From xen-devel-bounces@lists.xen.org Thu Nov 01 01:13:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 01:13:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjKn-0005fM-UG; Thu, 01 Nov 2012 01:12:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjKm-0005fH-DC for xen-devel@lists.xen.org; Thu, 01 Nov 2012 01:12:36 +0000 Received: from [85.158.139.83:2264] by server-4.bemta-5.messagelabs.com id AA/EE-15011-38CC1905; Thu, 01 Nov 2012 01:12:35 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-8.tower-182.messagelabs.com!1351732354!16941321!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzUwNzY=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzUwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9647 invoked from network); 1 Nov 2012 01:12:35 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-8.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 01:12:35 -0000 Received: from server2-groupware.localnet (kons-d9be1c11.pool.mediaWays.net [217.190.28.17]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Lpgco-1Srexo1Nsk-00fXX3; Thu, 01 Nov 2012 02:12:34 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Thu, 1 Nov 2012 02:18:14 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211010218.14872.ronny.hegewald@online.de> X-Provags-ID: V02:K0:OhYehV/ZLEZZANDWp750tdUbWc6X8BBlkDJR2nlbP2b QHqdmNFSDcFJQtWlv7K76MpfkrG/F/9W1ryOo/xSVN+Upw3cP2 uFNDvwqYG/AEJt82dcYwMR3k7eFKx0dIoldypAC00XmKFMyp4P r6XB5t4QEA/CtuoiAvxvEOk1lBT0kkLp5I5zH/3J3z2JLgqdCB Zo2PKQb9jacI+eM+wajZdnF1yO4MvYrubnwXgYIe2Lo3WGDDXS tyII0sEjTmDmRSXOl8BkjNjN9CHs9auwiIWL73BDT3lXKj8ogK 7vh/NmFqT5o1/K0+FGKBVNSMIHVzL+Cbt837na2e9c2jhKgksu vTOxPw75I7VjRZlUy2UmM/aGAtakT8Lw9hr8Ki7vDe1phqC/1K 1/3x/GMxprgAd4ojx/FB6v7cLSIo2KSfoQ= Subject: [Xen-devel] [PATCH] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org When a config-file for a pv-domU has a vfb section with a vnc=0 option then a "xl create" for that domU crashes with the message xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' failed. and the domU hangs early in the start. This patch fixes the cause of the assertion and let the domU start normally. This problem exists since xen 4.2. --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ } libxl_defbool_setdefault(&vfb->vnc.findunused, true); + } else { + libxl_defbool_setdefault(&vfb->vnc.findunused, false); } libxl_defbool_setdefault(&vfb->sdl.enable, false); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 01:13:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 01:13:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjKn-0005fM-UG; Thu, 01 Nov 2012 01:12:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjKm-0005fH-DC for xen-devel@lists.xen.org; Thu, 01 Nov 2012 01:12:36 +0000 Received: from [85.158.139.83:2264] by server-4.bemta-5.messagelabs.com id AA/EE-15011-38CC1905; Thu, 01 Nov 2012 01:12:35 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-8.tower-182.messagelabs.com!1351732354!16941321!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzUwNzY=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzUwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9647 invoked from network); 1 Nov 2012 01:12:35 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-8.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 01:12:35 -0000 Received: from server2-groupware.localnet (kons-d9be1c11.pool.mediaWays.net [217.190.28.17]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Lpgco-1Srexo1Nsk-00fXX3; Thu, 01 Nov 2012 02:12:34 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Thu, 1 Nov 2012 02:18:14 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211010218.14872.ronny.hegewald@online.de> X-Provags-ID: V02:K0:OhYehV/ZLEZZANDWp750tdUbWc6X8BBlkDJR2nlbP2b QHqdmNFSDcFJQtWlv7K76MpfkrG/F/9W1ryOo/xSVN+Upw3cP2 uFNDvwqYG/AEJt82dcYwMR3k7eFKx0dIoldypAC00XmKFMyp4P r6XB5t4QEA/CtuoiAvxvEOk1lBT0kkLp5I5zH/3J3z2JLgqdCB Zo2PKQb9jacI+eM+wajZdnF1yO4MvYrubnwXgYIe2Lo3WGDDXS tyII0sEjTmDmRSXOl8BkjNjN9CHs9auwiIWL73BDT3lXKj8ogK 7vh/NmFqT5o1/K0+FGKBVNSMIHVzL+Cbt837na2e9c2jhKgksu vTOxPw75I7VjRZlUy2UmM/aGAtakT8Lw9hr8Ki7vDe1phqC/1K 1/3x/GMxprgAd4ojx/FB6v7cLSIo2KSfoQ= Subject: [Xen-devel] [PATCH] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org When a config-file for a pv-domU has a vfb section with a vnc=0 option then a "xl create" for that domU crashes with the message xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' failed. and the domU hangs early in the start. This patch fixes the cause of the assertion and let the domU start normally. This problem exists since xen 4.2. --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ } libxl_defbool_setdefault(&vfb->vnc.findunused, true); + } else { + libxl_defbool_setdefault(&vfb->vnc.findunused, false); } libxl_defbool_setdefault(&vfb->sdl.enable, false); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 01:39:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 01:39:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjkD-0006Am-7E; Thu, 01 Nov 2012 01:38:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjkB-0006Ah-T5 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 01:38:52 +0000 Received: from [85.158.143.35:16771] by server-1.bemta-4.messagelabs.com id 55/8E-27934-BA2D1905; Thu, 01 Nov 2012 01:38:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1351733930!16014468!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24139 invoked from network); 1 Nov 2012 01:38:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 01:38:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,690,1344211200"; d="scan'208";a="15529328" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 01:38:49 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 01:38:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTjk8-0007KG-SS; Thu, 01 Nov 2012 01:38:48 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTjk8-0004gD-S0; Thu, 01 Nov 2012 01:38:48 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 01:38:48 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14280: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14280 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14280/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-sedf 11 guest-localmigrate fail pass in 14192 test-amd64-i386-win 7 windows-install fail pass in 14192 test-amd64-amd64-xl-sedf 14 guest-localmigrate/x10 fail in 14192 pass in 14186 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail in 14192 never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 01:39:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 01:39:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjkD-0006Am-7E; Thu, 01 Nov 2012 01:38:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTjkB-0006Ah-T5 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 01:38:52 +0000 Received: from [85.158.143.35:16771] by server-1.bemta-4.messagelabs.com id 55/8E-27934-BA2D1905; Thu, 01 Nov 2012 01:38:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1351733930!16014468!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24139 invoked from network); 1 Nov 2012 01:38:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 01:38:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,690,1344211200"; d="scan'208";a="15529328" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 01:38:49 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 01:38:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTjk8-0007KG-SS; Thu, 01 Nov 2012 01:38:48 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTjk8-0004gD-S0; Thu, 01 Nov 2012 01:38:48 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 01:38:48 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14280: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14280 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14280/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-sedf 11 guest-localmigrate fail pass in 14192 test-amd64-i386-win 7 windows-install fail pass in 14192 test-amd64-amd64-xl-sedf 14 guest-localmigrate/x10 fail in 14192 pass in 14186 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail in 14192 never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 02:14:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 02:14:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTkHm-0002xm-CP; Thu, 01 Nov 2012 02:13:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTkHl-0002fT-82 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 02:13:33 +0000 Received: from [85.158.139.83:12832] by server-9.bemta-5.messagelabs.com id C1/CA-29295-CCAD1905; Thu, 01 Nov 2012 02:13:32 +0000 X-Env-Sender: raistlin.df@gmail.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351736011!23617624!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21164 invoked from network); 1 Nov 2012 02:13:31 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 02:13:31 -0000 Received: by mail-ea0-f173.google.com with SMTP id a1so974470eaa.32 for ; Wed, 31 Oct 2012 19:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:mime-version; bh=xdHVECy2wLY+DLVYVfRF50kVl/dpSxyiTXFhM6/s8b8=; b=YcbjQoxCahHu038mPj7gIJhBMxswPQ1A5wfppnYwXvxpWe22EBjJ6e3yFeO4dPdtyZ n2q0PwTjVuKh2dziwLRdlptdcRYGuMKWAGeVtR+qdRpvpp6Z1lAeR5DxRcbsUwN23J3P kDRNdMstPAUgwhyWU+E9snuPYlbFeZpvf+7r3Hn3Yi6Mrasm0uAbEASXN8Ura0Y+ZcQA uv3C5hrKRQ5Uw8CQHwePiPGLvo2k+wpQ5pw4PmfZPO9s0oIQE2/iz2OXEdzJ5RjBqnv/ OiQrXnIlVSWbTGgxMGH+wY5iTjAnZUjLNG4JE4o5Y1rmsxkI9lv24Juf4rbNkj/KxuNp 2zsw== Received: by 10.14.199.134 with SMTP id x6mr92592827een.31.1351736011508; Wed, 31 Oct 2012 19:13:31 -0700 (PDT) Received: from [192.168.0.40] (ip-143-31.sn3.eutelia.it. [213.136.143.31]) by mx.google.com with ESMTPS id e1sm11482925eem.3.2012.10.31.19.13.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 19:13:30 -0700 (PDT) Message-ID: <1351736001.18330.139.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Thu, 01 Nov 2012 03:13:21 +0100 In-Reply-To: <20121029223555.GA24388@ocelot.phlegethon.org> References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 Mime-Version: 1.0 Cc: Dan Magenheimer , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , xen-devel@lists.xen.org, Zhigang Wang , Ian Jackson Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0208552959545569884==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0208552959545569884== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-jrQPAMTpPwECh/tIGrmE" --=-jrQPAMTpPwECh/tIGrmE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2012-10-29 at 22:35 +0000, Tim Deegan wrote: > At 10:06 -0700 on 29 Oct (1351505175), Dan Magenheimer wrote: > > In the case of a dying domain, a XENMEM_release operation > > is implied and must be executed by the hypervisor. > >=20 > > Ideally, the quantity of unclaimed memory for each domain and > > for the system should be query-able. This may require additional > > memory_op hypercalls. > >=20 > > I'd very much appreciate feedback on this proposed design! >=20 > As I said, I'm not opposed to this, though even after reading through > the other thread I'm not convinced that it's necessary (except in cases > where guest-controlled operations are allowed to consume unbounded > memory, which frankly gives me the heebie-jeebies). >=20 Let me also ask something. Playing with NUMA systems I've been in the situation where it would be nice to know not only how much free memory we have in general, but how much free memory there is in a specific (set of) node(s), and that in many places, from the hypervisor, to libxc, to top level toolstack. Right now I ask this to Xen, but that is indeed prone to races and TOCTOU issues if we allow for domain creation and ballooning (tmem/paging/...) to happen concurrently between themselves and between each other (as noted in the long thread that preceded this one). Question is, the "claim" mechanism you're proposing is by no means NUMA node-aware, right? Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-jrQPAMTpPwECh/tIGrmE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCR2sEACgkQk4XaBE3IOsRsfQCfbb/6tuBlKmKCmEokERwH2Tja gNAAoKKG2iiMHTey7J1N85ONU7Mq0sjS =ynoL -----END PGP SIGNATURE----- --=-jrQPAMTpPwECh/tIGrmE-- --===============0208552959545569884== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0208552959545569884==-- From xen-devel-bounces@lists.xen.org Thu Nov 01 02:14:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 02:14:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTkHm-0002xm-CP; Thu, 01 Nov 2012 02:13:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTkHl-0002fT-82 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 02:13:33 +0000 Received: from [85.158.139.83:12832] by server-9.bemta-5.messagelabs.com id C1/CA-29295-CCAD1905; Thu, 01 Nov 2012 02:13:32 +0000 X-Env-Sender: raistlin.df@gmail.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351736011!23617624!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21164 invoked from network); 1 Nov 2012 02:13:31 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 02:13:31 -0000 Received: by mail-ea0-f173.google.com with SMTP id a1so974470eaa.32 for ; Wed, 31 Oct 2012 19:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:mime-version; bh=xdHVECy2wLY+DLVYVfRF50kVl/dpSxyiTXFhM6/s8b8=; b=YcbjQoxCahHu038mPj7gIJhBMxswPQ1A5wfppnYwXvxpWe22EBjJ6e3yFeO4dPdtyZ n2q0PwTjVuKh2dziwLRdlptdcRYGuMKWAGeVtR+qdRpvpp6Z1lAeR5DxRcbsUwN23J3P kDRNdMstPAUgwhyWU+E9snuPYlbFeZpvf+7r3Hn3Yi6Mrasm0uAbEASXN8Ura0Y+ZcQA uv3C5hrKRQ5Uw8CQHwePiPGLvo2k+wpQ5pw4PmfZPO9s0oIQE2/iz2OXEdzJ5RjBqnv/ OiQrXnIlVSWbTGgxMGH+wY5iTjAnZUjLNG4JE4o5Y1rmsxkI9lv24Juf4rbNkj/KxuNp 2zsw== Received: by 10.14.199.134 with SMTP id x6mr92592827een.31.1351736011508; Wed, 31 Oct 2012 19:13:31 -0700 (PDT) Received: from [192.168.0.40] (ip-143-31.sn3.eutelia.it. [213.136.143.31]) by mx.google.com with ESMTPS id e1sm11482925eem.3.2012.10.31.19.13.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 19:13:30 -0700 (PDT) Message-ID: <1351736001.18330.139.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Thu, 01 Nov 2012 03:13:21 +0100 In-Reply-To: <20121029223555.GA24388@ocelot.phlegethon.org> References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 Mime-Version: 1.0 Cc: Dan Magenheimer , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , xen-devel@lists.xen.org, Zhigang Wang , Ian Jackson Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0208552959545569884==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0208552959545569884== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-jrQPAMTpPwECh/tIGrmE" --=-jrQPAMTpPwECh/tIGrmE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2012-10-29 at 22:35 +0000, Tim Deegan wrote: > At 10:06 -0700 on 29 Oct (1351505175), Dan Magenheimer wrote: > > In the case of a dying domain, a XENMEM_release operation > > is implied and must be executed by the hypervisor. > >=20 > > Ideally, the quantity of unclaimed memory for each domain and > > for the system should be query-able. This may require additional > > memory_op hypercalls. > >=20 > > I'd very much appreciate feedback on this proposed design! >=20 > As I said, I'm not opposed to this, though even after reading through > the other thread I'm not convinced that it's necessary (except in cases > where guest-controlled operations are allowed to consume unbounded > memory, which frankly gives me the heebie-jeebies). >=20 Let me also ask something. Playing with NUMA systems I've been in the situation where it would be nice to know not only how much free memory we have in general, but how much free memory there is in a specific (set of) node(s), and that in many places, from the hypervisor, to libxc, to top level toolstack. Right now I ask this to Xen, but that is indeed prone to races and TOCTOU issues if we allow for domain creation and ballooning (tmem/paging/...) to happen concurrently between themselves and between each other (as noted in the long thread that preceded this one). Question is, the "claim" mechanism you're proposing is by no means NUMA node-aware, right? Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-jrQPAMTpPwECh/tIGrmE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCR2sEACgkQk4XaBE3IOsRsfQCfbb/6tuBlKmKCmEokERwH2Tja gNAAoKKG2iiMHTey7J1N85ONU7Mq0sjS =ynoL -----END PGP SIGNATURE----- --=-jrQPAMTpPwECh/tIGrmE-- --===============0208552959545569884== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0208552959545569884==-- From xen-devel-bounces@lists.xen.org Thu Nov 01 05:43:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 05:43:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTnY6-0001GX-40; Thu, 01 Nov 2012 05:42:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTnY4-0001GS-8S for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 05:42:36 +0000 Received: from [85.158.139.211:24490] by server-9.bemta-5.messagelabs.com id 66/9E-29295-BCB02905; Thu, 01 Nov 2012 05:42:35 +0000 X-Env-Sender: rientjes@google.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351748553!17979063!1 X-Originating-IP: [209.85.220.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28066 invoked from network); 1 Nov 2012 05:42:34 -0000 Received: from mail-pa0-f43.google.com (HELO mail-pa0-f43.google.com) (209.85.220.43) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 05:42:34 -0000 Received: by mail-pa0-f43.google.com with SMTP id fb1so1603196pad.30 for ; Wed, 31 Oct 2012 22:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=EqdKn6LbzJGdB9Dly+uPZVHJd0PFo3sPP8pek9Qkzv8=; b=Q2BqGD/ltM3gevB/BqKxzBKQjFXBEW7QeMdrhH5Pzg9BcU+0NmKTnXoT3WZvvU65+V ZcEmvf4j44LMSfSMXDAreTEg0oKYnVIKpnqm/8aZlH8RU5gLg8gtyu4earrdCT4hmrUe FeTl8O8LKporNqJqLeSJ7PINx/I3XbJl0r8Tc7w/rGG1w9kFXR971zwdP6JonUXOeQLn PYYXKHW+P/3BiGE2ICKe2a5Pnx6AvKrUEdjCjkRb4y4q3pjiEjpa3dbZ5vNK3+DKJaW0 GRFz656mGQ4Qgsnpa0FlivyX5HFU55TF+IDzXazscX6v/5xemoPRqiA4ObfDbpXLMDOE EN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=EqdKn6LbzJGdB9Dly+uPZVHJd0PFo3sPP8pek9Qkzv8=; b=eL6XElcO4k96onRMd7Izsyyduj4e/Qy86DWT2yINASh2CpqXx2+qNND/VHPrxio3a5 sTi6Xgp14kj5yFWZillRZbQ1shjXy24KMLrM+AlV278PPqhPbQq61kGCuEliLuiMJXuq o/EHdhMH8882z0LCdONRuhFppCYK8AK5CdH06/6J5SgIhios8o3kyoim3QC9nGaQ2bYb y//rAftYsaiy6tKGBcHcmUTxb3BTBBolna83Nvt0mAnheCAiAlHzaShjiSZlnF66egxb cOdBZi8Ssx6dSJ03E2VFfU71sLMmGuc/9HRjxHzKCBcdY9OTvcQRtbDUZaVKs1y5xCmb VFvQ== Received: by 10.66.85.227 with SMTP id k3mr108120548paz.79.1351748552759; Wed, 31 Oct 2012 22:42:32 -0700 (PDT) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPS id ok3sm3481617pbb.11.2012.10.31.22.42.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 22:42:31 -0700 (PDT) Date: Wed, 31 Oct 2012 22:42:30 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Linus Torvalds , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQki2wafRNQkB+pGHOm31Dtc44NqGk8cEuVHnNbCn8M5fpsXKwCtYPMD4M8v+CRvCsPiYJAVwgNd4myvHlnNuQkE4HomxKYpki02OIquTZ6c2IX0dtV9oyef93Ny7LSmhwesVf4VedIlrsvSl/2OJlG/IrbqYnfp2DRfDg22C1roMQwqn+WPy/UvKVbnWWE3+wJDSd3W54VQPhki2q+i1yY61GBKEw== Cc: xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner Subject: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() resulting in the following link error: drivers/built-in.o: In function `dbgp_reset_prep': (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' drivers/built-in.o: In function `dbgp_external_startup': (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' Signed-off-by: David Rientjes --- arch/x86/xen/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -17,6 +17,7 @@ config XEN_DOM0 def_bool y depends on XEN && PCI_XEN && SWIOTLB_XEN depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI + depends on USB_SUPPORT # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST # name in tools. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 05:43:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 05:43:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTnY6-0001GX-40; Thu, 01 Nov 2012 05:42:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTnY4-0001GS-8S for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 05:42:36 +0000 Received: from [85.158.139.211:24490] by server-9.bemta-5.messagelabs.com id 66/9E-29295-BCB02905; Thu, 01 Nov 2012 05:42:35 +0000 X-Env-Sender: rientjes@google.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351748553!17979063!1 X-Originating-IP: [209.85.220.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28066 invoked from network); 1 Nov 2012 05:42:34 -0000 Received: from mail-pa0-f43.google.com (HELO mail-pa0-f43.google.com) (209.85.220.43) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 05:42:34 -0000 Received: by mail-pa0-f43.google.com with SMTP id fb1so1603196pad.30 for ; Wed, 31 Oct 2012 22:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=EqdKn6LbzJGdB9Dly+uPZVHJd0PFo3sPP8pek9Qkzv8=; b=Q2BqGD/ltM3gevB/BqKxzBKQjFXBEW7QeMdrhH5Pzg9BcU+0NmKTnXoT3WZvvU65+V ZcEmvf4j44LMSfSMXDAreTEg0oKYnVIKpnqm/8aZlH8RU5gLg8gtyu4earrdCT4hmrUe FeTl8O8LKporNqJqLeSJ7PINx/I3XbJl0r8Tc7w/rGG1w9kFXR971zwdP6JonUXOeQLn PYYXKHW+P/3BiGE2ICKe2a5Pnx6AvKrUEdjCjkRb4y4q3pjiEjpa3dbZ5vNK3+DKJaW0 GRFz656mGQ4Qgsnpa0FlivyX5HFU55TF+IDzXazscX6v/5xemoPRqiA4ObfDbpXLMDOE EN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=EqdKn6LbzJGdB9Dly+uPZVHJd0PFo3sPP8pek9Qkzv8=; b=eL6XElcO4k96onRMd7Izsyyduj4e/Qy86DWT2yINASh2CpqXx2+qNND/VHPrxio3a5 sTi6Xgp14kj5yFWZillRZbQ1shjXy24KMLrM+AlV278PPqhPbQq61kGCuEliLuiMJXuq o/EHdhMH8882z0LCdONRuhFppCYK8AK5CdH06/6J5SgIhios8o3kyoim3QC9nGaQ2bYb y//rAftYsaiy6tKGBcHcmUTxb3BTBBolna83Nvt0mAnheCAiAlHzaShjiSZlnF66egxb cOdBZi8Ssx6dSJ03E2VFfU71sLMmGuc/9HRjxHzKCBcdY9OTvcQRtbDUZaVKs1y5xCmb VFvQ== Received: by 10.66.85.227 with SMTP id k3mr108120548paz.79.1351748552759; Wed, 31 Oct 2012 22:42:32 -0700 (PDT) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPS id ok3sm3481617pbb.11.2012.10.31.22.42.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 22:42:31 -0700 (PDT) Date: Wed, 31 Oct 2012 22:42:30 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Linus Torvalds , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQki2wafRNQkB+pGHOm31Dtc44NqGk8cEuVHnNbCn8M5fpsXKwCtYPMD4M8v+CRvCsPiYJAVwgNd4myvHlnNuQkE4HomxKYpki02OIquTZ6c2IX0dtV9oyef93Ny7LSmhwesVf4VedIlrsvSl/2OJlG/IrbqYnfp2DRfDg22C1roMQwqn+WPy/UvKVbnWWE3+wJDSd3W54VQPhki2q+i1yY61GBKEw== Cc: xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner Subject: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() resulting in the following link error: drivers/built-in.o: In function `dbgp_reset_prep': (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' drivers/built-in.o: In function `dbgp_external_startup': (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' Signed-off-by: David Rientjes --- arch/x86/xen/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -17,6 +17,7 @@ config XEN_DOM0 def_bool y depends on XEN && PCI_XEN && SWIOTLB_XEN depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI + depends on USB_SUPPORT # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST # name in tools. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 06:17:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:17:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo57-0001xO-3L; Thu, 01 Nov 2012 06:16:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo55-0001xJ-H5 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:16:43 +0000 Received: from [85.158.139.211:18733] by server-1.bemta-5.messagelabs.com id B3/61-05877-AC312905; Thu, 01 Nov 2012 06:16:42 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1351750600!18467931!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7956 invoked from network); 1 Nov 2012 06:16:41 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 06:16:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="15531047" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 06:16:40 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 06:16:39 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTo51-0000L3-Ey; Thu, 01 Nov 2012 06:16:39 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTo51-0001aD-A5; Thu, 01 Nov 2012 06:16:39 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 06:16:39 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14286: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14286 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14286/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-i386-win-vcpus1 3 host-install(3) broken pass in 14280 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail in 14280 pass in 14286 test-amd64-i386-win 7 windows-install fail in 14280 pass in 14286 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail in 14280 never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf pass test-amd64-i386-win-vcpus1 broken test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 06:17:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:17:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo57-0001xO-3L; Thu, 01 Nov 2012 06:16:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo55-0001xJ-H5 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:16:43 +0000 Received: from [85.158.139.211:18733] by server-1.bemta-5.messagelabs.com id B3/61-05877-AC312905; Thu, 01 Nov 2012 06:16:42 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1351750600!18467931!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7956 invoked from network); 1 Nov 2012 06:16:41 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 06:16:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="15531047" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 06:16:40 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 06:16:39 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTo51-0000L3-Ey; Thu, 01 Nov 2012 06:16:39 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTo51-0001aD-A5; Thu, 01 Nov 2012 06:16:39 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 06:16:39 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14286: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14286 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14286/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-i386-win-vcpus1 3 host-install(3) broken pass in 14280 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail in 14280 pass in 14286 test-amd64-i386-win 7 windows-install fail in 14280 pass in 14286 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail in 14280 never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf pass test-amd64-i386-win-vcpus1 broken test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 06:18:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo6V-00021t-Iz; Thu, 01 Nov 2012 06:18:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo6U-00021a-63 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:18:10 +0000 Received: from [85.158.137.99:57027] by server-14.bemta-3.messagelabs.com id 0D/F5-12788-12412905; Thu, 01 Nov 2012 06:18:09 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351750688!14099882!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20048 invoked from network); 1 Nov 2012 06:18:08 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 06:18:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="15531058" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 06:18:08 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 06:18:07 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTo6R-0000Lz-Ki; Thu, 01 Nov 2012 06:18:07 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTo6R-00020U-In; Thu, 01 Nov 2012 06:18:07 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 06:18:07 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, keir@xen.org, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing bisection] complete test-i386-i386-xl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org branch xen-4.2-testing xen branch xen-4.2-testing job test-i386-i386-xl test guest-start Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson For bisection revision-tuple graph see: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.xen-4.2-testing.test-i386-i386-xl.guest-start.html Revision IDs in each graph node refer, respectively, to the Trees above. ---------------------------------------- Searching for failure / basis pass: 14280 fail [host=bush-cricket] / 14076 [host=earwig] 13927 [host=itch-mite] 13925 ok. Failure / basis pass flights: 14280 / 13925 Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Latest a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df Basis pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 Generating revisions with ./adhoc-revtuple-generator git://xenbits.xen.org/linux-pvops.git#a938a246d34912423c560f475ccf1ce0c71d9d00-a938a246d34912423c560f475ccf1ce0c71d9d00 git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git#bacc0d302445c75f18f4c826750fb5853b60e7ca-bacc0d302445c75f18f4c826750fb5853b60e7ca git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git#cdf4d2bb4006805f209712fbb8ed1f83127e9984-cdf4d2bb4006805f209712fbb8ed1f83127e9984 http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg#27db446078b5-2bca7e58a3df pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found Loaded 1001 nodes in revision graph Searching for test results: 13925 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 13927 [host=itch-mite] 14076 [host=earwig] 14185 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14170 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14171 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14187 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14160 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14150 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14172 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14200 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14188 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14174 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14153 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14175 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14189 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14156 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14176 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14158 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14190 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14162 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14163 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14165 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14178 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14186 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14166 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14180 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14168 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14169 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14191 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14181 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14202 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14182 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14193 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14183 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14184 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14173 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14194 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14196 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14198 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14277 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14192 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14278 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 747c216a612c 14281 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 8c1fb247f394 14282 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 cd0ae0ba4653 14283 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14280 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14285 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14287 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14290 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14291 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14292 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14293 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb Searching for interesting versions Result found: flight 13925 (pass), for basis pass Result found: flight 14150 (fail), for basis failure Repro found: flight 14202 (pass), for basis pass Repro found: flight 14277 (fail), for basis failure 0 revisions at a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 No revisions left to test, checking graph state. Result found: flight 14285 (pass), for last pass Result found: flight 14287 (fail), for first failure Repro found: flight 14290 (pass), for last pass Repro found: flight 14291 (fail), for first failure Repro found: flight 14292 (pass), for last pass Repro found: flight 14293 (fail), for first failure *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson Revision graph left in /home/xc_osstest/results/bisect.xen-4.2-testing.test-i386-i386-xl.guest-start.{dot,ps,png,html}. ---------------------------------------- 14293: tolerable ALL FAIL flight 14293 xen-4.2-testing real-bisect [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14293/ Failures :-/ but no regressions. Tests which did not succeed, including tests which could not be run: test-i386-i386-xl 9 guest-start fail baseline untested jobs: test-i386-i386-xl fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 06:18:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo6V-00021t-Iz; Thu, 01 Nov 2012 06:18:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTo6U-00021a-63 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:18:10 +0000 Received: from [85.158.137.99:57027] by server-14.bemta-3.messagelabs.com id 0D/F5-12788-12412905; Thu, 01 Nov 2012 06:18:09 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351750688!14099882!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20048 invoked from network); 1 Nov 2012 06:18:08 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 06:18:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="15531058" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 06:18:08 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 06:18:07 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTo6R-0000Lz-Ki; Thu, 01 Nov 2012 06:18:07 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTo6R-00020U-In; Thu, 01 Nov 2012 06:18:07 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 06:18:07 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, keir@xen.org, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing bisection] complete test-i386-i386-xl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org branch xen-4.2-testing xen branch xen-4.2-testing job test-i386-i386-xl test guest-start Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson For bisection revision-tuple graph see: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.xen-4.2-testing.test-i386-i386-xl.guest-start.html Revision IDs in each graph node refer, respectively, to the Trees above. ---------------------------------------- Searching for failure / basis pass: 14280 fail [host=bush-cricket] / 14076 [host=earwig] 13927 [host=itch-mite] 13925 ok. Failure / basis pass flights: 14280 / 13925 Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Latest a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df Basis pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 Generating revisions with ./adhoc-revtuple-generator git://xenbits.xen.org/linux-pvops.git#a938a246d34912423c560f475ccf1ce0c71d9d00-a938a246d34912423c560f475ccf1ce0c71d9d00 git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git#bacc0d302445c75f18f4c826750fb5853b60e7ca-bacc0d302445c75f18f4c826750fb5853b60e7ca git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git#cdf4d2bb4006805f209712fbb8ed1f83127e9984-cdf4d2bb4006805f209712fbb8ed1f83127e9984 http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg#27db446078b5-2bca7e58a3df pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found Loaded 1001 nodes in revision graph Searching for test results: 13925 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 13927 [host=itch-mite] 14076 [host=earwig] 14185 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14170 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14171 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14187 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14160 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14150 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14172 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14200 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14188 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14174 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14153 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14175 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14189 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14156 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14176 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14158 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14190 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14162 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14163 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14165 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14178 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14186 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14166 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14180 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14168 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14169 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14191 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14181 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14202 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14182 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14193 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14183 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14184 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14173 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14194 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14196 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14198 blocked a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27db446078b5 14277 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14192 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14278 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 747c216a612c 14281 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 8c1fb247f394 14282 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 cd0ae0ba4653 14283 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14280 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14285 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14287 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14290 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14291 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14292 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14293 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb Searching for interesting versions Result found: flight 13925 (pass), for basis pass Result found: flight 14150 (fail), for basis failure Repro found: flight 14202 (pass), for basis pass Repro found: flight 14277 (fail), for basis failure 0 revisions at a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 No revisions left to test, checking graph state. Result found: flight 14285 (pass), for last pass Result found: flight 14287 (fail), for first failure Repro found: flight 14290 (pass), for last pass Repro found: flight 14291 (fail), for first failure Repro found: flight 14292 (pass), for last pass Repro found: flight 14293 (fail), for first failure *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson Revision graph left in /home/xc_osstest/results/bisect.xen-4.2-testing.test-i386-i386-xl.guest-start.{dot,ps,png,html}. ---------------------------------------- 14293: tolerable ALL FAIL flight 14293 xen-4.2-testing real-bisect [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14293/ Failures :-/ but no regressions. Tests which did not succeed, including tests which could not be run: test-i386-i386-xl 9 guest-start fail baseline untested jobs: test-i386-i386-xl fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 06:36:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:36:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToNb-0002Tr-8x; Thu, 01 Nov 2012 06:35:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToNZ-0002Tm-BV for xen-devel@lists.xen.org; Thu, 01 Nov 2012 06:35:49 +0000 Received: from [193.109.254.147:19233] by server-4.bemta-14.messagelabs.com id 65/01-18856-44812905; Thu, 01 Nov 2012 06:35:48 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1351751745!2358914!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzc4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7071 invoked from network); 1 Nov 2012 06:35:46 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-15.tower-27.messagelabs.com with SMTP; 1 Nov 2012 06:35:46 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 31 Oct 2012 23:35:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,691,1344236400"; d="scan'208,223";a="213837549" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 31 Oct 2012 23:35:45 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:35:44 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 14:34:46 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNs7Z0Ti91BiFLfUibRvXA4zlK85fUjX6A Date: Thu, 1 Nov 2012 06:34:45 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> In-Reply-To: <20121026201409.GF2708@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks! updated as attached. Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 1 Nov 2012 21:02:36 +0800 Subject: [PATCH 1/2] Xen acpi pad implement PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and very thin logic level, would take over acpi pad staff. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object and then hypercall to hyervisor for the rest work, say, core parking. Signed-off-by: Liu, Jinsong --- drivers/xen/Makefile | 1 + drivers/xen/xen_acpi_pad.c | 206 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 +++ 3 files changed, 224 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xen_acpi_pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..a2af622 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) +=3D mcelog.o obj-$(CONFIG_XEN_PCIDEV_BACKEND) +=3D xen-pciback/ obj-$(CONFIG_XEN_PRIVCMD) +=3D xen-privcmd.o obj-$(CONFIG_XEN_ACPI_PROCESSOR) +=3D xen-acpi-processor.o +obj-$(CONFIG_XEN_DOM0) +=3D xen_acpi_pad.o xen-evtchn-y :=3D evtchn.o xen-gntdev-y :=3D gntdev.o xen-gntalloc-y :=3D gntalloc.o diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c new file mode 100644 index 0000000..e8c26a4 --- /dev/null +++ b/drivers/xen/xen_acpi_pad.c @@ -0,0 +1,206 @@ +/* + * xen_acpi_pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 + +static DEFINE_MUTEX(xen_pad_lock); + +static int xen_pad_set_idle_cpus(int num_cpus) +{ + struct xen_platform_op op; + + if (num_cpus < 0) + return -EINVAL; + + /* set cpu nums expected to be idled */ + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D num_cpus; + + return HYPERVISOR_dom0_op(&op); +} + +/* + * Cannot get idle cpus by using hypercall once (shared with _SET) + * because of the characteristic of Xen continue_hypercall_on_cpu + */ +static int xen_pad_get_idle_cpus(void) +{ + int ret; + struct xen_platform_op op; + + /* get cpu nums actually be idled */ + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + ret =3D HYPERVISOR_dom0_op(&op); + if (ret < 0) + return ret; + + return op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int xen_acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void xen_acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_cpus) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_cpus; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void xen_acpi_pad_handle_notify(acpi_handle handle) +{ + int num_cpus; + + num_cpus =3D xen_acpi_pad_pur(handle); + if (num_cpus < 0) + return; + + mutex_lock(&xen_pad_lock); + if (xen_pad_set_idle_cpus(num_cpus)) { + mutex_unlock(&xen_pad_lock); + return; + } + + num_cpus =3D xen_pad_get_idle_cpus(); + if (num_cpus < 0) { + mutex_unlock(&xen_pad_lock); + return; + } + mutex_unlock(&xen_pad_lock); + + xen_acpi_pad_ost(handle, 0, num_cpus); +} + +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + xen_acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int xen_acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int xen_acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_pad_lock); + xen_pad_set_idle_cpus(0); + mutex_unlock(&xen_pad_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver xen_acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D xen_acpi_pad_add, + .remove =3D xen_acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + int ret =3D -ENOSYS; + unsigned int version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + unsigned int major =3D version >> 16; + unsigned int minor =3D version & 0xffff; + + /* Only DOM0 is responsible for Xen acpi pad */ + if (!xen_initial_domain()) + return -ENODEV; + + /* Only Xen4.2 or later support Xen acpi pad */ + if (((major =3D=3D 4) && (minor >=3D 2)) || (major > 4)) + ret =3D acpi_bus_register_driver(&xen_acpi_pad_driver); + + return ret; +} +subsys_initcall(xen_acpi_pad_init); diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..a3be54c 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-pad-implement.patch" Content-Description: 0001-Xen-acpi-pad-implement.patch Content-Disposition: attachment; filename="0001-Xen-acpi-pad-implement.patch"; size=8184; creation-date="Thu, 01 Nov 2012 06:25:57 GMT"; modification-date="Thu, 01 Nov 2012 13:29:12 GMT" Content-Transfer-Encoding: base64 RnJvbSBmNTE0Yjk3NjI4OTQ1Y2ZhYzAwZWZiMGQ0NTZmMTMzZDQ0NzU0YzlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCAxIE5vdiAyMDEyIDIxOjAyOjM2ICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbiBhY3BpIHBhZCBpbXBsZW1lbnQKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdhdG9y IERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRoZSBw bGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFuZCBj b250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0uCgpU aGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVubmlu ZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90IHdv cmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHZlcnkgdGhp biBsb2dpYyBsZXZlbCwgd291bGQgdGFrZSBvdmVyIGFjcGkgcGFkIHN0YWZmLgpXaGVuIGFjcGkg cGFkIG5vdGlmeSBPU1BNLCB4ZW4gcGFkIGxvZ2ljIGludGVyY2VwdCBhbmQgcGFyc2UgX1BVUiBv YmplY3QKYW5kIHRoZW4gaHlwZXJjYWxsIHRvIGh5ZXJ2aXNvciBmb3IgdGhlIHJlc3Qgd29yaywg c2F5LCBjb3JlIHBhcmtpbmcuCgpTaWduZWQtb2ZmLWJ5OiBMaXUsIEppbnNvbmcgPGppbnNvbmcu bGl1QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3hlbi9NYWtlZmlsZSAgICAgICAgICAgICB8ICAg IDEgKwogZHJpdmVycy94ZW4veGVuX2FjcGlfcGFkLmMgICAgICAgfCAgMjA2ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZv cm0uaCB8ICAgMTcgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDIyNCBpbnNlcnRpb25zKCspLCAwIGRl bGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMveGVuL3hlbl9hY3BpX3BhZC5j CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmls ZQppbmRleCAwZTg2MzcwLi5hMmFmNjIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmls ZQorKysgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQpAQCAtMjksNiArMjksNyBAQCBvYmotJChDT05G SUdfWEVOX01DRV9MT0cpCQkrPSBtY2Vsb2cubwogb2JqLSQoQ09ORklHX1hFTl9QQ0lERVZfQkFD S0VORCkJKz0geGVuLXBjaWJhY2svCiBvYmotJChDT05GSUdfWEVOX1BSSVZDTUQpCQkrPSB4ZW4t cHJpdmNtZC5vCiBvYmotJChDT05GSUdfWEVOX0FDUElfUFJPQ0VTU09SKQkrPSB4ZW4tYWNwaS1w cm9jZXNzb3Iubworb2JqLSQoQ09ORklHX1hFTl9ET00wKQkJCSs9IHhlbl9hY3BpX3BhZC5vCiB4 ZW4tZXZ0Y2huLXkJCQkJOj0gZXZ0Y2huLm8KIHhlbi1nbnRkZXYteQkJCQk6PSBnbnRkZXYubwog eGVuLWdudGFsbG9jLXkJCQkJOj0gZ250YWxsb2MubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4v eGVuX2FjcGlfcGFkLmMgYi9kcml2ZXJzL3hlbi94ZW5fYWNwaV9wYWQuYwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5lOGMyNmE0Ci0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVy cy94ZW4veGVuX2FjcGlfcGFkLmMKQEAgLTAsMCArMSwyMDYgQEAKKy8qCisgKiB4ZW5fYWNwaV9w YWQuYyAtIFhlbiBwYWQgaW50ZXJmYWNlCisgKgorICogQ29weXJpZ2h0IChjKSAyMDEyLCBJbnRl bCBDb3Jwb3JhdGlvbi4KKyAqICAgIEF1dGhvcjogTGl1LCBKaW5zb25nIDxqaW5zb25nLmxpdUBp bnRlbC5jb20+CisgKgorICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g cmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQKKyAqIHVuZGVyIHRoZSB0ZXJtcyBhbmQg Y29uZGl0aW9ucyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UsCisgKiB2ZXJzaW9u IDIsIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLgorICoKKyAq IFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSBpdCB3aWxsIGJlIHVzZWZ1 bCwgYnV0IFdJVEhPVVQKKyAqIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVk IHdhcnJhbnR5IG9mIE1FUkNIQU5UQUJJTElUWSBvcgorICogRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvcgorICog bW9yZSBkZXRhaWxzLgorICovCisKKyNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KKyNpbmNsdWRl IDxsaW51eC90eXBlcy5oPgorI2luY2x1ZGUgPGFjcGkvYWNwaV9idXMuaD4KKyNpbmNsdWRlIDxh Y3BpL2FjcGlfZHJpdmVycy5oPgorI2luY2x1ZGUgPGFzbS94ZW4vaHlwZXJjYWxsLmg+CisjaW5j bHVkZSA8eGVuL2ludGVyZmFjZS92ZXJzaW9uLmg+CisKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1Jf QUdHUkVHQVRPUl9DTEFTUwkiYWNwaV9wYWQiCisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JF R0FUT1JfREVWSUNFX05BTUUgIlByb2Nlc3NvciBBZ2dyZWdhdG9yIgorI2RlZmluZSBBQ1BJX1BS T0NFU1NPUl9BR0dSRUdBVE9SX05PVElGWSAweDgwCisKK3N0YXRpYyBERUZJTkVfTVVURVgoeGVu X3BhZF9sb2NrKTsKKworc3RhdGljIGludCB4ZW5fcGFkX3NldF9pZGxlX2NwdXMoaW50IG51bV9j cHVzKQoreworCXN0cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3A7CisKKwlpZiAobnVtX2NwdXMgPCAw KQorCQlyZXR1cm4gLUVJTlZBTDsKKworCS8qIHNldCBjcHUgbnVtcyBleHBlY3RlZCB0byBiZSBp ZGxlZCAqLworCW9wLmNtZCA9IFhFTlBGX2NvcmVfcGFya2luZzsKKwlvcC51LmNvcmVfcGFya2lu Zy50eXBlID0gWEVOX0NPUkVfUEFSS0lOR19TRVQ7CisJb3AudS5jb3JlX3BhcmtpbmcuaWRsZV9u dW1zID0gbnVtX2NwdXM7CisKKwlyZXR1cm4gSFlQRVJWSVNPUl9kb20wX29wKCZvcCk7Cit9CisK Ky8qCisgKiBDYW5ub3QgZ2V0IGlkbGUgY3B1cyBieSB1c2luZyBoeXBlcmNhbGwgb25jZSAoc2hh cmVkIHdpdGggX1NFVCkKKyAqIGJlY2F1c2Ugb2YgdGhlIGNoYXJhY3RlcmlzdGljIG9mIFhlbiBj b250aW51ZV9oeXBlcmNhbGxfb25fY3B1CisgKi8KK3N0YXRpYyBpbnQgeGVuX3BhZF9nZXRfaWRs ZV9jcHVzKHZvaWQpCit7CisJaW50IHJldDsKKwlzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIG9wOwor CisJLyogZ2V0IGNwdSBudW1zIGFjdHVhbGx5IGJlIGlkbGVkICovCisJb3AuY21kID0gWEVOUEZf Y29yZV9wYXJraW5nOworCW9wLnUuY29yZV9wYXJraW5nLnR5cGUgPSBYRU5fQ09SRV9QQVJLSU5H X0dFVDsKKwlyZXQgPSBIWVBFUlZJU09SX2RvbTBfb3AoJm9wKTsKKwlpZiAocmV0IDwgMCkKKwkJ cmV0dXJuIHJldDsKKworCXJldHVybiBvcC51LmNvcmVfcGFya2luZy5pZGxlX251bXM7Cit9CisK Ky8qCisgKiBRdWVyeSBmaXJtd2FyZSBob3cgbWFueSBDUFVzIHNob3VsZCBiZSBpZGxlCisgKiBy ZXR1cm4gLTEgb24gZmFpbHVyZQorICovCitzdGF0aWMgaW50IHhlbl9hY3BpX3BhZF9wdXIoYWNw aV9oYW5kbGUgaGFuZGxlKQoreworCXN0cnVjdCBhY3BpX2J1ZmZlciBidWZmZXIgPSB7QUNQSV9B TExPQ0FURV9CVUZGRVIsIE5VTEx9OworCXVuaW9uIGFjcGlfb2JqZWN0ICpwYWNrYWdlOworCWlu dCBudW0gPSAtMTsKKworCWlmIChBQ1BJX0ZBSUxVUkUoYWNwaV9ldmFsdWF0ZV9vYmplY3QoaGFu ZGxlLCAiX1BVUiIsIE5VTEwsICZidWZmZXIpKSkKKwkJcmV0dXJuIG51bTsKKworCWlmICghYnVm ZmVyLmxlbmd0aCB8fCAhYnVmZmVyLnBvaW50ZXIpCisJCXJldHVybiBudW07CisKKwlwYWNrYWdl ID0gYnVmZmVyLnBvaW50ZXI7CisKKwlpZiAocGFja2FnZS0+dHlwZSA9PSBBQ1BJX1RZUEVfUEFD S0FHRSAmJgorCQlwYWNrYWdlLT5wYWNrYWdlLmNvdW50ID09IDIgJiYKKwkJcGFja2FnZS0+cGFj a2FnZS5lbGVtZW50c1swXS5pbnRlZ2VyLnZhbHVlID09IDEpIC8qIHJldiAxICovCisKKwkJbnVt ID0gcGFja2FnZS0+cGFja2FnZS5lbGVtZW50c1sxXS5pbnRlZ2VyLnZhbHVlOworCisJa2ZyZWUo YnVmZmVyLnBvaW50ZXIpOworCXJldHVybiBudW07Cit9CisKKy8qIE5vdGlmeSBmaXJtd2FyZSBo b3cgbWFueSBDUFVzIGFyZSBpZGxlICovCitzdGF0aWMgdm9pZCB4ZW5fYWNwaV9wYWRfb3N0KGFj cGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMyX3QgaWRsZV9jcHVzKQoreworCXVu aW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVH RVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9U WVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2JqZWN0X2xpc3QgYXJnX2xpc3QgPSB7 MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZhbHVlID0gQUNQSV9QUk9DRVNTT1Jf QUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVnZXIudmFsdWUgPSAgc3RhdDsKKwlw YXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1zWzJdLmJ1ZmZlci5wb2ludGVyID0g KHZvaWQgKikmaWRsZV9jcHVzOworCWFjcGlfZXZhbHVhdGVfb2JqZWN0KGhhbmRsZSwgIl9PU1Qi LCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9pZCB4ZW5fYWNwaV9wYWRfaGFuZGxl X25vdGlmeShhY3BpX2hhbmRsZSBoYW5kbGUpCit7CisJaW50IG51bV9jcHVzOworCisJbnVtX2Nw dXMgPSB4ZW5fYWNwaV9wYWRfcHVyKGhhbmRsZSk7CisJaWYgKG51bV9jcHVzIDwgMCkKKwkJcmV0 dXJuOworCisJbXV0ZXhfbG9jaygmeGVuX3BhZF9sb2NrKTsKKwlpZiAoeGVuX3BhZF9zZXRfaWRs ZV9jcHVzKG51bV9jcHVzKSkgeworCQltdXRleF91bmxvY2soJnhlbl9wYWRfbG9jayk7CisJCXJl dHVybjsKKwl9CisKKwludW1fY3B1cyA9IHhlbl9wYWRfZ2V0X2lkbGVfY3B1cygpOworCWlmIChu dW1fY3B1cyA8IDApIHsKKwkJbXV0ZXhfdW5sb2NrKCZ4ZW5fcGFkX2xvY2spOworCQlyZXR1cm47 CisJfQorCW11dGV4X3VubG9jaygmeGVuX3BhZF9sb2NrKTsKKworCXhlbl9hY3BpX3BhZF9vc3Qo aGFuZGxlLCAwLCBudW1fY3B1cyk7Cit9CisKK3N0YXRpYyB2b2lkIHhlbl9hY3BpX3BhZF9ub3Rp ZnkoYWNwaV9oYW5kbGUgaGFuZGxlLCB1MzIgZXZlbnQsCisJdm9pZCAqZGF0YSkKK3sKKwlzd2l0 Y2ggKGV2ZW50KSB7CisJY2FzZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX05PVElGWToKKwkJ eGVuX2FjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7CisJZGVmYXVsdDoK KwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVudCk7CisJCWJyZWFr OworCX0KK30KKworc3RhdGljIGludCB4ZW5fYWNwaV9wYWRfYWRkKHN0cnVjdCBhY3BpX2Rldmlj ZSAqZGV2aWNlKQoreworCWFjcGlfc3RhdHVzIHN0YXR1czsKKworCXN0cmNweShhY3BpX2Rldmlj ZV9uYW1lKGRldmljZSksIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfREVWSUNFX05BTUUpOwor CXN0cmNweShhY3BpX2RldmljZV9jbGFzcyhkZXZpY2UpLCBBQ1BJX1BST0NFU1NPUl9BR0dSRUdB VE9SX0NMQVNTKTsKKworCXN0YXR1cyA9IGFjcGlfaW5zdGFsbF9ub3RpZnlfaGFuZGxlcihkZXZp Y2UtPmhhbmRsZSwKKwkJIEFDUElfREVWSUNFX05PVElGWSwgeGVuX2FjcGlfcGFkX25vdGlmeSwg ZGV2aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVWOwor CisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgeGVuX2FjcGlfcGFkX3JlbW92ZShzdHJ1Y3Qg YWNwaV9kZXZpY2UgKmRldmljZSwKKwlpbnQgdHlwZSkKK3sKKwltdXRleF9sb2NrKCZ4ZW5fcGFk X2xvY2spOworCXhlbl9wYWRfc2V0X2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9w YWRfbG9jayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwK KwkJQUNQSV9ERVZJQ0VfTk9USUZZLCB4ZW5fYWNwaV9wYWRfbm90aWZ5KTsKKwlyZXR1cm4gMDsK K30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9pZCBwYWRfZGV2aWNlX2lkc1td ID0geworCXsiQUNQSTAwMEMiLCAwfSwKKwl7IiIsIDB9LAorfTsKKworc3RhdGljIHN0cnVjdCBh Y3BpX2RyaXZlciB4ZW5fYWNwaV9wYWRfZHJpdmVyID0geworCS5uYW1lID0gInByb2Nlc3Nvcl9h Z2dyZWdhdG9yIiwKKwkuY2xhc3MgPSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0NMQVNTLAor CS5pZHMgPSBwYWRfZGV2aWNlX2lkcywKKwkub3BzID0geworCQkuYWRkID0geGVuX2FjcGlfcGFk X2FkZCwKKwkJLnJlbW92ZSA9IHhlbl9hY3BpX3BhZF9yZW1vdmUsCisJfSwKK307CisKK3N0YXRp YyBpbnQgX19pbml0IHhlbl9hY3BpX3BhZF9pbml0KHZvaWQpCit7CisJaW50IHJldCA9IC1FTk9T WVM7CisJdW5zaWduZWQgaW50IHZlcnNpb24gPSBIWVBFUlZJU09SX3hlbl92ZXJzaW9uKFhFTlZF Ul92ZXJzaW9uLCBOVUxMKTsKKwl1bnNpZ25lZCBpbnQgbWFqb3IgPSB2ZXJzaW9uID4+IDE2Owor CXVuc2lnbmVkIGludCBtaW5vciA9IHZlcnNpb24gJiAweGZmZmY7CisKKwkvKiBPbmx5IERPTTAg aXMgcmVzcG9uc2libGUgZm9yIFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9t YWluKCkpCisJCXJldHVybiAtRU5PREVWOworCisJLyogT25seSBYZW40LjIgb3IgbGF0ZXIgc3Vw cG9ydCBYZW4gYWNwaSBwYWQgKi8KKwlpZiAoKChtYWpvciA9PSA0KSAmJiAobWlub3IgPj0gMikp IHx8IChtYWpvciA+IDQpKQorCQlyZXQgPSBhY3BpX2J1c19yZWdpc3Rlcl9kcml2ZXIoJnhlbl9h Y3BpX3BhZF9kcml2ZXIpOworCisJcmV0dXJuIHJldDsKK30KK3N1YnN5c19pbml0Y2FsbCh4ZW5f YWNwaV9wYWRfaW5pdCk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZv cm0uaCBiL2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCmluZGV4IDQ3NTViNWYuLmEz YmU1NGMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCisrKyBi L2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCkBAIC0zMjQsNiArMzI0LDIyIEBAIHN0 cnVjdCB4ZW5wZl9jcHVfb2wgewogfTsKIERFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBm X2NwdV9vbCk7CiAKKy8qCisgKiBDTUQgNTggYW5kIDU5IGFyZSByZXNlcnZlZCBmb3IgY3B1IGhv dGFkZCBhbmQgbWVtb3J5IGhvdGFkZCwKKyAqIHdoaWNoIGFyZSBhbHJlYWR5IG9jY3VwaWVkIGF0 IFhlbiBoeXBlcnZpc29yIHNpZGUuCisgKi8KKyNkZWZpbmUgWEVOUEZfY29yZV9wYXJraW5nCTYw CitzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nIHsKKwkvKiBJTiB2YXJpYWJsZXMgKi8KKyNkZWZp bmUgWEVOX0NPUkVfUEFSS0lOR19TRVQJMQorI2RlZmluZSBYRU5fQ09SRV9QQVJLSU5HX0dFVAky CisJdWludDMyX3QgdHlwZTsKKwkvKiBJTiB2YXJpYWJsZXM6ICBzZXQgY3B1IG51bXMgZXhwZWN0 ZWQgdG8gYmUgaWRsZWQgKi8KKwkvKiBPVVQgdmFyaWFibGVzOiBnZXQgY3B1IG51bXMgYWN0dWFs bHkgYmUgaWRsZWQgKi8KKwl1aW50MzJfdCBpZGxlX251bXM7Cit9OworREVGSU5FX0dVRVNUX0hB TkRMRV9TVFJVQ1QoeGVucGZfY29yZV9wYXJraW5nKTsKKwogc3RydWN0IHhlbl9wbGF0Zm9ybV9v cCB7CiAJdWludDMyX3QgY21kOwogCXVpbnQzMl90IGludGVyZmFjZV92ZXJzaW9uOyAvKiBYRU5Q Rl9JTlRFUkZBQ0VfVkVSU0lPTiAqLwpAQCAtMzQxLDYgKzM1Nyw3IEBAIHN0cnVjdCB4ZW5fcGxh dGZvcm1fb3AgewogCQlzdHJ1Y3QgeGVucGZfc2V0X3Byb2Nlc3Nvcl9wbWluZm8gc2V0X3BtaW5m bzsKIAkJc3RydWN0IHhlbnBmX3BjcHVpbmZvICAgICAgICAgIHBjcHVfaW5mbzsKIAkJc3RydWN0 IHhlbnBmX2NwdV9vbCAgICAgICAgICAgIGNwdV9vbDsKKwkJc3RydWN0IHhlbnBmX2NvcmVfcGFy a2luZyAgICAgIGNvcmVfcGFya2luZzsKIAkJdWludDhfdCAgICAgICAgICAgICAgICAgICAgICAg IHBhZFsxMjhdOwogCX0gdTsKIH07Ci0tIAoxLjcuMQoK --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 01 06:36:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:36:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToNb-0002Tr-8x; Thu, 01 Nov 2012 06:35:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToNZ-0002Tm-BV for xen-devel@lists.xen.org; Thu, 01 Nov 2012 06:35:49 +0000 Received: from [193.109.254.147:19233] by server-4.bemta-14.messagelabs.com id 65/01-18856-44812905; Thu, 01 Nov 2012 06:35:48 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1351751745!2358914!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzc4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7071 invoked from network); 1 Nov 2012 06:35:46 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-15.tower-27.messagelabs.com with SMTP; 1 Nov 2012 06:35:46 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 31 Oct 2012 23:35:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,691,1344236400"; d="scan'208,223";a="213837549" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 31 Oct 2012 23:35:45 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:35:44 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 14:34:46 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNs7Z0Ti91BiFLfUibRvXA4zlK85fUjX6A Date: Thu, 1 Nov 2012 06:34:45 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> In-Reply-To: <20121026201409.GF2708@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks! updated as attached. Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 1 Nov 2012 21:02:36 +0800 Subject: [PATCH 1/2] Xen acpi pad implement PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and very thin logic level, would take over acpi pad staff. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object and then hypercall to hyervisor for the rest work, say, core parking. Signed-off-by: Liu, Jinsong --- drivers/xen/Makefile | 1 + drivers/xen/xen_acpi_pad.c | 206 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 +++ 3 files changed, 224 insertions(+), 0 deletions(-) create mode 100644 drivers/xen/xen_acpi_pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..a2af622 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) +=3D mcelog.o obj-$(CONFIG_XEN_PCIDEV_BACKEND) +=3D xen-pciback/ obj-$(CONFIG_XEN_PRIVCMD) +=3D xen-privcmd.o obj-$(CONFIG_XEN_ACPI_PROCESSOR) +=3D xen-acpi-processor.o +obj-$(CONFIG_XEN_DOM0) +=3D xen_acpi_pad.o xen-evtchn-y :=3D evtchn.o xen-gntdev-y :=3D gntdev.o xen-gntalloc-y :=3D gntalloc.o diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c new file mode 100644 index 0000000..e8c26a4 --- /dev/null +++ b/drivers/xen/xen_acpi_pad.c @@ -0,0 +1,206 @@ +/* + * xen_acpi_pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 + +static DEFINE_MUTEX(xen_pad_lock); + +static int xen_pad_set_idle_cpus(int num_cpus) +{ + struct xen_platform_op op; + + if (num_cpus < 0) + return -EINVAL; + + /* set cpu nums expected to be idled */ + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D num_cpus; + + return HYPERVISOR_dom0_op(&op); +} + +/* + * Cannot get idle cpus by using hypercall once (shared with _SET) + * because of the characteristic of Xen continue_hypercall_on_cpu + */ +static int xen_pad_get_idle_cpus(void) +{ + int ret; + struct xen_platform_op op; + + /* get cpu nums actually be idled */ + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + ret =3D HYPERVISOR_dom0_op(&op); + if (ret < 0) + return ret; + + return op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int xen_acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void xen_acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_cpus) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_cpus; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void xen_acpi_pad_handle_notify(acpi_handle handle) +{ + int num_cpus; + + num_cpus =3D xen_acpi_pad_pur(handle); + if (num_cpus < 0) + return; + + mutex_lock(&xen_pad_lock); + if (xen_pad_set_idle_cpus(num_cpus)) { + mutex_unlock(&xen_pad_lock); + return; + } + + num_cpus =3D xen_pad_get_idle_cpus(); + if (num_cpus < 0) { + mutex_unlock(&xen_pad_lock); + return; + } + mutex_unlock(&xen_pad_lock); + + xen_acpi_pad_ost(handle, 0, num_cpus); +} + +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + xen_acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int xen_acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int xen_acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_pad_lock); + xen_pad_set_idle_cpus(0); + mutex_unlock(&xen_pad_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver xen_acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D xen_acpi_pad_add, + .remove =3D xen_acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + int ret =3D -ENOSYS; + unsigned int version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + unsigned int major =3D version >> 16; + unsigned int minor =3D version & 0xffff; + + /* Only DOM0 is responsible for Xen acpi pad */ + if (!xen_initial_domain()) + return -ENODEV; + + /* Only Xen4.2 or later support Xen acpi pad */ + if (((major =3D=3D 4) && (minor >=3D 2)) || (major > 4)) + ret =3D acpi_bus_register_driver(&xen_acpi_pad_driver); + + return ret; +} +subsys_initcall(xen_acpi_pad_init); diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..a3be54c 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-pad-implement.patch" Content-Description: 0001-Xen-acpi-pad-implement.patch Content-Disposition: attachment; filename="0001-Xen-acpi-pad-implement.patch"; size=8184; creation-date="Thu, 01 Nov 2012 06:25:57 GMT"; modification-date="Thu, 01 Nov 2012 13:29:12 GMT" Content-Transfer-Encoding: base64 RnJvbSBmNTE0Yjk3NjI4OTQ1Y2ZhYzAwZWZiMGQ0NTZmMTMzZDQ0NzU0YzlkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCAxIE5vdiAyMDEyIDIxOjAyOjM2ICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbiBhY3BpIHBhZCBpbXBsZW1lbnQKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdhdG9y IERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRoZSBw bGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFuZCBj b250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0uCgpU aGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVubmlu ZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90IHdv cmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHZlcnkgdGhp biBsb2dpYyBsZXZlbCwgd291bGQgdGFrZSBvdmVyIGFjcGkgcGFkIHN0YWZmLgpXaGVuIGFjcGkg cGFkIG5vdGlmeSBPU1BNLCB4ZW4gcGFkIGxvZ2ljIGludGVyY2VwdCBhbmQgcGFyc2UgX1BVUiBv YmplY3QKYW5kIHRoZW4gaHlwZXJjYWxsIHRvIGh5ZXJ2aXNvciBmb3IgdGhlIHJlc3Qgd29yaywg c2F5LCBjb3JlIHBhcmtpbmcuCgpTaWduZWQtb2ZmLWJ5OiBMaXUsIEppbnNvbmcgPGppbnNvbmcu bGl1QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3hlbi9NYWtlZmlsZSAgICAgICAgICAgICB8ICAg IDEgKwogZHJpdmVycy94ZW4veGVuX2FjcGlfcGFkLmMgICAgICAgfCAgMjA2ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZv cm0uaCB8ICAgMTcgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDIyNCBpbnNlcnRpb25zKCspLCAwIGRl bGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMveGVuL3hlbl9hY3BpX3BhZC5j CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmls ZQppbmRleCAwZTg2MzcwLi5hMmFmNjIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmls ZQorKysgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQpAQCAtMjksNiArMjksNyBAQCBvYmotJChDT05G SUdfWEVOX01DRV9MT0cpCQkrPSBtY2Vsb2cubwogb2JqLSQoQ09ORklHX1hFTl9QQ0lERVZfQkFD S0VORCkJKz0geGVuLXBjaWJhY2svCiBvYmotJChDT05GSUdfWEVOX1BSSVZDTUQpCQkrPSB4ZW4t cHJpdmNtZC5vCiBvYmotJChDT05GSUdfWEVOX0FDUElfUFJPQ0VTU09SKQkrPSB4ZW4tYWNwaS1w cm9jZXNzb3Iubworb2JqLSQoQ09ORklHX1hFTl9ET00wKQkJCSs9IHhlbl9hY3BpX3BhZC5vCiB4 ZW4tZXZ0Y2huLXkJCQkJOj0gZXZ0Y2huLm8KIHhlbi1nbnRkZXYteQkJCQk6PSBnbnRkZXYubwog eGVuLWdudGFsbG9jLXkJCQkJOj0gZ250YWxsb2MubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4v eGVuX2FjcGlfcGFkLmMgYi9kcml2ZXJzL3hlbi94ZW5fYWNwaV9wYWQuYwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5lOGMyNmE0Ci0tLSAvZGV2L251bGwKKysrIGIvZHJpdmVy cy94ZW4veGVuX2FjcGlfcGFkLmMKQEAgLTAsMCArMSwyMDYgQEAKKy8qCisgKiB4ZW5fYWNwaV9w YWQuYyAtIFhlbiBwYWQgaW50ZXJmYWNlCisgKgorICogQ29weXJpZ2h0IChjKSAyMDEyLCBJbnRl bCBDb3Jwb3JhdGlvbi4KKyAqICAgIEF1dGhvcjogTGl1LCBKaW5zb25nIDxqaW5zb25nLmxpdUBp bnRlbC5jb20+CisgKgorICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g cmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQKKyAqIHVuZGVyIHRoZSB0ZXJtcyBhbmQg Y29uZGl0aW9ucyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UsCisgKiB2ZXJzaW9u IDIsIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLgorICoKKyAq IFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSBpdCB3aWxsIGJlIHVzZWZ1 bCwgYnV0IFdJVEhPVVQKKyAqIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVk IHdhcnJhbnR5IG9mIE1FUkNIQU5UQUJJTElUWSBvcgorICogRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvcgorICog bW9yZSBkZXRhaWxzLgorICovCisKKyNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4KKyNpbmNsdWRl IDxsaW51eC90eXBlcy5oPgorI2luY2x1ZGUgPGFjcGkvYWNwaV9idXMuaD4KKyNpbmNsdWRlIDxh Y3BpL2FjcGlfZHJpdmVycy5oPgorI2luY2x1ZGUgPGFzbS94ZW4vaHlwZXJjYWxsLmg+CisjaW5j bHVkZSA8eGVuL2ludGVyZmFjZS92ZXJzaW9uLmg+CisKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1Jf QUdHUkVHQVRPUl9DTEFTUwkiYWNwaV9wYWQiCisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JF R0FUT1JfREVWSUNFX05BTUUgIlByb2Nlc3NvciBBZ2dyZWdhdG9yIgorI2RlZmluZSBBQ1BJX1BS T0NFU1NPUl9BR0dSRUdBVE9SX05PVElGWSAweDgwCisKK3N0YXRpYyBERUZJTkVfTVVURVgoeGVu X3BhZF9sb2NrKTsKKworc3RhdGljIGludCB4ZW5fcGFkX3NldF9pZGxlX2NwdXMoaW50IG51bV9j cHVzKQoreworCXN0cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3A7CisKKwlpZiAobnVtX2NwdXMgPCAw KQorCQlyZXR1cm4gLUVJTlZBTDsKKworCS8qIHNldCBjcHUgbnVtcyBleHBlY3RlZCB0byBiZSBp ZGxlZCAqLworCW9wLmNtZCA9IFhFTlBGX2NvcmVfcGFya2luZzsKKwlvcC51LmNvcmVfcGFya2lu Zy50eXBlID0gWEVOX0NPUkVfUEFSS0lOR19TRVQ7CisJb3AudS5jb3JlX3BhcmtpbmcuaWRsZV9u dW1zID0gbnVtX2NwdXM7CisKKwlyZXR1cm4gSFlQRVJWSVNPUl9kb20wX29wKCZvcCk7Cit9CisK Ky8qCisgKiBDYW5ub3QgZ2V0IGlkbGUgY3B1cyBieSB1c2luZyBoeXBlcmNhbGwgb25jZSAoc2hh cmVkIHdpdGggX1NFVCkKKyAqIGJlY2F1c2Ugb2YgdGhlIGNoYXJhY3RlcmlzdGljIG9mIFhlbiBj b250aW51ZV9oeXBlcmNhbGxfb25fY3B1CisgKi8KK3N0YXRpYyBpbnQgeGVuX3BhZF9nZXRfaWRs ZV9jcHVzKHZvaWQpCit7CisJaW50IHJldDsKKwlzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIG9wOwor CisJLyogZ2V0IGNwdSBudW1zIGFjdHVhbGx5IGJlIGlkbGVkICovCisJb3AuY21kID0gWEVOUEZf Y29yZV9wYXJraW5nOworCW9wLnUuY29yZV9wYXJraW5nLnR5cGUgPSBYRU5fQ09SRV9QQVJLSU5H X0dFVDsKKwlyZXQgPSBIWVBFUlZJU09SX2RvbTBfb3AoJm9wKTsKKwlpZiAocmV0IDwgMCkKKwkJ cmV0dXJuIHJldDsKKworCXJldHVybiBvcC51LmNvcmVfcGFya2luZy5pZGxlX251bXM7Cit9CisK Ky8qCisgKiBRdWVyeSBmaXJtd2FyZSBob3cgbWFueSBDUFVzIHNob3VsZCBiZSBpZGxlCisgKiBy ZXR1cm4gLTEgb24gZmFpbHVyZQorICovCitzdGF0aWMgaW50IHhlbl9hY3BpX3BhZF9wdXIoYWNw aV9oYW5kbGUgaGFuZGxlKQoreworCXN0cnVjdCBhY3BpX2J1ZmZlciBidWZmZXIgPSB7QUNQSV9B TExPQ0FURV9CVUZGRVIsIE5VTEx9OworCXVuaW9uIGFjcGlfb2JqZWN0ICpwYWNrYWdlOworCWlu dCBudW0gPSAtMTsKKworCWlmIChBQ1BJX0ZBSUxVUkUoYWNwaV9ldmFsdWF0ZV9vYmplY3QoaGFu ZGxlLCAiX1BVUiIsIE5VTEwsICZidWZmZXIpKSkKKwkJcmV0dXJuIG51bTsKKworCWlmICghYnVm ZmVyLmxlbmd0aCB8fCAhYnVmZmVyLnBvaW50ZXIpCisJCXJldHVybiBudW07CisKKwlwYWNrYWdl ID0gYnVmZmVyLnBvaW50ZXI7CisKKwlpZiAocGFja2FnZS0+dHlwZSA9PSBBQ1BJX1RZUEVfUEFD S0FHRSAmJgorCQlwYWNrYWdlLT5wYWNrYWdlLmNvdW50ID09IDIgJiYKKwkJcGFja2FnZS0+cGFj a2FnZS5lbGVtZW50c1swXS5pbnRlZ2VyLnZhbHVlID09IDEpIC8qIHJldiAxICovCisKKwkJbnVt ID0gcGFja2FnZS0+cGFja2FnZS5lbGVtZW50c1sxXS5pbnRlZ2VyLnZhbHVlOworCisJa2ZyZWUo YnVmZmVyLnBvaW50ZXIpOworCXJldHVybiBudW07Cit9CisKKy8qIE5vdGlmeSBmaXJtd2FyZSBo b3cgbWFueSBDUFVzIGFyZSBpZGxlICovCitzdGF0aWMgdm9pZCB4ZW5fYWNwaV9wYWRfb3N0KGFj cGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMyX3QgaWRsZV9jcHVzKQoreworCXVu aW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVH RVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9U WVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2JqZWN0X2xpc3QgYXJnX2xpc3QgPSB7 MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZhbHVlID0gQUNQSV9QUk9DRVNTT1Jf QUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVnZXIudmFsdWUgPSAgc3RhdDsKKwlw YXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1zWzJdLmJ1ZmZlci5wb2ludGVyID0g KHZvaWQgKikmaWRsZV9jcHVzOworCWFjcGlfZXZhbHVhdGVfb2JqZWN0KGhhbmRsZSwgIl9PU1Qi LCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9pZCB4ZW5fYWNwaV9wYWRfaGFuZGxl X25vdGlmeShhY3BpX2hhbmRsZSBoYW5kbGUpCit7CisJaW50IG51bV9jcHVzOworCisJbnVtX2Nw dXMgPSB4ZW5fYWNwaV9wYWRfcHVyKGhhbmRsZSk7CisJaWYgKG51bV9jcHVzIDwgMCkKKwkJcmV0 dXJuOworCisJbXV0ZXhfbG9jaygmeGVuX3BhZF9sb2NrKTsKKwlpZiAoeGVuX3BhZF9zZXRfaWRs ZV9jcHVzKG51bV9jcHVzKSkgeworCQltdXRleF91bmxvY2soJnhlbl9wYWRfbG9jayk7CisJCXJl dHVybjsKKwl9CisKKwludW1fY3B1cyA9IHhlbl9wYWRfZ2V0X2lkbGVfY3B1cygpOworCWlmIChu dW1fY3B1cyA8IDApIHsKKwkJbXV0ZXhfdW5sb2NrKCZ4ZW5fcGFkX2xvY2spOworCQlyZXR1cm47 CisJfQorCW11dGV4X3VubG9jaygmeGVuX3BhZF9sb2NrKTsKKworCXhlbl9hY3BpX3BhZF9vc3Qo aGFuZGxlLCAwLCBudW1fY3B1cyk7Cit9CisKK3N0YXRpYyB2b2lkIHhlbl9hY3BpX3BhZF9ub3Rp ZnkoYWNwaV9oYW5kbGUgaGFuZGxlLCB1MzIgZXZlbnQsCisJdm9pZCAqZGF0YSkKK3sKKwlzd2l0 Y2ggKGV2ZW50KSB7CisJY2FzZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX05PVElGWToKKwkJ eGVuX2FjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7CisJZGVmYXVsdDoK KwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVudCk7CisJCWJyZWFr OworCX0KK30KKworc3RhdGljIGludCB4ZW5fYWNwaV9wYWRfYWRkKHN0cnVjdCBhY3BpX2Rldmlj ZSAqZGV2aWNlKQoreworCWFjcGlfc3RhdHVzIHN0YXR1czsKKworCXN0cmNweShhY3BpX2Rldmlj ZV9uYW1lKGRldmljZSksIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfREVWSUNFX05BTUUpOwor CXN0cmNweShhY3BpX2RldmljZV9jbGFzcyhkZXZpY2UpLCBBQ1BJX1BST0NFU1NPUl9BR0dSRUdB VE9SX0NMQVNTKTsKKworCXN0YXR1cyA9IGFjcGlfaW5zdGFsbF9ub3RpZnlfaGFuZGxlcihkZXZp Y2UtPmhhbmRsZSwKKwkJIEFDUElfREVWSUNFX05PVElGWSwgeGVuX2FjcGlfcGFkX25vdGlmeSwg ZGV2aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVWOwor CisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgeGVuX2FjcGlfcGFkX3JlbW92ZShzdHJ1Y3Qg YWNwaV9kZXZpY2UgKmRldmljZSwKKwlpbnQgdHlwZSkKK3sKKwltdXRleF9sb2NrKCZ4ZW5fcGFk X2xvY2spOworCXhlbl9wYWRfc2V0X2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9w YWRfbG9jayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwK KwkJQUNQSV9ERVZJQ0VfTk9USUZZLCB4ZW5fYWNwaV9wYWRfbm90aWZ5KTsKKwlyZXR1cm4gMDsK K30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBhY3BpX2RldmljZV9pZCBwYWRfZGV2aWNlX2lkc1td ID0geworCXsiQUNQSTAwMEMiLCAwfSwKKwl7IiIsIDB9LAorfTsKKworc3RhdGljIHN0cnVjdCBh Y3BpX2RyaXZlciB4ZW5fYWNwaV9wYWRfZHJpdmVyID0geworCS5uYW1lID0gInByb2Nlc3Nvcl9h Z2dyZWdhdG9yIiwKKwkuY2xhc3MgPSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0NMQVNTLAor CS5pZHMgPSBwYWRfZGV2aWNlX2lkcywKKwkub3BzID0geworCQkuYWRkID0geGVuX2FjcGlfcGFk X2FkZCwKKwkJLnJlbW92ZSA9IHhlbl9hY3BpX3BhZF9yZW1vdmUsCisJfSwKK307CisKK3N0YXRp YyBpbnQgX19pbml0IHhlbl9hY3BpX3BhZF9pbml0KHZvaWQpCit7CisJaW50IHJldCA9IC1FTk9T WVM7CisJdW5zaWduZWQgaW50IHZlcnNpb24gPSBIWVBFUlZJU09SX3hlbl92ZXJzaW9uKFhFTlZF Ul92ZXJzaW9uLCBOVUxMKTsKKwl1bnNpZ25lZCBpbnQgbWFqb3IgPSB2ZXJzaW9uID4+IDE2Owor CXVuc2lnbmVkIGludCBtaW5vciA9IHZlcnNpb24gJiAweGZmZmY7CisKKwkvKiBPbmx5IERPTTAg aXMgcmVzcG9uc2libGUgZm9yIFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9t YWluKCkpCisJCXJldHVybiAtRU5PREVWOworCisJLyogT25seSBYZW40LjIgb3IgbGF0ZXIgc3Vw cG9ydCBYZW4gYWNwaSBwYWQgKi8KKwlpZiAoKChtYWpvciA9PSA0KSAmJiAobWlub3IgPj0gMikp IHx8IChtYWpvciA+IDQpKQorCQlyZXQgPSBhY3BpX2J1c19yZWdpc3Rlcl9kcml2ZXIoJnhlbl9h Y3BpX3BhZF9kcml2ZXIpOworCisJcmV0dXJuIHJldDsKK30KK3N1YnN5c19pbml0Y2FsbCh4ZW5f YWNwaV9wYWRfaW5pdCk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZv cm0uaCBiL2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCmluZGV4IDQ3NTViNWYuLmEz YmU1NGMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCisrKyBi L2luY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCkBAIC0zMjQsNiArMzI0LDIyIEBAIHN0 cnVjdCB4ZW5wZl9jcHVfb2wgewogfTsKIERFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBm X2NwdV9vbCk7CiAKKy8qCisgKiBDTUQgNTggYW5kIDU5IGFyZSByZXNlcnZlZCBmb3IgY3B1IGhv dGFkZCBhbmQgbWVtb3J5IGhvdGFkZCwKKyAqIHdoaWNoIGFyZSBhbHJlYWR5IG9jY3VwaWVkIGF0 IFhlbiBoeXBlcnZpc29yIHNpZGUuCisgKi8KKyNkZWZpbmUgWEVOUEZfY29yZV9wYXJraW5nCTYw CitzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nIHsKKwkvKiBJTiB2YXJpYWJsZXMgKi8KKyNkZWZp bmUgWEVOX0NPUkVfUEFSS0lOR19TRVQJMQorI2RlZmluZSBYRU5fQ09SRV9QQVJLSU5HX0dFVAky CisJdWludDMyX3QgdHlwZTsKKwkvKiBJTiB2YXJpYWJsZXM6ICBzZXQgY3B1IG51bXMgZXhwZWN0 ZWQgdG8gYmUgaWRsZWQgKi8KKwkvKiBPVVQgdmFyaWFibGVzOiBnZXQgY3B1IG51bXMgYWN0dWFs bHkgYmUgaWRsZWQgKi8KKwl1aW50MzJfdCBpZGxlX251bXM7Cit9OworREVGSU5FX0dVRVNUX0hB TkRMRV9TVFJVQ1QoeGVucGZfY29yZV9wYXJraW5nKTsKKwogc3RydWN0IHhlbl9wbGF0Zm9ybV9v cCB7CiAJdWludDMyX3QgY21kOwogCXVpbnQzMl90IGludGVyZmFjZV92ZXJzaW9uOyAvKiBYRU5Q Rl9JTlRFUkZBQ0VfVkVSU0lPTiAqLwpAQCAtMzQxLDYgKzM1Nyw3IEBAIHN0cnVjdCB4ZW5fcGxh dGZvcm1fb3AgewogCQlzdHJ1Y3QgeGVucGZfc2V0X3Byb2Nlc3Nvcl9wbWluZm8gc2V0X3BtaW5m bzsKIAkJc3RydWN0IHhlbnBmX3BjcHVpbmZvICAgICAgICAgIHBjcHVfaW5mbzsKIAkJc3RydWN0 IHhlbnBmX2NwdV9vbCAgICAgICAgICAgIGNwdV9vbDsKKwkJc3RydWN0IHhlbnBmX2NvcmVfcGFy a2luZyAgICAgIGNvcmVfcGFya2luZzsKIAkJdWludDhfdCAgICAgICAgICAgICAgICAgICAgICAg IHBhZFsxMjhdOwogCX0gdTsKIH07Ci0tIAoxLjcuMQoK --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC8292335377346SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 01 06:39:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:39:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToQt-0002f0-5e; Thu, 01 Nov 2012 06:39:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToQr-0002eu-U9 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:39:14 +0000 Received: from [85.158.139.83:56213] by server-9.bemta-5.messagelabs.com id E3/97-29295-11912905; Thu, 01 Nov 2012 06:39:13 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1351751951!25529376!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzc4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8447 invoked from network); 1 Nov 2012 06:39:12 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-4.tower-182.messagelabs.com with SMTP; 1 Nov 2012 06:39:12 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 31 Oct 2012 23:38:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,691,1344236400"; d="scan'208,223";a="235568496" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 31 Oct 2012 23:38:50 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:38:50 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:38:50 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 14:38:42 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xensource.com" Thread-Topic: [PATCH 2/2] Revert pad config check in xen_check_mwait Thread-Index: Ac2yq1FN1e+6ZP87QOCrcigNApJpmAFT/F+A Date: Thu, 1 Nov 2012 06:38:41 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_" MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] Revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Updated, adding version check at mwait routine. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 27e28963d4d25e4c998b5b5ea3828a02e6de9470 Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 1 Nov 2012 21:18:43 +0800 Subject: [PATCH 2/2] Revert pad config check in xen_check_mwait With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..9e22e41 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -297,6 +296,10 @@ static bool __init xen_check_mwait(void) uint32_t buf[3]; unsigned int ax, bx, cx, dx; unsigned int mwait_mask; + unsigned int version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + unsigned int major =3D version >> 16; + unsigned int minor =3D version & 0xffff; + =20 /* We need to determine whether it is OK to expose the MWAIT * capability to the kernel to harvest deeper than C3 states from ACPI @@ -309,6 +312,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (((major =3D=3D 4) && (minor < 2)) || (major < 4)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Revert-pad-config-check-in-xen_check_mwait.patch"; size=2139; creation-date="Thu, 01 Nov 2012 06:25:57 GMT"; modification-date="Thu, 01 Nov 2012 13:29:12 GMT" Content-Transfer-Encoding: base64 RnJvbSAyN2UyODk2M2Q0ZDI1ZTRjOTk4YjViNWVhMzgyOGEwMmU2ZGU5NDcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCAxIE5vdiAyMDEyIDIxOjE4OjQzICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFJldmVydCBwYWQgY29uZmlnIGNoZWNrIGluIHhlbl9jaGVja19td2FpdAoKV2l0aCBYZW4gYWNw aSBwYWQgbG9naWMgYWRkZWQgaW50byBrZXJuZWwsIHdlIGNhbiBub3cgcmV2ZXJ0IHhlbiBtd2Fp dCByZWxhdGVkCnBhdGNoIGRmODhiMmQ5NmUzNmQ5YTllMzI1YmZjZDEyZWI0NTY3MWNiYmM5Mzcu IFRoZSByZWFzb24gaXMsIHdoZW4gcnVubmluZyB1bmRlcgpuZXdlciBYZW4gcGxhdGZvcm0sIFhl biBwYWQgZHJpdmVyIHdvdWxkIGJlIGVhcmx5IGxvYWRlZCwgc28gbmF0aXZlIHBhZCBkcml2ZXIK d291bGQgZmFpbCB0byBiZSBsb2FkZWQsIGFuZCBoZW5jZSBubyBtd2FpdC9tb25pdG9yICNVRCBy aXNrIGFnYWluLgoKQW5vdGhlciBwb2ludCBpcywgb25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9y dCBYZW4gYWNwaSBwYWQsIHNvIHdlIHdvbid0IGV4cG9zZQptd2FpdCBjcHVpZCBjYXBhYmlsaXR5 IHdoZW4gcnVubmluZyB1bmRlciBvbGRlciBYZW4gcGxhdGZvcm0uCgpTaWduZWQtb2ZmLWJ5OiBM aXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vZW5s aWdodGVuLmMgfCAgIDE0ICsrKysrKysrKysrKy0tCiAxIGZpbGVzIGNoYW5nZWQsIDEyIGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL2VubGln aHRlbi5jIGIvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCmluZGV4IDU4NmQ4MzguLjllMjJlNDEg MTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYworKysgYi9hcmNoL3g4Ni94ZW4v ZW5saWdodGVuLmMKQEAgLTI4Nyw4ICsyODcsNyBAQCBzdGF0aWMgdm9pZCB4ZW5fY3B1aWQodW5z aWduZWQgaW50ICpheCwgdW5zaWduZWQgaW50ICpieCwKIAogc3RhdGljIGJvb2wgX19pbml0IHhl bl9jaGVja19td2FpdCh2b2lkKQogewotI2lmIGRlZmluZWQoQ09ORklHX0FDUEkpICYmICFkZWZp bmVkKENPTkZJR19BQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SKSAmJiBcCi0JIWRlZmluZWQoQ09O RklHX0FDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfTU9EVUxFKQorI2lmZGVmIENPTkZJR19BQ1BJ CiAJc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCBvcCA9IHsKIAkJLmNtZAkJCT0gWEVOUEZfc2V0X3By b2Nlc3Nvcl9wbWluZm8sCiAJCS51LnNldF9wbWluZm8uaWQJPSAtMSwKQEAgLTI5Nyw2ICsyOTYs MTAgQEAgc3RhdGljIGJvb2wgX19pbml0IHhlbl9jaGVja19td2FpdCh2b2lkKQogCXVpbnQzMl90 IGJ1ZlszXTsKIAl1bnNpZ25lZCBpbnQgYXgsIGJ4LCBjeCwgZHg7CiAJdW5zaWduZWQgaW50IG13 YWl0X21hc2s7CisJdW5zaWduZWQgaW50IHZlcnNpb24gPSBIWVBFUlZJU09SX3hlbl92ZXJzaW9u KFhFTlZFUl92ZXJzaW9uLCBOVUxMKTsKKwl1bnNpZ25lZCBpbnQgbWFqb3IgPSB2ZXJzaW9uID4+ IDE2OworCXVuc2lnbmVkIGludCBtaW5vciA9IHZlcnNpb24gJiAweGZmZmY7CisKIAogCS8qIFdl IG5lZWQgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgaXQgaXMgT0sgdG8gZXhwb3NlIHRoZSBNV0FJVAog CSAqIGNhcGFiaWxpdHkgdG8gdGhlIGtlcm5lbCB0byBoYXJ2ZXN0IGRlZXBlciB0aGFuIEMzIHN0 YXRlcyBmcm9tIEFDUEkKQEAgLTMwOSw2ICszMTIsMTMgQEAgc3RhdGljIGJvb2wgX19pbml0IHhl bl9jaGVja19td2FpdCh2b2lkKQogCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkpCiAJCXJldHVy biBmYWxzZTsKIAorCS8qCisJICogV2hlbiBydW5uaW5nIHVuZGVyIHBsYXRmb3JtIGVhcmxpZXIg dGhhbiBYZW40LjIsIGRvIG5vdCBleHBvc2UKKwkgKiBtd2FpdCwgdG8gYXZvaWQgdGhlIHJpc2sg b2YgbG9hZGluZyBuYXRpdmUgYWNwaSBwYWQgZHJpdmVyCisJICovCisJaWYgKCgobWFqb3IgPT0g NCkgJiYgKG1pbm9yIDwgMikpIHx8IChtYWpvciA8IDQpKQorCQlyZXR1cm4gZmFsc2U7CisKIAlh eCA9IDE7CiAJY3ggPSAwOwogCi0tIAoxLjcuMQoK --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 01 06:39:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 06:39:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToQt-0002f0-5e; Thu, 01 Nov 2012 06:39:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TToQr-0002eu-U9 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 06:39:14 +0000 Received: from [85.158.139.83:56213] by server-9.bemta-5.messagelabs.com id E3/97-29295-11912905; Thu, 01 Nov 2012 06:39:13 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1351751951!25529376!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzc4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8447 invoked from network); 1 Nov 2012 06:39:12 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-4.tower-182.messagelabs.com with SMTP; 1 Nov 2012 06:39:12 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 31 Oct 2012 23:38:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,691,1344236400"; d="scan'208,223";a="235568496" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 31 Oct 2012 23:38:50 -0700 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:38:50 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 31 Oct 2012 23:38:50 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 14:38:42 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xensource.com" Thread-Topic: [PATCH 2/2] Revert pad config check in xen_check_mwait Thread-Index: Ac2yq1FN1e+6ZP87QOCrcigNApJpmAFT/F+A Date: Thu, 1 Nov 2012 06:38:41 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_" MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] Revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Updated, adding version check at mwait routine. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From 27e28963d4d25e4c998b5b5ea3828a02e6de9470 Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 1 Nov 2012 21:18:43 +0800 Subject: [PATCH 2/2] Revert pad config check in xen_check_mwait With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..9e22e41 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -297,6 +296,10 @@ static bool __init xen_check_mwait(void) uint32_t buf[3]; unsigned int ax, bx, cx, dx; unsigned int mwait_mask; + unsigned int version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + unsigned int major =3D version >> 16; + unsigned int minor =3D version & 0xffff; + =20 /* We need to determine whether it is OK to expose the MWAIT * capability to the kernel to harvest deeper than C3 states from ACPI @@ -309,6 +312,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (((major =3D=3D 4) && (minor < 2)) || (major < 4)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Revert-pad-config-check-in-xen_check_mwait.patch"; size=2139; creation-date="Thu, 01 Nov 2012 06:25:57 GMT"; modification-date="Thu, 01 Nov 2012 13:29:12 GMT" Content-Transfer-Encoding: base64 RnJvbSAyN2UyODk2M2Q0ZDI1ZTRjOTk4YjViNWVhMzgyOGEwMmU2ZGU5NDcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCAxIE5vdiAyMDEyIDIxOjE4OjQzICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFJldmVydCBwYWQgY29uZmlnIGNoZWNrIGluIHhlbl9jaGVja19td2FpdAoKV2l0aCBYZW4gYWNw aSBwYWQgbG9naWMgYWRkZWQgaW50byBrZXJuZWwsIHdlIGNhbiBub3cgcmV2ZXJ0IHhlbiBtd2Fp dCByZWxhdGVkCnBhdGNoIGRmODhiMmQ5NmUzNmQ5YTllMzI1YmZjZDEyZWI0NTY3MWNiYmM5Mzcu IFRoZSByZWFzb24gaXMsIHdoZW4gcnVubmluZyB1bmRlcgpuZXdlciBYZW4gcGxhdGZvcm0sIFhl biBwYWQgZHJpdmVyIHdvdWxkIGJlIGVhcmx5IGxvYWRlZCwgc28gbmF0aXZlIHBhZCBkcml2ZXIK d291bGQgZmFpbCB0byBiZSBsb2FkZWQsIGFuZCBoZW5jZSBubyBtd2FpdC9tb25pdG9yICNVRCBy aXNrIGFnYWluLgoKQW5vdGhlciBwb2ludCBpcywgb25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9y dCBYZW4gYWNwaSBwYWQsIHNvIHdlIHdvbid0IGV4cG9zZQptd2FpdCBjcHVpZCBjYXBhYmlsaXR5 IHdoZW4gcnVubmluZyB1bmRlciBvbGRlciBYZW4gcGxhdGZvcm0uCgpTaWduZWQtb2ZmLWJ5OiBM aXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vZW5s aWdodGVuLmMgfCAgIDE0ICsrKysrKysrKysrKy0tCiAxIGZpbGVzIGNoYW5nZWQsIDEyIGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL2VubGln aHRlbi5jIGIvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCmluZGV4IDU4NmQ4MzguLjllMjJlNDEg MTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYworKysgYi9hcmNoL3g4Ni94ZW4v ZW5saWdodGVuLmMKQEAgLTI4Nyw4ICsyODcsNyBAQCBzdGF0aWMgdm9pZCB4ZW5fY3B1aWQodW5z aWduZWQgaW50ICpheCwgdW5zaWduZWQgaW50ICpieCwKIAogc3RhdGljIGJvb2wgX19pbml0IHhl bl9jaGVja19td2FpdCh2b2lkKQogewotI2lmIGRlZmluZWQoQ09ORklHX0FDUEkpICYmICFkZWZp bmVkKENPTkZJR19BQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SKSAmJiBcCi0JIWRlZmluZWQoQ09O RklHX0FDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfTU9EVUxFKQorI2lmZGVmIENPTkZJR19BQ1BJ CiAJc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCBvcCA9IHsKIAkJLmNtZAkJCT0gWEVOUEZfc2V0X3By b2Nlc3Nvcl9wbWluZm8sCiAJCS51LnNldF9wbWluZm8uaWQJPSAtMSwKQEAgLTI5Nyw2ICsyOTYs MTAgQEAgc3RhdGljIGJvb2wgX19pbml0IHhlbl9jaGVja19td2FpdCh2b2lkKQogCXVpbnQzMl90 IGJ1ZlszXTsKIAl1bnNpZ25lZCBpbnQgYXgsIGJ4LCBjeCwgZHg7CiAJdW5zaWduZWQgaW50IG13 YWl0X21hc2s7CisJdW5zaWduZWQgaW50IHZlcnNpb24gPSBIWVBFUlZJU09SX3hlbl92ZXJzaW9u KFhFTlZFUl92ZXJzaW9uLCBOVUxMKTsKKwl1bnNpZ25lZCBpbnQgbWFqb3IgPSB2ZXJzaW9uID4+ IDE2OworCXVuc2lnbmVkIGludCBtaW5vciA9IHZlcnNpb24gJiAweGZmZmY7CisKIAogCS8qIFdl IG5lZWQgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgaXQgaXMgT0sgdG8gZXhwb3NlIHRoZSBNV0FJVAog CSAqIGNhcGFiaWxpdHkgdG8gdGhlIGtlcm5lbCB0byBoYXJ2ZXN0IGRlZXBlciB0aGFuIEMzIHN0 YXRlcyBmcm9tIEFDUEkKQEAgLTMwOSw2ICszMTIsMTMgQEAgc3RhdGljIGJvb2wgX19pbml0IHhl bl9jaGVja19td2FpdCh2b2lkKQogCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkpCiAJCXJldHVy biBmYWxzZTsKIAorCS8qCisJICogV2hlbiBydW5uaW5nIHVuZGVyIHBsYXRmb3JtIGVhcmxpZXIg dGhhbiBYZW40LjIsIGRvIG5vdCBleHBvc2UKKwkgKiBtd2FpdCwgdG8gYXZvaWQgdGhlIHJpc2sg b2YgbG9hZGluZyBuYXRpdmUgYWNwaSBwYWQgZHJpdmVyCisJICovCisJaWYgKCgobWFqb3IgPT0g NCkgJiYgKG1pbm9yIDwgMikpIHx8IChtYWpvciA8IDQpKQorCQlyZXR1cm4gZmFsc2U7CisKIAlh eCA9IDE7CiAJY3ggPSAwOwogCi0tIAoxLjcuMQoK --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537735CSHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 01 08:04:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:04:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpl1-0004kZ-OL; Thu, 01 Nov 2012 08:04:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpl0-0004kU-3Y for xen-devel@lists.xen.org; Thu, 01 Nov 2012 08:04:06 +0000 Received: from [193.109.254.147:51233] by server-16.bemta-14.messagelabs.com id D7/ED-09215-5FC22905; Thu, 01 Nov 2012 08:04:05 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1351757043!3541323!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODI5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19196 invoked from network); 1 Nov 2012 08:04:04 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:04:04 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="213085810" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:04:03 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 04:04:02 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTpkv-0007os-Sx; Thu, 01 Nov 2012 08:04:02 +0000 Message-ID: <1351756924.25014.29.camel@hastur.hellion.org.uk> From: Ian Campbell To: Ronny Hegewald Date: Thu, 1 Nov 2012 09:02:04 +0100 In-Reply-To: <201211010218.14872.ronny.hegewald@online.de> References: <201211010218.14872.ronny.hegewald@online.de> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 02:18 +0000, Ronny Hegewald wrote: > When a config-file for a pv-domU has a vfb section with a vnc=0 option then a > "xl create" for that domU crashes with the message > > > xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' > failed. > > > and the domU hangs early in the start. > > This patch fixes the cause of the assertion and let the domU start normally. > > This problem exists since xen 4.2. This seems like a good fix, in order to for us to apply it please can you "sign off" as described in http://wiki.xen.org/wiki/Submitting_Xen_Patches#Signing_off_a_patch I do wonder if perhaps libxl__device_vfb_add ought to be gating a bunch of those accesses on vnc.enabled though. Ian. > > --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 > +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 > @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ > } > > libxl_defbool_setdefault(&vfb->vnc.findunused, true); > + } else { > + libxl_defbool_setdefault(&vfb->vnc.findunused, false); > } > > libxl_defbool_setdefault(&vfb->sdl.enable, false); > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 08:04:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:04:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpl1-0004kZ-OL; Thu, 01 Nov 2012 08:04:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpl0-0004kU-3Y for xen-devel@lists.xen.org; Thu, 01 Nov 2012 08:04:06 +0000 Received: from [193.109.254.147:51233] by server-16.bemta-14.messagelabs.com id D7/ED-09215-5FC22905; Thu, 01 Nov 2012 08:04:05 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1351757043!3541323!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODI5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19196 invoked from network); 1 Nov 2012 08:04:04 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:04:04 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="213085810" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:04:03 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 04:04:02 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTpkv-0007os-Sx; Thu, 01 Nov 2012 08:04:02 +0000 Message-ID: <1351756924.25014.29.camel@hastur.hellion.org.uk> From: Ian Campbell To: Ronny Hegewald Date: Thu, 1 Nov 2012 09:02:04 +0100 In-Reply-To: <201211010218.14872.ronny.hegewald@online.de> References: <201211010218.14872.ronny.hegewald@online.de> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 02:18 +0000, Ronny Hegewald wrote: > When a config-file for a pv-domU has a vfb section with a vnc=0 option then a > "xl create" for that domU crashes with the message > > > xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' > failed. > > > and the domU hangs early in the start. > > This patch fixes the cause of the assertion and let the domU start normally. > > This problem exists since xen 4.2. This seems like a good fix, in order to for us to apply it please can you "sign off" as described in http://wiki.xen.org/wiki/Submitting_Xen_Patches#Signing_off_a_patch I do wonder if perhaps libxl__device_vfb_add ought to be gating a bunch of those accesses on vnc.enabled though. Ian. > > --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 > +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 > @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ > } > > libxl_defbool_setdefault(&vfb->vnc.findunused, true); > + } else { > + libxl_defbool_setdefault(&vfb->vnc.findunused, false); > } > > libxl_defbool_setdefault(&vfb->sdl.enable, false); > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 08:13:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:13:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTptx-00050e-P6; Thu, 01 Nov 2012 08:13:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTptw-00050Z-DX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:13:20 +0000 Received: from [85.158.143.99:39854] by server-3.bemta-4.messagelabs.com id 98/C1-06841-F1F22905; Thu, 01 Nov 2012 08:13:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1351757598!22904955!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA0NTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5525 invoked from network); 1 Nov 2012 08:13:19 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:13:19 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="43115760" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:13:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 04:13:17 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTpts-0008EJ-On; Thu, 01 Nov 2012 08:13:16 +0000 Message-ID: <1351757479.25014.31.camel@hastur.hellion.org.uk> From: Ian Campbell To: Lenar Shakirov Date: Thu, 1 Nov 2012 09:11:19 +0100 In-Reply-To: <50913EC6.3040105@zarafa.cg.ru> References: <50913EC6.3040105@zarafa.cg.ru> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich , =?UTF-8?Q?=D0=AE=D1=81=D1=83=D0=BF=D0=BE=D0=B2_=D0=A0=D0=B0=D0=B4?= =?UTF-8?Q?=D0=B8=D0=BA?= Subject: Re: [Xen-devel] Xen 4.1.3 booting VM from phy:/dev/cdrom regression X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-10-31 at 15:07 +0000, Lenar Shakirov wrote: > Hi, > > I have the regression with booting VM from "phy:/dev/cdrom" on xen > 4.1.3, but it works with 4.1.2. > > Backport of commit > http://xenbits.xen.org/gitweb/?p=qemu-xen-4.2-testing.git;a=commit;h=effd5676225761abdab90becac519716515c3be4 to 4.1.3 fix my trouble. CCing Ian J (tools backport maintainer) and Jan (stable branch maintainer). The referenced patch is a revert so presumably the original patch should not have been backported in the first place. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 08:13:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:13:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTptx-00050e-P6; Thu, 01 Nov 2012 08:13:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTptw-00050Z-DX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:13:20 +0000 Received: from [85.158.143.99:39854] by server-3.bemta-4.messagelabs.com id 98/C1-06841-F1F22905; Thu, 01 Nov 2012 08:13:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1351757598!22904955!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA0NTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5525 invoked from network); 1 Nov 2012 08:13:19 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:13:19 -0000 X-IronPort-AV: E=Sophos;i="4.80,691,1344211200"; d="scan'208";a="43115760" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:13:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 04:13:17 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTpts-0008EJ-On; Thu, 01 Nov 2012 08:13:16 +0000 Message-ID: <1351757479.25014.31.camel@hastur.hellion.org.uk> From: Ian Campbell To: Lenar Shakirov Date: Thu, 1 Nov 2012 09:11:19 +0100 In-Reply-To: <50913EC6.3040105@zarafa.cg.ru> References: <50913EC6.3040105@zarafa.cg.ru> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich , =?UTF-8?Q?=D0=AE=D1=81=D1=83=D0=BF=D0=BE=D0=B2_=D0=A0=D0=B0=D0=B4?= =?UTF-8?Q?=D0=B8=D0=BA?= Subject: Re: [Xen-devel] Xen 4.1.3 booting VM from phy:/dev/cdrom regression X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-10-31 at 15:07 +0000, Lenar Shakirov wrote: > Hi, > > I have the regression with booting VM from "phy:/dev/cdrom" on xen > 4.1.3, but it works with 4.1.2. > > Backport of commit > http://xenbits.xen.org/gitweb/?p=qemu-xen-4.2-testing.git;a=commit;h=effd5676225761abdab90becac519716515c3be4 to 4.1.3 fix my trouble. CCing Ian J (tools backport maintainer) and Jan (stable branch maintainer). The referenced patch is a revert so presumably the original patch should not have been backported in the first place. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 08:48:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:48:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTqRm-0005f7-Og; Thu, 01 Nov 2012 08:48:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTqRk-0005f2-IP for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:48:16 +0000 Received: from [85.158.137.99:56518] by server-2.bemta-3.messagelabs.com id 56/01-04744-F4732905; Thu, 01 Nov 2012 08:48:15 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1351759693!12207203!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9536 invoked from network); 1 Nov 2012 08:48:15 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:48:15 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="15532527" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:48:07 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 08:48:06 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTqRa-0001BA-Gn; Thu, 01 Nov 2012 08:48:06 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTqRa-0006RC-B8; Thu, 01 Nov 2012 08:48:06 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 08:48:06 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14289: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14289 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14289/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14179 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14179 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14179 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14179 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass version targeted for testing: xen bf249cd5f2c1 baseline version: xen bf249cd5f2c1 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 08:48:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 08:48:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTqRm-0005f7-Og; Thu, 01 Nov 2012 08:48:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTqRk-0005f2-IP for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:48:16 +0000 Received: from [85.158.137.99:56518] by server-2.bemta-3.messagelabs.com id 56/01-04744-F4732905; Thu, 01 Nov 2012 08:48:15 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1351759693!12207203!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY3OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9536 invoked from network); 1 Nov 2012 08:48:15 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:48:15 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="15532527" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 08:48:07 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 08:48:06 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTqRa-0001BA-Gn; Thu, 01 Nov 2012 08:48:06 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTqRa-0006RC-B8; Thu, 01 Nov 2012 08:48:06 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 08:48:06 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14289: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14289 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14289/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14179 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14179 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14179 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14179 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass version targeted for testing: xen bf249cd5f2c1 baseline version: xen bf249cd5f2c1 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:03:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:03:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsYP-0007xt-DS; Thu, 01 Nov 2012 11:03:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsYN-0007xm-K5 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:03:15 +0000 Received: from [85.158.139.83:61262] by server-6.bemta-5.messagelabs.com id 05/9D-19321-2F652905; Thu, 01 Nov 2012 11:03:14 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1351767793!28277907!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25222 invoked from network); 1 Nov 2012 11:03:13 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 11:03:13 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTsYJ-000GJb-Qi; Thu, 01 Nov 2012 11:03:11 +0000 Date: Thu, 1 Nov 2012 11:03:11 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121101110311.GB61948@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Robert, I've spent a bit more time digging around and I think I have a better idea of why you've done things the way you did. The 'simple' version I was thinking of doesn't work as well as I thought. :| At 13:45 -0400 on 22 Oct (1350913547), Robert Phillips wrote: > I believe the bug was toward the end of the function where it used to > call clear_page(l1) The function copies bits from l1 into a temporary > bitmap, then copies them from there to the user-provided dirty_bitmap. > When it's done, it clears the page at l1. But two framebuffers might > cohabit that page, not overlapping but at distinction areas within it. > Reading the dirtiness for one frame buffer and then clearing the whole > page wipes out information "owned" by the other frame buffer. This > bug would not show up if there is only one frame buffer so your live > migration code is ok. Yep, understood. > And when it's time to look for dirty bits, we know precisely which > PTEs to look at. The old code used to scan all page tables > periodically and we would see a performance hit with precisely that > periodicity. Was this caused by the 2-second timeout where it would try to unmap the vram if it hadn't been dirtied in that time? Were you finding that it would unmap and then immediately try to map it again? > One unfortunate bit of complexity relates to the fact that several > PTEs can map to the same guest physical page. We have to bookkeep > them all The old code basically relied on this not happening (assuming that framebuffers would be mapped only once). Is that assumption just wrong? Is it broken by things like DirectX? > so each PTEs that maps to a guest physical page must be > represented by its own dv_paddr_link, and, for the set that relate to > the same guest page, they are all linked together. The head of the > linked list is the entry in the range's pl_tab array that corresponds > to that guest physical page. Right; you've built a complete reverse mapping from pfn to ptes. > re: " since we already maintain a sparse bitmap to hold the dirty log" > I don't believe the dirty log is maintained except when page_mode is set for PG_log_dirty. > That mode exists for live migrate and the discipline for entering/leaving it is quite different than the finer granularity needed for dirty vram. Sorry, I had got confused there. I was thinking that we could move over more to PG_log_dirty-style operation, where we'd trap on writes and update the bitmap (since we now keep that bitmap as a trie the sparseness would be OK). But on closer inspection the cost of clearing all the mappings when the bitmap is cleared would be either too much overhead (throw away _all_ shadows every time) or about as complex as the mechanism needed to scan the _PAGE_DIRTY bits. I think I have a better idea of the intention of the patch now; I'll go over the code in detail today. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:03:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:03:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsYP-0007xt-DS; Thu, 01 Nov 2012 11:03:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsYN-0007xm-K5 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:03:15 +0000 Received: from [85.158.139.83:61262] by server-6.bemta-5.messagelabs.com id 05/9D-19321-2F652905; Thu, 01 Nov 2012 11:03:14 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-182.messagelabs.com!1351767793!28277907!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25222 invoked from network); 1 Nov 2012 11:03:13 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 11:03:13 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTsYJ-000GJb-Qi; Thu, 01 Nov 2012 11:03:11 +0000 Date: Thu, 1 Nov 2012 11:03:11 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121101110311.GB61948@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Robert, I've spent a bit more time digging around and I think I have a better idea of why you've done things the way you did. The 'simple' version I was thinking of doesn't work as well as I thought. :| At 13:45 -0400 on 22 Oct (1350913547), Robert Phillips wrote: > I believe the bug was toward the end of the function where it used to > call clear_page(l1) The function copies bits from l1 into a temporary > bitmap, then copies them from there to the user-provided dirty_bitmap. > When it's done, it clears the page at l1. But two framebuffers might > cohabit that page, not overlapping but at distinction areas within it. > Reading the dirtiness for one frame buffer and then clearing the whole > page wipes out information "owned" by the other frame buffer. This > bug would not show up if there is only one frame buffer so your live > migration code is ok. Yep, understood. > And when it's time to look for dirty bits, we know precisely which > PTEs to look at. The old code used to scan all page tables > periodically and we would see a performance hit with precisely that > periodicity. Was this caused by the 2-second timeout where it would try to unmap the vram if it hadn't been dirtied in that time? Were you finding that it would unmap and then immediately try to map it again? > One unfortunate bit of complexity relates to the fact that several > PTEs can map to the same guest physical page. We have to bookkeep > them all The old code basically relied on this not happening (assuming that framebuffers would be mapped only once). Is that assumption just wrong? Is it broken by things like DirectX? > so each PTEs that maps to a guest physical page must be > represented by its own dv_paddr_link, and, for the set that relate to > the same guest page, they are all linked together. The head of the > linked list is the entry in the range's pl_tab array that corresponds > to that guest physical page. Right; you've built a complete reverse mapping from pfn to ptes. > re: " since we already maintain a sparse bitmap to hold the dirty log" > I don't believe the dirty log is maintained except when page_mode is set for PG_log_dirty. > That mode exists for live migrate and the discipline for entering/leaving it is quite different than the finer granularity needed for dirty vram. Sorry, I had got confused there. I was thinking that we could move over more to PG_log_dirty-style operation, where we'd trap on writes and update the bitmap (since we now keep that bitmap as a trie the sparseness would be OK). But on closer inspection the cost of clearing all the mappings when the bitmap is cleared would be either too much overhead (throw away _all_ shadows every time) or about as complex as the mechanism needed to scan the _PAGE_DIRTY bits. I think I have a better idea of the intention of the patch now; I'll go over the code in detail today. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:05:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:05:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsa2-00082A-UL; Thu, 01 Nov 2012 11:04:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpyV-0005Bz-18 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:18:03 +0000 Received: from [85.158.143.35:16211] by server-3.bemta-4.messagelabs.com id D9/36-06841-A3032905; Thu, 01 Nov 2012 08:18:02 +0000 X-Env-Sender: weiyj.lk@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1351757879!11716670!1 X-Originating-IP: [209.85.216.50] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7778 invoked from network); 1 Nov 2012 08:18:01 -0000 Received: from mail-qa0-f50.google.com (HELO mail-qa0-f50.google.com) (209.85.216.50) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:18:01 -0000 Received: by mail-qa0-f50.google.com with SMTP id t11so86136qaa.9 for ; Thu, 01 Nov 2012 01:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=xYjK2ZUt1Jpw8/fba39Tv9HYhaRUlnkKSKyjh+dA4Gc=; b=iiJui2QYiVtgpNSh872PiWLKUwSqatCqLDBXOVayTWCkTmwX1NELJSYpgBtp7IMq0f QcKT/8qn5pFVQvrlX2bNql4DC0910MTZTE9EqZMyDux0DGzy4dEpA54dgwmLNeSbMvhg jF40/WXhUJsyjoDkegVorvbMqYdYkQeRlPwvuEFtOtf8EoVyW1PXnboYBhSwMD28I/TA V8AOH6kLnFLHR5pfDDMv3MOaMaP7oE7IWesqwRK3fcnz758ji9nAZgTB8BJB2papTSjg yo9g9EZIfrOV8qX8Ou5UDtugaFuoEbnPo2Yb5b3lM6z3ZZDsQ2CE/wgSaMjEgZpcxl7V KMQA== MIME-Version: 1.0 Received: by 10.224.222.141 with SMTP id ig13mr21623855qab.75.1351757879649; Thu, 01 Nov 2012 01:17:59 -0700 (PDT) Received: by 10.229.207.197 with HTTP; Thu, 1 Nov 2012 01:17:59 -0700 (PDT) Date: Thu, 1 Nov 2012 16:17:59 +0800 Message-ID: From: Wei Yongjun To: konrad.wilk@oracle.com, jeremy@goop.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, mukesh.rathor@oracle.com X-Mailman-Approved-At: Thu, 01 Nov 2012 11:04:57 +0000 Cc: linux-kernel@vger.kernel.org, yongjun_wei@trendmicro.com.cn, x86@kernel.org, xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org Subject: [Xen-devel] [PATCH -next] xen/x86: remove duplicated include from enlighten.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org From: Wei Yongjun Remove duplicated include. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun --- arch/x86/xen/enlighten.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index eb9a567..4c694a7 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:05:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:05:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsa2-00082A-UL; Thu, 01 Nov 2012 11:04:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTpyV-0005Bz-18 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 08:18:03 +0000 Received: from [85.158.143.35:16211] by server-3.bemta-4.messagelabs.com id D9/36-06841-A3032905; Thu, 01 Nov 2012 08:18:02 +0000 X-Env-Sender: weiyj.lk@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1351757879!11716670!1 X-Originating-IP: [209.85.216.50] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7778 invoked from network); 1 Nov 2012 08:18:01 -0000 Received: from mail-qa0-f50.google.com (HELO mail-qa0-f50.google.com) (209.85.216.50) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 08:18:01 -0000 Received: by mail-qa0-f50.google.com with SMTP id t11so86136qaa.9 for ; Thu, 01 Nov 2012 01:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=xYjK2ZUt1Jpw8/fba39Tv9HYhaRUlnkKSKyjh+dA4Gc=; b=iiJui2QYiVtgpNSh872PiWLKUwSqatCqLDBXOVayTWCkTmwX1NELJSYpgBtp7IMq0f QcKT/8qn5pFVQvrlX2bNql4DC0910MTZTE9EqZMyDux0DGzy4dEpA54dgwmLNeSbMvhg jF40/WXhUJsyjoDkegVorvbMqYdYkQeRlPwvuEFtOtf8EoVyW1PXnboYBhSwMD28I/TA V8AOH6kLnFLHR5pfDDMv3MOaMaP7oE7IWesqwRK3fcnz758ji9nAZgTB8BJB2papTSjg yo9g9EZIfrOV8qX8Ou5UDtugaFuoEbnPo2Yb5b3lM6z3ZZDsQ2CE/wgSaMjEgZpcxl7V KMQA== MIME-Version: 1.0 Received: by 10.224.222.141 with SMTP id ig13mr21623855qab.75.1351757879649; Thu, 01 Nov 2012 01:17:59 -0700 (PDT) Received: by 10.229.207.197 with HTTP; Thu, 1 Nov 2012 01:17:59 -0700 (PDT) Date: Thu, 1 Nov 2012 16:17:59 +0800 Message-ID: From: Wei Yongjun To: konrad.wilk@oracle.com, jeremy@goop.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, mukesh.rathor@oracle.com X-Mailman-Approved-At: Thu, 01 Nov 2012 11:04:57 +0000 Cc: linux-kernel@vger.kernel.org, yongjun_wei@trendmicro.com.cn, x86@kernel.org, xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org Subject: [Xen-devel] [PATCH -next] xen/x86: remove duplicated include from enlighten.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org From: Wei Yongjun Remove duplicated include. dpatch engine is used to auto generate this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun --- arch/x86/xen/enlighten.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index eb9a567..4c694a7 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:08:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:08:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsct-0008FR-Mj; Thu, 01 Nov 2012 11:07:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsct-0008FM-7E for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:07:55 +0000 Received: from [85.158.137.99:37267] by server-10.bemta-3.messagelabs.com id 9A/A1-19806-A0852905; Thu, 01 Nov 2012 11:07:54 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351768072!12164610!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA2OTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11487 invoked from network); 1 Nov 2012 11:07:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:07:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="43126338" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:07:45 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX01.citrite.net ([10.13.107.65]) with mapi; Thu, 1 Nov 2012 07:07:45 -0400 From: Robert Phillips To: "Tim (Xen.org)" Date: Thu, 1 Nov 2012 07:07:32 -0400 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac24IH3eO1oMoGjARAis+272YCC8pAAAEjAA Message-ID: <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> <20121101110311.GB61948@ocelot.phlegethon.org> In-Reply-To: <20121101110311.GB61948@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thanks, Tim, for your review. I still owe xen-devel a revised version of the patch that adheres better to the Xen coding style conventions. (Excuse my ignorance but) are those documented somewhere? -- rsp -----Original Message----- From: Tim Deegan [mailto:tim@xen.org] Sent: Thursday, November 01, 2012 7:03 AM To: Robert Phillips Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Hi Robert, I've spent a bit more time digging around and I think I have a better idea of why you've done things the way you did. The 'simple' version I was thinking of doesn't work as well as I thought. :| At 13:45 -0400 on 22 Oct (1350913547), Robert Phillips wrote: > I believe the bug was toward the end of the function where it used to > call clear_page(l1) The function copies bits from l1 into a temporary > bitmap, then copies them from there to the user-provided dirty_bitmap. > When it's done, it clears the page at l1. But two framebuffers might > cohabit that page, not overlapping but at distinction areas within it. > Reading the dirtiness for one frame buffer and then clearing the whole > page wipes out information "owned" by the other frame buffer. This > bug would not show up if there is only one frame buffer so your live > migration code is ok. Yep, understood. > And when it's time to look for dirty bits, we know precisely which > PTEs to look at. The old code used to scan all page tables > periodically and we would see a performance hit with precisely that > periodicity. Was this caused by the 2-second timeout where it would try to unmap the vram if it hadn't been dirtied in that time? Were you finding that it would unmap and then immediately try to map it again? > One unfortunate bit of complexity relates to the fact that several > PTEs can map to the same guest physical page. We have to bookkeep > them all The old code basically relied on this not happening (assuming that framebuffers would be mapped only once). Is that assumption just wrong? Is it broken by things like DirectX? > so each PTEs that maps to a guest physical page must be represented by > its own dv_paddr_link, and, for the set that relate to the same guest > page, they are all linked together. The head of the linked list is > the entry in the range's pl_tab array that corresponds to that guest > physical page. Right; you've built a complete reverse mapping from pfn to ptes. > re: " since we already maintain a sparse bitmap to hold the dirty log" > I don't believe the dirty log is maintained except when page_mode is set for PG_log_dirty. > That mode exists for live migrate and the discipline for entering/leaving it is quite different than the finer granularity needed for dirty vram. Sorry, I had got confused there. I was thinking that we could move over more to PG_log_dirty-style operation, where we'd trap on writes and update the bitmap (since we now keep that bitmap as a trie the sparseness would be OK). But on closer inspection the cost of clearing all the mappings when the bitmap is cleared would be either too much overhead (throw away _all_ shadows every time) or about as complex as the mechanism needed to scan the _PAGE_DIRTY bits. I think I have a better idea of the intention of the patch now; I'll go over the code in detail today. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:08:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:08:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsct-0008FR-Mj; Thu, 01 Nov 2012 11:07:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsct-0008FM-7E for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:07:55 +0000 Received: from [85.158.137.99:37267] by server-10.bemta-3.messagelabs.com id 9A/A1-19806-A0852905; Thu, 01 Nov 2012 11:07:54 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351768072!12164610!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA2OTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11487 invoked from network); 1 Nov 2012 11:07:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:07:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="43126338" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:07:45 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX01.citrite.net ([10.13.107.65]) with mapi; Thu, 1 Nov 2012 07:07:45 -0400 From: Robert Phillips To: "Tim (Xen.org)" Date: Thu, 1 Nov 2012 07:07:32 -0400 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac24IH3eO1oMoGjARAis+272YCC8pAAAEjAA Message-ID: <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> <20121101110311.GB61948@ocelot.phlegethon.org> In-Reply-To: <20121101110311.GB61948@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thanks, Tim, for your review. I still owe xen-devel a revised version of the patch that adheres better to the Xen coding style conventions. (Excuse my ignorance but) are those documented somewhere? -- rsp -----Original Message----- From: Tim Deegan [mailto:tim@xen.org] Sent: Thursday, November 01, 2012 7:03 AM To: Robert Phillips Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Hi Robert, I've spent a bit more time digging around and I think I have a better idea of why you've done things the way you did. The 'simple' version I was thinking of doesn't work as well as I thought. :| At 13:45 -0400 on 22 Oct (1350913547), Robert Phillips wrote: > I believe the bug was toward the end of the function where it used to > call clear_page(l1) The function copies bits from l1 into a temporary > bitmap, then copies them from there to the user-provided dirty_bitmap. > When it's done, it clears the page at l1. But two framebuffers might > cohabit that page, not overlapping but at distinction areas within it. > Reading the dirtiness for one frame buffer and then clearing the whole > page wipes out information "owned" by the other frame buffer. This > bug would not show up if there is only one frame buffer so your live > migration code is ok. Yep, understood. > And when it's time to look for dirty bits, we know precisely which > PTEs to look at. The old code used to scan all page tables > periodically and we would see a performance hit with precisely that > periodicity. Was this caused by the 2-second timeout where it would try to unmap the vram if it hadn't been dirtied in that time? Were you finding that it would unmap and then immediately try to map it again? > One unfortunate bit of complexity relates to the fact that several > PTEs can map to the same guest physical page. We have to bookkeep > them all The old code basically relied on this not happening (assuming that framebuffers would be mapped only once). Is that assumption just wrong? Is it broken by things like DirectX? > so each PTEs that maps to a guest physical page must be represented by > its own dv_paddr_link, and, for the set that relate to the same guest > page, they are all linked together. The head of the linked list is > the entry in the range's pl_tab array that corresponds to that guest > physical page. Right; you've built a complete reverse mapping from pfn to ptes. > re: " since we already maintain a sparse bitmap to hold the dirty log" > I don't believe the dirty log is maintained except when page_mode is set for PG_log_dirty. > That mode exists for live migrate and the discipline for entering/leaving it is quite different than the finer granularity needed for dirty vram. Sorry, I had got confused there. I was thinking that we could move over more to PG_log_dirty-style operation, where we'd trap on writes and update the bitmap (since we now keep that bitmap as a trie the sparseness would be OK). But on closer inspection the cost of clearing all the mappings when the bitmap is cleared would be either too much overhead (throw away _all_ shadows every time) or about as complex as the mechanism needed to scan the _PAGE_DIRTY bits. I think I have a better idea of the intention of the patch now; I'll go over the code in detail today. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:15:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:15:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsjX-00008h-IZ; Thu, 01 Nov 2012 11:14:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsjV-00008b-RR for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:14:46 +0000 Received: from [85.158.143.99:8427] by server-2.bemta-4.messagelabs.com id 19/41-28922-5A952905; Thu, 01 Nov 2012 11:14:45 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1351768482!18584807!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13366 invoked from network); 1 Nov 2012 11:14:44 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:14:44 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="213096870" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:14:42 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:14:42 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTsjR-0007yG-BG; Thu, 01 Nov 2012 11:14:41 +0000 Message-ID: <509259A0.9010509@eu.citrix.com> Date: Thu, 1 Nov 2012 12:14:40 +0100 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "Liu, Jinsong" References: <50912B5F02000078000A5B8E@nat28.tlf.novell.com> In-Reply-To: Cc: Ian Jackson , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH 01/02] Handles broken page occurred before migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Are you actually using "hg email" (or patchbomb) to send these? Having changes to patches included in-line to replies makes it hard to keep track of what the newest version is. Tradition is to send the whole series again, with "v2" or "v3" added to the end. If you're using patchbomb, the relevant command would be: $ hg email -o --flag "v3" Also, the second patch doesn't seem to apply to xen-unstable tip anymore -- can you rebase? -George On 31/10/12 17:14, Liu, Jinsong wrote: > [snip] >> If you use scope restricted local variables (which I appreciate), >> please declare them in the innermost possible scope, ... >> >>> + >>> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >>> != NULL ) + { >>> + pfn = domctl->u.set_broken_page_p2m.pfn; + >>> + mfn = get_gfn_query(d, pfn, &pt); >> ... i.e. here (and then both assignments can become initializers >> at once). >> >>> + if ( !mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) ) + >>> { + put_gfn(d, pfn); >>> + rcu_unlock_domain(d); >>> + ret = -EINVAL; >>> + break; >>> + } >>> + >>> + if ( p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt ) >>> + ret = -EINVAL; >> The two if() conditions can be easily joined (the more that they >> both produce -EINVAL). >> > Thanks, updated as attached. > > Jinsong > > ====================== > > Handles broken page occurred before migration > > This patch handles guest broken page which occurred before migration. > > At sender, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > At target, it would set p2m as p2m_ram_broken for broken page, so that > if guest access the broken page again, it would kill itself as expected. > > Signed-off-by: Liu, Jinsong > > diff -r e84a79d11d7a tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain.c Thu Nov 01 07:52:41 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r e84a79d11d7a tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Thu Nov 01 07:52:41 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r e84a79d11d7a tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Thu Nov 01 07:52:41 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r e84a79d11d7a tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xenctrl.h Thu Nov 01 07:52:41 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r e84a79d11d7a xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/xen/arch/x86/domctl.c Thu Nov 01 07:52:41 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r e84a79d11d7a xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Thu Nov 01 01:41:03 2012 +0800 > +++ b/xen/include/public/domctl.h Thu Nov 01 07:52:41 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:15:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:15:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsjX-00008h-IZ; Thu, 01 Nov 2012 11:14:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTsjV-00008b-RR for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:14:46 +0000 Received: from [85.158.143.99:8427] by server-2.bemta-4.messagelabs.com id 19/41-28922-5A952905; Thu, 01 Nov 2012 11:14:45 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1351768482!18584807!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13366 invoked from network); 1 Nov 2012 11:14:44 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:14:44 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="213096870" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:14:42 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:14:42 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTsjR-0007yG-BG; Thu, 01 Nov 2012 11:14:41 +0000 Message-ID: <509259A0.9010509@eu.citrix.com> Date: Thu, 1 Nov 2012 12:14:40 +0100 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "Liu, Jinsong" References: <50912B5F02000078000A5B8E@nat28.tlf.novell.com> In-Reply-To: Cc: Ian Jackson , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH 01/02] Handles broken page occurred before migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Are you actually using "hg email" (or patchbomb) to send these? Having changes to patches included in-line to replies makes it hard to keep track of what the newest version is. Tradition is to send the whole series again, with "v2" or "v3" added to the end. If you're using patchbomb, the relevant command would be: $ hg email -o --flag "v3" Also, the second patch doesn't seem to apply to xen-unstable tip anymore -- can you rebase? -George On 31/10/12 17:14, Liu, Jinsong wrote: > [snip] >> If you use scope restricted local variables (which I appreciate), >> please declare them in the innermost possible scope, ... >> >>> + >>> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >>> != NULL ) + { >>> + pfn = domctl->u.set_broken_page_p2m.pfn; + >>> + mfn = get_gfn_query(d, pfn, &pt); >> ... i.e. here (and then both assignments can become initializers >> at once). >> >>> + if ( !mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) ) + >>> { + put_gfn(d, pfn); >>> + rcu_unlock_domain(d); >>> + ret = -EINVAL; >>> + break; >>> + } >>> + >>> + if ( p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt ) >>> + ret = -EINVAL; >> The two if() conditions can be easily joined (the more that they >> both produce -EINVAL). >> > Thanks, updated as attached. > > Jinsong > > ====================== > > Handles broken page occurred before migration > > This patch handles guest broken page which occurred before migration. > > At sender, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > At target, it would set p2m as p2m_ram_broken for broken page, so that > if guest access the broken page again, it would kill itself as expected. > > Signed-off-by: Liu, Jinsong > > diff -r e84a79d11d7a tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain.c Thu Nov 01 07:52:41 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r e84a79d11d7a tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Thu Nov 01 07:52:41 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r e84a79d11d7a tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Thu Nov 01 07:52:41 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r e84a79d11d7a tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Thu Nov 01 01:41:03 2012 +0800 > +++ b/tools/libxc/xenctrl.h Thu Nov 01 07:52:41 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r e84a79d11d7a xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Thu Nov 01 01:41:03 2012 +0800 > +++ b/xen/arch/x86/domctl.c Thu Nov 01 07:52:41 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r e84a79d11d7a xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Thu Nov 01 01:41:03 2012 +0800 > +++ b/xen/include/public/domctl.h Thu Nov 01 07:52:41 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:45:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtDD-0000j7-6a; Thu, 01 Nov 2012 11:45:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtDB-0000j2-Nl for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:45:25 +0000 Received: from [85.158.138.51:31520] by server-15.bemta-3.messagelabs.com id 2D/01-09445-0D062905; Thu, 01 Nov 2012 11:45:20 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1351770318!28182061!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA2OTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16481 invoked from network); 1 Nov 2012 11:45:20 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:45:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="43129230" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:45:18 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:45:17 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTtD2-0000ro-ST; Thu, 01 Nov 2012 11:45:17 +0000 Message-ID: <1351770199.25014.46.camel@hastur.hellion.org.uk> From: Ian Campbell To: Robert Phillips Date: Thu, 1 Nov 2012 12:43:19 +0100 In-Reply-To: <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> <20121101110311.GB61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Please can you avoid top posting, it makes conversations harder to follow. On Thu, 2012-11-01 at 11:07 +0000, Robert Phillips wrote: > Thanks, Tim, for your review. > > I still owe xen-devel a revised version of the patch that adheres better to the Xen coding style conventions. > (Excuse my ignorance but) are those documented somewhere? It's in the file "CODING_STYLE" at the top-level of the source tree. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:45:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:45:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtDD-0000j7-6a; Thu, 01 Nov 2012 11:45:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtDB-0000j2-Nl for xen-devel@lists.xen.org; Thu, 01 Nov 2012 11:45:25 +0000 Received: from [85.158.138.51:31520] by server-15.bemta-3.messagelabs.com id 2D/01-09445-0D062905; Thu, 01 Nov 2012 11:45:20 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1351770318!28182061!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODA2OTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16481 invoked from network); 1 Nov 2012 11:45:20 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:45:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="43129230" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:45:18 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:45:17 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTtD2-0000ro-ST; Thu, 01 Nov 2012 11:45:17 +0000 Message-ID: <1351770199.25014.46.camel@hastur.hellion.org.uk> From: Ian Campbell To: Robert Phillips Date: Thu, 1 Nov 2012 12:43:19 +0100 In-Reply-To: <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121022161009.GK12577@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C86D22EDE@FTLPMAILBOX02.citrite.net> <20121101110311.GB61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876559B2@FTLPMAILBOX02.citrite.net> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Please can you avoid top posting, it makes conversations harder to follow. On Thu, 2012-11-01 at 11:07 +0000, Robert Phillips wrote: > Thanks, Tim, for your review. > > I still owe xen-devel a revised version of the patch that adheres better to the Xen coding style conventions. > (Excuse my ignorance but) are those documented somewhere? It's in the file "CODING_STYLE" at the top-level of the source tree. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:54:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:54:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtLv-00011W-7K; Thu, 01 Nov 2012 11:54:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtLt-00011R-BX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 11:54:25 +0000 Received: from [85.158.143.99:2631] by server-3.bemta-4.messagelabs.com id FD/73-06841-0F262905; Thu, 01 Nov 2012 11:54:24 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351770862!22904143!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9736 invoked from network); 1 Nov 2012 11:54:23 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:54:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="213099651" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:54:22 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:54:21 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTtLp-0001Ga-IS; Thu, 01 Nov 2012 11:54:21 +0000 Message-ID: <509262EC.90108@eu.citrix.com> Date: Thu, 1 Nov 2012 12:54:20 +0100 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "Liu, Jinsong" References: In-Reply-To: Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 31/10/12 12:21, Liu, Jinsong wrote: > Handles broken page occurred during migration > > This patch handles broken page which occurred during migration. > > It monitors the critical area of live migration (from vMCE point of view, > the copypages stage of migration is the critical area while other areas are not). > > If a vMCE occur at the critical area of live migration, it marks the broken page > to dirty map, so that at copypages stage of migration, its pfn_type > and pfn number would transfer to target and then take appropriate action. > > At target, it would set p2m as p2m_ram_broken for broken page, so that if > guest access the broken page again, it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong [snip] > diff -r 3313ee9f6142 xen/arch/x86/cpu/mcheck/mce_intel.c > --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Thu Oct 25 05:49:11 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Tue Oct 30 06:07:05 2012 +0800 > @@ -342,6 +342,22 @@ > goto vmce_failed; > } > > + if ( unlikely(d->arch.vmce_monitor) ) > + { > + /* > + * vMCE occur during migration > + * > + * mark broken page to dirty bitmap, so that at copypages > + * stage of migration, its pfn_type and pfn number would > + * transfer to target and then take appropriate action > + * > + * At target, it would set p2m as p2m_ram_broken for broken > + * page, so that if guest access the broken page again, it > + * would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + Given that logdirty is only enabled when we're doing some kind of migration (Remus or otherwise), wouldn't it make sense to just unconditionally call paging_mark_dirty(), rather than doing all this stuff with vmce_monitor? paging_mark_dirty() is already a no-op if live-migration is not enabled; and if it is enabled, you probably want whoever is using logdirty to go through and deal with the broken page anyway. So it seems like you could just add paging_mark_dirty() to the previous patch, and get rid of the rest of this patch entirely. -George _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 11:54:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 11:54:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtLv-00011W-7K; Thu, 01 Nov 2012 11:54:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTtLt-00011R-BX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 11:54:25 +0000 Received: from [85.158.143.99:2631] by server-3.bemta-4.messagelabs.com id FD/73-06841-0F262905; Thu, 01 Nov 2012 11:54:24 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351770862!22904143!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9736 invoked from network); 1 Nov 2012 11:54:23 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 11:54:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,692,1344211200"; d="scan'208";a="213099651" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 11:54:22 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 07:54:21 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TTtLp-0001Ga-IS; Thu, 01 Nov 2012 11:54:21 +0000 Message-ID: <509262EC.90108@eu.citrix.com> Date: Thu, 1 Nov 2012 12:54:20 +0100 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "Liu, Jinsong" References: In-Reply-To: Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 31/10/12 12:21, Liu, Jinsong wrote: > Handles broken page occurred during migration > > This patch handles broken page which occurred during migration. > > It monitors the critical area of live migration (from vMCE point of view, > the copypages stage of migration is the critical area while other areas are not). > > If a vMCE occur at the critical area of live migration, it marks the broken page > to dirty map, so that at copypages stage of migration, its pfn_type > and pfn number would transfer to target and then take appropriate action. > > At target, it would set p2m as p2m_ram_broken for broken page, so that if > guest access the broken page again, it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong [snip] > diff -r 3313ee9f6142 xen/arch/x86/cpu/mcheck/mce_intel.c > --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Thu Oct 25 05:49:11 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Tue Oct 30 06:07:05 2012 +0800 > @@ -342,6 +342,22 @@ > goto vmce_failed; > } > > + if ( unlikely(d->arch.vmce_monitor) ) > + { > + /* > + * vMCE occur during migration > + * > + * mark broken page to dirty bitmap, so that at copypages > + * stage of migration, its pfn_type and pfn number would > + * transfer to target and then take appropriate action > + * > + * At target, it would set p2m as p2m_ram_broken for broken > + * page, so that if guest access the broken page again, it > + * would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + Given that logdirty is only enabled when we're doing some kind of migration (Remus or otherwise), wouldn't it make sense to just unconditionally call paging_mark_dirty(), rather than doing all this stuff with vmce_monitor? paging_mark_dirty() is already a no-op if live-migration is not enabled; and if it is enabled, you probably want whoever is using logdirty to go through and deal with the broken page anyway. So it seems like you could just add paging_mark_dirty() to the previous patch, and get rid of the rest of this patch entirely. -George _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 12:50:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 12:50:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuDa-0002Rq-1X; Thu, 01 Nov 2012 12:49:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuDY-0002Rl-7d for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 12:49:52 +0000 Received: from [85.158.139.211:44640] by server-15.bemta-5.messagelabs.com id C6/00-26920-FEF62905; Thu, 01 Nov 2012 12:49:51 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351774189!16972613!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16889 invoked from network); 1 Nov 2012 12:49:51 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-9.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 12:49:51 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1CnQN3009551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 12:49:27 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1CnN3Q004707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 12:49:24 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1CnKM7021511; Thu, 1 Nov 2012 07:49:20 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 05:49:19 -0700 Date: Thu, 1 Nov 2012 08:49:13 -0400 From: Konrad Rzeszutek Wilk To: David Rientjes , JBeulich@suse.com Message-ID: <20121101124912.GA10743@localhost.localdomain> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , Linus Torvalds Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: > CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no > definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() > resulting in the following link error: > > drivers/built-in.o: In function `dbgp_reset_prep': > (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' > drivers/built-in.o: In function `dbgp_external_startup': > (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' There is another patch that needs to be Acked and picked up by Greg KH that fixes this. Let me poke Jan Beulich to repost it with the appropiate Acks. > > Signed-off-by: David Rientjes > --- > arch/x86/xen/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig > --- a/arch/x86/xen/Kconfig > +++ b/arch/x86/xen/Kconfig > @@ -17,6 +17,7 @@ config XEN_DOM0 > def_bool y > depends on XEN && PCI_XEN && SWIOTLB_XEN > depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI > + depends on USB_SUPPORT > > # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST > # name in tools. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 12:50:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 12:50:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuDa-0002Rq-1X; Thu, 01 Nov 2012 12:49:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuDY-0002Rl-7d for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 12:49:52 +0000 Received: from [85.158.139.211:44640] by server-15.bemta-5.messagelabs.com id C6/00-26920-FEF62905; Thu, 01 Nov 2012 12:49:51 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351774189!16972613!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16889 invoked from network); 1 Nov 2012 12:49:51 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-9.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 12:49:51 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1CnQN3009551 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 12:49:27 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1CnN3Q004707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 12:49:24 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1CnKM7021511; Thu, 1 Nov 2012 07:49:20 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 05:49:19 -0700 Date: Thu, 1 Nov 2012 08:49:13 -0400 From: Konrad Rzeszutek Wilk To: David Rientjes , JBeulich@suse.com Message-ID: <20121101124912.GA10743@localhost.localdomain> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , Linus Torvalds Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: > CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no > definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() > resulting in the following link error: > > drivers/built-in.o: In function `dbgp_reset_prep': > (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' > drivers/built-in.o: In function `dbgp_external_startup': > (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' There is another patch that needs to be Acked and picked up by Greg KH that fixes this. Let me poke Jan Beulich to repost it with the appropiate Acks. > > Signed-off-by: David Rientjes > --- > arch/x86/xen/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig > --- a/arch/x86/xen/Kconfig > +++ b/arch/x86/xen/Kconfig > @@ -17,6 +17,7 @@ config XEN_DOM0 > def_bool y > depends on XEN && PCI_XEN && SWIOTLB_XEN > depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI > + depends on USB_SUPPORT > > # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST > # name in tools. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 13:40:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 13:40:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuzv-0003R2-EU; Thu, 01 Nov 2012 13:39:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuzt-0003Qx-DA for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 13:39:49 +0000 Received: from [85.158.143.35:53998] by server-1.bemta-4.messagelabs.com id 5E/9B-27934-4AB72905; Thu, 01 Nov 2012 13:39:48 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1351777143!5208937!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI1ODE4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27303 invoked from network); 1 Nov 2012 13:39:04 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-4.tower-21.messagelabs.com with SMTP; 1 Nov 2012 13:39:04 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 01 Nov 2012 06:39:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,693,1344236400"; d="scan'208";a="212228165" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 06:39:02 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 06:39:01 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 06:39:01 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 21:39:00 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 02/02] Handles broken page occurred during migration Thread-Index: AQHNuCegST9jWMNZSlWheBhAdddc/ZfU9vJQ Date: Thu, 1 Nov 2012 13:38:59 +0000 Message-ID: References: <509262EC.90108@eu.citrix.com> In-Reply-To: <509262EC.90108@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > On 31/10/12 12:21, Liu, Jinsong wrote: >> Handles broken page occurred during migration >> >> This patch handles broken page which occurred during migration. >> >> It monitors the critical area of live migration (from vMCE point of >> view, >> the copypages stage of migration is the critical area while other >> areas are not). >> >> If a vMCE occur at the critical area of live migration, it marks the >> broken page to dirty map, so that at copypages stage of migration, >> its pfn_type >> and pfn number would transfer to target and then take appropriate >> action. >> >> At target, it would set p2m as p2m_ram_broken for broken page, so >> that if >> guest access the broken page again, it would kill itself as expected. >> >> Suggested-by: George Dunlap >> Signed-off-by: Liu, Jinsong > > [snip] > >> diff -r 3313ee9f6142 xen/arch/x86/cpu/mcheck/mce_intel.c >> --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Thu Oct 25 05:49:11 2012 >> +0800 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Tue Oct 30 06:07:05 >> 2012 +0800 @@ -342,6 +342,22 @@ goto >> vmce_failed; } >> >> + if ( unlikely(d->arch.vmce_monitor) ) + >> { + /* >> + * vMCE occur during migration + >> * + * mark broken page to dirty bitmap, so that >> at copypages + * stage of migration, its >> pfn_type and pfn number would + * transfer to >> target and then take appropriate action + * + >> * At target, it would set p2m as p2m_ram_broken for broken + >> * page, so that if guest access the broken page again, it + >> * would kill itself as expected. + */ + >> paging_mark_dirty(d, mfn); + } >> + > > Given that logdirty is only enabled when we're doing some kind of > migration (Remus or otherwise), wouldn't it make sense to just > unconditionally call paging_mark_dirty(), rather than doing all this > stuff with vmce_monitor? paging_mark_dirty() is already a no-op if > live-migration is not enabled; and if it is enabled, you probably want > whoever is using logdirty to go through and deal with the broken page > anyway. That's just what I concerned -- can we guarantee paging log dirty mode only occur during live migration/remus? say, under the case vram_tracking (hap_enable_vram_tracking) it also enable log dirty. > > So it seems like you could just add paging_mark_dirty() to the > previous patch, and get rid of the rest of this patch entirely. > Currently I just find 2 cases which use log dirty mode: live migration/remus and vram tracking. So if we can make sure that log dirty would not used more in the future, it's fine to me to simplify my code by unconditionally call paging_mark_dirty at mce handler. What do you think? Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 13:40:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 13:40:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuzv-0003R2-EU; Thu, 01 Nov 2012 13:39:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTuzt-0003Qx-DA for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 13:39:49 +0000 Received: from [85.158.143.35:53998] by server-1.bemta-4.messagelabs.com id 5E/9B-27934-4AB72905; Thu, 01 Nov 2012 13:39:48 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1351777143!5208937!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI1ODE4\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27303 invoked from network); 1 Nov 2012 13:39:04 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-4.tower-21.messagelabs.com with SMTP; 1 Nov 2012 13:39:04 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 01 Nov 2012 06:39:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,693,1344236400"; d="scan'208";a="212228165" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 06:39:02 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 06:39:01 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 06:39:01 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 1 Nov 2012 21:39:00 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 02/02] Handles broken page occurred during migration Thread-Index: AQHNuCegST9jWMNZSlWheBhAdddc/ZfU9vJQ Date: Thu, 1 Nov 2012 13:38:59 +0000 Message-ID: References: <509262EC.90108@eu.citrix.com> In-Reply-To: <509262EC.90108@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > On 31/10/12 12:21, Liu, Jinsong wrote: >> Handles broken page occurred during migration >> >> This patch handles broken page which occurred during migration. >> >> It monitors the critical area of live migration (from vMCE point of >> view, >> the copypages stage of migration is the critical area while other >> areas are not). >> >> If a vMCE occur at the critical area of live migration, it marks the >> broken page to dirty map, so that at copypages stage of migration, >> its pfn_type >> and pfn number would transfer to target and then take appropriate >> action. >> >> At target, it would set p2m as p2m_ram_broken for broken page, so >> that if >> guest access the broken page again, it would kill itself as expected. >> >> Suggested-by: George Dunlap >> Signed-off-by: Liu, Jinsong > > [snip] > >> diff -r 3313ee9f6142 xen/arch/x86/cpu/mcheck/mce_intel.c >> --- a/xen/arch/x86/cpu/mcheck/mce_intel.c Thu Oct 25 05:49:11 2012 >> +0800 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Tue Oct 30 06:07:05 >> 2012 +0800 @@ -342,6 +342,22 @@ goto >> vmce_failed; } >> >> + if ( unlikely(d->arch.vmce_monitor) ) + >> { + /* >> + * vMCE occur during migration + >> * + * mark broken page to dirty bitmap, so that >> at copypages + * stage of migration, its >> pfn_type and pfn number would + * transfer to >> target and then take appropriate action + * + >> * At target, it would set p2m as p2m_ram_broken for broken + >> * page, so that if guest access the broken page again, it + >> * would kill itself as expected. + */ + >> paging_mark_dirty(d, mfn); + } >> + > > Given that logdirty is only enabled when we're doing some kind of > migration (Remus or otherwise), wouldn't it make sense to just > unconditionally call paging_mark_dirty(), rather than doing all this > stuff with vmce_monitor? paging_mark_dirty() is already a no-op if > live-migration is not enabled; and if it is enabled, you probably want > whoever is using logdirty to go through and deal with the broken page > anyway. That's just what I concerned -- can we guarantee paging log dirty mode only occur during live migration/remus? say, under the case vram_tracking (hap_enable_vram_tracking) it also enable log dirty. > > So it seems like you could just add paging_mark_dirty() to the > previous patch, and get rid of the rest of this patch entirely. > Currently I just find 2 cases which use log dirty mode: live migration/remus and vram tracking. So if we can make sure that log dirty would not used more in the future, it's fine to me to simplify my code by unconditionally call paging_mark_dirty at mce handler. What do you think? Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 14:25:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 14:25:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvhJ-0004ci-35; Thu, 01 Nov 2012 14:24:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvhH-0004ca-Sg for xen-devel@lists.xen.org; Thu, 01 Nov 2012 14:24:40 +0000 Received: from [85.158.143.99:32632] by server-2.bemta-4.messagelabs.com id E8/85-28922-72682905; Thu, 01 Nov 2012 14:24:39 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1351779876!18465768!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24193 invoked from network); 1 Nov 2012 14:24:36 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-8.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 14:24:36 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTvhC-000Gvp-EL; Thu, 01 Nov 2012 14:24:34 +0000 Date: Thu, 1 Nov 2012 14:24:34 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121101142434.GC61948@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> User-Agent: Mutt/1.4.2.1i Cc: Robert Phillips , xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, At 14:15 -0400 on 16 Oct (1350396902), Robert Phillips wrote: > From: Robert Phillips > > Support is provided for both shadow and hardware assisted paging (HAP) modes. > This code bookkeeps the set of video frame buffers (vram), > detects when the guest has modified any of those buffers and, upon request, > returns a bitmap of the modified pages. > > This lets other software components re-paint the portions of the monitor (or monitors) that have changed. > Each monitor has a frame buffer of some size at some position in guest physical memory. > The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. Having read through this in detail, it's looking very plausible. :) A few style nits: - please use the Xen spacings around 'if ( foo )' and 'for ( x; y; z )'; - there's a bit of trailing whitespace in the new file, and a few places where indentation seems to have gone a bit wrong; - please make sure the whole thing is linewrapped to <80 characters; and - there's no need for braces around single-line blocks. More substantive comments: - I think the dirty_vram.c and dirty_vram.h files belong under mm/ rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is an indicator that this is really MM code. - Please use xzalloc() rather than xmalloc() + memset(0). It avoids the sizes of alloc and memset getting out of sync. - The i386 build is dead, so you can drop some #ifdef __i386__ sections. - There really ought to be some limit on how many PTEs you're willing to track. Otherwise a large guest can consume lots and lots of Xen's memory by making lots of PTEs that point to framebuffers. That might also lead to performance problems, e.g. in the unshadow function that walks over all those liked lists. Also, I think that the memory for the paddr_links ought to come from the shadow pool (i.e. using domain->arch.paging.alloc_page()) rather than soaking up otherwise free memory. A few other detailed comments below... > +/* Free a paddr_link struct, given address of its predecessor in linked list */ > +dv_paddr_link_t * > +free_paddr_link(struct domain *d, > + dv_paddr_link_t **ppl, > + dv_paddr_link_t *pl) > +{ > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > + dv_paddr_link_t *npl; /* next pl */ > + > + ASSERT( paging_locked_by_me(d) ); > + /* extension mapping? */ > + if (ppl) /* yes. free it */ > + { > + pl = (*ppl); This assignment seems like it should always be a noop. Would it be correct to replace it with ASSERT(pl == *ppl)? > + (*ppl) = npl = pl->pl_next; > + } > + else /* main table */ > + { > + /* move 2nd mapping to main table. > + * and free 2nd mapping */ > + dv_paddr_link_t * spl; > + spl = pl->pl_next; > + if (spl == NULL) > + { > + pl->sl1ma = INVALID_PADDR; > + return pl; > + } > + pl->sl1ma = spl->sl1ma; > + pl->pl_next = spl->pl_next; > + npl = pl; /* reprocess main table entry again */ > + pl = spl; OK, that took a lot of staring at to be sure it's right. :) I'd be inclined to just put all paddr_links in the linked list (and have an array of pointers rather than an array of paddr_link_ts). Is it worth having the extra complexity here, and at the callers, to avoid a single memory read? > + } > + pl->sl1ma = INVALID_PADDR; > + pl->pl_next = dirty_vram->pl_free; > + dirty_vram->pl_free = pl; > + return npl; > +} > + > + > +/* dirty_vram_range_update() > + * This is called whenever a level 1 page table entry is modified. > + * If the L1PTE is being cleared, the function removes any paddr_links > + * that refer to it. > + * If the L1PTE is being set to a frame buffer page, a paddr_link is > + * created for that page's entry in pl_tab. > + * Returns 1 iff entry found and set or cleared. > + */ > +int dirty_vram_range_update(struct domain *d, > + unsigned long gfn, > + paddr_t sl1ma, > + int set) > +{ > + int effective = 0; > + dv_range_t *range; > + > + ASSERT(paging_locked_by_me(d)); > + range = dirty_vram_range_find_gfn(d, gfn); > + if ( range ) > + { I think this would be more readable as 'if ( !range ) return 0' here rather than indenting most of the function. > + unsigned long i = gfn - range->begin_pfn; > + dv_paddr_link_t *pl = &range->pl_tab[ i ]; > + dv_paddr_link_t **ppl = NULL; > + int len = 0; > + > + /* find matching entry (pl), if any, and its predecessor > + * in linked list (ppl) */ > + while (pl != NULL) > + { > + if (pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) > + break; > + ppl = &pl->pl_next; > + pl = *ppl; > + len++; > + } > + > + if (set) > + { > + /* Did we find sl1ma in either the main table or the linked list? */ > + if (pl == NULL) /* no, so we'll need to alloc a link */ > + { > + ASSERT(ppl != NULL); > + /* alloc link and append it to list */ > + (*ppl) = pl = alloc_paddr_link(d); > + if (pl == NULL) > + goto out; This needs to signal some sort of error. Otherwise, if we can't add this sl1e to the list we'll just silently fail to track it. > + } > + if ( pl->sl1ma != sl1ma ) > + { ASSERT(pl->sl1ma == INVALID_PADDR) ? > + pl->sl1ma = sl1ma; > + range->nr_mappings++; > + } > + effective = 1; > + if (len > range->mappings_hwm) > + { > + range->mappings_hwm = len; > +#if DEBUG_update_vram_mapping > + gdprintk(XENLOG_DEBUG, > + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", > + gfn, sl1ma, > + range->mappings_hwm, > + range->nr_mappings, > + d->arch.paging.shadow.free_pages); > +#endif > + } > + } > + else /* clear */ > + { > + if (pl && pl->sl1ma == sl1ma ) > + { > +#if DEBUG_update_vram_mapping > + gdprintk(XENLOG_DEBUG, > + "[%lx] clear sl1ma:%lx mappings:%d\n", > + gfn, sl1ma, > + range->nr_mappings-1); > +#endif > + free_paddr_link(d, ppl, pl); > + if ( --range->nr_mappings == 0 ) > + { > + dirty_vram_range_free(d, range); What's this for? If the guest unmaps the framebuffer and remaps it (or if the shadow PTs of the mappings are temporarily discarded) this will stop us from tracking the new mappings until the toolstack asks for the bitmap (and then it will be expensive to go and find the mappings). > + } > + effective = 1; > + } > + } > + } > + out: > + return effective; > +} > +/* shadow_track_dirty_vram() > + * This is the API called by the guest to determine which pages in the range > + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. > + * It creates the domain's dv_dirty_vram on demand. > + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. > + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). > + * It copies the dirty bitmask into guest storage. > + */ > +int shadow_track_dirty_vram(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > +{ > + int rc = 0; > + unsigned long end_pfn = begin_pfn + nr; > + int flush_tlb = 0; > + dv_range_t *range; > + struct p2m_domain *p2m = p2m_get_hostp2m(d); > + > + if (end_pfn < begin_pfn > + || begin_pfn > p2m->max_mapped_pfn > + || end_pfn >= p2m->max_mapped_pfn) I know you just copied this from the old definition but the limits seem wrong here -- I think it should be: if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) > +/* hap_clean_vram_tracking_range() > + * For all the pages in the range specified by [begin_pfn,nr), > + * note in the dirty bitmap any page that has been marked as read-write, > + * which signifies that the page has been dirtied, and reset the page > + * to ram_logdirty. > + */ > +void hap_clean_vram_tracking_range(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + uint8_t *dirty_bitmap) > +{ > + int i; > + unsigned long pfn; > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > + dv_range_t *range; > + > + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); > + ASSERT(paging_locked_by_me(d)); > + > + if ( !dirty_vram ) > + { > + gdprintk(XENLOG_DEBUG, "Should only be called while tracking dirty vram.\n"); > + return; > + } > + > + range = dirty_vram_range_find(d, begin_pfn, nr); > + if (!range) > + return; Oughtn't we to return all 1s in the bitmap here? If the range isn't currently being tracked we should conservatively assume it's all dirty, right? > + > + /* set l1e entries of P2M table to be read-only. */ > + /* On first write, it page faults, its entry is changed to read-write, > + * its bit in the dirty bitmap is set, and on retry the write succeeds. */ > + for (i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++) > + { > + p2m_type_t pt; > + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); > + if (pt == p2m_ram_rw) > + dirty_bitmap[i >> 3] |= (1 << (i & 7)); > + } > + flush_tlb_mask(d->domain_dirty_cpumask); > +} > + > +static void hap_vram_tracking_init(struct domain *d) > +{ > + paging_log_dirty_init(d, hap_enable_vram_tracking, > + hap_disable_vram_tracking, > + NULL); > +} > + > +/* hap_track_dirty_vram() > + * Create the domain's dv_dirty_vram struct on demand. > + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is first encountered. > + * Collect the guest_dirty bitmask, a bit mask of the dirties vram pages, by > + * calling paging_log_dirty_range(). > + */ > +int hap_track_dirty_vram(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > +{ > + long rc = 0; > + dv_dirty_vram_t *dirty_vram; > + int restart_log_dirty = 0; > + > + paging_lock(d); > + dirty_vram = d->arch.hvm_domain.dirty_vram; > + if ( nr ) > + { > + dv_range_t *range = NULL; > + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; > + unsigned long dirty_bitmap[size]; All the users of this array cast to (uint8_t *) -- just declare it as uint8_t * instead? > + > + /* Already tracking dirty vram? */ > + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ > + { > + /* Handle the addition of another range */ > + range = dirty_vram_range_find(d, begin_pfn, nr); > + if ( !range ) > + { > + rc = -ENOMEM; > + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) > + goto param_fail; > + restart_log_dirty = 1; > + } > + } > + /* Just starting to track dirty vram? */ > + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ > + { > + rc = -ENOMEM; > + if ( !(dirty_vram = dirty_vram_alloc(d)) ) > + goto param_fail; > + > + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) > + goto param_fail; > + > + restart_log_dirty = 1; > + /* Initialize callbacks for vram tracking */ > + hap_vram_tracking_init(d); > + } > + else > + { > + /* Test for invalid combination */ > + if ( !paging_mode_log_dirty(d) && dirty_vram ) > + rc = -EINVAL; > + else /* logging dirty of all memory, not tracking dirty vram */ > + rc = -ENODATA; > + goto param_fail; > + } > + > + if (restart_log_dirty) > + { > + /* disable then enable log dirty */ Why disable and re-enable? The call to paging_log_dirty_range() below will reset the p2m entries of the range you care about, so I think all you need to do is enable it in the 'just starting' case above. And, since you know you're in HAP mode, not in log-dirty mode, and already have the paging lock, you can just set d->arch.paging.mode |= PG_log_dirty there rather than jumping through the paging_log_dirty_enable() path and messing with locks. > + paging_unlock(d); > + if (paging_mode_log_dirty(d)) > + paging_log_dirty_disable(d); > + > + rc = paging_log_dirty_enable(d); > + paging_lock(d); > + if (rc != 0) > + goto param_fail; > + } > + > + paging_unlock(d); > + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); > + paging_log_dirty_range(d, begin_pfn, nr, (uint8_t*)dirty_bitmap); > + rc = -EFAULT; > + if ( copy_to_guest(guest_dirty_bitmap, > + (uint8_t*)dirty_bitmap, > + size * BYTES_PER_LONG) == 0 ) > + { > + rc = 0; > + } > + } > + else > + { > + /* If zero pages specified while already tracking dirty vram > + * then stop tracking */ > + if ( paging_mode_log_dirty(d) && dirty_vram ) { > + paging_unlock(d); > + rc = paging_log_dirty_disable(d); > + paging_lock(d); > + dirty_vram_free(d); This is different from the shadow case -- there, IIUC, you just ignore requests where nr == 0; here, you tear down all vram tracking. Can you choose one of those, and document it in the public header? > + } else /* benign no-op */ > + { > + rc = 0; > + } > + paging_unlock(d); > + } > + > + return rc; > +/* paging_mark_dirty_hap() > + * Make a hap page writeable and mark it as dirty. > + * This done atomically under the p2m and paging locks to avoid leaving > + * a window where the page might be modified without being marked as dirty. > + */ I'm perplexed by this -- AFAICT it's either not necessary (because all log-dirty read/clean ops are done with the domain paused) or not sufficient (because although the bitmap and the PTE are updated under the p2m lock, the actual dirtying of the page happens at some other time). Can you spell out for me exactly what this is protecting against? > +typedef int (*hash_pfn_callback_t)(struct vcpu *v, > + mfn_t smfn, > + unsigned long begin_pfn, > + unsigned long end_pfn, > + int *removed); > + > +static int hash_pfn_foreach(struct vcpu *v, > + unsigned int callback_mask, > + hash_pfn_callback_t callbacks[], > + unsigned long begin_pfn, > + unsigned long end_pfn) > +/* Walk the hash table looking at the types of the entries and > + * calling the appropriate callback function for each entry. > + * The mask determines which shadow types we call back for, and the array > + * of callbacks tells us which function to call. > + * Any callback may return non-zero to let us skip the rest of the scan. > + * > + * WARNING: Callbacks MUST NOT add or remove hash entries unless they > + * then return non-zero to terminate the scan. */ This code duplication is a bit much. I think you should recast the existing hash_foreach() function to take a pointer as its fourth argument instead of an MFN, and then make the existing callers just cast their MFN argument as a pointer. The you can use the same function, passing a pointer to a struct { begin, end, removed }. Please make the changes to hash_foreach() in a separate patch from the dirty_vram stuff. > @@ -1211,12 +1164,14 @@ static int shadow_set_l1e(struct vcpu *v, > shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); > /* fall through */ > case 0: > - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > break; > } > } > } > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); Why is this being called twice here? Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 14:25:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 14:25:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvhJ-0004ci-35; Thu, 01 Nov 2012 14:24:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvhH-0004ca-Sg for xen-devel@lists.xen.org; Thu, 01 Nov 2012 14:24:40 +0000 Received: from [85.158.143.99:32632] by server-2.bemta-4.messagelabs.com id E8/85-28922-72682905; Thu, 01 Nov 2012 14:24:39 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1351779876!18465768!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24193 invoked from network); 1 Nov 2012 14:24:36 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-8.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 14:24:36 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTvhC-000Gvp-EL; Thu, 01 Nov 2012 14:24:34 +0000 Date: Thu, 1 Nov 2012 14:24:34 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121101142434.GC61948@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> User-Agent: Mutt/1.4.2.1i Cc: Robert Phillips , xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, At 14:15 -0400 on 16 Oct (1350396902), Robert Phillips wrote: > From: Robert Phillips > > Support is provided for both shadow and hardware assisted paging (HAP) modes. > This code bookkeeps the set of video frame buffers (vram), > detects when the guest has modified any of those buffers and, upon request, > returns a bitmap of the modified pages. > > This lets other software components re-paint the portions of the monitor (or monitors) that have changed. > Each monitor has a frame buffer of some size at some position in guest physical memory. > The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. Having read through this in detail, it's looking very plausible. :) A few style nits: - please use the Xen spacings around 'if ( foo )' and 'for ( x; y; z )'; - there's a bit of trailing whitespace in the new file, and a few places where indentation seems to have gone a bit wrong; - please make sure the whole thing is linewrapped to <80 characters; and - there's no need for braces around single-line blocks. More substantive comments: - I think the dirty_vram.c and dirty_vram.h files belong under mm/ rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is an indicator that this is really MM code. - Please use xzalloc() rather than xmalloc() + memset(0). It avoids the sizes of alloc and memset getting out of sync. - The i386 build is dead, so you can drop some #ifdef __i386__ sections. - There really ought to be some limit on how many PTEs you're willing to track. Otherwise a large guest can consume lots and lots of Xen's memory by making lots of PTEs that point to framebuffers. That might also lead to performance problems, e.g. in the unshadow function that walks over all those liked lists. Also, I think that the memory for the paddr_links ought to come from the shadow pool (i.e. using domain->arch.paging.alloc_page()) rather than soaking up otherwise free memory. A few other detailed comments below... > +/* Free a paddr_link struct, given address of its predecessor in linked list */ > +dv_paddr_link_t * > +free_paddr_link(struct domain *d, > + dv_paddr_link_t **ppl, > + dv_paddr_link_t *pl) > +{ > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > + dv_paddr_link_t *npl; /* next pl */ > + > + ASSERT( paging_locked_by_me(d) ); > + /* extension mapping? */ > + if (ppl) /* yes. free it */ > + { > + pl = (*ppl); This assignment seems like it should always be a noop. Would it be correct to replace it with ASSERT(pl == *ppl)? > + (*ppl) = npl = pl->pl_next; > + } > + else /* main table */ > + { > + /* move 2nd mapping to main table. > + * and free 2nd mapping */ > + dv_paddr_link_t * spl; > + spl = pl->pl_next; > + if (spl == NULL) > + { > + pl->sl1ma = INVALID_PADDR; > + return pl; > + } > + pl->sl1ma = spl->sl1ma; > + pl->pl_next = spl->pl_next; > + npl = pl; /* reprocess main table entry again */ > + pl = spl; OK, that took a lot of staring at to be sure it's right. :) I'd be inclined to just put all paddr_links in the linked list (and have an array of pointers rather than an array of paddr_link_ts). Is it worth having the extra complexity here, and at the callers, to avoid a single memory read? > + } > + pl->sl1ma = INVALID_PADDR; > + pl->pl_next = dirty_vram->pl_free; > + dirty_vram->pl_free = pl; > + return npl; > +} > + > + > +/* dirty_vram_range_update() > + * This is called whenever a level 1 page table entry is modified. > + * If the L1PTE is being cleared, the function removes any paddr_links > + * that refer to it. > + * If the L1PTE is being set to a frame buffer page, a paddr_link is > + * created for that page's entry in pl_tab. > + * Returns 1 iff entry found and set or cleared. > + */ > +int dirty_vram_range_update(struct domain *d, > + unsigned long gfn, > + paddr_t sl1ma, > + int set) > +{ > + int effective = 0; > + dv_range_t *range; > + > + ASSERT(paging_locked_by_me(d)); > + range = dirty_vram_range_find_gfn(d, gfn); > + if ( range ) > + { I think this would be more readable as 'if ( !range ) return 0' here rather than indenting most of the function. > + unsigned long i = gfn - range->begin_pfn; > + dv_paddr_link_t *pl = &range->pl_tab[ i ]; > + dv_paddr_link_t **ppl = NULL; > + int len = 0; > + > + /* find matching entry (pl), if any, and its predecessor > + * in linked list (ppl) */ > + while (pl != NULL) > + { > + if (pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) > + break; > + ppl = &pl->pl_next; > + pl = *ppl; > + len++; > + } > + > + if (set) > + { > + /* Did we find sl1ma in either the main table or the linked list? */ > + if (pl == NULL) /* no, so we'll need to alloc a link */ > + { > + ASSERT(ppl != NULL); > + /* alloc link and append it to list */ > + (*ppl) = pl = alloc_paddr_link(d); > + if (pl == NULL) > + goto out; This needs to signal some sort of error. Otherwise, if we can't add this sl1e to the list we'll just silently fail to track it. > + } > + if ( pl->sl1ma != sl1ma ) > + { ASSERT(pl->sl1ma == INVALID_PADDR) ? > + pl->sl1ma = sl1ma; > + range->nr_mappings++; > + } > + effective = 1; > + if (len > range->mappings_hwm) > + { > + range->mappings_hwm = len; > +#if DEBUG_update_vram_mapping > + gdprintk(XENLOG_DEBUG, > + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", > + gfn, sl1ma, > + range->mappings_hwm, > + range->nr_mappings, > + d->arch.paging.shadow.free_pages); > +#endif > + } > + } > + else /* clear */ > + { > + if (pl && pl->sl1ma == sl1ma ) > + { > +#if DEBUG_update_vram_mapping > + gdprintk(XENLOG_DEBUG, > + "[%lx] clear sl1ma:%lx mappings:%d\n", > + gfn, sl1ma, > + range->nr_mappings-1); > +#endif > + free_paddr_link(d, ppl, pl); > + if ( --range->nr_mappings == 0 ) > + { > + dirty_vram_range_free(d, range); What's this for? If the guest unmaps the framebuffer and remaps it (or if the shadow PTs of the mappings are temporarily discarded) this will stop us from tracking the new mappings until the toolstack asks for the bitmap (and then it will be expensive to go and find the mappings). > + } > + effective = 1; > + } > + } > + } > + out: > + return effective; > +} > +/* shadow_track_dirty_vram() > + * This is the API called by the guest to determine which pages in the range > + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. > + * It creates the domain's dv_dirty_vram on demand. > + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. > + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). > + * It copies the dirty bitmask into guest storage. > + */ > +int shadow_track_dirty_vram(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > +{ > + int rc = 0; > + unsigned long end_pfn = begin_pfn + nr; > + int flush_tlb = 0; > + dv_range_t *range; > + struct p2m_domain *p2m = p2m_get_hostp2m(d); > + > + if (end_pfn < begin_pfn > + || begin_pfn > p2m->max_mapped_pfn > + || end_pfn >= p2m->max_mapped_pfn) I know you just copied this from the old definition but the limits seem wrong here -- I think it should be: if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) > +/* hap_clean_vram_tracking_range() > + * For all the pages in the range specified by [begin_pfn,nr), > + * note in the dirty bitmap any page that has been marked as read-write, > + * which signifies that the page has been dirtied, and reset the page > + * to ram_logdirty. > + */ > +void hap_clean_vram_tracking_range(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + uint8_t *dirty_bitmap) > +{ > + int i; > + unsigned long pfn; > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > + dv_range_t *range; > + > + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); > + ASSERT(paging_locked_by_me(d)); > + > + if ( !dirty_vram ) > + { > + gdprintk(XENLOG_DEBUG, "Should only be called while tracking dirty vram.\n"); > + return; > + } > + > + range = dirty_vram_range_find(d, begin_pfn, nr); > + if (!range) > + return; Oughtn't we to return all 1s in the bitmap here? If the range isn't currently being tracked we should conservatively assume it's all dirty, right? > + > + /* set l1e entries of P2M table to be read-only. */ > + /* On first write, it page faults, its entry is changed to read-write, > + * its bit in the dirty bitmap is set, and on retry the write succeeds. */ > + for (i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++) > + { > + p2m_type_t pt; > + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); > + if (pt == p2m_ram_rw) > + dirty_bitmap[i >> 3] |= (1 << (i & 7)); > + } > + flush_tlb_mask(d->domain_dirty_cpumask); > +} > + > +static void hap_vram_tracking_init(struct domain *d) > +{ > + paging_log_dirty_init(d, hap_enable_vram_tracking, > + hap_disable_vram_tracking, > + NULL); > +} > + > +/* hap_track_dirty_vram() > + * Create the domain's dv_dirty_vram struct on demand. > + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is first encountered. > + * Collect the guest_dirty bitmask, a bit mask of the dirties vram pages, by > + * calling paging_log_dirty_range(). > + */ > +int hap_track_dirty_vram(struct domain *d, > + unsigned long begin_pfn, > + unsigned long nr, > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > +{ > + long rc = 0; > + dv_dirty_vram_t *dirty_vram; > + int restart_log_dirty = 0; > + > + paging_lock(d); > + dirty_vram = d->arch.hvm_domain.dirty_vram; > + if ( nr ) > + { > + dv_range_t *range = NULL; > + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; > + unsigned long dirty_bitmap[size]; All the users of this array cast to (uint8_t *) -- just declare it as uint8_t * instead? > + > + /* Already tracking dirty vram? */ > + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ > + { > + /* Handle the addition of another range */ > + range = dirty_vram_range_find(d, begin_pfn, nr); > + if ( !range ) > + { > + rc = -ENOMEM; > + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) > + goto param_fail; > + restart_log_dirty = 1; > + } > + } > + /* Just starting to track dirty vram? */ > + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ > + { > + rc = -ENOMEM; > + if ( !(dirty_vram = dirty_vram_alloc(d)) ) > + goto param_fail; > + > + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) > + goto param_fail; > + > + restart_log_dirty = 1; > + /* Initialize callbacks for vram tracking */ > + hap_vram_tracking_init(d); > + } > + else > + { > + /* Test for invalid combination */ > + if ( !paging_mode_log_dirty(d) && dirty_vram ) > + rc = -EINVAL; > + else /* logging dirty of all memory, not tracking dirty vram */ > + rc = -ENODATA; > + goto param_fail; > + } > + > + if (restart_log_dirty) > + { > + /* disable then enable log dirty */ Why disable and re-enable? The call to paging_log_dirty_range() below will reset the p2m entries of the range you care about, so I think all you need to do is enable it in the 'just starting' case above. And, since you know you're in HAP mode, not in log-dirty mode, and already have the paging lock, you can just set d->arch.paging.mode |= PG_log_dirty there rather than jumping through the paging_log_dirty_enable() path and messing with locks. > + paging_unlock(d); > + if (paging_mode_log_dirty(d)) > + paging_log_dirty_disable(d); > + > + rc = paging_log_dirty_enable(d); > + paging_lock(d); > + if (rc != 0) > + goto param_fail; > + } > + > + paging_unlock(d); > + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); > + paging_log_dirty_range(d, begin_pfn, nr, (uint8_t*)dirty_bitmap); > + rc = -EFAULT; > + if ( copy_to_guest(guest_dirty_bitmap, > + (uint8_t*)dirty_bitmap, > + size * BYTES_PER_LONG) == 0 ) > + { > + rc = 0; > + } > + } > + else > + { > + /* If zero pages specified while already tracking dirty vram > + * then stop tracking */ > + if ( paging_mode_log_dirty(d) && dirty_vram ) { > + paging_unlock(d); > + rc = paging_log_dirty_disable(d); > + paging_lock(d); > + dirty_vram_free(d); This is different from the shadow case -- there, IIUC, you just ignore requests where nr == 0; here, you tear down all vram tracking. Can you choose one of those, and document it in the public header? > + } else /* benign no-op */ > + { > + rc = 0; > + } > + paging_unlock(d); > + } > + > + return rc; > +/* paging_mark_dirty_hap() > + * Make a hap page writeable and mark it as dirty. > + * This done atomically under the p2m and paging locks to avoid leaving > + * a window where the page might be modified without being marked as dirty. > + */ I'm perplexed by this -- AFAICT it's either not necessary (because all log-dirty read/clean ops are done with the domain paused) or not sufficient (because although the bitmap and the PTE are updated under the p2m lock, the actual dirtying of the page happens at some other time). Can you spell out for me exactly what this is protecting against? > +typedef int (*hash_pfn_callback_t)(struct vcpu *v, > + mfn_t smfn, > + unsigned long begin_pfn, > + unsigned long end_pfn, > + int *removed); > + > +static int hash_pfn_foreach(struct vcpu *v, > + unsigned int callback_mask, > + hash_pfn_callback_t callbacks[], > + unsigned long begin_pfn, > + unsigned long end_pfn) > +/* Walk the hash table looking at the types of the entries and > + * calling the appropriate callback function for each entry. > + * The mask determines which shadow types we call back for, and the array > + * of callbacks tells us which function to call. > + * Any callback may return non-zero to let us skip the rest of the scan. > + * > + * WARNING: Callbacks MUST NOT add or remove hash entries unless they > + * then return non-zero to terminate the scan. */ This code duplication is a bit much. I think you should recast the existing hash_foreach() function to take a pointer as its fourth argument instead of an MFN, and then make the existing callers just cast their MFN argument as a pointer. The you can use the same function, passing a pointer to a struct { begin, end, removed }. Please make the changes to hash_foreach() in a separate patch from the dirty_vram stuff. > @@ -1211,12 +1164,14 @@ static int shadow_set_l1e(struct vcpu *v, > shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); > /* fall through */ > case 0: > - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > break; > } > } > } > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); Why is this being called twice here? Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 14:38:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 14:38:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvu0-00053w-EK; Thu, 01 Nov 2012 14:37:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvty-00053p-OX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 14:37:47 +0000 Received: from [85.158.143.35:26975] by server-1.bemta-4.messagelabs.com id 64/D7-27934-A3982905; Thu, 01 Nov 2012 14:37:46 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1351780644!5449422!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13855 invoked from network); 1 Nov 2012 14:37:24 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 14:37:24 -0000 X-IronPort-AV: E=Sophos;i="4.80,693,1344211200"; d="scan'208";a="15539926" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 14:37:23 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 14:37:23 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTvtb-0003DR-Ju; Thu, 01 Nov 2012 14:37:23 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTvta-00011F-Ur; Thu, 01 Nov 2012 14:37:23 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 14:37:23 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14294: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14294 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14294/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail in 14286 REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-i386-i386-xl-winxpsp3 3 host-install(3) broken pass in 14286 test-amd64-i386-win-vcpus1 3 host-install(3) broken in 14286 pass in 14294 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf pass test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 broken ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 14:38:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 14:38:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvu0-00053w-EK; Thu, 01 Nov 2012 14:37:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTvty-00053p-OX for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 14:37:47 +0000 Received: from [85.158.143.35:26975] by server-1.bemta-4.messagelabs.com id 64/D7-27934-A3982905; Thu, 01 Nov 2012 14:37:46 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1351780644!5449422!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13855 invoked from network); 1 Nov 2012 14:37:24 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 14:37:24 -0000 X-IronPort-AV: E=Sophos;i="4.80,693,1344211200"; d="scan'208";a="15539926" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 14:37:23 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 14:37:23 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTvtb-0003DR-Ju; Thu, 01 Nov 2012 14:37:23 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTvta-00011F-Ur; Thu, 01 Nov 2012 14:37:23 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 14:37:23 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14294: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14294 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14294/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail in 14286 REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-i386-i386-xl-winxpsp3 3 host-install(3) broken pass in 14286 test-amd64-i386-win-vcpus1 3 host-install(3) broken in 14286 pass in 14294 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf pass test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 broken ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 15:50:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 15:50:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx20-0006M3-LV; Thu, 01 Nov 2012 15:50:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx1z-0006Ly-Ig for xen-devel@lists.xen.org; Thu, 01 Nov 2012 15:50:07 +0000 Received: from [85.158.137.99:12700] by server-13.bemta-3.messagelabs.com id 44/0F-24887-E2A92905; Thu, 01 Nov 2012 15:50:06 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351785003!12206389!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3390 invoked from network); 1 Nov 2012 15:50:05 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 15:50:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,693,1344211200"; d="scan'208";a="213130606" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 01 Nov 2012 15:50:03 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Thu, 1 Nov 2012 11:50:02 -0400 Date: Thu, 1 Nov 2012 15:49:24 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Jan Beulich In-Reply-To: <504F625D020000780009AA85@nat28.tlf.novell.com> Message-ID: References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: xen-devel , George Dunlap , Konrad Rzeszutek Wilk , "fantonifabio@tiscali.it" Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 11 Sep 2012, Jan Beulich wrote: > >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > > xen.efi not compile when we build xen on Wheezy and probably is not > > possible boot with lvm volume, fallback options ecc... > > Just get a suitable tool chain installed then. > > > UEFI with grub2 seem the best option but with xen hypervisor seem not > > load efi variable. > > Sure, because only xen.efi has the code to deal with such. > > (Btw., I assume you aren't aware that any boot manager > whatsoever, other than the one coming with EFI, is sort of > bogus under EFI?) Unfortunately it looks like more and more people are of the opinion that grub2 is useful even on UEFI firmware. For example, it is pretty clear that Ubuntu is still going to boot Xen via grub2 no matter how the firmware looks like. What would it take to make Xen work properly with grub2 on a UEFI firmware? I think that we should add it as a work item for Xen 4.3. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 15:50:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 15:50:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx20-0006M3-LV; Thu, 01 Nov 2012 15:50:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx1z-0006Ly-Ig for xen-devel@lists.xen.org; Thu, 01 Nov 2012 15:50:07 +0000 Received: from [85.158.137.99:12700] by server-13.bemta-3.messagelabs.com id 44/0F-24887-E2A92905; Thu, 01 Nov 2012 15:50:06 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351785003!12206389!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODMyMzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3390 invoked from network); 1 Nov 2012 15:50:05 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 15:50:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,693,1344211200"; d="scan'208";a="213130606" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 01 Nov 2012 15:50:03 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Thu, 1 Nov 2012 11:50:02 -0400 Date: Thu, 1 Nov 2012 15:49:24 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Jan Beulich In-Reply-To: <504F625D020000780009AA85@nat28.tlf.novell.com> Message-ID: References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: xen-devel , George Dunlap , Konrad Rzeszutek Wilk , "fantonifabio@tiscali.it" Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 11 Sep 2012, Jan Beulich wrote: > >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > > xen.efi not compile when we build xen on Wheezy and probably is not > > possible boot with lvm volume, fallback options ecc... > > Just get a suitable tool chain installed then. > > > UEFI with grub2 seem the best option but with xen hypervisor seem not > > load efi variable. > > Sure, because only xen.efi has the code to deal with such. > > (Btw., I assume you aren't aware that any boot manager > whatsoever, other than the one coming with EFI, is sort of > bogus under EFI?) Unfortunately it looks like more and more people are of the opinion that grub2 is useful even on UEFI firmware. For example, it is pretty clear that Ubuntu is still going to boot Xen via grub2 no matter how the firmware looks like. What would it take to make Xen work properly with grub2 on a UEFI firmware? I think that we should add it as a work item for Xen 4.3. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 15:52:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 15:52:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx3v-0006Uk-62; Thu, 01 Nov 2012 15:52:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx3t-0006Ud-EI for xen-devel@lists.xen.org; Thu, 01 Nov 2012 15:52:05 +0000 Received: from [85.158.139.211:36512] by server-12.bemta-5.messagelabs.com id DC/40-02886-4AA92905; Thu, 01 Nov 2012 15:52:04 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1351785121!18453007!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12927 invoked from network); 1 Nov 2012 15:52:03 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 15:52:03 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1Fpp5i014342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 15:51:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1FpoWI015708 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 15:51:50 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Fpnjs032505; Thu, 1 Nov 2012 10:51:49 -0500 MIME-Version: 1.0 Message-ID: Date: Thu, 1 Nov 2012 08:51:45 -0700 (PDT) From: Dan Magenheimer To: Dario Faggioli , Tim Deegan References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <1351736001.18330.139.camel@Solace> In-Reply-To: <1351736001.18330.139.camel@Solace> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , xen-devel@lists.xen.org, Zhigang Wang , Ian Jackson Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Dario Faggioli [mailto:raistlin@linux.it] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On Mon, 2012-10-29 at 22:35 +0000, Tim Deegan wrote: > > At 10:06 -0700 on 29 Oct (1351505175), Dan Magenheimer wrote: > > > In the case of a dying domain, a XENMEM_release operation > > > is implied and must be executed by the hypervisor. > > > > > > Ideally, the quantity of unclaimed memory for each domain and > > > for the system should be query-able. This may require additional > > > memory_op hypercalls. > > > > > > I'd very much appreciate feedback on this proposed design! > > > > As I said, I'm not opposed to this, though even after reading through > > the other thread I'm not convinced that it's necessary (except in cases > > where guest-controlled operations are allowed to consume unbounded > > memory, which frankly gives me the heebie-jeebies). > > > Let me also ask something. > > Playing with NUMA systems I've been in the situation where it would be > nice to know not only how much free memory we have in general, but how > much free memory there is in a specific (set of) node(s), and that in > many places, from the hypervisor, to libxc, to top level toolstack. > > Right now I ask this to Xen, but that is indeed prone to races and > TOCTOU issues if we allow for domain creation and ballooning TOCTOU... hadn't seen that term before, but I agree it describes the problem succinctly. Thanks, I will begin using that now! > (tmem/paging/...) to happen concurrently between themselves and between > each other (as noted in the long thread that preceded this one). > > Question is, the "claim" mechanism you're proposing is by no means NUMA > node-aware, right? I hadn't thought about NUMA, but I think the claim mechanism could be augmented to attempt to stake a claim on a specified node, or on any node that has sufficient memory. AFAICT this might complicate the arithmetic a bit but should work. Let me prototype the NUMA-ignorant mechanism first though... Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 15:52:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 15:52:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx3v-0006Uk-62; Thu, 01 Nov 2012 15:52:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTx3t-0006Ud-EI for xen-devel@lists.xen.org; Thu, 01 Nov 2012 15:52:05 +0000 Received: from [85.158.139.211:36512] by server-12.bemta-5.messagelabs.com id DC/40-02886-4AA92905; Thu, 01 Nov 2012 15:52:04 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1351785121!18453007!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12927 invoked from network); 1 Nov 2012 15:52:03 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 15:52:03 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1Fpp5i014342 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 15:51:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1FpoWI015708 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 15:51:50 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Fpnjs032505; Thu, 1 Nov 2012 10:51:49 -0500 MIME-Version: 1.0 Message-ID: Date: Thu, 1 Nov 2012 08:51:45 -0700 (PDT) From: Dan Magenheimer To: Dario Faggioli , Tim Deegan References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <1351736001.18330.139.camel@Solace> In-Reply-To: <1351736001.18330.139.camel@Solace> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , xen-devel@lists.xen.org, Zhigang Wang , Ian Jackson Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Dario Faggioli [mailto:raistlin@linux.it] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On Mon, 2012-10-29 at 22:35 +0000, Tim Deegan wrote: > > At 10:06 -0700 on 29 Oct (1351505175), Dan Magenheimer wrote: > > > In the case of a dying domain, a XENMEM_release operation > > > is implied and must be executed by the hypervisor. > > > > > > Ideally, the quantity of unclaimed memory for each domain and > > > for the system should be query-able. This may require additional > > > memory_op hypercalls. > > > > > > I'd very much appreciate feedback on this proposed design! > > > > As I said, I'm not opposed to this, though even after reading through > > the other thread I'm not convinced that it's necessary (except in cases > > where guest-controlled operations are allowed to consume unbounded > > memory, which frankly gives me the heebie-jeebies). > > > Let me also ask something. > > Playing with NUMA systems I've been in the situation where it would be > nice to know not only how much free memory we have in general, but how > much free memory there is in a specific (set of) node(s), and that in > many places, from the hypervisor, to libxc, to top level toolstack. > > Right now I ask this to Xen, but that is indeed prone to races and > TOCTOU issues if we allow for domain creation and ballooning TOCTOU... hadn't seen that term before, but I agree it describes the problem succinctly. Thanks, I will begin using that now! > (tmem/paging/...) to happen concurrently between themselves and between > each other (as noted in the long thread that preceded this one). > > Question is, the "claim" mechanism you're proposing is by no means NUMA > node-aware, right? I hadn't thought about NUMA, but I think the claim mechanism could be augmented to attempt to stake a claim on a specified node, or on any node that has sufficient memory. AFAICT this might complicate the arithmetic a bit but should work. Let me prototype the NUMA-ignorant mechanism first though... Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 16:08:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 16:08:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxIu-0007Kn-MT; Thu, 01 Nov 2012 16:07:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxIs-0007Ki-FW for xen-devel@lists.xen.org; Thu, 01 Nov 2012 16:07:34 +0000 Received: from [85.158.138.51:33146] by server-10.bemta-3.messagelabs.com id AF/D5-19806-54E92905; Thu, 01 Nov 2012 16:07:33 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1351786051!20223178!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyMDIw\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1573 invoked from network); 1 Nov 2012 16:07:32 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-3.tower-174.messagelabs.com with SMTP; 1 Nov 2012 16:07:32 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 01 Nov 2012 09:06:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,693,1344236400"; d="scan'208";a="214023247" Received: from fmsmsx107.amr.corp.intel.com ([10.19.9.54]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2012 09:06:52 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX107.amr.corp.intel.com (10.19.9.54) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 09:06:52 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Fri, 2 Nov 2012 00:06:51 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 01/02] Handles broken page occurred before migration Thread-Index: AQHNuCIVIm/L3sGKQI2O8U05ITu8CJfVIufg Date: Thu, 1 Nov 2012 16:06:50 +0000 Message-ID: References: <50912B5F02000078000A5B8E@nat28.tlf.novell.com> <509259A0.9010509@eu.citrix.com> In-Reply-To: <509259A0.9010509@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Ian Jackson , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH 01/02] Handles broken page occurred before migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > Are you actually using "hg email" (or patchbomb) to send these? > > Having changes to patches included in-line to replies makes it hard to > keep track of what the newest version is. Tradition is to send the > whole series again, with "v2" or "v3" added to the end. If you're > using patchbomb, the relevant command would be: > > $ hg email -o --flag "v3" OK, I will use 'hg email' next time updating vmce patch. (I'm just not habit of using it, say, defaultly the patch is included as text in the email body for easy reviewing, but when I use 'a' hoping to attach patch file, the patch context disappear in the email body -- only patch description left in the email body) > > Also, the second patch doesn't seem to apply to xen-unstable tip > anymore -- can you rebase? > > -George Sure. Thanks, Jinsong > > On 31/10/12 17:14, Liu, Jinsong wrote: >> [snip] >>> If you use scope restricted local variables (which I appreciate), >>> please declare them in the innermost possible scope, ... >>> >>>> + >>>> + d = rcu_lock_domain_by_id(domctl->domain); + if ( >>>> d != NULL ) + { + pfn = >>>> domctl->u.set_broken_page_p2m.pfn; + + mfn = >>>> get_gfn_query(d, pfn, &pt); >>> ... i.e. here (and then both assignments can become initializers at >>> once). >>> >>>> + if ( !mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) ) + >>>> { + put_gfn(d, pfn); >>>> + rcu_unlock_domain(d); >>>> + ret = -EINVAL; >>>> + break; >>>> + } >>>> + >>>> + if ( p2m_change_type(d, pfn, pt, p2m_ram_broken) != >>>> pt ) + ret = -EINVAL; >>> The two if() conditions can be easily joined (the more that they >>> both produce -EINVAL). >>> >> Thanks, updated as attached. >> >> Jinsong >> >> ====================== >> >> Handles broken page occurred before migration >> >> This patch handles guest broken page which occurred before migration. >> >> At sender, the broken page would be mapped but not copied to target >> (otherwise it may trigger more serious error, say, SRAR error). >> While its pfn_type and pfn number would be transferred to target >> so that target take appropriate action. >> >> At target, it would set p2m as p2m_ram_broken for broken page, so >> that >> if guest access the broken page again, it would kill itself as >> expected. >> >> Signed-off-by: Liu, Jinsong >> >> diff -r e84a79d11d7a tools/libxc/xc_domain.c >> --- a/tools/libxc/xc_domain.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -283,6 +283,22 @@ return ret; >> } >> >> +/* set broken page p2m */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn) >> +{ >> + int ret; >> + DECLARE_DOMCTL; >> + >> + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; >> + domctl.domain = (domid_t)domid; >> + domctl.u.set_broken_page_p2m.pfn = pfn; >> + ret = do_domctl(xch, &domctl); >> + >> + return ret ? -1 : 0; >> +} >> + >> /* get info from hvm guest for save */ >> int xc_domain_hvm_getcontext(xc_interface *xch, >> uint32_t domid, >> diff -r e84a79d11d7a tools/libxc/xc_domain_restore.c >> --- a/tools/libxc/xc_domain_restore.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain_restore.c Thu Nov 01 07:52:41 2012 +0800 >> @@ -962,9 +962,15 @@ >> >> countpages = count; >> for (i = oldcount; i < buf->nr_pages; ++i) >> - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XTAB >> - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; >> + >> + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; >> + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || >> + pagetype == XEN_DOMCTL_PFINFO_BROKEN || >> + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> --countpages; + } >> >> if (!countpages) >> return count; >> @@ -1200,6 +1206,17 @@ >> /* a bogus/unmapped/allocate-only page: skip it */ >> continue; >> >> + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { >> + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + >> { + ERROR("Set p2m for broken page failed, " >> + "dom=%d, pfn=%lx\n", dom, pfn); >> + goto err_mapped; >> + } >> + continue; >> + } >> + >> if (pfn_err[i]) >> { >> ERROR("unexpected PFN mapping failure pfn %lx map_mfn >> %lx p2m_mfn %lx", >> diff -r e84a79d11d7a tools/libxc/xc_domain_save.c >> --- a/tools/libxc/xc_domain_save.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain_save.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -1277,6 +1277,13 @@ if ( !hvm ) >> gmfn = pfn_to_mfn(gmfn); >> >> + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + >> { + pfn_type[j] |= pfn_batch[j]; >> + ++run; >> + continue; >> + } >> + >> if ( pfn_err[j] ) >> { >> if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) >> @@ -1371,8 +1378,12 @@ } >> } >> >> - /* skip pages that aren't present or are alloc-only >> */ + /* + * skip pages that aren't >> present, + * or are broken, or are alloc-only + >> */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB >> + || pagetype == XEN_DOMCTL_PFINFO_BROKEN >> || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> continue; >> >> diff -r e84a79d11d7a tools/libxc/xenctrl.h >> --- a/tools/libxc/xenctrl.h Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xenctrl.h Thu Nov 01 07:52:41 2012 +0800 @@ -575,6 >> +575,17 @@ xc_domaininfo_t *info); >> >> /** >> + * This function set p2m for broken page >> + * &parm xch a handle to an open hypervisor interface >> + * @parm domid the domain id which broken page belong to >> + * @parm pfn the pfn number of the broken page >> + * @return 0 on success, -1 on failure >> + */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn); >> + >> +/** >> * This function returns information about the context of a hvm >> domain >> * @parm xch a handle to an open hypervisor interface >> * @parm domid the domain to get information from >> diff -r e84a79d11d7a xen/arch/x86/domctl.c >> --- a/xen/arch/x86/domctl.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/xen/arch/x86/domctl.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) >> { >> unsigned long type = 0; >> + p2m_type_t t; >> >> - page = get_page_from_gfn(d, arr[j], NULL, >> P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], >> &t, P2M_ALLOC); >> >> if ( unlikely(!page) || >> unlikely(is_xen_heap_page(page)) ) >> - type = XEN_DOMCTL_PFINFO_XTAB; + >> { + if ( p2m_is_broken(t) ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; + >> else + type = XEN_DOMCTL_PFINFO_XTAB; + >> } else >> { >> switch( page->u.inuse.type_info & >> PGT_type_mask ) @@ -235,6 +241,9 @@ >> >> if ( page->u.inuse.type_info & PGT_pinned ) >> type |= XEN_DOMCTL_PFINFO_LPINTAB; + >> + if ( page->count_info & PGC_broken ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; >> } >> >> if ( page ) >> @@ -1568,6 +1577,29 @@ >> } >> break; >> >> + case XEN_DOMCTL_set_broken_page_p2m: >> + { >> + struct domain *d; >> + >> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >> != NULL ) + { >> + p2m_type_t pt; >> + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; >> + mfn_t mfn = get_gfn_query(d, pfn, &pt); + >> + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) >> || + (p2m_change_type(d, pfn, pt, >> p2m_ram_broken) != pt)) ) + ret = -EINVAL; >> + >> + put_gfn(d, pfn); >> + rcu_unlock_domain(d); >> + } >> + else >> + ret = -ESRCH; >> + } >> + break; >> + >> default: >> ret = iommu_do_domctl(domctl, u_domctl); >> break; >> diff -r e84a79d11d7a xen/include/public/domctl.h >> --- a/xen/include/public/domctl.h Thu Nov 01 01:41:03 2012 +0800 >> +++ b/xen/include/public/domctl.h Thu Nov 01 07:52:41 2012 +0800 @@ >> -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) >> #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ >> #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page >> */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ >> #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) >> >> @@ -835,6 +836,12 @@ >> typedef struct xen_domctl_set_access_required >> xen_domctl_set_access_required_t; >> DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); >> >> +struct xen_domctl_set_broken_page_p2m { >> + uint64_aligned_t pfn; >> +}; >> +typedef struct xen_domctl_set_broken_page_p2m >> xen_domctl_set_broken_page_p2m_t; >> +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + >> struct xen_domctl { uint32_t cmd; >> #define XEN_DOMCTL_createdomain 1 @@ -900,6 >> +907,7 @@ #define XEN_DOMCTL_set_access_required 64 >> #define XEN_DOMCTL_audit_p2m 65 >> #define XEN_DOMCTL_set_virq_handler 66 >> +#define XEN_DOMCTL_set_broken_page_p2m 67 >> #define XEN_DOMCTL_gdbsx_guestmemio 1000 >> #define XEN_DOMCTL_gdbsx_pausevcpu 1001 >> #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 >> +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; >> struct xen_domctl_set_virq_handler set_virq_handler; >> struct xen_domctl_gdbsx_memio gdbsx_guest_memio; >> + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; >> struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; >> struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; >> uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 16:08:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 16:08:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxIu-0007Kn-MT; Thu, 01 Nov 2012 16:07:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxIs-0007Ki-FW for xen-devel@lists.xen.org; Thu, 01 Nov 2012 16:07:34 +0000 Received: from [85.158.138.51:33146] by server-10.bemta-3.messagelabs.com id AF/D5-19806-54E92905; Thu, 01 Nov 2012 16:07:33 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1351786051!20223178!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyMDIw\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1573 invoked from network); 1 Nov 2012 16:07:32 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-3.tower-174.messagelabs.com with SMTP; 1 Nov 2012 16:07:32 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 01 Nov 2012 09:06:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,693,1344236400"; d="scan'208";a="214023247" Received: from fmsmsx107.amr.corp.intel.com ([10.19.9.54]) by orsmga001.jf.intel.com with ESMTP; 01 Nov 2012 09:06:52 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX107.amr.corp.intel.com (10.19.9.54) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 09:06:52 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Fri, 2 Nov 2012 00:06:51 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 01/02] Handles broken page occurred before migration Thread-Index: AQHNuCIVIm/L3sGKQI2O8U05ITu8CJfVIufg Date: Thu, 1 Nov 2012 16:06:50 +0000 Message-ID: References: <50912B5F02000078000A5B8E@nat28.tlf.novell.com> <509259A0.9010509@eu.citrix.com> In-Reply-To: <509259A0.9010509@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Ian Jackson , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH 01/02] Handles broken page occurred before migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > Are you actually using "hg email" (or patchbomb) to send these? > > Having changes to patches included in-line to replies makes it hard to > keep track of what the newest version is. Tradition is to send the > whole series again, with "v2" or "v3" added to the end. If you're > using patchbomb, the relevant command would be: > > $ hg email -o --flag "v3" OK, I will use 'hg email' next time updating vmce patch. (I'm just not habit of using it, say, defaultly the patch is included as text in the email body for easy reviewing, but when I use 'a' hoping to attach patch file, the patch context disappear in the email body -- only patch description left in the email body) > > Also, the second patch doesn't seem to apply to xen-unstable tip > anymore -- can you rebase? > > -George Sure. Thanks, Jinsong > > On 31/10/12 17:14, Liu, Jinsong wrote: >> [snip] >>> If you use scope restricted local variables (which I appreciate), >>> please declare them in the innermost possible scope, ... >>> >>>> + >>>> + d = rcu_lock_domain_by_id(domctl->domain); + if ( >>>> d != NULL ) + { + pfn = >>>> domctl->u.set_broken_page_p2m.pfn; + + mfn = >>>> get_gfn_query(d, pfn, &pt); >>> ... i.e. here (and then both assignments can become initializers at >>> once). >>> >>>> + if ( !mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) ) + >>>> { + put_gfn(d, pfn); >>>> + rcu_unlock_domain(d); >>>> + ret = -EINVAL; >>>> + break; >>>> + } >>>> + >>>> + if ( p2m_change_type(d, pfn, pt, p2m_ram_broken) != >>>> pt ) + ret = -EINVAL; >>> The two if() conditions can be easily joined (the more that they >>> both produce -EINVAL). >>> >> Thanks, updated as attached. >> >> Jinsong >> >> ====================== >> >> Handles broken page occurred before migration >> >> This patch handles guest broken page which occurred before migration. >> >> At sender, the broken page would be mapped but not copied to target >> (otherwise it may trigger more serious error, say, SRAR error). >> While its pfn_type and pfn number would be transferred to target >> so that target take appropriate action. >> >> At target, it would set p2m as p2m_ram_broken for broken page, so >> that >> if guest access the broken page again, it would kill itself as >> expected. >> >> Signed-off-by: Liu, Jinsong >> >> diff -r e84a79d11d7a tools/libxc/xc_domain.c >> --- a/tools/libxc/xc_domain.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -283,6 +283,22 @@ return ret; >> } >> >> +/* set broken page p2m */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn) >> +{ >> + int ret; >> + DECLARE_DOMCTL; >> + >> + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; >> + domctl.domain = (domid_t)domid; >> + domctl.u.set_broken_page_p2m.pfn = pfn; >> + ret = do_domctl(xch, &domctl); >> + >> + return ret ? -1 : 0; >> +} >> + >> /* get info from hvm guest for save */ >> int xc_domain_hvm_getcontext(xc_interface *xch, >> uint32_t domid, >> diff -r e84a79d11d7a tools/libxc/xc_domain_restore.c >> --- a/tools/libxc/xc_domain_restore.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain_restore.c Thu Nov 01 07:52:41 2012 +0800 >> @@ -962,9 +962,15 @@ >> >> countpages = count; >> for (i = oldcount; i < buf->nr_pages; ++i) >> - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XTAB >> - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; >> + >> + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; >> + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || >> + pagetype == XEN_DOMCTL_PFINFO_BROKEN || >> + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> --countpages; + } >> >> if (!countpages) >> return count; >> @@ -1200,6 +1206,17 @@ >> /* a bogus/unmapped/allocate-only page: skip it */ >> continue; >> >> + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { >> + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + >> { + ERROR("Set p2m for broken page failed, " >> + "dom=%d, pfn=%lx\n", dom, pfn); >> + goto err_mapped; >> + } >> + continue; >> + } >> + >> if (pfn_err[i]) >> { >> ERROR("unexpected PFN mapping failure pfn %lx map_mfn >> %lx p2m_mfn %lx", >> diff -r e84a79d11d7a tools/libxc/xc_domain_save.c >> --- a/tools/libxc/xc_domain_save.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xc_domain_save.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -1277,6 +1277,13 @@ if ( !hvm ) >> gmfn = pfn_to_mfn(gmfn); >> >> + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + >> { + pfn_type[j] |= pfn_batch[j]; >> + ++run; >> + continue; >> + } >> + >> if ( pfn_err[j] ) >> { >> if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) >> @@ -1371,8 +1378,12 @@ } >> } >> >> - /* skip pages that aren't present or are alloc-only >> */ + /* + * skip pages that aren't >> present, + * or are broken, or are alloc-only + >> */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB >> + || pagetype == XEN_DOMCTL_PFINFO_BROKEN >> || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> continue; >> >> diff -r e84a79d11d7a tools/libxc/xenctrl.h >> --- a/tools/libxc/xenctrl.h Thu Nov 01 01:41:03 2012 +0800 >> +++ b/tools/libxc/xenctrl.h Thu Nov 01 07:52:41 2012 +0800 @@ -575,6 >> +575,17 @@ xc_domaininfo_t *info); >> >> /** >> + * This function set p2m for broken page >> + * &parm xch a handle to an open hypervisor interface >> + * @parm domid the domain id which broken page belong to >> + * @parm pfn the pfn number of the broken page >> + * @return 0 on success, -1 on failure >> + */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn); >> + >> +/** >> * This function returns information about the context of a hvm >> domain >> * @parm xch a handle to an open hypervisor interface >> * @parm domid the domain to get information from >> diff -r e84a79d11d7a xen/arch/x86/domctl.c >> --- a/xen/arch/x86/domctl.c Thu Nov 01 01:41:03 2012 +0800 >> +++ b/xen/arch/x86/domctl.c Thu Nov 01 07:52:41 2012 +0800 @@ >> -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) >> { >> unsigned long type = 0; >> + p2m_type_t t; >> >> - page = get_page_from_gfn(d, arr[j], NULL, >> P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], >> &t, P2M_ALLOC); >> >> if ( unlikely(!page) || >> unlikely(is_xen_heap_page(page)) ) >> - type = XEN_DOMCTL_PFINFO_XTAB; + >> { + if ( p2m_is_broken(t) ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; + >> else + type = XEN_DOMCTL_PFINFO_XTAB; + >> } else >> { >> switch( page->u.inuse.type_info & >> PGT_type_mask ) @@ -235,6 +241,9 @@ >> >> if ( page->u.inuse.type_info & PGT_pinned ) >> type |= XEN_DOMCTL_PFINFO_LPINTAB; + >> + if ( page->count_info & PGC_broken ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; >> } >> >> if ( page ) >> @@ -1568,6 +1577,29 @@ >> } >> break; >> >> + case XEN_DOMCTL_set_broken_page_p2m: >> + { >> + struct domain *d; >> + >> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >> != NULL ) + { >> + p2m_type_t pt; >> + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; >> + mfn_t mfn = get_gfn_query(d, pfn, &pt); + >> + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) >> || + (p2m_change_type(d, pfn, pt, >> p2m_ram_broken) != pt)) ) + ret = -EINVAL; >> + >> + put_gfn(d, pfn); >> + rcu_unlock_domain(d); >> + } >> + else >> + ret = -ESRCH; >> + } >> + break; >> + >> default: >> ret = iommu_do_domctl(domctl, u_domctl); >> break; >> diff -r e84a79d11d7a xen/include/public/domctl.h >> --- a/xen/include/public/domctl.h Thu Nov 01 01:41:03 2012 +0800 >> +++ b/xen/include/public/domctl.h Thu Nov 01 07:52:41 2012 +0800 @@ >> -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) >> #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ >> #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page >> */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ >> #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) >> >> @@ -835,6 +836,12 @@ >> typedef struct xen_domctl_set_access_required >> xen_domctl_set_access_required_t; >> DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); >> >> +struct xen_domctl_set_broken_page_p2m { >> + uint64_aligned_t pfn; >> +}; >> +typedef struct xen_domctl_set_broken_page_p2m >> xen_domctl_set_broken_page_p2m_t; >> +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + >> struct xen_domctl { uint32_t cmd; >> #define XEN_DOMCTL_createdomain 1 @@ -900,6 >> +907,7 @@ #define XEN_DOMCTL_set_access_required 64 >> #define XEN_DOMCTL_audit_p2m 65 >> #define XEN_DOMCTL_set_virq_handler 66 >> +#define XEN_DOMCTL_set_broken_page_p2m 67 >> #define XEN_DOMCTL_gdbsx_guestmemio 1000 >> #define XEN_DOMCTL_gdbsx_pausevcpu 1001 >> #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 >> +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; >> struct xen_domctl_set_virq_handler set_virq_handler; >> struct xen_domctl_gdbsx_memio gdbsx_guest_memio; >> + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; >> struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; >> struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; >> uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 16:43:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 16:43:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxrJ-0007zE-SF; Thu, 01 Nov 2012 16:43:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxrI-0007z9-3R for xen-devel@lists.xen.org; Thu, 01 Nov 2012 16:43:08 +0000 Received: from [85.158.143.99:36431] by server-1.bemta-4.messagelabs.com id 77/07-27934-B96A2905; Thu, 01 Nov 2012 16:43:07 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351788183!27691887!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9650 invoked from network); 1 Nov 2012 16:43:06 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-3.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 16:43:06 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1Ggvos024280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 16:42:58 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Ggudu007205 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 16:42:57 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Gguji002261; Thu, 1 Nov 2012 11:42:56 -0500 MIME-Version: 1.0 Message-ID: <38bc9a60-827c-41f8-a667-e08960b8c135@default> Date: Thu, 1 Nov 2012 09:42:52 -0700 (PDT) From: Dan Magenheimer To: Ian Campbell , Ian Jackson X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] Content-Type: multipart/mixed; boundary="__1351788176109146638abhmt102.oracle.com" X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] xen-tmem-list-parse: fix ugly parse output X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Hmmm... It appears I never posted the corrected version of this patch so it never made it upstream. See: http://lists.xen.org/archives/html/xen-devel/2011-11/msg00587.html=20 http://lists.xen.org/archives/html/xen-devel/2011-11/msg02145.html=20 It would be good if this very minor fix was also applied to 4.2 (and, if possible, 4.1). Thanks, Dan =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The program xen-tmem-list-parse parses the output of xm/xl tmem-list into human-readable format. A missing NULL terminator sometimes causes garbage to be spewed where the two-letter pool type should be output. Signed-off-by: Dan Magenheimer --- tools/misc/xen-tmem-list-parse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/misc/xen-tmem-list-parse.c b/tools/misc/xen-tmem-list-pa= rse.c index 977e4d3..f32b107 100644 --- a/tools/misc/xen-tmem-list-parse.c +++ b/tools/misc/xen-tmem-list-parse.c @@ -243,6 +243,7 @@ void parse_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; if (pool_type[1] =3D=3D 'S') return; /* no need to repeat print data for shared pools */ printf("domid%lu,id%lu[%s]:pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " @@ -286,6 +287,7 @@ void parse_shared_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; parse_sharers(s,"SC",buf,BUFSIZE); printf("poolid=3D%lu[%s] uuid=3D%llx.%llx, shared-by:%s: " "pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " --=20 1.7.1 --__1351788176109146638abhmt102.oracle.com Content-Type: application/octet-stream; name="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" RnJvbTogRGFuIE1hZ2VuaGVpbWVyIDxkYW4ubWFnZW5oZWltZXJAb3JhY2xlLmNvbT4KRGF0ZTog VGh1LCAxIE5vdiAyMDEyIDEwOjI0OjU2IC0wNjAwClN1YmplY3Q6IFtQQVRDSF0gRml4IHVnbHkg cGFyc2Ugb3V0cHV0IGZvciB4ZW4tdG1lbS1saXN0LXBhcnNlCgpUaGUgcHJvZ3JhbSB4ZW4tdG1l bS1saXN0LXBhcnNlIHBhcnNlcyB0aGUgb3V0cHV0IG9mIHhtL3hsIHRtZW0tbGlzdAppbnRvIGh1 bWFuLXJlYWRhYmxlIGZvcm1hdC4gIEEgbWlzc2luZyBOVUxMIHRlcm1pbmF0b3Igc29tZXRpbWVz CmNhdXNlcyBnYXJiYWdlIHRvIGJlIHNwZXdlZCB3aGVyZSB0aGUgdHdvLWxldHRlciBwb29sIHR5 cGUKc2hvdWxkIGJlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IERhbiBNYWdlbmhlaW1lciA8ZGFu Lm1hZ2VuaGVpbWVyQG9yYWNsZS5jb20+Ci0tLQogdG9vbHMvbWlzYy94ZW4tdG1lbS1saXN0LXBh cnNlLmMgfCAgICAyICsrCiAxIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9taXNjL3hlbi10bWVtLWxpc3QtcGFyc2UuYyBi L3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCmluZGV4IDk3N2U0ZDMuLmYzMmIxMDcg MTAwNjQ0Ci0tLSBhL3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCisrKyBiL3Rvb2xz L21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCkBAIC0yNDMsNiArMjQzLDcgQEAgdm9pZCBwYXJz ZV9wb29sKGNoYXIgKnMpCiAgICAgdW5zaWduZWQgbG9uZyBsb25nIGZsdXNoX29ianMgPSBwYXJz ZShzLCJvdCIpOwogCiAgICAgcGFyc2Vfc3RyaW5nKHMsIlBUIixwb29sX3R5cGUsMik7CisgICAg cG9vbF90eXBlWzJdID0gJ1wwJzsKICAgICBpZiAocG9vbF90eXBlWzFdID09ICdTJykKICAgICAg ICAgcmV0dXJuOyAvKiBubyBuZWVkIHRvIHJlcGVhdCBwcmludCBkYXRhIGZvciBzaGFyZWQgcG9v bHMgKi8KICAgICBwcmludGYoImRvbWlkJWx1LGlkJWx1WyVzXTpwZ3A9JWxsdShtYXg9JWxsdSkg b2JqPSVsbHUoJWxsdSkgIgpAQCAtMjg2LDYgKzI4Nyw3IEBAIHZvaWQgcGFyc2Vfc2hhcmVkX3Bv b2woY2hhciAqcykKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgZmx1c2hfb2JqcyA9IHBhcnNlKHMs Im90Iik7CiAKICAgICBwYXJzZV9zdHJpbmcocywiUFQiLHBvb2xfdHlwZSwyKTsKKyAgICBwb29s X3R5cGVbMl0gPSAnXDAnOwogICAgIHBhcnNlX3NoYXJlcnMocywiU0MiLGJ1ZixCVUZTSVpFKTsK ICAgICBwcmludGYoInBvb2xpZD0lbHVbJXNdIHV1aWQ9JWxseC4lbGx4LCBzaGFyZWQtYnk6JXM6 ICIKICAgICAgICAgICAgInBncD0lbGx1KG1heD0lbGx1KSBvYmo9JWxsdSglbGx1KSAiCi0tIAox LjcuMQoK --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__1351788176109146638abhmt102.oracle.com-- From xen-devel-bounces@lists.xen.org Thu Nov 01 16:43:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 16:43:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxrJ-0007zE-SF; Thu, 01 Nov 2012 16:43:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTxrI-0007z9-3R for xen-devel@lists.xen.org; Thu, 01 Nov 2012 16:43:08 +0000 Received: from [85.158.143.99:36431] by server-1.bemta-4.messagelabs.com id 77/07-27934-B96A2905; Thu, 01 Nov 2012 16:43:07 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351788183!27691887!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9650 invoked from network); 1 Nov 2012 16:43:06 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-3.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 16:43:06 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1Ggvos024280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 16:42:58 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Ggudu007205 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 16:42:57 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Gguji002261; Thu, 1 Nov 2012 11:42:56 -0500 MIME-Version: 1.0 Message-ID: <38bc9a60-827c-41f8-a667-e08960b8c135@default> Date: Thu, 1 Nov 2012 09:42:52 -0700 (PDT) From: Dan Magenheimer To: Ian Campbell , Ian Jackson X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] Content-Type: multipart/mixed; boundary="__1351788176109146638abhmt102.oracle.com" X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] xen-tmem-list-parse: fix ugly parse output X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Hmmm... It appears I never posted the corrected version of this patch so it never made it upstream. See: http://lists.xen.org/archives/html/xen-devel/2011-11/msg00587.html=20 http://lists.xen.org/archives/html/xen-devel/2011-11/msg02145.html=20 It would be good if this very minor fix was also applied to 4.2 (and, if possible, 4.1). Thanks, Dan =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The program xen-tmem-list-parse parses the output of xm/xl tmem-list into human-readable format. A missing NULL terminator sometimes causes garbage to be spewed where the two-letter pool type should be output. Signed-off-by: Dan Magenheimer --- tools/misc/xen-tmem-list-parse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/misc/xen-tmem-list-parse.c b/tools/misc/xen-tmem-list-pa= rse.c index 977e4d3..f32b107 100644 --- a/tools/misc/xen-tmem-list-parse.c +++ b/tools/misc/xen-tmem-list-parse.c @@ -243,6 +243,7 @@ void parse_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; if (pool_type[1] =3D=3D 'S') return; /* no need to repeat print data for shared pools */ printf("domid%lu,id%lu[%s]:pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " @@ -286,6 +287,7 @@ void parse_shared_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; parse_sharers(s,"SC",buf,BUFSIZE); printf("poolid=3D%lu[%s] uuid=3D%llx.%llx, shared-by:%s: " "pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " --=20 1.7.1 --__1351788176109146638abhmt102.oracle.com Content-Type: application/octet-stream; name="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" RnJvbTogRGFuIE1hZ2VuaGVpbWVyIDxkYW4ubWFnZW5oZWltZXJAb3JhY2xlLmNvbT4KRGF0ZTog VGh1LCAxIE5vdiAyMDEyIDEwOjI0OjU2IC0wNjAwClN1YmplY3Q6IFtQQVRDSF0gRml4IHVnbHkg cGFyc2Ugb3V0cHV0IGZvciB4ZW4tdG1lbS1saXN0LXBhcnNlCgpUaGUgcHJvZ3JhbSB4ZW4tdG1l bS1saXN0LXBhcnNlIHBhcnNlcyB0aGUgb3V0cHV0IG9mIHhtL3hsIHRtZW0tbGlzdAppbnRvIGh1 bWFuLXJlYWRhYmxlIGZvcm1hdC4gIEEgbWlzc2luZyBOVUxMIHRlcm1pbmF0b3Igc29tZXRpbWVz CmNhdXNlcyBnYXJiYWdlIHRvIGJlIHNwZXdlZCB3aGVyZSB0aGUgdHdvLWxldHRlciBwb29sIHR5 cGUKc2hvdWxkIGJlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IERhbiBNYWdlbmhlaW1lciA8ZGFu Lm1hZ2VuaGVpbWVyQG9yYWNsZS5jb20+Ci0tLQogdG9vbHMvbWlzYy94ZW4tdG1lbS1saXN0LXBh cnNlLmMgfCAgICAyICsrCiAxIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9taXNjL3hlbi10bWVtLWxpc3QtcGFyc2UuYyBi L3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCmluZGV4IDk3N2U0ZDMuLmYzMmIxMDcg MTAwNjQ0Ci0tLSBhL3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCisrKyBiL3Rvb2xz L21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCkBAIC0yNDMsNiArMjQzLDcgQEAgdm9pZCBwYXJz ZV9wb29sKGNoYXIgKnMpCiAgICAgdW5zaWduZWQgbG9uZyBsb25nIGZsdXNoX29ianMgPSBwYXJz ZShzLCJvdCIpOwogCiAgICAgcGFyc2Vfc3RyaW5nKHMsIlBUIixwb29sX3R5cGUsMik7CisgICAg cG9vbF90eXBlWzJdID0gJ1wwJzsKICAgICBpZiAocG9vbF90eXBlWzFdID09ICdTJykKICAgICAg ICAgcmV0dXJuOyAvKiBubyBuZWVkIHRvIHJlcGVhdCBwcmludCBkYXRhIGZvciBzaGFyZWQgcG9v bHMgKi8KICAgICBwcmludGYoImRvbWlkJWx1LGlkJWx1WyVzXTpwZ3A9JWxsdShtYXg9JWxsdSkg b2JqPSVsbHUoJWxsdSkgIgpAQCAtMjg2LDYgKzI4Nyw3IEBAIHZvaWQgcGFyc2Vfc2hhcmVkX3Bv b2woY2hhciAqcykKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgZmx1c2hfb2JqcyA9IHBhcnNlKHMs Im90Iik7CiAKICAgICBwYXJzZV9zdHJpbmcocywiUFQiLHBvb2xfdHlwZSwyKTsKKyAgICBwb29s X3R5cGVbMl0gPSAnXDAnOwogICAgIHBhcnNlX3NoYXJlcnMocywiU0MiLGJ1ZixCVUZTSVpFKTsK ICAgICBwcmludGYoInBvb2xpZD0lbHVbJXNdIHV1aWQ9JWxseC4lbGx4LCBzaGFyZWQtYnk6JXM6 ICIKICAgICAgICAgICAgInBncD0lbGx1KG1heD0lbGx1KSBvYmo9JWxsdSglbGx1KSAiCi0tIAox LjcuMQoK --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__1351788176109146638abhmt102.oracle.com-- From xen-devel-bounces@lists.xen.org Thu Nov 01 17:01:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTy8K-0008O2-NU; Thu, 01 Nov 2012 17:00:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTy8J-0008Nx-Fg for xen-devel@lists.xen.org; Thu, 01 Nov 2012 17:00:43 +0000 Received: from [85.158.137.99:37371] by server-16.bemta-3.messagelabs.com id E7/7E-07461-ABAA2905; Thu, 01 Nov 2012 17:00:42 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-217.messagelabs.com!1351789239!17332318!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16140 invoked from network); 1 Nov 2012 17:00:40 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 17:00:40 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTy7s-000HK2-JL; Thu, 01 Nov 2012 17:00:16 +0000 Date: Thu, 1 Nov 2012 17:00:16 +0000 From: Tim Deegan To: Peter Maloney Message-ID: <20121101170016.GD61948@ocelot.phlegethon.org> References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121022135920.GE12577@ocelot.phlegethon.org> User-Agent: Mutt/1.4.2.1i Cc: Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: > At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: > > The change was 8 months ago > > > > changeset: 24770:7f79475d3de7 > > user: Andres Lagar-Cavilla > > date: Fri Feb 10 16:07:07 2012 +0000 > > summary: x86/mm: Make p2m lookups fully synchronized wrt modifications > > This change was bad for performnace across the board and most of it has > since been either reverted or amended, but clearly we missed something > here. > > It's interesting that Win8 isn't slowed down. I wonder whether that's to > do with the way it drives the VGA card -- IIRC it uses a generic VESA > driver rather than a Cirrus one. In fact this is to do with the APIC. On my test system, a busy 2-vcpu VM is making about 300k/s accesses to the APIC TPR. These accesses are all trapped and emulated by Xen, and that emulation has got more expensive as part of this change. Later Windows OSes have a feature called 'lazy IRQL' which makes those accesses go away, but sadly that's not been done for WinXP. On modern Intel CPUs, the hardware acceleration for TPR accesses works for XP; on AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead of MMIO, which XP is clearly not doing. :( Peter: if you have the option, you might find that installing the PV drivers that ship with Citrix XenServer 6.0 makes things work better. Andres: even though this load of APIC emulations is pretty extreme, it's surprising that the VM runs faster on shadow pagetables! Any ideas for where this slowdown is coming from? Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:01:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:01:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTy8K-0008O2-NU; Thu, 01 Nov 2012 17:00:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTy8J-0008Nx-Fg for xen-devel@lists.xen.org; Thu, 01 Nov 2012 17:00:43 +0000 Received: from [85.158.137.99:37371] by server-16.bemta-3.messagelabs.com id E7/7E-07461-ABAA2905; Thu, 01 Nov 2012 17:00:42 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-217.messagelabs.com!1351789239!17332318!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16140 invoked from network); 1 Nov 2012 17:00:40 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 17:00:40 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TTy7s-000HK2-JL; Thu, 01 Nov 2012 17:00:16 +0000 Date: Thu, 1 Nov 2012 17:00:16 +0000 From: Tim Deegan To: Peter Maloney Message-ID: <20121101170016.GD61948@ocelot.phlegethon.org> References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121022135920.GE12577@ocelot.phlegethon.org> User-Agent: Mutt/1.4.2.1i Cc: Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: > At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: > > The change was 8 months ago > > > > changeset: 24770:7f79475d3de7 > > user: Andres Lagar-Cavilla > > date: Fri Feb 10 16:07:07 2012 +0000 > > summary: x86/mm: Make p2m lookups fully synchronized wrt modifications > > This change was bad for performnace across the board and most of it has > since been either reverted or amended, but clearly we missed something > here. > > It's interesting that Win8 isn't slowed down. I wonder whether that's to > do with the way it drives the VGA card -- IIRC it uses a generic VESA > driver rather than a Cirrus one. In fact this is to do with the APIC. On my test system, a busy 2-vcpu VM is making about 300k/s accesses to the APIC TPR. These accesses are all trapped and emulated by Xen, and that emulation has got more expensive as part of this change. Later Windows OSes have a feature called 'lazy IRQL' which makes those accesses go away, but sadly that's not been done for WinXP. On modern Intel CPUs, the hardware acceleration for TPR accesses works for XP; on AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead of MMIO, which XP is clearly not doing. :( Peter: if you have the option, you might find that installing the PV drivers that ship with Citrix XenServer 6.0 makes things work better. Andres: even though this load of APIC emulations is pretty extreme, it's surprising that the VM runs faster on shadow pagetables! Any ideas for where this slowdown is coming from? Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:29:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:29:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyZl-0000hX-1o; Thu, 01 Nov 2012 17:29:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyZj-0000hL-FN for xen-devel@lists.xen.org; Thu, 01 Nov 2012 17:29:03 +0000 Received: from [85.158.143.35:23122] by server-3.bemta-4.messagelabs.com id 87/EA-06841-E51B2905; Thu, 01 Nov 2012 17:29:02 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-6.tower-21.messagelabs.com!1351790939!15999624!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15369 invoked from network); 1 Nov 2012 17:29:00 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:29:00 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so2597405iam.32 for ; Thu, 01 Nov 2012 10:28:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=mFnGL9grTfH7TD+Wd+9+waZcIlRWY3kbRGXMqtoRDIA=; b=lz8iKo8swLODsOsUYo4chjFj0LIT7iF4Y7qGiSf1yXHn84Wy+9Lqf+k7TZEhi9WQ+1 FfEmxvpia8tKC/KrL5qV3nyRchAuxxjOx/HRh5fHoYUslijRJ2UrEg+e9uJd6joW5uno 0MsG/4tHzCm5t3JK0ObiUgX+G+GtkK5jVARVdksdGpV0bknvkRfPJ69kuAEU1FYdST1t i7CynsFbZbcXvxjxkB68IN8YXr73EPncv0hY2HdPkPk+Z3BM7XEG1YL2NjBtfjrP6QHw b1nUQqTNSd+MH280JyU/44WV1Z9pWuaWsZsZpdu5bxZsg/n+Fhr55yEuvSrHukToLXBr dx+Q== Received: by 10.50.212.8 with SMTP id ng8mr1982325igc.64.1351790938998; Thu, 01 Nov 2012 10:28:58 -0700 (PDT) Received: from andress-macbook.gridcentric.ca ([206.223.182.18]) by mx.google.com with ESMTPS id pq3sm13370056igc.8.2012.11.01.10.28.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 10:28:58 -0700 (PDT) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: <20121101170016.GD61948@ocelot.phlegethon.org> Date: Thu, 1 Nov 2012 13:28:59 -0400 Message-Id: References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> <20121101170016.GD61948@ocelot.phlegethon.org> To: Tim Deegan X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQmhYZEkDvP/b1Jrax0wsiPurRyuaxknOl3o6Gypc34ljhmvJTSTAK09c5zlJt3rdWZTs+Xw Cc: Peter Maloney , Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 1, 2012, at 1:00 PM, Tim Deegan wrote: > Hi, > > At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: >> At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: >>> The change was 8 months ago >>> >>> changeset: 24770:7f79475d3de7 >>> user: Andres Lagar-Cavilla >>> date: Fri Feb 10 16:07:07 2012 +0000 >>> summary: x86/mm: Make p2m lookups fully synchronized wrt modifications >> >> This change was bad for performnace across the board and most of it has >> since been either reverted or amended, but clearly we missed something >> here. >> >> It's interesting that Win8 isn't slowed down. I wonder whether that's to >> do with the way it drives the VGA card -- IIRC it uses a generic VESA >> driver rather than a Cirrus one. > > In fact this is to do with the APIC. On my test system, a busy 2-vcpu > VM is making about 300k/s accesses to the APIC TPR. These accesses are > all trapped and emulated by Xen, and that emulation has got more > expensive as part of this change. > > Later Windows OSes have a feature called 'lazy IRQL' which makes those > accesses go away, but sadly that's not been done for WinXP. On modern > Intel CPUs, the hardware acceleration for TPR accesses works for XP; on > AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead > of MMIO, which XP is clearly not doing. :( > > Peter: if you have the option, you might find that installing the PV > drivers that ship with Citrix XenServer 6.0 makes things work better. > > Andres: even though this load of APIC emulations is pretty extreme, it's > surprising that the VM runs faster on shadow pagetables! Any ideas for > where this slowdown is coming from? Not any immediate ideas without profiling. However, most callers of hvmemul_do_io pass a stub zero ram_gpa address. We might be madly hitting the p2m locks for no reason there. How about the following patch, Peter, Tim? diff -r 5171750d133e xen/arch/x86/hvm/emulate.c --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -60,24 +60,28 @@ static int hvmemul_do_io( ioreq_t *p = get_ioreq(curr); unsigned long ram_gfn = paddr_to_pfn(ram_gpa); p2m_type_t p2mt; - struct page_info *ram_page; + struct page_info *ram_page = NULL; int rc; /* Check for paged out page */ - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); - if ( p2m_is_paging(p2mt) ) + if ( ram_gpa != INVALID_MFN ) { - if ( ram_page ) - put_page(ram_page); - p2m_mem_paging_populate(curr->domain, ram_gfn); - return X86EMUL_RETRY; - } - if ( p2m_is_shared(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - return X86EMUL_RETRY; - } + ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); + if ( p2m_is_paging(p2mt) ) + { + if ( ram_page ) + put_page(ram_page); + p2m_mem_paging_populate(curr->domain, ram_gfn); + return X86EMUL_RETRY; + } + if ( p2m_is_shared(p2mt) ) + { + if ( ram_page ) + put_page(ram_page); + return X86EMUL_RETRY; + } + } else + value = 0; /* for pvalue */ /* * Weird-sized accesses have undefined behaviour: we discard writes @@ -455,7 +459,7 @@ static int __hvmemul_read( return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, p_data); } @@ -480,7 +484,8 @@ static int __hvmemul_read( addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); if ( rc != X86EMUL_OKAY ) return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, + IOREQ_READ, 0, p_data); case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -552,7 +557,7 @@ static int hvmemul_write( unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, p_data); } @@ -573,7 +578,7 @@ static int hvmemul_write( addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); if ( rc != X86EMUL_OKAY ) return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, p_data); case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; @@ -804,7 +809,7 @@ static int hvmemul_read_io( { unsigned long reps = 1; *val = 0; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, val); } static int hvmemul_write_io( @@ -814,7 +819,7 @@ static int hvmemul_write_io( struct x86_emulate_ctxt *ctxt) { unsigned long reps = 1; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, &val); } static int hvmemul_read_cr( diff -r 5171750d133e xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -231,7 +231,7 @@ int handle_pio(uint16_t port, int size, if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); + rc = hvmemul_do_pio(port, &reps, size, INVALID_MFN, dir, 0, &data); switch ( rc ) { > > Cheers, > > Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:29:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:29:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyZl-0000hX-1o; Thu, 01 Nov 2012 17:29:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyZj-0000hL-FN for xen-devel@lists.xen.org; Thu, 01 Nov 2012 17:29:03 +0000 Received: from [85.158.143.35:23122] by server-3.bemta-4.messagelabs.com id 87/EA-06841-E51B2905; Thu, 01 Nov 2012 17:29:02 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-6.tower-21.messagelabs.com!1351790939!15999624!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15369 invoked from network); 1 Nov 2012 17:29:00 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:29:00 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so2597405iam.32 for ; Thu, 01 Nov 2012 10:28:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=mFnGL9grTfH7TD+Wd+9+waZcIlRWY3kbRGXMqtoRDIA=; b=lz8iKo8swLODsOsUYo4chjFj0LIT7iF4Y7qGiSf1yXHn84Wy+9Lqf+k7TZEhi9WQ+1 FfEmxvpia8tKC/KrL5qV3nyRchAuxxjOx/HRh5fHoYUslijRJ2UrEg+e9uJd6joW5uno 0MsG/4tHzCm5t3JK0ObiUgX+G+GtkK5jVARVdksdGpV0bknvkRfPJ69kuAEU1FYdST1t i7CynsFbZbcXvxjxkB68IN8YXr73EPncv0hY2HdPkPk+Z3BM7XEG1YL2NjBtfjrP6QHw b1nUQqTNSd+MH280JyU/44WV1Z9pWuaWsZsZpdu5bxZsg/n+Fhr55yEuvSrHukToLXBr dx+Q== Received: by 10.50.212.8 with SMTP id ng8mr1982325igc.64.1351790938998; Thu, 01 Nov 2012 10:28:58 -0700 (PDT) Received: from andress-macbook.gridcentric.ca ([206.223.182.18]) by mx.google.com with ESMTPS id pq3sm13370056igc.8.2012.11.01.10.28.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 10:28:58 -0700 (PDT) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: <20121101170016.GD61948@ocelot.phlegethon.org> Date: Thu, 1 Nov 2012 13:28:59 -0400 Message-Id: References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> <20121101170016.GD61948@ocelot.phlegethon.org> To: Tim Deegan X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQmhYZEkDvP/b1Jrax0wsiPurRyuaxknOl3o6Gypc34ljhmvJTSTAK09c5zlJt3rdWZTs+Xw Cc: Peter Maloney , Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 1, 2012, at 1:00 PM, Tim Deegan wrote: > Hi, > > At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: >> At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: >>> The change was 8 months ago >>> >>> changeset: 24770:7f79475d3de7 >>> user: Andres Lagar-Cavilla >>> date: Fri Feb 10 16:07:07 2012 +0000 >>> summary: x86/mm: Make p2m lookups fully synchronized wrt modifications >> >> This change was bad for performnace across the board and most of it has >> since been either reverted or amended, but clearly we missed something >> here. >> >> It's interesting that Win8 isn't slowed down. I wonder whether that's to >> do with the way it drives the VGA card -- IIRC it uses a generic VESA >> driver rather than a Cirrus one. > > In fact this is to do with the APIC. On my test system, a busy 2-vcpu > VM is making about 300k/s accesses to the APIC TPR. These accesses are > all trapped and emulated by Xen, and that emulation has got more > expensive as part of this change. > > Later Windows OSes have a feature called 'lazy IRQL' which makes those > accesses go away, but sadly that's not been done for WinXP. On modern > Intel CPUs, the hardware acceleration for TPR accesses works for XP; on > AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead > of MMIO, which XP is clearly not doing. :( > > Peter: if you have the option, you might find that installing the PV > drivers that ship with Citrix XenServer 6.0 makes things work better. > > Andres: even though this load of APIC emulations is pretty extreme, it's > surprising that the VM runs faster on shadow pagetables! Any ideas for > where this slowdown is coming from? Not any immediate ideas without profiling. However, most callers of hvmemul_do_io pass a stub zero ram_gpa address. We might be madly hitting the p2m locks for no reason there. How about the following patch, Peter, Tim? diff -r 5171750d133e xen/arch/x86/hvm/emulate.c --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -60,24 +60,28 @@ static int hvmemul_do_io( ioreq_t *p = get_ioreq(curr); unsigned long ram_gfn = paddr_to_pfn(ram_gpa); p2m_type_t p2mt; - struct page_info *ram_page; + struct page_info *ram_page = NULL; int rc; /* Check for paged out page */ - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); - if ( p2m_is_paging(p2mt) ) + if ( ram_gpa != INVALID_MFN ) { - if ( ram_page ) - put_page(ram_page); - p2m_mem_paging_populate(curr->domain, ram_gfn); - return X86EMUL_RETRY; - } - if ( p2m_is_shared(p2mt) ) - { - if ( ram_page ) - put_page(ram_page); - return X86EMUL_RETRY; - } + ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); + if ( p2m_is_paging(p2mt) ) + { + if ( ram_page ) + put_page(ram_page); + p2m_mem_paging_populate(curr->domain, ram_gfn); + return X86EMUL_RETRY; + } + if ( p2m_is_shared(p2mt) ) + { + if ( ram_page ) + put_page(ram_page); + return X86EMUL_RETRY; + } + } else + value = 0; /* for pvalue */ /* * Weird-sized accesses have undefined behaviour: we discard writes @@ -455,7 +459,7 @@ static int __hvmemul_read( return X86EMUL_UNHANDLEABLE; gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, p_data); } @@ -480,7 +484,8 @@ static int __hvmemul_read( addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); if ( rc != X86EMUL_OKAY ) return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, + IOREQ_READ, 0, p_data); case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; case HVMCOPY_gfn_shared: @@ -552,7 +557,7 @@ static int hvmemul_write( unsigned int off = addr & (PAGE_SIZE - 1); gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); if ( (off + bytes) <= PAGE_SIZE ) - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, p_data); } @@ -573,7 +578,7 @@ static int hvmemul_write( addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); if ( rc != X86EMUL_OKAY ) return rc; - return hvmemul_do_mmio(gpa, &reps, bytes, 0, + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, p_data); case HVMCOPY_gfn_paged_out: return X86EMUL_RETRY; @@ -804,7 +809,7 @@ static int hvmemul_read_io( { unsigned long reps = 1; *val = 0; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, val); } static int hvmemul_write_io( @@ -814,7 +819,7 @@ static int hvmemul_write_io( struct x86_emulate_ctxt *ctxt) { unsigned long reps = 1; - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, &val); } static int hvmemul_read_cr( diff -r 5171750d133e xen/arch/x86/hvm/io.c --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -231,7 +231,7 @@ int handle_pio(uint16_t port, int size, if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); + rc = hvmemul_do_pio(port, &reps, size, INVALID_MFN, dir, 0, &data); switch ( rc ) { > > Cheers, > > Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:43:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:43:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTymq-00017O-C9; Thu, 01 Nov 2012 17:42:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTymp-00017J-Kc for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:42:35 +0000 Received: from [85.158.138.51:9127] by server-15.bemta-3.messagelabs.com id E2/0A-09445-A84B2905; Thu, 01 Nov 2012 17:42:34 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1351791754!19427771!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23024 invoked from network); 1 Nov 2012 17:42:34 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:42:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15543619" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 17:42:33 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 17:42:32 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTymm-0004cT-UB; Thu, 01 Nov 2012 17:42:32 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTymm-0008Ei-Nh; Thu, 01 Nov 2012 17:42:32 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 17:42:32 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14299: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14299 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14299/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-pv 5 xen-boot fail REGR. vs. 14199 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14199 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14199 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14199 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv fail test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit 27d0858dbcf199838b8c50a3e94d397bf326d986 Author: Greg Kroah-Hartman Date: Wed Oct 31 09:51:59 2012 -0700 Linux 3.0.50 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:43:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:43:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTymq-00017O-C9; Thu, 01 Nov 2012 17:42:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTymp-00017J-Kc for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:42:35 +0000 Received: from [85.158.138.51:9127] by server-15.bemta-3.messagelabs.com id E2/0A-09445-A84B2905; Thu, 01 Nov 2012 17:42:34 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1351791754!19427771!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23024 invoked from network); 1 Nov 2012 17:42:34 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:42:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15543619" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 17:42:33 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 17:42:32 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTymm-0004cT-UB; Thu, 01 Nov 2012 17:42:32 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TTymm-0008Ei-Nh; Thu, 01 Nov 2012 17:42:32 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 1 Nov 2012 17:42:32 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14299: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14299 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14299/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-pv 5 xen-boot fail REGR. vs. 14199 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14199 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14199 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14199 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv fail test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit 27d0858dbcf199838b8c50a3e94d397bf326d986 Author: Greg Kroah-Hartman Date: Wed Oct 31 09:51:59 2012 -0700 Linux 3.0.50 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:46:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:46:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyqh-0001H3-1V; Thu, 01 Nov 2012 17:46:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyqf-0001Gx-VO for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:46:34 +0000 Received: from [85.158.139.83:3738] by server-4.bemta-5.messagelabs.com id E0/15-15011-975B2905; Thu, 01 Nov 2012 17:46:33 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1351791992!28333682!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15291 invoked from network); 1 Nov 2012 17:46:32 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:46:32 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15543667" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 17:46:19 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 17:46:18 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTyqQ-0004dw-KA; Thu, 01 Nov 2012 17:46:18 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TTyqQ-0002qi-9x; Thu, 01 Nov 2012 17:46:18 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20626.46441.914578.814812@mariner.uk.xensource.com> Date: Thu, 1 Nov 2012 17:46:17 +0000 To: xen.org Cc: "xen-devel@lists.xensource.com" , Tim Deegan , Ian Campbell , Jan Beulich Subject: [Xen-devel] [PATCH 4.2] properly handle errors from page sharing hypercalls X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xen.org writes ("[xen-4.2-testing bisection] complete test-i386-i386-xl"): > branch xen-4.2-testing > xen branch xen-4.2-testing > job test-i386-i386-xl > test guest-start > > Tree: linux git://xenbits.xen.org/linux-pvops.git > Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git > Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg > > *** Found and reproduced problem changeset *** > > Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg > Bug introduced: 051e2a30e3fb > Bug not present: c23d938e3e64 > > > changeset: 25886:051e2a30e3fb > user: Ian Campbell > date: Fri Oct 26 16:40:18 2012 +0100 > > libxl: handle errors from xc_sharing_* info functions > > On a 32 bit hypervisor xl info currently reports: > sharing_freed_memory : 72057594037927935 > sharing_used_memory : 72057594037927935 > > Eat the ENOSYS and turn it into 0. Log and propagate other errors. > > I don't have a 32 bit system handy, so tested on x86_64 with a libxc > hacked to return -ENOSYS and -EINVAL. > > Signed-off-by: Ian Campbell > Acked-by: Ian Jackson > Acked-by: Andres Lagar-Cavilla > Committed-by: Ian Campbell > > xen-unstable changeset: 25894:95a971c8058f > Backport-requested-by: Ian Campbell > Committed-by: Ian Jackson I have been investigating this. I don't see how it could possibly have ever worked. AFAICT the problem is as follows: * XENMEM_get_sharing_freed_pages is handled by subarch_memory_op. On 32-bit, it is not supported and returs ENOSYS. * Eventually, this causes the ioctl IOCTL_PRIVCMD_HYPERCALL to return -1 setting errno to ENOSYS. This return value is propagated by libxc, with xc_sharing_freed_pages returning -1. * So in libxl_get_physinfo l==-1. But the code mistakenly assumes that xc_sharing_freed_pages would have returned -errno. We therefore take the LIBXL__LOG_ERRNOVAL branch. * Additionally because we failed to make the errno value nonnegative again (if l is -errno, then LIBXL__LOG_ERRNOVAL should take -l for the errno value), libxl__logv does not in fact log the supposed errno value of 1. (Which would be EPERM.) I don't think this patch in this form can ever have worked as intended. The only reason we didn't spot that this doesn't work when this patch was tested in xen-unstable is that xen-unstable doesn't have 32-bit any more. The tests described in the commit message must have involved making the same mistake as in the patch, of course. I have committed the attached patch to xen-4.2-testing.hg. Hopefully this will get us a test push. After that we should consider what other backports are needed. Ian. # HG changeset patch # User Ian Jackson # Date 1351791764 0 # Node ID 9d2ad9218dcc5a541ca09f47f60d7c3fec1039eb # Parent 4727c234198d51fdd248c3ba92560faa147b2ac6 libxl: properly handle errors from page sharing hypercalls 25886:051e2a30e3fb (25894:95a971c8058f in xen-unstable) is wrong because it assumes that xc_sharing_freed_pages etc. return -errnoval on error. However, like other libxc calls they return -1 setting errno. Correct this, checking for l<0 and then testing errno against ENOSYS, and also log the correct errno value. Signed-off-by: Ian Jackson Committed-by: Ian Jackson diff -r 4727c234198d -r 9d2ad9218dcc tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Oct 26 17:03:13 2012 +0100 +++ b/tools/libxl/libxl.c Thu Nov 01 17:42:44 2012 +0000 @@ -3653,21 +3653,25 @@ int libxl_get_physinfo(libxl_ctx *ctx, l physinfo->free_pages = xcphysinfo.free_pages; physinfo->scrub_pages = xcphysinfo.scrub_pages; l = xc_sharing_freed_pages(ctx->xch); - if (l == -ENOSYS) { - l = 0; - } else if (l < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l, - "getting sharing freed pages"); - return ERROR_FAIL; + if (l < 0) { + if (errno == ENOSYS) { + l = 0; + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting sharing freed pages"); + return ERROR_FAIL; + } } physinfo->sharing_freed_pages = l; l = xc_sharing_used_frames(ctx->xch); - if (l == -ENOSYS) { - l = 0; - } else if (l < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l, - "getting sharing used frames"); - return ERROR_FAIL; + if (l < 0) { + if (errno == ENOSYS) { + l = 0; + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting sharing used frames"); + return ERROR_FAIL; + } } physinfo->sharing_used_frames = l; physinfo->nr_nodes = xcphysinfo.nr_nodes; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 17:46:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 17:46:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyqh-0001H3-1V; Thu, 01 Nov 2012 17:46:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyqf-0001Gx-VO for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:46:34 +0000 Received: from [85.158.139.83:3738] by server-4.bemta-5.messagelabs.com id E0/15-15011-975B2905; Thu, 01 Nov 2012 17:46:33 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1351791992!28333682!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15291 invoked from network); 1 Nov 2012 17:46:32 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 17:46:32 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15543667" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 17:46:19 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 17:46:18 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TTyqQ-0004dw-KA; Thu, 01 Nov 2012 17:46:18 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TTyqQ-0002qi-9x; Thu, 01 Nov 2012 17:46:18 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20626.46441.914578.814812@mariner.uk.xensource.com> Date: Thu, 1 Nov 2012 17:46:17 +0000 To: xen.org Cc: "xen-devel@lists.xensource.com" , Tim Deegan , Ian Campbell , Jan Beulich Subject: [Xen-devel] [PATCH 4.2] properly handle errors from page sharing hypercalls X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xen.org writes ("[xen-4.2-testing bisection] complete test-i386-i386-xl"): > branch xen-4.2-testing > xen branch xen-4.2-testing > job test-i386-i386-xl > test guest-start > > Tree: linux git://xenbits.xen.org/linux-pvops.git > Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git > Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg > > *** Found and reproduced problem changeset *** > > Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg > Bug introduced: 051e2a30e3fb > Bug not present: c23d938e3e64 > > > changeset: 25886:051e2a30e3fb > user: Ian Campbell > date: Fri Oct 26 16:40:18 2012 +0100 > > libxl: handle errors from xc_sharing_* info functions > > On a 32 bit hypervisor xl info currently reports: > sharing_freed_memory : 72057594037927935 > sharing_used_memory : 72057594037927935 > > Eat the ENOSYS and turn it into 0. Log and propagate other errors. > > I don't have a 32 bit system handy, so tested on x86_64 with a libxc > hacked to return -ENOSYS and -EINVAL. > > Signed-off-by: Ian Campbell > Acked-by: Ian Jackson > Acked-by: Andres Lagar-Cavilla > Committed-by: Ian Campbell > > xen-unstable changeset: 25894:95a971c8058f > Backport-requested-by: Ian Campbell > Committed-by: Ian Jackson I have been investigating this. I don't see how it could possibly have ever worked. AFAICT the problem is as follows: * XENMEM_get_sharing_freed_pages is handled by subarch_memory_op. On 32-bit, it is not supported and returs ENOSYS. * Eventually, this causes the ioctl IOCTL_PRIVCMD_HYPERCALL to return -1 setting errno to ENOSYS. This return value is propagated by libxc, with xc_sharing_freed_pages returning -1. * So in libxl_get_physinfo l==-1. But the code mistakenly assumes that xc_sharing_freed_pages would have returned -errno. We therefore take the LIBXL__LOG_ERRNOVAL branch. * Additionally because we failed to make the errno value nonnegative again (if l is -errno, then LIBXL__LOG_ERRNOVAL should take -l for the errno value), libxl__logv does not in fact log the supposed errno value of 1. (Which would be EPERM.) I don't think this patch in this form can ever have worked as intended. The only reason we didn't spot that this doesn't work when this patch was tested in xen-unstable is that xen-unstable doesn't have 32-bit any more. The tests described in the commit message must have involved making the same mistake as in the patch, of course. I have committed the attached patch to xen-4.2-testing.hg. Hopefully this will get us a test push. After that we should consider what other backports are needed. Ian. # HG changeset patch # User Ian Jackson # Date 1351791764 0 # Node ID 9d2ad9218dcc5a541ca09f47f60d7c3fec1039eb # Parent 4727c234198d51fdd248c3ba92560faa147b2ac6 libxl: properly handle errors from page sharing hypercalls 25886:051e2a30e3fb (25894:95a971c8058f in xen-unstable) is wrong because it assumes that xc_sharing_freed_pages etc. return -errnoval on error. However, like other libxc calls they return -1 setting errno. Correct this, checking for l<0 and then testing errno against ENOSYS, and also log the correct errno value. Signed-off-by: Ian Jackson Committed-by: Ian Jackson diff -r 4727c234198d -r 9d2ad9218dcc tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Oct 26 17:03:13 2012 +0100 +++ b/tools/libxl/libxl.c Thu Nov 01 17:42:44 2012 +0000 @@ -3653,21 +3653,25 @@ int libxl_get_physinfo(libxl_ctx *ctx, l physinfo->free_pages = xcphysinfo.free_pages; physinfo->scrub_pages = xcphysinfo.scrub_pages; l = xc_sharing_freed_pages(ctx->xch); - if (l == -ENOSYS) { - l = 0; - } else if (l < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l, - "getting sharing freed pages"); - return ERROR_FAIL; + if (l < 0) { + if (errno == ENOSYS) { + l = 0; + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting sharing freed pages"); + return ERROR_FAIL; + } } physinfo->sharing_freed_pages = l; l = xc_sharing_used_frames(ctx->xch); - if (l == -ENOSYS) { - l = 0; - } else if (l < 0) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, l, - "getting sharing used frames"); - return ERROR_FAIL; + if (l < 0) { + if (errno == ENOSYS) { + l = 0; + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting sharing used frames"); + return ERROR_FAIL; + } } physinfo->sharing_used_frames = l; physinfo->nr_nodes = xcphysinfo.nr_nodes; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 18:05:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 18:05:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTz8x-0001n9-V6; Thu, 01 Nov 2012 18:05:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyQG-0000KB-4R for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:19:16 +0000 Received: from [85.158.139.211:63750] by server-16.bemta-5.messagelabs.com id 67/75-04786-31FA2905; Thu, 01 Nov 2012 17:19:15 +0000 X-Env-Sender: rdunlap@infradead.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1351790352!18512055!1 X-Originating-IP: [85.118.1.10] X-SpamReason: No, hits=2.3 required=7.0 tests=UNIQUE_WORDS, UPPERCASE_50_75 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19379 invoked from network); 1 Nov 2012 17:19:13 -0000 Received: from casper.infradead.org (HELO casper.infradead.org) (85.118.1.10) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 17:19:13 -0000 Received: from static-50-53-38-135.bvtn.or.frontiernet.net ([50.53.38.135] helo=[192.168.1.7]) by casper.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1TTyPq-0000es-S5; Thu, 01 Nov 2012 17:18:51 +0000 Message-ID: <5092AEF7.5020609@infradead.org> Date: Thu, 01 Nov 2012 10:18:47 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Stephen Rothwell References: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> In-Reply-To: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> Content-Type: multipart/mixed; boundary="------------010605010902080307000907" X-Mailman-Approved-At: Thu, 01 Nov 2012 18:05:25 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-next@vger.kernel.org Subject: Re: [Xen-devel] linux-next: Tree for Nov 1 (xen) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------010605010902080307000907 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 10/31/2012 10:36 PM, Stephen Rothwell wrote: > Hi all, > > New trees: rr-fixes and swiotlb > > Changes since 20121031: > arch/x86/xen/enlighten.c:109:0: warning: "xen_pvh_domain" redefined include/xen/xen.h:23:0: note: this is the location of the previous definition Full randconfig file is attached. -- ~Randy --------------010605010902080307000907 Content-Type: text/plain; name="config-r8493" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="config-r8493" # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.7.0-rc3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y CONFIG_FHANDLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y # CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set # # RCU Subsystem # CONFIG_TINY_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y # CONFIG_TREE_RCU_TRACE is not set CONFIG_RCU_BOOST=y CONFIG_RCU_BOOST_PRIO=1 CONFIG_RCU_BOOST_DELAY=500 CONFIG_IKCONFIG=m CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y # CONFIG_IPC_NS is not set # CONFIG_PID_NS is not set # CONFIG_SCHED_AUTOGROUP is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_BLK_DEV_INITRD is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_ANON_INODES=y CONFIG_EXPERT=y CONFIG_HAVE_UID16=y CONFIG_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_HOTPLUG=y # CONFIG_PRINTK is not set CONFIG_BUG=y CONFIG_ELF_CORE=y # CONFIG_PCSPKR_PLATFORM is not set CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y # CONFIG_EPOLL is not set # CONFIG_SIGNALFD is not set # CONFIG_TIMERFD is not set # CONFIG_EVENTFD is not set # CONFIG_SHMEM is not set # CONFIG_AIO is not set # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y # # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_PROFILING=y # CONFIG_OPROFILE is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_KRETPROBES=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_GENERIC_KERNEL_THREAD=y CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_RCU_USER_QS=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_FORCE=y # CONFIG_MODULE_SIG_SHA1 is not set # CONFIG_MODULE_SIG_SHA224 is not set CONFIG_MODULE_SIG_SHA256=y # CONFIG_MODULE_SIG_SHA384 is not set # CONFIG_MODULE_SIG_SHA512 is not set # CONFIG_BLOCK is not set CONFIG_ASN1=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_FREEZER=y # # Processor type and features # # CONFIG_ZONE_DMA is not set # CONFIG_SMP is not set CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_KVMTOOL_TEST_ENABLE is not set CONFIG_PARAVIRT_GUEST=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_XEN=y # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set CONFIG_XEN_X86_PVH=y # CONFIG_KVM_GUEST is not set CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_DEBUG=y CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y # CONFIG_DMI is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=1 # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y # CONFIG_X86_MCE_AMD is not set CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_INJECT=m CONFIG_X86_THERMAL_VECTOR=y CONFIG_I8K=m # CONFIG_MICROCODE is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DIRECT_GBPAGES=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y # CONFIG_SPARSEMEM_VMEMMAP is not set CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 # CONFIG_COMPACTION is not set CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_NEED_PER_CPU_KM=y CONFIG_CLEANCACHE=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 # CONFIG_X86_PAT is not set # CONFIG_ARCH_RANDOM is not set CONFIG_X86_SMAP=y # CONFIG_SECCOMP is not set CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="" CONFIG_CMDLINE_OVERRIDE=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_PM_SLEEP=y CONFIG_PM_AUTOSLEEP=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=100 # CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set # CONFIG_SFI is not set # # CPU Frequency scaling # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # # x86 CPU frequency scaling drivers # CONFIG_X86_P4_CLOCKMOD=m # # shared options # CONFIG_X86_SPEEDSTEP_LIB=m # CONFIG_CPU_IDLE is not set # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # # Memory power savings # # CONFIG_I7300_IDLE is not set # # Bus options (PCI etc.) # # CONFIG_PCI is not set # CONFIG_ISA_DMA_API is not set CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y # # PC-card bridges # # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m # CONFIG_X86_X32 is not set CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_X86_DEV_DMA_OPS=y # CONFIG_NET is not set CONFIG_HAVE_BPF_JIT=y # # Device Drivers # # # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="" # CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_DEBUG_DRIVER=y CONFIG_DEBUG_DEVRES=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_SPI=y CONFIG_REGMAP_IRQ=y # CONFIG_DMA_SHARED_BUFFER is not set # # Bus devices # CONFIG_OMAP_OCP2SCP=m # CONFIG_MTD is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PC is not set # CONFIG_PARPORT_GSC is not set # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y # # Misc devices # # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_AD525X_DPOT=m # CONFIG_AD525X_DPOT_SPI is not set CONFIG_ENCLOSURE_SERVICES=m # CONFIG_TI_DAC7512 is not set # CONFIG_VMWARE_BALLOON is not set CONFIG_BMP085=y CONFIG_BMP085_SPI=m # CONFIG_C2PORT is not set # # EEPROM support # CONFIG_EEPROM_AT25=m # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set # # Texas Instruments shared transport line discipline # # CONFIG_SENSORS_LIS3_SPI is not set # # Altera FPGA firmware download module # CONFIG_HAVE_IDE=y # # SCSI device support # CONFIG_SCSI_MOD=y # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set CONFIG_MACINTOSH_DRIVERS=y # # Input device support # CONFIG_INPUT=m # CONFIG_INPUT_FF_MEMLESS is not set CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_MC13783_PWRBUTTON=m # CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_DA9052_ONKEY=m # CONFIG_INPUT_PCAP is not set CONFIG_INPUT_ADXL34X=m # CONFIG_INPUT_ADXL34X_SPI is not set # CONFIG_INPUT_CMA3000 is not set # CONFIG_INPUT_XEN_KBDDEV_FRONTEND is not set # # Hardware I/O ports # CONFIG_SERIO=m CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m # CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set CONFIG_SERIO_ALTERA_PS2=m # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_ARC_PS2=m # CONFIG_GAMEPORT is not set # # Character devices # # CONFIG_VT is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_TRACE_SINK is not set CONFIG_DEVKMEM=y # # Serial drivers # CONFIG_SERIAL_8250=m CONFIG_FIX_EARLYCON_MEM=y # CONFIG_SERIAL_8250_CS is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set CONFIG_SERIAL_MAX310X=y CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_XILINX_PS_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_TTY_PRINTK=y # CONFIG_PRINTER is not set # CONFIG_PPDEV is not set CONFIG_HVC_DRIVER=y # CONFIG_HVC_XEN is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_PANIC_EVENT=y CONFIG_IPMI_PANIC_STRING=y # CONFIG_IPMI_DEVICE_INTERFACE is not set CONFIG_IPMI_SI=m # CONFIG_IPMI_WATCHDOG is not set CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_VIA is not set # CONFIG_HW_RANDOM_VIRTIO is not set # CONFIG_NVRAM is not set # CONFIG_R3964 is not set # # PCMCIA character devices # CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m # CONFIG_CARDMAN_4040 is not set # CONFIG_MWAVE is not set # CONFIG_HANGCHECK_TIMER is not set # CONFIG_TCG_TPM is not set CONFIG_TELCLOCK=m # CONFIG_I2C is not set CONFIG_SPI=y CONFIG_SPI_DEBUG=y CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m # CONFIG_SPI_GPIO is not set CONFIG_SPI_LM70_LLP=m CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_SPI_XILINX is not set CONFIG_SPI_DESIGNWARE=m # # SPI Protocol Masters # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y # # HSI clients # CONFIG_HSI_CHAR=m # # PPS support # # CONFIG_PPS is not set # # PPS generators support # # # PTP clock support # # # Enable Device Drivers -> PPS to see the PTP clock options. # CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_DA9052 is not set # # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set CONFIG_GPIO_IT8761E=m # # I2C GPIO expanders: # # CONFIG_GPIO_ARIZONA is not set # # PCI GPIO expanders: # # # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set CONFIG_GPIO_MCP23S08=m # CONFIG_GPIO_MC33880 is not set CONFIG_GPIO_74X164=m # # AC97 GPIO expanders: # # # MODULbus GPIO expanders: # # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set CONFIG_POWER_AVS=y CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_HWMON_DEBUG_CHIP=y # # Native drivers # # CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m # CONFIG_SENSORS_GPIO_FAN is not set CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_IBMAEM is not set CONFIG_SENSORS_IBMPEX=m # CONFIG_SENSORS_IT87 is not set CONFIG_SENSORS_LM70=m CONFIG_SENSORS_MAX1111=m # CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m # CONFIG_SENSORS_SHT15 is not set CONFIG_SENSORS_SMSC47M1=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SENSORS_ADS7871=m # CONFIG_SENSORS_VIA_CPUTEMP is not set CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_APPLESMC=m # CONFIG_SENSORS_MC13783_ADC is not set CONFIG_THERMAL=m CONFIG_THERMAL_HWMON=y CONFIG_CPU_THERMAL=y CONFIG_FAIR_SHARE=y CONFIG_STEP_WISE=y CONFIG_USER_SPACE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # CONFIG_SSB=m CONFIG_SSB_PCMCIAHOST_POSSIBLE=y # CONFIG_SSB_PCMCIAHOST is not set CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_SSB_SDIOHOST is not set CONFIG_SSB_SILENT=y CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # CONFIG_BCMA=m # CONFIG_BCMA_DRIVER_GMAC_CMN is not set # CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers # CONFIG_MFD_CORE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set CONFIG_PMIC_DA9052=y CONFIG_MFD_DA9052_SPI=y CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_SPI=m CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m CONFIG_MFD_MC13XXX_SPI=m # CONFIG_ABX500_CORE is not set CONFIG_EZX_PCAP=y # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # # CONFIG_MEDIA_CAMERA_SUPPORT is not set # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_RADIO_SUPPORT=y # CONFIG_MEDIA_RC_SUPPORT is not set CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2=m # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set # # Media drivers # CONFIG_MEDIA_USB_SUPPORT=y # # Supported MMC/SDIO adapters # CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_SI470X is not set # CONFIG_USB_MR800 is not set CONFIG_USB_DSBR=m # CONFIG_RADIO_SHARK2 is not set CONFIG_USB_KEENE=m # # Texas Instruments WL128x FM driver (ST based) # # # Media ancillary drivers (tuners, sensors, i2c, frontends) # # # Encoders, decoders, sensors and other helper chips # # # Audio decoders, processors and mixers # # # RDS decoders # # # Video decoders # # # Video and audio decoders # # # MPEG video encoders # # CONFIG_VIDEO_CX2341X is not set # # Video encoders # # # Camera sensor devices # # # Flash devices # # # Video improvement chips # # # Miscelaneous helper chips # # # Sensors used on soc_camera driver # CONFIG_MEDIA_ATTACH=y # # Customize TV tuners # # # Customise DVB Frontends # # # Tools to develop new frontends # CONFIG_DVB_DUMMY_FE=m # # Graphics support # # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=m # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # # Frame buffer hardware drivers # CONFIG_FB_ARC=m # CONFIG_FB_VGA16 is not set CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_XEN_FBDEV_FRONTEND is not set CONFIG_FB_METRONOME=m # CONFIG_FB_BROADSHEET is not set CONFIG_FB_AUO_K190X=m CONFIG_FB_AUO_K1900=m CONFIG_FB_AUO_K1901=m CONFIG_EXYNOS_VIDEO=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_SOUND is not set # # HID support # CONFIG_HID=m # CONFIG_HIDRAW is not set # CONFIG_UHID is not set # CONFIG_HID_GENERIC is not set # # Special HID drivers # # # USB HID support # # CONFIG_USB_HID is not set CONFIG_HID_PID=y # # USB HID Boot Protocol drivers # # CONFIG_USB_KBD is not set CONFIG_USB_MOUSE=m # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_BLACKLIST_HUB=y CONFIG_USB_DWC3=m CONFIG_USB_DWC3_DEBUG=y # CONFIG_USB_DWC3_VERBOSE is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers # CONFIG_USB_C67X00_HCD=m CONFIG_USB_OXU210HP_HCD=m # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_U132_HCD=m # CONFIG_USB_SL811_HCD is not set CONFIG_USB_R8A66597_HCD=m # CONFIG_USB_RENESAS_USBHS_HCD is not set CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m # CONFIG_USB_MUSB_TUSB6010 is not set CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_DEBUG=y CONFIG_USB_RENESAS_USBHS=m # # USB Device Class drivers # # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=m # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # # also be needed; see USB_STORAGE Help for more info # # # USB Imaging devices # CONFIG_USB_MDC800=m # # USB port drivers # CONFIG_USB_USS720=m # CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers # CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set CONFIG_USB_RIO500=m # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_LED is not set CONFIG_USB_CYPRESS_CY7C63=m # CONFIG_USB_CYTHERM is not set # CONFIG_USB_IDMOUSE is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_APPLEDISPLAY is not set CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_IOWARRIOR=m # CONFIG_USB_TEST is not set CONFIG_USB_ISIGHTFW=m # CONFIG_USB_YUREX is not set CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # # CONFIG_OMAP_USB2 is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG=y # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # # USB Peripheral Controller # # CONFIG_USB_R8A66597 is not set CONFIG_USB_RENESAS_USBHS_UDC=m # CONFIG_USB_MV_UDC is not set CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m # CONFIG_USB_NET2272 is not set CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set # CONFIG_USB_GADGETFS is not set CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_GENERIC=y CONFIG_USB_G_SERIAL=m # CONFIG_USB_G_PRINTER is not set CONFIG_USB_G_HID=m CONFIG_USB_G_DBGP=m CONFIG_USB_G_DBGP_PRINTK=y # CONFIG_USB_G_DBGP_SERIAL is not set CONFIG_USB_G_WEBCAM=m # # OTG and related infrastructure # CONFIG_USB_OTG_UTILS=y CONFIG_USB_GPIO_VBUS=m CONFIG_NOP_USB_XCEIV=m CONFIG_MMC=m CONFIG_MMC_DEBUG=y # CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_MMC_CLKGATE=y # # MMC/SD/SDIO Card Drivers # CONFIG_SDIO_UART=m CONFIG_MMC_TEST=m # # MMC/SD/SDIO Host Controller Drivers # # CONFIG_MMC_SDHCI is not set CONFIG_MMC_SPI=m # CONFIG_MMC_VUB300 is not set CONFIG_MMC_USHC=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_DEBUG=y # # MemoryStick drivers # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # # MemoryStick Host Controller Drivers # CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m # # LED drivers # CONFIG_LEDS_GPIO=m # CONFIG_LEDS_DA9052 is not set # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_LT3593 is not set CONFIG_LEDS_MC13783=m CONFIG_LEDS_OT200=m CONFIG_LEDS_TRIGGERS=y # # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_CPU is not set # CONFIG_LEDS_TRIGGER_GPIO is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set CONFIG_ACCESSIBILITY=y CONFIG_EDAC=y # # Reporting subsystems # # CONFIG_EDAC_LEGACY_SYSFS is not set CONFIG_EDAC_DEBUG=y CONFIG_EDAC_MM_EDAC=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # # RTC interfaces # CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_TEST=m # # SPI RTC drivers # CONFIG_RTC_DRV_M41T93=m # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m # CONFIG_RTC_DRV_R9701 is not set CONFIG_RTC_DRV_RS5C348=m # CONFIG_RTC_DRV_DS3234 is not set CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # # CONFIG_RTC_DRV_CMOS is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_DA9052 is not set # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m # CONFIG_RTC_DRV_MSM6242 is not set CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m # CONFIG_RTC_DRV_DS2404 is not set # # on-CPU RTC drivers # CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_MC13XXX=m # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set CONFIG_VIRTIO=m # # Virtio drivers # CONFIG_VIRTIO_BALLOON=m # CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support # # # Xen driver support # # CONFIG_XEN_BALLOON is not set # CONFIG_XEN_DEV_EVTCHN is not set # CONFIG_XENFS is not set CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_TMEM=y CONFIG_XEN_PRIVCMD=m CONFIG_XEN_HAVE_PVMMU=y CONFIG_STAGING=y CONFIG_ECHO=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 # CONFIG_COMEDI_MISC_DRIVERS is not set CONFIG_COMEDI_PCMCIA_DRIVERS=y CONFIG_COMEDI_CB_DAS16_CS=m CONFIG_COMEDI_DAS08_CS=m # CONFIG_COMEDI_NI_DAQ_700_CS is not set CONFIG_COMEDI_NI_DAQ_DIO24_CS=m # CONFIG_COMEDI_NI_MIO_CS is not set CONFIG_COMEDI_QUATECH_DAQP_CS=m CONFIG_COMEDI_USB_DRIVERS=y # CONFIG_COMEDI_DT9812 is not set CONFIG_COMEDI_USBDUX=m # CONFIG_COMEDI_USBDUXFAST is not set CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_8255=m CONFIG_COMEDI_FC=m CONFIG_COMEDI_DAS08=m # CONFIG_ASUS_OLED is not set CONFIG_PANEL=m CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 # CONFIG_PANEL_CHANGE_MESSAGE is not set CONFIG_TRANZPORT=m # CONFIG_ZSMALLOC is not set # CONFIG_FT1000 is not set # # Speakup console speech # CONFIG_STAGING_MEDIA=y # # Android # CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y # CONFIG_ANDROID_LOGGER is not set # CONFIG_ANDROID_TIMED_OUTPUT is not set # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set CONFIG_ANDROID_INTF_ALARM_DEV=y # CONFIG_IPACK_BUS is not set # CONFIG_CED1401 is not set # CONFIG_DGRP is not set # CONFIG_X86_PLATFORM_DEVICES is not set # # Hardware Spinlock drivers # CONFIG_CLKEVT_I8253=y CONFIG_CLKBLD_I8253=y CONFIG_IOMMU_SUPPORT=y # # Remoteproc drivers (EXPERIMENTAL) # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # # CONFIG_VIRT_DRIVERS is not set CONFIG_PM_DEVFREQ=y # # DEVFREQ Governors # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set # # DEVFREQ Drivers # CONFIG_EXTCON=m # # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_ARIZONA is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set CONFIG_PWM=y # # Firmware Drivers # CONFIG_EDD=m CONFIG_EDD_OFF=y # CONFIG_FIRMWARE_MEMMAP is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_ISCSI_IBFT_FIND=y CONFIG_GOOGLE_FIRMWARE=y # # Google Firmware Drivers # # # File systems # CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y # CONFIG_FILE_LOCKING is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_FANOTIFY is not set CONFIG_QUOTA=y # CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_QUOTA_DEBUG is not set # CONFIG_QFMT_V1 is not set # CONFIG_QFMT_V2 is not set CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m # CONFIG_CUSE is not set # # Caches # # CONFIG_FSCACHE is not set # # Pseudo filesystems # # CONFIG_PROC_FS is not set CONFIG_SYSFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set CONFIG_NLS_CODEPAGE_737=m # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set CONFIG_NLS_CODEPAGE_852=m CONFIG_NLS_CODEPAGE_855=m CONFIG_NLS_CODEPAGE_857=m CONFIG_NLS_CODEPAGE_860=m # CONFIG_NLS_CODEPAGE_861 is not set CONFIG_NLS_CODEPAGE_862=m CONFIG_NLS_CODEPAGE_863=m # CONFIG_NLS_CODEPAGE_864 is not set CONFIG_NLS_CODEPAGE_865=m # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set CONFIG_NLS_CODEPAGE_936=m # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set CONFIG_NLS_CODEPAGE_949=m # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set CONFIG_NLS_ISO8859_4=m # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set CONFIG_NLS_ISO8859_9=m CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_MAC_ROMAN is not set CONFIG_NLS_MAC_CELTIC=m CONFIG_NLS_MAC_CENTEURO=m # CONFIG_NLS_MAC_CROATIAN is not set # CONFIG_NLS_MAC_CYRILLIC is not set # CONFIG_NLS_MAC_GAELIC is not set CONFIG_NLS_MAC_GREEK=m CONFIG_NLS_MAC_ICELAND=m # CONFIG_NLS_MAC_INUIT is not set # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set # CONFIG_NLS_UTF8 is not set # # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set CONFIG_READABLE_ASM=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEBUG_OBJECTS=y # CONFIG_DEBUG_OBJECTS_SELFTEST is not set CONFIG_DEBUG_OBJECTS_FREE=y # CONFIG_DEBUG_OBJECTS_TIMERS is not set # CONFIG_DEBUG_OBJECTS_WORK is not set # CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set # CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_PI_LIST=y CONFIG_RT_MUTEX_TESTER=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y # CONFIG_PROVE_RCU_REPEATEDLY is not set CONFIG_PROVE_RCU_DELAY=y CONFIG_SPARSE_RCU_POINTER=y CONFIG_LOCKDEP=y CONFIG_LOCK_STAT=y CONFIG_DEBUG_LOCKDEP=y CONFIG_TRACE_IRQFLAGS=y CONFIG_DEBUG_ATOMIC_SLEEP=y CONFIG_DEBUG_LOCKING_API_SELFTESTS=y CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_KOBJECT=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_VIRTUAL=y CONFIG_DEBUG_WRITECOUNT=y # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_DEBUG_LIST=y CONFIG_TEST_LIST_SORT=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set CONFIG_DEBUG_CREDENTIALS=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set CONFIG_KPROBES_SANITY_TEST=y CONFIG_BACKTRACE_SELF_TEST=m CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y CONFIG_NOTIFIER_ERROR_INJECTION=m # CONFIG_PM_NOTIFIER_ERROR_INJECT is not set # CONFIG_FAULT_INJECTION is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_KMEMCHECK=y # CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT is not set # CONFIG_KMEMCHECK_ENABLED_BY_DEFAULT is not set CONFIG_KMEMCHECK_ONESHOT_BY_DEFAULT=y CONFIG_KMEMCHECK_QUEUE_SIZE=64 CONFIG_KMEMCHECK_SHADOW_COPY_SHIFT=5 CONFIG_KMEMCHECK_PARTIAL_OK=y CONFIG_KMEMCHECK_BITOPS_OK=y # CONFIG_TEST_KSTRTOX is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_X86_PTDUMP=y CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_IOMMU_STRESS=y CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 CONFIG_IO_DELAY_TYPE_NONE=3 # CONFIG_IO_DELAY_0X80 is not set # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_UDELAY is not set CONFIG_IO_DELAY_NONE=y CONFIG_DEFAULT_IO_DELAY_TYPE=3 # CONFIG_DEBUG_BOOT_PARAMS is not set CONFIG_CPA_DEBUG=y # CONFIG_OPTIMIZE_INLINING is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options # CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_PATH=y CONFIG_SECURITY_YAMA=y # CONFIG_SECURITY_YAMA_STACKED is not set # CONFIG_IMA is not set # CONFIG_EVM is not set CONFIG_DEFAULT_SECURITY_YAMA=y # CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY="yama" CONFIG_CRYPTO=y # # Crypto core or helper # # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ABLK_HELPER_X86=m CONFIG_CRYPTO_GLUE_HELPER_X86=m # # Authenticated Encryption with Associated Data # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set CONFIG_CRYPTO_SEQIV=m # # Block modes # CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m # # Hash modes # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set CONFIG_CRYPTO_CRC32C_X86_64=y CONFIG_CRYPTO_CRC32C_INTEL=m # CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA1_SSSE3 is not set CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_X86_64=m # CONFIG_CRYPTO_AES_NI_INTEL is not set CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA is not set CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m # CONFIG_CRYPTO_SALSA20_X86_64 is not set CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m # CONFIG_CRYPTO_TEA is not set CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m # # Compression # CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=m # # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m # CONFIG_CRYPTO_HW is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_PUBLIC_KEY_ALGO_RSA=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_HAVE_KVM=y CONFIG_VIRTUALIZATION=y # CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_BITREVERSE=m CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=m CONFIG_CRC32_SELFTEST=y # CONFIG_CRC32_SLICEBY8 is not set # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_BIT=y CONFIG_CRC7=m # CONFIG_LIBCRC32C is not set # CONFIG_CRC8 is not set CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_AVERAGE=y CONFIG_CLZ_TAB=y CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_MPILIB=y CONFIG_OID_REGISTRY=y --------------010605010902080307000907 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------010605010902080307000907-- From xen-devel-bounces@lists.xen.org Thu Nov 01 18:05:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 18:05:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTz8x-0001n9-V6; Thu, 01 Nov 2012 18:05:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TTyQG-0000KB-4R for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 17:19:16 +0000 Received: from [85.158.139.211:63750] by server-16.bemta-5.messagelabs.com id 67/75-04786-31FA2905; Thu, 01 Nov 2012 17:19:15 +0000 X-Env-Sender: rdunlap@infradead.org X-Msg-Ref: server-3.tower-206.messagelabs.com!1351790352!18512055!1 X-Originating-IP: [85.118.1.10] X-SpamReason: No, hits=2.3 required=7.0 tests=UNIQUE_WORDS, UPPERCASE_50_75 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19379 invoked from network); 1 Nov 2012 17:19:13 -0000 Received: from casper.infradead.org (HELO casper.infradead.org) (85.118.1.10) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 17:19:13 -0000 Received: from static-50-53-38-135.bvtn.or.frontiernet.net ([50.53.38.135] helo=[192.168.1.7]) by casper.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1TTyPq-0000es-S5; Thu, 01 Nov 2012 17:18:51 +0000 Message-ID: <5092AEF7.5020609@infradead.org> Date: Thu, 01 Nov 2012 10:18:47 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Stephen Rothwell References: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> In-Reply-To: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> Content-Type: multipart/mixed; boundary="------------010605010902080307000907" X-Mailman-Approved-At: Thu, 01 Nov 2012 18:05:25 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-next@vger.kernel.org Subject: Re: [Xen-devel] linux-next: Tree for Nov 1 (xen) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------010605010902080307000907 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 10/31/2012 10:36 PM, Stephen Rothwell wrote: > Hi all, > > New trees: rr-fixes and swiotlb > > Changes since 20121031: > arch/x86/xen/enlighten.c:109:0: warning: "xen_pvh_domain" redefined include/xen/xen.h:23:0: note: this is the location of the previous definition Full randconfig file is attached. -- ~Randy --------------010605010902080307000907 Content-Type: text/plain; name="config-r8493" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="config-r8493" # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.7.0-rc3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_GPIO=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SYSVIPC=y CONFIG_FHANDLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y # CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set # # RCU Subsystem # CONFIG_TINY_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y # CONFIG_TREE_RCU_TRACE is not set CONFIG_RCU_BOOST=y CONFIG_RCU_BOOST_PRIO=1 CONFIG_RCU_BOOST_DELAY=500 CONFIG_IKCONFIG=m CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y # CONFIG_IPC_NS is not set # CONFIG_PID_NS is not set # CONFIG_SCHED_AUTOGROUP is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_BLK_DEV_INITRD is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_ANON_INODES=y CONFIG_EXPERT=y CONFIG_HAVE_UID16=y CONFIG_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_HOTPLUG=y # CONFIG_PRINTK is not set CONFIG_BUG=y CONFIG_ELF_CORE=y # CONFIG_PCSPKR_PLATFORM is not set CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y # CONFIG_EPOLL is not set # CONFIG_SIGNALFD is not set # CONFIG_TIMERFD is not set # CONFIG_EVENTFD is not set # CONFIG_SHMEM is not set # CONFIG_AIO is not set # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y # # Kernel Performance Events And Counters # CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB_DEBUG=y CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_PROFILING=y # CONFIG_OPROFILE is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_KRETPROBES=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_GENERIC_KERNEL_THREAD=y CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_RCU_USER_QS=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling # # CONFIG_GCOV_KERNEL is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_FORCE=y # CONFIG_MODULE_SIG_SHA1 is not set # CONFIG_MODULE_SIG_SHA224 is not set CONFIG_MODULE_SIG_SHA256=y # CONFIG_MODULE_SIG_SHA384 is not set # CONFIG_MODULE_SIG_SHA512 is not set # CONFIG_BLOCK is not set CONFIG_ASN1=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_FREEZER=y # # Processor type and features # # CONFIG_ZONE_DMA is not set # CONFIG_SMP is not set CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_KVMTOOL_TEST_ENABLE is not set CONFIG_PARAVIRT_GUEST=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_XEN=y # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set CONFIG_XEN_X86_PVH=y # CONFIG_KVM_GUEST is not set CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_DEBUG=y CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_AMD=y CONFIG_CPU_SUP_CENTAUR=y CONFIG_HPET_TIMER=y # CONFIG_DMI is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=1 # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y # CONFIG_X86_MCE_AMD is not set CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MCE_INJECT=m CONFIG_X86_THERMAL_VECTOR=y CONFIG_I8K=m # CONFIG_MICROCODE is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DIRECT_GBPAGES=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y # CONFIG_SPARSEMEM_VMEMMAP is not set CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=999999 # CONFIG_COMPACTION is not set CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_NEED_PER_CPU_KM=y CONFIG_CLEANCACHE=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 # CONFIG_X86_PAT is not set # CONFIG_ARCH_RANDOM is not set CONFIG_X86_SMAP=y # CONFIG_SECCOMP is not set CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x1000000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_COMPAT_VDSO is not set CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="" CONFIG_CMDLINE_OVERRIDE=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management and ACPI options # CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_PM_SLEEP=y CONFIG_PM_AUTOSLEEP=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=100 # CONFIG_PM_WAKELOCKS_GC is not set CONFIG_PM_RUNTIME=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set # CONFIG_SFI is not set # # CPU Frequency scaling # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # # x86 CPU frequency scaling drivers # CONFIG_X86_P4_CLOCKMOD=m # # shared options # CONFIG_X86_SPEEDSTEP_LIB=m # CONFIG_CPU_IDLE is not set # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # # Memory power savings # # CONFIG_I7300_IDLE is not set # # Bus options (PCI etc.) # # CONFIG_PCI is not set # CONFIG_ISA_DMA_API is not set CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y # # PC-card bridges # # # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m # CONFIG_X86_X32 is not set CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y CONFIG_HAVE_TEXT_POKE_SMP=y CONFIG_X86_DEV_DMA_OPS=y # CONFIG_NET is not set CONFIG_HAVE_BPF_JIT=y # # Device Drivers # # # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="" # CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" CONFIG_DEBUG_DRIVER=y CONFIG_DEBUG_DEVRES=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_REGMAP=y CONFIG_REGMAP_SPI=y CONFIG_REGMAP_IRQ=y # CONFIG_DMA_SHARED_BUFFER is not set # # Bus devices # CONFIG_OMAP_OCP2SCP=m # CONFIG_MTD is not set CONFIG_PARPORT=m # CONFIG_PARPORT_PC is not set # CONFIG_PARPORT_GSC is not set # CONFIG_PARPORT_AX88796 is not set CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y # # Misc devices # # CONFIG_SENSORS_LIS3LV02D is not set CONFIG_AD525X_DPOT=m # CONFIG_AD525X_DPOT_SPI is not set CONFIG_ENCLOSURE_SERVICES=m # CONFIG_TI_DAC7512 is not set # CONFIG_VMWARE_BALLOON is not set CONFIG_BMP085=y CONFIG_BMP085_SPI=m # CONFIG_C2PORT is not set # # EEPROM support # CONFIG_EEPROM_AT25=m # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set # # Texas Instruments shared transport line discipline # # CONFIG_SENSORS_LIS3_SPI is not set # # Altera FPGA firmware download module # CONFIG_HAVE_IDE=y # # SCSI device support # CONFIG_SCSI_MOD=y # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set CONFIG_MACINTOSH_DRIVERS=y # # Input device support # CONFIG_INPUT=m # CONFIG_INPUT_FF_MEMLESS is not set CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_MC13783_PWRBUTTON=m # CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_INPUT_ATI_REMOTE2 is not set CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=m # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_DA9052_ONKEY=m # CONFIG_INPUT_PCAP is not set CONFIG_INPUT_ADXL34X=m # CONFIG_INPUT_ADXL34X_SPI is not set # CONFIG_INPUT_CMA3000 is not set # CONFIG_INPUT_XEN_KBDDEV_FRONTEND is not set # # Hardware I/O ports # CONFIG_SERIO=m CONFIG_SERIO_I8042=m CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=m CONFIG_SERIO_PARKBD=m # CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set CONFIG_SERIO_ALTERA_PS2=m # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_ARC_PS2=m # CONFIG_GAMEPORT is not set # # Character devices # # CONFIG_VT is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_TRACE_SINK is not set CONFIG_DEVKMEM=y # # Serial drivers # CONFIG_SERIAL_8250=m CONFIG_FIX_EARLYCON_MEM=y # CONFIG_SERIAL_8250_CS is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # # CONFIG_SERIAL_MAX3100 is not set CONFIG_SERIAL_MAX310X=y CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_XILINX_PS_UART is not set CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_TTY_PRINTK=y # CONFIG_PRINTER is not set # CONFIG_PPDEV is not set CONFIG_HVC_DRIVER=y # CONFIG_HVC_XEN is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_PANIC_EVENT=y CONFIG_IPMI_PANIC_STRING=y # CONFIG_IPMI_DEVICE_INTERFACE is not set CONFIG_IPMI_SI=m # CONFIG_IPMI_WATCHDOG is not set CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_VIA is not set # CONFIG_HW_RANDOM_VIRTIO is not set # CONFIG_NVRAM is not set # CONFIG_R3964 is not set # # PCMCIA character devices # CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m # CONFIG_CARDMAN_4040 is not set # CONFIG_MWAVE is not set # CONFIG_HANGCHECK_TIMER is not set # CONFIG_TCG_TPM is not set CONFIG_TELCLOCK=m # CONFIG_I2C is not set CONFIG_SPI=y CONFIG_SPI_DEBUG=y CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m # CONFIG_SPI_GPIO is not set CONFIG_SPI_LM70_LLP=m CONFIG_SPI_OC_TINY=m # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_SPI_XILINX is not set CONFIG_SPI_DESIGNWARE=m # # SPI Protocol Masters # # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set CONFIG_HSI=m CONFIG_HSI_BOARDINFO=y # # HSI clients # CONFIG_HSI_CHAR=m # # PPS support # # CONFIG_PPS is not set # # PPS generators support # # # PTP clock support # # # Enable Device Drivers -> PPS to see the PTP clock options. # CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_DA9052 is not set # # Memory mapped GPIO drivers: # # CONFIG_GPIO_GENERIC_PLATFORM is not set CONFIG_GPIO_IT8761E=m # # I2C GPIO expanders: # # CONFIG_GPIO_ARIZONA is not set # # PCI GPIO expanders: # # # SPI GPIO expanders: # # CONFIG_GPIO_MAX7301 is not set CONFIG_GPIO_MCP23S08=m # CONFIG_GPIO_MC33880 is not set CONFIG_GPIO_74X164=m # # AC97 GPIO expanders: # # # MODULbus GPIO expanders: # # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set CONFIG_POWER_AVS=y CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_HWMON_DEBUG_CHIP=y # # Native drivers # # CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m # CONFIG_SENSORS_GPIO_FAN is not set CONFIG_SENSORS_CORETEMP=m # CONFIG_SENSORS_IBMAEM is not set CONFIG_SENSORS_IBMPEX=m # CONFIG_SENSORS_IT87 is not set CONFIG_SENSORS_LM70=m CONFIG_SENSORS_MAX1111=m # CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m # CONFIG_SENSORS_SHT15 is not set CONFIG_SENSORS_SMSC47M1=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SCH56XX_COMMON is not set CONFIG_SENSORS_ADS7871=m # CONFIG_SENSORS_VIA_CPUTEMP is not set CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_APPLESMC=m # CONFIG_SENSORS_MC13783_ADC is not set CONFIG_THERMAL=m CONFIG_THERMAL_HWMON=y CONFIG_CPU_THERMAL=y CONFIG_FAIR_SHARE=y CONFIG_STEP_WISE=y CONFIG_USER_SPACE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set # CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # CONFIG_SSB=m CONFIG_SSB_PCMCIAHOST_POSSIBLE=y # CONFIG_SSB_PCMCIAHOST is not set CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_SSB_SDIOHOST is not set CONFIG_SSB_SILENT=y CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # CONFIG_BCMA=m # CONFIG_BCMA_DRIVER_GMAC_CMN is not set # CONFIG_BCMA_DEBUG is not set # # Multifunction device drivers # CONFIG_MFD_CORE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set CONFIG_PMIC_DA9052=y CONFIG_MFD_DA9052_SPI=y CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_SPI=m CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y # CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m CONFIG_MFD_MC13XXX_SPI=m # CONFIG_ABX500_CORE is not set CONFIG_EZX_PCAP=y # CONFIG_REGULATOR is not set CONFIG_MEDIA_SUPPORT=m # # Multimedia core support # # CONFIG_MEDIA_CAMERA_SUPPORT is not set # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_RADIO_SUPPORT=y # CONFIG_MEDIA_RC_SUPPORT is not set CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2=m # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set # # Media drivers # CONFIG_MEDIA_USB_SUPPORT=y # # Supported MMC/SDIO adapters # CONFIG_RADIO_ADAPTERS=y # CONFIG_RADIO_SI470X is not set # CONFIG_USB_MR800 is not set CONFIG_USB_DSBR=m # CONFIG_RADIO_SHARK2 is not set CONFIG_USB_KEENE=m # # Texas Instruments WL128x FM driver (ST based) # # # Media ancillary drivers (tuners, sensors, i2c, frontends) # # # Encoders, decoders, sensors and other helper chips # # # Audio decoders, processors and mixers # # # RDS decoders # # # Video decoders # # # Video and audio decoders # # # MPEG video encoders # # CONFIG_VIDEO_CX2341X is not set # # Video encoders # # # Camera sensor devices # # # Flash devices # # # Video improvement chips # # # Miscelaneous helper chips # # # Sensors used on soc_camera driver # CONFIG_MEDIA_ATTACH=y # # Customize TV tuners # # # Customise DVB Frontends # # # Tools to develop new frontends # CONFIG_DVB_DUMMY_FE=m # # Graphics support # # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=m # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # # Frame buffer hardware drivers # CONFIG_FB_ARC=m # CONFIG_FB_VGA16 is not set CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_SMSCUFX=m # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_XEN_FBDEV_FRONTEND is not set CONFIG_FB_METRONOME=m # CONFIG_FB_BROADSHEET is not set CONFIG_FB_AUO_K190X=m CONFIG_FB_AUO_K1900=m CONFIG_FB_AUO_K1901=m CONFIG_EXYNOS_VIDEO=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_SOUND is not set # # HID support # CONFIG_HID=m # CONFIG_HIDRAW is not set # CONFIG_UHID is not set # CONFIG_HID_GENERIC is not set # # Special HID drivers # # # USB HID support # # CONFIG_USB_HID is not set CONFIG_HID_PID=y # # USB HID Boot Protocol drivers # # CONFIG_USB_KBD is not set CONFIG_USB_MOUSE=m # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set # CONFIG_USB_ARCH_HAS_XHCI is not set CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=m CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=m # CONFIG_USB_DEBUG is not set CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_BLACKLIST_HUB=y CONFIG_USB_DWC3=m CONFIG_USB_DWC3_DEBUG=y # CONFIG_USB_DWC3_VERBOSE is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB_CBAF is not set # # USB Host Controller Drivers # CONFIG_USB_C67X00_HCD=m CONFIG_USB_OXU210HP_HCD=m # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_U132_HCD=m # CONFIG_USB_SL811_HCD is not set CONFIG_USB_R8A66597_HCD=m # CONFIG_USB_RENESAS_USBHS_HCD is not set CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m # CONFIG_USB_MUSB_TUSB6010 is not set CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y # CONFIG_USB_CHIPIDEA_HOST is not set CONFIG_USB_CHIPIDEA_DEBUG=y CONFIG_USB_RENESAS_USBHS=m # # USB Device Class drivers # # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=m # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # # also be needed; see USB_STORAGE Help for more info # # # USB Imaging devices # CONFIG_USB_MDC800=m # # USB port drivers # CONFIG_USB_USS720=m # CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers # CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set CONFIG_USB_RIO500=m # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_LED is not set CONFIG_USB_CYPRESS_CY7C63=m # CONFIG_USB_CYTHERM is not set # CONFIG_USB_IDMOUSE is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_APPLEDISPLAY is not set CONFIG_USB_SISUSBVGA=m CONFIG_USB_LD=m # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_IOWARRIOR=m # CONFIG_USB_TEST is not set CONFIG_USB_ISIGHTFW=m # CONFIG_USB_YUREX is not set CONFIG_USB_EZUSB_FX2=m # # USB Physical Layer drivers # # CONFIG_OMAP_USB2 is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG=y # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # # USB Peripheral Controller # # CONFIG_USB_R8A66597 is not set CONFIG_USB_RENESAS_USBHS_UDC=m # CONFIG_USB_MV_UDC is not set CONFIG_USB_GADGET_MUSB_HDRC=m CONFIG_USB_M66592=m # CONFIG_USB_NET2272 is not set CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m # CONFIG_USB_ZERO is not set # CONFIG_USB_GADGETFS is not set CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_GENERIC=y CONFIG_USB_G_SERIAL=m # CONFIG_USB_G_PRINTER is not set CONFIG_USB_G_HID=m CONFIG_USB_G_DBGP=m CONFIG_USB_G_DBGP_PRINTK=y # CONFIG_USB_G_DBGP_SERIAL is not set CONFIG_USB_G_WEBCAM=m # # OTG and related infrastructure # CONFIG_USB_OTG_UTILS=y CONFIG_USB_GPIO_VBUS=m CONFIG_NOP_USB_XCEIV=m CONFIG_MMC=m CONFIG_MMC_DEBUG=y # CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_MMC_CLKGATE=y # # MMC/SD/SDIO Card Drivers # CONFIG_SDIO_UART=m CONFIG_MMC_TEST=m # # MMC/SD/SDIO Host Controller Drivers # # CONFIG_MMC_SDHCI is not set CONFIG_MMC_SPI=m # CONFIG_MMC_VUB300 is not set CONFIG_MMC_USHC=m CONFIG_MEMSTICK=m CONFIG_MEMSTICK_DEBUG=y # # MemoryStick drivers # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set # # MemoryStick Host Controller Drivers # CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m # # LED drivers # CONFIG_LEDS_GPIO=m # CONFIG_LEDS_DA9052 is not set # CONFIG_LEDS_DAC124S085 is not set # CONFIG_LEDS_LT3593 is not set CONFIG_LEDS_MC13783=m CONFIG_LEDS_OT200=m CONFIG_LEDS_TRIGGERS=y # # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set # CONFIG_LEDS_TRIGGER_CPU is not set # CONFIG_LEDS_TRIGGER_GPIO is not set CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # # CONFIG_LEDS_TRIGGER_TRANSIENT is not set CONFIG_ACCESSIBILITY=y CONFIG_EDAC=y # # Reporting subsystems # # CONFIG_EDAC_LEGACY_SYSFS is not set CONFIG_EDAC_DEBUG=y CONFIG_EDAC_MM_EDAC=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # # RTC interfaces # CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_TEST=m # # SPI RTC drivers # CONFIG_RTC_DRV_M41T93=m # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m # CONFIG_RTC_DRV_R9701 is not set CONFIG_RTC_DRV_RS5C348=m # CONFIG_RTC_DRV_DS3234 is not set CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers # # CONFIG_RTC_DRV_CMOS is not set CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_DA9052 is not set # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m # CONFIG_RTC_DRV_MSM6242 is not set CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_V3020=m # CONFIG_RTC_DRV_DS2404 is not set # # on-CPU RTC drivers # CONFIG_RTC_DRV_PCAP=m CONFIG_RTC_DRV_MC13XXX=m # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set CONFIG_VIRTIO=m # # Virtio drivers # CONFIG_VIRTIO_BALLOON=m # CONFIG_VIRTIO_MMIO is not set # # Microsoft Hyper-V guest support # # # Xen driver support # # CONFIG_XEN_BALLOON is not set # CONFIG_XEN_DEV_EVTCHN is not set # CONFIG_XENFS is not set CONFIG_XEN_SYS_HYPERVISOR=y CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_TMEM=y CONFIG_XEN_PRIVCMD=m CONFIG_XEN_HAVE_PVMMU=y CONFIG_STAGING=y CONFIG_ECHO=m CONFIG_COMEDI=m # CONFIG_COMEDI_DEBUG is not set CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 # CONFIG_COMEDI_MISC_DRIVERS is not set CONFIG_COMEDI_PCMCIA_DRIVERS=y CONFIG_COMEDI_CB_DAS16_CS=m CONFIG_COMEDI_DAS08_CS=m # CONFIG_COMEDI_NI_DAQ_700_CS is not set CONFIG_COMEDI_NI_DAQ_DIO24_CS=m # CONFIG_COMEDI_NI_MIO_CS is not set CONFIG_COMEDI_QUATECH_DAQP_CS=m CONFIG_COMEDI_USB_DRIVERS=y # CONFIG_COMEDI_DT9812 is not set CONFIG_COMEDI_USBDUX=m # CONFIG_COMEDI_USBDUXFAST is not set CONFIG_COMEDI_USBDUXSIGMA=m CONFIG_COMEDI_VMK80XX=m CONFIG_COMEDI_8255=m CONFIG_COMEDI_FC=m CONFIG_COMEDI_DAS08=m # CONFIG_ASUS_OLED is not set CONFIG_PANEL=m CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 # CONFIG_PANEL_CHANGE_MESSAGE is not set CONFIG_TRANZPORT=m # CONFIG_ZSMALLOC is not set # CONFIG_FT1000 is not set # # Speakup console speech # CONFIG_STAGING_MEDIA=y # # Android # CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y # CONFIG_ANDROID_LOGGER is not set # CONFIG_ANDROID_TIMED_OUTPUT is not set # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set CONFIG_ANDROID_INTF_ALARM_DEV=y # CONFIG_IPACK_BUS is not set # CONFIG_CED1401 is not set # CONFIG_DGRP is not set # CONFIG_X86_PLATFORM_DEVICES is not set # # Hardware Spinlock drivers # CONFIG_CLKEVT_I8253=y CONFIG_CLKBLD_I8253=y CONFIG_IOMMU_SUPPORT=y # # Remoteproc drivers (EXPERIMENTAL) # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # # Rpmsg drivers # # CONFIG_VIRT_DRIVERS is not set CONFIG_PM_DEVFREQ=y # # DEVFREQ Governors # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set # # DEVFREQ Drivers # CONFIG_EXTCON=m # # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_ARIZONA is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set CONFIG_PWM=y # # Firmware Drivers # CONFIG_EDD=m CONFIG_EDD_OFF=y # CONFIG_FIRMWARE_MEMMAP is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_ISCSI_IBFT_FIND=y CONFIG_GOOGLE_FIRMWARE=y # # Google Firmware Drivers # # # File systems # CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_FS_POSIX_ACL is not set CONFIG_EXPORTFS=y # CONFIG_FILE_LOCKING is not set CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_FANOTIFY is not set CONFIG_QUOTA=y # CONFIG_PRINT_QUOTA_WARNING is not set # CONFIG_QUOTA_DEBUG is not set # CONFIG_QFMT_V1 is not set # CONFIG_QFMT_V2 is not set CONFIG_QUOTACTL=y CONFIG_QUOTACTL_COMPAT=y # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=m # CONFIG_CUSE is not set # # Caches # # CONFIG_FSCACHE is not set # # Pseudo filesystems # # CONFIG_PROC_FS is not set CONFIG_SYSFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NLS=m CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_437 is not set CONFIG_NLS_CODEPAGE_737=m # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set CONFIG_NLS_CODEPAGE_852=m CONFIG_NLS_CODEPAGE_855=m CONFIG_NLS_CODEPAGE_857=m CONFIG_NLS_CODEPAGE_860=m # CONFIG_NLS_CODEPAGE_861 is not set CONFIG_NLS_CODEPAGE_862=m CONFIG_NLS_CODEPAGE_863=m # CONFIG_NLS_CODEPAGE_864 is not set CONFIG_NLS_CODEPAGE_865=m # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set CONFIG_NLS_CODEPAGE_936=m # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set CONFIG_NLS_CODEPAGE_949=m # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set CONFIG_NLS_ISO8859_4=m # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set CONFIG_NLS_ISO8859_9=m CONFIG_NLS_ISO8859_13=m CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m # CONFIG_NLS_KOI8_U is not set # CONFIG_NLS_MAC_ROMAN is not set CONFIG_NLS_MAC_CELTIC=m CONFIG_NLS_MAC_CENTEURO=m # CONFIG_NLS_MAC_CROATIAN is not set # CONFIG_NLS_MAC_CYRILLIC is not set # CONFIG_NLS_MAC_GAELIC is not set CONFIG_NLS_MAC_GREEK=m CONFIG_NLS_MAC_ICELAND=m # CONFIG_NLS_MAC_INUIT is not set # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set # CONFIG_NLS_UTF8 is not set # # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set CONFIG_READABLE_ASM=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEBUG_OBJECTS=y # CONFIG_DEBUG_OBJECTS_SELFTEST is not set CONFIG_DEBUG_OBJECTS_FREE=y # CONFIG_DEBUG_OBJECTS_TIMERS is not set # CONFIG_DEBUG_OBJECTS_WORK is not set # CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set # CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_SLUB_STATS is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_PI_LIST=y CONFIG_RT_MUTEX_TESTER=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y # CONFIG_PROVE_RCU_REPEATEDLY is not set CONFIG_PROVE_RCU_DELAY=y CONFIG_SPARSE_RCU_POINTER=y CONFIG_LOCKDEP=y CONFIG_LOCK_STAT=y CONFIG_DEBUG_LOCKDEP=y CONFIG_TRACE_IRQFLAGS=y CONFIG_DEBUG_ATOMIC_SLEEP=y CONFIG_DEBUG_LOCKING_API_SELFTESTS=y CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_KOBJECT=y # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set CONFIG_DEBUG_VIRTUAL=y CONFIG_DEBUG_WRITECOUNT=y # CONFIG_DEBUG_MEMORY_INIT is not set CONFIG_DEBUG_LIST=y CONFIG_TEST_LIST_SORT=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set CONFIG_DEBUG_CREDENTIALS=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TRACE is not set CONFIG_KPROBES_SANITY_TEST=y CONFIG_BACKTRACE_SELF_TEST=m CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y CONFIG_NOTIFIER_ERROR_INJECTION=m # CONFIG_PM_NOTIFIER_ERROR_INJECT is not set # CONFIG_FAULT_INJECTION is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_KMEMCHECK=y # CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT is not set # CONFIG_KMEMCHECK_ENABLED_BY_DEFAULT is not set CONFIG_KMEMCHECK_ONESHOT_BY_DEFAULT=y CONFIG_KMEMCHECK_QUEUE_SIZE=64 CONFIG_KMEMCHECK_SHADOW_COPY_SHIFT=5 CONFIG_KMEMCHECK_PARTIAL_OK=y CONFIG_KMEMCHECK_BITOPS_OK=y # CONFIG_TEST_KSTRTOX is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_X86_PTDUMP=y CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_IOMMU_STRESS=y CONFIG_HAVE_MMIOTRACE_SUPPORT=y # CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 CONFIG_IO_DELAY_TYPE_NONE=3 # CONFIG_IO_DELAY_0X80 is not set # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_UDELAY is not set CONFIG_IO_DELAY_NONE=y CONFIG_DEFAULT_IO_DELAY_TYPE=3 # CONFIG_DEBUG_BOOT_PARAMS is not set CONFIG_CPA_DEBUG=y # CONFIG_OPTIMIZE_INLINING is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_NMI_SELFTEST is not set # # Security options # CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_PATH=y CONFIG_SECURITY_YAMA=y # CONFIG_SECURITY_YAMA_STACKED is not set # CONFIG_IMA is not set # CONFIG_EVM is not set CONFIG_DEFAULT_SECURITY_YAMA=y # CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY="yama" CONFIG_CRYPTO=y # # Crypto core or helper # # CONFIG_CRYPTO_FIPS is not set CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_ABLK_HELPER_X86=m CONFIG_CRYPTO_GLUE_HELPER_X86=m # # Authenticated Encryption with Associated Data # # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_GCM is not set CONFIG_CRYPTO_SEQIV=m # # Block modes # CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m # # Hash modes # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set CONFIG_CRYPTO_CRC32C_X86_64=y CONFIG_CRYPTO_CRC32C_INTEL=m # CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA1_SSSE3 is not set CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_X86_64=m # CONFIG_CRYPTO_AES_NI_INTEL is not set CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA is not set CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST5_AVX_X86_64=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CAST6_AVX_X86_64=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m # CONFIG_CRYPTO_SALSA20_X86_64 is not set CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m # CONFIG_CRYPTO_TEA is not set CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m # # Compression # CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=m # # Random Number Generation # CONFIG_CRYPTO_ANSI_CPRNG=m # CONFIG_CRYPTO_HW is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_PUBLIC_KEY_ALGO_RSA=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_HAVE_KVM=y CONFIG_VIRTUALIZATION=y # CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_BITREVERSE=m CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IO=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set CONFIG_CRC_T10DIF=m CONFIG_CRC_ITU_T=m CONFIG_CRC32=m CONFIG_CRC32_SELFTEST=y # CONFIG_CRC32_SLICEBY8 is not set # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_BIT=y CONFIG_CRC7=m # CONFIG_LIBCRC32C is not set # CONFIG_CRC8 is not set CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_XZ_DEC is not set # CONFIG_XZ_DEC_BCJ is not set CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_NLATTR=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_AVERAGE=y CONFIG_CLZ_TAB=y CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_MPILIB=y CONFIG_OID_REGISTRY=y --------------010605010902080307000907 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------010605010902080307000907-- From xen-devel-bounces@lists.xen.org Thu Nov 01 19:30:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:30:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Se-0003FN-SD; Thu, 01 Nov 2012 19:29:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Sd-0003FE-W0 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 19:29:52 +0000 Received: from [85.158.143.35:46403] by server-3.bemta-4.messagelabs.com id 7C/A5-06841-FADC2905; Thu, 01 Nov 2012 19:29:51 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1351798188!5485441!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI2Mjk2\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2909 invoked from network); 1 Nov 2012 19:29:49 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-2.tower-21.messagelabs.com with SMTP; 1 Nov 2012 19:29:49 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Nov 2012 12:29:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,695,1344236400"; d="scan'208";a="212390028" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 12:29:40 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 12:29:39 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 12:29:39 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Fri, 2 Nov 2012 03:29:37 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 02/02] Handles broken page occurred during migration Thread-Index: AQHNuCegST9jWMNZSlWheBhAdddc/ZfU9vJQgABjrxA= Date: Thu, 1 Nov 2012 19:29:36 +0000 Message-ID: References: <509262EC.90108@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >> >> Given that logdirty is only enabled when we're doing some kind of >> migration (Remus or otherwise), wouldn't it make sense to just >> unconditionally call paging_mark_dirty(), rather than doing all this >> stuff with vmce_monitor? paging_mark_dirty() is already a no-op if >> live-migration is not enabled; and if it is enabled, you probably >> want whoever is using logdirty to go through and deal with the >> broken page anyway. > > That's just what I concerned -- can we guarantee paging log dirty > mode only occur during live migration/remus? > say, under the case vram_tracking (hap_enable_vram_tracking) it also > enable log dirty. > >> >> So it seems like you could just add paging_mark_dirty() to the >> previous patch, and get rid of the rest of this patch entirely. >> > > Currently I just find 2 cases which use log dirty mode: live > migration/remus and vram tracking. So if we can make sure that log > dirty would not used more in the future, it's fine to me to simplify > my code by unconditionally call paging_mark_dirty at mce handler. > > What do you think? > > Thanks, > Jinsong Anyway, I udpated first -- considering currently log dirty indeed only used by 2 cases (migration and vram), I simplify the code and merge 2 patches into 1. Will send out via 'hg email'. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 19:30:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:30:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Se-0003FN-SD; Thu, 01 Nov 2012 19:29:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Sd-0003FE-W0 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 19:29:52 +0000 Received: from [85.158.143.35:46403] by server-3.bemta-4.messagelabs.com id 7C/A5-06841-FADC2905; Thu, 01 Nov 2012 19:29:51 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1351798188!5485441!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI2Mjk2\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2909 invoked from network); 1 Nov 2012 19:29:49 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-2.tower-21.messagelabs.com with SMTP; 1 Nov 2012 19:29:49 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Nov 2012 12:29:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,695,1344236400"; d="scan'208";a="212390028" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 12:29:40 -0700 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 12:29:39 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 1 Nov 2012 12:29:39 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Fri, 2 Nov 2012 03:29:37 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [PATCH 02/02] Handles broken page occurred during migration Thread-Index: AQHNuCegST9jWMNZSlWheBhAdddc/ZfU9vJQgABjrxA= Date: Thu, 1 Nov 2012 19:29:36 +0000 Message-ID: References: <509262EC.90108@eu.citrix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jan Beulich Subject: Re: [Xen-devel] [PATCH 02/02] Handles broken page occurred during migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >> >> Given that logdirty is only enabled when we're doing some kind of >> migration (Remus or otherwise), wouldn't it make sense to just >> unconditionally call paging_mark_dirty(), rather than doing all this >> stuff with vmce_monitor? paging_mark_dirty() is already a no-op if >> live-migration is not enabled; and if it is enabled, you probably >> want whoever is using logdirty to go through and deal with the >> broken page anyway. > > That's just what I concerned -- can we guarantee paging log dirty > mode only occur during live migration/remus? > say, under the case vram_tracking (hap_enable_vram_tracking) it also > enable log dirty. > >> >> So it seems like you could just add paging_mark_dirty() to the >> previous patch, and get rid of the rest of this patch entirely. >> > > Currently I just find 2 cases which use log dirty mode: live > migration/remus and vram tracking. So if we can make sure that log > dirty would not used more in the future, it's fine to me to simplify > my code by unconditionally call paging_mark_dirty at mce handler. > > What do you think? > > Thanks, > Jinsong Anyway, I udpated first -- considering currently log dirty indeed only used by 2 cases (migration and vram), I simplify the code and merge 2 patches into 1. Will send out via 'hg email'. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 19:33:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Vg-0003NG-FO; Thu, 01 Nov 2012 19:33:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Ve-0003NA-VP for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 19:32:59 +0000 Received: from [85.158.143.99:54509] by server-3.bemta-4.messagelabs.com id 69/57-06841-A6EC2905; Thu, 01 Nov 2012 19:32:58 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351798376!22961470!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI2Mjk2\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10249 invoked from network); 1 Nov 2012 19:32:57 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-2.tower-216.messagelabs.com with SMTP; 1 Nov 2012 19:32:57 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Nov 2012 12:32:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,695,1344236400"; d="scan'208";a="212391095" Received: from ljsromley.bj.intel.com ([10.240.192.102]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 12:32:54 -0700 MIME-Version: 1.0 X-Mercurial-Node: 730dd3f22a12fd97814b54fb337e018b7c2bc83c Message-Id: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> User-Agent: Mercurial-patchbomb/1.4 Date: Fri, 02 Nov 2012 11:25:29 +0800 From: Liu Jinsong To: george.dunlap@eu.citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com Cc: xen-devel@lists.xensource.com Subject: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Generally, there are 2 cases: 1. broken page occurs before migration 2. broken page occurs during migration At the sender for case 1, the broken page would be mapped but not copied to target (otherwise it may trigger more serious error, say, SRAR error). While its pfn_type and pfn number would be transferred to target so that target take appropriate action. for case 2, mce handler marks the broken page to dirty bitmap, so that at copypages stage of migration, its pfn_type and pfn number would be transferred to target and then take appropriate action. At the target it would set p2m as p2m_ram_broken for broken page, so that if guest access the broken page again, it would kill itself as expected. Suggested-by: George Dunlap Signed-off-by: Liu, Jinsong diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 @@ -283,6 +283,22 @@ return ret; } +/* set broken page p2m */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn) +{ + int ret; + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; + domctl.domain = (domid_t)domid; + domctl.u.set_broken_page_p2m.pfn = pfn; + ret = do_domctl(xch, &domctl); + + return ret ? -1 : 0; +} + /* get info from hvm guest for save */ int xc_domain_hvm_getcontext(xc_interface *xch, uint32_t domid, diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 @@ -962,9 +962,15 @@ countpages = count; for (i = oldcount; i < buf->nr_pages; ++i) - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; + + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || + pagetype == XEN_DOMCTL_PFINFO_BROKEN || + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) --countpages; + } if (!countpages) return count; @@ -1200,6 +1206,17 @@ /* a bogus/unmapped/allocate-only page: skip it */ continue; + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + { + ERROR("Set p2m for broken page failed, " + "dom=%d, pfn=%lx\n", dom, pfn); + goto err_mapped; + } + continue; + } + if (pfn_err[i]) { ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) gmfn = pfn_to_mfn(gmfn); + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + { + pfn_type[j] |= pfn_batch[j]; + ++run; + continue; + } + if ( pfn_err[j] ) { if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) @@ -1371,8 +1378,12 @@ } } - /* skip pages that aren't present or are alloc-only */ + /* + * skip pages that aren't present, + * or are broken, or are alloc-only + */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB + || pagetype == XEN_DOMCTL_PFINFO_BROKEN || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) continue; diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 @@ -575,6 +575,17 @@ xc_domaininfo_t *info); /** + * This function set p2m for broken page + * &parm xch a handle to an open hypervisor interface + * @parm domid the domain id which broken page belong to + * @parm pfn the pfn number of the broken page + * @return 0 on success, -1 on failure + */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn); + +/** * This function returns information about the context of a hvm domain * @parm xch a handle to an open hypervisor interface * @parm domid the domain to get information from diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/cpu/mcheck/mcaction.c --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 @@ -1,5 +1,6 @@ #include #include +#include #include "mcaction.h" #include "vmce.h" #include "mce.h" @@ -91,6 +92,24 @@ goto vmce_failed; } + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && + paging_mode_log_dirty(d) ) + { + /* + * vMCE occur during migration + * + * At sender, it marks broken page to dirty bitmap, + * so that at copypages stage of migration, brokan + * page's pfn_type and pfn number would be transferred + * to target and then take appropriate action. + * + * At target, it would set p2m as p2m_ram_broken for + * broken page, so that if guest access the broken page + * again, it would kill itself as expected. + */ + paging_mark_dirty(d, mfn); + } + if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) { printk("Unmap broken memory %lx for DOM%d failed\n", diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 @@ -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) { unsigned long type = 0; + p2m_type_t t; - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); if ( unlikely(!page) || unlikely(is_xen_heap_page(page)) ) - type = XEN_DOMCTL_PFINFO_XTAB; + { + if ( p2m_is_broken(t) ) + type = XEN_DOMCTL_PFINFO_BROKEN; + else + type = XEN_DOMCTL_PFINFO_XTAB; + } else { switch( page->u.inuse.type_info & PGT_type_mask ) @@ -235,6 +241,9 @@ if ( page->u.inuse.type_info & PGT_pinned ) type |= XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type = XEN_DOMCTL_PFINFO_BROKEN; } if ( page ) @@ -1568,6 +1577,29 @@ } break; + case XEN_DOMCTL_set_broken_page_p2m: + { + struct domain *d; + + d = rcu_lock_domain_by_id(domctl->domain); + if ( d != NULL ) + { + p2m_type_t pt; + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; + mfn_t mfn = get_gfn_query(d, pfn, &pt); + + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) + ret = -EINVAL; + + put_gfn(d, pfn); + rcu_unlock_domain(d); + } + else + ret = -ESRCH; + } + break; + default: ret = iommu_do_domctl(domctl, u_domctl); break; diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) @@ -835,6 +836,12 @@ typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); +struct xen_domctl_set_broken_page_p2m { + uint64_aligned_t pfn; +}; +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -900,6 +907,7 @@ #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 #define XEN_DOMCTL_set_virq_handler 66 +#define XEN_DOMCTL_set_broken_page_p2m 67 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 19:33:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Vg-0003NG-FO; Thu, 01 Nov 2012 19:33:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0Ve-0003NA-VP for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 19:32:59 +0000 Received: from [85.158.143.99:54509] by server-3.bemta-4.messagelabs.com id 69/57-06841-A6EC2905; Thu, 01 Nov 2012 19:32:58 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351798376!22961470!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI2Mjk2\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10249 invoked from network); 1 Nov 2012 19:32:57 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-2.tower-216.messagelabs.com with SMTP; 1 Nov 2012 19:32:57 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Nov 2012 12:32:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,695,1344236400"; d="scan'208";a="212391095" Received: from ljsromley.bj.intel.com ([10.240.192.102]) by azsmga001.ch.intel.com with ESMTP; 01 Nov 2012 12:32:54 -0700 MIME-Version: 1.0 X-Mercurial-Node: 730dd3f22a12fd97814b54fb337e018b7c2bc83c Message-Id: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> User-Agent: Mercurial-patchbomb/1.4 Date: Fri, 02 Nov 2012 11:25:29 +0800 From: Liu Jinsong To: george.dunlap@eu.citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com Cc: xen-devel@lists.xensource.com Subject: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Generally, there are 2 cases: 1. broken page occurs before migration 2. broken page occurs during migration At the sender for case 1, the broken page would be mapped but not copied to target (otherwise it may trigger more serious error, say, SRAR error). While its pfn_type and pfn number would be transferred to target so that target take appropriate action. for case 2, mce handler marks the broken page to dirty bitmap, so that at copypages stage of migration, its pfn_type and pfn number would be transferred to target and then take appropriate action. At the target it would set p2m as p2m_ram_broken for broken page, so that if guest access the broken page again, it would kill itself as expected. Suggested-by: George Dunlap Signed-off-by: Liu, Jinsong diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 @@ -283,6 +283,22 @@ return ret; } +/* set broken page p2m */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn) +{ + int ret; + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; + domctl.domain = (domid_t)domid; + domctl.u.set_broken_page_p2m.pfn = pfn; + ret = do_domctl(xch, &domctl); + + return ret ? -1 : 0; +} + /* get info from hvm guest for save */ int xc_domain_hvm_getcontext(xc_interface *xch, uint32_t domid, diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 @@ -962,9 +962,15 @@ countpages = count; for (i = oldcount; i < buf->nr_pages; ++i) - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; + + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || + pagetype == XEN_DOMCTL_PFINFO_BROKEN || + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) --countpages; + } if (!countpages) return count; @@ -1200,6 +1206,17 @@ /* a bogus/unmapped/allocate-only page: skip it */ continue; + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + { + ERROR("Set p2m for broken page failed, " + "dom=%d, pfn=%lx\n", dom, pfn); + goto err_mapped; + } + continue; + } + if (pfn_err[i]) { ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) gmfn = pfn_to_mfn(gmfn); + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + { + pfn_type[j] |= pfn_batch[j]; + ++run; + continue; + } + if ( pfn_err[j] ) { if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) @@ -1371,8 +1378,12 @@ } } - /* skip pages that aren't present or are alloc-only */ + /* + * skip pages that aren't present, + * or are broken, or are alloc-only + */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB + || pagetype == XEN_DOMCTL_PFINFO_BROKEN || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) continue; diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 @@ -575,6 +575,17 @@ xc_domaininfo_t *info); /** + * This function set p2m for broken page + * &parm xch a handle to an open hypervisor interface + * @parm domid the domain id which broken page belong to + * @parm pfn the pfn number of the broken page + * @return 0 on success, -1 on failure + */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn); + +/** * This function returns information about the context of a hvm domain * @parm xch a handle to an open hypervisor interface * @parm domid the domain to get information from diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/cpu/mcheck/mcaction.c --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 @@ -1,5 +1,6 @@ #include #include +#include #include "mcaction.h" #include "vmce.h" #include "mce.h" @@ -91,6 +92,24 @@ goto vmce_failed; } + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && + paging_mode_log_dirty(d) ) + { + /* + * vMCE occur during migration + * + * At sender, it marks broken page to dirty bitmap, + * so that at copypages stage of migration, brokan + * page's pfn_type and pfn number would be transferred + * to target and then take appropriate action. + * + * At target, it would set p2m as p2m_ram_broken for + * broken page, so that if guest access the broken page + * again, it would kill itself as expected. + */ + paging_mark_dirty(d, mfn); + } + if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) { printk("Unmap broken memory %lx for DOM%d failed\n", diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 @@ -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) { unsigned long type = 0; + p2m_type_t t; - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); if ( unlikely(!page) || unlikely(is_xen_heap_page(page)) ) - type = XEN_DOMCTL_PFINFO_XTAB; + { + if ( p2m_is_broken(t) ) + type = XEN_DOMCTL_PFINFO_BROKEN; + else + type = XEN_DOMCTL_PFINFO_XTAB; + } else { switch( page->u.inuse.type_info & PGT_type_mask ) @@ -235,6 +241,9 @@ if ( page->u.inuse.type_info & PGT_pinned ) type |= XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type = XEN_DOMCTL_PFINFO_BROKEN; } if ( page ) @@ -1568,6 +1577,29 @@ } break; + case XEN_DOMCTL_set_broken_page_p2m: + { + struct domain *d; + + d = rcu_lock_domain_by_id(domctl->domain); + if ( d != NULL ) + { + p2m_type_t pt; + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; + mfn_t mfn = get_gfn_query(d, pfn, &pt); + + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) + ret = -EINVAL; + + put_gfn(d, pfn); + rcu_unlock_domain(d); + } + else + ret = -ESRCH; + } + break; + default: ret = iommu_do_domctl(domctl, u_domctl); break; diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) @@ -835,6 +836,12 @@ typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); +struct xen_domctl_set_broken_page_p2m { + uint64_aligned_t pfn; +}; +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -900,6 +907,7 @@ #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 #define XEN_DOMCTL_set_virq_handler 66 +#define XEN_DOMCTL_set_broken_page_p2m 67 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 19:58:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:58:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0tT-0003yh-R2; Thu, 01 Nov 2012 19:57:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0tS-0003yc-Cw for xen-devel@lists.xen.org; Thu, 01 Nov 2012 19:57:34 +0000 Received: from [85.158.138.51:15829] by server-5.bemta-3.messagelabs.com id F4/3E-26311-D24D2905; Thu, 01 Nov 2012 19:57:33 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1351799852!19439493!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5036 invoked from network); 1 Nov 2012 19:57:33 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-174.messagelabs.com with SMTP; 1 Nov 2012 19:57:33 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 19:57:31 +0000 Message-Id: <5092D42A020000780008EB7B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 19:57:30 +0000 From: "Jan Beulich" To: References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: konrad.wilk@oracle.com, george.dunlap@citrix.com, fantonifabio@tiscali.it, xen-devel@lists.xen.org Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Stefano Stabellini 11/01/12 4:50 PM >>> >On Tue, 11 Sep 2012, Jan Beulich wrote: >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: >> > xen.efi not compile when we build xen on Wheezy and probably is not >> > possible boot with lvm volume, fallback options ecc... >> >> Just get a suitable tool chain installed then. >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not >> > load efi variable. >> >> Sure, because only xen.efi has the code to deal with such. >> >> (Btw., I assume you aren't aware that any boot manager >> whatsoever, other than the one coming with EFI, is sort of >> bogus under EFI?) > >Unfortunately it looks like more and more people are of the opinion that >grub2 is useful even on UEFI firmware. >For example, it is pretty clear that Ubuntu is still going to boot Xen >via grub2 no matter how the firmware looks like. Then they need to be tought how to do it properly, the more that Linux itself now is capable of booting without a boot loader (other than the EFI one). >What would it take to make Xen work properly with grub2 on a UEFI firmware? I can't be that difficult. >I think that we should add it as a work item for Xen 4.3. If you have someone to do that work. I'm willing to review the resulting changes, but I currently don't see me doing anything here (as being totally unimportant and - just to repeat that - conceptually wrong). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 19:58:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 19:58:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0tT-0003yh-R2; Thu, 01 Nov 2012 19:57:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU0tS-0003yc-Cw for xen-devel@lists.xen.org; Thu, 01 Nov 2012 19:57:34 +0000 Received: from [85.158.138.51:15829] by server-5.bemta-3.messagelabs.com id F4/3E-26311-D24D2905; Thu, 01 Nov 2012 19:57:33 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1351799852!19439493!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5036 invoked from network); 1 Nov 2012 19:57:33 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-174.messagelabs.com with SMTP; 1 Nov 2012 19:57:33 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 19:57:31 +0000 Message-Id: <5092D42A020000780008EB7B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 19:57:30 +0000 From: "Jan Beulich" To: References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: konrad.wilk@oracle.com, george.dunlap@citrix.com, fantonifabio@tiscali.it, xen-devel@lists.xen.org Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Stefano Stabellini 11/01/12 4:50 PM >>> >On Tue, 11 Sep 2012, Jan Beulich wrote: >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: >> > xen.efi not compile when we build xen on Wheezy and probably is not >> > possible boot with lvm volume, fallback options ecc... >> >> Just get a suitable tool chain installed then. >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not >> > load efi variable. >> >> Sure, because only xen.efi has the code to deal with such. >> >> (Btw., I assume you aren't aware that any boot manager >> whatsoever, other than the one coming with EFI, is sort of >> bogus under EFI?) > >Unfortunately it looks like more and more people are of the opinion that >grub2 is useful even on UEFI firmware. >For example, it is pretty clear that Ubuntu is still going to boot Xen >via grub2 no matter how the firmware looks like. Then they need to be tought how to do it properly, the more that Linux itself now is capable of booting without a boot loader (other than the EFI one). >What would it take to make Xen work properly with grub2 on a UEFI firmware? I can't be that difficult. >I think that we should add it as a work item for Xen 4.3. If you have someone to do that work. I'm willing to review the resulting changes, but I currently don't see me doing anything here (as being totally unimportant and - just to repeat that - conceptually wrong). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:05:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:05:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU10h-0004H3-OM; Thu, 01 Nov 2012 20:05:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU10g-0004Gy-JU for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 20:05:02 +0000 Received: from [85.158.138.51:11643] by server-7.bemta-3.messagelabs.com id 42/DE-01713-DE5D2905; Thu, 01 Nov 2012 20:05:01 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1351800301!9652787!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13948 invoked from network); 1 Nov 2012 20:05:01 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-174.messagelabs.com with SMTP; 1 Nov 2012 20:05:01 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 20:05:00 +0000 Message-Id: <5092D5EA020000780008EB85@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 20:04:58 +0000 From: "Jan Beulich" To: , References: <20121101124912.GA10743@localhost.localdomain> In-Reply-To: <20121101124912.GA10743@localhost.localdomain> Mime-Version: 1.0 Content-Disposition: inline Cc: jeremy@goop.org, xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() >> resulting in the following link error: >> >> drivers/built-in.o: In function `dbgp_reset_prep': >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' >> drivers/built-in.o: In function `dbgp_external_startup': >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' > >There is another patch that needs to be Acked and picked up by >Greg KH that fixes this. > >Let me poke Jan Beulich to repost it with the appropiate Acks. It's been picked up already, but another dependency problem was found with it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had first submitted). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:05:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:05:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU10h-0004H3-OM; Thu, 01 Nov 2012 20:05:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU10g-0004Gy-JU for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 20:05:02 +0000 Received: from [85.158.138.51:11643] by server-7.bemta-3.messagelabs.com id 42/DE-01713-DE5D2905; Thu, 01 Nov 2012 20:05:01 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1351800301!9652787!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13948 invoked from network); 1 Nov 2012 20:05:01 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-174.messagelabs.com with SMTP; 1 Nov 2012 20:05:01 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 20:05:00 +0000 Message-Id: <5092D5EA020000780008EB85@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 20:04:58 +0000 From: "Jan Beulich" To: , References: <20121101124912.GA10743@localhost.localdomain> In-Reply-To: <20121101124912.GA10743@localhost.localdomain> Mime-Version: 1.0 Content-Disposition: inline Cc: jeremy@goop.org, xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() >> resulting in the following link error: >> >> drivers/built-in.o: In function `dbgp_reset_prep': >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' >> drivers/built-in.o: In function `dbgp_external_startup': >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' > >There is another patch that needs to be Acked and picked up by >Greg KH that fixes this. > >Let me poke Jan Beulich to repost it with the appropiate Acks. It's been picked up already, but another dependency problem was found with it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had first submitted). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:20:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:20:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fg-0004dA-AT; Thu, 01 Nov 2012 20:20:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fe-0004d5-7q for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 20:20:30 +0000 Received: from [85.158.139.83:4565] by server-16.bemta-5.messagelabs.com id 34/2A-04786-D89D2905; Thu, 01 Nov 2012 20:20:29 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1351801227!24077995!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11183 invoked from network); 1 Nov 2012 20:20:28 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 20:20:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15545742" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 20:20:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 20:20:26 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fa-000622-Eq; Thu, 01 Nov 2012 20:20:26 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU1Fa-0001Ct-E6; Thu, 01 Nov 2012 20:20:26 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 20:20:26 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, keir@xen.org, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing bisection] complete test-i386-i386-xl-qemuu-winxpsp3 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org branch xen-4.2-testing xen branch xen-4.2-testing job test-i386-i386-xl-qemuu-winxpsp3 test windows-install Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson For bisection revision-tuple graph see: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.xen-4.2-testing.test-i386-i386-xl-qemuu-winxpsp3.windows-install.html Revision IDs in each graph node refer, respectively, to the Trees above. ---------------------------------------- Searching for failure / basis pass: 14280 fail [host=bush-cricket] / 14076 ok. Failure / basis pass flights: 14280 / 14076 Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Latest a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df Basis pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 Generating revisions with ./adhoc-revtuple-generator git://xenbits.xen.org/linux-pvops.git#a938a246d34912423c560f475ccf1ce0c71d9d00-a938a246d34912423c560f475ccf1ce0c71d9d00 git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git#bacc0d302445c75f18f4c826750fb5853b60e7ca-bacc0d302445c75f18f4c826750fb5853b60e7ca git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git#cdf4d2bb4006805f209712fbb8ed1f83127e9984-cdf4d2bb4006805f209712fbb8ed1f83127e9984 http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg#40ccbee890e1-2bca7e58a3df pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found Loaded 1001 nodes in revision graph Searching for test results: 14076 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 14160 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14150 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14153 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14156 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14186 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14173 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14295 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 14296 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14192 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14297 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 87900aea9c6b 14280 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14300 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27312134166b 14301 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14327 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14305 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14309 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14328 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14330 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb Searching for interesting versions Result found: flight 14076 (pass), for basis pass Result found: flight 14150 (fail), for basis failure Repro found: flight 14295 (pass), for basis pass Repro found: flight 14296 (fail), for basis failure 0 revisions at a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 No revisions left to test, checking graph state. Result found: flight 14301 (pass), for last pass Result found: flight 14305 (fail), for first failure Repro found: flight 14309 (pass), for last pass Repro found: flight 14327 (fail), for first failure Repro found: flight 14328 (pass), for last pass Repro found: flight 14330 (fail), for first failure *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson Revision graph left in /home/xc_osstest/results/bisect.xen-4.2-testing.test-i386-i386-xl-qemuu-winxpsp3.windows-install.{dot,ps,png,html}. ---------------------------------------- 14330: tolerable ALL FAIL flight 14330 xen-4.2-testing real-bisect [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14330/ Failures :-/ but no regressions. Tests which did not succeed, including tests which could not be run: test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail baseline untested jobs: test-i386-i386-xl-qemuu-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:20:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:20:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fg-0004dA-AT; Thu, 01 Nov 2012 20:20:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fe-0004d5-7q for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 20:20:30 +0000 Received: from [85.158.139.83:4565] by server-16.bemta-5.messagelabs.com id 34/2A-04786-D89D2905; Thu, 01 Nov 2012 20:20:29 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1351801227!24077995!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11183 invoked from network); 1 Nov 2012 20:20:28 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 20:20:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15545742" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 20:20:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 20:20:26 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU1Fa-000622-Eq; Thu, 01 Nov 2012 20:20:26 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU1Fa-0001Ct-E6; Thu, 01 Nov 2012 20:20:26 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 20:20:26 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, keir@xen.org, stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing bisection] complete test-i386-i386-xl-qemuu-winxpsp3 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org branch xen-4.2-testing xen branch xen-4.2-testing job test-i386-i386-xl-qemuu-winxpsp3 test windows-install Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson For bisection revision-tuple graph see: http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.xen-4.2-testing.test-i386-i386-xl-qemuu-winxpsp3.windows-install.html Revision IDs in each graph node refer, respectively, to the Trees above. ---------------------------------------- Searching for failure / basis pass: 14280 fail [host=bush-cricket] / 14076 ok. Failure / basis pass flights: 14280 / 14076 Tree: linux git://xenbits.xen.org/linux-pvops.git Tree: qemu git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git Tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Latest a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df Basis pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 Generating revisions with ./adhoc-revtuple-generator git://xenbits.xen.org/linux-pvops.git#a938a246d34912423c560f475ccf1ce0c71d9d00-a938a246d34912423c560f475ccf1ce0c71d9d00 git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git#bacc0d302445c75f18f4c826750fb5853b60e7ca-bacc0d302445c75f18f4c826750fb5853b60e7ca git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git#cdf4d2bb4006805f209712fbb8ed1f83127e9984-cdf4d2bb4006805f209712fbb8ed1f83127e9984 http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg#40ccbee890e1-2bca7e58a3df pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found Loaded 1001 nodes in revision graph Searching for test results: 14076 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 14160 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14150 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14153 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14156 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14186 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14173 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14295 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 40ccbee890e1 14296 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14192 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14297 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 87900aea9c6b 14280 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 2bca7e58a3df 14300 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 27312134166b 14301 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14327 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14305 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb 14309 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14328 pass a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 14330 fail a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 051e2a30e3fb Searching for interesting versions Result found: flight 14076 (pass), for basis pass Result found: flight 14150 (fail), for basis failure Repro found: flight 14295 (pass), for basis pass Repro found: flight 14296 (fail), for basis failure 0 revisions at a938a246d34912423c560f475ccf1ce0c71d9d00 bacc0d302445c75f18f4c826750fb5853b60e7ca cdf4d2bb4006805f209712fbb8ed1f83127e9984 c23d938e3e64 No revisions left to test, checking graph state. Result found: flight 14301 (pass), for last pass Result found: flight 14305 (fail), for first failure Repro found: flight 14309 (pass), for last pass Repro found: flight 14327 (fail), for first failure Repro found: flight 14328 (pass), for last pass Repro found: flight 14330 (fail), for first failure *** Found and reproduced problem changeset *** Bug is in tree: xen http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg Bug introduced: 051e2a30e3fb Bug not present: c23d938e3e64 pulling from ssh://xen@xenbits.xen.org/HG/staging/xen-4.2-testing.hg searching for changes no changes found changeset: 25886:051e2a30e3fb user: Ian Campbell date: Fri Oct 26 16:40:18 2012 +0100 libxl: handle errors from xc_sharing_* info functions On a 32 bit hypervisor xl info currently reports: sharing_freed_memory : 72057594037927935 sharing_used_memory : 72057594037927935 Eat the ENOSYS and turn it into 0. Log and propagate other errors. I don't have a 32 bit system handy, so tested on x86_64 with a libxc hacked to return -ENOSYS and -EINVAL. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Andres Lagar-Cavilla Committed-by: Ian Campbell xen-unstable changeset: 25894:95a971c8058f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson Revision graph left in /home/xc_osstest/results/bisect.xen-4.2-testing.test-i386-i386-xl-qemuu-winxpsp3.windows-install.{dot,ps,png,html}. ---------------------------------------- 14330: tolerable ALL FAIL flight 14330 xen-4.2-testing real-bisect [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14330/ Failures :-/ but no regressions. Tests which did not succeed, including tests which could not be run: test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail baseline untested jobs: test-i386-i386-xl-qemuu-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sm-00050P-9G; Thu, 01 Nov 2012 20:34:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sl-00050G-2K for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:03 +0000 Received: from [85.158.139.83:47016] by server-13.bemta-5.messagelabs.com id 92/E7-27809-ABCD2905; Thu, 01 Nov 2012 20:34:02 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-182.messagelabs.com!1351802040!28634408!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13190 invoked from network); 1 Nov 2012 20:34:01 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:01 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030866; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:25 -0400 Message-Id: <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Similar to xenbus_read_integer, this function reads a xenstore path and parses it as a uuid. See include/xenbus.h for details. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/include/xenbus.h b/extras/mini-os/include/xenbus.h index cd6316e..f619066 100644 --- a/extras/mini-os/include/xenbus.h +++ b/extras/mini-os/include/xenbus.h @@ -95,6 +95,10 @@ char *xenbus_transaction_end(xenbus_transaction_t, int abort, /* Read path and parse it as an integer. Returns -1 on error. */ int xenbus_read_integer(const char *path); +/* Read path and parse it as 16 byte uuid. Returns 1 if + * read and parsing were successful, 0 if not */ +int xenbus_read_uuid(const char* path, unsigned char uuid[16]); + /* Contraction of snprintf and xenbus_write(path/node). */ char* xenbus_printf(xenbus_transaction_t xbt, const char* node, const char* path, diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c index 8c899f3..ee1691b 100644 --- a/extras/mini-os/xenbus/xenbus.c +++ b/extras/mini-os/xenbus/xenbus.c @@ -719,6 +719,33 @@ int xenbus_read_integer(const char *path) return t; } +int xenbus_read_uuid(const char* path, unsigned char uuid[16]) { + char * res, *buf; + res = xenbus_read(XBT_NIL, path, &buf); + if(res) { + printk("Failed to read %s.\n", path); + free(res); + return 0; + } + if(strlen(buf) != ((2*16)+4) /* 16 hex bytes and 4 hyphens */ + || sscanf(buf, + "%2hhx%2hhx%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx", + uuid, uuid + 1, uuid + 2, uuid + 3, + uuid + 4, uuid + 5, uuid + 6, uuid + 7, + uuid + 8, uuid + 9, uuid + 10, uuid + 11, + uuid + 12, uuid + 13, uuid + 14, uuid + 15) != 16) { + printk("Xenbus path %s value %s is not a uuid!\n", path, buf); + free(buf); + return 0; + } + free(buf); + return 1; +} + char* xenbus_printf(xenbus_transaction_t xbt, const char* node, const char* path, const char* fmt, ...) -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sm-00050P-9G; Thu, 01 Nov 2012 20:34:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sl-00050G-2K for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:03 +0000 Received: from [85.158.139.83:47016] by server-13.bemta-5.messagelabs.com id 92/E7-27809-ABCD2905; Thu, 01 Nov 2012 20:34:02 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-182.messagelabs.com!1351802040!28634408!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13190 invoked from network); 1 Nov 2012 20:34:01 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:01 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030866; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:25 -0400 Message-Id: <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Similar to xenbus_read_integer, this function reads a xenstore path and parses it as a uuid. See include/xenbus.h for details. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/include/xenbus.h b/extras/mini-os/include/xenbus.h index cd6316e..f619066 100644 --- a/extras/mini-os/include/xenbus.h +++ b/extras/mini-os/include/xenbus.h @@ -95,6 +95,10 @@ char *xenbus_transaction_end(xenbus_transaction_t, int abort, /* Read path and parse it as an integer. Returns -1 on error. */ int xenbus_read_integer(const char *path); +/* Read path and parse it as 16 byte uuid. Returns 1 if + * read and parsing were successful, 0 if not */ +int xenbus_read_uuid(const char* path, unsigned char uuid[16]); + /* Contraction of snprintf and xenbus_write(path/node). */ char* xenbus_printf(xenbus_transaction_t xbt, const char* node, const char* path, diff --git a/extras/mini-os/xenbus/xenbus.c b/extras/mini-os/xenbus/xenbus.c index 8c899f3..ee1691b 100644 --- a/extras/mini-os/xenbus/xenbus.c +++ b/extras/mini-os/xenbus/xenbus.c @@ -719,6 +719,33 @@ int xenbus_read_integer(const char *path) return t; } +int xenbus_read_uuid(const char* path, unsigned char uuid[16]) { + char * res, *buf; + res = xenbus_read(XBT_NIL, path, &buf); + if(res) { + printk("Failed to read %s.\n", path); + free(res); + return 0; + } + if(strlen(buf) != ((2*16)+4) /* 16 hex bytes and 4 hyphens */ + || sscanf(buf, + "%2hhx%2hhx%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx-" + "%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx", + uuid, uuid + 1, uuid + 2, uuid + 3, + uuid + 4, uuid + 5, uuid + 6, uuid + 7, + uuid + 8, uuid + 9, uuid + 10, uuid + 11, + uuid + 12, uuid + 13, uuid + 14, uuid + 15) != 16) { + printk("Xenbus path %s value %s is not a uuid!\n", path, buf); + free(buf); + return 0; + } + free(buf); + return 1; +} + char* xenbus_printf(xenbus_transaction_t xbt, const char* node, const char* path, const char* fmt, ...) -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Si-000507-TW; Thu, 01 Nov 2012 20:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Si-000500-3m for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:00 +0000 Received: from [85.158.139.211:31855] by server-7.bemta-5.messagelabs.com id 43/22-23096-7BCD2905; Thu, 01 Nov 2012 20:33:59 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-6.tower-206.messagelabs.com!1351802036!18540838!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3013 invoked from network); 1 Nov 2012 20:33:58 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:33:58 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030843; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:24 -0400 Message-Id: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Disabling the above flags in default mini-os build. They generate a lot of spam. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/minios.mk b/extras/mini-os/minios.mk index 48ed768..f42f48b 100644 --- a/extras/mini-os/minios.mk +++ b/extras/mini-os/minios.mk @@ -20,8 +20,8 @@ DEF_CFLAGS += -g #DEF_CFLAGS += -DMM_DEBUG #DEF_CFLAGS += -DFS_DEBUG #DEF_CFLAGS += -DLIBC_DEBUG -DEF_CFLAGS += -DGNT_DEBUG -DEF_CFLAGS += -DGNTMAP_DEBUG +#DEF_CFLAGS += -DGNT_DEBUG +#DEF_CFLAGS += -DGNTMAP_DEBUG else DEF_CFLAGS += -O3 endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Si-000507-TW; Thu, 01 Nov 2012 20:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Si-000500-3m for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:00 +0000 Received: from [85.158.139.211:31855] by server-7.bemta-5.messagelabs.com id 43/22-23096-7BCD2905; Thu, 01 Nov 2012 20:33:59 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-6.tower-206.messagelabs.com!1351802036!18540838!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3013 invoked from network); 1 Nov 2012 20:33:58 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:33:58 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030843; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:24 -0400 Message-Id: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Disabling the above flags in default mini-os build. They generate a lot of spam. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/minios.mk b/extras/mini-os/minios.mk index 48ed768..f42f48b 100644 --- a/extras/mini-os/minios.mk +++ b/extras/mini-os/minios.mk @@ -20,8 +20,8 @@ DEF_CFLAGS += -g #DEF_CFLAGS += -DMM_DEBUG #DEF_CFLAGS += -DFS_DEBUG #DEF_CFLAGS += -DLIBC_DEBUG -DEF_CFLAGS += -DGNT_DEBUG -DEF_CFLAGS += -DGNTMAP_DEBUG +#DEF_CFLAGS += -DGNT_DEBUG +#DEF_CFLAGS += -DGNTMAP_DEBUG else DEF_CFLAGS += -O3 endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Su-00051h-2J; Thu, 01 Nov 2012 20:34:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sr-000519-2g for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:09 +0000 Received: from [85.158.138.51:41257] by server-15.bemta-3.messagelabs.com id 27/F9-09445-FBCD2905; Thu, 01 Nov 2012 20:34:07 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-174.messagelabs.com!1351802041!28289883!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24016 invoked from network); 1 Nov 2012 20:34:03 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:03 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030871; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:26 -0400 Message-Id: <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 3/9] add tpmfront, tpm_tis, and tpmback drivers to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch adds 3 new drivers to mini-os. tpmfront - paravirtualized tpm frontend driver tpmback - paravirtualized tpm backend driver tpm_tis - hardware tpm driver Unfortunately these drivers were derived from GPL licensed linux kernel drivers so they must carry the GPL license. However, since mini-os now supports conditional compilation, hopefully these drivers can be included into the xen tree and conditionally removed from non-gpl projects. By default they are disabled in the makefile. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 2422db3..2302a23 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -22,6 +22,9 @@ CONFIG_QEMU_XS_ARGS ?= n CONFIG_TEST ?= n CONFIG_PCIFRONT ?= n CONFIG_BLKFRONT ?= y +CONFIG_TPMFRONT ?= n +CONFIG_TPM_TIS ?= n +CONFIG_TPMBACK ?= n CONFIG_NETFRONT ?= y CONFIG_FBFRONT ?= y CONFIG_KBDFRONT ?= y @@ -36,6 +39,9 @@ flags-$(CONFIG_SPARSE_BSS) += -DCONFIG_SPARSE_BSS flags-$(CONFIG_QEMU_XS_ARGS) += -DCONFIG_QEMU_XS_ARGS flags-$(CONFIG_PCIFRONT) += -DCONFIG_PCIFRONT flags-$(CONFIG_BLKFRONT) += -DCONFIG_BLKFRONT +flags-$(CONFIG_TPMFRONT) += -DCONFIG_TPMFRONT +flags-$(CONFIG_TPM_TIS) += -DCONFIG_TPM_TIS +flags-$(CONFIG_TPMBACK) += -DCONFIG_TPMBACK flags-$(CONFIG_NETFRONT) += -DCONFIG_NETFRONT flags-$(CONFIG_KBDFRONT) += -DCONFIG_KBDFRONT flags-$(CONFIG_FBFRONT) += -DCONFIG_FBFRONT @@ -67,6 +73,9 @@ TARGET := mini-os SUBDIRS := lib xenbus console src-$(CONFIG_BLKFRONT) += blkfront.c +src-$(CONFIG_TPMFRONT) += tpmfront.c +src-$(CONFIG_TPM_TIS) += tpm_tis.c +src-$(CONFIG_TPMBACK) += tpmback.c src-y += daytime.c src-y += events.c src-$(CONFIG_FBFRONT) += fbfront.c diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h index d4641b6..935bede 100644 --- a/extras/mini-os/include/lib.h +++ b/extras/mini-os/include/lib.h @@ -142,6 +142,8 @@ enum fd_type { FTYPE_FB, FTYPE_MEM, FTYPE_SAVEFILE, + FTYPE_TPMFRONT, + FTYPE_TPM_TIS, }; LIST_HEAD(evtchn_port_list, evtchn_port_info); @@ -185,6 +187,20 @@ extern struct file { struct { struct consfront_dev *dev; } cons; +#ifdef CONFIG_TPMFRONT + struct { + struct tpmfront_dev *dev; + int respgot; + off_t offset; + } tpmfront; +#endif +#ifdef CONFIG_TPM_TIS + struct { + struct tpm_chip *dev; + int respgot; + off_t offset; + } tpm_tis; +#endif #ifdef CONFIG_XENBUS struct { /* To each xenbus FD is associated a queue of watch events for this diff --git a/extras/mini-os/include/tpm_tis.h b/extras/mini-os/include/tpm_tis.h new file mode 100644 index 0000000..1faca0d --- /dev/null +++ b/extras/mini-os/include/tpm_tis.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm.c + * from the linux kernel + * + * Copyright (C) 2004 IBM Corporation + * + * This code has also been derived from drivers/char/tpm/tpm_tis.c + * from the linux kernel + * + * Copyright (C) 2005, 2006 IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#ifndef TPM_TIS_H +#define TPM_TIS_H + +#include +#include + +#define TPM_TIS_EN_LOCL0 1 +#define TPM_TIS_EN_LOCL1 (1 << 1) +#define TPM_TIS_EN_LOCL2 (1 << 2) +#define TPM_TIS_EN_LOCL3 (1 << 3) +#define TPM_TIS_EN_LOCL4 (1 << 4) +#define TPM_TIS_EN_LOCLALL (TPM_TIS_EN_LOCL0 | TPM_TIS_EN_LOCL1 | TPM_TIS_EN_LOCL2 | TPM_TIS_EN_LOCL3 | TPM_TIS_EN_LOCL4) +#define TPM_TIS_LOCL_INT_TO_FLAG(x) (1 << x) +#define TPM_BASEADDR 0xFED40000 +#define TPM_PROBE_IRQ 0xFFFF + +struct tpm_chip; + +struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq); +void shutdown_tpm_tis(struct tpm_chip* tpm); + +int tpm_tis_request_locality(struct tpm_chip* tpm, int locality); +int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); + +#ifdef HAVE_LIBC +#include +#include +/* POSIX IO functions: + * use tpm_tis_open() to get a file descriptor to the tpm device + * use write() on the fd to send a command to the backend. You must + * include the entire command in a single call to write(). + * use read() on the fd to read the response. You can use + * fstat() to get the size of the response and lseek() to seek on it. + */ +int tpm_tis_open(struct tpm_chip* tpm); +int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count); +int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count); +int tpm_tis_posix_fstat(int fd, struct stat* buf); +#endif + +#endif diff --git a/extras/mini-os/include/tpmback.h b/extras/mini-os/include/tpmback.h new file mode 100644 index 0000000..ff86732 --- /dev/null +++ b/extras/mini-os/include/tpmback.h @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/xen/tpmback/tpmback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netback/netback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This code has also been derived from drivers/xen/tpmback/xenbus.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2005 IBM Corporation + * Copyright (C) 2005 Rusty Russell + * + * This code has also been derived from drivers/xen/tpmback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself also derived from drvivers/xen/netback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2004, Keir Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ + +#include +#include +#include +#include +#ifndef TPMBACK_H +#define TPMBACK_H + +struct tpmcmd { + domid_t domid; /* Domid of the frontend */ + unsigned int handle; /* Handle of the frontend */ + unsigned char uuid[16]; /* uuid of the tpm interface */ + + unsigned int req_len; /* Size of the command in buf - set by tpmback driver */ + uint8_t* req; /* tpm command bits, allocated by driver, DON'T FREE IT */ + unsigned int resp_len; /* Size of the outgoing command, + you set this before passing the cmd object to tpmback_resp */ + uint8_t* resp; /* Buffer for response - YOU MUST ALLOCATE IT, YOU MUST ALSO FREE IT */ +}; +typedef struct tpmcmd tpmcmd_t; + +/* Initialize the tpm backend driver */ +void init_tpmback(void); + +/* Shutdown tpm backend driver */ +void shutdown_tpmback(void); + +/* Blocks until a tpm command is sent from any front end. + * Returns a pointer to the tpm command to handle. + * Do not try to free this pointer or the req buffer + * This function will return NULL if the tpm backend driver + * is shutdown or any other error occurs */ +tpmcmd_t* tpmback_req_any(void); + +/* Blocks until a tpm command from the frontend at domid/handle + * is sent. + * Returns NULL if domid/handle is not connected, tpmback is + * shutdown or shutting down, or if there is an error + */ +tpmcmd_t* tpmback_req(domid_t domid, unsigned int handle); + +/* Send the response to the tpm command back to the frontend + * This function will free the tpmcmd object, but you must free the resp + * buffer yourself */ +void tpmback_resp(tpmcmd_t* tpmcmd); + +/* Waits for the first frontend to connect and then sets domid and handle appropriately. + * If one or more frontends are already connected, this will set domid and handle to one + * of them arbitrarily. The main use for this function is to wait until a single + * frontend connection has occured. + * returns 0 on success, non-zero on failure */ +int tpmback_wait_for_frontend_connect(domid_t *domid, unsigned int *handle); + +/* returns the number of frontends connected */ +int tpmback_num_frontends(void); + +/* Returns the uuid of the specified frontend, NULL on error. + * The return value is internally allocated, so don't free it */ +unsigned char* tpmback_get_uuid(domid_t domid, unsigned int handle); + +/* Specify a function to call when a new tpm device connects */ +void tpmback_set_open_callback(void (*cb)(domid_t, unsigned int)); + +/* Specify a function to call when a tpm device disconnects */ +void tpmback_set_close_callback(void (*cb)(domid_t, unsigned int)); + +//Not Implemented +void tpmback_set_suspend_callback(void (*cb)(domid_t, unsigned int)); +void tpmback_set_resume_callback(void (*cb)(domid_t, unsigned int)); + +#endif diff --git a/extras/mini-os/include/tpmfront.h b/extras/mini-os/include/tpmfront.h new file mode 100644 index 0000000..fd2cb17 --- /dev/null +++ b/extras/mini-os/include/tpmfront.h @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm_vtpm.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2006 IBM Corporation + * + * This code has also been derived from drivers/char/tpm_xen.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netfront/netfront.c + * from the linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + */ +#ifndef TPMFRONT_H +#define TPMFRONT_H + +#include +#include +#include +#include +#include +#include +#include + +struct tpmfront_dev { + grant_ref_t ring_ref; + evtchn_port_t evtchn; + + tpmif_tx_interface_t* tx; + + void** pages; + + domid_t bedomid; + char* nodename; + char* bepath; + + XenbusState state; + + uint8_t waiting; + struct wait_queue_head waitq; + + uint8_t* respbuf; + size_t resplen; + +#ifdef HAVE_LIBC + int fd; +#endif + +}; + + +/*Initialize frontend */ +struct tpmfront_dev* init_tpmfront(const char* nodename); +/*Shutdown frontend */ +void shutdown_tpmfront(struct tpmfront_dev* dev); + +/* Send a tpm command to the backend and wait for the response + * + * @dev - frontend device + * @req - request buffer + * @reqlen - length of request buffer + * @resp - *resp will be set to internal response buffer, don't free it! Value is undefined on error + * @resplen - *resplen will be set to the length of the response. Value is undefined on error + * + * returns 0 on success, non zero on failure. + * */ +int tpmfront_cmd(struct tpmfront_dev* dev, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); + +#ifdef HAVE_LIBC +#include +/* POSIX IO functions: + * use tpmfront_open() to get a file descriptor to the tpm device + * use write() on the fd to send a command to the backend. You must + * include the entire command in a single call to write(). + * use read() on the fd to read the response. You can use + * fstat() to get the size of the response and lseek() to seek on it. + */ +int tpmfront_open(struct tpmfront_dev* dev); +int tpmfront_posix_read(int fd, uint8_t* buf, size_t count); +int tpmfront_posix_write(int fd, const uint8_t* buf, size_t count); +int tpmfront_posix_fstat(int fd, struct stat* buf); +#endif + + +#endif diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index 6cb97b1..d212969 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include @@ -294,6 +296,16 @@ int read(int fd, void *buf, size_t nbytes) return blkfront_posix_read(fd, buf, nbytes); } #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: { + return tpmfront_posix_read(fd, buf, nbytes); + } +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: { + return tpm_tis_posix_read(fd, buf, nbytes); + } +#endif default: break; } @@ -330,6 +342,14 @@ int write(int fd, const void *buf, size_t nbytes) case FTYPE_BLK: return blkfront_posix_write(fd, buf, nbytes); #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + return tpmfront_posix_write(fd, buf, nbytes); +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + return tpm_tis_posix_write(fd, buf, nbytes); +#endif default: break; } @@ -341,8 +361,16 @@ int write(int fd, const void *buf, size_t nbytes) off_t lseek(int fd, off_t offset, int whence) { switch(files[fd].type) { +#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONFIG_TPM_TIS) #ifdef CONFIG_BLKFRONT case FTYPE_BLK: +#endif +#ifdef CONFIG_TPMFRNT + case FTYPE_TPMFRONT: +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: +#endif switch (whence) { case SEEK_SET: files[fd].file.offset = offset; @@ -420,6 +448,18 @@ int close(int fd) files[fd].type = FTYPE_NONE; return 0; #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + shutdown_tpmfront(files[fd].tpmfront.dev); + files[fd].type = FTYPE_NONE; + return 0; +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + shutdown_tpm_tis(files[fd].tpm_tis.dev); + files[fd].type = FTYPE_NONE; + return 0; +#endif #ifdef CONFIG_KBDFRONT case FTYPE_KBD: shutdown_kbdfront(files[fd].kbd.dev); @@ -489,6 +529,14 @@ int fstat(int fd, struct stat *buf) case FTYPE_BLK: return blkfront_posix_fstat(fd, buf); #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + return tpmfront_posix_fstat(fd, buf); +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + return tpm_tis_posix_fstat(fd, buf); +#endif default: break; } diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c new file mode 100644 index 0000000..e8ca69f --- /dev/null +++ b/extras/mini-os/tpm_tis.c @@ -0,0 +1,1354 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm.c + * from the linux kernel + * + * Copyright (C) 2004 IBM Corporation + * + * This code has also been derived from drivers/char/tpm/tpm_tis.c + * from the linux kernel + * + * Copyright (C) 2005, 2006 IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef min + #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) +#endif + +#define TPM_HEADER_SIZE 10 + +#define TPM_BUFSIZE 2048 + +struct tpm_input_header { + uint16_t tag; + uint32_t length; + uint32_t ordinal; +}__attribute__((packed)); + +struct tpm_output_header { + uint16_t tag; + uint32_t length; + uint32_t return_code; +}__attribute__((packed)); + +struct stclear_flags_t { + uint16_t tag; + uint8_t deactivated; + uint8_t disableForceClear; + uint8_t physicalPresence; + uint8_t physicalPresenceLock; + uint8_t bGlobalLock; +}__attribute__((packed)); + +struct tpm_version_t { + uint8_t Major; + uint8_t Minor; + uint8_t revMajor; + uint8_t revMinor; +}__attribute__((packed)); + +struct tpm_version_1_2_t { + uint16_t tag; + uint8_t Major; + uint8_t Minor; + uint8_t revMajor; + uint8_t revMinor; +}__attribute__((packed)); + +struct timeout_t { + uint32_t a; + uint32_t b; + uint32_t c; + uint32_t d; +}__attribute__((packed)); + +struct duration_t { + uint32_t tpm_short; + uint32_t tpm_medium; + uint32_t tpm_long; +}__attribute__((packed)); + +struct permanent_flags_t { + uint16_t tag; + uint8_t disable; + uint8_t ownership; + uint8_t deactivated; + uint8_t readPubek; + uint8_t disableOwnerClear; + uint8_t allowMaintenance; + uint8_t physicalPresenceLifetimeLock; + uint8_t physicalPresenceHWEnable; + uint8_t physicalPresenceCMDEnable; + uint8_t CEKPUsed; + uint8_t TPMpost; + uint8_t TPMpostLock; + uint8_t FIPS; + uint8_t operator; + uint8_t enableRevokeEK; + uint8_t nvLocked; + uint8_t readSRKPub; + uint8_t tpmEstablished; + uint8_t maintenanceDone; + uint8_t disableFullDALogicInfo; +}__attribute__((packed)); + +typedef union { + struct permanent_flags_t perm_flags; + struct stclear_flags_t stclear_flags; + bool owned; + uint32_t num_pcrs; + struct tpm_version_t tpm_version; + struct tpm_version_1_2_t tpm_version_1_2; + uint32_t manufacturer_id; + struct timeout_t timeout; + struct duration_t duration; +} cap_t; + +struct tpm_getcap_params_in { + uint32_t cap; + uint32_t subcap_size; + uint32_t subcap; +}__attribute__((packed)); + +struct tpm_getcap_params_out { + uint32_t cap_size; + cap_t cap; +}__attribute__((packed)); + +struct tpm_readpubek_params_out { + uint8_t algorithm[4]; + uint8_t encscheme[2]; + uint8_t sigscheme[2]; + uint32_t paramsize; + uint8_t parameters[12]; /*assuming RSA*/ + uint32_t keysize; + uint8_t modulus[256]; + uint8_t checksum[20]; +}__attribute__((packed)); + +typedef union { + struct tpm_input_header in; + struct tpm_output_header out; +} tpm_cmd_header; + +#define TPM_DIGEST_SIZE 20 +struct tpm_pcrread_out { + uint8_t pcr_result[TPM_DIGEST_SIZE]; +}__attribute__((packed)); + +struct tpm_pcrread_in { + uint32_t pcr_idx; +}__attribute__((packed)); + +struct tpm_pcrextend_in { + uint32_t pcr_idx; + uint8_t hash[TPM_DIGEST_SIZE]; +}__attribute__((packed)); + +typedef union { + struct tpm_getcap_params_out getcap_out; + struct tpm_readpubek_params_out readpubek_out; + uint8_t readpubek_out_buffer[sizeof(struct tpm_readpubek_params_out)]; + struct tpm_getcap_params_in getcap_in; + struct tpm_pcrread_in pcrread_in; + struct tpm_pcrread_out pcrread_out; + struct tpm_pcrextend_in pcrextend_in; +} tpm_cmd_params; + +struct tpm_cmd_t { + tpm_cmd_header header; + tpm_cmd_params params; +}__attribute__((packed)); + + +enum tpm_duration { + TPM_SHORT = 0, + TPM_MEDIUM = 1, + TPM_LONG = 2, + TPM_UNDEFINED, +}; + +#define TPM_MAX_ORDINAL 243 +#define TPM_MAX_PROTECTED_ORDINAL 12 +#define TPM_PROTECTED_ORDINAL_MASK 0xFF + +extern const uint8_t tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL]; +extern const uint8_t tpm_ordinal_duration[TPM_MAX_ORDINAL]; + +#define TPM_DIGEST_SIZE 20 +#define TPM_ERROR_SIZE 10 +#define TPM_RET_CODE_IDX 6 + +/* tpm_capabilities */ +#define TPM_CAP_FLAG cpu_to_be32(4) +#define TPM_CAP_PROP cpu_to_be32(5) +#define CAP_VERSION_1_1 cpu_to_be32(0x06) +#define CAP_VERSION_1_2 cpu_to_be32(0x1A) + +/* tpm_sub_capabilities */ +#define TPM_CAP_PROP_PCR cpu_to_be32(0x101) +#define TPM_CAP_PROP_MANUFACTURER cpu_to_be32(0x103) +#define TPM_CAP_FLAG_PERM cpu_to_be32(0x108) +#define TPM_CAP_FLAG_VOL cpu_to_be32(0x109) +#define TPM_CAP_PROP_OWNER cpu_to_be32(0x111) +#define TPM_CAP_PROP_TIS_TIMEOUT cpu_to_be32(0x115) +#define TPM_CAP_PROP_TIS_DURATION cpu_to_be32(0x120) + + +#define TPM_INTERNAL_RESULT_SIZE 200 +#define TPM_TAG_RQU_COMMAND cpu_to_be16(193) +#define TPM_ORD_GET_CAP cpu_to_be32(101) + +extern const struct tpm_input_header tpm_getcap_header; + + + +const uint8_t tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL] = { + TPM_UNDEFINED, /* 0 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 5 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 10 */ + TPM_SHORT, +}; + +const uint8_t tpm_ordinal_duration[TPM_MAX_ORDINAL] = { + TPM_UNDEFINED, /* 0 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 5 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 10 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_LONG, + TPM_LONG, + TPM_MEDIUM, /* 15 */ + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, + TPM_LONG, + TPM_SHORT, /* 20 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, /* 25 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 30 */ + TPM_LONG, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 35 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 40 */ + TPM_LONG, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 45 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_LONG, + TPM_MEDIUM, /* 50 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 55 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 60 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 65 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 70 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 75 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 80 */ + TPM_UNDEFINED, + TPM_MEDIUM, + TPM_LONG, + TPM_SHORT, + TPM_UNDEFINED, /* 85 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 90 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 95 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 100 */ + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 105 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 110 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 115 */ + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 120 */ + TPM_LONG, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 125 */ + TPM_SHORT, + TPM_LONG, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 130 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_SHORT, + TPM_MEDIUM, + TPM_UNDEFINED, /* 135 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 140 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 145 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 150 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 155 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 160 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 165 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 170 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 175 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 180 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, /* 185 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 190 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 195 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 200 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 205 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 210 */ + TPM_UNDEFINED, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_UNDEFINED, /* 215 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 220 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 225 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 230 */ + TPM_LONG, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 235 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 240 */ + TPM_UNDEFINED, + TPM_MEDIUM, +}; + +const struct tpm_input_header tpm_getcap_header = { + .tag = TPM_TAG_RQU_COMMAND, + .length = cpu_to_be32(22), + .ordinal = TPM_ORD_GET_CAP +}; + + +enum tis_access { + TPM_ACCESS_VALID = 0x80, + TPM_ACCESS_ACTIVE_LOCALITY = 0x20, /* (R) */ + TPM_ACCESS_RELINQUISH_LOCALITY = 0x20,/* (W) */ + TPM_ACCESS_REQUEST_PENDING = 0x04, /* (W) */ + TPM_ACCESS_REQUEST_USE = 0x02, /* (W) */ +}; + +enum tis_status { + TPM_STS_VALID = 0x80, /* (R) */ + TPM_STS_COMMAND_READY = 0x40, /* (R) */ + TPM_STS_DATA_AVAIL = 0x10, /* (R) */ + TPM_STS_DATA_EXPECT = 0x08, /* (R) */ + TPM_STS_GO = 0x20, /* (W) */ +}; + +enum tis_int_flags { + TPM_GLOBAL_INT_ENABLE = 0x80000000, + TPM_INTF_BURST_COUNT_STATIC = 0x100, + TPM_INTF_CMD_READY_INT = 0x080, + TPM_INTF_INT_EDGE_FALLING = 0x040, + TPM_INTF_INT_EDGE_RISING = 0x020, + TPM_INTF_INT_LEVEL_LOW = 0x010, + TPM_INTF_INT_LEVEL_HIGH = 0x008, + TPM_INTF_LOCALITY_CHANGE_INT = 0x004, + TPM_INTF_STS_VALID_INT = 0x002, + TPM_INTF_DATA_AVAIL_INT = 0x001, +}; + +enum tis_defaults { + TIS_MEM_BASE = 0xFED40000, + TIS_MEM_LEN = 0x5000, + TIS_SHORT_TIMEOUT = 750, /*ms*/ + TIS_LONG_TIMEOUT = 2000, /*2 sec */ +}; + +#define TPM_TIMEOUT 5 + +#define TPM_ACCESS(t, l) (((uint8_t*)t->pages[l]) + 0x0000) +#define TPM_INT_ENABLE(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0008)) +#define TPM_INT_VECTOR(t, l) (((uint8_t*)t->pages[l]) + 0x000C) +#define TPM_INT_STATUS(t, l) (((uint8_t*)t->pages[l]) + 0x0010) +#define TPM_INTF_CAPS(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0014)) +#define TPM_STS(t, l) ((uint8_t*)(((uint8_t*)t->pages[l]) + 0x0018)) +#define TPM_DATA_FIFO(t, l) (((uint8_t*)t->pages[l]) + 0x0024) + +#define TPM_DID_VID(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0F00)) +#define TPM_RID(t, l) (((uint8_t*)t->pages[l]) + 0x0F04) + +struct tpm_chip { + int enabled_localities; + int locality; + unsigned long baseaddr; + uint8_t* pages[5]; + int did, vid, rid; + + uint8_t data_buffer[TPM_BUFSIZE]; + int data_len; + + s_time_t timeout_a, timeout_b, timeout_c, timeout_d; + s_time_t duration[3]; + +#ifdef HAVE_LIBC + int fd; +#endif + + unsigned int irq; + struct wait_queue_head read_queue; + struct wait_queue_head int_queue; +}; + + +static void __init_tpm_chip(struct tpm_chip* tpm) { + tpm->enabled_localities = TPM_TIS_EN_LOCLALL; + tpm->locality = -1; + tpm->baseaddr = 0; + tpm->pages[0] = tpm->pages[1] = tpm->pages[2] = tpm->pages[3] = tpm->pages[4] = NULL; + tpm->vid = 0; + tpm->did = 0; + tpm->irq = 0; + init_waitqueue_head(&tpm->read_queue); + init_waitqueue_head(&tpm->int_queue); + + tpm->data_len = -1; + +#ifdef HAVE_LIBC + tpm->fd = -1; +#endif +} + +/* + * Returns max number of nsecs to wait + */ +s_time_t tpm_calc_ordinal_duration(struct tpm_chip *chip, + uint32_t ordinal) +{ + int duration_idx = TPM_UNDEFINED; + s_time_t duration = 0; + + if (ordinal < TPM_MAX_ORDINAL) + duration_idx = tpm_ordinal_duration[ordinal]; + else if ((ordinal & TPM_PROTECTED_ORDINAL_MASK) < + TPM_MAX_PROTECTED_ORDINAL) + duration_idx = + tpm_protected_ordinal_duration[ordinal & + TPM_PROTECTED_ORDINAL_MASK]; + + if (duration_idx != TPM_UNDEFINED) { + duration = chip->duration[duration_idx]; + } + + if (duration <= 0) { + return SECONDS(120); + } + else + { + return duration; + } +} + + +static int locality_enabled(struct tpm_chip* tpm, int l) { + return tpm->enabled_localities & (1 << l); +} + +static int check_locality(struct tpm_chip* tpm, int l) { + if(locality_enabled(tpm, l) && (ioread8(TPM_ACCESS(tpm, l)) & + (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == + (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) { + return l; + } + return -1; +} + +void release_locality(struct tpm_chip* tpm, int l, int force) +{ + if (locality_enabled(tpm, l) && (force || (ioread8(TPM_ACCESS(tpm, l)) & + (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == + (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID))) { + iowrite8(TPM_ACCESS(tpm, l), TPM_ACCESS_RELINQUISH_LOCALITY); + } +} + +int tpm_tis_request_locality(struct tpm_chip* tpm, int l) { + + s_time_t stop; + /*Make sure locality is valid */ + if(!locality_enabled(tpm, l)) { + printk("tpm_tis_change_locality() Tried to change to locality %d, but it is disabled or invalid!\n", l); + return -1; + } + /* Check if we already have the current locality */ + if(check_locality(tpm, l) >= 0) { + return tpm->locality = l; + } + /* Set the new locality*/ + iowrite8(TPM_ACCESS(tpm, l), TPM_ACCESS_REQUEST_USE); + + if(tpm->irq) { + /* Wait for interrupt */ + wait_event_deadline(tpm->int_queue, (check_locality(tpm, l) >= 0), NOW() + tpm->timeout_a); + + /* FIXME: Handle timeout event, should return error in that case */ + return l; + } else { + /* Wait for burstcount */ + stop = NOW() + tpm->timeout_a; + do { + if(check_locality(tpm, l) >= 0) { + return tpm->locality = l; + } + msleep(TPM_TIMEOUT); + } while(NOW() < stop); + } + + printk("REQ LOCALITY FAILURE\n"); + return -1; +} + +static uint8_t tpm_tis_status(struct tpm_chip* tpm) { + return ioread8(TPM_STS(tpm, tpm->locality)); +} + +/* This causes the current command to be aborted */ +static void tpm_tis_ready(struct tpm_chip* tpm) { + iowrite8(TPM_STS(tpm, tpm->locality), TPM_STS_COMMAND_READY); +} +#define tpm_tis_cancel_cmd(v) tpm_tis_ready(v) + +static int get_burstcount(struct tpm_chip* tpm) { + s_time_t stop; + int burstcnt; + + stop = NOW() + tpm->timeout_d; + do { + burstcnt = ioread8((TPM_STS(tpm, tpm->locality) + 1)); + burstcnt += ioread8(TPM_STS(tpm, tpm->locality) + 2) << 8; + + if (burstcnt) { + return burstcnt; + } + msleep(TPM_TIMEOUT); + } while(NOW() < stop); + return -EBUSY; +} + +static int wait_for_stat(struct tpm_chip* tpm, uint8_t mask, + unsigned long timeout, struct wait_queue_head* queue) { + s_time_t stop; + uint8_t status; + + status = tpm_tis_status(tpm); + if((status & mask) == mask) { + return 0; + } + + if(tpm->irq) { + wait_event_deadline(*queue, ((tpm_tis_status(tpm) & mask) == mask), timeout); + /* FIXME: Check for timeout and return -ETIME */ + return 0; + } else { + stop = NOW() + timeout; + do { + msleep(TPM_TIMEOUT); + status = tpm_tis_status(tpm); + if((status & mask) == mask) + return 0; + } while( NOW() < stop); + } + return -ETIME; +} + +static int recv_data(struct tpm_chip* tpm, uint8_t* buf, size_t count) { + int size = 0; + int burstcnt; + while( size < count && + wait_for_stat(tpm, + TPM_STS_DATA_AVAIL | TPM_STS_VALID, + tpm->timeout_c, + &tpm->read_queue) + == 0) { + burstcnt = get_burstcount(tpm); + for(; burstcnt > 0 && size < count; --burstcnt) + { + buf[size++] = ioread8(TPM_DATA_FIFO(tpm, tpm->locality)); + } + } + return size; +} + +int tpm_tis_recv(struct tpm_chip* tpm, uint8_t* buf, size_t count) { + int size = 0; + int expected, status; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; + goto out; + } + + /* read first 10 bytes, including tag, paramsize, and result */ + if((size = + recv_data(tpm, buf, TPM_HEADER_SIZE)) < TPM_HEADER_SIZE) { + printk("Error reading tpm cmd header\n"); + goto out; + } + + expected = be32_to_cpu(*((uint32_t*)(buf + 2))); + if(expected > count) { + size = -EIO; + goto out; + } + + if((size += recv_data(tpm, & buf[TPM_HEADER_SIZE], + expected - TPM_HEADER_SIZE)) < expected) { + printk("Unable to read rest of tpm command size=%d expected=%d\n", size, expected); + size = -ETIME; + goto out; + } + + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->int_queue); + status = tpm_tis_status(tpm); + if(status & TPM_STS_DATA_AVAIL) { + printk("Error: left over data\n"); + size = -EIO; + goto out; + } + +out: + tpm_tis_ready(tpm); + release_locality(tpm, tpm->locality, 0); + return size; +} +int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { + int rc; + int status, burstcnt = 0; + int count = 0; + uint32_t ordinal; + + if(tpm_tis_request_locality(tpm, tpm->locality) < 0) { + return -EBUSY; + } + + status = tpm_tis_status(tpm); + if((status & TPM_STS_COMMAND_READY) == 0) { + tpm_tis_ready(tpm); + if(wait_for_stat(tpm, TPM_STS_COMMAND_READY, tpm->timeout_b, &tpm->int_queue) < 0) { + rc = -ETIME; + goto out_err; + } + } + + while(count < len - 1) { + burstcnt = get_burstcount(tpm); + for(;burstcnt > 0 && count < len -1; --burstcnt) { + iowrite8(TPM_DATA_FIFO(tpm, tpm->locality), buf[count++]); + } + + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->int_queue); + status = tpm_tis_status(tpm); + if((status & TPM_STS_DATA_EXPECT) == 0) { + rc = -EIO; + goto out_err; + } + } + + /*Write last byte*/ + iowrite8(TPM_DATA_FIFO(tpm, tpm->locality), buf[count]); + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->read_queue); + status = tpm_tis_status(tpm); + if((status & TPM_STS_DATA_EXPECT) != 0) { + rc = -EIO; + goto out_err; + } + + /*go and do it*/ + iowrite8(TPM_STS(tpm, tpm->locality), TPM_STS_GO); + + if(tpm->irq) { + /*Wait for interrupt */ + ordinal = be32_to_cpu(*(buf + 6)); + if(wait_for_stat(tpm, + TPM_STS_DATA_AVAIL | TPM_STS_VALID, + tpm_calc_ordinal_duration(tpm, ordinal), + &tpm->read_queue) < 0) { + rc = -ETIME; + goto out_err; + } + } +#ifdef HAVE_LIBC + if(tpm->fd >= 0) { + files[tpm->fd].read = 0; + files[tpm->fd].tpm_tis.respgot = 0; + files[tpm->fd].tpm_tis.offset = 0; + } +#endif + return len; + +out_err: + tpm_tis_ready(tpm); + release_locality(tpm, tpm->locality, 0); + return rc; +} + +static void tpm_tis_irq_handler(evtchn_port_t port, struct pt_regs *regs, void* data) +{ + struct tpm_chip* tpm = data; + uint32_t interrupt; + int i; + + interrupt = ioread32(TPM_INT_STATUS(tpm, tpm->locality)); + if(interrupt == 0) { + return; + } + + if(interrupt & TPM_INTF_DATA_AVAIL_INT) { + wake_up(&tpm->read_queue); + } + if(interrupt & TPM_INTF_LOCALITY_CHANGE_INT) { + for(i = 0; i < 5; ++i) { + if(check_locality(tpm, i) >= 0) { + break; + } + } + } + if(interrupt & (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT | + TPM_INTF_CMD_READY_INT)) { + wake_up(&tpm->int_queue); + } + + /* Clear interrupts handled with TPM_EOI */ + iowrite32(TPM_INT_STATUS(tpm, tpm->locality), interrupt); + ioread32(TPM_INT_STATUS(tpm, tpm->locality)); + return; +} + +/* + * Internal kernel interface to transmit TPM commands + */ +static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, + size_t bufsiz) +{ + ssize_t rc; + uint32_t count, ordinal; + s_time_t stop; + + count = be32_to_cpu(*((uint32_t *) (buf + 2))); + ordinal = be32_to_cpu(*((uint32_t *) (buf + 6))); + if (count == 0) + return -ENODATA; + if (count > bufsiz) { + printk("Error: invalid count value %x %zx \n", count, bufsiz); + return -E2BIG; + } + + //down(&chip->tpm_mutex); + + if ((rc = tpm_tis_send(chip, (uint8_t *) buf, count)) < 0) { + printk("tpm_transmit: tpm_send: error %ld\n", rc); + goto out; + } + + if (chip->irq) + goto out_recv; + + stop = NOW() + tpm_calc_ordinal_duration(chip, ordinal); + do { + uint8_t status = tpm_tis_status(chip); + if ((status & (TPM_STS_DATA_AVAIL | TPM_STS_VALID)) == + (TPM_STS_DATA_AVAIL | TPM_STS_VALID)) + goto out_recv; + + if ((status == TPM_STS_COMMAND_READY)) { + printk("TPM Error: Operation Canceled\n"); + rc = -ECANCELED; + goto out; + } + + msleep(TPM_TIMEOUT); /* CHECK */ + rmb(); + } while (NOW() < stop); + + /* Cancel the command */ + tpm_tis_cancel_cmd(chip); + printk("TPM Operation Timed out\n"); + rc = -ETIME; + goto out; + +out_recv: + if((rc = tpm_tis_recv(chip, (uint8_t *) buf, bufsiz)) < 0) { + printk("tpm_transmit: tpm_recv: error %d\n", rc); + } +out: + //up(&chip->tpm_mutex); + return rc; +} + +static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd, + int len, const char *desc) +{ + int err; + + len = tpm_transmit(chip,(uint8_t *) cmd, len); + if (len < 0) + return len; + if (len == TPM_ERROR_SIZE) { + err = be32_to_cpu(cmd->header.out.return_code); + printk("A TPM error (%d) occurred %s\n", err, desc); + return err; + } + return 0; +} + +int tpm_get_timeouts(struct tpm_chip *chip) +{ + struct tpm_cmd_t tpm_cmd; + struct timeout_t *timeout_cap; + struct duration_t *duration_cap; + ssize_t rc; + uint32_t timeout; + unsigned int scale = 1; + + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT; + + if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, + "attempting to determine the timeouts")) != 0) { + printk("transmit failed %d\n", rc); + goto duration; + } + + if(be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || + be32_to_cpu(tpm_cmd.header.out.length) != + sizeof(tpm_cmd.header.out) + sizeof(uint32_t) + 4 * sizeof(uint32_t)) { + return -EINVAL; + } + + timeout_cap = &tpm_cmd.params.getcap_out.cap.timeout; + /* Don't overwrite default if value is 0 */ + timeout = be32_to_cpu(timeout_cap->a); + if(timeout && timeout < 1000) { + /* timeouts in msc rather usec */ + scale = 1000; + } + if (timeout) + chip->timeout_a = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->b); + if (timeout) + chip->timeout_b = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->c); + if (timeout) + chip->timeout_c = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->d); + if (timeout) + chip->timeout_d = MICROSECS(timeout * scale); /*Convert to msec */ + +duration: + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_DURATION; + + if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, + "attempting to determine the durations")) < 0) { + return rc; + } + + if(be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || + be32_to_cpu(tpm_cmd.header.out.length) != + sizeof(tpm_cmd.header.out) + sizeof(uint32_t) + 3 * sizeof(uint32_t)) { + return -EINVAL; + } + + duration_cap = &tpm_cmd.params.getcap_out.cap.duration; + chip->duration[TPM_SHORT] = MICROSECS(be32_to_cpu(duration_cap->tpm_short)); + chip->duration[TPM_MEDIUM] = MICROSECS(be32_to_cpu(duration_cap->tpm_medium)); + chip->duration[TPM_LONG] = MICROSECS(be32_to_cpu(duration_cap->tpm_long)); + + /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above + * value wrong and apparently reports msecs rather than usecs. So we + * fix up the resulting too-small TPM_SHORT value to make things work. + */ + if (chip->duration[TPM_SHORT] < MILLISECS(10)) { + chip->duration[TPM_SHORT] = SECONDS(1); + chip->duration[TPM_MEDIUM] *= 1000; + chip->duration[TPM_LONG] *= 1000; + printk("Adjusting TPM timeout parameters\n"); + } + + return 0; +} + + + +void tpm_continue_selftest(struct tpm_chip* chip) { + uint8_t data[] = { + 0, 193, /* TPM_TAG_RQU_COMMAND */ + 0, 0, 0, 10, /* length */ + 0, 0, 0, 83, /* TPM_ORD_GetCapability */ + }; + + tpm_transmit(chip, data, sizeof(data)); +} + +ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, + const char *desc) +{ + struct tpm_cmd_t tpm_cmd; + int rc; + + tpm_cmd.header.in = tpm_getcap_header; + if (subcap_id == CAP_VERSION_1_1 || subcap_id == CAP_VERSION_1_2) { + tpm_cmd.params.getcap_in.cap = subcap_id; + /*subcap field not necessary */ + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0); + tpm_cmd.header.in.length -= cpu_to_be32(sizeof(uint32_t)); + } else { + if (subcap_id == TPM_CAP_FLAG_PERM || + subcap_id == TPM_CAP_FLAG_VOL) + tpm_cmd.params.getcap_in.cap = TPM_CAP_FLAG; + else + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = subcap_id; + } + rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, desc); + if (!rc) + *cap = tpm_cmd.params.getcap_out.cap; + return rc; +} + + +struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq) +{ + int i; + unsigned long addr; + struct tpm_chip* tpm = NULL; + uint32_t didvid; + uint32_t intfcaps; + uint32_t intmask; + + printk("============= Init TPM TIS Driver ==============\n"); + + /*Sanity check the localities input */ + if(localities & ~TPM_TIS_EN_LOCLALL) { + printk("init_tpm_tis() Invalid locality specification! %X\n", localities); + goto abort_egress; + } + + printk("IOMEM Machine Base Address: %lX\n", baseaddr); + + /* Create the tpm data structure */ + tpm = malloc(sizeof(struct tpm_chip)); + __init_tpm_chip(tpm); + + /* Set the enabled localities - if 0 we leave default as all enabled */ + if(localities != 0) { + tpm->enabled_localities = localities; + } + printk("Enabled Localities: "); + for(i = 0; i < 5; ++i) { + if(locality_enabled(tpm, i)) { + printk("%d ", i); + } + } + printk("\n"); + + /* Set the base machine address */ + tpm->baseaddr = baseaddr; + + /* Set default timeouts */ + tpm->timeout_a = MILLISECS(TIS_SHORT_TIMEOUT); + tpm->timeout_b = MILLISECS(TIS_LONG_TIMEOUT); + tpm->timeout_c = MILLISECS(TIS_SHORT_TIMEOUT); + tpm->timeout_d = MILLISECS(TIS_SHORT_TIMEOUT); + + /*Map the mmio pages */ + addr = tpm->baseaddr; + for(i = 0; i < 5; ++i) { + if(locality_enabled(tpm, i)) { + /* Map the page in now */ + if((tpm->pages[i] = ioremap_nocache(addr, PAGE_SIZE)) == NULL) { + printk("Unable to map iomem page a address %p\n", addr); + goto abort_egress; + } + + /* Set default locality to the first enabled one */ + if (tpm->locality < 0) { + if(tpm_tis_request_locality(tpm, i) < 0) { + printk("Unable to request locality %d??\n", i); + goto abort_egress; + } + } + } + addr += PAGE_SIZE; + } + + + /* Get the vendor and device ids */ + didvid = ioread32(TPM_DID_VID(tpm, tpm->locality)); + tpm->did = didvid >> 16; + tpm->vid = didvid & 0xFFFF; + + + /* Get the revision id */ + tpm->rid = ioread8(TPM_RID(tpm, tpm->locality)); + + printk("1.2 TPM (device-id=0x%X vendor-id = %X rev-id = %X)\n", tpm->did, tpm->vid, tpm->rid); + + intfcaps = ioread32(TPM_INTF_CAPS(tpm, tpm->locality)); + printk("TPM interface capabilities (0x%x):\n", intfcaps); + if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) + printk("\tBurst Count Static\n"); + if (intfcaps & TPM_INTF_CMD_READY_INT) + printk("\tCommand Ready Int Support\n"); + if (intfcaps & TPM_INTF_INT_EDGE_FALLING) + printk("\tInterrupt Edge Falling\n"); + if (intfcaps & TPM_INTF_INT_EDGE_RISING) + printk("\tInterrupt Edge Rising\n"); + if (intfcaps & TPM_INTF_INT_LEVEL_LOW) + printk("\tInterrupt Level Low\n"); + if (intfcaps & TPM_INTF_INT_LEVEL_HIGH) + printk("\tInterrupt Level High\n"); + if (intfcaps & TPM_INTF_LOCALITY_CHANGE_INT) + printk("\tLocality Change Int Support\n"); + if (intfcaps & TPM_INTF_STS_VALID_INT) + printk("\tSts Valid Int Support\n"); + if (intfcaps & TPM_INTF_DATA_AVAIL_INT) + printk("\tData Avail Int Support\n"); + + /*Interupt setup */ + intmask = ioread32(TPM_INT_ENABLE(tpm, tpm->locality)); + + intmask |= TPM_INTF_CMD_READY_INT + | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT + | TPM_INTF_STS_VALID_INT; + + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), intmask); + + /*If interupts are enabled, handle it */ + if(irq) { + if(irq != TPM_PROBE_IRQ) { + tpm->irq = irq; + } else { + /*FIXME add irq probing feature later */ + printk("IRQ probing not implemented\n"); + } + } + + if(tpm->irq) { + iowrite8(TPM_INT_VECTOR(tpm, tpm->locality), tpm->irq); + + if(bind_pirq(tpm->irq, 1, tpm_tis_irq_handler, tpm) != 0) { + printk("Unabled to request irq: %u for use\n", tpm->irq); + printk("Will use polling mode\n"); + tpm->irq = 0; + } else { + /* Clear all existing */ + iowrite32(TPM_INT_STATUS(tpm, tpm->locality), ioread32(TPM_INT_STATUS(tpm, tpm->locality))); + + /* Turn on interrupts */ + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), intmask | TPM_GLOBAL_INT_ENABLE); + } + } + + if(tpm_get_timeouts(tpm)) { + printk("Could not get TPM timeouts and durations\n"); + goto abort_egress; + } + tpm_continue_selftest(tpm); + + + return tpm; +abort_egress: + if(tpm != NULL) { + shutdown_tpm_tis(tpm); + } + return NULL; +} + +void shutdown_tpm_tis(struct tpm_chip* tpm){ + int i; + + printk("Shutting down tpm_tis device\n"); + + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); + + /*Unmap all of the mmio pages */ + for(i = 0; i < 5; ++i) { + if(tpm->pages[i] != NULL) { + iounmap(tpm->pages[i], PAGE_SIZE); + tpm->pages[i] = NULL; + } + } + free(tpm); + return; +} + + +int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) +{ + if(tpm->locality < 0) { + printk("tpm_tis_cmd() failed! locality not set!\n"); + return -1; + } + if(reqlen > TPM_BUFSIZE) { + reqlen = TPM_BUFSIZE; + } + memcpy(tpm->data_buffer, req, reqlen); + *resplen = tpm_transmit(tpm, tpm->data_buffer, TPM_BUFSIZE); + + *resp = malloc(*resplen); + memcpy(*resp, tpm->data_buffer, *resplen); + return 0; +} + +#ifdef HAVE_LIBC +int tpm_tis_open(struct tpm_chip* tpm) +{ + /* Silently prevent multiple opens */ + if(tpm->fd != -1) { + return tpm->fd; + } + + tpm->fd = alloc_fd(FTYPE_TPM_TIS); + printk("tpm_tis_open() -> %d\n", tpm->fd); + files[tpm->fd].tpm_tis.dev = tpm; + files[tpm->fd].tpm_tis.offset = 0; + files[tpm->fd].tpm_tis.respgot = 0; + return tpm->fd; +} + +int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) +{ + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + if(tpm->locality < 0) { + printk("tpm_tis_posix_write() failed! locality not set!\n"); + errno = EINPROGRESS; + return -1; + } + if(count == 0) { + return 0; + } + + /* Return an error if we are already processing a command */ + if(count > TPM_BUFSIZE) { + count = TPM_BUFSIZE; + } + /* Send the command now */ + memcpy(tpm->data_buffer, buf, count); + if((tpm->data_len = tpm_transmit(tpm, tpm->data_buffer, TPM_BUFSIZE)) < 0) { + errno = EIO; + return -1; + } + return count; +} + +int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) +{ + int rc; + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + if(count == 0) { + return 0; + } + + /* If there is no tpm resp to read, return EIO */ + if(tpm->data_len < 0) { + errno = EIO; + return -1; + } + + + /* Handle EOF case */ + if(files[fd].tpm_tis.offset >= tpm->data_len) { + rc = 0; + } else { + rc = min(tpm->data_len - files[fd].tpm_tis.offset, count); + memcpy(buf, tpm->data_buffer + files[fd].tpm_tis.offset, rc); + } + files[fd].tpm_tis.offset += rc; + /* Reset the data pending flag */ + return rc; +} +int tpm_tis_posix_fstat(int fd, struct stat* buf) +{ + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + buf->st_mode = O_RDWR; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_size = be32_to_cpu(*((uint32_t*)(tpm->data_buffer + 2))); + buf->st_atime = buf->st_mtime = buf->st_ctime = time(NULL); + return 0; +} + + +#endif diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c new file mode 100644 index 0000000..658fed1 --- /dev/null +++ b/extras/mini-os/tpmback.c @@ -0,0 +1,1102 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/xen/tpmback/tpmback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netback/netback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This code has also been derived from drivers/xen/tpmback/xenbus.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2005 IBM Corporation + * Copyright (C) 2005 Rusty Russell + * + * This code has also been derived from drivers/xen/tpmback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself also derived from drvivers/xen/netback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2004, Keir Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#ifndef HAVE_LIBC +#define strtoul simple_strtoul +#endif + +//#define TPMBACK_PRINT_DEBUG +#ifdef TPMBACK_PRINT_DEBUG +#define TPMBACK_DEBUG(fmt,...) printk("Tpmback:Debug("__FILE__":%d) " fmt, __LINE__, ##__VA_ARGS__) +#define TPMBACK_DEBUG_MORE(fmt,...) printk(fmt, ##__VA_ARGS__) +#else +#define TPMBACK_DEBUG(fmt,...) +#endif +#define TPMBACK_ERR(fmt,...) printk("Tpmback:Error " fmt, ##__VA_ARGS__) +#define TPMBACK_LOG(fmt,...) printk("Tpmback:Info " fmt, ##__VA_ARGS__) + +#define min(a,b) (((a) < (b)) ? (a) : (b)) + +/* Default size of the tpmif array at initialization */ +#define DEF_ARRAY_SIZE 1 + +/* tpmif and tpmdev flags */ +#define TPMIF_CLOSED 1 +#define TPMIF_REQ_READY 2 + +struct tpmif { + domid_t domid; + unsigned int handle; + + char* fe_path; + char* fe_state_path; + + /* Locally bound event channel*/ + evtchn_port_t evtchn; + + /* Shared page */ + tpmif_tx_interface_t* tx; + + /* pointer to TPMIF_RX_RING_SIZE pages */ + void** pages; + + enum xenbus_state state; + enum { DISCONNECTED, DISCONNECTING, CONNECTED } status; + + unsigned char uuid[16]; + + /* state flags */ + int flags; +}; +typedef struct tpmif tpmif_t; + +struct tpmback_dev { + + tpmif_t** tpmlist; + unsigned long num_tpms; + unsigned long num_alloc; + + struct gntmap map; + + /* True if at least one tpmif has a request to be handled */ + int flags; + + xenbus_event_queue events; + + /* Callbacks */ + void (*open_callback)(domid_t, unsigned int); + void (*close_callback)(domid_t, unsigned int); + void (*suspend_callback)(domid_t, unsigned int); + void (*resume_callback)(domid_t, unsigned int); +}; +typedef struct tpmback_dev tpmback_dev_t; + +enum { EV_NONE, EV_NEWFE, EV_STCHNG } tpm_ev_enum; + +/* Global objects */ +static struct thread* eventthread = NULL; +static tpmback_dev_t gtpmdev = { + .tpmlist = NULL, + .num_tpms = 0, + .num_alloc = 0, + .flags = TPMIF_CLOSED, + .events = NULL, + .open_callback = NULL, + .close_callback = NULL, + .suspend_callback = NULL, + .resume_callback = NULL, +}; +struct wait_queue_head waitq; +int globalinit = 0; + +/************************************ + * TPMIF SORTED ARRAY FUNCTIONS + * tpmback_dev_t.tpmlist is a sorted array, sorted by domid and then handle number + * Duplicates are not allowed + * **********************************/ + +inline void tpmif_req_ready(tpmif_t* tpmif) { + tpmif->flags |= TPMIF_REQ_READY; + gtpmdev.flags |= TPMIF_REQ_READY; +} + +inline void tpmdev_check_req(void) { + int i; + int flags; + local_irq_save(flags); + for(i = 0; i < gtpmdev.num_tpms; ++i) { + if(gtpmdev.tpmlist[i]->flags & TPMIF_REQ_READY) { + gtpmdev.flags |= TPMIF_REQ_READY; + local_irq_restore(flags); + return; + } + } + gtpmdev.flags &= ~TPMIF_REQ_READY; + local_irq_restore(flags); +} + +inline void tpmif_req_finished(tpmif_t* tpmif) { + tpmif->flags &= ~TPMIF_REQ_READY; + tpmdev_check_req(); +} + +int __get_tpmif_index(int st, int n, domid_t domid, unsigned int handle) +{ + int i = st + n /2; + tpmif_t* tmp; + + if( n <= 0 ) + return -1; + + tmp = gtpmdev.tpmlist[i]; + if(domid == tmp->domid && tmp->handle == handle) { + return i; + } else if ( (domid < tmp->domid) || + (domid == tmp->domid && handle < tmp->handle)) { + return __get_tpmif_index(st, n/2, domid, handle); + } else { + return __get_tpmif_index(i + 1, n/2 - ((n +1) % 2), domid, handle); + } +} + +/* Returns the array index of the tpmif domid/handle. Returns -1 if no such tpmif exists */ +int get_tpmif_index(domid_t domid, unsigned int handle) +{ + int flags; + int index; + local_irq_save(flags); + index = __get_tpmif_index(0, gtpmdev.num_tpms, domid, handle); + local_irq_restore(flags); + return index; +} + +/* Returns the tpmif domid/handle or NULL if none exists */ +tpmif_t* get_tpmif(domid_t domid, unsigned int handle) +{ + int flags; + int i; + tpmif_t* ret; + local_irq_save(flags); + i = get_tpmif_index(domid, handle); + if (i < 0) { + ret = NULL; + } else { + ret = gtpmdev.tpmlist[i]; + } + local_irq_restore(flags); + return ret; +} + +/* Remove the given tpmif. Returns 0 if it was removed, -1 if it was not removed */ +int remove_tpmif(tpmif_t* tpmif) +{ + int i, j; + char* err; + int flags; + local_irq_save(flags); + + /* Find the index in the array if it exists */ + i = get_tpmif_index(tpmif->domid, tpmif->handle); + if (i < 0) { + goto error; + } + + /* Remove the interface from the list */ + for(j = i; j < gtpmdev.num_tpms - 1; ++j) { + gtpmdev.tpmlist[j] = gtpmdev.tpmlist[j+1]; + } + gtpmdev.tpmlist[j] = NULL; + --gtpmdev.num_tpms; + + /* If removed tpm was the only ready tpm, then we need to check and turn off the ready flag */ + tpmdev_check_req(); + + local_irq_restore(flags); + + /* Stop listening for events on this tpm interface */ + if((err = xenbus_unwatch_path_token(XBT_NIL, tpmif->fe_state_path, tpmif->fe_state_path))) { + TPMBACK_ERR("Unable to unwatch path token `%s' Error was %s Ignoring..\n", tpmif->fe_state_path, err); + free(err); + } + + return 0; +error: + local_irq_restore(flags); + return -1; +} + +/* Insert tpmif into dev->tpmlist. Returns 0 on success and non zero on error. + * It is an error to insert a tpmif with the same domid and handle + * number + * as something already in the list */ +int insert_tpmif(tpmif_t* tpmif) +{ + int flags; + unsigned int i, j; + tpmif_t* tmp; + char* err; + + local_irq_save(flags); + + /*Check if we need to allocate more space */ + if (gtpmdev.num_tpms == gtpmdev.num_alloc) { + gtpmdev.num_alloc *= 2; + gtpmdev.tpmlist = realloc(gtpmdev.tpmlist, gtpmdev.num_alloc); + } + + /*Find where to put the new interface */ + for(i = 0; i < gtpmdev.num_tpms; ++i) + { + tmp = gtpmdev.tpmlist[i]; + if(tpmif->domid == tmp->domid && tpmif->handle == tmp->handle) { + TPMBACK_ERR("Tried to insert duplicate tpm interface %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + if((tpmif->domid < tmp->domid) || + (tpmif->domid == tmp->domid && tpmif->handle < tmp->handle)) { + break; + } + } + + /*Shift all the tpm pointers past i down one */ + for(j = gtpmdev.num_tpms; j > i; --j) { + gtpmdev.tpmlist[j] = gtpmdev.tpmlist[j-1]; + } + + /*Add the new interface */ + gtpmdev.tpmlist[i] = tpmif; + ++gtpmdev.num_tpms; + + /*Should not be needed, anything inserted with ready flag is probably an error */ + tpmdev_check_req(); + + local_irq_restore(flags); + + /*Listen for state changes on the new interface */ + if((err = xenbus_watch_path_token(XBT_NIL, tpmif->fe_state_path, tpmif->fe_state_path, >pmdev.events))) + { + /* if we got an error here we should carefully remove the interface and then return */ + TPMBACK_ERR("Unable to watch path token `%s' Error was %s\n", tpmif->fe_state_path, err); + free(err); + remove_tpmif(tpmif); + goto error_post_irq; + } + + return 0; +error: + local_irq_restore(flags); +error_post_irq: + return -1; +} + + +/***************** + * CHANGE BACKEND STATE + * *****************/ +/*Attempts to change the backend state in xenstore + * returns 0 on success and non-zero on error */ +int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) +{ + char path[512]; + char *value; + char *err; + enum xenbus_state readst; + TPMBACK_DEBUG("Backend state change %u/%u from=%d to=%d\n", (unsigned int) tpmif->domid, tpmif->handle, tpmif->state, state); + if (tpmif->state == state) + return 0; + + snprintf(path, 512, "backend/vtpm/%u/%u/state", (unsigned int) tpmif->domid, tpmif->handle); + + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Unable to read backend state %s, error was %s\n", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &readst) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + /* It's possible that the backend state got updated by hotplug or something else behind our back */ + if(readst != tpmif->state) { + TPMBACK_DEBUG("tpm interface state was %d but xenstore state was %d!\n", tpmif->state, readst); + tpmif->state = readst; + } + + /*If if the state isnt changing, then we dont update xenstore b/c we dont want to fire extraneous events */ + if(tpmif->state == state) { + return 0; + } + + /*update xenstore*/ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_printf(XBT_NIL, path, "state", "%u", state))) { + TPMBACK_ERR("Error writing to xenstore %s, error was %s new state=%d\n", path, err, state); + free(err); + return -1; + } + + tpmif->state = state; + + return 0; +} +/********************************** + * TPMIF CREATION AND DELETION + * *******************************/ +inline tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + tpmif = malloc(sizeof(*tpmif)); + tpmif->domid = domid; + tpmif->handle = handle; + tpmif->fe_path = NULL; + tpmif->fe_state_path = NULL; + tpmif->state = XenbusStateInitialising; + tpmif->status = DISCONNECTED; + tpmif->tx = NULL; + tpmif->pages = NULL; + tpmif->flags = 0; + memset(tpmif->uuid, 0, sizeof(tpmif->uuid)); + return tpmif; +} + +void __free_tpmif(tpmif_t* tpmif) +{ + if(tpmif->pages) { + free(tpmif->pages); + } + if(tpmif->fe_path) { + free(tpmif->fe_path); + } + if(tpmif->fe_state_path) { + free(tpmif->fe_state_path); + } + free(tpmif); +} +/* Creates a new tpm interface, adds it to the sorted array and returns it. + * returns NULL on error + * If the tpm interface already exists, it is returned*/ +tpmif_t* new_tpmif(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + char* err; + char path[512]; + + /* Make sure we haven't already created this tpm + * Double events can occur */ + if((tpmif = get_tpmif(domid, handle)) != NULL) { + return tpmif; + } + + tpmif = __init_tpmif(domid, handle); + + /* Get the uuid from xenstore */ + snprintf(path, 512, "backend/vtpm/%u/%u/uuid", (unsigned int) domid, handle); + if((!xenbus_read_uuid(path, tpmif->uuid))) { + TPMBACK_ERR("Error reading %s\n", path); + goto error; + } + + /* allocate pages to be used for shared mapping */ + if((tpmif->pages = malloc(sizeof(void*) * TPMIF_TX_RING_SIZE)) == NULL) { + goto error; + } + memset(tpmif->pages, 0, sizeof(void*) * TPMIF_TX_RING_SIZE); + + if(tpmif_change_state(tpmif, XenbusStateInitWait)) { + goto error; + } + + snprintf(path, 512, "backend/vtpm/%u/%u/frontend", (unsigned int) domid, handle); + if((err = xenbus_read(XBT_NIL, path, &tpmif->fe_path))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s), Error = %s", path, err); + free(err); + goto error; + } + + /*Set the state path */ + tpmif->fe_state_path = malloc(strlen(tpmif->fe_path) + 7); + strcpy(tpmif->fe_state_path, tpmif->fe_path); + strcat(tpmif->fe_state_path, "/state"); + + if(insert_tpmif(tpmif)) { + goto error; + } + TPMBACK_DEBUG("New tpmif %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + /* Do the callback now */ + if(gtpmdev.open_callback) { + gtpmdev.open_callback(tpmif->domid, tpmif->handle); + } + return tpmif; +error: + __free_tpmif(tpmif); + return NULL; + +} + +/* Removes tpmif from dev->tpmlist and frees it's memory usage */ +void free_tpmif(tpmif_t* tpmif) +{ + char* err; + char path[512]; + TPMBACK_DEBUG("Free tpmif %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + if(tpmif->flags & TPMIF_CLOSED) { + TPMBACK_ERR("Tried to free an instance twice! Theres a bug somewhere!\n"); + BUG(); + } + tpmif->flags = TPMIF_CLOSED; + + tpmif_change_state(tpmif, XenbusStateClosing); + + /* Unmap share page and unbind event channel */ + if(tpmif->status == CONNECTED) { + tpmif->status = DISCONNECTING; + mask_evtchn(tpmif->evtchn); + + if(gntmap_munmap(>pmdev.map, (unsigned long)tpmif->tx, 1)) { + TPMBACK_ERR("%u/%u Error occured while trying to unmap shared page\n", (unsigned int) tpmif->domid, tpmif->handle); + } + + unbind_evtchn(tpmif->evtchn); + } + tpmif->status = DISCONNECTED; + tpmif_change_state(tpmif, XenbusStateClosed); + + /* Do the callback now */ + if(gtpmdev.close_callback) { + gtpmdev.close_callback(tpmif->domid, tpmif->handle); + } + + /* remove from array */ + remove_tpmif(tpmif); + + /* Wake up anyone possibly waiting on this interface and let them exit */ + wake_up(&waitq); + schedule(); + + /* Remove the old xenbus entries */ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_rm(XBT_NIL, path))) { + TPMBACK_ERR("Error cleaning up xenbus entries path=%s error=%s\n", path, err); + free(err); + } + + TPMBACK_LOG("Frontend %u/%u disconnected\n", (unsigned int) tpmif->domid, tpmif->handle); + + /* free memory */ + __free_tpmif(tpmif); + +} + +/********************** + * REMAINING TPMBACK FUNCTIONS + * ********************/ + +/*Event channel handler */ +void tpmback_handler(evtchn_port_t port, struct pt_regs *regs, void *data) +{ + tpmif_t* tpmif = (tpmif_t*) data; + tpmif_tx_request_t* tx = &tpmif->tx->ring[0].req; + /* Throw away 0 size events, these can trigger from event channel unmasking */ + if(tx->size == 0) + return; + + TPMBACK_DEBUG("EVENT CHANNEL FIRE %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + tpmif_req_ready(tpmif); + wake_up(&waitq); + +} + +/* Connect to frontend */ +int connect_fe(tpmif_t* tpmif) +{ + char path[512]; + char* err, *value; + uint32_t domid; + grant_ref_t ringref; + evtchn_port_t evtchn; + + /* If already connected then quit */ + if (tpmif->status == CONNECTED) { + TPMBACK_DEBUG("%u/%u tried to connect while it was already connected?\n", (unsigned int) tpmif->domid, tpmif->handle); + return 0; + } + + /* Fetch the grant reference */ + snprintf(path, 512, "%s/ring-ref", tpmif->fe_path); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s) Error = %s", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &ringref) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + + /* Fetch the event channel*/ + snprintf(path, 512, "%s/event-channel", tpmif->fe_path); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s) Error = %s", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &evtchn) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + domid = tpmif->domid; + if((tpmif->tx = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &ringref, PROT_READ | PROT_WRITE)) == NULL) { + TPMBACK_ERR("Failed to map grant reference %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + return -1; + } + memset(tpmif->tx, 0, PAGE_SIZE); + + /*Bind the event channel */ + if((evtchn_bind_interdomain(tpmif->domid, evtchn, tpmback_handler, tpmif, &tpmif->evtchn))) + { + TPMBACK_ERR("%u/%u Unable to bind to interdomain event channel!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error_post_map; + } + unmask_evtchn(tpmif->evtchn); + + /* Write the ready flag and change status to connected */ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_printf(XBT_NIL, path, "ready", "%u", 1))) { + TPMBACK_ERR("%u/%u Unable to write ready flag on connect_fe()\n", (unsigned int) tpmif->domid, tpmif->handle); + free(err); + goto error_post_evtchn; + } + tpmif->status = CONNECTED; + if((tpmif_change_state(tpmif, XenbusStateConnected))){ + goto error_post_evtchn; + } + + TPMBACK_LOG("Frontend %u/%u connected\n", (unsigned int) tpmif->domid, tpmif->handle); + + return 0; +error_post_evtchn: + mask_evtchn(tpmif->evtchn); + unbind_evtchn(tpmif->evtchn); +error_post_map: + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->tx, 1); + return -1; +} + +static int frontend_changed(tpmif_t* tpmif) +{ + int state = xenbus_read_integer(tpmif->fe_state_path); + if(state < 0) { + state = XenbusStateUnknown; + } + + TPMBACK_DEBUG("Frontend %u/%u state changed to %d\n", (unsigned int) tpmif->domid, tpmif->handle, state); + + switch (state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + break; + + case XenbusStateConnected: + if(connect_fe(tpmif)) { + TPMBACK_ERR("Failed to connect to front end %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + tpmif_change_state(tpmif, XenbusStateClosed); + return -1; + } + break; + + case XenbusStateClosing: + tpmif_change_state(tpmif, XenbusStateClosing); + break; + + case XenbusStateUnknown: /* keep it here */ + case XenbusStateClosed: + free_tpmif(tpmif); + break; + + default: + TPMBACK_DEBUG("BAD STATE CHANGE %u/%u state = %d for tpmif\n", (unsigned int) tpmif->domid, tpmif->handle, state); + return -1; + } + return 0; +} + + +/* parses the string that comes out of xenbus_watch_wait_return. */ +static int parse_eventstr(const char* evstr, domid_t* domid, unsigned int* handle) +{ + int ret; + char cmd[40]; + char* err; + char* value; + unsigned int udomid = 0; + tpmif_t* tpmif; + /* First check for new frontends, this occurs when /backend/vtpm// gets created. Note we what the sscanf to fail on the last %s */ + if (sscanf(evstr, "backend/vtpm/%u/%u/%40s", &udomid, handle, cmd) == 2) { + *domid = udomid; + /* Make sure the entry exists, if this event triggers because the entry dissapeared then ignore it */ + if((err = xenbus_read(XBT_NIL, evstr, &value))) { + free(err); + return EV_NONE; + } + free(value); + /* Make sure the tpmif entry does not already exist, this should not happen */ + if((tpmif = get_tpmif(*domid, *handle)) != NULL) { + TPMBACK_DEBUG("Duplicate tpm entries! %u %u\n", tpmif->domid, tpmif->handle); + return EV_NONE; + } + return EV_NEWFE; + } else if((ret = sscanf(evstr, "/local/domain/%u/device/vtpm/%u/%40s", &udomid, handle, cmd)) == 3) { + *domid = udomid; + if (!strcmp(cmd, "state")) + return EV_STCHNG; + } + return EV_NONE; +} + +void handle_backend_event(char* evstr) { + tpmif_t* tpmif; + domid_t domid; + unsigned int handle; + int event; + + TPMBACK_DEBUG("Xenbus Event: %s\n", evstr); + + event = parse_eventstr(evstr, &domid, &handle); + + switch(event) { + case EV_NEWFE: + if(new_tpmif(domid, handle) == NULL) { + TPMBACK_ERR("Failed to create new tpm instance %u/%u\n", (unsigned int) domid, handle); + } + wake_up(&waitq); + break; + case EV_STCHNG: + if((tpmif = get_tpmif(domid, handle))) { + frontend_changed(tpmif); + } else { + TPMBACK_DEBUG("Event Received for non-existant tpm! instance=%u/%u xenbus_event=%s\n", (unsigned int) domid, handle, evstr); + } + break; + } +} + +/* Runs through the given path and creates events recursively + * for all of its children. + * @path - xenstore path to scan */ +static void generate_backend_events(const char* path) +{ + char* err; + int i, len; + char **dirs; + char *entry; + + if((err = xenbus_ls(XBT_NIL, path, &dirs)) != NULL) { + free(err); + return; + } + + for(i = 0; dirs[i] != NULL; ++i) { + len = strlen(path) + strlen(dirs[i]) + 2; + entry = malloc(len); + snprintf(entry, len, "%s/%s", path, dirs[i]); + + /* Generate and handle event for the entry itself */ + handle_backend_event(entry); + + /* Do children */ + generate_backend_events(entry); + + /* Cleanup */ + free(entry); + free(dirs[i]); + } + free(dirs); + return; +} + +unsigned char* tpmback_get_uuid(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + if((tpmif = get_tpmif(domid, handle)) == NULL) { + TPMBACK_DEBUG("get_uuid() failed, %u/%u is an invalid frontend\n", (unsigned int) domid, handle); + return NULL; + } + + return tpmif->uuid; +} + +void tpmback_set_open_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.open_callback = cb; +} +void tpmback_set_close_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.close_callback = cb; +} +void tpmback_set_suspend_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.suspend_callback = cb; +} +void tpmback_set_resume_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.resume_callback = cb; +} + +static void event_listener(void) +{ + const char* bepath = "backend/vtpm"; + char **path; + char* err; + + /* Setup the backend device watch */ + if((err = xenbus_watch_path_token(XBT_NIL, bepath, bepath, >pmdev.events)) != NULL) { + TPMBACK_ERR("xenbus_watch_path_token(%s) failed with error %s!\n", bepath, err); + free(err); + goto egress; + } + + /* Check for any frontends that connected before we set the watch. + * This is almost guaranteed to happen if both domains are started + * immediatly one after the other. + * We do this by manually generating events on everything in the backend + * path */ + generate_backend_events(bepath); + + /* Wait and listen for changes in frontend connections */ + while(1) { + path = xenbus_wait_for_watch_return(>pmdev.events); + + /*If quit flag was set then exit */ + if(gtpmdev.flags & TPMIF_CLOSED) { + TPMBACK_DEBUG("listener thread got quit event. Exiting..\n"); + free(path); + break; + } + handle_backend_event(*path); + free(path); + + } + + if((err = xenbus_unwatch_path_token(XBT_NIL, bepath, bepath)) != NULL) { + free(err); + } +egress: + return; +} + +void event_thread(void* p) { + event_listener(); +} + +void init_tpmback(void) +{ + if(!globalinit) { + init_waitqueue_head(&waitq); + globalinit = 1; + } + printk("============= Init TPM BACK ================\n"); + gtpmdev.tpmlist = malloc(sizeof(tpmif_t*) * DEF_ARRAY_SIZE); + gtpmdev.num_alloc = DEF_ARRAY_SIZE; + gtpmdev.num_tpms = 0; + gtpmdev.flags = 0; + + gtpmdev.open_callback = gtpmdev.close_callback = NULL; + gtpmdev.suspend_callback = gtpmdev.resume_callback = NULL; + + eventthread = create_thread("tpmback-listener", event_thread, NULL); + +} + +void shutdown_tpmback(void) +{ + /* Disable callbacks */ + gtpmdev.open_callback = gtpmdev.close_callback = NULL; + gtpmdev.suspend_callback = gtpmdev.resume_callback = NULL; + + TPMBACK_LOG("Shutting down tpm backend\n"); + /* Set the quit flag */ + gtpmdev.flags = TPMIF_CLOSED; + + //printk("num tpms is %d\n", gtpmdev.num_tpms); + /*Free all backend instances */ + while(gtpmdev.num_tpms) { + free_tpmif(gtpmdev.tpmlist[0]); + } + free(gtpmdev.tpmlist); + gtpmdev.tpmlist = NULL; + gtpmdev.num_alloc = 0; + + /* Wake up anyone possibly waiting on the device and let them exit */ + wake_up(&waitq); + schedule(); +} + +inline void init_tpmcmd(tpmcmd_t* tpmcmd, domid_t domid, unsigned int handle, unsigned char uuid[16]) +{ + tpmcmd->domid = domid; + tpmcmd->handle = handle; + memcpy(tpmcmd->uuid, uuid, sizeof(tpmcmd->uuid)); + tpmcmd->req = NULL; + tpmcmd->req_len = 0; + tpmcmd->resp = NULL; + tpmcmd->resp_len = 0; +} + +tpmcmd_t* get_request(tpmif_t* tpmif) { + tpmcmd_t* cmd; + tpmif_tx_request_t* tx; + int offset; + int tocopy; + int i; + uint32_t domid; + int flags; + + local_irq_save(flags); + + /* Allocate the cmd object to hold the data */ + if((cmd = malloc(sizeof(*cmd))) == NULL) { + goto error; + } + init_tpmcmd(cmd, tpmif->domid, tpmif->handle, tpmif->uuid); + + tx = &tpmif->tx->ring[0].req; + cmd->req_len = tx->size; + /* Allocate the buffer */ + if(cmd->req_len) { + if((cmd->req = malloc(cmd->req_len)) == NULL) { + goto error; + } + } + /* Copy the bits from the shared pages */ + offset = 0; + for(i = 0; i < TPMIF_TX_RING_SIZE && offset < cmd->req_len; ++i) { + tx = &tpmif->tx->ring[i].req; + + /* Map the page with the data */ + domid = (uint32_t)tpmif->domid; + if((tpmif->pages[i] = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &tx->ref, PROT_READ)) == NULL) { + TPMBACK_ERR("%u/%u Unable to map shared page during read!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + + /* do the copy now */ + tocopy = min(cmd->req_len - offset, PAGE_SIZE); + memcpy(&cmd->req[offset], tpmif->pages[i], tocopy); + offset += tocopy; + + /* release the page */ + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->pages[i], 1); + + } + +#ifdef TPMBACK_PRINT_DEBUG + TPMBACK_DEBUG("Received Tpm Command from %u/%u of size %u", (unsigned int) tpmif->domid, tpmif->handle, cmd->req_len); + for(i = 0; i < cmd->req_len; ++i) { + if (!(i % 30)) { + TPMBACK_DEBUG_MORE("\n"); + } + TPMBACK_DEBUG_MORE("%02hhX ", cmd->req[i]); + } + TPMBACK_DEBUG_MORE("\n\n"); +#endif + + local_irq_restore(flags); + return cmd; +error: + if(cmd != NULL) { + if (cmd->req != NULL) { + free(cmd->req); + cmd->req = NULL; + } + free(cmd); + cmd = NULL; + } + local_irq_restore(flags); + return NULL; + +} + +void send_response(tpmcmd_t* cmd, tpmif_t* tpmif) +{ + tpmif_tx_request_t* tx; + int offset; + int i; + uint32_t domid; + int tocopy; + int flags; + + local_irq_save(flags); + + tx = &tpmif->tx->ring[0].req; + tx->size = cmd->resp_len; + + offset = 0; + for(i = 0; i < TPMIF_TX_RING_SIZE && offset < cmd->resp_len; ++i) { + tx = &tpmif->tx->ring[i].req; + + /* Map the page with the data */ + domid = (uint32_t)tpmif->domid; + if((tpmif->pages[i] = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &tx->ref, PROT_WRITE)) == NULL) { + TPMBACK_ERR("%u/%u Unable to map shared page during write!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + + /* do the copy now */ + tocopy = min(cmd->resp_len - offset, PAGE_SIZE); + memcpy(tpmif->pages[i], &cmd->resp[offset], tocopy); + offset += tocopy; + + /* release the page */ + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->pages[i], 1); + + } + +#ifdef TPMBACK_PRINT_DEBUG + TPMBACK_DEBUG("Sent response to %u/%u of size %u", (unsigned int) tpmif->domid, tpmif->handle, cmd->resp_len); + for(i = 0; i < cmd->resp_len; ++i) { + if (!(i % 30)) { + TPMBACK_DEBUG_MORE("\n"); + } + TPMBACK_DEBUG_MORE("%02hhX ", cmd->resp[i]); + } + TPMBACK_DEBUG_MORE("\n\n"); +#endif + /* clear the ready flag and send the event channel notice to the frontend */ + tpmif_req_finished(tpmif); + notify_remote_via_evtchn(tpmif->evtchn); +error: + local_irq_restore(flags); + return; +} + +tpmcmd_t* tpmback_req_any(void) +{ + int i; + /* Block until something has a request */ + wait_event(waitq, (gtpmdev.flags & (TPMIF_REQ_READY | TPMIF_CLOSED))); + + /* Check if were shutting down */ + if(gtpmdev.flags & TPMIF_CLOSED) { + /* if something was waiting for us to give up the queue so it can shutdown, let it finish */ + schedule(); + return NULL; + } + + for(i = 0; i < gtpmdev.num_tpms; ++i) { + if(gtpmdev.tpmlist[i]->flags & TPMIF_REQ_READY) { + return get_request(gtpmdev.tpmlist[i]); + } + } + + TPMBACK_ERR("backend request ready flag was set but no interfaces were actually ready\n"); + return NULL; +} + +tpmcmd_t* tpmback_req(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + tpmif = get_tpmif(domid, handle); + if(tpmif == NULL) { + return NULL; + } + + wait_event(waitq, (tpmif->flags & (TPMIF_REQ_READY | TPMIF_CLOSED) || gtpmdev.flags & TPMIF_CLOSED)); + + /* Check if were shutting down */ + if(tpmif->flags & TPMIF_CLOSED || gtpmdev.flags & TPMIF_CLOSED) { + /* if something was waiting for us to give up the queue so it can free this instance, let it finish */ + schedule(); + return NULL; + } + + return get_request(tpmif); +} + +void tpmback_resp(tpmcmd_t* tpmcmd) +{ + tpmif_t* tpmif; + + /* Get the associated interface, if it doesnt exist then just quit */ + tpmif = get_tpmif(tpmcmd->domid, tpmcmd->handle); + if(tpmif == NULL) { + TPMBACK_ERR("Tried to send a reponse to non existant frontend %u/%u\n", (unsigned int) tpmcmd->domid, tpmcmd->handle); + goto end; + } + + if(!(tpmif->flags & TPMIF_REQ_READY)) { + TPMBACK_ERR("Tried to send response to a frontend that was not waiting for one %u/%u\n", (unsigned int) tpmcmd->domid, tpmcmd->handle); + goto end; + } + + /* Send response to frontend */ + send_response(tpmcmd, tpmif); + +end: + if(tpmcmd->req != NULL) { + free(tpmcmd->req); + } + free(tpmcmd); + return; +} + +int tpmback_wait_for_frontend_connect(domid_t *domid, unsigned int *handle) +{ + tpmif_t* tpmif; + int flags; + wait_event(waitq, ((gtpmdev.num_tpms > 0) || gtpmdev.flags & TPMIF_CLOSED)); + if(gtpmdev.flags & TPMIF_CLOSED) { + return -1; + } + local_irq_save(flags); + tpmif = gtpmdev.tpmlist[0]; + *domid = tpmif->domid; + *handle = tpmif->handle; + local_irq_restore(flags); + + return 0; +} + +int tpmback_num_frontends(void) +{ + return gtpmdev.num_tpms; +} diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c new file mode 100644 index 0000000..0218d7f --- /dev/null +++ b/extras/mini-os/tpmfront.c @@ -0,0 +1,608 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm_vtpm.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2006 IBM Corporation + * + * This code has also been derived from drivers/char/tpm_xen.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netfront/netfront.c + * from the linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define TPMFRONT_PRINT_DEBUG +#ifdef TPMFRONT_PRINT_DEBUG +#define TPMFRONT_DEBUG(fmt,...) printk("Tpmfront:Debug("__FILE__":%d) " fmt, __LINE__, ##__VA_ARGS__) +#define TPMFRONT_DEBUG_MORE(fmt,...) printk(fmt, ##__VA_ARGS__) +#else +#define TPMFRONT_DEBUG(fmt,...) +#endif +#define TPMFRONT_ERR(fmt,...) printk("Tpmfront:Error " fmt, ##__VA_ARGS__) +#define TPMFRONT_LOG(fmt,...) printk("Tpmfront:Info " fmt, ##__VA_ARGS__) + +#define min(a,b) (((a) < (b)) ? (a) : (b)) + +void tpmfront_handler(evtchn_port_t port, struct pt_regs *regs, void *data) { + struct tpmfront_dev* dev = (struct tpmfront_dev*) data; + /*If we get a response when we didnt make a request, just ignore it */ + if(!dev->waiting) { + return; + } + + dev->waiting = 0; +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].read = 1; + } +#endif + wake_up(&dev->waitq); +} + +static int publish_xenbus(struct tpmfront_dev* dev) { + xenbus_transaction_t xbt; + int retry; + char* err; + /* Write the grant reference and event channel to xenstore */ +again: + if((err = xenbus_transaction_start(&xbt))) { + TPMFRONT_ERR("Unable to start xenbus transaction, error was %s\n", err); + free(err); + return -1; + } + + if((err = xenbus_printf(xbt, dev->nodename, "ring-ref", "%u", (unsigned int) dev->ring_ref))) { + TPMFRONT_ERR("Unable to write %s/ring-ref, error was %s\n", dev->nodename, err); + free(err); + goto abort_transaction; + } + + if((err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", (unsigned int) dev->evtchn))) { + TPMFRONT_ERR("Unable to write %s/event-channel, error was %s\n", dev->nodename, err); + free(err); + goto abort_transaction; + } + + if((err = xenbus_transaction_end(xbt, 0, &retry))) { + TPMFRONT_ERR("Unable to complete xenbus transaction, error was %s\n", err); + free(err); + return -1; + } + if(retry) { + goto again; + } + + return 0; +abort_transaction: + if((err = xenbus_transaction_end(xbt, 1, &retry))) { + free(err); + } + return -1; +} + +static int wait_for_backend_connect(xenbus_event_queue* events, char* path) +{ + int state; + + TPMFRONT_LOG("Waiting for backend connection..\n"); + /* Wait for the backend to connect */ + while(1) { + state = xenbus_read_integer(path); + if ( state < 0) + state = XenbusStateUnknown; + switch(state) { + /* Bad states, we quit with error */ + case XenbusStateUnknown: + case XenbusStateClosing: + case XenbusStateClosed: + TPMFRONT_ERR("Unable to connect to backend\n"); + return -1; + /* If backend is connected then break out of loop */ + case XenbusStateConnected: + TPMFRONT_LOG("Backend Connected\n"); + return 0; + default: + xenbus_wait_for_watch(events); + } + } + +} + +static int wait_for_backend_closed(xenbus_event_queue* events, char* path) +{ + int state; + + TPMFRONT_LOG("Waiting for backend to close..\n"); + while(1) { + state = xenbus_read_integer(path); + if ( state < 0) + state = XenbusStateUnknown; + switch(state) { + case XenbusStateUnknown: + TPMFRONT_ERR("Backend Unknown state, forcing shutdown\n"); + return -1; + case XenbusStateClosed: + TPMFRONT_LOG("Backend Closed\n"); + return 0; + default: + xenbus_wait_for_watch(events); + } + } + +} + +static int wait_for_backend_state_changed(struct tpmfront_dev* dev, XenbusState state) { + char* err; + int ret = 0; + xenbus_event_queue events = NULL; + char path[512]; + + snprintf(path, 512, "%s/state", dev->bepath); + /*Setup the watch to wait for the backend */ + if((err = xenbus_watch_path_token(XBT_NIL, path, path, &events))) { + TPMFRONT_ERR("Could not set a watch on %s, error was %s\n", path, err); + free(err); + return -1; + } + + /* Do the actual wait loop now */ + switch(state) { + case XenbusStateConnected: + ret = wait_for_backend_connect(&events, path); + break; + case XenbusStateClosed: + ret = wait_for_backend_closed(&events, path); + break; + default: + break; + } + + if((err = xenbus_unwatch_path_token(XBT_NIL, path, path))) { + TPMFRONT_ERR("Unable to unwatch %s, error was %s, ignoring..\n", path, err); + free(err); + } + return ret; +} + +static int tpmfront_connect(struct tpmfront_dev* dev) +{ + char* err; + /* Create shared page */ + dev->tx = (tpmif_tx_interface_t*) alloc_page(); + if(dev->tx == NULL) { + TPMFRONT_ERR("Unable to allocate page for shared memory\n"); + goto error; + } + memset(dev->tx, 0, PAGE_SIZE); + dev->ring_ref = gnttab_grant_access(dev->bedomid, virt_to_mfn(dev->tx), 0); + TPMFRONT_DEBUG("grant ref is %lu\n", (unsigned long) dev->ring_ref); + + /*Create event channel */ + if(evtchn_alloc_unbound(dev->bedomid, tpmfront_handler, dev, &dev->evtchn)) { + TPMFRONT_ERR("Unable to allocate event channel\n"); + goto error_postmap; + } + unmask_evtchn(dev->evtchn); + TPMFRONT_DEBUG("event channel is %lu\n", (unsigned long) dev->evtchn); + + /* Write the entries to xenstore */ + if(publish_xenbus(dev)) { + goto error_postevtchn; + } + + /* Change state to connected */ + dev->state = XenbusStateConnected; + + /* Tell the backend that we are ready */ + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", dev->state))) { + TPMFRONT_ERR("Unable to write to xenstore %s/state, value=%u", dev->nodename, XenbusStateConnected); + free(err); + goto error; + } + + return 0; +error_postevtchn: + mask_evtchn(dev->evtchn); + unbind_evtchn(dev->evtchn); +error_postmap: + gnttab_end_access(dev->ring_ref); + free_page(dev->tx); +error: + return -1; +} + +struct tpmfront_dev* init_tpmfront(const char* _nodename) +{ + struct tpmfront_dev* dev; + const char* nodename; + char path[512]; + char* value, *err; + unsigned long long ival; + int i; + + printk("============= Init TPM Front ================\n"); + + dev = malloc(sizeof(struct tpmfront_dev)); + memset(dev, 0, sizeof(struct tpmfront_dev)); + +#ifdef HAVE_LIBC + dev->fd = -1; +#endif + + nodename = _nodename ? _nodename : "device/vtpm/0"; + dev->nodename = strdup(nodename); + + init_waitqueue_head(&dev->waitq); + + /* Get backend domid */ + snprintf(path, 512, "%s/backend-id", dev->nodename); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMFRONT_ERR("Unable to read %s during tpmfront initialization! error = %s\n", path, err); + free(err); + goto error; + } + if(sscanf(value, "%llu", &ival) != 1) { + TPMFRONT_ERR("%s has non-integer value (%s)\n", path, value); + free(value); + goto error; + } + free(value); + dev->bedomid = ival; + + /* Get backend xenstore path */ + snprintf(path, 512, "%s/backend", dev->nodename); + if((err = xenbus_read(XBT_NIL, path, &dev->bepath))) { + TPMFRONT_ERR("Unable to read %s during tpmfront initialization! error = %s\n", path, err); + free(err); + goto error; + } + + /* Create and publish grant reference and event channel */ + if (tpmfront_connect(dev)) { + goto error; + } + + /* Wait for backend to connect */ + if( wait_for_backend_state_changed(dev, XenbusStateConnected)) { + goto error; + } + + /* Allocate pages that will contain the messages */ + dev->pages = malloc(sizeof(void*) * TPMIF_TX_RING_SIZE); + if(dev->pages == NULL) { + goto error; + } + memset(dev->pages, 0, sizeof(void*) * TPMIF_TX_RING_SIZE); + for(i = 0; i < TPMIF_TX_RING_SIZE; ++i) { + dev->pages[i] = (void*)alloc_page(); + if(dev->pages[i] == NULL) { + goto error; + } + } + + TPMFRONT_LOG("Initialization Completed successfully\n"); + + return dev; + +error: + shutdown_tpmfront(dev); + return NULL; +} +void shutdown_tpmfront(struct tpmfront_dev* dev) +{ + char* err; + char path[512]; + int i; + tpmif_tx_request_t* tx; + if(dev == NULL) { + return; + } + TPMFRONT_LOG("Shutting down tpmfront\n"); + /* disconnect */ + if(dev->state == XenbusStateConnected) { + dev->state = XenbusStateClosing; + //FIXME: Transaction for this? + /* Tell backend we are closing */ + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", (unsigned int) dev->state))) { + free(err); + } + + /* Clean up xenstore entries */ + snprintf(path, 512, "%s/event-channel", dev->nodename); + if((err = xenbus_rm(XBT_NIL, path))) { + free(err); + } + snprintf(path, 512, "%s/ring-ref", dev->nodename); + if((err = xenbus_rm(XBT_NIL, path))) { + free(err); + } + + /* Tell backend we are closed */ + dev->state = XenbusStateClosed; + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", (unsigned int) dev->state))) { + TPMFRONT_ERR("Unable to write to %s, error was %s", dev->nodename, err); + free(err); + } + + /* Wait for the backend to close and unmap shared pages, ignore any errors */ + wait_for_backend_state_changed(dev, XenbusStateClosed); + + /* Cleanup any shared pages */ + if(dev->pages) { + for(i = 0; i < TPMIF_TX_RING_SIZE; ++i) { + if(dev->pages[i]) { + tx = &dev->tx->ring[i].req; + if(tx->ref != 0) { + gnttab_end_access(tx->ref); + } + free_page(dev->pages[i]); + } + } + free(dev->pages); + } + + /* Close event channel and unmap shared page */ + mask_evtchn(dev->evtchn); + unbind_evtchn(dev->evtchn); + gnttab_end_access(dev->ring_ref); + + free_page(dev->tx); + + } + + /* Cleanup memory usage */ + if(dev->respbuf) { + free(dev->respbuf); + } + if(dev->bepath) { + free(dev->bepath); + } + if(dev->nodename) { + free(dev->nodename); + } + free(dev); +} + +int tpmfront_send(struct tpmfront_dev* dev, const uint8_t* msg, size_t length) +{ + int i; + tpmif_tx_request_t* tx = NULL; + /* Error Checking */ + if(dev == NULL || dev->state != XenbusStateConnected) { + TPMFRONT_ERR("Tried to send message through disconnected frontend\n"); + return -1; + } + +#ifdef TPMFRONT_PRINT_DEBUG + TPMFRONT_DEBUG("Sending Msg to backend size=%u", (unsigned int) length); + for(i = 0; i < length; ++i) { + if(!(i % 30)) { + TPMFRONT_DEBUG_MORE("\n"); + } + TPMFRONT_DEBUG_MORE("%02X ", msg[i]); + } + TPMFRONT_DEBUG_MORE("\n"); +#endif + + /* Copy to shared pages now */ + for(i = 0; length > 0 && i < TPMIF_TX_RING_SIZE; ++i) { + /* Share the page */ + tx = &dev->tx->ring[i].req; + tx->unused = 0; + tx->addr = virt_to_mach(dev->pages[i]); + tx->ref = gnttab_grant_access(dev->bedomid, virt_to_mfn(dev->pages[i]), 0); + /* Copy the bits to the page */ + tx->size = length > PAGE_SIZE ? PAGE_SIZE : length; + memcpy(dev->pages[i], &msg[i * PAGE_SIZE], tx->size); + + /* Update counters */ + length -= tx->size; + } + dev->waiting = 1; + dev->resplen = 0; +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].read = 0; + files[dev->fd].tpmfront.respgot = 0; + files[dev->fd].tpmfront.offset = 0; + } +#endif + notify_remote_via_evtchn(dev->evtchn); + return 0; +} +int tpmfront_recv(struct tpmfront_dev* dev, uint8_t** msg, size_t *length) +{ + tpmif_tx_request_t* tx; + int i; + if(dev == NULL || dev->state != XenbusStateConnected) { + TPMFRONT_ERR("Tried to receive message from disconnected frontend\n"); + return -1; + } + /*Wait for the response */ + wait_event(dev->waitq, (!dev->waiting)); + + /* Initialize */ + *msg = NULL; + *length = 0; + + /* special case, just quit */ + tx = &dev->tx->ring[0].req; + if(tx->size == 0 ) { + goto quit; + } + /* Get the total size */ + tx = &dev->tx->ring[0].req; + for(i = 0; i < TPMIF_TX_RING_SIZE && tx->size > 0; ++i) { + tx = &dev->tx->ring[i].req; + *length += tx->size; + } + /* Alloc the buffer */ + if(dev->respbuf) { + free(dev->respbuf); + } + *msg = dev->respbuf = malloc(*length); + dev->resplen = *length; + /* Copy the bits */ + tx = &dev->tx->ring[0].req; + for(i = 0; i < TPMIF_TX_RING_SIZE && tx->size > 0; ++i) { + tx = &dev->tx->ring[i].req; + memcpy(&(*msg)[i * PAGE_SIZE], dev->pages[i], tx->size); + gnttab_end_access(tx->ref); + tx->ref = 0; + } +#ifdef TPMFRONT_PRINT_DEBUG + TPMFRONT_DEBUG("Received response from backend size=%u", (unsigned int) *length); + for(i = 0; i < *length; ++i) { + if(!(i % 30)) { + TPMFRONT_DEBUG_MORE("\n"); + } + TPMFRONT_DEBUG_MORE("%02X ", (*msg)[i]); + } + TPMFRONT_DEBUG_MORE("\n"); +#endif +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].tpmfront.respgot = 1; + } +#endif +quit: + return 0; +} + +int tpmfront_cmd(struct tpmfront_dev* dev, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) +{ + int rc; + if((rc = tpmfront_send(dev, req, reqlen))) { + return rc; + } + if((rc = tpmfront_recv(dev, resp, resplen))) { + return rc; + } + + return 0; +} + +#ifdef HAVE_LIBC +#include +int tpmfront_open(struct tpmfront_dev* dev) +{ + /* Silently prevent multiple opens */ + if(dev->fd != -1) { + return dev->fd; + } + + dev->fd = alloc_fd(FTYPE_TPMFRONT); + printk("tpmfront_open(%s) -> %d\n", dev->nodename, dev->fd); + files[dev->fd].tpmfront.dev = dev; + files[dev->fd].tpmfront.offset = 0; + files[dev->fd].tpmfront.respgot = 0; + return dev->fd; +} + +int tpmfront_posix_write(int fd, const uint8_t* buf, size_t count) +{ + int rc; + struct tpmfront_dev* dev; + dev = files[fd].tpmfront.dev; + + if(count == 0) { + return 0; + } + + /* Return an error if we are already processing a command */ + if(dev->waiting) { + errno = EINPROGRESS; + return -1; + } + /* Send the command now */ + if((rc = tpmfront_send(dev, buf, count)) != 0) { + errno = EIO; + return -1; + } + return count; +} + +int tpmfront_posix_read(int fd, uint8_t* buf, size_t count) +{ + int rc; + uint8_t* dummybuf; + size_t dummysz; + struct tpmfront_dev* dev; + + dev = files[fd].tpmfront.dev; + + if(count == 0) { + return 0; + } + + /* get the response if we haven't already */ + if(files[dev->fd].tpmfront.respgot == 0) { + if ((rc = tpmfront_recv(dev, &dummybuf, &dummysz)) != 0) { + errno = EIO; + return -1; + } + } + + /* handle EOF case */ + if(files[dev->fd].tpmfront.offset >= dev->resplen) { + return 0; + } + + /* Compute the number of bytes and do the copy operation */ + if((rc = min(count, dev->resplen - files[dev->fd].tpmfront.offset)) != 0) { + memcpy(buf, dev->respbuf + files[dev->fd].tpmfront.offset, rc); + files[dev->fd].tpmfront.offset += rc; + } + + return rc; +} + +int tpmfront_posix_fstat(int fd, struct stat* buf) +{ + uint8_t* dummybuf; + size_t dummysz; + int rc; + struct tpmfront_dev* dev = files[fd].tpmfront.dev; + + /* If we have a response waiting, then read it now from the backend + * so we can get its length*/ + if(dev->waiting || (files[dev->fd].read == 1 && !files[dev->fd].tpmfront.respgot)) { + if ((rc = tpmfront_recv(dev, &dummybuf, &dummysz)) != 0) { + errno = EIO; + return -1; + } + } + + buf->st_mode = O_RDWR; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_size = dev->resplen; + buf->st_atime = buf->st_mtime = buf->st_ctime = time(NULL); + + return 0; +} + + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Su-00051h-2J; Thu, 01 Nov 2012 20:34:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sr-000519-2g for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:09 +0000 Received: from [85.158.138.51:41257] by server-15.bemta-3.messagelabs.com id 27/F9-09445-FBCD2905; Thu, 01 Nov 2012 20:34:07 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-174.messagelabs.com!1351802041!28289883!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24016 invoked from network); 1 Nov 2012 20:34:03 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:03 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030871; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:26 -0400 Message-Id: <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 3/9] add tpmfront, tpm_tis, and tpmback drivers to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch adds 3 new drivers to mini-os. tpmfront - paravirtualized tpm frontend driver tpmback - paravirtualized tpm backend driver tpm_tis - hardware tpm driver Unfortunately these drivers were derived from GPL licensed linux kernel drivers so they must carry the GPL license. However, since mini-os now supports conditional compilation, hopefully these drivers can be included into the xen tree and conditionally removed from non-gpl projects. By default they are disabled in the makefile. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 2422db3..2302a23 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -22,6 +22,9 @@ CONFIG_QEMU_XS_ARGS ?= n CONFIG_TEST ?= n CONFIG_PCIFRONT ?= n CONFIG_BLKFRONT ?= y +CONFIG_TPMFRONT ?= n +CONFIG_TPM_TIS ?= n +CONFIG_TPMBACK ?= n CONFIG_NETFRONT ?= y CONFIG_FBFRONT ?= y CONFIG_KBDFRONT ?= y @@ -36,6 +39,9 @@ flags-$(CONFIG_SPARSE_BSS) += -DCONFIG_SPARSE_BSS flags-$(CONFIG_QEMU_XS_ARGS) += -DCONFIG_QEMU_XS_ARGS flags-$(CONFIG_PCIFRONT) += -DCONFIG_PCIFRONT flags-$(CONFIG_BLKFRONT) += -DCONFIG_BLKFRONT +flags-$(CONFIG_TPMFRONT) += -DCONFIG_TPMFRONT +flags-$(CONFIG_TPM_TIS) += -DCONFIG_TPM_TIS +flags-$(CONFIG_TPMBACK) += -DCONFIG_TPMBACK flags-$(CONFIG_NETFRONT) += -DCONFIG_NETFRONT flags-$(CONFIG_KBDFRONT) += -DCONFIG_KBDFRONT flags-$(CONFIG_FBFRONT) += -DCONFIG_FBFRONT @@ -67,6 +73,9 @@ TARGET := mini-os SUBDIRS := lib xenbus console src-$(CONFIG_BLKFRONT) += blkfront.c +src-$(CONFIG_TPMFRONT) += tpmfront.c +src-$(CONFIG_TPM_TIS) += tpm_tis.c +src-$(CONFIG_TPMBACK) += tpmback.c src-y += daytime.c src-y += events.c src-$(CONFIG_FBFRONT) += fbfront.c diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h index d4641b6..935bede 100644 --- a/extras/mini-os/include/lib.h +++ b/extras/mini-os/include/lib.h @@ -142,6 +142,8 @@ enum fd_type { FTYPE_FB, FTYPE_MEM, FTYPE_SAVEFILE, + FTYPE_TPMFRONT, + FTYPE_TPM_TIS, }; LIST_HEAD(evtchn_port_list, evtchn_port_info); @@ -185,6 +187,20 @@ extern struct file { struct { struct consfront_dev *dev; } cons; +#ifdef CONFIG_TPMFRONT + struct { + struct tpmfront_dev *dev; + int respgot; + off_t offset; + } tpmfront; +#endif +#ifdef CONFIG_TPM_TIS + struct { + struct tpm_chip *dev; + int respgot; + off_t offset; + } tpm_tis; +#endif #ifdef CONFIG_XENBUS struct { /* To each xenbus FD is associated a queue of watch events for this diff --git a/extras/mini-os/include/tpm_tis.h b/extras/mini-os/include/tpm_tis.h new file mode 100644 index 0000000..1faca0d --- /dev/null +++ b/extras/mini-os/include/tpm_tis.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm.c + * from the linux kernel + * + * Copyright (C) 2004 IBM Corporation + * + * This code has also been derived from drivers/char/tpm/tpm_tis.c + * from the linux kernel + * + * Copyright (C) 2005, 2006 IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#ifndef TPM_TIS_H +#define TPM_TIS_H + +#include +#include + +#define TPM_TIS_EN_LOCL0 1 +#define TPM_TIS_EN_LOCL1 (1 << 1) +#define TPM_TIS_EN_LOCL2 (1 << 2) +#define TPM_TIS_EN_LOCL3 (1 << 3) +#define TPM_TIS_EN_LOCL4 (1 << 4) +#define TPM_TIS_EN_LOCLALL (TPM_TIS_EN_LOCL0 | TPM_TIS_EN_LOCL1 | TPM_TIS_EN_LOCL2 | TPM_TIS_EN_LOCL3 | TPM_TIS_EN_LOCL4) +#define TPM_TIS_LOCL_INT_TO_FLAG(x) (1 << x) +#define TPM_BASEADDR 0xFED40000 +#define TPM_PROBE_IRQ 0xFFFF + +struct tpm_chip; + +struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq); +void shutdown_tpm_tis(struct tpm_chip* tpm); + +int tpm_tis_request_locality(struct tpm_chip* tpm, int locality); +int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); + +#ifdef HAVE_LIBC +#include +#include +/* POSIX IO functions: + * use tpm_tis_open() to get a file descriptor to the tpm device + * use write() on the fd to send a command to the backend. You must + * include the entire command in a single call to write(). + * use read() on the fd to read the response. You can use + * fstat() to get the size of the response and lseek() to seek on it. + */ +int tpm_tis_open(struct tpm_chip* tpm); +int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count); +int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count); +int tpm_tis_posix_fstat(int fd, struct stat* buf); +#endif + +#endif diff --git a/extras/mini-os/include/tpmback.h b/extras/mini-os/include/tpmback.h new file mode 100644 index 0000000..ff86732 --- /dev/null +++ b/extras/mini-os/include/tpmback.h @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/xen/tpmback/tpmback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netback/netback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This code has also been derived from drivers/xen/tpmback/xenbus.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2005 IBM Corporation + * Copyright (C) 2005 Rusty Russell + * + * This code has also been derived from drivers/xen/tpmback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself also derived from drvivers/xen/netback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2004, Keir Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ + +#include +#include +#include +#include +#ifndef TPMBACK_H +#define TPMBACK_H + +struct tpmcmd { + domid_t domid; /* Domid of the frontend */ + unsigned int handle; /* Handle of the frontend */ + unsigned char uuid[16]; /* uuid of the tpm interface */ + + unsigned int req_len; /* Size of the command in buf - set by tpmback driver */ + uint8_t* req; /* tpm command bits, allocated by driver, DON'T FREE IT */ + unsigned int resp_len; /* Size of the outgoing command, + you set this before passing the cmd object to tpmback_resp */ + uint8_t* resp; /* Buffer for response - YOU MUST ALLOCATE IT, YOU MUST ALSO FREE IT */ +}; +typedef struct tpmcmd tpmcmd_t; + +/* Initialize the tpm backend driver */ +void init_tpmback(void); + +/* Shutdown tpm backend driver */ +void shutdown_tpmback(void); + +/* Blocks until a tpm command is sent from any front end. + * Returns a pointer to the tpm command to handle. + * Do not try to free this pointer or the req buffer + * This function will return NULL if the tpm backend driver + * is shutdown or any other error occurs */ +tpmcmd_t* tpmback_req_any(void); + +/* Blocks until a tpm command from the frontend at domid/handle + * is sent. + * Returns NULL if domid/handle is not connected, tpmback is + * shutdown or shutting down, or if there is an error + */ +tpmcmd_t* tpmback_req(domid_t domid, unsigned int handle); + +/* Send the response to the tpm command back to the frontend + * This function will free the tpmcmd object, but you must free the resp + * buffer yourself */ +void tpmback_resp(tpmcmd_t* tpmcmd); + +/* Waits for the first frontend to connect and then sets domid and handle appropriately. + * If one or more frontends are already connected, this will set domid and handle to one + * of them arbitrarily. The main use for this function is to wait until a single + * frontend connection has occured. + * returns 0 on success, non-zero on failure */ +int tpmback_wait_for_frontend_connect(domid_t *domid, unsigned int *handle); + +/* returns the number of frontends connected */ +int tpmback_num_frontends(void); + +/* Returns the uuid of the specified frontend, NULL on error. + * The return value is internally allocated, so don't free it */ +unsigned char* tpmback_get_uuid(domid_t domid, unsigned int handle); + +/* Specify a function to call when a new tpm device connects */ +void tpmback_set_open_callback(void (*cb)(domid_t, unsigned int)); + +/* Specify a function to call when a tpm device disconnects */ +void tpmback_set_close_callback(void (*cb)(domid_t, unsigned int)); + +//Not Implemented +void tpmback_set_suspend_callback(void (*cb)(domid_t, unsigned int)); +void tpmback_set_resume_callback(void (*cb)(domid_t, unsigned int)); + +#endif diff --git a/extras/mini-os/include/tpmfront.h b/extras/mini-os/include/tpmfront.h new file mode 100644 index 0000000..fd2cb17 --- /dev/null +++ b/extras/mini-os/include/tpmfront.h @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm_vtpm.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2006 IBM Corporation + * + * This code has also been derived from drivers/char/tpm_xen.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netfront/netfront.c + * from the linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + */ +#ifndef TPMFRONT_H +#define TPMFRONT_H + +#include +#include +#include +#include +#include +#include +#include + +struct tpmfront_dev { + grant_ref_t ring_ref; + evtchn_port_t evtchn; + + tpmif_tx_interface_t* tx; + + void** pages; + + domid_t bedomid; + char* nodename; + char* bepath; + + XenbusState state; + + uint8_t waiting; + struct wait_queue_head waitq; + + uint8_t* respbuf; + size_t resplen; + +#ifdef HAVE_LIBC + int fd; +#endif + +}; + + +/*Initialize frontend */ +struct tpmfront_dev* init_tpmfront(const char* nodename); +/*Shutdown frontend */ +void shutdown_tpmfront(struct tpmfront_dev* dev); + +/* Send a tpm command to the backend and wait for the response + * + * @dev - frontend device + * @req - request buffer + * @reqlen - length of request buffer + * @resp - *resp will be set to internal response buffer, don't free it! Value is undefined on error + * @resplen - *resplen will be set to the length of the response. Value is undefined on error + * + * returns 0 on success, non zero on failure. + * */ +int tpmfront_cmd(struct tpmfront_dev* dev, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen); + +#ifdef HAVE_LIBC +#include +/* POSIX IO functions: + * use tpmfront_open() to get a file descriptor to the tpm device + * use write() on the fd to send a command to the backend. You must + * include the entire command in a single call to write(). + * use read() on the fd to read the response. You can use + * fstat() to get the size of the response and lseek() to seek on it. + */ +int tpmfront_open(struct tpmfront_dev* dev); +int tpmfront_posix_read(int fd, uint8_t* buf, size_t count); +int tpmfront_posix_write(int fd, const uint8_t* buf, size_t count); +int tpmfront_posix_fstat(int fd, struct stat* buf); +#endif + + +#endif diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index 6cb97b1..d212969 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include @@ -294,6 +296,16 @@ int read(int fd, void *buf, size_t nbytes) return blkfront_posix_read(fd, buf, nbytes); } #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: { + return tpmfront_posix_read(fd, buf, nbytes); + } +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: { + return tpm_tis_posix_read(fd, buf, nbytes); + } +#endif default: break; } @@ -330,6 +342,14 @@ int write(int fd, const void *buf, size_t nbytes) case FTYPE_BLK: return blkfront_posix_write(fd, buf, nbytes); #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + return tpmfront_posix_write(fd, buf, nbytes); +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + return tpm_tis_posix_write(fd, buf, nbytes); +#endif default: break; } @@ -341,8 +361,16 @@ int write(int fd, const void *buf, size_t nbytes) off_t lseek(int fd, off_t offset, int whence) { switch(files[fd].type) { +#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONFIG_TPM_TIS) #ifdef CONFIG_BLKFRONT case FTYPE_BLK: +#endif +#ifdef CONFIG_TPMFRNT + case FTYPE_TPMFRONT: +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: +#endif switch (whence) { case SEEK_SET: files[fd].file.offset = offset; @@ -420,6 +448,18 @@ int close(int fd) files[fd].type = FTYPE_NONE; return 0; #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + shutdown_tpmfront(files[fd].tpmfront.dev); + files[fd].type = FTYPE_NONE; + return 0; +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + shutdown_tpm_tis(files[fd].tpm_tis.dev); + files[fd].type = FTYPE_NONE; + return 0; +#endif #ifdef CONFIG_KBDFRONT case FTYPE_KBD: shutdown_kbdfront(files[fd].kbd.dev); @@ -489,6 +529,14 @@ int fstat(int fd, struct stat *buf) case FTYPE_BLK: return blkfront_posix_fstat(fd, buf); #endif +#ifdef CONFIG_TPMFRONT + case FTYPE_TPMFRONT: + return tpmfront_posix_fstat(fd, buf); +#endif +#ifdef CONFIG_TPM_TIS + case FTYPE_TPM_TIS: + return tpm_tis_posix_fstat(fd, buf); +#endif default: break; } diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c new file mode 100644 index 0000000..e8ca69f --- /dev/null +++ b/extras/mini-os/tpm_tis.c @@ -0,0 +1,1354 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm.c + * from the linux kernel + * + * Copyright (C) 2004 IBM Corporation + * + * This code has also been derived from drivers/char/tpm/tpm_tis.c + * from the linux kernel + * + * Copyright (C) 2005, 2006 IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef min + #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) +#endif + +#define TPM_HEADER_SIZE 10 + +#define TPM_BUFSIZE 2048 + +struct tpm_input_header { + uint16_t tag; + uint32_t length; + uint32_t ordinal; +}__attribute__((packed)); + +struct tpm_output_header { + uint16_t tag; + uint32_t length; + uint32_t return_code; +}__attribute__((packed)); + +struct stclear_flags_t { + uint16_t tag; + uint8_t deactivated; + uint8_t disableForceClear; + uint8_t physicalPresence; + uint8_t physicalPresenceLock; + uint8_t bGlobalLock; +}__attribute__((packed)); + +struct tpm_version_t { + uint8_t Major; + uint8_t Minor; + uint8_t revMajor; + uint8_t revMinor; +}__attribute__((packed)); + +struct tpm_version_1_2_t { + uint16_t tag; + uint8_t Major; + uint8_t Minor; + uint8_t revMajor; + uint8_t revMinor; +}__attribute__((packed)); + +struct timeout_t { + uint32_t a; + uint32_t b; + uint32_t c; + uint32_t d; +}__attribute__((packed)); + +struct duration_t { + uint32_t tpm_short; + uint32_t tpm_medium; + uint32_t tpm_long; +}__attribute__((packed)); + +struct permanent_flags_t { + uint16_t tag; + uint8_t disable; + uint8_t ownership; + uint8_t deactivated; + uint8_t readPubek; + uint8_t disableOwnerClear; + uint8_t allowMaintenance; + uint8_t physicalPresenceLifetimeLock; + uint8_t physicalPresenceHWEnable; + uint8_t physicalPresenceCMDEnable; + uint8_t CEKPUsed; + uint8_t TPMpost; + uint8_t TPMpostLock; + uint8_t FIPS; + uint8_t operator; + uint8_t enableRevokeEK; + uint8_t nvLocked; + uint8_t readSRKPub; + uint8_t tpmEstablished; + uint8_t maintenanceDone; + uint8_t disableFullDALogicInfo; +}__attribute__((packed)); + +typedef union { + struct permanent_flags_t perm_flags; + struct stclear_flags_t stclear_flags; + bool owned; + uint32_t num_pcrs; + struct tpm_version_t tpm_version; + struct tpm_version_1_2_t tpm_version_1_2; + uint32_t manufacturer_id; + struct timeout_t timeout; + struct duration_t duration; +} cap_t; + +struct tpm_getcap_params_in { + uint32_t cap; + uint32_t subcap_size; + uint32_t subcap; +}__attribute__((packed)); + +struct tpm_getcap_params_out { + uint32_t cap_size; + cap_t cap; +}__attribute__((packed)); + +struct tpm_readpubek_params_out { + uint8_t algorithm[4]; + uint8_t encscheme[2]; + uint8_t sigscheme[2]; + uint32_t paramsize; + uint8_t parameters[12]; /*assuming RSA*/ + uint32_t keysize; + uint8_t modulus[256]; + uint8_t checksum[20]; +}__attribute__((packed)); + +typedef union { + struct tpm_input_header in; + struct tpm_output_header out; +} tpm_cmd_header; + +#define TPM_DIGEST_SIZE 20 +struct tpm_pcrread_out { + uint8_t pcr_result[TPM_DIGEST_SIZE]; +}__attribute__((packed)); + +struct tpm_pcrread_in { + uint32_t pcr_idx; +}__attribute__((packed)); + +struct tpm_pcrextend_in { + uint32_t pcr_idx; + uint8_t hash[TPM_DIGEST_SIZE]; +}__attribute__((packed)); + +typedef union { + struct tpm_getcap_params_out getcap_out; + struct tpm_readpubek_params_out readpubek_out; + uint8_t readpubek_out_buffer[sizeof(struct tpm_readpubek_params_out)]; + struct tpm_getcap_params_in getcap_in; + struct tpm_pcrread_in pcrread_in; + struct tpm_pcrread_out pcrread_out; + struct tpm_pcrextend_in pcrextend_in; +} tpm_cmd_params; + +struct tpm_cmd_t { + tpm_cmd_header header; + tpm_cmd_params params; +}__attribute__((packed)); + + +enum tpm_duration { + TPM_SHORT = 0, + TPM_MEDIUM = 1, + TPM_LONG = 2, + TPM_UNDEFINED, +}; + +#define TPM_MAX_ORDINAL 243 +#define TPM_MAX_PROTECTED_ORDINAL 12 +#define TPM_PROTECTED_ORDINAL_MASK 0xFF + +extern const uint8_t tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL]; +extern const uint8_t tpm_ordinal_duration[TPM_MAX_ORDINAL]; + +#define TPM_DIGEST_SIZE 20 +#define TPM_ERROR_SIZE 10 +#define TPM_RET_CODE_IDX 6 + +/* tpm_capabilities */ +#define TPM_CAP_FLAG cpu_to_be32(4) +#define TPM_CAP_PROP cpu_to_be32(5) +#define CAP_VERSION_1_1 cpu_to_be32(0x06) +#define CAP_VERSION_1_2 cpu_to_be32(0x1A) + +/* tpm_sub_capabilities */ +#define TPM_CAP_PROP_PCR cpu_to_be32(0x101) +#define TPM_CAP_PROP_MANUFACTURER cpu_to_be32(0x103) +#define TPM_CAP_FLAG_PERM cpu_to_be32(0x108) +#define TPM_CAP_FLAG_VOL cpu_to_be32(0x109) +#define TPM_CAP_PROP_OWNER cpu_to_be32(0x111) +#define TPM_CAP_PROP_TIS_TIMEOUT cpu_to_be32(0x115) +#define TPM_CAP_PROP_TIS_DURATION cpu_to_be32(0x120) + + +#define TPM_INTERNAL_RESULT_SIZE 200 +#define TPM_TAG_RQU_COMMAND cpu_to_be16(193) +#define TPM_ORD_GET_CAP cpu_to_be32(101) + +extern const struct tpm_input_header tpm_getcap_header; + + + +const uint8_t tpm_protected_ordinal_duration[TPM_MAX_PROTECTED_ORDINAL] = { + TPM_UNDEFINED, /* 0 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 5 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 10 */ + TPM_SHORT, +}; + +const uint8_t tpm_ordinal_duration[TPM_MAX_ORDINAL] = { + TPM_UNDEFINED, /* 0 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 5 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 10 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_LONG, + TPM_LONG, + TPM_MEDIUM, /* 15 */ + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, + TPM_LONG, + TPM_SHORT, /* 20 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, /* 25 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 30 */ + TPM_LONG, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 35 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 40 */ + TPM_LONG, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 45 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_LONG, + TPM_MEDIUM, /* 50 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 55 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 60 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 65 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 70 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 75 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 80 */ + TPM_UNDEFINED, + TPM_MEDIUM, + TPM_LONG, + TPM_SHORT, + TPM_UNDEFINED, /* 85 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 90 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 95 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 100 */ + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 105 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 110 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 115 */ + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 120 */ + TPM_LONG, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 125 */ + TPM_SHORT, + TPM_LONG, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, /* 130 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_SHORT, + TPM_MEDIUM, + TPM_UNDEFINED, /* 135 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 140 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 145 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 150 */ + TPM_MEDIUM, + TPM_MEDIUM, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 155 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 160 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 165 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_LONG, /* 170 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 175 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_MEDIUM, /* 180 */ + TPM_SHORT, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, /* 185 */ + TPM_SHORT, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 190 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 195 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 200 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 205 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_MEDIUM, /* 210 */ + TPM_UNDEFINED, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_MEDIUM, + TPM_UNDEFINED, /* 215 */ + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, + TPM_SHORT, /* 220 */ + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_SHORT, + TPM_UNDEFINED, /* 225 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 230 */ + TPM_LONG, + TPM_MEDIUM, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, /* 235 */ + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_UNDEFINED, + TPM_SHORT, /* 240 */ + TPM_UNDEFINED, + TPM_MEDIUM, +}; + +const struct tpm_input_header tpm_getcap_header = { + .tag = TPM_TAG_RQU_COMMAND, + .length = cpu_to_be32(22), + .ordinal = TPM_ORD_GET_CAP +}; + + +enum tis_access { + TPM_ACCESS_VALID = 0x80, + TPM_ACCESS_ACTIVE_LOCALITY = 0x20, /* (R) */ + TPM_ACCESS_RELINQUISH_LOCALITY = 0x20,/* (W) */ + TPM_ACCESS_REQUEST_PENDING = 0x04, /* (W) */ + TPM_ACCESS_REQUEST_USE = 0x02, /* (W) */ +}; + +enum tis_status { + TPM_STS_VALID = 0x80, /* (R) */ + TPM_STS_COMMAND_READY = 0x40, /* (R) */ + TPM_STS_DATA_AVAIL = 0x10, /* (R) */ + TPM_STS_DATA_EXPECT = 0x08, /* (R) */ + TPM_STS_GO = 0x20, /* (W) */ +}; + +enum tis_int_flags { + TPM_GLOBAL_INT_ENABLE = 0x80000000, + TPM_INTF_BURST_COUNT_STATIC = 0x100, + TPM_INTF_CMD_READY_INT = 0x080, + TPM_INTF_INT_EDGE_FALLING = 0x040, + TPM_INTF_INT_EDGE_RISING = 0x020, + TPM_INTF_INT_LEVEL_LOW = 0x010, + TPM_INTF_INT_LEVEL_HIGH = 0x008, + TPM_INTF_LOCALITY_CHANGE_INT = 0x004, + TPM_INTF_STS_VALID_INT = 0x002, + TPM_INTF_DATA_AVAIL_INT = 0x001, +}; + +enum tis_defaults { + TIS_MEM_BASE = 0xFED40000, + TIS_MEM_LEN = 0x5000, + TIS_SHORT_TIMEOUT = 750, /*ms*/ + TIS_LONG_TIMEOUT = 2000, /*2 sec */ +}; + +#define TPM_TIMEOUT 5 + +#define TPM_ACCESS(t, l) (((uint8_t*)t->pages[l]) + 0x0000) +#define TPM_INT_ENABLE(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0008)) +#define TPM_INT_VECTOR(t, l) (((uint8_t*)t->pages[l]) + 0x000C) +#define TPM_INT_STATUS(t, l) (((uint8_t*)t->pages[l]) + 0x0010) +#define TPM_INTF_CAPS(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0014)) +#define TPM_STS(t, l) ((uint8_t*)(((uint8_t*)t->pages[l]) + 0x0018)) +#define TPM_DATA_FIFO(t, l) (((uint8_t*)t->pages[l]) + 0x0024) + +#define TPM_DID_VID(t, l) ((uint32_t*)(((uint8_t*)t->pages[l]) + 0x0F00)) +#define TPM_RID(t, l) (((uint8_t*)t->pages[l]) + 0x0F04) + +struct tpm_chip { + int enabled_localities; + int locality; + unsigned long baseaddr; + uint8_t* pages[5]; + int did, vid, rid; + + uint8_t data_buffer[TPM_BUFSIZE]; + int data_len; + + s_time_t timeout_a, timeout_b, timeout_c, timeout_d; + s_time_t duration[3]; + +#ifdef HAVE_LIBC + int fd; +#endif + + unsigned int irq; + struct wait_queue_head read_queue; + struct wait_queue_head int_queue; +}; + + +static void __init_tpm_chip(struct tpm_chip* tpm) { + tpm->enabled_localities = TPM_TIS_EN_LOCLALL; + tpm->locality = -1; + tpm->baseaddr = 0; + tpm->pages[0] = tpm->pages[1] = tpm->pages[2] = tpm->pages[3] = tpm->pages[4] = NULL; + tpm->vid = 0; + tpm->did = 0; + tpm->irq = 0; + init_waitqueue_head(&tpm->read_queue); + init_waitqueue_head(&tpm->int_queue); + + tpm->data_len = -1; + +#ifdef HAVE_LIBC + tpm->fd = -1; +#endif +} + +/* + * Returns max number of nsecs to wait + */ +s_time_t tpm_calc_ordinal_duration(struct tpm_chip *chip, + uint32_t ordinal) +{ + int duration_idx = TPM_UNDEFINED; + s_time_t duration = 0; + + if (ordinal < TPM_MAX_ORDINAL) + duration_idx = tpm_ordinal_duration[ordinal]; + else if ((ordinal & TPM_PROTECTED_ORDINAL_MASK) < + TPM_MAX_PROTECTED_ORDINAL) + duration_idx = + tpm_protected_ordinal_duration[ordinal & + TPM_PROTECTED_ORDINAL_MASK]; + + if (duration_idx != TPM_UNDEFINED) { + duration = chip->duration[duration_idx]; + } + + if (duration <= 0) { + return SECONDS(120); + } + else + { + return duration; + } +} + + +static int locality_enabled(struct tpm_chip* tpm, int l) { + return tpm->enabled_localities & (1 << l); +} + +static int check_locality(struct tpm_chip* tpm, int l) { + if(locality_enabled(tpm, l) && (ioread8(TPM_ACCESS(tpm, l)) & + (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) == + (TPM_ACCESS_ACTIVE_LOCALITY | TPM_ACCESS_VALID)) { + return l; + } + return -1; +} + +void release_locality(struct tpm_chip* tpm, int l, int force) +{ + if (locality_enabled(tpm, l) && (force || (ioread8(TPM_ACCESS(tpm, l)) & + (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID)) == + (TPM_ACCESS_REQUEST_PENDING | TPM_ACCESS_VALID))) { + iowrite8(TPM_ACCESS(tpm, l), TPM_ACCESS_RELINQUISH_LOCALITY); + } +} + +int tpm_tis_request_locality(struct tpm_chip* tpm, int l) { + + s_time_t stop; + /*Make sure locality is valid */ + if(!locality_enabled(tpm, l)) { + printk("tpm_tis_change_locality() Tried to change to locality %d, but it is disabled or invalid!\n", l); + return -1; + } + /* Check if we already have the current locality */ + if(check_locality(tpm, l) >= 0) { + return tpm->locality = l; + } + /* Set the new locality*/ + iowrite8(TPM_ACCESS(tpm, l), TPM_ACCESS_REQUEST_USE); + + if(tpm->irq) { + /* Wait for interrupt */ + wait_event_deadline(tpm->int_queue, (check_locality(tpm, l) >= 0), NOW() + tpm->timeout_a); + + /* FIXME: Handle timeout event, should return error in that case */ + return l; + } else { + /* Wait for burstcount */ + stop = NOW() + tpm->timeout_a; + do { + if(check_locality(tpm, l) >= 0) { + return tpm->locality = l; + } + msleep(TPM_TIMEOUT); + } while(NOW() < stop); + } + + printk("REQ LOCALITY FAILURE\n"); + return -1; +} + +static uint8_t tpm_tis_status(struct tpm_chip* tpm) { + return ioread8(TPM_STS(tpm, tpm->locality)); +} + +/* This causes the current command to be aborted */ +static void tpm_tis_ready(struct tpm_chip* tpm) { + iowrite8(TPM_STS(tpm, tpm->locality), TPM_STS_COMMAND_READY); +} +#define tpm_tis_cancel_cmd(v) tpm_tis_ready(v) + +static int get_burstcount(struct tpm_chip* tpm) { + s_time_t stop; + int burstcnt; + + stop = NOW() + tpm->timeout_d; + do { + burstcnt = ioread8((TPM_STS(tpm, tpm->locality) + 1)); + burstcnt += ioread8(TPM_STS(tpm, tpm->locality) + 2) << 8; + + if (burstcnt) { + return burstcnt; + } + msleep(TPM_TIMEOUT); + } while(NOW() < stop); + return -EBUSY; +} + +static int wait_for_stat(struct tpm_chip* tpm, uint8_t mask, + unsigned long timeout, struct wait_queue_head* queue) { + s_time_t stop; + uint8_t status; + + status = tpm_tis_status(tpm); + if((status & mask) == mask) { + return 0; + } + + if(tpm->irq) { + wait_event_deadline(*queue, ((tpm_tis_status(tpm) & mask) == mask), timeout); + /* FIXME: Check for timeout and return -ETIME */ + return 0; + } else { + stop = NOW() + timeout; + do { + msleep(TPM_TIMEOUT); + status = tpm_tis_status(tpm); + if((status & mask) == mask) + return 0; + } while( NOW() < stop); + } + return -ETIME; +} + +static int recv_data(struct tpm_chip* tpm, uint8_t* buf, size_t count) { + int size = 0; + int burstcnt; + while( size < count && + wait_for_stat(tpm, + TPM_STS_DATA_AVAIL | TPM_STS_VALID, + tpm->timeout_c, + &tpm->read_queue) + == 0) { + burstcnt = get_burstcount(tpm); + for(; burstcnt > 0 && size < count; --burstcnt) + { + buf[size++] = ioread8(TPM_DATA_FIFO(tpm, tpm->locality)); + } + } + return size; +} + +int tpm_tis_recv(struct tpm_chip* tpm, uint8_t* buf, size_t count) { + int size = 0; + int expected, status; + + if (count < TPM_HEADER_SIZE) { + size = -EIO; + goto out; + } + + /* read first 10 bytes, including tag, paramsize, and result */ + if((size = + recv_data(tpm, buf, TPM_HEADER_SIZE)) < TPM_HEADER_SIZE) { + printk("Error reading tpm cmd header\n"); + goto out; + } + + expected = be32_to_cpu(*((uint32_t*)(buf + 2))); + if(expected > count) { + size = -EIO; + goto out; + } + + if((size += recv_data(tpm, & buf[TPM_HEADER_SIZE], + expected - TPM_HEADER_SIZE)) < expected) { + printk("Unable to read rest of tpm command size=%d expected=%d\n", size, expected); + size = -ETIME; + goto out; + } + + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->int_queue); + status = tpm_tis_status(tpm); + if(status & TPM_STS_DATA_AVAIL) { + printk("Error: left over data\n"); + size = -EIO; + goto out; + } + +out: + tpm_tis_ready(tpm); + release_locality(tpm, tpm->locality, 0); + return size; +} +int tpm_tis_send(struct tpm_chip* tpm, uint8_t* buf, size_t len) { + int rc; + int status, burstcnt = 0; + int count = 0; + uint32_t ordinal; + + if(tpm_tis_request_locality(tpm, tpm->locality) < 0) { + return -EBUSY; + } + + status = tpm_tis_status(tpm); + if((status & TPM_STS_COMMAND_READY) == 0) { + tpm_tis_ready(tpm); + if(wait_for_stat(tpm, TPM_STS_COMMAND_READY, tpm->timeout_b, &tpm->int_queue) < 0) { + rc = -ETIME; + goto out_err; + } + } + + while(count < len - 1) { + burstcnt = get_burstcount(tpm); + for(;burstcnt > 0 && count < len -1; --burstcnt) { + iowrite8(TPM_DATA_FIFO(tpm, tpm->locality), buf[count++]); + } + + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->int_queue); + status = tpm_tis_status(tpm); + if((status & TPM_STS_DATA_EXPECT) == 0) { + rc = -EIO; + goto out_err; + } + } + + /*Write last byte*/ + iowrite8(TPM_DATA_FIFO(tpm, tpm->locality), buf[count]); + wait_for_stat(tpm, TPM_STS_VALID, tpm->timeout_c, &tpm->read_queue); + status = tpm_tis_status(tpm); + if((status & TPM_STS_DATA_EXPECT) != 0) { + rc = -EIO; + goto out_err; + } + + /*go and do it*/ + iowrite8(TPM_STS(tpm, tpm->locality), TPM_STS_GO); + + if(tpm->irq) { + /*Wait for interrupt */ + ordinal = be32_to_cpu(*(buf + 6)); + if(wait_for_stat(tpm, + TPM_STS_DATA_AVAIL | TPM_STS_VALID, + tpm_calc_ordinal_duration(tpm, ordinal), + &tpm->read_queue) < 0) { + rc = -ETIME; + goto out_err; + } + } +#ifdef HAVE_LIBC + if(tpm->fd >= 0) { + files[tpm->fd].read = 0; + files[tpm->fd].tpm_tis.respgot = 0; + files[tpm->fd].tpm_tis.offset = 0; + } +#endif + return len; + +out_err: + tpm_tis_ready(tpm); + release_locality(tpm, tpm->locality, 0); + return rc; +} + +static void tpm_tis_irq_handler(evtchn_port_t port, struct pt_regs *regs, void* data) +{ + struct tpm_chip* tpm = data; + uint32_t interrupt; + int i; + + interrupt = ioread32(TPM_INT_STATUS(tpm, tpm->locality)); + if(interrupt == 0) { + return; + } + + if(interrupt & TPM_INTF_DATA_AVAIL_INT) { + wake_up(&tpm->read_queue); + } + if(interrupt & TPM_INTF_LOCALITY_CHANGE_INT) { + for(i = 0; i < 5; ++i) { + if(check_locality(tpm, i) >= 0) { + break; + } + } + } + if(interrupt & (TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_STS_VALID_INT | + TPM_INTF_CMD_READY_INT)) { + wake_up(&tpm->int_queue); + } + + /* Clear interrupts handled with TPM_EOI */ + iowrite32(TPM_INT_STATUS(tpm, tpm->locality), interrupt); + ioread32(TPM_INT_STATUS(tpm, tpm->locality)); + return; +} + +/* + * Internal kernel interface to transmit TPM commands + */ +static ssize_t tpm_transmit(struct tpm_chip *chip, const uint8_t *buf, + size_t bufsiz) +{ + ssize_t rc; + uint32_t count, ordinal; + s_time_t stop; + + count = be32_to_cpu(*((uint32_t *) (buf + 2))); + ordinal = be32_to_cpu(*((uint32_t *) (buf + 6))); + if (count == 0) + return -ENODATA; + if (count > bufsiz) { + printk("Error: invalid count value %x %zx \n", count, bufsiz); + return -E2BIG; + } + + //down(&chip->tpm_mutex); + + if ((rc = tpm_tis_send(chip, (uint8_t *) buf, count)) < 0) { + printk("tpm_transmit: tpm_send: error %ld\n", rc); + goto out; + } + + if (chip->irq) + goto out_recv; + + stop = NOW() + tpm_calc_ordinal_duration(chip, ordinal); + do { + uint8_t status = tpm_tis_status(chip); + if ((status & (TPM_STS_DATA_AVAIL | TPM_STS_VALID)) == + (TPM_STS_DATA_AVAIL | TPM_STS_VALID)) + goto out_recv; + + if ((status == TPM_STS_COMMAND_READY)) { + printk("TPM Error: Operation Canceled\n"); + rc = -ECANCELED; + goto out; + } + + msleep(TPM_TIMEOUT); /* CHECK */ + rmb(); + } while (NOW() < stop); + + /* Cancel the command */ + tpm_tis_cancel_cmd(chip); + printk("TPM Operation Timed out\n"); + rc = -ETIME; + goto out; + +out_recv: + if((rc = tpm_tis_recv(chip, (uint8_t *) buf, bufsiz)) < 0) { + printk("tpm_transmit: tpm_recv: error %d\n", rc); + } +out: + //up(&chip->tpm_mutex); + return rc; +} + +static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd, + int len, const char *desc) +{ + int err; + + len = tpm_transmit(chip,(uint8_t *) cmd, len); + if (len < 0) + return len; + if (len == TPM_ERROR_SIZE) { + err = be32_to_cpu(cmd->header.out.return_code); + printk("A TPM error (%d) occurred %s\n", err, desc); + return err; + } + return 0; +} + +int tpm_get_timeouts(struct tpm_chip *chip) +{ + struct tpm_cmd_t tpm_cmd; + struct timeout_t *timeout_cap; + struct duration_t *duration_cap; + ssize_t rc; + uint32_t timeout; + unsigned int scale = 1; + + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT; + + if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, + "attempting to determine the timeouts")) != 0) { + printk("transmit failed %d\n", rc); + goto duration; + } + + if(be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || + be32_to_cpu(tpm_cmd.header.out.length) != + sizeof(tpm_cmd.header.out) + sizeof(uint32_t) + 4 * sizeof(uint32_t)) { + return -EINVAL; + } + + timeout_cap = &tpm_cmd.params.getcap_out.cap.timeout; + /* Don't overwrite default if value is 0 */ + timeout = be32_to_cpu(timeout_cap->a); + if(timeout && timeout < 1000) { + /* timeouts in msc rather usec */ + scale = 1000; + } + if (timeout) + chip->timeout_a = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->b); + if (timeout) + chip->timeout_b = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->c); + if (timeout) + chip->timeout_c = MICROSECS(timeout * scale); /*Convert to msec */ + timeout = be32_to_cpu(timeout_cap->d); + if (timeout) + chip->timeout_d = MICROSECS(timeout * scale); /*Convert to msec */ + +duration: + tpm_cmd.header.in = tpm_getcap_header; + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_DURATION; + + if((rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, + "attempting to determine the durations")) < 0) { + return rc; + } + + if(be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || + be32_to_cpu(tpm_cmd.header.out.length) != + sizeof(tpm_cmd.header.out) + sizeof(uint32_t) + 3 * sizeof(uint32_t)) { + return -EINVAL; + } + + duration_cap = &tpm_cmd.params.getcap_out.cap.duration; + chip->duration[TPM_SHORT] = MICROSECS(be32_to_cpu(duration_cap->tpm_short)); + chip->duration[TPM_MEDIUM] = MICROSECS(be32_to_cpu(duration_cap->tpm_medium)); + chip->duration[TPM_LONG] = MICROSECS(be32_to_cpu(duration_cap->tpm_long)); + + /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above + * value wrong and apparently reports msecs rather than usecs. So we + * fix up the resulting too-small TPM_SHORT value to make things work. + */ + if (chip->duration[TPM_SHORT] < MILLISECS(10)) { + chip->duration[TPM_SHORT] = SECONDS(1); + chip->duration[TPM_MEDIUM] *= 1000; + chip->duration[TPM_LONG] *= 1000; + printk("Adjusting TPM timeout parameters\n"); + } + + return 0; +} + + + +void tpm_continue_selftest(struct tpm_chip* chip) { + uint8_t data[] = { + 0, 193, /* TPM_TAG_RQU_COMMAND */ + 0, 0, 0, 10, /* length */ + 0, 0, 0, 83, /* TPM_ORD_GetCapability */ + }; + + tpm_transmit(chip, data, sizeof(data)); +} + +ssize_t tpm_getcap(struct tpm_chip *chip, uint32_t subcap_id, cap_t *cap, + const char *desc) +{ + struct tpm_cmd_t tpm_cmd; + int rc; + + tpm_cmd.header.in = tpm_getcap_header; + if (subcap_id == CAP_VERSION_1_1 || subcap_id == CAP_VERSION_1_2) { + tpm_cmd.params.getcap_in.cap = subcap_id; + /*subcap field not necessary */ + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0); + tpm_cmd.header.in.length -= cpu_to_be32(sizeof(uint32_t)); + } else { + if (subcap_id == TPM_CAP_FLAG_PERM || + subcap_id == TPM_CAP_FLAG_VOL) + tpm_cmd.params.getcap_in.cap = TPM_CAP_FLAG; + else + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); + tpm_cmd.params.getcap_in.subcap = subcap_id; + } + rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, desc); + if (!rc) + *cap = tpm_cmd.params.getcap_out.cap; + return rc; +} + + +struct tpm_chip* init_tpm_tis(unsigned long baseaddr, int localities, unsigned int irq) +{ + int i; + unsigned long addr; + struct tpm_chip* tpm = NULL; + uint32_t didvid; + uint32_t intfcaps; + uint32_t intmask; + + printk("============= Init TPM TIS Driver ==============\n"); + + /*Sanity check the localities input */ + if(localities & ~TPM_TIS_EN_LOCLALL) { + printk("init_tpm_tis() Invalid locality specification! %X\n", localities); + goto abort_egress; + } + + printk("IOMEM Machine Base Address: %lX\n", baseaddr); + + /* Create the tpm data structure */ + tpm = malloc(sizeof(struct tpm_chip)); + __init_tpm_chip(tpm); + + /* Set the enabled localities - if 0 we leave default as all enabled */ + if(localities != 0) { + tpm->enabled_localities = localities; + } + printk("Enabled Localities: "); + for(i = 0; i < 5; ++i) { + if(locality_enabled(tpm, i)) { + printk("%d ", i); + } + } + printk("\n"); + + /* Set the base machine address */ + tpm->baseaddr = baseaddr; + + /* Set default timeouts */ + tpm->timeout_a = MILLISECS(TIS_SHORT_TIMEOUT); + tpm->timeout_b = MILLISECS(TIS_LONG_TIMEOUT); + tpm->timeout_c = MILLISECS(TIS_SHORT_TIMEOUT); + tpm->timeout_d = MILLISECS(TIS_SHORT_TIMEOUT); + + /*Map the mmio pages */ + addr = tpm->baseaddr; + for(i = 0; i < 5; ++i) { + if(locality_enabled(tpm, i)) { + /* Map the page in now */ + if((tpm->pages[i] = ioremap_nocache(addr, PAGE_SIZE)) == NULL) { + printk("Unable to map iomem page a address %p\n", addr); + goto abort_egress; + } + + /* Set default locality to the first enabled one */ + if (tpm->locality < 0) { + if(tpm_tis_request_locality(tpm, i) < 0) { + printk("Unable to request locality %d??\n", i); + goto abort_egress; + } + } + } + addr += PAGE_SIZE; + } + + + /* Get the vendor and device ids */ + didvid = ioread32(TPM_DID_VID(tpm, tpm->locality)); + tpm->did = didvid >> 16; + tpm->vid = didvid & 0xFFFF; + + + /* Get the revision id */ + tpm->rid = ioread8(TPM_RID(tpm, tpm->locality)); + + printk("1.2 TPM (device-id=0x%X vendor-id = %X rev-id = %X)\n", tpm->did, tpm->vid, tpm->rid); + + intfcaps = ioread32(TPM_INTF_CAPS(tpm, tpm->locality)); + printk("TPM interface capabilities (0x%x):\n", intfcaps); + if (intfcaps & TPM_INTF_BURST_COUNT_STATIC) + printk("\tBurst Count Static\n"); + if (intfcaps & TPM_INTF_CMD_READY_INT) + printk("\tCommand Ready Int Support\n"); + if (intfcaps & TPM_INTF_INT_EDGE_FALLING) + printk("\tInterrupt Edge Falling\n"); + if (intfcaps & TPM_INTF_INT_EDGE_RISING) + printk("\tInterrupt Edge Rising\n"); + if (intfcaps & TPM_INTF_INT_LEVEL_LOW) + printk("\tInterrupt Level Low\n"); + if (intfcaps & TPM_INTF_INT_LEVEL_HIGH) + printk("\tInterrupt Level High\n"); + if (intfcaps & TPM_INTF_LOCALITY_CHANGE_INT) + printk("\tLocality Change Int Support\n"); + if (intfcaps & TPM_INTF_STS_VALID_INT) + printk("\tSts Valid Int Support\n"); + if (intfcaps & TPM_INTF_DATA_AVAIL_INT) + printk("\tData Avail Int Support\n"); + + /*Interupt setup */ + intmask = ioread32(TPM_INT_ENABLE(tpm, tpm->locality)); + + intmask |= TPM_INTF_CMD_READY_INT + | TPM_INTF_LOCALITY_CHANGE_INT | TPM_INTF_DATA_AVAIL_INT + | TPM_INTF_STS_VALID_INT; + + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), intmask); + + /*If interupts are enabled, handle it */ + if(irq) { + if(irq != TPM_PROBE_IRQ) { + tpm->irq = irq; + } else { + /*FIXME add irq probing feature later */ + printk("IRQ probing not implemented\n"); + } + } + + if(tpm->irq) { + iowrite8(TPM_INT_VECTOR(tpm, tpm->locality), tpm->irq); + + if(bind_pirq(tpm->irq, 1, tpm_tis_irq_handler, tpm) != 0) { + printk("Unabled to request irq: %u for use\n", tpm->irq); + printk("Will use polling mode\n"); + tpm->irq = 0; + } else { + /* Clear all existing */ + iowrite32(TPM_INT_STATUS(tpm, tpm->locality), ioread32(TPM_INT_STATUS(tpm, tpm->locality))); + + /* Turn on interrupts */ + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), intmask | TPM_GLOBAL_INT_ENABLE); + } + } + + if(tpm_get_timeouts(tpm)) { + printk("Could not get TPM timeouts and durations\n"); + goto abort_egress; + } + tpm_continue_selftest(tpm); + + + return tpm; +abort_egress: + if(tpm != NULL) { + shutdown_tpm_tis(tpm); + } + return NULL; +} + +void shutdown_tpm_tis(struct tpm_chip* tpm){ + int i; + + printk("Shutting down tpm_tis device\n"); + + iowrite32(TPM_INT_ENABLE(tpm, tpm->locality), ~TPM_GLOBAL_INT_ENABLE); + + /*Unmap all of the mmio pages */ + for(i = 0; i < 5; ++i) { + if(tpm->pages[i] != NULL) { + iounmap(tpm->pages[i], PAGE_SIZE); + tpm->pages[i] = NULL; + } + } + free(tpm); + return; +} + + +int tpm_tis_cmd(struct tpm_chip* tpm, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) +{ + if(tpm->locality < 0) { + printk("tpm_tis_cmd() failed! locality not set!\n"); + return -1; + } + if(reqlen > TPM_BUFSIZE) { + reqlen = TPM_BUFSIZE; + } + memcpy(tpm->data_buffer, req, reqlen); + *resplen = tpm_transmit(tpm, tpm->data_buffer, TPM_BUFSIZE); + + *resp = malloc(*resplen); + memcpy(*resp, tpm->data_buffer, *resplen); + return 0; +} + +#ifdef HAVE_LIBC +int tpm_tis_open(struct tpm_chip* tpm) +{ + /* Silently prevent multiple opens */ + if(tpm->fd != -1) { + return tpm->fd; + } + + tpm->fd = alloc_fd(FTYPE_TPM_TIS); + printk("tpm_tis_open() -> %d\n", tpm->fd); + files[tpm->fd].tpm_tis.dev = tpm; + files[tpm->fd].tpm_tis.offset = 0; + files[tpm->fd].tpm_tis.respgot = 0; + return tpm->fd; +} + +int tpm_tis_posix_write(int fd, const uint8_t* buf, size_t count) +{ + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + if(tpm->locality < 0) { + printk("tpm_tis_posix_write() failed! locality not set!\n"); + errno = EINPROGRESS; + return -1; + } + if(count == 0) { + return 0; + } + + /* Return an error if we are already processing a command */ + if(count > TPM_BUFSIZE) { + count = TPM_BUFSIZE; + } + /* Send the command now */ + memcpy(tpm->data_buffer, buf, count); + if((tpm->data_len = tpm_transmit(tpm, tpm->data_buffer, TPM_BUFSIZE)) < 0) { + errno = EIO; + return -1; + } + return count; +} + +int tpm_tis_posix_read(int fd, uint8_t* buf, size_t count) +{ + int rc; + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + if(count == 0) { + return 0; + } + + /* If there is no tpm resp to read, return EIO */ + if(tpm->data_len < 0) { + errno = EIO; + return -1; + } + + + /* Handle EOF case */ + if(files[fd].tpm_tis.offset >= tpm->data_len) { + rc = 0; + } else { + rc = min(tpm->data_len - files[fd].tpm_tis.offset, count); + memcpy(buf, tpm->data_buffer + files[fd].tpm_tis.offset, rc); + } + files[fd].tpm_tis.offset += rc; + /* Reset the data pending flag */ + return rc; +} +int tpm_tis_posix_fstat(int fd, struct stat* buf) +{ + struct tpm_chip* tpm; + tpm = files[fd].tpm_tis.dev; + + buf->st_mode = O_RDWR; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_size = be32_to_cpu(*((uint32_t*)(tpm->data_buffer + 2))); + buf->st_atime = buf->st_mtime = buf->st_ctime = time(NULL); + return 0; +} + + +#endif diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c new file mode 100644 index 0000000..658fed1 --- /dev/null +++ b/extras/mini-os/tpmback.c @@ -0,0 +1,1102 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/xen/tpmback/tpmback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netback/netback.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This code has also been derived from drivers/xen/tpmback/xenbus.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2005 IBM Corporation + * Copyright (C) 2005 Rusty Russell + * + * This code has also been derived from drivers/xen/tpmback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself also derived from drvivers/xen/netback/interface.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2004, Keir Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2 + * of the License + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#ifndef HAVE_LIBC +#define strtoul simple_strtoul +#endif + +//#define TPMBACK_PRINT_DEBUG +#ifdef TPMBACK_PRINT_DEBUG +#define TPMBACK_DEBUG(fmt,...) printk("Tpmback:Debug("__FILE__":%d) " fmt, __LINE__, ##__VA_ARGS__) +#define TPMBACK_DEBUG_MORE(fmt,...) printk(fmt, ##__VA_ARGS__) +#else +#define TPMBACK_DEBUG(fmt,...) +#endif +#define TPMBACK_ERR(fmt,...) printk("Tpmback:Error " fmt, ##__VA_ARGS__) +#define TPMBACK_LOG(fmt,...) printk("Tpmback:Info " fmt, ##__VA_ARGS__) + +#define min(a,b) (((a) < (b)) ? (a) : (b)) + +/* Default size of the tpmif array at initialization */ +#define DEF_ARRAY_SIZE 1 + +/* tpmif and tpmdev flags */ +#define TPMIF_CLOSED 1 +#define TPMIF_REQ_READY 2 + +struct tpmif { + domid_t domid; + unsigned int handle; + + char* fe_path; + char* fe_state_path; + + /* Locally bound event channel*/ + evtchn_port_t evtchn; + + /* Shared page */ + tpmif_tx_interface_t* tx; + + /* pointer to TPMIF_RX_RING_SIZE pages */ + void** pages; + + enum xenbus_state state; + enum { DISCONNECTED, DISCONNECTING, CONNECTED } status; + + unsigned char uuid[16]; + + /* state flags */ + int flags; +}; +typedef struct tpmif tpmif_t; + +struct tpmback_dev { + + tpmif_t** tpmlist; + unsigned long num_tpms; + unsigned long num_alloc; + + struct gntmap map; + + /* True if at least one tpmif has a request to be handled */ + int flags; + + xenbus_event_queue events; + + /* Callbacks */ + void (*open_callback)(domid_t, unsigned int); + void (*close_callback)(domid_t, unsigned int); + void (*suspend_callback)(domid_t, unsigned int); + void (*resume_callback)(domid_t, unsigned int); +}; +typedef struct tpmback_dev tpmback_dev_t; + +enum { EV_NONE, EV_NEWFE, EV_STCHNG } tpm_ev_enum; + +/* Global objects */ +static struct thread* eventthread = NULL; +static tpmback_dev_t gtpmdev = { + .tpmlist = NULL, + .num_tpms = 0, + .num_alloc = 0, + .flags = TPMIF_CLOSED, + .events = NULL, + .open_callback = NULL, + .close_callback = NULL, + .suspend_callback = NULL, + .resume_callback = NULL, +}; +struct wait_queue_head waitq; +int globalinit = 0; + +/************************************ + * TPMIF SORTED ARRAY FUNCTIONS + * tpmback_dev_t.tpmlist is a sorted array, sorted by domid and then handle number + * Duplicates are not allowed + * **********************************/ + +inline void tpmif_req_ready(tpmif_t* tpmif) { + tpmif->flags |= TPMIF_REQ_READY; + gtpmdev.flags |= TPMIF_REQ_READY; +} + +inline void tpmdev_check_req(void) { + int i; + int flags; + local_irq_save(flags); + for(i = 0; i < gtpmdev.num_tpms; ++i) { + if(gtpmdev.tpmlist[i]->flags & TPMIF_REQ_READY) { + gtpmdev.flags |= TPMIF_REQ_READY; + local_irq_restore(flags); + return; + } + } + gtpmdev.flags &= ~TPMIF_REQ_READY; + local_irq_restore(flags); +} + +inline void tpmif_req_finished(tpmif_t* tpmif) { + tpmif->flags &= ~TPMIF_REQ_READY; + tpmdev_check_req(); +} + +int __get_tpmif_index(int st, int n, domid_t domid, unsigned int handle) +{ + int i = st + n /2; + tpmif_t* tmp; + + if( n <= 0 ) + return -1; + + tmp = gtpmdev.tpmlist[i]; + if(domid == tmp->domid && tmp->handle == handle) { + return i; + } else if ( (domid < tmp->domid) || + (domid == tmp->domid && handle < tmp->handle)) { + return __get_tpmif_index(st, n/2, domid, handle); + } else { + return __get_tpmif_index(i + 1, n/2 - ((n +1) % 2), domid, handle); + } +} + +/* Returns the array index of the tpmif domid/handle. Returns -1 if no such tpmif exists */ +int get_tpmif_index(domid_t domid, unsigned int handle) +{ + int flags; + int index; + local_irq_save(flags); + index = __get_tpmif_index(0, gtpmdev.num_tpms, domid, handle); + local_irq_restore(flags); + return index; +} + +/* Returns the tpmif domid/handle or NULL if none exists */ +tpmif_t* get_tpmif(domid_t domid, unsigned int handle) +{ + int flags; + int i; + tpmif_t* ret; + local_irq_save(flags); + i = get_tpmif_index(domid, handle); + if (i < 0) { + ret = NULL; + } else { + ret = gtpmdev.tpmlist[i]; + } + local_irq_restore(flags); + return ret; +} + +/* Remove the given tpmif. Returns 0 if it was removed, -1 if it was not removed */ +int remove_tpmif(tpmif_t* tpmif) +{ + int i, j; + char* err; + int flags; + local_irq_save(flags); + + /* Find the index in the array if it exists */ + i = get_tpmif_index(tpmif->domid, tpmif->handle); + if (i < 0) { + goto error; + } + + /* Remove the interface from the list */ + for(j = i; j < gtpmdev.num_tpms - 1; ++j) { + gtpmdev.tpmlist[j] = gtpmdev.tpmlist[j+1]; + } + gtpmdev.tpmlist[j] = NULL; + --gtpmdev.num_tpms; + + /* If removed tpm was the only ready tpm, then we need to check and turn off the ready flag */ + tpmdev_check_req(); + + local_irq_restore(flags); + + /* Stop listening for events on this tpm interface */ + if((err = xenbus_unwatch_path_token(XBT_NIL, tpmif->fe_state_path, tpmif->fe_state_path))) { + TPMBACK_ERR("Unable to unwatch path token `%s' Error was %s Ignoring..\n", tpmif->fe_state_path, err); + free(err); + } + + return 0; +error: + local_irq_restore(flags); + return -1; +} + +/* Insert tpmif into dev->tpmlist. Returns 0 on success and non zero on error. + * It is an error to insert a tpmif with the same domid and handle + * number + * as something already in the list */ +int insert_tpmif(tpmif_t* tpmif) +{ + int flags; + unsigned int i, j; + tpmif_t* tmp; + char* err; + + local_irq_save(flags); + + /*Check if we need to allocate more space */ + if (gtpmdev.num_tpms == gtpmdev.num_alloc) { + gtpmdev.num_alloc *= 2; + gtpmdev.tpmlist = realloc(gtpmdev.tpmlist, gtpmdev.num_alloc); + } + + /*Find where to put the new interface */ + for(i = 0; i < gtpmdev.num_tpms; ++i) + { + tmp = gtpmdev.tpmlist[i]; + if(tpmif->domid == tmp->domid && tpmif->handle == tmp->handle) { + TPMBACK_ERR("Tried to insert duplicate tpm interface %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + if((tpmif->domid < tmp->domid) || + (tpmif->domid == tmp->domid && tpmif->handle < tmp->handle)) { + break; + } + } + + /*Shift all the tpm pointers past i down one */ + for(j = gtpmdev.num_tpms; j > i; --j) { + gtpmdev.tpmlist[j] = gtpmdev.tpmlist[j-1]; + } + + /*Add the new interface */ + gtpmdev.tpmlist[i] = tpmif; + ++gtpmdev.num_tpms; + + /*Should not be needed, anything inserted with ready flag is probably an error */ + tpmdev_check_req(); + + local_irq_restore(flags); + + /*Listen for state changes on the new interface */ + if((err = xenbus_watch_path_token(XBT_NIL, tpmif->fe_state_path, tpmif->fe_state_path, >pmdev.events))) + { + /* if we got an error here we should carefully remove the interface and then return */ + TPMBACK_ERR("Unable to watch path token `%s' Error was %s\n", tpmif->fe_state_path, err); + free(err); + remove_tpmif(tpmif); + goto error_post_irq; + } + + return 0; +error: + local_irq_restore(flags); +error_post_irq: + return -1; +} + + +/***************** + * CHANGE BACKEND STATE + * *****************/ +/*Attempts to change the backend state in xenstore + * returns 0 on success and non-zero on error */ +int tpmif_change_state(tpmif_t* tpmif, enum xenbus_state state) +{ + char path[512]; + char *value; + char *err; + enum xenbus_state readst; + TPMBACK_DEBUG("Backend state change %u/%u from=%d to=%d\n", (unsigned int) tpmif->domid, tpmif->handle, tpmif->state, state); + if (tpmif->state == state) + return 0; + + snprintf(path, 512, "backend/vtpm/%u/%u/state", (unsigned int) tpmif->domid, tpmif->handle); + + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Unable to read backend state %s, error was %s\n", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &readst) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + /* It's possible that the backend state got updated by hotplug or something else behind our back */ + if(readst != tpmif->state) { + TPMBACK_DEBUG("tpm interface state was %d but xenstore state was %d!\n", tpmif->state, readst); + tpmif->state = readst; + } + + /*If if the state isnt changing, then we dont update xenstore b/c we dont want to fire extraneous events */ + if(tpmif->state == state) { + return 0; + } + + /*update xenstore*/ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_printf(XBT_NIL, path, "state", "%u", state))) { + TPMBACK_ERR("Error writing to xenstore %s, error was %s new state=%d\n", path, err, state); + free(err); + return -1; + } + + tpmif->state = state; + + return 0; +} +/********************************** + * TPMIF CREATION AND DELETION + * *******************************/ +inline tpmif_t* __init_tpmif(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + tpmif = malloc(sizeof(*tpmif)); + tpmif->domid = domid; + tpmif->handle = handle; + tpmif->fe_path = NULL; + tpmif->fe_state_path = NULL; + tpmif->state = XenbusStateInitialising; + tpmif->status = DISCONNECTED; + tpmif->tx = NULL; + tpmif->pages = NULL; + tpmif->flags = 0; + memset(tpmif->uuid, 0, sizeof(tpmif->uuid)); + return tpmif; +} + +void __free_tpmif(tpmif_t* tpmif) +{ + if(tpmif->pages) { + free(tpmif->pages); + } + if(tpmif->fe_path) { + free(tpmif->fe_path); + } + if(tpmif->fe_state_path) { + free(tpmif->fe_state_path); + } + free(tpmif); +} +/* Creates a new tpm interface, adds it to the sorted array and returns it. + * returns NULL on error + * If the tpm interface already exists, it is returned*/ +tpmif_t* new_tpmif(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + char* err; + char path[512]; + + /* Make sure we haven't already created this tpm + * Double events can occur */ + if((tpmif = get_tpmif(domid, handle)) != NULL) { + return tpmif; + } + + tpmif = __init_tpmif(domid, handle); + + /* Get the uuid from xenstore */ + snprintf(path, 512, "backend/vtpm/%u/%u/uuid", (unsigned int) domid, handle); + if((!xenbus_read_uuid(path, tpmif->uuid))) { + TPMBACK_ERR("Error reading %s\n", path); + goto error; + } + + /* allocate pages to be used for shared mapping */ + if((tpmif->pages = malloc(sizeof(void*) * TPMIF_TX_RING_SIZE)) == NULL) { + goto error; + } + memset(tpmif->pages, 0, sizeof(void*) * TPMIF_TX_RING_SIZE); + + if(tpmif_change_state(tpmif, XenbusStateInitWait)) { + goto error; + } + + snprintf(path, 512, "backend/vtpm/%u/%u/frontend", (unsigned int) domid, handle); + if((err = xenbus_read(XBT_NIL, path, &tpmif->fe_path))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s), Error = %s", path, err); + free(err); + goto error; + } + + /*Set the state path */ + tpmif->fe_state_path = malloc(strlen(tpmif->fe_path) + 7); + strcpy(tpmif->fe_state_path, tpmif->fe_path); + strcat(tpmif->fe_state_path, "/state"); + + if(insert_tpmif(tpmif)) { + goto error; + } + TPMBACK_DEBUG("New tpmif %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + /* Do the callback now */ + if(gtpmdev.open_callback) { + gtpmdev.open_callback(tpmif->domid, tpmif->handle); + } + return tpmif; +error: + __free_tpmif(tpmif); + return NULL; + +} + +/* Removes tpmif from dev->tpmlist and frees it's memory usage */ +void free_tpmif(tpmif_t* tpmif) +{ + char* err; + char path[512]; + TPMBACK_DEBUG("Free tpmif %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + if(tpmif->flags & TPMIF_CLOSED) { + TPMBACK_ERR("Tried to free an instance twice! Theres a bug somewhere!\n"); + BUG(); + } + tpmif->flags = TPMIF_CLOSED; + + tpmif_change_state(tpmif, XenbusStateClosing); + + /* Unmap share page and unbind event channel */ + if(tpmif->status == CONNECTED) { + tpmif->status = DISCONNECTING; + mask_evtchn(tpmif->evtchn); + + if(gntmap_munmap(>pmdev.map, (unsigned long)tpmif->tx, 1)) { + TPMBACK_ERR("%u/%u Error occured while trying to unmap shared page\n", (unsigned int) tpmif->domid, tpmif->handle); + } + + unbind_evtchn(tpmif->evtchn); + } + tpmif->status = DISCONNECTED; + tpmif_change_state(tpmif, XenbusStateClosed); + + /* Do the callback now */ + if(gtpmdev.close_callback) { + gtpmdev.close_callback(tpmif->domid, tpmif->handle); + } + + /* remove from array */ + remove_tpmif(tpmif); + + /* Wake up anyone possibly waiting on this interface and let them exit */ + wake_up(&waitq); + schedule(); + + /* Remove the old xenbus entries */ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_rm(XBT_NIL, path))) { + TPMBACK_ERR("Error cleaning up xenbus entries path=%s error=%s\n", path, err); + free(err); + } + + TPMBACK_LOG("Frontend %u/%u disconnected\n", (unsigned int) tpmif->domid, tpmif->handle); + + /* free memory */ + __free_tpmif(tpmif); + +} + +/********************** + * REMAINING TPMBACK FUNCTIONS + * ********************/ + +/*Event channel handler */ +void tpmback_handler(evtchn_port_t port, struct pt_regs *regs, void *data) +{ + tpmif_t* tpmif = (tpmif_t*) data; + tpmif_tx_request_t* tx = &tpmif->tx->ring[0].req; + /* Throw away 0 size events, these can trigger from event channel unmasking */ + if(tx->size == 0) + return; + + TPMBACK_DEBUG("EVENT CHANNEL FIRE %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + tpmif_req_ready(tpmif); + wake_up(&waitq); + +} + +/* Connect to frontend */ +int connect_fe(tpmif_t* tpmif) +{ + char path[512]; + char* err, *value; + uint32_t domid; + grant_ref_t ringref; + evtchn_port_t evtchn; + + /* If already connected then quit */ + if (tpmif->status == CONNECTED) { + TPMBACK_DEBUG("%u/%u tried to connect while it was already connected?\n", (unsigned int) tpmif->domid, tpmif->handle); + return 0; + } + + /* Fetch the grant reference */ + snprintf(path, 512, "%s/ring-ref", tpmif->fe_path); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s) Error = %s", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &ringref) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + + /* Fetch the event channel*/ + snprintf(path, 512, "%s/event-channel", tpmif->fe_path); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMBACK_ERR("Error creating new tpm instance xenbus_read(%s) Error = %s", path, err); + free(err); + return -1; + } + if(sscanf(value, "%d", &evtchn) != 1) { + TPMBACK_ERR("Non integer value (%s) in %s ??\n", value, path); + free(value); + return -1; + } + free(value); + + domid = tpmif->domid; + if((tpmif->tx = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &ringref, PROT_READ | PROT_WRITE)) == NULL) { + TPMBACK_ERR("Failed to map grant reference %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + return -1; + } + memset(tpmif->tx, 0, PAGE_SIZE); + + /*Bind the event channel */ + if((evtchn_bind_interdomain(tpmif->domid, evtchn, tpmback_handler, tpmif, &tpmif->evtchn))) + { + TPMBACK_ERR("%u/%u Unable to bind to interdomain event channel!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error_post_map; + } + unmask_evtchn(tpmif->evtchn); + + /* Write the ready flag and change status to connected */ + snprintf(path, 512, "backend/vtpm/%u/%u", (unsigned int) tpmif->domid, tpmif->handle); + if((err = xenbus_printf(XBT_NIL, path, "ready", "%u", 1))) { + TPMBACK_ERR("%u/%u Unable to write ready flag on connect_fe()\n", (unsigned int) tpmif->domid, tpmif->handle); + free(err); + goto error_post_evtchn; + } + tpmif->status = CONNECTED; + if((tpmif_change_state(tpmif, XenbusStateConnected))){ + goto error_post_evtchn; + } + + TPMBACK_LOG("Frontend %u/%u connected\n", (unsigned int) tpmif->domid, tpmif->handle); + + return 0; +error_post_evtchn: + mask_evtchn(tpmif->evtchn); + unbind_evtchn(tpmif->evtchn); +error_post_map: + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->tx, 1); + return -1; +} + +static int frontend_changed(tpmif_t* tpmif) +{ + int state = xenbus_read_integer(tpmif->fe_state_path); + if(state < 0) { + state = XenbusStateUnknown; + } + + TPMBACK_DEBUG("Frontend %u/%u state changed to %d\n", (unsigned int) tpmif->domid, tpmif->handle, state); + + switch (state) { + case XenbusStateInitialising: + case XenbusStateInitialised: + break; + + case XenbusStateConnected: + if(connect_fe(tpmif)) { + TPMBACK_ERR("Failed to connect to front end %u/%u\n", (unsigned int) tpmif->domid, tpmif->handle); + tpmif_change_state(tpmif, XenbusStateClosed); + return -1; + } + break; + + case XenbusStateClosing: + tpmif_change_state(tpmif, XenbusStateClosing); + break; + + case XenbusStateUnknown: /* keep it here */ + case XenbusStateClosed: + free_tpmif(tpmif); + break; + + default: + TPMBACK_DEBUG("BAD STATE CHANGE %u/%u state = %d for tpmif\n", (unsigned int) tpmif->domid, tpmif->handle, state); + return -1; + } + return 0; +} + + +/* parses the string that comes out of xenbus_watch_wait_return. */ +static int parse_eventstr(const char* evstr, domid_t* domid, unsigned int* handle) +{ + int ret; + char cmd[40]; + char* err; + char* value; + unsigned int udomid = 0; + tpmif_t* tpmif; + /* First check for new frontends, this occurs when /backend/vtpm// gets created. Note we what the sscanf to fail on the last %s */ + if (sscanf(evstr, "backend/vtpm/%u/%u/%40s", &udomid, handle, cmd) == 2) { + *domid = udomid; + /* Make sure the entry exists, if this event triggers because the entry dissapeared then ignore it */ + if((err = xenbus_read(XBT_NIL, evstr, &value))) { + free(err); + return EV_NONE; + } + free(value); + /* Make sure the tpmif entry does not already exist, this should not happen */ + if((tpmif = get_tpmif(*domid, *handle)) != NULL) { + TPMBACK_DEBUG("Duplicate tpm entries! %u %u\n", tpmif->domid, tpmif->handle); + return EV_NONE; + } + return EV_NEWFE; + } else if((ret = sscanf(evstr, "/local/domain/%u/device/vtpm/%u/%40s", &udomid, handle, cmd)) == 3) { + *domid = udomid; + if (!strcmp(cmd, "state")) + return EV_STCHNG; + } + return EV_NONE; +} + +void handle_backend_event(char* evstr) { + tpmif_t* tpmif; + domid_t domid; + unsigned int handle; + int event; + + TPMBACK_DEBUG("Xenbus Event: %s\n", evstr); + + event = parse_eventstr(evstr, &domid, &handle); + + switch(event) { + case EV_NEWFE: + if(new_tpmif(domid, handle) == NULL) { + TPMBACK_ERR("Failed to create new tpm instance %u/%u\n", (unsigned int) domid, handle); + } + wake_up(&waitq); + break; + case EV_STCHNG: + if((tpmif = get_tpmif(domid, handle))) { + frontend_changed(tpmif); + } else { + TPMBACK_DEBUG("Event Received for non-existant tpm! instance=%u/%u xenbus_event=%s\n", (unsigned int) domid, handle, evstr); + } + break; + } +} + +/* Runs through the given path and creates events recursively + * for all of its children. + * @path - xenstore path to scan */ +static void generate_backend_events(const char* path) +{ + char* err; + int i, len; + char **dirs; + char *entry; + + if((err = xenbus_ls(XBT_NIL, path, &dirs)) != NULL) { + free(err); + return; + } + + for(i = 0; dirs[i] != NULL; ++i) { + len = strlen(path) + strlen(dirs[i]) + 2; + entry = malloc(len); + snprintf(entry, len, "%s/%s", path, dirs[i]); + + /* Generate and handle event for the entry itself */ + handle_backend_event(entry); + + /* Do children */ + generate_backend_events(entry); + + /* Cleanup */ + free(entry); + free(dirs[i]); + } + free(dirs); + return; +} + +unsigned char* tpmback_get_uuid(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + if((tpmif = get_tpmif(domid, handle)) == NULL) { + TPMBACK_DEBUG("get_uuid() failed, %u/%u is an invalid frontend\n", (unsigned int) domid, handle); + return NULL; + } + + return tpmif->uuid; +} + +void tpmback_set_open_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.open_callback = cb; +} +void tpmback_set_close_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.close_callback = cb; +} +void tpmback_set_suspend_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.suspend_callback = cb; +} +void tpmback_set_resume_callback(void (*cb)(domid_t, unsigned int)) +{ + gtpmdev.resume_callback = cb; +} + +static void event_listener(void) +{ + const char* bepath = "backend/vtpm"; + char **path; + char* err; + + /* Setup the backend device watch */ + if((err = xenbus_watch_path_token(XBT_NIL, bepath, bepath, >pmdev.events)) != NULL) { + TPMBACK_ERR("xenbus_watch_path_token(%s) failed with error %s!\n", bepath, err); + free(err); + goto egress; + } + + /* Check for any frontends that connected before we set the watch. + * This is almost guaranteed to happen if both domains are started + * immediatly one after the other. + * We do this by manually generating events on everything in the backend + * path */ + generate_backend_events(bepath); + + /* Wait and listen for changes in frontend connections */ + while(1) { + path = xenbus_wait_for_watch_return(>pmdev.events); + + /*If quit flag was set then exit */ + if(gtpmdev.flags & TPMIF_CLOSED) { + TPMBACK_DEBUG("listener thread got quit event. Exiting..\n"); + free(path); + break; + } + handle_backend_event(*path); + free(path); + + } + + if((err = xenbus_unwatch_path_token(XBT_NIL, bepath, bepath)) != NULL) { + free(err); + } +egress: + return; +} + +void event_thread(void* p) { + event_listener(); +} + +void init_tpmback(void) +{ + if(!globalinit) { + init_waitqueue_head(&waitq); + globalinit = 1; + } + printk("============= Init TPM BACK ================\n"); + gtpmdev.tpmlist = malloc(sizeof(tpmif_t*) * DEF_ARRAY_SIZE); + gtpmdev.num_alloc = DEF_ARRAY_SIZE; + gtpmdev.num_tpms = 0; + gtpmdev.flags = 0; + + gtpmdev.open_callback = gtpmdev.close_callback = NULL; + gtpmdev.suspend_callback = gtpmdev.resume_callback = NULL; + + eventthread = create_thread("tpmback-listener", event_thread, NULL); + +} + +void shutdown_tpmback(void) +{ + /* Disable callbacks */ + gtpmdev.open_callback = gtpmdev.close_callback = NULL; + gtpmdev.suspend_callback = gtpmdev.resume_callback = NULL; + + TPMBACK_LOG("Shutting down tpm backend\n"); + /* Set the quit flag */ + gtpmdev.flags = TPMIF_CLOSED; + + //printk("num tpms is %d\n", gtpmdev.num_tpms); + /*Free all backend instances */ + while(gtpmdev.num_tpms) { + free_tpmif(gtpmdev.tpmlist[0]); + } + free(gtpmdev.tpmlist); + gtpmdev.tpmlist = NULL; + gtpmdev.num_alloc = 0; + + /* Wake up anyone possibly waiting on the device and let them exit */ + wake_up(&waitq); + schedule(); +} + +inline void init_tpmcmd(tpmcmd_t* tpmcmd, domid_t domid, unsigned int handle, unsigned char uuid[16]) +{ + tpmcmd->domid = domid; + tpmcmd->handle = handle; + memcpy(tpmcmd->uuid, uuid, sizeof(tpmcmd->uuid)); + tpmcmd->req = NULL; + tpmcmd->req_len = 0; + tpmcmd->resp = NULL; + tpmcmd->resp_len = 0; +} + +tpmcmd_t* get_request(tpmif_t* tpmif) { + tpmcmd_t* cmd; + tpmif_tx_request_t* tx; + int offset; + int tocopy; + int i; + uint32_t domid; + int flags; + + local_irq_save(flags); + + /* Allocate the cmd object to hold the data */ + if((cmd = malloc(sizeof(*cmd))) == NULL) { + goto error; + } + init_tpmcmd(cmd, tpmif->domid, tpmif->handle, tpmif->uuid); + + tx = &tpmif->tx->ring[0].req; + cmd->req_len = tx->size; + /* Allocate the buffer */ + if(cmd->req_len) { + if((cmd->req = malloc(cmd->req_len)) == NULL) { + goto error; + } + } + /* Copy the bits from the shared pages */ + offset = 0; + for(i = 0; i < TPMIF_TX_RING_SIZE && offset < cmd->req_len; ++i) { + tx = &tpmif->tx->ring[i].req; + + /* Map the page with the data */ + domid = (uint32_t)tpmif->domid; + if((tpmif->pages[i] = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &tx->ref, PROT_READ)) == NULL) { + TPMBACK_ERR("%u/%u Unable to map shared page during read!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + + /* do the copy now */ + tocopy = min(cmd->req_len - offset, PAGE_SIZE); + memcpy(&cmd->req[offset], tpmif->pages[i], tocopy); + offset += tocopy; + + /* release the page */ + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->pages[i], 1); + + } + +#ifdef TPMBACK_PRINT_DEBUG + TPMBACK_DEBUG("Received Tpm Command from %u/%u of size %u", (unsigned int) tpmif->domid, tpmif->handle, cmd->req_len); + for(i = 0; i < cmd->req_len; ++i) { + if (!(i % 30)) { + TPMBACK_DEBUG_MORE("\n"); + } + TPMBACK_DEBUG_MORE("%02hhX ", cmd->req[i]); + } + TPMBACK_DEBUG_MORE("\n\n"); +#endif + + local_irq_restore(flags); + return cmd; +error: + if(cmd != NULL) { + if (cmd->req != NULL) { + free(cmd->req); + cmd->req = NULL; + } + free(cmd); + cmd = NULL; + } + local_irq_restore(flags); + return NULL; + +} + +void send_response(tpmcmd_t* cmd, tpmif_t* tpmif) +{ + tpmif_tx_request_t* tx; + int offset; + int i; + uint32_t domid; + int tocopy; + int flags; + + local_irq_save(flags); + + tx = &tpmif->tx->ring[0].req; + tx->size = cmd->resp_len; + + offset = 0; + for(i = 0; i < TPMIF_TX_RING_SIZE && offset < cmd->resp_len; ++i) { + tx = &tpmif->tx->ring[i].req; + + /* Map the page with the data */ + domid = (uint32_t)tpmif->domid; + if((tpmif->pages[i] = gntmap_map_grant_refs(>pmdev.map, 1, &domid, 0, &tx->ref, PROT_WRITE)) == NULL) { + TPMBACK_ERR("%u/%u Unable to map shared page during write!\n", (unsigned int) tpmif->domid, tpmif->handle); + goto error; + } + + /* do the copy now */ + tocopy = min(cmd->resp_len - offset, PAGE_SIZE); + memcpy(tpmif->pages[i], &cmd->resp[offset], tocopy); + offset += tocopy; + + /* release the page */ + gntmap_munmap(>pmdev.map, (unsigned long)tpmif->pages[i], 1); + + } + +#ifdef TPMBACK_PRINT_DEBUG + TPMBACK_DEBUG("Sent response to %u/%u of size %u", (unsigned int) tpmif->domid, tpmif->handle, cmd->resp_len); + for(i = 0; i < cmd->resp_len; ++i) { + if (!(i % 30)) { + TPMBACK_DEBUG_MORE("\n"); + } + TPMBACK_DEBUG_MORE("%02hhX ", cmd->resp[i]); + } + TPMBACK_DEBUG_MORE("\n\n"); +#endif + /* clear the ready flag and send the event channel notice to the frontend */ + tpmif_req_finished(tpmif); + notify_remote_via_evtchn(tpmif->evtchn); +error: + local_irq_restore(flags); + return; +} + +tpmcmd_t* tpmback_req_any(void) +{ + int i; + /* Block until something has a request */ + wait_event(waitq, (gtpmdev.flags & (TPMIF_REQ_READY | TPMIF_CLOSED))); + + /* Check if were shutting down */ + if(gtpmdev.flags & TPMIF_CLOSED) { + /* if something was waiting for us to give up the queue so it can shutdown, let it finish */ + schedule(); + return NULL; + } + + for(i = 0; i < gtpmdev.num_tpms; ++i) { + if(gtpmdev.tpmlist[i]->flags & TPMIF_REQ_READY) { + return get_request(gtpmdev.tpmlist[i]); + } + } + + TPMBACK_ERR("backend request ready flag was set but no interfaces were actually ready\n"); + return NULL; +} + +tpmcmd_t* tpmback_req(domid_t domid, unsigned int handle) +{ + tpmif_t* tpmif; + tpmif = get_tpmif(domid, handle); + if(tpmif == NULL) { + return NULL; + } + + wait_event(waitq, (tpmif->flags & (TPMIF_REQ_READY | TPMIF_CLOSED) || gtpmdev.flags & TPMIF_CLOSED)); + + /* Check if were shutting down */ + if(tpmif->flags & TPMIF_CLOSED || gtpmdev.flags & TPMIF_CLOSED) { + /* if something was waiting for us to give up the queue so it can free this instance, let it finish */ + schedule(); + return NULL; + } + + return get_request(tpmif); +} + +void tpmback_resp(tpmcmd_t* tpmcmd) +{ + tpmif_t* tpmif; + + /* Get the associated interface, if it doesnt exist then just quit */ + tpmif = get_tpmif(tpmcmd->domid, tpmcmd->handle); + if(tpmif == NULL) { + TPMBACK_ERR("Tried to send a reponse to non existant frontend %u/%u\n", (unsigned int) tpmcmd->domid, tpmcmd->handle); + goto end; + } + + if(!(tpmif->flags & TPMIF_REQ_READY)) { + TPMBACK_ERR("Tried to send response to a frontend that was not waiting for one %u/%u\n", (unsigned int) tpmcmd->domid, tpmcmd->handle); + goto end; + } + + /* Send response to frontend */ + send_response(tpmcmd, tpmif); + +end: + if(tpmcmd->req != NULL) { + free(tpmcmd->req); + } + free(tpmcmd); + return; +} + +int tpmback_wait_for_frontend_connect(domid_t *domid, unsigned int *handle) +{ + tpmif_t* tpmif; + int flags; + wait_event(waitq, ((gtpmdev.num_tpms > 0) || gtpmdev.flags & TPMIF_CLOSED)); + if(gtpmdev.flags & TPMIF_CLOSED) { + return -1; + } + local_irq_save(flags); + tpmif = gtpmdev.tpmlist[0]; + *domid = tpmif->domid; + *handle = tpmif->handle; + local_irq_restore(flags); + + return 0; +} + +int tpmback_num_frontends(void) +{ + return gtpmdev.num_tpms; +} diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c new file mode 100644 index 0000000..0218d7f --- /dev/null +++ b/extras/mini-os/tpmfront.c @@ -0,0 +1,608 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * This code has been derived from drivers/char/tpm_vtpm.c + * from the xen 2.6.18 linux kernel + * + * Copyright (C) 2006 IBM Corporation + * + * This code has also been derived from drivers/char/tpm_xen.c + * from the xen 2.6.18 linux kernel + * + * Copyright (c) 2005, IBM Corporation + * + * which was itself derived from drivers/xen/netfront/netfront.c + * from the linux kernel + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define TPMFRONT_PRINT_DEBUG +#ifdef TPMFRONT_PRINT_DEBUG +#define TPMFRONT_DEBUG(fmt,...) printk("Tpmfront:Debug("__FILE__":%d) " fmt, __LINE__, ##__VA_ARGS__) +#define TPMFRONT_DEBUG_MORE(fmt,...) printk(fmt, ##__VA_ARGS__) +#else +#define TPMFRONT_DEBUG(fmt,...) +#endif +#define TPMFRONT_ERR(fmt,...) printk("Tpmfront:Error " fmt, ##__VA_ARGS__) +#define TPMFRONT_LOG(fmt,...) printk("Tpmfront:Info " fmt, ##__VA_ARGS__) + +#define min(a,b) (((a) < (b)) ? (a) : (b)) + +void tpmfront_handler(evtchn_port_t port, struct pt_regs *regs, void *data) { + struct tpmfront_dev* dev = (struct tpmfront_dev*) data; + /*If we get a response when we didnt make a request, just ignore it */ + if(!dev->waiting) { + return; + } + + dev->waiting = 0; +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].read = 1; + } +#endif + wake_up(&dev->waitq); +} + +static int publish_xenbus(struct tpmfront_dev* dev) { + xenbus_transaction_t xbt; + int retry; + char* err; + /* Write the grant reference and event channel to xenstore */ +again: + if((err = xenbus_transaction_start(&xbt))) { + TPMFRONT_ERR("Unable to start xenbus transaction, error was %s\n", err); + free(err); + return -1; + } + + if((err = xenbus_printf(xbt, dev->nodename, "ring-ref", "%u", (unsigned int) dev->ring_ref))) { + TPMFRONT_ERR("Unable to write %s/ring-ref, error was %s\n", dev->nodename, err); + free(err); + goto abort_transaction; + } + + if((err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", (unsigned int) dev->evtchn))) { + TPMFRONT_ERR("Unable to write %s/event-channel, error was %s\n", dev->nodename, err); + free(err); + goto abort_transaction; + } + + if((err = xenbus_transaction_end(xbt, 0, &retry))) { + TPMFRONT_ERR("Unable to complete xenbus transaction, error was %s\n", err); + free(err); + return -1; + } + if(retry) { + goto again; + } + + return 0; +abort_transaction: + if((err = xenbus_transaction_end(xbt, 1, &retry))) { + free(err); + } + return -1; +} + +static int wait_for_backend_connect(xenbus_event_queue* events, char* path) +{ + int state; + + TPMFRONT_LOG("Waiting for backend connection..\n"); + /* Wait for the backend to connect */ + while(1) { + state = xenbus_read_integer(path); + if ( state < 0) + state = XenbusStateUnknown; + switch(state) { + /* Bad states, we quit with error */ + case XenbusStateUnknown: + case XenbusStateClosing: + case XenbusStateClosed: + TPMFRONT_ERR("Unable to connect to backend\n"); + return -1; + /* If backend is connected then break out of loop */ + case XenbusStateConnected: + TPMFRONT_LOG("Backend Connected\n"); + return 0; + default: + xenbus_wait_for_watch(events); + } + } + +} + +static int wait_for_backend_closed(xenbus_event_queue* events, char* path) +{ + int state; + + TPMFRONT_LOG("Waiting for backend to close..\n"); + while(1) { + state = xenbus_read_integer(path); + if ( state < 0) + state = XenbusStateUnknown; + switch(state) { + case XenbusStateUnknown: + TPMFRONT_ERR("Backend Unknown state, forcing shutdown\n"); + return -1; + case XenbusStateClosed: + TPMFRONT_LOG("Backend Closed\n"); + return 0; + default: + xenbus_wait_for_watch(events); + } + } + +} + +static int wait_for_backend_state_changed(struct tpmfront_dev* dev, XenbusState state) { + char* err; + int ret = 0; + xenbus_event_queue events = NULL; + char path[512]; + + snprintf(path, 512, "%s/state", dev->bepath); + /*Setup the watch to wait for the backend */ + if((err = xenbus_watch_path_token(XBT_NIL, path, path, &events))) { + TPMFRONT_ERR("Could not set a watch on %s, error was %s\n", path, err); + free(err); + return -1; + } + + /* Do the actual wait loop now */ + switch(state) { + case XenbusStateConnected: + ret = wait_for_backend_connect(&events, path); + break; + case XenbusStateClosed: + ret = wait_for_backend_closed(&events, path); + break; + default: + break; + } + + if((err = xenbus_unwatch_path_token(XBT_NIL, path, path))) { + TPMFRONT_ERR("Unable to unwatch %s, error was %s, ignoring..\n", path, err); + free(err); + } + return ret; +} + +static int tpmfront_connect(struct tpmfront_dev* dev) +{ + char* err; + /* Create shared page */ + dev->tx = (tpmif_tx_interface_t*) alloc_page(); + if(dev->tx == NULL) { + TPMFRONT_ERR("Unable to allocate page for shared memory\n"); + goto error; + } + memset(dev->tx, 0, PAGE_SIZE); + dev->ring_ref = gnttab_grant_access(dev->bedomid, virt_to_mfn(dev->tx), 0); + TPMFRONT_DEBUG("grant ref is %lu\n", (unsigned long) dev->ring_ref); + + /*Create event channel */ + if(evtchn_alloc_unbound(dev->bedomid, tpmfront_handler, dev, &dev->evtchn)) { + TPMFRONT_ERR("Unable to allocate event channel\n"); + goto error_postmap; + } + unmask_evtchn(dev->evtchn); + TPMFRONT_DEBUG("event channel is %lu\n", (unsigned long) dev->evtchn); + + /* Write the entries to xenstore */ + if(publish_xenbus(dev)) { + goto error_postevtchn; + } + + /* Change state to connected */ + dev->state = XenbusStateConnected; + + /* Tell the backend that we are ready */ + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", dev->state))) { + TPMFRONT_ERR("Unable to write to xenstore %s/state, value=%u", dev->nodename, XenbusStateConnected); + free(err); + goto error; + } + + return 0; +error_postevtchn: + mask_evtchn(dev->evtchn); + unbind_evtchn(dev->evtchn); +error_postmap: + gnttab_end_access(dev->ring_ref); + free_page(dev->tx); +error: + return -1; +} + +struct tpmfront_dev* init_tpmfront(const char* _nodename) +{ + struct tpmfront_dev* dev; + const char* nodename; + char path[512]; + char* value, *err; + unsigned long long ival; + int i; + + printk("============= Init TPM Front ================\n"); + + dev = malloc(sizeof(struct tpmfront_dev)); + memset(dev, 0, sizeof(struct tpmfront_dev)); + +#ifdef HAVE_LIBC + dev->fd = -1; +#endif + + nodename = _nodename ? _nodename : "device/vtpm/0"; + dev->nodename = strdup(nodename); + + init_waitqueue_head(&dev->waitq); + + /* Get backend domid */ + snprintf(path, 512, "%s/backend-id", dev->nodename); + if((err = xenbus_read(XBT_NIL, path, &value))) { + TPMFRONT_ERR("Unable to read %s during tpmfront initialization! error = %s\n", path, err); + free(err); + goto error; + } + if(sscanf(value, "%llu", &ival) != 1) { + TPMFRONT_ERR("%s has non-integer value (%s)\n", path, value); + free(value); + goto error; + } + free(value); + dev->bedomid = ival; + + /* Get backend xenstore path */ + snprintf(path, 512, "%s/backend", dev->nodename); + if((err = xenbus_read(XBT_NIL, path, &dev->bepath))) { + TPMFRONT_ERR("Unable to read %s during tpmfront initialization! error = %s\n", path, err); + free(err); + goto error; + } + + /* Create and publish grant reference and event channel */ + if (tpmfront_connect(dev)) { + goto error; + } + + /* Wait for backend to connect */ + if( wait_for_backend_state_changed(dev, XenbusStateConnected)) { + goto error; + } + + /* Allocate pages that will contain the messages */ + dev->pages = malloc(sizeof(void*) * TPMIF_TX_RING_SIZE); + if(dev->pages == NULL) { + goto error; + } + memset(dev->pages, 0, sizeof(void*) * TPMIF_TX_RING_SIZE); + for(i = 0; i < TPMIF_TX_RING_SIZE; ++i) { + dev->pages[i] = (void*)alloc_page(); + if(dev->pages[i] == NULL) { + goto error; + } + } + + TPMFRONT_LOG("Initialization Completed successfully\n"); + + return dev; + +error: + shutdown_tpmfront(dev); + return NULL; +} +void shutdown_tpmfront(struct tpmfront_dev* dev) +{ + char* err; + char path[512]; + int i; + tpmif_tx_request_t* tx; + if(dev == NULL) { + return; + } + TPMFRONT_LOG("Shutting down tpmfront\n"); + /* disconnect */ + if(dev->state == XenbusStateConnected) { + dev->state = XenbusStateClosing; + //FIXME: Transaction for this? + /* Tell backend we are closing */ + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", (unsigned int) dev->state))) { + free(err); + } + + /* Clean up xenstore entries */ + snprintf(path, 512, "%s/event-channel", dev->nodename); + if((err = xenbus_rm(XBT_NIL, path))) { + free(err); + } + snprintf(path, 512, "%s/ring-ref", dev->nodename); + if((err = xenbus_rm(XBT_NIL, path))) { + free(err); + } + + /* Tell backend we are closed */ + dev->state = XenbusStateClosed; + if((err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%u", (unsigned int) dev->state))) { + TPMFRONT_ERR("Unable to write to %s, error was %s", dev->nodename, err); + free(err); + } + + /* Wait for the backend to close and unmap shared pages, ignore any errors */ + wait_for_backend_state_changed(dev, XenbusStateClosed); + + /* Cleanup any shared pages */ + if(dev->pages) { + for(i = 0; i < TPMIF_TX_RING_SIZE; ++i) { + if(dev->pages[i]) { + tx = &dev->tx->ring[i].req; + if(tx->ref != 0) { + gnttab_end_access(tx->ref); + } + free_page(dev->pages[i]); + } + } + free(dev->pages); + } + + /* Close event channel and unmap shared page */ + mask_evtchn(dev->evtchn); + unbind_evtchn(dev->evtchn); + gnttab_end_access(dev->ring_ref); + + free_page(dev->tx); + + } + + /* Cleanup memory usage */ + if(dev->respbuf) { + free(dev->respbuf); + } + if(dev->bepath) { + free(dev->bepath); + } + if(dev->nodename) { + free(dev->nodename); + } + free(dev); +} + +int tpmfront_send(struct tpmfront_dev* dev, const uint8_t* msg, size_t length) +{ + int i; + tpmif_tx_request_t* tx = NULL; + /* Error Checking */ + if(dev == NULL || dev->state != XenbusStateConnected) { + TPMFRONT_ERR("Tried to send message through disconnected frontend\n"); + return -1; + } + +#ifdef TPMFRONT_PRINT_DEBUG + TPMFRONT_DEBUG("Sending Msg to backend size=%u", (unsigned int) length); + for(i = 0; i < length; ++i) { + if(!(i % 30)) { + TPMFRONT_DEBUG_MORE("\n"); + } + TPMFRONT_DEBUG_MORE("%02X ", msg[i]); + } + TPMFRONT_DEBUG_MORE("\n"); +#endif + + /* Copy to shared pages now */ + for(i = 0; length > 0 && i < TPMIF_TX_RING_SIZE; ++i) { + /* Share the page */ + tx = &dev->tx->ring[i].req; + tx->unused = 0; + tx->addr = virt_to_mach(dev->pages[i]); + tx->ref = gnttab_grant_access(dev->bedomid, virt_to_mfn(dev->pages[i]), 0); + /* Copy the bits to the page */ + tx->size = length > PAGE_SIZE ? PAGE_SIZE : length; + memcpy(dev->pages[i], &msg[i * PAGE_SIZE], tx->size); + + /* Update counters */ + length -= tx->size; + } + dev->waiting = 1; + dev->resplen = 0; +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].read = 0; + files[dev->fd].tpmfront.respgot = 0; + files[dev->fd].tpmfront.offset = 0; + } +#endif + notify_remote_via_evtchn(dev->evtchn); + return 0; +} +int tpmfront_recv(struct tpmfront_dev* dev, uint8_t** msg, size_t *length) +{ + tpmif_tx_request_t* tx; + int i; + if(dev == NULL || dev->state != XenbusStateConnected) { + TPMFRONT_ERR("Tried to receive message from disconnected frontend\n"); + return -1; + } + /*Wait for the response */ + wait_event(dev->waitq, (!dev->waiting)); + + /* Initialize */ + *msg = NULL; + *length = 0; + + /* special case, just quit */ + tx = &dev->tx->ring[0].req; + if(tx->size == 0 ) { + goto quit; + } + /* Get the total size */ + tx = &dev->tx->ring[0].req; + for(i = 0; i < TPMIF_TX_RING_SIZE && tx->size > 0; ++i) { + tx = &dev->tx->ring[i].req; + *length += tx->size; + } + /* Alloc the buffer */ + if(dev->respbuf) { + free(dev->respbuf); + } + *msg = dev->respbuf = malloc(*length); + dev->resplen = *length; + /* Copy the bits */ + tx = &dev->tx->ring[0].req; + for(i = 0; i < TPMIF_TX_RING_SIZE && tx->size > 0; ++i) { + tx = &dev->tx->ring[i].req; + memcpy(&(*msg)[i * PAGE_SIZE], dev->pages[i], tx->size); + gnttab_end_access(tx->ref); + tx->ref = 0; + } +#ifdef TPMFRONT_PRINT_DEBUG + TPMFRONT_DEBUG("Received response from backend size=%u", (unsigned int) *length); + for(i = 0; i < *length; ++i) { + if(!(i % 30)) { + TPMFRONT_DEBUG_MORE("\n"); + } + TPMFRONT_DEBUG_MORE("%02X ", (*msg)[i]); + } + TPMFRONT_DEBUG_MORE("\n"); +#endif +#ifdef HAVE_LIBC + if(dev->fd >= 0) { + files[dev->fd].tpmfront.respgot = 1; + } +#endif +quit: + return 0; +} + +int tpmfront_cmd(struct tpmfront_dev* dev, uint8_t* req, size_t reqlen, uint8_t** resp, size_t* resplen) +{ + int rc; + if((rc = tpmfront_send(dev, req, reqlen))) { + return rc; + } + if((rc = tpmfront_recv(dev, resp, resplen))) { + return rc; + } + + return 0; +} + +#ifdef HAVE_LIBC +#include +int tpmfront_open(struct tpmfront_dev* dev) +{ + /* Silently prevent multiple opens */ + if(dev->fd != -1) { + return dev->fd; + } + + dev->fd = alloc_fd(FTYPE_TPMFRONT); + printk("tpmfront_open(%s) -> %d\n", dev->nodename, dev->fd); + files[dev->fd].tpmfront.dev = dev; + files[dev->fd].tpmfront.offset = 0; + files[dev->fd].tpmfront.respgot = 0; + return dev->fd; +} + +int tpmfront_posix_write(int fd, const uint8_t* buf, size_t count) +{ + int rc; + struct tpmfront_dev* dev; + dev = files[fd].tpmfront.dev; + + if(count == 0) { + return 0; + } + + /* Return an error if we are already processing a command */ + if(dev->waiting) { + errno = EINPROGRESS; + return -1; + } + /* Send the command now */ + if((rc = tpmfront_send(dev, buf, count)) != 0) { + errno = EIO; + return -1; + } + return count; +} + +int tpmfront_posix_read(int fd, uint8_t* buf, size_t count) +{ + int rc; + uint8_t* dummybuf; + size_t dummysz; + struct tpmfront_dev* dev; + + dev = files[fd].tpmfront.dev; + + if(count == 0) { + return 0; + } + + /* get the response if we haven't already */ + if(files[dev->fd].tpmfront.respgot == 0) { + if ((rc = tpmfront_recv(dev, &dummybuf, &dummysz)) != 0) { + errno = EIO; + return -1; + } + } + + /* handle EOF case */ + if(files[dev->fd].tpmfront.offset >= dev->resplen) { + return 0; + } + + /* Compute the number of bytes and do the copy operation */ + if((rc = min(count, dev->resplen - files[dev->fd].tpmfront.offset)) != 0) { + memcpy(buf, dev->respbuf + files[dev->fd].tpmfront.offset, rc); + files[dev->fd].tpmfront.offset += rc; + } + + return rc; +} + +int tpmfront_posix_fstat(int fd, struct stat* buf) +{ + uint8_t* dummybuf; + size_t dummysz; + int rc; + struct tpmfront_dev* dev = files[fd].tpmfront.dev; + + /* If we have a response waiting, then read it now from the backend + * so we can get its length*/ + if(dev->waiting || (files[dev->fd].read == 1 && !files[dev->fd].tpmfront.respgot)) { + if ((rc = tpmfront_recv(dev, &dummybuf, &dummysz)) != 0) { + errno = EIO; + return -1; + } + } + + buf->st_mode = O_RDWR; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_size = dev->resplen; + buf->st_atime = buf->st_mtime = buf->st_ctime = time(NULL); + + return 0; +} + + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sp-00050v-Ln; Thu, 01 Nov 2012 20:34:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1So-00050f-5v for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:06 +0000 Received: from [85.158.143.99:6368] by server-2.bemta-4.messagelabs.com id B7/4C-28922-DBCD2905; Thu, 01 Nov 2012 20:34:05 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-4.tower-216.messagelabs.com!1351802043!22999381!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11977 invoked from network); 1 Nov 2012 20:34:04 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-4.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:04 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030877; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:27 -0400 Message-Id: <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org lseek always used files[fd].file.offset. It should use the offset of whatever union member is actually being used. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index d212969..d108920 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -360,45 +360,54 @@ int write(int fd, const void *buf, size_t nbytes) off_t lseek(int fd, off_t offset, int whence) { + off_t* target = NULL; switch(files[fd].type) { -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONFIG_TPM_TIS) #ifdef CONFIG_BLKFRONT case FTYPE_BLK: + target = &files[fd].blk.offset; + break; #endif #ifdef CONFIG_TPMFRNT case FTYPE_TPMFRONT: + target = &files[fd].tpmfront.offset; + break; #endif #ifdef CONFIG_TPM_TIS case FTYPE_TPM_TIS: + target = &files[fd].tpm_tis.offset; + break; #endif - switch (whence) { - case SEEK_SET: - files[fd].file.offset = offset; - break; - case SEEK_CUR: - files[fd].file.offset += offset; - break; - case SEEK_END: - { - struct stat st; - int ret; - ret = fstat(fd, &st); - if (ret) - return -1; - files[fd].file.offset = st.st_size + offset; - break; - } - default: - errno = EINVAL; - return -1; - } - return files[fd].file.offset; - break; -#endif - default: /* Not implemented on this FTYPE */ - errno = ESPIPE; - return (off_t) -1; + case FTYPE_FILE: + target = &files[fd].file.offset; + break; + default: + /* Not implemented for this filetype */ + errno = ESPIPE; + return (off_t) -1; + } + + switch (whence) { + case SEEK_SET: + *target = offset; + break; + case SEEK_CUR: + *target += offset; + break; + case SEEK_END: + { + struct stat st; + int ret; + ret = fstat(fd, &st); + if (ret) + return -1; + *target = st.st_size + offset; + break; + } + default: + errno = EINVAL; + return -1; } + return *target; } int fsync(int fd) { -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:34:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:34:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Sp-00050v-Ln; Thu, 01 Nov 2012 20:34:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1So-00050f-5v for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:06 +0000 Received: from [85.158.143.99:6368] by server-2.bemta-4.messagelabs.com id B7/4C-28922-DBCD2905; Thu, 01 Nov 2012 20:34:05 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-4.tower-216.messagelabs.com!1351802043!22999381!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11977 invoked from network); 1 Nov 2012 20:34:04 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-4.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:04 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148030877; Thu, 01 Nov 2012 16:33:38 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, samuel.thibault@ens-lyon.org Date: Thu, 1 Nov 2012 16:33:27 -0400 Message-Id: <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org lseek always used files[fd].file.offset. It should use the offset of whatever union member is actually being used. Signed-off-by: Matthew Fioravante diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c index d212969..d108920 100644 --- a/extras/mini-os/lib/sys.c +++ b/extras/mini-os/lib/sys.c @@ -360,45 +360,54 @@ int write(int fd, const void *buf, size_t nbytes) off_t lseek(int fd, off_t offset, int whence) { + off_t* target = NULL; switch(files[fd].type) { -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONFIG_TPM_TIS) #ifdef CONFIG_BLKFRONT case FTYPE_BLK: + target = &files[fd].blk.offset; + break; #endif #ifdef CONFIG_TPMFRNT case FTYPE_TPMFRONT: + target = &files[fd].tpmfront.offset; + break; #endif #ifdef CONFIG_TPM_TIS case FTYPE_TPM_TIS: + target = &files[fd].tpm_tis.offset; + break; #endif - switch (whence) { - case SEEK_SET: - files[fd].file.offset = offset; - break; - case SEEK_CUR: - files[fd].file.offset += offset; - break; - case SEEK_END: - { - struct stat st; - int ret; - ret = fstat(fd, &st); - if (ret) - return -1; - files[fd].file.offset = st.st_size + offset; - break; - } - default: - errno = EINVAL; - return -1; - } - return files[fd].file.offset; - break; -#endif - default: /* Not implemented on this FTYPE */ - errno = ESPIPE; - return (off_t) -1; + case FTYPE_FILE: + target = &files[fd].file.offset; + break; + default: + /* Not implemented for this filetype */ + errno = ESPIPE; + return (off_t) -1; + } + + switch (whence) { + case SEEK_SET: + *target = offset; + break; + case SEEK_CUR: + *target += offset; + break; + case SEEK_END: + { + struct stat st; + int ret; + ret = fstat(fd, &st); + if (ret) + return -1; + *target = st.st_size + offset; + break; + } + default: + errno = EINVAL; + return -1; } + return *target; } int fsync(int fd) { -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:35:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:35:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1TX-0005BP-QA; Thu, 01 Nov 2012 20:34:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1TV-0005Az-W4 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:50 +0000 Received: from [85.158.137.99:23348] by server-8.bemta-3.messagelabs.com id C8/84-07786-9ECD2905; Thu, 01 Nov 2012 20:34:49 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351802086!12234877!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzMjEzNQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9042 invoked from network); 1 Nov 2012 20:34:48 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:48 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KYjW1006726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:34:46 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1KYidM016094 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:34:44 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1KYhG1004358; Thu, 1 Nov 2012 15:34:44 -0500 MIME-Version: 1.0 Message-ID: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Date: Thu, 1 Nov 2012 13:34:40 -0700 (PDT) From: Dan Magenheimer To: "Keir (Xen.org)" , Jan Beulich X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel@lists.xen.org Subject: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Keir and Jan -- With the plan to obsolete the x86 32-bit hypervisor at 4.3, when prototyping the "claim" hypercall/subop, can I assume that the CONFIG_X86 code in the hypervisor and, specifically any separation of the concepts of xen_heap from dom_heap, can be ignored? Or will the ARM version of the hypervisor be requiring a similar separation of xen_heap vs dom_heap? If the CONFIG_X86/separation code will no longer be used, shall I submit a patch to delete the code in page_alloc.c and memory.c? Or can you (Keir or Jan) just delete it? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:35:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:35:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1TX-0005BP-QA; Thu, 01 Nov 2012 20:34:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1TV-0005Az-W4 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:34:50 +0000 Received: from [85.158.137.99:23348] by server-8.bemta-3.messagelabs.com id C8/84-07786-9ECD2905; Thu, 01 Nov 2012 20:34:49 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351802086!12234877!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzMjEzNQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9042 invoked from network); 1 Nov 2012 20:34:48 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:34:48 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KYjW1006726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:34:46 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1KYidM016094 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:34:44 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1KYhG1004358; Thu, 1 Nov 2012 15:34:44 -0500 MIME-Version: 1.0 Message-ID: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Date: Thu, 1 Nov 2012 13:34:40 -0700 (PDT) From: Dan Magenheimer To: "Keir (Xen.org)" , Jan Beulich X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel@lists.xen.org Subject: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Keir and Jan -- With the plan to obsolete the x86 32-bit hypervisor at 4.3, when prototyping the "claim" hypercall/subop, can I assume that the CONFIG_X86 code in the hypervisor and, specifically any separation of the concepts of xen_heap from dom_heap, can be ignored? Or will the ARM version of the hypervisor be requiring a similar separation of xen_heap vs dom_heap? If the CONFIG_X86/separation code will no longer be used, shall I submit a patch to delete the code in page_alloc.c and memory.c? Or can you (Keir or Jan) just delete it? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:35:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:35:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1U1-0005IR-8B; Thu, 01 Nov 2012 20:35:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Ty-0005Hl-NV for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:35:19 +0000 Received: from [85.158.138.51:27704] by server-5.bemta-3.messagelabs.com id 7B/B4-26311-60DD2905; Thu, 01 Nov 2012 20:35:18 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-174.messagelabs.com!1351802113!28289966!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25710 invoked from network); 1 Nov 2012 20:35:15 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:35:15 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031095; Thu, 01 Nov 2012 16:35:09 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Date: Thu, 1 Nov 2012 16:34:56 -0400 Message-Id: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 5/9] add vtpm support to libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch adds vtpm support to libxl. It adds vtpm parsing to config files and 3 new xl commands: vtpm-attach vtpm-detach vtpm-list Signed-off-by: Matthew Fioravante diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 428da21..fe4fac9 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -298,6 +298,35 @@ Specifies the networking provision (both emulated network adapters, and Xen virtual interfaces) to provided to the guest. See F. +=item B + +Specifies the virtual trusted platform module to be +provided to the guest. Please see F +for more details. + +Each B is a comma-separated list of C +settings, from the following list: + +=over 4 + +=item C + +Specify the backend domain name of id. This value is required! +If this domain is a guest, the backend should be set to the +vtpm domain name. If this domain is a vtpm, the +backend should be set to the vtpm manager domain name. + +=item C + +Specify the uuid of this vtpm device. The uuid is used to uniquely +identify the vtpm device. You can create one using the uuidgen +program on unix systems. If left unspecified, a new uuid +will be randomly generated every time the domain boots. +If this is a vtpm domain, you should specify a value. The +value is optional if this is a guest domain. + +=back + =item B Specifies the paravirtual framebuffer devices which should be supplied diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 7b1f2cf..097fe43 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1106,6 +1106,31 @@ List virtual network interfaces for a domain. =back +=head2 VTPM DEVICES + +=over 4 + +=item B I I + +Creates a new vtpm device in the domain specified by I. +I describes the device to attach, using the same format as the +B string in the domain config file. See L for +more information. + +=item B I I + +Removes the vtpm device from the domain specified by I. +I is the numeric device id given to the virtual trusted +platform module device. You will need to run B to determine that number. +Alternatively the I of the vtpm can be used to +select the virtual device to detach. + +=item B I + +List virtual trusted platform modules for a domain. + +=back + =head1 PCI PASS-THROUGH =over 4 diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 665385b..be457f4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1710,6 +1710,243 @@ out: } /******************************************************************************/ +int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm) +{ + if(libxl_uuid_is_nil(&vtpm->uuid)) { + libxl_uuid_generate(&vtpm->uuid); + } + return 0; +} + +static int libxl__device_from_vtpm(libxl__gc *gc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__device *device) +{ + device->backend_devid = vtpm->devid; + device->backend_domid = vtpm->backend_domid; + device->backend_kind = LIBXL__DEVICE_KIND_VTPM; + device->devid = vtpm->devid; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_VTPM; + + return 0; +} + +void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + flexarray_t *front; + flexarray_t *back; + libxl__device *device; + char *dompath, **l; + unsigned int nb, rc; + + rc = libxl__device_vtpm_setdefault(gc, vtpm); + if (rc) goto out; + + front = flexarray_make(gc, 16, 1); + back = flexarray_make(gc, 16, 1); + + if(vtpm->devid == -1) { + if (!(dompath = libxl__xs_get_dompath(gc, domid))) { + rc = ERROR_FAIL; + goto out; + } + l = libxl__xs_directory(gc, XBT_NULL, + GCSPRINTF("%s/device/vtpm", dompath), &nb); + if(l == NULL || nb == 0) { + vtpm->devid = 0; + } else { + vtpm->devid = strtoul(l[nb - 1], NULL, 10) + 1; + } + } + + GCNEW(device); + rc = libxl__device_from_vtpm(gc, domid, vtpm, device); + if ( rc != 0 ) goto out; + + flexarray_append(back, "frontend-id"); + flexarray_append(back, GCSPRINTF("%d", domid)); + flexarray_append(back, "online"); + flexarray_append(back, "1"); + flexarray_append(back, "state"); + flexarray_append(back, GCSPRINTF("%d", 1)); + flexarray_append(back, "handle"); + flexarray_append(back, GCSPRINTF("%d", vtpm->devid)); + + flexarray_append(back, "uuid"); + flexarray_append(back, GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(vtpm->uuid))); + flexarray_append(back, "resume"); + flexarray_append(back, "False"); + + flexarray_append(front, "backend-id"); + flexarray_append(front, GCSPRINTF("%d", vtpm->backend_domid)); + flexarray_append(front, "state"); + flexarray_append(front, GCSPRINTF("%d", 1)); + flexarray_append(front, "handle"); + flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); + + libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back, back->count), + libxl__xs_kvs_of_flexarray(gc, front, front->count)); + + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + + rc = 0; +out: + aodev->rc = rc; + if(rc) aodev->callback(egc, aodev); + return; +} + +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num) +{ + GC_INIT(ctx); + + libxl_device_vtpm* vtpms = NULL; + char* fe_path = NULL; + char** dir = NULL; + unsigned int ndirs = 0; + + *num = 0; + + fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); + dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); + if(dir) { + vtpms = malloc(sizeof(*vtpms) * ndirs); + libxl_device_vtpm* vtpm; + libxl_device_vtpm* end = vtpms + ndirs; + for(vtpm = vtpms; vtpm < end; ++vtpm, ++dir) { + char* tmp; + const char* be_path = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s/backend", + fe_path, *dir)); + + vtpm->devid = atoi(*dir); + + tmp = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s/backend_id", + fe_path, *dir)); + vtpm->backend_domid = atoi(tmp); + + tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); + if(tmp) { + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); + exit(1); + } + } + } + } + *num = ndirs; + + GC_FREE; + return vtpms; +} + +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, + uint32_t domid, + libxl_device_vtpm *vtpm, + libxl_vtpminfo *vtpminfo) +{ + GC_INIT(ctx); + char *dompath, *vtpmpath; + char *val; + int rc = 0; + + libxl_vtpminfo_init(vtpminfo); + dompath = libxl__xs_get_dompath(gc, domid); + vtpminfo->devid = vtpm->devid; + + vtpmpath = GCSPRINTF("%s/device/vtpm/%d", dompath, vtpminfo->devid); + vtpminfo->backend = xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/backend", vtpmpath), NULL); + if (!vtpminfo->backend) { + goto err; + } + if(!libxl__xs_read(gc, XBT_NULL, vtpminfo->backend)) { + goto err; + } + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/backend-id", vtpmpath)); + vtpminfo->backend_id = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/state", vtpmpath)); + vtpminfo->state = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/event-channel", vtpmpath)); + vtpminfo->evtch = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/ring-ref", vtpmpath)); + vtpminfo->rref = val ? strtoul(val, NULL, 10) : -1; + + vtpminfo->frontend = xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/frontend", vtpminfo->backend), NULL); + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/frontend-id", vtpminfo->backend)); + vtpminfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/uuid", vtpminfo->backend)); + if(val == NULL) { + LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); + goto err; + } + if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { + LOG(ERROR, + "%s/uuid is a malformed uuid?? (%s) Probably a bug!\n", + vtpminfo->backend, val); + goto err; + } + + goto exit; +err: + rc = ERROR_FAIL; +exit: + GC_FREE; + return rc; +} + +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, + uint32_t domid, + int devid, + libxl_device_vtpm *vtpm) +{ + libxl_device_vtpm *vtpms; + int nb, i; + int rc; + + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + if (!vtpms) + return ERROR_FAIL; + + memset(vtpm, 0, sizeof (libxl_device_vtpm)); + rc = 1; + for (i = 0; i < nb; ++i) { + if(devid == vtpms[i].devid) { + vtpm->backend_domid = vtpms[i].backend_domid; + vtpm->devid = vtpms[i].devid; + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); + rc = 0; + break; + } + } + + libxl_device_vtpm_list_free(vtpms, nb); + return rc; +} + + +/******************************************************************************/ int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) { @@ -3046,6 +3283,8 @@ out: * libxl_device_disk_destroy * libxl_device_nic_remove * libxl_device_nic_destroy + * libxl_device_vtpm_remove + * libxl_device_vtpm_destroy * libxl_device_vkb_remove * libxl_device_vkb_destroy * libxl_device_vfb_remove @@ -3097,6 +3336,10 @@ DEFINE_DEVICE_REMOVE(vkb, destroy, 1) DEFINE_DEVICE_REMOVE(vfb, remove, 0) DEFINE_DEVICE_REMOVE(vfb, destroy, 1) +/* vtpm */ +DEFINE_DEVICE_REMOVE(vtpm, remove, 0) +DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) + #undef DEFINE_DEVICE_REMOVE /******************************************************************************/ @@ -3105,6 +3348,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* The following functions are defined: * libxl_device_disk_add * libxl_device_nic_add + * libxl_device_vtpm_add */ #define DEFINE_DEVICE_ADD(type) \ @@ -3131,6 +3375,9 @@ DEFINE_DEVICE_ADD(disk) /* nic */ DEFINE_DEVICE_ADD(nic) +/* vtpm */ +DEFINE_DEVICE_ADD(vtpm) + #undef DEFINE_DEVICE_ADD /******************************************************************************/ diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 7a7c419..e2ba549 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,13 +478,14 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs, num_vtpms; libxl_device_disk *disks; libxl_device_nic *nics; libxl_device_pci *pcidevs; libxl_device_vfb *vfbs; libxl_device_vkb *vkbs; + libxl_device_vtpm *vtpms; libxl_action_on_shutdown on_poweroff; libxl_action_on_shutdown on_reboot; @@ -645,6 +646,9 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, int *nb_vcpu, int *nr_vcpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); +void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms); +void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); + /* * Devices * ======= @@ -745,6 +749,23 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); +/* Virtual TPMs */ +int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_vtpm_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_vtpm_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num); +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); + /* Keyboard */ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e81747b..9d20086 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -55,6 +55,8 @@ void libxl_domain_config_dispose(libxl_domain_config *d_config) libxl_device_vkb_dispose(&d_config->vkbs[i]); free(d_config->vkbs); + libxl_device_vtpm_list_free(d_config->vtpms, d_config->num_vtpms); + libxl_domain_create_info_dispose(&d_config->c_info); libxl_domain_build_info_dispose(&d_config->b_info); } @@ -601,6 +603,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, int ret); +static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, + int ret); static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); @@ -1085,13 +1089,13 @@ static void domcreate_devmodel_started(libxl__egc *egc, if (d_config->num_nics > 0) { /* Attach nics */ libxl__multidev_begin(ao, &dcs->multidev); - dcs->multidev.callback = domcreate_attach_pci; + dcs->multidev.callback = domcreate_attach_vtpms; libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); libxl__multidev_prepared(egc, &dcs->multidev, 0); return; } - domcreate_attach_pci(egc, &dcs->multidev, 0); + domcreate_attach_vtpms(egc, &dcs->multidev, 0); return; error_out: @@ -1099,6 +1103,39 @@ error_out: domcreate_complete(egc, dcs, ret); } +static void domcreate_attach_vtpms(libxl__egc *egc, + libxl__multidev *multidev, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); + STATE_AO_GC(dcs->ao); + int domid = dcs->guest_domid; + + libxl_domain_config* const d_config = dcs->guest_config; + + if(ret) { + LOG(ERROR, "unable to add nic devices"); + goto error_out; + } + + /* Plug vtpm devices */ + if (d_config->num_vtpms > 0) { + /* Attach vtpms */ + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_attach_pci; + libxl__add_vtpms(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); + return; + } + + domcreate_attach_pci(egc, multidev, 0); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, int ret) { @@ -1112,7 +1149,7 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, libxl_domain_config *const d_config = dcs->guest_config; if (ret) { - LOG(ERROR, "unable to add nic devices"); + LOG(ERROR, "unable to add vtpm devices"); goto error_out; } diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index c3283f1..51dd06e 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -497,6 +497,7 @@ void libxl__multidev_prepared(libxl__egc *egc, * The following functions are defined: * libxl__add_disks * libxl__add_nics + * libxl__add_vtpms */ #define DEFINE_DEVICES_ADD(type) \ @@ -515,6 +516,7 @@ void libxl__multidev_prepared(libxl__egc *egc, DEFINE_DEVICES_ADD(disk) DEFINE_DEVICES_ADD(nic) +DEFINE_DEVICES_ADD(vtpm) #undef DEFINE_DEVICES_ADD diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8f220cb..cba3616 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -958,6 +958,7 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, uint32_t domid); +_hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); @@ -2007,6 +2008,10 @@ _hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl_device_nic *nic, libxl__ao_device *aodev); +_hidden void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__ao_device *aodev); + /* Internal function to connect a vkb device */ _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, libxl_device_vkb *vkb); @@ -2439,6 +2444,10 @@ _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, libxl__multidev *multidev); +_hidden void libxl__add_vtpms(libxl__egc *egc, libxl__ao *ao, uint32_t domid, + libxl_domain_config *d_config, + libxl__multidev *multidev); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de111a6..7eac4a8 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -395,6 +395,12 @@ libxl_device_pci = Struct("device_pci", [ ("permissive", bool), ]) +libxl_device_vtpm = Struct("device_vtpm", [ + ("backend_domid", libxl_domid), + ("devid", libxl_devid), + ("uuid", libxl_uuid), +]) + libxl_diskinfo = Struct("diskinfo", [ ("backend", string), ("backend_id", uint32), @@ -418,6 +424,18 @@ libxl_nicinfo = Struct("nicinfo", [ ("rref_rx", integer), ], dir=DIR_OUT) +libxl_vtpminfo = Struct("vtpminfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ("evtch", integer), + ("rref", integer), + ("uuid", libxl_uuid), + ], dir=DIR_OUT) + libxl_vcpuinfo = Struct("vcpuinfo", [ ("vcpuid", uint32), ("cpu", uint32), diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index 5ac8c9c..c40120e 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -19,6 +19,7 @@ libxl__device_kind = Enumeration("device_kind", [ (5, "VFB"), (6, "VKBD"), (7, "CONSOLE"), + (8, "VTPM"), ]) libxl__console_backend = Enumeration("console_backend", [ diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 55cd299..8f78790 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -463,6 +463,33 @@ int libxl_pipe(libxl_ctx *ctx, int pipes[2]) return 0; } +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + libxl_uuid* uuid, libxl_device_vtpm *vtpm) +{ + libxl_device_vtpm *vtpms; + int nb, i; + int rc; + + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + if (!vtpms) + return ERROR_FAIL; + + memset(vtpm, 0, sizeof (libxl_device_vtpm)); + rc = 1; + for (i = 0; i < nb; ++i) { + if(!libxl_uuid_compare(uuid, &vtpms[i].uuid)) { + vtpm->backend_domid = vtpms[i].backend_domid; + vtpm->devid = vtpms[i].devid; + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); + rc = 0; + break; + } + } + + libxl_device_vtpm_list_free(vtpms, nb); + return rc; +} + int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic) { @@ -819,6 +846,22 @@ void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) free(list); } +void libxl_vtpminfo_list_free(libxl_vtpminfo* list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_vtpminfo_dispose(&list[i]); + free(list); +} + +void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_device_vtpm_dispose(&list[i]); + free(list); +} + int libxl_domid_valid_guest(uint32_t domid) { /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 83aaac7..40f3f30 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -64,6 +64,11 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + libxl_uuid *uuid, libxl_device_vtpm *vtpm); +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + int devid, libxl_device_vtpm *vtpm); + int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 0b2f848..be6f38b 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -79,6 +79,9 @@ int main_networkdetach(int argc, char **argv); int main_blockattach(int argc, char **argv); int main_blocklist(int argc, char **argv); int main_blockdetach(int argc, char **argv); +int main_vtpmattach(int argc, char **argv); +int main_vtpmlist(int argc, char **argv); +int main_vtpmdetach(int argc, char **argv); int main_uptime(int argc, char **argv); int main_tmem_list(int argc, char **argv); int main_tmem_freeze(int argc, char **argv); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a43b371..65f83bd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -573,7 +573,7 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; int num_ioports, num_irqs, num_iomem; int pci_power_mgmt = 0; @@ -1048,6 +1048,58 @@ static void parse_config_data(const char *config_source, } } + if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { + d_config->num_vtpms = 0; + d_config->vtpms = NULL; + while ((buf = xlu_cfg_get_listitem (vtpms, d_config->num_vtpms)) != NULL) { + libxl_device_vtpm *vtpm; + char * buf2 = strdup(buf); + char *p, *p2; + bool got_backend = false; + + d_config->vtpms = (libxl_device_vtpm *) realloc(d_config->vtpms, + sizeof(libxl_device_vtpm) * (d_config->num_vtpms+1)); + vtpm = d_config->vtpms + d_config->num_vtpms; + libxl_device_vtpm_init(vtpm); + vtpm->devid = d_config->num_vtpms; + + p = strtok(buf2, ","); + if(p) { + do { + while(*p == ' ') + ++p; + if ((p2 = strchr(p, '=')) == NULL) + break; + *p2 = '\0'; + if (!strcmp(p, "backend")) { + if(domain_qualifier_to_domid(p2 + 1, &(vtpm->backend_domid), 0)) + { + fprintf(stderr, + "Specified vtpm backend domain `%s' does not exist!\n", p2 + 1); + exit(1); + } + got_backend = true; + } else if(!strcmp(p, "uuid")) { + if( libxl_uuid_from_string(&vtpm->uuid, p2 + 1) ) { + fprintf(stderr, + "Failed to parse vtpm UUID: %s\n", p2 + 1); + exit(1); + } + } else { + fprintf(stderr, "Unknown string `%s' in vtpm spec\n", p); + exit(1); + } + } while ((p = strtok(NULL, ",")) != NULL); + } + if(!got_backend) { + fprintf(stderr, "vtpm spec missing required backend field!\n"); + exit(1); + } + free(buf2); + d_config->num_vtpms++; + } + } + if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { d_config->num_nics = 0; d_config->nics = NULL; @@ -1073,7 +1125,7 @@ static void parse_config_data(const char *config_source, p = strtok(buf2, ","); if (!p) - goto skip; + goto skip_nic; do { while (*p == ' ') p++; @@ -1137,7 +1189,7 @@ static void parse_config_data(const char *config_source, fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); } } while ((p = strtok(NULL, ",")) != NULL); -skip: +skip_nic: free(buf2); d_config->num_nics++; } @@ -5634,6 +5686,132 @@ int main_blockdetach(int argc, char **argv) return rc; } +int main_vtpmattach(int argc, char **argv) +{ + int opt; + libxl_device_vtpm vtpm; + char *oparg; + unsigned int val; + uint32_t domid; + + if ((opt = def_getopt(argc, argv, "", "vtpm-attach", 1)) != -1) + return opt; + + if (domain_qualifier_to_domid(argv[optind], &domid, 0) < 0) { + fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); + return 1; + } + ++optind; + + libxl_device_vtpm_init(&vtpm); + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { + if (MATCH_OPTION("uuid", *argv, oparg)) { + if(libxl_uuid_from_string(&(vtpm.uuid), oparg)) { + fprintf(stderr, "Invalid uuid specified (%s)\n", oparg); + return 1; + } + } else if (MATCH_OPTION("backend", *argv, oparg)) { + if(domain_qualifier_to_domid(oparg, &val, 0)) { + fprintf(stderr, + "Specified backend domain does not exist, defaulting to Dom0\n"); + val = 0; + } + vtpm.backend_domid = val; + } else { + fprintf(stderr, "unrecognized argument `%s'\n", *argv); + return 1; + } + } + + if(dryrun_only) { + char* json = libxl_device_vtpm_to_json(ctx, &vtpm); + printf("vtpm: %s\n", json); + free(json); + libxl_device_vtpm_dispose(&vtpm); + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + return 0; + } + + if (libxl_device_vtpm_add(ctx, domid, &vtpm, 0)) { + fprintf(stderr, "libxl_device_vtpm_add failed.\n"); + return 1; + } + libxl_device_vtpm_dispose(&vtpm); + return 0; +} + +int main_vtpmlist(int argc, char **argv) +{ + int opt; + libxl_device_vtpm *vtpms; + libxl_vtpminfo vtpminfo; + int nb, i; + + if ((opt = def_getopt(argc, argv, "", "vtpm-list", 1)) != -1) + return opt; + + /* Idx BE UUID Hdl Sta evch rref BE-path */ + printf("%-3s %-2s %-36s %-6s %-5s %-6s %-5s %-10s\n", + "Idx", "BE", "Uuid", "handle", "state", "evt-ch", "ring-ref", "BE-path"); + for (argv += optind, argc -= optind; argc > 0; --argc, ++argv) { + uint32_t domid; + if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) { + fprintf(stderr, "%s is an invalid domain identifier\n", *argv); + continue; + } + if (!(vtpms = libxl_device_vtpm_list(ctx, domid, &nb))) { + continue; + } + for (i = 0; i < nb; ++i) { + if(!libxl_device_vtpm_getinfo(ctx, domid, &vtpms[i], &vtpminfo)) { + /* Idx BE UUID Hdl Sta evch rref BE-path*/ + printf("%-3d %-2d " LIBXL_UUID_FMT " %6d %5d %6d %8d %-30s\n", + vtpminfo.devid, vtpminfo.backend_id, + LIBXL_UUID_BYTES(vtpminfo.uuid), + vtpminfo.devid, vtpminfo.state, vtpminfo.evtch, + vtpminfo.rref, vtpminfo.backend); + + libxl_vtpminfo_dispose(&vtpminfo); + } + libxl_device_vtpm_dispose(&vtpms[i]); + } + free(vtpms); + } + return 0; +} + +int main_vtpmdetach(int argc, char **argv) +{ + uint32_t domid; + int opt, rc=0; + libxl_device_vtpm vtpm; + libxl_uuid uuid; + + if ((opt = def_getopt(argc, argv, "", "vtpm-detach", 2)) != -1) + return opt; + + domid = find_domain(argv[optind]); + + if ( libxl_uuid_from_string(&uuid, argv[optind+1])) { + if (libxl_devid_to_device_vtpm(ctx, domid, atoi(argv[optind+1]), &vtpm)) { + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); + return 1; + } + } else { + if (libxl_uuid_to_device_vtpm(ctx, domid, &uuid, &vtpm)) { + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); + return 1; + } + } + rc = libxl_device_vtpm_remove(ctx, domid, &vtpm, 0); + if (rc) { + fprintf(stderr, "libxl_device_vtpm_remove failed.\n"); + } + libxl_device_vtpm_dispose(&vtpm); + return rc; +} + + static char *uptime_to_string(unsigned long uptime, int short_mode) { int sec, min, hour, day; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index d3a215d..ac58642 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -341,6 +341,21 @@ struct cmd_spec cmd_table[] = { "Destroy a domain's virtual block device", " ", }, + { "vtpm-attach", + &main_vtpmattach, 1, 1, + "Create a new virtual TPM device", + " [uuid=] [backend=]", + }, + { "vtpm-list", + &main_vtpmlist, 0, 0, + "List virtual TPM devices for a domain", + "", + }, + { "vtpm-detach", + &main_vtpmdetach, 0, 1, + "Destroy a domain's virtual TPM device", + " ", + }, { "uptime", &main_uptime, 0, 0, "Print uptime for all/some domains", -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:35:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:35:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1U1-0005IR-8B; Thu, 01 Nov 2012 20:35:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Ty-0005Hl-NV for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:35:19 +0000 Received: from [85.158.138.51:27704] by server-5.bemta-3.messagelabs.com id 7B/B4-26311-60DD2905; Thu, 01 Nov 2012 20:35:18 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-174.messagelabs.com!1351802113!28289966!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25710 invoked from network); 1 Nov 2012 20:35:15 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:35:15 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031095; Thu, 01 Nov 2012 16:35:09 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Date: Thu, 1 Nov 2012 16:34:56 -0400 Message-Id: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 5/9] add vtpm support to libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch adds vtpm support to libxl. It adds vtpm parsing to config files and 3 new xl commands: vtpm-attach vtpm-detach vtpm-list Signed-off-by: Matthew Fioravante diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 428da21..fe4fac9 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -298,6 +298,35 @@ Specifies the networking provision (both emulated network adapters, and Xen virtual interfaces) to provided to the guest. See F. +=item B + +Specifies the virtual trusted platform module to be +provided to the guest. Please see F +for more details. + +Each B is a comma-separated list of C +settings, from the following list: + +=over 4 + +=item C + +Specify the backend domain name of id. This value is required! +If this domain is a guest, the backend should be set to the +vtpm domain name. If this domain is a vtpm, the +backend should be set to the vtpm manager domain name. + +=item C + +Specify the uuid of this vtpm device. The uuid is used to uniquely +identify the vtpm device. You can create one using the uuidgen +program on unix systems. If left unspecified, a new uuid +will be randomly generated every time the domain boots. +If this is a vtpm domain, you should specify a value. The +value is optional if this is a guest domain. + +=back + =item B Specifies the paravirtual framebuffer devices which should be supplied diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 7b1f2cf..097fe43 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1106,6 +1106,31 @@ List virtual network interfaces for a domain. =back +=head2 VTPM DEVICES + +=over 4 + +=item B I I + +Creates a new vtpm device in the domain specified by I. +I describes the device to attach, using the same format as the +B string in the domain config file. See L for +more information. + +=item B I I + +Removes the vtpm device from the domain specified by I. +I is the numeric device id given to the virtual trusted +platform module device. You will need to run B to determine that number. +Alternatively the I of the vtpm can be used to +select the virtual device to detach. + +=item B I + +List virtual trusted platform modules for a domain. + +=back + =head1 PCI PASS-THROUGH =over 4 diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 665385b..be457f4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1710,6 +1710,243 @@ out: } /******************************************************************************/ +int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm) +{ + if(libxl_uuid_is_nil(&vtpm->uuid)) { + libxl_uuid_generate(&vtpm->uuid); + } + return 0; +} + +static int libxl__device_from_vtpm(libxl__gc *gc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__device *device) +{ + device->backend_devid = vtpm->devid; + device->backend_domid = vtpm->backend_domid; + device->backend_kind = LIBXL__DEVICE_KIND_VTPM; + device->devid = vtpm->devid; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_VTPM; + + return 0; +} + +void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__ao_device *aodev) +{ + STATE_AO_GC(aodev->ao); + flexarray_t *front; + flexarray_t *back; + libxl__device *device; + char *dompath, **l; + unsigned int nb, rc; + + rc = libxl__device_vtpm_setdefault(gc, vtpm); + if (rc) goto out; + + front = flexarray_make(gc, 16, 1); + back = flexarray_make(gc, 16, 1); + + if(vtpm->devid == -1) { + if (!(dompath = libxl__xs_get_dompath(gc, domid))) { + rc = ERROR_FAIL; + goto out; + } + l = libxl__xs_directory(gc, XBT_NULL, + GCSPRINTF("%s/device/vtpm", dompath), &nb); + if(l == NULL || nb == 0) { + vtpm->devid = 0; + } else { + vtpm->devid = strtoul(l[nb - 1], NULL, 10) + 1; + } + } + + GCNEW(device); + rc = libxl__device_from_vtpm(gc, domid, vtpm, device); + if ( rc != 0 ) goto out; + + flexarray_append(back, "frontend-id"); + flexarray_append(back, GCSPRINTF("%d", domid)); + flexarray_append(back, "online"); + flexarray_append(back, "1"); + flexarray_append(back, "state"); + flexarray_append(back, GCSPRINTF("%d", 1)); + flexarray_append(back, "handle"); + flexarray_append(back, GCSPRINTF("%d", vtpm->devid)); + + flexarray_append(back, "uuid"); + flexarray_append(back, GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(vtpm->uuid))); + flexarray_append(back, "resume"); + flexarray_append(back, "False"); + + flexarray_append(front, "backend-id"); + flexarray_append(front, GCSPRINTF("%d", vtpm->backend_domid)); + flexarray_append(front, "state"); + flexarray_append(front, GCSPRINTF("%d", 1)); + flexarray_append(front, "handle"); + flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); + + libxl__device_generic_add(gc, XBT_NULL, device, + libxl__xs_kvs_of_flexarray(gc, back, back->count), + libxl__xs_kvs_of_flexarray(gc, front, front->count)); + + aodev->dev = device; + aodev->action = DEVICE_CONNECT; + libxl__wait_device_connection(egc, aodev); + + rc = 0; +out: + aodev->rc = rc; + if(rc) aodev->callback(egc, aodev); + return; +} + +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num) +{ + GC_INIT(ctx); + + libxl_device_vtpm* vtpms = NULL; + char* fe_path = NULL; + char** dir = NULL; + unsigned int ndirs = 0; + + *num = 0; + + fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); + dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); + if(dir) { + vtpms = malloc(sizeof(*vtpms) * ndirs); + libxl_device_vtpm* vtpm; + libxl_device_vtpm* end = vtpms + ndirs; + for(vtpm = vtpms; vtpm < end; ++vtpm, ++dir) { + char* tmp; + const char* be_path = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s/backend", + fe_path, *dir)); + + vtpm->devid = atoi(*dir); + + tmp = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s/backend_id", + fe_path, *dir)); + vtpm->backend_domid = atoi(tmp); + + tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); + if(tmp) { + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); + exit(1); + } + } + } + } + *num = ndirs; + + GC_FREE; + return vtpms; +} + +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, + uint32_t domid, + libxl_device_vtpm *vtpm, + libxl_vtpminfo *vtpminfo) +{ + GC_INIT(ctx); + char *dompath, *vtpmpath; + char *val; + int rc = 0; + + libxl_vtpminfo_init(vtpminfo); + dompath = libxl__xs_get_dompath(gc, domid); + vtpminfo->devid = vtpm->devid; + + vtpmpath = GCSPRINTF("%s/device/vtpm/%d", dompath, vtpminfo->devid); + vtpminfo->backend = xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/backend", vtpmpath), NULL); + if (!vtpminfo->backend) { + goto err; + } + if(!libxl__xs_read(gc, XBT_NULL, vtpminfo->backend)) { + goto err; + } + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/backend-id", vtpmpath)); + vtpminfo->backend_id = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/state", vtpmpath)); + vtpminfo->state = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/event-channel", vtpmpath)); + vtpminfo->evtch = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/ring-ref", vtpmpath)); + vtpminfo->rref = val ? strtoul(val, NULL, 10) : -1; + + vtpminfo->frontend = xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/frontend", vtpminfo->backend), NULL); + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/frontend-id", vtpminfo->backend)); + vtpminfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; + + val = libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/uuid", vtpminfo->backend)); + if(val == NULL) { + LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); + goto err; + } + if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { + LOG(ERROR, + "%s/uuid is a malformed uuid?? (%s) Probably a bug!\n", + vtpminfo->backend, val); + goto err; + } + + goto exit; +err: + rc = ERROR_FAIL; +exit: + GC_FREE; + return rc; +} + +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, + uint32_t domid, + int devid, + libxl_device_vtpm *vtpm) +{ + libxl_device_vtpm *vtpms; + int nb, i; + int rc; + + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + if (!vtpms) + return ERROR_FAIL; + + memset(vtpm, 0, sizeof (libxl_device_vtpm)); + rc = 1; + for (i = 0; i < nb; ++i) { + if(devid == vtpms[i].devid) { + vtpm->backend_domid = vtpms[i].backend_domid; + vtpm->devid = vtpms[i].devid; + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); + rc = 0; + break; + } + } + + libxl_device_vtpm_list_free(vtpms, nb); + return rc; +} + + +/******************************************************************************/ int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) { @@ -3046,6 +3283,8 @@ out: * libxl_device_disk_destroy * libxl_device_nic_remove * libxl_device_nic_destroy + * libxl_device_vtpm_remove + * libxl_device_vtpm_destroy * libxl_device_vkb_remove * libxl_device_vkb_destroy * libxl_device_vfb_remove @@ -3097,6 +3336,10 @@ DEFINE_DEVICE_REMOVE(vkb, destroy, 1) DEFINE_DEVICE_REMOVE(vfb, remove, 0) DEFINE_DEVICE_REMOVE(vfb, destroy, 1) +/* vtpm */ +DEFINE_DEVICE_REMOVE(vtpm, remove, 0) +DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) + #undef DEFINE_DEVICE_REMOVE /******************************************************************************/ @@ -3105,6 +3348,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) /* The following functions are defined: * libxl_device_disk_add * libxl_device_nic_add + * libxl_device_vtpm_add */ #define DEFINE_DEVICE_ADD(type) \ @@ -3131,6 +3375,9 @@ DEFINE_DEVICE_ADD(disk) /* nic */ DEFINE_DEVICE_ADD(nic) +/* vtpm */ +DEFINE_DEVICE_ADD(vtpm) + #undef DEFINE_DEVICE_ADD /******************************************************************************/ diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 7a7c419..e2ba549 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,13 +478,14 @@ typedef struct { libxl_domain_create_info c_info; libxl_domain_build_info b_info; - int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs, num_vtpms; libxl_device_disk *disks; libxl_device_nic *nics; libxl_device_pci *pcidevs; libxl_device_vfb *vfbs; libxl_device_vkb *vkbs; + libxl_device_vtpm *vtpms; libxl_action_on_shutdown on_poweroff; libxl_action_on_shutdown on_reboot; @@ -645,6 +646,9 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, int *nb_vcpu, int *nr_vcpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); +void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms); +void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); + /* * Devices * ======= @@ -745,6 +749,23 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic, libxl_nicinfo *nicinfo); +/* Virtual TPMs */ +int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_vtpm_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_vtpm_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num); +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, + libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); + /* Keyboard */ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e81747b..9d20086 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -55,6 +55,8 @@ void libxl_domain_config_dispose(libxl_domain_config *d_config) libxl_device_vkb_dispose(&d_config->vkbs[i]); free(d_config->vkbs); + libxl_device_vtpm_list_free(d_config->vtpms, d_config->num_vtpms); + libxl_domain_create_info_dispose(&d_config->c_info); libxl_domain_build_info_dispose(&d_config->b_info); } @@ -601,6 +603,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, int ret); +static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, + int ret); static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); @@ -1085,13 +1089,13 @@ static void domcreate_devmodel_started(libxl__egc *egc, if (d_config->num_nics > 0) { /* Attach nics */ libxl__multidev_begin(ao, &dcs->multidev); - dcs->multidev.callback = domcreate_attach_pci; + dcs->multidev.callback = domcreate_attach_vtpms; libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); libxl__multidev_prepared(egc, &dcs->multidev, 0); return; } - domcreate_attach_pci(egc, &dcs->multidev, 0); + domcreate_attach_vtpms(egc, &dcs->multidev, 0); return; error_out: @@ -1099,6 +1103,39 @@ error_out: domcreate_complete(egc, dcs, ret); } +static void domcreate_attach_vtpms(libxl__egc *egc, + libxl__multidev *multidev, + int ret) +{ + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); + STATE_AO_GC(dcs->ao); + int domid = dcs->guest_domid; + + libxl_domain_config* const d_config = dcs->guest_config; + + if(ret) { + LOG(ERROR, "unable to add nic devices"); + goto error_out; + } + + /* Plug vtpm devices */ + if (d_config->num_vtpms > 0) { + /* Attach vtpms */ + libxl__multidev_begin(ao, &dcs->multidev); + dcs->multidev.callback = domcreate_attach_pci; + libxl__add_vtpms(egc, ao, domid, d_config, &dcs->multidev); + libxl__multidev_prepared(egc, &dcs->multidev, 0); + return; + } + + domcreate_attach_pci(egc, multidev, 0); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, int ret) { @@ -1112,7 +1149,7 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, libxl_domain_config *const d_config = dcs->guest_config; if (ret) { - LOG(ERROR, "unable to add nic devices"); + LOG(ERROR, "unable to add vtpm devices"); goto error_out; } diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index c3283f1..51dd06e 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -497,6 +497,7 @@ void libxl__multidev_prepared(libxl__egc *egc, * The following functions are defined: * libxl__add_disks * libxl__add_nics + * libxl__add_vtpms */ #define DEFINE_DEVICES_ADD(type) \ @@ -515,6 +516,7 @@ void libxl__multidev_prepared(libxl__egc *egc, DEFINE_DEVICES_ADD(disk) DEFINE_DEVICES_ADD(nic) +DEFINE_DEVICES_ADD(vtpm) #undef DEFINE_DEVICES_ADD diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8f220cb..cba3616 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -958,6 +958,7 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, uint32_t domid); +_hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); @@ -2007,6 +2008,10 @@ _hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl_device_nic *nic, libxl__ao_device *aodev); +_hidden void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, + libxl_device_vtpm *vtpm, + libxl__ao_device *aodev); + /* Internal function to connect a vkb device */ _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, libxl_device_vkb *vkb); @@ -2439,6 +2444,10 @@ _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, libxl_domain_config *d_config, libxl__multidev *multidev); +_hidden void libxl__add_vtpms(libxl__egc *egc, libxl__ao *ao, uint32_t domid, + libxl_domain_config *d_config, + libxl__multidev *multidev); + /*----- device model creation -----*/ /* First layer; wraps libxl__spawn_spawn. */ diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de111a6..7eac4a8 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -395,6 +395,12 @@ libxl_device_pci = Struct("device_pci", [ ("permissive", bool), ]) +libxl_device_vtpm = Struct("device_vtpm", [ + ("backend_domid", libxl_domid), + ("devid", libxl_devid), + ("uuid", libxl_uuid), +]) + libxl_diskinfo = Struct("diskinfo", [ ("backend", string), ("backend_id", uint32), @@ -418,6 +424,18 @@ libxl_nicinfo = Struct("nicinfo", [ ("rref_rx", integer), ], dir=DIR_OUT) +libxl_vtpminfo = Struct("vtpminfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ("evtch", integer), + ("rref", integer), + ("uuid", libxl_uuid), + ], dir=DIR_OUT) + libxl_vcpuinfo = Struct("vcpuinfo", [ ("vcpuid", uint32), ("cpu", uint32), diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl index 5ac8c9c..c40120e 100644 --- a/tools/libxl/libxl_types_internal.idl +++ b/tools/libxl/libxl_types_internal.idl @@ -19,6 +19,7 @@ libxl__device_kind = Enumeration("device_kind", [ (5, "VFB"), (6, "VKBD"), (7, "CONSOLE"), + (8, "VTPM"), ]) libxl__console_backend = Enumeration("console_backend", [ diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 55cd299..8f78790 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -463,6 +463,33 @@ int libxl_pipe(libxl_ctx *ctx, int pipes[2]) return 0; } +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + libxl_uuid* uuid, libxl_device_vtpm *vtpm) +{ + libxl_device_vtpm *vtpms; + int nb, i; + int rc; + + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); + if (!vtpms) + return ERROR_FAIL; + + memset(vtpm, 0, sizeof (libxl_device_vtpm)); + rc = 1; + for (i = 0; i < nb; ++i) { + if(!libxl_uuid_compare(uuid, &vtpms[i].uuid)) { + vtpm->backend_domid = vtpms[i].backend_domid; + vtpm->devid = vtpms[i].devid; + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); + rc = 0; + break; + } + } + + libxl_device_vtpm_list_free(vtpms, nb); + return rc; +} + int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic) { @@ -819,6 +846,22 @@ void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) free(list); } +void libxl_vtpminfo_list_free(libxl_vtpminfo* list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_vtpminfo_dispose(&list[i]); + free(list); +} + +void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_device_vtpm_dispose(&list[i]); + free(list); +} + int libxl_domid_valid_guest(uint32_t domid) { /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 83aaac7..40f3f30 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -64,6 +64,11 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, libxl_device_disk *disk); +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + libxl_uuid *uuid, libxl_device_vtpm *vtpm); +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, + int devid, libxl_device_vtpm *vtpm); + int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be * called by the application when done. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 0b2f848..be6f38b 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -79,6 +79,9 @@ int main_networkdetach(int argc, char **argv); int main_blockattach(int argc, char **argv); int main_blocklist(int argc, char **argv); int main_blockdetach(int argc, char **argv); +int main_vtpmattach(int argc, char **argv); +int main_vtpmlist(int argc, char **argv); +int main_vtpmdetach(int argc, char **argv); int main_uptime(int argc, char **argv); int main_tmem_list(int argc, char **argv); int main_tmem_freeze(int argc, char **argv); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a43b371..65f83bd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -573,7 +573,7 @@ static void parse_config_data(const char *config_source, const char *buf; long l; XLU_Config *config; - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; XLU_ConfigList *ioports, *irqs, *iomem; int num_ioports, num_irqs, num_iomem; int pci_power_mgmt = 0; @@ -1048,6 +1048,58 @@ static void parse_config_data(const char *config_source, } } + if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { + d_config->num_vtpms = 0; + d_config->vtpms = NULL; + while ((buf = xlu_cfg_get_listitem (vtpms, d_config->num_vtpms)) != NULL) { + libxl_device_vtpm *vtpm; + char * buf2 = strdup(buf); + char *p, *p2; + bool got_backend = false; + + d_config->vtpms = (libxl_device_vtpm *) realloc(d_config->vtpms, + sizeof(libxl_device_vtpm) * (d_config->num_vtpms+1)); + vtpm = d_config->vtpms + d_config->num_vtpms; + libxl_device_vtpm_init(vtpm); + vtpm->devid = d_config->num_vtpms; + + p = strtok(buf2, ","); + if(p) { + do { + while(*p == ' ') + ++p; + if ((p2 = strchr(p, '=')) == NULL) + break; + *p2 = '\0'; + if (!strcmp(p, "backend")) { + if(domain_qualifier_to_domid(p2 + 1, &(vtpm->backend_domid), 0)) + { + fprintf(stderr, + "Specified vtpm backend domain `%s' does not exist!\n", p2 + 1); + exit(1); + } + got_backend = true; + } else if(!strcmp(p, "uuid")) { + if( libxl_uuid_from_string(&vtpm->uuid, p2 + 1) ) { + fprintf(stderr, + "Failed to parse vtpm UUID: %s\n", p2 + 1); + exit(1); + } + } else { + fprintf(stderr, "Unknown string `%s' in vtpm spec\n", p); + exit(1); + } + } while ((p = strtok(NULL, ",")) != NULL); + } + if(!got_backend) { + fprintf(stderr, "vtpm spec missing required backend field!\n"); + exit(1); + } + free(buf2); + d_config->num_vtpms++; + } + } + if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { d_config->num_nics = 0; d_config->nics = NULL; @@ -1073,7 +1125,7 @@ static void parse_config_data(const char *config_source, p = strtok(buf2, ","); if (!p) - goto skip; + goto skip_nic; do { while (*p == ' ') p++; @@ -1137,7 +1189,7 @@ static void parse_config_data(const char *config_source, fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); } } while ((p = strtok(NULL, ",")) != NULL); -skip: +skip_nic: free(buf2); d_config->num_nics++; } @@ -5634,6 +5686,132 @@ int main_blockdetach(int argc, char **argv) return rc; } +int main_vtpmattach(int argc, char **argv) +{ + int opt; + libxl_device_vtpm vtpm; + char *oparg; + unsigned int val; + uint32_t domid; + + if ((opt = def_getopt(argc, argv, "", "vtpm-attach", 1)) != -1) + return opt; + + if (domain_qualifier_to_domid(argv[optind], &domid, 0) < 0) { + fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); + return 1; + } + ++optind; + + libxl_device_vtpm_init(&vtpm); + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { + if (MATCH_OPTION("uuid", *argv, oparg)) { + if(libxl_uuid_from_string(&(vtpm.uuid), oparg)) { + fprintf(stderr, "Invalid uuid specified (%s)\n", oparg); + return 1; + } + } else if (MATCH_OPTION("backend", *argv, oparg)) { + if(domain_qualifier_to_domid(oparg, &val, 0)) { + fprintf(stderr, + "Specified backend domain does not exist, defaulting to Dom0\n"); + val = 0; + } + vtpm.backend_domid = val; + } else { + fprintf(stderr, "unrecognized argument `%s'\n", *argv); + return 1; + } + } + + if(dryrun_only) { + char* json = libxl_device_vtpm_to_json(ctx, &vtpm); + printf("vtpm: %s\n", json); + free(json); + libxl_device_vtpm_dispose(&vtpm); + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + return 0; + } + + if (libxl_device_vtpm_add(ctx, domid, &vtpm, 0)) { + fprintf(stderr, "libxl_device_vtpm_add failed.\n"); + return 1; + } + libxl_device_vtpm_dispose(&vtpm); + return 0; +} + +int main_vtpmlist(int argc, char **argv) +{ + int opt; + libxl_device_vtpm *vtpms; + libxl_vtpminfo vtpminfo; + int nb, i; + + if ((opt = def_getopt(argc, argv, "", "vtpm-list", 1)) != -1) + return opt; + + /* Idx BE UUID Hdl Sta evch rref BE-path */ + printf("%-3s %-2s %-36s %-6s %-5s %-6s %-5s %-10s\n", + "Idx", "BE", "Uuid", "handle", "state", "evt-ch", "ring-ref", "BE-path"); + for (argv += optind, argc -= optind; argc > 0; --argc, ++argv) { + uint32_t domid; + if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) { + fprintf(stderr, "%s is an invalid domain identifier\n", *argv); + continue; + } + if (!(vtpms = libxl_device_vtpm_list(ctx, domid, &nb))) { + continue; + } + for (i = 0; i < nb; ++i) { + if(!libxl_device_vtpm_getinfo(ctx, domid, &vtpms[i], &vtpminfo)) { + /* Idx BE UUID Hdl Sta evch rref BE-path*/ + printf("%-3d %-2d " LIBXL_UUID_FMT " %6d %5d %6d %8d %-30s\n", + vtpminfo.devid, vtpminfo.backend_id, + LIBXL_UUID_BYTES(vtpminfo.uuid), + vtpminfo.devid, vtpminfo.state, vtpminfo.evtch, + vtpminfo.rref, vtpminfo.backend); + + libxl_vtpminfo_dispose(&vtpminfo); + } + libxl_device_vtpm_dispose(&vtpms[i]); + } + free(vtpms); + } + return 0; +} + +int main_vtpmdetach(int argc, char **argv) +{ + uint32_t domid; + int opt, rc=0; + libxl_device_vtpm vtpm; + libxl_uuid uuid; + + if ((opt = def_getopt(argc, argv, "", "vtpm-detach", 2)) != -1) + return opt; + + domid = find_domain(argv[optind]); + + if ( libxl_uuid_from_string(&uuid, argv[optind+1])) { + if (libxl_devid_to_device_vtpm(ctx, domid, atoi(argv[optind+1]), &vtpm)) { + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); + return 1; + } + } else { + if (libxl_uuid_to_device_vtpm(ctx, domid, &uuid, &vtpm)) { + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); + return 1; + } + } + rc = libxl_device_vtpm_remove(ctx, domid, &vtpm, 0); + if (rc) { + fprintf(stderr, "libxl_device_vtpm_remove failed.\n"); + } + libxl_device_vtpm_dispose(&vtpm); + return rc; +} + + static char *uptime_to_string(unsigned long uptime, int short_mode) { int sec, min, hour, day; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index d3a215d..ac58642 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -341,6 +341,21 @@ struct cmd_spec cmd_table[] = { "Destroy a domain's virtual block device", " ", }, + { "vtpm-attach", + &main_vtpmattach, 1, 1, + "Create a new virtual TPM device", + " [uuid=] [backend=]", + }, + { "vtpm-list", + &main_vtpmlist, 0, 0, + "List virtual TPM devices for a domain", + "", + }, + { "vtpm-detach", + &main_vtpmdetach, 0, 1, + "Destroy a domain's virtual TPM device", + " ", + }, { "uptime", &main_uptime, 0, 0, "Print uptime for all/some domains", -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:36:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Uv-0005V2-Sk; Thu, 01 Nov 2012 20:36:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Ut-0005U8-IG for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:16 +0000 Received: from [85.158.138.51:33023] by server-1.bemta-3.messagelabs.com id 36/15-12169-E3DD2905; Thu, 01 Nov 2012 20:36:14 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-14.tower-174.messagelabs.com!1351802165!21991508!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UNPARSEABLE_RELAY,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28940 invoked from network); 1 Nov 2012 20:36:06 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:06 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031189; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:49 -0400 Message-Id: <1351802150-19258-3-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 8/9] add stubdom/vtpmmgr code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add the code base for vtpmmgrdom. Makefile changes next patch. Signed-off-by: Matthew Fioravante diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile new file mode 100644 index 0000000..88c83c3 --- /dev/null +++ b/stubdom/vtpmmgr/Makefile @@ -0,0 +1,32 @@ +# Copyright (c) 2010-2012 United States Government, as represented by +# the Secretary of Defense. All rights reserved. +# +# THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT +# ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES +# INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY +# DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE +# SOFTWARE. +# + +XEN_ROOT=../.. + +PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library +PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o bignum.o sha4.o havege.o timing.o entropy_poll.o + +TARGET=vtpmmgr.a +OBJS=vtpmmgr.o vtpm_cmd_handler.o vtpm_storage.o init.o tpmrsa.o tpm.o log.o + +CFLAGS+=-Werror -Iutil -Icrypto -Itcs +CFLAGS+=-Wno-declaration-after-statement -Wno-unused-label + +build: $(TARGET) +$(TARGET): $(OBJS) + ar -rcs $@ $^ $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + +clean: + rm -f $(TARGET) $(OBJS) + +distclean: clean + +.PHONY: clean distclean diff --git a/stubdom/vtpmmgr/init.c b/stubdom/vtpmmgr/init.c new file mode 100644 index 0000000..a158020 --- /dev/null +++ b/stubdom/vtpmmgr/init.c @@ -0,0 +1,553 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "vtpmmgr.h" +#include "vtpm_storage.h" +#include "tpm.h" +#include "marshal.h" + +struct Opts { + enum { + TPMDRV_TPM_TIS, + TPMDRV_TPMFRONT, + } tpmdriver; + unsigned long tpmiomem; + unsigned int tpmirq; + unsigned int tpmlocality; + int gen_owner_auth; +}; + +// --------------------------- Well Known Auths -------------------------- +const TPM_AUTHDATA WELLKNOWN_SRK_AUTH = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + +const TPM_AUTHDATA WELLKNOWN_OWNER_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + +struct vtpm_globals vtpm_globals = { + .tpm_fd = -1, + .storage_key = TPM_KEY_INIT, + .storage_key_handle = 0, + .oiap = { .AuthHandle = 0 } +}; + +static int tpm_entropy_source(void* dummy, unsigned char* data, size_t len, size_t* olen) { + UINT32 sz = len; + TPM_RESULT rc = TPM_GetRandom(&sz, data); + *olen = sz; + return rc == TPM_SUCCESS ? 0 : POLARSSL_ERR_ENTROPY_SOURCE_FAILED; +} + +static TPM_RESULT check_tpm_version(void) { + TPM_RESULT status; + UINT32 rsize; + BYTE* res = NULL; + TPM_CAP_VERSION_INFO vinfo; + + TPMTRYRETURN(TPM_GetCapability( + TPM_CAP_VERSION_VAL, + 0, + NULL, + &rsize, + &res)); + if(rsize < 4) { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid size returned by GetCapability!\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + unpack_TPM_CAP_VERSION_INFO(res, &vinfo, UNPACK_ALIAS); + + vtpmloginfo(VTPM_LOG_VTPM, "Hardware TPM:\n"); + vtpmloginfo(VTPM_LOG_VTPM, " version: %hhd %hhd %hhd %hhd\n", + vinfo.version.major, vinfo.version.minor, vinfo.version.revMajor, vinfo.version.revMinor); + vtpmloginfo(VTPM_LOG_VTPM, " specLevel: %hd\n", vinfo.specLevel); + vtpmloginfo(VTPM_LOG_VTPM, " errataRev: %hhd\n", vinfo.errataRev); + vtpmloginfo(VTPM_LOG_VTPM, " vendorID: %c%c%c%c\n", + vinfo.tpmVendorID[0], vinfo.tpmVendorID[1], + vinfo.tpmVendorID[2], vinfo.tpmVendorID[3]); + vtpmloginfo(VTPM_LOG_VTPM, " vendorSpecificSize: %hd\n", vinfo.vendorSpecificSize); + vtpmloginfo(VTPM_LOG_VTPM, " vendorSpecific: "); + for(int i = 0; i < vinfo.vendorSpecificSize; ++i) { + vtpmloginfomore(VTPM_LOG_VTPM, "%02hhx", vinfo.vendorSpecific[i]); + } + vtpmloginfomore(VTPM_LOG_VTPM, "\n"); + +abort_egress: + free(res); + return status; +} + +static TPM_RESULT flush_tpm(void) { + TPM_RESULT status = TPM_SUCCESS; + const TPM_RESOURCE_TYPE reslist[] = { TPM_RT_KEY, TPM_RT_AUTH, TPM_RT_TRANS, TPM_RT_COUNTER, TPM_RT_DAA_TPM, TPM_RT_CONTEXT }; + BYTE* keylist = NULL; + UINT32 keylistSize; + BYTE* ptr; + + //Iterate through each resource type and flush all handles + for(int i = 0; i < sizeof(reslist) / sizeof(TPM_RESOURCE_TYPE); ++i) { + TPM_RESOURCE_TYPE beres = cpu_to_be32(reslist[i]); + UINT16 size; + TPMTRYRETURN(TPM_GetCapability( + TPM_CAP_HANDLE, + sizeof(TPM_RESOURCE_TYPE), + (BYTE*)(&beres), + &keylistSize, + &keylist)); + + ptr = keylist; + ptr = unpack_UINT16(ptr, &size); + + //Flush each handle + if(size) { + vtpmloginfo(VTPM_LOG_VTPM, "Flushing %u handle(s) of type %lu\n", size, (unsigned long) reslist[i]); + for(int j = 0; j < size; ++j) { + TPM_HANDLE h; + ptr = unpack_TPM_HANDLE(ptr, &h); + TPMTRYRETURN(TPM_FlushSpecific(h, reslist[i])); + } + } + + free(keylist); + keylist = NULL; + } + + goto egress; +abort_egress: + free(keylist); +egress: + return status; +} + + +static TPM_RESULT try_take_ownership(void) { + TPM_RESULT status = TPM_SUCCESS; + TPM_PUBKEY pubEK = TPM_PUBKEY_INIT; + + // If we can read PubEK then there is no owner and we should take it. + status = TPM_ReadPubek(&pubEK); + + switch(status) { + case TPM_DISABLED_CMD: + //Cannot read ek? TPM has owner + vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); + status = TPM_SUCCESS; + break; + case TPM_NO_ENDORSEMENT: + { + //If theres no ek, we have to create one + TPM_KEY_PARMS keyInfo = { + .algorithmID = TPM_ALG_RSA, + .encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1, + .sigScheme = TPM_SS_NONE, + .parmSize = 12, + .parms.rsa = { + .keyLength = RSA_KEY_SIZE, + .numPrimes = 2, + .exponentSize = 0, + .exponent = NULL, + }, + }; + TPMTRYRETURN(TPM_CreateEndorsementKeyPair(&keyInfo, &pubEK)); + } + //fall through to take ownership + case TPM_SUCCESS: + { + //Construct the Srk + TPM_KEY srk = { + .ver = TPM_STRUCT_VER_1_1, + .keyUsage = TPM_KEY_STORAGE, + .keyFlags = 0x00, + .authDataUsage = TPM_AUTH_ALWAYS, + .algorithmParms = { + .algorithmID = TPM_ALG_RSA, + .encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1, + .sigScheme = TPM_SS_NONE, + .parmSize = 12, + .parms.rsa = { + .keyLength = RSA_KEY_SIZE, + .numPrimes = 2, + .exponentSize = 0, + .exponent = NULL, + }, + }, + .PCRInfoSize = 0, + .pubKey = { + .keyLength = 0, + .key = NULL, + }, + .encDataSize = 0, + }; + + TPMTRYRETURN(TPM_TakeOwnership( + &pubEK, + (const TPM_AUTHDATA*)&vtpm_globals.owner_auth, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &srk, + NULL, + &vtpm_globals.oiap)); + + TPMTRYRETURN(TPM_DisablePubekRead( + (const TPM_AUTHDATA*)&vtpm_globals.owner_auth, + &vtpm_globals.oiap)); + } + break; + default: + break; + } +abort_egress: + free_TPM_PUBKEY(&pubEK); + return status; +} + +static void init_storage_key(TPM_KEY* key) { + key->ver.major = 1; + key->ver.minor = 1; + key->ver.revMajor = 0; + key->ver.revMinor = 0; + + key->keyUsage = TPM_KEY_BIND; + key->keyFlags = 0; + key->authDataUsage = TPM_AUTH_ALWAYS; + + TPM_KEY_PARMS* p = &key->algorithmParms; + p->algorithmID = TPM_ALG_RSA; + p->encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; + p->sigScheme = TPM_SS_NONE; + p->parmSize = 12; + + TPM_RSA_KEY_PARMS* r = &p->parms.rsa; + r->keyLength = RSA_KEY_SIZE; + r->numPrimes = 2; + r->exponentSize = 0; + r->exponent = NULL; + + key->PCRInfoSize = 0; + key->encDataSize = 0; + key->encData = NULL; +} + +static int parse_auth_string(char* authstr, BYTE* target, const TPM_AUTHDATA wellknown, int allowrandom) { + int rc; + /* well known owner auth */ + if(!strcmp(authstr, "well-known")) { + memcpy(target, wellknown, sizeof(TPM_AUTHDATA)); + } + /* Create a randomly generated owner auth */ + else if(allowrandom && !strcmp(authstr, "random")) { + return 1; + } + /* owner auth is a raw hash */ + else if(!strncmp(authstr, "hash:", 5)) { + authstr += 5; + if((rc = strlen(authstr)) != 40) { + vtpmlogerror(VTPM_LOG_VTPM, "Supplied owner auth hex string `%s' must be exactly 40 characters (20 bytes) long, length=%d\n", authstr, rc); + return -1; + } + for(int j = 0; j < 20; ++j) { + if(sscanf(authstr, "%hhX", target + j) != 1) { + vtpmlogerror(VTPM_LOG_VTPM, "Supplied owner auth string `%s' is not a valid hex string\n", authstr); + return -1; + } + authstr += 2; + } + } + /* owner auth is a string that will be hashed */ + else if(!strncmp(authstr, "text:", 5)) { + authstr += 5; + sha1((const unsigned char*)authstr, strlen(authstr), target); + } + else { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid auth string %s\n", authstr); + return -1; + } + + return 0; +} + +int parse_cmdline_opts(int argc, char** argv, struct Opts* opts) +{ + int rc; + int i; + + //Set defaults + memcpy(vtpm_globals.owner_auth, WELLKNOWN_OWNER_AUTH, sizeof(TPM_AUTHDATA)); + memcpy(vtpm_globals.srk_auth, WELLKNOWN_SRK_AUTH, sizeof(TPM_AUTHDATA)); + + for(i = 1; i < argc; ++i) { + if(!strncmp(argv[i], "owner_auth:", 10)) { + if((rc = parse_auth_string(argv[i] + 10, vtpm_globals.owner_auth, WELLKNOWN_OWNER_AUTH, 1)) < 0) { + goto err_invalid; + } + if(rc == 1) { + opts->gen_owner_auth = 1; + } + } + else if(!strncmp(argv[i], "srk_auth:", 8)) { + if((rc = parse_auth_string(argv[i] + 8, vtpm_globals.srk_auth, WELLKNOWN_SRK_AUTH, 0)) != 0) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmdriver=", 10)) { + if(!strcmp(argv[i] + 10, "tpm_tis")) { + opts->tpmdriver = TPMDRV_TPM_TIS; + } else if(!strcmp(argv[i] + 10, "tpmfront")) { + opts->tpmdriver = TPMDRV_TPMFRONT; + } else { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmiomem=",9)) { + if(sscanf(argv[i] + 9, "0x%lX", &opts->tpmiomem) != 1) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmirq=",7)) { + if(!strcmp(argv[i] + 7, "probe")) { + opts->tpmirq = TPM_PROBE_IRQ; + } else if( sscanf(argv[i] + 7, "%u", &opts->tpmirq) != 1) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmlocality=",12)) { + if(sscanf(argv[i] + 12, "%u", &opts->tpmlocality) != 1 || opts->tpmlocality > 4) { + goto err_invalid; + } + } + } + + switch(opts->tpmdriver) { + case TPMDRV_TPM_TIS: + vtpmloginfo(VTPM_LOG_VTPM, "Option: Using tpm_tis driver\n"); + break; + case TPMDRV_TPMFRONT: + vtpmloginfo(VTPM_LOG_VTPM, "Option: Using tpmfront driver\n"); + break; + } + + return 0; +err_invalid: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid Option %s\n", argv[i]); + return -1; +} + + + +static TPM_RESULT vtpmmgr_create(void) { + TPM_RESULT status = TPM_SUCCESS; + TPM_AUTH_SESSION osap = TPM_AUTH_SESSION_INIT; + TPM_AUTHDATA sharedsecret; + + // Take ownership if TPM is unowned + TPMTRYRETURN(try_take_ownership()); + + // Generate storage key's auth + memset(&vtpm_globals.storage_key_usage_auth, 0, sizeof(TPM_AUTHDATA)); + + TPMTRYRETURN( TPM_OSAP( + TPM_ET_KEYHANDLE, + TPM_SRK_KEYHANDLE, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &sharedsecret, + &osap) ); + + init_storage_key(&vtpm_globals.storage_key); + + //initialize the storage key + TPMTRYRETURN( TPM_CreateWrapKey( + TPM_SRK_KEYHANDLE, + (const TPM_AUTHDATA*)&sharedsecret, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.storage_key, + &osap) ); + + //Load Storage Key + TPMTRYRETURN( TPM_LoadKey( + TPM_SRK_KEYHANDLE, + &vtpm_globals.storage_key, + &vtpm_globals.storage_key_handle, + (const TPM_AUTHDATA*) &vtpm_globals.srk_auth, + &vtpm_globals.oiap)); + + //Make sure TPM has commited changes + TPMTRYRETURN( TPM_SaveState() ); + + //Create new disk image + TPMTRYRETURN(vtpm_storage_new_header()); + + goto egress; +abort_egress: +egress: + vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager\n"); + + //End the OSAP session + if(osap.AuthHandle) { + TPM_TerminateHandle(osap.AuthHandle); + } + + return status; +} + +TPM_RESULT vtpmmgr_init(int argc, char** argv) { + TPM_RESULT status = TPM_SUCCESS; + + /* Default commandline options */ + struct Opts opts = { + .tpmdriver = TPMDRV_TPM_TIS, + .tpmiomem = TPM_BASEADDR, + .tpmirq = 0, + .tpmlocality = 0, + .gen_owner_auth = 0, + }; + + if(parse_cmdline_opts(argc, argv, &opts) != 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Command line parsing failed! exiting..\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + //Setup storage system + if(vtpm_storage_init() != 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize storage subsystem!\n"); + status = TPM_IOERROR; + goto abort_egress; + } + + //Setup tpmback device + init_tpmback(); + + //Setup tpm access + switch(opts.tpmdriver) { + case TPMDRV_TPM_TIS: + { + struct tpm_chip* tpm; + if((tpm = init_tpm_tis(opts.tpmiomem, TPM_TIS_LOCL_INT_TO_FLAG(opts.tpmlocality), opts.tpmirq)) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize tpmfront device\n"); + status = TPM_IOERROR; + goto abort_egress; + } + vtpm_globals.tpm_fd = tpm_tis_open(tpm); + tpm_tis_request_locality(tpm, opts.tpmlocality); + } + break; + case TPMDRV_TPMFRONT: + { + struct tpmfront_dev* tpmfront_dev; + if((tpmfront_dev = init_tpmfront(NULL)) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize tpmfront device\n"); + status = TPM_IOERROR; + goto abort_egress; + } + vtpm_globals.tpm_fd = tpmfront_open(tpmfront_dev); + } + break; + } + + //Get the version of the tpm + TPMTRYRETURN(check_tpm_version()); + + // Blow away all stale handles left in the tpm + if(flush_tpm() != TPM_SUCCESS) { + vtpmlogerror(VTPM_LOG_VTPM, "VTPM_FlushResources failed, continuing anyway..\n"); + } + + /* Initialize the rng */ + entropy_init(&vtpm_globals.entropy); + entropy_add_source(&vtpm_globals.entropy, tpm_entropy_source, NULL, 0); + entropy_gather(&vtpm_globals.entropy); + ctr_drbg_init(&vtpm_globals.ctr_drbg, entropy_func, &vtpm_globals.entropy, NULL, 0); + ctr_drbg_set_prediction_resistance( &vtpm_globals.ctr_drbg, CTR_DRBG_PR_OFF ); + + // Generate Auth for Owner + if(opts.gen_owner_auth) { + vtpmmgr_rand(vtpm_globals.owner_auth, sizeof(TPM_AUTHDATA)); + } + + // Create OIAP session for service's authorized commands + TPMTRYRETURN( TPM_OIAP(&vtpm_globals.oiap) ); + + /* Load the Manager data, if it fails create a new manager */ + if (vtpm_storage_load_header() != TPM_SUCCESS) { + /* If the OIAP session was closed by an error, create a new one */ + if(vtpm_globals.oiap.AuthHandle == 0) { + TPMTRYRETURN( TPM_OIAP(&vtpm_globals.oiap) ); + } + vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); + TPMTRYRETURN( vtpmmgr_create() ); + } + + goto egress; +abort_egress: + vtpmmgr_shutdown(); +egress: + return status; +} + +void vtpmmgr_shutdown(void) +{ + /* Cleanup resources */ + free_TPM_KEY(&vtpm_globals.storage_key); + + /* Cleanup TPM resources */ + TPM_EvictKey(vtpm_globals.storage_key_handle); + TPM_TerminateHandle(vtpm_globals.oiap.AuthHandle); + + /* Close tpmback */ + shutdown_tpmback(); + + /* Close the storage system and blkfront */ + vtpm_storage_shutdown(); + + /* Close tpmfront/tpm_tis */ + close(vtpm_globals.tpm_fd); + + vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); +} diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c new file mode 100644 index 0000000..a82c913 --- /dev/null +++ b/stubdom/vtpmmgr/log.c @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include + +#include "tcg.h" + +char *module_names[] = { "", + "TPM", + "TPM", + "VTPM", + "VTPM", + "TXDATA", + }; +// Helper code for the consts, eg. to produce messages for error codes. + +typedef struct error_code_entry_t { + TPM_RESULT code; + char * code_name; + char * msg; +} error_code_entry_t; + +static const error_code_entry_t error_msgs [] = { + { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, + { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, + { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, + { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, + { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, + { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, + { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, + { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, + { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, + { TPM_FAIL, "TPM_FAIL", "The operation failed" }, + { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, + { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, + { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, + { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, + { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, + { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, + { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, + { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, + { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, + { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, + { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, + { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, + { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, + { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, + { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, + { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, + { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, + { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, + { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, + { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, + { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, + { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, + { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, + { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, + { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, + { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, + { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, + { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, + { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, + { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, + { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, + + { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, + { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, + { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, + { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, + { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, + { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, + { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, + { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, + { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, + { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, + { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, + { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, + { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, + { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, + { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, + { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, + { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, + { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, + { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, + { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, + { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, + { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, + { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, + { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, + { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, + { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, + { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, + { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, + { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, + { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, + { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, + { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, + { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, + { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, + { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, + { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, + { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, + { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, +}; + + +// helper function for the error codes: +const char* tpm_get_error_name (TPM_RESULT code) { + // just do a linear scan for now + unsigned i; + for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) + if (code == error_msgs[i].code) + return error_msgs[i].code_name; + + return("Unknown Error Code"); +} diff --git a/stubdom/vtpmmgr/log.h b/stubdom/vtpmmgr/log.h new file mode 100644 index 0000000..5c7abf5 --- /dev/null +++ b/stubdom/vtpmmgr/log.h @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __VTPM_LOG_H__ +#define __VTPM_LOG_H__ + +#include // for uint32_t +#include // for pointer NULL +#include +#include "tcg.h" + +// =========================== LOGGING ============================== + +// the logging module numbers +#define VTPM_LOG_TPM 1 +#define VTPM_LOG_TPM_DEEP 2 +#define VTPM_LOG_VTPM 3 +#define VTPM_LOG_VTPM_DEEP 4 +#define VTPM_LOG_TXDATA 5 + +extern char *module_names[]; + +// Default to standard logging +#ifndef LOGGING_MODULES +#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)|BITMASK(VTPM_LOG_TPM)) +#endif + +// bit-access macros +#define BITMASK(idx) ( 1U << (idx) ) +#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) +#define SETBIT(num,idx) (num) |= BITMASK(idx) +#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) + +#define vtpmloginfo(module, fmt, args...) \ + if (GETBIT (LOGGING_MODULES, module) == 1) { \ + fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ + } + +#define vtpmloginfomore(module, fmt, args...) \ + if (GETBIT (LOGGING_MODULES, module) == 1) { \ + fprintf (stdout, fmt,##args); \ + } + +#define vtpmlogerror(module, fmt, args...) \ + fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); + +//typedef UINT32 tpm_size_t; + +// helper function for the error codes: +const char* tpm_get_error_name (TPM_RESULT code); + +#endif // _VTPM_LOG_H_ diff --git a/stubdom/vtpmmgr/marshal.h b/stubdom/vtpmmgr/marshal.h new file mode 100644 index 0000000..77d32f0 --- /dev/null +++ b/stubdom/vtpmmgr/marshal.h @@ -0,0 +1,528 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef MARSHAL_H +#define MARSHAL_H + +#include +#include +#include +#include "tcg.h" + +typedef enum UnpackPtr { + UNPACK_ALIAS, + UNPACK_ALLOC +} UnpackPtr; + +inline BYTE* pack_BYTE(BYTE* ptr, BYTE t) { + ptr[0] = t; + return ++ptr; +} + +inline BYTE* unpack_BYTE(BYTE* ptr, BYTE* t) { + t[0] = ptr[0]; + return ++ptr; +} + +#define pack_BOOL(p, t) pack_BYTE(p, t) +#define unpack_BOOL(p, t) unpack_BYTE(p, t) + +inline BYTE* pack_UINT16(BYTE* ptr, UINT16 t) { + BYTE* b = (BYTE*)&t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + ptr[0] = b[1]; + ptr[1] = b[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + ptr[0] = b[0]; + ptr[1] = b[1]; +#endif + return ptr + sizeof(UINT16); +} + +inline BYTE* unpack_UINT16(BYTE* ptr, UINT16* t) { + BYTE* b = (BYTE*)t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + b[0] = ptr[1]; + b[1] = ptr[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + b[0] = ptr[0]; + b[1] = ptr[1]; +#endif + return ptr + sizeof(UINT16); +} + +inline BYTE* pack_UINT32(BYTE* ptr, UINT32 t) { + BYTE* b = (BYTE*)&t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + ptr[3] = b[0]; + ptr[2] = b[1]; + ptr[1] = b[2]; + ptr[0] = b[3]; +#elif __BYTE_ORDER == __BIG_ENDIAN + ptr[0] = b[0]; + ptr[1] = b[1]; + ptr[2] = b[2]; + ptr[3] = b[3]; +#endif + return ptr + sizeof(UINT32); +} + +inline BYTE* unpack_UINT32(BYTE* ptr, UINT32* t) { + BYTE* b = (BYTE*)t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + b[0] = ptr[3]; + b[1] = ptr[2]; + b[2] = ptr[1]; + b[3] = ptr[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + b[0] = ptr[0]; + b[1] = ptr[1]; + b[2] = ptr[2]; + b[3] = ptr[3]; +#endif + return ptr + sizeof(UINT32); +} + +#define pack_TPM_RESULT(p, t) pack_UINT32(p, t) +#define pack_TPM_PCRINDEX(p, t) pack_UINT32(p, t) +#define pack_TPM_DIRINDEX(p, t) pack_UINT32(p, t) +#define pack_TPM_HANDLE(p, t) pack_UINT32(p, t) +#define pack_TPM_AUTHHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_HASHHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_HMACHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_ENCHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TPM_KEY_HANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_ENTITYHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TPM_RESOURCE_TYPE(p, t) pack_UINT32(p, t) +#define pack_TPM_COMMAND_CODE(p, t) pack_UINT32(p, t) +#define pack_TPM_PROTOCOL_ID(p, t) pack_UINT16(p, t) +#define pack_TPM_AUTH_DATA_USAGE(p, t) pack_BYTE(p, t) +#define pack_TPM_ENTITY_TYPE(p, t) pack_UINT16(p, t) +#define pack_TPM_ALGORITHM_ID(p, t) pack_UINT32(p, t) +#define pack_TPM_KEY_USAGE(p, t) pack_UINT16(p, t) +#define pack_TPM_STARTUP_TYPE(p, t) pack_UINT16(p, t) +#define pack_TPM_CAPABILITY_AREA(p, t) pack_UINT32(p, t) +#define pack_TPM_ENC_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_SIG_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_MIGRATE_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_PHYSICAL_PRESENCE(p, t) pack_UINT16(p, t) +#define pack_TPM_KEY_FLAGS(p, t) pack_UINT32(p, t) + +#define unpack_TPM_RESULT(p, t) unpack_UINT32(p, t) +#define unpack_TPM_PCRINDEX(p, t) unpack_UINT32(p, t) +#define unpack_TPM_DIRINDEX(p, t) unpack_UINT32(p, t) +#define unpack_TPM_HANDLE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_AUTHHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_HASHHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_HMACHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_ENCHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TPM_KEY_HANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_ENTITYHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TPM_RESOURCE_TYPE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_COMMAND_CODE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_PROTOCOL_ID(p, t) unpack_UINT16(p, t) +#define unpack_TPM_AUTH_DATA_USAGE(p, t) unpack_BYTE(p, t) +#define unpack_TPM_ENTITY_TYPE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_ALGORITHM_ID(p, t) unpack_UINT32(p, t) +#define unpack_TPM_KEY_USAGE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_STARTUP_TYPE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_CAPABILITY_AREA(p, t) unpack_UINT32(p, t) +#define unpack_TPM_ENC_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_SIG_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_MIGRATE_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_PHYSICAL_PRESENCE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_KEY_FLAGS(p, t) unpack_UINT32(p, t) + +#define pack_TPM_AUTH_HANDLE(p, t) pack_UINT32(p, t); +#define pack_TCS_CONTEXT_HANDLE(p, t) pack_UINT32(p, t); +#define pack_TCS_KEY_HANDLE(p, t) pack_UINT32(p, t); + +#define unpack_TPM_AUTH_HANDLE(p, t) unpack_UINT32(p, t); +#define unpack_TCS_CONTEXT_HANDLE(p, t) unpack_UINT32(p, t); +#define unpack_TCS_KEY_HANDLE(p, t) unpack_UINT32(p, t); + +inline BYTE* pack_BUFFER(BYTE* ptr, const BYTE* buf, UINT32 size) { + memcpy(ptr, buf, size); + return ptr + size; +} + +inline BYTE* unpack_BUFFER(BYTE* ptr, BYTE* buf, UINT32 size) { + memcpy(buf, ptr, size); + return ptr + size; +} + +inline BYTE* unpack_ALIAS(BYTE* ptr, BYTE** buf, UINT32 size) { + *buf = ptr; + return ptr + size; +} + +inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) { + if(size) { + *buf = malloc(size); + memcpy(*buf, ptr, size); + } else { + *buf = NULL; + } + return ptr + size; +} + +inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) { + if(alloc == UNPACK_ALLOC) { + return unpack_ALLOC(ptr, buf, size); + } else { + return unpack_ALIAS(ptr, buf, size); + } +} + +inline BYTE* pack_TPM_AUTHDATA(BYTE* ptr, const TPM_AUTHDATA* d) { + return pack_BUFFER(ptr, *d, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_AUTHDATA(BYTE* ptr, TPM_AUTHDATA* d) { + return unpack_BUFFER(ptr, *d, TPM_DIGEST_SIZE); +} + +#define pack_TPM_SECRET(p, t) pack_TPM_AUTHDATA(p, t) +#define pack_TPM_ENCAUTH(p, t) pack_TPM_AUTHDATA(p, t) +#define pack_TPM_PAYLOAD_TYPE(p, t) pack_BYTE(p, t) +#define pack_TPM_TAG(p, t) pack_UINT16(p, t) +#define pack_TPM_STRUCTURE_TAG(p, t) pack_UINT16(p, t) + +#define unpack_TPM_SECRET(p, t) unpack_TPM_AUTHDATA(p, t) +#define unpack_TPM_ENCAUTH(p, t) unpack_TPM_AUTHDATA(p, t) +#define unpack_TPM_PAYLOAD_TYPE(p, t) unpack_BYTE(p, t) +#define unpack_TPM_TAG(p, t) unpack_UINT16(p, t) +#define unpack_TPM_STRUCTURE_TAG(p, t) unpack_UINT16(p, t) + +inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) { + ptr[0] = t->major; + ptr[1] = t->minor; + ptr[2] = t->revMajor; + ptr[3] = t->revMinor; + return ptr + 4; +} + +inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) { + t->major = ptr[0]; + t->minor = ptr[1]; + t->revMajor = ptr[2]; + t->revMinor = ptr[3]; + return ptr + 4; +} + +inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v) { + ptr = pack_TPM_STRUCTURE_TAG(ptr, v->tag); + ptr = pack_TPM_VERSION(ptr, &v->version); + ptr = pack_UINT16(ptr, v->specLevel); + ptr = pack_BYTE(ptr, v->errataRev); + ptr = pack_BUFFER(ptr, v->tpmVendorID, sizeof(v->tpmVendorID)); + ptr = pack_UINT16(ptr, v->vendorSpecificSize); + ptr = pack_BUFFER(ptr, v->vendorSpecific, v->vendorSpecificSize); + return ptr; +} + +inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, UnpackPtr alloc) { + ptr = unpack_TPM_STRUCTURE_TAG(ptr, &v->tag); + ptr = unpack_TPM_VERSION(ptr, &v->version); + ptr = unpack_UINT16(ptr, &v->specLevel); + ptr = unpack_BYTE(ptr, &v->errataRev); + ptr = unpack_BUFFER(ptr, v->tpmVendorID, sizeof(v->tpmVendorID)); + ptr = unpack_UINT16(ptr, &v->vendorSpecificSize); + ptr = unpack_PTR(ptr, &v->vendorSpecific, v->vendorSpecificSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_DIGEST(BYTE* ptr, const TPM_DIGEST* d) { + return pack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_DIGEST(BYTE* ptr, TPM_DIGEST* d) { + return unpack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE); +} + +#define pack_TPM_PCRVALUE(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_PCRVALUE(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_COMPOSITE_HASH(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_COMPOSITE_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_DIRVALUE(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_DIRVALUE(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_HMAC(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_HMAC(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_CHOSENID_HASH(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_CHOSENID_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d); + +inline BYTE* pack_TPM_NONCE(BYTE* ptr, const TPM_NONCE* n) { + return pack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_NONCE(BYTE* ptr, TPM_NONCE* n) { + return unpack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE); +} + +inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PARMS* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_UINT32(ptr, k->blockSize); + ptr = pack_UINT32(ptr, k->ivSize); + return pack_BUFFER(ptr, k->IV, k->ivSize); +} + +inline BYTE* unpack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, TPM_SYMMETRIC_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_UINT32(ptr, &k->blockSize); + ptr = unpack_UINT32(ptr, &k->ivSize); + return unpack_PTR(ptr, &k->IV, k->ivSize, alloc); +} + +inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_UINT32(ptr, k->numPrimes); + ptr = pack_UINT32(ptr, k->exponentSize); + return pack_BUFFER(ptr, k->exponent, k->exponentSize); +} + +inline BYTE* unpack_TPM_RSA_KEY_PARMS(BYTE* ptr, TPM_RSA_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_UINT32(ptr, &k->numPrimes); + ptr = unpack_UINT32(ptr, &k->exponentSize); + return unpack_PTR(ptr, &k->exponent, k->exponentSize, alloc); +} + +inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) { + ptr = pack_TPM_ALGORITHM_ID(ptr, k->algorithmID); + ptr = pack_TPM_ENC_SCHEME(ptr, k->encScheme); + ptr = pack_TPM_SIG_SCHEME(ptr, k->sigScheme); + ptr = pack_UINT32(ptr, k->parmSize); + + if(k->parmSize) { + switch(k->algorithmID) { + case TPM_ALG_RSA: + return pack_TPM_RSA_KEY_PARMS(ptr, &k->parms.rsa); + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + return pack_TPM_SYMMETRIC_KEY_PARMS(ptr, &k->parms.sym); + } + } + return ptr; +} + +inline BYTE* unpack_TPM_KEY_PARMS(BYTE* ptr, TPM_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_TPM_ALGORITHM_ID(ptr, &k->algorithmID); + ptr = unpack_TPM_ENC_SCHEME(ptr, &k->encScheme); + ptr = unpack_TPM_SIG_SCHEME(ptr, &k->sigScheme); + ptr = unpack_UINT32(ptr, &k->parmSize); + + if(k->parmSize) { + switch(k->algorithmID) { + case TPM_ALG_RSA: + return unpack_TPM_RSA_KEY_PARMS(ptr, &k->parms.rsa, alloc); + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + return unpack_TPM_SYMMETRIC_KEY_PARMS(ptr, &k->parms.sym, alloc); + } + } + return ptr; +} + +inline BYTE* pack_TPM_STORE_PUBKEY(BYTE* ptr, const TPM_STORE_PUBKEY* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_BUFFER(ptr, k->key, k->keyLength); + return ptr; +} + +inline BYTE* unpack_TPM_STORE_PUBKEY(BYTE* ptr, TPM_STORE_PUBKEY* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_PTR(ptr, &k->key, k->keyLength, alloc); + return ptr; +} + +inline BYTE* pack_TPM_PUBKEY(BYTE* ptr, const TPM_PUBKEY* k) { + ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms); + return pack_TPM_STORE_PUBKEY(ptr, &k->pubKey); +} + +inline BYTE* unpack_TPM_PUBKEY(BYTE* ptr, TPM_PUBKEY* k, UnpackPtr alloc) { + ptr = unpack_TPM_KEY_PARMS(ptr, &k->algorithmParms, alloc); + return unpack_TPM_STORE_PUBKEY(ptr, &k->pubKey, alloc); +} + +inline BYTE* pack_TPM_PCR_SELECTION(BYTE* ptr, const TPM_PCR_SELECTION* p) { + ptr = pack_UINT16(ptr, p->sizeOfSelect); + ptr = pack_BUFFER(ptr, p->pcrSelect, p->sizeOfSelect); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_SELECTION(BYTE* ptr, TPM_PCR_SELECTION* p, UnpackPtr alloc) { + ptr = unpack_UINT16(ptr, &p->sizeOfSelect); + ptr = unpack_PTR(ptr, &p->pcrSelect, p->sizeOfSelect, alloc); + return ptr; +} + +inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) { + ptr = pack_TPM_PCR_SELECTION(ptr, &p->pcrSelection); + ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease); + ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtCreation); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_INFO(BYTE* ptr, TPM_PCR_INFO* p, UnpackPtr alloc) { + ptr = unpack_TPM_PCR_SELECTION(ptr, &p->pcrSelection, alloc); + ptr = unpack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease); + ptr = unpack_TPM_COMPOSITE_HASH(ptr, &p->digestAtCreation); + return ptr; +} + +inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) { + ptr = pack_TPM_PCR_SELECTION(ptr, &p->select); + ptr = pack_UINT32(ptr, p->valueSize); + ptr = pack_BUFFER(ptr, (const BYTE*)p->pcrValue, p->valueSize); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_COMPOSITE(BYTE* ptr, TPM_PCR_COMPOSITE* p, UnpackPtr alloc) { + ptr = unpack_TPM_PCR_SELECTION(ptr, &p->select, alloc); + ptr = unpack_UINT32(ptr, &p->valueSize); + ptr = unpack_PTR(ptr, (BYTE**)&p->pcrValue, p->valueSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) { + ptr = pack_TPM_VERSION(ptr, &k->ver); + ptr = pack_TPM_KEY_USAGE(ptr, k->keyUsage); + ptr = pack_TPM_KEY_FLAGS(ptr, k->keyFlags); + ptr = pack_TPM_AUTH_DATA_USAGE(ptr, k->authDataUsage); + ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms); + ptr = pack_UINT32(ptr, k->PCRInfoSize); + if(k->PCRInfoSize) { + ptr = pack_TPM_PCR_INFO(ptr, &k->PCRInfo); + } + ptr = pack_TPM_STORE_PUBKEY(ptr, &k->pubKey); + ptr = pack_UINT32(ptr, k->encDataSize); + return pack_BUFFER(ptr, k->encData, k->encDataSize); +} + +inline BYTE* unpack_TPM_KEY(BYTE* ptr, TPM_KEY* k, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &k->ver); + ptr = unpack_TPM_KEY_USAGE(ptr, &k->keyUsage); + ptr = unpack_TPM_KEY_FLAGS(ptr, &k->keyFlags); + ptr = unpack_TPM_AUTH_DATA_USAGE(ptr, &k->authDataUsage); + ptr = unpack_TPM_KEY_PARMS(ptr, &k->algorithmParms, alloc); + ptr = unpack_UINT32(ptr, &k->PCRInfoSize); + if(k->PCRInfoSize) { + ptr = unpack_TPM_PCR_INFO(ptr, &k->PCRInfo, alloc); + } + ptr = unpack_TPM_STORE_PUBKEY(ptr, &k->pubKey, alloc); + ptr = unpack_UINT32(ptr, &k->encDataSize); + return unpack_PTR(ptr, &k->encData, k->encDataSize, alloc); +} + +inline BYTE* pack_TPM_BOUND_DATA(BYTE* ptr, const TPM_BOUND_DATA* b, UINT32 payloadSize) { + ptr = pack_TPM_VERSION(ptr, &b->ver); + ptr = pack_TPM_PAYLOAD_TYPE(ptr, b->payload); + return pack_BUFFER(ptr, b->payloadData, payloadSize); +} + +inline BYTE* unpack_TPM_BOUND_DATA(BYTE* ptr, TPM_BOUND_DATA* b, UINT32 payloadSize, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &b->ver); + ptr = unpack_TPM_PAYLOAD_TYPE(ptr, &b->payload); + return unpack_PTR(ptr, &b->payloadData, payloadSize, alloc); +} + +inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) { + ptr = pack_TPM_VERSION(ptr, &d->ver); + ptr = pack_UINT32(ptr, d->sealInfoSize); + if(d->sealInfoSize) { + ptr = pack_TPM_PCR_INFO(ptr, &d->sealInfo); + } + ptr = pack_UINT32(ptr, d->encDataSize); + ptr = pack_BUFFER(ptr, d->encData, d->encDataSize); + return ptr; +} + +inline BYTE* unpack_TPM_STORED_DATA(BYTE* ptr, TPM_STORED_DATA* d, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &d->ver); + ptr = unpack_UINT32(ptr, &d->sealInfoSize); + if(d->sealInfoSize) { + ptr = unpack_TPM_PCR_INFO(ptr, &d->sealInfo, alloc); + } + ptr = unpack_UINT32(ptr, &d->encDataSize); + ptr = unpack_PTR(ptr, &d->encData, d->encDataSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) { + ptr = pack_TPM_AUTH_HANDLE(ptr, auth->AuthHandle); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + ptr = pack_TPM_AUTHDATA(ptr, &auth->HMAC); + return ptr; +} + +inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) { + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = unpack_BOOL(ptr, &auth->fContinueAuthSession); + ptr = unpack_TPM_AUTHDATA(ptr, &auth->HMAC); + return ptr; +} + +inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr, + TPM_TAG tag, + UINT32 size, + TPM_COMMAND_CODE ord) { + ptr = pack_UINT16(ptr, tag); + ptr = pack_UINT32(ptr, size); + return pack_UINT32(ptr, ord); +} + +inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr, + TPM_TAG* tag, + UINT32* size, + TPM_COMMAND_CODE* ord) { + ptr = unpack_UINT16(ptr, tag); + ptr = unpack_UINT32(ptr, size); + ptr = unpack_UINT32(ptr, ord); + return ptr; +} + +#define pack_TPM_RSP_HEADER(p, t, s, r) pack_TPM_RQU_HEADER(p, t, s, r); +#define unpack_TPM_RSP_HEADER(p, t, s, r) unpack_TPM_RQU_HEADER(p, t, s, r); + +#endif diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg new file mode 100644 index 0000000..3fb383d --- /dev/null +++ b/stubdom/vtpmmgr/minios.cfg @@ -0,0 +1,14 @@ +CONFIG_TPMFRONT=y +CONFIG_TPM_TIS=y +CONFIG_TPMBACK=y +CONFIG_START_NETWORK=n +CONFIG_TEST=n +CONFIG_PCIFRONT=n +CONFIG_BLKFRONT=y +CONFIG_NETFRONT=n +CONFIG_FBFRONT=n +CONFIG_KBDFRONT=n +CONFIG_CONSFRONT=n +CONFIG_XENBUS=y +CONFIG_LWIP=n +CONFIG_XC=n diff --git a/stubdom/vtpmmgr/tcg.h b/stubdom/vtpmmgr/tcg.h new file mode 100644 index 0000000..7687eae --- /dev/null +++ b/stubdom/vtpmmgr/tcg.h @@ -0,0 +1,707 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005 Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __TCG_H__ +#define __TCG_H__ + +#include +#include + +// **************************** CONSTANTS ********************************* + +// BOOL values +#define TRUE 0x01 +#define FALSE 0x00 + +#define TCPA_MAX_BUFFER_LENGTH 0x2000 + +// +// TPM_COMMAND_CODE values +#define TPM_PROTECTED_ORDINAL 0x00000000UL +#define TPM_UNPROTECTED_ORDINAL 0x80000000UL +#define TPM_CONNECTION_ORDINAL 0x40000000UL +#define TPM_VENDOR_ORDINAL 0x20000000UL + +#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveContext (184UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadContext (185UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_FlushSpecific (186UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PCR_Reset (200UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_DefineSpace (204UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_WriteValue (205UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_WriteValueAuth (206UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_ReadValue (207UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_ReadValueAuth (208UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_UpdateVerification (209UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_Manage (210UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_CreateKeyDelegation (212UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_CreateOwnerDelegation (213UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_VerifyDelegation (214UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_LoadOwnerDelegation (216UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_ReadAuth (217UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_ReadTable (219UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateCounter (220UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_IncrementCounter (221UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadCounter (222UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseCounter (223UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseCounterOwner (224UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_EstablishTransport (230UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ExecuteTransport (231UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseTransportSigned (232UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetTicks (241UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_TickStampBlob (242UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_MAX (256UL + TPM_PROTECTED_ORDINAL) + +#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) + + + +// +// TPM_RESULT values +// +// just put in the whole table from spec 1.2 + +#define TPM_BASE 0x0 // The start of TPM return codes +#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands +#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. + +#define TPM_SUCCESS TPM_BASE // Successful completion of the operation +#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed +#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect +#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad +#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. +#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access +#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated +#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled +#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled +#define TPM_FAIL TPM_BASE + 9 // The operation failed +#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent +#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled +#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid +#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found +#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme +#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed +#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted +#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. +#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set +#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM +#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner +#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. +#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short +#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. +#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. +#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value +#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. +#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. +#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. +#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization +#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid +#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM +#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. +#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. +#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. +#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed +#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed +#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed +#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup +#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information +#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM + +#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. +#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. +#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key +#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. +#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value +#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability +#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions +#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also +#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success +#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute +#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport +#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed +#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource +#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode +#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID +#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available +#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command +#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key +#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization +#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable +#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation +#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to +#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area +#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match +#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to +#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict +#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent +#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. +#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect +#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area +#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large +#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded +#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set +#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded +#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked +#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family +#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled +#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session + +// TPM_STARTUP_TYPE values +#define TPM_ST_CLEAR 0x0001 +#define TPM_ST_STATE 0x0002 +#define TPM_ST_DEACTIVATED 0x003 + +// TPM_TAG values +#define TPM_TAG_RQU_COMMAND 0x00c1 +#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 +#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 +#define TPM_TAG_RSP_COMMAND 0x00c4 +#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 +#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 + +// TPM_PAYLOAD_TYPE values +#define TPM_PT_ASYM 0x01 +#define TPM_PT_BIND 0x02 +#define TPM_PT_MIGRATE 0x03 +#define TPM_PT_MAINT 0x04 +#define TPM_PT_SEAL 0x05 + +// TPM_ENTITY_TYPE values +#define TPM_ET_KEYHANDLE 0x0001 +#define TPM_ET_OWNER 0x0002 +#define TPM_ET_DATA 0x0003 +#define TPM_ET_SRK 0x0004 +#define TPM_ET_KEY 0x0005 + +/// TPM_ResourceTypes +#define TPM_RT_KEY 0x00000001 +#define TPM_RT_AUTH 0x00000002 +#define TPM_RT_HASH 0x00000003 +#define TPM_RT_TRANS 0x00000004 +#define TPM_RT_CONTEXT 0x00000005 +#define TPM_RT_COUNTER 0x00000006 +#define TPM_RT_DELEGATE 0x00000007 +#define TPM_RT_DAA_TPM 0x00000008 +#define TPM_RT_DAA_V0 0x00000009 +#define TPM_RT_DAA_V1 0x0000000A + + + +// TPM_PROTOCOL_ID values +#define TPM_PID_OIAP 0x0001 +#define TPM_PID_OSAP 0x0002 +#define TPM_PID_ADIP 0x0003 +#define TPM_PID_ADCP 0x0004 +#define TPM_PID_OWNER 0x0005 + +// TPM_ALGORITHM_ID values +#define TPM_ALG_RSA 0x00000001 +#define TPM_ALG_SHA 0x00000004 +#define TPM_ALG_HMAC 0x00000005 +#define TPM_ALG_AES128 0x00000006 +#define TPM_ALG_MFG1 0x00000007 +#define TPM_ALG_AES192 0x00000008 +#define TPM_ALG_AES256 0x00000009 +#define TPM_ALG_XOR 0x0000000A + +// TPM_ENC_SCHEME values +#define TPM_ES_NONE 0x0001 +#define TPM_ES_RSAESPKCSv15 0x0002 +#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 + +// TPM_SIG_SCHEME values +#define TPM_SS_NONE 0x0001 +#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 +#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 + +/* + * TPM_CAPABILITY_AREA Values for TPM_GetCapability ([TPM_Part2], Section 21.1) + */ +#define TPM_CAP_ORD 0x00000001 +#define TPM_CAP_ALG 0x00000002 +#define TPM_CAP_PID 0x00000003 +#define TPM_CAP_FLAG 0x00000004 +#define TPM_CAP_PROPERTY 0x00000005 +#define TPM_CAP_VERSION 0x00000006 +#define TPM_CAP_KEY_HANDLE 0x00000007 +#define TPM_CAP_CHECK_LOADED 0x00000008 +#define TPM_CAP_SYM_MODE 0x00000009 +#define TPM_CAP_KEY_STATUS 0x0000000C +#define TPM_CAP_NV_LIST 0x0000000D +#define TPM_CAP_MFR 0x00000010 +#define TPM_CAP_NV_INDEX 0x00000011 +#define TPM_CAP_TRANS_ALG 0x00000012 +#define TPM_CAP_HANDLE 0x00000014 +#define TPM_CAP_TRANS_ES 0x00000015 +#define TPM_CAP_AUTH_ENCRYPT 0x00000017 +#define TPM_CAP_SELECT_SIZE 0x00000018 +#define TPM_CAP_DA_LOGIC 0x00000019 +#define TPM_CAP_VERSION_VAL 0x0000001A + +/* subCap definitions ([TPM_Part2], Section 21.2) */ +#define TPM_CAP_PROP_PCR 0x00000101 +#define TPM_CAP_PROP_DIR 0x00000102 +#define TPM_CAP_PROP_MANUFACTURER 0x00000103 +#define TPM_CAP_PROP_KEYS 0x00000104 +#define TPM_CAP_PROP_MIN_COUNTER 0x00000107 +#define TPM_CAP_FLAG_PERMANENT 0x00000108 +#define TPM_CAP_FLAG_VOLATILE 0x00000109 +#define TPM_CAP_PROP_AUTHSESS 0x0000010A +#define TPM_CAP_PROP_TRANSESS 0x0000010B +#define TPM_CAP_PROP_COUNTERS 0x0000010C +#define TPM_CAP_PROP_MAX_AUTHSESS 0x0000010D +#define TPM_CAP_PROP_MAX_TRANSESS 0x0000010E +#define TPM_CAP_PROP_MAX_COUNTERS 0x0000010F +#define TPM_CAP_PROP_MAX_KEYS 0x00000110 +#define TPM_CAP_PROP_OWNER 0x00000111 +#define TPM_CAP_PROP_CONTEXT 0x00000112 +#define TPM_CAP_PROP_MAX_CONTEXT 0x00000113 +#define TPM_CAP_PROP_FAMILYROWS 0x00000114 +#define TPM_CAP_PROP_TIS_TIMEOUT 0x00000115 +#define TPM_CAP_PROP_STARTUP_EFFECT 0x00000116 +#define TPM_CAP_PROP_DELEGATE_ROW 0x00000117 +#define TPM_CAP_PROP_MAX_DAASESS 0x00000119 +#define TPM_CAP_PROP_DAASESS 0x0000011A +#define TPM_CAP_PROP_CONTEXT_DIST 0x0000011B +#define TPM_CAP_PROP_DAA_INTERRUPT 0x0000011C +#define TPM_CAP_PROP_SESSIONS 0x0000011D +#define TPM_CAP_PROP_MAX_SESSIONS 0x0000011E +#define TPM_CAP_PROP_CMK_RESTRICTION 0x0000011F +#define TPM_CAP_PROP_DURATION 0x00000120 +#define TPM_CAP_PROP_ACTIVE_COUNTER 0x00000122 +#define TPM_CAP_PROP_MAX_NV_AVAILABLE 0x00000123 +#define TPM_CAP_PROP_INPUT_BUFFER 0x00000124 + +// TPM_KEY_USAGE values +#define TPM_KEY_EK 0x0000 +#define TPM_KEY_SIGNING 0x0010 +#define TPM_KEY_STORAGE 0x0011 +#define TPM_KEY_IDENTITY 0x0012 +#define TPM_KEY_AUTHCHANGE 0X0013 +#define TPM_KEY_BIND 0x0014 +#define TPM_KEY_LEGACY 0x0015 + +// TPM_AUTH_DATA_USAGE values +#define TPM_AUTH_NEVER 0x00 +#define TPM_AUTH_ALWAYS 0x01 + +// Key Handle of owner and srk +#define TPM_OWNER_KEYHANDLE 0x40000001 +#define TPM_SRK_KEYHANDLE 0x40000000 + + + +// *************************** TYPEDEFS ********************************* +typedef unsigned char BYTE; +typedef unsigned char BOOL; +typedef uint16_t UINT16; +typedef uint32_t UINT32; +typedef uint64_t UINT64; + +typedef UINT32 TPM_RESULT; +typedef UINT32 TPM_PCRINDEX; +typedef UINT32 TPM_DIRINDEX; +typedef UINT32 TPM_HANDLE; +typedef TPM_HANDLE TPM_AUTHHANDLE; +typedef TPM_HANDLE TCPA_HASHHANDLE; +typedef TPM_HANDLE TCPA_HMACHANDLE; +typedef TPM_HANDLE TCPA_ENCHANDLE; +typedef TPM_HANDLE TPM_KEY_HANDLE; +typedef TPM_HANDLE TCPA_ENTITYHANDLE; +typedef UINT32 TPM_RESOURCE_TYPE; +typedef UINT32 TPM_COMMAND_CODE; +typedef UINT16 TPM_PROTOCOL_ID; +typedef BYTE TPM_AUTH_DATA_USAGE; +typedef UINT16 TPM_ENTITY_TYPE; +typedef UINT32 TPM_ALGORITHM_ID; +typedef UINT16 TPM_KEY_USAGE; +typedef UINT16 TPM_STARTUP_TYPE; +typedef UINT32 TPM_CAPABILITY_AREA; +typedef UINT16 TPM_ENC_SCHEME; +typedef UINT16 TPM_SIG_SCHEME; +typedef UINT16 TPM_MIGRATE_SCHEME; +typedef UINT16 TPM_PHYSICAL_PRESENCE; +typedef UINT32 TPM_KEY_FLAGS; + +#define TPM_DIGEST_SIZE 20 // Don't change this +typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; +typedef TPM_AUTHDATA TPM_SECRET; +typedef TPM_AUTHDATA TPM_ENCAUTH; +typedef BYTE TPM_PAYLOAD_TYPE; +typedef UINT16 TPM_TAG; +typedef UINT16 TPM_STRUCTURE_TAG; + +// Data Types of the TCS +typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session +typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle +typedef UINT32 TCS_KEY_HANDLE; // Basic key handle + +// ************************* STRUCTURES ********************************** + +typedef struct TPM_VERSION { + BYTE major; + BYTE minor; + BYTE revMajor; + BYTE revMinor; +} TPM_VERSION; + +static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; + +typedef struct TPM_CAP_VERSION_INFO { + TPM_STRUCTURE_TAG tag; + TPM_VERSION version; + UINT16 specLevel; + BYTE errataRev; + BYTE tpmVendorID[4]; + UINT16 vendorSpecificSize; + BYTE* vendorSpecific; +} TPM_CAP_VERSION_INFO; + +inline void free_TPM_CAP_VERSION_INFO(TPM_CAP_VERSION_INFO* v) { + free(v->vendorSpecific); + v->vendorSpecific = NULL; +} + +typedef struct TPM_DIGEST { + BYTE digest[TPM_DIGEST_SIZE]; +} TPM_DIGEST; + +typedef TPM_DIGEST TPM_PCRVALUE; +typedef TPM_DIGEST TPM_COMPOSITE_HASH; +typedef TPM_DIGEST TPM_DIRVALUE; +typedef TPM_DIGEST TPM_HMAC; +typedef TPM_DIGEST TPM_CHOSENID_HASH; + +typedef struct TPM_NONCE { + BYTE nonce[TPM_DIGEST_SIZE]; +} TPM_NONCE; + +typedef struct TPM_SYMMETRIC_KEY_PARMS { + UINT32 keyLength; + UINT32 blockSize; + UINT32 ivSize; + BYTE* IV; +} TPM_SYMMETRIC_KEY_PARMS; + +inline void free_TPM_SYMMETRIC_KEY_PARMS(TPM_SYMMETRIC_KEY_PARMS* p) { + free(p->IV); + p->IV = NULL; +} + +#define TPM_SYMMETRIC_KEY_PARMS_INIT { 0, 0, 0, NULL } + +typedef struct TPM_RSA_KEY_PARMS { + UINT32 keyLength; + UINT32 numPrimes; + UINT32 exponentSize; + BYTE* exponent; +} TPM_RSA_KEY_PARMS; + +#define TPM_RSA_KEY_PARMS_INIT { 0, 0, 0, NULL } + +inline void free_TPM_RSA_KEY_PARMS(TPM_RSA_KEY_PARMS* p) { + free(p->exponent); + p->exponent = NULL; +} + +typedef struct TPM_KEY_PARMS { + TPM_ALGORITHM_ID algorithmID; + TPM_ENC_SCHEME encScheme; + TPM_SIG_SCHEME sigScheme; + UINT32 parmSize; + union { + TPM_SYMMETRIC_KEY_PARMS sym; + TPM_RSA_KEY_PARMS rsa; + } parms; +} TPM_KEY_PARMS; + +#define TPM_KEY_PARMS_INIT { 0, 0, 0, 0 } + +inline void free_TPM_KEY_PARMS(TPM_KEY_PARMS* p) { + if(p->parmSize) { + switch(p->algorithmID) { + case TPM_ALG_RSA: + free_TPM_RSA_KEY_PARMS(&p->parms.rsa); + break; + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + free_TPM_SYMMETRIC_KEY_PARMS(&p->parms.sym); + break; + } + } +} + +typedef struct TPM_STORE_PUBKEY { + UINT32 keyLength; + BYTE* key; +} TPM_STORE_PUBKEY; + +#define TPM_STORE_PUBKEY_INIT { 0, NULL } + +inline void free_TPM_STORE_PUBKEY(TPM_STORE_PUBKEY* p) { + free(p->key); + p->key = NULL; +} + +typedef struct TPM_PUBKEY { + TPM_KEY_PARMS algorithmParms; + TPM_STORE_PUBKEY pubKey; +} TPM_PUBKEY; + +#define TPM_PUBKEY_INIT { TPM_KEY_PARMS_INIT, TPM_STORE_PUBKEY_INIT } + +inline void free_TPM_PUBKEY(TPM_PUBKEY* k) { + free_TPM_KEY_PARMS(&k->algorithmParms); + free_TPM_STORE_PUBKEY(&k->pubKey); +} + +typedef struct TPM_PCR_SELECTION { + UINT16 sizeOfSelect; + BYTE* pcrSelect; +} TPM_PCR_SELECTION; + +#define TPM_PCR_SELECTION_INIT { 0, NULL } + +inline void free_TPM_PCR_SELECTION(TPM_PCR_SELECTION* p) { + free(p->pcrSelect); + p->pcrSelect = NULL; +} + +typedef struct TPM_PCR_INFO { + TPM_PCR_SELECTION pcrSelection; + TPM_COMPOSITE_HASH digestAtRelease; + TPM_COMPOSITE_HASH digestAtCreation; +} TPM_PCR_INFO; + +#define TPM_PCR_INFO_INIT { TPM_PCR_SELECTION_INIT } + +inline void free_TPM_PCR_INFO(TPM_PCR_INFO* p) { + free_TPM_PCR_SELECTION(&p->pcrSelection); +} + +typedef struct TPM_PCR_COMPOSITE { + TPM_PCR_SELECTION select; + UINT32 valueSize; + TPM_PCRVALUE* pcrValue; +} TPM_PCR_COMPOSITE; + +#define TPM_PCR_COMPOSITE_INIT { TPM_PCR_SELECTION_INIT, 0, NULL } + +inline void free_TPM_PCR_COMPOSITE(TPM_PCR_COMPOSITE* p) { + free_TPM_PCR_SELECTION(&p->select); + free(p->pcrValue); + p->pcrValue = NULL; +} + +typedef struct TPM_KEY { + TPM_VERSION ver; + TPM_KEY_USAGE keyUsage; + TPM_KEY_FLAGS keyFlags; + TPM_AUTH_DATA_USAGE authDataUsage; + TPM_KEY_PARMS algorithmParms; + UINT32 PCRInfoSize; + TPM_PCR_INFO PCRInfo; + TPM_STORE_PUBKEY pubKey; + UINT32 encDataSize; + BYTE* encData; +} TPM_KEY; + +#define TPM_KEY_INIT { .algorithmParms = TPM_KEY_PARMS_INIT,\ + .PCRInfoSize = 0, .PCRInfo = TPM_PCR_INFO_INIT, \ + .pubKey = TPM_STORE_PUBKEY_INIT, \ + .encDataSize = 0, .encData = NULL } + +inline void free_TPM_KEY(TPM_KEY* k) { + if(k->PCRInfoSize) { + free_TPM_PCR_INFO(&k->PCRInfo); + } + free_TPM_STORE_PUBKEY(&k->pubKey); + free(k->encData); + k->encData = NULL; +} + +typedef struct TPM_BOUND_DATA { + TPM_VERSION ver; + TPM_PAYLOAD_TYPE payload; + BYTE* payloadData; +} TPM_BOUND_DATA; + +#define TPM_BOUND_DATA_INIT { .payloadData = NULL } + +inline void free_TPM_BOUND_DATA(TPM_BOUND_DATA* d) { + free(d->payloadData); + d->payloadData = NULL; +} + +typedef struct TPM_STORED_DATA { + TPM_VERSION ver; + UINT32 sealInfoSize; + TPM_PCR_INFO sealInfo; + UINT32 encDataSize; + BYTE* encData; +} TPM_STORED_DATA; + +#define TPM_STORED_DATA_INIT { .sealInfoSize = 0, sealInfo = TPM_PCR_INFO_INIT,\ + .encDataSize = 0, .encData = NULL } + +inline void free_TPM_STORED_DATA(TPM_STORED_DATA* d) { + if(d->sealInfoSize) { + free_TPM_PCR_INFO(&d->sealInfo); + } + free(d->encData); + d->encData = NULL; +} + +typedef struct TPM_AUTH_SESSION { + TPM_AUTHHANDLE AuthHandle; + TPM_NONCE NonceOdd; // system + TPM_NONCE NonceEven; // TPM + BOOL fContinueAuthSession; + TPM_AUTHDATA HMAC; +} TPM_AUTH_SESSION; + +#define TPM_AUTH_SESSION_INIT { .AuthHandle = 0, .fContinueAuthSession = FALSE } + +// ---------------------- Functions for checking TPM_RESULTs ----------------- + +#include + +// FIXME: Review use of these and delete unneeded ones. + +// these are really badly dependent on local structure: +// DEPENDS: local var 'status' of type TPM_RESULT +// DEPENDS: label 'abort_egress' which cleans up and returns the status +#define ERRORDIE(s) do { status = s; \ + fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ + goto abort_egress; } \ + while (0) + +// DEPENDS: local var 'status' of type TPM_RESULT +// DEPENDS: label 'abort_egress' which cleans up and returns the status +// Try command c. If it fails, set status to s and goto abort. +#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ + status = s; \ + printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ + goto abort_egress; \ + } else {\ + status = c; \ + } + +// Try command c. If it fails, print error message, set status to actual return code. Goto abort +#define TPMTRYRETURN(c) do { status = c; \ + if (status != TPM_SUCCESS) { \ + fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ + goto abort_egress; \ + } \ + } while(0) + + +#endif //__TCPA_H__ diff --git a/stubdom/vtpmmgr/tpm.c b/stubdom/vtpmmgr/tpm.c new file mode 100644 index 0000000..123a27c --- /dev/null +++ b/stubdom/vtpmmgr/tpm.c @@ -0,0 +1,938 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include +#include +#include + +#include + +#include "tcg.h" +#include "tpm.h" +#include "log.h" +#include "marshal.h" +#include "tpmrsa.h" +#include "vtpmmgr.h" + +#define TCPA_MAX_BUFFER_LENGTH 0x2000 + +#define TPM_BEGIN(TAG, ORD) \ + const TPM_TAG intag = TAG;\ +TPM_TAG tag = intag;\ +UINT32 paramSize;\ +const TPM_COMMAND_CODE ordinal = ORD;\ +TPM_RESULT status = TPM_SUCCESS;\ +BYTE in_buf[TCPA_MAX_BUFFER_LENGTH];\ +BYTE out_buf[TCPA_MAX_BUFFER_LENGTH];\ +UINT32 out_len = sizeof(out_buf);\ +BYTE* ptr = in_buf;\ +/*Print a log message */\ +vtpmloginfo(VTPM_LOG_TPM, "%s\n", __func__);\ +/* Pack the header*/\ +ptr = pack_TPM_TAG(ptr, tag);\ +ptr += sizeof(UINT32);\ +ptr = pack_TPM_COMMAND_CODE(ptr, ordinal)\ + +#define TPM_AUTH_BEGIN() \ + sha1_context sha1_ctx;\ +BYTE* authbase = ptr - sizeof(TPM_COMMAND_CODE);\ +TPM_DIGEST paramDigest;\ +sha1_starts(&sha1_ctx) + +#define TPM_AUTH1_GEN(HMACkey, auth) do {\ + sha1_finish(&sha1_ctx, paramDigest.digest);\ + generateAuth(¶mDigest, HMACkey, auth);\ + ptr = pack_TPM_AUTH_SESSION(ptr, auth);\ +} while(0) + +#define TPM_AUTH2_GEN(HMACkey, auth) do {\ + generateAuth(¶mDigest, HMACkey, auth);\ + ptr = pack_TPM_AUTH_SESSION(ptr, auth);\ +} while(0) + +#define TPM_TRANSMIT() do {\ + /* Pack the command size */\ + paramSize = ptr - in_buf;\ + pack_UINT32(in_buf + sizeof(TPM_TAG), paramSize);\ + if((status = TPM_TransmitData(in_buf, paramSize, out_buf, &out_len)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH_VERIFY_BEGIN() do {\ + UINT32 buf[2] = { cpu_to_be32(status), cpu_to_be32(ordinal) };\ + sha1_starts(&sha1_ctx);\ + sha1_update(&sha1_ctx, (unsigned char*)buf, sizeof(buf));\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH1_VERIFY(HMACkey, auth) do {\ + sha1_finish(&sha1_ctx, paramDigest.digest);\ + ptr = unpack_TPM_AUTH_SESSION(ptr, auth);\ + if((status = verifyAuth(¶mDigest, HMACkey, auth)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH2_VERIFY(HMACkey, auth) do {\ + ptr = unpack_TPM_AUTH_SESSION(ptr, auth);\ + if((status = verifyAuth(¶mDigest, HMACkey, auth)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + + + +#define TPM_UNPACK_VERIFY() do { \ + ptr = out_buf;\ + ptr = unpack_TPM_RSP_HEADER(ptr, \ + &(tag), &(paramSize), &(status));\ + if((status) != TPM_SUCCESS || (tag) != (intag +3)) { \ + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(status));\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH_HASH() do {\ + sha1_update(&sha1_ctx, authbase, ptr - authbase);\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH_SKIP() do {\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH_ERR_CHECK(auth) do {\ + if(status != TPM_SUCCESS || auth->fContinueAuthSession == FALSE) {\ + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x closed by TPM\n", auth->AuthHandle);\ + auth->AuthHandle = 0;\ + }\ +} while(0) + +static void xorEncrypt(const TPM_SECRET* sharedSecret, + TPM_NONCE* nonce, + const TPM_AUTHDATA* inAuth0, + TPM_ENCAUTH outAuth0, + const TPM_AUTHDATA* inAuth1, + TPM_ENCAUTH outAuth1) { + BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; + BYTE XORkey[TPM_DIGEST_SIZE]; + BYTE* ptr = XORbuffer; + ptr = pack_TPM_SECRET(ptr, sharedSecret); + ptr = pack_TPM_NONCE(ptr, nonce); + + sha1(XORbuffer, ptr - XORbuffer, XORkey); + + if(inAuth0) { + for(int i = 0; i < TPM_DIGEST_SIZE; ++i) { + outAuth0[i] = XORkey[i] ^ (*inAuth0)[i]; + } + } + if(inAuth1) { + for(int i = 0; i < TPM_DIGEST_SIZE; ++i) { + outAuth1[i] = XORkey[i] ^ (*inAuth1)[i]; + } + } + +} + +static void generateAuth(const TPM_DIGEST* paramDigest, + const TPM_SECRET* HMACkey, + TPM_AUTH_SESSION *auth) +{ + //Generate new OddNonce + vtpmmgr_rand((BYTE*)auth->NonceOdd.nonce, sizeof(TPM_NONCE)); + + // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). + BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; + BYTE* ptr = hmacText; + + ptr = pack_TPM_DIGEST(ptr, paramDigest); + ptr = pack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + + sha1_hmac((BYTE *) HMACkey, sizeof(TPM_DIGEST), + (BYTE *) hmacText, sizeof(hmacText), + auth->HMAC); +} + +static TPM_RESULT verifyAuth(const TPM_DIGEST* paramDigest, + /*[IN]*/ const TPM_SECRET *HMACkey, + /*[IN,OUT]*/ TPM_AUTH_SESSION *auth) +{ + + // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). + TPM_AUTHDATA hm; + BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; + BYTE* ptr = hmacText; + + ptr = pack_TPM_DIGEST(ptr, paramDigest); + ptr = pack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + + sha1_hmac( (BYTE *) HMACkey, sizeof(TPM_DIGEST), + (BYTE *) hmacText, sizeof(hmacText), + hm); + + // Compare correct HMAC with provided one. + if (memcmp(hm, auth->HMAC, sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality + return TPM_SUCCESS; + } else { + vtpmlogerror(VTPM_LOG_TPM, "Auth Session verification failed!\n"); + return TPM_AUTHFAIL; + } +} + + + +// ------------------------------------------------------------------ +// Authorization Commands +// ------------------------------------------------------------------ + +TPM_RESULT TPM_OIAP(TPM_AUTH_SESSION* auth) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_OIAP); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); + auth->fContinueAuthSession = TRUE; + + ptr = unpack_UINT32(ptr, &auth->AuthHandle); + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_OSAP(TPM_ENTITY_TYPE entityType, // in + UINT32 entityValue, // in + const TPM_AUTHDATA* usageAuth, //in + TPM_SECRET *sharedSecret, //out + TPM_AUTH_SESSION *auth) +{ + BYTE* nonceOddOSAP; + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_OSAP); + + ptr = pack_TPM_ENTITY_TYPE(ptr, entityType); + ptr = pack_UINT32(ptr, entityValue); + + //nonce Odd OSAP + nonceOddOSAP = ptr; + vtpmmgr_rand(ptr, TPM_DIGEST_SIZE); + ptr += TPM_DIGEST_SIZE; + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, &auth->AuthHandle); + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + + //Calculate session secret + sha1_context ctx; + sha1_hmac_starts(&ctx, *usageAuth, TPM_DIGEST_SIZE); + sha1_hmac_update(&ctx, ptr, TPM_DIGEST_SIZE); //ptr = nonceEvenOSAP + sha1_hmac_update(&ctx, nonceOddOSAP, TPM_DIGEST_SIZE); + sha1_hmac_finish(&ctx, *sharedSecret); + + memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); + auth->fContinueAuthSession = FALSE; + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_TakeOwnership( + const TPM_PUBKEY *pubEK, //in + const TPM_AUTHDATA* ownerAuth, //in + const TPM_AUTHDATA* srkAuth, //in + const TPM_KEY* inSrk, //in + TPM_KEY* outSrk, //out, optional + TPM_AUTH_SESSION* auth) // in, out +{ + int keyAlloced = 0; + tpmrsa_context ek_rsa = TPMRSA_CTX_INIT; + + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_TakeOwnership); + TPM_AUTH_BEGIN(); + + tpmrsa_set_pubkey(&ek_rsa, + pubEK->pubKey.key, pubEK->pubKey.keyLength, + pubEK->algorithmParms.parms.rsa.exponent, + pubEK->algorithmParms.parms.rsa.exponentSize); + + /* Pack the protocol ID */ + ptr = pack_UINT16(ptr, TPM_PID_OWNER); + + /* Pack the encrypted owner auth */ + ptr = pack_UINT32(ptr, pubEK->algorithmParms.parms.rsa.keyLength / 8); + tpmrsa_pub_encrypt_oaep(&ek_rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + sizeof(TPM_SECRET), + (BYTE*) ownerAuth, + ptr); + ptr += pubEK->algorithmParms.parms.rsa.keyLength / 8; + + /* Pack the encrypted srk auth */ + ptr = pack_UINT32(ptr, pubEK->algorithmParms.parms.rsa.keyLength / 8); + tpmrsa_pub_encrypt_oaep(&ek_rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + sizeof(TPM_SECRET), + (BYTE*) srkAuth, + ptr); + ptr += pubEK->algorithmParms.parms.rsa.keyLength / 8; + + /* Pack the Srk key */ + ptr = pack_TPM_KEY(ptr, inSrk); + + /* Hash everything up to here */ + TPM_AUTH_HASH(); + + /* Generate the authorization */ + TPM_AUTH1_GEN(ownerAuth, auth); + + /* Send the command to the tpm*/ + TPM_TRANSMIT(); + /* Unpack and validate the header */ + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + if(outSrk != NULL) { + /* If the user wants a copy of the srk we give it to them */ + keyAlloced = 1; + ptr = unpack_TPM_KEY(ptr, outSrk, UNPACK_ALLOC); + } else { + /*otherwise just parse past it */ + TPM_KEY temp; + ptr = unpack_TPM_KEY(ptr, &temp, UNPACK_ALIAS); + } + + /* Hash the output key */ + TPM_AUTH_HASH(); + + /* Verify authorizaton */ + TPM_AUTH1_VERIFY(ownerAuth, auth); + + goto egress; +abort_egress: + if(keyAlloced) { + free_TPM_KEY(outSrk); + } +egress: + tpmrsa_free(&ek_rsa); + TPM_AUTH_ERR_CHECK(auth); + return status; +} + + +TPM_RESULT TPM_DisablePubekRead ( + const TPM_AUTHDATA* ownerAuth, + TPM_AUTH_SESSION* auth) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_DisablePubekRead); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(ownerAuth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + TPM_AUTH1_VERIFY(ownerAuth, auth); + +abort_egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + + +TPM_RESULT TPM_TerminateHandle(TPM_AUTHHANDLE handle) // in +{ + if(handle == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_Terminate_Handle); + + ptr = pack_TPM_AUTHHANDLE(ptr, handle); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x closed by TPM_TerminateHandle\n", handle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_Extend( TPM_PCRINDEX pcrNum, // in + TPM_DIGEST inDigest, // in + TPM_PCRVALUE* outDigest) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_Extend); + + ptr = pack_TPM_PCRINDEX(ptr, pcrNum); + ptr = pack_TPM_DIGEST(ptr, &inDigest); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_TPM_PCRVALUE(ptr, outDigest); + +abort_egress: + return status; +} + +TPM_RESULT TPM_Seal( + TPM_KEY_HANDLE keyHandle, // in + UINT32 pcrInfoSize, // in + TPM_PCR_INFO* pcrInfo, // in + UINT32 inDataSize, // in + const BYTE* inData, // in + TPM_STORED_DATA* sealedData, //out + const TPM_SECRET* osapSharedSecret, //in + const TPM_AUTHDATA* sealedDataAuth, //in + TPM_AUTH_SESSION* pubAuth // in, out + ) +{ + int dataAlloced = 0; + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_Seal); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, keyHandle); + + TPM_AUTH_SKIP(); + + xorEncrypt(osapSharedSecret, &pubAuth->NonceEven, + sealedDataAuth, ptr, + NULL, NULL); + ptr += sizeof(TPM_ENCAUTH); + + ptr = pack_UINT32(ptr, pcrInfoSize); + ptr = pack_TPM_PCR_INFO(ptr, pcrInfo); + + ptr = pack_UINT32(ptr, inDataSize); + ptr = pack_BUFFER(ptr, inData, inDataSize); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(osapSharedSecret, pubAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_TPM_STORED_DATA(ptr, sealedData, UNPACK_ALLOC); + dataAlloced = 1; + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(osapSharedSecret, pubAuth); + + goto egress; +abort_egress: + if(dataAlloced) { + free_TPM_STORED_DATA(sealedData); + } +egress: + TPM_AUTH_ERR_CHECK(pubAuth); + return status; +} + +TPM_RESULT TPM_Unseal( + TPM_KEY_HANDLE parentHandle, // in + const TPM_STORED_DATA* sealedData, + UINT32* outSize, // out + BYTE** out, //out + const TPM_AUTHDATA* key_usage_auth, //in + const TPM_AUTHDATA* data_usage_auth, //in + TPM_AUTH_SESSION* keyAuth, // in, out + TPM_AUTH_SESSION* dataAuth // in, out + ) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH2_COMMAND, TPM_ORD_Unseal); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, parentHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_TPM_STORED_DATA(ptr, sealedData); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(key_usage_auth, keyAuth); + TPM_AUTH2_GEN(data_usage_auth, dataAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, outSize); + ptr = unpack_ALLOC(ptr, out, *outSize); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(key_usage_auth, keyAuth); + TPM_AUTH2_VERIFY(data_usage_auth, dataAuth); + +abort_egress: + TPM_AUTH_ERR_CHECK(keyAuth); + TPM_AUTH_ERR_CHECK(dataAuth); + return status; +} + +TPM_RESULT TPM_Bind( + const TPM_KEY* key, + const BYTE* in, + UINT32 ilen, + BYTE* out) +{ + TPM_RESULT status; + tpmrsa_context rsa = TPMRSA_CTX_INIT; + TPM_BOUND_DATA boundData; + uint8_t plain[TCPA_MAX_BUFFER_LENGTH]; + BYTE* ptr = plain; + + vtpmloginfo(VTPM_LOG_TPM, "%s\n", __func__); + + tpmrsa_set_pubkey(&rsa, + key->pubKey.key, key->pubKey.keyLength, + key->algorithmParms.parms.rsa.exponent, + key->algorithmParms.parms.rsa.exponentSize); + + // Fill boundData's accessory information + boundData.ver = TPM_STRUCT_VER_1_1; + boundData.payload = TPM_PT_BIND; + boundData.payloadData = (BYTE*)in; + + //marshall the bound data object + ptr = pack_TPM_BOUND_DATA(ptr, &boundData, ilen); + + // Encrypt the data + TPMTRYRETURN(tpmrsa_pub_encrypt_oaep(&rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + ptr - plain, + plain, + out)); + +abort_egress: + tpmrsa_free(&rsa); + return status; + +} + +TPM_RESULT TPM_UnBind( + TPM_KEY_HANDLE keyHandle, // in + UINT32 ilen, //in + const BYTE* in, // + UINT32* olen, // + BYTE* out, //out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth //in, out + ) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_UnBind); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, keyHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_UINT32(ptr, ilen); + ptr = pack_BUFFER(ptr, in, ilen); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(usage_auth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, olen); + if(*olen > ilen) { + vtpmlogerror(VTPM_LOG_TPM, "Output length < input length!\n"); + status = TPM_IOERROR; + goto abort_egress; + } + ptr = unpack_BUFFER(ptr, out, *olen); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(usage_auth, auth); + +abort_egress: +egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + +TPM_RESULT TPM_CreateWrapKey( + TPM_KEY_HANDLE hWrappingKey, // in + const TPM_AUTHDATA* osapSharedSecret, + const TPM_AUTHDATA* dataUsageAuth, //in + const TPM_AUTHDATA* dataMigrationAuth, //in + TPM_KEY* key, //in, out + TPM_AUTH_SESSION* pAuth) // in, out +{ + int keyAlloced = 0; + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_CreateWrapKey); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, hWrappingKey); + + TPM_AUTH_SKIP(); + + //Encrypted auths + xorEncrypt(osapSharedSecret, &pAuth->NonceEven, + dataUsageAuth, ptr, + dataMigrationAuth, ptr + sizeof(TPM_ENCAUTH)); + ptr += sizeof(TPM_ENCAUTH) * 2; + + ptr = pack_TPM_KEY(ptr, key); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(osapSharedSecret, pAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + keyAlloced = 1; + ptr = unpack_TPM_KEY(ptr, key, UNPACK_ALLOC); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(osapSharedSecret, pAuth); + + goto egress; +abort_egress: + if(keyAlloced) { + free_TPM_KEY(key); + } +egress: + TPM_AUTH_ERR_CHECK(pAuth); + return status; +} + +TPM_RESULT TPM_LoadKey( + TPM_KEY_HANDLE parentHandle, // + const TPM_KEY* key, //in + TPM_HANDLE* keyHandle, // out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_LoadKey); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, parentHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_TPM_KEY(ptr, key); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(usage_auth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, keyHandle); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(usage_auth, auth); + + vtpmloginfo(VTPM_LOG_TPM, "Key Handle: 0x%x opened by TPM_LoadKey\n", *keyHandle); + +abort_egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + +TPM_RESULT TPM_EvictKey( TPM_KEY_HANDLE hKey) // in +{ + if(hKey == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_EvictKey); + + ptr = pack_TPM_KEY_HANDLE(ptr, hKey); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + vtpmloginfo(VTPM_LOG_TPM, "Key handle: 0x%x closed by TPM_EvictKey\n", hKey); + +abort_egress: + return status; +} + +TPM_RESULT TPM_FlushSpecific(TPM_HANDLE handle, + TPM_RESOURCE_TYPE rt) { + if(handle == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_FlushSpecific); + + ptr = pack_TPM_HANDLE(ptr, handle); + ptr = pack_TPM_RESOURCE_TYPE(ptr, rt); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + +abort_egress: + return status; +} + +TPM_RESULT TPM_GetRandom( UINT32* bytesRequested, // in, out + BYTE* randomBytes) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_GetRandom); + + // check input params + if (bytesRequested == NULL || randomBytes == NULL){ + return TPM_BAD_PARAMETER; + } + + ptr = pack_UINT32(ptr, *bytesRequested); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, bytesRequested); + ptr = unpack_BUFFER(ptr, randomBytes, *bytesRequested); + +abort_egress: + return status; +} + + +TPM_RESULT TPM_ReadPubek( + TPM_PUBKEY* pubEK //out + ) +{ + BYTE* antiReplay = NULL; + BYTE* kptr = NULL; + BYTE digest[TPM_DIGEST_SIZE]; + sha1_context ctx; + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_ReadPubek); + + //antiReplay nonce + vtpmmgr_rand(ptr, TPM_DIGEST_SIZE); + antiReplay = ptr; + ptr += TPM_DIGEST_SIZE; + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + //unpack and allocate the key + kptr = ptr; + ptr = unpack_TPM_PUBKEY(ptr, pubEK, UNPACK_ALLOC); + + //Verify the checksum + sha1_starts(&ctx); + sha1_update(&ctx, kptr, ptr - kptr); + sha1_update(&ctx, antiReplay, TPM_DIGEST_SIZE); + sha1_finish(&ctx, digest); + + //ptr points to the checksum computed by TPM + if(memcmp(digest, ptr, TPM_DIGEST_SIZE)) { + vtpmlogerror(VTPM_LOG_TPM, "TPM_ReadPubek: Checksum returned by TPM was invalid!\n"); + status = TPM_FAIL; + goto abort_egress; + } + + goto egress; +abort_egress: + if(kptr != NULL) { //If we unpacked the pubEK, we have to free it + free_TPM_PUBKEY(pubEK); + } +egress: + return status; +} + + +TPM_RESULT TPM_SaveState(void) +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_SaveState); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + +abort_egress: + return status; +} + +TPM_RESULT TPM_GetCapability( + TPM_CAPABILITY_AREA capArea, + UINT32 subCapSize, + const BYTE* subCap, + UINT32* respSize, + BYTE** resp) +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_GetCapability); + + ptr = pack_TPM_CAPABILITY_AREA(ptr, capArea); + ptr = pack_UINT32(ptr, subCapSize); + ptr = pack_BUFFER(ptr, subCap, subCapSize); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, respSize); + ptr = unpack_ALLOC(ptr, resp, *respSize); + +abort_egress: + return status; +} + +TPM_RESULT TPM_CreateEndorsementKeyPair( + const TPM_KEY_PARMS* keyInfo, + TPM_PUBKEY* pubEK) +{ + BYTE* kptr = NULL; + sha1_context ctx; + TPM_DIGEST checksum; + TPM_DIGEST hash; + TPM_NONCE antiReplay; + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_CreateEndorsementKeyPair); + + //Make anti replay nonce + vtpmmgr_rand(antiReplay.nonce, sizeof(antiReplay.nonce)); + + ptr = pack_TPM_NONCE(ptr, &antiReplay); + ptr = pack_TPM_KEY_PARMS(ptr, keyInfo); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + sha1_starts(&ctx); + + kptr = ptr; + ptr = unpack_TPM_PUBKEY(ptr, pubEK, UNPACK_ALLOC); + + /* Hash the pub key blob */ + sha1_update(&ctx, kptr, ptr - kptr); + ptr = unpack_TPM_DIGEST(ptr, &checksum); + + sha1_update(&ctx, antiReplay.nonce, sizeof(antiReplay.nonce)); + + sha1_finish(&ctx, hash.digest); + if(memcmp(checksum.digest, hash.digest, TPM_DIGEST_SIZE)) { + vtpmloginfo(VTPM_LOG_VTPM, "TPM_CreateEndorsementKey: Checkum verification failed!\n"); + status = TPM_FAIL; + goto abort_egress; + } + + goto egress; +abort_egress: + if(kptr) { + free_TPM_PUBKEY(pubEK); + } +egress: + return status; +} + +TPM_RESULT TPM_TransmitData( + BYTE* in, + UINT32 insize, + BYTE* out, + UINT32* outsize) { + TPM_RESULT status = TPM_SUCCESS; + + UINT32 i; + vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); + for(i = 0 ; i < insize ; i++) + vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); + + vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); + + ssize_t size = 0; + + // send the request + size = write (vtpm_globals.tpm_fd, in, insize); + if (size < 0) { + vtpmlogerror(VTPM_LOG_TXDATA, "write() failed : %s\n", strerror(errno)); + ERRORDIE (TPM_IOERROR); + } + else if ((UINT32) size < insize) { + vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); + ERRORDIE (TPM_IOERROR); + } + + // read the response + size = read (vtpm_globals.tpm_fd, out, *outsize); + if (size < 0) { + vtpmlogerror(VTPM_LOG_TXDATA, "read() failed : %s\n", strerror(errno)); + ERRORDIE (TPM_IOERROR); + } + + vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); + for(i = 0 ; i < size ; i++) + vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); + + vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); + + *outsize = size; + goto egress; + +abort_egress: +egress: + return status; +} diff --git a/stubdom/vtpmmgr/tpm.h b/stubdom/vtpmmgr/tpm.h new file mode 100644 index 0000000..304e145 --- /dev/null +++ b/stubdom/vtpmmgr/tpm.h @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005/2006, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __TPM_H__ +#define __TPM_H__ + +#include "tcg.h" + +// ------------------------------------------------------------------ +// Exposed API +// ------------------------------------------------------------------ + +// TPM v1.1B Command Set + +// Authorzation +TPM_RESULT TPM_OIAP( + TPM_AUTH_SESSION* auth //out + ); + +TPM_RESULT TPM_OSAP ( + TPM_ENTITY_TYPE entityType, // in + UINT32 entityValue, // in + const TPM_AUTHDATA* usageAuth, //in + TPM_SECRET *sharedSecret, //out + TPM_AUTH_SESSION *auth); + +TPM_RESULT TPM_TakeOwnership( + const TPM_PUBKEY *pubEK, //in + const TPM_AUTHDATA* ownerAuth, //in + const TPM_AUTHDATA* srkAuth, //in + const TPM_KEY* inSrk, //in + TPM_KEY* outSrk, //out, optional + TPM_AUTH_SESSION* auth // in, out + ); + +TPM_RESULT TPM_DisablePubekRead ( + const TPM_AUTHDATA* ownerAuth, + TPM_AUTH_SESSION* auth + ); + +TPM_RESULT TPM_TerminateHandle ( TPM_AUTHHANDLE handle // in + ); + +TPM_RESULT TPM_FlushSpecific ( TPM_HANDLE handle, // in + TPM_RESOURCE_TYPE resourceType //in + ); + +// TPM Mandatory +TPM_RESULT TPM_Extend ( TPM_PCRINDEX pcrNum, // in + TPM_DIGEST inDigest, // in + TPM_PCRVALUE* outDigest // out + ); + +TPM_RESULT TPM_PcrRead ( TPM_PCRINDEX pcrNum, // in + TPM_PCRVALUE* outDigest // out + ); + +TPM_RESULT TPM_Quote ( TCS_KEY_HANDLE keyHandle, // in + TPM_NONCE antiReplay, // in + UINT32* PcrDataSize, // in, out + BYTE** PcrData, // in, out + TPM_AUTH_SESSION* privAuth, // in, out + UINT32* sigSize, // out + BYTE** sig // out + ); + +TPM_RESULT TPM_Seal( + TCS_KEY_HANDLE keyHandle, // in + UINT32 pcrInfoSize, // in + TPM_PCR_INFO* pcrInfo, // in + UINT32 inDataSize, // in + const BYTE* inData, // in + TPM_STORED_DATA* sealedData, //out + const TPM_SECRET* osapSharedSecret, //in + const TPM_AUTHDATA* sealDataAuth, //in + TPM_AUTH_SESSION* pubAuth // in, out + ); + +TPM_RESULT TPM_Unseal ( + TPM_KEY_HANDLE parentHandle, // in + const TPM_STORED_DATA* sealedData, + UINT32* outSize, // out + BYTE** out, //out + const TPM_AUTHDATA* key_usage_auth, //in + const TPM_AUTHDATA* data_usage_auth, //in + TPM_AUTH_SESSION* keyAuth, // in, out + TPM_AUTH_SESSION* dataAuth // in, out + ); + +TPM_RESULT TPM_DirWriteAuth ( TPM_DIRINDEX dirIndex, // in + TPM_DIRVALUE newContents, // in + TPM_AUTH_SESSION* ownerAuth // in, out + ); + +TPM_RESULT TPM_DirRead ( TPM_DIRINDEX dirIndex, // in + TPM_DIRVALUE* dirValue // out + ); + +TPM_RESULT TPM_Bind( + const TPM_KEY* key, //in + const BYTE* in, //in + UINT32 ilen, //in + BYTE* out //out, must be at least cipher block size + ); + +TPM_RESULT TPM_UnBind ( + TCS_KEY_HANDLE keyHandle, // in + UINT32 ilen, //in + const BYTE* in, // + UINT32* outDataSize, // out + BYTE* outData, //out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth //in, out + ); + +TPM_RESULT TPM_CreateWrapKey ( + TCS_KEY_HANDLE hWrappingKey, // in + const TPM_AUTHDATA* osapSharedSecret, + const TPM_AUTHDATA* dataUsageAuth, //in + const TPM_AUTHDATA* dataMigrationAuth, //in + TPM_KEY* key, //in + TPM_AUTH_SESSION* pAuth // in, out + ); + +TPM_RESULT TPM_LoadKey ( + TPM_KEY_HANDLE parentHandle, // + const TPM_KEY* key, //in + TPM_HANDLE* keyHandle, // out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth + ); + +TPM_RESULT TPM_GetPubKey ( TCS_KEY_HANDLE hKey, // in + TPM_AUTH_SESSION* pAuth, // in, out + UINT32* pcPubKeySize, // out + BYTE** prgbPubKey // out + ); + +TPM_RESULT TPM_EvictKey ( TCS_KEY_HANDLE hKey // in + ); + +TPM_RESULT TPM_FlushSpecific(TPM_HANDLE handle, //in + TPM_RESOURCE_TYPE rt //in + ); + +TPM_RESULT TPM_Sign ( TCS_KEY_HANDLE keyHandle, // in + UINT32 areaToSignSize, // in + BYTE* areaToSign, // in + TPM_AUTH_SESSION* privAuth, // in, out + UINT32* sigSize, // out + BYTE** sig // out + ); + +TPM_RESULT TPM_GetRandom ( UINT32* bytesRequested, // in, out + BYTE* randomBytes // out + ); + +TPM_RESULT TPM_StirRandom ( UINT32 inDataSize, // in + BYTE* inData // in + ); + +TPM_RESULT TPM_ReadPubek ( + TPM_PUBKEY* pubEK //out + ); + +TPM_RESULT TPM_GetCapability( + TPM_CAPABILITY_AREA capArea, + UINT32 subCapSize, + const BYTE* subCap, + UINT32* respSize, + BYTE** resp); + +TPM_RESULT TPM_SaveState(void); + +TPM_RESULT TPM_CreateEndorsementKeyPair( + const TPM_KEY_PARMS* keyInfo, + TPM_PUBKEY* pubEK); + +TPM_RESULT TPM_TransmitData( + BYTE* in, + UINT32 insize, + BYTE* out, + UINT32* outsize); + +#endif //TPM_H diff --git a/stubdom/vtpmmgr/tpmrsa.c b/stubdom/vtpmmgr/tpmrsa.c new file mode 100644 index 0000000..56094e7 --- /dev/null +++ b/stubdom/vtpmmgr/tpmrsa.c @@ -0,0 +1,175 @@ +/* + * The RSA public-key cryptosystem + * + * Copyright (C) 2006-2011, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * RSA was designed by Ron Rivest, Adi Shamir and Len Adleman. + * + * http://theory.lcs.mit.edu/~rivest/rsapaper.pdf + * http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf + */ + +#include "tcg.h" +#include "polarssl/sha1.h" + +#include +#include + +#include "tpmrsa.h" + +#define HASH_LEN 20 + +void tpmrsa_set_pubkey(tpmrsa_context* ctx, + const unsigned char* key, + int keylen, + const unsigned char* exponent, + int explen) { + + tpmrsa_free(ctx); + + if(explen == 0) { //Default e= 2^16+1 + mpi_lset(&ctx->E, 65537); + } else { + mpi_read_binary(&ctx->E, exponent, explen); + } + mpi_read_binary(&ctx->N, key, keylen); + + ctx->len = ( mpi_msb(&ctx->N) + 7) >> 3; +} + +static TPM_RESULT tpmrsa_public( tpmrsa_context *ctx, + const unsigned char *input, + unsigned char *output ) +{ + int ret; + size_t olen; + mpi T; + + mpi_init( &T ); + + MPI_CHK( mpi_read_binary( &T, input, ctx->len ) ); + + if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 ) + { + mpi_free( &T ); + return TPM_ENCRYPT_ERROR; + } + + olen = ctx->len; + MPI_CHK( mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) ); + MPI_CHK( mpi_write_binary( &T, output, olen ) ); + +cleanup: + + mpi_free( &T ); + + if( ret != 0 ) + return TPM_ENCRYPT_ERROR; + + return TPM_SUCCESS; +} + +static void mgf_mask( unsigned char *dst, int dlen, unsigned char *src, int slen) +{ + unsigned char mask[HASH_LEN]; + unsigned char counter[4] = {0, 0, 0, 0}; + int i; + sha1_context mctx; + + //We always hash the src with the counter, so save the partial hash + sha1_starts(&mctx); + sha1_update(&mctx, src, slen); + + // Generate and apply dbMask + while(dlen > 0) { + //Copy the sha1 context + sha1_context ctx = mctx; + + //compute hash for input || counter + sha1_update(&ctx, counter, sizeof(counter)); + sha1_finish(&ctx, mask); + + //Apply the mask + for(i = 0; i < (dlen < HASH_LEN ? dlen : HASH_LEN); ++i) { + *(dst++) ^= mask[i]; + } + + //Increment counter + ++counter[3]; + + dlen -= HASH_LEN; + } +} + +/* + * Add the message padding, then do an RSA operation + */ +TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx, + int (*f_rng)(void *, unsigned char *, size_t), + void *p_rng, + size_t ilen, + const unsigned char *input, + unsigned char *output ) +{ + int ret; + int olen; + unsigned char* seed = output + 1; + unsigned char* db = output + HASH_LEN +1; + + olen = ctx->len-1; + + if( f_rng == NULL ) + return TPM_ENCRYPT_ERROR; + + if( ilen > olen - 2 * HASH_LEN - 1) + return TPM_ENCRYPT_ERROR; + + output[0] = 0; + + //Encoding parameter p + sha1((unsigned char*)"TCPA", 4, db); + + //PS + memset(db + HASH_LEN, 0, + olen - ilen - 2 * HASH_LEN - 1); + + //constant 1 byte + db[olen - ilen - HASH_LEN -1] = 0x01; + + //input string + memcpy(db + olen - ilen - HASH_LEN, + input, ilen); + + //Generate random seed + if( ( ret = f_rng( p_rng, seed, HASH_LEN ) ) != 0 ) + return TPM_ENCRYPT_ERROR; + + // maskedDB: Apply dbMask to DB + mgf_mask( db, olen - HASH_LEN, seed, HASH_LEN); + + // maskedSeed: Apply seedMask to seed + mgf_mask( seed, HASH_LEN, db, olen - HASH_LEN); + + // Do the crypto op + return tpmrsa_public(ctx, output, output); +} diff --git a/stubdom/vtpmmgr/tpmrsa.h b/stubdom/vtpmmgr/tpmrsa.h new file mode 100644 index 0000000..59579e7 --- /dev/null +++ b/stubdom/vtpmmgr/tpmrsa.h @@ -0,0 +1,67 @@ +/** + * \file rsa.h + * + * \brief The RSA public-key cryptosystem + * + * Copyright (C) 2006-2010, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef TPMRSA_H +#define TPMRSA_H + +#include "tcg.h" +#include + +/* tpm software key */ +typedef struct +{ + size_t len; /*!< size(N) in chars */ + + mpi N; /*!< public modulus */ + mpi E; /*!< public exponent */ + + mpi RN; /*!< cached R^2 mod N */ +} +tpmrsa_context; + +#define TPMRSA_CTX_INIT { 0, {0, 0, NULL}, {0, 0, NULL}, {0, 0, NULL}} + +/* Setup the rsa context using tpm public key data */ +void tpmrsa_set_pubkey(tpmrsa_context* ctx, + const unsigned char* key, + int keylen, + const unsigned char* exponent, + int explen); + +/* Do rsa public crypto */ +TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx, + int (*f_rng)(void *, unsigned char *, size_t), + void *p_rng, + size_t ilen, + const unsigned char *input, + unsigned char *output ); + +/* free tpmrsa key */ +inline void tpmrsa_free( tpmrsa_context *ctx ) { + mpi_free( &ctx->RN ); mpi_free( &ctx->E ); mpi_free( &ctx->N ); +} + +#endif /* tpmrsa.h */ diff --git a/stubdom/vtpmmgr/uuid.h b/stubdom/vtpmmgr/uuid.h new file mode 100644 index 0000000..4737645 --- /dev/null +++ b/stubdom/vtpmmgr/uuid.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPMMGR_UUID_H +#define VTPMMGR_UUID_H + +#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" +#define UUID_FMTLEN ((2*16)+4) /* 16 hex bytes plus 4 hypens */ +#define UUID_BYTES(uuid) uuid[0], uuid[1], uuid[2], uuid[3], \ + uuid[4], uuid[5], uuid[6], uuid[7], \ + uuid[8], uuid[9], uuid[10], uuid[11], \ + uuid[12], uuid[13], uuid[14], uuid[15] + + +typedef uint8_t uuid_t[16]; + +#endif diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c b/stubdom/vtpmmgr/vtpm_cmd_handler.c new file mode 100644 index 0000000..f82a2a9 --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include + +#include "marshal.h" +#include "log.h" +#include "vtpm_storage.h" +#include "vtpmmgr.h" +#include "tpm.h" +#include "tcg.h" + +static TPM_RESULT vtpmmgr_SaveHashKey( + const uuid_t uuid, + tpmcmd_t* tpmcmd) +{ + TPM_RESULT status = TPM_SUCCESS; + + if(tpmcmd->req_len != VTPM_COMMAND_HEADER_SIZE + HASHKEYSZ) { + vtpmlogerror(VTPM_LOG_VTPM, "VTPM_ORD_SAVEHASHKEY hashkey too short!\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + /* Do the command */ + TPMTRYRETURN(vtpm_storage_save_hashkey(uuid, tpmcmd->req + VTPM_COMMAND_HEADER_SIZE)); + +abort_egress: + pack_TPM_RSP_HEADER(tpmcmd->resp, + VTPM_TAG_RSP, VTPM_COMMAND_HEADER_SIZE, status); + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + + return status; +} + +static TPM_RESULT vtpmmgr_LoadHashKey( + const uuid_t uuid, + tpmcmd_t* tpmcmd) { + TPM_RESULT status = TPM_SUCCESS; + + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + + TPMTRYRETURN(vtpm_storage_load_hashkey(uuid, tpmcmd->resp + VTPM_COMMAND_HEADER_SIZE)); + + tpmcmd->resp_len += HASHKEYSZ; + +abort_egress: + pack_TPM_RSP_HEADER(tpmcmd->resp, + VTPM_TAG_RSP, tpmcmd->resp_len, status); + + return status; +} + + +TPM_RESULT vtpmmgr_handle_cmd( + const uuid_t uuid, + tpmcmd_t* tpmcmd) +{ + TPM_RESULT status = TPM_SUCCESS; + TPM_TAG tag; + UINT32 size; + TPM_COMMAND_CODE ord; + + unpack_TPM_RQU_HEADER(tpmcmd->req, + &tag, &size, &ord); + + /* Handle the command now */ + switch(tag) { + case VTPM_TAG_REQ: + //This is a vTPM command + switch(ord) { + case VTPM_ORD_SAVEHASHKEY: + return vtpmmgr_SaveHashKey(uuid, tpmcmd); + case VTPM_ORD_LOADHASHKEY: + return vtpmmgr_LoadHashKey(uuid, tpmcmd); + default: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid vTPM Ordinal %" PRIu32 "\n", ord); + status = TPM_BAD_ORDINAL; + } + break; + case TPM_TAG_RQU_COMMAND: + case TPM_TAG_RQU_AUTH1_COMMAND: + case TPM_TAG_RQU_AUTH2_COMMAND: + //This is a TPM passthrough command + switch(ord) { + case TPM_ORD_GetRandom: + vtpmloginfo(VTPM_LOG_VTPM, "Passthrough: TPM_GetRandom\n"); + break; + case TPM_ORD_PcrRead: + vtpmloginfo(VTPM_LOG_VTPM, "Passthrough: TPM_PcrRead\n"); + break; + default: + vtpmlogerror(VTPM_LOG_VTPM, "TPM Disallowed Passthrough ord=%" PRIu32 "\n", ord); + status = TPM_DISABLED_CMD; + goto abort_egress; + } + + size = TCPA_MAX_BUFFER_LENGTH; + TPMTRYRETURN(TPM_TransmitData(tpmcmd->req, tpmcmd->req_len, tpmcmd->resp, &size)); + tpmcmd->resp_len = size; + + unpack_TPM_RESULT(tpmcmd->resp + sizeof(TPM_TAG) + sizeof(UINT32), &status); + return status; + + break; + default: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid tag=%" PRIu16 "\n", tag); + status = TPM_BADTAG; + } + +abort_egress: + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + pack_TPM_RSP_HEADER(tpmcmd->resp, + tag + 3, tpmcmd->resp_len, status); + + return status; +} diff --git a/stubdom/vtpmmgr/vtpm_manager.h b/stubdom/vtpmmgr/vtpm_manager.h new file mode 100644 index 0000000..a2bbcca --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_manager.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPM_MANAGER_H +#define VTPM_MANAGER_H + +#define VTPM_TAG_REQ 0x01c1 +#define VTPM_TAG_RSP 0x01c4 +#define COMMAND_BUFFER_SIZE 4096 + +// Header size +#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) + +//************************ Command Codes **************************** +#define VTPM_ORD_BASE 0x0000 +#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command +#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) + +// Non-priviledged VTPM Commands (From DMI's) +#define VTPM_ORD_SAVEHASHKEY (VTPM_ORD_BASE + 1) // DMI requests encryption key for persistent storage +#define VTPM_ORD_LOADHASHKEY (VTPM_ORD_BASE + 2) // DMI requests symkey to be regenerated + +//************************ Return Codes **************************** +#define VTPM_SUCCESS 0 +#define VTPM_FAIL 1 +#define VTPM_UNSUPPORTED 2 +#define VTPM_FORBIDDEN 3 +#define VTPM_RESTORE_CONTEXT_FAILED 4 +#define VTPM_INVALID_REQUEST 5 + +#endif diff --git a/stubdom/vtpmmgr/vtpm_storage.c b/stubdom/vtpmmgr/vtpm_storage.c new file mode 100644 index 0000000..3862fdb --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_storage.c @@ -0,0 +1,783 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +/*************************************************************** + * DISK IMAGE LAYOUT + * ************************************************************* + * All data is stored in BIG ENDIAN format + * ************************************************************* + * Section 1: Header + * + * 10 bytes id ID String "VTPMMGRDOM" + * uint32_t version Disk Image version number (current == 1) + * uint32_t storage_key_len Length of the Boot Key + * BYTEARRAY storage_key TPM boot key + * + * ************************************************************* + * Section 2: Key Data Table (starts at offset 4096) + * + * This is a list of blocks, each is RSA_CIPHER_SIZE long + * and is encrypted with the storage key. + * + * The first block always exists and it contains: + * uint32_t num_vtpms Number of vtpms (number of remaining blocks) + * + * The rest of the blocks look like this: + * 16 bytes uuid uuid of the owner of this key and hash + * 20 bytes hash Sha1 hash of vTPM's data, supplied by vTPM + * 32 bytes key AES-256 Encryption Key, supplied by vTPM + * + * ************************************************************* + */ +#define DISKVERS 1 +#define IDSTR "VTPMMGRDOM" +#define IDSTRLEN 10 +#define AES_BLOCK_SIZE 16 +#define AES_KEY_BITS 256 +#define AES_KEY_SIZE (AES_KEY_BITS/8) +#define BUF_SIZE 4096 + +#define UUID_TBL_ENT_SIZE (sizeof(uuid_t) + sizeof(uint32_t)) + +#define HEADERSZ (10 + 4 + 4) + +#define TRY_READ(buf, size, msg) do {\ + int rc; \ + if((rc = read(blkfront_fd, buf, (size))) != (size)) { \ + vtpmlogerror(VTPM_LOG_VTPM, "read() failed! " msg " : rc=(%d/%d), error=(%s)\n", rc, (int)(size), strerror(errno)); \ + status = TPM_IOERROR;\ + goto abort_egress;\ + } \ +} while(0) + +#define TRY_WRITE(buf, size, msg) do {\ + int rc; \ + if((rc = write(blkfront_fd, buf, (size))) != (size)) { \ + vtpmlogerror(VTPM_LOG_VTPM, "write() failed! " msg " : rc=(%d/%d), error=(%s)\n", rc, (int)(size), strerror(errno)); \ + status = TPM_IOERROR;\ + goto abort_egress;\ + } \ +} while(0) + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "vtpm_manager.h" +#include "log.h" +#include "marshal.h" +#include "tpm.h" +#include "uuid.h" + +#include "vtpmmgr.h" +#include "vtpm_storage.h" + +#define MAX(a,b) ( ((a) > (b)) ? (a) : (b) ) +#define MIN(a,b) ( ((a) < (b)) ? (a) : (b) ) + +/* blkfront device objets */ +static struct blkfront_dev* blkdev = NULL; +static int blkfront_fd = -1; + +struct Vtpm { + uuid_t uuid; + int offset; +}; +struct Storage { + int aes_offset; + int uuid_offset; + int end_offset; + + int num_vtpms; + int num_vtpms_alloced; + struct Vtpm* vtpms; +}; + +/* Global storage data */ +static struct Storage g_store = { + .vtpms = NULL, +}; + +static int get_offset(void) { + return lseek(blkfront_fd, 0, SEEK_CUR); +} + +static void reset_store(void) { + g_store.aes_offset = 0; + g_store.uuid_offset = 0; + g_store.end_offset = 0; + + g_store.num_vtpms = 0; + g_store.num_vtpms_alloced = 0; + free(g_store.vtpms); + g_store.vtpms = NULL; +} + +static int vtpm_get_index(const uuid_t uuid) { + int st = 0; + int ed = g_store.num_vtpms-1; + while(st <= ed) { + int mid = ((unsigned int)st + (unsigned int)ed) >> 1; //avoid overflow + int c = memcmp(uuid, &g_store.vtpms[mid].uuid, sizeof(uuid_t)); + if(c == 0) { + return mid; + } else if(c > 0) { + st = mid + 1; + } else { + ed = mid - 1; + } + } + return -(st + 1); +} + +static void vtpm_add(const uuid_t uuid, int offset, int index) { + /* Realloc more space if needed */ + if(g_store.num_vtpms >= g_store.num_vtpms_alloced) { + g_store.num_vtpms_alloced += 16; + g_store.vtpms = realloc( + g_store.vtpms, + sizeof(struct Vtpm) * g_store.num_vtpms_alloced); + } + + /* Move everybody after the new guy */ + for(int i = g_store.num_vtpms; i > index; --i) { + g_store.vtpms[i] = g_store.vtpms[i-1]; + } + + vtpmloginfo(VTPM_LOG_VTPM, "Registered vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + + /* Finally add new one */ + memcpy(g_store.vtpms[index].uuid, uuid, sizeof(uuid_t)); + g_store.vtpms[index].offset = offset; + ++g_store.num_vtpms; +} + +#if 0 +static void vtpm_remove(int index) { + for(i = index; i < g_store.num_vtpms; ++i) { + g_store.vtpms[i] = g_store.vtpms[i+1]; + } + --g_store.num_vtpms; +} +#endif + +static int pack_uuid_table(uint8_t* table, int size, int* nvtpms) { + uint8_t* ptr = table; + while(*nvtpms < g_store.num_vtpms && size >= 0) + { + /* Pack the uuid */ + memcpy(ptr, (uint8_t*)g_store.vtpms[*nvtpms].uuid, sizeof(uuid_t)); + ptr+= sizeof(uuid_t); + + + /* Pack the offset */ + ptr = pack_UINT32(ptr, g_store.vtpms[*nvtpms].offset); + + ++*nvtpms; + size -= UUID_TBL_ENT_SIZE; + } + return ptr - table; +} + +/* Extract the uuids */ +static int extract_uuid_table(uint8_t* table, int size) { + uint8_t* ptr = table; + for(;size >= UUID_TBL_ENT_SIZE; size -= UUID_TBL_ENT_SIZE) { + int index; + uint32_t v32; + + /*uuid_t is just an array of bytes, so we can do a direct cast here */ + uint8_t* uuid = ptr; + ptr += sizeof(uuid_t); + + /* Get the offset of the key */ + ptr = unpack_UINT32(ptr, &v32); + + /* Insert the new vtpm in sorted order */ + if((index = vtpm_get_index(uuid)) >= 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Vtpm (" UUID_FMT ") exists multiple times! ignoring...\n", UUID_BYTES(uuid)); + continue; + } + index = -index -1; + + vtpm_add(uuid, v32, index); + + } + return ptr - table; +} + +static void vtpm_decrypt_block(aes_context* aes, + uint8_t* iv, + uint8_t* cipher, + uint8_t* plain, + int cipher_sz, + int* overlap) +{ + int bytes_ext; + /* Decrypt */ + aes_crypt_cbc(aes, AES_DECRYPT, + cipher_sz, + iv, cipher, plain + *overlap); + + /* Extract */ + bytes_ext = extract_uuid_table(plain, cipher_sz + *overlap); + + /* Copy left overs to the beginning */ + *overlap = cipher_sz + *overlap - bytes_ext; + memcpy(plain, plain + bytes_ext, *overlap); +} + +static int vtpm_encrypt_block(aes_context* aes, + uint8_t* iv, + uint8_t* plain, + uint8_t* cipher, + int block_sz, + int* overlap, + int* num_vtpms) +{ + int bytes_to_crypt; + int bytes_packed; + + /* Pack the uuid table */ + bytes_packed = *overlap + pack_uuid_table(plain + *overlap, block_sz - *overlap, num_vtpms); + bytes_to_crypt = MIN(bytes_packed, block_sz); + + /* Add padding if we aren't on a multiple of the block size */ + if(bytes_to_crypt & (AES_BLOCK_SIZE-1)) { + int oldsz = bytes_to_crypt; + //add padding + bytes_to_crypt += AES_BLOCK_SIZE - (bytes_to_crypt & (AES_BLOCK_SIZE-1)); + //fill padding with random bytes + vtpmmgr_rand(plain + oldsz, bytes_to_crypt - oldsz); + *overlap = 0; + } else { + *overlap = bytes_packed - bytes_to_crypt; + } + + /* Encrypt this chunk */ + aes_crypt_cbc(aes, AES_ENCRYPT, + bytes_to_crypt, + iv, plain, cipher); + + /* Copy the left over partials to the beginning */ + memcpy(plain, plain + bytes_to_crypt, *overlap); + + return bytes_to_crypt; +} + +static TPM_RESULT vtpm_storage_new_vtpm(const uuid_t uuid, int index) { + TPM_RESULT status = TPM_SUCCESS; + uint8_t plain[BUF_SIZE + AES_BLOCK_SIZE]; + uint8_t buf[BUF_SIZE]; + uint8_t* ptr; + int cipher_sz; + aes_context aes; + + /* Add new vtpm to the table */ + vtpm_add(uuid, g_store.end_offset, index); + g_store.end_offset += RSA_CIPHER_SIZE; + + /* Compute the new end location of the encrypted uuid table */ + cipher_sz = AES_BLOCK_SIZE; //IV + cipher_sz += g_store.num_vtpms * UUID_TBL_ENT_SIZE; //uuid table + cipher_sz += (AES_BLOCK_SIZE - (cipher_sz & (AES_BLOCK_SIZE -1))) & (AES_BLOCK_SIZE-1); //aes padding + + /* Does this overlap any key data? If so they need to be relocated */ + int uuid_end = (g_store.uuid_offset + cipher_sz + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + for(int i = 0; i < g_store.num_vtpms; ++i) { + if(g_store.vtpms[i].offset < uuid_end) { + + vtpmloginfo(VTPM_LOG_VTPM, "Relocating vtpm data\n"); + + //Read the hashkey cipher text + lseek(blkfront_fd, g_store.vtpms[i].offset, SEEK_SET); + TRY_READ(buf, RSA_CIPHER_SIZE, "vtpm hashkey relocate"); + + //Write the cipher text to new offset + lseek(blkfront_fd, g_store.end_offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm hashkey relocate"); + + //Save new offset + g_store.vtpms[i].offset = g_store.end_offset; + g_store.end_offset += RSA_CIPHER_SIZE; + } + } + + vtpmloginfo(VTPM_LOG_VTPM, "Generating a new symmetric key\n"); + + /* Generate an aes key */ + TPMTRYRETURN(vtpmmgr_rand(plain, AES_KEY_SIZE)); + aes_setkey_enc(&aes, plain, AES_KEY_BITS); + ptr = plain + AES_KEY_SIZE; + + /* Pack the crypted size */ + ptr = pack_UINT32(ptr, cipher_sz); + + vtpmloginfo(VTPM_LOG_VTPM, "Binding encrypted key\n"); + + /* Seal the key and size */ + TPMTRYRETURN(TPM_Bind(&vtpm_globals.storage_key, + plain, + ptr - plain, + buf)); + + /* Write the sealed key to disk */ + lseek(blkfront_fd, g_store.aes_offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm aes key"); + + /* ENCRYPT AND WRITE UUID TABLE */ + + vtpmloginfo(VTPM_LOG_VTPM, "Encrypting the uuid table\n"); + + int num_vtpms = 0; + int overlap = 0; + int bytes_crypted; + uint8_t iv[AES_BLOCK_SIZE]; + + /* Generate the iv for the first block */ + TPMTRYRETURN(vtpmmgr_rand(iv, AES_BLOCK_SIZE)); + + /* Copy the iv to the cipher text buffer to be written to disk */ + memcpy(buf, iv, AES_BLOCK_SIZE); + ptr = buf + AES_BLOCK_SIZE; + + /* Encrypt the first block of the uuid table */ + bytes_crypted = vtpm_encrypt_block(&aes, + iv, //iv + plain, //plaintext + ptr, //cipher text + BUF_SIZE - AES_BLOCK_SIZE, + &overlap, + &num_vtpms); + + /* Write the iv followed by the crypted table*/ + TRY_WRITE(buf, bytes_crypted + AES_BLOCK_SIZE, "vtpm uuid table"); + + /* Decrement the number of bytes encrypted */ + cipher_sz -= bytes_crypted + AES_BLOCK_SIZE; + + /* If there are more vtpms, encrypt and write them block by block */ + while(cipher_sz > 0) { + /* Encrypt the next block of the uuid table */ + bytes_crypted = vtpm_encrypt_block(&aes, + iv, + plain, + buf, + BUF_SIZE, + &overlap, + &num_vtpms); + + /* Write the cipher text to disk */ + TRY_WRITE(buf, bytes_crypted, "vtpm uuid table"); + + cipher_sz -= bytes_crypted; + } + + goto egress; +abort_egress: +egress: + return status; +} + + +/************************************** + * PUBLIC FUNCTIONS + * ***********************************/ + +int vtpm_storage_init(void) { + struct blkfront_info info; + if((blkdev = init_blkfront(NULL, &info)) == NULL) { + return -1; + } + if((blkfront_fd = blkfront_open(blkdev)) < 0) { + return -1; + } + return 0; +} + +void vtpm_storage_shutdown(void) { + reset_store(); + close(blkfront_fd); +} + +TPM_RESULT vtpm_storage_load_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]) +{ + TPM_RESULT status = TPM_SUCCESS; + int index; + uint8_t cipher[RSA_CIPHER_SIZE]; + uint8_t clear[RSA_CIPHER_SIZE]; + UINT32 clear_size; + + /* Find the index of this uuid */ + if((index = vtpm_get_index(uuid)) < 0) { + index = -index-1; + vtpmlogerror(VTPM_LOG_VTPM, "LoadKey failure: Unrecognized uuid! " UUID_FMT "\n", UUID_BYTES(uuid)); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + /* Read the table entry */ + lseek(blkfront_fd, g_store.vtpms[index].offset, SEEK_SET); + TRY_READ(cipher, RSA_CIPHER_SIZE, "vtpm hashkey data"); + + /* Decrypt the table entry */ + TPMTRYRETURN(TPM_UnBind( + vtpm_globals.storage_key_handle, + RSA_CIPHER_SIZE, + cipher, + &clear_size, + clear, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.oiap)); + + if(clear_size < HASHKEYSZ) { + vtpmloginfo(VTPM_LOG_VTPM, "Decrypted Hash key size (%" PRIu32 ") was too small!\n", clear_size); + status = TPM_RESOURCES; + goto abort_egress; + } + + memcpy(hashkey, clear, HASHKEYSZ); + + vtpmloginfo(VTPM_LOG_VTPM, "Loaded hash and key for vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + goto egress; +abort_egress: + vtpmlogerror(VTPM_LOG_VTPM, "Failed to load key\n"); +egress: + return status; +} + +TPM_RESULT vtpm_storage_save_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]) +{ + TPM_RESULT status = TPM_SUCCESS; + int index; + uint8_t buf[RSA_CIPHER_SIZE]; + + /* Find the index of this uuid */ + if((index = vtpm_get_index(uuid)) < 0) { + index = -index-1; + /* Create a new vtpm */ + TPMTRYRETURN( vtpm_storage_new_vtpm(uuid, index) ); + } + + /* Encrypt the hash and key */ + TPMTRYRETURN( TPM_Bind(&vtpm_globals.storage_key, + hashkey, + HASHKEYSZ, + buf)); + + /* Write to disk */ + lseek(blkfront_fd, g_store.vtpms[index].offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm hashkey data"); + + vtpmloginfo(VTPM_LOG_VTPM, "Saved hash and key for vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + goto egress; +abort_egress: + vtpmlogerror(VTPM_LOG_VTPM, "Failed to save key\n"); +egress: + return status; +} + +TPM_RESULT vtpm_storage_new_header() +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t buf[BUF_SIZE]; + uint8_t keybuf[AES_KEY_SIZE + sizeof(uint32_t)]; + uint8_t* ptr = buf; + uint8_t* sptr; + + /* Clear everything first */ + reset_store(); + + vtpmloginfo(VTPM_LOG_VTPM, "Creating new disk image header\n"); + + /*Copy the ID string */ + memcpy(ptr, IDSTR, IDSTRLEN); + ptr += IDSTRLEN; + + /*Copy the version */ + ptr = pack_UINT32(ptr, DISKVERS); + + /*Save the location of the key size */ + sptr = ptr; + ptr += sizeof(UINT32); + + vtpmloginfo(VTPM_LOG_VTPM, "Saving root storage key..\n"); + + /* Copy the storage key */ + ptr = pack_TPM_KEY(ptr, &vtpm_globals.storage_key); + + /* Now save the size */ + pack_UINT32(sptr, ptr - (sptr + 4)); + + /* Create a fake aes key and set cipher text size to 0 */ + memset(keybuf, 0, sizeof(keybuf)); + + vtpmloginfo(VTPM_LOG_VTPM, "Binding uuid table symmetric key..\n"); + + /* Save the location of the aes key */ + g_store.aes_offset = ptr - buf; + + /* Store the fake aes key and vtpm count */ + TPMTRYRETURN(TPM_Bind(&vtpm_globals.storage_key, + keybuf, + sizeof(keybuf), + ptr)); + ptr+= RSA_CIPHER_SIZE; + + /* Write the header to disk */ + lseek(blkfront_fd, 0, SEEK_SET); + TRY_WRITE(buf, ptr-buf, "vtpm header"); + + /* Save the location of the uuid table */ + g_store.uuid_offset = get_offset(); + + /* Save the end offset */ + g_store.end_offset = (g_store.uuid_offset + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + + vtpmloginfo(VTPM_LOG_VTPM, "Saved new manager disk header.\n"); + + goto egress; +abort_egress: +egress: + return status; +} + + +TPM_RESULT vtpm_storage_load_header(void) +{ + TPM_RESULT status = TPM_SUCCESS; + uint32_t v32; + uint8_t buf[BUF_SIZE]; + uint8_t* ptr = buf; + aes_context aes; + + /* Clear everything first */ + reset_store(); + + /* Read the header from disk */ + lseek(blkfront_fd, 0, SEEK_SET); + TRY_READ(buf, IDSTRLEN + sizeof(UINT32) + sizeof(UINT32), "vtpm header"); + + vtpmloginfo(VTPM_LOG_VTPM, "Loading disk image header\n"); + + /* Verify the ID string */ + if(memcmp(ptr, IDSTR, IDSTRLEN)) { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid ID string in disk image!\n"); + status = TPM_FAIL; + goto abort_egress; + } + ptr+=IDSTRLEN; + + /* Unpack the version */ + ptr = unpack_UINT32(ptr, &v32); + + /* Verify the version */ + if(v32 != DISKVERS) { + vtpmlogerror(VTPM_LOG_VTPM, "Unsupported disk image version number %" PRIu32 "\n", v32); + status = TPM_FAIL; + goto abort_egress; + } + + /* Size of the storage key */ + ptr = unpack_UINT32(ptr, &v32); + + /* Sanity check */ + if(v32 > BUF_SIZE) { + vtpmlogerror(VTPM_LOG_VTPM, "Size of storage key (%" PRIu32 ") is too large!\n", v32); + status = TPM_IOERROR; + goto abort_egress; + } + + /* read the storage key */ + TRY_READ(buf, v32, "storage pub key"); + + vtpmloginfo(VTPM_LOG_VTPM, "Unpacking storage key\n"); + + /* unpack the storage key */ + ptr = unpack_TPM_KEY(buf, &vtpm_globals.storage_key, UNPACK_ALLOC); + + /* Load Storage Key into the TPM */ + TPMTRYRETURN( TPM_LoadKey( + TPM_SRK_KEYHANDLE, + &vtpm_globals.storage_key, + &vtpm_globals.storage_key_handle, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &vtpm_globals.oiap)); + + /* Initialize the storage key auth */ + memset(vtpm_globals.storage_key_usage_auth, 0, sizeof(TPM_AUTHDATA)); + + /* Store the offset of the aes key */ + g_store.aes_offset = get_offset(); + + /* Read the rsa cipher text for the aes key */ + TRY_READ(buf, RSA_CIPHER_SIZE, "aes key"); + ptr = buf + RSA_CIPHER_SIZE; + + vtpmloginfo(VTPM_LOG_VTPM, "Unbinding uuid table symmetric key\n"); + + /* Decrypt the aes key protecting the uuid table */ + UINT32 datalen; + TPMTRYRETURN(TPM_UnBind( + vtpm_globals.storage_key_handle, + RSA_CIPHER_SIZE, + buf, + &datalen, + ptr, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.oiap)); + + /* Validate the length of the output buffer */ + if(datalen < AES_KEY_SIZE + sizeof(UINT32)) { + vtpmlogerror(VTPM_LOG_VTPM, "Unbound AES key size (%d) was too small! expected (%ld)\n", datalen, AES_KEY_SIZE + sizeof(UINT32)); + status = TPM_IOERROR; + goto abort_egress; + } + + /* Extract the aes key */ + aes_setkey_dec(&aes, ptr, AES_KEY_BITS); + ptr+= AES_KEY_SIZE; + + /* Extract the ciphertext size */ + ptr = unpack_UINT32(ptr, &v32); + int cipher_size = v32; + + /* Sanity check */ + if(cipher_size & (AES_BLOCK_SIZE-1)) { + vtpmlogerror(VTPM_LOG_VTPM, "Cipher text size (%" PRIu32 ") is not a multiple of the aes block size! (%d)\n", v32, AES_BLOCK_SIZE); + status = TPM_IOERROR; + goto abort_egress; + } + + /* Save the location of the uuid table */ + g_store.uuid_offset = get_offset(); + + /* Only decrypt the table if there are vtpms to decrypt */ + if(cipher_size > 0) { + int rbytes; + int overlap = 0; + uint8_t plain[BUF_SIZE + AES_BLOCK_SIZE]; + uint8_t iv[AES_BLOCK_SIZE]; + + vtpmloginfo(VTPM_LOG_VTPM, "Decrypting uuid table\n"); + + /* Pre allocate the vtpm array */ + g_store.num_vtpms_alloced = cipher_size / UUID_TBL_ENT_SIZE; + g_store.vtpms = malloc(sizeof(struct Vtpm) * g_store.num_vtpms_alloced); + + /* Read the iv and the first chunk of cipher text */ + rbytes = MIN(cipher_size, BUF_SIZE); + TRY_READ(buf, rbytes, "vtpm uuid table\n"); + cipher_size -= rbytes; + + /* Copy the iv */ + memcpy(iv, buf, AES_BLOCK_SIZE); + ptr = buf + AES_BLOCK_SIZE; + + /* Remove the iv from the number of bytes to decrypt */ + rbytes -= AES_BLOCK_SIZE; + + /* Decrypt and extract vtpms */ + vtpm_decrypt_block(&aes, + iv, ptr, plain, + rbytes, &overlap); + + /* Read the rest of the table if there is more */ + while(cipher_size > 0) { + /* Read next chunk of cipher text */ + rbytes = MIN(cipher_size, BUF_SIZE); + TRY_READ(buf, rbytes, "vtpm uuid table"); + cipher_size -= rbytes; + + /* Decrypt a block of text */ + vtpm_decrypt_block(&aes, + iv, buf, plain, + rbytes, &overlap); + + } + vtpmloginfo(VTPM_LOG_VTPM, "Loaded %d vtpms!\n", g_store.num_vtpms); + } + + /* The end of the key table, new vtpms go here */ + int uuid_end = (get_offset() + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + g_store.end_offset = uuid_end; + + /* Compute the end offset while validating vtpms*/ + for(int i = 0; i < g_store.num_vtpms; ++i) { + /* offset must not collide with previous data */ + if(g_store.vtpms[i].offset < uuid_end) { + vtpmlogerror(VTPM_LOG_VTPM, "vtpm: " UUID_FMT + " offset (%d) is before end of uuid table (%d)!\n", + UUID_BYTES(g_store.vtpms[i].uuid), + g_store.vtpms[i].offset, uuid_end); + status = TPM_IOERROR; + goto abort_egress; + } + /* offset must be at a multiple of cipher size */ + if(g_store.vtpms[i].offset & (RSA_CIPHER_SIZE-1)) { + vtpmlogerror(VTPM_LOG_VTPM, "vtpm: " UUID_FMT + " offset(%d) is not at a multiple of the rsa cipher text size (%d)!\n", + UUID_BYTES(g_store.vtpms[i].uuid), + g_store.vtpms[i].offset, RSA_CIPHER_SIZE); + status = TPM_IOERROR; + goto abort_egress; + } + /* Save the last offset */ + if(g_store.vtpms[i].offset >= g_store.end_offset) { + g_store.end_offset = g_store.vtpms[i].offset + RSA_CIPHER_SIZE; + } + } + + goto egress; +abort_egress: + //An error occured somewhere + vtpmlogerror(VTPM_LOG_VTPM, "Failed to load manager data!\n"); + + //Clear the data store + reset_store(); + + //Reset the storage key structure + free_TPM_KEY(&vtpm_globals.storage_key); + { + TPM_KEY key = TPM_KEY_INIT; + vtpm_globals.storage_key = key; + } + + //Reset the storage key handle + TPM_EvictKey(vtpm_globals.storage_key_handle); + vtpm_globals.storage_key_handle = 0; +egress: + return status; +} + +#if 0 +/* For testing disk IO */ +void add_fake_vtpms(int num) { + for(int i = 0; i < num; ++i) { + uint32_t ind = cpu_to_be32(i); + + uuid_t uuid; + memset(uuid, 0, sizeof(uuid_t)); + memcpy(uuid, &ind, sizeof(ind)); + int index = vtpm_get_index(uuid); + index = -index-1; + + vtpm_storage_new_vtpm(uuid, index); + } +} +#endif diff --git a/stubdom/vtpmmgr/vtpm_storage.h b/stubdom/vtpmmgr/vtpm_storage.h new file mode 100644 index 0000000..a5a5fd7 --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_storage.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPM_STORAGE_H +#define VTPM_STORAGE_h + +#include "uuid.h" + +#define VTPM_NVMKEY_SIZE 32 +#define HASHKEYSZ (sizeof(TPM_DIGEST) + VTPM_NVMKEY_SIZE) + +/* Initialize the storage system and its virtual disk */ +int vtpm_storage_init(void); + +/* Shutdown the storage system and its virtual disk */ +void vtpm_storage_shutdown(void); + +/* Loads Sha1 hash and 256 bit AES key from disk and stores them + * packed together in outbuf. outbuf must be freed + * by the caller using buffer_free() + */ +TPM_RESULT vtpm_storage_load_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]); + +/* inbuf must contain a sha1 hash followed by a 256 bit AES key. + * Encrypts and stores the hash and key to disk */ +TPM_RESULT vtpm_storage_save_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]); + +/* Load the vtpm manager data - call this on startup */ +TPM_RESULT vtpm_storage_load_header(void); + +/* Saves the vtpm manager data - call this on shutdown */ +TPM_RESULT vtpm_storage_new_header(void); + + +#endif diff --git a/stubdom/vtpmmgr/vtpmmgr.c b/stubdom/vtpmmgr/vtpmmgr.c new file mode 100644 index 0000000..563f4e8 --- /dev/null +++ b/stubdom/vtpmmgr/vtpmmgr.c @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include +#include +#include +#include +#include "log.h" + +#include "vtpmmgr.h" +#include "tcg.h" + + +void main_loop(void) { + tpmcmd_t* tpmcmd; + uint8_t respbuf[TCPA_MAX_BUFFER_LENGTH]; + + while(1) { + /* Wait for requests from a vtpm */ + vtpmloginfo(VTPM_LOG_VTPM, "Waiting for commands from vTPM's:\n"); + if((tpmcmd = tpmback_req_any()) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "NULL tpmcmd\n"); + continue; + } + + tpmcmd->resp = respbuf; + + /* Process the command */ + vtpmmgr_handle_cmd(tpmcmd->uuid, tpmcmd); + + /* Send response */ + tpmback_resp(tpmcmd); + } +} + +int main(int argc, char** argv) +{ + int rc = 0; + sleep(2); + vtpmloginfo(VTPM_LOG_VTPM, "Starting vTPM manager domain\n"); + + /* Initialize the vtpm manager */ + if(vtpmmgr_init(argc, argv) != TPM_SUCCESS) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize vtpmmgr domain!\n"); + rc = -1; + goto exit; + } + + main_loop(); + + vtpmloginfo(VTPM_LOG_VTPM, "vTPM Manager shutting down...\n"); + + vtpmmgr_shutdown(); + +exit: + return rc; + +} diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h new file mode 100644 index 0000000..50a1992 --- /dev/null +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPMMGR_H +#define VTPMMGR_H + +#include +#include +#include + +#include "uuid.h" +#include "tcg.h" +#include "vtpm_manager.h" + +#define RSA_KEY_SIZE 0x0800 +#define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8) + +struct vtpm_globals { + int tpm_fd; + TPM_KEY storage_key; + TPM_HANDLE storage_key_handle; // Key used by persistent store + TPM_AUTH_SESSION oiap; // OIAP session for storageKey + TPM_AUTHDATA storage_key_usage_auth; + + TPM_AUTHDATA owner_auth; + TPM_AUTHDATA srk_auth; + + entropy_context entropy; + ctr_drbg_context ctr_drbg; +}; + +// --------------------------- Global Values -------------------------- +extern struct vtpm_globals vtpm_globals; // Key info and DMI states + +TPM_RESULT vtpmmgr_init(int argc, char** argv); +void vtpmmgr_shutdown(void); + +TPM_RESULT vtpmmgr_handle_cmd(const uuid_t uuid, tpmcmd_t* tpmcmd); + +inline TPM_RESULT vtpmmgr_rand(unsigned char* bytes, size_t num_bytes) { + return ctr_drbg_random(&vtpm_globals.ctr_drbg, bytes, num_bytes) == 0 ? 0 : TPM_FAIL; +} + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:36:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Uv-0005V2-Sk; Thu, 01 Nov 2012 20:36:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Ut-0005U8-IG for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:16 +0000 Received: from [85.158.138.51:33023] by server-1.bemta-3.messagelabs.com id 36/15-12169-E3DD2905; Thu, 01 Nov 2012 20:36:14 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-14.tower-174.messagelabs.com!1351802165!21991508!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UNPARSEABLE_RELAY,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28940 invoked from network); 1 Nov 2012 20:36:06 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:06 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031189; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:49 -0400 Message-Id: <1351802150-19258-3-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 8/9] add stubdom/vtpmmgr code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add the code base for vtpmmgrdom. Makefile changes next patch. Signed-off-by: Matthew Fioravante diff --git a/stubdom/vtpmmgr/Makefile b/stubdom/vtpmmgr/Makefile new file mode 100644 index 0000000..88c83c3 --- /dev/null +++ b/stubdom/vtpmmgr/Makefile @@ -0,0 +1,32 @@ +# Copyright (c) 2010-2012 United States Government, as represented by +# the Secretary of Defense. All rights reserved. +# +# THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT +# ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES +# INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY +# DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE +# SOFTWARE. +# + +XEN_ROOT=../.. + +PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library +PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o bignum.o sha4.o havege.o timing.o entropy_poll.o + +TARGET=vtpmmgr.a +OBJS=vtpmmgr.o vtpm_cmd_handler.o vtpm_storage.o init.o tpmrsa.o tpm.o log.o + +CFLAGS+=-Werror -Iutil -Icrypto -Itcs +CFLAGS+=-Wno-declaration-after-statement -Wno-unused-label + +build: $(TARGET) +$(TARGET): $(OBJS) + ar -rcs $@ $^ $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + +clean: + rm -f $(TARGET) $(OBJS) + +distclean: clean + +.PHONY: clean distclean diff --git a/stubdom/vtpmmgr/init.c b/stubdom/vtpmmgr/init.c new file mode 100644 index 0000000..a158020 --- /dev/null +++ b/stubdom/vtpmmgr/init.c @@ -0,0 +1,553 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "vtpmmgr.h" +#include "vtpm_storage.h" +#include "tpm.h" +#include "marshal.h" + +struct Opts { + enum { + TPMDRV_TPM_TIS, + TPMDRV_TPMFRONT, + } tpmdriver; + unsigned long tpmiomem; + unsigned int tpmirq; + unsigned int tpmlocality; + int gen_owner_auth; +}; + +// --------------------------- Well Known Auths -------------------------- +const TPM_AUTHDATA WELLKNOWN_SRK_AUTH = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + +const TPM_AUTHDATA WELLKNOWN_OWNER_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + +struct vtpm_globals vtpm_globals = { + .tpm_fd = -1, + .storage_key = TPM_KEY_INIT, + .storage_key_handle = 0, + .oiap = { .AuthHandle = 0 } +}; + +static int tpm_entropy_source(void* dummy, unsigned char* data, size_t len, size_t* olen) { + UINT32 sz = len; + TPM_RESULT rc = TPM_GetRandom(&sz, data); + *olen = sz; + return rc == TPM_SUCCESS ? 0 : POLARSSL_ERR_ENTROPY_SOURCE_FAILED; +} + +static TPM_RESULT check_tpm_version(void) { + TPM_RESULT status; + UINT32 rsize; + BYTE* res = NULL; + TPM_CAP_VERSION_INFO vinfo; + + TPMTRYRETURN(TPM_GetCapability( + TPM_CAP_VERSION_VAL, + 0, + NULL, + &rsize, + &res)); + if(rsize < 4) { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid size returned by GetCapability!\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + unpack_TPM_CAP_VERSION_INFO(res, &vinfo, UNPACK_ALIAS); + + vtpmloginfo(VTPM_LOG_VTPM, "Hardware TPM:\n"); + vtpmloginfo(VTPM_LOG_VTPM, " version: %hhd %hhd %hhd %hhd\n", + vinfo.version.major, vinfo.version.minor, vinfo.version.revMajor, vinfo.version.revMinor); + vtpmloginfo(VTPM_LOG_VTPM, " specLevel: %hd\n", vinfo.specLevel); + vtpmloginfo(VTPM_LOG_VTPM, " errataRev: %hhd\n", vinfo.errataRev); + vtpmloginfo(VTPM_LOG_VTPM, " vendorID: %c%c%c%c\n", + vinfo.tpmVendorID[0], vinfo.tpmVendorID[1], + vinfo.tpmVendorID[2], vinfo.tpmVendorID[3]); + vtpmloginfo(VTPM_LOG_VTPM, " vendorSpecificSize: %hd\n", vinfo.vendorSpecificSize); + vtpmloginfo(VTPM_LOG_VTPM, " vendorSpecific: "); + for(int i = 0; i < vinfo.vendorSpecificSize; ++i) { + vtpmloginfomore(VTPM_LOG_VTPM, "%02hhx", vinfo.vendorSpecific[i]); + } + vtpmloginfomore(VTPM_LOG_VTPM, "\n"); + +abort_egress: + free(res); + return status; +} + +static TPM_RESULT flush_tpm(void) { + TPM_RESULT status = TPM_SUCCESS; + const TPM_RESOURCE_TYPE reslist[] = { TPM_RT_KEY, TPM_RT_AUTH, TPM_RT_TRANS, TPM_RT_COUNTER, TPM_RT_DAA_TPM, TPM_RT_CONTEXT }; + BYTE* keylist = NULL; + UINT32 keylistSize; + BYTE* ptr; + + //Iterate through each resource type and flush all handles + for(int i = 0; i < sizeof(reslist) / sizeof(TPM_RESOURCE_TYPE); ++i) { + TPM_RESOURCE_TYPE beres = cpu_to_be32(reslist[i]); + UINT16 size; + TPMTRYRETURN(TPM_GetCapability( + TPM_CAP_HANDLE, + sizeof(TPM_RESOURCE_TYPE), + (BYTE*)(&beres), + &keylistSize, + &keylist)); + + ptr = keylist; + ptr = unpack_UINT16(ptr, &size); + + //Flush each handle + if(size) { + vtpmloginfo(VTPM_LOG_VTPM, "Flushing %u handle(s) of type %lu\n", size, (unsigned long) reslist[i]); + for(int j = 0; j < size; ++j) { + TPM_HANDLE h; + ptr = unpack_TPM_HANDLE(ptr, &h); + TPMTRYRETURN(TPM_FlushSpecific(h, reslist[i])); + } + } + + free(keylist); + keylist = NULL; + } + + goto egress; +abort_egress: + free(keylist); +egress: + return status; +} + + +static TPM_RESULT try_take_ownership(void) { + TPM_RESULT status = TPM_SUCCESS; + TPM_PUBKEY pubEK = TPM_PUBKEY_INIT; + + // If we can read PubEK then there is no owner and we should take it. + status = TPM_ReadPubek(&pubEK); + + switch(status) { + case TPM_DISABLED_CMD: + //Cannot read ek? TPM has owner + vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); + status = TPM_SUCCESS; + break; + case TPM_NO_ENDORSEMENT: + { + //If theres no ek, we have to create one + TPM_KEY_PARMS keyInfo = { + .algorithmID = TPM_ALG_RSA, + .encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1, + .sigScheme = TPM_SS_NONE, + .parmSize = 12, + .parms.rsa = { + .keyLength = RSA_KEY_SIZE, + .numPrimes = 2, + .exponentSize = 0, + .exponent = NULL, + }, + }; + TPMTRYRETURN(TPM_CreateEndorsementKeyPair(&keyInfo, &pubEK)); + } + //fall through to take ownership + case TPM_SUCCESS: + { + //Construct the Srk + TPM_KEY srk = { + .ver = TPM_STRUCT_VER_1_1, + .keyUsage = TPM_KEY_STORAGE, + .keyFlags = 0x00, + .authDataUsage = TPM_AUTH_ALWAYS, + .algorithmParms = { + .algorithmID = TPM_ALG_RSA, + .encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1, + .sigScheme = TPM_SS_NONE, + .parmSize = 12, + .parms.rsa = { + .keyLength = RSA_KEY_SIZE, + .numPrimes = 2, + .exponentSize = 0, + .exponent = NULL, + }, + }, + .PCRInfoSize = 0, + .pubKey = { + .keyLength = 0, + .key = NULL, + }, + .encDataSize = 0, + }; + + TPMTRYRETURN(TPM_TakeOwnership( + &pubEK, + (const TPM_AUTHDATA*)&vtpm_globals.owner_auth, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &srk, + NULL, + &vtpm_globals.oiap)); + + TPMTRYRETURN(TPM_DisablePubekRead( + (const TPM_AUTHDATA*)&vtpm_globals.owner_auth, + &vtpm_globals.oiap)); + } + break; + default: + break; + } +abort_egress: + free_TPM_PUBKEY(&pubEK); + return status; +} + +static void init_storage_key(TPM_KEY* key) { + key->ver.major = 1; + key->ver.minor = 1; + key->ver.revMajor = 0; + key->ver.revMinor = 0; + + key->keyUsage = TPM_KEY_BIND; + key->keyFlags = 0; + key->authDataUsage = TPM_AUTH_ALWAYS; + + TPM_KEY_PARMS* p = &key->algorithmParms; + p->algorithmID = TPM_ALG_RSA; + p->encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; + p->sigScheme = TPM_SS_NONE; + p->parmSize = 12; + + TPM_RSA_KEY_PARMS* r = &p->parms.rsa; + r->keyLength = RSA_KEY_SIZE; + r->numPrimes = 2; + r->exponentSize = 0; + r->exponent = NULL; + + key->PCRInfoSize = 0; + key->encDataSize = 0; + key->encData = NULL; +} + +static int parse_auth_string(char* authstr, BYTE* target, const TPM_AUTHDATA wellknown, int allowrandom) { + int rc; + /* well known owner auth */ + if(!strcmp(authstr, "well-known")) { + memcpy(target, wellknown, sizeof(TPM_AUTHDATA)); + } + /* Create a randomly generated owner auth */ + else if(allowrandom && !strcmp(authstr, "random")) { + return 1; + } + /* owner auth is a raw hash */ + else if(!strncmp(authstr, "hash:", 5)) { + authstr += 5; + if((rc = strlen(authstr)) != 40) { + vtpmlogerror(VTPM_LOG_VTPM, "Supplied owner auth hex string `%s' must be exactly 40 characters (20 bytes) long, length=%d\n", authstr, rc); + return -1; + } + for(int j = 0; j < 20; ++j) { + if(sscanf(authstr, "%hhX", target + j) != 1) { + vtpmlogerror(VTPM_LOG_VTPM, "Supplied owner auth string `%s' is not a valid hex string\n", authstr); + return -1; + } + authstr += 2; + } + } + /* owner auth is a string that will be hashed */ + else if(!strncmp(authstr, "text:", 5)) { + authstr += 5; + sha1((const unsigned char*)authstr, strlen(authstr), target); + } + else { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid auth string %s\n", authstr); + return -1; + } + + return 0; +} + +int parse_cmdline_opts(int argc, char** argv, struct Opts* opts) +{ + int rc; + int i; + + //Set defaults + memcpy(vtpm_globals.owner_auth, WELLKNOWN_OWNER_AUTH, sizeof(TPM_AUTHDATA)); + memcpy(vtpm_globals.srk_auth, WELLKNOWN_SRK_AUTH, sizeof(TPM_AUTHDATA)); + + for(i = 1; i < argc; ++i) { + if(!strncmp(argv[i], "owner_auth:", 10)) { + if((rc = parse_auth_string(argv[i] + 10, vtpm_globals.owner_auth, WELLKNOWN_OWNER_AUTH, 1)) < 0) { + goto err_invalid; + } + if(rc == 1) { + opts->gen_owner_auth = 1; + } + } + else if(!strncmp(argv[i], "srk_auth:", 8)) { + if((rc = parse_auth_string(argv[i] + 8, vtpm_globals.srk_auth, WELLKNOWN_SRK_AUTH, 0)) != 0) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmdriver=", 10)) { + if(!strcmp(argv[i] + 10, "tpm_tis")) { + opts->tpmdriver = TPMDRV_TPM_TIS; + } else if(!strcmp(argv[i] + 10, "tpmfront")) { + opts->tpmdriver = TPMDRV_TPMFRONT; + } else { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmiomem=",9)) { + if(sscanf(argv[i] + 9, "0x%lX", &opts->tpmiomem) != 1) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmirq=",7)) { + if(!strcmp(argv[i] + 7, "probe")) { + opts->tpmirq = TPM_PROBE_IRQ; + } else if( sscanf(argv[i] + 7, "%u", &opts->tpmirq) != 1) { + goto err_invalid; + } + } + else if(!strncmp(argv[i], "tpmlocality=",12)) { + if(sscanf(argv[i] + 12, "%u", &opts->tpmlocality) != 1 || opts->tpmlocality > 4) { + goto err_invalid; + } + } + } + + switch(opts->tpmdriver) { + case TPMDRV_TPM_TIS: + vtpmloginfo(VTPM_LOG_VTPM, "Option: Using tpm_tis driver\n"); + break; + case TPMDRV_TPMFRONT: + vtpmloginfo(VTPM_LOG_VTPM, "Option: Using tpmfront driver\n"); + break; + } + + return 0; +err_invalid: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid Option %s\n", argv[i]); + return -1; +} + + + +static TPM_RESULT vtpmmgr_create(void) { + TPM_RESULT status = TPM_SUCCESS; + TPM_AUTH_SESSION osap = TPM_AUTH_SESSION_INIT; + TPM_AUTHDATA sharedsecret; + + // Take ownership if TPM is unowned + TPMTRYRETURN(try_take_ownership()); + + // Generate storage key's auth + memset(&vtpm_globals.storage_key_usage_auth, 0, sizeof(TPM_AUTHDATA)); + + TPMTRYRETURN( TPM_OSAP( + TPM_ET_KEYHANDLE, + TPM_SRK_KEYHANDLE, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &sharedsecret, + &osap) ); + + init_storage_key(&vtpm_globals.storage_key); + + //initialize the storage key + TPMTRYRETURN( TPM_CreateWrapKey( + TPM_SRK_KEYHANDLE, + (const TPM_AUTHDATA*)&sharedsecret, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.storage_key, + &osap) ); + + //Load Storage Key + TPMTRYRETURN( TPM_LoadKey( + TPM_SRK_KEYHANDLE, + &vtpm_globals.storage_key, + &vtpm_globals.storage_key_handle, + (const TPM_AUTHDATA*) &vtpm_globals.srk_auth, + &vtpm_globals.oiap)); + + //Make sure TPM has commited changes + TPMTRYRETURN( TPM_SaveState() ); + + //Create new disk image + TPMTRYRETURN(vtpm_storage_new_header()); + + goto egress; +abort_egress: +egress: + vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager\n"); + + //End the OSAP session + if(osap.AuthHandle) { + TPM_TerminateHandle(osap.AuthHandle); + } + + return status; +} + +TPM_RESULT vtpmmgr_init(int argc, char** argv) { + TPM_RESULT status = TPM_SUCCESS; + + /* Default commandline options */ + struct Opts opts = { + .tpmdriver = TPMDRV_TPM_TIS, + .tpmiomem = TPM_BASEADDR, + .tpmirq = 0, + .tpmlocality = 0, + .gen_owner_auth = 0, + }; + + if(parse_cmdline_opts(argc, argv, &opts) != 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Command line parsing failed! exiting..\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + //Setup storage system + if(vtpm_storage_init() != 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize storage subsystem!\n"); + status = TPM_IOERROR; + goto abort_egress; + } + + //Setup tpmback device + init_tpmback(); + + //Setup tpm access + switch(opts.tpmdriver) { + case TPMDRV_TPM_TIS: + { + struct tpm_chip* tpm; + if((tpm = init_tpm_tis(opts.tpmiomem, TPM_TIS_LOCL_INT_TO_FLAG(opts.tpmlocality), opts.tpmirq)) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize tpmfront device\n"); + status = TPM_IOERROR; + goto abort_egress; + } + vtpm_globals.tpm_fd = tpm_tis_open(tpm); + tpm_tis_request_locality(tpm, opts.tpmlocality); + } + break; + case TPMDRV_TPMFRONT: + { + struct tpmfront_dev* tpmfront_dev; + if((tpmfront_dev = init_tpmfront(NULL)) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize tpmfront device\n"); + status = TPM_IOERROR; + goto abort_egress; + } + vtpm_globals.tpm_fd = tpmfront_open(tpmfront_dev); + } + break; + } + + //Get the version of the tpm + TPMTRYRETURN(check_tpm_version()); + + // Blow away all stale handles left in the tpm + if(flush_tpm() != TPM_SUCCESS) { + vtpmlogerror(VTPM_LOG_VTPM, "VTPM_FlushResources failed, continuing anyway..\n"); + } + + /* Initialize the rng */ + entropy_init(&vtpm_globals.entropy); + entropy_add_source(&vtpm_globals.entropy, tpm_entropy_source, NULL, 0); + entropy_gather(&vtpm_globals.entropy); + ctr_drbg_init(&vtpm_globals.ctr_drbg, entropy_func, &vtpm_globals.entropy, NULL, 0); + ctr_drbg_set_prediction_resistance( &vtpm_globals.ctr_drbg, CTR_DRBG_PR_OFF ); + + // Generate Auth for Owner + if(opts.gen_owner_auth) { + vtpmmgr_rand(vtpm_globals.owner_auth, sizeof(TPM_AUTHDATA)); + } + + // Create OIAP session for service's authorized commands + TPMTRYRETURN( TPM_OIAP(&vtpm_globals.oiap) ); + + /* Load the Manager data, if it fails create a new manager */ + if (vtpm_storage_load_header() != TPM_SUCCESS) { + /* If the OIAP session was closed by an error, create a new one */ + if(vtpm_globals.oiap.AuthHandle == 0) { + TPMTRYRETURN( TPM_OIAP(&vtpm_globals.oiap) ); + } + vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); + TPMTRYRETURN( vtpmmgr_create() ); + } + + goto egress; +abort_egress: + vtpmmgr_shutdown(); +egress: + return status; +} + +void vtpmmgr_shutdown(void) +{ + /* Cleanup resources */ + free_TPM_KEY(&vtpm_globals.storage_key); + + /* Cleanup TPM resources */ + TPM_EvictKey(vtpm_globals.storage_key_handle); + TPM_TerminateHandle(vtpm_globals.oiap.AuthHandle); + + /* Close tpmback */ + shutdown_tpmback(); + + /* Close the storage system and blkfront */ + vtpm_storage_shutdown(); + + /* Close tpmfront/tpm_tis */ + close(vtpm_globals.tpm_fd); + + vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); +} diff --git a/stubdom/vtpmmgr/log.c b/stubdom/vtpmmgr/log.c new file mode 100644 index 0000000..a82c913 --- /dev/null +++ b/stubdom/vtpmmgr/log.c @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include + +#include "tcg.h" + +char *module_names[] = { "", + "TPM", + "TPM", + "VTPM", + "VTPM", + "TXDATA", + }; +// Helper code for the consts, eg. to produce messages for error codes. + +typedef struct error_code_entry_t { + TPM_RESULT code; + char * code_name; + char * msg; +} error_code_entry_t; + +static const error_code_entry_t error_msgs [] = { + { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, + { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, + { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, + { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, + { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, + { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, + { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, + { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, + { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, + { TPM_FAIL, "TPM_FAIL", "The operation failed" }, + { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, + { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, + { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, + { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, + { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, + { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, + { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, + { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, + { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, + { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, + { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, + { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, + { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, + { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, + { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, + { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, + { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, + { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, + { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, + { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, + { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, + { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, + { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, + { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, + { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, + { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, + { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, + { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, + { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, + { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, + { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, + + { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, + { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, + { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, + { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, + { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, + { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, + { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, + { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, + { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, + { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, + { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, + { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, + { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, + { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, + { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, + { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, + { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, + { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, + { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, + { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, + { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, + { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, + { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, + { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, + { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, + { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, + { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, + { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, + { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, + { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, + { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, + { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, + { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, + { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, + { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, + { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, + { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, + { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, +}; + + +// helper function for the error codes: +const char* tpm_get_error_name (TPM_RESULT code) { + // just do a linear scan for now + unsigned i; + for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) + if (code == error_msgs[i].code) + return error_msgs[i].code_name; + + return("Unknown Error Code"); +} diff --git a/stubdom/vtpmmgr/log.h b/stubdom/vtpmmgr/log.h new file mode 100644 index 0000000..5c7abf5 --- /dev/null +++ b/stubdom/vtpmmgr/log.h @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __VTPM_LOG_H__ +#define __VTPM_LOG_H__ + +#include // for uint32_t +#include // for pointer NULL +#include +#include "tcg.h" + +// =========================== LOGGING ============================== + +// the logging module numbers +#define VTPM_LOG_TPM 1 +#define VTPM_LOG_TPM_DEEP 2 +#define VTPM_LOG_VTPM 3 +#define VTPM_LOG_VTPM_DEEP 4 +#define VTPM_LOG_TXDATA 5 + +extern char *module_names[]; + +// Default to standard logging +#ifndef LOGGING_MODULES +#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)|BITMASK(VTPM_LOG_TPM)) +#endif + +// bit-access macros +#define BITMASK(idx) ( 1U << (idx) ) +#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) +#define SETBIT(num,idx) (num) |= BITMASK(idx) +#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) + +#define vtpmloginfo(module, fmt, args...) \ + if (GETBIT (LOGGING_MODULES, module) == 1) { \ + fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ + } + +#define vtpmloginfomore(module, fmt, args...) \ + if (GETBIT (LOGGING_MODULES, module) == 1) { \ + fprintf (stdout, fmt,##args); \ + } + +#define vtpmlogerror(module, fmt, args...) \ + fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); + +//typedef UINT32 tpm_size_t; + +// helper function for the error codes: +const char* tpm_get_error_name (TPM_RESULT code); + +#endif // _VTPM_LOG_H_ diff --git a/stubdom/vtpmmgr/marshal.h b/stubdom/vtpmmgr/marshal.h new file mode 100644 index 0000000..77d32f0 --- /dev/null +++ b/stubdom/vtpmmgr/marshal.h @@ -0,0 +1,528 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef MARSHAL_H +#define MARSHAL_H + +#include +#include +#include +#include "tcg.h" + +typedef enum UnpackPtr { + UNPACK_ALIAS, + UNPACK_ALLOC +} UnpackPtr; + +inline BYTE* pack_BYTE(BYTE* ptr, BYTE t) { + ptr[0] = t; + return ++ptr; +} + +inline BYTE* unpack_BYTE(BYTE* ptr, BYTE* t) { + t[0] = ptr[0]; + return ++ptr; +} + +#define pack_BOOL(p, t) pack_BYTE(p, t) +#define unpack_BOOL(p, t) unpack_BYTE(p, t) + +inline BYTE* pack_UINT16(BYTE* ptr, UINT16 t) { + BYTE* b = (BYTE*)&t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + ptr[0] = b[1]; + ptr[1] = b[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + ptr[0] = b[0]; + ptr[1] = b[1]; +#endif + return ptr + sizeof(UINT16); +} + +inline BYTE* unpack_UINT16(BYTE* ptr, UINT16* t) { + BYTE* b = (BYTE*)t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + b[0] = ptr[1]; + b[1] = ptr[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + b[0] = ptr[0]; + b[1] = ptr[1]; +#endif + return ptr + sizeof(UINT16); +} + +inline BYTE* pack_UINT32(BYTE* ptr, UINT32 t) { + BYTE* b = (BYTE*)&t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + ptr[3] = b[0]; + ptr[2] = b[1]; + ptr[1] = b[2]; + ptr[0] = b[3]; +#elif __BYTE_ORDER == __BIG_ENDIAN + ptr[0] = b[0]; + ptr[1] = b[1]; + ptr[2] = b[2]; + ptr[3] = b[3]; +#endif + return ptr + sizeof(UINT32); +} + +inline BYTE* unpack_UINT32(BYTE* ptr, UINT32* t) { + BYTE* b = (BYTE*)t; +#if __BYTE_ORDER == __LITTLE_ENDIAN + b[0] = ptr[3]; + b[1] = ptr[2]; + b[2] = ptr[1]; + b[3] = ptr[0]; +#elif __BYTE_ORDER == __BIG_ENDIAN + b[0] = ptr[0]; + b[1] = ptr[1]; + b[2] = ptr[2]; + b[3] = ptr[3]; +#endif + return ptr + sizeof(UINT32); +} + +#define pack_TPM_RESULT(p, t) pack_UINT32(p, t) +#define pack_TPM_PCRINDEX(p, t) pack_UINT32(p, t) +#define pack_TPM_DIRINDEX(p, t) pack_UINT32(p, t) +#define pack_TPM_HANDLE(p, t) pack_UINT32(p, t) +#define pack_TPM_AUTHHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_HASHHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_HMACHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_ENCHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TPM_KEY_HANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TCPA_ENTITYHANDLE(p, t) pack_TPM_HANDLE(p, t) +#define pack_TPM_RESOURCE_TYPE(p, t) pack_UINT32(p, t) +#define pack_TPM_COMMAND_CODE(p, t) pack_UINT32(p, t) +#define pack_TPM_PROTOCOL_ID(p, t) pack_UINT16(p, t) +#define pack_TPM_AUTH_DATA_USAGE(p, t) pack_BYTE(p, t) +#define pack_TPM_ENTITY_TYPE(p, t) pack_UINT16(p, t) +#define pack_TPM_ALGORITHM_ID(p, t) pack_UINT32(p, t) +#define pack_TPM_KEY_USAGE(p, t) pack_UINT16(p, t) +#define pack_TPM_STARTUP_TYPE(p, t) pack_UINT16(p, t) +#define pack_TPM_CAPABILITY_AREA(p, t) pack_UINT32(p, t) +#define pack_TPM_ENC_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_SIG_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_MIGRATE_SCHEME(p, t) pack_UINT16(p, t) +#define pack_TPM_PHYSICAL_PRESENCE(p, t) pack_UINT16(p, t) +#define pack_TPM_KEY_FLAGS(p, t) pack_UINT32(p, t) + +#define unpack_TPM_RESULT(p, t) unpack_UINT32(p, t) +#define unpack_TPM_PCRINDEX(p, t) unpack_UINT32(p, t) +#define unpack_TPM_DIRINDEX(p, t) unpack_UINT32(p, t) +#define unpack_TPM_HANDLE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_AUTHHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_HASHHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_HMACHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_ENCHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TPM_KEY_HANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TCPA_ENTITYHANDLE(p, t) unpack_TPM_HANDLE(p, t) +#define unpack_TPM_RESOURCE_TYPE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_COMMAND_CODE(p, t) unpack_UINT32(p, t) +#define unpack_TPM_PROTOCOL_ID(p, t) unpack_UINT16(p, t) +#define unpack_TPM_AUTH_DATA_USAGE(p, t) unpack_BYTE(p, t) +#define unpack_TPM_ENTITY_TYPE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_ALGORITHM_ID(p, t) unpack_UINT32(p, t) +#define unpack_TPM_KEY_USAGE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_STARTUP_TYPE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_CAPABILITY_AREA(p, t) unpack_UINT32(p, t) +#define unpack_TPM_ENC_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_SIG_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_MIGRATE_SCHEME(p, t) unpack_UINT16(p, t) +#define unpack_TPM_PHYSICAL_PRESENCE(p, t) unpack_UINT16(p, t) +#define unpack_TPM_KEY_FLAGS(p, t) unpack_UINT32(p, t) + +#define pack_TPM_AUTH_HANDLE(p, t) pack_UINT32(p, t); +#define pack_TCS_CONTEXT_HANDLE(p, t) pack_UINT32(p, t); +#define pack_TCS_KEY_HANDLE(p, t) pack_UINT32(p, t); + +#define unpack_TPM_AUTH_HANDLE(p, t) unpack_UINT32(p, t); +#define unpack_TCS_CONTEXT_HANDLE(p, t) unpack_UINT32(p, t); +#define unpack_TCS_KEY_HANDLE(p, t) unpack_UINT32(p, t); + +inline BYTE* pack_BUFFER(BYTE* ptr, const BYTE* buf, UINT32 size) { + memcpy(ptr, buf, size); + return ptr + size; +} + +inline BYTE* unpack_BUFFER(BYTE* ptr, BYTE* buf, UINT32 size) { + memcpy(buf, ptr, size); + return ptr + size; +} + +inline BYTE* unpack_ALIAS(BYTE* ptr, BYTE** buf, UINT32 size) { + *buf = ptr; + return ptr + size; +} + +inline BYTE* unpack_ALLOC(BYTE* ptr, BYTE** buf, UINT32 size) { + if(size) { + *buf = malloc(size); + memcpy(*buf, ptr, size); + } else { + *buf = NULL; + } + return ptr + size; +} + +inline BYTE* unpack_PTR(BYTE* ptr, BYTE** buf, UINT32 size, UnpackPtr alloc) { + if(alloc == UNPACK_ALLOC) { + return unpack_ALLOC(ptr, buf, size); + } else { + return unpack_ALIAS(ptr, buf, size); + } +} + +inline BYTE* pack_TPM_AUTHDATA(BYTE* ptr, const TPM_AUTHDATA* d) { + return pack_BUFFER(ptr, *d, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_AUTHDATA(BYTE* ptr, TPM_AUTHDATA* d) { + return unpack_BUFFER(ptr, *d, TPM_DIGEST_SIZE); +} + +#define pack_TPM_SECRET(p, t) pack_TPM_AUTHDATA(p, t) +#define pack_TPM_ENCAUTH(p, t) pack_TPM_AUTHDATA(p, t) +#define pack_TPM_PAYLOAD_TYPE(p, t) pack_BYTE(p, t) +#define pack_TPM_TAG(p, t) pack_UINT16(p, t) +#define pack_TPM_STRUCTURE_TAG(p, t) pack_UINT16(p, t) + +#define unpack_TPM_SECRET(p, t) unpack_TPM_AUTHDATA(p, t) +#define unpack_TPM_ENCAUTH(p, t) unpack_TPM_AUTHDATA(p, t) +#define unpack_TPM_PAYLOAD_TYPE(p, t) unpack_BYTE(p, t) +#define unpack_TPM_TAG(p, t) unpack_UINT16(p, t) +#define unpack_TPM_STRUCTURE_TAG(p, t) unpack_UINT16(p, t) + +inline BYTE* pack_TPM_VERSION(BYTE* ptr, const TPM_VERSION* t) { + ptr[0] = t->major; + ptr[1] = t->minor; + ptr[2] = t->revMajor; + ptr[3] = t->revMinor; + return ptr + 4; +} + +inline BYTE* unpack_TPM_VERSION(BYTE* ptr, TPM_VERSION* t) { + t->major = ptr[0]; + t->minor = ptr[1]; + t->revMajor = ptr[2]; + t->revMinor = ptr[3]; + return ptr + 4; +} + +inline BYTE* pack_TPM_CAP_VERSION_INFO(BYTE* ptr, const TPM_CAP_VERSION_INFO* v) { + ptr = pack_TPM_STRUCTURE_TAG(ptr, v->tag); + ptr = pack_TPM_VERSION(ptr, &v->version); + ptr = pack_UINT16(ptr, v->specLevel); + ptr = pack_BYTE(ptr, v->errataRev); + ptr = pack_BUFFER(ptr, v->tpmVendorID, sizeof(v->tpmVendorID)); + ptr = pack_UINT16(ptr, v->vendorSpecificSize); + ptr = pack_BUFFER(ptr, v->vendorSpecific, v->vendorSpecificSize); + return ptr; +} + +inline BYTE* unpack_TPM_CAP_VERSION_INFO(BYTE* ptr, TPM_CAP_VERSION_INFO* v, UnpackPtr alloc) { + ptr = unpack_TPM_STRUCTURE_TAG(ptr, &v->tag); + ptr = unpack_TPM_VERSION(ptr, &v->version); + ptr = unpack_UINT16(ptr, &v->specLevel); + ptr = unpack_BYTE(ptr, &v->errataRev); + ptr = unpack_BUFFER(ptr, v->tpmVendorID, sizeof(v->tpmVendorID)); + ptr = unpack_UINT16(ptr, &v->vendorSpecificSize); + ptr = unpack_PTR(ptr, &v->vendorSpecific, v->vendorSpecificSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_DIGEST(BYTE* ptr, const TPM_DIGEST* d) { + return pack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_DIGEST(BYTE* ptr, TPM_DIGEST* d) { + return unpack_BUFFER(ptr, d->digest, TPM_DIGEST_SIZE); +} + +#define pack_TPM_PCRVALUE(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_PCRVALUE(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_COMPOSITE_HASH(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_COMPOSITE_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_DIRVALUE(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_DIRVALUE(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_HMAC(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_HMAC(ptr, d) unpack_TPM_DIGEST(ptr, d); + +#define pack_TPM_CHOSENID_HASH(ptr, d) pack_TPM_DIGEST(ptr, d); +#define unpack_TPM_CHOSENID_HASH(ptr, d) unpack_TPM_DIGEST(ptr, d); + +inline BYTE* pack_TPM_NONCE(BYTE* ptr, const TPM_NONCE* n) { + return pack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE); +} + +inline BYTE* unpack_TPM_NONCE(BYTE* ptr, TPM_NONCE* n) { + return unpack_BUFFER(ptr, n->nonce, TPM_DIGEST_SIZE); +} + +inline BYTE* pack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, const TPM_SYMMETRIC_KEY_PARMS* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_UINT32(ptr, k->blockSize); + ptr = pack_UINT32(ptr, k->ivSize); + return pack_BUFFER(ptr, k->IV, k->ivSize); +} + +inline BYTE* unpack_TPM_SYMMETRIC_KEY_PARMS(BYTE* ptr, TPM_SYMMETRIC_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_UINT32(ptr, &k->blockSize); + ptr = unpack_UINT32(ptr, &k->ivSize); + return unpack_PTR(ptr, &k->IV, k->ivSize, alloc); +} + +inline BYTE* pack_TPM_RSA_KEY_PARMS(BYTE* ptr, const TPM_RSA_KEY_PARMS* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_UINT32(ptr, k->numPrimes); + ptr = pack_UINT32(ptr, k->exponentSize); + return pack_BUFFER(ptr, k->exponent, k->exponentSize); +} + +inline BYTE* unpack_TPM_RSA_KEY_PARMS(BYTE* ptr, TPM_RSA_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_UINT32(ptr, &k->numPrimes); + ptr = unpack_UINT32(ptr, &k->exponentSize); + return unpack_PTR(ptr, &k->exponent, k->exponentSize, alloc); +} + +inline BYTE* pack_TPM_KEY_PARMS(BYTE* ptr, const TPM_KEY_PARMS* k) { + ptr = pack_TPM_ALGORITHM_ID(ptr, k->algorithmID); + ptr = pack_TPM_ENC_SCHEME(ptr, k->encScheme); + ptr = pack_TPM_SIG_SCHEME(ptr, k->sigScheme); + ptr = pack_UINT32(ptr, k->parmSize); + + if(k->parmSize) { + switch(k->algorithmID) { + case TPM_ALG_RSA: + return pack_TPM_RSA_KEY_PARMS(ptr, &k->parms.rsa); + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + return pack_TPM_SYMMETRIC_KEY_PARMS(ptr, &k->parms.sym); + } + } + return ptr; +} + +inline BYTE* unpack_TPM_KEY_PARMS(BYTE* ptr, TPM_KEY_PARMS* k, UnpackPtr alloc) { + ptr = unpack_TPM_ALGORITHM_ID(ptr, &k->algorithmID); + ptr = unpack_TPM_ENC_SCHEME(ptr, &k->encScheme); + ptr = unpack_TPM_SIG_SCHEME(ptr, &k->sigScheme); + ptr = unpack_UINT32(ptr, &k->parmSize); + + if(k->parmSize) { + switch(k->algorithmID) { + case TPM_ALG_RSA: + return unpack_TPM_RSA_KEY_PARMS(ptr, &k->parms.rsa, alloc); + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + return unpack_TPM_SYMMETRIC_KEY_PARMS(ptr, &k->parms.sym, alloc); + } + } + return ptr; +} + +inline BYTE* pack_TPM_STORE_PUBKEY(BYTE* ptr, const TPM_STORE_PUBKEY* k) { + ptr = pack_UINT32(ptr, k->keyLength); + ptr = pack_BUFFER(ptr, k->key, k->keyLength); + return ptr; +} + +inline BYTE* unpack_TPM_STORE_PUBKEY(BYTE* ptr, TPM_STORE_PUBKEY* k, UnpackPtr alloc) { + ptr = unpack_UINT32(ptr, &k->keyLength); + ptr = unpack_PTR(ptr, &k->key, k->keyLength, alloc); + return ptr; +} + +inline BYTE* pack_TPM_PUBKEY(BYTE* ptr, const TPM_PUBKEY* k) { + ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms); + return pack_TPM_STORE_PUBKEY(ptr, &k->pubKey); +} + +inline BYTE* unpack_TPM_PUBKEY(BYTE* ptr, TPM_PUBKEY* k, UnpackPtr alloc) { + ptr = unpack_TPM_KEY_PARMS(ptr, &k->algorithmParms, alloc); + return unpack_TPM_STORE_PUBKEY(ptr, &k->pubKey, alloc); +} + +inline BYTE* pack_TPM_PCR_SELECTION(BYTE* ptr, const TPM_PCR_SELECTION* p) { + ptr = pack_UINT16(ptr, p->sizeOfSelect); + ptr = pack_BUFFER(ptr, p->pcrSelect, p->sizeOfSelect); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_SELECTION(BYTE* ptr, TPM_PCR_SELECTION* p, UnpackPtr alloc) { + ptr = unpack_UINT16(ptr, &p->sizeOfSelect); + ptr = unpack_PTR(ptr, &p->pcrSelect, p->sizeOfSelect, alloc); + return ptr; +} + +inline BYTE* pack_TPM_PCR_INFO(BYTE* ptr, const TPM_PCR_INFO* p) { + ptr = pack_TPM_PCR_SELECTION(ptr, &p->pcrSelection); + ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease); + ptr = pack_TPM_COMPOSITE_HASH(ptr, &p->digestAtCreation); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_INFO(BYTE* ptr, TPM_PCR_INFO* p, UnpackPtr alloc) { + ptr = unpack_TPM_PCR_SELECTION(ptr, &p->pcrSelection, alloc); + ptr = unpack_TPM_COMPOSITE_HASH(ptr, &p->digestAtRelease); + ptr = unpack_TPM_COMPOSITE_HASH(ptr, &p->digestAtCreation); + return ptr; +} + +inline BYTE* pack_TPM_PCR_COMPOSITE(BYTE* ptr, const TPM_PCR_COMPOSITE* p) { + ptr = pack_TPM_PCR_SELECTION(ptr, &p->select); + ptr = pack_UINT32(ptr, p->valueSize); + ptr = pack_BUFFER(ptr, (const BYTE*)p->pcrValue, p->valueSize); + return ptr; +} + +inline BYTE* unpack_TPM_PCR_COMPOSITE(BYTE* ptr, TPM_PCR_COMPOSITE* p, UnpackPtr alloc) { + ptr = unpack_TPM_PCR_SELECTION(ptr, &p->select, alloc); + ptr = unpack_UINT32(ptr, &p->valueSize); + ptr = unpack_PTR(ptr, (BYTE**)&p->pcrValue, p->valueSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_KEY(BYTE* ptr, const TPM_KEY* k) { + ptr = pack_TPM_VERSION(ptr, &k->ver); + ptr = pack_TPM_KEY_USAGE(ptr, k->keyUsage); + ptr = pack_TPM_KEY_FLAGS(ptr, k->keyFlags); + ptr = pack_TPM_AUTH_DATA_USAGE(ptr, k->authDataUsage); + ptr = pack_TPM_KEY_PARMS(ptr, &k->algorithmParms); + ptr = pack_UINT32(ptr, k->PCRInfoSize); + if(k->PCRInfoSize) { + ptr = pack_TPM_PCR_INFO(ptr, &k->PCRInfo); + } + ptr = pack_TPM_STORE_PUBKEY(ptr, &k->pubKey); + ptr = pack_UINT32(ptr, k->encDataSize); + return pack_BUFFER(ptr, k->encData, k->encDataSize); +} + +inline BYTE* unpack_TPM_KEY(BYTE* ptr, TPM_KEY* k, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &k->ver); + ptr = unpack_TPM_KEY_USAGE(ptr, &k->keyUsage); + ptr = unpack_TPM_KEY_FLAGS(ptr, &k->keyFlags); + ptr = unpack_TPM_AUTH_DATA_USAGE(ptr, &k->authDataUsage); + ptr = unpack_TPM_KEY_PARMS(ptr, &k->algorithmParms, alloc); + ptr = unpack_UINT32(ptr, &k->PCRInfoSize); + if(k->PCRInfoSize) { + ptr = unpack_TPM_PCR_INFO(ptr, &k->PCRInfo, alloc); + } + ptr = unpack_TPM_STORE_PUBKEY(ptr, &k->pubKey, alloc); + ptr = unpack_UINT32(ptr, &k->encDataSize); + return unpack_PTR(ptr, &k->encData, k->encDataSize, alloc); +} + +inline BYTE* pack_TPM_BOUND_DATA(BYTE* ptr, const TPM_BOUND_DATA* b, UINT32 payloadSize) { + ptr = pack_TPM_VERSION(ptr, &b->ver); + ptr = pack_TPM_PAYLOAD_TYPE(ptr, b->payload); + return pack_BUFFER(ptr, b->payloadData, payloadSize); +} + +inline BYTE* unpack_TPM_BOUND_DATA(BYTE* ptr, TPM_BOUND_DATA* b, UINT32 payloadSize, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &b->ver); + ptr = unpack_TPM_PAYLOAD_TYPE(ptr, &b->payload); + return unpack_PTR(ptr, &b->payloadData, payloadSize, alloc); +} + +inline BYTE* pack_TPM_STORED_DATA(BYTE* ptr, const TPM_STORED_DATA* d) { + ptr = pack_TPM_VERSION(ptr, &d->ver); + ptr = pack_UINT32(ptr, d->sealInfoSize); + if(d->sealInfoSize) { + ptr = pack_TPM_PCR_INFO(ptr, &d->sealInfo); + } + ptr = pack_UINT32(ptr, d->encDataSize); + ptr = pack_BUFFER(ptr, d->encData, d->encDataSize); + return ptr; +} + +inline BYTE* unpack_TPM_STORED_DATA(BYTE* ptr, TPM_STORED_DATA* d, UnpackPtr alloc) { + ptr = unpack_TPM_VERSION(ptr, &d->ver); + ptr = unpack_UINT32(ptr, &d->sealInfoSize); + if(d->sealInfoSize) { + ptr = unpack_TPM_PCR_INFO(ptr, &d->sealInfo, alloc); + } + ptr = unpack_UINT32(ptr, &d->encDataSize); + ptr = unpack_PTR(ptr, &d->encData, d->encDataSize, alloc); + return ptr; +} + +inline BYTE* pack_TPM_AUTH_SESSION(BYTE* ptr, const TPM_AUTH_SESSION* auth) { + ptr = pack_TPM_AUTH_HANDLE(ptr, auth->AuthHandle); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + ptr = pack_TPM_AUTHDATA(ptr, &auth->HMAC); + return ptr; +} + +inline BYTE* unpack_TPM_AUTH_SESSION(BYTE* ptr, TPM_AUTH_SESSION* auth) { + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = unpack_BOOL(ptr, &auth->fContinueAuthSession); + ptr = unpack_TPM_AUTHDATA(ptr, &auth->HMAC); + return ptr; +} + +inline BYTE* pack_TPM_RQU_HEADER(BYTE* ptr, + TPM_TAG tag, + UINT32 size, + TPM_COMMAND_CODE ord) { + ptr = pack_UINT16(ptr, tag); + ptr = pack_UINT32(ptr, size); + return pack_UINT32(ptr, ord); +} + +inline BYTE* unpack_TPM_RQU_HEADER(BYTE* ptr, + TPM_TAG* tag, + UINT32* size, + TPM_COMMAND_CODE* ord) { + ptr = unpack_UINT16(ptr, tag); + ptr = unpack_UINT32(ptr, size); + ptr = unpack_UINT32(ptr, ord); + return ptr; +} + +#define pack_TPM_RSP_HEADER(p, t, s, r) pack_TPM_RQU_HEADER(p, t, s, r); +#define unpack_TPM_RSP_HEADER(p, t, s, r) unpack_TPM_RQU_HEADER(p, t, s, r); + +#endif diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg new file mode 100644 index 0000000..3fb383d --- /dev/null +++ b/stubdom/vtpmmgr/minios.cfg @@ -0,0 +1,14 @@ +CONFIG_TPMFRONT=y +CONFIG_TPM_TIS=y +CONFIG_TPMBACK=y +CONFIG_START_NETWORK=n +CONFIG_TEST=n +CONFIG_PCIFRONT=n +CONFIG_BLKFRONT=y +CONFIG_NETFRONT=n +CONFIG_FBFRONT=n +CONFIG_KBDFRONT=n +CONFIG_CONSFRONT=n +CONFIG_XENBUS=y +CONFIG_LWIP=n +CONFIG_XC=n diff --git a/stubdom/vtpmmgr/tcg.h b/stubdom/vtpmmgr/tcg.h new file mode 100644 index 0000000..7687eae --- /dev/null +++ b/stubdom/vtpmmgr/tcg.h @@ -0,0 +1,707 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005 Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __TCG_H__ +#define __TCG_H__ + +#include +#include + +// **************************** CONSTANTS ********************************* + +// BOOL values +#define TRUE 0x01 +#define FALSE 0x00 + +#define TCPA_MAX_BUFFER_LENGTH 0x2000 + +// +// TPM_COMMAND_CODE values +#define TPM_PROTECTED_ORDINAL 0x00000000UL +#define TPM_UNPROTECTED_ORDINAL 0x80000000UL +#define TPM_CONNECTION_ORDINAL 0x40000000UL +#define TPM_VENDOR_ORDINAL 0x20000000UL + +#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_SaveContext (184UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_LoadContext (185UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_FlushSpecific (186UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_PCR_Reset (200UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_DefineSpace (204UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_WriteValue (205UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_WriteValueAuth (206UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_ReadValue (207UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_NV_ReadValueAuth (208UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_UpdateVerification (209UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_Manage (210UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_CreateKeyDelegation (212UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_CreateOwnerDelegation (213UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_VerifyDelegation (214UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_LoadOwnerDelegation (216UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_ReadAuth (217UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_Delegate_ReadTable (219UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_CreateCounter (220UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_IncrementCounter (221UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReadCounter (222UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseCounter (223UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseCounterOwner (224UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_EstablishTransport (230UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ExecuteTransport (231UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_ReleaseTransportSigned (232UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_GetTicks (241UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_TickStampBlob (242UL + TPM_PROTECTED_ORDINAL) +#define TPM_ORD_MAX (256UL + TPM_PROTECTED_ORDINAL) + +#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) + + + +// +// TPM_RESULT values +// +// just put in the whole table from spec 1.2 + +#define TPM_BASE 0x0 // The start of TPM return codes +#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands +#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. + +#define TPM_SUCCESS TPM_BASE // Successful completion of the operation +#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed +#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect +#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad +#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. +#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access +#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated +#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled +#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled +#define TPM_FAIL TPM_BASE + 9 // The operation failed +#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent +#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled +#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid +#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found +#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme +#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed +#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted +#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. +#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set +#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM +#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner +#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. +#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short +#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. +#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. +#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value +#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. +#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. +#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. +#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization +#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid +#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM +#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. +#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. +#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. +#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed +#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed +#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed +#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup +#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information +#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM + +#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. +#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. +#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key +#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. +#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value +#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability +#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions +#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also +#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success +#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute +#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport +#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed +#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource +#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode +#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID +#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available +#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command +#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key +#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization +#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable +#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation +#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to +#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area +#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match +#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to +#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict +#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent +#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. +#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect +#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area +#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large +#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded +#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set +#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded +#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked +#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family +#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled +#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session + +// TPM_STARTUP_TYPE values +#define TPM_ST_CLEAR 0x0001 +#define TPM_ST_STATE 0x0002 +#define TPM_ST_DEACTIVATED 0x003 + +// TPM_TAG values +#define TPM_TAG_RQU_COMMAND 0x00c1 +#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 +#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 +#define TPM_TAG_RSP_COMMAND 0x00c4 +#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 +#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 + +// TPM_PAYLOAD_TYPE values +#define TPM_PT_ASYM 0x01 +#define TPM_PT_BIND 0x02 +#define TPM_PT_MIGRATE 0x03 +#define TPM_PT_MAINT 0x04 +#define TPM_PT_SEAL 0x05 + +// TPM_ENTITY_TYPE values +#define TPM_ET_KEYHANDLE 0x0001 +#define TPM_ET_OWNER 0x0002 +#define TPM_ET_DATA 0x0003 +#define TPM_ET_SRK 0x0004 +#define TPM_ET_KEY 0x0005 + +/// TPM_ResourceTypes +#define TPM_RT_KEY 0x00000001 +#define TPM_RT_AUTH 0x00000002 +#define TPM_RT_HASH 0x00000003 +#define TPM_RT_TRANS 0x00000004 +#define TPM_RT_CONTEXT 0x00000005 +#define TPM_RT_COUNTER 0x00000006 +#define TPM_RT_DELEGATE 0x00000007 +#define TPM_RT_DAA_TPM 0x00000008 +#define TPM_RT_DAA_V0 0x00000009 +#define TPM_RT_DAA_V1 0x0000000A + + + +// TPM_PROTOCOL_ID values +#define TPM_PID_OIAP 0x0001 +#define TPM_PID_OSAP 0x0002 +#define TPM_PID_ADIP 0x0003 +#define TPM_PID_ADCP 0x0004 +#define TPM_PID_OWNER 0x0005 + +// TPM_ALGORITHM_ID values +#define TPM_ALG_RSA 0x00000001 +#define TPM_ALG_SHA 0x00000004 +#define TPM_ALG_HMAC 0x00000005 +#define TPM_ALG_AES128 0x00000006 +#define TPM_ALG_MFG1 0x00000007 +#define TPM_ALG_AES192 0x00000008 +#define TPM_ALG_AES256 0x00000009 +#define TPM_ALG_XOR 0x0000000A + +// TPM_ENC_SCHEME values +#define TPM_ES_NONE 0x0001 +#define TPM_ES_RSAESPKCSv15 0x0002 +#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 + +// TPM_SIG_SCHEME values +#define TPM_SS_NONE 0x0001 +#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 +#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 + +/* + * TPM_CAPABILITY_AREA Values for TPM_GetCapability ([TPM_Part2], Section 21.1) + */ +#define TPM_CAP_ORD 0x00000001 +#define TPM_CAP_ALG 0x00000002 +#define TPM_CAP_PID 0x00000003 +#define TPM_CAP_FLAG 0x00000004 +#define TPM_CAP_PROPERTY 0x00000005 +#define TPM_CAP_VERSION 0x00000006 +#define TPM_CAP_KEY_HANDLE 0x00000007 +#define TPM_CAP_CHECK_LOADED 0x00000008 +#define TPM_CAP_SYM_MODE 0x00000009 +#define TPM_CAP_KEY_STATUS 0x0000000C +#define TPM_CAP_NV_LIST 0x0000000D +#define TPM_CAP_MFR 0x00000010 +#define TPM_CAP_NV_INDEX 0x00000011 +#define TPM_CAP_TRANS_ALG 0x00000012 +#define TPM_CAP_HANDLE 0x00000014 +#define TPM_CAP_TRANS_ES 0x00000015 +#define TPM_CAP_AUTH_ENCRYPT 0x00000017 +#define TPM_CAP_SELECT_SIZE 0x00000018 +#define TPM_CAP_DA_LOGIC 0x00000019 +#define TPM_CAP_VERSION_VAL 0x0000001A + +/* subCap definitions ([TPM_Part2], Section 21.2) */ +#define TPM_CAP_PROP_PCR 0x00000101 +#define TPM_CAP_PROP_DIR 0x00000102 +#define TPM_CAP_PROP_MANUFACTURER 0x00000103 +#define TPM_CAP_PROP_KEYS 0x00000104 +#define TPM_CAP_PROP_MIN_COUNTER 0x00000107 +#define TPM_CAP_FLAG_PERMANENT 0x00000108 +#define TPM_CAP_FLAG_VOLATILE 0x00000109 +#define TPM_CAP_PROP_AUTHSESS 0x0000010A +#define TPM_CAP_PROP_TRANSESS 0x0000010B +#define TPM_CAP_PROP_COUNTERS 0x0000010C +#define TPM_CAP_PROP_MAX_AUTHSESS 0x0000010D +#define TPM_CAP_PROP_MAX_TRANSESS 0x0000010E +#define TPM_CAP_PROP_MAX_COUNTERS 0x0000010F +#define TPM_CAP_PROP_MAX_KEYS 0x00000110 +#define TPM_CAP_PROP_OWNER 0x00000111 +#define TPM_CAP_PROP_CONTEXT 0x00000112 +#define TPM_CAP_PROP_MAX_CONTEXT 0x00000113 +#define TPM_CAP_PROP_FAMILYROWS 0x00000114 +#define TPM_CAP_PROP_TIS_TIMEOUT 0x00000115 +#define TPM_CAP_PROP_STARTUP_EFFECT 0x00000116 +#define TPM_CAP_PROP_DELEGATE_ROW 0x00000117 +#define TPM_CAP_PROP_MAX_DAASESS 0x00000119 +#define TPM_CAP_PROP_DAASESS 0x0000011A +#define TPM_CAP_PROP_CONTEXT_DIST 0x0000011B +#define TPM_CAP_PROP_DAA_INTERRUPT 0x0000011C +#define TPM_CAP_PROP_SESSIONS 0x0000011D +#define TPM_CAP_PROP_MAX_SESSIONS 0x0000011E +#define TPM_CAP_PROP_CMK_RESTRICTION 0x0000011F +#define TPM_CAP_PROP_DURATION 0x00000120 +#define TPM_CAP_PROP_ACTIVE_COUNTER 0x00000122 +#define TPM_CAP_PROP_MAX_NV_AVAILABLE 0x00000123 +#define TPM_CAP_PROP_INPUT_BUFFER 0x00000124 + +// TPM_KEY_USAGE values +#define TPM_KEY_EK 0x0000 +#define TPM_KEY_SIGNING 0x0010 +#define TPM_KEY_STORAGE 0x0011 +#define TPM_KEY_IDENTITY 0x0012 +#define TPM_KEY_AUTHCHANGE 0X0013 +#define TPM_KEY_BIND 0x0014 +#define TPM_KEY_LEGACY 0x0015 + +// TPM_AUTH_DATA_USAGE values +#define TPM_AUTH_NEVER 0x00 +#define TPM_AUTH_ALWAYS 0x01 + +// Key Handle of owner and srk +#define TPM_OWNER_KEYHANDLE 0x40000001 +#define TPM_SRK_KEYHANDLE 0x40000000 + + + +// *************************** TYPEDEFS ********************************* +typedef unsigned char BYTE; +typedef unsigned char BOOL; +typedef uint16_t UINT16; +typedef uint32_t UINT32; +typedef uint64_t UINT64; + +typedef UINT32 TPM_RESULT; +typedef UINT32 TPM_PCRINDEX; +typedef UINT32 TPM_DIRINDEX; +typedef UINT32 TPM_HANDLE; +typedef TPM_HANDLE TPM_AUTHHANDLE; +typedef TPM_HANDLE TCPA_HASHHANDLE; +typedef TPM_HANDLE TCPA_HMACHANDLE; +typedef TPM_HANDLE TCPA_ENCHANDLE; +typedef TPM_HANDLE TPM_KEY_HANDLE; +typedef TPM_HANDLE TCPA_ENTITYHANDLE; +typedef UINT32 TPM_RESOURCE_TYPE; +typedef UINT32 TPM_COMMAND_CODE; +typedef UINT16 TPM_PROTOCOL_ID; +typedef BYTE TPM_AUTH_DATA_USAGE; +typedef UINT16 TPM_ENTITY_TYPE; +typedef UINT32 TPM_ALGORITHM_ID; +typedef UINT16 TPM_KEY_USAGE; +typedef UINT16 TPM_STARTUP_TYPE; +typedef UINT32 TPM_CAPABILITY_AREA; +typedef UINT16 TPM_ENC_SCHEME; +typedef UINT16 TPM_SIG_SCHEME; +typedef UINT16 TPM_MIGRATE_SCHEME; +typedef UINT16 TPM_PHYSICAL_PRESENCE; +typedef UINT32 TPM_KEY_FLAGS; + +#define TPM_DIGEST_SIZE 20 // Don't change this +typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; +typedef TPM_AUTHDATA TPM_SECRET; +typedef TPM_AUTHDATA TPM_ENCAUTH; +typedef BYTE TPM_PAYLOAD_TYPE; +typedef UINT16 TPM_TAG; +typedef UINT16 TPM_STRUCTURE_TAG; + +// Data Types of the TCS +typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session +typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle +typedef UINT32 TCS_KEY_HANDLE; // Basic key handle + +// ************************* STRUCTURES ********************************** + +typedef struct TPM_VERSION { + BYTE major; + BYTE minor; + BYTE revMajor; + BYTE revMinor; +} TPM_VERSION; + +static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; + +typedef struct TPM_CAP_VERSION_INFO { + TPM_STRUCTURE_TAG tag; + TPM_VERSION version; + UINT16 specLevel; + BYTE errataRev; + BYTE tpmVendorID[4]; + UINT16 vendorSpecificSize; + BYTE* vendorSpecific; +} TPM_CAP_VERSION_INFO; + +inline void free_TPM_CAP_VERSION_INFO(TPM_CAP_VERSION_INFO* v) { + free(v->vendorSpecific); + v->vendorSpecific = NULL; +} + +typedef struct TPM_DIGEST { + BYTE digest[TPM_DIGEST_SIZE]; +} TPM_DIGEST; + +typedef TPM_DIGEST TPM_PCRVALUE; +typedef TPM_DIGEST TPM_COMPOSITE_HASH; +typedef TPM_DIGEST TPM_DIRVALUE; +typedef TPM_DIGEST TPM_HMAC; +typedef TPM_DIGEST TPM_CHOSENID_HASH; + +typedef struct TPM_NONCE { + BYTE nonce[TPM_DIGEST_SIZE]; +} TPM_NONCE; + +typedef struct TPM_SYMMETRIC_KEY_PARMS { + UINT32 keyLength; + UINT32 blockSize; + UINT32 ivSize; + BYTE* IV; +} TPM_SYMMETRIC_KEY_PARMS; + +inline void free_TPM_SYMMETRIC_KEY_PARMS(TPM_SYMMETRIC_KEY_PARMS* p) { + free(p->IV); + p->IV = NULL; +} + +#define TPM_SYMMETRIC_KEY_PARMS_INIT { 0, 0, 0, NULL } + +typedef struct TPM_RSA_KEY_PARMS { + UINT32 keyLength; + UINT32 numPrimes; + UINT32 exponentSize; + BYTE* exponent; +} TPM_RSA_KEY_PARMS; + +#define TPM_RSA_KEY_PARMS_INIT { 0, 0, 0, NULL } + +inline void free_TPM_RSA_KEY_PARMS(TPM_RSA_KEY_PARMS* p) { + free(p->exponent); + p->exponent = NULL; +} + +typedef struct TPM_KEY_PARMS { + TPM_ALGORITHM_ID algorithmID; + TPM_ENC_SCHEME encScheme; + TPM_SIG_SCHEME sigScheme; + UINT32 parmSize; + union { + TPM_SYMMETRIC_KEY_PARMS sym; + TPM_RSA_KEY_PARMS rsa; + } parms; +} TPM_KEY_PARMS; + +#define TPM_KEY_PARMS_INIT { 0, 0, 0, 0 } + +inline void free_TPM_KEY_PARMS(TPM_KEY_PARMS* p) { + if(p->parmSize) { + switch(p->algorithmID) { + case TPM_ALG_RSA: + free_TPM_RSA_KEY_PARMS(&p->parms.rsa); + break; + case TPM_ALG_AES128: + case TPM_ALG_AES192: + case TPM_ALG_AES256: + free_TPM_SYMMETRIC_KEY_PARMS(&p->parms.sym); + break; + } + } +} + +typedef struct TPM_STORE_PUBKEY { + UINT32 keyLength; + BYTE* key; +} TPM_STORE_PUBKEY; + +#define TPM_STORE_PUBKEY_INIT { 0, NULL } + +inline void free_TPM_STORE_PUBKEY(TPM_STORE_PUBKEY* p) { + free(p->key); + p->key = NULL; +} + +typedef struct TPM_PUBKEY { + TPM_KEY_PARMS algorithmParms; + TPM_STORE_PUBKEY pubKey; +} TPM_PUBKEY; + +#define TPM_PUBKEY_INIT { TPM_KEY_PARMS_INIT, TPM_STORE_PUBKEY_INIT } + +inline void free_TPM_PUBKEY(TPM_PUBKEY* k) { + free_TPM_KEY_PARMS(&k->algorithmParms); + free_TPM_STORE_PUBKEY(&k->pubKey); +} + +typedef struct TPM_PCR_SELECTION { + UINT16 sizeOfSelect; + BYTE* pcrSelect; +} TPM_PCR_SELECTION; + +#define TPM_PCR_SELECTION_INIT { 0, NULL } + +inline void free_TPM_PCR_SELECTION(TPM_PCR_SELECTION* p) { + free(p->pcrSelect); + p->pcrSelect = NULL; +} + +typedef struct TPM_PCR_INFO { + TPM_PCR_SELECTION pcrSelection; + TPM_COMPOSITE_HASH digestAtRelease; + TPM_COMPOSITE_HASH digestAtCreation; +} TPM_PCR_INFO; + +#define TPM_PCR_INFO_INIT { TPM_PCR_SELECTION_INIT } + +inline void free_TPM_PCR_INFO(TPM_PCR_INFO* p) { + free_TPM_PCR_SELECTION(&p->pcrSelection); +} + +typedef struct TPM_PCR_COMPOSITE { + TPM_PCR_SELECTION select; + UINT32 valueSize; + TPM_PCRVALUE* pcrValue; +} TPM_PCR_COMPOSITE; + +#define TPM_PCR_COMPOSITE_INIT { TPM_PCR_SELECTION_INIT, 0, NULL } + +inline void free_TPM_PCR_COMPOSITE(TPM_PCR_COMPOSITE* p) { + free_TPM_PCR_SELECTION(&p->select); + free(p->pcrValue); + p->pcrValue = NULL; +} + +typedef struct TPM_KEY { + TPM_VERSION ver; + TPM_KEY_USAGE keyUsage; + TPM_KEY_FLAGS keyFlags; + TPM_AUTH_DATA_USAGE authDataUsage; + TPM_KEY_PARMS algorithmParms; + UINT32 PCRInfoSize; + TPM_PCR_INFO PCRInfo; + TPM_STORE_PUBKEY pubKey; + UINT32 encDataSize; + BYTE* encData; +} TPM_KEY; + +#define TPM_KEY_INIT { .algorithmParms = TPM_KEY_PARMS_INIT,\ + .PCRInfoSize = 0, .PCRInfo = TPM_PCR_INFO_INIT, \ + .pubKey = TPM_STORE_PUBKEY_INIT, \ + .encDataSize = 0, .encData = NULL } + +inline void free_TPM_KEY(TPM_KEY* k) { + if(k->PCRInfoSize) { + free_TPM_PCR_INFO(&k->PCRInfo); + } + free_TPM_STORE_PUBKEY(&k->pubKey); + free(k->encData); + k->encData = NULL; +} + +typedef struct TPM_BOUND_DATA { + TPM_VERSION ver; + TPM_PAYLOAD_TYPE payload; + BYTE* payloadData; +} TPM_BOUND_DATA; + +#define TPM_BOUND_DATA_INIT { .payloadData = NULL } + +inline void free_TPM_BOUND_DATA(TPM_BOUND_DATA* d) { + free(d->payloadData); + d->payloadData = NULL; +} + +typedef struct TPM_STORED_DATA { + TPM_VERSION ver; + UINT32 sealInfoSize; + TPM_PCR_INFO sealInfo; + UINT32 encDataSize; + BYTE* encData; +} TPM_STORED_DATA; + +#define TPM_STORED_DATA_INIT { .sealInfoSize = 0, sealInfo = TPM_PCR_INFO_INIT,\ + .encDataSize = 0, .encData = NULL } + +inline void free_TPM_STORED_DATA(TPM_STORED_DATA* d) { + if(d->sealInfoSize) { + free_TPM_PCR_INFO(&d->sealInfo); + } + free(d->encData); + d->encData = NULL; +} + +typedef struct TPM_AUTH_SESSION { + TPM_AUTHHANDLE AuthHandle; + TPM_NONCE NonceOdd; // system + TPM_NONCE NonceEven; // TPM + BOOL fContinueAuthSession; + TPM_AUTHDATA HMAC; +} TPM_AUTH_SESSION; + +#define TPM_AUTH_SESSION_INIT { .AuthHandle = 0, .fContinueAuthSession = FALSE } + +// ---------------------- Functions for checking TPM_RESULTs ----------------- + +#include + +// FIXME: Review use of these and delete unneeded ones. + +// these are really badly dependent on local structure: +// DEPENDS: local var 'status' of type TPM_RESULT +// DEPENDS: label 'abort_egress' which cleans up and returns the status +#define ERRORDIE(s) do { status = s; \ + fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ + goto abort_egress; } \ + while (0) + +// DEPENDS: local var 'status' of type TPM_RESULT +// DEPENDS: label 'abort_egress' which cleans up and returns the status +// Try command c. If it fails, set status to s and goto abort. +#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ + status = s; \ + printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ + goto abort_egress; \ + } else {\ + status = c; \ + } + +// Try command c. If it fails, print error message, set status to actual return code. Goto abort +#define TPMTRYRETURN(c) do { status = c; \ + if (status != TPM_SUCCESS) { \ + fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ + goto abort_egress; \ + } \ + } while(0) + + +#endif //__TCPA_H__ diff --git a/stubdom/vtpmmgr/tpm.c b/stubdom/vtpmmgr/tpm.c new file mode 100644 index 0000000..123a27c --- /dev/null +++ b/stubdom/vtpmmgr/tpm.c @@ -0,0 +1,938 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include +#include +#include + +#include + +#include "tcg.h" +#include "tpm.h" +#include "log.h" +#include "marshal.h" +#include "tpmrsa.h" +#include "vtpmmgr.h" + +#define TCPA_MAX_BUFFER_LENGTH 0x2000 + +#define TPM_BEGIN(TAG, ORD) \ + const TPM_TAG intag = TAG;\ +TPM_TAG tag = intag;\ +UINT32 paramSize;\ +const TPM_COMMAND_CODE ordinal = ORD;\ +TPM_RESULT status = TPM_SUCCESS;\ +BYTE in_buf[TCPA_MAX_BUFFER_LENGTH];\ +BYTE out_buf[TCPA_MAX_BUFFER_LENGTH];\ +UINT32 out_len = sizeof(out_buf);\ +BYTE* ptr = in_buf;\ +/*Print a log message */\ +vtpmloginfo(VTPM_LOG_TPM, "%s\n", __func__);\ +/* Pack the header*/\ +ptr = pack_TPM_TAG(ptr, tag);\ +ptr += sizeof(UINT32);\ +ptr = pack_TPM_COMMAND_CODE(ptr, ordinal)\ + +#define TPM_AUTH_BEGIN() \ + sha1_context sha1_ctx;\ +BYTE* authbase = ptr - sizeof(TPM_COMMAND_CODE);\ +TPM_DIGEST paramDigest;\ +sha1_starts(&sha1_ctx) + +#define TPM_AUTH1_GEN(HMACkey, auth) do {\ + sha1_finish(&sha1_ctx, paramDigest.digest);\ + generateAuth(¶mDigest, HMACkey, auth);\ + ptr = pack_TPM_AUTH_SESSION(ptr, auth);\ +} while(0) + +#define TPM_AUTH2_GEN(HMACkey, auth) do {\ + generateAuth(¶mDigest, HMACkey, auth);\ + ptr = pack_TPM_AUTH_SESSION(ptr, auth);\ +} while(0) + +#define TPM_TRANSMIT() do {\ + /* Pack the command size */\ + paramSize = ptr - in_buf;\ + pack_UINT32(in_buf + sizeof(TPM_TAG), paramSize);\ + if((status = TPM_TransmitData(in_buf, paramSize, out_buf, &out_len)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH_VERIFY_BEGIN() do {\ + UINT32 buf[2] = { cpu_to_be32(status), cpu_to_be32(ordinal) };\ + sha1_starts(&sha1_ctx);\ + sha1_update(&sha1_ctx, (unsigned char*)buf, sizeof(buf));\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH1_VERIFY(HMACkey, auth) do {\ + sha1_finish(&sha1_ctx, paramDigest.digest);\ + ptr = unpack_TPM_AUTH_SESSION(ptr, auth);\ + if((status = verifyAuth(¶mDigest, HMACkey, auth)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH2_VERIFY(HMACkey, auth) do {\ + ptr = unpack_TPM_AUTH_SESSION(ptr, auth);\ + if((status = verifyAuth(¶mDigest, HMACkey, auth)) != TPM_SUCCESS) {\ + goto abort_egress;\ + }\ +} while(0) + + + +#define TPM_UNPACK_VERIFY() do { \ + ptr = out_buf;\ + ptr = unpack_TPM_RSP_HEADER(ptr, \ + &(tag), &(paramSize), &(status));\ + if((status) != TPM_SUCCESS || (tag) != (intag +3)) { \ + vtpmlogerror(VTPM_LOG_TPM, "Failed with return code %s\n", tpm_get_error_name(status));\ + goto abort_egress;\ + }\ +} while(0) + +#define TPM_AUTH_HASH() do {\ + sha1_update(&sha1_ctx, authbase, ptr - authbase);\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH_SKIP() do {\ + authbase = ptr;\ +} while(0) + +#define TPM_AUTH_ERR_CHECK(auth) do {\ + if(status != TPM_SUCCESS || auth->fContinueAuthSession == FALSE) {\ + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x closed by TPM\n", auth->AuthHandle);\ + auth->AuthHandle = 0;\ + }\ +} while(0) + +static void xorEncrypt(const TPM_SECRET* sharedSecret, + TPM_NONCE* nonce, + const TPM_AUTHDATA* inAuth0, + TPM_ENCAUTH outAuth0, + const TPM_AUTHDATA* inAuth1, + TPM_ENCAUTH outAuth1) { + BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; + BYTE XORkey[TPM_DIGEST_SIZE]; + BYTE* ptr = XORbuffer; + ptr = pack_TPM_SECRET(ptr, sharedSecret); + ptr = pack_TPM_NONCE(ptr, nonce); + + sha1(XORbuffer, ptr - XORbuffer, XORkey); + + if(inAuth0) { + for(int i = 0; i < TPM_DIGEST_SIZE; ++i) { + outAuth0[i] = XORkey[i] ^ (*inAuth0)[i]; + } + } + if(inAuth1) { + for(int i = 0; i < TPM_DIGEST_SIZE; ++i) { + outAuth1[i] = XORkey[i] ^ (*inAuth1)[i]; + } + } + +} + +static void generateAuth(const TPM_DIGEST* paramDigest, + const TPM_SECRET* HMACkey, + TPM_AUTH_SESSION *auth) +{ + //Generate new OddNonce + vtpmmgr_rand((BYTE*)auth->NonceOdd.nonce, sizeof(TPM_NONCE)); + + // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). + BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; + BYTE* ptr = hmacText; + + ptr = pack_TPM_DIGEST(ptr, paramDigest); + ptr = pack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + + sha1_hmac((BYTE *) HMACkey, sizeof(TPM_DIGEST), + (BYTE *) hmacText, sizeof(hmacText), + auth->HMAC); +} + +static TPM_RESULT verifyAuth(const TPM_DIGEST* paramDigest, + /*[IN]*/ const TPM_SECRET *HMACkey, + /*[IN,OUT]*/ TPM_AUTH_SESSION *auth) +{ + + // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). + TPM_AUTHDATA hm; + BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; + BYTE* ptr = hmacText; + + ptr = pack_TPM_DIGEST(ptr, paramDigest); + ptr = pack_TPM_NONCE(ptr, &auth->NonceEven); + ptr = pack_TPM_NONCE(ptr, &auth->NonceOdd); + ptr = pack_BOOL(ptr, auth->fContinueAuthSession); + + sha1_hmac( (BYTE *) HMACkey, sizeof(TPM_DIGEST), + (BYTE *) hmacText, sizeof(hmacText), + hm); + + // Compare correct HMAC with provided one. + if (memcmp(hm, auth->HMAC, sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality + return TPM_SUCCESS; + } else { + vtpmlogerror(VTPM_LOG_TPM, "Auth Session verification failed!\n"); + return TPM_AUTHFAIL; + } +} + + + +// ------------------------------------------------------------------ +// Authorization Commands +// ------------------------------------------------------------------ + +TPM_RESULT TPM_OIAP(TPM_AUTH_SESSION* auth) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_OIAP); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); + auth->fContinueAuthSession = TRUE; + + ptr = unpack_UINT32(ptr, &auth->AuthHandle); + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_OSAP(TPM_ENTITY_TYPE entityType, // in + UINT32 entityValue, // in + const TPM_AUTHDATA* usageAuth, //in + TPM_SECRET *sharedSecret, //out + TPM_AUTH_SESSION *auth) +{ + BYTE* nonceOddOSAP; + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_OSAP); + + ptr = pack_TPM_ENTITY_TYPE(ptr, entityType); + ptr = pack_UINT32(ptr, entityValue); + + //nonce Odd OSAP + nonceOddOSAP = ptr; + vtpmmgr_rand(ptr, TPM_DIGEST_SIZE); + ptr += TPM_DIGEST_SIZE; + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, &auth->AuthHandle); + ptr = unpack_TPM_NONCE(ptr, &auth->NonceEven); + + //Calculate session secret + sha1_context ctx; + sha1_hmac_starts(&ctx, *usageAuth, TPM_DIGEST_SIZE); + sha1_hmac_update(&ctx, ptr, TPM_DIGEST_SIZE); //ptr = nonceEvenOSAP + sha1_hmac_update(&ctx, nonceOddOSAP, TPM_DIGEST_SIZE); + sha1_hmac_finish(&ctx, *sharedSecret); + + memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); + auth->fContinueAuthSession = FALSE; + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_TakeOwnership( + const TPM_PUBKEY *pubEK, //in + const TPM_AUTHDATA* ownerAuth, //in + const TPM_AUTHDATA* srkAuth, //in + const TPM_KEY* inSrk, //in + TPM_KEY* outSrk, //out, optional + TPM_AUTH_SESSION* auth) // in, out +{ + int keyAlloced = 0; + tpmrsa_context ek_rsa = TPMRSA_CTX_INIT; + + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_TakeOwnership); + TPM_AUTH_BEGIN(); + + tpmrsa_set_pubkey(&ek_rsa, + pubEK->pubKey.key, pubEK->pubKey.keyLength, + pubEK->algorithmParms.parms.rsa.exponent, + pubEK->algorithmParms.parms.rsa.exponentSize); + + /* Pack the protocol ID */ + ptr = pack_UINT16(ptr, TPM_PID_OWNER); + + /* Pack the encrypted owner auth */ + ptr = pack_UINT32(ptr, pubEK->algorithmParms.parms.rsa.keyLength / 8); + tpmrsa_pub_encrypt_oaep(&ek_rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + sizeof(TPM_SECRET), + (BYTE*) ownerAuth, + ptr); + ptr += pubEK->algorithmParms.parms.rsa.keyLength / 8; + + /* Pack the encrypted srk auth */ + ptr = pack_UINT32(ptr, pubEK->algorithmParms.parms.rsa.keyLength / 8); + tpmrsa_pub_encrypt_oaep(&ek_rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + sizeof(TPM_SECRET), + (BYTE*) srkAuth, + ptr); + ptr += pubEK->algorithmParms.parms.rsa.keyLength / 8; + + /* Pack the Srk key */ + ptr = pack_TPM_KEY(ptr, inSrk); + + /* Hash everything up to here */ + TPM_AUTH_HASH(); + + /* Generate the authorization */ + TPM_AUTH1_GEN(ownerAuth, auth); + + /* Send the command to the tpm*/ + TPM_TRANSMIT(); + /* Unpack and validate the header */ + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + if(outSrk != NULL) { + /* If the user wants a copy of the srk we give it to them */ + keyAlloced = 1; + ptr = unpack_TPM_KEY(ptr, outSrk, UNPACK_ALLOC); + } else { + /*otherwise just parse past it */ + TPM_KEY temp; + ptr = unpack_TPM_KEY(ptr, &temp, UNPACK_ALIAS); + } + + /* Hash the output key */ + TPM_AUTH_HASH(); + + /* Verify authorizaton */ + TPM_AUTH1_VERIFY(ownerAuth, auth); + + goto egress; +abort_egress: + if(keyAlloced) { + free_TPM_KEY(outSrk); + } +egress: + tpmrsa_free(&ek_rsa); + TPM_AUTH_ERR_CHECK(auth); + return status; +} + + +TPM_RESULT TPM_DisablePubekRead ( + const TPM_AUTHDATA* ownerAuth, + TPM_AUTH_SESSION* auth) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_DisablePubekRead); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(ownerAuth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + TPM_AUTH1_VERIFY(ownerAuth, auth); + +abort_egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + + +TPM_RESULT TPM_TerminateHandle(TPM_AUTHHANDLE handle) // in +{ + if(handle == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_Terminate_Handle); + + ptr = pack_TPM_AUTHHANDLE(ptr, handle); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + vtpmloginfo(VTPM_LOG_TPM, "Auth Session: 0x%x closed by TPM_TerminateHandle\n", handle); + +abort_egress: + return status; +} + +TPM_RESULT TPM_Extend( TPM_PCRINDEX pcrNum, // in + TPM_DIGEST inDigest, // in + TPM_PCRVALUE* outDigest) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_Extend); + + ptr = pack_TPM_PCRINDEX(ptr, pcrNum); + ptr = pack_TPM_DIGEST(ptr, &inDigest); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_TPM_PCRVALUE(ptr, outDigest); + +abort_egress: + return status; +} + +TPM_RESULT TPM_Seal( + TPM_KEY_HANDLE keyHandle, // in + UINT32 pcrInfoSize, // in + TPM_PCR_INFO* pcrInfo, // in + UINT32 inDataSize, // in + const BYTE* inData, // in + TPM_STORED_DATA* sealedData, //out + const TPM_SECRET* osapSharedSecret, //in + const TPM_AUTHDATA* sealedDataAuth, //in + TPM_AUTH_SESSION* pubAuth // in, out + ) +{ + int dataAlloced = 0; + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_Seal); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, keyHandle); + + TPM_AUTH_SKIP(); + + xorEncrypt(osapSharedSecret, &pubAuth->NonceEven, + sealedDataAuth, ptr, + NULL, NULL); + ptr += sizeof(TPM_ENCAUTH); + + ptr = pack_UINT32(ptr, pcrInfoSize); + ptr = pack_TPM_PCR_INFO(ptr, pcrInfo); + + ptr = pack_UINT32(ptr, inDataSize); + ptr = pack_BUFFER(ptr, inData, inDataSize); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(osapSharedSecret, pubAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_TPM_STORED_DATA(ptr, sealedData, UNPACK_ALLOC); + dataAlloced = 1; + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(osapSharedSecret, pubAuth); + + goto egress; +abort_egress: + if(dataAlloced) { + free_TPM_STORED_DATA(sealedData); + } +egress: + TPM_AUTH_ERR_CHECK(pubAuth); + return status; +} + +TPM_RESULT TPM_Unseal( + TPM_KEY_HANDLE parentHandle, // in + const TPM_STORED_DATA* sealedData, + UINT32* outSize, // out + BYTE** out, //out + const TPM_AUTHDATA* key_usage_auth, //in + const TPM_AUTHDATA* data_usage_auth, //in + TPM_AUTH_SESSION* keyAuth, // in, out + TPM_AUTH_SESSION* dataAuth // in, out + ) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH2_COMMAND, TPM_ORD_Unseal); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, parentHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_TPM_STORED_DATA(ptr, sealedData); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(key_usage_auth, keyAuth); + TPM_AUTH2_GEN(data_usage_auth, dataAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, outSize); + ptr = unpack_ALLOC(ptr, out, *outSize); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(key_usage_auth, keyAuth); + TPM_AUTH2_VERIFY(data_usage_auth, dataAuth); + +abort_egress: + TPM_AUTH_ERR_CHECK(keyAuth); + TPM_AUTH_ERR_CHECK(dataAuth); + return status; +} + +TPM_RESULT TPM_Bind( + const TPM_KEY* key, + const BYTE* in, + UINT32 ilen, + BYTE* out) +{ + TPM_RESULT status; + tpmrsa_context rsa = TPMRSA_CTX_INIT; + TPM_BOUND_DATA boundData; + uint8_t plain[TCPA_MAX_BUFFER_LENGTH]; + BYTE* ptr = plain; + + vtpmloginfo(VTPM_LOG_TPM, "%s\n", __func__); + + tpmrsa_set_pubkey(&rsa, + key->pubKey.key, key->pubKey.keyLength, + key->algorithmParms.parms.rsa.exponent, + key->algorithmParms.parms.rsa.exponentSize); + + // Fill boundData's accessory information + boundData.ver = TPM_STRUCT_VER_1_1; + boundData.payload = TPM_PT_BIND; + boundData.payloadData = (BYTE*)in; + + //marshall the bound data object + ptr = pack_TPM_BOUND_DATA(ptr, &boundData, ilen); + + // Encrypt the data + TPMTRYRETURN(tpmrsa_pub_encrypt_oaep(&rsa, + ctr_drbg_random, &vtpm_globals.ctr_drbg, + ptr - plain, + plain, + out)); + +abort_egress: + tpmrsa_free(&rsa); + return status; + +} + +TPM_RESULT TPM_UnBind( + TPM_KEY_HANDLE keyHandle, // in + UINT32 ilen, //in + const BYTE* in, // + UINT32* olen, // + BYTE* out, //out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth //in, out + ) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_UnBind); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, keyHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_UINT32(ptr, ilen); + ptr = pack_BUFFER(ptr, in, ilen); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(usage_auth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, olen); + if(*olen > ilen) { + vtpmlogerror(VTPM_LOG_TPM, "Output length < input length!\n"); + status = TPM_IOERROR; + goto abort_egress; + } + ptr = unpack_BUFFER(ptr, out, *olen); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(usage_auth, auth); + +abort_egress: +egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + +TPM_RESULT TPM_CreateWrapKey( + TPM_KEY_HANDLE hWrappingKey, // in + const TPM_AUTHDATA* osapSharedSecret, + const TPM_AUTHDATA* dataUsageAuth, //in + const TPM_AUTHDATA* dataMigrationAuth, //in + TPM_KEY* key, //in, out + TPM_AUTH_SESSION* pAuth) // in, out +{ + int keyAlloced = 0; + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_CreateWrapKey); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, hWrappingKey); + + TPM_AUTH_SKIP(); + + //Encrypted auths + xorEncrypt(osapSharedSecret, &pAuth->NonceEven, + dataUsageAuth, ptr, + dataMigrationAuth, ptr + sizeof(TPM_ENCAUTH)); + ptr += sizeof(TPM_ENCAUTH) * 2; + + ptr = pack_TPM_KEY(ptr, key); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(osapSharedSecret, pAuth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + keyAlloced = 1; + ptr = unpack_TPM_KEY(ptr, key, UNPACK_ALLOC); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(osapSharedSecret, pAuth); + + goto egress; +abort_egress: + if(keyAlloced) { + free_TPM_KEY(key); + } +egress: + TPM_AUTH_ERR_CHECK(pAuth); + return status; +} + +TPM_RESULT TPM_LoadKey( + TPM_KEY_HANDLE parentHandle, // + const TPM_KEY* key, //in + TPM_HANDLE* keyHandle, // out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth) +{ + TPM_BEGIN(TPM_TAG_RQU_AUTH1_COMMAND, TPM_ORD_LoadKey); + TPM_AUTH_BEGIN(); + + TPM_AUTH_HASH(); + + ptr = pack_TPM_KEY_HANDLE(ptr, parentHandle); + + TPM_AUTH_SKIP(); + + ptr = pack_TPM_KEY(ptr, key); + + TPM_AUTH_HASH(); + + TPM_AUTH1_GEN(usage_auth, auth); + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + TPM_AUTH_VERIFY_BEGIN(); + + ptr = unpack_UINT32(ptr, keyHandle); + + TPM_AUTH_HASH(); + + TPM_AUTH1_VERIFY(usage_auth, auth); + + vtpmloginfo(VTPM_LOG_TPM, "Key Handle: 0x%x opened by TPM_LoadKey\n", *keyHandle); + +abort_egress: + TPM_AUTH_ERR_CHECK(auth); + return status; +} + +TPM_RESULT TPM_EvictKey( TPM_KEY_HANDLE hKey) // in +{ + if(hKey == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_EvictKey); + + ptr = pack_TPM_KEY_HANDLE(ptr, hKey); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + vtpmloginfo(VTPM_LOG_TPM, "Key handle: 0x%x closed by TPM_EvictKey\n", hKey); + +abort_egress: + return status; +} + +TPM_RESULT TPM_FlushSpecific(TPM_HANDLE handle, + TPM_RESOURCE_TYPE rt) { + if(handle == 0) { + return TPM_SUCCESS; + } + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_FlushSpecific); + + ptr = pack_TPM_HANDLE(ptr, handle); + ptr = pack_TPM_RESOURCE_TYPE(ptr, rt); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + +abort_egress: + return status; +} + +TPM_RESULT TPM_GetRandom( UINT32* bytesRequested, // in, out + BYTE* randomBytes) // out +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_GetRandom); + + // check input params + if (bytesRequested == NULL || randomBytes == NULL){ + return TPM_BAD_PARAMETER; + } + + ptr = pack_UINT32(ptr, *bytesRequested); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, bytesRequested); + ptr = unpack_BUFFER(ptr, randomBytes, *bytesRequested); + +abort_egress: + return status; +} + + +TPM_RESULT TPM_ReadPubek( + TPM_PUBKEY* pubEK //out + ) +{ + BYTE* antiReplay = NULL; + BYTE* kptr = NULL; + BYTE digest[TPM_DIGEST_SIZE]; + sha1_context ctx; + + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_ReadPubek); + + //antiReplay nonce + vtpmmgr_rand(ptr, TPM_DIGEST_SIZE); + antiReplay = ptr; + ptr += TPM_DIGEST_SIZE; + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + //unpack and allocate the key + kptr = ptr; + ptr = unpack_TPM_PUBKEY(ptr, pubEK, UNPACK_ALLOC); + + //Verify the checksum + sha1_starts(&ctx); + sha1_update(&ctx, kptr, ptr - kptr); + sha1_update(&ctx, antiReplay, TPM_DIGEST_SIZE); + sha1_finish(&ctx, digest); + + //ptr points to the checksum computed by TPM + if(memcmp(digest, ptr, TPM_DIGEST_SIZE)) { + vtpmlogerror(VTPM_LOG_TPM, "TPM_ReadPubek: Checksum returned by TPM was invalid!\n"); + status = TPM_FAIL; + goto abort_egress; + } + + goto egress; +abort_egress: + if(kptr != NULL) { //If we unpacked the pubEK, we have to free it + free_TPM_PUBKEY(pubEK); + } +egress: + return status; +} + + +TPM_RESULT TPM_SaveState(void) +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_SaveState); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + +abort_egress: + return status; +} + +TPM_RESULT TPM_GetCapability( + TPM_CAPABILITY_AREA capArea, + UINT32 subCapSize, + const BYTE* subCap, + UINT32* respSize, + BYTE** resp) +{ + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_GetCapability); + + ptr = pack_TPM_CAPABILITY_AREA(ptr, capArea); + ptr = pack_UINT32(ptr, subCapSize); + ptr = pack_BUFFER(ptr, subCap, subCapSize); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + ptr = unpack_UINT32(ptr, respSize); + ptr = unpack_ALLOC(ptr, resp, *respSize); + +abort_egress: + return status; +} + +TPM_RESULT TPM_CreateEndorsementKeyPair( + const TPM_KEY_PARMS* keyInfo, + TPM_PUBKEY* pubEK) +{ + BYTE* kptr = NULL; + sha1_context ctx; + TPM_DIGEST checksum; + TPM_DIGEST hash; + TPM_NONCE antiReplay; + TPM_BEGIN(TPM_TAG_RQU_COMMAND, TPM_ORD_CreateEndorsementKeyPair); + + //Make anti replay nonce + vtpmmgr_rand(antiReplay.nonce, sizeof(antiReplay.nonce)); + + ptr = pack_TPM_NONCE(ptr, &antiReplay); + ptr = pack_TPM_KEY_PARMS(ptr, keyInfo); + + TPM_TRANSMIT(); + TPM_UNPACK_VERIFY(); + + sha1_starts(&ctx); + + kptr = ptr; + ptr = unpack_TPM_PUBKEY(ptr, pubEK, UNPACK_ALLOC); + + /* Hash the pub key blob */ + sha1_update(&ctx, kptr, ptr - kptr); + ptr = unpack_TPM_DIGEST(ptr, &checksum); + + sha1_update(&ctx, antiReplay.nonce, sizeof(antiReplay.nonce)); + + sha1_finish(&ctx, hash.digest); + if(memcmp(checksum.digest, hash.digest, TPM_DIGEST_SIZE)) { + vtpmloginfo(VTPM_LOG_VTPM, "TPM_CreateEndorsementKey: Checkum verification failed!\n"); + status = TPM_FAIL; + goto abort_egress; + } + + goto egress; +abort_egress: + if(kptr) { + free_TPM_PUBKEY(pubEK); + } +egress: + return status; +} + +TPM_RESULT TPM_TransmitData( + BYTE* in, + UINT32 insize, + BYTE* out, + UINT32* outsize) { + TPM_RESULT status = TPM_SUCCESS; + + UINT32 i; + vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); + for(i = 0 ; i < insize ; i++) + vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); + + vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); + + ssize_t size = 0; + + // send the request + size = write (vtpm_globals.tpm_fd, in, insize); + if (size < 0) { + vtpmlogerror(VTPM_LOG_TXDATA, "write() failed : %s\n", strerror(errno)); + ERRORDIE (TPM_IOERROR); + } + else if ((UINT32) size < insize) { + vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); + ERRORDIE (TPM_IOERROR); + } + + // read the response + size = read (vtpm_globals.tpm_fd, out, *outsize); + if (size < 0) { + vtpmlogerror(VTPM_LOG_TXDATA, "read() failed : %s\n", strerror(errno)); + ERRORDIE (TPM_IOERROR); + } + + vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); + for(i = 0 ; i < size ; i++) + vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); + + vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); + + *outsize = size; + goto egress; + +abort_egress: +egress: + return status; +} diff --git a/stubdom/vtpmmgr/tpm.h b/stubdom/vtpmmgr/tpm.h new file mode 100644 index 0000000..304e145 --- /dev/null +++ b/stubdom/vtpmmgr/tpm.h @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005/2006, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __TPM_H__ +#define __TPM_H__ + +#include "tcg.h" + +// ------------------------------------------------------------------ +// Exposed API +// ------------------------------------------------------------------ + +// TPM v1.1B Command Set + +// Authorzation +TPM_RESULT TPM_OIAP( + TPM_AUTH_SESSION* auth //out + ); + +TPM_RESULT TPM_OSAP ( + TPM_ENTITY_TYPE entityType, // in + UINT32 entityValue, // in + const TPM_AUTHDATA* usageAuth, //in + TPM_SECRET *sharedSecret, //out + TPM_AUTH_SESSION *auth); + +TPM_RESULT TPM_TakeOwnership( + const TPM_PUBKEY *pubEK, //in + const TPM_AUTHDATA* ownerAuth, //in + const TPM_AUTHDATA* srkAuth, //in + const TPM_KEY* inSrk, //in + TPM_KEY* outSrk, //out, optional + TPM_AUTH_SESSION* auth // in, out + ); + +TPM_RESULT TPM_DisablePubekRead ( + const TPM_AUTHDATA* ownerAuth, + TPM_AUTH_SESSION* auth + ); + +TPM_RESULT TPM_TerminateHandle ( TPM_AUTHHANDLE handle // in + ); + +TPM_RESULT TPM_FlushSpecific ( TPM_HANDLE handle, // in + TPM_RESOURCE_TYPE resourceType //in + ); + +// TPM Mandatory +TPM_RESULT TPM_Extend ( TPM_PCRINDEX pcrNum, // in + TPM_DIGEST inDigest, // in + TPM_PCRVALUE* outDigest // out + ); + +TPM_RESULT TPM_PcrRead ( TPM_PCRINDEX pcrNum, // in + TPM_PCRVALUE* outDigest // out + ); + +TPM_RESULT TPM_Quote ( TCS_KEY_HANDLE keyHandle, // in + TPM_NONCE antiReplay, // in + UINT32* PcrDataSize, // in, out + BYTE** PcrData, // in, out + TPM_AUTH_SESSION* privAuth, // in, out + UINT32* sigSize, // out + BYTE** sig // out + ); + +TPM_RESULT TPM_Seal( + TCS_KEY_HANDLE keyHandle, // in + UINT32 pcrInfoSize, // in + TPM_PCR_INFO* pcrInfo, // in + UINT32 inDataSize, // in + const BYTE* inData, // in + TPM_STORED_DATA* sealedData, //out + const TPM_SECRET* osapSharedSecret, //in + const TPM_AUTHDATA* sealDataAuth, //in + TPM_AUTH_SESSION* pubAuth // in, out + ); + +TPM_RESULT TPM_Unseal ( + TPM_KEY_HANDLE parentHandle, // in + const TPM_STORED_DATA* sealedData, + UINT32* outSize, // out + BYTE** out, //out + const TPM_AUTHDATA* key_usage_auth, //in + const TPM_AUTHDATA* data_usage_auth, //in + TPM_AUTH_SESSION* keyAuth, // in, out + TPM_AUTH_SESSION* dataAuth // in, out + ); + +TPM_RESULT TPM_DirWriteAuth ( TPM_DIRINDEX dirIndex, // in + TPM_DIRVALUE newContents, // in + TPM_AUTH_SESSION* ownerAuth // in, out + ); + +TPM_RESULT TPM_DirRead ( TPM_DIRINDEX dirIndex, // in + TPM_DIRVALUE* dirValue // out + ); + +TPM_RESULT TPM_Bind( + const TPM_KEY* key, //in + const BYTE* in, //in + UINT32 ilen, //in + BYTE* out //out, must be at least cipher block size + ); + +TPM_RESULT TPM_UnBind ( + TCS_KEY_HANDLE keyHandle, // in + UINT32 ilen, //in + const BYTE* in, // + UINT32* outDataSize, // out + BYTE* outData, //out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth //in, out + ); + +TPM_RESULT TPM_CreateWrapKey ( + TCS_KEY_HANDLE hWrappingKey, // in + const TPM_AUTHDATA* osapSharedSecret, + const TPM_AUTHDATA* dataUsageAuth, //in + const TPM_AUTHDATA* dataMigrationAuth, //in + TPM_KEY* key, //in + TPM_AUTH_SESSION* pAuth // in, out + ); + +TPM_RESULT TPM_LoadKey ( + TPM_KEY_HANDLE parentHandle, // + const TPM_KEY* key, //in + TPM_HANDLE* keyHandle, // out + const TPM_AUTHDATA* usage_auth, + TPM_AUTH_SESSION* auth + ); + +TPM_RESULT TPM_GetPubKey ( TCS_KEY_HANDLE hKey, // in + TPM_AUTH_SESSION* pAuth, // in, out + UINT32* pcPubKeySize, // out + BYTE** prgbPubKey // out + ); + +TPM_RESULT TPM_EvictKey ( TCS_KEY_HANDLE hKey // in + ); + +TPM_RESULT TPM_FlushSpecific(TPM_HANDLE handle, //in + TPM_RESOURCE_TYPE rt //in + ); + +TPM_RESULT TPM_Sign ( TCS_KEY_HANDLE keyHandle, // in + UINT32 areaToSignSize, // in + BYTE* areaToSign, // in + TPM_AUTH_SESSION* privAuth, // in, out + UINT32* sigSize, // out + BYTE** sig // out + ); + +TPM_RESULT TPM_GetRandom ( UINT32* bytesRequested, // in, out + BYTE* randomBytes // out + ); + +TPM_RESULT TPM_StirRandom ( UINT32 inDataSize, // in + BYTE* inData // in + ); + +TPM_RESULT TPM_ReadPubek ( + TPM_PUBKEY* pubEK //out + ); + +TPM_RESULT TPM_GetCapability( + TPM_CAPABILITY_AREA capArea, + UINT32 subCapSize, + const BYTE* subCap, + UINT32* respSize, + BYTE** resp); + +TPM_RESULT TPM_SaveState(void); + +TPM_RESULT TPM_CreateEndorsementKeyPair( + const TPM_KEY_PARMS* keyInfo, + TPM_PUBKEY* pubEK); + +TPM_RESULT TPM_TransmitData( + BYTE* in, + UINT32 insize, + BYTE* out, + UINT32* outsize); + +#endif //TPM_H diff --git a/stubdom/vtpmmgr/tpmrsa.c b/stubdom/vtpmmgr/tpmrsa.c new file mode 100644 index 0000000..56094e7 --- /dev/null +++ b/stubdom/vtpmmgr/tpmrsa.c @@ -0,0 +1,175 @@ +/* + * The RSA public-key cryptosystem + * + * Copyright (C) 2006-2011, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * RSA was designed by Ron Rivest, Adi Shamir and Len Adleman. + * + * http://theory.lcs.mit.edu/~rivest/rsapaper.pdf + * http://www.cacr.math.uwaterloo.ca/hac/about/chap8.pdf + */ + +#include "tcg.h" +#include "polarssl/sha1.h" + +#include +#include + +#include "tpmrsa.h" + +#define HASH_LEN 20 + +void tpmrsa_set_pubkey(tpmrsa_context* ctx, + const unsigned char* key, + int keylen, + const unsigned char* exponent, + int explen) { + + tpmrsa_free(ctx); + + if(explen == 0) { //Default e= 2^16+1 + mpi_lset(&ctx->E, 65537); + } else { + mpi_read_binary(&ctx->E, exponent, explen); + } + mpi_read_binary(&ctx->N, key, keylen); + + ctx->len = ( mpi_msb(&ctx->N) + 7) >> 3; +} + +static TPM_RESULT tpmrsa_public( tpmrsa_context *ctx, + const unsigned char *input, + unsigned char *output ) +{ + int ret; + size_t olen; + mpi T; + + mpi_init( &T ); + + MPI_CHK( mpi_read_binary( &T, input, ctx->len ) ); + + if( mpi_cmp_mpi( &T, &ctx->N ) >= 0 ) + { + mpi_free( &T ); + return TPM_ENCRYPT_ERROR; + } + + olen = ctx->len; + MPI_CHK( mpi_exp_mod( &T, &T, &ctx->E, &ctx->N, &ctx->RN ) ); + MPI_CHK( mpi_write_binary( &T, output, olen ) ); + +cleanup: + + mpi_free( &T ); + + if( ret != 0 ) + return TPM_ENCRYPT_ERROR; + + return TPM_SUCCESS; +} + +static void mgf_mask( unsigned char *dst, int dlen, unsigned char *src, int slen) +{ + unsigned char mask[HASH_LEN]; + unsigned char counter[4] = {0, 0, 0, 0}; + int i; + sha1_context mctx; + + //We always hash the src with the counter, so save the partial hash + sha1_starts(&mctx); + sha1_update(&mctx, src, slen); + + // Generate and apply dbMask + while(dlen > 0) { + //Copy the sha1 context + sha1_context ctx = mctx; + + //compute hash for input || counter + sha1_update(&ctx, counter, sizeof(counter)); + sha1_finish(&ctx, mask); + + //Apply the mask + for(i = 0; i < (dlen < HASH_LEN ? dlen : HASH_LEN); ++i) { + *(dst++) ^= mask[i]; + } + + //Increment counter + ++counter[3]; + + dlen -= HASH_LEN; + } +} + +/* + * Add the message padding, then do an RSA operation + */ +TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx, + int (*f_rng)(void *, unsigned char *, size_t), + void *p_rng, + size_t ilen, + const unsigned char *input, + unsigned char *output ) +{ + int ret; + int olen; + unsigned char* seed = output + 1; + unsigned char* db = output + HASH_LEN +1; + + olen = ctx->len-1; + + if( f_rng == NULL ) + return TPM_ENCRYPT_ERROR; + + if( ilen > olen - 2 * HASH_LEN - 1) + return TPM_ENCRYPT_ERROR; + + output[0] = 0; + + //Encoding parameter p + sha1((unsigned char*)"TCPA", 4, db); + + //PS + memset(db + HASH_LEN, 0, + olen - ilen - 2 * HASH_LEN - 1); + + //constant 1 byte + db[olen - ilen - HASH_LEN -1] = 0x01; + + //input string + memcpy(db + olen - ilen - HASH_LEN, + input, ilen); + + //Generate random seed + if( ( ret = f_rng( p_rng, seed, HASH_LEN ) ) != 0 ) + return TPM_ENCRYPT_ERROR; + + // maskedDB: Apply dbMask to DB + mgf_mask( db, olen - HASH_LEN, seed, HASH_LEN); + + // maskedSeed: Apply seedMask to seed + mgf_mask( seed, HASH_LEN, db, olen - HASH_LEN); + + // Do the crypto op + return tpmrsa_public(ctx, output, output); +} diff --git a/stubdom/vtpmmgr/tpmrsa.h b/stubdom/vtpmmgr/tpmrsa.h new file mode 100644 index 0000000..59579e7 --- /dev/null +++ b/stubdom/vtpmmgr/tpmrsa.h @@ -0,0 +1,67 @@ +/** + * \file rsa.h + * + * \brief The RSA public-key cryptosystem + * + * Copyright (C) 2006-2010, Brainspark B.V. + * + * This file is part of PolarSSL (http://www.polarssl.org) + * Lead Maintainer: Paul Bakker + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef TPMRSA_H +#define TPMRSA_H + +#include "tcg.h" +#include + +/* tpm software key */ +typedef struct +{ + size_t len; /*!< size(N) in chars */ + + mpi N; /*!< public modulus */ + mpi E; /*!< public exponent */ + + mpi RN; /*!< cached R^2 mod N */ +} +tpmrsa_context; + +#define TPMRSA_CTX_INIT { 0, {0, 0, NULL}, {0, 0, NULL}, {0, 0, NULL}} + +/* Setup the rsa context using tpm public key data */ +void tpmrsa_set_pubkey(tpmrsa_context* ctx, + const unsigned char* key, + int keylen, + const unsigned char* exponent, + int explen); + +/* Do rsa public crypto */ +TPM_RESULT tpmrsa_pub_encrypt_oaep( tpmrsa_context *ctx, + int (*f_rng)(void *, unsigned char *, size_t), + void *p_rng, + size_t ilen, + const unsigned char *input, + unsigned char *output ); + +/* free tpmrsa key */ +inline void tpmrsa_free( tpmrsa_context *ctx ) { + mpi_free( &ctx->RN ); mpi_free( &ctx->E ); mpi_free( &ctx->N ); +} + +#endif /* tpmrsa.h */ diff --git a/stubdom/vtpmmgr/uuid.h b/stubdom/vtpmmgr/uuid.h new file mode 100644 index 0000000..4737645 --- /dev/null +++ b/stubdom/vtpmmgr/uuid.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPMMGR_UUID_H +#define VTPMMGR_UUID_H + +#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" +#define UUID_FMTLEN ((2*16)+4) /* 16 hex bytes plus 4 hypens */ +#define UUID_BYTES(uuid) uuid[0], uuid[1], uuid[2], uuid[3], \ + uuid[4], uuid[5], uuid[6], uuid[7], \ + uuid[8], uuid[9], uuid[10], uuid[11], \ + uuid[12], uuid[13], uuid[14], uuid[15] + + +typedef uint8_t uuid_t[16]; + +#endif diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c b/stubdom/vtpmmgr/vtpm_cmd_handler.c new file mode 100644 index 0000000..f82a2a9 --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include + +#include "marshal.h" +#include "log.h" +#include "vtpm_storage.h" +#include "vtpmmgr.h" +#include "tpm.h" +#include "tcg.h" + +static TPM_RESULT vtpmmgr_SaveHashKey( + const uuid_t uuid, + tpmcmd_t* tpmcmd) +{ + TPM_RESULT status = TPM_SUCCESS; + + if(tpmcmd->req_len != VTPM_COMMAND_HEADER_SIZE + HASHKEYSZ) { + vtpmlogerror(VTPM_LOG_VTPM, "VTPM_ORD_SAVEHASHKEY hashkey too short!\n"); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + /* Do the command */ + TPMTRYRETURN(vtpm_storage_save_hashkey(uuid, tpmcmd->req + VTPM_COMMAND_HEADER_SIZE)); + +abort_egress: + pack_TPM_RSP_HEADER(tpmcmd->resp, + VTPM_TAG_RSP, VTPM_COMMAND_HEADER_SIZE, status); + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + + return status; +} + +static TPM_RESULT vtpmmgr_LoadHashKey( + const uuid_t uuid, + tpmcmd_t* tpmcmd) { + TPM_RESULT status = TPM_SUCCESS; + + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + + TPMTRYRETURN(vtpm_storage_load_hashkey(uuid, tpmcmd->resp + VTPM_COMMAND_HEADER_SIZE)); + + tpmcmd->resp_len += HASHKEYSZ; + +abort_egress: + pack_TPM_RSP_HEADER(tpmcmd->resp, + VTPM_TAG_RSP, tpmcmd->resp_len, status); + + return status; +} + + +TPM_RESULT vtpmmgr_handle_cmd( + const uuid_t uuid, + tpmcmd_t* tpmcmd) +{ + TPM_RESULT status = TPM_SUCCESS; + TPM_TAG tag; + UINT32 size; + TPM_COMMAND_CODE ord; + + unpack_TPM_RQU_HEADER(tpmcmd->req, + &tag, &size, &ord); + + /* Handle the command now */ + switch(tag) { + case VTPM_TAG_REQ: + //This is a vTPM command + switch(ord) { + case VTPM_ORD_SAVEHASHKEY: + return vtpmmgr_SaveHashKey(uuid, tpmcmd); + case VTPM_ORD_LOADHASHKEY: + return vtpmmgr_LoadHashKey(uuid, tpmcmd); + default: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid vTPM Ordinal %" PRIu32 "\n", ord); + status = TPM_BAD_ORDINAL; + } + break; + case TPM_TAG_RQU_COMMAND: + case TPM_TAG_RQU_AUTH1_COMMAND: + case TPM_TAG_RQU_AUTH2_COMMAND: + //This is a TPM passthrough command + switch(ord) { + case TPM_ORD_GetRandom: + vtpmloginfo(VTPM_LOG_VTPM, "Passthrough: TPM_GetRandom\n"); + break; + case TPM_ORD_PcrRead: + vtpmloginfo(VTPM_LOG_VTPM, "Passthrough: TPM_PcrRead\n"); + break; + default: + vtpmlogerror(VTPM_LOG_VTPM, "TPM Disallowed Passthrough ord=%" PRIu32 "\n", ord); + status = TPM_DISABLED_CMD; + goto abort_egress; + } + + size = TCPA_MAX_BUFFER_LENGTH; + TPMTRYRETURN(TPM_TransmitData(tpmcmd->req, tpmcmd->req_len, tpmcmd->resp, &size)); + tpmcmd->resp_len = size; + + unpack_TPM_RESULT(tpmcmd->resp + sizeof(TPM_TAG) + sizeof(UINT32), &status); + return status; + + break; + default: + vtpmlogerror(VTPM_LOG_VTPM, "Invalid tag=%" PRIu16 "\n", tag); + status = TPM_BADTAG; + } + +abort_egress: + tpmcmd->resp_len = VTPM_COMMAND_HEADER_SIZE; + pack_TPM_RSP_HEADER(tpmcmd->resp, + tag + 3, tpmcmd->resp_len, status); + + return status; +} diff --git a/stubdom/vtpmmgr/vtpm_manager.h b/stubdom/vtpmmgr/vtpm_manager.h new file mode 100644 index 0000000..a2bbcca --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_manager.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPM_MANAGER_H +#define VTPM_MANAGER_H + +#define VTPM_TAG_REQ 0x01c1 +#define VTPM_TAG_RSP 0x01c4 +#define COMMAND_BUFFER_SIZE 4096 + +// Header size +#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) + +//************************ Command Codes **************************** +#define VTPM_ORD_BASE 0x0000 +#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command +#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) + +// Non-priviledged VTPM Commands (From DMI's) +#define VTPM_ORD_SAVEHASHKEY (VTPM_ORD_BASE + 1) // DMI requests encryption key for persistent storage +#define VTPM_ORD_LOADHASHKEY (VTPM_ORD_BASE + 2) // DMI requests symkey to be regenerated + +//************************ Return Codes **************************** +#define VTPM_SUCCESS 0 +#define VTPM_FAIL 1 +#define VTPM_UNSUPPORTED 2 +#define VTPM_FORBIDDEN 3 +#define VTPM_RESTORE_CONTEXT_FAILED 4 +#define VTPM_INVALID_REQUEST 5 + +#endif diff --git a/stubdom/vtpmmgr/vtpm_storage.c b/stubdom/vtpmmgr/vtpm_storage.c new file mode 100644 index 0000000..3862fdb --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_storage.c @@ -0,0 +1,783 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +/*************************************************************** + * DISK IMAGE LAYOUT + * ************************************************************* + * All data is stored in BIG ENDIAN format + * ************************************************************* + * Section 1: Header + * + * 10 bytes id ID String "VTPMMGRDOM" + * uint32_t version Disk Image version number (current == 1) + * uint32_t storage_key_len Length of the Boot Key + * BYTEARRAY storage_key TPM boot key + * + * ************************************************************* + * Section 2: Key Data Table (starts at offset 4096) + * + * This is a list of blocks, each is RSA_CIPHER_SIZE long + * and is encrypted with the storage key. + * + * The first block always exists and it contains: + * uint32_t num_vtpms Number of vtpms (number of remaining blocks) + * + * The rest of the blocks look like this: + * 16 bytes uuid uuid of the owner of this key and hash + * 20 bytes hash Sha1 hash of vTPM's data, supplied by vTPM + * 32 bytes key AES-256 Encryption Key, supplied by vTPM + * + * ************************************************************* + */ +#define DISKVERS 1 +#define IDSTR "VTPMMGRDOM" +#define IDSTRLEN 10 +#define AES_BLOCK_SIZE 16 +#define AES_KEY_BITS 256 +#define AES_KEY_SIZE (AES_KEY_BITS/8) +#define BUF_SIZE 4096 + +#define UUID_TBL_ENT_SIZE (sizeof(uuid_t) + sizeof(uint32_t)) + +#define HEADERSZ (10 + 4 + 4) + +#define TRY_READ(buf, size, msg) do {\ + int rc; \ + if((rc = read(blkfront_fd, buf, (size))) != (size)) { \ + vtpmlogerror(VTPM_LOG_VTPM, "read() failed! " msg " : rc=(%d/%d), error=(%s)\n", rc, (int)(size), strerror(errno)); \ + status = TPM_IOERROR;\ + goto abort_egress;\ + } \ +} while(0) + +#define TRY_WRITE(buf, size, msg) do {\ + int rc; \ + if((rc = write(blkfront_fd, buf, (size))) != (size)) { \ + vtpmlogerror(VTPM_LOG_VTPM, "write() failed! " msg " : rc=(%d/%d), error=(%s)\n", rc, (int)(size), strerror(errno)); \ + status = TPM_IOERROR;\ + goto abort_egress;\ + } \ +} while(0) + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "vtpm_manager.h" +#include "log.h" +#include "marshal.h" +#include "tpm.h" +#include "uuid.h" + +#include "vtpmmgr.h" +#include "vtpm_storage.h" + +#define MAX(a,b) ( ((a) > (b)) ? (a) : (b) ) +#define MIN(a,b) ( ((a) < (b)) ? (a) : (b) ) + +/* blkfront device objets */ +static struct blkfront_dev* blkdev = NULL; +static int blkfront_fd = -1; + +struct Vtpm { + uuid_t uuid; + int offset; +}; +struct Storage { + int aes_offset; + int uuid_offset; + int end_offset; + + int num_vtpms; + int num_vtpms_alloced; + struct Vtpm* vtpms; +}; + +/* Global storage data */ +static struct Storage g_store = { + .vtpms = NULL, +}; + +static int get_offset(void) { + return lseek(blkfront_fd, 0, SEEK_CUR); +} + +static void reset_store(void) { + g_store.aes_offset = 0; + g_store.uuid_offset = 0; + g_store.end_offset = 0; + + g_store.num_vtpms = 0; + g_store.num_vtpms_alloced = 0; + free(g_store.vtpms); + g_store.vtpms = NULL; +} + +static int vtpm_get_index(const uuid_t uuid) { + int st = 0; + int ed = g_store.num_vtpms-1; + while(st <= ed) { + int mid = ((unsigned int)st + (unsigned int)ed) >> 1; //avoid overflow + int c = memcmp(uuid, &g_store.vtpms[mid].uuid, sizeof(uuid_t)); + if(c == 0) { + return mid; + } else if(c > 0) { + st = mid + 1; + } else { + ed = mid - 1; + } + } + return -(st + 1); +} + +static void vtpm_add(const uuid_t uuid, int offset, int index) { + /* Realloc more space if needed */ + if(g_store.num_vtpms >= g_store.num_vtpms_alloced) { + g_store.num_vtpms_alloced += 16; + g_store.vtpms = realloc( + g_store.vtpms, + sizeof(struct Vtpm) * g_store.num_vtpms_alloced); + } + + /* Move everybody after the new guy */ + for(int i = g_store.num_vtpms; i > index; --i) { + g_store.vtpms[i] = g_store.vtpms[i-1]; + } + + vtpmloginfo(VTPM_LOG_VTPM, "Registered vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + + /* Finally add new one */ + memcpy(g_store.vtpms[index].uuid, uuid, sizeof(uuid_t)); + g_store.vtpms[index].offset = offset; + ++g_store.num_vtpms; +} + +#if 0 +static void vtpm_remove(int index) { + for(i = index; i < g_store.num_vtpms; ++i) { + g_store.vtpms[i] = g_store.vtpms[i+1]; + } + --g_store.num_vtpms; +} +#endif + +static int pack_uuid_table(uint8_t* table, int size, int* nvtpms) { + uint8_t* ptr = table; + while(*nvtpms < g_store.num_vtpms && size >= 0) + { + /* Pack the uuid */ + memcpy(ptr, (uint8_t*)g_store.vtpms[*nvtpms].uuid, sizeof(uuid_t)); + ptr+= sizeof(uuid_t); + + + /* Pack the offset */ + ptr = pack_UINT32(ptr, g_store.vtpms[*nvtpms].offset); + + ++*nvtpms; + size -= UUID_TBL_ENT_SIZE; + } + return ptr - table; +} + +/* Extract the uuids */ +static int extract_uuid_table(uint8_t* table, int size) { + uint8_t* ptr = table; + for(;size >= UUID_TBL_ENT_SIZE; size -= UUID_TBL_ENT_SIZE) { + int index; + uint32_t v32; + + /*uuid_t is just an array of bytes, so we can do a direct cast here */ + uint8_t* uuid = ptr; + ptr += sizeof(uuid_t); + + /* Get the offset of the key */ + ptr = unpack_UINT32(ptr, &v32); + + /* Insert the new vtpm in sorted order */ + if((index = vtpm_get_index(uuid)) >= 0) { + vtpmlogerror(VTPM_LOG_VTPM, "Vtpm (" UUID_FMT ") exists multiple times! ignoring...\n", UUID_BYTES(uuid)); + continue; + } + index = -index -1; + + vtpm_add(uuid, v32, index); + + } + return ptr - table; +} + +static void vtpm_decrypt_block(aes_context* aes, + uint8_t* iv, + uint8_t* cipher, + uint8_t* plain, + int cipher_sz, + int* overlap) +{ + int bytes_ext; + /* Decrypt */ + aes_crypt_cbc(aes, AES_DECRYPT, + cipher_sz, + iv, cipher, plain + *overlap); + + /* Extract */ + bytes_ext = extract_uuid_table(plain, cipher_sz + *overlap); + + /* Copy left overs to the beginning */ + *overlap = cipher_sz + *overlap - bytes_ext; + memcpy(plain, plain + bytes_ext, *overlap); +} + +static int vtpm_encrypt_block(aes_context* aes, + uint8_t* iv, + uint8_t* plain, + uint8_t* cipher, + int block_sz, + int* overlap, + int* num_vtpms) +{ + int bytes_to_crypt; + int bytes_packed; + + /* Pack the uuid table */ + bytes_packed = *overlap + pack_uuid_table(plain + *overlap, block_sz - *overlap, num_vtpms); + bytes_to_crypt = MIN(bytes_packed, block_sz); + + /* Add padding if we aren't on a multiple of the block size */ + if(bytes_to_crypt & (AES_BLOCK_SIZE-1)) { + int oldsz = bytes_to_crypt; + //add padding + bytes_to_crypt += AES_BLOCK_SIZE - (bytes_to_crypt & (AES_BLOCK_SIZE-1)); + //fill padding with random bytes + vtpmmgr_rand(plain + oldsz, bytes_to_crypt - oldsz); + *overlap = 0; + } else { + *overlap = bytes_packed - bytes_to_crypt; + } + + /* Encrypt this chunk */ + aes_crypt_cbc(aes, AES_ENCRYPT, + bytes_to_crypt, + iv, plain, cipher); + + /* Copy the left over partials to the beginning */ + memcpy(plain, plain + bytes_to_crypt, *overlap); + + return bytes_to_crypt; +} + +static TPM_RESULT vtpm_storage_new_vtpm(const uuid_t uuid, int index) { + TPM_RESULT status = TPM_SUCCESS; + uint8_t plain[BUF_SIZE + AES_BLOCK_SIZE]; + uint8_t buf[BUF_SIZE]; + uint8_t* ptr; + int cipher_sz; + aes_context aes; + + /* Add new vtpm to the table */ + vtpm_add(uuid, g_store.end_offset, index); + g_store.end_offset += RSA_CIPHER_SIZE; + + /* Compute the new end location of the encrypted uuid table */ + cipher_sz = AES_BLOCK_SIZE; //IV + cipher_sz += g_store.num_vtpms * UUID_TBL_ENT_SIZE; //uuid table + cipher_sz += (AES_BLOCK_SIZE - (cipher_sz & (AES_BLOCK_SIZE -1))) & (AES_BLOCK_SIZE-1); //aes padding + + /* Does this overlap any key data? If so they need to be relocated */ + int uuid_end = (g_store.uuid_offset + cipher_sz + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + for(int i = 0; i < g_store.num_vtpms; ++i) { + if(g_store.vtpms[i].offset < uuid_end) { + + vtpmloginfo(VTPM_LOG_VTPM, "Relocating vtpm data\n"); + + //Read the hashkey cipher text + lseek(blkfront_fd, g_store.vtpms[i].offset, SEEK_SET); + TRY_READ(buf, RSA_CIPHER_SIZE, "vtpm hashkey relocate"); + + //Write the cipher text to new offset + lseek(blkfront_fd, g_store.end_offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm hashkey relocate"); + + //Save new offset + g_store.vtpms[i].offset = g_store.end_offset; + g_store.end_offset += RSA_CIPHER_SIZE; + } + } + + vtpmloginfo(VTPM_LOG_VTPM, "Generating a new symmetric key\n"); + + /* Generate an aes key */ + TPMTRYRETURN(vtpmmgr_rand(plain, AES_KEY_SIZE)); + aes_setkey_enc(&aes, plain, AES_KEY_BITS); + ptr = plain + AES_KEY_SIZE; + + /* Pack the crypted size */ + ptr = pack_UINT32(ptr, cipher_sz); + + vtpmloginfo(VTPM_LOG_VTPM, "Binding encrypted key\n"); + + /* Seal the key and size */ + TPMTRYRETURN(TPM_Bind(&vtpm_globals.storage_key, + plain, + ptr - plain, + buf)); + + /* Write the sealed key to disk */ + lseek(blkfront_fd, g_store.aes_offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm aes key"); + + /* ENCRYPT AND WRITE UUID TABLE */ + + vtpmloginfo(VTPM_LOG_VTPM, "Encrypting the uuid table\n"); + + int num_vtpms = 0; + int overlap = 0; + int bytes_crypted; + uint8_t iv[AES_BLOCK_SIZE]; + + /* Generate the iv for the first block */ + TPMTRYRETURN(vtpmmgr_rand(iv, AES_BLOCK_SIZE)); + + /* Copy the iv to the cipher text buffer to be written to disk */ + memcpy(buf, iv, AES_BLOCK_SIZE); + ptr = buf + AES_BLOCK_SIZE; + + /* Encrypt the first block of the uuid table */ + bytes_crypted = vtpm_encrypt_block(&aes, + iv, //iv + plain, //plaintext + ptr, //cipher text + BUF_SIZE - AES_BLOCK_SIZE, + &overlap, + &num_vtpms); + + /* Write the iv followed by the crypted table*/ + TRY_WRITE(buf, bytes_crypted + AES_BLOCK_SIZE, "vtpm uuid table"); + + /* Decrement the number of bytes encrypted */ + cipher_sz -= bytes_crypted + AES_BLOCK_SIZE; + + /* If there are more vtpms, encrypt and write them block by block */ + while(cipher_sz > 0) { + /* Encrypt the next block of the uuid table */ + bytes_crypted = vtpm_encrypt_block(&aes, + iv, + plain, + buf, + BUF_SIZE, + &overlap, + &num_vtpms); + + /* Write the cipher text to disk */ + TRY_WRITE(buf, bytes_crypted, "vtpm uuid table"); + + cipher_sz -= bytes_crypted; + } + + goto egress; +abort_egress: +egress: + return status; +} + + +/************************************** + * PUBLIC FUNCTIONS + * ***********************************/ + +int vtpm_storage_init(void) { + struct blkfront_info info; + if((blkdev = init_blkfront(NULL, &info)) == NULL) { + return -1; + } + if((blkfront_fd = blkfront_open(blkdev)) < 0) { + return -1; + } + return 0; +} + +void vtpm_storage_shutdown(void) { + reset_store(); + close(blkfront_fd); +} + +TPM_RESULT vtpm_storage_load_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]) +{ + TPM_RESULT status = TPM_SUCCESS; + int index; + uint8_t cipher[RSA_CIPHER_SIZE]; + uint8_t clear[RSA_CIPHER_SIZE]; + UINT32 clear_size; + + /* Find the index of this uuid */ + if((index = vtpm_get_index(uuid)) < 0) { + index = -index-1; + vtpmlogerror(VTPM_LOG_VTPM, "LoadKey failure: Unrecognized uuid! " UUID_FMT "\n", UUID_BYTES(uuid)); + status = TPM_BAD_PARAMETER; + goto abort_egress; + } + + /* Read the table entry */ + lseek(blkfront_fd, g_store.vtpms[index].offset, SEEK_SET); + TRY_READ(cipher, RSA_CIPHER_SIZE, "vtpm hashkey data"); + + /* Decrypt the table entry */ + TPMTRYRETURN(TPM_UnBind( + vtpm_globals.storage_key_handle, + RSA_CIPHER_SIZE, + cipher, + &clear_size, + clear, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.oiap)); + + if(clear_size < HASHKEYSZ) { + vtpmloginfo(VTPM_LOG_VTPM, "Decrypted Hash key size (%" PRIu32 ") was too small!\n", clear_size); + status = TPM_RESOURCES; + goto abort_egress; + } + + memcpy(hashkey, clear, HASHKEYSZ); + + vtpmloginfo(VTPM_LOG_VTPM, "Loaded hash and key for vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + goto egress; +abort_egress: + vtpmlogerror(VTPM_LOG_VTPM, "Failed to load key\n"); +egress: + return status; +} + +TPM_RESULT vtpm_storage_save_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]) +{ + TPM_RESULT status = TPM_SUCCESS; + int index; + uint8_t buf[RSA_CIPHER_SIZE]; + + /* Find the index of this uuid */ + if((index = vtpm_get_index(uuid)) < 0) { + index = -index-1; + /* Create a new vtpm */ + TPMTRYRETURN( vtpm_storage_new_vtpm(uuid, index) ); + } + + /* Encrypt the hash and key */ + TPMTRYRETURN( TPM_Bind(&vtpm_globals.storage_key, + hashkey, + HASHKEYSZ, + buf)); + + /* Write to disk */ + lseek(blkfront_fd, g_store.vtpms[index].offset, SEEK_SET); + TRY_WRITE(buf, RSA_CIPHER_SIZE, "vtpm hashkey data"); + + vtpmloginfo(VTPM_LOG_VTPM, "Saved hash and key for vtpm " UUID_FMT "\n", UUID_BYTES(uuid)); + goto egress; +abort_egress: + vtpmlogerror(VTPM_LOG_VTPM, "Failed to save key\n"); +egress: + return status; +} + +TPM_RESULT vtpm_storage_new_header() +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t buf[BUF_SIZE]; + uint8_t keybuf[AES_KEY_SIZE + sizeof(uint32_t)]; + uint8_t* ptr = buf; + uint8_t* sptr; + + /* Clear everything first */ + reset_store(); + + vtpmloginfo(VTPM_LOG_VTPM, "Creating new disk image header\n"); + + /*Copy the ID string */ + memcpy(ptr, IDSTR, IDSTRLEN); + ptr += IDSTRLEN; + + /*Copy the version */ + ptr = pack_UINT32(ptr, DISKVERS); + + /*Save the location of the key size */ + sptr = ptr; + ptr += sizeof(UINT32); + + vtpmloginfo(VTPM_LOG_VTPM, "Saving root storage key..\n"); + + /* Copy the storage key */ + ptr = pack_TPM_KEY(ptr, &vtpm_globals.storage_key); + + /* Now save the size */ + pack_UINT32(sptr, ptr - (sptr + 4)); + + /* Create a fake aes key and set cipher text size to 0 */ + memset(keybuf, 0, sizeof(keybuf)); + + vtpmloginfo(VTPM_LOG_VTPM, "Binding uuid table symmetric key..\n"); + + /* Save the location of the aes key */ + g_store.aes_offset = ptr - buf; + + /* Store the fake aes key and vtpm count */ + TPMTRYRETURN(TPM_Bind(&vtpm_globals.storage_key, + keybuf, + sizeof(keybuf), + ptr)); + ptr+= RSA_CIPHER_SIZE; + + /* Write the header to disk */ + lseek(blkfront_fd, 0, SEEK_SET); + TRY_WRITE(buf, ptr-buf, "vtpm header"); + + /* Save the location of the uuid table */ + g_store.uuid_offset = get_offset(); + + /* Save the end offset */ + g_store.end_offset = (g_store.uuid_offset + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + + vtpmloginfo(VTPM_LOG_VTPM, "Saved new manager disk header.\n"); + + goto egress; +abort_egress: +egress: + return status; +} + + +TPM_RESULT vtpm_storage_load_header(void) +{ + TPM_RESULT status = TPM_SUCCESS; + uint32_t v32; + uint8_t buf[BUF_SIZE]; + uint8_t* ptr = buf; + aes_context aes; + + /* Clear everything first */ + reset_store(); + + /* Read the header from disk */ + lseek(blkfront_fd, 0, SEEK_SET); + TRY_READ(buf, IDSTRLEN + sizeof(UINT32) + sizeof(UINT32), "vtpm header"); + + vtpmloginfo(VTPM_LOG_VTPM, "Loading disk image header\n"); + + /* Verify the ID string */ + if(memcmp(ptr, IDSTR, IDSTRLEN)) { + vtpmlogerror(VTPM_LOG_VTPM, "Invalid ID string in disk image!\n"); + status = TPM_FAIL; + goto abort_egress; + } + ptr+=IDSTRLEN; + + /* Unpack the version */ + ptr = unpack_UINT32(ptr, &v32); + + /* Verify the version */ + if(v32 != DISKVERS) { + vtpmlogerror(VTPM_LOG_VTPM, "Unsupported disk image version number %" PRIu32 "\n", v32); + status = TPM_FAIL; + goto abort_egress; + } + + /* Size of the storage key */ + ptr = unpack_UINT32(ptr, &v32); + + /* Sanity check */ + if(v32 > BUF_SIZE) { + vtpmlogerror(VTPM_LOG_VTPM, "Size of storage key (%" PRIu32 ") is too large!\n", v32); + status = TPM_IOERROR; + goto abort_egress; + } + + /* read the storage key */ + TRY_READ(buf, v32, "storage pub key"); + + vtpmloginfo(VTPM_LOG_VTPM, "Unpacking storage key\n"); + + /* unpack the storage key */ + ptr = unpack_TPM_KEY(buf, &vtpm_globals.storage_key, UNPACK_ALLOC); + + /* Load Storage Key into the TPM */ + TPMTRYRETURN( TPM_LoadKey( + TPM_SRK_KEYHANDLE, + &vtpm_globals.storage_key, + &vtpm_globals.storage_key_handle, + (const TPM_AUTHDATA*)&vtpm_globals.srk_auth, + &vtpm_globals.oiap)); + + /* Initialize the storage key auth */ + memset(vtpm_globals.storage_key_usage_auth, 0, sizeof(TPM_AUTHDATA)); + + /* Store the offset of the aes key */ + g_store.aes_offset = get_offset(); + + /* Read the rsa cipher text for the aes key */ + TRY_READ(buf, RSA_CIPHER_SIZE, "aes key"); + ptr = buf + RSA_CIPHER_SIZE; + + vtpmloginfo(VTPM_LOG_VTPM, "Unbinding uuid table symmetric key\n"); + + /* Decrypt the aes key protecting the uuid table */ + UINT32 datalen; + TPMTRYRETURN(TPM_UnBind( + vtpm_globals.storage_key_handle, + RSA_CIPHER_SIZE, + buf, + &datalen, + ptr, + (const TPM_AUTHDATA*)&vtpm_globals.storage_key_usage_auth, + &vtpm_globals.oiap)); + + /* Validate the length of the output buffer */ + if(datalen < AES_KEY_SIZE + sizeof(UINT32)) { + vtpmlogerror(VTPM_LOG_VTPM, "Unbound AES key size (%d) was too small! expected (%ld)\n", datalen, AES_KEY_SIZE + sizeof(UINT32)); + status = TPM_IOERROR; + goto abort_egress; + } + + /* Extract the aes key */ + aes_setkey_dec(&aes, ptr, AES_KEY_BITS); + ptr+= AES_KEY_SIZE; + + /* Extract the ciphertext size */ + ptr = unpack_UINT32(ptr, &v32); + int cipher_size = v32; + + /* Sanity check */ + if(cipher_size & (AES_BLOCK_SIZE-1)) { + vtpmlogerror(VTPM_LOG_VTPM, "Cipher text size (%" PRIu32 ") is not a multiple of the aes block size! (%d)\n", v32, AES_BLOCK_SIZE); + status = TPM_IOERROR; + goto abort_egress; + } + + /* Save the location of the uuid table */ + g_store.uuid_offset = get_offset(); + + /* Only decrypt the table if there are vtpms to decrypt */ + if(cipher_size > 0) { + int rbytes; + int overlap = 0; + uint8_t plain[BUF_SIZE + AES_BLOCK_SIZE]; + uint8_t iv[AES_BLOCK_SIZE]; + + vtpmloginfo(VTPM_LOG_VTPM, "Decrypting uuid table\n"); + + /* Pre allocate the vtpm array */ + g_store.num_vtpms_alloced = cipher_size / UUID_TBL_ENT_SIZE; + g_store.vtpms = malloc(sizeof(struct Vtpm) * g_store.num_vtpms_alloced); + + /* Read the iv and the first chunk of cipher text */ + rbytes = MIN(cipher_size, BUF_SIZE); + TRY_READ(buf, rbytes, "vtpm uuid table\n"); + cipher_size -= rbytes; + + /* Copy the iv */ + memcpy(iv, buf, AES_BLOCK_SIZE); + ptr = buf + AES_BLOCK_SIZE; + + /* Remove the iv from the number of bytes to decrypt */ + rbytes -= AES_BLOCK_SIZE; + + /* Decrypt and extract vtpms */ + vtpm_decrypt_block(&aes, + iv, ptr, plain, + rbytes, &overlap); + + /* Read the rest of the table if there is more */ + while(cipher_size > 0) { + /* Read next chunk of cipher text */ + rbytes = MIN(cipher_size, BUF_SIZE); + TRY_READ(buf, rbytes, "vtpm uuid table"); + cipher_size -= rbytes; + + /* Decrypt a block of text */ + vtpm_decrypt_block(&aes, + iv, buf, plain, + rbytes, &overlap); + + } + vtpmloginfo(VTPM_LOG_VTPM, "Loaded %d vtpms!\n", g_store.num_vtpms); + } + + /* The end of the key table, new vtpms go here */ + int uuid_end = (get_offset() + RSA_CIPHER_SIZE) & ~(RSA_CIPHER_SIZE -1); + g_store.end_offset = uuid_end; + + /* Compute the end offset while validating vtpms*/ + for(int i = 0; i < g_store.num_vtpms; ++i) { + /* offset must not collide with previous data */ + if(g_store.vtpms[i].offset < uuid_end) { + vtpmlogerror(VTPM_LOG_VTPM, "vtpm: " UUID_FMT + " offset (%d) is before end of uuid table (%d)!\n", + UUID_BYTES(g_store.vtpms[i].uuid), + g_store.vtpms[i].offset, uuid_end); + status = TPM_IOERROR; + goto abort_egress; + } + /* offset must be at a multiple of cipher size */ + if(g_store.vtpms[i].offset & (RSA_CIPHER_SIZE-1)) { + vtpmlogerror(VTPM_LOG_VTPM, "vtpm: " UUID_FMT + " offset(%d) is not at a multiple of the rsa cipher text size (%d)!\n", + UUID_BYTES(g_store.vtpms[i].uuid), + g_store.vtpms[i].offset, RSA_CIPHER_SIZE); + status = TPM_IOERROR; + goto abort_egress; + } + /* Save the last offset */ + if(g_store.vtpms[i].offset >= g_store.end_offset) { + g_store.end_offset = g_store.vtpms[i].offset + RSA_CIPHER_SIZE; + } + } + + goto egress; +abort_egress: + //An error occured somewhere + vtpmlogerror(VTPM_LOG_VTPM, "Failed to load manager data!\n"); + + //Clear the data store + reset_store(); + + //Reset the storage key structure + free_TPM_KEY(&vtpm_globals.storage_key); + { + TPM_KEY key = TPM_KEY_INIT; + vtpm_globals.storage_key = key; + } + + //Reset the storage key handle + TPM_EvictKey(vtpm_globals.storage_key_handle); + vtpm_globals.storage_key_handle = 0; +egress: + return status; +} + +#if 0 +/* For testing disk IO */ +void add_fake_vtpms(int num) { + for(int i = 0; i < num; ++i) { + uint32_t ind = cpu_to_be32(i); + + uuid_t uuid; + memset(uuid, 0, sizeof(uuid_t)); + memcpy(uuid, &ind, sizeof(ind)); + int index = vtpm_get_index(uuid); + index = -index-1; + + vtpm_storage_new_vtpm(uuid, index); + } +} +#endif diff --git a/stubdom/vtpmmgr/vtpm_storage.h b/stubdom/vtpmmgr/vtpm_storage.h new file mode 100644 index 0000000..a5a5fd7 --- /dev/null +++ b/stubdom/vtpmmgr/vtpm_storage.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPM_STORAGE_H +#define VTPM_STORAGE_h + +#include "uuid.h" + +#define VTPM_NVMKEY_SIZE 32 +#define HASHKEYSZ (sizeof(TPM_DIGEST) + VTPM_NVMKEY_SIZE) + +/* Initialize the storage system and its virtual disk */ +int vtpm_storage_init(void); + +/* Shutdown the storage system and its virtual disk */ +void vtpm_storage_shutdown(void); + +/* Loads Sha1 hash and 256 bit AES key from disk and stores them + * packed together in outbuf. outbuf must be freed + * by the caller using buffer_free() + */ +TPM_RESULT vtpm_storage_load_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]); + +/* inbuf must contain a sha1 hash followed by a 256 bit AES key. + * Encrypts and stores the hash and key to disk */ +TPM_RESULT vtpm_storage_save_hashkey(const uuid_t uuid, uint8_t hashkey[HASHKEYSZ]); + +/* Load the vtpm manager data - call this on startup */ +TPM_RESULT vtpm_storage_load_header(void); + +/* Saves the vtpm manager data - call this on shutdown */ +TPM_RESULT vtpm_storage_new_header(void); + + +#endif diff --git a/stubdom/vtpmmgr/vtpmmgr.c b/stubdom/vtpmmgr/vtpmmgr.c new file mode 100644 index 0000000..563f4e8 --- /dev/null +++ b/stubdom/vtpmmgr/vtpmmgr.c @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include +#include +#include +#include +#include +#include "log.h" + +#include "vtpmmgr.h" +#include "tcg.h" + + +void main_loop(void) { + tpmcmd_t* tpmcmd; + uint8_t respbuf[TCPA_MAX_BUFFER_LENGTH]; + + while(1) { + /* Wait for requests from a vtpm */ + vtpmloginfo(VTPM_LOG_VTPM, "Waiting for commands from vTPM's:\n"); + if((tpmcmd = tpmback_req_any()) == NULL) { + vtpmlogerror(VTPM_LOG_VTPM, "NULL tpmcmd\n"); + continue; + } + + tpmcmd->resp = respbuf; + + /* Process the command */ + vtpmmgr_handle_cmd(tpmcmd->uuid, tpmcmd); + + /* Send response */ + tpmback_resp(tpmcmd); + } +} + +int main(int argc, char** argv) +{ + int rc = 0; + sleep(2); + vtpmloginfo(VTPM_LOG_VTPM, "Starting vTPM manager domain\n"); + + /* Initialize the vtpm manager */ + if(vtpmmgr_init(argc, argv) != TPM_SUCCESS) { + vtpmlogerror(VTPM_LOG_VTPM, "Unable to initialize vtpmmgr domain!\n"); + rc = -1; + goto exit; + } + + main_loop(); + + vtpmloginfo(VTPM_LOG_VTPM, "vTPM Manager shutting down...\n"); + + vtpmmgr_shutdown(); + +exit: + return rc; + +} diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h new file mode 100644 index 0000000..50a1992 --- /dev/null +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * based off of the original tools/vtpm_manager code base which is: + * Copyright (c) 2005, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef VTPMMGR_H +#define VTPMMGR_H + +#include +#include +#include + +#include "uuid.h" +#include "tcg.h" +#include "vtpm_manager.h" + +#define RSA_KEY_SIZE 0x0800 +#define RSA_CIPHER_SIZE (RSA_KEY_SIZE / 8) + +struct vtpm_globals { + int tpm_fd; + TPM_KEY storage_key; + TPM_HANDLE storage_key_handle; // Key used by persistent store + TPM_AUTH_SESSION oiap; // OIAP session for storageKey + TPM_AUTHDATA storage_key_usage_auth; + + TPM_AUTHDATA owner_auth; + TPM_AUTHDATA srk_auth; + + entropy_context entropy; + ctr_drbg_context ctr_drbg; +}; + +// --------------------------- Global Values -------------------------- +extern struct vtpm_globals vtpm_globals; // Key info and DMI states + +TPM_RESULT vtpmmgr_init(int argc, char** argv); +void vtpmmgr_shutdown(void); + +TPM_RESULT vtpmmgr_handle_cmd(const uuid_t uuid, tpmcmd_t* tpmcmd); + +inline TPM_RESULT vtpmmgr_rand(unsigned char* bytes, size_t num_bytes) { + return ctr_drbg_random(&vtpm_globals.ctr_drbg, bytes, num_bytes) == 0 ? 0 : TPM_FAIL; +} + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1V8-0005Yu-4F; Thu, 01 Nov 2012 20:36:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1V6-0005YK-4Z for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:28 +0000 Received: from [85.158.137.99:16199] by server-14.bemta-3.messagelabs.com id 7A/31-12788-B4DD2905; Thu, 01 Nov 2012 20:36:27 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-2.tower-217.messagelabs.com!1351802165!17261497!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD,UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1967 invoked from network); 1 Nov 2012 20:36:06 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-2.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:06 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031185; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:48 -0400 Message-Id: <1351802150-19258-2-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 7/9] add vtpm-stubdom code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add the code base for vtpm-stubdom to the stubdom heirarchy. Makefile changes in later patch. Signed-off-by: Matthew Fioravante diff --git a/stubdom/vtpm/Makefile b/stubdom/vtpm/Makefile new file mode 100644 index 0000000..686c0ea --- /dev/null +++ b/stubdom/vtpm/Makefile @@ -0,0 +1,37 @@ +# Copyright (c) 2010-2012 United States Government, as represented by +# the Secretary of Defense. All rights reserved. +# +# THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT +# ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES +# INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY +# DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE +# SOFTWARE. +# + +XEN_ROOT=../.. + +PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library +PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o sha4.o + +TARGET=vtpm.a +OBJS=vtpm.o vtpm_cmd.o vtpmblk.o vtpm_pcrs.o + + +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/build +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/tpm +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/crypto +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH) + +$(TARGET): $(OBJS) + ar -cr $@ $(OBJS) $(TPMEMU_OBJS) $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + +$(OBJS): vtpm_manager.h + +vtpm_manager.h: + ln -s ../vtpmmgr/vtpm_manager.h vtpm_manager.h + +clean: + -rm $(TARGET) $(OBJS) vtpm_manager.h + +.PHONY: clean diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg new file mode 100644 index 0000000..31652ee --- /dev/null +++ b/stubdom/vtpm/minios.cfg @@ -0,0 +1,14 @@ +CONFIG_TPMFRONT=y +CONFIG_TPM_TIS=n +CONFIG_TPMBACK=y +CONFIG_START_NETWORK=n +CONFIG_TEST=n +CONFIG_PCIFRONT=n +CONFIG_BLKFRONT=y +CONFIG_NETFRONT=n +CONFIG_FBFRONT=n +CONFIG_KBDFRONT=n +CONFIG_CONSFRONT=n +CONFIG_XENBUS=y +CONFIG_LWIP=n +CONFIG_XC=n diff --git a/stubdom/vtpm/vtpm.c b/stubdom/vtpm/vtpm.c new file mode 100644 index 0000000..71aef78 --- /dev/null +++ b/stubdom/vtpm/vtpm.c @@ -0,0 +1,404 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "tpm/tpm_emulator_extern.h" +#include "tpm/tpm_marshalling.h" +#include "vtpm.h" +#include "vtpm_cmd.h" +#include "vtpm_pcrs.h" +#include "vtpmblk.h" + +#define TPM_LOG_INFO LOG_INFO +#define TPM_LOG_ERROR LOG_ERR +#define TPM_LOG_DEBUG LOG_DEBUG + +/* Global commandline options - default values */ +struct Opt_args opt_args = { + .startup = ST_CLEAR, + .loglevel = TPM_LOG_INFO, + .hwinitpcrs = VTPM_PCRNONE, + .tpmconf = 0, + .enable_maint_cmds = false, +}; + +static uint32_t badords[32]; +static unsigned int n_badords = 0; + +entropy_context entropy; +ctr_drbg_context ctr_drbg; + +struct tpmfront_dev* tpmfront_dev; + +void vtpm_get_extern_random_bytes(void *buf, size_t nbytes) +{ + ctr_drbg_random(&ctr_drbg, buf, nbytes); +} + +int vtpm_read_from_file(uint8_t **data, size_t *data_length) { + return read_vtpmblk(tpmfront_dev, data, data_length); +} + +int vtpm_write_to_file(uint8_t *data, size_t data_length) { + return write_vtpmblk(tpmfront_dev, data, data_length); +} + +int vtpm_extern_init_fake(void) { + return 0; +} + +void vtpm_extern_release_fake(void) { +} + + +void vtpm_log(int priority, const char *fmt, ...) +{ + if(opt_args.loglevel >= priority) { + va_list v; + va_start(v, fmt); + vprintf(fmt, v); + va_end(v); + } +} + +static uint64_t vtpm_get_ticks(void) +{ + static uint64_t old_t = 0; + uint64_t new_t, res_t; + struct timeval tv; + gettimeofday(&tv, NULL); + new_t = (uint64_t)tv.tv_sec * 1000000 + (uint64_t)tv.tv_usec; + res_t = (old_t > 0) ? new_t - old_t : 0; + old_t = new_t; + return res_t; +} + + +static int tpm_entropy_source(void* dummy, unsigned char* data, size_t len, size_t* olen) { + UINT32 sz = len; + TPM_RESULT rc = VTPM_GetRandom(tpmfront_dev, data, &sz); + *olen = sz; + return rc == TPM_SUCCESS ? 0 : POLARSSL_ERR_ENTROPY_SOURCE_FAILED; +} + +int init_random(void) { + /* Initialize the rng */ + entropy_init(&entropy); + entropy_add_source(&entropy, tpm_entropy_source, NULL, 0); + entropy_gather(&entropy); + ctr_drbg_init(&ctr_drbg, entropy_func, &entropy, NULL, 0); + ctr_drbg_set_prediction_resistance( &ctr_drbg, CTR_DRBG_PR_OFF ); + + return 0; +} + +int check_ordinal(tpmcmd_t* tpmcmd) { + TPM_COMMAND_CODE ord; + UINT32 len = 4; + BYTE* ptr; + unsigned int i; + + if(tpmcmd->req_len < 10) { + return true; + } + + ptr = tpmcmd->req + 6; + tpm_unmarshal_UINT32(&ptr, &len, &ord); + + for(i = 0; i < n_badords; ++i) { + if(ord == badords[i]) { + error("Disabled command ordinal (%" PRIu32") requested!\n"); + return false; + } + } + return true; +} + +static void main_loop(void) { + tpmcmd_t* tpmcmd = NULL; + domid_t domid; /* Domid of frontend */ + unsigned int handle; /* handle of frontend */ + int res = -1; + + info("VTPM Initializing\n"); + + /* Set required tpm config args */ + opt_args.tpmconf |= TPM_CONF_STRONG_PERSISTENCE; + opt_args.tpmconf &= ~TPM_CONF_USE_INTERNAL_PRNG; + opt_args.tpmconf |= TPM_CONF_GENERATE_EK; + opt_args.tpmconf |= TPM_CONF_GENERATE_SEED_DAA; + + /* Initialize the emulator */ + tpm_emulator_init(opt_args.startup, opt_args.tpmconf); + + /* Initialize any requested PCRs with hardware TPM values */ + if(vtpm_initialize_hw_pcrs(tpmfront_dev, opt_args.hwinitpcrs) != TPM_SUCCESS) { + error("Failed to initialize PCRs with hardware TPM values"); + goto abort_postpcrs; + } + + /* Wait for the frontend domain to connect */ + info("Waiting for frontend domain to connect.."); + if(tpmback_wait_for_frontend_connect(&domid, &handle) == 0) { + info("VTPM attached to Frontend %u/%u", (unsigned int) domid, handle); + } else { + error("Unable to attach to a frontend"); + } + + tpmcmd = tpmback_req(domid, handle); + while(tpmcmd) { + /* Handle the request */ + if(tpmcmd->req_len) { + tpmcmd->resp = NULL; + tpmcmd->resp_len = 0; + + /* First check for disabled ordinals */ + if(!check_ordinal(tpmcmd)) { + create_error_response(tpmcmd, TPM_BAD_ORDINAL); + } + /* If not disabled, do the command */ + else { + if((res = tpm_handle_command(tpmcmd->req, tpmcmd->req_len, &tpmcmd->resp, &tpmcmd->resp_len)) != 0) { + error("tpm_handle_command() failed"); + create_error_response(tpmcmd, TPM_FAIL); + } + } + } + + /* Send the response */ + tpmback_resp(tpmcmd); + + /* Wait for the next request */ + tpmcmd = tpmback_req(domid, handle); + + } + +abort_postpcrs: + info("VTPM Shutting down\n"); + + tpm_emulator_shutdown(); +} + +int parse_cmd_line(int argc, char** argv) +{ + char sval[25]; + char* logstr = NULL; + /* Parse the command strings */ + for(unsigned int i = 1; i < argc; ++i) { + if (sscanf(argv[i], "loglevel=%25s", sval) == 1){ + if (!strcmp(sval, "debug")) { + opt_args.loglevel = TPM_LOG_DEBUG; + logstr = "debug"; + } + else if (!strcmp(sval, "info")) { + logstr = "info"; + opt_args.loglevel = TPM_LOG_INFO; + } + else if (!strcmp(sval, "error")) { + logstr = "error"; + opt_args.loglevel = TPM_LOG_ERROR; + } + } + else if (!strcmp(argv[i], "clear")) { + opt_args.startup = ST_CLEAR; + } + else if (!strcmp(argv[i], "save")) { + opt_args.startup = ST_SAVE; + } + else if (!strcmp(argv[i], "deactivated")) { + opt_args.startup = ST_DEACTIVATED; + } + else if (!strncmp(argv[i], "maintcmds=", 10)) { + if(!strcmp(argv[i] + 10, "1")) { + opt_args.enable_maint_cmds = true; + } else if(!strcmp(argv[i] + 10, "0")) { + opt_args.enable_maint_cmds = false; + } + } + else if(!strncmp(argv[i], "hwinitpcr=", 10)) { + char *pch = argv[i] + 10; + unsigned int v1, v2; + pch = strtok(pch, ","); + while(pch != NULL) { + if(!strcmp(pch, "all")) { + //Set all + opt_args.hwinitpcrs = VTPM_PCRALL; + } else if(!strcmp(pch, "none")) { + //Set none + opt_args.hwinitpcrs = VTPM_PCRNONE; + } else if(sscanf(pch, "%u", &v1) == 1) { + //Set one + if(v1 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + opt_args.hwinitpcrs |= (1 << v1); + } else if(sscanf(pch, "%u-%u", &v1, &v2) == 2) { + //Set range + if(v1 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + if(v2 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + if(v2 < v1) { + unsigned tp = v1; + v1 = v2; + v2 = tp; + } + for(unsigned int i = v1; i <= v2; ++i) { + opt_args.hwinitpcrs |= (1 << i); + } + } else { + error("hwintipcr error: Invalid PCR specification : %s", pch); + return -1; + } + pch = strtok(NULL, ","); + } + } + else { + error("Invalid command line option `%s'", argv[i]); + } + + } + + /* Check Errors and print results */ + switch(opt_args.startup) { + case ST_CLEAR: + info("Startup mode is `clear'"); + break; + case ST_SAVE: + info("Startup mode is `save'"); + break; + case ST_DEACTIVATED: + info("Startup mode is `deactivated'"); + break; + default: + error("Invalid startup mode %d", opt_args.startup); + return -1; + } + + if(opt_args.hwinitpcrs & (VTPM_PCRALL)) + { + char pcrstr[1024]; + char* ptr = pcrstr; + + pcrstr[0] = '\0'; + info("The following PCRs will be initialized with values from the hardware TPM:"); + for(unsigned int i = 0; i < TPM_NUM_PCR; ++i) { + if(opt_args.hwinitpcrs & (1 << i)) { + ptr += sprintf(ptr, "%u, ", i); + } + } + /* get rid of the last comma if any numbers were printed */ + *(ptr -2) = '\0'; + + info("\t%s", pcrstr); + } else { + info("All PCRs initialized to default values"); + } + + if(!opt_args.enable_maint_cmds) { + info("TPM Maintenance Commands disabled"); + badords[n_badords++] = TPM_ORD_CreateMaintenanceArchive; + badords[n_badords++] = TPM_ORD_LoadMaintenanceArchive; + badords[n_badords++] = TPM_ORD_KillMaintenanceFeature; + badords[n_badords++] = TPM_ORD_LoadManuMaintPub; + badords[n_badords++] = TPM_ORD_ReadManuMaintPub; + } else { + info("TPM Maintenance Commands enabled"); + } + + info("Log level set to %s", logstr); + + return 0; +} + +void cleanup_opt_args(void) { +} + +int main(int argc, char **argv) +{ + //FIXME: initializing blkfront without this sleep causes the domain to crash on boot + sleep(2); + + /* Setup extern function pointers */ + tpm_extern_init = vtpm_extern_init_fake; + tpm_extern_release = vtpm_extern_release_fake; + tpm_malloc = malloc; + tpm_free = free; + tpm_log = vtpm_log; + tpm_get_ticks = vtpm_get_ticks; + tpm_get_extern_random_bytes = vtpm_get_extern_random_bytes; + tpm_write_to_storage = vtpm_write_to_file; + tpm_read_from_storage = vtpm_read_from_file; + + info("starting TPM Emulator (1.2.%d.%d-%d)", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD); + if(parse_cmd_line(argc, argv)) { + error("Error parsing commandline\n"); + return -1; + } + + /* Initialize devices */ + init_tpmback(); + if((tpmfront_dev = init_tpmfront(NULL)) == NULL) { + error("Unable to initialize tpmfront device"); + goto abort_posttpmfront; + } + + /* Seed the RNG with entropy from hardware TPM */ + if(init_random()) { + error("Unable to initialize RNG"); + goto abort_postrng; + } + + /* Initialize blkfront device */ + if(init_vtpmblk(tpmfront_dev)) { + error("Unable to initialize Blkfront persistent storage"); + goto abort_postvtpmblk; + } + + /* Run main loop */ + main_loop(); + + /* Shutdown blkfront */ + shutdown_vtpmblk(); +abort_postvtpmblk: +abort_postrng: + + /* Close devices */ + shutdown_tpmfront(tpmfront_dev); +abort_posttpmfront: + shutdown_tpmback(); + + cleanup_opt_args(); + + return 0; +} diff --git a/stubdom/vtpm/vtpm.h b/stubdom/vtpm/vtpm.h new file mode 100644 index 0000000..5919e44 --- /dev/null +++ b/stubdom/vtpm/vtpm.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef VTPM_H +#define VTPM_H + +#include + +/* For testing */ +#define VERS_CMD "\x00\xC1\x00\x00\x00\x16\x00\x00\x00\x65\x00\x00\x00\x05\x00\x00\x00\x04\x00\x00\x01\x03" +#define VERS_CMD_LEN 22 + +/* Global commandline options */ +struct Opt_args { + enum StartUp { + ST_CLEAR = 1, + ST_SAVE = 2, + ST_DEACTIVATED = 3 + } startup; + unsigned long hwinitpcrs; + int loglevel; + uint32_t tpmconf; + bool enable_maint_cmds; +}; +extern struct Opt_args opt_args; + +#endif diff --git a/stubdom/vtpm/vtpm_cmd.c b/stubdom/vtpm/vtpm_cmd.c new file mode 100644 index 0000000..7eae98b --- /dev/null +++ b/stubdom/vtpm/vtpm_cmd.c @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include "tpm/tpm_marshalling.h" +#include "vtpm_manager.h" +#include "vtpm_cmd.h" +#include + +#define TRYFAILGOTO(C) \ + if((C)) { \ + status = TPM_FAIL; \ + goto abort_egress; \ + } +#define TRYFAILGOTOMSG(C, msg) \ + if((C)) { \ + status = TPM_FAIL; \ + error(msg); \ + goto abort_egress; \ + } +#define CHECKSTATUSGOTO(ret, fname) \ + if((ret) != TPM_SUCCESS) { \ + error("%s failed with error code (%lu)", fname, (unsigned long) ret); \ + status = ord; \ + goto abort_egress; \ + } + +#define ERR_MALFORMED "Malformed response from backend" +#define ERR_TPMFRONT "Error sending command through frontend device" + +struct shpage { + void* page; + grant_ref_t grantref; +}; + +typedef struct shpage shpage_t; + +static inline int pack_header(uint8_t** bptr, UINT32* len, TPM_TAG tag, UINT32 size, TPM_COMMAND_CODE ord) +{ + return *bptr == NULL || + tpm_marshal_UINT16(bptr, len, tag) || + tpm_marshal_UINT32(bptr, len, size) || + tpm_marshal_UINT32(bptr, len, ord); +} + +static inline int unpack_header(uint8_t** bptr, UINT32* len, TPM_TAG* tag, UINT32* size, TPM_COMMAND_CODE* ord) +{ + return *bptr == NULL || + tpm_unmarshal_UINT16(bptr, len, tag) || + tpm_unmarshal_UINT32(bptr, len, size) || + tpm_unmarshal_UINT32(bptr, len, ord); +} + +int create_error_response(tpmcmd_t* tpmcmd, TPM_RESULT errorcode) +{ + TPM_TAG tag; + UINT32 len = tpmcmd->req_len; + uint8_t* respptr; + uint8_t* cmdptr = tpmcmd->req; + + if(!tpm_unmarshal_UINT16(&cmdptr, &len, &tag)) { + switch (tag) { + case TPM_TAG_RQU_COMMAND: + tag = TPM_TAG_RSP_COMMAND; + break; + case TPM_TAG_RQU_AUTH1_COMMAND: + tag = TPM_TAG_RQU_AUTH2_COMMAND; + break; + case TPM_TAG_RQU_AUTH2_COMMAND: + tag = TPM_TAG_RQU_AUTH2_COMMAND; + break; + } + } else { + tag = TPM_TAG_RSP_COMMAND; + } + + tpmcmd->resp_len = len = 10; + tpmcmd->resp = respptr = tpm_malloc(tpmcmd->resp_len); + + return pack_header(&respptr, &len, tag, len, errorcode); +} + +TPM_RESULT VTPM_GetRandom(struct tpmfront_dev* tpmfront_dev, BYTE* bytes, UINT32 *numbytes) { + TPM_RESULT status = TPM_SUCCESS; + uint8_t* cmdbuf, *resp, *bptr; + size_t resplen = 0; + UINT32 len; + + /*Ask the real tpm for random bytes for the seed */ + TPM_TAG tag = TPM_TAG_RQU_COMMAND; + UINT32 size; + TPM_COMMAND_CODE ord = TPM_ORD_GetRandom; + len = size = sizeof(TPM_TAG) + sizeof(UINT32) + sizeof(TPM_COMMAND_CODE) + sizeof(UINT32); + + /*Create the raw tpm command */ + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + TRYFAILGOTO(tpm_marshal_UINT32(&bptr, &len, *numbytes)); + + /* Send cmd, wait for response */ + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), + ERR_TPMFRONT); + + bptr = resp; len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + //Check return status of command + CHECKSTATUSGOTO(ord, "TPM_GetRandom()"); + + // Get the number of random bytes in the response + TRYFAILGOTOMSG(tpm_unmarshal_UINT32(&bptr, &len, &size), ERR_MALFORMED); + *numbytes = size; + + //Get the random bytes out, tpm may give us less bytes than what we wanrt + TRYFAILGOTOMSG(tpm_unmarshal_BYTE_ARRAY(&bptr, &len, bytes, *numbytes), ERR_MALFORMED); + + goto egress; +abort_egress: +egress: + free(cmdbuf); + return status; + +} + +TPM_RESULT VTPM_LoadHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t* data_length) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t* bptr, *resp; + uint8_t* cmdbuf = NULL; + size_t resplen = 0; + UINT32 len; + + TPM_TAG tag = VTPM_TAG_REQ; + UINT32 size; + TPM_COMMAND_CODE ord = VTPM_ORD_LOADHASHKEY; + + /*Create the command*/ + len = size = VTPM_COMMAND_HEADER_SIZE; + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + + /* Send the command to vtpm_manager */ + info("Requesting Encryption key from backend"); + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + /* Unpack response header */ + bptr = resp; + len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + /* Check return code */ + CHECKSTATUSGOTO(ord, "VTPM_LoadHashKey()"); + + /* Get the size of the key */ + *data_length = size - VTPM_COMMAND_HEADER_SIZE; + + /* Copy the key bits */ + *data = malloc(*data_length); + memcpy(*data, bptr, *data_length); + + goto egress; +abort_egress: + error("VTPM_LoadHashKey failed"); +egress: + free(cmdbuf); + return status; +} + +TPM_RESULT VTPM_SaveHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t* bptr, *resp; + uint8_t* cmdbuf = NULL; + size_t resplen = 0; + UINT32 len; + + TPM_TAG tag = VTPM_TAG_REQ; + UINT32 size; + TPM_COMMAND_CODE ord = VTPM_ORD_SAVEHASHKEY; + + /*Create the command*/ + len = size = VTPM_COMMAND_HEADER_SIZE + data_length; + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + memcpy(bptr, data, data_length); + bptr += data_length; + + /* Send the command to vtpm_manager */ + info("Sending encryption key to backend"); + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + /* Unpack response header */ + bptr = resp; + len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + /* Check return code */ + CHECKSTATUSGOTO(ord, "VTPM_SaveHashKey()"); + + goto egress; +abort_egress: + error("VTPM_SaveHashKey failed"); +egress: + free(cmdbuf); + return status; +} + +TPM_RESULT VTPM_PCRRead(struct tpmfront_dev* tpmfront_dev, UINT32 pcrIndex, BYTE* outDigest) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t *cmdbuf, *resp, *bptr; + size_t resplen = 0; + UINT32 len; + + /*Just send a TPM_PCRRead Command to the HW tpm */ + TPM_TAG tag = TPM_TAG_RQU_COMMAND; + UINT32 size; + TPM_COMMAND_CODE ord = TPM_ORD_PCRRead; + len = size = sizeof(TPM_TAG) + sizeof(UINT32) + sizeof(TPM_COMMAND_CODE) + sizeof(UINT32); + + /*Create the raw tpm cmd */ + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + TRYFAILGOTO(tpm_marshal_UINT32(&bptr, &len, pcrIndex)); + + /*Send Cmd wait for response */ + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + bptr = resp; len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + //Check return status of command + CHECKSTATUSGOTO(ord, "TPM_PCRRead"); + + //Get the ptr value + memcpy(outDigest, bptr, sizeof(TPM_PCRVALUE)); + + goto egress; +abort_egress: +egress: + free(cmdbuf); + return status; + +} diff --git a/stubdom/vtpm/vtpm_cmd.h b/stubdom/vtpm/vtpm_cmd.h new file mode 100644 index 0000000..b0bfa22 --- /dev/null +++ b/stubdom/vtpm/vtpm_cmd.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef MANAGER_H +#define MANAGER_H + +#include +#include +#include "tpm/tpm_structures.h" + +/* Create a command response error header */ +int create_error_response(tpmcmd_t* tpmcmd, TPM_RESULT errorcode); +/* Request random bytes from hardware tpm, returns 0 on success */ +TPM_RESULT VTPM_GetRandom(struct tpmfront_dev* tpmfront_dev, BYTE* bytes, UINT32* numbytes); +/* Retreive 256 bit AES encryption key from manager */ +TPM_RESULT VTPM_LoadHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t* data_length); +/* Manager securely saves our 256 bit AES encryption key */ +TPM_RESULT VTPM_SaveHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length); +/* Send a TPM_PCRRead command passthrough the manager to the hw tpm */ +TPM_RESULT VTPM_PCRRead(struct tpmfront_dev* tpmfront_dev, UINT32 pcrIndex, BYTE* outDigest); + +#endif diff --git a/stubdom/vtpm/vtpm_pcrs.c b/stubdom/vtpm/vtpm_pcrs.c new file mode 100644 index 0000000..22a6cef --- /dev/null +++ b/stubdom/vtpm/vtpm_pcrs.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include "vtpm_pcrs.h" +#include "vtpm_cmd.h" +#include "tpm/tpm_data.h" + +#define PCR_VALUE tpmData.permanent.data.pcrValue + +static int write_pcr_direct(unsigned int pcrIndex, uint8_t* val) { + if(pcrIndex > TPM_NUM_PCR) { + return TPM_BADINDEX; + } + memcpy(&PCR_VALUE[pcrIndex], val, sizeof(TPM_PCRVALUE)); + return TPM_SUCCESS; +} + +TPM_RESULT vtpm_initialize_hw_pcrs(struct tpmfront_dev* tpmfront_dev, unsigned long pcrs) +{ + TPM_RESULT rc = TPM_SUCCESS; + uint8_t digest[sizeof(TPM_PCRVALUE)]; + + for(unsigned int i = 0; i < TPM_NUM_PCR; ++i) { + if(pcrs & 1 << i) { + if((rc = VTPM_PCRRead(tpmfront_dev, i, digest)) != TPM_SUCCESS) { + error("TPM_PCRRead failed with error : %d", rc); + return rc; + } + write_pcr_direct(i, digest); + } + } + + return rc; +} diff --git a/stubdom/vtpm/vtpm_pcrs.h b/stubdom/vtpm/vtpm_pcrs.h new file mode 100644 index 0000000..11835f9 --- /dev/null +++ b/stubdom/vtpm/vtpm_pcrs.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef VTPM_PCRS_H +#define VTPM_PCRS_H + +#include "tpm/tpm_structures.h" + +#define VTPM_PCR0 1 +#define VTPM_PCR1 1 << 1 +#define VTPM_PCR2 1 << 2 +#define VTPM_PCR3 1 << 3 +#define VTPM_PCR4 1 << 4 +#define VTPM_PCR5 1 << 5 +#define VTPM_PCR6 1 << 6 +#define VTPM_PCR7 1 << 7 +#define VTPM_PCR8 1 << 8 +#define VTPM_PCR9 1 << 9 +#define VTPM_PCR10 1 << 10 +#define VTPM_PCR11 1 << 11 +#define VTPM_PCR12 1 << 12 +#define VTPM_PCR13 1 << 13 +#define VTPM_PCR14 1 << 14 +#define VTPM_PCR15 1 << 15 +#define VTPM_PCR16 1 << 16 +#define VTPM_PCR17 1 << 17 +#define VTPM_PCR18 1 << 18 +#define VTPM_PCR19 1 << 19 +#define VTPM_PCR20 1 << 20 +#define VTPM_PCR21 1 << 21 +#define VTPM_PCR22 1 << 22 +#define VTPM_PCR23 1 << 23 + +#define VTPM_PCRALL (1 << TPM_NUM_PCR) - 1 +#define VTPM_PCRNONE 0 + +#define VTPM_NUMPCRS 24 + +struct tpmfront_dev; + +TPM_RESULT vtpm_initialize_hw_pcrs(struct tpmfront_dev* tpmfront_dev, unsigned long pcrs); + + +#endif diff --git a/stubdom/vtpm/vtpmblk.c b/stubdom/vtpm/vtpmblk.c new file mode 100644 index 0000000..b343bd8 --- /dev/null +++ b/stubdom/vtpm/vtpmblk.c @@ -0,0 +1,307 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include "vtpmblk.h" +#include "tpm/tpm_marshalling.h" +#include "vtpm_cmd.h" +#include "polarssl/aes.h" +#include "polarssl/sha1.h" +#include +#include +#include +#include + +/*Encryption key and block sizes */ +#define BLKSZ 16 + +static struct blkfront_dev* blkdev = NULL; +static int blkfront_fd = -1; + +int init_vtpmblk(struct tpmfront_dev* tpmfront_dev) +{ + struct blkfront_info blkinfo; + info("Initializing persistent NVM storage\n"); + + if((blkdev = init_blkfront(NULL, &blkinfo)) == NULL) { + error("BLKIO: ERROR Unable to initialize blkfront"); + return -1; + } + if (blkinfo.info & VDISK_READONLY || blkinfo.mode != O_RDWR) { + error("BLKIO: ERROR block device is read only!"); + goto error; + } + if((blkfront_fd = blkfront_open(blkdev)) == -1) { + error("Unable to open blkfront file descriptor!"); + goto error; + } + + return 0; +error: + shutdown_blkfront(blkdev); + blkdev = NULL; + return -1; +} + +void shutdown_vtpmblk(void) +{ + close(blkfront_fd); + blkfront_fd = -1; + blkdev = NULL; +} + +int write_vtpmblk_raw(uint8_t *data, size_t data_length) +{ + int rc; + uint32_t lenbuf; + debug("Begin Write data=%p len=%u", data, data_length); + + lenbuf = cpu_to_be32((uint32_t)data_length); + + lseek(blkfront_fd, 0, SEEK_SET); + if((rc = write(blkfront_fd, (uint8_t*)&lenbuf, 4)) != 4) { + error("write(length) failed! error was %s", strerror(errno)); + return -1; + } + if((rc = write(blkfront_fd, data, data_length)) != data_length) { + error("write(data) failed! error was %s", strerror(errno)); + return -1; + } + + info("Wrote %u bytes to NVM persistent storage", data_length); + + return 0; +} + +int read_vtpmblk_raw(uint8_t **data, size_t *data_length) +{ + int rc; + uint32_t lenbuf; + + lseek(blkfront_fd, 0, SEEK_SET); + if(( rc = read(blkfront_fd, (uint8_t*)&lenbuf, 4)) != 4) { + error("read(length) failed! error was %s", strerror(errno)); + return -1; + } + *data_length = (size_t) cpu_to_be32(lenbuf); + if(*data_length == 0) { + error("read 0 data_length for NVM"); + return -1; + } + + *data = tpm_malloc(*data_length); + if((rc = read(blkfront_fd, *data, *data_length)) != *data_length) { + error("read(data) failed! error was %s", strerror(errno)); + return -1; + } + + info("Read %u bytes from NVM persistent storage", *data_length); + return 0; +} + +int encrypt_vtpmblk(uint8_t* clear, size_t clear_len, uint8_t** cipher, size_t* cipher_len, uint8_t* symkey) +{ + int rc = 0; + uint8_t iv[BLKSZ]; + aes_context aes_ctx; + UINT32 temp; + int mod; + + uint8_t* clbuf = NULL; + + uint8_t* ivptr; + int ivlen; + + uint8_t* cptr; //Cipher block pointer + int clen; //Cipher block length + + /*Create a new 256 bit encryption key */ + if(symkey == NULL) { + rc = -1; + goto abort_egress; + } + tpm_get_extern_random_bytes(symkey, NVMKEYSZ); + + /*Setup initialization vector - random bits and then 4 bytes clear text size at the end*/ + temp = sizeof(UINT32); + ivlen = BLKSZ - temp; + tpm_get_extern_random_bytes(iv, ivlen); + ivptr = iv + ivlen; + tpm_marshal_UINT32(&ivptr, &temp, (UINT32) clear_len); + + /*The clear text needs to be padded out to a multiple of BLKSZ */ + mod = clear_len % BLKSZ; + clen = mod ? clear_len + BLKSZ - mod : clear_len; + clbuf = malloc(clen); + if (clbuf == NULL) { + rc = -1; + goto abort_egress; + } + memcpy(clbuf, clear, clear_len); + /* zero out the padding bits - FIXME: better / more secure way to handle these? */ + if(clen - clear_len) { + memset(clbuf + clear_len, 0, clen - clear_len); + } + + /* Setup the ciphertext buffer */ + *cipher_len = BLKSZ + clen; /*iv + ciphertext */ + cptr = *cipher = malloc(*cipher_len); + if (*cipher == NULL) { + rc = -1; + goto abort_egress; + } + + /* Copy the IV to cipher text blob*/ + memcpy(cptr, iv, BLKSZ); + cptr += BLKSZ; + + /* Setup encryption */ + aes_setkey_enc(&aes_ctx, symkey, 256); + + /* Do encryption now */ + aes_crypt_cbc(&aes_ctx, AES_ENCRYPT, clen, iv, clbuf, cptr); + + goto egress; +abort_egress: +egress: + free(clbuf); + return rc; +} +int decrypt_vtpmblk(uint8_t* cipher, size_t cipher_len, uint8_t** clear, size_t* clear_len, uint8_t* symkey) +{ + int rc = 0; + uint8_t iv[BLKSZ]; + uint8_t* ivptr; + UINT32 u32, temp; + aes_context aes_ctx; + + uint8_t* cptr = cipher; //cipher block pointer + int clen = cipher_len; //cipher block length + + /* Pull out the initialization vector */ + memcpy(iv, cipher, BLKSZ); + cptr += BLKSZ; + clen -= BLKSZ; + + /* Setup the clear text buffer */ + if((*clear = malloc(clen)) == NULL) { + rc = -1; + goto abort_egress; + } + + /* Get the length of clear text from last 4 bytes of iv */ + temp = sizeof(UINT32); + ivptr = iv + BLKSZ - temp; + tpm_unmarshal_UINT32(&ivptr, &temp, &u32); + *clear_len = u32; + + /* Setup decryption */ + aes_setkey_dec(&aes_ctx, symkey, 256); + + /* Do decryption now */ + if ((clen % BLKSZ) != 0) { + error("Decryption Error: Cipher block size was not a multiple of %u", BLKSZ); + rc = -1; + goto abort_egress; + } + aes_crypt_cbc(&aes_ctx, AES_DECRYPT, clen, iv, cptr, *clear); + + goto egress; +abort_egress: +egress: + return rc; +} + +int write_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length) { + int rc; + uint8_t* cipher = NULL; + size_t cipher_len = 0; + uint8_t hashkey[HASHKEYSZ]; + uint8_t* symkey = hashkey + HASHSZ; + + /* Encrypt the data */ + if((rc = encrypt_vtpmblk(data, data_length, &cipher, &cipher_len, symkey))) { + goto abort_egress; + } + /* Write to disk */ + if((rc = write_vtpmblk_raw(cipher, cipher_len))) { + goto abort_egress; + } + /* Get sha1 hash of data */ + sha1(cipher, cipher_len, hashkey); + + /* Send hash and key to manager */ + if((rc = VTPM_SaveHashKey(tpmfront_dev, hashkey, HASHKEYSZ)) != TPM_SUCCESS) { + goto abort_egress; + } + goto egress; +abort_egress: +egress: + free(cipher); + return rc; +} + +int read_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t *data_length) { + int rc; + uint8_t* cipher = NULL; + size_t cipher_len = 0; + size_t keysize; + uint8_t* hashkey = NULL; + uint8_t hash[HASHSZ]; + uint8_t* symkey; + + /* Retreive the hash and the key from the manager */ + if((rc = VTPM_LoadHashKey(tpmfront_dev, &hashkey, &keysize)) != TPM_SUCCESS) { + goto abort_egress; + } + if(keysize != HASHKEYSZ) { + error("Manager returned a hashkey of invalid size! expected %d, actual %d", NVMKEYSZ, keysize); + rc = -1; + goto abort_egress; + } + symkey = hashkey + HASHSZ; + + /* Read from disk now */ + if((rc = read_vtpmblk_raw(&cipher, &cipher_len))) { + goto abort_egress; + } + + /* Compute the hash of the cipher text and compare */ + sha1(cipher, cipher_len, hash); + if(memcmp(hash, hashkey, HASHSZ)) { + int i; + error("NVM Storage Checksum failed!"); + printf("Expected: "); + for(i = 0; i < HASHSZ; ++i) { + printf("%02hhX ", hashkey[i]); + } + printf("\n"); + printf("Actual: "); + for(i = 0; i < HASHSZ; ++i) { + printf("%02hhX ", hash[i]); + } + printf("\n"); + rc = -1; + goto abort_egress; + } + + /* Decrypt the blob */ + if((rc = decrypt_vtpmblk(cipher, cipher_len, data, data_length, symkey))) { + goto abort_egress; + } + goto egress; +abort_egress: +egress: + free(cipher); + free(hashkey); + return rc; +} diff --git a/stubdom/vtpm/vtpmblk.h b/stubdom/vtpm/vtpmblk.h new file mode 100644 index 0000000..282ce6a --- /dev/null +++ b/stubdom/vtpm/vtpmblk.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef NVM_H +#define NVM_H +#include +#include +#include + +#define NVMKEYSZ 32 +#define HASHSZ 20 +#define HASHKEYSZ (NVMKEYSZ + HASHSZ) + +int init_vtpmblk(struct tpmfront_dev* tpmfront_dev); +void shutdown_vtpmblk(void); + +/* Encrypts and writes data to blk device */ +int write_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t *data, size_t data_length); +/* Reads, Decrypts, and returns data from blk device */ +int read_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t **data, size_t *data_length); + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1V8-0005Yu-4F; Thu, 01 Nov 2012 20:36:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1V6-0005YK-4Z for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:28 +0000 Received: from [85.158.137.99:16199] by server-14.bemta-3.messagelabs.com id 7A/31-12788-B4DD2905; Thu, 01 Nov 2012 20:36:27 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-2.tower-217.messagelabs.com!1351802165!17261497!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD,UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1967 invoked from network); 1 Nov 2012 20:36:06 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-2.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:06 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031185; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:48 -0400 Message-Id: <1351802150-19258-2-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 7/9] add vtpm-stubdom code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add the code base for vtpm-stubdom to the stubdom heirarchy. Makefile changes in later patch. Signed-off-by: Matthew Fioravante diff --git a/stubdom/vtpm/Makefile b/stubdom/vtpm/Makefile new file mode 100644 index 0000000..686c0ea --- /dev/null +++ b/stubdom/vtpm/Makefile @@ -0,0 +1,37 @@ +# Copyright (c) 2010-2012 United States Government, as represented by +# the Secretary of Defense. All rights reserved. +# +# THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT +# ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES +# INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS +# FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY +# DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE +# SOFTWARE. +# + +XEN_ROOT=../.. + +PSSL_DIR=../polarssl-$(XEN_TARGET_ARCH)/library +PSSL_OBJS=aes.o sha1.o entropy.o ctr_drbg.o sha4.o + +TARGET=vtpm.a +OBJS=vtpm.o vtpm_cmd.o vtpmblk.o vtpm_pcrs.o + + +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/build +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/tpm +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH)/crypto +CPPFLAGS+=-I../tpm_emulator-$(XEN_TARGET_ARCH) + +$(TARGET): $(OBJS) + ar -cr $@ $(OBJS) $(TPMEMU_OBJS) $(foreach obj,$(PSSL_OBJS),$(PSSL_DIR)/$(obj)) + +$(OBJS): vtpm_manager.h + +vtpm_manager.h: + ln -s ../vtpmmgr/vtpm_manager.h vtpm_manager.h + +clean: + -rm $(TARGET) $(OBJS) vtpm_manager.h + +.PHONY: clean diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg new file mode 100644 index 0000000..31652ee --- /dev/null +++ b/stubdom/vtpm/minios.cfg @@ -0,0 +1,14 @@ +CONFIG_TPMFRONT=y +CONFIG_TPM_TIS=n +CONFIG_TPMBACK=y +CONFIG_START_NETWORK=n +CONFIG_TEST=n +CONFIG_PCIFRONT=n +CONFIG_BLKFRONT=y +CONFIG_NETFRONT=n +CONFIG_FBFRONT=n +CONFIG_KBDFRONT=n +CONFIG_CONSFRONT=n +CONFIG_XENBUS=y +CONFIG_LWIP=n +CONFIG_XC=n diff --git a/stubdom/vtpm/vtpm.c b/stubdom/vtpm/vtpm.c new file mode 100644 index 0000000..71aef78 --- /dev/null +++ b/stubdom/vtpm/vtpm.c @@ -0,0 +1,404 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "tpm/tpm_emulator_extern.h" +#include "tpm/tpm_marshalling.h" +#include "vtpm.h" +#include "vtpm_cmd.h" +#include "vtpm_pcrs.h" +#include "vtpmblk.h" + +#define TPM_LOG_INFO LOG_INFO +#define TPM_LOG_ERROR LOG_ERR +#define TPM_LOG_DEBUG LOG_DEBUG + +/* Global commandline options - default values */ +struct Opt_args opt_args = { + .startup = ST_CLEAR, + .loglevel = TPM_LOG_INFO, + .hwinitpcrs = VTPM_PCRNONE, + .tpmconf = 0, + .enable_maint_cmds = false, +}; + +static uint32_t badords[32]; +static unsigned int n_badords = 0; + +entropy_context entropy; +ctr_drbg_context ctr_drbg; + +struct tpmfront_dev* tpmfront_dev; + +void vtpm_get_extern_random_bytes(void *buf, size_t nbytes) +{ + ctr_drbg_random(&ctr_drbg, buf, nbytes); +} + +int vtpm_read_from_file(uint8_t **data, size_t *data_length) { + return read_vtpmblk(tpmfront_dev, data, data_length); +} + +int vtpm_write_to_file(uint8_t *data, size_t data_length) { + return write_vtpmblk(tpmfront_dev, data, data_length); +} + +int vtpm_extern_init_fake(void) { + return 0; +} + +void vtpm_extern_release_fake(void) { +} + + +void vtpm_log(int priority, const char *fmt, ...) +{ + if(opt_args.loglevel >= priority) { + va_list v; + va_start(v, fmt); + vprintf(fmt, v); + va_end(v); + } +} + +static uint64_t vtpm_get_ticks(void) +{ + static uint64_t old_t = 0; + uint64_t new_t, res_t; + struct timeval tv; + gettimeofday(&tv, NULL); + new_t = (uint64_t)tv.tv_sec * 1000000 + (uint64_t)tv.tv_usec; + res_t = (old_t > 0) ? new_t - old_t : 0; + old_t = new_t; + return res_t; +} + + +static int tpm_entropy_source(void* dummy, unsigned char* data, size_t len, size_t* olen) { + UINT32 sz = len; + TPM_RESULT rc = VTPM_GetRandom(tpmfront_dev, data, &sz); + *olen = sz; + return rc == TPM_SUCCESS ? 0 : POLARSSL_ERR_ENTROPY_SOURCE_FAILED; +} + +int init_random(void) { + /* Initialize the rng */ + entropy_init(&entropy); + entropy_add_source(&entropy, tpm_entropy_source, NULL, 0); + entropy_gather(&entropy); + ctr_drbg_init(&ctr_drbg, entropy_func, &entropy, NULL, 0); + ctr_drbg_set_prediction_resistance( &ctr_drbg, CTR_DRBG_PR_OFF ); + + return 0; +} + +int check_ordinal(tpmcmd_t* tpmcmd) { + TPM_COMMAND_CODE ord; + UINT32 len = 4; + BYTE* ptr; + unsigned int i; + + if(tpmcmd->req_len < 10) { + return true; + } + + ptr = tpmcmd->req + 6; + tpm_unmarshal_UINT32(&ptr, &len, &ord); + + for(i = 0; i < n_badords; ++i) { + if(ord == badords[i]) { + error("Disabled command ordinal (%" PRIu32") requested!\n"); + return false; + } + } + return true; +} + +static void main_loop(void) { + tpmcmd_t* tpmcmd = NULL; + domid_t domid; /* Domid of frontend */ + unsigned int handle; /* handle of frontend */ + int res = -1; + + info("VTPM Initializing\n"); + + /* Set required tpm config args */ + opt_args.tpmconf |= TPM_CONF_STRONG_PERSISTENCE; + opt_args.tpmconf &= ~TPM_CONF_USE_INTERNAL_PRNG; + opt_args.tpmconf |= TPM_CONF_GENERATE_EK; + opt_args.tpmconf |= TPM_CONF_GENERATE_SEED_DAA; + + /* Initialize the emulator */ + tpm_emulator_init(opt_args.startup, opt_args.tpmconf); + + /* Initialize any requested PCRs with hardware TPM values */ + if(vtpm_initialize_hw_pcrs(tpmfront_dev, opt_args.hwinitpcrs) != TPM_SUCCESS) { + error("Failed to initialize PCRs with hardware TPM values"); + goto abort_postpcrs; + } + + /* Wait for the frontend domain to connect */ + info("Waiting for frontend domain to connect.."); + if(tpmback_wait_for_frontend_connect(&domid, &handle) == 0) { + info("VTPM attached to Frontend %u/%u", (unsigned int) domid, handle); + } else { + error("Unable to attach to a frontend"); + } + + tpmcmd = tpmback_req(domid, handle); + while(tpmcmd) { + /* Handle the request */ + if(tpmcmd->req_len) { + tpmcmd->resp = NULL; + tpmcmd->resp_len = 0; + + /* First check for disabled ordinals */ + if(!check_ordinal(tpmcmd)) { + create_error_response(tpmcmd, TPM_BAD_ORDINAL); + } + /* If not disabled, do the command */ + else { + if((res = tpm_handle_command(tpmcmd->req, tpmcmd->req_len, &tpmcmd->resp, &tpmcmd->resp_len)) != 0) { + error("tpm_handle_command() failed"); + create_error_response(tpmcmd, TPM_FAIL); + } + } + } + + /* Send the response */ + tpmback_resp(tpmcmd); + + /* Wait for the next request */ + tpmcmd = tpmback_req(domid, handle); + + } + +abort_postpcrs: + info("VTPM Shutting down\n"); + + tpm_emulator_shutdown(); +} + +int parse_cmd_line(int argc, char** argv) +{ + char sval[25]; + char* logstr = NULL; + /* Parse the command strings */ + for(unsigned int i = 1; i < argc; ++i) { + if (sscanf(argv[i], "loglevel=%25s", sval) == 1){ + if (!strcmp(sval, "debug")) { + opt_args.loglevel = TPM_LOG_DEBUG; + logstr = "debug"; + } + else if (!strcmp(sval, "info")) { + logstr = "info"; + opt_args.loglevel = TPM_LOG_INFO; + } + else if (!strcmp(sval, "error")) { + logstr = "error"; + opt_args.loglevel = TPM_LOG_ERROR; + } + } + else if (!strcmp(argv[i], "clear")) { + opt_args.startup = ST_CLEAR; + } + else if (!strcmp(argv[i], "save")) { + opt_args.startup = ST_SAVE; + } + else if (!strcmp(argv[i], "deactivated")) { + opt_args.startup = ST_DEACTIVATED; + } + else if (!strncmp(argv[i], "maintcmds=", 10)) { + if(!strcmp(argv[i] + 10, "1")) { + opt_args.enable_maint_cmds = true; + } else if(!strcmp(argv[i] + 10, "0")) { + opt_args.enable_maint_cmds = false; + } + } + else if(!strncmp(argv[i], "hwinitpcr=", 10)) { + char *pch = argv[i] + 10; + unsigned int v1, v2; + pch = strtok(pch, ","); + while(pch != NULL) { + if(!strcmp(pch, "all")) { + //Set all + opt_args.hwinitpcrs = VTPM_PCRALL; + } else if(!strcmp(pch, "none")) { + //Set none + opt_args.hwinitpcrs = VTPM_PCRNONE; + } else if(sscanf(pch, "%u", &v1) == 1) { + //Set one + if(v1 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + opt_args.hwinitpcrs |= (1 << v1); + } else if(sscanf(pch, "%u-%u", &v1, &v2) == 2) { + //Set range + if(v1 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + if(v2 >= TPM_NUM_PCR) { + error("hwinitpcr error: Invalid PCR index %u", v1); + return -1; + } + if(v2 < v1) { + unsigned tp = v1; + v1 = v2; + v2 = tp; + } + for(unsigned int i = v1; i <= v2; ++i) { + opt_args.hwinitpcrs |= (1 << i); + } + } else { + error("hwintipcr error: Invalid PCR specification : %s", pch); + return -1; + } + pch = strtok(NULL, ","); + } + } + else { + error("Invalid command line option `%s'", argv[i]); + } + + } + + /* Check Errors and print results */ + switch(opt_args.startup) { + case ST_CLEAR: + info("Startup mode is `clear'"); + break; + case ST_SAVE: + info("Startup mode is `save'"); + break; + case ST_DEACTIVATED: + info("Startup mode is `deactivated'"); + break; + default: + error("Invalid startup mode %d", opt_args.startup); + return -1; + } + + if(opt_args.hwinitpcrs & (VTPM_PCRALL)) + { + char pcrstr[1024]; + char* ptr = pcrstr; + + pcrstr[0] = '\0'; + info("The following PCRs will be initialized with values from the hardware TPM:"); + for(unsigned int i = 0; i < TPM_NUM_PCR; ++i) { + if(opt_args.hwinitpcrs & (1 << i)) { + ptr += sprintf(ptr, "%u, ", i); + } + } + /* get rid of the last comma if any numbers were printed */ + *(ptr -2) = '\0'; + + info("\t%s", pcrstr); + } else { + info("All PCRs initialized to default values"); + } + + if(!opt_args.enable_maint_cmds) { + info("TPM Maintenance Commands disabled"); + badords[n_badords++] = TPM_ORD_CreateMaintenanceArchive; + badords[n_badords++] = TPM_ORD_LoadMaintenanceArchive; + badords[n_badords++] = TPM_ORD_KillMaintenanceFeature; + badords[n_badords++] = TPM_ORD_LoadManuMaintPub; + badords[n_badords++] = TPM_ORD_ReadManuMaintPub; + } else { + info("TPM Maintenance Commands enabled"); + } + + info("Log level set to %s", logstr); + + return 0; +} + +void cleanup_opt_args(void) { +} + +int main(int argc, char **argv) +{ + //FIXME: initializing blkfront without this sleep causes the domain to crash on boot + sleep(2); + + /* Setup extern function pointers */ + tpm_extern_init = vtpm_extern_init_fake; + tpm_extern_release = vtpm_extern_release_fake; + tpm_malloc = malloc; + tpm_free = free; + tpm_log = vtpm_log; + tpm_get_ticks = vtpm_get_ticks; + tpm_get_extern_random_bytes = vtpm_get_extern_random_bytes; + tpm_write_to_storage = vtpm_write_to_file; + tpm_read_from_storage = vtpm_read_from_file; + + info("starting TPM Emulator (1.2.%d.%d-%d)", VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD); + if(parse_cmd_line(argc, argv)) { + error("Error parsing commandline\n"); + return -1; + } + + /* Initialize devices */ + init_tpmback(); + if((tpmfront_dev = init_tpmfront(NULL)) == NULL) { + error("Unable to initialize tpmfront device"); + goto abort_posttpmfront; + } + + /* Seed the RNG with entropy from hardware TPM */ + if(init_random()) { + error("Unable to initialize RNG"); + goto abort_postrng; + } + + /* Initialize blkfront device */ + if(init_vtpmblk(tpmfront_dev)) { + error("Unable to initialize Blkfront persistent storage"); + goto abort_postvtpmblk; + } + + /* Run main loop */ + main_loop(); + + /* Shutdown blkfront */ + shutdown_vtpmblk(); +abort_postvtpmblk: +abort_postrng: + + /* Close devices */ + shutdown_tpmfront(tpmfront_dev); +abort_posttpmfront: + shutdown_tpmback(); + + cleanup_opt_args(); + + return 0; +} diff --git a/stubdom/vtpm/vtpm.h b/stubdom/vtpm/vtpm.h new file mode 100644 index 0000000..5919e44 --- /dev/null +++ b/stubdom/vtpm/vtpm.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef VTPM_H +#define VTPM_H + +#include + +/* For testing */ +#define VERS_CMD "\x00\xC1\x00\x00\x00\x16\x00\x00\x00\x65\x00\x00\x00\x05\x00\x00\x00\x04\x00\x00\x01\x03" +#define VERS_CMD_LEN 22 + +/* Global commandline options */ +struct Opt_args { + enum StartUp { + ST_CLEAR = 1, + ST_SAVE = 2, + ST_DEACTIVATED = 3 + } startup; + unsigned long hwinitpcrs; + int loglevel; + uint32_t tpmconf; + bool enable_maint_cmds; +}; +extern struct Opt_args opt_args; + +#endif diff --git a/stubdom/vtpm/vtpm_cmd.c b/stubdom/vtpm/vtpm_cmd.c new file mode 100644 index 0000000..7eae98b --- /dev/null +++ b/stubdom/vtpm/vtpm_cmd.c @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include "tpm/tpm_marshalling.h" +#include "vtpm_manager.h" +#include "vtpm_cmd.h" +#include + +#define TRYFAILGOTO(C) \ + if((C)) { \ + status = TPM_FAIL; \ + goto abort_egress; \ + } +#define TRYFAILGOTOMSG(C, msg) \ + if((C)) { \ + status = TPM_FAIL; \ + error(msg); \ + goto abort_egress; \ + } +#define CHECKSTATUSGOTO(ret, fname) \ + if((ret) != TPM_SUCCESS) { \ + error("%s failed with error code (%lu)", fname, (unsigned long) ret); \ + status = ord; \ + goto abort_egress; \ + } + +#define ERR_MALFORMED "Malformed response from backend" +#define ERR_TPMFRONT "Error sending command through frontend device" + +struct shpage { + void* page; + grant_ref_t grantref; +}; + +typedef struct shpage shpage_t; + +static inline int pack_header(uint8_t** bptr, UINT32* len, TPM_TAG tag, UINT32 size, TPM_COMMAND_CODE ord) +{ + return *bptr == NULL || + tpm_marshal_UINT16(bptr, len, tag) || + tpm_marshal_UINT32(bptr, len, size) || + tpm_marshal_UINT32(bptr, len, ord); +} + +static inline int unpack_header(uint8_t** bptr, UINT32* len, TPM_TAG* tag, UINT32* size, TPM_COMMAND_CODE* ord) +{ + return *bptr == NULL || + tpm_unmarshal_UINT16(bptr, len, tag) || + tpm_unmarshal_UINT32(bptr, len, size) || + tpm_unmarshal_UINT32(bptr, len, ord); +} + +int create_error_response(tpmcmd_t* tpmcmd, TPM_RESULT errorcode) +{ + TPM_TAG tag; + UINT32 len = tpmcmd->req_len; + uint8_t* respptr; + uint8_t* cmdptr = tpmcmd->req; + + if(!tpm_unmarshal_UINT16(&cmdptr, &len, &tag)) { + switch (tag) { + case TPM_TAG_RQU_COMMAND: + tag = TPM_TAG_RSP_COMMAND; + break; + case TPM_TAG_RQU_AUTH1_COMMAND: + tag = TPM_TAG_RQU_AUTH2_COMMAND; + break; + case TPM_TAG_RQU_AUTH2_COMMAND: + tag = TPM_TAG_RQU_AUTH2_COMMAND; + break; + } + } else { + tag = TPM_TAG_RSP_COMMAND; + } + + tpmcmd->resp_len = len = 10; + tpmcmd->resp = respptr = tpm_malloc(tpmcmd->resp_len); + + return pack_header(&respptr, &len, tag, len, errorcode); +} + +TPM_RESULT VTPM_GetRandom(struct tpmfront_dev* tpmfront_dev, BYTE* bytes, UINT32 *numbytes) { + TPM_RESULT status = TPM_SUCCESS; + uint8_t* cmdbuf, *resp, *bptr; + size_t resplen = 0; + UINT32 len; + + /*Ask the real tpm for random bytes for the seed */ + TPM_TAG tag = TPM_TAG_RQU_COMMAND; + UINT32 size; + TPM_COMMAND_CODE ord = TPM_ORD_GetRandom; + len = size = sizeof(TPM_TAG) + sizeof(UINT32) + sizeof(TPM_COMMAND_CODE) + sizeof(UINT32); + + /*Create the raw tpm command */ + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + TRYFAILGOTO(tpm_marshal_UINT32(&bptr, &len, *numbytes)); + + /* Send cmd, wait for response */ + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), + ERR_TPMFRONT); + + bptr = resp; len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + //Check return status of command + CHECKSTATUSGOTO(ord, "TPM_GetRandom()"); + + // Get the number of random bytes in the response + TRYFAILGOTOMSG(tpm_unmarshal_UINT32(&bptr, &len, &size), ERR_MALFORMED); + *numbytes = size; + + //Get the random bytes out, tpm may give us less bytes than what we wanrt + TRYFAILGOTOMSG(tpm_unmarshal_BYTE_ARRAY(&bptr, &len, bytes, *numbytes), ERR_MALFORMED); + + goto egress; +abort_egress: +egress: + free(cmdbuf); + return status; + +} + +TPM_RESULT VTPM_LoadHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t* data_length) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t* bptr, *resp; + uint8_t* cmdbuf = NULL; + size_t resplen = 0; + UINT32 len; + + TPM_TAG tag = VTPM_TAG_REQ; + UINT32 size; + TPM_COMMAND_CODE ord = VTPM_ORD_LOADHASHKEY; + + /*Create the command*/ + len = size = VTPM_COMMAND_HEADER_SIZE; + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + + /* Send the command to vtpm_manager */ + info("Requesting Encryption key from backend"); + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + /* Unpack response header */ + bptr = resp; + len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + /* Check return code */ + CHECKSTATUSGOTO(ord, "VTPM_LoadHashKey()"); + + /* Get the size of the key */ + *data_length = size - VTPM_COMMAND_HEADER_SIZE; + + /* Copy the key bits */ + *data = malloc(*data_length); + memcpy(*data, bptr, *data_length); + + goto egress; +abort_egress: + error("VTPM_LoadHashKey failed"); +egress: + free(cmdbuf); + return status; +} + +TPM_RESULT VTPM_SaveHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t* bptr, *resp; + uint8_t* cmdbuf = NULL; + size_t resplen = 0; + UINT32 len; + + TPM_TAG tag = VTPM_TAG_REQ; + UINT32 size; + TPM_COMMAND_CODE ord = VTPM_ORD_SAVEHASHKEY; + + /*Create the command*/ + len = size = VTPM_COMMAND_HEADER_SIZE + data_length; + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + memcpy(bptr, data, data_length); + bptr += data_length; + + /* Send the command to vtpm_manager */ + info("Sending encryption key to backend"); + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + /* Unpack response header */ + bptr = resp; + len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + /* Check return code */ + CHECKSTATUSGOTO(ord, "VTPM_SaveHashKey()"); + + goto egress; +abort_egress: + error("VTPM_SaveHashKey failed"); +egress: + free(cmdbuf); + return status; +} + +TPM_RESULT VTPM_PCRRead(struct tpmfront_dev* tpmfront_dev, UINT32 pcrIndex, BYTE* outDigest) +{ + TPM_RESULT status = TPM_SUCCESS; + uint8_t *cmdbuf, *resp, *bptr; + size_t resplen = 0; + UINT32 len; + + /*Just send a TPM_PCRRead Command to the HW tpm */ + TPM_TAG tag = TPM_TAG_RQU_COMMAND; + UINT32 size; + TPM_COMMAND_CODE ord = TPM_ORD_PCRRead; + len = size = sizeof(TPM_TAG) + sizeof(UINT32) + sizeof(TPM_COMMAND_CODE) + sizeof(UINT32); + + /*Create the raw tpm cmd */ + bptr = cmdbuf = malloc(size); + TRYFAILGOTO(pack_header(&bptr, &len, tag, size, ord)); + TRYFAILGOTO(tpm_marshal_UINT32(&bptr, &len, pcrIndex)); + + /*Send Cmd wait for response */ + TRYFAILGOTOMSG(tpmfront_cmd(tpmfront_dev, cmdbuf, size, &resp, &resplen), ERR_TPMFRONT); + + bptr = resp; len = resplen; + TRYFAILGOTOMSG(unpack_header(&bptr, &len, &tag, &size, &ord), ERR_MALFORMED); + + //Check return status of command + CHECKSTATUSGOTO(ord, "TPM_PCRRead"); + + //Get the ptr value + memcpy(outDigest, bptr, sizeof(TPM_PCRVALUE)); + + goto egress; +abort_egress: +egress: + free(cmdbuf); + return status; + +} diff --git a/stubdom/vtpm/vtpm_cmd.h b/stubdom/vtpm/vtpm_cmd.h new file mode 100644 index 0000000..b0bfa22 --- /dev/null +++ b/stubdom/vtpm/vtpm_cmd.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef MANAGER_H +#define MANAGER_H + +#include +#include +#include "tpm/tpm_structures.h" + +/* Create a command response error header */ +int create_error_response(tpmcmd_t* tpmcmd, TPM_RESULT errorcode); +/* Request random bytes from hardware tpm, returns 0 on success */ +TPM_RESULT VTPM_GetRandom(struct tpmfront_dev* tpmfront_dev, BYTE* bytes, UINT32* numbytes); +/* Retreive 256 bit AES encryption key from manager */ +TPM_RESULT VTPM_LoadHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t* data_length); +/* Manager securely saves our 256 bit AES encryption key */ +TPM_RESULT VTPM_SaveHashKey(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length); +/* Send a TPM_PCRRead command passthrough the manager to the hw tpm */ +TPM_RESULT VTPM_PCRRead(struct tpmfront_dev* tpmfront_dev, UINT32 pcrIndex, BYTE* outDigest); + +#endif diff --git a/stubdom/vtpm/vtpm_pcrs.c b/stubdom/vtpm/vtpm_pcrs.c new file mode 100644 index 0000000..22a6cef --- /dev/null +++ b/stubdom/vtpm/vtpm_pcrs.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include "vtpm_pcrs.h" +#include "vtpm_cmd.h" +#include "tpm/tpm_data.h" + +#define PCR_VALUE tpmData.permanent.data.pcrValue + +static int write_pcr_direct(unsigned int pcrIndex, uint8_t* val) { + if(pcrIndex > TPM_NUM_PCR) { + return TPM_BADINDEX; + } + memcpy(&PCR_VALUE[pcrIndex], val, sizeof(TPM_PCRVALUE)); + return TPM_SUCCESS; +} + +TPM_RESULT vtpm_initialize_hw_pcrs(struct tpmfront_dev* tpmfront_dev, unsigned long pcrs) +{ + TPM_RESULT rc = TPM_SUCCESS; + uint8_t digest[sizeof(TPM_PCRVALUE)]; + + for(unsigned int i = 0; i < TPM_NUM_PCR; ++i) { + if(pcrs & 1 << i) { + if((rc = VTPM_PCRRead(tpmfront_dev, i, digest)) != TPM_SUCCESS) { + error("TPM_PCRRead failed with error : %d", rc); + return rc; + } + write_pcr_direct(i, digest); + } + } + + return rc; +} diff --git a/stubdom/vtpm/vtpm_pcrs.h b/stubdom/vtpm/vtpm_pcrs.h new file mode 100644 index 0000000..11835f9 --- /dev/null +++ b/stubdom/vtpm/vtpm_pcrs.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef VTPM_PCRS_H +#define VTPM_PCRS_H + +#include "tpm/tpm_structures.h" + +#define VTPM_PCR0 1 +#define VTPM_PCR1 1 << 1 +#define VTPM_PCR2 1 << 2 +#define VTPM_PCR3 1 << 3 +#define VTPM_PCR4 1 << 4 +#define VTPM_PCR5 1 << 5 +#define VTPM_PCR6 1 << 6 +#define VTPM_PCR7 1 << 7 +#define VTPM_PCR8 1 << 8 +#define VTPM_PCR9 1 << 9 +#define VTPM_PCR10 1 << 10 +#define VTPM_PCR11 1 << 11 +#define VTPM_PCR12 1 << 12 +#define VTPM_PCR13 1 << 13 +#define VTPM_PCR14 1 << 14 +#define VTPM_PCR15 1 << 15 +#define VTPM_PCR16 1 << 16 +#define VTPM_PCR17 1 << 17 +#define VTPM_PCR18 1 << 18 +#define VTPM_PCR19 1 << 19 +#define VTPM_PCR20 1 << 20 +#define VTPM_PCR21 1 << 21 +#define VTPM_PCR22 1 << 22 +#define VTPM_PCR23 1 << 23 + +#define VTPM_PCRALL (1 << TPM_NUM_PCR) - 1 +#define VTPM_PCRNONE 0 + +#define VTPM_NUMPCRS 24 + +struct tpmfront_dev; + +TPM_RESULT vtpm_initialize_hw_pcrs(struct tpmfront_dev* tpmfront_dev, unsigned long pcrs); + + +#endif diff --git a/stubdom/vtpm/vtpmblk.c b/stubdom/vtpm/vtpmblk.c new file mode 100644 index 0000000..b343bd8 --- /dev/null +++ b/stubdom/vtpm/vtpmblk.c @@ -0,0 +1,307 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#include +#include "vtpmblk.h" +#include "tpm/tpm_marshalling.h" +#include "vtpm_cmd.h" +#include "polarssl/aes.h" +#include "polarssl/sha1.h" +#include +#include +#include +#include + +/*Encryption key and block sizes */ +#define BLKSZ 16 + +static struct blkfront_dev* blkdev = NULL; +static int blkfront_fd = -1; + +int init_vtpmblk(struct tpmfront_dev* tpmfront_dev) +{ + struct blkfront_info blkinfo; + info("Initializing persistent NVM storage\n"); + + if((blkdev = init_blkfront(NULL, &blkinfo)) == NULL) { + error("BLKIO: ERROR Unable to initialize blkfront"); + return -1; + } + if (blkinfo.info & VDISK_READONLY || blkinfo.mode != O_RDWR) { + error("BLKIO: ERROR block device is read only!"); + goto error; + } + if((blkfront_fd = blkfront_open(blkdev)) == -1) { + error("Unable to open blkfront file descriptor!"); + goto error; + } + + return 0; +error: + shutdown_blkfront(blkdev); + blkdev = NULL; + return -1; +} + +void shutdown_vtpmblk(void) +{ + close(blkfront_fd); + blkfront_fd = -1; + blkdev = NULL; +} + +int write_vtpmblk_raw(uint8_t *data, size_t data_length) +{ + int rc; + uint32_t lenbuf; + debug("Begin Write data=%p len=%u", data, data_length); + + lenbuf = cpu_to_be32((uint32_t)data_length); + + lseek(blkfront_fd, 0, SEEK_SET); + if((rc = write(blkfront_fd, (uint8_t*)&lenbuf, 4)) != 4) { + error("write(length) failed! error was %s", strerror(errno)); + return -1; + } + if((rc = write(blkfront_fd, data, data_length)) != data_length) { + error("write(data) failed! error was %s", strerror(errno)); + return -1; + } + + info("Wrote %u bytes to NVM persistent storage", data_length); + + return 0; +} + +int read_vtpmblk_raw(uint8_t **data, size_t *data_length) +{ + int rc; + uint32_t lenbuf; + + lseek(blkfront_fd, 0, SEEK_SET); + if(( rc = read(blkfront_fd, (uint8_t*)&lenbuf, 4)) != 4) { + error("read(length) failed! error was %s", strerror(errno)); + return -1; + } + *data_length = (size_t) cpu_to_be32(lenbuf); + if(*data_length == 0) { + error("read 0 data_length for NVM"); + return -1; + } + + *data = tpm_malloc(*data_length); + if((rc = read(blkfront_fd, *data, *data_length)) != *data_length) { + error("read(data) failed! error was %s", strerror(errno)); + return -1; + } + + info("Read %u bytes from NVM persistent storage", *data_length); + return 0; +} + +int encrypt_vtpmblk(uint8_t* clear, size_t clear_len, uint8_t** cipher, size_t* cipher_len, uint8_t* symkey) +{ + int rc = 0; + uint8_t iv[BLKSZ]; + aes_context aes_ctx; + UINT32 temp; + int mod; + + uint8_t* clbuf = NULL; + + uint8_t* ivptr; + int ivlen; + + uint8_t* cptr; //Cipher block pointer + int clen; //Cipher block length + + /*Create a new 256 bit encryption key */ + if(symkey == NULL) { + rc = -1; + goto abort_egress; + } + tpm_get_extern_random_bytes(symkey, NVMKEYSZ); + + /*Setup initialization vector - random bits and then 4 bytes clear text size at the end*/ + temp = sizeof(UINT32); + ivlen = BLKSZ - temp; + tpm_get_extern_random_bytes(iv, ivlen); + ivptr = iv + ivlen; + tpm_marshal_UINT32(&ivptr, &temp, (UINT32) clear_len); + + /*The clear text needs to be padded out to a multiple of BLKSZ */ + mod = clear_len % BLKSZ; + clen = mod ? clear_len + BLKSZ - mod : clear_len; + clbuf = malloc(clen); + if (clbuf == NULL) { + rc = -1; + goto abort_egress; + } + memcpy(clbuf, clear, clear_len); + /* zero out the padding bits - FIXME: better / more secure way to handle these? */ + if(clen - clear_len) { + memset(clbuf + clear_len, 0, clen - clear_len); + } + + /* Setup the ciphertext buffer */ + *cipher_len = BLKSZ + clen; /*iv + ciphertext */ + cptr = *cipher = malloc(*cipher_len); + if (*cipher == NULL) { + rc = -1; + goto abort_egress; + } + + /* Copy the IV to cipher text blob*/ + memcpy(cptr, iv, BLKSZ); + cptr += BLKSZ; + + /* Setup encryption */ + aes_setkey_enc(&aes_ctx, symkey, 256); + + /* Do encryption now */ + aes_crypt_cbc(&aes_ctx, AES_ENCRYPT, clen, iv, clbuf, cptr); + + goto egress; +abort_egress: +egress: + free(clbuf); + return rc; +} +int decrypt_vtpmblk(uint8_t* cipher, size_t cipher_len, uint8_t** clear, size_t* clear_len, uint8_t* symkey) +{ + int rc = 0; + uint8_t iv[BLKSZ]; + uint8_t* ivptr; + UINT32 u32, temp; + aes_context aes_ctx; + + uint8_t* cptr = cipher; //cipher block pointer + int clen = cipher_len; //cipher block length + + /* Pull out the initialization vector */ + memcpy(iv, cipher, BLKSZ); + cptr += BLKSZ; + clen -= BLKSZ; + + /* Setup the clear text buffer */ + if((*clear = malloc(clen)) == NULL) { + rc = -1; + goto abort_egress; + } + + /* Get the length of clear text from last 4 bytes of iv */ + temp = sizeof(UINT32); + ivptr = iv + BLKSZ - temp; + tpm_unmarshal_UINT32(&ivptr, &temp, &u32); + *clear_len = u32; + + /* Setup decryption */ + aes_setkey_dec(&aes_ctx, symkey, 256); + + /* Do decryption now */ + if ((clen % BLKSZ) != 0) { + error("Decryption Error: Cipher block size was not a multiple of %u", BLKSZ); + rc = -1; + goto abort_egress; + } + aes_crypt_cbc(&aes_ctx, AES_DECRYPT, clen, iv, cptr, *clear); + + goto egress; +abort_egress: +egress: + return rc; +} + +int write_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t* data, size_t data_length) { + int rc; + uint8_t* cipher = NULL; + size_t cipher_len = 0; + uint8_t hashkey[HASHKEYSZ]; + uint8_t* symkey = hashkey + HASHSZ; + + /* Encrypt the data */ + if((rc = encrypt_vtpmblk(data, data_length, &cipher, &cipher_len, symkey))) { + goto abort_egress; + } + /* Write to disk */ + if((rc = write_vtpmblk_raw(cipher, cipher_len))) { + goto abort_egress; + } + /* Get sha1 hash of data */ + sha1(cipher, cipher_len, hashkey); + + /* Send hash and key to manager */ + if((rc = VTPM_SaveHashKey(tpmfront_dev, hashkey, HASHKEYSZ)) != TPM_SUCCESS) { + goto abort_egress; + } + goto egress; +abort_egress: +egress: + free(cipher); + return rc; +} + +int read_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t** data, size_t *data_length) { + int rc; + uint8_t* cipher = NULL; + size_t cipher_len = 0; + size_t keysize; + uint8_t* hashkey = NULL; + uint8_t hash[HASHSZ]; + uint8_t* symkey; + + /* Retreive the hash and the key from the manager */ + if((rc = VTPM_LoadHashKey(tpmfront_dev, &hashkey, &keysize)) != TPM_SUCCESS) { + goto abort_egress; + } + if(keysize != HASHKEYSZ) { + error("Manager returned a hashkey of invalid size! expected %d, actual %d", NVMKEYSZ, keysize); + rc = -1; + goto abort_egress; + } + symkey = hashkey + HASHSZ; + + /* Read from disk now */ + if((rc = read_vtpmblk_raw(&cipher, &cipher_len))) { + goto abort_egress; + } + + /* Compute the hash of the cipher text and compare */ + sha1(cipher, cipher_len, hash); + if(memcmp(hash, hashkey, HASHSZ)) { + int i; + error("NVM Storage Checksum failed!"); + printf("Expected: "); + for(i = 0; i < HASHSZ; ++i) { + printf("%02hhX ", hashkey[i]); + } + printf("\n"); + printf("Actual: "); + for(i = 0; i < HASHSZ; ++i) { + printf("%02hhX ", hash[i]); + } + printf("\n"); + rc = -1; + goto abort_egress; + } + + /* Decrypt the blob */ + if((rc = decrypt_vtpmblk(cipher, cipher_len, data, data_length, symkey))) { + goto abort_egress; + } + goto egress; +abort_egress: +egress: + free(cipher); + free(hashkey); + return rc; +} diff --git a/stubdom/vtpm/vtpmblk.h b/stubdom/vtpm/vtpmblk.h new file mode 100644 index 0000000..282ce6a --- /dev/null +++ b/stubdom/vtpm/vtpmblk.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2012 United States Government, as represented by + * the Secretary of Defense. All rights reserved. + * + * THIS SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED AS IS AND WITHOUT + * ANY EXPRESS OR IMPLIED WARRANTIES WHATSOEVER. ALL WARRANTIES + * INCLUDING, BUT NOT LIMITED TO, PERFORMANCE, MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE HEREBY + * DISCLAIMED. USERS ASSUME THE ENTIRE RISK AND LIABILITY OF USING THE + * SOFTWARE. + */ + +#ifndef NVM_H +#define NVM_H +#include +#include +#include + +#define NVMKEYSZ 32 +#define HASHSZ 20 +#define HASHKEYSZ (NVMKEYSZ + HASHSZ) + +int init_vtpmblk(struct tpmfront_dev* tpmfront_dev); +void shutdown_vtpmblk(void); + +/* Encrypts and writes data to blk device */ +int write_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t *data, size_t data_length); +/* Reads, Decrypts, and returns data from blk device */ +int read_vtpmblk(struct tpmfront_dev* tpmfront_dev, uint8_t **data, size_t *data_length); + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:36:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1VF-0005c2-Oo; Thu, 01 Nov 2012 20:36:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1VE-0005bQ-Jw for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:36 +0000 Received: from [193.109.254.147:54834] by server-12.bemta-14.messagelabs.com id 7A/51-00510-35DD2905; Thu, 01 Nov 2012 20:36:35 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-11.tower-27.messagelabs.com!1351802192!2496558!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15453 invoked from network); 1 Nov 2012 20:36:34 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:34 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031245; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:50 -0400 Message-Id: <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add 3 new libraries to stubdom: libgmp polarssl Berlios TPM Emulator 0.7.4 Also adds makefile structure for vtpm-stubdom and vtpmmgrdom Signed-off-by: Matthew Fioravante diff --git a/stubdom/Makefile b/stubdom/Makefile index 50ba360..96801b2 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -31,6 +31,18 @@ GRUB_VERSION=0.97 OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 OCAML_VERSION=3.11.0 +GMP_VERSION=4.3.2 +#GMP_URL?=$(XEN_EXTFILES_URL) +GMP_URL?=ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) + +POLARSSL_VERSION=1.1.4 +#POLARSSL_URL?=$(XEN_EXTFILES_URL) +POLARSSL_URL?=http://polarssl.org/code/releases + +TPMEMU_VERSION=0.7.4 +#TPMEMU_URL?=$(XEN_EXTFILES_URL) +TPMEMU_URL?=http://download.berlios.de/tpm-emulator + WGET=wget -c GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) @@ -74,12 +86,12 @@ TARGET_CPPFLAGS += -I$(XEN_ROOT)/xen/include TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib -TARGETS=ioemu c caml grub xenstore +TARGETS=ioemu c caml grub xenstore vtpm vtpmmgr .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom +build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom vtpm-stubdom vtpmmgrdom else build: genpath endif @@ -176,6 +188,76 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz touch $@ ############# +# cross-gmp +############# +gmp-$(GMP_VERSION).tar.bz2: + $(WGET) $(GMP_URL)/$@ + +.PHONY: cross-gmp +ifeq ($(XEN_TARGET_ARCH), x86_32) + GMPEXT=ABI=32 +endif +gmp-$(XEN_TARGET_ARCH): gmp-$(GMP_VERSION).tar.bz2 $(NEWLIB_STAMPFILE) + tar xjf $< + mv gmp-$(GMP_VERSION) $@ + #patch -d $@ -p0 < gmp.patch + cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf + sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@/config.h + touch $@ + +GMP_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libgmp.a +cross-gmp: $(GMP_STAMPFILE) +$(GMP_STAMPFILE): gmp-$(XEN_TARGET_ARCH) + ( cd $< && \ + $(MAKE) && \ + $(MAKE) install ) + +############# +# cross-polarssl +############# +polarssl-$(POLARSSL_VERSION)-gpl.tgz: + $(WGET) $(POLARSSL_URL)/$@ + +polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz + tar xzf $< + mv polarssl-$(POLARSSL_VERSION) $@ + patch -d $@ -p1 < polarssl.patch + touch $@ + +POLARSSL_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libpolarssl.a +cross-polarssl: $(POLARSSL_STAMPFILE) +$(POLARSSL_STAMPFILE): polarssl-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) lwip-$(XEN_TARGET_ARCH) + ( cd $ Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:36:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1VF-0005c2-Oo; Thu, 01 Nov 2012 20:36:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1VE-0005bQ-Jw for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:36 +0000 Received: from [193.109.254.147:54834] by server-12.bemta-14.messagelabs.com id 7A/51-00510-35DD2905; Thu, 01 Nov 2012 20:36:35 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-11.tower-27.messagelabs.com!1351802192!2496558!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15453 invoked from network); 1 Nov 2012 20:36:34 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:34 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031245; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:50 -0400 Message-Id: <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Add 3 new libraries to stubdom: libgmp polarssl Berlios TPM Emulator 0.7.4 Also adds makefile structure for vtpm-stubdom and vtpmmgrdom Signed-off-by: Matthew Fioravante diff --git a/stubdom/Makefile b/stubdom/Makefile index 50ba360..96801b2 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -31,6 +31,18 @@ GRUB_VERSION=0.97 OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 OCAML_VERSION=3.11.0 +GMP_VERSION=4.3.2 +#GMP_URL?=$(XEN_EXTFILES_URL) +GMP_URL?=ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) + +POLARSSL_VERSION=1.1.4 +#POLARSSL_URL?=$(XEN_EXTFILES_URL) +POLARSSL_URL?=http://polarssl.org/code/releases + +TPMEMU_VERSION=0.7.4 +#TPMEMU_URL?=$(XEN_EXTFILES_URL) +TPMEMU_URL?=http://download.berlios.de/tpm-emulator + WGET=wget -c GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) @@ -74,12 +86,12 @@ TARGET_CPPFLAGS += -I$(XEN_ROOT)/xen/include TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib -TARGETS=ioemu c caml grub xenstore +TARGETS=ioemu c caml grub xenstore vtpm vtpmmgr .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom +build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom vtpm-stubdom vtpmmgrdom else build: genpath endif @@ -176,6 +188,76 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz touch $@ ############# +# cross-gmp +############# +gmp-$(GMP_VERSION).tar.bz2: + $(WGET) $(GMP_URL)/$@ + +.PHONY: cross-gmp +ifeq ($(XEN_TARGET_ARCH), x86_32) + GMPEXT=ABI=32 +endif +gmp-$(XEN_TARGET_ARCH): gmp-$(GMP_VERSION).tar.bz2 $(NEWLIB_STAMPFILE) + tar xjf $< + mv gmp-$(GMP_VERSION) $@ + #patch -d $@ -p0 < gmp.patch + cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf + sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@/config.h + touch $@ + +GMP_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libgmp.a +cross-gmp: $(GMP_STAMPFILE) +$(GMP_STAMPFILE): gmp-$(XEN_TARGET_ARCH) + ( cd $< && \ + $(MAKE) && \ + $(MAKE) install ) + +############# +# cross-polarssl +############# +polarssl-$(POLARSSL_VERSION)-gpl.tgz: + $(WGET) $(POLARSSL_URL)/$@ + +polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz + tar xzf $< + mv polarssl-$(POLARSSL_VERSION) $@ + patch -d $@ -p1 < polarssl.patch + touch $@ + +POLARSSL_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libpolarssl.a +cross-polarssl: $(POLARSSL_STAMPFILE) +$(POLARSSL_STAMPFILE): polarssl-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) lwip-$(XEN_TARGET_ARCH) + ( cd $ Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:40:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Yp-0006KW-H7; Thu, 01 Nov 2012 20:40:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Uv-0005Uu-Ke for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:18 +0000 Received: from [193.109.254.147:12184] by server-13.bemta-14.messagelabs.com id F9/98-11239-04DD2905; Thu, 01 Nov 2012 20:36:16 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-27.messagelabs.com!1351802168!8576896!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22623 invoked from network); 1 Nov 2012 20:36:10 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:10 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031182; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:47 -0400 Message-Id: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 X-Mailman-Approved-At: Thu, 01 Nov 2012 20:40:18 +0000 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Remove the old vtpm process model. It doesn't work very well and is no longer supported. Signed-off-by: Matthew Fioravante diff --git a/tools/Makefile b/tools/Makefile index d8c8cc0..2ca43b9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager -SUBDIRS-$(VTPM_TOOLS) += vtpm SUBDIRS-y += xenstat SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) SUBDIRS-$(CONFIG_Linux) += memshr diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c index 631306b..90a6b85 100644 --- a/tools/blktap2/drivers/hashtable.c +++ b/tools/blktap2/drivers/hashtable.c @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable.c - * - tools/vtpm_manager/util/hashtable.c */ #include "hashtable.h" diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h index 89aa3dc..56ca053 100644 --- a/tools/blktap2/drivers/hashtable.h +++ b/tools/blktap2/drivers/hashtable.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable.h - * - tools/vtpm_manager/util/hashtable.h */ #ifndef __HASHTABLE_CWC22_H__ diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c index 402e06b..731917c 100644 --- a/tools/blktap2/drivers/hashtable_itr.c +++ b/tools/blktap2/drivers/hashtable_itr.c @@ -1,10 +1,5 @@ /* Copyright (C) 2002, 2004 Christopher Clark */ -/* - * There are duplicates of this code in: - * - tools/vtpm_manager/util/hashtable_itr.c - */ - #include "hashtable.h" #include "hashtable_private.h" #include "hashtable_itr.h" diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h index 3d80638..81da838 100644 --- a/tools/blktap2/drivers/hashtable_itr.h +++ b/tools/blktap2/drivers/hashtable_itr.h @@ -1,10 +1,5 @@ /* Copyright (C) 2002, 2004 Christopher Clark */ -/* - * There are duplicates of this code in: - * - tools/vtpm_manager/util/hashtable_itr.h - */ - #ifndef __HASHTABLE_ITR_CWC22__ #define __HASHTABLE_ITR_CWC22__ #include "hashtable.h" diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h index 5a13a65..954ecc3 100644 --- a/tools/blktap2/drivers/hashtable_private.h +++ b/tools/blktap2/drivers/hashtable_private.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable_private.h - * - tools/vtpm_manager/util/hashtable_private.h */ #ifndef __HASHTABLE_PRIVATE_CWC22_H__ diff --git a/tools/configure.ac b/tools/configure.ac index e708f01..586313d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) diff --git a/tools/examples/README b/tools/examples/README index 5b0314e..2225d5c 100644 --- a/tools/examples/README +++ b/tools/examples/README @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode vif-common.sh - sourced by vif-bridge vif-nat - xen virtual network start/stop script in NAT mode vif-route - xen virtual network start/stop script in routed mode -vtpm - called by xen-backend.agent to bind/unbind vTPM devices -vtpm-common.sh - common code for vTPM handling -vtpm-delete - remove an entry from the vTPM table given the - domain's name -vtpm-hotplug-common.sh - sourced by vtpm -vtpm-migration.sh - sourced by external-device-migrate -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug devices xen-backend.rules - hotplug script rules xend-config.sxp - default xend configuration file diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub index 85f847c..e04e6c1 100644 --- a/tools/examples/xmexample.pv-grub +++ b/tools/examples/xmexample.pv-grub @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = [ 'instance=1,backend=0' ] - -#---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' # for a domain to stop: poweroff, reboot, and crash. For each of these you # may specify: diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 index 330aaf0..c951200 100644 --- a/tools/examples/xmexample1 +++ b/tools/examples/xmexample1 @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = [ 'instance=1,backend=0' ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 index 4e5eb3d..8c5137e 100644 --- a/tools/examples/xmexample2 +++ b/tools/examples/xmexample2 @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = ['instance=%d,backend=0' % (vmid) ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 index dc22ce1..ae799f9 100644 --- a/tools/examples/xmexample3 +++ b/tools/examples/xmexample3 @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = ['instance=%d,backend=0' % (vmid) ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 0166790..0605559 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd XEN_SCRIPTS += blktap -XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl +XEN_SCRIPT_DATA += block-common.sh UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules xend.rules diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm deleted file mode 100644 index 38a4532..0000000 --- a/tools/hotplug/Linux/vtpm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -dir=$(dirname "$0") -. "$dir/vtpm-hotplug-common.sh" - -vtpm_fatal_error=0 - -case "$command" in - add) - vtpm_create_instance - ;; - remove) - vtpm_remove_instance - ;; -esac - -if [ $vtpm_fatal_error -eq 0 ]; then - log debug "Successful vTPM operation '$command'." - success -else - fatal "Error while executing vTPM operation '$command'." -fi diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh deleted file mode 100644 index d0d7935..0000000 --- a/tools/hotplug/Linux/vtpm-common.sh +++ /dev/null @@ -1,448 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# Copyright (c) 2005 XenSource Ltd. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/logging.sh" -. "$dir/locking.sh" - -VTPMDB="/var/vtpm/vtpm.db" - -#In the vtpm-impl file some commands should be defined: -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) -if [ -r "$dir/vtpm-impl.alt" ]; then - . "$dir/vtpm-impl.alt" -elif [ -r "$dir/vtpm-impl" ]; then - . "$dir/vtpm-impl" -else - function vtpm_create () { - true - } - function vtpm_setup() { - true - } - function vtpm_start() { - true - } - function vtpm_suspend() { - true - } - function vtpm_resume() { - true - } - function vtpm_delete() { - true - } - function vtpm_migrate() { - echo "Error: vTPM migration accross machines not implemented." - } - function vtpm_migrate_local() { - echo "Error: local vTPM migration not supported" - } - function vtpm_migrate_recover() { - true - } -fi - - -#Find the instance number for the vtpm given the name of the domain -# Parameters -# - vmname : the name of the vm -# Return value -# Returns '0' if instance number could not be found, otherwise -# it returns the instance number in the variable 'instance' -function vtpmdb_find_instance () { - local vmname ret instance - vmname=$1 - ret=0 - - instance=$(cat $VTPMDB | \ - awk -vvmname=$vmname \ - '{ \ - if ( 1 != index($1,"#")) { \ - if ( $1 == vmname ) { \ - print $2; \ - exit; \ - } \ - } \ - }') - if [ "$instance" != "" ]; then - ret=$instance - fi - echo "$ret" -} - - -# Check whether a particular instance number is still available -# returns "0" if it is not available, "1" otherwise. -function vtpmdb_is_free_instancenum () { - local instance instances avail i - instance=$1 - avail=1 - #Allowed instance number range: 1-255 - if [ $instance -eq 0 -o $instance -gt 255 ]; then - avail=0 - else - instances=$(cat $VTPMDB | \ - awk \ - '{ \ - if (1 != index($1,"#")) { \ - printf("%s ",$2); \ - } \ - }') - for i in $instances; do - if [ $i -eq $instance ]; then - avail=0 - break - fi - done - fi - echo "$avail" -} - - -# Get an available instance number given the database -# Returns an unused instance number -function vtpmdb_get_free_instancenum () { - local ctr instances don found - instances=$(cat $VTPMDB | \ - awk \ - '{ \ - if (1 != index($1,"#")) { \ - printf("%s ",$2); \ - } \ - }') - ctr=1 - don=0 - while [ $don -eq 0 ]; do - found=0 - for i in $instances; do - if [ $i -eq $ctr ]; then - found=1; - break; - fi - done - - if [ $found -eq 0 ]; then - don=1 - break - fi - let ctr=ctr+1 - done - echo "$ctr" -} - - -# Add a domain name and instance number to the DB file -function vtpmdb_add_instance () { - local res vmname inst - vmname=$1 - inst=$2 - - if [ ! -f $VTPMDB ]; then - echo "#Database for VM to vTPM association" > $VTPMDB - echo "#1st column: domain name" >> $VTPMDB - echo "#2nd column: TPM instance number" >> $VTPMDB - fi - res=$(vtpmdb_validate_entry $vmname $inst) - if [ $res -eq 0 ]; then - echo "$vmname $inst" >> $VTPMDB - fi -} - - -#Validate whether an entry is the same as passed to this -#function -function vtpmdb_validate_entry () { - local res rc vmname inst - rc=0 - vmname=$1 - inst=$2 - - res=$(cat $VTPMDB | \ - awk -vvmname=$vmname \ - -vinst=$inst \ - '{ \ - if ( 1 == index($1,"#")) {\ - } else \ - if ( $1 == vmname && \ - $2 == inst) { \ - printf("1"); \ - exit; \ - } else \ - if ( $1 == vmname || \ - $2 == inst) { \ - printf("2"); \ - exit; \ - } \ - }') - - if [ "$res" == "1" ]; then - rc=1 - elif [ "$res" == "2" ]; then - rc=2 - fi - echo "$rc" -} - - -#Remove an entry from the vTPM database given its domain name -#and instance number -function vtpmdb_remove_entry () { - local vmname instance VTPMDB_TMP - vmname=$1 - instance=$2 - VTPMDB_TMP="$VTPMDB".tmp - - $(cat $VTPMDB | \ - awk -vvmname=$vmname \ - '{ \ - if ( $1 != vmname ) { \ - print $0; \ - } \ - '} > $VTPMDB_TMP) - if [ -e $VTPMDB_TMP ]; then - mv -f $VTPMDB_TMP $VTPMDB - vtpm_delete $instance - else - log err "Error creating temporary file '$VTPMDB_TMP'." - fi -} - - -# Find the reason for the creation of this device: -# Returns 'resume' or 'create' -function vtpm_get_create_reason () { - local resume - resume=$(xenstore_read $XENBUS_PATH/resume) - if [ "$resume" == "True" ]; then - echo "resume" - else - echo "create" - fi -} - - -#Create a vTPM instance -# If no entry in the TPM database is found, the instance is -# created and an entry added to the database. -function vtpm_create_instance () { - local res instance domname reason uuid - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) - reason=$(vtpm_get_create_reason) - - claim_lock vtpmdb - - instance="0" - - if [ "$uuid" != "" ]; then - instance=$(vtpmdb_find_instance $uuid) - fi - if [ "$instance" == "0" ]; then - domname=$(xenstore_read "$XENBUS_PATH"/domain) - instance=$(vtpmdb_find_instance $domname) - fi - - if [ "$instance" == "0" -a "$reason" != "create" ]; then - release_lock vtpmdb - return - fi - - if [ "$instance" == "0" ]; then - #Try to give the preferred instance to the domain - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) - if [ "$instance" != "" ]; then - res=$(vtpmdb_is_free_instancenum $instance) - if [ $res -eq 0 ]; then - instance=$(vtpmdb_get_free_instancenum) - fi - else - instance=$(vtpmdb_get_free_instancenum) - fi - - vtpm_create $instance - - if [ $vtpm_fatal_error -eq 0 ]; then - if [ "$uuid" != "" ]; then - vtpmdb_add_instance $uuid $instance - else - vtpmdb_add_instance $domname $instance - fi - fi - else - if [ "$reason" == "resume" ]; then - vtpm_resume $instance - else - vtpm_start $instance - fi - fi - - release_lock vtpmdb - - xenstore_write $XENBUS_PATH/instance $instance -} - - -#Remove an instance when a VM is terminating or suspending. -#Since it is assumed that the VM will appear again, the -#entry is kept in the VTPMDB file. -function vtpm_remove_instance () { - local instance reason domname uuid - #Stop script execution quietly if path does not exist (anymore) - xenstore-exists "$XENBUS_PATH"/domain - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) - - claim_lock vtpmdb - - instance="0" - - if [ "$uuid" != "" ]; then - instance=$(vtpmdb_find_instance $uuid) - fi - - if [ "$instance" == "0" ]; then - domname=$(xenstore_read "$XENBUS_PATH"/domain) - instance=$(vtpmdb_find_instance $domname) - fi - - if [ "$instance" != "0" ]; then - vtpm_suspend $instance - fi - - release_lock vtpmdb -} - - -#Remove an entry in the VTPMDB file given the domain's name -#1st parameter: The name of the domain -function vtpm_delete_instance () { - local instance - - claim_lock vtpmdb - - instance=$(vtpmdb_find_instance $1) - if [ "$instance" != "0" ]; then - vtpmdb_remove_entry $1 $instance - fi - - release_lock vtpmdb -} - -# Determine whether the given address is local to this machine -# Return values: -# "-1" : the given machine name is invalid -# "0" : this is not an address of this machine -# "1" : this is an address local to this machine -function vtpm_isLocalAddress() { - local addr res - addr=$(ping $1 -c 1 | \ - awk '{ print substr($3,2,length($3)-2); exit }') - if [ "$addr" == "" ]; then - echo "-1" - return - fi - res=$(ifconfig | grep "inet addr" | \ - awk -vaddr=$addr \ - '{ \ - if ( addr == substr($2, 6)) {\ - print "1"; \ - } \ - }' \ - ) - if [ "$res" == "" ]; then - echo "0" - return - fi - echo "1" -} - -# Perform a migration step. This function differentiates between migration -# to the local host or to a remote machine. -# Parameters: -# 1st: destination host to migrate to -# 2nd: name of the domain to migrate -# 3rd: the migration step to perform -function vtpm_migration_step() { - local res=$(vtpm_isLocalAddress $1) - if [ "$res" == "0" ]; then - vtpm_migrate $1 $2 $3 - else - vtpm_migrate_local - fi -} - -# Recover from migration due to an error. This function differentiates -# between migration to the local host or to a remote machine. -# Parameters: -# 1st: destination host the migration was going to -# 2nd: name of the domain that was to be migrated -# 3rd: the last successful migration step that was done -function vtpm_recover() { - local res - res=$(vtpm_isLocalAddress $1) - if [ "$res" == "0" ]; then - vtpm_migrate_recover $1 $2 $3 - fi -} - - -#Determine the domain id given a domain's name. -#1st parameter: name of the domain -#return value: domain id or -1 if domain id could not be determined -function vtpm_domid_from_name () { - local id name ids - ids=$(xenstore-list /local/domain) - for id in $ids; do - name=$(xenstore-read /local/domain/$id/name) - if [ "$name" == "$1" ]; then - echo "$id" - return - fi - done - echo "-1" -} - -#Determine the virtual TPM's instance number using the domain ID. -#1st parm: domain ID -function vtpm_uuid_by_domid() { - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) -} - - -# Determine the vTPM's UUID by the name of the VM -function vtpm_uuid_from_vmname() { - local domid=$(vtpm_domid_from_name $1) - if [ "$domid" != "-1" ]; then - echo $(vtpm_uuid_by_domid $domid) - return - fi - echo "" -} - -#Add a virtual TPM instance number and its associated domain name -#to the VTPMDB file and activate usage of this virtual TPM instance -#by writing the instance number into the xenstore -#1st parm: name of virtual machine -#2nd parm: instance of associated virtual TPM -function vtpm_add_and_activate() { - local domid=$(vtpm_domid_from_name $1) - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then - vtpmdb_add_instance $vtpm_uuid $2 - xenstore-write backend/vtpm/$domid/0/instance $2 - fi -} diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete deleted file mode 100644 index b75b95b..0000000 --- a/tools/hotplug/Linux/vtpm-delete +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# This scripts must be called the following way: -# vtpm-delete -# or -# vtpm-delete --vmname - -dir=$(dirname "$0") -. "$dir/vtpm-common.sh" - -if [ "$1" == "--vmname" ]; then - vtpm_uuid=$(vtpm_uuid_from_vmname $2) - if [ "$vtpm_uuid" != "" ];then - vtpm_delete_instance $vtpm_uuid - fi -else - vtpm_delete_instance $1 -fi diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh deleted file mode 100644 index 9fd35e7..0000000 --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# Copyright (c) 2005 XenSource Ltd. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/xen-hotplug-common.sh" - -findCommand "$@" -if [ "$command" != "online" ] && - [ "$command" != "offline" ] && - [ "$command" != "add" ] && - [ "$command" != "remove" ] -then - log err "Invalid command: $command" - exit 1 -fi - - -XENBUS_PATH="${XENBUS_PATH:?}" - -. "$dir/vtpm-common.sh" diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl deleted file mode 100644 index 4f9a1fd..0000000 --- a/tools/hotplug/Linux/vtpm-impl +++ /dev/null @@ -1,208 +0,0 @@ -#!/bin/bash -# =================================================================== -# -# Copyright (c) 2005, Intel Corp. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. -# =================================================================== - -# | SRC | TAG | CMD SIZE | ORD |mtype|strt -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 - -TPM_TYPE_PVM=\\x01 -TPM_TYPE_HVM=\\x02 - -TPM_SUCCESS=00000000 - -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo - -VTPM_MIG=/usr/bin/vtpm_migrator - -# -------------------- Helpers for binary streams ----------- - -function str_to_hex32() { - printf "%0.8x" $1 -} - -function hex32_to_bin() { - local inst=$(str_to_hex32 $1); - - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` - - echo "$n1$n2$n3$n4" -} - -function vtpm_manager_cmd() { - local cmd=$1; - local inst=$2; - local inst_bin=$(hex32_to_bin $inst); - - claim_lock vtpm_mgr - - #send cmd to vtpm_manager - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER - - #recv response - set +e - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` - set -e - - release_lock vtpm_mgr - - #return whether the command was successful - if [ $resp_hex -ne $TPM_SUCCESS ]; then - vtpm_fatal_error=1 - false - else - true - fi -} - -# Helper to get vm type to pass to vtpm_manager open/resume -function vtpm_get_type() { - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) - local vm=$(xenstore_read /local/domain/$inst/vm) - if [ "$vm" != "" ]; then - local ostype=$(xenstore-read $vm/image/ostype) - if [ "$ostype" == "hvm" ]; then - echo $TPM_TYPE_HVM; - else - echo $TPM_TYPE_PVM; - fi - fi -} - -# ------------------ Command handlers ----------------- - -# Create new vtpm instance & set it up for use -function vtpm_create () { - # Creation is handled implicitly by the manager on first setup - # so just set it up for use - $(vtpm_start $1) -} - -# Setup vtpm instance for use. -function vtpm_start() { - local vmtype=$(vtpm_get_type); - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) -} - -function vtpm_resume() { - local vmtype=$(vtpm_get_type); - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) -} - -# Reset the vtpm AKA clear PCRs -function vtpm_reset() { - #not used by current implemenation - true -} - -# Shutdown the vtpm while the vm is down -# This could be a suspend of shutdown -# we cannot distinquish, so save the state -# and decide on startup if we should keep is -function vtpm_suspend() { - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) -} - - -function vtpm_delete() { - local inst=$1 - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then - rm -f /var/vtpm/vtpm_dm_$1.data - true - else - vtpm_fatal_error=1 - false - fi -} - -# Perform a migration step. This function differentiates between migration -# to the local host or to a remote machine. -# Parameters: -# 1st: destination host to migrate to -# 2nd: name of the domain to migrate -# 3rd: the migration step to perform -function vtpm_migrate() { - local instance res - - instance=$(vtpmdb_find_instance $2) - if [ "$instance" == "" ]; then - log err "VTPM Migratoin failed. Unable to translation of domain name" - echo "Error: VTPM Migration failed while looking up instance number" - fi - - case "$3" in - 0) - #Incicate migration supported - echo "0" - ;; - - 1) - # Get Public Key from Destination - # Call vtpm_manager's migration part 1 - claim_lock vtpm_mgr - $VTPM_MIG $1 $2 $instance $3 - release_lock vtpm_mgr - ;; - - 2) - # Call manager's migration step 2 and send result to destination - # If successful remove from db - claim_lock vtpm_mgr - $VTPM_MIG $1 $2 $instance $3 - release_lock vtpm_mgr - ;; - - 3) - if `ps x | grep "$VTPM_MIG $1"`; then - log err "VTPM Migration failed to complete." - echo "Error: VTPM Migration failed to complete." - fi - ;; - esac - -} - - -function vtpm_migrate_recover() { - echo "Error: Recovery not supported yet" -} - -function vtpm_migrate_local() { - echo "Error: local vTPM migration not supported" -} diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh deleted file mode 100644 index 7e38ae2..0000000 --- a/tools/hotplug/Linux/vtpm-migration.sh +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/vtpm-common.sh" diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules index c591a3f..a0d409e 100644 --- a/tools/hotplug/Linux/xen-backend.rules +++ b/tools/hotplug/Linux/xen-backend.rules @@ -1,6 +1,5 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile deleted file mode 100644 index 7b3efa5..0000000 --- a/tools/vtpm/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. - -# Base definitions and rules -include $(XEN_ROOT)/tools/vtpm/Rules.mk - -# Dir name for emulator (as dom0 tpm driver) -TPM_EMULATOR_DIR = tpm_emulator -# Dir name for vtpm instance -VTPM_DIR = vtpm -ORIG_DIR = orig - -# Emulator tarball name -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz - -GMP_HEADER = /usr/include/gmp.h - -.PHONY: all -all: build - -.PHONY: build -build: build_sub - -.PHONY: install -install: build - $(MAKE) -C $(VTPM_DIR) install-recursive - -.PHONY: clean -clean: - @if [ -d $(TPM_EMULATOR_DIR) ]; \ - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ - fi - @if [ -d $(VTPM_DIR) ]; \ - then $(MAKE) -C $(VTPM_DIR) clean; \ - fi - -.PHONY: mrproper -mrproper: - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) - -# Download Swiss emulator -$(TPM_EMULATOR_TARFILE): - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) - -# Create vtpm dirs -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch - rm -rf $(VTPM_DIR) - tar -xzf $(TPM_EMULATOR_TARFILE) - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) - - set -e; cd $(VTPM_DIR); \ - patch -p1 < ../vtpm-0.5.1.patch; \ - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch - -orig: $(TPM_EMULATOR_TARFILE) - mkdir $(ORIG_DIR); - set -e; cd $(ORIG_DIR); \ - tar -xzf ../$(TPM_EMULATOR_TARFILE); - -updatepatches: clean orig - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; - mv vtpm.patch vtpm.patch.old; - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; - -.PHONY: build_sub -build_sub: $(VTPM_DIR)/tpmd/tpmd - set -e; if [ -e $(GMP_HEADER) ]; then \ - $(MAKE) -C $(VTPM_DIR) version; \ - $(MAKE) -C $(VTPM_DIR) all-recursive; \ - else \ - echo "=== Unable to build VTPMs. libgmp could not be found."; \ - fi - diff --git a/tools/vtpm/README b/tools/vtpm/README deleted file mode 100644 index 2008cbd..0000000 --- a/tools/vtpm/README +++ /dev/null @@ -1,45 +0,0 @@ - -Directory Structure -=================== -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will - be patched and used for our vtpms -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, - listens on a pair of fifos for TPM commands, - persistent state is sent via named fifo to vtpm - manager, which encrypts it and protects it. -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM - platforms, this patches the emulator to allow - it to be inserted into the dom0 kernel -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator - -Compile Flags -=================== -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs - Not Defined (default): VTPMs are processes - -Requirements -============ -- xen-unstable -- IBM frontend/backend vtpm driver patch -- vtpm_managerd -- GNU MP Big number library (GMP) - -vtpmd Flow (for vtpm_manager. vtpmd never run by default) -============================ -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. -- VTPM Manager listens to TPM BE. -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. -- When the manager receives the open message from the BE, it launches a vtpm -- Xend allows the VM to continue booting. -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. -- The fifo listener begins listening for the reply from vtpm for the request. -- Vtpm processes request and replies to manager over shared named fifo. -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. - -tpm_emulator flow -================== -Read documentation in tpm_emulator-0.2 directory diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk deleted file mode 100644 index 548cff0..0000000 --- a/tools/vtpm/Rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) -include $(XEN_ROOT)/tools/Rules.mk - -# -# Tool definitions -# - -# General compiler flags -CFLAGS = -Werror -g3 - -# Generic project files -HDRS = $(wildcard *.h) -SRCS = $(wildcard *.c) -OBJS = $(patsubst %.c,%.o,$(SRCS)) - -# Generic (non-header) dependencies -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk - -$(OBJS): $(SRCS) - --include $(DEPS) - -BUILD_EMULATOR = y - -# Make sure these are just rules -.PHONY : all build install clean diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch deleted file mode 100644 index c34c665..0000000 --- a/tools/vtpm/tpm_emulator.patch +++ /dev/null @@ -1,1919 +0,0 @@ -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 -@@ -1,2 +1,3 @@ - Mario Strasser - Heiko Stamer [DAA] -+INTEL Corp <> [Dropped to Ring3] -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 -@@ -1,3 +1,6 @@ -+????-??-?? Intel Corp -+ * Moved module out of kernel to run as a ring 3 app -+ - 2006-06-23 Mario Strasser - * tpm_startup.c: behaviour of ST_CLEAR and storage of - persistent data adapted -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -24,15 +25,10 @@ int __gmp_junk; - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, - int linenum, const char *expr) - { -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", -+ error("%s:%d: GNU MP assertion failed: %s\n", - filename, linenum, expr); - } - --void __attribute__ ((regparm(0))) abort(void) --{ -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); --} -- - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ - - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur - - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) - { -- void *ret = (void*)kmalloc(size, GFP_KERNEL); -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME -- "GMP: cannot allocate memory (size=%u)\n", size); -+ void *ret = (void*)malloc(size); -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); - return ret; - } - - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, - size_t old_size, size_t new_size) - { -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " -- "(old_size=%u new_size=%u)\n", old_size, new_size); -+ void *ret = (void*)malloc(new_size); -+ if (!ret) error("GMP: Cannot reallocate memory " -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); - memcpy(ret, oldptr, old_size); -- kfree(oldptr); -+ free(oldptr); - return ret; - } - -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel - /* overwrite used memory */ - if (blk_ptr != NULL) { - memset(blk_ptr, 0, blk_size); -- kfree(blk_ptr); -+ free(blk_ptr); - } - } - -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -381,7 +382,7 @@ static int encode_message(int type, uint - msg[0] = 0x00; - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); - sha1_init(&ctx); -- sha1_update(&ctx, "TCPA", 4); -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); -@@ -429,7 +430,7 @@ static int decode_message(int type, uint - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); - sha1_init(&ctx); -- sha1_update(&ctx, "TCPA", 4); -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); - sha1_final(&ctx, &msg[1]); - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], - SHA1_DIGEST_LENGTH) != 0) return -1; -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 -@@ -1,195 +0,0 @@ --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux -- * Copyright (C) 2004 Mario Strasser , -- * -- * This module is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published -- * by the Free Software Foundation; either version 2 of the License, -- * or (at your option) any later version. -- * -- * This module is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ -- */ -- --#include --#include --#include --#include --#include --#include "linux_module.h" --#include "tpm/tpm_emulator.h" -- --MODULE_LICENSE("GPL"); --MODULE_AUTHOR("Mario Strasser "); --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); -- --/* module startup parameters */ --char *startup = "save"; --module_param(startup, charp, 0444); --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " -- "Possible values are 'clear', 'save' (default) and 'deactivated."); --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; --module_param(storage_file, charp, 0644); --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " -- "file of the TPM."); -- --/* TPM lock */ --static struct semaphore tpm_mutex; -- --/* TPM command response */ --static struct { -- uint8_t *data; -- uint32_t size; --} tpm_response; -- --/* module state */ --#define STATE_IS_OPEN 0 --static uint32_t module_state; --static struct timespec old_time; -- --static int tpm_open(struct inode *inode, struct file *file) --{ -- debug("%s()", __FUNCTION__); -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; -- return 0; --} -- --static int tpm_release(struct inode *inode, struct file *file) --{ -- debug("%s()", __FUNCTION__); -- clear_bit(STATE_IS_OPEN, (void*)&module_state); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) { -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return 0; --} -- --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) --{ -- debug("%s(%d)", __FUNCTION__, count); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) { -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); -- *ppos += count; -- if ((size_t)tpm_response.size == (size_t)*ppos) { -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } -- } else { -- count = 0; -- } -- up(&tpm_mutex); -- return count; --} -- --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) --{ -- debug("%s(%d)", __FUNCTION__, count); -- down(&tpm_mutex); -- *ppos = 0; -- if (tpm_response.data != NULL) kfree(tpm_response.data); -- if (tpm_handle_command(buf, count, &tpm_response.data, -- &tpm_response.size) != 0) { -- count = -EILSEQ; -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return count; --} -- --#define TPMIOC_CANCEL _IO('T', 0x00) --#define TPMIOC_TRANSMIT _IO('T', 0x01) -- --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) --{ -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); -- if (cmd == TPMIOC_TRANSMIT) { -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) kfree(tpm_response.data); -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, -- &tpm_response.size) == 0) { -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, -- tpm_response.size); -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } else { -- tpm_response.size = 0; -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return tpm_response.size; -- } -- return -1; --} -- --struct file_operations fops = { -- .owner = THIS_MODULE, -- .open = tpm_open, -- .release = tpm_release, -- .read = tpm_read, -- .write = tpm_write, -- .ioctl = tpm_ioctl, --}; -- --static struct miscdevice tpm_dev = { -- .minor = TPM_DEVICE_MINOR, -- .name = TPM_DEVICE_NAME, -- .fops = &fops, --}; -- --int __init init_tpm_module(void) --{ -- int res = misc_register(&tpm_dev); -- if (res != 0) { -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); -- return res; -- } -- /* initialize variables */ -- sema_init(&tpm_mutex, 1); -- module_state = 0; -- tpm_response.data = NULL; -- old_time = current_kernel_time(); -- /* initialize TPM emulator */ -- if (!strcmp(startup, "clear")) { -- tpm_emulator_init(1); -- } else if (!strcmp(startup, "save")) { -- tpm_emulator_init(2); -- } else if (!strcmp(startup, "deactivated")) { -- tpm_emulator_init(3); -- } else { -- error("invalid startup mode '%s'; must be 'clear', " -- "'save' (default) or 'deactivated", startup); -- misc_deregister(&tpm_dev); -- return -EINVAL; -- } -- return 0; --} -- --void __exit cleanup_tpm_module(void) --{ -- tpm_emulator_shutdown(); -- misc_deregister(&tpm_dev); -- if (tpm_response.data != NULL) kfree(tpm_response.data); --} -- --module_init(init_tpm_module); --module_exit(cleanup_tpm_module); -- --uint64_t tpm_get_ticks(void) --{ -- struct timespec new_time = current_kernel_time(); -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; -- old_time = new_time; -- return (ticks > 0) ? ticks : 1; --} -- -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -17,54 +18,62 @@ - #ifndef _LINUX_MODULE_H_ - #define _LINUX_MODULE_H_ - --#include --#include --#include -+#include -+#include -+#include -+#include - #include --#include --#include --#include --#include - --/* module settings */ -+#include -+#define __BYTEORDER_HAS_U64__ -+#ifdef LITTLE_ENDIAN -+ #include -+#else -+ #include -+#endif - -+/* module settings */ -+#define min(A,B) ((A)<(B)?(A):(B)) -+#ifndef STR - #define STR(s) __STR__(s) - #define __STR__(s) #s -+#endif - #include "tpm_version.h" - - #define TPM_DEVICE_MINOR 224 - #define TPM_DEVICE_NAME "tpm" - #define TPM_MODULE_NAME "tpm_emulator" - --/* debug and log output functions */ -- - #ifdef DEBUG --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) - #else - #define debug(fmt, ...) - #endif --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) - - /* memory allocation */ - - static inline void *tpm_malloc(size_t size) - { -- return kmalloc(size, GFP_KERNEL); -+ return malloc(size); - } - - static inline void tpm_free(const void *ptr) - { -- if (ptr != NULL) kfree(ptr); -+ if (ptr != NULL) free( (void *) ptr); - } - - /* random numbers */ - -+//FIXME; -+void get_random_bytes(void *buf, int nbytes); -+ - static inline void tpm_get_random_bytes(void *buf, int nbytes) - { - get_random_bytes(buf, nbytes); -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); - #define CPU_TO_LE16(x) __cpu_to_le16(x) - - #define BE64_TO_CPU(x) __be64_to_cpu(x) --#define LE64_TO_CPU(x) __be64_to_cpu(x) -+#define LE64_TO_CPU(x) __le64_to_cpu(x) - #define BE32_TO_CPU(x) __be32_to_cpu(x) --#define LE32_TO_CPU(x) __be32_to_cpu(x) -+#define LE32_TO_CPU(x) __le32_to_cpu(x) - #define BE16_TO_CPU(x) __be16_to_cpu(x) - #define LE16_TO_CPU(x) __le16_to_cpu(x) - -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 -@@ -1,24 +1,40 @@ - # Software-Based Trusted Platform Module (TPM) Emulator for Linux - # Copyright (C) 2004 Mario Strasser -+# Copyright (C) 2006 INTEL Corp. - # - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ - --# kernel settings --KERNEL_RELEASE := $(shell uname -r) --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build --MOD_SUBDIR := misc -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) - - # module settings --MODULE_NAME := tpm_emulator -+BIN := tpm_emulator - VERSION_MAJOR := 0 - VERSION_MINOR := 4 - VERSION_BUILD := $(shell date +"%s") - --# enable/disable DEBUG messages --EXTRA_CFLAGS += -Wall -DDEBUG -g -+# Installation program and options -+INSTALL = install -+INSTALL_PROG = $(INSTALL) -m0755 -+INSTALL_DIR = $(INSTALL) -d -m0755 -+ -+# Xen tools installation directory -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin -+ -+CC := gcc -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG -+CFLAGS += -I. -Itpm -+ -+# Is the simulator running in it's own vm? -+#CFLAGS += -DVTPM_MULTI_VM -+ -+ifeq ($(COMPILE_ARCH),x86_64) -+LIBDIR = lib64 -+else -+LIBDIR = lib -+endif - - # GNU MP configuration --GMP_LIB := /usr/lib/libgmp.a -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a - GMP_HEADER := /usr/include/gmp.h - - # sources and objects -@@ -27,38 +43,32 @@ DIRS := . crypto tpm - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) - OBJS := $(patsubst %.c, %.o, $(SRCS)) - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) - --obj-m := $(MODULE_NAME).o --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a -+obj-m := $(BIN) -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a - - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm - - # do not print "Entering directory ..." - MAKEFLAGS += --no-print-directory - --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules -+all: $(BIN) - --install: -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install -- test -d /var/tpm || mkdir /var/tpm -- test -c /dev/tpm || mknod /dev/tpm c 10 224 -- chmod 666 /dev/tpm -- depmod -a -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) -+ -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+install: $(BIN) -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi - - clean: -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) - --dist: $(DISTSRC) -- rm -rf $(DISTDIR) -- mkdir $(DISTDIR) -- cp --parents $(DISTSRC) $(DISTDIR)/ -- rm -f $(DISTDIR)/crypto/gmp.h -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) -- rm -rf $(DISTDIR) -+mrproper: clean -+ rm -f $(BIN) tpm_version.h - - $(src)/crypto/libgmp.a: - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a -@@ -88,4 +98,3 @@ version: - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h - - .PHONY: all install clean dist gmp version -- -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst - Copyright - -------------------------------------------------------------------------- - Copyright (C) 2004 Mario Strasser and Swiss Federal --Institute of Technology (ETH) Zurich. -+ Institute of Technology (ETH) Zurich. -+Copyright (C) 2005 INTEL Corp - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -43,6 +44,12 @@ Example: - GMP_LIB := /usr/lib/libgmp.a - GMP_HEADER := /usr/include/gmp.h - -+GNU MP Library on 64 bit Systems -+-------------------------------------------------------------------------- -+Some 64-bit kernels have problems with importing the user-space gmp -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. -+ - Installation - -------------------------------------------------------------------------- - The compilation and installation process uses the build environment for -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE - TPM_RESULT res; - - info("TPM_GetCapabilityOwner()"); -- -+ -+ if (!tpmData.permanent.flags.owned) { -+ return TPM_NOSRK; -+ } - /* Verify owner authorization */ - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); - if (res != TPM_SUCCESS) return res; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) - || len != 0) return TPM_BAD_PARAMETER; -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) - || len != 0) return TPM_BAD_PARAMETER; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC - - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) - { -- UINT32 key_length; -+ size_t key_length; - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; - /* setup TPM_PUBKEY structure */ -- key_length = tpmData.permanent.data.endorsementKey.size; -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, -- pubEndorsementKey->pubKey.key, -- &pubEndorsementKey->pubKey.keyLength); -+ pubEndorsementKey->pubKey.key, -+ &key_length); -+ pubEndorsementKey->pubKey.keyLength = key_length; - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ - { - TPM_RESULT res; - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; -+ size_t key_length; - info("TPM_OwnerReadInternalPub()"); - /* verify authorization */ - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, -- &publicPortion->pubKey.keyLength); -+ &key_length); -+ publicPortion->pubKey.keyLength = key_length; - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; - publicPortion->algorithmParms.encScheme = srk->encScheme; - publicPortion->algorithmParms.sigScheme = srk->sigScheme; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE - TPM_KEY_DATA *cert, *key; - sha1_ctx_t sha1_ctx; - BYTE *buf, *p; -- UINT32 length; -+ UINT32 length32; -+ size_t length; - info("TPM_CertifyKey()"); - /* get keys */ - cert = tpm_get_key(certHandle); -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - p = buf = tpm_malloc(length); -+ length32=(UINT32) length; - if (buf == NULL -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); - return TPM_FAIL; - } - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - sha1_init(&sha1_ctx); -- sha1_update(&sha1_ctx, buf, length); -+ sha1_update(&sha1_ctx, buf, (size_t) length); - sha1_final(&sha1_ctx, buf); - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); - tpm_free(buf); -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL - TPM_KEY_DATA *cert, *key; - sha1_ctx_t sha1_ctx; - BYTE *buf, *p; -- UINT32 length; -+ size_t length; -+ UINT32 length32; - info("TPM_CertifyKey2()"); - /* get keys */ - cert = tpm_get_key(certHandle); -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - p = buf = tpm_malloc(length); -+ length32 = (UINT32) length; - if (buf == NULL -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); - return TPM_FAIL; - } -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, - sizeof(session->DAA_session.DAA_digest)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_update(&sha1, inputData1, inputSize1); - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); - } -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, - sizeof(session->DAA_session.DAA_digest)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE*) "\x00", 1); - rsa_export_modulus(&aikData->key, scratch, &size); - sha1_update(&sha1, scratch, size); - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr - void tpm_init_data(void) - { - /* endorsement key */ -+#ifndef TPM_GENERATE_EK - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" -@@ -77,6 +78,8 @@ void tpm_init_data(void) - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; -+#endif -+ - int i; - /* reset all data to NULL, FALSE or 0 */ - memset(&tpmData, 0, sizeof(tpmData)); -@@ -152,44 +155,43 @@ void tpm_release_data(void) - - #ifdef TPM_STORE_TO_FILE - --#include --#include --#include -+#include -+#include -+#include -+#include - - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) - - static int write_to_file(uint8_t *data, size_t data_length) - { - int res; -- struct file *fp; -- mm_segment_t old_fs = get_fs(); -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- if (IS_ERR(fp)) return -1; -- set_fs(get_ds()); -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); -- set_fs(old_fs); -- filp_close(fp, NULL); -+ int fp; -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -+ res = write(fp, data, data_length); -+ close(fp); - return (res == data_length) ? 0 : -1; - } - - static int read_from_file(uint8_t **data, size_t *data_length) - { - int res; -- struct file *fp; -- mm_segment_t old_fs = get_fs(); -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); -- if (IS_ERR(fp)) return -1; -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ -+ int fp, file_status; -+ struct stat file_info; -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); -+ file_status = fstat(fp, &file_info); -+ if (file_status < 0) { -+ close(fp); -+ return -1; -+ } -+ -+ *data_length = file_info.st_size; - *data = tpm_malloc(*data_length); - if (*data == NULL) { -- filp_close(fp, NULL); -+ close(fp); - return -1; - } -- set_fs(get_ds()); -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); -- set_fs(old_fs); -- filp_close(fp, NULL); -+ res = read(fp, *data, *data_length); -+ close(fp); - if (res != *data_length) { - tpm_free(*data); - return -1; -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data - int tpm_store_permanent_data(void) - { - uint8_t *buf, *ptr; -- size_t buf_length, len; -+ UINT32 buf_length, len; - - /* marshal data */ -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); - buf = ptr = tpm_malloc(buf_length); - if (buf == NULL - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { - tpm_free(buf); - return -1; - } -+ - if (write_to_file(buf, buf_length - len)) { - tpm_free(buf); - return -1; -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) - int tpm_restore_permanent_data(void) - { - uint8_t *buf, *ptr; -- size_t buf_length, len; -+ size_t buf_length; -+ UINT32 len; - TPM_VERSION ver; - - /* read data */ - if (read_from_file(&buf, &buf_length)) return -1; - ptr = buf; -- len = buf_length; -+ len = (uint32_t) buf_length; - /* unmarshal data */ - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { - tpm_free(buf); - return -1; - } -+ - tpm_free(buf); - return 0; - } - - int tpm_erase_permanent_data(void) - { -- int res = write_to_file("", 0); -+ int res = write_to_file((uint8_t *) "", 0); - return res; - } - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA - BYTE *ptr; - UINT32 len; - info("TPM_SaveKeyContext()"); -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", - keyContextSize, &contextBlob); - if (res != TPM_SUCCESS) return res; - len = *keyContextSize; -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH - BYTE *ptr; - UINT32 len; - info("TPM_SaveAuthContext()"); -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", - authContextSize, &contextBlob); - if (res != TPM_SUCCESS) return res; - len = *authContextSize; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -22,7 +23,8 @@ - /* TPM configuration */ - #define TPM_STORE_TO_FILE 1 - #undef TPM_STRONG_PERSISTENCE --#undef TPM_GENERATE_EK -+//#undef TPM_GENERATE_EK -+#define TPM_GENERATE_EK - #undef TPM_GENERATE_SEED_DAA - - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * - - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) - { -- UINT32 m_len, e_len, q_len; -+ size_t m_len, e_len, q_len; - if (*length < sizeof_RSA((*v))) return -1; - if (v->size > 0) { - rsa_export_modulus(v, &(*ptr)[6], &m_len); -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT - return 0; - } - -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) -+{ -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; -+ -+ return 0; -+} -+ -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) -+{ -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; -+ -+ return 0; -+} -+ -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) -+{ -+ UINT32 i; -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; -+ } -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; -+ } -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; -+ -+ return 0; -+} -+ -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) -+{ -+ UINT32 i; -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; -+ } -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; -+ } -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; -+ -+ return 0; -+} -+ - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) - { - if (tpm_marshal_BYTE(ptr, length, v->type) -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); - -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); -+ -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); -+ - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO - TPM_RESULT res; - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; -- UINT32 buf_size = ek->size >> 3; -+ size_t buf_size = ek->size >> 3, key_length; - BYTE buf[buf_size]; - - info("TPM_TakeOwnership()"); -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO - return TPM_FAIL; - } - rsa_export_modulus(&srk->key, srkPub->pubKey.key, -- &srkPub->pubKey.keyLength); -+ &key_length); -+ srkPub->pubKey.keyLength = (UINT32) key_length; - /* setup tpmProof and set state to owned */ - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, - sizeof(tpmData.permanent.data.tpmProof.nonce)); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) - { - int i; -+ int restore_fail; - info("TPM_Startup(%d)", startupType); - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; -- /* reset STANY_FLAGS */ -- SET_TO_ZERO(&tpmData.stany.flags); -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; -- /* reset STANY_DATA (invalidates ALL sessions) */ -- SET_TO_ZERO(&tpmData.stany.data); -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; -- /* init session-context nonce */ -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); -+ -+ /* try and restore state to get EK, SRK, etc */ -+ restore_fail = tpm_restore_permanent_data(); -+ - /* set data and flags according to the given startup type */ - if (startupType == TPM_ST_CLEAR) { -- /* if available, restore permanent data */ -- tpm_restore_permanent_data(); -+ /* reset STANY_FLAGS */ -+ SET_TO_ZERO(&tpmData.stany.flags); -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; -+ /* reset STANY_DATA (invalidates ALL sessions) */ -+ SET_TO_ZERO(&tpmData.stany.data); -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; -+ /* init session-context nonce */ -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); - /* reset PCR values */ - for (i = 0; i < TPM_NUM_PCR; i++) { -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); - else -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); - } - /* reset STCLEAR_FLAGS */ - SET_TO_ZERO(&tpmData.stclear.flags); -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE - /* init key-context nonce */ - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); - } else if (startupType == TPM_ST_STATE) { -- if (tpm_restore_permanent_data()) { -+ /* restore must have been successful for TPM_ST_STATE */ -+ if (restore_fail) { - error("restoring permanent data failed"); - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; - tpmData.permanent.flags.selfTestSucceeded = FALSE; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - BYTE *enc, UINT32 *enc_size) - { - UINT32 len; -+ size_t enc_size32 = *enc_size; - BYTE *buf, *ptr; - rsa_public_key_t pub_key; - int scheme; -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - if (buf == NULL - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), -- enc, enc_size)) { -+ enc, &enc_size32)) { - tpm_free(buf); - rsa_release_public_key(&pub_key); - return -1; -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, - TPM_SEALED_DATA *seal, BYTE **buf) - { -- UINT32 len; -+ size_t len; -+ UINT32 len32; - BYTE *ptr; - int scheme; - switch (key->encScheme) { -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke - len = enc_size; - *buf = ptr = tpm_malloc(len); - if (*buf == NULL -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ -+ tpm_free(*buf); -+ return -1; -+ } -+ len32 = len; -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { - tpm_free(*buf); - return -1; - } -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par - - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, - BYTE *inData, TPM_AUTH *auth1, -- UINT32 *outDataSize, BYTE **outData) -+ UINT32 *outDataSize32, BYTE **outData) - { - TPM_RESULT res; - TPM_KEY_DATA *key; - int scheme; -+ size_t outDataSize; - - info("TPM_UnBind()"); - /* get key */ -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key - /* the size of the input data muss be greater than zero */ - if (inDataSize == 0) return TPM_BAD_PARAMETER; - /* decrypt data */ -- *outDataSize = inDataSize; -- *outData = tpm_malloc(*outDataSize); -+ outDataSize = inDataSize; -+ *outData = tpm_malloc(outDataSize); - if (*outData == NULL) return TPM_NOSPACE; - switch (key->encScheme) { - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; - } - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, -- *outData, outDataSize)) { -+ *outData, &outDataSize)) { - tpm_free(*outData); - return TPM_DECRYPT_ERROR; - } - /* verify data if it is of type TPM_BOUND_DATA */ - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 - || key->keyUsage != TPM_KEY_LEGACY) { -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { - tpm_free(*outData); - return TPM_DECRYPT_ERROR; - } -- *outDataSize -= 5; -- memmove(*outData, &(*outData)[5], *outDataSize); -+ outDataSize -= 5; -+ memmove(*outData, &(*outData)[5], outDataSize); - } -+ *outDataSize32 = (UINT32) outDataSize; - return TPM_SUCCESS; - } - -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke - } - - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, -- BYTE *enc, UINT32 *enc_size) -+ BYTE *enc, UINT32 *enc_size32) - { - UINT32 len; - BYTE *buf, *ptr; - rsa_public_key_t pub_key; - int scheme; -+ size_t enc_size; - switch (key->encScheme) { - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke - if (buf == NULL - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), -- enc, enc_size)) { -+ enc, &enc_size)) { - tpm_free(buf); - rsa_release_public_key(&pub_key); - return -1; - } -+ *enc_size32 = (UINT32) enc_size; - tpm_free(buf); - rsa_release_public_key(&pub_key); - return 0; -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, - TPM_STORE_ASYMKEY *store, BYTE **buf) - { -- UINT32 len; -+ UINT32 len32; -+ size_t len; - BYTE *ptr; - int scheme; - switch (key->encScheme) { -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke - len = enc_size; - *buf = ptr = tpm_malloc(len); - if (*buf == NULL -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { -+ tpm_free(*buf); -+ return -1; -+ } -+ len32 = (UINT32) len; -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { - tpm_free(*buf); - return -1; - } -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - TPM_SESSION_DATA *session; - TPM_STORE_ASYMKEY store; - rsa_private_key_t rsa; -- UINT32 key_length; -+ size_t key_length; - - info("TPM_CreateWrapKey()"); - /* get parent key */ -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - } - } - /* generate key and store it */ -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; -- wrappedKey->pubKey.keyLength = key_length >> 3; -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) -+ return TPM_FAIL; -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); -- store.privKey.keyLength = key_length >> 4; -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; - store.privKey.key = tpm_malloc(store.privKey.keyLength); - wrappedKey->encDataSize = parent->key.size >> 3; - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - tpm_free(wrappedKey->encData); - return TPM_NOSPACE; - } -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, -- &wrappedKey->pubKey.keyLength); -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, -+ &key_length); -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); -+ store.privKey.keyLength = (UINT32) key_length; - rsa_release_private_key(&rsa); - /* compute the digest of the wrapped key (without encData) */ - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p - - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) - { -+ size_t key_length; - parms->algorithmID = TPM_ALG_RSA; - parms->encScheme = key->encScheme; - parms->sigScheme = key->sigScheme; -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); - if (parms->parms.rsa.exponent == NULL) return -1; - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, -- &parms->parms.rsa.exponentSize); -+ &key_length); -+ parms->parms.rsa.exponentSize = (UINT32) key_length; - parms->parmSize = 12 + parms->parms.rsa.exponentSize; - return 0; - } -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE - TPM_RESULT res; - TPM_KEY_DATA *key; - TPM_DIGEST digest; -+ size_t key_length; - info("TPM_GetPubKey()"); - /* get key */ - if (keyHandle == TPM_KH_SRK -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE - pubKey->pubKey.keyLength = key->key.size >> 3; - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; -- rsa_export_modulus(&key->key, pubKey->pubKey.key, -- &pubKey->pubKey.keyLength); -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); -+ pubKey->pubKey.keyLength = (UINT32) key_length; - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); - tpm_free(pubKey->pubKey.key); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { - TPM_DIGEST DAA_digest_gamma; - BYTE DAA_generic_q[26]; - } TPM_DAA_ISSUER; -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) - - /* - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { - TPM_DIGEST DAA_rekey; - UINT32 DAA_count; - } TPM_DAA_TPM; -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) - - /* - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { - BYTE DAA_scratch[256]; - BYTE DAA_stage; - } TPM_DAA_CONTEXT; -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) - - /* - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { - BYTE DAA_join_u1[138]; - TPM_DIGEST DAA_digest_n0; - } TPM_DAA_JOINDATA; -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) - - /* - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { - //UINT32 ownerReference; - //BOOL disableResetLock; - } TPM_STCLEAR_DATA; -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) - - /* - * TPM_SESSION_DATA -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { - TPM_DAA_JOINDATA DAA_joinSession; - TPM_HANDLE handle; - } TPM_DAA_SESSION_DATA; -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) - - /* - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { - TPM_DAAHANDLE currentDAA; - TPM_TRANSHANDLE transExclusive; - } TPM_STANY_DATA; -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) - - /* - * TPM_DATA -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) - struct { - uint8_t *data; uint32_t repetitions; uint8_t *digest; - } test_cases[] = {{ -- "abc", 1, -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" -+ (uint8_t*)"abc", 1, -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" - }, { -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" - }, { -- "a", 1000000, -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" -+ (uint8_t*)"a", 1000000, -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" - }, { -- "0123456701234567012345670123456701234567012345670123456701234567", 10, -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" - }}; - - debug("tpm_test_sha1()"); - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { - sha1_init(&ctx); - for (j = 0; j < test_cases[i].repetitions; j++) -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); - sha1_final(&ctx, digest); - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; - } -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) - struct { - uint8_t *key, key_len, *data, data_len, *digest; - } test_cases[] = {{ -- "\x0b", 20, "Hi There", 8, -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" - }, { -- "Jefe", 4, "what do ya want for nothing?", 28, -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" - }, { -- "\xaa", 20, "\xdd", 50, -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" - }, { -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" - }, { -- "\x0c", 20, "Test With Truncation", 20, -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" - }, { -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" - }, { -- "\xaa", 80, -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" -+ (uint8_t*)"\xaa", 80, -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" - }}; - - debug("tpm_test_hmac()"); - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { - uint8_t key[test_cases[i].key_len]; - memset(key, test_cases[i].key[0], test_cases[i].key_len); - hmac_init(&ctx, key, test_cases[i].key_len); - } else { - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); - } -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); - } - hmac_final(&ctx, digest); - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) - static int tpm_test_rsa_EK(void) - { - int res = 0; -- char *data = "RSA PKCS #1 v1.5 Test-String"; -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; - uint8_t buf[256]; -- size_t buf_len, data_len = strlen(data); -+ size_t buf_len, data_len = strlen((char*)data); - rsa_private_key_t priv_key; - rsa_public_key_t pub_key; - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) - { - info("TPM_GetTicks()"); -- memcpy(currentTime, &tpmData.stany.data.currentTicks, -- sizeof(TPM_CURRENT_TICKS)); -- return TPM_SUCCESS; -+ return TPM_DISABLED_CMD; - } - - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN - TPM_CURRENT_TICKS *currentTicks, - UINT32 *sigSize, BYTE **sig) - { -- TPM_RESULT res; -- TPM_KEY_DATA *key; -- BYTE *info, *p; -- UINT32 info_length, length; - info("TPM_TickStampBlob()"); -- /* get key */ -- key = tpm_get_key(keyHandle); -- if (key == NULL) return TPM_INVALID_KEYHANDLE; -- /* verify authorization */ -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); -- if (res != TPM_SUCCESS) return res; -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; -- /* get current ticks */ -- TPM_GetTicks(currentTicks); -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ -- *sigSize = key->key.size >> 3; -- *sig = tpm_malloc(*sigSize); -- if (*sig == NULL) return TPM_FAIL; -- /* setup TPM_SIGN_INFO structure */ -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); -- info = tpm_malloc(info_length); -- if (info == NULL) { -- tpm_free(*sig); -- return TPM_FAIL; -- } -- memcpy(&info[0], "\x05\x00TSTP", 6); -- memcpy(&info[6], antiReplay->nonce, 20); -- *(UINT32*)&info[26] = CPU_TO_BE32(20 -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); -- p = &info[30 + sizeof(TPM_DIGEST)]; -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { -- tpm_free(*sig); -- tpm_free(info); -- return TPM_FAIL; -- } -- return TPM_SUCCESS; -+ return TPM_DISABLED_CMD; - } - - void tpm_update_ticks(void) - { -- if (tpmData.stany.data.currentTicks.tag == 0) { -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); --/* removed since v1.2 rev 94 -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; --*/ -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, -- sizeof(TPM_NONCE)); -- tpmData.stany.data.currentTicks.tickRate = 1; --/* removed since v1.2 rev 94 -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; --*/ -- } else { -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); -- } - } - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE - sha1_init(&sha1); - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); -- sha1_update(&sha1, "in", 2); -+ sha1_update(&sha1, (BYTE*)"in", 2); - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); - j = CPU_TO_BE32(i); - sha1_update(&sha1, (BYTE*)&j, 4); -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE - sha1_init(&sha1); - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); -- sha1_update(&sha1, "out", 3); -+ sha1_update(&sha1, (BYTE*)"out", 3); - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); - j = CPU_TO_BE32(i); - sha1_update(&sha1, (BYTE*)&j, 4); -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 -@@ -0,0 +1,156 @@ -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux -+ * Copyright (C) 2005 INTEL Corp -+ * -+ * This module is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published -+ * by the Free Software Foundation; either version 2 of the License, -+ * or (at your option) any later version. -+ * -+ * This module is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "tpm_emulator.h" -+ -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" -+ -+#define BUFFER_SIZE 2048 -+ -+static int devurandom=0; -+ -+void get_random_bytes(void *buf, int nbytes) { -+ -+ if (devurandom == 0) { -+ devurandom = open("/dev/urandom", O_RDONLY); -+ } -+ -+ if (read(devurandom, buf, nbytes) != nbytes) { -+ printf("Can't get random number.\n"); -+ exit(-1); -+ } -+} -+ -+uint64_t tpm_get_ticks(void) -+{ -+ //struct timeval tv; -+ //int gettimeofday(&tv, struct timezone *tz); -+ return 0; -+} -+ -+int main(int argc, char **argv) -+{ -+ uint8_t in[BUFFER_SIZE], *out; -+ uint32_t out_size; -+ int in_size, written; -+ int i; -+ struct stat file_info; -+ -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; -+ if (argc < 2) { -+ printf("Usage: tpmd clear|save|deactivated\n" ); -+ return -1; -+ } -+ -+ /* initialize TPM emulator */ -+ if (!strcmp(argv[1], "clear")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(1); -+ } else if (!strcmp(argv[1], "save")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(2); -+ } else if (!strcmp(argv[1], "deactivated")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(3); -+ } else { -+ printf("invalid startup mode '%s'; must be 'clear', " -+ "'save' (default) or 'deactivated", argv[1]); -+ return -1; -+ } -+ -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); -+ return -1; -+ } -+ } -+ -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); -+ return -1; -+ } -+ } -+ -+ while (1) { -+abort_command: -+ if (tpm_rx_fh < 0) { -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); -+ } -+ -+ if (tpm_rx_fh < 0) { -+ printf("ERROR: failed to open devices to listen to guest.\n"); -+ return -1; -+ } -+ -+ if (tpm_tx_fh < 0) { -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); -+ } -+ -+ if (tpm_tx_fh < 0) { -+ printf("ERROR: failed to open devices to respond to guest.\n"); -+ return -1; -+ } -+ -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); -+ if (in_size < 6) { // Magic size of minium TPM command -+ printf("Recv[%d] to small: 0x", in_size); -+ if (in_size <= 0) { -+ close(tpm_rx_fh); -+ tpm_rx_fh = -1; -+ goto abort_command; -+ } -+ } else { -+ printf("Recv[%d]: 0x", in_size); -+ for (i=0; i< in_size; i++) -+ printf("%x ", in[i]); -+ printf("\n"); -+ } -+ -+ -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { -+ printf("ERROR: Handler Failed.\n"); -+ } -+ -+ written = write(tpm_tx_fh, out, out_size); -+ -+ if (written != out_size ) { -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); -+ } else { -+ printf("Sent[%Zu]: ", out_size); -+ } -+ for (i=0; i< out_size; i++) -+ printf("%x ", out[i]); -+ printf("\n"); -+ tpm_free(out); -+ -+ } // loop -+ -+ tpm_emulator_shutdown(); -+ -+ close(tpm_tx_fh); -+ close(tpm_rx_fh); -+ -+} -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 -@@ -2,5 +2,5 @@ - #define _TPM_VERSION_H_ - #define VERSION_MAJOR 0 - #define VERSION_MINOR 4 --#define VERSION_BUILD 1151058734 -+#define VERSION_BUILD 1153776940 - #endif /* _TPM_VERSION_H_ */ diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch deleted file mode 100644 index 95586c1..0000000 --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile ---- tpm_emulator-0.5.1/tpmd/Makefile -+++ tpm_emulator-0.5.1/tpmd/Makefile -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing - CFLAGS += -I../../../../tools/vtpm_manager/manager --LDFLAGS += -lgmp -+LDLIBS += -lgmp - - BINDIR := /usr/bin/ - diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch deleted file mode 100644 index 2aeb745..0000000 --- a/tools/vtpm/vtpm-0.5.1.patch +++ /dev/null @@ -1,766 +0,0 @@ -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 - VERSION_BUILD := $(shell date +"%s") - VERSION_SUFFIX := .1 - --SUBDIRS := tpmd tpmd_dev tddl -+SUBDIRS := tpmd - - all: version all-recursive - -@@ -48,12 +48,12 @@ user_install: user - modules_install: modules - @$(MAKE) -C tpmd_dev install || exit -1 - --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd -+DIRS := . tpm crypto tpmd - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd -+DIRS := . tpmd - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in -+DISTSRC += ./README ./AUTHORS ./ChangeLog - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) - - dist: $(DISTSRC) -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_TIS_TIMEOUT: - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ -+ UINT32 len = *respSize = 16; -+ BYTE *ptr = *resp = tpm_malloc(*respSize); -+ if (ptr == NULL || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { -+ tpm_free(*resp); -+ return TPM_FAIL; -+ } -+ return TPM_SUCCESS; -+ - - case TPM_CAP_PROP_STARTUP_EFFECT: - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_DURATION: - debug("[TPM_CAP_PROP_DURATION]"); -- /* TODO: TPM_CAP_PROP_DURATION */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; -+ *respSize = 16; -+ *resp = tpm_malloc(*respSize); -+ memcpy(*resp,dur,16); -+ - - case TPM_CAP_PROP_ACTIVE_COUNTER: - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a - -Wwrite-strings -Wsign-compare -Wno-multichar - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing -+CFLAGS += -I../../../../tools/vtpm_manager/manager - LDFLAGS += -lgmp - --BINDIR := /usr/sbin/ -+BINDIR := /usr/bin/ - - TPMD := tpmd - DIRS := ../tpm ../crypto -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil - OBJS := $(patsubst %.c, %.o, $(SRCS)) - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) - -+VTPM_BIN := vtpmd -+ - vpath %.c $(strip $(DIRS)) - - all: $(TPMD) -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss - INSTALL ?= install - - install: $(TPMD) -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) - - .PHONY: all clean install - -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 -@@ -32,6 +32,9 @@ - #include - #include "tpm_emulator_config.h" - #include "tpm/tpm_emulator.h" -+#include "tpm/tpm_structures.h" -+#include "tpm/tpm_marshalling.h" -+#include "vtpm_manager.h" - - #define TPM_DAEMON_NAME "tpmd" - #define TPM_CMD_BUF_SIZE 4096 -@@ -39,6 +42,24 @@ - #define TPM_RANDOM_DEVICE "/dev/urandom" - #undef TPM_MKDIRS - -+#ifdef VTPM_MULTI_VM -+ #define DEV_BE "/dev/vtpm" -+ #define DEV_FE "/dev/tpm" -+#else -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" -+ -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -+ -+ static char *vtpm_rx_name=NULL; -+#endif -+ -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#define BUFFER_SIZE 2048 -+ - static volatile int stopflag = 0; - static int is_daemon = 0; - static int opt_debug = 0; -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ - static uid_t opt_uid = 0; - static gid_t opt_gid = 0; - static int tpm_startup = 2; -+static int vtpm_type = VTPM_TYPE_PVM; -+int dmi_id = 0; - static int rand_fh; - - void tpm_log(int priority, const char *fmt, ...) -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) - - int tpm_write_to_file(uint8_t *data, size_t data_length) - { -- int fh; -- ssize_t res; -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- if (fh < 0) return -1; -- while (data_length > 0) { -- res = write(fh, data, data_length); -- if (res < 0) { -- close(fh); -- return -1; -- } -- data_length -= res; -- data += res; -+ int res, out_data_size, in_header_size; -+ BYTE *ptr, *out_data, *in_header; -+ UINT32 result, len, in_rsp_size; -+ UINT16 tag = VTPM_TAG_REQ; -+ -+ printf("Saving NVM\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; -+#endif -+ -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { -+ free(out_data); -+ return -1; -+ } -+ -+ printf("\tSending SaveNVM Command.\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); - } -- close(fh); -- return 0; -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading SaveNVM header.\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_tx_fh); close(vtpm_rx_fh); -+#endif -+ -+ printf("\tFinishing up SaveNVM\n"); -+ return (0); - } - - int tpm_read_from_file(uint8_t **data, size_t *data_length) - { -- int fh; -- ssize_t res; -- size_t total_length; -- fh = open(opt_storage_file, O_RDONLY); -- if (fh < 0) return -1; -- total_length = lseek(fh, 0, SEEK_END); -- lseek(fh, 0, SEEK_SET); -- *data = tpm_malloc(total_length); -- if (*data == NULL) { -- close(fh); -- return -1; -- } -- *data_length = 0; -- while (total_length > 0) { -- res = read(fh, &(*data)[*data_length], total_length); -- if (res < 0) { -- close(fh); -- tpm_free(*data); -- return -1; -- } -- *data_length += res; -- total_length -= res; -+ int res, out_data_size, in_header_size; -+ uint8_t *ptr, *out_data, *in_header; -+ UINT16 tag = VTPM_TAG_REQ; -+ UINT32 len, in_rsp_size, result; -+#ifdef VTPM_MUTLI_VM -+ int vtpm_rx_fh, vtpm_tx_fh; -+#endif -+ -+ printf("Loading NVM.\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ printf("Error in read_from_file:301\n"); -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { -+ free(out_data); -+ printf("Error in read_from_file:325\n"); -+ -+ return -1; -+ } -+ -+ printf("\tSending LoadNVM command\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) -+ { -+ printf("Error in read_from_file:335\n"); -+ return -1; -+ } -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); - } -- close(fh); -- return 0; -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ printf("Error in read_from_file:352\n"); -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading LoadNVM header\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ printf("Error in read_from_file:375\n"); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ printf("Error in read_from_file:381\n"); -+ return -1; -+ } -+ -+ // Read Encrypted data from VTPM Manager -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; -+ *data = (uint8_t *) malloc(*data_length); -+ -+ printf("\tReading clear data from LoadNVM.\n"); -+ res = read(vtpm_rx_fh, *data, *data_length); -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_rx_fh);close(vtpm_tx_fh); -+#endif -+ -+ printf("\tReturing from loading NVM\n"); -+ if (res != (int)*data_length) { -+ free(*data); -+ printf("Error in read_from_file:398\n"); -+ return -1; -+ } else { -+ return 0; -+ } -+ -+ -+ - } - - static void print_usage(char *name) - { - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); -+ "[-o user name] [-g group name] [-h]" -+#ifdef VTPM_MULTI_VM -+ "clear|save|deactivated\n", name); -+#else -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); -+#endif - printf(" d : enable debug mode\n"); - printf(" f : forces the application to run in the foreground\n"); - printf(" s : storage file to use (default: %s)\n", opt_storage_file); -@@ -205,7 +413,13 @@ static void parse_options(int argc, char - exit(EXIT_SUCCESS); - } - } -- if (optind < argc) { -+ /*Make sure we have all required options*/ -+#ifdef VTPM_MULTI_VM -+#define EXTRA_OPTS 0 -+#else -+#define EXTRA_OPTS 2 -+#endif -+ if (optind < argc - EXTRA_OPTS ) { - debug("startup mode = '%s'", argv[optind]); - if (!strcmp(argv[optind], "clear")) { - tpm_startup = 1; -@@ -219,6 +433,25 @@ static void parse_options(int argc, char - print_usage(argv[0]); - exit(EXIT_SUCCESS); - } -+#ifndef VTPM_MULTI_VM -+ ++optind; -+ if(!strcmp(argv[optind], "pvm")) { -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo -+ } else if (!strcmp(argv[optind], "hvm")) { -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket -+ } else { -+ error("Invalid vm mode '%s'; must be 'pvm', " -+ "or 'hvm' ", argv[optind]); -+ print_usage(argv[0]); -+ exit(EXIT_SUCCESS); -+ } -+ ++optind; -+ dmi_id = atoi(argv[optind]); -+#endif -+ } else { -+ error("Invalid number of arguments"); -+ print_usage(argv[0]); -+ exit(EXIT_SUCCESS); - } - } - -@@ -348,93 +581,180 @@ static int init_socket(const char *name) - - static void main_loop(void) - { -- int sock, fh, res; -- int32_t in_len; -+ int32_t in_len, written; - uint32_t out_len; -- uint8_t in[TPM_CMD_BUF_SIZE], *out; -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; -+ int guest_id=-1; -+ int i; -+ char *vtpm_rx_file=NULL; -+ int res; -+ -+#ifndef VTPM_MULTI_VM -+ int sockfd = -1; - struct sockaddr_un addr; -- socklen_t addr_len; -- fd_set rfds; -- struct timeval tv; -+ struct sockaddr_un client_addr; -+ unsigned int client_length; -+#endif -+ -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#ifndef VTPM_MULTI_VM -+ if (vtpm_type == VTPM_TYPE_PVM) { -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); -+ } else { -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); -+ -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { -+ error("Unable to create socket. errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&addr, 0, sizeof(addr)); -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path,vtpm_rx_file ); -+ unlink(addr.sun_path); -+ } -+#endif - - info("staring main loop"); -- /* open UNIX socket */ -- sock = init_socket(opt_socket_name); -- if (sock < 0) exit(EXIT_FAILURE); - /* init tpm emulator */ -- debug("initializing TPM emulator: %d", tpm_startup); -+#ifdef VTPM_MULTI_VM -+ debug("initializing TPM emulator: state=%d", tpm_startup); -+#else -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); -+#endif - tpm_emulator_init(tpm_startup); - /* start command processing */ - while (!stopflag) { - /* wait for incomming connections */ - debug("waiting for connections..."); -- FD_ZERO(&rfds); -- FD_SET(sock, &rfds); -- tv.tv_sec = 10; -- tv.tv_usec = 0; -- res = select(sock + 1, &rfds, NULL, NULL, &tv); -- if (res < 0) { -- error("select(sock) failed: %s", strerror(errno)); -- break; -- } else if (res == 0) { -- continue; -- } -- addr_len = sizeof(addr); -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); -- if (fh < 0) { -- error("accept() failed: %s", strerror(errno)); -- continue; -- } -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); -+#else -+ if (vtpm_type == VTPM_TYPE_PVM) -+ { -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); -+ } else { -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { -+ error("Unable to bind(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ if (listen(sockfd, 10) <0) { -+ error("Unable to listen(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&client_addr, 0, sizeof(client_addr)); -+ client_length = sizeof(client_addr); -+ -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); -+ } -+#endif -+ } -+ -+ /*Error Checking*/ -+ if (vtpm_rx_fh < 0) { -+ error("Failed to open devices to listen to guest.\n"); -+ exit(-1); -+ } -+ - /* receive and handle commands */ - in_len = 0; - do { - debug("waiting for commands..."); -- FD_ZERO(&rfds); -- FD_SET(fh, &rfds); -- tv.tv_sec = TPM_COMMAND_TIMEOUT; -- tv.tv_usec = 0; -- res = select(fh + 1, &rfds, NULL, NULL, &tv); -- if (res < 0) { -- error("select(fh) failed: %s", strerror(errno)); -- close(fh); -- break; -- } else if (res == 0) { --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS -- info("connection closed due to inactivity"); -- close(fh); -- break; --#else -- continue; --#endif -- } -- in_len = read(fh, in, sizeof(in)); -- if (in_len > 0) { -+ -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); -+ /*Magic size of minimum TPM command is 6*/ -+ //FIXME Magic size check may not be required anymore -+ if (in_len < 6) { -+ info("Recv incomplete command of %d bytes.", in_len); -+ if (in_len <= 0) { -+ close(vtpm_rx_fh); -+ vtpm_rx_fh = -1; -+ continue; -+ } -+ } else { -+ /*Debug Printouts*/ - debug("received %d bytes", in_len); -+ debug_nostop("Recv[%d]: 0x", in_len); -+ for (i=0; i< in_len; i++) -+ debug_more("%x ", in[i]); -+ debug_more("\n"); -+ /*Multiple Guest check*/ -+ if (guest_id == -1) { -+ guest_id = *((int32_t *) in); -+ } else { -+ if (guest_id != *((int32_t *) in) ) { -+ error("WARNING: More than one guest attached\n"); -+ } -+ } -+ -+ /*Open tx handle now*/ -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_type == VTPM_TYPE_PVM) { -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); -+ } // No need to open the other direction for HVM -+#endif -+ } -+ if (vtpm_tx_fh < 0) { -+ error("Failed to open devices to respond to guest.\n"); -+ exit(-1); -+ } -+ -+ /*Handle the TPM command now*/ - out = NULL; -- res = tpm_handle_command(in, in_len, &out, &out_len); -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); - if (res < 0) { - error("tpm_handle_command() failed"); - } else { - debug("sending %d bytes", out_len); -+ //FIXME this prepending may or may not be needed -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); -+ *(uint32_t *) addressed_out = *(uint32_t *) in; -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); -+ out_len += sizeof(uint32_t); -+ /*End Prepend*/ -+ -+ /*Perform write operation now*/ - while (out_len > 0) { -- res = write(fh, out, out_len); -+ res = write(vtpm_tx_fh, addressed_out, out_len); -+ - if (res < 0) { - error("write(%d) failed: %s", out_len, strerror(errno)); - break; -- } -+ } else { -+ debug_nostop("Sent[%Zu]: ", out_len); -+ for (i=0; (unsigned int)i< out_len; i++) -+ debug_more("%x ", addressed_out[i]); -+ debug_more("\n"); -+ } - out_len -= res; - } - tpm_free(out); -+ tpm_free(addressed_out); - } - } - } while (in_len > 0); -- close(fh); -+ //close(fh); - } -+ - /* shutdown tpm emulator */ - tpm_emulator_shutdown(); -- /* close socket */ -- close(sock); -- unlink(opt_socket_name); -+ /* Close handles */ -+ close(vtpm_tx_fh); -+#ifndef VTPM_MULTI_VM -+ close(vtpm_rx_fh); -+ free(vtpm_rx_file); -+#endif - info("main loop stopped"); - } - -@@ -450,12 +770,13 @@ int main(int argc, char **argv) - /* open random device */ - init_random(); - /* init signal handlers */ -- init_signal_handler(); -+ //init_signal_handler(); - /* unless requested otherwiese, fork and daemonize process */ -- if (!opt_foreground) daemonize(); -+ //if (!opt_foreground) daemonize(); - /* start main processing loop */ - main_loop(); - info("stopping TPM Emulator daemon"); - closelog(); - return 0; - } -+ -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 -@@ -29,23 +29,28 @@ - - /* TPM emulator configuration */ - --#undef TPM_STRONG_PERSISTENCE --#undef TPM_GENERATE_EK -+#define TPM_STRONG_PERSISTENCE -+#define TPM_GENERATE_EK - #undef TPM_GENERATE_SEED_DAA - #undef TPM_MEMORY_ALIGNMENT_MANDATORY - -+extern int dmi_id; -+ - /* log macros */ - - void tpm_log(int priority, const char *fmt, ...); - --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) - - /* min/max macros that also do strict type-checking */ - diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch deleted file mode 100644 index e896b25..0000000 --- a/tools/vtpm/vtpm.patch +++ /dev/null @@ -1,716 +0,0 @@ -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 -@@ -1,3 +1,3 @@ - Mario Strasser - Heiko Stamer [DAA] --INTEL Corp <> [Dropped to Ring3] -+INTEL Corp <> [VTPM Extensions] -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 -@@ -1,5 +1,6 @@ - ????-??-?? Intel Corp - * Moved module out of kernel to run as a ring 3 app -+ * Modified save_to_file and load_from_file to call xen VTPM manager - - 2006-06-23 Mario Strasser - * tpm_startup.c: behaviour of ST_CLEAR and storage of -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 -@@ -44,18 +44,26 @@ - #define TPM_DEVICE_NAME "tpm" - #define TPM_MODULE_NAME "tpm_emulator" - -+/* debug and log output functions */ -+extern int dmi_id; -+ - #ifdef DEBUG --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) - #else - #define debug(fmt, ...) -+#define debug_nostop(fmt, ...) -+#define debug_more(fmt, ...) - #endif --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) - - /* memory allocation */ - -diff -uprN tpm_emulator/Makefile vtpm/Makefile ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 -@@ -7,7 +7,7 @@ - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) - - # module settings --BIN := tpm_emulator -+BIN := vtpmd - VERSION_MAJOR := 0 - VERSION_MINOR := 4 - VERSION_BUILD := $(shell date +"%s") -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - CC := gcc - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG --CFLAGS += -I. -Itpm -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager - - # Is the simulator running in it's own vm? - #CFLAGS += -DVTPM_MULTI_VM -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt - - install: $(BIN) - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi - - clean: - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) -@@ -98,3 +97,4 @@ version: - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h - - .PHONY: all install clean dist gmp version -+ -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_TIS_TIMEOUT: - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ -+ UINT32 len = *respSize = 16; -+ BYTE *ptr = *resp = tpm_malloc(*respSize); -+ if (ptr == NULL || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { -+ tpm_free(*resp); -+ return TPM_FAIL; -+ } -+ return TPM_SUCCESS; - - case TPM_CAP_PROP_STARTUP_EFFECT: - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_DURATION: - debug("[TPM_CAP_PROP_DURATION]"); -- /* TODO: TPM_CAP_PROP_DURATION */ -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; -+ *respSize = 16; -+ *resp = tpm_malloc(*respSize); -+ memcpy(*resp,dur,16); - return TPM_FAIL; - - case TPM_CAP_PROP_ACTIVE_COUNTER: -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO - sha1_ctx_t sha1; - UINT32 res = CPU_TO_BE32(rsp->result); - UINT32 ord = CPU_TO_BE32(ordinal); -+ UINT32 offset = 0; - - /* compute SHA1 hash */ - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*)&res, 4); - sha1_update(&sha1, (BYTE*)&ord, 4); -- sha1_update(&sha1, rsp->param, rsp->paramSize); -+ if (ordinal == TPM_ORD_LoadKey2) { -+ offset = 4; -+ } -+ if (rsp->paramSize - offset > 0) { -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); -+ } - sha1_final(&sha1, rsp->auth1->digest); - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, - rsp->auth1->digest, sizeof(rsp->auth1->digest)); -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -15,10 +16,15 @@ - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ - */ - -+#include -+#include -+#include -+#include -+ - #include "tpm_emulator.h" - #include "tpm_structures.h" - #include "tpm_marshalling.h" --#include "linux_module.h" -+#include "vtpm_manager.h" - - TPM_DATA tpmData; - -@@ -158,45 +164,232 @@ void tpm_release_data(void) - #include - #include - #include --#include - --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#ifdef VTPM_MUTLI_VM -+ #define DEV_FE "/dev/tpm" -+#else -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -+ -+ extern int dmi_id; -+ static char *vtpm_rx_name=NULL; -+#endif - - static int write_to_file(uint8_t *data, size_t data_length) - { -- int res; -- int fp; -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- res = write(fp, data, data_length); -- close(fp); -- return (res == data_length) ? 0 : -1; -+ int res, out_data_size, in_header_size; -+ BYTE *ptr, *out_data, *in_header; -+ UINT32 result, len, in_rsp_size; -+ UINT16 tag = VTPM_TAG_REQ; -+ -+ printf("Saving NVM\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; -+#endif -+ -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { -+ free(out_data); -+ return -1; -+ } -+ -+ printf("\tSending SaveNVM Command.\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); -+ } -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading SaveNVM header.\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_tx_fh); close(vtpm_rx_fh); -+#endif -+ -+ printf("\tFinishing up SaveNVM\n"); -+ return (0); - } - - static int read_from_file(uint8_t **data, size_t *data_length) - { -- int res; -- int fp, file_status; -- struct stat file_info; -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); -- file_status = fstat(fp, &file_info); -- if (file_status < 0) { -- close(fp); -- return -1; -- } -+ int res, out_data_size, in_header_size; -+ uint8_t *ptr, *out_data, *in_header; -+ UINT16 tag = VTPM_TAG_REQ; -+ UINT32 len, in_rsp_size, result; -+#ifdef VTPM_MUTLI_VM -+ int vtpm_rx_fh, vtpm_tx_fh; -+#endif -+ -+ printf("Loading NVM.\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } - -- *data_length = file_info.st_size; -- *data = tpm_malloc(*data_length); -- if (*data == NULL) { -- close(fp); -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { -+ free(out_data); - return -1; - } -- res = read(fp, *data, *data_length); -- close(fp); -+ -+ printf("\tSending LoadNVM command\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); -+ } -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading LoadNVM header\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+ // Read Encrypted data from VTPM Manager -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; -+ *data = (uint8_t *) malloc(*data_length); -+ -+ printf("\tReading clear data from LoadNVM.\n"); -+ res = read(vtpm_rx_fh, *data, *data_length); -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_rx_fh);close(vtpm_tx_fh); -+#endif -+ -+ printf("\tReturing from loading NVM\n"); - if (res != *data_length) { -- tpm_free(*data); -- return -1; -+ free(*data); -+ return -1; -+ } else { -+ return 0; - } -- return 0; -+ - } - - #else -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 -@@ -21,12 +21,24 @@ - #include - #include - #include -+#include -+#include -+#include - - #include "tpm_emulator.h" -+#include "vtpm_manager.h" - --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" -+#ifdef VTPM_MULTI_VM -+ #define DEV_BE "/dev/vtpm" -+#else -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" - -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" -+#endif -+ -+ int dmi_id; -+ - #define BUFFER_SIZE 2048 - - static int devurandom=0; -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby - } - - if (read(devurandom, buf, nbytes) != nbytes) { -- printf("Can't get random number.\n"); -+ error("Can't get random number.\n"); - exit(-1); - } - } -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) - - int main(int argc, char **argv) - { -- uint8_t in[BUFFER_SIZE], *out; -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; -+ char *vtpm_rx_file=NULL; - uint32_t out_size; - int in_size, written; -- int i; -- struct stat file_info; -+ int i, guest_id=-1; - -- int tpm_tx_fh=-1, tpm_rx_fh=-1; -+#ifndef VTPM_MULTI_VM -+ int sockfd = -1; -+ struct sockaddr_un addr; -+ struct sockaddr_un client_addr; -+ unsigned int client_length; -+ -+#endif -+ -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+#ifdef VTPM_MULTI_VM - if (argc < 2) { -- printf("Usage: tpmd clear|save|deactivated\n" ); -+ error("Usage: tpmd clear|save|deactivated\n" ); -+#else -+ if (argc < 4) { -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); -+#endif - return -1; - } - -+#ifndef VTPM_MULTI_VM -+ /* setup type of vm */ -+ if (!strcmp(argv[2], "pvm")) { -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo -+ } else if (!strcmp(argv[2], "hvm")) { -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket -+ } else { -+ error("invalid vTPM type '%s'.\n", argv[2]); -+ } -+ -+ dmi_id = atoi(argv[3]); -+ -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); -+ } else { -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); -+ -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { -+ error("Unable to create socket. errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&addr, 0, sizeof(addr)); -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path,vtpm_rx_file ); -+ unlink(addr.sun_path); -+ } -+#endif -+ -+#ifdef VTPM_MULTI_VM -+ info("Initializing tpm state: %s\n", argv[1]); -+#else -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); -+#endif -+ - /* initialize TPM emulator */ - if (!strcmp(argv[1], "clear")) { -- printf("Initializing tpm: %s\n", argv[1]); - tpm_emulator_init(1); -- } else if (!strcmp(argv[1], "save")) { -- printf("Initializing tpm: %s\n", argv[1]); -+ } else if (!strcmp(argv[1], "save")) { - tpm_emulator_init(2); - } else if (!strcmp(argv[1], "deactivated")) { -- printf("Initializing tpm: %s\n", argv[1]); - tpm_emulator_init(3); - } else { -- printf("invalid startup mode '%s'; must be 'clear', " -+ error("invalid startup mode '%s'; must be 'clear', " - "'save' (default) or 'deactivated", argv[1]); - return -1; - } -- -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); -- return -1; -- } -- } -- -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); -- return -1; -- } -- } -- -+ - while (1) { - abort_command: -- if (tpm_rx_fh < 0) { -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); -+#else -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); -+ } else { -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { -+ error("Unable to bind(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ if (listen(sockfd, 10) <0) { -+ error("Unable to listen(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&client_addr, 0, sizeof(client_addr)); -+ client_length = sizeof(client_addr); -+ -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); -+ } -+#endif - } - -- if (tpm_rx_fh < 0) { -- printf("ERROR: failed to open devices to listen to guest.\n"); -+ if (vtpm_rx_fh < 0) { -+ error("Failed to open devices to listen to guest.\n"); - return -1; - } - -- if (tpm_tx_fh < 0) { -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); -- } -- -- if (tpm_tx_fh < 0) { -- printf("ERROR: failed to open devices to respond to guest.\n"); -- return -1; -- } -- -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); - if (in_size < 6) { // Magic size of minium TPM command -- printf("Recv[%d] to small: 0x", in_size); -+ info("Recv incomplete command of %d bytes.", in_size); - if (in_size <= 0) { -- close(tpm_rx_fh); -- tpm_rx_fh = -1; -+ close(vtpm_rx_fh); -+ vtpm_rx_fh = -1; - goto abort_command; - } - } else { -- printf("Recv[%d]: 0x", in_size); -+ debug_nostop("Recv[%d]: 0x", in_size); - for (i=0; i< in_size; i++) -- printf("%x ", in[i]); -- printf("\n"); -+ debug_more("%x ", in[i]); -+ debug_more("\n"); - } - -- -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { -- printf("ERROR: Handler Failed.\n"); -+ if (guest_id == -1) { -+ guest_id = *((uint32_t *) in); -+ } else { -+ if (guest_id != *((uint32_t *) in) ) { -+ error("WARNING: More than one guest attached\n"); -+ } -+ } -+ -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); -+ } // No need to open the other direction for HVM -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ error("Failed to open devices to respond to guest.\n"); -+ return -1; -+ } -+ -+ // Handle the command, but skip the domain id header -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { -+ error("Handler Failed.\n"); - } - -- written = write(tpm_tx_fh, out, out_size); -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); -+ *(uint32_t *) addressed_out = *(uint32_t *) in; -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); -+ -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); - -- if (written != out_size ) { -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); -+ if (written != out_size + sizeof(uint32_t)) { -+ error("Part of response not written %d/%d.\n", written, out_size); - } else { -- printf("Sent[%Zu]: ", out_size); -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) -+ debug_more("%x ", addressed_out[i]); -+ debug_more("\n"); - } -- for (i=0; i< out_size; i++) -- printf("%x ", out[i]); -- printf("\n"); - tpm_free(out); -+ tpm_free(addressed_out); - - } // loop - - tpm_emulator_shutdown(); - -- close(tpm_tx_fh); -- close(tpm_rx_fh); -+ close(vtpm_tx_fh); -+#ifndef VTPM_MUTLI_VM -+ close(vtpm_rx_fh); -+ free (vtpm_rx_file); -+#endif - - } diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING deleted file mode 100644 index c4b86b7..0000000 --- a/tools/vtpm_manager/COPYING +++ /dev/null @@ -1,32 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile deleted file mode 100644 index 632f41b..0000000 --- a/tools/vtpm_manager/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. - -# Base definitions and rules -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -SUBDIRS = crypto tcs util manager migration -OPENSSL_HEADER = /usr/include/openssl/crypto.h - -.PHONY: all clean install -all clean install: %: subdirs-% - -.PHONY: mrproper -mrproper: - @set -e; for subdir in $(SUBDIRS); do \ - $(MAKE) -C $$subdir $@; \ - done - - diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README deleted file mode 100644 index f0d1e98..0000000 --- a/tools/vtpm_manager/README +++ /dev/null @@ -1,94 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -Directory Structure -=================== -tools/vtpm_manager/crypto -> crypto files -tools/vtpm_manager/TCS -> TCS implementation -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. -tools/vtpm_manager/manager -> VTPM Manager - -Compile Flags -=================== -LOGGING_MODULES -> How extensive logging happens - see util/log.h for more info - -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs - Not Defined (default): VTPMs are processes - -# Debugging flags that may disappear without notice in the future - -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and - /tmp/out.fifo rather than backend - -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs - -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, - use a well known value. This is useful for debugging and for - poor bios which do not support clearing TPM if OwnerAuth is - lost. However this has no protection from malicious app - issuing a TPM_OwnerClear to wipe the TPM - -Requirements -============ -- xen-unstable -- vtpm frontend/backend driver patch -- OpenSSL Library - -Single-VM Flow -============================ -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. -- VTPM Manager listens to TPM BE. -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. -- When the manager receives the open message from the BE, it launches a vtpm -- Xend allows the VM to continue booting. -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. -- The fifo listener begins listening for the reply from vtpm for the request. -- Vtpm processes request and replies to manager over shared named fifo. -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. - -NOTES: -* SaveService SHOULD seal it's table before saving it to disk. However, - the current Xen infrastructure does not provide a mechanism for this to be - unsealed later. Specifically, the auth and wrapped key must be available ONLY - to the service, or it's not even worth encrypting - - In the future the vtpm manager will be protected by an early boot mechanism - that will allow for better protection of it's data. - -TODO: -- Timeout on crashed vtpms -- create lock for shared fifo for talking to vtpms. diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk deleted file mode 100644 index 651772b..0000000 --- a/tools/vtpm_manager/Rules.mk +++ /dev/null @@ -1,59 +0,0 @@ -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) -include $(XEN_ROOT)/tools/Rules.mk - -# -# Tool definitions -# - -# General compiler flags -CFLAGS = -Werror -g3 - -# Generic project files -HDRS = $(wildcard *.h) -SRCS = $(wildcard *.c) -OBJS = $(patsubst %.c,%.o,$(SRCS)) - -# Generic (non-header) dependencies -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -$(OBJS): $(SRCS) - --include $(FILES) - -# Make sure these are just rules -.PHONY : all build install clean - -# -# Project-specific definitions -# - -# Need UNIX98 spec for pthread rwlocks -CFLAGS += -D_GNU_SOURCE - -# Logging Level. See utils/tools.h for usage -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" - -# Silent Mode -#CFLAGS += -DLOGGING_MODULES=0x0 -#CFLAGS += -DLOGGING_MODULES=0xff - -# Use frontend/backend pairs between manager & DMs? -#CFLAGS += -DVTPM_MULTI_VM - -# vtpm_manager listens on fifo's rather than backend -#CFLAGS += -DDUMMY_BACKEND - -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos -#CFLAGS += -DDUMMY_TPM - -# Do not have manager launch DMs. -#CFLAGS += -DMANUAL_DM_LAUNCH - -# Fixed OwnerAuth -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH - -# Include -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile deleted file mode 100644 index 13b61c9..0000000 --- a/tools/vtpm_manager/crypto/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libtcpaCrypto.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c deleted file mode 100644 index 7dae655..0000000 --- a/tools/vtpm_manager/crypto/crypto.c +++ /dev/null @@ -1,88 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// crypto.c -// -// This file will handle all the TPM Crypto functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include "crypto.h" -#include "log.h" - -/** - * Initialize cryptography library - * @rand: random seed - * @size: size of @rand - */ -void Crypto_Init(const BYTE* rand, int size) { - ERR_load_crypto_strings(); - CRYPTO_malloc_init(); - OpenSSL_add_all_algorithms(); - SYM_CIPHER = EVP_aes_128_cbc(); - RAND_poll(); - if (rand == NULL) - return; - - RAND_add(rand, size, size); -} - -/** - * Shutdown cryptography library - */ -void Crypto_Exit() { - ERR_free_strings(); - ERR_remove_state(0); - EVP_cleanup(); -} - - -/** - * Get random data - * @data: (OUT) Random data - * @size: Size of @data - */ -void Crypto_GetRandom(void* data, int size) { - int result; - - result = RAND_pseudo_bytes((BYTE*) data, size); - - if (result <= 0) - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", - ERR_error_string (ERR_get_error(), NULL)); -} diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h deleted file mode 100644 index 488d4d6..0000000 --- a/tools/vtpm_manager/crypto/crypto.h +++ /dev/null @@ -1,175 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// crypto.h -// -// This file defines the TPM Crypto API -// -// ================================================================== - -#ifndef __CRYPTO_H__ -#define __CRYPTO_H__ - -#include -#include -#include - -#include "tcg.h" -#include "sym_crypto.h" - -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes - -#define OAEP_P "TCPA" -#define OAEP_P_SIZE 4 - -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID -#define CRYPTO_ALGORITH_RSA 0x01 - -// Supported Encryption Schemes CRYPTO_INFO.encScheme -#define CRYPTO_ES_NONE 0x0001 -#define CRYPTO_ES_RSAESPKCSv15 0x0002 -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 - -// Supported Signature schemes CRYPTO_INFO.sigScheme -#define CRYPTO_SS_NONE 0x0001 -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 - -typedef struct CRYPTO_INFO { - void *keyInfo; - UINT32 algorithmID; - UINT32 encScheme; - UINT32 sigScheme; -} CRYPTO_INFO; - - -void Crypto_Init(const BYTE* rand, int size); - -void Crypto_Exit(); - -void Crypto_GetRandom(void* data, int size); - -void Crypto_HMAC( const BYTE* text, - int text_len, - const BYTE* key, - int key_len, - BYTE* digest); - -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, - const buffer_t * key, - BYTE * o_digest); /* presumably of 20 bytes */ - -void Crypto_SHA1Full( const BYTE* text, - UINT32 size, - BYTE* hash); //Complete 3part SHA1 - -// o_hash needs to be large enough to hold the digest, ie 20 bytes -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, - BYTE * o_hash); - -void Crypto_SHA1Start(UINT32* maxNumBytes); -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); -void Crypto_SHA1Complete( int hashDataSize, - const BYTE* hashData, - BYTE* hashValue); - -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, - /*in*/ UINT32 pubExpSize, - /*in*/ BYTE *pubExp, - /*out*/ UINT32 *privExpSize, - /*out*/ BYTE *privExp, - /*out*/ UINT32 *modulusSize, - /*out*/ BYTE *modulus, - /*out*/ CRYPTO_INFO *keys); - -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 privExpSize, - /*[IN]*/ BYTE *privExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); - -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo); - -// -// symmetric pack and unpack operations -// -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, - BYTE ** io_buf, UINT32 * io_buflen); - -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, - BYTE * in, UINT32 len, - UINT32 * o_lenread); - - -// return 0 on success, -1 on error -int Crypto_RSAEnc( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData); - -// return 0 on success, -1 on error -int Crypto_RSADec( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData); - -// return 0 on success, -1 on error -int Crypto_RSASign( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *sigSize, - /*out*/ BYTE *sig); - -bool Crypto_RSAVerify( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - UINT32 sigSize, - BYTE *sig); - -//private: -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); - -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); - -#endif // __CRYPTO_H__ diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c deleted file mode 100644 index c73114a..0000000 --- a/tools/vtpm_manager/crypto/hash.c +++ /dev/null @@ -1,153 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// hash.c -// -// This file will handle all the TPM Hash functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tcg.h" // for TPM_SUCCESS -#include "crypto.h" - -static SHA_CTX g_shaContext; - -void Crypto_HMAC( const BYTE* text, - int text_len, - const BYTE* key, - int key_len, - BYTE* digest) { - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) - return; - - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); -} - -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, - const buffer_t * key, - BYTE * o_digest) { /* presumably of 20 bytes */ - - Crypto_HMAC (text->bytes, text->size, - key->bytes, key->size, - o_digest); - - return TPM_SUCCESS; -} - - -/* - * SHA1 - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally - */ -void Crypto_SHA1Full( const BYTE* text, - uint32_t size, - BYTE* hash) { - - if (text == NULL || size == 0) - return; - - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete - uint32_t maxBytes; // Not used for anything - Crypto_SHA1Start(&maxBytes); - - while (size > 64){ - Crypto_SHA1Update(64, text); - size -= 64; - text += 64; - } - - Crypto_SHA1Complete(size, text, hash); -} - -// same thing using buffer_t -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, - BYTE * o_digest) { - - if (buf->bytes == NULL || buf->size == 0) - return TPM_BAD_PARAMETER; - - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); - - return TPM_SUCCESS; -} - - -/* - * Initialize SHA1 - * (OUT) Maximum number of bytes that can be sent to SHA1Update. - * Must be a multiple of 64 bytes. - */ -void Crypto_SHA1Start(uint32_t* maxNumBytes) { - int max = SHA_CBLOCK; - // Initialize the crypto library - SHA1_Init(&g_shaContext); - *maxNumBytes = max; -} - -/* - * Process SHA1 - * @numBytes: (IN) The number of bytes in hashData. - * Must be a multiple of 64 bytes. - * @hashData: (IN) Bytes to be hashed. - */ -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { - - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) - return; - - SHA1_Update(&g_shaContext, hashData, numBytes); -} - -/* - * Complete the SHA1 process - * @hashDataSize: (IN) Number of bytes in hashData. - * Must be a multiple of 64 bytes. - * @hashData: (IN) Final bytes to be hashed. - * @hashValue: (OUT) The output of the SHA-1 hash. - */ -void Crypto_SHA1Complete(int hashDataSize, - const BYTE* hashData, - BYTE* hashValue) { - SHA1_Update(&g_shaContext, hashData, hashDataSize); - SHA1_Final(hashValue, &g_shaContext); -} diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c deleted file mode 100644 index 7737dc6..0000000 --- a/tools/vtpm_manager/crypto/rsa.c +++ /dev/null @@ -1,434 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// rsa.c -// -// This file will handle all the TPM RSA crypto functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "crypto.h" -#include "log.h" - -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, - /*in*/ UINT32 pubExpSize, - /*in*/ BYTE *pubExp, - /*out*/ UINT32 *privExpSize, - /*out*/ BYTE *privExp, - /*out*/ UINT32 *modulusSize, - /*out*/ BYTE *modulus, - /*out*/ CRYPTO_INFO *keys) { - unsigned long e_value; - - if (pubExpSize == 0) // Default e = 2^16+1 - e_value = (0x01 << 16) + 1; - else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - e_value = (0x01 << 16) + 1; - } - - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); - - if (keys) { - keys->keyInfo = rsa; - keys->algorithmID = CRYPTO_ALGORITH_RSA; - } - - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); -} - -// Create a CRYPTO_INFO struct from the BYTE * key parts. -// If pubExp info is NULL, use TCG default. -// If there is a remainder while calculating the privExp, return FALSE. - -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 privExpSize, - /*[IN]*/ BYTE *privExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo) { - cryptoInfo->keyInfo = RSA_new(); - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - rsa->e = BN_new(); - - if (pubExpSize == 0) { // Default e = 2^16+1 - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } - - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); -} - -// Create a CRYPTO_INFO struct from the BYTE * key parts. -// If pubExp info is NULL, use TCG default. -// If there is a remainder while calculating the privExp, return FALSE. - -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo) { - cryptoInfo->keyInfo = RSA_new(); - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - rsa->e = BN_new(); - - if (pubExpSize == 0) { // Default e = 2^16+1 - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } - - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); - -} - -int Crypto_RSAEnc( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData) { - RSA *rsa = (RSA *) key->keyInfo; - UINT32 paddedDataSize = RSA_size (rsa); - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); - int rc; - - if (paddedData == NULL) - return -1; - - *outDataSize = 0; - - switch (key->encScheme) { - case CRYPTO_ES_RSAESPKCSv15: - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { - rc = -1; - goto abort_egress; - } - break; - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { - rc = -1; - goto abort_egress; - } - break; - default: - rc = -1; - goto abort_egress; - } - - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); - if (rc == -1) - goto abort_egress; - - *outDataSize = rc; - - if (rc > 0) rc = 0; - - goto egress; - - abort_egress: - egress: - - if (paddedData) - free (paddedData); - return rc; - -} - -int Crypto_RSADec( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData) { - - RSA *rsa = (RSA *) key->keyInfo; - UINT32 paddedDataSize = RSA_size (rsa); - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); - int rc; - - if (paddedData == NULL) - goto abort_egress; - - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - - paddedDataSize = rc; - - switch (key->encScheme) { - case CRYPTO_ES_RSAESPKCSv15: - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, - paddedData + 1, paddedDataSize - 1, - RSA_size(rsa)); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", - ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - *outDataSize = rc; - break; - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, - paddedData + 1, paddedDataSize - 1, - RSA_size(rsa), - (BYTE *) OAEP_P, OAEP_P_SIZE); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", - ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - *outDataSize = rc; - break; - default: - *outDataSize = 0; - } - - free(paddedData); paddedData = NULL; - goto egress; - - abort_egress: - - if (paddedData) - free (paddedData); - return -1; - - egress: - return 0; -} - -// Signs either a SHA1 digest of a message or a DER encoding of a message -// Textual messages MUST be encoded or Hashed before sending into this function -// It will NOT SHA the message. -int Crypto_RSASign( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *sigSize, - /*out*/ BYTE *sig) { - int status; - unsigned int intSigSize; - - switch(key->sigScheme) { - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); - break; - case CRYPTO_SS_RSASSAPKCS1v15_DER: - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); - status = 0; - break; - default: - status = 0; - } - - if (status == 0) { - *sigSize = 0; - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); - return -1; - } - - *sigSize = (UINT32) intSigSize; - return 0; -} - -bool Crypto_RSAVerify( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - UINT32 sigSize, - BYTE *sig) { - int status; - - switch(key->sigScheme){ - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); - break; - case CRYPTO_SS_RSASSAPKCS1v15_DER: - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); - status = 0; - break; - default: - status = 0; - } - - if (status) - return(1); - else { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); - return(0); - } - -} - -// helper which packs everything into a BIO! - -// packs the parameters first, then the private key, then the public key -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in -// *io_buflen -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, - BYTE ** io_buf, UINT32 * io_buflen) { - TPM_RESULT status = TPM_SUCCESS; - BYTE * buf; - long len, outlen = *io_buflen; - - const long PARAMSLEN = 3*sizeof(UINT32); - - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - BIO *mem = BIO_new(BIO_s_mem()); - - - // write the openssl keys to the BIO - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_SIZE); - } - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_SIZE); - } - - // get the buffer out - len = BIO_get_mem_data (mem, &buf); - - // see if we need to allocate a return buffer - if (*io_buf == NULL) { - *io_buf = (BYTE*) malloc (PARAMSLEN + len); - if (*io_buf == NULL) - ERRORDIE (TPM_SIZE); - } else { // *io_buf is already allocated - if (outlen < len + PARAMSLEN) - ERRORDIE (TPM_SIZE); // but not large enough! - } - - // copy over the parameters (three UINT32's starting at algorithmID) - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); - - // copy over the DER keys - memcpy (*io_buf + PARAMSLEN, buf, len); - - *io_buflen = len + PARAMSLEN; - - goto egress; - - - abort_egress: - egress: - - BIO_free (mem); - - return status; -} - - - -// sets up ci, and returns the number of bytes read in o_lenread -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, - BYTE * in, UINT32 len, - UINT32 * o_lenread) { - - TPM_RESULT status = TPM_SUCCESS; - long l; - BIO *mem; - RSA *rsa; - - // first load up the params - l = 3 * sizeof(UINT32); - memcpy (&ci->algorithmID, in, l); - len -= l; - in += l; - - // and now the openssl keys, private first - mem = BIO_new_mem_buf (in, len); - - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_BAD_PARAMETER); - } - // now use the same RSA object and fill in the private key - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_BAD_PARAMETER); - } - - ci->keyInfo = rsa; // needs to be freed somehow later - - // FIXME: havent figured out yet how to tell how many bytes were read in the - // above oprations! so o_lenread is not set - - goto egress; - - abort_egress: - egress: - - BIO_free (mem); - - return status; -} diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c deleted file mode 100644 index 3d86e19..0000000 --- a/tools/vtpm_manager/crypto/sym_crypto.c +++ /dev/null @@ -1,237 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// sym_crypto.c -// -// Symmetric crypto portion of crypto -// -// ================================================================== - -#include -#include - -#include "tcg.h" -#include "sym_crypto.h" - -typedef enum crypt_op_type_t { - CRYPT_ENCRYPT, - CRYPT_DECRYPT -} crypt_op_type_t; - -TPM_RESULT ossl_symcrypto_op (symkey_t* key, - const buffer_t* in, - const buffer_t* iv, - buffer_t * out, - crypt_op_type_t optype); - - -// this is initialized in Crypto_Init() -const EVP_CIPHER * SYM_CIPHER = NULL; - -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; - - -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { - TPM_RESULT status = TPM_SUCCESS; - - EVP_CIPHER_CTX_init (&key->context); - - key->cipher = SYM_CIPHER; - - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); - - goto egress; - - abort_egress: - EVP_CIPHER_CTX_cleanup (&key->context); - - egress: - - return status; -} - - - -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { - int res; - TPM_RESULT status = TPM_SUCCESS; - - // hmm, EVP_CIPHER_CTX_init does not return a value - EVP_CIPHER_CTX_init (&key->context); - - key->cipher = SYM_CIPHER; - - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; - - // and generate the key material - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); - if (res < 0) - ERRORDIE (TPM_SHORTRANDOM); - - - goto egress; - - abort_egress: - EVP_CIPHER_CTX_cleanup (&key->context); - buffer_free (&key->key); - - egress: - return status; -} - - -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, - const buffer_t* clear, - buffer_t* o_cipher) { - TPM_RESULT status = TPM_SUCCESS; - - buffer_t iv, cipher_alias; - - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); - - buffer_init (o_cipher, - clear->size + - EVP_CIPHER_iv_length(key->cipher) + - EVP_CIPHER_block_size (key->cipher), - 0); - - // copy the IV into the front - buffer_copy (o_cipher, &iv); - - // make an alias into which we'll put the ciphertext - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); - - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); - - // set the output size correctly - o_cipher->size += cipher_alias.size; - - goto egress; - - abort_egress: - - egress: - - return status; - -} - - - -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, - const buffer_t* cipher, - buffer_t* o_clear) { - TPM_RESULT status = TPM_SUCCESS; - - buffer_t iv, cipher_alias; - - // alias for the IV - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); - - // make an alias to where the ciphertext is, after the IV - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); - - // prepare the output buffer - TPMTRYRETURN( buffer_init (o_clear, - cipher->size - - EVP_CIPHER_iv_length(key->cipher) - + EVP_CIPHER_block_size(key->cipher), - 0) ); - - // and decrypt - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); - - goto egress; - - abort_egress: - buffer_free (o_clear); - - egress: - - return status; -} - - - -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { - buffer_memset (&key->key, 0); - buffer_free (&key->key); - - EVP_CIPHER_CTX_cleanup (&key->context); - - return TPM_SUCCESS; -} - - -TPM_RESULT ossl_symcrypto_op (symkey_t* key, - const buffer_t* in, - const buffer_t* iv, - buffer_t * out, - crypt_op_type_t optype) { - TPM_RESULT status = TPM_SUCCESS; - - int inlen, outlen; - tpm_size_t running; - - if ( ! EVP_CipherInit_ex (&key->context, - key->cipher, NULL, key->key.bytes, iv->bytes, - optype == CRYPT_ENCRYPT ? 1 : 0) ) - ERRORDIE (TPM_FAIL); - - - - inlen = in->size; - - outlen = 0; - running = 0; - - - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) - ERRORDIE (TPM_FAIL); - - running += outlen; - - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) - ERRORDIE (TPM_FAIL); - - running += outlen; - - out->size = running; - - goto egress; - - abort_egress: - egress: - - return status; -} diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h deleted file mode 100644 index 7fb59a8..0000000 --- a/tools/vtpm_manager/crypto/sym_crypto.h +++ /dev/null @@ -1,72 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// sym_crypto.h -// -// Symmetric Crypto -// -// ================================================================== - -#ifndef _SYM_CRYPTO_H -#define _SYM_CRYPTO_H - -#include -#include "buffer.h" - -typedef struct symkey_t { - buffer_t key; - - EVP_CIPHER_CTX context; - const EVP_CIPHER * cipher; -} symkey_t; - -extern const EVP_CIPHER * SYM_CIPHER; - -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); - -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); - - -// these functions will allocate their output buffers -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, - const buffer_t* clear, - buffer_t* o_cipher); - -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, - const buffer_t* cipher, - buffer_t* o_clear); - -// only free the internal parts, not the 'key' ptr -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); - -#endif /* _SYM_CRYPTO_H */ diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile deleted file mode 100644 index a33c18a..0000000 --- a/tools/vtpm_manager/manager/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = vtpm_managerd - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ - fi - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ - fi - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: - rm -f $(BIN) - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -# libraries -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a -LIBS += -lcrypto $(PTHREAD_LIBS) -lm -CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LDFLAGS) diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c deleted file mode 100644 index 5c3cf7e..0000000 --- a/tools/vtpm_manager/manager/dmictl.c +++ /dev/null @@ -1,266 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// dmictl.c -// -// Functions for creating and destroying DMIs -// -// ================================================================== - -#include -#include -#include - -#include "vtpmpriv.h" -#include "bsg.h" -#include "buffer.h" -#include "log.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "vtpm_ipc.h" - -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" - -// if dmi_res is non-null, then return a pointer to new object. -// Also, this does not fill in the measurements. They should be filled by -// design dependent code or saveNVM -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { - - TPM_RESULT status=TPM_SUCCESS; - VTPM_DMI_RESOURCE *new_dmi=NULL; - UINT32 *dmi_id_key=NULL; - - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { - status = TPM_RESOURCES; - goto abort_egress; - } - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); - new_dmi->dmi_id = dmi_id; - new_dmi->dmi_type = dmi_type; - new_dmi->connected = FALSE; - new_dmi->TCSContext = 0; - - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); - - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { - status = TPM_RESOURCES; - goto abort_egress; - } - *dmi_id_key = new_dmi->dmi_id; - - // install into map - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); - status = TPM_FAIL; - goto abort_egress; - } - - if (dmi_res) - *dmi_res = new_dmi; - - goto egress; - - abort_egress: - if (new_dmi) { - free(new_dmi->NVMLocation); - free(new_dmi); - } - free(dmi_id_key); - - egress: - return status; -} - -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { - if (dmi_res == NULL) - return TPM_SUCCESS; - - if (dmi_res->dmi_id == VTPM_CTL_DM) - return(TPM_BAD_PARAMETER); - - TCS_CloseContext(dmi_res->TCSContext); - dmi_res->connected = FALSE; - - vtpm_globals->connected_dmis--; - - return (VTPM_Close_DMI_Extra(dmi_res) ); -} - -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { - - VTPM_DMI_RESOURCE *new_dmi=NULL; - TPM_RESULT status=TPM_FAIL; - BYTE dmi_type, vm_type, startup_mode; - UINT32 dmi_id; - - if (param_buf == NULL) { // Assume creation of Dom 0 control - dmi_type = VTPM_TYPE_NON_MIGRATABLE; - dmi_id = VTPM_CTL_DM; - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } else { - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 - BSG_UnpackList( param_buf->bytes, 4, - BSG_TYPE_BYTE, &dmi_type, - BSG_TYPE_BYTE, &startup_mode, - BSG_TYPE_BYTE, &vm_type, - BSG_TYPE_UINT32, &dmi_id); - } - - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (new_dmi == NULL) { - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); - // Brand New DMI. Initialize the persistent pieces - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); - } else - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); - - if (new_dmi->connected) { - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Initialize the Non-persistent pieces - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); - - new_dmi->connected = TRUE; - - // Design specific new DMI code. - // Includes: create IPCs, Measuring DMI, and maybe launching DMI - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); - close_dmi(new_dmi ); - - egress: - return status; -} - -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *dmi_res=NULL; - UINT32 dmi_id; - - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - BSG_UnpackList( param_buf->bytes, 1, - BSG_TYPE_UINT32, &dmi_id); - - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); - - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (dmi_res == NULL ) { - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (!dmi_res->connected) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Close Dmi - TPMTRYRETURN(close_dmi( dmi_res )); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *dmi_res=NULL; - UINT32 dmi_id; - - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - BSG_UnpackList( param_buf->bytes, 1, - BSG_TYPE_UINT32, &dmi_id); - - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); - - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); - if (dmi_res == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - //vtpm scripts delete file dmi_res->NVMLocation for us - - // Close DMI first - TPMTRYRETURN(close_dmi( dmi_res )); - free ( dmi_res ); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c deleted file mode 100644 index 54da708..0000000 --- a/tools/vtpm_manager/manager/migration.c +++ /dev/null @@ -1,307 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// dmictl.c -// -// Functions for creating and destroying DMIs -// -// ================================================================== - -#include -#include -#include - -#include "vtpmpriv.h" -#include "bsg.h" -#include "buffer.h" -#include "log.h" -#include "hashtable.h" - -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *mig_dmi=NULL; - UINT32 dmi_id; - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; - - if (param_buf == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - struct pack_buf_t enc_dmi_state_pack; - - BSG_UnpackList(param_buf->bytes, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; - - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); - - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (mig_dmi) { - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** UnBind Blob **/ - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, - enc_dmi_state_pack.size, - enc_dmi_state_pack.data) ); - - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, - vtpm_globals->manager_tcs_handle, - vtpm_globals->storageKeyHandle, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - &clear_dmi_blob) ); - - // Create new dmi - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); - - /** Open Blob **/ - struct pack_buf_t dmi_state_pack; - - BSG_UnpackList(clear_dmi_blob.bytes, 2, - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, - BSG_TPM_SIZE32_DATA, &dmi_state_pack); - - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, - dmi_state_pack.size, - dmi_state_pack.data) ); - - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); - - egress: - buffer_free(&clear_dmi_blob); - buffer_free(&dmi_state_abuf); - - return status; -} - -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *mig_dmi; - UINT32 dmi_id; - VTPM_MIGKEY_LIST *last_mig, *mig_key; - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; - - if (param_buf == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - struct pack_buf_t name_pack; - - BSG_UnpackList( param_buf->bytes, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_SIZE32_DATA, &name_pack); - - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); - - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (mig_dmi == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** Find migration key for dest **/ - last_mig = NULL; - mig_key = vtpm_globals->mig_keys; - while (mig_key != NULL) { - if (mig_key->name_size == name_pack.size) - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { - break; - } - - last_mig = mig_key; - mig_key = mig_key->next; - } - - if (!mig_key) { - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** Mark vtpm as migrated **/ - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; - - /** Build Blob **/ - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); - - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); - - struct pack_constbuf_t dmi_state_pack; - - dmi_state_pack.size = buffer_len(&dmi_state); - dmi_state_pack.data = dmi_state.bytes; - - BSG_PackList(clear_dmi_blob.bytes, 2, - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, - BSG_TPM_SIZE32_DATA, &dmi_state_pack); - - /** Bind Blob **/ - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, - &mig_key->key, - result_buf) ); - - if (last_mig) - last_mig->next = mig_key->next; - else - vtpm_globals->mig_keys = mig_key->next; - - free(mig_key->name); - free(mig_key); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); - - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. - - egress: - - buffer_free(&clear_dmi_blob); - buffer_free(&dmi_state); - - return status; -} - - -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); - - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; - TPM_KEY mig_key; - - // Unpack/return key structure - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - mig_key.algorithmParms.parms, - &rsaKeyParms); - - pubkey_exp_pack.size = rsaKeyParms.exponentSize; - pubkey_exp_pack.data = rsaKeyParms.exponent; - pubkey_mod_pack.size = mig_key.pubKey.keyLength; - pubkey_mod_pack.data = mig_key.pubKey.key; - - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + - pubkey_exp_pack.size + - pubkey_mod_pack.size, NULL ) ); - - BSG_PackList( result_buf->bytes, 2, - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); - - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); - egress: - - return status; -} - -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_MIGKEY_LIST *mig_key; - - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); - - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them - - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; - - //FIXME: scan list and verify name is not already in the list - - BSG_UnpackList( param_buf->bytes, 3, - BSG_TPM_SIZE32_DATA, &name_pack, - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); - - //TODO: Maintain a persistent list for pub_keys. - //TODO: Verify pub_key is trusted - - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); - mig_key->name_size = name_pack.size; - mig_key->name = name_pack.data; - - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, - pubkey_exp_pack.data, - pubkey_mod_pack.size, - pubkey_mod_pack.data, - &mig_key->key); - - - mig_key->next = vtpm_globals->mig_keys; - vtpm_globals->mig_keys = mig_key; - - // free(name_pack.data); Do not free. data is now part of mig_key. - free(pubkey_exp_pack.data); - free(pubkey_mod_pack.data); - - return TPM_SUCCESS; -} diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c deleted file mode 100644 index d5e6ffd..0000000 --- a/tools/vtpm_manager/manager/securestorage.c +++ /dev/null @@ -1,512 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// securestorage.c -// -// Functions regarding securely storing DMI secrets. -// -// ================================================================== - -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "crypto.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "buffer.h" -#include "log.h" - -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, - CRYPTO_INFO *asymkey, - buffer_t *sealed_data) { - TPM_RESULT status = TPM_SUCCESS; - symkey_t symkey; - buffer_t data_cipher = NULL_BUF, - symkey_cipher = NULL_BUF; - - UINT32 i; - struct pack_constbuf_t symkey_cipher32, data_cipher32; - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); - for (i=0; i< buffer_len(inbuf); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - // Generate a sym key and encrypt state with it - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); - - // Encrypt symmetric key - TPMTRYRETURN( VTSP_Bind( asymkey, - &symkey.key, - &symkey_cipher) ); - - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher - - symkey_cipher32.size = buffer_len(&symkey_cipher); - symkey_cipher32.data = symkey_cipher.bytes; - - data_cipher32.size = buffer_len(&data_cipher); - data_cipher32.data = data_cipher.bytes; - - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); - - BSG_PackList(sealed_data->bytes, 2, - BSG_TPM_SIZE32_DATA, &symkey_cipher32, - BSG_TPM_SIZE32_DATA, &data_cipher32); - - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); - for (i=0; i< buffer_len(sealed_data); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); - - egress: - - buffer_free ( &data_cipher); - buffer_free ( &symkey_cipher); - Crypto_symcrypto_freekey (&symkey); - - return status; -} - -TPM_RESULT envelope_decrypt(const buffer_t *cipher, - TCS_CONTEXT_HANDLE TCSContext, - TPM_HANDLE keyHandle, - const TPM_AUTHDATA *key_usage_auth, - buffer_t *unsealed_data) { - - TPM_RESULT status = TPM_SUCCESS; - symkey_t symkey; - buffer_t data_cipher = NULL_BUF, - symkey_clear = NULL_BUF, - symkey_cipher = NULL_BUF; - struct pack_buf_t symkey_cipher32, data_cipher32; - int i; - - memset(&symkey, 0, sizeof(symkey_t)); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); - for (i=0; i< buffer_len(cipher); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - BSG_UnpackList(cipher->bytes, 2, - BSG_TPM_SIZE32_DATA, &symkey_cipher32, - BSG_TPM_SIZE32_DATA, &data_cipher32); - - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, - symkey_cipher32.size, - symkey_cipher32.data) ); - - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, - data_cipher32.size, - data_cipher32.data) ); - - // Decrypt Symmetric Key - TPMTRYRETURN( VTSP_Unbind( TCSContext, - keyHandle, - &symkey_cipher, - key_usage_auth, - &symkey_clear, - &(vtpm_globals->keyAuth) ) ); - - // create symmetric key using saved bits - Crypto_symcrypto_initkey (&symkey, &symkey_clear); - - // Decrypt State - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); - for (i=0; i< buffer_len(unsealed_data); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); - - egress: - buffer_free ( &data_cipher); - buffer_free ( &symkey_clear); - buffer_free ( &symkey_cipher); - Crypto_symcrypto_freekey (&symkey); - - return status; -} - -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - int fh; - long bytes_written; - buffer_t sealed_NVM = NULL_BUF; - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); - - TPMTRYRETURN( envelope_encrypt(inbuf, - &vtpm_globals->storageKey, - &sealed_NVM) ); - - // Write sealed blob off disk from NVMLocation - // TODO: How to properly return from these. Do we care if we return failure - // after writing the file? We can't get the old one back. - // TODO: Backup old file and try and recover that way. - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); - status = TPM_IOERROR; - goto abort_egress; - } - close(fh); - - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); - - egress: - buffer_free(&sealed_NVM); - return status; -} - - -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - - buffer_t sealed_NVM = NULL_BUF; - long fh_size; - int fh, stat_ret, i; - struct stat file_stat; - TPM_DIGEST sealedNVMHash; - - if (myDMI->NVMLocation == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); - status = TPM_AUTHFAIL; - goto abort_egress; - } - - //Read sealed blob off disk from NVMLocation - fh = open(myDMI->NVMLocation, O_RDONLY); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - fh_size = file_stat.st_size; - else { - status = TPM_IOERROR; - goto abort_egress; - } - - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { - status = TPM_IOERROR; - goto abort_egress; - } - close(fh); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); - - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); - - // Verify measurement of sealed blob. - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); - for (i=0; i< sizeof(TPM_DIGEST); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); - for (i=0; i< sizeof(TPM_DIGEST); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - status = TPM_AUTHFAIL; - goto abort_egress; - } - - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, - myDMI->TCSContext, - vtpm_globals->storageKeyHandle, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - outbuf) ); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); - - egress: - buffer_free( &sealed_NVM ); - - return status; -} - - -TPM_RESULT VTPM_SaveManagerData(void) { - TPM_RESULT status=TPM_SUCCESS; - int fh, dmis=-1; - - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; - - struct hashtable_itr *dmi_itr; - VTPM_DMI_RESOURCE *dmi_res; - - UINT32 boot_key_size = 0, flat_dmis_size = 0; - - // Initially fill these with buffer sizes for each data type. Later fill - // in actual size, once flattened. - boot_key_size = sizeof(UINT32) + // bootkeysize - bootKeySize; // boot key - - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version - 3*sizeof(TPM_DIGEST) + // Auths - sizeof(UINT32) +// storagekeysize - storageKeySize, NULL) ); // storage key - - - flat_boot_key = (BYTE *) malloc( boot_key_size ); - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); - - boot_key_size = BSG_PackList(flat_boot_key, 1, - BSG_TPM_SIZE32_DATA, &boot_key_pack); - - BSG_PackList(clear_flat_global.bytes, 4, - BSG_TYPE_BYTE, &vtpm_manager_gen, - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, - BSG_TPM_SIZE32_DATA, &storage_key_pack); - - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, - &vtpm_globals->bootKey, - &enc_flat_global) ); - - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); - - // Per DMI values to be saved (if any exit) - if (hashtable_count(vtpm_globals->dmi_map) > 1) { - - flat_dmis = (BYTE *) malloc( - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info - - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); - do { - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); - dmis++; - - // No need to save dmi0. - if (dmi_res->dmi_id == 0) - continue; - - - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, - BSG_TYPE_UINT32, &dmi_res->dmi_id, - BSG_TYPE_BYTE, &dmi_res->dmi_type, - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); - - } while (hashtable_iterator_advance(dmi_itr)); - } - - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); - if (fh == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); - status = TPM_IOERROR; - goto abort_egress; - } - - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - goto egress; - - abort_egress: - egress: - - free(flat_boot_key); - free(flat_enc); - buffer_free(&enc_flat_global); - free(flat_dmis); - close(fh); - - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); - return status; -} - -TPM_RESULT VTPM_LoadManagerData(void) { - - TPM_RESULT status=TPM_SUCCESS; - int fh, stat_ret, dmis=0; - long fh_size = 0, step_size; - BYTE *flat_table=NULL; - buffer_t unsealed_data, enc_table_abuf; - struct pack_buf_t storage_key_pack, boot_key_pack; - UINT32 *dmi_id_key, enc_size; - BYTE vtpm_manager_gen; - - VTPM_DMI_RESOURCE *dmi_res; - UINT32 dmi_id; - BYTE dmi_type; - struct stat file_stat; - - TPM_HANDLE boot_key_handle; - TPM_AUTHDATA boot_usage_auth; - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); - - fh = open(STATE_FILE, O_RDONLY ); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - fh_size = file_stat.st_size; - else { - status = TPM_IOERROR; - goto abort_egress; - } - - flat_table = (BYTE *) malloc(fh_size); - - if ((long) read(fh, flat_table, fh_size) != fh_size ) { - status = TPM_IOERROR; - goto abort_egress; - } - - // Read Boot Key - step_size = BSG_UnpackList( flat_table, 2, - BSG_TPM_SIZE32_DATA, &boot_key_pack, - BSG_TYPE_UINT32, &enc_size); - - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); - - //Load Boot Key - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->bootKeyWrap, - &SRK_AUTH, - &boot_key_handle, - &vtpm_globals->keyAuth, - &vtpm_globals->bootKey, - FALSE) ); - - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, - vtpm_globals->manager_tcs_handle, - boot_key_handle, - (const TPM_AUTHDATA*) &boot_usage_auth, - &unsealed_data) ); - step_size += enc_size; - - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { - // Once there is more than one gen, this will include some compatability stuff - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); - } - - // Global Values needing to be saved - BSG_UnpackList( unsealed_data.bytes, 4, - BSG_TYPE_BYTE, &vtpm_manager_gen, - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, - BSG_TPM_SIZE32_DATA, &storage_key_pack); - - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); - - // Per DMI values to be saved - while ( step_size < fh_size ){ - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); - step_size = fh_size; - } else { - step_size += BSG_UnpackList(flat_table + step_size, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TYPE_BYTE, &dmi_type); - - //TODO: Try and gracefully recover from problems. - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); - dmis++; - - step_size += BSG_UnpackList(flat_table + step_size, 2, - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); - } - - } - - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); - egress: - - free(flat_table); - close(fh); - - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. - - return status; -} - diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c deleted file mode 100644 index 9b1e5f8..0000000 --- a/tools/vtpm_manager/manager/tpmpassthrough.c +++ /dev/null @@ -1,110 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tpmpassthrough.c -// -// Functions regarding passing DMI requests to HWTPM -// -// ================================================================== - -#include "tcg.h" -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "log.h" - -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, - buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE *ord; - - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); - - switch (*ord) { - - // Forbidden for DMI use - case TPM_ORD_TakeOwnership: - case TPM_ORD_ChangeAuthOwner: - case TPM_ORD_DirWriteAuth: - case TPM_ORD_DirRead: - case TPM_ORD_AuthorizeMigrationKey: - case TPM_ORD_CreateMaintenanceArchive: - case TPM_ORD_LoadMaintenanceArchive: - case TPM_ORD_KillMaintenanceFeature: - case TPM_ORD_LoadManuMaintPub: - case TPM_ORD_ReadManuMaintPub: - case TPM_ORD_SelfTestFull: - case TPM_ORD_SelfTestStartup: - case TPM_ORD_CertifySelfTest: - case TPM_ORD_ContinueSelfTest: - case TPM_ORD_GetTestResult: - case TPM_ORD_Reset: - case TPM_ORD_OwnerClear: - case TPM_ORD_DisableOwnerClear: - case TPM_ORD_ForceClear: - case TPM_ORD_DisableForceClear: - case TPM_ORD_GetCapabilityOwner: - case TPM_ORD_OwnerSetDisable: - case TPM_ORD_PhysicalEnable: - case TPM_ORD_PhysicalDisable: - case TPM_ORD_SetOwnerInstall: - case TPM_ORD_PhysicalSetDeactivated: - case TPM_ORD_SetTempDeactivated: - case TPM_ORD_CreateEndorsementKeyPair: - case TPM_ORD_GetAuditEvent: - case TPM_ORD_GetAuditEventSigned: - case TPM_ORD_GetOrdinalAuditStatus: - case TPM_ORD_SetOrdinalAuditStatus: - case TPM_ORD_SetRedirection: - case TPM_ORD_FieldUpgrade: - case TSC_ORD_PhysicalPresence: - status = TPM_DISABLED_CMD; - goto abort_egress; - break; - - } // End ORD Switch - - // Call TCS with command - - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); - - goto egress; - - abort_egress: - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); - egress: - - return status; -} diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c deleted file mode 100644 index 319dc83..0000000 --- a/tools/vtpm_manager/manager/vtpm_ipc.c +++ /dev/null @@ -1,141 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_ipc.c Implements ipc routines using file io. This file can -// be replaced with other ipc types. -// -// =================================================================== - -#include -#include "vtpm_ipc.h" -#include "vtpmpriv.h" -#include "log.h" - -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { - ipc_h->name = name; - ipc_h->flags = flags; - ipc_h->fh = VTPM_IPC_CLOSED; - - if (create) - return(vtpm_ipc_create(ipc_h)); - else - return 0; -} - -// Create the file that needs opening. Used only for FIFOs -// FYI: This may cause problems in other file IO schemes. We'll see. -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { - int fh; - struct stat file_info; - - if ((!ipc_h) || (!ipc_h->name)) - return -1; - - if ( stat(ipc_h->name, &file_info) == -1) { - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); - return -1; - } - } - - ipc_h->fh = VTPM_IPC_CLOSED; - - return 0; -} - - -// Read size bytes. If FH isn't open, open it. -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ - vtpm_ipc_handle_t *my_ipc_h; - int result; - - if (ipc_h) { - my_ipc_h = ipc_h; - } else { - my_ipc_h = alt_ipc_h; - } - - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); - } - - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); - return -1; - } - - result = read(my_ipc_h->fh, bytes, size); - if (result < 0) { - my_ipc_h->fh = VTPM_IPC_CLOSED; - } - - return (result); -} - -// Write size bytes. If FH isn't open, open it. -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { - vtpm_ipc_handle_t *my_ipc_h; - int result; - - if (ipc_h) { - my_ipc_h = ipc_h; - } else { - my_ipc_h = alt_ipc_h; - } - - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); - } - - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); - return -1; - } - - result = write(my_ipc_h->fh, bytes, size); - if (result < 0) { - my_ipc_h->fh = VTPM_IPC_CLOSED; - } - - return (result); -} - -// Mark file as closed and try and close it. Errors not reported. -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { - - if (ipc_h) { - close(ipc_h->fh); - ipc_h->fh = VTPM_IPC_CLOSED; - } - -} diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h deleted file mode 100644 index 529c4a2..0000000 --- a/tools/vtpm_manager/manager/vtpm_ipc.h +++ /dev/null @@ -1,71 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_ipc.h Header for interprocess communication between VTPM manager -// and Guests or VTPMs -// -// =================================================================== - -#ifndef __VTPM_IO_H__ -#define __VTPM_IO_H__ - -#include "tcg.h" - -#define VTPM_IPC_CLOSED -1 - -// Represents an (somewhat) abstracted io handle. -typedef struct vtpm_ipc_handle_t { - int fh; // IO handle. - int flags; // Flags for opening. This may need to become - // a void *, but for now files use an int. - char *name; // Names for debugging as well as filenames - // for file-based io. -} vtpm_ipc_handle_t; - - -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); - -// Create the file that needs opening. Used only for FIFOs -// FYI: This may cause problems in other file IO schemes. We'll see. -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); - -// Read size bytes. If FH isn't open, open it. -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); - -// Write size bytes. If FH isn't open, open it. -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); - -// Mark file as closed and try and close it. Errors not reported. -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); - -#endif diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c deleted file mode 100644 index e737d60..0000000 --- a/tools/vtpm_manager/manager/vtpm_lock.c +++ /dev/null @@ -1,63 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_lock.c Provided controlled sync around access to vtpm structures -// -// =================================================================== - -#include -#include "vtpm_lock.h" - -static pthread_rwlock_t vtpm_lock; - -void vtpm_lock_init() { - - pthread_rwlock_init( &vtpm_lock, NULL); -} - -void vtpm_lock_destroy(){ - pthread_rwlock_destroy(&vtpm_lock); -} - -void vtpm_lock_rdlock(){ - pthread_rwlock_rdlock(&vtpm_lock); -} - -void vtpm_lock_wrlock(){ - pthread_rwlock_wrlock(&vtpm_lock); -} - -void vtpm_lock_unlock(){ - pthread_rwlock_unlock(&vtpm_lock); -} - diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h deleted file mode 100644 index 53a339d..0000000 --- a/tools/vtpm_manager/manager/vtpm_lock.h +++ /dev/null @@ -1,48 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_lock.h Provided controlled sync around access to vtpm structures -// -// =================================================================== - -#ifndef __VTPM_LOCK_H__ -#define __VTPM_LOCK_H__ - -void vtpm_lock_init(); -void vtpm_lock_destroy(); - -void vtpm_lock_rdlock(); -void vtpm_lock_wrlock(); -void vtpm_lock_unlock(); - -#endif diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c deleted file mode 100644 index e089f78..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager.c +++ /dev/null @@ -1,285 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager.c -// -// This file will house the main logic of the VTPM Manager -// -// ================================================================== - -#include -#include -#include - -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "hashtable.h" -#include "hashtable_itr.h" - -#include "log.h" -#include "buffer.h" - -VTPM_GLOBALS *vtpm_globals=NULL; - -// --------------------------- Well Known Auths -------------------------- -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - -#ifdef WELL_KNOWN_OWNER_AUTH -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -#endif - - -// -------------------------- Hash table functions -------------------- - -static unsigned int hashfunc32(void *ky) { - return (* (UINT32 *) ky); -} - -static int equals32(void *k1, void *k2) { - return (*(UINT32 *) k1 == *(UINT32 *) k2); -} - -// --------------------------- Functions ------------------------------ - -TPM_RESULT VTPM_Create_Manager(){ - - TPM_RESULT status = TPM_SUCCESS; - - // Generate Auth for Owner -#ifdef WELL_KNOWN_OWNER_AUTH - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); -#else - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); -#endif - - // Take Owership of TPM - CRYPTO_INFO ek_cryptoInfo; - - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); - - // If we can read PubEK then there is no owner and we should take it. - // We use the abilty to read the pubEK to flag that the TPM is owned. - // FIXME: Change to just trying to take ownership and react to the status - if (status == TPM_SUCCESS) { - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, - &SRK_AUTH, - &ek_cryptoInfo, - &vtpm_globals->keyAuth)); - - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, - &vtpm_globals->keyAuth)); - } else { - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); - } - - // Generate storage key's auth - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, - sizeof(TPM_AUTHDATA) ); - - TCS_AUTH osap; - TPM_AUTHDATA sharedsecret; - - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, - TPM_ET_KEYHANDLE, - TPM_SRK_KEYHANDLE, - &SRK_AUTH, - &sharedsecret, - &osap) ); - - osap.fContinueAuthSession = FALSE; - - - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, - TPM_KEY_BIND, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - TPM_SRK_KEYHANDLE, - (const TPM_AUTHDATA*)&sharedsecret, - &vtpm_globals->storageKeyWrap, - &osap) ); - - // Generate boot key's auth - TPM_AUTHDATA bootKeyWrapAuth; - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); - - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, - TPM_ET_KEYHANDLE, - TPM_SRK_KEYHANDLE, - &SRK_AUTH, - &sharedsecret, - &osap) ); - - osap.fContinueAuthSession = FALSE; - - // FIXME: This key protects the global secrets on disk. It should use TPM - // PCR bindings to limit its use to legit configurations. - // Current binds are open, implying a Trusted VM contains this code. - // If this VM is not Trusted, use measurement and PCR bindings. - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, - TPM_KEY_BIND, - (const TPM_AUTHDATA*)&bootKeyWrapAuth, - TPM_SRK_KEYHANDLE, - (const TPM_AUTHDATA*)&sharedsecret, - &vtpm_globals->bootKeyWrap, - &osap) ); - - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->bootKeyWrap, - NULL, - NULL, - NULL, - &vtpm_globals->bootKey, - TRUE ) ); - - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); - goto egress; - - abort_egress: - exit(1); - - egress: - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); - return status; - -} - -/////////////////////////////////////////////////////////////////////////////// -TPM_RESULT VTPM_Init_Manager() { - TPM_RESULT status = TPM_FAIL, serviceStatus; - BYTE *randomsead; - UINT32 randomsize=256; - - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ - status = TPM_FAIL; - goto abort_egress; - } - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); - - vtpm_globals->connected_dmis = 0; - - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ - status = TPM_FAIL; - goto abort_egress; - } - - // Create new TCS Object - vtpm_globals->manager_tcs_handle = 0; - - TPMTRYRETURN(TCS_create()); - - // Create TCS Context for service - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); - - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, - &randomsize, - &randomsead)); - - Crypto_Init(randomsead, randomsize); - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); - - // Create OIAP session for service's authorized commands - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, - &vtpm_globals->keyAuth) ); - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; - - vtpm_globals->mig_keys = NULL; - - // If fails, create new Manager. - serviceStatus = VTPM_LoadManagerData(); - if (serviceStatus == TPM_IOERROR) { - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); - TPMTRYRETURN( VTPM_Create_Manager() ); - TPMTRYRETURN( VTPM_SaveManagerData() ); - } else if (serviceStatus != TPM_SUCCESS) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); - exit(1); - } - - //Load Storage Key - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->storageKeyWrap, - &SRK_AUTH, - &vtpm_globals->storageKeyHandle, - &vtpm_globals->keyAuth, - &vtpm_globals->storageKey, - FALSE ) ); - - // Create entry for Dom0 for control messages - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); - - goto egress; - - abort_egress: - egress: - - return(status); -} - -/////////////////////////////////////////////////////////////////////////////// -void VTPM_Stop_Manager() { - VTPM_DMI_RESOURCE *dmi_res; - struct hashtable_itr *dmi_itr; - - // Close all the TCS contexts. TCS should evict keys based on this - if (hashtable_count(vtpm_globals->dmi_map) > 0) { - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); - do { - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); - if (dmi_res->connected) - close_dmi( dmi_res ); // Not really interested in return code - - } while (hashtable_iterator_advance(dmi_itr)); - free (dmi_itr); - } - - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); - - TCS_CloseContext(vtpm_globals->manager_tcs_handle); - TCS_destroy(); - - hashtable_destroy(vtpm_globals->dmi_map, 1); - free(vtpm_globals); - - Crypto_Exit(); - - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); -} diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h deleted file mode 100644 index a324a8f..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager.h +++ /dev/null @@ -1,150 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager.h -// -// Public Interface header for VTPM Manager -// -// ================================================================== - -#ifndef __VTPM_MANAGER_H__ -#define __VTPM_MANAGER_H__ - -#define VTPM_TAG_REQ 0x01c1 -#define VTPM_TAG_RSP 0x01c4 -#define COMMAND_BUFFER_SIZE 4096 - -// Header sizes. Note Header MAY include the DMI -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) - -//************************ Command Codes **************************** -#define VTPM_ORD_BASE 0x0000 -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) - -// Non-priviledged VTPM Commands (From DMI's) -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key - -// Priviledged VTPM Commands (From management console) -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest - -//************************ Return Codes **************************** -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain -#define VTPM_TYPE_HVM 2 // HVM Domain - -//************************ Return Codes **************************** -#define VTPM_SUCCESS 0 -#define VTPM_FAIL 1 -#define VTPM_UNSUPPORTED 2 -#define VTPM_FORBIDDEN 3 -#define VTPM_RESTORE_CONTEXT_FAILED 4 -#define VTPM_INVALID_REQUEST 5 - -//*********************** Parameter Values ************************* -#define VTPM_TYPE_NON_MIGRATABLE 0x00 -#define VTPM_TYPE_MIGRATABLE 0x01 -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. - // VTPM can be recovered or deleted only - -/******************* Command Parameter API ************************* - -VTPM Command Format - dmi: 4 bytes // Source of message. - // WARNING: This is prepended by the channel. - // Thus it is received by VTPM Manager, - // but not sent by DMI - tpm tag: 2 bytes - command size: 4 bytes // Size of command including header but not DMI - ord: 4 bytes // Command ordinal above - parameters: size - 10 bytes // Command Parameter - -VTPM Response Format - tpm tag: 2 bytes - response_size: 4 bytes - status: 4 bytes - parameters: size - 10 bytes - - -VTPM_Open: - Input Parameters: - mig_type: 1 byte - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 - domain type: 1 byte - instance_id: 4 bytes - Output Parameters: - None - -VTPM_Close - Input Parameters: - instance_id: 4 bytes - Output Parameters: - None - -VTPM_Delete - Input Parameters: - instance_id: 4 bytes - Output Parameters: - None - -VTPM_SaveNVM - Input Parameters: - data: n bytes (Header indicates size of data) - Output Parameters: - None - -VTPM_LoadNVM - Input Parameters: - None - Output Parameters: - data: n bytes (Header indicates size of data) - -VTPM_TPMCommand - Input Parameters: - TPM Command Byte Stream: n bytes - Output Parameters: - TPM Reponse Byte Stream: n bytes - -*********************************************************************/ - -#endif //_VTPM_MANAGER_H_ diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c deleted file mode 100644 index 2001074..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c +++ /dev/null @@ -1,488 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager_handler.c -// -// This file will house the main logic of the VTPM Manager -// -// ================================================================== - -#include -#include -#include -#include - -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "log.h" -#include "buffer.h" - -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); - -// ---------------------- Prototypes ------------------- -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, - TPM_COMMAND_CODE ord, - buffer_t *command_buf, - buffer_t *result_buf, - BOOL is_priv, - char *thread_name); - -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - VTPM_DMI_RESOURCE *dmi_res, - BYTE *cmd_header, - buffer_t *param_buf, - buffer_t *result_buf, - char *thread_name); - -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - BOOL fw_tpm, // Forward TPM cmds? - vtpm_ipc_handle_t *fw_tx_ipc_h, - vtpm_ipc_handle_t *fw_rx_ipc_h, - BOOL is_priv, - char *thread_name) { - TPM_RESULT status = TPM_FAIL; // Should never return - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; - buffer_t *command_buf=NULL, *result_buf=NULL; - TPM_TAG tag; - TPM_COMMAND_CODE ord; - VTPM_DMI_RESOURCE *dmi_res; - int size_read, size_write, i; - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending - - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); - - // ------------------------ Main Loop -------------------------------- - while(1) { - - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); - - // --------------------- Read Cmd from Sender ---------------- - - // Read command header - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); - for (i=0; i 0) { - in_param = (BYTE *) malloc(cmd_size); - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); - if (size_read > 0) { - for (i=0; idmi_map, &dmi)) || - (!dmi_res->connected) ) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); - status = TPM_BAD_PARAMETER; - // We have no one to reply to, they don't exist. - goto abort_command; - } - - if (tag == VTPM_TAG_REQ) { - - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); - - } else { // This is not a VTPM Command at all. - if (fw_tpm) { - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); - - // This means calling the DMI failed, not that the cmd failed in the DMI - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app - if (status != TPM_SUCCESS) { - status = TPM_IOERROR; - goto abort_with_error; - } - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This - // should be forwarded to the caller VM - add_header = FALSE; - } else { - // We are not supposed to forward TPM commands at all. - int i; - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); - for (i=0; i 0) - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); - //Note: Send message + dmi_id - } else { - reply = result_buf->bytes; - reply_size = buffer_len(result_buf); - } - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); - for (i=0; i < reply_size; i++) - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); - - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); - goto abort_command; - } - free(out_message); out_message=NULL; - - if (size_write < (int)reply_size) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); - goto abort_command; - } - - // On certain failures an error message cannot be sent. - // This marks the beginning of cleanup in preperation for the next command. - abort_command: - //free buffers - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - //free(in_param); // This was converted to command_buf. No need to free - buffer_free(result_buf); - buffer_free(command_buf); - - // If we have a write lock, save the manager table - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); - } - - vtpm_lock_unlock(); - add_header = TRUE; // Reset to the default - } // End while(1) - -} - -///////////////////////////////////////////////////////////////////////// -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, - TPM_COMMAND_CODE ord, - buffer_t *command_buf, - buffer_t *result_buf, - BOOL is_priv, - char *thread_name) { - - TPM_RESULT status = TPM_FAIL; - - switch (ord) { - case VTPM_ORD_SAVENVM: - status= VTPM_Handle_Save_NVM(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_LOADNVM: - status= VTPM_Handle_Load_NVM(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_TPMCOMMAND: - status= VTPM_Handle_TPM_Command(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_GET_MIG_KEY: - status = VTPM_Handle_Get_Migration_key(command_buf, - result_buf); - break; - - case VTPM_ORD_LOAD_MIG_KEY: - status = VTPM_Handle_Load_Migration_key(command_buf, - result_buf); - break; - - default: - // Privileged handlers can do maintanance - if (is_priv) { - switch (ord) { - case VTPM_ORD_OPEN: - status = VTPM_Handle_New_DMI(command_buf); - break; - - case VTPM_ORD_CLOSE: - status = VTPM_Handle_Close_DMI(command_buf); - break; - - case VTPM_ORD_DELETE: - status = VTPM_Handle_Delete_DMI(command_buf); - break; - - case VTPM_ORD_MIGRATE_IN: - status = VTPM_Handle_Migrate_In(command_buf, result_buf); - break; - - case VTPM_ORD_MIGRATE_OUT: - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); - break; - - default: - status = TPM_BAD_ORDINAL; - } // switch - } else { // is priv command - - status = TPM_BAD_ORDINAL; - } // inner switch - } // outer switch - - return(status); -} - -///////////////////////////////////////////////////////////////////// -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - VTPM_DMI_RESOURCE *dmi_res, - BYTE *cmd_header, - buffer_t *param_buf, - buffer_t *result_buf, - char *thread_name) { - - TPM_RESULT status = TPM_FAIL; - UINT32 dmi_dst; - TPM_COMMAND_CODE ord; - TPM_TAG tag_out; - UINT32 dmi_cmd_size, in_param_size, adj_param_size; - BYTE *dmi_cmd, *in_param; - int size_read, size_write, i; - - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness - if (dmi_res->dmi_id == VTPM_CTL_DM) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); - status = TPM_FAIL; - goto abort_with_error; - } - - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); - - //Forward TPM CMD stamped with dmi_id to DMI for handling - if (buffer_len(param_buf)) { - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); - - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); - for (i=0; itx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); - for (i=0; irx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); - for (i=0; i 0) { - in_param = (BYTE *) malloc(adj_param_size); - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); - if (size_read > 0) { - for (i=0; i -#include -#include -#include -#include -#include -#include -#include -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "tcg.h" -#include "log.h" -#include "vtpm_ipc.h" - -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" - -#define VTPM_BE_FNAME "/dev/vtpm" -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" - -#define VTPM_TYPE_PVM_STRING "pvm" -#define VTPM_TYPE_HVM_STRING "hvm" - -struct vtpm_thread_params_s { - vtpm_ipc_handle_t *tx_ipc_h; - vtpm_ipc_handle_t *rx_ipc_h; - BOOL fw_tpm; - vtpm_ipc_handle_t *fw_tx_ipc_h; - vtpm_ipc_handle_t *fw_rx_ipc_h; - BOOL is_priv; - char *thread_name; -}; - -// This is needed to all extra_close_dmi to close this to prevent a -// broken pipe when no DMIs are left. -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; - -void *vtpm_manager_thread(void *arg_void) { - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; - - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, - arg->is_priv, arg->thread_name); - - return (status); -} - - -void signal_handler(int reason) { - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); - } else { - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); - pthread_exit(NULL); - } - - VTPM_Stop_Manager(); - exit(-1); -} - -struct sigaction ctl_c_handler; - -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { - - TPM_RESULT status = TPM_SUCCESS; - int fh; - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; - struct stat file_info; - - if (dmi_res->dmi_id == VTPM_CTL_DM) { - dmi_res->tx_tpm_ipc_h = NULL; - dmi_res->rx_tpm_ipc_h = NULL; - dmi_res->tx_vtpm_ipc_h = NULL; - dmi_res->rx_vtpm_ipc_h = NULL; - } else { - // Create a pair of fifo pipes - dmi_res->rx_tpm_ipc_h = NULL; - dmi_res->rx_vtpm_ipc_h = NULL; - - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { - status =TPM_RESOURCES; - goto abort_egress; - } - - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); - - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? - status = TPM_IOERROR; - goto abort_egress; - } - - // Measure DMI - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value - // Also, this mechanism is specific to 1 VM architecture. - /* - fh = open(TPM_EMULATOR_PATH, O_RDONLY); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - dmi_size = file_stat.st_size; - else { - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); - status = TPM_IOERROR; - goto abort_egress; - } - dmi_buffer - */ - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); - - if (vm_type == VTPM_TYPE_PVM) - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; - else - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; - - // Launch DMI - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); -#ifdef MANUAL_DM_LAUNCH - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); - dmi_res->dmi_pid = 0; -#else - pid_t pid = fork(); - - if (pid == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); - status = TPM_RESOURCES; - goto abort_egress; - } else if (pid == 0) { - switch (startup_mode) { - case TPM_ST_CLEAR: - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); - break; - case TPM_ST_STATE: - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); - break; - case TPM_ST_DEACTIVATED: - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); - break; - default: - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Returning from these at all is an error. - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); - } else { - dmi_res->dmi_pid = pid; - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); - } -#endif // MANUAL_DM_LAUNCH - - } // If DMI = VTPM_CTL_DM - status = TPM_SUCCESS; - -abort_egress: - return (status); -} - -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { - TPM_RESULT status = TPM_SUCCESS; - - if (vtpm_globals->connected_dmis == 0) { - // No more DMI's connected. Close fifo to prevent a broken pipe. - // This is hackish. Need to think of another way. - vtpm_ipc_close(g_rx_tpm_ipc_h); - } - - - if (dmi_res->dmi_id != VTPM_CTL_DM) { - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); - - free(dmi_res->tx_tpm_ipc_h->name); - free(dmi_res->tx_vtpm_ipc_h->name); - -#ifndef MANUAL_DM_LAUNCH - if (dmi_res->dmi_id != VTPM_CTL_DM) { - if (dmi_res->dmi_pid != 0) { - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); - status = TPM_FAIL; - } - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); - status = TPM_FAIL; - } - } -#endif - - } //endif ! dom0 - return status; -} - - -int main(int argc, char **argv) { - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; - pthread_t be_thread, dmi_thread, hp_thread; - -#ifdef DUMMY_BACKEND - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; -#else - vtpm_ipc_handle_t real_be_ipc_h; -#endif - - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); - - // -------------------- Initialize Manager ----------------- - if (VTPM_Init_Manager() != TPM_SUCCESS) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); - return -1; - } - - // -------------------- Setup Ctrl+C Handlers -------------- - ctl_c_handler.sa_handler = signal_handler; - sigemptyset(&ctl_c_handler.sa_mask); - ctl_c_handler.sa_flags = 0; - - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); - - // For easier debuggin with gdb - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); - - sigset_t sig_mask; - sigemptyset(&sig_mask); - sigaddset(&sig_mask, SIGPIPE); - sigprocmask(SIG_BLOCK, &sig_mask, NULL); - - // ------------------- Set up file ipc structures ---------- -#ifdef DUMMY_BACKEND - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { - - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); - exit(-1); - } - - tx_be_ipc_h = &tx_dummy_ipc_h; - rx_be_ipc_h = &rx_dummy_ipc_h; -#else - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); - - tx_be_ipc_h = &real_be_ipc_h; - rx_be_ipc_h = &real_be_ipc_h; -#endif - - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); - exit(-1); - } - - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; - - // -------------------- Set up thread params ------------- - - be_thread_params.tx_ipc_h = tx_be_ipc_h; - be_thread_params.rx_ipc_h = rx_be_ipc_h; - be_thread_params.fw_tpm = TRUE; - be_thread_params.fw_tx_ipc_h = NULL; - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; - be_thread_params.is_priv = FALSE; - be_thread_params.thread_name = "Backend Listener"; - - dmi_thread_params.tx_ipc_h = NULL; - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; - dmi_thread_params.fw_tpm = FALSE; - dmi_thread_params.fw_tx_ipc_h = NULL; - dmi_thread_params.fw_rx_ipc_h = NULL; - dmi_thread_params.is_priv = FALSE; - dmi_thread_params.thread_name = "VTPM Listener"; - - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; - hp_thread_params.fw_tpm = FALSE; - hp_thread_params.fw_tx_ipc_h = NULL; - hp_thread_params.fw_rx_ipc_h = NULL; - hp_thread_params.is_priv = TRUE; - hp_thread_params.thread_name = "Hotplug Listener"; - - // --------------------- Launch Threads ----------------- - - vtpm_lock_init(); - - vtpm_globals->master_pid = pthread_self(); - - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); - exit(-1); - } - - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); - exit(-1); - } - - - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); - exit(-1); - } - - //Join the other threads until exit time. - pthread_join(be_thread, NULL); - pthread_join(dmi_thread, NULL); - pthread_join(hp_thread, NULL); - - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); - - VTPM_Stop_Manager(); - vtpm_lock_destroy(); - return 0; -} diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h deleted file mode 100644 index 41e8d2d..0000000 --- a/tools/vtpm_manager/manager/vtpmpriv.h +++ /dev/null @@ -1,186 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpmpriv.h -// -// Structures and functions private to the manager -// -// ================================================================== - -#ifndef __VTPMPRIV_H__ -#define __VTPMPRIV_H__ - -#include "vtpm_manager.h" -#include "tcg.h" -#include "tcs.h" -#include "buffer.h" -#include "crypto.h" -#include "vtpm_ipc.h" - -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table - // is changed. It's used for backwards compatability - -#define STATE_FILE "/var/vtpm/VTPM" -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" -#define VTPM_CTL_DM 0 - -// ------------------------ Private Structures ----------------------- -typedef struct VTPM_DMI_RESOURCE_T { - // I/O info for Manager to talk to DMI's and controllers - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI - -#ifndef VTPM_MULTI_VM - pid_t dmi_pid; -#endif - - // Non-persistent Information - bool connected; - UINT32 dmi_domain_id; - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle - char *NVMLocation; // NULL term string indicating location - // of NVM. - // Persistent Information about DMI - UINT32 dmi_id; - BYTE dmi_type; - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI -} VTPM_DMI_RESOURCE; - -typedef struct tdVTPM_MIGKEY_LIST { - UINT32 name_size; - BYTE *name; // Name of destination (IP addr, domain name, etc) - CRYPTO_INFO key; - struct tdVTPM_MIGKEY_LIST *next; -} VTPM_MIGKEY_LIST; - - -typedef struct tdVTPM_GLOBALS { - // Non-persistent data -#ifndef VTPM_MULTI_VM - pid_t master_pid; -#endif - - int connected_dmis; // To close guest_rx when no dmis are connected - - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys - // Currently keys are loaded at migration time, - // TODO: Make VTPM man store a keys persistently - // and update script to check if key is needed - // before fetching it. - - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager - TPM_HANDLE storageKeyHandle; // Key used by persistent store - CRYPTO_INFO storageKey; // For software encryption - CRYPTO_INFO bootKey; // For saving table - TCS_AUTH keyAuth; // OIAP session for storageKey - - // Persistent Data - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM - buffer_t storageKeyWrap; // Wrapped copy of storageKey - TPM_AUTHDATA srk_usage_auth; - TPM_AUTHDATA storage_key_usage_auth; - - buffer_t bootKeyWrap; // Wrapped copy of boot key - -}VTPM_GLOBALS; - -// --------------------------- Global Values -------------------------- -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value - -// ********************** VTPM Functions ************************* -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service -void VTPM_Stop_Manager(); // Stop VTPM Service -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - BOOL fw_tpm, // Should forward TPM cmds - vtpm_ipc_handle_t *fw_tx_ipc_h, - vtpm_ipc_handle_t *fw_rx_ipc_h, - BOOL is_priv, - char *client_name); - -// ********************** Command Handler Prototypes *********************** - -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, - buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_SaveManagerData(void); -TPM_RESULT VTPM_LoadManagerData(void); - -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); - -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); - -// Helper functions -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); - -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, - CRYPTO_INFO *asymkey, - buffer_t *sealed_data); - -TPM_RESULT envelope_decrypt(const buffer_t *cipher, - TCS_CONTEXT_HANDLE TCSContext, - TPM_HANDLE keyHandle, - const TPM_AUTHDATA *key_usage_auth, - buffer_t *unsealed_data); - -#endif // __VTPMPRIV_H__ diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c deleted file mode 100644 index fc8a66f..0000000 --- a/tools/vtpm_manager/manager/vtsp.c +++ /dev/null @@ -1,1042 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtsp.c -// -// Higher level interface to TCS for use in service. -// -// ================================================================== - -#include -#include "tcg.h" -#include "tcs.h" -#include "bsg.h" -#include "log.h" -#include "crypto.h" -#include "vtsp.h" -#include "buffer.h" - -#define RSA_KEY_SIZE 0x0800 - -/*********************************************************************************** - * GenerateAuth: Generate authorization info to be sent back to application - * - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed - * outParamDigestTextSize Size of inParamDigestText - * HMACkey Key to be used for HMACing - * For OIAP use key.authUsage or PersistStore.ownerAuth - * For OSAP use shared secret - * pAuth Authorization information from the application - * - * Return: TPM_SUCCESS Authorization data created - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP - *************************************************************************************/ -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, - /*[IN]*/ UINT32 inParamDigestTextSize, - /*[IN]*/ const TPM_SECRET *HMACkey, - /*[IN,OUT]*/ TCS_AUTH *auth) { - - if (inParamDigestText == NULL || auth == NULL) - return (TPM_AUTHFAIL); - else { - - //Generate new OddNonce - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); - - // Create SHA1 inParamDigest - TPM_DIGEST inParamDigest; - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); - - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; - - BSG_PackList( hmacText, 4, - BSG_TPM_DIGEST, &inParamDigest, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); - - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); - - return(TPM_SUCCESS); - - } -} - -/*********************************************************************************** - * VerifyAuth: Verify the authdata for a command requiring authorization - * - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed - * inParamDigestTextSize Size of inParamDigestText - * authDataUsage AuthDataUsage for the Entity being used - * Key->authDataUsage or TPM_AUTH_OWNER - * HMACkey Key to be used for HMACing - * For OIAP use key.authUsage or PersistStore.ownerAuth - * For OSAP use NULL (It will be aquired from the Auth Session) - * If unknown (default), assume OIAP - * sessionAuth A TCS_AUTH info for the session - * pAuth Authorization information from the application - * hContext If specified, on failed Auth, VerifyAuth will - * generate a new OIAP session in place of themselves - * destroyed session. - * - * Return: TPM_SUCCESS Authorization Verified - * TPM_AUTHFAIL Authorization Failed - * TPM_FAIL Failure during SHA1 routines - *************************************************************************************/ -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, - /*[IN]*/ UINT32 outParamDigestTextSize, - /*[IN]*/ const TPM_SECRET *HMACkey, - /*[IN,OUT]*/ TCS_AUTH *auth, - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { - if (outParamDigestText == NULL || auth == NULL) - return (TPM_AUTHFAIL); - - - // Create SHA1 inParamDigest - TPM_DIGEST outParamDigest; - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); - - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). - TPM_DIGEST hm; - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; - - BSG_PackList( hmacText, 4, - BSG_TPM_DIGEST, &outParamDigest, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); - - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); - - // Compare correct HMAC with provided one. - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality - if (!auth->fContinueAuthSession) - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); - - return (TPM_SUCCESS); - } else { - // If specified, reconnect the OIAP session. - // NOTE: This only works for TCS's that never have a 0 context. - if (hContext) { - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); - VTSP_OIAP( hContext, auth); - } - return (TPM_AUTHFAIL); - } -} - -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPMTRYRETURN( TCSP_OIAP(hContext, - &auth->AuthHandle, - &auth->NonceEven) ); - - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); - auth->fContinueAuthSession = FALSE; - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); - goto egress; - - abort_egress: - - egress: - - return status; -} - -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, - const TPM_ENTITY_TYPE entityType, - const UINT32 entityValue, - const TPM_AUTHDATA *usageAuth, - TPM_SECRET *sharedSecret, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; - - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); - - TPMTRYRETURN( TCSP_OSAP( hContext, - entityType, - entityValue, - nonceOddOSAP, - &auth->AuthHandle, - &auth->NonceEven, - &nonceEvenOSAP) ); - - // Calculating Session Secret - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; - - BSG_PackList( sharedSecretText, 2, - BSG_TPM_NONCE, &nonceEvenOSAP, - BSG_TPM_NONCE, &nonceOddOSAP); - - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); - - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); - auth->fContinueAuthSession = FALSE; - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); - - goto egress; - - abort_egress: - - egress: - - return status; -} - - -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, - const TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); - goto egress; - - abort_egress: - - egress: - - return status; -} - - -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, - CRYPTO_INFO *crypto_info) { - - TPM_RESULT status; - TPM_NONCE antiReplay; - TPM_DIGEST checksum; - BYTE *pubEKtext; - UINT32 pubEKtextsize; - - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); - - // GenerateAuth new nonceOdd - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); - - - TPMTRYRETURN( TCSP_ReadPubek( hContext, - antiReplay, - &pubEKtextsize, - &pubEKtext, - &checksum) ); - - - // Extract the remaining output parameters - TPM_PUBKEY pubEK; - - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); - - // Build CryptoInfo for the bindingKey - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - pubEK.algorithmParms.parms, - &rsaKeyParms); - - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, - rsaKeyParms.exponent, - pubEK.pubKey.keyLength, - pubEK.pubKey.key, - crypto_info); - - // Destroy rsaKeyParms - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); - - // Set encryption scheme - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; - - goto egress; - - abort_egress: - - egress: - - return status; -} - -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - const TPM_AUTHDATA *srkAuth, - CRYPTO_INFO *ek_cryptoInfo, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; - BYTE *new_srk; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // vars for srkpubkey parameter - TPM_KEY srkPub; - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; - - struct pack_buf_t srkText; - - //These values are accurate for an enc(AuthData). - struct pack_buf_t encOwnerAuth, encSrkAuth; - - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); - - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); - status = TPM_RESOURCES; - goto abort_egress; - } - - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); - - - // Build srk public key struct - srkPub.ver = TPM_STRUCT_VER_1_1; - srkPub.keyUsage = TPM_KEY_STORAGE; - srkPub.keyFlags = 0x00; - srkPub.authDataUsage = TPM_AUTH_ALWAYS; - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); - srkPub.PCRInfoSize = 0; - srkPub.PCRInfo = 0; - srkPub.pubKey.keyLength= 0; - srkPub.encDataSize = 0; - - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 5, - BSG_TPM_COMMAND_CODE,&command, - BSG_TPM_PROTOCOL_ID, &proto_id, - BSG_TPM_SIZE32_DATA, &encOwnerAuth, - BSG_TPM_SIZE32_DATA, &encSrkAuth, - BSG_TPM_KEY, &srkPub); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); - - new_srk = srkText.data; - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, - proto_id, - encOwnerAuth.size, - encOwnerAuth.data, - encSrkAuth.size, - encSrkAuth.data, - &srkText.size, - &new_srk, - auth ) ); - - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - memcpy(paramText + paramTextSize, new_srk, srkText.size); - paramTextSize += srkText.size; - - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - ownerAuth, auth, - hContext) ); - - goto egress; - - abort_egress: - - egress: - - free(srkText.data); - free(encSrkAuth.data); - free(encOwnerAuth.data); - free(paramText); - - TCS_FreeMemory(hContext, new_srk); - - return status; -} - -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 1, - BSG_TPM_COMMAND_CODE, &command); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - ownerAuth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in - auth) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - ownerAuth, auth, - hContext) ); - goto egress; - - abort_egress: - egress: - free(paramText); - return status; -} - -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_USAGE usage, - const TPM_AUTHDATA *newKeyAuth, - const TCS_KEY_HANDLE parentHandle, - const TPM_AUTHDATA *osapSharedSecret, - buffer_t *pubKeyBuf, - TCS_AUTH *auth) { - - int i; - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; - - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); - - // vars for Calculate encUsageAuth - BYTE *paramText; - UINT32 paramTextSize; - - // vars for Calculate encUsageAuth - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; - TPM_DIGEST XORKey1; - UINT32 XORbufferSize; - TPM_SECRET encUsageAuth, encMigrationAuth; - - // vars for Flatten newKey prototype - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; - struct pack_buf_t newKeyText; - - // Fill in newKey - TPM_KEY newKey; - - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; - newKey.algorithmParms.parmSize = 12; - - switch (usage) { - case TPM_KEY_SIGNING: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); - newKey.keyUsage = TPM_KEY_SIGNING; - newKey.algorithmParms.encScheme = TPM_ES_NONE; - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; - break; - case TPM_KEY_STORAGE: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); - newKey.keyUsage = TPM_KEY_STORAGE; - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - newKey.algorithmParms.sigScheme = TPM_SS_NONE; - break; - case TPM_KEY_BIND: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); - newKey.keyUsage = TPM_KEY_BIND; - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - newKey.algorithmParms.sigScheme = TPM_SS_NONE; - break; - default: - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - - newKey.ver = TPM_STRUCT_VER_1_1; - - newKey.keyFlags = 0; - newKey.authDataUsage = TPM_AUTH_ALWAYS; - newKey.pubKey.keyLength= 0; - newKey.encDataSize = 0; - newKey.encData = NULL; - - // FIXME: Support PCR bindings - newKey.PCRInfoSize = 0; - newKey.PCRInfo = NULL; - - // Calculate encUsageAuth - XORbufferSize = BSG_PackList( XORbuffer, 2, - BSG_TPM_SECRET, osapSharedSecret, - BSG_TPM_NONCE, &auth->NonceEven); - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); - - // FIXME: No support for migratable keys. - for (i=0; i < TPM_DIGEST_SIZE; i++) - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; - - // Flatten newKey prototype - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); - newKeyText.data = flatKey; - newKeyText.size = flatKeySize; - - // Generate HMAC - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_AUTHDATA, &encUsageAuth, - BSG_TPM_AUTHDATA, &encMigrationAuth); - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); - paramTextSize += newKeyText.size; - - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - osapSharedSecret, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, - parentHandle, - encUsageAuth, - encMigrationAuth, - &newKeyText.size, - &newKeyText.data, - auth) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); - paramTextSize += newKeyText.size; - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - osapSharedSecret, auth, 0) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); - - goto egress; - - abort_egress: - - egress: - - free(flatKey); - free(paramText); - TCS_FreeMemory(hContext, newKeyText.data); - - return status; -} - -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, - const TCS_KEY_HANDLE hUnwrappingKey, - const buffer_t *rgbWrappedKeyBlob, - const TPM_AUTHDATA *parentAuth, - TPM_HANDLE *newKeyHandle, - TCS_AUTH *auth, - CRYPTO_INFO *cryptoinfo, - const BOOL skipTPMLoad) { - - - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; - - BYTE *paramText=NULL; // Digest to make Auth. - UINT32 paramTextSize; - - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it - if (! skipTPMLoad) { - - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || - (newKeyHandle==NULL) || (auth==NULL)) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Generate Extra TCS Parameters - TPM_HANDLE phKeyHMAC; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 1, - BSG_TPM_COMMAND_CODE, &command); - - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); - paramTextSize += buffer_len(rgbWrappedKeyBlob); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - parentAuth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, - hUnwrappingKey, - buffer_len(rgbWrappedKeyBlob), - rgbWrappedKeyBlob->bytes, - auth, - newKeyHandle, - &phKeyHMAC) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_HANDLE, newKeyHandle); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - parentAuth, auth, - hContext) ); - } - - // Build cryptoinfo structure for software crypto function. - if (cryptoinfo != NULL) { - TPM_KEY newKey; - - // Unpack/return key structure - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - newKey.algorithmParms.parms, - &rsaKeyParms); - - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, - rsaKeyParms.exponent, - newKey.pubKey.keyLength, - newKey.pubKey.key, - cryptoinfo); - - // Destroy rsaKeyParms - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); - - // Set encryption scheme - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - } - - goto egress; - - abort_egress: - - egress: - - free(paramText); - return status; -} - -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE key_handle, - const buffer_t *bound_data, - const TPM_AUTHDATA *usage_auth, - buffer_t *clear_data, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_UnBind; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate Extra TCS Parameters - struct pack_buf_t clear_data32; - BYTE *clear_data_text; - UINT32 clear_data_size; - - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &bound_data32); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - usage_auth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_UnBind( hContext, - key_handle, - buffer_len(bound_data), - bound_data->bytes, - auth, - &clear_data_size, - &clear_data_text) ); - - - // Verify Auth - clear_data32.size = clear_data_size; - clear_data32.data = clear_data_text; - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &clear_data32); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - usage_auth, auth, - hContext) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); - - goto egress; - - abort_egress: - - egress: - - free(paramText); - TCS_FreeMemory(hContext, clear_data_text); - - return status; -} - -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, - const buffer_t *inData, - buffer_t *outData) -{ - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); - TPM_RESULT status = TPM_SUCCESS; - TPM_BOUND_DATA boundData; - UINT32 i; - - // Fill boundData's accessory information - boundData.ver = TPM_STRUCT_VER_1_1; - boundData.payload = TPM_PT_BIND; - boundData.payloadData = inData->bytes; - - // Pack boundData before encryption - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * - (sizeof(TPM_VERSION) + - sizeof(TPM_PAYLOAD_TYPE) + - buffer_len(inData))); - if (flatBoundData == NULL) { - return TPM_NOSPACE; - } - UINT32 flatBoundDataSize = 0; - flatBoundDataSize = BSG_PackList( flatBoundData, 2, - BSG_TPM_VERSION, &boundData.ver, - BSG_TYPE_BYTE, &boundData.payload); - - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); - flatBoundDataSize += buffer_len(inData); - - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. - UINT32 out_tmp_size; - - // Encrypt flatBoundData - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, - flatBoundDataSize, - flatBoundData, - &out_tmp_size, - out_tmp) ); - - if (out_tmp_size > RSA_KEY_SIZE/8) { - // The result of RSAEnc should be a fixed size based on key size. - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); - } - - buffer_init(outData, 0, NULL); - buffer_append_raw(outData, out_tmp_size, out_tmp); - - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); - for(i = 0 ; i < out_tmp_size ; i++) { - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); - } - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - goto egress; - abort_egress: - egress: - - // Free flatBoundData - free(flatBoundData); - - return TPM_SUCCESS; -} - -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_AUTHDATA *sealDataAuth, - const TPM_PCR_COMPOSITE *pcrComp, - const buffer_t *inData, - TPM_STORED_DATA *sealedData, - const TPM_SECRET *osapSharedSecret, - TCS_AUTH *auth) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_Seal; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate PCR_Info Struct from Comp - TPM_PCR_INFO pcrInfo; - UINT32 pcrInfoSize, flatpcrSize; - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks - sizeof(UINT16) + // 2 byte UINT16 - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs - - if (pcrComp != NULL) { - //printf("\n\tBinding to PCRs: "); - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) - //printf("%2.2x", pcrComp->select.pcrSelect[i]); - - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); - - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); - } else { - //printf("\n\tBinding to no PCRS."); - pcrInfoSize = 0; - } - - // Calculate encUsageAuth - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; - UINT32 XORbufferSize = sizeof(XORbuffer); - TPM_DIGEST XORKey; - TPM_ENCAUTH encAuth; - - BSG_PackList( XORbuffer, 2, - BSG_TPM_SECRET, osapSharedSecret, - BSG_TPM_NONCE, &auth->NonceEven ); - - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); - - int i; - for (i=0; i < TPM_DIGEST_SIZE; i++) - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; - - // Generate Extra TCS Parameters - UINT32 inDataSize = buffer_len(inData); - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; - - UINT32 sealedDataSize; - BYTE *flatSealedData=NULL; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 4, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_ENCAUTH, &encAuth, - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, - BSG_TPM_SIZE32_DATA, &inData_pack); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - osapSharedSecret, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_Seal( hContext, - keyHandle, - encAuth, - pcrInfoSize, - flatpcr, - inDataSize, - inData->bytes, - auth, - &sealedDataSize, - &flatSealedData) ); - - // Unpack/return key structure - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_STORED_DATA, sealedData); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - osapSharedSecret, auth, - 0) ); - - - goto egress; - - abort_egress: - egress: - - if (flatSealedData) - TCS_FreeMemory( hContext, flatSealedData); - - free(paramText); - return status; -} - - -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_STORED_DATA *sealedData, - const TPM_AUTHDATA *key_usage_auth, - const TPM_AUTHDATA *data_usage_auth, - buffer_t *outData, - TCS_AUTH *auth, - TCS_AUTH *dataAuth) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_Unseal; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate Extra TCS Parameters - UINT32 sealDataSize, clearDataSize; - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + - 2 * sizeof(UINT32) + - sealedData->sealInfoSize + - sealedData->encDataSize), - *clearData=NULL; - - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_STORED_DATA, sealedData); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - key_usage_auth, auth) ); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - data_usage_auth, dataAuth) ); - // Call TCS - TPMTRYRETURN( TCSP_Unseal( hContext, - keyHandle, - sealDataSize, - flatSealedData, - auth, - dataAuth, - &clearDataSize, - &clearData) ); - - // Verify Auth - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &clearData_pack); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - key_usage_auth, auth, - hContext) ); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - data_usage_auth, dataAuth, - hContext) ); - - // Unpack/return key structure - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); - - goto egress; - - abort_egress: - egress: - - if (flatSealedData) - TCS_FreeMemory( hContext, clearData); - - free(paramText); - return status; -} - -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { - - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); - - TPM_RESULT status = TPM_SUCCESS; - - // Call TCS - return ( TCSP_SaveState ( hContext ) ); - -} - - -// Function Reaches into unsupported TCS command, beware. -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, - const buffer_t *inbuf, - buffer_t *outbuf ) { - - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); - TPM_RESULT status = TPM_SUCCESS; - - // Generate Extra TCS Parameters - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; - - // Call TCS - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, - &resultTextSize, resultText) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); - goto egress; - - abort_egress: - - egress: - TCS_FreeMemory(hContext, resultText); - free(resultText); - return status; -} diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h deleted file mode 100644 index 2fb0440..0000000 --- a/tools/vtpm_manager/manager/vtsp.h +++ /dev/null @@ -1,126 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtsp.h -// -// Higher level interface to TCS. -// -// ================================================================== - -#ifndef __VTSP_H__ -#define __VTSP_H__ - -#include "tcg.h" -#include "tcs.h" - -#define KEY_BUFFER_SIZE 2048 - -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, - const buffer_t *inbuf, - buffer_t *outbuf ); - -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, - TCS_AUTH *auth); - -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, - const TPM_ENTITY_TYPE entityType, - const UINT32 entityValue, - const TPM_AUTHDATA *usageAuth, - TPM_SECRET *sharedsecret, - TCS_AUTH *auth); - -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, - const TCS_AUTH *auth); - -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, - CRYPTO_INFO *cypto_info); - -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - const TPM_AUTHDATA *srkAuth, - CRYPTO_INFO *ek_cryptoInfo, - TCS_AUTH *auth); - -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - TCS_AUTH *auth); - -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_USAGE usage, - const TPM_AUTHDATA *newKeyAuth, - const TCS_KEY_HANDLE parentHandle, - const TPM_AUTHDATA *osapSharedSecret, - buffer_t *pubKeyBuf, - TCS_AUTH *auth); - -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, - const TCS_KEY_HANDLE hUnwrappingKey, - const buffer_t *rgbWrappedKeyBlob, - const TPM_AUTHDATA *parentAuth, - TPM_HANDLE *newKeyHandle, - TCS_AUTH *pAuth, - CRYPTO_INFO *cryptoinfo, - const BOOL skipTPMLoad); - -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE key_handle, - const buffer_t *bound_data, - const TPM_AUTHDATA *usage_auth, - buffer_t *clear_data, - TCS_AUTH *auth); - -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, - const buffer_t *inData, - buffer_t *outData); - -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_AUTHDATA *sealDataAuth, - const TPM_PCR_COMPOSITE *pcrComp, - const buffer_t *inData, - TPM_STORED_DATA *sealedData, - const TPM_SECRET *osapSharedSecret, - TCS_AUTH *auth); - -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_STORED_DATA *sealedData, - const TPM_AUTHDATA *key_usage_auth, - const TPM_AUTHDATA *data_usage_auth, - buffer_t *outData, - TCS_AUTH *auth, - TCS_AUTH *dataAuth); - -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); - -#endif //_VTSP_H_ diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile deleted file mode 100644 index e33ae95..0000000 --- a/tools/vtpm_manager/migration/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -VPATH = ../manager - -BIND = vtpm_migratord -BINC = vtpm_migrator - -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c - -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) - -.PHONY: all -all: build - -.PHONY: build -build: $(BIND) $(BINC) - -.PHONY: install -install: build - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: - rm -f $(BINC) $(BIND) - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIND): $(OBJSD) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -$(BINC): $(OBJSC) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -# libraries -LIBS += ../util/libTCGUtils.a diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c deleted file mode 100644 index 08986f4..0000000 --- a/tools/vtpm_manager/migration/vtpm_manager_if.c +++ /dev/null @@ -1,186 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager_if.c -// -// Provides functions to call local vtpm manager interface (Hotplug) -// -// ================================================================== - -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "vtpm_ipc.h" -#include "bsg.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" - -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; - -TPM_RESULT vtpm_manager_open(){ - - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); - return TPM_IOERROR; - } - - return TPM_SUCCESS; -} - -void vtpm_manager_close() { - - vtpm_ipc_close(&tx_ipc_h); - vtpm_ipc_close(&rx_ipc_h); -} - - -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, - buffer_t *command_param_buf, - TPM_RESULT *cmd_status, /* out */ - buffer_t *result_param_buf) { - - TPM_RESULT status = TPM_FAIL; - int size_read, size_write, i; - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; - TPM_TAG tag=VTPM_TAG_REQ; - - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); - adj_command = (BYTE *) malloc( adj_command_size ); - if (!adj_command) { - status = TPM_RESOURCES; - goto abort_egress; - } - - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); - BSG_PackList(adj_command, 4, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_COMMAND_CODE, &ord ); - - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); - - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); - for (i=0; i< adj_command_size; i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - if (size_write != (int) adj_command_size ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); - - // Read header for response to manager command - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); - for (i=0; i 0) { - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); - goto abort_egress; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - status = TPM_IOERROR; - goto abort_egress; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - - diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h deleted file mode 100644 index 8d52e66..0000000 --- a/tools/vtpm_manager/migration/vtpm_migrator.h +++ /dev/null @@ -1,104 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_migrator.h -// -// Public Interface header for VTPM Migrator -// -// ================================================================== - -#ifndef __VTPM_MIGRATOR_H__ -#define __VTPM_MIGRATOR_H__ - -#define VTPM_MTAG_REQ 0x02c1 -#define VTPM_MTAG_RSP 0x02c4 - -// Header sizes. -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) - -//*********************** Connection Info ************************** -#define VTPM_MIG_PORT 48879 - -//************************ Command Codes *************************** -#define VTPM_MORD_MIG_STEP1 0x00 -#define VTPM_MORD_MIG_STEP2 0x01 -#define VTPM_MORD_MIG_STEP3 0x02 -#define VTPM_MORD_MIG_STEP4 0x03 - -//************************ Return Codes **************************** -#define VTPM_SUCCESS 0 -#define VTPM_FAIL 1 - -/******************* Command Parameter API ************************* - -VTPM Command Format - tpm tag: 2 bytes - command size: 4 bytes // Size of command including header but not DMI - ord: 4 bytes // Command ordinal above - parameters: size - 10 bytes // Command Parameter - -VTPM Response Format - tpm tag: 2 bytes - response_size: 4 bytes - status: 4 bytes - parameters: size - 10 bytes - - -VTPM_Mig_Phase1: - Unsupported: (Handled by scripts) - -VTPM_Mig_Phase2 - Input Parameters: - domain_name_size: 4 bytes - domain_name : domain_name_size bytes - Output Parameters: - pub_exp_size: 4 bytes - pub_exp: pub_exp_size bytes - pub_mod_size: 4 bytes - pub_mod: pub_mod_size bytes - -VTPM_Mig_Phase3 - Input Parameters: - vtpm_state_size: 4 bytes - vtpm_state: vtpm_state_size bytes - Output Parameters: - none - -VTPM_Mig_Phase4 - Unsupported: (Handled by scripts) - - -*********************************************************************/ - -#endif //_VTPM_MANAGER_H_ diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c deleted file mode 100644 index de48b2d..0000000 --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c +++ /dev/null @@ -1,219 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_migrator_if.c -// -// Provides functions to call open network connection & call -// a function on the vtpm_migratord on the destination -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "bsg.h" -#include "vtpm_migrator.h" - -static int sock_desc; - - -TPM_RESULT vtpm_migratord_open(char *server_address){ - - TPM_RESULT status = TPM_FAIL; - - /* network variables */ - struct in_addr ip_addr; - struct sockaddr_in server_addr; - int addr_len; - struct hostent *dns_info=NULL; - - /* set up connection to server*/ - dns_info = gethostbyname(server_address); - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); - - if(ip_addr.s_addr < 0) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /* set up server variable */ - memset((char *)&server_addr, 0, sizeof(server_addr)); - server_addr.sin_family = AF_INET; - server_addr.sin_port = htons(VTPM_MIG_PORT); - server_addr.sin_addr.s_addr = ip_addr.s_addr; - - /* open socket, make connection */ - sock_desc = socket(AF_INET, SOCK_STREAM, 0); - - if (sock_desc < 0 ) { - status = TPM_IOERROR; - goto abort_egress; - } - - if (connect(sock_desc, - (struct sockaddr *)&server_addr, - sizeof(server_addr)) < 0 ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - status = TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - -void vtpm_migratord_close() { - close(sock_desc); -} - - -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, - buffer_t *command_param_buf, - TPM_RESULT *cmd_status, /* out */ - buffer_t *result_param_buf) { - - TPM_RESULT status = TPM_FAIL; - int size_read, size_write, i; - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; - TPM_TAG tag=VTPM_MTAG_REQ; - - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); - command = (BYTE *) malloc( command_size ); - if (!command) { - status = TPM_RESOURCES; - goto abort_egress; - } - - BSG_PackList(command, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &command_size, - BSG_TPM_COMMAND_CODE, &ord ); - - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); - - size_write = write(sock_desc, command, command_size); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); - for (i=0; i< command_size; i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - if (size_write != (int) command_size ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); - - // Read header for response - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); - for (i=0; i 0) { - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); - goto abort_egress; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - status = TPM_IOERROR; - goto abort_egress; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - - diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c deleted file mode 100644 index 18b3bdb..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratorc.c +++ /dev/null @@ -1,211 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include - -#include "tcg.h" -#include "log.h" -#include "bsg.h" -#include "buffer.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, - char *name, - UINT32 instance) { - TPM_RESULT status, cmd_status; - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; - UINT32 offset; - struct pack_buf_t addr_data32; - - //===== Get Destination's Public Migration Key ====== - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); - - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, - &out_param_buf, - &cmd_status, - &mig_key_buf) ); - vtpm_migratord_close(); - - TPMTRYRETURN(cmd_status); - - //===== Load migration key into vtpm_manager ======== - - addr_data32.data = (BYTE *)server_addr; - addr_data32.size = strlen(server_addr) + 1; // Include the null - - TPMTRYRETURN ( buffer_init ( &out_param_buf, - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), - NULL ) ) ; - - offset = BSG_PackList(out_param_buf.bytes, 1, - BSG_TPM_SIZE32_DATA, &addr_data32); - - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); - - TPMTRYRETURN ( vtpm_manager_open() ); - - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, - &out_param_buf, - &cmd_status, - &empty_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - goto egress; - - abort_egress: - egress: - - buffer_free(&mig_key_buf); - buffer_free(&out_param_buf); - - return status; -} - - -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, - char *name, - UINT32 instance) { - TPM_RESULT status, cmd_status; - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; - struct pack_buf_t addr_data32, name_data32, state_data32; - - //===== Get vtpm state from vtpm_manager ======== - addr_data32.data = (BYTE *)server_addr; - addr_data32.size = strlen(server_addr) + 1; // Include the null - - TPMTRYRETURN ( buffer_init ( &out_param_buf, - (2 * sizeof(UINT32)) + addr_data32.size, - NULL ) ) ; - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TYPE_UINT32, &instance, - BSG_TPM_SIZE32_DATA, &addr_data32); - - TPMTRYRETURN ( vtpm_manager_open() ); - - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, - &out_param_buf, - &cmd_status, - &state_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - TPMTRYRETURN( buffer_free( &out_param_buf ) ); - - //===== Send vtpm state to destination ====== - name_data32.data = (BYTE *)name; - name_data32.size = strlen(name) + 1; // Include the null - state_data32.data = state_buf.bytes; - state_data32.size = buffer_len(&state_buf); - - TPMTRYRETURN( buffer_init( &out_param_buf, - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, - NULL ) ) ; - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TPM_SIZE32_DATA, &name_data32, - BSG_TPM_SIZE32_DATA, &state_data32); - - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); - - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, - &out_param_buf, - &cmd_status, - &empty_buf) ); - vtpm_migratord_close(); - - TPMTRYRETURN(cmd_status); - - goto egress; - - abort_egress: - egress: - - buffer_free( &out_param_buf); - buffer_free( &state_buf); - buffer_free( &empty_buf); - - return status; -} - - -// Usage vtpm_migrator addr domain_name instance step - -int main(int argc, char **argv) { - - /* variables for processing of command */ - TPM_RESULT status = TPM_FAIL; - char *server_addr, *name; - UINT32 instance, step; - - if (argc != 5) { - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); - status= TPM_BAD_PARAMETER; - goto abort_egress; - } - - server_addr = argv[1]; - name = argv[2]; - instance = atoi( argv[3] ); - step = atoi( argv[4] ); - - switch (step) { - case VTPM_MORD_MIG_STEP2: - status = handle_vtpm_mig_step2(server_addr, name, instance); - break; - - case VTPM_MORD_MIG_STEP3: - status = handle_vtpm_mig_step3(server_addr, name, instance); - break; - - default: - status = TPM_BAD_PARAMETER; - goto abort_egress; - break; - } - - goto egress; - abort_egress: - egress: - - return status; -} - diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c deleted file mode 100644 index ea18c8c..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratord.c +++ /dev/null @@ -1,202 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "log.h" -#include "bsg.h" -#include "buffer.h" -#include "vtpm_migrator.h" - -void build_error_msg( buffer_t *buf, TPM_RESULT status) { - TPM_TAG tag = VTPM_MTAG_RSP; - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; - - buffer_init(buf, out_param_size, NULL); - - BSG_PackList(buf->bytes, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_RESULT, &status ); -} - -int main() { - - /* network variables */ - int sock_descr, client_sock=-1, len; - struct sockaddr_in addr; - struct sockaddr_in client_addr; - unsigned int client_length; - int bytes; - - /* variables for processing of command */ - TPM_RESULT status = TPM_FAIL; - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; - TPM_TAG tag; - TPM_COMMAND_CODE ord; - UINT32 in_param_size, adj_param_size; - int i, size_read, size_write; - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; - - - /* setup socket */ - sock_descr = socket(AF_INET, SOCK_STREAM, 0); - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_port = htons(VTPM_MIG_PORT); - - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); - return 1; - } - - listen(sock_descr, 10); - - for(;;) { - // ============ clear client info and wait for connection ========== - memset(&client_addr, 0, sizeof(client_addr)); - client_length = sizeof(client_addr); - - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); - client_sock=accept(sock_descr, &client_addr, &client_length); - if (client_sock == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); - goto abort_command; - } else { - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); - } - - // =================== Read incoming command ====================== - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); - for (i=0; i 0) { - buffer_init( &in_param_buf, adj_param_size, NULL); - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); - build_error_msg(&result_buf, TPM_IOERROR); - goto abort_command_with_error; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - build_error_msg(&result_buf, TPM_BAD_PARAMETER); - goto abort_command_with_error; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - /* Handle Command */ - switch (ord) { - case VTPM_MORD_MIG_STEP2: - handle_vtpm_mig_step2(&in_param_buf, &result_buf); - break; - - case VTPM_MORD_MIG_STEP3: - handle_vtpm_mig_step3(&in_param_buf, &result_buf); - break; - - default: - build_error_msg(&result_buf, TPM_BAD_PARAMETER); - goto abort_command_with_error; - } - - abort_command_with_error: - /* Write Response */ - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); - for (i=0; i< buffer_len(&result_buf); i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); - goto abort_command; - } - - if (size_write != (int) buffer_len(&result_buf) ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); - - abort_command: - close(client_sock); - buffer_free(&in_param_buf); - buffer_free(&result_buf); - - } // For (;;) - - return 0; -} - diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c deleted file mode 100644 index 0a8a2d5..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c +++ /dev/null @@ -1,177 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "log.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" -#define VTPM_SH_CMD_FTR "\"" -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" -#define VTPM_SH_ADD "vtpm_add_and_activate" -#define VTPM_SH_RESUME "vtpm_resume" - -// This must be updated to the longest command name. Currently GETINST -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) - -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) -{ - TPM_TAG tag = VTPM_TAG_RSP; - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; - TPM_RESULT status=TPM_SUCCESS, cmd_status; - UINT32 out_param_size; - - if ( (!in_param_buf) || (!result_buf) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // ================= Call manager and get mig key =============== - TPMTRYRETURN( vtpm_manager_open() ); - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, - &out_param_buf, // Empty - &cmd_status, - &mig_key_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - // ==================== return the mig key ===================== - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); - - TPMTRYRETURN( buffer_init(result_buf, - out_param_size, - NULL) ); - - BSG_PackList( result_buf->bytes, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_RESULT, &status); - - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, - mig_key_buf.bytes, buffer_len(&mig_key_buf)); - - goto egress; - - abort_egress: - buffer_free(result_buf); - build_error_msg(result_buf, status); - - egress: - return; -} - -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) -{ - TPM_TAG tag = VTPM_TAG_RSP; - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; - TPM_RESULT status=TPM_SUCCESS, cmd_status; - UINT32 out_param_size, instance; - char *shell_cmd_str=NULL; - size_t shell_cmd_strlen; - FILE *shell_f=NULL; - - if ( (!in_param_buf) || (!result_buf) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // ================= Read Parameters =============== - struct pack_buf_t name_data32, state_data32; - - BSG_UnpackList(in_param_buf->bytes, 2, - BSG_TPM_SIZE32_DATA, &name_data32, - BSG_TPM_SIZE32_DATA, &state_data32); - - // Before using this string, protect us from a non-null term array. - if (name_data32.data[name_data32.size -1] != 0x00) { - name_data32.data[name_data32.size -1] = 0x00; - } - - // ====== Call hotplug-script and get an instance ====== - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 - - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); - - shell_f = popen(shell_cmd_str, "r"); - fscanf(shell_f, "%d", &instance); - pclose(shell_f); - - // ====== Call hotplug-script and add instance ====== - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, - name_data32.data, instance); - system(shell_cmd_str); - - // ========= Call vtpm_manager and load VTPM ======= - TPMTRYRETURN( buffer_init( &out_param_buf, - 2*sizeof(UINT32) + state_data32.size, - NULL) ); - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TYPE_UINT32, &instance, - BSG_TPM_SIZE32_DATA, &state_data32); - - TPMTRYRETURN( vtpm_manager_open() ); - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, - &out_param_buf, - &cmd_status, - &empty_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - // ====== Call hotplug-script and resume instance ====== - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); - system(shell_cmd_str); - - goto egress; - abort_egress: - egress: - free(shell_cmd_str); - - // In this case no params come back, so reuse build_error_msg even for succes. - build_error_msg(result_buf, status); - return; -} - diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile deleted file mode 100644 index 11af91e..0000000 --- a/tools/vtpm_manager/tcs/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libTCS.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c deleted file mode 100644 index cf3803c..0000000 --- a/tools/vtpm_manager/tcs/contextmgr.c +++ /dev/null @@ -1,224 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// contextmgr.c -// -// This file contains the context management functions for TCS. -// -// ================================================================== - -#include -#include -#include -#include "tcs.h" -#include "contextmgr.h" -#include "log.h" -#include "hashtable.h" - -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in - int BlockSize) { // in - - BLOCK* pCurrentBlock = NULL; - BLOCK* pBlock = NULL; - - // check incoming params - if (pContextHandle == NULL || BlockSize == 0) - return NULL; - - // Create New Block - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); - if (pBlock == NULL) - return (0); - - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); - if (pBlock->aMemory == NULL) - return (0); - - memset(pBlock->aMemory, 0, BlockSize); - pBlock->nBlockSize = BlockSize; - pBlock->pNextBlock = NULL; - - // search for the last block created where to add the - // newly created block - if(pContextHandle->pTopBlock != NULL) { - pCurrentBlock = pContextHandle->pTopBlock; - while(pCurrentBlock->pNextBlock != NULL) - pCurrentBlock = pCurrentBlock->pNextBlock; - - - pCurrentBlock->pNextBlock= pBlock; - } else - pContextHandle->pTopBlock = pBlock; - - - pContextHandle->nBlockCount++; - - return pBlock->aMemory; -} - - -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in - BYTE* pTCPA_BYTEs) { // in - BLOCK* pCurrentBlock = NULL; - BLOCK* pParentBlock = NULL; - BOOL bFound = FALSE; - - if (pContextHandle == NULL) - return FALSE; - - - // Search for the Block in the context by aMemory pointer - pParentBlock = NULL; - pCurrentBlock = pContextHandle->pTopBlock; - - while(pCurrentBlock != NULL) { - // If aMemory block is found, delete it - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { - // if it is the top Block, remove it from the top, - // otherwise remove it from the ParentBlock and stitch - // the NextBlock to the ParentBlock - if(pParentBlock == NULL) - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; - else - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; - - // delete memory Block associated with pointer pTCPA_BYTEs - free(pCurrentBlock->aMemory); - pCurrentBlock->aMemory = NULL; - - free(pCurrentBlock); - pCurrentBlock = pParentBlock; - - pContextHandle->nBlockCount--; - bFound = TRUE; - } - - if(pCurrentBlock != NULL) { - pParentBlock = pCurrentBlock; - pCurrentBlock = pCurrentBlock->pNextBlock; - } - } - - return bFound; -} - -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in - TPM_RESOURCE_TYPE type, // in - TPM_HANDLE handle) { // in - HANDLE_LIST* pNewHandle = NULL; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if (pContextHandle == NULL) - return 0; - - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); - - if (pNewHandle == NULL) - return (0); - - pNewHandle->handle = handle; - pNewHandle->type = type; - pNewHandle->pNextHandle = pContextHandle->pHandleList; - - pContextHandle->pHandleList = pNewHandle; - - return 1; -} - -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in - TPM_HANDLE handle) { // in - - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, - *pLastHandle = pCurrentHandle; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); - - if (pContextHandle == NULL) - return 0; - - while (1) { - - if (pCurrentHandle->handle == handle) { // Found element - if (pCurrentHandle == pLastHandle) { // First element in list - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; - free(pCurrentHandle); - } else { // Ordinary element - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; - free(pCurrentHandle); - } - - return 1; - - } else { // Not found yet; - pLastHandle = pCurrentHandle; - pCurrentHandle = pCurrentHandle->pNextHandle; - if (pCurrentHandle == NULL) // Found end of list - return 0; - } - - } -} - -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in - HANDLE_LIST* pCurrentHandle; - BOOL returncode = TRUE; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); - - if (pContextHandle == NULL) - return 1; - - pCurrentHandle = pContextHandle->pHandleList; - while (pCurrentHandle != NULL) { - - switch (pCurrentHandle->type) { - case TPM_RT_KEY: - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); - break; - case TPM_RT_AUTH: - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); - break; - default: - returncode = FALSE; - } - - pCurrentHandle = pCurrentHandle->pNextHandle; - - } - - return 1; -} diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h deleted file mode 100644 index e3fdf0f..0000000 --- a/tools/vtpm_manager/tcs/contextmgr.h +++ /dev/null @@ -1,82 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// contextmgr.c -// -// This file contains the context management functions for TCS. -// -// ================================================================== - -#ifndef __CONTEXTMGR_H__ -#define __CONTEXTMGR_H__ - -#include "tcg.h" - -#define BLOCK_SIZE 300 - -typedef struct block { - int nBlockSize; - BYTE* aMemory; - struct block* pNextBlock; -} BLOCK; - -typedef struct handle_List { - TPM_HANDLE handle; - TPM_RESOURCE_TYPE type; - struct handle_List* pNextHandle; -} HANDLE_LIST; - -typedef struct context_handle { - TCS_CONTEXT_HANDLE handle; - int nBlockCount; - BLOCK* pTopBlock; - HANDLE_LIST* pHandleList; -} CONTEXT_HANDLE; - -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in - int BlockSize); // in - -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in - BYTE* pTCPA_BYTEs); // in - - -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in - TPM_RESOURCE_TYPE type, // in - TPM_HANDLE handle); // in - -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in - TPM_HANDLE handle); // in - -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in - -#endif //_CONTEXTMGR_H_ diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c deleted file mode 100644 index 7c1378c..0000000 --- a/tools/vtpm_manager/tcs/tcs.c +++ /dev/null @@ -1,1192 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcs.c -// -// This file contains the functions that implement a TCS. -// -// ================================================================== - -#include -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "tcs.h" -#include "contextmgr.h" -#include "tpmddl.h" -#include "log.h" -#include "hashtable.h" -#include "hashtable_itr.h" - -// Static Global Vars for the TCS -static int TCS_m_nCount = 0; - -#define TCPA_MAX_BUFFER_LENGTH 0x2000 - -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; - -struct hashtable *context_ht; - -// -------------------------- Hash table functions -------------------- - -static unsigned int hashfunc32(void *ky) { - return (* (UINT32 *) ky); -} - -static int equals32(void *k1, void *k2) { - return (*(UINT32 *) k1 == *(UINT32 *) k2); -} - -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); -} - -// --------------------------------------------------------------------------------- -// Initialization/Uninitialization SubComponent API -// --------------------------------------------------------------------------------- -TPM_RESULT TCS_create() { - TDDL_RESULT hRes = TDDL_E_FAIL; - TPM_RESULT result = TPM_FAIL; - - if (TCS_m_nCount == 0) { - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); - hRes = TDDL_Open(); - - context_ht = create_hashtable(10, hashfunc32, equals32); - - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { - result = TPM_SUCCESS; - TCS_m_nCount++; - } else { - result = TPM_IOERROR; - hashtable_destroy(context_ht, 1); - } - } else - TCS_m_nCount++; - - return(result); -} - - -void TCS_destroy() -{ - TCS_m_nCount--; - - if (TCS_m_nCount == 0) { - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); - TDDL_Close(); - - struct hashtable_itr *context_itr; - TCS_CONTEXT_HANDLE *hContext; - - // Close all the TCS contexts. TCS should evict keys based on this - if (hashtable_count(context_ht) > 0) { - context_itr = hashtable_iterator(context_ht); - do { - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); - - } while (hashtable_iterator_advance(context_itr)); - free(context_itr); - } - hashtable_destroy(context_ht, 1); - } - -} - -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in - UINT32 MemSize, // in - BYTE** ppMemPtr) {// out - - TPM_RESULT returnCode = TPM_FAIL; - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if (pContextHandle != NULL && ppMemPtr != NULL) { - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); - returnCode = TPM_SUCCESS; - } - - return returnCode; -} - -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in - BYTE* pMemory) { // in - TPM_RESULT returnCode = TPM_FAIL; - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if ( (pContextHandle != NULL && pMemory != NULL) && - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) - returnCode = TPM_SUCCESS; - - - return returnCode; -} - -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out - TPM_RESULT returnCode = TPM_FAIL; - TCS_CONTEXT_HANDLE *newContext; - - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); - - if (hContext) { - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); - if (pContextHandle == NULL) - return TPM_SIZE; - - // initialize to 0 - pContextHandle->nBlockCount = 0; - pContextHandle->pTopBlock = NULL; - pContextHandle->pHandleList = NULL; - - // Create New Block - AddMemBlock(pContextHandle, BLOCK_SIZE); - - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); - - if (hashtable_search(context_ht, &newContext) !=NULL) - *newContext += 1; - - pContextHandle->handle = *newContext; - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { - free(newContext); - free(pContextHandle); - returnCode = TPM_FAIL; - } else { - *hContext = *newContext; - returnCode = TPM_SUCCESS; - } - } - - return(returnCode); -} - -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in - //FIXME: TCS SHOULD Track failed auths and make sure - //we don't try and re-free them here. - TPM_RESULT returnCode = TPM_FAIL; - - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if(pContextHandle != NULL) { - // Print test info - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); - - // free memory for all the blocks - DeleteMemBlock(pContextHandle, NULL ); - pContextHandle->pTopBlock = NULL; - - FreeHandleList(pContextHandle); - if (pContextHandle->pHandleList != NULL) - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); - - // Release the TPM's resources - if (hashtable_remove(context_ht, &hContext) == NULL) - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); - - free(pContextHandle); - returnCode = TPM_SUCCESS; - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); - return(returnCode); -} - -// ------------------------------------------------------------------ -// Internal Functions -// ------------------------------------------------------------------ -int packAuth(BYTE* dst, TCS_AUTH* auth) { - // CHECK: according to the command specs, the outgoing auth params are: - // nonceEven - // nonceOdd - // continueAuthSession - // auth digest for return params - // - // this is a bit different than this code... - - return BSG_PackList(dst, 4, - BSG_TYPE_UINT32, &(auth->AuthHandle), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), - BSG_TPM_AUTHDATA, &(auth->HMAC)); -} - -int unpackAuth(TCS_AUTH* auth, BYTE* src) { - return BSG_UnpackList(src, 3, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), - BSG_TPM_AUTHDATA, &(auth->HMAC)); -} - -// ------------------------------------------------------------------ -// Authorization Commands -// ------------------------------------------------------------------ - -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonce0) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; - UINT32 paramSize = 0; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (authHandle == NULL || nonce0 == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_UnpackList(OutBuf+i, 2, - BSG_TYPE_UINT32, authHandle, - BSG_TPM_NONCE, nonce0); - - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in - TPM_ENTITY_TYPE entityType, // in - UINT32 entityValue, // in - TPM_NONCE nonceOddOSAP, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonceEven, // out - TPM_NONCE* nonceEvenOSAP) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT16, &entityType, - BSG_TYPE_UINT32, &entityValue, - BSG_TPM_NONCE, &nonceOddOSAP); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_UnpackList(OutBuf+i, 3, - BSG_TYPE_UINT32, authHandle, - BSG_TPM_NONCE, nonceEven, - BSG_TPM_NONCE, nonceEvenOSAP); - - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in - UINT16 protocolID, // in - UINT32 encOwnerAuthSize, // in - BYTE* encOwnerAuth, // in - UINT32 encSrkAuthSize, // in - BYTE* encSrkAuth, // in - UINT32* SrkSize, // in, out - BYTE** Srk, // in, out - TCS_AUTH* ownerAuth) // in, out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT16, &protocolID, - BSG_TYPE_UINT32, &encOwnerAuthSize); - - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); - InLength += encOwnerAuthSize; - InLength += BSG_Pack( BSG_TYPE_UINT32, - &encSrkAuthSize, - InBuf+InLength); - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); - InLength += encSrkAuthSize; - memcpy(InBuf+InLength, *Srk, *SrkSize); - InLength += *SrkSize; - InLength += packAuth(InBuf+InLength, ownerAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, - &InLength, - InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS){ - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_KEY srkPub; - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); - unpackAuth(ownerAuth, OutBuf+i); - - // fill output params - BYTE tempBuf[1024]; - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { - return(TPM_SIZE); - } - memcpy(*Srk, tempBuf, *SrkSize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - - -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTH* ownerAuth) { // in, out - - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - - InLength += packAuth(InBuf+InLength, ownerAuth); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS){ - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - unpackAuth(ownerAuth, OutBuf+i); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - - -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &handle); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (!DeleteHandleFromList(hContext, handle)) - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); - - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Print debug info - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -// TPM Mandatory -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_DIGEST inDigest, // in - TPM_PCRVALUE* outDigest) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &pcrNum, - BSG_TPM_DIGEST, &inDigest); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ - // Extract the remaining output parameters - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_ENCAUTH encAuth, // in - UINT32 pcrInfoSize, // in - BYTE* PcrInfo, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* pubAuth, // in, out - UINT32* SealedDataSize, // out - BYTE** SealedData) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &keyHandle, - BSG_TPM_ENCAUTH, encAuth, - BSG_TYPE_UINT32, &pcrInfoSize); - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); - InLength += pcrInfoSize; - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); - memcpy(InBuf+InLength, inData, inDataSize); - InLength += inDataSize; - InLength += packAuth(InBuf+InLength, pubAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_STORED_DATA sealedData; - - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); - unpackAuth(pubAuth, OutBuf+i); - - // fill SealedData - BYTE tempBuf[1024]; - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*SealedData, tempBuf, *SealedDataSize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE parentHandle, // in - UINT32 SealedDataSize, // in - BYTE* SealedData, // in - TCS_AUTH* parentAuth, // in, out - TCS_AUTH* dataAuth, // in, out - UINT32* DataSize, // out - BYTE** Data) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || - DataSize == NULL || Data == NULL) - return TPM_BAD_PARAMETER; - - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &parentHandle); - memcpy(InBuf+InLength, SealedData, SealedDataSize); - InLength += SealedDataSize; - InLength += packAuth(InBuf+InLength, parentAuth); - InLength += packAuth(InBuf+InLength, dataAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*Data, OutBuf+i, *DataSize); - i += *DataSize; - i += unpackAuth(parentAuth, OutBuf+i); - unpackAuth(dataAuth, OutBuf+i); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* privAuth, // in, out - UINT32* outDataSize, // out - BYTE** outData) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &keyHandle, - BSG_TYPE_UINT32, &inDataSize); - memcpy(InBuf+InLength, inData, inDataSize); - InLength += inDataSize; - InLength += packAuth(InBuf+InLength, privAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) - return TPM_SIZE; - - memcpy(*outData, OutBuf+i, *outDataSize); - i += *outDataSize; - unpackAuth(privAuth, OutBuf+i); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hWrappingKey, // in - TPM_ENCAUTH KeyUsageAuth, // in - TPM_ENCAUTH KeyMigrationAuth, // in - UINT32* pcKeySize, // in, out - BYTE** prgbKey, // in, out - TCS_AUTH* pAuth) // in, out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) - return TPM_BAD_PARAMETER; - - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hWrappingKey, - BSG_TPM_ENCAUTH, KeyUsageAuth, - BSG_TPM_ENCAUTH, KeyMigrationAuth); - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); - InLength += *pcKeySize; - InLength += packAuth(InBuf+InLength, pAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_RESULT, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_KEY wrappedKey; - - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); - unpackAuth(pAuth, OutBuf+i); - - // Fill prgbKey - BYTE tempBuf[1024]; - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) - return TPM_SIZE; - - memcpy(*prgbKey, tempBuf, *pcKeySize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hUnwrappingKey, // in - UINT32 cWrappedKeyBlobSize, // in - BYTE* rgbWrappedKeyBlob, // in - TCS_AUTH* pAuth, // in, out - TCS_KEY_HANDLE* phKeyTCSI, // out - TCS_KEY_HANDLE* phKeyHMAC) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) - return TPM_BAD_PARAMETER; - - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hUnwrappingKey); - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); - InLength += cWrappedKeyBlobSize; - InLength += packAuth(InBuf+InLength, pAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, - OutBuf+i, - phKeyTCSI); - unpackAuth(pAuth, OutBuf+i); - - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hKey); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (!DeleteHandleFromList(hContext, hKey)) { - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); - } - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in - UINT32* bytesRequested, // in, out - BYTE** randomBytes) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (bytesRequested == NULL || *randomBytes == NULL){ - return TPM_BAD_PARAMETER; - } - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, bytesRequested); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in - TPM_NONCE antiReplay, // in - UINT32* pubEndorsementKeySize, // out - BYTE** pubEndorsementKey, // out - TPM_DIGEST* checksum) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { - return TPM_BAD_PARAMETER; - } - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TPM_NONCE, &antiReplay); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - TPM_PUBKEY pubEK; - i += BSG_UnpackList(OutBuf+i, 2, - BSG_TPM_PUBKEY, &pubEK, - BSG_TPM_DIGEST, checksum); - - // fill EndorsementKey - BYTE tempBuf[1024]; - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in - BYTE *inData, // in - UINT32 *outDataSize,// in/out - BYTE *outData) { // out - - TDDL_RESULT hRes; - - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); - //FIXME: Add Context Management - hRes = TDDL_TransmitData( inData, - inDataSize, - outData, - outDataSize); - - if (hRes == TDDL_SUCCESS) { - return TPM_SUCCESS; - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); - return TPM_IOERROR; - } - -} diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h deleted file mode 100644 index 83b9cd0..0000000 --- a/tools/vtpm_manager/tcs/tcs.h +++ /dev/null @@ -1,245 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcs.h -// -// This file declares the TCS API -// -// ================================================================== - -#ifndef __TCS_H__ -#define __TCS_H__ - -#include "tcg.h" -#include "contextmgr.h" -#include "buffer.h" - -#define HANDLE_NULL 0 - -// ------------------------------------------------------------------ -// Exposed API -// ------------------------------------------------------------------ - -TPM_RESULT TCS_create(); -void TCS_destroy(); - -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); - -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); - -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in - UINT32 MemSize, // in - BYTE** ppMemPtr ); //out - -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in - BYTE* pMemory); // in - -// ------------------------------------------------------------------ -// Exposed API -// ------------------------------------------------------------------ - -// TPM v1.1B Command Set - -// Authorzation -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonce0 // out - ); - -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in - TPM_ENTITY_TYPE entityType, // in - UINT32 entityValue, // in - TPM_NONCE nonceOddOSAP, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonceEven, // out - TPM_NONCE* nonceEvenOSAP // out - ); - -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in - UINT16 protocolID, // in - UINT32 encOwnerAuthSize, // in - BYTE* encOwnerAuth, // in - UINT32 encSrkAuthSize, // in - BYTE* encSrkAuth, // in - UINT32* SrkSize, // in, out - BYTE** Srk, // in, out - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle // in - ); - -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle, // in - TPM_RESOURCE_TYPE resourceType //in - ); - -// TPM Mandatory -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_DIGEST inDigest, // in - TPM_PCRVALUE* outDigest // out - ); - -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_PCRVALUE* outDigest // out - ); - -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_NONCE antiReplay, // in - UINT32* PcrDataSize, // in, out - BYTE** PcrData, // in, out - TCS_AUTH* privAuth, // in, out - UINT32* sigSize, // out - BYTE** sig // out - ); - -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_ENCAUTH encAuth, // in - UINT32 pcrInfoSize, // in - BYTE* PcrInfo, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* pubAuth, // in, out - UINT32* SealedDataSize, // out - BYTE** SealedData // out - ); - -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE parentHandle, // in - UINT32 SealedDataSize, // in - BYTE* SealedData, // in - TCS_AUTH* parentAuth, // in, out - TCS_AUTH* dataAuth, // in, out - UINT32* DataSize, // out - BYTE** Data // out - ); - -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in - TPM_DIRINDEX dirIndex, // in - TPM_DIRVALUE newContents, // in - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in - TPM_DIRINDEX dirIndex, // in - TPM_DIRVALUE* dirValue // out - ); - -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* privAuth, // in, out - UINT32* outDataSize, // out - BYTE** outData // out - ); - -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hWrappingKey, // in - TPM_ENCAUTH KeyUsageAuth, // in - TPM_ENCAUTH KeyMigrationAuth, // in - UINT32* pcKeySize, // in, out - BYTE** prgbKey, // in, out - TCS_AUTH* pAuth // in, out - ); - -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hUnwrappingKey, // in - UINT32 cWrappedKeyBlobSize, // in - BYTE* rgbWrappedKeyBlob, // in - TCS_AUTH* pAuth, // in, out - TCS_KEY_HANDLE* phKeyTCSI, // out - TCS_KEY_HANDLE* phKeyHMAC // out - ); - -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey, // in - TCS_AUTH* pAuth, // in, out - UINT32* pcPubKeySize, // out - BYTE** prgbPubKey // out - ); - -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey // in - ); - -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 areaToSignSize, // in - BYTE* areaToSign, // in - TCS_AUTH* privAuth, // in, out - UINT32* sigSize, // out - BYTE** sig // out - ); - -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in - UINT32* bytesRequested, // in, out - BYTE** randomBytes // out - ); - -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in - UINT32 inDataSize, // in - BYTE* inData // in - ); - -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in - TPM_NONCE antiReplay, // in - UINT32* pubEndorsementKeySize, // out - BYTE** pubEndorsementKey, // out - TPM_DIGEST* checksum // out - ); - - -// Non-Standard TCSP calls -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in - -//Give direct access to TransmitData. -// Key and Auth Management is done before transfering command to TDDL. -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in - BYTE *inData, // in - UINT32 *outDataSize,// in/out - BYTE *outData); // out - -///////////// Private Functions //////////////////// -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); - -#endif //TCS_H diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h deleted file mode 100644 index e7e54f1..0000000 --- a/tools/vtpm_manager/tcs/tpmddl.h +++ /dev/null @@ -1,69 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tpmddl.c -// -// This file defines the TDDLI API -// -// ================================================================== - -#ifndef __TPMDDL_H__ -#define __TPMDDL_H__ - -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 - -#define TDDL_E_FAIL 1 -#define TDDL_E_SUCCESS 0 -#define TDDL_SUCCESS 0 - -typedef unsigned int TDDL_UINT32; -typedef TDDL_UINT32 TDDL_RESULT; -typedef unsigned char TDDL_BYTE; - -TDDL_RESULT TDDL_Open(); -void TDDL_Close(); -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, - TDDL_UINT32 insize, - TDDL_BYTE* out, - TDDL_UINT32* outsize); -TDDL_RESULT TDDL_GetStatus(); -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, - TDDL_UINT32 sub, - TDDL_BYTE* buffer, - TDDL_UINT32* size); -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, - TDDL_UINT32 sub, - TDDL_BYTE* buffer, - TDDL_UINT32* size); - -#endif // __TPMDDL_H__ diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c deleted file mode 100644 index 74bbdca..0000000 --- a/tools/vtpm_manager/tcs/transmit.c +++ /dev/null @@ -1,147 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "tpmddl.h" - -// flag to track whether TDDL has been opened -static int g_TDDL_open = 0; -static int g_tx_fd = -1; // the fd to the TPM - -#ifndef DUMMY_TPM - #define TPM_TX_FNAME "/dev/tpm0" - static int *g_rx_fdp = &g_tx_fd; -#else - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" - static int g_rx_fd = -1; - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM -#endif - -TPM_RESULT -TDDL_TransmitData( TDDL_BYTE* in, - TDDL_UINT32 insize, - TDDL_BYTE* out, - TDDL_UINT32* outsize) { - TPM_RESULT status = TPM_SUCCESS; - TDDL_UINT32 i; - - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); - for(i = 0 ; i < insize ; i++) - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); - - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - ssize_t size = 0; - - // send the request - size = write (g_tx_fd, in, insize); - if (size < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); - ERRORDIE (TPM_IOERROR); - } - else if ((TDDL_UINT32) size < insize) { - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); - // ... ? - } - - // read the response - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); - if (size < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); - ERRORDIE (TPM_IOERROR); - } - - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); - for(i = 0 ; i < size ; i++) - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); - - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - *outsize = size; - // close connection - goto egress; - - abort_egress: - egress: - return status; -} - -TPM_RESULT TDDL_Open() { - - TDDL_RESULT status = TDDL_SUCCESS; - - if (g_TDDL_open) - return TPM_FAIL; - -#ifdef DUMMY_TPM - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); -#endif - - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); - if (g_tx_fd < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); - return TPM_IOERROR; - } - - g_TDDL_open = 1; - - return status; -} - -void TDDL_Close() { - if (! g_TDDL_open) - return; - - if (g_tx_fd>= 0) { - if (close(g_tx_fd) < 0) - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); - g_tx_fd = -1; - } - - if (*g_rx_fdp>= 0) { - if (close(*g_rx_fdp) < 0) - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); - *g_rx_fdp = -1; - } - - g_TDDL_open = 0; - -} diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile deleted file mode 100644 index 36bc38f..0000000 --- a/tools/vtpm_manager/util/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libTCGUtils.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c deleted file mode 100644 index fa36ce7..0000000 --- a/tools/vtpm_manager/util/bsg.c +++ /dev/null @@ -1,829 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// bsg.cpp -// -// This file will handle all the TPM Byte Stream functions -// -// ================================================================== - -#include -#include -#include -#include -#include "tcg.h" -#include "crypto.h" -#include "bsg.h" -#include "log.h" - -static int g_log_recursion_level = 0; - -// a largest buffer size. if we get a buf size bigger than this when unpacking, -// will complain! -#define BSG_MAX_BUF_SIZE (1<<18) - -#define bsglog(fmt, ...) do { \ - int __i; \ - for (__i=0; __i < g_log_recursion_level; __i++) { \ - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ - } \ - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ - } while (0) - - -// FIXME: trigger the selfcheck--need to use glibc hook to do this -//BOOL dummy1 = BSG_static_selfcheck(); - - -// Interpretting Types -// ------------------- -// -// Incoming Types are composed of two parts {format, info} squished into a -// BSG_UINT32. The first 4 bits is a format spec indicating what type of -// data it is. If the first 4 bits are zero the info corresponds to a value in -// BSG_s_fmt[]. This is a structure whose composition is described in -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the -// data (in bytes) being passed in. For example a UINT32 being passed in would -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, -// this is interpretted as the end of the structure, and the result is returned. - -// these flags are mutually exclusive, so I'll just make them -// format values which indicate the semantics of the 'info' part and the source -// data. The above description has been accordingly adjusted. - -// format values for determining what type of data the incoming type is -// it's a 4 bit value, occupying the high 4 bits -#define __FMT_CONST (1UL << 28) // Constant sized value -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. -#define __FMT_HSIZE (4UL << 28) // A number of handles -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists - // of {size32, data} but we're to pack only the - // data as that is already packed, and so - // can/must be unpacked without - // explicitly reading it size - -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) - -// constant (8/16/32-bits) -#define FMT_U8 (__FMT_CONST | 1UL) -#define FMT_U16 (__FMT_CONST | 2UL) -#define FMT_U32 (__FMT_CONST | 4UL) - -// const with a compiler-computed size -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) - -// other data (size bytes) -// Used primarily for DIGESTS -> FMT_DATA(20) -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) - -// 16/32-bit size followed by N bytes of data -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) - -// 16-bit size followed by N key handles -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) - -#define DIGEST_SIZE 20 -typedef BSG_UINT32 BSG_HANDLE; - -// TCPA_AUTH has 11 fields! -#define MAX_FIELDS 11 -typedef struct BSG_Format -{ - BSG_Type type; - const char* name; - BSG_UINT32 fields[MAX_FIELDS + 1]; -} BSG_Format; - -/* - * TCPA structure data formats - */ -// this has to be manually kept in sync with the -// Type enum!! the static_selfcheck() function should be used regularly! -static BSG_Format s_fmt[] = -{ - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, - - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, - - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, - - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", - {FMT_SIZE16_HANDLES, 0}}, - - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { - BSG_TPM_ALGORITHM_ID, - BSG_TPM_ENC_SCHEME, - BSG_TPM_SIG_SCHEME, - FMT_SIZE32_DATA, - 0}}, - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, - {BSG_TPM_KEY, "BSG_TPM_KEY", { - BSG_TPM_VERSION, - BSG_TPM_KEY_USAGE, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_KEY_PARMS, - FMT_SIZE32_DATA, // the PCR_INFO - BSG_TPM_STORE_PUBKEY, - FMT_SIZE32_DATA, // the encrypted part - 0}}, - - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { - BSG_TPM_PUBKEY, - BSG_TPM_MIGRATE_SCHEME, - BSG_TPM_DIGEST, 0}}, - - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { - BSG_TPM_COMMAND_CODE, - BSG_TPM_RESULT, 0 }}, - - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { - BSG_TPM_DIGEST, - BSG_TPM_DIGEST, - FMT_DATA(2), - FMT_SIZE32_DATA, 0}}, - - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, - FMT_SIZE32_DATA, - 0} }, - - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_COMPOSITE_HASH, - 0} }, - - - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { - BSG_TPM_VERSION, - FMT_SIZE32_DATA, - FMT_SIZE32_DATA, - 0}}, - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { - BSG_TPM_ALGORITHM_ID, - BSG_TPM_ENC_SCHEME, - FMT_SIZE16_DATA, - 0}}, - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { - BSG_TPM_PAYLOAD_TYPE, - BSG_TPM_SECRET, - BSG_TPM_SECRET, - BSG_TPM_DIGEST, - BSG_TPM_STORE_PRIVKEY, - 0}}, - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { - BSG_TPM_PAYLOAD_TYPE, - BSG_TPM_SECRET, - BSG_TPM_DIGEST, - FMT_U32, - BSG_TPM_STORE_PRIVKEY, - 0}}, - - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { - BSG_TPM_VERSION, - FMT_DATA(4), - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_NONCE, - 0}}, - - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { - BSG_TPM_VERSION, - FMT_U32, - BSG_TPM_CHOSENID_HASH, - BSG_TPM_PUBKEY, - 0}}, - - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, - - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { - FMT_U8, - FMT_U8, - 0}}, - - {BSG_TCS_AUTH, "TCS_AUTH", { - BSG_TYPE_UINT32, - BSG_TPM_NONCE, - BSG_TPM_NONCE, - BSG_TYPE_BOOL, - BSG_TPM_AUTHDATA, - 0}}, - - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { - BSG_TPM_VERSION, - BSG_TPM_KEY_USAGE, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_KEY_PARMS, - FMT_SIZE32_DATA, - BSG_TPM_STORE_PUBKEY, - 0}}, - - {BSG_PACKED, "BSG_PACKED", { - __FMT_PACKED, - 0 }}, - - {BSG_TYPE_MAX, "", {0}}, -}; - - -static const BSG_Format* find_format (BSG_Type t) { - BSG_Format * f = s_fmt; - - if (t >= BSG_TYPE_MAX) { - return NULL; - } - - // WARNING: this depends on the enum and s_fmt[] array being in sync! make - // sure to run the static_selfcheck() to make sure - f = s_fmt + (t - BSG_TYPE_FIRST); - - return f; -} - -// -// a consistency-checking routine which can be run at compile time -// (ie. immediately after compilation) -// -// tasks: -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] -// -// conditions: -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first -// Type has value 0, not 1 -// -// FIXME: should have a function be passed in here which is called if the test -// fails. Then the caller can decide what to do: abort, notify, whatever -// -BOOL BSG_static_selfcheck () -{ - int i; - - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); - bsglog ("failure at %i, allegedly %s\n", - i, s_fmt[i - BSG_TYPE_FIRST].name); - abort(); - return FALSE; - } - } - - bsglog ("%s\n", "BSG: static_selfcheck success!"); - return TRUE; -} - - -/** - * Flatten a TCPA structure into a buffer in big-endian format - * @type: TCPA structure type - * @src: (IN) TCPA structure (OUT) end of TCPA structure - * @dst: (OUT) flattened data - * Returns: Flattened size or -1 for unknown types - */ -// make it so that it can just run through the whole process and return -// the packed size, without packing anything. this will be done if dst is NULL. -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) -{ - // check incoming parameters - if (*src == NULL) - return 0; - - const BSG_BYTE* s = *src; - BSG_BYTE* d = dst; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 - { - BSG_UINT32 val = 0; - switch (size) { - case 1: val = * (BYTE*) s; break; - case 2: val = * (unsigned short*) s; break; - case 4: val = * (BSG_UINT32*) s; break; - } - if (dst) - BSG_PackConst(val, size, d); - - s += size; - d += size; - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when - // this is used. - - if (dst) { - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); - memcpy(d, s, size); - } - - s += size; - d += size; - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles - - BSG_UINT32 psize = 0; - switch (size) { - case 1: psize = * (BYTE*) s; break; - case 2: psize = * (unsigned short*) s; break; - case 4: psize = * (BSG_UINT32*) s; break; - } - - if (dst) - BSG_PackConst(psize, size, d); - - s += size; - d += size; - - // now 's' points to an address, so cast it to BSG_BYTE** - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); - s += sizeof(BSG_BYTE*); - - if (format == __FMT_HSIZE) {// This is a list of psize Handles - if (dst) { - BSG_HANDLE* d2 = (BSG_HANDLE*) d; - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; - BSG_UINT32 i; - for (i = 0; i < psize; i++) - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); - - } - d += psize * sizeof(BSG_HANDLE); - } else {// If it's not psize handles, it's psize data. - if (psize > 0) { - if (dst) { - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", - psize, pdata, d); - memcpy(d, pdata, psize); - } - } - d += psize; - } - } else if (format == __FMT_PACKED) { - // the source buffer is a pack_constbuf_t, which has a size and a - // pointer. just copy the buffer value, the size is not included in the - // output stream. - pack_constbuf_t * buf = (pack_constbuf_t*) s; - - if (dst) { - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", - buf->size, buf->data, d); - memcpy(d, buf->data, buf->size); - } - - s += buf->size; - d += buf->size; - } else if (format == 0) {// No flags are set. This is a structure & it should - // be looked up in the bsg_s_fmt[] - - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); - return -1; - } - - if (dst) - bsglog ("BSG_Pack type %s\n", x->name); - - - // iterate through the fields - const BSG_UINT32* f = x->fields; - for (; *f; f++) { - int fsize; - - g_log_recursion_level++; - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); - g_log_recursion_level--; - - if (fsize <= 0) - return fsize; - - d += fsize; - } - } else { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); - return -1; - } - - *src = s; - return (d - dst); -} - -/** - * Unflatten a TCPA structure from a buffer in big-endian format - * @type: TCPA structure type - * @src: flattened data - * @dst: (IN) TCPA structure (OUT) end of TCPA structure - * Returns: Flattened size - * Note: Returns flattened size NOT the unpacked structure size - */ -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { - // check incoming parameters - if (src == NULL) - return 0; - - - const BSG_BYTE* s = src; - BSG_BYTE* d = dst ? *dst:NULL; - if (dst && !d) - dst = NULL; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 - - BSG_UINT32 val = BSG_UnpackConst(s, size); - - if (dst) { - switch (size) { - case 1: *(BYTE *) d = (BSG_BYTE) val; break; - case 2: *(unsigned short*) d = (unsigned short) val; break; - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; - } - } - - s += size; - d += size; - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. - if (dst) - memcpy(d, s, size); - - d += size; - s += size; - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles - - BSG_UINT32 psize = BSG_UnpackConst(s, size); - - if (psize > BSG_MAX_BUF_SIZE) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", - BSG_MAX_BUF_SIZE); - return -1; - } - - if (dst) { - switch (size) { - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; - case 2: *(unsigned short*) d = (unsigned short) psize; break; - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; - } - } - - s += size; - d += size; - - BSG_BYTE* pdata = NULL; - - if (psize) { - if (format == __FMT_HSIZE) { // This is a list of psize Handles - if (dst) { - BSG_HANDLE* s2 = (BSG_HANDLE*) s; - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); - if (!pdata) - return -1; - - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; - BSG_UINT32 i; - for (i = 0; i < psize; i++) { - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); - } - } - s += psize * sizeof(BSG_HANDLE); - } else { // If it's not psize handles, it's psize data. - if (dst) { - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); - if (!pdata) - return -1; - memcpy(pdata, s, psize); - } - s += psize; - } - } - if (dst) - *(void**) d = pdata; - - d += sizeof(void*); - } else if (format == __FMT_PACKED) { - - // this doesn't make sense for unpacking! - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " - "This does not make sense\n"); - - return -1; - } else if (format == 0) {// No flags are set. This is a structure & it should - // be looked up in the bsg_s_fmt[] - - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); - return -1; - } - - const BSG_UINT32* f = x->fields; - for (; *f; f++) { - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); - if (fsize <= 0) - return fsize; - s += fsize; - } - } - - if (dst) - *dst = d; - return (s - src); -} - -/** - * Free memory associated with unpacked TCPA structure - * @type: TCPA structure type - * @src: (IN) TCPA structure (OUT) end of TCPA structure - * Note: Destroy should be called on all structures created with Unpack - * to ensure that any allocated memory is freed - */ -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { - BSG_BYTE* s = *src; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if ((src == NULL) || (*src == NULL)) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); - return; - } - - if (format == __FMT_CONST || format == __FMT_DATA) - s += size; - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { - s += size; - BSG_BYTE* ptr = *(BSG_BYTE**) s; - free(ptr); - s += sizeof(void*); - } else if (format == __FMT_PACKED) { - - // this doesn't make sense for unpacking, hence also for Destroy() - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " - "This does not make sense\n"); - - return; - } else if (format == 0) { - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); - return; - } - - const BSG_UINT32* f = x->fields; - for (; *f; f++) - BSG_Destroy_private((BSG_Type) *f, &s); - } - - *src = s; -} - -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) -{ - const BSG_BYTE* src2 = (const BSG_BYTE*) src; - return BSG_Pack_private(type, &src2, dst); -} - -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) -{ - BSG_BYTE* dst2 = (BSG_BYTE*) dst; - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); -} - -void BSG_Destroy(BSG_Type type, void* src) -{ - BSG_BYTE* src2 = (BSG_BYTE*) src; - BSG_Destroy_private(type, &src2); -} - -/** - * Pack a 8/16/32-bit constant into a buffer in big-endian format - * @val: constant value - * @size: constant size in bytes (1, 2, or 4) - * @dst: (OUT) buffer - */ -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); - - switch (size) { - case 4: - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); - dst[3] = (BSG_BYTE)(val & 0xff); - break; - case 2: - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); - dst[1] = (BSG_BYTE)(val & 0xff); - break; - case 1: - dst[0] = (BSG_BYTE)(val & 0xff); - break; - } -} - -/** - * Unpack a 8/16/32-bit constant from a buffer in big-endian format - * @src: buffer - * @size: constant size in bytes (1, 2, or 4) - */ -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { - BSG_UINT32 val = 0; - - if (src == NULL) - return 0; - - switch (size) { - case 4: - val = (((BSG_UINT32) src[0]) << 24 - | ((BSG_UINT32) src[1]) << 16 - | ((BSG_UINT32) src[2]) << 8 - | (BSG_UINT32) src[3]); - break; - case 2: - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); - break; - case 1: - val = (BSG_UINT32) src[0]; - break; - } - return val; -} - -// Pack a list of parameters. Beware not to send values, but rather you must -// send a pointer to your values Instead. This includes UINT32's. -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { - int ParamNumber; - BSG_Type format; - BSG_BYTE* val = NULL; - int size=0; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - //Strangeness with int is because gcc wanted an int rather than a enum of ints. - format = (BSG_Type) va_arg( paramList, int ); - val = va_arg( paramList, BSG_BYTE* ); - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); - } - - va_end (paramList); - - return size; -} - -// Unpack a list of parameters. -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { - int ParamNumber = 0; - BSG_Type format; - BSG_BYTE* val = NULL; - int size = 0; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - format = (BSG_Type) va_arg( paramList, int ); - val = va_arg( paramList, BSG_BYTE* ); - - size += BSG_Unpack(format, src + size, val); - } - - va_end( paramList ); - - return size; -} - -// Destroy any memory allocated by calls to unpack -void BSG_DestroyList(int ParamCount, ... ) { - int ParamNumber = 0; - BSG_Type argType; - BSG_BYTE* paramValue = NULL; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - argType = (BSG_Type) va_arg( paramList, int ); - paramValue = va_arg( paramList, BSG_BYTE* ); - - BSG_Destroy(argType, paramValue); - } - - va_end( paramList ); - - return; -} - - -// and a tuple version -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { - int i; - - for (i = 0; i < numParams; i++) - BSG_Destroy (params[i].type, params[i].addr); - - return TPM_SUCCESS; -} - - -// -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed -// by the caller later -// - -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { - int size = BSG_Pack (type, src, NULL); - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); - if (dest == NULL) - return -1; - - size = BSG_Pack(type, src, dest); - *o_dst = dest; - return size; -} - - - -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { - va_list args; - int size; - - va_start (args, ParamCount); - size = BSG_PackList (NULL, ParamCount, args); - va_end (args); - - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); - if (dest == NULL) - return -1; - - va_start (args, ParamCount); - size = BSG_PackList (dest, ParamCount, args); - va_end (args); - - *outBuffer = dest; - return size; -} diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h deleted file mode 100644 index 0896812..0000000 --- a/tools/vtpm_manager/util/bsg.h +++ /dev/null @@ -1,166 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// bsg.h -// -// This file contains API's for the TPM Byte Stream functions -// -// ================================================================== - -#ifndef __BSG_H__ -#define __BSG_H__ - -#include -#include "buffer.h" - -typedef unsigned int BSG_UINT32; -typedef unsigned char BSG_BYTE; - -// forward decl -struct pack_const_tuple_t; - -struct pack_tuple_t; - - -/** - * Byte stream generator - */ -// this has to be manually kept in sync with the -// s_fmt array!! -// but now we have a self-check function which can make sure things are well -// (if used!) -typedef enum BSG_Type -{ - BSG_TYPE_FIRST = 1, - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an - // unused/special value - BSG_TYPE_UINT16, - BSG_TYPE_BYTE, - BSG_TYPE_BOOL, - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by - // a pointer to that much data. can pass a - // struct pack_buf_t as the param - BSG_TPM_TAG, - BSG_TPM_HANDLE, - BSG_TPM_RESULT, - BSG_TPM_RESOURCE_TYPE, - BSG_TPM_COMMAND_CODE, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_ALGORITHM_ID, - BSG_TPM_PROTOCOL_ID, - BSG_TPM_KEY_USAGE, - BSG_TPM_ENC_SCHEME, - BSG_TPM_SIG_SCHEME, - BSG_TPM_MIGRATE_SCHEME, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTHDATA, - BSG_TPM_SECRET, - BSG_TPM_ENCAUTH, - BSG_TPM_PAYLOAD_TYPE, - - BSG_TPM_VERSION, - BSG_TPM_DIGEST, - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_CHOSENID_HASH, - BSG_TPM_NONCE, - BSG_TPM_KEY_HANDLE, - BSG_TPM_KEY_HANDLE_LIST, - BSG_TPM_KEY_PARMS, - BSG_TPM_RSA_KEY_PARMS, - BSG_TPM_STORE_PUBKEY, - BSG_TPM_PUBKEY, - BSG_TPM_KEY, - - BSG_TPM_MIGRATIONKEYAUTH, - BSG_TCPA_AUDIT_EVENT, - BSG_TCPA_EVENT_CERT, - BSG_TPM_PCR_SELECTION, - BSG_TPM_PCR_COMPOSITE, - BSG_TPM_PCR_INFO, - BSG_TPM_STORED_DATA, - BSG_TPM_SYMMETRIC_KEY, - BSG_TPM_STORE_PRIVKEY, - BSG_TPM_STORE_ASYMKEY, - BSG_TPM_MIGRATE_ASYMKEY, - BSG_TPM_QUOTE_INFO, - BSG_TPM_IDENTITY_CONTENTS, - BSG_TPM_PCRVALUE, - BSG_TCPA_PCR_FLAGS, - BSG_TCS_AUTH, - - // this is the BSG_TPM_KEY struct without the encData field - BSG_TPM_KEY_NONSENSITIVE, - - BSG_PACKED, - - BSG_TYPE_MAX -} BSG_Type; - -struct pack_const_tuple_t { - BSG_Type type; - const void * addr; -}; - - -typedef struct pack_tuple_t { - BSG_Type type; - void * addr; -} pack_tuple_t; - -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); -void BSG_Destroy(BSG_Type type, void* src); - -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed -// by the caller later. returns size of allocated buffer, or -1 in case -// allocation failed -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); - -// a va_list version of PackList -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); -void BSG_DestroyList(int ParamCount, ... ); - -// wrapper of PackList which uses a buffer_t -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); - -// and a tuple version -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); - -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); - -BOOL BSG_static_selfcheck (); - -#endif diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c deleted file mode 100644 index df48bc2..0000000 --- a/tools/vtpm_manager/util/buffer.c +++ /dev/null @@ -1,226 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - - -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "buffer.h" - -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); - -// -// buffer functions! -// - -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { - if (initsize == 0) { - memset(buf, 0, sizeof(*buf)); - return TPM_SUCCESS; - } - - - buf->bytes = (BYTE*) malloc (initsize); - if (buf->bytes == NULL) - return TPM_RESOURCES; - - buf->size = initsize; - buf->alloc_size = initsize; - - if (initval) - memcpy (buf->bytes, initval, initsize); - - buf->is_owner = TRUE; - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { - - buf->size = initsize; - buf->alloc_size = initsize; - buf->bytes = initval; - - buf->is_owner = TRUE; - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); - buf->is_owner = TRUE; - - return status; -} - - - -// make an alias to a constant array -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { - // TODO: try to enforce the const things somehow! - buf->bytes = (BYTE*) val; - buf->size = size; - buf->alloc_size = 0; // this field is now unneeded - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - -// make an alias into buf, with given offset and length -// if len = 0, make the alias go to the end of buf -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, - tpm_size_t offset, tpm_size_t len) { - if (offset + len > b->size) { - return TPM_NOSPACE; - } - - buf->bytes = b->bytes + offset; - buf->size = len > 0 ? len : b->size - offset; - - //VS/ buf->alloc_size = 0; - if (len ==0) - buf->alloc_size = b->alloc_size - offset; - else - buf->alloc_size = MIN(b->alloc_size - offset, len); - - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - -// make an alias buffer_t into bytestream, with given length -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { - - buf->size = size; - buf->alloc_size = size; - buf->bytes = val; - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - - - -// copy into the start of dest -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) -{ - TPM_RESULT status = TPM_SUCCESS; - - if (dest->alloc_size < src->size) { - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); - } - - memcpy (dest->bytes, src->bytes, src->size); - dest->size = src->size; - - //VS/ dest->is_owner = TRUE; - - abort_egress: - - return status; -} - - - -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); -} - - -void buffer_memset (buffer_t * buf, BYTE b) { - memset (buf->bytes, b, buf->size); -} - - -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { - TPM_RESULT status = TPM_SUCCESS; - - if (buf->alloc_size < buf->size + len) { - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); - } - - memcpy (buf->bytes + buf->size, bytes, len); - - buf->size += len; - - goto egress; - - abort_egress: - - egress: - - return status; -} - -tpm_size_t buffer_len (const buffer_t* buf) { - return buf->size; -} - -TPM_RESULT buffer_free (buffer_t * buf) { - if (buf && buf->is_owner && buf->bytes != NULL) { - free (buf->bytes); - buf->bytes = NULL; - buf->size = buf->alloc_size = 0; - - } - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { - - // we want to realloc to twice the size, or the new size, whichever - // bigger - - BYTE * tmpbuf = NULL; - - newsize = MAX (buf->alloc_size * 2, newsize); - - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); - if (tmpbuf == NULL) - return TPM_SIZE; - - - buf->bytes = tmpbuf; - buf->alloc_size = newsize; - - return TPM_SUCCESS; -} diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h deleted file mode 100644 index d8a9abc..0000000 --- a/tools/vtpm_manager/util/buffer.h +++ /dev/null @@ -1,95 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#ifndef __VTPM_BUFFER_H__ -#define __VTPM_BUFFER_H__ - -#include // for pointer NULL -#include "tcg.h" - -typedef UINT32 tpm_size_t; - -// first version, probably will be expanded... - -#define NULL_BUF {0,0,0,0} - -typedef struct { - // private!! - tpm_size_t size, alloc_size; - BYTE * bytes; - - BOOL is_owner; // do we own this buffer, and need to free it? -} buffer_t; - -// allocate the buffer if initsize > 0, copying over initval if provided -TPM_RESULT buffer_init (buffer_t * buf, - tpm_size_t initsize, - const BYTE* initval); - -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * -TPM_RESULT buffer_init_convert (buffer_t * buf, - tpm_size_t initsize, - BYTE* initval); - -// make an alias to a constant array, no copying -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); - -// make an alias into buf, with given offset and length -// if len = 0, make the alias go to the end of buf -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, - tpm_size_t offset, tpm_size_t); - -// make an alias buffer into a bytestream -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, - tpm_size_t size, BYTE* val); - -// "copy constructor" -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); - - -// copy into the start of a -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); - -// are they equal? -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); - -// set the buffer to a constant byte -void buffer_memset (buffer_t * buf, BYTE b); - -tpm_size_t buffer_len (const buffer_t* buf); - -TPM_RESULT buffer_free (buffer_t * buf); - -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); - -#endif // _TOOLS_H_ diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c deleted file mode 100644 index aff0e2b..0000000 --- a/tools/vtpm_manager/util/hashtable.c +++ /dev/null @@ -1,316 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable.c - * - tools/blktap2/drivers/hashtable.c - */ - -#include "hashtable.h" -#include "hashtable_private.h" -#include -#include -#include -#include - -/* -Credit for primes table: Aaron Krowne - http://br.endernet.org/~akrowne/ - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html -*/ -static const unsigned int primes[] = { -53, 97, 193, 389, -769, 1543, 3079, 6151, -12289, 24593, 49157, 98317, -196613, 393241, 786433, 1572869, -3145739, 6291469, 12582917, 25165843, -50331653, 100663319, 201326611, 402653189, -805306457, 1610612741 -}; -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); -const float max_load_factor = 0.65; - -/*****************************************************************************/ -struct hashtable * -create_hashtable(unsigned int minsize, - unsigned int (*hashf) (void*), - int (*eqf) (void*,void*)) -{ - struct hashtable *h; - unsigned int pindex, size = primes[0]; - /* Check requested hashtable isn't too large */ - if (minsize > (1u << 30)) return NULL; - /* Enforce size as prime */ - for (pindex=0; pindex < prime_table_length; pindex++) { - if (primes[pindex] > minsize) { size = primes[pindex]; break; } - } - h = (struct hashtable *)malloc(sizeof(struct hashtable)); - if (NULL == h) return NULL; /*oom*/ - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); - if (NULL == h->table) { free(h); return NULL; } /*oom*/ - memset(h->table, 0, size * sizeof(struct entry *)); - h->tablelength = size; - h->primeindex = pindex; - h->entrycount = 0; - h->hashfn = hashf; - h->eqfn = eqf; - h->loadlimit = (unsigned int) ceil(size * max_load_factor); -#ifdef HASHTABLE_THREADED - pthread_mutex_init(&h->mutex, NULL); -#endif - return h; -} - -/*****************************************************************************/ -unsigned int -hash(struct hashtable *h, void *k) -{ - unsigned int i = h->hashfn(k); - i += ~(i << 9); - i ^= ((i >> 14) | (i << 18)); /* >>> */ - i += (i << 4); - i ^= ((i >> 10) | (i << 22)); /* >>> */ - return i; -} - -/*****************************************************************************/ -static int -hashtable_expand(struct hashtable *h) -{ - /* Double the size of the table to accomodate more entries */ - struct entry **newtable; - struct entry *e; - struct entry **pE; - unsigned int newsize, i, index; - /* Check we're not hitting max capacity */ - if (h->primeindex == (prime_table_length - 1)) return 0; - newsize = primes[++(h->primeindex)]; - - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); - if (NULL != newtable) - { - memset(newtable, 0, newsize * sizeof(struct entry *)); - /* This algorithm is not 'stable'. ie. it reverses the list - * when it transfers entries between the tables */ - for (i = 0; i < h->tablelength; i++) { - while (NULL != (e = h->table[i])) { - h->table[i] = e->next; - index = indexFor(newsize,e->h); - e->next = newtable[index]; - newtable[index] = e; - } - } - free(h->table); - h->table = newtable; - } - /* Plan B: realloc instead */ - else - { - newtable = (struct entry **) - realloc(h->table, newsize * sizeof(struct entry *)); - if (NULL == newtable) { (h->primeindex)--; return 0; } - h->table = newtable; - memset(newtable[h->tablelength], 0, newsize - h->tablelength); - for (i = 0; i < h->tablelength; i++) { - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { - index = indexFor(newsize,e->h); - if (index == i) - { - pE = &(e->next); - } - else - { - *pE = e->next; - e->next = newtable[index]; - newtable[index] = e; - } - } - } - } - h->tablelength = newsize; - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); - return -1; -} - -/*****************************************************************************/ -unsigned int -hashtable_count(struct hashtable *h) -{ - unsigned int count; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - count = h->entrycount; -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return count; -} - -/*****************************************************************************/ -int -hashtable_insert(struct hashtable *h, void *k, void *v) -{ - /* This method allows duplicate keys - but they shouldn't be used */ - unsigned int index; - struct entry *e; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - if (++(h->entrycount) > h->loadlimit) - { - /* Ignore the return value. If expand fails, we should - * still try cramming just this value into the existing table - * -- we may not have memory for a larger table, but one more - * element may be ok. Next time we insert, we'll try expanding again.*/ - hashtable_expand(h); - } - e = (struct entry *)malloc(sizeof(struct entry)); - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ - e->h = hash(h,k); - index = indexFor(h->tablelength,e->h); - e->k = k; - e->v = v; - e->next = h->table[index]; - h->table[index] = e; -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return -1; -} - -/*****************************************************************************/ -void * /* returns value associated with key */ -hashtable_search(struct hashtable *h, void *k) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e; - unsigned int hashvalue, index; - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); - e = h->table[index]; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return e->v; - } - e = e->next; - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return NULL; -} - -/*****************************************************************************/ -void * /* returns value associated with key */ -hashtable_remove(struct hashtable *h, void *k) -{ - /* TODO: consider compacting the table when the load factor drops enough, - * or provide a 'compact' method. */ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e; - struct entry **pE; - void *v; - unsigned int hashvalue, index; - - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hash(h,k)); - pE = &(h->table[index]); - e = *pE; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) - { - *pE = e->next; - h->entrycount--; - v = e->v; - freekey(e->k); - free(e); - return v; - } - pE = &(e->next); - e = e->next; - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return NULL; -} - -/*****************************************************************************/ -/* destroy */ -void -hashtable_destroy(struct hashtable *h, int free_values) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - unsigned int i; - struct entry *e, *f; - struct entry **table = h->table; - if (free_values) - { - for (i = 0; i < h->tablelength; i++) - { - e = table[i]; - while (NULL != e) - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } - } - } - else - { - for (i = 0; i < h->tablelength; i++) - { - e = table[i]; - while (NULL != e) - { f = e; e = e->next; freekey(f->k); free(f); } - } - } - free(h->table); -#ifdef HASHTABLE_THREADED - pthread_mutex_destroy(&h->mutex); -#endif - free(h); -} diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h deleted file mode 100644 index dedc60a..0000000 --- a/tools/vtpm_manager/util/hashtable.h +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable.h - * - tools/blktap2/drivers/hashtable.h - */ - -#ifndef __HASHTABLE_CWC22_H__ -#define __HASHTABLE_CWC22_H__ - -struct hashtable; - -/* Example of use: - * - * struct hashtable *h; - * struct some_key *k; - * struct some_value *v; - * - * static unsigned int hash_from_key_fn( void *k ); - * static int keys_equal_fn ( void *key1, void *key2 ); - * - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); - * k = (struct some_key *) malloc(sizeof(struct some_key)); - * v = (struct some_value *) malloc(sizeof(struct some_value)); - * - * (initialise k and v to suitable values) - * - * if (! hashtable_insert(h,k,v) ) - * { exit(-1); } - * - * if (NULL == (found = hashtable_search(h,k) )) - * { printf("not found!"); } - * - * if (NULL == (found = hashtable_remove(h,k) )) - * { printf("Not found\n"); } - * - */ - -/* Macros may be used to define type-safe(r) hashtable access functions, with - * methods specialized to take known key and value types as parameters. - * - * Example: - * - * Insert this at the start of your file: - * - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); - * - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. - * These operate just like hashtable_insert etc., with the same parameters, - * but their function signatures have 'struct some_key *' rather than - * 'void *', and hence can generate compile time errors if your program is - * supplying incorrect data as a key (and similarly for value). - * - * Note that the hash and key equality functions passed to create_hashtable - * still take 'void *' parameters instead of 'some key *'. This shouldn't be - * a difficult issue as they're only defined and passed once, and the other - * functions will ensure that only valid keys are supplied to them. - * - * The cost for this checking is increased code size and runtime overhead - * - if performance is important, it may be worth switching back to the - * unsafe methods once your program has been debugged with the safe methods. - * This just requires switching to some simple alternative defines - eg: - * #define insert_some hashtable_insert - * - */ - -/***************************************************************************** - * create_hashtable - - * @name create_hashtable - * @param minsize minimum initial size of hashtable - * @param hashfunction function for hashing keys - * @param key_eq_fn function for determining key equality - * @return newly created hashtable or NULL on failure - */ - -struct hashtable * -create_hashtable(unsigned int minsize, - unsigned int (*hashfunction) (void*), - int (*key_eq_fn) (void*,void*)); - -/***************************************************************************** - * hashtable_insert - - * @name hashtable_insert - * @param h the hashtable to insert into - * @param k the key - hashtable claims ownership and will free on removal - * @param v the value - does not claim ownership - * @return non-zero for successful insertion - * - * This function will cause the table to expand if the insertion would take - * the ratio of entries to table size over the maximum load factor. - * - * This function does not check for repeated insertions with a duplicate key. - * The value returned when using a duplicate key is undefined -- when - * the hashtable changes size, the order of retrieval of duplicate key - * entries is reversed. - * If in doubt, remove before insert. - */ - -int -hashtable_insert(struct hashtable *h, void *k, void *v); - -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ -{ \ - return hashtable_insert(h,k,v); \ -} - -/***************************************************************************** - * hashtable_search - - * @name hashtable_search - * @param h the hashtable to search - * @param k the key to search for - does not claim ownership - * @return the value associated with the key, or NULL if none found - */ - -void * -hashtable_search(struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ -valuetype * fnname (struct hashtable *h, keytype *k) \ -{ \ - return (valuetype *) (hashtable_search(h,k)); \ -} - -/***************************************************************************** - * hashtable_remove - - * @name hashtable_remove - * @param h the hashtable to remove the item from - * @param k the key to search for - does not claim ownership - * @return the value associated with the key, or NULL if none found - */ - -void * /* returns value */ -hashtable_remove(struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ -valuetype * fnname (struct hashtable *h, keytype *k) \ -{ \ - return (valuetype *) (hashtable_remove(h,k)); \ -} - - -/***************************************************************************** - * hashtable_count - - * @name hashtable_count - * @param h the hashtable - * @return the number of items stored in the hashtable - */ -unsigned int -hashtable_count(struct hashtable *h); - - -/***************************************************************************** - * hashtable_destroy - - * @name hashtable_destroy - * @param h the hashtable - * @param free_values whether to call 'free' on the remaining values - */ - -void -hashtable_destroy(struct hashtable *h, int free_values); - -#endif /* __HASHTABLE_CWC22_H__ */ diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c deleted file mode 100644 index dcf42c8..0000000 --- a/tools/vtpm_manager/util/hashtable_itr.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/blktap2/drivers/hashtable_itr.c - */ - -#include "hashtable.h" -#include "hashtable_private.h" -#include "hashtable_itr.h" -#include /* defines NULL */ - -/*****************************************************************************/ -/* hashtable_iterator - iterator constructor */ - -struct hashtable_itr * -hashtable_iterator(struct hashtable *h) -{ - unsigned int i, tablelength; - struct hashtable_itr *itr = (struct hashtable_itr *) - malloc(sizeof(struct hashtable_itr)); - if (NULL == itr) return NULL; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - itr->h = h; - itr->e = NULL; - itr->parent = NULL; - tablelength = h->tablelength; - itr->index = tablelength; - if (0 == h->entrycount) { -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return itr; - } - - for (i = 0; i < tablelength; i++) - { - if (NULL != h->table[i]) - { - itr->e = h->table[i]; - itr->index = i; - break; - } - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return itr; -} - -/*****************************************************************************/ -/* key - return the key of the (key,value) pair at the current position */ -/* value - return the value of the (key,value) pair at the current position */ - -void * -hashtable_iterator_key(struct hashtable_itr *i) -{ return i->e->k; } - -void * -hashtable_iterator_value(struct hashtable_itr *i) -{ return i->e->v; } - -/*****************************************************************************/ -/* advance - advance the iterator to the next element - * returns zero if advanced to end of table */ - -int -hashtable_iterator_advance(struct hashtable_itr *itr) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&itr->h->mutex); -#endif - unsigned int j,tablelength; - struct entry **table; - struct entry *next; - int ret; - if (NULL == itr->e) { /* stupidity check */ - ret = 0; - goto egress; - } - - next = itr->e->next; - if (NULL != next) - { - itr->parent = itr->e; - itr->e = next; - ret = -1; - goto egress; - } - - tablelength = itr->h->tablelength; - itr->parent = NULL; - if (tablelength <= (j = ++(itr->index))) - { - itr->e = NULL; - ret = 0; - goto egress; - } - table = itr->h->table; - while (NULL == (next = table[j])) - { - if (++j >= tablelength) - { - itr->index = tablelength; - itr->e = NULL; - ret = 0; - goto egress; - } - } - itr->index = j; - itr->e = next; - ret = -1; - - egress: -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&itr->h->mutex); -#endif - return ret; -} - -/*****************************************************************************/ -/* remove - remove the entry at the current iterator position - * and advance the iterator, if there is a successive - * element. - * If you want the value, read it before you remove: - * beware memory leaks if you don't. - * Returns zero if end of iteration. */ - -int -hashtable_iterator_remove(struct hashtable_itr *itr) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&itr->h->mutex); -#endif - struct entry *remember_e, *remember_parent; - int ret; - - /* Do the removal */ - if (NULL == (itr->parent)) - { - /* element is head of a chain */ - itr->h->table[itr->index] = itr->e->next; - } else { - /* element is mid-chain */ - itr->parent->next = itr->e->next; - } - /* itr->e is now outside the hashtable */ - remember_e = itr->e; - itr->h->entrycount--; - freekey(remember_e->k); - - /* Advance the iterator, correcting the parent */ - remember_parent = itr->parent; - ret = hashtable_iterator_advance(itr); - if (itr->parent == remember_e) { itr->parent = remember_parent; } - free(remember_e); -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&itr->h->mutex); -#endif - return ret; -} - -/*****************************************************************************/ -int /* returns zero if not found */ -hashtable_iterator_search(struct hashtable_itr *itr, - struct hashtable *h, void *k) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e, *parent; - unsigned int hashvalue, index; - int ret; - - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); - - e = h->table[index]; - parent = NULL; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) - { - itr->index = index; - itr->e = e; - itr->parent = parent; - itr->h = h; - ret= -1; - goto egress; - } - parent = e; - e = e->next; - } - ret = 0; - -egress: -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return ret; -} diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h deleted file mode 100644 index 35654e0..0000000 --- a/tools/vtpm_manager/util/hashtable_itr.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/blktap2/drivers/hashtable_itr.h - */ - - -#ifndef __HASHTABLE_ITR_CWC22__ -#define __HASHTABLE_ITR_CWC22__ -#include "hashtable.h" -#include "hashtable_private.h" /* needed to enable inlining */ - -/*****************************************************************************/ -/* This struct is only concrete here to allow the inlining of two of the - * accessor functions. */ -struct hashtable_itr -{ - struct hashtable *h; - struct entry *e; - struct entry *parent; - unsigned int index; -}; - - -/*****************************************************************************/ -/* hashtable_iterator - */ - -struct hashtable_itr * -hashtable_iterator(struct hashtable *h); - -/*****************************************************************************/ -/* hashtable_iterator_key - * - return the value of the (key,value) pair at the current position */ - -void *hashtable_iterator_key(struct hashtable_itr *i); - -/*****************************************************************************/ -/* value - return the value of the (key,value) pair at the current position */ - -void *hashtable_iterator_value(struct hashtable_itr *i); - -/*****************************************************************************/ -/* advance - advance the iterator to the next element - * returns zero if advanced to end of table */ - -int -hashtable_iterator_advance(struct hashtable_itr *itr); - -/*****************************************************************************/ -/* remove - remove current element and advance the iterator to the next element - * NB: if you need the value to free it, read it before - * removing. ie: beware memory leaks! - * returns zero if advanced to end of table */ - -int -hashtable_iterator_remove(struct hashtable_itr *itr); - -/*****************************************************************************/ -/* search - overwrite the supplied iterator, to point to the entry - * matching the supplied key. - h points to the hashtable to be searched. - * returns zero if not found. */ -int -hashtable_iterator_search(struct hashtable_itr *itr, - struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ -{ \ - return (hashtable_iterator_search(i,h,k)); \ -} - - - -#endif /* __HASHTABLE_ITR_CWC22__*/ diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h deleted file mode 100644 index d87a7f9..0000000 --- a/tools/vtpm_manager/util/hashtable_private.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable_private.h - * - tools/blktap2/drivers/hashtable_private.h - */ - -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ -#define __HASHTABLE_PRIVATE_CWC22_H__ - -#include "hashtable.h" -#ifdef HASHTABLE_THREADED -#include -#endif - -/*****************************************************************************/ -struct entry -{ - void *k, *v; - unsigned int h; - struct entry *next; -}; - -struct hashtable { - unsigned int tablelength; - struct entry **table; - unsigned int entrycount; - unsigned int loadlimit; - unsigned int primeindex; - unsigned int (*hashfn) (void *k); - int (*eqfn) (void *k1, void *k2); -#ifdef HASHTABLE_THREADED - pthread_mutex_t mutex; -#endif -}; - -/*****************************************************************************/ -unsigned int -hash(struct hashtable *h, void *k); - -/*****************************************************************************/ -/* indexFor */ -static inline unsigned int -indexFor(unsigned int tablelength, unsigned int hashvalue) { - return (hashvalue % tablelength); -}; - -/* Only works if tablelength == 2^N */ -/*static inline unsigned int -indexFor(unsigned int tablelength, unsigned int hashvalue) -{ - return (hashvalue & (tablelength - 1u)); -} -*/ - -/*****************************************************************************/ -#define freekey(X) free(X) -/*define freekey(X) ; */ - - -/*****************************************************************************/ - -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c deleted file mode 100644 index 75fe91a..0000000 --- a/tools/vtpm_manager/util/log.c +++ /dev/null @@ -1,142 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include - -#include "buffer.h" -#include "tcg.h" - -// Helper code for the consts, eg. to produce messages for error codes. - -typedef struct error_code_entry_t { - TPM_RESULT code; - char * code_name; - char * msg; -} error_code_entry_t; - -static const error_code_entry_t error_msgs [] = { - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, - - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, -}; - - -// helper function for the error codes: -const char* tpm_get_error_name (TPM_RESULT code) { - // just do a linear scan for now - unsigned i; - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) - if (code == error_msgs[i].code) - return error_msgs[i].code_name; - - return("Unknown Error Code"); -} diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h deleted file mode 100644 index 1f15f5b..0000000 --- a/tools/vtpm_manager/util/log.h +++ /dev/null @@ -1,94 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#ifndef __VTPM_LOG_H__ -#define __VTPM_LOG_H__ - -#include // for uint32_t -#include // for pointer NULL - -// =========================== LOGGING ============================== - -// the logging module numbers -#define VTPM_LOG_CRYPTO 1 -#define VTPM_LOG_BSG 2 -#define VTPM_LOG_TXDATA 3 -#define VTPM_LOG_TCS 4 -#define VTPM_LOG_TCS_DEEP 5 -#define VTPM_LOG_VTSP 6 -#define VTPM_LOG_VTPM 7 -#define VTPM_LOG_VTPM_DEEP 8 -#define VTPM_LOG_VTSP_DEEP 9 - -static char *module_names[] = { "", - "CRYPTO", - "BSG", - "TXDATA", - "TCS", - "TCS", - "VTSP", - "VTPM", - "VTPM", - "VTSP" - }; - -// Default to standard logging -#ifndef LOGGING_MODULES -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) -#endif - -// bit-access macros -#define BITMASK(idx) ( 1U << (idx) ) -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) -#define SETBIT(num,idx) (num) |= BITMASK(idx) -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) - -#define vtpmloginfo(module, fmt, args...) \ - if (GETBIT (LOGGING_MODULES, module) == 1) { \ - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ - } - -#define vtpmloginfomore(module, fmt, args...) \ - if (GETBIT (LOGGING_MODULES, module) == 1) { \ - fprintf (stdout, fmt,##args); \ - } - -#define vtpmlogerror(module, fmt, args...) \ - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); - -//typedef UINT32 tpm_size_t; - -// helper function for the error codes: -const char* tpm_get_error_name (TPM_RESULT code); - -#endif // _VTPM_LOG_H_ diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h deleted file mode 100644 index 5c42913..0000000 --- a/tools/vtpm_manager/util/tcg.h +++ /dev/null @@ -1,503 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcg.h -// -// This file contains all the structure and type definitions -// -// ================================================================== - -#ifndef __TCG_H__ -#define __TCG_H__ - -// This pragma is used to disallow structure padding -#pragma pack(push, 1) - -// *************************** TYPEDEFS ********************************* -typedef unsigned char BYTE; -typedef unsigned char BOOL; -typedef unsigned short UINT16; -typedef unsigned int UINT32; -typedef unsigned long long UINT64; - -typedef UINT32 TPM_RESULT; -typedef UINT32 TPM_PCRINDEX; -typedef UINT32 TPM_DIRINDEX; -typedef UINT32 TPM_HANDLE; -typedef TPM_HANDLE TPM_AUTHHANDLE; -typedef TPM_HANDLE TCPA_HASHHANDLE; -typedef TPM_HANDLE TCPA_HMACHANDLE; -typedef TPM_HANDLE TCPA_ENCHANDLE; -typedef TPM_HANDLE TPM_KEY_HANDLE; -typedef TPM_HANDLE TCPA_ENTITYHANDLE; -typedef UINT32 TPM_RESOURCE_TYPE; -typedef UINT32 TPM_COMMAND_CODE; -typedef UINT16 TPM_PROTOCOL_ID; -typedef BYTE TPM_AUTH_DATA_USAGE; -typedef UINT16 TPM_ENTITY_TYPE; -typedef UINT32 TPM_ALGORITHM_ID; -typedef UINT16 TPM_KEY_USAGE; -typedef UINT16 TPM_STARTUP_TYPE; -typedef UINT32 TPM_CAPABILITY_AREA; -typedef UINT16 TPM_ENC_SCHEME; -typedef UINT16 TPM_SIG_SCHEME; -typedef UINT16 TPM_MIGRATE_SCHEME; -typedef UINT16 TPM_PHYSICAL_PRESENCE; -typedef UINT32 TPM_KEY_FLAGS; - -#define TPM_DIGEST_SIZE 20 // Don't change this -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; -typedef TPM_AUTHDATA TPM_SECRET; -typedef TPM_AUTHDATA TPM_ENCAUTH; -typedef BYTE TPM_PAYLOAD_TYPE; -typedef UINT16 TPM_TAG; - -// Data Types of the TCS -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle - -// ************************* STRUCTURES ********************************** - -typedef struct TPM_VERSION { - BYTE major; - BYTE minor; - BYTE revMajor; - BYTE revMinor; -} TPM_VERSION; - -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; - -typedef struct TPM_DIGEST { - BYTE digest[TPM_DIGEST_SIZE]; -} TPM_DIGEST; - -typedef TPM_DIGEST TPM_PCRVALUE; -typedef TPM_DIGEST TPM_COMPOSITE_HASH; -typedef TPM_DIGEST TPM_DIRVALUE; -typedef TPM_DIGEST TPM_HMAC; -typedef TPM_DIGEST TPM_CHOSENID_HASH; - -typedef struct TPM_NONCE { - BYTE nonce[TPM_DIGEST_SIZE]; -} TPM_NONCE; - -typedef struct TPM_KEY_PARMS { - TPM_ALGORITHM_ID algorithmID; - TPM_ENC_SCHEME encScheme; - TPM_SIG_SCHEME sigScheme; - UINT32 parmSize; - BYTE* parms; -} TPM_KEY_PARMS; - -typedef struct TPM_RSA_KEY_PARMS { - UINT32 keyLength; - UINT32 numPrimes; - UINT32 exponentSize; - BYTE* exponent; -} TPM_RSA_KEY_PARMS; - -typedef struct TPM_STORE_PUBKEY { - UINT32 keyLength; - BYTE* key; -} TPM_STORE_PUBKEY; - -typedef struct TPM_PUBKEY { - TPM_KEY_PARMS algorithmParms; - TPM_STORE_PUBKEY pubKey; -} TPM_PUBKEY; - -typedef struct TPM_KEY { - TPM_VERSION ver; - TPM_KEY_USAGE keyUsage; - TPM_KEY_FLAGS keyFlags; - TPM_AUTH_DATA_USAGE authDataUsage; - TPM_KEY_PARMS algorithmParms; - UINT32 PCRInfoSize; - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL - TPM_STORE_PUBKEY pubKey; - UINT32 encDataSize; - BYTE* encData; -} TPM_KEY; - -typedef struct TPM_PCR_SELECTION { - UINT16 sizeOfSelect; /// in bytes - BYTE* pcrSelect; -} TPM_PCR_SELECTION; - -typedef struct TPM_PCR_COMPOSITE { - TPM_PCR_SELECTION select; - UINT32 valueSize; - TPM_PCRVALUE* pcrValue; -} TPM_PCR_COMPOSITE; - - -typedef struct TPM_PCR_INFO { - TPM_PCR_SELECTION pcrSelection; - TPM_COMPOSITE_HASH digestAtRelease; - TPM_COMPOSITE_HASH digestAtCreation; -} TPM_PCR_INFO; - - -typedef struct TPM_BOUND_DATA { - TPM_VERSION ver; - TPM_PAYLOAD_TYPE payload; - BYTE* payloadData; -} TPM_BOUND_DATA; - -typedef struct TPM_STORED_DATA { - TPM_VERSION ver; - UINT32 sealInfoSize; - BYTE* sealInfo; - UINT32 encDataSize; - BYTE* encData; -} TPM_STORED_DATA; - -typedef struct TCS_AUTH { - TCS_AUTHHANDLE AuthHandle; - TPM_NONCE NonceOdd; // system - TPM_NONCE NonceEven; // TPM - BOOL fContinueAuthSession; - TPM_AUTHDATA HMAC; -} TCS_AUTH; - -// structures for dealing with sizes followed by buffers in all the -// TCG structure. -typedef struct pack_buf_t { - UINT32 size; - BYTE * data; -} pack_buf_t; - -typedef struct pack_constbuf_t { - UINT32 size; - const BYTE* data; -} pack_constbuf_t; - - - -// **************************** CONSTANTS ********************************* - -// BOOL values -#define TRUE 0x01 -#define FALSE 0x00 - -#define TCPA_MAX_BUFFER_LENGTH 0x2000 - -// -// TPM_COMMAND_CODE values -#define TPM_PROTECTED_ORDINAL 0x00000000UL -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL -#define TPM_CONNECTION_ORDINAL 0x40000000UL -#define TPM_VENDOR_ORDINAL 0x20000000UL - -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) - - - -// -// TPM_RESULT values -// -// just put in the whole table from spec 1.2 - -#define TPM_BASE 0x0 // The start of TPM return codes -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. - -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled -#define TPM_FAIL TPM_BASE + 9 // The operation failed -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM - -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session - -// TPM_STARTUP_TYPE values -#define TPM_ST_CLEAR 0x0001 -#define TPM_ST_STATE 0x0002 -#define TPM_ST_DEACTIVATED 0x003 - -// TPM_TAG values -#define TPM_TAG_RQU_COMMAND 0x00c1 -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 -#define TPM_TAG_RSP_COMMAND 0x00c4 -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 - -// TPM_PAYLOAD_TYPE values -#define TPM_PT_ASYM 0x01 -#define TPM_PT_BIND 0x02 -#define TPM_PT_MIGRATE 0x03 -#define TPM_PT_MAINT 0x04 -#define TPM_PT_SEAL 0x05 - -// TPM_ENTITY_TYPE values -#define TPM_ET_KEYHANDLE 0x0001 -#define TPM_ET_OWNER 0x0002 -#define TPM_ET_DATA 0x0003 -#define TPM_ET_SRK 0x0004 -#define TPM_ET_KEY 0x0005 - -/// TPM_ResourceTypes -#define TPM_RT_KEY 0x00000001 -#define TPM_RT_AUTH 0x00000002 -#define TPM_RT_TRANS 0x00000004 -#define TPM_RT_CONTEXT 0x00000005 - -// TPM_PROTOCOL_ID values -#define TPM_PID_OIAP 0x0001 -#define TPM_PID_OSAP 0x0002 -#define TPM_PID_ADIP 0x0003 -#define TPM_PID_ADCP 0x0004 -#define TPM_PID_OWNER 0x0005 - -// TPM_ALGORITHM_ID values -#define TPM_ALG_RSA 0x00000001 -#define TPM_ALG_DES 0x00000002 -#define TPM_ALG_3DES 0X00000003 -#define TPM_ALG_SHA 0x00000004 -#define TPM_ALG_HMAC 0x00000005 -#define TCPA_ALG_AES 0x00000006 - -// TPM_ENC_SCHEME values -#define TPM_ES_NONE 0x0001 -#define TPM_ES_RSAESPKCSv15 0x0002 -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 - -// TPM_SIG_SCHEME values -#define TPM_SS_NONE 0x0001 -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 - -// TPM_KEY_USAGE values -#define TPM_KEY_EK 0x0000 -#define TPM_KEY_SIGNING 0x0010 -#define TPM_KEY_STORAGE 0x0011 -#define TPM_KEY_IDENTITY 0x0012 -#define TPM_KEY_AUTHCHANGE 0X0013 -#define TPM_KEY_BIND 0x0014 -#define TPM_KEY_LEGACY 0x0015 - -// TPM_AUTH_DATA_USAGE values -#define TPM_AUTH_NEVER 0x00 -#define TPM_AUTH_ALWAYS 0x01 - -// Key Handle of owner and srk -#define TPM_OWNER_KEYHANDLE 0x40000001 -#define TPM_SRK_KEYHANDLE 0x40000000 - -// ---------------------- Functions for checking TPM_RESULTs ----------------- - -#include - -// FIXME: Review use of these and delete unneeded ones. - -// these are really badly dependent on local structure: -// DEPENDS: local var 'status' of type TPM_RESULT -// DEPENDS: label 'abort_egress' which cleans up and returns the status -#define ERRORDIE(s) do { status = s; \ - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ - goto abort_egress; } \ - while (0) - -// DEPENDS: local var 'status' of type TPM_RESULT -// DEPENDS: label 'abort_egress' which cleans up and returns the status -// Try command c. If it fails, set status to s and goto abort. -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ - status = s; \ - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ - goto abort_egress; \ - } else {\ - status = c; \ - } - -// Try command c. If it fails, print error message, set status to actual return code. Goto abort -#define TPMTRYRETURN(c) do { status = c; \ - if (status != TPM_SUCCESS) { \ - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ - goto abort_egress; \ - } \ - } while(0) - - -#pragma pack(pop) - -#endif //__TCPA_H__ diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 3b89223..0ba1d55 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable.c - * - tools/vtpm_manager/util/hashtable.c */ #include "hashtable.h" diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 8e6bb5b..4d68223 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable.h - * - tools/vtpm_manager/util/hashtable.h */ #ifndef __HASHTABLE_CWC22_H__ diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h index cabaffe..a08559d 100644 --- a/tools/xenstore/hashtable_private.h +++ b/tools/xenstore/hashtable_private.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable_private.h - * - tools/vtpm_manager/util/hashtable_private.h */ #ifndef __HASHTABLE_PRIVATE_CWC22_H__ diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index ad1eb78..c142140 100644 --- a/tools/xm-test/configure.ac +++ b/tools/xm-test/configure.ac @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ tests/unpause/Makefile tests/vcpu-pin/Makefile tests/vcpu-disable/Makefile - tests/vtpm/Makefile tests/xapi/Makefile tests/enforce_dom0_cpus/Makefile tests/cpupool/Makefile diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default index f0516b2..e04591b 100644 --- a/tools/xm-test/grouptest/default +++ b/tools/xm-test/grouptest/default @@ -27,5 +27,4 @@ sysrq unpause vcpu-disable vcpu-pin -vtpm xapi diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium index bafc988..5c3e1b1 100644 --- a/tools/xm-test/grouptest/medium +++ b/tools/xm-test/grouptest/medium @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test unpause vcpu-disable vcpu-pin -vtpm diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi index 3b04921..7a08b77 100644 --- a/tools/xm-test/grouptest/xapi +++ b/tools/xm-test/grouptest/xapi @@ -1,2 +1 @@ xapi -vtpm 09_vtpm-xapi.test diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py index ae8c550..3ba7433 100644 --- a/tools/xm-test/lib/XmTestLib/XenDomain.py +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py @@ -59,7 +59,6 @@ class XenConfig: # These options need to be lists self.defaultOpts["disk"] = [] self.defaultOpts["vif"] = [] - self.defaultOpts["vtpm"] = [] self.opts = self.defaultOpts diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am index 8d673ed..455f50c 100644 --- a/tools/xm-test/tests/Makefile.am +++ b/tools/xm-test/tests/Makefile.am @@ -25,7 +25,6 @@ SUBDIRS = \ unpause \ vcpu-disable \ vcpu-pin \ - vtpm \ enforce_dom0_cpus \ save restore migrate \ cpupool diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py deleted file mode 100644 index dfd1227..0000000 --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# verify list - - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) - -try: - domain.start(noConsole=True) -except DomainError, e: - if verbose: - print e.extra - vtpm_cleanup(domain.getName()) - FAIL("Unable to create domain") - - -domName = domain.getName() - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) -eyecatcher = "/local/domain/0/backend/vtpm" -where = output.find(eyecatcher) -if status != 0: - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) -elif where < 0: - FAIL("Fail to list virtual TPM device") - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py deleted file mode 100644 index a18cbab..0000000 --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -domain.closeConsole() - -domain.stop() - -if not re.search("PCR-00:",run["output"]): - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py deleted file mode 100644 index b863f27..0000000 --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; suspend and resume the domain and -# check list of pcrs again - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm save %s %s.save" % - (domName, domName), - timeout=30) - - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm save did not succeed") - - try: - status, ouptut = traceCommand("xm restore %s.save" % - (domName), - timeout=30) - except TimeoutError, e: - os.remove("%s.save" % domName) - saveLog(consoleHistory) - FAIL(str(e)) - - os.remove("%s.save" % domName) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm restore did not succeed") - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() - diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py deleted file mode 100644 index ccc8b73..0000000 --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; locally migrate the domain and -# check list of pcrs again -# This test does local live migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate -l %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py deleted file mode 100644 index 57b87df..0000000 --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; locally migrate the domain and -# check list of pcrs again -# This test does local (non-live) migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py deleted file mode 100644 index c70691d..0000000 --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py +++ /dev/null @@ -1,125 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; suspend and resume the domain and -# check list of pcrs again and validate extended pcr - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm save %s %s.save" % - (domName, domName), - timeout=30) - - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm save did not succeed") - - try: - status, ouptut = traceCommand("xm restore %s.save" % - (domName), - timeout=30) - except TimeoutError, e: - os.remove("%s.save" % domName) - saveLog(consoleHistory) - FAIL(str(e)) - - os.remove("%s.save" % domName) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm restore did not succeed") - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() - diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py deleted file mode 100644 index 4ff3360..0000000 --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; locally migrate the domain and -# check list of pcrs again and validate extended pcr -# This test does local live migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate -l %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py deleted file mode 100644 index 27125fc..0000000 --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; locally migrate the domain and -# check list of pcrs again and validate extended pcr -# This test does local (non-live) migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py deleted file mode 100644 index a1aa8b3..0000000 --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Test to test the vtpm class through the Xen-API -# -# Tested methods: -# VTPM: get_uuid, get_backend, get_by_uuid, get_record -# create, destroy, get_VM -# VM: get_VTPMS - -from XmTestLib import xapi -from XmTestLib.XenAPIDomain import XmTestAPIDomain -from XmTestLib import * -from vtpm_utils import * -import commands -import os - -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] - -try: - # XmTestAPIDomain tries to establish a connection to XenD - domain = XmTestAPIDomain() -except Exception, e: - SKIP("Skipping test. Error: %s" % str(e)) -vm_uuid = domain.get_uuid() - -vtpmcfg = {} -vtpmcfg['backend'] = DOM0_UUID -vtpmcfg['VM'] = vm_uuid - -session = xapi.connect() - -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) - -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) -if vtpm_be != vtpmcfg['backend']: - FAIL("vTPM's backend is in '%s', expected: '%s'" % - (vtpm_be, vtpmcfg['backend'])) - -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) - -miss_keys = [] -for k in VTPM_RECORD_KEYS: - if k not in vtpm_rec.keys(): - miss_keys.append(k) -if len(miss_keys) > 0: - FAIL("vTPM record is missing key(s): %s" % miss_keys) - -if vtpm_rec['uuid'] != vtpm_uuid: - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % - (vtpm_rec['uuid'], vtpm_uuid)) -if vtpm_rec['VM'] != vm_uuid: - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % - (vtpm_rec['VM'], vm_uuid)) -if vtpm_rec['backend'] != vtpmcfg['backend']: - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % - (vtpm_rev['backend'], vtpmcfg['backend'])) - -badkeys = [] -keys = vtpm_rec.keys() -for k in keys: - if k not in VTPM_RECORD_KEYS: - badkeys.append(k) -if len(badkeys) > 0: - FAIL("Unexpected attributes in result: %s" % badkeys) - -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % - (vm_ref, vm_uuid)) - -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) -if uuid != vtpm_uuid: - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % - (uuid, vtpm_uuid)) - -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) -if vtpm_ref != vtpm_uuid: - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % - (vtpm_ref, vtpm_uuid)) - -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) -if len(vm_vtpms) != 1: - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % - (len(vm_vtpms), 1)) -if vtpm_uuid not in vm_vtpms: - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % - (vm_vtpms[0], vtpm_uuid)) - -try: - console = domain.start() -except DomainError, e: - FAIL("Unable to create domain.") - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("1. No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) - #Should never get here - FAIL("Could destroy vTPM while VM is running") -except: - pass - -rc = session.xenapi.VM.suspend(vm_uuid) -if rc: - FAIL("Could not suspend VM") - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) - #May not throw an exception in 'suspend' state -except: - pass - -rc = session.xenapi.VM.resume(vm_uuid, False) -if rc: - FAIL("Could not resume VM") - -try: - console = domain.getConsole() -except ConsoleError, e: - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -domain.stop() - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) -except: - FAIL("Could NOT destroy vTPM while domain is halted.") - -domain.destroy() diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am deleted file mode 100644 index dd67e45..0000000 --- a/tools/xm-test/tests/vtpm/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = - -TESTS = 01_vtpm-list_pos.test \ - 02_vtpm-cat_pcrs.test \ - 03_vtpm-susp_res.test \ - 04_vtpm-loc_migr.test \ - 05_vtpm-loc_migr.test \ - 06_vtpm-susp_res_pcrs.test \ - 07_vtpm-mig_pcrs.test \ - 08_vtpm-mig_pcrs.test \ - 09_vtpm-xapi.test - -XFAIL_TESTS = - -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py -TESTS_ENVIRONMENT=@TENV@ - -%.test: %.py - cp $< $@ - chmod +x $@ - -clean-local: am_config_clean-local - -am_config_clean-local: - rm -f *test - rm -f *log - rm -f *~ diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py deleted file mode 100644 index 4e5b281..0000000 --- a/tools/xm-test/tests/vtpm/vtpm_utils.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -from XmTestLib import * - -if ENABLE_HVM_SUPPORT: - SKIP("vtpm tests not supported for HVM domains") - -status, output = traceCommand("COLUMNS=200 ; " - "ps aux | grep vtpm_manager | grep -v grep") -if output == "": - SKIP("virtual TPM manager must be started to run this test; might " - "need /dev/tpm0") - -def vtpm_cleanup(domName): - traceCommand("/etc/xen/scripts/vtpm-delete " - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % - str(domid(domName))) - -def vtpm_cleanup(uuid): - from xen.xm import main - if main.serverType != main.SERVER_XEN_API: - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) - -def vtpm_get_uuid(domainid): - s, o = traceCommand("xenstore-read " - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) - return o -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:40:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:40:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Yp-0006KW-H7; Thu, 01 Nov 2012 20:40:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1Uv-0005Uu-Ke for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:36:18 +0000 Received: from [193.109.254.147:12184] by server-13.bemta-14.messagelabs.com id F9/98-11239-04DD2905; Thu, 01 Nov 2012 20:36:16 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-27.messagelabs.com!1351802168!8576896!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22623 invoked from network); 1 Nov 2012 20:36:10 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:36:10 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148031182; Thu, 01 Nov 2012 16:35:56 -0400 From: Matthew Fioravante To: Ian.Campbell@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Date: Thu, 1 Nov 2012 16:35:47 -0400 Message-Id: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 X-Mailman-Approved-At: Thu, 01 Nov 2012 20:40:18 +0000 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Remove the old vtpm process model. It doesn't work very well and is no longer supported. Signed-off-by: Matthew Fioravante diff --git a/tools/Makefile b/tools/Makefile index d8c8cc0..2ca43b9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager -SUBDIRS-$(VTPM_TOOLS) += vtpm SUBDIRS-y += xenstat SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) SUBDIRS-$(CONFIG_Linux) += memshr diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c index 631306b..90a6b85 100644 --- a/tools/blktap2/drivers/hashtable.c +++ b/tools/blktap2/drivers/hashtable.c @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable.c - * - tools/vtpm_manager/util/hashtable.c */ #include "hashtable.h" diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h index 89aa3dc..56ca053 100644 --- a/tools/blktap2/drivers/hashtable.h +++ b/tools/blktap2/drivers/hashtable.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable.h - * - tools/vtpm_manager/util/hashtable.h */ #ifndef __HASHTABLE_CWC22_H__ diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c index 402e06b..731917c 100644 --- a/tools/blktap2/drivers/hashtable_itr.c +++ b/tools/blktap2/drivers/hashtable_itr.c @@ -1,10 +1,5 @@ /* Copyright (C) 2002, 2004 Christopher Clark */ -/* - * There are duplicates of this code in: - * - tools/vtpm_manager/util/hashtable_itr.c - */ - #include "hashtable.h" #include "hashtable_private.h" #include "hashtable_itr.h" diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h index 3d80638..81da838 100644 --- a/tools/blktap2/drivers/hashtable_itr.h +++ b/tools/blktap2/drivers/hashtable_itr.h @@ -1,10 +1,5 @@ /* Copyright (C) 2002, 2004 Christopher Clark */ -/* - * There are duplicates of this code in: - * - tools/vtpm_manager/util/hashtable_itr.h - */ - #ifndef __HASHTABLE_ITR_CWC22__ #define __HASHTABLE_ITR_CWC22__ #include "hashtable.h" diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h index 5a13a65..954ecc3 100644 --- a/tools/blktap2/drivers/hashtable_private.h +++ b/tools/blktap2/drivers/hashtable_private.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/xenstore/hashtable_private.h - * - tools/vtpm_manager/util/hashtable_private.h */ #ifndef __HASHTABLE_PRIVATE_CWC22_H__ diff --git a/tools/configure.ac b/tools/configure.ac index e708f01..586313d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) # Enable/disable options AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) diff --git a/tools/examples/README b/tools/examples/README index 5b0314e..2225d5c 100644 --- a/tools/examples/README +++ b/tools/examples/README @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode vif-common.sh - sourced by vif-bridge vif-nat - xen virtual network start/stop script in NAT mode vif-route - xen virtual network start/stop script in routed mode -vtpm - called by xen-backend.agent to bind/unbind vTPM devices -vtpm-common.sh - common code for vTPM handling -vtpm-delete - remove an entry from the vTPM table given the - domain's name -vtpm-hotplug-common.sh - sourced by vtpm -vtpm-migration.sh - sourced by external-device-migrate -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug devices xen-backend.rules - hotplug script rules xend-config.sxp - default xend configuration file diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub index 85f847c..e04e6c1 100644 --- a/tools/examples/xmexample.pv-grub +++ b/tools/examples/xmexample.pv-grub @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = [ 'instance=1,backend=0' ] - -#---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' # for a domain to stop: poweroff, reboot, and crash. For each of these you # may specify: diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 index 330aaf0..c951200 100644 --- a/tools/examples/xmexample1 +++ b/tools/examples/xmexample1 @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = [ 'instance=1,backend=0' ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 index 4e5eb3d..8c5137e 100644 --- a/tools/examples/xmexample2 +++ b/tools/examples/xmexample2 @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = ['instance=%d,backend=0' % (vmid) ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 index dc22ce1..ae799f9 100644 --- a/tools/examples/xmexample3 +++ b/tools/examples/xmexample3 @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] # configured in xend-config.sxp. #---------------------------------------------------------------------------- -# Define to which TPM instance the user domain should communicate. -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' -# where INSTANCE indicates the instance number of the TPM the VM -# should be talking to and DOM provides the domain where the backend -# is located. -# Note that no two virtual machines should try to connect to the same -# TPM instance. The handling of all TPM instances does require -# some management effort in so far that VM configration files (and thus -# a VM) should be associated with a TPM instance throughout the lifetime -# of the VM / VM configuration file. The instance number must be -# greater or equal to 1. -#vtpm = ['instance=%d,backend=0' % (vmid) ] - -#---------------------------------------------------------------------------- # Set the kernel command line for the new domain. # You only need to define the IP parameters and hostname if the domain's # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 0166790..0605559 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd XEN_SCRIPTS += blktap -XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl +XEN_SCRIPT_DATA += block-common.sh UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules xend.rules diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm deleted file mode 100644 index 38a4532..0000000 --- a/tools/hotplug/Linux/vtpm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -dir=$(dirname "$0") -. "$dir/vtpm-hotplug-common.sh" - -vtpm_fatal_error=0 - -case "$command" in - add) - vtpm_create_instance - ;; - remove) - vtpm_remove_instance - ;; -esac - -if [ $vtpm_fatal_error -eq 0 ]; then - log debug "Successful vTPM operation '$command'." - success -else - fatal "Error while executing vTPM operation '$command'." -fi diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh deleted file mode 100644 index d0d7935..0000000 --- a/tools/hotplug/Linux/vtpm-common.sh +++ /dev/null @@ -1,448 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# Copyright (c) 2005 XenSource Ltd. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/logging.sh" -. "$dir/locking.sh" - -VTPMDB="/var/vtpm/vtpm.db" - -#In the vtpm-impl file some commands should be defined: -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) -if [ -r "$dir/vtpm-impl.alt" ]; then - . "$dir/vtpm-impl.alt" -elif [ -r "$dir/vtpm-impl" ]; then - . "$dir/vtpm-impl" -else - function vtpm_create () { - true - } - function vtpm_setup() { - true - } - function vtpm_start() { - true - } - function vtpm_suspend() { - true - } - function vtpm_resume() { - true - } - function vtpm_delete() { - true - } - function vtpm_migrate() { - echo "Error: vTPM migration accross machines not implemented." - } - function vtpm_migrate_local() { - echo "Error: local vTPM migration not supported" - } - function vtpm_migrate_recover() { - true - } -fi - - -#Find the instance number for the vtpm given the name of the domain -# Parameters -# - vmname : the name of the vm -# Return value -# Returns '0' if instance number could not be found, otherwise -# it returns the instance number in the variable 'instance' -function vtpmdb_find_instance () { - local vmname ret instance - vmname=$1 - ret=0 - - instance=$(cat $VTPMDB | \ - awk -vvmname=$vmname \ - '{ \ - if ( 1 != index($1,"#")) { \ - if ( $1 == vmname ) { \ - print $2; \ - exit; \ - } \ - } \ - }') - if [ "$instance" != "" ]; then - ret=$instance - fi - echo "$ret" -} - - -# Check whether a particular instance number is still available -# returns "0" if it is not available, "1" otherwise. -function vtpmdb_is_free_instancenum () { - local instance instances avail i - instance=$1 - avail=1 - #Allowed instance number range: 1-255 - if [ $instance -eq 0 -o $instance -gt 255 ]; then - avail=0 - else - instances=$(cat $VTPMDB | \ - awk \ - '{ \ - if (1 != index($1,"#")) { \ - printf("%s ",$2); \ - } \ - }') - for i in $instances; do - if [ $i -eq $instance ]; then - avail=0 - break - fi - done - fi - echo "$avail" -} - - -# Get an available instance number given the database -# Returns an unused instance number -function vtpmdb_get_free_instancenum () { - local ctr instances don found - instances=$(cat $VTPMDB | \ - awk \ - '{ \ - if (1 != index($1,"#")) { \ - printf("%s ",$2); \ - } \ - }') - ctr=1 - don=0 - while [ $don -eq 0 ]; do - found=0 - for i in $instances; do - if [ $i -eq $ctr ]; then - found=1; - break; - fi - done - - if [ $found -eq 0 ]; then - don=1 - break - fi - let ctr=ctr+1 - done - echo "$ctr" -} - - -# Add a domain name and instance number to the DB file -function vtpmdb_add_instance () { - local res vmname inst - vmname=$1 - inst=$2 - - if [ ! -f $VTPMDB ]; then - echo "#Database for VM to vTPM association" > $VTPMDB - echo "#1st column: domain name" >> $VTPMDB - echo "#2nd column: TPM instance number" >> $VTPMDB - fi - res=$(vtpmdb_validate_entry $vmname $inst) - if [ $res -eq 0 ]; then - echo "$vmname $inst" >> $VTPMDB - fi -} - - -#Validate whether an entry is the same as passed to this -#function -function vtpmdb_validate_entry () { - local res rc vmname inst - rc=0 - vmname=$1 - inst=$2 - - res=$(cat $VTPMDB | \ - awk -vvmname=$vmname \ - -vinst=$inst \ - '{ \ - if ( 1 == index($1,"#")) {\ - } else \ - if ( $1 == vmname && \ - $2 == inst) { \ - printf("1"); \ - exit; \ - } else \ - if ( $1 == vmname || \ - $2 == inst) { \ - printf("2"); \ - exit; \ - } \ - }') - - if [ "$res" == "1" ]; then - rc=1 - elif [ "$res" == "2" ]; then - rc=2 - fi - echo "$rc" -} - - -#Remove an entry from the vTPM database given its domain name -#and instance number -function vtpmdb_remove_entry () { - local vmname instance VTPMDB_TMP - vmname=$1 - instance=$2 - VTPMDB_TMP="$VTPMDB".tmp - - $(cat $VTPMDB | \ - awk -vvmname=$vmname \ - '{ \ - if ( $1 != vmname ) { \ - print $0; \ - } \ - '} > $VTPMDB_TMP) - if [ -e $VTPMDB_TMP ]; then - mv -f $VTPMDB_TMP $VTPMDB - vtpm_delete $instance - else - log err "Error creating temporary file '$VTPMDB_TMP'." - fi -} - - -# Find the reason for the creation of this device: -# Returns 'resume' or 'create' -function vtpm_get_create_reason () { - local resume - resume=$(xenstore_read $XENBUS_PATH/resume) - if [ "$resume" == "True" ]; then - echo "resume" - else - echo "create" - fi -} - - -#Create a vTPM instance -# If no entry in the TPM database is found, the instance is -# created and an entry added to the database. -function vtpm_create_instance () { - local res instance domname reason uuid - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) - reason=$(vtpm_get_create_reason) - - claim_lock vtpmdb - - instance="0" - - if [ "$uuid" != "" ]; then - instance=$(vtpmdb_find_instance $uuid) - fi - if [ "$instance" == "0" ]; then - domname=$(xenstore_read "$XENBUS_PATH"/domain) - instance=$(vtpmdb_find_instance $domname) - fi - - if [ "$instance" == "0" -a "$reason" != "create" ]; then - release_lock vtpmdb - return - fi - - if [ "$instance" == "0" ]; then - #Try to give the preferred instance to the domain - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) - if [ "$instance" != "" ]; then - res=$(vtpmdb_is_free_instancenum $instance) - if [ $res -eq 0 ]; then - instance=$(vtpmdb_get_free_instancenum) - fi - else - instance=$(vtpmdb_get_free_instancenum) - fi - - vtpm_create $instance - - if [ $vtpm_fatal_error -eq 0 ]; then - if [ "$uuid" != "" ]; then - vtpmdb_add_instance $uuid $instance - else - vtpmdb_add_instance $domname $instance - fi - fi - else - if [ "$reason" == "resume" ]; then - vtpm_resume $instance - else - vtpm_start $instance - fi - fi - - release_lock vtpmdb - - xenstore_write $XENBUS_PATH/instance $instance -} - - -#Remove an instance when a VM is terminating or suspending. -#Since it is assumed that the VM will appear again, the -#entry is kept in the VTPMDB file. -function vtpm_remove_instance () { - local instance reason domname uuid - #Stop script execution quietly if path does not exist (anymore) - xenstore-exists "$XENBUS_PATH"/domain - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) - - claim_lock vtpmdb - - instance="0" - - if [ "$uuid" != "" ]; then - instance=$(vtpmdb_find_instance $uuid) - fi - - if [ "$instance" == "0" ]; then - domname=$(xenstore_read "$XENBUS_PATH"/domain) - instance=$(vtpmdb_find_instance $domname) - fi - - if [ "$instance" != "0" ]; then - vtpm_suspend $instance - fi - - release_lock vtpmdb -} - - -#Remove an entry in the VTPMDB file given the domain's name -#1st parameter: The name of the domain -function vtpm_delete_instance () { - local instance - - claim_lock vtpmdb - - instance=$(vtpmdb_find_instance $1) - if [ "$instance" != "0" ]; then - vtpmdb_remove_entry $1 $instance - fi - - release_lock vtpmdb -} - -# Determine whether the given address is local to this machine -# Return values: -# "-1" : the given machine name is invalid -# "0" : this is not an address of this machine -# "1" : this is an address local to this machine -function vtpm_isLocalAddress() { - local addr res - addr=$(ping $1 -c 1 | \ - awk '{ print substr($3,2,length($3)-2); exit }') - if [ "$addr" == "" ]; then - echo "-1" - return - fi - res=$(ifconfig | grep "inet addr" | \ - awk -vaddr=$addr \ - '{ \ - if ( addr == substr($2, 6)) {\ - print "1"; \ - } \ - }' \ - ) - if [ "$res" == "" ]; then - echo "0" - return - fi - echo "1" -} - -# Perform a migration step. This function differentiates between migration -# to the local host or to a remote machine. -# Parameters: -# 1st: destination host to migrate to -# 2nd: name of the domain to migrate -# 3rd: the migration step to perform -function vtpm_migration_step() { - local res=$(vtpm_isLocalAddress $1) - if [ "$res" == "0" ]; then - vtpm_migrate $1 $2 $3 - else - vtpm_migrate_local - fi -} - -# Recover from migration due to an error. This function differentiates -# between migration to the local host or to a remote machine. -# Parameters: -# 1st: destination host the migration was going to -# 2nd: name of the domain that was to be migrated -# 3rd: the last successful migration step that was done -function vtpm_recover() { - local res - res=$(vtpm_isLocalAddress $1) - if [ "$res" == "0" ]; then - vtpm_migrate_recover $1 $2 $3 - fi -} - - -#Determine the domain id given a domain's name. -#1st parameter: name of the domain -#return value: domain id or -1 if domain id could not be determined -function vtpm_domid_from_name () { - local id name ids - ids=$(xenstore-list /local/domain) - for id in $ids; do - name=$(xenstore-read /local/domain/$id/name) - if [ "$name" == "$1" ]; then - echo "$id" - return - fi - done - echo "-1" -} - -#Determine the virtual TPM's instance number using the domain ID. -#1st parm: domain ID -function vtpm_uuid_by_domid() { - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) -} - - -# Determine the vTPM's UUID by the name of the VM -function vtpm_uuid_from_vmname() { - local domid=$(vtpm_domid_from_name $1) - if [ "$domid" != "-1" ]; then - echo $(vtpm_uuid_by_domid $domid) - return - fi - echo "" -} - -#Add a virtual TPM instance number and its associated domain name -#to the VTPMDB file and activate usage of this virtual TPM instance -#by writing the instance number into the xenstore -#1st parm: name of virtual machine -#2nd parm: instance of associated virtual TPM -function vtpm_add_and_activate() { - local domid=$(vtpm_domid_from_name $1) - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then - vtpmdb_add_instance $vtpm_uuid $2 - xenstore-write backend/vtpm/$domid/0/instance $2 - fi -} diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete deleted file mode 100644 index b75b95b..0000000 --- a/tools/hotplug/Linux/vtpm-delete +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# This scripts must be called the following way: -# vtpm-delete -# or -# vtpm-delete --vmname - -dir=$(dirname "$0") -. "$dir/vtpm-common.sh" - -if [ "$1" == "--vmname" ]; then - vtpm_uuid=$(vtpm_uuid_from_vmname $2) - if [ "$vtpm_uuid" != "" ];then - vtpm_delete_instance $vtpm_uuid - fi -else - vtpm_delete_instance $1 -fi diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh deleted file mode 100644 index 9fd35e7..0000000 --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# Copyright (c) 2005 XenSource Ltd. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/xen-hotplug-common.sh" - -findCommand "$@" -if [ "$command" != "online" ] && - [ "$command" != "offline" ] && - [ "$command" != "add" ] && - [ "$command" != "remove" ] -then - log err "Invalid command: $command" - exit 1 -fi - - -XENBUS_PATH="${XENBUS_PATH:?}" - -. "$dir/vtpm-common.sh" diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl deleted file mode 100644 index 4f9a1fd..0000000 --- a/tools/hotplug/Linux/vtpm-impl +++ /dev/null @@ -1,208 +0,0 @@ -#!/bin/bash -# =================================================================== -# -# Copyright (c) 2005, Intel Corp. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. -# =================================================================== - -# | SRC | TAG | CMD SIZE | ORD |mtype|strt -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 - -TPM_TYPE_PVM=\\x01 -TPM_TYPE_HVM=\\x02 - -TPM_SUCCESS=00000000 - -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo - -VTPM_MIG=/usr/bin/vtpm_migrator - -# -------------------- Helpers for binary streams ----------- - -function str_to_hex32() { - printf "%0.8x" $1 -} - -function hex32_to_bin() { - local inst=$(str_to_hex32 $1); - - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` - - echo "$n1$n2$n3$n4" -} - -function vtpm_manager_cmd() { - local cmd=$1; - local inst=$2; - local inst_bin=$(hex32_to_bin $inst); - - claim_lock vtpm_mgr - - #send cmd to vtpm_manager - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER - - #recv response - set +e - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` - set -e - - release_lock vtpm_mgr - - #return whether the command was successful - if [ $resp_hex -ne $TPM_SUCCESS ]; then - vtpm_fatal_error=1 - false - else - true - fi -} - -# Helper to get vm type to pass to vtpm_manager open/resume -function vtpm_get_type() { - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) - local vm=$(xenstore_read /local/domain/$inst/vm) - if [ "$vm" != "" ]; then - local ostype=$(xenstore-read $vm/image/ostype) - if [ "$ostype" == "hvm" ]; then - echo $TPM_TYPE_HVM; - else - echo $TPM_TYPE_PVM; - fi - fi -} - -# ------------------ Command handlers ----------------- - -# Create new vtpm instance & set it up for use -function vtpm_create () { - # Creation is handled implicitly by the manager on first setup - # so just set it up for use - $(vtpm_start $1) -} - -# Setup vtpm instance for use. -function vtpm_start() { - local vmtype=$(vtpm_get_type); - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) -} - -function vtpm_resume() { - local vmtype=$(vtpm_get_type); - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) -} - -# Reset the vtpm AKA clear PCRs -function vtpm_reset() { - #not used by current implemenation - true -} - -# Shutdown the vtpm while the vm is down -# This could be a suspend of shutdown -# we cannot distinquish, so save the state -# and decide on startup if we should keep is -function vtpm_suspend() { - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) -} - - -function vtpm_delete() { - local inst=$1 - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then - rm -f /var/vtpm/vtpm_dm_$1.data - true - else - vtpm_fatal_error=1 - false - fi -} - -# Perform a migration step. This function differentiates between migration -# to the local host or to a remote machine. -# Parameters: -# 1st: destination host to migrate to -# 2nd: name of the domain to migrate -# 3rd: the migration step to perform -function vtpm_migrate() { - local instance res - - instance=$(vtpmdb_find_instance $2) - if [ "$instance" == "" ]; then - log err "VTPM Migratoin failed. Unable to translation of domain name" - echo "Error: VTPM Migration failed while looking up instance number" - fi - - case "$3" in - 0) - #Incicate migration supported - echo "0" - ;; - - 1) - # Get Public Key from Destination - # Call vtpm_manager's migration part 1 - claim_lock vtpm_mgr - $VTPM_MIG $1 $2 $instance $3 - release_lock vtpm_mgr - ;; - - 2) - # Call manager's migration step 2 and send result to destination - # If successful remove from db - claim_lock vtpm_mgr - $VTPM_MIG $1 $2 $instance $3 - release_lock vtpm_mgr - ;; - - 3) - if `ps x | grep "$VTPM_MIG $1"`; then - log err "VTPM Migration failed to complete." - echo "Error: VTPM Migration failed to complete." - fi - ;; - esac - -} - - -function vtpm_migrate_recover() { - echo "Error: Recovery not supported yet" -} - -function vtpm_migrate_local() { - echo "Error: local vTPM migration not supported" -} diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh deleted file mode 100644 index 7e38ae2..0000000 --- a/tools/hotplug/Linux/vtpm-migration.sh +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2005 IBM Corporation -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -dir=$(dirname "$0") -. "$dir/vtpm-common.sh" diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules index c591a3f..a0d409e 100644 --- a/tools/hotplug/Linux/xen-backend.rules +++ b/tools/hotplug/Linux/xen-backend.rules @@ -1,6 +1,5 @@ SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile deleted file mode 100644 index 7b3efa5..0000000 --- a/tools/vtpm/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. - -# Base definitions and rules -include $(XEN_ROOT)/tools/vtpm/Rules.mk - -# Dir name for emulator (as dom0 tpm driver) -TPM_EMULATOR_DIR = tpm_emulator -# Dir name for vtpm instance -VTPM_DIR = vtpm -ORIG_DIR = orig - -# Emulator tarball name -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz - -GMP_HEADER = /usr/include/gmp.h - -.PHONY: all -all: build - -.PHONY: build -build: build_sub - -.PHONY: install -install: build - $(MAKE) -C $(VTPM_DIR) install-recursive - -.PHONY: clean -clean: - @if [ -d $(TPM_EMULATOR_DIR) ]; \ - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ - fi - @if [ -d $(VTPM_DIR) ]; \ - then $(MAKE) -C $(VTPM_DIR) clean; \ - fi - -.PHONY: mrproper -mrproper: - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) - -# Download Swiss emulator -$(TPM_EMULATOR_TARFILE): - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) - -# Create vtpm dirs -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch - rm -rf $(VTPM_DIR) - tar -xzf $(TPM_EMULATOR_TARFILE) - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) - - set -e; cd $(VTPM_DIR); \ - patch -p1 < ../vtpm-0.5.1.patch; \ - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch - -orig: $(TPM_EMULATOR_TARFILE) - mkdir $(ORIG_DIR); - set -e; cd $(ORIG_DIR); \ - tar -xzf ../$(TPM_EMULATOR_TARFILE); - -updatepatches: clean orig - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; - mv vtpm.patch vtpm.patch.old; - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; - -.PHONY: build_sub -build_sub: $(VTPM_DIR)/tpmd/tpmd - set -e; if [ -e $(GMP_HEADER) ]; then \ - $(MAKE) -C $(VTPM_DIR) version; \ - $(MAKE) -C $(VTPM_DIR) all-recursive; \ - else \ - echo "=== Unable to build VTPMs. libgmp could not be found."; \ - fi - diff --git a/tools/vtpm/README b/tools/vtpm/README deleted file mode 100644 index 2008cbd..0000000 --- a/tools/vtpm/README +++ /dev/null @@ -1,45 +0,0 @@ - -Directory Structure -=================== -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will - be patched and used for our vtpms -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, - listens on a pair of fifos for TPM commands, - persistent state is sent via named fifo to vtpm - manager, which encrypts it and protects it. -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM - platforms, this patches the emulator to allow - it to be inserted into the dom0 kernel -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator - -Compile Flags -=================== -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs - Not Defined (default): VTPMs are processes - -Requirements -============ -- xen-unstable -- IBM frontend/backend vtpm driver patch -- vtpm_managerd -- GNU MP Big number library (GMP) - -vtpmd Flow (for vtpm_manager. vtpmd never run by default) -============================ -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. -- VTPM Manager listens to TPM BE. -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. -- When the manager receives the open message from the BE, it launches a vtpm -- Xend allows the VM to continue booting. -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. -- The fifo listener begins listening for the reply from vtpm for the request. -- Vtpm processes request and replies to manager over shared named fifo. -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. - -tpm_emulator flow -================== -Read documentation in tpm_emulator-0.2 directory diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk deleted file mode 100644 index 548cff0..0000000 --- a/tools/vtpm/Rules.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) -include $(XEN_ROOT)/tools/Rules.mk - -# -# Tool definitions -# - -# General compiler flags -CFLAGS = -Werror -g3 - -# Generic project files -HDRS = $(wildcard *.h) -SRCS = $(wildcard *.c) -OBJS = $(patsubst %.c,%.o,$(SRCS)) - -# Generic (non-header) dependencies -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk - -$(OBJS): $(SRCS) - --include $(DEPS) - -BUILD_EMULATOR = y - -# Make sure these are just rules -.PHONY : all build install clean diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch deleted file mode 100644 index c34c665..0000000 --- a/tools/vtpm/tpm_emulator.patch +++ /dev/null @@ -1,1919 +0,0 @@ -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 -@@ -1,2 +1,3 @@ - Mario Strasser - Heiko Stamer [DAA] -+INTEL Corp <> [Dropped to Ring3] -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 -@@ -1,3 +1,6 @@ -+????-??-?? Intel Corp -+ * Moved module out of kernel to run as a ring 3 app -+ - 2006-06-23 Mario Strasser - * tpm_startup.c: behaviour of ST_CLEAR and storage of - persistent data adapted -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -24,15 +25,10 @@ int __gmp_junk; - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, - int linenum, const char *expr) - { -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", -+ error("%s:%d: GNU MP assertion failed: %s\n", - filename, linenum, expr); - } - --void __attribute__ ((regparm(0))) abort(void) --{ -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); --} -- - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ - - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur - - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) - { -- void *ret = (void*)kmalloc(size, GFP_KERNEL); -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME -- "GMP: cannot allocate memory (size=%u)\n", size); -+ void *ret = (void*)malloc(size); -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); - return ret; - } - - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, - size_t old_size, size_t new_size) - { -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " -- "(old_size=%u new_size=%u)\n", old_size, new_size); -+ void *ret = (void*)malloc(new_size); -+ if (!ret) error("GMP: Cannot reallocate memory " -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); - memcpy(ret, oldptr, old_size); -- kfree(oldptr); -+ free(oldptr); - return ret; - } - -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel - /* overwrite used memory */ - if (blk_ptr != NULL) { - memset(blk_ptr, 0, blk_size); -- kfree(blk_ptr); -+ free(blk_ptr); - } - } - -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -381,7 +382,7 @@ static int encode_message(int type, uint - msg[0] = 0x00; - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); - sha1_init(&ctx); -- sha1_update(&ctx, "TCPA", 4); -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); -@@ -429,7 +430,7 @@ static int decode_message(int type, uint - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); - sha1_init(&ctx); -- sha1_update(&ctx, "TCPA", 4); -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); - sha1_final(&ctx, &msg[1]); - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], - SHA1_DIGEST_LENGTH) != 0) return -1; -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 -@@ -1,195 +0,0 @@ --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux -- * Copyright (C) 2004 Mario Strasser , -- * -- * This module is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published -- * by the Free Software Foundation; either version 2 of the License, -- * or (at your option) any later version. -- * -- * This module is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ -- */ -- --#include --#include --#include --#include --#include --#include "linux_module.h" --#include "tpm/tpm_emulator.h" -- --MODULE_LICENSE("GPL"); --MODULE_AUTHOR("Mario Strasser "); --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); -- --/* module startup parameters */ --char *startup = "save"; --module_param(startup, charp, 0444); --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " -- "Possible values are 'clear', 'save' (default) and 'deactivated."); --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; --module_param(storage_file, charp, 0644); --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " -- "file of the TPM."); -- --/* TPM lock */ --static struct semaphore tpm_mutex; -- --/* TPM command response */ --static struct { -- uint8_t *data; -- uint32_t size; --} tpm_response; -- --/* module state */ --#define STATE_IS_OPEN 0 --static uint32_t module_state; --static struct timespec old_time; -- --static int tpm_open(struct inode *inode, struct file *file) --{ -- debug("%s()", __FUNCTION__); -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; -- return 0; --} -- --static int tpm_release(struct inode *inode, struct file *file) --{ -- debug("%s()", __FUNCTION__); -- clear_bit(STATE_IS_OPEN, (void*)&module_state); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) { -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return 0; --} -- --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) --{ -- debug("%s(%d)", __FUNCTION__, count); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) { -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); -- *ppos += count; -- if ((size_t)tpm_response.size == (size_t)*ppos) { -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } -- } else { -- count = 0; -- } -- up(&tpm_mutex); -- return count; --} -- --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) --{ -- debug("%s(%d)", __FUNCTION__, count); -- down(&tpm_mutex); -- *ppos = 0; -- if (tpm_response.data != NULL) kfree(tpm_response.data); -- if (tpm_handle_command(buf, count, &tpm_response.data, -- &tpm_response.size) != 0) { -- count = -EILSEQ; -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return count; --} -- --#define TPMIOC_CANCEL _IO('T', 0x00) --#define TPMIOC_TRANSMIT _IO('T', 0x01) -- --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) --{ -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); -- if (cmd == TPMIOC_TRANSMIT) { -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); -- down(&tpm_mutex); -- if (tpm_response.data != NULL) kfree(tpm_response.data); -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, -- &tpm_response.size) == 0) { -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, -- tpm_response.size); -- kfree(tpm_response.data); -- tpm_response.data = NULL; -- } else { -- tpm_response.size = 0; -- tpm_response.data = NULL; -- } -- up(&tpm_mutex); -- return tpm_response.size; -- } -- return -1; --} -- --struct file_operations fops = { -- .owner = THIS_MODULE, -- .open = tpm_open, -- .release = tpm_release, -- .read = tpm_read, -- .write = tpm_write, -- .ioctl = tpm_ioctl, --}; -- --static struct miscdevice tpm_dev = { -- .minor = TPM_DEVICE_MINOR, -- .name = TPM_DEVICE_NAME, -- .fops = &fops, --}; -- --int __init init_tpm_module(void) --{ -- int res = misc_register(&tpm_dev); -- if (res != 0) { -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); -- return res; -- } -- /* initialize variables */ -- sema_init(&tpm_mutex, 1); -- module_state = 0; -- tpm_response.data = NULL; -- old_time = current_kernel_time(); -- /* initialize TPM emulator */ -- if (!strcmp(startup, "clear")) { -- tpm_emulator_init(1); -- } else if (!strcmp(startup, "save")) { -- tpm_emulator_init(2); -- } else if (!strcmp(startup, "deactivated")) { -- tpm_emulator_init(3); -- } else { -- error("invalid startup mode '%s'; must be 'clear', " -- "'save' (default) or 'deactivated", startup); -- misc_deregister(&tpm_dev); -- return -EINVAL; -- } -- return 0; --} -- --void __exit cleanup_tpm_module(void) --{ -- tpm_emulator_shutdown(); -- misc_deregister(&tpm_dev); -- if (tpm_response.data != NULL) kfree(tpm_response.data); --} -- --module_init(init_tpm_module); --module_exit(cleanup_tpm_module); -- --uint64_t tpm_get_ticks(void) --{ -- struct timespec new_time = current_kernel_time(); -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; -- old_time = new_time; -- return (ticks > 0) ? ticks : 1; --} -- -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -17,54 +18,62 @@ - #ifndef _LINUX_MODULE_H_ - #define _LINUX_MODULE_H_ - --#include --#include --#include -+#include -+#include -+#include -+#include - #include --#include --#include --#include --#include - --/* module settings */ -+#include -+#define __BYTEORDER_HAS_U64__ -+#ifdef LITTLE_ENDIAN -+ #include -+#else -+ #include -+#endif - -+/* module settings */ -+#define min(A,B) ((A)<(B)?(A):(B)) -+#ifndef STR - #define STR(s) __STR__(s) - #define __STR__(s) #s -+#endif - #include "tpm_version.h" - - #define TPM_DEVICE_MINOR 224 - #define TPM_DEVICE_NAME "tpm" - #define TPM_MODULE_NAME "tpm_emulator" - --/* debug and log output functions */ -- - #ifdef DEBUG --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) - #else - #define debug(fmt, ...) - #endif --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ -+ __FILE__, __LINE__, ## __VA_ARGS__) - - /* memory allocation */ - - static inline void *tpm_malloc(size_t size) - { -- return kmalloc(size, GFP_KERNEL); -+ return malloc(size); - } - - static inline void tpm_free(const void *ptr) - { -- if (ptr != NULL) kfree(ptr); -+ if (ptr != NULL) free( (void *) ptr); - } - - /* random numbers */ - -+//FIXME; -+void get_random_bytes(void *buf, int nbytes); -+ - static inline void tpm_get_random_bytes(void *buf, int nbytes) - { - get_random_bytes(buf, nbytes); -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); - #define CPU_TO_LE16(x) __cpu_to_le16(x) - - #define BE64_TO_CPU(x) __be64_to_cpu(x) --#define LE64_TO_CPU(x) __be64_to_cpu(x) -+#define LE64_TO_CPU(x) __le64_to_cpu(x) - #define BE32_TO_CPU(x) __be32_to_cpu(x) --#define LE32_TO_CPU(x) __be32_to_cpu(x) -+#define LE32_TO_CPU(x) __le32_to_cpu(x) - #define BE16_TO_CPU(x) __be16_to_cpu(x) - #define LE16_TO_CPU(x) __le16_to_cpu(x) - -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 -@@ -1,24 +1,40 @@ - # Software-Based Trusted Platform Module (TPM) Emulator for Linux - # Copyright (C) 2004 Mario Strasser -+# Copyright (C) 2006 INTEL Corp. - # - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ - --# kernel settings --KERNEL_RELEASE := $(shell uname -r) --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build --MOD_SUBDIR := misc -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) - - # module settings --MODULE_NAME := tpm_emulator -+BIN := tpm_emulator - VERSION_MAJOR := 0 - VERSION_MINOR := 4 - VERSION_BUILD := $(shell date +"%s") - --# enable/disable DEBUG messages --EXTRA_CFLAGS += -Wall -DDEBUG -g -+# Installation program and options -+INSTALL = install -+INSTALL_PROG = $(INSTALL) -m0755 -+INSTALL_DIR = $(INSTALL) -d -m0755 -+ -+# Xen tools installation directory -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin -+ -+CC := gcc -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG -+CFLAGS += -I. -Itpm -+ -+# Is the simulator running in it's own vm? -+#CFLAGS += -DVTPM_MULTI_VM -+ -+ifeq ($(COMPILE_ARCH),x86_64) -+LIBDIR = lib64 -+else -+LIBDIR = lib -+endif - - # GNU MP configuration --GMP_LIB := /usr/lib/libgmp.a -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a - GMP_HEADER := /usr/include/gmp.h - - # sources and objects -@@ -27,38 +43,32 @@ DIRS := . crypto tpm - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) - OBJS := $(patsubst %.c, %.o, $(SRCS)) - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) - --obj-m := $(MODULE_NAME).o --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a -+obj-m := $(BIN) -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a - - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm - - # do not print "Entering directory ..." - MAKEFLAGS += --no-print-directory - --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules -+all: $(BIN) - --install: -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install -- test -d /var/tpm || mkdir /var/tpm -- test -c /dev/tpm || mknod /dev/tpm c 10 224 -- chmod 666 /dev/tpm -- depmod -a -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) -+ -+%.o: %.c -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+install: $(BIN) -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi - - clean: -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) - --dist: $(DISTSRC) -- rm -rf $(DISTDIR) -- mkdir $(DISTDIR) -- cp --parents $(DISTSRC) $(DISTDIR)/ -- rm -f $(DISTDIR)/crypto/gmp.h -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) -- rm -rf $(DISTDIR) -+mrproper: clean -+ rm -f $(BIN) tpm_version.h - - $(src)/crypto/libgmp.a: - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a -@@ -88,4 +98,3 @@ version: - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h - - .PHONY: all install clean dist gmp version -- -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst - Copyright - -------------------------------------------------------------------------- - Copyright (C) 2004 Mario Strasser and Swiss Federal --Institute of Technology (ETH) Zurich. -+ Institute of Technology (ETH) Zurich. -+Copyright (C) 2005 INTEL Corp - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -43,6 +44,12 @@ Example: - GMP_LIB := /usr/lib/libgmp.a - GMP_HEADER := /usr/include/gmp.h - -+GNU MP Library on 64 bit Systems -+-------------------------------------------------------------------------- -+Some 64-bit kernels have problems with importing the user-space gmp -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. -+ - Installation - -------------------------------------------------------------------------- - The compilation and installation process uses the build environment for -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE - TPM_RESULT res; - - info("TPM_GetCapabilityOwner()"); -- -+ -+ if (!tpmData.permanent.flags.owned) { -+ return TPM_NOSRK; -+ } - /* Verify owner authorization */ - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); - if (res != TPM_SUCCESS) return res; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) - || len != 0) return TPM_BAD_PARAMETER; -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) - || len != 0) return TPM_BAD_PARAMETER; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC - - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) - { -- UINT32 key_length; -+ size_t key_length; - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; - /* setup TPM_PUBKEY structure */ -- key_length = tpmData.permanent.data.endorsementKey.size; -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, -- pubEndorsementKey->pubKey.key, -- &pubEndorsementKey->pubKey.keyLength); -+ pubEndorsementKey->pubKey.key, -+ &key_length); -+ pubEndorsementKey->pubKey.keyLength = key_length; - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ - { - TPM_RESULT res; - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; -+ size_t key_length; - info("TPM_OwnerReadInternalPub()"); - /* verify authorization */ - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, -- &publicPortion->pubKey.keyLength); -+ &key_length); -+ publicPortion->pubKey.keyLength = key_length; - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; - publicPortion->algorithmParms.encScheme = srk->encScheme; - publicPortion->algorithmParms.sigScheme = srk->sigScheme; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE - TPM_KEY_DATA *cert, *key; - sha1_ctx_t sha1_ctx; - BYTE *buf, *p; -- UINT32 length; -+ UINT32 length32; -+ size_t length; - info("TPM_CertifyKey()"); - /* get keys */ - cert = tpm_get_key(certHandle); -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - p = buf = tpm_malloc(length); -+ length32=(UINT32) length; - if (buf == NULL -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); - return TPM_FAIL; - } - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - sha1_init(&sha1_ctx); -- sha1_update(&sha1_ctx, buf, length); -+ sha1_update(&sha1_ctx, buf, (size_t) length); - sha1_final(&sha1_ctx, buf); - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); - tpm_free(buf); -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL - TPM_KEY_DATA *cert, *key; - sha1_ctx_t sha1_ctx; - BYTE *buf, *p; -- UINT32 length; -+ size_t length; -+ UINT32 length32; - info("TPM_CertifyKey2()"); - /* get keys */ - cert = tpm_get_key(certHandle); -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); - p = buf = tpm_malloc(length); -+ length32 = (UINT32) length; - if (buf == NULL -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); - return TPM_FAIL; - } -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, - sizeof(session->DAA_session.DAA_digest)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_update(&sha1, inputData1, inputSize1); - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); - } -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, - sizeof(session->DAA_session.DAA_digest)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE*) "\x00", 1); - rsa_export_modulus(&aikData->key, scratch, &size); - sha1_update(&sha1, scratch, size); - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x00", 1); -+ sha1_update(&sha1, (BYTE *) "\x00", 1); - sha1_final(&sha1, scratch); - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, - sizeof(session->DAA_tpmSpecific.DAA_rekey)); - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, - sizeof(session->DAA_tpmSpecific.DAA_count)); -- sha1_update(&sha1, "\x01", 1); -+ sha1_update(&sha1, (BYTE *) "\x01", 1); - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); - mpz_init(f), mpz_init(q); - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr - void tpm_init_data(void) - { - /* endorsement key */ -+#ifndef TPM_GENERATE_EK - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" -@@ -77,6 +78,8 @@ void tpm_init_data(void) - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; -+#endif -+ - int i; - /* reset all data to NULL, FALSE or 0 */ - memset(&tpmData, 0, sizeof(tpmData)); -@@ -152,44 +155,43 @@ void tpm_release_data(void) - - #ifdef TPM_STORE_TO_FILE - --#include --#include --#include -+#include -+#include -+#include -+#include - - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) - - static int write_to_file(uint8_t *data, size_t data_length) - { - int res; -- struct file *fp; -- mm_segment_t old_fs = get_fs(); -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- if (IS_ERR(fp)) return -1; -- set_fs(get_ds()); -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); -- set_fs(old_fs); -- filp_close(fp, NULL); -+ int fp; -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -+ res = write(fp, data, data_length); -+ close(fp); - return (res == data_length) ? 0 : -1; - } - - static int read_from_file(uint8_t **data, size_t *data_length) - { - int res; -- struct file *fp; -- mm_segment_t old_fs = get_fs(); -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); -- if (IS_ERR(fp)) return -1; -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ -+ int fp, file_status; -+ struct stat file_info; -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); -+ file_status = fstat(fp, &file_info); -+ if (file_status < 0) { -+ close(fp); -+ return -1; -+ } -+ -+ *data_length = file_info.st_size; - *data = tpm_malloc(*data_length); - if (*data == NULL) { -- filp_close(fp, NULL); -+ close(fp); - return -1; - } -- set_fs(get_ds()); -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); -- set_fs(old_fs); -- filp_close(fp, NULL); -+ res = read(fp, *data, *data_length); -+ close(fp); - if (res != *data_length) { - tpm_free(*data); - return -1; -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data - int tpm_store_permanent_data(void) - { - uint8_t *buf, *ptr; -- size_t buf_length, len; -+ UINT32 buf_length, len; - - /* marshal data */ -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); - buf = ptr = tpm_malloc(buf_length); - if (buf == NULL - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { - tpm_free(buf); - return -1; - } -+ - if (write_to_file(buf, buf_length - len)) { - tpm_free(buf); - return -1; -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) - int tpm_restore_permanent_data(void) - { - uint8_t *buf, *ptr; -- size_t buf_length, len; -+ size_t buf_length; -+ UINT32 len; - TPM_VERSION ver; - - /* read data */ - if (read_from_file(&buf, &buf_length)) return -1; - ptr = buf; -- len = buf_length; -+ len = (uint32_t) buf_length; - /* unmarshal data */ - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { - tpm_free(buf); - return -1; - } -+ - tpm_free(buf); - return 0; - } - - int tpm_erase_permanent_data(void) - { -- int res = write_to_file("", 0); -+ int res = write_to_file((uint8_t *) "", 0); - return res; - } - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA - BYTE *ptr; - UINT32 len; - info("TPM_SaveKeyContext()"); -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", - keyContextSize, &contextBlob); - if (res != TPM_SUCCESS) return res; - len = *keyContextSize; -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH - BYTE *ptr; - UINT32 len; - info("TPM_SaveAuthContext()"); -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", - authContextSize, &contextBlob); - if (res != TPM_SUCCESS) return res; - len = *authContextSize; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1,5 +1,6 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -22,7 +23,8 @@ - /* TPM configuration */ - #define TPM_STORE_TO_FILE 1 - #undef TPM_STRONG_PERSISTENCE --#undef TPM_GENERATE_EK -+//#undef TPM_GENERATE_EK -+#define TPM_GENERATE_EK - #undef TPM_GENERATE_SEED_DAA - - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * - - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) - { -- UINT32 m_len, e_len, q_len; -+ size_t m_len, e_len, q_len; - if (*length < sizeof_RSA((*v))) return -1; - if (v->size > 0) { - rsa_export_modulus(v, &(*ptr)[6], &m_len); -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT - return 0; - } - -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) -+{ -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; -+ -+ return 0; -+} -+ -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) -+{ -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; -+ -+ return 0; -+} -+ -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) -+{ -+ UINT32 i; -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; -+ } -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; -+ } -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; -+ -+ return 0; -+} -+ -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) -+{ -+ UINT32 i; -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; -+ } -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; -+ } -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; -+ -+ return 0; -+} -+ - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) - { - if (tpm_marshal_BYTE(ptr, length, v->type) -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); - -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); -+ -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); -+ - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO - TPM_RESULT res; - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; -- UINT32 buf_size = ek->size >> 3; -+ size_t buf_size = ek->size >> 3, key_length; - BYTE buf[buf_size]; - - info("TPM_TakeOwnership()"); -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO - return TPM_FAIL; - } - rsa_export_modulus(&srk->key, srkPub->pubKey.key, -- &srkPub->pubKey.keyLength); -+ &key_length); -+ srkPub->pubKey.keyLength = (UINT32) key_length; - /* setup tpmProof and set state to owned */ - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, - sizeof(tpmData.permanent.data.tpmProof.nonce)); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) - { - int i; -+ int restore_fail; - info("TPM_Startup(%d)", startupType); - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; -- /* reset STANY_FLAGS */ -- SET_TO_ZERO(&tpmData.stany.flags); -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; -- /* reset STANY_DATA (invalidates ALL sessions) */ -- SET_TO_ZERO(&tpmData.stany.data); -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; -- /* init session-context nonce */ -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); -+ -+ /* try and restore state to get EK, SRK, etc */ -+ restore_fail = tpm_restore_permanent_data(); -+ - /* set data and flags according to the given startup type */ - if (startupType == TPM_ST_CLEAR) { -- /* if available, restore permanent data */ -- tpm_restore_permanent_data(); -+ /* reset STANY_FLAGS */ -+ SET_TO_ZERO(&tpmData.stany.flags); -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; -+ /* reset STANY_DATA (invalidates ALL sessions) */ -+ SET_TO_ZERO(&tpmData.stany.data); -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; -+ /* init session-context nonce */ -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); - /* reset PCR values */ - for (i = 0; i < TPM_NUM_PCR; i++) { -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); - else -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); - } - /* reset STCLEAR_FLAGS */ - SET_TO_ZERO(&tpmData.stclear.flags); -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE - /* init key-context nonce */ - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); - } else if (startupType == TPM_ST_STATE) { -- if (tpm_restore_permanent_data()) { -+ /* restore must have been successful for TPM_ST_STATE */ -+ if (restore_fail) { - error("restoring permanent data failed"); - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; - tpmData.permanent.flags.selfTestSucceeded = FALSE; -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - BYTE *enc, UINT32 *enc_size) - { - UINT32 len; -+ size_t enc_size32 = *enc_size; - BYTE *buf, *ptr; - rsa_public_key_t pub_key; - int scheme; -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - if (buf == NULL - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), -- enc, enc_size)) { -+ enc, &enc_size32)) { - tpm_free(buf); - rsa_release_public_key(&pub_key); - return -1; -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, - TPM_SEALED_DATA *seal, BYTE **buf) - { -- UINT32 len; -+ size_t len; -+ UINT32 len32; - BYTE *ptr; - int scheme; - switch (key->encScheme) { -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke - len = enc_size; - *buf = ptr = tpm_malloc(len); - if (*buf == NULL -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ -+ tpm_free(*buf); -+ return -1; -+ } -+ len32 = len; -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { - tpm_free(*buf); - return -1; - } -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par - - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, - BYTE *inData, TPM_AUTH *auth1, -- UINT32 *outDataSize, BYTE **outData) -+ UINT32 *outDataSize32, BYTE **outData) - { - TPM_RESULT res; - TPM_KEY_DATA *key; - int scheme; -+ size_t outDataSize; - - info("TPM_UnBind()"); - /* get key */ -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key - /* the size of the input data muss be greater than zero */ - if (inDataSize == 0) return TPM_BAD_PARAMETER; - /* decrypt data */ -- *outDataSize = inDataSize; -- *outData = tpm_malloc(*outDataSize); -+ outDataSize = inDataSize; -+ *outData = tpm_malloc(outDataSize); - if (*outData == NULL) return TPM_NOSPACE; - switch (key->encScheme) { - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; - } - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, -- *outData, outDataSize)) { -+ *outData, &outDataSize)) { - tpm_free(*outData); - return TPM_DECRYPT_ERROR; - } - /* verify data if it is of type TPM_BOUND_DATA */ - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 - || key->keyUsage != TPM_KEY_LEGACY) { -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { - tpm_free(*outData); - return TPM_DECRYPT_ERROR; - } -- *outDataSize -= 5; -- memmove(*outData, &(*outData)[5], *outDataSize); -+ outDataSize -= 5; -+ memmove(*outData, &(*outData)[5], outDataSize); - } -+ *outDataSize32 = (UINT32) outDataSize; - return TPM_SUCCESS; - } - -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke - } - - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, -- BYTE *enc, UINT32 *enc_size) -+ BYTE *enc, UINT32 *enc_size32) - { - UINT32 len; - BYTE *buf, *ptr; - rsa_public_key_t pub_key; - int scheme; -+ size_t enc_size; - switch (key->encScheme) { - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke - if (buf == NULL - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), -- enc, enc_size)) { -+ enc, &enc_size)) { - tpm_free(buf); - rsa_release_public_key(&pub_key); - return -1; - } -+ *enc_size32 = (UINT32) enc_size; - tpm_free(buf); - rsa_release_public_key(&pub_key); - return 0; -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, - TPM_STORE_ASYMKEY *store, BYTE **buf) - { -- UINT32 len; -+ UINT32 len32; -+ size_t len; - BYTE *ptr; - int scheme; - switch (key->encScheme) { -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke - len = enc_size; - *buf = ptr = tpm_malloc(len); - if (*buf == NULL -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { -+ tpm_free(*buf); -+ return -1; -+ } -+ len32 = (UINT32) len; -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { - tpm_free(*buf); - return -1; - } -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - TPM_SESSION_DATA *session; - TPM_STORE_ASYMKEY store; - rsa_private_key_t rsa; -- UINT32 key_length; -+ size_t key_length; - - info("TPM_CreateWrapKey()"); - /* get parent key */ -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - } - } - /* generate key and store it */ -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; -- wrappedKey->pubKey.keyLength = key_length >> 3; -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) -+ return TPM_FAIL; -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); -- store.privKey.keyLength = key_length >> 4; -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; - store.privKey.key = tpm_malloc(store.privKey.keyLength); - wrappedKey->encDataSize = parent->key.size >> 3; - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN - tpm_free(wrappedKey->encData); - return TPM_NOSPACE; - } -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, -- &wrappedKey->pubKey.keyLength); -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, -+ &key_length); -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); -+ store.privKey.keyLength = (UINT32) key_length; - rsa_release_private_key(&rsa); - /* compute the digest of the wrapped key (without encData) */ - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p - - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) - { -+ size_t key_length; - parms->algorithmID = TPM_ALG_RSA; - parms->encScheme = key->encScheme; - parms->sigScheme = key->sigScheme; -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); - if (parms->parms.rsa.exponent == NULL) return -1; - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, -- &parms->parms.rsa.exponentSize); -+ &key_length); -+ parms->parms.rsa.exponentSize = (UINT32) key_length; - parms->parmSize = 12 + parms->parms.rsa.exponentSize; - return 0; - } -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE - TPM_RESULT res; - TPM_KEY_DATA *key; - TPM_DIGEST digest; -+ size_t key_length; - info("TPM_GetPubKey()"); - /* get key */ - if (keyHandle == TPM_KH_SRK -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE - pubKey->pubKey.keyLength = key->key.size >> 3; - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; -- rsa_export_modulus(&key->key, pubKey->pubKey.key, -- &pubKey->pubKey.keyLength); -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); -+ pubKey->pubKey.keyLength = (UINT32) key_length; - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); - tpm_free(pubKey->pubKey.key); -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { - TPM_DIGEST DAA_digest_gamma; - BYTE DAA_generic_q[26]; - } TPM_DAA_ISSUER; -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) - - /* - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { - TPM_DIGEST DAA_rekey; - UINT32 DAA_count; - } TPM_DAA_TPM; -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) - - /* - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { - BYTE DAA_scratch[256]; - BYTE DAA_stage; - } TPM_DAA_CONTEXT; -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) - - /* - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { - BYTE DAA_join_u1[138]; - TPM_DIGEST DAA_digest_n0; - } TPM_DAA_JOINDATA; -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) - - /* - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { - //UINT32 ownerReference; - //BOOL disableResetLock; - } TPM_STCLEAR_DATA; -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) - - /* - * TPM_SESSION_DATA -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { - TPM_DAA_JOINDATA DAA_joinSession; - TPM_HANDLE handle; - } TPM_DAA_SESSION_DATA; -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) - - /* - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { - TPM_DAAHANDLE currentDAA; - TPM_TRANSHANDLE transExclusive; - } TPM_STANY_DATA; -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) - - /* - * TPM_DATA -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) - struct { - uint8_t *data; uint32_t repetitions; uint8_t *digest; - } test_cases[] = {{ -- "abc", 1, -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" -+ (uint8_t*)"abc", 1, -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" - }, { -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" - }, { -- "a", 1000000, -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" -+ (uint8_t*)"a", 1000000, -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" - }, { -- "0123456701234567012345670123456701234567012345670123456701234567", 10, -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" - }}; - - debug("tpm_test_sha1()"); - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { - sha1_init(&ctx); - for (j = 0; j < test_cases[i].repetitions; j++) -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); - sha1_final(&ctx, digest); - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; - } -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) - struct { - uint8_t *key, key_len, *data, data_len, *digest; - } test_cases[] = {{ -- "\x0b", 20, "Hi There", 8, -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" - }, { -- "Jefe", 4, "what do ya want for nothing?", 28, -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" - }, { -- "\xaa", 20, "\xdd", 50, -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" - }, { -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" - }, { -- "\x0c", 20, "Test With Truncation", 20, -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" - }, { -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" - }, { -- "\xaa", 80, -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" -+ (uint8_t*)"\xaa", 80, -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" - }}; - - debug("tpm_test_hmac()"); - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { - uint8_t key[test_cases[i].key_len]; - memset(key, test_cases[i].key[0], test_cases[i].key_len); - hmac_init(&ctx, key, test_cases[i].key_len); - } else { - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); - } -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); - } - hmac_final(&ctx, digest); - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) - static int tpm_test_rsa_EK(void) - { - int res = 0; -- char *data = "RSA PKCS #1 v1.5 Test-String"; -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; - uint8_t buf[256]; -- size_t buf_len, data_len = strlen(data); -+ size_t buf_len, data_len = strlen((char*)data); - rsa_private_key_t priv_key; - rsa_public_key_t pub_key; - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) - { - info("TPM_GetTicks()"); -- memcpy(currentTime, &tpmData.stany.data.currentTicks, -- sizeof(TPM_CURRENT_TICKS)); -- return TPM_SUCCESS; -+ return TPM_DISABLED_CMD; - } - - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN - TPM_CURRENT_TICKS *currentTicks, - UINT32 *sigSize, BYTE **sig) - { -- TPM_RESULT res; -- TPM_KEY_DATA *key; -- BYTE *info, *p; -- UINT32 info_length, length; - info("TPM_TickStampBlob()"); -- /* get key */ -- key = tpm_get_key(keyHandle); -- if (key == NULL) return TPM_INVALID_KEYHANDLE; -- /* verify authorization */ -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); -- if (res != TPM_SUCCESS) return res; -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; -- /* get current ticks */ -- TPM_GetTicks(currentTicks); -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ -- *sigSize = key->key.size >> 3; -- *sig = tpm_malloc(*sigSize); -- if (*sig == NULL) return TPM_FAIL; -- /* setup TPM_SIGN_INFO structure */ -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); -- info = tpm_malloc(info_length); -- if (info == NULL) { -- tpm_free(*sig); -- return TPM_FAIL; -- } -- memcpy(&info[0], "\x05\x00TSTP", 6); -- memcpy(&info[6], antiReplay->nonce, 20); -- *(UINT32*)&info[26] = CPU_TO_BE32(20 -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); -- p = &info[30 + sizeof(TPM_DIGEST)]; -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { -- tpm_free(*sig); -- tpm_free(info); -- return TPM_FAIL; -- } -- return TPM_SUCCESS; -+ return TPM_DISABLED_CMD; - } - - void tpm_update_ticks(void) - { -- if (tpmData.stany.data.currentTicks.tag == 0) { -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); --/* removed since v1.2 rev 94 -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; --*/ -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, -- sizeof(TPM_NONCE)); -- tpmData.stany.data.currentTicks.tickRate = 1; --/* removed since v1.2 rev 94 -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; --*/ -- } else { -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); -- } - } - -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE - sha1_init(&sha1); - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); -- sha1_update(&sha1, "in", 2); -+ sha1_update(&sha1, (BYTE*)"in", 2); - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); - j = CPU_TO_BE32(i); - sha1_update(&sha1, (BYTE*)&j, 4); -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE - sha1_init(&sha1); - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); -- sha1_update(&sha1, "out", 3); -+ sha1_update(&sha1, (BYTE*)"out", 3); - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); - j = CPU_TO_BE32(i); - sha1_update(&sha1, (BYTE*)&j, 4); -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 -@@ -0,0 +1,156 @@ -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux -+ * Copyright (C) 2005 INTEL Corp -+ * -+ * This module is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published -+ * by the Free Software Foundation; either version 2 of the License, -+ * or (at your option) any later version. -+ * -+ * This module is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "tpm_emulator.h" -+ -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" -+ -+#define BUFFER_SIZE 2048 -+ -+static int devurandom=0; -+ -+void get_random_bytes(void *buf, int nbytes) { -+ -+ if (devurandom == 0) { -+ devurandom = open("/dev/urandom", O_RDONLY); -+ } -+ -+ if (read(devurandom, buf, nbytes) != nbytes) { -+ printf("Can't get random number.\n"); -+ exit(-1); -+ } -+} -+ -+uint64_t tpm_get_ticks(void) -+{ -+ //struct timeval tv; -+ //int gettimeofday(&tv, struct timezone *tz); -+ return 0; -+} -+ -+int main(int argc, char **argv) -+{ -+ uint8_t in[BUFFER_SIZE], *out; -+ uint32_t out_size; -+ int in_size, written; -+ int i; -+ struct stat file_info; -+ -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; -+ if (argc < 2) { -+ printf("Usage: tpmd clear|save|deactivated\n" ); -+ return -1; -+ } -+ -+ /* initialize TPM emulator */ -+ if (!strcmp(argv[1], "clear")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(1); -+ } else if (!strcmp(argv[1], "save")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(2); -+ } else if (!strcmp(argv[1], "deactivated")) { -+ printf("Initializing tpm: %s\n", argv[1]); -+ tpm_emulator_init(3); -+ } else { -+ printf("invalid startup mode '%s'; must be 'clear', " -+ "'save' (default) or 'deactivated", argv[1]); -+ return -1; -+ } -+ -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); -+ return -1; -+ } -+ } -+ -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); -+ return -1; -+ } -+ } -+ -+ while (1) { -+abort_command: -+ if (tpm_rx_fh < 0) { -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); -+ } -+ -+ if (tpm_rx_fh < 0) { -+ printf("ERROR: failed to open devices to listen to guest.\n"); -+ return -1; -+ } -+ -+ if (tpm_tx_fh < 0) { -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); -+ } -+ -+ if (tpm_tx_fh < 0) { -+ printf("ERROR: failed to open devices to respond to guest.\n"); -+ return -1; -+ } -+ -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); -+ if (in_size < 6) { // Magic size of minium TPM command -+ printf("Recv[%d] to small: 0x", in_size); -+ if (in_size <= 0) { -+ close(tpm_rx_fh); -+ tpm_rx_fh = -1; -+ goto abort_command; -+ } -+ } else { -+ printf("Recv[%d]: 0x", in_size); -+ for (i=0; i< in_size; i++) -+ printf("%x ", in[i]); -+ printf("\n"); -+ } -+ -+ -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { -+ printf("ERROR: Handler Failed.\n"); -+ } -+ -+ written = write(tpm_tx_fh, out, out_size); -+ -+ if (written != out_size ) { -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); -+ } else { -+ printf("Sent[%Zu]: ", out_size); -+ } -+ for (i=0; i< out_size; i++) -+ printf("%x ", out[i]); -+ printf("\n"); -+ tpm_free(out); -+ -+ } // loop -+ -+ tpm_emulator_shutdown(); -+ -+ close(tpm_tx_fh); -+ close(tpm_rx_fh); -+ -+} -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 -@@ -2,5 +2,5 @@ - #define _TPM_VERSION_H_ - #define VERSION_MAJOR 0 - #define VERSION_MINOR 4 --#define VERSION_BUILD 1151058734 -+#define VERSION_BUILD 1153776940 - #endif /* _TPM_VERSION_H_ */ diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch deleted file mode 100644 index 95586c1..0000000 --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile ---- tpm_emulator-0.5.1/tpmd/Makefile -+++ tpm_emulator-0.5.1/tpmd/Makefile -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing - CFLAGS += -I../../../../tools/vtpm_manager/manager --LDFLAGS += -lgmp -+LDLIBS += -lgmp - - BINDIR := /usr/bin/ - diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch deleted file mode 100644 index 2aeb745..0000000 --- a/tools/vtpm/vtpm-0.5.1.patch +++ /dev/null @@ -1,766 +0,0 @@ -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 - VERSION_BUILD := $(shell date +"%s") - VERSION_SUFFIX := .1 - --SUBDIRS := tpmd tpmd_dev tddl -+SUBDIRS := tpmd - - all: version all-recursive - -@@ -48,12 +48,12 @@ user_install: user - modules_install: modules - @$(MAKE) -C tpmd_dev install || exit -1 - --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd -+DIRS := . tpm crypto tpmd - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd -+DIRS := . tpmd - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in -+DISTSRC += ./README ./AUTHORS ./ChangeLog - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) - - dist: $(DISTSRC) -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_TIS_TIMEOUT: - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ -+ UINT32 len = *respSize = 16; -+ BYTE *ptr = *resp = tpm_malloc(*respSize); -+ if (ptr == NULL || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { -+ tpm_free(*resp); -+ return TPM_FAIL; -+ } -+ return TPM_SUCCESS; -+ - - case TPM_CAP_PROP_STARTUP_EFFECT: - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_DURATION: - debug("[TPM_CAP_PROP_DURATION]"); -- /* TODO: TPM_CAP_PROP_DURATION */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; -+ *respSize = 16; -+ *resp = tpm_malloc(*respSize); -+ memcpy(*resp,dur,16); -+ - - case TPM_CAP_PROP_ACTIVE_COUNTER: - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a - -Wwrite-strings -Wsign-compare -Wno-multichar - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing -+CFLAGS += -I../../../../tools/vtpm_manager/manager - LDFLAGS += -lgmp - --BINDIR := /usr/sbin/ -+BINDIR := /usr/bin/ - - TPMD := tpmd - DIRS := ../tpm ../crypto -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil - OBJS := $(patsubst %.c, %.o, $(SRCS)) - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) - -+VTPM_BIN := vtpmd -+ - vpath %.c $(strip $(DIRS)) - - all: $(TPMD) -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss - INSTALL ?= install - - install: $(TPMD) -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) - - .PHONY: all clean install - -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 -@@ -32,6 +32,9 @@ - #include - #include "tpm_emulator_config.h" - #include "tpm/tpm_emulator.h" -+#include "tpm/tpm_structures.h" -+#include "tpm/tpm_marshalling.h" -+#include "vtpm_manager.h" - - #define TPM_DAEMON_NAME "tpmd" - #define TPM_CMD_BUF_SIZE 4096 -@@ -39,6 +42,24 @@ - #define TPM_RANDOM_DEVICE "/dev/urandom" - #undef TPM_MKDIRS - -+#ifdef VTPM_MULTI_VM -+ #define DEV_BE "/dev/vtpm" -+ #define DEV_FE "/dev/tpm" -+#else -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" -+ -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -+ -+ static char *vtpm_rx_name=NULL; -+#endif -+ -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#define BUFFER_SIZE 2048 -+ - static volatile int stopflag = 0; - static int is_daemon = 0; - static int opt_debug = 0; -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ - static uid_t opt_uid = 0; - static gid_t opt_gid = 0; - static int tpm_startup = 2; -+static int vtpm_type = VTPM_TYPE_PVM; -+int dmi_id = 0; - static int rand_fh; - - void tpm_log(int priority, const char *fmt, ...) -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) - - int tpm_write_to_file(uint8_t *data, size_t data_length) - { -- int fh; -- ssize_t res; -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- if (fh < 0) return -1; -- while (data_length > 0) { -- res = write(fh, data, data_length); -- if (res < 0) { -- close(fh); -- return -1; -- } -- data_length -= res; -- data += res; -+ int res, out_data_size, in_header_size; -+ BYTE *ptr, *out_data, *in_header; -+ UINT32 result, len, in_rsp_size; -+ UINT16 tag = VTPM_TAG_REQ; -+ -+ printf("Saving NVM\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; -+#endif -+ -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { -+ free(out_data); -+ return -1; -+ } -+ -+ printf("\tSending SaveNVM Command.\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); - } -- close(fh); -- return 0; -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading SaveNVM header.\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_tx_fh); close(vtpm_rx_fh); -+#endif -+ -+ printf("\tFinishing up SaveNVM\n"); -+ return (0); - } - - int tpm_read_from_file(uint8_t **data, size_t *data_length) - { -- int fh; -- ssize_t res; -- size_t total_length; -- fh = open(opt_storage_file, O_RDONLY); -- if (fh < 0) return -1; -- total_length = lseek(fh, 0, SEEK_END); -- lseek(fh, 0, SEEK_SET); -- *data = tpm_malloc(total_length); -- if (*data == NULL) { -- close(fh); -- return -1; -- } -- *data_length = 0; -- while (total_length > 0) { -- res = read(fh, &(*data)[*data_length], total_length); -- if (res < 0) { -- close(fh); -- tpm_free(*data); -- return -1; -- } -- *data_length += res; -- total_length -= res; -+ int res, out_data_size, in_header_size; -+ uint8_t *ptr, *out_data, *in_header; -+ UINT16 tag = VTPM_TAG_REQ; -+ UINT32 len, in_rsp_size, result; -+#ifdef VTPM_MUTLI_VM -+ int vtpm_rx_fh, vtpm_tx_fh; -+#endif -+ -+ printf("Loading NVM.\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ printf("Error in read_from_file:301\n"); -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { -+ free(out_data); -+ printf("Error in read_from_file:325\n"); -+ -+ return -1; -+ } -+ -+ printf("\tSending LoadNVM command\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) -+ { -+ printf("Error in read_from_file:335\n"); -+ return -1; -+ } -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); - } -- close(fh); -- return 0; -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ printf("Error in read_from_file:352\n"); -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading LoadNVM header\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ printf("Error in read_from_file:375\n"); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ printf("Error in read_from_file:381\n"); -+ return -1; -+ } -+ -+ // Read Encrypted data from VTPM Manager -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; -+ *data = (uint8_t *) malloc(*data_length); -+ -+ printf("\tReading clear data from LoadNVM.\n"); -+ res = read(vtpm_rx_fh, *data, *data_length); -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_rx_fh);close(vtpm_tx_fh); -+#endif -+ -+ printf("\tReturing from loading NVM\n"); -+ if (res != (int)*data_length) { -+ free(*data); -+ printf("Error in read_from_file:398\n"); -+ return -1; -+ } else { -+ return 0; -+ } -+ -+ -+ - } - - static void print_usage(char *name) - { - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); -+ "[-o user name] [-g group name] [-h]" -+#ifdef VTPM_MULTI_VM -+ "clear|save|deactivated\n", name); -+#else -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); -+#endif - printf(" d : enable debug mode\n"); - printf(" f : forces the application to run in the foreground\n"); - printf(" s : storage file to use (default: %s)\n", opt_storage_file); -@@ -205,7 +413,13 @@ static void parse_options(int argc, char - exit(EXIT_SUCCESS); - } - } -- if (optind < argc) { -+ /*Make sure we have all required options*/ -+#ifdef VTPM_MULTI_VM -+#define EXTRA_OPTS 0 -+#else -+#define EXTRA_OPTS 2 -+#endif -+ if (optind < argc - EXTRA_OPTS ) { - debug("startup mode = '%s'", argv[optind]); - if (!strcmp(argv[optind], "clear")) { - tpm_startup = 1; -@@ -219,6 +433,25 @@ static void parse_options(int argc, char - print_usage(argv[0]); - exit(EXIT_SUCCESS); - } -+#ifndef VTPM_MULTI_VM -+ ++optind; -+ if(!strcmp(argv[optind], "pvm")) { -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo -+ } else if (!strcmp(argv[optind], "hvm")) { -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket -+ } else { -+ error("Invalid vm mode '%s'; must be 'pvm', " -+ "or 'hvm' ", argv[optind]); -+ print_usage(argv[0]); -+ exit(EXIT_SUCCESS); -+ } -+ ++optind; -+ dmi_id = atoi(argv[optind]); -+#endif -+ } else { -+ error("Invalid number of arguments"); -+ print_usage(argv[0]); -+ exit(EXIT_SUCCESS); - } - } - -@@ -348,93 +581,180 @@ static int init_socket(const char *name) - - static void main_loop(void) - { -- int sock, fh, res; -- int32_t in_len; -+ int32_t in_len, written; - uint32_t out_len; -- uint8_t in[TPM_CMD_BUF_SIZE], *out; -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; -+ int guest_id=-1; -+ int i; -+ char *vtpm_rx_file=NULL; -+ int res; -+ -+#ifndef VTPM_MULTI_VM -+ int sockfd = -1; - struct sockaddr_un addr; -- socklen_t addr_len; -- fd_set rfds; -- struct timeval tv; -+ struct sockaddr_un client_addr; -+ unsigned int client_length; -+#endif -+ -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#ifndef VTPM_MULTI_VM -+ if (vtpm_type == VTPM_TYPE_PVM) { -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); -+ } else { -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); -+ -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { -+ error("Unable to create socket. errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&addr, 0, sizeof(addr)); -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path,vtpm_rx_file ); -+ unlink(addr.sun_path); -+ } -+#endif - - info("staring main loop"); -- /* open UNIX socket */ -- sock = init_socket(opt_socket_name); -- if (sock < 0) exit(EXIT_FAILURE); - /* init tpm emulator */ -- debug("initializing TPM emulator: %d", tpm_startup); -+#ifdef VTPM_MULTI_VM -+ debug("initializing TPM emulator: state=%d", tpm_startup); -+#else -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); -+#endif - tpm_emulator_init(tpm_startup); - /* start command processing */ - while (!stopflag) { - /* wait for incomming connections */ - debug("waiting for connections..."); -- FD_ZERO(&rfds); -- FD_SET(sock, &rfds); -- tv.tv_sec = 10; -- tv.tv_usec = 0; -- res = select(sock + 1, &rfds, NULL, NULL, &tv); -- if (res < 0) { -- error("select(sock) failed: %s", strerror(errno)); -- break; -- } else if (res == 0) { -- continue; -- } -- addr_len = sizeof(addr); -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); -- if (fh < 0) { -- error("accept() failed: %s", strerror(errno)); -- continue; -- } -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); -+#else -+ if (vtpm_type == VTPM_TYPE_PVM) -+ { -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); -+ } else { -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { -+ error("Unable to bind(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ if (listen(sockfd, 10) <0) { -+ error("Unable to listen(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&client_addr, 0, sizeof(client_addr)); -+ client_length = sizeof(client_addr); -+ -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); -+ } -+#endif -+ } -+ -+ /*Error Checking*/ -+ if (vtpm_rx_fh < 0) { -+ error("Failed to open devices to listen to guest.\n"); -+ exit(-1); -+ } -+ - /* receive and handle commands */ - in_len = 0; - do { - debug("waiting for commands..."); -- FD_ZERO(&rfds); -- FD_SET(fh, &rfds); -- tv.tv_sec = TPM_COMMAND_TIMEOUT; -- tv.tv_usec = 0; -- res = select(fh + 1, &rfds, NULL, NULL, &tv); -- if (res < 0) { -- error("select(fh) failed: %s", strerror(errno)); -- close(fh); -- break; -- } else if (res == 0) { --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS -- info("connection closed due to inactivity"); -- close(fh); -- break; --#else -- continue; --#endif -- } -- in_len = read(fh, in, sizeof(in)); -- if (in_len > 0) { -+ -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); -+ /*Magic size of minimum TPM command is 6*/ -+ //FIXME Magic size check may not be required anymore -+ if (in_len < 6) { -+ info("Recv incomplete command of %d bytes.", in_len); -+ if (in_len <= 0) { -+ close(vtpm_rx_fh); -+ vtpm_rx_fh = -1; -+ continue; -+ } -+ } else { -+ /*Debug Printouts*/ - debug("received %d bytes", in_len); -+ debug_nostop("Recv[%d]: 0x", in_len); -+ for (i=0; i< in_len; i++) -+ debug_more("%x ", in[i]); -+ debug_more("\n"); -+ /*Multiple Guest check*/ -+ if (guest_id == -1) { -+ guest_id = *((int32_t *) in); -+ } else { -+ if (guest_id != *((int32_t *) in) ) { -+ error("WARNING: More than one guest attached\n"); -+ } -+ } -+ -+ /*Open tx handle now*/ -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_type == VTPM_TYPE_PVM) { -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); -+ } // No need to open the other direction for HVM -+#endif -+ } -+ if (vtpm_tx_fh < 0) { -+ error("Failed to open devices to respond to guest.\n"); -+ exit(-1); -+ } -+ -+ /*Handle the TPM command now*/ - out = NULL; -- res = tpm_handle_command(in, in_len, &out, &out_len); -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); - if (res < 0) { - error("tpm_handle_command() failed"); - } else { - debug("sending %d bytes", out_len); -+ //FIXME this prepending may or may not be needed -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); -+ *(uint32_t *) addressed_out = *(uint32_t *) in; -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); -+ out_len += sizeof(uint32_t); -+ /*End Prepend*/ -+ -+ /*Perform write operation now*/ - while (out_len > 0) { -- res = write(fh, out, out_len); -+ res = write(vtpm_tx_fh, addressed_out, out_len); -+ - if (res < 0) { - error("write(%d) failed: %s", out_len, strerror(errno)); - break; -- } -+ } else { -+ debug_nostop("Sent[%Zu]: ", out_len); -+ for (i=0; (unsigned int)i< out_len; i++) -+ debug_more("%x ", addressed_out[i]); -+ debug_more("\n"); -+ } - out_len -= res; - } - tpm_free(out); -+ tpm_free(addressed_out); - } - } - } while (in_len > 0); -- close(fh); -+ //close(fh); - } -+ - /* shutdown tpm emulator */ - tpm_emulator_shutdown(); -- /* close socket */ -- close(sock); -- unlink(opt_socket_name); -+ /* Close handles */ -+ close(vtpm_tx_fh); -+#ifndef VTPM_MULTI_VM -+ close(vtpm_rx_fh); -+ free(vtpm_rx_file); -+#endif - info("main loop stopped"); - } - -@@ -450,12 +770,13 @@ int main(int argc, char **argv) - /* open random device */ - init_random(); - /* init signal handlers */ -- init_signal_handler(); -+ //init_signal_handler(); - /* unless requested otherwiese, fork and daemonize process */ -- if (!opt_foreground) daemonize(); -+ //if (!opt_foreground) daemonize(); - /* start main processing loop */ - main_loop(); - info("stopping TPM Emulator daemon"); - closelog(); - return 0; - } -+ -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 -@@ -29,23 +29,28 @@ - - /* TPM emulator configuration */ - --#undef TPM_STRONG_PERSISTENCE --#undef TPM_GENERATE_EK -+#define TPM_STRONG_PERSISTENCE -+#define TPM_GENERATE_EK - #undef TPM_GENERATE_SEED_DAA - #undef TPM_MEMORY_ALIGNMENT_MANDATORY - -+extern int dmi_id; -+ - /* log macros */ - - void tpm_log(int priority, const char *fmt, ...); - --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) - - /* min/max macros that also do strict type-checking */ - diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch deleted file mode 100644 index e896b25..0000000 --- a/tools/vtpm/vtpm.patch +++ /dev/null @@ -1,716 +0,0 @@ -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 -@@ -1,3 +1,3 @@ - Mario Strasser - Heiko Stamer [DAA] --INTEL Corp <> [Dropped to Ring3] -+INTEL Corp <> [VTPM Extensions] -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 -@@ -1,5 +1,6 @@ - ????-??-?? Intel Corp - * Moved module out of kernel to run as a ring 3 app -+ * Modified save_to_file and load_from_file to call xen VTPM manager - - 2006-06-23 Mario Strasser - * tpm_startup.c: behaviour of ST_CLEAR and storage of -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 -@@ -44,18 +44,26 @@ - #define TPM_DEVICE_NAME "tpm" - #define TPM_MODULE_NAME "tpm_emulator" - -+/* debug and log output functions */ -+extern int dmi_id; -+ - #ifdef DEBUG --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) - #else - #define debug(fmt, ...) -+#define debug_nostop(fmt, ...) -+#define debug_more(fmt, ...) - #endif --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ -- __FILE__, __LINE__, ## __VA_ARGS__) -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) - - /* memory allocation */ - -diff -uprN tpm_emulator/Makefile vtpm/Makefile ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 -@@ -7,7 +7,7 @@ - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) - - # module settings --BIN := tpm_emulator -+BIN := vtpmd - VERSION_MAJOR := 0 - VERSION_MINOR := 4 - VERSION_BUILD := $(shell date +"%s") -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - CC := gcc - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG --CFLAGS += -I. -Itpm -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager - - # Is the simulator running in it's own vm? - #CFLAGS += -DVTPM_MULTI_VM -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt - - install: $(BIN) - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi - - clean: - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) -@@ -98,3 +97,4 @@ version: - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h - - .PHONY: all install clean dist gmp version -+ -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_TIS_TIMEOUT: - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ -- return TPM_FAIL; -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ -+ UINT32 len = *respSize = 16; -+ BYTE *ptr = *resp = tpm_malloc(*respSize); -+ if (ptr == NULL || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000) || -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { -+ tpm_free(*resp); -+ return TPM_FAIL; -+ } -+ return TPM_SUCCESS; - - case TPM_CAP_PROP_STARTUP_EFFECT: - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su - - case TPM_CAP_PROP_DURATION: - debug("[TPM_CAP_PROP_DURATION]"); -- /* TODO: TPM_CAP_PROP_DURATION */ -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; -+ *respSize = 16; -+ *resp = tpm_malloc(*respSize); -+ memcpy(*resp,dur,16); - return TPM_FAIL; - - case TPM_CAP_PROP_ACTIVE_COUNTER: -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO - sha1_ctx_t sha1; - UINT32 res = CPU_TO_BE32(rsp->result); - UINT32 ord = CPU_TO_BE32(ordinal); -+ UINT32 offset = 0; - - /* compute SHA1 hash */ - sha1_init(&sha1); - sha1_update(&sha1, (BYTE*)&res, 4); - sha1_update(&sha1, (BYTE*)&ord, 4); -- sha1_update(&sha1, rsp->param, rsp->paramSize); -+ if (ordinal == TPM_ORD_LoadKey2) { -+ offset = 4; -+ } -+ if (rsp->paramSize - offset > 0) { -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); -+ } - sha1_final(&sha1, rsp->auth1->digest); - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, - rsp->auth1->digest, sizeof(rsp->auth1->digest)); -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 -@@ -1,6 +1,7 @@ - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux - * Copyright (C) 2004 Mario Strasser , - * Swiss Federal Institute of Technology (ETH) Zurich -+ * Copyright (C) 2005 INTEL Corp - * - * This module is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published -@@ -15,10 +16,15 @@ - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ - */ - -+#include -+#include -+#include -+#include -+ - #include "tpm_emulator.h" - #include "tpm_structures.h" - #include "tpm_marshalling.h" --#include "linux_module.h" -+#include "vtpm_manager.h" - - TPM_DATA tpmData; - -@@ -158,45 +164,232 @@ void tpm_release_data(void) - #include - #include - #include --#include - --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+ -+#ifdef VTPM_MUTLI_VM -+ #define DEV_FE "/dev/tpm" -+#else -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -+ -+ extern int dmi_id; -+ static char *vtpm_rx_name=NULL; -+#endif - - static int write_to_file(uint8_t *data, size_t data_length) - { -- int res; -- int fp; -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); -- res = write(fp, data, data_length); -- close(fp); -- return (res == data_length) ? 0 : -1; -+ int res, out_data_size, in_header_size; -+ BYTE *ptr, *out_data, *in_header; -+ UINT32 result, len, in_rsp_size; -+ UINT16 tag = VTPM_TAG_REQ; -+ -+ printf("Saving NVM\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; -+#endif -+ -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { -+ free(out_data); -+ return -1; -+ } -+ -+ printf("\tSending SaveNVM Command.\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); -+ } -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading SaveNVM header.\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_tx_fh); close(vtpm_rx_fh); -+#endif -+ -+ printf("\tFinishing up SaveNVM\n"); -+ return (0); - } - - static int read_from_file(uint8_t **data, size_t *data_length) - { -- int res; -- int fp, file_status; -- struct stat file_info; -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); -- file_status = fstat(fp, &file_info); -- if (file_status < 0) { -- close(fp); -- return -1; -- } -+ int res, out_data_size, in_header_size; -+ uint8_t *ptr, *out_data, *in_header; -+ UINT16 tag = VTPM_TAG_REQ; -+ UINT32 len, in_rsp_size, result; -+#ifdef VTPM_MUTLI_VM -+ int vtpm_rx_fh, vtpm_tx_fh; -+#endif -+ -+ printf("Loading NVM.\n"); -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); -+#else -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); -+#endif -+ } - -- *data_length = file_info.st_size; -- *data = tpm_malloc(*data_length); -- if (*data == NULL) { -- close(fp); -+ if (vtpm_tx_fh < 0) { -+ return -1; -+ } -+ -+ // Send request to VTPM Manager to encrypt data -+#ifdef VTPM_MUTLI_VM -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ out_data = ptr = (BYTE *) malloc(len); -+ -+ if (ptr == NULL -+#ifndef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) -+#endif -+ || tpm_marshal_UINT16(&ptr, &len, tag) -+#ifdef VTPM_MUTLI_VM -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) -+#else -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) -+#endif -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { -+ free(out_data); - return -1; - } -- res = read(fp, *data, *data_length); -- close(fp); -+ -+ printf("\tSending LoadNVM command\n"); -+ res = write(vtpm_tx_fh, out_data, out_data_size); -+ free(out_data); -+ if (res != out_data_size) return -1; -+ -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (vtpm_rx_name == NULL) { -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); -+ } -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); -+#endif -+ } -+ -+ if (vtpm_rx_fh < 0) { -+ return -1; -+ } -+ -+ // Read Header of response so we can get the size & status -+#ifdef VTPM_MUTLI_VM -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; -+#else -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; -+#endif -+ in_header = ptr = malloc(in_header_size); -+ -+ printf("\tReading LoadNVM header\n"); -+ res = read(vtpm_rx_fh, in_header, in_header_size); -+ -+ if ( (res != in_header_size) -+#ifndef VTPM_MUTLI_VM -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) -+#endif -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { -+ free(in_header); -+ return -1; -+ } -+ free(in_header); -+ -+ if (result != VTPM_SUCCESS) { -+ return -1; -+ } -+ -+ // Read Encrypted data from VTPM Manager -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; -+ *data = (uint8_t *) malloc(*data_length); -+ -+ printf("\tReading clear data from LoadNVM.\n"); -+ res = read(vtpm_rx_fh, *data, *data_length); -+#ifdef VTPM_MUTLI_VM -+ close(vtpm_rx_fh);close(vtpm_tx_fh); -+#endif -+ -+ printf("\tReturing from loading NVM\n"); - if (res != *data_length) { -- tpm_free(*data); -- return -1; -+ free(*data); -+ return -1; -+ } else { -+ return 0; - } -- return 0; -+ - } - - #else -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 -@@ -21,12 +21,24 @@ - #include - #include - #include -+#include -+#include -+#include - - #include "tpm_emulator.h" -+#include "vtpm_manager.h" - --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" -+#ifdef VTPM_MULTI_VM -+ #define DEV_BE "/dev/vtpm" -+#else -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" - -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" -+#endif -+ -+ int dmi_id; -+ - #define BUFFER_SIZE 2048 - - static int devurandom=0; -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby - } - - if (read(devurandom, buf, nbytes) != nbytes) { -- printf("Can't get random number.\n"); -+ error("Can't get random number.\n"); - exit(-1); - } - } -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) - - int main(int argc, char **argv) - { -- uint8_t in[BUFFER_SIZE], *out; -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; -+ char *vtpm_rx_file=NULL; - uint32_t out_size; - int in_size, written; -- int i; -- struct stat file_info; -+ int i, guest_id=-1; - -- int tpm_tx_fh=-1, tpm_rx_fh=-1; -+#ifndef VTPM_MULTI_VM -+ int sockfd = -1; -+ struct sockaddr_un addr; -+ struct sockaddr_un client_addr; -+ unsigned int client_length; -+ -+#endif -+ -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; -+#ifdef VTPM_MULTI_VM - if (argc < 2) { -- printf("Usage: tpmd clear|save|deactivated\n" ); -+ error("Usage: tpmd clear|save|deactivated\n" ); -+#else -+ if (argc < 4) { -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); -+#endif - return -1; - } - -+#ifndef VTPM_MULTI_VM -+ /* setup type of vm */ -+ if (!strcmp(argv[2], "pvm")) { -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo -+ } else if (!strcmp(argv[2], "hvm")) { -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket -+ } else { -+ error("invalid vTPM type '%s'.\n", argv[2]); -+ } -+ -+ dmi_id = atoi(argv[3]); -+ -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); -+ } else { -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); -+ -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { -+ error("Unable to create socket. errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&addr, 0, sizeof(addr)); -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path,vtpm_rx_file ); -+ unlink(addr.sun_path); -+ } -+#endif -+ -+#ifdef VTPM_MULTI_VM -+ info("Initializing tpm state: %s\n", argv[1]); -+#else -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); -+#endif -+ - /* initialize TPM emulator */ - if (!strcmp(argv[1], "clear")) { -- printf("Initializing tpm: %s\n", argv[1]); - tpm_emulator_init(1); -- } else if (!strcmp(argv[1], "save")) { -- printf("Initializing tpm: %s\n", argv[1]); -+ } else if (!strcmp(argv[1], "save")) { - tpm_emulator_init(2); - } else if (!strcmp(argv[1], "deactivated")) { -- printf("Initializing tpm: %s\n", argv[1]); - tpm_emulator_init(3); - } else { -- printf("invalid startup mode '%s'; must be 'clear', " -+ error("invalid startup mode '%s'; must be 'clear', " - "'save' (default) or 'deactivated", argv[1]); - return -1; - } -- -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); -- return -1; -- } -- } -- -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); -- return -1; -- } -- } -- -+ - while (1) { - abort_command: -- if (tpm_rx_fh < 0) { -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); -+ if (vtpm_rx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); -+#else -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); -+ } else { -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { -+ error("Unable to bind(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ if (listen(sockfd, 10) <0) { -+ error("Unable to listen(). errno = %d\n", errno); -+ exit (-1); -+ } -+ -+ memset(&client_addr, 0, sizeof(client_addr)); -+ client_length = sizeof(client_addr); -+ -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); -+ } -+#endif - } - -- if (tpm_rx_fh < 0) { -- printf("ERROR: failed to open devices to listen to guest.\n"); -+ if (vtpm_rx_fh < 0) { -+ error("Failed to open devices to listen to guest.\n"); - return -1; - } - -- if (tpm_tx_fh < 0) { -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); -- } -- -- if (tpm_tx_fh < 0) { -- printf("ERROR: failed to open devices to respond to guest.\n"); -- return -1; -- } -- -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); - if (in_size < 6) { // Magic size of minium TPM command -- printf("Recv[%d] to small: 0x", in_size); -+ info("Recv incomplete command of %d bytes.", in_size); - if (in_size <= 0) { -- close(tpm_rx_fh); -- tpm_rx_fh = -1; -+ close(vtpm_rx_fh); -+ vtpm_rx_fh = -1; - goto abort_command; - } - } else { -- printf("Recv[%d]: 0x", in_size); -+ debug_nostop("Recv[%d]: 0x", in_size); - for (i=0; i< in_size; i++) -- printf("%x ", in[i]); -- printf("\n"); -+ debug_more("%x ", in[i]); -+ debug_more("\n"); - } - -- -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { -- printf("ERROR: Handler Failed.\n"); -+ if (guest_id == -1) { -+ guest_id = *((uint32_t *) in); -+ } else { -+ if (guest_id != *((uint32_t *) in) ) { -+ error("WARNING: More than one guest attached\n"); -+ } -+ } -+ -+ if (vtpm_tx_fh < 0) { -+#ifdef VTPM_MUTLI_VM -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); -+ vtpm_rx_fh = vtpm_tx_fh; -+#else -+ if (type == VTPM_TYPE_PVM) { -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); -+ } // No need to open the other direction for HVM -+#endif -+ } -+ -+ if (vtpm_tx_fh < 0) { -+ error("Failed to open devices to respond to guest.\n"); -+ return -1; -+ } -+ -+ // Handle the command, but skip the domain id header -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { -+ error("Handler Failed.\n"); - } - -- written = write(tpm_tx_fh, out, out_size); -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); -+ *(uint32_t *) addressed_out = *(uint32_t *) in; -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); -+ -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); - -- if (written != out_size ) { -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); -+ if (written != out_size + sizeof(uint32_t)) { -+ error("Part of response not written %d/%d.\n", written, out_size); - } else { -- printf("Sent[%Zu]: ", out_size); -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) -+ debug_more("%x ", addressed_out[i]); -+ debug_more("\n"); - } -- for (i=0; i< out_size; i++) -- printf("%x ", out[i]); -- printf("\n"); - tpm_free(out); -+ tpm_free(addressed_out); - - } // loop - - tpm_emulator_shutdown(); - -- close(tpm_tx_fh); -- close(tpm_rx_fh); -+ close(vtpm_tx_fh); -+#ifndef VTPM_MUTLI_VM -+ close(vtpm_rx_fh); -+ free (vtpm_rx_file); -+#endif - - } diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING deleted file mode 100644 index c4b86b7..0000000 --- a/tools/vtpm_manager/COPYING +++ /dev/null @@ -1,32 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile deleted file mode 100644 index 632f41b..0000000 --- a/tools/vtpm_manager/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. - -# Base definitions and rules -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -SUBDIRS = crypto tcs util manager migration -OPENSSL_HEADER = /usr/include/openssl/crypto.h - -.PHONY: all clean install -all clean install: %: subdirs-% - -.PHONY: mrproper -mrproper: - @set -e; for subdir in $(SUBDIRS); do \ - $(MAKE) -C $$subdir $@; \ - done - - diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README deleted file mode 100644 index f0d1e98..0000000 --- a/tools/vtpm_manager/README +++ /dev/null @@ -1,94 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -Directory Structure -=================== -tools/vtpm_manager/crypto -> crypto files -tools/vtpm_manager/TCS -> TCS implementation -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. -tools/vtpm_manager/manager -> VTPM Manager - -Compile Flags -=================== -LOGGING_MODULES -> How extensive logging happens - see util/log.h for more info - -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs - Not Defined (default): VTPMs are processes - -# Debugging flags that may disappear without notice in the future - -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and - /tmp/out.fifo rather than backend - -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs - -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, - use a well known value. This is useful for debugging and for - poor bios which do not support clearing TPM if OwnerAuth is - lost. However this has no protection from malicious app - issuing a TPM_OwnerClear to wipe the TPM - -Requirements -============ -- xen-unstable -- vtpm frontend/backend driver patch -- OpenSSL Library - -Single-VM Flow -============================ -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. -- VTPM Manager listens to TPM BE. -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. -- When the manager receives the open message from the BE, it launches a vtpm -- Xend allows the VM to continue booting. -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. -- The fifo listener begins listening for the reply from vtpm for the request. -- Vtpm processes request and replies to manager over shared named fifo. -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. - -NOTES: -* SaveService SHOULD seal it's table before saving it to disk. However, - the current Xen infrastructure does not provide a mechanism for this to be - unsealed later. Specifically, the auth and wrapped key must be available ONLY - to the service, or it's not even worth encrypting - - In the future the vtpm manager will be protected by an early boot mechanism - that will allow for better protection of it's data. - -TODO: -- Timeout on crashed vtpms -- create lock for shared fifo for talking to vtpms. diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk deleted file mode 100644 index 651772b..0000000 --- a/tools/vtpm_manager/Rules.mk +++ /dev/null @@ -1,59 +0,0 @@ -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) -include $(XEN_ROOT)/tools/Rules.mk - -# -# Tool definitions -# - -# General compiler flags -CFLAGS = -Werror -g3 - -# Generic project files -HDRS = $(wildcard *.h) -SRCS = $(wildcard *.c) -OBJS = $(patsubst %.c,%.o,$(SRCS)) - -# Generic (non-header) dependencies -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -$(OBJS): $(SRCS) - --include $(FILES) - -# Make sure these are just rules -.PHONY : all build install clean - -# -# Project-specific definitions -# - -# Need UNIX98 spec for pthread rwlocks -CFLAGS += -D_GNU_SOURCE - -# Logging Level. See utils/tools.h for usage -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" - -# Silent Mode -#CFLAGS += -DLOGGING_MODULES=0x0 -#CFLAGS += -DLOGGING_MODULES=0xff - -# Use frontend/backend pairs between manager & DMs? -#CFLAGS += -DVTPM_MULTI_VM - -# vtpm_manager listens on fifo's rather than backend -#CFLAGS += -DDUMMY_BACKEND - -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos -#CFLAGS += -DDUMMY_TPM - -# Do not have manager launch DMs. -#CFLAGS += -DMANUAL_DM_LAUNCH - -# Fixed OwnerAuth -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH - -# Include -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile deleted file mode 100644 index 13b61c9..0000000 --- a/tools/vtpm_manager/crypto/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libtcpaCrypto.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c deleted file mode 100644 index 7dae655..0000000 --- a/tools/vtpm_manager/crypto/crypto.c +++ /dev/null @@ -1,88 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// crypto.c -// -// This file will handle all the TPM Crypto functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include "crypto.h" -#include "log.h" - -/** - * Initialize cryptography library - * @rand: random seed - * @size: size of @rand - */ -void Crypto_Init(const BYTE* rand, int size) { - ERR_load_crypto_strings(); - CRYPTO_malloc_init(); - OpenSSL_add_all_algorithms(); - SYM_CIPHER = EVP_aes_128_cbc(); - RAND_poll(); - if (rand == NULL) - return; - - RAND_add(rand, size, size); -} - -/** - * Shutdown cryptography library - */ -void Crypto_Exit() { - ERR_free_strings(); - ERR_remove_state(0); - EVP_cleanup(); -} - - -/** - * Get random data - * @data: (OUT) Random data - * @size: Size of @data - */ -void Crypto_GetRandom(void* data, int size) { - int result; - - result = RAND_pseudo_bytes((BYTE*) data, size); - - if (result <= 0) - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", - ERR_error_string (ERR_get_error(), NULL)); -} diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h deleted file mode 100644 index 488d4d6..0000000 --- a/tools/vtpm_manager/crypto/crypto.h +++ /dev/null @@ -1,175 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// crypto.h -// -// This file defines the TPM Crypto API -// -// ================================================================== - -#ifndef __CRYPTO_H__ -#define __CRYPTO_H__ - -#include -#include -#include - -#include "tcg.h" -#include "sym_crypto.h" - -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes - -#define OAEP_P "TCPA" -#define OAEP_P_SIZE 4 - -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID -#define CRYPTO_ALGORITH_RSA 0x01 - -// Supported Encryption Schemes CRYPTO_INFO.encScheme -#define CRYPTO_ES_NONE 0x0001 -#define CRYPTO_ES_RSAESPKCSv15 0x0002 -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 - -// Supported Signature schemes CRYPTO_INFO.sigScheme -#define CRYPTO_SS_NONE 0x0001 -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 - -typedef struct CRYPTO_INFO { - void *keyInfo; - UINT32 algorithmID; - UINT32 encScheme; - UINT32 sigScheme; -} CRYPTO_INFO; - - -void Crypto_Init(const BYTE* rand, int size); - -void Crypto_Exit(); - -void Crypto_GetRandom(void* data, int size); - -void Crypto_HMAC( const BYTE* text, - int text_len, - const BYTE* key, - int key_len, - BYTE* digest); - -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, - const buffer_t * key, - BYTE * o_digest); /* presumably of 20 bytes */ - -void Crypto_SHA1Full( const BYTE* text, - UINT32 size, - BYTE* hash); //Complete 3part SHA1 - -// o_hash needs to be large enough to hold the digest, ie 20 bytes -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, - BYTE * o_hash); - -void Crypto_SHA1Start(UINT32* maxNumBytes); -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); -void Crypto_SHA1Complete( int hashDataSize, - const BYTE* hashData, - BYTE* hashValue); - -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, - /*in*/ UINT32 pubExpSize, - /*in*/ BYTE *pubExp, - /*out*/ UINT32 *privExpSize, - /*out*/ BYTE *privExp, - /*out*/ UINT32 *modulusSize, - /*out*/ BYTE *modulus, - /*out*/ CRYPTO_INFO *keys); - -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 privExpSize, - /*[IN]*/ BYTE *privExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); - -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo); - -// -// symmetric pack and unpack operations -// -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, - BYTE ** io_buf, UINT32 * io_buflen); - -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, - BYTE * in, UINT32 len, - UINT32 * o_lenread); - - -// return 0 on success, -1 on error -int Crypto_RSAEnc( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData); - -// return 0 on success, -1 on error -int Crypto_RSADec( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData); - -// return 0 on success, -1 on error -int Crypto_RSASign( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *sigSize, - /*out*/ BYTE *sig); - -bool Crypto_RSAVerify( CRYPTO_INFO *keys, - UINT32 inDataSize, - BYTE *inData, - UINT32 sigSize, - BYTE *sig); - -//private: -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); - -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); - -#endif // __CRYPTO_H__ diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c deleted file mode 100644 index c73114a..0000000 --- a/tools/vtpm_manager/crypto/hash.c +++ /dev/null @@ -1,153 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// hash.c -// -// This file will handle all the TPM Hash functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tcg.h" // for TPM_SUCCESS -#include "crypto.h" - -static SHA_CTX g_shaContext; - -void Crypto_HMAC( const BYTE* text, - int text_len, - const BYTE* key, - int key_len, - BYTE* digest) { - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) - return; - - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); -} - -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, - const buffer_t * key, - BYTE * o_digest) { /* presumably of 20 bytes */ - - Crypto_HMAC (text->bytes, text->size, - key->bytes, key->size, - o_digest); - - return TPM_SUCCESS; -} - - -/* - * SHA1 - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally - */ -void Crypto_SHA1Full( const BYTE* text, - uint32_t size, - BYTE* hash) { - - if (text == NULL || size == 0) - return; - - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete - uint32_t maxBytes; // Not used for anything - Crypto_SHA1Start(&maxBytes); - - while (size > 64){ - Crypto_SHA1Update(64, text); - size -= 64; - text += 64; - } - - Crypto_SHA1Complete(size, text, hash); -} - -// same thing using buffer_t -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, - BYTE * o_digest) { - - if (buf->bytes == NULL || buf->size == 0) - return TPM_BAD_PARAMETER; - - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); - - return TPM_SUCCESS; -} - - -/* - * Initialize SHA1 - * (OUT) Maximum number of bytes that can be sent to SHA1Update. - * Must be a multiple of 64 bytes. - */ -void Crypto_SHA1Start(uint32_t* maxNumBytes) { - int max = SHA_CBLOCK; - // Initialize the crypto library - SHA1_Init(&g_shaContext); - *maxNumBytes = max; -} - -/* - * Process SHA1 - * @numBytes: (IN) The number of bytes in hashData. - * Must be a multiple of 64 bytes. - * @hashData: (IN) Bytes to be hashed. - */ -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { - - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) - return; - - SHA1_Update(&g_shaContext, hashData, numBytes); -} - -/* - * Complete the SHA1 process - * @hashDataSize: (IN) Number of bytes in hashData. - * Must be a multiple of 64 bytes. - * @hashData: (IN) Final bytes to be hashed. - * @hashValue: (OUT) The output of the SHA-1 hash. - */ -void Crypto_SHA1Complete(int hashDataSize, - const BYTE* hashData, - BYTE* hashValue) { - SHA1_Update(&g_shaContext, hashData, hashDataSize); - SHA1_Final(hashValue, &g_shaContext); -} diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c deleted file mode 100644 index 7737dc6..0000000 --- a/tools/vtpm_manager/crypto/rsa.c +++ /dev/null @@ -1,434 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// rsa.c -// -// This file will handle all the TPM RSA crypto functionality -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "crypto.h" -#include "log.h" - -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, - /*in*/ UINT32 pubExpSize, - /*in*/ BYTE *pubExp, - /*out*/ UINT32 *privExpSize, - /*out*/ BYTE *privExp, - /*out*/ UINT32 *modulusSize, - /*out*/ BYTE *modulus, - /*out*/ CRYPTO_INFO *keys) { - unsigned long e_value; - - if (pubExpSize == 0) // Default e = 2^16+1 - e_value = (0x01 << 16) + 1; - else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - e_value = (0x01 << 16) + 1; - } - - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); - - if (keys) { - keys->keyInfo = rsa; - keys->algorithmID = CRYPTO_ALGORITH_RSA; - } - - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); -} - -// Create a CRYPTO_INFO struct from the BYTE * key parts. -// If pubExp info is NULL, use TCG default. -// If there is a remainder while calculating the privExp, return FALSE. - -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 privExpSize, - /*[IN]*/ BYTE *privExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo) { - cryptoInfo->keyInfo = RSA_new(); - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - rsa->e = BN_new(); - - if (pubExpSize == 0) { // Default e = 2^16+1 - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } - - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); -} - -// Create a CRYPTO_INFO struct from the BYTE * key parts. -// If pubExp info is NULL, use TCG default. -// If there is a remainder while calculating the privExp, return FALSE. - -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, - /*[IN]*/ BYTE *pubExp, - /*[IN]*/ UINT32 modulusSize, - /*[IN]*/ BYTE *modulus, - CRYPTO_INFO* cryptoInfo) { - cryptoInfo->keyInfo = RSA_new(); - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - rsa->e = BN_new(); - - if (pubExpSize == 0) { // Default e = 2^16+1 - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } else { - // This is not supported, but the following line MIGHT work - // under then assumption that the format is BigNum compatable - // Though it's not in the spec, so who knows what it is. - // Forcing the default. - //BN_bin2bn(pubExp, pubExpSize, NULL); - BN_set_bit(rsa->e, 16); - BN_set_bit(rsa->e, 0); - } - - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); - -} - -int Crypto_RSAEnc( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData) { - RSA *rsa = (RSA *) key->keyInfo; - UINT32 paddedDataSize = RSA_size (rsa); - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); - int rc; - - if (paddedData == NULL) - return -1; - - *outDataSize = 0; - - switch (key->encScheme) { - case CRYPTO_ES_RSAESPKCSv15: - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { - rc = -1; - goto abort_egress; - } - break; - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { - rc = -1; - goto abort_egress; - } - break; - default: - rc = -1; - goto abort_egress; - } - - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); - if (rc == -1) - goto abort_egress; - - *outDataSize = rc; - - if (rc > 0) rc = 0; - - goto egress; - - abort_egress: - egress: - - if (paddedData) - free (paddedData); - return rc; - -} - -int Crypto_RSADec( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *outDataSize, - /*out*/ BYTE *outData) { - - RSA *rsa = (RSA *) key->keyInfo; - UINT32 paddedDataSize = RSA_size (rsa); - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); - int rc; - - if (paddedData == NULL) - goto abort_egress; - - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - - paddedDataSize = rc; - - switch (key->encScheme) { - case CRYPTO_ES_RSAESPKCSv15: - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, - paddedData + 1, paddedDataSize - 1, - RSA_size(rsa)); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", - ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - *outDataSize = rc; - break; - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, - paddedData + 1, paddedDataSize - 1, - RSA_size(rsa), - (BYTE *) OAEP_P, OAEP_P_SIZE); - if (rc == -1) { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", - ERR_error_string(ERR_get_error(), NULL)); - goto abort_egress; - } - *outDataSize = rc; - break; - default: - *outDataSize = 0; - } - - free(paddedData); paddedData = NULL; - goto egress; - - abort_egress: - - if (paddedData) - free (paddedData); - return -1; - - egress: - return 0; -} - -// Signs either a SHA1 digest of a message or a DER encoding of a message -// Textual messages MUST be encoded or Hashed before sending into this function -// It will NOT SHA the message. -int Crypto_RSASign( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - /*out*/ UINT32 *sigSize, - /*out*/ BYTE *sig) { - int status; - unsigned int intSigSize; - - switch(key->sigScheme) { - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); - break; - case CRYPTO_SS_RSASSAPKCS1v15_DER: - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); - status = 0; - break; - default: - status = 0; - } - - if (status == 0) { - *sigSize = 0; - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); - return -1; - } - - *sigSize = (UINT32) intSigSize; - return 0; -} - -bool Crypto_RSAVerify( CRYPTO_INFO *key, - UINT32 inDataSize, - BYTE *inData, - UINT32 sigSize, - BYTE *sig) { - int status; - - switch(key->sigScheme){ - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); - break; - case CRYPTO_SS_RSASSAPKCS1v15_DER: - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); - status = 0; - break; - default: - status = 0; - } - - if (status) - return(1); - else { - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); - return(0); - } - -} - -// helper which packs everything into a BIO! - -// packs the parameters first, then the private key, then the public key -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in -// *io_buflen -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, - BYTE ** io_buf, UINT32 * io_buflen) { - TPM_RESULT status = TPM_SUCCESS; - BYTE * buf; - long len, outlen = *io_buflen; - - const long PARAMSLEN = 3*sizeof(UINT32); - - RSA *rsa = (RSA *) cryptoInfo->keyInfo; - - BIO *mem = BIO_new(BIO_s_mem()); - - - // write the openssl keys to the BIO - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_SIZE); - } - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_SIZE); - } - - // get the buffer out - len = BIO_get_mem_data (mem, &buf); - - // see if we need to allocate a return buffer - if (*io_buf == NULL) { - *io_buf = (BYTE*) malloc (PARAMSLEN + len); - if (*io_buf == NULL) - ERRORDIE (TPM_SIZE); - } else { // *io_buf is already allocated - if (outlen < len + PARAMSLEN) - ERRORDIE (TPM_SIZE); // but not large enough! - } - - // copy over the parameters (three UINT32's starting at algorithmID) - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); - - // copy over the DER keys - memcpy (*io_buf + PARAMSLEN, buf, len); - - *io_buflen = len + PARAMSLEN; - - goto egress; - - - abort_egress: - egress: - - BIO_free (mem); - - return status; -} - - - -// sets up ci, and returns the number of bytes read in o_lenread -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, - BYTE * in, UINT32 len, - UINT32 * o_lenread) { - - TPM_RESULT status = TPM_SUCCESS; - long l; - BIO *mem; - RSA *rsa; - - // first load up the params - l = 3 * sizeof(UINT32); - memcpy (&ci->algorithmID, in, l); - len -= l; - in += l; - - // and now the openssl keys, private first - mem = BIO_new_mem_buf (in, len); - - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_BAD_PARAMETER); - } - // now use the same RSA object and fill in the private key - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { - ERR_print_errors_fp (stderr); - ERRORDIE (TPM_BAD_PARAMETER); - } - - ci->keyInfo = rsa; // needs to be freed somehow later - - // FIXME: havent figured out yet how to tell how many bytes were read in the - // above oprations! so o_lenread is not set - - goto egress; - - abort_egress: - egress: - - BIO_free (mem); - - return status; -} diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c deleted file mode 100644 index 3d86e19..0000000 --- a/tools/vtpm_manager/crypto/sym_crypto.c +++ /dev/null @@ -1,237 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// sym_crypto.c -// -// Symmetric crypto portion of crypto -// -// ================================================================== - -#include -#include - -#include "tcg.h" -#include "sym_crypto.h" - -typedef enum crypt_op_type_t { - CRYPT_ENCRYPT, - CRYPT_DECRYPT -} crypt_op_type_t; - -TPM_RESULT ossl_symcrypto_op (symkey_t* key, - const buffer_t* in, - const buffer_t* iv, - buffer_t * out, - crypt_op_type_t optype); - - -// this is initialized in Crypto_Init() -const EVP_CIPHER * SYM_CIPHER = NULL; - -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; - - -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { - TPM_RESULT status = TPM_SUCCESS; - - EVP_CIPHER_CTX_init (&key->context); - - key->cipher = SYM_CIPHER; - - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); - - goto egress; - - abort_egress: - EVP_CIPHER_CTX_cleanup (&key->context); - - egress: - - return status; -} - - - -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { - int res; - TPM_RESULT status = TPM_SUCCESS; - - // hmm, EVP_CIPHER_CTX_init does not return a value - EVP_CIPHER_CTX_init (&key->context); - - key->cipher = SYM_CIPHER; - - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; - - // and generate the key material - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); - if (res < 0) - ERRORDIE (TPM_SHORTRANDOM); - - - goto egress; - - abort_egress: - EVP_CIPHER_CTX_cleanup (&key->context); - buffer_free (&key->key); - - egress: - return status; -} - - -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, - const buffer_t* clear, - buffer_t* o_cipher) { - TPM_RESULT status = TPM_SUCCESS; - - buffer_t iv, cipher_alias; - - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); - - buffer_init (o_cipher, - clear->size + - EVP_CIPHER_iv_length(key->cipher) + - EVP_CIPHER_block_size (key->cipher), - 0); - - // copy the IV into the front - buffer_copy (o_cipher, &iv); - - // make an alias into which we'll put the ciphertext - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); - - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); - - // set the output size correctly - o_cipher->size += cipher_alias.size; - - goto egress; - - abort_egress: - - egress: - - return status; - -} - - - -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, - const buffer_t* cipher, - buffer_t* o_clear) { - TPM_RESULT status = TPM_SUCCESS; - - buffer_t iv, cipher_alias; - - // alias for the IV - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); - - // make an alias to where the ciphertext is, after the IV - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); - - // prepare the output buffer - TPMTRYRETURN( buffer_init (o_clear, - cipher->size - - EVP_CIPHER_iv_length(key->cipher) - + EVP_CIPHER_block_size(key->cipher), - 0) ); - - // and decrypt - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); - - goto egress; - - abort_egress: - buffer_free (o_clear); - - egress: - - return status; -} - - - -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { - buffer_memset (&key->key, 0); - buffer_free (&key->key); - - EVP_CIPHER_CTX_cleanup (&key->context); - - return TPM_SUCCESS; -} - - -TPM_RESULT ossl_symcrypto_op (symkey_t* key, - const buffer_t* in, - const buffer_t* iv, - buffer_t * out, - crypt_op_type_t optype) { - TPM_RESULT status = TPM_SUCCESS; - - int inlen, outlen; - tpm_size_t running; - - if ( ! EVP_CipherInit_ex (&key->context, - key->cipher, NULL, key->key.bytes, iv->bytes, - optype == CRYPT_ENCRYPT ? 1 : 0) ) - ERRORDIE (TPM_FAIL); - - - - inlen = in->size; - - outlen = 0; - running = 0; - - - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) - ERRORDIE (TPM_FAIL); - - running += outlen; - - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) - ERRORDIE (TPM_FAIL); - - running += outlen; - - out->size = running; - - goto egress; - - abort_egress: - egress: - - return status; -} diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h deleted file mode 100644 index 7fb59a8..0000000 --- a/tools/vtpm_manager/crypto/sym_crypto.h +++ /dev/null @@ -1,72 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// sym_crypto.h -// -// Symmetric Crypto -// -// ================================================================== - -#ifndef _SYM_CRYPTO_H -#define _SYM_CRYPTO_H - -#include -#include "buffer.h" - -typedef struct symkey_t { - buffer_t key; - - EVP_CIPHER_CTX context; - const EVP_CIPHER * cipher; -} symkey_t; - -extern const EVP_CIPHER * SYM_CIPHER; - -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); - -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); - - -// these functions will allocate their output buffers -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, - const buffer_t* clear, - buffer_t* o_cipher); - -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, - const buffer_t* cipher, - buffer_t* o_clear); - -// only free the internal parts, not the 'key' ptr -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); - -#endif /* _SYM_CRYPTO_H */ diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile deleted file mode 100644 index a33c18a..0000000 --- a/tools/vtpm_manager/manager/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = vtpm_managerd - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ - fi - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ - fi - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: - rm -f $(BIN) - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -# libraries -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a -LIBS += -lcrypto $(PTHREAD_LIBS) -lm -CFLAGS += $(PTHREAD_CFLAGS) -LDFLAGS += $(PTHREAD_LDFLAGS) diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c deleted file mode 100644 index 5c3cf7e..0000000 --- a/tools/vtpm_manager/manager/dmictl.c +++ /dev/null @@ -1,266 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// dmictl.c -// -// Functions for creating and destroying DMIs -// -// ================================================================== - -#include -#include -#include - -#include "vtpmpriv.h" -#include "bsg.h" -#include "buffer.h" -#include "log.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "vtpm_ipc.h" - -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" - -// if dmi_res is non-null, then return a pointer to new object. -// Also, this does not fill in the measurements. They should be filled by -// design dependent code or saveNVM -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { - - TPM_RESULT status=TPM_SUCCESS; - VTPM_DMI_RESOURCE *new_dmi=NULL; - UINT32 *dmi_id_key=NULL; - - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { - status = TPM_RESOURCES; - goto abort_egress; - } - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); - new_dmi->dmi_id = dmi_id; - new_dmi->dmi_type = dmi_type; - new_dmi->connected = FALSE; - new_dmi->TCSContext = 0; - - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); - - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { - status = TPM_RESOURCES; - goto abort_egress; - } - *dmi_id_key = new_dmi->dmi_id; - - // install into map - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); - status = TPM_FAIL; - goto abort_egress; - } - - if (dmi_res) - *dmi_res = new_dmi; - - goto egress; - - abort_egress: - if (new_dmi) { - free(new_dmi->NVMLocation); - free(new_dmi); - } - free(dmi_id_key); - - egress: - return status; -} - -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { - if (dmi_res == NULL) - return TPM_SUCCESS; - - if (dmi_res->dmi_id == VTPM_CTL_DM) - return(TPM_BAD_PARAMETER); - - TCS_CloseContext(dmi_res->TCSContext); - dmi_res->connected = FALSE; - - vtpm_globals->connected_dmis--; - - return (VTPM_Close_DMI_Extra(dmi_res) ); -} - -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { - - VTPM_DMI_RESOURCE *new_dmi=NULL; - TPM_RESULT status=TPM_FAIL; - BYTE dmi_type, vm_type, startup_mode; - UINT32 dmi_id; - - if (param_buf == NULL) { // Assume creation of Dom 0 control - dmi_type = VTPM_TYPE_NON_MIGRATABLE; - dmi_id = VTPM_CTL_DM; - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } else { - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 - BSG_UnpackList( param_buf->bytes, 4, - BSG_TYPE_BYTE, &dmi_type, - BSG_TYPE_BYTE, &startup_mode, - BSG_TYPE_BYTE, &vm_type, - BSG_TYPE_UINT32, &dmi_id); - } - - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (new_dmi == NULL) { - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); - // Brand New DMI. Initialize the persistent pieces - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); - } else - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); - - if (new_dmi->connected) { - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Initialize the Non-persistent pieces - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); - - new_dmi->connected = TRUE; - - // Design specific new DMI code. - // Includes: create IPCs, Measuring DMI, and maybe launching DMI - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); - close_dmi(new_dmi ); - - egress: - return status; -} - -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *dmi_res=NULL; - UINT32 dmi_id; - - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - BSG_UnpackList( param_buf->bytes, 1, - BSG_TYPE_UINT32, &dmi_id); - - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); - - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (dmi_res == NULL ) { - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (!dmi_res->connected) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Close Dmi - TPMTRYRETURN(close_dmi( dmi_res )); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *dmi_res=NULL; - UINT32 dmi_id; - - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - BSG_UnpackList( param_buf->bytes, 1, - BSG_TYPE_UINT32, &dmi_id); - - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); - - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); - if (dmi_res == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - //vtpm scripts delete file dmi_res->NVMLocation for us - - // Close DMI first - TPMTRYRETURN(close_dmi( dmi_res )); - free ( dmi_res ); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c deleted file mode 100644 index 54da708..0000000 --- a/tools/vtpm_manager/manager/migration.c +++ /dev/null @@ -1,307 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// dmictl.c -// -// Functions for creating and destroying DMIs -// -// ================================================================== - -#include -#include -#include - -#include "vtpmpriv.h" -#include "bsg.h" -#include "buffer.h" -#include "log.h" -#include "hashtable.h" - -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *mig_dmi=NULL; - UINT32 dmi_id; - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; - - if (param_buf == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - struct pack_buf_t enc_dmi_state_pack; - - BSG_UnpackList(param_buf->bytes, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; - - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); - - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (mig_dmi) { - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** UnBind Blob **/ - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, - enc_dmi_state_pack.size, - enc_dmi_state_pack.data) ); - - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, - vtpm_globals->manager_tcs_handle, - vtpm_globals->storageKeyHandle, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - &clear_dmi_blob) ); - - // Create new dmi - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); - - /** Open Blob **/ - struct pack_buf_t dmi_state_pack; - - BSG_UnpackList(clear_dmi_blob.bytes, 2, - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, - BSG_TPM_SIZE32_DATA, &dmi_state_pack); - - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, - dmi_state_pack.size, - dmi_state_pack.data) ); - - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); - - egress: - buffer_free(&clear_dmi_blob); - buffer_free(&dmi_state_abuf); - - return status; -} - -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_DMI_RESOURCE *mig_dmi; - UINT32 dmi_id; - VTPM_MIGKEY_LIST *last_mig, *mig_key; - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; - - if (param_buf == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - struct pack_buf_t name_pack; - - BSG_UnpackList( param_buf->bytes, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_SIZE32_DATA, &name_pack); - - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); - - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); - if (mig_dmi == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** Find migration key for dest **/ - last_mig = NULL; - mig_key = vtpm_globals->mig_keys; - while (mig_key != NULL) { - if (mig_key->name_size == name_pack.size) - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { - break; - } - - last_mig = mig_key; - mig_key = mig_key->next; - } - - if (!mig_key) { - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /** Mark vtpm as migrated **/ - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; - - /** Build Blob **/ - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); - - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); - - struct pack_constbuf_t dmi_state_pack; - - dmi_state_pack.size = buffer_len(&dmi_state); - dmi_state_pack.data = dmi_state.bytes; - - BSG_PackList(clear_dmi_blob.bytes, 2, - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, - BSG_TPM_SIZE32_DATA, &dmi_state_pack); - - /** Bind Blob **/ - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, - &mig_key->key, - result_buf) ); - - if (last_mig) - last_mig->next = mig_key->next; - else - vtpm_globals->mig_keys = mig_key->next; - - free(mig_key->name); - free(mig_key); - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); - - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. - - egress: - - buffer_free(&clear_dmi_blob); - buffer_free(&dmi_state); - - return status; -} - - -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); - - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; - TPM_KEY mig_key; - - // Unpack/return key structure - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - mig_key.algorithmParms.parms, - &rsaKeyParms); - - pubkey_exp_pack.size = rsaKeyParms.exponentSize; - pubkey_exp_pack.data = rsaKeyParms.exponent; - pubkey_mod_pack.size = mig_key.pubKey.keyLength; - pubkey_mod_pack.data = mig_key.pubKey.key; - - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + - pubkey_exp_pack.size + - pubkey_mod_pack.size, NULL ) ); - - BSG_PackList( result_buf->bytes, 2, - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); - - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); - egress: - - return status; -} - -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf) { - - TPM_RESULT status=TPM_FAIL; - VTPM_MIGKEY_LIST *mig_key; - - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); - - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them - - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; - - //FIXME: scan list and verify name is not already in the list - - BSG_UnpackList( param_buf->bytes, 3, - BSG_TPM_SIZE32_DATA, &name_pack, - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); - - //TODO: Maintain a persistent list for pub_keys. - //TODO: Verify pub_key is trusted - - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); - mig_key->name_size = name_pack.size; - mig_key->name = name_pack.data; - - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, - pubkey_exp_pack.data, - pubkey_mod_pack.size, - pubkey_mod_pack.data, - &mig_key->key); - - - mig_key->next = vtpm_globals->mig_keys; - vtpm_globals->mig_keys = mig_key; - - // free(name_pack.data); Do not free. data is now part of mig_key. - free(pubkey_exp_pack.data); - free(pubkey_mod_pack.data); - - return TPM_SUCCESS; -} diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c deleted file mode 100644 index d5e6ffd..0000000 --- a/tools/vtpm_manager/manager/securestorage.c +++ /dev/null @@ -1,512 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// securestorage.c -// -// Functions regarding securely storing DMI secrets. -// -// ================================================================== - -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "crypto.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "buffer.h" -#include "log.h" - -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, - CRYPTO_INFO *asymkey, - buffer_t *sealed_data) { - TPM_RESULT status = TPM_SUCCESS; - symkey_t symkey; - buffer_t data_cipher = NULL_BUF, - symkey_cipher = NULL_BUF; - - UINT32 i; - struct pack_constbuf_t symkey_cipher32, data_cipher32; - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); - for (i=0; i< buffer_len(inbuf); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - // Generate a sym key and encrypt state with it - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); - - // Encrypt symmetric key - TPMTRYRETURN( VTSP_Bind( asymkey, - &symkey.key, - &symkey_cipher) ); - - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher - - symkey_cipher32.size = buffer_len(&symkey_cipher); - symkey_cipher32.data = symkey_cipher.bytes; - - data_cipher32.size = buffer_len(&data_cipher); - data_cipher32.data = data_cipher.bytes; - - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); - - BSG_PackList(sealed_data->bytes, 2, - BSG_TPM_SIZE32_DATA, &symkey_cipher32, - BSG_TPM_SIZE32_DATA, &data_cipher32); - - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); - for (i=0; i< buffer_len(sealed_data); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); - - egress: - - buffer_free ( &data_cipher); - buffer_free ( &symkey_cipher); - Crypto_symcrypto_freekey (&symkey); - - return status; -} - -TPM_RESULT envelope_decrypt(const buffer_t *cipher, - TCS_CONTEXT_HANDLE TCSContext, - TPM_HANDLE keyHandle, - const TPM_AUTHDATA *key_usage_auth, - buffer_t *unsealed_data) { - - TPM_RESULT status = TPM_SUCCESS; - symkey_t symkey; - buffer_t data_cipher = NULL_BUF, - symkey_clear = NULL_BUF, - symkey_cipher = NULL_BUF; - struct pack_buf_t symkey_cipher32, data_cipher32; - int i; - - memset(&symkey, 0, sizeof(symkey_t)); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); - for (i=0; i< buffer_len(cipher); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - BSG_UnpackList(cipher->bytes, 2, - BSG_TPM_SIZE32_DATA, &symkey_cipher32, - BSG_TPM_SIZE32_DATA, &data_cipher32); - - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, - symkey_cipher32.size, - symkey_cipher32.data) ); - - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, - data_cipher32.size, - data_cipher32.data) ); - - // Decrypt Symmetric Key - TPMTRYRETURN( VTSP_Unbind( TCSContext, - keyHandle, - &symkey_cipher, - key_usage_auth, - &symkey_clear, - &(vtpm_globals->keyAuth) ) ); - - // create symmetric key using saved bits - Crypto_symcrypto_initkey (&symkey, &symkey_clear); - - // Decrypt State - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); - for (i=0; i< buffer_len(unsealed_data); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); - - egress: - buffer_free ( &data_cipher); - buffer_free ( &symkey_clear); - buffer_free ( &symkey_cipher); - Crypto_symcrypto_freekey (&symkey); - - return status; -} - -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - int fh; - long bytes_written; - buffer_t sealed_NVM = NULL_BUF; - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); - - TPMTRYRETURN( envelope_encrypt(inbuf, - &vtpm_globals->storageKey, - &sealed_NVM) ); - - // Write sealed blob off disk from NVMLocation - // TODO: How to properly return from these. Do we care if we return failure - // after writing the file? We can't get the old one back. - // TODO: Backup old file and try and recover that way. - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); - status = TPM_IOERROR; - goto abort_egress; - } - close(fh); - - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); - - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); - - egress: - buffer_free(&sealed_NVM); - return status; -} - - -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - - buffer_t sealed_NVM = NULL_BUF; - long fh_size; - int fh, stat_ret, i; - struct stat file_stat; - TPM_DIGEST sealedNVMHash; - - if (myDMI->NVMLocation == NULL) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); - status = TPM_AUTHFAIL; - goto abort_egress; - } - - //Read sealed blob off disk from NVMLocation - fh = open(myDMI->NVMLocation, O_RDONLY); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - fh_size = file_stat.st_size; - else { - status = TPM_IOERROR; - goto abort_egress; - } - - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { - status = TPM_IOERROR; - goto abort_egress; - } - close(fh); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); - - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); - - // Verify measurement of sealed blob. - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); - for (i=0; i< sizeof(TPM_DIGEST); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); - for (i=0; i< sizeof(TPM_DIGEST); i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - - status = TPM_AUTHFAIL; - goto abort_egress; - } - - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, - myDMI->TCSContext, - vtpm_globals->storageKeyHandle, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - outbuf) ); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); - - egress: - buffer_free( &sealed_NVM ); - - return status; -} - - -TPM_RESULT VTPM_SaveManagerData(void) { - TPM_RESULT status=TPM_SUCCESS; - int fh, dmis=-1; - - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; - - struct hashtable_itr *dmi_itr; - VTPM_DMI_RESOURCE *dmi_res; - - UINT32 boot_key_size = 0, flat_dmis_size = 0; - - // Initially fill these with buffer sizes for each data type. Later fill - // in actual size, once flattened. - boot_key_size = sizeof(UINT32) + // bootkeysize - bootKeySize; // boot key - - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version - 3*sizeof(TPM_DIGEST) + // Auths - sizeof(UINT32) +// storagekeysize - storageKeySize, NULL) ); // storage key - - - flat_boot_key = (BYTE *) malloc( boot_key_size ); - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); - - boot_key_size = BSG_PackList(flat_boot_key, 1, - BSG_TPM_SIZE32_DATA, &boot_key_pack); - - BSG_PackList(clear_flat_global.bytes, 4, - BSG_TYPE_BYTE, &vtpm_manager_gen, - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, - BSG_TPM_SIZE32_DATA, &storage_key_pack); - - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, - &vtpm_globals->bootKey, - &enc_flat_global) ); - - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); - - // Per DMI values to be saved (if any exit) - if (hashtable_count(vtpm_globals->dmi_map) > 1) { - - flat_dmis = (BYTE *) malloc( - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info - - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); - do { - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); - dmis++; - - // No need to save dmi0. - if (dmi_res->dmi_id == 0) - continue; - - - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, - BSG_TYPE_UINT32, &dmi_res->dmi_id, - BSG_TYPE_BYTE, &dmi_res->dmi_type, - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); - - } while (hashtable_iterator_advance(dmi_itr)); - } - - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); - if (fh == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); - status = TPM_IOERROR; - goto abort_egress; - } - - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - goto egress; - - abort_egress: - egress: - - free(flat_boot_key); - free(flat_enc); - buffer_free(&enc_flat_global); - free(flat_dmis); - close(fh); - - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); - return status; -} - -TPM_RESULT VTPM_LoadManagerData(void) { - - TPM_RESULT status=TPM_SUCCESS; - int fh, stat_ret, dmis=0; - long fh_size = 0, step_size; - BYTE *flat_table=NULL; - buffer_t unsealed_data, enc_table_abuf; - struct pack_buf_t storage_key_pack, boot_key_pack; - UINT32 *dmi_id_key, enc_size; - BYTE vtpm_manager_gen; - - VTPM_DMI_RESOURCE *dmi_res; - UINT32 dmi_id; - BYTE dmi_type; - struct stat file_stat; - - TPM_HANDLE boot_key_handle; - TPM_AUTHDATA boot_usage_auth; - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); - - fh = open(STATE_FILE, O_RDONLY ); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - fh_size = file_stat.st_size; - else { - status = TPM_IOERROR; - goto abort_egress; - } - - flat_table = (BYTE *) malloc(fh_size); - - if ((long) read(fh, flat_table, fh_size) != fh_size ) { - status = TPM_IOERROR; - goto abort_egress; - } - - // Read Boot Key - step_size = BSG_UnpackList( flat_table, 2, - BSG_TPM_SIZE32_DATA, &boot_key_pack, - BSG_TYPE_UINT32, &enc_size); - - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); - - //Load Boot Key - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->bootKeyWrap, - &SRK_AUTH, - &boot_key_handle, - &vtpm_globals->keyAuth, - &vtpm_globals->bootKey, - FALSE) ); - - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, - vtpm_globals->manager_tcs_handle, - boot_key_handle, - (const TPM_AUTHDATA*) &boot_usage_auth, - &unsealed_data) ); - step_size += enc_size; - - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { - // Once there is more than one gen, this will include some compatability stuff - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); - } - - // Global Values needing to be saved - BSG_UnpackList( unsealed_data.bytes, 4, - BSG_TYPE_BYTE, &vtpm_manager_gen, - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, - BSG_TPM_SIZE32_DATA, &storage_key_pack); - - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); - - // Per DMI values to be saved - while ( step_size < fh_size ){ - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); - step_size = fh_size; - } else { - step_size += BSG_UnpackList(flat_table + step_size, 2, - BSG_TYPE_UINT32, &dmi_id, - BSG_TYPE_BYTE, &dmi_type); - - //TODO: Try and gracefully recover from problems. - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); - dmis++; - - step_size += BSG_UnpackList(flat_table + step_size, 2, - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); - } - - } - - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); - goto egress; - - abort_egress: - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); - egress: - - free(flat_table); - close(fh); - - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. - - return status; -} - diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c deleted file mode 100644 index 9b1e5f8..0000000 --- a/tools/vtpm_manager/manager/tpmpassthrough.c +++ /dev/null @@ -1,110 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tpmpassthrough.c -// -// Functions regarding passing DMI requests to HWTPM -// -// ================================================================== - -#include "tcg.h" -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "log.h" - -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, - buffer_t *inbuf, - buffer_t *outbuf) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE *ord; - - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); - - switch (*ord) { - - // Forbidden for DMI use - case TPM_ORD_TakeOwnership: - case TPM_ORD_ChangeAuthOwner: - case TPM_ORD_DirWriteAuth: - case TPM_ORD_DirRead: - case TPM_ORD_AuthorizeMigrationKey: - case TPM_ORD_CreateMaintenanceArchive: - case TPM_ORD_LoadMaintenanceArchive: - case TPM_ORD_KillMaintenanceFeature: - case TPM_ORD_LoadManuMaintPub: - case TPM_ORD_ReadManuMaintPub: - case TPM_ORD_SelfTestFull: - case TPM_ORD_SelfTestStartup: - case TPM_ORD_CertifySelfTest: - case TPM_ORD_ContinueSelfTest: - case TPM_ORD_GetTestResult: - case TPM_ORD_Reset: - case TPM_ORD_OwnerClear: - case TPM_ORD_DisableOwnerClear: - case TPM_ORD_ForceClear: - case TPM_ORD_DisableForceClear: - case TPM_ORD_GetCapabilityOwner: - case TPM_ORD_OwnerSetDisable: - case TPM_ORD_PhysicalEnable: - case TPM_ORD_PhysicalDisable: - case TPM_ORD_SetOwnerInstall: - case TPM_ORD_PhysicalSetDeactivated: - case TPM_ORD_SetTempDeactivated: - case TPM_ORD_CreateEndorsementKeyPair: - case TPM_ORD_GetAuditEvent: - case TPM_ORD_GetAuditEventSigned: - case TPM_ORD_GetOrdinalAuditStatus: - case TPM_ORD_SetOrdinalAuditStatus: - case TPM_ORD_SetRedirection: - case TPM_ORD_FieldUpgrade: - case TSC_ORD_PhysicalPresence: - status = TPM_DISABLED_CMD; - goto abort_egress; - break; - - } // End ORD Switch - - // Call TCS with command - - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); - - goto egress; - - abort_egress: - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); - egress: - - return status; -} diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c deleted file mode 100644 index 319dc83..0000000 --- a/tools/vtpm_manager/manager/vtpm_ipc.c +++ /dev/null @@ -1,141 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_ipc.c Implements ipc routines using file io. This file can -// be replaced with other ipc types. -// -// =================================================================== - -#include -#include "vtpm_ipc.h" -#include "vtpmpriv.h" -#include "log.h" - -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { - ipc_h->name = name; - ipc_h->flags = flags; - ipc_h->fh = VTPM_IPC_CLOSED; - - if (create) - return(vtpm_ipc_create(ipc_h)); - else - return 0; -} - -// Create the file that needs opening. Used only for FIFOs -// FYI: This may cause problems in other file IO schemes. We'll see. -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { - int fh; - struct stat file_info; - - if ((!ipc_h) || (!ipc_h->name)) - return -1; - - if ( stat(ipc_h->name, &file_info) == -1) { - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); - return -1; - } - } - - ipc_h->fh = VTPM_IPC_CLOSED; - - return 0; -} - - -// Read size bytes. If FH isn't open, open it. -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ - vtpm_ipc_handle_t *my_ipc_h; - int result; - - if (ipc_h) { - my_ipc_h = ipc_h; - } else { - my_ipc_h = alt_ipc_h; - } - - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); - } - - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); - return -1; - } - - result = read(my_ipc_h->fh, bytes, size); - if (result < 0) { - my_ipc_h->fh = VTPM_IPC_CLOSED; - } - - return (result); -} - -// Write size bytes. If FH isn't open, open it. -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { - vtpm_ipc_handle_t *my_ipc_h; - int result; - - if (ipc_h) { - my_ipc_h = ipc_h; - } else { - my_ipc_h = alt_ipc_h; - } - - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); - } - - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); - return -1; - } - - result = write(my_ipc_h->fh, bytes, size); - if (result < 0) { - my_ipc_h->fh = VTPM_IPC_CLOSED; - } - - return (result); -} - -// Mark file as closed and try and close it. Errors not reported. -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { - - if (ipc_h) { - close(ipc_h->fh); - ipc_h->fh = VTPM_IPC_CLOSED; - } - -} diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h deleted file mode 100644 index 529c4a2..0000000 --- a/tools/vtpm_manager/manager/vtpm_ipc.h +++ /dev/null @@ -1,71 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_ipc.h Header for interprocess communication between VTPM manager -// and Guests or VTPMs -// -// =================================================================== - -#ifndef __VTPM_IO_H__ -#define __VTPM_IO_H__ - -#include "tcg.h" - -#define VTPM_IPC_CLOSED -1 - -// Represents an (somewhat) abstracted io handle. -typedef struct vtpm_ipc_handle_t { - int fh; // IO handle. - int flags; // Flags for opening. This may need to become - // a void *, but for now files use an int. - char *name; // Names for debugging as well as filenames - // for file-based io. -} vtpm_ipc_handle_t; - - -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); - -// Create the file that needs opening. Used only for FIFOs -// FYI: This may cause problems in other file IO schemes. We'll see. -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); - -// Read size bytes. If FH isn't open, open it. -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); - -// Write size bytes. If FH isn't open, open it. -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); - -// Mark file as closed and try and close it. Errors not reported. -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); - -#endif diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c deleted file mode 100644 index e737d60..0000000 --- a/tools/vtpm_manager/manager/vtpm_lock.c +++ /dev/null @@ -1,63 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_lock.c Provided controlled sync around access to vtpm structures -// -// =================================================================== - -#include -#include "vtpm_lock.h" - -static pthread_rwlock_t vtpm_lock; - -void vtpm_lock_init() { - - pthread_rwlock_init( &vtpm_lock, NULL); -} - -void vtpm_lock_destroy(){ - pthread_rwlock_destroy(&vtpm_lock); -} - -void vtpm_lock_rdlock(){ - pthread_rwlock_rdlock(&vtpm_lock); -} - -void vtpm_lock_wrlock(){ - pthread_rwlock_wrlock(&vtpm_lock); -} - -void vtpm_lock_unlock(){ - pthread_rwlock_unlock(&vtpm_lock); -} - diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h deleted file mode 100644 index 53a339d..0000000 --- a/tools/vtpm_manager/manager/vtpm_lock.h +++ /dev/null @@ -1,48 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_lock.h Provided controlled sync around access to vtpm structures -// -// =================================================================== - -#ifndef __VTPM_LOCK_H__ -#define __VTPM_LOCK_H__ - -void vtpm_lock_init(); -void vtpm_lock_destroy(); - -void vtpm_lock_rdlock(); -void vtpm_lock_wrlock(); -void vtpm_lock_unlock(); - -#endif diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c deleted file mode 100644 index e089f78..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager.c +++ /dev/null @@ -1,285 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager.c -// -// This file will house the main logic of the VTPM Manager -// -// ================================================================== - -#include -#include -#include - -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "hashtable.h" -#include "hashtable_itr.h" - -#include "log.h" -#include "buffer.h" - -VTPM_GLOBALS *vtpm_globals=NULL; - -// --------------------------- Well Known Auths -------------------------- -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - -#ifdef WELL_KNOWN_OWNER_AUTH -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -#endif - - -// -------------------------- Hash table functions -------------------- - -static unsigned int hashfunc32(void *ky) { - return (* (UINT32 *) ky); -} - -static int equals32(void *k1, void *k2) { - return (*(UINT32 *) k1 == *(UINT32 *) k2); -} - -// --------------------------- Functions ------------------------------ - -TPM_RESULT VTPM_Create_Manager(){ - - TPM_RESULT status = TPM_SUCCESS; - - // Generate Auth for Owner -#ifdef WELL_KNOWN_OWNER_AUTH - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); -#else - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); -#endif - - // Take Owership of TPM - CRYPTO_INFO ek_cryptoInfo; - - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); - - // If we can read PubEK then there is no owner and we should take it. - // We use the abilty to read the pubEK to flag that the TPM is owned. - // FIXME: Change to just trying to take ownership and react to the status - if (status == TPM_SUCCESS) { - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, - &SRK_AUTH, - &ek_cryptoInfo, - &vtpm_globals->keyAuth)); - - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, - &vtpm_globals->keyAuth)); - } else { - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); - } - - // Generate storage key's auth - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, - sizeof(TPM_AUTHDATA) ); - - TCS_AUTH osap; - TPM_AUTHDATA sharedsecret; - - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, - TPM_ET_KEYHANDLE, - TPM_SRK_KEYHANDLE, - &SRK_AUTH, - &sharedsecret, - &osap) ); - - osap.fContinueAuthSession = FALSE; - - - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, - TPM_KEY_BIND, - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, - TPM_SRK_KEYHANDLE, - (const TPM_AUTHDATA*)&sharedsecret, - &vtpm_globals->storageKeyWrap, - &osap) ); - - // Generate boot key's auth - TPM_AUTHDATA bootKeyWrapAuth; - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); - - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, - TPM_ET_KEYHANDLE, - TPM_SRK_KEYHANDLE, - &SRK_AUTH, - &sharedsecret, - &osap) ); - - osap.fContinueAuthSession = FALSE; - - // FIXME: This key protects the global secrets on disk. It should use TPM - // PCR bindings to limit its use to legit configurations. - // Current binds are open, implying a Trusted VM contains this code. - // If this VM is not Trusted, use measurement and PCR bindings. - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, - TPM_KEY_BIND, - (const TPM_AUTHDATA*)&bootKeyWrapAuth, - TPM_SRK_KEYHANDLE, - (const TPM_AUTHDATA*)&sharedsecret, - &vtpm_globals->bootKeyWrap, - &osap) ); - - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->bootKeyWrap, - NULL, - NULL, - NULL, - &vtpm_globals->bootKey, - TRUE ) ); - - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); - goto egress; - - abort_egress: - exit(1); - - egress: - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); - return status; - -} - -/////////////////////////////////////////////////////////////////////////////// -TPM_RESULT VTPM_Init_Manager() { - TPM_RESULT status = TPM_FAIL, serviceStatus; - BYTE *randomsead; - UINT32 randomsize=256; - - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ - status = TPM_FAIL; - goto abort_egress; - } - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); - - vtpm_globals->connected_dmis = 0; - - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ - status = TPM_FAIL; - goto abort_egress; - } - - // Create new TCS Object - vtpm_globals->manager_tcs_handle = 0; - - TPMTRYRETURN(TCS_create()); - - // Create TCS Context for service - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); - - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, - &randomsize, - &randomsead)); - - Crypto_Init(randomsead, randomsize); - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); - - // Create OIAP session for service's authorized commands - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, - &vtpm_globals->keyAuth) ); - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; - - vtpm_globals->mig_keys = NULL; - - // If fails, create new Manager. - serviceStatus = VTPM_LoadManagerData(); - if (serviceStatus == TPM_IOERROR) { - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); - TPMTRYRETURN( VTPM_Create_Manager() ); - TPMTRYRETURN( VTPM_SaveManagerData() ); - } else if (serviceStatus != TPM_SUCCESS) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); - exit(1); - } - - //Load Storage Key - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, - TPM_SRK_KEYHANDLE, - &vtpm_globals->storageKeyWrap, - &SRK_AUTH, - &vtpm_globals->storageKeyHandle, - &vtpm_globals->keyAuth, - &vtpm_globals->storageKey, - FALSE ) ); - - // Create entry for Dom0 for control messages - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); - - goto egress; - - abort_egress: - egress: - - return(status); -} - -/////////////////////////////////////////////////////////////////////////////// -void VTPM_Stop_Manager() { - VTPM_DMI_RESOURCE *dmi_res; - struct hashtable_itr *dmi_itr; - - // Close all the TCS contexts. TCS should evict keys based on this - if (hashtable_count(vtpm_globals->dmi_map) > 0) { - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); - do { - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); - if (dmi_res->connected) - close_dmi( dmi_res ); // Not really interested in return code - - } while (hashtable_iterator_advance(dmi_itr)); - free (dmi_itr); - } - - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); - - TCS_CloseContext(vtpm_globals->manager_tcs_handle); - TCS_destroy(); - - hashtable_destroy(vtpm_globals->dmi_map, 1); - free(vtpm_globals); - - Crypto_Exit(); - - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); -} diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h deleted file mode 100644 index a324a8f..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager.h +++ /dev/null @@ -1,150 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager.h -// -// Public Interface header for VTPM Manager -// -// ================================================================== - -#ifndef __VTPM_MANAGER_H__ -#define __VTPM_MANAGER_H__ - -#define VTPM_TAG_REQ 0x01c1 -#define VTPM_TAG_RSP 0x01c4 -#define COMMAND_BUFFER_SIZE 4096 - -// Header sizes. Note Header MAY include the DMI -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) - -//************************ Command Codes **************************** -#define VTPM_ORD_BASE 0x0000 -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) - -// Non-priviledged VTPM Commands (From DMI's) -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key - -// Priviledged VTPM Commands (From management console) -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest - -//************************ Return Codes **************************** -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain -#define VTPM_TYPE_HVM 2 // HVM Domain - -//************************ Return Codes **************************** -#define VTPM_SUCCESS 0 -#define VTPM_FAIL 1 -#define VTPM_UNSUPPORTED 2 -#define VTPM_FORBIDDEN 3 -#define VTPM_RESTORE_CONTEXT_FAILED 4 -#define VTPM_INVALID_REQUEST 5 - -//*********************** Parameter Values ************************* -#define VTPM_TYPE_NON_MIGRATABLE 0x00 -#define VTPM_TYPE_MIGRATABLE 0x01 -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. - // VTPM can be recovered or deleted only - -/******************* Command Parameter API ************************* - -VTPM Command Format - dmi: 4 bytes // Source of message. - // WARNING: This is prepended by the channel. - // Thus it is received by VTPM Manager, - // but not sent by DMI - tpm tag: 2 bytes - command size: 4 bytes // Size of command including header but not DMI - ord: 4 bytes // Command ordinal above - parameters: size - 10 bytes // Command Parameter - -VTPM Response Format - tpm tag: 2 bytes - response_size: 4 bytes - status: 4 bytes - parameters: size - 10 bytes - - -VTPM_Open: - Input Parameters: - mig_type: 1 byte - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 - domain type: 1 byte - instance_id: 4 bytes - Output Parameters: - None - -VTPM_Close - Input Parameters: - instance_id: 4 bytes - Output Parameters: - None - -VTPM_Delete - Input Parameters: - instance_id: 4 bytes - Output Parameters: - None - -VTPM_SaveNVM - Input Parameters: - data: n bytes (Header indicates size of data) - Output Parameters: - None - -VTPM_LoadNVM - Input Parameters: - None - Output Parameters: - data: n bytes (Header indicates size of data) - -VTPM_TPMCommand - Input Parameters: - TPM Command Byte Stream: n bytes - Output Parameters: - TPM Reponse Byte Stream: n bytes - -*********************************************************************/ - -#endif //_VTPM_MANAGER_H_ diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c deleted file mode 100644 index 2001074..0000000 --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c +++ /dev/null @@ -1,488 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager_handler.c -// -// This file will house the main logic of the VTPM Manager -// -// ================================================================== - -#include -#include -#include -#include - -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "vtsp.h" -#include "bsg.h" -#include "hashtable.h" -#include "hashtable_itr.h" -#include "log.h" -#include "buffer.h" - -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); - -// ---------------------- Prototypes ------------------- -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, - TPM_COMMAND_CODE ord, - buffer_t *command_buf, - buffer_t *result_buf, - BOOL is_priv, - char *thread_name); - -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - VTPM_DMI_RESOURCE *dmi_res, - BYTE *cmd_header, - buffer_t *param_buf, - buffer_t *result_buf, - char *thread_name); - -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - BOOL fw_tpm, // Forward TPM cmds? - vtpm_ipc_handle_t *fw_tx_ipc_h, - vtpm_ipc_handle_t *fw_rx_ipc_h, - BOOL is_priv, - char *thread_name) { - TPM_RESULT status = TPM_FAIL; // Should never return - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; - buffer_t *command_buf=NULL, *result_buf=NULL; - TPM_TAG tag; - TPM_COMMAND_CODE ord; - VTPM_DMI_RESOURCE *dmi_res; - int size_read, size_write, i; - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending - - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); - - // ------------------------ Main Loop -------------------------------- - while(1) { - - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); - - // --------------------- Read Cmd from Sender ---------------- - - // Read command header - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); - for (i=0; i 0) { - in_param = (BYTE *) malloc(cmd_size); - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); - if (size_read > 0) { - for (i=0; idmi_map, &dmi)) || - (!dmi_res->connected) ) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); - status = TPM_BAD_PARAMETER; - // We have no one to reply to, they don't exist. - goto abort_command; - } - - if (tag == VTPM_TAG_REQ) { - - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); - - } else { // This is not a VTPM Command at all. - if (fw_tpm) { - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); - - // This means calling the DMI failed, not that the cmd failed in the DMI - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app - if (status != TPM_SUCCESS) { - status = TPM_IOERROR; - goto abort_with_error; - } - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This - // should be forwarded to the caller VM - add_header = FALSE; - } else { - // We are not supposed to forward TPM commands at all. - int i; - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); - for (i=0; i 0) - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); - //Note: Send message + dmi_id - } else { - reply = result_buf->bytes; - reply_size = buffer_len(result_buf); - } - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); - for (i=0; i < reply_size; i++) - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); - - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); - goto abort_command; - } - free(out_message); out_message=NULL; - - if (size_write < (int)reply_size) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); - goto abort_command; - } - - // On certain failures an error message cannot be sent. - // This marks the beginning of cleanup in preperation for the next command. - abort_command: - //free buffers - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - //free(in_param); // This was converted to command_buf. No need to free - buffer_free(result_buf); - buffer_free(command_buf); - - // If we have a write lock, save the manager table - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); - } - - vtpm_lock_unlock(); - add_header = TRUE; // Reset to the default - } // End while(1) - -} - -///////////////////////////////////////////////////////////////////////// -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, - TPM_COMMAND_CODE ord, - buffer_t *command_buf, - buffer_t *result_buf, - BOOL is_priv, - char *thread_name) { - - TPM_RESULT status = TPM_FAIL; - - switch (ord) { - case VTPM_ORD_SAVENVM: - status= VTPM_Handle_Save_NVM(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_LOADNVM: - status= VTPM_Handle_Load_NVM(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_TPMCOMMAND: - status= VTPM_Handle_TPM_Command(dmi_res, - command_buf, - result_buf); - break; - - case VTPM_ORD_GET_MIG_KEY: - status = VTPM_Handle_Get_Migration_key(command_buf, - result_buf); - break; - - case VTPM_ORD_LOAD_MIG_KEY: - status = VTPM_Handle_Load_Migration_key(command_buf, - result_buf); - break; - - default: - // Privileged handlers can do maintanance - if (is_priv) { - switch (ord) { - case VTPM_ORD_OPEN: - status = VTPM_Handle_New_DMI(command_buf); - break; - - case VTPM_ORD_CLOSE: - status = VTPM_Handle_Close_DMI(command_buf); - break; - - case VTPM_ORD_DELETE: - status = VTPM_Handle_Delete_DMI(command_buf); - break; - - case VTPM_ORD_MIGRATE_IN: - status = VTPM_Handle_Migrate_In(command_buf, result_buf); - break; - - case VTPM_ORD_MIGRATE_OUT: - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); - break; - - default: - status = TPM_BAD_ORDINAL; - } // switch - } else { // is priv command - - status = TPM_BAD_ORDINAL; - } // inner switch - } // outer switch - - return(status); -} - -///////////////////////////////////////////////////////////////////// -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - VTPM_DMI_RESOURCE *dmi_res, - BYTE *cmd_header, - buffer_t *param_buf, - buffer_t *result_buf, - char *thread_name) { - - TPM_RESULT status = TPM_FAIL; - UINT32 dmi_dst; - TPM_COMMAND_CODE ord; - TPM_TAG tag_out; - UINT32 dmi_cmd_size, in_param_size, adj_param_size; - BYTE *dmi_cmd, *in_param; - int size_read, size_write, i; - - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness - if (dmi_res->dmi_id == VTPM_CTL_DM) { - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); - status = TPM_FAIL; - goto abort_with_error; - } - - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); - - //Forward TPM CMD stamped with dmi_id to DMI for handling - if (buffer_len(param_buf)) { - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); - - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); - for (i=0; itx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); - if (size_write > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); - for (i=0; irx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); - for (i=0; i 0) { - in_param = (BYTE *) malloc(adj_param_size); - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); - if (size_read > 0) { - for (i=0; i -#include -#include -#include -#include -#include -#include -#include -#include "vtpm_manager.h" -#include "vtpmpriv.h" -#include "tcg.h" -#include "log.h" -#include "vtpm_ipc.h" - -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" - -#define VTPM_BE_FNAME "/dev/vtpm" -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" - -#define VTPM_TYPE_PVM_STRING "pvm" -#define VTPM_TYPE_HVM_STRING "hvm" - -struct vtpm_thread_params_s { - vtpm_ipc_handle_t *tx_ipc_h; - vtpm_ipc_handle_t *rx_ipc_h; - BOOL fw_tpm; - vtpm_ipc_handle_t *fw_tx_ipc_h; - vtpm_ipc_handle_t *fw_rx_ipc_h; - BOOL is_priv; - char *thread_name; -}; - -// This is needed to all extra_close_dmi to close this to prevent a -// broken pipe when no DMIs are left. -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; - -void *vtpm_manager_thread(void *arg_void) { - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; - - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, - arg->is_priv, arg->thread_name); - - return (status); -} - - -void signal_handler(int reason) { - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); - } else { - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); - pthread_exit(NULL); - } - - VTPM_Stop_Manager(); - exit(-1); -} - -struct sigaction ctl_c_handler; - -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { - - TPM_RESULT status = TPM_SUCCESS; - int fh; - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; - struct stat file_info; - - if (dmi_res->dmi_id == VTPM_CTL_DM) { - dmi_res->tx_tpm_ipc_h = NULL; - dmi_res->rx_tpm_ipc_h = NULL; - dmi_res->tx_vtpm_ipc_h = NULL; - dmi_res->rx_vtpm_ipc_h = NULL; - } else { - // Create a pair of fifo pipes - dmi_res->rx_tpm_ipc_h = NULL; - dmi_res->rx_vtpm_ipc_h = NULL; - - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { - status =TPM_RESOURCES; - goto abort_egress; - } - - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); - - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? - status = TPM_IOERROR; - goto abort_egress; - } - - // Measure DMI - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value - // Also, this mechanism is specific to 1 VM architecture. - /* - fh = open(TPM_EMULATOR_PATH, O_RDONLY); - stat_ret = fstat(fh, &file_stat); - if (stat_ret == 0) - dmi_size = file_stat.st_size; - else { - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); - status = TPM_IOERROR; - goto abort_egress; - } - dmi_buffer - */ - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); - - if (vm_type == VTPM_TYPE_PVM) - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; - else - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; - - // Launch DMI - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); -#ifdef MANUAL_DM_LAUNCH - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); - dmi_res->dmi_pid = 0; -#else - pid_t pid = fork(); - - if (pid == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); - status = TPM_RESOURCES; - goto abort_egress; - } else if (pid == 0) { - switch (startup_mode) { - case TPM_ST_CLEAR: - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); - break; - case TPM_ST_STATE: - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); - break; - case TPM_ST_DEACTIVATED: - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); - break; - default: - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Returning from these at all is an error. - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); - } else { - dmi_res->dmi_pid = pid; - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); - } -#endif // MANUAL_DM_LAUNCH - - } // If DMI = VTPM_CTL_DM - status = TPM_SUCCESS; - -abort_egress: - return (status); -} - -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { - TPM_RESULT status = TPM_SUCCESS; - - if (vtpm_globals->connected_dmis == 0) { - // No more DMI's connected. Close fifo to prevent a broken pipe. - // This is hackish. Need to think of another way. - vtpm_ipc_close(g_rx_tpm_ipc_h); - } - - - if (dmi_res->dmi_id != VTPM_CTL_DM) { - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); - - free(dmi_res->tx_tpm_ipc_h->name); - free(dmi_res->tx_vtpm_ipc_h->name); - -#ifndef MANUAL_DM_LAUNCH - if (dmi_res->dmi_id != VTPM_CTL_DM) { - if (dmi_res->dmi_pid != 0) { - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); - status = TPM_FAIL; - } - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); - status = TPM_FAIL; - } - } -#endif - - } //endif ! dom0 - return status; -} - - -int main(int argc, char **argv) { - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; - pthread_t be_thread, dmi_thread, hp_thread; - -#ifdef DUMMY_BACKEND - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; -#else - vtpm_ipc_handle_t real_be_ipc_h; -#endif - - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); - - // -------------------- Initialize Manager ----------------- - if (VTPM_Init_Manager() != TPM_SUCCESS) { - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); - return -1; - } - - // -------------------- Setup Ctrl+C Handlers -------------- - ctl_c_handler.sa_handler = signal_handler; - sigemptyset(&ctl_c_handler.sa_mask); - ctl_c_handler.sa_flags = 0; - - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); - - // For easier debuggin with gdb - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); - - sigset_t sig_mask; - sigemptyset(&sig_mask); - sigaddset(&sig_mask, SIGPIPE); - sigprocmask(SIG_BLOCK, &sig_mask, NULL); - - // ------------------- Set up file ipc structures ---------- -#ifdef DUMMY_BACKEND - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { - - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); - exit(-1); - } - - tx_be_ipc_h = &tx_dummy_ipc_h; - rx_be_ipc_h = &rx_dummy_ipc_h; -#else - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); - - tx_be_ipc_h = &real_be_ipc_h; - rx_be_ipc_h = &real_be_ipc_h; -#endif - - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); - exit(-1); - } - - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; - - // -------------------- Set up thread params ------------- - - be_thread_params.tx_ipc_h = tx_be_ipc_h; - be_thread_params.rx_ipc_h = rx_be_ipc_h; - be_thread_params.fw_tpm = TRUE; - be_thread_params.fw_tx_ipc_h = NULL; - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; - be_thread_params.is_priv = FALSE; - be_thread_params.thread_name = "Backend Listener"; - - dmi_thread_params.tx_ipc_h = NULL; - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; - dmi_thread_params.fw_tpm = FALSE; - dmi_thread_params.fw_tx_ipc_h = NULL; - dmi_thread_params.fw_rx_ipc_h = NULL; - dmi_thread_params.is_priv = FALSE; - dmi_thread_params.thread_name = "VTPM Listener"; - - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; - hp_thread_params.fw_tpm = FALSE; - hp_thread_params.fw_tx_ipc_h = NULL; - hp_thread_params.fw_rx_ipc_h = NULL; - hp_thread_params.is_priv = TRUE; - hp_thread_params.thread_name = "Hotplug Listener"; - - // --------------------- Launch Threads ----------------- - - vtpm_lock_init(); - - vtpm_globals->master_pid = pthread_self(); - - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); - exit(-1); - } - - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); - exit(-1); - } - - - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); - exit(-1); - } - - //Join the other threads until exit time. - pthread_join(be_thread, NULL); - pthread_join(dmi_thread, NULL); - pthread_join(hp_thread, NULL); - - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); - - VTPM_Stop_Manager(); - vtpm_lock_destroy(); - return 0; -} diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h deleted file mode 100644 index 41e8d2d..0000000 --- a/tools/vtpm_manager/manager/vtpmpriv.h +++ /dev/null @@ -1,186 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpmpriv.h -// -// Structures and functions private to the manager -// -// ================================================================== - -#ifndef __VTPMPRIV_H__ -#define __VTPMPRIV_H__ - -#include "vtpm_manager.h" -#include "tcg.h" -#include "tcs.h" -#include "buffer.h" -#include "crypto.h" -#include "vtpm_ipc.h" - -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table - // is changed. It's used for backwards compatability - -#define STATE_FILE "/var/vtpm/VTPM" -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" -#define VTPM_CTL_DM 0 - -// ------------------------ Private Structures ----------------------- -typedef struct VTPM_DMI_RESOURCE_T { - // I/O info for Manager to talk to DMI's and controllers - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI - -#ifndef VTPM_MULTI_VM - pid_t dmi_pid; -#endif - - // Non-persistent Information - bool connected; - UINT32 dmi_domain_id; - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle - char *NVMLocation; // NULL term string indicating location - // of NVM. - // Persistent Information about DMI - UINT32 dmi_id; - BYTE dmi_type; - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI -} VTPM_DMI_RESOURCE; - -typedef struct tdVTPM_MIGKEY_LIST { - UINT32 name_size; - BYTE *name; // Name of destination (IP addr, domain name, etc) - CRYPTO_INFO key; - struct tdVTPM_MIGKEY_LIST *next; -} VTPM_MIGKEY_LIST; - - -typedef struct tdVTPM_GLOBALS { - // Non-persistent data -#ifndef VTPM_MULTI_VM - pid_t master_pid; -#endif - - int connected_dmis; // To close guest_rx when no dmis are connected - - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys - // Currently keys are loaded at migration time, - // TODO: Make VTPM man store a keys persistently - // and update script to check if key is needed - // before fetching it. - - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager - TPM_HANDLE storageKeyHandle; // Key used by persistent store - CRYPTO_INFO storageKey; // For software encryption - CRYPTO_INFO bootKey; // For saving table - TCS_AUTH keyAuth; // OIAP session for storageKey - - // Persistent Data - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM - buffer_t storageKeyWrap; // Wrapped copy of storageKey - TPM_AUTHDATA srk_usage_auth; - TPM_AUTHDATA storage_key_usage_auth; - - buffer_t bootKeyWrap; // Wrapped copy of boot key - -}VTPM_GLOBALS; - -// --------------------------- Global Values -------------------------- -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value - -// ********************** VTPM Functions ************************* -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service -void VTPM_Stop_Manager(); // Stop VTPM Service -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, - vtpm_ipc_handle_t *rx_ipc_h, - BOOL fw_tpm, // Should forward TPM cmds - vtpm_ipc_handle_t *fw_tx_ipc_h, - vtpm_ipc_handle_t *fw_rx_ipc_h, - BOOL is_priv, - char *client_name); - -// ********************** Command Handler Prototypes *********************** - -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, - const buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, - buffer_t *inbuf, - buffer_t *outbuf); - -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); - -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, - buffer_t *result_buf); - -TPM_RESULT VTPM_SaveManagerData(void); -TPM_RESULT VTPM_LoadManagerData(void); - -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); - -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); - -// Helper functions -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); - -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, - CRYPTO_INFO *asymkey, - buffer_t *sealed_data); - -TPM_RESULT envelope_decrypt(const buffer_t *cipher, - TCS_CONTEXT_HANDLE TCSContext, - TPM_HANDLE keyHandle, - const TPM_AUTHDATA *key_usage_auth, - buffer_t *unsealed_data); - -#endif // __VTPMPRIV_H__ diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c deleted file mode 100644 index fc8a66f..0000000 --- a/tools/vtpm_manager/manager/vtsp.c +++ /dev/null @@ -1,1042 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtsp.c -// -// Higher level interface to TCS for use in service. -// -// ================================================================== - -#include -#include "tcg.h" -#include "tcs.h" -#include "bsg.h" -#include "log.h" -#include "crypto.h" -#include "vtsp.h" -#include "buffer.h" - -#define RSA_KEY_SIZE 0x0800 - -/*********************************************************************************** - * GenerateAuth: Generate authorization info to be sent back to application - * - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed - * outParamDigestTextSize Size of inParamDigestText - * HMACkey Key to be used for HMACing - * For OIAP use key.authUsage or PersistStore.ownerAuth - * For OSAP use shared secret - * pAuth Authorization information from the application - * - * Return: TPM_SUCCESS Authorization data created - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP - *************************************************************************************/ -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, - /*[IN]*/ UINT32 inParamDigestTextSize, - /*[IN]*/ const TPM_SECRET *HMACkey, - /*[IN,OUT]*/ TCS_AUTH *auth) { - - if (inParamDigestText == NULL || auth == NULL) - return (TPM_AUTHFAIL); - else { - - //Generate new OddNonce - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); - - // Create SHA1 inParamDigest - TPM_DIGEST inParamDigest; - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); - - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; - - BSG_PackList( hmacText, 4, - BSG_TPM_DIGEST, &inParamDigest, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); - - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); - - return(TPM_SUCCESS); - - } -} - -/*********************************************************************************** - * VerifyAuth: Verify the authdata for a command requiring authorization - * - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed - * inParamDigestTextSize Size of inParamDigestText - * authDataUsage AuthDataUsage for the Entity being used - * Key->authDataUsage or TPM_AUTH_OWNER - * HMACkey Key to be used for HMACing - * For OIAP use key.authUsage or PersistStore.ownerAuth - * For OSAP use NULL (It will be aquired from the Auth Session) - * If unknown (default), assume OIAP - * sessionAuth A TCS_AUTH info for the session - * pAuth Authorization information from the application - * hContext If specified, on failed Auth, VerifyAuth will - * generate a new OIAP session in place of themselves - * destroyed session. - * - * Return: TPM_SUCCESS Authorization Verified - * TPM_AUTHFAIL Authorization Failed - * TPM_FAIL Failure during SHA1 routines - *************************************************************************************/ -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, - /*[IN]*/ UINT32 outParamDigestTextSize, - /*[IN]*/ const TPM_SECRET *HMACkey, - /*[IN,OUT]*/ TCS_AUTH *auth, - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { - if (outParamDigestText == NULL || auth == NULL) - return (TPM_AUTHFAIL); - - - // Create SHA1 inParamDigest - TPM_DIGEST outParamDigest; - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); - - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). - TPM_DIGEST hm; - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; - - BSG_PackList( hmacText, 4, - BSG_TPM_DIGEST, &outParamDigest, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); - - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); - - // Compare correct HMAC with provided one. - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality - if (!auth->fContinueAuthSession) - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); - - return (TPM_SUCCESS); - } else { - // If specified, reconnect the OIAP session. - // NOTE: This only works for TCS's that never have a 0 context. - if (hContext) { - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); - VTSP_OIAP( hContext, auth); - } - return (TPM_AUTHFAIL); - } -} - -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPMTRYRETURN( TCSP_OIAP(hContext, - &auth->AuthHandle, - &auth->NonceEven) ); - - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); - auth->fContinueAuthSession = FALSE; - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); - goto egress; - - abort_egress: - - egress: - - return status; -} - -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, - const TPM_ENTITY_TYPE entityType, - const UINT32 entityValue, - const TPM_AUTHDATA *usageAuth, - TPM_SECRET *sharedSecret, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; - - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); - - TPMTRYRETURN( TCSP_OSAP( hContext, - entityType, - entityValue, - nonceOddOSAP, - &auth->AuthHandle, - &auth->NonceEven, - &nonceEvenOSAP) ); - - // Calculating Session Secret - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; - - BSG_PackList( sharedSecretText, 2, - BSG_TPM_NONCE, &nonceEvenOSAP, - BSG_TPM_NONCE, &nonceOddOSAP); - - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); - - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); - auth->fContinueAuthSession = FALSE; - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); - - goto egress; - - abort_egress: - - egress: - - return status; -} - - -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, - const TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); - TPM_RESULT status = TPM_SUCCESS; - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); - - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); - goto egress; - - abort_egress: - - egress: - - return status; -} - - -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, - CRYPTO_INFO *crypto_info) { - - TPM_RESULT status; - TPM_NONCE antiReplay; - TPM_DIGEST checksum; - BYTE *pubEKtext; - UINT32 pubEKtextsize; - - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); - - // GenerateAuth new nonceOdd - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); - - - TPMTRYRETURN( TCSP_ReadPubek( hContext, - antiReplay, - &pubEKtextsize, - &pubEKtext, - &checksum) ); - - - // Extract the remaining output parameters - TPM_PUBKEY pubEK; - - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); - - // Build CryptoInfo for the bindingKey - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - pubEK.algorithmParms.parms, - &rsaKeyParms); - - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, - rsaKeyParms.exponent, - pubEK.pubKey.keyLength, - pubEK.pubKey.key, - crypto_info); - - // Destroy rsaKeyParms - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); - - // Set encryption scheme - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; - - goto egress; - - abort_egress: - - egress: - - return status; -} - -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - const TPM_AUTHDATA *srkAuth, - CRYPTO_INFO *ek_cryptoInfo, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; - BYTE *new_srk; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // vars for srkpubkey parameter - TPM_KEY srkPub; - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; - - struct pack_buf_t srkText; - - //These values are accurate for an enc(AuthData). - struct pack_buf_t encOwnerAuth, encSrkAuth; - - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); - - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); - status = TPM_RESOURCES; - goto abort_egress; - } - - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); - - - // Build srk public key struct - srkPub.ver = TPM_STRUCT_VER_1_1; - srkPub.keyUsage = TPM_KEY_STORAGE; - srkPub.keyFlags = 0x00; - srkPub.authDataUsage = TPM_AUTH_ALWAYS; - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); - srkPub.PCRInfoSize = 0; - srkPub.PCRInfo = 0; - srkPub.pubKey.keyLength= 0; - srkPub.encDataSize = 0; - - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 5, - BSG_TPM_COMMAND_CODE,&command, - BSG_TPM_PROTOCOL_ID, &proto_id, - BSG_TPM_SIZE32_DATA, &encOwnerAuth, - BSG_TPM_SIZE32_DATA, &encSrkAuth, - BSG_TPM_KEY, &srkPub); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); - - new_srk = srkText.data; - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, - proto_id, - encOwnerAuth.size, - encOwnerAuth.data, - encSrkAuth.size, - encSrkAuth.data, - &srkText.size, - &new_srk, - auth ) ); - - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - memcpy(paramText + paramTextSize, new_srk, srkText.size); - paramTextSize += srkText.size; - - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - ownerAuth, auth, - hContext) ); - - goto egress; - - abort_egress: - - egress: - - free(srkText.data); - free(encSrkAuth.data); - free(encOwnerAuth.data); - free(paramText); - - TCS_FreeMemory(hContext, new_srk); - - return status; -} - -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 1, - BSG_TPM_COMMAND_CODE, &command); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - ownerAuth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in - auth) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - ownerAuth, auth, - hContext) ); - goto egress; - - abort_egress: - egress: - free(paramText); - return status; -} - -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_USAGE usage, - const TPM_AUTHDATA *newKeyAuth, - const TCS_KEY_HANDLE parentHandle, - const TPM_AUTHDATA *osapSharedSecret, - buffer_t *pubKeyBuf, - TCS_AUTH *auth) { - - int i; - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; - - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); - - // vars for Calculate encUsageAuth - BYTE *paramText; - UINT32 paramTextSize; - - // vars for Calculate encUsageAuth - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; - TPM_DIGEST XORKey1; - UINT32 XORbufferSize; - TPM_SECRET encUsageAuth, encMigrationAuth; - - // vars for Flatten newKey prototype - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; - struct pack_buf_t newKeyText; - - // Fill in newKey - TPM_KEY newKey; - - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; - newKey.algorithmParms.parmSize = 12; - - switch (usage) { - case TPM_KEY_SIGNING: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); - newKey.keyUsage = TPM_KEY_SIGNING; - newKey.algorithmParms.encScheme = TPM_ES_NONE; - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; - break; - case TPM_KEY_STORAGE: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); - newKey.keyUsage = TPM_KEY_STORAGE; - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - newKey.algorithmParms.sigScheme = TPM_SS_NONE; - break; - case TPM_KEY_BIND: - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); - newKey.keyUsage = TPM_KEY_BIND; - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; - newKey.algorithmParms.sigScheme = TPM_SS_NONE; - break; - default: - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - - newKey.ver = TPM_STRUCT_VER_1_1; - - newKey.keyFlags = 0; - newKey.authDataUsage = TPM_AUTH_ALWAYS; - newKey.pubKey.keyLength= 0; - newKey.encDataSize = 0; - newKey.encData = NULL; - - // FIXME: Support PCR bindings - newKey.PCRInfoSize = 0; - newKey.PCRInfo = NULL; - - // Calculate encUsageAuth - XORbufferSize = BSG_PackList( XORbuffer, 2, - BSG_TPM_SECRET, osapSharedSecret, - BSG_TPM_NONCE, &auth->NonceEven); - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); - - // FIXME: No support for migratable keys. - for (i=0; i < TPM_DIGEST_SIZE; i++) - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; - - // Flatten newKey prototype - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); - newKeyText.data = flatKey; - newKeyText.size = flatKeySize; - - // Generate HMAC - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_AUTHDATA, &encUsageAuth, - BSG_TPM_AUTHDATA, &encMigrationAuth); - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); - paramTextSize += newKeyText.size; - - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - osapSharedSecret, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, - parentHandle, - encUsageAuth, - encMigrationAuth, - &newKeyText.size, - &newKeyText.data, - auth) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command); - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); - paramTextSize += newKeyText.size; - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - osapSharedSecret, auth, 0) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); - - goto egress; - - abort_egress: - - egress: - - free(flatKey); - free(paramText); - TCS_FreeMemory(hContext, newKeyText.data); - - return status; -} - -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, - const TCS_KEY_HANDLE hUnwrappingKey, - const buffer_t *rgbWrappedKeyBlob, - const TPM_AUTHDATA *parentAuth, - TPM_HANDLE *newKeyHandle, - TCS_AUTH *auth, - CRYPTO_INFO *cryptoinfo, - const BOOL skipTPMLoad) { - - - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; - - BYTE *paramText=NULL; // Digest to make Auth. - UINT32 paramTextSize; - - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it - if (! skipTPMLoad) { - - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || - (newKeyHandle==NULL) || (auth==NULL)) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // Generate Extra TCS Parameters - TPM_HANDLE phKeyHMAC; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 1, - BSG_TPM_COMMAND_CODE, &command); - - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); - paramTextSize += buffer_len(rgbWrappedKeyBlob); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - parentAuth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, - hUnwrappingKey, - buffer_len(rgbWrappedKeyBlob), - rgbWrappedKeyBlob->bytes, - auth, - newKeyHandle, - &phKeyHMAC) ); - - // Verify Auth - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_HANDLE, newKeyHandle); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - parentAuth, auth, - hContext) ); - } - - // Build cryptoinfo structure for software crypto function. - if (cryptoinfo != NULL) { - TPM_KEY newKey; - - // Unpack/return key structure - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); - TPM_RSA_KEY_PARMS rsaKeyParms; - - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, - newKey.algorithmParms.parms, - &rsaKeyParms); - - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, - rsaKeyParms.exponent, - newKey.pubKey.keyLength, - newKey.pubKey.key, - cryptoinfo); - - // Destroy rsaKeyParms - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); - - // Set encryption scheme - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; - } - - goto egress; - - abort_egress: - - egress: - - free(paramText); - return status; -} - -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE key_handle, - const buffer_t *bound_data, - const TPM_AUTHDATA *usage_auth, - buffer_t *clear_data, - TCS_AUTH *auth) { - - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_UnBind; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate Extra TCS Parameters - struct pack_buf_t clear_data32; - BYTE *clear_data_text; - UINT32 clear_data_size; - - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &bound_data32); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - usage_auth, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_UnBind( hContext, - key_handle, - buffer_len(bound_data), - bound_data->bytes, - auth, - &clear_data_size, - &clear_data_text) ); - - - // Verify Auth - clear_data32.size = clear_data_size; - clear_data32.data = clear_data_text; - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &clear_data32); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - usage_auth, auth, - hContext) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); - - goto egress; - - abort_egress: - - egress: - - free(paramText); - TCS_FreeMemory(hContext, clear_data_text); - - return status; -} - -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, - const buffer_t *inData, - buffer_t *outData) -{ - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); - TPM_RESULT status = TPM_SUCCESS; - TPM_BOUND_DATA boundData; - UINT32 i; - - // Fill boundData's accessory information - boundData.ver = TPM_STRUCT_VER_1_1; - boundData.payload = TPM_PT_BIND; - boundData.payloadData = inData->bytes; - - // Pack boundData before encryption - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * - (sizeof(TPM_VERSION) + - sizeof(TPM_PAYLOAD_TYPE) + - buffer_len(inData))); - if (flatBoundData == NULL) { - return TPM_NOSPACE; - } - UINT32 flatBoundDataSize = 0; - flatBoundDataSize = BSG_PackList( flatBoundData, 2, - BSG_TPM_VERSION, &boundData.ver, - BSG_TYPE_BYTE, &boundData.payload); - - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); - flatBoundDataSize += buffer_len(inData); - - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. - UINT32 out_tmp_size; - - // Encrypt flatBoundData - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, - flatBoundDataSize, - flatBoundData, - &out_tmp_size, - out_tmp) ); - - if (out_tmp_size > RSA_KEY_SIZE/8) { - // The result of RSAEnc should be a fixed size based on key size. - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); - } - - buffer_init(outData, 0, NULL); - buffer_append_raw(outData, out_tmp_size, out_tmp); - - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); - for(i = 0 ; i < out_tmp_size ; i++) { - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); - } - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - goto egress; - abort_egress: - egress: - - // Free flatBoundData - free(flatBoundData); - - return TPM_SUCCESS; -} - -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_AUTHDATA *sealDataAuth, - const TPM_PCR_COMPOSITE *pcrComp, - const buffer_t *inData, - TPM_STORED_DATA *sealedData, - const TPM_SECRET *osapSharedSecret, - TCS_AUTH *auth) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_Seal; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate PCR_Info Struct from Comp - TPM_PCR_INFO pcrInfo; - UINT32 pcrInfoSize, flatpcrSize; - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks - sizeof(UINT16) + // 2 byte UINT16 - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs - - if (pcrComp != NULL) { - //printf("\n\tBinding to PCRs: "); - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) - //printf("%2.2x", pcrComp->select.pcrSelect[i]); - - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); - - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); - } else { - //printf("\n\tBinding to no PCRS."); - pcrInfoSize = 0; - } - - // Calculate encUsageAuth - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; - UINT32 XORbufferSize = sizeof(XORbuffer); - TPM_DIGEST XORKey; - TPM_ENCAUTH encAuth; - - BSG_PackList( XORbuffer, 2, - BSG_TPM_SECRET, osapSharedSecret, - BSG_TPM_NONCE, &auth->NonceEven ); - - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); - - int i; - for (i=0; i < TPM_DIGEST_SIZE; i++) - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; - - // Generate Extra TCS Parameters - UINT32 inDataSize = buffer_len(inData); - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; - - UINT32 sealedDataSize; - BYTE *flatSealedData=NULL; - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 4, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_ENCAUTH, &encAuth, - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, - BSG_TPM_SIZE32_DATA, &inData_pack); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - osapSharedSecret, auth) ); - - // Call TCS - TPMTRYRETURN( TCSP_Seal( hContext, - keyHandle, - encAuth, - pcrInfoSize, - flatpcr, - inDataSize, - inData->bytes, - auth, - &sealedDataSize, - &flatSealedData) ); - - // Unpack/return key structure - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_STORED_DATA, sealedData); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - osapSharedSecret, auth, - 0) ); - - - goto egress; - - abort_egress: - egress: - - if (flatSealedData) - TCS_FreeMemory( hContext, flatSealedData); - - free(paramText); - return status; -} - - -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_STORED_DATA *sealedData, - const TPM_AUTHDATA *key_usage_auth, - const TPM_AUTHDATA *data_usage_auth, - buffer_t *outData, - TCS_AUTH *auth, - TCS_AUTH *dataAuth) { - - TPM_RESULT status = TPM_SUCCESS; - TPM_COMMAND_CODE command = TPM_ORD_Unseal; - - BYTE *paramText; // Digest to make Auth. - UINT32 paramTextSize; - - // Generate Extra TCS Parameters - UINT32 sealDataSize, clearDataSize; - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + - 2 * sizeof(UINT32) + - sealedData->sealInfoSize + - sealedData->encDataSize), - *clearData=NULL; - - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); - - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - - paramTextSize = BSG_PackList(paramText, 2, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_STORED_DATA, sealedData); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - key_usage_auth, auth) ); - - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, - data_usage_auth, dataAuth) ); - // Call TCS - TPMTRYRETURN( TCSP_Unseal( hContext, - keyHandle, - sealDataSize, - flatSealedData, - auth, - dataAuth, - &clearDataSize, - &clearData) ); - - // Verify Auth - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; - - paramTextSize = BSG_PackList(paramText, 3, - BSG_TPM_RESULT, &status, - BSG_TPM_COMMAND_CODE, &command, - BSG_TPM_SIZE32_DATA, &clearData_pack); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - key_usage_auth, auth, - hContext) ); - - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, - data_usage_auth, dataAuth, - hContext) ); - - // Unpack/return key structure - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); - - goto egress; - - abort_egress: - egress: - - if (flatSealedData) - TCS_FreeMemory( hContext, clearData); - - free(paramText); - return status; -} - -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { - - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); - - TPM_RESULT status = TPM_SUCCESS; - - // Call TCS - return ( TCSP_SaveState ( hContext ) ); - -} - - -// Function Reaches into unsupported TCS command, beware. -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, - const buffer_t *inbuf, - buffer_t *outbuf ) { - - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); - TPM_RESULT status = TPM_SUCCESS; - - // Generate Extra TCS Parameters - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; - - // Call TCS - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, - &resultTextSize, resultText) ); - - // Unpack/return key structure - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); - goto egress; - - abort_egress: - - egress: - TCS_FreeMemory(hContext, resultText); - free(resultText); - return status; -} diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h deleted file mode 100644 index 2fb0440..0000000 --- a/tools/vtpm_manager/manager/vtsp.h +++ /dev/null @@ -1,126 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtsp.h -// -// Higher level interface to TCS. -// -// ================================================================== - -#ifndef __VTSP_H__ -#define __VTSP_H__ - -#include "tcg.h" -#include "tcs.h" - -#define KEY_BUFFER_SIZE 2048 - -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, - const buffer_t *inbuf, - buffer_t *outbuf ); - -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, - TCS_AUTH *auth); - -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, - const TPM_ENTITY_TYPE entityType, - const UINT32 entityValue, - const TPM_AUTHDATA *usageAuth, - TPM_SECRET *sharedsecret, - TCS_AUTH *auth); - -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, - const TCS_AUTH *auth); - -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, - CRYPTO_INFO *cypto_info); - -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - const TPM_AUTHDATA *srkAuth, - CRYPTO_INFO *ek_cryptoInfo, - TCS_AUTH *auth); - -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, - const TPM_AUTHDATA *ownerAuth, - TCS_AUTH *auth); - -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_USAGE usage, - const TPM_AUTHDATA *newKeyAuth, - const TCS_KEY_HANDLE parentHandle, - const TPM_AUTHDATA *osapSharedSecret, - buffer_t *pubKeyBuf, - TCS_AUTH *auth); - -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, - const TCS_KEY_HANDLE hUnwrappingKey, - const buffer_t *rgbWrappedKeyBlob, - const TPM_AUTHDATA *parentAuth, - TPM_HANDLE *newKeyHandle, - TCS_AUTH *pAuth, - CRYPTO_INFO *cryptoinfo, - const BOOL skipTPMLoad); - -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE key_handle, - const buffer_t *bound_data, - const TPM_AUTHDATA *usage_auth, - buffer_t *clear_data, - TCS_AUTH *auth); - -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, - const buffer_t *inData, - buffer_t *outData); - -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_AUTHDATA *sealDataAuth, - const TPM_PCR_COMPOSITE *pcrComp, - const buffer_t *inData, - TPM_STORED_DATA *sealedData, - const TPM_SECRET *osapSharedSecret, - TCS_AUTH *auth); - -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, - const TPM_KEY_HANDLE keyHandle, - const TPM_STORED_DATA *sealedData, - const TPM_AUTHDATA *key_usage_auth, - const TPM_AUTHDATA *data_usage_auth, - buffer_t *outData, - TCS_AUTH *auth, - TCS_AUTH *dataAuth); - -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); - -#endif //_VTSP_H_ diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile deleted file mode 100644 index e33ae95..0000000 --- a/tools/vtpm_manager/migration/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -VPATH = ../manager - -BIND = vtpm_migratord -BINC = vtpm_migrator - -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c - -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) - -.PHONY: all -all: build - -.PHONY: build -build: $(BIND) $(BINC) - -.PHONY: install -install: build - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) - -.PHONY: clean -clean: - rm -f $(BINC) $(BIND) - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIND): $(OBJSD) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -$(BINC): $(OBJSC) - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ - -# libraries -LIBS += ../util/libTCGUtils.a diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c deleted file mode 100644 index 08986f4..0000000 --- a/tools/vtpm_manager/migration/vtpm_manager_if.c +++ /dev/null @@ -1,186 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_manager_if.c -// -// Provides functions to call local vtpm manager interface (Hotplug) -// -// ================================================================== - -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "vtpm_ipc.h" -#include "bsg.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" - -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; - -TPM_RESULT vtpm_manager_open(){ - - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); - return TPM_IOERROR; - } - - return TPM_SUCCESS; -} - -void vtpm_manager_close() { - - vtpm_ipc_close(&tx_ipc_h); - vtpm_ipc_close(&rx_ipc_h); -} - - -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, - buffer_t *command_param_buf, - TPM_RESULT *cmd_status, /* out */ - buffer_t *result_param_buf) { - - TPM_RESULT status = TPM_FAIL; - int size_read, size_write, i; - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; - TPM_TAG tag=VTPM_TAG_REQ; - - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); - adj_command = (BYTE *) malloc( adj_command_size ); - if (!adj_command) { - status = TPM_RESOURCES; - goto abort_egress; - } - - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); - BSG_PackList(adj_command, 4, - BSG_TYPE_UINT32, &dmi_id, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_COMMAND_CODE, &ord ); - - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); - - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); - for (i=0; i< adj_command_size; i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - if (size_write != (int) adj_command_size ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); - - // Read header for response to manager command - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); - for (i=0; i 0) { - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); - goto abort_egress; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - status = TPM_IOERROR; - goto abort_egress; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - - diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h deleted file mode 100644 index 8d52e66..0000000 --- a/tools/vtpm_manager/migration/vtpm_migrator.h +++ /dev/null @@ -1,104 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_migrator.h -// -// Public Interface header for VTPM Migrator -// -// ================================================================== - -#ifndef __VTPM_MIGRATOR_H__ -#define __VTPM_MIGRATOR_H__ - -#define VTPM_MTAG_REQ 0x02c1 -#define VTPM_MTAG_RSP 0x02c4 - -// Header sizes. -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) - -//*********************** Connection Info ************************** -#define VTPM_MIG_PORT 48879 - -//************************ Command Codes *************************** -#define VTPM_MORD_MIG_STEP1 0x00 -#define VTPM_MORD_MIG_STEP2 0x01 -#define VTPM_MORD_MIG_STEP3 0x02 -#define VTPM_MORD_MIG_STEP4 0x03 - -//************************ Return Codes **************************** -#define VTPM_SUCCESS 0 -#define VTPM_FAIL 1 - -/******************* Command Parameter API ************************* - -VTPM Command Format - tpm tag: 2 bytes - command size: 4 bytes // Size of command including header but not DMI - ord: 4 bytes // Command ordinal above - parameters: size - 10 bytes // Command Parameter - -VTPM Response Format - tpm tag: 2 bytes - response_size: 4 bytes - status: 4 bytes - parameters: size - 10 bytes - - -VTPM_Mig_Phase1: - Unsupported: (Handled by scripts) - -VTPM_Mig_Phase2 - Input Parameters: - domain_name_size: 4 bytes - domain_name : domain_name_size bytes - Output Parameters: - pub_exp_size: 4 bytes - pub_exp: pub_exp_size bytes - pub_mod_size: 4 bytes - pub_mod: pub_mod_size bytes - -VTPM_Mig_Phase3 - Input Parameters: - vtpm_state_size: 4 bytes - vtpm_state: vtpm_state_size bytes - Output Parameters: - none - -VTPM_Mig_Phase4 - Unsupported: (Handled by scripts) - - -*********************************************************************/ - -#endif //_VTPM_MANAGER_H_ diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c deleted file mode 100644 index de48b2d..0000000 --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c +++ /dev/null @@ -1,219 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// vtpm_migrator_if.c -// -// Provides functions to call open network connection & call -// a function on the vtpm_migratord on the destination -// -// ================================================================== - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "bsg.h" -#include "vtpm_migrator.h" - -static int sock_desc; - - -TPM_RESULT vtpm_migratord_open(char *server_address){ - - TPM_RESULT status = TPM_FAIL; - - /* network variables */ - struct in_addr ip_addr; - struct sockaddr_in server_addr; - int addr_len; - struct hostent *dns_info=NULL; - - /* set up connection to server*/ - dns_info = gethostbyname(server_address); - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); - - if(ip_addr.s_addr < 0) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - /* set up server variable */ - memset((char *)&server_addr, 0, sizeof(server_addr)); - server_addr.sin_family = AF_INET; - server_addr.sin_port = htons(VTPM_MIG_PORT); - server_addr.sin_addr.s_addr = ip_addr.s_addr; - - /* open socket, make connection */ - sock_desc = socket(AF_INET, SOCK_STREAM, 0); - - if (sock_desc < 0 ) { - status = TPM_IOERROR; - goto abort_egress; - } - - if (connect(sock_desc, - (struct sockaddr *)&server_addr, - sizeof(server_addr)) < 0 ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - status = TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - -void vtpm_migratord_close() { - close(sock_desc); -} - - -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, - buffer_t *command_param_buf, - TPM_RESULT *cmd_status, /* out */ - buffer_t *result_param_buf) { - - TPM_RESULT status = TPM_FAIL; - int size_read, size_write, i; - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; - TPM_TAG tag=VTPM_MTAG_REQ; - - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); - command = (BYTE *) malloc( command_size ); - if (!command) { - status = TPM_RESOURCES; - goto abort_egress; - } - - BSG_PackList(command, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &command_size, - BSG_TPM_COMMAND_CODE, &ord ); - - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); - - size_write = write(sock_desc, command, command_size); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); - for (i=0; i< command_size; i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); - status = TPM_IOERROR; - goto abort_egress; - } - - if (size_write != (int) command_size ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); - - // Read header for response - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); - for (i=0; i 0) { - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); - goto abort_egress; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - status = TPM_IOERROR; - goto abort_egress; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - status=TPM_SUCCESS; - goto egress; - - abort_egress: - egress: - - return status; -} - - diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c deleted file mode 100644 index 18b3bdb..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratorc.c +++ /dev/null @@ -1,211 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include - -#include "tcg.h" -#include "log.h" -#include "bsg.h" -#include "buffer.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, - char *name, - UINT32 instance) { - TPM_RESULT status, cmd_status; - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; - UINT32 offset; - struct pack_buf_t addr_data32; - - //===== Get Destination's Public Migration Key ====== - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); - - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, - &out_param_buf, - &cmd_status, - &mig_key_buf) ); - vtpm_migratord_close(); - - TPMTRYRETURN(cmd_status); - - //===== Load migration key into vtpm_manager ======== - - addr_data32.data = (BYTE *)server_addr; - addr_data32.size = strlen(server_addr) + 1; // Include the null - - TPMTRYRETURN ( buffer_init ( &out_param_buf, - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), - NULL ) ) ; - - offset = BSG_PackList(out_param_buf.bytes, 1, - BSG_TPM_SIZE32_DATA, &addr_data32); - - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); - - TPMTRYRETURN ( vtpm_manager_open() ); - - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, - &out_param_buf, - &cmd_status, - &empty_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - goto egress; - - abort_egress: - egress: - - buffer_free(&mig_key_buf); - buffer_free(&out_param_buf); - - return status; -} - - -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, - char *name, - UINT32 instance) { - TPM_RESULT status, cmd_status; - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; - struct pack_buf_t addr_data32, name_data32, state_data32; - - //===== Get vtpm state from vtpm_manager ======== - addr_data32.data = (BYTE *)server_addr; - addr_data32.size = strlen(server_addr) + 1; // Include the null - - TPMTRYRETURN ( buffer_init ( &out_param_buf, - (2 * sizeof(UINT32)) + addr_data32.size, - NULL ) ) ; - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TYPE_UINT32, &instance, - BSG_TPM_SIZE32_DATA, &addr_data32); - - TPMTRYRETURN ( vtpm_manager_open() ); - - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, - &out_param_buf, - &cmd_status, - &state_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - TPMTRYRETURN( buffer_free( &out_param_buf ) ); - - //===== Send vtpm state to destination ====== - name_data32.data = (BYTE *)name; - name_data32.size = strlen(name) + 1; // Include the null - state_data32.data = state_buf.bytes; - state_data32.size = buffer_len(&state_buf); - - TPMTRYRETURN( buffer_init( &out_param_buf, - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, - NULL ) ) ; - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TPM_SIZE32_DATA, &name_data32, - BSG_TPM_SIZE32_DATA, &state_data32); - - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); - - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, - &out_param_buf, - &cmd_status, - &empty_buf) ); - vtpm_migratord_close(); - - TPMTRYRETURN(cmd_status); - - goto egress; - - abort_egress: - egress: - - buffer_free( &out_param_buf); - buffer_free( &state_buf); - buffer_free( &empty_buf); - - return status; -} - - -// Usage vtpm_migrator addr domain_name instance step - -int main(int argc, char **argv) { - - /* variables for processing of command */ - TPM_RESULT status = TPM_FAIL; - char *server_addr, *name; - UINT32 instance, step; - - if (argc != 5) { - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); - status= TPM_BAD_PARAMETER; - goto abort_egress; - } - - server_addr = argv[1]; - name = argv[2]; - instance = atoi( argv[3] ); - step = atoi( argv[4] ); - - switch (step) { - case VTPM_MORD_MIG_STEP2: - status = handle_vtpm_mig_step2(server_addr, name, instance); - break; - - case VTPM_MORD_MIG_STEP3: - status = handle_vtpm_mig_step3(server_addr, name, instance); - break; - - default: - status = TPM_BAD_PARAMETER; - goto abort_egress; - break; - } - - goto egress; - abort_egress: - egress: - - return status; -} - diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c deleted file mode 100644 index ea18c8c..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratord.c +++ /dev/null @@ -1,202 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "log.h" -#include "bsg.h" -#include "buffer.h" -#include "vtpm_migrator.h" - -void build_error_msg( buffer_t *buf, TPM_RESULT status) { - TPM_TAG tag = VTPM_MTAG_RSP; - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; - - buffer_init(buf, out_param_size, NULL); - - BSG_PackList(buf->bytes, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_RESULT, &status ); -} - -int main() { - - /* network variables */ - int sock_descr, client_sock=-1, len; - struct sockaddr_in addr; - struct sockaddr_in client_addr; - unsigned int client_length; - int bytes; - - /* variables for processing of command */ - TPM_RESULT status = TPM_FAIL; - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; - TPM_TAG tag; - TPM_COMMAND_CODE ord; - UINT32 in_param_size, adj_param_size; - int i, size_read, size_write; - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; - - - /* setup socket */ - sock_descr = socket(AF_INET, SOCK_STREAM, 0); - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_ANY); - addr.sin_port = htons(VTPM_MIG_PORT); - - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); - return 1; - } - - listen(sock_descr, 10); - - for(;;) { - // ============ clear client info and wait for connection ========== - memset(&client_addr, 0, sizeof(client_addr)); - client_length = sizeof(client_addr); - - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); - client_sock=accept(sock_descr, &client_addr, &client_length); - if (client_sock == -1) { - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); - goto abort_command; - } else { - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); - } - - // =================== Read incoming command ====================== - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); - if (size_read > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); - for (i=0; i 0) { - buffer_init( &in_param_buf, adj_param_size, NULL); - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); - if (size_read > 0) { - for (i=0; i< size_read; i++) - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); - - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); - build_error_msg(&result_buf, TPM_IOERROR); - goto abort_command_with_error; - } - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - - if (size_read < (int)adj_param_size) { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); - build_error_msg(&result_buf, TPM_BAD_PARAMETER); - goto abort_command_with_error; - } - } else { - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); - } - - /* Handle Command */ - switch (ord) { - case VTPM_MORD_MIG_STEP2: - handle_vtpm_mig_step2(&in_param_buf, &result_buf); - break; - - case VTPM_MORD_MIG_STEP3: - handle_vtpm_mig_step3(&in_param_buf, &result_buf); - break; - - default: - build_error_msg(&result_buf, TPM_BAD_PARAMETER); - goto abort_command_with_error; - } - - abort_command_with_error: - /* Write Response */ - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); - - if (size_write > 0) { - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); - for (i=0; i< buffer_len(&result_buf); i++) { - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); - } - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); - } else { - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); - goto abort_command; - } - - if (size_write != (int) buffer_len(&result_buf) ) - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); - - abort_command: - close(client_sock); - buffer_free(&in_param_buf); - buffer_free(&result_buf); - - } // For (;;) - - return 0; -} - diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c deleted file mode 100644 index 0a8a2d5..0000000 --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c +++ /dev/null @@ -1,177 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "log.h" -#include "vtpm_migrator.h" -#include "vtpm_manager.h" - -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" -#define VTPM_SH_CMD_FTR "\"" -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" -#define VTPM_SH_ADD "vtpm_add_and_activate" -#define VTPM_SH_RESUME "vtpm_resume" - -// This must be updated to the longest command name. Currently GETINST -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) - -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) -{ - TPM_TAG tag = VTPM_TAG_RSP; - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; - TPM_RESULT status=TPM_SUCCESS, cmd_status; - UINT32 out_param_size; - - if ( (!in_param_buf) || (!result_buf) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // ================= Call manager and get mig key =============== - TPMTRYRETURN( vtpm_manager_open() ); - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, - &out_param_buf, // Empty - &cmd_status, - &mig_key_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - // ==================== return the mig key ===================== - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); - - TPMTRYRETURN( buffer_init(result_buf, - out_param_size, - NULL) ); - - BSG_PackList( result_buf->bytes, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, &out_param_size, - BSG_TPM_RESULT, &status); - - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, - mig_key_buf.bytes, buffer_len(&mig_key_buf)); - - goto egress; - - abort_egress: - buffer_free(result_buf); - build_error_msg(result_buf, status); - - egress: - return; -} - -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) -{ - TPM_TAG tag = VTPM_TAG_RSP; - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; - TPM_RESULT status=TPM_SUCCESS, cmd_status; - UINT32 out_param_size, instance; - char *shell_cmd_str=NULL; - size_t shell_cmd_strlen; - FILE *shell_f=NULL; - - if ( (!in_param_buf) || (!result_buf) ) { - status = TPM_BAD_PARAMETER; - goto abort_egress; - } - - // ================= Read Parameters =============== - struct pack_buf_t name_data32, state_data32; - - BSG_UnpackList(in_param_buf->bytes, 2, - BSG_TPM_SIZE32_DATA, &name_data32, - BSG_TPM_SIZE32_DATA, &state_data32); - - // Before using this string, protect us from a non-null term array. - if (name_data32.data[name_data32.size -1] != 0x00) { - name_data32.data[name_data32.size -1] = 0x00; - } - - // ====== Call hotplug-script and get an instance ====== - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 - - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); - - shell_f = popen(shell_cmd_str, "r"); - fscanf(shell_f, "%d", &instance); - pclose(shell_f); - - // ====== Call hotplug-script and add instance ====== - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, - name_data32.data, instance); - system(shell_cmd_str); - - // ========= Call vtpm_manager and load VTPM ======= - TPMTRYRETURN( buffer_init( &out_param_buf, - 2*sizeof(UINT32) + state_data32.size, - NULL) ); - - BSG_PackList(out_param_buf.bytes, 2, - BSG_TYPE_UINT32, &instance, - BSG_TPM_SIZE32_DATA, &state_data32); - - TPMTRYRETURN( vtpm_manager_open() ); - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, - &out_param_buf, - &cmd_status, - &empty_buf) ); - - vtpm_manager_close(); - - TPMTRYRETURN(cmd_status); - - // ====== Call hotplug-script and resume instance ====== - snprintf(shell_cmd_str, shell_cmd_strlen, - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); - system(shell_cmd_str); - - goto egress; - abort_egress: - egress: - free(shell_cmd_str); - - // In this case no params come back, so reuse build_error_msg even for succes. - build_error_msg(result_buf, status); - return; -} - diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile deleted file mode 100644 index 11af91e..0000000 --- a/tools/vtpm_manager/tcs/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libTCS.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c deleted file mode 100644 index cf3803c..0000000 --- a/tools/vtpm_manager/tcs/contextmgr.c +++ /dev/null @@ -1,224 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// contextmgr.c -// -// This file contains the context management functions for TCS. -// -// ================================================================== - -#include -#include -#include -#include "tcs.h" -#include "contextmgr.h" -#include "log.h" -#include "hashtable.h" - -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in - int BlockSize) { // in - - BLOCK* pCurrentBlock = NULL; - BLOCK* pBlock = NULL; - - // check incoming params - if (pContextHandle == NULL || BlockSize == 0) - return NULL; - - // Create New Block - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); - if (pBlock == NULL) - return (0); - - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); - if (pBlock->aMemory == NULL) - return (0); - - memset(pBlock->aMemory, 0, BlockSize); - pBlock->nBlockSize = BlockSize; - pBlock->pNextBlock = NULL; - - // search for the last block created where to add the - // newly created block - if(pContextHandle->pTopBlock != NULL) { - pCurrentBlock = pContextHandle->pTopBlock; - while(pCurrentBlock->pNextBlock != NULL) - pCurrentBlock = pCurrentBlock->pNextBlock; - - - pCurrentBlock->pNextBlock= pBlock; - } else - pContextHandle->pTopBlock = pBlock; - - - pContextHandle->nBlockCount++; - - return pBlock->aMemory; -} - - -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in - BYTE* pTCPA_BYTEs) { // in - BLOCK* pCurrentBlock = NULL; - BLOCK* pParentBlock = NULL; - BOOL bFound = FALSE; - - if (pContextHandle == NULL) - return FALSE; - - - // Search for the Block in the context by aMemory pointer - pParentBlock = NULL; - pCurrentBlock = pContextHandle->pTopBlock; - - while(pCurrentBlock != NULL) { - // If aMemory block is found, delete it - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { - // if it is the top Block, remove it from the top, - // otherwise remove it from the ParentBlock and stitch - // the NextBlock to the ParentBlock - if(pParentBlock == NULL) - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; - else - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; - - // delete memory Block associated with pointer pTCPA_BYTEs - free(pCurrentBlock->aMemory); - pCurrentBlock->aMemory = NULL; - - free(pCurrentBlock); - pCurrentBlock = pParentBlock; - - pContextHandle->nBlockCount--; - bFound = TRUE; - } - - if(pCurrentBlock != NULL) { - pParentBlock = pCurrentBlock; - pCurrentBlock = pCurrentBlock->pNextBlock; - } - } - - return bFound; -} - -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in - TPM_RESOURCE_TYPE type, // in - TPM_HANDLE handle) { // in - HANDLE_LIST* pNewHandle = NULL; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if (pContextHandle == NULL) - return 0; - - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); - - if (pNewHandle == NULL) - return (0); - - pNewHandle->handle = handle; - pNewHandle->type = type; - pNewHandle->pNextHandle = pContextHandle->pHandleList; - - pContextHandle->pHandleList = pNewHandle; - - return 1; -} - -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in - TPM_HANDLE handle) { // in - - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, - *pLastHandle = pCurrentHandle; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); - - if (pContextHandle == NULL) - return 0; - - while (1) { - - if (pCurrentHandle->handle == handle) { // Found element - if (pCurrentHandle == pLastHandle) { // First element in list - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; - free(pCurrentHandle); - } else { // Ordinary element - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; - free(pCurrentHandle); - } - - return 1; - - } else { // Not found yet; - pLastHandle = pCurrentHandle; - pCurrentHandle = pCurrentHandle->pNextHandle; - if (pCurrentHandle == NULL) // Found end of list - return 0; - } - - } -} - -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in - HANDLE_LIST* pCurrentHandle; - BOOL returncode = TRUE; - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); - - if (pContextHandle == NULL) - return 1; - - pCurrentHandle = pContextHandle->pHandleList; - while (pCurrentHandle != NULL) { - - switch (pCurrentHandle->type) { - case TPM_RT_KEY: - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); - break; - case TPM_RT_AUTH: - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); - break; - default: - returncode = FALSE; - } - - pCurrentHandle = pCurrentHandle->pNextHandle; - - } - - return 1; -} diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h deleted file mode 100644 index e3fdf0f..0000000 --- a/tools/vtpm_manager/tcs/contextmgr.h +++ /dev/null @@ -1,82 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// contextmgr.c -// -// This file contains the context management functions for TCS. -// -// ================================================================== - -#ifndef __CONTEXTMGR_H__ -#define __CONTEXTMGR_H__ - -#include "tcg.h" - -#define BLOCK_SIZE 300 - -typedef struct block { - int nBlockSize; - BYTE* aMemory; - struct block* pNextBlock; -} BLOCK; - -typedef struct handle_List { - TPM_HANDLE handle; - TPM_RESOURCE_TYPE type; - struct handle_List* pNextHandle; -} HANDLE_LIST; - -typedef struct context_handle { - TCS_CONTEXT_HANDLE handle; - int nBlockCount; - BLOCK* pTopBlock; - HANDLE_LIST* pHandleList; -} CONTEXT_HANDLE; - -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in - int BlockSize); // in - -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in - BYTE* pTCPA_BYTEs); // in - - -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in - TPM_RESOURCE_TYPE type, // in - TPM_HANDLE handle); // in - -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in - TPM_HANDLE handle); // in - -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in - -#endif //_CONTEXTMGR_H_ diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c deleted file mode 100644 index 7c1378c..0000000 --- a/tools/vtpm_manager/tcs/tcs.c +++ /dev/null @@ -1,1192 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcs.c -// -// This file contains the functions that implement a TCS. -// -// ================================================================== - -#include -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "tcs.h" -#include "contextmgr.h" -#include "tpmddl.h" -#include "log.h" -#include "hashtable.h" -#include "hashtable_itr.h" - -// Static Global Vars for the TCS -static int TCS_m_nCount = 0; - -#define TCPA_MAX_BUFFER_LENGTH 0x2000 - -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; - -struct hashtable *context_ht; - -// -------------------------- Hash table functions -------------------- - -static unsigned int hashfunc32(void *ky) { - return (* (UINT32 *) ky); -} - -static int equals32(void *k1, void *k2) { - return (*(UINT32 *) k1 == *(UINT32 *) k2); -} - -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); -} - -// --------------------------------------------------------------------------------- -// Initialization/Uninitialization SubComponent API -// --------------------------------------------------------------------------------- -TPM_RESULT TCS_create() { - TDDL_RESULT hRes = TDDL_E_FAIL; - TPM_RESULT result = TPM_FAIL; - - if (TCS_m_nCount == 0) { - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); - hRes = TDDL_Open(); - - context_ht = create_hashtable(10, hashfunc32, equals32); - - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { - result = TPM_SUCCESS; - TCS_m_nCount++; - } else { - result = TPM_IOERROR; - hashtable_destroy(context_ht, 1); - } - } else - TCS_m_nCount++; - - return(result); -} - - -void TCS_destroy() -{ - TCS_m_nCount--; - - if (TCS_m_nCount == 0) { - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); - TDDL_Close(); - - struct hashtable_itr *context_itr; - TCS_CONTEXT_HANDLE *hContext; - - // Close all the TCS contexts. TCS should evict keys based on this - if (hashtable_count(context_ht) > 0) { - context_itr = hashtable_iterator(context_ht); - do { - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); - - } while (hashtable_iterator_advance(context_itr)); - free(context_itr); - } - hashtable_destroy(context_ht, 1); - } - -} - -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in - UINT32 MemSize, // in - BYTE** ppMemPtr) {// out - - TPM_RESULT returnCode = TPM_FAIL; - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if (pContextHandle != NULL && ppMemPtr != NULL) { - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); - returnCode = TPM_SUCCESS; - } - - return returnCode; -} - -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in - BYTE* pMemory) { // in - TPM_RESULT returnCode = TPM_FAIL; - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if ( (pContextHandle != NULL && pMemory != NULL) && - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) - returnCode = TPM_SUCCESS; - - - return returnCode; -} - -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out - TPM_RESULT returnCode = TPM_FAIL; - TCS_CONTEXT_HANDLE *newContext; - - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); - - if (hContext) { - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); - if (pContextHandle == NULL) - return TPM_SIZE; - - // initialize to 0 - pContextHandle->nBlockCount = 0; - pContextHandle->pTopBlock = NULL; - pContextHandle->pHandleList = NULL; - - // Create New Block - AddMemBlock(pContextHandle, BLOCK_SIZE); - - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); - - if (hashtable_search(context_ht, &newContext) !=NULL) - *newContext += 1; - - pContextHandle->handle = *newContext; - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { - free(newContext); - free(pContextHandle); - returnCode = TPM_FAIL; - } else { - *hContext = *newContext; - returnCode = TPM_SUCCESS; - } - } - - return(returnCode); -} - -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in - //FIXME: TCS SHOULD Track failed auths and make sure - //we don't try and re-free them here. - TPM_RESULT returnCode = TPM_FAIL; - - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); - - if(pContextHandle != NULL) { - // Print test info - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); - - // free memory for all the blocks - DeleteMemBlock(pContextHandle, NULL ); - pContextHandle->pTopBlock = NULL; - - FreeHandleList(pContextHandle); - if (pContextHandle->pHandleList != NULL) - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); - - // Release the TPM's resources - if (hashtable_remove(context_ht, &hContext) == NULL) - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); - - free(pContextHandle); - returnCode = TPM_SUCCESS; - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); - return(returnCode); -} - -// ------------------------------------------------------------------ -// Internal Functions -// ------------------------------------------------------------------ -int packAuth(BYTE* dst, TCS_AUTH* auth) { - // CHECK: according to the command specs, the outgoing auth params are: - // nonceEven - // nonceOdd - // continueAuthSession - // auth digest for return params - // - // this is a bit different than this code... - - return BSG_PackList(dst, 4, - BSG_TYPE_UINT32, &(auth->AuthHandle), - BSG_TPM_NONCE, &(auth->NonceOdd), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), - BSG_TPM_AUTHDATA, &(auth->HMAC)); -} - -int unpackAuth(TCS_AUTH* auth, BYTE* src) { - return BSG_UnpackList(src, 3, - BSG_TPM_NONCE, &(auth->NonceEven), - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), - BSG_TPM_AUTHDATA, &(auth->HMAC)); -} - -// ------------------------------------------------------------------ -// Authorization Commands -// ------------------------------------------------------------------ - -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonce0) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; - UINT32 paramSize = 0; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (authHandle == NULL || nonce0 == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_UnpackList(OutBuf+i, 2, - BSG_TYPE_UINT32, authHandle, - BSG_TPM_NONCE, nonce0); - - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in - TPM_ENTITY_TYPE entityType, // in - UINT32 entityValue, // in - TPM_NONCE nonceOddOSAP, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonceEven, // out - TPM_NONCE* nonceEvenOSAP) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT16, &entityType, - BSG_TYPE_UINT32, &entityValue, - BSG_TPM_NONCE, &nonceOddOSAP); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_UnpackList(OutBuf+i, 3, - BSG_TYPE_UINT32, authHandle, - BSG_TPM_NONCE, nonceEven, - BSG_TPM_NONCE, nonceEvenOSAP); - - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in - UINT16 protocolID, // in - UINT32 encOwnerAuthSize, // in - BYTE* encOwnerAuth, // in - UINT32 encSrkAuthSize, // in - BYTE* encSrkAuth, // in - UINT32* SrkSize, // in, out - BYTE** Srk, // in, out - TCS_AUTH* ownerAuth) // in, out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT16, &protocolID, - BSG_TYPE_UINT32, &encOwnerAuthSize); - - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); - InLength += encOwnerAuthSize; - InLength += BSG_Pack( BSG_TYPE_UINT32, - &encSrkAuthSize, - InBuf+InLength); - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); - InLength += encSrkAuthSize; - memcpy(InBuf+InLength, *Srk, *SrkSize); - InLength += *SrkSize; - InLength += packAuth(InBuf+InLength, ownerAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, - &InLength, - InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS){ - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_KEY srkPub; - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); - unpackAuth(ownerAuth, OutBuf+i); - - // fill output params - BYTE tempBuf[1024]; - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { - return(TPM_SIZE); - } - memcpy(*Srk, tempBuf, *SrkSize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - - -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTH* ownerAuth) { // in, out - - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - - InLength += packAuth(InBuf+InLength, ownerAuth); - - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS){ - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - unpackAuth(ownerAuth, OutBuf+i); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - - -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &handle); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (!DeleteHandleFromList(hContext, handle)) - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); - - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Print debug info - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); - - } - - return(returnCode); -} - -// TPM Mandatory -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_DIGEST inDigest, // in - TPM_PCRVALUE* outDigest) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &pcrNum, - BSG_TPM_DIGEST, &inDigest); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - - // unpack to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ - // Extract the remaining output parameters - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_ENCAUTH encAuth, // in - UINT32 pcrInfoSize, // in - BYTE* PcrInfo, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* pubAuth, // in, out - UINT32* SealedDataSize, // out - BYTE** SealedData) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &keyHandle, - BSG_TPM_ENCAUTH, encAuth, - BSG_TYPE_UINT32, &pcrInfoSize); - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); - InLength += pcrInfoSize; - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); - memcpy(InBuf+InLength, inData, inDataSize); - InLength += inDataSize; - InLength += packAuth(InBuf+InLength, pubAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) - == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_STORED_DATA sealedData; - - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); - unpackAuth(pubAuth, OutBuf+i); - - // fill SealedData - BYTE tempBuf[1024]; - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*SealedData, tempBuf, *SealedDataSize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE parentHandle, // in - UINT32 SealedDataSize, // in - BYTE* SealedData, // in - TCS_AUTH* parentAuth, // in, out - TCS_AUTH* dataAuth, // in, out - UINT32* DataSize, // out - BYTE** Data) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || - DataSize == NULL || Data == NULL) - return TPM_BAD_PARAMETER; - - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &parentHandle); - memcpy(InBuf+InLength, SealedData, SealedDataSize); - InLength += SealedDataSize; - InLength += packAuth(InBuf+InLength, parentAuth); - InLength += packAuth(InBuf+InLength, dataAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList( OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*Data, OutBuf+i, *DataSize); - i += *DataSize; - i += unpackAuth(parentAuth, OutBuf+i); - unpackAuth(dataAuth, OutBuf+i); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* privAuth, // in, out - UINT32* outDataSize, // out - BYTE** outData) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) - return TPM_BAD_PARAMETER; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 5, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &keyHandle, - BSG_TYPE_UINT32, &inDataSize); - memcpy(InBuf+InLength, inData, inDataSize); - InLength += inDataSize; - InLength += packAuth(InBuf+InLength, privAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) - return TPM_SIZE; - - memcpy(*outData, OutBuf+i, *outDataSize); - i += *outDataSize; - unpackAuth(privAuth, OutBuf+i); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hWrappingKey, // in - TPM_ENCAUTH KeyUsageAuth, // in - TPM_ENCAUTH KeyMigrationAuth, // in - UINT32* pcKeySize, // in, out - BYTE** prgbKey, // in, out - TCS_AUTH* pAuth) // in, out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) - return TPM_BAD_PARAMETER; - - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 6, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hWrappingKey, - BSG_TPM_ENCAUTH, KeyUsageAuth, - BSG_TPM_ENCAUTH, KeyMigrationAuth); - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); - InLength += *pcKeySize; - InLength += packAuth(InBuf+InLength, pAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_RESULT, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - TPM_KEY wrappedKey; - - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); - unpackAuth(pAuth, OutBuf+i); - - // Fill prgbKey - BYTE tempBuf[1024]; - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) - return TPM_SIZE; - - memcpy(*prgbKey, tempBuf, *pcKeySize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hUnwrappingKey, // in - UINT32 cWrappedKeyBlobSize, // in - BYTE* rgbWrappedKeyBlob, // in - TCS_AUTH* pAuth, // in, out - TCS_KEY_HANDLE* phKeyTCSI, // out - TCS_KEY_HANDLE* phKeyHMAC) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) - return TPM_BAD_PARAMETER; - - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hUnwrappingKey); - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); - InLength += cWrappedKeyBlobSize; - InLength += packAuth(InBuf+InLength, pAuth); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { - // Extract the remaining output parameters - i += BSG_Unpack(BSG_TYPE_UINT32, - OutBuf+i, - phKeyTCSI); - unpackAuth(pAuth, OutBuf+i); - - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); - } - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - - return(returnCode); -} - -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, &hKey); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (!DeleteHandleFromList(hContext, hKey)) { - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); - } - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in - UINT32* bytesRequested, // in, out - BYTE** randomBytes) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (bytesRequested == NULL || *randomBytes == NULL){ - return TPM_BAD_PARAMETER; - } - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TYPE_UINT32, bytesRequested); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in - TPM_NONCE antiReplay, // in - UINT32* pubEndorsementKeySize, // out - BYTE** pubEndorsementKey, // out - TPM_DIGEST* checksum) // out -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // check input params - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { - return TPM_BAD_PARAMETER; - } - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 4, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal, - BSG_TPM_NONCE, &antiReplay); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - int i = BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - // Extract the remaining output parameters - TPM_PUBKEY pubEK; - i += BSG_UnpackList(OutBuf+i, 2, - BSG_TPM_PUBKEY, &pubEK, - BSG_TPM_DIGEST, checksum); - - // fill EndorsementKey - BYTE tempBuf[1024]; - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { - return TPM_SIZE; - } - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in -{ - // setup input/output parameters block - TPM_TAG tag = TPM_TAG_RQU_COMMAND; - UINT32 paramSize = 0; - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; - TPM_RESULT returnCode = TPM_SUCCESS; - - // setup the TPM driver input and output buffers - TDDL_RESULT hRes = TDDL_E_FAIL; - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; - - // Convert Byte Input parameter in the input byte stream InBuf - InLength = BSG_PackList(InBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &ordinal); - // fill paramSize again as we now have the correct size - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); - - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); - - // call the TPM driver - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { - // unpack OutBuf to get the tag, paramSize, & returnCode - BSG_UnpackList(OutBuf, 3, - BSG_TPM_TAG, &tag, - BSG_TYPE_UINT32, ¶mSize, - BSG_TPM_COMMAND_CODE, &returnCode); - - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); - } - } - - return(returnCode); -} - - -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in - BYTE *inData, // in - UINT32 *outDataSize,// in/out - BYTE *outData) { // out - - TDDL_RESULT hRes; - - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); - //FIXME: Add Context Management - hRes = TDDL_TransmitData( inData, - inDataSize, - outData, - outDataSize); - - if (hRes == TDDL_SUCCESS) { - return TPM_SUCCESS; - } else { - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); - return TPM_IOERROR; - } - -} diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h deleted file mode 100644 index 83b9cd0..0000000 --- a/tools/vtpm_manager/tcs/tcs.h +++ /dev/null @@ -1,245 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcs.h -// -// This file declares the TCS API -// -// ================================================================== - -#ifndef __TCS_H__ -#define __TCS_H__ - -#include "tcg.h" -#include "contextmgr.h" -#include "buffer.h" - -#define HANDLE_NULL 0 - -// ------------------------------------------------------------------ -// Exposed API -// ------------------------------------------------------------------ - -TPM_RESULT TCS_create(); -void TCS_destroy(); - -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); - -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); - -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in - UINT32 MemSize, // in - BYTE** ppMemPtr ); //out - -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in - BYTE* pMemory); // in - -// ------------------------------------------------------------------ -// Exposed API -// ------------------------------------------------------------------ - -// TPM v1.1B Command Set - -// Authorzation -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonce0 // out - ); - -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in - TPM_ENTITY_TYPE entityType, // in - UINT32 entityValue, // in - TPM_NONCE nonceOddOSAP, // in - TCS_AUTHHANDLE* authHandle, // out - TPM_NONCE* nonceEven, // out - TPM_NONCE* nonceEvenOSAP // out - ); - -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in - UINT16 protocolID, // in - UINT32 encOwnerAuthSize, // in - BYTE* encOwnerAuth, // in - UINT32 encSrkAuthSize, // in - BYTE* encSrkAuth, // in - UINT32* SrkSize, // in, out - BYTE** Srk, // in, out - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle // in - ); - -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in - TCS_AUTHHANDLE handle, // in - TPM_RESOURCE_TYPE resourceType //in - ); - -// TPM Mandatory -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_DIGEST inDigest, // in - TPM_PCRVALUE* outDigest // out - ); - -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in - TPM_PCRINDEX pcrNum, // in - TPM_PCRVALUE* outDigest // out - ); - -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_NONCE antiReplay, // in - UINT32* PcrDataSize, // in, out - BYTE** PcrData, // in, out - TCS_AUTH* privAuth, // in, out - UINT32* sigSize, // out - BYTE** sig // out - ); - -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - TPM_ENCAUTH encAuth, // in - UINT32 pcrInfoSize, // in - BYTE* PcrInfo, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* pubAuth, // in, out - UINT32* SealedDataSize, // out - BYTE** SealedData // out - ); - -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE parentHandle, // in - UINT32 SealedDataSize, // in - BYTE* SealedData, // in - TCS_AUTH* parentAuth, // in, out - TCS_AUTH* dataAuth, // in, out - UINT32* DataSize, // out - BYTE** Data // out - ); - -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in - TPM_DIRINDEX dirIndex, // in - TPM_DIRVALUE newContents, // in - TCS_AUTH* ownerAuth // in, out - ); - -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in - TPM_DIRINDEX dirIndex, // in - TPM_DIRVALUE* dirValue // out - ); - -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 inDataSize, // in - BYTE* inData, // in - TCS_AUTH* privAuth, // in, out - UINT32* outDataSize, // out - BYTE** outData // out - ); - -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hWrappingKey, // in - TPM_ENCAUTH KeyUsageAuth, // in - TPM_ENCAUTH KeyMigrationAuth, // in - UINT32* pcKeySize, // in, out - BYTE** prgbKey, // in, out - TCS_AUTH* pAuth // in, out - ); - -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hUnwrappingKey, // in - UINT32 cWrappedKeyBlobSize, // in - BYTE* rgbWrappedKeyBlob, // in - TCS_AUTH* pAuth, // in, out - TCS_KEY_HANDLE* phKeyTCSI, // out - TCS_KEY_HANDLE* phKeyHMAC // out - ); - -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey, // in - TCS_AUTH* pAuth, // in, out - UINT32* pcPubKeySize, // out - BYTE** prgbPubKey // out - ); - -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE hKey // in - ); - -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in - TCS_KEY_HANDLE keyHandle, // in - UINT32 areaToSignSize, // in - BYTE* areaToSign, // in - TCS_AUTH* privAuth, // in, out - UINT32* sigSize, // out - BYTE** sig // out - ); - -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in - UINT32* bytesRequested, // in, out - BYTE** randomBytes // out - ); - -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in - UINT32 inDataSize, // in - BYTE* inData // in - ); - -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in - TPM_NONCE antiReplay, // in - UINT32* pubEndorsementKeySize, // out - BYTE** pubEndorsementKey, // out - TPM_DIGEST* checksum // out - ); - - -// Non-Standard TCSP calls -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in - -//Give direct access to TransmitData. -// Key and Auth Management is done before transfering command to TDDL. -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in - BYTE *inData, // in - UINT32 *outDataSize,// in/out - BYTE *outData); // out - -///////////// Private Functions //////////////////// -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); - -#endif //TCS_H diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h deleted file mode 100644 index e7e54f1..0000000 --- a/tools/vtpm_manager/tcs/tpmddl.h +++ /dev/null @@ -1,69 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tpmddl.c -// -// This file defines the TDDLI API -// -// ================================================================== - -#ifndef __TPMDDL_H__ -#define __TPMDDL_H__ - -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 - -#define TDDL_E_FAIL 1 -#define TDDL_E_SUCCESS 0 -#define TDDL_SUCCESS 0 - -typedef unsigned int TDDL_UINT32; -typedef TDDL_UINT32 TDDL_RESULT; -typedef unsigned char TDDL_BYTE; - -TDDL_RESULT TDDL_Open(); -void TDDL_Close(); -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, - TDDL_UINT32 insize, - TDDL_BYTE* out, - TDDL_UINT32* outsize); -TDDL_RESULT TDDL_GetStatus(); -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, - TDDL_UINT32 sub, - TDDL_BYTE* buffer, - TDDL_UINT32* size); -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, - TDDL_UINT32 sub, - TDDL_BYTE* buffer, - TDDL_UINT32* size); - -#endif // __TPMDDL_H__ diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c deleted file mode 100644 index 74bbdca..0000000 --- a/tools/vtpm_manager/tcs/transmit.c +++ /dev/null @@ -1,147 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include -#include - -#include "tcg.h" -#include "buffer.h" -#include "log.h" -#include "tpmddl.h" - -// flag to track whether TDDL has been opened -static int g_TDDL_open = 0; -static int g_tx_fd = -1; // the fd to the TPM - -#ifndef DUMMY_TPM - #define TPM_TX_FNAME "/dev/tpm0" - static int *g_rx_fdp = &g_tx_fd; -#else - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" - static int g_rx_fd = -1; - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM -#endif - -TPM_RESULT -TDDL_TransmitData( TDDL_BYTE* in, - TDDL_UINT32 insize, - TDDL_BYTE* out, - TDDL_UINT32* outsize) { - TPM_RESULT status = TPM_SUCCESS; - TDDL_UINT32 i; - - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); - for(i = 0 ; i < insize ; i++) - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); - - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - ssize_t size = 0; - - // send the request - size = write (g_tx_fd, in, insize); - if (size < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); - ERRORDIE (TPM_IOERROR); - } - else if ((TDDL_UINT32) size < insize) { - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); - // ... ? - } - - // read the response - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); - if (size < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); - ERRORDIE (TPM_IOERROR); - } - - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); - for(i = 0 ; i < size ; i++) - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); - - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); - - *outsize = size; - // close connection - goto egress; - - abort_egress: - egress: - return status; -} - -TPM_RESULT TDDL_Open() { - - TDDL_RESULT status = TDDL_SUCCESS; - - if (g_TDDL_open) - return TPM_FAIL; - -#ifdef DUMMY_TPM - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); -#endif - - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); - if (g_tx_fd < 0) { - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); - return TPM_IOERROR; - } - - g_TDDL_open = 1; - - return status; -} - -void TDDL_Close() { - if (! g_TDDL_open) - return; - - if (g_tx_fd>= 0) { - if (close(g_tx_fd) < 0) - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); - g_tx_fd = -1; - } - - if (*g_rx_fdp>= 0) { - if (close(*g_rx_fdp) < 0) - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); - *g_rx_fdp = -1; - } - - g_TDDL_open = 0; - -} diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile deleted file mode 100644 index 36bc38f..0000000 --- a/tools/vtpm_manager/util/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk - -BIN = libTCGUtils.a - -.PHONY: all -all: build - -.PHONY: build -build: $(BIN) - -.PHONY: install -install: build - -.PHONY: clean -clean: - rm -f *.a *.so *.o *.rpm $(DEP_FILES) - -.PHONY: mrproper -mrproper: clean - rm -f *~ - -$(BIN): $(OBJS) - $(AR) rcs $(BIN) $(OBJS) diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c deleted file mode 100644 index fa36ce7..0000000 --- a/tools/vtpm_manager/util/bsg.c +++ /dev/null @@ -1,829 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// bsg.cpp -// -// This file will handle all the TPM Byte Stream functions -// -// ================================================================== - -#include -#include -#include -#include -#include "tcg.h" -#include "crypto.h" -#include "bsg.h" -#include "log.h" - -static int g_log_recursion_level = 0; - -// a largest buffer size. if we get a buf size bigger than this when unpacking, -// will complain! -#define BSG_MAX_BUF_SIZE (1<<18) - -#define bsglog(fmt, ...) do { \ - int __i; \ - for (__i=0; __i < g_log_recursion_level; __i++) { \ - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ - } \ - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ - } while (0) - - -// FIXME: trigger the selfcheck--need to use glibc hook to do this -//BOOL dummy1 = BSG_static_selfcheck(); - - -// Interpretting Types -// ------------------- -// -// Incoming Types are composed of two parts {format, info} squished into a -// BSG_UINT32. The first 4 bits is a format spec indicating what type of -// data it is. If the first 4 bits are zero the info corresponds to a value in -// BSG_s_fmt[]. This is a structure whose composition is described in -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the -// data (in bytes) being passed in. For example a UINT32 being passed in would -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, -// this is interpretted as the end of the structure, and the result is returned. - -// these flags are mutually exclusive, so I'll just make them -// format values which indicate the semantics of the 'info' part and the source -// data. The above description has been accordingly adjusted. - -// format values for determining what type of data the incoming type is -// it's a 4 bit value, occupying the high 4 bits -#define __FMT_CONST (1UL << 28) // Constant sized value -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. -#define __FMT_HSIZE (4UL << 28) // A number of handles -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists - // of {size32, data} but we're to pack only the - // data as that is already packed, and so - // can/must be unpacked without - // explicitly reading it size - -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) - -// constant (8/16/32-bits) -#define FMT_U8 (__FMT_CONST | 1UL) -#define FMT_U16 (__FMT_CONST | 2UL) -#define FMT_U32 (__FMT_CONST | 4UL) - -// const with a compiler-computed size -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) - -// other data (size bytes) -// Used primarily for DIGESTS -> FMT_DATA(20) -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) - -// 16/32-bit size followed by N bytes of data -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) - -// 16-bit size followed by N key handles -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) - -#define DIGEST_SIZE 20 -typedef BSG_UINT32 BSG_HANDLE; - -// TCPA_AUTH has 11 fields! -#define MAX_FIELDS 11 -typedef struct BSG_Format -{ - BSG_Type type; - const char* name; - BSG_UINT32 fields[MAX_FIELDS + 1]; -} BSG_Format; - -/* - * TCPA structure data formats - */ -// this has to be manually kept in sync with the -// Type enum!! the static_selfcheck() function should be used regularly! -static BSG_Format s_fmt[] = -{ - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, - - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, - - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, - - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", - {FMT_SIZE16_HANDLES, 0}}, - - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { - BSG_TPM_ALGORITHM_ID, - BSG_TPM_ENC_SCHEME, - BSG_TPM_SIG_SCHEME, - FMT_SIZE32_DATA, - 0}}, - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, - {BSG_TPM_KEY, "BSG_TPM_KEY", { - BSG_TPM_VERSION, - BSG_TPM_KEY_USAGE, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_KEY_PARMS, - FMT_SIZE32_DATA, // the PCR_INFO - BSG_TPM_STORE_PUBKEY, - FMT_SIZE32_DATA, // the encrypted part - 0}}, - - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { - BSG_TPM_PUBKEY, - BSG_TPM_MIGRATE_SCHEME, - BSG_TPM_DIGEST, 0}}, - - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { - BSG_TPM_COMMAND_CODE, - BSG_TPM_RESULT, 0 }}, - - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { - BSG_TPM_DIGEST, - BSG_TPM_DIGEST, - FMT_DATA(2), - FMT_SIZE32_DATA, 0}}, - - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, - FMT_SIZE32_DATA, - 0} }, - - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_COMPOSITE_HASH, - 0} }, - - - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { - BSG_TPM_VERSION, - FMT_SIZE32_DATA, - FMT_SIZE32_DATA, - 0}}, - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { - BSG_TPM_ALGORITHM_ID, - BSG_TPM_ENC_SCHEME, - FMT_SIZE16_DATA, - 0}}, - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { - BSG_TPM_PAYLOAD_TYPE, - BSG_TPM_SECRET, - BSG_TPM_SECRET, - BSG_TPM_DIGEST, - BSG_TPM_STORE_PRIVKEY, - 0}}, - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { - BSG_TPM_PAYLOAD_TYPE, - BSG_TPM_SECRET, - BSG_TPM_DIGEST, - FMT_U32, - BSG_TPM_STORE_PRIVKEY, - 0}}, - - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { - BSG_TPM_VERSION, - FMT_DATA(4), - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_NONCE, - 0}}, - - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { - BSG_TPM_VERSION, - FMT_U32, - BSG_TPM_CHOSENID_HASH, - BSG_TPM_PUBKEY, - 0}}, - - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, - - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { - FMT_U8, - FMT_U8, - 0}}, - - {BSG_TCS_AUTH, "TCS_AUTH", { - BSG_TYPE_UINT32, - BSG_TPM_NONCE, - BSG_TPM_NONCE, - BSG_TYPE_BOOL, - BSG_TPM_AUTHDATA, - 0}}, - - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { - BSG_TPM_VERSION, - BSG_TPM_KEY_USAGE, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_KEY_PARMS, - FMT_SIZE32_DATA, - BSG_TPM_STORE_PUBKEY, - 0}}, - - {BSG_PACKED, "BSG_PACKED", { - __FMT_PACKED, - 0 }}, - - {BSG_TYPE_MAX, "", {0}}, -}; - - -static const BSG_Format* find_format (BSG_Type t) { - BSG_Format * f = s_fmt; - - if (t >= BSG_TYPE_MAX) { - return NULL; - } - - // WARNING: this depends on the enum and s_fmt[] array being in sync! make - // sure to run the static_selfcheck() to make sure - f = s_fmt + (t - BSG_TYPE_FIRST); - - return f; -} - -// -// a consistency-checking routine which can be run at compile time -// (ie. immediately after compilation) -// -// tasks: -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] -// -// conditions: -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first -// Type has value 0, not 1 -// -// FIXME: should have a function be passed in here which is called if the test -// fails. Then the caller can decide what to do: abort, notify, whatever -// -BOOL BSG_static_selfcheck () -{ - int i; - - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); - bsglog ("failure at %i, allegedly %s\n", - i, s_fmt[i - BSG_TYPE_FIRST].name); - abort(); - return FALSE; - } - } - - bsglog ("%s\n", "BSG: static_selfcheck success!"); - return TRUE; -} - - -/** - * Flatten a TCPA structure into a buffer in big-endian format - * @type: TCPA structure type - * @src: (IN) TCPA structure (OUT) end of TCPA structure - * @dst: (OUT) flattened data - * Returns: Flattened size or -1 for unknown types - */ -// make it so that it can just run through the whole process and return -// the packed size, without packing anything. this will be done if dst is NULL. -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) -{ - // check incoming parameters - if (*src == NULL) - return 0; - - const BSG_BYTE* s = *src; - BSG_BYTE* d = dst; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 - { - BSG_UINT32 val = 0; - switch (size) { - case 1: val = * (BYTE*) s; break; - case 2: val = * (unsigned short*) s; break; - case 4: val = * (BSG_UINT32*) s; break; - } - if (dst) - BSG_PackConst(val, size, d); - - s += size; - d += size; - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when - // this is used. - - if (dst) { - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); - memcpy(d, s, size); - } - - s += size; - d += size; - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles - - BSG_UINT32 psize = 0; - switch (size) { - case 1: psize = * (BYTE*) s; break; - case 2: psize = * (unsigned short*) s; break; - case 4: psize = * (BSG_UINT32*) s; break; - } - - if (dst) - BSG_PackConst(psize, size, d); - - s += size; - d += size; - - // now 's' points to an address, so cast it to BSG_BYTE** - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); - s += sizeof(BSG_BYTE*); - - if (format == __FMT_HSIZE) {// This is a list of psize Handles - if (dst) { - BSG_HANDLE* d2 = (BSG_HANDLE*) d; - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; - BSG_UINT32 i; - for (i = 0; i < psize; i++) - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); - - } - d += psize * sizeof(BSG_HANDLE); - } else {// If it's not psize handles, it's psize data. - if (psize > 0) { - if (dst) { - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", - psize, pdata, d); - memcpy(d, pdata, psize); - } - } - d += psize; - } - } else if (format == __FMT_PACKED) { - // the source buffer is a pack_constbuf_t, which has a size and a - // pointer. just copy the buffer value, the size is not included in the - // output stream. - pack_constbuf_t * buf = (pack_constbuf_t*) s; - - if (dst) { - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", - buf->size, buf->data, d); - memcpy(d, buf->data, buf->size); - } - - s += buf->size; - d += buf->size; - } else if (format == 0) {// No flags are set. This is a structure & it should - // be looked up in the bsg_s_fmt[] - - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); - return -1; - } - - if (dst) - bsglog ("BSG_Pack type %s\n", x->name); - - - // iterate through the fields - const BSG_UINT32* f = x->fields; - for (; *f; f++) { - int fsize; - - g_log_recursion_level++; - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); - g_log_recursion_level--; - - if (fsize <= 0) - return fsize; - - d += fsize; - } - } else { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); - return -1; - } - - *src = s; - return (d - dst); -} - -/** - * Unflatten a TCPA structure from a buffer in big-endian format - * @type: TCPA structure type - * @src: flattened data - * @dst: (IN) TCPA structure (OUT) end of TCPA structure - * Returns: Flattened size - * Note: Returns flattened size NOT the unpacked structure size - */ -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { - // check incoming parameters - if (src == NULL) - return 0; - - - const BSG_BYTE* s = src; - BSG_BYTE* d = dst ? *dst:NULL; - if (dst && !d) - dst = NULL; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 - - BSG_UINT32 val = BSG_UnpackConst(s, size); - - if (dst) { - switch (size) { - case 1: *(BYTE *) d = (BSG_BYTE) val; break; - case 2: *(unsigned short*) d = (unsigned short) val; break; - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; - } - } - - s += size; - d += size; - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. - if (dst) - memcpy(d, s, size); - - d += size; - s += size; - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles - - BSG_UINT32 psize = BSG_UnpackConst(s, size); - - if (psize > BSG_MAX_BUF_SIZE) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", - BSG_MAX_BUF_SIZE); - return -1; - } - - if (dst) { - switch (size) { - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; - case 2: *(unsigned short*) d = (unsigned short) psize; break; - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; - } - } - - s += size; - d += size; - - BSG_BYTE* pdata = NULL; - - if (psize) { - if (format == __FMT_HSIZE) { // This is a list of psize Handles - if (dst) { - BSG_HANDLE* s2 = (BSG_HANDLE*) s; - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); - if (!pdata) - return -1; - - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; - BSG_UINT32 i; - for (i = 0; i < psize; i++) { - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); - } - } - s += psize * sizeof(BSG_HANDLE); - } else { // If it's not psize handles, it's psize data. - if (dst) { - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); - if (!pdata) - return -1; - memcpy(pdata, s, psize); - } - s += psize; - } - } - if (dst) - *(void**) d = pdata; - - d += sizeof(void*); - } else if (format == __FMT_PACKED) { - - // this doesn't make sense for unpacking! - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " - "This does not make sense\n"); - - return -1; - } else if (format == 0) {// No flags are set. This is a structure & it should - // be looked up in the bsg_s_fmt[] - - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); - return -1; - } - - const BSG_UINT32* f = x->fields; - for (; *f; f++) { - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); - if (fsize <= 0) - return fsize; - s += fsize; - } - } - - if (dst) - *dst = d; - return (s - src); -} - -/** - * Free memory associated with unpacked TCPA structure - * @type: TCPA structure type - * @src: (IN) TCPA structure (OUT) end of TCPA structure - * Note: Destroy should be called on all structures created with Unpack - * to ensure that any allocated memory is freed - */ -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { - BSG_BYTE* s = *src; - - BSG_UINT32 size = __FMT_MASK_SIZE(type); - BSG_UINT32 format = __FMT_MASK_FORMAT(type); - - if ((src == NULL) || (*src == NULL)) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); - return; - } - - if (format == __FMT_CONST || format == __FMT_DATA) - s += size; - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { - s += size; - BSG_BYTE* ptr = *(BSG_BYTE**) s; - free(ptr); - s += sizeof(void*); - } else if (format == __FMT_PACKED) { - - // this doesn't make sense for unpacking, hence also for Destroy() - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " - "This does not make sense\n"); - - return; - } else if (format == 0) { - const BSG_Format* x = find_format (type); - if (x == NULL) { - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); - return; - } - - const BSG_UINT32* f = x->fields; - for (; *f; f++) - BSG_Destroy_private((BSG_Type) *f, &s); - } - - *src = s; -} - -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) -{ - const BSG_BYTE* src2 = (const BSG_BYTE*) src; - return BSG_Pack_private(type, &src2, dst); -} - -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) -{ - BSG_BYTE* dst2 = (BSG_BYTE*) dst; - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); -} - -void BSG_Destroy(BSG_Type type, void* src) -{ - BSG_BYTE* src2 = (BSG_BYTE*) src; - BSG_Destroy_private(type, &src2); -} - -/** - * Pack a 8/16/32-bit constant into a buffer in big-endian format - * @val: constant value - * @size: constant size in bytes (1, 2, or 4) - * @dst: (OUT) buffer - */ -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); - - switch (size) { - case 4: - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); - dst[3] = (BSG_BYTE)(val & 0xff); - break; - case 2: - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); - dst[1] = (BSG_BYTE)(val & 0xff); - break; - case 1: - dst[0] = (BSG_BYTE)(val & 0xff); - break; - } -} - -/** - * Unpack a 8/16/32-bit constant from a buffer in big-endian format - * @src: buffer - * @size: constant size in bytes (1, 2, or 4) - */ -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { - BSG_UINT32 val = 0; - - if (src == NULL) - return 0; - - switch (size) { - case 4: - val = (((BSG_UINT32) src[0]) << 24 - | ((BSG_UINT32) src[1]) << 16 - | ((BSG_UINT32) src[2]) << 8 - | (BSG_UINT32) src[3]); - break; - case 2: - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); - break; - case 1: - val = (BSG_UINT32) src[0]; - break; - } - return val; -} - -// Pack a list of parameters. Beware not to send values, but rather you must -// send a pointer to your values Instead. This includes UINT32's. -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { - int ParamNumber; - BSG_Type format; - BSG_BYTE* val = NULL; - int size=0; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - //Strangeness with int is because gcc wanted an int rather than a enum of ints. - format = (BSG_Type) va_arg( paramList, int ); - val = va_arg( paramList, BSG_BYTE* ); - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); - } - - va_end (paramList); - - return size; -} - -// Unpack a list of parameters. -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { - int ParamNumber = 0; - BSG_Type format; - BSG_BYTE* val = NULL; - int size = 0; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - format = (BSG_Type) va_arg( paramList, int ); - val = va_arg( paramList, BSG_BYTE* ); - - size += BSG_Unpack(format, src + size, val); - } - - va_end( paramList ); - - return size; -} - -// Destroy any memory allocated by calls to unpack -void BSG_DestroyList(int ParamCount, ... ) { - int ParamNumber = 0; - BSG_Type argType; - BSG_BYTE* paramValue = NULL; - - va_list paramList; - va_start( paramList, ParamCount ); - - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { - argType = (BSG_Type) va_arg( paramList, int ); - paramValue = va_arg( paramList, BSG_BYTE* ); - - BSG_Destroy(argType, paramValue); - } - - va_end( paramList ); - - return; -} - - -// and a tuple version -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { - int i; - - for (i = 0; i < numParams; i++) - BSG_Destroy (params[i].type, params[i].addr); - - return TPM_SUCCESS; -} - - -// -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed -// by the caller later -// - -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { - int size = BSG_Pack (type, src, NULL); - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); - if (dest == NULL) - return -1; - - size = BSG_Pack(type, src, dest); - *o_dst = dest; - return size; -} - - - -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { - va_list args; - int size; - - va_start (args, ParamCount); - size = BSG_PackList (NULL, ParamCount, args); - va_end (args); - - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); - if (dest == NULL) - return -1; - - va_start (args, ParamCount); - size = BSG_PackList (dest, ParamCount, args); - va_end (args); - - *outBuffer = dest; - return size; -} diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h deleted file mode 100644 index 0896812..0000000 --- a/tools/vtpm_manager/util/bsg.h +++ /dev/null @@ -1,166 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// bsg.h -// -// This file contains API's for the TPM Byte Stream functions -// -// ================================================================== - -#ifndef __BSG_H__ -#define __BSG_H__ - -#include -#include "buffer.h" - -typedef unsigned int BSG_UINT32; -typedef unsigned char BSG_BYTE; - -// forward decl -struct pack_const_tuple_t; - -struct pack_tuple_t; - - -/** - * Byte stream generator - */ -// this has to be manually kept in sync with the -// s_fmt array!! -// but now we have a self-check function which can make sure things are well -// (if used!) -typedef enum BSG_Type -{ - BSG_TYPE_FIRST = 1, - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an - // unused/special value - BSG_TYPE_UINT16, - BSG_TYPE_BYTE, - BSG_TYPE_BOOL, - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by - // a pointer to that much data. can pass a - // struct pack_buf_t as the param - BSG_TPM_TAG, - BSG_TPM_HANDLE, - BSG_TPM_RESULT, - BSG_TPM_RESOURCE_TYPE, - BSG_TPM_COMMAND_CODE, - BSG_TPM_AUTH_DATA_USAGE, - BSG_TPM_ALGORITHM_ID, - BSG_TPM_PROTOCOL_ID, - BSG_TPM_KEY_USAGE, - BSG_TPM_ENC_SCHEME, - BSG_TPM_SIG_SCHEME, - BSG_TPM_MIGRATE_SCHEME, - BSG_TPM_KEY_FLAGS, - BSG_TPM_AUTHDATA, - BSG_TPM_SECRET, - BSG_TPM_ENCAUTH, - BSG_TPM_PAYLOAD_TYPE, - - BSG_TPM_VERSION, - BSG_TPM_DIGEST, - BSG_TPM_COMPOSITE_HASH, - BSG_TPM_CHOSENID_HASH, - BSG_TPM_NONCE, - BSG_TPM_KEY_HANDLE, - BSG_TPM_KEY_HANDLE_LIST, - BSG_TPM_KEY_PARMS, - BSG_TPM_RSA_KEY_PARMS, - BSG_TPM_STORE_PUBKEY, - BSG_TPM_PUBKEY, - BSG_TPM_KEY, - - BSG_TPM_MIGRATIONKEYAUTH, - BSG_TCPA_AUDIT_EVENT, - BSG_TCPA_EVENT_CERT, - BSG_TPM_PCR_SELECTION, - BSG_TPM_PCR_COMPOSITE, - BSG_TPM_PCR_INFO, - BSG_TPM_STORED_DATA, - BSG_TPM_SYMMETRIC_KEY, - BSG_TPM_STORE_PRIVKEY, - BSG_TPM_STORE_ASYMKEY, - BSG_TPM_MIGRATE_ASYMKEY, - BSG_TPM_QUOTE_INFO, - BSG_TPM_IDENTITY_CONTENTS, - BSG_TPM_PCRVALUE, - BSG_TCPA_PCR_FLAGS, - BSG_TCS_AUTH, - - // this is the BSG_TPM_KEY struct without the encData field - BSG_TPM_KEY_NONSENSITIVE, - - BSG_PACKED, - - BSG_TYPE_MAX -} BSG_Type; - -struct pack_const_tuple_t { - BSG_Type type; - const void * addr; -}; - - -typedef struct pack_tuple_t { - BSG_Type type; - void * addr; -} pack_tuple_t; - -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); -void BSG_Destroy(BSG_Type type, void* src); - -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed -// by the caller later. returns size of allocated buffer, or -1 in case -// allocation failed -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); - -// a va_list version of PackList -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); -void BSG_DestroyList(int ParamCount, ... ); - -// wrapper of PackList which uses a buffer_t -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); - -// and a tuple version -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); - -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); - -BOOL BSG_static_selfcheck (); - -#endif diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c deleted file mode 100644 index df48bc2..0000000 --- a/tools/vtpm_manager/util/buffer.c +++ /dev/null @@ -1,226 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - - -#include -#include -#include -#include -#include - -#include "tcg.h" -#include "bsg.h" -#include "buffer.h" - -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); - -// -// buffer functions! -// - -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { - if (initsize == 0) { - memset(buf, 0, sizeof(*buf)); - return TPM_SUCCESS; - } - - - buf->bytes = (BYTE*) malloc (initsize); - if (buf->bytes == NULL) - return TPM_RESOURCES; - - buf->size = initsize; - buf->alloc_size = initsize; - - if (initval) - memcpy (buf->bytes, initval, initsize); - - buf->is_owner = TRUE; - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { - - buf->size = initsize; - buf->alloc_size = initsize; - buf->bytes = initval; - - buf->is_owner = TRUE; - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); - buf->is_owner = TRUE; - - return status; -} - - - -// make an alias to a constant array -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { - // TODO: try to enforce the const things somehow! - buf->bytes = (BYTE*) val; - buf->size = size; - buf->alloc_size = 0; // this field is now unneeded - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - -// make an alias into buf, with given offset and length -// if len = 0, make the alias go to the end of buf -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, - tpm_size_t offset, tpm_size_t len) { - if (offset + len > b->size) { - return TPM_NOSPACE; - } - - buf->bytes = b->bytes + offset; - buf->size = len > 0 ? len : b->size - offset; - - //VS/ buf->alloc_size = 0; - if (len ==0) - buf->alloc_size = b->alloc_size - offset; - else - buf->alloc_size = MIN(b->alloc_size - offset, len); - - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - -// make an alias buffer_t into bytestream, with given length -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { - - buf->size = size; - buf->alloc_size = size; - buf->bytes = val; - - buf->is_owner = FALSE; - - return TPM_SUCCESS; -} - - - -// copy into the start of dest -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) -{ - TPM_RESULT status = TPM_SUCCESS; - - if (dest->alloc_size < src->size) { - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); - } - - memcpy (dest->bytes, src->bytes, src->size); - dest->size = src->size; - - //VS/ dest->is_owner = TRUE; - - abort_egress: - - return status; -} - - - -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); -} - - -void buffer_memset (buffer_t * buf, BYTE b) { - memset (buf->bytes, b, buf->size); -} - - -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { - TPM_RESULT status = TPM_SUCCESS; - - if (buf->alloc_size < buf->size + len) { - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); - } - - memcpy (buf->bytes + buf->size, bytes, len); - - buf->size += len; - - goto egress; - - abort_egress: - - egress: - - return status; -} - -tpm_size_t buffer_len (const buffer_t* buf) { - return buf->size; -} - -TPM_RESULT buffer_free (buffer_t * buf) { - if (buf && buf->is_owner && buf->bytes != NULL) { - free (buf->bytes); - buf->bytes = NULL; - buf->size = buf->alloc_size = 0; - - } - - return TPM_SUCCESS; -} - -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { - - // we want to realloc to twice the size, or the new size, whichever - // bigger - - BYTE * tmpbuf = NULL; - - newsize = MAX (buf->alloc_size * 2, newsize); - - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); - if (tmpbuf == NULL) - return TPM_SIZE; - - - buf->bytes = tmpbuf; - buf->alloc_size = newsize; - - return TPM_SUCCESS; -} diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h deleted file mode 100644 index d8a9abc..0000000 --- a/tools/vtpm_manager/util/buffer.h +++ /dev/null @@ -1,95 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#ifndef __VTPM_BUFFER_H__ -#define __VTPM_BUFFER_H__ - -#include // for pointer NULL -#include "tcg.h" - -typedef UINT32 tpm_size_t; - -// first version, probably will be expanded... - -#define NULL_BUF {0,0,0,0} - -typedef struct { - // private!! - tpm_size_t size, alloc_size; - BYTE * bytes; - - BOOL is_owner; // do we own this buffer, and need to free it? -} buffer_t; - -// allocate the buffer if initsize > 0, copying over initval if provided -TPM_RESULT buffer_init (buffer_t * buf, - tpm_size_t initsize, - const BYTE* initval); - -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * -TPM_RESULT buffer_init_convert (buffer_t * buf, - tpm_size_t initsize, - BYTE* initval); - -// make an alias to a constant array, no copying -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); - -// make an alias into buf, with given offset and length -// if len = 0, make the alias go to the end of buf -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, - tpm_size_t offset, tpm_size_t); - -// make an alias buffer into a bytestream -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, - tpm_size_t size, BYTE* val); - -// "copy constructor" -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); - - -// copy into the start of a -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); - -// are they equal? -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); - -// set the buffer to a constant byte -void buffer_memset (buffer_t * buf, BYTE b); - -tpm_size_t buffer_len (const buffer_t* buf); - -TPM_RESULT buffer_free (buffer_t * buf); - -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); - -#endif // _TOOLS_H_ diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c deleted file mode 100644 index aff0e2b..0000000 --- a/tools/vtpm_manager/util/hashtable.c +++ /dev/null @@ -1,316 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable.c - * - tools/blktap2/drivers/hashtable.c - */ - -#include "hashtable.h" -#include "hashtable_private.h" -#include -#include -#include -#include - -/* -Credit for primes table: Aaron Krowne - http://br.endernet.org/~akrowne/ - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html -*/ -static const unsigned int primes[] = { -53, 97, 193, 389, -769, 1543, 3079, 6151, -12289, 24593, 49157, 98317, -196613, 393241, 786433, 1572869, -3145739, 6291469, 12582917, 25165843, -50331653, 100663319, 201326611, 402653189, -805306457, 1610612741 -}; -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); -const float max_load_factor = 0.65; - -/*****************************************************************************/ -struct hashtable * -create_hashtable(unsigned int minsize, - unsigned int (*hashf) (void*), - int (*eqf) (void*,void*)) -{ - struct hashtable *h; - unsigned int pindex, size = primes[0]; - /* Check requested hashtable isn't too large */ - if (minsize > (1u << 30)) return NULL; - /* Enforce size as prime */ - for (pindex=0; pindex < prime_table_length; pindex++) { - if (primes[pindex] > minsize) { size = primes[pindex]; break; } - } - h = (struct hashtable *)malloc(sizeof(struct hashtable)); - if (NULL == h) return NULL; /*oom*/ - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); - if (NULL == h->table) { free(h); return NULL; } /*oom*/ - memset(h->table, 0, size * sizeof(struct entry *)); - h->tablelength = size; - h->primeindex = pindex; - h->entrycount = 0; - h->hashfn = hashf; - h->eqfn = eqf; - h->loadlimit = (unsigned int) ceil(size * max_load_factor); -#ifdef HASHTABLE_THREADED - pthread_mutex_init(&h->mutex, NULL); -#endif - return h; -} - -/*****************************************************************************/ -unsigned int -hash(struct hashtable *h, void *k) -{ - unsigned int i = h->hashfn(k); - i += ~(i << 9); - i ^= ((i >> 14) | (i << 18)); /* >>> */ - i += (i << 4); - i ^= ((i >> 10) | (i << 22)); /* >>> */ - return i; -} - -/*****************************************************************************/ -static int -hashtable_expand(struct hashtable *h) -{ - /* Double the size of the table to accomodate more entries */ - struct entry **newtable; - struct entry *e; - struct entry **pE; - unsigned int newsize, i, index; - /* Check we're not hitting max capacity */ - if (h->primeindex == (prime_table_length - 1)) return 0; - newsize = primes[++(h->primeindex)]; - - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); - if (NULL != newtable) - { - memset(newtable, 0, newsize * sizeof(struct entry *)); - /* This algorithm is not 'stable'. ie. it reverses the list - * when it transfers entries between the tables */ - for (i = 0; i < h->tablelength; i++) { - while (NULL != (e = h->table[i])) { - h->table[i] = e->next; - index = indexFor(newsize,e->h); - e->next = newtable[index]; - newtable[index] = e; - } - } - free(h->table); - h->table = newtable; - } - /* Plan B: realloc instead */ - else - { - newtable = (struct entry **) - realloc(h->table, newsize * sizeof(struct entry *)); - if (NULL == newtable) { (h->primeindex)--; return 0; } - h->table = newtable; - memset(newtable[h->tablelength], 0, newsize - h->tablelength); - for (i = 0; i < h->tablelength; i++) { - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { - index = indexFor(newsize,e->h); - if (index == i) - { - pE = &(e->next); - } - else - { - *pE = e->next; - e->next = newtable[index]; - newtable[index] = e; - } - } - } - } - h->tablelength = newsize; - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); - return -1; -} - -/*****************************************************************************/ -unsigned int -hashtable_count(struct hashtable *h) -{ - unsigned int count; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - count = h->entrycount; -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return count; -} - -/*****************************************************************************/ -int -hashtable_insert(struct hashtable *h, void *k, void *v) -{ - /* This method allows duplicate keys - but they shouldn't be used */ - unsigned int index; - struct entry *e; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - if (++(h->entrycount) > h->loadlimit) - { - /* Ignore the return value. If expand fails, we should - * still try cramming just this value into the existing table - * -- we may not have memory for a larger table, but one more - * element may be ok. Next time we insert, we'll try expanding again.*/ - hashtable_expand(h); - } - e = (struct entry *)malloc(sizeof(struct entry)); - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ - e->h = hash(h,k); - index = indexFor(h->tablelength,e->h); - e->k = k; - e->v = v; - e->next = h->table[index]; - h->table[index] = e; -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return -1; -} - -/*****************************************************************************/ -void * /* returns value associated with key */ -hashtable_search(struct hashtable *h, void *k) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e; - unsigned int hashvalue, index; - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); - e = h->table[index]; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return e->v; - } - e = e->next; - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return NULL; -} - -/*****************************************************************************/ -void * /* returns value associated with key */ -hashtable_remove(struct hashtable *h, void *k) -{ - /* TODO: consider compacting the table when the load factor drops enough, - * or provide a 'compact' method. */ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e; - struct entry **pE; - void *v; - unsigned int hashvalue, index; - - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hash(h,k)); - pE = &(h->table[index]); - e = *pE; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) - { - *pE = e->next; - h->entrycount--; - v = e->v; - freekey(e->k); - free(e); - return v; - } - pE = &(e->next); - e = e->next; - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return NULL; -} - -/*****************************************************************************/ -/* destroy */ -void -hashtable_destroy(struct hashtable *h, int free_values) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - unsigned int i; - struct entry *e, *f; - struct entry **table = h->table; - if (free_values) - { - for (i = 0; i < h->tablelength; i++) - { - e = table[i]; - while (NULL != e) - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } - } - } - else - { - for (i = 0; i < h->tablelength; i++) - { - e = table[i]; - while (NULL != e) - { f = e; e = e->next; freekey(f->k); free(f); } - } - } - free(h->table); -#ifdef HASHTABLE_THREADED - pthread_mutex_destroy(&h->mutex); -#endif - free(h); -} diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h deleted file mode 100644 index dedc60a..0000000 --- a/tools/vtpm_manager/util/hashtable.h +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable.h - * - tools/blktap2/drivers/hashtable.h - */ - -#ifndef __HASHTABLE_CWC22_H__ -#define __HASHTABLE_CWC22_H__ - -struct hashtable; - -/* Example of use: - * - * struct hashtable *h; - * struct some_key *k; - * struct some_value *v; - * - * static unsigned int hash_from_key_fn( void *k ); - * static int keys_equal_fn ( void *key1, void *key2 ); - * - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); - * k = (struct some_key *) malloc(sizeof(struct some_key)); - * v = (struct some_value *) malloc(sizeof(struct some_value)); - * - * (initialise k and v to suitable values) - * - * if (! hashtable_insert(h,k,v) ) - * { exit(-1); } - * - * if (NULL == (found = hashtable_search(h,k) )) - * { printf("not found!"); } - * - * if (NULL == (found = hashtable_remove(h,k) )) - * { printf("Not found\n"); } - * - */ - -/* Macros may be used to define type-safe(r) hashtable access functions, with - * methods specialized to take known key and value types as parameters. - * - * Example: - * - * Insert this at the start of your file: - * - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); - * - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. - * These operate just like hashtable_insert etc., with the same parameters, - * but their function signatures have 'struct some_key *' rather than - * 'void *', and hence can generate compile time errors if your program is - * supplying incorrect data as a key (and similarly for value). - * - * Note that the hash and key equality functions passed to create_hashtable - * still take 'void *' parameters instead of 'some key *'. This shouldn't be - * a difficult issue as they're only defined and passed once, and the other - * functions will ensure that only valid keys are supplied to them. - * - * The cost for this checking is increased code size and runtime overhead - * - if performance is important, it may be worth switching back to the - * unsafe methods once your program has been debugged with the safe methods. - * This just requires switching to some simple alternative defines - eg: - * #define insert_some hashtable_insert - * - */ - -/***************************************************************************** - * create_hashtable - - * @name create_hashtable - * @param minsize minimum initial size of hashtable - * @param hashfunction function for hashing keys - * @param key_eq_fn function for determining key equality - * @return newly created hashtable or NULL on failure - */ - -struct hashtable * -create_hashtable(unsigned int minsize, - unsigned int (*hashfunction) (void*), - int (*key_eq_fn) (void*,void*)); - -/***************************************************************************** - * hashtable_insert - - * @name hashtable_insert - * @param h the hashtable to insert into - * @param k the key - hashtable claims ownership and will free on removal - * @param v the value - does not claim ownership - * @return non-zero for successful insertion - * - * This function will cause the table to expand if the insertion would take - * the ratio of entries to table size over the maximum load factor. - * - * This function does not check for repeated insertions with a duplicate key. - * The value returned when using a duplicate key is undefined -- when - * the hashtable changes size, the order of retrieval of duplicate key - * entries is reversed. - * If in doubt, remove before insert. - */ - -int -hashtable_insert(struct hashtable *h, void *k, void *v); - -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ -{ \ - return hashtable_insert(h,k,v); \ -} - -/***************************************************************************** - * hashtable_search - - * @name hashtable_search - * @param h the hashtable to search - * @param k the key to search for - does not claim ownership - * @return the value associated with the key, or NULL if none found - */ - -void * -hashtable_search(struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ -valuetype * fnname (struct hashtable *h, keytype *k) \ -{ \ - return (valuetype *) (hashtable_search(h,k)); \ -} - -/***************************************************************************** - * hashtable_remove - - * @name hashtable_remove - * @param h the hashtable to remove the item from - * @param k the key to search for - does not claim ownership - * @return the value associated with the key, or NULL if none found - */ - -void * /* returns value */ -hashtable_remove(struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ -valuetype * fnname (struct hashtable *h, keytype *k) \ -{ \ - return (valuetype *) (hashtable_remove(h,k)); \ -} - - -/***************************************************************************** - * hashtable_count - - * @name hashtable_count - * @param h the hashtable - * @return the number of items stored in the hashtable - */ -unsigned int -hashtable_count(struct hashtable *h); - - -/***************************************************************************** - * hashtable_destroy - - * @name hashtable_destroy - * @param h the hashtable - * @param free_values whether to call 'free' on the remaining values - */ - -void -hashtable_destroy(struct hashtable *h, int free_values); - -#endif /* __HASHTABLE_CWC22_H__ */ diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c deleted file mode 100644 index dcf42c8..0000000 --- a/tools/vtpm_manager/util/hashtable_itr.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/blktap2/drivers/hashtable_itr.c - */ - -#include "hashtable.h" -#include "hashtable_private.h" -#include "hashtable_itr.h" -#include /* defines NULL */ - -/*****************************************************************************/ -/* hashtable_iterator - iterator constructor */ - -struct hashtable_itr * -hashtable_iterator(struct hashtable *h) -{ - unsigned int i, tablelength; - struct hashtable_itr *itr = (struct hashtable_itr *) - malloc(sizeof(struct hashtable_itr)); - if (NULL == itr) return NULL; -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - itr->h = h; - itr->e = NULL; - itr->parent = NULL; - tablelength = h->tablelength; - itr->index = tablelength; - if (0 == h->entrycount) { -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return itr; - } - - for (i = 0; i < tablelength; i++) - { - if (NULL != h->table[i]) - { - itr->e = h->table[i]; - itr->index = i; - break; - } - } -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return itr; -} - -/*****************************************************************************/ -/* key - return the key of the (key,value) pair at the current position */ -/* value - return the value of the (key,value) pair at the current position */ - -void * -hashtable_iterator_key(struct hashtable_itr *i) -{ return i->e->k; } - -void * -hashtable_iterator_value(struct hashtable_itr *i) -{ return i->e->v; } - -/*****************************************************************************/ -/* advance - advance the iterator to the next element - * returns zero if advanced to end of table */ - -int -hashtable_iterator_advance(struct hashtable_itr *itr) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&itr->h->mutex); -#endif - unsigned int j,tablelength; - struct entry **table; - struct entry *next; - int ret; - if (NULL == itr->e) { /* stupidity check */ - ret = 0; - goto egress; - } - - next = itr->e->next; - if (NULL != next) - { - itr->parent = itr->e; - itr->e = next; - ret = -1; - goto egress; - } - - tablelength = itr->h->tablelength; - itr->parent = NULL; - if (tablelength <= (j = ++(itr->index))) - { - itr->e = NULL; - ret = 0; - goto egress; - } - table = itr->h->table; - while (NULL == (next = table[j])) - { - if (++j >= tablelength) - { - itr->index = tablelength; - itr->e = NULL; - ret = 0; - goto egress; - } - } - itr->index = j; - itr->e = next; - ret = -1; - - egress: -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&itr->h->mutex); -#endif - return ret; -} - -/*****************************************************************************/ -/* remove - remove the entry at the current iterator position - * and advance the iterator, if there is a successive - * element. - * If you want the value, read it before you remove: - * beware memory leaks if you don't. - * Returns zero if end of iteration. */ - -int -hashtable_iterator_remove(struct hashtable_itr *itr) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&itr->h->mutex); -#endif - struct entry *remember_e, *remember_parent; - int ret; - - /* Do the removal */ - if (NULL == (itr->parent)) - { - /* element is head of a chain */ - itr->h->table[itr->index] = itr->e->next; - } else { - /* element is mid-chain */ - itr->parent->next = itr->e->next; - } - /* itr->e is now outside the hashtable */ - remember_e = itr->e; - itr->h->entrycount--; - freekey(remember_e->k); - - /* Advance the iterator, correcting the parent */ - remember_parent = itr->parent; - ret = hashtable_iterator_advance(itr); - if (itr->parent == remember_e) { itr->parent = remember_parent; } - free(remember_e); -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&itr->h->mutex); -#endif - return ret; -} - -/*****************************************************************************/ -int /* returns zero if not found */ -hashtable_iterator_search(struct hashtable_itr *itr, - struct hashtable *h, void *k) -{ -#ifdef HASHTABLE_THREADED - pthread_mutex_lock(&h->mutex); -#endif - struct entry *e, *parent; - unsigned int hashvalue, index; - int ret; - - hashvalue = hash(h,k); - index = indexFor(h->tablelength,hashvalue); - - e = h->table[index]; - parent = NULL; - while (NULL != e) - { - /* Check hash value to short circuit heavier comparison */ - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) - { - itr->index = index; - itr->e = e; - itr->parent = parent; - itr->h = h; - ret= -1; - goto egress; - } - parent = e; - e = e->next; - } - ret = 0; - -egress: -#ifdef HASHTABLE_THREADED - pthread_mutex_unlock(&h->mutex); -#endif - return ret; -} diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h deleted file mode 100644 index 35654e0..0000000 --- a/tools/vtpm_manager/util/hashtable_itr.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/blktap2/drivers/hashtable_itr.h - */ - - -#ifndef __HASHTABLE_ITR_CWC22__ -#define __HASHTABLE_ITR_CWC22__ -#include "hashtable.h" -#include "hashtable_private.h" /* needed to enable inlining */ - -/*****************************************************************************/ -/* This struct is only concrete here to allow the inlining of two of the - * accessor functions. */ -struct hashtable_itr -{ - struct hashtable *h; - struct entry *e; - struct entry *parent; - unsigned int index; -}; - - -/*****************************************************************************/ -/* hashtable_iterator - */ - -struct hashtable_itr * -hashtable_iterator(struct hashtable *h); - -/*****************************************************************************/ -/* hashtable_iterator_key - * - return the value of the (key,value) pair at the current position */ - -void *hashtable_iterator_key(struct hashtable_itr *i); - -/*****************************************************************************/ -/* value - return the value of the (key,value) pair at the current position */ - -void *hashtable_iterator_value(struct hashtable_itr *i); - -/*****************************************************************************/ -/* advance - advance the iterator to the next element - * returns zero if advanced to end of table */ - -int -hashtable_iterator_advance(struct hashtable_itr *itr); - -/*****************************************************************************/ -/* remove - remove current element and advance the iterator to the next element - * NB: if you need the value to free it, read it before - * removing. ie: beware memory leaks! - * returns zero if advanced to end of table */ - -int -hashtable_iterator_remove(struct hashtable_itr *itr); - -/*****************************************************************************/ -/* search - overwrite the supplied iterator, to point to the entry - * matching the supplied key. - h points to the hashtable to be searched. - * returns zero if not found. */ -int -hashtable_iterator_search(struct hashtable_itr *itr, - struct hashtable *h, void *k); - -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ -{ \ - return (hashtable_iterator_search(i,h,k)); \ -} - - - -#endif /* __HASHTABLE_ITR_CWC22__*/ diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h deleted file mode 100644 index d87a7f9..0000000 --- a/tools/vtpm_manager/util/hashtable_private.h +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2005, Intel Corp - * Copyright (c) 2002, Christopher Clark - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of the original author; nor the names of any contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * There are duplicates of this code in: - * - tools/xenstore/hashtable_private.h - * - tools/blktap2/drivers/hashtable_private.h - */ - -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ -#define __HASHTABLE_PRIVATE_CWC22_H__ - -#include "hashtable.h" -#ifdef HASHTABLE_THREADED -#include -#endif - -/*****************************************************************************/ -struct entry -{ - void *k, *v; - unsigned int h; - struct entry *next; -}; - -struct hashtable { - unsigned int tablelength; - struct entry **table; - unsigned int entrycount; - unsigned int loadlimit; - unsigned int primeindex; - unsigned int (*hashfn) (void *k); - int (*eqfn) (void *k1, void *k2); -#ifdef HASHTABLE_THREADED - pthread_mutex_t mutex; -#endif -}; - -/*****************************************************************************/ -unsigned int -hash(struct hashtable *h, void *k); - -/*****************************************************************************/ -/* indexFor */ -static inline unsigned int -indexFor(unsigned int tablelength, unsigned int hashvalue) { - return (hashvalue % tablelength); -}; - -/* Only works if tablelength == 2^N */ -/*static inline unsigned int -indexFor(unsigned int tablelength, unsigned int hashvalue) -{ - return (hashvalue & (tablelength - 1u)); -} -*/ - -/*****************************************************************************/ -#define freekey(X) free(X) -/*define freekey(X) ; */ - - -/*****************************************************************************/ - -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c deleted file mode 100644 index 75fe91a..0000000 --- a/tools/vtpm_manager/util/log.c +++ /dev/null @@ -1,142 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#include -#include -#include - -#include "buffer.h" -#include "tcg.h" - -// Helper code for the consts, eg. to produce messages for error codes. - -typedef struct error_code_entry_t { - TPM_RESULT code; - char * code_name; - char * msg; -} error_code_entry_t; - -static const error_code_entry_t error_msgs [] = { - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, - - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, -}; - - -// helper function for the error codes: -const char* tpm_get_error_name (TPM_RESULT code) { - // just do a linear scan for now - unsigned i; - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) - if (code == error_msgs[i].code) - return error_msgs[i].code_name; - - return("Unknown Error Code"); -} diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h deleted file mode 100644 index 1f15f5b..0000000 --- a/tools/vtpm_manager/util/log.h +++ /dev/null @@ -1,94 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== - -#ifndef __VTPM_LOG_H__ -#define __VTPM_LOG_H__ - -#include // for uint32_t -#include // for pointer NULL - -// =========================== LOGGING ============================== - -// the logging module numbers -#define VTPM_LOG_CRYPTO 1 -#define VTPM_LOG_BSG 2 -#define VTPM_LOG_TXDATA 3 -#define VTPM_LOG_TCS 4 -#define VTPM_LOG_TCS_DEEP 5 -#define VTPM_LOG_VTSP 6 -#define VTPM_LOG_VTPM 7 -#define VTPM_LOG_VTPM_DEEP 8 -#define VTPM_LOG_VTSP_DEEP 9 - -static char *module_names[] = { "", - "CRYPTO", - "BSG", - "TXDATA", - "TCS", - "TCS", - "VTSP", - "VTPM", - "VTPM", - "VTSP" - }; - -// Default to standard logging -#ifndef LOGGING_MODULES -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) -#endif - -// bit-access macros -#define BITMASK(idx) ( 1U << (idx) ) -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) -#define SETBIT(num,idx) (num) |= BITMASK(idx) -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) - -#define vtpmloginfo(module, fmt, args...) \ - if (GETBIT (LOGGING_MODULES, module) == 1) { \ - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ - } - -#define vtpmloginfomore(module, fmt, args...) \ - if (GETBIT (LOGGING_MODULES, module) == 1) { \ - fprintf (stdout, fmt,##args); \ - } - -#define vtpmlogerror(module, fmt, args...) \ - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); - -//typedef UINT32 tpm_size_t; - -// helper function for the error codes: -const char* tpm_get_error_name (TPM_RESULT code); - -#endif // _VTPM_LOG_H_ diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h deleted file mode 100644 index 5c42913..0000000 --- a/tools/vtpm_manager/util/tcg.h +++ /dev/null @@ -1,503 +0,0 @@ -// =================================================================== -// -// Copyright (c) 2005, Intel Corp. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -// OF THE POSSIBILITY OF SUCH DAMAGE. -// =================================================================== -// -// tcg.h -// -// This file contains all the structure and type definitions -// -// ================================================================== - -#ifndef __TCG_H__ -#define __TCG_H__ - -// This pragma is used to disallow structure padding -#pragma pack(push, 1) - -// *************************** TYPEDEFS ********************************* -typedef unsigned char BYTE; -typedef unsigned char BOOL; -typedef unsigned short UINT16; -typedef unsigned int UINT32; -typedef unsigned long long UINT64; - -typedef UINT32 TPM_RESULT; -typedef UINT32 TPM_PCRINDEX; -typedef UINT32 TPM_DIRINDEX; -typedef UINT32 TPM_HANDLE; -typedef TPM_HANDLE TPM_AUTHHANDLE; -typedef TPM_HANDLE TCPA_HASHHANDLE; -typedef TPM_HANDLE TCPA_HMACHANDLE; -typedef TPM_HANDLE TCPA_ENCHANDLE; -typedef TPM_HANDLE TPM_KEY_HANDLE; -typedef TPM_HANDLE TCPA_ENTITYHANDLE; -typedef UINT32 TPM_RESOURCE_TYPE; -typedef UINT32 TPM_COMMAND_CODE; -typedef UINT16 TPM_PROTOCOL_ID; -typedef BYTE TPM_AUTH_DATA_USAGE; -typedef UINT16 TPM_ENTITY_TYPE; -typedef UINT32 TPM_ALGORITHM_ID; -typedef UINT16 TPM_KEY_USAGE; -typedef UINT16 TPM_STARTUP_TYPE; -typedef UINT32 TPM_CAPABILITY_AREA; -typedef UINT16 TPM_ENC_SCHEME; -typedef UINT16 TPM_SIG_SCHEME; -typedef UINT16 TPM_MIGRATE_SCHEME; -typedef UINT16 TPM_PHYSICAL_PRESENCE; -typedef UINT32 TPM_KEY_FLAGS; - -#define TPM_DIGEST_SIZE 20 // Don't change this -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; -typedef TPM_AUTHDATA TPM_SECRET; -typedef TPM_AUTHDATA TPM_ENCAUTH; -typedef BYTE TPM_PAYLOAD_TYPE; -typedef UINT16 TPM_TAG; - -// Data Types of the TCS -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle - -// ************************* STRUCTURES ********************************** - -typedef struct TPM_VERSION { - BYTE major; - BYTE minor; - BYTE revMajor; - BYTE revMinor; -} TPM_VERSION; - -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; - -typedef struct TPM_DIGEST { - BYTE digest[TPM_DIGEST_SIZE]; -} TPM_DIGEST; - -typedef TPM_DIGEST TPM_PCRVALUE; -typedef TPM_DIGEST TPM_COMPOSITE_HASH; -typedef TPM_DIGEST TPM_DIRVALUE; -typedef TPM_DIGEST TPM_HMAC; -typedef TPM_DIGEST TPM_CHOSENID_HASH; - -typedef struct TPM_NONCE { - BYTE nonce[TPM_DIGEST_SIZE]; -} TPM_NONCE; - -typedef struct TPM_KEY_PARMS { - TPM_ALGORITHM_ID algorithmID; - TPM_ENC_SCHEME encScheme; - TPM_SIG_SCHEME sigScheme; - UINT32 parmSize; - BYTE* parms; -} TPM_KEY_PARMS; - -typedef struct TPM_RSA_KEY_PARMS { - UINT32 keyLength; - UINT32 numPrimes; - UINT32 exponentSize; - BYTE* exponent; -} TPM_RSA_KEY_PARMS; - -typedef struct TPM_STORE_PUBKEY { - UINT32 keyLength; - BYTE* key; -} TPM_STORE_PUBKEY; - -typedef struct TPM_PUBKEY { - TPM_KEY_PARMS algorithmParms; - TPM_STORE_PUBKEY pubKey; -} TPM_PUBKEY; - -typedef struct TPM_KEY { - TPM_VERSION ver; - TPM_KEY_USAGE keyUsage; - TPM_KEY_FLAGS keyFlags; - TPM_AUTH_DATA_USAGE authDataUsage; - TPM_KEY_PARMS algorithmParms; - UINT32 PCRInfoSize; - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL - TPM_STORE_PUBKEY pubKey; - UINT32 encDataSize; - BYTE* encData; -} TPM_KEY; - -typedef struct TPM_PCR_SELECTION { - UINT16 sizeOfSelect; /// in bytes - BYTE* pcrSelect; -} TPM_PCR_SELECTION; - -typedef struct TPM_PCR_COMPOSITE { - TPM_PCR_SELECTION select; - UINT32 valueSize; - TPM_PCRVALUE* pcrValue; -} TPM_PCR_COMPOSITE; - - -typedef struct TPM_PCR_INFO { - TPM_PCR_SELECTION pcrSelection; - TPM_COMPOSITE_HASH digestAtRelease; - TPM_COMPOSITE_HASH digestAtCreation; -} TPM_PCR_INFO; - - -typedef struct TPM_BOUND_DATA { - TPM_VERSION ver; - TPM_PAYLOAD_TYPE payload; - BYTE* payloadData; -} TPM_BOUND_DATA; - -typedef struct TPM_STORED_DATA { - TPM_VERSION ver; - UINT32 sealInfoSize; - BYTE* sealInfo; - UINT32 encDataSize; - BYTE* encData; -} TPM_STORED_DATA; - -typedef struct TCS_AUTH { - TCS_AUTHHANDLE AuthHandle; - TPM_NONCE NonceOdd; // system - TPM_NONCE NonceEven; // TPM - BOOL fContinueAuthSession; - TPM_AUTHDATA HMAC; -} TCS_AUTH; - -// structures for dealing with sizes followed by buffers in all the -// TCG structure. -typedef struct pack_buf_t { - UINT32 size; - BYTE * data; -} pack_buf_t; - -typedef struct pack_constbuf_t { - UINT32 size; - const BYTE* data; -} pack_constbuf_t; - - - -// **************************** CONSTANTS ********************************* - -// BOOL values -#define TRUE 0x01 -#define FALSE 0x00 - -#define TCPA_MAX_BUFFER_LENGTH 0x2000 - -// -// TPM_COMMAND_CODE values -#define TPM_PROTECTED_ORDINAL 0x00000000UL -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL -#define TPM_CONNECTION_ORDINAL 0x40000000UL -#define TPM_VENDOR_ORDINAL 0x20000000UL - -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) - - - -// -// TPM_RESULT values -// -// just put in the whole table from spec 1.2 - -#define TPM_BASE 0x0 // The start of TPM return codes -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. - -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled -#define TPM_FAIL TPM_BASE + 9 // The operation failed -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM - -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session - -// TPM_STARTUP_TYPE values -#define TPM_ST_CLEAR 0x0001 -#define TPM_ST_STATE 0x0002 -#define TPM_ST_DEACTIVATED 0x003 - -// TPM_TAG values -#define TPM_TAG_RQU_COMMAND 0x00c1 -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 -#define TPM_TAG_RSP_COMMAND 0x00c4 -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 - -// TPM_PAYLOAD_TYPE values -#define TPM_PT_ASYM 0x01 -#define TPM_PT_BIND 0x02 -#define TPM_PT_MIGRATE 0x03 -#define TPM_PT_MAINT 0x04 -#define TPM_PT_SEAL 0x05 - -// TPM_ENTITY_TYPE values -#define TPM_ET_KEYHANDLE 0x0001 -#define TPM_ET_OWNER 0x0002 -#define TPM_ET_DATA 0x0003 -#define TPM_ET_SRK 0x0004 -#define TPM_ET_KEY 0x0005 - -/// TPM_ResourceTypes -#define TPM_RT_KEY 0x00000001 -#define TPM_RT_AUTH 0x00000002 -#define TPM_RT_TRANS 0x00000004 -#define TPM_RT_CONTEXT 0x00000005 - -// TPM_PROTOCOL_ID values -#define TPM_PID_OIAP 0x0001 -#define TPM_PID_OSAP 0x0002 -#define TPM_PID_ADIP 0x0003 -#define TPM_PID_ADCP 0x0004 -#define TPM_PID_OWNER 0x0005 - -// TPM_ALGORITHM_ID values -#define TPM_ALG_RSA 0x00000001 -#define TPM_ALG_DES 0x00000002 -#define TPM_ALG_3DES 0X00000003 -#define TPM_ALG_SHA 0x00000004 -#define TPM_ALG_HMAC 0x00000005 -#define TCPA_ALG_AES 0x00000006 - -// TPM_ENC_SCHEME values -#define TPM_ES_NONE 0x0001 -#define TPM_ES_RSAESPKCSv15 0x0002 -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 - -// TPM_SIG_SCHEME values -#define TPM_SS_NONE 0x0001 -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 - -// TPM_KEY_USAGE values -#define TPM_KEY_EK 0x0000 -#define TPM_KEY_SIGNING 0x0010 -#define TPM_KEY_STORAGE 0x0011 -#define TPM_KEY_IDENTITY 0x0012 -#define TPM_KEY_AUTHCHANGE 0X0013 -#define TPM_KEY_BIND 0x0014 -#define TPM_KEY_LEGACY 0x0015 - -// TPM_AUTH_DATA_USAGE values -#define TPM_AUTH_NEVER 0x00 -#define TPM_AUTH_ALWAYS 0x01 - -// Key Handle of owner and srk -#define TPM_OWNER_KEYHANDLE 0x40000001 -#define TPM_SRK_KEYHANDLE 0x40000000 - -// ---------------------- Functions for checking TPM_RESULTs ----------------- - -#include - -// FIXME: Review use of these and delete unneeded ones. - -// these are really badly dependent on local structure: -// DEPENDS: local var 'status' of type TPM_RESULT -// DEPENDS: label 'abort_egress' which cleans up and returns the status -#define ERRORDIE(s) do { status = s; \ - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ - goto abort_egress; } \ - while (0) - -// DEPENDS: local var 'status' of type TPM_RESULT -// DEPENDS: label 'abort_egress' which cleans up and returns the status -// Try command c. If it fails, set status to s and goto abort. -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ - status = s; \ - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ - goto abort_egress; \ - } else {\ - status = c; \ - } - -// Try command c. If it fails, print error message, set status to actual return code. Goto abort -#define TPMTRYRETURN(c) do { status = c; \ - if (status != TPM_SUCCESS) { \ - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ - goto abort_egress; \ - } \ - } while(0) - - -#pragma pack(pop) - -#endif //__TCPA_H__ diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 3b89223..0ba1d55 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable.c - * - tools/vtpm_manager/util/hashtable.c */ #include "hashtable.h" diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 8e6bb5b..4d68223 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable.h - * - tools/vtpm_manager/util/hashtable.h */ #ifndef __HASHTABLE_CWC22_H__ diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h index cabaffe..a08559d 100644 --- a/tools/xenstore/hashtable_private.h +++ b/tools/xenstore/hashtable_private.h @@ -3,7 +3,6 @@ /* * There are duplicates of this code in: * - tools/blktap2/drivers/hashtable_private.h - * - tools/vtpm_manager/util/hashtable_private.h */ #ifndef __HASHTABLE_PRIVATE_CWC22_H__ diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index ad1eb78..c142140 100644 --- a/tools/xm-test/configure.ac +++ b/tools/xm-test/configure.ac @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ tests/unpause/Makefile tests/vcpu-pin/Makefile tests/vcpu-disable/Makefile - tests/vtpm/Makefile tests/xapi/Makefile tests/enforce_dom0_cpus/Makefile tests/cpupool/Makefile diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default index f0516b2..e04591b 100644 --- a/tools/xm-test/grouptest/default +++ b/tools/xm-test/grouptest/default @@ -27,5 +27,4 @@ sysrq unpause vcpu-disable vcpu-pin -vtpm xapi diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium index bafc988..5c3e1b1 100644 --- a/tools/xm-test/grouptest/medium +++ b/tools/xm-test/grouptest/medium @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test unpause vcpu-disable vcpu-pin -vtpm diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi index 3b04921..7a08b77 100644 --- a/tools/xm-test/grouptest/xapi +++ b/tools/xm-test/grouptest/xapi @@ -1,2 +1 @@ xapi -vtpm 09_vtpm-xapi.test diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py index ae8c550..3ba7433 100644 --- a/tools/xm-test/lib/XmTestLib/XenDomain.py +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py @@ -59,7 +59,6 @@ class XenConfig: # These options need to be lists self.defaultOpts["disk"] = [] self.defaultOpts["vif"] = [] - self.defaultOpts["vtpm"] = [] self.opts = self.defaultOpts diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am index 8d673ed..455f50c 100644 --- a/tools/xm-test/tests/Makefile.am +++ b/tools/xm-test/tests/Makefile.am @@ -25,7 +25,6 @@ SUBDIRS = \ unpause \ vcpu-disable \ vcpu-pin \ - vtpm \ enforce_dom0_cpus \ save restore migrate \ cpupool diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py deleted file mode 100644 index dfd1227..0000000 --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# verify list - - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) - -try: - domain.start(noConsole=True) -except DomainError, e: - if verbose: - print e.extra - vtpm_cleanup(domain.getName()) - FAIL("Unable to create domain") - - -domName = domain.getName() - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) -eyecatcher = "/local/domain/0/backend/vtpm" -where = output.find(eyecatcher) -if status != 0: - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) -elif where < 0: - FAIL("Fail to list virtual TPM device") - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py deleted file mode 100644 index a18cbab..0000000 --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -domain.closeConsole() - -domain.stop() - -if not re.search("PCR-00:",run["output"]): - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py deleted file mode 100644 index b863f27..0000000 --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; suspend and resume the domain and -# check list of pcrs again - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm save %s %s.save" % - (domName, domName), - timeout=30) - - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm save did not succeed") - - try: - status, ouptut = traceCommand("xm restore %s.save" % - (domName), - timeout=30) - except TimeoutError, e: - os.remove("%s.save" % domName) - saveLog(consoleHistory) - FAIL(str(e)) - - os.remove("%s.save" % domName) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm restore did not succeed") - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() - diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py deleted file mode 100644 index ccc8b73..0000000 --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; locally migrate the domain and -# check list of pcrs again -# This test does local live migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate -l %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py deleted file mode 100644 index 57b87df..0000000 --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# check list of pcrs; locally migrate the domain and -# check list of pcrs again -# This test does local (non-live) migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py deleted file mode 100644 index c70691d..0000000 --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py +++ /dev/null @@ -1,125 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; suspend and resume the domain and -# check list of pcrs again and validate extended pcr - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm save %s %s.save" % - (domName, domName), - timeout=30) - - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm save did not succeed") - - try: - status, ouptut = traceCommand("xm restore %s.save" % - (domName), - timeout=30) - except TimeoutError, e: - os.remove("%s.save" % domName) - saveLog(consoleHistory) - FAIL(str(e)) - - os.remove("%s.save" % domName) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm restore did not succeed") - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() - diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py deleted file mode 100644 index 4ff3360..0000000 --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; locally migrate the domain and -# check list of pcrs again and validate extended pcr -# This test does local live migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate -l %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py deleted file mode 100644 index 27125fc..0000000 --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py +++ /dev/null @@ -1,119 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Positive Test: create domain with virtual TPM attached at build time, -# extend a pcr -# check list of pcrs; locally migrate the domain and -# check list of pcrs again and validate extended pcr -# This test does local (non-live) migration. - -from XmTestLib import * -from vtpm_utils import * -import commands -import os -import os.path -import atexit - -config = {"vtpm":"instance=1,backend=0"} -domain = XmTestDomain(extraConfig=config) -domName = domain.getName() -consoleHistory = "" - -try: - console = domain.start() -except DomainError, e: - if verbose: - print e.extra - FAIL("Unable to create domain (%s)" % domName) - -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("mknod /dev/tpm0 c 10 224") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while creating /dev/tpm0") - -try: - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("Error while extending PCR 0") - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) - -consoleHistory = console.getHistory() -domain.closeConsole() - -old_domid = domid(domName) - -loop = 0 -while loop < 3: - try: - status, ouptut = traceCommand("xm migrate %s localhost" % - domName, - timeout=90) - except TimeoutError, e: - saveLog(consoleHistory) - FAIL(str(e)) - - if status != 0: - saveLog(consoleHistory) - FAIL("xm migrate did not succeed. External device migration activated?") - - - domName = domain.getName() - new_domid = domid(domName) - - if (old_domid == new_domid): - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % - (old_domid,loop)) - - try: - console = domain.getConsole() - except ConsoleError, e: - FAIL(str(e)) - - try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") - except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("No result from dumping the PCRs") - - if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") - - if not re.search("PCR-00: 1E A7 BD",run["output"]): - saveLog(console.getHistory()) - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) - - loop += 1 - -domain.closeConsole() - -domain.stop() diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py deleted file mode 100644 index a1aa8b3..0000000 --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py +++ /dev/null @@ -1,158 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -# Test to test the vtpm class through the Xen-API -# -# Tested methods: -# VTPM: get_uuid, get_backend, get_by_uuid, get_record -# create, destroy, get_VM -# VM: get_VTPMS - -from XmTestLib import xapi -from XmTestLib.XenAPIDomain import XmTestAPIDomain -from XmTestLib import * -from vtpm_utils import * -import commands -import os - -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] - -try: - # XmTestAPIDomain tries to establish a connection to XenD - domain = XmTestAPIDomain() -except Exception, e: - SKIP("Skipping test. Error: %s" % str(e)) -vm_uuid = domain.get_uuid() - -vtpmcfg = {} -vtpmcfg['backend'] = DOM0_UUID -vtpmcfg['VM'] = vm_uuid - -session = xapi.connect() - -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) - -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) -if vtpm_be != vtpmcfg['backend']: - FAIL("vTPM's backend is in '%s', expected: '%s'" % - (vtpm_be, vtpmcfg['backend'])) - -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) - -miss_keys = [] -for k in VTPM_RECORD_KEYS: - if k not in vtpm_rec.keys(): - miss_keys.append(k) -if len(miss_keys) > 0: - FAIL("vTPM record is missing key(s): %s" % miss_keys) - -if vtpm_rec['uuid'] != vtpm_uuid: - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % - (vtpm_rec['uuid'], vtpm_uuid)) -if vtpm_rec['VM'] != vm_uuid: - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % - (vtpm_rec['VM'], vm_uuid)) -if vtpm_rec['backend'] != vtpmcfg['backend']: - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % - (vtpm_rev['backend'], vtpmcfg['backend'])) - -badkeys = [] -keys = vtpm_rec.keys() -for k in keys: - if k not in VTPM_RECORD_KEYS: - badkeys.append(k) -if len(badkeys) > 0: - FAIL("Unexpected attributes in result: %s" % badkeys) - -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % - (vm_ref, vm_uuid)) - -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) -if uuid != vtpm_uuid: - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % - (uuid, vtpm_uuid)) - -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) -if vtpm_ref != vtpm_uuid: - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % - (vtpm_ref, vtpm_uuid)) - -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) -if len(vm_vtpms) != 1: - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % - (len(vm_vtpms), 1)) -if vtpm_uuid not in vm_vtpms: - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % - (vm_vtpms[0], vtpm_uuid)) - -try: - console = domain.start() -except DomainError, e: - FAIL("Unable to create domain.") - -try: - console.sendInput("input") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("1. No result from dumping the PCRs") - -if re.search("No such file",run["output"]): - FAIL("TPM frontend support not compiled into (domU?) kernel") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) - #Should never get here - FAIL("Could destroy vTPM while VM is running") -except: - pass - -rc = session.xenapi.VM.suspend(vm_uuid) -if rc: - FAIL("Could not suspend VM") - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) - #May not throw an exception in 'suspend' state -except: - pass - -rc = session.xenapi.VM.resume(vm_uuid, False) -if rc: - FAIL("Could not resume VM") - -try: - console = domain.getConsole() -except ConsoleError, e: - FAIL(str(e)) - -try: - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") -except ConsoleError, e: - saveLog(console.getHistory()) - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") - -if not re.search("PCR-00:",run["output"]): - saveLog(console.getHistory()) - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) - -domain.stop() - -try: - session.xenapi.VTPM.destroy(vtpm_uuid) -except: - FAIL("Could NOT destroy vTPM while domain is halted.") - -domain.destroy() diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am deleted file mode 100644 index dd67e45..0000000 --- a/tools/xm-test/tests/vtpm/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = - -TESTS = 01_vtpm-list_pos.test \ - 02_vtpm-cat_pcrs.test \ - 03_vtpm-susp_res.test \ - 04_vtpm-loc_migr.test \ - 05_vtpm-loc_migr.test \ - 06_vtpm-susp_res_pcrs.test \ - 07_vtpm-mig_pcrs.test \ - 08_vtpm-mig_pcrs.test \ - 09_vtpm-xapi.test - -XFAIL_TESTS = - -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py -TESTS_ENVIRONMENT=@TENV@ - -%.test: %.py - cp $< $@ - chmod +x $@ - -clean-local: am_config_clean-local - -am_config_clean-local: - rm -f *test - rm -f *log - rm -f *~ diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py deleted file mode 100644 index 4e5b281..0000000 --- a/tools/xm-test/tests/vtpm/vtpm_utils.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) International Business Machines Corp., 2006 -# Author: Stefan Berger - -from XmTestLib import * - -if ENABLE_HVM_SUPPORT: - SKIP("vtpm tests not supported for HVM domains") - -status, output = traceCommand("COLUMNS=200 ; " - "ps aux | grep vtpm_manager | grep -v grep") -if output == "": - SKIP("virtual TPM manager must be started to run this test; might " - "need /dev/tpm0") - -def vtpm_cleanup(domName): - traceCommand("/etc/xen/scripts/vtpm-delete " - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % - str(domid(domName))) - -def vtpm_cleanup(uuid): - from xen.xm import main - if main.serverType != main.SERVER_XEN_API: - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) - -def vtpm_get_uuid(domainid): - s, o = traceCommand("xenstore-read " - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) - return o -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:41:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:41:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1a6-0006Sz-Sx; Thu, 01 Nov 2012 20:41:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1a5-0006Sa-4h for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:41:37 +0000 Received: from [85.158.137.99:46850] by server-12.bemta-3.messagelabs.com id 1B/1B-22757-08ED2905; Thu, 01 Nov 2012 20:41:36 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351802495!12235431!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21846 invoked from network); 1 Nov 2012 20:41:35 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-217.messagelabs.com with SMTP; 1 Nov 2012 20:41:35 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 20:41:35 +0000 Message-Id: <5092DE7E020000780008EB96@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 20:41:34 +0000 From: "Jan Beulich" To: , References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> In-Reply-To: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Dan Magenheimer 11/01/12 9:34 PM >>> >With the plan to obsolete the x86 32-bit hypervisor at 4.3, That's not just a plan, but reality already. >when prototyping the "claim" hypercall/subop, can I assume >that the CONFIG_X86 code in the hypervisor and, specifically >any separation of the concepts of xen_heap from dom_heap, >can be ignored? No, you shouldn't. Once adding support for memory amounts beyond 5Tb I expect the separation to become meaningful even for x86-64. >Or will the ARM version of the hypervisor be requiring >a similar separation of xen_heap vs dom_heap? > >If the CONFIG_X86/separation code will no longer be used, >shall I submit a patch to delete the code in page_alloc.c >and memory.c? Or can you (Keir or Jan) just delete it? Please don't. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:41:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:41:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1a6-0006Sz-Sx; Thu, 01 Nov 2012 20:41:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1a5-0006Sa-4h for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:41:37 +0000 Received: from [85.158.137.99:46850] by server-12.bemta-3.messagelabs.com id 1B/1B-22757-08ED2905; Thu, 01 Nov 2012 20:41:36 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1351802495!12235431!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21846 invoked from network); 1 Nov 2012 20:41:35 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-217.messagelabs.com with SMTP; 1 Nov 2012 20:41:35 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 01 Nov 2012 20:41:35 +0000 Message-Id: <5092DE7E020000780008EB96@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 01 Nov 2012 20:41:34 +0000 From: "Jan Beulich" To: , References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> In-Reply-To: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Dan Magenheimer 11/01/12 9:34 PM >>> >With the plan to obsolete the x86 32-bit hypervisor at 4.3, That's not just a plan, but reality already. >when prototyping the "claim" hypercall/subop, can I assume >that the CONFIG_X86 code in the hypervisor and, specifically >any separation of the concepts of xen_heap from dom_heap, >can be ignored? No, you shouldn't. Once adding support for memory amounts beyond 5Tb I expect the separation to become meaningful even for x86-64. >Or will the ARM version of the hypervisor be requiring >a similar separation of xen_heap vs dom_heap? > >If the CONFIG_X86/separation code will no longer be used, >shall I submit a patch to delete the code in page_alloc.c >and memory.c? Or can you (Keir or Jan) just delete it? Please don't. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:46:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:46:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1el-0006ll-Kt; Thu, 01 Nov 2012 20:46:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1el-0006lf-6G for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:46:27 +0000 Received: from [85.158.143.35:5557] by server-3.bemta-4.messagelabs.com id 9A/A9-06841-2AFD2905; Thu, 01 Nov 2012 20:46:26 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1351802784!16140389!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5949 invoked from network); 1 Nov 2012 20:46:25 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:46:25 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TU1eg-000Hru-Hi; Thu, 01 Nov 2012 20:46:22 +0000 Date: Thu, 1 Nov 2012 20:46:22 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121101204622.GA66969@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <620abc58-07b9-4102-b883-0bfcd8e78471@default> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > when prototyping the "claim" hypercall/subop, can I assume > that the CONFIG_X86 code in the hypervisor and, specifically > any separation of the concepts of xen_heap from dom_heap, > can be ignored? > > Or will the ARM version of the hypervisor be requiring > a similar separation of xen_heap vs dom_heap? Yes, 32-bit ARM has this separation. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:46:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:46:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1el-0006ll-Kt; Thu, 01 Nov 2012 20:46:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1el-0006lf-6G for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:46:27 +0000 Received: from [85.158.143.35:5557] by server-3.bemta-4.messagelabs.com id 9A/A9-06841-2AFD2905; Thu, 01 Nov 2012 20:46:26 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1351802784!16140389!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5949 invoked from network); 1 Nov 2012 20:46:25 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:46:25 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TU1eg-000Hru-Hi; Thu, 01 Nov 2012 20:46:22 +0000 Date: Thu, 1 Nov 2012 20:46:22 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121101204622.GA66969@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <620abc58-07b9-4102-b883-0bfcd8e78471@default> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > when prototyping the "claim" hypercall/subop, can I assume > that the CONFIG_X86 code in the hypervisor and, specifically > any separation of the concepts of xen_heap from dom_heap, > can be ignored? > > Or will the ARM version of the hypervisor be requiring > a similar separation of xen_heap vs dom_heap? Yes, 32-bit ARM has this separation. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:55:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1nN-00073K-LU; Thu, 01 Nov 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1nM-00073F-2y for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:55:20 +0000 Received: from [85.158.139.83:26710] by server-15.bemta-5.messagelabs.com id D4/8F-26920-7B1E2905; Thu, 01 Nov 2012 20:55:19 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1351803317!28364096!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 1 Nov 2012 20:55:18 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:55:18 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KtFUe024274 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:55:16 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1KtFrD023875 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:55:15 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1KtEWE014700; Thu, 1 Nov 2012 15:55:14 -0500 MIME-Version: 1.0 Message-ID: <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> Date: Thu, 1 Nov 2012 13:55:10 -0700 (PDT) From: Dan Magenheimer To: Jan Beulich , keir@xen.org References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> In-Reply-To: <5092DE7E020000780008EB96@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:jbeulich@suse.com] > Sent: Thursday, November 01, 2012 2:42 PM > To: Dan Magenheimer; keir@xen.org > Cc: xen-devel@lists.xen.org > Subject: Re: 32bit xen and "claim" > >If the CONFIG_X86/separation code will no longer be used, > >shall I submit a patch to delete the code in page_alloc.c > >and memory.c? Or can you (Keir or Jan) just delete it? > > Please don't. OK. I'm glad I asked rather than assuming. > >when prototyping the "claim" hypercall/subop, can I assume > >that the CONFIG_X86 code in the hypervisor and, specifically > >any separation of the concepts of xen_heap from dom_heap, > >can be ignored? > > No, you shouldn't. Once adding support for memory amounts beyond 5Tb > I expect the separation to become meaningful even for x86-64. On quick scan, I don't see anything obvious in the archives that explains why 5Tb is the limit (rather than, say, 4Tb or 8Tb, or some other power of two). Could you provide a pointer to this info or, if you agree it is non-obvious and undocumented, say a few words of explanation? Also, just wondering, should exceeding 5Tb be on the 4.3 features list or is >5Tb physical memory still too far away? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:55:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1nN-00073K-LU; Thu, 01 Nov 2012 20:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1nM-00073F-2y for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:55:20 +0000 Received: from [85.158.139.83:26710] by server-15.bemta-5.messagelabs.com id D4/8F-26920-7B1E2905; Thu, 01 Nov 2012 20:55:19 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1351803317!28364096!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 1 Nov 2012 20:55:18 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:55:18 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KtFUe024274 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:55:16 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1KtFrD023875 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:55:15 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1KtEWE014700; Thu, 1 Nov 2012 15:55:14 -0500 MIME-Version: 1.0 Message-ID: <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> Date: Thu, 1 Nov 2012 13:55:10 -0700 (PDT) From: Dan Magenheimer To: Jan Beulich , keir@xen.org References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> In-Reply-To: <5092DE7E020000780008EB96@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:jbeulich@suse.com] > Sent: Thursday, November 01, 2012 2:42 PM > To: Dan Magenheimer; keir@xen.org > Cc: xen-devel@lists.xen.org > Subject: Re: 32bit xen and "claim" > >If the CONFIG_X86/separation code will no longer be used, > >shall I submit a patch to delete the code in page_alloc.c > >and memory.c? Or can you (Keir or Jan) just delete it? > > Please don't. OK. I'm glad I asked rather than assuming. > >when prototyping the "claim" hypercall/subop, can I assume > >that the CONFIG_X86 code in the hypervisor and, specifically > >any separation of the concepts of xen_heap from dom_heap, > >can be ignored? > > No, you shouldn't. Once adding support for memory amounts beyond 5Tb > I expect the separation to become meaningful even for x86-64. On quick scan, I don't see anything obvious in the archives that explains why 5Tb is the limit (rather than, say, 4Tb or 8Tb, or some other power of two). Could you provide a pointer to this info or, if you agree it is non-obvious and undocumented, say a few words of explanation? Also, just wondering, should exceeding 5Tb be on the 4.3 features list or is >5Tb physical memory still too far away? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:58:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:58:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1pv-0007CM-6s; Thu, 01 Nov 2012 20:57:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1pt-0007CD-Di for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:57:57 +0000 Received: from [85.158.139.211:12140] by server-14.bemta-5.messagelabs.com id 90/51-21768-452E2905; Thu, 01 Nov 2012 20:57:56 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351803468!18087445!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMTM5Mjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 558 invoked from network); 1 Nov 2012 20:57:49 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:57:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KvkVP028446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:57:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Kvjsu013223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:57:46 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Kvjbx016352; Thu, 1 Nov 2012 15:57:45 -0500 MIME-Version: 1.0 Message-ID: Date: Thu, 1 Nov 2012 13:57:41 -0700 (PDT) From: Dan Magenheimer To: Tim Deegan References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> In-Reply-To: <20121101204622.GA66969@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: [Xen-devel] 32bit xen and "claim" > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > when prototyping the "claim" hypercall/subop, can I assume > > that the CONFIG_X86 code in the hypervisor and, specifically > > any separation of the concepts of xen_heap from dom_heap, > > can be ignored? > > > > Or will the ARM version of the hypervisor be requiring > > a similar separation of xen_heap vs dom_heap? > > Yes, 32-bit ARM has this separation. Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 to mean CONFIG-32-bitness then? Seems dangerous given that various random chunks of CONFIG_X86 may be disappearing. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 20:58:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 20:58:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1pv-0007CM-6s; Thu, 01 Nov 2012 20:57:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1pt-0007CD-Di for xen-devel@lists.xen.org; Thu, 01 Nov 2012 20:57:57 +0000 Received: from [85.158.139.211:12140] by server-14.bemta-5.messagelabs.com id 90/51-21768-452E2905; Thu, 01 Nov 2012 20:57:56 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351803468!18087445!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMTM5Mjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 558 invoked from network); 1 Nov 2012 20:57:49 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 20:57:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1KvkVP028446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 20:57:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Kvjsu013223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 20:57:46 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1Kvjbx016352; Thu, 1 Nov 2012 15:57:45 -0500 MIME-Version: 1.0 Message-ID: Date: Thu, 1 Nov 2012 13:57:41 -0700 (PDT) From: Dan Magenheimer To: Tim Deegan References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> In-Reply-To: <20121101204622.GA66969@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: [Xen-devel] 32bit xen and "claim" > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > when prototyping the "claim" hypercall/subop, can I assume > > that the CONFIG_X86 code in the hypervisor and, specifically > > any separation of the concepts of xen_heap from dom_heap, > > can be ignored? > > > > Or will the ARM version of the hypervisor be requiring > > a similar separation of xen_heap vs dom_heap? > > Yes, 32-bit ARM has this separation. Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 to mean CONFIG-32-bitness then? Seems dangerous given that various random chunks of CONFIG_X86 may be disappearing. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:03:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:03:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1ue-0007Tf-Tf; Thu, 01 Nov 2012 21:02:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1ud-0007Ta-FB for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:02:51 +0000 Received: from [85.158.143.99:56671] by server-2.bemta-4.messagelabs.com id 22/A2-28922-A73E2905; Thu, 01 Nov 2012 21:02:50 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-5.tower-216.messagelabs.com!1351803769!27951390!1 X-Originating-IP: [81.169.146.161] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0Njk5Mzg=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0Njk5Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18542 invoked from network); 1 Nov 2012 21:02:49 -0000 Received: from mo-p00-ob.rzone.de (HELO mo-p00-ob.rzone.de) (81.169.146.161) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:02:49 -0000 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmztM8TOFHjS0IEKU= X-RZG-CLASS-ID: mo00 Received: from probook.site (dslb-088-065-093-063.pools.arcor-ip.net [88.65.93.63]) by smtp.strato.de (jored mo25) (RZmta 30.21 DYNA|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id 2019e3oA1KGJzY ; Thu, 1 Nov 2012 22:02:41 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7248A18643; Thu, 1 Nov 2012 22:02:40 +0100 (CET) From: Olaf Hering To: Jeremy Fitzhardinge , Konrad Rzeszutek Wilk Date: Thu, 1 Nov 2012 22:02:30 +0100 Message-Id: <1351803750-7335-1-git-send-email-olaf@aepfle.de> X-Mailer: git-send-email 1.8.0 Cc: Olaf Hering , xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v5] xen PVonHVM: use E820_Reserved area for shared_info X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a respin of 00e37bdb0113a98408de42db85be002f21dbffd3 ("xen PVonHVM: move shared_info to MMIO before kexec"). Currently kexec in a PVonHVM guest fails with a triple fault because the new kernel overwrites the shared info page. The exact failure depends on the size of the kernel image. This patch moves the pfn from RAM into an E820 reserved memory area. The pfn containing the shared_info is located somewhere in RAM. This will cause trouble if the current kernel is doing a kexec boot into a new kernel. The new kernel (and its startup code) can not know where the pfn is, so it can not reserve the page. The hypervisor will continue to update the pfn, and as a result memory corruption occours in the new kernel. The toolstack marks the memory area FC000000-FFFFFFFF as reserved in the E820 map. Within that range newer toolstacks (4.3+) will keep 1MB starting from FE700000 as reserved for guest use. Older Xen4 toolstacks will usually not allocate areas up to FE700000, so FE700000 is expected to work also with older toolstacks. In Xen3 there is no reserved area at a fixed location. If the guest is started on such old hosts the shared_info page will be placed in RAM. As a result kexec can not be used. Signed-off-by: Olaf Hering --- v5: reword subject handle Xen3, continue to use extend_brk on old hosts v4: rebase to 3.7-rc3 v3: make xen_hvm_init_shared_info static v2: add __init to xen_hvm_set_shared_info arch/x86/xen/enlighten.c | 75 ++++++++++++++++++++++++++++++++++-------------- arch/x86/xen/suspend.c | 2 +- arch/x86/xen/xen-ops.h | 2 +- 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..a90c3bb 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1495,51 +1495,72 @@ asmlinkage void __init xen_start_kernel(void) #endif } -void __ref xen_hvm_init_shared_info(void) +#ifdef CONFIG_XEN_PVHVM +#define HVM_SHARED_INFO_ADDR 0xFE700000UL +static struct shared_info *xen_hvm_shared_info; +static unsigned long xen_hvm_sip_phys; +static int xen_major, xen_minor; + +static void xen_hvm_connect_shared_info(unsigned long pfn) { - int cpu; struct xen_add_to_physmap xatp; - static struct shared_info *shared_info_page = 0; - if (!shared_info_page) - shared_info_page = (struct shared_info *) - extend_brk(PAGE_SIZE, PAGE_SIZE); xatp.domid = DOMID_SELF; xatp.idx = 0; xatp.space = XENMAPSPACE_shared_info; - xatp.gpfn = __pa(shared_info_page) >> PAGE_SHIFT; + xatp.gpfn = pfn; if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) BUG(); - HYPERVISOR_shared_info = (struct shared_info *)shared_info_page; +} +static void __init xen_hvm_set_shared_info(struct shared_info *sip) +{ + int cpu; + + HYPERVISOR_shared_info = sip; /* xen_vcpu is a pointer to the vcpu_info struct in the shared_info * page, we use it in the event channel upcall and in some pvclock * related functions. We don't need the vcpu_info placement * optimizations because we don't use any pv_mmu or pv_irq op on - * HVM. - * When xen_hvm_init_shared_info is run at boot time only vcpu 0 is - * online but xen_hvm_init_shared_info is run at resume time too and - * in that case multiple vcpus might be online. */ - for_each_online_cpu(cpu) { + * HVM. */ + for_each_online_cpu(cpu) per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; +} + +/* Reconnect the shared_info pfn to a (new) mfn */ +void xen_hvm_resume_shared_info(void) +{ + xen_hvm_connect_shared_info(xen_hvm_sip_phys >> PAGE_SHIFT); +} + +/* Xen tools prior to Xen 4 do not provide a E820_Reserved area for guest usage. + * On these old tools the shared info page will be placed in E820_Ram. + * Xen 4 provides a E820_Reserved area at 0xFC000000, and this code expects + * that nothing is mapped up to HVM_SHARED_INFO_ADDR. + * Xen 4.3+ provides an explicit 1MB area at HVM_SHARED_INFO_ADDR which is used + * here for the shared info page. */ +static void __init xen_hvm_init_shared_info(void) +{ + if (xen_major < 4) { + xen_hvm_shared_info = extend_brk(PAGE_SIZE, PAGE_SIZE); + xen_hvm_sip_phys = __pa(xen_hvm_shared_info); + } else { + xen_hvm_sip_phys = HVM_SHARED_INFO_ADDR; + set_fixmap(FIX_PARAVIRT_BOOTMAP, xen_hvm_sip_phys); + xen_hvm_shared_info = + (struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP); } + xen_hvm_connect_shared_info(xen_hvm_sip_phys >> PAGE_SHIFT); + xen_hvm_set_shared_info(xen_hvm_shared_info); } -#ifdef CONFIG_XEN_PVHVM static void __init init_hvm_pv_info(void) { - int major, minor; uint32_t eax, ebx, ecx, edx, pages, msr, base; u64 pfn; base = xen_cpuid_base(); - cpuid(base + 1, &eax, &ebx, &ecx, &edx); - - major = eax >> 16; - minor = eax & 0xffff; - printk(KERN_INFO "Xen version %d.%d.\n", major, minor); - cpuid(base + 2, &pages, &msr, &ecx, &edx); pfn = __pa(hypercall_page); @@ -1590,12 +1611,22 @@ static void __init xen_hvm_guest_init(void) static bool __init xen_hvm_platform(void) { + uint32_t eax, ebx, ecx, edx, base; + if (xen_pv_domain()) return false; - if (!xen_cpuid_base()) + base = xen_cpuid_base(); + if (!base) return false; + cpuid(base + 1, &eax, &ebx, &ecx, &edx); + + xen_major = eax >> 16; + xen_minor = eax & 0xffff; + + printk(KERN_INFO "Xen version %d.%d.\n", xen_major, xen_minor); + return true; } diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 45329c8..ae8a00c 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -30,7 +30,7 @@ void xen_arch_hvm_post_suspend(int suspend_cancelled) { #ifdef CONFIG_XEN_PVHVM int cpu; - xen_hvm_init_shared_info(); + xen_hvm_resume_shared_info(); xen_callback_vector(); xen_unplug_emulated_devices(); if (xen_feature(XENFEAT_hvm_safe_pvclock)) { diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index a95b417..d2e73d1 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -40,7 +40,7 @@ void xen_enable_syscall(void); void xen_vcpu_restore(void); void xen_callback_vector(void); -void xen_hvm_init_shared_info(void); +void xen_hvm_resume_shared_info(void); void xen_unplug_emulated_devices(void); void __init xen_build_dynamic_phys_to_machine(void); -- 1.8.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:03:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:03:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1ue-0007Tf-Tf; Thu, 01 Nov 2012 21:02:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU1ud-0007Ta-FB for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:02:51 +0000 Received: from [85.158.143.99:56671] by server-2.bemta-4.messagelabs.com id 22/A2-28922-A73E2905; Thu, 01 Nov 2012 21:02:50 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-5.tower-216.messagelabs.com!1351803769!27951390!1 X-Originating-IP: [81.169.146.161] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0Njk5Mzg=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0Njk5Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18542 invoked from network); 1 Nov 2012 21:02:49 -0000 Received: from mo-p00-ob.rzone.de (HELO mo-p00-ob.rzone.de) (81.169.146.161) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:02:49 -0000 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmztM8TOFHjS0IEKU= X-RZG-CLASS-ID: mo00 Received: from probook.site (dslb-088-065-093-063.pools.arcor-ip.net [88.65.93.63]) by smtp.strato.de (jored mo25) (RZmta 30.21 DYNA|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id 2019e3oA1KGJzY ; Thu, 1 Nov 2012 22:02:41 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7248A18643; Thu, 1 Nov 2012 22:02:40 +0100 (CET) From: Olaf Hering To: Jeremy Fitzhardinge , Konrad Rzeszutek Wilk Date: Thu, 1 Nov 2012 22:02:30 +0100 Message-Id: <1351803750-7335-1-git-send-email-olaf@aepfle.de> X-Mailer: git-send-email 1.8.0 Cc: Olaf Hering , xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH v5] xen PVonHVM: use E820_Reserved area for shared_info X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a respin of 00e37bdb0113a98408de42db85be002f21dbffd3 ("xen PVonHVM: move shared_info to MMIO before kexec"). Currently kexec in a PVonHVM guest fails with a triple fault because the new kernel overwrites the shared info page. The exact failure depends on the size of the kernel image. This patch moves the pfn from RAM into an E820 reserved memory area. The pfn containing the shared_info is located somewhere in RAM. This will cause trouble if the current kernel is doing a kexec boot into a new kernel. The new kernel (and its startup code) can not know where the pfn is, so it can not reserve the page. The hypervisor will continue to update the pfn, and as a result memory corruption occours in the new kernel. The toolstack marks the memory area FC000000-FFFFFFFF as reserved in the E820 map. Within that range newer toolstacks (4.3+) will keep 1MB starting from FE700000 as reserved for guest use. Older Xen4 toolstacks will usually not allocate areas up to FE700000, so FE700000 is expected to work also with older toolstacks. In Xen3 there is no reserved area at a fixed location. If the guest is started on such old hosts the shared_info page will be placed in RAM. As a result kexec can not be used. Signed-off-by: Olaf Hering --- v5: reword subject handle Xen3, continue to use extend_brk on old hosts v4: rebase to 3.7-rc3 v3: make xen_hvm_init_shared_info static v2: add __init to xen_hvm_set_shared_info arch/x86/xen/enlighten.c | 75 ++++++++++++++++++++++++++++++++++-------------- arch/x86/xen/suspend.c | 2 +- arch/x86/xen/xen-ops.h | 2 +- 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..a90c3bb 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1495,51 +1495,72 @@ asmlinkage void __init xen_start_kernel(void) #endif } -void __ref xen_hvm_init_shared_info(void) +#ifdef CONFIG_XEN_PVHVM +#define HVM_SHARED_INFO_ADDR 0xFE700000UL +static struct shared_info *xen_hvm_shared_info; +static unsigned long xen_hvm_sip_phys; +static int xen_major, xen_minor; + +static void xen_hvm_connect_shared_info(unsigned long pfn) { - int cpu; struct xen_add_to_physmap xatp; - static struct shared_info *shared_info_page = 0; - if (!shared_info_page) - shared_info_page = (struct shared_info *) - extend_brk(PAGE_SIZE, PAGE_SIZE); xatp.domid = DOMID_SELF; xatp.idx = 0; xatp.space = XENMAPSPACE_shared_info; - xatp.gpfn = __pa(shared_info_page) >> PAGE_SHIFT; + xatp.gpfn = pfn; if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) BUG(); - HYPERVISOR_shared_info = (struct shared_info *)shared_info_page; +} +static void __init xen_hvm_set_shared_info(struct shared_info *sip) +{ + int cpu; + + HYPERVISOR_shared_info = sip; /* xen_vcpu is a pointer to the vcpu_info struct in the shared_info * page, we use it in the event channel upcall and in some pvclock * related functions. We don't need the vcpu_info placement * optimizations because we don't use any pv_mmu or pv_irq op on - * HVM. - * When xen_hvm_init_shared_info is run at boot time only vcpu 0 is - * online but xen_hvm_init_shared_info is run at resume time too and - * in that case multiple vcpus might be online. */ - for_each_online_cpu(cpu) { + * HVM. */ + for_each_online_cpu(cpu) per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; +} + +/* Reconnect the shared_info pfn to a (new) mfn */ +void xen_hvm_resume_shared_info(void) +{ + xen_hvm_connect_shared_info(xen_hvm_sip_phys >> PAGE_SHIFT); +} + +/* Xen tools prior to Xen 4 do not provide a E820_Reserved area for guest usage. + * On these old tools the shared info page will be placed in E820_Ram. + * Xen 4 provides a E820_Reserved area at 0xFC000000, and this code expects + * that nothing is mapped up to HVM_SHARED_INFO_ADDR. + * Xen 4.3+ provides an explicit 1MB area at HVM_SHARED_INFO_ADDR which is used + * here for the shared info page. */ +static void __init xen_hvm_init_shared_info(void) +{ + if (xen_major < 4) { + xen_hvm_shared_info = extend_brk(PAGE_SIZE, PAGE_SIZE); + xen_hvm_sip_phys = __pa(xen_hvm_shared_info); + } else { + xen_hvm_sip_phys = HVM_SHARED_INFO_ADDR; + set_fixmap(FIX_PARAVIRT_BOOTMAP, xen_hvm_sip_phys); + xen_hvm_shared_info = + (struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP); } + xen_hvm_connect_shared_info(xen_hvm_sip_phys >> PAGE_SHIFT); + xen_hvm_set_shared_info(xen_hvm_shared_info); } -#ifdef CONFIG_XEN_PVHVM static void __init init_hvm_pv_info(void) { - int major, minor; uint32_t eax, ebx, ecx, edx, pages, msr, base; u64 pfn; base = xen_cpuid_base(); - cpuid(base + 1, &eax, &ebx, &ecx, &edx); - - major = eax >> 16; - minor = eax & 0xffff; - printk(KERN_INFO "Xen version %d.%d.\n", major, minor); - cpuid(base + 2, &pages, &msr, &ecx, &edx); pfn = __pa(hypercall_page); @@ -1590,12 +1611,22 @@ static void __init xen_hvm_guest_init(void) static bool __init xen_hvm_platform(void) { + uint32_t eax, ebx, ecx, edx, base; + if (xen_pv_domain()) return false; - if (!xen_cpuid_base()) + base = xen_cpuid_base(); + if (!base) return false; + cpuid(base + 1, &eax, &ebx, &ecx, &edx); + + xen_major = eax >> 16; + xen_minor = eax & 0xffff; + + printk(KERN_INFO "Xen version %d.%d.\n", xen_major, xen_minor); + return true; } diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 45329c8..ae8a00c 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -30,7 +30,7 @@ void xen_arch_hvm_post_suspend(int suspend_cancelled) { #ifdef CONFIG_XEN_PVHVM int cpu; - xen_hvm_init_shared_info(); + xen_hvm_resume_shared_info(); xen_callback_vector(); xen_unplug_emulated_devices(); if (xen_feature(XENFEAT_hvm_safe_pvclock)) { diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index a95b417..d2e73d1 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -40,7 +40,7 @@ void xen_enable_syscall(void); void xen_vcpu_restore(void); void xen_callback_vector(void); -void xen_hvm_init_shared_info(void); +void xen_hvm_resume_shared_info(void); void xen_unplug_emulated_devices(void); void __init xen_build_dynamic_phys_to_machine(void); -- 1.8.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:11:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU22v-0007iB-TV; Thu, 01 Nov 2012 21:11:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU22u-0007i6-PI for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:11:25 +0000 Received: from [85.158.143.99:28614] by server-3.bemta-4.messagelabs.com id C1/10-06841-C75E2905; Thu, 01 Nov 2012 21:11:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351804283!22968701!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7726 invoked from network); 1 Nov 2012 21:11:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 21:11:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15546311" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 21:11:22 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 21:11:22 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU22s-0006Js-5b; Thu, 01 Nov 2012 21:11:22 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU22s-0007Ej-54; Thu, 01 Nov 2012 21:11:22 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 21:11:22 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14302: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14302 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14302/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-sedf 11 guest-localmigrate fail pass in 14294 test-amd64-i386-xl-multivcpu 3 host-install(3) broken pass in 14294 test-i386-i386-xl-winxpsp3 3 host-install(3) broken in 14294 pass in 14302 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu broken test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:11:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:11:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU22v-0007iB-TV; Thu, 01 Nov 2012 21:11:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU22u-0007i6-PI for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:11:25 +0000 Received: from [85.158.143.99:28614] by server-3.bemta-4.messagelabs.com id C1/10-06841-C75E2905; Thu, 01 Nov 2012 21:11:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351804283!22968701!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY4ODc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7726 invoked from network); 1 Nov 2012 21:11:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 21:11:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,695,1344211200"; d="scan'208";a="15546311" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2012 21:11:22 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 1 Nov 2012 21:11:22 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU22s-0006Js-5b; Thu, 01 Nov 2012 21:11:22 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU22s-0007Ej-54; Thu, 01 Nov 2012 21:11:22 +0000 To: Message-ID: From: xen.org Date: Thu, 1 Nov 2012 21:11:22 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14302: regressions - trouble: broken/fail/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14302 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14302/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-i386-i386-xl 9 guest-start fail REGR. vs. 14076 test-i386-i386-xl-qemuu-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-winxpsp3 7 windows-install fail REGR. vs. 14076 test-i386-i386-xl-win 7 windows-install fail REGR. vs. 14076 Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-sedf 11 guest-localmigrate fail pass in 14294 test-amd64-i386-xl-multivcpu 3 host-install(3) broken pass in 14294 test-i386-i386-xl-winxpsp3 3 host-install(3) broken in 14294 pass in 14302 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 2bca7e58a3df baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl fail test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu broken test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. (No revision log; it would be 632 lines long.) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:29:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:29:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2KX-00089a-Tn; Thu, 01 Nov 2012 21:29:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2KW-00089V-JB for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:29:36 +0000 Received: from [85.158.139.211:2837] by server-12.bemta-5.messagelabs.com id B6/32-02886-FB9E2905; Thu, 01 Nov 2012 21:29:35 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1351805373!18090305!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2448 invoked from network); 1 Nov 2012 21:29:34 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:29:34 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4A82F84074; Thu, 1 Nov 2012 22:29:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VQ6M3YR8ocWL; Thu, 1 Nov 2012 22:29:33 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 02FD884072; Thu, 1 Nov 2012 22:29:32 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2KR-0001Qt-5S; Thu, 01 Nov 2012 22:29:31 +0100 Date: Thu, 1 Nov 2012 22:29:31 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a > lot of spam. Do they? I've never seen any, and normally they shouldn't be, so there could be another issue. Could you show what happens? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:29:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:29:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2KX-00089a-Tn; Thu, 01 Nov 2012 21:29:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2KW-00089V-JB for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:29:36 +0000 Received: from [85.158.139.211:2837] by server-12.bemta-5.messagelabs.com id B6/32-02886-FB9E2905; Thu, 01 Nov 2012 21:29:35 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1351805373!18090305!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2448 invoked from network); 1 Nov 2012 21:29:34 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:29:34 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4A82F84074; Thu, 1 Nov 2012 22:29:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VQ6M3YR8ocWL; Thu, 1 Nov 2012 22:29:33 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 02FD884072; Thu, 1 Nov 2012 22:29:32 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2KR-0001Qt-5S; Thu, 01 Nov 2012 22:29:31 +0100 Date: Thu, 1 Nov 2012 22:29:31 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a > lot of spam. Do they? I've never seen any, and normally they shouldn't be, so there could be another issue. Could you show what happens? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:32:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:32:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2NM-0008Hx-GP; Thu, 01 Nov 2012 21:32:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2NK-0008Hn-O3 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:32:30 +0000 Received: from [85.158.138.51:3824] by server-11.bemta-3.messagelabs.com id C4/75-19361-96AE2905; Thu, 01 Nov 2012 21:32:25 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1351805544!19447112!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31391 invoked from network); 1 Nov 2012 21:32:25 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:32:25 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 6B85A84074; Thu, 1 Nov 2012 22:32:24 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7AqdyGyrEdEk; Thu, 1 Nov 2012 22:32:24 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 24B0684072; Thu, 1 Nov 2012 22:32:24 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2NC-0001Tf-PY; Thu, 01 Nov 2012 22:32:22 +0100 Date: Thu, 1 Nov 2012 22:32:22 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:25 -0400, a =E9crit : > Similar to xenbus_read_integer, this function reads a xenstore path > and parses it as a uuid. See include/xenbus.h for details. > = > Signed-off-by: Matthew Fioravante Acked-by: Samuel Thibault _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:32:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:32:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2NM-0008Hx-GP; Thu, 01 Nov 2012 21:32:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2NK-0008Hn-O3 for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:32:30 +0000 Received: from [85.158.138.51:3824] by server-11.bemta-3.messagelabs.com id C4/75-19361-96AE2905; Thu, 01 Nov 2012 21:32:25 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1351805544!19447112!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31391 invoked from network); 1 Nov 2012 21:32:25 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:32:25 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 6B85A84074; Thu, 1 Nov 2012 22:32:24 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7AqdyGyrEdEk; Thu, 1 Nov 2012 22:32:24 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 24B0684072; Thu, 1 Nov 2012 22:32:24 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2NC-0001Tf-PY; Thu, 01 Nov 2012 22:32:22 +0100 Date: Thu, 1 Nov 2012 22:32:22 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:25 -0400, a =E9crit : > Similar to xenbus_read_integer, this function reads a xenstore path > and parses it as a uuid. See include/xenbus.h for details. > = > Signed-off-by: Matthew Fioravante Acked-by: Samuel Thibault _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:35:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:35:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2Pf-0008Sq-2r; Thu, 01 Nov 2012 21:34:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2Pd-0008Sh-LW for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:34:53 +0000 Received: from [193.109.254.147:7828] by server-14.bemta-14.messagelabs.com id 1D/A1-14517-CFAE2905; Thu, 01 Nov 2012 21:34:52 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1351805692!3639646!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16718 invoked from network); 1 Nov 2012 21:34:52 -0000 Received: from toccata.ens-lyon.org (HELO toccata.ens-lyon.org) (140.77.166.68) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:34:52 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 1391184074; Thu, 1 Nov 2012 22:34:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tURCf7VdaXpm; Thu, 1 Nov 2012 22:34:51 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id C2A5A84072; Thu, 1 Nov 2012 22:34:51 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2Pa-0001UI-CK; Thu, 01 Nov 2012 22:34:50 +0100 Date: Thu, 1 Nov 2012 22:34:50 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:27 -0400, a =E9crit : > -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONF= IG_TPM_TIS) ... > #ifdef CONFIG_TPMFRNT There seems to be a mismatch here between CONFIG_TPMFRONT and CONFIG_TPMFRNT? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:35:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:35:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2Pf-0008Sq-2r; Thu, 01 Nov 2012 21:34:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2Pd-0008Sh-LW for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:34:53 +0000 Received: from [193.109.254.147:7828] by server-14.bemta-14.messagelabs.com id 1D/A1-14517-CFAE2905; Thu, 01 Nov 2012 21:34:52 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1351805692!3639646!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16718 invoked from network); 1 Nov 2012 21:34:52 -0000 Received: from toccata.ens-lyon.org (HELO toccata.ens-lyon.org) (140.77.166.68) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:34:52 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 1391184074; Thu, 1 Nov 2012 22:34:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tURCf7VdaXpm; Thu, 1 Nov 2012 22:34:51 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id C2A5A84072; Thu, 1 Nov 2012 22:34:51 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TU2Pa-0001UI-CK; Thu, 01 Nov 2012 22:34:50 +0100 Date: Thu, 1 Nov 2012 22:34:50 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:27 -0400, a =E9crit : > -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || defined(CONF= IG_TPM_TIS) ... > #ifdef CONFIG_TPMFRNT There seems to be a mismatch here between CONFIG_TPMFRONT and CONFIG_TPMFRNT? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:58:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2mP-0000gZ-Um; Thu, 01 Nov 2012 21:58:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2mO-0000gO-P1 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:58:25 +0000 Received: from [85.158.139.211:43585] by server-6.bemta-5.messagelabs.com id B6/01-19321-080F2905; Thu, 01 Nov 2012 21:58:24 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1351807101!18486400!1 X-Originating-IP: [148.87.113.117] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQ4Ljg3LjExMy4xMTcgPT4gODMyMjAy\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26932 invoked from network); 1 Nov 2012 21:58:23 -0000 Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:58:23 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1LvvqN027502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 21:57:57 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Lvssl008978 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 21:57:55 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1LvrIm023096; Thu, 1 Nov 2012 16:57:53 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 14:57:52 -0700 Date: Thu, 1 Nov 2012 17:57:49 -0400 From: Konrad Rzeszutek Wilk To: Randy Dunlap Message-ID: <20121101215749.GB18854@localhost.localdomain> References: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> <5092AEF7.5020609@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092AEF7.5020609@infradead.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Stephen Rothwell , Jeremy Fitzhardinge , xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-next@vger.kernel.org Subject: Re: [Xen-devel] linux-next: Tree for Nov 1 (xen) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 10:18:47AM -0700, Randy Dunlap wrote: > On 10/31/2012 10:36 PM, Stephen Rothwell wrote: > > > Hi all, > > > > New trees: rr-fixes and swiotlb > > > > Changes since 20121031: > > > > > arch/x86/xen/enlighten.c:109:0: warning: "xen_pvh_domain" redefined > include/xen/xen.h:23:0: note: this is the location of the previous definition I think this was due to a patch that mistakenly was put in the tmem.git tree. It should not surface tomorrow. > > Full randconfig file is attached. > > -- > ~Randy > # > # Automatically generated file; DO NOT EDIT. > # Linux/x86_64 3.7.0-rc3 Kernel Configuration > # > CONFIG_64BIT=y > CONFIG_X86_64=y > CONFIG_X86=y > CONFIG_INSTRUCTION_DECODER=y > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" > CONFIG_LOCKDEP_SUPPORT=y > CONFIG_STACKTRACE_SUPPORT=y > CONFIG_HAVE_LATENCYTOP_SUPPORT=y > CONFIG_MMU=y > CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NEED_SG_DMA_LENGTH=y > CONFIG_GENERIC_BUG=y > CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y > CONFIG_GENERIC_HWEIGHT=y > CONFIG_GENERIC_GPIO=y > CONFIG_RWSEM_XCHGADD_ALGORITHM=y > CONFIG_GENERIC_CALIBRATE_DELAY=y > CONFIG_ARCH_HAS_CPU_RELAX=y > CONFIG_ARCH_HAS_DEFAULT_IDLE=y > CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y > CONFIG_ARCH_HAS_CPU_AUTOPROBE=y > CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y > CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y > CONFIG_ARCH_HIBERNATION_POSSIBLE=y > CONFIG_ARCH_SUSPEND_POSSIBLE=y > CONFIG_ZONE_DMA32=y > CONFIG_AUDIT_ARCH=y > CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y > CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y > CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" > CONFIG_ARCH_SUPPORTS_UPROBES=y > CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" > CONFIG_HAVE_IRQ_WORK=y > CONFIG_IRQ_WORK=y > CONFIG_BUILDTIME_EXTABLE_SORT=y > > # > # General setup > # > CONFIG_EXPERIMENTAL=y > CONFIG_BROKEN_ON_SMP=y > CONFIG_INIT_ENV_ARG_LIMIT=32 > CONFIG_CROSS_COMPILE="" > CONFIG_LOCALVERSION="" > # CONFIG_LOCALVERSION_AUTO is not set > CONFIG_HAVE_KERNEL_GZIP=y > CONFIG_HAVE_KERNEL_BZIP2=y > CONFIG_HAVE_KERNEL_LZMA=y > CONFIG_HAVE_KERNEL_XZ=y > CONFIG_HAVE_KERNEL_LZO=y > # CONFIG_KERNEL_GZIP is not set > CONFIG_KERNEL_BZIP2=y > # CONFIG_KERNEL_LZMA is not set > # CONFIG_KERNEL_XZ is not set > # CONFIG_KERNEL_LZO is not set > CONFIG_DEFAULT_HOSTNAME="(none)" > CONFIG_SYSVIPC=y > CONFIG_FHANDLE=y > CONFIG_HAVE_GENERIC_HARDIRQS=y > > # > # IRQ subsystem > # > CONFIG_GENERIC_HARDIRQS=y > CONFIG_GENERIC_IRQ_PROBE=y > CONFIG_GENERIC_IRQ_SHOW=y > CONFIG_IRQ_DOMAIN=y > # CONFIG_IRQ_DOMAIN_DEBUG is not set > CONFIG_IRQ_FORCED_THREADING=y > CONFIG_SPARSE_IRQ=y > CONFIG_CLOCKSOURCE_WATCHDOG=y > CONFIG_ARCH_CLOCKSOURCE_DATA=y > CONFIG_GENERIC_TIME_VSYSCALL=y > CONFIG_GENERIC_CLOCKEVENTS=y > CONFIG_GENERIC_CLOCKEVENTS_BUILD=y > CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y > CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y > CONFIG_GENERIC_CMOS_UPDATE=y > > # > # Timers subsystem > # > CONFIG_TICK_ONESHOT=y > # CONFIG_NO_HZ is not set > CONFIG_HIGH_RES_TIMERS=y > > # > # CPU/Task time and stats accounting > # > CONFIG_TICK_CPU_ACCOUNTING=y > # CONFIG_IRQ_TIME_ACCOUNTING is not set > # CONFIG_BSD_PROCESS_ACCT is not set > > # > # RCU Subsystem > # > CONFIG_TINY_PREEMPT_RCU=y > CONFIG_PREEMPT_RCU=y > # CONFIG_TREE_RCU_TRACE is not set > CONFIG_RCU_BOOST=y > CONFIG_RCU_BOOST_PRIO=1 > CONFIG_RCU_BOOST_DELAY=500 > CONFIG_IKCONFIG=m > CONFIG_LOG_BUF_SHIFT=17 > CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y > CONFIG_CHECKPOINT_RESTORE=y > CONFIG_NAMESPACES=y > CONFIG_UTS_NS=y > # CONFIG_IPC_NS is not set > # CONFIG_PID_NS is not set > # CONFIG_SCHED_AUTOGROUP is not set > CONFIG_SYSFS_DEPRECATED=y > # CONFIG_SYSFS_DEPRECATED_V2 is not set > # CONFIG_RELAY is not set > # CONFIG_BLK_DEV_INITRD is not set > # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set > CONFIG_ANON_INODES=y > CONFIG_EXPERT=y > CONFIG_HAVE_UID16=y > CONFIG_UID16=y > CONFIG_SYSCTL_EXCEPTION_TRACE=y > CONFIG_KALLSYMS=y > CONFIG_KALLSYMS_ALL=y > CONFIG_HOTPLUG=y > # CONFIG_PRINTK is not set > CONFIG_BUG=y > CONFIG_ELF_CORE=y > # CONFIG_PCSPKR_PLATFORM is not set > CONFIG_HAVE_PCSPKR_PLATFORM=y > CONFIG_BASE_FULL=y > CONFIG_FUTEX=y > # CONFIG_EPOLL is not set > # CONFIG_SIGNALFD is not set > # CONFIG_TIMERFD is not set > # CONFIG_EVENTFD is not set > # CONFIG_SHMEM is not set > # CONFIG_AIO is not set > # CONFIG_EMBEDDED is not set > CONFIG_HAVE_PERF_EVENTS=y > > # > # Kernel Performance Events And Counters > # > CONFIG_PERF_EVENTS=y > # CONFIG_DEBUG_PERF_USE_VMALLOC is not set > CONFIG_VM_EVENT_COUNTERS=y > CONFIG_SLUB_DEBUG=y > CONFIG_COMPAT_BRK=y > # CONFIG_SLAB is not set > CONFIG_SLUB=y > # CONFIG_SLOB is not set > CONFIG_PROFILING=y > # CONFIG_OPROFILE is not set > CONFIG_HAVE_OPROFILE=y > CONFIG_OPROFILE_NMI_TIMER=y > CONFIG_KPROBES=y > CONFIG_JUMP_LABEL=y > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y > CONFIG_KRETPROBES=y > CONFIG_HAVE_IOREMAP_PROT=y > CONFIG_HAVE_KPROBES=y > CONFIG_HAVE_KRETPROBES=y > CONFIG_HAVE_OPTPROBES=y > CONFIG_HAVE_ARCH_TRACEHOOK=y > CONFIG_HAVE_DMA_ATTRS=y > CONFIG_GENERIC_SMP_IDLE_THREAD=y > CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y > CONFIG_HAVE_DMA_API_DEBUG=y > CONFIG_HAVE_HW_BREAKPOINT=y > CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y > CONFIG_HAVE_USER_RETURN_NOTIFIER=y > CONFIG_HAVE_PERF_EVENTS_NMI=y > CONFIG_HAVE_PERF_REGS=y > CONFIG_HAVE_PERF_USER_STACK_DUMP=y > CONFIG_HAVE_ARCH_JUMP_LABEL=y > CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y > CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y > CONFIG_HAVE_CMPXCHG_LOCAL=y > CONFIG_HAVE_CMPXCHG_DOUBLE=y > CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y > CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y > CONFIG_GENERIC_KERNEL_THREAD=y > CONFIG_GENERIC_KERNEL_EXECVE=y > CONFIG_HAVE_ARCH_SECCOMP_FILTER=y > CONFIG_HAVE_RCU_USER_QS=y > CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y > CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y > CONFIG_MODULES_USE_ELF_RELA=y > > # > # GCOV-based kernel profiling > # > # CONFIG_GCOV_KERNEL is not set > # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set > CONFIG_RT_MUTEXES=y > CONFIG_BASE_SMALL=0 > CONFIG_MODULES=y > CONFIG_MODULE_FORCE_LOAD=y > CONFIG_MODULE_UNLOAD=y > # CONFIG_MODULE_FORCE_UNLOAD is not set > CONFIG_MODVERSIONS=y > CONFIG_MODULE_SRCVERSION_ALL=y > CONFIG_MODULE_SIG=y > CONFIG_MODULE_SIG_FORCE=y > # CONFIG_MODULE_SIG_SHA1 is not set > # CONFIG_MODULE_SIG_SHA224 is not set > CONFIG_MODULE_SIG_SHA256=y > # CONFIG_MODULE_SIG_SHA384 is not set > # CONFIG_MODULE_SIG_SHA512 is not set > # CONFIG_BLOCK is not set > CONFIG_ASN1=y > CONFIG_UNINLINE_SPIN_UNLOCK=y > CONFIG_FREEZER=y > > # > # Processor type and features > # > # CONFIG_ZONE_DMA is not set > # CONFIG_SMP is not set > CONFIG_X86_MPPARSE=y > # CONFIG_X86_EXTENDED_PLATFORM is not set > CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y > CONFIG_SCHED_OMIT_FRAME_POINTER=y > # CONFIG_KVMTOOL_TEST_ENABLE is not set > CONFIG_PARAVIRT_GUEST=y > # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set > CONFIG_XEN=y > # CONFIG_XEN_PRIVILEGED_GUEST is not set > CONFIG_XEN_MAX_DOMAIN_MEMORY=500 > CONFIG_XEN_SAVE_RESTORE=y > # CONFIG_XEN_DEBUG_FS is not set > CONFIG_XEN_X86_PVH=y > # CONFIG_KVM_GUEST is not set > CONFIG_PARAVIRT=y > CONFIG_PARAVIRT_CLOCK=y > CONFIG_PARAVIRT_DEBUG=y > CONFIG_NO_BOOTMEM=y > # CONFIG_MEMTEST is not set > # CONFIG_MK8 is not set > # CONFIG_MPSC is not set > # CONFIG_MCORE2 is not set > # CONFIG_MATOM is not set > CONFIG_GENERIC_CPU=y > CONFIG_X86_INTERNODE_CACHE_SHIFT=6 > CONFIG_X86_CMPXCHG=y > CONFIG_X86_L1_CACHE_SHIFT=6 > CONFIG_X86_XADD=y > CONFIG_X86_WP_WORKS_OK=y > CONFIG_X86_TSC=y > CONFIG_X86_CMPXCHG64=y > CONFIG_X86_CMOV=y > CONFIG_X86_MINIMUM_CPU_FAMILY=64 > CONFIG_X86_DEBUGCTLMSR=y > # CONFIG_PROCESSOR_SELECT is not set > CONFIG_CPU_SUP_INTEL=y > CONFIG_CPU_SUP_AMD=y > CONFIG_CPU_SUP_CENTAUR=y > CONFIG_HPET_TIMER=y > # CONFIG_DMI is not set > CONFIG_SWIOTLB=y > CONFIG_IOMMU_HELPER=y > CONFIG_NR_CPUS=1 > # CONFIG_PREEMPT_NONE is not set > # CONFIG_PREEMPT_VOLUNTARY is not set > CONFIG_PREEMPT=y > CONFIG_PREEMPT_COUNT=y > CONFIG_X86_LOCAL_APIC=y > CONFIG_X86_IO_APIC=y > # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set > CONFIG_X86_MCE=y > CONFIG_X86_MCE_INTEL=y > # CONFIG_X86_MCE_AMD is not set > CONFIG_X86_MCE_THRESHOLD=y > CONFIG_X86_MCE_INJECT=m > CONFIG_X86_THERMAL_VECTOR=y > CONFIG_I8K=m > # CONFIG_MICROCODE is not set > CONFIG_X86_MSR=m > CONFIG_X86_CPUID=m > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_DIRECT_GBPAGES=y > CONFIG_ARCH_SPARSEMEM_ENABLE=y > CONFIG_ARCH_SPARSEMEM_DEFAULT=y > CONFIG_ARCH_SELECT_MEMORY_MODEL=y > CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 > CONFIG_SELECT_MEMORY_MODEL=y > CONFIG_SPARSEMEM_MANUAL=y > CONFIG_SPARSEMEM=y > CONFIG_HAVE_MEMORY_PRESENT=y > CONFIG_SPARSEMEM_EXTREME=y > CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y > CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y > # CONFIG_SPARSEMEM_VMEMMAP is not set > CONFIG_HAVE_MEMBLOCK=y > CONFIG_HAVE_MEMBLOCK_NODE_MAP=y > CONFIG_ARCH_DISCARD_MEMBLOCK=y > CONFIG_MEMORY_ISOLATION=y > # CONFIG_MEMORY_HOTPLUG is not set > CONFIG_PAGEFLAGS_EXTENDED=y > CONFIG_SPLIT_PTLOCK_CPUS=999999 > # CONFIG_COMPACTION is not set > CONFIG_PHYS_ADDR_T_64BIT=y > CONFIG_ZONE_DMA_FLAG=0 > CONFIG_VIRT_TO_BUS=y > CONFIG_MMU_NOTIFIER=y > CONFIG_KSM=y > CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 > CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y > CONFIG_MEMORY_FAILURE=y > # CONFIG_TRANSPARENT_HUGEPAGE is not set > CONFIG_CROSS_MEMORY_ATTACH=y > CONFIG_NEED_PER_CPU_KM=y > CONFIG_CLEANCACHE=y > # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set > CONFIG_X86_RESERVE_LOW=64 > CONFIG_MTRR=y > CONFIG_MTRR_SANITIZER=y > CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 > CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 > # CONFIG_X86_PAT is not set > # CONFIG_ARCH_RANDOM is not set > CONFIG_X86_SMAP=y > # CONFIG_SECCOMP is not set > CONFIG_CC_STACKPROTECTOR=y > # CONFIG_HZ_100 is not set > # CONFIG_HZ_250 is not set > CONFIG_HZ_300=y > # CONFIG_HZ_1000 is not set > CONFIG_HZ=300 > CONFIG_SCHED_HRTICK=y > # CONFIG_KEXEC is not set > # CONFIG_CRASH_DUMP is not set > CONFIG_PHYSICAL_START=0x1000000 > # CONFIG_RELOCATABLE is not set > CONFIG_PHYSICAL_ALIGN=0x1000000 > # CONFIG_COMPAT_VDSO is not set > CONFIG_CMDLINE_BOOL=y > CONFIG_CMDLINE="" > CONFIG_CMDLINE_OVERRIDE=y > CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y > > # > # Power management and ACPI options > # > CONFIG_SUSPEND=y > CONFIG_SUSPEND_FREEZER=y > CONFIG_HIBERNATE_CALLBACKS=y > CONFIG_PM_SLEEP=y > CONFIG_PM_AUTOSLEEP=y > CONFIG_PM_WAKELOCKS=y > CONFIG_PM_WAKELOCKS_LIMIT=100 > # CONFIG_PM_WAKELOCKS_GC is not set > CONFIG_PM_RUNTIME=y > CONFIG_PM=y > # CONFIG_PM_DEBUG is not set > # CONFIG_SFI is not set > > # > # CPU Frequency scaling > # > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_TABLE=m > CONFIG_CPU_FREQ_STAT=m > # CONFIG_CPU_FREQ_STAT_DETAILS is not set > CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y > # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set > CONFIG_CPU_FREQ_GOV_PERFORMANCE=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > CONFIG_CPU_FREQ_GOV_ONDEMAND=m > # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set > > # > # x86 CPU frequency scaling drivers > # > CONFIG_X86_P4_CLOCKMOD=m > > # > # shared options > # > CONFIG_X86_SPEEDSTEP_LIB=m > # CONFIG_CPU_IDLE is not set > # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set > > # > # Memory power savings > # > # CONFIG_I7300_IDLE is not set > > # > # Bus options (PCI etc.) > # > # CONFIG_PCI is not set > # CONFIG_ISA_DMA_API is not set > CONFIG_PCCARD=m > CONFIG_PCMCIA=m > CONFIG_PCMCIA_LOAD_CIS=y > > # > # PC-card bridges > # > > # > # Executable file formats / Emulations > # > CONFIG_BINFMT_ELF=y > CONFIG_COMPAT_BINFMT_ELF=y > CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y > CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y > # CONFIG_HAVE_AOUT is not set > CONFIG_BINFMT_MISC=m > CONFIG_COREDUMP=y > CONFIG_IA32_EMULATION=y > CONFIG_IA32_AOUT=m > # CONFIG_X86_X32 is not set > CONFIG_COMPAT=y > CONFIG_COMPAT_FOR_U64_ALIGNMENT=y > CONFIG_SYSVIPC_COMPAT=y > CONFIG_KEYS_COMPAT=y > CONFIG_HAVE_TEXT_POKE_SMP=y > CONFIG_X86_DEV_DMA_OPS=y > # CONFIG_NET is not set > CONFIG_HAVE_BPF_JIT=y > > # > # Device Drivers > # > > # > # Generic Driver Options > # > CONFIG_UEVENT_HELPER_PATH="" > # CONFIG_DEVTMPFS is not set > CONFIG_STANDALONE=y > CONFIG_PREVENT_FIRMWARE_BUILD=y > CONFIG_FW_LOADER=m > # CONFIG_FIRMWARE_IN_KERNEL is not set > CONFIG_EXTRA_FIRMWARE="" > CONFIG_DEBUG_DRIVER=y > CONFIG_DEBUG_DEVRES=y > CONFIG_SYS_HYPERVISOR=y > # CONFIG_GENERIC_CPU_DEVICES is not set > CONFIG_REGMAP=y > CONFIG_REGMAP_SPI=y > CONFIG_REGMAP_IRQ=y > # CONFIG_DMA_SHARED_BUFFER is not set > > # > # Bus devices > # > CONFIG_OMAP_OCP2SCP=m > # CONFIG_MTD is not set > CONFIG_PARPORT=m > # CONFIG_PARPORT_PC is not set > # CONFIG_PARPORT_GSC is not set > # CONFIG_PARPORT_AX88796 is not set > CONFIG_PARPORT_1284=y > CONFIG_PARPORT_NOT_PC=y > > # > # Misc devices > # > # CONFIG_SENSORS_LIS3LV02D is not set > CONFIG_AD525X_DPOT=m > # CONFIG_AD525X_DPOT_SPI is not set > CONFIG_ENCLOSURE_SERVICES=m > # CONFIG_TI_DAC7512 is not set > # CONFIG_VMWARE_BALLOON is not set > CONFIG_BMP085=y > CONFIG_BMP085_SPI=m > # CONFIG_C2PORT is not set > > # > # EEPROM support > # > CONFIG_EEPROM_AT25=m > # CONFIG_EEPROM_93CX6 is not set > # CONFIG_EEPROM_93XX46 is not set > > # > # Texas Instruments shared transport line discipline > # > # CONFIG_SENSORS_LIS3_SPI is not set > > # > # Altera FPGA firmware download module > # > CONFIG_HAVE_IDE=y > > # > # SCSI device support > # > CONFIG_SCSI_MOD=y > # CONFIG_SCSI_DMA is not set > # CONFIG_SCSI_NETLINK is not set > CONFIG_MACINTOSH_DRIVERS=y > > # > # Input device support > # > CONFIG_INPUT=m > # CONFIG_INPUT_FF_MEMLESS is not set > CONFIG_INPUT_POLLDEV=m > CONFIG_INPUT_SPARSEKMAP=m > CONFIG_INPUT_MATRIXKMAP=m > > # > # Userland interfaces > # > # CONFIG_INPUT_MOUSEDEV is not set > CONFIG_INPUT_JOYDEV=m > CONFIG_INPUT_EVDEV=m > # CONFIG_INPUT_EVBUG is not set > > # > # Input Device Drivers > # > # CONFIG_INPUT_KEYBOARD is not set > # CONFIG_INPUT_MOUSE is not set > # CONFIG_INPUT_JOYSTICK is not set > # CONFIG_INPUT_TABLET is not set > # CONFIG_INPUT_TOUCHSCREEN is not set > CONFIG_INPUT_MISC=y > CONFIG_INPUT_AD714X=m > CONFIG_INPUT_AD714X_SPI=m > CONFIG_INPUT_MC13783_PWRBUTTON=m > # CONFIG_INPUT_GPIO_TILT_POLLED is not set > # CONFIG_INPUT_ATI_REMOTE2 is not set > CONFIG_INPUT_KEYSPAN_REMOTE=m > CONFIG_INPUT_POWERMATE=m > # CONFIG_INPUT_YEALINK is not set > # CONFIG_INPUT_CM109 is not set > CONFIG_INPUT_UINPUT=m > # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set > CONFIG_INPUT_DA9052_ONKEY=m > # CONFIG_INPUT_PCAP is not set > CONFIG_INPUT_ADXL34X=m > # CONFIG_INPUT_ADXL34X_SPI is not set > # CONFIG_INPUT_CMA3000 is not set > # CONFIG_INPUT_XEN_KBDDEV_FRONTEND is not set > > # > # Hardware I/O ports > # > CONFIG_SERIO=m > CONFIG_SERIO_I8042=m > CONFIG_SERIO_SERPORT=m > CONFIG_SERIO_CT82C710=m > CONFIG_SERIO_PARKBD=m > # CONFIG_SERIO_LIBPS2 is not set > # CONFIG_SERIO_RAW is not set > CONFIG_SERIO_ALTERA_PS2=m > # CONFIG_SERIO_PS2MULT is not set > CONFIG_SERIO_ARC_PS2=m > # CONFIG_GAMEPORT is not set > > # > # Character devices > # > # CONFIG_VT is not set > CONFIG_UNIX98_PTYS=y > # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set > # CONFIG_LEGACY_PTYS is not set > # CONFIG_SERIAL_NONSTANDARD is not set > # CONFIG_TRACE_SINK is not set > CONFIG_DEVKMEM=y > > # > # Serial drivers > # > CONFIG_SERIAL_8250=m > CONFIG_FIX_EARLYCON_MEM=y > # CONFIG_SERIAL_8250_CS is not set > CONFIG_SERIAL_8250_NR_UARTS=4 > CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > # CONFIG_SERIAL_8250_EXTENDED is not set > > # > # Non-8250 serial port support > # > # CONFIG_SERIAL_MAX3100 is not set > CONFIG_SERIAL_MAX310X=y > CONFIG_SERIAL_CORE=y > # CONFIG_SERIAL_SCCNXP is not set > # CONFIG_SERIAL_TIMBERDALE is not set > # CONFIG_SERIAL_ALTERA_JTAGUART is not set > # CONFIG_SERIAL_ALTERA_UART is not set > # CONFIG_SERIAL_IFX6X60 is not set > # CONFIG_SERIAL_XILINX_PS_UART is not set > CONFIG_SERIAL_ARC=m > CONFIG_SERIAL_ARC_NR_PORTS=1 > CONFIG_TTY_PRINTK=y > # CONFIG_PRINTER is not set > # CONFIG_PPDEV is not set > CONFIG_HVC_DRIVER=y > # CONFIG_HVC_XEN is not set > CONFIG_VIRTIO_CONSOLE=m > CONFIG_IPMI_HANDLER=m > CONFIG_IPMI_PANIC_EVENT=y > CONFIG_IPMI_PANIC_STRING=y > # CONFIG_IPMI_DEVICE_INTERFACE is not set > CONFIG_IPMI_SI=m > # CONFIG_IPMI_WATCHDOG is not set > CONFIG_IPMI_POWEROFF=m > CONFIG_HW_RANDOM=m > # CONFIG_HW_RANDOM_TIMERIOMEM is not set > # CONFIG_HW_RANDOM_VIA is not set > # CONFIG_HW_RANDOM_VIRTIO is not set > # CONFIG_NVRAM is not set > # CONFIG_R3964 is not set > > # > # PCMCIA character devices > # > CONFIG_SYNCLINK_CS=m > CONFIG_CARDMAN_4000=m > # CONFIG_CARDMAN_4040 is not set > # CONFIG_MWAVE is not set > # CONFIG_HANGCHECK_TIMER is not set > # CONFIG_TCG_TPM is not set > CONFIG_TELCLOCK=m > # CONFIG_I2C is not set > CONFIG_SPI=y > CONFIG_SPI_DEBUG=y > CONFIG_SPI_MASTER=y > > # > # SPI Master Controller Drivers > # > # CONFIG_SPI_ALTERA is not set > CONFIG_SPI_BITBANG=m > CONFIG_SPI_BUTTERFLY=m > # CONFIG_SPI_GPIO is not set > CONFIG_SPI_LM70_LLP=m > CONFIG_SPI_OC_TINY=m > # CONFIG_SPI_PXA2XX_PCI is not set > # CONFIG_SPI_XILINX is not set > CONFIG_SPI_DESIGNWARE=m > > # > # SPI Protocol Masters > # > # CONFIG_SPI_SPIDEV is not set > # CONFIG_SPI_TLE62X0 is not set > CONFIG_HSI=m > CONFIG_HSI_BOARDINFO=y > > # > # HSI clients > # > CONFIG_HSI_CHAR=m > > # > # PPS support > # > # CONFIG_PPS is not set > > # > # PPS generators support > # > > # > # PTP clock support > # > > # > # Enable Device Drivers -> PPS to see the PTP clock options. > # > CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y > CONFIG_GPIOLIB=y > CONFIG_DEBUG_GPIO=y > CONFIG_GPIO_SYSFS=y > # CONFIG_GPIO_DA9052 is not set > > # > # Memory mapped GPIO drivers: > # > # CONFIG_GPIO_GENERIC_PLATFORM is not set > CONFIG_GPIO_IT8761E=m > > # > # I2C GPIO expanders: > # > # CONFIG_GPIO_ARIZONA is not set > > # > # PCI GPIO expanders: > # > > # > # SPI GPIO expanders: > # > # CONFIG_GPIO_MAX7301 is not set > CONFIG_GPIO_MCP23S08=m > # CONFIG_GPIO_MC33880 is not set > CONFIG_GPIO_74X164=m > > # > # AC97 GPIO expanders: > # > > # > # MODULbus GPIO expanders: > # > # CONFIG_W1 is not set > # CONFIG_POWER_SUPPLY is not set > CONFIG_POWER_AVS=y > CONFIG_HWMON=m > CONFIG_HWMON_VID=m > CONFIG_HWMON_DEBUG_CHIP=y > > # > # Native drivers > # > # CONFIG_SENSORS_AD7314 is not set > # CONFIG_SENSORS_ADCXX is not set > CONFIG_SENSORS_DA9052_ADC=m > CONFIG_SENSORS_F71805F=m > CONFIG_SENSORS_F71882FG=m > # CONFIG_SENSORS_GPIO_FAN is not set > CONFIG_SENSORS_CORETEMP=m > # CONFIG_SENSORS_IBMAEM is not set > CONFIG_SENSORS_IBMPEX=m > # CONFIG_SENSORS_IT87 is not set > CONFIG_SENSORS_LM70=m > CONFIG_SENSORS_MAX1111=m > # CONFIG_SENSORS_MAX197 is not set > # CONFIG_SENSORS_NTC_THERMISTOR is not set > CONFIG_SENSORS_PC87360=m > CONFIG_SENSORS_PC87427=m > # CONFIG_SENSORS_SHT15 is not set > CONFIG_SENSORS_SMSC47M1=m > # CONFIG_SENSORS_SMSC47B397 is not set > # CONFIG_SENSORS_SCH56XX_COMMON is not set > CONFIG_SENSORS_ADS7871=m > # CONFIG_SENSORS_VIA_CPUTEMP is not set > CONFIG_SENSORS_VT1211=m > CONFIG_SENSORS_W83627HF=m > CONFIG_SENSORS_W83627EHF=m > CONFIG_SENSORS_APPLESMC=m > # CONFIG_SENSORS_MC13783_ADC is not set > CONFIG_THERMAL=m > CONFIG_THERMAL_HWMON=y > CONFIG_CPU_THERMAL=y > CONFIG_FAIR_SHARE=y > CONFIG_STEP_WISE=y > CONFIG_USER_SPACE=y > CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y > # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set > # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set > # CONFIG_WATCHDOG is not set > CONFIG_SSB_POSSIBLE=y > > # > # Sonics Silicon Backplane > # > CONFIG_SSB=m > CONFIG_SSB_PCMCIAHOST_POSSIBLE=y > # CONFIG_SSB_PCMCIAHOST is not set > CONFIG_SSB_SDIOHOST_POSSIBLE=y > # CONFIG_SSB_SDIOHOST is not set > CONFIG_SSB_SILENT=y > CONFIG_BCMA_POSSIBLE=y > > # > # Broadcom specific AMBA > # > CONFIG_BCMA=m > # CONFIG_BCMA_DRIVER_GMAC_CMN is not set > # CONFIG_BCMA_DEBUG is not set > > # > # Multifunction device drivers > # > CONFIG_MFD_CORE=y > # CONFIG_MFD_SM501 is not set > # CONFIG_HTC_PASIC3 is not set > # CONFIG_MFD_TPS65912_SPI is not set > # CONFIG_MFD_STMPE is not set > # CONFIG_MFD_TMIO is not set > CONFIG_PMIC_DA9052=y > CONFIG_MFD_DA9052_SPI=y > CONFIG_MFD_ARIZONA=y > CONFIG_MFD_ARIZONA_SPI=m > CONFIG_MFD_WM5102=y > CONFIG_MFD_WM5110=y > # CONFIG_MFD_WM831X_SPI is not set > CONFIG_MFD_MC13783=m > CONFIG_MFD_MC13XXX=m > CONFIG_MFD_MC13XXX_SPI=m > # CONFIG_ABX500_CORE is not set > CONFIG_EZX_PCAP=y > # CONFIG_REGULATOR is not set > CONFIG_MEDIA_SUPPORT=m > > # > # Multimedia core support > # > # CONFIG_MEDIA_CAMERA_SUPPORT is not set > # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set > # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set > CONFIG_MEDIA_RADIO_SUPPORT=y > # CONFIG_MEDIA_RC_SUPPORT is not set > CONFIG_VIDEO_DEV=m > CONFIG_VIDEO_V4L2=m > # CONFIG_VIDEO_ADV_DEBUG is not set > # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set > > # > # Media drivers > # > CONFIG_MEDIA_USB_SUPPORT=y > > # > # Supported MMC/SDIO adapters > # > CONFIG_RADIO_ADAPTERS=y > # CONFIG_RADIO_SI470X is not set > # CONFIG_USB_MR800 is not set > CONFIG_USB_DSBR=m > # CONFIG_RADIO_SHARK2 is not set > CONFIG_USB_KEENE=m > > # > # Texas Instruments WL128x FM driver (ST based) > # > > # > # Media ancillary drivers (tuners, sensors, i2c, frontends) > # > > # > # Encoders, decoders, sensors and other helper chips > # > > # > # Audio decoders, processors and mixers > # > > # > # RDS decoders > # > > # > # Video decoders > # > > # > # Video and audio decoders > # > > # > # MPEG video encoders > # > # CONFIG_VIDEO_CX2341X is not set > > # > # Video encoders > # > > # > # Camera sensor devices > # > > # > # Flash devices > # > > # > # Video improvement chips > # > > # > # Miscelaneous helper chips > # > > # > # Sensors used on soc_camera driver > # > CONFIG_MEDIA_ATTACH=y > > # > # Customize TV tuners > # > > # > # Customise DVB Frontends > # > > # > # Tools to develop new frontends > # > CONFIG_DVB_DUMMY_FE=m > > # > # Graphics support > # > # CONFIG_DRM is not set > # CONFIG_VGASTATE is not set > # CONFIG_VIDEO_OUTPUT_CONTROL is not set > CONFIG_FB=m > # CONFIG_FIRMWARE_EDID is not set > # CONFIG_FB_DDC is not set > # CONFIG_FB_BOOT_VESA_SUPPORT is not set > CONFIG_FB_CFB_FILLRECT=m > CONFIG_FB_CFB_COPYAREA=m > CONFIG_FB_CFB_IMAGEBLIT=m > # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set > CONFIG_FB_SYS_FILLRECT=m > CONFIG_FB_SYS_COPYAREA=m > CONFIG_FB_SYS_IMAGEBLIT=m > # CONFIG_FB_FOREIGN_ENDIAN is not set > CONFIG_FB_SYS_FOPS=m > # CONFIG_FB_WMT_GE_ROPS is not set > CONFIG_FB_DEFERRED_IO=y > CONFIG_FB_HECUBA=m > # CONFIG_FB_SVGALIB is not set > # CONFIG_FB_MACMODES is not set > # CONFIG_FB_BACKLIGHT is not set > CONFIG_FB_MODE_HELPERS=y > # CONFIG_FB_TILEBLITTING is not set > > # > # Frame buffer hardware drivers > # > CONFIG_FB_ARC=m > # CONFIG_FB_VGA16 is not set > CONFIG_FB_N411=m > CONFIG_FB_HGA=m > CONFIG_FB_S1D13XXX=m > CONFIG_FB_TMIO=m > CONFIG_FB_TMIO_ACCELL=y > CONFIG_FB_SMSCUFX=m > # CONFIG_FB_UDL is not set > # CONFIG_FB_VIRTUAL is not set > # CONFIG_XEN_FBDEV_FRONTEND is not set > CONFIG_FB_METRONOME=m > # CONFIG_FB_BROADSHEET is not set > CONFIG_FB_AUO_K190X=m > CONFIG_FB_AUO_K1900=m > CONFIG_FB_AUO_K1901=m > CONFIG_EXYNOS_VIDEO=y > # CONFIG_BACKLIGHT_LCD_SUPPORT is not set > CONFIG_LOGO=y > CONFIG_LOGO_LINUX_MONO=y > CONFIG_LOGO_LINUX_VGA16=y > # CONFIG_LOGO_LINUX_CLUT224 is not set > # CONFIG_SOUND is not set > > # > # HID support > # > CONFIG_HID=m > # CONFIG_HIDRAW is not set > # CONFIG_UHID is not set > # CONFIG_HID_GENERIC is not set > > # > # Special HID drivers > # > > # > # USB HID support > # > # CONFIG_USB_HID is not set > CONFIG_HID_PID=y > > # > # USB HID Boot Protocol drivers > # > # CONFIG_USB_KBD is not set > CONFIG_USB_MOUSE=m > # CONFIG_USB_ARCH_HAS_OHCI is not set > # CONFIG_USB_ARCH_HAS_EHCI is not set > # CONFIG_USB_ARCH_HAS_XHCI is not set > CONFIG_USB_SUPPORT=y > CONFIG_USB_COMMON=m > CONFIG_USB_ARCH_HAS_HCD=y > CONFIG_USB=m > # CONFIG_USB_DEBUG is not set > CONFIG_USB_ANNOUNCE_NEW_DEVICES=y > > # > # Miscellaneous USB options > # > # CONFIG_USB_DYNAMIC_MINORS is not set > # CONFIG_USB_SUSPEND is not set > CONFIG_USB_OTG_WHITELIST=y > CONFIG_USB_OTG_BLACKLIST_HUB=y > CONFIG_USB_DWC3=m > CONFIG_USB_DWC3_DEBUG=y > # CONFIG_USB_DWC3_VERBOSE is not set > # CONFIG_USB_MON is not set > # CONFIG_USB_WUSB_CBAF is not set > > # > # USB Host Controller Drivers > # > CONFIG_USB_C67X00_HCD=m > CONFIG_USB_OXU210HP_HCD=m > # CONFIG_USB_ISP116X_HCD is not set > CONFIG_USB_ISP1760_HCD=m > CONFIG_USB_ISP1362_HCD=m > CONFIG_USB_U132_HCD=m > # CONFIG_USB_SL811_HCD is not set > CONFIG_USB_R8A66597_HCD=m > # CONFIG_USB_RENESAS_USBHS_HCD is not set > CONFIG_USB_HCD_BCMA=m > CONFIG_USB_HCD_SSB=m > CONFIG_USB_MUSB_HDRC=m > # CONFIG_USB_MUSB_TUSB6010 is not set > CONFIG_MUSB_PIO_ONLY=y > CONFIG_USB_CHIPIDEA=m > CONFIG_USB_CHIPIDEA_UDC=y > # CONFIG_USB_CHIPIDEA_HOST is not set > CONFIG_USB_CHIPIDEA_DEBUG=y > CONFIG_USB_RENESAS_USBHS=m > > # > # USB Device Class drivers > # > # CONFIG_USB_ACM is not set > CONFIG_USB_PRINTER=m > # CONFIG_USB_WDM is not set > # CONFIG_USB_TMC is not set > > # > # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may > # > > # > # also be needed; see USB_STORAGE Help for more info > # > > # > # USB Imaging devices > # > CONFIG_USB_MDC800=m > > # > # USB port drivers > # > CONFIG_USB_USS720=m > # CONFIG_USB_SERIAL is not set > > # > # USB Miscellaneous drivers > # > CONFIG_USB_EMI62=m > CONFIG_USB_EMI26=m > # CONFIG_USB_ADUTUX is not set > # CONFIG_USB_SEVSEG is not set > CONFIG_USB_RIO500=m > # CONFIG_USB_LEGOTOWER is not set > CONFIG_USB_LCD=m > # CONFIG_USB_LED is not set > CONFIG_USB_CYPRESS_CY7C63=m > # CONFIG_USB_CYTHERM is not set > # CONFIG_USB_IDMOUSE is not set > CONFIG_USB_FTDI_ELAN=m > # CONFIG_USB_APPLEDISPLAY is not set > CONFIG_USB_SISUSBVGA=m > CONFIG_USB_LD=m > # CONFIG_USB_TRANCEVIBRATOR is not set > CONFIG_USB_IOWARRIOR=m > # CONFIG_USB_TEST is not set > CONFIG_USB_ISIGHTFW=m > # CONFIG_USB_YUREX is not set > CONFIG_USB_EZUSB_FX2=m > > # > # USB Physical Layer drivers > # > # CONFIG_OMAP_USB2 is not set > CONFIG_USB_GADGET=m > CONFIG_USB_GADGET_DEBUG=y > # CONFIG_USB_GADGET_DEBUG_FS is not set > CONFIG_USB_GADGET_VBUS_DRAW=2 > CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > > # > # USB Peripheral Controller > # > # CONFIG_USB_R8A66597 is not set > CONFIG_USB_RENESAS_USBHS_UDC=m > # CONFIG_USB_MV_UDC is not set > CONFIG_USB_GADGET_MUSB_HDRC=m > CONFIG_USB_M66592=m > # CONFIG_USB_NET2272 is not set > CONFIG_USB_DUMMY_HCD=m > CONFIG_USB_LIBCOMPOSITE=m > # CONFIG_USB_ZERO is not set > # CONFIG_USB_GADGETFS is not set > CONFIG_USB_FUNCTIONFS=m > CONFIG_USB_FUNCTIONFS_GENERIC=y > CONFIG_USB_G_SERIAL=m > # CONFIG_USB_G_PRINTER is not set > CONFIG_USB_G_HID=m > CONFIG_USB_G_DBGP=m > CONFIG_USB_G_DBGP_PRINTK=y > # CONFIG_USB_G_DBGP_SERIAL is not set > CONFIG_USB_G_WEBCAM=m > > # > # OTG and related infrastructure > # > CONFIG_USB_OTG_UTILS=y > CONFIG_USB_GPIO_VBUS=m > CONFIG_NOP_USB_XCEIV=m > CONFIG_MMC=m > CONFIG_MMC_DEBUG=y > # CONFIG_MMC_UNSAFE_RESUME is not set > CONFIG_MMC_CLKGATE=y > > # > # MMC/SD/SDIO Card Drivers > # > CONFIG_SDIO_UART=m > CONFIG_MMC_TEST=m > > # > # MMC/SD/SDIO Host Controller Drivers > # > # CONFIG_MMC_SDHCI is not set > CONFIG_MMC_SPI=m > # CONFIG_MMC_VUB300 is not set > CONFIG_MMC_USHC=m > CONFIG_MEMSTICK=m > CONFIG_MEMSTICK_DEBUG=y > > # > # MemoryStick drivers > # > # CONFIG_MEMSTICK_UNSAFE_RESUME is not set > > # > # MemoryStick Host Controller Drivers > # > CONFIG_NEW_LEDS=y > CONFIG_LEDS_CLASS=m > > # > # LED drivers > # > CONFIG_LEDS_GPIO=m > # CONFIG_LEDS_DA9052 is not set > # CONFIG_LEDS_DAC124S085 is not set > # CONFIG_LEDS_LT3593 is not set > CONFIG_LEDS_MC13783=m > CONFIG_LEDS_OT200=m > CONFIG_LEDS_TRIGGERS=y > > # > # LED Triggers > # > CONFIG_LEDS_TRIGGER_TIMER=m > CONFIG_LEDS_TRIGGER_ONESHOT=m > CONFIG_LEDS_TRIGGER_HEARTBEAT=m > # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set > # CONFIG_LEDS_TRIGGER_CPU is not set > # CONFIG_LEDS_TRIGGER_GPIO is not set > CONFIG_LEDS_TRIGGER_DEFAULT_ON=m > > # > # iptables trigger is under Netfilter config (LED target) > # > # CONFIG_LEDS_TRIGGER_TRANSIENT is not set > CONFIG_ACCESSIBILITY=y > CONFIG_EDAC=y > > # > # Reporting subsystems > # > # CONFIG_EDAC_LEGACY_SYSFS is not set > CONFIG_EDAC_DEBUG=y > CONFIG_EDAC_MM_EDAC=m > CONFIG_RTC_LIB=y > CONFIG_RTC_CLASS=y > CONFIG_RTC_HCTOSYS=y > CONFIG_RTC_HCTOSYS_DEVICE="rtc0" > # CONFIG_RTC_DEBUG is not set > > # > # RTC interfaces > # > CONFIG_RTC_INTF_SYSFS=y > CONFIG_RTC_INTF_DEV=y > CONFIG_RTC_INTF_DEV_UIE_EMUL=y > CONFIG_RTC_DRV_TEST=m > > # > # SPI RTC drivers > # > CONFIG_RTC_DRV_M41T93=m > # CONFIG_RTC_DRV_M41T94 is not set > # CONFIG_RTC_DRV_DS1305 is not set > CONFIG_RTC_DRV_DS1390=m > CONFIG_RTC_DRV_MAX6902=m > # CONFIG_RTC_DRV_R9701 is not set > CONFIG_RTC_DRV_RS5C348=m > # CONFIG_RTC_DRV_DS3234 is not set > CONFIG_RTC_DRV_PCF2123=m > > # > # Platform RTC drivers > # > # CONFIG_RTC_DRV_CMOS is not set > CONFIG_RTC_DRV_DS1286=m > # CONFIG_RTC_DRV_DS1511 is not set > # CONFIG_RTC_DRV_DS1553 is not set > # CONFIG_RTC_DRV_DS1742 is not set > # CONFIG_RTC_DRV_DA9052 is not set > # CONFIG_RTC_DRV_STK17TA8 is not set > # CONFIG_RTC_DRV_M48T86 is not set > CONFIG_RTC_DRV_M48T35=m > CONFIG_RTC_DRV_M48T59=m > # CONFIG_RTC_DRV_MSM6242 is not set > CONFIG_RTC_DRV_BQ4802=m > CONFIG_RTC_DRV_RP5C01=m > CONFIG_RTC_DRV_V3020=m > # CONFIG_RTC_DRV_DS2404 is not set > > # > # on-CPU RTC drivers > # > CONFIG_RTC_DRV_PCAP=m > CONFIG_RTC_DRV_MC13XXX=m > # CONFIG_DMADEVICES is not set > # CONFIG_AUXDISPLAY is not set > # CONFIG_UIO is not set > CONFIG_VIRTIO=m > > # > # Virtio drivers > # > CONFIG_VIRTIO_BALLOON=m > # CONFIG_VIRTIO_MMIO is not set > > # > # Microsoft Hyper-V guest support > # > > # > # Xen driver support > # > # CONFIG_XEN_BALLOON is not set > # CONFIG_XEN_DEV_EVTCHN is not set > # CONFIG_XENFS is not set > CONFIG_XEN_SYS_HYPERVISOR=y > CONFIG_XEN_GNTDEV=m > CONFIG_XEN_GRANT_DEV_ALLOC=m > CONFIG_XEN_TMEM=y > CONFIG_XEN_PRIVCMD=m > CONFIG_XEN_HAVE_PVMMU=y > CONFIG_STAGING=y > CONFIG_ECHO=m > CONFIG_COMEDI=m > # CONFIG_COMEDI_DEBUG is not set > CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 > CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 > # CONFIG_COMEDI_MISC_DRIVERS is not set > CONFIG_COMEDI_PCMCIA_DRIVERS=y > CONFIG_COMEDI_CB_DAS16_CS=m > CONFIG_COMEDI_DAS08_CS=m > # CONFIG_COMEDI_NI_DAQ_700_CS is not set > CONFIG_COMEDI_NI_DAQ_DIO24_CS=m > # CONFIG_COMEDI_NI_MIO_CS is not set > CONFIG_COMEDI_QUATECH_DAQP_CS=m > CONFIG_COMEDI_USB_DRIVERS=y > # CONFIG_COMEDI_DT9812 is not set > CONFIG_COMEDI_USBDUX=m > # CONFIG_COMEDI_USBDUXFAST is not set > CONFIG_COMEDI_USBDUXSIGMA=m > CONFIG_COMEDI_VMK80XX=m > CONFIG_COMEDI_8255=m > CONFIG_COMEDI_FC=m > CONFIG_COMEDI_DAS08=m > # CONFIG_ASUS_OLED is not set > CONFIG_PANEL=m > CONFIG_PANEL_PARPORT=0 > CONFIG_PANEL_PROFILE=5 > # CONFIG_PANEL_CHANGE_MESSAGE is not set > CONFIG_TRANZPORT=m > # CONFIG_ZSMALLOC is not set > # CONFIG_FT1000 is not set > > # > # Speakup console speech > # > CONFIG_STAGING_MEDIA=y > > # > # Android > # > CONFIG_ANDROID=y > CONFIG_ANDROID_BINDER_IPC=y > # CONFIG_ANDROID_LOGGER is not set > # CONFIG_ANDROID_TIMED_OUTPUT is not set > # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set > CONFIG_ANDROID_INTF_ALARM_DEV=y > # CONFIG_IPACK_BUS is not set > # CONFIG_CED1401 is not set > # CONFIG_DGRP is not set > # CONFIG_X86_PLATFORM_DEVICES is not set > > # > # Hardware Spinlock drivers > # > CONFIG_CLKEVT_I8253=y > CONFIG_CLKBLD_I8253=y > CONFIG_IOMMU_SUPPORT=y > > # > # Remoteproc drivers (EXPERIMENTAL) > # > CONFIG_REMOTEPROC=m > CONFIG_STE_MODEM_RPROC=m > > # > # Rpmsg drivers > # > # CONFIG_VIRT_DRIVERS is not set > CONFIG_PM_DEVFREQ=y > > # > # DEVFREQ Governors > # > CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y > # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set > # CONFIG_DEVFREQ_GOV_POWERSAVE is not set > # CONFIG_DEVFREQ_GOV_USERSPACE is not set > > # > # DEVFREQ Drivers > # > CONFIG_EXTCON=m > > # > # Extcon Device Drivers > # > CONFIG_EXTCON_GPIO=m > # CONFIG_EXTCON_ARIZONA is not set > # CONFIG_MEMORY is not set > # CONFIG_IIO is not set > CONFIG_PWM=y > > # > # Firmware Drivers > # > CONFIG_EDD=m > CONFIG_EDD_OFF=y > # CONFIG_FIRMWARE_MEMMAP is not set > CONFIG_DELL_RBU=m > CONFIG_DCDBAS=m > CONFIG_ISCSI_IBFT_FIND=y > CONFIG_GOOGLE_FIRMWARE=y > > # > # Google Firmware Drivers > # > > # > # File systems > # > CONFIG_DCACHE_WORD_ACCESS=y > # CONFIG_FS_POSIX_ACL is not set > CONFIG_EXPORTFS=y > # CONFIG_FILE_LOCKING is not set > CONFIG_FSNOTIFY=y > CONFIG_DNOTIFY=y > CONFIG_INOTIFY_USER=y > # CONFIG_FANOTIFY is not set > CONFIG_QUOTA=y > # CONFIG_PRINT_QUOTA_WARNING is not set > # CONFIG_QUOTA_DEBUG is not set > # CONFIG_QFMT_V1 is not set > # CONFIG_QFMT_V2 is not set > CONFIG_QUOTACTL=y > CONFIG_QUOTACTL_COMPAT=y > # CONFIG_AUTOFS4_FS is not set > CONFIG_FUSE_FS=m > # CONFIG_CUSE is not set > > # > # Caches > # > # CONFIG_FSCACHE is not set > > # > # Pseudo filesystems > # > # CONFIG_PROC_FS is not set > CONFIG_SYSFS=y > # CONFIG_HUGETLBFS is not set > # CONFIG_HUGETLB_PAGE is not set > CONFIG_CONFIGFS_FS=m > # CONFIG_MISC_FILESYSTEMS is not set > CONFIG_NLS=m > CONFIG_NLS_DEFAULT="iso8859-1" > # CONFIG_NLS_CODEPAGE_437 is not set > CONFIG_NLS_CODEPAGE_737=m > # CONFIG_NLS_CODEPAGE_775 is not set > # CONFIG_NLS_CODEPAGE_850 is not set > CONFIG_NLS_CODEPAGE_852=m > CONFIG_NLS_CODEPAGE_855=m > CONFIG_NLS_CODEPAGE_857=m > CONFIG_NLS_CODEPAGE_860=m > # CONFIG_NLS_CODEPAGE_861 is not set > CONFIG_NLS_CODEPAGE_862=m > CONFIG_NLS_CODEPAGE_863=m > # CONFIG_NLS_CODEPAGE_864 is not set > CONFIG_NLS_CODEPAGE_865=m > # CONFIG_NLS_CODEPAGE_866 is not set > # CONFIG_NLS_CODEPAGE_869 is not set > CONFIG_NLS_CODEPAGE_936=m > # CONFIG_NLS_CODEPAGE_950 is not set > # CONFIG_NLS_CODEPAGE_932 is not set > CONFIG_NLS_CODEPAGE_949=m > # CONFIG_NLS_CODEPAGE_874 is not set > # CONFIG_NLS_ISO8859_8 is not set > # CONFIG_NLS_CODEPAGE_1250 is not set > CONFIG_NLS_CODEPAGE_1251=m > CONFIG_NLS_ASCII=m > CONFIG_NLS_ISO8859_1=m > # CONFIG_NLS_ISO8859_2 is not set > # CONFIG_NLS_ISO8859_3 is not set > CONFIG_NLS_ISO8859_4=m > # CONFIG_NLS_ISO8859_5 is not set > # CONFIG_NLS_ISO8859_6 is not set > # CONFIG_NLS_ISO8859_7 is not set > CONFIG_NLS_ISO8859_9=m > CONFIG_NLS_ISO8859_13=m > CONFIG_NLS_ISO8859_14=m > CONFIG_NLS_ISO8859_15=m > CONFIG_NLS_KOI8_R=m > # CONFIG_NLS_KOI8_U is not set > # CONFIG_NLS_MAC_ROMAN is not set > CONFIG_NLS_MAC_CELTIC=m > CONFIG_NLS_MAC_CENTEURO=m > # CONFIG_NLS_MAC_CROATIAN is not set > # CONFIG_NLS_MAC_CYRILLIC is not set > # CONFIG_NLS_MAC_GAELIC is not set > CONFIG_NLS_MAC_GREEK=m > CONFIG_NLS_MAC_ICELAND=m > # CONFIG_NLS_MAC_INUIT is not set > # CONFIG_NLS_MAC_ROMANIAN is not set > # CONFIG_NLS_MAC_TURKISH is not set > # CONFIG_NLS_UTF8 is not set > > # > # Kernel hacking > # > CONFIG_TRACE_IRQFLAGS_SUPPORT=y > CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 > CONFIG_ENABLE_WARN_DEPRECATED=y > CONFIG_ENABLE_MUST_CHECK=y > CONFIG_FRAME_WARN=2048 > CONFIG_MAGIC_SYSRQ=y > # CONFIG_STRIP_ASM_SYMS is not set > CONFIG_READABLE_ASM=y > CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_FS=y > # CONFIG_HEADERS_CHECK is not set > # CONFIG_DEBUG_SECTION_MISMATCH is not set > CONFIG_DEBUG_KERNEL=y > # CONFIG_DEBUG_SHIRQ is not set > CONFIG_LOCKUP_DETECTOR=y > CONFIG_HARDLOCKUP_DETECTOR=y > CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y > CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 > # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set > CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 > # CONFIG_PANIC_ON_OOPS is not set > CONFIG_PANIC_ON_OOPS_VALUE=0 > # CONFIG_DETECT_HUNG_TASK is not set > CONFIG_DEBUG_OBJECTS=y > # CONFIG_DEBUG_OBJECTS_SELFTEST is not set > CONFIG_DEBUG_OBJECTS_FREE=y > # CONFIG_DEBUG_OBJECTS_TIMERS is not set > # CONFIG_DEBUG_OBJECTS_WORK is not set > # CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set > # CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set > CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 > # CONFIG_SLUB_STATS is not set > CONFIG_HAVE_DEBUG_KMEMLEAK=y > # CONFIG_DEBUG_KMEMLEAK is not set > # CONFIG_DEBUG_PREEMPT is not set > CONFIG_DEBUG_RT_MUTEXES=y > CONFIG_DEBUG_PI_LIST=y > CONFIG_RT_MUTEX_TESTER=y > CONFIG_DEBUG_SPINLOCK=y > CONFIG_DEBUG_MUTEXES=y > CONFIG_DEBUG_LOCK_ALLOC=y > CONFIG_PROVE_LOCKING=y > CONFIG_PROVE_RCU=y > # CONFIG_PROVE_RCU_REPEATEDLY is not set > CONFIG_PROVE_RCU_DELAY=y > CONFIG_SPARSE_RCU_POINTER=y > CONFIG_LOCKDEP=y > CONFIG_LOCK_STAT=y > CONFIG_DEBUG_LOCKDEP=y > CONFIG_TRACE_IRQFLAGS=y > CONFIG_DEBUG_ATOMIC_SLEEP=y > CONFIG_DEBUG_LOCKING_API_SELFTESTS=y > CONFIG_STACKTRACE=y > # CONFIG_DEBUG_STACK_USAGE is not set > CONFIG_DEBUG_KOBJECT=y > # CONFIG_DEBUG_BUGVERBOSE is not set > # CONFIG_DEBUG_INFO is not set > # CONFIG_DEBUG_VM is not set > CONFIG_DEBUG_VIRTUAL=y > CONFIG_DEBUG_WRITECOUNT=y > # CONFIG_DEBUG_MEMORY_INIT is not set > CONFIG_DEBUG_LIST=y > CONFIG_TEST_LIST_SORT=y > # CONFIG_DEBUG_SG is not set > # CONFIG_DEBUG_NOTIFIERS is not set > CONFIG_DEBUG_CREDENTIALS=y > CONFIG_ARCH_WANT_FRAME_POINTERS=y > CONFIG_FRAME_POINTER=y > # CONFIG_RCU_TORTURE_TEST is not set > # CONFIG_RCU_TRACE is not set > CONFIG_KPROBES_SANITY_TEST=y > CONFIG_BACKTRACE_SELF_TEST=m > CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y > CONFIG_NOTIFIER_ERROR_INJECTION=m > # CONFIG_PM_NOTIFIER_ERROR_INJECT is not set > # CONFIG_FAULT_INJECTION is not set > CONFIG_USER_STACKTRACE_SUPPORT=y > CONFIG_HAVE_FUNCTION_TRACER=y > CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y > CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y > CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y > CONFIG_HAVE_DYNAMIC_FTRACE=y > CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y > CONFIG_HAVE_SYSCALL_TRACEPOINTS=y > CONFIG_HAVE_FENTRY=y > CONFIG_HAVE_C_RECORDMCOUNT=y > CONFIG_TRACING_SUPPORT=y > # CONFIG_FTRACE is not set > # CONFIG_RBTREE_TEST is not set > # CONFIG_INTERVAL_TREE_TEST is not set > # CONFIG_DMA_API_DEBUG is not set > # CONFIG_ATOMIC64_SELFTEST is not set > # CONFIG_SAMPLES is not set > CONFIG_HAVE_ARCH_KGDB=y > # CONFIG_KGDB is not set > CONFIG_HAVE_ARCH_KMEMCHECK=y > CONFIG_KMEMCHECK=y > # CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT is not set > # CONFIG_KMEMCHECK_ENABLED_BY_DEFAULT is not set > CONFIG_KMEMCHECK_ONESHOT_BY_DEFAULT=y > CONFIG_KMEMCHECK_QUEUE_SIZE=64 > CONFIG_KMEMCHECK_SHADOW_COPY_SHIFT=5 > CONFIG_KMEMCHECK_PARTIAL_OK=y > CONFIG_KMEMCHECK_BITOPS_OK=y > # CONFIG_TEST_KSTRTOX is not set > # CONFIG_STRICT_DEVMEM is not set > CONFIG_X86_VERBOSE_BOOTUP=y > CONFIG_EARLY_PRINTK=y > CONFIG_DEBUG_STACKOVERFLOW=y > CONFIG_X86_PTDUMP=y > CONFIG_DEBUG_RODATA=y > # CONFIG_DEBUG_RODATA_TEST is not set > CONFIG_DEBUG_SET_MODULE_RONX=y > # CONFIG_DEBUG_NX_TEST is not set > # CONFIG_DEBUG_TLBFLUSH is not set > CONFIG_IOMMU_STRESS=y > CONFIG_HAVE_MMIOTRACE_SUPPORT=y > # CONFIG_X86_DECODER_SELFTEST is not set > CONFIG_IO_DELAY_TYPE_0X80=0 > CONFIG_IO_DELAY_TYPE_0XED=1 > CONFIG_IO_DELAY_TYPE_UDELAY=2 > CONFIG_IO_DELAY_TYPE_NONE=3 > # CONFIG_IO_DELAY_0X80 is not set > # CONFIG_IO_DELAY_0XED is not set > # CONFIG_IO_DELAY_UDELAY is not set > CONFIG_IO_DELAY_NONE=y > CONFIG_DEFAULT_IO_DELAY_TYPE=3 > # CONFIG_DEBUG_BOOT_PARAMS is not set > CONFIG_CPA_DEBUG=y > # CONFIG_OPTIMIZE_INLINING is not set > # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set > # CONFIG_DEBUG_NMI_SELFTEST is not set > > # > # Security options > # > CONFIG_KEYS=y > # CONFIG_ENCRYPTED_KEYS is not set > CONFIG_KEYS_DEBUG_PROC_KEYS=y > CONFIG_SECURITY_DMESG_RESTRICT=y > CONFIG_SECURITY=y > CONFIG_SECURITYFS=y > CONFIG_SECURITY_NETWORK=y > CONFIG_SECURITY_PATH=y > CONFIG_SECURITY_YAMA=y > # CONFIG_SECURITY_YAMA_STACKED is not set > # CONFIG_IMA is not set > # CONFIG_EVM is not set > CONFIG_DEFAULT_SECURITY_YAMA=y > # CONFIG_DEFAULT_SECURITY_DAC is not set > CONFIG_DEFAULT_SECURITY="yama" > CONFIG_CRYPTO=y > > # > # Crypto core or helper > # > # CONFIG_CRYPTO_FIPS is not set > CONFIG_CRYPTO_ALGAPI=y > CONFIG_CRYPTO_ALGAPI2=y > CONFIG_CRYPTO_AEAD=m > CONFIG_CRYPTO_AEAD2=y > CONFIG_CRYPTO_BLKCIPHER=m > CONFIG_CRYPTO_BLKCIPHER2=y > CONFIG_CRYPTO_HASH=y > CONFIG_CRYPTO_HASH2=y > CONFIG_CRYPTO_RNG=m > CONFIG_CRYPTO_RNG2=y > CONFIG_CRYPTO_PCOMP=m > CONFIG_CRYPTO_PCOMP2=y > CONFIG_CRYPTO_MANAGER=m > CONFIG_CRYPTO_MANAGER2=y > # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set > CONFIG_CRYPTO_GF128MUL=m > CONFIG_CRYPTO_NULL=m > CONFIG_CRYPTO_WORKQUEUE=y > CONFIG_CRYPTO_CRYPTD=m > CONFIG_CRYPTO_AUTHENC=m > CONFIG_CRYPTO_TEST=m > CONFIG_CRYPTO_ABLK_HELPER_X86=m > CONFIG_CRYPTO_GLUE_HELPER_X86=m > > # > # Authenticated Encryption with Associated Data > # > # CONFIG_CRYPTO_CCM is not set > # CONFIG_CRYPTO_GCM is not set > CONFIG_CRYPTO_SEQIV=m > > # > # Block modes > # > CONFIG_CRYPTO_CBC=m > CONFIG_CRYPTO_CTR=m > CONFIG_CRYPTO_CTS=m > CONFIG_CRYPTO_ECB=m > CONFIG_CRYPTO_LRW=m > CONFIG_CRYPTO_PCBC=m > CONFIG_CRYPTO_XTS=m > > # > # Hash modes > # > # CONFIG_CRYPTO_HMAC is not set > # CONFIG_CRYPTO_XCBC is not set > # CONFIG_CRYPTO_VMAC is not set > > # > # Digest > # > # CONFIG_CRYPTO_CRC32C is not set > CONFIG_CRYPTO_CRC32C_X86_64=y > CONFIG_CRYPTO_CRC32C_INTEL=m > # CONFIG_CRYPTO_GHASH is not set > # CONFIG_CRYPTO_MD4 is not set > # CONFIG_CRYPTO_MD5 is not set > # CONFIG_CRYPTO_MICHAEL_MIC is not set > # CONFIG_CRYPTO_RMD128 is not set > # CONFIG_CRYPTO_RMD160 is not set > CONFIG_CRYPTO_RMD256=m > CONFIG_CRYPTO_RMD320=m > # CONFIG_CRYPTO_SHA1 is not set > # CONFIG_CRYPTO_SHA1_SSSE3 is not set > CONFIG_CRYPTO_SHA256=y > # CONFIG_CRYPTO_SHA512 is not set > # CONFIG_CRYPTO_TGR192 is not set > CONFIG_CRYPTO_WP512=m > CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m > > # > # Ciphers > # > CONFIG_CRYPTO_AES=m > CONFIG_CRYPTO_AES_X86_64=m > # CONFIG_CRYPTO_AES_NI_INTEL is not set > CONFIG_CRYPTO_ANUBIS=m > CONFIG_CRYPTO_ARC4=m > # CONFIG_CRYPTO_BLOWFISH is not set > # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set > # CONFIG_CRYPTO_CAMELLIA is not set > CONFIG_CRYPTO_CAMELLIA_X86_64=m > CONFIG_CRYPTO_CAST5=m > CONFIG_CRYPTO_CAST5_AVX_X86_64=m > CONFIG_CRYPTO_CAST6=m > CONFIG_CRYPTO_CAST6_AVX_X86_64=m > CONFIG_CRYPTO_DES=m > # CONFIG_CRYPTO_FCRYPT is not set > CONFIG_CRYPTO_KHAZAD=m > CONFIG_CRYPTO_SALSA20=m > # CONFIG_CRYPTO_SALSA20_X86_64 is not set > CONFIG_CRYPTO_SEED=m > CONFIG_CRYPTO_SERPENT=m > CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m > CONFIG_CRYPTO_SERPENT_AVX_X86_64=m > # CONFIG_CRYPTO_TEA is not set > CONFIG_CRYPTO_TWOFISH=m > CONFIG_CRYPTO_TWOFISH_COMMON=m > CONFIG_CRYPTO_TWOFISH_X86_64=m > CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m > CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m > > # > # Compression > # > CONFIG_CRYPTO_DEFLATE=m > CONFIG_CRYPTO_ZLIB=m > CONFIG_CRYPTO_LZO=m > > # > # Random Number Generation > # > CONFIG_CRYPTO_ANSI_CPRNG=m > # CONFIG_CRYPTO_HW is not set > CONFIG_ASYMMETRIC_KEY_TYPE=y > CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y > CONFIG_PUBLIC_KEY_ALGO_RSA=y > CONFIG_X509_CERTIFICATE_PARSER=y > CONFIG_HAVE_KVM=y > CONFIG_VIRTUALIZATION=y > # CONFIG_BINARY_PRINTF is not set > > # > # Library routines > # > CONFIG_BITREVERSE=m > CONFIG_GENERIC_STRNCPY_FROM_USER=y > CONFIG_GENERIC_STRNLEN_USER=y > CONFIG_GENERIC_FIND_FIRST_BIT=y > CONFIG_GENERIC_PCI_IOMAP=y > CONFIG_GENERIC_IOMAP=y > CONFIG_GENERIC_IO=y > # CONFIG_CRC_CCITT is not set > # CONFIG_CRC16 is not set > CONFIG_CRC_T10DIF=m > CONFIG_CRC_ITU_T=m > CONFIG_CRC32=m > CONFIG_CRC32_SELFTEST=y > # CONFIG_CRC32_SLICEBY8 is not set > # CONFIG_CRC32_SLICEBY4 is not set > # CONFIG_CRC32_SARWATE is not set > CONFIG_CRC32_BIT=y > CONFIG_CRC7=m > # CONFIG_LIBCRC32C is not set > # CONFIG_CRC8 is not set > CONFIG_ZLIB_INFLATE=m > CONFIG_ZLIB_DEFLATE=m > CONFIG_LZO_COMPRESS=y > CONFIG_LZO_DECOMPRESS=y > # CONFIG_XZ_DEC is not set > # CONFIG_XZ_DEC_BCJ is not set > CONFIG_HAS_IOMEM=y > CONFIG_HAS_IOPORT=y > CONFIG_HAS_DMA=y > CONFIG_NLATTR=y > CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y > CONFIG_AVERAGE=y > CONFIG_CLZ_TAB=y > CONFIG_CORDIC=m > # CONFIG_DDR is not set > CONFIG_MPILIB=y > CONFIG_OID_REGISTRY=y _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 21:58:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 21:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2mP-0000gZ-Um; Thu, 01 Nov 2012 21:58:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2mO-0000gO-P1 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 21:58:25 +0000 Received: from [85.158.139.211:43585] by server-6.bemta-5.messagelabs.com id B6/01-19321-080F2905; Thu, 01 Nov 2012 21:58:24 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1351807101!18486400!1 X-Originating-IP: [148.87.113.117] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQ4Ljg3LjExMy4xMTcgPT4gODMyMjAy\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26932 invoked from network); 1 Nov 2012 21:58:23 -0000 Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 21:58:23 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1LvvqN027502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 21:57:57 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1Lvssl008978 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 21:57:55 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1LvrIm023096; Thu, 1 Nov 2012 16:57:53 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 14:57:52 -0700 Date: Thu, 1 Nov 2012 17:57:49 -0400 From: Konrad Rzeszutek Wilk To: Randy Dunlap Message-ID: <20121101215749.GB18854@localhost.localdomain> References: <20121101163622.129b59967d2ee76e6946874a@canb.auug.org.au> <5092AEF7.5020609@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092AEF7.5020609@infradead.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Stephen Rothwell , Jeremy Fitzhardinge , xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-next@vger.kernel.org Subject: Re: [Xen-devel] linux-next: Tree for Nov 1 (xen) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 10:18:47AM -0700, Randy Dunlap wrote: > On 10/31/2012 10:36 PM, Stephen Rothwell wrote: > > > Hi all, > > > > New trees: rr-fixes and swiotlb > > > > Changes since 20121031: > > > > > arch/x86/xen/enlighten.c:109:0: warning: "xen_pvh_domain" redefined > include/xen/xen.h:23:0: note: this is the location of the previous definition I think this was due to a patch that mistakenly was put in the tmem.git tree. It should not surface tomorrow. > > Full randconfig file is attached. > > -- > ~Randy > # > # Automatically generated file; DO NOT EDIT. > # Linux/x86_64 3.7.0-rc3 Kernel Configuration > # > CONFIG_64BIT=y > CONFIG_X86_64=y > CONFIG_X86=y > CONFIG_INSTRUCTION_DECODER=y > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" > CONFIG_LOCKDEP_SUPPORT=y > CONFIG_STACKTRACE_SUPPORT=y > CONFIG_HAVE_LATENCYTOP_SUPPORT=y > CONFIG_MMU=y > CONFIG_NEED_DMA_MAP_STATE=y > CONFIG_NEED_SG_DMA_LENGTH=y > CONFIG_GENERIC_BUG=y > CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y > CONFIG_GENERIC_HWEIGHT=y > CONFIG_GENERIC_GPIO=y > CONFIG_RWSEM_XCHGADD_ALGORITHM=y > CONFIG_GENERIC_CALIBRATE_DELAY=y > CONFIG_ARCH_HAS_CPU_RELAX=y > CONFIG_ARCH_HAS_DEFAULT_IDLE=y > CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y > CONFIG_ARCH_HAS_CPU_AUTOPROBE=y > CONFIG_HAVE_SETUP_PER_CPU_AREA=y > CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y > CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y > CONFIG_ARCH_HIBERNATION_POSSIBLE=y > CONFIG_ARCH_SUSPEND_POSSIBLE=y > CONFIG_ZONE_DMA32=y > CONFIG_AUDIT_ARCH=y > CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y > CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y > CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" > CONFIG_ARCH_SUPPORTS_UPROBES=y > CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" > CONFIG_HAVE_IRQ_WORK=y > CONFIG_IRQ_WORK=y > CONFIG_BUILDTIME_EXTABLE_SORT=y > > # > # General setup > # > CONFIG_EXPERIMENTAL=y > CONFIG_BROKEN_ON_SMP=y > CONFIG_INIT_ENV_ARG_LIMIT=32 > CONFIG_CROSS_COMPILE="" > CONFIG_LOCALVERSION="" > # CONFIG_LOCALVERSION_AUTO is not set > CONFIG_HAVE_KERNEL_GZIP=y > CONFIG_HAVE_KERNEL_BZIP2=y > CONFIG_HAVE_KERNEL_LZMA=y > CONFIG_HAVE_KERNEL_XZ=y > CONFIG_HAVE_KERNEL_LZO=y > # CONFIG_KERNEL_GZIP is not set > CONFIG_KERNEL_BZIP2=y > # CONFIG_KERNEL_LZMA is not set > # CONFIG_KERNEL_XZ is not set > # CONFIG_KERNEL_LZO is not set > CONFIG_DEFAULT_HOSTNAME="(none)" > CONFIG_SYSVIPC=y > CONFIG_FHANDLE=y > CONFIG_HAVE_GENERIC_HARDIRQS=y > > # > # IRQ subsystem > # > CONFIG_GENERIC_HARDIRQS=y > CONFIG_GENERIC_IRQ_PROBE=y > CONFIG_GENERIC_IRQ_SHOW=y > CONFIG_IRQ_DOMAIN=y > # CONFIG_IRQ_DOMAIN_DEBUG is not set > CONFIG_IRQ_FORCED_THREADING=y > CONFIG_SPARSE_IRQ=y > CONFIG_CLOCKSOURCE_WATCHDOG=y > CONFIG_ARCH_CLOCKSOURCE_DATA=y > CONFIG_GENERIC_TIME_VSYSCALL=y > CONFIG_GENERIC_CLOCKEVENTS=y > CONFIG_GENERIC_CLOCKEVENTS_BUILD=y > CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y > CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y > CONFIG_GENERIC_CMOS_UPDATE=y > > # > # Timers subsystem > # > CONFIG_TICK_ONESHOT=y > # CONFIG_NO_HZ is not set > CONFIG_HIGH_RES_TIMERS=y > > # > # CPU/Task time and stats accounting > # > CONFIG_TICK_CPU_ACCOUNTING=y > # CONFIG_IRQ_TIME_ACCOUNTING is not set > # CONFIG_BSD_PROCESS_ACCT is not set > > # > # RCU Subsystem > # > CONFIG_TINY_PREEMPT_RCU=y > CONFIG_PREEMPT_RCU=y > # CONFIG_TREE_RCU_TRACE is not set > CONFIG_RCU_BOOST=y > CONFIG_RCU_BOOST_PRIO=1 > CONFIG_RCU_BOOST_DELAY=500 > CONFIG_IKCONFIG=m > CONFIG_LOG_BUF_SHIFT=17 > CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y > CONFIG_CHECKPOINT_RESTORE=y > CONFIG_NAMESPACES=y > CONFIG_UTS_NS=y > # CONFIG_IPC_NS is not set > # CONFIG_PID_NS is not set > # CONFIG_SCHED_AUTOGROUP is not set > CONFIG_SYSFS_DEPRECATED=y > # CONFIG_SYSFS_DEPRECATED_V2 is not set > # CONFIG_RELAY is not set > # CONFIG_BLK_DEV_INITRD is not set > # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set > CONFIG_ANON_INODES=y > CONFIG_EXPERT=y > CONFIG_HAVE_UID16=y > CONFIG_UID16=y > CONFIG_SYSCTL_EXCEPTION_TRACE=y > CONFIG_KALLSYMS=y > CONFIG_KALLSYMS_ALL=y > CONFIG_HOTPLUG=y > # CONFIG_PRINTK is not set > CONFIG_BUG=y > CONFIG_ELF_CORE=y > # CONFIG_PCSPKR_PLATFORM is not set > CONFIG_HAVE_PCSPKR_PLATFORM=y > CONFIG_BASE_FULL=y > CONFIG_FUTEX=y > # CONFIG_EPOLL is not set > # CONFIG_SIGNALFD is not set > # CONFIG_TIMERFD is not set > # CONFIG_EVENTFD is not set > # CONFIG_SHMEM is not set > # CONFIG_AIO is not set > # CONFIG_EMBEDDED is not set > CONFIG_HAVE_PERF_EVENTS=y > > # > # Kernel Performance Events And Counters > # > CONFIG_PERF_EVENTS=y > # CONFIG_DEBUG_PERF_USE_VMALLOC is not set > CONFIG_VM_EVENT_COUNTERS=y > CONFIG_SLUB_DEBUG=y > CONFIG_COMPAT_BRK=y > # CONFIG_SLAB is not set > CONFIG_SLUB=y > # CONFIG_SLOB is not set > CONFIG_PROFILING=y > # CONFIG_OPROFILE is not set > CONFIG_HAVE_OPROFILE=y > CONFIG_OPROFILE_NMI_TIMER=y > CONFIG_KPROBES=y > CONFIG_JUMP_LABEL=y > CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y > CONFIG_KRETPROBES=y > CONFIG_HAVE_IOREMAP_PROT=y > CONFIG_HAVE_KPROBES=y > CONFIG_HAVE_KRETPROBES=y > CONFIG_HAVE_OPTPROBES=y > CONFIG_HAVE_ARCH_TRACEHOOK=y > CONFIG_HAVE_DMA_ATTRS=y > CONFIG_GENERIC_SMP_IDLE_THREAD=y > CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y > CONFIG_HAVE_DMA_API_DEBUG=y > CONFIG_HAVE_HW_BREAKPOINT=y > CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y > CONFIG_HAVE_USER_RETURN_NOTIFIER=y > CONFIG_HAVE_PERF_EVENTS_NMI=y > CONFIG_HAVE_PERF_REGS=y > CONFIG_HAVE_PERF_USER_STACK_DUMP=y > CONFIG_HAVE_ARCH_JUMP_LABEL=y > CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y > CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y > CONFIG_HAVE_CMPXCHG_LOCAL=y > CONFIG_HAVE_CMPXCHG_DOUBLE=y > CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y > CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y > CONFIG_GENERIC_KERNEL_THREAD=y > CONFIG_GENERIC_KERNEL_EXECVE=y > CONFIG_HAVE_ARCH_SECCOMP_FILTER=y > CONFIG_HAVE_RCU_USER_QS=y > CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y > CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y > CONFIG_MODULES_USE_ELF_RELA=y > > # > # GCOV-based kernel profiling > # > # CONFIG_GCOV_KERNEL is not set > # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set > CONFIG_RT_MUTEXES=y > CONFIG_BASE_SMALL=0 > CONFIG_MODULES=y > CONFIG_MODULE_FORCE_LOAD=y > CONFIG_MODULE_UNLOAD=y > # CONFIG_MODULE_FORCE_UNLOAD is not set > CONFIG_MODVERSIONS=y > CONFIG_MODULE_SRCVERSION_ALL=y > CONFIG_MODULE_SIG=y > CONFIG_MODULE_SIG_FORCE=y > # CONFIG_MODULE_SIG_SHA1 is not set > # CONFIG_MODULE_SIG_SHA224 is not set > CONFIG_MODULE_SIG_SHA256=y > # CONFIG_MODULE_SIG_SHA384 is not set > # CONFIG_MODULE_SIG_SHA512 is not set > # CONFIG_BLOCK is not set > CONFIG_ASN1=y > CONFIG_UNINLINE_SPIN_UNLOCK=y > CONFIG_FREEZER=y > > # > # Processor type and features > # > # CONFIG_ZONE_DMA is not set > # CONFIG_SMP is not set > CONFIG_X86_MPPARSE=y > # CONFIG_X86_EXTENDED_PLATFORM is not set > CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y > CONFIG_SCHED_OMIT_FRAME_POINTER=y > # CONFIG_KVMTOOL_TEST_ENABLE is not set > CONFIG_PARAVIRT_GUEST=y > # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set > CONFIG_XEN=y > # CONFIG_XEN_PRIVILEGED_GUEST is not set > CONFIG_XEN_MAX_DOMAIN_MEMORY=500 > CONFIG_XEN_SAVE_RESTORE=y > # CONFIG_XEN_DEBUG_FS is not set > CONFIG_XEN_X86_PVH=y > # CONFIG_KVM_GUEST is not set > CONFIG_PARAVIRT=y > CONFIG_PARAVIRT_CLOCK=y > CONFIG_PARAVIRT_DEBUG=y > CONFIG_NO_BOOTMEM=y > # CONFIG_MEMTEST is not set > # CONFIG_MK8 is not set > # CONFIG_MPSC is not set > # CONFIG_MCORE2 is not set > # CONFIG_MATOM is not set > CONFIG_GENERIC_CPU=y > CONFIG_X86_INTERNODE_CACHE_SHIFT=6 > CONFIG_X86_CMPXCHG=y > CONFIG_X86_L1_CACHE_SHIFT=6 > CONFIG_X86_XADD=y > CONFIG_X86_WP_WORKS_OK=y > CONFIG_X86_TSC=y > CONFIG_X86_CMPXCHG64=y > CONFIG_X86_CMOV=y > CONFIG_X86_MINIMUM_CPU_FAMILY=64 > CONFIG_X86_DEBUGCTLMSR=y > # CONFIG_PROCESSOR_SELECT is not set > CONFIG_CPU_SUP_INTEL=y > CONFIG_CPU_SUP_AMD=y > CONFIG_CPU_SUP_CENTAUR=y > CONFIG_HPET_TIMER=y > # CONFIG_DMI is not set > CONFIG_SWIOTLB=y > CONFIG_IOMMU_HELPER=y > CONFIG_NR_CPUS=1 > # CONFIG_PREEMPT_NONE is not set > # CONFIG_PREEMPT_VOLUNTARY is not set > CONFIG_PREEMPT=y > CONFIG_PREEMPT_COUNT=y > CONFIG_X86_LOCAL_APIC=y > CONFIG_X86_IO_APIC=y > # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set > CONFIG_X86_MCE=y > CONFIG_X86_MCE_INTEL=y > # CONFIG_X86_MCE_AMD is not set > CONFIG_X86_MCE_THRESHOLD=y > CONFIG_X86_MCE_INJECT=m > CONFIG_X86_THERMAL_VECTOR=y > CONFIG_I8K=m > # CONFIG_MICROCODE is not set > CONFIG_X86_MSR=m > CONFIG_X86_CPUID=m > CONFIG_ARCH_PHYS_ADDR_T_64BIT=y > CONFIG_ARCH_DMA_ADDR_T_64BIT=y > CONFIG_DIRECT_GBPAGES=y > CONFIG_ARCH_SPARSEMEM_ENABLE=y > CONFIG_ARCH_SPARSEMEM_DEFAULT=y > CONFIG_ARCH_SELECT_MEMORY_MODEL=y > CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 > CONFIG_SELECT_MEMORY_MODEL=y > CONFIG_SPARSEMEM_MANUAL=y > CONFIG_SPARSEMEM=y > CONFIG_HAVE_MEMORY_PRESENT=y > CONFIG_SPARSEMEM_EXTREME=y > CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y > CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y > # CONFIG_SPARSEMEM_VMEMMAP is not set > CONFIG_HAVE_MEMBLOCK=y > CONFIG_HAVE_MEMBLOCK_NODE_MAP=y > CONFIG_ARCH_DISCARD_MEMBLOCK=y > CONFIG_MEMORY_ISOLATION=y > # CONFIG_MEMORY_HOTPLUG is not set > CONFIG_PAGEFLAGS_EXTENDED=y > CONFIG_SPLIT_PTLOCK_CPUS=999999 > # CONFIG_COMPACTION is not set > CONFIG_PHYS_ADDR_T_64BIT=y > CONFIG_ZONE_DMA_FLAG=0 > CONFIG_VIRT_TO_BUS=y > CONFIG_MMU_NOTIFIER=y > CONFIG_KSM=y > CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 > CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y > CONFIG_MEMORY_FAILURE=y > # CONFIG_TRANSPARENT_HUGEPAGE is not set > CONFIG_CROSS_MEMORY_ATTACH=y > CONFIG_NEED_PER_CPU_KM=y > CONFIG_CLEANCACHE=y > # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set > CONFIG_X86_RESERVE_LOW=64 > CONFIG_MTRR=y > CONFIG_MTRR_SANITIZER=y > CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 > CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 > # CONFIG_X86_PAT is not set > # CONFIG_ARCH_RANDOM is not set > CONFIG_X86_SMAP=y > # CONFIG_SECCOMP is not set > CONFIG_CC_STACKPROTECTOR=y > # CONFIG_HZ_100 is not set > # CONFIG_HZ_250 is not set > CONFIG_HZ_300=y > # CONFIG_HZ_1000 is not set > CONFIG_HZ=300 > CONFIG_SCHED_HRTICK=y > # CONFIG_KEXEC is not set > # CONFIG_CRASH_DUMP is not set > CONFIG_PHYSICAL_START=0x1000000 > # CONFIG_RELOCATABLE is not set > CONFIG_PHYSICAL_ALIGN=0x1000000 > # CONFIG_COMPAT_VDSO is not set > CONFIG_CMDLINE_BOOL=y > CONFIG_CMDLINE="" > CONFIG_CMDLINE_OVERRIDE=y > CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y > > # > # Power management and ACPI options > # > CONFIG_SUSPEND=y > CONFIG_SUSPEND_FREEZER=y > CONFIG_HIBERNATE_CALLBACKS=y > CONFIG_PM_SLEEP=y > CONFIG_PM_AUTOSLEEP=y > CONFIG_PM_WAKELOCKS=y > CONFIG_PM_WAKELOCKS_LIMIT=100 > # CONFIG_PM_WAKELOCKS_GC is not set > CONFIG_PM_RUNTIME=y > CONFIG_PM=y > # CONFIG_PM_DEBUG is not set > # CONFIG_SFI is not set > > # > # CPU Frequency scaling > # > CONFIG_CPU_FREQ=y > CONFIG_CPU_FREQ_TABLE=m > CONFIG_CPU_FREQ_STAT=m > # CONFIG_CPU_FREQ_STAT_DETAILS is not set > CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y > # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set > # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set > CONFIG_CPU_FREQ_GOV_PERFORMANCE=y > CONFIG_CPU_FREQ_GOV_POWERSAVE=m > CONFIG_CPU_FREQ_GOV_USERSPACE=m > CONFIG_CPU_FREQ_GOV_ONDEMAND=m > # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set > > # > # x86 CPU frequency scaling drivers > # > CONFIG_X86_P4_CLOCKMOD=m > > # > # shared options > # > CONFIG_X86_SPEEDSTEP_LIB=m > # CONFIG_CPU_IDLE is not set > # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set > > # > # Memory power savings > # > # CONFIG_I7300_IDLE is not set > > # > # Bus options (PCI etc.) > # > # CONFIG_PCI is not set > # CONFIG_ISA_DMA_API is not set > CONFIG_PCCARD=m > CONFIG_PCMCIA=m > CONFIG_PCMCIA_LOAD_CIS=y > > # > # PC-card bridges > # > > # > # Executable file formats / Emulations > # > CONFIG_BINFMT_ELF=y > CONFIG_COMPAT_BINFMT_ELF=y > CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y > CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y > # CONFIG_HAVE_AOUT is not set > CONFIG_BINFMT_MISC=m > CONFIG_COREDUMP=y > CONFIG_IA32_EMULATION=y > CONFIG_IA32_AOUT=m > # CONFIG_X86_X32 is not set > CONFIG_COMPAT=y > CONFIG_COMPAT_FOR_U64_ALIGNMENT=y > CONFIG_SYSVIPC_COMPAT=y > CONFIG_KEYS_COMPAT=y > CONFIG_HAVE_TEXT_POKE_SMP=y > CONFIG_X86_DEV_DMA_OPS=y > # CONFIG_NET is not set > CONFIG_HAVE_BPF_JIT=y > > # > # Device Drivers > # > > # > # Generic Driver Options > # > CONFIG_UEVENT_HELPER_PATH="" > # CONFIG_DEVTMPFS is not set > CONFIG_STANDALONE=y > CONFIG_PREVENT_FIRMWARE_BUILD=y > CONFIG_FW_LOADER=m > # CONFIG_FIRMWARE_IN_KERNEL is not set > CONFIG_EXTRA_FIRMWARE="" > CONFIG_DEBUG_DRIVER=y > CONFIG_DEBUG_DEVRES=y > CONFIG_SYS_HYPERVISOR=y > # CONFIG_GENERIC_CPU_DEVICES is not set > CONFIG_REGMAP=y > CONFIG_REGMAP_SPI=y > CONFIG_REGMAP_IRQ=y > # CONFIG_DMA_SHARED_BUFFER is not set > > # > # Bus devices > # > CONFIG_OMAP_OCP2SCP=m > # CONFIG_MTD is not set > CONFIG_PARPORT=m > # CONFIG_PARPORT_PC is not set > # CONFIG_PARPORT_GSC is not set > # CONFIG_PARPORT_AX88796 is not set > CONFIG_PARPORT_1284=y > CONFIG_PARPORT_NOT_PC=y > > # > # Misc devices > # > # CONFIG_SENSORS_LIS3LV02D is not set > CONFIG_AD525X_DPOT=m > # CONFIG_AD525X_DPOT_SPI is not set > CONFIG_ENCLOSURE_SERVICES=m > # CONFIG_TI_DAC7512 is not set > # CONFIG_VMWARE_BALLOON is not set > CONFIG_BMP085=y > CONFIG_BMP085_SPI=m > # CONFIG_C2PORT is not set > > # > # EEPROM support > # > CONFIG_EEPROM_AT25=m > # CONFIG_EEPROM_93CX6 is not set > # CONFIG_EEPROM_93XX46 is not set > > # > # Texas Instruments shared transport line discipline > # > # CONFIG_SENSORS_LIS3_SPI is not set > > # > # Altera FPGA firmware download module > # > CONFIG_HAVE_IDE=y > > # > # SCSI device support > # > CONFIG_SCSI_MOD=y > # CONFIG_SCSI_DMA is not set > # CONFIG_SCSI_NETLINK is not set > CONFIG_MACINTOSH_DRIVERS=y > > # > # Input device support > # > CONFIG_INPUT=m > # CONFIG_INPUT_FF_MEMLESS is not set > CONFIG_INPUT_POLLDEV=m > CONFIG_INPUT_SPARSEKMAP=m > CONFIG_INPUT_MATRIXKMAP=m > > # > # Userland interfaces > # > # CONFIG_INPUT_MOUSEDEV is not set > CONFIG_INPUT_JOYDEV=m > CONFIG_INPUT_EVDEV=m > # CONFIG_INPUT_EVBUG is not set > > # > # Input Device Drivers > # > # CONFIG_INPUT_KEYBOARD is not set > # CONFIG_INPUT_MOUSE is not set > # CONFIG_INPUT_JOYSTICK is not set > # CONFIG_INPUT_TABLET is not set > # CONFIG_INPUT_TOUCHSCREEN is not set > CONFIG_INPUT_MISC=y > CONFIG_INPUT_AD714X=m > CONFIG_INPUT_AD714X_SPI=m > CONFIG_INPUT_MC13783_PWRBUTTON=m > # CONFIG_INPUT_GPIO_TILT_POLLED is not set > # CONFIG_INPUT_ATI_REMOTE2 is not set > CONFIG_INPUT_KEYSPAN_REMOTE=m > CONFIG_INPUT_POWERMATE=m > # CONFIG_INPUT_YEALINK is not set > # CONFIG_INPUT_CM109 is not set > CONFIG_INPUT_UINPUT=m > # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set > CONFIG_INPUT_DA9052_ONKEY=m > # CONFIG_INPUT_PCAP is not set > CONFIG_INPUT_ADXL34X=m > # CONFIG_INPUT_ADXL34X_SPI is not set > # CONFIG_INPUT_CMA3000 is not set > # CONFIG_INPUT_XEN_KBDDEV_FRONTEND is not set > > # > # Hardware I/O ports > # > CONFIG_SERIO=m > CONFIG_SERIO_I8042=m > CONFIG_SERIO_SERPORT=m > CONFIG_SERIO_CT82C710=m > CONFIG_SERIO_PARKBD=m > # CONFIG_SERIO_LIBPS2 is not set > # CONFIG_SERIO_RAW is not set > CONFIG_SERIO_ALTERA_PS2=m > # CONFIG_SERIO_PS2MULT is not set > CONFIG_SERIO_ARC_PS2=m > # CONFIG_GAMEPORT is not set > > # > # Character devices > # > # CONFIG_VT is not set > CONFIG_UNIX98_PTYS=y > # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set > # CONFIG_LEGACY_PTYS is not set > # CONFIG_SERIAL_NONSTANDARD is not set > # CONFIG_TRACE_SINK is not set > CONFIG_DEVKMEM=y > > # > # Serial drivers > # > CONFIG_SERIAL_8250=m > CONFIG_FIX_EARLYCON_MEM=y > # CONFIG_SERIAL_8250_CS is not set > CONFIG_SERIAL_8250_NR_UARTS=4 > CONFIG_SERIAL_8250_RUNTIME_UARTS=4 > # CONFIG_SERIAL_8250_EXTENDED is not set > > # > # Non-8250 serial port support > # > # CONFIG_SERIAL_MAX3100 is not set > CONFIG_SERIAL_MAX310X=y > CONFIG_SERIAL_CORE=y > # CONFIG_SERIAL_SCCNXP is not set > # CONFIG_SERIAL_TIMBERDALE is not set > # CONFIG_SERIAL_ALTERA_JTAGUART is not set > # CONFIG_SERIAL_ALTERA_UART is not set > # CONFIG_SERIAL_IFX6X60 is not set > # CONFIG_SERIAL_XILINX_PS_UART is not set > CONFIG_SERIAL_ARC=m > CONFIG_SERIAL_ARC_NR_PORTS=1 > CONFIG_TTY_PRINTK=y > # CONFIG_PRINTER is not set > # CONFIG_PPDEV is not set > CONFIG_HVC_DRIVER=y > # CONFIG_HVC_XEN is not set > CONFIG_VIRTIO_CONSOLE=m > CONFIG_IPMI_HANDLER=m > CONFIG_IPMI_PANIC_EVENT=y > CONFIG_IPMI_PANIC_STRING=y > # CONFIG_IPMI_DEVICE_INTERFACE is not set > CONFIG_IPMI_SI=m > # CONFIG_IPMI_WATCHDOG is not set > CONFIG_IPMI_POWEROFF=m > CONFIG_HW_RANDOM=m > # CONFIG_HW_RANDOM_TIMERIOMEM is not set > # CONFIG_HW_RANDOM_VIA is not set > # CONFIG_HW_RANDOM_VIRTIO is not set > # CONFIG_NVRAM is not set > # CONFIG_R3964 is not set > > # > # PCMCIA character devices > # > CONFIG_SYNCLINK_CS=m > CONFIG_CARDMAN_4000=m > # CONFIG_CARDMAN_4040 is not set > # CONFIG_MWAVE is not set > # CONFIG_HANGCHECK_TIMER is not set > # CONFIG_TCG_TPM is not set > CONFIG_TELCLOCK=m > # CONFIG_I2C is not set > CONFIG_SPI=y > CONFIG_SPI_DEBUG=y > CONFIG_SPI_MASTER=y > > # > # SPI Master Controller Drivers > # > # CONFIG_SPI_ALTERA is not set > CONFIG_SPI_BITBANG=m > CONFIG_SPI_BUTTERFLY=m > # CONFIG_SPI_GPIO is not set > CONFIG_SPI_LM70_LLP=m > CONFIG_SPI_OC_TINY=m > # CONFIG_SPI_PXA2XX_PCI is not set > # CONFIG_SPI_XILINX is not set > CONFIG_SPI_DESIGNWARE=m > > # > # SPI Protocol Masters > # > # CONFIG_SPI_SPIDEV is not set > # CONFIG_SPI_TLE62X0 is not set > CONFIG_HSI=m > CONFIG_HSI_BOARDINFO=y > > # > # HSI clients > # > CONFIG_HSI_CHAR=m > > # > # PPS support > # > # CONFIG_PPS is not set > > # > # PPS generators support > # > > # > # PTP clock support > # > > # > # Enable Device Drivers -> PPS to see the PTP clock options. > # > CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y > CONFIG_GPIOLIB=y > CONFIG_DEBUG_GPIO=y > CONFIG_GPIO_SYSFS=y > # CONFIG_GPIO_DA9052 is not set > > # > # Memory mapped GPIO drivers: > # > # CONFIG_GPIO_GENERIC_PLATFORM is not set > CONFIG_GPIO_IT8761E=m > > # > # I2C GPIO expanders: > # > # CONFIG_GPIO_ARIZONA is not set > > # > # PCI GPIO expanders: > # > > # > # SPI GPIO expanders: > # > # CONFIG_GPIO_MAX7301 is not set > CONFIG_GPIO_MCP23S08=m > # CONFIG_GPIO_MC33880 is not set > CONFIG_GPIO_74X164=m > > # > # AC97 GPIO expanders: > # > > # > # MODULbus GPIO expanders: > # > # CONFIG_W1 is not set > # CONFIG_POWER_SUPPLY is not set > CONFIG_POWER_AVS=y > CONFIG_HWMON=m > CONFIG_HWMON_VID=m > CONFIG_HWMON_DEBUG_CHIP=y > > # > # Native drivers > # > # CONFIG_SENSORS_AD7314 is not set > # CONFIG_SENSORS_ADCXX is not set > CONFIG_SENSORS_DA9052_ADC=m > CONFIG_SENSORS_F71805F=m > CONFIG_SENSORS_F71882FG=m > # CONFIG_SENSORS_GPIO_FAN is not set > CONFIG_SENSORS_CORETEMP=m > # CONFIG_SENSORS_IBMAEM is not set > CONFIG_SENSORS_IBMPEX=m > # CONFIG_SENSORS_IT87 is not set > CONFIG_SENSORS_LM70=m > CONFIG_SENSORS_MAX1111=m > # CONFIG_SENSORS_MAX197 is not set > # CONFIG_SENSORS_NTC_THERMISTOR is not set > CONFIG_SENSORS_PC87360=m > CONFIG_SENSORS_PC87427=m > # CONFIG_SENSORS_SHT15 is not set > CONFIG_SENSORS_SMSC47M1=m > # CONFIG_SENSORS_SMSC47B397 is not set > # CONFIG_SENSORS_SCH56XX_COMMON is not set > CONFIG_SENSORS_ADS7871=m > # CONFIG_SENSORS_VIA_CPUTEMP is not set > CONFIG_SENSORS_VT1211=m > CONFIG_SENSORS_W83627HF=m > CONFIG_SENSORS_W83627EHF=m > CONFIG_SENSORS_APPLESMC=m > # CONFIG_SENSORS_MC13783_ADC is not set > CONFIG_THERMAL=m > CONFIG_THERMAL_HWMON=y > CONFIG_CPU_THERMAL=y > CONFIG_FAIR_SHARE=y > CONFIG_STEP_WISE=y > CONFIG_USER_SPACE=y > CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y > # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set > # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set > # CONFIG_WATCHDOG is not set > CONFIG_SSB_POSSIBLE=y > > # > # Sonics Silicon Backplane > # > CONFIG_SSB=m > CONFIG_SSB_PCMCIAHOST_POSSIBLE=y > # CONFIG_SSB_PCMCIAHOST is not set > CONFIG_SSB_SDIOHOST_POSSIBLE=y > # CONFIG_SSB_SDIOHOST is not set > CONFIG_SSB_SILENT=y > CONFIG_BCMA_POSSIBLE=y > > # > # Broadcom specific AMBA > # > CONFIG_BCMA=m > # CONFIG_BCMA_DRIVER_GMAC_CMN is not set > # CONFIG_BCMA_DEBUG is not set > > # > # Multifunction device drivers > # > CONFIG_MFD_CORE=y > # CONFIG_MFD_SM501 is not set > # CONFIG_HTC_PASIC3 is not set > # CONFIG_MFD_TPS65912_SPI is not set > # CONFIG_MFD_STMPE is not set > # CONFIG_MFD_TMIO is not set > CONFIG_PMIC_DA9052=y > CONFIG_MFD_DA9052_SPI=y > CONFIG_MFD_ARIZONA=y > CONFIG_MFD_ARIZONA_SPI=m > CONFIG_MFD_WM5102=y > CONFIG_MFD_WM5110=y > # CONFIG_MFD_WM831X_SPI is not set > CONFIG_MFD_MC13783=m > CONFIG_MFD_MC13XXX=m > CONFIG_MFD_MC13XXX_SPI=m > # CONFIG_ABX500_CORE is not set > CONFIG_EZX_PCAP=y > # CONFIG_REGULATOR is not set > CONFIG_MEDIA_SUPPORT=m > > # > # Multimedia core support > # > # CONFIG_MEDIA_CAMERA_SUPPORT is not set > # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set > # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set > CONFIG_MEDIA_RADIO_SUPPORT=y > # CONFIG_MEDIA_RC_SUPPORT is not set > CONFIG_VIDEO_DEV=m > CONFIG_VIDEO_V4L2=m > # CONFIG_VIDEO_ADV_DEBUG is not set > # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set > > # > # Media drivers > # > CONFIG_MEDIA_USB_SUPPORT=y > > # > # Supported MMC/SDIO adapters > # > CONFIG_RADIO_ADAPTERS=y > # CONFIG_RADIO_SI470X is not set > # CONFIG_USB_MR800 is not set > CONFIG_USB_DSBR=m > # CONFIG_RADIO_SHARK2 is not set > CONFIG_USB_KEENE=m > > # > # Texas Instruments WL128x FM driver (ST based) > # > > # > # Media ancillary drivers (tuners, sensors, i2c, frontends) > # > > # > # Encoders, decoders, sensors and other helper chips > # > > # > # Audio decoders, processors and mixers > # > > # > # RDS decoders > # > > # > # Video decoders > # > > # > # Video and audio decoders > # > > # > # MPEG video encoders > # > # CONFIG_VIDEO_CX2341X is not set > > # > # Video encoders > # > > # > # Camera sensor devices > # > > # > # Flash devices > # > > # > # Video improvement chips > # > > # > # Miscelaneous helper chips > # > > # > # Sensors used on soc_camera driver > # > CONFIG_MEDIA_ATTACH=y > > # > # Customize TV tuners > # > > # > # Customise DVB Frontends > # > > # > # Tools to develop new frontends > # > CONFIG_DVB_DUMMY_FE=m > > # > # Graphics support > # > # CONFIG_DRM is not set > # CONFIG_VGASTATE is not set > # CONFIG_VIDEO_OUTPUT_CONTROL is not set > CONFIG_FB=m > # CONFIG_FIRMWARE_EDID is not set > # CONFIG_FB_DDC is not set > # CONFIG_FB_BOOT_VESA_SUPPORT is not set > CONFIG_FB_CFB_FILLRECT=m > CONFIG_FB_CFB_COPYAREA=m > CONFIG_FB_CFB_IMAGEBLIT=m > # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set > CONFIG_FB_SYS_FILLRECT=m > CONFIG_FB_SYS_COPYAREA=m > CONFIG_FB_SYS_IMAGEBLIT=m > # CONFIG_FB_FOREIGN_ENDIAN is not set > CONFIG_FB_SYS_FOPS=m > # CONFIG_FB_WMT_GE_ROPS is not set > CONFIG_FB_DEFERRED_IO=y > CONFIG_FB_HECUBA=m > # CONFIG_FB_SVGALIB is not set > # CONFIG_FB_MACMODES is not set > # CONFIG_FB_BACKLIGHT is not set > CONFIG_FB_MODE_HELPERS=y > # CONFIG_FB_TILEBLITTING is not set > > # > # Frame buffer hardware drivers > # > CONFIG_FB_ARC=m > # CONFIG_FB_VGA16 is not set > CONFIG_FB_N411=m > CONFIG_FB_HGA=m > CONFIG_FB_S1D13XXX=m > CONFIG_FB_TMIO=m > CONFIG_FB_TMIO_ACCELL=y > CONFIG_FB_SMSCUFX=m > # CONFIG_FB_UDL is not set > # CONFIG_FB_VIRTUAL is not set > # CONFIG_XEN_FBDEV_FRONTEND is not set > CONFIG_FB_METRONOME=m > # CONFIG_FB_BROADSHEET is not set > CONFIG_FB_AUO_K190X=m > CONFIG_FB_AUO_K1900=m > CONFIG_FB_AUO_K1901=m > CONFIG_EXYNOS_VIDEO=y > # CONFIG_BACKLIGHT_LCD_SUPPORT is not set > CONFIG_LOGO=y > CONFIG_LOGO_LINUX_MONO=y > CONFIG_LOGO_LINUX_VGA16=y > # CONFIG_LOGO_LINUX_CLUT224 is not set > # CONFIG_SOUND is not set > > # > # HID support > # > CONFIG_HID=m > # CONFIG_HIDRAW is not set > # CONFIG_UHID is not set > # CONFIG_HID_GENERIC is not set > > # > # Special HID drivers > # > > # > # USB HID support > # > # CONFIG_USB_HID is not set > CONFIG_HID_PID=y > > # > # USB HID Boot Protocol drivers > # > # CONFIG_USB_KBD is not set > CONFIG_USB_MOUSE=m > # CONFIG_USB_ARCH_HAS_OHCI is not set > # CONFIG_USB_ARCH_HAS_EHCI is not set > # CONFIG_USB_ARCH_HAS_XHCI is not set > CONFIG_USB_SUPPORT=y > CONFIG_USB_COMMON=m > CONFIG_USB_ARCH_HAS_HCD=y > CONFIG_USB=m > # CONFIG_USB_DEBUG is not set > CONFIG_USB_ANNOUNCE_NEW_DEVICES=y > > # > # Miscellaneous USB options > # > # CONFIG_USB_DYNAMIC_MINORS is not set > # CONFIG_USB_SUSPEND is not set > CONFIG_USB_OTG_WHITELIST=y > CONFIG_USB_OTG_BLACKLIST_HUB=y > CONFIG_USB_DWC3=m > CONFIG_USB_DWC3_DEBUG=y > # CONFIG_USB_DWC3_VERBOSE is not set > # CONFIG_USB_MON is not set > # CONFIG_USB_WUSB_CBAF is not set > > # > # USB Host Controller Drivers > # > CONFIG_USB_C67X00_HCD=m > CONFIG_USB_OXU210HP_HCD=m > # CONFIG_USB_ISP116X_HCD is not set > CONFIG_USB_ISP1760_HCD=m > CONFIG_USB_ISP1362_HCD=m > CONFIG_USB_U132_HCD=m > # CONFIG_USB_SL811_HCD is not set > CONFIG_USB_R8A66597_HCD=m > # CONFIG_USB_RENESAS_USBHS_HCD is not set > CONFIG_USB_HCD_BCMA=m > CONFIG_USB_HCD_SSB=m > CONFIG_USB_MUSB_HDRC=m > # CONFIG_USB_MUSB_TUSB6010 is not set > CONFIG_MUSB_PIO_ONLY=y > CONFIG_USB_CHIPIDEA=m > CONFIG_USB_CHIPIDEA_UDC=y > # CONFIG_USB_CHIPIDEA_HOST is not set > CONFIG_USB_CHIPIDEA_DEBUG=y > CONFIG_USB_RENESAS_USBHS=m > > # > # USB Device Class drivers > # > # CONFIG_USB_ACM is not set > CONFIG_USB_PRINTER=m > # CONFIG_USB_WDM is not set > # CONFIG_USB_TMC is not set > > # > # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may > # > > # > # also be needed; see USB_STORAGE Help for more info > # > > # > # USB Imaging devices > # > CONFIG_USB_MDC800=m > > # > # USB port drivers > # > CONFIG_USB_USS720=m > # CONFIG_USB_SERIAL is not set > > # > # USB Miscellaneous drivers > # > CONFIG_USB_EMI62=m > CONFIG_USB_EMI26=m > # CONFIG_USB_ADUTUX is not set > # CONFIG_USB_SEVSEG is not set > CONFIG_USB_RIO500=m > # CONFIG_USB_LEGOTOWER is not set > CONFIG_USB_LCD=m > # CONFIG_USB_LED is not set > CONFIG_USB_CYPRESS_CY7C63=m > # CONFIG_USB_CYTHERM is not set > # CONFIG_USB_IDMOUSE is not set > CONFIG_USB_FTDI_ELAN=m > # CONFIG_USB_APPLEDISPLAY is not set > CONFIG_USB_SISUSBVGA=m > CONFIG_USB_LD=m > # CONFIG_USB_TRANCEVIBRATOR is not set > CONFIG_USB_IOWARRIOR=m > # CONFIG_USB_TEST is not set > CONFIG_USB_ISIGHTFW=m > # CONFIG_USB_YUREX is not set > CONFIG_USB_EZUSB_FX2=m > > # > # USB Physical Layer drivers > # > # CONFIG_OMAP_USB2 is not set > CONFIG_USB_GADGET=m > CONFIG_USB_GADGET_DEBUG=y > # CONFIG_USB_GADGET_DEBUG_FS is not set > CONFIG_USB_GADGET_VBUS_DRAW=2 > CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > > # > # USB Peripheral Controller > # > # CONFIG_USB_R8A66597 is not set > CONFIG_USB_RENESAS_USBHS_UDC=m > # CONFIG_USB_MV_UDC is not set > CONFIG_USB_GADGET_MUSB_HDRC=m > CONFIG_USB_M66592=m > # CONFIG_USB_NET2272 is not set > CONFIG_USB_DUMMY_HCD=m > CONFIG_USB_LIBCOMPOSITE=m > # CONFIG_USB_ZERO is not set > # CONFIG_USB_GADGETFS is not set > CONFIG_USB_FUNCTIONFS=m > CONFIG_USB_FUNCTIONFS_GENERIC=y > CONFIG_USB_G_SERIAL=m > # CONFIG_USB_G_PRINTER is not set > CONFIG_USB_G_HID=m > CONFIG_USB_G_DBGP=m > CONFIG_USB_G_DBGP_PRINTK=y > # CONFIG_USB_G_DBGP_SERIAL is not set > CONFIG_USB_G_WEBCAM=m > > # > # OTG and related infrastructure > # > CONFIG_USB_OTG_UTILS=y > CONFIG_USB_GPIO_VBUS=m > CONFIG_NOP_USB_XCEIV=m > CONFIG_MMC=m > CONFIG_MMC_DEBUG=y > # CONFIG_MMC_UNSAFE_RESUME is not set > CONFIG_MMC_CLKGATE=y > > # > # MMC/SD/SDIO Card Drivers > # > CONFIG_SDIO_UART=m > CONFIG_MMC_TEST=m > > # > # MMC/SD/SDIO Host Controller Drivers > # > # CONFIG_MMC_SDHCI is not set > CONFIG_MMC_SPI=m > # CONFIG_MMC_VUB300 is not set > CONFIG_MMC_USHC=m > CONFIG_MEMSTICK=m > CONFIG_MEMSTICK_DEBUG=y > > # > # MemoryStick drivers > # > # CONFIG_MEMSTICK_UNSAFE_RESUME is not set > > # > # MemoryStick Host Controller Drivers > # > CONFIG_NEW_LEDS=y > CONFIG_LEDS_CLASS=m > > # > # LED drivers > # > CONFIG_LEDS_GPIO=m > # CONFIG_LEDS_DA9052 is not set > # CONFIG_LEDS_DAC124S085 is not set > # CONFIG_LEDS_LT3593 is not set > CONFIG_LEDS_MC13783=m > CONFIG_LEDS_OT200=m > CONFIG_LEDS_TRIGGERS=y > > # > # LED Triggers > # > CONFIG_LEDS_TRIGGER_TIMER=m > CONFIG_LEDS_TRIGGER_ONESHOT=m > CONFIG_LEDS_TRIGGER_HEARTBEAT=m > # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set > # CONFIG_LEDS_TRIGGER_CPU is not set > # CONFIG_LEDS_TRIGGER_GPIO is not set > CONFIG_LEDS_TRIGGER_DEFAULT_ON=m > > # > # iptables trigger is under Netfilter config (LED target) > # > # CONFIG_LEDS_TRIGGER_TRANSIENT is not set > CONFIG_ACCESSIBILITY=y > CONFIG_EDAC=y > > # > # Reporting subsystems > # > # CONFIG_EDAC_LEGACY_SYSFS is not set > CONFIG_EDAC_DEBUG=y > CONFIG_EDAC_MM_EDAC=m > CONFIG_RTC_LIB=y > CONFIG_RTC_CLASS=y > CONFIG_RTC_HCTOSYS=y > CONFIG_RTC_HCTOSYS_DEVICE="rtc0" > # CONFIG_RTC_DEBUG is not set > > # > # RTC interfaces > # > CONFIG_RTC_INTF_SYSFS=y > CONFIG_RTC_INTF_DEV=y > CONFIG_RTC_INTF_DEV_UIE_EMUL=y > CONFIG_RTC_DRV_TEST=m > > # > # SPI RTC drivers > # > CONFIG_RTC_DRV_M41T93=m > # CONFIG_RTC_DRV_M41T94 is not set > # CONFIG_RTC_DRV_DS1305 is not set > CONFIG_RTC_DRV_DS1390=m > CONFIG_RTC_DRV_MAX6902=m > # CONFIG_RTC_DRV_R9701 is not set > CONFIG_RTC_DRV_RS5C348=m > # CONFIG_RTC_DRV_DS3234 is not set > CONFIG_RTC_DRV_PCF2123=m > > # > # Platform RTC drivers > # > # CONFIG_RTC_DRV_CMOS is not set > CONFIG_RTC_DRV_DS1286=m > # CONFIG_RTC_DRV_DS1511 is not set > # CONFIG_RTC_DRV_DS1553 is not set > # CONFIG_RTC_DRV_DS1742 is not set > # CONFIG_RTC_DRV_DA9052 is not set > # CONFIG_RTC_DRV_STK17TA8 is not set > # CONFIG_RTC_DRV_M48T86 is not set > CONFIG_RTC_DRV_M48T35=m > CONFIG_RTC_DRV_M48T59=m > # CONFIG_RTC_DRV_MSM6242 is not set > CONFIG_RTC_DRV_BQ4802=m > CONFIG_RTC_DRV_RP5C01=m > CONFIG_RTC_DRV_V3020=m > # CONFIG_RTC_DRV_DS2404 is not set > > # > # on-CPU RTC drivers > # > CONFIG_RTC_DRV_PCAP=m > CONFIG_RTC_DRV_MC13XXX=m > # CONFIG_DMADEVICES is not set > # CONFIG_AUXDISPLAY is not set > # CONFIG_UIO is not set > CONFIG_VIRTIO=m > > # > # Virtio drivers > # > CONFIG_VIRTIO_BALLOON=m > # CONFIG_VIRTIO_MMIO is not set > > # > # Microsoft Hyper-V guest support > # > > # > # Xen driver support > # > # CONFIG_XEN_BALLOON is not set > # CONFIG_XEN_DEV_EVTCHN is not set > # CONFIG_XENFS is not set > CONFIG_XEN_SYS_HYPERVISOR=y > CONFIG_XEN_GNTDEV=m > CONFIG_XEN_GRANT_DEV_ALLOC=m > CONFIG_XEN_TMEM=y > CONFIG_XEN_PRIVCMD=m > CONFIG_XEN_HAVE_PVMMU=y > CONFIG_STAGING=y > CONFIG_ECHO=m > CONFIG_COMEDI=m > # CONFIG_COMEDI_DEBUG is not set > CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 > CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 > # CONFIG_COMEDI_MISC_DRIVERS is not set > CONFIG_COMEDI_PCMCIA_DRIVERS=y > CONFIG_COMEDI_CB_DAS16_CS=m > CONFIG_COMEDI_DAS08_CS=m > # CONFIG_COMEDI_NI_DAQ_700_CS is not set > CONFIG_COMEDI_NI_DAQ_DIO24_CS=m > # CONFIG_COMEDI_NI_MIO_CS is not set > CONFIG_COMEDI_QUATECH_DAQP_CS=m > CONFIG_COMEDI_USB_DRIVERS=y > # CONFIG_COMEDI_DT9812 is not set > CONFIG_COMEDI_USBDUX=m > # CONFIG_COMEDI_USBDUXFAST is not set > CONFIG_COMEDI_USBDUXSIGMA=m > CONFIG_COMEDI_VMK80XX=m > CONFIG_COMEDI_8255=m > CONFIG_COMEDI_FC=m > CONFIG_COMEDI_DAS08=m > # CONFIG_ASUS_OLED is not set > CONFIG_PANEL=m > CONFIG_PANEL_PARPORT=0 > CONFIG_PANEL_PROFILE=5 > # CONFIG_PANEL_CHANGE_MESSAGE is not set > CONFIG_TRANZPORT=m > # CONFIG_ZSMALLOC is not set > # CONFIG_FT1000 is not set > > # > # Speakup console speech > # > CONFIG_STAGING_MEDIA=y > > # > # Android > # > CONFIG_ANDROID=y > CONFIG_ANDROID_BINDER_IPC=y > # CONFIG_ANDROID_LOGGER is not set > # CONFIG_ANDROID_TIMED_OUTPUT is not set > # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set > CONFIG_ANDROID_INTF_ALARM_DEV=y > # CONFIG_IPACK_BUS is not set > # CONFIG_CED1401 is not set > # CONFIG_DGRP is not set > # CONFIG_X86_PLATFORM_DEVICES is not set > > # > # Hardware Spinlock drivers > # > CONFIG_CLKEVT_I8253=y > CONFIG_CLKBLD_I8253=y > CONFIG_IOMMU_SUPPORT=y > > # > # Remoteproc drivers (EXPERIMENTAL) > # > CONFIG_REMOTEPROC=m > CONFIG_STE_MODEM_RPROC=m > > # > # Rpmsg drivers > # > # CONFIG_VIRT_DRIVERS is not set > CONFIG_PM_DEVFREQ=y > > # > # DEVFREQ Governors > # > CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y > # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set > # CONFIG_DEVFREQ_GOV_POWERSAVE is not set > # CONFIG_DEVFREQ_GOV_USERSPACE is not set > > # > # DEVFREQ Drivers > # > CONFIG_EXTCON=m > > # > # Extcon Device Drivers > # > CONFIG_EXTCON_GPIO=m > # CONFIG_EXTCON_ARIZONA is not set > # CONFIG_MEMORY is not set > # CONFIG_IIO is not set > CONFIG_PWM=y > > # > # Firmware Drivers > # > CONFIG_EDD=m > CONFIG_EDD_OFF=y > # CONFIG_FIRMWARE_MEMMAP is not set > CONFIG_DELL_RBU=m > CONFIG_DCDBAS=m > CONFIG_ISCSI_IBFT_FIND=y > CONFIG_GOOGLE_FIRMWARE=y > > # > # Google Firmware Drivers > # > > # > # File systems > # > CONFIG_DCACHE_WORD_ACCESS=y > # CONFIG_FS_POSIX_ACL is not set > CONFIG_EXPORTFS=y > # CONFIG_FILE_LOCKING is not set > CONFIG_FSNOTIFY=y > CONFIG_DNOTIFY=y > CONFIG_INOTIFY_USER=y > # CONFIG_FANOTIFY is not set > CONFIG_QUOTA=y > # CONFIG_PRINT_QUOTA_WARNING is not set > # CONFIG_QUOTA_DEBUG is not set > # CONFIG_QFMT_V1 is not set > # CONFIG_QFMT_V2 is not set > CONFIG_QUOTACTL=y > CONFIG_QUOTACTL_COMPAT=y > # CONFIG_AUTOFS4_FS is not set > CONFIG_FUSE_FS=m > # CONFIG_CUSE is not set > > # > # Caches > # > # CONFIG_FSCACHE is not set > > # > # Pseudo filesystems > # > # CONFIG_PROC_FS is not set > CONFIG_SYSFS=y > # CONFIG_HUGETLBFS is not set > # CONFIG_HUGETLB_PAGE is not set > CONFIG_CONFIGFS_FS=m > # CONFIG_MISC_FILESYSTEMS is not set > CONFIG_NLS=m > CONFIG_NLS_DEFAULT="iso8859-1" > # CONFIG_NLS_CODEPAGE_437 is not set > CONFIG_NLS_CODEPAGE_737=m > # CONFIG_NLS_CODEPAGE_775 is not set > # CONFIG_NLS_CODEPAGE_850 is not set > CONFIG_NLS_CODEPAGE_852=m > CONFIG_NLS_CODEPAGE_855=m > CONFIG_NLS_CODEPAGE_857=m > CONFIG_NLS_CODEPAGE_860=m > # CONFIG_NLS_CODEPAGE_861 is not set > CONFIG_NLS_CODEPAGE_862=m > CONFIG_NLS_CODEPAGE_863=m > # CONFIG_NLS_CODEPAGE_864 is not set > CONFIG_NLS_CODEPAGE_865=m > # CONFIG_NLS_CODEPAGE_866 is not set > # CONFIG_NLS_CODEPAGE_869 is not set > CONFIG_NLS_CODEPAGE_936=m > # CONFIG_NLS_CODEPAGE_950 is not set > # CONFIG_NLS_CODEPAGE_932 is not set > CONFIG_NLS_CODEPAGE_949=m > # CONFIG_NLS_CODEPAGE_874 is not set > # CONFIG_NLS_ISO8859_8 is not set > # CONFIG_NLS_CODEPAGE_1250 is not set > CONFIG_NLS_CODEPAGE_1251=m > CONFIG_NLS_ASCII=m > CONFIG_NLS_ISO8859_1=m > # CONFIG_NLS_ISO8859_2 is not set > # CONFIG_NLS_ISO8859_3 is not set > CONFIG_NLS_ISO8859_4=m > # CONFIG_NLS_ISO8859_5 is not set > # CONFIG_NLS_ISO8859_6 is not set > # CONFIG_NLS_ISO8859_7 is not set > CONFIG_NLS_ISO8859_9=m > CONFIG_NLS_ISO8859_13=m > CONFIG_NLS_ISO8859_14=m > CONFIG_NLS_ISO8859_15=m > CONFIG_NLS_KOI8_R=m > # CONFIG_NLS_KOI8_U is not set > # CONFIG_NLS_MAC_ROMAN is not set > CONFIG_NLS_MAC_CELTIC=m > CONFIG_NLS_MAC_CENTEURO=m > # CONFIG_NLS_MAC_CROATIAN is not set > # CONFIG_NLS_MAC_CYRILLIC is not set > # CONFIG_NLS_MAC_GAELIC is not set > CONFIG_NLS_MAC_GREEK=m > CONFIG_NLS_MAC_ICELAND=m > # CONFIG_NLS_MAC_INUIT is not set > # CONFIG_NLS_MAC_ROMANIAN is not set > # CONFIG_NLS_MAC_TURKISH is not set > # CONFIG_NLS_UTF8 is not set > > # > # Kernel hacking > # > CONFIG_TRACE_IRQFLAGS_SUPPORT=y > CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 > CONFIG_ENABLE_WARN_DEPRECATED=y > CONFIG_ENABLE_MUST_CHECK=y > CONFIG_FRAME_WARN=2048 > CONFIG_MAGIC_SYSRQ=y > # CONFIG_STRIP_ASM_SYMS is not set > CONFIG_READABLE_ASM=y > CONFIG_UNUSED_SYMBOLS=y > CONFIG_DEBUG_FS=y > # CONFIG_HEADERS_CHECK is not set > # CONFIG_DEBUG_SECTION_MISMATCH is not set > CONFIG_DEBUG_KERNEL=y > # CONFIG_DEBUG_SHIRQ is not set > CONFIG_LOCKUP_DETECTOR=y > CONFIG_HARDLOCKUP_DETECTOR=y > CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y > CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 > # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set > CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 > # CONFIG_PANIC_ON_OOPS is not set > CONFIG_PANIC_ON_OOPS_VALUE=0 > # CONFIG_DETECT_HUNG_TASK is not set > CONFIG_DEBUG_OBJECTS=y > # CONFIG_DEBUG_OBJECTS_SELFTEST is not set > CONFIG_DEBUG_OBJECTS_FREE=y > # CONFIG_DEBUG_OBJECTS_TIMERS is not set > # CONFIG_DEBUG_OBJECTS_WORK is not set > # CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set > # CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set > CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 > # CONFIG_SLUB_STATS is not set > CONFIG_HAVE_DEBUG_KMEMLEAK=y > # CONFIG_DEBUG_KMEMLEAK is not set > # CONFIG_DEBUG_PREEMPT is not set > CONFIG_DEBUG_RT_MUTEXES=y > CONFIG_DEBUG_PI_LIST=y > CONFIG_RT_MUTEX_TESTER=y > CONFIG_DEBUG_SPINLOCK=y > CONFIG_DEBUG_MUTEXES=y > CONFIG_DEBUG_LOCK_ALLOC=y > CONFIG_PROVE_LOCKING=y > CONFIG_PROVE_RCU=y > # CONFIG_PROVE_RCU_REPEATEDLY is not set > CONFIG_PROVE_RCU_DELAY=y > CONFIG_SPARSE_RCU_POINTER=y > CONFIG_LOCKDEP=y > CONFIG_LOCK_STAT=y > CONFIG_DEBUG_LOCKDEP=y > CONFIG_TRACE_IRQFLAGS=y > CONFIG_DEBUG_ATOMIC_SLEEP=y > CONFIG_DEBUG_LOCKING_API_SELFTESTS=y > CONFIG_STACKTRACE=y > # CONFIG_DEBUG_STACK_USAGE is not set > CONFIG_DEBUG_KOBJECT=y > # CONFIG_DEBUG_BUGVERBOSE is not set > # CONFIG_DEBUG_INFO is not set > # CONFIG_DEBUG_VM is not set > CONFIG_DEBUG_VIRTUAL=y > CONFIG_DEBUG_WRITECOUNT=y > # CONFIG_DEBUG_MEMORY_INIT is not set > CONFIG_DEBUG_LIST=y > CONFIG_TEST_LIST_SORT=y > # CONFIG_DEBUG_SG is not set > # CONFIG_DEBUG_NOTIFIERS is not set > CONFIG_DEBUG_CREDENTIALS=y > CONFIG_ARCH_WANT_FRAME_POINTERS=y > CONFIG_FRAME_POINTER=y > # CONFIG_RCU_TORTURE_TEST is not set > # CONFIG_RCU_TRACE is not set > CONFIG_KPROBES_SANITY_TEST=y > CONFIG_BACKTRACE_SELF_TEST=m > CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y > CONFIG_NOTIFIER_ERROR_INJECTION=m > # CONFIG_PM_NOTIFIER_ERROR_INJECT is not set > # CONFIG_FAULT_INJECTION is not set > CONFIG_USER_STACKTRACE_SUPPORT=y > CONFIG_HAVE_FUNCTION_TRACER=y > CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y > CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y > CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y > CONFIG_HAVE_DYNAMIC_FTRACE=y > CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y > CONFIG_HAVE_SYSCALL_TRACEPOINTS=y > CONFIG_HAVE_FENTRY=y > CONFIG_HAVE_C_RECORDMCOUNT=y > CONFIG_TRACING_SUPPORT=y > # CONFIG_FTRACE is not set > # CONFIG_RBTREE_TEST is not set > # CONFIG_INTERVAL_TREE_TEST is not set > # CONFIG_DMA_API_DEBUG is not set > # CONFIG_ATOMIC64_SELFTEST is not set > # CONFIG_SAMPLES is not set > CONFIG_HAVE_ARCH_KGDB=y > # CONFIG_KGDB is not set > CONFIG_HAVE_ARCH_KMEMCHECK=y > CONFIG_KMEMCHECK=y > # CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT is not set > # CONFIG_KMEMCHECK_ENABLED_BY_DEFAULT is not set > CONFIG_KMEMCHECK_ONESHOT_BY_DEFAULT=y > CONFIG_KMEMCHECK_QUEUE_SIZE=64 > CONFIG_KMEMCHECK_SHADOW_COPY_SHIFT=5 > CONFIG_KMEMCHECK_PARTIAL_OK=y > CONFIG_KMEMCHECK_BITOPS_OK=y > # CONFIG_TEST_KSTRTOX is not set > # CONFIG_STRICT_DEVMEM is not set > CONFIG_X86_VERBOSE_BOOTUP=y > CONFIG_EARLY_PRINTK=y > CONFIG_DEBUG_STACKOVERFLOW=y > CONFIG_X86_PTDUMP=y > CONFIG_DEBUG_RODATA=y > # CONFIG_DEBUG_RODATA_TEST is not set > CONFIG_DEBUG_SET_MODULE_RONX=y > # CONFIG_DEBUG_NX_TEST is not set > # CONFIG_DEBUG_TLBFLUSH is not set > CONFIG_IOMMU_STRESS=y > CONFIG_HAVE_MMIOTRACE_SUPPORT=y > # CONFIG_X86_DECODER_SELFTEST is not set > CONFIG_IO_DELAY_TYPE_0X80=0 > CONFIG_IO_DELAY_TYPE_0XED=1 > CONFIG_IO_DELAY_TYPE_UDELAY=2 > CONFIG_IO_DELAY_TYPE_NONE=3 > # CONFIG_IO_DELAY_0X80 is not set > # CONFIG_IO_DELAY_0XED is not set > # CONFIG_IO_DELAY_UDELAY is not set > CONFIG_IO_DELAY_NONE=y > CONFIG_DEFAULT_IO_DELAY_TYPE=3 > # CONFIG_DEBUG_BOOT_PARAMS is not set > CONFIG_CPA_DEBUG=y > # CONFIG_OPTIMIZE_INLINING is not set > # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set > # CONFIG_DEBUG_NMI_SELFTEST is not set > > # > # Security options > # > CONFIG_KEYS=y > # CONFIG_ENCRYPTED_KEYS is not set > CONFIG_KEYS_DEBUG_PROC_KEYS=y > CONFIG_SECURITY_DMESG_RESTRICT=y > CONFIG_SECURITY=y > CONFIG_SECURITYFS=y > CONFIG_SECURITY_NETWORK=y > CONFIG_SECURITY_PATH=y > CONFIG_SECURITY_YAMA=y > # CONFIG_SECURITY_YAMA_STACKED is not set > # CONFIG_IMA is not set > # CONFIG_EVM is not set > CONFIG_DEFAULT_SECURITY_YAMA=y > # CONFIG_DEFAULT_SECURITY_DAC is not set > CONFIG_DEFAULT_SECURITY="yama" > CONFIG_CRYPTO=y > > # > # Crypto core or helper > # > # CONFIG_CRYPTO_FIPS is not set > CONFIG_CRYPTO_ALGAPI=y > CONFIG_CRYPTO_ALGAPI2=y > CONFIG_CRYPTO_AEAD=m > CONFIG_CRYPTO_AEAD2=y > CONFIG_CRYPTO_BLKCIPHER=m > CONFIG_CRYPTO_BLKCIPHER2=y > CONFIG_CRYPTO_HASH=y > CONFIG_CRYPTO_HASH2=y > CONFIG_CRYPTO_RNG=m > CONFIG_CRYPTO_RNG2=y > CONFIG_CRYPTO_PCOMP=m > CONFIG_CRYPTO_PCOMP2=y > CONFIG_CRYPTO_MANAGER=m > CONFIG_CRYPTO_MANAGER2=y > # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set > CONFIG_CRYPTO_GF128MUL=m > CONFIG_CRYPTO_NULL=m > CONFIG_CRYPTO_WORKQUEUE=y > CONFIG_CRYPTO_CRYPTD=m > CONFIG_CRYPTO_AUTHENC=m > CONFIG_CRYPTO_TEST=m > CONFIG_CRYPTO_ABLK_HELPER_X86=m > CONFIG_CRYPTO_GLUE_HELPER_X86=m > > # > # Authenticated Encryption with Associated Data > # > # CONFIG_CRYPTO_CCM is not set > # CONFIG_CRYPTO_GCM is not set > CONFIG_CRYPTO_SEQIV=m > > # > # Block modes > # > CONFIG_CRYPTO_CBC=m > CONFIG_CRYPTO_CTR=m > CONFIG_CRYPTO_CTS=m > CONFIG_CRYPTO_ECB=m > CONFIG_CRYPTO_LRW=m > CONFIG_CRYPTO_PCBC=m > CONFIG_CRYPTO_XTS=m > > # > # Hash modes > # > # CONFIG_CRYPTO_HMAC is not set > # CONFIG_CRYPTO_XCBC is not set > # CONFIG_CRYPTO_VMAC is not set > > # > # Digest > # > # CONFIG_CRYPTO_CRC32C is not set > CONFIG_CRYPTO_CRC32C_X86_64=y > CONFIG_CRYPTO_CRC32C_INTEL=m > # CONFIG_CRYPTO_GHASH is not set > # CONFIG_CRYPTO_MD4 is not set > # CONFIG_CRYPTO_MD5 is not set > # CONFIG_CRYPTO_MICHAEL_MIC is not set > # CONFIG_CRYPTO_RMD128 is not set > # CONFIG_CRYPTO_RMD160 is not set > CONFIG_CRYPTO_RMD256=m > CONFIG_CRYPTO_RMD320=m > # CONFIG_CRYPTO_SHA1 is not set > # CONFIG_CRYPTO_SHA1_SSSE3 is not set > CONFIG_CRYPTO_SHA256=y > # CONFIG_CRYPTO_SHA512 is not set > # CONFIG_CRYPTO_TGR192 is not set > CONFIG_CRYPTO_WP512=m > CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m > > # > # Ciphers > # > CONFIG_CRYPTO_AES=m > CONFIG_CRYPTO_AES_X86_64=m > # CONFIG_CRYPTO_AES_NI_INTEL is not set > CONFIG_CRYPTO_ANUBIS=m > CONFIG_CRYPTO_ARC4=m > # CONFIG_CRYPTO_BLOWFISH is not set > # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set > # CONFIG_CRYPTO_CAMELLIA is not set > CONFIG_CRYPTO_CAMELLIA_X86_64=m > CONFIG_CRYPTO_CAST5=m > CONFIG_CRYPTO_CAST5_AVX_X86_64=m > CONFIG_CRYPTO_CAST6=m > CONFIG_CRYPTO_CAST6_AVX_X86_64=m > CONFIG_CRYPTO_DES=m > # CONFIG_CRYPTO_FCRYPT is not set > CONFIG_CRYPTO_KHAZAD=m > CONFIG_CRYPTO_SALSA20=m > # CONFIG_CRYPTO_SALSA20_X86_64 is not set > CONFIG_CRYPTO_SEED=m > CONFIG_CRYPTO_SERPENT=m > CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m > CONFIG_CRYPTO_SERPENT_AVX_X86_64=m > # CONFIG_CRYPTO_TEA is not set > CONFIG_CRYPTO_TWOFISH=m > CONFIG_CRYPTO_TWOFISH_COMMON=m > CONFIG_CRYPTO_TWOFISH_X86_64=m > CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m > CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m > > # > # Compression > # > CONFIG_CRYPTO_DEFLATE=m > CONFIG_CRYPTO_ZLIB=m > CONFIG_CRYPTO_LZO=m > > # > # Random Number Generation > # > CONFIG_CRYPTO_ANSI_CPRNG=m > # CONFIG_CRYPTO_HW is not set > CONFIG_ASYMMETRIC_KEY_TYPE=y > CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y > CONFIG_PUBLIC_KEY_ALGO_RSA=y > CONFIG_X509_CERTIFICATE_PARSER=y > CONFIG_HAVE_KVM=y > CONFIG_VIRTUALIZATION=y > # CONFIG_BINARY_PRINTF is not set > > # > # Library routines > # > CONFIG_BITREVERSE=m > CONFIG_GENERIC_STRNCPY_FROM_USER=y > CONFIG_GENERIC_STRNLEN_USER=y > CONFIG_GENERIC_FIND_FIRST_BIT=y > CONFIG_GENERIC_PCI_IOMAP=y > CONFIG_GENERIC_IOMAP=y > CONFIG_GENERIC_IO=y > # CONFIG_CRC_CCITT is not set > # CONFIG_CRC16 is not set > CONFIG_CRC_T10DIF=m > CONFIG_CRC_ITU_T=m > CONFIG_CRC32=m > CONFIG_CRC32_SELFTEST=y > # CONFIG_CRC32_SLICEBY8 is not set > # CONFIG_CRC32_SLICEBY4 is not set > # CONFIG_CRC32_SARWATE is not set > CONFIG_CRC32_BIT=y > CONFIG_CRC7=m > # CONFIG_LIBCRC32C is not set > # CONFIG_CRC8 is not set > CONFIG_ZLIB_INFLATE=m > CONFIG_ZLIB_DEFLATE=m > CONFIG_LZO_COMPRESS=y > CONFIG_LZO_DECOMPRESS=y > # CONFIG_XZ_DEC is not set > # CONFIG_XZ_DEC_BCJ is not set > CONFIG_HAS_IOMEM=y > CONFIG_HAS_IOPORT=y > CONFIG_HAS_DMA=y > CONFIG_NLATTR=y > CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y > CONFIG_AVERAGE=y > CONFIG_CLZ_TAB=y > CONFIG_CORDIC=m > # CONFIG_DDR is not set > CONFIG_MPILIB=y > CONFIG_OID_REGISTRY=y _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:06:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:06:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2tU-00017F-2A; Thu, 01 Nov 2012 22:05:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2tS-000179-7I for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 22:05:42 +0000 Received: from [85.158.143.99:37921] by server-3.bemta-4.messagelabs.com id 1E/46-06841-532F2905; Thu, 01 Nov 2012 22:05:41 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1351807539!23033040!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25339 invoked from network); 1 Nov 2012 22:05:40 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-12.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 22:05:40 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1M5Qm3030384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 22:05:27 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1M5PU6029933 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 22:05:25 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1M5OJc007089; Thu, 1 Nov 2012 17:05:24 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 15:05:23 -0700 Date: Thu, 1 Nov 2012 18:05:20 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121101220520.GC18854@localhost.localdomain> References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D5EA020000780008EB85@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, rientjes@google.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 08:04:58PM +0000, Jan Beulich wrote: > >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> > >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: > >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no > >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() > >> resulting in the following link error: > >> > >> drivers/built-in.o: In function `dbgp_reset_prep': > >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' > >> drivers/built-in.o: In function `dbgp_external_startup': > >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' > > > >There is another patch that needs to be Acked and picked up by > >Greg KH that fixes this. > > > >Let me poke Jan Beulich to repost it with the appropiate Acks. > > It's been picked up already, but another dependency problem was found with > it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had > first submitted). Oh. I missed that part - so do you think that this patch should also be used? Or do you think there is another way to fix this? I am in transit right now so I can't prep a patch (and the laptop I've is extremely slow to even do a test compile). > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:06:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:06:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2tU-00017F-2A; Thu, 01 Nov 2012 22:05:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2tS-000179-7I for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 22:05:42 +0000 Received: from [85.158.143.99:37921] by server-3.bemta-4.messagelabs.com id 1E/46-06841-532F2905; Thu, 01 Nov 2012 22:05:41 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1351807539!23033040!1 X-Originating-IP: [141.146.126.227] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuMjI3ID0+IDgzOTM3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25339 invoked from network); 1 Nov 2012 22:05:40 -0000 Received: from acsinet15.oracle.com (HELO acsinet15.oracle.com) (141.146.126.227) by server-12.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 1 Nov 2012 22:05:40 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA1M5Qm3030384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Nov 2012 22:05:27 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA1M5PU6029933 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Nov 2012 22:05:25 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA1M5OJc007089; Thu, 1 Nov 2012 17:05:24 -0500 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2012 15:05:23 -0700 Date: Thu, 1 Nov 2012 18:05:20 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121101220520.GC18854@localhost.localdomain> References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D5EA020000780008EB85@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, rientjes@google.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 08:04:58PM +0000, Jan Beulich wrote: > >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> > >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: > >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no > >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() > >> resulting in the following link error: > >> > >> drivers/built-in.o: In function `dbgp_reset_prep': > >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' > >> drivers/built-in.o: In function `dbgp_external_startup': > >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' > > > >There is another patch that needs to be Acked and picked up by > >Greg KH that fixes this. > > > >Let me poke Jan Beulich to repost it with the appropiate Acks. > > It's been picked up already, but another dependency problem was found with > it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had > first submitted). Oh. I missed that part - so do you think that this patch should also be used? Or do you think there is another way to fix this? I am in transit right now so I can't prep a patch (and the laptop I've is extremely slow to even do a test compile). > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:30:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:30:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3HN-0001aV-6H; Thu, 01 Nov 2012 22:30:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3HL-0001aI-E4 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 22:30:23 +0000 Received: from [85.158.139.211:15564] by server-9.bemta-5.messagelabs.com id 5F/7A-29295-EF7F2905; Thu, 01 Nov 2012 22:30:22 +0000 X-Env-Sender: rientjes@google.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1351809019!18582829!1 X-Originating-IP: [209.85.160.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15453 invoked from network); 1 Nov 2012 22:30:21 -0000 Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 22:30:21 -0000 Received: by mail-pb0-f43.google.com with SMTP id jt11so2189569pbb.30 for ; Thu, 01 Nov 2012 15:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=qhYR0r0It3yNiyLzq7XAx987leLqexmGOf821yh1jWo=; b=Ab8RtbYsJKQcc9ZPva9LXyX3LocvnhZVGh5OwY8z0tsT1G6icLCntAypR2SrHemVFj pYJco2KO1G7fsD9MT3h8Ra9FOEsl1JZmM2/w9Fwg46QioRVw+kJbqJvA7mY0Wt19zdqV UdrTl/9RK6Ms2KEN+622CEKtwhS/ZcdNQ2SMXdXgJJEjGHgud+PVajDrfDFPDLpMRc8K iprFmmYZuTnt4Fpacn9mGKjjUzqVzaUYaLFtQwOc3ZHyQ4xC9jdKbTXrJUK05b4pGCt0 gIRG4z+Y3lC+BYZVZnCWW1mb24kNJPdu9xEDJ690s9LwQcDbDRl5sI0u8G+zZgY+9Hr3 kyKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type:x-gm-message-state; bh=qhYR0r0It3yNiyLzq7XAx987leLqexmGOf821yh1jWo=; b=L79TaqgkmNVG+GGDjYJIxfZqwyJZ6K2LPoRFF7+o8RoknCUaSBMWal7272w0Dlogly UiaTuzblx/B4l7N+rQqsFIH/orcWNgp55l6SdhnoTGFJFEcK2ci1nMakxzUuca/7BQLC Qm7DfpZ1VlwjOW1edxhApaUDL+vDOmH5rT3jYjgqqbkOBMJj2KX7Os3hJXUd/iOD+4Fy zvdFyYmvfHAC8DiUujcgq1LAkTJn1IzPm6jjcoy4eAMw1SZGhw1aAMsek9B9m+SPHrmb uVjIUbuSWExcHdZgcV0GytuHxhTV/tLnS+qYnMTrcNUFh5NRN7q+Z+XW3o/TGEcal4by /JVA== Received: by 10.66.90.73 with SMTP id bu9mr115115399pab.71.1351809019282; Thu, 01 Nov 2012 15:30:19 -0700 (PDT) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPS id vo8sm4649016pbc.16.2012.11.01.15.30.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 15:30:18 -0700 (PDT) Date: Thu, 1 Nov 2012 15:30:17 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Konrad Rzeszutek Wilk In-Reply-To: <20121101220520.GC18854@localhost.localdomain> Message-ID: References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> <20121101220520.GC18854@localhost.localdomain> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQke22CHHX+966loqCEjFH3MlHVC7e4xfhvHNlNlK74JCdFta6CecO1TmEWO0SRDUQU+8D9LKjYZOZ2pO/sXKxPWpgKNvRw1R1RE42az30a6zkDwQOMi5rE9+TDKF5bleLQyc7inJzj38nKa8RqC+zu9/lDof3+5qvoXj6b3CdOtFzaiCDQ2OV0F2JwXaWB9FujgvMnPlurbhQEpcRAEfa8N2vqYDw== Cc: jeremy@goop.org, xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, Jan Beulich , hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 1 Nov 2012, Konrad Rzeszutek Wilk wrote: > Oh. I missed that part - so do you think that this patch should also > be used? Or do you think there is another way to fix this? > Appears to be fixed by d99e65bda806 ("USB: fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled") as of this morning's tree which relies on CONFIG_USB, which effectively requires CONFIG_USB_SUPPORT that this patch provides, so feel free to drop mine. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:30:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:30:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3HN-0001aV-6H; Thu, 01 Nov 2012 22:30:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3HL-0001aI-E4 for xen-devel@lists.xensource.com; Thu, 01 Nov 2012 22:30:23 +0000 Received: from [85.158.139.211:15564] by server-9.bemta-5.messagelabs.com id 5F/7A-29295-EF7F2905; Thu, 01 Nov 2012 22:30:22 +0000 X-Env-Sender: rientjes@google.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1351809019!18582829!1 X-Originating-IP: [209.85.160.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15453 invoked from network); 1 Nov 2012 22:30:21 -0000 Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 1 Nov 2012 22:30:21 -0000 Received: by mail-pb0-f43.google.com with SMTP id jt11so2189569pbb.30 for ; Thu, 01 Nov 2012 15:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=qhYR0r0It3yNiyLzq7XAx987leLqexmGOf821yh1jWo=; b=Ab8RtbYsJKQcc9ZPva9LXyX3LocvnhZVGh5OwY8z0tsT1G6icLCntAypR2SrHemVFj pYJco2KO1G7fsD9MT3h8Ra9FOEsl1JZmM2/w9Fwg46QioRVw+kJbqJvA7mY0Wt19zdqV UdrTl/9RK6Ms2KEN+622CEKtwhS/ZcdNQ2SMXdXgJJEjGHgud+PVajDrfDFPDLpMRc8K iprFmmYZuTnt4Fpacn9mGKjjUzqVzaUYaLFtQwOc3ZHyQ4xC9jdKbTXrJUK05b4pGCt0 gIRG4z+Y3lC+BYZVZnCWW1mb24kNJPdu9xEDJ690s9LwQcDbDRl5sI0u8G+zZgY+9Hr3 kyKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type:x-gm-message-state; bh=qhYR0r0It3yNiyLzq7XAx987leLqexmGOf821yh1jWo=; b=L79TaqgkmNVG+GGDjYJIxfZqwyJZ6K2LPoRFF7+o8RoknCUaSBMWal7272w0Dlogly UiaTuzblx/B4l7N+rQqsFIH/orcWNgp55l6SdhnoTGFJFEcK2ci1nMakxzUuca/7BQLC Qm7DfpZ1VlwjOW1edxhApaUDL+vDOmH5rT3jYjgqqbkOBMJj2KX7Os3hJXUd/iOD+4Fy zvdFyYmvfHAC8DiUujcgq1LAkTJn1IzPm6jjcoy4eAMw1SZGhw1aAMsek9B9m+SPHrmb uVjIUbuSWExcHdZgcV0GytuHxhTV/tLnS+qYnMTrcNUFh5NRN7q+Z+XW3o/TGEcal4by /JVA== Received: by 10.66.90.73 with SMTP id bu9mr115115399pab.71.1351809019282; Thu, 01 Nov 2012 15:30:19 -0700 (PDT) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPS id vo8sm4649016pbc.16.2012.11.01.15.30.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 15:30:18 -0700 (PDT) Date: Thu, 1 Nov 2012 15:30:17 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Konrad Rzeszutek Wilk In-Reply-To: <20121101220520.GC18854@localhost.localdomain> Message-ID: References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> <20121101220520.GC18854@localhost.localdomain> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQke22CHHX+966loqCEjFH3MlHVC7e4xfhvHNlNlK74JCdFta6CecO1TmEWO0SRDUQU+8D9LKjYZOZ2pO/sXKxPWpgKNvRw1R1RE42az30a6zkDwQOMi5rE9+TDKF5bleLQyc7inJzj38nKa8RqC+zu9/lDof3+5qvoXj6b3CdOtFzaiCDQ2OV0F2JwXaWB9FujgvMnPlurbhQEpcRAEfa8N2vqYDw== Cc: jeremy@goop.org, xen-devel@lists.xensource.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, Jan Beulich , hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 1 Nov 2012, Konrad Rzeszutek Wilk wrote: > Oh. I missed that part - so do you think that this patch should also > be used? Or do you think there is another way to fix this? > Appears to be fixed by d99e65bda806 ("USB: fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled") as of this morning's tree which relies on CONFIG_USB, which effectively requires CONFIG_USB_SUPPORT that this patch provides, so feel free to drop mine. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:33:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3KA-0001jq-Ow; Thu, 01 Nov 2012 22:33:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2U4-0000HA-8U for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:39:28 +0000 Received: from [85.158.139.211:6924] by server-16.bemta-5.messagelabs.com id F6/6F-04786-F0CE2905; Thu, 01 Nov 2012 21:39:27 +0000 X-Env-Sender: osp@andrep.de X-Msg-Ref: server-5.tower-206.messagelabs.com!1351805953!18487074!1 X-Originating-IP: [217.160.17.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27982 invoked from network); 1 Nov 2012 21:39:16 -0000 Received: from s15333296.onlinehome-server.info (HELO s15333296.onlinehome-server.info) (217.160.17.100) by server-5.tower-206.messagelabs.com with SMTP; 1 Nov 2012 21:39:16 -0000 Received: from localhost.localdomain (g227155030.adsl.alicedsl.de [92.227.155.30]) by s15333296.onlinehome-server.info (Postfix) with ESMTPSA id 96C1F84080A9; Thu, 1 Nov 2012 22:39:12 +0100 (CET) From: Andre Przywara To: Ian.Jackson@eu.citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, keir@xen.org, jbeulich@suse.com Date: Thu, 1 Nov 2012 22:40:57 +0100 Message-Id: <1351806057-3167-1-git-send-email-osp@andrep.de> X-Mailer: git-send-email 1.7.1 X-Mailman-Approved-At: Thu, 01 Nov 2012 22:33:18 +0000 Cc: Andre Przywara , boris.ostrovsky@amd.com, wei.huang2@amd.com, Christoph_Egger@gmx.de, xen-devel@lists.xen.org, weiwang.dd@gmail.com Subject: [Xen-devel] [PATCH] update MAINTAINERS file X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org There have been some "organizational changes" within AMD. Update the MAINTAINERS file accordingly. Please also feel free to use the new email addresses if there are any inquires related to code authored by Wei Wang, Christoph Egger or Andre Przywara. Signed-off-by: Andre Przywara Acked-by: Wei Wang Acked-by: Boris Ostrovsky Acked-by: Wei Huang Acked-by: Christoph Egger --- MAINTAINERS | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2d8517b..1c595f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -78,7 +78,6 @@ Maintainers List (try to look for most precise areas first) ACPI & POWER MANAGEMENT M: Winston Wang M: Gang Wei -M: Mark Langsdorf M: Jan Beulich S: Supported F: xen/arch/x86/acpi/ @@ -86,13 +85,15 @@ F: xen/drivers/acpi/ F: xen/drivers/cpufreq/ AMD IOMMU -M: Wei Wang -S: Supported +M: Wei Wang +M: Wei Huang +S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Andre Przywara -M: Christoph Egger +M: Andre Przywara +M: Christoph Egger +M: Boris Ostrovsky M: Wei Huang S: Supported F: xen/arch/x86/hvm/svm/ @@ -170,7 +171,7 @@ S: Supported T: hg http://xenbits.xen.org/XCP/linux-2.6.*.pq.hg MACHINE CHECK (MCA) & RAS -M: Christoph Egger +M: Christoph Egger M: Yunhong Jiang S: Supported F: xen/arch/x86/cpu/mcheck/ -- 1.7.12.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 01 22:33:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 01 Nov 2012 22:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU3KA-0001jq-Ow; Thu, 01 Nov 2012 22:33:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU2U4-0000HA-8U for xen-devel@lists.xen.org; Thu, 01 Nov 2012 21:39:28 +0000 Received: from [85.158.139.211:6924] by server-16.bemta-5.messagelabs.com id F6/6F-04786-F0CE2905; Thu, 01 Nov 2012 21:39:27 +0000 X-Env-Sender: osp@andrep.de X-Msg-Ref: server-5.tower-206.messagelabs.com!1351805953!18487074!1 X-Originating-IP: [217.160.17.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27982 invoked from network); 1 Nov 2012 21:39:16 -0000 Received: from s15333296.onlinehome-server.info (HELO s15333296.onlinehome-server.info) (217.160.17.100) by server-5.tower-206.messagelabs.com with SMTP; 1 Nov 2012 21:39:16 -0000 Received: from localhost.localdomain (g227155030.adsl.alicedsl.de [92.227.155.30]) by s15333296.onlinehome-server.info (Postfix) with ESMTPSA id 96C1F84080A9; Thu, 1 Nov 2012 22:39:12 +0100 (CET) From: Andre Przywara To: Ian.Jackson@eu.citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, keir@xen.org, jbeulich@suse.com Date: Thu, 1 Nov 2012 22:40:57 +0100 Message-Id: <1351806057-3167-1-git-send-email-osp@andrep.de> X-Mailer: git-send-email 1.7.1 X-Mailman-Approved-At: Thu, 01 Nov 2012 22:33:18 +0000 Cc: Andre Przywara , boris.ostrovsky@amd.com, wei.huang2@amd.com, Christoph_Egger@gmx.de, xen-devel@lists.xen.org, weiwang.dd@gmail.com Subject: [Xen-devel] [PATCH] update MAINTAINERS file X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org There have been some "organizational changes" within AMD. Update the MAINTAINERS file accordingly. Please also feel free to use the new email addresses if there are any inquires related to code authored by Wei Wang, Christoph Egger or Andre Przywara. Signed-off-by: Andre Przywara Acked-by: Wei Wang Acked-by: Boris Ostrovsky Acked-by: Wei Huang Acked-by: Christoph Egger --- MAINTAINERS | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2d8517b..1c595f4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -78,7 +78,6 @@ Maintainers List (try to look for most precise areas first) ACPI & POWER MANAGEMENT M: Winston Wang M: Gang Wei -M: Mark Langsdorf M: Jan Beulich S: Supported F: xen/arch/x86/acpi/ @@ -86,13 +85,15 @@ F: xen/drivers/acpi/ F: xen/drivers/cpufreq/ AMD IOMMU -M: Wei Wang -S: Supported +M: Wei Wang +M: Wei Huang +S: Maintained F: xen/drivers/passthrough/amd/ AMD SVM -M: Andre Przywara -M: Christoph Egger +M: Andre Przywara +M: Christoph Egger +M: Boris Ostrovsky M: Wei Huang S: Supported F: xen/arch/x86/hvm/svm/ @@ -170,7 +171,7 @@ S: Supported T: hg http://xenbits.xen.org/XCP/linux-2.6.*.pq.hg MACHINE CHECK (MCA) & RAS -M: Christoph Egger +M: Christoph Egger M: Yunhong Jiang S: Supported F: xen/arch/x86/cpu/mcheck/ -- 1.7.12.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 02:03:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 02:03:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU6aZ-0004ac-Pq; Fri, 02 Nov 2012 02:02:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU6aX-0004aX-GJ for xen-devel@lists.xen.org; Fri, 02 Nov 2012 02:02:25 +0000 Received: from [85.158.138.51:3029] by server-16.bemta-3.messagelabs.com id 25/5C-07461-0B923905; Fri, 02 Nov 2012 02:02:24 +0000 X-Env-Sender: avs.009@gmail.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1351821742!28315198!1 X-Originating-IP: [209.85.219.45] X-SpamReason: No, hits=0.6 required=7.0 tests=HTML_60_70,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23988 invoked from network); 2 Nov 2012 02:02:23 -0000 Received: from mail-oa0-f45.google.com (HELO mail-oa0-f45.google.com) (209.85.219.45) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 02:02:23 -0000 Received: by mail-oa0-f45.google.com with SMTP id i18so3890001oag.32 for ; Thu, 01 Nov 2012 19:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=euLS2+qA5ai/9UOYf3kvq1voWKYL0OGF8loDxPN3YNs=; b=GSj2Wbmk8wH8DtMQh7NfJuXGyqMpWHpyscjCV/m4By3ka+D2IXBPK7Lw7L5nvzr1jN 4wrLck4WRVG2A71ma/e7901c6ujFNyRzRc5dM8I0TGSXl5ZHk8lDd+6i9im4WDoU0gQT E/76eImOmncgx5YL2YVQnVqaVqjz1zgDw/o6/Mq09Jgwj92W7E30o7TqAksTzhsVFp+m mpKckwza/qdJT1ulGrtxMRTNtvpD2WIOFf7HUIC+3Zj5AdYk/qKx2G3CpGNqGqWroNIY zeQqJBfAUtsMw2fB0XYAfaRBWtvAOlwuG7h+8lY30BINNmIEJVuNZyQoQUEHsRgT7DRi nEJQ== MIME-Version: 1.0 Received: by 10.182.1.72 with SMTP id 8mr195299obk.61.1351821742297; Thu, 01 Nov 2012 19:02:22 -0700 (PDT) Received: by 10.60.161.233 with HTTP; Thu, 1 Nov 2012 19:02:22 -0700 (PDT) In-Reply-To: <383bffd3-c605-449a-8ff3-35eee4e75b48@default> References: <383bffd3-c605-449a-8ff3-35eee4e75b48@default> Date: Fri, 2 Nov 2012 00:02:22 -0200 Message-ID: From: Allan Scheid To: Daniel Kiper Cc: xen-devel@lists.xen.org, JBeulich@suse.com, konrad.wilk@oracle.com Subject: Re: [Xen-devel] Xen 4.2 with EFI on IBM x3650 ACPI Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8408456622164461522==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8408456622164461522== Content-Type: multipart/alternative; boundary=f46d04462fe0bfd2b604cd7986c2 --f46d04462fe0bfd2b604cd7986c2 Content-Type: text/plain; charset=ISO-8859-1 Yes, i typed the e-mail too fast, and not read correct email from Konrad! 2012/10/23 Daniel Kiper > Hi, > > > Thank's Jan and Daniel, i am using now > > I think that you meant Konrad because I did not help a lot. > > [...] > > Daniel * * 2012/10/23 Daniel Kiper > Hi, > > > Thank's Jan and Daniel, i am using now > > I think that you meant Konrad because I did not help a lot. > > [...] > > Daniel --f46d04462fe0bfd2b604cd7986c2 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Yes, i typed the e-mail too fast, and not read correct email from Konrad!
2012/10/23 Daniel Kiper=A0<daniel.k= iper@oracle.com>
Hi,

> Thank's Jan and Dani= el, i am using now

I think that you meant Konrad because I did not help a lot.
[...]

Daniel=


2012/10/23 Daniel Kipe= r <daniel.kiper@oracle.com>
Hi,

> Thank's Jan and Daniel, i am using now

I think that you meant Konrad because I did not help a lot.

[...]

Daniel
--f46d04462fe0bfd2b604cd7986c2-- --===============8408456622164461522== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8408456622164461522==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 02:03:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 02:03:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU6aZ-0004ac-Pq; Fri, 02 Nov 2012 02:02:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU6aX-0004aX-GJ for xen-devel@lists.xen.org; Fri, 02 Nov 2012 02:02:25 +0000 Received: from [85.158.138.51:3029] by server-16.bemta-3.messagelabs.com id 25/5C-07461-0B923905; Fri, 02 Nov 2012 02:02:24 +0000 X-Env-Sender: avs.009@gmail.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1351821742!28315198!1 X-Originating-IP: [209.85.219.45] X-SpamReason: No, hits=0.6 required=7.0 tests=HTML_60_70,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23988 invoked from network); 2 Nov 2012 02:02:23 -0000 Received: from mail-oa0-f45.google.com (HELO mail-oa0-f45.google.com) (209.85.219.45) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 02:02:23 -0000 Received: by mail-oa0-f45.google.com with SMTP id i18so3890001oag.32 for ; Thu, 01 Nov 2012 19:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=euLS2+qA5ai/9UOYf3kvq1voWKYL0OGF8loDxPN3YNs=; b=GSj2Wbmk8wH8DtMQh7NfJuXGyqMpWHpyscjCV/m4By3ka+D2IXBPK7Lw7L5nvzr1jN 4wrLck4WRVG2A71ma/e7901c6ujFNyRzRc5dM8I0TGSXl5ZHk8lDd+6i9im4WDoU0gQT E/76eImOmncgx5YL2YVQnVqaVqjz1zgDw/o6/Mq09Jgwj92W7E30o7TqAksTzhsVFp+m mpKckwza/qdJT1ulGrtxMRTNtvpD2WIOFf7HUIC+3Zj5AdYk/qKx2G3CpGNqGqWroNIY zeQqJBfAUtsMw2fB0XYAfaRBWtvAOlwuG7h+8lY30BINNmIEJVuNZyQoQUEHsRgT7DRi nEJQ== MIME-Version: 1.0 Received: by 10.182.1.72 with SMTP id 8mr195299obk.61.1351821742297; Thu, 01 Nov 2012 19:02:22 -0700 (PDT) Received: by 10.60.161.233 with HTTP; Thu, 1 Nov 2012 19:02:22 -0700 (PDT) In-Reply-To: <383bffd3-c605-449a-8ff3-35eee4e75b48@default> References: <383bffd3-c605-449a-8ff3-35eee4e75b48@default> Date: Fri, 2 Nov 2012 00:02:22 -0200 Message-ID: From: Allan Scheid To: Daniel Kiper Cc: xen-devel@lists.xen.org, JBeulich@suse.com, konrad.wilk@oracle.com Subject: Re: [Xen-devel] Xen 4.2 with EFI on IBM x3650 ACPI Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8408456622164461522==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8408456622164461522== Content-Type: multipart/alternative; boundary=f46d04462fe0bfd2b604cd7986c2 --f46d04462fe0bfd2b604cd7986c2 Content-Type: text/plain; charset=ISO-8859-1 Yes, i typed the e-mail too fast, and not read correct email from Konrad! 2012/10/23 Daniel Kiper > Hi, > > > Thank's Jan and Daniel, i am using now > > I think that you meant Konrad because I did not help a lot. > > [...] > > Daniel * * 2012/10/23 Daniel Kiper > Hi, > > > Thank's Jan and Daniel, i am using now > > I think that you meant Konrad because I did not help a lot. > > [...] > > Daniel --f46d04462fe0bfd2b604cd7986c2 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Yes, i typed the e-mail too fast, and not read correct email from Konrad!
2012/10/23 Daniel Kiper=A0<daniel.k= iper@oracle.com>
Hi,

> Thank's Jan and Dani= el, i am using now

I think that you meant Konrad because I did not help a lot.
[...]

Daniel=


2012/10/23 Daniel Kipe= r <daniel.kiper@oracle.com>
Hi,

> Thank's Jan and Daniel, i am using now

I think that you meant Konrad because I did not help a lot.

[...]

Daniel
--f46d04462fe0bfd2b604cd7986c2-- --===============8408456622164461522== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8408456622164461522==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 05:05:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 05:05:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU9R5-0000D5-Rb; Fri, 02 Nov 2012 05:04:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU9R4-0000D0-9u for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 05:04:50 +0000 Received: from [85.158.139.211:4883] by server-8.bemta-5.messagelabs.com id CA/12-06050-17453905; Fri, 02 Nov 2012 05:04:49 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1351832688!18527627!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5MzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24928 invoked from network); 2 Nov 2012 05:04:48 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 05:04:48 -0000 X-IronPort-AV: E=Sophos;i="4.80,696,1344211200"; d="scan'208";a="15549384" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 05:04:47 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 05:04:47 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU9R1-0000Nt-9x; Fri, 02 Nov 2012 05:04:47 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU9R1-00070H-8v; Fri, 02 Nov 2012 05:04:47 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 05:04:47 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14332: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14332 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14332/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-i386-i386-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 651d965ee2c0 baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.2-testing + revision=651d965ee2c0 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.2-testing 651d965ee2c0 + branch=xen-4.2-testing + revision=651d965ee2c0 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.2-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.2-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git ++ : daily-cron.xen-4.2-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.2-testing.git + info_linux_tree xen-4.2-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.2-testing.hg + hg push -r 651d965ee2c0 ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 30 changesets with 53 changes to 45 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 05:05:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 05:05:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU9R5-0000D5-Rb; Fri, 02 Nov 2012 05:04:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TU9R4-0000D0-9u for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 05:04:50 +0000 Received: from [85.158.139.211:4883] by server-8.bemta-5.messagelabs.com id CA/12-06050-17453905; Fri, 02 Nov 2012 05:04:49 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1351832688!18527627!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5MzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24928 invoked from network); 2 Nov 2012 05:04:48 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 05:04:48 -0000 X-IronPort-AV: E=Sophos;i="4.80,696,1344211200"; d="scan'208";a="15549384" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 05:04:47 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 05:04:47 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TU9R1-0000Nt-9x; Fri, 02 Nov 2012 05:04:47 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TU9R1-00070H-8v; Fri, 02 Nov 2012 05:04:47 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 05:04:47 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14332: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14332 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14332/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail REGR. vs. 14076 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail REGR. vs. 14076 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-i386-i386-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 651d965ee2c0 baseline version: xen 40ccbee890e1 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Bastian Blank Chuang Cao George Dunlap Ian Campbell Ian Jackson Jan Beulich Jason McCarver Joe Jin Keir Fraser Matt Wilson Matthew Fioravante Olaf Hering Roger Pau Monne Sander Eikelenboom Stefano Stabellini ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.2-testing + revision=651d965ee2c0 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.2-testing 651d965ee2c0 + branch=xen-4.2-testing + revision=651d965ee2c0 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.2-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.2-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git ++ : daily-cron.xen-4.2-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.2-testing.git + info_linux_tree xen-4.2-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.2-testing.hg + hg push -r 651d965ee2c0 ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 30 changesets with 53 changes to 45 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 06:23:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 06:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUAdt-00031D-52; Fri, 02 Nov 2012 06:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUAdr-000318-MW for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 06:22:07 +0000 Received: from [85.158.143.99:58249] by server-2.bemta-4.messagelabs.com id E5/56-28922-E8663905; Fri, 02 Nov 2012 06:22:06 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351837326!27755180!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5MzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25843 invoked from network); 2 Nov 2012 06:22:06 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 06:22:06 -0000 X-IronPort-AV: E=Sophos;i="4.80,696,1344211200"; d="scan'208";a="15549840" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 06:07:04 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 06:07:03 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUAPH-0000jP-Ku; Fri, 02 Nov 2012 06:07:03 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUAPH-0007O4-Hd; Fri, 02 Nov 2012 06:07:03 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 06:07:03 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14337: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14337 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14337/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14289 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14289 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14289 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14289 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bf249cd5f2c1 baseline version: xen bf249cd5f2c1 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 06:23:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 06:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUAdt-00031D-52; Fri, 02 Nov 2012 06:22:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUAdr-000318-MW for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 06:22:07 +0000 Received: from [85.158.143.99:58249] by server-2.bemta-4.messagelabs.com id E5/56-28922-E8663905; Fri, 02 Nov 2012 06:22:06 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351837326!27755180!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5MzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25843 invoked from network); 2 Nov 2012 06:22:06 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 06:22:06 -0000 X-IronPort-AV: E=Sophos;i="4.80,696,1344211200"; d="scan'208";a="15549840" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 06:07:04 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 06:07:03 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUAPH-0000jP-Ku; Fri, 02 Nov 2012 06:07:03 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUAPH-0007O4-Hd; Fri, 02 Nov 2012 06:07:03 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 06:07:03 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14337: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14337 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14337/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14289 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14289 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14289 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14289 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bf249cd5f2c1 baseline version: xen bf249cd5f2c1 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 08:19:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:19:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCSc-0005ik-9c; Fri, 02 Nov 2012 08:18:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCSZ-0005ic-MY for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 08:18:36 +0000 Received: from [85.158.137.99:49773] by server-9.bemta-3.messagelabs.com id 4B/E9-02388-6D183905; Fri, 02 Nov 2012 08:18:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1351844309!12684597!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18852 invoked from network); 2 Nov 2012 08:18:30 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-217.messagelabs.com with SMTP; 2 Nov 2012 08:18:30 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:18:29 +0000 Message-Id: <5093900B02000078000A5F29@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:19:07 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> <20121101220520.GC18854@localhost.localdomain> In-Reply-To: <20121101220520.GC18854@localhost.localdomain> Mime-Version: 1.0 Content-Disposition: inline Cc: jeremy@goop.org, xen-devel@lists.xensource.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, rientjes@google.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 01.11.12 at 23:05, Konrad Rzeszutek Wilk wrote: > On Thu, Nov 01, 2012 at 08:04:58PM +0000, Jan Beulich wrote: >> >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> >> >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: >> >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no >> >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() >> >> resulting in the following link error: >> >> >> >> drivers/built-in.o: In function `dbgp_reset_prep': >> >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' >> >> drivers/built-in.o: In function `dbgp_external_startup': >> >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' >> > >> >There is another patch that needs to be Acked and picked up by >> >Greg KH that fixes this. >> > >> >Let me poke Jan Beulich to repost it with the appropiate Acks. >> >> It's been picked up already, but another dependency problem was found with >> it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had >> first submitted). > > Oh. I missed that part - so do you think that this patch should also > be used? Or do you think there is another way to fix this? > > I am in transit right now so I can't prep a patch (and the laptop I've > is extremely slow to even do a test compile). Alan and I settled on relaxing the condition in ehci-dbgp.c to IS_ENABLED(USB). But it's not clear to me if I should send an incremental patch or a replacement one (neither he nor Greg answered my respective inquiry). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 08:19:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:19:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCSc-0005ik-9c; Fri, 02 Nov 2012 08:18:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCSZ-0005ic-MY for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 08:18:36 +0000 Received: from [85.158.137.99:49773] by server-9.bemta-3.messagelabs.com id 4B/E9-02388-6D183905; Fri, 02 Nov 2012 08:18:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1351844309!12684597!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18852 invoked from network); 2 Nov 2012 08:18:30 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-217.messagelabs.com with SMTP; 2 Nov 2012 08:18:30 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:18:29 +0000 Message-Id: <5093900B02000078000A5F29@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:19:07 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <20121101124912.GA10743@localhost.localdomain> <5092D5EA020000780008EB85@nat28.tlf.novell.com> <20121101220520.GC18854@localhost.localdomain> In-Reply-To: <20121101220520.GC18854@localhost.localdomain> Mime-Version: 1.0 Content-Disposition: inline Cc: jeremy@goop.org, xen-devel@lists.xensource.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, mingo@redhat.com, rientjes@google.com, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: [Xen-devel] [patch] x86, xen: fix build dependency when USB_SUPPORT is not enabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 01.11.12 at 23:05, Konrad Rzeszutek Wilk wrote: > On Thu, Nov 01, 2012 at 08:04:58PM +0000, Jan Beulich wrote: >> >>> Konrad Rzeszutek Wilk 11/01/12 1:49 PM >>> >> >On Wed, Oct 31, 2012 at 10:42:30PM -0700, David Rientjes wrote: >> >> CONFIG_XEN_DOM0 must depend on CONFIG_USB_SUPPORT, otherwise there is no >> >> definition of xen_dbgp_reset_prep() and xen_dbgp_external_startup() >> >> resulting in the following link error: >> >> >> >> drivers/built-in.o: In function `dbgp_reset_prep': >> >> (.text+0x1e03c5): undefined reference to `xen_dbgp_reset_prep' >> >> drivers/built-in.o: In function `dbgp_external_startup': >> >> (.text+0x1e0d55): undefined reference to `xen_dbgp_external_startup' >> > >> >There is another patch that needs to be Acked and picked up by >> >Greg KH that fixes this. >> > >> >Let me poke Jan Beulich to repost it with the appropiate Acks. >> >> It's been picked up already, but another dependency problem was found with >> it (due to not having used CONFIG_USB_SUPPORT as dependency, as I had >> first submitted). > > Oh. I missed that part - so do you think that this patch should also > be used? Or do you think there is another way to fix this? > > I am in transit right now so I can't prep a patch (and the laptop I've > is extremely slow to even do a test compile). Alan and I settled on relaxing the condition in ehci-dbgp.c to IS_ENABLED(USB). But it's not clear to me if I should send an incremental patch or a replacement one (neither he nor Greg answered my respective inquiry). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 08:38:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:38:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUClq-0006BT-4c; Fri, 02 Nov 2012 08:38:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUClp-0006BO-75 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 08:38:29 +0000 Received: from [85.158.143.99:55205] by server-3.bemta-4.messagelabs.com id 72/69-06841-48683905; Fri, 02 Nov 2012 08:38:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1351845507!21944129!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25263 invoked from network); 2 Nov 2012 08:38:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-216.messagelabs.com with SMTP; 2 Nov 2012 08:38:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:37:28 +0000 Message-Id: <5093947F02000078000A5F42@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:38:07 +0000 From: "Jan Beulich" To: , "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part52639C7F.2__=" Cc: Randy Dunlap , xen-devel , stern@rowland.harvard.edu, linux-usb@vger.kernel.org, Stefano Stabellini Subject: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part52639C7F.2__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since there's no possible caller of dbgp_external_startup() and dbgp_reset_prep() when !USB, there's no point in building and exporting these functions in that case. This eliminates a build error under the conditions listed in the subject, introduced with the merge f1c6872e4980bc4078cfaead05f892b3d78dea64. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Cc: Alan Stern Cc: Stefano Stabellini --- (incremental patch attached, in case that one is preferred) v3: Relax condition from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. v2: Switch the dependency from USB_SUPPORT to USB_EHCI_HCD as requested by Alan (albeit I don't really agree to that change). --- drivers/usb/early/ehci-dbgp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- 3.7-rc3/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3-ehci-dbgp-early-xen-no-usb/drivers/usb/early/ehci-dbgp.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -614,12 +615,6 @@ err: return -ENODEV; } =20 -int dbgp_external_startup(struct usb_hcd *hcd) -{ - return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); -} -EXPORT_SYMBOL_GPL(dbgp_external_startup); - static int ehci_reset_port(int port) { u32 portsc; @@ -979,6 +974,7 @@ struct console early_dbgp_console =3D { .index =3D -1, }; =20 +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret =3D xen_dbgp_reset_prep(hcd); @@ -1007,6 +1003,13 @@ int dbgp_reset_prep(struct usb_hcd *hcd) } EXPORT_SYMBOL_GPL(dbgp_reset_prep); =20 +int dbgp_external_startup(struct usb_hcd *hcd) +{ + return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); +} +EXPORT_SYMBOL_GPL(dbgp_external_startup); +#endif /* USB */ + #ifdef CONFIG_KGDB =20 static char kgdbdbgp_buf[DBGP_MAX_PACKET]; --=__Part52639C7F.2__= Content-Type: text/plain; name="linux-3.7-rc3-ehci-dbgp-early-xen-no-usb-v3-incremental.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-ehci-dbgp-early-xen-no-usb-v3-incremental.patch" fix build of EHCI debug port code when USB_CHIPIDEA but not USB_EHCI_HCD=0A= =0ARelax condition of building the reset interface stubs in=0Adrivers/usb/e= arly/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also=0Acover the = chipidea driver re-using code from ehci-hcd.=0A=0AReported-by: Randy = Dunlap =0ASigned-off-by: Jan Beulich =0ACc: Alan Stern =0ACc: Stefano Stabellini = =0A=0A---=0A drivers/usb/early/ehci-dbgp.= c | 4 ++--=0A 1 file changed, 2 insertions(+), 2 deletions(-)=0A=0A= --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c=0A+++ 3.7-rc3/drivers/usb/ea= rly/ehci-dbgp.c=0A@@ -974,7 +974,7 @@ struct console early_dbgp_console = =3D {=0A .index =3D -1,=0A };=0A =0A-#if IS_ENABLED(CONFIG_USB_= EHCI_HCD)=0A+#if IS_ENABLED(CONFIG_USB)=0A int dbgp_reset_prep(struct = usb_hcd *hcd)=0A {=0A int ret =3D xen_dbgp_reset_prep(hcd);=0A@@ -1008,7 = +1008,7 @@ int dbgp_external_startup(struct usb_hcd=0A return xen_dbgp_ext= ernal_startup(hcd) ?: _dbgp_external_startup();=0A }=0A EXPORT_SYMBOL_GPL(d= bgp_external_startup);=0A-#endif /* USB_EHCI_HCD */=0A+#endif /* USB */=0A = =0A #ifdef CONFIG_KGDB=0A =0A --=__Part52639C7F.2__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part52639C7F.2__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 08:38:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:38:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUClq-0006BT-4c; Fri, 02 Nov 2012 08:38:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUClp-0006BO-75 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 08:38:29 +0000 Received: from [85.158.143.99:55205] by server-3.bemta-4.messagelabs.com id 72/69-06841-48683905; Fri, 02 Nov 2012 08:38:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1351845507!21944129!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25263 invoked from network); 2 Nov 2012 08:38:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-216.messagelabs.com with SMTP; 2 Nov 2012 08:38:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:37:28 +0000 Message-Id: <5093947F02000078000A5F42@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:38:07 +0000 From: "Jan Beulich" To: , "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part52639C7F.2__=" Cc: Randy Dunlap , xen-devel , stern@rowland.harvard.edu, linux-usb@vger.kernel.org, Stefano Stabellini Subject: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part52639C7F.2__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since there's no possible caller of dbgp_external_startup() and dbgp_reset_prep() when !USB, there's no point in building and exporting these functions in that case. This eliminates a build error under the conditions listed in the subject, introduced with the merge f1c6872e4980bc4078cfaead05f892b3d78dea64. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Cc: Alan Stern Cc: Stefano Stabellini --- (incremental patch attached, in case that one is preferred) v3: Relax condition from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. v2: Switch the dependency from USB_SUPPORT to USB_EHCI_HCD as requested by Alan (albeit I don't really agree to that change). --- drivers/usb/early/ehci-dbgp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- 3.7-rc3/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3-ehci-dbgp-early-xen-no-usb/drivers/usb/early/ehci-dbgp.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -614,12 +615,6 @@ err: return -ENODEV; } =20 -int dbgp_external_startup(struct usb_hcd *hcd) -{ - return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); -} -EXPORT_SYMBOL_GPL(dbgp_external_startup); - static int ehci_reset_port(int port) { u32 portsc; @@ -979,6 +974,7 @@ struct console early_dbgp_console =3D { .index =3D -1, }; =20 +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret =3D xen_dbgp_reset_prep(hcd); @@ -1007,6 +1003,13 @@ int dbgp_reset_prep(struct usb_hcd *hcd) } EXPORT_SYMBOL_GPL(dbgp_reset_prep); =20 +int dbgp_external_startup(struct usb_hcd *hcd) +{ + return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); +} +EXPORT_SYMBOL_GPL(dbgp_external_startup); +#endif /* USB */ + #ifdef CONFIG_KGDB =20 static char kgdbdbgp_buf[DBGP_MAX_PACKET]; --=__Part52639C7F.2__= Content-Type: text/plain; name="linux-3.7-rc3-ehci-dbgp-early-xen-no-usb-v3-incremental.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-ehci-dbgp-early-xen-no-usb-v3-incremental.patch" fix build of EHCI debug port code when USB_CHIPIDEA but not USB_EHCI_HCD=0A= =0ARelax condition of building the reset interface stubs in=0Adrivers/usb/e= arly/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also=0Acover the = chipidea driver re-using code from ehci-hcd.=0A=0AReported-by: Randy = Dunlap =0ASigned-off-by: Jan Beulich =0ACc: Alan Stern =0ACc: Stefano Stabellini = =0A=0A---=0A drivers/usb/early/ehci-dbgp.= c | 4 ++--=0A 1 file changed, 2 insertions(+), 2 deletions(-)=0A=0A= --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c=0A+++ 3.7-rc3/drivers/usb/ea= rly/ehci-dbgp.c=0A@@ -974,7 +974,7 @@ struct console early_dbgp_console = =3D {=0A .index =3D -1,=0A };=0A =0A-#if IS_ENABLED(CONFIG_USB_= EHCI_HCD)=0A+#if IS_ENABLED(CONFIG_USB)=0A int dbgp_reset_prep(struct = usb_hcd *hcd)=0A {=0A int ret =3D xen_dbgp_reset_prep(hcd);=0A@@ -1008,7 = +1008,7 @@ int dbgp_external_startup(struct usb_hcd=0A return xen_dbgp_ext= ernal_startup(hcd) ?: _dbgp_external_startup();=0A }=0A EXPORT_SYMBOL_GPL(d= bgp_external_startup);=0A-#endif /* USB_EHCI_HCD */=0A+#endif /* USB */=0A = =0A #ifdef CONFIG_KGDB=0A =0A --=__Part52639C7F.2__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part52639C7F.2__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 08:41:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:41:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCo8-0006Iv-NP; Fri, 02 Nov 2012 08:40:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCo7-0006Hg-11 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 08:40:51 +0000 Received: from [85.158.139.83:54546] by server-12.bemta-5.messagelabs.com id 90/4D-02886-21783905; Fri, 02 Nov 2012 08:40:50 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351845649!23825634!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2418 invoked from network); 2 Nov 2012 08:40:49 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-182.messagelabs.com with SMTP; 2 Nov 2012 08:40:49 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:40:49 +0000 Message-Id: <5093954902000078000A5F45@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:41:29 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> In-Reply-To: <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 01.11.12 at 21:55, Dan Magenheimer wrote: >> >when prototyping the "claim" hypercall/subop, can I assume >> >that the CONFIG_X86 code in the hypervisor and, specifically >> >any separation of the concepts of xen_heap from dom_heap, >> >can be ignored? >> >> No, you shouldn't. Once adding support for memory amounts beyond 5Tb >> I expect the separation to become meaningful even for x86-64. > > On quick scan, I don't see anything obvious in the archives > that explains why 5Tb is the limit (rather than, say, 4Tb > or 8Tb, or some other power of two). Could you provide a > pointer to this info or, if you agree it is non-obvious and > undocumented, say a few words of explanation? xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment preceding all those #define-s). > Also, just wondering, should exceeding 5Tb be on the 4.3 > features list or is >5Tb physical memory still too far away? It _is_ on the feature list. So far I just had way too many other issues to deal with, preventing me to get started with that work. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 08:41:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 08:41:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCo8-0006Iv-NP; Fri, 02 Nov 2012 08:40:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUCo7-0006Hg-11 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 08:40:51 +0000 Received: from [85.158.139.83:54546] by server-12.bemta-5.messagelabs.com id 90/4D-02886-21783905; Fri, 02 Nov 2012 08:40:50 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351845649!23825634!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2418 invoked from network); 2 Nov 2012 08:40:49 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-182.messagelabs.com with SMTP; 2 Nov 2012 08:40:49 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 08:40:49 +0000 Message-Id: <5093954902000078000A5F45@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 08:41:29 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> In-Reply-To: <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 01.11.12 at 21:55, Dan Magenheimer wrote: >> >when prototyping the "claim" hypercall/subop, can I assume >> >that the CONFIG_X86 code in the hypervisor and, specifically >> >any separation of the concepts of xen_heap from dom_heap, >> >can be ignored? >> >> No, you shouldn't. Once adding support for memory amounts beyond 5Tb >> I expect the separation to become meaningful even for x86-64. > > On quick scan, I don't see anything obvious in the archives > that explains why 5Tb is the limit (rather than, say, 4Tb > or 8Tb, or some other power of two). Could you provide a > pointer to this info or, if you agree it is non-obvious and > undocumented, say a few words of explanation? xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment preceding all those #define-s). > Also, just wondering, should exceeding 5Tb be on the 4.3 > features list or is >5Tb physical memory still too far away? It _is_ on the feature list. So far I just had way too many other issues to deal with, preventing me to get started with that work. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:01:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:01:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUD7x-0006wT-ST; Fri, 02 Nov 2012 09:01:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUD7w-0006wI-Ly for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:01:20 +0000 Received: from [85.158.143.99:35785] by server-1.bemta-4.messagelabs.com id 00/71-27934-0EB83905; Fri, 02 Nov 2012 09:01:20 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1351846879!23088542!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16140 invoked from network); 2 Nov 2012 09:01:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-216.messagelabs.com with SMTP; 2 Nov 2012 09:01:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 09:01:18 +0000 Message-Id: <50939A1502000078000A5F61@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 09:01:57 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> <509008A502000078000A584E@nat28.tlf.novell.com> <5090EBFE02000078000A59DD@nat28.tlf.novell.com> <83bb902d-8e49-41cf-ad1e-c07c62d6e5f8@default> <50915DA702000078000A5C75@nat28.tlf.novell.com> <5a1fef58-be52-464d-8f86-b65dffb32431@default> In-Reply-To: <5a1fef58-be52-464d-8f86-b65dffb32431@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , "Keir\(Xen.org\)" , IanCampbell , Konrad Wilk , GeorgeDunlap , IanJackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 31.10.12 at 17:51, Dan Magenheimer wrote: > To look at it another way, the code in alloc_heap_page() > contained within the loop: > > for ( i = 0; i < (1 << order); i++ ) > > may be already unacceptable, even _after_ the patch, if > order==26 (a fictional page size just for this illustration) > because the heap_lock will be held for a very very long time. > (In fact for order==20, 1GB pages, it could already be a > problem.) A million iterations doing just a few memory reads and writes (not even atomic ones afaics) doesn't sound that bad. And order-18 allocations (which is what 1Gb pages really amount to) are the biggest ever happening (post-boot, if that matters). You'll get much worse behavior if these large order allocations fail, and the callers have to fall back to smaller ones. Plus, if necessary, that loop could be broken up so that only the initial part of it gets run with the lock held (see c/s 22135:69e8bb164683 for why the unlock was moved past the loop). That would make for a shorter lock hold time, but for a higher allocation latency on large oder allocations (due to worse cache locality). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:01:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:01:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUD7x-0006wT-ST; Fri, 02 Nov 2012 09:01:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUD7w-0006wI-Ly for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:01:20 +0000 Received: from [85.158.143.99:35785] by server-1.bemta-4.messagelabs.com id 00/71-27934-0EB83905; Fri, 02 Nov 2012 09:01:20 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1351846879!23088542!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5NjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16140 invoked from network); 2 Nov 2012 09:01:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-216.messagelabs.com with SMTP; 2 Nov 2012 09:01:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 09:01:18 +0000 Message-Id: <50939A1502000078000A5F61@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 09:01:57 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> <509008A502000078000A584E@nat28.tlf.novell.com> <5090EBFE02000078000A59DD@nat28.tlf.novell.com> <83bb902d-8e49-41cf-ad1e-c07c62d6e5f8@default> <50915DA702000078000A5C75@nat28.tlf.novell.com> <5a1fef58-be52-464d-8f86-b65dffb32431@default> In-Reply-To: <5a1fef58-be52-464d-8f86-b65dffb32431@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , "Keir\(Xen.org\)" , IanCampbell , Konrad Wilk , GeorgeDunlap , IanJackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 31.10.12 at 17:51, Dan Magenheimer wrote: > To look at it another way, the code in alloc_heap_page() > contained within the loop: > > for ( i = 0; i < (1 << order); i++ ) > > may be already unacceptable, even _after_ the patch, if > order==26 (a fictional page size just for this illustration) > because the heap_lock will be held for a very very long time. > (In fact for order==20, 1GB pages, it could already be a > problem.) A million iterations doing just a few memory reads and writes (not even atomic ones afaics) doesn't sound that bad. And order-18 allocations (which is what 1Gb pages really amount to) are the biggest ever happening (post-boot, if that matters). You'll get much worse behavior if these large order allocations fail, and the callers have to fall back to smaller ones. Plus, if necessary, that loop could be broken up so that only the initial part of it gets run with the lock held (see c/s 22135:69e8bb164683 for why the unlock was moved past the loop). That would make for a shorter lock hold time, but for a higher allocation latency on large oder allocations (due to worse cache locality). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:30:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:30:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDa4-0007Wf-JG; Fri, 02 Nov 2012 09:30:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDa2-0007WW-V6 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:30:23 +0000 Received: from [85.158.138.51:9633] by server-2.bemta-3.messagelabs.com id 12/32-04744-DA293905; Fri, 02 Nov 2012 09:30:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1351848620!20466249!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1625 invoked from network); 2 Nov 2012 09:30:21 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 09:30:21 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1899326wey.32 for ; Fri, 02 Nov 2012 02:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=OyBdE3M7tRSBSUzcDLpVQ5QGF0/r8vcFzxNhoM9BNhM=; b=fRjtg8mO+iR0uf9r00VZf2Dl6+yBzvxQ5d8kjxQ3PQmYGQsQIYxgjcs3XP8ty9Rbn8 lJc0dHrfDGqC+MnRuaY/FARsj1dtSMt8xhLjtlHZEUVklaeFdqjUgs9SiQsKbx8mFvdG uZt1qzNwYgdXy4ea30dJgmPzHsZWccP3NaooqSUeyE2m80fnaQAynUBC3QO83U40KPsT qnSVKrDSDZWfb6gtfac3I2jJj89u/Kg0K8MGDUuCCzFRdMXTJ7Gw3lpbFsSogLr8lt3o anWew/9whNjfX9IPjIerBZEtveOtK713e1uTWpuSEdnhYZ5Bl7gHuuiPoehuL3QH0THQ HExQ== Received: by 10.181.11.233 with SMTP id el9mr1027831wid.3.1351848620475; Fri, 02 Nov 2012 02:30:20 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id eq2sm1752083wib.1.2012.11.02.02.30.17 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 02:30:19 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 09:30:14 +0000 From: Keir Fraser To: Jan Beulich , Dan Magenheimer Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac243KmFTd1mEfxoMUOLVRVHmQp3kA== In-Reply-To: <50939A1502000078000A5F61@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 09:01, "Jan Beulich" wrote: > Plus, if necessary, that loop could be broken up so that only the > initial part of it gets run with the lock held (see c/s > 22135:69e8bb164683 for why the unlock was moved past the > loop). That would make for a shorter lock hold time, but for a > higher allocation latency on large oder allocations (due to worse > cache locality). In fact I believe only the first page needs to have its count_info set to != PGC_state_free, while the lock is held. That is sufficient to defeat the buddy merging in free_heap_pages(). Similarly, we could hoist most of the first loop in free_heap_pages() outside the lock. There's a lot of scope for optimisation here. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:30:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:30:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDa4-0007Wf-JG; Fri, 02 Nov 2012 09:30:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDa2-0007WW-V6 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:30:23 +0000 Received: from [85.158.138.51:9633] by server-2.bemta-3.messagelabs.com id 12/32-04744-DA293905; Fri, 02 Nov 2012 09:30:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1351848620!20466249!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1625 invoked from network); 2 Nov 2012 09:30:21 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 09:30:21 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1899326wey.32 for ; Fri, 02 Nov 2012 02:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=OyBdE3M7tRSBSUzcDLpVQ5QGF0/r8vcFzxNhoM9BNhM=; b=fRjtg8mO+iR0uf9r00VZf2Dl6+yBzvxQ5d8kjxQ3PQmYGQsQIYxgjcs3XP8ty9Rbn8 lJc0dHrfDGqC+MnRuaY/FARsj1dtSMt8xhLjtlHZEUVklaeFdqjUgs9SiQsKbx8mFvdG uZt1qzNwYgdXy4ea30dJgmPzHsZWccP3NaooqSUeyE2m80fnaQAynUBC3QO83U40KPsT qnSVKrDSDZWfb6gtfac3I2jJj89u/Kg0K8MGDUuCCzFRdMXTJ7Gw3lpbFsSogLr8lt3o anWew/9whNjfX9IPjIerBZEtveOtK713e1uTWpuSEdnhYZ5Bl7gHuuiPoehuL3QH0THQ HExQ== Received: by 10.181.11.233 with SMTP id el9mr1027831wid.3.1351848620475; Fri, 02 Nov 2012 02:30:20 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id eq2sm1752083wib.1.2012.11.02.02.30.17 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 02:30:19 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 09:30:14 +0000 From: Keir Fraser To: Jan Beulich , Dan Magenheimer Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac243KmFTd1mEfxoMUOLVRVHmQp3kA== In-Reply-To: <50939A1502000078000A5F61@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 09:01, "Jan Beulich" wrote: > Plus, if necessary, that loop could be broken up so that only the > initial part of it gets run with the lock held (see c/s > 22135:69e8bb164683 for why the unlock was moved past the > loop). That would make for a shorter lock hold time, but for a > higher allocation latency on large oder allocations (due to worse > cache locality). In fact I believe only the first page needs to have its count_info set to != PGC_state_free, while the lock is held. That is sufficient to defeat the buddy merging in free_heap_pages(). Similarly, we could hoist most of the first loop in free_heap_pages() outside the lock. There's a lot of scope for optimisation here. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:31:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:31:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDaj-0007gV-0X; Fri, 02 Nov 2012 09:31:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDag-0007gI-N4 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:31:03 +0000 Received: from [85.158.137.99:9058] by server-15.bemta-3.messagelabs.com id 2A/8B-09445-1D293905; Fri, 02 Nov 2012 09:30:57 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-217.messagelabs.com!1351848656!14311557!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18551 invoked from network); 2 Nov 2012 09:30:57 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 09:30:57 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TUDaZ-000K9l-6R; Fri, 02 Nov 2012 09:30:55 +0000 Date: Fri, 2 Nov 2012 09:30:55 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121102093055.GA77212@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:57 -0700 on 01 Nov (1351778261), Dan Magenheimer wrote: > > From: Tim Deegan [mailto:tim@xen.org] > > Subject: Re: [Xen-devel] 32bit xen and "claim" > > > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > > when prototyping the "claim" hypercall/subop, can I assume > > > that the CONFIG_X86 code in the hypervisor and, specifically > > > any separation of the concepts of xen_heap from dom_heap, > > > can be ignored? > > > > > > Or will the ARM version of the hypervisor be requiring > > > a similar separation of xen_heap vs dom_heap? > > > > Yes, 32-bit ARM has this separation. > > Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 > to mean CONFIG-32-bitness then? No. CONFIG_X86 doesn't mean 32-bit, even on x86; it means i386/amd64 as distinct from MIPS/ARM/PPC. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 09:31:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 09:31:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDaj-0007gV-0X; Fri, 02 Nov 2012 09:31:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUDag-0007gI-N4 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 09:31:03 +0000 Received: from [85.158.137.99:9058] by server-15.bemta-3.messagelabs.com id 2A/8B-09445-1D293905; Fri, 02 Nov 2012 09:30:57 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-217.messagelabs.com!1351848656!14311557!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18551 invoked from network); 2 Nov 2012 09:30:57 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 09:30:57 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TUDaZ-000K9l-6R; Fri, 02 Nov 2012 09:30:55 +0000 Date: Fri, 2 Nov 2012 09:30:55 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121102093055.GA77212@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:57 -0700 on 01 Nov (1351778261), Dan Magenheimer wrote: > > From: Tim Deegan [mailto:tim@xen.org] > > Subject: Re: [Xen-devel] 32bit xen and "claim" > > > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > > when prototyping the "claim" hypercall/subop, can I assume > > > that the CONFIG_X86 code in the hypervisor and, specifically > > > any separation of the concepts of xen_heap from dom_heap, > > > can be ignored? > > > > > > Or will the ARM version of the hypervisor be requiring > > > a similar separation of xen_heap vs dom_heap? > > > > Yes, 32-bit ARM has this separation. > > Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 > to mean CONFIG-32-bitness then? No. CONFIG_X86 doesn't mean 32-bit, even on x86; it means i386/amd64 as distinct from MIPS/ARM/PPC. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 10:38:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 10:38:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEdM-0000j9-TY; Fri, 02 Nov 2012 10:37:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEdK-0000j3-Pz for xen-devel@lists.xen.org; Fri, 02 Nov 2012 10:37:50 +0000 Received: from [85.158.137.99:18649] by server-2.bemta-3.messagelabs.com id 4E/58-04744-972A3905; Fri, 02 Nov 2012 10:37:45 +0000 X-Env-Sender: s.munaut@whatever-company.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1351852663!17459401!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6255 invoked from network); 2 Nov 2012 10:37:45 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 10:37:45 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4507674vcb.32 for ; Fri, 02 Nov 2012 03:37:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=kHSRKiEajuw0NhD9kz+wPB5ZzqwalVNqbngar1EY/UM=; b=R1R/l3Y689CE49wJD5b1swBSzbDbTJ55X3Iq0FPNJHUWVwDdw3Ac3sTfYxn+M+tK35 h6gyXIOoJCgpA9y1BBaXtfvP8WsW5pVU8IdrtMvMA21IHraaBtTpYmWRZgdvxfYmQ78r 3u3MUISEg5gzgEW8IxcP8WGozau1cc6wFLD2l1+eVDFHTKesq9X3DRAASltS0CqCYfHX mbbTQZOskiVHbrS4FkrjL52DFuCu75GnLdyLWp0um5IKUw7uLB47pdZSltHJrrKKfG4d tY/LlqJ1y3QoleRZc3rj8/kqTmau084HRpy6R2l4tG9EVbPck9Wf1C4DpmwcCAyIea4Z IXRg== MIME-Version: 1.0 Received: by 10.52.77.101 with SMTP id r5mr1237684vdw.25.1351852663514; Fri, 02 Nov 2012 03:37:43 -0700 (PDT) Received: by 10.220.207.28 with HTTP; Fri, 2 Nov 2012 03:37:43 -0700 (PDT) Date: Fri, 2 Nov 2012 11:37:43 +0100 Message-ID: From: Sylvain Munaut To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQkdWNqv7yOPqTD3aEukceMwVxcyOlNmx3Td/ZWrh5qmt87RSHzThC+ILMhPuIdJkpjyImJH Subject: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I'm using a custom block script in my xen setup and when started, it creates a new device node pointing to some network resources. Now I noticed that the script is called twice for the root block, the first time for pygrub most likely, but is only stopped once ... I don't mind creating two devices node, but then I need to destroy both ... Is this a known issue ? Cheers, Sylvain _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 10:38:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 10:38:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEdM-0000j9-TY; Fri, 02 Nov 2012 10:37:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEdK-0000j3-Pz for xen-devel@lists.xen.org; Fri, 02 Nov 2012 10:37:50 +0000 Received: from [85.158.137.99:18649] by server-2.bemta-3.messagelabs.com id 4E/58-04744-972A3905; Fri, 02 Nov 2012 10:37:45 +0000 X-Env-Sender: s.munaut@whatever-company.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1351852663!17459401!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6255 invoked from network); 2 Nov 2012 10:37:45 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 10:37:45 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4507674vcb.32 for ; Fri, 02 Nov 2012 03:37:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=kHSRKiEajuw0NhD9kz+wPB5ZzqwalVNqbngar1EY/UM=; b=R1R/l3Y689CE49wJD5b1swBSzbDbTJ55X3Iq0FPNJHUWVwDdw3Ac3sTfYxn+M+tK35 h6gyXIOoJCgpA9y1BBaXtfvP8WsW5pVU8IdrtMvMA21IHraaBtTpYmWRZgdvxfYmQ78r 3u3MUISEg5gzgEW8IxcP8WGozau1cc6wFLD2l1+eVDFHTKesq9X3DRAASltS0CqCYfHX mbbTQZOskiVHbrS4FkrjL52DFuCu75GnLdyLWp0um5IKUw7uLB47pdZSltHJrrKKfG4d tY/LlqJ1y3QoleRZc3rj8/kqTmau084HRpy6R2l4tG9EVbPck9Wf1C4DpmwcCAyIea4Z IXRg== MIME-Version: 1.0 Received: by 10.52.77.101 with SMTP id r5mr1237684vdw.25.1351852663514; Fri, 02 Nov 2012 03:37:43 -0700 (PDT) Received: by 10.220.207.28 with HTTP; Fri, 2 Nov 2012 03:37:43 -0700 (PDT) Date: Fri, 2 Nov 2012 11:37:43 +0100 Message-ID: From: Sylvain Munaut To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQkdWNqv7yOPqTD3aEukceMwVxcyOlNmx3Td/ZWrh5qmt87RSHzThC+ILMhPuIdJkpjyImJH Subject: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I'm using a custom block script in my xen setup and when started, it creates a new device node pointing to some network resources. Now I noticed that the script is called twice for the root block, the first time for pygrub most likely, but is only stopped once ... I don't mind creating two devices node, but then I need to destroy both ... Is this a known issue ? Cheers, Sylvain _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 10:51:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 10:51:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEq9-0001J5-VM; Fri, 02 Nov 2012 10:51:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEq8-0001H6-Cb for xen-devel@lists.xen.org; Fri, 02 Nov 2012 10:51:04 +0000 Received: from [85.158.137.99:5536] by server-8.bemta-3.messagelabs.com id DB/52-07786-795A3905; Fri, 02 Nov 2012 10:51:03 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-11.tower-217.messagelabs.com!1351853462!16575354!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27995 invoked from network); 2 Nov 2012 10:51:02 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-11.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 10:51:02 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 8ADA84014B0; Fri, 2 Nov 2012 11:51:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QJ9F8kB6B1C1; Fri, 2 Nov 2012 11:51:02 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id DB29840131D; Fri, 2 Nov 2012 11:51:01 +0100 (CET) Message-ID: <5093A592.1050005@tiscali.it> Date: Fri, 02 Nov 2012 11:50:58 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel , aliguori@us.ibm.com Subject: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============3296776057195519040==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============3296776057195519040== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090302020408070308050004" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms090302020408070308050004 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable I tried to compile and test xen-unstable (changeset 26124:bf249cd5f2c1)=20 with qemu unstable (commit 4ba79505f43bd0ace35c3fe42197eb02e7e0478e) but = failed with this error: hw/xenfb.c: In function =E2xenfb_guest_copy=E2: hw/xenfb.c:651:5: error: implicit declaration of function =E2dpy_update=E2= =20 [-Werror=3Dimplicit-function-declaration] hw/xenfb.c:651:5: error: nested extern declaration of =E2dpy_update=E2=20 [-Werror=3Dnested-externs] hw/xenfb.c: In function =E2xenfb_update=E2: hw/xenfb.c:769:9: error: implicit declaration of function =E2dpy_resize=E2= =20 [-Werror=3Dimplicit-function-declaration] hw/xenfb.c:769:9: error: nested extern declaration of =E2dpy_resize=E2=20 [-Werror=3Dnested-externs] cc1: all warnings being treated as errors make[3]: *** [hw/xenfb.o] Error 1 make[3]: Leaving directory=20 `/mnt/vm/xen/xen-unstable.hg/tools/qemu-xen-dir-remote' make[2]: *** [subdir-all-qemu-xen-dir] Error 2 make[2]: Leaving directory `/mnt/vm/xen/xen-unstable.hg/tools' make[1]: *** [subdirs-install] Error 2 make[1]: Leaving directory `/mnt/vm/xen/xen-unstable.hg/tools' make: *** [install-tools] Error 2 Build of some days ago was working , xenfb seem that need to be adapt=20 for latest vga changes on qemu upstream. --------------ms090302020408070308050004 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjEwNTA1OFowIwYJKoZIhvcNAQkEMRYEFChbRolUmhc1eoM4nyMq30Ju TZDDMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEARNDAI4Gq/+KTTC7iui30Nmvf HYPih+1DWT6fgfFYSkcR20oo5/MGXm2q34H9Xxk+2S0H38rrRlj9Etz5slkwdivG8/jlLvjU SPX5YXu62A/0fnhBWstyzUKHtpNnUS9H7/1aUwXTtnUh+NZgV5InNmVt2c3ryKP/vvwnTl7l qvNHf6Q93DTxn1dQBlAHN2B630s7dKLFjpepen2J+87UTVpXQ8fOEwuzg6ceE4uxwqzwivgp Y8l3JnJN7oyvY3cLqu7AfAXlgQImzLbZ5z9T5kiISiZd3kKW1L6vSGKDsmzTf1Dakv5OIVBj GgpOm0q42J+66WCoQ2wb/apWsI8oXAAAAAAAAA== --------------ms090302020408070308050004-- --===============3296776057195519040== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============3296776057195519040==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 10:51:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 10:51:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEq9-0001J5-VM; Fri, 02 Nov 2012 10:51:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUEq8-0001H6-Cb for xen-devel@lists.xen.org; Fri, 02 Nov 2012 10:51:04 +0000 Received: from [85.158.137.99:5536] by server-8.bemta-3.messagelabs.com id DB/52-07786-795A3905; Fri, 02 Nov 2012 10:51:03 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-11.tower-217.messagelabs.com!1351853462!16575354!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27995 invoked from network); 2 Nov 2012 10:51:02 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-11.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 10:51:02 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 8ADA84014B0; Fri, 2 Nov 2012 11:51:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QJ9F8kB6B1C1; Fri, 2 Nov 2012 11:51:02 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id DB29840131D; Fri, 2 Nov 2012 11:51:01 +0100 (CET) Message-ID: <5093A592.1050005@tiscali.it> Date: Fri, 02 Nov 2012 11:50:58 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel , aliguori@us.ibm.com Subject: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============3296776057195519040==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============3296776057195519040== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090302020408070308050004" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms090302020408070308050004 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable I tried to compile and test xen-unstable (changeset 26124:bf249cd5f2c1)=20 with qemu unstable (commit 4ba79505f43bd0ace35c3fe42197eb02e7e0478e) but = failed with this error: hw/xenfb.c: In function =E2xenfb_guest_copy=E2: hw/xenfb.c:651:5: error: implicit declaration of function =E2dpy_update=E2= =20 [-Werror=3Dimplicit-function-declaration] hw/xenfb.c:651:5: error: nested extern declaration of =E2dpy_update=E2=20 [-Werror=3Dnested-externs] hw/xenfb.c: In function =E2xenfb_update=E2: hw/xenfb.c:769:9: error: implicit declaration of function =E2dpy_resize=E2= =20 [-Werror=3Dimplicit-function-declaration] hw/xenfb.c:769:9: error: nested extern declaration of =E2dpy_resize=E2=20 [-Werror=3Dnested-externs] cc1: all warnings being treated as errors make[3]: *** [hw/xenfb.o] Error 1 make[3]: Leaving directory=20 `/mnt/vm/xen/xen-unstable.hg/tools/qemu-xen-dir-remote' make[2]: *** [subdir-all-qemu-xen-dir] Error 2 make[2]: Leaving directory `/mnt/vm/xen/xen-unstable.hg/tools' make[1]: *** [subdirs-install] Error 2 make[1]: Leaving directory `/mnt/vm/xen/xen-unstable.hg/tools' make: *** [install-tools] Error 2 Build of some days ago was working , xenfb seem that need to be adapt=20 for latest vga changes on qemu upstream. --------------ms090302020408070308050004 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjEwNTA1OFowIwYJKoZIhvcNAQkEMRYEFChbRolUmhc1eoM4nyMq30Ju TZDDMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEARNDAI4Gq/+KTTC7iui30Nmvf HYPih+1DWT6fgfFYSkcR20oo5/MGXm2q34H9Xxk+2S0H38rrRlj9Etz5slkwdivG8/jlLvjU SPX5YXu62A/0fnhBWstyzUKHtpNnUS9H7/1aUwXTtnUh+NZgV5InNmVt2c3ryKP/vvwnTl7l qvNHf6Q93DTxn1dQBlAHN2B630s7dKLFjpepen2J+87UTVpXQ8fOEwuzg6ceE4uxwqzwivgp Y8l3JnJN7oyvY3cLqu7AfAXlgQImzLbZ5z9T5kiISiZd3kKW1L6vSGKDsmzTf1Dakv5OIVBj GgpOm0q42J+66WCoQ2wb/apWsI8oXAAAAAAAAA== --------------ms090302020408070308050004-- --===============3296776057195519040== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============3296776057195519040==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ8-00023M-P6; Fri, 02 Nov 2012 11:21:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ7-00023H-F0 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:02 +0000 Received: from [193.109.254.147:30520] by server-13.bemta-14.messagelabs.com id 8D/6C-11239-C9CA3905; Fri, 02 Nov 2012 11:21:00 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1351855259!2573050!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3138 invoked from network); 2 Nov 2012 11:21:00 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:00 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ4-0007g6-K0; Fri, 02 Nov 2012 11:20:58 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ2-0005eU-Cs; Fri, 02 Nov 2012 11:20:58 +0000 MIME-Version: 1.0 Message-Id: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:54 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 0 of 5] docs: x86 PV MMU related functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The following series adds some documentation for the PV MU related hypercalls. For the most part this is just a case of adding a suitable prototype and marking things up so they show up in the generated docs. I also have a draft of a wiki article on the subject which references the information in the public headers which I hope to post soon. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ8-00023M-P6; Fri, 02 Nov 2012 11:21:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ7-00023H-F0 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:02 +0000 Received: from [193.109.254.147:30520] by server-13.bemta-14.messagelabs.com id 8D/6C-11239-C9CA3905; Fri, 02 Nov 2012 11:21:00 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1351855259!2573050!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3138 invoked from network); 2 Nov 2012 11:21:00 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:00 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ4-0007g6-K0; Fri, 02 Nov 2012 11:20:58 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ2-0005eU-Cs; Fri, 02 Nov 2012 11:20:58 +0000 MIME-Version: 1.0 Message-Id: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:54 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 0 of 5] docs: x86 PV MMU related functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The following series adds some documentation for the PV MU related hypercalls. For the most part this is just a case of adding a suitable prototype and marking things up so they show up in the generated docs. I also have a draft of a wiki article on the subject which references the information in the public headers which I hope to post soon. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJC-00023b-5O; Fri, 02 Nov 2012 11:21:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJB-00023T-8Q for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:05 +0000 Received: from [85.158.143.99:3029] by server-3.bemta-4.messagelabs.com id A2/D4-06841-0ACA3905; Fri, 02 Nov 2012 11:21:04 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351855263!27795811!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2486 invoked from network); 2 Nov 2012 11:21:03 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:03 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ9-0007gO-6Y; Fri, 02 Nov 2012 11:21:03 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ6-0005eU-Fo; Fri, 02 Nov 2012 11:21:02 +0000 MIME-Version: 1.0 X-Mercurial-Node: e6880358eba346c386b9faaa30a5489df73a06a0 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:56 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 2 of 5] docs: Document HYPERVISOR_mmuext_op X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351854990 -3600 # Node ID e6880358eba346c386b9faaa30a5489df73a06a0 # Parent e8e1191aef208fbe2f4de61aad3e4fd789333646 docs: Document HYPERVISOR_mmuext_op Mark-up for inclusion of generated docs. Remove some trailing whitespace. Signed-off-by: Ian Campbell diff -r e8e1191aef20 -r e6880358eba3 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:16:30 2012 +0100 @@ -319,48 +319,54 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); /* * MMU EXTENDED OPERATIONS - * - * HYPERVISOR_mmuext_op() accepts a list of mmuext_op structures. + * + * ` enum neg_errnoval + * ` HYPERVISOR_mmuext_op(mmuext_op_t uops[], + * ` unsigned int count, + * ` unsigned int *pdone, + * ` unsigned int foreigndom) + */ +/* HYPERVISOR_mmuext_op() accepts a list of mmuext_op structures. * A foreigndom (FD) can be specified (or DOMID_SELF for none). * Where the FD has some effect, it is described below. - * + * * cmd: MMUEXT_(UN)PIN_*_TABLE * mfn: Machine frame number to be (un)pinned as a p.t. page. * The frame must belong to the FD, if one is specified. - * + * * cmd: MMUEXT_NEW_BASEPTR * mfn: Machine frame number of new page-table base to install in MMU. - * + * * cmd: MMUEXT_NEW_USER_BASEPTR [x86/64 only] * mfn: Machine frame number of new page-table base to install in MMU * when in user space. - * + * * cmd: MMUEXT_TLB_FLUSH_LOCAL * No additional arguments. Flushes local TLB. - * + * * cmd: MMUEXT_INVLPG_LOCAL * linear_addr: Linear address to be flushed from the local TLB. - * + * * cmd: MMUEXT_TLB_FLUSH_MULTI * vcpumask: Pointer to bitmap of VCPUs to be flushed. - * + * * cmd: MMUEXT_INVLPG_MULTI * linear_addr: Linear address to be flushed. * vcpumask: Pointer to bitmap of VCPUs to be flushed. - * + * * cmd: MMUEXT_TLB_FLUSH_ALL * No additional arguments. Flushes all VCPUs' TLBs. - * + * * cmd: MMUEXT_INVLPG_ALL * linear_addr: Linear address to be flushed from all VCPUs' TLBs. - * + * * cmd: MMUEXT_FLUSH_CACHE * No additional arguments. Writes back and flushes cache contents. * * cmd: MMUEXT_FLUSH_CACHE_GLOBAL * No additional arguments. Writes back and flushes cache contents * on all CPUs in the system. - * + * * cmd: MMUEXT_SET_LDT * linear_addr: Linear address of LDT base (NB. must be page-aligned). * nr_ents: Number of entries in LDT. @@ -375,6 +381,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); * cmd: MMUEXT_[UN]MARK_SUPER * mfn: Machine frame number of head of superpage to be [un]marked. */ +/* ` enum mmuext_cmd { */ #define MMUEXT_PIN_L1_TABLE 0 #define MMUEXT_PIN_L2_TABLE 1 #define MMUEXT_PIN_L3_TABLE 2 @@ -395,10 +402,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); #define MMUEXT_FLUSH_CACHE_GLOBAL 18 #define MMUEXT_MARK_SUPER 19 #define MMUEXT_UNMARK_SUPER 20 +/* ` } */ #ifndef __ASSEMBLY__ struct mmuext_op { - unsigned int cmd; + unsigned int cmd; /* => enum mmuext_cmd */ union { /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR * CLEAR_PAGE, COPY_PAGE, [UN]MARK_SUPER */ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJC-00023b-5O; Fri, 02 Nov 2012 11:21:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJB-00023T-8Q for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:05 +0000 Received: from [85.158.143.99:3029] by server-3.bemta-4.messagelabs.com id A2/D4-06841-0ACA3905; Fri, 02 Nov 2012 11:21:04 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351855263!27795811!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2486 invoked from network); 2 Nov 2012 11:21:03 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:03 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ9-0007gO-6Y; Fri, 02 Nov 2012 11:21:03 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ6-0005eU-Fo; Fri, 02 Nov 2012 11:21:02 +0000 MIME-Version: 1.0 X-Mercurial-Node: e6880358eba346c386b9faaa30a5489df73a06a0 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:56 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 2 of 5] docs: Document HYPERVISOR_mmuext_op X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351854990 -3600 # Node ID e6880358eba346c386b9faaa30a5489df73a06a0 # Parent e8e1191aef208fbe2f4de61aad3e4fd789333646 docs: Document HYPERVISOR_mmuext_op Mark-up for inclusion of generated docs. Remove some trailing whitespace. Signed-off-by: Ian Campbell diff -r e8e1191aef20 -r e6880358eba3 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:16:30 2012 +0100 @@ -319,48 +319,54 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); /* * MMU EXTENDED OPERATIONS - * - * HYPERVISOR_mmuext_op() accepts a list of mmuext_op structures. + * + * ` enum neg_errnoval + * ` HYPERVISOR_mmuext_op(mmuext_op_t uops[], + * ` unsigned int count, + * ` unsigned int *pdone, + * ` unsigned int foreigndom) + */ +/* HYPERVISOR_mmuext_op() accepts a list of mmuext_op structures. * A foreigndom (FD) can be specified (or DOMID_SELF for none). * Where the FD has some effect, it is described below. - * + * * cmd: MMUEXT_(UN)PIN_*_TABLE * mfn: Machine frame number to be (un)pinned as a p.t. page. * The frame must belong to the FD, if one is specified. - * + * * cmd: MMUEXT_NEW_BASEPTR * mfn: Machine frame number of new page-table base to install in MMU. - * + * * cmd: MMUEXT_NEW_USER_BASEPTR [x86/64 only] * mfn: Machine frame number of new page-table base to install in MMU * when in user space. - * + * * cmd: MMUEXT_TLB_FLUSH_LOCAL * No additional arguments. Flushes local TLB. - * + * * cmd: MMUEXT_INVLPG_LOCAL * linear_addr: Linear address to be flushed from the local TLB. - * + * * cmd: MMUEXT_TLB_FLUSH_MULTI * vcpumask: Pointer to bitmap of VCPUs to be flushed. - * + * * cmd: MMUEXT_INVLPG_MULTI * linear_addr: Linear address to be flushed. * vcpumask: Pointer to bitmap of VCPUs to be flushed. - * + * * cmd: MMUEXT_TLB_FLUSH_ALL * No additional arguments. Flushes all VCPUs' TLBs. - * + * * cmd: MMUEXT_INVLPG_ALL * linear_addr: Linear address to be flushed from all VCPUs' TLBs. - * + * * cmd: MMUEXT_FLUSH_CACHE * No additional arguments. Writes back and flushes cache contents. * * cmd: MMUEXT_FLUSH_CACHE_GLOBAL * No additional arguments. Writes back and flushes cache contents * on all CPUs in the system. - * + * * cmd: MMUEXT_SET_LDT * linear_addr: Linear address of LDT base (NB. must be page-aligned). * nr_ents: Number of entries in LDT. @@ -375,6 +381,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); * cmd: MMUEXT_[UN]MARK_SUPER * mfn: Machine frame number of head of superpage to be [un]marked. */ +/* ` enum mmuext_cmd { */ #define MMUEXT_PIN_L1_TABLE 0 #define MMUEXT_PIN_L2_TABLE 1 #define MMUEXT_PIN_L3_TABLE 2 @@ -395,10 +402,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); #define MMUEXT_FLUSH_CACHE_GLOBAL 18 #define MMUEXT_MARK_SUPER 19 #define MMUEXT_UNMARK_SUPER 20 +/* ` } */ #ifndef __ASSEMBLY__ struct mmuext_op { - unsigned int cmd; + unsigned int cmd; /* => enum mmuext_cmd */ union { /* [UN]PIN_TABLE, NEW_BASEPTR, NEW_USER_BASEPTR * CLEAR_PAGE, COPY_PAGE, [UN]MARK_SUPER */ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJF-00024M-Uj; Fri, 02 Nov 2012 11:21:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-00023q-Tx for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:09 +0000 Received: from [85.158.137.99:25490] by server-5.bemta-3.messagelabs.com id F2/B5-26311-E9CA3905; Fri, 02 Nov 2012 11:21:02 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1351855260!17460263!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22708 invoked from network); 2 Nov 2012 11:21:01 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-16.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:01 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ6-0007gE-R1; Fri, 02 Nov 2012 11:21:00 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ4-0005eU-8W; Fri, 02 Nov 2012 11:21:00 +0000 MIME-Version: 1.0 X-Mercurial-Node: e8e1191aef208fbe2f4de61aad3e4fd789333646 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:55 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351854956 -3600 # Node ID e8e1191aef208fbe2f4de61aad3e4fd789333646 # Parent 37a8946eeb9db8b5eafc1c75aded006ad5322af8 docs: document HYPERVISOR_update_va_mapping(_other_domain) Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 37a8946eeb9d -r e8e1191aef20 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #endif +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, + * ` enum uvm_flags flags) + * ` + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, + * ` enum uvm_flags flags, + * ` domid_t domid) + * ` + * ` @va: The virtual address whose mapping we want to change + * ` @val: The new page table entry + * ` @flags: Control TLB flushes + */ +*/ /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ +/* ` enum uvm_flags { */ #define UVMF_NONE (0UL<<0) /* No flushing at all. */ #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ +/* ` } */ /* * Commands to HYPERVISOR_console_io(). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJF-00024M-Uj; Fri, 02 Nov 2012 11:21:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-00023q-Tx for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:09 +0000 Received: from [85.158.137.99:25490] by server-5.bemta-3.messagelabs.com id F2/B5-26311-E9CA3905; Fri, 02 Nov 2012 11:21:02 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1351855260!17460263!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22708 invoked from network); 2 Nov 2012 11:21:01 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-16.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:01 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJ6-0007gE-R1; Fri, 02 Nov 2012 11:21:00 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ4-0005eU-8W; Fri, 02 Nov 2012 11:21:00 +0000 MIME-Version: 1.0 X-Mercurial-Node: e8e1191aef208fbe2f4de61aad3e4fd789333646 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:55 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351854956 -3600 # Node ID e8e1191aef208fbe2f4de61aad3e4fd789333646 # Parent 37a8946eeb9db8b5eafc1c75aded006ad5322af8 docs: document HYPERVISOR_update_va_mapping(_other_domain) Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 37a8946eeb9d -r e8e1191aef20 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #endif +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, + * ` enum uvm_flags flags) + * ` + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, + * ` enum uvm_flags flags, + * ` domid_t domid) + * ` + * ` @va: The virtual address whose mapping we want to change + * ` @val: The new page table entry + * ` @flags: Control TLB flushes + */ +*/ /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ +/* ` enum uvm_flags { */ #define UVMF_NONE (0UL<<0) /* No flushing at all. */ #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ +/* ` } */ /* * Commands to HYPERVISOR_console_io(). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJK-00025F-Ay; Fri, 02 Nov 2012 11:21:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJI-00024u-Lv for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:12 +0000 Received: from [85.158.139.83:19675] by server-12.bemta-5.messagelabs.com id 73/B8-02886-8ACA3905; Fri, 02 Nov 2012 11:21:12 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351855271!23854230!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1217 invoked from network); 2 Nov 2012 11:21:11 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:11 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJH-0007gk-1n; Fri, 02 Nov 2012 11:21:11 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-0005eU-Fr; Fri, 02 Nov 2012 11:21:10 +0000 MIME-Version: 1.0 X-Mercurial-Node: afb8de49d9a8f91cf1b0248842e56be8e4b48995 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:59 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 5 of 5] docs: Include prototype for HYPERVISOR_multicall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855028 -3600 # Node ID afb8de49d9a8f91cf1b0248842e56be8e4b48995 # Parent bb43f655bcc863d681fe30cea477f12333dd0cc6 docs: Include prototype for HYPERVISOR_multicall Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r bb43f655bcc8 -r afb8de49d9a8 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:16:59 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:17:08 2012 +0100 @@ -540,7 +540,10 @@ typedef struct mmu_update mmu_update_t; DEFINE_XEN_GUEST_HANDLE(mmu_update_t); /* - * Send an array of these to HYPERVISOR_multicall(). + * ` enum neg_errnoval + * ` HYPERVISOR_multicall(multicall_entry_t call_list[], + * ` unsigned int nr_calls); + * * NB. The fields are natural register size for this architecture. */ struct multicall_entry { _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJK-00025F-Ay; Fri, 02 Nov 2012 11:21:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJI-00024u-Lv for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:12 +0000 Received: from [85.158.139.83:19675] by server-12.bemta-5.messagelabs.com id 73/B8-02886-8ACA3905; Fri, 02 Nov 2012 11:21:12 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1351855271!23854230!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1217 invoked from network); 2 Nov 2012 11:21:11 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-6.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:11 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJH-0007gk-1n; Fri, 02 Nov 2012 11:21:11 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-0005eU-Fr; Fri, 02 Nov 2012 11:21:10 +0000 MIME-Version: 1.0 X-Mercurial-Node: afb8de49d9a8f91cf1b0248842e56be8e4b48995 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:59 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 5 of 5] docs: Include prototype for HYPERVISOR_multicall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855028 -3600 # Node ID afb8de49d9a8f91cf1b0248842e56be8e4b48995 # Parent bb43f655bcc863d681fe30cea477f12333dd0cc6 docs: Include prototype for HYPERVISOR_multicall Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r bb43f655bcc8 -r afb8de49d9a8 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:16:59 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:17:08 2012 +0100 @@ -540,7 +540,10 @@ typedef struct mmu_update mmu_update_t; DEFINE_XEN_GUEST_HANDLE(mmu_update_t); /* - * Send an array of these to HYPERVISOR_multicall(). + * ` enum neg_errnoval + * ` HYPERVISOR_multicall(multicall_entry_t call_list[], + * ` unsigned int nr_calls); + * * NB. The fields are natural register size for this architecture. */ struct multicall_entry { _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-00023y-IL; Fri, 02 Nov 2012 11:21:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJC-00023c-OF for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:06 +0000 Received: from [85.158.139.211:40310] by server-7.bemta-5.messagelabs.com id 3C/D1-23096-1ACA3905; Fri, 02 Nov 2012 11:21:05 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351855265!17112920!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10103 invoked from network); 2 Nov 2012 11:21:05 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:05 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJB-0007gW-6D; Fri, 02 Nov 2012 11:21:05 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ8-0005eU-S4; Fri, 02 Nov 2012 11:21:04 +0000 MIME-Version: 1.0 X-Mercurial-Node: 433d5d988e30e66a9c1f53a9b2c027692f9de11c Message-Id: <433d5d988e30e66a9c1f.1351855137@hastur.hellion.org.uk> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:57 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 3 of 5] docs: Add ToC entry for start of day memory layout X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855004 -3600 # Node ID 433d5d988e30e66a9c1f53a9b2c027692f9de11c # Parent e6880358eba346c386b9faaa30a5489df73a06a0 docs: Add ToC entry for start of day memory layout. Signed-off-by: Ian Campbell diff -r e6880358eba3 -r 433d5d988e30 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:16:30 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:16:44 2012 +0100 @@ -680,7 +680,8 @@ typedef struct shared_info shared_info_t #endif /* - * Start-of-day memory layout: + * `incontents 200 startofday Start-of-day memory layout + * * 1. The domain is started within contiguous virtual-memory region. * 2. The contiguous region ends on an aligned 4MB boundary. * 3. This the order of bootstrap elements in the initial virtual region: _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJE-00023y-IL; Fri, 02 Nov 2012 11:21:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJC-00023c-OF for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:06 +0000 Received: from [85.158.139.211:40310] by server-7.bemta-5.messagelabs.com id 3C/D1-23096-1ACA3905; Fri, 02 Nov 2012 11:21:05 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351855265!17112920!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10103 invoked from network); 2 Nov 2012 11:21:05 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:05 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJB-0007gW-6D; Fri, 02 Nov 2012 11:21:05 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJ8-0005eU-S4; Fri, 02 Nov 2012 11:21:04 +0000 MIME-Version: 1.0 X-Mercurial-Node: 433d5d988e30e66a9c1f53a9b2c027692f9de11c Message-Id: <433d5d988e30e66a9c1f.1351855137@hastur.hellion.org.uk> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:57 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 3 of 5] docs: Add ToC entry for start of day memory layout X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855004 -3600 # Node ID 433d5d988e30e66a9c1f53a9b2c027692f9de11c # Parent e6880358eba346c386b9faaa30a5489df73a06a0 docs: Add ToC entry for start of day memory layout. Signed-off-by: Ian Campbell diff -r e6880358eba3 -r 433d5d988e30 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Nov 02 12:16:30 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 12:16:44 2012 +0100 @@ -680,7 +680,8 @@ typedef struct shared_info shared_info_t #endif /* - * Start-of-day memory layout: + * `incontents 200 startofday Start-of-day memory layout + * * 1. The domain is started within contiguous virtual-memory region. * 2. The contiguous region ends on an aligned 4MB boundary. * 3. This the order of bootstrap elements in the initial virtual region: _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJS-000278-Oz; Fri, 02 Nov 2012 11:21:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJR-00026F-63 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:21 +0000 Received: from [85.158.143.35:55529] by server-2.bemta-4.messagelabs.com id E1/E2-28922-EACA3905; Fri, 02 Nov 2012 11:21:18 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1351855268!11192668!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30495 invoked from network); 2 Nov 2012 11:21:09 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:09 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJE-0007gf-Qk; Fri, 02 Nov 2012 11:21:08 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJA-0005eU-Rv; Fri, 02 Nov 2012 11:21:08 +0000 MIME-Version: 1.0 X-Mercurial-Node: bb43f655bcc863d681fe30cea477f12333dd0cc6 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:58 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 4 of 5] docs: Document HYPERVISOR_update_descriptor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855019 -3600 # Node ID bb43f655bcc863d681fe30cea477f12333dd0cc6 # Parent 433d5d988e30e66a9c1f53a9b2c027692f9de11c docs: Document HYPERVISOR_update_descriptor Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 433d5d988e30 -r bb43f655bcc8 xen/include/public/arch-x86/xen.h --- a/xen/include/public/arch-x86/xen.h Fri Nov 02 12:16:44 2012 +0100 +++ b/xen/include/public/arch-x86/xen.h Fri Nov 02 12:16:59 2012 +0100 @@ -71,7 +71,7 @@ typedef unsigned long xen_pfn_t; #endif /* - * SEGMENT DESCRIPTOR TABLES + * `incontents 200 segdesc Segment Descriptor Tables */ /* * ` enum neg_errnoval @@ -83,11 +83,24 @@ typedef unsigned long xen_pfn_t; * start of the GDT because some stupid OSes export hard-coded selector values * in their ABI. These hard-coded values are always near the start of the GDT, * so Xen places itself out of the way, at the far end of the GDT. + * + * NB The LDT is set using the MMUEXT_SET_LDT op of HYPERVISOR_mmuext_op */ #define FIRST_RESERVED_GDT_PAGE 14 #define FIRST_RESERVED_GDT_BYTE (FIRST_RESERVED_GDT_PAGE * 4096) #define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8) + +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_descriptor(u64 pa, u64 desc); + * ` + * ` @pa The machine physical address of the descriptor to + * ` update. Must be either a descriptor page or writable. + * ` @desc The descriptor value to update, in the same format as a + * ` native descriptor table entry. + */ + /* Maximum number of virtual CPUs in legacy multi-processor guests. */ #define XEN_LEGACY_MAX_VCPUS 32 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:21:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:21:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJS-000278-Oz; Fri, 02 Nov 2012 11:21:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFJR-00026F-63 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:21:21 +0000 Received: from [85.158.143.35:55529] by server-2.bemta-4.messagelabs.com id E1/E2-28922-EACA3905; Fri, 02 Nov 2012 11:21:18 +0000 X-Env-Sender: ian.campbell@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1351855268!11192668!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30495 invoked from network); 2 Nov 2012 11:21:09 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2012 11:21:09 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TUFJE-0007gf-Qk; Fri, 02 Nov 2012 11:21:08 +0000 Received: from [192.168.1.164] (helo=hastur.hellion.org.uk) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TUFJA-0005eU-Rv; Fri, 02 Nov 2012 11:21:08 +0000 MIME-Version: 1.0 X-Mercurial-Node: bb43f655bcc863d681fe30cea477f12333dd0cc6 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Fri, 02 Nov 2012 12:18:58 +0100 From: Ian Campbell To: xen-devel@lists.xen.org X-SA-Exim-Connect-IP: 192.168.1.164 X-SA-Exim-Mail-From: ian.campbell@citrix.com X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: Ian Campbell Subject: [Xen-devel] [PATCH 4 of 5] docs: Document HYPERVISOR_update_descriptor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User Ian Campbell # Date 1351855019 -3600 # Node ID bb43f655bcc863d681fe30cea477f12333dd0cc6 # Parent 433d5d988e30e66a9c1f53a9b2c027692f9de11c docs: Document HYPERVISOR_update_descriptor Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 433d5d988e30 -r bb43f655bcc8 xen/include/public/arch-x86/xen.h --- a/xen/include/public/arch-x86/xen.h Fri Nov 02 12:16:44 2012 +0100 +++ b/xen/include/public/arch-x86/xen.h Fri Nov 02 12:16:59 2012 +0100 @@ -71,7 +71,7 @@ typedef unsigned long xen_pfn_t; #endif /* - * SEGMENT DESCRIPTOR TABLES + * `incontents 200 segdesc Segment Descriptor Tables */ /* * ` enum neg_errnoval @@ -83,11 +83,24 @@ typedef unsigned long xen_pfn_t; * start of the GDT because some stupid OSes export hard-coded selector values * in their ABI. These hard-coded values are always near the start of the GDT, * so Xen places itself out of the way, at the far end of the GDT. + * + * NB The LDT is set using the MMUEXT_SET_LDT op of HYPERVISOR_mmuext_op */ #define FIRST_RESERVED_GDT_PAGE 14 #define FIRST_RESERVED_GDT_BYTE (FIRST_RESERVED_GDT_PAGE * 4096) #define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8) + +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_descriptor(u64 pa, u64 desc); + * ` + * ` @pa The machine physical address of the descriptor to + * ` update. Must be either a descriptor page or writable. + * ` @desc The descriptor value to update, in the same format as a + * ` native descriptor table entry. + */ + /* Maximum number of virtual CPUs in legacy multi-processor guests. */ #define XEN_LEGACY_MAX_VCPUS 32 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:34:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:34:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFVk-00033P-8F; Fri, 02 Nov 2012 11:34:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFVh-00033K-Uw for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:34:02 +0000 Received: from [85.158.138.51:16212] by server-15.bemta-3.messagelabs.com id 70/25-09445-9AFA3905; Fri, 02 Nov 2012 11:34:01 +0000 X-Env-Sender: david.vrabel@citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1351856039!20400496!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODM2NTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7477 invoked from network); 2 Nov 2012 11:34:00 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 11:34:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="213223475" Received: from unknown (HELO FTLPEX01CL02.citrite.net) ([10.13.107.79]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 02 Nov 2012 11:33:58 +0000 Received: from [10.80.2.76] (10.80.2.76) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.2.318.1; Fri, 2 Nov 2012 07:33:58 -0400 Message-ID: <5093AFA5.4000107@citrix.com> Date: Fri, 2 Nov 2012 11:33:57 +0000 From: David Vrabel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20120428 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: Ian Campbell References: In-Reply-To: X-Originating-IP: [10.80.2.76] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/12 11:18, Ian Campbell wrote: > docs: document HYPERVISOR_update_va_mapping(_other_domain) > > Mark-up for inclusion of generated docs. > > Signed-off-by: Ian Campbell > > diff -r 37a8946eeb9d -r e8e1191aef20 xen/include/public/xen.h > --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 > +++ b/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 > @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; > DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); > #endif > > +/* > + * ` enum neg_errnoval > + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, > + * ` enum uvm_flags flags) > + * ` > + * ` enum neg_errnoval > + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, > + * ` enum uvm_flags flags, > + * ` domid_t domid) > + * ` > + * ` @va: The virtual address whose mapping we want to change > + * ` @val: The new page table entry Suggest mentioning that this PTE requires the MFN not PFN. David > + * ` @flags: Control TLB flushes > + */ > +*/ > /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ > /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ > /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ > +/* ` enum uvm_flags { */ > #define UVMF_NONE (0UL<<0) /* No flushing at all. */ > #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ > #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ > @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); > #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ > #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ > #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ > +/* ` } */ > > /* > * Commands to HYPERVISOR_console_io(). > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:34:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:34:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFVk-00033P-8F; Fri, 02 Nov 2012 11:34:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFVh-00033K-Uw for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:34:02 +0000 Received: from [85.158.138.51:16212] by server-15.bemta-3.messagelabs.com id 70/25-09445-9AFA3905; Fri, 02 Nov 2012 11:34:01 +0000 X-Env-Sender: david.vrabel@citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1351856039!20400496!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODM2NTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7477 invoked from network); 2 Nov 2012 11:34:00 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 11:34:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="213223475" Received: from unknown (HELO FTLPEX01CL02.citrite.net) ([10.13.107.79]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 02 Nov 2012 11:33:58 +0000 Received: from [10.80.2.76] (10.80.2.76) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.2.318.1; Fri, 2 Nov 2012 07:33:58 -0400 Message-ID: <5093AFA5.4000107@citrix.com> Date: Fri, 2 Nov 2012 11:33:57 +0000 From: David Vrabel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20120428 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: Ian Campbell References: In-Reply-To: X-Originating-IP: [10.80.2.76] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/12 11:18, Ian Campbell wrote: > docs: document HYPERVISOR_update_va_mapping(_other_domain) > > Mark-up for inclusion of generated docs. > > Signed-off-by: Ian Campbell > > diff -r 37a8946eeb9d -r e8e1191aef20 xen/include/public/xen.h > --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 > +++ b/xen/include/public/xen.h Fri Nov 02 12:15:56 2012 +0100 > @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; > DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); > #endif > > +/* > + * ` enum neg_errnoval > + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, > + * ` enum uvm_flags flags) > + * ` > + * ` enum neg_errnoval > + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, > + * ` enum uvm_flags flags, > + * ` domid_t domid) > + * ` > + * ` @va: The virtual address whose mapping we want to change > + * ` @val: The new page table entry Suggest mentioning that this PTE requires the MFN not PFN. David > + * ` @flags: Control TLB flushes > + */ > +*/ > /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ > /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ > /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ > +/* ` enum uvm_flags { */ > #define UVMF_NONE (0UL<<0) /* No flushing at all. */ > #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ > #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ > @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); > #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ > #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ > #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ > +/* ` } */ > > /* > * Commands to HYPERVISOR_console_io(). > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:37:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:37:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFYj-0003A6-TX; Fri, 02 Nov 2012 11:37:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFYi-0003A0-Ji for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:37:08 +0000 Received: from [85.158.137.99:9050] by server-16.bemta-3.messagelabs.com id 5A/9D-07461-360B3905; Fri, 02 Nov 2012 11:37:07 +0000 X-Env-Sender: dkiper@net-space.pl X-Msg-Ref: server-12.tower-217.messagelabs.com!1351856226!14332024!1 X-Originating-IP: [89.174.63.77] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22701 invoked from network); 2 Nov 2012 11:37:07 -0000 Received: from router-fw.net-space.pl (HELO router-fw.net-space.pl) (89.174.63.77) by server-12.tower-217.messagelabs.com with EDH-RSA-DES-CBC3-SHA encrypted SMTP; 2 Nov 2012 11:37:07 -0000 Received: (from localhost user: 'dkiper' uid#4000 fake: STDIN (dkiper@router-fw.net-space.pl)) by router-fw-old.local.net-space.pl id S1619235Ab2KBLgv (ORCPT ); Fri, 2 Nov 2012 12:36:51 +0100 Date: Fri, 2 Nov 2012 12:36:51 +0100 From: Daniel Kiper To: Jan Beulich Message-ID: <20121102113651.GA9845@router-fw-old.local.net-space.pl> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D42A020000780008EB7B@nat28.tlf.novell.com> User-Agent: Mutt/1.3.28i Cc: konrad.wilk@oracle.com, daniel.kiper@oracle.com, fantonifabio@tiscali.it, george.dunlap@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> > possible boot with lvm volume, fallback options ecc... > >> > >> Just get a suitable tool chain installed then. > >> > >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> > load efi variable. > >> > >> Sure, because only xen.efi has the code to deal with such. > >> > >> (Btw., I assume you aren't aware that any boot manager > >> whatsoever, other than the one coming with EFI, is sort of > >> bogus under EFI?) > > > >Unfortunately it looks like more and more people are of the opinion that > >grub2 is useful even on UEFI firmware. > >For example, it is pretty clear that Ubuntu is still going to boot Xen > >via grub2 no matter how the firmware looks like. > > Then they need to be tought how to do it properly, the more that Linux itself > now is capable of booting without a boot loader (other than the EFI one). > > >What would it take to make Xen work properly with grub2 on a UEFI firmware? > > I can't be that difficult. > > >I think that we should add it as a work item for Xen 4.3. > > If you have someone to do that work. I'm willing to review the resulting > changes, but I currently don't see me doing anything here (as being totally > unimportant and - just to repeat that - conceptually wrong). Heh... I agree with Jan but there are so many things conceptually wrong used by millions of people and we could not change that. Let's fix (broke?) it. I am going to work on EFI stuff in upstream kernel and I think this task could be assigned to me too. Daniel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 11:37:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 11:37:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFYj-0003A6-TX; Fri, 02 Nov 2012 11:37:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUFYi-0003A0-Ji for xen-devel@lists.xen.org; Fri, 02 Nov 2012 11:37:08 +0000 Received: from [85.158.137.99:9050] by server-16.bemta-3.messagelabs.com id 5A/9D-07461-360B3905; Fri, 02 Nov 2012 11:37:07 +0000 X-Env-Sender: dkiper@net-space.pl X-Msg-Ref: server-12.tower-217.messagelabs.com!1351856226!14332024!1 X-Originating-IP: [89.174.63.77] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22701 invoked from network); 2 Nov 2012 11:37:07 -0000 Received: from router-fw.net-space.pl (HELO router-fw.net-space.pl) (89.174.63.77) by server-12.tower-217.messagelabs.com with EDH-RSA-DES-CBC3-SHA encrypted SMTP; 2 Nov 2012 11:37:07 -0000 Received: (from localhost user: 'dkiper' uid#4000 fake: STDIN (dkiper@router-fw.net-space.pl)) by router-fw-old.local.net-space.pl id S1619235Ab2KBLgv (ORCPT ); Fri, 2 Nov 2012 12:36:51 +0100 Date: Fri, 2 Nov 2012 12:36:51 +0100 From: Daniel Kiper To: Jan Beulich Message-ID: <20121102113651.GA9845@router-fw-old.local.net-space.pl> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D42A020000780008EB7B@nat28.tlf.novell.com> User-Agent: Mutt/1.3.28i Cc: konrad.wilk@oracle.com, daniel.kiper@oracle.com, fantonifabio@tiscali.it, george.dunlap@citrix.com, xen-devel@lists.xen.org, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> > possible boot with lvm volume, fallback options ecc... > >> > >> Just get a suitable tool chain installed then. > >> > >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> > load efi variable. > >> > >> Sure, because only xen.efi has the code to deal with such. > >> > >> (Btw., I assume you aren't aware that any boot manager > >> whatsoever, other than the one coming with EFI, is sort of > >> bogus under EFI?) > > > >Unfortunately it looks like more and more people are of the opinion that > >grub2 is useful even on UEFI firmware. > >For example, it is pretty clear that Ubuntu is still going to boot Xen > >via grub2 no matter how the firmware looks like. > > Then they need to be tought how to do it properly, the more that Linux itself > now is capable of booting without a boot loader (other than the EFI one). > > >What would it take to make Xen work properly with grub2 on a UEFI firmware? > > I can't be that difficult. > > >I think that we should add it as a work item for Xen 4.3. > > If you have someone to do that work. I'm willing to review the resulting > changes, but I currently don't see me doing anything here (as being totally > unimportant and - just to repeat that - conceptually wrong). Heh... I agree with Jan but there are so many things conceptually wrong used by millions of people and we could not change that. Let's fix (broke?) it. I am going to work on EFI stuff in upstream kernel and I think this task could be assigned to me too. Daniel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:10:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:10:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH0N-0005Wb-Cx; Fri, 02 Nov 2012 13:09:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH0M-0005WW-Eh for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:09:46 +0000 Received: from [85.158.139.211:20972] by server-3.bemta-5.messagelabs.com id 63/AE-18736-916C3905; Fri, 02 Nov 2012 13:09:45 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351861779!17128478!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODM2NTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29381 invoked from network); 2 Nov 2012 13:09:40 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 13:09:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="213230762" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 13:09:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 09:09:07 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TUGzh-0007Xb-Hu; Fri, 02 Nov 2012 13:09:06 +0000 Message-ID: <1351861627.25014.50.camel@hastur.hellion.org.uk> From: Ian Campbell To: David Vrabel Date: Fri, 2 Nov 2012 13:07:07 +0000 In-Reply-To: <5093AFA5.4000107@citrix.com> References: <5093AFA5.4000107@citrix.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 11:33 +0000, David Vrabel wrote: > > + * ` @va: The virtual address whose mapping we want to change > > + * ` @val: The new page table entry > > Suggest mentioning that this PTE requires the MFN not PFN. Good idea. 8<--------------------------------------------- # HG changeset patch # User Ian Campbell # Date 1351861598 0 # Node ID 3753cf4617500ee0ac443eeba4f6a12257d77253 # Parent 37a8946eeb9db8b5eafc1c75aded006ad5322af8 docs: document HYPERVISOR_update_va_mapping(_other_domain) Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 37a8946eeb9d -r 3753cf461750 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 13:06:38 2012 +0000 @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #endif +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, + * ` enum uvm_flags flags) + * ` + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, + * ` enum uvm_flags flags, + * ` domid_t domid) + * ` + * ` @va: The virtual address whose mapping we want to change + * ` @val: The new page table entry, must contain a machine address + * ` @flags: Control TLB flushes + */ +*/ /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ +/* ` enum uvm_flags { */ #define UVMF_NONE (0UL<<0) /* No flushing at all. */ #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ +/* ` } */ /* * Commands to HYPERVISOR_console_io(). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:10:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:10:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH0N-0005Wb-Cx; Fri, 02 Nov 2012 13:09:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH0M-0005WW-Eh for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:09:46 +0000 Received: from [85.158.139.211:20972] by server-3.bemta-5.messagelabs.com id 63/AE-18736-916C3905; Fri, 02 Nov 2012 13:09:45 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1351861779!17128478!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODM2NTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29381 invoked from network); 2 Nov 2012 13:09:40 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 13:09:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="213230762" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 13:09:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 09:09:07 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TUGzh-0007Xb-Hu; Fri, 02 Nov 2012 13:09:06 +0000 Message-ID: <1351861627.25014.50.camel@hastur.hellion.org.uk> From: Ian Campbell To: David Vrabel Date: Fri, 2 Nov 2012 13:07:07 +0000 In-Reply-To: <5093AFA5.4000107@citrix.com> References: <5093AFA5.4000107@citrix.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1 of 5] docs: document HYPERVISOR_update_va_mapping(_other_domain) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 11:33 +0000, David Vrabel wrote: > > + * ` @va: The virtual address whose mapping we want to change > > + * ` @val: The new page table entry > > Suggest mentioning that this PTE requires the MFN not PFN. Good idea. 8<--------------------------------------------- # HG changeset patch # User Ian Campbell # Date 1351861598 0 # Node ID 3753cf4617500ee0ac443eeba4f6a12257d77253 # Parent 37a8946eeb9db8b5eafc1c75aded006ad5322af8 docs: document HYPERVISOR_update_va_mapping(_other_domain) Mark-up for inclusion of generated docs. Signed-off-by: Ian Campbell diff -r 37a8946eeb9d -r 3753cf461750 xen/include/public/xen.h --- a/xen/include/public/xen.h Fri Oct 26 16:09:29 2012 +0100 +++ b/xen/include/public/xen.h Fri Nov 02 13:06:38 2012 +0000 @@ -423,9 +423,25 @@ typedef struct mmuext_op mmuext_op_t; DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #endif +/* + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping(unsigned long va, u64 val, + * ` enum uvm_flags flags) + * ` + * ` enum neg_errnoval + * ` HYPERVISOR_update_va_mapping_otherdomain(unsigned long va, u64 val, + * ` enum uvm_flags flags, + * ` domid_t domid) + * ` + * ` @va: The virtual address whose mapping we want to change + * ` @val: The new page table entry, must contain a machine address + * ` @flags: Control TLB flushes + */ +*/ /* These are passed as 'flags' to update_va_mapping. They can be ORed. */ /* When specifying UVMF_MULTI, also OR in a pointer to a CPU bitmap. */ /* UVMF_LOCAL is merely UVMF_MULTI with a NULL bitmap pointer. */ +/* ` enum uvm_flags { */ #define UVMF_NONE (0UL<<0) /* No flushing at all. */ #define UVMF_TLB_FLUSH (1UL<<0) /* Flush entire TLB(s). */ #define UVMF_INVLPG (2UL<<0) /* Flush only one entry. */ @@ -433,6 +449,7 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define UVMF_MULTI (0UL<<2) /* Flush subset of TLBs. */ #define UVMF_LOCAL (0UL<<2) /* Flush local TLB. */ #define UVMF_ALL (1UL<<2) /* Flush all TLBs. */ +/* ` } */ /* * Commands to HYPERVISOR_console_io(). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:11:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:11:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH23-0005j3-0Y; Fri, 02 Nov 2012 13:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH21-0005io-7Q for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:11:29 +0000 Received: from [85.158.139.83:23300] by server-9.bemta-5.messagelabs.com id 11/65-29295-E76C3905; Fri, 02 Nov 2012 13:11:26 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1351861885!27785537!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20504 invoked from network); 2 Nov 2012 13:11:25 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 2 Nov 2012 13:11:25 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 13:11:27 +0000 Message-Id: <5093D4B502000078000A606E@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 13:12:05 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartD8E916B5.0__=" Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartD8E916B5.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline It has never been used for anything, and Linux 3.7 doesn't propagate this information anymore. Signed-off-by: Jan Beulich --- Konrad, on the pv-ops side it may be better to pass zero rather than leaving the field completely uninitialized. --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -935,7 +935,6 @@ static void set_cx( } =20 cx->latency =3D xen_cx->latency; - cx->power =3D xen_cx->power; =20 cx->target_residency =3D cx->latency * latency_factor; if ( cx->type =3D=3D ACPI_STATE_C1 || cx->type =3D=3D ACPI_STATE_C2 ) --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -96,7 +96,6 @@ static const struct cpuidle_state { char name[16]; unsigned int flags; unsigned int exit_latency; /* in US */ - int power_usage; /* in mW */ unsigned int target_residency; /* in US */ } *cpuidle_state_table; =20 @@ -479,7 +478,6 @@ static int mwait_idle_cpu_init(struct no cx->type =3D cstate; cx->address =3D get_driver_data(cstate); cx->entry_method =3D ACPI_CSTATE_EM_FFH; - cx->power =3D cpuidle_state_table[cstate].power_usage; cx->latency =3D cpuidle_state_table[cstate].exit_latency; cx->target_residency =3D cpuidle_state_table[cstate].target_residency; --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -46,7 +46,6 @@ struct acpi_processor_cx u32 address; u32 latency; u32 target_residency; - u32 power; u32 usage; u64 time; }; --=__PartD8E916B5.0__= Content-Type: text/plain; name="ACPI-cpuidle-no-power-field.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-cpuidle-no-power-field.patch" ACPI/cpuidle: remove unused "power" field from Cx state data=0A=0AIt has = never been used for anything, and Linux 3.7 doesn't propagate=0Athis = information anymore.=0A=0ASigned-off-by: Jan Beulich =0A= ---=0AKonrad, on the pv-ops side it may be better to pass zero rather = than=0Aleaving the field completely uninitialized.=0A=0A--- a/xen/arch/x86/= acpi/cpu_idle.c=0A+++ b/xen/arch/x86/acpi/cpu_idle.c=0A@@ -935,7 +935,6 @@ = static void set_cx(=0A }=0A =0A cx->latency =3D xen_cx->latency;= =0A- cx->power =3D xen_cx->power;=0A =0A cx->target_residency= =3D cx->latency * latency_factor;=0A if ( cx->type =3D=3D ACPI_STATE_C= 1 || cx->type =3D=3D ACPI_STATE_C2 )=0A--- a/xen/arch/x86/cpu/mwait-idle.c= =0A+++ b/xen/arch/x86/cpu/mwait-idle.c=0A@@ -96,7 +96,6 @@ static const = struct cpuidle_state {=0A char name[16];=0A unsigned = int flags;=0A unsigned int exit_latency; /* in US */=0A- = int power_usage; /* in mW */=0A unsigned int target_resi= dency; /* in US */=0A } *cpuidle_state_table;=0A =0A@@ -479,7 +478,6 @@ = static int mwait_idle_cpu_init(struct no=0A cx->type =3D = cstate;=0A cx->address =3D get_driver_data(cstate);=0A = cx->entry_method =3D ACPI_CSTATE_EM_FFH;=0A- cx->power =3D = cpuidle_state_table[cstate].power_usage;=0A cx->latency =3D = cpuidle_state_table[cstate].exit_latency;=0A cx->target_residenc= y =3D=0A cpuidle_state_table[cstate].target_residenc= y;=0A--- a/xen/include/xen/cpuidle.h=0A+++ b/xen/include/xen/cpuidle.h=0A@@= -46,7 +46,6 @@ struct acpi_processor_cx=0A u32 address;=0A u32 = latency;=0A u32 target_residency;=0A- u32 power;=0A u32 = usage;=0A u64 time;=0A };=0A --=__PartD8E916B5.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartD8E916B5.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 13:11:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:11:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH23-0005j3-0Y; Fri, 02 Nov 2012 13:11:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH21-0005io-7Q for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:11:29 +0000 Received: from [85.158.139.83:23300] by server-9.bemta-5.messagelabs.com id 11/65-29295-E76C3905; Fri, 02 Nov 2012 13:11:26 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1351861885!27785537!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20504 invoked from network); 2 Nov 2012 13:11:25 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 2 Nov 2012 13:11:25 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 13:11:27 +0000 Message-Id: <5093D4B502000078000A606E@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 13:12:05 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartD8E916B5.0__=" Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartD8E916B5.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline It has never been used for anything, and Linux 3.7 doesn't propagate this information anymore. Signed-off-by: Jan Beulich --- Konrad, on the pv-ops side it may be better to pass zero rather than leaving the field completely uninitialized. --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -935,7 +935,6 @@ static void set_cx( } =20 cx->latency =3D xen_cx->latency; - cx->power =3D xen_cx->power; =20 cx->target_residency =3D cx->latency * latency_factor; if ( cx->type =3D=3D ACPI_STATE_C1 || cx->type =3D=3D ACPI_STATE_C2 ) --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -96,7 +96,6 @@ static const struct cpuidle_state { char name[16]; unsigned int flags; unsigned int exit_latency; /* in US */ - int power_usage; /* in mW */ unsigned int target_residency; /* in US */ } *cpuidle_state_table; =20 @@ -479,7 +478,6 @@ static int mwait_idle_cpu_init(struct no cx->type =3D cstate; cx->address =3D get_driver_data(cstate); cx->entry_method =3D ACPI_CSTATE_EM_FFH; - cx->power =3D cpuidle_state_table[cstate].power_usage; cx->latency =3D cpuidle_state_table[cstate].exit_latency; cx->target_residency =3D cpuidle_state_table[cstate].target_residency; --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -46,7 +46,6 @@ struct acpi_processor_cx u32 address; u32 latency; u32 target_residency; - u32 power; u32 usage; u64 time; }; --=__PartD8E916B5.0__= Content-Type: text/plain; name="ACPI-cpuidle-no-power-field.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-cpuidle-no-power-field.patch" ACPI/cpuidle: remove unused "power" field from Cx state data=0A=0AIt has = never been used for anything, and Linux 3.7 doesn't propagate=0Athis = information anymore.=0A=0ASigned-off-by: Jan Beulich =0A= ---=0AKonrad, on the pv-ops side it may be better to pass zero rather = than=0Aleaving the field completely uninitialized.=0A=0A--- a/xen/arch/x86/= acpi/cpu_idle.c=0A+++ b/xen/arch/x86/acpi/cpu_idle.c=0A@@ -935,7 +935,6 @@ = static void set_cx(=0A }=0A =0A cx->latency =3D xen_cx->latency;= =0A- cx->power =3D xen_cx->power;=0A =0A cx->target_residency= =3D cx->latency * latency_factor;=0A if ( cx->type =3D=3D ACPI_STATE_C= 1 || cx->type =3D=3D ACPI_STATE_C2 )=0A--- a/xen/arch/x86/cpu/mwait-idle.c= =0A+++ b/xen/arch/x86/cpu/mwait-idle.c=0A@@ -96,7 +96,6 @@ static const = struct cpuidle_state {=0A char name[16];=0A unsigned = int flags;=0A unsigned int exit_latency; /* in US */=0A- = int power_usage; /* in mW */=0A unsigned int target_resi= dency; /* in US */=0A } *cpuidle_state_table;=0A =0A@@ -479,7 +478,6 @@ = static int mwait_idle_cpu_init(struct no=0A cx->type =3D = cstate;=0A cx->address =3D get_driver_data(cstate);=0A = cx->entry_method =3D ACPI_CSTATE_EM_FFH;=0A- cx->power =3D = cpuidle_state_table[cstate].power_usage;=0A cx->latency =3D = cpuidle_state_table[cstate].exit_latency;=0A cx->target_residenc= y =3D=0A cpuidle_state_table[cstate].target_residenc= y;=0A--- a/xen/include/xen/cpuidle.h=0A+++ b/xen/include/xen/cpuidle.h=0A@@= -46,7 +46,6 @@ struct acpi_processor_cx=0A u32 address;=0A u32 = latency;=0A u32 target_residency;=0A- u32 power;=0A u32 = usage;=0A u64 time;=0A };=0A --=__PartD8E916B5.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartD8E916B5.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 13:13:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH3c-0005pC-GN; Fri, 02 Nov 2012 13:13:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH3b-0005p3-AN for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:13:07 +0000 Received: from [85.158.139.83:20011] by server-15.bemta-5.messagelabs.com id DB/85-26920-2E6C3905; Fri, 02 Nov 2012 13:13:06 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1351861985!27785834!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26058 invoked from network); 2 Nov 2012 13:13:05 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 2 Nov 2012 13:13:05 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 13:13:08 +0000 Message-Id: <5093D51B02000078000A607C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 13:13:47 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part7746B91B.0__=" Subject: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part7746B91B.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Matching a similar change in Linux 3.7-rc. Signed-off-by: Jan Beulich --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -365,6 +365,7 @@ static struct intel_idle_id { ICPU(0x2a, snb), ICPU(0x2d, snb), ICPU(0x3a, ivb), + ICPU(0x3e, ivb), {} }; =20 --=__Part7746B91B.0__= Content-Type: text/plain; name="x86-IvyBridge-idle.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-IvyBridge-idle.patch" x86/mwait-idle: enable Ivy Bridge Xeon support=0A=0AMatching a similar = change in Linux 3.7-rc.=0A=0ASigned-off-by: Jan Beulich = =0A=0A--- a/xen/arch/x86/cpu/mwait-idle.c=0A+++ b/xen/arch/x86/cpu/mwait-id= le.c=0A@@ -365,6 +365,7 @@ static struct intel_idle_id {=0A ICPU(0x2a, = snb),=0A ICPU(0x2d, snb),=0A ICPU(0x3a, ivb),=0A+ ICPU(0x3e, = ivb),=0A {}=0A };=0A =0A --=__Part7746B91B.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part7746B91B.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 13:13:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH3c-0005pC-GN; Fri, 02 Nov 2012 13:13:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUH3b-0005p3-AN for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:13:07 +0000 Received: from [85.158.139.83:20011] by server-15.bemta-5.messagelabs.com id DB/85-26920-2E6C3905; Fri, 02 Nov 2012 13:13:06 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1351861985!27785834!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26058 invoked from network); 2 Nov 2012 13:13:05 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 2 Nov 2012 13:13:05 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 13:13:08 +0000 Message-Id: <5093D51B02000078000A607C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 13:13:47 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part7746B91B.0__=" Subject: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part7746B91B.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Matching a similar change in Linux 3.7-rc. Signed-off-by: Jan Beulich --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -365,6 +365,7 @@ static struct intel_idle_id { ICPU(0x2a, snb), ICPU(0x2d, snb), ICPU(0x3a, ivb), + ICPU(0x3e, ivb), {} }; =20 --=__Part7746B91B.0__= Content-Type: text/plain; name="x86-IvyBridge-idle.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-IvyBridge-idle.patch" x86/mwait-idle: enable Ivy Bridge Xeon support=0A=0AMatching a similar = change in Linux 3.7-rc.=0A=0ASigned-off-by: Jan Beulich = =0A=0A--- a/xen/arch/x86/cpu/mwait-idle.c=0A+++ b/xen/arch/x86/cpu/mwait-id= le.c=0A@@ -365,6 +365,7 @@ static struct intel_idle_id {=0A ICPU(0x2a, = snb),=0A ICPU(0x2d, snb),=0A ICPU(0x3a, ivb),=0A+ ICPU(0x3e, = ivb),=0A {}=0A };=0A =0A --=__Part7746B91B.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part7746B91B.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 13:20:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:20:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHAC-00065l-D7; Fri, 02 Nov 2012 13:19:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHAB-00065g-CR for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:19:55 +0000 Received: from [85.158.139.83:18980] by server-5.bemta-5.messagelabs.com id DF/B6-11353-A78C3905; Fri, 02 Nov 2012 13:19:54 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-182.messagelabs.com!1351862392!28469977!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28181 invoked from network); 2 Nov 2012 13:19:53 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:19:53 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148072870; Fri, 02 Nov 2012 09:19:35 -0400 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Fri, 2 Nov 2012 09:19:35 -0400 From: "Fioravante, Matthew E." To: Samuel Thibault Date: Fri, 2 Nov 2012 09:19:34 -0400 Thread-Topic: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Thread-Index: Ac24eAahX8hXvh1QQMOaS0N/XXlNOwAhIkOw Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org It happens in my vtpm domains because the drivers often create and release = grant references. This patch isn't completely necessary. Do we want to have= these debug prints in the default build? -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] = Sent: Thursday, November 01, 2012 5:30 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a = > lot of spam. Do they? I've never seen any, and normally they shouldn't be, so there cou= ld be another issue. Could you show what happens? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:20:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:20:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHAC-00065l-D7; Fri, 02 Nov 2012 13:19:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHAB-00065g-CR for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:19:55 +0000 Received: from [85.158.139.83:18980] by server-5.bemta-5.messagelabs.com id DF/B6-11353-A78C3905; Fri, 02 Nov 2012 13:19:54 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-182.messagelabs.com!1351862392!28469977!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28181 invoked from network); 2 Nov 2012 13:19:53 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:19:53 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148072870; Fri, 02 Nov 2012 09:19:35 -0400 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Fri, 2 Nov 2012 09:19:35 -0400 From: "Fioravante, Matthew E." To: Samuel Thibault Date: Fri, 2 Nov 2012 09:19:34 -0400 Thread-Topic: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Thread-Index: Ac24eAahX8hXvh1QQMOaS0N/XXlNOwAhIkOw Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org It happens in my vtpm domains because the drivers often create and release = grant references. This patch isn't completely necessary. Do we want to have= these debug prints in the default build? -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] = Sent: Thursday, November 01, 2012 5:30 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a = > lot of spam. Do they? I've never seen any, and normally they shouldn't be, so there cou= ld be another issue. Could you show what happens? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:23:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHCu-0006Lu-48; Fri, 02 Nov 2012 13:22:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHCs-0006Lh-Ap for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:22:42 +0000 Received: from [85.158.137.99:65314] by server-5.bemta-3.messagelabs.com id C5/AF-26311-129C3905; Fri, 02 Nov 2012 13:22:41 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-217.messagelabs.com!1351862559!12122839!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26091 invoked from network); 2 Nov 2012 13:22:40 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:22:40 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148073138; Fri, 02 Nov 2012 09:22:24 -0400 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Fri, 2 Nov 2012 09:22:24 -0400 From: "Fioravante, Matthew E." To: Samuel Thibault Date: Fri, 2 Nov 2012 09:22:23 -0400 Thread-Topic: [PATCH VTPM 4/9] fix bug in lseek for mini-os Thread-Index: Ac24eL4vcRrcEd6zQouCzs5eticUnAAhD1Ug Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA70@aplesstripe.dom1.jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Good catch. Fix will be in the next round of patches. -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] = Sent: Thursday, November 01, 2012 5:35 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 4/9] fix bug in lseek for mini-os Matthew Fioravante, le Thu 01 Nov 2012 16:33:27 -0400, a =E9crit : > -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || = > defined(CONFIG_TPM_TIS) ... > #ifdef CONFIG_TPMFRNT There seems to be a mismatch here between CONFIG_TPMFRONT and CONFIG_TPMFRN= T? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:23:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHCu-0006Lu-48; Fri, 02 Nov 2012 13:22:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHCs-0006Lh-Ap for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:22:42 +0000 Received: from [85.158.137.99:65314] by server-5.bemta-3.messagelabs.com id C5/AF-26311-129C3905; Fri, 02 Nov 2012 13:22:41 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-217.messagelabs.com!1351862559!12122839!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26091 invoked from network); 2 Nov 2012 13:22:40 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:22:40 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148073138; Fri, 02 Nov 2012 09:22:24 -0400 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Fri, 2 Nov 2012 09:22:24 -0400 From: "Fioravante, Matthew E." To: Samuel Thibault Date: Fri, 2 Nov 2012 09:22:23 -0400 Thread-Topic: [PATCH VTPM 4/9] fix bug in lseek for mini-os Thread-Index: Ac24eL4vcRrcEd6zQouCzs5eticUnAAhD1Ug Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA70@aplesstripe.dom1.jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-4-git-send-email-matthew.fioravante@jhuapl.edu> <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121101213450.GS5569@type.youpi.perso.aquilenet.fr> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 4/9] fix bug in lseek for mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Good catch. Fix will be in the next round of patches. -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] = Sent: Thursday, November 01, 2012 5:35 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 4/9] fix bug in lseek for mini-os Matthew Fioravante, le Thu 01 Nov 2012 16:33:27 -0400, a =E9crit : > -#if defined(CONFIG_BLKFRONT) || defined(CONFIG_TPMFRONT) || = > defined(CONFIG_TPM_TIS) ... > #ifdef CONFIG_TPMFRNT There seems to be a mismatch here between CONFIG_TPMFRONT and CONFIG_TPMFRN= T? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:30:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHJx-0006am-W9; Fri, 02 Nov 2012 13:30:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHJw-0006ah-8N for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:30:00 +0000 Received: from [85.158.143.99:54580] by server-1.bemta-4.messagelabs.com id 95/29-27934-7DAC3905; Fri, 02 Nov 2012 13:29:59 +0000 X-Env-Sender: aliguori@us.ibm.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1351862994!21988808!1 X-Originating-IP: [122.248.162.2] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTIyLjI0OC4xNjIuMiA9PiAyODMxNjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25875 invoked from network); 2 Nov 2012 13:29:58 -0000 Received: from e28smtp02.in.ibm.com (HELO e28smtp02.in.ibm.com) (122.248.162.2) by server-10.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:29:58 -0000 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Nov 2012 18:59:53 +0530 Received: from d28relay01.in.ibm.com (9.184.220.58) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 2 Nov 2012 18:59:51 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA2DTnKi25952502 for ; Fri, 2 Nov 2012 18:59:50 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA2Ixe5p010213 for ; Sat, 3 Nov 2012 05:59:40 +1100 Received: from titi.na.relay.ibm.com ([9.80.60.224]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA2IxZFe009980; Sat, 3 Nov 2012 05:59:37 +1100 From: Anthony Liguori To: fantonifabio@tiscali.it, xen-devel , Gerd Hoffmann In-Reply-To: <5093A592.1050005@tiscali.it> References: <5093A592.1050005@tiscali.it> User-Agent: Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Fri, 02 Nov 2012 08:29:43 -0500 Message-ID: <87ehkcw2t4.fsf@codemonkey.ws> MIME-Version: 1.0 x-cbid: 12110213-5816-0000-0000-0000052F0DEF Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org RmFiaW8gRmFudG9uaSA8ZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQ+IHdyaXRlczoKCj4gSSB0cmll ZCB0byBjb21waWxlIGFuZCB0ZXN0IHhlbi11bnN0YWJsZSAoY2hhbmdlc2V0IDI2MTI0OmJmMjQ5 Y2Q1ZjJjMSkgCj4gd2l0aCBxZW11IHVuc3RhYmxlIChjb21taXQgNGJhNzk1MDVmNDNiZDBhY2Uz NWMzZmU0MjE5N2ViMDJlN2UwNDc4ZSkgYnV0IAo+IGZhaWxlZCB3aXRoIHRoaXMgZXJyb3I6Cj4K PiBody94ZW5mYi5jOiBJbiBmdW5jdGlvbiDDonhlbmZiX2d1ZXN0X2NvcHnDojoKPiBody94ZW5m Yi5jOjY1MTo1OiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24gw6JkcHlf dXBkYXRlw6IgCj4gWy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24tZGVjbGFyYXRpb25dCj4gaHcv eGVuZmIuYzo2NTE6NTogZXJyb3I6IG5lc3RlZCBleHRlcm4gZGVjbGFyYXRpb24gb2Ygw6JkcHlf dXBkYXRlw6IgCj4gWy1XZXJyb3I9bmVzdGVkLWV4dGVybnNdCj4gaHcveGVuZmIuYzogSW4gZnVu Y3Rpb24gw6J4ZW5mYl91cGRhdGXDojoKPiBody94ZW5mYi5jOjc2OTo5OiBlcnJvcjogaW1wbGlj aXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24gw6JkcHlfcmVzaXplw6IgCj4gWy1XZXJyb3I9aW1w bGljaXQtZnVuY3Rpb24tZGVjbGFyYXRpb25dCj4gaHcveGVuZmIuYzo3Njk6OTogZXJyb3I6IG5l c3RlZCBleHRlcm4gZGVjbGFyYXRpb24gb2Ygw6JkcHlfcmVzaXplw6IgCj4gWy1XZXJyb3I9bmVz dGVkLWV4dGVybnNdCj4gY2MxOiBhbGwgd2FybmluZ3MgYmVpbmcgdHJlYXRlZCBhcyBlcnJvcnMK PiBtYWtlWzNdOiAqKiogW2h3L3hlbmZiLm9dIEVycm9yIDEKPiBtYWtlWzNdOiBMZWF2aW5nIGRp cmVjdG9yeSAKPiBgL21udC92bS94ZW4veGVuLXVuc3RhYmxlLmhnL3Rvb2xzL3FlbXUteGVuLWRp ci1yZW1vdGUnCj4gbWFrZVsyXTogKioqIFtzdWJkaXItYWxsLXFlbXUteGVuLWRpcl0gRXJyb3Ig Mgo+IG1ha2VbMl06IExlYXZpbmcgZGlyZWN0b3J5IGAvbW50L3ZtL3hlbi94ZW4tdW5zdGFibGUu aGcvdG9vbHMnCj4gbWFrZVsxXTogKioqIFtzdWJkaXJzLWluc3RhbGxdIEVycm9yIDIKPiBtYWtl WzFdOiBMZWF2aW5nIGRpcmVjdG9yeSBgL21udC92bS94ZW4veGVuLXVuc3RhYmxlLmhnL3Rvb2xz Jwo+IG1ha2U6ICoqKiBbaW5zdGFsbC10b29sc10gRXJyb3IgMgoKQ2FuIHlvdSB0YWtlIGEgbG9v ayBhdCB0aGlzIEdlcmQ/CgpUaGFua3MuCgpBbnRob255IExpZ3VvcmkKCj4KPiBCdWlsZCBvZiBz b21lIGRheXMgYWdvIHdhcyB3b3JraW5nICwgeGVuZmIgc2VlbSB0aGF0IG5lZWQgdG8gYmUgYWRh cHQgCj4gZm9yIGxhdGVzdCB2Z2EgY2hhbmdlcyBvbiBxZW11IHVwc3RyZWFtLgoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRl dmVsCg== From xen-devel-bounces@lists.xen.org Fri Nov 02 13:30:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHJx-0006am-W9; Fri, 02 Nov 2012 13:30:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHJw-0006ah-8N for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:30:00 +0000 Received: from [85.158.143.99:54580] by server-1.bemta-4.messagelabs.com id 95/29-27934-7DAC3905; Fri, 02 Nov 2012 13:29:59 +0000 X-Env-Sender: aliguori@us.ibm.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1351862994!21988808!1 X-Originating-IP: [122.248.162.2] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTIyLjI0OC4xNjIuMiA9PiAyODMxNjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25875 invoked from network); 2 Nov 2012 13:29:58 -0000 Received: from e28smtp02.in.ibm.com (HELO e28smtp02.in.ibm.com) (122.248.162.2) by server-10.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:29:58 -0000 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Nov 2012 18:59:53 +0530 Received: from d28relay01.in.ibm.com (9.184.220.58) by e28smtp02.in.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 2 Nov 2012 18:59:51 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA2DTnKi25952502 for ; Fri, 2 Nov 2012 18:59:50 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA2Ixe5p010213 for ; Sat, 3 Nov 2012 05:59:40 +1100 Received: from titi.na.relay.ibm.com ([9.80.60.224]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA2IxZFe009980; Sat, 3 Nov 2012 05:59:37 +1100 From: Anthony Liguori To: fantonifabio@tiscali.it, xen-devel , Gerd Hoffmann In-Reply-To: <5093A592.1050005@tiscali.it> References: <5093A592.1050005@tiscali.it> User-Agent: Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Fri, 02 Nov 2012 08:29:43 -0500 Message-ID: <87ehkcw2t4.fsf@codemonkey.ws> MIME-Version: 1.0 x-cbid: 12110213-5816-0000-0000-0000052F0DEF Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org RmFiaW8gRmFudG9uaSA8ZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQ+IHdyaXRlczoKCj4gSSB0cmll ZCB0byBjb21waWxlIGFuZCB0ZXN0IHhlbi11bnN0YWJsZSAoY2hhbmdlc2V0IDI2MTI0OmJmMjQ5 Y2Q1ZjJjMSkgCj4gd2l0aCBxZW11IHVuc3RhYmxlIChjb21taXQgNGJhNzk1MDVmNDNiZDBhY2Uz NWMzZmU0MjE5N2ViMDJlN2UwNDc4ZSkgYnV0IAo+IGZhaWxlZCB3aXRoIHRoaXMgZXJyb3I6Cj4K PiBody94ZW5mYi5jOiBJbiBmdW5jdGlvbiDDonhlbmZiX2d1ZXN0X2NvcHnDojoKPiBody94ZW5m Yi5jOjY1MTo1OiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24gw6JkcHlf dXBkYXRlw6IgCj4gWy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24tZGVjbGFyYXRpb25dCj4gaHcv eGVuZmIuYzo2NTE6NTogZXJyb3I6IG5lc3RlZCBleHRlcm4gZGVjbGFyYXRpb24gb2Ygw6JkcHlf dXBkYXRlw6IgCj4gWy1XZXJyb3I9bmVzdGVkLWV4dGVybnNdCj4gaHcveGVuZmIuYzogSW4gZnVu Y3Rpb24gw6J4ZW5mYl91cGRhdGXDojoKPiBody94ZW5mYi5jOjc2OTo5OiBlcnJvcjogaW1wbGlj aXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24gw6JkcHlfcmVzaXplw6IgCj4gWy1XZXJyb3I9aW1w bGljaXQtZnVuY3Rpb24tZGVjbGFyYXRpb25dCj4gaHcveGVuZmIuYzo3Njk6OTogZXJyb3I6IG5l c3RlZCBleHRlcm4gZGVjbGFyYXRpb24gb2Ygw6JkcHlfcmVzaXplw6IgCj4gWy1XZXJyb3I9bmVz dGVkLWV4dGVybnNdCj4gY2MxOiBhbGwgd2FybmluZ3MgYmVpbmcgdHJlYXRlZCBhcyBlcnJvcnMK PiBtYWtlWzNdOiAqKiogW2h3L3hlbmZiLm9dIEVycm9yIDEKPiBtYWtlWzNdOiBMZWF2aW5nIGRp cmVjdG9yeSAKPiBgL21udC92bS94ZW4veGVuLXVuc3RhYmxlLmhnL3Rvb2xzL3FlbXUteGVuLWRp ci1yZW1vdGUnCj4gbWFrZVsyXTogKioqIFtzdWJkaXItYWxsLXFlbXUteGVuLWRpcl0gRXJyb3Ig Mgo+IG1ha2VbMl06IExlYXZpbmcgZGlyZWN0b3J5IGAvbW50L3ZtL3hlbi94ZW4tdW5zdGFibGUu aGcvdG9vbHMnCj4gbWFrZVsxXTogKioqIFtzdWJkaXJzLWluc3RhbGxdIEVycm9yIDIKPiBtYWtl WzFdOiBMZWF2aW5nIGRpcmVjdG9yeSBgL21udC92bS94ZW4veGVuLXVuc3RhYmxlLmhnL3Rvb2xz Jwo+IG1ha2U6ICoqKiBbaW5zdGFsbC10b29sc10gRXJyb3IgMgoKQ2FuIHlvdSB0YWtlIGEgbG9v ayBhdCB0aGlzIEdlcmQ/CgpUaGFua3MuCgpBbnRob255IExpZ3VvcmkKCj4KPiBCdWlsZCBvZiBz b21lIGRheXMgYWdvIHdhcyB3b3JraW5nICwgeGVuZmIgc2VlbSB0aGF0IG5lZWQgdG8gYmUgYWRh cHQgCj4gZm9yIGxhdGVzdCB2Z2EgY2hhbmdlcyBvbiBxZW11IHVwc3RyZWFtLgoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRl dmVsCg== From xen-devel-bounces@lists.xen.org Fri Nov 02 13:45:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:45:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHYf-000727-Fd; Fri, 02 Nov 2012 13:45:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHYe-000722-OM for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:45:12 +0000 Received: from [85.158.137.99:14336] by server-16.bemta-3.messagelabs.com id 60/8E-07461-76EC3905; Fri, 02 Nov 2012 13:45:11 +0000 X-Env-Sender: kraxel@redhat.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1351863909!12679725!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTg2MDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30796 invoked from network); 2 Nov 2012 13:45:09 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-7.tower-217.messagelabs.com with SMTP; 2 Nov 2012 13:45:09 -0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA2Dj3Cg002899 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 09:45:07 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA2Dj11W032525; Fri, 2 Nov 2012 09:45:02 -0400 Message-ID: <5093CE5D.8070409@redhat.com> Date: Fri, 02 Nov 2012 14:45:01 +0100 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121026 Thunderbird/10.0.10 MIME-Version: 1.0 To: Anthony Liguori References: <5093A592.1050005@tiscali.it> <87ehkcw2t4.fsf@codemonkey.ws> In-Reply-To: <87ehkcw2t4.fsf@codemonkey.ws> X-Enigmail-Version: 1.4 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Cc: xen-devel , fantonifabio@tiscali.it Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org ICBIaSwKCj4+IGh3L3hlbmZiLmM6NjUxOjU6IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBv ZiBmdW5jdGlvbiDDomRweV91cGRhdGXDoiAKPj4gWy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24t ZGVjbGFyYXRpb25dCj4gCj4gQ2FuIHlvdSB0YWtlIGEgbG9vayBhdCB0aGlzIEdlcmQ/CgpIYXBw ZW5lZCBhbHJlYWR5OiBodHRwOi8vcGF0Y2h3b3JrLm96bGFicy5vcmcvcGF0Y2gvMTk2NDkyLwoK Y2hlZXJzLAogIEdlcmQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0 cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Fri Nov 02 13:45:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:45:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHYf-000727-Fd; Fri, 02 Nov 2012 13:45:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHYe-000722-OM for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:45:12 +0000 Received: from [85.158.137.99:14336] by server-16.bemta-3.messagelabs.com id 60/8E-07461-76EC3905; Fri, 02 Nov 2012 13:45:11 +0000 X-Env-Sender: kraxel@redhat.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1351863909!12679725!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTg2MDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30796 invoked from network); 2 Nov 2012 13:45:09 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-7.tower-217.messagelabs.com with SMTP; 2 Nov 2012 13:45:09 -0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA2Dj3Cg002899 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 09:45:07 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA2Dj11W032525; Fri, 2 Nov 2012 09:45:02 -0400 Message-ID: <5093CE5D.8070409@redhat.com> Date: Fri, 02 Nov 2012 14:45:01 +0100 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121026 Thunderbird/10.0.10 MIME-Version: 1.0 To: Anthony Liguori References: <5093A592.1050005@tiscali.it> <87ehkcw2t4.fsf@codemonkey.ws> In-Reply-To: <87ehkcw2t4.fsf@codemonkey.ws> X-Enigmail-Version: 1.4 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Cc: xen-devel , fantonifabio@tiscali.it Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org ICBIaSwKCj4+IGh3L3hlbmZiLmM6NjUxOjU6IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBv ZiBmdW5jdGlvbiDDomRweV91cGRhdGXDoiAKPj4gWy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24t ZGVjbGFyYXRpb25dCj4gCj4gQ2FuIHlvdSB0YWtlIGEgbG9vayBhdCB0aGlzIEdlcmQ/CgpIYXBw ZW5lZCBhbHJlYWR5OiBodHRwOi8vcGF0Y2h3b3JrLm96bGFicy5vcmcvcGF0Y2gvMTk2NDkyLwoK Y2hlZXJzLAogIEdlcmQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0 cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Fri Nov 02 13:52:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:52:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHfm-0007Jr-Ff; Fri, 02 Nov 2012 13:52:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHfl-0007Jm-5P for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:52:33 +0000 Received: from [85.158.137.99:20343] by server-1.bemta-3.messagelabs.com id E4/00-12169-A10D3905; Fri, 02 Nov 2012 13:52:26 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1351864344!14352431!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 2 Nov 2012 13:52:26 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:52:26 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2DqDgY005576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 13:52:14 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2DqCsE017645 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 13:52:13 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2DqCkR012772; Fri, 2 Nov 2012 08:52:12 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 06:52:11 -0700 Date: Fri, 2 Nov 2012 09:52:09 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich , daniel.kiper@oracle.com Message-ID: <20121102135209.GB3038@konrad-lan.dumpdata.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D42A020000780008EB7B@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> > possible boot with lvm volume, fallback options ecc... > >> > >> Just get a suitable tool chain installed then. > >> > >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> > load efi variable. > >> > >> Sure, because only xen.efi has the code to deal with such. > >> > >> (Btw., I assume you aren't aware that any boot manager > >> whatsoever, other than the one coming with EFI, is sort of > >> bogus under EFI?) > > > >Unfortunately it looks like more and more people are of the opinion that > >grub2 is useful even on UEFI firmware. > >For example, it is pretty clear that Ubuntu is still going to boot Xen > >via grub2 no matter how the firmware looks like. > > Then they need to be tought how to do it properly, the more that Linux itself > now is capable of booting without a boot loader (other than the EFI one). > > >What would it take to make Xen work properly with grub2 on a UEFI firmware? > > I can't be that difficult. I believe the only issue was the check to do the Multiboot-E820 parsing before the E801 parsing? Perhaps that has already been done? > > >I think that we should add it as a work item for Xen 4.3. > > If you have someone to do that work. I'm willing to review the resulting > changes, but I currently don't see me doing anything here (as being totally > unimportant and - just to repeat that - conceptually wrong). > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:52:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:52:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHfm-0007Jr-Ff; Fri, 02 Nov 2012 13:52:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHfl-0007Jm-5P for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:52:33 +0000 Received: from [85.158.137.99:20343] by server-1.bemta-3.messagelabs.com id E4/00-12169-A10D3905; Fri, 02 Nov 2012 13:52:26 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1351864344!14352431!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 2 Nov 2012 13:52:26 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:52:26 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2DqDgY005576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 13:52:14 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2DqCsE017645 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 13:52:13 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2DqCkR012772; Fri, 2 Nov 2012 08:52:12 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 06:52:11 -0700 Date: Fri, 2 Nov 2012 09:52:09 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich , daniel.kiper@oracle.com Message-ID: <20121102135209.GB3038@konrad-lan.dumpdata.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5092D42A020000780008EB7B@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> > possible boot with lvm volume, fallback options ecc... > >> > >> Just get a suitable tool chain installed then. > >> > >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> > load efi variable. > >> > >> Sure, because only xen.efi has the code to deal with such. > >> > >> (Btw., I assume you aren't aware that any boot manager > >> whatsoever, other than the one coming with EFI, is sort of > >> bogus under EFI?) > > > >Unfortunately it looks like more and more people are of the opinion that > >grub2 is useful even on UEFI firmware. > >For example, it is pretty clear that Ubuntu is still going to boot Xen > >via grub2 no matter how the firmware looks like. > > Then they need to be tought how to do it properly, the more that Linux itself > now is capable of booting without a boot loader (other than the EFI one). > > >What would it take to make Xen work properly with grub2 on a UEFI firmware? > > I can't be that difficult. I believe the only issue was the check to do the Multiboot-E820 parsing before the E801 parsing? Perhaps that has already been done? > > >I think that we should add it as a work item for Xen 4.3. > > If you have someone to do that work. I'm willing to review the resulting > changes, but I currently don't see me doing anything here (as being totally > unimportant and - just to repeat that - conceptually wrong). > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:55:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHiY-0007RC-6l; Fri, 02 Nov 2012 13:55:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHiW-0007R5-Ih for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:55:24 +0000 Received: from [85.158.143.99:42467] by server-2.bemta-4.messagelabs.com id BB/16-28922-BC0D3905; Fri, 02 Nov 2012 13:55:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351864520!27818663!1 X-Originating-IP: [148.87.113.117] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQ4Ljg3LjExMy4xMTcgPT4gODMzNDAx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3905 invoked from network); 2 Nov 2012 13:55:21 -0000 Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by server-3.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:55:21 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2DtIlf018945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 13:55:19 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2DtH3j026950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 13:55:18 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2DtH3s014738; Fri, 2 Nov 2012 08:55:17 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 06:55:17 -0700 Date: Fri, 2 Nov 2012 09:55:15 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102135514.GC3038@konrad-lan.dumpdata.com> References: <5093D4B502000078000A606E@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093D4B502000078000A606E@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: > It has never been used for anything, and Linux 3.7 doesn't propagate > this information anymore. > > Signed-off-by: Jan Beulich > --- > Konrad, on the pv-ops side it may be better to pass zero rather than > leaving the field completely uninitialized. I think this got taken care of by: commit c59687f8466df36633d937cc298aad465d704990 Author: Daniel Lezcano Date: Wed Sep 5 15:13:48 2012 +0200 cpuidle / ACPI : remove power from acpi_processor_cx structure Remove the unused power field from struct struct acpi_processor_cx. [rjw: Modified changelog.] And the the xen_processor_cx is allocated using kcalloc which resets everything to zero - so I think we are safe there. Thx! _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 13:55:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 13:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHiY-0007RC-6l; Fri, 02 Nov 2012 13:55:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHiW-0007R5-Ih for xen-devel@lists.xen.org; Fri, 02 Nov 2012 13:55:24 +0000 Received: from [85.158.143.99:42467] by server-2.bemta-4.messagelabs.com id BB/16-28922-BC0D3905; Fri, 02 Nov 2012 13:55:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1351864520!27818663!1 X-Originating-IP: [148.87.113.117] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQ4Ljg3LjExMy4xMTcgPT4gODMzNDAx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3905 invoked from network); 2 Nov 2012 13:55:21 -0000 Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by server-3.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 13:55:21 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2DtIlf018945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 13:55:19 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2DtH3j026950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 13:55:18 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2DtH3s014738; Fri, 2 Nov 2012 08:55:17 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 06:55:17 -0700 Date: Fri, 2 Nov 2012 09:55:15 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102135514.GC3038@konrad-lan.dumpdata.com> References: <5093D4B502000078000A606E@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093D4B502000078000A606E@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: > It has never been used for anything, and Linux 3.7 doesn't propagate > this information anymore. > > Signed-off-by: Jan Beulich > --- > Konrad, on the pv-ops side it may be better to pass zero rather than > leaving the field completely uninitialized. I think this got taken care of by: commit c59687f8466df36633d937cc298aad465d704990 Author: Daniel Lezcano Date: Wed Sep 5 15:13:48 2012 +0200 cpuidle / ACPI : remove power from acpi_processor_cx structure Remove the unused power field from struct struct acpi_processor_cx. [rjw: Modified changelog.] And the the xen_processor_cx is allocated using kcalloc which resets everything to zero - so I think we are safe there. Thx! _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:00:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHnK-0007h8-1p; Fri, 02 Nov 2012 14:00:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHnI-0007h1-IF for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:00:20 +0000 Received: from [85.158.139.83:53587] by server-14.bemta-5.messagelabs.com id 1C/F2-21768-3F1D3905; Fri, 02 Nov 2012 14:00:19 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-5.tower-182.messagelabs.com!1351864815!28515420!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28790 invoked from network); 2 Nov 2012 14:00:15 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-5.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:00:15 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 40C5E4016C5; Fri, 2 Nov 2012 15:00:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zwVK4IxWPoNv; Fri, 2 Nov 2012 15:00:13 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id 070544016C2; Fri, 2 Nov 2012 15:00:12 +0100 (CET) Message-ID: <5093D1E9.40806@tiscali.it> Date: Fri, 02 Nov 2012 15:00:09 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Daniel Kiper References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102113651.GA9845@router-fw-old.local.net-space.pl> In-Reply-To: <20121102113651.GA9845@router-fw-old.local.net-space.pl> Cc: konrad.wilk@oracle.com, daniel.kiper@oracle.com, stefano.stabellini@eu.citrix.com, george.dunlap@citrix.com, xen-devel@lists.xen.org, Jan Beulich Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4972352783070105894==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============4972352783070105894== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms020904070002090202000500" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms020904070002090202000500 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Il 02/11/2012 12:36, Daniel Kiper ha scritto: > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: >>>>> Stefano Stabellini 11/01/12 4:50= PM >>> >>> On Tue, 11 Sep 2012, Jan Beulich wrote: >>>>>>> On 11.09.12 at 15:17, Fabio Fantoni wro= te: >>>>> xen.efi not compile when we build xen on Wheezy and probably is not= >>>>> possible boot with lvm volume, fallback options ecc... >>>> Just get a suitable tool chain installed then. >>>> >>>>> UEFI with grub2 seem the best option but with xen hypervisor seem n= ot >>>>> load efi variable. >>>> Sure, because only xen.efi has the code to deal with such. >>>> >>>> (Btw., I assume you aren't aware that any boot manager >>>> whatsoever, other than the one coming with EFI, is sort of >>>> bogus under EFI?) >>> Unfortunately it looks like more and more people are of the opinion t= hat >>> grub2 is useful even on UEFI firmware. >>> For example, it is pretty clear that Ubuntu is still going to boot Xe= n >>> via grub2 no matter how the firmware looks like. >> Then they need to be tought how to do it properly, the more that Linux= itself >> now is capable of booting without a boot loader (other than the EFI on= e). >> >>> What would it take to make Xen work properly with grub2 on a UEFI fir= mware? >> I can't be that difficult. >> >>> I think that we should add it as a work item for Xen 4.3. >> If you have someone to do that work. I'm willing to review the resulti= ng >> changes, but I currently don't see me doing anything here (as being to= tally >> unimportant and - just to repeat that - conceptually wrong). > Heh... I agree with Jan but there are so many things conceptually wrong= > used by millions of people and we could not change that. Let's fix > (broke?) it. I am going to work on EFI stuff in upstream kernel and > I think this task could be assigned to me too. > > Daniel > > > ----- > Nessun virus nel messaggio. > Controllato da AVG - www.avg.com > Versione: 2012.0.2221 / Database dei virus: 2441/5368 - Data di rilasc= io: 01/11/2012 > > Thanks for getting this task. Hope to hear from you soon regard this,=20 let us know as soon as you can post patches. --------------ms020904070002090202000500 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjE0MDAwOVowIwYJKoZIhvcNAQkEMRYEFOLP2CgdHSNKGCJBB583FRq3 zF2LMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEAEgRALE3/0LiJrcBZgRqLUl55 c47otDrFkX+jqSFeurevgosAMQJWhev8eVa6+RaPCgSYAdMivGXaESO1MCybfRFqjOVDsiIZ V3XFTd4Gwe3i4cMbI0fUBcAt69PmCQYdnYg/qNEG7QSVvcRjNRcJ4jlgn7Dp6lhmLCK0O3cz 5fd8V7kmlI9tpcrE1WcnIutwrTYJb5gGYMOrze1fg+HS3G0xCHQPXy2imHspBd09HcoJEtRk DycTfNaS4Pnd6ofIqain5+8htCcyqi4z8qJw/5V3miiuWK+vkXsTnLmhqi4NUBiF05c4qw0b ly7KGTEiWJ7pvnNSoRxD2EKlg8RKoAAAAAAAAA== --------------ms020904070002090202000500-- --===============4972352783070105894== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4972352783070105894==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:00:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHnK-0007h8-1p; Fri, 02 Nov 2012 14:00:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHnI-0007h1-IF for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:00:20 +0000 Received: from [85.158.139.83:53587] by server-14.bemta-5.messagelabs.com id 1C/F2-21768-3F1D3905; Fri, 02 Nov 2012 14:00:19 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-5.tower-182.messagelabs.com!1351864815!28515420!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28790 invoked from network); 2 Nov 2012 14:00:15 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-5.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:00:15 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 40C5E4016C5; Fri, 2 Nov 2012 15:00:15 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zwVK4IxWPoNv; Fri, 2 Nov 2012 15:00:13 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id 070544016C2; Fri, 2 Nov 2012 15:00:12 +0100 (CET) Message-ID: <5093D1E9.40806@tiscali.it> Date: Fri, 02 Nov 2012 15:00:09 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Daniel Kiper References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102113651.GA9845@router-fw-old.local.net-space.pl> In-Reply-To: <20121102113651.GA9845@router-fw-old.local.net-space.pl> Cc: konrad.wilk@oracle.com, daniel.kiper@oracle.com, stefano.stabellini@eu.citrix.com, george.dunlap@citrix.com, xen-devel@lists.xen.org, Jan Beulich Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4972352783070105894==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============4972352783070105894== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms020904070002090202000500" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms020904070002090202000500 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Il 02/11/2012 12:36, Daniel Kiper ha scritto: > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: >>>>> Stefano Stabellini 11/01/12 4:50= PM >>> >>> On Tue, 11 Sep 2012, Jan Beulich wrote: >>>>>>> On 11.09.12 at 15:17, Fabio Fantoni wro= te: >>>>> xen.efi not compile when we build xen on Wheezy and probably is not= >>>>> possible boot with lvm volume, fallback options ecc... >>>> Just get a suitable tool chain installed then. >>>> >>>>> UEFI with grub2 seem the best option but with xen hypervisor seem n= ot >>>>> load efi variable. >>>> Sure, because only xen.efi has the code to deal with such. >>>> >>>> (Btw., I assume you aren't aware that any boot manager >>>> whatsoever, other than the one coming with EFI, is sort of >>>> bogus under EFI?) >>> Unfortunately it looks like more and more people are of the opinion t= hat >>> grub2 is useful even on UEFI firmware. >>> For example, it is pretty clear that Ubuntu is still going to boot Xe= n >>> via grub2 no matter how the firmware looks like. >> Then they need to be tought how to do it properly, the more that Linux= itself >> now is capable of booting without a boot loader (other than the EFI on= e). >> >>> What would it take to make Xen work properly with grub2 on a UEFI fir= mware? >> I can't be that difficult. >> >>> I think that we should add it as a work item for Xen 4.3. >> If you have someone to do that work. I'm willing to review the resulti= ng >> changes, but I currently don't see me doing anything here (as being to= tally >> unimportant and - just to repeat that - conceptually wrong). > Heh... I agree with Jan but there are so many things conceptually wrong= > used by millions of people and we could not change that. Let's fix > (broke?) it. I am going to work on EFI stuff in upstream kernel and > I think this task could be assigned to me too. > > Daniel > > > ----- > Nessun virus nel messaggio. > Controllato da AVG - www.avg.com > Versione: 2012.0.2221 / Database dei virus: 2441/5368 - Data di rilasc= io: 01/11/2012 > > Thanks for getting this task. Hope to hear from you soon regard this,=20 let us know as soon as you can post patches. --------------ms020904070002090202000500 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjE0MDAwOVowIwYJKoZIhvcNAQkEMRYEFOLP2CgdHSNKGCJBB583FRq3 zF2LMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEAEgRALE3/0LiJrcBZgRqLUl55 c47otDrFkX+jqSFeurevgosAMQJWhev8eVa6+RaPCgSYAdMivGXaESO1MCybfRFqjOVDsiIZ V3XFTd4Gwe3i4cMbI0fUBcAt69PmCQYdnYg/qNEG7QSVvcRjNRcJ4jlgn7Dp6lhmLCK0O3cz 5fd8V7kmlI9tpcrE1WcnIutwrTYJb5gGYMOrze1fg+HS3G0xCHQPXy2imHspBd09HcoJEtRk DycTfNaS4Pnd6ofIqain5+8htCcyqi4z8qJw/5V3miiuWK+vkXsTnLmhqi4NUBiF05c4qw0b ly7KGTEiWJ7pvnNSoRxD2EKlg8RKoAAAAAAAAA== --------------ms020904070002090202000500-- --===============4972352783070105894== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4972352783070105894==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:07:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHtg-0008BC-Lc; Fri, 02 Nov 2012 14:06:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHtg-0008B5-88 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:06:56 +0000 Received: from [85.158.143.35:17758] by server-1.bemta-4.messagelabs.com id 97/FA-27934-F73D3905; Fri, 02 Nov 2012 14:06:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1351865213!5748051!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11218 invoked from network); 2 Nov 2012 14:06:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:06:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:07:05 +0000 Message-Id: <5093E1B602000078000A6105@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:07:34 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <5093D4B502000078000A606E@nat28.tlf.novell.com> <20121102135514.GC3038@konrad-lan.dumpdata.com> In-Reply-To: <20121102135514.GC3038@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 14:55, Konrad Rzeszutek Wilk wrote: > On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: >> It has never been used for anything, and Linux 3.7 doesn't propagate >> this information anymore. >> >> Signed-off-by: Jan Beulich >> --- >> Konrad, on the pv-ops side it may be better to pass zero rather than >> leaving the field completely uninitialized. > > I think this got taken care of by: > > commit c59687f8466df36633d937cc298aad465d704990 > Author: Daniel Lezcano > Date: Wed Sep 5 15:13:48 2012 +0200 > > cpuidle / ACPI : remove power from acpi_processor_cx structure > > Remove the unused power field from struct struct acpi_processor_cx. > > [rjw: Modified changelog.] That's the commit I was referring to. > And the the xen_processor_cx is allocated using kcalloc which resets > everything to zero - so I think we are safe there. And that I didn't pay attention to - sorry for the noise then. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:07:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHtg-0008BC-Lc; Fri, 02 Nov 2012 14:06:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHtg-0008B5-88 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:06:56 +0000 Received: from [85.158.143.35:17758] by server-1.bemta-4.messagelabs.com id 97/FA-27934-F73D3905; Fri, 02 Nov 2012 14:06:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1351865213!5748051!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11218 invoked from network); 2 Nov 2012 14:06:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:06:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:07:05 +0000 Message-Id: <5093E1B602000078000A6105@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:07:34 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <5093D4B502000078000A606E@nat28.tlf.novell.com> <20121102135514.GC3038@konrad-lan.dumpdata.com> In-Reply-To: <20121102135514.GC3038@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 14:55, Konrad Rzeszutek Wilk wrote: > On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: >> It has never been used for anything, and Linux 3.7 doesn't propagate >> this information anymore. >> >> Signed-off-by: Jan Beulich >> --- >> Konrad, on the pv-ops side it may be better to pass zero rather than >> leaving the field completely uninitialized. > > I think this got taken care of by: > > commit c59687f8466df36633d937cc298aad465d704990 > Author: Daniel Lezcano > Date: Wed Sep 5 15:13:48 2012 +0200 > > cpuidle / ACPI : remove power from acpi_processor_cx structure > > Remove the unused power field from struct struct acpi_processor_cx. > > [rjw: Modified changelog.] That's the commit I was referring to. > And the the xen_processor_cx is allocated using kcalloc which resets > everything to zero - so I think we are safe there. And that I didn't pay attention to - sorry for the noise then. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:10:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:10:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHxM-0008OG-FO; Fri, 02 Nov 2012 14:10:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHxK-0008O3-Ne for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:10:42 +0000 Received: from [85.158.139.211:27361] by server-16.bemta-5.messagelabs.com id 30/D9-04786-264D3905; Fri, 02 Nov 2012 14:10:42 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351865441!18194474!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3831 invoked from network); 2 Nov 2012 14:10:41 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-206.messagelabs.com with SMTP; 2 Nov 2012 14:10:41 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:10:55 +0000 Message-Id: <5093E29A02000078000A611D@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:11:22 +0000 From: "Jan Beulich" To: , "Konrad Rzeszutek Wilk" References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> In-Reply-To: <20121102135209.GB3038@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 14:52, Konrad Rzeszutek Wilk wrote: > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: >> >>> Stefano Stabellini 11/01/12 4:50 PM >>> >> >On Tue, 11 Sep 2012, Jan Beulich wrote: >> >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: >> >> > xen.efi not compile when we build xen on Wheezy and probably is not >> >> > possible boot with lvm volume, fallback options ecc... >> >> >> >> Just get a suitable tool chain installed then. >> >> >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not >> >> > load efi variable. >> >> >> >> Sure, because only xen.efi has the code to deal with such. >> >> >> >> (Btw., I assume you aren't aware that any boot manager >> >> whatsoever, other than the one coming with EFI, is sort of >> >> bogus under EFI?) >> > >> >Unfortunately it looks like more and more people are of the opinion that >> >grub2 is useful even on UEFI firmware. >> >For example, it is pretty clear that Ubuntu is still going to boot Xen >> >via grub2 no matter how the firmware looks like. >> >> Then they need to be tought how to do it properly, the more that Linux > itself >> now is capable of booting without a boot loader (other than the EFI one). >> >> >What would it take to make Xen work properly with grub2 on a UEFI firmware? >> >> I can't be that difficult. > > I believe the only issue was the check to do the Multiboot-E820 parsing > before the E801 parsing? Perhaps that has already been done? That's in all 4.x trees already. But no - the other important aspect is that without retrieving/passing on the proper EFI table pointers, on a legacy free system Xen and Dom0 won't be able to locate the ACPI tables. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:10:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:10:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHxM-0008OG-FO; Fri, 02 Nov 2012 14:10:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUHxK-0008O3-Ne for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:10:42 +0000 Received: from [85.158.139.211:27361] by server-16.bemta-5.messagelabs.com id 30/D9-04786-264D3905; Fri, 02 Nov 2012 14:10:42 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1351865441!18194474!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3831 invoked from network); 2 Nov 2012 14:10:41 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-206.messagelabs.com with SMTP; 2 Nov 2012 14:10:41 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:10:55 +0000 Message-Id: <5093E29A02000078000A611D@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:11:22 +0000 From: "Jan Beulich" To: , "Konrad Rzeszutek Wilk" References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> In-Reply-To: <20121102135209.GB3038@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 14:52, Konrad Rzeszutek Wilk wrote: > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: >> >>> Stefano Stabellini 11/01/12 4:50 PM >>> >> >On Tue, 11 Sep 2012, Jan Beulich wrote: >> >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: >> >> > xen.efi not compile when we build xen on Wheezy and probably is not >> >> > possible boot with lvm volume, fallback options ecc... >> >> >> >> Just get a suitable tool chain installed then. >> >> >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not >> >> > load efi variable. >> >> >> >> Sure, because only xen.efi has the code to deal with such. >> >> >> >> (Btw., I assume you aren't aware that any boot manager >> >> whatsoever, other than the one coming with EFI, is sort of >> >> bogus under EFI?) >> > >> >Unfortunately it looks like more and more people are of the opinion that >> >grub2 is useful even on UEFI firmware. >> >For example, it is pretty clear that Ubuntu is still going to boot Xen >> >via grub2 no matter how the firmware looks like. >> >> Then they need to be tought how to do it properly, the more that Linux > itself >> now is capable of booting without a boot loader (other than the EFI one). >> >> >What would it take to make Xen work properly with grub2 on a UEFI firmware? >> >> I can't be that difficult. > > I believe the only issue was the check to do the Multiboot-E820 parsing > before the E801 parsing? Perhaps that has already been done? That's in all 4.x trees already. But no - the other important aspect is that without retrieving/passing on the proper EFI table pointers, on a legacy free system Xen and Dom0 won't be able to locate the ACPI tables. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:15:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:15:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI1A-0000HI-4P; Fri, 02 Nov 2012 14:14:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI18-0000HC-BS for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 14:14:38 +0000 Received: from [85.158.138.51:63327] by server-16.bemta-3.messagelabs.com id AE/8E-07461-D45D3905; Fri, 02 Nov 2012 14:14:37 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1351865676!20422830!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27344 invoked from network); 2 Nov 2012 14:14:37 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:14:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="15558598" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 14:13:40 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 14:13:39 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUI0B-0004zR-Nq; Fri, 02 Nov 2012 14:13:39 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUI0B-0006nj-Mg; Fri, 02 Nov 2012 14:13:39 +0000 To: Message-ID: From: xen.org Date: Fri, 2 Nov 2012 14:13:39 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14343: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14343 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14343/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-amd64 4 xen-build fail REGR. vs. 14199 build-amd64-pvops 4 kernel-build fail REGR. vs. 14199 build-i386 4 xen-build fail REGR. vs. 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-sedf-pin 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-pcipt-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-amd64-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-sedf 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win 1 xen-build-check(1) blocked n/a test-amd64-amd64-win 1 xen-build-check(1) blocked n/a test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-winxpsp3 1 xen-build-check(1) blocked n/a version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 fail build-i386 fail build-amd64-pvops fail build-i386-pvops pass test-amd64-amd64-xl blocked test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 blocked test-amd64-amd64-xl-win7-amd64 blocked test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel blocked test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair blocked test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin blocked test-amd64-amd64-pv blocked test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf blocked test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win blocked test-amd64-i386-win blocked test-amd64-amd64-xl-win blocked test-amd64-amd64-xl-qemuu-winxpsp3 blocked test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 blocked ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit 27d0858dbcf199838b8c50a3e94d397bf326d986 Author: Greg Kroah-Hartman Date: Wed Oct 31 09:51:59 2012 -0700 Linux 3.0.50 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:15:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:15:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI1A-0000HI-4P; Fri, 02 Nov 2012 14:14:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI18-0000HC-BS for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 14:14:38 +0000 Received: from [85.158.138.51:63327] by server-16.bemta-3.messagelabs.com id AE/8E-07461-D45D3905; Fri, 02 Nov 2012 14:14:37 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1351865676!20422830!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27344 invoked from network); 2 Nov 2012 14:14:37 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:14:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="15558598" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 14:13:40 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 14:13:39 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUI0B-0004zR-Nq; Fri, 02 Nov 2012 14:13:39 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUI0B-0006nj-Mg; Fri, 02 Nov 2012 14:13:39 +0000 To: Message-ID: From: xen.org Date: Fri, 2 Nov 2012 14:13:39 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14343: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14343 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14343/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-amd64 4 xen-build fail REGR. vs. 14199 build-amd64-pvops 4 kernel-build fail REGR. vs. 14199 build-i386 4 xen-build fail REGR. vs. 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-sedf-pin 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-pcipt-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-amd64-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-sedf 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win 1 xen-build-check(1) blocked n/a test-amd64-amd64-win 1 xen-build-check(1) blocked n/a test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-winxpsp3 1 xen-build-check(1) blocked n/a version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 fail build-i386 fail build-amd64-pvops fail build-i386-pvops pass test-amd64-amd64-xl blocked test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 blocked test-amd64-amd64-xl-win7-amd64 blocked test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel blocked test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair blocked test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin blocked test-amd64-amd64-pv blocked test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf blocked test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win blocked test-amd64-i386-win blocked test-amd64-amd64-xl-win blocked test-amd64-amd64-xl-qemuu-winxpsp3 blocked test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 blocked ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit 27d0858dbcf199838b8c50a3e94d397bf326d986 Author: Greg Kroah-Hartman Date: Wed Oct 31 09:51:59 2012 -0700 Linux 3.0.50 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:17:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:17:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI3t-0000Qy-SB; Fri, 02 Nov 2012 14:17:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI3t-0000Qs-1O for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:17:29 +0000 Received: from [85.158.139.83:62424] by server-11.bemta-5.messagelabs.com id A0/40-03409-8F5D3905; Fri, 02 Nov 2012 14:17:28 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1351865846!24203845!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30401 invoked from network); 2 Nov 2012 14:17:27 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:17:27 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2EHL0M023837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 14:17:22 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2EHK5Z007964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 14:17:21 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2EHKeT010200; Fri, 2 Nov 2012 09:17:20 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 07:17:20 -0700 Date: Fri, 2 Nov 2012 10:17:17 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102141717.GE3038@konrad-lan.dumpdata.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E29A02000078000A611D@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: daniel.kiper@oracle.com, xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:11:22PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 14:52, Konrad Rzeszutek Wilk wrote: > > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >> >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >> >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> >> > possible boot with lvm volume, fallback options ecc... > >> >> > >> >> Just get a suitable tool chain installed then. > >> >> > >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> >> > load efi variable. > >> >> > >> >> Sure, because only xen.efi has the code to deal with such. > >> >> > >> >> (Btw., I assume you aren't aware that any boot manager > >> >> whatsoever, other than the one coming with EFI, is sort of > >> >> bogus under EFI?) > >> > > >> >Unfortunately it looks like more and more people are of the opinion that > >> >grub2 is useful even on UEFI firmware. > >> >For example, it is pretty clear that Ubuntu is still going to boot Xen > >> >via grub2 no matter how the firmware looks like. > >> > >> Then they need to be tought how to do it properly, the more that Linux > > itself > >> now is capable of booting without a boot loader (other than the EFI one). > >> > >> >What would it take to make Xen work properly with grub2 on a UEFI firmware? > >> > >> I can't be that difficult. > > > > I believe the only issue was the check to do the Multiboot-E820 parsing > > before the E801 parsing? Perhaps that has already been done? > > That's in all 4.x trees already. But no - the other important aspect > is that without retrieving/passing on the proper EFI table pointers, > on a legacy free system Xen and Dom0 won't be able to locate the > ACPI tables. Ah yes (). I think the work-around could be to use the kexec introduced arguments: "acpi_rsdp=" > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:17:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:17:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI3t-0000Qy-SB; Fri, 02 Nov 2012 14:17:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI3t-0000Qs-1O for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:17:29 +0000 Received: from [85.158.139.83:62424] by server-11.bemta-5.messagelabs.com id A0/40-03409-8F5D3905; Fri, 02 Nov 2012 14:17:28 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1351865846!24203845!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30401 invoked from network); 2 Nov 2012 14:17:27 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:17:27 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2EHL0M023837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 14:17:22 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2EHK5Z007964 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 14:17:21 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2EHKeT010200; Fri, 2 Nov 2012 09:17:20 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 07:17:20 -0700 Date: Fri, 2 Nov 2012 10:17:17 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102141717.GE3038@konrad-lan.dumpdata.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E29A02000078000A611D@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: daniel.kiper@oracle.com, xen-devel@lists.xen.org, george.dunlap@citrix.com, fantonifabio@tiscali.it, stefano.stabellini@eu.citrix.com Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:11:22PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 14:52, Konrad Rzeszutek Wilk wrote: > > On Thu, Nov 01, 2012 at 07:57:30PM +0000, Jan Beulich wrote: > >> >>> Stefano Stabellini 11/01/12 4:50 PM >>> > >> >On Tue, 11 Sep 2012, Jan Beulich wrote: > >> >> >>> On 11.09.12 at 15:17, Fabio Fantoni wrote: > >> >> > xen.efi not compile when we build xen on Wheezy and probably is not > >> >> > possible boot with lvm volume, fallback options ecc... > >> >> > >> >> Just get a suitable tool chain installed then. > >> >> > >> >> > UEFI with grub2 seem the best option but with xen hypervisor seem not > >> >> > load efi variable. > >> >> > >> >> Sure, because only xen.efi has the code to deal with such. > >> >> > >> >> (Btw., I assume you aren't aware that any boot manager > >> >> whatsoever, other than the one coming with EFI, is sort of > >> >> bogus under EFI?) > >> > > >> >Unfortunately it looks like more and more people are of the opinion that > >> >grub2 is useful even on UEFI firmware. > >> >For example, it is pretty clear that Ubuntu is still going to boot Xen > >> >via grub2 no matter how the firmware looks like. > >> > >> Then they need to be tought how to do it properly, the more that Linux > > itself > >> now is capable of booting without a boot loader (other than the EFI one). > >> > >> >What would it take to make Xen work properly with grub2 on a UEFI firmware? > >> > >> I can't be that difficult. > > > > I believe the only issue was the check to do the Multiboot-E820 parsing > > before the E801 parsing? Perhaps that has already been done? > > That's in all 4.x trees already. But no - the other important aspect > is that without retrieving/passing on the proper EFI table pointers, > on a legacy free system Xen and Dom0 won't be able to locate the > ACPI tables. Ah yes (). I think the work-around could be to use the kexec introduced arguments: "acpi_rsdp=" > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:19:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:19:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI5K-0000YJ-Bd; Fri, 02 Nov 2012 14:18:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI5J-0000Y7-19 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:18:57 +0000 Received: from [85.158.137.99:41671] by server-2.bemta-3.messagelabs.com id 12/D2-04744-F46D3905; Fri, 02 Nov 2012 14:18:55 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351865933!16605317!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 414 invoked from network); 2 Nov 2012 14:18:55 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-11.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:18:55 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2EIqvW024756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 14:18:53 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2EIqDc003855 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 14:18:52 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2EIqRl011387; Fri, 2 Nov 2012 09:18:52 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 07:18:51 -0700 Date: Fri, 2 Nov 2012 10:18:45 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102141845.GA3413@konrad-lan.dumpdata.com> References: <5093D4B502000078000A606E@nat28.tlf.novell.com> <20121102135514.GC3038@konrad-lan.dumpdata.com> <5093E1B602000078000A6105@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E1B602000078000A6105@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:07:34PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 14:55, Konrad Rzeszutek Wilk wrote: > > On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: > >> It has never been used for anything, and Linux 3.7 doesn't propagate > >> this information anymore. > >> > >> Signed-off-by: Jan Beulich > >> --- > >> Konrad, on the pv-ops side it may be better to pass zero rather than > >> leaving the field completely uninitialized. > > > > I think this got taken care of by: > > > > commit c59687f8466df36633d937cc298aad465d704990 > > Author: Daniel Lezcano > > Date: Wed Sep 5 15:13:48 2012 +0200 > > > > cpuidle / ACPI : remove power from acpi_processor_cx structure > > > > Remove the unused power field from struct struct acpi_processor_cx. > > > > [rjw: Modified changelog.] > > That's the commit I was referring to. > > > And the the xen_processor_cx is allocated using kcalloc which resets > > everything to zero - so I think we are safe there. > > And that I didn't pay attention to - sorry for the noise then. Oh no problem - Thank you for keeping me in the loop! > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:19:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:19:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI5K-0000YJ-Bd; Fri, 02 Nov 2012 14:18:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI5J-0000Y7-19 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:18:57 +0000 Received: from [85.158.137.99:41671] by server-2.bemta-3.messagelabs.com id 12/D2-04744-F46D3905; Fri, 02 Nov 2012 14:18:55 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351865933!16605317!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNDA2NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 414 invoked from network); 2 Nov 2012 14:18:55 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-11.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:18:55 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA2EIqvW024756 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Nov 2012 14:18:53 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA2EIqDc003855 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Nov 2012 14:18:52 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA2EIqRl011387; Fri, 2 Nov 2012 09:18:52 -0500 Received: from konrad-lan.dumpdata.com (/64.222.209.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Nov 2012 07:18:51 -0700 Date: Fri, 2 Nov 2012 10:18:45 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102141845.GA3413@konrad-lan.dumpdata.com> References: <5093D4B502000078000A606E@nat28.tlf.novell.com> <20121102135514.GC3038@konrad-lan.dumpdata.com> <5093E1B602000078000A6105@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E1B602000078000A6105@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:07:34PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 14:55, Konrad Rzeszutek Wilk wrote: > > On Fri, Nov 02, 2012 at 01:12:05PM +0000, Jan Beulich wrote: > >> It has never been used for anything, and Linux 3.7 doesn't propagate > >> this information anymore. > >> > >> Signed-off-by: Jan Beulich > >> --- > >> Konrad, on the pv-ops side it may be better to pass zero rather than > >> leaving the field completely uninitialized. > > > > I think this got taken care of by: > > > > commit c59687f8466df36633d937cc298aad465d704990 > > Author: Daniel Lezcano > > Date: Wed Sep 5 15:13:48 2012 +0200 > > > > cpuidle / ACPI : remove power from acpi_processor_cx structure > > > > Remove the unused power field from struct struct acpi_processor_cx. > > > > [rjw: Modified changelog.] > > That's the commit I was referring to. > > > And the the xen_processor_cx is allocated using kcalloc which resets > > everything to zero - so I think we are safe there. > > And that I didn't pay attention to - sorry for the noise then. Oh no problem - Thank you for keeping me in the loop! > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:23:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:23:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI9K-00014p-QF; Fri, 02 Nov 2012 14:23:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI9J-00014a-3d for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:23:05 +0000 Received: from [85.158.143.99:46276] by server-3.bemta-4.messagelabs.com id 65/4A-06841-847D3905; Fri, 02 Nov 2012 14:23:04 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-15.tower-216.messagelabs.com!1351866180!28362626!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1991 invoked from network); 2 Nov 2012 14:23:03 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-15.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:23:03 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 11FAA4015FC; Fri, 2 Nov 2012 15:23:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xaymLTWzThAo; Fri, 2 Nov 2012 15:22:59 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id B120B40009E; Fri, 2 Nov 2012 15:22:58 +0100 (CET) Message-ID: <5093D73E.2040403@tiscali.it> Date: Fri, 02 Nov 2012 15:22:54 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Gerd Hoffmann References: <5093A592.1050005@tiscali.it> <87ehkcw2t4.fsf@codemonkey.ws> <5093CE5D.8070409@redhat.com> In-Reply-To: <5093CE5D.8070409@redhat.com> Cc: Anthony Liguori , xen-devel Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8354307003510196197==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============8354307003510196197== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010603090706050205040308" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms010603090706050205040308 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Il 02/11/2012 14:45, Gerd Hoffmann ha scritto: > Hi, > >>> hw/xenfb.c:651:5: error: implicit declaration of function =C3=A2dpy_u= pdate=C3=A2 >>> [-Werror=3Dimplicit-function-declaration] >> Can you take a look at this Gerd? > Happened already: http://patchwork.ozlabs.org/patch/196492/ > > cheers, > Gerd > > > ----- > Nessun virus nel messaggio. > Controllato da AVG - www.avg.com > Versione: 2012.0.2221 / Database dei virus: 2441/5368 - Data di rilasc= io: 01/11/2012 > > Thanks, patch applied and build successfull. Start testing xen-unstable with qemu upstream unstable, tried Quantal=20 pvonhvm domU with spice and qxl, qemu crashes showing this on log file: main_channel_link: add main channel client main_channel_handle_parsed: net test: latency 47.335000 ms, bitrate=20 752664461 bps (717.796765 Mbps) red_dispatcher_set_cursor_peer: inputs_connect: inputs channel client create id 0, group 0, virt start 0, virt end ffffffffffffffff, generation 0,=20 delta 0 id 1, group 1, virt start 7f634059b000, virt end 7f6344599000,=20 generation 0, delta 7f634059b000 id 2, group 1, virt start 7f6333f04000, virt end 7f6337f04000,=20 generation 0, delta 7f6333f04000 (/usr/sbin/xl:3427): Spice-CRITICAL **: red_memslots.c:123:get_virt:=20 slot_id 194 too big, addr=3Dc2c2c2c2c2c2c2c2 Some problem also on test of some days ago, can someone solve also this=20 problem please? If you need more information/logs tell me and I'll post it. --------------ms010603090706050205040308 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjE0MjI1NFowIwYJKoZIhvcNAQkEMRYEFCq+L7B4Pxd5FB0Ye6HWDv1u +/gsMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEAN7F+XVcrpzD7hb7WCB4OOnqV ebUrRryBCt3QvU2UJZlv3TzfkpX5pRKROK55NOQuKcdDd10m8tj8CjuLEkA/CPnvSzKA9uDo bnkNjmHS4lIQOD+WS20G0+Ky8JuWISMOja3vG3z4R6LoNPqDlTd03G4jBCE9/oQP5W73tAwB 7H71ZXKm4tx0JlXvUhAf2PSLNocb4Nn8znY3IoudZf0WOG4WDcAi4ci1pkff/td236fweDYh 3JBG133nxpK0URPpVkZXjvOHjxQ76t28Zex515MmQ33gjJOkf3VdUKd72uptUufYNOd/vdnT tuUeeTNBJG08eZrTzumNfjm2DeWm3wAAAAAAAA== --------------ms010603090706050205040308-- --===============8354307003510196197== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8354307003510196197==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:23:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:23:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI9K-00014p-QF; Fri, 02 Nov 2012 14:23:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUI9J-00014a-3d for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:23:05 +0000 Received: from [85.158.143.99:46276] by server-3.bemta-4.messagelabs.com id 65/4A-06841-847D3905; Fri, 02 Nov 2012 14:23:04 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-15.tower-216.messagelabs.com!1351866180!28362626!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1991 invoked from network); 2 Nov 2012 14:23:03 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-15.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:23:03 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id 11FAA4015FC; Fri, 2 Nov 2012 15:23:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xaymLTWzThAo; Fri, 2 Nov 2012 15:22:59 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id B120B40009E; Fri, 2 Nov 2012 15:22:58 +0100 (CET) Message-ID: <5093D73E.2040403@tiscali.it> Date: Fri, 02 Nov 2012 15:22:54 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Gerd Hoffmann References: <5093A592.1050005@tiscali.it> <87ehkcw2t4.fsf@codemonkey.ws> <5093CE5D.8070409@redhat.com> In-Reply-To: <5093CE5D.8070409@redhat.com> Cc: Anthony Liguori , xen-devel Subject: Re: [Xen-devel] Build xen-unstable and qemu upstream unstable fail with error on xenfb.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8354307003510196197==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============8354307003510196197== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010603090706050205040308" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms010603090706050205040308 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Il 02/11/2012 14:45, Gerd Hoffmann ha scritto: > Hi, > >>> hw/xenfb.c:651:5: error: implicit declaration of function =C3=A2dpy_u= pdate=C3=A2 >>> [-Werror=3Dimplicit-function-declaration] >> Can you take a look at this Gerd? > Happened already: http://patchwork.ozlabs.org/patch/196492/ > > cheers, > Gerd > > > ----- > Nessun virus nel messaggio. > Controllato da AVG - www.avg.com > Versione: 2012.0.2221 / Database dei virus: 2441/5368 - Data di rilasc= io: 01/11/2012 > > Thanks, patch applied and build successfull. Start testing xen-unstable with qemu upstream unstable, tried Quantal=20 pvonhvm domU with spice and qxl, qemu crashes showing this on log file: main_channel_link: add main channel client main_channel_handle_parsed: net test: latency 47.335000 ms, bitrate=20 752664461 bps (717.796765 Mbps) red_dispatcher_set_cursor_peer: inputs_connect: inputs channel client create id 0, group 0, virt start 0, virt end ffffffffffffffff, generation 0,=20 delta 0 id 1, group 1, virt start 7f634059b000, virt end 7f6344599000,=20 generation 0, delta 7f634059b000 id 2, group 1, virt start 7f6333f04000, virt end 7f6337f04000,=20 generation 0, delta 7f6333f04000 (/usr/sbin/xl:3427): Spice-CRITICAL **: red_memslots.c:123:get_virt:=20 slot_id 194 too big, addr=3Dc2c2c2c2c2c2c2c2 Some problem also on test of some days ago, can someone solve also this=20 problem please? If you need more information/logs tell me and I'll post it. --------------ms010603090706050205040308 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTEwMjE0MjI1NFowIwYJKoZIhvcNAQkEMRYEFCq+L7B4Pxd5FB0Ye6HWDv1u +/gsMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEAN7F+XVcrpzD7hb7WCB4OOnqV ebUrRryBCt3QvU2UJZlv3TzfkpX5pRKROK55NOQuKcdDd10m8tj8CjuLEkA/CPnvSzKA9uDo bnkNjmHS4lIQOD+WS20G0+Ky8JuWISMOja3vG3z4R6LoNPqDlTd03G4jBCE9/oQP5W73tAwB 7H71ZXKm4tx0JlXvUhAf2PSLNocb4Nn8znY3IoudZf0WOG4WDcAi4ci1pkff/td236fweDYh 3JBG133nxpK0URPpVkZXjvOHjxQ76t28Zex515MmQ33gjJOkf3VdUKd72uptUufYNOd/vdnT tuUeeTNBJG08eZrTzumNfjm2DeWm3wAAAAAAAA== --------------ms010603090706050205040308-- --===============8354307003510196197== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8354307003510196197==-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:25:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:25:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIB6-0001HZ-Fp; Fri, 02 Nov 2012 14:24:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIB4-0001HH-P8 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:24:54 +0000 Received: from [193.109.254.147:20115] by server-2.bemta-14.messagelabs.com id 9D/66-20829-6B7D3905; Fri, 02 Nov 2012 14:24:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1351866291!9359285!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEwMDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2017 invoked from network); 2 Nov 2012 14:24:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:24:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="43273393" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 14:24:51 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 10:24:51 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TUIB0-0000Ct-Eo; Fri, 02 Nov 2012 14:24:50 +0000 Message-ID: <1351866172.25014.67.camel@hastur.hellion.org.uk> From: Ian Campbell To: Jan Beulich Date: Fri, 2 Nov 2012 14:22:52 +0000 In-Reply-To: <5093E29A02000078000A611D@nat28.tlf.novell.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "fantonifabio@tiscali.it" , George Dunlap , "daniel.kiper@oracle.com" , Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > I believe the only issue was the check to do the Multiboot-E820 parsing > > before the E801 parsing? Perhaps that has already been done? > > That's in all 4.x trees already. But no - the other important aspect > is that without retrieving/passing on the proper EFI table pointers, > on a legacy free system Xen and Dom0 won't be able to locate the > ACPI tables. How does this work with native Linux? AIUI the most common way to boot regular Linux is using grub-efi. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:25:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:25:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIB6-0001HZ-Fp; Fri, 02 Nov 2012 14:24:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIB4-0001HH-P8 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:24:54 +0000 Received: from [193.109.254.147:20115] by server-2.bemta-14.messagelabs.com id 9D/66-20829-6B7D3905; Fri, 02 Nov 2012 14:24:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1351866291!9359285!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEwMDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2017 invoked from network); 2 Nov 2012 14:24:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:24:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="43273393" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 14:24:51 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 10:24:51 -0400 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TUIB0-0000Ct-Eo; Fri, 02 Nov 2012 14:24:50 +0000 Message-ID: <1351866172.25014.67.camel@hastur.hellion.org.uk> From: Ian Campbell To: Jan Beulich Date: Fri, 2 Nov 2012 14:22:52 +0000 In-Reply-To: <5093E29A02000078000A611D@nat28.tlf.novell.com> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "fantonifabio@tiscali.it" , George Dunlap , "daniel.kiper@oracle.com" , Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > I believe the only issue was the check to do the Multiboot-E820 parsing > > before the E801 parsing? Perhaps that has already been done? > > That's in all 4.x trees already. But no - the other important aspect > is that without retrieving/passing on the proper EFI table pointers, > on a legacy free system Xen and Dom0 won't be able to locate the > ACPI tables. How does this work with native Linux? AIUI the most common way to boot regular Linux is using grub-efi. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIIA-0001rE-HI; Fri, 02 Nov 2012 14:32:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUII9-0001r6-GH for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:32:13 +0000 Received: from [85.158.143.99:55864] by server-1.bemta-4.messagelabs.com id E2/7D-27934-C69D3905; Fri, 02 Nov 2012 14:32:12 +0000 X-Env-Sender: alan@lxorguk.ukuu.org.uk X-Msg-Ref: server-6.tower-216.messagelabs.com!1351866731!21356310!1 X-Originating-IP: [81.2.110.251] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13574 invoked from network); 2 Nov 2012 14:32:12 -0000 Received: from lxorguk.ukuu.org.uk (HELO lxorguk.ukuu.org.uk) (81.2.110.251) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:32:12 -0000 Received: from pyramind.ukuu.org.uk (earthlight.etchedpixels.co.uk [81.2.110.250]) by lxorguk.ukuu.org.uk (8.14.5/8.14.1) with ESMTP id qA2F3uit023517; Fri, 2 Nov 2012 15:04:01 GMT Received: from pyramind.ukuu.org.uk (localhost [127.0.0.1]) by pyramind.ukuu.org.uk (8.14.5/8.14.5) with ESMTP id qA2EbFf4026031; Fri, 2 Nov 2012 14:37:16 GMT Date: Fri, 2 Nov 2012 14:37:15 +0000 From: Alan Cox To: Ian Campbell Message-ID: <20121102143715.2a1ee422@pyramind.ukuu.org.uk> In-Reply-To: <1351866172.25014.67.camel@hastur.hellion.org.uk> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> <1351866172.25014.67.camel@hastur.hellion.org.uk> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.8; x86_64-redhat-linux-gnu) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEWysKsSBQMIAwIZCwj///8wIhxoRDXH9QHCAAABeUlEQVQ4jaXTvW7DIBAAYCQTzz2hdq+rdg494ZmBeE5KYHZjm/d/hJ6NfzBJpp5kRb5PHJwvMPMk2L9As5Y9AmYRBL+HAyJKeOU5aHRhsAAvORQ+UEgAvgddj/lwAXndw2laEDqA4x6KEBhjYRCg9tBFCOuJFxg2OKegbWjbsRTk8PPhKPD7HcRxB7cqhgBRp9Dcqs+B8v4CQvFdqeot3Kov6hBUn0AJitrzY+sgUuiA8i0r7+B3AfqKcN6t8M6HtqQ+AOoELCikgQSbgabKaJW3kn5lBs47JSGDhhLKDUh1UMipwwinMYPTBuIBjEclSaGZUk9hDlTb5sUTYN2SFFQuPe4Gox1X0FZOufjgBiV1Vls7b+GvK3SU4wfmcGo9rPPQzgIabfj4TYQo15k3bTHX9RIw/kniir5YbtJF4jkFG+dsDK1IgE413zAthU/vR2HVMmFUPIHTvF6jWCpFaGw/A3qWgnbxpSm9MSmY5b3pM1gvNc/gQfwBsGwF0VCtxZgAAAAASUVORK5CYII= Mime-Version: 1.0 Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , George Dunlap , "daniel.kiper@oracle.com" , "fantonifabio@tiscali.it" , "xen-devel@lists.xen.org" , Jan Beulich Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2 Nov 2012 14:22:52 +0000 Ian Campbell wrote: > > > > I believe the only issue was the check to do the Multiboot-E820 parsing > > > before the E801 parsing? Perhaps that has already been done? > > > > That's in all 4.x trees already. But no - the other important aspect > > is that without retrieving/passing on the proper EFI table pointers, > > on a legacy free system Xen and Dom0 won't be able to locate the > > ACPI tables. > > How does this work with native Linux? AIUI the most common way to boot > regular Linux is using grub-efi. The preferred way to boot Linux on an EFI platform is to build an EFI Linux kernel and just let EFI run it. This is supported from 3.3 onwards. All you then need is one of the innumerable EFI boot chooses that are springing up (rEFInd, Gummiboot etc) or use the UEFI Shell or efibootmgr Alan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:32:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:32:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIIA-0001rE-HI; Fri, 02 Nov 2012 14:32:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUII9-0001r6-GH for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:32:13 +0000 Received: from [85.158.143.99:55864] by server-1.bemta-4.messagelabs.com id E2/7D-27934-C69D3905; Fri, 02 Nov 2012 14:32:12 +0000 X-Env-Sender: alan@lxorguk.ukuu.org.uk X-Msg-Ref: server-6.tower-216.messagelabs.com!1351866731!21356310!1 X-Originating-IP: [81.2.110.251] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13574 invoked from network); 2 Nov 2012 14:32:12 -0000 Received: from lxorguk.ukuu.org.uk (HELO lxorguk.ukuu.org.uk) (81.2.110.251) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 2 Nov 2012 14:32:12 -0000 Received: from pyramind.ukuu.org.uk (earthlight.etchedpixels.co.uk [81.2.110.250]) by lxorguk.ukuu.org.uk (8.14.5/8.14.1) with ESMTP id qA2F3uit023517; Fri, 2 Nov 2012 15:04:01 GMT Received: from pyramind.ukuu.org.uk (localhost [127.0.0.1]) by pyramind.ukuu.org.uk (8.14.5/8.14.5) with ESMTP id qA2EbFf4026031; Fri, 2 Nov 2012 14:37:16 GMT Date: Fri, 2 Nov 2012 14:37:15 +0000 From: Alan Cox To: Ian Campbell Message-ID: <20121102143715.2a1ee422@pyramind.ukuu.org.uk> In-Reply-To: <1351866172.25014.67.camel@hastur.hellion.org.uk> References: <504F3355.2070201@tiscali.it> <504F5182020000780009A9CC@nat28.tlf.novell.com> <504F39F0.10701@tiscali.it> <504F625D020000780009AA85@nat28.tlf.novell.com> <5092D42A020000780008EB7B@nat28.tlf.novell.com> <20121102135209.GB3038@konrad-lan.dumpdata.com> <5093E29A02000078000A611D@nat28.tlf.novell.com> <1351866172.25014.67.camel@hastur.hellion.org.uk> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.8; x86_64-redhat-linux-gnu) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAFVBMVEWysKsSBQMIAwIZCwj///8wIhxoRDXH9QHCAAABeUlEQVQ4jaXTvW7DIBAAYCQTzz2hdq+rdg494ZmBeE5KYHZjm/d/hJ6NfzBJpp5kRb5PHJwvMPMk2L9As5Y9AmYRBL+HAyJKeOU5aHRhsAAvORQ+UEgAvgddj/lwAXndw2laEDqA4x6KEBhjYRCg9tBFCOuJFxg2OKegbWjbsRTk8PPhKPD7HcRxB7cqhgBRp9Dcqs+B8v4CQvFdqeot3Kov6hBUn0AJitrzY+sgUuiA8i0r7+B3AfqKcN6t8M6HtqQ+AOoELCikgQSbgabKaJW3kn5lBs47JSGDhhLKDUh1UMipwwinMYPTBuIBjEclSaGZUk9hDlTb5sUTYN2SFFQuPe4Gox1X0FZOufjgBiV1Vls7b+GvK3SU4wfmcGo9rPPQzgIabfj4TYQo15k3bTHX9RIw/kniir5YbtJF4jkFG+dsDK1IgE413zAthU/vR2HVMmFUPIHTvF6jWCpFaGw/A3qWgnbxpSm9MSmY5b3pM1gvNc/gQfwBsGwF0VCtxZgAAAAASUVORK5CYII= Mime-Version: 1.0 Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , George Dunlap , "daniel.kiper@oracle.com" , "fantonifabio@tiscali.it" , "xen-devel@lists.xen.org" , Jan Beulich Subject: Re: [Xen-devel] Start xen on UEFI system with grub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2 Nov 2012 14:22:52 +0000 Ian Campbell wrote: > > > > I believe the only issue was the check to do the Multiboot-E820 parsing > > > before the E801 parsing? Perhaps that has already been done? > > > > That's in all 4.x trees already. But no - the other important aspect > > is that without retrieving/passing on the proper EFI table pointers, > > on a legacy free system Xen and Dom0 won't be able to locate the > > ACPI tables. > > How does this work with native Linux? AIUI the most common way to boot > regular Linux is using grub-efi. The preferred way to boot Linux on an EFI platform is to build an EFI Linux kernel and just let EFI run it. This is supported from 3.3 onwards. All you then need is one of the innumerable EFI boot chooses that are springing up (rEFInd, Gummiboot etc) or use the UEFI Shell or efibootmgr Alan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:35:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:35:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIKr-0001zB-Ka; Fri, 02 Nov 2012 14:35:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIKq-0001z4-2U for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:35:00 +0000 Received: from [85.158.143.35:26721] by server-2.bemta-4.messagelabs.com id 8A/5F-28922-31AD3905; Fri, 02 Nov 2012 14:34:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866898!16125998!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5775 invoked from network); 2 Nov 2012 14:34:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:34:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:35:29 +0000 Message-Id: <5093E84C02000078000A619F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:35:40 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Disposition: inline Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 0/2] xen-pciback: parsing improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 1: simplify and tighten parsing of device IDs 2: reject out of range inputs Signed-off-by: Jan Beulich _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:35:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:35:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIKr-0001zB-Ka; Fri, 02 Nov 2012 14:35:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIKq-0001z4-2U for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:35:00 +0000 Received: from [85.158.143.35:26721] by server-2.bemta-4.messagelabs.com id 8A/5F-28922-31AD3905; Fri, 02 Nov 2012 14:34:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866898!16125998!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5775 invoked from network); 2 Nov 2012 14:34:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:34:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:35:29 +0000 Message-Id: <5093E84C02000078000A619F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:35:40 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Disposition: inline Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 0/2] xen-pciback: parsing improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 1: simplify and tighten parsing of device IDs 2: reject out of range inputs Signed-off-by: Jan Beulich _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:36:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:36:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUILr-00025Y-8O; Fri, 02 Nov 2012 14:36:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUILp-000259-3T for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:36:01 +0000 Received: from [85.158.143.35:33663] by server-1.bemta-4.messagelabs.com id 60/62-27934-E4AD3905; Fri, 02 Nov 2012 14:35:58 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866957!16126148!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8873 invoked from network); 2 Nov 2012 14:35:57 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:35:57 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:36:30 +0000 Message-Id: <5093E88602000078000A61A3@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:36:38 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part1726D966.0__=" Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 1/2] xen-pciback: simplify and tighten parsing of device IDs X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part1726D966.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Now that at least one of the conformance problems of the kernel's sscanf() was addressed (commit da99075c1d368315e1508b6143226c0d27b621e0), we can improve the parsing done in xen-pciback both in terms of code readability and correctness (in particular properly rejecting input strings not well formed). Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/pci_stub.c | 83 +++++++++++++++++---------------= ----- 1 file changed, 39 insertions(+), 44 deletions(-) --- 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c +++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c @@ -897,42 +897,35 @@ static struct pci_driver xen_pcibk_pci_d static inline int str_to_slot(const char *buf, int *domain, int *bus, int *slot, int *func) { - int err; - char wc =3D '*'; + int parsed =3D 0; =20 - err =3D sscanf(buf, " %x:%x:%x.%x", domain, bus, slot, func); - switch (err) { + switch (sscanf(buf, " %x:%x:%x.%x %n", domain, bus, slot, func, + &parsed)) { case 3: *func =3D -1; - err =3D sscanf(buf, " %x:%x:%x.%c", domain, bus, slot, = &wc); + sscanf(buf, " %x:%x:%x.* %n", domain, bus, slot, &parsed); break; case 2: *slot =3D *func =3D -1; - err =3D sscanf(buf, " %x:%x:*.%c", domain, bus, &wc); - if (err >=3D 2) - ++err; + sscanf(buf, " %x:%x:*.* %n", domain, bus, &parsed); break; } - if (err =3D=3D 4 && wc =3D=3D '*') + if (parsed && !buf[parsed]) return 0; - else if (err < 0) - return -EINVAL; =20 /* try again without domain */ *domain =3D 0; - wc =3D '*'; - err =3D sscanf(buf, " %x:%x.%x", bus, slot, func); - switch (err) { + switch (sscanf(buf, " %x:%x.%x %n", bus, slot, func, &parsed)) { case 2: *func =3D -1; - err =3D sscanf(buf, " %x:%x.%c", bus, slot, &wc); + sscanf(buf, " %x:%x.* %n", bus, slot, &parsed); break; case 1: *slot =3D *func =3D -1; - err =3D sscanf(buf, " %x:*.%c", bus, &wc) + 1; + sscanf(buf, " %x:*.* %n", bus, &parsed); break; } - if (err =3D=3D 3 && wc =3D=3D '*') + if (parsed && !buf[parsed]) return 0; =20 return -EINVAL; @@ -941,13 +934,20 @@ static inline int str_to_slot(const char static inline int str_to_quirk(const char *buf, int *domain, int *bus, = int *slot, int *func, int *reg, int *size, int = *mask) { - int err; + int parsed =3D 0; + + sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x %n", domain, bus, slot, = func, + reg, size, mask, &parsed); + if (parsed && !buf[parsed]) + return 0; =20 - err =3D - sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", domain, bus, = slot, - func, reg, size, mask); - if (err =3D=3D 7) + /* try again without domain */ + *domain =3D 0; + sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, = size, + mask, &parsed); + if (parsed && !buf[parsed]) return 0; + return -EINVAL; } =20 @@ -1339,8 +1339,6 @@ static int __init pcistub_init(void) =20 if (pci_devs_to_hide && *pci_devs_to_hide) { do { - char wc =3D '*'; - parsed =3D 0; =20 err =3D sscanf(pci_devs_to_hide + pos, @@ -1349,51 +1347,48 @@ static int __init pcistub_init(void) switch (err) { case 3: func =3D -1; - err =3D sscanf(pci_devs_to_hide + pos, - " (%x:%x:%x.%c) %n", - &domain, &bus, &slot, &wc, - &parsed); + sscanf(pci_devs_to_hide + pos, + " (%x:%x:%x.*) %n", + &domain, &bus, &slot, &parsed); break; case 2: slot =3D func =3D -1; - err =3D sscanf(pci_devs_to_hide + pos, - " (%x:%x:*.%c) %n", - &domain, &bus, &wc, &parsed) = + 1; + sscanf(pci_devs_to_hide + pos, + " (%x:%x:*.*) %n", + &domain, &bus, &parsed); break; } =20 - if (err !=3D 4 || wc !=3D '*') { + if (!parsed) { domain =3D 0; - wc =3D '*'; err =3D sscanf(pci_devs_to_hide + pos, " (%x:%x.%x) %n", &bus, &slot, &func, &parsed); switch (err) { case 2: func =3D -1; - err =3D sscanf(pci_devs_to_hide + = pos, - " (%x:%x.%c) %n", - &bus, &slot, &wc, - &parsed); + sscanf(pci_devs_to_hide + pos, + " (%x:%x.*) %n", + &bus, &slot, &parsed); break; case 1: slot =3D func =3D -1; - err =3D sscanf(pci_devs_to_hide + = pos, - " (%x:*.%c) %n", - &bus, &wc, &parsed) + = 1; + sscanf(pci_devs_to_hide + pos, + " (%x:*.*) %n", + &bus, &parsed); break; } - if (err !=3D 3 || wc !=3D '*') - goto parse_error; } =20 + if (parsed <=3D 0) + goto parse_error; + err =3D pcistub_device_id_add(domain, bus, slot, = func); if (err) goto out; =20 - /* if parsed<=3D0, we've reached the end of the = string */ pos +=3D parsed; - } while (parsed > 0 && pci_devs_to_hide[pos]); + } while (pci_devs_to_hide[pos]); } =20 /* If we're the first PCI Device Driver to register, we're the --=__Part1726D966.0__= Content-Type: text/plain; name="linux-3.7-rc3-xen-pciback-parse.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-xen-pciback-parse.patch" xen-pciback: simplify and tighten parsing of device IDs=0A=0ANow that at = least one of the conformance problems of the kernel's=0Asscanf() was = addressed (commit da99075c1d368315e1508b6143226c0d27b621e0),=0Awe can = improve the parsing done in xen-pciback both in terms of code=0Areadability= and correctness (in particular properly rejecting input=0Astrings not = well formed).=0A=0ASigned-off-by: Jan Beulich =0A=0A---= =0A drivers/xen/xen-pciback/pci_stub.c | 83 +++++++++++++++++------------= --------=0A 1 file changed, 39 insertions(+), 44 deletions(-)=0A=0A--- = 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c=0A+++ = 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c=0A@@ -897,42 = +897,35 @@ static struct pci_driver xen_pcibk_pci_d=0A static inline int = str_to_slot(const char *buf, int *domain, int *bus,=0A = int *slot, int *func)=0A {=0A- int err;=0A- char wc =3D = '*';=0A+ int parsed =3D 0;=0A =0A- err =3D sscanf(buf, " = %x:%x:%x.%x", domain, bus, slot, func);=0A- switch (err) {=0A+ = switch (sscanf(buf, " %x:%x:%x.%x %n", domain, bus, slot, func,=0A+ = &parsed)) {=0A case 3:=0A *func =3D -1;=0A- = err =3D sscanf(buf, " %x:%x:%x.%c", domain, bus, slot, &wc);=0A+ = sscanf(buf, " %x:%x:%x.* %n", domain, bus, slot, &parsed);=0A = break;=0A case 2:=0A *slot =3D *func =3D -1;=0A- = err =3D sscanf(buf, " %x:%x:*.%c", domain, bus, &wc);=0A- if = (err >=3D 2)=0A- ++err;=0A+ sscanf(buf,= " %x:%x:*.* %n", domain, bus, &parsed);=0A break;=0A = }=0A- if (err =3D=3D 4 && wc =3D=3D '*')=0A+ if (parsed && !buf[parsed])= =0A return 0;=0A- else if (err < 0)=0A- return = -EINVAL;=0A =0A /* try again without domain */=0A *domain = =3D 0;=0A- wc =3D '*';=0A- err =3D sscanf(buf, " %x:%x.%x", bus, = slot, func);=0A- switch (err) {=0A+ switch (sscanf(buf, " = %x:%x.%x %n", bus, slot, func, &parsed)) {=0A case 2:=0A = *func =3D -1;=0A- err =3D sscanf(buf, " %x:%x.%c", bus, = slot, &wc);=0A+ sscanf(buf, " %x:%x.* %n", bus, slot, &parsed);=0A = break;=0A case 1:=0A *slot =3D *func = =3D -1;=0A- err =3D sscanf(buf, " %x:*.%c", bus, &wc) + 1;=0A+ = sscanf(buf, " %x:*.* %n", bus, &parsed);=0A break;=0A = }=0A- if (err =3D=3D 3 && wc =3D=3D '*')=0A+ if (parsed && !buf[parsed])= =0A return 0;=0A =0A return -EINVAL;=0A@@ -941,13 = +934,20 @@ static inline int str_to_slot(const char=0A static inline int = str_to_quirk(const char *buf, int *domain, int *bus, int=0A = *slot, int *func, int *reg, int *size, int *mask)=0A {=0A- = int err;=0A+ int parsed =3D 0;=0A+=0A+ sscanf(buf, " %4x:%2x:%2x.%= d-%8x:%1x:%8x %n", domain, bus, slot, func,=0A+ reg, size, mask, = &parsed);=0A+ if (parsed && !buf[parsed])=0A+ return 0;=0A =0A- = err =3D=0A- sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", = domain, bus, slot,=0A- func, reg, size, mask);=0A- if (err = =3D=3D 7)=0A+ /* try again without domain */=0A+ *domain =3D 0;=0A+ = sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, size,=0A+ = mask, &parsed);=0A+ if (parsed && !buf[parsed])=0A = return 0;=0A+=0A return -EINVAL;=0A }=0A =0A@@ -1339,8 +1339,6 @@ = static int __init pcistub_init(void)=0A =0A if (pci_devs_to_hide && = *pci_devs_to_hide) {=0A do {=0A- = char wc =3D '*';=0A-=0A parsed =3D 0;=0A =0A = err =3D sscanf(pci_devs_to_hide + pos,=0A@@ -1349,51 +1347,48 @@ = static int __init pcistub_init(void)=0A switch = (err) {=0A case 3:=0A = func =3D -1;=0A- err =3D sscanf(pci_devs_to_= hide + pos,=0A- " (%x:%x:%x.%c) = %n",=0A- &domain, &bus, &slot, = &wc,=0A- &parsed);=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:%x:%x.*) %n",=0A+ &domain, = &bus, &slot, &parsed);=0A break;=0A = case 2:=0A slot =3D func =3D -1;=0A- = err =3D sscanf(pci_devs_to_hide + pos,=0A- = " (%x:%x:*.%c) %n",=0A- = &domain, &bus, &wc, &parsed) + 1;=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ " = (%x:%x:*.*) %n",=0A+ &domain, &bus, = &parsed);=0A break;=0A = }=0A =0A- if (err !=3D 4 || wc !=3D '*') {=0A+ = if (!parsed) {=0A domain =3D 0;=0A- = wc =3D '*';=0A err =3D = sscanf(pci_devs_to_hide + pos,=0A = " (%x:%x.%x) %n",=0A &bus, &slot, = &func, &parsed);=0A switch (err) {=0A = case 2:=0A func =3D = -1;=0A- err =3D sscanf(pci_devs_to_hide + = pos,=0A- " (%x:%x.%c) = %n",=0A- &bus, &slot, = &wc,=0A- &parsed);=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:%x.*) %n",=0A+ = &bus, &slot, &parsed);=0A = break;=0A case 1:=0A = slot =3D func =3D -1;=0A- = err =3D sscanf(pci_devs_to_hide + pos,=0A- = " (%x:*.%c) %n",=0A- = &bus, &wc, &parsed) + 1;=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:*.*) %n",=0A+ &bus, = &parsed);=0A break;=0A = }=0A- if (err !=3D 3 || wc !=3D '*')=0A- = goto parse_error;=0A = }=0A =0A+ if (parsed <=3D 0)=0A+ = goto parse_error;=0A+=0A err =3D pcistub_device_id_a= dd(domain, bus, slot, func);=0A if (err)=0A = goto out;=0A =0A- /* if parsed<=3D0, = we've reached the end of the string */=0A pos +=3D = parsed;=0A- } while (parsed > 0 && pci_devs_to_hide[pos]);=0A+ = } while (pci_devs_to_hide[pos]);=0A }=0A =0A /* If = we're the first PCI Device Driver to register, we're the=0A --=__Part1726D966.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part1726D966.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:36:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:36:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUILr-00025Y-8O; Fri, 02 Nov 2012 14:36:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUILp-000259-3T for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:36:01 +0000 Received: from [85.158.143.35:33663] by server-1.bemta-4.messagelabs.com id 60/62-27934-E4AD3905; Fri, 02 Nov 2012 14:35:58 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866957!16126148!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8873 invoked from network); 2 Nov 2012 14:35:57 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:35:57 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:36:30 +0000 Message-Id: <5093E88602000078000A61A3@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:36:38 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part1726D966.0__=" Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 1/2] xen-pciback: simplify and tighten parsing of device IDs X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part1726D966.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Now that at least one of the conformance problems of the kernel's sscanf() was addressed (commit da99075c1d368315e1508b6143226c0d27b621e0), we can improve the parsing done in xen-pciback both in terms of code readability and correctness (in particular properly rejecting input strings not well formed). Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/pci_stub.c | 83 +++++++++++++++++---------------= ----- 1 file changed, 39 insertions(+), 44 deletions(-) --- 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c +++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c @@ -897,42 +897,35 @@ static struct pci_driver xen_pcibk_pci_d static inline int str_to_slot(const char *buf, int *domain, int *bus, int *slot, int *func) { - int err; - char wc =3D '*'; + int parsed =3D 0; =20 - err =3D sscanf(buf, " %x:%x:%x.%x", domain, bus, slot, func); - switch (err) { + switch (sscanf(buf, " %x:%x:%x.%x %n", domain, bus, slot, func, + &parsed)) { case 3: *func =3D -1; - err =3D sscanf(buf, " %x:%x:%x.%c", domain, bus, slot, = &wc); + sscanf(buf, " %x:%x:%x.* %n", domain, bus, slot, &parsed); break; case 2: *slot =3D *func =3D -1; - err =3D sscanf(buf, " %x:%x:*.%c", domain, bus, &wc); - if (err >=3D 2) - ++err; + sscanf(buf, " %x:%x:*.* %n", domain, bus, &parsed); break; } - if (err =3D=3D 4 && wc =3D=3D '*') + if (parsed && !buf[parsed]) return 0; - else if (err < 0) - return -EINVAL; =20 /* try again without domain */ *domain =3D 0; - wc =3D '*'; - err =3D sscanf(buf, " %x:%x.%x", bus, slot, func); - switch (err) { + switch (sscanf(buf, " %x:%x.%x %n", bus, slot, func, &parsed)) { case 2: *func =3D -1; - err =3D sscanf(buf, " %x:%x.%c", bus, slot, &wc); + sscanf(buf, " %x:%x.* %n", bus, slot, &parsed); break; case 1: *slot =3D *func =3D -1; - err =3D sscanf(buf, " %x:*.%c", bus, &wc) + 1; + sscanf(buf, " %x:*.* %n", bus, &parsed); break; } - if (err =3D=3D 3 && wc =3D=3D '*') + if (parsed && !buf[parsed]) return 0; =20 return -EINVAL; @@ -941,13 +934,20 @@ static inline int str_to_slot(const char static inline int str_to_quirk(const char *buf, int *domain, int *bus, = int *slot, int *func, int *reg, int *size, int = *mask) { - int err; + int parsed =3D 0; + + sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x %n", domain, bus, slot, = func, + reg, size, mask, &parsed); + if (parsed && !buf[parsed]) + return 0; =20 - err =3D - sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", domain, bus, = slot, - func, reg, size, mask); - if (err =3D=3D 7) + /* try again without domain */ + *domain =3D 0; + sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, = size, + mask, &parsed); + if (parsed && !buf[parsed]) return 0; + return -EINVAL; } =20 @@ -1339,8 +1339,6 @@ static int __init pcistub_init(void) =20 if (pci_devs_to_hide && *pci_devs_to_hide) { do { - char wc =3D '*'; - parsed =3D 0; =20 err =3D sscanf(pci_devs_to_hide + pos, @@ -1349,51 +1347,48 @@ static int __init pcistub_init(void) switch (err) { case 3: func =3D -1; - err =3D sscanf(pci_devs_to_hide + pos, - " (%x:%x:%x.%c) %n", - &domain, &bus, &slot, &wc, - &parsed); + sscanf(pci_devs_to_hide + pos, + " (%x:%x:%x.*) %n", + &domain, &bus, &slot, &parsed); break; case 2: slot =3D func =3D -1; - err =3D sscanf(pci_devs_to_hide + pos, - " (%x:%x:*.%c) %n", - &domain, &bus, &wc, &parsed) = + 1; + sscanf(pci_devs_to_hide + pos, + " (%x:%x:*.*) %n", + &domain, &bus, &parsed); break; } =20 - if (err !=3D 4 || wc !=3D '*') { + if (!parsed) { domain =3D 0; - wc =3D '*'; err =3D sscanf(pci_devs_to_hide + pos, " (%x:%x.%x) %n", &bus, &slot, &func, &parsed); switch (err) { case 2: func =3D -1; - err =3D sscanf(pci_devs_to_hide + = pos, - " (%x:%x.%c) %n", - &bus, &slot, &wc, - &parsed); + sscanf(pci_devs_to_hide + pos, + " (%x:%x.*) %n", + &bus, &slot, &parsed); break; case 1: slot =3D func =3D -1; - err =3D sscanf(pci_devs_to_hide + = pos, - " (%x:*.%c) %n", - &bus, &wc, &parsed) + = 1; + sscanf(pci_devs_to_hide + pos, + " (%x:*.*) %n", + &bus, &parsed); break; } - if (err !=3D 3 || wc !=3D '*') - goto parse_error; } =20 + if (parsed <=3D 0) + goto parse_error; + err =3D pcistub_device_id_add(domain, bus, slot, = func); if (err) goto out; =20 - /* if parsed<=3D0, we've reached the end of the = string */ pos +=3D parsed; - } while (parsed > 0 && pci_devs_to_hide[pos]); + } while (pci_devs_to_hide[pos]); } =20 /* If we're the first PCI Device Driver to register, we're the --=__Part1726D966.0__= Content-Type: text/plain; name="linux-3.7-rc3-xen-pciback-parse.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-xen-pciback-parse.patch" xen-pciback: simplify and tighten parsing of device IDs=0A=0ANow that at = least one of the conformance problems of the kernel's=0Asscanf() was = addressed (commit da99075c1d368315e1508b6143226c0d27b621e0),=0Awe can = improve the parsing done in xen-pciback both in terms of code=0Areadability= and correctness (in particular properly rejecting input=0Astrings not = well formed).=0A=0ASigned-off-by: Jan Beulich =0A=0A---= =0A drivers/xen/xen-pciback/pci_stub.c | 83 +++++++++++++++++------------= --------=0A 1 file changed, 39 insertions(+), 44 deletions(-)=0A=0A--- = 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c=0A+++ = 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c=0A@@ -897,42 = +897,35 @@ static struct pci_driver xen_pcibk_pci_d=0A static inline int = str_to_slot(const char *buf, int *domain, int *bus,=0A = int *slot, int *func)=0A {=0A- int err;=0A- char wc =3D = '*';=0A+ int parsed =3D 0;=0A =0A- err =3D sscanf(buf, " = %x:%x:%x.%x", domain, bus, slot, func);=0A- switch (err) {=0A+ = switch (sscanf(buf, " %x:%x:%x.%x %n", domain, bus, slot, func,=0A+ = &parsed)) {=0A case 3:=0A *func =3D -1;=0A- = err =3D sscanf(buf, " %x:%x:%x.%c", domain, bus, slot, &wc);=0A+ = sscanf(buf, " %x:%x:%x.* %n", domain, bus, slot, &parsed);=0A = break;=0A case 2:=0A *slot =3D *func =3D -1;=0A- = err =3D sscanf(buf, " %x:%x:*.%c", domain, bus, &wc);=0A- if = (err >=3D 2)=0A- ++err;=0A+ sscanf(buf,= " %x:%x:*.* %n", domain, bus, &parsed);=0A break;=0A = }=0A- if (err =3D=3D 4 && wc =3D=3D '*')=0A+ if (parsed && !buf[parsed])= =0A return 0;=0A- else if (err < 0)=0A- return = -EINVAL;=0A =0A /* try again without domain */=0A *domain = =3D 0;=0A- wc =3D '*';=0A- err =3D sscanf(buf, " %x:%x.%x", bus, = slot, func);=0A- switch (err) {=0A+ switch (sscanf(buf, " = %x:%x.%x %n", bus, slot, func, &parsed)) {=0A case 2:=0A = *func =3D -1;=0A- err =3D sscanf(buf, " %x:%x.%c", bus, = slot, &wc);=0A+ sscanf(buf, " %x:%x.* %n", bus, slot, &parsed);=0A = break;=0A case 1:=0A *slot =3D *func = =3D -1;=0A- err =3D sscanf(buf, " %x:*.%c", bus, &wc) + 1;=0A+ = sscanf(buf, " %x:*.* %n", bus, &parsed);=0A break;=0A = }=0A- if (err =3D=3D 3 && wc =3D=3D '*')=0A+ if (parsed && !buf[parsed])= =0A return 0;=0A =0A return -EINVAL;=0A@@ -941,13 = +934,20 @@ static inline int str_to_slot(const char=0A static inline int = str_to_quirk(const char *buf, int *domain, int *bus, int=0A = *slot, int *func, int *reg, int *size, int *mask)=0A {=0A- = int err;=0A+ int parsed =3D 0;=0A+=0A+ sscanf(buf, " %4x:%2x:%2x.%= d-%8x:%1x:%8x %n", domain, bus, slot, func,=0A+ reg, size, mask, = &parsed);=0A+ if (parsed && !buf[parsed])=0A+ return 0;=0A =0A- = err =3D=0A- sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", = domain, bus, slot,=0A- func, reg, size, mask);=0A- if (err = =3D=3D 7)=0A+ /* try again without domain */=0A+ *domain =3D 0;=0A+ = sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, size,=0A+ = mask, &parsed);=0A+ if (parsed && !buf[parsed])=0A = return 0;=0A+=0A return -EINVAL;=0A }=0A =0A@@ -1339,8 +1339,6 @@ = static int __init pcistub_init(void)=0A =0A if (pci_devs_to_hide && = *pci_devs_to_hide) {=0A do {=0A- = char wc =3D '*';=0A-=0A parsed =3D 0;=0A =0A = err =3D sscanf(pci_devs_to_hide + pos,=0A@@ -1349,51 +1347,48 @@ = static int __init pcistub_init(void)=0A switch = (err) {=0A case 3:=0A = func =3D -1;=0A- err =3D sscanf(pci_devs_to_= hide + pos,=0A- " (%x:%x:%x.%c) = %n",=0A- &domain, &bus, &slot, = &wc,=0A- &parsed);=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:%x:%x.*) %n",=0A+ &domain, = &bus, &slot, &parsed);=0A break;=0A = case 2:=0A slot =3D func =3D -1;=0A- = err =3D sscanf(pci_devs_to_hide + pos,=0A- = " (%x:%x:*.%c) %n",=0A- = &domain, &bus, &wc, &parsed) + 1;=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ " = (%x:%x:*.*) %n",=0A+ &domain, &bus, = &parsed);=0A break;=0A = }=0A =0A- if (err !=3D 4 || wc !=3D '*') {=0A+ = if (!parsed) {=0A domain =3D 0;=0A- = wc =3D '*';=0A err =3D = sscanf(pci_devs_to_hide + pos,=0A = " (%x:%x.%x) %n",=0A &bus, &slot, = &func, &parsed);=0A switch (err) {=0A = case 2:=0A func =3D = -1;=0A- err =3D sscanf(pci_devs_to_hide + = pos,=0A- " (%x:%x.%c) = %n",=0A- &bus, &slot, = &wc,=0A- &parsed);=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:%x.*) %n",=0A+ = &bus, &slot, &parsed);=0A = break;=0A case 1:=0A = slot =3D func =3D -1;=0A- = err =3D sscanf(pci_devs_to_hide + pos,=0A- = " (%x:*.%c) %n",=0A- = &bus, &wc, &parsed) + 1;=0A+ = sscanf(pci_devs_to_hide + pos,=0A+ = " (%x:*.*) %n",=0A+ &bus, = &parsed);=0A break;=0A = }=0A- if (err !=3D 3 || wc !=3D '*')=0A- = goto parse_error;=0A = }=0A =0A+ if (parsed <=3D 0)=0A+ = goto parse_error;=0A+=0A err =3D pcistub_device_id_a= dd(domain, bus, slot, func);=0A if (err)=0A = goto out;=0A =0A- /* if parsed<=3D0, = we've reached the end of the string */=0A pos +=3D = parsed;=0A- } while (parsed > 0 && pci_devs_to_hide[pos]);=0A+ = } while (pci_devs_to_hide[pos]);=0A }=0A =0A /* If = we're the first PCI Device Driver to register, we're the=0A --=__Part1726D966.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part1726D966.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:36:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:36:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIMN-00029g-Mf; Fri, 02 Nov 2012 14:36:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIMM-00029S-UI for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:36:35 +0000 Received: from [85.158.143.35:39201] by server-3.bemta-4.messagelabs.com id B4/AC-06841-27AD3905; Fri, 02 Nov 2012 14:36:34 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866992!16126226!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10349 invoked from network); 2 Nov 2012 14:36:32 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:36:32 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:37:06 +0000 Message-Id: <5093E8A902000078000A61A7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:37:13 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartF8C93689.0__=" Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 2/2] xen-pciback: reject out of range inputs X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartF8C93689.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This add checks for out of range numbers (including in cases where the folding of slot and function into a single value could yield false matches). It also removes the bogus field width restrictions in str_to_quirk() - nowhere else in the driver this is being done, and hence this function could reject input the equivalent of which would be happily accepted in other places (in particular, "0x" prefixes causing the effective width of the actual number to be either zero or less than what would be required to cover the full range of valid values). Note that for the moment this second part is cosmetic only, as the kernel's sscanf() currently ignores the field widths, but a patch to overcome this is on its way. Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/pci_stub.c | 39 +++++++++++++++++++++++++-------= ----- 1 file changed, 27 insertions(+), 12 deletions(-) --- 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c +++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c @@ -142,7 +142,8 @@ static struct pcistub_device *pcistub_de if (psdev->dev !=3D NULL && domain =3D=3D pci_domain_nr(psdev->dev->bus) && bus =3D=3D psdev->dev->bus->number - && PCI_DEVFN(slot, func) =3D=3D psdev->dev->devfn) { + && slot =3D=3D PCI_SLOT(psdev->dev->devfn) + && func =3D=3D PCI_FUNC(psdev->dev->devfn)) { pcistub_device_get(psdev); goto out; } @@ -191,7 +192,8 @@ struct pci_dev *pcistub_get_pci_dev_by_s if (psdev->dev !=3D NULL && domain =3D=3D pci_domain_nr(psdev->dev->bus) && bus =3D=3D psdev->dev->bus->number - && PCI_DEVFN(slot, func) =3D=3D psdev->dev->devfn) { + && slot =3D=3D PCI_SLOT(psdev->dev->devfn) + && func =3D=3D PCI_FUNC(psdev->dev->devfn)) { found_dev =3D pcistub_device_get_pci_dev(pdev, = psdev); break; } @@ -936,14 +938,14 @@ static inline int str_to_quirk(const cha { int parsed =3D 0; =20 - sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x %n", domain, bus, slot, = func, + sscanf(buf, " %x:%x:%x.%x-%x:%x:%x %n", domain, bus, slot, func, reg, size, mask, &parsed); if (parsed && !buf[parsed]) return 0; =20 /* try again without domain */ *domain =3D 0; - sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, = size, + sscanf(buf, " %x:%x.%x-%x:%x:%x %n", bus, slot, func, reg, size, mask, &parsed); if (parsed && !buf[parsed]) return 0; @@ -955,7 +957,7 @@ static int pcistub_device_id_add(int dom { struct pcistub_device_id *pci_dev_id; unsigned long flags; - int rc =3D 0; + int rc =3D 0, devfn =3D PCI_DEVFN(slot, func); =20 if (slot < 0) { for (slot =3D 0; !rc && slot < 32; ++slot) @@ -969,13 +971,24 @@ static int pcistub_device_id_add(int dom return rc; } =20 + if (( +#if !defined(MODULE) /* pci_domains_supported is not being exported */ \ + || !defined(CONFIG_PCI_DOMAINS) + !pci_domains_supported ? domain : +#endif + domain < 0 || domain > 0xffff) + || bus < 0 || bus > 0xff + || PCI_SLOT(devfn) !=3D slot + || PCI_FUNC(devfn) !=3D func) + return -EINVAL; + pci_dev_id =3D kmalloc(sizeof(*pci_dev_id), GFP_KERNEL); if (!pci_dev_id) return -ENOMEM; =20 pci_dev_id->domain =3D domain; pci_dev_id->bus =3D bus; - pci_dev_id->devfn =3D PCI_DEVFN(slot, func); + pci_dev_id->devfn =3D devfn; =20 pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%d\n", domain, bus, slot, func); @@ -1016,14 +1029,18 @@ static int pcistub_device_id_remove(int return err; } =20 -static int pcistub_reg_add(int domain, int bus, int slot, int func, int = reg, - int size, int mask) +static int pcistub_reg_add(int domain, int bus, int slot, int func, + unsigned int reg, unsigned int size, + unsigned int mask) { int err =3D 0; struct pcistub_device *psdev; struct pci_dev *dev; struct config_field *field; =20 + if (reg > 0xfff || (size < 4 && (mask >> (size * 8)))) + return -EINVAL; + psdev =3D pcistub_device_find(domain, bus, slot, func); if (!psdev) { err =3D -ENODEV; @@ -1254,13 +1271,11 @@ static ssize_t permissive_add(struct dev int err; struct pcistub_device *psdev; struct xen_pcibk_dev_data *dev_data; + err =3D str_to_slot(buf, &domain, &bus, &slot, &func); if (err) goto out; - if (slot < 0 || func < 0) { - err =3D -EINVAL; - goto out; - } + psdev =3D pcistub_device_find(domain, bus, slot, func); if (!psdev) { err =3D -ENODEV; --=__PartF8C93689.0__= Content-Type: text/plain; name="linux-3.7-rc3-xen-pciback-strict.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-xen-pciback-strict.patch" xen-pciback: reject out of range inputs=0A=0AThis add checks for out of = range numbers (including in cases where the=0Afolding of slot and function = into a single value could yield false=0Amatches).=0A=0AIt also removes the = bogus field width restrictions in str_to_quirk() -=0Anowhere else in the = driver this is being done, and hence this function=0Acould reject input = the equivalent of which would be happily accepted=0Ain other places (in = particular, "0x" prefixes causing the effective=0Awidth of the actual = number to be either zero or less than what would be=0Arequired to cover = the full range of valid values). Note that for the=0Amoment this second = part is cosmetic only, as the kernel's sscanf()=0Acurrently ignores the = field widths, but a patch to overcome this is on=0Aits way.=0A=0ASigned-off= -by: Jan Beulich =0A=0A---=0A drivers/xen/xen-pciback/pc= i_stub.c | 39 +++++++++++++++++++++++++------------=0A 1 file changed, = 27 insertions(+), 12 deletions(-)=0A=0A--- 3.7-rc3-xen-pciback.orig/drivers= /xen/xen-pciback/pci_stub.c=0A+++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciba= ck/pci_stub.c=0A@@ -142,7 +142,8 @@ static struct pcistub_device *pcistub_d= e=0A if (psdev->dev !=3D NULL=0A && domain = =3D=3D pci_domain_nr(psdev->dev->bus)=0A && bus =3D=3D = psdev->dev->bus->number=0A- && PCI_DEVFN(slot, func) = =3D=3D psdev->dev->devfn) {=0A+ && slot =3D=3D PCI_SLOT(psdev->= dev->devfn)=0A+ && func =3D=3D PCI_FUNC(psdev->dev->devfn)) = {=0A pcistub_device_get(psdev);=0A = goto out;=0A }=0A@@ -191,7 +192,8 @@ struct pci_dev *pcistub_get= _pci_dev_by_s=0A if (psdev->dev !=3D NULL=0A = && domain =3D=3D pci_domain_nr(psdev->dev->bus)=0A && bus = =3D=3D psdev->dev->bus->number=0A- && PCI_DEVFN(slot, = func) =3D=3D psdev->dev->devfn) {=0A+ && slot =3D=3D = PCI_SLOT(psdev->dev->devfn)=0A+ && func =3D=3D PCI_FUNC(psdev->= dev->devfn)) {=0A found_dev =3D pcistub_device_get_pc= i_dev(pdev, psdev);=0A break;=0A }=0A@@ = -936,14 +938,14 @@ static inline int str_to_quirk(const cha=0A {=0A = int parsed =3D 0;=0A =0A- sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x = %n", domain, bus, slot, func,=0A+ sscanf(buf, " %x:%x:%x.%x-%x:%x:%x = %n", domain, bus, slot, func,=0A reg, size, mask, = &parsed);=0A if (parsed && !buf[parsed])=0A return 0;=0A =0A = /* try again without domain */=0A *domain =3D 0;=0A- sscanf(buf,= " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, size,=0A+ sscanf(buf,= " %x:%x.%x-%x:%x:%x %n", bus, slot, func, reg, size,=0A = mask, &parsed);=0A if (parsed && !buf[parsed])=0A return = 0;=0A@@ -955,7 +957,7 @@ static int pcistub_device_id_add(int dom=0A {=0A = struct pcistub_device_id *pci_dev_id;=0A unsigned long flags;=0A- = int rc =3D 0;=0A+ int rc =3D 0, devfn =3D PCI_DEVFN(slot, func);=0A = =0A if (slot < 0) {=0A for (slot =3D 0; !rc && slot < 32; = ++slot)=0A@@ -969,13 +971,24 @@ static int pcistub_device_id_add(int = dom=0A return rc;=0A }=0A =0A+ if ((=0A+#if !defined(MODUL= E) /* pci_domains_supported is not being exported */ \=0A+ || !defined(C= ONFIG_PCI_DOMAINS)=0A+ !pci_domains_supported ? domain :=0A+#endif=0A= + domain < 0 || domain > 0xffff)=0A+ || bus < 0 || bus > = 0xff=0A+ || PCI_SLOT(devfn) !=3D slot=0A+ || PCI_FUNC(dev= fn) !=3D func)=0A+ return -EINVAL;=0A+=0A pci_dev_id =3D = kmalloc(sizeof(*pci_dev_id), GFP_KERNEL);=0A if (!pci_dev_id)=0A = return -ENOMEM;=0A =0A pci_dev_id->domain =3D domain;=0A pci_dev_id-= >bus =3D bus;=0A- pci_dev_id->devfn =3D PCI_DEVFN(slot, func);=0A+ = pci_dev_id->devfn =3D devfn;=0A =0A pr_debug(DRV_NAME ": wants to = seize %04x:%02x:%02x.%d\n",=0A domain, bus, slot, func);=0A@@ = -1016,14 +1029,18 @@ static int pcistub_device_id_remove(int=0A = return err;=0A }=0A =0A-static int pcistub_reg_add(int domain, int bus, = int slot, int func, int reg,=0A- int size, int = mask)=0A+static int pcistub_reg_add(int domain, int bus, int slot, int = func,=0A+ unsigned int reg, unsigned int = size,=0A+ unsigned int mask)=0A {=0A int err = =3D 0;=0A struct pcistub_device *psdev;=0A struct pci_dev = *dev;=0A struct config_field *field;=0A =0A+ if (reg > 0xfff || = (size < 4 && (mask >> (size * 8))))=0A+ return -EINVAL;=0A+=0A = psdev =3D pcistub_device_find(domain, bus, slot, func);=0A if = (!psdev) {=0A err =3D -ENODEV;=0A@@ -1254,13 +1271,11 @@ static = ssize_t permissive_add(struct dev=0A int err;=0A struct pcistub_devi= ce *psdev;=0A struct xen_pcibk_dev_data *dev_data;=0A+=0A err =3D = str_to_slot(buf, &domain, &bus, &slot, &func);=0A if (err)=0A = goto out;=0A- if (slot < 0 || func < 0) {=0A- err =3D -EINVAL;=0A= - goto out;=0A- }=0A+=0A psdev =3D pcistub_device_fi= nd(domain, bus, slot, func);=0A if (!psdev) {=0A = err =3D -ENODEV;=0A --=__PartF8C93689.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartF8C93689.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:36:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:36:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIMN-00029g-Mf; Fri, 02 Nov 2012 14:36:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIMM-00029S-UI for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:36:35 +0000 Received: from [85.158.143.35:39201] by server-3.bemta-4.messagelabs.com id B4/AC-06841-27AD3905; Fri, 02 Nov 2012 14:36:34 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1351866992!16126226!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10349 invoked from network); 2 Nov 2012 14:36:32 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 2 Nov 2012 14:36:32 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 14:37:06 +0000 Message-Id: <5093E8A902000078000A61A7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 14:37:13 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartF8C93689.0__=" Cc: linux-kernel@vger.kernel.org, xen-devel Subject: [Xen-devel] [PATCH 2/2] xen-pciback: reject out of range inputs X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartF8C93689.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This add checks for out of range numbers (including in cases where the folding of slot and function into a single value could yield false matches). It also removes the bogus field width restrictions in str_to_quirk() - nowhere else in the driver this is being done, and hence this function could reject input the equivalent of which would be happily accepted in other places (in particular, "0x" prefixes causing the effective width of the actual number to be either zero or less than what would be required to cover the full range of valid values). Note that for the moment this second part is cosmetic only, as the kernel's sscanf() currently ignores the field widths, but a patch to overcome this is on its way. Signed-off-by: Jan Beulich --- drivers/xen/xen-pciback/pci_stub.c | 39 +++++++++++++++++++++++++-------= ----- 1 file changed, 27 insertions(+), 12 deletions(-) --- 3.7-rc3-xen-pciback.orig/drivers/xen/xen-pciback/pci_stub.c +++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciback/pci_stub.c @@ -142,7 +142,8 @@ static struct pcistub_device *pcistub_de if (psdev->dev !=3D NULL && domain =3D=3D pci_domain_nr(psdev->dev->bus) && bus =3D=3D psdev->dev->bus->number - && PCI_DEVFN(slot, func) =3D=3D psdev->dev->devfn) { + && slot =3D=3D PCI_SLOT(psdev->dev->devfn) + && func =3D=3D PCI_FUNC(psdev->dev->devfn)) { pcistub_device_get(psdev); goto out; } @@ -191,7 +192,8 @@ struct pci_dev *pcistub_get_pci_dev_by_s if (psdev->dev !=3D NULL && domain =3D=3D pci_domain_nr(psdev->dev->bus) && bus =3D=3D psdev->dev->bus->number - && PCI_DEVFN(slot, func) =3D=3D psdev->dev->devfn) { + && slot =3D=3D PCI_SLOT(psdev->dev->devfn) + && func =3D=3D PCI_FUNC(psdev->dev->devfn)) { found_dev =3D pcistub_device_get_pci_dev(pdev, = psdev); break; } @@ -936,14 +938,14 @@ static inline int str_to_quirk(const cha { int parsed =3D 0; =20 - sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x %n", domain, bus, slot, = func, + sscanf(buf, " %x:%x:%x.%x-%x:%x:%x %n", domain, bus, slot, func, reg, size, mask, &parsed); if (parsed && !buf[parsed]) return 0; =20 /* try again without domain */ *domain =3D 0; - sscanf(buf, " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, = size, + sscanf(buf, " %x:%x.%x-%x:%x:%x %n", bus, slot, func, reg, size, mask, &parsed); if (parsed && !buf[parsed]) return 0; @@ -955,7 +957,7 @@ static int pcistub_device_id_add(int dom { struct pcistub_device_id *pci_dev_id; unsigned long flags; - int rc =3D 0; + int rc =3D 0, devfn =3D PCI_DEVFN(slot, func); =20 if (slot < 0) { for (slot =3D 0; !rc && slot < 32; ++slot) @@ -969,13 +971,24 @@ static int pcistub_device_id_add(int dom return rc; } =20 + if (( +#if !defined(MODULE) /* pci_domains_supported is not being exported */ \ + || !defined(CONFIG_PCI_DOMAINS) + !pci_domains_supported ? domain : +#endif + domain < 0 || domain > 0xffff) + || bus < 0 || bus > 0xff + || PCI_SLOT(devfn) !=3D slot + || PCI_FUNC(devfn) !=3D func) + return -EINVAL; + pci_dev_id =3D kmalloc(sizeof(*pci_dev_id), GFP_KERNEL); if (!pci_dev_id) return -ENOMEM; =20 pci_dev_id->domain =3D domain; pci_dev_id->bus =3D bus; - pci_dev_id->devfn =3D PCI_DEVFN(slot, func); + pci_dev_id->devfn =3D devfn; =20 pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%d\n", domain, bus, slot, func); @@ -1016,14 +1029,18 @@ static int pcistub_device_id_remove(int return err; } =20 -static int pcistub_reg_add(int domain, int bus, int slot, int func, int = reg, - int size, int mask) +static int pcistub_reg_add(int domain, int bus, int slot, int func, + unsigned int reg, unsigned int size, + unsigned int mask) { int err =3D 0; struct pcistub_device *psdev; struct pci_dev *dev; struct config_field *field; =20 + if (reg > 0xfff || (size < 4 && (mask >> (size * 8)))) + return -EINVAL; + psdev =3D pcistub_device_find(domain, bus, slot, func); if (!psdev) { err =3D -ENODEV; @@ -1254,13 +1271,11 @@ static ssize_t permissive_add(struct dev int err; struct pcistub_device *psdev; struct xen_pcibk_dev_data *dev_data; + err =3D str_to_slot(buf, &domain, &bus, &slot, &func); if (err) goto out; - if (slot < 0 || func < 0) { - err =3D -EINVAL; - goto out; - } + psdev =3D pcistub_device_find(domain, bus, slot, func); if (!psdev) { err =3D -ENODEV; --=__PartF8C93689.0__= Content-Type: text/plain; name="linux-3.7-rc3-xen-pciback-strict.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="linux-3.7-rc3-xen-pciback-strict.patch" xen-pciback: reject out of range inputs=0A=0AThis add checks for out of = range numbers (including in cases where the=0Afolding of slot and function = into a single value could yield false=0Amatches).=0A=0AIt also removes the = bogus field width restrictions in str_to_quirk() -=0Anowhere else in the = driver this is being done, and hence this function=0Acould reject input = the equivalent of which would be happily accepted=0Ain other places (in = particular, "0x" prefixes causing the effective=0Awidth of the actual = number to be either zero or less than what would be=0Arequired to cover = the full range of valid values). Note that for the=0Amoment this second = part is cosmetic only, as the kernel's sscanf()=0Acurrently ignores the = field widths, but a patch to overcome this is on=0Aits way.=0A=0ASigned-off= -by: Jan Beulich =0A=0A---=0A drivers/xen/xen-pciback/pc= i_stub.c | 39 +++++++++++++++++++++++++------------=0A 1 file changed, = 27 insertions(+), 12 deletions(-)=0A=0A--- 3.7-rc3-xen-pciback.orig/drivers= /xen/xen-pciback/pci_stub.c=0A+++ 3.7-rc3-xen-pciback/drivers/xen/xen-pciba= ck/pci_stub.c=0A@@ -142,7 +142,8 @@ static struct pcistub_device *pcistub_d= e=0A if (psdev->dev !=3D NULL=0A && domain = =3D=3D pci_domain_nr(psdev->dev->bus)=0A && bus =3D=3D = psdev->dev->bus->number=0A- && PCI_DEVFN(slot, func) = =3D=3D psdev->dev->devfn) {=0A+ && slot =3D=3D PCI_SLOT(psdev->= dev->devfn)=0A+ && func =3D=3D PCI_FUNC(psdev->dev->devfn)) = {=0A pcistub_device_get(psdev);=0A = goto out;=0A }=0A@@ -191,7 +192,8 @@ struct pci_dev *pcistub_get= _pci_dev_by_s=0A if (psdev->dev !=3D NULL=0A = && domain =3D=3D pci_domain_nr(psdev->dev->bus)=0A && bus = =3D=3D psdev->dev->bus->number=0A- && PCI_DEVFN(slot, = func) =3D=3D psdev->dev->devfn) {=0A+ && slot =3D=3D = PCI_SLOT(psdev->dev->devfn)=0A+ && func =3D=3D PCI_FUNC(psdev->= dev->devfn)) {=0A found_dev =3D pcistub_device_get_pc= i_dev(pdev, psdev);=0A break;=0A }=0A@@ = -936,14 +938,14 @@ static inline int str_to_quirk(const cha=0A {=0A = int parsed =3D 0;=0A =0A- sscanf(buf, " %4x:%2x:%2x.%d-%8x:%1x:%8x = %n", domain, bus, slot, func,=0A+ sscanf(buf, " %x:%x:%x.%x-%x:%x:%x = %n", domain, bus, slot, func,=0A reg, size, mask, = &parsed);=0A if (parsed && !buf[parsed])=0A return 0;=0A =0A = /* try again without domain */=0A *domain =3D 0;=0A- sscanf(buf,= " %2x:%2x.%d-%8x:%1x:%8x %n", bus, slot, func, reg, size,=0A+ sscanf(buf,= " %x:%x.%x-%x:%x:%x %n", bus, slot, func, reg, size,=0A = mask, &parsed);=0A if (parsed && !buf[parsed])=0A return = 0;=0A@@ -955,7 +957,7 @@ static int pcistub_device_id_add(int dom=0A {=0A = struct pcistub_device_id *pci_dev_id;=0A unsigned long flags;=0A- = int rc =3D 0;=0A+ int rc =3D 0, devfn =3D PCI_DEVFN(slot, func);=0A = =0A if (slot < 0) {=0A for (slot =3D 0; !rc && slot < 32; = ++slot)=0A@@ -969,13 +971,24 @@ static int pcistub_device_id_add(int = dom=0A return rc;=0A }=0A =0A+ if ((=0A+#if !defined(MODUL= E) /* pci_domains_supported is not being exported */ \=0A+ || !defined(C= ONFIG_PCI_DOMAINS)=0A+ !pci_domains_supported ? domain :=0A+#endif=0A= + domain < 0 || domain > 0xffff)=0A+ || bus < 0 || bus > = 0xff=0A+ || PCI_SLOT(devfn) !=3D slot=0A+ || PCI_FUNC(dev= fn) !=3D func)=0A+ return -EINVAL;=0A+=0A pci_dev_id =3D = kmalloc(sizeof(*pci_dev_id), GFP_KERNEL);=0A if (!pci_dev_id)=0A = return -ENOMEM;=0A =0A pci_dev_id->domain =3D domain;=0A pci_dev_id-= >bus =3D bus;=0A- pci_dev_id->devfn =3D PCI_DEVFN(slot, func);=0A+ = pci_dev_id->devfn =3D devfn;=0A =0A pr_debug(DRV_NAME ": wants to = seize %04x:%02x:%02x.%d\n",=0A domain, bus, slot, func);=0A@@ = -1016,14 +1029,18 @@ static int pcistub_device_id_remove(int=0A = return err;=0A }=0A =0A-static int pcistub_reg_add(int domain, int bus, = int slot, int func, int reg,=0A- int size, int = mask)=0A+static int pcistub_reg_add(int domain, int bus, int slot, int = func,=0A+ unsigned int reg, unsigned int = size,=0A+ unsigned int mask)=0A {=0A int err = =3D 0;=0A struct pcistub_device *psdev;=0A struct pci_dev = *dev;=0A struct config_field *field;=0A =0A+ if (reg > 0xfff || = (size < 4 && (mask >> (size * 8))))=0A+ return -EINVAL;=0A+=0A = psdev =3D pcistub_device_find(domain, bus, slot, func);=0A if = (!psdev) {=0A err =3D -ENODEV;=0A@@ -1254,13 +1271,11 @@ static = ssize_t permissive_add(struct dev=0A int err;=0A struct pcistub_devi= ce *psdev;=0A struct xen_pcibk_dev_data *dev_data;=0A+=0A err =3D = str_to_slot(buf, &domain, &bus, &slot, &func);=0A if (err)=0A = goto out;=0A- if (slot < 0 || func < 0) {=0A- err =3D -EINVAL;=0A= - goto out;=0A- }=0A+=0A psdev =3D pcistub_device_fi= nd(domain, bus, slot, func);=0A if (!psdev) {=0A = err =3D -ENODEV;=0A --=__PartF8C93689.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartF8C93689.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 02 14:50:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:50:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa3-0002j2-44; Fri, 02 Nov 2012 14:50:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa2-0002is-6b for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:50:42 +0000 Received: from [85.158.143.99:62262] by server-1.bemta-4.messagelabs.com id 20/64-27934-1CDD3905; Fri, 02 Nov 2012 14:50:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1351867840!28064051!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4791 invoked from network); 2 Nov 2012 14:50:40 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:50:40 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so1130104wib.14 for ; Fri, 02 Nov 2012 07:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=dVzSHeue3Bv+16lHRVDPg65OuGKzMBoOLeo9DUjS/Jc=; b=T8+RY20mFhCAqry7NOPJOlSBNtb2oJPYEpn8sLELFko7rHk2FxCeUMOeNgm98Z0TM4 NNrPTu+kUlbaqtIJA0lF3r/Ir1GrehNxGVWl+12di4Q0ipUpt83ZLq7BTmqYAEWYQeCp 6f9KavEHU3fSj6z66+f4S4H4ssxWCSv5HXvm/MUNcCFsoyHUJNBDYs2ZtvQIpvCBsG+S zJP4wQtnWDF64wU0JNA4/rqHr9fmUtzx2Zcd6uEz/EGFqtB4f7ZarIUr4j7p6pm2y9p/ o5Fd+l4ghviIK2oaYTZRmQeoOCqlGsjLqfvVUeS5Hji4ulLDNVLdUJNx7ZI4f5K7V3Iq 60sQ== Received: by 10.180.80.100 with SMTP id q4mr2918534wix.20.1351867840186; Fri, 02 Nov 2012 07:50:40 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fp6sm2584386wib.0.2012.11.02.07.50.38 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:50:39 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 14:50:35 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support Thread-Index: Ac25CWog19FmwZx9BUCCnuwylJJSCg== In-Reply-To: <5093D51B02000078000A607C@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 13:13, "Jan Beulich" wrote: > Matching a similar change in Linux 3.7-rc. > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- a/xen/arch/x86/cpu/mwait-idle.c > +++ b/xen/arch/x86/cpu/mwait-idle.c > @@ -365,6 +365,7 @@ static struct intel_idle_id { > ICPU(0x2a, snb), > ICPU(0x2d, snb), > ICPU(0x3a, ivb), > + ICPU(0x3e, ivb), > {} > }; > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:50:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:50:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa3-0002j2-44; Fri, 02 Nov 2012 14:50:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa2-0002is-6b for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:50:42 +0000 Received: from [85.158.143.99:62262] by server-1.bemta-4.messagelabs.com id 20/64-27934-1CDD3905; Fri, 02 Nov 2012 14:50:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1351867840!28064051!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4791 invoked from network); 2 Nov 2012 14:50:40 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:50:40 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so1130104wib.14 for ; Fri, 02 Nov 2012 07:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=dVzSHeue3Bv+16lHRVDPg65OuGKzMBoOLeo9DUjS/Jc=; b=T8+RY20mFhCAqry7NOPJOlSBNtb2oJPYEpn8sLELFko7rHk2FxCeUMOeNgm98Z0TM4 NNrPTu+kUlbaqtIJA0lF3r/Ir1GrehNxGVWl+12di4Q0ipUpt83ZLq7BTmqYAEWYQeCp 6f9KavEHU3fSj6z66+f4S4H4ssxWCSv5HXvm/MUNcCFsoyHUJNBDYs2ZtvQIpvCBsG+S zJP4wQtnWDF64wU0JNA4/rqHr9fmUtzx2Zcd6uEz/EGFqtB4f7ZarIUr4j7p6pm2y9p/ o5Fd+l4ghviIK2oaYTZRmQeoOCqlGsjLqfvVUeS5Hji4ulLDNVLdUJNx7ZI4f5K7V3Iq 60sQ== Received: by 10.180.80.100 with SMTP id q4mr2918534wix.20.1351867840186; Fri, 02 Nov 2012 07:50:40 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fp6sm2584386wib.0.2012.11.02.07.50.38 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:50:39 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 14:50:35 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support Thread-Index: Ac25CWog19FmwZx9BUCCnuwylJJSCg== In-Reply-To: <5093D51B02000078000A607C@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/mwait-idle: enable Ivy Bridge Xeon support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 13:13, "Jan Beulich" wrote: > Matching a similar change in Linux 3.7-rc. > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- a/xen/arch/x86/cpu/mwait-idle.c > +++ b/xen/arch/x86/cpu/mwait-idle.c > @@ -365,6 +365,7 @@ static struct intel_idle_id { > ICPU(0x2a, snb), > ICPU(0x2d, snb), > ICPU(0x3a, ivb), > + ICPU(0x3e, ivb), > {} > }; > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:50:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:50:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa3-0002j9-Fb; Fri, 02 Nov 2012 14:50:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa2-0002it-Ad for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:50:42 +0000 Received: from [85.158.143.99:62261] by server-2.bemta-4.messagelabs.com id 99/82-28922-1CDD3905; Fri, 02 Nov 2012 14:50:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351867837!23079094!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 377 invoked from network); 2 Nov 2012 14:50:40 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:50:40 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so1130064wib.14 for ; Fri, 02 Nov 2012 07:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=WZAxIENOpzFzAVnsRCNFwXucWshl0Y71rzHDlekyE14=; b=1C899zk/9HgoubRv+0TPHzy9FDp87VHvR3xQjldvGjZtTuU2UaJbbqkiO4v7vABUdy my75/WVQgTOc6Q+BQ0CAhgFxMlccqunfZRqVwDu/N5pLVJjng63sZJd4tmt3RW+S/XWT 4e7i8tQNtRUqGHdSQBAOmfV9pdshbLNqsiBxF3TK3KkQPJ9MgfcfqO5hZN1C9sqT174l EEOfPr7YU3sTdggRjrBzwqIa5HeCtK6T0Kmz1tEzSw5J8ovhzhzBwMXU1yft56yMuedR dyvN8QUUqWrjnD9KWe/JY7n/y16ed0tTilWPFmYjB4dkW6rkPhLWpnVqHSia8lHHaDi+ aBLw== Received: by 10.180.94.169 with SMTP id dd9mr1946728wib.14.1351867837045; Fri, 02 Nov 2012 07:50:37 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fp6sm2584386wib.0.2012.11.02.07.50.33 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:50:36 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 14:50:23 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data Thread-Index: Ac25CWL5wab22k7IE0GeFnEPr1FkBA== In-Reply-To: <5093D4B502000078000A606E@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 13:12, "Jan Beulich" wrote: > It has never been used for anything, and Linux 3.7 doesn't propagate > this information anymore. > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- > Konrad, on the pv-ops side it may be better to pass zero rather than > leaving the field completely uninitialized. > > --- a/xen/arch/x86/acpi/cpu_idle.c > +++ b/xen/arch/x86/acpi/cpu_idle.c > @@ -935,7 +935,6 @@ static void set_cx( > } > > cx->latency = xen_cx->latency; > - cx->power = xen_cx->power; > > cx->target_residency = cx->latency * latency_factor; > if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) > --- a/xen/arch/x86/cpu/mwait-idle.c > +++ b/xen/arch/x86/cpu/mwait-idle.c > @@ -96,7 +96,6 @@ static const struct cpuidle_state { > char name[16]; > unsigned int flags; > unsigned int exit_latency; /* in US */ > - int power_usage; /* in mW */ > unsigned int target_residency; /* in US */ > } *cpuidle_state_table; > > @@ -479,7 +478,6 @@ static int mwait_idle_cpu_init(struct no > cx->type = cstate; > cx->address = get_driver_data(cstate); > cx->entry_method = ACPI_CSTATE_EM_FFH; > - cx->power = cpuidle_state_table[cstate].power_usage; > cx->latency = cpuidle_state_table[cstate].exit_latency; > cx->target_residency = > cpuidle_state_table[cstate].target_residency; > --- a/xen/include/xen/cpuidle.h > +++ b/xen/include/xen/cpuidle.h > @@ -46,7 +46,6 @@ struct acpi_processor_cx > u32 address; > u32 latency; > u32 target_residency; > - u32 power; > u32 usage; > u64 time; > }; > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 14:50:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 14:50:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa3-0002j9-Fb; Fri, 02 Nov 2012 14:50:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUIa2-0002it-Ad for xen-devel@lists.xen.org; Fri, 02 Nov 2012 14:50:42 +0000 Received: from [85.158.143.99:62261] by server-2.bemta-4.messagelabs.com id 99/82-28922-1CDD3905; Fri, 02 Nov 2012 14:50:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1351867837!23079094!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 377 invoked from network); 2 Nov 2012 14:50:40 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 14:50:40 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so1130064wib.14 for ; Fri, 02 Nov 2012 07:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=WZAxIENOpzFzAVnsRCNFwXucWshl0Y71rzHDlekyE14=; b=1C899zk/9HgoubRv+0TPHzy9FDp87VHvR3xQjldvGjZtTuU2UaJbbqkiO4v7vABUdy my75/WVQgTOc6Q+BQ0CAhgFxMlccqunfZRqVwDu/N5pLVJjng63sZJd4tmt3RW+S/XWT 4e7i8tQNtRUqGHdSQBAOmfV9pdshbLNqsiBxF3TK3KkQPJ9MgfcfqO5hZN1C9sqT174l EEOfPr7YU3sTdggRjrBzwqIa5HeCtK6T0Kmz1tEzSw5J8ovhzhzBwMXU1yft56yMuedR dyvN8QUUqWrjnD9KWe/JY7n/y16ed0tTilWPFmYjB4dkW6rkPhLWpnVqHSia8lHHaDi+ aBLw== Received: by 10.180.94.169 with SMTP id dd9mr1946728wib.14.1351867837045; Fri, 02 Nov 2012 07:50:37 -0700 (PDT) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fp6sm2584386wib.0.2012.11.02.07.50.33 (version=SSLv3 cipher=OTHER); Fri, 02 Nov 2012 07:50:36 -0700 (PDT) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Fri, 02 Nov 2012 14:50:23 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data Thread-Index: Ac25CWL5wab22k7IE0GeFnEPr1FkBA== In-Reply-To: <5093D4B502000078000A606E@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] ACPI/cpuidle: remove unused "power" field from Cx state data X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/2012 13:12, "Jan Beulich" wrote: > It has never been used for anything, and Linux 3.7 doesn't propagate > this information anymore. > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- > Konrad, on the pv-ops side it may be better to pass zero rather than > leaving the field completely uninitialized. > > --- a/xen/arch/x86/acpi/cpu_idle.c > +++ b/xen/arch/x86/acpi/cpu_idle.c > @@ -935,7 +935,6 @@ static void set_cx( > } > > cx->latency = xen_cx->latency; > - cx->power = xen_cx->power; > > cx->target_residency = cx->latency * latency_factor; > if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) > --- a/xen/arch/x86/cpu/mwait-idle.c > +++ b/xen/arch/x86/cpu/mwait-idle.c > @@ -96,7 +96,6 @@ static const struct cpuidle_state { > char name[16]; > unsigned int flags; > unsigned int exit_latency; /* in US */ > - int power_usage; /* in mW */ > unsigned int target_residency; /* in US */ > } *cpuidle_state_table; > > @@ -479,7 +478,6 @@ static int mwait_idle_cpu_init(struct no > cx->type = cstate; > cx->address = get_driver_data(cstate); > cx->entry_method = ACPI_CSTATE_EM_FFH; > - cx->power = cpuidle_state_table[cstate].power_usage; > cx->latency = cpuidle_state_table[cstate].exit_latency; > cx->target_residency = > cpuidle_state_table[cstate].target_residency; > --- a/xen/include/xen/cpuidle.h > +++ b/xen/include/xen/cpuidle.h > @@ -46,7 +46,6 @@ struct acpi_processor_cx > u32 address; > u32 latency; > u32 target_residency; > - u32 power; > u32 usage; > u64 time; > }; > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 15:43:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 15:43:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJPE-0004Di-Fh; Fri, 02 Nov 2012 15:43:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJPC-0004Db-NR for xen-devel@lists.xen.org; Fri, 02 Nov 2012 15:43:34 +0000 Received: from [193.109.254.147:16463] by server-14.bemta-14.messagelabs.com id 5A/86-14517-52AE3905; Fri, 02 Nov 2012 15:43:33 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1351871012!9489164!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28439 invoked from network); 2 Nov 2012 15:43:33 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 15:43:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="15560858" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 15:43:12 +0000 Received: from mac.citrite.net (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 15:43:12 +0000 From: Roger Pau Monne To: Date: Fri, 2 Nov 2012 16:43:04 +0100 Message-ID: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, Roger Pau Monne Subject: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch contains fixes for persistent grants implementation v2: * handle == 0 is a valid handle, so initialize grants in blkback setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported by Konrad Rzeszutek Wilk. * new_map is a boolean, use "true" or "false" instead of 1 and 0. Reported by Konrad Rzeszutek Wilk. * blkfront announces the persistent-grants feature as feature-persistent-grants, use feature-persistent instead which is consistent with blkback and the public Xen headers. * Add a consistency check in blkfront to make sure we don't try to access segments that have not been set. Signed-off-by: Roger Pau Monne Cc: Cc: --- drivers/block/xen-blkback/blkback.c | 15 +++++++++------ drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/xen-blkfront.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 663d42d..a059616 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, * We are using persistent grants and * the grant is already mapped */ - new_map = 0; + new_map = false; } else if (use_persistent_gnts && blkif->persistent_gnt_c < max_mapped_grant_pages(blkif->blk_protocol)) { @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, * We are using persistent grants, the grant is * not mapped but we have room for it */ - new_map = 1; - persistent_gnt = kzalloc( + new_map = true; + persistent_gnt = kmalloc( sizeof(struct persistent_gnt), GFP_KERNEL); if (!persistent_gnt) @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, return -ENOMEM; } persistent_gnt->gnt = req->u.rw.seg[i].gref; + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; pages_to_gnt[segs_to_map] = persistent_gnt->page; @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", blkif->domid, blkif->vbd.handle); } - new_map = 1; + new_map = true; pages[i] = blkbk->pending_page(pending_req, i); addr = vaddr(pending_req, i); pages_to_gnt[segs_to_map] = @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, */ bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); for (i = 0, j = 0; i < nseg; i++) { - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { + if (!persistent_gnts[i] || + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { /* This is a newly mapped grant */ BUG_ON(j >= segs_to_map); if (unlikely(map[j].status != 0)) { @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, } } if (persistent_gnts[i]) { - if (!persistent_gnts[i]->handle) { + if (persistent_gnts[i]->handle == + BLKBACK_INVALID_HANDLE) { /* * If this is a new persistent grant * save the handler diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index b225026..a03ecbb 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) return -1; } err = xenbus_gather(XBT_NIL, dev->otherend, - "feature-persistent-grants", "%u", + "feature-persistent", "%u", &pers_grants, NULL); if (err) pers_grants = 0; diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 911d733..f1de806 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, rq_for_each_segment(bvec, s->request, iter) { BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); i = offset >> PAGE_SHIFT; + BUG_ON(i >= s->req.u.rw.nr_segments); shared_data = kmap_atomic( pfn_to_page(s->grants_used[i]->pfn)); bvec_data = bvec_kmap_irq(bvec, &flags); @@ -1069,7 +1070,7 @@ again: goto abort_transaction; } err = xenbus_printf(xbt, dev->nodename, - "feature-persistent-grants", "%u", 1); + "feature-persistent", "%u", 1); if (err) dev_warn(&dev->dev, "writing persistent grants feature to xenbus"); -- 1.7.7.5 (Apple Git-26) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 15:43:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 15:43:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJPE-0004Di-Fh; Fri, 02 Nov 2012 15:43:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJPC-0004Db-NR for xen-devel@lists.xen.org; Fri, 02 Nov 2012 15:43:34 +0000 Received: from [193.109.254.147:16463] by server-14.bemta-14.messagelabs.com id 5A/86-14517-52AE3905; Fri, 02 Nov 2012 15:43:33 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1351871012!9489164!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28439 invoked from network); 2 Nov 2012 15:43:33 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 15:43:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,699,1344211200"; d="scan'208";a="15560858" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 15:43:12 +0000 Received: from mac.citrite.net (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 15:43:12 +0000 From: Roger Pau Monne To: Date: Fri, 2 Nov 2012 16:43:04 +0100 Message-ID: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, Roger Pau Monne Subject: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch contains fixes for persistent grants implementation v2: * handle == 0 is a valid handle, so initialize grants in blkback setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported by Konrad Rzeszutek Wilk. * new_map is a boolean, use "true" or "false" instead of 1 and 0. Reported by Konrad Rzeszutek Wilk. * blkfront announces the persistent-grants feature as feature-persistent-grants, use feature-persistent instead which is consistent with blkback and the public Xen headers. * Add a consistency check in blkfront to make sure we don't try to access segments that have not been set. Signed-off-by: Roger Pau Monne Cc: Cc: --- drivers/block/xen-blkback/blkback.c | 15 +++++++++------ drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/xen-blkfront.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 663d42d..a059616 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, * We are using persistent grants and * the grant is already mapped */ - new_map = 0; + new_map = false; } else if (use_persistent_gnts && blkif->persistent_gnt_c < max_mapped_grant_pages(blkif->blk_protocol)) { @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, * We are using persistent grants, the grant is * not mapped but we have room for it */ - new_map = 1; - persistent_gnt = kzalloc( + new_map = true; + persistent_gnt = kmalloc( sizeof(struct persistent_gnt), GFP_KERNEL); if (!persistent_gnt) @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, return -ENOMEM; } persistent_gnt->gnt = req->u.rw.seg[i].gref; + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; pages_to_gnt[segs_to_map] = persistent_gnt->page; @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", blkif->domid, blkif->vbd.handle); } - new_map = 1; + new_map = true; pages[i] = blkbk->pending_page(pending_req, i); addr = vaddr(pending_req, i); pages_to_gnt[segs_to_map] = @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, */ bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); for (i = 0, j = 0; i < nseg; i++) { - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { + if (!persistent_gnts[i] || + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { /* This is a newly mapped grant */ BUG_ON(j >= segs_to_map); if (unlikely(map[j].status != 0)) { @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, } } if (persistent_gnts[i]) { - if (!persistent_gnts[i]->handle) { + if (persistent_gnts[i]->handle == + BLKBACK_INVALID_HANDLE) { /* * If this is a new persistent grant * save the handler diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index b225026..a03ecbb 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) return -1; } err = xenbus_gather(XBT_NIL, dev->otherend, - "feature-persistent-grants", "%u", + "feature-persistent", "%u", &pers_grants, NULL); if (err) pers_grants = 0; diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 911d733..f1de806 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, rq_for_each_segment(bvec, s->request, iter) { BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); i = offset >> PAGE_SHIFT; + BUG_ON(i >= s->req.u.rw.nr_segments); shared_data = kmap_atomic( pfn_to_page(s->grants_used[i]->pfn)); bvec_data = bvec_kmap_irq(bvec, &flags); @@ -1069,7 +1070,7 @@ again: goto abort_transaction; } err = xenbus_printf(xbt, dev->nodename, - "feature-persistent-grants", "%u", 1); + "feature-persistent", "%u", 1); if (err) dev_warn(&dev->dev, "writing persistent grants feature to xenbus"); -- 1.7.7.5 (Apple Git-26) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:19:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:19:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJxr-0005Lv-DV; Fri, 02 Nov 2012 16:19:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJxp-0005LP-GB for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:19:21 +0000 Received: from [85.158.137.99:65474] by server-3.bemta-3.messagelabs.com id 41/C2-31566-882F3905; Fri, 02 Nov 2012 16:19:20 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1351873157!12147205!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10748 invoked from network); 2 Nov 2012 16:19:20 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:19:20 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:19:15 +0000 Message-Id: <509400BD02000078000A6258@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:19:57 +0000 From: "Jan Beulich" To: "Ronny Hegewald" Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 24.10.12 at 17:49, Jan Beulich wrote: > The iommu is enabled by default when xen is booting and later disabled > in iommu_setup() when no iommu is present. > > But under some circumstances iommu code can be called before > iommu_setup() is processed. If there is no iommu available xen crashes. > > This can happen for example when panic(...) is called as introduced > with the patch "x86-64: detect processors subject to AMD erratum #121 > and refuse to boot" since xen 4.1.3, resulting in > find_iommu_for_device() to be called in the context of > disable_IO_APIC() / __stop_this_cpu(). > > This patch fixes this by keeping the iommu disabled until iommu_setup() > is entered. > > Originally-by: Ronny Hegewald > > In order for iommu_enable to be off initially, iommu_supports_eim() > must not depend on it anymore, nor must acpi_parse_dmar(). The former > in turn requires that iommu_intremap gets uncoupled from iommu_enabled > (in particular, failure during IOMMU setup should no longer result in > iommu_intremap getting cleared by generic code; IOMMU specific code > can still do so provided in can live with the consequences). > > This could have the nice side effect of allowing to use "iommu=off" > even when x2APIC was pre-enabled by the BIOS (in which case interrupt > remapping is a requirement, but DMA translation [obviously] isn't), but > that doesn't currently work (and hence x2apic_bsp_setup() forces the > IOMMU on rather than just interrupt remapping). > > For consistency with VT-d, make the AMD IOMMU code also skip all ACPI > table parsing when neither iommu_enable nor iommu_intremap are set. > > Signed-off-by: Jan Beulich So after having got acks from both Intel and AMD, I committed this to -unstable, but I'm rather hesitant to backport this onto the 4.x branches (not the least because in the end this is just cosmetic for the problem you reported - the box would not boot in either case, just that with the patch it is more obvious why). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:19:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:19:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJxr-0005Lv-DV; Fri, 02 Nov 2012 16:19:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUJxp-0005LP-GB for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:19:21 +0000 Received: from [85.158.137.99:65474] by server-3.bemta-3.messagelabs.com id 41/C2-31566-882F3905; Fri, 02 Nov 2012 16:19:20 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1351873157!12147205!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10748 invoked from network); 2 Nov 2012 16:19:20 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:19:20 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:19:15 +0000 Message-Id: <509400BD02000078000A6258@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:19:57 +0000 From: "Jan Beulich" To: "Ronny Hegewald" Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 24.10.12 at 17:49, Jan Beulich wrote: > The iommu is enabled by default when xen is booting and later disabled > in iommu_setup() when no iommu is present. > > But under some circumstances iommu code can be called before > iommu_setup() is processed. If there is no iommu available xen crashes. > > This can happen for example when panic(...) is called as introduced > with the patch "x86-64: detect processors subject to AMD erratum #121 > and refuse to boot" since xen 4.1.3, resulting in > find_iommu_for_device() to be called in the context of > disable_IO_APIC() / __stop_this_cpu(). > > This patch fixes this by keeping the iommu disabled until iommu_setup() > is entered. > > Originally-by: Ronny Hegewald > > In order for iommu_enable to be off initially, iommu_supports_eim() > must not depend on it anymore, nor must acpi_parse_dmar(). The former > in turn requires that iommu_intremap gets uncoupled from iommu_enabled > (in particular, failure during IOMMU setup should no longer result in > iommu_intremap getting cleared by generic code; IOMMU specific code > can still do so provided in can live with the consequences). > > This could have the nice side effect of allowing to use "iommu=off" > even when x2APIC was pre-enabled by the BIOS (in which case interrupt > remapping is a requirement, but DMA translation [obviously] isn't), but > that doesn't currently work (and hence x2apic_bsp_setup() forces the > IOMMU on rather than just interrupt remapping). > > For consistency with VT-d, make the AMD IOMMU code also skip all ACPI > table parsing when neither iommu_enable nor iommu_intremap are set. > > Signed-off-by: Jan Beulich So after having got acks from both Intel and AMD, I committed this to -unstable, but I'm rather hesitant to backport this onto the 4.x branches (not the least because in the end this is just cosmetic for the problem you reported - the box would not boot in either case, just that with the patch it is more obvious why). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:23:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:23:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUK1x-0005cy-4k; Fri, 02 Nov 2012 16:23:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUK1w-0005cs-Ev for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:23:36 +0000 Received: from [85.158.139.211:51033] by server-8.bemta-5.messagelabs.com id C7/D5-06050-783F3905; Fri, 02 Nov 2012 16:23:35 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-6.tower-206.messagelabs.com!1351873413!18666915!1 X-Originating-IP: [209.85.220.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1447 invoked from network); 2 Nov 2012 16:23:35 -0000 Received: from mail-pa0-f45.google.com (HELO mail-pa0-f45.google.com) (209.85.220.45) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:23:35 -0000 Received: by mail-pa0-f45.google.com with SMTP id fb10so2668281pad.32 for ; Fri, 02 Nov 2012 09:23:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=EaVC243jcuIWU8aOZsOenAPQJiL3gY8AnNxd3eSPhsk=; b=VUc/LajnfD/XJBLxHoaK8J2nNbyN26VQu/qk5fhp3uX+YLi/iOqzeIBb7co0VzxBp2 AwMLjfG++yhYP0cqiNUvZ0f3iqh3YK2HBYssBdtr2o3rSvNF5lUwlin0R1ak9GDrnnna zFGViurUdcj8IiApoI2ZFVArf/NjBbLrbdQmr1gt2YLI+d/V1GNrS6Hrzc0aX4Bpbucm jdQ0/rqdArax1z0cr89FB4UY+SHEhcST5kkAFIzoQK6A8iJo5jDyEc2IcYSBRbyeXHxk a3I744T74cniJCHW4MIQ/maoym/+bwvkO5uLBS08Pa9C8aQZ2QcqY8S23JVlEFUmvhZJ Jdvw== Received: by 10.66.80.133 with SMTP id r5mr6796577pax.24.1351873413226; Fri, 02 Nov 2012 09:23:33 -0700 (PDT) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net. [67.168.183.230]) by mx.google.com with ESMTPS id wg3sm5977705pbc.28.2012.11.02.09.23.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:23:32 -0700 (PDT) Date: Fri, 2 Nov 2012 09:23:34 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102162334.GB4093@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093947F02000078000A5F42@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnPAx63QVcXJzm/e7gIPTNKoxWabwLMd1I07W9qi9pZk8PerHEM1m+cn4QAHDSZuUpXz/Ua Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > Since there's no possible caller of dbgp_external_startup() and Please just send the incremental patch, in a format that I can apply it (hint, as an attachment like this I can't, as I would have to hand-edit the attachment, and I might get it wrong...) thanks, greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:23:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:23:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUK1x-0005cy-4k; Fri, 02 Nov 2012 16:23:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUK1w-0005cs-Ev for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:23:36 +0000 Received: from [85.158.139.211:51033] by server-8.bemta-5.messagelabs.com id C7/D5-06050-783F3905; Fri, 02 Nov 2012 16:23:35 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-6.tower-206.messagelabs.com!1351873413!18666915!1 X-Originating-IP: [209.85.220.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1447 invoked from network); 2 Nov 2012 16:23:35 -0000 Received: from mail-pa0-f45.google.com (HELO mail-pa0-f45.google.com) (209.85.220.45) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:23:35 -0000 Received: by mail-pa0-f45.google.com with SMTP id fb10so2668281pad.32 for ; Fri, 02 Nov 2012 09:23:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=EaVC243jcuIWU8aOZsOenAPQJiL3gY8AnNxd3eSPhsk=; b=VUc/LajnfD/XJBLxHoaK8J2nNbyN26VQu/qk5fhp3uX+YLi/iOqzeIBb7co0VzxBp2 AwMLjfG++yhYP0cqiNUvZ0f3iqh3YK2HBYssBdtr2o3rSvNF5lUwlin0R1ak9GDrnnna zFGViurUdcj8IiApoI2ZFVArf/NjBbLrbdQmr1gt2YLI+d/V1GNrS6Hrzc0aX4Bpbucm jdQ0/rqdArax1z0cr89FB4UY+SHEhcST5kkAFIzoQK6A8iJo5jDyEc2IcYSBRbyeXHxk a3I744T74cniJCHW4MIQ/maoym/+bwvkO5uLBS08Pa9C8aQZ2QcqY8S23JVlEFUmvhZJ Jdvw== Received: by 10.66.80.133 with SMTP id r5mr6796577pax.24.1351873413226; Fri, 02 Nov 2012 09:23:33 -0700 (PDT) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net. [67.168.183.230]) by mx.google.com with ESMTPS id wg3sm5977705pbc.28.2012.11.02.09.23.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:23:32 -0700 (PDT) Date: Fri, 2 Nov 2012 09:23:34 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102162334.GB4093@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093947F02000078000A5F42@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnPAx63QVcXJzm/e7gIPTNKoxWabwLMd1I07W9qi9pZk8PerHEM1m+cn4QAHDSZuUpXz/Ua Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > Since there's no possible caller of dbgp_external_startup() and Please just send the incremental patch, in a format that I can apply it (hint, as an attachment like this I can't, as I would have to hand-edit the attachment, and I might get it wrong...) thanks, greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:37:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:37:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKFP-00064I-LD; Fri, 02 Nov 2012 16:37:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKFO-00064D-67 for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 16:37:30 +0000 Received: from [85.158.139.83:17704] by server-14.bemta-5.messagelabs.com id F5/66-21768-9C6F3905; Fri, 02 Nov 2012 16:37:29 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1351874247!28497603!1 X-Originating-IP: [209.85.212.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22626 invoked from network); 2 Nov 2012 16:37:28 -0000 Received: from mail-vb0-f43.google.com (HELO mail-vb0-f43.google.com) (209.85.212.43) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:37:28 -0000 Received: by mail-vb0-f43.google.com with SMTP id fq11so4997087vbb.30 for ; Fri, 02 Nov 2012 09:37:27 -0700 (PDT) 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=PAkQn89GlTxElI/EixHAKjvTPXRYDDMr9Dl0c2h/XTs=; b=WE3XxnXLMtnFVD4wtth61FJ3Yrn18A6hSzjsoaGqfM3hJOB++mxPC3f3pIWZDo//6O Es5ma65verJx2bIPED6zjnjhKNYo2AWf5LLgSr0ZdYtfrlumJTFjGygeGz5gJK3b1D1n O2MJ++F8lpTdlT3Jp7tU/TcULnhM9ZlQh8bJcCXrB1rqePq4QNMKdiK9DXZWiP9exIOe IEykB+O1g1aHvn39I+PBh3kSuOu9SpiPCnokRXCgc5tLn86dwNhYppdbpIDJLLrGwVB3 9AVRqHom9iz02nJHOLG3PGo5lhjkO88mXXyHxoYiqlSyseXgiv8AyrvMWJ1tTt1FzKTd zrVw== Received: by 10.52.76.40 with SMTP id h8mr1976125vdw.123.1351874246814; Fri, 02 Nov 2012 09:37:26 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id zx18sm5242691veb.3.2012.11.02.09.37.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:37:26 -0700 (PDT) Date: Fri, 2 Nov 2012 12:37:20 -0400 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121102163720.GA27213@konrad-lan.dumpdata.com> References: <1350673381-20342-1-git-send-email-konrad.wilk@oracle.com> <1350984138.2237.22.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1350984138.2237.22.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Oct 23, 2012 at 10:22:18AM +0100, Ian Campbell wrote: > On Fri, 2012-10-19 at 20:03 +0100, Konrad Rzeszutek Wilk wrote: > > Makes it easier to troubleshoot in the field. > > > > Signed-off-by: Konrad Rzeszutek Wilk > > --- > > include/xen/hvm.h | 31 +++++++++++++++++++++++++++++-- > > 1 files changed, 29 insertions(+), 2 deletions(-) > > > > diff --git a/include/xen/hvm.h b/include/xen/hvm.h > > index b193fa2..c2a4238 100644 > > --- a/include/xen/hvm.h > > +++ b/include/xen/hvm.h > > @@ -5,6 +5,33 @@ > > #include > > #include > > > > +static const char *param_name(int op) > > +{ > > + static const char *const names[] = { > > #define PARAM(x) [x] = STRINGIFY(x) > would save from typos due to doubling everything up. > > Or even: > #define PARAM(x) [HVM_PARAM#_x] STRINGIFY(x) > > > + [HVM_PARAM_CALLBACK_IRQ] = "HVM_PARAM_CALLBACK_IRQ", > > + [HVM_PARAM_STORE_PFN] = "HVM_PARAM_STORE_PFN", > > + [HVM_PARAM_STORE_EVTCHN] = "HVM_PARAM_STORE_EVTCHN", > > + [HVM_PARAM_PAE_ENABLED] = "HVM_PARAM_PAE_ENABLED", > > + [HVM_PARAM_IOREQ_PFN] = "HVM_PARAM_IOREQ_PFN", > > + [HVM_PARAM_BUFIOREQ_PFN] = "HVM_PARAM_BUFIOREQ_PFN", > > + [HVM_PARAM_TIMER_MODE] = "HVM_PARAM_TIMER_MODE", > > + [HVM_PARAM_HPET_ENABLED] = "HVM_PARAM_HPET_ENABLED", > > + [HVM_PARAM_IDENT_PT] = "HVM_PARAM_IDENT_PT", > > + [HVM_PARAM_DM_DOMAIN] = "HVM_PARAM_DM_DOMAIN", > > + [HVM_PARAM_ACPI_S_STATE] = "HVM_PARAM_ACPI_S_STATE", > > + [HVM_PARAM_VM86_TSS] = "HVM_PARAM_VM86_TSS", > > + [HVM_PARAM_VPT_ALIGN] = "HVM_PARAM_VPT_ALIGN", > > + [HVM_PARAM_CONSOLE_PFN] = "HVM_PARAM_CONSOLE_PFN", > > + [HVM_PARAM_CONSOLE_EVTCHN] = "HVM_PARAM_CONSOLE_EVTCHN" }; > > You probably want a , and a newline before the }. > > > + > > + if (op >= ARRAY_SIZE(names)) > > + return "unknown"; > > + > > + if (!names[op]) > > + return "reserved"; > > + > > + return names[op]; > > +} > > static inline int hvm_get_parameter(int idx, uint64_t *value) > > { > > struct xen_hvm_param xhv; > > @@ -14,8 +41,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) > > xhv.index = idx; > > r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); > > if (r < 0) { > > - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", > > - idx, r); > > + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", > > + param_name(idx), idx, r); > > return r; > > } > > *value = xhv.value; Like this? >From 66705b0ff8808d86c12fcb3815d849a848b5409b Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 19 Oct 2012 15:01:46 -0400 Subject: [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. Makes it easier to troubleshoot in the field. [v1: Use macro per Ian's suggestion] Signed-off-by: Konrad Rzeszutek Wilk --- include/xen/hvm.h | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/include/xen/hvm.h b/include/xen/hvm.h index b193fa2..13e43e4 100644 --- a/include/xen/hvm.h +++ b/include/xen/hvm.h @@ -5,6 +5,36 @@ #include #include +static const char *param_name(int op) +{ +#define PARAM(x) [HVM_PARAM_##x] = #x + static const char *const names[] = { + PARAM(CALLBACK_IRQ), + PARAM(STORE_PFN), + PARAM(STORE_EVTCHN), + PARAM(PAE_ENABLED), + PARAM(IOREQ_PFN), + PARAM(BUFIOREQ_PFN), + PARAM(TIMER_MODE), + PARAM(HPET_ENABLED), + PARAM(IDENT_PT), + PARAM(DM_DOMAIN), + PARAM(ACPI_S_STATE), + PARAM(VM86_TSS), + PARAM(VPT_ALIGN), + PARAM(CONSOLE_PFN), + PARAM(CONSOLE_EVTCHN), + }; +#undef PARAM + + if (op >= ARRAY_SIZE(names)) + return "unknown"; + + if (!names[op]) + return "reserved"; + + return names[op]; +} static inline int hvm_get_parameter(int idx, uint64_t *value) { struct xen_hvm_param xhv; @@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) xhv.index = idx; r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); if (r < 0) { - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", - idx, r); + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", + param_name(idx), idx, r); return r; } *value = xhv.value; -- 1.7.11.7 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:37:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:37:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKFP-00064I-LD; Fri, 02 Nov 2012 16:37:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKFO-00064D-67 for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 16:37:30 +0000 Received: from [85.158.139.83:17704] by server-14.bemta-5.messagelabs.com id F5/66-21768-9C6F3905; Fri, 02 Nov 2012 16:37:29 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1351874247!28497603!1 X-Originating-IP: [209.85.212.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP,UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22626 invoked from network); 2 Nov 2012 16:37:28 -0000 Received: from mail-vb0-f43.google.com (HELO mail-vb0-f43.google.com) (209.85.212.43) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:37:28 -0000 Received: by mail-vb0-f43.google.com with SMTP id fq11so4997087vbb.30 for ; Fri, 02 Nov 2012 09:37:27 -0700 (PDT) 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=PAkQn89GlTxElI/EixHAKjvTPXRYDDMr9Dl0c2h/XTs=; b=WE3XxnXLMtnFVD4wtth61FJ3Yrn18A6hSzjsoaGqfM3hJOB++mxPC3f3pIWZDo//6O Es5ma65verJx2bIPED6zjnjhKNYo2AWf5LLgSr0ZdYtfrlumJTFjGygeGz5gJK3b1D1n O2MJ++F8lpTdlT3Jp7tU/TcULnhM9ZlQh8bJcCXrB1rqePq4QNMKdiK9DXZWiP9exIOe IEykB+O1g1aHvn39I+PBh3kSuOu9SpiPCnokRXCgc5tLn86dwNhYppdbpIDJLLrGwVB3 9AVRqHom9iz02nJHOLG3PGo5lhjkO88mXXyHxoYiqlSyseXgiv8AyrvMWJ1tTt1FzKTd zrVw== Received: by 10.52.76.40 with SMTP id h8mr1976125vdw.123.1351874246814; Fri, 02 Nov 2012 09:37:26 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id zx18sm5242691veb.3.2012.11.02.09.37.26 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:37:26 -0700 (PDT) Date: Fri, 2 Nov 2012 12:37:20 -0400 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121102163720.GA27213@konrad-lan.dumpdata.com> References: <1350673381-20342-1-git-send-email-konrad.wilk@oracle.com> <1350984138.2237.22.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1350984138.2237.22.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Oct 23, 2012 at 10:22:18AM +0100, Ian Campbell wrote: > On Fri, 2012-10-19 at 20:03 +0100, Konrad Rzeszutek Wilk wrote: > > Makes it easier to troubleshoot in the field. > > > > Signed-off-by: Konrad Rzeszutek Wilk > > --- > > include/xen/hvm.h | 31 +++++++++++++++++++++++++++++-- > > 1 files changed, 29 insertions(+), 2 deletions(-) > > > > diff --git a/include/xen/hvm.h b/include/xen/hvm.h > > index b193fa2..c2a4238 100644 > > --- a/include/xen/hvm.h > > +++ b/include/xen/hvm.h > > @@ -5,6 +5,33 @@ > > #include > > #include > > > > +static const char *param_name(int op) > > +{ > > + static const char *const names[] = { > > #define PARAM(x) [x] = STRINGIFY(x) > would save from typos due to doubling everything up. > > Or even: > #define PARAM(x) [HVM_PARAM#_x] STRINGIFY(x) > > > + [HVM_PARAM_CALLBACK_IRQ] = "HVM_PARAM_CALLBACK_IRQ", > > + [HVM_PARAM_STORE_PFN] = "HVM_PARAM_STORE_PFN", > > + [HVM_PARAM_STORE_EVTCHN] = "HVM_PARAM_STORE_EVTCHN", > > + [HVM_PARAM_PAE_ENABLED] = "HVM_PARAM_PAE_ENABLED", > > + [HVM_PARAM_IOREQ_PFN] = "HVM_PARAM_IOREQ_PFN", > > + [HVM_PARAM_BUFIOREQ_PFN] = "HVM_PARAM_BUFIOREQ_PFN", > > + [HVM_PARAM_TIMER_MODE] = "HVM_PARAM_TIMER_MODE", > > + [HVM_PARAM_HPET_ENABLED] = "HVM_PARAM_HPET_ENABLED", > > + [HVM_PARAM_IDENT_PT] = "HVM_PARAM_IDENT_PT", > > + [HVM_PARAM_DM_DOMAIN] = "HVM_PARAM_DM_DOMAIN", > > + [HVM_PARAM_ACPI_S_STATE] = "HVM_PARAM_ACPI_S_STATE", > > + [HVM_PARAM_VM86_TSS] = "HVM_PARAM_VM86_TSS", > > + [HVM_PARAM_VPT_ALIGN] = "HVM_PARAM_VPT_ALIGN", > > + [HVM_PARAM_CONSOLE_PFN] = "HVM_PARAM_CONSOLE_PFN", > > + [HVM_PARAM_CONSOLE_EVTCHN] = "HVM_PARAM_CONSOLE_EVTCHN" }; > > You probably want a , and a newline before the }. > > > + > > + if (op >= ARRAY_SIZE(names)) > > + return "unknown"; > > + > > + if (!names[op]) > > + return "reserved"; > > + > > + return names[op]; > > +} > > static inline int hvm_get_parameter(int idx, uint64_t *value) > > { > > struct xen_hvm_param xhv; > > @@ -14,8 +41,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) > > xhv.index = idx; > > r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); > > if (r < 0) { > > - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", > > - idx, r); > > + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", > > + param_name(idx), idx, r); > > return r; > > } > > *value = xhv.value; Like this? >From 66705b0ff8808d86c12fcb3815d849a848b5409b Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 19 Oct 2012 15:01:46 -0400 Subject: [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. Makes it easier to troubleshoot in the field. [v1: Use macro per Ian's suggestion] Signed-off-by: Konrad Rzeszutek Wilk --- include/xen/hvm.h | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/include/xen/hvm.h b/include/xen/hvm.h index b193fa2..13e43e4 100644 --- a/include/xen/hvm.h +++ b/include/xen/hvm.h @@ -5,6 +5,36 @@ #include #include +static const char *param_name(int op) +{ +#define PARAM(x) [HVM_PARAM_##x] = #x + static const char *const names[] = { + PARAM(CALLBACK_IRQ), + PARAM(STORE_PFN), + PARAM(STORE_EVTCHN), + PARAM(PAE_ENABLED), + PARAM(IOREQ_PFN), + PARAM(BUFIOREQ_PFN), + PARAM(TIMER_MODE), + PARAM(HPET_ENABLED), + PARAM(IDENT_PT), + PARAM(DM_DOMAIN), + PARAM(ACPI_S_STATE), + PARAM(VM86_TSS), + PARAM(VPT_ALIGN), + PARAM(CONSOLE_PFN), + PARAM(CONSOLE_EVTCHN), + }; +#undef PARAM + + if (op >= ARRAY_SIZE(names)) + return "unknown"; + + if (!names[op]) + return "reserved"; + + return names[op]; +} static inline int hvm_get_parameter(int idx, uint64_t *value) { struct xen_hvm_param xhv; @@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) xhv.index = idx; r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); if (r < 0) { - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", - idx, r); + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", + param_name(idx), idx, r); return r; } *value = xhv.value; -- 1.7.11.7 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:44:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:44:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKLx-0006Ma-Ha; Fri, 02 Nov 2012 16:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKLv-0006MU-Sg for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:44:16 +0000 Received: from [85.158.139.83:50970] by server-4.bemta-5.messagelabs.com id 1B/F2-15011-F58F3905; Fri, 02 Nov 2012 16:44:15 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1351874652!17234520!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5855 invoked from network); 2 Nov 2012 16:44:14 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-8.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:44:14 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4930219vcb.32 for ; Fri, 02 Nov 2012 09:44:12 -0700 (PDT) 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=CPWsw2tFgm96CPbFXlyrBtqir5rbmgUS16W94S9pHSA=; b=CnS4SuADCOIvPcGie8BaVTNfROjRTQu80IDJr6Yypcbs+t5z/SYGSyW7Gy+GZgkmrw 7FRKc1y/syElT1H5mQ5fVqPD271CWM6iL6Oc32GAmeJnhtgjR+8/ToKpjKE2b6o1XezD OFbO6mpPLrKGpWGgOnmXXBo5SBPJClUuWfbq/2oUufjvW2b/+Bg9CuQ6KSirzVr6ECjH wta6HZouQgJNjG5o149EoA/EhfqpEW6zrRwD4bJAe3n8KM0T4TdgQTbZ16XvMMDY+pD8 A2VpwYvR9DsIp1YB1Ygu4KPxgdUIguL1BJoYGLqSpIEWKwdy4IBkvaKbZVdT4B1E5Aen B+8w== Received: by 10.220.150.82 with SMTP id x18mr2279389vcv.73.1351874652239; Fri, 02 Nov 2012 09:44:12 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id zx18sm5249881veb.3.2012.11.02.09.44.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:44:12 -0700 (PDT) Date: Fri, 2 Nov 2012 12:44:09 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102164409.GB27213@konrad-lan.dumpdata.com> References: <1351519698-11069-1-git-send-email-konrad.wilk@oracle.com> <1351519698-11069-2-git-send-email-konrad.wilk@oracle.com> <20121030154450.GA3000@phenom.dumpdata.com> <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: xen-devel , linux-kernel@vger.kernel.org, Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] xen/hypercall: fix hypercall fallback code for very old hypervisors X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 31, 2012 at 08:55:54AM +0000, Jan Beulich wrote: > >>> On 30.10.12 at 16:44, Konrad Rzeszutek Wilk wrote: > > On Mon, Oct 29, 2012 at 10:08:17AM -0400, Konrad Rzeszutek Wilk wrote: > >> From: Jan Beulich > >> > >> While copying the argument structures in HYPERVISOR_event_channel_op() > >> and HYPERVISOR_physdev_op() into the local variable is sufficiently > >> safe even if the actual structure is smaller than the container one, > >> copying back eventual output values the same way isn't: This may > >> collide with on-stack variables (particularly "rc") which may change > >> between the first and second memcpy() (i.e. the second memcpy() could > >> discard that change). > >> > >> Move the fallback code into out-of-line functions, and handle all of > >> the operations known by this old a hypervisor individually: Some don't > >> require copying back anything at all, and for the rest use the > >> individual argument structures' sizes rather than the container's. > >> > >> Reported-by: Dan Carpenter > >> Signed-off-by: Jan Beulich > >> [v2: Reduce #define/#undef usage in HYPERVISOR_physdev_op_compat().] > >> Signed-off-by: Konrad Rzeszutek Wilk > > > > And it looks like I get > > > > ERROR: "HYPERVISOR_event_channel_op_compat" [drivers/xen/xen-evtchn.ko] > > undefined! > > > > when I build xen-evtchn as module. Jan did you encounter this issue on > > 2.6.18? > > No - the event channel driver there can't be built as a module, and > for the forward ported kernels I apparently never tried to build with > a compat setting of 3.0.2 or less (and I didn't care that much either > because the oldest we're actually concerned about is 3.0.4 to cover > some of those very old EC2 systems; I'll add the export at the right > point nevertheless). Ok, ended up with this version which I was thinking to for v3.7-rc5: >From 4ae4c7658a7c0501521c422d618038587c3edeca Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 19 Oct 2012 15:25:37 -0400 Subject: [PATCH] xen/hypercall: fix hypercall fallback code for very old hypervisors While copying the argument structures in HYPERVISOR_event_channel_op() and HYPERVISOR_physdev_op() into the local variable is sufficiently safe even if the actual structure is smaller than the container one, copying back eventual output values the same way isn't: This may collide with on-stack variables (particularly "rc") which may change between the first and second memcpy() (i.e. the second memcpy() could discard that change). Move the fallback code into out-of-line functions, and handle all of the operations known by this old a hypervisor individually: Some don't require copying back anything at all, and for the rest use the individual argument structures' sizes rather than the container's. Reported-by: Dan Carpenter Signed-off-by: Jan Beulich [v2: Reduce #define/#undef usage in HYPERVISOR_physdev_op_compat().] [v3: Fix compile errors when modules use said hypercalls] [v4: Add xen_ prefix to the HYPERCALL_..] Signed-off-by: Konrad Rzeszutek Wilk --- arch/x86/include/asm/xen/hypercall.h | 21 ++++------ drivers/xen/Makefile | 2 +- drivers/xen/fallback.c | 81 ++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 drivers/xen/fallback.c diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 59c226d..4055421 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -359,18 +359,14 @@ HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, return _hypercall4(int, update_va_mapping, va, new_val.pte, new_val.pte >> 32, flags); } +extern int __must_check xen_HYPERVISOR_event_channel_op_compat(int, void *); static inline int HYPERVISOR_event_channel_op(int cmd, void *arg) { int rc = _hypercall2(int, event_channel_op, cmd, arg); - if (unlikely(rc == -ENOSYS)) { - struct evtchn_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, event_channel_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } + if (unlikely(rc == -ENOSYS)) + rc = xen_HYPERVISOR_event_channel_op_compat(cmd, arg); return rc; } @@ -386,17 +382,14 @@ HYPERVISOR_console_io(int cmd, int count, char *str) return _hypercall3(int, console_io, cmd, count, str); } +extern int __must_check xen_HYPERVISOR_physdev_op_compat(int, void *); + static inline int HYPERVISOR_physdev_op(int cmd, void *arg) { int rc = _hypercall2(int, physdev_op, cmd, arg); - if (unlikely(rc == -ENOSYS)) { - struct physdev_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, physdev_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } + if (unlikely(rc == -ENOSYS)) + rc = xen_HYPERVISOR_physdev_op_compat(cmd, arg); return rc; } diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e863703..46de6cd 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,7 +2,7 @@ ifneq ($(CONFIG_ARM),y) obj-y += manage.o balloon.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o +obj-y += grant-table.o features.o events.o fallback.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) diff --git a/drivers/xen/fallback.c b/drivers/xen/fallback.c new file mode 100644 index 0000000..b29ce32 --- /dev/null +++ b/drivers/xen/fallback.c @@ -0,0 +1,81 @@ +#include +#include +#include +#include +#include +#include + +int xen_HYPERVISOR_event_channel_op_compat(int cmd, void *arg) +{ + struct evtchn_op op; + int rc; + + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, event_channel_op_compat, &op); + + switch (cmd) { + case EVTCHNOP_close: + case EVTCHNOP_send: + case EVTCHNOP_bind_vcpu: + case EVTCHNOP_unmask: + /* no output */ + break; + +#define COPY_BACK(eop) \ + case EVTCHNOP_##eop: \ + memcpy(arg, &op.u.eop, sizeof(op.u.eop)); \ + break + + COPY_BACK(bind_interdomain); + COPY_BACK(bind_virq); + COPY_BACK(bind_pirq); + COPY_BACK(status); + COPY_BACK(alloc_unbound); + COPY_BACK(bind_ipi); +#undef COPY_BACK + + default: + WARN_ON(rc != -ENOSYS); + break; + } + + return rc; +} +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_event_channel_op_compat); + +int xen_HYPERVISOR_physdev_op_compat(int cmd, void *arg) +{ + struct physdev_op op; + int rc; + + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, physdev_op_compat, &op); + + switch (cmd) { + case PHYSDEVOP_IRQ_UNMASK_NOTIFY: + case PHYSDEVOP_set_iopl: + case PHYSDEVOP_set_iobitmap: + case PHYSDEVOP_apic_write: + /* no output */ + break; + +#define COPY_BACK(pop, fld) \ + case PHYSDEVOP_##pop: \ + memcpy(arg, &op.u.fld, sizeof(op.u.fld)); \ + break + + COPY_BACK(irq_status_query, irq_status_query); + COPY_BACK(apic_read, apic_op); + COPY_BACK(ASSIGN_VECTOR, irq_op); +#undef COPY_BACK + + default: + WARN_ON(rc != -ENOSYS); + break; + } + + return rc; +} +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_physdev_op_compat); -- 1.7.11.7 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:44:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:44:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKLx-0006Ma-Ha; Fri, 02 Nov 2012 16:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKLv-0006MU-Sg for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:44:16 +0000 Received: from [85.158.139.83:50970] by server-4.bemta-5.messagelabs.com id 1B/F2-15011-F58F3905; Fri, 02 Nov 2012 16:44:15 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-8.tower-182.messagelabs.com!1351874652!17234520!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5855 invoked from network); 2 Nov 2012 16:44:14 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-8.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:44:14 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4930219vcb.32 for ; Fri, 02 Nov 2012 09:44:12 -0700 (PDT) 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=CPWsw2tFgm96CPbFXlyrBtqir5rbmgUS16W94S9pHSA=; b=CnS4SuADCOIvPcGie8BaVTNfROjRTQu80IDJr6Yypcbs+t5z/SYGSyW7Gy+GZgkmrw 7FRKc1y/syElT1H5mQ5fVqPD271CWM6iL6Oc32GAmeJnhtgjR+8/ToKpjKE2b6o1XezD OFbO6mpPLrKGpWGgOnmXXBo5SBPJClUuWfbq/2oUufjvW2b/+Bg9CuQ6KSirzVr6ECjH wta6HZouQgJNjG5o149EoA/EhfqpEW6zrRwD4bJAe3n8KM0T4TdgQTbZ16XvMMDY+pD8 A2VpwYvR9DsIp1YB1Ygu4KPxgdUIguL1BJoYGLqSpIEWKwdy4IBkvaKbZVdT4B1E5Aen B+8w== Received: by 10.220.150.82 with SMTP id x18mr2279389vcv.73.1351874652239; Fri, 02 Nov 2012 09:44:12 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id zx18sm5249881veb.3.2012.11.02.09.44.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:44:12 -0700 (PDT) Date: Fri, 2 Nov 2012 12:44:09 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102164409.GB27213@konrad-lan.dumpdata.com> References: <1351519698-11069-1-git-send-email-konrad.wilk@oracle.com> <1351519698-11069-2-git-send-email-konrad.wilk@oracle.com> <20121030154450.GA3000@phenom.dumpdata.com> <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: xen-devel , linux-kernel@vger.kernel.org, Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] xen/hypercall: fix hypercall fallback code for very old hypervisors X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 31, 2012 at 08:55:54AM +0000, Jan Beulich wrote: > >>> On 30.10.12 at 16:44, Konrad Rzeszutek Wilk wrote: > > On Mon, Oct 29, 2012 at 10:08:17AM -0400, Konrad Rzeszutek Wilk wrote: > >> From: Jan Beulich > >> > >> While copying the argument structures in HYPERVISOR_event_channel_op() > >> and HYPERVISOR_physdev_op() into the local variable is sufficiently > >> safe even if the actual structure is smaller than the container one, > >> copying back eventual output values the same way isn't: This may > >> collide with on-stack variables (particularly "rc") which may change > >> between the first and second memcpy() (i.e. the second memcpy() could > >> discard that change). > >> > >> Move the fallback code into out-of-line functions, and handle all of > >> the operations known by this old a hypervisor individually: Some don't > >> require copying back anything at all, and for the rest use the > >> individual argument structures' sizes rather than the container's. > >> > >> Reported-by: Dan Carpenter > >> Signed-off-by: Jan Beulich > >> [v2: Reduce #define/#undef usage in HYPERVISOR_physdev_op_compat().] > >> Signed-off-by: Konrad Rzeszutek Wilk > > > > And it looks like I get > > > > ERROR: "HYPERVISOR_event_channel_op_compat" [drivers/xen/xen-evtchn.ko] > > undefined! > > > > when I build xen-evtchn as module. Jan did you encounter this issue on > > 2.6.18? > > No - the event channel driver there can't be built as a module, and > for the forward ported kernels I apparently never tried to build with > a compat setting of 3.0.2 or less (and I didn't care that much either > because the oldest we're actually concerned about is 3.0.4 to cover > some of those very old EC2 systems; I'll add the export at the right > point nevertheless). Ok, ended up with this version which I was thinking to for v3.7-rc5: >From 4ae4c7658a7c0501521c422d618038587c3edeca Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 19 Oct 2012 15:25:37 -0400 Subject: [PATCH] xen/hypercall: fix hypercall fallback code for very old hypervisors While copying the argument structures in HYPERVISOR_event_channel_op() and HYPERVISOR_physdev_op() into the local variable is sufficiently safe even if the actual structure is smaller than the container one, copying back eventual output values the same way isn't: This may collide with on-stack variables (particularly "rc") which may change between the first and second memcpy() (i.e. the second memcpy() could discard that change). Move the fallback code into out-of-line functions, and handle all of the operations known by this old a hypervisor individually: Some don't require copying back anything at all, and for the rest use the individual argument structures' sizes rather than the container's. Reported-by: Dan Carpenter Signed-off-by: Jan Beulich [v2: Reduce #define/#undef usage in HYPERVISOR_physdev_op_compat().] [v3: Fix compile errors when modules use said hypercalls] [v4: Add xen_ prefix to the HYPERCALL_..] Signed-off-by: Konrad Rzeszutek Wilk --- arch/x86/include/asm/xen/hypercall.h | 21 ++++------ drivers/xen/Makefile | 2 +- drivers/xen/fallback.c | 81 ++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 drivers/xen/fallback.c diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 59c226d..4055421 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -359,18 +359,14 @@ HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, return _hypercall4(int, update_va_mapping, va, new_val.pte, new_val.pte >> 32, flags); } +extern int __must_check xen_HYPERVISOR_event_channel_op_compat(int, void *); static inline int HYPERVISOR_event_channel_op(int cmd, void *arg) { int rc = _hypercall2(int, event_channel_op, cmd, arg); - if (unlikely(rc == -ENOSYS)) { - struct evtchn_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, event_channel_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } + if (unlikely(rc == -ENOSYS)) + rc = xen_HYPERVISOR_event_channel_op_compat(cmd, arg); return rc; } @@ -386,17 +382,14 @@ HYPERVISOR_console_io(int cmd, int count, char *str) return _hypercall3(int, console_io, cmd, count, str); } +extern int __must_check xen_HYPERVISOR_physdev_op_compat(int, void *); + static inline int HYPERVISOR_physdev_op(int cmd, void *arg) { int rc = _hypercall2(int, physdev_op, cmd, arg); - if (unlikely(rc == -ENOSYS)) { - struct physdev_op op; - op.cmd = cmd; - memcpy(&op.u, arg, sizeof(op.u)); - rc = _hypercall1(int, physdev_op_compat, &op); - memcpy(arg, &op.u, sizeof(op.u)); - } + if (unlikely(rc == -ENOSYS)) + rc = xen_HYPERVISOR_physdev_op_compat(cmd, arg); return rc; } diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e863703..46de6cd 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,7 +2,7 @@ ifneq ($(CONFIG_ARM),y) obj-y += manage.o balloon.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o +obj-y += grant-table.o features.o events.o fallback.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) diff --git a/drivers/xen/fallback.c b/drivers/xen/fallback.c new file mode 100644 index 0000000..b29ce32 --- /dev/null +++ b/drivers/xen/fallback.c @@ -0,0 +1,81 @@ +#include +#include +#include +#include +#include +#include + +int xen_HYPERVISOR_event_channel_op_compat(int cmd, void *arg) +{ + struct evtchn_op op; + int rc; + + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, event_channel_op_compat, &op); + + switch (cmd) { + case EVTCHNOP_close: + case EVTCHNOP_send: + case EVTCHNOP_bind_vcpu: + case EVTCHNOP_unmask: + /* no output */ + break; + +#define COPY_BACK(eop) \ + case EVTCHNOP_##eop: \ + memcpy(arg, &op.u.eop, sizeof(op.u.eop)); \ + break + + COPY_BACK(bind_interdomain); + COPY_BACK(bind_virq); + COPY_BACK(bind_pirq); + COPY_BACK(status); + COPY_BACK(alloc_unbound); + COPY_BACK(bind_ipi); +#undef COPY_BACK + + default: + WARN_ON(rc != -ENOSYS); + break; + } + + return rc; +} +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_event_channel_op_compat); + +int xen_HYPERVISOR_physdev_op_compat(int cmd, void *arg) +{ + struct physdev_op op; + int rc; + + op.cmd = cmd; + memcpy(&op.u, arg, sizeof(op.u)); + rc = _hypercall1(int, physdev_op_compat, &op); + + switch (cmd) { + case PHYSDEVOP_IRQ_UNMASK_NOTIFY: + case PHYSDEVOP_set_iopl: + case PHYSDEVOP_set_iobitmap: + case PHYSDEVOP_apic_write: + /* no output */ + break; + +#define COPY_BACK(pop, fld) \ + case PHYSDEVOP_##pop: \ + memcpy(arg, &op.u.fld, sizeof(op.u.fld)); \ + break + + COPY_BACK(irq_status_query, irq_status_query); + COPY_BACK(apic_read, apic_op); + COPY_BACK(ASSIGN_VECTOR, irq_op); +#undef COPY_BACK + + default: + WARN_ON(rc != -ENOSYS); + break; + } + + return rc; +} +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_physdev_op_compat); -- 1.7.11.7 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:50:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:50:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKRH-0006WL-Em; Fri, 02 Nov 2012 16:49:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKRF-0006WE-Jx for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:49:45 +0000 Received: from [85.158.143.35:35486] by server-1.bemta-4.messagelabs.com id 45/C8-27934-8A9F3905; Fri, 02 Nov 2012 16:49:44 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1351874982!11432064!1 X-Originating-IP: [209.85.212.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19620 invoked from network); 2 Nov 2012 16:49:43 -0000 Received: from mail-vb0-f45.google.com (HELO mail-vb0-f45.google.com) (209.85.212.45) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:49:43 -0000 Received: by mail-vb0-f45.google.com with SMTP id p1so4916736vbi.32 for ; Fri, 02 Nov 2012 09:49:42 -0700 (PDT) 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=Z6UdQuFVU6jV+gDOLJ9ziIGGV+sGlCuHhWgKXy5q0UQ=; b=PwwbPqpGnTGovTKIzIF2k8tC6ZT+zoZTldRG3yfaltf+kG4uB4RqbXs4C7tP7D1bJX WaQtw9bc8C7cMMwz1wP5UN0aNQSZ7feoFWHRbE7lhkKmuY21yzjm2OzkemDtJwBe8iN7 D516dIjP9Q7Z38Nl12bXIlz0kbhgVPXUcaGKQ19pucqpPXtkS1iT/KWFaxr00G8vtxJ6 FDhL/CQYPnzg9GJPgU90/0/JdWI95zji2aSC8yFzqYKzUV+K15Z11ZibJb8DwDmJ2stb j/ee7eylNf4yLvgVZXedSPfR84jQYNKrTr0FlB7jparGht8H+CXq90T8aLBTNZOqGnAP P5XQ== Received: by 10.52.74.135 with SMTP id t7mr2097296vdv.18.1351874982236; Fri, 02 Nov 2012 09:49:42 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id co1sm5793659vdc.10.2012.11.02.09.49.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:49:41 -0700 (PDT) Date: Fri, 2 Nov 2012 12:49:39 -0400 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121102164937.GC27213@konrad-lan.dumpdata.com> References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 06:34:45AM +0000, Liu, Jinsong wrote: > Thanks! updated as attached. > > Jinsong > > ===================== > >From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Thu, 1 Nov 2012 21:02:36 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and very thin logic level, would take over acpi pad staff. > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > and then hypercall to hyervisor for the rest work, say, core parking. Two comments: - Did you look at the SuSE tree? Jan mentioned that they did some fixes? Did you carry them over? - The init function should not make hypercalls before checking if it in facts run under Xen. > > Signed-off-by: Liu, Jinsong > --- > drivers/xen/Makefile | 1 + > drivers/xen/xen_acpi_pad.c | 206 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 +++ > 3 files changed, 224 insertions(+), 0 deletions(-) > create mode 100644 drivers/xen/xen_acpi_pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..a2af622 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > xen-evtchn-y := evtchn.o > xen-gntdev-y := gntdev.o > xen-gntalloc-y := gntalloc.o > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > new file mode 100644 > index 0000000..e8c26a4 > --- /dev/null > +++ b/drivers/xen/xen_acpi_pad.c > @@ -0,0 +1,206 @@ > +/* > + * xen_acpi_pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static DEFINE_MUTEX(xen_pad_lock); > + > +static int xen_pad_set_idle_cpus(int num_cpus) > +{ > + struct xen_platform_op op; > + > + if (num_cpus < 0) > + return -EINVAL; > + > + /* set cpu nums expected to be idled */ > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = num_cpus; > + > + return HYPERVISOR_dom0_op(&op); > +} > + > +/* > + * Cannot get idle cpus by using hypercall once (shared with _SET) > + * because of the characteristic of Xen continue_hypercall_on_cpu > + */ > +static int xen_pad_get_idle_cpus(void) > +{ > + int ret; > + struct xen_platform_op op; > + > + /* get cpu nums actually be idled */ > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret < 0) > + return ret; > + > + return op.u.core_parking.idle_nums; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int xen_acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_cpus) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_cpus; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > +{ > + int num_cpus; > + > + num_cpus = xen_acpi_pad_pur(handle); > + if (num_cpus < 0) > + return; > + > + mutex_lock(&xen_pad_lock); > + if (xen_pad_set_idle_cpus(num_cpus)) { > + mutex_unlock(&xen_pad_lock); > + return; > + } > + > + num_cpus = xen_pad_get_idle_cpus(); > + if (num_cpus < 0) { > + mutex_unlock(&xen_pad_lock); > + return; > + } > + mutex_unlock(&xen_pad_lock); > + > + xen_acpi_pad_ost(handle, 0, num_cpus); > +} > + > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + xen_acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int xen_acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static int xen_acpi_pad_remove(struct acpi_device *device, > + int type) > +{ > + mutex_lock(&xen_pad_lock); > + xen_pad_set_idle_cpus(0); > + mutex_unlock(&xen_pad_lock); > + > + acpi_remove_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver xen_acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = xen_acpi_pad_add, > + .remove = xen_acpi_pad_remove, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + int ret = -ENOSYS; > + unsigned int version = HYPERVISOR_xen_version(XENVER_version, NULL); Heh. so if you run this on baremetal I wonder what will happen. > + unsigned int major = version >> 16; > + unsigned int minor = version & 0xffff; > + > + /* Only DOM0 is responsible for Xen acpi pad */ > + if (!xen_initial_domain()) > + return -ENODEV; > + I think the check for version should happen here. > + /* Only Xen4.2 or later support Xen acpi pad */ > + if (((major == 4) && (minor >= 2)) || (major > 4)) > + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); > + > + return ret; > +} > +subsys_initcall(xen_acpi_pad_init); > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..a3be54c 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which are already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > -- > 1.7.1 > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:50:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:50:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKRH-0006WL-Em; Fri, 02 Nov 2012 16:49:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKRF-0006WE-Jx for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:49:45 +0000 Received: from [85.158.143.35:35486] by server-1.bemta-4.messagelabs.com id 45/C8-27934-8A9F3905; Fri, 02 Nov 2012 16:49:44 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1351874982!11432064!1 X-Originating-IP: [209.85.212.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19620 invoked from network); 2 Nov 2012 16:49:43 -0000 Received: from mail-vb0-f45.google.com (HELO mail-vb0-f45.google.com) (209.85.212.45) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 16:49:43 -0000 Received: by mail-vb0-f45.google.com with SMTP id p1so4916736vbi.32 for ; Fri, 02 Nov 2012 09:49:42 -0700 (PDT) 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=Z6UdQuFVU6jV+gDOLJ9ziIGGV+sGlCuHhWgKXy5q0UQ=; b=PwwbPqpGnTGovTKIzIF2k8tC6ZT+zoZTldRG3yfaltf+kG4uB4RqbXs4C7tP7D1bJX WaQtw9bc8C7cMMwz1wP5UN0aNQSZ7feoFWHRbE7lhkKmuY21yzjm2OzkemDtJwBe8iN7 D516dIjP9Q7Z38Nl12bXIlz0kbhgVPXUcaGKQ19pucqpPXtkS1iT/KWFaxr00G8vtxJ6 FDhL/CQYPnzg9GJPgU90/0/JdWI95zji2aSC8yFzqYKzUV+K15Z11ZibJb8DwDmJ2stb j/ee7eylNf4yLvgVZXedSPfR84jQYNKrTr0FlB7jparGht8H+CXq90T8aLBTNZOqGnAP P5XQ== Received: by 10.52.74.135 with SMTP id t7mr2097296vdv.18.1351874982236; Fri, 02 Nov 2012 09:49:42 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id co1sm5793659vdc.10.2012.11.02.09.49.41 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 09:49:41 -0700 (PDT) Date: Fri, 2 Nov 2012 12:49:39 -0400 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121102164937.GC27213@konrad-lan.dumpdata.com> References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 01, 2012 at 06:34:45AM +0000, Liu, Jinsong wrote: > Thanks! updated as attached. > > Jinsong > > ===================== > >From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Thu, 1 Nov 2012 21:02:36 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and very thin logic level, would take over acpi pad staff. > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > and then hypercall to hyervisor for the rest work, say, core parking. Two comments: - Did you look at the SuSE tree? Jan mentioned that they did some fixes? Did you carry them over? - The init function should not make hypercalls before checking if it in facts run under Xen. > > Signed-off-by: Liu, Jinsong > --- > drivers/xen/Makefile | 1 + > drivers/xen/xen_acpi_pad.c | 206 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 +++ > 3 files changed, 224 insertions(+), 0 deletions(-) > create mode 100644 drivers/xen/xen_acpi_pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..a2af622 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > xen-evtchn-y := evtchn.o > xen-gntdev-y := gntdev.o > xen-gntalloc-y := gntalloc.o > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > new file mode 100644 > index 0000000..e8c26a4 > --- /dev/null > +++ b/drivers/xen/xen_acpi_pad.c > @@ -0,0 +1,206 @@ > +/* > + * xen_acpi_pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static DEFINE_MUTEX(xen_pad_lock); > + > +static int xen_pad_set_idle_cpus(int num_cpus) > +{ > + struct xen_platform_op op; > + > + if (num_cpus < 0) > + return -EINVAL; > + > + /* set cpu nums expected to be idled */ > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = num_cpus; > + > + return HYPERVISOR_dom0_op(&op); > +} > + > +/* > + * Cannot get idle cpus by using hypercall once (shared with _SET) > + * because of the characteristic of Xen continue_hypercall_on_cpu > + */ > +static int xen_pad_get_idle_cpus(void) > +{ > + int ret; > + struct xen_platform_op op; > + > + /* get cpu nums actually be idled */ > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret < 0) > + return ret; > + > + return op.u.core_parking.idle_nums; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int xen_acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_cpus) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_cpus; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > +{ > + int num_cpus; > + > + num_cpus = xen_acpi_pad_pur(handle); > + if (num_cpus < 0) > + return; > + > + mutex_lock(&xen_pad_lock); > + if (xen_pad_set_idle_cpus(num_cpus)) { > + mutex_unlock(&xen_pad_lock); > + return; > + } > + > + num_cpus = xen_pad_get_idle_cpus(); > + if (num_cpus < 0) { > + mutex_unlock(&xen_pad_lock); > + return; > + } > + mutex_unlock(&xen_pad_lock); > + > + xen_acpi_pad_ost(handle, 0, num_cpus); > +} > + > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + xen_acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int xen_acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static int xen_acpi_pad_remove(struct acpi_device *device, > + int type) > +{ > + mutex_lock(&xen_pad_lock); > + xen_pad_set_idle_cpus(0); > + mutex_unlock(&xen_pad_lock); > + > + acpi_remove_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver xen_acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = xen_acpi_pad_add, > + .remove = xen_acpi_pad_remove, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + int ret = -ENOSYS; > + unsigned int version = HYPERVISOR_xen_version(XENVER_version, NULL); Heh. so if you run this on baremetal I wonder what will happen. > + unsigned int major = version >> 16; > + unsigned int minor = version & 0xffff; > + > + /* Only DOM0 is responsible for Xen acpi pad */ > + if (!xen_initial_domain()) > + return -ENODEV; > + I think the check for version should happen here. > + /* Only Xen4.2 or later support Xen acpi pad */ > + if (((major == 4) && (minor >= 2)) || (major > 4)) > + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); > + > + return ret; > +} > +subsys_initcall(xen_acpi_pad_init); > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..a3be54c 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which are already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > -- > 1.7.1 > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:54:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:54:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKVV-0006nm-4d; Fri, 02 Nov 2012 16:54:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKVT-0006nf-9h for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:54:07 +0000 Received: from [85.158.137.99:39630] by server-16.bemta-3.messagelabs.com id 3F/49-07461-EAAF3905; Fri, 02 Nov 2012 16:54:06 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351875246!16624728!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9513 invoked from network); 2 Nov 2012 16:54:06 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-11.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:54:06 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:54:05 +0000 Message-Id: <509408E702000078000A6285@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:54:47 +0000 From: "Jan Beulich" To: "Greg KH" References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> In-Reply-To: <20121102162334.GB4093@kroah.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 17:23, Greg KH wrote: > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: >> Since there's no possible caller of dbgp_external_startup() and > > > > Please just send the incremental patch, in a format that I can apply it > (hint, as an attachment like this I can't, as I would have to hand-edit > the attachment, and I might get it wrong...) Here you go: fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD Relax condition of building the reset interface stubs in drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Acked-by: Alan Stern Cc: Stefano Stabellini --- drivers/usb/early/ehci-dbgp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3/drivers/usb/early/ehci-dbgp.c @@ -974,7 +974,7 @@ struct console early_dbgp_console = { .index = -1, }; -#if IS_ENABLED(CONFIG_USB_EHCI_HCD) +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret = xen_dbgp_reset_prep(hcd); @@ -1008,7 +1008,7 @@ int dbgp_external_startup(struct usb_hcd return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); } EXPORT_SYMBOL_GPL(dbgp_external_startup); -#endif /* USB_EHCI_HCD */ +#endif /* USB */ #ifdef CONFIG_KGDB _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:54:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:54:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKVV-0006nm-4d; Fri, 02 Nov 2012 16:54:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKVT-0006nf-9h for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:54:07 +0000 Received: from [85.158.137.99:39630] by server-16.bemta-3.messagelabs.com id 3F/49-07461-EAAF3905; Fri, 02 Nov 2012 16:54:06 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351875246!16624728!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9513 invoked from network); 2 Nov 2012 16:54:06 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-11.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:54:06 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:54:05 +0000 Message-Id: <509408E702000078000A6285@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:54:47 +0000 From: "Jan Beulich" To: "Greg KH" References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> In-Reply-To: <20121102162334.GB4093@kroah.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 17:23, Greg KH wrote: > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: >> Since there's no possible caller of dbgp_external_startup() and > > > > Please just send the incremental patch, in a format that I can apply it > (hint, as an attachment like this I can't, as I would have to hand-edit > the attachment, and I might get it wrong...) Here you go: fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD Relax condition of building the reset interface stubs in drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Acked-by: Alan Stern Cc: Stefano Stabellini --- drivers/usb/early/ehci-dbgp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3/drivers/usb/early/ehci-dbgp.c @@ -974,7 +974,7 @@ struct console early_dbgp_console = { .index = -1, }; -#if IS_ENABLED(CONFIG_USB_EHCI_HCD) +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret = xen_dbgp_reset_prep(hcd); @@ -1008,7 +1008,7 @@ int dbgp_external_startup(struct usb_hcd return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); } EXPORT_SYMBOL_GPL(dbgp_external_startup); -#endif /* USB_EHCI_HCD */ +#endif /* USB */ #ifdef CONFIG_KGDB _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:56:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:56:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKXl-0006uK-LV; Fri, 02 Nov 2012 16:56:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKXj-0006uD-QN for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:56:27 +0000 Received: from [85.158.137.99:50045] by server-2.bemta-3.messagelabs.com id 15/50-04744-B3BF3905; Fri, 02 Nov 2012 16:56:27 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351875386!14343005!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31512 invoked from network); 2 Nov 2012 16:56:26 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:56:26 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:56:25 +0000 Message-Id: <5094097302000078000A6288@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:57:07 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <1351519698-11069-1-git-send-email-konrad.wilk@oracle.com> <1351519698-11069-2-git-send-email-konrad.wilk@oracle.com> <20121030154450.GA3000@phenom.dumpdata.com> <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> <20121102164409.GB27213@konrad-lan.dumpdata.com> In-Reply-To: <20121102164409.GB27213@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, xen-devel Subject: Re: [Xen-devel] [PATCH 1/2] xen/hypercall: fix hypercall fallback code for very old hypervisors X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 17:44, Konrad Rzeszutek Wilk wrote: > --- a/arch/x86/include/asm/xen/hypercall.h > +++ b/arch/x86/include/asm/xen/hypercall.h > @@ -359,18 +359,14 @@ HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, > return _hypercall4(int, update_va_mapping, va, > new_val.pte, new_val.pte >> 32, flags); > } > +extern int __must_check xen_HYPERVISOR_event_channel_op_compat(int, void *); Why don't you drop the HYPERVISOR_ now that you added the xen_? >... > +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_event_channel_op_compat); While this export is necessary, ... >... > +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_physdev_op_compat); ... I would recommend not adding this one without need. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 16:56:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 16:56:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKXl-0006uK-LV; Fri, 02 Nov 2012 16:56:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKXj-0006uD-QN for xen-devel@lists.xen.org; Fri, 02 Nov 2012 16:56:27 +0000 Received: from [85.158.137.99:50045] by server-2.bemta-3.messagelabs.com id 15/50-04744-B3BF3905; Fri, 02 Nov 2012 16:56:27 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351875386!14343005!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31512 invoked from network); 2 Nov 2012 16:56:26 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-217.messagelabs.com with SMTP; 2 Nov 2012 16:56:26 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 16:56:25 +0000 Message-Id: <5094097302000078000A6288@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 16:57:07 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <1351519698-11069-1-git-send-email-konrad.wilk@oracle.com> <1351519698-11069-2-git-send-email-konrad.wilk@oracle.com> <20121030154450.GA3000@phenom.dumpdata.com> <5090F5AA02000078000A5A0B@nat28.tlf.novell.com> <20121102164409.GB27213@konrad-lan.dumpdata.com> In-Reply-To: <20121102164409.GB27213@konrad-lan.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, xen-devel Subject: Re: [Xen-devel] [PATCH 1/2] xen/hypercall: fix hypercall fallback code for very old hypervisors X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 17:44, Konrad Rzeszutek Wilk wrote: > --- a/arch/x86/include/asm/xen/hypercall.h > +++ b/arch/x86/include/asm/xen/hypercall.h > @@ -359,18 +359,14 @@ HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, > return _hypercall4(int, update_va_mapping, va, > new_val.pte, new_val.pte >> 32, flags); > } > +extern int __must_check xen_HYPERVISOR_event_channel_op_compat(int, void *); Why don't you drop the HYPERVISOR_ now that you added the xen_? >... > +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_event_channel_op_compat); While this export is necessary, ... >... > +EXPORT_SYMBOL_GPL(xen_HYPERVISOR_physdev_op_compat); ... I would recommend not adding this one without need. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:02:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKd0-0007IX-Dl; Fri, 02 Nov 2012 17:01:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKcz-0007IS-Qd for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:01:54 +0000 Received: from [85.158.143.35:18132] by server-1.bemta-4.messagelabs.com id 7E/64-27934-18CF3905; Fri, 02 Nov 2012 17:01:53 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1351875685!11940922!1 X-Originating-IP: [209.85.220.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18063 invoked from network); 2 Nov 2012 17:01:27 -0000 Received: from mail-pa0-f45.google.com (HELO mail-pa0-f45.google.com) (209.85.220.45) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 17:01:27 -0000 Received: by mail-pa0-f45.google.com with SMTP id fb10so2689286pad.32 for ; Fri, 02 Nov 2012 10:01:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=GrUMntppyfIslzmXaAb4GNoKn4oNz2aLTRspMPjlJeY=; b=HDvOA320hE2xRBpl7jvAFVZcqDpjQziLR55Av+JUtGST0aO0tXhYmF7hEfLHZLt69i QwnjbXI02HLNYbTsKjZ3Tyrq5dzwGLiWt0He9rEKh/ZGSKo1u17C1ytpJ3PGfwdJvbRZ AilpVb859xtV0ytMBCHWkDmRdU2rwLlKgIy4/PgU02oOTcjk0jhh+d0DlOZxRYJnPVIc T7srvdS8F0LDcSpGgbmsjQOyl1PmGRx0IbpbM2dYCdDfXVCNxl5bwq46HtFHAMk3ASAO Pm3nB7ezaE+HYQRqFTq3BN2bbSPyfmWUZtl7qK51KYOUUptgmQh52YnPFYTwujiVpVpl UdzQ== Received: by 10.66.83.201 with SMTP id s9mr6801792pay.74.1351875684925; Fri, 02 Nov 2012 10:01:24 -0700 (PDT) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net. [67.168.183.230]) by mx.google.com with ESMTPS id v2sm4274992paz.27.2012.11.02.10.01.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:01:23 -0700 (PDT) Date: Fri, 2 Nov 2012 10:01:26 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102170126.GA8413@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509408E702000078000A6285@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkF9X+e8wzGt46XLkltisoTKAgIV7KsYfglGMwIZxXq3qld0hXqC35QeilK8xkBUYIfaIXQ Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 17:23, Greg KH wrote: > > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > >> Since there's no possible caller of dbgp_external_startup() and > > > > > > > > Please just send the incremental patch, in a format that I can apply it > > (hint, as an attachment like this I can't, as I would have to hand-edit > > the attachment, and I might get it wrong...) > > Here you go: > > fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD > > Relax condition of building the reset interface stubs in > drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also > cover the chipidea driver re-using code from ehci-hcd. Ok, I'm going to be a pain here, but this isn't in a form I can apply it. I would have to edit this by hand and then run it through git, making it a pain to apply. Please be nice to overworked maintainers and make it easy to apply your patches, send them in a format that they don't have to edit _anything_. Third times a charm? greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:02:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:02:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKd0-0007IX-Dl; Fri, 02 Nov 2012 17:01:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKcz-0007IS-Qd for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:01:54 +0000 Received: from [85.158.143.35:18132] by server-1.bemta-4.messagelabs.com id 7E/64-27934-18CF3905; Fri, 02 Nov 2012 17:01:53 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1351875685!11940922!1 X-Originating-IP: [209.85.220.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18063 invoked from network); 2 Nov 2012 17:01:27 -0000 Received: from mail-pa0-f45.google.com (HELO mail-pa0-f45.google.com) (209.85.220.45) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 17:01:27 -0000 Received: by mail-pa0-f45.google.com with SMTP id fb10so2689286pad.32 for ; Fri, 02 Nov 2012 10:01:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=GrUMntppyfIslzmXaAb4GNoKn4oNz2aLTRspMPjlJeY=; b=HDvOA320hE2xRBpl7jvAFVZcqDpjQziLR55Av+JUtGST0aO0tXhYmF7hEfLHZLt69i QwnjbXI02HLNYbTsKjZ3Tyrq5dzwGLiWt0He9rEKh/ZGSKo1u17C1ytpJ3PGfwdJvbRZ AilpVb859xtV0ytMBCHWkDmRdU2rwLlKgIy4/PgU02oOTcjk0jhh+d0DlOZxRYJnPVIc T7srvdS8F0LDcSpGgbmsjQOyl1PmGRx0IbpbM2dYCdDfXVCNxl5bwq46HtFHAMk3ASAO Pm3nB7ezaE+HYQRqFTq3BN2bbSPyfmWUZtl7qK51KYOUUptgmQh52YnPFYTwujiVpVpl UdzQ== Received: by 10.66.83.201 with SMTP id s9mr6801792pay.74.1351875684925; Fri, 02 Nov 2012 10:01:24 -0700 (PDT) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net. [67.168.183.230]) by mx.google.com with ESMTPS id v2sm4274992paz.27.2012.11.02.10.01.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:01:23 -0700 (PDT) Date: Fri, 2 Nov 2012 10:01:26 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102170126.GA8413@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509408E702000078000A6285@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkF9X+e8wzGt46XLkltisoTKAgIV7KsYfglGMwIZxXq3qld0hXqC35QeilK8xkBUYIfaIXQ Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 17:23, Greg KH wrote: > > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > >> Since there's no possible caller of dbgp_external_startup() and > > > > > > > > Please just send the incremental patch, in a format that I can apply it > > (hint, as an attachment like this I can't, as I would have to hand-edit > > the attachment, and I might get it wrong...) > > Here you go: > > fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD > > Relax condition of building the reset interface stubs in > drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also > cover the chipidea driver re-using code from ehci-hcd. Ok, I'm going to be a pain here, but this isn't in a form I can apply it. I would have to edit this by hand and then run it through git, making it a pain to apply. Please be nice to overworked maintainers and make it easy to apply your patches, send them in a format that they don't have to edit _anything_. Third times a charm? greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:06:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:06:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKgt-0007R8-2X; Fri, 02 Nov 2012 17:05:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKgr-0007R2-6o for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:05:53 +0000 Received: from [85.158.137.99:62255] by server-12.bemta-3.messagelabs.com id DF/95-22757-07DF3905; Fri, 02 Nov 2012 17:05:52 +0000 X-Env-Sender: konrad.r.wilk@gmail.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351875950!14344152!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29476 invoked from network); 2 Nov 2012 17:05:51 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 17:05:51 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4955304vcb.32 for ; Fri, 02 Nov 2012 10:05:50 -0700 (PDT) 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=4EY7019Jkj/abK6tOYRUBI9cV+WMxlsJRbC48Enf+1Q=; b=lUG5QweZpCvKoAl6mqqVMFbJwYH28B9NuSVMhsQ03FOLHLaaRRqjryIcuqOVl99lCs 4/cg7MrgahTJ1mIiIKM5flfqqKLtuoodq1dK6Ne750hskS+tzSfzqHmetfNmNXrDGTil 1omAe5wsGZVMFahfoxeAEfNGKBNw1LHjqv+JKJu0DVsPS5I4Z+c3K1EEezuO7oqyQ9+c yLwh4gzDNv+6T11yLmS3j45WKGhZFl71/J48Hqy30VBFhouXYrahgSTl73iNDVJLMx1a uUe+Cs/Q1lAMQBv/mWG6+dBKWg8QDzU2+a52lm4OKHBYH30tUWBxeWPtbQb9H0mKLIsB f6jg== Received: by 10.220.119.196 with SMTP id a4mr2460670vcr.19.1351875950031; Fri, 02 Nov 2012 10:05:50 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id l15sm5811203vdt.14.2012.11.02.10.05.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:05:49 -0700 (PDT) Date: Fri, 2 Nov 2012 13:05:46 -0400 From: Konrad Rzeszutek Wilk To: Roger Pau Monne Message-ID: <20121102170543.GA1853@konrad-lan.dumpdata.com> References: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 04:43:04PM +0100, Roger Pau Monne wrote: > This patch contains fixes for persistent grants implementation v2: > > * handle == 0 is a valid handle, so initialize grants in blkback > setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported > by Konrad Rzeszutek Wilk. > > * new_map is a boolean, use "true" or "false" instead of 1 and 0. > Reported by Konrad Rzeszutek Wilk. > > * blkfront announces the persistent-grants feature as > feature-persistent-grants, use feature-persistent instead which is > consistent with blkback and the public Xen headers. > > * Add a consistency check in blkfront to make sure we don't try to > access segments that have not been set. Looks good.. but > > Signed-off-by: Roger Pau Monne > Cc: > Cc: > --- > drivers/block/xen-blkback/blkback.c | 15 +++++++++------ > drivers/block/xen-blkback/xenbus.c | 2 +- > drivers/block/xen-blkfront.c | 3 ++- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c > index 663d42d..a059616 100644 > --- a/drivers/block/xen-blkback/blkback.c > +++ b/drivers/block/xen-blkback/blkback.c > @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, > * We are using persistent grants and > * the grant is already mapped > */ > - new_map = 0; > + new_map = false; > } else if (use_persistent_gnts && > blkif->persistent_gnt_c < > max_mapped_grant_pages(blkif->blk_protocol)) { > @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, > * We are using persistent grants, the grant is > * not mapped but we have room for it > */ > - new_map = 1; > - persistent_gnt = kzalloc( > + new_map = true; > + persistent_gnt = kmalloc( Why do we want to use kmalloc instead of kzalloc? > sizeof(struct persistent_gnt), > GFP_KERNEL); > if (!persistent_gnt) > @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, > return -ENOMEM; > } > persistent_gnt->gnt = req->u.rw.seg[i].gref; > + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; > > pages_to_gnt[segs_to_map] = > persistent_gnt->page; > @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, > pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", > blkif->domid, blkif->vbd.handle); > } > - new_map = 1; > + new_map = true; > pages[i] = blkbk->pending_page(pending_req, i); > addr = vaddr(pending_req, i); > pages_to_gnt[segs_to_map] = > @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, > */ > bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); > for (i = 0, j = 0; i < nseg; i++) { > - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { > + if (!persistent_gnts[i] || > + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { > /* This is a newly mapped grant */ > BUG_ON(j >= segs_to_map); > if (unlikely(map[j].status != 0)) { > @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, > } > } > if (persistent_gnts[i]) { > - if (!persistent_gnts[i]->handle) { > + if (persistent_gnts[i]->handle == > + BLKBACK_INVALID_HANDLE) { > /* > * If this is a new persistent grant > * save the handler > diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c > index b225026..a03ecbb 100644 > --- a/drivers/block/xen-blkback/xenbus.c > +++ b/drivers/block/xen-blkback/xenbus.c > @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) > return -1; > } > err = xenbus_gather(XBT_NIL, dev->otherend, > - "feature-persistent-grants", "%u", > + "feature-persistent", "%u", > &pers_grants, NULL); > if (err) > pers_grants = 0; > diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c > index 911d733..f1de806 100644 > --- a/drivers/block/xen-blkfront.c > +++ b/drivers/block/xen-blkfront.c > @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, > rq_for_each_segment(bvec, s->request, iter) { > BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); > i = offset >> PAGE_SHIFT; > + BUG_ON(i >= s->req.u.rw.nr_segments); > shared_data = kmap_atomic( > pfn_to_page(s->grants_used[i]->pfn)); > bvec_data = bvec_kmap_irq(bvec, &flags); > @@ -1069,7 +1070,7 @@ again: > goto abort_transaction; > } > err = xenbus_printf(xbt, dev->nodename, > - "feature-persistent-grants", "%u", 1); > + "feature-persistent", "%u", 1); > if (err) > dev_warn(&dev->dev, > "writing persistent grants feature to xenbus"); > -- > 1.7.7.5 (Apple Git-26) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:06:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:06:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKgt-0007R8-2X; Fri, 02 Nov 2012 17:05:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKgr-0007R2-6o for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:05:53 +0000 Received: from [85.158.137.99:62255] by server-12.bemta-3.messagelabs.com id DF/95-22757-07DF3905; Fri, 02 Nov 2012 17:05:52 +0000 X-Env-Sender: konrad.r.wilk@gmail.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351875950!14344152!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29476 invoked from network); 2 Nov 2012 17:05:51 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 17:05:51 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4955304vcb.32 for ; Fri, 02 Nov 2012 10:05:50 -0700 (PDT) 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=4EY7019Jkj/abK6tOYRUBI9cV+WMxlsJRbC48Enf+1Q=; b=lUG5QweZpCvKoAl6mqqVMFbJwYH28B9NuSVMhsQ03FOLHLaaRRqjryIcuqOVl99lCs 4/cg7MrgahTJ1mIiIKM5flfqqKLtuoodq1dK6Ne750hskS+tzSfzqHmetfNmNXrDGTil 1omAe5wsGZVMFahfoxeAEfNGKBNw1LHjqv+JKJu0DVsPS5I4Z+c3K1EEezuO7oqyQ9+c yLwh4gzDNv+6T11yLmS3j45WKGhZFl71/J48Hqy30VBFhouXYrahgSTl73iNDVJLMx1a uUe+Cs/Q1lAMQBv/mWG6+dBKWg8QDzU2+a52lm4OKHBYH30tUWBxeWPtbQb9H0mKLIsB f6jg== Received: by 10.220.119.196 with SMTP id a4mr2460670vcr.19.1351875950031; Fri, 02 Nov 2012 10:05:50 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id l15sm5811203vdt.14.2012.11.02.10.05.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 10:05:49 -0700 (PDT) Date: Fri, 2 Nov 2012 13:05:46 -0400 From: Konrad Rzeszutek Wilk To: Roger Pau Monne Message-ID: <20121102170543.GA1853@konrad-lan.dumpdata.com> References: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 04:43:04PM +0100, Roger Pau Monne wrote: > This patch contains fixes for persistent grants implementation v2: > > * handle == 0 is a valid handle, so initialize grants in blkback > setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported > by Konrad Rzeszutek Wilk. > > * new_map is a boolean, use "true" or "false" instead of 1 and 0. > Reported by Konrad Rzeszutek Wilk. > > * blkfront announces the persistent-grants feature as > feature-persistent-grants, use feature-persistent instead which is > consistent with blkback and the public Xen headers. > > * Add a consistency check in blkfront to make sure we don't try to > access segments that have not been set. Looks good.. but > > Signed-off-by: Roger Pau Monne > Cc: > Cc: > --- > drivers/block/xen-blkback/blkback.c | 15 +++++++++------ > drivers/block/xen-blkback/xenbus.c | 2 +- > drivers/block/xen-blkfront.c | 3 ++- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c > index 663d42d..a059616 100644 > --- a/drivers/block/xen-blkback/blkback.c > +++ b/drivers/block/xen-blkback/blkback.c > @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, > * We are using persistent grants and > * the grant is already mapped > */ > - new_map = 0; > + new_map = false; > } else if (use_persistent_gnts && > blkif->persistent_gnt_c < > max_mapped_grant_pages(blkif->blk_protocol)) { > @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, > * We are using persistent grants, the grant is > * not mapped but we have room for it > */ > - new_map = 1; > - persistent_gnt = kzalloc( > + new_map = true; > + persistent_gnt = kmalloc( Why do we want to use kmalloc instead of kzalloc? > sizeof(struct persistent_gnt), > GFP_KERNEL); > if (!persistent_gnt) > @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, > return -ENOMEM; > } > persistent_gnt->gnt = req->u.rw.seg[i].gref; > + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; > > pages_to_gnt[segs_to_map] = > persistent_gnt->page; > @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, > pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", > blkif->domid, blkif->vbd.handle); > } > - new_map = 1; > + new_map = true; > pages[i] = blkbk->pending_page(pending_req, i); > addr = vaddr(pending_req, i); > pages_to_gnt[segs_to_map] = > @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, > */ > bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); > for (i = 0, j = 0; i < nseg; i++) { > - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { > + if (!persistent_gnts[i] || > + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { > /* This is a newly mapped grant */ > BUG_ON(j >= segs_to_map); > if (unlikely(map[j].status != 0)) { > @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, > } > } > if (persistent_gnts[i]) { > - if (!persistent_gnts[i]->handle) { > + if (persistent_gnts[i]->handle == > + BLKBACK_INVALID_HANDLE) { > /* > * If this is a new persistent grant > * save the handler > diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c > index b225026..a03ecbb 100644 > --- a/drivers/block/xen-blkback/xenbus.c > +++ b/drivers/block/xen-blkback/xenbus.c > @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) > return -1; > } > err = xenbus_gather(XBT_NIL, dev->otherend, > - "feature-persistent-grants", "%u", > + "feature-persistent", "%u", > &pers_grants, NULL); > if (err) > pers_grants = 0; > diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c > index 911d733..f1de806 100644 > --- a/drivers/block/xen-blkfront.c > +++ b/drivers/block/xen-blkfront.c > @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, > rq_for_each_segment(bvec, s->request, iter) { > BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); > i = offset >> PAGE_SHIFT; > + BUG_ON(i >= s->req.u.rw.nr_segments); > shared_data = kmap_atomic( > pfn_to_page(s->grants_used[i]->pfn)); > bvec_data = bvec_kmap_irq(bvec, &flags); > @@ -1069,7 +1070,7 @@ again: > goto abort_transaction; > } > err = xenbus_printf(xbt, dev->nodename, > - "feature-persistent-grants", "%u", 1); > + "feature-persistent", "%u", 1); > if (err) > dev_warn(&dev->dev, > "writing persistent grants feature to xenbus"); > -- > 1.7.7.5 (Apple Git-26) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:07:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:07:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKht-0007WS-Mk; Fri, 02 Nov 2012 17:06:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKhr-0007WE-V0 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:06:56 +0000 Received: from [85.158.143.99:15775] by server-1.bemta-4.messagelabs.com id 14/F8-27934-FADF3905; Fri, 02 Nov 2012 17:06:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1351876013!20879331!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24385 invoked from network); 2 Nov 2012 17:06:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-11.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:06:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 17:06:53 +0000 Message-Id: <50940BE702000078000A62AD@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 17:07:35 +0000 From: "Jan Beulich" To: "Greg KH" References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> <20121102170126.GA8413@kroah.com> In-Reply-To: <20121102170126.GA8413@kroah.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 18:01, Greg KH wrote: > On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: >> >>> On 02.11.12 at 17:23, Greg KH wrote: >> > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: >> >> Since there's no possible caller of dbgp_external_startup() and >> > >> > >> > >> > Please just send the incremental patch, in a format that I can apply it >> > (hint, as an attachment like this I can't, as I would have to hand-edit >> > the attachment, and I might get it wrong...) >> >> Here you go: >> >> fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD >> >> Relax condition of building the reset interface stubs in >> drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also >> cover the chipidea driver re-using code from ehci-hcd. > > Ok, I'm going to be a pain here, but this isn't in a form I can apply > it. I would have to edit this by hand and then run it through git, > making it a pain to apply. Please be nice to overworked maintainers and > make it easy to apply your patches, send them in a format that they > don't have to edit _anything_. > > Third times a charm? Assuming (since you didn't mention what's wrong) all this is about is the fact that the mail contains other text besides the patch, I'll resend the patch alone. If that's not your issue, you'll have to tell me what it is I did wrong. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:07:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:07:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKht-0007WS-Mk; Fri, 02 Nov 2012 17:06:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKhr-0007WE-V0 for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:06:56 +0000 Received: from [85.158.143.99:15775] by server-1.bemta-4.messagelabs.com id 14/F8-27934-FADF3905; Fri, 02 Nov 2012 17:06:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1351876013!20879331!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24385 invoked from network); 2 Nov 2012 17:06:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-11.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:06:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 17:06:53 +0000 Message-Id: <50940BE702000078000A62AD@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 17:07:35 +0000 From: "Jan Beulich" To: "Greg KH" References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> <20121102170126.GA8413@kroah.com> In-Reply-To: <20121102170126.GA8413@kroah.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 02.11.12 at 18:01, Greg KH wrote: > On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: >> >>> On 02.11.12 at 17:23, Greg KH wrote: >> > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: >> >> Since there's no possible caller of dbgp_external_startup() and >> > >> > >> > >> > Please just send the incremental patch, in a format that I can apply it >> > (hint, as an attachment like this I can't, as I would have to hand-edit >> > the attachment, and I might get it wrong...) >> >> Here you go: >> >> fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD >> >> Relax condition of building the reset interface stubs in >> drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also >> cover the chipidea driver re-using code from ehci-hcd. > > Ok, I'm going to be a pain here, but this isn't in a form I can apply > it. I would have to edit this by hand and then run it through git, > making it a pain to apply. Please be nice to overworked maintainers and > make it easy to apply your patches, send them in a format that they > don't have to edit _anything_. > > Third times a charm? Assuming (since you didn't mention what's wrong) all this is about is the fact that the mail contains other text besides the patch, I'll resend the patch alone. If that's not your issue, you'll have to tell me what it is I did wrong. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:08:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:08:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKjH-0007eD-6Y; Fri, 02 Nov 2012 17:08:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKjG-0007e6-Bm for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:08:22 +0000 Received: from [85.158.143.99:46405] by server-2.bemta-4.messagelabs.com id 92/8A-28922-50EF3905; Fri, 02 Nov 2012 17:08:21 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1351876100!28382418!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27936 invoked from network); 2 Nov 2012 17:08:21 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:08:21 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 17:08:19 +0000 Message-Id: <50940C3C02000078000A62B0@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 17:09:00 +0000 From: "Jan Beulich" To: Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: [Xen-devel] [PATCH] fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Relax condition of building the reset interface stubs in drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Acked-by: Alan Stern Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini --- drivers/usb/early/ehci-dbgp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3/drivers/usb/early/ehci-dbgp.c @@ -974,7 +974,7 @@ struct console early_dbgp_console = { .index = -1, }; -#if IS_ENABLED(CONFIG_USB_EHCI_HCD) +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret = xen_dbgp_reset_prep(hcd); @@ -1008,7 +1008,7 @@ int dbgp_external_startup(struct usb_hcd return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); } EXPORT_SYMBOL_GPL(dbgp_external_startup); -#endif /* USB_EHCI_HCD */ +#endif /* USB */ #ifdef CONFIG_KGDB _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:08:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:08:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKjH-0007eD-6Y; Fri, 02 Nov 2012 17:08:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKjG-0007e6-Bm for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:08:22 +0000 Received: from [85.158.143.99:46405] by server-2.bemta-4.messagelabs.com id 92/8A-28922-50EF3905; Fri, 02 Nov 2012 17:08:21 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1351876100!28382418!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27936 invoked from network); 2 Nov 2012 17:08:21 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:08:21 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 02 Nov 2012 17:08:19 +0000 Message-Id: <50940C3C02000078000A62B0@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 02 Nov 2012 17:09:00 +0000 From: "Jan Beulich" To: Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: [Xen-devel] [PATCH] fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Relax condition of building the reset interface stubs in drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. Reported-by: Randy Dunlap Signed-off-by: Jan Beulich Acked-by: Alan Stern Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini --- drivers/usb/early/ehci-dbgp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 3.7-rc3.orig/drivers/usb/early/ehci-dbgp.c +++ 3.7-rc3/drivers/usb/early/ehci-dbgp.c @@ -974,7 +974,7 @@ struct console early_dbgp_console = { .index = -1, }; -#if IS_ENABLED(CONFIG_USB_EHCI_HCD) +#if IS_ENABLED(CONFIG_USB) int dbgp_reset_prep(struct usb_hcd *hcd) { int ret = xen_dbgp_reset_prep(hcd); @@ -1008,7 +1008,7 @@ int dbgp_external_startup(struct usb_hcd return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup(); } EXPORT_SYMBOL_GPL(dbgp_external_startup); -#endif /* USB_EHCI_HCD */ +#endif /* USB */ #ifdef CONFIG_KGDB _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:09:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:09:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKk2-0007je-Kw; Fri, 02 Nov 2012 17:09:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKk1-0007jQ-2G for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:09:09 +0000 Received: from [85.158.143.99:47907] by server-2.bemta-4.messagelabs.com id 21/1B-28922-43EF3905; Fri, 02 Nov 2012 17:09:08 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1351876146!20879577!1 X-Originating-IP: [198.145.19.201] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29213 invoked from network); 2 Nov 2012 17:09:07 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.19.201) by server-11.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:09:07 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98B462044B; Fri, 2 Nov 2012 17:09:05 +0000 (UTC) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net [67.168.183.230]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3E5E20442; Fri, 2 Nov 2012 17:09:04 +0000 (UTC) Date: Fri, 2 Nov 2012 10:09:09 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102170909.GA2633@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> <20121102170126.GA8413@kroah.com> <50940BE702000078000A62AD@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50940BE702000078000A62AD@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 05:07:35PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 18:01, Greg KH wrote: > > On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: > >> >>> On 02.11.12 at 17:23, Greg KH wrote: > >> > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > >> >> Since there's no possible caller of dbgp_external_startup() and > >> > > >> > > >> > > >> > Please just send the incremental patch, in a format that I can apply it > >> > (hint, as an attachment like this I can't, as I would have to hand-edit > >> > the attachment, and I might get it wrong...) > >> > >> Here you go: > >> > >> fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD > >> > >> Relax condition of building the reset interface stubs in > >> drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also > >> cover the chipidea driver re-using code from ehci-hcd. > > > > Ok, I'm going to be a pain here, but this isn't in a form I can apply > > it. I would have to edit this by hand and then run it through git, > > making it a pain to apply. Please be nice to overworked maintainers and > > make it easy to apply your patches, send them in a format that they > > don't have to edit _anything_. > > > > Third times a charm? > > Assuming (since you didn't mention what's wrong) all this is about > is the fact that the mail contains other text besides the patch, I'll > resend the patch alone. If that's not your issue, you'll have to > tell me what it is I did wrong. Yes, that is incorrect, along with the Subject: line. thanks, greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 17:09:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 17:09:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKk2-0007je-Kw; Fri, 02 Nov 2012 17:09:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUKk1-0007jQ-2G for xen-devel@lists.xen.org; Fri, 02 Nov 2012 17:09:09 +0000 Received: from [85.158.143.99:47907] by server-2.bemta-4.messagelabs.com id 21/1B-28922-43EF3905; Fri, 02 Nov 2012 17:09:08 +0000 X-Env-Sender: gregkh@linuxfoundation.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1351876146!20879577!1 X-Originating-IP: [198.145.19.201] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29213 invoked from network); 2 Nov 2012 17:09:07 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.19.201) by server-11.tower-216.messagelabs.com with SMTP; 2 Nov 2012 17:09:07 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98B462044B; Fri, 2 Nov 2012 17:09:05 +0000 (UTC) Received: from localhost (c-67-168-183-230.hsd1.wa.comcast.net [67.168.183.230]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3E5E20442; Fri, 2 Nov 2012 17:09:04 +0000 (UTC) Date: Fri, 2 Nov 2012 10:09:09 -0700 From: Greg KH To: Jan Beulich Message-ID: <20121102170909.GA2633@kroah.com> References: <5093947F02000078000A5F42@nat28.tlf.novell.com> <20121102162334.GB4093@kroah.com> <509408E702000078000A6285@nat28.tlf.novell.com> <20121102170126.GA8413@kroah.com> <50940BE702000078000A62AD@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50940BE702000078000A62AD@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: Konrad Rzeszutek Wilk , linux-usb@vger.kernel.org, xen-devel , Randy Dunlap , stern@rowland.harvard.edu, Stefano Stabellini Subject: Re: [Xen-devel] [PATCH, v3] fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 05:07:35PM +0000, Jan Beulich wrote: > >>> On 02.11.12 at 18:01, Greg KH wrote: > > On Fri, Nov 02, 2012 at 04:54:47PM +0000, Jan Beulich wrote: > >> >>> On 02.11.12 at 17:23, Greg KH wrote: > >> > On Fri, Nov 02, 2012 at 08:38:07AM +0000, Jan Beulich wrote: > >> >> Since there's no possible caller of dbgp_external_startup() and > >> > > >> > > >> > > >> > Please just send the incremental patch, in a format that I can apply it > >> > (hint, as an attachment like this I can't, as I would have to hand-edit > >> > the attachment, and I might get it wrong...) > >> > >> Here you go: > >> > >> fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD > >> > >> Relax condition of building the reset interface stubs in > >> drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also > >> cover the chipidea driver re-using code from ehci-hcd. > > > > Ok, I'm going to be a pain here, but this isn't in a form I can apply > > it. I would have to edit this by hand and then run it through git, > > making it a pain to apply. Please be nice to overworked maintainers and > > make it easy to apply your patches, send them in a format that they > > don't have to edit _anything_. > > > > Third times a charm? > > Assuming (since you didn't mention what's wrong) all this is about > is the fact that the mail contains other text besides the patch, I'll > resend the patch alone. If that's not your issue, you'll have to > tell me what it is I did wrong. Yes, that is incorrect, along with the Subject: line. thanks, greg k-h _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 19:56:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 19:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNL3-0001QF-7E; Fri, 02 Nov 2012 19:55:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNL1-0001QA-Hi for xen-devel@lists.xen.org; Fri, 02 Nov 2012 19:55:31 +0000 Received: from [85.158.139.211:58709] by server-13.bemta-5.messagelabs.com id 70/15-27809-23524905; Fri, 02 Nov 2012 19:55:30 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-11.tower-206.messagelabs.com!1351886129!18686400!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzc3MTM=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzc3MTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9910 invoked from network); 2 Nov 2012 19:55:29 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 19:55:29 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0M3OHE-1TCz2m0akC-00r7w7; Fri, 02 Nov 2012 20:55:28 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Fri, 2 Nov 2012 21:01:08 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> In-Reply-To: <1351756924.25014.29.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211022101.08926.ronny.hegewald@online.de> X-Provags-ID: V02:K0:V1mElcsN8pnZqK1QPWxtS/KVZQKF+71q2AfRyTEuSza 2Vq3Qsm3XyBAywKABqFvE42eep6c2aUeUnOKhRhJJ7+pyGmEoJ GSXOaWwzV7V1bauAXW3/MTvLe5+s8PFMbtsWgS/pvnxmqYSXRt mPRKvEJmEt+n7c/NOge/TwAxThLeasETyEyOGUXySPIwQ1QNAa 974PraWylW2uKkuTlNDO2a+T3QMz4ibN0XVEn7iovfN8/io6o8 QEKfAPvHXAUpS0l19RuzY+rrR1XDqtKo+KNh/HQpUjIJg+Yfqf lvpm6SfMthSQVdSve8OxMR9UXGlNRL7UOhvRqHJylHsON6R+Jg wKXQ3JKGdDj1CWyvwnRLt9Fn83TLKqC0CFdklQY1kqfmZczvhg PJUJtYVNjehIfjx4eBY7RpCROzNfv1fMME= Cc: Ian Campbell Subject: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org When a config-file for a pv-domU has a vfb section with a vnc=0 option then a "xl create" for that domU crashes with the message xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' failed. and the domU hangs early in the start. This patch fixes the cause of the assertion and let the domU start normally. This problem exists since xen 4.2. Signed-off-by: Ronny Hegewald@online.de --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ } libxl_defbool_setdefault(&vfb->vnc.findunused, true); + } else { + libxl_defbool_setdefault(&vfb->vnc.findunused, false); } libxl_defbool_setdefault(&vfb->sdl.enable, false); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 19:56:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 19:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNL3-0001QF-7E; Fri, 02 Nov 2012 19:55:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNL1-0001QA-Hi for xen-devel@lists.xen.org; Fri, 02 Nov 2012 19:55:31 +0000 Received: from [85.158.139.211:58709] by server-13.bemta-5.messagelabs.com id 70/15-27809-23524905; Fri, 02 Nov 2012 19:55:30 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-11.tower-206.messagelabs.com!1351886129!18686400!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzc3MTM=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzc3MTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9910 invoked from network); 2 Nov 2012 19:55:29 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 19:55:29 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0M3OHE-1TCz2m0akC-00r7w7; Fri, 02 Nov 2012 20:55:28 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Fri, 2 Nov 2012 21:01:08 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> In-Reply-To: <1351756924.25014.29.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211022101.08926.ronny.hegewald@online.de> X-Provags-ID: V02:K0:V1mElcsN8pnZqK1QPWxtS/KVZQKF+71q2AfRyTEuSza 2Vq3Qsm3XyBAywKABqFvE42eep6c2aUeUnOKhRhJJ7+pyGmEoJ GSXOaWwzV7V1bauAXW3/MTvLe5+s8PFMbtsWgS/pvnxmqYSXRt mPRKvEJmEt+n7c/NOge/TwAxThLeasETyEyOGUXySPIwQ1QNAa 974PraWylW2uKkuTlNDO2a+T3QMz4ibN0XVEn7iovfN8/io6o8 QEKfAPvHXAUpS0l19RuzY+rrR1XDqtKo+KNh/HQpUjIJg+Yfqf lvpm6SfMthSQVdSve8OxMR9UXGlNRL7UOhvRqHJylHsON6R+Jg wKXQ3JKGdDj1CWyvwnRLt9Fn83TLKqC0CFdklQY1kqfmZczvhg PJUJtYVNjehIfjx4eBY7RpCROzNfv1fMME= Cc: Ian Campbell Subject: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org When a config-file for a pv-domU has a vfb section with a vnc=0 option then a "xl create" for that domU crashes with the message xl: libxl.c:252: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' failed. and the domU hangs early in the start. This patch fixes the cause of the assertion and let the domU start normally. This problem exists since xen 4.2. Signed-off-by: Ronny Hegewald@online.de --- tools/libxl/libxl.c.org 2012-11-01 01:35:52.000000000 +0000 +++ tools/libxl/libxl.c 2012-11-01 01:36:20.000000000 +0000 @@ -2949,6 +2949,8 @@ int libxl__device_vfb_setdefault(libxl__ } libxl_defbool_setdefault(&vfb->vnc.findunused, true); + } else { + libxl_defbool_setdefault(&vfb->vnc.findunused, false); } libxl_defbool_setdefault(&vfb->sdl.enable, false); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 20:11:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 20:11:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNZV-0001f2-PX; Fri, 02 Nov 2012 20:10:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNZU-0001ex-EG for xen-devel@lists.xen.org; Fri, 02 Nov 2012 20:10:28 +0000 Received: from [85.158.139.83:32641] by server-12.bemta-5.messagelabs.com id 85/B9-02886-3B824905; Fri, 02 Nov 2012 20:10:27 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1351887025!28517790!1 X-Originating-IP: [209.85.212.65] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1372 invoked from network); 2 Nov 2012 20:10:26 -0000 Received: from mail-vb0-f65.google.com (HELO mail-vb0-f65.google.com) (209.85.212.65) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 20:10:26 -0000 Received: by mail-vb0-f65.google.com with SMTP id fn1so623464vbb.8 for ; Fri, 02 Nov 2012 13:10:25 -0700 (PDT) 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=AgtuvloRSKaWWwNZhR3U6Xl/W3oToyFIcV0Ksvt34R8=; b=vFvq7u+nAAo9zyyFtcR0XH9JhXD2uAyKyWEhjub40gKQdGFKupDumsaTFdc47AII8L CJ+Vcyl0C9dPR8DZWAPYv3cKGhoG7l9LCqV2aeuuJ/wvOCyrxYPsXnra9rEoQc0fqjLI 1MB71MOywe1q5Ag9aXzHgPryAPjk+CnJ0Mz0Q4/rlSheMz9quaKFyVVkNMiTevmFGKKt vsuS0AWNNFW2eFRws8p5rPyY21nGzoSYg7xzdSgSRPYEVS6ykb9XHHxrQkRDsOekF5k/ KdFRdbYN2hLw2yHafkGfkMw09nJx14P+Y06Esx/6wlhu/r2RguwgAyqcQ8ZU/2RPe42C iRGA== Received: by 10.58.223.200 with SMTP id qw8mr3056234vec.12.1351887025009; Fri, 02 Nov 2012 13:10:25 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id u6sm4265897vdi.20.2012.11.02.13.10.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 13:10:24 -0700 (PDT) Date: Fri, 2 Nov 2012 16:10:19 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102201018.GA6786@konrad-lan.dumpdata.com> References: <5093E84C02000078000A619F@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E84C02000078000A619F@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: xen-devel , linux-kernel@vger.kernel.org, Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 0/2] xen-pciback: parsing improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:35:40PM +0000, Jan Beulich wrote: > 1: simplify and tighten parsing of device IDs > 2: reject out of range inputs applied for v3.8. Thanks! > > Signed-off-by: Jan Beulich > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 20:11:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 20:11:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNZV-0001f2-PX; Fri, 02 Nov 2012 20:10:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNZU-0001ex-EG for xen-devel@lists.xen.org; Fri, 02 Nov 2012 20:10:28 +0000 Received: from [85.158.139.83:32641] by server-12.bemta-5.messagelabs.com id 85/B9-02886-3B824905; Fri, 02 Nov 2012 20:10:27 +0000 X-Env-Sender: ketuzsezr@gmail.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1351887025!28517790!1 X-Originating-IP: [209.85.212.65] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1372 invoked from network); 2 Nov 2012 20:10:26 -0000 Received: from mail-vb0-f65.google.com (HELO mail-vb0-f65.google.com) (209.85.212.65) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 20:10:26 -0000 Received: by mail-vb0-f65.google.com with SMTP id fn1so623464vbb.8 for ; Fri, 02 Nov 2012 13:10:25 -0700 (PDT) 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=AgtuvloRSKaWWwNZhR3U6Xl/W3oToyFIcV0Ksvt34R8=; b=vFvq7u+nAAo9zyyFtcR0XH9JhXD2uAyKyWEhjub40gKQdGFKupDumsaTFdc47AII8L CJ+Vcyl0C9dPR8DZWAPYv3cKGhoG7l9LCqV2aeuuJ/wvOCyrxYPsXnra9rEoQc0fqjLI 1MB71MOywe1q5Ag9aXzHgPryAPjk+CnJ0Mz0Q4/rlSheMz9quaKFyVVkNMiTevmFGKKt vsuS0AWNNFW2eFRws8p5rPyY21nGzoSYg7xzdSgSRPYEVS6ykb9XHHxrQkRDsOekF5k/ KdFRdbYN2hLw2yHafkGfkMw09nJx14P+Y06Esx/6wlhu/r2RguwgAyqcQ8ZU/2RPe42C iRGA== Received: by 10.58.223.200 with SMTP id qw8mr3056234vec.12.1351887025009; Fri, 02 Nov 2012 13:10:25 -0700 (PDT) Received: from konrad-lan.dumpdata.com (pool-64-222-209-26.port.east.myfairpoint.net. [64.222.209.26]) by mx.google.com with ESMTPS id u6sm4265897vdi.20.2012.11.02.13.10.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 13:10:24 -0700 (PDT) Date: Fri, 2 Nov 2012 16:10:19 -0400 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121102201018.GA6786@konrad-lan.dumpdata.com> References: <5093E84C02000078000A619F@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5093E84C02000078000A619F@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: xen-devel , linux-kernel@vger.kernel.org, Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 0/2] xen-pciback: parsing improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 02, 2012 at 02:35:40PM +0000, Jan Beulich wrote: > 1: simplify and tighten parsing of device IDs > 2: reject out of range inputs applied for v3.8. Thanks! > > Signed-off-by: Jan Beulich > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 20:14:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 20:14:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNcW-0001lx-CD; Fri, 02 Nov 2012 20:13:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNcU-0001lp-JT for xen-devel@lists.xen.org; Fri, 02 Nov 2012 20:13:34 +0000 Received: from [85.158.143.99:52970] by server-1.bemta-4.messagelabs.com id F1/02-27934-D6924905; Fri, 02 Nov 2012 20:13:33 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1351887213!20893656!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31041 invoked from network); 2 Nov 2012 20:13:33 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 20:13:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,701,1344211200"; d="scan'208";a="15564501" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 20:13:33 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 20:13:32 +0000 Message-ID: <5094296B.5030406@citrix.com> Date: Fri, 2 Nov 2012 21:13:31 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> <20121102170543.GA1853@konrad-lan.dumpdata.com> In-Reply-To: <20121102170543.GA1853@konrad-lan.dumpdata.com> Cc: "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/12 18:05, Konrad Rzeszutek Wilk wrote: > On Fri, Nov 02, 2012 at 04:43:04PM +0100, Roger Pau Monne wrote: >> This patch contains fixes for persistent grants implementation v2: >> >> * handle == 0 is a valid handle, so initialize grants in blkback >> setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported >> by Konrad Rzeszutek Wilk. >> >> * new_map is a boolean, use "true" or "false" instead of 1 and 0. >> Reported by Konrad Rzeszutek Wilk. >> >> * blkfront announces the persistent-grants feature as >> feature-persistent-grants, use feature-persistent instead which is >> consistent with blkback and the public Xen headers. >> >> * Add a consistency check in blkfront to make sure we don't try to >> access segments that have not been set. > > Looks good.. but >> >> Signed-off-by: Roger Pau Monne >> Cc: >> Cc: >> --- >> drivers/block/xen-blkback/blkback.c | 15 +++++++++------ >> drivers/block/xen-blkback/xenbus.c | 2 +- >> drivers/block/xen-blkfront.c | 3 ++- >> 3 files changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c >> index 663d42d..a059616 100644 >> --- a/drivers/block/xen-blkback/blkback.c >> +++ b/drivers/block/xen-blkback/blkback.c >> @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> * We are using persistent grants and >> * the grant is already mapped >> */ >> - new_map = 0; >> + new_map = false; >> } else if (use_persistent_gnts && >> blkif->persistent_gnt_c < >> max_mapped_grant_pages(blkif->blk_protocol)) { >> @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> * We are using persistent grants, the grant is >> * not mapped but we have room for it >> */ >> - new_map = 1; >> - persistent_gnt = kzalloc( >> + new_map = true; >> + persistent_gnt = kmalloc( > > Why do we want to use kmalloc instead of kzalloc? In the previous patch I relied on handle being 0 when not set (that's why I was using kzalloc), but this was wrong (0 is a valid handle), so now I explicitly initialize it to BLKBACK_INVALID_HANDLE. I replaced the kzalloc with kmalloc because it should be faster, and there's no need to zero it anymore. > >> sizeof(struct persistent_gnt), >> GFP_KERNEL); >> if (!persistent_gnt) >> @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> return -ENOMEM; >> } >> persistent_gnt->gnt = req->u.rw.seg[i].gref; >> + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; >> >> pages_to_gnt[segs_to_map] = >> persistent_gnt->page; >> @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", >> blkif->domid, blkif->vbd.handle); >> } >> - new_map = 1; >> + new_map = true; >> pages[i] = blkbk->pending_page(pending_req, i); >> addr = vaddr(pending_req, i); >> pages_to_gnt[segs_to_map] = >> @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> */ >> bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); >> for (i = 0, j = 0; i < nseg; i++) { >> - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { >> + if (!persistent_gnts[i] || >> + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { >> /* This is a newly mapped grant */ >> BUG_ON(j >= segs_to_map); >> if (unlikely(map[j].status != 0)) { >> @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> } >> } >> if (persistent_gnts[i]) { >> - if (!persistent_gnts[i]->handle) { >> + if (persistent_gnts[i]->handle == >> + BLKBACK_INVALID_HANDLE) { >> /* >> * If this is a new persistent grant >> * save the handler >> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c >> index b225026..a03ecbb 100644 >> --- a/drivers/block/xen-blkback/xenbus.c >> +++ b/drivers/block/xen-blkback/xenbus.c >> @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) >> return -1; >> } >> err = xenbus_gather(XBT_NIL, dev->otherend, >> - "feature-persistent-grants", "%u", >> + "feature-persistent", "%u", >> &pers_grants, NULL); >> if (err) >> pers_grants = 0; >> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c >> index 911d733..f1de806 100644 >> --- a/drivers/block/xen-blkfront.c >> +++ b/drivers/block/xen-blkfront.c >> @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, >> rq_for_each_segment(bvec, s->request, iter) { >> BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); >> i = offset >> PAGE_SHIFT; >> + BUG_ON(i >= s->req.u.rw.nr_segments); >> shared_data = kmap_atomic( >> pfn_to_page(s->grants_used[i]->pfn)); >> bvec_data = bvec_kmap_irq(bvec, &flags); >> @@ -1069,7 +1070,7 @@ again: >> goto abort_transaction; >> } >> err = xenbus_printf(xbt, dev->nodename, >> - "feature-persistent-grants", "%u", 1); >> + "feature-persistent", "%u", 1); >> if (err) >> dev_warn(&dev->dev, >> "writing persistent grants feature to xenbus"); >> -- >> 1.7.7.5 (Apple Git-26) >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 20:14:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 20:14:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNcW-0001lx-CD; Fri, 02 Nov 2012 20:13:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUNcU-0001lp-JT for xen-devel@lists.xen.org; Fri, 02 Nov 2012 20:13:34 +0000 Received: from [85.158.143.99:52970] by server-1.bemta-4.messagelabs.com id F1/02-27934-D6924905; Fri, 02 Nov 2012 20:13:33 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1351887213!20893656!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31041 invoked from network); 2 Nov 2012 20:13:33 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 20:13:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,701,1344211200"; d="scan'208";a="15564501" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 20:13:33 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 20:13:32 +0000 Message-ID: <5094296B.5030406@citrix.com> Date: Fri, 2 Nov 2012 21:13:31 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1351870984-22078-1-git-send-email-roger.pau@citrix.com> <20121102170543.GA1853@konrad-lan.dumpdata.com> In-Reply-To: <20121102170543.GA1853@konrad-lan.dumpdata.com> Cc: "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen-blk: persistent-grants fixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 02/11/12 18:05, Konrad Rzeszutek Wilk wrote: > On Fri, Nov 02, 2012 at 04:43:04PM +0100, Roger Pau Monne wrote: >> This patch contains fixes for persistent grants implementation v2: >> >> * handle == 0 is a valid handle, so initialize grants in blkback >> setting the handle to BLKBACK_INVALID_HANDLE instead of 0. Reported >> by Konrad Rzeszutek Wilk. >> >> * new_map is a boolean, use "true" or "false" instead of 1 and 0. >> Reported by Konrad Rzeszutek Wilk. >> >> * blkfront announces the persistent-grants feature as >> feature-persistent-grants, use feature-persistent instead which is >> consistent with blkback and the public Xen headers. >> >> * Add a consistency check in blkfront to make sure we don't try to >> access segments that have not been set. > > Looks good.. but >> >> Signed-off-by: Roger Pau Monne >> Cc: >> Cc: >> --- >> drivers/block/xen-blkback/blkback.c | 15 +++++++++------ >> drivers/block/xen-blkback/xenbus.c | 2 +- >> drivers/block/xen-blkfront.c | 3 ++- >> 3 files changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c >> index 663d42d..a059616 100644 >> --- a/drivers/block/xen-blkback/blkback.c >> +++ b/drivers/block/xen-blkback/blkback.c >> @@ -503,7 +503,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> * We are using persistent grants and >> * the grant is already mapped >> */ >> - new_map = 0; >> + new_map = false; >> } else if (use_persistent_gnts && >> blkif->persistent_gnt_c < >> max_mapped_grant_pages(blkif->blk_protocol)) { >> @@ -511,8 +511,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> * We are using persistent grants, the grant is >> * not mapped but we have room for it >> */ >> - new_map = 1; >> - persistent_gnt = kzalloc( >> + new_map = true; >> + persistent_gnt = kmalloc( > > Why do we want to use kmalloc instead of kzalloc? In the previous patch I relied on handle being 0 when not set (that's why I was using kzalloc), but this was wrong (0 is a valid handle), so now I explicitly initialize it to BLKBACK_INVALID_HANDLE. I replaced the kzalloc with kmalloc because it should be faster, and there's no need to zero it anymore. > >> sizeof(struct persistent_gnt), >> GFP_KERNEL); >> if (!persistent_gnt) >> @@ -523,6 +523,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> return -ENOMEM; >> } >> persistent_gnt->gnt = req->u.rw.seg[i].gref; >> + persistent_gnt->handle = BLKBACK_INVALID_HANDLE; >> >> pages_to_gnt[segs_to_map] = >> persistent_gnt->page; >> @@ -547,7 +548,7 @@ static int xen_blkbk_map(struct blkif_request *req, >> pr_alert(DRV_PFX " domain %u, device %#x is using maximum number of persistent grants\n", >> blkif->domid, blkif->vbd.handle); >> } >> - new_map = 1; >> + new_map = true; >> pages[i] = blkbk->pending_page(pending_req, i); >> addr = vaddr(pending_req, i); >> pages_to_gnt[segs_to_map] = >> @@ -584,7 +585,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> */ >> bitmap_zero(pending_req->unmap_seg, BLKIF_MAX_SEGMENTS_PER_REQUEST); >> for (i = 0, j = 0; i < nseg; i++) { >> - if (!persistent_gnts[i] || !persistent_gnts[i]->handle) { >> + if (!persistent_gnts[i] || >> + persistent_gnts[i]->handle == BLKBACK_INVALID_HANDLE) { >> /* This is a newly mapped grant */ >> BUG_ON(j >= segs_to_map); >> if (unlikely(map[j].status != 0)) { >> @@ -601,7 +603,8 @@ static int xen_blkbk_map(struct blkif_request *req, >> } >> } >> if (persistent_gnts[i]) { >> - if (!persistent_gnts[i]->handle) { >> + if (persistent_gnts[i]->handle == >> + BLKBACK_INVALID_HANDLE) { >> /* >> * If this is a new persistent grant >> * save the handler >> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c >> index b225026..a03ecbb 100644 >> --- a/drivers/block/xen-blkback/xenbus.c >> +++ b/drivers/block/xen-blkback/xenbus.c >> @@ -760,7 +760,7 @@ static int connect_ring(struct backend_info *be) >> return -1; >> } >> err = xenbus_gather(XBT_NIL, dev->otherend, >> - "feature-persistent-grants", "%u", >> + "feature-persistent", "%u", >> &pers_grants, NULL); >> if (err) >> pers_grants = 0; >> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c >> index 911d733..f1de806 100644 >> --- a/drivers/block/xen-blkfront.c >> +++ b/drivers/block/xen-blkfront.c >> @@ -852,6 +852,7 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, >> rq_for_each_segment(bvec, s->request, iter) { >> BUG_ON((bvec->bv_offset + bvec->bv_len) > PAGE_SIZE); >> i = offset >> PAGE_SHIFT; >> + BUG_ON(i >= s->req.u.rw.nr_segments); >> shared_data = kmap_atomic( >> pfn_to_page(s->grants_used[i]->pfn)); >> bvec_data = bvec_kmap_irq(bvec, &flags); >> @@ -1069,7 +1070,7 @@ again: >> goto abort_transaction; >> } >> err = xenbus_printf(xbt, dev->nodename, >> - "feature-persistent-grants", "%u", 1); >> + "feature-persistent", "%u", 1); >> if (err) >> dev_warn(&dev->dev, >> "writing persistent grants feature to xenbus"); >> -- >> 1.7.7.5 (Apple Git-26) >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 21:29:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 21:29:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUOnW-0002BX-AW; Fri, 02 Nov 2012 21:29:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUOnU-0002BS-Ln for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 21:29:00 +0000 Received: from [85.158.137.99:48931] by server-12.bemta-3.messagelabs.com id BD/2F-22757-71B34905; Fri, 02 Nov 2012 21:28:55 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351891733!16645611!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30341 invoked from network); 2 Nov 2012 21:28:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 21:28:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,701,1344211200"; d="scan'208";a="15564829" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 21:28:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 21:28:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUOnM-00006A-58; Fri, 02 Nov 2012 21:28:52 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUOnM-0005X3-1o; Fri, 02 Nov 2012 21:28:52 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 21:28:52 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14346: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14346 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14346/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-xl-winxpsp3-vcpus1 12 guest-localmigrate/x10 fail REGR. vs. 14337 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14337 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14337 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14337 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14337 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bf249cd5f2c1 ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Ian Jackson Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ changeset: 26127:bd78e5630a5b tag: tip user: Jan Beulich date: Fri Nov 02 17:15:30 2012 +0100 IOMMU: keep disabled until iommu_setup() is called The iommu is enabled by default when xen is booting and later disabled in iommu_setup() when no iommu is present. But under some circumstances iommu code can be called before iommu_setup() is processed. If there is no iommu available xen crashes. This can happen for example when panic(...) is called as introduced with the patch "x86-64: detect processors subject to AMD erratum #121 and refuse to boot" since xen 4.1.3, resulting in find_iommu_for_device() to be called in the context of disable_IO_APIC() / __stop_this_cpu(). This patch fixes this by keeping the iommu disabled until iommu_setup() is entered. Originally-by: Ronny Hegewald In order for iommu_enable to be off initially, iommu_supports_eim() must not depend on it anymore, nor must acpi_parse_dmar(). The former in turn requires that iommu_intremap gets uncoupled from iommu_enabled (in particular, failure during IOMMU setup should no longer result in iommu_intremap getting cleared by generic code; IOMMU specific code can still do so provided in can live with the consequences). This could have the nice side effect of allowing to use "iommu=off" even when x2APIC was pre-enabled by the BIOS (in which case interrupt remapping is a requirement, but DMA translation [obviously] isn't), but that doesn't currently work (and hence x2apic_bsp_setup() forces the IOMMU on rather than just interrupt remapping). For consistency with VT-d, make the AMD IOMMU code also skip all ACPI table parsing when neither iommu_enable nor iommu_intremap are set. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang Acked-by: "Huang2, Wei" changeset: 26126:cacdc787d11f user: Jan Beulich date: Fri Nov 02 16:15:53 2012 +0100 x86/mwait-idle: enable Ivy Bridge Xeon support Matching a similar change in Linux 3.7-rc. Signed-off-by: Jan Beulich Acked-by: Keir Fraser changeset: 26125:951d04441908 user: Jan Beulich date: Fri Nov 02 16:14:11 2012 +0100 ACPI/cpuidle: remove unused "power" field from Cx state data It has never been used for anything, and Linux 3.7 doesn't propagate this information anymore. Signed-off-by: Jan Beulich Acked-by: Keir Fraser changeset: 26124:bf249cd5f2c1 user: Ian Jackson date: Tue Oct 30 18:12:11 2012 +0000 autoconf: add file missing from 26123:f6d5b3bf74a8 This file was in 26123:f6d5b3bf74a8 as submitted but I failed to add it. Committed-by: Ian Jackson (qemu changes not included) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 02 21:29:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 02 Nov 2012 21:29:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUOnW-0002BX-AW; Fri, 02 Nov 2012 21:29:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUOnU-0002BS-Ln for xen-devel@lists.xensource.com; Fri, 02 Nov 2012 21:29:00 +0000 Received: from [85.158.137.99:48931] by server-12.bemta-3.messagelabs.com id BD/2F-22757-71B34905; Fri, 02 Nov 2012 21:28:55 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1351891733!16645611!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTY5ODk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30341 invoked from network); 2 Nov 2012 21:28:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 2 Nov 2012 21:28:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,701,1344211200"; d="scan'208";a="15564829" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 02 Nov 2012 21:28:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 2 Nov 2012 21:28:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUOnM-00006A-58; Fri, 02 Nov 2012 21:28:52 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUOnM-0005X3-1o; Fri, 02 Nov 2012 21:28:52 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 2 Nov 2012 21:28:52 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14346: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14346 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14346/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-xl-winxpsp3-vcpus1 12 guest-localmigrate/x10 fail REGR. vs. 14337 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14337 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14337 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14337 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14337 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bf249cd5f2c1 ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Ian Jackson Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ changeset: 26127:bd78e5630a5b tag: tip user: Jan Beulich date: Fri Nov 02 17:15:30 2012 +0100 IOMMU: keep disabled until iommu_setup() is called The iommu is enabled by default when xen is booting and later disabled in iommu_setup() when no iommu is present. But under some circumstances iommu code can be called before iommu_setup() is processed. If there is no iommu available xen crashes. This can happen for example when panic(...) is called as introduced with the patch "x86-64: detect processors subject to AMD erratum #121 and refuse to boot" since xen 4.1.3, resulting in find_iommu_for_device() to be called in the context of disable_IO_APIC() / __stop_this_cpu(). This patch fixes this by keeping the iommu disabled until iommu_setup() is entered. Originally-by: Ronny Hegewald In order for iommu_enable to be off initially, iommu_supports_eim() must not depend on it anymore, nor must acpi_parse_dmar(). The former in turn requires that iommu_intremap gets uncoupled from iommu_enabled (in particular, failure during IOMMU setup should no longer result in iommu_intremap getting cleared by generic code; IOMMU specific code can still do so provided in can live with the consequences). This could have the nice side effect of allowing to use "iommu=off" even when x2APIC was pre-enabled by the BIOS (in which case interrupt remapping is a requirement, but DMA translation [obviously] isn't), but that doesn't currently work (and hence x2apic_bsp_setup() forces the IOMMU on rather than just interrupt remapping). For consistency with VT-d, make the AMD IOMMU code also skip all ACPI table parsing when neither iommu_enable nor iommu_intremap are set. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang Acked-by: "Huang2, Wei" changeset: 26126:cacdc787d11f user: Jan Beulich date: Fri Nov 02 16:15:53 2012 +0100 x86/mwait-idle: enable Ivy Bridge Xeon support Matching a similar change in Linux 3.7-rc. Signed-off-by: Jan Beulich Acked-by: Keir Fraser changeset: 26125:951d04441908 user: Jan Beulich date: Fri Nov 02 16:14:11 2012 +0100 ACPI/cpuidle: remove unused "power" field from Cx state data It has never been used for anything, and Linux 3.7 doesn't propagate this information anymore. Signed-off-by: Jan Beulich Acked-by: Keir Fraser changeset: 26124:bf249cd5f2c1 user: Ian Jackson date: Tue Oct 30 18:12:11 2012 +0000 autoconf: add file missing from 26123:f6d5b3bf74a8 This file was in 26123:f6d5b3bf74a8 as submitted but I failed to add it. Committed-by: Ian Jackson (qemu changes not included) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSbV-0007De-UX; Sat, 03 Nov 2012 01:32:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSbU-0007DZ-23 for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 01:32:52 +0000 Received: from [85.158.137.99:4840] by server-11.bemta-3.messagelabs.com id B7/56-19361-34474905; Sat, 03 Nov 2012 01:32:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351906369!14379140!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcxMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30473 invoked from network); 3 Nov 2012 01:32:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:32:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,702,1344211200"; d="scan'208";a="15565724" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 01:32:48 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 01:32:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUSbQ-0001OL-AR; Sat, 03 Nov 2012 01:32:48 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUSbQ-000252-3j; Sat, 03 Nov 2012 01:32:48 +0000 To: Message-ID: From: xen.org Date: Sat, 3 Nov 2012 01:32:48 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14349: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14349 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14349/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14337 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14337 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14337 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14337 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bf249cd5f2c1 ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Ian Jackson Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=bd78e5630a5b + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable bd78e5630a5b + branch=xen-unstable + revision=bd78e5630a5b + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r bd78e5630a5b ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 11 changes to 10 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:33:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:33:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSbV-0007De-UX; Sat, 03 Nov 2012 01:32:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSbU-0007DZ-23 for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 01:32:52 +0000 Received: from [85.158.137.99:4840] by server-11.bemta-3.messagelabs.com id B7/56-19361-34474905; Sat, 03 Nov 2012 01:32:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1351906369!14379140!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcxMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30473 invoked from network); 3 Nov 2012 01:32:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:32:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,702,1344211200"; d="scan'208";a="15565724" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 01:32:48 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 01:32:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUSbQ-0001OL-AR; Sat, 03 Nov 2012 01:32:48 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUSbQ-000252-3j; Sat, 03 Nov 2012 01:32:48 +0000 To: Message-ID: From: xen.org Date: Sat, 3 Nov 2012 01:32:48 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14349: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14349 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14349/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14337 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14337 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14337 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14337 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bf249cd5f2c1 ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Ian Jackson Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=bd78e5630a5b + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable bd78e5630a5b + branch=xen-unstable + revision=bd78e5630a5b + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r bd78e5630a5b ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 11 changes to 10 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:39:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:39:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUShn-0007Rg-0t; Sat, 03 Nov 2012 01:39:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUShl-0007RY-EC for xen-devel@lists.xen.org; Sat, 03 Nov 2012 01:39:21 +0000 Received: from [193.109.254.147:44860] by server-11.bemta-14.messagelabs.com id 42/93-29027-8C574905; Sat, 03 Nov 2012 01:39:20 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-3.tower-27.messagelabs.com!1351906760!9532321!1 X-Originating-IP: [212.227.126.171] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32092 invoked from network); 3 Nov 2012 01:39:20 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.171) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:39:20 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lar3w-1T6NIq0eCW-00kr5a; Sat, 03 Nov 2012 02:39:16 +0100 From: Ronny Hegewald To: "Jan Beulich" Date: Sat, 3 Nov 2012 02:44:58 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <509400BD02000078000A6258@nat28.tlf.novell.com> In-Reply-To: <509400BD02000078000A6258@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211030244.58300.ronny.hegewald@online.de> X-Provags-ID: V02:K0:SBvkB/DtaPPykQf0R5pprrxVlSF2iyb+h34EzzVzQfT Z60HhczCHZteyudMVzwn5411ZjeETdshiRfOBDW6dipwv0BswZ H7vFocGFtGj2weCQXkY6TjzjejgI9pDUrzh9YfQo59rI89k6Yw P5gqMIVFFd4xXG+LNsGaxi1aoX0y2c7hPEz/f4bhlOGNecb+rm SafWbekY1OuzcBgO81z4Z9tP/klSXw3loXqU79504tim0fgYO7 OwDvoF26bq3XexD/eGEzXEZmCGF1IyF4OYSHCT1V6GBrDxF+iH bIhl0+1B0mHCXMfxFQh/vm+Bo9v+LRdmwuMPDmlaN4MBxawjNi 5xoez7fZKn+gKr4rmy3gznRpmPqEj+2SY6RHsRLkYxhKHDNxi9 Rpbydh4z05yiQ4G55CwYJF/CCS/US0yq14= Cc: wei.huang2@amd.com, weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > So after having got acks from both Intel and AMD, I committed > this to -unstable, but I'm rather hesitant to backport this onto the > 4.x branches (not the least because in the end this is just > cosmetic for the problem you reported - the box would not boot > in either case, just that with the patch it is more obvious why). Actually the affected box can still boot xen. But you have to add the "allow_unsafe" option to the boot-parameters, which you are informed about as long the intended panic message is printed. Without the patch their is just the crash and the stacktrace. But this problem seem only to hit some older AMD cpus for socket 754,939 and 940 (as noted in CVE-2012-2934), and i didnt find any other report on the web about this xen crash. So it looks minor enough to not trouble the stable-branches with it imho too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:39:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:39:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUShn-0007Rg-0t; Sat, 03 Nov 2012 01:39:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUShl-0007RY-EC for xen-devel@lists.xen.org; Sat, 03 Nov 2012 01:39:21 +0000 Received: from [193.109.254.147:44860] by server-11.bemta-14.messagelabs.com id 42/93-29027-8C574905; Sat, 03 Nov 2012 01:39:20 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-3.tower-27.messagelabs.com!1351906760!9532321!1 X-Originating-IP: [212.227.126.171] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32092 invoked from network); 3 Nov 2012 01:39:20 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.171) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:39:20 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lar3w-1T6NIq0eCW-00kr5a; Sat, 03 Nov 2012 02:39:16 +0100 From: Ronny Hegewald To: "Jan Beulich" Date: Sat, 3 Nov 2012 02:44:58 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <509400BD02000078000A6258@nat28.tlf.novell.com> In-Reply-To: <509400BD02000078000A6258@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211030244.58300.ronny.hegewald@online.de> X-Provags-ID: V02:K0:SBvkB/DtaPPykQf0R5pprrxVlSF2iyb+h34EzzVzQfT Z60HhczCHZteyudMVzwn5411ZjeETdshiRfOBDW6dipwv0BswZ H7vFocGFtGj2weCQXkY6TjzjejgI9pDUrzh9YfQo59rI89k6Yw P5gqMIVFFd4xXG+LNsGaxi1aoX0y2c7hPEz/f4bhlOGNecb+rm SafWbekY1OuzcBgO81z4Z9tP/klSXw3loXqU79504tim0fgYO7 OwDvoF26bq3XexD/eGEzXEZmCGF1IyF4OYSHCT1V6GBrDxF+iH bIhl0+1B0mHCXMfxFQh/vm+Bo9v+LRdmwuMPDmlaN4MBxawjNi 5xoez7fZKn+gKr4rmy3gznRpmPqEj+2SY6RHsRLkYxhKHDNxi9 Rpbydh4z05yiQ4G55CwYJF/CCS/US0yq14= Cc: wei.huang2@amd.com, weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > So after having got acks from both Intel and AMD, I committed > this to -unstable, but I'm rather hesitant to backport this onto the > 4.x branches (not the least because in the end this is just > cosmetic for the problem you reported - the box would not boot > in either case, just that with the patch it is more obvious why). Actually the affected box can still boot xen. But you have to add the "allow_unsafe" option to the boot-parameters, which you are informed about as long the intended panic message is printed. Without the patch their is just the crash and the stacktrace. But this problem seem only to hit some older AMD cpus for socket 754,939 and 940 (as noted in CVE-2012-2934), and i didnt find any other report on the web about this xen crash. So it looks minor enough to not trouble the stable-branches with it imho too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:51:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:51:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSsZ-0007cb-6W; Sat, 03 Nov 2012 01:50:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSsX-0007cW-Le for xen-devel@lists.xen.org; Sat, 03 Nov 2012 01:50:29 +0000 Received: from [85.158.143.99:15903] by server-3.bemta-4.messagelabs.com id F9/55-06841-46874905; Sat, 03 Nov 2012 01:50:28 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-10.tower-216.messagelabs.com!1351907427!22051069!1 X-Originating-IP: [212.227.126.171] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28594 invoked from network); 3 Nov 2012 01:50:27 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.171) by server-10.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:50:27 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MLC0j-1TUjzd0acz-000sPE; Sat, 03 Nov 2012 02:50:24 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Sat, 3 Nov 2012 02:55:37 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> <201211022101.08926.ronny.hegewald@online.de> In-Reply-To: <201211022101.08926.ronny.hegewald@online.de> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211030255.37630.ronny.hegewald@online.de> X-Provags-ID: V02:K0:fO/pff7CRVACYSedO3ZvGx49xB5gK+wQvbJJ5VoU9qd tTNZOFhHvv0DuAoFBgvUN5xVmslxcgr7RmwYeD+WIfQOzyu/Ke ZDsH9GhePl1V5KtI2zyXF+qdNX25HkcShVX1iRACFiYfOgiHS7 c0x8pAQHokCQRs3d6Y0AZy/E762O6me17LhtZgGJ5KJdDi5i57 izCEQMvVwoJ4wsiRB5nGkW8AvzDPMmX1M235+0DVsp4+cOC9PQ yT4Yu1KZ1rY3UfMM49iP7uJ6aOpVY95Go7ZK0rnrFR0kUwd5GP JTrYiHJYSJ5WW+wCYvFprDbhA7nzjUGlNp5PsNKH3QuuOWJl0G 3iPlwKa+NaLb2BwTXJePaLNhDzN+dH3XualIHdMqvvFAhlYtZk g/RD3nAjUDjE+wTuC9zIYWuMoZIClZKVa8= Cc: Ian Campbell Subject: Re: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > Signed-off-by: Ronny Hegewald@online.de > Somehow the sign off gone wrong. it was supposed to be Signed-off-by: Ronny Hegewald _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 01:51:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 01:51:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSsZ-0007cb-6W; Sat, 03 Nov 2012 01:50:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUSsX-0007cW-Le for xen-devel@lists.xen.org; Sat, 03 Nov 2012 01:50:29 +0000 Received: from [85.158.143.99:15903] by server-3.bemta-4.messagelabs.com id F9/55-06841-46874905; Sat, 03 Nov 2012 01:50:28 +0000 X-Env-Sender: ronny.hegewald@online.de X-Msg-Ref: server-10.tower-216.messagelabs.com!1351907427!22051069!1 X-Originating-IP: [212.227.126.171] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xNzEgPT4gNjM3NDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28594 invoked from network); 3 Nov 2012 01:50:27 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.171) by server-10.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 01:50:27 -0000 Received: from server2-groupware.localnet (kons-d9be1d83.pool.mediaWays.net [217.190.29.131]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MLC0j-1TUjzd0acz-000sPE; Sat, 03 Nov 2012 02:50:24 +0100 From: Ronny Hegewald To: xen-devel@lists.xen.org Date: Sat, 3 Nov 2012 02:55:37 +0000 User-Agent: KMail/1.11.4 (Linux/3.0.3; KDE/4.2.4; i686; ; ) References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> <201211022101.08926.ronny.hegewald@online.de> In-Reply-To: <201211022101.08926.ronny.hegewald@online.de> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201211030255.37630.ronny.hegewald@online.de> X-Provags-ID: V02:K0:fO/pff7CRVACYSedO3ZvGx49xB5gK+wQvbJJ5VoU9qd tTNZOFhHvv0DuAoFBgvUN5xVmslxcgr7RmwYeD+WIfQOzyu/Ke ZDsH9GhePl1V5KtI2zyXF+qdNX25HkcShVX1iRACFiYfOgiHS7 c0x8pAQHokCQRs3d6Y0AZy/E762O6me17LhtZgGJ5KJdDi5i57 izCEQMvVwoJ4wsiRB5nGkW8AvzDPMmX1M235+0DVsp4+cOC9PQ yT4Yu1KZ1rY3UfMM49iP7uJ6aOpVY95Go7ZK0rnrFR0kUwd5GP JTrYiHJYSJ5WW+wCYvFprDbhA7nzjUGlNp5PsNKH3QuuOWJl0G 3iPlwKa+NaLb2BwTXJePaLNhDzN+dH3XualIHdMqvvFAhlYtZk g/RD3nAjUDjE+wTuC9zIYWuMoZIClZKVa8= Cc: Ian Campbell Subject: Re: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > Signed-off-by: Ronny Hegewald@online.de > Somehow the sign off gone wrong. it was supposed to be Signed-off-by: Ronny Hegewald _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 05:36:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 05:36:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUWP0-0000WQ-6c; Sat, 03 Nov 2012 05:36:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUWOy-0000WL-MM for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 05:36:12 +0000 Received: from [85.158.139.83:15033] by server-8.bemta-5.messagelabs.com id 98/2F-06050-B4DA4905; Sat, 03 Nov 2012 05:36:11 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1351920971!25854727!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcxMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7907 invoked from network); 3 Nov 2012 05:36:11 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 05:36:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,704,1344211200"; d="scan'208";a="15566711" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 05:36:10 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 05:36:09 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUWOw-0002gM-00; Sat, 03 Nov 2012 05:36:10 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUWOv-00082J-Jp; Sat, 03 Nov 2012 05:36:09 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Sat, 3 Nov 2012 05:36:09 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14352: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14352 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14352/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14349 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14349 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14349 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14349 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 05:36:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 05:36:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUWP0-0000WQ-6c; Sat, 03 Nov 2012 05:36:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUWOy-0000WL-MM for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 05:36:12 +0000 Received: from [85.158.139.83:15033] by server-8.bemta-5.messagelabs.com id 98/2F-06050-B4DA4905; Sat, 03 Nov 2012 05:36:11 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1351920971!25854727!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcxMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7907 invoked from network); 3 Nov 2012 05:36:11 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 05:36:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,704,1344211200"; d="scan'208";a="15566711" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 05:36:10 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 05:36:09 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUWOw-0002gM-00; Sat, 03 Nov 2012 05:36:10 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUWOv-00082J-Jp; Sat, 03 Nov 2012 05:36:09 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Sat, 3 Nov 2012 05:36:09 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14352: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14352 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14352/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14349 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14349 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14349 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14349 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 12:17:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 12:17:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUceh-0002ow-Rb; Sat, 03 Nov 2012 12:16:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUceg-0002or-BZ for xen-devel@lists.xen.org; Sat, 03 Nov 2012 12:16:50 +0000 Received: from [85.158.139.83:24960] by server-3.bemta-5.messagelabs.com id F8/62-18736-13B05905; Sat, 03 Nov 2012 12:16:49 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1351945008!28622184!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI2OTMw\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4194 invoked from network); 3 Nov 2012 12:16:48 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-5.tower-182.messagelabs.com with SMTP; 3 Nov 2012 12:16:48 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 03 Nov 2012 05:16:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,705,1344236400"; d="scan'208";a="164103494" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by AZSMGA002.ch.intel.com with ESMTP; 03 Nov 2012 05:16:46 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.19.9.28) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sat, 3 Nov 2012 05:16:46 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.19.9.28) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sat, 3 Nov 2012 05:16:46 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Sat, 3 Nov 2012 20:16:44 +0800 From: "Liu, Jinsong" To: Jan Beulich , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNuRoMTi91BiFLfUibRvXA4zlK85fX//8g Date: Sat, 3 Nov 2012 12:16:44 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: <20121102164937.GC27213@konrad-lan.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Konrad Rzeszutek Wilk wrote: >>> From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 >>> 2001 >> From: Liu, Jinsong >> Date: Thu, 1 Nov 2012 21:02:36 +0800 >> Subject: [PATCH 1/2] Xen acpi pad implement >> >> PAD is acpi Processor Aggregator Device which provides a control >> point >> that enables the platform to perform specific processor configuration >> and control that applies to all processors in the platform. >> >> This patch is to implement Xen acpi pad logic. When running under Xen >> virt platform, native pad driver would not work. Instead Xen pad >> driver, >> a self-contained and very thin logic level, would take over acpi pad >> staff. When acpi pad notify OSPM, xen pad logic intercept and parse >> _PUR object >> and then hypercall to hyervisor for the rest work, say, core parking. > > Two comments: > - Did you look at the SuSE tree? Jan mentioned that they did some > fixes? Did you carry them over? I didn't look at Suse tree. Jan, would you please tell me where can I pull Suse tree? have you implemented xen-acpi-pad logic at Suse dom0 and which points you have fixed? > - The init function should not make hypercalls before checking if it > in facts run under Xen. OK. >> + >> +static const struct acpi_device_id pad_device_ids[] = { >> + {"ACPI000C", 0}, + {"", 0}, >> +}; >> + >> +static struct acpi_driver xen_acpi_pad_driver = { >> + .name = "processor_aggregator", >> + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, >> + .ids = pad_device_ids, >> + .ops = { >> + .add = xen_acpi_pad_add, >> + .remove = xen_acpi_pad_remove, >> + }, >> +}; >> + >> +static int __init xen_acpi_pad_init(void) >> +{ >> + int ret = -ENOSYS; >> + unsigned int version = HYPERVISOR_xen_version(XENVER_version, >> NULL); > > Heh. so if you run this on baremetal I wonder what will happen. > >> + unsigned int major = version >> 16; >> + unsigned int minor = version & 0xffff; >> + >> + /* Only DOM0 is responsible for Xen acpi pad */ >> + if (!xen_initial_domain()) >> + return -ENODEV; >> + > > I think the check for version should happen here. Got it, will update later. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 12:17:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 12:17:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUceh-0002ow-Rb; Sat, 03 Nov 2012 12:16:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUceg-0002or-BZ for xen-devel@lists.xen.org; Sat, 03 Nov 2012 12:16:50 +0000 Received: from [85.158.139.83:24960] by server-3.bemta-5.messagelabs.com id F8/62-18736-13B05905; Sat, 03 Nov 2012 12:16:49 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1351945008!28622184!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI2OTMw\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4194 invoked from network); 3 Nov 2012 12:16:48 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-5.tower-182.messagelabs.com with SMTP; 3 Nov 2012 12:16:48 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 03 Nov 2012 05:16:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,705,1344236400"; d="scan'208";a="164103494" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by AZSMGA002.ch.intel.com with ESMTP; 03 Nov 2012 05:16:46 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.19.9.28) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sat, 3 Nov 2012 05:16:46 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.19.9.28) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sat, 3 Nov 2012 05:16:46 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Sat, 3 Nov 2012 20:16:44 +0800 From: "Liu, Jinsong" To: Jan Beulich , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNuRoMTi91BiFLfUibRvXA4zlK85fX//8g Date: Sat, 3 Nov 2012 12:16:44 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: <20121102164937.GC27213@konrad-lan.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Konrad Rzeszutek Wilk wrote: >>> From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 >>> 2001 >> From: Liu, Jinsong >> Date: Thu, 1 Nov 2012 21:02:36 +0800 >> Subject: [PATCH 1/2] Xen acpi pad implement >> >> PAD is acpi Processor Aggregator Device which provides a control >> point >> that enables the platform to perform specific processor configuration >> and control that applies to all processors in the platform. >> >> This patch is to implement Xen acpi pad logic. When running under Xen >> virt platform, native pad driver would not work. Instead Xen pad >> driver, >> a self-contained and very thin logic level, would take over acpi pad >> staff. When acpi pad notify OSPM, xen pad logic intercept and parse >> _PUR object >> and then hypercall to hyervisor for the rest work, say, core parking. > > Two comments: > - Did you look at the SuSE tree? Jan mentioned that they did some > fixes? Did you carry them over? I didn't look at Suse tree. Jan, would you please tell me where can I pull Suse tree? have you implemented xen-acpi-pad logic at Suse dom0 and which points you have fixed? > - The init function should not make hypercalls before checking if it > in facts run under Xen. OK. >> + >> +static const struct acpi_device_id pad_device_ids[] = { >> + {"ACPI000C", 0}, + {"", 0}, >> +}; >> + >> +static struct acpi_driver xen_acpi_pad_driver = { >> + .name = "processor_aggregator", >> + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, >> + .ids = pad_device_ids, >> + .ops = { >> + .add = xen_acpi_pad_add, >> + .remove = xen_acpi_pad_remove, >> + }, >> +}; >> + >> +static int __init xen_acpi_pad_init(void) >> +{ >> + int ret = -ENOSYS; >> + unsigned int version = HYPERVISOR_xen_version(XENVER_version, >> NULL); > > Heh. so if you run this on baremetal I wonder what will happen. > >> + unsigned int major = version >> 16; >> + unsigned int minor = version & 0xffff; >> + >> + /* Only DOM0 is responsible for Xen acpi pad */ >> + if (!xen_initial_domain()) >> + return -ENODEV; >> + > > I think the check for version should happen here. Got it, will update later. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 15:25:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 15:25:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUfaI-0003Wb-V1; Sat, 03 Nov 2012 15:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUfaH-0003WW-GR for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 15:24:29 +0000 Received: from [85.158.139.211:61922] by server-14.bemta-5.messagelabs.com id B3/5D-21768-C2735905; Sat, 03 Nov 2012 15:24:28 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1351956267!18758938!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyMzQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31194 invoked from network); 3 Nov 2012 15:24:27 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 15:24:27 -0000 X-IronPort-AV: E=Sophos;i="4.80,705,1344211200"; d="scan'208";a="15569188" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 15:24:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 15:24:26 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUfaE-000657-ED; Sat, 03 Nov 2012 15:24:26 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUfaE-0000xz-0t; Sat, 03 Nov 2012 15:24:26 +0000 To: Message-ID: From: xen.org Date: Sat, 3 Nov 2012 15:24:26 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14354: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14354 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14354/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14199 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14199 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14199 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=linux-3.0 + revision=27d0858dbcf199838b8c50a3e94d397bf326d986 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push linux-3.0 27d0858dbcf199838b8c50a3e94d397bf326d986 + branch=linux-3.0 + revision=27d0858dbcf199838b8c50a3e94d397bf326d986 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=linux + xenbranch=xen-unstable + '[' xlinux = xlinux ']' + linuxbranch=linux-3.0 + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.linux-3.0 ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.linux-3.0 + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree linux-3.0 + case $1 in + : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + : linux-3.0.y + : linux-3.0.y + : git + : git + : git://xenbits.xen.org/linux-pvops.git + : xen@xenbits.xensource.com:git/linux-pvops.git + : tested/linux-3.0 + : tested/linux-3.0 + return 0 + cd /export/home/osstest/repos/linux + git push xen@xenbits.xensource.com:git/linux-pvops.git 27d0858dbcf199838b8c50a3e94d397bf326d986:tested/linux-3.0 Counting objects: 1 Counting objects: 255, done. Compressing objects: 2% (1/36) Compressing objects: 5% (2/36) Compressing objects: 8% (3/36) Compressing objects: 11% (4/36) Compressing objects: 13% (5/36) Compressing objects: 16% (6/36) Compressing objects: 19% (7/36) Compressing objects: 22% (8/36) Compressing objects: 25% (9/36) Compressing objects: 27% (10/36) Compressing objects: 30% (11/36) Compressing objects: 33% (12/36) Compressing objects: 36% (13/36) Compressing objects: 38% (14/36) Compressing objects: 41% (15/36) Compressing objects: 44% (16/36) Compressing objects: 47% (17/36) Compressing objects: 50% (18/36) Compressing objects: 52% (19/36) Compressing objects: 55% (20/36) Compressing objects: 58% (21/36) Compressing objects: 61% (22/36) Compressing objects: 63% (23/36) Compressing objects: 66% (24/36) Compressing objects: 69% (25/36) Compressing objects: 72% (26/36) Compressing objects: 75% (27/36) Compressing objects: 77% (28/36) Compressing objects: 80% (29/36) Compressing objects: 83% (30/36) Compressing objects: 86% (31/36) Compressing objects: 88% (32/36) Compressing objects: 91% (33/36) Compressing objects: 94% (34/36) Compressing objects: 97% (35/36) Compressing objects: 100% (36/36) Compressing objects: 100% (36/36), done. Writing objects: 0% (1/197) Writing objects: 1% (2/197) Writing objects: 2% (4/197) Writing objects: 3% (6/197) Writing objects: 4% (8/197) Writing objects: 5% (10/197) Writing objects: 6% (12/197) Writing objects: 7% (14/197) Writing objects: 8% (16/197) Writing objects: 9% (18/197) Writing objects: 10% (20/197) Writing objects: 11% (22/197) Writing objects: 12% (24/197) Writing objects: 13% (26/197) Writing objects: 14% (28/197) Writing objects: 15% (30/197) Writing objects: 16% (32/197) Writing objects: 17% (34/197) Writing objects: 18% (36/197) Writing objects: 19% (38/197) Writing objects: 20% (40/197) Writing objects: 21% (42/197) Writing objects: 22% (44/197) Writing objects: 23% (46/197) Writing objects: 24% (48/197) Writing objects: 25% (51/197) Writing objects: 26% (52/197) Writing objects: 27% (54/197) Writing objects: 28% (56/197) Writing objects: 29% (58/197) Writing objects: 30% (60/197) Writing objects: 31% (62/197) Writing objects: 32% (64/197) Writing objects: 33% (66/197) Writing objects: 34% (67/197) Writing objects: 35% (69/197) Writing objects: 36% (71/197) Writing objects: 37% (73/197) Writing objects: 38% (76/197) Writing objects: 39% (77/197) Writing objects: 40% (79/197) Writing objects: 41% (81/197) Writing objects: 42% (83/197) Writing objects: 43% (85/197) Writing objects: 44% (87/197) Writing objects: 45% (89/197) Writing objects: 46% (91/197) Writing objects: 47% (93/197) Writing objects: 48% (95/197) Writing objects: 49% (97/197) Writing objects: 50% (99/197) Writing objects: 51% (101/197) Writing objects: 52% (103/197) Writing objects: 53% (105/197) Writing objects: 54% (107/197) Writing objects: 55% (109/197) Writing objects: 56% (111/197) Writing objects: 57% (113/197) Writing objects: 58% (115/197) Writing objects: 59% (117/197) Writing objects: 60% (119/197) Writing objects: 61% (121/197) Writing objects: 62% (123/197) Writing objects: 63% (125/197) Writing objects: 64% (127/197) Writing objects: 65% (129/197) Writing objects: 66% (131/197) Writing objects: 67% (132/197) Writing objects: 68% (134/197) Writing objects: 69% (136/197) Writing objects: 70% (138/197) Writing objects: 71% (140/197) Writing objects: 72% (142/197) Writing objects: 73% (144/197) Writing objects: 74% (146/197) Writing objects: 75% (148/197) Writing objects: 76% (150/197) Writing objects: 77% (152/197) Writing objects: 78% (154/197) Writing objects: 79% (156/197) Writing objects: 80% (158/197) Writing objects: 81% (160/197) Writing objects: 82% (162/197) Writing objects: 83% (164/197) Writing objects: 84% (166/197) Writing objects: 85% (168/197) Writing objects: 86% (170/197) Writing objects: 87% (172/197) Writing objects: 88% (174/197) Writing objects: 89% (176/197) Writing objects: 90% (178/197) Writing objects: 91% (180/197) Writing objects: 92% (182/197) Writing objects: 93% (184/197) Writing objects: 94% (186/197) Writing objects: 95% (188/197) Writing objects: 96% (190/197) Writing objects: 97% (192/197) Writing objects: 98% (194/197) Writing objects: 99% (196/197) Writing objects: 100% (197/197) Writing objects: 100% (197/197), 32.90 KiB, done. Total 197 (delta 161), reused 189 (delta 161) To xen@xenbits.xensource.com:git/linux-pvops.git d9ee258..27d0858 27d0858dbcf199838b8c50a3e94d397bf326d986 -> tested/linux-3.0 + exit 0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 03 15:25:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 03 Nov 2012 15:25:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUfaI-0003Wb-V1; Sat, 03 Nov 2012 15:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUfaH-0003WW-GR for xen-devel@lists.xensource.com; Sat, 03 Nov 2012 15:24:29 +0000 Received: from [85.158.139.211:61922] by server-14.bemta-5.messagelabs.com id B3/5D-21768-C2735905; Sat, 03 Nov 2012 15:24:28 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1351956267!18758938!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyMzQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31194 invoked from network); 3 Nov 2012 15:24:27 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 3 Nov 2012 15:24:27 -0000 X-IronPort-AV: E=Sophos;i="4.80,705,1344211200"; d="scan'208";a="15569188" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 03 Nov 2012 15:24:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 3 Nov 2012 15:24:26 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUfaE-000657-ED; Sat, 03 Nov 2012 15:24:26 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUfaE-0000xz-0t; Sat, 03 Nov 2012 15:24:26 +0000 To: Message-ID: From: xen.org Date: Sat, 3 Nov 2012 15:24:26 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14354: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14354 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14354/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14199 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14199 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14199 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14199 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 baseline version: linux d9ee258b13506301b6da6450cf7a1692826b471e ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=linux-3.0 + revision=27d0858dbcf199838b8c50a3e94d397bf326d986 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push linux-3.0 27d0858dbcf199838b8c50a3e94d397bf326d986 + branch=linux-3.0 + revision=27d0858dbcf199838b8c50a3e94d397bf326d986 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=linux + xenbranch=xen-unstable + '[' xlinux = xlinux ']' + linuxbranch=linux-3.0 + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.linux-3.0 ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.linux-3.0 + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree linux-3.0 + case $1 in + : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + : linux-3.0.y + : linux-3.0.y + : git + : git + : git://xenbits.xen.org/linux-pvops.git + : xen@xenbits.xensource.com:git/linux-pvops.git + : tested/linux-3.0 + : tested/linux-3.0 + return 0 + cd /export/home/osstest/repos/linux + git push xen@xenbits.xensource.com:git/linux-pvops.git 27d0858dbcf199838b8c50a3e94d397bf326d986:tested/linux-3.0 Counting objects: 1 Counting objects: 255, done. Compressing objects: 2% (1/36) Compressing objects: 5% (2/36) Compressing objects: 8% (3/36) Compressing objects: 11% (4/36) Compressing objects: 13% (5/36) Compressing objects: 16% (6/36) Compressing objects: 19% (7/36) Compressing objects: 22% (8/36) Compressing objects: 25% (9/36) Compressing objects: 27% (10/36) Compressing objects: 30% (11/36) Compressing objects: 33% (12/36) Compressing objects: 36% (13/36) Compressing objects: 38% (14/36) Compressing objects: 41% (15/36) Compressing objects: 44% (16/36) Compressing objects: 47% (17/36) Compressing objects: 50% (18/36) Compressing objects: 52% (19/36) Compressing objects: 55% (20/36) Compressing objects: 58% (21/36) Compressing objects: 61% (22/36) Compressing objects: 63% (23/36) Compressing objects: 66% (24/36) Compressing objects: 69% (25/36) Compressing objects: 72% (26/36) Compressing objects: 75% (27/36) Compressing objects: 77% (28/36) Compressing objects: 80% (29/36) Compressing objects: 83% (30/36) Compressing objects: 86% (31/36) Compressing objects: 88% (32/36) Compressing objects: 91% (33/36) Compressing objects: 94% (34/36) Compressing objects: 97% (35/36) Compressing objects: 100% (36/36) Compressing objects: 100% (36/36), done. Writing objects: 0% (1/197) Writing objects: 1% (2/197) Writing objects: 2% (4/197) Writing objects: 3% (6/197) Writing objects: 4% (8/197) Writing objects: 5% (10/197) Writing objects: 6% (12/197) Writing objects: 7% (14/197) Writing objects: 8% (16/197) Writing objects: 9% (18/197) Writing objects: 10% (20/197) Writing objects: 11% (22/197) Writing objects: 12% (24/197) Writing objects: 13% (26/197) Writing objects: 14% (28/197) Writing objects: 15% (30/197) Writing objects: 16% (32/197) Writing objects: 17% (34/197) Writing objects: 18% (36/197) Writing objects: 19% (38/197) Writing objects: 20% (40/197) Writing objects: 21% (42/197) Writing objects: 22% (44/197) Writing objects: 23% (46/197) Writing objects: 24% (48/197) Writing objects: 25% (51/197) Writing objects: 26% (52/197) Writing objects: 27% (54/197) Writing objects: 28% (56/197) Writing objects: 29% (58/197) Writing objects: 30% (60/197) Writing objects: 31% (62/197) Writing objects: 32% (64/197) Writing objects: 33% (66/197) Writing objects: 34% (67/197) Writing objects: 35% (69/197) Writing objects: 36% (71/197) Writing objects: 37% (73/197) Writing objects: 38% (76/197) Writing objects: 39% (77/197) Writing objects: 40% (79/197) Writing objects: 41% (81/197) Writing objects: 42% (83/197) Writing objects: 43% (85/197) Writing objects: 44% (87/197) Writing objects: 45% (89/197) Writing objects: 46% (91/197) Writing objects: 47% (93/197) Writing objects: 48% (95/197) Writing objects: 49% (97/197) Writing objects: 50% (99/197) Writing objects: 51% (101/197) Writing objects: 52% (103/197) Writing objects: 53% (105/197) Writing objects: 54% (107/197) Writing objects: 55% (109/197) Writing objects: 56% (111/197) Writing objects: 57% (113/197) Writing objects: 58% (115/197) Writing objects: 59% (117/197) Writing objects: 60% (119/197) Writing objects: 61% (121/197) Writing objects: 62% (123/197) Writing objects: 63% (125/197) Writing objects: 64% (127/197) Writing objects: 65% (129/197) Writing objects: 66% (131/197) Writing objects: 67% (132/197) Writing objects: 68% (134/197) Writing objects: 69% (136/197) Writing objects: 70% (138/197) Writing objects: 71% (140/197) Writing objects: 72% (142/197) Writing objects: 73% (144/197) Writing objects: 74% (146/197) Writing objects: 75% (148/197) Writing objects: 76% (150/197) Writing objects: 77% (152/197) Writing objects: 78% (154/197) Writing objects: 79% (156/197) Writing objects: 80% (158/197) Writing objects: 81% (160/197) Writing objects: 82% (162/197) Writing objects: 83% (164/197) Writing objects: 84% (166/197) Writing objects: 85% (168/197) Writing objects: 86% (170/197) Writing objects: 87% (172/197) Writing objects: 88% (174/197) Writing objects: 89% (176/197) Writing objects: 90% (178/197) Writing objects: 91% (180/197) Writing objects: 92% (182/197) Writing objects: 93% (184/197) Writing objects: 94% (186/197) Writing objects: 95% (188/197) Writing objects: 96% (190/197) Writing objects: 97% (192/197) Writing objects: 98% (194/197) Writing objects: 99% (196/197) Writing objects: 100% (197/197) Writing objects: 100% (197/197), 32.90 KiB, done. Total 197 (delta 161), reused 189 (delta 161) To xen@xenbits.xensource.com:git/linux-pvops.git d9ee258..27d0858 27d0858dbcf199838b8c50a3e94d397bf326d986 -> tested/linux-3.0 + exit 0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 05:37:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 05:37:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUssu-0002Z9-Nt; Sun, 04 Nov 2012 05:36:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUsst-0002Z4-GJ for xen-devel@lists.xensource.com; Sun, 04 Nov 2012 05:36:35 +0000 Received: from [85.158.137.99:40834] by server-10.bemta-3.messagelabs.com id E0/5F-19806-2EEF5905; Sun, 04 Nov 2012 05:36:34 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352007393!17637818!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11156 invoked from network); 4 Nov 2012 05:36:33 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 05:36:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,707,1344211200"; d="scan'208";a="15571230" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 04 Nov 2012 05:36:32 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 4 Nov 2012 05:36:31 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUssq-00026F-3y; Sun, 04 Nov 2012 05:36:32 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUssp-0002l7-OA; Sun, 04 Nov 2012 05:36:31 +0000 To: Message-ID: From: xen.org Date: Sun, 4 Nov 2012 05:36:31 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14359: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14359 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14359/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail pass in 14352 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14352 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14352 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14352 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail in 14352 like 14349 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 05:37:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 05:37:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUssu-0002Z9-Nt; Sun, 04 Nov 2012 05:36:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TUsst-0002Z4-GJ for xen-devel@lists.xensource.com; Sun, 04 Nov 2012 05:36:35 +0000 Received: from [85.158.137.99:40834] by server-10.bemta-3.messagelabs.com id E0/5F-19806-2EEF5905; Sun, 04 Nov 2012 05:36:34 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352007393!17637818!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyMzU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11156 invoked from network); 4 Nov 2012 05:36:33 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 05:36:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,707,1344211200"; d="scan'208";a="15571230" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 04 Nov 2012 05:36:32 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 4 Nov 2012 05:36:31 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TUssq-00026F-3y; Sun, 04 Nov 2012 05:36:32 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TUssp-0002l7-OA; Sun, 04 Nov 2012 05:36:31 +0000 To: Message-ID: From: xen.org Date: Sun, 4 Nov 2012 05:36:31 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14359: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14359 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14359/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail pass in 14352 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14352 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14352 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14352 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail in 14352 like 14349 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 16:18:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 16:18:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV2tC-0006Dc-60; Sun, 04 Nov 2012 16:17:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV2tA-0006DX-9x for xen-devel@lists.xen.org; Sun, 04 Nov 2012 16:17:32 +0000 Received: from [85.158.138.51:13699] by server-15.bemta-3.messagelabs.com id BD/B3-09445-B1596905; Sun, 04 Nov 2012 16:17:31 +0000 X-Env-Sender: weiwang.dd@gmail.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352045849!28550078!1 X-Originating-IP: [209.85.216.52] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24862 invoked from network); 4 Nov 2012 16:17:30 -0000 Received: from mail-qa0-f52.google.com (HELO mail-qa0-f52.google.com) (209.85.216.52) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 16:17:30 -0000 Received: by mail-qa0-f52.google.com with SMTP id g14so638233qab.11 for ; Sun, 04 Nov 2012 08:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ggWqyqUSEqFWFuaLKTYHWZ6Ko8NSXTdTy34F6xjHRNk=; b=uuqCvkYgZ55TmT9iKF216LArKH8PMC/mobzHUf6aaEygpDGRk/v5+R/XeEJ4pIQ28Z rzAzG0xACfZY2WVguPfZ7WfnWq2BIMBoiuGJNLZHFZItSY/1CnFcVjgfDFyWaXruyla7 FicDwXRCy+aeBUb7diEyUBrQYcEnS3A7Uy63EqXaYVho1/XjpwsZcGx3nB0Vubw6ddgO mbLdbf0loAiKF3JO8+VZSozyfN2Ns+dBKCVrCzELhdtt7TlG8m9IAqVsMwP3aIQ5fYuq wgzT+QBaJl/xtIm+y3Nq2gDpWXdLzsZZkrtXZHmlq0z26kjI7/C8NMf1RoY6tIwd6onM zjTg== MIME-Version: 1.0 Received: by 10.49.48.135 with SMTP id l7mr12799991qen.23.1352045849092; Sun, 04 Nov 2012 08:17:29 -0800 (PST) Received: by 10.49.105.101 with HTTP; Sun, 4 Nov 2012 08:17:29 -0800 (PST) In-Reply-To: <201211030244.58300.ronny.hegewald@online.de> References: <509400BD02000078000A6258@nat28.tlf.novell.com> <201211030244.58300.ronny.hegewald@online.de> Date: Sun, 4 Nov 2012 17:17:29 +0100 Message-ID: From: Wei Wang To: Ronny Hegewald Cc: wei.huang2@amd.com, xiantao.zhang@intel.com, Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============2616562728962901098==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============2616562728962901098== Content-Type: multipart/alternative; boundary=047d7b677abc8e229304cdadb44d --047d7b677abc8e229304cdadb44d Content-Type: text/plain; charset=ISO-8859-1 Acked-by: Wei Wang weiwang.dd@gmail.com and sorry for late reply. Thanks, Wei 2012/11/3 Ronny Hegewald > > So after having got acks from both Intel and AMD, I committed > > this to -unstable, but I'm rather hesitant to backport this onto the > > 4.x branches (not the least because in the end this is just > > cosmetic for the problem you reported - the box would not boot > > in either case, just that with the patch it is more obvious why). > > Actually the affected box can still boot xen. But you have to add the > "allow_unsafe" option to the boot-parameters, which you are informed about > as > long the intended panic message is printed. > > Without the patch their is just the crash and the stacktrace. > > But this problem seem only to hit some older AMD cpus for socket 754,939 > and > 940 (as noted in CVE-2012-2934), and i didnt find any other report on the > web > about this xen crash. > > So it looks minor enough to not trouble the stable-branches with it imho > too. > > --047d7b677abc8e229304cdadb44d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Acked-by: Wei Wang weiwang.dd@= gmail.com
and sorry for late reply.
=A0
T= hanks,
Wei
2012/11/3 Ronny Hegewald = <ronny.hegewald@online.de>
> So after having got acks from both = Intel and AMD, I committed
> this to -unstable, but I'm rather hesitant to backport this onto t= he
> 4.x branches (not the least because in the end this is just
> cosmetic for the problem you reported - the box would not boot
> in either case, just that with the patch it is more obvious why).

Actually the affected box can still boot xen. But you have to add the=
"allow_unsafe" option to the boot-parameters, which you are infor= med about as
long the intended panic message is printed.

Without the patch their is just the crash and the stacktrace.

But this problem seem only to hit some older AMD cpus for socket 754,939 an= d
940 (as noted in CVE-2012-2934), and i didnt find any other report on the w= eb
about this xen crash.

So it looks minor enough to not trouble the stable-branches with it imho to= o.


--047d7b677abc8e229304cdadb44d-- --===============2616562728962901098== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============2616562728962901098==-- From xen-devel-bounces@lists.xen.org Sun Nov 04 16:18:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 16:18:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV2tC-0006Dc-60; Sun, 04 Nov 2012 16:17:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV2tA-0006DX-9x for xen-devel@lists.xen.org; Sun, 04 Nov 2012 16:17:32 +0000 Received: from [85.158.138.51:13699] by server-15.bemta-3.messagelabs.com id BD/B3-09445-B1596905; Sun, 04 Nov 2012 16:17:31 +0000 X-Env-Sender: weiwang.dd@gmail.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352045849!28550078!1 X-Originating-IP: [209.85.216.52] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24862 invoked from network); 4 Nov 2012 16:17:30 -0000 Received: from mail-qa0-f52.google.com (HELO mail-qa0-f52.google.com) (209.85.216.52) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 16:17:30 -0000 Received: by mail-qa0-f52.google.com with SMTP id g14so638233qab.11 for ; Sun, 04 Nov 2012 08:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=ggWqyqUSEqFWFuaLKTYHWZ6Ko8NSXTdTy34F6xjHRNk=; b=uuqCvkYgZ55TmT9iKF216LArKH8PMC/mobzHUf6aaEygpDGRk/v5+R/XeEJ4pIQ28Z rzAzG0xACfZY2WVguPfZ7WfnWq2BIMBoiuGJNLZHFZItSY/1CnFcVjgfDFyWaXruyla7 FicDwXRCy+aeBUb7diEyUBrQYcEnS3A7Uy63EqXaYVho1/XjpwsZcGx3nB0Vubw6ddgO mbLdbf0loAiKF3JO8+VZSozyfN2Ns+dBKCVrCzELhdtt7TlG8m9IAqVsMwP3aIQ5fYuq wgzT+QBaJl/xtIm+y3Nq2gDpWXdLzsZZkrtXZHmlq0z26kjI7/C8NMf1RoY6tIwd6onM zjTg== MIME-Version: 1.0 Received: by 10.49.48.135 with SMTP id l7mr12799991qen.23.1352045849092; Sun, 04 Nov 2012 08:17:29 -0800 (PST) Received: by 10.49.105.101 with HTTP; Sun, 4 Nov 2012 08:17:29 -0800 (PST) In-Reply-To: <201211030244.58300.ronny.hegewald@online.de> References: <509400BD02000078000A6258@nat28.tlf.novell.com> <201211030244.58300.ronny.hegewald@online.de> Date: Sun, 4 Nov 2012 17:17:29 +0100 Message-ID: From: Wei Wang To: Ronny Hegewald Cc: wei.huang2@amd.com, xiantao.zhang@intel.com, Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH v3] IOMMU: keep disabled until iommu_setup() is called X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============2616562728962901098==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============2616562728962901098== Content-Type: multipart/alternative; boundary=047d7b677abc8e229304cdadb44d --047d7b677abc8e229304cdadb44d Content-Type: text/plain; charset=ISO-8859-1 Acked-by: Wei Wang weiwang.dd@gmail.com and sorry for late reply. Thanks, Wei 2012/11/3 Ronny Hegewald > > So after having got acks from both Intel and AMD, I committed > > this to -unstable, but I'm rather hesitant to backport this onto the > > 4.x branches (not the least because in the end this is just > > cosmetic for the problem you reported - the box would not boot > > in either case, just that with the patch it is more obvious why). > > Actually the affected box can still boot xen. But you have to add the > "allow_unsafe" option to the boot-parameters, which you are informed about > as > long the intended panic message is printed. > > Without the patch their is just the crash and the stacktrace. > > But this problem seem only to hit some older AMD cpus for socket 754,939 > and > 940 (as noted in CVE-2012-2934), and i didnt find any other report on the > web > about this xen crash. > > So it looks minor enough to not trouble the stable-branches with it imho > too. > > --047d7b677abc8e229304cdadb44d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Acked-by: Wei Wang weiwang.dd@= gmail.com
and sorry for late reply.
=A0
T= hanks,
Wei
2012/11/3 Ronny Hegewald = <ronny.hegewald@online.de>
> So after having got acks from both = Intel and AMD, I committed
> this to -unstable, but I'm rather hesitant to backport this onto t= he
> 4.x branches (not the least because in the end this is just
> cosmetic for the problem you reported - the box would not boot
> in either case, just that with the patch it is more obvious why).

Actually the affected box can still boot xen. But you have to add the=
"allow_unsafe" option to the boot-parameters, which you are infor= med about as
long the intended panic message is printed.

Without the patch their is just the crash and the stacktrace.

But this problem seem only to hit some older AMD cpus for socket 754,939 an= d
940 (as noted in CVE-2012-2934), and i didnt find any other report on the w= eb
about this xen crash.

So it looks minor enough to not trouble the stable-branches with it imho to= o.


--047d7b677abc8e229304cdadb44d-- --===============2616562728962901098== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============2616562728962901098==-- From xen-devel-bounces@lists.xen.org Sun Nov 04 19:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 19:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV66f-0006vx-Hv; Sun, 04 Nov 2012 19:43:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV66d-0006vs-JS for xen-devel@lists.xen.org; Sun, 04 Nov 2012 19:43:39 +0000 Received: from [85.158.137.99:58761] by server-2.bemta-3.messagelabs.com id 69/08-04744-A65C6905; Sun, 04 Nov 2012 19:43:38 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352058216!12942996!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjAyMTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28257 invoked from network); 4 Nov 2012 19:43:37 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 4 Nov 2012 19:43:37 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA4JhGic023764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 4 Nov 2012 19:43:17 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA4JhEwd024315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 4 Nov 2012 19:43:14 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA4JhDlI007789; Sun, 4 Nov 2012 13:43:13 -0600 MIME-Version: 1.0 Message-ID: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Date: Sun, 4 Nov 2012 11:43:06 -0800 (PST) From: Dan Magenheimer To: Keir Fraser , Jan Beulich References: <50939A1502000078000A5F61@nat28.tlf.novell.com> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Keir Fraser [mailto:keir@xen.org] > Sent: Friday, November 02, 2012 3:30 AM > To: Jan Beulich; Dan Magenheimer > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > Plus, if necessary, that loop could be broken up so that only the > > initial part of it gets run with the lock held (see c/s > > 22135:69e8bb164683 for why the unlock was moved past the > > loop). That would make for a shorter lock hold time, but for a > > higher allocation latency on large oder allocations (due to worse > > cache locality). > > In fact I believe only the first page needs to have its count_info set to != > PGC_state_free, while the lock is held. That is sufficient to defeat the > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > first loop in free_heap_pages() outside the lock. There's a lot of scope for > optimisation here. (sorry for the delayed response) Aren't we getting a little sidetracked here? (Maybe my fault for looking at whether this specific loop is fast enough...) This loop handles only order=N chunks of RAM. Speeding up this loop and holding the heap_lock here for a shorter period only helps the TOCTOU race if the entire domain can be allocated as a single order-N allocation. Domain creation is supposed to succeed as long as there is sufficient RAM, _regardless_ of the state of memory fragmentation, correct? So unless the code for the _entire_ memory allocation path can be optimized so that the heap_lock can be held across _all_ the allocations necessary to create an arbitrary-sized domain, for any arbitrary state of memory fragmentation, the original problem has not been solved. Or am I misunderstanding? I _think_ the claim hypercall/subop should resolve this, though admittedly I have yet to prove (and code) it. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 19:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 19:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV66f-0006vx-Hv; Sun, 04 Nov 2012 19:43:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV66d-0006vs-JS for xen-devel@lists.xen.org; Sun, 04 Nov 2012 19:43:39 +0000 Received: from [85.158.137.99:58761] by server-2.bemta-3.messagelabs.com id 69/08-04744-A65C6905; Sun, 04 Nov 2012 19:43:38 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352058216!12942996!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjAyMTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28257 invoked from network); 4 Nov 2012 19:43:37 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 4 Nov 2012 19:43:37 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA4JhGic023764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 4 Nov 2012 19:43:17 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA4JhEwd024315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 4 Nov 2012 19:43:14 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA4JhDlI007789; Sun, 4 Nov 2012 13:43:13 -0600 MIME-Version: 1.0 Message-ID: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Date: Sun, 4 Nov 2012 11:43:06 -0800 (PST) From: Dan Magenheimer To: Keir Fraser , Jan Beulich References: <50939A1502000078000A5F61@nat28.tlf.novell.com> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Keir Fraser [mailto:keir@xen.org] > Sent: Friday, November 02, 2012 3:30 AM > To: Jan Beulich; Dan Magenheimer > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > Plus, if necessary, that loop could be broken up so that only the > > initial part of it gets run with the lock held (see c/s > > 22135:69e8bb164683 for why the unlock was moved past the > > loop). That would make for a shorter lock hold time, but for a > > higher allocation latency on large oder allocations (due to worse > > cache locality). > > In fact I believe only the first page needs to have its count_info set to != > PGC_state_free, while the lock is held. That is sufficient to defeat the > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > first loop in free_heap_pages() outside the lock. There's a lot of scope for > optimisation here. (sorry for the delayed response) Aren't we getting a little sidetracked here? (Maybe my fault for looking at whether this specific loop is fast enough...) This loop handles only order=N chunks of RAM. Speeding up this loop and holding the heap_lock here for a shorter period only helps the TOCTOU race if the entire domain can be allocated as a single order-N allocation. Domain creation is supposed to succeed as long as there is sufficient RAM, _regardless_ of the state of memory fragmentation, correct? So unless the code for the _entire_ memory allocation path can be optimized so that the heap_lock can be held across _all_ the allocations necessary to create an arbitrary-sized domain, for any arbitrary state of memory fragmentation, the original problem has not been solved. Or am I misunderstanding? I _think_ the claim hypercall/subop should resolve this, though admittedly I have yet to prove (and code) it. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 20:36:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 20:36:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV6v9-0007ex-Mi; Sun, 04 Nov 2012 20:35:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV6v8-0007es-GI for xen-devel@lists.xen.org; Sun, 04 Nov 2012 20:35:51 +0000 Received: from [85.158.137.99:38266] by server-15.bemta-3.messagelabs.com id 60/5B-09445-B91D6905; Sun, 04 Nov 2012 20:35:39 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-10.tower-217.messagelabs.com!1352061338!17707527!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12818 invoked from network); 4 Nov 2012 20:35:38 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-10.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 4 Nov 2012 20:35:38 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TV6uq-00032B-Kt; Sun, 04 Nov 2012 20:35:32 +0000 Date: Sun, 4 Nov 2012 20:35:32 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121104203532.GA11377@ocelot.phlegethon.org> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> User-Agent: Mutt/1.4.2.1i Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:43 -0800 on 04 Nov (1352029386), Dan Magenheimer wrote: > > From: Keir Fraser [mailto:keir@xen.org] > > Sent: Friday, November 02, 2012 3:30 AM > > To: Jan Beulich; Dan Magenheimer > > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > > > Plus, if necessary, that loop could be broken up so that only the > > > initial part of it gets run with the lock held (see c/s > > > 22135:69e8bb164683 for why the unlock was moved past the > > > loop). That would make for a shorter lock hold time, but for a > > > higher allocation latency on large oder allocations (due to worse > > > cache locality). > > > > In fact I believe only the first page needs to have its count_info set to != > > PGC_state_free, while the lock is held. That is sufficient to defeat the > > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > > first loop in free_heap_pages() outside the lock. There's a lot of scope for > > optimisation here. > > (sorry for the delayed response) > > Aren't we getting a little sidetracked here? (Maybe my fault for > looking at whether this specific loop is fast enough...) > > This loop handles only order=N chunks of RAM. Speeding up this > loop and holding the heap_lock here for a shorter period only helps > the TOCTOU race if the entire domain can be allocated as a > single order-N allocation. I think the idea is to speed up allocation so that, even for a large VM, you can just allocate memory instead of needing a reservation hypercall (whose only purpose, AIUI, is to give you an immediate answer). > So unless the code for the _entire_ memory allocation path can > be optimized so that the heap_lock can be held across _all_ the > allocations necessary to create an arbitrary-sized domain, for > any arbitrary state of memory fragmentation, the original > problem has not been solved. > > Or am I misunderstanding? > > I _think_ the claim hypercall/subop should resolve this, though > admittedly I have yet to prove (and code) it. I don't think it solves it - or rather it might solve this _particular_ instance of it but it doesn't solve the bigger problem. If you have a set of overcommitted hosts and you want to start a new VM, you need to: - (a) decide which of your hosts is the least overcommitted; - (b) free up enough memory on that host to build the VM; and - (c) build the VM. The claim hypercall _might_ fix (c) (if it could handle allocations that need address-width limits or contiguous pages). But (b) and (a) have exactly the same problem, unless there is a central arbiter of memory allocation (or equivalent distributed system). If you try to start 2 VMs at once, - (a) the toolstack will choose to start them both on the same machine, even if that's not optimal, or in the case where one creation is _bound_ to fail after some delay. - (b) the other VMs (and perhaps tmem) start ballooning out enough memory to start the new VM. This can take even longer than allocating it since it depends on guest behaviour. It can fail after an arbitrary delay (ditto). If you have a toolstack with enough knowledge and control over memory allocation to sort out stages (a) and (b) in such a way that there are no delayed failures, (c) should be trivial. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 20:36:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 20:36:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV6v9-0007ex-Mi; Sun, 04 Nov 2012 20:35:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV6v8-0007es-GI for xen-devel@lists.xen.org; Sun, 04 Nov 2012 20:35:51 +0000 Received: from [85.158.137.99:38266] by server-15.bemta-3.messagelabs.com id 60/5B-09445-B91D6905; Sun, 04 Nov 2012 20:35:39 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-10.tower-217.messagelabs.com!1352061338!17707527!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12818 invoked from network); 4 Nov 2012 20:35:38 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-10.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 4 Nov 2012 20:35:38 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TV6uq-00032B-Kt; Sun, 04 Nov 2012 20:35:32 +0000 Date: Sun, 4 Nov 2012 20:35:32 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121104203532.GA11377@ocelot.phlegethon.org> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> User-Agent: Mutt/1.4.2.1i Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:43 -0800 on 04 Nov (1352029386), Dan Magenheimer wrote: > > From: Keir Fraser [mailto:keir@xen.org] > > Sent: Friday, November 02, 2012 3:30 AM > > To: Jan Beulich; Dan Magenheimer > > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > > > Plus, if necessary, that loop could be broken up so that only the > > > initial part of it gets run with the lock held (see c/s > > > 22135:69e8bb164683 for why the unlock was moved past the > > > loop). That would make for a shorter lock hold time, but for a > > > higher allocation latency on large oder allocations (due to worse > > > cache locality). > > > > In fact I believe only the first page needs to have its count_info set to != > > PGC_state_free, while the lock is held. That is sufficient to defeat the > > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > > first loop in free_heap_pages() outside the lock. There's a lot of scope for > > optimisation here. > > (sorry for the delayed response) > > Aren't we getting a little sidetracked here? (Maybe my fault for > looking at whether this specific loop is fast enough...) > > This loop handles only order=N chunks of RAM. Speeding up this > loop and holding the heap_lock here for a shorter period only helps > the TOCTOU race if the entire domain can be allocated as a > single order-N allocation. I think the idea is to speed up allocation so that, even for a large VM, you can just allocate memory instead of needing a reservation hypercall (whose only purpose, AIUI, is to give you an immediate answer). > So unless the code for the _entire_ memory allocation path can > be optimized so that the heap_lock can be held across _all_ the > allocations necessary to create an arbitrary-sized domain, for > any arbitrary state of memory fragmentation, the original > problem has not been solved. > > Or am I misunderstanding? > > I _think_ the claim hypercall/subop should resolve this, though > admittedly I have yet to prove (and code) it. I don't think it solves it - or rather it might solve this _particular_ instance of it but it doesn't solve the bigger problem. If you have a set of overcommitted hosts and you want to start a new VM, you need to: - (a) decide which of your hosts is the least overcommitted; - (b) free up enough memory on that host to build the VM; and - (c) build the VM. The claim hypercall _might_ fix (c) (if it could handle allocations that need address-width limits or contiguous pages). But (b) and (a) have exactly the same problem, unless there is a central arbiter of memory allocation (or equivalent distributed system). If you try to start 2 VMs at once, - (a) the toolstack will choose to start them both on the same machine, even if that's not optimal, or in the case where one creation is _bound_ to fail after some delay. - (b) the other VMs (and perhaps tmem) start ballooning out enough memory to start the new VM. This can take even longer than allocating it since it depends on guest behaviour. It can fail after an arbitrary delay (ditto). If you have a toolstack with enough knowledge and control over memory allocation to sort out stages (a) and (b) in such a way that there are no delayed failures, (c) should be trivial. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 22:24:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 22:24:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV8bx-00085P-4D; Sun, 04 Nov 2012 22:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV8bv-00085K-53 for xen-devel@lists.xen.org; Sun, 04 Nov 2012 22:24:07 +0000 Received: from [85.158.143.35:29248] by server-3.bemta-4.messagelabs.com id 66/8A-06841-60BE6905; Sun, 04 Nov 2012 22:24:06 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352067845!12132919!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23853 invoked from network); 4 Nov 2012 22:24:05 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 22:24:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,711,1344211200"; d="scan'208";a="15574964" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 04 Nov 2012 22:24:04 +0000 Received: from Roger-2.local.net (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 4 Nov 2012 22:24:04 +0000 From: Roger Pau Monne To: Date: Sun, 4 Nov 2012 23:23:50 +0100 Message-ID: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: xen-devel@lists.xen.org, Roger Pau Monne Subject: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch implements persistent grants for xbd_xenbus (blkfront in Linux terminology). The effect of this change is to reduce the number of unmap operations performed, since they cause a (costly) TLB shootdown. This allows the I/O performance to scale better when a large number of VMs are performing I/O. On startup xbd_xenbus notifies the backend driver that it is using persistent grants. If the backend driver is not capable of persistent mapping, xbd_xenbus will still use the same grants, since it is compatible with the previous protocol, and simplifies the code complexity in xbd_xenbus. Each time a request is send to the backend driver, xbd_xenbus will check if there are free grants already mapped and will try to use one of those. If there are not enough grants already mapped, xbd_xenbus will request new grants, and they will be added to the list of free grants when the transaction is finished, so they can be reused. Data has to be copied from the request (struct buf) to the mapped grant, or from the mapped grant to the request, depending on the operation being performed. To test the performance impact of this patch I've benchmarked the number of IOPS performed simultaneously by 15 NetBSD DomU guests on a Linux Dom0 that supports persistent grants. The backend used to perform this tests was a ramdisk of size 1GB. Sum of IOPS Non-persistent 336718 Persistent 686010 As seen, there's a x2 increase in the total number of IOPS being performed. As a reference, using exactly the same setup Linux DomUs are able to achieve 1102019 IOPS, so there's still plenty of room for improvement. As said previously this implementation only covers for the NetBSD front-end driver. Cc: xen-devel@lists.xen.org --- sys/arch/xen/xen/xbd_xenbus.c | 174 ++++++++++++++++++++++++---------------- 1 files changed, 104 insertions(+), 70 deletions(-) diff --git a/sys/arch/xen/xen/xbd_xenbus.c b/sys/arch/xen/xen/xbd_xenbus.c index a9221e7..4ece0b0 100644 --- a/sys/arch/xen/xen/xbd_xenbus.c +++ b/sys/arch/xen/xen/xbd_xenbus.c @@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $" #include #include #include +#include #include @@ -99,12 +100,18 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $" #define XEN_BSHIFT 9 /* log2(XEN_BSIZE) */ #define XEN_BSIZE (1 << XEN_BSHIFT) +struct grant { + SLIST_ENTRY(grant) gnt_next; + grant_ref_t gref; + vaddr_t va; +}; + struct xbd_req { SLIST_ENTRY(xbd_req) req_next; uint16_t req_id; /* ID passed to backend */ union { struct { - grant_ref_t req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST]; + struct grant *req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST]; int req_nr_segments; /* number of segments in this request */ struct buf *req_bp; /* buffer associated with this request */ void *req_data; /* pointer to the data buffer */ @@ -152,6 +159,8 @@ struct xbd_xenbus_softc { u_long sc_handle; /* from backend */ int sc_cache_flush; /* backend supports BLKIF_OP_FLUSH_DISKCACHE */ krndsource_t sc_rnd_source; + SLIST_HEAD(,grant) sc_free_grants; /* list of available mapped grants */ + int sc_persistent_grants; /* backend supports persistent grants */ }; #if 0 @@ -172,9 +181,6 @@ static int xbdstart(struct dk_softc *, struct buf *); static void xbd_backend_changed(void *, XenbusState); static void xbd_connect(struct xbd_xenbus_softc *); -static int xbd_map_align(struct xbd_req *); -static void xbd_unmap_align(struct xbd_req *); - static void xbdminphys(struct buf *); CFATTACH_DECL3_NEW(xbd, sizeof(struct xbd_xenbus_softc), @@ -217,6 +223,23 @@ static struct dkdriver xbddkdriver = { .d_minphys = xbdminphys, }; +static void +xbd_clear_grants(struct xbd_xenbus_softc *sc) +{ + struct grant *entry; + + /* Unmap and clear the list of persistent grants */ + while (!SLIST_EMPTY(&sc->sc_free_grants)) { + entry = SLIST_FIRST(&sc->sc_free_grants); + SLIST_REMOVE_HEAD(&sc->sc_free_grants, gnt_next); + if (__predict_false(xengnt_status(entry->gref))) + panic("grant still used"); + xengnt_revoke_access(entry->gref); + uvm_km_kmem_free(kmem_va_arena, entry->va, PAGE_SIZE); + free(entry, M_DEVBUF); + } +} + static int xbd_xenbus_match(device_t parent, cfdata_t match, void *aux) { @@ -285,6 +308,7 @@ xbd_xenbus_attach(device_t parent, device_t self, void *aux) SLIST_INSERT_HEAD(&sc->sc_xbdreq_head, &sc->sc_reqs[i], req_next); } + SLIST_INIT(&sc->sc_free_grants); sc->sc_backend_status = BLKIF_STATE_DISCONNECTED; sc->sc_shutdown = BLKIF_SHUTDOWN_REMOTE; @@ -368,6 +392,8 @@ xbd_xenbus_detach(device_t dev, int flags) rnd_detach_source(&sc->sc_rnd_source); } + xbd_clear_grants(sc); + hypervisor_mask_event(sc->sc_evtchn); event_remove_handler(sc->sc_evtchn, &xbd_handler, sc); while (xengnt_status(sc->sc_ring_gntref)) { @@ -402,6 +428,8 @@ xbd_xenbus_suspend(device_t dev, const pmf_qual_t *qual) { splx(s); + xbd_clear_grants(sc); + xenbus_device_suspend(sc->sc_xbusd); aprint_verbose_dev(dev, "removed event channel %d\n", sc->sc_evtchn); @@ -475,6 +503,12 @@ again: errmsg = "writing protocol"; goto abort_transaction; } + error = xenbus_printf(xbt, sc->sc_xbusd->xbusd_path, + "feature-persistent", "%u", 1); + if (error) { + errmsg = "writing feature-persistent"; + goto abort_transaction; + } error = xenbus_transaction_end(xbt, 0); if (error == EAGAIN) goto again; @@ -614,7 +648,7 @@ xbd_connect(struct xbd_xenbus_softc *sc) { int err; unsigned long long sectors; - u_long cache_flush; + u_long cache_flush, feature_persistent; err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_path, "virtual-device", &sc->sc_handle, 10); @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) else sc->sc_cache_flush = 0; + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, + "feature-persistent", &feature_persistent, 10); + if (err) + feature_persistent = 0; + if (feature_persistent > 0) + sc->sc_persistent_grants = 1; + else + sc->sc_persistent_grants = 0; + xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateConnected); } @@ -662,7 +705,8 @@ xbd_handler(void *arg) struct buf *bp; RING_IDX resp_prod, i; int more_to_do; - int seg; + int seg, nbytes, ncopy; + vaddr_t va; DPRINTF(("xbd_handler(%s)\n", device_xname(sc->sc_dksc.sc_dev))); @@ -684,18 +728,6 @@ again: /* caller will free the req */ continue; } - for (seg = xbdreq->req_nr_segments - 1; seg >= 0; seg--) { - if (__predict_false( - xengnt_status(xbdreq->req_gntref[seg]))) { - aprint_verbose_dev(sc->sc_dksc.sc_dev, - "grant still used by backend\n"); - sc->sc_ring.rsp_cons = i; - xbdreq->req_nr_segments = seg + 1; - goto done; - } - xengnt_revoke_access(xbdreq->req_gntref[seg]); - xbdreq->req_nr_segments--; - } if (rep->operation != BLKIF_OP_READ && rep->operation != BLKIF_OP_WRITE) { aprint_error_dev(sc->sc_dksc.sc_dev, @@ -709,10 +741,20 @@ again: bp->b_resid = bp->b_bcount; goto next; } - /* b_resid was set in xbdstart */ + + if (rep->operation == BLKIF_OP_READ) { + /* Read data from the request */ + nbytes = xbdreq->req_bp->b_bcount; + va = (vaddr_t)xbdreq->req_bp->b_data; + for (seg = 0; seg < xbdreq->req_nr_segments; seg++) { + ncopy = nbytes > PAGE_SIZE ? PAGE_SIZE : nbytes; + memcpy((void *) va, (void *) xbdreq->req_gntref[seg]->va, + ncopy); + nbytes -= ncopy; + va += ncopy; + } + } next: - if (bp->b_data != xbdreq->req_data) - xbd_unmap_align(xbdreq); disk_unbusy(&sc->sc_dksc.sc_dkdev, (bp->b_bcount - bp->b_resid), (bp->b_flags & B_READ)); @@ -720,8 +762,12 @@ next: bp->b_blkno); biodone(bp); SLIST_INSERT_HEAD(&sc->sc_xbdreq_head, xbdreq, req_next); + /* Insert the grants back into the list of available grants */ + for (seg = 0; seg < xbdreq->req_nr_segments; seg++) + SLIST_INSERT_HEAD(&sc->sc_free_grants, + xbdreq->req_gntref[seg], gnt_next); } -done: + xen_rmb(); sc->sc_ring.rsp_cons = i; @@ -944,9 +990,11 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) int ret = 0, runqueue = 1; size_t bcount, off; paddr_t ma; - vaddr_t va; - int nsects, nbytes, seg; + vaddr_t va = 0; + vaddr_t va_newmap; + int nsects, nbytes, seg, s, rc; int notify; + struct grant *gnt; DPRINTF(("xbdstart(%p): b_bcount = %ld\n", bp, (long)bp->b_bcount)); @@ -990,13 +1038,6 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) } xbdreq->req_bp = bp; - xbdreq->req_data = bp->b_data; - if ((vaddr_t)bp->b_data & (XEN_BSIZE - 1)) { - if (__predict_false(xbd_map_align(xbdreq) != 0)) { - ret = -1; - goto out; - } - } /* now we're sure we'll send this buf */ disk_busy(&dksc->sc_dkdev); SLIST_REMOVE_HEAD(&sc->sc_xbdreq_head, req_next); @@ -1006,8 +1047,6 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) req->sector_number = bp->b_rawblkno; req->handle = sc->sc_handle; - va = (vaddr_t)xbdreq->req_data & ~PAGE_MASK; - off = (vaddr_t)xbdreq->req_data & PAGE_MASK; if (bp->b_rawblkno + bp->b_bcount / DEV_BSIZE >= sc->sc_xbdsize) { bcount = (sc->sc_xbdsize - bp->b_rawblkno) * DEV_BSIZE; bp->b_resid = bp->b_bcount - bcount; @@ -1020,8 +1059,32 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) bcount = XBD_MAX_XFER; } for (seg = 0; bcount > 0;) { - pmap_extract_ma(pmap_kernel(), va, &ma); - KASSERT((ma & (XEN_BSIZE - 1)) == 0); + /* Get an already mapped grant or map a new one */ + if (!SLIST_EMPTY(&sc->sc_free_grants)) { + gnt = SLIST_FIRST(&sc->sc_free_grants); + SLIST_REMOVE_HEAD(&sc->sc_free_grants, gnt_next); + } else { + s = splvm(); + rc = uvm_km_kmem_alloc(kmem_va_arena, PAGE_SIZE, + (VM_NOSLEEP | VM_INSTANTFIT), + (vmem_addr_t *)&va_newmap); + splx(s); + if (__predict_false(rc != 0)) + panic("xbdstart: unable to map memory"); + pmap_extract_ma(pmap_kernel(), va_newmap, &ma); + KASSERT((ma & (XEN_BSIZE - 1)) == 0); + gnt = malloc(sizeof(struct grant), M_DEVBUF, M_NOWAIT); + if (__predict_false(xengnt_grant_access( + sc->sc_xbusd->xbusd_otherend_id, ma, 0, + &gnt->gref))) + panic("xbdstart: xengnt_grant_access"); + gnt->va = va_newmap; + } + xbdreq->req_data = (void *)gnt->va; + if (seg == 0) { + off = (vaddr_t)xbdreq->req_data & PAGE_MASK; + va = (vaddr_t)bp->b_data; + } if (bcount > PAGE_SIZE - off) nbytes = PAGE_SIZE - off; else @@ -1031,11 +1094,12 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) req->seg[seg].last_sect = (off >> XEN_BSHIFT) + nsects - 1; KASSERT(req->seg[seg].first_sect <= req->seg[seg].last_sect); KASSERT(req->seg[seg].last_sect < 8); - if (__predict_false(xengnt_grant_access( - sc->sc_xbusd->xbusd_otherend_id, ma, - (bp->b_flags & B_READ) == 0, &xbdreq->req_gntref[seg]))) - panic("xbdstart: xengnt_grant_access"); /* XXX XXX !!! */ - req->seg[seg].gref = xbdreq->req_gntref[seg]; + if (req->operation == BLKIF_OP_WRITE) + /* Copy data from the buf to the request */ + memcpy((void *)(gnt->va + off), (void *)(va + off), nbytes); + + req->seg[seg].gref = gnt->gref; + xbdreq->req_gntref[seg] = gnt; seg++; KASSERT(seg <= BLKIF_MAX_SEGMENTS_PER_REQUEST); va += PAGE_SIZE; @@ -1063,33 +1127,3 @@ err: biodone(bp); return 0; } - -static int -xbd_map_align(struct xbd_req *req) -{ - int s = splvm(); - int rc; - - rc = uvm_km_kmem_alloc(kmem_va_arena, - req->req_bp->b_bcount, (VM_NOSLEEP | VM_INSTANTFIT), - (vmem_addr_t *)&req->req_data); - splx(s); - if (__predict_false(rc != 0)) - return ENOMEM; - if ((req->req_bp->b_flags & B_READ) == 0) - memcpy(req->req_data, req->req_bp->b_data, - req->req_bp->b_bcount); - return 0; -} - -static void -xbd_unmap_align(struct xbd_req *req) -{ - int s; - if (req->req_bp->b_flags & B_READ) - memcpy(req->req_bp->b_data, req->req_data, - req->req_bp->b_bcount); - s = splvm(); - uvm_km_kmem_free(kmem_va_arena, (vaddr_t)req->req_data, req->req_bp->b_bcount); - splx(s); -} -- 1.7.7.5 (Apple Git-26) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 04 22:24:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 04 Nov 2012 22:24:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV8bx-00085P-4D; Sun, 04 Nov 2012 22:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TV8bv-00085K-53 for xen-devel@lists.xen.org; Sun, 04 Nov 2012 22:24:07 +0000 Received: from [85.158.143.35:29248] by server-3.bemta-4.messagelabs.com id 66/8A-06841-60BE6905; Sun, 04 Nov 2012 22:24:06 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352067845!12132919!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23853 invoked from network); 4 Nov 2012 22:24:05 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 4 Nov 2012 22:24:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,711,1344211200"; d="scan'208";a="15574964" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 04 Nov 2012 22:24:04 +0000 Received: from Roger-2.local.net (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 4 Nov 2012 22:24:04 +0000 From: Roger Pau Monne To: Date: Sun, 4 Nov 2012 23:23:50 +0100 Message-ID: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: xen-devel@lists.xen.org, Roger Pau Monne Subject: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch implements persistent grants for xbd_xenbus (blkfront in Linux terminology). The effect of this change is to reduce the number of unmap operations performed, since they cause a (costly) TLB shootdown. This allows the I/O performance to scale better when a large number of VMs are performing I/O. On startup xbd_xenbus notifies the backend driver that it is using persistent grants. If the backend driver is not capable of persistent mapping, xbd_xenbus will still use the same grants, since it is compatible with the previous protocol, and simplifies the code complexity in xbd_xenbus. Each time a request is send to the backend driver, xbd_xenbus will check if there are free grants already mapped and will try to use one of those. If there are not enough grants already mapped, xbd_xenbus will request new grants, and they will be added to the list of free grants when the transaction is finished, so they can be reused. Data has to be copied from the request (struct buf) to the mapped grant, or from the mapped grant to the request, depending on the operation being performed. To test the performance impact of this patch I've benchmarked the number of IOPS performed simultaneously by 15 NetBSD DomU guests on a Linux Dom0 that supports persistent grants. The backend used to perform this tests was a ramdisk of size 1GB. Sum of IOPS Non-persistent 336718 Persistent 686010 As seen, there's a x2 increase in the total number of IOPS being performed. As a reference, using exactly the same setup Linux DomUs are able to achieve 1102019 IOPS, so there's still plenty of room for improvement. As said previously this implementation only covers for the NetBSD front-end driver. Cc: xen-devel@lists.xen.org --- sys/arch/xen/xen/xbd_xenbus.c | 174 ++++++++++++++++++++++++---------------- 1 files changed, 104 insertions(+), 70 deletions(-) diff --git a/sys/arch/xen/xen/xbd_xenbus.c b/sys/arch/xen/xen/xbd_xenbus.c index a9221e7..4ece0b0 100644 --- a/sys/arch/xen/xen/xbd_xenbus.c +++ b/sys/arch/xen/xen/xbd_xenbus.c @@ -68,6 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $" #include #include #include +#include #include @@ -99,12 +100,18 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.57 2012/05/25 15:03:38 elric Exp $" #define XEN_BSHIFT 9 /* log2(XEN_BSIZE) */ #define XEN_BSIZE (1 << XEN_BSHIFT) +struct grant { + SLIST_ENTRY(grant) gnt_next; + grant_ref_t gref; + vaddr_t va; +}; + struct xbd_req { SLIST_ENTRY(xbd_req) req_next; uint16_t req_id; /* ID passed to backend */ union { struct { - grant_ref_t req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST]; + struct grant *req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST]; int req_nr_segments; /* number of segments in this request */ struct buf *req_bp; /* buffer associated with this request */ void *req_data; /* pointer to the data buffer */ @@ -152,6 +159,8 @@ struct xbd_xenbus_softc { u_long sc_handle; /* from backend */ int sc_cache_flush; /* backend supports BLKIF_OP_FLUSH_DISKCACHE */ krndsource_t sc_rnd_source; + SLIST_HEAD(,grant) sc_free_grants; /* list of available mapped grants */ + int sc_persistent_grants; /* backend supports persistent grants */ }; #if 0 @@ -172,9 +181,6 @@ static int xbdstart(struct dk_softc *, struct buf *); static void xbd_backend_changed(void *, XenbusState); static void xbd_connect(struct xbd_xenbus_softc *); -static int xbd_map_align(struct xbd_req *); -static void xbd_unmap_align(struct xbd_req *); - static void xbdminphys(struct buf *); CFATTACH_DECL3_NEW(xbd, sizeof(struct xbd_xenbus_softc), @@ -217,6 +223,23 @@ static struct dkdriver xbddkdriver = { .d_minphys = xbdminphys, }; +static void +xbd_clear_grants(struct xbd_xenbus_softc *sc) +{ + struct grant *entry; + + /* Unmap and clear the list of persistent grants */ + while (!SLIST_EMPTY(&sc->sc_free_grants)) { + entry = SLIST_FIRST(&sc->sc_free_grants); + SLIST_REMOVE_HEAD(&sc->sc_free_grants, gnt_next); + if (__predict_false(xengnt_status(entry->gref))) + panic("grant still used"); + xengnt_revoke_access(entry->gref); + uvm_km_kmem_free(kmem_va_arena, entry->va, PAGE_SIZE); + free(entry, M_DEVBUF); + } +} + static int xbd_xenbus_match(device_t parent, cfdata_t match, void *aux) { @@ -285,6 +308,7 @@ xbd_xenbus_attach(device_t parent, device_t self, void *aux) SLIST_INSERT_HEAD(&sc->sc_xbdreq_head, &sc->sc_reqs[i], req_next); } + SLIST_INIT(&sc->sc_free_grants); sc->sc_backend_status = BLKIF_STATE_DISCONNECTED; sc->sc_shutdown = BLKIF_SHUTDOWN_REMOTE; @@ -368,6 +392,8 @@ xbd_xenbus_detach(device_t dev, int flags) rnd_detach_source(&sc->sc_rnd_source); } + xbd_clear_grants(sc); + hypervisor_mask_event(sc->sc_evtchn); event_remove_handler(sc->sc_evtchn, &xbd_handler, sc); while (xengnt_status(sc->sc_ring_gntref)) { @@ -402,6 +428,8 @@ xbd_xenbus_suspend(device_t dev, const pmf_qual_t *qual) { splx(s); + xbd_clear_grants(sc); + xenbus_device_suspend(sc->sc_xbusd); aprint_verbose_dev(dev, "removed event channel %d\n", sc->sc_evtchn); @@ -475,6 +503,12 @@ again: errmsg = "writing protocol"; goto abort_transaction; } + error = xenbus_printf(xbt, sc->sc_xbusd->xbusd_path, + "feature-persistent", "%u", 1); + if (error) { + errmsg = "writing feature-persistent"; + goto abort_transaction; + } error = xenbus_transaction_end(xbt, 0); if (error == EAGAIN) goto again; @@ -614,7 +648,7 @@ xbd_connect(struct xbd_xenbus_softc *sc) { int err; unsigned long long sectors; - u_long cache_flush; + u_long cache_flush, feature_persistent; err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_path, "virtual-device", &sc->sc_handle, 10); @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) else sc->sc_cache_flush = 0; + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, + "feature-persistent", &feature_persistent, 10); + if (err) + feature_persistent = 0; + if (feature_persistent > 0) + sc->sc_persistent_grants = 1; + else + sc->sc_persistent_grants = 0; + xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateConnected); } @@ -662,7 +705,8 @@ xbd_handler(void *arg) struct buf *bp; RING_IDX resp_prod, i; int more_to_do; - int seg; + int seg, nbytes, ncopy; + vaddr_t va; DPRINTF(("xbd_handler(%s)\n", device_xname(sc->sc_dksc.sc_dev))); @@ -684,18 +728,6 @@ again: /* caller will free the req */ continue; } - for (seg = xbdreq->req_nr_segments - 1; seg >= 0; seg--) { - if (__predict_false( - xengnt_status(xbdreq->req_gntref[seg]))) { - aprint_verbose_dev(sc->sc_dksc.sc_dev, - "grant still used by backend\n"); - sc->sc_ring.rsp_cons = i; - xbdreq->req_nr_segments = seg + 1; - goto done; - } - xengnt_revoke_access(xbdreq->req_gntref[seg]); - xbdreq->req_nr_segments--; - } if (rep->operation != BLKIF_OP_READ && rep->operation != BLKIF_OP_WRITE) { aprint_error_dev(sc->sc_dksc.sc_dev, @@ -709,10 +741,20 @@ again: bp->b_resid = bp->b_bcount; goto next; } - /* b_resid was set in xbdstart */ + + if (rep->operation == BLKIF_OP_READ) { + /* Read data from the request */ + nbytes = xbdreq->req_bp->b_bcount; + va = (vaddr_t)xbdreq->req_bp->b_data; + for (seg = 0; seg < xbdreq->req_nr_segments; seg++) { + ncopy = nbytes > PAGE_SIZE ? PAGE_SIZE : nbytes; + memcpy((void *) va, (void *) xbdreq->req_gntref[seg]->va, + ncopy); + nbytes -= ncopy; + va += ncopy; + } + } next: - if (bp->b_data != xbdreq->req_data) - xbd_unmap_align(xbdreq); disk_unbusy(&sc->sc_dksc.sc_dkdev, (bp->b_bcount - bp->b_resid), (bp->b_flags & B_READ)); @@ -720,8 +762,12 @@ next: bp->b_blkno); biodone(bp); SLIST_INSERT_HEAD(&sc->sc_xbdreq_head, xbdreq, req_next); + /* Insert the grants back into the list of available grants */ + for (seg = 0; seg < xbdreq->req_nr_segments; seg++) + SLIST_INSERT_HEAD(&sc->sc_free_grants, + xbdreq->req_gntref[seg], gnt_next); } -done: + xen_rmb(); sc->sc_ring.rsp_cons = i; @@ -944,9 +990,11 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) int ret = 0, runqueue = 1; size_t bcount, off; paddr_t ma; - vaddr_t va; - int nsects, nbytes, seg; + vaddr_t va = 0; + vaddr_t va_newmap; + int nsects, nbytes, seg, s, rc; int notify; + struct grant *gnt; DPRINTF(("xbdstart(%p): b_bcount = %ld\n", bp, (long)bp->b_bcount)); @@ -990,13 +1038,6 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) } xbdreq->req_bp = bp; - xbdreq->req_data = bp->b_data; - if ((vaddr_t)bp->b_data & (XEN_BSIZE - 1)) { - if (__predict_false(xbd_map_align(xbdreq) != 0)) { - ret = -1; - goto out; - } - } /* now we're sure we'll send this buf */ disk_busy(&dksc->sc_dkdev); SLIST_REMOVE_HEAD(&sc->sc_xbdreq_head, req_next); @@ -1006,8 +1047,6 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) req->sector_number = bp->b_rawblkno; req->handle = sc->sc_handle; - va = (vaddr_t)xbdreq->req_data & ~PAGE_MASK; - off = (vaddr_t)xbdreq->req_data & PAGE_MASK; if (bp->b_rawblkno + bp->b_bcount / DEV_BSIZE >= sc->sc_xbdsize) { bcount = (sc->sc_xbdsize - bp->b_rawblkno) * DEV_BSIZE; bp->b_resid = bp->b_bcount - bcount; @@ -1020,8 +1059,32 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) bcount = XBD_MAX_XFER; } for (seg = 0; bcount > 0;) { - pmap_extract_ma(pmap_kernel(), va, &ma); - KASSERT((ma & (XEN_BSIZE - 1)) == 0); + /* Get an already mapped grant or map a new one */ + if (!SLIST_EMPTY(&sc->sc_free_grants)) { + gnt = SLIST_FIRST(&sc->sc_free_grants); + SLIST_REMOVE_HEAD(&sc->sc_free_grants, gnt_next); + } else { + s = splvm(); + rc = uvm_km_kmem_alloc(kmem_va_arena, PAGE_SIZE, + (VM_NOSLEEP | VM_INSTANTFIT), + (vmem_addr_t *)&va_newmap); + splx(s); + if (__predict_false(rc != 0)) + panic("xbdstart: unable to map memory"); + pmap_extract_ma(pmap_kernel(), va_newmap, &ma); + KASSERT((ma & (XEN_BSIZE - 1)) == 0); + gnt = malloc(sizeof(struct grant), M_DEVBUF, M_NOWAIT); + if (__predict_false(xengnt_grant_access( + sc->sc_xbusd->xbusd_otherend_id, ma, 0, + &gnt->gref))) + panic("xbdstart: xengnt_grant_access"); + gnt->va = va_newmap; + } + xbdreq->req_data = (void *)gnt->va; + if (seg == 0) { + off = (vaddr_t)xbdreq->req_data & PAGE_MASK; + va = (vaddr_t)bp->b_data; + } if (bcount > PAGE_SIZE - off) nbytes = PAGE_SIZE - off; else @@ -1031,11 +1094,12 @@ xbdstart(struct dk_softc *dksc, struct buf *bp) req->seg[seg].last_sect = (off >> XEN_BSHIFT) + nsects - 1; KASSERT(req->seg[seg].first_sect <= req->seg[seg].last_sect); KASSERT(req->seg[seg].last_sect < 8); - if (__predict_false(xengnt_grant_access( - sc->sc_xbusd->xbusd_otherend_id, ma, - (bp->b_flags & B_READ) == 0, &xbdreq->req_gntref[seg]))) - panic("xbdstart: xengnt_grant_access"); /* XXX XXX !!! */ - req->seg[seg].gref = xbdreq->req_gntref[seg]; + if (req->operation == BLKIF_OP_WRITE) + /* Copy data from the buf to the request */ + memcpy((void *)(gnt->va + off), (void *)(va + off), nbytes); + + req->seg[seg].gref = gnt->gref; + xbdreq->req_gntref[seg] = gnt; seg++; KASSERT(seg <= BLKIF_MAX_SEGMENTS_PER_REQUEST); va += PAGE_SIZE; @@ -1063,33 +1127,3 @@ err: biodone(bp); return 0; } - -static int -xbd_map_align(struct xbd_req *req) -{ - int s = splvm(); - int rc; - - rc = uvm_km_kmem_alloc(kmem_va_arena, - req->req_bp->b_bcount, (VM_NOSLEEP | VM_INSTANTFIT), - (vmem_addr_t *)&req->req_data); - splx(s); - if (__predict_false(rc != 0)) - return ENOMEM; - if ((req->req_bp->b_flags & B_READ) == 0) - memcpy(req->req_data, req->req_bp->b_data, - req->req_bp->b_bcount); - return 0; -} - -static void -xbd_unmap_align(struct xbd_req *req) -{ - int s; - if (req->req_bp->b_flags & B_READ) - memcpy(req->req_bp->b_data, req->req_data, - req->req_bp->b_bcount); - s = splvm(); - uvm_km_kmem_free(kmem_va_arena, (vaddr_t)req->req_data, req->req_bp->b_bcount); - splx(s); -} -- 1.7.7.5 (Apple Git-26) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 00:24:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 00:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVATd-0000WI-CZ; Mon, 05 Nov 2012 00:23:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVATb-0000WD-QZ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 00:23:40 +0000 Received: from [193.109.254.147:55058] by server-9.bemta-14.messagelabs.com id 34/3E-30773-A0707905; Mon, 05 Nov 2012 00:23:38 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352075017!9656726!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjA1MjI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9065 invoked from network); 5 Nov 2012 00:23:38 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 00:23:38 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA50NH8N013404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 00:23:18 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA50NGfx011830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 00:23:17 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA50NF4j001598; Sun, 4 Nov 2012 18:23:15 -0600 MIME-Version: 1.0 Message-ID: <26f55aab-7523-4681-9a61-a5e5740d43a9@default> Date: Sun, 4 Nov 2012 16:23:08 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: <20121104203532.GA11377@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Hi Tim -- > At 11:43 -0800 on 04 Nov (1352029386), Dan Magenheimer wrote: > > > From: Keir Fraser [mailto:keir@xen.org] > > > Sent: Friday, November 02, 2012 3:30 AM > > > To: Jan Beulich; Dan Magenheimer > > > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > > > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > > > > > Plus, if necessary, that loop could be broken up so that only the > > > > initial part of it gets run with the lock held (see c/s > > > > 22135:69e8bb164683 for why the unlock was moved past the > > > > loop). That would make for a shorter lock hold time, but for a > > > > higher allocation latency on large oder allocations (due to worse > > > > cache locality). > > > > > > In fact I believe only the first page needs to have its count_info set to != > > > PGC_state_free, while the lock is held. That is sufficient to defeat the > > > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > > > first loop in free_heap_pages() outside the lock. There's a lot of scope for > > > optimisation here. > > > > (sorry for the delayed response) > > > > Aren't we getting a little sidetracked here? (Maybe my fault for > > looking at whether this specific loop is fast enough...) > > > > This loop handles only order=N chunks of RAM. Speeding up this > > loop and holding the heap_lock here for a shorter period only helps > > the TOCTOU race if the entire domain can be allocated as a > > single order-N allocation. > > I think the idea is to speed up allocation so that, even for a large VM, > you can just allocate memory instead of needing a reservation hypercall > (whose only purpose, AIUI, is to give you an immediate answer). Its purpose is to give an immediate answer on whether sufficient space is available for allocation AND (atomically) claim it so no other call to the allocator can race and steal some or all of it away. So unless the allocation is sped up enough (given an arbitrary size domain and arbitrary state of memory fragmentation) so that the heap_lock can be held for that length of time, speeding up allocation doesn't solve the problem. > > So unless the code for the _entire_ memory allocation path can > > be optimized so that the heap_lock can be held across _all_ the > > allocations necessary to create an arbitrary-sized domain, for > > any arbitrary state of memory fragmentation, the original > > problem has not been solved. > > > > Or am I misunderstanding? > > > > I _think_ the claim hypercall/subop should resolve this, though > > admittedly I have yet to prove (and code) it. > > I don't think it solves it - or rather it might solve this _particular_ > instance of it but it doesn't solve the bigger problem. If you have a > set of overcommitted hosts and you want to start a new VM, you need to: > > - (a) decide which of your hosts is the least overcommitted; > - (b) free up enough memory on that host to build the VM; and > - (c) build the VM. > > The claim hypercall _might_ fix (c) (if it could handle allocations that > need address-width limits or contiguous pages). But (b) and (a) have > exactly the same problem, unless there is a central arbiter of memory > allocation (or equivalent distributed system). If you try to start 2 > VMs at once, > > - (a) the toolstack will choose to start them both on the same machine, > even if that's not optimal, or in the case where one creation is > _bound_ to fail after some delay. > - (b) the other VMs (and perhaps tmem) start ballooning out enough > memory to start the new VM. This can take even longer than > allocating it since it depends on guest behaviour. It can fail > after an arbitrary delay (ditto). > > If you have a toolstack with enough knowledge and control over memory > allocation to sort out stages (a) and (b) in such a way that there are > no delayed failures, (c) should be trivial. (You've used the labels (a) and (b) twice so I'm not quite sure I understand... but in any case) Sigh. No, you are missing the beauty of tmem and dynamic allocation; you are thinking from the old static paradigm where the toolstack controls how much memory is available. There is no central arbiter of memory anymore than there is a central toolstack (other than the hypervisor on a one server Xen environment) that decides exactly when to assign vcpus to pcpus. There is no "free up enough memory on that host". Tmem doesn't start ballooning out enough memory to start the VM... the guests are responsible for doing the ballooning and it is _already done_. The machine either has sufficient free+freeable memory or it does not; and it is _that_ determination that needs to be done atomically because many threads are micro-allocating, and possibly multiple toolstack threads are macro-allocating, simultaneously. Everything is handled dynamically. And just like a CPU scheduler built into a hypervisor that dynamically allocates vcpu->pcpus has proven more effective than partitioning pcpus to different domains, dynamic memory management should prove more effective than some bossy toolstack trying to control memory statically. I understand that you can solve "my" problem in your paradigm without a claim hypercall and/or by speeding up allocations. I _don't_ see that you can solve "my" problem in _my_ paradigm without a claim hypercall... speeding up allocations doesn't solve the TOCTOU race so allocating sufficient space for a domain must be atomic. Sigh. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 00:24:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 00:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVATd-0000WI-CZ; Mon, 05 Nov 2012 00:23:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVATb-0000WD-QZ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 00:23:40 +0000 Received: from [193.109.254.147:55058] by server-9.bemta-14.messagelabs.com id 34/3E-30773-A0707905; Mon, 05 Nov 2012 00:23:38 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352075017!9656726!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjA1MjI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9065 invoked from network); 5 Nov 2012 00:23:38 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 00:23:38 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA50NH8N013404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 00:23:18 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA50NGfx011830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 00:23:17 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA50NF4j001598; Sun, 4 Nov 2012 18:23:15 -0600 MIME-Version: 1.0 Message-ID: <26f55aab-7523-4681-9a61-a5e5740d43a9@default> Date: Sun, 4 Nov 2012 16:23:08 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: <20121104203532.GA11377@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Hi Tim -- > At 11:43 -0800 on 04 Nov (1352029386), Dan Magenheimer wrote: > > > From: Keir Fraser [mailto:keir@xen.org] > > > Sent: Friday, November 02, 2012 3:30 AM > > > To: Jan Beulich; Dan Magenheimer > > > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > > > devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; TimDeegan > > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > > > On 02/11/2012 09:01, "Jan Beulich" wrote: > > > > > > > Plus, if necessary, that loop could be broken up so that only the > > > > initial part of it gets run with the lock held (see c/s > > > > 22135:69e8bb164683 for why the unlock was moved past the > > > > loop). That would make for a shorter lock hold time, but for a > > > > higher allocation latency on large oder allocations (due to worse > > > > cache locality). > > > > > > In fact I believe only the first page needs to have its count_info set to != > > > PGC_state_free, while the lock is held. That is sufficient to defeat the > > > buddy merging in free_heap_pages(). Similarly, we could hoist most of the > > > first loop in free_heap_pages() outside the lock. There's a lot of scope for > > > optimisation here. > > > > (sorry for the delayed response) > > > > Aren't we getting a little sidetracked here? (Maybe my fault for > > looking at whether this specific loop is fast enough...) > > > > This loop handles only order=N chunks of RAM. Speeding up this > > loop and holding the heap_lock here for a shorter period only helps > > the TOCTOU race if the entire domain can be allocated as a > > single order-N allocation. > > I think the idea is to speed up allocation so that, even for a large VM, > you can just allocate memory instead of needing a reservation hypercall > (whose only purpose, AIUI, is to give you an immediate answer). Its purpose is to give an immediate answer on whether sufficient space is available for allocation AND (atomically) claim it so no other call to the allocator can race and steal some or all of it away. So unless the allocation is sped up enough (given an arbitrary size domain and arbitrary state of memory fragmentation) so that the heap_lock can be held for that length of time, speeding up allocation doesn't solve the problem. > > So unless the code for the _entire_ memory allocation path can > > be optimized so that the heap_lock can be held across _all_ the > > allocations necessary to create an arbitrary-sized domain, for > > any arbitrary state of memory fragmentation, the original > > problem has not been solved. > > > > Or am I misunderstanding? > > > > I _think_ the claim hypercall/subop should resolve this, though > > admittedly I have yet to prove (and code) it. > > I don't think it solves it - or rather it might solve this _particular_ > instance of it but it doesn't solve the bigger problem. If you have a > set of overcommitted hosts and you want to start a new VM, you need to: > > - (a) decide which of your hosts is the least overcommitted; > - (b) free up enough memory on that host to build the VM; and > - (c) build the VM. > > The claim hypercall _might_ fix (c) (if it could handle allocations that > need address-width limits or contiguous pages). But (b) and (a) have > exactly the same problem, unless there is a central arbiter of memory > allocation (or equivalent distributed system). If you try to start 2 > VMs at once, > > - (a) the toolstack will choose to start them both on the same machine, > even if that's not optimal, or in the case where one creation is > _bound_ to fail after some delay. > - (b) the other VMs (and perhaps tmem) start ballooning out enough > memory to start the new VM. This can take even longer than > allocating it since it depends on guest behaviour. It can fail > after an arbitrary delay (ditto). > > If you have a toolstack with enough knowledge and control over memory > allocation to sort out stages (a) and (b) in such a way that there are > no delayed failures, (c) should be trivial. (You've used the labels (a) and (b) twice so I'm not quite sure I understand... but in any case) Sigh. No, you are missing the beauty of tmem and dynamic allocation; you are thinking from the old static paradigm where the toolstack controls how much memory is available. There is no central arbiter of memory anymore than there is a central toolstack (other than the hypervisor on a one server Xen environment) that decides exactly when to assign vcpus to pcpus. There is no "free up enough memory on that host". Tmem doesn't start ballooning out enough memory to start the VM... the guests are responsible for doing the ballooning and it is _already done_. The machine either has sufficient free+freeable memory or it does not; and it is _that_ determination that needs to be done atomically because many threads are micro-allocating, and possibly multiple toolstack threads are macro-allocating, simultaneously. Everything is handled dynamically. And just like a CPU scheduler built into a hypervisor that dynamically allocates vcpu->pcpus has proven more effective than partitioning pcpus to different domains, dynamic memory management should prove more effective than some bossy toolstack trying to control memory statically. I understand that you can solve "my" problem in your paradigm without a claim hypercall and/or by speeding up allocations. I _don't_ see that you can solve "my" problem in _my_ paradigm without a claim hypercall... speeding up allocations doesn't solve the TOCTOU race so allocating sufficient space for a domain must be atomic. Sigh. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 05:29:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 05:29:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVFF2-0006TB-M7; Mon, 05 Nov 2012 05:28:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVFF0-0006T6-FM for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 05:28:54 +0000 Received: from [85.158.143.99:17437] by server-3.bemta-4.messagelabs.com id 3A/97-06841-59E47905; Mon, 05 Nov 2012 05:28:53 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352093333!21588163!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8279 invoked from network); 5 Nov 2012 05:28:53 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 05:28:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,713,1344211200"; d="scan'208";a="15576533" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 05:28:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:28:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVFEx-0001GA-My; Mon, 05 Nov 2012 05:28:51 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVFEx-0005F9-IG; Mon, 05 Nov 2012 05:28:51 +0000 To: Message-ID: From: xen.org Date: Mon, 5 Nov 2012 05:28:51 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14365: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14365 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14365/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14359 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14359 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14359 test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail like 14359 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 05:29:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 05:29:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVFF2-0006TB-M7; Mon, 05 Nov 2012 05:28:56 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVFF0-0006T6-FM for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 05:28:54 +0000 Received: from [85.158.143.99:17437] by server-3.bemta-4.messagelabs.com id 3A/97-06841-59E47905; Mon, 05 Nov 2012 05:28:53 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352093333!21588163!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8279 invoked from network); 5 Nov 2012 05:28:53 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 05:28:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,713,1344211200"; d="scan'208";a="15576533" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 05:28:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:28:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVFEx-0001GA-My; Mon, 05 Nov 2012 05:28:51 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVFEx-0005F9-IG; Mon, 05 Nov 2012 05:28:51 +0000 To: Message-ID: From: xen.org Date: Mon, 5 Nov 2012 05:28:51 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14365: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14365 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14365/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14359 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14359 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14359 test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail like 14359 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 06:43:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 06:43:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVGOQ-0006nw-IB; Mon, 05 Nov 2012 06:42:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVGOO-0006np-Js for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 06:42:40 +0000 Received: from [85.158.137.99:4444] by server-1.bemta-3.messagelabs.com id DB/D5-12169-FDF57905; Mon, 05 Nov 2012 06:42:39 +0000 X-Env-Sender: dan.carpenter@oracle.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352097757!17711546!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjA1MjI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5598 invoked from network); 5 Nov 2012 06:42:39 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 06:42:39 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA56gToU028659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 06:42:31 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA56gQJQ023391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 06:42:27 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA56gOMY015197; Mon, 5 Nov 2012 00:42:24 -0600 Received: from elgon.mountain (/41.212.103.53) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 04 Nov 2012 22:42:23 -0800 Date: Mon, 5 Nov 2012 09:42:17 +0300 From: Dan Carpenter To: Konrad Rzeszutek Wilk , Mukesh Rathor Message-ID: <20121105064217.GA26179@elgon.mountain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, kernel-janitors@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [Xen-devel] [patch] xen/privcmd: fix condition in privcmd_close() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The parenthesis are in the wrong place so the original code is equivalent to: if (!xen_feature(XENFEAT_writable_descriptor_tables)) { ... Which obviously was not intended. Signed-off-by: Dan Carpenter diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index b9d0898..6011f3b 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -495,7 +495,7 @@ static void privcmd_close(struct vm_area_struct *vma) struct page **pages = vma->vm_private_data; int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - if (!xen_feature(XENFEAT_auto_translated_physmap || !numpgs || !pages)) + if (!xen_feature(XENFEAT_auto_translated_physmap) || !numpgs || !pages) return; xen_unmap_domain_mfn_range(vma, numpgs, pages); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 06:43:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 06:43:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVGOQ-0006nw-IB; Mon, 05 Nov 2012 06:42:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVGOO-0006np-Js for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 06:42:40 +0000 Received: from [85.158.137.99:4444] by server-1.bemta-3.messagelabs.com id DB/D5-12169-FDF57905; Mon, 05 Nov 2012 06:42:39 +0000 X-Env-Sender: dan.carpenter@oracle.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352097757!17711546!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjA1MjI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5598 invoked from network); 5 Nov 2012 06:42:39 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 06:42:39 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA56gToU028659 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 06:42:31 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA56gQJQ023391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 06:42:27 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA56gOMY015197; Mon, 5 Nov 2012 00:42:24 -0600 Received: from elgon.mountain (/41.212.103.53) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 04 Nov 2012 22:42:23 -0800 Date: Mon, 5 Nov 2012 09:42:17 +0300 From: Dan Carpenter To: Konrad Rzeszutek Wilk , Mukesh Rathor Message-ID: <20121105064217.GA26179@elgon.mountain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, kernel-janitors@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [Xen-devel] [patch] xen/privcmd: fix condition in privcmd_close() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The parenthesis are in the wrong place so the original code is equivalent to: if (!xen_feature(XENFEAT_writable_descriptor_tables)) { ... Which obviously was not intended. Signed-off-by: Dan Carpenter diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index b9d0898..6011f3b 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -495,7 +495,7 @@ static void privcmd_close(struct vm_area_struct *vma) struct page **pages = vma->vm_private_data; int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - if (!xen_feature(XENFEAT_auto_translated_physmap || !numpgs || !pages)) + if (!xen_feature(XENFEAT_auto_translated_physmap) || !numpgs || !pages) return; xen_unmap_domain_mfn_range(vma, numpgs, pages); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 08:30:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 08:30:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVI3x-0008KL-QY; Mon, 05 Nov 2012 08:29:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVI3w-0008KG-UD for xen-devel@lists.xen.org; Mon, 05 Nov 2012 08:29:41 +0000 Received: from [85.158.143.99:2421] by server-1.bemta-4.messagelabs.com id C8/E2-27934-4F877905; Mon, 05 Nov 2012 08:29:40 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352104179!17433695!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13733 invoked from network); 5 Nov 2012 08:29:39 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-216.messagelabs.com with SMTP; 5 Nov 2012 08:29:39 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 08:31:56 +0000 Message-Id: <509786FF02000078000A6491@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 08:29:35 +0000 From: "Jan Beulich" To: "Jinsong Liu" References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 03.11.12 at 13:16, "Liu, Jinsong" wrote: > Konrad Rzeszutek Wilk wrote: >>>> From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 >>>> 2001 >>> From: Liu, Jinsong >>> Date: Thu, 1 Nov 2012 21:02:36 +0800 >>> Subject: [PATCH 1/2] Xen acpi pad implement >>> >>> PAD is acpi Processor Aggregator Device which provides a control >>> point >>> that enables the platform to perform specific processor configuration >>> and control that applies to all processors in the platform. >>> >>> This patch is to implement Xen acpi pad logic. When running under Xen >>> virt platform, native pad driver would not work. Instead Xen pad >>> driver, >>> a self-contained and very thin logic level, would take over acpi pad >>> staff. When acpi pad notify OSPM, xen pad logic intercept and parse >>> _PUR object >>> and then hypercall to hyervisor for the rest work, say, core parking. >> >> Two comments: >> - Did you look at the SuSE tree? Jan mentioned that they did some >> fixes? Did you carry them over? > > I didn't look at Suse tree. > > Jan, would you please tell me where can I pull Suse tree? http://kernel.opensuse.org/git > have you > implemented xen-acpi-pad logic at Suse dom0 and which points you have fixed? Yes, we've been carrying this for quite some time. I don't recall the specific cleanups to the code I did, so I can only refer you to the trees above. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 08:30:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 08:30:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVI3x-0008KL-QY; Mon, 05 Nov 2012 08:29:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVI3w-0008KG-UD for xen-devel@lists.xen.org; Mon, 05 Nov 2012 08:29:41 +0000 Received: from [85.158.143.99:2421] by server-1.bemta-4.messagelabs.com id C8/E2-27934-4F877905; Mon, 05 Nov 2012 08:29:40 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352104179!17433695!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13733 invoked from network); 5 Nov 2012 08:29:39 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-216.messagelabs.com with SMTP; 5 Nov 2012 08:29:39 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 08:31:56 +0000 Message-Id: <509786FF02000078000A6491@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 08:29:35 +0000 From: "Jan Beulich" To: "Jinsong Liu" References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 03.11.12 at 13:16, "Liu, Jinsong" wrote: > Konrad Rzeszutek Wilk wrote: >>>> From f514b97628945cfac00efb0d456f133d44754c9d Mon Sep 17 00:00:00 >>>> 2001 >>> From: Liu, Jinsong >>> Date: Thu, 1 Nov 2012 21:02:36 +0800 >>> Subject: [PATCH 1/2] Xen acpi pad implement >>> >>> PAD is acpi Processor Aggregator Device which provides a control >>> point >>> that enables the platform to perform specific processor configuration >>> and control that applies to all processors in the platform. >>> >>> This patch is to implement Xen acpi pad logic. When running under Xen >>> virt platform, native pad driver would not work. Instead Xen pad >>> driver, >>> a self-contained and very thin logic level, would take over acpi pad >>> staff. When acpi pad notify OSPM, xen pad logic intercept and parse >>> _PUR object >>> and then hypercall to hyervisor for the rest work, say, core parking. >> >> Two comments: >> - Did you look at the SuSE tree? Jan mentioned that they did some >> fixes? Did you carry them over? > > I didn't look at Suse tree. > > Jan, would you please tell me where can I pull Suse tree? http://kernel.opensuse.org/git > have you > implemented xen-acpi-pad logic at Suse dom0 and which points you have fixed? Yes, we've been carrying this for quite some time. I don't recall the specific cleanups to the code I did, so I can only refer you to the trees above. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 09:17:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 09:17:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVInJ-0000Ab-7t; Mon, 05 Nov 2012 09:16:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVInH-0000AW-1L for xen-devel@lists.xen.org; Mon, 05 Nov 2012 09:16:31 +0000 Received: from [85.158.138.51:22344] by server-2.bemta-3.messagelabs.com id 71/29-04744-EE387905; Mon, 05 Nov 2012 09:16:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352106989!20684211!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12392 invoked from network); 5 Nov 2012 09:16:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-174.messagelabs.com with SMTP; 5 Nov 2012 09:16:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 09:16:28 +0000 Message-Id: <509791F902000078000A64D4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 09:16:25 +0000 From: "Jan Beulich" To: "Dan Magenheimer" , "Keir Fraser" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> In-Reply-To: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 04.11.12 at 20:43, Dan Magenheimer wrote: >> From: Keir Fraser [mailto:keir@xen.org] >> Sent: Friday, November 02, 2012 3:30 AM >> To: Jan Beulich; Dan Magenheimer >> Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; > DarioFaggioli; xen- >> devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; > Zhigang Wang; TimDeegan >> Subject: Re: Proposed new "memory capacity claim" hypercall/feature >> >> On 02/11/2012 09:01, "Jan Beulich" wrote: >> >> > Plus, if necessary, that loop could be broken up so that only the >> > initial part of it gets run with the lock held (see c/s >> > 22135:69e8bb164683 for why the unlock was moved past the >> > loop). That would make for a shorter lock hold time, but for a >> > higher allocation latency on large oder allocations (due to worse >> > cache locality). >> >> In fact I believe only the first page needs to have its count_info set to != >> PGC_state_free, while the lock is held. That is sufficient to defeat the >> buddy merging in free_heap_pages(). Similarly, we could hoist most of the >> first loop in free_heap_pages() outside the lock. There's a lot of scope for >> optimisation here. > > (sorry for the delayed response) > > Aren't we getting a little sidetracked here? (Maybe my fault for > looking at whether this specific loop is fast enough...) > > This loop handles only order=N chunks of RAM. Speeding up this > loop and holding the heap_lock here for a shorter period only helps > the TOCTOU race if the entire domain can be allocated as a > single order-N allocation. > > Domain creation is supposed to succeed as long as there is > sufficient RAM, _regardless_ of the state of memory fragmentation, > correct? > > So unless the code for the _entire_ memory allocation path can > be optimized so that the heap_lock can be held across _all_ the > allocations necessary to create an arbitrary-sized domain, for > any arbitrary state of memory fragmentation, the original > problem has not been solved. > > Or am I misunderstanding? I think we got here via questioning whether suppressing certain activities (like tmem causing the allocator visible amount of available memory) for a brief period of time would be acceptable, and while that indeed depends on the overall latency of memory allocation for the domain as a whole, I would be somewhat tolerant for it to involve a longer suspension period on a highly fragmented system. But of course, if this can be made work uniformly, that would be preferred. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 09:17:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 09:17:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVInJ-0000Ab-7t; Mon, 05 Nov 2012 09:16:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVInH-0000AW-1L for xen-devel@lists.xen.org; Mon, 05 Nov 2012 09:16:31 +0000 Received: from [85.158.138.51:22344] by server-2.bemta-3.messagelabs.com id 71/29-04744-EE387905; Mon, 05 Nov 2012 09:16:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352106989!20684211!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12392 invoked from network); 5 Nov 2012 09:16:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-174.messagelabs.com with SMTP; 5 Nov 2012 09:16:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 09:16:28 +0000 Message-Id: <509791F902000078000A64D4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 09:16:25 +0000 From: "Jan Beulich" To: "Dan Magenheimer" , "Keir Fraser" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> In-Reply-To: <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 04.11.12 at 20:43, Dan Magenheimer wrote: >> From: Keir Fraser [mailto:keir@xen.org] >> Sent: Friday, November 02, 2012 3:30 AM >> To: Jan Beulich; Dan Magenheimer >> Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; > DarioFaggioli; xen- >> devel@lists.xen.org; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; > Zhigang Wang; TimDeegan >> Subject: Re: Proposed new "memory capacity claim" hypercall/feature >> >> On 02/11/2012 09:01, "Jan Beulich" wrote: >> >> > Plus, if necessary, that loop could be broken up so that only the >> > initial part of it gets run with the lock held (see c/s >> > 22135:69e8bb164683 for why the unlock was moved past the >> > loop). That would make for a shorter lock hold time, but for a >> > higher allocation latency on large oder allocations (due to worse >> > cache locality). >> >> In fact I believe only the first page needs to have its count_info set to != >> PGC_state_free, while the lock is held. That is sufficient to defeat the >> buddy merging in free_heap_pages(). Similarly, we could hoist most of the >> first loop in free_heap_pages() outside the lock. There's a lot of scope for >> optimisation here. > > (sorry for the delayed response) > > Aren't we getting a little sidetracked here? (Maybe my fault for > looking at whether this specific loop is fast enough...) > > This loop handles only order=N chunks of RAM. Speeding up this > loop and holding the heap_lock here for a shorter period only helps > the TOCTOU race if the entire domain can be allocated as a > single order-N allocation. > > Domain creation is supposed to succeed as long as there is > sufficient RAM, _regardless_ of the state of memory fragmentation, > correct? > > So unless the code for the _entire_ memory allocation path can > be optimized so that the heap_lock can be held across _all_ the > allocations necessary to create an arbitrary-sized domain, for > any arbitrary state of memory fragmentation, the original > problem has not been solved. > > Or am I misunderstanding? I think we got here via questioning whether suppressing certain activities (like tmem causing the allocator visible amount of available memory) for a brief period of time would be acceptable, and while that indeed depends on the overall latency of memory allocation for the domain as a whole, I would be somewhat tolerant for it to involve a longer suspension period on a highly fragmented system. But of course, if this can be made work uniformly, that would be preferred. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:28:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:28:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJuI-0000ig-W8; Mon, 05 Nov 2012 10:27:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJuH-0000iW-U3 for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 10:27:50 +0000 Received: from [193.109.254.147:16070] by server-4.bemta-14.messagelabs.com id CD/F4-18856-5A497905; Mon, 05 Nov 2012 10:27:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1352111260!9628635!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16334 invoked from network); 5 Nov 2012 10:27:41 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:27:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,714,1344211200"; d="scan'208";a="43417971" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 10:27:40 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:27:39 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVJu7-0006Lk-EA; Mon, 05 Nov 2012 10:27:39 +0000 Message-ID: <1352111140.25014.97.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 5 Nov 2012 11:25:40 +0100 In-Reply-To: <20121102163720.GA27213@konrad-lan.dumpdata.com> References: <1350673381-20342-1-git-send-email-konrad.wilk@oracle.com> <1350984138.2237.22.camel@zakaz.uk.xensource.com> <20121102163720.GA27213@konrad-lan.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 16:37 +0000, Konrad Rzeszutek Wilk wrote: > Like this? Yup. Although I'm not sure if it really needs to be inlined. I guess it's not an especially performance sensitve path though. > > From 66705b0ff8808d86c12fcb3815d849a848b5409b Mon Sep 17 00:00:00 2001 > From: Konrad Rzeszutek Wilk > Date: Fri, 19 Oct 2012 15:01:46 -0400 > Subject: [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out > which flag it is. > > Makes it easier to troubleshoot in the field. > > [v1: Use macro per Ian's suggestion] > Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell > --- > include/xen/hvm.h | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/include/xen/hvm.h b/include/xen/hvm.h > index b193fa2..13e43e4 100644 > --- a/include/xen/hvm.h > +++ b/include/xen/hvm.h > @@ -5,6 +5,36 @@ > #include > #include > > +static const char *param_name(int op) > +{ > +#define PARAM(x) [HVM_PARAM_##x] = #x > + static const char *const names[] = { > + PARAM(CALLBACK_IRQ), > + PARAM(STORE_PFN), > + PARAM(STORE_EVTCHN), > + PARAM(PAE_ENABLED), > + PARAM(IOREQ_PFN), > + PARAM(BUFIOREQ_PFN), > + PARAM(TIMER_MODE), > + PARAM(HPET_ENABLED), > + PARAM(IDENT_PT), > + PARAM(DM_DOMAIN), > + PARAM(ACPI_S_STATE), > + PARAM(VM86_TSS), > + PARAM(VPT_ALIGN), > + PARAM(CONSOLE_PFN), > + PARAM(CONSOLE_EVTCHN), > + }; > +#undef PARAM > + > + if (op >= ARRAY_SIZE(names)) > + return "unknown"; > + > + if (!names[op]) > + return "reserved"; > + > + return names[op]; > +} > static inline int hvm_get_parameter(int idx, uint64_t *value) > { > struct xen_hvm_param xhv; > @@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) > xhv.index = idx; > r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); > if (r < 0) { > - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", > - idx, r); > + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", > + param_name(idx), idx, r); > return r; > } > *value = xhv.value; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:28:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:28:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJuI-0000ig-W8; Mon, 05 Nov 2012 10:27:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJuH-0000iW-U3 for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 10:27:50 +0000 Received: from [193.109.254.147:16070] by server-4.bemta-14.messagelabs.com id CD/F4-18856-5A497905; Mon, 05 Nov 2012 10:27:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1352111260!9628635!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16334 invoked from network); 5 Nov 2012 10:27:41 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:27:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,714,1344211200"; d="scan'208";a="43417971" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 10:27:40 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:27:39 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVJu7-0006Lk-EA; Mon, 05 Nov 2012 10:27:39 +0000 Message-ID: <1352111140.25014.97.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 5 Nov 2012 11:25:40 +0100 In-Reply-To: <20121102163720.GA27213@konrad-lan.dumpdata.com> References: <1350673381-20342-1-git-send-email-konrad.wilk@oracle.com> <1350984138.2237.22.camel@zakaz.uk.xensource.com> <20121102163720.GA27213@konrad-lan.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 16:37 +0000, Konrad Rzeszutek Wilk wrote: > Like this? Yup. Although I'm not sure if it really needs to be inlined. I guess it's not an especially performance sensitve path though. > > From 66705b0ff8808d86c12fcb3815d849a848b5409b Mon Sep 17 00:00:00 2001 > From: Konrad Rzeszutek Wilk > Date: Fri, 19 Oct 2012 15:01:46 -0400 > Subject: [PATCH] xen/hvm: If we fail to fetch an HVM parameter print out > which flag it is. > > Makes it easier to troubleshoot in the field. > > [v1: Use macro per Ian's suggestion] > Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell > --- > include/xen/hvm.h | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/include/xen/hvm.h b/include/xen/hvm.h > index b193fa2..13e43e4 100644 > --- a/include/xen/hvm.h > +++ b/include/xen/hvm.h > @@ -5,6 +5,36 @@ > #include > #include > > +static const char *param_name(int op) > +{ > +#define PARAM(x) [HVM_PARAM_##x] = #x > + static const char *const names[] = { > + PARAM(CALLBACK_IRQ), > + PARAM(STORE_PFN), > + PARAM(STORE_EVTCHN), > + PARAM(PAE_ENABLED), > + PARAM(IOREQ_PFN), > + PARAM(BUFIOREQ_PFN), > + PARAM(TIMER_MODE), > + PARAM(HPET_ENABLED), > + PARAM(IDENT_PT), > + PARAM(DM_DOMAIN), > + PARAM(ACPI_S_STATE), > + PARAM(VM86_TSS), > + PARAM(VPT_ALIGN), > + PARAM(CONSOLE_PFN), > + PARAM(CONSOLE_EVTCHN), > + }; > +#undef PARAM > + > + if (op >= ARRAY_SIZE(names)) > + return "unknown"; > + > + if (!names[op]) > + return "reserved"; > + > + return names[op]; > +} > static inline int hvm_get_parameter(int idx, uint64_t *value) > { > struct xen_hvm_param xhv; > @@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) > xhv.index = idx; > r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); > if (r < 0) { > - printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", > - idx, r); > + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", > + param_name(idx), idx, r); > return r; > } > *value = xhv.value; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:32:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:32:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJyP-0001Av-G3; Mon, 05 Nov 2012 10:32:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJyO-0001Ak-6y for xen-devel@lists.xen.org; Mon, 05 Nov 2012 10:32:04 +0000 Received: from [85.158.139.211:11469] by server-15.bemta-5.messagelabs.com id 1D/25-26920-3A597905; Mon, 05 Nov 2012 10:32:03 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1352111520!18916794!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27572 invoked from network); 5 Nov 2012 10:32:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:32:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,714,1344211200"; d="scan'208";a="43418811" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 10:32:00 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:31:59 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVJyJ-0006PA-Ac; Mon, 05 Nov 2012 10:31:59 +0000 Message-ID: <1352111399.25014.101.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Mon, 5 Nov 2012 11:29:59 +0100 In-Reply-To: <26f55aab-7523-4681-9a61-a5e5740d43a9@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > There is no "free up enough memory on that host". Tmem doesn't start > ballooning out enough memory to start the VM... the guests are > responsible for doing the ballooning and it is _already done_. The > machine either has sufficient free+freeable memory or it does not; How does one go about deciding which host in a multi thousand host deployment to try the claim hypercall on? Ian _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:32:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:32:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJyP-0001Av-G3; Mon, 05 Nov 2012 10:32:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVJyO-0001Ak-6y for xen-devel@lists.xen.org; Mon, 05 Nov 2012 10:32:04 +0000 Received: from [85.158.139.211:11469] by server-15.bemta-5.messagelabs.com id 1D/25-26920-3A597905; Mon, 05 Nov 2012 10:32:03 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1352111520!18916794!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27572 invoked from network); 5 Nov 2012 10:32:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:32:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,714,1344211200"; d="scan'208";a="43418811" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 10:32:00 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 05:31:59 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVJyJ-0006PA-Ac; Mon, 05 Nov 2012 10:31:59 +0000 Message-ID: <1352111399.25014.101.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Mon, 5 Nov 2012 11:29:59 +0100 In-Reply-To: <26f55aab-7523-4681-9a61-a5e5740d43a9@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > There is no "free up enough memory on that host". Tmem doesn't start > ballooning out enough memory to start the VM... the guests are > responsible for doing the ballooning and it is _already done_. The > machine either has sufficient free+freeable memory or it does not; How does one go about deciding which host in a multi thousand host deployment to try the claim hypercall on? Ian _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:58:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:58:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKNs-0001if-ON; Mon, 05 Nov 2012 10:58:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKNr-0001ia-HO for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 10:58:23 +0000 Received: from [85.158.138.51:2207] by server-9.bemta-3.messagelabs.com id 96/FF-02388-ECB97905; Mon, 05 Nov 2012 10:58:22 +0000 X-Env-Sender: dave.martin@linaro.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1352113101!28639400!1 X-Originating-IP: [209.85.217.171] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4846 invoked from network); 5 Nov 2012 10:58:22 -0000 Received: from mail-lb0-f171.google.com (HELO mail-lb0-f171.google.com) (209.85.217.171) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:58:22 -0000 Received: by mail-lb0-f171.google.com with SMTP id m4so4817788lbo.30 for ; Mon, 05 Nov 2012 02:58:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=khRgQCVTgsE4uGPSW7rGmW1yEbunI0n3ndxeKzmcmFQ=; b=CnQiEAJG0iUrD3tdzc0kotjK3TEMa+bGMyCD2rTCKaE4Qt9GmQl5HXtd1T9h0fU25w ahUDukDzH15ctxUTEadLF3NfrfjsAAfwADIzqf3zKMyRzvp6eQaumLjHwmqdmJ2YCTGz dyHGGOxnrKIJwboyGabs+xiY8nD6KVdRQ3wQmYBf2SiOCRwV2rnBjzPGW0dJEHjUAh8Z i3t8YkmxlqUB19eN5DbOghi1KLaCrEYPTAXE22IhfgEKu1D2giU8nny48wSfMlR3bghB ipK6CVQLyq9C86+KC8wKptuFTqBdPdhRc8X8fJ+i1C1j0iavGckR9qWAwXDnLqOB+cvp gh3A== Received: by 10.152.47.148 with SMTP id d20mr8732886lan.42.1352113101356; Mon, 05 Nov 2012 02:58:21 -0800 (PST) Received: from linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id sx3sm5495094lab.9.2012.11.05.02.58.19 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 02:58:20 -0800 (PST) Date: Mon, 5 Nov 2012 10:58:17 +0000 From: Dave Martin To: Stefano Stabellini Message-ID: <20121105105817.GC2005@linaro.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmIBhv9TCzlSUOVZOlsBkn89ICiSWZpsCVirF5QsH0PXdPJsxVzaYcL+nCvShw5urei668M Cc: "xen-devel@lists.xensource.com" , "linaro-dev@lists.linaro.org" , Ian Campbell , "arnd@arndb.de" , "konrad.wilk@oracle.com" , "Tim \(Xen.org\)" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] [PATCH RESEND] xen/arm: use the __HVC macro X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 24, 2012 at 04:26:08PM +0100, Stefano Stabellini wrote: > Use the new __HVC macro in hypercall.S. > > Signed-off-by: Stefano Stabellini This is correct usage of the __HVC() macro, so Acked-by: Dave Martin > --- > arch/arm/xen/hypercall.S | 14 +++++--------- > 1 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S > index 074f5ed..71f7239 100644 > --- a/arch/arm/xen/hypercall.S > +++ b/arch/arm/xen/hypercall.S > @@ -48,20 +48,16 @@ > > #include > #include > +#include > #include > > > -/* HVC 0xEA1 */ > -#ifdef CONFIG_THUMB2_KERNEL > -#define xen_hvc .word 0xf7e08ea1 > -#else > -#define xen_hvc .word 0xe140ea71 > -#endif > +#define XEN_IMM 0xEA1 > > #define HYPERCALL_SIMPLE(hypercall) \ > ENTRY(HYPERVISOR_##hypercall) \ > mov r12, #__HYPERVISOR_##hypercall; \ > - xen_hvc; \ > + __HVC(XEN_IMM); \ > mov pc, lr; \ > ENDPROC(HYPERVISOR_##hypercall) > > @@ -76,7 +72,7 @@ ENTRY(HYPERVISOR_##hypercall) \ > stmdb sp!, {r4} \ > ldr r4, [sp, #4] \ > mov r12, #__HYPERVISOR_##hypercall; \ > - xen_hvc \ > + __HVC(XEN_IMM); \ > ldm sp!, {r4} \ > mov pc, lr \ > ENDPROC(HYPERVISOR_##hypercall) > @@ -100,7 +96,7 @@ ENTRY(privcmd_call) > mov r2, r3 > ldr r3, [sp, #8] > ldr r4, [sp, #4] > - xen_hvc > + __HVC(XEN_IMM) > ldm sp!, {r4} > mov pc, lr > ENDPROC(privcmd_call); > -- > 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 10:58:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 10:58:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKNs-0001if-ON; Mon, 05 Nov 2012 10:58:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKNr-0001ia-HO for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 10:58:23 +0000 Received: from [85.158.138.51:2207] by server-9.bemta-3.messagelabs.com id 96/FF-02388-ECB97905; Mon, 05 Nov 2012 10:58:22 +0000 X-Env-Sender: dave.martin@linaro.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1352113101!28639400!1 X-Originating-IP: [209.85.217.171] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4846 invoked from network); 5 Nov 2012 10:58:22 -0000 Received: from mail-lb0-f171.google.com (HELO mail-lb0-f171.google.com) (209.85.217.171) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 10:58:22 -0000 Received: by mail-lb0-f171.google.com with SMTP id m4so4817788lbo.30 for ; Mon, 05 Nov 2012 02:58:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=khRgQCVTgsE4uGPSW7rGmW1yEbunI0n3ndxeKzmcmFQ=; b=CnQiEAJG0iUrD3tdzc0kotjK3TEMa+bGMyCD2rTCKaE4Qt9GmQl5HXtd1T9h0fU25w ahUDukDzH15ctxUTEadLF3NfrfjsAAfwADIzqf3zKMyRzvp6eQaumLjHwmqdmJ2YCTGz dyHGGOxnrKIJwboyGabs+xiY8nD6KVdRQ3wQmYBf2SiOCRwV2rnBjzPGW0dJEHjUAh8Z i3t8YkmxlqUB19eN5DbOghi1KLaCrEYPTAXE22IhfgEKu1D2giU8nny48wSfMlR3bghB ipK6CVQLyq9C86+KC8wKptuFTqBdPdhRc8X8fJ+i1C1j0iavGckR9qWAwXDnLqOB+cvp gh3A== Received: by 10.152.47.148 with SMTP id d20mr8732886lan.42.1352113101356; Mon, 05 Nov 2012 02:58:21 -0800 (PST) Received: from linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id sx3sm5495094lab.9.2012.11.05.02.58.19 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 02:58:20 -0800 (PST) Date: Mon, 5 Nov 2012 10:58:17 +0000 From: Dave Martin To: Stefano Stabellini Message-ID: <20121105105817.GC2005@linaro.org> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmIBhv9TCzlSUOVZOlsBkn89ICiSWZpsCVirF5QsH0PXdPJsxVzaYcL+nCvShw5urei668M Cc: "xen-devel@lists.xensource.com" , "linaro-dev@lists.linaro.org" , Ian Campbell , "arnd@arndb.de" , "konrad.wilk@oracle.com" , "Tim \(Xen.org\)" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] [PATCH RESEND] xen/arm: use the __HVC macro X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Oct 24, 2012 at 04:26:08PM +0100, Stefano Stabellini wrote: > Use the new __HVC macro in hypercall.S. > > Signed-off-by: Stefano Stabellini This is correct usage of the __HVC() macro, so Acked-by: Dave Martin > --- > arch/arm/xen/hypercall.S | 14 +++++--------- > 1 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S > index 074f5ed..71f7239 100644 > --- a/arch/arm/xen/hypercall.S > +++ b/arch/arm/xen/hypercall.S > @@ -48,20 +48,16 @@ > > #include > #include > +#include > #include > > > -/* HVC 0xEA1 */ > -#ifdef CONFIG_THUMB2_KERNEL > -#define xen_hvc .word 0xf7e08ea1 > -#else > -#define xen_hvc .word 0xe140ea71 > -#endif > +#define XEN_IMM 0xEA1 > > #define HYPERCALL_SIMPLE(hypercall) \ > ENTRY(HYPERVISOR_##hypercall) \ > mov r12, #__HYPERVISOR_##hypercall; \ > - xen_hvc; \ > + __HVC(XEN_IMM); \ > mov pc, lr; \ > ENDPROC(HYPERVISOR_##hypercall) > > @@ -76,7 +72,7 @@ ENTRY(HYPERVISOR_##hypercall) \ > stmdb sp!, {r4} \ > ldr r4, [sp, #4] \ > mov r12, #__HYPERVISOR_##hypercall; \ > - xen_hvc \ > + __HVC(XEN_IMM); \ > ldm sp!, {r4} \ > mov pc, lr \ > ENDPROC(HYPERVISOR_##hypercall) > @@ -100,7 +96,7 @@ ENTRY(privcmd_call) > mov r2, r3 > ldr r3, [sp, #8] > ldr r4, [sp, #4] > - xen_hvc > + __HVC(XEN_IMM) > ldm sp!, {r4} > mov pc, lr > ENDPROC(privcmd_call); > -- > 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 11:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 11:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKPW-0001p7-87; Mon, 05 Nov 2012 11:00:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKPU-0001p0-E4 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 11:00:04 +0000 Received: from [85.158.143.35:53660] by server-2.bemta-4.messagelabs.com id 4E/30-28922-33C97905; Mon, 05 Nov 2012 11:00:03 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352113199!6029370!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12926 invoked from network); 5 Nov 2012 10:59:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 5 Nov 2012 10:59:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 10:59:58 +0000 Message-Id: <5097AA3A02000078000A6528@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 10:59:54 +0000 From: "Jan Beulich" To: "Ian Jackson" , "Stefano Stabellini" References: <508E489502000078000A4FC6@nat28.tlf.novell.com> <20121030132951.GA4192@aepfle.de> <508FE6DD02000078000A56CF@nat28.tlf.novell.com> <20623.57765.463131.112836@mariner.uk.xensource.com> In-Reply-To: <20623.57765.463131.112836@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Olaf Hering , Ian Campbell , xen-devel Subject: Re: [Xen-devel] preparing for 4.2.1 and 4.1.4 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 30.10.12 at 15:18, Ian Jackson wrote: > I did a huge pile of backports late last week which seem to have > broken some things. The bisector is working on it and I'm hoping it > will report fairly shortly ... So what about the 4.1 tree? Should we cut RC1 there without any tools backports? Also, for both releases - what about their qemu tree(s)? There was a regression reported for 4.1.3 compared to 4.1.2, fixing of which supposedly involved a revert that apparently had been done in 4.2 already. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 11:00:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 11:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKPW-0001p7-87; Mon, 05 Nov 2012 11:00:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVKPU-0001p0-E4 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 11:00:04 +0000 Received: from [85.158.143.35:53660] by server-2.bemta-4.messagelabs.com id 4E/30-28922-33C97905; Mon, 05 Nov 2012 11:00:03 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352113199!6029370!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12926 invoked from network); 5 Nov 2012 10:59:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 5 Nov 2012 10:59:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 10:59:58 +0000 Message-Id: <5097AA3A02000078000A6528@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 10:59:54 +0000 From: "Jan Beulich" To: "Ian Jackson" , "Stefano Stabellini" References: <508E489502000078000A4FC6@nat28.tlf.novell.com> <20121030132951.GA4192@aepfle.de> <508FE6DD02000078000A56CF@nat28.tlf.novell.com> <20623.57765.463131.112836@mariner.uk.xensource.com> In-Reply-To: <20623.57765.463131.112836@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Olaf Hering , Ian Campbell , xen-devel Subject: Re: [Xen-devel] preparing for 4.2.1 and 4.1.4 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 30.10.12 at 15:18, Ian Jackson wrote: > I did a huge pile of backports late last week which seem to have > broken some things. The bisector is working on it and I'm hoping it > will report fairly shortly ... So what about the 4.1 tree? Should we cut RC1 there without any tools backports? Also, for both releases - what about their qemu tree(s)? There was a regression reported for 4.1.3 compared to 4.1.2, fixing of which supposedly involved a revert that apparently had been done in 4.2 already. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 11:56:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 11:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLHD-0002Bz-JB; Mon, 05 Nov 2012 11:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLHC-0002Bu-2f for xen-devel@lists.xen.org; Mon, 05 Nov 2012 11:55:34 +0000 Received: from [85.158.138.51:15074] by server-15.bemta-3.messagelabs.com id 7E/30-09445-439A7905; Mon, 05 Nov 2012 11:55:32 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-2.tower-174.messagelabs.com!1352116531!28747001!1 X-Originating-IP: [81.169.146.161] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0NzI3Mjg=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0NzI3Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26337 invoked from network); 5 Nov 2012 11:55:32 -0000 Received: from mo-p00-ob.rzone.de (HELO mo-p00-ob.rzone.de) (81.169.146.161) by server-2.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 11:55:32 -0000 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmwtM48/lq2s7sGlE= X-RZG-CLASS-ID: mo00 Received: from probook.site (dslb-084-057-073-078.pools.arcor-ip.net [84.57.73.78]) by smtp.strato.de (joses mo32) (RZmta 30.22 DYNA|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id V05106oA5BcSwH ; Mon, 5 Nov 2012 12:55:26 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7609B18643; Mon, 5 Nov 2012 12:55:26 +0100 (CET) Date: Mon, 5 Nov 2012 12:55:26 +0100 From: Olaf Hering To: Jan Beulich Message-ID: <20121105115526.GA18634@aepfle.de> References: <508E489502000078000A4FC6@nat28.tlf.novell.com> <20121030132951.GA4192@aepfle.de> <508FE6DD02000078000A56CF@nat28.tlf.novell.com> <20623.57765.463131.112836@mariner.uk.xensource.com> <5097AA3A02000078000A6528@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5097AA3A02000078000A6528@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel , Ian Jackson , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] preparing for 4.2.1 and 4.1.4 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 05, Jan Beulich wrote: > >>> On 30.10.12 at 15:18, Ian Jackson wrote: > > I did a huge pile of backports late last week which seem to have > > broken some things. The bisector is working on it and I'm hoping it > > will report fairly shortly ... > > So what about the 4.1 tree? Should we cut RC1 there without any > tools backports? At least the locking change should be backported to 4.1 as a bugfix: changeset: 26079:b3b03536789a hotplug/Linux: close lockfd after lock attempt Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 11:56:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 11:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLHD-0002Bz-JB; Mon, 05 Nov 2012 11:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLHC-0002Bu-2f for xen-devel@lists.xen.org; Mon, 05 Nov 2012 11:55:34 +0000 Received: from [85.158.138.51:15074] by server-15.bemta-3.messagelabs.com id 7E/30-09445-439A7905; Mon, 05 Nov 2012 11:55:32 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-2.tower-174.messagelabs.com!1352116531!28747001!1 X-Originating-IP: [81.169.146.161] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0NzI3Mjg=\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE2MSA9PiA0NzI3Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26337 invoked from network); 5 Nov 2012 11:55:32 -0000 Received: from mo-p00-ob.rzone.de (HELO mo-p00-ob.rzone.de) (81.169.146.161) by server-2.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 11:55:32 -0000 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmwtM48/lq2s7sGlE= X-RZG-CLASS-ID: mo00 Received: from probook.site (dslb-084-057-073-078.pools.arcor-ip.net [84.57.73.78]) by smtp.strato.de (joses mo32) (RZmta 30.22 DYNA|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id V05106oA5BcSwH ; Mon, 5 Nov 2012 12:55:26 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7609B18643; Mon, 5 Nov 2012 12:55:26 +0100 (CET) Date: Mon, 5 Nov 2012 12:55:26 +0100 From: Olaf Hering To: Jan Beulich Message-ID: <20121105115526.GA18634@aepfle.de> References: <508E489502000078000A4FC6@nat28.tlf.novell.com> <20121030132951.GA4192@aepfle.de> <508FE6DD02000078000A56CF@nat28.tlf.novell.com> <20623.57765.463131.112836@mariner.uk.xensource.com> <5097AA3A02000078000A6528@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5097AA3A02000078000A6528@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel , Ian Jackson , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] preparing for 4.2.1 and 4.1.4 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 05, Jan Beulich wrote: > >>> On 30.10.12 at 15:18, Ian Jackson wrote: > > I did a huge pile of backports late last week which seem to have > > broken some things. The bisector is working on it and I'm hoping it > > will report fairly shortly ... > > So what about the 4.1 tree? Should we cut RC1 there without any > tools backports? At least the locking change should be backported to 4.1 as a bugfix: changeset: 26079:b3b03536789a hotplug/Linux: close lockfd after lock attempt Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 12:27:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 12:27:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLli-0002ZW-D1; Mon, 05 Nov 2012 12:27:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLlh-0002ZI-7J for xen-devel@lists.xen.org; Mon, 05 Nov 2012 12:27:05 +0000 Received: from [85.158.138.51:46819] by server-3.bemta-3.messagelabs.com id F6/CC-31566-890B7905; Mon, 05 Nov 2012 12:27:04 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-14.tower-174.messagelabs.com!1352118422!22395600!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDA5MTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6741 invoked from network); 5 Nov 2012 12:27:02 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 12:27:02 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id 4AF241851; Mon, 5 Nov 2012 14:27:01 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id 26FB72005D; Mon, 5 Nov 2012 14:27:00 +0200 (EET) Date: Mon, 5 Nov 2012 14:26:59 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: "greg@enjellic.com" Message-ID: <20121105122659.GE8912@reaktio.net> References: <201208281225.q7SCP1WO017490@wind.enjellic.com> <1346226868.4847.21.camel@dagon.hellion.org.uk> <20120925113510.GM8912@reaktio.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120925113510.GM8912@reaktio.net> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Sep 25, 2012 at 02:35:10PM +0300, Pasi K=E4rkk=E4inen wrote: > On Wed, Aug 29, 2012 at 08:54:28AM +0100, Ian Campbell wrote: > > On Tue, 2012-08-28 at 13:25 +0100, Dr. Greg Wettstein wrote: > > > Good morning, hope the day is going well for everyone. > > > = > > > The patches to fix the blktap2 issues which result in orphaned > > > tapdisk2 processes and the transitory deadlock on guest shutdown > > > didn't make it into the 4.1.3 release. Updated patches to address > > > these problems are available at the following location: > > > = > > > ftp://ftp.enjellic.com/pub/xen/xen-4.1.3.blktap1.patch > > > ftp://ftp.enjellic.com/pub/xen/xen-4.1.3.blktap2.patch > > > = > > > The patches are designed to be applied in order and have been verified > > > to work against the 4.1.3 release. > > = > > Please can you post these patches as emails with a changelog and a > > signed-off-by. You should also CC Ian Jackson since he is the one who > > does the tools backports. > > > = > Hello again, > = > Dr. Greg: Can you please re-post the patches as emails with Signed-off-by= lines included, > as suggested below in Ian's reply.. ? = > = > http://wiki.xen.org/wiki/Submitting_Xen_Patches > = Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you can re-= submit = these blktap2 bugfix patches for inclusion! = Thanks, -- Pasi > = > > The changelog should be clear about the backport status. IIRC one of > > these is a backport from unstable (so the changelog should say of which > > commit and preserve the original S-o-b) and the other is a > > reimplementation since too much has changed in unstable so there is no > > plausible backport (and the changelog should mention this). > > = > > Ideally these mails would be threaded with subjects "[PATCH 1/2] ..." > > and "[PATCH 2/2] ..." so that it is obvious that there is a sequence to > > them. A tool such as hg email will do this for you. > > http://wiki.xen.org/wiki/Submitting_Xen_Patches has some hints on how to > > use it. > > = > > If nothing has changed since the previous posting it may be sufficient > > to reply to that previous postings with a "ping" message and CC Ian > > there. > > = > > Ian. > > = > = > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 12:27:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 12:27:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLli-0002ZW-D1; Mon, 05 Nov 2012 12:27:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLlh-0002ZI-7J for xen-devel@lists.xen.org; Mon, 05 Nov 2012 12:27:05 +0000 Received: from [85.158.138.51:46819] by server-3.bemta-3.messagelabs.com id F6/CC-31566-890B7905; Mon, 05 Nov 2012 12:27:04 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-14.tower-174.messagelabs.com!1352118422!22395600!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDA5MTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6741 invoked from network); 5 Nov 2012 12:27:02 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 12:27:02 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id 4AF241851; Mon, 5 Nov 2012 14:27:01 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id 26FB72005D; Mon, 5 Nov 2012 14:27:00 +0200 (EET) Date: Mon, 5 Nov 2012 14:26:59 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: "greg@enjellic.com" Message-ID: <20121105122659.GE8912@reaktio.net> References: <201208281225.q7SCP1WO017490@wind.enjellic.com> <1346226868.4847.21.camel@dagon.hellion.org.uk> <20120925113510.GM8912@reaktio.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120925113510.GM8912@reaktio.net> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Sep 25, 2012 at 02:35:10PM +0300, Pasi K=E4rkk=E4inen wrote: > On Wed, Aug 29, 2012 at 08:54:28AM +0100, Ian Campbell wrote: > > On Tue, 2012-08-28 at 13:25 +0100, Dr. Greg Wettstein wrote: > > > Good morning, hope the day is going well for everyone. > > > = > > > The patches to fix the blktap2 issues which result in orphaned > > > tapdisk2 processes and the transitory deadlock on guest shutdown > > > didn't make it into the 4.1.3 release. Updated patches to address > > > these problems are available at the following location: > > > = > > > ftp://ftp.enjellic.com/pub/xen/xen-4.1.3.blktap1.patch > > > ftp://ftp.enjellic.com/pub/xen/xen-4.1.3.blktap2.patch > > > = > > > The patches are designed to be applied in order and have been verified > > > to work against the 4.1.3 release. > > = > > Please can you post these patches as emails with a changelog and a > > signed-off-by. You should also CC Ian Jackson since he is the one who > > does the tools backports. > > > = > Hello again, > = > Dr. Greg: Can you please re-post the patches as emails with Signed-off-by= lines included, > as suggested below in Ian's reply.. ? = > = > http://wiki.xen.org/wiki/Submitting_Xen_Patches > = Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you can re-= submit = these blktap2 bugfix patches for inclusion! = Thanks, -- Pasi > = > > The changelog should be clear about the backport status. IIRC one of > > these is a backport from unstable (so the changelog should say of which > > commit and preserve the original S-o-b) and the other is a > > reimplementation since too much has changed in unstable so there is no > > plausible backport (and the changelog should mention this). > > = > > Ideally these mails would be threaded with subjects "[PATCH 1/2] ..." > > and "[PATCH 2/2] ..." so that it is obvious that there is a sequence to > > them. A tool such as hg email will do this for you. > > http://wiki.xen.org/wiki/Submitting_Xen_Patches has some hints on how to > > use it. > > = > > If nothing has changed since the previous posting it may be sufficient > > to reply to that previous postings with a "ping" message and CC Ian > > there. > > = > > Ian. > > = > = > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 12:35:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 12:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLt1-0002wh-AG; Mon, 05 Nov 2012 12:34:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLt0-0002wc-04 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 12:34:38 +0000 Received: from [85.158.139.83:10556] by server-1.bemta-5.messagelabs.com id 84/14-05877-D52B7905; Mon, 05 Nov 2012 12:34:37 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-14.tower-182.messagelabs.com!1352118875!24527943!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDA5MTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26402 invoked from network); 5 Nov 2012 12:34:35 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 12:34:35 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id C8D212BC1; Mon, 5 Nov 2012 14:34:34 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id A02122005D; Mon, 5 Nov 2012 14:34:34 +0200 (EET) Date: Mon, 5 Nov 2012 14:34:34 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: Keir Fraser Message-ID: <20121105123434.GF8912@reaktio.net> References: <20488.9122.701811.248760@mariner.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: George Dunlap , Juergen Gross , Ian Jackson , xen-devel Subject: Re: [Xen-devel] Backport requests of cs 23420..23423 for 4.0 and 4.1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Jul 19, 2012 at 04:23:43PM +0100, Keir Fraser wrote: > On 19/07/2012 16:11, "Ian Jackson" wrote: > > > Keir Fraser writes ("Re: [Xen-devel] Backport requests of cs 23420..23423 for > > 4.0 and 4.1"): > >> On 13/07/2012 07:08, "Juergen Gross" wrote: > >>> I would like to request to include these changesets in 4.0 and > >>> 4.1. The backport is quite trivial, I can send patches if you are > >>> willing to take them. > >> > >> Will need an Ack from George and then patches applied by (or at least an Ack > >> from) a tools maintainer. > > > > Thanks for replying Keir, but I'm rather queasy about this. > > > > These patches have not been in any released version of Xen and are > > fairly substantial. I would say that we should not backport anything > > that isn't a critical bugfix which hasn't been sitting in a released > > version of Xen for a while; and a new feature ought to be considered > > very carefully. > > They have been in use in Citrix XenServer for a while. However, this is > still late in stable point-release cycle to drop these in. It might make > sense to have them in 4.2.0 for a while, and then reconsider for backport > for 4.1.4 (I think you are probably right to nack for the 4.0 branch). > Hello, Should these patches now go in to 4.1.4-rc1 ? -- Pasi > -- Keir > > > Now maybe the unfortunately extended 4.2 release cycle may mean we > > should relax this rule but I'd prefer to see a clear justification for > > why this is important to retrofit to 4.1. > > > > And the Xen 4.0 tree is in the deep freeze and I don't think we should > > be backporting anything other than critical bugfixes for it. > > > > Ian. > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 12:35:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 12:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLt1-0002wh-AG; Mon, 05 Nov 2012 12:34:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVLt0-0002wc-04 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 12:34:38 +0000 Received: from [85.158.139.83:10556] by server-1.bemta-5.messagelabs.com id 84/14-05877-D52B7905; Mon, 05 Nov 2012 12:34:37 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-14.tower-182.messagelabs.com!1352118875!24527943!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDA5MTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26402 invoked from network); 5 Nov 2012 12:34:35 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 12:34:35 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id C8D212BC1; Mon, 5 Nov 2012 14:34:34 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id A02122005D; Mon, 5 Nov 2012 14:34:34 +0200 (EET) Date: Mon, 5 Nov 2012 14:34:34 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: Keir Fraser Message-ID: <20121105123434.GF8912@reaktio.net> References: <20488.9122.701811.248760@mariner.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Cc: George Dunlap , Juergen Gross , Ian Jackson , xen-devel Subject: Re: [Xen-devel] Backport requests of cs 23420..23423 for 4.0 and 4.1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Jul 19, 2012 at 04:23:43PM +0100, Keir Fraser wrote: > On 19/07/2012 16:11, "Ian Jackson" wrote: > > > Keir Fraser writes ("Re: [Xen-devel] Backport requests of cs 23420..23423 for > > 4.0 and 4.1"): > >> On 13/07/2012 07:08, "Juergen Gross" wrote: > >>> I would like to request to include these changesets in 4.0 and > >>> 4.1. The backport is quite trivial, I can send patches if you are > >>> willing to take them. > >> > >> Will need an Ack from George and then patches applied by (or at least an Ack > >> from) a tools maintainer. > > > > Thanks for replying Keir, but I'm rather queasy about this. > > > > These patches have not been in any released version of Xen and are > > fairly substantial. I would say that we should not backport anything > > that isn't a critical bugfix which hasn't been sitting in a released > > version of Xen for a while; and a new feature ought to be considered > > very carefully. > > They have been in use in Citrix XenServer for a while. However, this is > still late in stable point-release cycle to drop these in. It might make > sense to have them in 4.2.0 for a while, and then reconsider for backport > for 4.1.4 (I think you are probably right to nack for the 4.0 branch). > Hello, Should these patches now go in to 4.1.4-rc1 ? -- Pasi > -- Keir > > > Now maybe the unfortunately extended 4.2 release cycle may mean we > > should relax this rule but I'd prefer to see a clear justification for > > why this is important to retrofit to 4.1. > > > > And the Xen 4.0 tree is in the deep freeze and I don't think we should > > be backporting anything other than critical bugfixes for it. > > > > Ian. > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 14:31:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 14:31:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVNhC-00041z-9R; Mon, 05 Nov 2012 14:30:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVNhB-00041u-Qw for xen-devel@lists.xen.org; Mon, 05 Nov 2012 14:30:33 +0000 Received: from [85.158.143.99:57017] by server-2.bemta-4.messagelabs.com id AB/49-28922-98DC7905; Mon, 05 Nov 2012 14:30:33 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352125829!23445606!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26802 invoked from network); 5 Nov 2012 14:30:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-216.messagelabs.com with SMTP; 5 Nov 2012 14:30:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 14:30:28 +0000 Message-Id: <5097DB9102000078000A65C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 14:30:25 +0000 From: "Jan Beulich" To: ,, Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org All, so far it was my understanding that this option is intended to get the DMA behavior that Dom0 observes as close as possible to how it would be without IOMMU. However, we're now dealing with a customer report where a single function device is observed to initiate DMA operations appearing to originate from function 1, which makes obvious that the option above is not making things as transparent as I would have expected them to be: Without IOMMU, such requests get processed fine, while with IOMMU (due to there not being a context entry for the bogus device) the device fails to initialize (causing DMA faults, the presence of which I had to convince myself of separately, as for whatever reason at least the VT-d code doesn't issue any log message in that case). So I'm now seeking for alternative workaround suggestions that we could pass to that customer (less intrusive than "iommu=off"). Thanks, Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 14:31:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 14:31:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVNhC-00041z-9R; Mon, 05 Nov 2012 14:30:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVNhB-00041u-Qw for xen-devel@lists.xen.org; Mon, 05 Nov 2012 14:30:33 +0000 Received: from [85.158.143.99:57017] by server-2.bemta-4.messagelabs.com id AB/49-28922-98DC7905; Mon, 05 Nov 2012 14:30:33 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352125829!23445606!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26802 invoked from network); 5 Nov 2012 14:30:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-216.messagelabs.com with SMTP; 5 Nov 2012 14:30:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 14:30:28 +0000 Message-Id: <5097DB9102000078000A65C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 14:30:25 +0000 From: "Jan Beulich" To: ,, Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org All, so far it was my understanding that this option is intended to get the DMA behavior that Dom0 observes as close as possible to how it would be without IOMMU. However, we're now dealing with a customer report where a single function device is observed to initiate DMA operations appearing to originate from function 1, which makes obvious that the option above is not making things as transparent as I would have expected them to be: Without IOMMU, such requests get processed fine, while with IOMMU (due to there not being a context entry for the bogus device) the device fails to initialize (causing DMA faults, the presence of which I had to convince myself of separately, as for whatever reason at least the VT-d code doesn't issue any log message in that case). So I'm now seeking for alternative workaround suggestions that we could pass to that customer (less intrusive than "iommu=off"). Thanks, Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 14:55:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 14:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVO4z-0004GB-Ed; Mon, 05 Nov 2012 14:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVO4y-0004G6-9D for xen-devel@lists.xen.org; Mon, 05 Nov 2012 14:55:08 +0000 Received: from [85.158.143.35:15951] by server-1.bemta-4.messagelabs.com id 88/9E-27934-B43D7905; Mon, 05 Nov 2012 14:55:07 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352127294!15836378!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjEyMDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22641 invoked from network); 5 Nov 2012 14:54:55 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 14:54:55 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5EsgHm031183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 14:54:43 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5Ese2s017163 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 14:54:41 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5Esds7024148; Mon, 5 Nov 2012 08:54:39 -0600 MIME-Version: 1.0 Message-ID: <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> Date: Mon, 5 Nov 2012 06:54:31 -0800 (PST) From: Dan Magenheimer To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> In-Reply-To: <1352111399.25014.101.camel@hastur.hellion.org.uk> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , xen-devel@lists.xen.org, George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Campbell [mailto:ian.campbell@citrix.com] > Sent: Monday, November 05, 2012 3:30 AM > To: Dan Magenheimer > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > There is no "free up enough memory on that host". Tmem doesn't start > > ballooning out enough memory to start the VM... the guests are > > responsible for doing the ballooning and it is _already done_. The > > machine either has sufficient free+freeable memory or it does not; > > How does one go about deciding which host in a multi thousand host > deployment to try the claim hypercall on? I don't get paid enough to solve that problem :-) VM placement (both for new domains and migration due to load-balancing and power-management) is dependent on a number of factors currently involving CPU utilization, SAN utilization, and LAN utilization, I think using historical trends on streams of sampled statistics. This is very non-deterministic as all of these factors may vary dramatically within a sampling interval. Adding free+freeable memory to this just adds one more such statistic. Actually two, as it is probably best to track free separately from freeable since a candidate host that has enough free memory should have preference over one with freeable memory. Sorry if that's not very satisfying but anything beyond that meager description is outside of my area of expertise. Dan P.S. I don't think I've ever said _thousands_ of physical hosts, just hundreds (with thousands of VMs). Honestly I don't know the upper support bound for an Oracle VM "server pool" (which is what we call the collection of hundreds of physical machines)... it may be thousands. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 14:55:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 14:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVO4z-0004GB-Ed; Mon, 05 Nov 2012 14:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVO4y-0004G6-9D for xen-devel@lists.xen.org; Mon, 05 Nov 2012 14:55:08 +0000 Received: from [85.158.143.35:15951] by server-1.bemta-4.messagelabs.com id 88/9E-27934-B43D7905; Mon, 05 Nov 2012 14:55:07 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352127294!15836378!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjEyMDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22641 invoked from network); 5 Nov 2012 14:54:55 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 14:54:55 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5EsgHm031183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 14:54:43 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5Ese2s017163 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 14:54:41 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5Esds7024148; Mon, 5 Nov 2012 08:54:39 -0600 MIME-Version: 1.0 Message-ID: <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> Date: Mon, 5 Nov 2012 06:54:31 -0800 (PST) From: Dan Magenheimer To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> In-Reply-To: <1352111399.25014.101.camel@hastur.hellion.org.uk> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , xen-devel@lists.xen.org, George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Campbell [mailto:ian.campbell@citrix.com] > Sent: Monday, November 05, 2012 3:30 AM > To: Dan Magenheimer > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > There is no "free up enough memory on that host". Tmem doesn't start > > ballooning out enough memory to start the VM... the guests are > > responsible for doing the ballooning and it is _already done_. The > > machine either has sufficient free+freeable memory or it does not; > > How does one go about deciding which host in a multi thousand host > deployment to try the claim hypercall on? I don't get paid enough to solve that problem :-) VM placement (both for new domains and migration due to load-balancing and power-management) is dependent on a number of factors currently involving CPU utilization, SAN utilization, and LAN utilization, I think using historical trends on streams of sampled statistics. This is very non-deterministic as all of these factors may vary dramatically within a sampling interval. Adding free+freeable memory to this just adds one more such statistic. Actually two, as it is probably best to track free separately from freeable since a candidate host that has enough free memory should have preference over one with freeable memory. Sorry if that's not very satisfying but anything beyond that meager description is outside of my area of expertise. Dan P.S. I don't think I've ever said _thousands_ of physical hosts, just hundreds (with thousands of VMs). Honestly I don't know the upper support bound for an Oracle VM "server pool" (which is what we call the collection of hundreds of physical machines)... it may be thousands. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:12:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:12:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOLR-0004UC-32; Mon, 05 Nov 2012 15:12:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOLO-0004U7-P3 for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 15:12:07 +0000 Received: from [85.158.139.83:46322] by server-6.bemta-5.messagelabs.com id 7D/BC-19321-547D7905; Mon, 05 Nov 2012 15:12:05 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-11.tower-182.messagelabs.com!1352128320!21609403!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8977 invoked from network); 5 Nov 2012 15:12:02 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 15:12:02 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148249615; Mon, 05 Nov 2012 10:10:29 -0500 From: Matthew Fioravante To: key@linux.vnet.ibm.com, mail@srajiv.net, jeremy@goop.org, tpmdd-devel@lists.sourceforge.net, xen-devel@lists.xensource.com, konrad.wilk@oracle.com Date: Mon, 5 Nov 2012 10:09:57 -0500 Message-Id: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch ports the xen vtpm frontend driver for linux from the linux-2.6.18-xen.hg tree to linux-stable. Signed-off-by: Matthew Fioravante --- drivers/char/tpm/Kconfig | 9 + drivers/char/tpm/Makefile | 2 + drivers/char/tpm/tpm.h | 15 + drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_vtpm.h | 55 +++ drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ include/xen/interface/io/tpmif.h | 77 +++++ 7 files changed, 1391 insertions(+) create mode 100644 drivers/char/tpm/tpm_vtpm.c create mode 100644 drivers/char/tpm/tpm_vtpm.h create mode 100644 drivers/char/tpm/tpm_xen.c create mode 100644 include/xen/interface/io/tpmif.h diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 915875e..08c1010 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -81,4 +81,13 @@ config TCG_IBMVTPM will be accessible from within Linux. To compile this driver as a module, choose M here; the module will be called tpm_ibmvtpm. +config TCG_XEN + tristate "XEN TPM Interface" + depends on TCG_TPM && XEN + ---help--- + If you want to make TPM support available to a Xen user domain, + say Yes and it will be accessible from within Linux. + To compile this driver as a module, choose M here; the module + will be called tpm_xenu. + endif # TCG_TPM diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 5b3fc8b..16911c5 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o +tpm_xenu-y = tpm_xen.o tpm_vtpm.o diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 8ef7649..2e5a47a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -130,6 +130,9 @@ struct tpm_chip { struct list_head list; void (*release) (struct device *); +#if CONFIG_XEN + void *priv; +#endif }; #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) @@ -310,6 +313,18 @@ struct tpm_cmd_t { ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); +#ifdef CONFIG_XEN +static inline void *chip_get_private(const struct tpm_chip *chip) +{ + return chip->priv; +} + +static inline void chip_set_private(struct tpm_chip *chip, void *priv) +{ + chip->priv = priv; +} +#endif + extern int tpm_get_timeouts(struct tpm_chip *); extern void tpm_gen_interrupt(struct tpm_chip *); extern int tpm_do_selftest(struct tpm_chip *); diff --git a/drivers/char/tpm/tpm_vtpm.c b/drivers/char/tpm/tpm_vtpm.c new file mode 100644 index 0000000..7687252 --- /dev/null +++ b/drivers/char/tpm/tpm_vtpm.c @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2006 IBM Corporation + * + * Authors: + * Stefan Berger + * + * Generic device driver part for device drivers in a virtualized + * environment. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + * + */ + +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "tpm_vtpm.h" + +/* read status bits */ +enum { + STATUS_BUSY = 0x01, + STATUS_DATA_AVAIL = 0x02, + STATUS_READY = 0x04 +}; + +struct transmission { + struct list_head next; + + unsigned char *request; + size_t request_len; + size_t request_buflen; + + unsigned char *response; + size_t response_len; + size_t response_buflen; + + unsigned int flags; +}; + +enum { + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 +}; + + +enum { + DATAEX_FLAG_QUEUED_ONLY = 0x1 +}; + + +/* local variables */ + +/* local function prototypes */ +static int _vtpm_send_queued(struct tpm_chip *chip); + + +/* ============================================================= + * Some utility functions + * ============================================================= + */ +static void vtpm_state_init(struct vtpm_state *vtpms) +{ + vtpms->current_request = NULL; + spin_lock_init(&vtpms->req_list_lock); + init_waitqueue_head(&vtpms->req_wait_queue); + INIT_LIST_HEAD(&vtpms->queued_requests); + + vtpms->current_response = NULL; + spin_lock_init(&vtpms->resp_list_lock); + init_waitqueue_head(&vtpms->resp_wait_queue); + + vtpms->disconnect_time = jiffies; +} + + +static inline struct transmission *transmission_alloc(void) +{ + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); +} + + static unsigned char * +transmission_set_req_buffer(struct transmission *t, + unsigned char *buffer, size_t len) +{ + if (t->request_buflen < len) { + kfree(t->request); + t->request = kmalloc(len, GFP_KERNEL); + if (!t->request) { + t->request_buflen = 0; + return NULL; + } + t->request_buflen = len; + } + + memcpy(t->request, buffer, len); + t->request_len = len; + + return t->request; +} + + static unsigned char * +transmission_set_res_buffer(struct transmission *t, + const unsigned char *buffer, size_t len) +{ + if (t->response_buflen < len) { + kfree(t->response); + t->response = kmalloc(len, GFP_ATOMIC); + if (!t->response) { + t->response_buflen = 0; + return NULL; + } + t->response_buflen = len; + } + + memcpy(t->response, buffer, len); + t->response_len = len; + + return t->response; +} + +static inline void transmission_free(struct transmission *t) +{ + kfree(t->request); + kfree(t->response); + kfree(t); +} + +/* ============================================================= + * Interface with the lower layer driver + * ============================================================= + */ +/* + * Lower layer uses this function to make a response available. + */ +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, + void *ptr) +{ + unsigned long flags; + int ret_size = 0; + struct transmission *t; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * The list with requests must contain one request + * only and the element there must be the one that + * was passed to me from the front-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if (vtpms->current_request != ptr) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return 0; + } + t = vtpms->current_request; + if (t) { + transmission_free(t); + vtpms->current_request = NULL; + } + + t = transmission_alloc(); + if (t) { + if (!transmission_set_res_buffer(t, buffer, count)) { + transmission_free(t); + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return -ENOMEM; + } + ret_size = count; + vtpms->current_response = t; + wake_up_interruptible(&vtpms->resp_wait_queue); + } + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + + return ret_size; +} + + +/* + * Lower layer indicates its status (connected/disconnected) + */ +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) +{ + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + vtpms->vd_status = vd_status; + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) + vtpms->disconnect_time = jiffies; +} + +/* ============================================================= + * Interface with the generic TPM driver + * ============================================================= + */ +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * Check if the previous operation only queued the command + * In this case there won't be a response, so I just + * return from here and reset that flag. In any other + * case I should receive a response from the back-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + /* + * The first few commands (measurements) must be + * queued since it might not be possible to talk to the + * TPM, yet. + * Return a response of up to 30 '0's. + */ + + count = min_t(size_t, count, 30); + memset(buf, 0x0, count); + return count; + } + /* + * Check whether something is in the responselist and if + * there's nothing in the list wait for something to appear. + */ + + if (!vtpms->current_response) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, + 1000); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + rc = min(count, t->response_len); + memcpy(buf, t->response, rc); + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct transmission *t = transmission_alloc(); + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + if (!t) + return -ENOMEM; + /* + * If there's a current request, it must be the + * previous request that has timed out. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + if (vtpms->current_request != NULL) { + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" + " Previous request must have timed out.\n"); + transmission_free(vtpms->current_request); + vtpms->current_request = NULL; + } + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + /* + * Queue the packet if the driver below is not + * ready, yet, or there is any packet already + * in the queue. + * If the driver below is ready, unqueue all + * packets first before sending our current + * packet. + * For each unqueued packet, except for the + * last (=current) packet, call the function + * tpm_xen_recv to wait for the response to come + * back. + */ + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { + if (time_after(jiffies, + vtpms->disconnect_time + HZ * 10)) { + rc = -ENOENT; + } else { + goto queue_it; + } + } else { + /* + * Send all queued packets. + */ + if (_vtpm_send_queued(chip) == 0) { + + vtpms->current_request = t; + + rc = vtpm_vd_send(vtpms->tpm_private, + buf, + count, + t); + /* + * The generic TPM driver will call + * the function to receive the response. + */ + if (rc < 0) { + vtpms->current_request = NULL; + goto queue_it; + } + } else { +queue_it: + if (!transmission_set_req_buffer(t, buf, count)) { + transmission_free(t); + rc = -ENOMEM; + goto exit; + } + /* + * An error occurred. Don't event try + * to send the current request. Just + * queue it. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; + list_add_tail(&t->next, &vtpms->queued_requests); + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + } + } + +exit: + return rc; +} + + +/* + * Send all queued requests. + */ +static int _vtpm_send_queued(struct tpm_chip *chip) +{ + int rc; + int error = 0; + unsigned long flags; + unsigned char buffer[1]; + struct vtpm_state *vtpms; + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->req_list_lock, flags); + + while (!list_empty(&vtpms->queued_requests)) { + /* + * Need to dequeue them. + * Read the result into a dummy buffer. + */ + struct transmission *qt = (struct transmission *) + vtpms->queued_requests.next; + list_del(&qt->next); + vtpms->current_request = qt; + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + rc = vtpm_vd_send(vtpms->tpm_private, + qt->request, + qt->request_len, + qt); + + if (rc < 0) { + spin_lock_irqsave(&vtpms->req_list_lock, flags); + qt = vtpms->current_request; + if (qt != NULL) { + /* + * requeue it at the beginning + * of the list + */ + list_add(&qt->next, + &vtpms->queued_requests); + } + vtpms->current_request = NULL; + error = 1; + break; + } + /* + * After this point qt is not valid anymore! + * It is freed when the front-end is delivering + * the data by calling tpm_recv + */ + /* + * Receive response into provided dummy buffer + */ + rc = vtpm_recv(chip, buffer, sizeof(buffer)); + spin_lock_irqsave(&vtpms->req_list_lock, flags); + } + + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + return error; +} + +static void vtpm_cancel(struct tpm_chip *chip) +{ + unsigned long flags; + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + + if (!vtpms->current_response && vtpms->current_request) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on(&vtpms->resp_wait_queue); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); +} + +static u8 vtpm_status(struct tpm_chip *chip) +{ + u8 rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + /* + * Data are available if: + * - there's a current response + * - the last packet was queued only (this is fake, but necessary to + * get the generic TPM layer to call the receive function.) + */ + if (vtpms->current_response || + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { + rc = STATUS_DATA_AVAIL; + } else if (!vtpms->current_response && !vtpms->current_request) { + rc = STATUS_READY; + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static const struct file_operations vtpm_ops = { + .owner = THIS_MODULE, + .llseek = no_llseek, + .open = tpm_open, + .read = tpm_read, + .write = tpm_write, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, + NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute *vtpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + NULL, +}; + +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; + +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) + +static struct tpm_vendor_specific tpm_vtpm = { + .recv = vtpm_recv, + .send = vtpm_send, + .cancel = vtpm_cancel, + .status = vtpm_status, + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, + .req_complete_val = STATUS_DATA_AVAIL, + .req_canceled = STATUS_READY, + .attr_group = &vtpm_attr_grp, + .miscdev = { + .fops = &vtpm_ops, + }, + .duration = { + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + }, +}; + +struct tpm_chip *init_vtpm(struct device *dev, + struct tpm_private *tp) +{ + long rc; + struct tpm_chip *chip; + struct vtpm_state *vtpms; + + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); + if (!vtpms) + return ERR_PTR(-ENOMEM); + + vtpm_state_init(vtpms); + vtpms->tpm_private = tp; + + chip = tpm_register_hardware(dev, &tpm_vtpm); + if (!chip) { + rc = -ENODEV; + goto err_free_mem; + } + + chip_set_private(chip, vtpms); + + return chip; + +err_free_mem: + kfree(vtpms); + + return ERR_PTR(rc); +} + +void cleanup_vtpm(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + tpm_remove_hardware(dev); + kfree(vtpms); +} diff --git a/drivers/char/tpm/tpm_vtpm.h b/drivers/char/tpm/tpm_vtpm.h new file mode 100644 index 0000000..d888fd8 --- /dev/null +++ b/drivers/char/tpm/tpm_vtpm.h @@ -0,0 +1,55 @@ +#ifndef TPM_VTPM_H +#define TPM_VTPM_H + +struct tpm_chip; +struct tpm_private; + +struct vtpm_state { + struct transmission *current_request; + spinlock_t req_list_lock; + wait_queue_head_t req_wait_queue; + + struct list_head queued_requests; + + struct transmission *current_response; + spinlock_t resp_list_lock; + wait_queue_head_t resp_wait_queue; + + u8 vd_status; + u8 flags; + + unsigned long disconnect_time; + + /* + * The following is a private structure of the underlying + * driver. It is passed as parameter in the send function. + */ + struct tpm_private *tpm_private; +}; + + +enum vdev_status { + TPM_VD_STATUS_DISCONNECTED = 0x0, + TPM_VD_STATUS_CONNECTED = 0x1 +}; + +/* this function is called from tpm_vtpm.c */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr); + +/* these functions are offered by tpm_vtpm.c */ +struct tpm_chip *init_vtpm(struct device *, + struct tpm_private *); +void cleanup_vtpm(struct device *); +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, void *ptr); +void vtpm_vd_status(const struct tpm_chip *, u8 status); + +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = chip_get_private(chip); + return vtpms->tpm_private; +} + +#endif diff --git a/drivers/char/tpm/tpm_xen.c b/drivers/char/tpm/tpm_xen.c new file mode 100644 index 0000000..7198de3 --- /dev/null +++ b/drivers/char/tpm/tpm_xen.c @@ -0,0 +1,690 @@ +/* + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from drivers/xen/netfront/netfront.c + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "tpm_vtpm.h" + +#undef DEBUG + +#define GRANT_INVALID_REF 0 + +/* local structures */ +struct tpm_private { + struct tpm_chip *chip; + + tpmif_tx_interface_t *tx; + atomic_t refcnt; + unsigned int evtchn; + u8 is_connected; + u8 is_suspended; + + spinlock_t tx_lock; + + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; + + atomic_t tx_busy; + void *tx_remember; + + domid_t backend_id; + wait_queue_head_t wait_q; + + struct xenbus_device *dev; + int ring_ref; +}; + +struct tx_buffer { + unsigned int size; /* available space in data */ + unsigned int len; /* used space in data */ + unsigned char *data; /* pointer to a page */ +}; + + +/* locally visible variables */ +static grant_ref_t gref_head; +static struct tpm_private *my_priv; + +/* local function prototypes */ +static irqreturn_t tpmif_int(int irq, + void *tpm_priv); +static void tpmif_rx_action(unsigned long unused); +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid); +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); +static void tpmif_free_tx_buffers(struct tpm_private *tp); +static void tpmif_set_connected_state(struct tpm_private *tp, + u8 newstate); +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int userbuffer, + void *remember); +static void destroy_tpmring(struct tpm_private *tp); + + static inline int +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, + int isuserbuffer) +{ + int copied = len; + + if (len > txb->size) + copied = txb->size; + if (isuserbuffer) { + if (copy_from_user(txb->data, src, copied)) + return -EFAULT; + } else { + memcpy(txb->data, src, copied); + } + txb->len = len; + return copied; +} + +static inline struct tx_buffer *tx_buffer_alloc(void) +{ + struct tx_buffer *txb; + + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); + if (!txb) + return NULL; + + txb->len = 0; + txb->size = PAGE_SIZE; + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); + if (txb->data == NULL) { + kfree(txb); + txb = NULL; + } + + return txb; +} + + +static inline void tx_buffer_free(struct tx_buffer *txb) +{ + if (txb) { + free_page((long)txb->data); + kfree(txb); + } +} + +/************************************************************** + Utility function for the tpm_private structure + **************************************************************/ +static void tpm_private_init(struct tpm_private *tp) +{ + spin_lock_init(&tp->tx_lock); + init_waitqueue_head(&tp->wait_q); + atomic_set(&tp->refcnt, 1); +} + +static void tpm_private_put(void) +{ + if (!atomic_dec_and_test(&my_priv->refcnt)) + return; + + tpmif_free_tx_buffers(my_priv); + kfree(my_priv); + my_priv = NULL; +} + +static struct tpm_private *tpm_private_get(void) +{ + int err; + + if (my_priv) { + atomic_inc(&my_priv->refcnt); + return my_priv; + } + + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); + if (!my_priv) + return NULL; + + tpm_private_init(my_priv); + err = tpmif_allocate_tx_buffers(my_priv); + if (err < 0) + tpm_private_put(); + + return my_priv; +} + +/************************************************************** + + The interface to let the tpm plugin register its callback + function and send data to another partition using this module + + **************************************************************/ + +static DEFINE_MUTEX(suspend_lock); +/* + * Send data via this module by calling this function + */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr) +{ + int sent; + + mutex_lock(&suspend_lock); + sent = tpm_xmit(tp, buf, count, 0, ptr); + mutex_unlock(&suspend_lock); + + return sent; +} + +/************************************************************** + XENBUS support code + **************************************************************/ + +static int setup_tpmring(struct xenbus_device *dev, + struct tpm_private *tp) +{ + tpmif_tx_interface_t *sring; + int err; + + tp->ring_ref = GRANT_INVALID_REF; + + sring = (void *)__get_free_page(GFP_KERNEL); + if (!sring) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); + return -ENOMEM; + } + tp->tx = sring; + + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); + if (err < 0) { + free_page((unsigned long)sring); + tp->tx = NULL; + xenbus_dev_fatal(dev, err, "allocating grant reference"); + goto fail; + } + tp->ring_ref = err; + + err = tpmif_connect(dev, tp, dev->otherend_id); + if (err) + goto fail; + + return 0; +fail: + destroy_tpmring(tp); + return err; +} + + +static void destroy_tpmring(struct tpm_private *tp) +{ + tpmif_set_connected_state(tp, 0); + + if (tp->ring_ref != GRANT_INVALID_REF) { + gnttab_end_foreign_access(tp->ring_ref, + 0, (unsigned long)tp->tx); + tp->ring_ref = GRANT_INVALID_REF; + tp->tx = NULL; + } + + if (tp->evtchn) + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); + + tp->evtchn = GRANT_INVALID_REF; +} + + +static int talk_to_backend(struct xenbus_device *dev, + struct tpm_private *tp) +{ + const char *message = NULL; + int err; + struct xenbus_transaction xbt; + + err = setup_tpmring(dev, tp); + if (err) { + xenbus_dev_fatal(dev, err, "setting up ring"); + goto out; + } + +again: + err = xenbus_transaction_start(&xbt); + if (err) { + xenbus_dev_fatal(dev, err, "starting transaction"); + goto destroy_tpmring; + } + + err = xenbus_printf(xbt, dev->nodename, + "ring-ref", "%u", tp->ring_ref); + if (err) { + message = "writing ring-ref"; + goto abort_transaction; + } + + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + tp->evtchn); + if (err) { + message = "writing event-channel"; + goto abort_transaction; + } + + err = xenbus_transaction_end(xbt, 0); + if (err == -EAGAIN) + goto again; + if (err) { + xenbus_dev_fatal(dev, err, "completing transaction"); + goto destroy_tpmring; + } + + xenbus_switch_state(dev, XenbusStateConnected); + + return 0; + +abort_transaction: + xenbus_transaction_end(xbt, 1); + if (message) + xenbus_dev_error(dev, err, "%s", message); +destroy_tpmring: + destroy_tpmring(tp); +out: + return err; +} + +/** + * Callback received when the backend's state changes. + */ +static void backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateReconfiguring: + case XenbusStateReconfigured: + case XenbusStateUnknown: + break; + + case XenbusStateConnected: + tpmif_set_connected_state(tp, 1); + break; + + case XenbusStateClosing: + tpmif_set_connected_state(tp, 0); + xenbus_frontend_closed(dev); + break; + + case XenbusStateClosed: + tpmif_set_connected_state(tp, 0); + if (tp->is_suspended == 0) + device_unregister(&dev->dev); + xenbus_frontend_closed(dev); + break; + } +} + +static int tpmfront_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int err; + int handle; + struct tpm_private *tp = tpm_private_get(); + + if (!tp) + return -ENOMEM; + + tp->chip = init_vtpm(&dev->dev, tp); + if (IS_ERR(tp->chip)) + return PTR_ERR(tp->chip); + + err = xenbus_scanf(XBT_NIL, dev->nodename, + "handle", "%i", &handle); + if (XENBUS_EXIST_ERR(err)) + return err; + + if (err < 0) { + xenbus_dev_fatal(dev, err, "reading virtual-device"); + return err; + } + + tp->dev = dev; + + err = talk_to_backend(dev, tp); + if (err) { + tpm_private_put(); + return err; + } + + return 0; +} + + +static int __devexit tpmfront_remove(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + cleanup_vtpm(&dev->dev); + return 0; +} + +static int tpmfront_suspend(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + u32 ctr; + + /* Take the lock, preventing any application from sending. */ + mutex_lock(&suspend_lock); + tp->is_suspended = 1; + + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { + /* Wait for a request to be responded to. */ + interruptible_sleep_on_timeout(&tp->wait_q, 100); + } + + return 0; +} + +static int tpmfront_suspend_finish(struct tpm_private *tp) +{ + tp->is_suspended = 0; + /* Allow applications to send again. */ + mutex_unlock(&suspend_lock); + return 0; +} + +static int tpmfront_resume(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + return talk_to_backend(dev, tp); +} + +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid) +{ + int err; + + tp->backend_id = domid; + tp->evtchn = GRANT_INVALID_REF; + + err = xenbus_alloc_evtchn(dev, &tp->evtchn); + if (err) + return err; + + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, + 0, "tpmif", tp); + if (err <= 0) + return err; + + return 0; +} + +static const struct xenbus_device_id tpmfront_ids[] = { + { "vtpm" }, + { "" } +}; +MODULE_ALIAS("xen:vtpm"); + +static DEFINE_XENBUS_DRIVER(tpmfront, , + .probe = tpmfront_probe, + .remove = __devexit_p(tpmfront_remove), + .resume = tpmfront_resume, + .otherend_changed = backend_changed, + .suspend = tpmfront_suspend, + ); + +static int __init init_tpm_xenbus(void) +{ + return xenbus_register_frontend(&tpmfront_driver); +} + +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { + tp->tx_buffers[i] = tx_buffer_alloc(); + if (!tp->tx_buffers[i]) { + tpmif_free_tx_buffers(tp); + return -ENOMEM; + } + } + return 0; +} + +static void tpmif_free_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) + tx_buffer_free(tp->tx_buffers[i]); +} + +static void tpmif_rx_action(unsigned long priv) +{ + struct tpm_private *tp = (struct tpm_private *)priv; + int i = 0; + unsigned int received; + unsigned int offset = 0; + u8 *buffer; + tpmif_tx_request_t *tx = &tp->tx->ring[i].req; + + atomic_set(&tp->tx_busy, 0); + wake_up_interruptible(&tp->wait_q); + + received = tx->size; + + buffer = kmalloc(received, GFP_ATOMIC); + if (!buffer) + return; + + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + tpmif_tx_request_t *tx; + unsigned int tocopy; + + tx = &tp->tx->ring[i].req; + tocopy = tx->size; + if (tocopy > PAGE_SIZE) + tocopy = PAGE_SIZE; + + memcpy(&buffer[offset], txb->data, tocopy); + + gnttab_release_grant_reference(&gref_head, tx->ref); + + offset += tocopy; + } + + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); + kfree(buffer); +} + + +static irqreturn_t tpmif_int(int irq, void *tpm_priv) +{ + struct tpm_private *tp = tpm_priv; + unsigned long flags; + + spin_lock_irqsave(&tp->tx_lock, flags); + tpmif_rx_tasklet.data = (unsigned long)tp; + tasklet_schedule(&tpmif_rx_tasklet); + spin_unlock_irqrestore(&tp->tx_lock, flags); + + return IRQ_HANDLED; +} + + +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int isuserbuffer, + void *remember) +{ + tpmif_tx_request_t *tx; + TPMIF_RING_IDX i; + unsigned int offset = 0; + + spin_lock_irq(&tp->tx_lock); + + if (unlikely(atomic_read(&tp->tx_busy))) { + spin_unlock_irq(&tp->tx_lock); + return -EBUSY; + } + + if (tp->is_connected != 1) { + spin_unlock_irq(&tp->tx_lock); + return -EIO; + } + + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + int copied; + + if (!txb) { + spin_unlock_irq(&tp->tx_lock); + return -EFAULT; + } + + copied = tx_buffer_copy(txb, &buf[offset], count, + isuserbuffer); + if (copied < 0) { + /* An error occurred */ + spin_unlock_irq(&tp->tx_lock); + return copied; + } + count -= copied; + offset += copied; + + tx = &tp->tx->ring[i].req; + tx->addr = virt_to_machine(txb->data).maddr; + tx->size = txb->len; + tx->unused = 0; + + /* Get the granttable reference for this page. */ + tx->ref = gnttab_claim_grant_reference(&gref_head); + if (tx->ref == -ENOSPC) { + spin_unlock_irq(&tp->tx_lock); + return -ENOSPC; + } + gnttab_grant_foreign_access_ref(tx->ref, + tp->backend_id, + virt_to_mfn(txb->data), + 0 /*RW*/); + wmb(); + } + + atomic_set(&tp->tx_busy, 1); + tp->tx_remember = remember; + + mb(); + + notify_remote_via_evtchn(tp->evtchn); + + spin_unlock_irq(&tp->tx_lock); + return offset; +} + + +static void tpmif_notify_upperlayer(struct tpm_private *tp) +{ + /* Notify upper layer about the state of the connection to the BE. */ + vtpm_vd_status(tp->chip, (tp->is_connected + ? TPM_VD_STATUS_CONNECTED + : TPM_VD_STATUS_DISCONNECTED)); +} + + +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) +{ + /* + * Don't notify upper layer if we are in suspend mode and + * should disconnect - assumption is that we will resume + * The mutex keeps apps from sending. + */ + if (is_connected == 0 && tp->is_suspended == 1) + return; + + /* + * Unlock the mutex if we are connected again + * after being suspended - now resuming. + * This also removes the suspend state. + */ + if (is_connected == 1 && tp->is_suspended == 1) + tpmfront_suspend_finish(tp); + + if (is_connected != tp->is_connected) { + tp->is_connected = is_connected; + tpmif_notify_upperlayer(tp); + } +} + + + +/* ================================================================= + * Initialization function. + * ================================================================= + */ + + +static int __init tpmif_init(void) +{ + struct tpm_private *tp; + + if (!xen_domain()) + return -ENODEV; + + tp = tpm_private_get(); + if (!tp) + return -ENOMEM; + + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, + &gref_head) < 0) { + tpm_private_put(); + return -EFAULT; + } + + init_tpm_xenbus(); + return 0; +} + + +module_init(tpmif_init); + +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h new file mode 100644 index 0000000..5342fca --- /dev/null +++ b/include/xen/interface/io/tpmif.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * tpmif.h + * + * TPM I/O interface for Xen guest OSes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from tools/libxc/xen/io/netif.h + * + * Copyright (c) 2003-2004, Keir Fraser + */ + +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ +#define __XEN_PUBLIC_IO_TPMIF_H__ + +#include "../grant_table.h" + +struct tpmif_tx_request { + unsigned long addr; /* Machine address of packet. */ + grant_ref_t ref; /* grant table access reference */ + uint16_t unused; + uint16_t size; /* Packet size in bytes. */ +}; +typedef struct tpmif_tx_request tpmif_tx_request_t; + +/* + * The TPMIF_TX_RING_SIZE defines the number of pages the + * front-end and backend can exchange (= size of array). + */ +typedef uint32_t TPMIF_RING_IDX; + +#define TPMIF_TX_RING_SIZE 1 + +/* This structure must fit in a memory page. */ + +struct tpmif_ring { + struct tpmif_tx_request req; +}; +typedef struct tpmif_ring tpmif_ring_t; + +struct tpmif_tx_interface { + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; +}; +typedef struct tpmif_tx_interface tpmif_tx_interface_t; + +#endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:12:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:12:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOLR-0004UC-32; Mon, 05 Nov 2012 15:12:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOLO-0004U7-P3 for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 15:12:07 +0000 Received: from [85.158.139.83:46322] by server-6.bemta-5.messagelabs.com id 7D/BC-19321-547D7905; Mon, 05 Nov 2012 15:12:05 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-11.tower-182.messagelabs.com!1352128320!21609403!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8977 invoked from network); 5 Nov 2012 15:12:02 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 15:12:02 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148249615; Mon, 05 Nov 2012 10:10:29 -0500 From: Matthew Fioravante To: key@linux.vnet.ibm.com, mail@srajiv.net, jeremy@goop.org, tpmdd-devel@lists.sourceforge.net, xen-devel@lists.xensource.com, konrad.wilk@oracle.com Date: Mon, 5 Nov 2012 10:09:57 -0500 Message-Id: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante , linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch ports the xen vtpm frontend driver for linux from the linux-2.6.18-xen.hg tree to linux-stable. Signed-off-by: Matthew Fioravante --- drivers/char/tpm/Kconfig | 9 + drivers/char/tpm/Makefile | 2 + drivers/char/tpm/tpm.h | 15 + drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ drivers/char/tpm/tpm_vtpm.h | 55 +++ drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ include/xen/interface/io/tpmif.h | 77 +++++ 7 files changed, 1391 insertions(+) create mode 100644 drivers/char/tpm/tpm_vtpm.c create mode 100644 drivers/char/tpm/tpm_vtpm.h create mode 100644 drivers/char/tpm/tpm_xen.c create mode 100644 include/xen/interface/io/tpmif.h diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 915875e..08c1010 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -81,4 +81,13 @@ config TCG_IBMVTPM will be accessible from within Linux. To compile this driver as a module, choose M here; the module will be called tpm_ibmvtpm. +config TCG_XEN + tristate "XEN TPM Interface" + depends on TCG_TPM && XEN + ---help--- + If you want to make TPM support available to a Xen user domain, + say Yes and it will be accessible from within Linux. + To compile this driver as a module, choose M here; the module + will be called tpm_xenu. + endif # TCG_TPM diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 5b3fc8b..16911c5 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o +tpm_xenu-y = tpm_xen.o tpm_vtpm.o diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 8ef7649..2e5a47a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -130,6 +130,9 @@ struct tpm_chip { struct list_head list; void (*release) (struct device *); +#if CONFIG_XEN + void *priv; +#endif }; #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) @@ -310,6 +313,18 @@ struct tpm_cmd_t { ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); +#ifdef CONFIG_XEN +static inline void *chip_get_private(const struct tpm_chip *chip) +{ + return chip->priv; +} + +static inline void chip_set_private(struct tpm_chip *chip, void *priv) +{ + chip->priv = priv; +} +#endif + extern int tpm_get_timeouts(struct tpm_chip *); extern void tpm_gen_interrupt(struct tpm_chip *); extern int tpm_do_selftest(struct tpm_chip *); diff --git a/drivers/char/tpm/tpm_vtpm.c b/drivers/char/tpm/tpm_vtpm.c new file mode 100644 index 0000000..7687252 --- /dev/null +++ b/drivers/char/tpm/tpm_vtpm.c @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2006 IBM Corporation + * + * Authors: + * Stefan Berger + * + * Generic device driver part for device drivers in a virtualized + * environment. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + * + */ + +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "tpm_vtpm.h" + +/* read status bits */ +enum { + STATUS_BUSY = 0x01, + STATUS_DATA_AVAIL = 0x02, + STATUS_READY = 0x04 +}; + +struct transmission { + struct list_head next; + + unsigned char *request; + size_t request_len; + size_t request_buflen; + + unsigned char *response; + size_t response_len; + size_t response_buflen; + + unsigned int flags; +}; + +enum { + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 +}; + + +enum { + DATAEX_FLAG_QUEUED_ONLY = 0x1 +}; + + +/* local variables */ + +/* local function prototypes */ +static int _vtpm_send_queued(struct tpm_chip *chip); + + +/* ============================================================= + * Some utility functions + * ============================================================= + */ +static void vtpm_state_init(struct vtpm_state *vtpms) +{ + vtpms->current_request = NULL; + spin_lock_init(&vtpms->req_list_lock); + init_waitqueue_head(&vtpms->req_wait_queue); + INIT_LIST_HEAD(&vtpms->queued_requests); + + vtpms->current_response = NULL; + spin_lock_init(&vtpms->resp_list_lock); + init_waitqueue_head(&vtpms->resp_wait_queue); + + vtpms->disconnect_time = jiffies; +} + + +static inline struct transmission *transmission_alloc(void) +{ + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); +} + + static unsigned char * +transmission_set_req_buffer(struct transmission *t, + unsigned char *buffer, size_t len) +{ + if (t->request_buflen < len) { + kfree(t->request); + t->request = kmalloc(len, GFP_KERNEL); + if (!t->request) { + t->request_buflen = 0; + return NULL; + } + t->request_buflen = len; + } + + memcpy(t->request, buffer, len); + t->request_len = len; + + return t->request; +} + + static unsigned char * +transmission_set_res_buffer(struct transmission *t, + const unsigned char *buffer, size_t len) +{ + if (t->response_buflen < len) { + kfree(t->response); + t->response = kmalloc(len, GFP_ATOMIC); + if (!t->response) { + t->response_buflen = 0; + return NULL; + } + t->response_buflen = len; + } + + memcpy(t->response, buffer, len); + t->response_len = len; + + return t->response; +} + +static inline void transmission_free(struct transmission *t) +{ + kfree(t->request); + kfree(t->response); + kfree(t); +} + +/* ============================================================= + * Interface with the lower layer driver + * ============================================================= + */ +/* + * Lower layer uses this function to make a response available. + */ +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, + void *ptr) +{ + unsigned long flags; + int ret_size = 0; + struct transmission *t; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * The list with requests must contain one request + * only and the element there must be the one that + * was passed to me from the front-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if (vtpms->current_request != ptr) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return 0; + } + t = vtpms->current_request; + if (t) { + transmission_free(t); + vtpms->current_request = NULL; + } + + t = transmission_alloc(); + if (t) { + if (!transmission_set_res_buffer(t, buffer, count)) { + transmission_free(t); + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return -ENOMEM; + } + ret_size = count; + vtpms->current_response = t; + wake_up_interruptible(&vtpms->resp_wait_queue); + } + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + + return ret_size; +} + + +/* + * Lower layer indicates its status (connected/disconnected) + */ +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) +{ + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + vtpms->vd_status = vd_status; + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) + vtpms->disconnect_time = jiffies; +} + +/* ============================================================= + * Interface with the generic TPM driver + * ============================================================= + */ +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * Check if the previous operation only queued the command + * In this case there won't be a response, so I just + * return from here and reset that flag. In any other + * case I should receive a response from the back-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + /* + * The first few commands (measurements) must be + * queued since it might not be possible to talk to the + * TPM, yet. + * Return a response of up to 30 '0's. + */ + + count = min_t(size_t, count, 30); + memset(buf, 0x0, count); + return count; + } + /* + * Check whether something is in the responselist and if + * there's nothing in the list wait for something to appear. + */ + + if (!vtpms->current_response) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, + 1000); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + rc = min(count, t->response_len); + memcpy(buf, t->response, rc); + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct transmission *t = transmission_alloc(); + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + if (!t) + return -ENOMEM; + /* + * If there's a current request, it must be the + * previous request that has timed out. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + if (vtpms->current_request != NULL) { + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" + " Previous request must have timed out.\n"); + transmission_free(vtpms->current_request); + vtpms->current_request = NULL; + } + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + /* + * Queue the packet if the driver below is not + * ready, yet, or there is any packet already + * in the queue. + * If the driver below is ready, unqueue all + * packets first before sending our current + * packet. + * For each unqueued packet, except for the + * last (=current) packet, call the function + * tpm_xen_recv to wait for the response to come + * back. + */ + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { + if (time_after(jiffies, + vtpms->disconnect_time + HZ * 10)) { + rc = -ENOENT; + } else { + goto queue_it; + } + } else { + /* + * Send all queued packets. + */ + if (_vtpm_send_queued(chip) == 0) { + + vtpms->current_request = t; + + rc = vtpm_vd_send(vtpms->tpm_private, + buf, + count, + t); + /* + * The generic TPM driver will call + * the function to receive the response. + */ + if (rc < 0) { + vtpms->current_request = NULL; + goto queue_it; + } + } else { +queue_it: + if (!transmission_set_req_buffer(t, buf, count)) { + transmission_free(t); + rc = -ENOMEM; + goto exit; + } + /* + * An error occurred. Don't event try + * to send the current request. Just + * queue it. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; + list_add_tail(&t->next, &vtpms->queued_requests); + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + } + } + +exit: + return rc; +} + + +/* + * Send all queued requests. + */ +static int _vtpm_send_queued(struct tpm_chip *chip) +{ + int rc; + int error = 0; + unsigned long flags; + unsigned char buffer[1]; + struct vtpm_state *vtpms; + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->req_list_lock, flags); + + while (!list_empty(&vtpms->queued_requests)) { + /* + * Need to dequeue them. + * Read the result into a dummy buffer. + */ + struct transmission *qt = (struct transmission *) + vtpms->queued_requests.next; + list_del(&qt->next); + vtpms->current_request = qt; + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + rc = vtpm_vd_send(vtpms->tpm_private, + qt->request, + qt->request_len, + qt); + + if (rc < 0) { + spin_lock_irqsave(&vtpms->req_list_lock, flags); + qt = vtpms->current_request; + if (qt != NULL) { + /* + * requeue it at the beginning + * of the list + */ + list_add(&qt->next, + &vtpms->queued_requests); + } + vtpms->current_request = NULL; + error = 1; + break; + } + /* + * After this point qt is not valid anymore! + * It is freed when the front-end is delivering + * the data by calling tpm_recv + */ + /* + * Receive response into provided dummy buffer + */ + rc = vtpm_recv(chip, buffer, sizeof(buffer)); + spin_lock_irqsave(&vtpms->req_list_lock, flags); + } + + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + return error; +} + +static void vtpm_cancel(struct tpm_chip *chip) +{ + unsigned long flags; + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + + if (!vtpms->current_response && vtpms->current_request) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on(&vtpms->resp_wait_queue); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); +} + +static u8 vtpm_status(struct tpm_chip *chip) +{ + u8 rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + /* + * Data are available if: + * - there's a current response + * - the last packet was queued only (this is fake, but necessary to + * get the generic TPM layer to call the receive function.) + */ + if (vtpms->current_response || + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { + rc = STATUS_DATA_AVAIL; + } else if (!vtpms->current_response && !vtpms->current_request) { + rc = STATUS_READY; + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static const struct file_operations vtpm_ops = { + .owner = THIS_MODULE, + .llseek = no_llseek, + .open = tpm_open, + .read = tpm_read, + .write = tpm_write, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, + NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute *vtpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + NULL, +}; + +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; + +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) + +static struct tpm_vendor_specific tpm_vtpm = { + .recv = vtpm_recv, + .send = vtpm_send, + .cancel = vtpm_cancel, + .status = vtpm_status, + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, + .req_complete_val = STATUS_DATA_AVAIL, + .req_canceled = STATUS_READY, + .attr_group = &vtpm_attr_grp, + .miscdev = { + .fops = &vtpm_ops, + }, + .duration = { + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + }, +}; + +struct tpm_chip *init_vtpm(struct device *dev, + struct tpm_private *tp) +{ + long rc; + struct tpm_chip *chip; + struct vtpm_state *vtpms; + + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); + if (!vtpms) + return ERR_PTR(-ENOMEM); + + vtpm_state_init(vtpms); + vtpms->tpm_private = tp; + + chip = tpm_register_hardware(dev, &tpm_vtpm); + if (!chip) { + rc = -ENODEV; + goto err_free_mem; + } + + chip_set_private(chip, vtpms); + + return chip; + +err_free_mem: + kfree(vtpms); + + return ERR_PTR(rc); +} + +void cleanup_vtpm(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + tpm_remove_hardware(dev); + kfree(vtpms); +} diff --git a/drivers/char/tpm/tpm_vtpm.h b/drivers/char/tpm/tpm_vtpm.h new file mode 100644 index 0000000..d888fd8 --- /dev/null +++ b/drivers/char/tpm/tpm_vtpm.h @@ -0,0 +1,55 @@ +#ifndef TPM_VTPM_H +#define TPM_VTPM_H + +struct tpm_chip; +struct tpm_private; + +struct vtpm_state { + struct transmission *current_request; + spinlock_t req_list_lock; + wait_queue_head_t req_wait_queue; + + struct list_head queued_requests; + + struct transmission *current_response; + spinlock_t resp_list_lock; + wait_queue_head_t resp_wait_queue; + + u8 vd_status; + u8 flags; + + unsigned long disconnect_time; + + /* + * The following is a private structure of the underlying + * driver. It is passed as parameter in the send function. + */ + struct tpm_private *tpm_private; +}; + + +enum vdev_status { + TPM_VD_STATUS_DISCONNECTED = 0x0, + TPM_VD_STATUS_CONNECTED = 0x1 +}; + +/* this function is called from tpm_vtpm.c */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr); + +/* these functions are offered by tpm_vtpm.c */ +struct tpm_chip *init_vtpm(struct device *, + struct tpm_private *); +void cleanup_vtpm(struct device *); +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, void *ptr); +void vtpm_vd_status(const struct tpm_chip *, u8 status); + +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = chip_get_private(chip); + return vtpms->tpm_private; +} + +#endif diff --git a/drivers/char/tpm/tpm_xen.c b/drivers/char/tpm/tpm_xen.c new file mode 100644 index 0000000..7198de3 --- /dev/null +++ b/drivers/char/tpm/tpm_xen.c @@ -0,0 +1,690 @@ +/* + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from drivers/xen/netfront/netfront.c + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "tpm_vtpm.h" + +#undef DEBUG + +#define GRANT_INVALID_REF 0 + +/* local structures */ +struct tpm_private { + struct tpm_chip *chip; + + tpmif_tx_interface_t *tx; + atomic_t refcnt; + unsigned int evtchn; + u8 is_connected; + u8 is_suspended; + + spinlock_t tx_lock; + + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; + + atomic_t tx_busy; + void *tx_remember; + + domid_t backend_id; + wait_queue_head_t wait_q; + + struct xenbus_device *dev; + int ring_ref; +}; + +struct tx_buffer { + unsigned int size; /* available space in data */ + unsigned int len; /* used space in data */ + unsigned char *data; /* pointer to a page */ +}; + + +/* locally visible variables */ +static grant_ref_t gref_head; +static struct tpm_private *my_priv; + +/* local function prototypes */ +static irqreturn_t tpmif_int(int irq, + void *tpm_priv); +static void tpmif_rx_action(unsigned long unused); +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid); +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); +static void tpmif_free_tx_buffers(struct tpm_private *tp); +static void tpmif_set_connected_state(struct tpm_private *tp, + u8 newstate); +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int userbuffer, + void *remember); +static void destroy_tpmring(struct tpm_private *tp); + + static inline int +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, + int isuserbuffer) +{ + int copied = len; + + if (len > txb->size) + copied = txb->size; + if (isuserbuffer) { + if (copy_from_user(txb->data, src, copied)) + return -EFAULT; + } else { + memcpy(txb->data, src, copied); + } + txb->len = len; + return copied; +} + +static inline struct tx_buffer *tx_buffer_alloc(void) +{ + struct tx_buffer *txb; + + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); + if (!txb) + return NULL; + + txb->len = 0; + txb->size = PAGE_SIZE; + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); + if (txb->data == NULL) { + kfree(txb); + txb = NULL; + } + + return txb; +} + + +static inline void tx_buffer_free(struct tx_buffer *txb) +{ + if (txb) { + free_page((long)txb->data); + kfree(txb); + } +} + +/************************************************************** + Utility function for the tpm_private structure + **************************************************************/ +static void tpm_private_init(struct tpm_private *tp) +{ + spin_lock_init(&tp->tx_lock); + init_waitqueue_head(&tp->wait_q); + atomic_set(&tp->refcnt, 1); +} + +static void tpm_private_put(void) +{ + if (!atomic_dec_and_test(&my_priv->refcnt)) + return; + + tpmif_free_tx_buffers(my_priv); + kfree(my_priv); + my_priv = NULL; +} + +static struct tpm_private *tpm_private_get(void) +{ + int err; + + if (my_priv) { + atomic_inc(&my_priv->refcnt); + return my_priv; + } + + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); + if (!my_priv) + return NULL; + + tpm_private_init(my_priv); + err = tpmif_allocate_tx_buffers(my_priv); + if (err < 0) + tpm_private_put(); + + return my_priv; +} + +/************************************************************** + + The interface to let the tpm plugin register its callback + function and send data to another partition using this module + + **************************************************************/ + +static DEFINE_MUTEX(suspend_lock); +/* + * Send data via this module by calling this function + */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr) +{ + int sent; + + mutex_lock(&suspend_lock); + sent = tpm_xmit(tp, buf, count, 0, ptr); + mutex_unlock(&suspend_lock); + + return sent; +} + +/************************************************************** + XENBUS support code + **************************************************************/ + +static int setup_tpmring(struct xenbus_device *dev, + struct tpm_private *tp) +{ + tpmif_tx_interface_t *sring; + int err; + + tp->ring_ref = GRANT_INVALID_REF; + + sring = (void *)__get_free_page(GFP_KERNEL); + if (!sring) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); + return -ENOMEM; + } + tp->tx = sring; + + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); + if (err < 0) { + free_page((unsigned long)sring); + tp->tx = NULL; + xenbus_dev_fatal(dev, err, "allocating grant reference"); + goto fail; + } + tp->ring_ref = err; + + err = tpmif_connect(dev, tp, dev->otherend_id); + if (err) + goto fail; + + return 0; +fail: + destroy_tpmring(tp); + return err; +} + + +static void destroy_tpmring(struct tpm_private *tp) +{ + tpmif_set_connected_state(tp, 0); + + if (tp->ring_ref != GRANT_INVALID_REF) { + gnttab_end_foreign_access(tp->ring_ref, + 0, (unsigned long)tp->tx); + tp->ring_ref = GRANT_INVALID_REF; + tp->tx = NULL; + } + + if (tp->evtchn) + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); + + tp->evtchn = GRANT_INVALID_REF; +} + + +static int talk_to_backend(struct xenbus_device *dev, + struct tpm_private *tp) +{ + const char *message = NULL; + int err; + struct xenbus_transaction xbt; + + err = setup_tpmring(dev, tp); + if (err) { + xenbus_dev_fatal(dev, err, "setting up ring"); + goto out; + } + +again: + err = xenbus_transaction_start(&xbt); + if (err) { + xenbus_dev_fatal(dev, err, "starting transaction"); + goto destroy_tpmring; + } + + err = xenbus_printf(xbt, dev->nodename, + "ring-ref", "%u", tp->ring_ref); + if (err) { + message = "writing ring-ref"; + goto abort_transaction; + } + + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + tp->evtchn); + if (err) { + message = "writing event-channel"; + goto abort_transaction; + } + + err = xenbus_transaction_end(xbt, 0); + if (err == -EAGAIN) + goto again; + if (err) { + xenbus_dev_fatal(dev, err, "completing transaction"); + goto destroy_tpmring; + } + + xenbus_switch_state(dev, XenbusStateConnected); + + return 0; + +abort_transaction: + xenbus_transaction_end(xbt, 1); + if (message) + xenbus_dev_error(dev, err, "%s", message); +destroy_tpmring: + destroy_tpmring(tp); +out: + return err; +} + +/** + * Callback received when the backend's state changes. + */ +static void backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateReconfiguring: + case XenbusStateReconfigured: + case XenbusStateUnknown: + break; + + case XenbusStateConnected: + tpmif_set_connected_state(tp, 1); + break; + + case XenbusStateClosing: + tpmif_set_connected_state(tp, 0); + xenbus_frontend_closed(dev); + break; + + case XenbusStateClosed: + tpmif_set_connected_state(tp, 0); + if (tp->is_suspended == 0) + device_unregister(&dev->dev); + xenbus_frontend_closed(dev); + break; + } +} + +static int tpmfront_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int err; + int handle; + struct tpm_private *tp = tpm_private_get(); + + if (!tp) + return -ENOMEM; + + tp->chip = init_vtpm(&dev->dev, tp); + if (IS_ERR(tp->chip)) + return PTR_ERR(tp->chip); + + err = xenbus_scanf(XBT_NIL, dev->nodename, + "handle", "%i", &handle); + if (XENBUS_EXIST_ERR(err)) + return err; + + if (err < 0) { + xenbus_dev_fatal(dev, err, "reading virtual-device"); + return err; + } + + tp->dev = dev; + + err = talk_to_backend(dev, tp); + if (err) { + tpm_private_put(); + return err; + } + + return 0; +} + + +static int __devexit tpmfront_remove(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + cleanup_vtpm(&dev->dev); + return 0; +} + +static int tpmfront_suspend(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + u32 ctr; + + /* Take the lock, preventing any application from sending. */ + mutex_lock(&suspend_lock); + tp->is_suspended = 1; + + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { + /* Wait for a request to be responded to. */ + interruptible_sleep_on_timeout(&tp->wait_q, 100); + } + + return 0; +} + +static int tpmfront_suspend_finish(struct tpm_private *tp) +{ + tp->is_suspended = 0; + /* Allow applications to send again. */ + mutex_unlock(&suspend_lock); + return 0; +} + +static int tpmfront_resume(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + return talk_to_backend(dev, tp); +} + +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid) +{ + int err; + + tp->backend_id = domid; + tp->evtchn = GRANT_INVALID_REF; + + err = xenbus_alloc_evtchn(dev, &tp->evtchn); + if (err) + return err; + + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, + 0, "tpmif", tp); + if (err <= 0) + return err; + + return 0; +} + +static const struct xenbus_device_id tpmfront_ids[] = { + { "vtpm" }, + { "" } +}; +MODULE_ALIAS("xen:vtpm"); + +static DEFINE_XENBUS_DRIVER(tpmfront, , + .probe = tpmfront_probe, + .remove = __devexit_p(tpmfront_remove), + .resume = tpmfront_resume, + .otherend_changed = backend_changed, + .suspend = tpmfront_suspend, + ); + +static int __init init_tpm_xenbus(void) +{ + return xenbus_register_frontend(&tpmfront_driver); +} + +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { + tp->tx_buffers[i] = tx_buffer_alloc(); + if (!tp->tx_buffers[i]) { + tpmif_free_tx_buffers(tp); + return -ENOMEM; + } + } + return 0; +} + +static void tpmif_free_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) + tx_buffer_free(tp->tx_buffers[i]); +} + +static void tpmif_rx_action(unsigned long priv) +{ + struct tpm_private *tp = (struct tpm_private *)priv; + int i = 0; + unsigned int received; + unsigned int offset = 0; + u8 *buffer; + tpmif_tx_request_t *tx = &tp->tx->ring[i].req; + + atomic_set(&tp->tx_busy, 0); + wake_up_interruptible(&tp->wait_q); + + received = tx->size; + + buffer = kmalloc(received, GFP_ATOMIC); + if (!buffer) + return; + + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + tpmif_tx_request_t *tx; + unsigned int tocopy; + + tx = &tp->tx->ring[i].req; + tocopy = tx->size; + if (tocopy > PAGE_SIZE) + tocopy = PAGE_SIZE; + + memcpy(&buffer[offset], txb->data, tocopy); + + gnttab_release_grant_reference(&gref_head, tx->ref); + + offset += tocopy; + } + + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); + kfree(buffer); +} + + +static irqreturn_t tpmif_int(int irq, void *tpm_priv) +{ + struct tpm_private *tp = tpm_priv; + unsigned long flags; + + spin_lock_irqsave(&tp->tx_lock, flags); + tpmif_rx_tasklet.data = (unsigned long)tp; + tasklet_schedule(&tpmif_rx_tasklet); + spin_unlock_irqrestore(&tp->tx_lock, flags); + + return IRQ_HANDLED; +} + + +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int isuserbuffer, + void *remember) +{ + tpmif_tx_request_t *tx; + TPMIF_RING_IDX i; + unsigned int offset = 0; + + spin_lock_irq(&tp->tx_lock); + + if (unlikely(atomic_read(&tp->tx_busy))) { + spin_unlock_irq(&tp->tx_lock); + return -EBUSY; + } + + if (tp->is_connected != 1) { + spin_unlock_irq(&tp->tx_lock); + return -EIO; + } + + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + int copied; + + if (!txb) { + spin_unlock_irq(&tp->tx_lock); + return -EFAULT; + } + + copied = tx_buffer_copy(txb, &buf[offset], count, + isuserbuffer); + if (copied < 0) { + /* An error occurred */ + spin_unlock_irq(&tp->tx_lock); + return copied; + } + count -= copied; + offset += copied; + + tx = &tp->tx->ring[i].req; + tx->addr = virt_to_machine(txb->data).maddr; + tx->size = txb->len; + tx->unused = 0; + + /* Get the granttable reference for this page. */ + tx->ref = gnttab_claim_grant_reference(&gref_head); + if (tx->ref == -ENOSPC) { + spin_unlock_irq(&tp->tx_lock); + return -ENOSPC; + } + gnttab_grant_foreign_access_ref(tx->ref, + tp->backend_id, + virt_to_mfn(txb->data), + 0 /*RW*/); + wmb(); + } + + atomic_set(&tp->tx_busy, 1); + tp->tx_remember = remember; + + mb(); + + notify_remote_via_evtchn(tp->evtchn); + + spin_unlock_irq(&tp->tx_lock); + return offset; +} + + +static void tpmif_notify_upperlayer(struct tpm_private *tp) +{ + /* Notify upper layer about the state of the connection to the BE. */ + vtpm_vd_status(tp->chip, (tp->is_connected + ? TPM_VD_STATUS_CONNECTED + : TPM_VD_STATUS_DISCONNECTED)); +} + + +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) +{ + /* + * Don't notify upper layer if we are in suspend mode and + * should disconnect - assumption is that we will resume + * The mutex keeps apps from sending. + */ + if (is_connected == 0 && tp->is_suspended == 1) + return; + + /* + * Unlock the mutex if we are connected again + * after being suspended - now resuming. + * This also removes the suspend state. + */ + if (is_connected == 1 && tp->is_suspended == 1) + tpmfront_suspend_finish(tp); + + if (is_connected != tp->is_connected) { + tp->is_connected = is_connected; + tpmif_notify_upperlayer(tp); + } +} + + + +/* ================================================================= + * Initialization function. + * ================================================================= + */ + + +static int __init tpmif_init(void) +{ + struct tpm_private *tp; + + if (!xen_domain()) + return -ENODEV; + + tp = tpm_private_get(); + if (!tp) + return -ENOMEM; + + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, + &gref_head) < 0) { + tpm_private_put(); + return -EFAULT; + } + + init_tpm_xenbus(); + return 0; +} + + +module_init(tpmif_init); + +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h new file mode 100644 index 0000000..5342fca --- /dev/null +++ b/include/xen/interface/io/tpmif.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * tpmif.h + * + * TPM I/O interface for Xen guest OSes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from tools/libxc/xen/io/netif.h + * + * Copyright (c) 2003-2004, Keir Fraser + */ + +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ +#define __XEN_PUBLIC_IO_TPMIF_H__ + +#include "../grant_table.h" + +struct tpmif_tx_request { + unsigned long addr; /* Machine address of packet. */ + grant_ref_t ref; /* grant table access reference */ + uint16_t unused; + uint16_t size; /* Packet size in bytes. */ +}; +typedef struct tpmif_tx_request tpmif_tx_request_t; + +/* + * The TPMIF_TX_RING_SIZE defines the number of pages the + * front-end and backend can exchange (= size of array). + */ +typedef uint32_t TPMIF_RING_IDX; + +#define TPMIF_TX_RING_SIZE 1 + +/* This structure must fit in a memory page. */ + +struct tpmif_ring { + struct tpmif_tx_request req; +}; +typedef struct tpmif_ring tpmif_ring_t; + +struct tpmif_tx_interface { + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; +}; +typedef struct tpmif_tx_interface tpmif_tx_interface_t; + +#endif + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:17:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:17:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOQZ-0004dM-1Y; Mon, 05 Nov 2012 15:17:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOQY-0004dF-6o for xen-devel@lists.xen.org; Mon, 05 Nov 2012 15:17:26 +0000 Received: from [193.109.254.147:13040] by server-3.bemta-14.messagelabs.com id D9/F7-01317-588D7905; Mon, 05 Nov 2012 15:17:25 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352128643!1824020!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7240 invoked from network); 5 Nov 2012 15:17:24 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 15:17:24 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="43445437" Received: from unknown (HELO FTLPEX01CL02.citrite.net) ([10.13.107.79]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 05 Nov 2012 15:17:22 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.2.318.1; Mon, 5 Nov 2012 10:17:22 -0500 Date: Mon, 5 Nov 2012 15:16:40 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk In-Reply-To: <20121102164937.GC27213@konrad-lan.dumpdata.com> Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "Liu, Jinsong" , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 0e86370..a2af622 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > > xen-evtchn-y := evtchn.o > > xen-gntdev-y := gntdev.o > > xen-gntalloc-y := gntalloc.o it should really depend on ACPI and maybe also X86, otherwise it is going to break the ARM build > > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > > new file mode 100644 > > index 0000000..e8c26a4 > > --- /dev/null > > +++ b/drivers/xen/xen_acpi_pad.c > > @@ -0,0 +1,206 @@ > > +/* > > + * xen_acpi_pad.c - Xen pad interface > > + * > > + * Copyright (c) 2012, Intel Corporation. > > + * Author: Liu, Jinsong > > + * > > + * This program is free software; you can redistribute it and/or modify it > > + * under the terms and conditions of the GNU General Public License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but WITHOUT > > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + */ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > > + > > +static DEFINE_MUTEX(xen_pad_lock); > > + > > +static int xen_pad_set_idle_cpus(int num_cpus) > > +{ > > + struct xen_platform_op op; > > + > > + if (num_cpus < 0) > > + return -EINVAL; > > + > > + /* set cpu nums expected to be idled */ > > + op.cmd = XENPF_core_parking; > > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > > + op.u.core_parking.idle_nums = num_cpus; > > + > > + return HYPERVISOR_dom0_op(&op); > > +} > > + > > +/* > > + * Cannot get idle cpus by using hypercall once (shared with _SET) > > + * because of the characteristic of Xen continue_hypercall_on_cpu > > + */ > > +static int xen_pad_get_idle_cpus(void) > > +{ > > + int ret; > > + struct xen_platform_op op; > > + > > + /* get cpu nums actually be idled */ > > + op.cmd = XENPF_core_parking; > > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > > + ret = HYPERVISOR_dom0_op(&op); > > + if (ret < 0) > > + return ret; > > + > > + return op.u.core_parking.idle_nums; > > +} > > + > > +/* > > + * Query firmware how many CPUs should be idle > > + * return -1 on failure > > + */ > > +static int xen_acpi_pad_pur(acpi_handle handle) > > +{ > > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > > + union acpi_object *package; > > + int num = -1; > > + > > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > > + return num; > > + > > + if (!buffer.length || !buffer.pointer) > > + return num; > > + > > + package = buffer.pointer; > > + > > + if (package->type == ACPI_TYPE_PACKAGE && > > + package->package.count == 2 && > > + package->package.elements[0].integer.value == 1) /* rev 1 */ > > + > > + num = package->package.elements[1].integer.value; > > + > > + kfree(buffer.pointer); > > + return num; > > +} > > + > > +/* Notify firmware how many CPUs are idle */ > > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > > + uint32_t idle_cpus) > > +{ > > + union acpi_object params[3] = { > > + {.type = ACPI_TYPE_INTEGER,}, > > + {.type = ACPI_TYPE_INTEGER,}, > > + {.type = ACPI_TYPE_BUFFER,}, > > + }; > > + struct acpi_object_list arg_list = {3, params}; > > + > > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > > + params[1].integer.value = stat; > > + params[2].buffer.length = 4; > > + params[2].buffer.pointer = (void *)&idle_cpus; > > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > > +} > > + > > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > > +{ > > + int num_cpus; > > + > > + num_cpus = xen_acpi_pad_pur(handle); > > + if (num_cpus < 0) > > + return; > > + > > + mutex_lock(&xen_pad_lock); > > + if (xen_pad_set_idle_cpus(num_cpus)) { > > + mutex_unlock(&xen_pad_lock); > > + return; > > + } > > + > > + num_cpus = xen_pad_get_idle_cpus(); > > + if (num_cpus < 0) { > > + mutex_unlock(&xen_pad_lock); > > + return; > > + } > > + mutex_unlock(&xen_pad_lock); > > + > > + xen_acpi_pad_ost(handle, 0, num_cpus); > > +} > > + > > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > > + void *data) > > +{ > > + switch (event) { > > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > > + xen_acpi_pad_handle_notify(handle); > > + break; > > + default: > > + pr_warn("Unsupported event [0x%x]\n", event); > > + break; > > + } > > +} > > + > > +static int xen_acpi_pad_add(struct acpi_device *device) > > +{ > > + acpi_status status; > > + > > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > > + > > + status = acpi_install_notify_handler(device->handle, > > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > > + if (ACPI_FAILURE(status)) > > + return -ENODEV; > > + > > + return 0; > > +} > > + > > +static int xen_acpi_pad_remove(struct acpi_device *device, > > + int type) > > +{ > > + mutex_lock(&xen_pad_lock); > > + xen_pad_set_idle_cpus(0); > > + mutex_unlock(&xen_pad_lock); > > + > > + acpi_remove_notify_handler(device->handle, > > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); > > + return 0; > > +} > > + > > +static const struct acpi_device_id pad_device_ids[] = { > > + {"ACPI000C", 0}, > > + {"", 0}, > > +}; > > + > > +static struct acpi_driver xen_acpi_pad_driver = { > > + .name = "processor_aggregator", > > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > > + .ids = pad_device_ids, > > + .ops = { > > + .add = xen_acpi_pad_add, > > + .remove = xen_acpi_pad_remove, > > + }, > > +}; > > + > > +static int __init xen_acpi_pad_init(void) > > +{ > > + int ret = -ENOSYS; > > + unsigned int version = HYPERVISOR_xen_version(XENVER_version, NULL); > > Heh. so if you run this on baremetal I wonder what will happen. > > > + unsigned int major = version >> 16; > > + unsigned int minor = version & 0xffff; > > + > > + /* Only DOM0 is responsible for Xen acpi pad */ > > + if (!xen_initial_domain()) > > + return -ENODEV; > > + > > I think the check for version should happen here. > > > + /* Only Xen4.2 or later support Xen acpi pad */ > > + if (((major == 4) && (minor >= 2)) || (major > 4)) > > + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); > > + > > + return ret; > > +} > > +subsys_initcall(xen_acpi_pad_init); > > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > > index 4755b5f..a3be54c 100644 > > --- a/include/xen/interface/platform.h > > +++ b/include/xen/interface/platform.h > > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > > }; > > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > > > +/* > > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > > + * which are already occupied at Xen hypervisor side. > > + */ > > +#define XENPF_core_parking 60 > > +struct xenpf_core_parking { > > + /* IN variables */ > > +#define XEN_CORE_PARKING_SET 1 > > +#define XEN_CORE_PARKING_GET 2 > > + uint32_t type; > > + /* IN variables: set cpu nums expected to be idled */ > > + /* OUT variables: get cpu nums actually be idled */ > > + uint32_t idle_nums; > > +}; > > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > > + > > struct xen_platform_op { > > uint32_t cmd; > > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > > @@ -341,6 +357,7 @@ struct xen_platform_op { > > struct xenpf_set_processor_pminfo set_pminfo; > > struct xenpf_pcpuinfo pcpu_info; > > struct xenpf_cpu_ol cpu_ol; > > + struct xenpf_core_parking core_parking; > > uint8_t pad[128]; > > } u; > > }; > > -- > > 1.7.1 > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:17:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:17:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOQZ-0004dM-1Y; Mon, 05 Nov 2012 15:17:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOQY-0004dF-6o for xen-devel@lists.xen.org; Mon, 05 Nov 2012 15:17:26 +0000 Received: from [193.109.254.147:13040] by server-3.bemta-14.messagelabs.com id D9/F7-01317-588D7905; Mon, 05 Nov 2012 15:17:25 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352128643!1824020!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODEzNTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7240 invoked from network); 5 Nov 2012 15:17:24 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 15:17:24 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="43445437" Received: from unknown (HELO FTLPEX01CL02.citrite.net) ([10.13.107.79]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 05 Nov 2012 15:17:22 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.2.318.1; Mon, 5 Nov 2012 10:17:22 -0500 Date: Mon, 5 Nov 2012 15:16:40 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk In-Reply-To: <20121102164937.GC27213@konrad-lan.dumpdata.com> Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "Liu, Jinsong" , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 0e86370..a2af622 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > > xen-evtchn-y := evtchn.o > > xen-gntdev-y := gntdev.o > > xen-gntalloc-y := gntalloc.o it should really depend on ACPI and maybe also X86, otherwise it is going to break the ARM build > > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > > new file mode 100644 > > index 0000000..e8c26a4 > > --- /dev/null > > +++ b/drivers/xen/xen_acpi_pad.c > > @@ -0,0 +1,206 @@ > > +/* > > + * xen_acpi_pad.c - Xen pad interface > > + * > > + * Copyright (c) 2012, Intel Corporation. > > + * Author: Liu, Jinsong > > + * > > + * This program is free software; you can redistribute it and/or modify it > > + * under the terms and conditions of the GNU General Public License, > > + * version 2, as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope it will be useful, but WITHOUT > > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + */ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > > + > > +static DEFINE_MUTEX(xen_pad_lock); > > + > > +static int xen_pad_set_idle_cpus(int num_cpus) > > +{ > > + struct xen_platform_op op; > > + > > + if (num_cpus < 0) > > + return -EINVAL; > > + > > + /* set cpu nums expected to be idled */ > > + op.cmd = XENPF_core_parking; > > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > > + op.u.core_parking.idle_nums = num_cpus; > > + > > + return HYPERVISOR_dom0_op(&op); > > +} > > + > > +/* > > + * Cannot get idle cpus by using hypercall once (shared with _SET) > > + * because of the characteristic of Xen continue_hypercall_on_cpu > > + */ > > +static int xen_pad_get_idle_cpus(void) > > +{ > > + int ret; > > + struct xen_platform_op op; > > + > > + /* get cpu nums actually be idled */ > > + op.cmd = XENPF_core_parking; > > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > > + ret = HYPERVISOR_dom0_op(&op); > > + if (ret < 0) > > + return ret; > > + > > + return op.u.core_parking.idle_nums; > > +} > > + > > +/* > > + * Query firmware how many CPUs should be idle > > + * return -1 on failure > > + */ > > +static int xen_acpi_pad_pur(acpi_handle handle) > > +{ > > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > > + union acpi_object *package; > > + int num = -1; > > + > > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > > + return num; > > + > > + if (!buffer.length || !buffer.pointer) > > + return num; > > + > > + package = buffer.pointer; > > + > > + if (package->type == ACPI_TYPE_PACKAGE && > > + package->package.count == 2 && > > + package->package.elements[0].integer.value == 1) /* rev 1 */ > > + > > + num = package->package.elements[1].integer.value; > > + > > + kfree(buffer.pointer); > > + return num; > > +} > > + > > +/* Notify firmware how many CPUs are idle */ > > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > > + uint32_t idle_cpus) > > +{ > > + union acpi_object params[3] = { > > + {.type = ACPI_TYPE_INTEGER,}, > > + {.type = ACPI_TYPE_INTEGER,}, > > + {.type = ACPI_TYPE_BUFFER,}, > > + }; > > + struct acpi_object_list arg_list = {3, params}; > > + > > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > > + params[1].integer.value = stat; > > + params[2].buffer.length = 4; > > + params[2].buffer.pointer = (void *)&idle_cpus; > > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > > +} > > + > > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > > +{ > > + int num_cpus; > > + > > + num_cpus = xen_acpi_pad_pur(handle); > > + if (num_cpus < 0) > > + return; > > + > > + mutex_lock(&xen_pad_lock); > > + if (xen_pad_set_idle_cpus(num_cpus)) { > > + mutex_unlock(&xen_pad_lock); > > + return; > > + } > > + > > + num_cpus = xen_pad_get_idle_cpus(); > > + if (num_cpus < 0) { > > + mutex_unlock(&xen_pad_lock); > > + return; > > + } > > + mutex_unlock(&xen_pad_lock); > > + > > + xen_acpi_pad_ost(handle, 0, num_cpus); > > +} > > + > > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > > + void *data) > > +{ > > + switch (event) { > > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > > + xen_acpi_pad_handle_notify(handle); > > + break; > > + default: > > + pr_warn("Unsupported event [0x%x]\n", event); > > + break; > > + } > > +} > > + > > +static int xen_acpi_pad_add(struct acpi_device *device) > > +{ > > + acpi_status status; > > + > > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > > + > > + status = acpi_install_notify_handler(device->handle, > > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > > + if (ACPI_FAILURE(status)) > > + return -ENODEV; > > + > > + return 0; > > +} > > + > > +static int xen_acpi_pad_remove(struct acpi_device *device, > > + int type) > > +{ > > + mutex_lock(&xen_pad_lock); > > + xen_pad_set_idle_cpus(0); > > + mutex_unlock(&xen_pad_lock); > > + > > + acpi_remove_notify_handler(device->handle, > > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); > > + return 0; > > +} > > + > > +static const struct acpi_device_id pad_device_ids[] = { > > + {"ACPI000C", 0}, > > + {"", 0}, > > +}; > > + > > +static struct acpi_driver xen_acpi_pad_driver = { > > + .name = "processor_aggregator", > > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > > + .ids = pad_device_ids, > > + .ops = { > > + .add = xen_acpi_pad_add, > > + .remove = xen_acpi_pad_remove, > > + }, > > +}; > > + > > +static int __init xen_acpi_pad_init(void) > > +{ > > + int ret = -ENOSYS; > > + unsigned int version = HYPERVISOR_xen_version(XENVER_version, NULL); > > Heh. so if you run this on baremetal I wonder what will happen. > > > + unsigned int major = version >> 16; > > + unsigned int minor = version & 0xffff; > > + > > + /* Only DOM0 is responsible for Xen acpi pad */ > > + if (!xen_initial_domain()) > > + return -ENODEV; > > + > > I think the check for version should happen here. > > > + /* Only Xen4.2 or later support Xen acpi pad */ > > + if (((major == 4) && (minor >= 2)) || (major > 4)) > > + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); > > + > > + return ret; > > +} > > +subsys_initcall(xen_acpi_pad_init); > > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > > index 4755b5f..a3be54c 100644 > > --- a/include/xen/interface/platform.h > > +++ b/include/xen/interface/platform.h > > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > > }; > > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > > > +/* > > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > > + * which are already occupied at Xen hypervisor side. > > + */ > > +#define XENPF_core_parking 60 > > +struct xenpf_core_parking { > > + /* IN variables */ > > +#define XEN_CORE_PARKING_SET 1 > > +#define XEN_CORE_PARKING_GET 2 > > + uint32_t type; > > + /* IN variables: set cpu nums expected to be idled */ > > + /* OUT variables: get cpu nums actually be idled */ > > + uint32_t idle_nums; > > +}; > > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > > + > > struct xen_platform_op { > > uint32_t cmd; > > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > > @@ -341,6 +357,7 @@ struct xen_platform_op { > > struct xenpf_set_processor_pminfo set_pminfo; > > struct xenpf_pcpuinfo pcpu_info; > > struct xenpf_cpu_ol cpu_ol; > > + struct xenpf_core_parking core_parking; > > uint8_t pad[128]; > > } u; > > }; > > -- > > 1.7.1 > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:34:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:34:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOfb-0004qv-If; Mon, 05 Nov 2012 15:32:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOfZ-0004qq-Ic for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 15:32:57 +0000 Received: from [85.158.143.99:63285] by server-2.bemta-4.messagelabs.com id EA/EB-28922-82CD7905; Mon, 05 Nov 2012 15:32:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352129575!28376650!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23025 invoked from network); 5 Nov 2012 15:32:55 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 15:32:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="15590114" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 15:32:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 15:32:54 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVOfW-0005UX-QW; Mon, 05 Nov 2012 15:32:54 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVOfW-00006M-Kw; Mon, 05 Nov 2012 15:32:54 +0000 To: Message-ID: From: xen.org Date: Mon, 5 Nov 2012 15:32:54 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14367: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14367 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14367/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-i386-pvops 4 kernel-build fail REGR. vs. 14354 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14354 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14354 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14354 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops fail test-amd64-amd64-xl pass test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair pass test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win fail test-amd64-i386-win blocked test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 Author: Greg Kroah-Hartman Date: Mon Nov 5 09:44:42 2012 +0100 Linux 3.0.51 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 15:34:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 15:34:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOfb-0004qv-If; Mon, 05 Nov 2012 15:32:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVOfZ-0004qq-Ic for xen-devel@lists.xensource.com; Mon, 05 Nov 2012 15:32:57 +0000 Received: from [85.158.143.99:63285] by server-2.bemta-4.messagelabs.com id EA/EB-28922-82CD7905; Mon, 05 Nov 2012 15:32:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352129575!28376650!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23025 invoked from network); 5 Nov 2012 15:32:55 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 15:32:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="15590114" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 15:32:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 15:32:54 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVOfW-0005UX-QW; Mon, 05 Nov 2012 15:32:54 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVOfW-00006M-Kw; Mon, 05 Nov 2012 15:32:54 +0000 To: Message-ID: From: xen.org Date: Mon, 5 Nov 2012 15:32:54 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14367: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14367 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14367/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-i386-pvops 4 kernel-build fail REGR. vs. 14354 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14354 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14354 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14354 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops fail test-amd64-amd64-xl pass test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair pass test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win fail test-amd64-i386-win blocked test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 Author: Greg Kroah-Hartman Date: Mon Nov 5 09:44:42 2012 +0100 Linux 3.0.51 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 16:50:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 16:50:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPrq-0005k9-UZ; Mon, 05 Nov 2012 16:49:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPrp-0005k4-S0 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 16:49:42 +0000 Received: from [85.158.143.99:51721] by server-1.bemta-4.messagelabs.com id 7D/46-27934-52EE7905; Mon, 05 Nov 2012 16:49:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352134178!28152641!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14026 invoked from network); 5 Nov 2012 16:49:38 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 5 Nov 2012 16:49:38 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 16:49:37 +0000 Message-Id: <5097FC3002000078000A66AE@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 16:49:36 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part7140BB30.0__=" Subject: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part7140BB30.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since the image pointed to may (and generally will) live in boot services memory (which we add to the global memory pool long before ACPI tables get looked at), we should prevent Dom0 from trying to retrieve the image data. The alternatives would be to - not add boot services memory to the global pool at all, or - defer adding boot services memory until Dom0 indicates it is safe to do so, or - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid adding that specific region to the E820 table. None of these is really attractive, and as Xen commonly prints to the video console anyway (without trying to avoid any regions on the screen), the invalidation would need to be done conditionally anyway. (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) Signed-off-by: Jan Beulich --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct #define acpi_parse_hpet NULL #endif =20 +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) +{ + struct acpi_table_bgrt *bgrt_tbl =3D + container_of(table, struct acpi_table_bgrt, header); + + if (table->length < sizeof(*bgrt_tbl)) + return -1; + + if (!(bgrt_tbl->status & 1)) + return 0; + + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64"= for (%u,%u)\n", + bgrt_tbl->version, bgrt_tbl->image_address, + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); + bgrt_tbl->status &=3D ~1; + + return 0; +} + #ifdef CONFIG_ACPI_SLEEP #define acpi_fadt_copy_address(dst, src, len) do { \ if (fadt->header.revision >=3D FADT2_REVISION_ID) = \ @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) =20 erst_init(); =20 + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); + return 0; } --- a/xen/include/acpi/actbl.h +++ b/xen/include/acpi/actbl.h @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { =20 #include #include +#include =20 /* * Sizes of the various flavors of FADT. We need to look closely --- /dev/null +++ b/xen/include/acpi/actbl3.h @@ -0,0 +1,557 @@ +/*************************************************************************= ***** + * + * Name: actbl3.h - ACPI Table Definitions + * + *************************************************************************= ****/ + +/* + * Copyright (C) 2000 - 2012, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for = further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the = names + * of any contributors may be used to endorse or promote products = derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#ifndef __ACTBL3_H__ +#define __ACTBL3_H__ + +/*************************************************************************= ****** + * + * Additional ACPI Tables (3) + * + * These tables are not consumed directly by the ACPICA subsystem, but = are + * included here to support device drivers and the AML disassembler. + * + * The tables in this file are fully defined within the ACPI specification= . + * + *************************************************************************= *****/ + +/* + * Values for description table header signatures for tables defined in = this + * file. Useful because they make it more difficult to inadvertently type = in + * the wrong signature. + */ +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for = Measurement table */ +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table = */ +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table = */ +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel = Table */ +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table = */ +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ + +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ + +/* Reserved table signatures */ + +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation = Table */ +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table = */ +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table = */ + +/* + * All tables must be byte-packed to match the ACPI specification, since + * the tables are provided by the system BIOS. + */ +#pragma pack(1) + +/* + * Note: C bitfields are not used for this reason: + * + * "Bitfields are great and easy to read, but unfortunately the C = language + * does not specify the layout of bitfields in memory, which means they = are + * essentially useless for dealing with packed data in on-disk formats or + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, + * this decision was a design error in C. Ritchie could have picked an = order + * and stuck with it." Norman Ramsey. + * See http://stackoverflow.com/a/1053662/41661=20 + */ + +/*************************************************************************= ****** + * + * BGRT - Boot Graphics Resource Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_bgrt { + struct acpi_table_header header; /* Common ACPI table = header */ + u16 version; + u8 status; + u8 image_type; + u64 image_address; + u32 image_offset_x; + u32 image_offset_y; +}; + +/*************************************************************************= ****** + * + * DRTM - Dynamic Root of Trust for Measurement table + * + *************************************************************************= *****/ + +struct acpi_table_drtm { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 entry_base_address; + u64 entry_length; + u32 entry_address32; + u64 entry_address64; + u64 exit_address; + u64 log_area_address; + u32 log_area_length; + u64 arch_dependent_address; + u32 flags; +}; + +/* 1) Validated Tables List */ + +struct acpi_drtm_vtl_list { + u32 validated_table_list_count; +}; + +/* 2) Resources List */ + +struct acpi_drtm_resource_list { + u32 resource_list_count; +}; + +/* 3) Platform-specific Identifiers List */ + +struct acpi_drtm_id_list { + u32 id_list_count; +}; + +/*************************************************************************= ****** + * + * FPDT - Firmware Performance Data Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_fpdt { + struct acpi_table_header header; /* Common ACPI table = header */ +}; + +/* FPDT subtable header */ + +struct acpi_fpdt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_fpdt_type { + ACPI_FPDT_TYPE_BOOT =3D 0, + ACPI_FPDT_TYPE_S3PERF =3D 1, +}; + +/* + * FPDT subtables + */ + +/* 0: Firmware Basic Boot Performance Record */ + +struct acpi_fpdt_boot { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 reset_end; + u64 load_start; + u64 startup_start; + u64 exit_services_entry; + u64 exit_services_exit; +}; + +/* 1: S3 Performance Table Pointer Record */ + +struct acpi_fpdt_s3pt_ptr { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 address; +}; + +/* + * S3PT - S3 Performance Table. This table is pointed to by the + * FPDT S3 Pointer Record above. + */ +struct acpi_table_s3pt { + u8 signature[4]; /* "S3PT" */ + u32 length; +}; + +/* + * S3PT Subtables + */ +struct acpi_s3pt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_s3pt_type { + ACPI_S3PT_TYPE_RESUME =3D 0, + ACPI_S3PT_TYPE_SUSPEND =3D 1, +}; + +struct acpi_s3pt_resume { + struct acpi_s3pt_header header; + u32 resume_count; + u64 full_resume; + u64 average_resume; +}; + +struct acpi_s3pt_suspend { + struct acpi_s3pt_header header; + u64 suspend_start; + u64 suspend_end; +}; + +/*************************************************************************= ****** + * + * GTDT - Generic Timer Description Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_gtdt { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 address; + u32 flags; + u32 secure_pl1_interrupt; + u32 secure_pl1_flags; + u32 non_secure_pl1_interrupt; + u32 non_secure_pl1_flags; + u32 virtual_timer_interrupt; + u32 virtual_timer_flags; + u32 non_secure_pl2_interrupt; + u32 non_secure_pl2_flags; +}; + +/* Values for Flags field above */ + +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 + +/* Values for all "TimerFlags" fields above */ + +#define ACPI_GTDT_INTERRUPT_MODE 1 +#define ACPI_GTDT_INTERRUPT_POLARITY 2 + +/*************************************************************************= ****** + * + * MPST - Memory Power State Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +#define ACPI_MPST_CHANNEL_INFO \ + u16 reserved1; \ + u8 channel_id; \ + u8 reserved2; \ + u16 power_node_count; + +/* Main table */ + +struct acpi_table_mpst { + struct acpi_table_header header; /* Common ACPI table = header */ + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Platform Communication Channel Info */ + +struct acpi_mpst_channel { + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Power Node Structure */ + +struct acpi_mpst_power_node { + u8 flags; + u8 reserved1; + u16 node_id; + u32 length; + u64 range_address; + u64 range_length; + u8 num_power_states; + u8 num_physical_components; + u16 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_ENABLED 1 +#define ACPI_MPST_POWER_MANAGED 2 +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 + +/* Memory Power State Structure (follows POWER_NODE above) */ + +struct acpi_mpst_power_state { + u8 power_state; + u8 info_index; +}; + +/* Physical Component ID Structure (follows POWER_STATE above) */ + +struct acpi_mpst_component { + u16 component_id; +}; + +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) = */ + +struct acpi_mpst_data_hdr { + u16 characteristics_count; +}; + +struct acpi_mpst_power_data { + u8 revision; + u8 flags; + u16 reserved1; + u32 average_power; + u32 power_saving; + u64 exit_latency; + u64 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_PRESERVE 1 +#define ACPI_MPST_AUTOENTRY 2 +#define ACPI_MPST_AUTOEXIT 4 + +/* Shared Memory Region (not part of an ACPI table) */ + +struct acpi_mpst_shared { + u32 signature; + u16 pcc_command; + u16 pcc_status; + u16 command_register; + u16 status_register; + u16 power_state_id; + u16 power_node_id; + u64 energy_consumed; + u64 average_power; +}; + +/*************************************************************************= ****** + * + * PCCT - Platform Communications Channel Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pcct { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 flags; + u32 latency; + u32 reserved; +}; + +/* Values for Flags field above */ + +#define ACPI_PCCT_DOORBELL 1 + +/* + * PCCT subtables + */ + +/* 0: Generic Communications Subspace */ + +struct acpi_pcct_subspace { + struct acpi_subtable_header header; + u8 reserved[6]; + u64 base_address; + u64 length; + struct acpi_generic_address doorbell_register; + u64 preserve_mask; + u64 write_mask; +}; + +/* + * PCC memory structures (not part of the ACPI table) + */ + +/* Shared Memory Region */ + +struct acpi_pcct_shared_memory { + u32 signature; + u16 command; + u16 status; +}; + +/*************************************************************************= ****** + * + * PMTT - Platform Memory Topology Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pmtt { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 reserved; +}; + +/* Common header for PMTT subtables that follow main table */ + +struct acpi_pmtt_header { + u8 type; + u8 reserved1; + u16 length; + u16 flags; + u16 reserved2; +}; + +/* Values for Type field above */ + +#define ACPI_PMTT_TYPE_SOCKET 0 +#define ACPI_PMTT_TYPE_CONTROLLER 1 +#define ACPI_PMTT_TYPE_DIMM 2 +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved = */ + +/* Values for Flags field above */ + +#define ACPI_PMTT_TOP_LEVEL 0x0001 +#define ACPI_PMTT_PHYSICAL 0x0002 +#define ACPI_PMTT_MEMORY_TYPE 0x000C + +/* + * PMTT subtables, correspond to Type in struct acpi_pmtt_header + */ + +/* 0: Socket Structure */ + +struct acpi_pmtt_socket { + struct acpi_pmtt_header header; + u16 socket_id; + u16 reserved; +}; + +/* 1: Memory Controller subtable */ + +struct acpi_pmtt_controller { + struct acpi_pmtt_header header; + u32 read_latency; + u32 write_latency; + u32 read_bandwidth; + u32 write_bandwidth; + u16 access_width; + u16 alignment; + u16 reserved; + u16 domain_count; +}; + +/* 1a: Proximity Domain substructure */ + +struct acpi_pmtt_domain { + u32 proximity_domain; +}; + +/* 2: Physical Component Identifier (DIMM) */ + +struct acpi_pmtt_physical_component { + struct acpi_pmtt_header header; + u16 component_id; + u16 reserved; + u32 memory_size; + u32 bios_handle; +}; + +/*************************************************************************= ****** + * + * RASF - RAS Feature Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_rasf { + struct acpi_table_header header; /* Common ACPI table = header */ + u8 channel_id[12]; +}; + +/* RASF Platform Communication Channel Shared Memory Region */ + +struct acpi_rasf_shared_memory { + u32 signature; + u16 command; + u16 status; + u64 requested_address; + u64 requested_length; + u64 actual_address; + u64 actual_length; + u16 flags; + u8 speed; +}; + +/* Masks for Flags and Speed fields above */ + +#define ACPI_RASF_SCRUBBER_RUNNING 1 +#define ACPI_RASF_SPEED (7<<1) + +/* Channel Commands */ + +enum acpi_rasf_commands { + ACPI_RASF_GET_RAS_CAPABILITIES =3D 1, + ACPI_RASF_GET_PATROL_PARAMETERS =3D 2, + ACPI_RASF_START_PATROL_SCRUBBER =3D 3, + ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4 +}; + +/* Channel Command flags */ + +#define ACPI_RASF_GENERATE_SCI (1<<15) + +/* Status values */ + +enum acpi_rasf_status { + ACPI_RASF_SUCCESS =3D 0, + ACPI_RASF_NOT_VALID =3D 1, + ACPI_RASF_NOT_SUPPORTED =3D 2, + ACPI_RASF_BUSY =3D 3, + ACPI_RASF_FAILED =3D 4, + ACPI_RASF_ABORTED =3D 5, + ACPI_RASF_INVALID_DATA =3D 6 +}; + +/* Status flags */ + +#define ACPI_RASF_COMMAND_COMPLETE (1) +#define ACPI_RASF_SCI_DOORBELL (1<<1) +#define ACPI_RASF_ERROR (1<<2) +#define ACPI_RASF_STATUS (0x1F<<3) + +/* Reset to default packing */ + +#pragma pack() + +#endif /* __ACTBL3_H__ */ --=__Part7140BB30.0__= Content-Type: text/plain; name="ACPI-BGRT-invalidate.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-BGRT-invalidate.patch" x86/ACPI: invalidate BGRT=0A=0ASince the image pointed to may (and = generally will) live in boot=0Aservices memory (which we add to the global = memory pool long before=0AACPI tables get looked at), we should prevent = Dom0 from trying to=0Aretrieve the image data.=0A=0AThe alternatives would = be to=0A- not add boot services memory to the global pool at all, or=0A- = defer adding boot services memory until Dom0 indicates it is safe to=0A = do so, or=0A- find and parse the BGRT table in xen/arch/x86/efi/boot.c, = and avoid=0A adding that specific region to the E820 table.=0ANone of = these is really attractive, and as Xen commonly prints to the=0Avideo = console anyway (without trying to avoid any regions on the=0Ascreen), the = invalidation would need to be done conditionally anyway.=0A=0A(xen/include/= acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4)=0A=0ASigned-off-by: = Jan Beulich =0A=0A--- a/xen/arch/x86/acpi/boot.c=0A+++ = b/xen/arch/x86/acpi/boot.c=0A@@ -286,6 +286,25 @@ static int __init = acpi_parse_hpet(struct=0A #define acpi_parse_hpet NULL=0A #endif=0A = =0A+static int __init acpi_invalidate_bgrt(struct acpi_table_header = *table)=0A+{=0A+ struct acpi_table_bgrt *bgrt_tbl =3D=0A+ = container_of(table, struct acpi_table_bgrt, header);=0A+=0A+ if = (table->length < sizeof(*bgrt_tbl))=0A+ return -1;=0A+=0A+ if = (!(bgrt_tbl->status & 1))=0A+ return 0;=0A+=0A+ printk(KERN= _INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for (%u,%u)\n",=0A= + bgrt_tbl->version, bgrt_tbl->image_address,=0A+ = bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y);=0A+ bgrt_tbl->s= tatus &=3D ~1;=0A+=0A+ return 0;=0A+}=0A+=0A #ifdef CONFIG_ACPI_SLEEP=0A = #define acpi_fadt_copy_address(dst, src, len) do { = \=0A if (fadt->header.revision >=3D FADT2_REVISION_ID) = \=0A@@ -653,5 +672,7 @@ int __init acpi_boot_init(void)=0A =0A erst_init()= ;=0A =0A+ acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt);=0A+= =0A return 0;=0A }=0A--- a/xen/include/acpi/actbl.h=0A+++ b/xen/include= /acpi/actbl.h=0A@@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles {=0A = =0A #include =0A #include =0A+#include = =0A =0A /*=0A * Sizes of the various flavors of FADT. We = need to look closely=0A--- /dev/null=0A+++ b/xen/include/acpi/actbl3.h=0A@@= -0,0 +1,557 @@=0A+/*******************************************************= ***********************=0A+ *=0A+ * Name: actbl3.h - ACPI Table Definitions= =0A+ *=0A+ ****************************************************************= *************/=0A+=0A+/*=0A+ * Copyright (C) 2000 - 2012, Intel Corp.=0A+ = * All rights reserved.=0A+ *=0A+ * Redistribution and use in source and = binary forms, with or without=0A+ * modification, are permitted provided = that the following conditions=0A+ * are met:=0A+ * 1. Redistributions of = source code must retain the above copyright=0A+ * notice, this list of = conditions, and the following disclaimer,=0A+ * without modification.=0A= + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer=0A+ * substantially similar to the "NO WARRANTY" disclaimer = below=0A+ * ("Disclaimer") and any redistribution must be conditioned = upon=0A+ * including a substantially similar Disclaimer requirement for = further=0A+ * binary redistribution.=0A+ * 3. Neither the names of the = above-listed copyright holders nor the names=0A+ * of any contributors = may be used to endorse or promote products derived=0A+ * from this = software without specific prior written permission.=0A+ *=0A+ * Alternative= ly, this software may be distributed under the terms of the=0A+ * GNU = General Public License ("GPL") version 2 as published by the Free=0A+ * = Software Foundation.=0A+ *=0A+ * NO WARRANTY=0A+ * THIS SOFTWARE IS = PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS=0A+ * "AS IS" AND ANY = EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT=0A+ * LIMITED TO, THE = IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR=0A+ * A PARTICULAR = PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT=0A+ * HOLDERS OR = CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL=0A+ * = DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS=0A+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION)=0A+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER = IN CONTRACT,=0A+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR = OTHERWISE) ARISING=0A+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN = IF ADVISED OF THE=0A+ * POSSIBILITY OF SUCH DAMAGES.=0A+ */=0A+=0A+#ifndef = __ACTBL3_H__=0A+#define __ACTBL3_H__=0A+=0A+/******************************= *************************************************=0A+ *=0A+ * Additional = ACPI Tables (3)=0A+ *=0A+ * These tables are not consumed directly by the = ACPICA subsystem, but are=0A+ * included here to support device drivers = and the AML disassembler.=0A+ *=0A+ * The tables in this file are fully = defined within the ACPI specification.=0A+ *=0A+ **************************= ****************************************************/=0A+=0A+/*=0A+ * = Values for description table header signatures for tables defined in = this=0A+ * file. Useful because they make it more difficult to inadvertentl= y type in=0A+ * the wrong signature.=0A+ */=0A+#define ACPI_SIG_BGRT = "BGRT" /* Boot Graphics Resource Table */=0A+#define ACPI_SIG_DRTM= "DRTM" /* Dynamic Root of Trust for Measurement table = */=0A+#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance = Data Table */=0A+#define ACPI_SIG_GTDT "GTDT" /* Generic Timer = Description Table */=0A+#define ACPI_SIG_MPST "MPST" /* Memory = Power State Table */=0A+#define ACPI_SIG_PCCT "PCCT" /* = Platform Communications Channel Table */=0A+#define ACPI_SIG_PMTT = "PMTT" /* Platform Memory Topology Table */=0A+#define ACPI_SIG_RASF = "RASF" /* RAS Feature table */=0A+=0A+#define ACPI_SIG_S3PT = "S3PT" /* S3 Performance (sub)Table */=0A+#define ACPI_SIG_PCCS = "PCC" /* PCC Shared Memory Region */=0A+=0A+/* Reserved table = signatures */=0A+=0A+#define ACPI_SIG_CSRT "CSRT" /* Core = System Resources Table */=0A+#define ACPI_SIG_MATR "MATR" /* = Memory Address Translation Table */=0A+#define ACPI_SIG_MSDM = "MSDM" /* Microsoft Data Management Table */=0A+#define ACPI_SIG_WPBT = "WPBT" /* Windows Platform Binary Table */=0A+=0A+/*=0A+ * All = tables must be byte-packed to match the ACPI specification, since=0A+ * = the tables are provided by the system BIOS.=0A+ */=0A+#pragma pack(1)=0A+= =0A+/*=0A+ * Note: C bitfields are not used for this reason:=0A+ *=0A+ * = "Bitfields are great and easy to read, but unfortunately the C language=0A+= * does not specify the layout of bitfields in memory, which means they = are=0A+ * essentially useless for dealing with packed data in on-disk = formats or=0A+ * binary wire protocols." (Or ACPI tables and buffers.) "If = you ask me,=0A+ * this decision was a design error in C. Ritchie could = have picked an order=0A+ * and stuck with it." Norman Ramsey.=0A+ * See = http://stackoverflow.com/a/1053662/41661=0A+ */=0A+=0A+/*******************= ************************************************************=0A+ *=0A+ * = BGRT - Boot Graphics Resource Table (ACPI 5.0)=0A+ * Version 1=0A+ = *=0A+ *********************************************************************= *********/=0A+=0A+struct acpi_table_bgrt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u16 version;=0A+ u8 = status;=0A+ u8 image_type;=0A+ u64 image_address;=0A+ u32 = image_offset_x;=0A+ u32 image_offset_y;=0A+};=0A+=0A+/*****************= **************************************************************=0A+ *=0A+ * = DRTM - Dynamic Root of Trust for Measurement table=0A+ *=0A+ **************= ****************************************************************/=0A+=0A+st= ruct acpi_table_drtm {=0A+ struct acpi_table_header header; /* = Common ACPI table header */=0A+ u64 entry_base_address;=0A+ u64 = entry_length;=0A+ u32 entry_address32;=0A+ u64 entry_address64= ;=0A+ u64 exit_address;=0A+ u64 log_area_address;=0A+ u32 = log_area_length;=0A+ u64 arch_dependent_address;=0A+ u32 flags;=0A+};=0A= +=0A+/* 1) Validated Tables List */=0A+=0A+struct acpi_drtm_vtl_list {=0A+ = u32 validated_table_list_count;=0A+};=0A+=0A+/* 2) Resources List = */=0A+=0A+struct acpi_drtm_resource_list {=0A+ u32 resource_list_count;=0A= +};=0A+=0A+/* 3) Platform-specific Identifiers List */=0A+=0A+struct = acpi_drtm_id_list {=0A+ u32 id_list_count;=0A+};=0A+=0A+/******************= *************************************************************=0A+ *=0A+ * = FPDT - Firmware Performance Data Table (ACPI 5.0)=0A+ * Version = 1=0A+ *=0A+ ***************************************************************= ***************/=0A+=0A+struct acpi_table_fpdt {=0A+ struct acpi_table_h= eader header; /* Common ACPI table header */=0A+};=0A+=0A+/* FPDT = subtable header */=0A+=0A+struct acpi_fpdt_header {=0A+ u16 type;=0A+ u8 = length;=0A+ u8 revision;=0A+};=0A+=0A+/* Values for Type field above = */=0A+=0A+enum acpi_fpdt_type {=0A+ ACPI_FPDT_TYPE_BOOT =3D 0,=0A+ = ACPI_FPDT_TYPE_S3PERF =3D 1,=0A+};=0A+=0A+/*=0A+ * FPDT subtables=0A+ = */=0A+=0A+/* 0: Firmware Basic Boot Performance Record */=0A+=0A+struct = acpi_fpdt_boot {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 reset_end;=0A+ u64 load_start;=0A+ = u64 startup_start;=0A+ u64 exit_services_entry;=0A+ u64 exit_services_e= xit;=0A+};=0A+=0A+/* 1: S3 Performance Table Pointer Record */=0A+=0A+struc= t acpi_fpdt_s3pt_ptr {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 address;=0A+};=0A+=0A+/*=0A+ * S3PT - S3 = Performance Table. This table is pointed to by the=0A+ * FPDT S3 Pointer = Record above.=0A+ */=0A+struct acpi_table_s3pt {=0A+ u8 signature[4]; = /* "S3PT" */=0A+ u32 length;=0A+};=0A+=0A+/*=0A+ * S3PT Subtables=0A= + */=0A+struct acpi_s3pt_header {=0A+ u16 type;=0A+ u8 length;=0A+ u8 = revision;=0A+};=0A+=0A+/* Values for Type field above */=0A+=0A+enum = acpi_s3pt_type {=0A+ ACPI_S3PT_TYPE_RESUME =3D 0,=0A+ ACPI_S3PT_T= YPE_SUSPEND =3D 1,=0A+};=0A+=0A+struct acpi_s3pt_resume {=0A+ struct = acpi_s3pt_header header;=0A+ u32 resume_count;=0A+ u64 full_resume;=0A= + u64 average_resume;=0A+};=0A+=0A+struct acpi_s3pt_suspend {=0A+ = struct acpi_s3pt_header header;=0A+ u64 suspend_start;=0A+ u64 = suspend_end;=0A+};=0A+=0A+/************************************************= *******************************=0A+ *=0A+ * GTDT - Generic Timer Descriptio= n Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ ***********************= *******************************************************/=0A+=0A+struct = acpi_table_gtdt {=0A+ struct acpi_table_header header; /* Common = ACPI table header */=0A+ u64 address;=0A+ u32 flags;=0A+ = u32 secure_pl1_interrupt;=0A+ u32 secure_pl1_flags;=0A+ u32 = non_secure_pl1_interrupt;=0A+ u32 non_secure_pl1_flags;=0A+ u32 = virtual_timer_interrupt;=0A+ u32 virtual_timer_flags;=0A+ u32 = non_secure_pl2_interrupt;=0A+ u32 non_secure_pl2_flags;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_GTDT_MAPPED_BLOCK_PRESE= NT 1=0A+=0A+/* Values for all "TimerFlags" fields above */=0A+=0A+#def= ine ACPI_GTDT_INTERRUPT_MODE 1=0A+#define ACPI_GTDT_INTERRUPT_PO= LARITY 2=0A+=0A+/***************************************************= ****************************=0A+ *=0A+ * MPST - Memory Power State Table = (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ *******************************= ***********************************************/=0A+=0A+#define ACPI_MPST_C= HANNEL_INFO \=0A+ u16 reserved1; \=0A+ = u8 channel_id; \=0A+ u8 = reserved2; \=0A+ u16 power_node_= count;=0A+=0A+/* Main table */=0A+=0A+struct acpi_table_mpst {=0A+ = struct acpi_table_header header; /* Common ACPI table header */=0A+ = ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */=0A+};=0A+=0A+/= * Memory Platform Communication Channel Info */=0A+=0A+struct acpi_mpst_cha= nnel {=0A+ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel = */=0A+};=0A+=0A+/* Memory Power Node Structure */=0A+=0A+struct acpi_mpst_p= ower_node {=0A+ u8 flags;=0A+ u8 reserved1;=0A+ u16 node_id;=0A+ = u32 length;=0A+ u64 range_address;=0A+ u64 range_length;=0A+ u8 = num_power_states;=0A+ u8 num_physical_components;=0A+ u16 reserved2;=0A+}= ;=0A+=0A+/* Values for Flags field above */=0A+=0A+#define ACPI_MPST_ENABLE= D 1=0A+#define ACPI_MPST_POWER_MANAGED 2=0A+#define = ACPI_MPST_HOT_PLUG_CAPABLE 4=0A+=0A+/* Memory Power State Structure = (follows POWER_NODE above) */=0A+=0A+struct acpi_mpst_power_state {=0A+ u8 = power_state;=0A+ u8 info_index;=0A+};=0A+=0A+/* Physical Component = ID Structure (follows POWER_STATE above) */=0A+=0A+struct acpi_mpst_compone= nt {=0A+ u16 component_id;=0A+};=0A+=0A+/* Memory Power State = Characteristics Structure (follows all POWER_NODEs) */=0A+=0A+struct = acpi_mpst_data_hdr {=0A+ u16 characteristics_count;=0A+};=0A+=0A+str= uct acpi_mpst_power_data {=0A+ u8 revision;=0A+ u8 flags;=0A+ = u16 reserved1;=0A+ u32 average_power;=0A+ u32 power_saving;=0A+ = u64 exit_latency;=0A+ u64 reserved2;=0A+};=0A+=0A+/* Values for Flags = field above */=0A+=0A+#define ACPI_MPST_PRESERVE 1=0A+#define = ACPI_MPST_AUTOENTRY 2=0A+#define ACPI_MPST_AUTOEXIT = 4=0A+=0A+/* Shared Memory Region (not part of an ACPI table) */=0A+=0A+st= ruct acpi_mpst_shared {=0A+ u32 signature;=0A+ u16 pcc_command;=0A= + u16 pcc_status;=0A+ u16 command_register;=0A+ u16 = status_register;=0A+ u16 power_state_id;=0A+ u16 power_node_id;=0A+ = u64 energy_consumed;=0A+ u64 average_power;=0A+};=0A+=0A+/**********= *********************************************************************=0A+ = *=0A+ * PCCT - Platform Communications Channel Table (ACPI 5.0)=0A+ * = Version 1=0A+ *=0A+ *****************************************************= *************************/=0A+=0A+struct acpi_table_pcct {=0A+ struct = acpi_table_header header; /* Common ACPI table header */=0A+ = u32 flags;=0A+ u32 latency;=0A+ u32 reserved;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_PCCT_DOORBELL = 1=0A+=0A+/*=0A+ * PCCT subtables=0A+ */=0A+=0A+/* 0: Generic Communicat= ions Subspace */=0A+=0A+struct acpi_pcct_subspace {=0A+ struct acpi_subtabl= e_header header;=0A+ u8 reserved[6];=0A+ u64 base_address;=0A+ = u64 length;=0A+ struct acpi_generic_address doorbell_register;=0A+ = u64 preserve_mask;=0A+ u64 write_mask;=0A+};=0A+=0A+/*=0A+ * PCC memory = structures (not part of the ACPI table)=0A+ */=0A+=0A+/* Shared Memory = Region */=0A+=0A+struct acpi_pcct_shared_memory {=0A+ u32 signature;=0A+ = u16 command;=0A+ u16 status;=0A+};=0A+=0A+/*************************= ******************************************************=0A+ *=0A+ * PMTT - = Platform Memory Topology Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_pmtt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u32 reserved;=0A+};=0A+=0A+= /* Common header for PMTT subtables that follow main table */=0A+=0A+struct= acpi_pmtt_header {=0A+ u8 type;=0A+ u8 reserved1;=0A+ u16 = length;=0A+ u16 flags;=0A+ u16 reserved2;=0A+};=0A+=0A+/* Values for = Type field above */=0A+=0A+#define ACPI_PMTT_TYPE_SOCKET = 0=0A+#define ACPI_PMTT_TYPE_CONTROLLER 1=0A+#define ACPI_PMTT_TYPE_DI= MM 2=0A+#define ACPI_PMTT_TYPE_RESERVED 3 /* = 0x03-0xFF are reserved */=0A+=0A+/* Values for Flags field above */=0A+=0A+= #define ACPI_PMTT_TOP_LEVEL 0x0001=0A+#define ACPI_PMTT_PHYSICA= L 0x0002=0A+#define ACPI_PMTT_MEMORY_TYPE 0x000C=0A+= =0A+/*=0A+ * PMTT subtables, correspond to Type in struct acpi_pmtt_header= =0A+ */=0A+=0A+/* 0: Socket Structure */=0A+=0A+struct acpi_pmtt_socket = {=0A+ struct acpi_pmtt_header header;=0A+ u16 socket_id;=0A+ = u16 reserved;=0A+};=0A+=0A+/* 1: Memory Controller subtable */=0A+=0A+struc= t acpi_pmtt_controller {=0A+ struct acpi_pmtt_header header;=0A+ = u32 read_latency;=0A+ u32 write_latency;=0A+ u32 read_bandwidth;=0A+ = u32 write_bandwidth;=0A+ u16 access_width;=0A+ u16 alignment;=0A+ = u16 reserved;=0A+ u16 domain_count;=0A+};=0A+=0A+/* 1a: Proximity = Domain substructure */=0A+=0A+struct acpi_pmtt_domain {=0A+ u32 = proximity_domain;=0A+};=0A+=0A+/* 2: Physical Component Identifier (DIMM) = */=0A+=0A+struct acpi_pmtt_physical_component {=0A+ struct acpi_pmtt_he= ader header;=0A+ u16 component_id;=0A+ u16 reserved;=0A+ = u32 memory_size;=0A+ u32 bios_handle;=0A+};=0A+=0A+/********************= ***********************************************************=0A+ *=0A+ * = RASF - RAS Feature Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_rasf {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u8 channel_id[12];=0A+};=0A= +=0A+/* RASF Platform Communication Channel Shared Memory Region */=0A+=0A+= struct acpi_rasf_shared_memory {=0A+ u32 signature;=0A+ u16 = command;=0A+ u16 status;=0A+ u64 requested_address;=0A+ u64 = requested_length;=0A+ u64 actual_address;=0A+ u64 actual_length;=0A+ = u16 flags;=0A+ u8 speed;=0A+};=0A+=0A+/* Masks for Flags and Speed fields = above */=0A+=0A+#define ACPI_RASF_SCRUBBER_RUNNING 1=0A+#define = ACPI_RASF_SPEED (7<<1)=0A+=0A+/* Channel Commands = */=0A+=0A+enum acpi_rasf_commands {=0A+ ACPI_RASF_GET_RAS_CAPABILITIES =3D = 1,=0A+ ACPI_RASF_GET_PATROL_PARAMETERS =3D 2,=0A+ ACPI_RASF_START_PAT= ROL_SCRUBBER =3D 3,=0A+ ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4=0A+};=0A+=0A+/= * Channel Command flags */=0A+=0A+#define ACPI_RASF_GENERATE_SCI = (1<<15)=0A+=0A+/* Status values */=0A+=0A+enum acpi_rasf_status {=0A+ = ACPI_RASF_SUCCESS =3D 0,=0A+ ACPI_RASF_NOT_VALID =3D 1,=0A+ ACPI_RASF_N= OT_SUPPORTED =3D 2,=0A+ ACPI_RASF_BUSY =3D 3,=0A+ ACPI_RASF_FAILED = =3D 4,=0A+ ACPI_RASF_ABORTED =3D 5,=0A+ ACPI_RASF_INVALID_DATA =3D = 6=0A+};=0A+=0A+/* Status flags */=0A+=0A+#define ACPI_RASF_COMMAND_COMPLETE= (1)=0A+#define ACPI_RASF_SCI_DOORBELL (1<<1)=0A+#define = ACPI_RASF_ERROR (1<<2)=0A+#define ACPI_RASF_STATUS = (0x1F<<3)=0A+=0A+/* Reset to default packing */=0A+=0A+#pragma = pack()=0A+=0A+#endif /* __ACTBL3_H__ */=0A --=__Part7140BB30.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part7140BB30.0__=-- From xen-devel-bounces@lists.xen.org Mon Nov 05 16:50:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 16:50:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPrq-0005k9-UZ; Mon, 05 Nov 2012 16:49:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPrp-0005k4-S0 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 16:49:42 +0000 Received: from [85.158.143.99:51721] by server-1.bemta-4.messagelabs.com id 7D/46-27934-52EE7905; Mon, 05 Nov 2012 16:49:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352134178!28152641!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14026 invoked from network); 5 Nov 2012 16:49:38 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 5 Nov 2012 16:49:38 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 16:49:37 +0000 Message-Id: <5097FC3002000078000A66AE@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 16:49:36 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part7140BB30.0__=" Subject: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part7140BB30.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since the image pointed to may (and generally will) live in boot services memory (which we add to the global memory pool long before ACPI tables get looked at), we should prevent Dom0 from trying to retrieve the image data. The alternatives would be to - not add boot services memory to the global pool at all, or - defer adding boot services memory until Dom0 indicates it is safe to do so, or - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid adding that specific region to the E820 table. None of these is really attractive, and as Xen commonly prints to the video console anyway (without trying to avoid any regions on the screen), the invalidation would need to be done conditionally anyway. (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) Signed-off-by: Jan Beulich --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct #define acpi_parse_hpet NULL #endif =20 +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) +{ + struct acpi_table_bgrt *bgrt_tbl =3D + container_of(table, struct acpi_table_bgrt, header); + + if (table->length < sizeof(*bgrt_tbl)) + return -1; + + if (!(bgrt_tbl->status & 1)) + return 0; + + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64"= for (%u,%u)\n", + bgrt_tbl->version, bgrt_tbl->image_address, + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); + bgrt_tbl->status &=3D ~1; + + return 0; +} + #ifdef CONFIG_ACPI_SLEEP #define acpi_fadt_copy_address(dst, src, len) do { \ if (fadt->header.revision >=3D FADT2_REVISION_ID) = \ @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) =20 erst_init(); =20 + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); + return 0; } --- a/xen/include/acpi/actbl.h +++ b/xen/include/acpi/actbl.h @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { =20 #include #include +#include =20 /* * Sizes of the various flavors of FADT. We need to look closely --- /dev/null +++ b/xen/include/acpi/actbl3.h @@ -0,0 +1,557 @@ +/*************************************************************************= ***** + * + * Name: actbl3.h - ACPI Table Definitions + * + *************************************************************************= ****/ + +/* + * Copyright (C) 2000 - 2012, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for = further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the = names + * of any contributors may be used to endorse or promote products = derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#ifndef __ACTBL3_H__ +#define __ACTBL3_H__ + +/*************************************************************************= ****** + * + * Additional ACPI Tables (3) + * + * These tables are not consumed directly by the ACPICA subsystem, but = are + * included here to support device drivers and the AML disassembler. + * + * The tables in this file are fully defined within the ACPI specification= . + * + *************************************************************************= *****/ + +/* + * Values for description table header signatures for tables defined in = this + * file. Useful because they make it more difficult to inadvertently type = in + * the wrong signature. + */ +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for = Measurement table */ +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table = */ +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table = */ +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel = Table */ +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table = */ +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ + +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ + +/* Reserved table signatures */ + +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation = Table */ +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table = */ +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table = */ + +/* + * All tables must be byte-packed to match the ACPI specification, since + * the tables are provided by the system BIOS. + */ +#pragma pack(1) + +/* + * Note: C bitfields are not used for this reason: + * + * "Bitfields are great and easy to read, but unfortunately the C = language + * does not specify the layout of bitfields in memory, which means they = are + * essentially useless for dealing with packed data in on-disk formats or + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, + * this decision was a design error in C. Ritchie could have picked an = order + * and stuck with it." Norman Ramsey. + * See http://stackoverflow.com/a/1053662/41661=20 + */ + +/*************************************************************************= ****** + * + * BGRT - Boot Graphics Resource Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_bgrt { + struct acpi_table_header header; /* Common ACPI table = header */ + u16 version; + u8 status; + u8 image_type; + u64 image_address; + u32 image_offset_x; + u32 image_offset_y; +}; + +/*************************************************************************= ****** + * + * DRTM - Dynamic Root of Trust for Measurement table + * + *************************************************************************= *****/ + +struct acpi_table_drtm { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 entry_base_address; + u64 entry_length; + u32 entry_address32; + u64 entry_address64; + u64 exit_address; + u64 log_area_address; + u32 log_area_length; + u64 arch_dependent_address; + u32 flags; +}; + +/* 1) Validated Tables List */ + +struct acpi_drtm_vtl_list { + u32 validated_table_list_count; +}; + +/* 2) Resources List */ + +struct acpi_drtm_resource_list { + u32 resource_list_count; +}; + +/* 3) Platform-specific Identifiers List */ + +struct acpi_drtm_id_list { + u32 id_list_count; +}; + +/*************************************************************************= ****** + * + * FPDT - Firmware Performance Data Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_fpdt { + struct acpi_table_header header; /* Common ACPI table = header */ +}; + +/* FPDT subtable header */ + +struct acpi_fpdt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_fpdt_type { + ACPI_FPDT_TYPE_BOOT =3D 0, + ACPI_FPDT_TYPE_S3PERF =3D 1, +}; + +/* + * FPDT subtables + */ + +/* 0: Firmware Basic Boot Performance Record */ + +struct acpi_fpdt_boot { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 reset_end; + u64 load_start; + u64 startup_start; + u64 exit_services_entry; + u64 exit_services_exit; +}; + +/* 1: S3 Performance Table Pointer Record */ + +struct acpi_fpdt_s3pt_ptr { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 address; +}; + +/* + * S3PT - S3 Performance Table. This table is pointed to by the + * FPDT S3 Pointer Record above. + */ +struct acpi_table_s3pt { + u8 signature[4]; /* "S3PT" */ + u32 length; +}; + +/* + * S3PT Subtables + */ +struct acpi_s3pt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_s3pt_type { + ACPI_S3PT_TYPE_RESUME =3D 0, + ACPI_S3PT_TYPE_SUSPEND =3D 1, +}; + +struct acpi_s3pt_resume { + struct acpi_s3pt_header header; + u32 resume_count; + u64 full_resume; + u64 average_resume; +}; + +struct acpi_s3pt_suspend { + struct acpi_s3pt_header header; + u64 suspend_start; + u64 suspend_end; +}; + +/*************************************************************************= ****** + * + * GTDT - Generic Timer Description Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_gtdt { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 address; + u32 flags; + u32 secure_pl1_interrupt; + u32 secure_pl1_flags; + u32 non_secure_pl1_interrupt; + u32 non_secure_pl1_flags; + u32 virtual_timer_interrupt; + u32 virtual_timer_flags; + u32 non_secure_pl2_interrupt; + u32 non_secure_pl2_flags; +}; + +/* Values for Flags field above */ + +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 + +/* Values for all "TimerFlags" fields above */ + +#define ACPI_GTDT_INTERRUPT_MODE 1 +#define ACPI_GTDT_INTERRUPT_POLARITY 2 + +/*************************************************************************= ****** + * + * MPST - Memory Power State Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +#define ACPI_MPST_CHANNEL_INFO \ + u16 reserved1; \ + u8 channel_id; \ + u8 reserved2; \ + u16 power_node_count; + +/* Main table */ + +struct acpi_table_mpst { + struct acpi_table_header header; /* Common ACPI table = header */ + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Platform Communication Channel Info */ + +struct acpi_mpst_channel { + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Power Node Structure */ + +struct acpi_mpst_power_node { + u8 flags; + u8 reserved1; + u16 node_id; + u32 length; + u64 range_address; + u64 range_length; + u8 num_power_states; + u8 num_physical_components; + u16 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_ENABLED 1 +#define ACPI_MPST_POWER_MANAGED 2 +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 + +/* Memory Power State Structure (follows POWER_NODE above) */ + +struct acpi_mpst_power_state { + u8 power_state; + u8 info_index; +}; + +/* Physical Component ID Structure (follows POWER_STATE above) */ + +struct acpi_mpst_component { + u16 component_id; +}; + +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) = */ + +struct acpi_mpst_data_hdr { + u16 characteristics_count; +}; + +struct acpi_mpst_power_data { + u8 revision; + u8 flags; + u16 reserved1; + u32 average_power; + u32 power_saving; + u64 exit_latency; + u64 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_PRESERVE 1 +#define ACPI_MPST_AUTOENTRY 2 +#define ACPI_MPST_AUTOEXIT 4 + +/* Shared Memory Region (not part of an ACPI table) */ + +struct acpi_mpst_shared { + u32 signature; + u16 pcc_command; + u16 pcc_status; + u16 command_register; + u16 status_register; + u16 power_state_id; + u16 power_node_id; + u64 energy_consumed; + u64 average_power; +}; + +/*************************************************************************= ****** + * + * PCCT - Platform Communications Channel Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pcct { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 flags; + u32 latency; + u32 reserved; +}; + +/* Values for Flags field above */ + +#define ACPI_PCCT_DOORBELL 1 + +/* + * PCCT subtables + */ + +/* 0: Generic Communications Subspace */ + +struct acpi_pcct_subspace { + struct acpi_subtable_header header; + u8 reserved[6]; + u64 base_address; + u64 length; + struct acpi_generic_address doorbell_register; + u64 preserve_mask; + u64 write_mask; +}; + +/* + * PCC memory structures (not part of the ACPI table) + */ + +/* Shared Memory Region */ + +struct acpi_pcct_shared_memory { + u32 signature; + u16 command; + u16 status; +}; + +/*************************************************************************= ****** + * + * PMTT - Platform Memory Topology Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pmtt { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 reserved; +}; + +/* Common header for PMTT subtables that follow main table */ + +struct acpi_pmtt_header { + u8 type; + u8 reserved1; + u16 length; + u16 flags; + u16 reserved2; +}; + +/* Values for Type field above */ + +#define ACPI_PMTT_TYPE_SOCKET 0 +#define ACPI_PMTT_TYPE_CONTROLLER 1 +#define ACPI_PMTT_TYPE_DIMM 2 +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved = */ + +/* Values for Flags field above */ + +#define ACPI_PMTT_TOP_LEVEL 0x0001 +#define ACPI_PMTT_PHYSICAL 0x0002 +#define ACPI_PMTT_MEMORY_TYPE 0x000C + +/* + * PMTT subtables, correspond to Type in struct acpi_pmtt_header + */ + +/* 0: Socket Structure */ + +struct acpi_pmtt_socket { + struct acpi_pmtt_header header; + u16 socket_id; + u16 reserved; +}; + +/* 1: Memory Controller subtable */ + +struct acpi_pmtt_controller { + struct acpi_pmtt_header header; + u32 read_latency; + u32 write_latency; + u32 read_bandwidth; + u32 write_bandwidth; + u16 access_width; + u16 alignment; + u16 reserved; + u16 domain_count; +}; + +/* 1a: Proximity Domain substructure */ + +struct acpi_pmtt_domain { + u32 proximity_domain; +}; + +/* 2: Physical Component Identifier (DIMM) */ + +struct acpi_pmtt_physical_component { + struct acpi_pmtt_header header; + u16 component_id; + u16 reserved; + u32 memory_size; + u32 bios_handle; +}; + +/*************************************************************************= ****** + * + * RASF - RAS Feature Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_rasf { + struct acpi_table_header header; /* Common ACPI table = header */ + u8 channel_id[12]; +}; + +/* RASF Platform Communication Channel Shared Memory Region */ + +struct acpi_rasf_shared_memory { + u32 signature; + u16 command; + u16 status; + u64 requested_address; + u64 requested_length; + u64 actual_address; + u64 actual_length; + u16 flags; + u8 speed; +}; + +/* Masks for Flags and Speed fields above */ + +#define ACPI_RASF_SCRUBBER_RUNNING 1 +#define ACPI_RASF_SPEED (7<<1) + +/* Channel Commands */ + +enum acpi_rasf_commands { + ACPI_RASF_GET_RAS_CAPABILITIES =3D 1, + ACPI_RASF_GET_PATROL_PARAMETERS =3D 2, + ACPI_RASF_START_PATROL_SCRUBBER =3D 3, + ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4 +}; + +/* Channel Command flags */ + +#define ACPI_RASF_GENERATE_SCI (1<<15) + +/* Status values */ + +enum acpi_rasf_status { + ACPI_RASF_SUCCESS =3D 0, + ACPI_RASF_NOT_VALID =3D 1, + ACPI_RASF_NOT_SUPPORTED =3D 2, + ACPI_RASF_BUSY =3D 3, + ACPI_RASF_FAILED =3D 4, + ACPI_RASF_ABORTED =3D 5, + ACPI_RASF_INVALID_DATA =3D 6 +}; + +/* Status flags */ + +#define ACPI_RASF_COMMAND_COMPLETE (1) +#define ACPI_RASF_SCI_DOORBELL (1<<1) +#define ACPI_RASF_ERROR (1<<2) +#define ACPI_RASF_STATUS (0x1F<<3) + +/* Reset to default packing */ + +#pragma pack() + +#endif /* __ACTBL3_H__ */ --=__Part7140BB30.0__= Content-Type: text/plain; name="ACPI-BGRT-invalidate.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-BGRT-invalidate.patch" x86/ACPI: invalidate BGRT=0A=0ASince the image pointed to may (and = generally will) live in boot=0Aservices memory (which we add to the global = memory pool long before=0AACPI tables get looked at), we should prevent = Dom0 from trying to=0Aretrieve the image data.=0A=0AThe alternatives would = be to=0A- not add boot services memory to the global pool at all, or=0A- = defer adding boot services memory until Dom0 indicates it is safe to=0A = do so, or=0A- find and parse the BGRT table in xen/arch/x86/efi/boot.c, = and avoid=0A adding that specific region to the E820 table.=0ANone of = these is really attractive, and as Xen commonly prints to the=0Avideo = console anyway (without trying to avoid any regions on the=0Ascreen), the = invalidation would need to be done conditionally anyway.=0A=0A(xen/include/= acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4)=0A=0ASigned-off-by: = Jan Beulich =0A=0A--- a/xen/arch/x86/acpi/boot.c=0A+++ = b/xen/arch/x86/acpi/boot.c=0A@@ -286,6 +286,25 @@ static int __init = acpi_parse_hpet(struct=0A #define acpi_parse_hpet NULL=0A #endif=0A = =0A+static int __init acpi_invalidate_bgrt(struct acpi_table_header = *table)=0A+{=0A+ struct acpi_table_bgrt *bgrt_tbl =3D=0A+ = container_of(table, struct acpi_table_bgrt, header);=0A+=0A+ if = (table->length < sizeof(*bgrt_tbl))=0A+ return -1;=0A+=0A+ if = (!(bgrt_tbl->status & 1))=0A+ return 0;=0A+=0A+ printk(KERN= _INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for (%u,%u)\n",=0A= + bgrt_tbl->version, bgrt_tbl->image_address,=0A+ = bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y);=0A+ bgrt_tbl->s= tatus &=3D ~1;=0A+=0A+ return 0;=0A+}=0A+=0A #ifdef CONFIG_ACPI_SLEEP=0A = #define acpi_fadt_copy_address(dst, src, len) do { = \=0A if (fadt->header.revision >=3D FADT2_REVISION_ID) = \=0A@@ -653,5 +672,7 @@ int __init acpi_boot_init(void)=0A =0A erst_init()= ;=0A =0A+ acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt);=0A+= =0A return 0;=0A }=0A--- a/xen/include/acpi/actbl.h=0A+++ b/xen/include= /acpi/actbl.h=0A@@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles {=0A = =0A #include =0A #include =0A+#include = =0A =0A /*=0A * Sizes of the various flavors of FADT. We = need to look closely=0A--- /dev/null=0A+++ b/xen/include/acpi/actbl3.h=0A@@= -0,0 +1,557 @@=0A+/*******************************************************= ***********************=0A+ *=0A+ * Name: actbl3.h - ACPI Table Definitions= =0A+ *=0A+ ****************************************************************= *************/=0A+=0A+/*=0A+ * Copyright (C) 2000 - 2012, Intel Corp.=0A+ = * All rights reserved.=0A+ *=0A+ * Redistribution and use in source and = binary forms, with or without=0A+ * modification, are permitted provided = that the following conditions=0A+ * are met:=0A+ * 1. Redistributions of = source code must retain the above copyright=0A+ * notice, this list of = conditions, and the following disclaimer,=0A+ * without modification.=0A= + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer=0A+ * substantially similar to the "NO WARRANTY" disclaimer = below=0A+ * ("Disclaimer") and any redistribution must be conditioned = upon=0A+ * including a substantially similar Disclaimer requirement for = further=0A+ * binary redistribution.=0A+ * 3. Neither the names of the = above-listed copyright holders nor the names=0A+ * of any contributors = may be used to endorse or promote products derived=0A+ * from this = software without specific prior written permission.=0A+ *=0A+ * Alternative= ly, this software may be distributed under the terms of the=0A+ * GNU = General Public License ("GPL") version 2 as published by the Free=0A+ * = Software Foundation.=0A+ *=0A+ * NO WARRANTY=0A+ * THIS SOFTWARE IS = PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS=0A+ * "AS IS" AND ANY = EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT=0A+ * LIMITED TO, THE = IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR=0A+ * A PARTICULAR = PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT=0A+ * HOLDERS OR = CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL=0A+ * = DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS=0A+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION)=0A+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER = IN CONTRACT,=0A+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR = OTHERWISE) ARISING=0A+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN = IF ADVISED OF THE=0A+ * POSSIBILITY OF SUCH DAMAGES.=0A+ */=0A+=0A+#ifndef = __ACTBL3_H__=0A+#define __ACTBL3_H__=0A+=0A+/******************************= *************************************************=0A+ *=0A+ * Additional = ACPI Tables (3)=0A+ *=0A+ * These tables are not consumed directly by the = ACPICA subsystem, but are=0A+ * included here to support device drivers = and the AML disassembler.=0A+ *=0A+ * The tables in this file are fully = defined within the ACPI specification.=0A+ *=0A+ **************************= ****************************************************/=0A+=0A+/*=0A+ * = Values for description table header signatures for tables defined in = this=0A+ * file. Useful because they make it more difficult to inadvertentl= y type in=0A+ * the wrong signature.=0A+ */=0A+#define ACPI_SIG_BGRT = "BGRT" /* Boot Graphics Resource Table */=0A+#define ACPI_SIG_DRTM= "DRTM" /* Dynamic Root of Trust for Measurement table = */=0A+#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance = Data Table */=0A+#define ACPI_SIG_GTDT "GTDT" /* Generic Timer = Description Table */=0A+#define ACPI_SIG_MPST "MPST" /* Memory = Power State Table */=0A+#define ACPI_SIG_PCCT "PCCT" /* = Platform Communications Channel Table */=0A+#define ACPI_SIG_PMTT = "PMTT" /* Platform Memory Topology Table */=0A+#define ACPI_SIG_RASF = "RASF" /* RAS Feature table */=0A+=0A+#define ACPI_SIG_S3PT = "S3PT" /* S3 Performance (sub)Table */=0A+#define ACPI_SIG_PCCS = "PCC" /* PCC Shared Memory Region */=0A+=0A+/* Reserved table = signatures */=0A+=0A+#define ACPI_SIG_CSRT "CSRT" /* Core = System Resources Table */=0A+#define ACPI_SIG_MATR "MATR" /* = Memory Address Translation Table */=0A+#define ACPI_SIG_MSDM = "MSDM" /* Microsoft Data Management Table */=0A+#define ACPI_SIG_WPBT = "WPBT" /* Windows Platform Binary Table */=0A+=0A+/*=0A+ * All = tables must be byte-packed to match the ACPI specification, since=0A+ * = the tables are provided by the system BIOS.=0A+ */=0A+#pragma pack(1)=0A+= =0A+/*=0A+ * Note: C bitfields are not used for this reason:=0A+ *=0A+ * = "Bitfields are great and easy to read, but unfortunately the C language=0A+= * does not specify the layout of bitfields in memory, which means they = are=0A+ * essentially useless for dealing with packed data in on-disk = formats or=0A+ * binary wire protocols." (Or ACPI tables and buffers.) "If = you ask me,=0A+ * this decision was a design error in C. Ritchie could = have picked an order=0A+ * and stuck with it." Norman Ramsey.=0A+ * See = http://stackoverflow.com/a/1053662/41661=0A+ */=0A+=0A+/*******************= ************************************************************=0A+ *=0A+ * = BGRT - Boot Graphics Resource Table (ACPI 5.0)=0A+ * Version 1=0A+ = *=0A+ *********************************************************************= *********/=0A+=0A+struct acpi_table_bgrt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u16 version;=0A+ u8 = status;=0A+ u8 image_type;=0A+ u64 image_address;=0A+ u32 = image_offset_x;=0A+ u32 image_offset_y;=0A+};=0A+=0A+/*****************= **************************************************************=0A+ *=0A+ * = DRTM - Dynamic Root of Trust for Measurement table=0A+ *=0A+ **************= ****************************************************************/=0A+=0A+st= ruct acpi_table_drtm {=0A+ struct acpi_table_header header; /* = Common ACPI table header */=0A+ u64 entry_base_address;=0A+ u64 = entry_length;=0A+ u32 entry_address32;=0A+ u64 entry_address64= ;=0A+ u64 exit_address;=0A+ u64 log_area_address;=0A+ u32 = log_area_length;=0A+ u64 arch_dependent_address;=0A+ u32 flags;=0A+};=0A= +=0A+/* 1) Validated Tables List */=0A+=0A+struct acpi_drtm_vtl_list {=0A+ = u32 validated_table_list_count;=0A+};=0A+=0A+/* 2) Resources List = */=0A+=0A+struct acpi_drtm_resource_list {=0A+ u32 resource_list_count;=0A= +};=0A+=0A+/* 3) Platform-specific Identifiers List */=0A+=0A+struct = acpi_drtm_id_list {=0A+ u32 id_list_count;=0A+};=0A+=0A+/******************= *************************************************************=0A+ *=0A+ * = FPDT - Firmware Performance Data Table (ACPI 5.0)=0A+ * Version = 1=0A+ *=0A+ ***************************************************************= ***************/=0A+=0A+struct acpi_table_fpdt {=0A+ struct acpi_table_h= eader header; /* Common ACPI table header */=0A+};=0A+=0A+/* FPDT = subtable header */=0A+=0A+struct acpi_fpdt_header {=0A+ u16 type;=0A+ u8 = length;=0A+ u8 revision;=0A+};=0A+=0A+/* Values for Type field above = */=0A+=0A+enum acpi_fpdt_type {=0A+ ACPI_FPDT_TYPE_BOOT =3D 0,=0A+ = ACPI_FPDT_TYPE_S3PERF =3D 1,=0A+};=0A+=0A+/*=0A+ * FPDT subtables=0A+ = */=0A+=0A+/* 0: Firmware Basic Boot Performance Record */=0A+=0A+struct = acpi_fpdt_boot {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 reset_end;=0A+ u64 load_start;=0A+ = u64 startup_start;=0A+ u64 exit_services_entry;=0A+ u64 exit_services_e= xit;=0A+};=0A+=0A+/* 1: S3 Performance Table Pointer Record */=0A+=0A+struc= t acpi_fpdt_s3pt_ptr {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 address;=0A+};=0A+=0A+/*=0A+ * S3PT - S3 = Performance Table. This table is pointed to by the=0A+ * FPDT S3 Pointer = Record above.=0A+ */=0A+struct acpi_table_s3pt {=0A+ u8 signature[4]; = /* "S3PT" */=0A+ u32 length;=0A+};=0A+=0A+/*=0A+ * S3PT Subtables=0A= + */=0A+struct acpi_s3pt_header {=0A+ u16 type;=0A+ u8 length;=0A+ u8 = revision;=0A+};=0A+=0A+/* Values for Type field above */=0A+=0A+enum = acpi_s3pt_type {=0A+ ACPI_S3PT_TYPE_RESUME =3D 0,=0A+ ACPI_S3PT_T= YPE_SUSPEND =3D 1,=0A+};=0A+=0A+struct acpi_s3pt_resume {=0A+ struct = acpi_s3pt_header header;=0A+ u32 resume_count;=0A+ u64 full_resume;=0A= + u64 average_resume;=0A+};=0A+=0A+struct acpi_s3pt_suspend {=0A+ = struct acpi_s3pt_header header;=0A+ u64 suspend_start;=0A+ u64 = suspend_end;=0A+};=0A+=0A+/************************************************= *******************************=0A+ *=0A+ * GTDT - Generic Timer Descriptio= n Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ ***********************= *******************************************************/=0A+=0A+struct = acpi_table_gtdt {=0A+ struct acpi_table_header header; /* Common = ACPI table header */=0A+ u64 address;=0A+ u32 flags;=0A+ = u32 secure_pl1_interrupt;=0A+ u32 secure_pl1_flags;=0A+ u32 = non_secure_pl1_interrupt;=0A+ u32 non_secure_pl1_flags;=0A+ u32 = virtual_timer_interrupt;=0A+ u32 virtual_timer_flags;=0A+ u32 = non_secure_pl2_interrupt;=0A+ u32 non_secure_pl2_flags;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_GTDT_MAPPED_BLOCK_PRESE= NT 1=0A+=0A+/* Values for all "TimerFlags" fields above */=0A+=0A+#def= ine ACPI_GTDT_INTERRUPT_MODE 1=0A+#define ACPI_GTDT_INTERRUPT_PO= LARITY 2=0A+=0A+/***************************************************= ****************************=0A+ *=0A+ * MPST - Memory Power State Table = (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ *******************************= ***********************************************/=0A+=0A+#define ACPI_MPST_C= HANNEL_INFO \=0A+ u16 reserved1; \=0A+ = u8 channel_id; \=0A+ u8 = reserved2; \=0A+ u16 power_node_= count;=0A+=0A+/* Main table */=0A+=0A+struct acpi_table_mpst {=0A+ = struct acpi_table_header header; /* Common ACPI table header */=0A+ = ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */=0A+};=0A+=0A+/= * Memory Platform Communication Channel Info */=0A+=0A+struct acpi_mpst_cha= nnel {=0A+ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel = */=0A+};=0A+=0A+/* Memory Power Node Structure */=0A+=0A+struct acpi_mpst_p= ower_node {=0A+ u8 flags;=0A+ u8 reserved1;=0A+ u16 node_id;=0A+ = u32 length;=0A+ u64 range_address;=0A+ u64 range_length;=0A+ u8 = num_power_states;=0A+ u8 num_physical_components;=0A+ u16 reserved2;=0A+}= ;=0A+=0A+/* Values for Flags field above */=0A+=0A+#define ACPI_MPST_ENABLE= D 1=0A+#define ACPI_MPST_POWER_MANAGED 2=0A+#define = ACPI_MPST_HOT_PLUG_CAPABLE 4=0A+=0A+/* Memory Power State Structure = (follows POWER_NODE above) */=0A+=0A+struct acpi_mpst_power_state {=0A+ u8 = power_state;=0A+ u8 info_index;=0A+};=0A+=0A+/* Physical Component = ID Structure (follows POWER_STATE above) */=0A+=0A+struct acpi_mpst_compone= nt {=0A+ u16 component_id;=0A+};=0A+=0A+/* Memory Power State = Characteristics Structure (follows all POWER_NODEs) */=0A+=0A+struct = acpi_mpst_data_hdr {=0A+ u16 characteristics_count;=0A+};=0A+=0A+str= uct acpi_mpst_power_data {=0A+ u8 revision;=0A+ u8 flags;=0A+ = u16 reserved1;=0A+ u32 average_power;=0A+ u32 power_saving;=0A+ = u64 exit_latency;=0A+ u64 reserved2;=0A+};=0A+=0A+/* Values for Flags = field above */=0A+=0A+#define ACPI_MPST_PRESERVE 1=0A+#define = ACPI_MPST_AUTOENTRY 2=0A+#define ACPI_MPST_AUTOEXIT = 4=0A+=0A+/* Shared Memory Region (not part of an ACPI table) */=0A+=0A+st= ruct acpi_mpst_shared {=0A+ u32 signature;=0A+ u16 pcc_command;=0A= + u16 pcc_status;=0A+ u16 command_register;=0A+ u16 = status_register;=0A+ u16 power_state_id;=0A+ u16 power_node_id;=0A+ = u64 energy_consumed;=0A+ u64 average_power;=0A+};=0A+=0A+/**********= *********************************************************************=0A+ = *=0A+ * PCCT - Platform Communications Channel Table (ACPI 5.0)=0A+ * = Version 1=0A+ *=0A+ *****************************************************= *************************/=0A+=0A+struct acpi_table_pcct {=0A+ struct = acpi_table_header header; /* Common ACPI table header */=0A+ = u32 flags;=0A+ u32 latency;=0A+ u32 reserved;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_PCCT_DOORBELL = 1=0A+=0A+/*=0A+ * PCCT subtables=0A+ */=0A+=0A+/* 0: Generic Communicat= ions Subspace */=0A+=0A+struct acpi_pcct_subspace {=0A+ struct acpi_subtabl= e_header header;=0A+ u8 reserved[6];=0A+ u64 base_address;=0A+ = u64 length;=0A+ struct acpi_generic_address doorbell_register;=0A+ = u64 preserve_mask;=0A+ u64 write_mask;=0A+};=0A+=0A+/*=0A+ * PCC memory = structures (not part of the ACPI table)=0A+ */=0A+=0A+/* Shared Memory = Region */=0A+=0A+struct acpi_pcct_shared_memory {=0A+ u32 signature;=0A+ = u16 command;=0A+ u16 status;=0A+};=0A+=0A+/*************************= ******************************************************=0A+ *=0A+ * PMTT - = Platform Memory Topology Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_pmtt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u32 reserved;=0A+};=0A+=0A+= /* Common header for PMTT subtables that follow main table */=0A+=0A+struct= acpi_pmtt_header {=0A+ u8 type;=0A+ u8 reserved1;=0A+ u16 = length;=0A+ u16 flags;=0A+ u16 reserved2;=0A+};=0A+=0A+/* Values for = Type field above */=0A+=0A+#define ACPI_PMTT_TYPE_SOCKET = 0=0A+#define ACPI_PMTT_TYPE_CONTROLLER 1=0A+#define ACPI_PMTT_TYPE_DI= MM 2=0A+#define ACPI_PMTT_TYPE_RESERVED 3 /* = 0x03-0xFF are reserved */=0A+=0A+/* Values for Flags field above */=0A+=0A+= #define ACPI_PMTT_TOP_LEVEL 0x0001=0A+#define ACPI_PMTT_PHYSICA= L 0x0002=0A+#define ACPI_PMTT_MEMORY_TYPE 0x000C=0A+= =0A+/*=0A+ * PMTT subtables, correspond to Type in struct acpi_pmtt_header= =0A+ */=0A+=0A+/* 0: Socket Structure */=0A+=0A+struct acpi_pmtt_socket = {=0A+ struct acpi_pmtt_header header;=0A+ u16 socket_id;=0A+ = u16 reserved;=0A+};=0A+=0A+/* 1: Memory Controller subtable */=0A+=0A+struc= t acpi_pmtt_controller {=0A+ struct acpi_pmtt_header header;=0A+ = u32 read_latency;=0A+ u32 write_latency;=0A+ u32 read_bandwidth;=0A+ = u32 write_bandwidth;=0A+ u16 access_width;=0A+ u16 alignment;=0A+ = u16 reserved;=0A+ u16 domain_count;=0A+};=0A+=0A+/* 1a: Proximity = Domain substructure */=0A+=0A+struct acpi_pmtt_domain {=0A+ u32 = proximity_domain;=0A+};=0A+=0A+/* 2: Physical Component Identifier (DIMM) = */=0A+=0A+struct acpi_pmtt_physical_component {=0A+ struct acpi_pmtt_he= ader header;=0A+ u16 component_id;=0A+ u16 reserved;=0A+ = u32 memory_size;=0A+ u32 bios_handle;=0A+};=0A+=0A+/********************= ***********************************************************=0A+ *=0A+ * = RASF - RAS Feature Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_rasf {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u8 channel_id[12];=0A+};=0A= +=0A+/* RASF Platform Communication Channel Shared Memory Region */=0A+=0A+= struct acpi_rasf_shared_memory {=0A+ u32 signature;=0A+ u16 = command;=0A+ u16 status;=0A+ u64 requested_address;=0A+ u64 = requested_length;=0A+ u64 actual_address;=0A+ u64 actual_length;=0A+ = u16 flags;=0A+ u8 speed;=0A+};=0A+=0A+/* Masks for Flags and Speed fields = above */=0A+=0A+#define ACPI_RASF_SCRUBBER_RUNNING 1=0A+#define = ACPI_RASF_SPEED (7<<1)=0A+=0A+/* Channel Commands = */=0A+=0A+enum acpi_rasf_commands {=0A+ ACPI_RASF_GET_RAS_CAPABILITIES =3D = 1,=0A+ ACPI_RASF_GET_PATROL_PARAMETERS =3D 2,=0A+ ACPI_RASF_START_PAT= ROL_SCRUBBER =3D 3,=0A+ ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4=0A+};=0A+=0A+/= * Channel Command flags */=0A+=0A+#define ACPI_RASF_GENERATE_SCI = (1<<15)=0A+=0A+/* Status values */=0A+=0A+enum acpi_rasf_status {=0A+ = ACPI_RASF_SUCCESS =3D 0,=0A+ ACPI_RASF_NOT_VALID =3D 1,=0A+ ACPI_RASF_N= OT_SUPPORTED =3D 2,=0A+ ACPI_RASF_BUSY =3D 3,=0A+ ACPI_RASF_FAILED = =3D 4,=0A+ ACPI_RASF_ABORTED =3D 5,=0A+ ACPI_RASF_INVALID_DATA =3D = 6=0A+};=0A+=0A+/* Status flags */=0A+=0A+#define ACPI_RASF_COMMAND_COMPLETE= (1)=0A+#define ACPI_RASF_SCI_DOORBELL (1<<1)=0A+#define = ACPI_RASF_ERROR (1<<2)=0A+#define ACPI_RASF_STATUS = (0x1F<<3)=0A+=0A+/* Reset to default packing */=0A+=0A+#pragma = pack()=0A+=0A+#endif /* __ACTBL3_H__ */=0A --=__Part7140BB30.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part7140BB30.0__=-- From xen-devel-bounces@lists.xen.org Mon Nov 05 16:54:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 16:54:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPvq-0005th-R2; Mon, 05 Nov 2012 16:53:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPvp-0005tZ-KQ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 16:53:49 +0000 Received: from [85.158.143.99:21087] by server-2.bemta-4.messagelabs.com id 8E/3D-28922-C1FE7905; Mon, 05 Nov 2012 16:53:48 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352134427!25341758!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19061 invoked from network); 5 Nov 2012 16:53:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 5 Nov 2012 16:53:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 16:53:47 +0000 Message-Id: <5097FD2902000078000A66BF@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 16:53:45 +0000 From: "Jan Beulich" To: ,, Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part49788309.4__=" Cc: Tim Deegan , Dario Faggioli , xen-devel Subject: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part49788309.4__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Under the assumption that in these cases recurring faults aren't a security issue and it can be expected that the drivers there are going to try to take care of the problem. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -625,6 +625,18 @@ static void parse_event_log_entry(struct for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ ) if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id ) { + const struct pci_dev *pdev; + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(iommu->seg, PCI_BUS(bdf), PCI_DEVFN2= (bdf)); + if ( pdev && pdev->domain !=3D dom_xen && + (!pdev->domain || !IS_PRIV(pdev->domain)) ) + pdev =3D NULL; + spin_unlock(&pcidevs_lock); + + if ( pdev ) + continue; + cword =3D pci_conf_read16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), PCI_FUNC(bdf), PCI_COMMAND); --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct reg =3D cap_fault_reg_offset(iommu->cap); while (1) { - u8 fault_reason; + const struct pci_dev *pdev; + u8 fault_reason, bus; u16 source_id, cword; u32 data; u64 guest_addr; @@ -950,14 +951,27 @@ static void __do_iommu_page_fault(struct iommu_page_fault_do_one(iommu, type, fault_reason, source_id, guest_addr); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ - cword =3D pci_conf_read16(iommu->intel->drhd->segment, - PCI_BUS(source_id), PCI_SLOT(source_id), - PCI_FUNC(source_id), PCI_COMMAND); - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), - PCI_SLOT(source_id), PCI_FUNC(source_id), - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + bus =3D PCI_BUS(source_id); + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(iommu->intel->drhd->segment, bus, + PCI_DEVFN2(source_id)); + if ( pdev && pdev->domain !=3D dom_xen && + (!pdev->domain || !IS_PRIV(pdev->domain)) ) + pdev =3D NULL; + spin_unlock(&pcidevs_lock); + + if ( !pdev ) + { + /* Tell the device to stop DMAing; we can't rely on the guest = to + * control it for us. */ + cword =3D pci_conf_read16(iommu->intel->drhd->segment, bus, + PCI_SLOT(source_id), PCI_FUNC(source_i= d), + PCI_COMMAND); + pci_conf_write16(iommu->intel->drhd->segment, bus, + PCI_SLOT(source_id), PCI_FUNC(source_id), + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + } =20 fault_index++; if ( fault_index > cap_num_fault_regs(iommu->cap) ) --=__Part49788309.4__= Content-Type: text/plain; name="IOMMU-disable-BM-not-dom0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="IOMMU-disable-BM-not-dom0.patch" IOMMU: don't disable bus mastering on faults for devices used by Xen or = Dom0=0A=0AUnder the assumption that in these cases recurring faults aren't = a=0Asecurity issue and it can be expected that the drivers there are = going=0Ato try to take care of the problem.=0A=0ASigned-off-by: Jan = Beulich =0A=0A--- a/xen/drivers/passthrough/amd/iommu_in= it.c=0A+++ b/xen/drivers/passthrough/amd/iommu_init.c=0A@@ -625,6 +625,18 = @@ static void parse_event_log_entry(struct=0A for ( bdf =3D 0; = bdf < ivrs_bdf_entries; bdf++ )=0A if ( get_dma_requestor_id(io= mmu->seg, bdf) =3D=3D device_id )=0A {=0A+ = const struct pci_dev *pdev;=0A+=0A+ spin_lock(&pcidevs_lock)= ;=0A+ pdev =3D pci_get_pdev(iommu->seg, PCI_BUS(bdf), = PCI_DEVFN2(bdf));=0A+ if ( pdev && pdev->domain !=3D = dom_xen &&=0A+ (!pdev->domain || !IS_PRIV(pdev->domain)= ) )=0A+ pdev =3D NULL;=0A+ spin_unlock(&p= cidevs_lock);=0A+=0A+ if ( pdev )=0A+ = continue;=0A+=0A cword =3D pci_conf_read16(iommu->seg, = PCI_BUS(bdf),=0A PCI_SLOT(bdf), = PCI_FUNC(bdf),=0A PCI_COMMAND);=0A-= -- a/xen/drivers/passthrough/vtd/iommu.c=0A+++ b/xen/drivers/passthrough/vt= d/iommu.c=0A@@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct=0A= reg =3D cap_fault_reg_offset(iommu->cap);=0A while (1)=0A = {=0A- u8 fault_reason;=0A+ const struct pci_dev *pdev;=0A+ = u8 fault_reason, bus;=0A u16 source_id, cword;=0A u32 = data;=0A u64 guest_addr;=0A@@ -950,14 +951,27 @@ static void = __do_iommu_page_fault(struct=0A iommu_page_fault_do_one(iommu, = type, fault_reason,=0A source_id, = guest_addr);=0A =0A- /* Tell the device to stop DMAing; we can't = rely on the guest to=0A- * control it for us. */=0A- cword = =3D pci_conf_read16(iommu->intel->drhd->segment,=0A- = PCI_BUS(source_id), PCI_SLOT(source_id),=0A- = PCI_FUNC(source_id), PCI_COMMAND);=0A- pci_conf_write16(io= mmu->intel->drhd->segment, PCI_BUS(source_id),=0A- = PCI_SLOT(source_id), PCI_FUNC(source_id),=0A- = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ bus =3D PCI_BUS(sourc= e_id);=0A+=0A+ spin_lock(&pcidevs_lock);=0A+ pdev =3D = pci_get_pdev(iommu->intel->drhd->segment, bus,=0A+ = PCI_DEVFN2(source_id));=0A+ if ( pdev && pdev->domain !=3D = dom_xen &&=0A+ (!pdev->domain || !IS_PRIV(pdev->domain)) )=0A+ = pdev =3D NULL;=0A+ spin_unlock(&pcidevs_lock);=0A+=0A+ = if ( !pdev )=0A+ {=0A+ /* Tell the device to stop = DMAing; we can't rely on the guest to=0A+ * control it for us. = */=0A+ cword =3D pci_conf_read16(iommu->intel->drhd->segment, = bus,=0A+ PCI_SLOT(source_id), PCI_FUNC(s= ource_id),=0A+ PCI_COMMAND);=0A+ = pci_conf_write16(iommu->intel->drhd->segment, bus,=0A+ = PCI_SLOT(source_id), PCI_FUNC(source_id),=0A+ = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ }=0A =0A = fault_index++;=0A if ( fault_index > cap_num_fault_regs(iomm= u->cap) )=0A --=__Part49788309.4__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part49788309.4__=-- From xen-devel-bounces@lists.xen.org Mon Nov 05 16:54:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 16:54:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPvq-0005th-R2; Mon, 05 Nov 2012 16:53:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVPvp-0005tZ-KQ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 16:53:49 +0000 Received: from [85.158.143.99:21087] by server-2.bemta-4.messagelabs.com id 8E/3D-28922-C1FE7905; Mon, 05 Nov 2012 16:53:48 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352134427!25341758!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19061 invoked from network); 5 Nov 2012 16:53:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 5 Nov 2012 16:53:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 05 Nov 2012 16:53:47 +0000 Message-Id: <5097FD2902000078000A66BF@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 05 Nov 2012 16:53:45 +0000 From: "Jan Beulich" To: ,, Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part49788309.4__=" Cc: Tim Deegan , Dario Faggioli , xen-devel Subject: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part49788309.4__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Under the assumption that in these cases recurring faults aren't a security issue and it can be expected that the drivers there are going to try to take care of the problem. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -625,6 +625,18 @@ static void parse_event_log_entry(struct for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ ) if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id ) { + const struct pci_dev *pdev; + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(iommu->seg, PCI_BUS(bdf), PCI_DEVFN2= (bdf)); + if ( pdev && pdev->domain !=3D dom_xen && + (!pdev->domain || !IS_PRIV(pdev->domain)) ) + pdev =3D NULL; + spin_unlock(&pcidevs_lock); + + if ( pdev ) + continue; + cword =3D pci_conf_read16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), PCI_FUNC(bdf), PCI_COMMAND); --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct reg =3D cap_fault_reg_offset(iommu->cap); while (1) { - u8 fault_reason; + const struct pci_dev *pdev; + u8 fault_reason, bus; u16 source_id, cword; u32 data; u64 guest_addr; @@ -950,14 +951,27 @@ static void __do_iommu_page_fault(struct iommu_page_fault_do_one(iommu, type, fault_reason, source_id, guest_addr); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ - cword =3D pci_conf_read16(iommu->intel->drhd->segment, - PCI_BUS(source_id), PCI_SLOT(source_id), - PCI_FUNC(source_id), PCI_COMMAND); - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), - PCI_SLOT(source_id), PCI_FUNC(source_id), - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + bus =3D PCI_BUS(source_id); + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(iommu->intel->drhd->segment, bus, + PCI_DEVFN2(source_id)); + if ( pdev && pdev->domain !=3D dom_xen && + (!pdev->domain || !IS_PRIV(pdev->domain)) ) + pdev =3D NULL; + spin_unlock(&pcidevs_lock); + + if ( !pdev ) + { + /* Tell the device to stop DMAing; we can't rely on the guest = to + * control it for us. */ + cword =3D pci_conf_read16(iommu->intel->drhd->segment, bus, + PCI_SLOT(source_id), PCI_FUNC(source_i= d), + PCI_COMMAND); + pci_conf_write16(iommu->intel->drhd->segment, bus, + PCI_SLOT(source_id), PCI_FUNC(source_id), + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + } =20 fault_index++; if ( fault_index > cap_num_fault_regs(iommu->cap) ) --=__Part49788309.4__= Content-Type: text/plain; name="IOMMU-disable-BM-not-dom0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="IOMMU-disable-BM-not-dom0.patch" IOMMU: don't disable bus mastering on faults for devices used by Xen or = Dom0=0A=0AUnder the assumption that in these cases recurring faults aren't = a=0Asecurity issue and it can be expected that the drivers there are = going=0Ato try to take care of the problem.=0A=0ASigned-off-by: Jan = Beulich =0A=0A--- a/xen/drivers/passthrough/amd/iommu_in= it.c=0A+++ b/xen/drivers/passthrough/amd/iommu_init.c=0A@@ -625,6 +625,18 = @@ static void parse_event_log_entry(struct=0A for ( bdf =3D 0; = bdf < ivrs_bdf_entries; bdf++ )=0A if ( get_dma_requestor_id(io= mmu->seg, bdf) =3D=3D device_id )=0A {=0A+ = const struct pci_dev *pdev;=0A+=0A+ spin_lock(&pcidevs_lock)= ;=0A+ pdev =3D pci_get_pdev(iommu->seg, PCI_BUS(bdf), = PCI_DEVFN2(bdf));=0A+ if ( pdev && pdev->domain !=3D = dom_xen &&=0A+ (!pdev->domain || !IS_PRIV(pdev->domain)= ) )=0A+ pdev =3D NULL;=0A+ spin_unlock(&p= cidevs_lock);=0A+=0A+ if ( pdev )=0A+ = continue;=0A+=0A cword =3D pci_conf_read16(iommu->seg, = PCI_BUS(bdf),=0A PCI_SLOT(bdf), = PCI_FUNC(bdf),=0A PCI_COMMAND);=0A-= -- a/xen/drivers/passthrough/vtd/iommu.c=0A+++ b/xen/drivers/passthrough/vt= d/iommu.c=0A@@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct=0A= reg =3D cap_fault_reg_offset(iommu->cap);=0A while (1)=0A = {=0A- u8 fault_reason;=0A+ const struct pci_dev *pdev;=0A+ = u8 fault_reason, bus;=0A u16 source_id, cword;=0A u32 = data;=0A u64 guest_addr;=0A@@ -950,14 +951,27 @@ static void = __do_iommu_page_fault(struct=0A iommu_page_fault_do_one(iommu, = type, fault_reason,=0A source_id, = guest_addr);=0A =0A- /* Tell the device to stop DMAing; we can't = rely on the guest to=0A- * control it for us. */=0A- cword = =3D pci_conf_read16(iommu->intel->drhd->segment,=0A- = PCI_BUS(source_id), PCI_SLOT(source_id),=0A- = PCI_FUNC(source_id), PCI_COMMAND);=0A- pci_conf_write16(io= mmu->intel->drhd->segment, PCI_BUS(source_id),=0A- = PCI_SLOT(source_id), PCI_FUNC(source_id),=0A- = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ bus =3D PCI_BUS(sourc= e_id);=0A+=0A+ spin_lock(&pcidevs_lock);=0A+ pdev =3D = pci_get_pdev(iommu->intel->drhd->segment, bus,=0A+ = PCI_DEVFN2(source_id));=0A+ if ( pdev && pdev->domain !=3D = dom_xen &&=0A+ (!pdev->domain || !IS_PRIV(pdev->domain)) )=0A+ = pdev =3D NULL;=0A+ spin_unlock(&pcidevs_lock);=0A+=0A+ = if ( !pdev )=0A+ {=0A+ /* Tell the device to stop = DMAing; we can't rely on the guest to=0A+ * control it for us. = */=0A+ cword =3D pci_conf_read16(iommu->intel->drhd->segment, = bus,=0A+ PCI_SLOT(source_id), PCI_FUNC(s= ource_id),=0A+ PCI_COMMAND);=0A+ = pci_conf_write16(iommu->intel->drhd->segment, bus,=0A+ = PCI_SLOT(source_id), PCI_FUNC(source_id),=0A+ = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ }=0A =0A = fault_index++;=0A if ( fault_index > cap_num_fault_regs(iomm= u->cap) )=0A --=__Part49788309.4__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part49788309.4__=-- From xen-devel-bounces@lists.xen.org Mon Nov 05 17:14:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:14:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQFk-0006Gd-Ux; Mon, 05 Nov 2012 17:14:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQFj-0006GY-CZ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:14:23 +0000 Received: from [85.158.139.211:53256] by server-7.bemta-5.messagelabs.com id D5/EA-23096-EE3F7905; Mon, 05 Nov 2012 17:14:22 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352135660!18940010!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29672 invoked from network); 5 Nov 2012 17:14:21 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:14:21 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="213422341" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 17:14:20 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 12:14:20 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVQFf-0003eG-D9; Mon, 05 Nov 2012 17:14:19 +0000 Message-ID: <5097F3E9.1060404@eu.citrix.com> Date: Mon, 5 Nov 2012 17:14:17 +0000 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Dan Magenheimer References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> In-Reply-To: Cc: "Tim \(Xen.org\)" , Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , Ian Jackson , George Shuklin , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 30/10/12 15:43, Dan Magenheimer wrote: > a) Truly free memory (each free page is on the hypervisor free list) > b) Freeable memory ("ephmeral" memory managed by tmem) > c) Owned memory (pages allocated by the hypervisor or for a domain) > > The sum of these three is always a constant: The total number of > RAM pages in the system. However, when tmem is active, the values > of all _three_ of these change constantly. So if at the start of a > domain launch, the sum of free+freeable exceeds the intended size > of the domain, the domain allocation/launch can start. Why free+freeable, rather than just "free"? > But then > if "owned" increases enough, there may no longer be enough memory > and the domain launch will fail. Again, "owned" would not increase at all if the guest weren't handing memory back to Xen. Why is that necessary, or even helpful? (And please don't start another rant about the bold new world of peace and love. Give me a freaking *technical* answer.) -George _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 17:14:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:14:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQFk-0006Gd-Ux; Mon, 05 Nov 2012 17:14:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQFj-0006GY-CZ for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:14:23 +0000 Received: from [85.158.139.211:53256] by server-7.bemta-5.messagelabs.com id D5/EA-23096-EE3F7905; Mon, 05 Nov 2012 17:14:22 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352135660!18940010!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29672 invoked from network); 5 Nov 2012 17:14:21 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:14:21 -0000 X-IronPort-AV: E=Sophos;i="4.80,715,1344211200"; d="scan'208";a="213422341" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 17:14:20 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 12:14:20 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[0.0.0.0]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVQFf-0003eG-D9; Mon, 05 Nov 2012 17:14:19 +0000 Message-ID: <5097F3E9.1060404@eu.citrix.com> Date: Mon, 5 Nov 2012 17:14:17 +0000 From: George Dunlap User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Dan Magenheimer References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> In-Reply-To: Cc: "Tim \(Xen.org\)" , Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , Ian Jackson , George Shuklin , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 30/10/12 15:43, Dan Magenheimer wrote: > a) Truly free memory (each free page is on the hypervisor free list) > b) Freeable memory ("ephmeral" memory managed by tmem) > c) Owned memory (pages allocated by the hypervisor or for a domain) > > The sum of these three is always a constant: The total number of > RAM pages in the system. However, when tmem is active, the values > of all _three_ of these change constantly. So if at the start of a > domain launch, the sum of free+freeable exceeds the intended size > of the domain, the domain allocation/launch can start. Why free+freeable, rather than just "free"? > But then > if "owned" increases enough, there may no longer be enough memory > and the domain launch will fail. Again, "owned" would not increase at all if the guest weren't handing memory back to Xen. Why is that necessary, or even helpful? (And please don't start another rant about the bold new world of peace and love. Give me a freaking *technical* answer.) -George _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 17:15:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:15:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQGh-0006JF-DQ; Mon, 05 Nov 2012 17:15:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQGf-0006JA-TN for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:15:22 +0000 Received: from [85.158.139.83:39889] by server-5.bemta-5.messagelabs.com id 4C/53-11353-924F7905; Mon, 05 Nov 2012 17:15:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352135719!28851530!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2137 invoked from network); 5 Nov 2012 17:15:19 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:15:19 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3364943wey.32 for ; Mon, 05 Nov 2012 09:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=YjyeWH2rRrtrZZMEI6rFoTNJ2fh6Sw/mRtrTOk4kob0=; b=aBkcbs3nDCNj8x6WqnkVOj7cr0BL+Eb0+sLMmUMaDkoa6AOpplCVkFaWBURJM5MweS D1xifWfrEUhNAtZLdLSjm/J3+EEWJPM6laBoRgQJpcL0k5ND/oN9kjHYJk0gLLTorsnA mKW0eyers3pV9kBzv4m3efKSjD77FvKRqX53xcGL7FGW3SEZNvirK8NJ0uviAtmwJE1E jRtS/yh8u7xE/AzF2Fa4oNWxRUcQXZiFyy1DU8wtO6/YQR1tgwk7quY6fxXSr0BMvHq9 yW5f5Kf2uJFLajGvSnbiVAFbdshs554LtptnbPN/D7mwPJsQ+t7d7OFNDlK2TUadx+dD nHHQ== Received: by 10.180.82.104 with SMTP id h8mr14243957wiy.19.1352135719031; Mon, 05 Nov 2012 09:15:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id r10sm9618966wiz.0.2012.11.05.09.15.10 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 09:15:18 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 17:15:05 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT Thread-Index: Ac27eRkXnyDo8+eskEmM+ixAJTW45A== In-Reply-To: <5097FC3002000078000A66AE@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 16:49, "Jan Beulich" wrote: > Since the image pointed to may (and generally will) live in boot > services memory (which we add to the global memory pool long before > ACPI tables get looked at), we should prevent Dom0 from trying to > retrieve the image data. > > The alternatives would be to > - not add boot services memory to the global pool at all, or > - defer adding boot services memory until Dom0 indicates it is safe to > do so, or > - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid > adding that specific region to the E820 table. > None of these is really attractive, and as Xen commonly prints to the > video console anyway (without trying to avoid any regions on the > screen), the invalidation would need to be done conditionally anyway. > > (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- a/xen/arch/x86/acpi/boot.c > +++ b/xen/arch/x86/acpi/boot.c > @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct > #define acpi_parse_hpet NULL > #endif > > +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) > +{ > + struct acpi_table_bgrt *bgrt_tbl = > + container_of(table, struct acpi_table_bgrt, header); > + > + if (table->length < sizeof(*bgrt_tbl)) > + return -1; > + > + if (!(bgrt_tbl->status & 1)) > + return 0; > + > + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for > (%u,%u)\n", > + bgrt_tbl->version, bgrt_tbl->image_address, > + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); > + bgrt_tbl->status &= ~1; > + > + return 0; > +} > + > #ifdef CONFIG_ACPI_SLEEP > #define acpi_fadt_copy_address(dst, src, len) do { \ > if (fadt->header.revision >= FADT2_REVISION_ID) \ > @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) > > erst_init(); > > + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); > + > return 0; > } > --- a/xen/include/acpi/actbl.h > +++ b/xen/include/acpi/actbl.h > @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { > > #include > #include > +#include > > /* > * Sizes of the various flavors of FADT. We need to look closely > --- /dev/null > +++ b/xen/include/acpi/actbl3.h > @@ -0,0 +1,557 @@ > +/**************************************************************************** > ** > + * > + * Name: actbl3.h - ACPI Table Definitions > + * > + > *****************************************************************************/ > + > +/* > + * Copyright (C) 2000 - 2012, Intel Corp. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions, and the following disclaimer, > + * without modification. > + * 2. Redistributions in binary form must reproduce at minimum a disclaimer > + * substantially similar to the "NO WARRANTY" disclaimer below > + * ("Disclaimer") and any redistribution must be conditioned upon > + * including a substantially similar Disclaimer requirement for further > + * binary redistribution. > + * 3. Neither the names of the above-listed copyright holders nor the names > + * of any contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * Alternatively, this software may be distributed under the terms of the > + * GNU General Public License ("GPL") version 2 as published by the Free > + * Software Foundation. > + * > + * NO WARRANTY > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING > + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > + * POSSIBILITY OF SUCH DAMAGES. > + */ > + > +#ifndef __ACTBL3_H__ > +#define __ACTBL3_H__ > + > +/**************************************************************************** > *** > + * > + * Additional ACPI Tables (3) > + * > + * These tables are not consumed directly by the ACPICA subsystem, but are > + * included here to support device drivers and the AML disassembler. > + * > + * The tables in this file are fully defined within the ACPI specification. > + * > + > ******************************************************************************> / > + > +/* > + * Values for description table header signatures for tables defined in this > + * file. Useful because they make it more difficult to inadvertently type in > + * the wrong signature. > + */ > +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ > +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for > Measurement table */ > +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table */ > +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table */ > +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ > +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel > Table */ > +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */ > +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ > + > +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ > +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ > + > +/* Reserved table signatures */ > + > +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ > +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation Table */ > +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ > +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */ > + > +/* > + * All tables must be byte-packed to match the ACPI specification, since > + * the tables are provided by the system BIOS. > + */ > +#pragma pack(1) > + > +/* > + * Note: C bitfields are not used for this reason: > + * > + * "Bitfields are great and easy to read, but unfortunately the C language > + * does not specify the layout of bitfields in memory, which means they are > + * essentially useless for dealing with packed data in on-disk formats or > + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, > + * this decision was a design error in C. Ritchie could have picked an order > + * and stuck with it." Norman Ramsey. > + * See http://stackoverflow.com/a/1053662/41661 > + */ > + > +/**************************************************************************** > *** > + * > + * BGRT - Boot Graphics Resource Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_bgrt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u16 version; > + u8 status; > + u8 image_type; > + u64 image_address; > + u32 image_offset_x; > + u32 image_offset_y; > +}; > + > +/**************************************************************************** > *** > + * > + * DRTM - Dynamic Root of Trust for Measurement table > + * > + > ******************************************************************************> / > + > +struct acpi_table_drtm { > + struct acpi_table_header header; /* Common ACPI table header */ > + u64 entry_base_address; > + u64 entry_length; > + u32 entry_address32; > + u64 entry_address64; > + u64 exit_address; > + u64 log_area_address; > + u32 log_area_length; > + u64 arch_dependent_address; > + u32 flags; > +}; > + > +/* 1) Validated Tables List */ > + > +struct acpi_drtm_vtl_list { > + u32 validated_table_list_count; > +}; > + > +/* 2) Resources List */ > + > +struct acpi_drtm_resource_list { > + u32 resource_list_count; > +}; > + > +/* 3) Platform-specific Identifiers List */ > + > +struct acpi_drtm_id_list { > + u32 id_list_count; > +}; > + > +/**************************************************************************** > *** > + * > + * FPDT - Firmware Performance Data Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_fpdt { > + struct acpi_table_header header; /* Common ACPI table header */ > +}; > + > +/* FPDT subtable header */ > + > +struct acpi_fpdt_header { > + u16 type; > + u8 length; > + u8 revision; > +}; > + > +/* Values for Type field above */ > + > +enum acpi_fpdt_type { > + ACPI_FPDT_TYPE_BOOT = 0, > + ACPI_FPDT_TYPE_S3PERF = 1, > +}; > + > +/* > + * FPDT subtables > + */ > + > +/* 0: Firmware Basic Boot Performance Record */ > + > +struct acpi_fpdt_boot { > + struct acpi_fpdt_header header; > + u8 reserved[4]; > + u64 reset_end; > + u64 load_start; > + u64 startup_start; > + u64 exit_services_entry; > + u64 exit_services_exit; > +}; > + > +/* 1: S3 Performance Table Pointer Record */ > + > +struct acpi_fpdt_s3pt_ptr { > + struct acpi_fpdt_header header; > + u8 reserved[4]; > + u64 address; > +}; > + > +/* > + * S3PT - S3 Performance Table. This table is pointed to by the > + * FPDT S3 Pointer Record above. > + */ > +struct acpi_table_s3pt { > + u8 signature[4]; /* "S3PT" */ > + u32 length; > +}; > + > +/* > + * S3PT Subtables > + */ > +struct acpi_s3pt_header { > + u16 type; > + u8 length; > + u8 revision; > +}; > + > +/* Values for Type field above */ > + > +enum acpi_s3pt_type { > + ACPI_S3PT_TYPE_RESUME = 0, > + ACPI_S3PT_TYPE_SUSPEND = 1, > +}; > + > +struct acpi_s3pt_resume { > + struct acpi_s3pt_header header; > + u32 resume_count; > + u64 full_resume; > + u64 average_resume; > +}; > + > +struct acpi_s3pt_suspend { > + struct acpi_s3pt_header header; > + u64 suspend_start; > + u64 suspend_end; > +}; > + > +/**************************************************************************** > *** > + * > + * GTDT - Generic Timer Description Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_gtdt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u64 address; > + u32 flags; > + u32 secure_pl1_interrupt; > + u32 secure_pl1_flags; > + u32 non_secure_pl1_interrupt; > + u32 non_secure_pl1_flags; > + u32 virtual_timer_interrupt; > + u32 virtual_timer_flags; > + u32 non_secure_pl2_interrupt; > + u32 non_secure_pl2_flags; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 > + > +/* Values for all "TimerFlags" fields above */ > + > +#define ACPI_GTDT_INTERRUPT_MODE 1 > +#define ACPI_GTDT_INTERRUPT_POLARITY 2 > + > +/**************************************************************************** > *** > + * > + * MPST - Memory Power State Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +#define ACPI_MPST_CHANNEL_INFO \ > + u16 reserved1; \ > + u8 channel_id; \ > + u8 reserved2; \ > + u16 power_node_count; > + > +/* Main table */ > + > +struct acpi_table_mpst { > + struct acpi_table_header header; /* Common ACPI table header */ > + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ > +}; > + > +/* Memory Platform Communication Channel Info */ > + > +struct acpi_mpst_channel { > + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ > +}; > + > +/* Memory Power Node Structure */ > + > +struct acpi_mpst_power_node { > + u8 flags; > + u8 reserved1; > + u16 node_id; > + u32 length; > + u64 range_address; > + u64 range_length; > + u8 num_power_states; > + u8 num_physical_components; > + u16 reserved2; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_MPST_ENABLED 1 > +#define ACPI_MPST_POWER_MANAGED 2 > +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 > + > +/* Memory Power State Structure (follows POWER_NODE above) */ > + > +struct acpi_mpst_power_state { > + u8 power_state; > + u8 info_index; > +}; > + > +/* Physical Component ID Structure (follows POWER_STATE above) */ > + > +struct acpi_mpst_component { > + u16 component_id; > +}; > + > +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) */ > + > +struct acpi_mpst_data_hdr { > + u16 characteristics_count; > +}; > + > +struct acpi_mpst_power_data { > + u8 revision; > + u8 flags; > + u16 reserved1; > + u32 average_power; > + u32 power_saving; > + u64 exit_latency; > + u64 reserved2; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_MPST_PRESERVE 1 > +#define ACPI_MPST_AUTOENTRY 2 > +#define ACPI_MPST_AUTOEXIT 4 > + > +/* Shared Memory Region (not part of an ACPI table) */ > + > +struct acpi_mpst_shared { > + u32 signature; > + u16 pcc_command; > + u16 pcc_status; > + u16 command_register; > + u16 status_register; > + u16 power_state_id; > + u16 power_node_id; > + u64 energy_consumed; > + u64 average_power; > +}; > + > +/**************************************************************************** > *** > + * > + * PCCT - Platform Communications Channel Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_pcct { > + struct acpi_table_header header; /* Common ACPI table header */ > + u32 flags; > + u32 latency; > + u32 reserved; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_PCCT_DOORBELL 1 > + > +/* > + * PCCT subtables > + */ > + > +/* 0: Generic Communications Subspace */ > + > +struct acpi_pcct_subspace { > + struct acpi_subtable_header header; > + u8 reserved[6]; > + u64 base_address; > + u64 length; > + struct acpi_generic_address doorbell_register; > + u64 preserve_mask; > + u64 write_mask; > +}; > + > +/* > + * PCC memory structures (not part of the ACPI table) > + */ > + > +/* Shared Memory Region */ > + > +struct acpi_pcct_shared_memory { > + u32 signature; > + u16 command; > + u16 status; > +}; > + > +/**************************************************************************** > *** > + * > + * PMTT - Platform Memory Topology Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_pmtt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u32 reserved; > +}; > + > +/* Common header for PMTT subtables that follow main table */ > + > +struct acpi_pmtt_header { > + u8 type; > + u8 reserved1; > + u16 length; > + u16 flags; > + u16 reserved2; > +}; > + > +/* Values for Type field above */ > + > +#define ACPI_PMTT_TYPE_SOCKET 0 > +#define ACPI_PMTT_TYPE_CONTROLLER 1 > +#define ACPI_PMTT_TYPE_DIMM 2 > +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved */ > + > +/* Values for Flags field above */ > + > +#define ACPI_PMTT_TOP_LEVEL 0x0001 > +#define ACPI_PMTT_PHYSICAL 0x0002 > +#define ACPI_PMTT_MEMORY_TYPE 0x000C > + > +/* > + * PMTT subtables, correspond to Type in struct acpi_pmtt_header > + */ > + > +/* 0: Socket Structure */ > + > +struct acpi_pmtt_socket { > + struct acpi_pmtt_header header; > + u16 socket_id; > + u16 reserved; > +}; > + > +/* 1: Memory Controller subtable */ > + > +struct acpi_pmtt_controller { > + struct acpi_pmtt_header header; > + u32 read_latency; > + u32 write_latency; > + u32 read_bandwidth; > + u32 write_bandwidth; > + u16 access_width; > + u16 alignment; > + u16 reserved; > + u16 domain_count; > +}; > + > +/* 1a: Proximity Domain substructure */ > + > +struct acpi_pmtt_domain { > + u32 proximity_domain; > +}; > + > +/* 2: Physical Component Identifier (DIMM) */ > + > +struct acpi_pmtt_physical_component { > + struct acpi_pmtt_header header; > + u16 component_id; > + u16 reserved; > + u32 memory_size; > + u32 bios_handle; > +}; > + > +/**************************************************************************** > *** > + * > + * RASF - RAS Feature Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_rasf { > + struct acpi_table_header header; /* Common ACPI table header */ > + u8 channel_id[12]; > +}; > + > +/* RASF Platform Communication Channel Shared Memory Region */ > + > +struct acpi_rasf_shared_memory { > + u32 signature; > + u16 command; > + u16 status; > + u64 requested_address; > + u64 requested_length; > + u64 actual_address; > + u64 actual_length; > + u16 flags; > + u8 speed; > +}; > + > +/* Masks for Flags and Speed fields above */ > + > +#define ACPI_RASF_SCRUBBER_RUNNING 1 > +#define ACPI_RASF_SPEED (7<<1) > + > +/* Channel Commands */ > + > +enum acpi_rasf_commands { > + ACPI_RASF_GET_RAS_CAPABILITIES = 1, > + ACPI_RASF_GET_PATROL_PARAMETERS = 2, > + ACPI_RASF_START_PATROL_SCRUBBER = 3, > + ACPI_RASF_STOP_PATROL_SCRUBBER = 4 > +}; > + > +/* Channel Command flags */ > + > +#define ACPI_RASF_GENERATE_SCI (1<<15) > + > +/* Status values */ > + > +enum acpi_rasf_status { > + ACPI_RASF_SUCCESS = 0, > + ACPI_RASF_NOT_VALID = 1, > + ACPI_RASF_NOT_SUPPORTED = 2, > + ACPI_RASF_BUSY = 3, > + ACPI_RASF_FAILED = 4, > + ACPI_RASF_ABORTED = 5, > + ACPI_RASF_INVALID_DATA = 6 > +}; > + > +/* Status flags */ > + > +#define ACPI_RASF_COMMAND_COMPLETE (1) > +#define ACPI_RASF_SCI_DOORBELL (1<<1) > +#define ACPI_RASF_ERROR (1<<2) > +#define ACPI_RASF_STATUS (0x1F<<3) > + > +/* Reset to default packing */ > + > +#pragma pack() > + > +#endif /* __ACTBL3_H__ */ > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 17:15:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:15:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQGh-0006JF-DQ; Mon, 05 Nov 2012 17:15:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQGf-0006JA-TN for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:15:22 +0000 Received: from [85.158.139.83:39889] by server-5.bemta-5.messagelabs.com id 4C/53-11353-924F7905; Mon, 05 Nov 2012 17:15:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352135719!28851530!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2137 invoked from network); 5 Nov 2012 17:15:19 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:15:19 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3364943wey.32 for ; Mon, 05 Nov 2012 09:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=YjyeWH2rRrtrZZMEI6rFoTNJ2fh6Sw/mRtrTOk4kob0=; b=aBkcbs3nDCNj8x6WqnkVOj7cr0BL+Eb0+sLMmUMaDkoa6AOpplCVkFaWBURJM5MweS D1xifWfrEUhNAtZLdLSjm/J3+EEWJPM6laBoRgQJpcL0k5ND/oN9kjHYJk0gLLTorsnA mKW0eyers3pV9kBzv4m3efKSjD77FvKRqX53xcGL7FGW3SEZNvirK8NJ0uviAtmwJE1E jRtS/yh8u7xE/AzF2Fa4oNWxRUcQXZiFyy1DU8wtO6/YQR1tgwk7quY6fxXSr0BMvHq9 yW5f5Kf2uJFLajGvSnbiVAFbdshs554LtptnbPN/D7mwPJsQ+t7d7OFNDlK2TUadx+dD nHHQ== Received: by 10.180.82.104 with SMTP id h8mr14243957wiy.19.1352135719031; Mon, 05 Nov 2012 09:15:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id r10sm9618966wiz.0.2012.11.05.09.15.10 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 09:15:18 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 17:15:05 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT Thread-Index: Ac27eRkXnyDo8+eskEmM+ixAJTW45A== In-Reply-To: <5097FC3002000078000A66AE@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 16:49, "Jan Beulich" wrote: > Since the image pointed to may (and generally will) live in boot > services memory (which we add to the global memory pool long before > ACPI tables get looked at), we should prevent Dom0 from trying to > retrieve the image data. > > The alternatives would be to > - not add boot services memory to the global pool at all, or > - defer adding boot services memory until Dom0 indicates it is safe to > do so, or > - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid > adding that specific region to the E820 table. > None of these is really attractive, and as Xen commonly prints to the > video console anyway (without trying to avoid any regions on the > screen), the invalidation would need to be done conditionally anyway. > > (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) > > Signed-off-by: Jan Beulich Acked-by: Keir Fraser > --- a/xen/arch/x86/acpi/boot.c > +++ b/xen/arch/x86/acpi/boot.c > @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct > #define acpi_parse_hpet NULL > #endif > > +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) > +{ > + struct acpi_table_bgrt *bgrt_tbl = > + container_of(table, struct acpi_table_bgrt, header); > + > + if (table->length < sizeof(*bgrt_tbl)) > + return -1; > + > + if (!(bgrt_tbl->status & 1)) > + return 0; > + > + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for > (%u,%u)\n", > + bgrt_tbl->version, bgrt_tbl->image_address, > + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); > + bgrt_tbl->status &= ~1; > + > + return 0; > +} > + > #ifdef CONFIG_ACPI_SLEEP > #define acpi_fadt_copy_address(dst, src, len) do { \ > if (fadt->header.revision >= FADT2_REVISION_ID) \ > @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) > > erst_init(); > > + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); > + > return 0; > } > --- a/xen/include/acpi/actbl.h > +++ b/xen/include/acpi/actbl.h > @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { > > #include > #include > +#include > > /* > * Sizes of the various flavors of FADT. We need to look closely > --- /dev/null > +++ b/xen/include/acpi/actbl3.h > @@ -0,0 +1,557 @@ > +/**************************************************************************** > ** > + * > + * Name: actbl3.h - ACPI Table Definitions > + * > + > *****************************************************************************/ > + > +/* > + * Copyright (C) 2000 - 2012, Intel Corp. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions, and the following disclaimer, > + * without modification. > + * 2. Redistributions in binary form must reproduce at minimum a disclaimer > + * substantially similar to the "NO WARRANTY" disclaimer below > + * ("Disclaimer") and any redistribution must be conditioned upon > + * including a substantially similar Disclaimer requirement for further > + * binary redistribution. > + * 3. Neither the names of the above-listed copyright holders nor the names > + * of any contributors may be used to endorse or promote products derived > + * from this software without specific prior written permission. > + * > + * Alternatively, this software may be distributed under the terms of the > + * GNU General Public License ("GPL") version 2 as published by the Free > + * Software Foundation. > + * > + * NO WARRANTY > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR > + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING > + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > + * POSSIBILITY OF SUCH DAMAGES. > + */ > + > +#ifndef __ACTBL3_H__ > +#define __ACTBL3_H__ > + > +/**************************************************************************** > *** > + * > + * Additional ACPI Tables (3) > + * > + * These tables are not consumed directly by the ACPICA subsystem, but are > + * included here to support device drivers and the AML disassembler. > + * > + * The tables in this file are fully defined within the ACPI specification. > + * > + > ******************************************************************************> / > + > +/* > + * Values for description table header signatures for tables defined in this > + * file. Useful because they make it more difficult to inadvertently type in > + * the wrong signature. > + */ > +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ > +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for > Measurement table */ > +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table */ > +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table */ > +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ > +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel > Table */ > +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */ > +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ > + > +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ > +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ > + > +/* Reserved table signatures */ > + > +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ > +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation Table */ > +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ > +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */ > + > +/* > + * All tables must be byte-packed to match the ACPI specification, since > + * the tables are provided by the system BIOS. > + */ > +#pragma pack(1) > + > +/* > + * Note: C bitfields are not used for this reason: > + * > + * "Bitfields are great and easy to read, but unfortunately the C language > + * does not specify the layout of bitfields in memory, which means they are > + * essentially useless for dealing with packed data in on-disk formats or > + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, > + * this decision was a design error in C. Ritchie could have picked an order > + * and stuck with it." Norman Ramsey. > + * See http://stackoverflow.com/a/1053662/41661 > + */ > + > +/**************************************************************************** > *** > + * > + * BGRT - Boot Graphics Resource Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_bgrt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u16 version; > + u8 status; > + u8 image_type; > + u64 image_address; > + u32 image_offset_x; > + u32 image_offset_y; > +}; > + > +/**************************************************************************** > *** > + * > + * DRTM - Dynamic Root of Trust for Measurement table > + * > + > ******************************************************************************> / > + > +struct acpi_table_drtm { > + struct acpi_table_header header; /* Common ACPI table header */ > + u64 entry_base_address; > + u64 entry_length; > + u32 entry_address32; > + u64 entry_address64; > + u64 exit_address; > + u64 log_area_address; > + u32 log_area_length; > + u64 arch_dependent_address; > + u32 flags; > +}; > + > +/* 1) Validated Tables List */ > + > +struct acpi_drtm_vtl_list { > + u32 validated_table_list_count; > +}; > + > +/* 2) Resources List */ > + > +struct acpi_drtm_resource_list { > + u32 resource_list_count; > +}; > + > +/* 3) Platform-specific Identifiers List */ > + > +struct acpi_drtm_id_list { > + u32 id_list_count; > +}; > + > +/**************************************************************************** > *** > + * > + * FPDT - Firmware Performance Data Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_fpdt { > + struct acpi_table_header header; /* Common ACPI table header */ > +}; > + > +/* FPDT subtable header */ > + > +struct acpi_fpdt_header { > + u16 type; > + u8 length; > + u8 revision; > +}; > + > +/* Values for Type field above */ > + > +enum acpi_fpdt_type { > + ACPI_FPDT_TYPE_BOOT = 0, > + ACPI_FPDT_TYPE_S3PERF = 1, > +}; > + > +/* > + * FPDT subtables > + */ > + > +/* 0: Firmware Basic Boot Performance Record */ > + > +struct acpi_fpdt_boot { > + struct acpi_fpdt_header header; > + u8 reserved[4]; > + u64 reset_end; > + u64 load_start; > + u64 startup_start; > + u64 exit_services_entry; > + u64 exit_services_exit; > +}; > + > +/* 1: S3 Performance Table Pointer Record */ > + > +struct acpi_fpdt_s3pt_ptr { > + struct acpi_fpdt_header header; > + u8 reserved[4]; > + u64 address; > +}; > + > +/* > + * S3PT - S3 Performance Table. This table is pointed to by the > + * FPDT S3 Pointer Record above. > + */ > +struct acpi_table_s3pt { > + u8 signature[4]; /* "S3PT" */ > + u32 length; > +}; > + > +/* > + * S3PT Subtables > + */ > +struct acpi_s3pt_header { > + u16 type; > + u8 length; > + u8 revision; > +}; > + > +/* Values for Type field above */ > + > +enum acpi_s3pt_type { > + ACPI_S3PT_TYPE_RESUME = 0, > + ACPI_S3PT_TYPE_SUSPEND = 1, > +}; > + > +struct acpi_s3pt_resume { > + struct acpi_s3pt_header header; > + u32 resume_count; > + u64 full_resume; > + u64 average_resume; > +}; > + > +struct acpi_s3pt_suspend { > + struct acpi_s3pt_header header; > + u64 suspend_start; > + u64 suspend_end; > +}; > + > +/**************************************************************************** > *** > + * > + * GTDT - Generic Timer Description Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_gtdt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u64 address; > + u32 flags; > + u32 secure_pl1_interrupt; > + u32 secure_pl1_flags; > + u32 non_secure_pl1_interrupt; > + u32 non_secure_pl1_flags; > + u32 virtual_timer_interrupt; > + u32 virtual_timer_flags; > + u32 non_secure_pl2_interrupt; > + u32 non_secure_pl2_flags; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 > + > +/* Values for all "TimerFlags" fields above */ > + > +#define ACPI_GTDT_INTERRUPT_MODE 1 > +#define ACPI_GTDT_INTERRUPT_POLARITY 2 > + > +/**************************************************************************** > *** > + * > + * MPST - Memory Power State Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +#define ACPI_MPST_CHANNEL_INFO \ > + u16 reserved1; \ > + u8 channel_id; \ > + u8 reserved2; \ > + u16 power_node_count; > + > +/* Main table */ > + > +struct acpi_table_mpst { > + struct acpi_table_header header; /* Common ACPI table header */ > + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ > +}; > + > +/* Memory Platform Communication Channel Info */ > + > +struct acpi_mpst_channel { > + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ > +}; > + > +/* Memory Power Node Structure */ > + > +struct acpi_mpst_power_node { > + u8 flags; > + u8 reserved1; > + u16 node_id; > + u32 length; > + u64 range_address; > + u64 range_length; > + u8 num_power_states; > + u8 num_physical_components; > + u16 reserved2; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_MPST_ENABLED 1 > +#define ACPI_MPST_POWER_MANAGED 2 > +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 > + > +/* Memory Power State Structure (follows POWER_NODE above) */ > + > +struct acpi_mpst_power_state { > + u8 power_state; > + u8 info_index; > +}; > + > +/* Physical Component ID Structure (follows POWER_STATE above) */ > + > +struct acpi_mpst_component { > + u16 component_id; > +}; > + > +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) */ > + > +struct acpi_mpst_data_hdr { > + u16 characteristics_count; > +}; > + > +struct acpi_mpst_power_data { > + u8 revision; > + u8 flags; > + u16 reserved1; > + u32 average_power; > + u32 power_saving; > + u64 exit_latency; > + u64 reserved2; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_MPST_PRESERVE 1 > +#define ACPI_MPST_AUTOENTRY 2 > +#define ACPI_MPST_AUTOEXIT 4 > + > +/* Shared Memory Region (not part of an ACPI table) */ > + > +struct acpi_mpst_shared { > + u32 signature; > + u16 pcc_command; > + u16 pcc_status; > + u16 command_register; > + u16 status_register; > + u16 power_state_id; > + u16 power_node_id; > + u64 energy_consumed; > + u64 average_power; > +}; > + > +/**************************************************************************** > *** > + * > + * PCCT - Platform Communications Channel Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_pcct { > + struct acpi_table_header header; /* Common ACPI table header */ > + u32 flags; > + u32 latency; > + u32 reserved; > +}; > + > +/* Values for Flags field above */ > + > +#define ACPI_PCCT_DOORBELL 1 > + > +/* > + * PCCT subtables > + */ > + > +/* 0: Generic Communications Subspace */ > + > +struct acpi_pcct_subspace { > + struct acpi_subtable_header header; > + u8 reserved[6]; > + u64 base_address; > + u64 length; > + struct acpi_generic_address doorbell_register; > + u64 preserve_mask; > + u64 write_mask; > +}; > + > +/* > + * PCC memory structures (not part of the ACPI table) > + */ > + > +/* Shared Memory Region */ > + > +struct acpi_pcct_shared_memory { > + u32 signature; > + u16 command; > + u16 status; > +}; > + > +/**************************************************************************** > *** > + * > + * PMTT - Platform Memory Topology Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_pmtt { > + struct acpi_table_header header; /* Common ACPI table header */ > + u32 reserved; > +}; > + > +/* Common header for PMTT subtables that follow main table */ > + > +struct acpi_pmtt_header { > + u8 type; > + u8 reserved1; > + u16 length; > + u16 flags; > + u16 reserved2; > +}; > + > +/* Values for Type field above */ > + > +#define ACPI_PMTT_TYPE_SOCKET 0 > +#define ACPI_PMTT_TYPE_CONTROLLER 1 > +#define ACPI_PMTT_TYPE_DIMM 2 > +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved */ > + > +/* Values for Flags field above */ > + > +#define ACPI_PMTT_TOP_LEVEL 0x0001 > +#define ACPI_PMTT_PHYSICAL 0x0002 > +#define ACPI_PMTT_MEMORY_TYPE 0x000C > + > +/* > + * PMTT subtables, correspond to Type in struct acpi_pmtt_header > + */ > + > +/* 0: Socket Structure */ > + > +struct acpi_pmtt_socket { > + struct acpi_pmtt_header header; > + u16 socket_id; > + u16 reserved; > +}; > + > +/* 1: Memory Controller subtable */ > + > +struct acpi_pmtt_controller { > + struct acpi_pmtt_header header; > + u32 read_latency; > + u32 write_latency; > + u32 read_bandwidth; > + u32 write_bandwidth; > + u16 access_width; > + u16 alignment; > + u16 reserved; > + u16 domain_count; > +}; > + > +/* 1a: Proximity Domain substructure */ > + > +struct acpi_pmtt_domain { > + u32 proximity_domain; > +}; > + > +/* 2: Physical Component Identifier (DIMM) */ > + > +struct acpi_pmtt_physical_component { > + struct acpi_pmtt_header header; > + u16 component_id; > + u16 reserved; > + u32 memory_size; > + u32 bios_handle; > +}; > + > +/**************************************************************************** > *** > + * > + * RASF - RAS Feature Table (ACPI 5.0) > + * Version 1 > + * > + > ******************************************************************************> / > + > +struct acpi_table_rasf { > + struct acpi_table_header header; /* Common ACPI table header */ > + u8 channel_id[12]; > +}; > + > +/* RASF Platform Communication Channel Shared Memory Region */ > + > +struct acpi_rasf_shared_memory { > + u32 signature; > + u16 command; > + u16 status; > + u64 requested_address; > + u64 requested_length; > + u64 actual_address; > + u64 actual_length; > + u16 flags; > + u8 speed; > +}; > + > +/* Masks for Flags and Speed fields above */ > + > +#define ACPI_RASF_SCRUBBER_RUNNING 1 > +#define ACPI_RASF_SPEED (7<<1) > + > +/* Channel Commands */ > + > +enum acpi_rasf_commands { > + ACPI_RASF_GET_RAS_CAPABILITIES = 1, > + ACPI_RASF_GET_PATROL_PARAMETERS = 2, > + ACPI_RASF_START_PATROL_SCRUBBER = 3, > + ACPI_RASF_STOP_PATROL_SCRUBBER = 4 > +}; > + > +/* Channel Command flags */ > + > +#define ACPI_RASF_GENERATE_SCI (1<<15) > + > +/* Status values */ > + > +enum acpi_rasf_status { > + ACPI_RASF_SUCCESS = 0, > + ACPI_RASF_NOT_VALID = 1, > + ACPI_RASF_NOT_SUPPORTED = 2, > + ACPI_RASF_BUSY = 3, > + ACPI_RASF_FAILED = 4, > + ACPI_RASF_ABORTED = 5, > + ACPI_RASF_INVALID_DATA = 6 > +}; > + > +/* Status flags */ > + > +#define ACPI_RASF_COMMAND_COMPLETE (1) > +#define ACPI_RASF_SCI_DOORBELL (1<<1) > +#define ACPI_RASF_ERROR (1<<2) > +#define ACPI_RASF_STATUS (0x1F<<3) > + > +/* Reset to default packing */ > + > +#pragma pack() > + > +#endif /* __ACTBL3_H__ */ > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 17:16:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:16:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQH2-0006LY-1I; Mon, 05 Nov 2012 17:15:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQH0-0006LG-GI for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:15:42 +0000 Received: from [85.158.139.211:3077] by server-15.bemta-5.messagelabs.com id 3A/E5-26920-D34F7905; Mon, 05 Nov 2012 17:15:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352135740!17462976!1 X-Originating-IP: [74.125.82.41] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21167 invoked from network); 5 Nov 2012 17:15:40 -0000 Received: from mail-wg0-f41.google.com (HELO mail-wg0-f41.google.com) (74.125.82.41) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:15:40 -0000 Received: by mail-wg0-f41.google.com with SMTP id ds1so2191893wgb.2 for ; Mon, 05 Nov 2012 09:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=i9y4r6ymUYMBpoTYl2SK117ESVjGbRYHj4XnL01BtMM=; b=F/06IIj7SuCYIiEPEiHGf1iRxkmk/kCEF3wwt3cEzzwc+BPtoEueMfHN34Ki/Ef7eD L/mmRH21IjNkWtq+L7aG8CVYzEYXf/4e16g4FLZPCT2RUIJuo7qsDAgfbQX3At+SLczF LZKf6JZGljKiajWWCRZiZDkfwCrNIpTMZcHHeZUqJftLASVcgVTUGC95Wr3PnxZNVnLC SwxIpEQyMcJ+QB8bsAV6v8xvQBbHIGO/k/VxjnK3MBHJuhPjBTu8ZxH5ilC8IigX0qwJ c7v9VgmUZuq3l+uwg/5kB8fFkD0Dop75YwO5wLrxcnYqC+iQx4Q+O09hbzFqdZZqcbXH Pe7Q== Received: by 10.216.197.65 with SMTP id s43mr3411388wen.41.1352135740384; Mon, 05 Nov 2012 09:15:40 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id eq2sm12766660wib.1.2012.11.05.09.15.37 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 09:15:39 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 17:15:26 +0000 From: Keir Fraser To: Jan Beulich , , , Message-ID: Thread-Topic: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 Thread-Index: Ac27eSWbkBvIdXtbDUG++tGSRulbwA== In-Reply-To: <5097FD2902000078000A66BF@nat28.tlf.novell.com> Mime-version: 1.0 Cc: Dario Faggioli , Tim Deegan , xen-devel Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 16:53, "Jan Beulich" wrote: > Under the assumption that in these cases recurring faults aren't a > security issue and it can be expected that the drivers there are going > to try to take care of the problem. > > Signed-off-by: Jan Beulich Solving an observed problem? -- Keir > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -625,6 +625,18 @@ static void parse_event_log_entry(struct > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > { > + const struct pci_dev *pdev; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(iommu->seg, PCI_BUS(bdf), > PCI_DEVFN2(bdf)); > + if ( pdev && pdev->domain != dom_xen && > + (!pdev->domain || !IS_PRIV(pdev->domain)) ) > + pdev = NULL; > + spin_unlock(&pcidevs_lock); > + > + if ( pdev ) > + continue; > + > cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > PCI_SLOT(bdf), PCI_FUNC(bdf), > PCI_COMMAND); > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct > reg = cap_fault_reg_offset(iommu->cap); > while (1) > { > - u8 fault_reason; > + const struct pci_dev *pdev; > + u8 fault_reason, bus; > u16 source_id, cword; > u32 data; > u64 guest_addr; > @@ -950,14 +951,27 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + bus = PCI_BUS(source_id); > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(iommu->intel->drhd->segment, bus, > + PCI_DEVFN2(source_id)); > + if ( pdev && pdev->domain != dom_xen && > + (!pdev->domain || !IS_PRIV(pdev->domain)) ) > + pdev = NULL; > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + { > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(iommu->intel->drhd->segment, bus, > + PCI_SLOT(source_id), PCI_FUNC(source_id), > + PCI_COMMAND); > + pci_conf_write16(iommu->intel->drhd->segment, bus, > + PCI_SLOT(source_id), PCI_FUNC(source_id), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + } > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 17:16:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 17:16:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQH2-0006LY-1I; Mon, 05 Nov 2012 17:15:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVQH0-0006LG-GI for xen-devel@lists.xen.org; Mon, 05 Nov 2012 17:15:42 +0000 Received: from [85.158.139.211:3077] by server-15.bemta-5.messagelabs.com id 3A/E5-26920-D34F7905; Mon, 05 Nov 2012 17:15:41 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352135740!17462976!1 X-Originating-IP: [74.125.82.41] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21167 invoked from network); 5 Nov 2012 17:15:40 -0000 Received: from mail-wg0-f41.google.com (HELO mail-wg0-f41.google.com) (74.125.82.41) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 17:15:40 -0000 Received: by mail-wg0-f41.google.com with SMTP id ds1so2191893wgb.2 for ; Mon, 05 Nov 2012 09:15:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=i9y4r6ymUYMBpoTYl2SK117ESVjGbRYHj4XnL01BtMM=; b=F/06IIj7SuCYIiEPEiHGf1iRxkmk/kCEF3wwt3cEzzwc+BPtoEueMfHN34Ki/Ef7eD L/mmRH21IjNkWtq+L7aG8CVYzEYXf/4e16g4FLZPCT2RUIJuo7qsDAgfbQX3At+SLczF LZKf6JZGljKiajWWCRZiZDkfwCrNIpTMZcHHeZUqJftLASVcgVTUGC95Wr3PnxZNVnLC SwxIpEQyMcJ+QB8bsAV6v8xvQBbHIGO/k/VxjnK3MBHJuhPjBTu8ZxH5ilC8IigX0qwJ c7v9VgmUZuq3l+uwg/5kB8fFkD0Dop75YwO5wLrxcnYqC+iQx4Q+O09hbzFqdZZqcbXH Pe7Q== Received: by 10.216.197.65 with SMTP id s43mr3411388wen.41.1352135740384; Mon, 05 Nov 2012 09:15:40 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id eq2sm12766660wib.1.2012.11.05.09.15.37 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 09:15:39 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 17:15:26 +0000 From: Keir Fraser To: Jan Beulich , , , Message-ID: Thread-Topic: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 Thread-Index: Ac27eSWbkBvIdXtbDUG++tGSRulbwA== In-Reply-To: <5097FD2902000078000A66BF@nat28.tlf.novell.com> Mime-version: 1.0 Cc: Dario Faggioli , Tim Deegan , xen-devel Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 16:53, "Jan Beulich" wrote: > Under the assumption that in these cases recurring faults aren't a > security issue and it can be expected that the drivers there are going > to try to take care of the problem. > > Signed-off-by: Jan Beulich Solving an observed problem? -- Keir > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -625,6 +625,18 @@ static void parse_event_log_entry(struct > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > { > + const struct pci_dev *pdev; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(iommu->seg, PCI_BUS(bdf), > PCI_DEVFN2(bdf)); > + if ( pdev && pdev->domain != dom_xen && > + (!pdev->domain || !IS_PRIV(pdev->domain)) ) > + pdev = NULL; > + spin_unlock(&pcidevs_lock); > + > + if ( pdev ) > + continue; > + > cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > PCI_SLOT(bdf), PCI_FUNC(bdf), > PCI_COMMAND); > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -916,7 +916,8 @@ static void __do_iommu_page_fault(struct > reg = cap_fault_reg_offset(iommu->cap); > while (1) > { > - u8 fault_reason; > + const struct pci_dev *pdev; > + u8 fault_reason, bus; > u16 source_id, cword; > u32 data; > u64 guest_addr; > @@ -950,14 +951,27 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + bus = PCI_BUS(source_id); > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(iommu->intel->drhd->segment, bus, > + PCI_DEVFN2(source_id)); > + if ( pdev && pdev->domain != dom_xen && > + (!pdev->domain || !IS_PRIV(pdev->domain)) ) > + pdev = NULL; > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + { > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(iommu->intel->drhd->segment, bus, > + PCI_SLOT(source_id), PCI_FUNC(source_id), > + PCI_COMMAND); > + pci_conf_write16(iommu->intel->drhd->segment, bus, > + PCI_SLOT(source_id), PCI_FUNC(source_id), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + } > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 18:22:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 18:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRJB-00076k-Lk; Mon, 05 Nov 2012 18:22:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRJA-00076d-76 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 18:22:00 +0000 Received: from [85.158.143.99:11644] by server-1.bemta-4.messagelabs.com id 13/D7-27934-7C308905; Mon, 05 Nov 2012 18:21:59 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352139717!21691257!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjEyMDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14778 invoked from network); 5 Nov 2012 18:21:58 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 18:21:58 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5ILh9u030240 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 18:21:43 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5ILeIT018364 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 18:21:41 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5ILdoA002447; Mon, 5 Nov 2012 12:21:39 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 5 Nov 2012 10:21:31 -0800 (PST) From: Dan Magenheimer To: George Dunlap References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> <5097F3E9.1060404@eu.citrix.com> In-Reply-To: <5097F3E9.1060404@eu.citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Tim \(Xen.org\)" , Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: George Dunlap [mailto:george.dunlap@eu.citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On 30/10/12 15:43, Dan Magenheimer wrote: > > a) Truly free memory (each free page is on the hypervisor free list) > > b) Freeable memory ("ephmeral" memory managed by tmem) > > c) Owned memory (pages allocated by the hypervisor or for a domain) > > > > The sum of these three is always a constant: The total number of > > RAM pages in the system. However, when tmem is active, the values > > of all _three_ of these change constantly. So if at the start of a > > domain launch, the sum of free+freeable exceeds the intended size > > of the domain, the domain allocation/launch can start. > (And please don't start another rant about the bold new world of peace > and love. Give me a freaking *technical* answer.) /Me removes seventies-style tie-dye tshirt with peace logo and sadly withdraws single daisy previously extended to George. > Why free+freeable, rather than just "free"? A free page is a page that is not used for anything at all. It is on the hypervisor's free list. A freeable page contains tmem ephemeral data stored on behalf of a domain (or, if dedup'ing is enabled, on behalf of one or more domains). More specifically for a tmem-enabled Linux guest, a freeable page contains a clean page cache page that the Linux guest OS has asked the hypervisor (via the tmem ABI) to hold if it can for as long as it can. The specific clean page cache pages are chosen and the call is done on the Linux side via "cleancache". So, when tmem is working optimally, there are few or no free pages and many many freeable pages (perhaps half of physical RAM or more). Freeable pages across all tmem-enabled guests are kept in a single LRU queue. When a request is made to the hypervisor allocator for a free page and its free list is empty, the allocator will force tmem to relinquish an ephemeral page (in LRU order). Because this is entirely up to the hypervisor and can happen at any time, freeable pages are not counted as "owned" by a domain but still have some value to a domain. So, in essence, a "free" page has zero value and a "freeable" page has a small, but non-zero value that decays over time. So it's useful for a toolstack to know both quantities. (And, since this thread has gone in many directions, let me reiterate that all of this has been working in the hypervisor since 4.0 in 2009, and cleancache in Linux since mid-2011.) > > But then > > if "owned" increases enough, there may no longer be enough memory > > and the domain launch will fail. > > Again, "owned" would not increase at all if the guest weren't handing > memory back to Xen. Why is that necessary, or even helpful? The guest _is_ handing memory back to Xen. This is the other half of the tmem functionality, persistent pages. Answering your second question is going to require a little more background. Since nobody, not even the guest kernel, can guess the future needs of its workload, there are two choices: (1) allocate enough RAM so that the supply always exceeds max-demand, or (2) aggressively reduce RAM to a reasonable guess for a target and prepare for the probability that, sometimes, available RAM won't be enough. Tmem does choice #2; self-ballooning aggressively drives RAM (or "current memory" as the hypervisor sees it) to a target level: in Linux, to Committed_AS modified by a formula similar to the one Novell derived for a minimum ballooning safety level. The target level changes constantly, but the selfballooning code samples and adjusts only periodically. If, during the time interval between samples, memory demand spikes, Linux has a memory shortage and responds as it must, namely by swapping. The frontswap code in Linux "intercepts" this swapping so that, in most cases, it goes to a Xen tmem persistent pool instead of to a (virtual or physical) swap disk. Data in persistent pools, unlike ephemeral pools, are guaranteed to be maintained by the hypervisor until the guest invalidates it or until the guest dies. As a result, pages allocated for persistent pools increase the count of pages "owned" by the domain that requested the pages, until the guest explicitly invalidates them (or dies). The accounting also ensures that malicious domains can't absorb memory beyond the toolset-specified limit ("maxmem"). Note that, if compression is enabled, a domain _may_ "logically" exceed maxmem, as long as it does not physically exceed it. (And, again, all of this too has been in Xen since 4.0 in 2009, and selfballooning has been in Linux since mid-2011, but frontswap finally was accepted into Linux earlier in 2012.) Ok, George, does that answer your questions, _technically_? I'll be happy to answer any others. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 18:22:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 18:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRJB-00076k-Lk; Mon, 05 Nov 2012 18:22:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRJA-00076d-76 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 18:22:00 +0000 Received: from [85.158.143.99:11644] by server-1.bemta-4.messagelabs.com id 13/D7-27934-7C308905; Mon, 05 Nov 2012 18:21:59 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352139717!21691257!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjEyMDE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14778 invoked from network); 5 Nov 2012 18:21:58 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 18:21:58 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5ILh9u030240 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 18:21:43 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5ILeIT018364 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 18:21:41 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5ILdoA002447; Mon, 5 Nov 2012 12:21:39 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 5 Nov 2012 10:21:31 -0800 (PST) From: Dan Magenheimer To: George Dunlap References: <60d00f38-98a3-4ec2-acbd-b49dafaada56@default> <20121029223555.GA24388@ocelot.phlegethon.org> <508F9DE902000078000A5565@nat28.tlf.novell.com> <5097F3E9.1060404@eu.citrix.com> In-Reply-To: <5097F3E9.1060404@eu.citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Tim \(Xen.org\)" , Olaf Hering , "Keir \(Xen.org\)" , Ian Campbell , Konrad Wilk , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: George Dunlap [mailto:george.dunlap@eu.citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > On 30/10/12 15:43, Dan Magenheimer wrote: > > a) Truly free memory (each free page is on the hypervisor free list) > > b) Freeable memory ("ephmeral" memory managed by tmem) > > c) Owned memory (pages allocated by the hypervisor or for a domain) > > > > The sum of these three is always a constant: The total number of > > RAM pages in the system. However, when tmem is active, the values > > of all _three_ of these change constantly. So if at the start of a > > domain launch, the sum of free+freeable exceeds the intended size > > of the domain, the domain allocation/launch can start. > (And please don't start another rant about the bold new world of peace > and love. Give me a freaking *technical* answer.) /Me removes seventies-style tie-dye tshirt with peace logo and sadly withdraws single daisy previously extended to George. > Why free+freeable, rather than just "free"? A free page is a page that is not used for anything at all. It is on the hypervisor's free list. A freeable page contains tmem ephemeral data stored on behalf of a domain (or, if dedup'ing is enabled, on behalf of one or more domains). More specifically for a tmem-enabled Linux guest, a freeable page contains a clean page cache page that the Linux guest OS has asked the hypervisor (via the tmem ABI) to hold if it can for as long as it can. The specific clean page cache pages are chosen and the call is done on the Linux side via "cleancache". So, when tmem is working optimally, there are few or no free pages and many many freeable pages (perhaps half of physical RAM or more). Freeable pages across all tmem-enabled guests are kept in a single LRU queue. When a request is made to the hypervisor allocator for a free page and its free list is empty, the allocator will force tmem to relinquish an ephemeral page (in LRU order). Because this is entirely up to the hypervisor and can happen at any time, freeable pages are not counted as "owned" by a domain but still have some value to a domain. So, in essence, a "free" page has zero value and a "freeable" page has a small, but non-zero value that decays over time. So it's useful for a toolstack to know both quantities. (And, since this thread has gone in many directions, let me reiterate that all of this has been working in the hypervisor since 4.0 in 2009, and cleancache in Linux since mid-2011.) > > But then > > if "owned" increases enough, there may no longer be enough memory > > and the domain launch will fail. > > Again, "owned" would not increase at all if the guest weren't handing > memory back to Xen. Why is that necessary, or even helpful? The guest _is_ handing memory back to Xen. This is the other half of the tmem functionality, persistent pages. Answering your second question is going to require a little more background. Since nobody, not even the guest kernel, can guess the future needs of its workload, there are two choices: (1) allocate enough RAM so that the supply always exceeds max-demand, or (2) aggressively reduce RAM to a reasonable guess for a target and prepare for the probability that, sometimes, available RAM won't be enough. Tmem does choice #2; self-ballooning aggressively drives RAM (or "current memory" as the hypervisor sees it) to a target level: in Linux, to Committed_AS modified by a formula similar to the one Novell derived for a minimum ballooning safety level. The target level changes constantly, but the selfballooning code samples and adjusts only periodically. If, during the time interval between samples, memory demand spikes, Linux has a memory shortage and responds as it must, namely by swapping. The frontswap code in Linux "intercepts" this swapping so that, in most cases, it goes to a Xen tmem persistent pool instead of to a (virtual or physical) swap disk. Data in persistent pools, unlike ephemeral pools, are guaranteed to be maintained by the hypervisor until the guest invalidates it or until the guest dies. As a result, pages allocated for persistent pools increase the count of pages "owned" by the domain that requested the pages, until the guest explicitly invalidates them (or dies). The accounting also ensures that malicious domains can't absorb memory beyond the toolset-specified limit ("maxmem"). Note that, if compression is enabled, a domain _may_ "logically" exceed maxmem, as long as it does not physically exceed it. (And, again, all of this too has been in Xen since 4.0 in 2009, and selfballooning has been in Linux since mid-2011, but frontswap finally was accepted into Linux earlier in 2012.) Ok, George, does that answer your questions, _technically_? I'll be happy to answer any others. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:00:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:00:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRuJ-0007Qm-MV; Mon, 05 Nov 2012 19:00:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRuH-0007Qh-Qe for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:00:22 +0000 Received: from [85.158.139.83:51231] by server-3.bemta-5.messagelabs.com id BA/6E-18736-4CC08905; Mon, 05 Nov 2012 19:00:20 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352142017!28862985!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9781 invoked from network); 5 Nov 2012 19:00:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:00:19 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5J0Fun008606 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 19:00:16 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5J0CV2011637 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 19:00:13 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5J0BCg032187; Mon, 5 Nov 2012 13:00:12 -0600 MIME-Version: 1.0 Message-ID: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Date: Mon, 5 Nov 2012 11:00:04 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> <20121102093055.GA77212@ocelot.phlegethon.org> In-Reply-To: <20121102093055.GA77212@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Sent: Friday, November 02, 2012 3:31 AM > To: Dan Magenheimer > Cc: Keir (Xen.org); Jan Beulich; xen-devel@lists.xen.org > Subject: Re: [Xen-devel] 32bit xen and "claim" > > At 13:57 -0700 on 01 Nov (1351778261), Dan Magenheimer wrote: > > > From: Tim Deegan [mailto:tim@xen.org] > > > Subject: Re: [Xen-devel] 32bit xen and "claim" > > > > > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > > > when prototyping the "claim" hypercall/subop, can I assume > > > > that the CONFIG_X86 code in the hypervisor and, specifically > > > > any separation of the concepts of xen_heap from dom_heap, > > > > can be ignored? > > > > > > > > Or will the ARM version of the hypervisor be requiring > > > > a similar separation of xen_heap vs dom_heap? > > > > > > Yes, 32-bit ARM has this separation. > > > > Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 > > to mean CONFIG-32-bitness then? > > No. CONFIG_X86 doesn't mean 32-bit, even on x86; it means i386/amd64 as > distinct from MIPS/ARM/PPC. Oops, sorry, I was confusing the old code in page_alloc.c that said: #if !defined(__x86_64__) && !defined(__ia64__) when I was reading the new code that says: #if !defined(CONFIG_X86) (why not #ifndef?) Sorry for the ARM-y noise. :-( But as long as I've bothered you already... does the ARM port already (or will it soon) support 64-bit versions of ARM? Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:00:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:00:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRuJ-0007Qm-MV; Mon, 05 Nov 2012 19:00:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVRuH-0007Qh-Qe for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:00:22 +0000 Received: from [85.158.139.83:51231] by server-3.bemta-5.messagelabs.com id BA/6E-18736-4CC08905; Mon, 05 Nov 2012 19:00:20 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352142017!28862985!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9781 invoked from network); 5 Nov 2012 19:00:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:00:19 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5J0Fun008606 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 19:00:16 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5J0CV2011637 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 19:00:13 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5J0BCg032187; Mon, 5 Nov 2012 13:00:12 -0600 MIME-Version: 1.0 Message-ID: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Date: Mon, 5 Nov 2012 11:00:04 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> <20121102093055.GA77212@ocelot.phlegethon.org> In-Reply-To: <20121102093055.GA77212@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Sent: Friday, November 02, 2012 3:31 AM > To: Dan Magenheimer > Cc: Keir (Xen.org); Jan Beulich; xen-devel@lists.xen.org > Subject: Re: [Xen-devel] 32bit xen and "claim" > > At 13:57 -0700 on 01 Nov (1351778261), Dan Magenheimer wrote: > > > From: Tim Deegan [mailto:tim@xen.org] > > > Subject: Re: [Xen-devel] 32bit xen and "claim" > > > > > > At 13:34 -0700 on 01 Nov (1351776880), Dan Magenheimer wrote: > > > > With the plan to obsolete the x86 32-bit hypervisor at 4.3, > > > > when prototyping the "claim" hypercall/subop, can I assume > > > > that the CONFIG_X86 code in the hypervisor and, specifically > > > > any separation of the concepts of xen_heap from dom_heap, > > > > can be ignored? > > > > > > > > Or will the ARM version of the hypervisor be requiring > > > > a similar separation of xen_heap vs dom_heap? > > > > > > Yes, 32-bit ARM has this separation. > > > > Hmmm... looking at page_alloc.c... does ARM overload CONFIG_X86 > > to mean CONFIG-32-bitness then? > > No. CONFIG_X86 doesn't mean 32-bit, even on x86; it means i386/amd64 as > distinct from MIPS/ARM/PPC. Oops, sorry, I was confusing the old code in page_alloc.c that said: #if !defined(__x86_64__) && !defined(__ia64__) when I was reading the new code that says: #if !defined(CONFIG_X86) (why not #ifndef?) Sorry for the ARM-y noise. :-( But as long as I've bothered you already... does the ARM port already (or will it soon) support 64-bit versions of ARM? Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:07:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVS05-0007aH-G1; Mon, 05 Nov 2012 19:06:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVS04-0007aA-5V for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:06:20 +0000 Received: from [85.158.139.83:12796] by server-12.bemta-5.messagelabs.com id 42/12-02886-B2E08905; Mon, 05 Nov 2012 19:06:19 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1352142378!21643116!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29697 invoked from network); 5 Nov 2012 19:06:18 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:06:18 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVS01-0006We-DR; Mon, 05 Nov 2012 19:06:17 +0000 Date: Mon, 5 Nov 2012 19:06:17 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121105190617.GA21990@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> <20121102093055.GA77212@ocelot.phlegethon.org> <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:00 -0800 on 05 Nov (1352113204), Dan Magenheimer wrote: > But as long as I've bothered you already... does the ARM port > already (or will it soon) support 64-bit versions of ARM? Real Soon Now, we hope. We've been a bit distracted by having actual hardware to test the 32-bit version on, but 64-bit support is definitely planned. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:07:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVS05-0007aH-G1; Mon, 05 Nov 2012 19:06:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVS04-0007aA-5V for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:06:20 +0000 Received: from [85.158.139.83:12796] by server-12.bemta-5.messagelabs.com id 42/12-02886-B2E08905; Mon, 05 Nov 2012 19:06:19 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-11.tower-182.messagelabs.com!1352142378!21643116!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29697 invoked from network); 5 Nov 2012 19:06:18 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:06:18 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVS01-0006We-DR; Mon, 05 Nov 2012 19:06:17 +0000 Date: Mon, 5 Nov 2012 19:06:17 +0000 From: Tim Deegan To: Dan Magenheimer Message-ID: <20121105190617.GA21990@ocelot.phlegethon.org> References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <20121101204622.GA66969@ocelot.phlegethon.org> <20121102093055.GA77212@ocelot.phlegethon.org> <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:00 -0800 on 05 Nov (1352113204), Dan Magenheimer wrote: > But as long as I've bothered you already... does the ARM port > already (or will it soon) support 64-bit versions of ARM? Real Soon Now, we hope. We've been a bit distracted by having actual hardware to test the 32-bit version on, but 64-bit support is definitely planned. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:17:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:17:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSAI-0007lO-Jr; Mon, 05 Nov 2012 19:16:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSAH-0007lJ-OT for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:16:53 +0000 Received: from [85.158.143.99:15276] by server-2.bemta-4.messagelabs.com id 83/E8-28922-5A018905; Mon, 05 Nov 2012 19:16:53 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352143011!21695885!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18899 invoked from network); 5 Nov 2012 19:16:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:16:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5JGl59026921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 19:16:48 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5JGkK6020617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 19:16:47 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5JGjPp012389; Mon, 5 Nov 2012 13:16:45 -0600 MIME-Version: 1.0 Message-ID: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Date: Mon, 5 Nov 2012 11:16:38 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> In-Reply-To: <5093954902000078000A5F45@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: 32bit xen and "claim" > > >>> On 01.11.12 at 21:55, Dan Magenheimer wrote: > >> >when prototyping the "claim" hypercall/subop, can I assume > >> >that the CONFIG_X86 code in the hypervisor and, specifically > >> >any separation of the concepts of xen_heap from dom_heap, > >> >can be ignored? > >> > >> No, you shouldn't. Once adding support for memory amounts beyond 5Tb > >> I expect the separation to become meaningful even for x86-64. > > > > On quick scan, I don't see anything obvious in the archives > > that explains why 5Tb is the limit (rather than, say, 4Tb > > or 8Tb, or some other power of two). Could you provide a > > pointer to this info or, if you agree it is non-obvious and > > undocumented, say a few words of explanation? > > xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment > preceding all those #define-s). Sorry if this is a silly question, but the hex value 0xffff880000000000 looks like a Linux kernel base address so it made me wonder: Do I understand correctly that the 5TB limit only applies because of legacy PV guests? > > Also, just wondering, should exceeding 5Tb be on the 4.3 > > features list or is >5Tb physical memory still too far away? > > It _is_ on the feature list. So far I just had way too many other > issues to deal with, preventing me to get started with that work. Sorry, I should have looked that up first. :-} Does it make sense to have a runtime option that unsets the physical limit but disallows legacy PV guests? If this defaults to false for machines with RAM<=5TB but to true for machines with RAM>5TB, then the feature is "done" (AND we have put a stake in the ground to begin the slow obsolescence of PV functionality). Just an idea... Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:17:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:17:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSAI-0007lO-Jr; Mon, 05 Nov 2012 19:16:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSAH-0007lJ-OT for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:16:53 +0000 Received: from [85.158.143.99:15276] by server-2.bemta-4.messagelabs.com id 83/E8-28922-5A018905; Mon, 05 Nov 2012 19:16:53 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-216.messagelabs.com!1352143011!21695885!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18899 invoked from network); 5 Nov 2012 19:16:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 19:16:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5JGl59026921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 19:16:48 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5JGkK6020617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 19:16:47 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5JGjPp012389; Mon, 5 Nov 2012 13:16:45 -0600 MIME-Version: 1.0 Message-ID: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Date: Mon, 5 Nov 2012 11:16:38 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> In-Reply-To: <5093954902000078000A5F45@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: 32bit xen and "claim" > > >>> On 01.11.12 at 21:55, Dan Magenheimer wrote: > >> >when prototyping the "claim" hypercall/subop, can I assume > >> >that the CONFIG_X86 code in the hypervisor and, specifically > >> >any separation of the concepts of xen_heap from dom_heap, > >> >can be ignored? > >> > >> No, you shouldn't. Once adding support for memory amounts beyond 5Tb > >> I expect the separation to become meaningful even for x86-64. > > > > On quick scan, I don't see anything obvious in the archives > > that explains why 5Tb is the limit (rather than, say, 4Tb > > or 8Tb, or some other power of two). Could you provide a > > pointer to this info or, if you agree it is non-obvious and > > undocumented, say a few words of explanation? > > xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment > preceding all those #define-s). Sorry if this is a silly question, but the hex value 0xffff880000000000 looks like a Linux kernel base address so it made me wonder: Do I understand correctly that the 5TB limit only applies because of legacy PV guests? > > Also, just wondering, should exceeding 5Tb be on the 4.3 > > features list or is >5Tb physical memory still too far away? > > It _is_ on the feature list. So far I just had way too many other > issues to deal with, preventing me to get started with that work. Sorry, I should have looked that up first. :-} Does it make sense to have a runtime option that unsets the physical limit but disallows legacy PV guests? If this defaults to false for machines with RAM<=5TB but to true for machines with RAM>5TB, then the feature is "done" (AND we have put a stake in the ground to begin the slow obsolescence of PV functionality). Just an idea... Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:50:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:50:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSgo-0000Gb-Ru; Mon, 05 Nov 2012 19:50:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSgn-0000GW-6w for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:50:29 +0000 Received: from [85.158.139.211:44400] by server-13.bemta-5.messagelabs.com id 95/95-27809-48818905; Mon, 05 Nov 2012 19:50:28 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352145027!18928397!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3029 invoked from network); 5 Nov 2012 19:50:27 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 19:50:27 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3447895wey.32 for ; Mon, 05 Nov 2012 11:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=EuPrvUd2LkIzTa5qnyp6SwdvYzQwUx5Lb0c5ZPe1j3A=; b=PVVc60x2/MWdyaTp4OJJiqci6bqUb27zDfjrR6R086Xz7HwEpZCNnE3t5IJO/JEcua ynbTdAjW6QbA0pOwjEoPMlAzaVKSfKlVN79I2v+O0fEXkzQtbx4WKft014JzLV16pdi1 R8teZm25Ta7GHmI/73uDoz+fd7EucBIVQ5BgD4cCjyp9Ja+pNLhGG60sCe1zkOFr0XXl mlSVAnm0jIEYTH62MD+Q180Wi+fSeSmMlivffCr6fMrqF7g+eJ87pHzt/KOeVbc700f0 jO0u2OJ1j7fdCAjVTc/XJwvFasOVVAx9o57chT0GV+VymU6aRkD0ksE2CsoIv5+VJeFn rDqA== Received: by 10.216.194.26 with SMTP id l26mr3402413wen.17.1352145027744; Mon, 05 Nov 2012 11:50:27 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id k20sm11710808wiv.11.2012.11.05.11.50.23 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 11:50:27 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 19:50:14 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: 32bit xen and "claim" Thread-Index: Ac27jsWvyWW6G6LDq0GIksemjYIftg== In-Reply-To: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 19:16, "Dan Magenheimer" wrote: >> xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment >> preceding all those #define-s). > > Sorry if this is a silly question, but the hex value > 0xffff880000000000 looks like a Linux kernel base address > so it made me wonder: > > Do I understand correctly that the 5TB limit only applies > because of legacy PV guests? Yes. For HVM guests we can direct-map all physical memory, all the time. We will only ever need ephemeral mappings on x86/64 when running PV guests. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:50:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:50:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSgo-0000Gb-Ru; Mon, 05 Nov 2012 19:50:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSgn-0000GW-6w for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:50:29 +0000 Received: from [85.158.139.211:44400] by server-13.bemta-5.messagelabs.com id 95/95-27809-48818905; Mon, 05 Nov 2012 19:50:28 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352145027!18928397!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3029 invoked from network); 5 Nov 2012 19:50:27 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 19:50:27 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3447895wey.32 for ; Mon, 05 Nov 2012 11:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=EuPrvUd2LkIzTa5qnyp6SwdvYzQwUx5Lb0c5ZPe1j3A=; b=PVVc60x2/MWdyaTp4OJJiqci6bqUb27zDfjrR6R086Xz7HwEpZCNnE3t5IJO/JEcua ynbTdAjW6QbA0pOwjEoPMlAzaVKSfKlVN79I2v+O0fEXkzQtbx4WKft014JzLV16pdi1 R8teZm25Ta7GHmI/73uDoz+fd7EucBIVQ5BgD4cCjyp9Ja+pNLhGG60sCe1zkOFr0XXl mlSVAnm0jIEYTH62MD+Q180Wi+fSeSmMlivffCr6fMrqF7g+eJ87pHzt/KOeVbc700f0 jO0u2OJ1j7fdCAjVTc/XJwvFasOVVAx9o57chT0GV+VymU6aRkD0ksE2CsoIv5+VJeFn rDqA== Received: by 10.216.194.26 with SMTP id l26mr3402413wen.17.1352145027744; Mon, 05 Nov 2012 11:50:27 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id k20sm11710808wiv.11.2012.11.05.11.50.23 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 11:50:27 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 19:50:14 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: 32bit xen and "claim" Thread-Index: Ac27jsWvyWW6G6LDq0GIksemjYIftg== In-Reply-To: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 19:16, "Dan Magenheimer" wrote: >> xen/include/asm-x86/config.h:DIRECTMAP_* (and the comment >> preceding all those #define-s). > > Sorry if this is a silly question, but the hex value > 0xffff880000000000 looks like a Linux kernel base address > so it made me wonder: > > Do I understand correctly that the 5TB limit only applies > because of legacy PV guests? Yes. For HVM guests we can direct-map all physical memory, all the time. We will only ever need ephemeral mappings on x86/64 when running PV guests. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:51:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:51:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVShq-0000NF-F4; Mon, 05 Nov 2012 19:51:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSho-0000N1-U8 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:51:33 +0000 Received: from [85.158.139.211:52571] by server-6.bemta-5.messagelabs.com id 6E/F9-19321-4C818905; Mon, 05 Nov 2012 19:51:32 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352145091!18997780!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15324 invoked from network); 5 Nov 2012 19:51:31 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 19:51:31 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so2991188wib.14 for ; Mon, 05 Nov 2012 11:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=JKqW4nafINkk8kWuOFtLAJdtTE8Jzjb1T6A9TaWnkoA=; b=t+9boMO4+E6+8uBXwFzEMuFkwkt5twF/dDnsVR2zsY9szyoLplBL0UMgsZARNxfuWS rVEa7qMy2SEhIUzAfTIHyfllRKm08oqNQBuxJ6+g8drv49W/MfrrISGfLj5KttBNB43V LbG6TV70lrwZ82fPZhvtS0akExh06KNEDquXF01nfRKngfn/JnP88XWp8llf/UJLBIB6 87gW3eOPgfQqJrOfKU1Ld8JPwRUwEQxSr3FYlH8smp1JPVzlXhseZEKLvT5FBeUNnQPu y0kZnykhnQCuENi3fR4Qpp7hnE7nDhujB0IiP6mtzW86DUf9bzookhfX5UdkYX3k27BO 3fTA== Received: by 10.216.217.195 with SMTP id i45mr3790999wep.14.1352145091572; Mon, 05 Nov 2012 11:51:31 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hv4sm3125532wib.0.2012.11.05.11.51.29 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 11:51:31 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 19:51:25 +0000 From: Keir Fraser To: Dan Magenheimer , Tim Deegan Message-ID: Thread-Topic: [Xen-devel] 32bit xen and "claim" Thread-Index: Ac27jvABriuTPWew902kug2rj1eumQ== In-Reply-To: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 19:00, "Dan Magenheimer" wrote: > #if !defined(CONFIG_X86) > > (why not #ifndef?) We have no coding convention to prefer one over the other. Personally I would say they are equally readable. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 19:51:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 19:51:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVShq-0000NF-F4; Mon, 05 Nov 2012 19:51:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVSho-0000N1-U8 for xen-devel@lists.xen.org; Mon, 05 Nov 2012 19:51:33 +0000 Received: from [85.158.139.211:52571] by server-6.bemta-5.messagelabs.com id 6E/F9-19321-4C818905; Mon, 05 Nov 2012 19:51:32 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352145091!18997780!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15324 invoked from network); 5 Nov 2012 19:51:31 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 19:51:31 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm4so2991188wib.14 for ; Mon, 05 Nov 2012 11:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=JKqW4nafINkk8kWuOFtLAJdtTE8Jzjb1T6A9TaWnkoA=; b=t+9boMO4+E6+8uBXwFzEMuFkwkt5twF/dDnsVR2zsY9szyoLplBL0UMgsZARNxfuWS rVEa7qMy2SEhIUzAfTIHyfllRKm08oqNQBuxJ6+g8drv49W/MfrrISGfLj5KttBNB43V LbG6TV70lrwZ82fPZhvtS0akExh06KNEDquXF01nfRKngfn/JnP88XWp8llf/UJLBIB6 87gW3eOPgfQqJrOfKU1Ld8JPwRUwEQxSr3FYlH8smp1JPVzlXhseZEKLvT5FBeUNnQPu y0kZnykhnQCuENi3fR4Qpp7hnE7nDhujB0IiP6mtzW86DUf9bzookhfX5UdkYX3k27BO 3fTA== Received: by 10.216.217.195 with SMTP id i45mr3790999wep.14.1352145091572; Mon, 05 Nov 2012 11:51:31 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hv4sm3125532wib.0.2012.11.05.11.51.29 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 11:51:31 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 05 Nov 2012 19:51:25 +0000 From: Keir Fraser To: Dan Magenheimer , Tim Deegan Message-ID: Thread-Topic: [Xen-devel] 32bit xen and "claim" Thread-Index: Ac27jvABriuTPWew902kug2rj1eumQ== In-Reply-To: <0ea96cac-0b8f-43bc-99a9-d330b4ea3d76@default> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 05/11/2012 19:00, "Dan Magenheimer" wrote: > #if !defined(CONFIG_X86) > > (why not #ifndef?) We have no coding convention to prefer one over the other. Personally I would say they are equally readable. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:27:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:27:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVV8b-0002Rh-Da; Mon, 05 Nov 2012 22:27:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVV8a-0002Rc-6U for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:27:20 +0000 Received: from [85.158.138.51:21776] by server-3.bemta-3.messagelabs.com id 3B/C3-31566-74D38905; Mon, 05 Nov 2012 22:27:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352154437!28789397!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31819 invoked from network); 5 Nov 2012 22:27:18 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 22:27:18 -0000 X-IronPort-AV: E=Sophos;i="4.80,718,1344211200"; d="scan'208";a="213469626" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 22:26:55 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 17:26:54 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVV88-0002T7-VF; Mon, 05 Nov 2012 22:26:54 +0000 Message-ID: <1352154288.7253.25.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Mon, 5 Nov 2012 23:24:48 +0100 In-Reply-To: <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: > > From: Ian Campbell [mailto:ian.campbell@citrix.com] > > Sent: Monday, November 05, 2012 3:30 AM > > To: Dan Magenheimer > > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > > There is no "free up enough memory on that host". Tmem doesn't start > > > ballooning out enough memory to start the VM... the guests are > > > responsible for doing the ballooning and it is _already done_. The > > > machine either has sufficient free+freeable memory or it does not; > > > > How does one go about deciding which host in a multi thousand host > > deployment to try the claim hypercall on? > > I don't get paid enough to solve that problem :-) > > VM placement (both for new domains and migration due to > load-balancing and power-management) is dependent on a > number of factors currently involving CPU utilization, > SAN utilization, and LAN utilization, I think using > historical trends on streams of sampled statistics. This > is very non-deterministic as all of these factors may > vary dramatically within a sampling interval. > > Adding free+freeable memory to this just adds one more > such statistic. Actually two, as it is probably best to > track free separately from freeable since a candidate > host that has enough free memory should have preference > over one with freeable memory. > > Sorry if that's not very satisfying but anything beyond that > meager description is outside of my area of expertise. I guess I don't see how your proposed claim hypercall is useful if you can't decide which machine you should call it on, whether it's 10s, 100s or 1000s of hosts. Surely you aren't suggesting that the toolstack try it on all (or even a subset) of them and see which sticks? By ignoring this part of the problem I think you are ignoring one of the most important bits of the story, without which it is very hard to make a useful and informed determination about the validity of the use cases you are describing for the new call. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:27:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:27:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVV8b-0002Rh-Da; Mon, 05 Nov 2012 22:27:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVV8a-0002Rc-6U for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:27:20 +0000 Received: from [85.158.138.51:21776] by server-3.bemta-3.messagelabs.com id 3B/C3-31566-74D38905; Mon, 05 Nov 2012 22:27:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352154437!28789397!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31819 invoked from network); 5 Nov 2012 22:27:18 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2012 22:27:18 -0000 X-IronPort-AV: E=Sophos;i="4.80,718,1344211200"; d="scan'208";a="213469626" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 05 Nov 2012 22:26:55 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Mon, 5 Nov 2012 17:26:54 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVV88-0002T7-VF; Mon, 05 Nov 2012 22:26:54 +0000 Message-ID: <1352154288.7253.25.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Mon, 5 Nov 2012 23:24:48 +0100 In-Reply-To: <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: > > From: Ian Campbell [mailto:ian.campbell@citrix.com] > > Sent: Monday, November 05, 2012 3:30 AM > > To: Dan Magenheimer > > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > > There is no "free up enough memory on that host". Tmem doesn't start > > > ballooning out enough memory to start the VM... the guests are > > > responsible for doing the ballooning and it is _already done_. The > > > machine either has sufficient free+freeable memory or it does not; > > > > How does one go about deciding which host in a multi thousand host > > deployment to try the claim hypercall on? > > I don't get paid enough to solve that problem :-) > > VM placement (both for new domains and migration due to > load-balancing and power-management) is dependent on a > number of factors currently involving CPU utilization, > SAN utilization, and LAN utilization, I think using > historical trends on streams of sampled statistics. This > is very non-deterministic as all of these factors may > vary dramatically within a sampling interval. > > Adding free+freeable memory to this just adds one more > such statistic. Actually two, as it is probably best to > track free separately from freeable since a candidate > host that has enough free memory should have preference > over one with freeable memory. > > Sorry if that's not very satisfying but anything beyond that > meager description is outside of my area of expertise. I guess I don't see how your proposed claim hypercall is useful if you can't decide which machine you should call it on, whether it's 10s, 100s or 1000s of hosts. Surely you aren't suggesting that the toolstack try it on all (or even a subset) of them and see which sticks? By ignoring this part of the problem I think you are ignoring one of the most important bits of the story, without which it is very hard to make a useful and informed determination about the validity of the use cases you are describing for the new call. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:34:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:34:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVFQ-0002cJ-8Z; Mon, 05 Nov 2012 22:34:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVFO-0002cE-Bz for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:34:22 +0000 Received: from [193.109.254.147:34209] by server-10.bemta-14.messagelabs.com id 7D/3E-31741-DEE38905; Mon, 05 Nov 2012 22:34:21 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352154858!8542919!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjM3NDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5492 invoked from network); 5 Nov 2012 22:34:20 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:34:20 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5MY5U9028082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:34:06 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5MY3NI002422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:34:04 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MY2YZ019145; Mon, 5 Nov 2012 16:34:02 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 5 Nov 2012 14:33:55 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: <20121104203532.GA11377@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Oops, missed an important part of your response... I'm glad I went back and reread it... > The claim hypercall _might_ fix (c) (if it could handle allocations that > need address-width limits or contiguous pages). I'm still looking into this part. It's my understanding (from Jan) that, post-dom0-launch, there are no known memory allocation paths that _require_ order>0 allocations. All of them attempt a larger allocation and gracefully fallback to (eventually) order==0 allocations. I've hacked some code in to the allocator to confirm this, though I'm not sure how to test the hypothesis exhaustively. For address-width limits, I suspect we are talking mostly or entirely about DMA in 32-bit PV domains? And/or PCI-passthrough? I'll look into it further, but if those are the principal cases, I'd have no problem documenting that the claim hypercall doesn't handle them and attempts to build such a domain might still fail slowly. At least unless/until someone decided to add any necessary special corner cases to the claim hypercall. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:34:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:34:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVFQ-0002cJ-8Z; Mon, 05 Nov 2012 22:34:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVFO-0002cE-Bz for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:34:22 +0000 Received: from [193.109.254.147:34209] by server-10.bemta-14.messagelabs.com id 7D/3E-31741-DEE38905; Mon, 05 Nov 2012 22:34:21 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352154858!8542919!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjM3NDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5492 invoked from network); 5 Nov 2012 22:34:20 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:34:20 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5MY5U9028082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:34:06 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5MY3NI002422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:34:04 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MY2YZ019145; Mon, 5 Nov 2012 16:34:02 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 5 Nov 2012 14:33:55 -0800 (PST) From: Dan Magenheimer To: Tim Deegan References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: <20121104203532.GA11377@ocelot.phlegethon.org> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , George Shuklin , Ian Jackson , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Tim Deegan [mailto:tim@xen.org] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Oops, missed an important part of your response... I'm glad I went back and reread it... > The claim hypercall _might_ fix (c) (if it could handle allocations that > need address-width limits or contiguous pages). I'm still looking into this part. It's my understanding (from Jan) that, post-dom0-launch, there are no known memory allocation paths that _require_ order>0 allocations. All of them attempt a larger allocation and gracefully fallback to (eventually) order==0 allocations. I've hacked some code in to the allocator to confirm this, though I'm not sure how to test the hypothesis exhaustively. For address-width limits, I suspect we are talking mostly or entirely about DMA in 32-bit PV domains? And/or PCI-passthrough? I'll look into it further, but if those are the principal cases, I'd have no problem documenting that the claim hypercall doesn't handle them and attempts to build such a domain might still fail slowly. At least unless/until someone decided to add any necessary special corner cases to the claim hypercall. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:59:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:59:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVd2-0002qG-E6; Mon, 05 Nov 2012 22:58:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVd0-0002q8-FY for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:58:46 +0000 Received: from [193.109.254.147:24630] by server-7.bemta-14.messagelabs.com id 76/C8-02272-5A448905; Mon, 05 Nov 2012 22:58:45 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352156323!9028822!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzOTA1MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12592 invoked from network); 5 Nov 2012 22:58:45 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:58:45 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5MwUA3015709 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:58:32 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5MwUE6019158 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:58:30 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MwTbs008727; Mon, 5 Nov 2012 16:58:29 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Nov 2012 14:58:28 -0800 Message-ID: <50984485.3010405@oracle.com> Date: Mon, 05 Nov 2012 17:58:13 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> In-Reply-To: <1352154288.7253.25.camel@hastur.hellion.org.uk> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Dan Magenheimer , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , Olaf Hering , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/05/2012 05:24 PM, Ian Campbell wrote: > On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: >>> On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: >>>> There is no "free up enough memory on that host". Tmem doesn't start >>>> ballooning out enough memory to start the VM... the guests are >>>> responsible for doing the ballooning and it is _already done_. The >>>> machine either has sufficient free+freeable memory or it does not; >>> How does one go about deciding which host in a multi thousand host >>> deployment to try the claim hypercall on? > I guess I don't see how your proposed claim hypercall is useful if you > can't decide which machine you should call it on, whether it's 10s, 100s > or 1000s of hosts. Surely you aren't suggesting that the toolstack try > it on all (or even a subset) of them and see which sticks? > > By ignoring this part of the problem I think you are ignoring one of the > most important bits of the story, without which it is very hard to make > a useful and informed determination about the validity of the use cases > you are describing for the new call. Planned implement: 1. Every Server (dom0) sends memory statistics to Manager every 20 seconds (tunable). 2. At one time, Manager selects a Server to run VM based on the snapshot of Server memory. Selected server should have: enough free memory for the VM or have free + freeable memory > VM memory. Two ways to handle failures: 1. Try start_vm on the first selected Server. If failed, try the second one. 2. Try reserve memory on the first Server. If failed, try the second one. If success, start_vm on the Server. >From high level, Dan's proposal could help with 2). If memory allocation is fast enough (VM start failed/success very fast), then 1) is preferred. Thanks, Zhigang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:59:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:59:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVd2-0002qG-E6; Mon, 05 Nov 2012 22:58:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVd0-0002q8-FY for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:58:46 +0000 Received: from [193.109.254.147:24630] by server-7.bemta-14.messagelabs.com id 76/C8-02272-5A448905; Mon, 05 Nov 2012 22:58:45 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352156323!9028822!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzOTA1MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12592 invoked from network); 5 Nov 2012 22:58:45 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:58:45 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5MwUA3015709 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:58:32 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5MwUE6019158 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:58:30 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MwTbs008727; Mon, 5 Nov 2012 16:58:29 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Nov 2012 14:58:28 -0800 Message-ID: <50984485.3010405@oracle.com> Date: Mon, 05 Nov 2012 17:58:13 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> In-Reply-To: <1352154288.7253.25.camel@hastur.hellion.org.uk> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Dan Magenheimer , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , Olaf Hering , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/05/2012 05:24 PM, Ian Campbell wrote: > On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: >>> On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: >>>> There is no "free up enough memory on that host". Tmem doesn't start >>>> ballooning out enough memory to start the VM... the guests are >>>> responsible for doing the ballooning and it is _already done_. The >>>> machine either has sufficient free+freeable memory or it does not; >>> How does one go about deciding which host in a multi thousand host >>> deployment to try the claim hypercall on? > I guess I don't see how your proposed claim hypercall is useful if you > can't decide which machine you should call it on, whether it's 10s, 100s > or 1000s of hosts. Surely you aren't suggesting that the toolstack try > it on all (or even a subset) of them and see which sticks? > > By ignoring this part of the problem I think you are ignoring one of the > most important bits of the story, without which it is very hard to make > a useful and informed determination about the validity of the use cases > you are describing for the new call. Planned implement: 1. Every Server (dom0) sends memory statistics to Manager every 20 seconds (tunable). 2. At one time, Manager selects a Server to run VM based on the snapshot of Server memory. Selected server should have: enough free memory for the VM or have free + freeable memory > VM memory. Two ways to handle failures: 1. Try start_vm on the first selected Server. If failed, try the second one. 2. Try reserve memory on the first Server. If failed, try the second one. If success, start_vm on the Server. >From high level, Dan's proposal could help with 2). If memory allocation is fast enough (VM start failed/success very fast), then 1) is preferred. Thanks, Zhigang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:59:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVdV-0002rt-RO; Mon, 05 Nov 2012 22:59:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVdU-0002rd-DK for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:59:16 +0000 Received: from [85.158.138.51:34150] by server-5.bemta-3.messagelabs.com id 46/5E-26311-3C448905; Mon, 05 Nov 2012 22:59:15 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352156352!28767231!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14330 invoked from network); 5 Nov 2012 22:59:13 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:59:13 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5Mx3FK016282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:59:03 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5Mwx8M001703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:59:00 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MwxlM003505; Mon, 5 Nov 2012 16:58:59 -0600 MIME-Version: 1.0 Message-ID: <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> Date: Mon, 5 Nov 2012 14:58:52 -0800 (PST) From: Dan Magenheimer To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> In-Reply-To: <1352154288.7253.25.camel@hastur.hellion.org.uk> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , xen-devel@lists.xen.org, George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Campbell [mailto:ian.campbell@citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Hi Ian -- > On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: > > > From: Ian Campbell [mailto:ian.campbell@citrix.com] > > > Sent: Monday, November 05, 2012 3:30 AM > > > To: Dan Magenheimer > > > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > > > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang > Wang > > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > > > There is no "free up enough memory on that host". Tmem doesn't start > > > > ballooning out enough memory to start the VM... the guests are > > > > responsible for doing the ballooning and it is _already done_. The > > > > machine either has sufficient free+freeable memory or it does not; > > > > > > How does one go about deciding which host in a multi thousand host > > > deployment to try the claim hypercall on? > > > > I don't get paid enough to solve that problem :-) > > > > VM placement (both for new domains and migration due to > > load-balancing and power-management) is dependent on a > > number of factors currently involving CPU utilization, > > SAN utilization, and LAN utilization, I think using > > historical trends on streams of sampled statistics. This > > is very non-deterministic as all of these factors may > > vary dramatically within a sampling interval. > > > > Adding free+freeable memory to this just adds one more > > such statistic. Actually two, as it is probably best to > > track free separately from freeable since a candidate > > host that has enough free memory should have preference > > over one with freeable memory. > > > > Sorry if that's not very satisfying but anything beyond that > > meager description is outside of my area of expertise. > > I guess I don't see how your proposed claim hypercall is useful if you > can't decide which machine you should call it on, whether it's 10s, 100s > or 1000s of hosts. Surely you aren't suggesting that the toolstack try > it on all (or even a subset) of them and see which sticks? > > By ignoring this part of the problem I think you are ignoring one of the > most important bits of the story, without which it is very hard to make > a useful and informed determination about the validity of the use cases > you are describing for the new call. I'm not ignoring it at all. One only needs to choose a machine and be prepared that the machine will (immediately) answer "sorry, won't fit". It's not necessary to choose the _optimal_ fit, only a probable one. Since failure is immediate, trying more than one machine (which should happen only rarely) is not particularly problematic, though I completely agree that trying _all_ of them might be. The existing OracleVM Manager already chooses domain launch candidates and load balancing candidates based on sampled CPU/SAN/LAN data, which is always stale but still sufficient as a rough estimate of the best machine to choose. Beyond that, I'm not particularly knowledgeable about the details and, even if I were, I'm not sure if the details are suitable for a public forum. But I can tell you that it has been shipping for over a year and here's some of what's published... look for DRS and DPM. http://www.oracle.com/us/technologies/virtualization/ovm3-whats-new-459313.pdf Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 22:59:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 22:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVdV-0002rt-RO; Mon, 05 Nov 2012 22:59:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVVdU-0002rd-DK for xen-devel@lists.xen.org; Mon, 05 Nov 2012 22:59:16 +0000 Received: from [85.158.138.51:34150] by server-5.bemta-3.messagelabs.com id 46/5E-26311-3C448905; Mon, 05 Nov 2012 22:59:15 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352156352!28767231!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAzNzAyOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14330 invoked from network); 5 Nov 2012 22:59:13 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-8.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 22:59:13 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA5Mx3FK016282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Nov 2012 22:59:03 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA5Mwx8M001703 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Nov 2012 22:59:00 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA5MwxlM003505; Mon, 5 Nov 2012 16:58:59 -0600 MIME-Version: 1.0 Message-ID: <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> Date: Mon, 5 Nov 2012 14:58:52 -0800 (PST) From: Dan Magenheimer To: Ian Campbell References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> In-Reply-To: <1352154288.7253.25.camel@hastur.hellion.org.uk> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , xen-devel@lists.xen.org, George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Campbell [mailto:ian.campbell@citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature Hi Ian -- > On Mon, 2012-11-05 at 14:54 +0000, Dan Magenheimer wrote: > > > From: Ian Campbell [mailto:ian.campbell@citrix.com] > > > Sent: Monday, November 05, 2012 3:30 AM > > > To: Dan Magenheimer > > > Cc: Tim (Xen.org); Keir (Xen.org); Jan Beulich; Olaf Hering; George Dunlap; Ian Jackson; George > > > Shuklin; DarioFaggioli; xen-devel@lists.xen.org; Konrad Wilk; Kurt Hackel; Mukesh Rathor; Zhigang > Wang > > > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > > > > > On Mon, 2012-11-05 at 00:23 +0000, Dan Magenheimer wrote: > > > > There is no "free up enough memory on that host". Tmem doesn't start > > > > ballooning out enough memory to start the VM... the guests are > > > > responsible for doing the ballooning and it is _already done_. The > > > > machine either has sufficient free+freeable memory or it does not; > > > > > > How does one go about deciding which host in a multi thousand host > > > deployment to try the claim hypercall on? > > > > I don't get paid enough to solve that problem :-) > > > > VM placement (both for new domains and migration due to > > load-balancing and power-management) is dependent on a > > number of factors currently involving CPU utilization, > > SAN utilization, and LAN utilization, I think using > > historical trends on streams of sampled statistics. This > > is very non-deterministic as all of these factors may > > vary dramatically within a sampling interval. > > > > Adding free+freeable memory to this just adds one more > > such statistic. Actually two, as it is probably best to > > track free separately from freeable since a candidate > > host that has enough free memory should have preference > > over one with freeable memory. > > > > Sorry if that's not very satisfying but anything beyond that > > meager description is outside of my area of expertise. > > I guess I don't see how your proposed claim hypercall is useful if you > can't decide which machine you should call it on, whether it's 10s, 100s > or 1000s of hosts. Surely you aren't suggesting that the toolstack try > it on all (or even a subset) of them and see which sticks? > > By ignoring this part of the problem I think you are ignoring one of the > most important bits of the story, without which it is very hard to make > a useful and informed determination about the validity of the use cases > you are describing for the new call. I'm not ignoring it at all. One only needs to choose a machine and be prepared that the machine will (immediately) answer "sorry, won't fit". It's not necessary to choose the _optimal_ fit, only a probable one. Since failure is immediate, trying more than one machine (which should happen only rarely) is not particularly problematic, though I completely agree that trying _all_ of them might be. The existing OracleVM Manager already chooses domain launch candidates and load balancing candidates based on sampled CPU/SAN/LAN data, which is always stale but still sufficient as a rough estimate of the best machine to choose. Beyond that, I'm not particularly knowledgeable about the details and, even if I were, I'm not sure if the details are suitable for a public forum. But I can tell you that it has been shipping for over a year and here's some of what's published... look for DRS and DPM. http://www.oracle.com/us/technologies/virtualization/ovm3-whats-new-459313.pdf Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 23:35:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 23:35:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVWC1-0003YB-Ex; Mon, 05 Nov 2012 23:34:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVWC0-0003Y6-PX for xen-devel@lists.xen.org; Mon, 05 Nov 2012 23:34:57 +0000 Received: from [85.158.137.99:47770] by server-3.bemta-3.messagelabs.com id 17/13-31566-F1D48905; Mon, 05 Nov 2012 23:34:55 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-13.tower-217.messagelabs.com!1352158495!17880769!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24974 invoked from network); 5 Nov 2012 23:34:55 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-13.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 23:34:55 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4A30F8406D; Tue, 6 Nov 2012 00:34:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S5cSROW1xvTR; Tue, 6 Nov 2012 00:34:54 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id F376C84067; Tue, 6 Nov 2012 00:34:53 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVWBw-0004sN-Kx; Tue, 06 Nov 2012 00:34:52 +0100 Date: Tue, 6 Nov 2012 00:34:52 +0100 From: Samuel Thibault To: "Fioravante, Matthew E." Message-ID: <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , "Fioravante, Matthew E." , "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Fioravante, Matthew E., le Fri 02 Nov 2012 09:19:34 -0400, a =E9crit : > It happens in my vtpm domains because the drivers often create and releas= e grant references. This patch isn't completely necessary. Do we want to ha= ve these debug prints in the default build? Well, surely -DGNT_DEBUG doesn't produce any output :) We could however drop it, since it only adds overhead to check something that is supposed to be already working (and which is quite well tested nowadays). About -DGNTMAP_DEBUG, which message are you getting printed a lot? Are you running out of references in gntmap_find_free_entry, or using gntmap_map_grant_refs a lot? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 05 23:35:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 05 Nov 2012 23:35:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVWC1-0003YB-Ex; Mon, 05 Nov 2012 23:34:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVWC0-0003Y6-PX for xen-devel@lists.xen.org; Mon, 05 Nov 2012 23:34:57 +0000 Received: from [85.158.137.99:47770] by server-3.bemta-3.messagelabs.com id 17/13-31566-F1D48905; Mon, 05 Nov 2012 23:34:55 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-13.tower-217.messagelabs.com!1352158495!17880769!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24974 invoked from network); 5 Nov 2012 23:34:55 -0000 Received: from toccata.ens-lyon.fr (HELO toccata.ens-lyon.org) (140.77.166.68) by server-13.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 5 Nov 2012 23:34:55 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4A30F8406D; Tue, 6 Nov 2012 00:34:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S5cSROW1xvTR; Tue, 6 Nov 2012 00:34:54 +0100 (CET) Received: from type.ipv6 (youpi.is-a-geek.org [80.67.176.89]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id F376C84067; Tue, 6 Nov 2012 00:34:53 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVWBw-0004sN-Kx; Tue, 06 Nov 2012 00:34:52 +0100 Date: Tue, 6 Nov 2012 00:34:52 +0100 From: Samuel Thibault To: "Fioravante, Matthew E." Message-ID: <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> Mail-Followup-To: Samuel Thibault , "Fioravante, Matthew E." , "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Fioravante, Matthew E., le Fri 02 Nov 2012 09:19:34 -0400, a =E9crit : > It happens in my vtpm domains because the drivers often create and releas= e grant references. This patch isn't completely necessary. Do we want to ha= ve these debug prints in the default build? Well, surely -DGNT_DEBUG doesn't produce any output :) We could however drop it, since it only adds overhead to check something that is supposed to be already working (and which is quite well tested nowadays). About -DGNTMAP_DEBUG, which message are you getting printed a lot? Are you running out of references in gntmap_find_free_entry, or using gntmap_map_grant_refs a lot? Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 05:49:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 05:49:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVc21-0001ny-IY; Tue, 06 Nov 2012 05:49:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVc1z-0001nt-6e for xen-devel@lists.xen.org; Tue, 06 Nov 2012 05:48:59 +0000 Received: from [193.109.254.147:50905] by server-14.bemta-14.messagelabs.com id 1B/1E-14517-AC4A8905; Tue, 06 Nov 2012 05:48:58 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352180936!9056369!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzM3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15442 invoked from network); 6 Nov 2012 05:48:57 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-12.tower-27.messagelabs.com with SMTP; 6 Nov 2012 05:48:57 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 05 Nov 2012 21:48:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,721,1344236400"; d="scan'208";a="215661461" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 05 Nov 2012 21:48:55 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 5 Nov 2012 21:48:54 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 6 Nov 2012 13:48:53 +0800 From: "Liu, Jinsong" To: Stefano Stabellini , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNu2iOTi91BiFLfUibRvXA4zlK85fcS22w Date: Tue, 6 Nov 2012 05:48:52 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Stefano Stabellini wrote: >>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>> index 0e86370..a2af622 100644 >>> --- a/drivers/xen/Makefile >>> +++ b/drivers/xen/Makefile >>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>> xen-evtchn-y := evtchn.o >>> xen-gntdev-y := gntdev.o >>> xen-gntalloc-y := gntalloc.o > > it should really depend on ACPI and maybe also X86, otherwise it is > going to break the ARM build > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which depends on X86_64). Thanks, Jinsong >>> diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c >>> new file mode 100644 >>> index 0000000..e8c26a4 >>> --- /dev/null >>> +++ b/drivers/xen/xen_acpi_pad.c >>> @@ -0,0 +1,206 @@ >>> +/* >>> + * xen_acpi_pad.c - Xen pad interface >>> + * >>> + * Copyright (c) 2012, Intel Corporation. >>> + * Author: Liu, Jinsong + * >>> + * This program is free software; you can redistribute it and/or >>> modify it + * under the terms and conditions of the GNU General >>> Public License, + * version 2, as published by the Free Software >>> Foundation. + * + * This program is distributed in the hope it will >>> be useful, but WITHOUT + * ANY WARRANTY; without even the implied >>> warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR >>> PURPOSE. See the GNU General Public License for + * more details. >>> + */ + >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> + >>> +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" >>> +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor >>> Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 >>> + >>> +static DEFINE_MUTEX(xen_pad_lock); >>> + >>> +static int xen_pad_set_idle_cpus(int num_cpus) >>> +{ >>> + struct xen_platform_op op; >>> + >>> + if (num_cpus < 0) >>> + return -EINVAL; >>> + >>> + /* set cpu nums expected to be idled */ >>> + op.cmd = XENPF_core_parking; >>> + op.u.core_parking.type = XEN_CORE_PARKING_SET; >>> + op.u.core_parking.idle_nums = num_cpus; >>> + >>> + return HYPERVISOR_dom0_op(&op); >>> +} >>> + >>> +/* >>> + * Cannot get idle cpus by using hypercall once (shared with _SET) >>> + * because of the characteristic of Xen continue_hypercall_on_cpu >>> + */ +static int xen_pad_get_idle_cpus(void) >>> +{ >>> + int ret; >>> + struct xen_platform_op op; >>> + >>> + /* get cpu nums actually be idled */ >>> + op.cmd = XENPF_core_parking; >>> + op.u.core_parking.type = XEN_CORE_PARKING_GET; >>> + ret = HYPERVISOR_dom0_op(&op); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return op.u.core_parking.idle_nums; >>> +} >>> + >>> +/* >>> + * Query firmware how many CPUs should be idle >>> + * return -1 on failure >>> + */ >>> +static int xen_acpi_pad_pur(acpi_handle handle) >>> +{ >>> + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; >>> + union acpi_object *package; >>> + int num = -1; >>> + >>> + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, >>> &buffer))) + return num; + >>> + if (!buffer.length || !buffer.pointer) >>> + return num; >>> + >>> + package = buffer.pointer; >>> + >>> + if (package->type == ACPI_TYPE_PACKAGE && >>> + package->package.count == 2 && >>> + package->package.elements[0].integer.value == 1) /* >>> rev 1 */ + + num = >>> package->package.elements[1].integer.value; + + >>> kfree(buffer.pointer); + return num; >>> +} >>> + >>> +/* Notify firmware how many CPUs are idle */ >>> +static void xen_acpi_pad_ost(acpi_handle handle, int stat, + >>> uint32_t idle_cpus) +{ >>> + union acpi_object params[3] = { >>> + {.type = ACPI_TYPE_INTEGER,}, >>> + {.type = ACPI_TYPE_INTEGER,}, >>> + {.type = ACPI_TYPE_BUFFER,}, >>> + }; >>> + struct acpi_object_list arg_list = {3, params}; + >>> + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; >>> + params[1].integer.value = stat; >>> + params[2].buffer.length = 4; >>> + params[2].buffer.pointer = (void *)&idle_cpus; >>> + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} >>> + >>> +static void xen_acpi_pad_handle_notify(acpi_handle handle) +{ >>> + int num_cpus; >>> + >>> + num_cpus = xen_acpi_pad_pur(handle); >>> + if (num_cpus < 0) >>> + return; >>> + >>> + mutex_lock(&xen_pad_lock); >>> + if (xen_pad_set_idle_cpus(num_cpus)) { >>> + mutex_unlock(&xen_pad_lock); >>> + return; >>> + } >>> + >>> + num_cpus = xen_pad_get_idle_cpus(); >>> + if (num_cpus < 0) { >>> + mutex_unlock(&xen_pad_lock); >>> + return; >>> + } >>> + mutex_unlock(&xen_pad_lock); >>> + >>> + xen_acpi_pad_ost(handle, 0, num_cpus); >>> +} >>> + >>> +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, + >>> void *data) +{ >>> + switch (event) { >>> + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: >>> + xen_acpi_pad_handle_notify(handle); >>> + break; >>> + default: >>> + pr_warn("Unsupported event [0x%x]\n", event); + >>> break; + } >>> +} >>> + >>> +static int xen_acpi_pad_add(struct acpi_device *device) +{ >>> + acpi_status status; >>> + >>> + strcpy(acpi_device_name(device), >>> ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + >>> strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); >>> + + status = acpi_install_notify_handler(device->handle, + >>> ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); + if >>> (ACPI_FAILURE(status)) + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +static int xen_acpi_pad_remove(struct acpi_device *device, + >>> int type) +{ >>> + mutex_lock(&xen_pad_lock); >>> + xen_pad_set_idle_cpus(0); >>> + mutex_unlock(&xen_pad_lock); >>> + >>> + acpi_remove_notify_handler(device->handle, >>> + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); + >>> return 0; +} >>> + >>> +static const struct acpi_device_id pad_device_ids[] = { + >>> {"ACPI000C", 0}, + {"", 0}, >>> +}; >>> + >>> +static struct acpi_driver xen_acpi_pad_driver = { >>> + .name = "processor_aggregator", >>> + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, >>> + .ids = pad_device_ids, >>> + .ops = { >>> + .add = xen_acpi_pad_add, >>> + .remove = xen_acpi_pad_remove, >>> + }, >>> +}; >>> + >>> +static int __init xen_acpi_pad_init(void) >>> +{ >>> + int ret = -ENOSYS; >>> + unsigned int version = HYPERVISOR_xen_version(XENVER_version, >>> NULL); >> >> Heh. so if you run this on baremetal I wonder what will happen. >> >>> + unsigned int major = version >> 16; >>> + unsigned int minor = version & 0xffff; >>> + >>> + /* Only DOM0 is responsible for Xen acpi pad */ >>> + if (!xen_initial_domain()) >>> + return -ENODEV; >>> + >> >> I think the check for version should happen here. >> >>> + /* Only Xen4.2 or later support Xen acpi pad */ >>> + if (((major == 4) && (minor >= 2)) || (major > 4)) >>> + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); >>> + + return ret; >>> +} >>> +subsys_initcall(xen_acpi_pad_init); >>> diff --git a/include/xen/interface/platform.h >>> b/include/xen/interface/platform.h index 4755b5f..a3be54c 100644 >>> --- a/include/xen/interface/platform.h +++ >>> b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct >>> xenpf_cpu_ol { }; >>> DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); >>> >>> +/* >>> + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, >>> + * which are already occupied at Xen hypervisor side. + */ >>> +#define XENPF_core_parking 60 >>> +struct xenpf_core_parking { >>> + /* IN variables */ >>> +#define XEN_CORE_PARKING_SET 1 >>> +#define XEN_CORE_PARKING_GET 2 >>> + uint32_t type; >>> + /* IN variables: set cpu nums expected to be idled */ >>> + /* OUT variables: get cpu nums actually be idled */ + >>> uint32_t idle_nums; +}; >>> +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); >>> + >>> struct xen_platform_op { >>> uint32_t cmd; >>> uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ >>> @@ -341,6 +357,7 @@ struct xen_platform_op { >>> struct xenpf_set_processor_pminfo set_pminfo; >>> struct xenpf_pcpuinfo pcpu_info; >>> struct xenpf_cpu_ol cpu_ol; >>> + struct xenpf_core_parking core_parking; >>> uint8_t pad[128]; } u; >>> }; >>> -- >>> 1.7.1 >> >> >>> _______________________________________________ >>> Xen-devel mailing list >>> Xen-devel@lists.xen.org >>> http://lists.xen.org/xen-devel >> >> -- >> To unsubscribe from this list: send the line "unsubscribe >> linux-kernel" in the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 05:49:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 05:49:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVc21-0001ny-IY; Tue, 06 Nov 2012 05:49:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVc1z-0001nt-6e for xen-devel@lists.xen.org; Tue, 06 Nov 2012 05:48:59 +0000 Received: from [193.109.254.147:50905] by server-14.bemta-14.messagelabs.com id 1B/1E-14517-AC4A8905; Tue, 06 Nov 2012 05:48:58 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352180936!9056369!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYxNzM3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15442 invoked from network); 6 Nov 2012 05:48:57 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-12.tower-27.messagelabs.com with SMTP; 6 Nov 2012 05:48:57 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 05 Nov 2012 21:48:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,721,1344236400"; d="scan'208";a="215661461" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 05 Nov 2012 21:48:55 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 5 Nov 2012 21:48:54 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 6 Nov 2012 13:48:53 +0800 From: "Liu, Jinsong" To: Stefano Stabellini , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNu2iOTi91BiFLfUibRvXA4zlK85fcS22w Date: Tue, 6 Nov 2012 05:48:52 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Stefano Stabellini wrote: >>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>> index 0e86370..a2af622 100644 >>> --- a/drivers/xen/Makefile >>> +++ b/drivers/xen/Makefile >>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>> xen-evtchn-y := evtchn.o >>> xen-gntdev-y := gntdev.o >>> xen-gntalloc-y := gntalloc.o > > it should really depend on ACPI and maybe also X86, otherwise it is > going to break the ARM build > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which depends on X86_64). Thanks, Jinsong >>> diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c >>> new file mode 100644 >>> index 0000000..e8c26a4 >>> --- /dev/null >>> +++ b/drivers/xen/xen_acpi_pad.c >>> @@ -0,0 +1,206 @@ >>> +/* >>> + * xen_acpi_pad.c - Xen pad interface >>> + * >>> + * Copyright (c) 2012, Intel Corporation. >>> + * Author: Liu, Jinsong + * >>> + * This program is free software; you can redistribute it and/or >>> modify it + * under the terms and conditions of the GNU General >>> Public License, + * version 2, as published by the Free Software >>> Foundation. + * + * This program is distributed in the hope it will >>> be useful, but WITHOUT + * ANY WARRANTY; without even the implied >>> warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR >>> PURPOSE. See the GNU General Public License for + * more details. >>> + */ + >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> +#include >>> + >>> +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" >>> +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor >>> Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 >>> + >>> +static DEFINE_MUTEX(xen_pad_lock); >>> + >>> +static int xen_pad_set_idle_cpus(int num_cpus) >>> +{ >>> + struct xen_platform_op op; >>> + >>> + if (num_cpus < 0) >>> + return -EINVAL; >>> + >>> + /* set cpu nums expected to be idled */ >>> + op.cmd = XENPF_core_parking; >>> + op.u.core_parking.type = XEN_CORE_PARKING_SET; >>> + op.u.core_parking.idle_nums = num_cpus; >>> + >>> + return HYPERVISOR_dom0_op(&op); >>> +} >>> + >>> +/* >>> + * Cannot get idle cpus by using hypercall once (shared with _SET) >>> + * because of the characteristic of Xen continue_hypercall_on_cpu >>> + */ +static int xen_pad_get_idle_cpus(void) >>> +{ >>> + int ret; >>> + struct xen_platform_op op; >>> + >>> + /* get cpu nums actually be idled */ >>> + op.cmd = XENPF_core_parking; >>> + op.u.core_parking.type = XEN_CORE_PARKING_GET; >>> + ret = HYPERVISOR_dom0_op(&op); >>> + if (ret < 0) >>> + return ret; >>> + >>> + return op.u.core_parking.idle_nums; >>> +} >>> + >>> +/* >>> + * Query firmware how many CPUs should be idle >>> + * return -1 on failure >>> + */ >>> +static int xen_acpi_pad_pur(acpi_handle handle) >>> +{ >>> + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; >>> + union acpi_object *package; >>> + int num = -1; >>> + >>> + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, >>> &buffer))) + return num; + >>> + if (!buffer.length || !buffer.pointer) >>> + return num; >>> + >>> + package = buffer.pointer; >>> + >>> + if (package->type == ACPI_TYPE_PACKAGE && >>> + package->package.count == 2 && >>> + package->package.elements[0].integer.value == 1) /* >>> rev 1 */ + + num = >>> package->package.elements[1].integer.value; + + >>> kfree(buffer.pointer); + return num; >>> +} >>> + >>> +/* Notify firmware how many CPUs are idle */ >>> +static void xen_acpi_pad_ost(acpi_handle handle, int stat, + >>> uint32_t idle_cpus) +{ >>> + union acpi_object params[3] = { >>> + {.type = ACPI_TYPE_INTEGER,}, >>> + {.type = ACPI_TYPE_INTEGER,}, >>> + {.type = ACPI_TYPE_BUFFER,}, >>> + }; >>> + struct acpi_object_list arg_list = {3, params}; + >>> + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; >>> + params[1].integer.value = stat; >>> + params[2].buffer.length = 4; >>> + params[2].buffer.pointer = (void *)&idle_cpus; >>> + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} >>> + >>> +static void xen_acpi_pad_handle_notify(acpi_handle handle) +{ >>> + int num_cpus; >>> + >>> + num_cpus = xen_acpi_pad_pur(handle); >>> + if (num_cpus < 0) >>> + return; >>> + >>> + mutex_lock(&xen_pad_lock); >>> + if (xen_pad_set_idle_cpus(num_cpus)) { >>> + mutex_unlock(&xen_pad_lock); >>> + return; >>> + } >>> + >>> + num_cpus = xen_pad_get_idle_cpus(); >>> + if (num_cpus < 0) { >>> + mutex_unlock(&xen_pad_lock); >>> + return; >>> + } >>> + mutex_unlock(&xen_pad_lock); >>> + >>> + xen_acpi_pad_ost(handle, 0, num_cpus); >>> +} >>> + >>> +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, + >>> void *data) +{ >>> + switch (event) { >>> + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: >>> + xen_acpi_pad_handle_notify(handle); >>> + break; >>> + default: >>> + pr_warn("Unsupported event [0x%x]\n", event); + >>> break; + } >>> +} >>> + >>> +static int xen_acpi_pad_add(struct acpi_device *device) +{ >>> + acpi_status status; >>> + >>> + strcpy(acpi_device_name(device), >>> ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + >>> strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); >>> + + status = acpi_install_notify_handler(device->handle, + >>> ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); + if >>> (ACPI_FAILURE(status)) + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +static int xen_acpi_pad_remove(struct acpi_device *device, + >>> int type) +{ >>> + mutex_lock(&xen_pad_lock); >>> + xen_pad_set_idle_cpus(0); >>> + mutex_unlock(&xen_pad_lock); >>> + >>> + acpi_remove_notify_handler(device->handle, >>> + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify); + >>> return 0; +} >>> + >>> +static const struct acpi_device_id pad_device_ids[] = { + >>> {"ACPI000C", 0}, + {"", 0}, >>> +}; >>> + >>> +static struct acpi_driver xen_acpi_pad_driver = { >>> + .name = "processor_aggregator", >>> + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, >>> + .ids = pad_device_ids, >>> + .ops = { >>> + .add = xen_acpi_pad_add, >>> + .remove = xen_acpi_pad_remove, >>> + }, >>> +}; >>> + >>> +static int __init xen_acpi_pad_init(void) >>> +{ >>> + int ret = -ENOSYS; >>> + unsigned int version = HYPERVISOR_xen_version(XENVER_version, >>> NULL); >> >> Heh. so if you run this on baremetal I wonder what will happen. >> >>> + unsigned int major = version >> 16; >>> + unsigned int minor = version & 0xffff; >>> + >>> + /* Only DOM0 is responsible for Xen acpi pad */ >>> + if (!xen_initial_domain()) >>> + return -ENODEV; >>> + >> >> I think the check for version should happen here. >> >>> + /* Only Xen4.2 or later support Xen acpi pad */ >>> + if (((major == 4) && (minor >= 2)) || (major > 4)) >>> + ret = acpi_bus_register_driver(&xen_acpi_pad_driver); >>> + + return ret; >>> +} >>> +subsys_initcall(xen_acpi_pad_init); >>> diff --git a/include/xen/interface/platform.h >>> b/include/xen/interface/platform.h index 4755b5f..a3be54c 100644 >>> --- a/include/xen/interface/platform.h +++ >>> b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct >>> xenpf_cpu_ol { }; >>> DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); >>> >>> +/* >>> + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, >>> + * which are already occupied at Xen hypervisor side. + */ >>> +#define XENPF_core_parking 60 >>> +struct xenpf_core_parking { >>> + /* IN variables */ >>> +#define XEN_CORE_PARKING_SET 1 >>> +#define XEN_CORE_PARKING_GET 2 >>> + uint32_t type; >>> + /* IN variables: set cpu nums expected to be idled */ >>> + /* OUT variables: get cpu nums actually be idled */ + >>> uint32_t idle_nums; +}; >>> +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); >>> + >>> struct xen_platform_op { >>> uint32_t cmd; >>> uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ >>> @@ -341,6 +357,7 @@ struct xen_platform_op { >>> struct xenpf_set_processor_pminfo set_pminfo; >>> struct xenpf_pcpuinfo pcpu_info; >>> struct xenpf_cpu_ol cpu_ol; >>> + struct xenpf_core_parking core_parking; >>> uint8_t pad[128]; } u; >>> }; >>> -- >>> 1.7.1 >> >> >>> _______________________________________________ >>> Xen-devel mailing list >>> Xen-devel@lists.xen.org >>> http://lists.xen.org/xen-devel >> >> -- >> To unsubscribe from this list: send the line "unsubscribe >> linux-kernel" in the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 05:59:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 05:59:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcBV-0001y7-3x; Tue, 06 Nov 2012 05:58:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcBT-0001xz-Nk for xen-devel@lists.xen.org; Tue, 06 Nov 2012 05:58:48 +0000 Received: from [85.158.139.211:62358] by server-11.bemta-5.messagelabs.com id 0A/52-03409-617A8905; Tue, 06 Nov 2012 05:58:46 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-15.tower-206.messagelabs.com!1352181365!18958618!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31529 invoked from network); 6 Nov 2012 05:57:40 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-15.tower-206.messagelabs.com with SMTP; 6 Nov 2012 05:57:40 -0000 Received: from [131.193.36.87] (dhcp17.rites.uic.edu [131.193.36.87]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id A29C5A25B8F; Mon, 5 Nov 2012 23:56:04 -0600 (CST) Message-ID: <5098A674.5090203@cs.uic.edu> Date: Mon, 05 Nov 2012 23:56:04 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> In-Reply-To: <20121025205653.GW5925@type.chello.at> Content-Type: multipart/mixed; boundary="------------000705040403080601030602" Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------000705040403080601030602 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Dear all, I haven't seen any updates on this matter, so I try to come up with a fix. Generally speaking, I want to mimic 32-bit mini-OS behaviour, adding: 1) a fixup table: for each byte offset in the critical region, it provides the number of bytes which have already been popped from the interrupted stack frame. 2) a fixup routine: obtain number of restored registers by quickly looking up the fixup table and coalesce the current stack frame with the just-interrupted one. 3) checks against re-entrance in hypervisor_callback The "git diff" output is attached to this email. I only did some naive "tests" by running it inside gdb. I am wondering is there a test suite for mini-OS? A follow-up question is that given this fix, do you still need hypercall iret? Thank you very much. Regards, Xu Zhang On 10/25/2012 03:56 PM, Samuel Thibault wrote: > Xu Zhang, le Tue 23 Oct 2012 17:43:28 -0500, a écrit : >> 64-bit mini-OS seems to adopt a mixed use of both (in HYPERVISOR_IRET). >> mini-OS doesn't have an userspace, so unless an NMI happened, it always >> perform interrupt/exception return with machine instruction iret, without >> checking against nested events. This is wrong to me. Am I missing something >> here? > I don't think you are missing anything. Cc-ing Grzegorz, who actually > wrote the code. > > Samuel --------------000705040403080601030602 Content-Type: text/x-patch; name="fixup.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fixup.diff" diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index a65e5d5..b4f351c 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -42,8 +42,10 @@ hypercall_page: NMI_MASK = 0x80000000 +#define RBX 40 #define RDI 112 #define ORIG_RAX 120 /* + error_code */ +#define RIP 128 #define EFLAGS 144 .macro RESTORE_ALL @@ -147,7 +149,43 @@ error_call_handler: ENTRY(hypervisor_callback) - zeroentry hypervisor_callback2 + movq (%rsp),%rcx + movq 8(%rsp),%r11 + addq $0x10,%rsp /* skip rcx and r11 */ + pushq $0 /* push error code/oldrax */ + pushq %rax /* push real oldrax to the rdi slot */ + leaq hypervisor_callback2(%rip), %rax + + /* rdi slot contains rax, oldrax contains error code */ + cld + subq $14*8,%rsp + movq %rsi,13*8(%rsp) + movq 14*8(%rsp),%rsi /* load rax from rdi slot */ + movq %rdx,12*8(%rsp) + movq %rcx,11*8(%rsp) + movq %rsi,10*8(%rsp) /* store rax */ + movq %r8, 9*8(%rsp) + movq %r9, 8*8(%rsp) + movq %r10,7*8(%rsp) + movq %r11,6*8(%rsp) + movq %rbx,5*8(%rsp) + movq %rbp,4*8(%rsp) + movq %r12,3*8(%rsp) + movq %r13,2*8(%rsp) + movq %r14,1*8(%rsp) + movq %r15,(%rsp) + movq %rdi, RDI(%rsp) + + # check against re-entrance + movq RIP(%rsp),%rbx + cmpq $scrit,%rbx + jb 10f + cmpq $ecrit,%rbx + jb critical_region_fixup + +10: movq RBX(%rsp),%rbx # restore rbx + movq %rsp,%rdi + call *%rax ENTRY(hypervisor_callback2) movq %rdi, %rsp @@ -172,17 +210,40 @@ scrit: /**** START OF CRITICAL REGION ****/ 14: XEN_LOCKED_BLOCK_EVENTS(%rsi) XEN_PUT_VCPU_INFO(%rsi) - subq $6*8,%rsp - movq %rbx,5*8(%rsp) - movq %rbp,4*8(%rsp) - movq %r12,3*8(%rsp) - movq %r13,2*8(%rsp) - movq %r14,1*8(%rsp) - movq %r15,(%rsp) - movq %rsp,%rdi # set the argument again + pushq %rbx + pushq %rbp + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + movq %rsp,%rdi # set the argument again jmp 11b ecrit: /**** END OF CRITICAL REGION ****/ +# [How we do the fixup]. We want to merge the current stack frame with the +# just-interrupted frame. How we do this depends on where in the critical +# region the interrupted handler was executing, and so how many saved +# registers are in each frame. We do this quickly using the lookup table +# 'critical_fixup_table'. For each byte offset in the critical region, it +# provides the number of bytes which have already been popped from the +# interrupted stack frame. +critical_region_fixup: + addq $critical_fixup_table - scrit, %rbx + movzbq (%rbx),%rbx # %rbx contains num bytes popped + mov %rsp,%rsi + add %rbx,%rsi # %esi points at end of src region + mov %rsp,%rdi + add $0xa8,%rdi # %edi points at end of dst region + mov %rbx,%rcx + shr $3,%rcx # convert bytes into count of 64-bit entities + je 16f # skip loop if nothing to copy +15: subq $8,%rsi # pre-decrementing copy loop + subq $8,%rdi + movq (%rsi),%rbx + movq %rbx,(%rdi) + loop 15b +16: movq %rdi,%rsp # final %rdi is top of merged stack + jmp 10b retint_kernel: retint_restore_args: @@ -210,6 +271,42 @@ error_exit: jmp retint_kernel +critical_fixup_table: + .byte 0x30,0x30,0x30 # testb $0xff,(%rsi) + .byte 0x30,0x30 # jne 14f + .byte 0x30,0x30,0x30,0x30 # mov (%rsp),%r11 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x8(%rsp),%r10 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x10(%rsp),%r9 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x18(%rsp),%r8 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x20(%rsp),%rax + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x28(%rsp),%rcx + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x30(%rsp),%rdx + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x38(%rsp),%rsi + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x40(%rsp),%rdi + .byte 0x30,0x30,0x30,0x30 # add $0x50,%rsp + .byte 0x80,0x80,0x80,0x80 # testl $NMI_MASK,2*8(%rsp) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # jne 2f + .byte 0x80,0x80,0x80,0x80 # testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # jne 1f + .byte 0x80,0x80,0x80,0x80,0x80 # orb $0x3,0x8(%rsp) + .byte 0x80,0x80,0x80,0x80,0x80 # orb $0x3,0x20(%rsp) + .byte 0x80,0x80 # iretq + .byte 0x80,0x80,0x80,0x80 # andl $~NMI_MASK,0x10(%rsp) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # pushq $0x0 + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + (__HYPERVISOR_iret * 32) + .byte 0x30,0x30,0x30,0x30 # movb $0x1,0x1(%rsi) + .byte 0x30 # push %rbx + .byte 0x28 # push %rbp + .byte 0x20,0x20 # push %r12 + .byte 0x18,0x18 # push %r13 + .byte 0x10,0x10 # push %r14 + .byte 0x08,0x08 # push %r15 + .byte 0x00,0x00,0x00 # mov %rsp,%rdi + .byte 0x00,0x00,0x00,0x00,0x00 # jmpq 11b + ENTRY(failsafe_callback) popq %rcx --------------000705040403080601030602 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------000705040403080601030602-- From xen-devel-bounces@lists.xen.org Tue Nov 06 05:59:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 05:59:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcBV-0001y7-3x; Tue, 06 Nov 2012 05:58:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcBT-0001xz-Nk for xen-devel@lists.xen.org; Tue, 06 Nov 2012 05:58:48 +0000 Received: from [85.158.139.211:62358] by server-11.bemta-5.messagelabs.com id 0A/52-03409-617A8905; Tue, 06 Nov 2012 05:58:46 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-15.tower-206.messagelabs.com!1352181365!18958618!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31529 invoked from network); 6 Nov 2012 05:57:40 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-15.tower-206.messagelabs.com with SMTP; 6 Nov 2012 05:57:40 -0000 Received: from [131.193.36.87] (dhcp17.rites.uic.edu [131.193.36.87]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id A29C5A25B8F; Mon, 5 Nov 2012 23:56:04 -0600 (CST) Message-ID: <5098A674.5090203@cs.uic.edu> Date: Mon, 05 Nov 2012 23:56:04 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> In-Reply-To: <20121025205653.GW5925@type.chello.at> Content-Type: multipart/mixed; boundary="------------000705040403080601030602" Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------000705040403080601030602 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Dear all, I haven't seen any updates on this matter, so I try to come up with a fix. Generally speaking, I want to mimic 32-bit mini-OS behaviour, adding: 1) a fixup table: for each byte offset in the critical region, it provides the number of bytes which have already been popped from the interrupted stack frame. 2) a fixup routine: obtain number of restored registers by quickly looking up the fixup table and coalesce the current stack frame with the just-interrupted one. 3) checks against re-entrance in hypervisor_callback The "git diff" output is attached to this email. I only did some naive "tests" by running it inside gdb. I am wondering is there a test suite for mini-OS? A follow-up question is that given this fix, do you still need hypercall iret? Thank you very much. Regards, Xu Zhang On 10/25/2012 03:56 PM, Samuel Thibault wrote: > Xu Zhang, le Tue 23 Oct 2012 17:43:28 -0500, a écrit : >> 64-bit mini-OS seems to adopt a mixed use of both (in HYPERVISOR_IRET). >> mini-OS doesn't have an userspace, so unless an NMI happened, it always >> perform interrupt/exception return with machine instruction iret, without >> checking against nested events. This is wrong to me. Am I missing something >> here? > I don't think you are missing anything. Cc-ing Grzegorz, who actually > wrote the code. > > Samuel --------------000705040403080601030602 Content-Type: text/x-patch; name="fixup.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fixup.diff" diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index a65e5d5..b4f351c 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -42,8 +42,10 @@ hypercall_page: NMI_MASK = 0x80000000 +#define RBX 40 #define RDI 112 #define ORIG_RAX 120 /* + error_code */ +#define RIP 128 #define EFLAGS 144 .macro RESTORE_ALL @@ -147,7 +149,43 @@ error_call_handler: ENTRY(hypervisor_callback) - zeroentry hypervisor_callback2 + movq (%rsp),%rcx + movq 8(%rsp),%r11 + addq $0x10,%rsp /* skip rcx and r11 */ + pushq $0 /* push error code/oldrax */ + pushq %rax /* push real oldrax to the rdi slot */ + leaq hypervisor_callback2(%rip), %rax + + /* rdi slot contains rax, oldrax contains error code */ + cld + subq $14*8,%rsp + movq %rsi,13*8(%rsp) + movq 14*8(%rsp),%rsi /* load rax from rdi slot */ + movq %rdx,12*8(%rsp) + movq %rcx,11*8(%rsp) + movq %rsi,10*8(%rsp) /* store rax */ + movq %r8, 9*8(%rsp) + movq %r9, 8*8(%rsp) + movq %r10,7*8(%rsp) + movq %r11,6*8(%rsp) + movq %rbx,5*8(%rsp) + movq %rbp,4*8(%rsp) + movq %r12,3*8(%rsp) + movq %r13,2*8(%rsp) + movq %r14,1*8(%rsp) + movq %r15,(%rsp) + movq %rdi, RDI(%rsp) + + # check against re-entrance + movq RIP(%rsp),%rbx + cmpq $scrit,%rbx + jb 10f + cmpq $ecrit,%rbx + jb critical_region_fixup + +10: movq RBX(%rsp),%rbx # restore rbx + movq %rsp,%rdi + call *%rax ENTRY(hypervisor_callback2) movq %rdi, %rsp @@ -172,17 +210,40 @@ scrit: /**** START OF CRITICAL REGION ****/ 14: XEN_LOCKED_BLOCK_EVENTS(%rsi) XEN_PUT_VCPU_INFO(%rsi) - subq $6*8,%rsp - movq %rbx,5*8(%rsp) - movq %rbp,4*8(%rsp) - movq %r12,3*8(%rsp) - movq %r13,2*8(%rsp) - movq %r14,1*8(%rsp) - movq %r15,(%rsp) - movq %rsp,%rdi # set the argument again + pushq %rbx + pushq %rbp + pushq %r12 + pushq %r13 + pushq %r14 + pushq %r15 + movq %rsp,%rdi # set the argument again jmp 11b ecrit: /**** END OF CRITICAL REGION ****/ +# [How we do the fixup]. We want to merge the current stack frame with the +# just-interrupted frame. How we do this depends on where in the critical +# region the interrupted handler was executing, and so how many saved +# registers are in each frame. We do this quickly using the lookup table +# 'critical_fixup_table'. For each byte offset in the critical region, it +# provides the number of bytes which have already been popped from the +# interrupted stack frame. +critical_region_fixup: + addq $critical_fixup_table - scrit, %rbx + movzbq (%rbx),%rbx # %rbx contains num bytes popped + mov %rsp,%rsi + add %rbx,%rsi # %esi points at end of src region + mov %rsp,%rdi + add $0xa8,%rdi # %edi points at end of dst region + mov %rbx,%rcx + shr $3,%rcx # convert bytes into count of 64-bit entities + je 16f # skip loop if nothing to copy +15: subq $8,%rsi # pre-decrementing copy loop + subq $8,%rdi + movq (%rsi),%rbx + movq %rbx,(%rdi) + loop 15b +16: movq %rdi,%rsp # final %rdi is top of merged stack + jmp 10b retint_kernel: retint_restore_args: @@ -210,6 +271,42 @@ error_exit: jmp retint_kernel +critical_fixup_table: + .byte 0x30,0x30,0x30 # testb $0xff,(%rsi) + .byte 0x30,0x30 # jne 14f + .byte 0x30,0x30,0x30,0x30 # mov (%rsp),%r11 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x8(%rsp),%r10 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x10(%rsp),%r9 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x18(%rsp),%r8 + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x20(%rsp),%rax + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x28(%rsp),%rcx + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x30(%rsp),%rdx + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x38(%rsp),%rsi + .byte 0x30,0x30,0x30,0x30,0x30 # mov 0x40(%rsp),%rdi + .byte 0x30,0x30,0x30,0x30 # add $0x50,%rsp + .byte 0x80,0x80,0x80,0x80 # testl $NMI_MASK,2*8(%rsp) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # jne 2f + .byte 0x80,0x80,0x80,0x80 # testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # jne 1f + .byte 0x80,0x80,0x80,0x80,0x80 # orb $0x3,0x8(%rsp) + .byte 0x80,0x80,0x80,0x80,0x80 # orb $0x3,0x20(%rsp) + .byte 0x80,0x80 # iretq + .byte 0x80,0x80,0x80,0x80 # andl $~NMI_MASK,0x10(%rsp) + .byte 0x80,0x80,0x80,0x80 + .byte 0x80,0x80 # pushq $0x0 + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + (__HYPERVISOR_iret * 32) + .byte 0x30,0x30,0x30,0x30 # movb $0x1,0x1(%rsi) + .byte 0x30 # push %rbx + .byte 0x28 # push %rbp + .byte 0x20,0x20 # push %r12 + .byte 0x18,0x18 # push %r13 + .byte 0x10,0x10 # push %r14 + .byte 0x08,0x08 # push %r15 + .byte 0x00,0x00,0x00 # mov %rsp,%rdi + .byte 0x00,0x00,0x00,0x00,0x00 # jmpq 11b + ENTRY(failsafe_callback) popq %rcx --------------000705040403080601030602 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------000705040403080601030602-- From xen-devel-bounces@lists.xen.org Tue Nov 06 06:16:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 06:16:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcSO-0002E1-Nj; Tue, 06 Nov 2012 06:16:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcSN-0002Dw-Ax for xen-devel@lists.xen.org; Tue, 06 Nov 2012 06:16:15 +0000 Received: from [85.158.143.35:38640] by server-1.bemta-4.messagelabs.com id 22/36-27934-E2BA8905; Tue, 06 Nov 2012 06:16:14 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352182571!12418189!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM0MTc2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8862 invoked from network); 6 Nov 2012 06:16:12 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-12.tower-21.messagelabs.com with SMTP; 6 Nov 2012 06:16:12 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 Nov 2012 22:15:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,721,1344236400"; d="scan'208";a="243011197" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by fmsmga001.fm.intel.com with ESMTP; 05 Nov 2012 22:15:51 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 5 Nov 2012 22:15:50 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 6 Nov 2012 14:15:20 +0800 From: "Liu, Jinsong" To: Stefano Stabellini , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNu2iOTi91BiFLfUibRvXA4zlK85fcS22wgAAEj4A= Date: Tue, 6 Nov 2012 06:15:19 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Liu, Jinsong wrote: > Stefano Stabellini wrote: >>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>>> index 0e86370..a2af622 100644 >>>> --- a/drivers/xen/Makefile >>>> +++ b/drivers/xen/Makefile >>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>>> xen-evtchn-y := evtchn.o >>>> xen-gntdev-y := gntdev.o >>>> xen-gntalloc-y := gntalloc.o >> >> it should really depend on ACPI and maybe also X86, otherwise it is >> going to break the ARM build >> >> > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which > depends on X86_64). > Ah, you and Konrad are right. I ignore XEN_DOM0 varies under different arch. (But seems it not depends on X86 since it's logically an acpi stuff?). Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 06:16:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 06:16:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcSO-0002E1-Nj; Tue, 06 Nov 2012 06:16:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcSN-0002Dw-Ax for xen-devel@lists.xen.org; Tue, 06 Nov 2012 06:16:15 +0000 Received: from [85.158.143.35:38640] by server-1.bemta-4.messagelabs.com id 22/36-27934-E2BA8905; Tue, 06 Nov 2012 06:16:14 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352182571!12418189!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM0MTc2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8862 invoked from network); 6 Nov 2012 06:16:12 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-12.tower-21.messagelabs.com with SMTP; 6 Nov 2012 06:16:12 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 Nov 2012 22:15:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,721,1344236400"; d="scan'208";a="243011197" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by fmsmga001.fm.intel.com with ESMTP; 05 Nov 2012 22:15:51 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 5 Nov 2012 22:15:50 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 6 Nov 2012 14:15:20 +0800 From: "Liu, Jinsong" To: Stefano Stabellini , Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNu2iOTi91BiFLfUibRvXA4zlK85fcS22wgAAEj4A= Date: Tue, 6 Nov 2012 06:15:19 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Liu, Jinsong wrote: > Stefano Stabellini wrote: >>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>>> index 0e86370..a2af622 100644 >>>> --- a/drivers/xen/Makefile >>>> +++ b/drivers/xen/Makefile >>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>>> xen-evtchn-y := evtchn.o >>>> xen-gntdev-y := gntdev.o >>>> xen-gntalloc-y := gntalloc.o >> >> it should really depend on ACPI and maybe also X86, otherwise it is >> going to break the ARM build >> >> > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which > depends on X86_64). > Ah, you and Konrad are right. I ignore XEN_DOM0 varies under different arch. (But seems it not depends on X86 since it's logically an acpi stuff?). Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 06:24:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 06:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcZl-0002Og-Ph; Tue, 06 Nov 2012 06:23:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcZj-0002Ob-UY for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 06:23:52 +0000 Received: from [85.158.138.51:27932] by server-10.bemta-3.messagelabs.com id A3/E1-19806-7FCA8905; Tue, 06 Nov 2012 06:23:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352183030!28847022!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10258 invoked from network); 6 Nov 2012 06:23:50 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 06:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,721,1344211200"; d="scan'208";a="15599787" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 06:23:49 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 06:23:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVcZh-0002Ry-8c; Tue, 06 Nov 2012 06:23:49 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVcZh-0000C9-0n; Tue, 06 Nov 2012 06:23:49 +0000 To: Message-ID: From: xen.org Date: Tue, 6 Nov 2012 06:23:49 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14368: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14368 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14368/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14365 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14365 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14365 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14352 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 06:24:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 06:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcZl-0002Og-Ph; Tue, 06 Nov 2012 06:23:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVcZj-0002Ob-UY for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 06:23:52 +0000 Received: from [85.158.138.51:27932] by server-10.bemta-3.messagelabs.com id A3/E1-19806-7FCA8905; Tue, 06 Nov 2012 06:23:51 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352183030!28847022!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTcyNDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10258 invoked from network); 6 Nov 2012 06:23:50 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 06:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,721,1344211200"; d="scan'208";a="15599787" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 06:23:49 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 06:23:48 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVcZh-0002Ry-8c; Tue, 06 Nov 2012 06:23:49 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVcZh-0000C9-0n; Tue, 06 Nov 2012 06:23:49 +0000 To: Message-ID: From: xen.org Date: Tue, 6 Nov 2012 06:23:49 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14368: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14368 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14368/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14365 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14365 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14365 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14352 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:00:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf0N-00042J-Ko; Tue, 06 Nov 2012 08:59:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf0L-00042E-3e for xen-devel@lists.xen.org; Tue, 06 Nov 2012 08:59:29 +0000 Received: from [85.158.139.83:6205] by server-11.bemta-5.messagelabs.com id B5/1B-03409-071D8905; Tue, 06 Nov 2012 08:59:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352192367!24999687!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16089 invoked from network); 6 Nov 2012 08:59:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-182.messagelabs.com with SMTP; 6 Nov 2012 08:59:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:01:21 +0000 Message-Id: <5098DF7E02000078000A696B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 08:59:26 +0000 From: "Jan Beulich" To: "xen-devel" ,"Keir Fraser" References: <5097FC3002000078000A66AE@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Subject: Re: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 18:15, Keir Fraser wrote: > On 05/11/2012 16:49, "Jan Beulich" wrote: > >> Since the image pointed to may (and generally will) live in boot >> services memory (which we add to the global memory pool long before >> ACPI tables get looked at), we should prevent Dom0 from trying to >> retrieve the image data. >> >> The alternatives would be to >> - not add boot services memory to the global pool at all, or >> - defer adding boot services memory until Dom0 indicates it is safe to >> do so, or >> - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid >> adding that specific region to the E820 table. >> None of these is really attractive, and as Xen commonly prints to the >> video console anyway (without trying to avoid any regions on the >> screen), the invalidation would need to be done conditionally anyway. >> >> (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) >> >> Signed-off-by: Jan Beulich > > Acked-by: Keir Fraser I'll have to hold this back until the real meaning of the valid bit here (and eventual other spec conforming ways of invalidating) got clarified: The Linux folks tell me that their understanding of its meaning differs from mine. Jan >> --- a/xen/arch/x86/acpi/boot.c >> +++ b/xen/arch/x86/acpi/boot.c >> @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct >> #define acpi_parse_hpet NULL >> #endif >> >> +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) >> +{ >> + struct acpi_table_bgrt *bgrt_tbl = >> + container_of(table, struct acpi_table_bgrt, header); >> + >> + if (table->length < sizeof(*bgrt_tbl)) >> + return -1; >> + >> + if (!(bgrt_tbl->status & 1)) >> + return 0; >> + >> + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for >> (%u,%u)\n", >> + bgrt_tbl->version, bgrt_tbl->image_address, >> + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); >> + bgrt_tbl->status &= ~1; >> + >> + return 0; >> +} >> + >> #ifdef CONFIG_ACPI_SLEEP >> #define acpi_fadt_copy_address(dst, src, len) do { \ >> if (fadt->header.revision >= FADT2_REVISION_ID) \ >> @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) >> >> erst_init(); >> >> + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); >> + >> return 0; >> } >> --- a/xen/include/acpi/actbl.h >> +++ b/xen/include/acpi/actbl.h >> @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { >> >> #include >> #include >> +#include >> >> /* >> * Sizes of the various flavors of FADT. We need to look closely >> --- /dev/null >> +++ b/xen/include/acpi/actbl3.h >> @@ -0,0 +1,557 @@ >> > +/*************************************************************************** > * >> ** >> + * >> + * Name: actbl3.h - ACPI Table Definitions >> + * >> + >> > ***************************************************************************** > / >> + >> +/* >> + * Copyright (C) 2000 - 2012, Intel Corp. >> + * All rights reserved. >> + * >> + * Redistribution and use in source and binary forms, with or without >> + * modification, are permitted provided that the following conditions >> + * are met: >> + * 1. Redistributions of source code must retain the above copyright >> + * notice, this list of conditions, and the following disclaimer, >> + * without modification. >> + * 2. Redistributions in binary form must reproduce at minimum a disclaimer >> + * substantially similar to the "NO WARRANTY" disclaimer below >> + * ("Disclaimer") and any redistribution must be conditioned upon >> + * including a substantially similar Disclaimer requirement for further >> + * binary redistribution. >> + * 3. Neither the names of the above-listed copyright holders nor the names >> + * of any contributors may be used to endorse or promote products > derived >> + * from this software without specific prior written permission. >> + * >> + * Alternatively, this software may be distributed under the terms of the >> + * GNU General Public License ("GPL") version 2 as published by the Free >> + * Software Foundation. >> + * >> + * NO WARRANTY >> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >> + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >> + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR >> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT >> + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL >> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, >> + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING >> + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >> + * POSSIBILITY OF SUCH DAMAGES. >> + */ >> + >> +#ifndef __ACTBL3_H__ >> +#define __ACTBL3_H__ >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * Additional ACPI Tables (3) >> + * >> + * These tables are not consumed directly by the ACPICA subsystem, but are >> + * included here to support device drivers and the AML disassembler. >> + * >> + * The tables in this file are fully defined within the ACPI specification. >> + * >> + >> > **************************************************************************** >**> > / >> + >> +/* >> + * Values for description table header signatures for tables defined in > this >> + * file. Useful because they make it more difficult to inadvertently type > in >> + * the wrong signature. >> + */ >> +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ >> +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for >> Measurement table */ >> +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table > */ >> +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table > */ >> +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ >> +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel >> Table */ >> +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */ >> +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ >> + >> +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ >> +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ >> + >> +/* Reserved table signatures */ >> + >> +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ >> +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation Table > */ >> +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table > */ >> +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */ >> + >> +/* >> + * All tables must be byte-packed to match the ACPI specification, since >> + * the tables are provided by the system BIOS. >> + */ >> +#pragma pack(1) >> + >> +/* >> + * Note: C bitfields are not used for this reason: >> + * >> + * "Bitfields are great and easy to read, but unfortunately the C language >> + * does not specify the layout of bitfields in memory, which means they are >> + * essentially useless for dealing with packed data in on-disk formats or >> + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, >> + * this decision was a design error in C. Ritchie could have picked an > order >> + * and stuck with it." Norman Ramsey. >> + * See http://stackoverflow.com/a/1053662/41661 >> + */ >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * BGRT - Boot Graphics Resource Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_bgrt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u16 version; >> + u8 status; >> + u8 image_type; >> + u64 image_address; >> + u32 image_offset_x; >> + u32 image_offset_y; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * DRTM - Dynamic Root of Trust for Measurement table >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_drtm { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u64 entry_base_address; >> + u64 entry_length; >> + u32 entry_address32; >> + u64 entry_address64; >> + u64 exit_address; >> + u64 log_area_address; >> + u32 log_area_length; >> + u64 arch_dependent_address; >> + u32 flags; >> +}; >> + >> +/* 1) Validated Tables List */ >> + >> +struct acpi_drtm_vtl_list { >> + u32 validated_table_list_count; >> +}; >> + >> +/* 2) Resources List */ >> + >> +struct acpi_drtm_resource_list { >> + u32 resource_list_count; >> +}; >> + >> +/* 3) Platform-specific Identifiers List */ >> + >> +struct acpi_drtm_id_list { >> + u32 id_list_count; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * FPDT - Firmware Performance Data Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_fpdt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> +}; >> + >> +/* FPDT subtable header */ >> + >> +struct acpi_fpdt_header { >> + u16 type; >> + u8 length; >> + u8 revision; >> +}; >> + >> +/* Values for Type field above */ >> + >> +enum acpi_fpdt_type { >> + ACPI_FPDT_TYPE_BOOT = 0, >> + ACPI_FPDT_TYPE_S3PERF = 1, >> +}; >> + >> +/* >> + * FPDT subtables >> + */ >> + >> +/* 0: Firmware Basic Boot Performance Record */ >> + >> +struct acpi_fpdt_boot { >> + struct acpi_fpdt_header header; >> + u8 reserved[4]; >> + u64 reset_end; >> + u64 load_start; >> + u64 startup_start; >> + u64 exit_services_entry; >> + u64 exit_services_exit; >> +}; >> + >> +/* 1: S3 Performance Table Pointer Record */ >> + >> +struct acpi_fpdt_s3pt_ptr { >> + struct acpi_fpdt_header header; >> + u8 reserved[4]; >> + u64 address; >> +}; >> + >> +/* >> + * S3PT - S3 Performance Table. This table is pointed to by the >> + * FPDT S3 Pointer Record above. >> + */ >> +struct acpi_table_s3pt { >> + u8 signature[4]; /* "S3PT" */ >> + u32 length; >> +}; >> + >> +/* >> + * S3PT Subtables >> + */ >> +struct acpi_s3pt_header { >> + u16 type; >> + u8 length; >> + u8 revision; >> +}; >> + >> +/* Values for Type field above */ >> + >> +enum acpi_s3pt_type { >> + ACPI_S3PT_TYPE_RESUME = 0, >> + ACPI_S3PT_TYPE_SUSPEND = 1, >> +}; >> + >> +struct acpi_s3pt_resume { >> + struct acpi_s3pt_header header; >> + u32 resume_count; >> + u64 full_resume; >> + u64 average_resume; >> +}; >> + >> +struct acpi_s3pt_suspend { >> + struct acpi_s3pt_header header; >> + u64 suspend_start; >> + u64 suspend_end; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * GTDT - Generic Timer Description Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_gtdt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u64 address; >> + u32 flags; >> + u32 secure_pl1_interrupt; >> + u32 secure_pl1_flags; >> + u32 non_secure_pl1_interrupt; >> + u32 non_secure_pl1_flags; >> + u32 virtual_timer_interrupt; >> + u32 virtual_timer_flags; >> + u32 non_secure_pl2_interrupt; >> + u32 non_secure_pl2_flags; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 >> + >> +/* Values for all "TimerFlags" fields above */ >> + >> +#define ACPI_GTDT_INTERRUPT_MODE 1 >> +#define ACPI_GTDT_INTERRUPT_POLARITY 2 >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * MPST - Memory Power State Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +#define ACPI_MPST_CHANNEL_INFO \ >> + u16 reserved1; \ >> + u8 channel_id; \ >> + u8 reserved2; \ >> + u16 power_node_count; >> + >> +/* Main table */ >> + >> +struct acpi_table_mpst { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ >> +}; >> + >> +/* Memory Platform Communication Channel Info */ >> + >> +struct acpi_mpst_channel { >> + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ >> +}; >> + >> +/* Memory Power Node Structure */ >> + >> +struct acpi_mpst_power_node { >> + u8 flags; >> + u8 reserved1; >> + u16 node_id; >> + u32 length; >> + u64 range_address; >> + u64 range_length; >> + u8 num_power_states; >> + u8 num_physical_components; >> + u16 reserved2; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_MPST_ENABLED 1 >> +#define ACPI_MPST_POWER_MANAGED 2 >> +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 >> + >> +/* Memory Power State Structure (follows POWER_NODE above) */ >> + >> +struct acpi_mpst_power_state { >> + u8 power_state; >> + u8 info_index; >> +}; >> + >> +/* Physical Component ID Structure (follows POWER_STATE above) */ >> + >> +struct acpi_mpst_component { >> + u16 component_id; >> +}; >> + >> +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) > */ >> + >> +struct acpi_mpst_data_hdr { >> + u16 characteristics_count; >> +}; >> + >> +struct acpi_mpst_power_data { >> + u8 revision; >> + u8 flags; >> + u16 reserved1; >> + u32 average_power; >> + u32 power_saving; >> + u64 exit_latency; >> + u64 reserved2; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_MPST_PRESERVE 1 >> +#define ACPI_MPST_AUTOENTRY 2 >> +#define ACPI_MPST_AUTOEXIT 4 >> + >> +/* Shared Memory Region (not part of an ACPI table) */ >> + >> +struct acpi_mpst_shared { >> + u32 signature; >> + u16 pcc_command; >> + u16 pcc_status; >> + u16 command_register; >> + u16 status_register; >> + u16 power_state_id; >> + u16 power_node_id; >> + u64 energy_consumed; >> + u64 average_power; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * PCCT - Platform Communications Channel Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_pcct { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u32 flags; >> + u32 latency; >> + u32 reserved; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_PCCT_DOORBELL 1 >> + >> +/* >> + * PCCT subtables >> + */ >> + >> +/* 0: Generic Communications Subspace */ >> + >> +struct acpi_pcct_subspace { >> + struct acpi_subtable_header header; >> + u8 reserved[6]; >> + u64 base_address; >> + u64 length; >> + struct acpi_generic_address doorbell_register; >> + u64 preserve_mask; >> + u64 write_mask; >> +}; >> + >> +/* >> + * PCC memory structures (not part of the ACPI table) >> + */ >> + >> +/* Shared Memory Region */ >> + >> +struct acpi_pcct_shared_memory { >> + u32 signature; >> + u16 command; >> + u16 status; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * PMTT - Platform Memory Topology Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_pmtt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u32 reserved; >> +}; >> + >> +/* Common header for PMTT subtables that follow main table */ >> + >> +struct acpi_pmtt_header { >> + u8 type; >> + u8 reserved1; >> + u16 length; >> + u16 flags; >> + u16 reserved2; >> +}; >> + >> +/* Values for Type field above */ >> + >> +#define ACPI_PMTT_TYPE_SOCKET 0 >> +#define ACPI_PMTT_TYPE_CONTROLLER 1 >> +#define ACPI_PMTT_TYPE_DIMM 2 >> +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved */ >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_PMTT_TOP_LEVEL 0x0001 >> +#define ACPI_PMTT_PHYSICAL 0x0002 >> +#define ACPI_PMTT_MEMORY_TYPE 0x000C >> + >> +/* >> + * PMTT subtables, correspond to Type in struct acpi_pmtt_header >> + */ >> + >> +/* 0: Socket Structure */ >> + >> +struct acpi_pmtt_socket { >> + struct acpi_pmtt_header header; >> + u16 socket_id; >> + u16 reserved; >> +}; >> + >> +/* 1: Memory Controller subtable */ >> + >> +struct acpi_pmtt_controller { >> + struct acpi_pmtt_header header; >> + u32 read_latency; >> + u32 write_latency; >> + u32 read_bandwidth; >> + u32 write_bandwidth; >> + u16 access_width; >> + u16 alignment; >> + u16 reserved; >> + u16 domain_count; >> +}; >> + >> +/* 1a: Proximity Domain substructure */ >> + >> +struct acpi_pmtt_domain { >> + u32 proximity_domain; >> +}; >> + >> +/* 2: Physical Component Identifier (DIMM) */ >> + >> +struct acpi_pmtt_physical_component { >> + struct acpi_pmtt_header header; >> + u16 component_id; >> + u16 reserved; >> + u32 memory_size; >> + u32 bios_handle; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * RASF - RAS Feature Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_rasf { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u8 channel_id[12]; >> +}; >> + >> +/* RASF Platform Communication Channel Shared Memory Region */ >> + >> +struct acpi_rasf_shared_memory { >> + u32 signature; >> + u16 command; >> + u16 status; >> + u64 requested_address; >> + u64 requested_length; >> + u64 actual_address; >> + u64 actual_length; >> + u16 flags; >> + u8 speed; >> +}; >> + >> +/* Masks for Flags and Speed fields above */ >> + >> +#define ACPI_RASF_SCRUBBER_RUNNING 1 >> +#define ACPI_RASF_SPEED (7<<1) >> + >> +/* Channel Commands */ >> + >> +enum acpi_rasf_commands { >> + ACPI_RASF_GET_RAS_CAPABILITIES = 1, >> + ACPI_RASF_GET_PATROL_PARAMETERS = 2, >> + ACPI_RASF_START_PATROL_SCRUBBER = 3, >> + ACPI_RASF_STOP_PATROL_SCRUBBER = 4 >> +}; >> + >> +/* Channel Command flags */ >> + >> +#define ACPI_RASF_GENERATE_SCI (1<<15) >> + >> +/* Status values */ >> + >> +enum acpi_rasf_status { >> + ACPI_RASF_SUCCESS = 0, >> + ACPI_RASF_NOT_VALID = 1, >> + ACPI_RASF_NOT_SUPPORTED = 2, >> + ACPI_RASF_BUSY = 3, >> + ACPI_RASF_FAILED = 4, >> + ACPI_RASF_ABORTED = 5, >> + ACPI_RASF_INVALID_DATA = 6 >> +}; >> + >> +/* Status flags */ >> + >> +#define ACPI_RASF_COMMAND_COMPLETE (1) >> +#define ACPI_RASF_SCI_DOORBELL (1<<1) >> +#define ACPI_RASF_ERROR (1<<2) >> +#define ACPI_RASF_STATUS (0x1F<<3) >> + >> +/* Reset to default packing */ >> + >> +#pragma pack() >> + >> +#endif /* __ACTBL3_H__ */ >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:00:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf0N-00042J-Ko; Tue, 06 Nov 2012 08:59:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf0L-00042E-3e for xen-devel@lists.xen.org; Tue, 06 Nov 2012 08:59:29 +0000 Received: from [85.158.139.83:6205] by server-11.bemta-5.messagelabs.com id B5/1B-03409-071D8905; Tue, 06 Nov 2012 08:59:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352192367!24999687!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16089 invoked from network); 6 Nov 2012 08:59:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-182.messagelabs.com with SMTP; 6 Nov 2012 08:59:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:01:21 +0000 Message-Id: <5098DF7E02000078000A696B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 08:59:26 +0000 From: "Jan Beulich" To: "xen-devel" ,"Keir Fraser" References: <5097FC3002000078000A66AE@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Subject: Re: [Xen-devel] [PATCH] x86/ACPI: invalidate BGRT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 18:15, Keir Fraser wrote: > On 05/11/2012 16:49, "Jan Beulich" wrote: > >> Since the image pointed to may (and generally will) live in boot >> services memory (which we add to the global memory pool long before >> ACPI tables get looked at), we should prevent Dom0 from trying to >> retrieve the image data. >> >> The alternatives would be to >> - not add boot services memory to the global pool at all, or >> - defer adding boot services memory until Dom0 indicates it is safe to >> do so, or >> - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid >> adding that specific region to the E820 table. >> None of these is really attractive, and as Xen commonly prints to the >> video console anyway (without trying to avoid any regions on the >> screen), the invalidation would need to be done conditionally anyway. >> >> (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) >> >> Signed-off-by: Jan Beulich > > Acked-by: Keir Fraser I'll have to hold this back until the real meaning of the valid bit here (and eventual other spec conforming ways of invalidating) got clarified: The Linux folks tell me that their understanding of its meaning differs from mine. Jan >> --- a/xen/arch/x86/acpi/boot.c >> +++ b/xen/arch/x86/acpi/boot.c >> @@ -286,6 +286,25 @@ static int __init acpi_parse_hpet(struct >> #define acpi_parse_hpet NULL >> #endif >> >> +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) >> +{ >> + struct acpi_table_bgrt *bgrt_tbl = >> + container_of(table, struct acpi_table_bgrt, header); >> + >> + if (table->length < sizeof(*bgrt_tbl)) >> + return -1; >> + >> + if (!(bgrt_tbl->status & 1)) >> + return 0; >> + >> + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64" for >> (%u,%u)\n", >> + bgrt_tbl->version, bgrt_tbl->image_address, >> + bgrt_tbl->image_offset_x, bgrt_tbl->image_offset_y); >> + bgrt_tbl->status &= ~1; >> + >> + return 0; >> +} >> + >> #ifdef CONFIG_ACPI_SLEEP >> #define acpi_fadt_copy_address(dst, src, len) do { \ >> if (fadt->header.revision >= FADT2_REVISION_ID) \ >> @@ -653,5 +672,7 @@ int __init acpi_boot_init(void) >> >> erst_init(); >> >> + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); >> + >> return 0; >> } >> --- a/xen/include/acpi/actbl.h >> +++ b/xen/include/acpi/actbl.h >> @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { >> >> #include >> #include >> +#include >> >> /* >> * Sizes of the various flavors of FADT. We need to look closely >> --- /dev/null >> +++ b/xen/include/acpi/actbl3.h >> @@ -0,0 +1,557 @@ >> > +/*************************************************************************** > * >> ** >> + * >> + * Name: actbl3.h - ACPI Table Definitions >> + * >> + >> > ***************************************************************************** > / >> + >> +/* >> + * Copyright (C) 2000 - 2012, Intel Corp. >> + * All rights reserved. >> + * >> + * Redistribution and use in source and binary forms, with or without >> + * modification, are permitted provided that the following conditions >> + * are met: >> + * 1. Redistributions of source code must retain the above copyright >> + * notice, this list of conditions, and the following disclaimer, >> + * without modification. >> + * 2. Redistributions in binary form must reproduce at minimum a disclaimer >> + * substantially similar to the "NO WARRANTY" disclaimer below >> + * ("Disclaimer") and any redistribution must be conditioned upon >> + * including a substantially similar Disclaimer requirement for further >> + * binary redistribution. >> + * 3. Neither the names of the above-listed copyright holders nor the names >> + * of any contributors may be used to endorse or promote products > derived >> + * from this software without specific prior written permission. >> + * >> + * Alternatively, this software may be distributed under the terms of the >> + * GNU General Public License ("GPL") version 2 as published by the Free >> + * Software Foundation. >> + * >> + * NO WARRANTY >> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >> + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT >> + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR >> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT >> + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL >> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, >> + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING >> + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >> + * POSSIBILITY OF SUCH DAMAGES. >> + */ >> + >> +#ifndef __ACTBL3_H__ >> +#define __ACTBL3_H__ >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * Additional ACPI Tables (3) >> + * >> + * These tables are not consumed directly by the ACPICA subsystem, but are >> + * included here to support device drivers and the AML disassembler. >> + * >> + * The tables in this file are fully defined within the ACPI specification. >> + * >> + >> > **************************************************************************** >**> > / >> + >> +/* >> + * Values for description table header signatures for tables defined in > this >> + * file. Useful because they make it more difficult to inadvertently type > in >> + * the wrong signature. >> + */ >> +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ >> +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for >> Measurement table */ >> +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table > */ >> +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table > */ >> +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ >> +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel >> Table */ >> +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table */ >> +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ >> + >> +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ >> +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ >> + >> +/* Reserved table signatures */ >> + >> +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ >> +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation Table > */ >> +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table > */ >> +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table */ >> + >> +/* >> + * All tables must be byte-packed to match the ACPI specification, since >> + * the tables are provided by the system BIOS. >> + */ >> +#pragma pack(1) >> + >> +/* >> + * Note: C bitfields are not used for this reason: >> + * >> + * "Bitfields are great and easy to read, but unfortunately the C language >> + * does not specify the layout of bitfields in memory, which means they are >> + * essentially useless for dealing with packed data in on-disk formats or >> + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, >> + * this decision was a design error in C. Ritchie could have picked an > order >> + * and stuck with it." Norman Ramsey. >> + * See http://stackoverflow.com/a/1053662/41661 >> + */ >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * BGRT - Boot Graphics Resource Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_bgrt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u16 version; >> + u8 status; >> + u8 image_type; >> + u64 image_address; >> + u32 image_offset_x; >> + u32 image_offset_y; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * DRTM - Dynamic Root of Trust for Measurement table >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_drtm { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u64 entry_base_address; >> + u64 entry_length; >> + u32 entry_address32; >> + u64 entry_address64; >> + u64 exit_address; >> + u64 log_area_address; >> + u32 log_area_length; >> + u64 arch_dependent_address; >> + u32 flags; >> +}; >> + >> +/* 1) Validated Tables List */ >> + >> +struct acpi_drtm_vtl_list { >> + u32 validated_table_list_count; >> +}; >> + >> +/* 2) Resources List */ >> + >> +struct acpi_drtm_resource_list { >> + u32 resource_list_count; >> +}; >> + >> +/* 3) Platform-specific Identifiers List */ >> + >> +struct acpi_drtm_id_list { >> + u32 id_list_count; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * FPDT - Firmware Performance Data Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_fpdt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> +}; >> + >> +/* FPDT subtable header */ >> + >> +struct acpi_fpdt_header { >> + u16 type; >> + u8 length; >> + u8 revision; >> +}; >> + >> +/* Values for Type field above */ >> + >> +enum acpi_fpdt_type { >> + ACPI_FPDT_TYPE_BOOT = 0, >> + ACPI_FPDT_TYPE_S3PERF = 1, >> +}; >> + >> +/* >> + * FPDT subtables >> + */ >> + >> +/* 0: Firmware Basic Boot Performance Record */ >> + >> +struct acpi_fpdt_boot { >> + struct acpi_fpdt_header header; >> + u8 reserved[4]; >> + u64 reset_end; >> + u64 load_start; >> + u64 startup_start; >> + u64 exit_services_entry; >> + u64 exit_services_exit; >> +}; >> + >> +/* 1: S3 Performance Table Pointer Record */ >> + >> +struct acpi_fpdt_s3pt_ptr { >> + struct acpi_fpdt_header header; >> + u8 reserved[4]; >> + u64 address; >> +}; >> + >> +/* >> + * S3PT - S3 Performance Table. This table is pointed to by the >> + * FPDT S3 Pointer Record above. >> + */ >> +struct acpi_table_s3pt { >> + u8 signature[4]; /* "S3PT" */ >> + u32 length; >> +}; >> + >> +/* >> + * S3PT Subtables >> + */ >> +struct acpi_s3pt_header { >> + u16 type; >> + u8 length; >> + u8 revision; >> +}; >> + >> +/* Values for Type field above */ >> + >> +enum acpi_s3pt_type { >> + ACPI_S3PT_TYPE_RESUME = 0, >> + ACPI_S3PT_TYPE_SUSPEND = 1, >> +}; >> + >> +struct acpi_s3pt_resume { >> + struct acpi_s3pt_header header; >> + u32 resume_count; >> + u64 full_resume; >> + u64 average_resume; >> +}; >> + >> +struct acpi_s3pt_suspend { >> + struct acpi_s3pt_header header; >> + u64 suspend_start; >> + u64 suspend_end; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * GTDT - Generic Timer Description Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_gtdt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u64 address; >> + u32 flags; >> + u32 secure_pl1_interrupt; >> + u32 secure_pl1_flags; >> + u32 non_secure_pl1_interrupt; >> + u32 non_secure_pl1_flags; >> + u32 virtual_timer_interrupt; >> + u32 virtual_timer_flags; >> + u32 non_secure_pl2_interrupt; >> + u32 non_secure_pl2_flags; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 >> + >> +/* Values for all "TimerFlags" fields above */ >> + >> +#define ACPI_GTDT_INTERRUPT_MODE 1 >> +#define ACPI_GTDT_INTERRUPT_POLARITY 2 >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * MPST - Memory Power State Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +#define ACPI_MPST_CHANNEL_INFO \ >> + u16 reserved1; \ >> + u8 channel_id; \ >> + u8 reserved2; \ >> + u16 power_node_count; >> + >> +/* Main table */ >> + >> +struct acpi_table_mpst { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ >> +}; >> + >> +/* Memory Platform Communication Channel Info */ >> + >> +struct acpi_mpst_channel { >> + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ >> +}; >> + >> +/* Memory Power Node Structure */ >> + >> +struct acpi_mpst_power_node { >> + u8 flags; >> + u8 reserved1; >> + u16 node_id; >> + u32 length; >> + u64 range_address; >> + u64 range_length; >> + u8 num_power_states; >> + u8 num_physical_components; >> + u16 reserved2; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_MPST_ENABLED 1 >> +#define ACPI_MPST_POWER_MANAGED 2 >> +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 >> + >> +/* Memory Power State Structure (follows POWER_NODE above) */ >> + >> +struct acpi_mpst_power_state { >> + u8 power_state; >> + u8 info_index; >> +}; >> + >> +/* Physical Component ID Structure (follows POWER_STATE above) */ >> + >> +struct acpi_mpst_component { >> + u16 component_id; >> +}; >> + >> +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) > */ >> + >> +struct acpi_mpst_data_hdr { >> + u16 characteristics_count; >> +}; >> + >> +struct acpi_mpst_power_data { >> + u8 revision; >> + u8 flags; >> + u16 reserved1; >> + u32 average_power; >> + u32 power_saving; >> + u64 exit_latency; >> + u64 reserved2; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_MPST_PRESERVE 1 >> +#define ACPI_MPST_AUTOENTRY 2 >> +#define ACPI_MPST_AUTOEXIT 4 >> + >> +/* Shared Memory Region (not part of an ACPI table) */ >> + >> +struct acpi_mpst_shared { >> + u32 signature; >> + u16 pcc_command; >> + u16 pcc_status; >> + u16 command_register; >> + u16 status_register; >> + u16 power_state_id; >> + u16 power_node_id; >> + u64 energy_consumed; >> + u64 average_power; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * PCCT - Platform Communications Channel Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_pcct { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u32 flags; >> + u32 latency; >> + u32 reserved; >> +}; >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_PCCT_DOORBELL 1 >> + >> +/* >> + * PCCT subtables >> + */ >> + >> +/* 0: Generic Communications Subspace */ >> + >> +struct acpi_pcct_subspace { >> + struct acpi_subtable_header header; >> + u8 reserved[6]; >> + u64 base_address; >> + u64 length; >> + struct acpi_generic_address doorbell_register; >> + u64 preserve_mask; >> + u64 write_mask; >> +}; >> + >> +/* >> + * PCC memory structures (not part of the ACPI table) >> + */ >> + >> +/* Shared Memory Region */ >> + >> +struct acpi_pcct_shared_memory { >> + u32 signature; >> + u16 command; >> + u16 status; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * PMTT - Platform Memory Topology Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_pmtt { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u32 reserved; >> +}; >> + >> +/* Common header for PMTT subtables that follow main table */ >> + >> +struct acpi_pmtt_header { >> + u8 type; >> + u8 reserved1; >> + u16 length; >> + u16 flags; >> + u16 reserved2; >> +}; >> + >> +/* Values for Type field above */ >> + >> +#define ACPI_PMTT_TYPE_SOCKET 0 >> +#define ACPI_PMTT_TYPE_CONTROLLER 1 >> +#define ACPI_PMTT_TYPE_DIMM 2 >> +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved */ >> + >> +/* Values for Flags field above */ >> + >> +#define ACPI_PMTT_TOP_LEVEL 0x0001 >> +#define ACPI_PMTT_PHYSICAL 0x0002 >> +#define ACPI_PMTT_MEMORY_TYPE 0x000C >> + >> +/* >> + * PMTT subtables, correspond to Type in struct acpi_pmtt_header >> + */ >> + >> +/* 0: Socket Structure */ >> + >> +struct acpi_pmtt_socket { >> + struct acpi_pmtt_header header; >> + u16 socket_id; >> + u16 reserved; >> +}; >> + >> +/* 1: Memory Controller subtable */ >> + >> +struct acpi_pmtt_controller { >> + struct acpi_pmtt_header header; >> + u32 read_latency; >> + u32 write_latency; >> + u32 read_bandwidth; >> + u32 write_bandwidth; >> + u16 access_width; >> + u16 alignment; >> + u16 reserved; >> + u16 domain_count; >> +}; >> + >> +/* 1a: Proximity Domain substructure */ >> + >> +struct acpi_pmtt_domain { >> + u32 proximity_domain; >> +}; >> + >> +/* 2: Physical Component Identifier (DIMM) */ >> + >> +struct acpi_pmtt_physical_component { >> + struct acpi_pmtt_header header; >> + u16 component_id; >> + u16 reserved; >> + u32 memory_size; >> + u32 bios_handle; >> +}; >> + >> > +/*************************************************************************** > * >> *** >> + * >> + * RASF - RAS Feature Table (ACPI 5.0) >> + * Version 1 >> + * >> + >> > **************************************************************************** >**> > / >> + >> +struct acpi_table_rasf { >> + struct acpi_table_header header; /* Common ACPI table header */ >> + u8 channel_id[12]; >> +}; >> + >> +/* RASF Platform Communication Channel Shared Memory Region */ >> + >> +struct acpi_rasf_shared_memory { >> + u32 signature; >> + u16 command; >> + u16 status; >> + u64 requested_address; >> + u64 requested_length; >> + u64 actual_address; >> + u64 actual_length; >> + u16 flags; >> + u8 speed; >> +}; >> + >> +/* Masks for Flags and Speed fields above */ >> + >> +#define ACPI_RASF_SCRUBBER_RUNNING 1 >> +#define ACPI_RASF_SPEED (7<<1) >> + >> +/* Channel Commands */ >> + >> +enum acpi_rasf_commands { >> + ACPI_RASF_GET_RAS_CAPABILITIES = 1, >> + ACPI_RASF_GET_PATROL_PARAMETERS = 2, >> + ACPI_RASF_START_PATROL_SCRUBBER = 3, >> + ACPI_RASF_STOP_PATROL_SCRUBBER = 4 >> +}; >> + >> +/* Channel Command flags */ >> + >> +#define ACPI_RASF_GENERATE_SCI (1<<15) >> + >> +/* Status values */ >> + >> +enum acpi_rasf_status { >> + ACPI_RASF_SUCCESS = 0, >> + ACPI_RASF_NOT_VALID = 1, >> + ACPI_RASF_NOT_SUPPORTED = 2, >> + ACPI_RASF_BUSY = 3, >> + ACPI_RASF_FAILED = 4, >> + ACPI_RASF_ABORTED = 5, >> + ACPI_RASF_INVALID_DATA = 6 >> +}; >> + >> +/* Status flags */ >> + >> +#define ACPI_RASF_COMMAND_COMPLETE (1) >> +#define ACPI_RASF_SCI_DOORBELL (1<<1) >> +#define ACPI_RASF_ERROR (1<<2) >> +#define ACPI_RASF_STATUS (0x1F<<3) >> + >> +/* Reset to default packing */ >> + >> +#pragma pack() >> + >> +#endif /* __ACTBL3_H__ */ >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:09:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:09:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf98-0004ES-LE; Tue, 06 Nov 2012 09:08:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf97-0004EN-Re for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:08:34 +0000 Received: from [85.158.139.83:40963] by server-10.bemta-5.messagelabs.com id 03/09-09257-093D8905; Tue, 06 Nov 2012 09:08:32 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352192912!28675891!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12406 invoked from network); 6 Nov 2012 09:08:32 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-182.messagelabs.com with SMTP; 6 Nov 2012 09:08:32 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:10:26 +0000 Message-Id: <5098E19D02000078000A697A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 09:08:29 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, Tim Deegan , xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 18:15, Keir Fraser wrote: > On 05/11/2012 16:53, "Jan Beulich" wrote: > >> Under the assumption that in these cases recurring faults aren't a >> security issue and it can be expected that the drivers there are going >> to try to take care of the problem. >> >> Signed-off-by: Jan Beulich > > Solving an observed problem? In the context of analyzing the situation described in "iommu=dom0-passthrough behavior" (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) I suppressed the IOMMU setup for some device in Dom0, and was quite puzzled to find that only a single fault would occur. The BM disabling is definitely a potential problem for devices Xen itself is making use of, and I view it as wrong for Dom0 too (it ought to be given a chance to recover - the failure mode of the driver for the disabled device differs quite significantly before and after this patch). With the change at hand, a next step (depending on the outcome of above inquiry to the IOMMU folks) might then be to insert an artificial device to overcome the IOMMU faults. This obviously should only be done for Xen or Dom0 used devices, i.e. could build on top of the special casing here. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:09:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:09:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf98-0004ES-LE; Tue, 06 Nov 2012 09:08:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVf97-0004EN-Re for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:08:34 +0000 Received: from [85.158.139.83:40963] by server-10.bemta-5.messagelabs.com id 03/09-09257-093D8905; Tue, 06 Nov 2012 09:08:32 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352192912!28675891!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12406 invoked from network); 6 Nov 2012 09:08:32 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-182.messagelabs.com with SMTP; 6 Nov 2012 09:08:32 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:10:26 +0000 Message-Id: <5098E19D02000078000A697A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 09:08:29 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, Tim Deegan , xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 18:15, Keir Fraser wrote: > On 05/11/2012 16:53, "Jan Beulich" wrote: > >> Under the assumption that in these cases recurring faults aren't a >> security issue and it can be expected that the drivers there are going >> to try to take care of the problem. >> >> Signed-off-by: Jan Beulich > > Solving an observed problem? In the context of analyzing the situation described in "iommu=dom0-passthrough behavior" (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) I suppressed the IOMMU setup for some device in Dom0, and was quite puzzled to find that only a single fault would occur. The BM disabling is definitely a potential problem for devices Xen itself is making use of, and I view it as wrong for Dom0 too (it ought to be given a chance to recover - the failure mode of the driver for the disabled device differs quite significantly before and after this patch). With the change at hand, a next step (depending on the outcome of above inquiry to the IOMMU folks) might then be to insert an artificial device to overcome the IOMMU faults. This obviously should only be done for Xen or Dom0 used devices, i.e. could build on top of the special casing here. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:44:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:44:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfhg-0004Vy-Nb; Tue, 06 Nov 2012 09:44:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfhf-0004Vt-Mf for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:44:15 +0000 Received: from [85.158.143.99:23693] by server-3.bemta-4.messagelabs.com id BA/75-06841-EEBD8905; Tue, 06 Nov 2012 09:44:14 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352195054!28461453!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6894 invoked from network); 6 Nov 2012 09:44:14 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 09:44:14 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:44:13 +0000 Message-Id: <5098E9FC02000078000A69A7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 09:44:12 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> In-Reply-To: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: > Does it make sense to have a runtime option that unsets the > physical limit but disallows legacy PV guests? If this > defaults to false for machines with RAM<=5TB but to true > for machines with RAM>5TB, then the feature is "done" > (AND we have put a stake in the ground to begin the > slow obsolescence of PV functionality). That would be interesting: Mukesh's PVH code wasn't even posted yet, i.e. you're proposing to render systems with more than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 kernel runnable in that environment). But yes, the plan is to extend the 1:1 mapping beyond 5Tb for non-PV guests, and going through actual mapping code only when acting in the context of a (64-bit) PV guest (even 32-bit PV guests can have the full 1:1 mapping). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:44:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:44:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfhg-0004Vy-Nb; Tue, 06 Nov 2012 09:44:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfhf-0004Vt-Mf for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:44:15 +0000 Received: from [85.158.143.99:23693] by server-3.bemta-4.messagelabs.com id BA/75-06841-EEBD8905; Tue, 06 Nov 2012 09:44:14 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352195054!28461453!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6894 invoked from network); 6 Nov 2012 09:44:14 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 09:44:14 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 09:44:13 +0000 Message-Id: <5098E9FC02000078000A69A7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 09:44:12 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> In-Reply-To: <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: > Does it make sense to have a runtime option that unsets the > physical limit but disallows legacy PV guests? If this > defaults to false for machines with RAM<=5TB but to true > for machines with RAM>5TB, then the feature is "done" > (AND we have put a stake in the ground to begin the > slow obsolescence of PV functionality). That would be interesting: Mukesh's PVH code wasn't even posted yet, i.e. you're proposing to render systems with more than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 kernel runnable in that environment). But yes, the plan is to extend the 1:1 mapping beyond 5Tb for non-PV guests, and going through actual mapping code only when acting in the context of a (64-bit) PV guest (even 32-bit PV guests can have the full 1:1 mapping). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:45:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfiX-0004Ye-5i; Tue, 06 Nov 2012 09:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfiV-0004YX-Qc for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:45:07 +0000 Received: from [85.158.137.99:53424] by server-15.bemta-3.messagelabs.com id 6B/95-09445-E1CD8905; Tue, 06 Nov 2012 09:45:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-5.tower-217.messagelabs.com!1352195101!13173815!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6053 invoked from network); 6 Nov 2012 09:45:02 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 09:45:02 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVfiK-000C2U-TF; Tue, 06 Nov 2012 09:44:56 +0000 Date: Tue, 6 Nov 2012 09:44:56 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121106094456.GA45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <5098E19D02000078000A697A@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 09:08 +0000 on 06 Nov (1352192909), Jan Beulich wrote: > >>> On 05.11.12 at 18:15, Keir Fraser wrote: > > On 05/11/2012 16:53, "Jan Beulich" wrote: > > > >> Under the assumption that in these cases recurring faults aren't a > >> security issue and it can be expected that the drivers there are going > >> to try to take care of the problem. > >> > >> Signed-off-by: Jan Beulich > > > > Solving an observed problem? > > In the context of analyzing the situation described in > "iommu=dom0-passthrough behavior" > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > I suppressed the IOMMU setup for some device in Dom0, and > was quite puzzled to find that only a single fault would occur. I think it would be better to allow some small number of faults per device before disabling it rather than give dom0 carte blanche. This check is really there to stop a mad device from hosing the system rather than to contain a malicious OS, and a properly out-of-control device needs to be stopped or it will livelock Xen with iommu faults. In a uniprocessor system, dom0 might never get the chance to fix it. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 09:45:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 09:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfiX-0004Ye-5i; Tue, 06 Nov 2012 09:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVfiV-0004YX-Qc for xen-devel@lists.xen.org; Tue, 06 Nov 2012 09:45:07 +0000 Received: from [85.158.137.99:53424] by server-15.bemta-3.messagelabs.com id 6B/95-09445-E1CD8905; Tue, 06 Nov 2012 09:45:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-5.tower-217.messagelabs.com!1352195101!13173815!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6053 invoked from network); 6 Nov 2012 09:45:02 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 09:45:02 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVfiK-000C2U-TF; Tue, 06 Nov 2012 09:44:56 +0000 Date: Tue, 6 Nov 2012 09:44:56 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121106094456.GA45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <5098E19D02000078000A697A@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 09:08 +0000 on 06 Nov (1352192909), Jan Beulich wrote: > >>> On 05.11.12 at 18:15, Keir Fraser wrote: > > On 05/11/2012 16:53, "Jan Beulich" wrote: > > > >> Under the assumption that in these cases recurring faults aren't a > >> security issue and it can be expected that the drivers there are going > >> to try to take care of the problem. > >> > >> Signed-off-by: Jan Beulich > > > > Solving an observed problem? > > In the context of analyzing the situation described in > "iommu=dom0-passthrough behavior" > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > I suppressed the IOMMU setup for some device in Dom0, and > was quite puzzled to find that only a single fault would occur. I think it would be better to allow some small number of faults per device before disabling it rather than give dom0 carte blanche. This check is really there to stop a mad device from hosing the system rather than to contain a malicious OS, and a properly out-of-control device needs to be stopped or it will livelock Xen with iommu faults. In a uniprocessor system, dom0 might never get the chance to fix it. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:22:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgIa-00052Y-OG; Tue, 06 Nov 2012 10:22:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgIZ-00052T-JT for xen-devel@lists.xen.org; Tue, 06 Nov 2012 10:22:23 +0000 Received: from [85.158.143.35:59332] by server-2.bemta-4.messagelabs.com id 48/E4-28922-ED4E8905; Tue, 06 Nov 2012 10:22:22 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352197151!14832689!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3935 invoked from network); 6 Nov 2012 10:19:11 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-21.messagelabs.com with SMTP; 6 Nov 2012 10:19:11 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 10:19:10 +0000 Message-Id: <5098F22C02000078000A69E2@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 10:19:08 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 10:44, Tim Deegan wrote: > At 09:08 +0000 on 06 Nov (1352192909), Jan Beulich wrote: >> >>> On 05.11.12 at 18:15, Keir Fraser wrote: >> > On 05/11/2012 16:53, "Jan Beulich" wrote: >> > >> >> Under the assumption that in these cases recurring faults aren't a >> >> security issue and it can be expected that the drivers there are going >> >> to try to take care of the problem. >> >> >> >> Signed-off-by: Jan Beulich >> > >> > Solving an observed problem? >> >> In the context of analyzing the situation described in >> "iommu=dom0-passthrough behavior" >> (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> I suppressed the IOMMU setup for some device in Dom0, and >> was quite puzzled to find that only a single fault would occur. > > I think it would be better to allow some small number of faults per > device before disabling it rather than give dom0 carte blanche. > > This check is really there to stop a mad device from hosing the system > rather than to contain a malicious OS, and a properly out-of-control > device needs to be stopped or it will livelock Xen with iommu faults. > In a uniprocessor system, dom0 might never get the chance to fix it. If that's the main goal, then on the AMD side the code may not do what you want it to: PPR log entries, causing interrupts too, don't get limited/suppressed in any way, yet are obviously to some extent under guest control. But yes, for the purpose here limiting the fault rate in some way (with a slightly higher limit for Dom0 than DomU-s) would indeed be the better route. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:22:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgIa-00052Y-OG; Tue, 06 Nov 2012 10:22:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgIZ-00052T-JT for xen-devel@lists.xen.org; Tue, 06 Nov 2012 10:22:23 +0000 Received: from [85.158.143.35:59332] by server-2.bemta-4.messagelabs.com id 48/E4-28922-ED4E8905; Tue, 06 Nov 2012 10:22:22 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352197151!14832689!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3935 invoked from network); 6 Nov 2012 10:19:11 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-21.messagelabs.com with SMTP; 6 Nov 2012 10:19:11 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 10:19:10 +0000 Message-Id: <5098F22C02000078000A69E2@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 10:19:08 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 10:44, Tim Deegan wrote: > At 09:08 +0000 on 06 Nov (1352192909), Jan Beulich wrote: >> >>> On 05.11.12 at 18:15, Keir Fraser wrote: >> > On 05/11/2012 16:53, "Jan Beulich" wrote: >> > >> >> Under the assumption that in these cases recurring faults aren't a >> >> security issue and it can be expected that the drivers there are going >> >> to try to take care of the problem. >> >> >> >> Signed-off-by: Jan Beulich >> > >> > Solving an observed problem? >> >> In the context of analyzing the situation described in >> "iommu=dom0-passthrough behavior" >> (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> I suppressed the IOMMU setup for some device in Dom0, and >> was quite puzzled to find that only a single fault would occur. > > I think it would be better to allow some small number of faults per > device before disabling it rather than give dom0 carte blanche. > > This check is really there to stop a mad device from hosing the system > rather than to contain a malicious OS, and a properly out-of-control > device needs to be stopped or it will livelock Xen with iommu faults. > In a uniprocessor system, dom0 might never get the chance to fix it. If that's the main goal, then on the AMD side the code may not do what you want it to: PPR log entries, causing interrupts too, don't get limited/suppressed in any way, yet are obviously to some extent under guest control. But yes, for the purpose here limiting the fault rate in some way (with a slightly higher limit for Dom0 than DomU-s) would indeed be the better route. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:30:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgPr-0005Bi-KY; Tue, 06 Nov 2012 10:29:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVeCz-0003Wo-V5 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 08:08:30 +0000 Received: from [85.158.137.99:22452] by server-16.bemta-3.messagelabs.com id 57/73-07461-875C8905; Tue, 06 Nov 2012 08:08:24 +0000 X-Env-Sender: qiumojiong@gmail.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352189301!12836005!1 X-Originating-IP: [209.85.210.43] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6509 invoked from network); 6 Nov 2012 08:08:23 -0000 Received: from mail-da0-f43.google.com (HELO mail-da0-f43.google.com) (209.85.210.43) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 08:08:23 -0000 Received: by mail-da0-f43.google.com with SMTP id u36so91759dak.30 for ; Tue, 06 Nov 2012 00:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=RIvVhEaHh8hDwAX84wCQsrxXTxVNv9Z44jyO0dJEDTo=; b=YdZjE1granE8S/4olSy/X+mhqIdg37YCX2tLEO/8C3bnxGaRw1JoIjw+koYDYo0LNG 5l/7sfNCjjfmow+9D05a9YOnWGDIy/srG1OszoD+g0endAaVCdXZ7pSwMMUobbO6k1mC TlHENr2Bv6zgNVaCgCEitx5bNiTvE8wtJtqIyPMO855aiWWgtOK7Z7nlgbkwSMafd7e+ f1Gn7xKbLlimcZc3DFiZaT6zLLcDuZMwfrXu3UHsKNQn2tmzTwbxUYu48+5zEG7Nnroo +CvECaFEjRLxH+KcteMmRJRn4hi6ccjzafEnBRX+yHL8CaONQmI/JA4QaKRy87+pLBt5 UcXA== Received: by 10.68.240.36 with SMTP id vx4mr1033342pbc.90.1352189301008; Tue, 06 Nov 2012 00:08:21 -0800 (PST) Received: from localhost.localdomain ([61.135.172.68]) by mx.google.com with ESMTPS id pu4sm4886515pbb.72.2012.11.06.00.08.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 00:08:20 -0800 (PST) From: Mojiong Qiu To: linux-kernel@vger.kernel.org Date: Tue, 6 Nov 2012 16:08:15 +0800 Message-Id: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Mailman-Approved-At: Tue, 06 Nov 2012 10:29:54 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , Mojiong Qiu , Mojiong Qiu , virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org exit_idle() should be called after irq_enter(), otherwise it throws: [ 2.513020] [ INFO: suspicious RCU usage. ] [ 2.513076] 3.6.5 #1 Not tainted [ 2.513128] ------------------------------- [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! [ 2.513271] [ 2.513271] other info that might help us debug this: [ 2.513271] [ 2.513388] [ 2.513388] RCU used illegally from idle CPU! [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 [ 2.513511] RCU used illegally from extended quiescent state! [ 2.513572] 1 lock held by swapper/0/0: [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 [ 2.513815] [ 2.513815] stack backtrace: [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 [ 2.513954] Call Trace: [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 [ 2.514381] [] exit_idle+0x43/0x50 [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 [ 2.514722] [] ? xen_safe_halt+0x10/0x20 [ 2.514782] [] ? default_idle+0xba/0x570 [ 2.514841] [] ? cpu_idle+0xdf/0x140 [ 2.514900] [] ? rest_init+0x135/0x144 [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c [ 2.515022] [] ? start_kernel+0x3db/0x3e8 [ 2.515081] [] ? repair_env_string+0x5a/0x5a [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 [ 2.515202] [] ? xen_start_kernel+0x465/0x46 Signed-off-by: Mojiong Qiu Cc: Konrad Rzeszutek Wilk Cc: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com Cc: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Cc: stable@kernel.org (at least to 3.0.y) --- drivers/xen/events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 912ac81..0be4df3 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs(regs); + irq_enter(); #ifdef CONFIG_X86 exit_idle(); #endif - irq_enter(); __xen_evtchn_do_upcall(); -- 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:30:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:30:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgPr-0005Bi-KY; Tue, 06 Nov 2012 10:29:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVeCz-0003Wo-V5 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 08:08:30 +0000 Received: from [85.158.137.99:22452] by server-16.bemta-3.messagelabs.com id 57/73-07461-875C8905; Tue, 06 Nov 2012 08:08:24 +0000 X-Env-Sender: qiumojiong@gmail.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352189301!12836005!1 X-Originating-IP: [209.85.210.43] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6509 invoked from network); 6 Nov 2012 08:08:23 -0000 Received: from mail-da0-f43.google.com (HELO mail-da0-f43.google.com) (209.85.210.43) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 08:08:23 -0000 Received: by mail-da0-f43.google.com with SMTP id u36so91759dak.30 for ; Tue, 06 Nov 2012 00:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=RIvVhEaHh8hDwAX84wCQsrxXTxVNv9Z44jyO0dJEDTo=; b=YdZjE1granE8S/4olSy/X+mhqIdg37YCX2tLEO/8C3bnxGaRw1JoIjw+koYDYo0LNG 5l/7sfNCjjfmow+9D05a9YOnWGDIy/srG1OszoD+g0endAaVCdXZ7pSwMMUobbO6k1mC TlHENr2Bv6zgNVaCgCEitx5bNiTvE8wtJtqIyPMO855aiWWgtOK7Z7nlgbkwSMafd7e+ f1Gn7xKbLlimcZc3DFiZaT6zLLcDuZMwfrXu3UHsKNQn2tmzTwbxUYu48+5zEG7Nnroo +CvECaFEjRLxH+KcteMmRJRn4hi6ccjzafEnBRX+yHL8CaONQmI/JA4QaKRy87+pLBt5 UcXA== Received: by 10.68.240.36 with SMTP id vx4mr1033342pbc.90.1352189301008; Tue, 06 Nov 2012 00:08:21 -0800 (PST) Received: from localhost.localdomain ([61.135.172.68]) by mx.google.com with ESMTPS id pu4sm4886515pbb.72.2012.11.06.00.08.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Nov 2012 00:08:20 -0800 (PST) From: Mojiong Qiu To: linux-kernel@vger.kernel.org Date: Tue, 6 Nov 2012 16:08:15 +0800 Message-Id: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-Mailman-Approved-At: Tue, 06 Nov 2012 10:29:54 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Konrad Rzeszutek Wilk , Mojiong Qiu , Mojiong Qiu , virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org exit_idle() should be called after irq_enter(), otherwise it throws: [ 2.513020] [ INFO: suspicious RCU usage. ] [ 2.513076] 3.6.5 #1 Not tainted [ 2.513128] ------------------------------- [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! [ 2.513271] [ 2.513271] other info that might help us debug this: [ 2.513271] [ 2.513388] [ 2.513388] RCU used illegally from idle CPU! [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 [ 2.513511] RCU used illegally from extended quiescent state! [ 2.513572] 1 lock held by swapper/0/0: [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 [ 2.513815] [ 2.513815] stack backtrace: [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 [ 2.513954] Call Trace: [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 [ 2.514381] [] exit_idle+0x43/0x50 [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 [ 2.514722] [] ? xen_safe_halt+0x10/0x20 [ 2.514782] [] ? default_idle+0xba/0x570 [ 2.514841] [] ? cpu_idle+0xdf/0x140 [ 2.514900] [] ? rest_init+0x135/0x144 [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c [ 2.515022] [] ? start_kernel+0x3db/0x3e8 [ 2.515081] [] ? repair_env_string+0x5a/0x5a [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 [ 2.515202] [] ? xen_start_kernel+0x465/0x46 Signed-off-by: Mojiong Qiu Cc: Konrad Rzeszutek Wilk Cc: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com Cc: virtualization@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org Cc: stable@kernel.org (at least to 3.0.y) --- drivers/xen/events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 912ac81..0be4df3 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs(regs); + irq_enter(); #ifdef CONFIG_X86 exit_idle(); #endif - irq_enter(); __xen_evtchn_do_upcall(); -- 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:49:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:49:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgiV-0005Rn-QL; Tue, 06 Nov 2012 10:49:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgiU-0005Ri-7p for xen-devel@lists.xen.org; Tue, 06 Nov 2012 10:49:10 +0000 Received: from [85.158.143.99:47523] by server-3.bemta-4.messagelabs.com id 43/24-06841-52BE8905; Tue, 06 Nov 2012 10:49:09 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352198949!28473598!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16325 invoked from network); 6 Nov 2012 10:49:09 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 10:49:09 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 10:49:08 +0000 Message-Id: <5098F93202000078000A6A14@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 10:49:06 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Tim Deegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , ZhigangWang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 23:33, Dan Magenheimer wrote: > For address-width limits, I suspect we are talking mostly or > entirely about DMA in 32-bit PV domains? And/or PCI-passthrough? > I'll look into it further, but if those are the principal cases, > I'd have no problem documenting that the claim hypercall doesn't > handle them and attempts to build such a domain might still > fail slowly. At least unless/until someone decided to add > any necessary special corner cases to the claim hypercall. DMA (also for 64-bit PV) is one aspect, and the fundamental address restriction of 32-bit guests is the perhaps more important one (for they can't access the full M2P map, and hence can't ever be handed pages not covered by the portion they have access to). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 10:49:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 10:49:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgiV-0005Rn-QL; Tue, 06 Nov 2012 10:49:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVgiU-0005Ri-7p for xen-devel@lists.xen.org; Tue, 06 Nov 2012 10:49:10 +0000 Received: from [85.158.143.99:47523] by server-3.bemta-4.messagelabs.com id 43/24-06841-52BE8905; Tue, 06 Nov 2012 10:49:09 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352198949!28473598!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16325 invoked from network); 6 Nov 2012 10:49:09 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 10:49:09 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 10:49:08 +0000 Message-Id: <5098F93202000078000A6A14@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 10:49:06 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Tim Deegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , ZhigangWang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 05.11.12 at 23:33, Dan Magenheimer wrote: > For address-width limits, I suspect we are talking mostly or > entirely about DMA in 32-bit PV domains? And/or PCI-passthrough? > I'll look into it further, but if those are the principal cases, > I'd have no problem documenting that the claim hypercall doesn't > handle them and attempts to build such a domain might still > fail slowly. At least unless/until someone decided to add > any necessary special corner cases to the claim hypercall. DMA (also for 64-bit PV) is one aspect, and the fundamental address restriction of 32-bit guests is the perhaps more important one (for they can't access the full M2P map, and hence can't ever be handed pages not covered by the portion they have access to). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 12:07:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:07:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhwD-0005zt-Nf; Tue, 06 Nov 2012 12:07:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhwC-0005zo-7o for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:07:24 +0000 Received: from [85.158.143.99:48580] by server-3.bemta-4.messagelabs.com id 58/71-06841-A7DF8905; Tue, 06 Nov 2012 12:07:22 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352203622!23539135!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12499 invoked from network); 6 Nov 2012 12:07:02 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 12:07:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15608811" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 12:06:35 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 12:06:34 +0000 Message-ID: <1352203585.505.5.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Tue, 6 Nov 2012 13:06:25 +0100 In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Jan Beulich , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7679863783174260802==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7679863783174260802== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-EKNA1l+QEyhzJYFv4W33" --=-EKNA1l+QEyhzJYFv4W33 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: > > In the context of analyzing the situation described in > > "iommu=3Ddom0-passthrough behavior" > > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > > I suppressed the IOMMU setup for some device in Dom0, and > > was quite puzzled to find that only a single fault would occur. >=20 > I think it would be better to allow some small number of faults per > device before disabling it rather than give dom0 carte blanche. >=20 > This check is really there to stop a mad device from hosing the system > rather than to contain a malicious OS, and a properly out-of-control > device needs to be stopped or it will livelock Xen with iommu faults. > In a uniprocessor system, dom0 might never get the chance to fix it. >=20 Right. But moving the fault handling code to softirq should have already helped solving/mitigating that, hasn't it? When implementing and testing that, I wasn't able to reproduce any livelock situation (although I can't exclude that to be at least partly due to my inexperience, especially at the time, with I/O virtualization)... Jan, have you (after killing the 'disable bus-mastering part' of course)? Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-EKNA1l+QEyhzJYFv4W33 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCY/UEACgkQk4XaBE3IOsQ1pQCbBluNzWKjNzntGZ4CPCFLt4mR iC4AniTNi3OIBScljLAnzZH7ymkHRJRh =v2EJ -----END PGP SIGNATURE----- --=-EKNA1l+QEyhzJYFv4W33-- --===============7679863783174260802== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7679863783174260802==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 12:07:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:07:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhwD-0005zt-Nf; Tue, 06 Nov 2012 12:07:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhwC-0005zo-7o for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:07:24 +0000 Received: from [85.158.143.99:48580] by server-3.bemta-4.messagelabs.com id 58/71-06841-A7DF8905; Tue, 06 Nov 2012 12:07:22 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352203622!23539135!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12499 invoked from network); 6 Nov 2012 12:07:02 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 12:07:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15608811" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 12:06:35 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 12:06:34 +0000 Message-ID: <1352203585.505.5.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Tue, 6 Nov 2012 13:06:25 +0100 In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Jan Beulich , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7679863783174260802==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7679863783174260802== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-EKNA1l+QEyhzJYFv4W33" --=-EKNA1l+QEyhzJYFv4W33 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: > > In the context of analyzing the situation described in > > "iommu=3Ddom0-passthrough behavior" > > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > > I suppressed the IOMMU setup for some device in Dom0, and > > was quite puzzled to find that only a single fault would occur. >=20 > I think it would be better to allow some small number of faults per > device before disabling it rather than give dom0 carte blanche. >=20 > This check is really there to stop a mad device from hosing the system > rather than to contain a malicious OS, and a properly out-of-control > device needs to be stopped or it will livelock Xen with iommu faults. > In a uniprocessor system, dom0 might never get the chance to fix it. >=20 Right. But moving the fault handling code to softirq should have already helped solving/mitigating that, hasn't it? When implementing and testing that, I wasn't able to reproduce any livelock situation (although I can't exclude that to be at least partly due to my inexperience, especially at the time, with I/O virtualization)... Jan, have you (after killing the 'disable bus-mastering part' of course)? Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-EKNA1l+QEyhzJYFv4W33 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCY/UEACgkQk4XaBE3IOsQ1pQCbBluNzWKjNzntGZ4CPCFLt4mR iC4AniTNi3OIBScljLAnzZH7ymkHRJRh =v2EJ -----END PGP SIGNATURE----- --=-EKNA1l+QEyhzJYFv4W33-- --===============7679863783174260802== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7679863783174260802==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 12:09:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:09:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhxw-00064U-7f; Tue, 06 Nov 2012 12:09:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhxu-00064N-QV for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:09:11 +0000 Received: from [85.158.139.83:9666] by server-7.bemta-5.messagelabs.com id E9/A6-23096-6EDF8905; Tue, 06 Nov 2012 12:09:10 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352203729!28441876!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11676 invoked from network); 6 Nov 2012 12:08:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 12:08:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15608858" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 12:08:49 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 12:08:48 +0000 Message-ID: <1352203727.505.7.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 13:08:47 +0100 In-Reply-To: <5098F22C02000078000A69E2@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <5098F22C02000078000A69E2@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4758811756323479261==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4758811756323479261== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-qjCvdL3sFjS0q5TwGI2f" --=-qjCvdL3sFjS0q5TwGI2f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 10:19 +0000, Jan Beulich wrote: > > This check is really there to stop a mad device from hosing the system > > rather than to contain a malicious OS, and a properly out-of-control > > device needs to be stopped or it will livelock Xen with iommu faults. > > In a uniprocessor system, dom0 might never get the chance to fix it. >=20 > If that's the main goal, then on the AMD side the code may not do > what you want it to: PPR log entries, causing interrupts too, don't > get limited/suppressed in any way, yet are obviously to some > extent under guest control. >=20 IIRC, PPR are dealt with in softirq context too, aren't they? > But yes, for the purpose here limiting the fault rate in some way > (with a slightly higher limit for Dom0 than DomU-s) would indeed > be the better route. >=20 BTW, yes, independently from the above and for what it counts, I agree with this. Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-qjCvdL3sFjS0q5TwGI2f Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEUEABECAAYFAlCY/c8ACgkQk4XaBE3IOsRRxQCfZPl9HnbbA1dM660HuWLHh5FC 33gAmMDPlzzFkl53B0Q3VOnJk6roRc0= =b/A1 -----END PGP SIGNATURE----- --=-qjCvdL3sFjS0q5TwGI2f-- --===============4758811756323479261== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4758811756323479261==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 12:09:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:09:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhxw-00064U-7f; Tue, 06 Nov 2012 12:09:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVhxu-00064N-QV for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:09:11 +0000 Received: from [85.158.139.83:9666] by server-7.bemta-5.messagelabs.com id E9/A6-23096-6EDF8905; Tue, 06 Nov 2012 12:09:10 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352203729!28441876!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11676 invoked from network); 6 Nov 2012 12:08:50 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 12:08:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15608858" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 12:08:49 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 12:08:48 +0000 Message-ID: <1352203727.505.7.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 13:08:47 +0100 In-Reply-To: <5098F22C02000078000A69E2@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <5098F22C02000078000A69E2@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4758811756323479261==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4758811756323479261== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-qjCvdL3sFjS0q5TwGI2f" --=-qjCvdL3sFjS0q5TwGI2f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 10:19 +0000, Jan Beulich wrote: > > This check is really there to stop a mad device from hosing the system > > rather than to contain a malicious OS, and a properly out-of-control > > device needs to be stopped or it will livelock Xen with iommu faults. > > In a uniprocessor system, dom0 might never get the chance to fix it. >=20 > If that's the main goal, then on the AMD side the code may not do > what you want it to: PPR log entries, causing interrupts too, don't > get limited/suppressed in any way, yet are obviously to some > extent under guest control. >=20 IIRC, PPR are dealt with in softirq context too, aren't they? > But yes, for the purpose here limiting the fault rate in some way > (with a slightly higher limit for Dom0 than DomU-s) would indeed > be the better route. >=20 BTW, yes, independently from the above and for what it counts, I agree with this. Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-qjCvdL3sFjS0q5TwGI2f Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEUEABECAAYFAlCY/c8ACgkQk4XaBE3IOsRRxQCfZPl9HnbbA1dM660HuWLHh5FC 33gAmMDPlzzFkl53B0Q3VOnJk6roRc0= =b/A1 -----END PGP SIGNATURE----- --=-qjCvdL3sFjS0q5TwGI2f-- --===============4758811756323479261== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4758811756323479261==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 12:39:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:39:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TViQV-0006LZ-Og; Tue, 06 Nov 2012 12:38:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TViQU-0006LU-AA for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:38:42 +0000 Received: from [85.158.139.211:61927] by server-10.bemta-5.messagelabs.com id 24/2F-09257-1D409905; Tue, 06 Nov 2012 12:38:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352205520!19133384!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23623 invoked from network); 6 Nov 2012 12:38:41 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-206.messagelabs.com with SMTP; 6 Nov 2012 12:38:41 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 12:38:39 +0000 Message-Id: <509912DE02000078000A6A9F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 12:38:38 +0000 From: "Jan Beulich" To: "Dario Faggioli" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <5098F22C02000078000A69E2@nat28.tlf.novell.com> <1352203727.505.7.camel@Solace> In-Reply-To: <1352203727.505.7.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 13:08, Dario Faggioli wrote: > On Tue, 2012-11-06 at 10:19 +0000, Jan Beulich wrote: >> > This check is really there to stop a mad device from hosing the system >> > rather than to contain a malicious OS, and a properly out-of-control >> > device needs to be stopped or it will livelock Xen with iommu faults. >> > In a uniprocessor system, dom0 might never get the chance to fix it. >> >> If that's the main goal, then on the AMD side the code may not do >> what you want it to: PPR log entries, causing interrupts too, don't >> get limited/suppressed in any way, yet are obviously to some >> extent under guest control. >> > IIRC, PPR are dealt with in softirq context too, aren't they? They are, but that only means Xen stays alive. Dom0 might still not get a chance to run if there's a flood of them. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 12:39:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:39:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TViQV-0006LZ-Og; Tue, 06 Nov 2012 12:38:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TViQU-0006LU-AA for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:38:42 +0000 Received: from [85.158.139.211:61927] by server-10.bemta-5.messagelabs.com id 24/2F-09257-1D409905; Tue, 06 Nov 2012 12:38:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352205520!19133384!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23623 invoked from network); 6 Nov 2012 12:38:41 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-206.messagelabs.com with SMTP; 6 Nov 2012 12:38:41 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 12:38:39 +0000 Message-Id: <509912DE02000078000A6A9F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 12:38:38 +0000 From: "Jan Beulich" To: "Dario Faggioli" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <5098F22C02000078000A69E2@nat28.tlf.novell.com> <1352203727.505.7.camel@Solace> In-Reply-To: <1352203727.505.7.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 13:08, Dario Faggioli wrote: > On Tue, 2012-11-06 at 10:19 +0000, Jan Beulich wrote: >> > This check is really there to stop a mad device from hosing the system >> > rather than to contain a malicious OS, and a properly out-of-control >> > device needs to be stopped or it will livelock Xen with iommu faults. >> > In a uniprocessor system, dom0 might never get the chance to fix it. >> >> If that's the main goal, then on the AMD side the code may not do >> what you want it to: PPR log entries, causing interrupts too, don't >> get limited/suppressed in any way, yet are obviously to some >> extent under guest control. >> > IIRC, PPR are dealt with in softirq context too, aren't they? They are, but that only means Xen stays alive. Dom0 might still not get a chance to run if there's a flood of them. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 12:51:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:51:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVice-0006Vd-0X; Tue, 06 Nov 2012 12:51:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVicc-0006VY-7b for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:51:14 +0000 Received: from [85.158.143.99:24476] by server-1.bemta-4.messagelabs.com id D9/FD-27934-1C709905; Tue, 06 Nov 2012 12:51:13 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352206272!28493991!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19686 invoked from network); 6 Nov 2012 12:51:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 12:51:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 12:51:11 +0000 Message-Id: <509915CD02000078000A6ABF@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 12:51:09 +0000 From: "Jan Beulich" To: "Dario Faggioli" , "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> In-Reply-To: <1352203585.505.5.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, Keir Fraser , weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 13:06, Dario Faggioli wrote: > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: >> > In the context of analyzing the situation described in >> > "iommu=dom0-passthrough behavior" >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> > I suppressed the IOMMU setup for some device in Dom0, and >> > was quite puzzled to find that only a single fault would occur. >> >> I think it would be better to allow some small number of faults per >> device before disabling it rather than give dom0 carte blanche. >> >> This check is really there to stop a mad device from hosing the system >> rather than to contain a malicious OS, and a properly out-of-control >> device needs to be stopped or it will livelock Xen with iommu faults. >> In a uniprocessor system, dom0 might never get the chance to fix it. >> > Right. But moving the fault handling code to softirq should have already > helped solving/mitigating that, hasn't it? It helps keeping Xen alive, but doesn't for any specific domain (including Dom0). > When implementing and testing that, I wasn't able to reproduce any > livelock situation (although I can't exclude that to be at least partly > due to my inexperience, especially at the time, with I/O > virtualization)... Jan, have you (after killing the 'disable > bus-mastering part' of course)? No, I haven't - you'd have to have a device that doesn't stop I/O after a finite amount was done (or program one that way, e.g. by handing it a cyclic list of SG descriptors or alike). Wasn't it at your (Citrix) end that the problem was actually observed/reported? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 12:51:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 12:51:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVice-0006Vd-0X; Tue, 06 Nov 2012 12:51:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVicc-0006VY-7b for xen-devel@lists.xen.org; Tue, 06 Nov 2012 12:51:14 +0000 Received: from [85.158.143.99:24476] by server-1.bemta-4.messagelabs.com id D9/FD-27934-1C709905; Tue, 06 Nov 2012 12:51:13 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352206272!28493991!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19686 invoked from network); 6 Nov 2012 12:51:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-216.messagelabs.com with SMTP; 6 Nov 2012 12:51:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 12:51:11 +0000 Message-Id: <509915CD02000078000A6ABF@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 12:51:09 +0000 From: "Jan Beulich" To: "Dario Faggioli" , "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> In-Reply-To: <1352203585.505.5.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline Cc: wei.huang2@amd.com, Keir Fraser , weiwang.dd@gmail.com, xiantao.zhang@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 13:06, Dario Faggioli wrote: > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: >> > In the context of analyzing the situation described in >> > "iommu=dom0-passthrough behavior" >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> > I suppressed the IOMMU setup for some device in Dom0, and >> > was quite puzzled to find that only a single fault would occur. >> >> I think it would be better to allow some small number of faults per >> device before disabling it rather than give dom0 carte blanche. >> >> This check is really there to stop a mad device from hosing the system >> rather than to contain a malicious OS, and a properly out-of-control >> device needs to be stopped or it will livelock Xen with iommu faults. >> In a uniprocessor system, dom0 might never get the chance to fix it. >> > Right. But moving the fault handling code to softirq should have already > helped solving/mitigating that, hasn't it? It helps keeping Xen alive, but doesn't for any specific domain (including Dom0). > When implementing and testing that, I wasn't able to reproduce any > livelock situation (although I can't exclude that to be at least partly > due to my inexperience, especially at the time, with I/O > virtualization)... Jan, have you (after killing the 'disable > bus-mastering part' of course)? No, I haven't - you'd have to have a device that doesn't stop I/O after a finite amount was done (or program one that way, e.g. by handing it a cyclic list of SG descriptors or alike). Wasn't it at your (Citrix) end that the problem was actually observed/reported? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 13:26:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 13:26:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjA2-0006oC-10; Tue, 06 Nov 2012 13:25:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjA1-0006o7-2F for xen-devel@lists.xen.org; Tue, 06 Nov 2012 13:25:45 +0000 Received: from [85.158.137.99:11960] by server-6.bemta-3.messagelabs.com id 8F/60-28265-7DF09905; Tue, 06 Nov 2012 13:25:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352208342!12601360!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12961 invoked from network); 6 Nov 2012 13:25:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 13:25:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="213558230" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 13:25:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 08:25:41 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVj9w-0006QF-P1; Tue, 06 Nov 2012 13:25:40 +0000 Message-ID: <1352208219.12977.4.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Tue, 6 Nov 2012 14:23:39 +0100 In-Reply-To: <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 22:58 +0000, Dan Magenheimer wrote: > It's not necessary to choose the _optimal_ fit, only a probable one. I think this is the key point which I was missing i.e. that it doesn't need to be a totally accurate answer. Without that piece it seemed to me that you must already have the more knowledgeable toolstack part which others have mentioned. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 13:26:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 13:26:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjA2-0006oC-10; Tue, 06 Nov 2012 13:25:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjA1-0006o7-2F for xen-devel@lists.xen.org; Tue, 06 Nov 2012 13:25:45 +0000 Received: from [85.158.137.99:11960] by server-6.bemta-3.messagelabs.com id 8F/60-28265-7DF09905; Tue, 06 Nov 2012 13:25:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352208342!12601360!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12961 invoked from network); 6 Nov 2012 13:25:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 13:25:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="213558230" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 13:25:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 08:25:41 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVj9w-0006QF-P1; Tue, 06 Nov 2012 13:25:40 +0000 Message-ID: <1352208219.12977.4.camel@hastur.hellion.org.uk> From: Ian Campbell To: Dan Magenheimer Date: Tue, 6 Nov 2012 14:23:39 +0100 In-Reply-To: <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <20121104203532.GA11377@ocelot.phlegethon.org> <26f55aab-7523-4681-9a61-a5e5740d43a9@default> <1352111399.25014.101.camel@hastur.hellion.org.uk> <5517445d-ed2e-4592-9a2b-98fc612f1ae8@default> <1352154288.7253.25.camel@hastur.hellion.org.uk> <8bec0df2-cf4b-4dcf-bbb8-121357a29d52@default> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "Keir \(Xen.org\)" , Konrad Wilk , George Dunlap , Ian Jackson , "Tim \(Xen.org\)" , "xen-devel@lists.xen.org" , George Shuklin , DarioFaggioli , Jan Beulich , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-05 at 22:58 +0000, Dan Magenheimer wrote: > It's not necessary to choose the _optimal_ fit, only a probable one. I think this is the key point which I was missing i.e. that it doesn't need to be a totally accurate answer. Without that piece it seemed to me that you must already have the more knowledgeable toolstack part which others have mentioned. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 13:59:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 13:59:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjgd-00070Y-O6; Tue, 06 Nov 2012 13:59:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjgc-00070T-8m for xen-devel@lists.xen.org; Tue, 06 Nov 2012 13:59:26 +0000 Received: from [85.158.143.35:6277] by server-1.bemta-4.messagelabs.com id 67/A4-27934-DB719905; Tue, 06 Nov 2012 13:59:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1352210331!15973013!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13805 invoked from network); 6 Nov 2012 13:58:51 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 13:58:51 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVjfu-000Cfy-Qd; Tue, 06 Nov 2012 13:58:42 +0000 Date: Tue, 6 Nov 2012 13:58:42 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121106135842.GB45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509915CD02000078000A6ABF@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , Dario Faggioli , wei.huang2@amd.com, xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:51 +0000 on 06 Nov (1352206269), Jan Beulich wrote: > >>> On 06.11.12 at 13:06, Dario Faggioli wrote: > > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: > >> > In the context of analyzing the situation described in > >> > "iommu=dom0-passthrough behavior" > >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > >> > I suppressed the IOMMU setup for some device in Dom0, and > >> > was quite puzzled to find that only a single fault would occur. > >> > >> I think it would be better to allow some small number of faults per > >> device before disabling it rather than give dom0 carte blanche. > >> > >> This check is really there to stop a mad device from hosing the system > >> rather than to contain a malicious OS, and a properly out-of-control > >> device needs to be stopped or it will livelock Xen with iommu faults. > >> In a uniprocessor system, dom0 might never get the chance to fix it. > >> > > Right. But moving the fault handling code to softirq should have already > > helped solving/mitigating that, hasn't it? > > It helps keeping Xen alive, but doesn't for any specific domain > (including Dom0). Indeed. (Intel) IOMMU interrupts are suppressed until the softirq handler acknowledges the error, but if the softirq handler doesn't disable the device, it will take another IOMMU interrupt immediately. I thought the AMD side behaved eth same but clearly not -- I'll try to take a look at that later in the week. > > When implementing and testing that, I wasn't able to reproduce any > > livelock situation (although I can't exclude that to be at least partly > > due to my inexperience, especially at the time, with I/O > > virtualization)... Jan, have you (after killing the 'disable > > bus-mastering part' of course)? > > No, I haven't - you'd have to have a device that doesn't stop I/O > after a finite amount was done (or program one that way, e.g. by > handing it a cyclic list of SG descriptors or alike). Wasn't it at your > (Citrix) end that the problem was actually observed/reported? IIRC it was someone at Intel who reported it. I never saw it myself. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 13:59:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 13:59:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjgd-00070Y-O6; Tue, 06 Nov 2012 13:59:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjgc-00070T-8m for xen-devel@lists.xen.org; Tue, 06 Nov 2012 13:59:26 +0000 Received: from [85.158.143.35:6277] by server-1.bemta-4.messagelabs.com id 67/A4-27934-DB719905; Tue, 06 Nov 2012 13:59:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1352210331!15973013!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13805 invoked from network); 6 Nov 2012 13:58:51 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 13:58:51 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TVjfu-000Cfy-Qd; Tue, 06 Nov 2012 13:58:42 +0000 Date: Tue, 6 Nov 2012 13:58:42 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121106135842.GB45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509915CD02000078000A6ABF@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , Dario Faggioli , wei.huang2@amd.com, xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:51 +0000 on 06 Nov (1352206269), Jan Beulich wrote: > >>> On 06.11.12 at 13:06, Dario Faggioli wrote: > > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: > >> > In the context of analyzing the situation described in > >> > "iommu=dom0-passthrough behavior" > >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) > >> > I suppressed the IOMMU setup for some device in Dom0, and > >> > was quite puzzled to find that only a single fault would occur. > >> > >> I think it would be better to allow some small number of faults per > >> device before disabling it rather than give dom0 carte blanche. > >> > >> This check is really there to stop a mad device from hosing the system > >> rather than to contain a malicious OS, and a properly out-of-control > >> device needs to be stopped or it will livelock Xen with iommu faults. > >> In a uniprocessor system, dom0 might never get the chance to fix it. > >> > > Right. But moving the fault handling code to softirq should have already > > helped solving/mitigating that, hasn't it? > > It helps keeping Xen alive, but doesn't for any specific domain > (including Dom0). Indeed. (Intel) IOMMU interrupts are suppressed until the softirq handler acknowledges the error, but if the softirq handler doesn't disable the device, it will take another IOMMU interrupt immediately. I thought the AMD side behaved eth same but clearly not -- I'll try to take a look at that later in the week. > > When implementing and testing that, I wasn't able to reproduce any > > livelock situation (although I can't exclude that to be at least partly > > due to my inexperience, especially at the time, with I/O > > virtualization)... Jan, have you (after killing the 'disable > > bus-mastering part' of course)? > > No, I haven't - you'd have to have a device that doesn't stop I/O > after a finite amount was done (or program one that way, e.g. by > handing it a cyclic list of SG descriptors or alike). Wasn't it at your > (Citrix) end that the problem was actually observed/reported? IIRC it was someone at Intel who reported it. I never saw it myself. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:18:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:18:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjyf-0007Fe-GD; Tue, 06 Nov 2012 14:18:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjye-0007FZ-7M for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:18:04 +0000 Received: from [85.158.143.99:38613] by server-1.bemta-4.messagelabs.com id 04/54-27934-B1C19905; Tue, 06 Nov 2012 14:18:03 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352211477!28271308!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3992 invoked from network); 6 Nov 2012 14:17:57 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 6 Nov 2012 14:17:57 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 14:17:57 +0000 Message-Id: <50992A2302000078000A6B78@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 14:17:55 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> In-Reply-To: <20121106135842.GB45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , Dario Faggioli , wei.huang2@amd.com, xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 14:58, Tim Deegan wrote: > At 12:51 +0000 on 06 Nov (1352206269), Jan Beulich wrote: >> >>> On 06.11.12 at 13:06, Dario Faggioli wrote: >> > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: >> >> > In the context of analyzing the situation described in >> >> > "iommu=dom0-passthrough behavior" >> >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> >> > I suppressed the IOMMU setup for some device in Dom0, and >> >> > was quite puzzled to find that only a single fault would occur. >> >> >> >> I think it would be better to allow some small number of faults per >> >> device before disabling it rather than give dom0 carte blanche. >> >> >> >> This check is really there to stop a mad device from hosing the system >> >> rather than to contain a malicious OS, and a properly out-of-control >> >> device needs to be stopped or it will livelock Xen with iommu faults. >> >> In a uniprocessor system, dom0 might never get the chance to fix it. >> >> >> > Right. But moving the fault handling code to softirq should have already >> > helped solving/mitigating that, hasn't it? >> >> It helps keeping Xen alive, but doesn't for any specific domain >> (including Dom0). > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > handler acknowledges the error, but if the softirq handler doesn't > disable the device, it will take another IOMMU interrupt immediately. > I thought the AMD side behaved eth same but clearly not -- I'll try to > take a look at that later in the week. I don't think AMD's behaves much different, it's just that for the PPR case nothing is being done in that regard (and it's unclear whether or under what circumstances a high rate of these could occur). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:18:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:18:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjyf-0007Fe-GD; Tue, 06 Nov 2012 14:18:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjye-0007FZ-7M for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:18:04 +0000 Received: from [85.158.143.99:38613] by server-1.bemta-4.messagelabs.com id 04/54-27934-B1C19905; Tue, 06 Nov 2012 14:18:03 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352211477!28271308!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3992 invoked from network); 6 Nov 2012 14:17:57 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 6 Nov 2012 14:17:57 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 06 Nov 2012 14:17:57 +0000 Message-Id: <50992A2302000078000A6B78@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 06 Nov 2012 14:17:55 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> In-Reply-To: <20121106135842.GB45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , Dario Faggioli , wei.huang2@amd.com, xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 14:58, Tim Deegan wrote: > At 12:51 +0000 on 06 Nov (1352206269), Jan Beulich wrote: >> >>> On 06.11.12 at 13:06, Dario Faggioli wrote: >> > On Tue, 2012-11-06 at 09:44 +0000, Tim Deegan wrote: >> >> > In the context of analyzing the situation described in >> >> > "iommu=dom0-passthrough behavior" >> >> > (http://lists.xen.org/archives/html/xen-devel/2012-11/msg00140.html) >> >> > I suppressed the IOMMU setup for some device in Dom0, and >> >> > was quite puzzled to find that only a single fault would occur. >> >> >> >> I think it would be better to allow some small number of faults per >> >> device before disabling it rather than give dom0 carte blanche. >> >> >> >> This check is really there to stop a mad device from hosing the system >> >> rather than to contain a malicious OS, and a properly out-of-control >> >> device needs to be stopped or it will livelock Xen with iommu faults. >> >> In a uniprocessor system, dom0 might never get the chance to fix it. >> >> >> > Right. But moving the fault handling code to softirq should have already >> > helped solving/mitigating that, hasn't it? >> >> It helps keeping Xen alive, but doesn't for any specific domain >> (including Dom0). > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > handler acknowledges the error, but if the softirq handler doesn't > disable the device, it will take another IOMMU interrupt immediately. > I thought the AMD side behaved eth same but clearly not -- I'll try to > take a look at that later in the week. I don't think AMD's behaves much different, it's just that for the PPR case nothing is being done in that regard (and it's unclear whether or under what circumstances a high rate of these could occur). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:19:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:19:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjzN-0007IC-Tg; Tue, 06 Nov 2012 14:18:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjzL-0007Hy-W9 for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:18:48 +0000 Received: from [193.109.254.147:29396] by server-15.bemta-14.messagelabs.com id DE/B0-12105-74C19905; Tue, 06 Nov 2012 14:18:47 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352211422!9806039!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14440 invoked from network); 6 Nov 2012 14:17:03 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:17:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613165" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:17:02 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:17:01 +0000 Message-ID: <1352211410.2155.7.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Tue, 6 Nov 2012 15:16:50 +0100 In-Reply-To: <20121106135842.GB45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , xen-devel , Jan Beulich , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5543024278306713870==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============5543024278306713870== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-ToUauuo/eo9Qf+ripbpI" --=-ToUauuo/eo9Qf+ripbpI Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 13:58 +0000, Tim Deegan wrote: > > It helps keeping Xen alive, but doesn't for any specific domain > > (including Dom0). >=20 > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > handler acknowledges the error, but if the softirq handler doesn't > disable the device, it will take another IOMMU interrupt immediately. > Right. I wasn't considering the possibility of this 'back-to-back' variant of the thing. > I thought the AMD side behaved eth same but clearly not -- I'll try to > take a look at that later in the week. >=20 I think it does, or at least, I'm quite sure when I moved the fault handling code in softiq context, I did it so that behavior was consistent wrt both Intel and AMD (by explicitly silencing interrupts until within the tasklet), at least for faults. PPR came later and I moved them within the softirq as well after asking AMD people, without having the possibility to test that myself. So, to recap, feel free to check. Faults should behave as you're describing, PPR I'm not sure. :-) Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-ToUauuo/eo9Qf+ripbpI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZG9IACgkQk4XaBE3IOsTBagCgg35YIjm6u6e1OAFS6Q7GYB2e 3NoAnA66EpIC0C7UeFH/YD5RJsx2Ske6 =9kp6 -----END PGP SIGNATURE----- --=-ToUauuo/eo9Qf+ripbpI-- --===============5543024278306713870== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5543024278306713870==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:19:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:19:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjzN-0007IC-Tg; Tue, 06 Nov 2012 14:18:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVjzL-0007Hy-W9 for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:18:48 +0000 Received: from [193.109.254.147:29396] by server-15.bemta-14.messagelabs.com id DE/B0-12105-74C19905; Tue, 06 Nov 2012 14:18:47 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352211422!9806039!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14440 invoked from network); 6 Nov 2012 14:17:03 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:17:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613165" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:17:02 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:17:01 +0000 Message-ID: <1352211410.2155.7.camel@Solace> From: Dario Faggioli To: Tim Deegan Date: Tue, 6 Nov 2012 15:16:50 +0100 In-Reply-To: <20121106135842.GB45690@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , xen-devel , Jan Beulich , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5543024278306713870==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============5543024278306713870== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-ToUauuo/eo9Qf+ripbpI" --=-ToUauuo/eo9Qf+ripbpI Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 13:58 +0000, Tim Deegan wrote: > > It helps keeping Xen alive, but doesn't for any specific domain > > (including Dom0). >=20 > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > handler acknowledges the error, but if the softirq handler doesn't > disable the device, it will take another IOMMU interrupt immediately. > Right. I wasn't considering the possibility of this 'back-to-back' variant of the thing. > I thought the AMD side behaved eth same but clearly not -- I'll try to > take a look at that later in the week. >=20 I think it does, or at least, I'm quite sure when I moved the fault handling code in softiq context, I did it so that behavior was consistent wrt both Intel and AMD (by explicitly silencing interrupts until within the tasklet), at least for faults. PPR came later and I moved them within the softirq as well after asking AMD people, without having the possibility to test that myself. So, to recap, feel free to check. Faults should behave as you're describing, PPR I'm not sure. :-) Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-ToUauuo/eo9Qf+ripbpI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZG9IACgkQk4XaBE3IOsTBagCgg35YIjm6u6e1OAFS6Q7GYB2e 3NoAnA66EpIC0C7UeFH/YD5RJsx2Ske6 =9kp6 -----END PGP SIGNATURE----- --=-ToUauuo/eo9Qf+ripbpI-- --===============5543024278306713870== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5543024278306713870==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:21:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:21:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk1r-0007TE-P1; Tue, 06 Nov 2012 14:21:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk1q-0007Sy-Dc for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:21:22 +0000 Received: from [85.158.143.35:51321] by server-3.bemta-4.messagelabs.com id B1/59-06841-1EC19905; Tue, 06 Nov 2012 14:21:21 +0000 X-Env-Sender: lukas@laukamp.me X-Msg-Ref: server-3.tower-21.messagelabs.com!1352211570!14129751!1 X-Originating-IP: [5.9.218.245] X-SpamReason: No, hits=0.2 required=7.0 tests=RCVD_ILLEGAL_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29779 invoked from network); 6 Nov 2012 14:19:30 -0000 Received: from mailer0.lippux.de (HELO mailer0.lippux.de) (5.9.218.245) by server-3.tower-21.messagelabs.com with SMTP; 6 Nov 2012 14:19:30 -0000 Received: from localhost (localhost [127.0.0.1]) by mailer0.lippux.de (Postfix) with ESMTP id 96EE62C205; Tue, 6 Nov 2012 15:19:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailer1.lippux.de Received: from mailer0.lippux.de ([127.0.0.1]) by localhost (mailer0.lippux.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3bfJt3HgIMvA; Tue, 6 Nov 2012 15:19:28 +0100 (CET) Received: from ashlynn.lippux.de (ashlynn.lippux.de [5.9.218.242]) by mailer0.lippux.de (Postfix) with ESMTPSA id 587D72C1EF; Tue, 6 Nov 2012 15:19:28 +0100 (CET) Message-ID: <50991C68.4070103@laukamp.me> Date: Tue, 06 Nov 2012 15:19:20 +0100 From: Lukas Laukamp User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-users@lists.xen.org" Cc: xen-devel Subject: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello all, I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now PyGrub seems to be damaged. It fails with following issue: Traceback (most recent call last): File "/usr/lib/xen/bin/pygrub", line 20, in import xen.lowlevel.xc ImportError: No module named xen.lowlevel.xc So I don't know if this is a bug or a normal issue. I sent this mail to the user and devel list. How could this problem be fixed or does I need to wait for a patch? Best Regards _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:21:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:21:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk1r-0007TE-P1; Tue, 06 Nov 2012 14:21:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk1q-0007Sy-Dc for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:21:22 +0000 Received: from [85.158.143.35:51321] by server-3.bemta-4.messagelabs.com id B1/59-06841-1EC19905; Tue, 06 Nov 2012 14:21:21 +0000 X-Env-Sender: lukas@laukamp.me X-Msg-Ref: server-3.tower-21.messagelabs.com!1352211570!14129751!1 X-Originating-IP: [5.9.218.245] X-SpamReason: No, hits=0.2 required=7.0 tests=RCVD_ILLEGAL_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29779 invoked from network); 6 Nov 2012 14:19:30 -0000 Received: from mailer0.lippux.de (HELO mailer0.lippux.de) (5.9.218.245) by server-3.tower-21.messagelabs.com with SMTP; 6 Nov 2012 14:19:30 -0000 Received: from localhost (localhost [127.0.0.1]) by mailer0.lippux.de (Postfix) with ESMTP id 96EE62C205; Tue, 6 Nov 2012 15:19:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailer1.lippux.de Received: from mailer0.lippux.de ([127.0.0.1]) by localhost (mailer0.lippux.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3bfJt3HgIMvA; Tue, 6 Nov 2012 15:19:28 +0100 (CET) Received: from ashlynn.lippux.de (ashlynn.lippux.de [5.9.218.242]) by mailer0.lippux.de (Postfix) with ESMTPSA id 587D72C1EF; Tue, 6 Nov 2012 15:19:28 +0100 (CET) Message-ID: <50991C68.4070103@laukamp.me> Date: Tue, 06 Nov 2012 15:19:20 +0100 From: Lukas Laukamp User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-users@lists.xen.org" Cc: xen-devel Subject: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello all, I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now PyGrub seems to be damaged. It fails with following issue: Traceback (most recent call last): File "/usr/lib/xen/bin/pygrub", line 20, in import xen.lowlevel.xc ImportError: No module named xen.lowlevel.xc So I don't know if this is a bug or a normal issue. I sent this mail to the user and devel list. How could this problem be fixed or does I need to wait for a patch? Best Regards _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:24:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:24:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk4u-0007eO-CK; Tue, 06 Nov 2012 14:24:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk4s-0007eA-Ux for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:24:31 +0000 Received: from [85.158.139.211:19669] by server-11.bemta-5.messagelabs.com id CB/58-03409-E9D19905; Tue, 06 Nov 2012 14:24:30 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1352211869!19080535!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26954 invoked from network); 6 Nov 2012 14:24:29 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:24:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613540" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:24:29 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:24:28 +0000 Message-ID: <1352211862.2155.13.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 15:24:22 +0100 In-Reply-To: <509915CD02000078000A6ABF@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6881749480603285661==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============6881749480603285661== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-GrSN0qQMMqtJRlrXr+kS" --=-GrSN0qQMMqtJRlrXr+kS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 12:51 +0000, Jan Beulich wrote: > > Right. But moving the fault handling code to softirq should have alread= y > > helped solving/mitigating that, hasn't it? >=20 > It helps keeping Xen alive, but doesn't for any specific domain > (including Dom0). >=20 Ok. Yes, now I remember... That was the main purpose of that work. Thanks and sorry. :-P > > When implementing and testing that, I wasn't able to reproduce any > > livelock situation (although I can't exclude that to be at least partly > > due to my inexperience, especially at the time, with I/O > > virtualization)... Jan, have you (after killing the 'disable > > bus-mastering part' of course)? >=20 > No, I haven't - you'd have to have a device that doesn't stop I/O > after a finite amount was done (or program one that way, e.g. by > handing it a cyclic list of SG descriptors or alike). Wasn't it at your > (Citrix) end that the problem was actually observed/reported? >=20 Yes but, as Tim said, I was never able to get in touch with the original faulting behavior/piece of hardware. Trying to simulate that as you're suggesting is basically what I did, but, at that time, I was using a passed-to-a-guest device, and wasn't bypassing (for anyone) the ~BUS_MASTERING thing... That's why I asked whether you observed a different behaviour. Anyway, I see that we're talking about different issues and understand (now) what you're trying to solve and why that is needed, so, again, sorry for dragging the discussion a bit out of scope. :-) Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-GrSN0qQMMqtJRlrXr+kS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZHZYACgkQk4XaBE3IOsQBUgCfUYT23GPWRULGUGoRsxMbuMNW OGIAn2GSo5gEpmbvUAyGHa/ffMKC+2jB =vMqn -----END PGP SIGNATURE----- --=-GrSN0qQMMqtJRlrXr+kS-- --===============6881749480603285661== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6881749480603285661==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:24:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:24:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk4u-0007eO-CK; Tue, 06 Nov 2012 14:24:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk4s-0007eA-Ux for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:24:31 +0000 Received: from [85.158.139.211:19669] by server-11.bemta-5.messagelabs.com id CB/58-03409-E9D19905; Tue, 06 Nov 2012 14:24:30 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1352211869!19080535!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26954 invoked from network); 6 Nov 2012 14:24:29 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:24:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613540" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:24:29 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:24:28 +0000 Message-ID: <1352211862.2155.13.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 15:24:22 +0100 In-Reply-To: <509915CD02000078000A6ABF@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6881749480603285661==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============6881749480603285661== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-GrSN0qQMMqtJRlrXr+kS" --=-GrSN0qQMMqtJRlrXr+kS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 12:51 +0000, Jan Beulich wrote: > > Right. But moving the fault handling code to softirq should have alread= y > > helped solving/mitigating that, hasn't it? >=20 > It helps keeping Xen alive, but doesn't for any specific domain > (including Dom0). >=20 Ok. Yes, now I remember... That was the main purpose of that work. Thanks and sorry. :-P > > When implementing and testing that, I wasn't able to reproduce any > > livelock situation (although I can't exclude that to be at least partly > > due to my inexperience, especially at the time, with I/O > > virtualization)... Jan, have you (after killing the 'disable > > bus-mastering part' of course)? >=20 > No, I haven't - you'd have to have a device that doesn't stop I/O > after a finite amount was done (or program one that way, e.g. by > handing it a cyclic list of SG descriptors or alike). Wasn't it at your > (Citrix) end that the problem was actually observed/reported? >=20 Yes but, as Tim said, I was never able to get in touch with the original faulting behavior/piece of hardware. Trying to simulate that as you're suggesting is basically what I did, but, at that time, I was using a passed-to-a-guest device, and wasn't bypassing (for anyone) the ~BUS_MASTERING thing... That's why I asked whether you observed a different behaviour. Anyway, I see that we're talking about different issues and understand (now) what you're trying to solve and why that is needed, so, again, sorry for dragging the discussion a bit out of scope. :-) Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-GrSN0qQMMqtJRlrXr+kS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZHZYACgkQk4XaBE3IOsQBUgCfUYT23GPWRULGUGoRsxMbuMNW OGIAn2GSo5gEpmbvUAyGHa/ffMKC+2jB =vMqn -----END PGP SIGNATURE----- --=-GrSN0qQMMqtJRlrXr+kS-- --===============6881749480603285661== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6881749480603285661==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:30:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:30:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkA0-0007pd-4V; Tue, 06 Nov 2012 14:29:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk9y-0007pY-Hc for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:29:46 +0000 Received: from [85.158.139.211:56003] by server-9.bemta-5.messagelabs.com id D5/E9-29295-9DE19905; Tue, 06 Nov 2012 14:29:45 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352212162!19077991!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17499 invoked from network); 6 Nov 2012 14:29:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:29:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613725" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:29:22 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:29:22 +0000 Message-ID: <1352212160.2155.18.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 15:29:20 +0100 In-Reply-To: <50992A2302000078000A6B78@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> <50992A2302000078000A6B78@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , "Tim \(Xen.org\)" , xen-devel , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0864760982664723963==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0864760982664723963== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-kJcfQeVYWtlOdCqMcYmN" --=-kJcfQeVYWtlOdCqMcYmN Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 14:17 +0000, Jan Beulich wrote: > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > > handler acknowledges the error, but if the softirq handler doesn't > > disable the device, it will take another IOMMU interrupt immediately. > > I thought the AMD side behaved eth same but clearly not -- I'll try to > > take a look at that later in the week. >=20 > I don't think AMD's behaves much different, it's just that for the > PPR case nothing is being done in that regard (and it's unclear > whether or under what circumstances a high rate of these could > occur). >=20 Indeed. I just double checked the code and yes, both faults and PPRs are handled that way, and new interrupts are disabled until the tasklet handles the request and re-enables them. The difference, as Jan is saying, is there is no PPR equivalent of disabling bus mastering that can ensure livelock safeness when it comes to them. Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-kJcfQeVYWtlOdCqMcYmN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZHsAACgkQk4XaBE3IOsQ5PwCfZbNoOfbAeFrRQKS9Z5c6xZe5 WUgAnRkSP0OfFDQZMpo7tfRoJ5KBJjBE =GwTj -----END PGP SIGNATURE----- --=-kJcfQeVYWtlOdCqMcYmN-- --===============0864760982664723963== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0864760982664723963==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:30:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:30:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkA0-0007pd-4V; Tue, 06 Nov 2012 14:29:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVk9y-0007pY-Hc for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:29:46 +0000 Received: from [85.158.139.211:56003] by server-9.bemta-5.messagelabs.com id D5/E9-29295-9DE19905; Tue, 06 Nov 2012 14:29:45 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352212162!19077991!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17499 invoked from network); 6 Nov 2012 14:29:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:29:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="asc'?scan'208";a="15613725" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:29:22 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:29:22 +0000 Message-ID: <1352212160.2155.18.camel@Solace> From: Dario Faggioli To: Jan Beulich Date: Tue, 6 Nov 2012 15:29:20 +0100 In-Reply-To: <50992A2302000078000A6B78@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> <50992A2302000078000A6B78@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , "Tim \(Xen.org\)" , xen-devel , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0864760982664723963==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0864760982664723963== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-kJcfQeVYWtlOdCqMcYmN" --=-kJcfQeVYWtlOdCqMcYmN Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2012-11-06 at 14:17 +0000, Jan Beulich wrote: > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > > handler acknowledges the error, but if the softirq handler doesn't > > disable the device, it will take another IOMMU interrupt immediately. > > I thought the AMD side behaved eth same but clearly not -- I'll try to > > take a look at that later in the week. >=20 > I don't think AMD's behaves much different, it's just that for the > PPR case nothing is being done in that regard (and it's unclear > whether or under what circumstances a high rate of these could > occur). >=20 Indeed. I just double checked the code and yes, both faults and PPRs are handled that way, and new interrupts are disabled until the tasklet handles the request and re-enables them. The difference, as Jan is saying, is there is no PPR equivalent of disabling bus mastering that can ensure livelock safeness when it comes to them. Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-kJcfQeVYWtlOdCqMcYmN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCZHsAACgkQk4XaBE3IOsQ5PwCfZbNoOfbAeFrRQKS9Z5c6xZe5 WUgAnRkSP0OfFDQZMpo7tfRoJ5KBJjBE =GwTj -----END PGP SIGNATURE----- --=-kJcfQeVYWtlOdCqMcYmN-- --===============0864760982664723963== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0864760982664723963==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 14:57:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:57:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkam-00087R-PN; Tue, 06 Nov 2012 14:57:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkal-00087M-FZ for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:57:27 +0000 Received: from [85.158.139.83:32342] by server-10.bemta-5.messagelabs.com id C0/05-09257-65529905; Tue, 06 Nov 2012 14:57:26 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352213844!28325257!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE2NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22339 invoked from network); 6 Nov 2012 14:57:25 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:57:25 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="43617205" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 06 Nov 2012 14:57:24 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Tue, 6 Nov 2012 09:57:23 -0500 Date: Tue, 6 Nov 2012 14:56:40 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: "Liu, Jinsong" In-Reply-To: Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" , Konrad Rzeszutek Wilk , Jan Beulich Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 6 Nov 2012, Liu, Jinsong wrote: > Liu, Jinsong wrote: > > Stefano Stabellini wrote: > >>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >>>> index 0e86370..a2af622 100644 > >>>> --- a/drivers/xen/Makefile > >>>> +++ b/drivers/xen/Makefile > >>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > >>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > >>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > >>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > >>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > >>>> xen-evtchn-y := evtchn.o > >>>> xen-gntdev-y := gntdev.o > >>>> xen-gntalloc-y := gntalloc.o > >> > >> it should really depend on ACPI and maybe also X86, otherwise it is > >> going to break the ARM build > >> > >> > > > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which > > depends on X86_64). > > > > Ah, you and Konrad are right. I ignore XEN_DOM0 varies under different arch. > (But seems it not depends on X86 since it's logically an acpi stuff?). If it is generic ACPI code, than it can depend only on ACPI. If it is ACPI code that contains X86 specific info, than it needs to depend on X86 too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:57:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:57:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkam-00087R-PN; Tue, 06 Nov 2012 14:57:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkal-00087M-FZ for xen-devel@lists.xen.org; Tue, 06 Nov 2012 14:57:27 +0000 Received: from [85.158.139.83:32342] by server-10.bemta-5.messagelabs.com id C0/05-09257-65529905; Tue, 06 Nov 2012 14:57:26 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352213844!28325257!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE2NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22339 invoked from network); 6 Nov 2012 14:57:25 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:57:25 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="43617205" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 06 Nov 2012 14:57:24 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Tue, 6 Nov 2012 09:57:23 -0500 Date: Tue, 6 Nov 2012 14:56:40 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: "Liu, Jinsong" In-Reply-To: Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: Konrad Rzeszutek Wilk , Stefano Stabellini , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xen.org" , Konrad Rzeszutek Wilk , Jan Beulich Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 6 Nov 2012, Liu, Jinsong wrote: > Liu, Jinsong wrote: > > Stefano Stabellini wrote: > >>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >>>> index 0e86370..a2af622 100644 > >>>> --- a/drivers/xen/Makefile > >>>> +++ b/drivers/xen/Makefile > >>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > >>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > >>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > >>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > >>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > >>>> xen-evtchn-y := evtchn.o > >>>> xen-gntdev-y := gntdev.o > >>>> xen-gntalloc-y := gntalloc.o > >> > >> it should really depend on ACPI and maybe also X86, otherwise it is > >> going to break the ARM build > >> > >> > > > > Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC (which > > depends on X86_64). > > > > Ah, you and Konrad are right. I ignore XEN_DOM0 varies under different arch. > (But seems it not depends on X86 since it's logically an acpi stuff?). If it is generic ACPI code, than it can depend only on ACPI. If it is ACPI code that contains X86 specific info, than it needs to depend on X86 too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:58:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:58:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkba-0008Ab-Qd; Tue, 06 Nov 2012 14:58:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkbZ-0008AP-2e for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:58:17 +0000 Received: from [193.109.254.147:40442] by server-5.bemta-14.messagelabs.com id C5/74-10257-88529905; Tue, 06 Nov 2012 14:58:16 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352213885!8656683!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE2NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18083 invoked from network); 6 Nov 2012 14:58:06 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:58:06 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="43617379" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:58:04 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 09:58:04 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVkbM-0007py-2R; Tue, 06 Nov 2012 14:58:04 +0000 Message-ID: <1352213764.12977.8.camel@hastur.hellion.org.uk> From: Ian Campbell To: Lukas Laukamp Date: Tue, 6 Nov 2012 15:56:04 +0100 In-Reply-To: <50991C68.4070103@laukamp.me> References: <50991C68.4070103@laukamp.me> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 14:19 +0000, Lukas Laukamp wrote: > Hello all, > > I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now > PyGrub seems to be damaged. It fails with following issue: > > Traceback (most recent call last): > File "/usr/lib/xen/bin/pygrub", line 20, in > import xen.lowlevel.xc > ImportError: No module named xen.lowlevel.xc > > So I don't know if this is a bug or a normal issue. I sent this mail to > the user and devel list. In general please don't cross post. If you are unsure then the user list is the best starting point. > How could this problem be fixed or does I need > to wait for a patch? This issue is described on the wiki. Please see http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout > > Best Regards > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:58:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:58:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkba-0008Ab-Qd; Tue, 06 Nov 2012 14:58:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkbZ-0008AP-2e for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:58:17 +0000 Received: from [193.109.254.147:40442] by server-5.bemta-14.messagelabs.com id C5/74-10257-88529905; Tue, 06 Nov 2012 14:58:16 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352213885!8656683!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE2NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18083 invoked from network); 6 Nov 2012 14:58:06 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:58:06 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="43617379" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:58:04 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 09:58:04 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVkbM-0007py-2R; Tue, 06 Nov 2012 14:58:04 +0000 Message-ID: <1352213764.12977.8.camel@hastur.hellion.org.uk> From: Ian Campbell To: Lukas Laukamp Date: Tue, 6 Nov 2012 15:56:04 +0100 In-Reply-To: <50991C68.4070103@laukamp.me> References: <50991C68.4070103@laukamp.me> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 14:19 +0000, Lukas Laukamp wrote: > Hello all, > > I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now > PyGrub seems to be damaged. It fails with following issue: > > Traceback (most recent call last): > File "/usr/lib/xen/bin/pygrub", line 20, in > import xen.lowlevel.xc > ImportError: No module named xen.lowlevel.xc > > So I don't know if this is a bug or a normal issue. I sent this mail to > the user and devel list. In general please don't cross post. If you are unsure then the user list is the best starting point. > How could this problem be fixed or does I need > to wait for a patch? This issue is described on the wiki. Please see http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout > > Best Regards > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:59:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:59:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkcZ-0008JO-9J; Tue, 06 Nov 2012 14:59:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkcY-0008J5-9v for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:59:18 +0000 Received: from [85.158.139.211:38351] by server-14.bemta-5.messagelabs.com id 35/13-21768-5C529905; Tue, 06 Nov 2012 14:59:17 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352213956!15122032!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23090 invoked from network); 6 Nov 2012 14:59:17 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:59:17 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="15614695" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:59:16 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:59:15 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVkcV-0006g7-LG; Tue, 06 Nov 2012 14:59:15 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVkcV-0005WG-45; Tue, 06 Nov 2012 14:59:15 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 6 Nov 2012 14:59:15 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14370: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14370 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14370/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-amd64-pvops 4 kernel-build fail REGR. vs. 14354 build-i386-pvops 4 kernel-build fail REGR. vs. 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-sedf-pin 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-pcipt-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-sedf 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win 1 xen-build-check(1) blocked n/a test-amd64-amd64-win 1 xen-build-check(1) blocked n/a test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-winxpsp3 1 xen-build-check(1) blocked n/a version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops fail build-i386-pvops fail test-amd64-amd64-xl blocked test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 blocked test-amd64-amd64-xl-win7-amd64 blocked test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel blocked test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair blocked test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin blocked test-amd64-amd64-pv blocked test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf blocked test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win blocked test-amd64-i386-win blocked test-amd64-amd64-xl-win blocked test-amd64-amd64-xl-qemuu-winxpsp3 blocked test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 blocked ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 Author: Greg Kroah-Hartman Date: Mon Nov 5 09:44:42 2012 +0100 Linux 3.0.51 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 14:59:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 14:59:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkcZ-0008JO-9J; Tue, 06 Nov 2012 14:59:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkcY-0008J5-9v for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 14:59:18 +0000 Received: from [85.158.139.211:38351] by server-14.bemta-5.messagelabs.com id 35/13-21768-5C529905; Tue, 06 Nov 2012 14:59:17 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352213956!15122032!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTczNjc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23090 invoked from network); 6 Nov 2012 14:59:17 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 14:59:17 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344211200"; d="scan'208";a="15614695" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 14:59:16 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 14:59:15 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVkcV-0006g7-LG; Tue, 06 Nov 2012 14:59:15 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVkcV-0005WG-45; Tue, 06 Nov 2012 14:59:15 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 6 Nov 2012 14:59:15 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14370: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14370 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14370/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: build-amd64-pvops 4 kernel-build fail REGR. vs. 14354 build-i386-pvops 4 kernel-build fail REGR. vs. 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-sedf-pin 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-pcipt-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-multivcpu 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-pv 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-intel 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-sedf 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-credit2 1 xen-build-check(1) blocked n/a test-amd64-i386-xl 1 xen-build-check(1) blocked n/a test-amd64-amd64-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-qemuu-rhel6hvm-amd 1 xen-build-check(1) blocked n/a test-amd64-i386-pair 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-winxpsp3-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win7-amd64 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-win 1 xen-build-check(1) blocked n/a test-amd64-amd64-win 1 xen-build-check(1) blocked n/a test-amd64-i386-win 1 xen-build-check(1) blocked n/a test-amd64-i386-xl-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-win-vcpus1 1 xen-build-check(1) blocked n/a test-amd64-i386-xend-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-winxpsp3 1 xen-build-check(1) blocked n/a test-amd64-amd64-xl-qemuu-winxpsp3 1 xen-build-check(1) blocked n/a version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops fail build-i386-pvops fail test-amd64-amd64-xl blocked test-amd64-i386-xl blocked test-amd64-i386-rhel6hvm-amd blocked test-amd64-i386-qemuu-rhel6hvm-amd blocked test-amd64-amd64-xl-qemuu-win7-amd64 blocked test-amd64-amd64-xl-win7-amd64 blocked test-amd64-i386-xl-win7-amd64 blocked test-amd64-i386-xl-credit2 blocked test-amd64-amd64-xl-pcipt-intel blocked test-amd64-i386-rhel6hvm-intel blocked test-amd64-i386-qemuu-rhel6hvm-intel blocked test-amd64-i386-xl-multivcpu blocked test-amd64-amd64-pair blocked test-amd64-i386-pair blocked test-amd64-amd64-xl-sedf-pin blocked test-amd64-amd64-pv blocked test-amd64-i386-pv blocked test-amd64-amd64-xl-sedf blocked test-amd64-i386-win-vcpus1 blocked test-amd64-i386-xl-win-vcpus1 blocked test-amd64-i386-xl-winxpsp3-vcpus1 blocked test-amd64-amd64-win blocked test-amd64-i386-win blocked test-amd64-amd64-xl-win blocked test-amd64-amd64-xl-qemuu-winxpsp3 blocked test-amd64-i386-xend-winxpsp3 blocked test-amd64-amd64-xl-winxpsp3 blocked ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ commit ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 Author: Greg Kroah-Hartman Date: Mon Nov 5 09:44:42 2012 +0100 Linux 3.0.51 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:00:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:00:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkdZ-0008U7-OK; Tue, 06 Nov 2012 15:00:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkdY-0008To-5y for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:00:20 +0000 Received: from [85.158.138.51:33750] by server-5.bemta-3.messagelabs.com id 5F/41-26311-30629905; Tue, 06 Nov 2012 15:00:19 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-4.tower-174.messagelabs.com!1352214013!28905526!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20883 invoked from network); 6 Nov 2012 15:00:14 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-4.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 15:00:14 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156676974; Tue, 06 Nov 2012 09:59:56 -0500 Message-ID: <509925EC.9020204@jhuapl.edu> Date: Tue, 06 Nov 2012 09:59:56 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Samuel Thibault References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1775052777505301465==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============1775052777505301465== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms050507040408010507050102" This is a cryptographically signed message in MIME format. --------------ms050507040408010507050102 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable The tpm front/back driver maps and unmaps a grant reference everytime it = sends a message. I'm not sure this is the most efficient design choice=20 but that's what the linux tpm driver did so I followed it. I'd like to=20 consider redesigning the driver at some point but right now I don't have = time. Compare the outputs of vtpmmgrdom below. Whats happening here is a vtpm=20 connects to the manager, requests some entropy from the hardware tpm,=20 loads its data and then saves its data. Tpmback:Info Frontend 10/0 connected INFO[VTPM]: Passthrough: TPM_GetRandom INFO[VTPM]: Waiting for commands from vTPM's: INFO[VTPM]: Passthrough: TPM_GetRandom INFO[VTPM]: Waiting for commands from vTPM's: INFO[TPM]: TPM_UnBind INFO[VTPM]: Loaded hash and key for vtpm=20 ac0a5b9e-cbe2-4c07-b43b-1d69e46fb839 INFO[VTPM]: Waiting for commands from vTPM's: INFO[TPM]: TPM_Bind INFO[VTPM]: Saved hash and key for vtpm ac0a5b9e-cbe2-4c07-b43b-1d69e46fb= 839 INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x11fd4c [13...]= ,=20 domids_stride=3D0, refs=3D0x11fd48 [2047...], writable=3D3) gntmap_set_max_grants(map=3D0x46378, count=3D128) Tpmback:Info Frontend 13/0 connected gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Passthrough: TPM_GetRandom gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Passthrough: TPM_GetRandom gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[TPM]: TPM_UnBind INFO[VTPM]: Loaded hash and key for vtpm=20 ac0a5b9e-cbe2-4c07-b43b-1d69e46fb839 gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[TPM]: TPM_Bind INFO[VTPM]: Saved hash and key for vtpm ac0a5b9e-cbe2-4c07-b43b-1d69e46fb= 839 gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) I'm perfectly willing to accept that this is just my problem and the tpm = driver should be fixed. But I also think it makes sense in general to=20 leave debug defines turned off for default builds. -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] Sent:=20 Monday, November 05, 2012 6:35 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Fioravante, Matthew E., le Fri 02 Nov 2012 09:19:34 -0400, a =E9crit : > It happens in my vtpm domains because the drivers often create and rele= ase grant references. This patch isn't completely necessary. Do we want t= o have these debug prints in the default build? Well, surely -DGNT_DEBUG doesn't produce any output :) We could however=20 drop it, since it only adds overhead to check something that is supposed = to be already working (and which is quite well tested nowadays). About -DGNTMAP_DEBUG, which message are you getting printed a lot? Are=20 you running out of references in gntmap_find_free_entry, or using=20 gntmap_map_grant_refs a lot? Samuel --------------ms050507040408010507050102 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNjE0NTk1NlowIwYJKoZIhvcNAQkEMRYEFMKCTAJNJJ196h6e vjvCL74CQp7SMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYAbdat4fx18DiIFCjTPjWBfj8FyRgncuGsd QOf6HHL/LfekEKzUiGYz2rvlX8XaQcnw6QphPoZcSkAa0EAkHniClakqrdOs1i6CICIkF4lG fQXz0c/23n0DwjX55iybCTNGE+dqM0Eam/J22a+hv3Wd6GOcfFe5Cf51P7jrIIHNngAAAAAA AA== --------------ms050507040408010507050102-- --===============1775052777505301465== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1775052777505301465==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 15:00:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:00:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkdZ-0008U7-OK; Tue, 06 Nov 2012 15:00:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkdY-0008To-5y for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:00:20 +0000 Received: from [85.158.138.51:33750] by server-5.bemta-3.messagelabs.com id 5F/41-26311-30629905; Tue, 06 Nov 2012 15:00:19 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-4.tower-174.messagelabs.com!1352214013!28905526!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20883 invoked from network); 6 Nov 2012 15:00:14 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-4.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 15:00:14 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156676974; Tue, 06 Nov 2012 09:59:56 -0500 Message-ID: <509925EC.9020204@jhuapl.edu> Date: Tue, 06 Nov 2012 09:59:56 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Samuel Thibault References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> In-Reply-To: <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1775052777505301465==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============1775052777505301465== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms050507040408010507050102" This is a cryptographically signed message in MIME format. --------------ms050507040408010507050102 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable The tpm front/back driver maps and unmaps a grant reference everytime it = sends a message. I'm not sure this is the most efficient design choice=20 but that's what the linux tpm driver did so I followed it. I'd like to=20 consider redesigning the driver at some point but right now I don't have = time. Compare the outputs of vtpmmgrdom below. Whats happening here is a vtpm=20 connects to the manager, requests some entropy from the hardware tpm,=20 loads its data and then saves its data. Tpmback:Info Frontend 10/0 connected INFO[VTPM]: Passthrough: TPM_GetRandom INFO[VTPM]: Waiting for commands from vTPM's: INFO[VTPM]: Passthrough: TPM_GetRandom INFO[VTPM]: Waiting for commands from vTPM's: INFO[TPM]: TPM_UnBind INFO[VTPM]: Loaded hash and key for vtpm=20 ac0a5b9e-cbe2-4c07-b43b-1d69e46fb839 INFO[VTPM]: Waiting for commands from vTPM's: INFO[TPM]: TPM_Bind INFO[VTPM]: Saved hash and key for vtpm ac0a5b9e-cbe2-4c07-b43b-1d69e46fb= 839 INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x11fd4c [13...]= ,=20 domids_stride=3D0, refs=3D0x11fd48 [2047...], writable=3D3) gntmap_set_max_grants(map=3D0x46378, count=3D128) Tpmback:Info Frontend 13/0 connected gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Passthrough: TPM_GetRandom gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Passthrough: TPM_GetRandom gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2046...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[TPM]: TPM_UnBind INFO[VTPM]: Loaded hash and key for vtpm=20 ac0a5b9e-cbe2-4c07-b43b-1d69e46fb839 gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[VTPM]: Waiting for commands from vTPM's: gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10de94 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D1) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) INFO[TPM]: TPM_Bind INFO[VTPM]: Saved hash and key for vtpm ac0a5b9e-cbe2-4c07-b43b-1d69e46fb= 839 gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x10dec4 [13...]= ,=20 domids_stride=3D0, refs=3D0x2006008 [2045...], writable=3D2) gntmap_set_max_grants(map=3D0x46378, count=3D128) gntmap_munmap(map=3D0x46378, start_address=3D2007000, count=3D1) I'm perfectly willing to accept that this is just my problem and the tpm = driver should be fixed. But I also think it makes sense in general to=20 leave debug defines turned off for default builds. -----Original Message----- From: Samuel Thibault [mailto:samuel.thibault@ens-lyon.org] Sent:=20 Monday, November 05, 2012 6:35 PM To: Fioravante, Matthew E. Cc: Ian.Campbell@citrix.com; xen-devel@lists.xen.org Subject: Re: [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG Fioravante, Matthew E., le Fri 02 Nov 2012 09:19:34 -0400, a =E9crit : > It happens in my vtpm domains because the drivers often create and rele= ase grant references. This patch isn't completely necessary. Do we want t= o have these debug prints in the default build? Well, surely -DGNT_DEBUG doesn't produce any output :) We could however=20 drop it, since it only adds overhead to check something that is supposed = to be already working (and which is quite well tested nowadays). About -DGNTMAP_DEBUG, which message are you getting printed a lot? Are=20 you running out of references in gntmap_find_free_entry, or using=20 gntmap_map_grant_refs a lot? Samuel --------------ms050507040408010507050102 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNjE0NTk1NlowIwYJKoZIhvcNAQkEMRYEFMKCTAJNJJ196h6e vjvCL74CQp7SMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYAbdat4fx18DiIFCjTPjWBfj8FyRgncuGsd QOf6HHL/LfekEKzUiGYz2rvlX8XaQcnw6QphPoZcSkAa0EAkHniClakqrdOs1i6CICIkF4lG fQXz0c/23n0DwjX55iybCTNGE+dqM0Eam/J22a+hv3Wd6GOcfFe5Cf51P7jrIIHNngAAAAAA AA== --------------ms050507040408010507050102-- --===============1775052777505301465== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1775052777505301465==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 15:13:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:13:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkq8-0000ac-7l; Tue, 06 Nov 2012 15:13:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkq6-0000aU-2J for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:13:18 +0000 Received: from [85.158.139.211:60955] by server-10.bemta-5.messagelabs.com id D4/C3-09257-D0929905; Tue, 06 Nov 2012 15:13:17 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-14.tower-206.messagelabs.com!1352214796!19059252!1 X-Originating-IP: [192.134.164.105] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5617 invoked from network); 6 Nov 2012 15:13:16 -0000 Received: from mail4-relais-sop.national.inria.fr (HELO mail4-relais-sop.national.inria.fr) (192.134.164.105) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:13:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344204000"; d="scan'208";a="161569459" Received: from unknown (HELO type.ipv6) ([193.50.110.135]) by mail4-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 06 Nov 2012 16:13:16 +0100 Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVkq4-0005fg-0q; Tue, 06 Nov 2012 16:13:16 +0100 Date: Tue, 6 Nov 2012 16:13:16 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121106151315.GK5802@type.bordeaux.inria.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a > lot of spam. > = > Signed-off-by: Matthew Fioravante Acked-by: Samuel Thibault _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:13:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:13:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkq8-0000ac-7l; Tue, 06 Nov 2012 15:13:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkq6-0000aU-2J for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:13:18 +0000 Received: from [85.158.139.211:60955] by server-10.bemta-5.messagelabs.com id D4/C3-09257-D0929905; Tue, 06 Nov 2012 15:13:17 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-14.tower-206.messagelabs.com!1352214796!19059252!1 X-Originating-IP: [192.134.164.105] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5617 invoked from network); 6 Nov 2012 15:13:16 -0000 Received: from mail4-relais-sop.national.inria.fr (HELO mail4-relais-sop.national.inria.fr) (192.134.164.105) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:13:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344204000"; d="scan'208";a="161569459" Received: from unknown (HELO type.ipv6) ([193.50.110.135]) by mail4-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 06 Nov 2012 16:13:16 +0100 Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVkq4-0005fg-0q; Tue, 06 Nov 2012 16:13:16 +0100 Date: Tue, 6 Nov 2012 16:13:16 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121106151315.GK5802@type.bordeaux.inria.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , Ian.Campbell@citrix.com, xen-devel@lists.xen.org References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Thu 01 Nov 2012 16:33:24 -0400, a =E9crit : > Disabling the above flags in default mini-os build. They generate a > lot of spam. > = > Signed-off-by: Matthew Fioravante Acked-by: Samuel Thibault _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:14:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:14:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkqa-0000d2-QV; Tue, 06 Nov 2012 15:13:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkqZ-0000cp-AO for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:13:47 +0000 Received: from [193.109.254.147:20311] by server-1.bemta-14.messagelabs.com id DF/4E-25314-A2929905; Tue, 06 Nov 2012 15:13:46 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1352214825!9823284!1 X-Originating-IP: [192.134.164.82] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28194 invoked from network); 6 Nov 2012 15:13:45 -0000 Received: from mail1-relais-roc.national.inria.fr (HELO mail1-relais-roc.national.inria.fr) (192.134.164.82) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:13:45 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344204000"; d="scan'208";a="180380167" Received: from unknown (HELO type.ipv6) ([193.50.110.135]) by mail1-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 06 Nov 2012 16:13:45 +0100 Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVkqX-0005gd-0S; Tue, 06 Nov 2012 16:13:45 +0100 Date: Tue, 6 Nov 2012 16:13:45 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121106151344.GL5802@type.bordeaux.inria.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> <509925EC.9020204@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509925EC.9020204@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Tue 06 Nov 2012 09:59:56 -0500, a =E9crit : > gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x11fd4c [13...], > domids_stride=3D0, refs=3D0x11fd48 [2047...], writable=3D3) > gntmap_set_max_grants(map=3D0x46378, count=3D128) Ok, let's get rid of them by default, then. Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:14:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:14:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkqa-0000d2-QV; Tue, 06 Nov 2012 15:13:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVkqZ-0000cp-AO for xen-devel@lists.xen.org; Tue, 06 Nov 2012 15:13:47 +0000 Received: from [193.109.254.147:20311] by server-1.bemta-14.messagelabs.com id DF/4E-25314-A2929905; Tue, 06 Nov 2012 15:13:46 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1352214825!9823284!1 X-Originating-IP: [192.134.164.82] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28194 invoked from network); 6 Nov 2012 15:13:45 -0000 Received: from mail1-relais-roc.national.inria.fr (HELO mail1-relais-roc.national.inria.fr) (192.134.164.82) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:13:45 -0000 X-IronPort-AV: E=Sophos;i="4.80,722,1344204000"; d="scan'208";a="180380167" Received: from unknown (HELO type.ipv6) ([193.50.110.135]) by mail1-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 06 Nov 2012 16:13:45 +0100 Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TVkqX-0005gd-0S; Tue, 06 Nov 2012 16:13:45 +0100 Date: Tue, 6 Nov 2012 16:13:45 +0100 From: Samuel Thibault To: Matthew Fioravante Message-ID: <20121106151344.GL5802@type.bordeaux.inria.fr> Mail-Followup-To: Samuel Thibault , Matthew Fioravante , "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121101212931.GQ5569@type.youpi.perso.aquilenet.fr> <068F06DC4D106941B297C0C5F9F446EA48A1C7BA68@aplesstripe.dom1.jhuapl.edu> <20121105233452.GI16909@type.youpi.perso.aquilenet.fr> <509925EC.9020204@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509925EC.9020204@jhuapl.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Matthew Fioravante, le Tue 06 Nov 2012 09:59:56 -0500, a =E9crit : > gntmap_map_grant_refs(map=3D0x46378, count=3D1, domids=3D0x11fd4c [13...], > domids_stride=3D0, refs=3D0x11fd48 [2047...], writable=3D3) > gntmap_set_max_grants(map=3D0x46378, count=3D128) Ok, let's get rid of them by default, then. Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:43:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:43:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlIl-00018y-MU; Tue, 06 Nov 2012 15:42:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlIj-00018t-La for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 15:42:54 +0000 Received: from [85.158.137.99:9034] by server-15.bemta-3.messagelabs.com id 8D/01-09445-CFF29905; Tue, 06 Nov 2012 15:42:52 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352216570!17868201!1 X-Originating-IP: [209.85.212.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31916 invoked from network); 6 Nov 2012 15:42:51 -0000 Received: from mail-vb0-f43.google.com (HELO mail-vb0-f43.google.com) (209.85.212.43) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:42:51 -0000 Received: by mail-vb0-f43.google.com with SMTP id fq11so657593vbb.30 for ; Tue, 06 Nov 2012 07:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=3Mwt18hOQZbZcCLlJVQIdMoO6nnbB8vmEMZn/3g2skQ=; b=LplQQQPSFX/Mpbsmhhgqhwj5k7Jx35Jm6zpp1rfTZNuKc3+5Cq0QZPoEX5YFb1H9MQ 8X8D+uvKIXfvSX8UFY0sGGRpvC3j1xJMbXgf6VYncygXcAXqH+YKABDttRv0UkEXuq1w CDVByoqaBcsyGvqEATMCeOMSRZsXDr5B3zreyjp451q5YWy9OhHMkXtvUzmHBxxRLIcD osR3EtLAExWzOsvxrZL5Ll5pOhL/hEc81rS4TAvTMWRlA3lvR/uKEgNwtl5y902OkKR3 1xGofE010scgmiB0ZIS4eh9DzJIGOqBD/Iz70Rv97nhjo34RgGkgJkj73vCcPEA5n6C/ grjg== MIME-Version: 1.0 Received: by 10.220.152.11 with SMTP id e11mr1189476vcw.61.1352216570022; Tue, 06 Nov 2012 07:42:50 -0800 (PST) Received: by 10.58.231.138 with HTTP; Tue, 6 Nov 2012 07:42:49 -0800 (PST) In-Reply-To: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> Date: Tue, 6 Nov 2012 15:42:49 +0000 X-Google-Sender-Auth: htMbIvCqsl5i1vlflAknDBcl0Ek Message-ID: From: George Dunlap To: Liu Jinsong Cc: xen-devel@lists.xensource.com, ian.jackson@eu.citrix.com, jbeulich@suse.com Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 2, 2012 at 3:25 AM, Liu Jinsong wrote: > Generally, there are 2 cases: > 1. broken page occurs before migration > 2. broken page occurs during migration > > At the sender > for case 1, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > for case 2, mce handler marks the broken page to dirty bitmap, so that > at copypages stage of migration, its pfn_type and pfn number would be > transferred to target and then take appropriate action. > > At the target > it would set p2m as p2m_ram_broken for broken page, so that if guest > access the broken page again, it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong Looks good to me -- thanks, Jinsong! Acked-by: George Dunlap > > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/cpu/mcheck/mcaction.c > --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > @@ -1,5 +1,6 @@ > #include > #include > +#include > #include "mcaction.h" > #include "vmce.h" > #include "mce.h" > @@ -91,6 +92,24 @@ > goto vmce_failed; > } > > + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && > + paging_mode_log_dirty(d) ) > + { > + /* > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, brokan > + * page's pfn_type and pfn number would be transferred > + * to target and then take appropriate action. > + * > + * At target, it would set p2m as p2m_ram_broken for > + * broken page, so that if guest access the broken page > + * again, it would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + > if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) > { > printk("Unmap broken memory %lx for DOM%d failed\n", > diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 15:43:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 15:43:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlIl-00018y-MU; Tue, 06 Nov 2012 15:42:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlIj-00018t-La for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 15:42:54 +0000 Received: from [85.158.137.99:9034] by server-15.bemta-3.messagelabs.com id 8D/01-09445-CFF29905; Tue, 06 Nov 2012 15:42:52 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352216570!17868201!1 X-Originating-IP: [209.85.212.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31916 invoked from network); 6 Nov 2012 15:42:51 -0000 Received: from mail-vb0-f43.google.com (HELO mail-vb0-f43.google.com) (209.85.212.43) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 15:42:51 -0000 Received: by mail-vb0-f43.google.com with SMTP id fq11so657593vbb.30 for ; Tue, 06 Nov 2012 07:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=3Mwt18hOQZbZcCLlJVQIdMoO6nnbB8vmEMZn/3g2skQ=; b=LplQQQPSFX/Mpbsmhhgqhwj5k7Jx35Jm6zpp1rfTZNuKc3+5Cq0QZPoEX5YFb1H9MQ 8X8D+uvKIXfvSX8UFY0sGGRpvC3j1xJMbXgf6VYncygXcAXqH+YKABDttRv0UkEXuq1w CDVByoqaBcsyGvqEATMCeOMSRZsXDr5B3zreyjp451q5YWy9OhHMkXtvUzmHBxxRLIcD osR3EtLAExWzOsvxrZL5Ll5pOhL/hEc81rS4TAvTMWRlA3lvR/uKEgNwtl5y902OkKR3 1xGofE010scgmiB0ZIS4eh9DzJIGOqBD/Iz70Rv97nhjo34RgGkgJkj73vCcPEA5n6C/ grjg== MIME-Version: 1.0 Received: by 10.220.152.11 with SMTP id e11mr1189476vcw.61.1352216570022; Tue, 06 Nov 2012 07:42:50 -0800 (PST) Received: by 10.58.231.138 with HTTP; Tue, 6 Nov 2012 07:42:49 -0800 (PST) In-Reply-To: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> Date: Tue, 6 Nov 2012 15:42:49 +0000 X-Google-Sender-Auth: htMbIvCqsl5i1vlflAknDBcl0Ek Message-ID: From: George Dunlap To: Liu Jinsong Cc: xen-devel@lists.xensource.com, ian.jackson@eu.citrix.com, jbeulich@suse.com Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 2, 2012 at 3:25 AM, Liu Jinsong wrote: > Generally, there are 2 cases: > 1. broken page occurs before migration > 2. broken page occurs during migration > > At the sender > for case 1, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > for case 2, mce handler marks the broken page to dirty bitmap, so that > at copypages stage of migration, its pfn_type and pfn number would be > transferred to target and then take appropriate action. > > At the target > it would set p2m as p2m_ram_broken for broken page, so that if guest > access the broken page again, it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong Looks good to me -- thanks, Jinsong! Acked-by: George Dunlap > > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/cpu/mcheck/mcaction.c > --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > @@ -1,5 +1,6 @@ > #include > #include > +#include > #include "mcaction.h" > #include "vmce.h" > #include "mce.h" > @@ -91,6 +92,24 @@ > goto vmce_failed; > } > > + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && > + paging_mode_log_dirty(d) ) > + { > + /* > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, brokan > + * page's pfn_type and pfn number would be transferred > + * to target and then take appropriate action. > + * > + * At target, it would set p2m as p2m_ram_broken for > + * broken page, so that if guest access the broken page > + * again, it would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + > if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) > { > printk("Unmap broken memory %lx for DOM%d failed\n", > diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:24:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:24:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlwa-00026i-SQ; Tue, 06 Nov 2012 16:24:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlwZ-00026d-V3 for xen-devel@lists.xen.org; Tue, 06 Nov 2012 16:24:04 +0000 Received: from [193.109.254.147:47982] by server-9.bemta-14.messagelabs.com id F1/FC-30773-3A939905; Tue, 06 Nov 2012 16:24:03 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352219042!7238606!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyMDU0\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13645 invoked from network); 6 Nov 2012 16:24:02 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-5.tower-27.messagelabs.com with SMTP; 6 Nov 2012 16:24:02 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 06 Nov 2012 08:23:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,722,1344236400"; d="scan'208";a="238028653" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 06 Nov 2012 08:24:00 -0800 Received: from fmsmsx152.amr.corp.intel.com (10.19.17.221) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:24:00 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx152.amr.corp.intel.com (10.19.17.221) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:24:00 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 00:23:58 +0800 From: "Liu, Jinsong" To: Stefano Stabellini Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvC7tTi91BiFLfUibRvXA4zlK85fc+8/g Date: Tue, 6 Nov 2012 16:23:57 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Stefano Stabellini wrote: > On Tue, 6 Nov 2012, Liu, Jinsong wrote: >> Liu, Jinsong wrote: >>> Stefano Stabellini wrote: >>>>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>>>>> index 0e86370..a2af622 100644 >>>>>> --- a/drivers/xen/Makefile >>>>>> +++ b/drivers/xen/Makefile >>>>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>>>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>>>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>>>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>>>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>>>>> xen-evtchn-y := evtchn.o >>>>>> xen-gntdev-y := gntdev.o >>>>>> xen-gntalloc-y := gntalloc.o >>>> >>>> it should really depend on ACPI and maybe also X86, otherwise it >>>> is going to break the ARM build >>>> >>>> >>> >>> Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC >>> (which depends on X86_64). >>> >> >> Ah, you and Konrad are right. I ignore XEN_DOM0 varies under >> different arch. (But seems it not depends on X86 since it's >> logically an acpi stuff?). > > If it is generic ACPI code, than it can depend only on ACPI. > If it is ACPI code that contains X86 specific info, than it needs to > depend on X86 too. No x86 specific so let's depend on ACPI. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:24:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:24:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlwa-00026i-SQ; Tue, 06 Nov 2012 16:24:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlwZ-00026d-V3 for xen-devel@lists.xen.org; Tue, 06 Nov 2012 16:24:04 +0000 Received: from [193.109.254.147:47982] by server-9.bemta-14.messagelabs.com id F1/FC-30773-3A939905; Tue, 06 Nov 2012 16:24:03 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352219042!7238606!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyMDU0\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13645 invoked from network); 6 Nov 2012 16:24:02 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-5.tower-27.messagelabs.com with SMTP; 6 Nov 2012 16:24:02 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 06 Nov 2012 08:23:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,722,1344236400"; d="scan'208";a="238028653" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 06 Nov 2012 08:24:00 -0800 Received: from fmsmsx152.amr.corp.intel.com (10.19.17.221) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:24:00 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx152.amr.corp.intel.com (10.19.17.221) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:24:00 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 00:23:58 +0800 From: "Liu, Jinsong" To: Stefano Stabellini Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvC7tTi91BiFLfUibRvXA4zlK85fc+8/g Date: Tue, 6 Nov 2012 16:23:57 +0000 Message-ID: References: <5089676602000078000A4928@nat28.tlf.novell.com> <508A89CB020000780008E6ED@nat28.tlf.novell.com> <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Stefano Stabellini wrote: > On Tue, 6 Nov 2012, Liu, Jinsong wrote: >> Liu, Jinsong wrote: >>> Stefano Stabellini wrote: >>>>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >>>>>> index 0e86370..a2af622 100644 >>>>>> --- a/drivers/xen/Makefile >>>>>> +++ b/drivers/xen/Makefile >>>>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o >>>>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ >>>>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o >>>>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o >>>>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o >>>>>> xen-evtchn-y := evtchn.o >>>>>> xen-gntdev-y := gntdev.o >>>>>> xen-gntalloc-y := gntalloc.o >>>> >>>> it should really depend on ACPI and maybe also X86, otherwise it >>>> is going to break the ARM build >>>> >>>> >>> >>> Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC >>> (which depends on X86_64). >>> >> >> Ah, you and Konrad are right. I ignore XEN_DOM0 varies under >> different arch. (But seems it not depends on X86 since it's >> logically an acpi stuff?). > > If it is generic ACPI code, than it can depend only on ACPI. > If it is ACPI code that contains X86 specific info, than it needs to > depend on X86 too. No x86 specific so let's depend on ACPI. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:26:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:26:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlyu-0002Cz-EQ; Tue, 06 Nov 2012 16:26:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlyt-0002Cr-9M for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:26:27 +0000 Received: from [85.158.139.83:11177] by server-9.bemta-5.messagelabs.com id 31/BF-29295-23A39905; Tue, 06 Nov 2012 16:26:26 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352219183!28764054!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5MDM3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13330 invoked from network); 6 Nov 2012 16:26:24 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-15.tower-182.messagelabs.com with SMTP; 6 Nov 2012 16:26:24 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 06 Nov 2012 08:26:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,722,1344236400"; d="scan'208";a="238029792" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 06 Nov 2012 08:26:16 -0800 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:26:16 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:26:16 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 00:26:14 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [Xen-devel] [PATCH] Handle broken page with regard to migration Thread-Index: AQHNvDVowo0CS0uWQ02/ywhb/M0oqpfc/eBg Date: Tue, 6 Nov 2012 16:26:13 +0000 Message-ID: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "ian.jackson@eu.citrix.com" , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > On Fri, Nov 2, 2012 at 3:25 AM, Liu Jinsong > wrote: >> Generally, there are 2 cases: >> 1. broken page occurs before migration >> 2. broken page occurs during migration >> >> At the sender >> for case 1, the broken page would be mapped but not copied to >> target (otherwise it may trigger more serious error, say, SRAR >> error). While its pfn_type and pfn number would be transferred to >> target so that target take appropriate action. >> >> for case 2, mce handler marks the broken page to dirty bitmap, so >> that at copypages stage of migration, its pfn_type and pfn number >> would be transferred to target and then take appropriate action. >> >> At the target >> it would set p2m as p2m_ram_broken for broken page, so that if >> guest access the broken page again, it would kill itself as >> expected. >> >> Suggested-by: George Dunlap >> Signed-off-by: Liu, Jinsong > > Looks good to me -- thanks, Jinsong! > > Acked-by: George Dunlap > Thanks George, for your review and great suggestion :-) >> >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c >> --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 >> +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 @@ >> -283,6 +283,22 @@ return ret; >> } >> >> +/* set broken page p2m */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn) >> +{ >> + int ret; >> + DECLARE_DOMCTL; >> + >> + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; >> + domctl.domain = (domid_t)domid; >> + domctl.u.set_broken_page_p2m.pfn = pfn; >> + ret = do_domctl(xch, &domctl); >> + >> + return ret ? -1 : 0; >> +} >> + >> /* get info from hvm guest for save */ >> int xc_domain_hvm_getcontext(xc_interface *xch, >> uint32_t domid, >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c >> --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 >> 2012 +0800 @@ -962,9 +962,15 @@ >> >> countpages = count; >> for (i = oldcount; i < buf->nr_pages; ++i) >> - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XTAB >> - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; >> + >> + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; >> + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || >> + pagetype == XEN_DOMCTL_PFINFO_BROKEN || >> + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> --countpages; + } >> >> if (!countpages) >> return count; >> @@ -1200,6 +1206,17 @@ >> /* a bogus/unmapped/allocate-only page: skip it */ >> continue; >> >> + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { >> + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + >> { + ERROR("Set p2m for broken page failed, " >> + "dom=%d, pfn=%lx\n", dom, pfn); >> + goto err_mapped; >> + } >> + continue; >> + } >> + >> if (pfn_err[i]) >> { >> ERROR("unexpected PFN mapping failure pfn %lx map_mfn >> %lx p2m_mfn %lx", >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c >> --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 >> 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) >> gmfn = pfn_to_mfn(gmfn); >> >> + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + >> { + pfn_type[j] |= pfn_batch[j]; >> + ++run; >> + continue; >> + } >> + >> if ( pfn_err[j] ) >> { >> if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) @@ >> -1371,8 +1378,12 @@ } >> } >> >> - /* skip pages that aren't present or are alloc-only >> */ + /* + * skip pages that aren't >> present, + * or are broken, or are alloc-only + >> */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB >> + || pagetype == XEN_DOMCTL_PFINFO_BROKEN >> || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> continue; >> >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h >> --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 >> +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 @@ >> -575,6 +575,17 @@ xc_domaininfo_t *info); >> >> /** >> + * This function set p2m for broken page >> + * &parm xch a handle to an open hypervisor interface >> + * @parm domid the domain id which broken page belong to >> + * @parm pfn the pfn number of the broken page >> + * @return 0 on success, -1 on failure >> + */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn); >> + >> +/** >> * This function returns information about the context of a hvm >> domain >> * @parm xch a handle to an open hypervisor interface >> * @parm domid the domain to get information from >> diff -r d675797494bd -r 730dd3f22a12 >> xen/arch/x86/cpu/mcheck/mcaction.c --- >> a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 >> 11:08:37 2012 +0800 @@ -1,5 +1,6 @@ #include #include >> +#include >> #include "mcaction.h" >> #include "vmce.h" >> #include "mce.h" >> @@ -91,6 +92,24 @@ >> goto vmce_failed; >> } >> >> + if ( is_hvm_domain(d) && >> !d->arch.hvm_domain.dirty_vram && + >> paging_mode_log_dirty(d) ) + { >> + /* >> + * vMCE occur during migration + >> * + * At sender, it marks broken page to dirty >> bitmap, + * so that at copypages stage of >> migration, brokan + * page's pfn_type and pfn >> number would be transferred + * to target and >> then take appropriate action. + * + >> * At target, it would set p2m as p2m_ram_broken for + >> * broken page, so that if guest access the broken page + >> * again, it would kill itself as expected. + >> */ + paging_mark_dirty(d, mfn); + } >> + >> if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) >> { printk("Unmap broken memory %lx for DOM%d >> failed\n", >> diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c >> --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 >> +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 @@ >> -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) >> { >> unsigned long type = 0; >> + p2m_type_t t; >> >> - page = get_page_from_gfn(d, arr[j], NULL, >> P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], >> &t, P2M_ALLOC); >> >> if ( unlikely(!page) || >> unlikely(is_xen_heap_page(page)) ) >> - type = XEN_DOMCTL_PFINFO_XTAB; + >> { + if ( p2m_is_broken(t) ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; + >> else + type = XEN_DOMCTL_PFINFO_XTAB; + >> } else >> { >> switch( page->u.inuse.type_info & >> PGT_type_mask ) @@ -235,6 +241,9 @@ >> >> if ( page->u.inuse.type_info & PGT_pinned ) >> type |= XEN_DOMCTL_PFINFO_LPINTAB; + >> + if ( page->count_info & PGC_broken ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; >> } >> >> if ( page ) >> @@ -1568,6 +1577,29 @@ >> } >> break; >> >> + case XEN_DOMCTL_set_broken_page_p2m: >> + { >> + struct domain *d; >> + >> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >> != NULL ) + { >> + p2m_type_t pt; >> + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; >> + mfn_t mfn = get_gfn_query(d, pfn, &pt); + >> + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) >> || + (p2m_change_type(d, pfn, pt, >> p2m_ram_broken) != pt)) ) + ret = -EINVAL; >> + >> + put_gfn(d, pfn); >> + rcu_unlock_domain(d); >> + } >> + else >> + ret = -ESRCH; >> + } >> + break; >> + >> default: >> ret = iommu_do_domctl(domctl, u_domctl); >> break; >> diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h >> --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 >> +0800 +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 >> 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB >> (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid >> page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* >> allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) >> /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) >> >> @@ -835,6 +836,12 @@ >> typedef struct xen_domctl_set_access_required >> xen_domctl_set_access_required_t; >> DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); >> >> +struct xen_domctl_set_broken_page_p2m { >> + uint64_aligned_t pfn; >> +}; >> +typedef struct xen_domctl_set_broken_page_p2m >> xen_domctl_set_broken_page_p2m_t; >> +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + >> struct xen_domctl { uint32_t cmd; >> #define XEN_DOMCTL_createdomain 1 @@ -900,6 >> +907,7 @@ #define XEN_DOMCTL_set_access_required 64 >> #define XEN_DOMCTL_audit_p2m 65 >> #define XEN_DOMCTL_set_virq_handler 66 >> +#define XEN_DOMCTL_set_broken_page_p2m 67 >> #define XEN_DOMCTL_gdbsx_guestmemio 1000 >> #define XEN_DOMCTL_gdbsx_pausevcpu 1001 >> #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 >> +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; >> struct xen_domctl_set_virq_handler set_virq_handler; >> struct xen_domctl_gdbsx_memio gdbsx_guest_memio; >> + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; >> struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; >> struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; >> uint8_t pad[128]; >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:26:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:26:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlyu-0002Cz-EQ; Tue, 06 Nov 2012 16:26:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVlyt-0002Cr-9M for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:26:27 +0000 Received: from [85.158.139.83:11177] by server-9.bemta-5.messagelabs.com id 31/BF-29295-23A39905; Tue, 06 Nov 2012 16:26:26 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352219183!28764054!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5MDM3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13330 invoked from network); 6 Nov 2012 16:26:24 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-15.tower-182.messagelabs.com with SMTP; 6 Nov 2012 16:26:24 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 06 Nov 2012 08:26:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,722,1344236400"; d="scan'208";a="238029792" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by orsmga002.jf.intel.com with ESMTP; 06 Nov 2012 08:26:16 -0800 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:26:16 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 6 Nov 2012 08:26:16 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 00:26:14 +0800 From: "Liu, Jinsong" To: George Dunlap Thread-Topic: [Xen-devel] [PATCH] Handle broken page with regard to migration Thread-Index: AQHNvDVowo0CS0uWQ02/ywhb/M0oqpfc/eBg Date: Tue, 6 Nov 2012 16:26:13 +0000 Message-ID: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "ian.jackson@eu.citrix.com" , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org George Dunlap wrote: > On Fri, Nov 2, 2012 at 3:25 AM, Liu Jinsong > wrote: >> Generally, there are 2 cases: >> 1. broken page occurs before migration >> 2. broken page occurs during migration >> >> At the sender >> for case 1, the broken page would be mapped but not copied to >> target (otherwise it may trigger more serious error, say, SRAR >> error). While its pfn_type and pfn number would be transferred to >> target so that target take appropriate action. >> >> for case 2, mce handler marks the broken page to dirty bitmap, so >> that at copypages stage of migration, its pfn_type and pfn number >> would be transferred to target and then take appropriate action. >> >> At the target >> it would set p2m as p2m_ram_broken for broken page, so that if >> guest access the broken page again, it would kill itself as >> expected. >> >> Suggested-by: George Dunlap >> Signed-off-by: Liu, Jinsong > > Looks good to me -- thanks, Jinsong! > > Acked-by: George Dunlap > Thanks George, for your review and great suggestion :-) >> >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain.c >> --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 >> +++ b/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 @@ >> -283,6 +283,22 @@ return ret; >> } >> >> +/* set broken page p2m */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn) >> +{ >> + int ret; >> + DECLARE_DOMCTL; >> + >> + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; >> + domctl.domain = (domid_t)domid; >> + domctl.u.set_broken_page_p2m.pfn = pfn; >> + ret = do_domctl(xch, &domctl); >> + >> + return ret ? -1 : 0; >> +} >> + >> /* get info from hvm guest for save */ >> int xc_domain_hvm_getcontext(xc_interface *xch, >> uint32_t domid, >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_restore.c >> --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 >> 2012 +0800 @@ -962,9 +962,15 @@ >> >> countpages = count; >> for (i = oldcount; i < buf->nr_pages; ++i) >> - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XTAB >> - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == >> XEN_DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; >> + >> + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; >> + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || >> + pagetype == XEN_DOMCTL_PFINFO_BROKEN || >> + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> --countpages; + } >> >> if (!countpages) >> return count; >> @@ -1200,6 +1206,17 @@ >> /* a bogus/unmapped/allocate-only page: skip it */ >> continue; >> >> + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) + { >> + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + >> { + ERROR("Set p2m for broken page failed, " >> + "dom=%d, pfn=%lx\n", dom, pfn); >> + goto err_mapped; >> + } >> + continue; >> + } >> + >> if (pfn_err[i]) >> { >> ERROR("unexpected PFN mapping failure pfn %lx map_mfn >> %lx p2m_mfn %lx", >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xc_domain_save.c >> --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 >> 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) >> gmfn = pfn_to_mfn(gmfn); >> >> + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) + >> { + pfn_type[j] |= pfn_batch[j]; >> + ++run; >> + continue; >> + } >> + >> if ( pfn_err[j] ) >> { >> if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) @@ >> -1371,8 +1378,12 @@ } >> } >> >> - /* skip pages that aren't present or are alloc-only >> */ + /* + * skip pages that aren't >> present, + * or are broken, or are alloc-only + >> */ if ( pagetype == XEN_DOMCTL_PFINFO_XTAB >> + || pagetype == XEN_DOMCTL_PFINFO_BROKEN >> || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) >> continue; >> >> diff -r d675797494bd -r 730dd3f22a12 tools/libxc/xenctrl.h >> --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 >> +++ b/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 @@ >> -575,6 +575,17 @@ xc_domaininfo_t *info); >> >> /** >> + * This function set p2m for broken page >> + * &parm xch a handle to an open hypervisor interface >> + * @parm domid the domain id which broken page belong to >> + * @parm pfn the pfn number of the broken page >> + * @return 0 on success, -1 on failure >> + */ >> +int xc_set_broken_page_p2m(xc_interface *xch, >> + uint32_t domid, >> + unsigned long pfn); >> + >> +/** >> * This function returns information about the context of a hvm >> domain >> * @parm xch a handle to an open hypervisor interface >> * @parm domid the domain to get information from >> diff -r d675797494bd -r 730dd3f22a12 >> xen/arch/x86/cpu/mcheck/mcaction.c --- >> a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 >> +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 >> 11:08:37 2012 +0800 @@ -1,5 +1,6 @@ #include #include >> +#include >> #include "mcaction.h" >> #include "vmce.h" >> #include "mce.h" >> @@ -91,6 +92,24 @@ >> goto vmce_failed; >> } >> >> + if ( is_hvm_domain(d) && >> !d->arch.hvm_domain.dirty_vram && + >> paging_mode_log_dirty(d) ) + { >> + /* >> + * vMCE occur during migration + >> * + * At sender, it marks broken page to dirty >> bitmap, + * so that at copypages stage of >> migration, brokan + * page's pfn_type and pfn >> number would be transferred + * to target and >> then take appropriate action. + * + >> * At target, it would set p2m as p2m_ram_broken for + >> * broken page, so that if guest access the broken page + >> * again, it would kill itself as expected. + >> */ + paging_mark_dirty(d, mfn); + } >> + >> if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) >> { printk("Unmap broken memory %lx for DOM%d >> failed\n", >> diff -r d675797494bd -r 730dd3f22a12 xen/arch/x86/domctl.c >> --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 >> +++ b/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 @@ >> -209,12 +209,18 @@ for ( j = 0; j < k; j++ ) >> { >> unsigned long type = 0; >> + p2m_type_t t; >> >> - page = get_page_from_gfn(d, arr[j], NULL, >> P2M_ALLOC); + page = get_page_from_gfn(d, arr[j], >> &t, P2M_ALLOC); >> >> if ( unlikely(!page) || >> unlikely(is_xen_heap_page(page)) ) >> - type = XEN_DOMCTL_PFINFO_XTAB; + >> { + if ( p2m_is_broken(t) ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; + >> else + type = XEN_DOMCTL_PFINFO_XTAB; + >> } else >> { >> switch( page->u.inuse.type_info & >> PGT_type_mask ) @@ -235,6 +241,9 @@ >> >> if ( page->u.inuse.type_info & PGT_pinned ) >> type |= XEN_DOMCTL_PFINFO_LPINTAB; + >> + if ( page->count_info & PGC_broken ) >> + type = XEN_DOMCTL_PFINFO_BROKEN; >> } >> >> if ( page ) >> @@ -1568,6 +1577,29 @@ >> } >> break; >> >> + case XEN_DOMCTL_set_broken_page_p2m: >> + { >> + struct domain *d; >> + >> + d = rcu_lock_domain_by_id(domctl->domain); + if ( d >> != NULL ) + { >> + p2m_type_t pt; >> + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; >> + mfn_t mfn = get_gfn_query(d, pfn, &pt); + >> + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) >> || + (p2m_change_type(d, pfn, pt, >> p2m_ram_broken) != pt)) ) + ret = -EINVAL; >> + >> + put_gfn(d, pfn); >> + rcu_unlock_domain(d); >> + } >> + else >> + ret = -ESRCH; >> + } >> + break; >> + >> default: >> ret = iommu_do_domctl(domctl, u_domctl); >> break; >> diff -r d675797494bd -r 730dd3f22a12 xen/include/public/domctl.h >> --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 >> +0800 +++ b/xen/include/public/domctl.h Fri Nov 02 11:08:37 >> 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB >> (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid >> page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* >> allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) >> /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) >> >> @@ -835,6 +836,12 @@ >> typedef struct xen_domctl_set_access_required >> xen_domctl_set_access_required_t; >> DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); >> >> +struct xen_domctl_set_broken_page_p2m { >> + uint64_aligned_t pfn; >> +}; >> +typedef struct xen_domctl_set_broken_page_p2m >> xen_domctl_set_broken_page_p2m_t; >> +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + >> struct xen_domctl { uint32_t cmd; >> #define XEN_DOMCTL_createdomain 1 @@ -900,6 >> +907,7 @@ #define XEN_DOMCTL_set_access_required 64 >> #define XEN_DOMCTL_audit_p2m 65 >> #define XEN_DOMCTL_set_virq_handler 66 >> +#define XEN_DOMCTL_set_broken_page_p2m 67 >> #define XEN_DOMCTL_gdbsx_guestmemio 1000 >> #define XEN_DOMCTL_gdbsx_pausevcpu 1001 >> #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 >> +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; >> struct xen_domctl_set_virq_handler set_virq_handler; >> struct xen_domctl_gdbsx_memio gdbsx_guest_memio; >> + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; >> struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; >> struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; >> uint8_t pad[128]; >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVm4R-0002QY-F0; Tue, 06 Nov 2012 16:32:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVm4P-0002QS-S0 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:32:10 +0000 Received: from [85.158.137.99:31076] by server-4.bemta-3.messagelabs.com id 00/79-30023-88B39905; Tue, 06 Nov 2012 16:32:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352219526!12926131!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7938 invoked from network); 6 Nov 2012 16:32:08 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 16:32:08 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6GUV8W013901 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 16:30:32 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6GUS8w025583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 16:30:29 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6GUQbH023806; Tue, 6 Nov 2012 10:30:26 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 08:30:26 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 0935D4042D; Tue, 6 Nov 2012 11:17:43 -0500 (EST) Date: Tue, 6 Nov 2012 11:17:42 -0500 From: Konrad Rzeszutek Wilk To: Mojiong Qiu Message-ID: <20121106161742.GJ9966@phenom.dumpdata.com> References: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Mojiong Qiu , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: Re: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 04:08:15PM +0800, Mojiong Qiu wrote: > exit_idle() should be called after irq_enter(), otherwise it throws: That seems odd - wouldn't "smp_x86_platform_ipi" also need the same treatment [edit: I was looking at 3.0 kernel code] ? Ah, this is caused by commit 98ad1cc14a5c4fd658f9d72c6ba5c86dfd3ce0d5 Author: Frederic Weisbecker Date: Fri Oct 7 18:22:09 2011 +0200 x86: Call idle notifier after irq_enter() and it missed the xen-case which means that any kernel v3.3 and newer need this, but earlier do not. Thx. Will put in 3.7 tree. > > [ 2.513020] [ INFO: suspicious RCU usage. ] > [ 2.513076] 3.6.5 #1 Not tainted > [ 2.513128] ------------------------------- > [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! > [ 2.513271] > [ 2.513271] other info that might help us debug this: > [ 2.513271] > [ 2.513388] > [ 2.513388] RCU used illegally from idle CPU! > [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 > [ 2.513511] RCU used illegally from extended quiescent state! > [ 2.513572] 1 lock held by swapper/0/0: > [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 > [ 2.513815] > [ 2.513815] stack backtrace: > [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 > [ 2.513954] Call Trace: > [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 > [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 > [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 > [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 > [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 > [ 2.514381] [] exit_idle+0x43/0x50 > [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 > [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 > [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 > [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 > [ 2.514722] [] ? xen_safe_halt+0x10/0x20 > [ 2.514782] [] ? default_idle+0xba/0x570 > [ 2.514841] [] ? cpu_idle+0xdf/0x140 > [ 2.514900] [] ? rest_init+0x135/0x144 > [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c > [ 2.515022] [] ? start_kernel+0x3db/0x3e8 > [ 2.515081] [] ? repair_env_string+0x5a/0x5a > [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 > [ 2.515202] [] ? xen_start_kernel+0x465/0x46 > > Signed-off-by: Mojiong Qiu > Cc: Konrad Rzeszutek Wilk > Cc: Jeremy Fitzhardinge > Cc: xen-devel@lists.xensource.com > Cc: virtualization@lists.linux-foundation.org > Cc: linux-kernel@vger.kernel.org > Cc: stable@kernel.org (at least to 3.0.y) ^^^- vger.kernel.org You mean 3.3.x > --- > drivers/xen/events.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/xen/events.c b/drivers/xen/events.c > index 912ac81..0be4df3 100644 > --- a/drivers/xen/events.c > +++ b/drivers/xen/events.c > @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) > { > struct pt_regs *old_regs = set_irq_regs(regs); > > + irq_enter(); > #ifdef CONFIG_X86 > exit_idle(); > #endif > - irq_enter(); > > __xen_evtchn_do_upcall(); > > -- > 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:32:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:32:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVm4R-0002QY-F0; Tue, 06 Nov 2012 16:32:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVm4P-0002QS-S0 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:32:10 +0000 Received: from [85.158.137.99:31076] by server-4.bemta-3.messagelabs.com id 00/79-30023-88B39905; Tue, 06 Nov 2012 16:32:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352219526!12926131!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7938 invoked from network); 6 Nov 2012 16:32:08 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 16:32:08 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6GUV8W013901 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 16:30:32 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6GUS8w025583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 16:30:29 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6GUQbH023806; Tue, 6 Nov 2012 10:30:26 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 08:30:26 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 0935D4042D; Tue, 6 Nov 2012 11:17:43 -0500 (EST) Date: Tue, 6 Nov 2012 11:17:42 -0500 From: Konrad Rzeszutek Wilk To: Mojiong Qiu Message-ID: <20121106161742.GJ9966@phenom.dumpdata.com> References: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Mojiong Qiu , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: Re: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 04:08:15PM +0800, Mojiong Qiu wrote: > exit_idle() should be called after irq_enter(), otherwise it throws: That seems odd - wouldn't "smp_x86_platform_ipi" also need the same treatment [edit: I was looking at 3.0 kernel code] ? Ah, this is caused by commit 98ad1cc14a5c4fd658f9d72c6ba5c86dfd3ce0d5 Author: Frederic Weisbecker Date: Fri Oct 7 18:22:09 2011 +0200 x86: Call idle notifier after irq_enter() and it missed the xen-case which means that any kernel v3.3 and newer need this, but earlier do not. Thx. Will put in 3.7 tree. > > [ 2.513020] [ INFO: suspicious RCU usage. ] > [ 2.513076] 3.6.5 #1 Not tainted > [ 2.513128] ------------------------------- > [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! > [ 2.513271] > [ 2.513271] other info that might help us debug this: > [ 2.513271] > [ 2.513388] > [ 2.513388] RCU used illegally from idle CPU! > [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 > [ 2.513511] RCU used illegally from extended quiescent state! > [ 2.513572] 1 lock held by swapper/0/0: > [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 > [ 2.513815] > [ 2.513815] stack backtrace: > [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 > [ 2.513954] Call Trace: > [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 > [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 > [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 > [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 > [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 > [ 2.514381] [] exit_idle+0x43/0x50 > [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 > [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 > [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 > [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 > [ 2.514722] [] ? xen_safe_halt+0x10/0x20 > [ 2.514782] [] ? default_idle+0xba/0x570 > [ 2.514841] [] ? cpu_idle+0xdf/0x140 > [ 2.514900] [] ? rest_init+0x135/0x144 > [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c > [ 2.515022] [] ? start_kernel+0x3db/0x3e8 > [ 2.515081] [] ? repair_env_string+0x5a/0x5a > [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 > [ 2.515202] [] ? xen_start_kernel+0x465/0x46 > > Signed-off-by: Mojiong Qiu > Cc: Konrad Rzeszutek Wilk > Cc: Jeremy Fitzhardinge > Cc: xen-devel@lists.xensource.com > Cc: virtualization@lists.linux-foundation.org > Cc: linux-kernel@vger.kernel.org > Cc: stable@kernel.org (at least to 3.0.y) ^^^- vger.kernel.org You mean 3.3.x > --- > drivers/xen/events.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/xen/events.c b/drivers/xen/events.c > index 912ac81..0be4df3 100644 > --- a/drivers/xen/events.c > +++ b/drivers/xen/events.c > @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) > { > struct pt_regs *old_regs = set_irq_regs(regs); > > + irq_enter(); > #ifdef CONFIG_X86 > exit_idle(); > #endif > - irq_enter(); > > __xen_evtchn_do_upcall(); > > -- > 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:46:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:46:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmHd-0002q3-LB; Tue, 06 Nov 2012 16:45:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmHb-0002pr-Vv for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:45:48 +0000 Received: from [85.158.137.99:29567] by server-5.bemta-3.messagelabs.com id 36/4A-26311-ABE39905; Tue, 06 Nov 2012 16:45:46 +0000 X-Env-Sender: lukas@laukamp.me X-Msg-Ref: server-14.tower-217.messagelabs.com!1352220345!17877770!1 X-Originating-IP: [5.9.218.245] X-SpamReason: No, hits=0.2 required=7.0 tests=RCVD_ILLEGAL_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18793 invoked from network); 6 Nov 2012 16:45:45 -0000 Received: from mailer0.lippux.de (HELO mailer0.lippux.de) (5.9.218.245) by server-14.tower-217.messagelabs.com with SMTP; 6 Nov 2012 16:45:45 -0000 Received: from localhost (localhost [127.0.0.1]) by mailer0.lippux.de (Postfix) with ESMTP id 7C1B02C205; Tue, 6 Nov 2012 17:45:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailer1.lippux.de Received: from mailer0.lippux.de ([127.0.0.1]) by localhost (mailer0.lippux.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tn5SWoBDanWJ; Tue, 6 Nov 2012 17:45:42 +0100 (CET) Received: from [192.168.25.10] (ashlynn.lippux.de [5.9.218.242]) by mailer0.lippux.de (Postfix) with ESMTPSA id 47F242C1EF; Tue, 6 Nov 2012 17:45:41 +0100 (CET) Message-ID: <50993EAE.5040301@laukamp.me> Date: Tue, 06 Nov 2012 17:45:34 +0100 From: Lukas Laukamp User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <50991C68.4070103@laukamp.me> <1352213764.12977.8.camel@hastur.hellion.org.uk> In-Reply-To: <1352213764.12977.8.camel@hastur.hellion.org.uk> Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Am 06.11.2012 15:56, schrieb Ian Campbell: > On Tue, 2012-11-06 at 14:19 +0000, Lukas Laukamp wrote: >> Hello all, >> >> I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now >> PyGrub seems to be damaged. It fails with following issue: >> >> Traceback (most recent call last): >> File "/usr/lib/xen/bin/pygrub", line 20, in >> import xen.lowlevel.xc >> ImportError: No module named xen.lowlevel.xc >> >> So I don't know if this is a bug or a normal issue. I sent this mail to >> the user and devel list. > In general please don't cross post. If you are unsure then the user list > is the best starting point. > >> How could this problem be fixed or does I need >> to wait for a patch? > This issue is described on the wiki. Please see > http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout > >> Best Regards >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel Hello all, I recompiled and build the deb package with that option. Now everything is fine. So thanks for the fast reply and sorry for my mistake. Best Regards _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:46:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:46:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmHd-0002q3-LB; Tue, 06 Nov 2012 16:45:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmHb-0002pr-Vv for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 16:45:48 +0000 Received: from [85.158.137.99:29567] by server-5.bemta-3.messagelabs.com id 36/4A-26311-ABE39905; Tue, 06 Nov 2012 16:45:46 +0000 X-Env-Sender: lukas@laukamp.me X-Msg-Ref: server-14.tower-217.messagelabs.com!1352220345!17877770!1 X-Originating-IP: [5.9.218.245] X-SpamReason: No, hits=0.2 required=7.0 tests=RCVD_ILLEGAL_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18793 invoked from network); 6 Nov 2012 16:45:45 -0000 Received: from mailer0.lippux.de (HELO mailer0.lippux.de) (5.9.218.245) by server-14.tower-217.messagelabs.com with SMTP; 6 Nov 2012 16:45:45 -0000 Received: from localhost (localhost [127.0.0.1]) by mailer0.lippux.de (Postfix) with ESMTP id 7C1B02C205; Tue, 6 Nov 2012 17:45:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailer1.lippux.de Received: from mailer0.lippux.de ([127.0.0.1]) by localhost (mailer0.lippux.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tn5SWoBDanWJ; Tue, 6 Nov 2012 17:45:42 +0100 (CET) Received: from [192.168.25.10] (ashlynn.lippux.de [5.9.218.242]) by mailer0.lippux.de (Postfix) with ESMTPSA id 47F242C1EF; Tue, 6 Nov 2012 17:45:41 +0100 (CET) Message-ID: <50993EAE.5040301@laukamp.me> Date: Tue, 06 Nov 2012 17:45:34 +0100 From: Lukas Laukamp User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <50991C68.4070103@laukamp.me> <1352213764.12977.8.camel@hastur.hellion.org.uk> In-Reply-To: <1352213764.12977.8.camel@hastur.hellion.org.uk> Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [User Problem/Possible Bug] Possible PyGrub Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Am 06.11.2012 15:56, schrieb Ian Campbell: > On Tue, 2012-11-06 at 14:19 +0000, Lukas Laukamp wrote: >> Hello all, >> >> I compiled latest Xen 4.2 stable with deb target on Debian Squeeze. Now >> PyGrub seems to be damaged. It fails with following issue: >> >> Traceback (most recent call last): >> File "/usr/lib/xen/bin/pygrub", line 20, in >> import xen.lowlevel.xc >> ImportError: No module named xen.lowlevel.xc >> >> So I don't know if this is a bug or a normal issue. I sent this mail to >> the user and devel list. > In general please don't cross post. If you are unsure then the user list > is the best starting point. > >> How could this problem be fixed or does I need >> to wait for a patch? > This issue is described on the wiki. Please see > http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout > >> Best Regards >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel Hello all, I recompiled and build the deb package with that option. Now everything is fine. So thanks for the fast reply and sorry for my mistake. Best Regards _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:56:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmRU-00038Z-TU; Tue, 06 Nov 2012 16:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmRT-00038U-RZ for xen-devel@lists.xen.org; Tue, 06 Nov 2012 16:56:00 +0000 Received: from [85.158.139.211:34641] by server-11.bemta-5.messagelabs.com id 6E/C0-03409-F1149905; Tue, 06 Nov 2012 16:55:59 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352220957!18685794!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3224 invoked from network); 6 Nov 2012 16:55:58 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 16:55:58 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6Gtmn4006531 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 16:55:49 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Gtl1N013856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 16:55:48 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6GtkLX005505; Tue, 6 Nov 2012 10:55:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 08:55:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C13D04042D; Tue, 6 Nov 2012 11:43:03 -0500 (EST) Date: Tue, 6 Nov 2012 11:43:03 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121106164303.GO9966@phenom.dumpdata.com> References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 04:23:57PM +0000, Liu, Jinsong wrote: > Stefano Stabellini wrote: > > On Tue, 6 Nov 2012, Liu, Jinsong wrote: > >> Liu, Jinsong wrote: > >>> Stefano Stabellini wrote: > >>>>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >>>>>> index 0e86370..a2af622 100644 > >>>>>> --- a/drivers/xen/Makefile > >>>>>> +++ b/drivers/xen/Makefile > >>>>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > >>>>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > >>>>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > >>>>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > >>>>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > >>>>>> xen-evtchn-y := evtchn.o > >>>>>> xen-gntdev-y := gntdev.o > >>>>>> xen-gntalloc-y := gntalloc.o > >>>> > >>>> it should really depend on ACPI and maybe also X86, otherwise it > >>>> is going to break the ARM build > >>>> > >>>> > >>> > >>> Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC > >>> (which depends on X86_64). > >>> > >> > >> Ah, you and Konrad are right. I ignore XEN_DOM0 varies under > >> different arch. (But seems it not depends on X86 since it's > >> logically an acpi stuff?). > > > > If it is generic ACPI code, than it can depend only on ACPI. > > If it is ACPI code that contains X86 specific info, than it needs to > > depend on X86 too. > > No x86 specific so let's depend on ACPI. Huh? This feature is x86 specific isn't it? I mean it is in the ACPI spec, but only x86 does it right? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 16:56:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 16:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmRU-00038Z-TU; Tue, 06 Nov 2012 16:56:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVmRT-00038U-RZ for xen-devel@lists.xen.org; Tue, 06 Nov 2012 16:56:00 +0000 Received: from [85.158.139.211:34641] by server-11.bemta-5.messagelabs.com id 6E/C0-03409-F1149905; Tue, 06 Nov 2012 16:55:59 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352220957!18685794!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3224 invoked from network); 6 Nov 2012 16:55:58 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 16:55:58 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6Gtmn4006531 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 16:55:49 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Gtl1N013856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 16:55:48 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6GtkLX005505; Tue, 6 Nov 2012 10:55:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 08:55:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C13D04042D; Tue, 6 Nov 2012 11:43:03 -0500 (EST) Date: Tue, 6 Nov 2012 11:43:03 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121106164303.GO9966@phenom.dumpdata.com> References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 04:23:57PM +0000, Liu, Jinsong wrote: > Stefano Stabellini wrote: > > On Tue, 6 Nov 2012, Liu, Jinsong wrote: > >> Liu, Jinsong wrote: > >>> Stefano Stabellini wrote: > >>>>>> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >>>>>> index 0e86370..a2af622 100644 > >>>>>> --- a/drivers/xen/Makefile > >>>>>> +++ b/drivers/xen/Makefile > >>>>>> @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > >>>>>> obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > >>>>>> obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > >>>>>> obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > >>>>>> +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > >>>>>> xen-evtchn-y := evtchn.o > >>>>>> xen-gntdev-y := gntdev.o > >>>>>> xen-gntalloc-y := gntalloc.o > >>>> > >>>> it should really depend on ACPI and maybe also X86, otherwise it > >>>> is going to break the ARM build > >>>> > >>>> > >>> > >>> Hmm, XEN_DOM0 has already depended on ACPI and X86_LOCAL_APIC > >>> (which depends on X86_64). > >>> > >> > >> Ah, you and Konrad are right. I ignore XEN_DOM0 varies under > >> different arch. (But seems it not depends on X86 since it's > >> logically an acpi stuff?). > > > > If it is generic ACPI code, than it can depend only on ACPI. > > If it is ACPI code that contains X86 specific info, than it needs to > > depend on X86 too. > > No x86 specific so let's depend on ACPI. Huh? This feature is x86 specific isn't it? I mean it is in the ACPI spec, but only x86 does it right? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 17:58:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 17:58:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnPf-0004on-Hz; Tue, 06 Nov 2012 17:58:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnPe-0004of-B1 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 17:58:10 +0000 Received: from [85.158.138.51:40840] by server-2.bemta-3.messagelabs.com id 7F/87-04744-1BF49905; Tue, 06 Nov 2012 17:58:09 +0000 X-Env-Sender: linux+xen-devel=lists.xensource.com@arm.linux.org.uk X-Msg-Ref: server-10.tower-174.messagelabs.com!1352224687!24914953!1 X-Originating-IP: [78.32.30.218] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25540 invoked from network); 6 Nov 2012 17:58:08 -0000 Received: from caramon.arm.linux.org.uk (HELO caramon.arm.linux.org.uk) (78.32.30.218) by server-10.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 17:58:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:Content-Type:MIME-Version:Message-ID:Subject:Cc:To:From:Date; bh=z4VDZOloZSwj7JTf1QJlUs7iFVBwOBa73KrdHjjP2lI=; b=c7RbasFWKFzEsDJs7zgUhTnev7E03HcUxgtE6IdpibeWsitqnqhzSLMX9+cllwjqHbIdnEAxHV/ACHVgWwdDYZJe6zjFalpm6NfjzmZDteY2z7b1i3bsbaCwFBMjGwdlbkSXeE1P1+wW7LMH+xz9TyZzSnIB05AZ+MGPMfAIV9g=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:36046) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1TVnPK-0003zB-Kt; Tue, 06 Nov 2012 17:57:50 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1TVnPJ-0007kX-GC; Tue, 06 Nov 2012 17:57:49 +0000 Date: Tue, 6 Nov 2012 17:57:49 +0000 From: Russell King - ARM Linux To: Stefano Stabellini , xen-devel@lists.xensource.com Message-ID: <20121106175749.GO28327@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org My build system is giving me the following errors against an OMAP4 randconfig build against the latest Linus' kernel plus arm-soc: ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! make[2]: *** [__modpost] Error 1 make[2]: Target `_modpost' not remade because of errors. make[1]: *** [modules] Error 2 make: *** [sub-make] Error 2 make: Target `uImage' not remade because of errors. make: Target `modules' not remade because of errors. Full build results and configuration are here: http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 17:58:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 17:58:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnPf-0004on-Hz; Tue, 06 Nov 2012 17:58:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnPe-0004of-B1 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 17:58:10 +0000 Received: from [85.158.138.51:40840] by server-2.bemta-3.messagelabs.com id 7F/87-04744-1BF49905; Tue, 06 Nov 2012 17:58:09 +0000 X-Env-Sender: linux+xen-devel=lists.xensource.com@arm.linux.org.uk X-Msg-Ref: server-10.tower-174.messagelabs.com!1352224687!24914953!1 X-Originating-IP: [78.32.30.218] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25540 invoked from network); 6 Nov 2012 17:58:08 -0000 Received: from caramon.arm.linux.org.uk (HELO caramon.arm.linux.org.uk) (78.32.30.218) by server-10.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 17:58:08 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:Content-Type:MIME-Version:Message-ID:Subject:Cc:To:From:Date; bh=z4VDZOloZSwj7JTf1QJlUs7iFVBwOBa73KrdHjjP2lI=; b=c7RbasFWKFzEsDJs7zgUhTnev7E03HcUxgtE6IdpibeWsitqnqhzSLMX9+cllwjqHbIdnEAxHV/ACHVgWwdDYZJe6zjFalpm6NfjzmZDteY2z7b1i3bsbaCwFBMjGwdlbkSXeE1P1+wW7LMH+xz9TyZzSnIB05AZ+MGPMfAIV9g=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:36046) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1TVnPK-0003zB-Kt; Tue, 06 Nov 2012 17:57:50 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1TVnPJ-0007kX-GC; Tue, 06 Nov 2012 17:57:49 +0000 Date: Tue, 6 Nov 2012 17:57:49 +0000 From: Russell King - ARM Linux To: Stefano Stabellini , xen-devel@lists.xensource.com Message-ID: <20121106175749.GO28327@n2100.arm.linux.org.uk> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org My build system is giving me the following errors against an OMAP4 randconfig build against the latest Linus' kernel plus arm-soc: ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! make[2]: *** [__modpost] Error 1 make[2]: Target `_modpost' not remade because of errors. make[1]: *** [modules] Error 2 make: *** [sub-make] Error 2 make: Target `uImage' not remade because of errors. make: Target `modules' not remade because of errors. Full build results and configuration are here: http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 18:41:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 18:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVo5K-0005Co-9e; Tue, 06 Nov 2012 18:41:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnss-00059u-I0 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 18:28:22 +0000 Received: from [85.158.139.83:40667] by server-15.bemta-5.messagelabs.com id 34/60-26920-5C659905; Tue, 06 Nov 2012 18:28:21 +0000 X-Env-Sender: shuahkhan@gmail.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352226498!24775229!1 X-Originating-IP: [209.85.160.43] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26574 invoked from network); 6 Nov 2012 18:28:20 -0000 Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 18:28:20 -0000 Received: by mail-pb0-f43.google.com with SMTP id jt11so649007pbb.30 for ; Tue, 06 Nov 2012 10:28:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=tnkNvYqJe3tEgVltCiab7M7blJ+adbV+yHBoLAP5uU4=; b=ZVAd8+EkcaHb2MHV/O98c/NHch0qujRyxnpfVw3BSLWAXatrBFk5n68xySvUDjp46s OaKluPmOcqbkPGuARkFhl4pVlEBQ/+f3mVrK/TcurxcPSsLluyEMeb93jcU/DXzcpIRh 9DRRICoE81OrcVRTe4+4E9pP72ZuMsGr8glm5CZ9oKkrCupP7lwPv6k/iFeR2fyDxbu0 zW684iYYit2RY9EASdu98TFGxeEbTBeXUY7Kd6JW9x4Xks/J63d6PGSxGhDEuTuJqQMT EOj+FVPkXfUSK5ZzK207qDrbsZnPkK6sztKkiOdJ07UvVWFuAa0P2bZgxMNpLrhn96BL rPIg== MIME-Version: 1.0 Received: by 10.68.195.9 with SMTP id ia9mr5901027pbc.74.1352226498399; Tue, 06 Nov 2012 10:28:18 -0800 (PST) Received: by 10.68.73.69 with HTTP; Tue, 6 Nov 2012 10:28:18 -0800 (PST) In-Reply-To: References: Date: Tue, 6 Nov 2012 11:28:18 -0700 Message-ID: From: Shuah Khan To: "Liu, Jinsong" X-Mailman-Approved-At: Tue, 06 Nov 2012 18:41:13 +0000 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Oct 25, 2012 at 6:19 AM, Liu, Jinsong wrote: > From f233ad06cf924116693d7d38be9ae9d8c11f8a9b Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Fri, 26 Oct 2012 02:32:48 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and very thin logic level, would take over acpi pad staff. "logic" instead of staff (guessing this is supposed to stuff) > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > and then hypercall to hyervisor for the rest work, say, core parking. hypervisor rest of the work? - could you add more details on what is handled by this think PAD driver and what would be left to the host pad driver. > > Signed-off-by: Liu, Jinsong > --- > drivers/xen/Makefile | 1 + > drivers/xen/xen_acpi_pad.c | 173 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 ++++ > 3 files changed, 191 insertions(+), 0 deletions(-) > create mode 100644 drivers/xen/xen_acpi_pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..a2af622 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > xen-evtchn-y := evtchn.o > xen-gntdev-y := gntdev.o > xen-gntalloc-y := gntalloc.o > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > new file mode 100644 > index 0000000..e7b7dca > --- /dev/null > +++ b/drivers/xen/xen_acpi_pad.c > @@ -0,0 +1,173 @@ > +/* > + * xen_acpi_pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) || \ > + defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static int xen_acpi_pad_idle_cpus(int *num_cpus) > +{ > + int ret; > + > + struct xen_platform_op op = { > + .cmd = XENPF_core_parking, > + .interface_version = XENPF_INTERFACE_VERSION, > + }; > + > + /* set cpu nums expected to be idled */ > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = (uint32_t)*num_cpus; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret) > + return ret; > + > + /* > + * get cpu nums actually be idled > + * cannot get it by using hypercall once (shared with _SET) > + * because of the characteristic of Xen continue_hypercall_on_cpu > + */ > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret) > + return ret; > + > + *num_cpus = op.u.core_parking.idle_nums; > + return 0; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int xen_acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_cpus) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_cpus; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > +{ > + int ret, num_cpus; > + > + num_cpus = xen_acpi_pad_pur(handle); > + if (num_cpus < 0) > + return; > + > + ret = xen_acpi_pad_idle_cpus(&num_cpus); > + if (ret) > + return; > + > + xen_acpi_pad_ost(handle, 0, num_cpus); > +} > + > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + xen_acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int xen_acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver xen_acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = xen_acpi_pad_add, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + /* Only DOM0 is responsible for Xen acpi pad */ > + if (xen_initial_domain()) > + return acpi_bus_register_driver(&xen_acpi_pad_driver); > + > + return -ENODEV; > +} > +subsys_initcall(xen_acpi_pad_init); > + > +#endif > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..0f44376 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 18:41:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 18:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVo5K-0005Co-9e; Tue, 06 Nov 2012 18:41:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVnss-00059u-I0 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 18:28:22 +0000 Received: from [85.158.139.83:40667] by server-15.bemta-5.messagelabs.com id 34/60-26920-5C659905; Tue, 06 Nov 2012 18:28:21 +0000 X-Env-Sender: shuahkhan@gmail.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352226498!24775229!1 X-Originating-IP: [209.85.160.43] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26574 invoked from network); 6 Nov 2012 18:28:20 -0000 Received: from mail-pb0-f43.google.com (HELO mail-pb0-f43.google.com) (209.85.160.43) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 18:28:20 -0000 Received: by mail-pb0-f43.google.com with SMTP id jt11so649007pbb.30 for ; Tue, 06 Nov 2012 10:28:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=tnkNvYqJe3tEgVltCiab7M7blJ+adbV+yHBoLAP5uU4=; b=ZVAd8+EkcaHb2MHV/O98c/NHch0qujRyxnpfVw3BSLWAXatrBFk5n68xySvUDjp46s OaKluPmOcqbkPGuARkFhl4pVlEBQ/+f3mVrK/TcurxcPSsLluyEMeb93jcU/DXzcpIRh 9DRRICoE81OrcVRTe4+4E9pP72ZuMsGr8glm5CZ9oKkrCupP7lwPv6k/iFeR2fyDxbu0 zW684iYYit2RY9EASdu98TFGxeEbTBeXUY7Kd6JW9x4Xks/J63d6PGSxGhDEuTuJqQMT EOj+FVPkXfUSK5ZzK207qDrbsZnPkK6sztKkiOdJ07UvVWFuAa0P2bZgxMNpLrhn96BL rPIg== MIME-Version: 1.0 Received: by 10.68.195.9 with SMTP id ia9mr5901027pbc.74.1352226498399; Tue, 06 Nov 2012 10:28:18 -0800 (PST) Received: by 10.68.73.69 with HTTP; Tue, 6 Nov 2012 10:28:18 -0800 (PST) In-Reply-To: References: Date: Tue, 6 Nov 2012 11:28:18 -0700 Message-ID: From: Shuah Khan To: "Liu, Jinsong" X-Mailman-Approved-At: Tue, 06 Nov 2012 18:41:13 +0000 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Oct 25, 2012 at 6:19 AM, Liu, Jinsong wrote: > From f233ad06cf924116693d7d38be9ae9d8c11f8a9b Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Fri, 26 Oct 2012 02:32:48 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and very thin logic level, would take over acpi pad staff. "logic" instead of staff (guessing this is supposed to stuff) > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > and then hypercall to hyervisor for the rest work, say, core parking. hypervisor rest of the work? - could you add more details on what is handled by this think PAD driver and what would be left to the host pad driver. > > Signed-off-by: Liu, Jinsong > --- > drivers/xen/Makefile | 1 + > drivers/xen/xen_acpi_pad.c | 173 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 ++++ > 3 files changed, 191 insertions(+), 0 deletions(-) > create mode 100644 drivers/xen/xen_acpi_pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..a2af622 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -29,6 +29,7 @@ obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > +obj-$(CONFIG_XEN_DOM0) += xen_acpi_pad.o > xen-evtchn-y := evtchn.o > xen-gntdev-y := gntdev.o > xen-gntalloc-y := gntalloc.o > diff --git a/drivers/xen/xen_acpi_pad.c b/drivers/xen/xen_acpi_pad.c > new file mode 100644 > index 0000000..e7b7dca > --- /dev/null > +++ b/drivers/xen/xen_acpi_pad.c > @@ -0,0 +1,173 @@ > +/* > + * xen_acpi_pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) || \ > + defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static int xen_acpi_pad_idle_cpus(int *num_cpus) > +{ > + int ret; > + > + struct xen_platform_op op = { > + .cmd = XENPF_core_parking, > + .interface_version = XENPF_INTERFACE_VERSION, > + }; > + > + /* set cpu nums expected to be idled */ > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = (uint32_t)*num_cpus; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret) > + return ret; > + > + /* > + * get cpu nums actually be idled > + * cannot get it by using hypercall once (shared with _SET) > + * because of the characteristic of Xen continue_hypercall_on_cpu > + */ > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + ret = HYPERVISOR_dom0_op(&op); > + if (ret) > + return ret; > + > + *num_cpus = op.u.core_parking.idle_nums; > + return 0; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int xen_acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void xen_acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_cpus) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_cpus; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void xen_acpi_pad_handle_notify(acpi_handle handle) > +{ > + int ret, num_cpus; > + > + num_cpus = xen_acpi_pad_pur(handle); > + if (num_cpus < 0) > + return; > + > + ret = xen_acpi_pad_idle_cpus(&num_cpus); > + if (ret) > + return; > + > + xen_acpi_pad_ost(handle, 0, num_cpus); > +} > + > +static void xen_acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + xen_acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int xen_acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, xen_acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver xen_acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = xen_acpi_pad_add, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + /* Only DOM0 is responsible for Xen acpi pad */ > + if (xen_initial_domain()) > + return acpi_bus_register_driver(&xen_acpi_pad_driver); > + > + return -ENODEV; > +} > +subsys_initcall(xen_acpi_pad_init); > + > +#endif > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..0f44376 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 19:53:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 19:53:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpCW-0005ZQ-8F; Tue, 06 Nov 2012 19:52:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpCT-0005ZL-SO for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 19:52:42 +0000 Received: from [85.158.137.99:13772] by server-7.bemta-3.messagelabs.com id 8F/1C-01713-48A69905; Tue, 06 Nov 2012 19:52:36 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352231553!14850071!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14666 invoked from network); 6 Nov 2012 19:52:35 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-9.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 19:52:35 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6JqCX5024514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 19:52:13 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Jq7rW004771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 19:52:08 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6Jq5Dl011821; Tue, 6 Nov 2012 13:52:05 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 11:52:04 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E0D3E4042D; Tue, 6 Nov 2012 14:39:21 -0500 (EST) Date: Tue, 6 Nov 2012 14:39:21 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121106193921.GC28473@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net, key@linux.vnet.ibm.com Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. So how does on test it ? Set it up? Use it? Is there some documentation about it - if so it should be in the patch description. I did a very very cursory look at it, see some of the comments. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 9 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 15 + > drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > drivers/char/tpm/tpm_vtpm.h | 55 +++ > drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/io/tpmif.h | 77 +++++ > 7 files changed, 1391 insertions(+) > create mode 100644 drivers/char/tpm/tpm_vtpm.c > create mode 100644 drivers/char/tpm/tpm_vtpm.h > create mode 100644 drivers/char/tpm/tpm_xen.c > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..08c1010 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,13 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. > + To compile this driver as a module, choose M here; the module > + will be called tpm_xenu. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..16911c5 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > +tpm_xenu-y = tpm_xen.o tpm_vtpm.o > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..2e5a47a 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -130,6 +130,9 @@ struct tpm_chip { > > struct list_head list; > void (*release) (struct device *); > +#if CONFIG_XEN > + void *priv; > +#endif > }; > > #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > @@ -310,6 +313,18 @@ struct tpm_cmd_t { > > ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > > +#ifdef CONFIG_XEN > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->priv; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->priv = priv; > +} > +#endif > + > extern int tpm_get_timeouts(struct tpm_chip *); > extern void tpm_gen_interrupt(struct tpm_chip *); > extern int tpm_do_selftest(struct tpm_chip *); > diff --git a/drivers/char/tpm/tpm_vtpm.c b/drivers/char/tpm/tpm_vtpm.c > new file mode 100644 > index 0000000..7687252 > --- /dev/null > +++ b/drivers/char/tpm/tpm_vtpm.c > @@ -0,0 +1,543 @@ > +/* > + * Copyright (C) 2006 IBM Corporation > + * > + * Authors: > + * Stefan Berger > + * > + * Generic device driver part for device drivers in a virtualized > + * environment. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation, version 2 of the > + * License. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "tpm_vtpm.h" > + > +/* read status bits */ > +enum { > + STATUS_BUSY = 0x01, > + STATUS_DATA_AVAIL = 0x02, > + STATUS_READY = 0x04 > +}; > + > +struct transmission { > + struct list_head next; > + > + unsigned char *request; > + size_t request_len; > + size_t request_buflen; > + > + unsigned char *response; > + size_t response_len; > + size_t response_buflen; > + > + unsigned int flags; > +}; > + > +enum { > + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 > +}; > + > + > +enum { > + DATAEX_FLAG_QUEUED_ONLY = 0x1 > +}; > + > + > +/* local variables */ > + > +/* local function prototypes */ > +static int _vtpm_send_queued(struct tpm_chip *chip); > + > + > +/* ============================================================= > + * Some utility functions > + * ============================================================= > + */ > +static void vtpm_state_init(struct vtpm_state *vtpms) > +{ > + vtpms->current_request = NULL; > + spin_lock_init(&vtpms->req_list_lock); > + init_waitqueue_head(&vtpms->req_wait_queue); > + INIT_LIST_HEAD(&vtpms->queued_requests); > + > + vtpms->current_response = NULL; > + spin_lock_init(&vtpms->resp_list_lock); > + init_waitqueue_head(&vtpms->resp_wait_queue); > + > + vtpms->disconnect_time = jiffies; > +} > + > + > +static inline struct transmission *transmission_alloc(void) > +{ > + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > +} > + > + static unsigned char * That is very weird tabbing? Did you run this patch through scripts/checkpatch.pl ? > +transmission_set_req_buffer(struct transmission *t, > + unsigned char *buffer, size_t len) > +{ > + if (t->request_buflen < len) { > + kfree(t->request); > + t->request = kmalloc(len, GFP_KERNEL); > + if (!t->request) { > + t->request_buflen = 0; > + return NULL; > + } > + t->request_buflen = len; > + } > + > + memcpy(t->request, buffer, len); > + t->request_len = len; > + > + return t->request; > +} > + > + static unsigned char * > +transmission_set_res_buffer(struct transmission *t, > + const unsigned char *buffer, size_t len) > +{ > + if (t->response_buflen < len) { > + kfree(t->response); > + t->response = kmalloc(len, GFP_ATOMIC); > + if (!t->response) { > + t->response_buflen = 0; > + return NULL; > + } > + t->response_buflen = len; > + } > + > + memcpy(t->response, buffer, len); > + t->response_len = len; > + > + return t->response; > +} > + > +static inline void transmission_free(struct transmission *t) > +{ > + kfree(t->request); > + kfree(t->response); > + kfree(t); > +} > + > +/* ============================================================= > + * Interface with the lower layer driver > + * ============================================================= > + */ > +/* > + * Lower layer uses this function to make a response available. > + */ > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, > + void *ptr) > +{ > + unsigned long flags; > + int ret_size = 0; > + struct transmission *t; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * The list with requests must contain one request > + * only and the element there must be the one that > + * was passed to me from the front-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if (vtpms->current_request != ptr) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return 0; > + } > + t = vtpms->current_request; > + if (t) { > + transmission_free(t); > + vtpms->current_request = NULL; > + } > + > + t = transmission_alloc(); > + if (t) { > + if (!transmission_set_res_buffer(t, buffer, count)) { > + transmission_free(t); > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return -ENOMEM; > + } > + ret_size = count; > + vtpms->current_response = t; > + wake_up_interruptible(&vtpms->resp_wait_queue); > + } > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + > + return ret_size; > +} > + > + > +/* > + * Lower layer indicates its status (connected/disconnected) > + */ > +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) > +{ > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + vtpms->vd_status = vd_status; > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) > + vtpms->disconnect_time = jiffies; > +} > + > +/* ============================================================= > + * Interface with the generic TPM driver > + * ============================================================= > + */ > +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * Check if the previous operation only queued the command > + * In this case there won't be a response, so I just > + * return from here and reset that flag. In any other > + * case I should receive a response from the back-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { > + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + /* > + * The first few commands (measurements) must be > + * queued since it might not be possible to talk to the > + * TPM, yet. > + * Return a response of up to 30 '0's. > + */ > + > + count = min_t(size_t, count, 30); > + memset(buf, 0x0, count); > + return count; > + } > + /* > + * Check whether something is in the responselist and if > + * there's nothing in the list wait for something to appear. > + */ > + > + if (!vtpms->current_response) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, > + 1000); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + rc = min(count, t->response_len); > + memcpy(buf, t->response, rc); > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct transmission *t = transmission_alloc(); > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + if (!t) > + return -ENOMEM; > + /* > + * If there's a current request, it must be the > + * previous request that has timed out. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + if (vtpms->current_request != NULL) { > + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" > + " Previous request must have timed out.\n"); > + transmission_free(vtpms->current_request); > + vtpms->current_request = NULL; > + } > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + /* > + * Queue the packet if the driver below is not > + * ready, yet, or there is any packet already > + * in the queue. > + * If the driver below is ready, unqueue all > + * packets first before sending our current > + * packet. > + * For each unqueued packet, except for the > + * last (=current) packet, call the function > + * tpm_xen_recv to wait for the response to come > + * back. > + */ > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { > + if (time_after(jiffies, > + vtpms->disconnect_time + HZ * 10)) { > + rc = -ENOENT; > + } else { > + goto queue_it; > + } > + } else { > + /* > + * Send all queued packets. > + */ > + if (_vtpm_send_queued(chip) == 0) { > + > + vtpms->current_request = t; > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + buf, > + count, > + t); > + /* > + * The generic TPM driver will call > + * the function to receive the response. > + */ > + if (rc < 0) { > + vtpms->current_request = NULL; > + goto queue_it; > + } > + } else { > +queue_it: > + if (!transmission_set_req_buffer(t, buf, count)) { > + transmission_free(t); > + rc = -ENOMEM; > + goto exit; > + } > + /* > + * An error occurred. Don't event try > + * to send the current request. Just > + * queue it. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; > + list_add_tail(&t->next, &vtpms->queued_requests); > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + } > + } > + > +exit: > + return rc; > +} > + > + > +/* > + * Send all queued requests. > + */ > +static int _vtpm_send_queued(struct tpm_chip *chip) > +{ > + int rc; > + int error = 0; > + unsigned long flags; > + unsigned char buffer[1]; > + struct vtpm_state *vtpms; > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + > + while (!list_empty(&vtpms->queued_requests)) { > + /* > + * Need to dequeue them. > + * Read the result into a dummy buffer. > + */ > + struct transmission *qt = (struct transmission *) > + vtpms->queued_requests.next; > + list_del(&qt->next); > + vtpms->current_request = qt; > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + qt->request, > + qt->request_len, > + qt); > + > + if (rc < 0) { > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + qt = vtpms->current_request; > + if (qt != NULL) { > + /* > + * requeue it at the beginning > + * of the list > + */ > + list_add(&qt->next, > + &vtpms->queued_requests); > + } > + vtpms->current_request = NULL; > + error = 1; > + break; > + } > + /* > + * After this point qt is not valid anymore! > + * It is freed when the front-end is delivering > + * the data by calling tpm_recv > + */ > + /* > + * Receive response into provided dummy buffer > + */ > + rc = vtpm_recv(chip, buffer, sizeof(buffer)); > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + } > + > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + return error; > +} > + > +static void vtpm_cancel(struct tpm_chip *chip) > +{ > + unsigned long flags; > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + > + if (!vtpms->current_response && vtpms->current_request) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on(&vtpms->resp_wait_queue); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > +} > + > +static u8 vtpm_status(struct tpm_chip *chip) > +{ > + u8 rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + /* > + * Data are available if: > + * - there's a current response > + * - the last packet was queued only (this is fake, but necessary to > + * get the generic TPM layer to call the receive function.) > + */ > + if (vtpms->current_response || > + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { > + rc = STATUS_DATA_AVAIL; > + } else if (!vtpms->current_response && !vtpms->current_request) { > + rc = STATUS_READY; > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static const struct file_operations vtpm_ops = { > + .owner = THIS_MODULE, > + .llseek = no_llseek, > + .open = tpm_open, > + .read = tpm_read, > + .write = tpm_write, > + .release = tpm_release, > +}; > + > +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > + NULL); > +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > + > +static struct attribute *vtpm_attrs[] = { > + &dev_attr_pubek.attr, > + &dev_attr_pcrs.attr, > + &dev_attr_enabled.attr, > + &dev_attr_active.attr, > + &dev_attr_owned.attr, > + &dev_attr_temp_deactivated.attr, > + &dev_attr_caps.attr, > + &dev_attr_cancel.attr, > + NULL, So are these going to show up in SysFS? If so, there should also be a corresponding file in Documentation/.../sysfs/something. > +}; > + > +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; > + > +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) > + > +static struct tpm_vendor_specific tpm_vtpm = { > + .recv = vtpm_recv, > + .send = vtpm_send, > + .cancel = vtpm_cancel, > + .status = vtpm_status, > + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, > + .req_complete_val = STATUS_DATA_AVAIL, > + .req_canceled = STATUS_READY, > + .attr_group = &vtpm_attr_grp, > + .miscdev = { > + .fops = &vtpm_ops, > + }, > + .duration = { > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + }, > +}; > + > +struct tpm_chip *init_vtpm(struct device *dev, > + struct tpm_private *tp) > +{ > + long rc; > + struct tpm_chip *chip; > + struct vtpm_state *vtpms; > + > + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); > + if (!vtpms) > + return ERR_PTR(-ENOMEM); > + > + vtpm_state_init(vtpms); > + vtpms->tpm_private = tp; > + > + chip = tpm_register_hardware(dev, &tpm_vtpm); > + if (!chip) { > + rc = -ENODEV; > + goto err_free_mem; > + } > + > + chip_set_private(chip, vtpms); > + > + return chip; > + > +err_free_mem: > + kfree(vtpms); > + > + return ERR_PTR(rc); > +} > + > +void cleanup_vtpm(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + tpm_remove_hardware(dev); > + kfree(vtpms); > +} > diff --git a/drivers/char/tpm/tpm_vtpm.h b/drivers/char/tpm/tpm_vtpm.h > new file mode 100644 > index 0000000..d888fd8 > --- /dev/null > +++ b/drivers/char/tpm/tpm_vtpm.h > @@ -0,0 +1,55 @@ > +#ifndef TPM_VTPM_H > +#define TPM_VTPM_H > + > +struct tpm_chip; > +struct tpm_private; > + > +struct vtpm_state { > + struct transmission *current_request; > + spinlock_t req_list_lock; > + wait_queue_head_t req_wait_queue; > + > + struct list_head queued_requests; > + > + struct transmission *current_response; > + spinlock_t resp_list_lock; > + wait_queue_head_t resp_wait_queue; > + > + u8 vd_status; > + u8 flags; > + > + unsigned long disconnect_time; > + > + /* > + * The following is a private structure of the underlying > + * driver. It is passed as parameter in the send function. > + */ > + struct tpm_private *tpm_private; > +}; > + > + > +enum vdev_status { > + TPM_VD_STATUS_DISCONNECTED = 0x0, > + TPM_VD_STATUS_CONNECTED = 0x1 > +}; > + > +/* this function is called from tpm_vtpm.c */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr); > + > +/* these functions are offered by tpm_vtpm.c */ > +struct tpm_chip *init_vtpm(struct device *, > + struct tpm_private *); > +void cleanup_vtpm(struct device *); > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, void *ptr); > +void vtpm_vd_status(const struct tpm_chip *, u8 status); > + > +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = chip_get_private(chip); > + return vtpms->tpm_private; > +} > + > +#endif > diff --git a/drivers/char/tpm/tpm_xen.c b/drivers/char/tpm/tpm_xen.c > new file mode 100644 > index 0000000..7198de3 > --- /dev/null > +++ b/drivers/char/tpm/tpm_xen.c > @@ -0,0 +1,690 @@ > +/* > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from drivers/xen/netfront/netfront.c > + * > + * Copyright (c) 2002-2004, K A Fraser > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License version 2 > + * as published by the Free Software Foundation; or, when distributed > + * separately from the Linux kernel or incorporated into other > + * software packages, subject to the following license: > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this source file (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, copy, modify, > + * merge, publish, distribute, sublicense, and/or sell copies of the Software, > + * and to permit persons to whom the Software is furnished to do so, subject to > + * the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "tpm_vtpm.h" > + > +#undef DEBUG > + > +#define GRANT_INVALID_REF 0 Interesting. The 0 grant value is actually a valid one. I think you want (-1ULL). > + > +/* local structures */ > +struct tpm_private { > + struct tpm_chip *chip; > + > + tpmif_tx_interface_t *tx; > + atomic_t refcnt; > + unsigned int evtchn; > + u8 is_connected; > + u8 is_suspended; > + > + spinlock_t tx_lock; > + > + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; > + > + atomic_t tx_busy; > + void *tx_remember; > + > + domid_t backend_id; > + wait_queue_head_t wait_q; > + > + struct xenbus_device *dev; > + int ring_ref; > +}; > + > +struct tx_buffer { > + unsigned int size; /* available space in data */ > + unsigned int len; /* used space in data */ > + unsigned char *data; /* pointer to a page */ > +}; > + > + > +/* locally visible variables */ > +static grant_ref_t gref_head; > +static struct tpm_private *my_priv; > + > +/* local function prototypes */ > +static irqreturn_t tpmif_int(int irq, > + void *tpm_priv); > +static void tpmif_rx_action(unsigned long unused); > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid); > +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); > +static void tpmif_free_tx_buffers(struct tpm_private *tp); > +static void tpmif_set_connected_state(struct tpm_private *tp, > + u8 newstate); > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int userbuffer, > + void *remember); > +static void destroy_tpmring(struct tpm_private *tp); > + > + static inline int > +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, > + int isuserbuffer) > +{ > + int copied = len; > + > + if (len > txb->size) > + copied = txb->size; > + if (isuserbuffer) { > + if (copy_from_user(txb->data, src, copied)) > + return -EFAULT; > + } else { > + memcpy(txb->data, src, copied); > + } > + txb->len = len; > + return copied; > +} > + > +static inline struct tx_buffer *tx_buffer_alloc(void) > +{ > + struct tx_buffer *txb; > + > + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); > + if (!txb) > + return NULL; > + > + txb->len = 0; > + txb->size = PAGE_SIZE; > + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); > + if (txb->data == NULL) { > + kfree(txb); > + txb = NULL; > + } > + > + return txb; > +} > + > + > +static inline void tx_buffer_free(struct tx_buffer *txb) > +{ > + if (txb) { > + free_page((long)txb->data); > + kfree(txb); > + } > +} > + > +/************************************************************** > + Utility function for the tpm_private structure > + **************************************************************/ > +static void tpm_private_init(struct tpm_private *tp) > +{ > + spin_lock_init(&tp->tx_lock); > + init_waitqueue_head(&tp->wait_q); > + atomic_set(&tp->refcnt, 1); > +} > + > +static void tpm_private_put(void) > +{ > + if (!atomic_dec_and_test(&my_priv->refcnt)) > + return; > + > + tpmif_free_tx_buffers(my_priv); > + kfree(my_priv); > + my_priv = NULL; > +} > + > +static struct tpm_private *tpm_private_get(void) > +{ > + int err; > + > + if (my_priv) { > + atomic_inc(&my_priv->refcnt); > + return my_priv; > + } > + > + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); > + if (!my_priv) > + return NULL; > + > + tpm_private_init(my_priv); > + err = tpmif_allocate_tx_buffers(my_priv); > + if (err < 0) > + tpm_private_put(); > + > + return my_priv; > +} > + > +/************************************************************** > + > + The interface to let the tpm plugin register its callback > + function and send data to another partition using this module > + > + **************************************************************/ > + > +static DEFINE_MUTEX(suspend_lock); > +/* > + * Send data via this module by calling this function > + */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr) > +{ > + int sent; > + > + mutex_lock(&suspend_lock); > + sent = tpm_xmit(tp, buf, count, 0, ptr); > + mutex_unlock(&suspend_lock); > + > + return sent; > +} > + > +/************************************************************** > + XENBUS support code > + **************************************************************/ > + > +static int setup_tpmring(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + tpmif_tx_interface_t *sring; > + int err; > + > + tp->ring_ref = GRANT_INVALID_REF; > + > + sring = (void *)__get_free_page(GFP_KERNEL); > + if (!sring) { > + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); > + return -ENOMEM; > + } > + tp->tx = sring; > + > + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); > + if (err < 0) { > + free_page((unsigned long)sring); > + tp->tx = NULL; > + xenbus_dev_fatal(dev, err, "allocating grant reference"); > + goto fail; > + } > + tp->ring_ref = err; > + > + err = tpmif_connect(dev, tp, dev->otherend_id); > + if (err) > + goto fail; > + > + return 0; > +fail: > + destroy_tpmring(tp); > + return err; > +} > + > + > +static void destroy_tpmring(struct tpm_private *tp) > +{ > + tpmif_set_connected_state(tp, 0); > + > + if (tp->ring_ref != GRANT_INVALID_REF) { > + gnttab_end_foreign_access(tp->ring_ref, > + 0, (unsigned long)tp->tx); > + tp->ring_ref = GRANT_INVALID_REF; > + tp->tx = NULL; > + } > + > + if (tp->evtchn) > + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); > + > + tp->evtchn = GRANT_INVALID_REF; > +} > + > + > +static int talk_to_backend(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + const char *message = NULL; > + int err; > + struct xenbus_transaction xbt; > + > + err = setup_tpmring(dev, tp); > + if (err) { > + xenbus_dev_fatal(dev, err, "setting up ring"); > + goto out; > + } > + > +again: > + err = xenbus_transaction_start(&xbt); > + if (err) { > + xenbus_dev_fatal(dev, err, "starting transaction"); > + goto destroy_tpmring; > + } > + > + err = xenbus_printf(xbt, dev->nodename, > + "ring-ref", "%u", tp->ring_ref); > + if (err) { > + message = "writing ring-ref"; > + goto abort_transaction; > + } > + > + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", > + tp->evtchn); > + if (err) { > + message = "writing event-channel"; > + goto abort_transaction; > + } > + > + err = xenbus_transaction_end(xbt, 0); > + if (err == -EAGAIN) > + goto again; > + if (err) { > + xenbus_dev_fatal(dev, err, "completing transaction"); > + goto destroy_tpmring; > + } > + > + xenbus_switch_state(dev, XenbusStateConnected); > + > + return 0; > + > +abort_transaction: > + xenbus_transaction_end(xbt, 1); > + if (message) > + xenbus_dev_error(dev, err, "%s", message); > +destroy_tpmring: > + destroy_tpmring(tp); > +out: > + return err; > +} > + > +/** > + * Callback received when the backend's state changes. > + */ > +static void backend_changed(struct xenbus_device *dev, > + enum xenbus_state backend_state) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + > + switch (backend_state) { > + case XenbusStateInitialising: > + case XenbusStateInitWait: > + case XenbusStateInitialised: > + case XenbusStateReconfiguring: > + case XenbusStateReconfigured: > + case XenbusStateUnknown: > + break; > + > + case XenbusStateConnected: > + tpmif_set_connected_state(tp, 1); > + break; > + > + case XenbusStateClosing: > + tpmif_set_connected_state(tp, 0); > + xenbus_frontend_closed(dev); > + break; > + > + case XenbusStateClosed: > + tpmif_set_connected_state(tp, 0); > + if (tp->is_suspended == 0) > + device_unregister(&dev->dev); > + xenbus_frontend_closed(dev); > + break; > + } > +} > + > +static int tpmfront_probe(struct xenbus_device *dev, > + const struct xenbus_device_id *id) > +{ > + int err; > + int handle; > + struct tpm_private *tp = tpm_private_get(); > + > + if (!tp) > + return -ENOMEM; > + > + tp->chip = init_vtpm(&dev->dev, tp); > + if (IS_ERR(tp->chip)) > + return PTR_ERR(tp->chip); > + > + err = xenbus_scanf(XBT_NIL, dev->nodename, > + "handle", "%i", &handle); > + if (XENBUS_EXIST_ERR(err)) > + return err; > + > + if (err < 0) { > + xenbus_dev_fatal(dev, err, "reading virtual-device"); > + return err; > + } > + > + tp->dev = dev; > + > + err = talk_to_backend(dev, tp); > + if (err) { > + tpm_private_put(); > + return err; > + } > + > + return 0; > +} > + > + > +static int __devexit tpmfront_remove(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + cleanup_vtpm(&dev->dev); > + return 0; > +} > + > +static int tpmfront_suspend(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + u32 ctr; > + > + /* Take the lock, preventing any application from sending. */ > + mutex_lock(&suspend_lock); > + tp->is_suspended = 1; > + > + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { > + /* Wait for a request to be responded to. */ > + interruptible_sleep_on_timeout(&tp->wait_q, 100); > + } > + > + return 0; > +} > + > +static int tpmfront_suspend_finish(struct tpm_private *tp) > +{ > + tp->is_suspended = 0; > + /* Allow applications to send again. */ > + mutex_unlock(&suspend_lock); > + return 0; > +} > + > +static int tpmfront_resume(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + return talk_to_backend(dev, tp); > +} > + > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid) > +{ > + int err; > + > + tp->backend_id = domid; > + tp->evtchn = GRANT_INVALID_REF; > + > + err = xenbus_alloc_evtchn(dev, &tp->evtchn); > + if (err) > + return err; > + > + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, > + 0, "tpmif", tp); > + if (err <= 0) > + return err; > + > + return 0; > +} > + > +static const struct xenbus_device_id tpmfront_ids[] = { > + { "vtpm" }, > + { "" } > +}; > +MODULE_ALIAS("xen:vtpm"); > + > +static DEFINE_XENBUS_DRIVER(tpmfront, , > + .probe = tpmfront_probe, > + .remove = __devexit_p(tpmfront_remove), > + .resume = tpmfront_resume, > + .otherend_changed = backend_changed, > + .suspend = tpmfront_suspend, > + ); > + > +static int __init init_tpm_xenbus(void) > +{ > + return xenbus_register_frontend(&tpmfront_driver); > +} > + > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { > + tp->tx_buffers[i] = tx_buffer_alloc(); > + if (!tp->tx_buffers[i]) { > + tpmif_free_tx_buffers(tp); > + return -ENOMEM; > + } > + } > + return 0; > +} > + > +static void tpmif_free_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) > + tx_buffer_free(tp->tx_buffers[i]); > +} > + > +static void tpmif_rx_action(unsigned long priv) > +{ > + struct tpm_private *tp = (struct tpm_private *)priv; > + int i = 0; > + unsigned int received; > + unsigned int offset = 0; > + u8 *buffer; > + tpmif_tx_request_t *tx = &tp->tx->ring[i].req; > + > + atomic_set(&tp->tx_busy, 0); > + wake_up_interruptible(&tp->wait_q); > + > + received = tx->size; > + > + buffer = kmalloc(received, GFP_ATOMIC); > + if (!buffer) > + return; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + tpmif_tx_request_t *tx; > + unsigned int tocopy; > + > + tx = &tp->tx->ring[i].req; > + tocopy = tx->size; > + if (tocopy > PAGE_SIZE) > + tocopy = PAGE_SIZE; > + > + memcpy(&buffer[offset], txb->data, tocopy); > + > + gnttab_release_grant_reference(&gref_head, tx->ref); > + > + offset += tocopy; > + } > + > + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); > + kfree(buffer); > +} > + > + > +static irqreturn_t tpmif_int(int irq, void *tpm_priv) > +{ > + struct tpm_private *tp = tpm_priv; > + unsigned long flags; > + > + spin_lock_irqsave(&tp->tx_lock, flags); > + tpmif_rx_tasklet.data = (unsigned long)tp; > + tasklet_schedule(&tpmif_rx_tasklet); > + spin_unlock_irqrestore(&tp->tx_lock, flags); > + > + return IRQ_HANDLED; > +} > + > + > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int isuserbuffer, > + void *remember) > +{ > + tpmif_tx_request_t *tx; > + TPMIF_RING_IDX i; > + unsigned int offset = 0; > + > + spin_lock_irq(&tp->tx_lock); > + > + if (unlikely(atomic_read(&tp->tx_busy))) { > + spin_unlock_irq(&tp->tx_lock); > + return -EBUSY; > + } > + > + if (tp->is_connected != 1) { > + spin_unlock_irq(&tp->tx_lock); > + return -EIO; > + } > + > + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + int copied; > + > + if (!txb) { > + spin_unlock_irq(&tp->tx_lock); > + return -EFAULT; > + } > + > + copied = tx_buffer_copy(txb, &buf[offset], count, > + isuserbuffer); > + if (copied < 0) { > + /* An error occurred */ > + spin_unlock_irq(&tp->tx_lock); > + return copied; > + } > + count -= copied; > + offset += copied; > + > + tx = &tp->tx->ring[i].req; > + tx->addr = virt_to_machine(txb->data).maddr; > + tx->size = txb->len; > + tx->unused = 0; > + > + /* Get the granttable reference for this page. */ > + tx->ref = gnttab_claim_grant_reference(&gref_head); > + if (tx->ref == -ENOSPC) { > + spin_unlock_irq(&tp->tx_lock); > + return -ENOSPC; > + } > + gnttab_grant_foreign_access_ref(tx->ref, > + tp->backend_id, > + virt_to_mfn(txb->data), > + 0 /*RW*/); > + wmb(); > + } > + > + atomic_set(&tp->tx_busy, 1); > + tp->tx_remember = remember; > + > + mb(); > + > + notify_remote_via_evtchn(tp->evtchn); > + > + spin_unlock_irq(&tp->tx_lock); > + return offset; > +} > + > + > +static void tpmif_notify_upperlayer(struct tpm_private *tp) > +{ > + /* Notify upper layer about the state of the connection to the BE. */ > + vtpm_vd_status(tp->chip, (tp->is_connected > + ? TPM_VD_STATUS_CONNECTED > + : TPM_VD_STATUS_DISCONNECTED)); > +} > + > + > +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) > +{ > + /* > + * Don't notify upper layer if we are in suspend mode and > + * should disconnect - assumption is that we will resume > + * The mutex keeps apps from sending. > + */ > + if (is_connected == 0 && tp->is_suspended == 1) > + return; > + > + /* > + * Unlock the mutex if we are connected again > + * after being suspended - now resuming. > + * This also removes the suspend state. > + */ > + if (is_connected == 1 && tp->is_suspended == 1) > + tpmfront_suspend_finish(tp); > + > + if (is_connected != tp->is_connected) { > + tp->is_connected = is_connected; > + tpmif_notify_upperlayer(tp); > + } > +} > + > + > + > +/* ================================================================= > + * Initialization function. > + * ================================================================= > + */ > + > + > +static int __init tpmif_init(void) > +{ > + struct tpm_private *tp; > + > + if (!xen_domain()) > + return -ENODEV; > + > + tp = tpm_private_get(); > + if (!tp) > + return -ENOMEM; > + > + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, > + &gref_head) < 0) { > + tpm_private_put(); > + return -EFAULT; > + } > + > + init_tpm_xenbus(); > + return 0; > +} > + > + > +module_init(tpmif_init); no module_exit? > + > +MODULE_LICENSE("Dual BSD/GPL"); > diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h > new file mode 100644 > index 0000000..5342fca > --- /dev/null > +++ b/include/xen/interface/io/tpmif.h > @@ -0,0 +1,77 @@ > +/****************************************************************************** > + * tpmif.h > + * > + * TPM I/O interface for Xen guest OSes. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from tools/libxc/xen/io/netif.h > + * > + * Copyright (c) 2003-2004, Keir Fraser > + */ > + > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +typedef struct tpmif_tx_request tpmif_tx_request_t; > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +typedef uint32_t TPMIF_RING_IDX; > + > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +typedef struct tpmif_ring tpmif_ring_t; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +typedef struct tpmif_tx_interface tpmif_tx_interface_t; > + > +#endif > + > +/* > + * Local variables: > + * mode: C > + * c-set-style: "BSD" > + * c-basic-offset: 4 > + * tab-width: 4 > + * indent-tabs-mode: nil > + * End: > + */ > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 19:53:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 19:53:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpCW-0005ZQ-8F; Tue, 06 Nov 2012 19:52:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpCT-0005ZL-SO for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 19:52:42 +0000 Received: from [85.158.137.99:13772] by server-7.bemta-3.messagelabs.com id 8F/1C-01713-48A69905; Tue, 06 Nov 2012 19:52:36 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352231553!14850071!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14666 invoked from network); 6 Nov 2012 19:52:35 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-9.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 19:52:35 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6JqCX5024514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 19:52:13 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Jq7rW004771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 19:52:08 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6Jq5Dl011821; Tue, 6 Nov 2012 13:52:05 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 11:52:04 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E0D3E4042D; Tue, 6 Nov 2012 14:39:21 -0500 (EST) Date: Tue, 6 Nov 2012 14:39:21 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121106193921.GC28473@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net, key@linux.vnet.ibm.com Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. So how does on test it ? Set it up? Use it? Is there some documentation about it - if so it should be in the patch description. I did a very very cursory look at it, see some of the comments. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 9 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 15 + > drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > drivers/char/tpm/tpm_vtpm.h | 55 +++ > drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/io/tpmif.h | 77 +++++ > 7 files changed, 1391 insertions(+) > create mode 100644 drivers/char/tpm/tpm_vtpm.c > create mode 100644 drivers/char/tpm/tpm_vtpm.h > create mode 100644 drivers/char/tpm/tpm_xen.c > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..08c1010 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,13 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. > + To compile this driver as a module, choose M here; the module > + will be called tpm_xenu. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..16911c5 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > +tpm_xenu-y = tpm_xen.o tpm_vtpm.o > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..2e5a47a 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -130,6 +130,9 @@ struct tpm_chip { > > struct list_head list; > void (*release) (struct device *); > +#if CONFIG_XEN > + void *priv; > +#endif > }; > > #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > @@ -310,6 +313,18 @@ struct tpm_cmd_t { > > ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > > +#ifdef CONFIG_XEN > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->priv; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->priv = priv; > +} > +#endif > + > extern int tpm_get_timeouts(struct tpm_chip *); > extern void tpm_gen_interrupt(struct tpm_chip *); > extern int tpm_do_selftest(struct tpm_chip *); > diff --git a/drivers/char/tpm/tpm_vtpm.c b/drivers/char/tpm/tpm_vtpm.c > new file mode 100644 > index 0000000..7687252 > --- /dev/null > +++ b/drivers/char/tpm/tpm_vtpm.c > @@ -0,0 +1,543 @@ > +/* > + * Copyright (C) 2006 IBM Corporation > + * > + * Authors: > + * Stefan Berger > + * > + * Generic device driver part for device drivers in a virtualized > + * environment. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation, version 2 of the > + * License. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "tpm_vtpm.h" > + > +/* read status bits */ > +enum { > + STATUS_BUSY = 0x01, > + STATUS_DATA_AVAIL = 0x02, > + STATUS_READY = 0x04 > +}; > + > +struct transmission { > + struct list_head next; > + > + unsigned char *request; > + size_t request_len; > + size_t request_buflen; > + > + unsigned char *response; > + size_t response_len; > + size_t response_buflen; > + > + unsigned int flags; > +}; > + > +enum { > + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 > +}; > + > + > +enum { > + DATAEX_FLAG_QUEUED_ONLY = 0x1 > +}; > + > + > +/* local variables */ > + > +/* local function prototypes */ > +static int _vtpm_send_queued(struct tpm_chip *chip); > + > + > +/* ============================================================= > + * Some utility functions > + * ============================================================= > + */ > +static void vtpm_state_init(struct vtpm_state *vtpms) > +{ > + vtpms->current_request = NULL; > + spin_lock_init(&vtpms->req_list_lock); > + init_waitqueue_head(&vtpms->req_wait_queue); > + INIT_LIST_HEAD(&vtpms->queued_requests); > + > + vtpms->current_response = NULL; > + spin_lock_init(&vtpms->resp_list_lock); > + init_waitqueue_head(&vtpms->resp_wait_queue); > + > + vtpms->disconnect_time = jiffies; > +} > + > + > +static inline struct transmission *transmission_alloc(void) > +{ > + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > +} > + > + static unsigned char * That is very weird tabbing? Did you run this patch through scripts/checkpatch.pl ? > +transmission_set_req_buffer(struct transmission *t, > + unsigned char *buffer, size_t len) > +{ > + if (t->request_buflen < len) { > + kfree(t->request); > + t->request = kmalloc(len, GFP_KERNEL); > + if (!t->request) { > + t->request_buflen = 0; > + return NULL; > + } > + t->request_buflen = len; > + } > + > + memcpy(t->request, buffer, len); > + t->request_len = len; > + > + return t->request; > +} > + > + static unsigned char * > +transmission_set_res_buffer(struct transmission *t, > + const unsigned char *buffer, size_t len) > +{ > + if (t->response_buflen < len) { > + kfree(t->response); > + t->response = kmalloc(len, GFP_ATOMIC); > + if (!t->response) { > + t->response_buflen = 0; > + return NULL; > + } > + t->response_buflen = len; > + } > + > + memcpy(t->response, buffer, len); > + t->response_len = len; > + > + return t->response; > +} > + > +static inline void transmission_free(struct transmission *t) > +{ > + kfree(t->request); > + kfree(t->response); > + kfree(t); > +} > + > +/* ============================================================= > + * Interface with the lower layer driver > + * ============================================================= > + */ > +/* > + * Lower layer uses this function to make a response available. > + */ > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, > + void *ptr) > +{ > + unsigned long flags; > + int ret_size = 0; > + struct transmission *t; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * The list with requests must contain one request > + * only and the element there must be the one that > + * was passed to me from the front-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if (vtpms->current_request != ptr) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return 0; > + } > + t = vtpms->current_request; > + if (t) { > + transmission_free(t); > + vtpms->current_request = NULL; > + } > + > + t = transmission_alloc(); > + if (t) { > + if (!transmission_set_res_buffer(t, buffer, count)) { > + transmission_free(t); > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return -ENOMEM; > + } > + ret_size = count; > + vtpms->current_response = t; > + wake_up_interruptible(&vtpms->resp_wait_queue); > + } > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + > + return ret_size; > +} > + > + > +/* > + * Lower layer indicates its status (connected/disconnected) > + */ > +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) > +{ > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + vtpms->vd_status = vd_status; > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) > + vtpms->disconnect_time = jiffies; > +} > + > +/* ============================================================= > + * Interface with the generic TPM driver > + * ============================================================= > + */ > +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * Check if the previous operation only queued the command > + * In this case there won't be a response, so I just > + * return from here and reset that flag. In any other > + * case I should receive a response from the back-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { > + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + /* > + * The first few commands (measurements) must be > + * queued since it might not be possible to talk to the > + * TPM, yet. > + * Return a response of up to 30 '0's. > + */ > + > + count = min_t(size_t, count, 30); > + memset(buf, 0x0, count); > + return count; > + } > + /* > + * Check whether something is in the responselist and if > + * there's nothing in the list wait for something to appear. > + */ > + > + if (!vtpms->current_response) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, > + 1000); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + rc = min(count, t->response_len); > + memcpy(buf, t->response, rc); > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct transmission *t = transmission_alloc(); > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + if (!t) > + return -ENOMEM; > + /* > + * If there's a current request, it must be the > + * previous request that has timed out. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + if (vtpms->current_request != NULL) { > + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" > + " Previous request must have timed out.\n"); > + transmission_free(vtpms->current_request); > + vtpms->current_request = NULL; > + } > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + /* > + * Queue the packet if the driver below is not > + * ready, yet, or there is any packet already > + * in the queue. > + * If the driver below is ready, unqueue all > + * packets first before sending our current > + * packet. > + * For each unqueued packet, except for the > + * last (=current) packet, call the function > + * tpm_xen_recv to wait for the response to come > + * back. > + */ > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { > + if (time_after(jiffies, > + vtpms->disconnect_time + HZ * 10)) { > + rc = -ENOENT; > + } else { > + goto queue_it; > + } > + } else { > + /* > + * Send all queued packets. > + */ > + if (_vtpm_send_queued(chip) == 0) { > + > + vtpms->current_request = t; > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + buf, > + count, > + t); > + /* > + * The generic TPM driver will call > + * the function to receive the response. > + */ > + if (rc < 0) { > + vtpms->current_request = NULL; > + goto queue_it; > + } > + } else { > +queue_it: > + if (!transmission_set_req_buffer(t, buf, count)) { > + transmission_free(t); > + rc = -ENOMEM; > + goto exit; > + } > + /* > + * An error occurred. Don't event try > + * to send the current request. Just > + * queue it. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; > + list_add_tail(&t->next, &vtpms->queued_requests); > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + } > + } > + > +exit: > + return rc; > +} > + > + > +/* > + * Send all queued requests. > + */ > +static int _vtpm_send_queued(struct tpm_chip *chip) > +{ > + int rc; > + int error = 0; > + unsigned long flags; > + unsigned char buffer[1]; > + struct vtpm_state *vtpms; > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + > + while (!list_empty(&vtpms->queued_requests)) { > + /* > + * Need to dequeue them. > + * Read the result into a dummy buffer. > + */ > + struct transmission *qt = (struct transmission *) > + vtpms->queued_requests.next; > + list_del(&qt->next); > + vtpms->current_request = qt; > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + qt->request, > + qt->request_len, > + qt); > + > + if (rc < 0) { > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + qt = vtpms->current_request; > + if (qt != NULL) { > + /* > + * requeue it at the beginning > + * of the list > + */ > + list_add(&qt->next, > + &vtpms->queued_requests); > + } > + vtpms->current_request = NULL; > + error = 1; > + break; > + } > + /* > + * After this point qt is not valid anymore! > + * It is freed when the front-end is delivering > + * the data by calling tpm_recv > + */ > + /* > + * Receive response into provided dummy buffer > + */ > + rc = vtpm_recv(chip, buffer, sizeof(buffer)); > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + } > + > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + return error; > +} > + > +static void vtpm_cancel(struct tpm_chip *chip) > +{ > + unsigned long flags; > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + > + if (!vtpms->current_response && vtpms->current_request) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on(&vtpms->resp_wait_queue); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > +} > + > +static u8 vtpm_status(struct tpm_chip *chip) > +{ > + u8 rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + /* > + * Data are available if: > + * - there's a current response > + * - the last packet was queued only (this is fake, but necessary to > + * get the generic TPM layer to call the receive function.) > + */ > + if (vtpms->current_response || > + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { > + rc = STATUS_DATA_AVAIL; > + } else if (!vtpms->current_response && !vtpms->current_request) { > + rc = STATUS_READY; > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static const struct file_operations vtpm_ops = { > + .owner = THIS_MODULE, > + .llseek = no_llseek, > + .open = tpm_open, > + .read = tpm_read, > + .write = tpm_write, > + .release = tpm_release, > +}; > + > +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > + NULL); > +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > + > +static struct attribute *vtpm_attrs[] = { > + &dev_attr_pubek.attr, > + &dev_attr_pcrs.attr, > + &dev_attr_enabled.attr, > + &dev_attr_active.attr, > + &dev_attr_owned.attr, > + &dev_attr_temp_deactivated.attr, > + &dev_attr_caps.attr, > + &dev_attr_cancel.attr, > + NULL, So are these going to show up in SysFS? If so, there should also be a corresponding file in Documentation/.../sysfs/something. > +}; > + > +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; > + > +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) > + > +static struct tpm_vendor_specific tpm_vtpm = { > + .recv = vtpm_recv, > + .send = vtpm_send, > + .cancel = vtpm_cancel, > + .status = vtpm_status, > + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, > + .req_complete_val = STATUS_DATA_AVAIL, > + .req_canceled = STATUS_READY, > + .attr_group = &vtpm_attr_grp, > + .miscdev = { > + .fops = &vtpm_ops, > + }, > + .duration = { > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + }, > +}; > + > +struct tpm_chip *init_vtpm(struct device *dev, > + struct tpm_private *tp) > +{ > + long rc; > + struct tpm_chip *chip; > + struct vtpm_state *vtpms; > + > + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); > + if (!vtpms) > + return ERR_PTR(-ENOMEM); > + > + vtpm_state_init(vtpms); > + vtpms->tpm_private = tp; > + > + chip = tpm_register_hardware(dev, &tpm_vtpm); > + if (!chip) { > + rc = -ENODEV; > + goto err_free_mem; > + } > + > + chip_set_private(chip, vtpms); > + > + return chip; > + > +err_free_mem: > + kfree(vtpms); > + > + return ERR_PTR(rc); > +} > + > +void cleanup_vtpm(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + tpm_remove_hardware(dev); > + kfree(vtpms); > +} > diff --git a/drivers/char/tpm/tpm_vtpm.h b/drivers/char/tpm/tpm_vtpm.h > new file mode 100644 > index 0000000..d888fd8 > --- /dev/null > +++ b/drivers/char/tpm/tpm_vtpm.h > @@ -0,0 +1,55 @@ > +#ifndef TPM_VTPM_H > +#define TPM_VTPM_H > + > +struct tpm_chip; > +struct tpm_private; > + > +struct vtpm_state { > + struct transmission *current_request; > + spinlock_t req_list_lock; > + wait_queue_head_t req_wait_queue; > + > + struct list_head queued_requests; > + > + struct transmission *current_response; > + spinlock_t resp_list_lock; > + wait_queue_head_t resp_wait_queue; > + > + u8 vd_status; > + u8 flags; > + > + unsigned long disconnect_time; > + > + /* > + * The following is a private structure of the underlying > + * driver. It is passed as parameter in the send function. > + */ > + struct tpm_private *tpm_private; > +}; > + > + > +enum vdev_status { > + TPM_VD_STATUS_DISCONNECTED = 0x0, > + TPM_VD_STATUS_CONNECTED = 0x1 > +}; > + > +/* this function is called from tpm_vtpm.c */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr); > + > +/* these functions are offered by tpm_vtpm.c */ > +struct tpm_chip *init_vtpm(struct device *, > + struct tpm_private *); > +void cleanup_vtpm(struct device *); > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, void *ptr); > +void vtpm_vd_status(const struct tpm_chip *, u8 status); > + > +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = chip_get_private(chip); > + return vtpms->tpm_private; > +} > + > +#endif > diff --git a/drivers/char/tpm/tpm_xen.c b/drivers/char/tpm/tpm_xen.c > new file mode 100644 > index 0000000..7198de3 > --- /dev/null > +++ b/drivers/char/tpm/tpm_xen.c > @@ -0,0 +1,690 @@ > +/* > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from drivers/xen/netfront/netfront.c > + * > + * Copyright (c) 2002-2004, K A Fraser > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License version 2 > + * as published by the Free Software Foundation; or, when distributed > + * separately from the Linux kernel or incorporated into other > + * software packages, subject to the following license: > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this source file (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, copy, modify, > + * merge, publish, distribute, sublicense, and/or sell copies of the Software, > + * and to permit persons to whom the Software is furnished to do so, subject to > + * the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "tpm_vtpm.h" > + > +#undef DEBUG > + > +#define GRANT_INVALID_REF 0 Interesting. The 0 grant value is actually a valid one. I think you want (-1ULL). > + > +/* local structures */ > +struct tpm_private { > + struct tpm_chip *chip; > + > + tpmif_tx_interface_t *tx; > + atomic_t refcnt; > + unsigned int evtchn; > + u8 is_connected; > + u8 is_suspended; > + > + spinlock_t tx_lock; > + > + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; > + > + atomic_t tx_busy; > + void *tx_remember; > + > + domid_t backend_id; > + wait_queue_head_t wait_q; > + > + struct xenbus_device *dev; > + int ring_ref; > +}; > + > +struct tx_buffer { > + unsigned int size; /* available space in data */ > + unsigned int len; /* used space in data */ > + unsigned char *data; /* pointer to a page */ > +}; > + > + > +/* locally visible variables */ > +static grant_ref_t gref_head; > +static struct tpm_private *my_priv; > + > +/* local function prototypes */ > +static irqreturn_t tpmif_int(int irq, > + void *tpm_priv); > +static void tpmif_rx_action(unsigned long unused); > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid); > +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); > +static void tpmif_free_tx_buffers(struct tpm_private *tp); > +static void tpmif_set_connected_state(struct tpm_private *tp, > + u8 newstate); > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int userbuffer, > + void *remember); > +static void destroy_tpmring(struct tpm_private *tp); > + > + static inline int > +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, > + int isuserbuffer) > +{ > + int copied = len; > + > + if (len > txb->size) > + copied = txb->size; > + if (isuserbuffer) { > + if (copy_from_user(txb->data, src, copied)) > + return -EFAULT; > + } else { > + memcpy(txb->data, src, copied); > + } > + txb->len = len; > + return copied; > +} > + > +static inline struct tx_buffer *tx_buffer_alloc(void) > +{ > + struct tx_buffer *txb; > + > + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); > + if (!txb) > + return NULL; > + > + txb->len = 0; > + txb->size = PAGE_SIZE; > + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); > + if (txb->data == NULL) { > + kfree(txb); > + txb = NULL; > + } > + > + return txb; > +} > + > + > +static inline void tx_buffer_free(struct tx_buffer *txb) > +{ > + if (txb) { > + free_page((long)txb->data); > + kfree(txb); > + } > +} > + > +/************************************************************** > + Utility function for the tpm_private structure > + **************************************************************/ > +static void tpm_private_init(struct tpm_private *tp) > +{ > + spin_lock_init(&tp->tx_lock); > + init_waitqueue_head(&tp->wait_q); > + atomic_set(&tp->refcnt, 1); > +} > + > +static void tpm_private_put(void) > +{ > + if (!atomic_dec_and_test(&my_priv->refcnt)) > + return; > + > + tpmif_free_tx_buffers(my_priv); > + kfree(my_priv); > + my_priv = NULL; > +} > + > +static struct tpm_private *tpm_private_get(void) > +{ > + int err; > + > + if (my_priv) { > + atomic_inc(&my_priv->refcnt); > + return my_priv; > + } > + > + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); > + if (!my_priv) > + return NULL; > + > + tpm_private_init(my_priv); > + err = tpmif_allocate_tx_buffers(my_priv); > + if (err < 0) > + tpm_private_put(); > + > + return my_priv; > +} > + > +/************************************************************** > + > + The interface to let the tpm plugin register its callback > + function and send data to another partition using this module > + > + **************************************************************/ > + > +static DEFINE_MUTEX(suspend_lock); > +/* > + * Send data via this module by calling this function > + */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr) > +{ > + int sent; > + > + mutex_lock(&suspend_lock); > + sent = tpm_xmit(tp, buf, count, 0, ptr); > + mutex_unlock(&suspend_lock); > + > + return sent; > +} > + > +/************************************************************** > + XENBUS support code > + **************************************************************/ > + > +static int setup_tpmring(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + tpmif_tx_interface_t *sring; > + int err; > + > + tp->ring_ref = GRANT_INVALID_REF; > + > + sring = (void *)__get_free_page(GFP_KERNEL); > + if (!sring) { > + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); > + return -ENOMEM; > + } > + tp->tx = sring; > + > + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); > + if (err < 0) { > + free_page((unsigned long)sring); > + tp->tx = NULL; > + xenbus_dev_fatal(dev, err, "allocating grant reference"); > + goto fail; > + } > + tp->ring_ref = err; > + > + err = tpmif_connect(dev, tp, dev->otherend_id); > + if (err) > + goto fail; > + > + return 0; > +fail: > + destroy_tpmring(tp); > + return err; > +} > + > + > +static void destroy_tpmring(struct tpm_private *tp) > +{ > + tpmif_set_connected_state(tp, 0); > + > + if (tp->ring_ref != GRANT_INVALID_REF) { > + gnttab_end_foreign_access(tp->ring_ref, > + 0, (unsigned long)tp->tx); > + tp->ring_ref = GRANT_INVALID_REF; > + tp->tx = NULL; > + } > + > + if (tp->evtchn) > + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); > + > + tp->evtchn = GRANT_INVALID_REF; > +} > + > + > +static int talk_to_backend(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + const char *message = NULL; > + int err; > + struct xenbus_transaction xbt; > + > + err = setup_tpmring(dev, tp); > + if (err) { > + xenbus_dev_fatal(dev, err, "setting up ring"); > + goto out; > + } > + > +again: > + err = xenbus_transaction_start(&xbt); > + if (err) { > + xenbus_dev_fatal(dev, err, "starting transaction"); > + goto destroy_tpmring; > + } > + > + err = xenbus_printf(xbt, dev->nodename, > + "ring-ref", "%u", tp->ring_ref); > + if (err) { > + message = "writing ring-ref"; > + goto abort_transaction; > + } > + > + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", > + tp->evtchn); > + if (err) { > + message = "writing event-channel"; > + goto abort_transaction; > + } > + > + err = xenbus_transaction_end(xbt, 0); > + if (err == -EAGAIN) > + goto again; > + if (err) { > + xenbus_dev_fatal(dev, err, "completing transaction"); > + goto destroy_tpmring; > + } > + > + xenbus_switch_state(dev, XenbusStateConnected); > + > + return 0; > + > +abort_transaction: > + xenbus_transaction_end(xbt, 1); > + if (message) > + xenbus_dev_error(dev, err, "%s", message); > +destroy_tpmring: > + destroy_tpmring(tp); > +out: > + return err; > +} > + > +/** > + * Callback received when the backend's state changes. > + */ > +static void backend_changed(struct xenbus_device *dev, > + enum xenbus_state backend_state) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + > + switch (backend_state) { > + case XenbusStateInitialising: > + case XenbusStateInitWait: > + case XenbusStateInitialised: > + case XenbusStateReconfiguring: > + case XenbusStateReconfigured: > + case XenbusStateUnknown: > + break; > + > + case XenbusStateConnected: > + tpmif_set_connected_state(tp, 1); > + break; > + > + case XenbusStateClosing: > + tpmif_set_connected_state(tp, 0); > + xenbus_frontend_closed(dev); > + break; > + > + case XenbusStateClosed: > + tpmif_set_connected_state(tp, 0); > + if (tp->is_suspended == 0) > + device_unregister(&dev->dev); > + xenbus_frontend_closed(dev); > + break; > + } > +} > + > +static int tpmfront_probe(struct xenbus_device *dev, > + const struct xenbus_device_id *id) > +{ > + int err; > + int handle; > + struct tpm_private *tp = tpm_private_get(); > + > + if (!tp) > + return -ENOMEM; > + > + tp->chip = init_vtpm(&dev->dev, tp); > + if (IS_ERR(tp->chip)) > + return PTR_ERR(tp->chip); > + > + err = xenbus_scanf(XBT_NIL, dev->nodename, > + "handle", "%i", &handle); > + if (XENBUS_EXIST_ERR(err)) > + return err; > + > + if (err < 0) { > + xenbus_dev_fatal(dev, err, "reading virtual-device"); > + return err; > + } > + > + tp->dev = dev; > + > + err = talk_to_backend(dev, tp); > + if (err) { > + tpm_private_put(); > + return err; > + } > + > + return 0; > +} > + > + > +static int __devexit tpmfront_remove(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + cleanup_vtpm(&dev->dev); > + return 0; > +} > + > +static int tpmfront_suspend(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + u32 ctr; > + > + /* Take the lock, preventing any application from sending. */ > + mutex_lock(&suspend_lock); > + tp->is_suspended = 1; > + > + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { > + /* Wait for a request to be responded to. */ > + interruptible_sleep_on_timeout(&tp->wait_q, 100); > + } > + > + return 0; > +} > + > +static int tpmfront_suspend_finish(struct tpm_private *tp) > +{ > + tp->is_suspended = 0; > + /* Allow applications to send again. */ > + mutex_unlock(&suspend_lock); > + return 0; > +} > + > +static int tpmfront_resume(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + return talk_to_backend(dev, tp); > +} > + > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid) > +{ > + int err; > + > + tp->backend_id = domid; > + tp->evtchn = GRANT_INVALID_REF; > + > + err = xenbus_alloc_evtchn(dev, &tp->evtchn); > + if (err) > + return err; > + > + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, > + 0, "tpmif", tp); > + if (err <= 0) > + return err; > + > + return 0; > +} > + > +static const struct xenbus_device_id tpmfront_ids[] = { > + { "vtpm" }, > + { "" } > +}; > +MODULE_ALIAS("xen:vtpm"); > + > +static DEFINE_XENBUS_DRIVER(tpmfront, , > + .probe = tpmfront_probe, > + .remove = __devexit_p(tpmfront_remove), > + .resume = tpmfront_resume, > + .otherend_changed = backend_changed, > + .suspend = tpmfront_suspend, > + ); > + > +static int __init init_tpm_xenbus(void) > +{ > + return xenbus_register_frontend(&tpmfront_driver); > +} > + > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { > + tp->tx_buffers[i] = tx_buffer_alloc(); > + if (!tp->tx_buffers[i]) { > + tpmif_free_tx_buffers(tp); > + return -ENOMEM; > + } > + } > + return 0; > +} > + > +static void tpmif_free_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) > + tx_buffer_free(tp->tx_buffers[i]); > +} > + > +static void tpmif_rx_action(unsigned long priv) > +{ > + struct tpm_private *tp = (struct tpm_private *)priv; > + int i = 0; > + unsigned int received; > + unsigned int offset = 0; > + u8 *buffer; > + tpmif_tx_request_t *tx = &tp->tx->ring[i].req; > + > + atomic_set(&tp->tx_busy, 0); > + wake_up_interruptible(&tp->wait_q); > + > + received = tx->size; > + > + buffer = kmalloc(received, GFP_ATOMIC); > + if (!buffer) > + return; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + tpmif_tx_request_t *tx; > + unsigned int tocopy; > + > + tx = &tp->tx->ring[i].req; > + tocopy = tx->size; > + if (tocopy > PAGE_SIZE) > + tocopy = PAGE_SIZE; > + > + memcpy(&buffer[offset], txb->data, tocopy); > + > + gnttab_release_grant_reference(&gref_head, tx->ref); > + > + offset += tocopy; > + } > + > + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); > + kfree(buffer); > +} > + > + > +static irqreturn_t tpmif_int(int irq, void *tpm_priv) > +{ > + struct tpm_private *tp = tpm_priv; > + unsigned long flags; > + > + spin_lock_irqsave(&tp->tx_lock, flags); > + tpmif_rx_tasklet.data = (unsigned long)tp; > + tasklet_schedule(&tpmif_rx_tasklet); > + spin_unlock_irqrestore(&tp->tx_lock, flags); > + > + return IRQ_HANDLED; > +} > + > + > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int isuserbuffer, > + void *remember) > +{ > + tpmif_tx_request_t *tx; > + TPMIF_RING_IDX i; > + unsigned int offset = 0; > + > + spin_lock_irq(&tp->tx_lock); > + > + if (unlikely(atomic_read(&tp->tx_busy))) { > + spin_unlock_irq(&tp->tx_lock); > + return -EBUSY; > + } > + > + if (tp->is_connected != 1) { > + spin_unlock_irq(&tp->tx_lock); > + return -EIO; > + } > + > + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + int copied; > + > + if (!txb) { > + spin_unlock_irq(&tp->tx_lock); > + return -EFAULT; > + } > + > + copied = tx_buffer_copy(txb, &buf[offset], count, > + isuserbuffer); > + if (copied < 0) { > + /* An error occurred */ > + spin_unlock_irq(&tp->tx_lock); > + return copied; > + } > + count -= copied; > + offset += copied; > + > + tx = &tp->tx->ring[i].req; > + tx->addr = virt_to_machine(txb->data).maddr; > + tx->size = txb->len; > + tx->unused = 0; > + > + /* Get the granttable reference for this page. */ > + tx->ref = gnttab_claim_grant_reference(&gref_head); > + if (tx->ref == -ENOSPC) { > + spin_unlock_irq(&tp->tx_lock); > + return -ENOSPC; > + } > + gnttab_grant_foreign_access_ref(tx->ref, > + tp->backend_id, > + virt_to_mfn(txb->data), > + 0 /*RW*/); > + wmb(); > + } > + > + atomic_set(&tp->tx_busy, 1); > + tp->tx_remember = remember; > + > + mb(); > + > + notify_remote_via_evtchn(tp->evtchn); > + > + spin_unlock_irq(&tp->tx_lock); > + return offset; > +} > + > + > +static void tpmif_notify_upperlayer(struct tpm_private *tp) > +{ > + /* Notify upper layer about the state of the connection to the BE. */ > + vtpm_vd_status(tp->chip, (tp->is_connected > + ? TPM_VD_STATUS_CONNECTED > + : TPM_VD_STATUS_DISCONNECTED)); > +} > + > + > +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) > +{ > + /* > + * Don't notify upper layer if we are in suspend mode and > + * should disconnect - assumption is that we will resume > + * The mutex keeps apps from sending. > + */ > + if (is_connected == 0 && tp->is_suspended == 1) > + return; > + > + /* > + * Unlock the mutex if we are connected again > + * after being suspended - now resuming. > + * This also removes the suspend state. > + */ > + if (is_connected == 1 && tp->is_suspended == 1) > + tpmfront_suspend_finish(tp); > + > + if (is_connected != tp->is_connected) { > + tp->is_connected = is_connected; > + tpmif_notify_upperlayer(tp); > + } > +} > + > + > + > +/* ================================================================= > + * Initialization function. > + * ================================================================= > + */ > + > + > +static int __init tpmif_init(void) > +{ > + struct tpm_private *tp; > + > + if (!xen_domain()) > + return -ENODEV; > + > + tp = tpm_private_get(); > + if (!tp) > + return -ENOMEM; > + > + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, > + &gref_head) < 0) { > + tpm_private_put(); > + return -EFAULT; > + } > + > + init_tpm_xenbus(); > + return 0; > +} > + > + > +module_init(tpmif_init); no module_exit? > + > +MODULE_LICENSE("Dual BSD/GPL"); > diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h > new file mode 100644 > index 0000000..5342fca > --- /dev/null > +++ b/include/xen/interface/io/tpmif.h > @@ -0,0 +1,77 @@ > +/****************************************************************************** > + * tpmif.h > + * > + * TPM I/O interface for Xen guest OSes. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from tools/libxc/xen/io/netif.h > + * > + * Copyright (c) 2003-2004, Keir Fraser > + */ > + > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +typedef struct tpmif_tx_request tpmif_tx_request_t; > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +typedef uint32_t TPMIF_RING_IDX; > + > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +typedef struct tpmif_ring tpmif_ring_t; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +typedef struct tpmif_tx_interface tpmif_tx_interface_t; > + > +#endif > + > +/* > + * Local variables: > + * mode: C > + * c-set-style: "BSD" > + * c-basic-offset: 4 > + * tab-width: 4 > + * indent-tabs-mode: nil > + * End: > + */ > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:14:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpWi-0005px-B8; Tue, 06 Nov 2012 20:13:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpWh-0005ps-3q for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 20:13:35 +0000 Received: from [85.158.143.35:10228] by server-3.bemta-4.messagelabs.com id D4/EE-06841-E6F69905; Tue, 06 Nov 2012 20:13:34 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352232808!11706774!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6143 invoked from network); 6 Nov 2012 20:13:30 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:13:30 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6KDCvc014804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 20:13:13 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6KDBTx015763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 20:13:12 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6KDBoq031926; Tue, 6 Nov 2012 14:13:11 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 12:13:11 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C5FAC4042D; Tue, 6 Nov 2012 15:00:28 -0500 (EST) Date: Tue, 6 Nov 2012 15:00:28 -0500 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xensource.com, roger.pau@citrix.com Message-ID: <20121106200028.GA29457@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] git pull for Jens for 3.8 (xen-blkback related, feature-persistent). X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Roger, I tested the feature-persistent patches and they rolled out succesfully out of the test system. This is a bootup test with 32/64 dom0, 32/64 PV/PVHVM domU, with new and old OS-es. I am thinking to send a git pull on Friday to Jens so that they will be part of Linux v3.8. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:14:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpWi-0005px-B8; Tue, 06 Nov 2012 20:13:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpWh-0005ps-3q for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 20:13:35 +0000 Received: from [85.158.143.35:10228] by server-3.bemta-4.messagelabs.com id D4/EE-06841-E6F69905; Tue, 06 Nov 2012 20:13:34 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352232808!11706774!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjY2OTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6143 invoked from network); 6 Nov 2012 20:13:30 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:13:30 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6KDCvc014804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 20:13:13 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6KDBTx015763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 20:13:12 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6KDBoq031926; Tue, 6 Nov 2012 14:13:11 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 12:13:11 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C5FAC4042D; Tue, 6 Nov 2012 15:00:28 -0500 (EST) Date: Tue, 6 Nov 2012 15:00:28 -0500 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xensource.com, roger.pau@citrix.com Message-ID: <20121106200028.GA29457@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] git pull for Jens for 3.8 (xen-blkback related, feature-persistent). X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Roger, I tested the feature-persistent patches and they rolled out succesfully out of the test system. This is a bootup test with 32/64 dom0, 32/64 PV/PVHVM domU, with new and old OS-es. I am thinking to send a git pull on Friday to Jens so that they will be part of Linux v3.8. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:28:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:28:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpl0-0005zq-PO; Tue, 06 Nov 2012 20:28:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpkz-0005zl-8m for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:28:21 +0000 Received: from [193.109.254.147:48098] by server-9.bemta-14.messagelabs.com id 06/4F-30773-4E279905; Tue, 06 Nov 2012 20:28:20 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-10.tower-27.messagelabs.com!1352233699!3695439!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTY3MQ==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTY3MQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4687 invoked from network); 6 Nov 2012 20:28:20 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:28:20 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV7qE= Received: from probook.site (ip-80-226-24-4.vodafone-net.de [80.226.24.4]) by smtp.strato.de (josoe mo11) (RZmta 30.22 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id 002fb9oA6KHuvU for ; Tue, 6 Nov 2012 21:28:19 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 8574A189BB; Tue, 6 Nov 2012 21:28:16 +0100 (CET) Date: Tue, 6 Nov 2012 21:28:16 +0100 From: Olaf Hering To: xen-devel@lists.xen.org Message-ID: <20121106202816.GA29655@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Subject: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org We got a customer report about long-lasting and then failing live migration of busy guests. The guest has 64G memory, is busy with its set of applications and as a result there will be always dirty pages to transfer. While some of this can be solved with faster network connection, the underlying issue is that tools/libxc/xc_domain_save.c:xc_domain_save will suspend a domain after a given number of iterations to transfer the remaining dirty pages. From what I understand this pausing of the guest (I dont know how long it is actually paused) is causing issues within the guest, the applications start to fail (again, no details). Their suggestion is to add some knob to the overall live migration process to avoid the suspend. If the guest could not be transfered with the parameters passed to xc_domain_save(), abort the migration and let it running on the old host. My questions are: Was such issue ever seen elsewhere? Should 'xm migrate --live' and 'xl migrate' get something like a --no-suspend option? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:28:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:28:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpl0-0005zq-PO; Tue, 06 Nov 2012 20:28:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpkz-0005zl-8m for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:28:21 +0000 Received: from [193.109.254.147:48098] by server-9.bemta-14.messagelabs.com id 06/4F-30773-4E279905; Tue, 06 Nov 2012 20:28:20 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-10.tower-27.messagelabs.com!1352233699!3695439!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTY3MQ==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTY3MQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4687 invoked from network); 6 Nov 2012 20:28:20 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-10.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:28:20 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV7qE= Received: from probook.site (ip-80-226-24-4.vodafone-net.de [80.226.24.4]) by smtp.strato.de (josoe mo11) (RZmta 30.22 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id 002fb9oA6KHuvU for ; Tue, 6 Nov 2012 21:28:19 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 8574A189BB; Tue, 6 Nov 2012 21:28:16 +0100 (CET) Date: Tue, 6 Nov 2012 21:28:16 +0100 From: Olaf Hering To: xen-devel@lists.xen.org Message-ID: <20121106202816.GA29655@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Subject: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org We got a customer report about long-lasting and then failing live migration of busy guests. The guest has 64G memory, is busy with its set of applications and as a result there will be always dirty pages to transfer. While some of this can be solved with faster network connection, the underlying issue is that tools/libxc/xc_domain_save.c:xc_domain_save will suspend a domain after a given number of iterations to transfer the remaining dirty pages. From what I understand this pausing of the guest (I dont know how long it is actually paused) is causing issues within the guest, the applications start to fail (again, no details). Their suggestion is to add some knob to the overall live migration process to avoid the suspend. If the guest could not be transfered with the parameters passed to xc_domain_save(), abort the migration and let it running on the old host. My questions are: Was such issue ever seen elsewhere? Should 'xm migrate --live' and 'xl migrate' get something like a --no-suspend option? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:41:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:41:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpxH-0006A3-2o; Tue, 06 Nov 2012 20:41:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpxF-00069x-4J for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:41:01 +0000 Received: from [85.158.137.99:48918] by server-6.bemta-3.messagelabs.com id 09/35-28265-CD579905; Tue, 06 Nov 2012 20:41:00 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352234457!12952810!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 689 invoked from network); 6 Nov 2012 20:40:59 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:40:59 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6Ketee009677 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 20:40:56 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Ket6h000328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 20:40:55 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6KescZ015014; Tue, 6 Nov 2012 14:40:54 -0600 MIME-Version: 1.0 Message-ID: Date: Tue, 6 Nov 2012 12:40:54 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> <5098E9FC02000078000A69A7@nat28.tlf.novell.com> In-Reply-To: <5098E9FC02000078000A69A7@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 06, 2012 2:44 AM > To: Dan Magenheimer > Cc: xen-devel@lists.xen.org; keir@xen.org > Subject: RE: 32bit xen and "claim" > > >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: > > Does it make sense to have a runtime option that unsets the > > physical limit but disallows legacy PV guests? If this > > defaults to false for machines with RAM<=5TB but to true > > for machines with RAM>5TB, then the feature is "done" > > (AND we have put a stake in the ground to begin the > > slow obsolescence of PV functionality). > > That would be interesting: Mukesh's PVH code wasn't even > posted yet, i.e. you're proposing to render systems with more > than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 > kernel runnable in that environment). Good point. BUT... couldn't a PV dom0 started with dom0_mem=X (where X is smaller than 5GB) still work? > But yes, the plan is to extend the 1:1 mapping beyond 5Tb for > non-PV guests, and going through actual mapping code only > when acting in the context of a (64-bit) PV guest (even 32-bit > PV guests can have the full 1:1 mapping). That makes sense. I guess I am just worried that this will require enough surgery that there will be a long bug tail. And, since 5TB machines will be quite rare for the next year or so, deprecating PV domains on those machines earlier than on smaller machines might have a much smaller impact on the Xen community. But this is all just a suggestion... I will stop now and leave it in your capable hands. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:41:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:41:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpxH-0006A3-2o; Tue, 06 Nov 2012 20:41:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVpxF-00069x-4J for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:41:01 +0000 Received: from [85.158.137.99:48918] by server-6.bemta-3.messagelabs.com id 09/35-28265-CD579905; Tue, 06 Nov 2012 20:41:00 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352234457!12952810!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 689 invoked from network); 6 Nov 2012 20:40:59 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 20:40:59 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6Ketee009677 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 20:40:56 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Ket6h000328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 20:40:55 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6KescZ015014; Tue, 6 Nov 2012 14:40:54 -0600 MIME-Version: 1.0 Message-ID: Date: Tue, 6 Nov 2012 12:40:54 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> <5098E9FC02000078000A69A7@nat28.tlf.novell.com> In-Reply-To: <5098E9FC02000078000A69A7@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 06, 2012 2:44 AM > To: Dan Magenheimer > Cc: xen-devel@lists.xen.org; keir@xen.org > Subject: RE: 32bit xen and "claim" > > >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: > > Does it make sense to have a runtime option that unsets the > > physical limit but disallows legacy PV guests? If this > > defaults to false for machines with RAM<=5TB but to true > > for machines with RAM>5TB, then the feature is "done" > > (AND we have put a stake in the ground to begin the > > slow obsolescence of PV functionality). > > That would be interesting: Mukesh's PVH code wasn't even > posted yet, i.e. you're proposing to render systems with more > than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 > kernel runnable in that environment). Good point. BUT... couldn't a PV dom0 started with dom0_mem=X (where X is smaller than 5GB) still work? > But yes, the plan is to extend the 1:1 mapping beyond 5Tb for > non-PV guests, and going through actual mapping code only > when acting in the context of a (64-bit) PV guest (even 32-bit > PV guests can have the full 1:1 mapping). That makes sense. I guess I am just worried that this will require enough surgery that there will be a long bug tail. And, since 5TB machines will be quite rare for the next year or so, deprecating PV domains on those machines earlier than on smaller machines might have a much smaller impact on the Xen community. But this is all just a suggestion... I will stop now and leave it in your capable hands. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:46:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVq2D-0006Hx-Ql; Tue, 06 Nov 2012 20:46:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVq2C-0006Hn-Lz for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:46:08 +0000 Received: from [85.158.143.99:8991] by server-1.bemta-4.messagelabs.com id 05/B1-27934-F0779905; Tue, 06 Nov 2012 20:46:07 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352234766!23635410!1 X-Originating-IP: [209.85.212.169] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17870 invoked from network); 6 Nov 2012 20:46:07 -0000 Received: from mail-wi0-f169.google.com (HELO mail-wi0-f169.google.com) (209.85.212.169) by server-12.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 20:46:07 -0000 Received: by mail-wi0-f169.google.com with SMTP id hq4so4195564wib.2 for ; Tue, 06 Nov 2012 12:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=6bij7HM2hRkaJNGzcJBCUYy22VaCNFJ8Ohg1eVOf9uw=; b=x/aZvlKrFT49AG62LZ/zQmRuU9NhEyoZ13ltcZYa0EkEd5CaVr7f2OOEVLoylJLyvB ToQI/0BT7MUgPVpgSR7VJtA0iJ6wanqLuPeJo8GvzszkGprE4BfS9uzd5EbczmjHyOEh Y9zcqC9NHYW7Swbi9irRI2k+G1II5FfwxkO9ss7LZj2PbdPVb1dLyflyz4B1RqynZix8 etc8LBlk5adOZLKEXF+WKz+67uZW0faKFkth38gkwnaPA8N/Ldl0sxm3Z+fPg4I14f2n 0dKZGqTBBs2JD9VhXB22kV1rul9df/+wHHnbv3vjcSKTodU/jBvaZZeW2K1z7dOoYE0R OuEA== Received: by 10.216.216.220 with SMTP id g70mr992502wep.83.1352234766723; Tue, 06 Nov 2012 12:46:06 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id f1sm406675wiy.2.2012.11.06.12.46.04 (version=SSLv3 cipher=OTHER); Tue, 06 Nov 2012 12:46:05 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 06 Nov 2012 20:45:57 +0000 From: Keir Fraser To: Olaf Hering , Message-ID: Thread-Topic: [Xen-devel] reliable live migration of large and busy guests Thread-Index: Ac28X7iuJoEeR0oq00CwgKZ5PLR1MQ== In-Reply-To: <20121106202816.GA29655@aepfle.de> Mime-version: 1.0 Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/2012 20:28, "Olaf Hering" wrote: > We got a customer report about long-lasting and then failing live > migration of busy guests. > > The guest has 64G memory, is busy with its set of applications and as a > result there will be always dirty pages to transfer. While some of this > can be solved with faster network connection, the underlying issue is > that tools/libxc/xc_domain_save.c:xc_domain_save will suspend a domain > after a given number of iterations to transfer the remaining dirty > pages. From what I understand this pausing of the guest (I dont know how > long it is actually paused) is causing issues within the guest, the > applications start to fail (again, no details). > > Their suggestion is to add some knob to the overall live migration > process to avoid the suspend. If the guest could not be transfered with > the parameters passed to xc_domain_save(), abort the migration and let > it running on the old host. > > > My questions are: > Was such issue ever seen elsewhere? It's known that if you have a workload that is dirtying lots of pages quickly, the final stop-and-copy phase will necessarily be large. A VM that is busy dirtying lots of pages can dirty pages much quicker than they can be transferred over the LAN. > Should 'xm migrate --live' and 'xl migrate' get something like a > --no-suspend option? Well, it is not really possible to avoid the suspend altogether, there is always going to be some minimal 'dirty working set'. But could provide parameters to require the dirty working set to be smaller than X pages within Y rounds of dirty page copying. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 20:46:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 20:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVq2D-0006Hx-Ql; Tue, 06 Nov 2012 20:46:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVq2C-0006Hn-Lz for xen-devel@lists.xen.org; Tue, 06 Nov 2012 20:46:08 +0000 Received: from [85.158.143.99:8991] by server-1.bemta-4.messagelabs.com id 05/B1-27934-F0779905; Tue, 06 Nov 2012 20:46:07 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352234766!23635410!1 X-Originating-IP: [209.85.212.169] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17870 invoked from network); 6 Nov 2012 20:46:07 -0000 Received: from mail-wi0-f169.google.com (HELO mail-wi0-f169.google.com) (209.85.212.169) by server-12.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 20:46:07 -0000 Received: by mail-wi0-f169.google.com with SMTP id hq4so4195564wib.2 for ; Tue, 06 Nov 2012 12:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=6bij7HM2hRkaJNGzcJBCUYy22VaCNFJ8Ohg1eVOf9uw=; b=x/aZvlKrFT49AG62LZ/zQmRuU9NhEyoZ13ltcZYa0EkEd5CaVr7f2OOEVLoylJLyvB ToQI/0BT7MUgPVpgSR7VJtA0iJ6wanqLuPeJo8GvzszkGprE4BfS9uzd5EbczmjHyOEh Y9zcqC9NHYW7Swbi9irRI2k+G1II5FfwxkO9ss7LZj2PbdPVb1dLyflyz4B1RqynZix8 etc8LBlk5adOZLKEXF+WKz+67uZW0faKFkth38gkwnaPA8N/Ldl0sxm3Z+fPg4I14f2n 0dKZGqTBBs2JD9VhXB22kV1rul9df/+wHHnbv3vjcSKTodU/jBvaZZeW2K1z7dOoYE0R OuEA== Received: by 10.216.216.220 with SMTP id g70mr992502wep.83.1352234766723; Tue, 06 Nov 2012 12:46:06 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id f1sm406675wiy.2.2012.11.06.12.46.04 (version=SSLv3 cipher=OTHER); Tue, 06 Nov 2012 12:46:05 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 06 Nov 2012 20:45:57 +0000 From: Keir Fraser To: Olaf Hering , Message-ID: Thread-Topic: [Xen-devel] reliable live migration of large and busy guests Thread-Index: Ac28X7iuJoEeR0oq00CwgKZ5PLR1MQ== In-Reply-To: <20121106202816.GA29655@aepfle.de> Mime-version: 1.0 Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/2012 20:28, "Olaf Hering" wrote: > We got a customer report about long-lasting and then failing live > migration of busy guests. > > The guest has 64G memory, is busy with its set of applications and as a > result there will be always dirty pages to transfer. While some of this > can be solved with faster network connection, the underlying issue is > that tools/libxc/xc_domain_save.c:xc_domain_save will suspend a domain > after a given number of iterations to transfer the remaining dirty > pages. From what I understand this pausing of the guest (I dont know how > long it is actually paused) is causing issues within the guest, the > applications start to fail (again, no details). > > Their suggestion is to add some knob to the overall live migration > process to avoid the suspend. If the guest could not be transfered with > the parameters passed to xc_domain_save(), abort the migration and let > it running on the old host. > > > My questions are: > Was such issue ever seen elsewhere? It's known that if you have a workload that is dirtying lots of pages quickly, the final stop-and-copy phase will necessarily be large. A VM that is busy dirtying lots of pages can dirty pages much quicker than they can be transferred over the LAN. > Should 'xm migrate --live' and 'xl migrate' get something like a > --no-suspend option? Well, it is not really possible to avoid the suspend altogether, there is always going to be some minimal 'dirty working set'. But could provide parameters to require the dirty working set to be smaller than X pages within Y rounds of dirty page copying. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:18:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:18:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqWq-0006YJ-FT; Tue, 06 Nov 2012 21:17:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqWp-0006YC-09 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:17:47 +0000 Received: from [193.109.254.147:61376] by server-16.bemta-14.messagelabs.com id 25/37-09215-A7E79905; Tue, 06 Nov 2012 21:17:46 +0000 X-Env-Sender: execooler@gmail.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352236664!9851980!1 X-Originating-IP: [209.85.219.43] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_20_30,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22913 invoked from network); 6 Nov 2012 21:17:45 -0000 Received: from mail-oa0-f43.google.com (HELO mail-oa0-f43.google.com) (209.85.219.43) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:17:45 -0000 Received: by mail-oa0-f43.google.com with SMTP id k1so1250901oag.30 for ; Tue, 06 Nov 2012 13:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=DDP5lft5ArXtJjLMfBCdGg5+7/8rEqmmSYuKNbw5rzQ=; b=hN0bHLZaWJ6z6YVjnCXHr3YWWQyBeNqaGcLwoGy4oGVsZ11Hz2SoK+7oiL04iUJ9LM E4fby12rnRthHx+rFU8LZfKytM8gBLeLdf5vZzdkwx3oQD/dB13hqUIDDyilXFPbOjYz PkU6niw2+BDoMvU7ngAnxWkR/Xx06i5ILvsfOlHX0inG4Zo6wNgzkMr6cJHkCVtpcwY5 a0EqpfjmwkDJbu0W9Mlh2gjFT7Wg8cVSfyZCrhyXfsC4lGx4iIjWRtcPUXIv5K5+paKe 6HHykgcSMMeezmE74fud/nKfGrsRPdTgQEu9UC4j7J+MeeWYaui1i6QQDGPUeZlc075w mlqA== MIME-Version: 1.0 Received: by 10.60.14.200 with SMTP id r8mr2065513oec.45.1352236663795; Tue, 06 Nov 2012 13:17:43 -0800 (PST) Received: by 10.76.21.135 with HTTP; Tue, 6 Nov 2012 13:17:43 -0800 (PST) Date: Wed, 7 Nov 2012 01:17:43 +0400 Message-ID: From: eXeC001er To: Xen-devel Subject: [Xen-devel] Communication interface between Dom0 and DomU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0433666895913037025==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0433666895913037025== Content-Type: multipart/alternative; boundary=e89a8fb201caff6f8604cdda21d4 --e89a8fb201caff6f8604cdda21d4 Content-Type: text/plain; charset=UTF-8 Hello. Is it available a communication interface between Dom0 and DomU to get some parameteres about DomU without connection via ssh? For example i need to get information about IP addresses that are allocated in DomU. I found following mail-thread: http://xen.1045712.n5.nabble.com/How-to-get-domU-IP-address-td2510278.html Keir Fraser said about xenstore, but as i understand to use xenstore need DomU should be started as PV-DomU or not ? I see that XenServer has xentool, that allow to control DomU and get information about it, but cannot find any info about the communication interface, that is used by the tools. Thanks. --e89a8fb201caff6f8604cdda21d4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello.

Is it available a communication interface between= Dom0 and DomU to get some parameteres about DomU without connection via ss= h?
For example i need to get information about IP addresses that = are allocated in DomU.
I found following mail-thread:



Keir Fraser said about xenstore, but as = i understand to use xenstore need DomU should be started as PV-DomU or not = ?

I see that XenServer has xentool, that allow to = control DomU and get information about it, but cannot find any info about t= he communication interface, that is used by the tools.

Thanks.
--e89a8fb201caff6f8604cdda21d4-- --===============0433666895913037025== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0433666895913037025==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 21:18:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:18:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqWq-0006YJ-FT; Tue, 06 Nov 2012 21:17:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqWp-0006YC-09 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:17:47 +0000 Received: from [193.109.254.147:61376] by server-16.bemta-14.messagelabs.com id 25/37-09215-A7E79905; Tue, 06 Nov 2012 21:17:46 +0000 X-Env-Sender: execooler@gmail.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352236664!9851980!1 X-Originating-IP: [209.85.219.43] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_20_30,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22913 invoked from network); 6 Nov 2012 21:17:45 -0000 Received: from mail-oa0-f43.google.com (HELO mail-oa0-f43.google.com) (209.85.219.43) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:17:45 -0000 Received: by mail-oa0-f43.google.com with SMTP id k1so1250901oag.30 for ; Tue, 06 Nov 2012 13:17:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=DDP5lft5ArXtJjLMfBCdGg5+7/8rEqmmSYuKNbw5rzQ=; b=hN0bHLZaWJ6z6YVjnCXHr3YWWQyBeNqaGcLwoGy4oGVsZ11Hz2SoK+7oiL04iUJ9LM E4fby12rnRthHx+rFU8LZfKytM8gBLeLdf5vZzdkwx3oQD/dB13hqUIDDyilXFPbOjYz PkU6niw2+BDoMvU7ngAnxWkR/Xx06i5ILvsfOlHX0inG4Zo6wNgzkMr6cJHkCVtpcwY5 a0EqpfjmwkDJbu0W9Mlh2gjFT7Wg8cVSfyZCrhyXfsC4lGx4iIjWRtcPUXIv5K5+paKe 6HHykgcSMMeezmE74fud/nKfGrsRPdTgQEu9UC4j7J+MeeWYaui1i6QQDGPUeZlc075w mlqA== MIME-Version: 1.0 Received: by 10.60.14.200 with SMTP id r8mr2065513oec.45.1352236663795; Tue, 06 Nov 2012 13:17:43 -0800 (PST) Received: by 10.76.21.135 with HTTP; Tue, 6 Nov 2012 13:17:43 -0800 (PST) Date: Wed, 7 Nov 2012 01:17:43 +0400 Message-ID: From: eXeC001er To: Xen-devel Subject: [Xen-devel] Communication interface between Dom0 and DomU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0433666895913037025==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0433666895913037025== Content-Type: multipart/alternative; boundary=e89a8fb201caff6f8604cdda21d4 --e89a8fb201caff6f8604cdda21d4 Content-Type: text/plain; charset=UTF-8 Hello. Is it available a communication interface between Dom0 and DomU to get some parameteres about DomU without connection via ssh? For example i need to get information about IP addresses that are allocated in DomU. I found following mail-thread: http://xen.1045712.n5.nabble.com/How-to-get-domU-IP-address-td2510278.html Keir Fraser said about xenstore, but as i understand to use xenstore need DomU should be started as PV-DomU or not ? I see that XenServer has xentool, that allow to control DomU and get information about it, but cannot find any info about the communication interface, that is used by the tools. Thanks. --e89a8fb201caff6f8604cdda21d4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello.

Is it available a communication interface between= Dom0 and DomU to get some parameteres about DomU without connection via ss= h?
For example i need to get information about IP addresses that = are allocated in DomU.
I found following mail-thread:


Keir Fraser said about xenstore, but as = i understand to use xenstore need DomU should be started as PV-DomU or not = ?

I see that XenServer has xentool, that allow to = control DomU and get information about it, but cannot find any info about t= he communication interface, that is used by the tools.

Thanks.
--e89a8fb201caff6f8604cdda21d4-- --===============0433666895913037025== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0433666895913037025==-- From xen-devel-bounces@lists.xen.org Tue Nov 06 21:32:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:32:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqkx-0006iD-UD; Tue, 06 Nov 2012 21:32:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqkw-0006i8-N5 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:32:22 +0000 Received: from [85.158.138.51:56373] by server-13.bemta-3.messagelabs.com id 3B/CD-24887-1E189905; Tue, 06 Nov 2012 21:32:17 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352237535!20944990!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20017 invoked from network); 6 Nov 2012 21:32:17 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 21:32:17 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6LVtQK031064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 21:31:57 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6LVsGR024347 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 21:31:54 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6LVqjr023487; Tue, 6 Nov 2012 15:31:52 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 13:31:52 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C7C164042D; Tue, 6 Nov 2012 16:19:09 -0500 (EST) Date: Tue, 6 Nov 2012 16:19:09 -0500 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xensource.com, Stefano Stabellini Message-ID: <20121106211909.GA32682@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Ian Campbell Subject: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Stefano, I setup a cross ARM build system so that the generic changes won't cause build issues on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix for that). But more interestingly the build system I do also makes a variations of config entries. So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. I found out that with: CONFIG_XEN_GNTDEV=m I get this ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) commit e1a982642262820d68779c06de64f8857a040f5a Author: Konrad Rzeszutek Wilk Date: Tue Nov 6 15:49:27 2012 -0500 xen/generic: Disable fallback build on ARM. As there is no need for it (the fallback code is for older hypervisors and they won't run under ARM), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more Signed-off-by: Konrad Rzeszutek Wilk diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..273d2b9 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,8 +1,8 @@ ifneq ($(CONFIG_ARM),y) -obj-y += manage.o balloon.o +obj-y += manage.o balloon.o fallback.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:32:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:32:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqkx-0006iD-UD; Tue, 06 Nov 2012 21:32:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqkw-0006i8-N5 for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:32:22 +0000 Received: from [85.158.138.51:56373] by server-13.bemta-3.messagelabs.com id 3B/CD-24887-1E189905; Tue, 06 Nov 2012 21:32:17 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352237535!20944990!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20017 invoked from network); 6 Nov 2012 21:32:17 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-6.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 21:32:17 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6LVtQK031064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 21:31:57 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6LVsGR024347 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 21:31:54 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6LVqjr023487; Tue, 6 Nov 2012 15:31:52 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 13:31:52 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C7C164042D; Tue, 6 Nov 2012 16:19:09 -0500 (EST) Date: Tue, 6 Nov 2012 16:19:09 -0500 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xensource.com, Stefano Stabellini Message-ID: <20121106211909.GA32682@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Ian Campbell Subject: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Stefano, I setup a cross ARM build system so that the generic changes won't cause build issues on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix for that). But more interestingly the build system I do also makes a variations of config entries. So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. I found out that with: CONFIG_XEN_GNTDEV=m I get this ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) commit e1a982642262820d68779c06de64f8857a040f5a Author: Konrad Rzeszutek Wilk Date: Tue Nov 6 15:49:27 2012 -0500 xen/generic: Disable fallback build on ARM. As there is no need for it (the fallback code is for older hypervisors and they won't run under ARM), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more Signed-off-by: Konrad Rzeszutek Wilk diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..273d2b9 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,8 +1,8 @@ ifneq ($(CONFIG_ARM),y) -obj-y += manage.o balloon.o +obj-y += manage.o balloon.o fallback.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:39:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:39:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqrc-0006rY-TB; Tue, 06 Nov 2012 21:39:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqrb-0006rT-Lm for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:39:15 +0000 Received: from [85.158.139.211:53646] by server-15.bemta-5.messagelabs.com id D7/19-26920-28389905; Tue, 06 Nov 2012 21:39:14 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352237954!19103509!1 X-Originating-IP: [74.125.82.171] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25508 invoked from network); 6 Nov 2012 21:39:14 -0000 Received: from mail-we0-f171.google.com (HELO mail-we0-f171.google.com) (74.125.82.171) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:39:14 -0000 Received: by mail-we0-f171.google.com with SMTP id s43so529295wey.30 for ; Tue, 06 Nov 2012 13:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=iQTyLM8Lqk6ygBBqVpFz2RFtzSglSYJHKi4lz45amzg=; b=XUGdwbP/wRfTzKhbkaAvusI7PwOGuS4Wq2L3kHiXWcIAZyt7HwmhPgp+XPjxsTDlXU 5WFLGFVsgnao/LZA63+Ye+PM84K/52517mfd8KisSlgd1tHwuEED9LCKfY29f0DKbeRx 0ZvhAYNIDVgMr0H/AQc+OkSqnhP9D4Tl9oRE1yguVWtPR/GZdT5MSHqyPCW0AFntT6fQ i7L3PYM+CBR3oMpXXcMZKV+qU0z8Xdm91DGhyTutxR19bqvkz2ij4pemuNeA0J+qb/hz snmSeBaV8VTJ53EZ+iwxFl55NVE9j7iW2bIlhxR7bRtemtGis3fzzfCO+nMiAye0Y9Hs nJZQ== Received: by 10.216.206.152 with SMTP id l24mr1067364weo.66.1352237953941; Tue, 06 Nov 2012 13:39:13 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id k20sm555789wiv.11.2012.11.06.13.39.12 (version=SSLv3 cipher=OTHER); Tue, 06 Nov 2012 13:39:13 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 06 Nov 2012 21:39:07 +0000 From: Keir Fraser To: eXeC001er , Xen-devel Message-ID: Thread-Topic: [Xen-devel] Communication interface between Dom0 and DomU Thread-Index: Ac28ZyYSWvIVqLASNk2S6XroAnapvg== In-Reply-To: Mime-version: 1.0 Subject: Re: [Xen-devel] Communication interface between Dom0 and DomU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/2012 21:17, "eXeC001er" wrote: > Hello. > > Is it available a communication interface between Dom0 and DomU to get some > parameteres about DomU without connection via ssh? > For example i need to get information about IP addresses that are allocated in > DomU. > I found following mail-thread: > > http://xen.1045712.n5.nabble.com/How-to-get-domU-IP-address-td2510278.html > > > Keir Fraser said about xenstore, but as i understand to use xenstore need DomU > should be started as PV-DomU or not ? I believe that an HVM Linux guest with PV drivers should also be able to use the xenstore command-line tools. I'm not 100% sure on that though. > I see that XenServer has xentool, that allow to control DomU and get > information about it, but cannot find any info about the communication > interface, that is used by the tools. > > Thanks. > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:39:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:39:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqrc-0006rY-TB; Tue, 06 Nov 2012 21:39:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVqrb-0006rT-Lm for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:39:15 +0000 Received: from [85.158.139.211:53646] by server-15.bemta-5.messagelabs.com id D7/19-26920-28389905; Tue, 06 Nov 2012 21:39:14 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352237954!19103509!1 X-Originating-IP: [74.125.82.171] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25508 invoked from network); 6 Nov 2012 21:39:14 -0000 Received: from mail-we0-f171.google.com (HELO mail-we0-f171.google.com) (74.125.82.171) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:39:14 -0000 Received: by mail-we0-f171.google.com with SMTP id s43so529295wey.30 for ; Tue, 06 Nov 2012 13:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=iQTyLM8Lqk6ygBBqVpFz2RFtzSglSYJHKi4lz45amzg=; b=XUGdwbP/wRfTzKhbkaAvusI7PwOGuS4Wq2L3kHiXWcIAZyt7HwmhPgp+XPjxsTDlXU 5WFLGFVsgnao/LZA63+Ye+PM84K/52517mfd8KisSlgd1tHwuEED9LCKfY29f0DKbeRx 0ZvhAYNIDVgMr0H/AQc+OkSqnhP9D4Tl9oRE1yguVWtPR/GZdT5MSHqyPCW0AFntT6fQ i7L3PYM+CBR3oMpXXcMZKV+qU0z8Xdm91DGhyTutxR19bqvkz2ij4pemuNeA0J+qb/hz snmSeBaV8VTJ53EZ+iwxFl55NVE9j7iW2bIlhxR7bRtemtGis3fzzfCO+nMiAye0Y9Hs nJZQ== Received: by 10.216.206.152 with SMTP id l24mr1067364weo.66.1352237953941; Tue, 06 Nov 2012 13:39:13 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id k20sm555789wiv.11.2012.11.06.13.39.12 (version=SSLv3 cipher=OTHER); Tue, 06 Nov 2012 13:39:13 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 06 Nov 2012 21:39:07 +0000 From: Keir Fraser To: eXeC001er , Xen-devel Message-ID: Thread-Topic: [Xen-devel] Communication interface between Dom0 and DomU Thread-Index: Ac28ZyYSWvIVqLASNk2S6XroAnapvg== In-Reply-To: Mime-version: 1.0 Subject: Re: [Xen-devel] Communication interface between Dom0 and DomU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/2012 21:17, "eXeC001er" wrote: > Hello. > > Is it available a communication interface between Dom0 and DomU to get some > parameteres about DomU without connection via ssh? > For example i need to get information about IP addresses that are allocated in > DomU. > I found following mail-thread: > > http://xen.1045712.n5.nabble.com/How-to-get-domU-IP-address-td2510278.html > > > Keir Fraser said about xenstore, but as i understand to use xenstore need DomU > should be started as PV-DomU or not ? I believe that an HVM Linux guest with PV drivers should also be able to use the xenstore command-line tools. I'm not 100% sure on that though. > I see that XenServer has xentool, that allow to control DomU and get > information about it, but cannot find any info about the communication > interface, that is used by the tools. > > Thanks. > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:42:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:42:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVquK-0006xn-J9; Tue, 06 Nov 2012 21:42:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVquJ-0006xi-2y for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:42:03 +0000 Received: from [85.158.143.35:8528] by server-2.bemta-4.messagelabs.com id 7C/AE-28922-A2489905; Tue, 06 Nov 2012 21:42:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352238120!16026375!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2348 invoked from network); 6 Nov 2012 21:42:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:42:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,723,1344211200"; d="scan'208";a="213645957" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 21:42:00 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 16:42:00 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVquF-0004z8-55; Tue, 06 Nov 2012 21:41:59 +0000 Message-ID: <1352237999.12977.13.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Tue, 6 Nov 2012 22:39:59 +0100 In-Reply-To: <20121106211909.GA32682@phenom.dumpdata.com> References: <20121106211909.GA32682@phenom.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 21:19 +0000, Konrad Rzeszutek Wilk wrote: > Hey Stefano, > > I setup a cross ARM build system so that the generic changes won't cause build issues > on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix > for that). > > But more interestingly the build system I do also makes a variations of config entries. > So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. > > I found out that with: > CONFIG_XEN_GNTDEV=m > I get this > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? I wonder if this is to do with missing EXPORT_SYMBOL for the various things in hypercall.S ? Quite possibly this is the same thing as Russell King just reported r.e. privmcd? > > (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) > > > commit e1a982642262820d68779c06de64f8857a040f5a > Author: Konrad Rzeszutek Wilk > Date: Tue Nov 6 15:49:27 2012 -0500 > > xen/generic: Disable fallback build on ARM. > > As there is no need for it (the fallback code is for older > hypervisors and they won't run under ARM), and also b/c > we get: > > drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': > drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known > drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] > drivers/xen/fallback.c:15:19: error: expected expression before 'int' > drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) > drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in > .. and more > > Signed-off-by: Konrad Rzeszutek Wilk > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 46de6cd..273d2b9 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -1,8 +1,8 @@ > ifneq ($(CONFIG_ARM),y) > -obj-y += manage.o balloon.o > +obj-y += manage.o balloon.o fallback.o > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > endif > -obj-y += grant-table.o features.o events.o fallback.o > +obj-y += grant-table.o features.o events.o > obj-y += xenbus/ > > nostackp := $(call cc-option, -fno-stack-protector) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:42:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:42:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVquK-0006xn-J9; Tue, 06 Nov 2012 21:42:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVquJ-0006xi-2y for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:42:03 +0000 Received: from [85.158.143.35:8528] by server-2.bemta-4.messagelabs.com id 7C/AE-28922-A2489905; Tue, 06 Nov 2012 21:42:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352238120!16026375!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2348 invoked from network); 6 Nov 2012 21:42:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 21:42:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,723,1344211200"; d="scan'208";a="213645957" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 21:42:00 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 16:42:00 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVquF-0004z8-55; Tue, 06 Nov 2012 21:41:59 +0000 Message-ID: <1352237999.12977.13.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Tue, 6 Nov 2012 22:39:59 +0100 In-Reply-To: <20121106211909.GA32682@phenom.dumpdata.com> References: <20121106211909.GA32682@phenom.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 21:19 +0000, Konrad Rzeszutek Wilk wrote: > Hey Stefano, > > I setup a cross ARM build system so that the generic changes won't cause build issues > on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix > for that). > > But more interestingly the build system I do also makes a variations of config entries. > So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. > > I found out that with: > CONFIG_XEN_GNTDEV=m > I get this > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? I wonder if this is to do with missing EXPORT_SYMBOL for the various things in hypercall.S ? Quite possibly this is the same thing as Russell King just reported r.e. privmcd? > > (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) > > > commit e1a982642262820d68779c06de64f8857a040f5a > Author: Konrad Rzeszutek Wilk > Date: Tue Nov 6 15:49:27 2012 -0500 > > xen/generic: Disable fallback build on ARM. > > As there is no need for it (the fallback code is for older > hypervisors and they won't run under ARM), and also b/c > we get: > > drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': > drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known > drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] > drivers/xen/fallback.c:15:19: error: expected expression before 'int' > drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) > drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in > .. and more > > Signed-off-by: Konrad Rzeszutek Wilk > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 46de6cd..273d2b9 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -1,8 +1,8 @@ > ifneq ($(CONFIG_ARM),y) > -obj-y += manage.o balloon.o > +obj-y += manage.o balloon.o fallback.o > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > endif > -obj-y += grant-table.o features.o events.o fallback.o > +obj-y += grant-table.o features.o events.o > obj-y += xenbus/ > > nostackp := $(call cc-option, -fno-stack-protector) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:55:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVr6u-0007Cp-3S; Tue, 06 Nov 2012 21:55:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVr6s-0007Ck-Ti for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:55:03 +0000 Received: from [85.158.139.83:52669] by server-9.bemta-5.messagelabs.com id 19/10-29295-63789905; Tue, 06 Nov 2012 21:55:02 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352238900!29070178!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8085 invoked from network); 6 Nov 2012 21:55:01 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 21:55:01 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6LsmXZ022072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 21:54:49 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6LsmrL014861 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 21:54:48 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6Lslo9009501; Tue, 6 Nov 2012 15:54:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 13:54:47 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 02BFC4042D; Tue, 6 Nov 2012 16:42:04 -0500 (EST) Date: Tue, 6 Nov 2012 16:42:04 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121106214204.GA787@phenom.dumpdata.com> References: <20121106211909.GA32682@phenom.dumpdata.com> <1352237999.12977.13.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352237999.12977.13.camel@hastur.hellion.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 10:39:59PM +0100, Ian Campbell wrote: > On Tue, 2012-11-06 at 21:19 +0000, Konrad Rzeszutek Wilk wrote: > > Hey Stefano, > > > > I setup a cross ARM build system so that the generic changes won't cause build issues > > on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix > > for that). > > > > But more interestingly the build system I do also makes a variations of config entries. > > So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. > > > > I found out that with: > > CONFIG_XEN_GNTDEV=m > > I get this > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > > > If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? > > I wonder if this is to do with missing EXPORT_SYMBOL for the various > things in hypercall.S ? Quite possibly this is the same thing as Russell > King just reported r.e. privmcd? I think so, I was unable to find the code for HYPERVISOR_event_channel_op until I did a grep for 'hypercall' and found the hypercall.S file :-( Will add an EXPORT_SYMBOL_GPL for said issue and see if that fixes it. > > > > > (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) > > > > > > commit e1a982642262820d68779c06de64f8857a040f5a > > Author: Konrad Rzeszutek Wilk > > Date: Tue Nov 6 15:49:27 2012 -0500 > > > > xen/generic: Disable fallback build on ARM. > > > > As there is no need for it (the fallback code is for older > > hypervisors and they won't run under ARM), and also b/c > > we get: > > > > drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': > > drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known > > drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] > > drivers/xen/fallback.c:15:19: error: expected expression before 'int' > > drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) > > drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in > > .. and more > > > > Signed-off-by: Konrad Rzeszutek Wilk > > > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 46de6cd..273d2b9 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -1,8 +1,8 @@ > > ifneq ($(CONFIG_ARM),y) > > -obj-y += manage.o balloon.o > > +obj-y += manage.o balloon.o fallback.o > > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > > endif > > -obj-y += grant-table.o features.o events.o fallback.o > > +obj-y += grant-table.o features.o events.o > > obj-y += xenbus/ > > > > nostackp := $(call cc-option, -fno-stack-protector) > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 21:55:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 21:55:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVr6u-0007Cp-3S; Tue, 06 Nov 2012 21:55:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVr6s-0007Ck-Ti for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 21:55:03 +0000 Received: from [85.158.139.83:52669] by server-9.bemta-5.messagelabs.com id 19/10-29295-63789905; Tue, 06 Nov 2012 21:55:02 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352238900!29070178!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8085 invoked from network); 6 Nov 2012 21:55:01 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 21:55:01 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6LsmXZ022072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 21:54:49 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6LsmrL014861 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 21:54:48 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6Lslo9009501; Tue, 6 Nov 2012 15:54:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 13:54:47 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 02BFC4042D; Tue, 6 Nov 2012 16:42:04 -0500 (EST) Date: Tue, 6 Nov 2012 16:42:04 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121106214204.GA787@phenom.dumpdata.com> References: <20121106211909.GA32682@phenom.dumpdata.com> <1352237999.12977.13.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352237999.12977.13.camel@hastur.hellion.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] ARM build with v3.7-rc3 with CONFIG_XEN_GNTDEV=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 10:39:59PM +0100, Ian Campbell wrote: > On Tue, 2012-11-06 at 21:19 +0000, Konrad Rzeszutek Wilk wrote: > > Hey Stefano, > > > > I setup a cross ARM build system so that the generic changes won't cause build issues > > on ARM (and actually caught a bug with fallback.o being enabled there - I've a fix > > for that). > > > > But more interestingly the build system I do also makes a variations of config entries. > > So there is the allmodules, allyes, allyes, but all Xen drivers are modules, etc. > > > > I found out that with: > > CONFIG_XEN_GNTDEV=m > > I get this > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > > > If I make it CONFIG_XEN_GNTDEV=y the issue disappears. Any thoughts? > > I wonder if this is to do with missing EXPORT_SYMBOL for the various > things in hypercall.S ? Quite possibly this is the same thing as Russell > King just reported r.e. privmcd? I think so, I was unable to find the code for HYPERVISOR_event_channel_op until I did a grep for 'hypercall' and found the hypercall.S file :-( Will add an EXPORT_SYMBOL_GPL for said issue and see if that fixes it. > > > > > (FYI, if you want to do this on v3.7-rc4 please apply this patch to your tree) > > > > > > commit e1a982642262820d68779c06de64f8857a040f5a > > Author: Konrad Rzeszutek Wilk > > Date: Tue Nov 6 15:49:27 2012 -0500 > > > > xen/generic: Disable fallback build on ARM. > > > > As there is no need for it (the fallback code is for older > > hypervisors and they won't run under ARM), and also b/c > > we get: > > > > drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': > > drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known > > drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] > > drivers/xen/fallback.c:15:19: error: expected expression before 'int' > > drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) > > drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in > > .. and more > > > > Signed-off-by: Konrad Rzeszutek Wilk > > > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 46de6cd..273d2b9 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -1,8 +1,8 @@ > > ifneq ($(CONFIG_ARM),y) > > -obj-y += manage.o balloon.o > > +obj-y += manage.o balloon.o fallback.o > > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > > endif > > -obj-y += grant-table.o features.o events.o fallback.o > > +obj-y += grant-table.o features.o events.o > > obj-y += xenbus/ > > > > nostackp := $(call cc-option, -fno-stack-protector) > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:18:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:18:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrTJ-0007Qk-4P; Tue, 06 Nov 2012 22:18:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrTH-0007Qf-Gh for xen-devel@lists.xen.org; Tue, 06 Nov 2012 22:18:11 +0000 Received: from [85.158.138.51:26123] by server-16.bemta-3.messagelabs.com id 82/86-07461-2AC89905; Tue, 06 Nov 2012 22:18:10 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-3.tower-174.messagelabs.com!1352240289!20886224!1 X-Originating-IP: [81.169.146.177] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NyA9PiAyNjI1Mg==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NyA9PiAyNjI1Mg==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20102 invoked from network); 6 Nov 2012 22:18:10 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.177) by server-3.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:18:10 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV7qE= Received: from probook.site (ip-80-226-24-4.vodafone-net.de [80.226.24.4]) by smtp.strato.de (josoe mo4) (RZmta 30.22 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id h02dfboA6LbTOU ; Tue, 6 Nov 2012 23:18:09 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id C06FF189BB; Tue, 6 Nov 2012 23:18:06 +0100 (CET) Date: Tue, 6 Nov 2012 23:18:06 +0100 From: Olaf Hering To: Keir Fraser Message-ID: <20121106221806.GA1813@aepfle.de> References: <20121106202816.GA29655@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, Keir Fraser wrote: > It's known that if you have a workload that is dirtying lots of pages > quickly, the final stop-and-copy phase will necessarily be large. A VM that > is busy dirtying lots of pages can dirty pages much quicker than they can be > transferred over the LAN. In my opinion such migration should be done at application level. > > Should 'xm migrate --live' and 'xl migrate' get something like a > > --no-suspend option? > > Well, it is not really possible to avoid the suspend altogether, there is > always going to be some minimal 'dirty working set'. But could provide > parameters to require the dirty working set to be smaller than X pages > within Y rounds of dirty page copying. Should such knobs be exposed to the tools like x[lm] migrate --knob1 val --knob2 val? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:18:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:18:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrTJ-0007Qk-4P; Tue, 06 Nov 2012 22:18:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrTH-0007Qf-Gh for xen-devel@lists.xen.org; Tue, 06 Nov 2012 22:18:11 +0000 Received: from [85.158.138.51:26123] by server-16.bemta-3.messagelabs.com id 82/86-07461-2AC89905; Tue, 06 Nov 2012 22:18:10 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-3.tower-174.messagelabs.com!1352240289!20886224!1 X-Originating-IP: [81.169.146.177] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NyA9PiAyNjI1Mg==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NyA9PiAyNjI1Mg==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20102 invoked from network); 6 Nov 2012 22:18:10 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.177) by server-3.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:18:10 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV7qE= Received: from probook.site (ip-80-226-24-4.vodafone-net.de [80.226.24.4]) by smtp.strato.de (josoe mo4) (RZmta 30.22 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id h02dfboA6LbTOU ; Tue, 6 Nov 2012 23:18:09 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id C06FF189BB; Tue, 6 Nov 2012 23:18:06 +0100 (CET) Date: Tue, 6 Nov 2012 23:18:06 +0100 From: Olaf Hering To: Keir Fraser Message-ID: <20121106221806.GA1813@aepfle.de> References: <20121106202816.GA29655@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, Keir Fraser wrote: > It's known that if you have a workload that is dirtying lots of pages > quickly, the final stop-and-copy phase will necessarily be large. A VM that > is busy dirtying lots of pages can dirty pages much quicker than they can be > transferred over the LAN. In my opinion such migration should be done at application level. > > Should 'xm migrate --live' and 'xl migrate' get something like a > > --no-suspend option? > > Well, it is not really possible to avoid the suspend altogether, there is > always going to be some minimal 'dirty working set'. But could provide > parameters to require the dirty working set to be smaller than X pages > within Y rounds of dirty page copying. Should such knobs be exposed to the tools like x[lm] migrate --knob1 val --knob2 val? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aC-1E; Tue, 06 Nov 2012 22:25:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrah-0007a2-1C for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:51 +0000 Received: from [85.158.143.99:30364] by server-1.bemta-4.messagelabs.com id 78/5E-27934-E6E89905; Tue, 06 Nov 2012 22:25:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352240748!28920829!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7744 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPkfB021480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPkTB010349 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:46 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPk2m028203; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 5707440068; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:01 -0500 Message-Id: <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org As there is no need for it (the fallback code is for older hypervisors and they won't run under ARM), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..273d2b9 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,8 +1,8 @@ ifneq ($(CONFIG_ARM),y) -obj-y += manage.o balloon.o +obj-y += manage.o balloon.o fallback.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) -- 1.7.7.6 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aC-1E; Tue, 06 Nov 2012 22:25:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrah-0007a2-1C for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:51 +0000 Received: from [85.158.143.99:30364] by server-1.bemta-4.messagelabs.com id 78/5E-27934-E6E89905; Tue, 06 Nov 2012 22:25:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352240748!28920829!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7744 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPkfB021480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPkTB010349 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:46 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPk2m028203; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 5707440068; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:01 -0500 Message-Id: <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org As there is no need for it (the fallback code is for older hypervisors and they won't run under ARM), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..273d2b9 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,8 +1,8 @@ ifneq ($(CONFIG_ARM),y) -obj-y += manage.o balloon.o +obj-y += manage.o balloon.o fallback.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) -- 1.7.7.6 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aK-Ch; Tue, 06 Nov 2012 22:25:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrah-0007a3-8z for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:51 +0000 Received: from [85.158.137.99:14700] by server-3.bemta-3.messagelabs.com id F9/B4-31566-E6E89905; Tue, 06 Nov 2012 22:25:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352240748!18024026!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17001 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPl65021483 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPk65017343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:46 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPkQc028202; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:45 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 4F28A40157; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:00 -0500 Message-Id: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH] Fix various compile errors/warnings on ARM with CONFIG_XEN_*=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Two patches that I was thinking for v3.7 to fix compile issues. [PATCH 1/2] xen/generic: Disable fallback build on ARM. This one, requires Stefano's Ack: [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aK-Ch; Tue, 06 Nov 2012 22:25:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrah-0007a3-8z for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:51 +0000 Received: from [85.158.137.99:14700] by server-3.bemta-3.messagelabs.com id F9/B4-31566-E6E89905; Tue, 06 Nov 2012 22:25:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352240748!18024026!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17001 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPl65021483 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPk65017343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:46 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPkQc028202; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:45 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 4F28A40157; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:00 -0500 Message-Id: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH] Fix various compile errors/warnings on ARM with CONFIG_XEN_*=m X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Two patches that I was thinking for v3.7 to fix compile issues. [PATCH 1/2] xen/generic: Disable fallback build on ARM. This one, requires Stefano's Ack: [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrak-0007ab-P8; Tue, 06 Nov 2012 22:25:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aE-JP for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:52 +0000 Received: from [85.158.138.51:63404] by server-2.bemta-3.messagelabs.com id 76/11-04744-F6E89905; Tue, 06 Nov 2012 22:25:51 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1352240748!24935517!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14890 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPlxk021482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPkE3027919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:47 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPkfG023101; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 5E7D3401A4; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:02 -0500 Message-Id: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org We end up with: ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! and this patch exports said function (which is implemented in hypercall.S). Signed-off-by: Konrad Rzeszutek Wilk --- arch/arm/xen/enlighten.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..96d969d 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) *pages = NULL; } EXPORT_SYMBOL_GPL(free_xenballooned_pages); + +/* In the hypervisor.S file. */ +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); +EXPORT_SYMBOL_GPL(privcmd_call); -- 1.7.7.6 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 22:26:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 22:26:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrak-0007ab-P8; Tue, 06 Nov 2012 22:25:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVrai-0007aE-JP for xen-devel@lists.xensource.com; Tue, 06 Nov 2012 22:25:52 +0000 Received: from [85.158.138.51:63404] by server-2.bemta-3.messagelabs.com id 76/11-04744-F6E89905; Tue, 06 Nov 2012 22:25:51 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1352240748!24935517!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0MTM4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14890 invoked from network); 6 Nov 2012 22:25:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 22:25:49 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6MPlxk021482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 22:25:47 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6MPkE3027919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 22:25:47 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6MPkfG023101; Tue, 6 Nov 2012 16:25:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 06 Nov 2012 14:25:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 5E7D3401A4; Tue, 6 Nov 2012 17:13:03 -0500 (EST) From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Tue, 6 Nov 2012 17:13:02 -0500 Message-Id: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org We end up with: ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! and this patch exports said function (which is implemented in hypercall.S). Signed-off-by: Konrad Rzeszutek Wilk --- arch/arm/xen/enlighten.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..96d969d 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) *pages = NULL; } EXPORT_SYMBOL_GPL(free_xenballooned_pages); + +/* In the hypervisor.S file. */ +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); +EXPORT_SYMBOL_GPL(privcmd_call); -- 1.7.7.6 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 23:19:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 23:19:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsQX-0008AD-4I; Tue, 06 Nov 2012 23:19:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsQV-0008A8-RG for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:19:24 +0000 Received: from [85.158.139.83:59997] by server-4.bemta-5.messagelabs.com id 1D/18-15011-AFA99905; Tue, 06 Nov 2012 23:19:22 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352243961!29075276!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26191 invoked from network); 6 Nov 2012 23:19:22 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 23:19:22 -0000 X-IronPort-AV: E=Sophos;i="4.80,724,1344211200"; d="scan'208";a="213658850" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 23:18:39 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 18:18:40 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVsPn-0006Gp-7g for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:18:39 +0000 Message-ID: <50999ACF.4040106@citrix.com> Date: Tue, 6 Nov 2012 23:18:39 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> In-Reply-To: <20121106221806.GA1813@aepfle.de> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/12 22:18, Olaf Hering wrote: > On Tue, Nov 06, Keir Fraser wrote: > >> It's known that if you have a workload that is dirtying lots of pages >> quickly, the final stop-and-copy phase will necessarily be large. A VM that >> is busy dirtying lots of pages can dirty pages much quicker than they can be >> transferred over the LAN. > In my opinion such migration should be done at application level. > >>> Should 'xm migrate --live' and 'xl migrate' get something like a >>> --no-suspend option? >> Well, it is not really possible to avoid the suspend altogether, there is >> always going to be some minimal 'dirty working set'. But could provide >> parameters to require the dirty working set to be smaller than X pages >> within Y rounds of dirty page copying. > Should such knobs be exposed to the tools like x[lm] migrate --knob1 val --knob2 val? > > Olaf We (Citrix) are currently looking at some fairly serious performance issues with migration with both classic and pvops dom0 kernels (Patches to follow in due course) While that will make the situation better, it wont solve the problem you have described. As far as I understand (so please correct me if I am wrong), migration works by transmitting pages until the rate of dirty pages per round approaches constant, at which point the domain gets paused, all remaining dirty pages are transmitted. (With the proviso that currently there are a maximum number of rounds until an automatic pausing - this is automatically problematic with increasing guest sizes.) Having these knobs tweakable by the admin/toolstack seems like a very sensible idea. The application problem you described could possibly be something crashing because of a sufficiently large jump in time? As potential food for thought: Is there wisdom in having a new kind of live migrate which, when pausing the VM on the source host, resumes the VM on the destination host. Xen would have to track not-yet-sent pages and pause the guest on pagefault, and request the required page as a matter of priority. The advantages of this approach would be that a timing sensitive workloads would be paused for far less time. Even if it was frequently being paused for pagefaults, the time to get a single page over the LAN would be far quicker than the entire dirty set, at which point on resume, the interrupt paths would fire again; The timing paths would quickly become fully populated. Further to that, a busy workload in the guest dirtying a page which has already been sent will not result in any further network traffic. The disadvantages would be that Xen would need 2 way communication with the toolstack to prioritise which page is needed to resolve a pagefault, and presumably the toolstack->toolstack protocol would be more complicated. In addition, it would be much harder to "roll back" the migrate; Once you resume the guest on the destination host, you are committed to completing the migrate. I presume there are other issues I have overlooked, but this idea has literally just occurred to me upon reading this thread so far. Comments? ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 23:19:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 23:19:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsQX-0008AD-4I; Tue, 06 Nov 2012 23:19:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsQV-0008A8-RG for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:19:24 +0000 Received: from [85.158.139.83:59997] by server-4.bemta-5.messagelabs.com id 1D/18-15011-AFA99905; Tue, 06 Nov 2012 23:19:22 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352243961!29075276!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQzNTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26191 invoked from network); 6 Nov 2012 23:19:22 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2012 23:19:22 -0000 X-IronPort-AV: E=Sophos;i="4.80,724,1344211200"; d="scan'208";a="213658850" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 06 Nov 2012 23:18:39 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 6 Nov 2012 18:18:40 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVsPn-0006Gp-7g for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:18:39 +0000 Message-ID: <50999ACF.4040106@citrix.com> Date: Tue, 6 Nov 2012 23:18:39 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> In-Reply-To: <20121106221806.GA1813@aepfle.de> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/12 22:18, Olaf Hering wrote: > On Tue, Nov 06, Keir Fraser wrote: > >> It's known that if you have a workload that is dirtying lots of pages >> quickly, the final stop-and-copy phase will necessarily be large. A VM that >> is busy dirtying lots of pages can dirty pages much quicker than they can be >> transferred over the LAN. > In my opinion such migration should be done at application level. > >>> Should 'xm migrate --live' and 'xl migrate' get something like a >>> --no-suspend option? >> Well, it is not really possible to avoid the suspend altogether, there is >> always going to be some minimal 'dirty working set'. But could provide >> parameters to require the dirty working set to be smaller than X pages >> within Y rounds of dirty page copying. > Should such knobs be exposed to the tools like x[lm] migrate --knob1 val --knob2 val? > > Olaf We (Citrix) are currently looking at some fairly serious performance issues with migration with both classic and pvops dom0 kernels (Patches to follow in due course) While that will make the situation better, it wont solve the problem you have described. As far as I understand (so please correct me if I am wrong), migration works by transmitting pages until the rate of dirty pages per round approaches constant, at which point the domain gets paused, all remaining dirty pages are transmitted. (With the proviso that currently there are a maximum number of rounds until an automatic pausing - this is automatically problematic with increasing guest sizes.) Having these knobs tweakable by the admin/toolstack seems like a very sensible idea. The application problem you described could possibly be something crashing because of a sufficiently large jump in time? As potential food for thought: Is there wisdom in having a new kind of live migrate which, when pausing the VM on the source host, resumes the VM on the destination host. Xen would have to track not-yet-sent pages and pause the guest on pagefault, and request the required page as a matter of priority. The advantages of this approach would be that a timing sensitive workloads would be paused for far less time. Even if it was frequently being paused for pagefaults, the time to get a single page over the LAN would be far quicker than the entire dirty set, at which point on resume, the interrupt paths would fire again; The timing paths would quickly become fully populated. Further to that, a busy workload in the guest dirtying a page which has already been sent will not result in any further network traffic. The disadvantages would be that Xen would need 2 way communication with the toolstack to prioritise which page is needed to resolve a pagefault, and presumably the toolstack->toolstack protocol would be more complicated. In addition, it would be much harder to "roll back" the migrate; Once you resume the guest on the destination host, you are committed to completing the migrate. I presume there are other issues I have overlooked, but this idea has literally just occurred to me upon reading this thread so far. Comments? ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 23:42:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 23:42:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsmR-0008LO-7w; Tue, 06 Nov 2012 23:42:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsmP-0008LJ-RO for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:42:02 +0000 Received: from [85.158.139.83:64380] by server-14.bemta-5.messagelabs.com id B1/D1-21768-840A9905; Tue, 06 Nov 2012 23:42:00 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352245319!29359219!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjkxMTg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26995 invoked from network); 6 Nov 2012 23:42:00 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 23:42:00 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6NfsT2021009 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 23:41:55 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Nfsuq026487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 23:41:54 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6NfrU4012021; Tue, 6 Nov 2012 17:41:54 -0600 MIME-Version: 1.0 Message-ID: <721bf725-662f-41cb-a1a3-7c908e05c188@default> Date: Tue, 6 Nov 2012 15:41:53 -0800 (PST) From: Dan Magenheimer To: Andrew Cooper , xen-devel@lists.xen.org References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> In-Reply-To: <50999ACF.4040106@citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > Sent: Tuesday, November 06, 2012 4:19 PM > To: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > As potential food for thought: > > Is there wisdom in having a new kind of live migrate which, when pausing > the VM on the source host, resumes the VM on the destination host. Xen > would have to track not-yet-sent pages and pause the guest on pagefault, > and request the required page as a matter of priority. > > The advantages of this approach would be that a timing sensitive > workloads would be paused for far less time. Even if it was frequently > being paused for pagefaults, the time to get a single page over the LAN > would be far quicker than the entire dirty set, at which point on > resume, the interrupt paths would fire again; The timing paths would > quickly become fully populated. Further to that, a busy workload in the > guest dirtying a page which has already been sent will not result in any > further network traffic. Something like this? http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 06 23:42:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 06 Nov 2012 23:42:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsmR-0008LO-7w; Tue, 06 Nov 2012 23:42:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVsmP-0008LJ-RO for xen-devel@lists.xen.org; Tue, 06 Nov 2012 23:42:02 +0000 Received: from [85.158.139.83:64380] by server-14.bemta-5.messagelabs.com id B1/D1-21768-840A9905; Tue, 06 Nov 2012 23:42:00 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352245319!29359219!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjkxMTg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26995 invoked from network); 6 Nov 2012 23:42:00 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 6 Nov 2012 23:42:00 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA6NfsT2021009 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Nov 2012 23:41:55 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA6Nfsuq026487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Nov 2012 23:41:54 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA6NfrU4012021; Tue, 6 Nov 2012 17:41:54 -0600 MIME-Version: 1.0 Message-ID: <721bf725-662f-41cb-a1a3-7c908e05c188@default> Date: Tue, 6 Nov 2012 15:41:53 -0800 (PST) From: Dan Magenheimer To: Andrew Cooper , xen-devel@lists.xen.org References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> In-Reply-To: <50999ACF.4040106@citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > Sent: Tuesday, November 06, 2012 4:19 PM > To: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > As potential food for thought: > > Is there wisdom in having a new kind of live migrate which, when pausing > the VM on the source host, resumes the VM on the destination host. Xen > would have to track not-yet-sent pages and pause the guest on pagefault, > and request the required page as a matter of priority. > > The advantages of this approach would be that a timing sensitive > workloads would be paused for far less time. Even if it was frequently > being paused for pagefaults, the time to get a single page over the LAN > would be far quicker than the entire dirty set, at which point on > resume, the interrupt paths would fire again; The timing paths would > quickly become fully populated. Further to that, a busy workload in the > guest dirtying a page which has already been sent will not result in any > further network traffic. Something like this? http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:07:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:07:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv2w-0004vy-Dj; Wed, 07 Nov 2012 02:07:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv2u-0004vt-Ak for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:07:12 +0000 Received: from [193.109.254.147:56766] by server-4.bemta-14.messagelabs.com id 59/A5-18856-F42C9905; Wed, 07 Nov 2012 02:07:11 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352254029!9967161!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29247 invoked from network); 7 Nov 2012 02:07:09 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-8.tower-27.messagelabs.com with SMTP; 7 Nov 2012 02:07:09 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA7261oS028590; Tue, 6 Nov 2012 20:06:01 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA7261Bp028589; Tue, 6 Nov 2012 20:06:01 -0600 Date: Tue, 6 Nov 2012 20:06:01 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070206.qA7261Bp028589@wind.enjellic.com> X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: xen-devel@lists.xen.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:06:01 -0600 (CST) Cc: ian.jackson@eu.citrix.com, keir@xen.org Subject: [Xen-devel] [PATCH 1/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------------------------------------------------------------------- Backport of the following patch from development: # User Ian Campbell <[hidden email]> # Date 1309968705 -3600 # Node ID e4781aedf817c5ab36f6f3077e44c43c566a2812 # Parent 700d0f03d50aa6619d313c1ff6aea7fd429d28a7 libxl: attempt to cleanup tapdisk processes on disk backend destroy. This patch properly terminates the tapdisk2 process(es) started to service a virtual block device. Signed-off-by: Greg Wettstein diff -r 700d0f03d50a tools/blktap2/control/tap-ctl-list.c --- a/tools/blktap2/control/tap-ctl-list.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/blktap2/control/tap-ctl-list.c Tue Nov 06 19:52:48 2012 -0600 @@ -506,17 +506,15 @@ out: } int -tap_ctl_find_minor(const char *type, const char *path) +tap_ctl_find(const char *type, const char *path, tap_list_t *tap) { tap_list_t **list, **_entry; - int minor, err; + int ret = -ENOENT, err; err = tap_ctl_list(&list); if (err) return err; - minor = -1; - for (_entry = list; *_entry != NULL; ++_entry) { tap_list_t *entry = *_entry; @@ -526,11 +524,13 @@ tap_ctl_find_minor(const char *type, con if (path && (!entry->path || strcmp(entry->path, path))) continue; - minor = entry->minor; + *tap = *entry; + tap->type = tap->path = NULL; + ret = 0; break; } tap_ctl_free_list(list); - return minor >= 0 ? minor : -ENOENT; + return ret; } diff -r 700d0f03d50a tools/blktap2/control/tap-ctl.h --- a/tools/blktap2/control/tap-ctl.h Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/blktap2/control/tap-ctl.h Tue Nov 06 19:52:48 2012 -0600 @@ -76,7 +76,7 @@ int tap_ctl_get_driver_id(const char *ha int tap_ctl_list(tap_list_t ***list); void tap_ctl_free_list(tap_list_t **list); -int tap_ctl_find_minor(const char *type, const char *path); +int tap_ctl_find(const char *type, const char *path, tap_list_t *tap); int tap_ctl_allocate(int *minor, char **devname); int tap_ctl_free(const int minor); diff -r 700d0f03d50a tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:52:48 2012 -0600 @@ -18,6 +18,8 @@ #include "tap-ctl.h" +#include + int libxl__blktap_enabled(libxl__gc *gc) { const char *msg; @@ -30,12 +32,13 @@ const char *libxl__blktap_devpath(libxl_ { const char *type; char *params, *devname = NULL; - int minor, err; + tap_list_t tap; + int err; type = libxl__device_disk_string_of_format(format); - minor = tap_ctl_find_minor(type, disk); - if (minor >= 0) { - devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", minor); + err = tap_ctl_find(type, disk, &tap); + if (err == 0) { + devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", tap.minor); if (devname) return devname; } @@ -49,3 +52,28 @@ const char *libxl__blktap_devpath(libxl_ return NULL; } + + +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +{ + char *path, *params, *type, *disk; + int err; + tap_list_t tap; + + path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); + if (!path) return; + + params = libxl__xs_read(gc, XBT_NULL, path); + if (!params) return; + + type = params; + disk = strchr(params, ':'); + if (!disk) return; + + *disk++ = '\0'; + + err = tap_ctl_find(type, disk, &tap); + if (err < 0) return; + + tap_ctl_destroy(tap.id, tap.minor); +} diff -r 700d0f03d50a tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:52:48 2012 -0600 @@ -250,6 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx if (!state) goto out; if (atoi(state) != 4) { + libxl__device_destroy_tapdisk(&gc, be_path); xs_rm(ctx->xsh, XBT_NULL, be_path); goto out; } @@ -368,6 +369,7 @@ int libxl__devices_destroy(libxl_ctx *ct } } } + libxl__device_destroy_tapdisk(&gc, be_path); out: libxl__free_all(&gc); return 0; diff -r 700d0f03d50a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_internal.h Tue Nov 06 19:52:48 2012 -0600 @@ -314,6 +314,12 @@ _hidden const char *libxl__blktap_devpat const char *disk, libxl_disk_format format); +/* libxl__device_destroy_tapdisk: + * Destroys any tapdisk process associated with the backend represented + * by be_path. + */ +_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); + _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); struct libxl__xen_console_reader { diff -r 700d0f03d50a tools/libxl/libxl_noblktap2.c --- a/tools/libxl/libxl_noblktap2.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_noblktap2.c Tue Nov 06 19:52:48 2012 -0600 @@ -27,3 +27,7 @@ const char *libxl__blktap_devpath(libxl_ { return NULL; } + +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +{ +} --------------------------------------------------------------------------- As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Man, despite his artistic pretensions, his sophistication and many accomplishments, owes the fact of his existence to a six-inch layer of topsoil and the fact that it rains." -- Anonymous writer on perspective. GAUSSIAN quote. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:07:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:07:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv2w-0004vy-Dj; Wed, 07 Nov 2012 02:07:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv2u-0004vt-Ak for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:07:12 +0000 Received: from [193.109.254.147:56766] by server-4.bemta-14.messagelabs.com id 59/A5-18856-F42C9905; Wed, 07 Nov 2012 02:07:11 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352254029!9967161!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29247 invoked from network); 7 Nov 2012 02:07:09 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-8.tower-27.messagelabs.com with SMTP; 7 Nov 2012 02:07:09 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA7261oS028590; Tue, 6 Nov 2012 20:06:01 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA7261Bp028589; Tue, 6 Nov 2012 20:06:01 -0600 Date: Tue, 6 Nov 2012 20:06:01 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070206.qA7261Bp028589@wind.enjellic.com> X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: xen-devel@lists.xen.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:06:01 -0600 (CST) Cc: ian.jackson@eu.citrix.com, keir@xen.org Subject: [Xen-devel] [PATCH 1/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------------------------------------------------------------------- Backport of the following patch from development: # User Ian Campbell <[hidden email]> # Date 1309968705 -3600 # Node ID e4781aedf817c5ab36f6f3077e44c43c566a2812 # Parent 700d0f03d50aa6619d313c1ff6aea7fd429d28a7 libxl: attempt to cleanup tapdisk processes on disk backend destroy. This patch properly terminates the tapdisk2 process(es) started to service a virtual block device. Signed-off-by: Greg Wettstein diff -r 700d0f03d50a tools/blktap2/control/tap-ctl-list.c --- a/tools/blktap2/control/tap-ctl-list.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/blktap2/control/tap-ctl-list.c Tue Nov 06 19:52:48 2012 -0600 @@ -506,17 +506,15 @@ out: } int -tap_ctl_find_minor(const char *type, const char *path) +tap_ctl_find(const char *type, const char *path, tap_list_t *tap) { tap_list_t **list, **_entry; - int minor, err; + int ret = -ENOENT, err; err = tap_ctl_list(&list); if (err) return err; - minor = -1; - for (_entry = list; *_entry != NULL; ++_entry) { tap_list_t *entry = *_entry; @@ -526,11 +524,13 @@ tap_ctl_find_minor(const char *type, con if (path && (!entry->path || strcmp(entry->path, path))) continue; - minor = entry->minor; + *tap = *entry; + tap->type = tap->path = NULL; + ret = 0; break; } tap_ctl_free_list(list); - return minor >= 0 ? minor : -ENOENT; + return ret; } diff -r 700d0f03d50a tools/blktap2/control/tap-ctl.h --- a/tools/blktap2/control/tap-ctl.h Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/blktap2/control/tap-ctl.h Tue Nov 06 19:52:48 2012 -0600 @@ -76,7 +76,7 @@ int tap_ctl_get_driver_id(const char *ha int tap_ctl_list(tap_list_t ***list); void tap_ctl_free_list(tap_list_t **list); -int tap_ctl_find_minor(const char *type, const char *path); +int tap_ctl_find(const char *type, const char *path, tap_list_t *tap); int tap_ctl_allocate(int *minor, char **devname); int tap_ctl_free(const int minor); diff -r 700d0f03d50a tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:52:48 2012 -0600 @@ -18,6 +18,8 @@ #include "tap-ctl.h" +#include + int libxl__blktap_enabled(libxl__gc *gc) { const char *msg; @@ -30,12 +32,13 @@ const char *libxl__blktap_devpath(libxl_ { const char *type; char *params, *devname = NULL; - int minor, err; + tap_list_t tap; + int err; type = libxl__device_disk_string_of_format(format); - minor = tap_ctl_find_minor(type, disk); - if (minor >= 0) { - devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", minor); + err = tap_ctl_find(type, disk, &tap); + if (err == 0) { + devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", tap.minor); if (devname) return devname; } @@ -49,3 +52,28 @@ const char *libxl__blktap_devpath(libxl_ return NULL; } + + +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +{ + char *path, *params, *type, *disk; + int err; + tap_list_t tap; + + path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); + if (!path) return; + + params = libxl__xs_read(gc, XBT_NULL, path); + if (!params) return; + + type = params; + disk = strchr(params, ':'); + if (!disk) return; + + *disk++ = '\0'; + + err = tap_ctl_find(type, disk, &tap); + if (err < 0) return; + + tap_ctl_destroy(tap.id, tap.minor); +} diff -r 700d0f03d50a tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:52:48 2012 -0600 @@ -250,6 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx if (!state) goto out; if (atoi(state) != 4) { + libxl__device_destroy_tapdisk(&gc, be_path); xs_rm(ctx->xsh, XBT_NULL, be_path); goto out; } @@ -368,6 +369,7 @@ int libxl__devices_destroy(libxl_ctx *ct } } } + libxl__device_destroy_tapdisk(&gc, be_path); out: libxl__free_all(&gc); return 0; diff -r 700d0f03d50a tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_internal.h Tue Nov 06 19:52:48 2012 -0600 @@ -314,6 +314,12 @@ _hidden const char *libxl__blktap_devpat const char *disk, libxl_disk_format format); +/* libxl__device_destroy_tapdisk: + * Destroys any tapdisk process associated with the backend represented + * by be_path. + */ +_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); + _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); struct libxl__xen_console_reader { diff -r 700d0f03d50a tools/libxl/libxl_noblktap2.c --- a/tools/libxl/libxl_noblktap2.c Mon Oct 29 09:04:48 2012 +0100 +++ b/tools/libxl/libxl_noblktap2.c Tue Nov 06 19:52:48 2012 -0600 @@ -27,3 +27,7 @@ const char *libxl__blktap_devpath(libxl_ { return NULL; } + +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) +{ +} --------------------------------------------------------------------------- As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Man, despite his artistic pretensions, his sophistication and many accomplishments, owes the fact of his existence to a six-inch layer of topsoil and the fact that it rains." -- Anonymous writer on perspective. GAUSSIAN quote. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:08:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:08:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv3p-0004y1-UD; Wed, 07 Nov 2012 02:08:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv3o-0004xv-Qi for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:08:09 +0000 Received: from [85.158.139.211:36640] by server-10.bemta-5.messagelabs.com id F6/CB-09257-782C9905; Wed, 07 Nov 2012 02:08:07 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352254086!19159513!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28799 invoked from network); 7 Nov 2012 02:08:06 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-3.tower-206.messagelabs.com with SMTP; 7 Nov 2012 02:08:06 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA727wVC028602; Tue, 6 Nov 2012 20:07:58 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA727wF1028601; Tue, 6 Nov 2012 20:07:58 -0600 Date: Tue, 6 Nov 2012 20:07:58 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070207.qA727wF1028601@wind.enjellic.com> X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: xen-devel@lists.xen.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:07:58 -0600 (CST) Cc: ian.jackson@eu.citrix.com, keir@xen.org Subject: [Xen-devel] [PATCH 2/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------------------------------------------------------------------- The following patch when applied on top of: libxl: attempt to cleanup tapdisk processes on disk backend destroy. Establishes correct cleanup behavior for blktap devices. This patch implements the release of the backend device before calling for the destruction of the userspace component of the blktap device. Without this patch the kernel xen-blkback driver deadlocks with the blktap2 user control plane until the IPC channel is terminated by the timeout on the select() call. This results in a noticeable delay in the termination of the guest and causes the blktap minor number which had been allocated to be orphaned. Signed-off-by: Greg Wettstein diff -r b184698e0893 tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Tue Nov 06 19:53:48 2012 -0600 +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:54:23 2012 -0600 @@ -59,6 +59,7 @@ void libxl__device_destroy_tapdisk(libxl char *path, *params, *type, *disk; int err; tap_list_t tap; + libxl_ctx *ctx = libxl__gc_owner(gc); path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); if (!path) return; @@ -75,5 +76,11 @@ void libxl__device_destroy_tapdisk(libxl err = tap_ctl_find(type, disk, &tap); if (err < 0) return; + /* + * Remove the instance of the backend device to avoid a deadlock with the + * removal of the tap device. + */ + xs_rm(ctx->xsh, XBT_NULL, be_path); + tap_ctl_destroy(tap.id, tap.minor); } diff -r b184698e0893 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Nov 06 19:53:48 2012 -0600 +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:54:23 2012 -0600 @@ -250,8 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx if (!state) goto out; if (atoi(state) != 4) { - libxl__device_destroy_tapdisk(&gc, be_path); - xs_rm(ctx->xsh, XBT_NULL, be_path); + libxl__device_destroy_tapdisk(&gc, be_path); goto out; } --------------------------------------------------------------------------- As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Fungus doesn't take a vacation." -- Rob Pike _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:08:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:08:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv3p-0004y1-UD; Wed, 07 Nov 2012 02:08:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVv3o-0004xv-Qi for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:08:09 +0000 Received: from [85.158.139.211:36640] by server-10.bemta-5.messagelabs.com id F6/CB-09257-782C9905; Wed, 07 Nov 2012 02:08:07 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352254086!19159513!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28799 invoked from network); 7 Nov 2012 02:08:06 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-3.tower-206.messagelabs.com with SMTP; 7 Nov 2012 02:08:06 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA727wVC028602; Tue, 6 Nov 2012 20:07:58 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA727wF1028601; Tue, 6 Nov 2012 20:07:58 -0600 Date: Tue, 6 Nov 2012 20:07:58 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070207.qA727wF1028601@wind.enjellic.com> X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: xen-devel@lists.xen.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:07:58 -0600 (CST) Cc: ian.jackson@eu.citrix.com, keir@xen.org Subject: [Xen-devel] [PATCH 2/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------------------------------------------------------------------- The following patch when applied on top of: libxl: attempt to cleanup tapdisk processes on disk backend destroy. Establishes correct cleanup behavior for blktap devices. This patch implements the release of the backend device before calling for the destruction of the userspace component of the blktap device. Without this patch the kernel xen-blkback driver deadlocks with the blktap2 user control plane until the IPC channel is terminated by the timeout on the select() call. This results in a noticeable delay in the termination of the guest and causes the blktap minor number which had been allocated to be orphaned. Signed-off-by: Greg Wettstein diff -r b184698e0893 tools/libxl/libxl_blktap2.c --- a/tools/libxl/libxl_blktap2.c Tue Nov 06 19:53:48 2012 -0600 +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:54:23 2012 -0600 @@ -59,6 +59,7 @@ void libxl__device_destroy_tapdisk(libxl char *path, *params, *type, *disk; int err; tap_list_t tap; + libxl_ctx *ctx = libxl__gc_owner(gc); path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); if (!path) return; @@ -75,5 +76,11 @@ void libxl__device_destroy_tapdisk(libxl err = tap_ctl_find(type, disk, &tap); if (err < 0) return; + /* + * Remove the instance of the backend device to avoid a deadlock with the + * removal of the tap device. + */ + xs_rm(ctx->xsh, XBT_NULL, be_path); + tap_ctl_destroy(tap.id, tap.minor); } diff -r b184698e0893 tools/libxl/libxl_device.c --- a/tools/libxl/libxl_device.c Tue Nov 06 19:53:48 2012 -0600 +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:54:23 2012 -0600 @@ -250,8 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx if (!state) goto out; if (atoi(state) != 4) { - libxl__device_destroy_tapdisk(&gc, be_path); - xs_rm(ctx->xsh, XBT_NULL, be_path); + libxl__device_destroy_tapdisk(&gc, be_path); goto out; } --------------------------------------------------------------------------- As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Fungus doesn't take a vacation." -- Rob Pike _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:18:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:18:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVvDO-0005Di-5U; Wed, 07 Nov 2012 02:18:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVvDM-0005Dd-Dc for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:18:00 +0000 Received: from [85.158.138.51:30029] by server-16.bemta-3.messagelabs.com id 0F/3A-07461-7D4C9905; Wed, 07 Nov 2012 02:17:59 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352254678!9273004!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17050 invoked from network); 7 Nov 2012 02:17:58 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-13.tower-174.messagelabs.com with SMTP; 7 Nov 2012 02:17:58 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA72HpYZ028648; Tue, 6 Nov 2012 20:17:51 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA72HoqS028647; Tue, 6 Nov 2012 20:17:50 -0600 Date: Tue, 6 Nov 2012 20:17:50 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070217.qA72HoqS028647@wind.enjellic.com> In-Reply-To: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= "Re: [Xen-devel] XEN 4.1.3 blktap2 patches." (Nov 5, 2:26pm) X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:17:51 -0600 (CST) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 5, 2:26pm, Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= wrote: } Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. Hi Pasi, hope this note finds your week going well. > Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you > can re-submit these blktap2 bugfix patches for inclusion! Yes, my apologies for being more then a bit tardy on this. I have been consumed with getting 4.2 validated in our development environment. I just sent a pair of patches to the list which I refreshed against the top of the xen-4.1.testing Mercurial repository which contain the blktap2 patches. With both applied 4.1.x shows correct behavior with respect to blktap2 cleanup and termination. > Thanks, > > -- Pasi Let me know if anything else is required. Once again my apologies for being tardy about getting these re-forwarded. Best wishes for a successful release and a productive remainder of the week. Greg }-- End of excerpt from Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Meeting: An assembly of people coming together to decide what person or department not represented in the room must solve a problem." -- Unknown \~t _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 02:18:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 02:18:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVvDO-0005Di-5U; Wed, 07 Nov 2012 02:18:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVvDM-0005Dd-Dc for xen-devel@lists.xen.org; Wed, 07 Nov 2012 02:18:00 +0000 Received: from [85.158.138.51:30029] by server-16.bemta-3.messagelabs.com id 0F/3A-07461-7D4C9905; Wed, 07 Nov 2012 02:17:59 +0000 X-Env-Sender: greg@wind.enjellic.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352254678!9273004!1 X-Originating-IP: [76.10.64.91] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17050 invoked from network); 7 Nov 2012 02:17:58 -0000 Received: from wind.enjellic.com (HELO wind.enjellic.com) (76.10.64.91) by server-13.tower-174.messagelabs.com with SMTP; 7 Nov 2012 02:17:58 -0000 Received: from wind.enjellic.com (localhost [127.0.0.1]) by wind.enjellic.com (8.14.3/8.14.3) with ESMTP id qA72HpYZ028648; Tue, 6 Nov 2012 20:17:51 -0600 Received: (from greg@localhost) by wind.enjellic.com (8.14.3/8.14.3/Submit) id qA72HoqS028647; Tue, 6 Nov 2012 20:17:50 -0600 Date: Tue, 6 Nov 2012 20:17:50 -0600 From: "Dr. Greg Wettstein" Message-Id: <201211070217.qA72HoqS028647@wind.enjellic.com> In-Reply-To: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= "Re: [Xen-devel] XEN 4.1.3 blktap2 patches." (Nov 5, 2:26pm) X-Mailer: Mail User's Shell (7.2.6-ESD1.0 03/31/2012) To: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.3 (wind.enjellic.com [0.0.0.0]); Tue, 06 Nov 2012 20:17:51 -0600 (CST) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: greg@enjellic.com List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 5, 2:26pm, Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= wrote: } Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. Hi Pasi, hope this note finds your week going well. > Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you > can re-submit these blktap2 bugfix patches for inclusion! Yes, my apologies for being more then a bit tardy on this. I have been consumed with getting 4.2 validated in our development environment. I just sent a pair of patches to the list which I refreshed against the top of the xen-4.1.testing Mercurial repository which contain the blktap2 patches. With both applied 4.1.x shows correct behavior with respect to blktap2 cleanup and termination. > Thanks, > > -- Pasi Let me know if anything else is required. Once again my apologies for being tardy about getting these re-forwarded. Best wishes for a successful release and a productive remainder of the week. Greg }-- End of excerpt from Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= As always, Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. 4206 N. 19th Ave. Specializing in information infra-structure Fargo, ND 58102 development. PH: 701-281-1686 FAX: 701-281-3949 EMAIL: greg@enjellic.com ------------------------------------------------------------------------------ "Meeting: An assembly of people coming together to decide what person or department not represented in the room must solve a problem." -- Unknown \~t _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 03:43:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 03:43:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVwXc-0005ZD-6u; Wed, 07 Nov 2012 03:43:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVwXa-0005Z8-Lf for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 03:42:58 +0000 Received: from [85.158.143.99:18468] by server-2.bemta-4.messagelabs.com id 0B/EC-28922-2C8D9905; Wed, 07 Nov 2012 03:42:58 +0000 X-Env-Sender: vip2442@gmail.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1352259776!22514250!1 X-Originating-IP: [209.85.214.171] X-SpamReason: No, hits=0.9 required=7.0 tests=HTML_40_50,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11124 invoked from network); 7 Nov 2012 03:42:57 -0000 Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by server-10.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 03:42:57 -0000 Received: by mail-ob0-f171.google.com with SMTP id 16so1573717obc.30 for ; Tue, 06 Nov 2012 19:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=PrkI7XORczE+CHxQugjVna31pQolxVQ1xtCIcR+IEVE=; b=di+mkg0OTkdViH8jr+53oQMwz3gJoJp0KEFeZ4veYvs1mbe76L3frQX1xjgv99Vh0y /DkhmedCB/vWq0AFcZR+wqw6OM8XoAdP5lO5d84Bm0B2IhSb7sEjlrWCm6wXJxpqyoAR NFYGuHBgUXgXrCJMcGDLWNQ1TQobgF6n0xHdwd7k5tS5l3cruk3+59YarBmGetFbRDlw Hli8DsW+u8Qd/mmlAtKrpFDn5NE0YOCC4xvV7tMQcBnLUXVGDDdk1BnJxMk0OpuSbZJV YtogKC61KUF0A+AHIMxdnpEV/7kAtCkrdLUvycsW3fUvA2PKJNyqTk9xaAXG0X4v+MTx dPLQ== MIME-Version: 1.0 Received: by 10.60.169.234 with SMTP id ah10mr905455oec.12.1352259775985; Tue, 06 Nov 2012 19:42:55 -0800 (PST) Received: by 10.76.86.164 with HTTP; Tue, 6 Nov 2012 19:42:55 -0800 (PST) Date: Tue, 6 Nov 2012 19:42:55 -0800 Message-ID: From: "Muneer A. Alshowkan" To: xen-devel@lists.xensource.com Subject: [Xen-devel] What do I need to write and compile code for xen hypercalls ? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4697995513818285935==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4697995513818285935== Content-Type: multipart/alternative; boundary=bcaec54d4d8e9778de04cddf838e --bcaec54d4d8e9778de04cddf838e Content-Type: text/plain; charset=ISO-8859-1 I want to write a code that list any hypercall happen from Domain U. I have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I need to write that code and compile it? Thanks. --bcaec54d4d8e9778de04cddf838e Content-Type: text/html; charset=ISO-8859-1

I want to write a code that list any hypercall happen from Domain U. I have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I need to write that code and compile it?



Thanks.
--bcaec54d4d8e9778de04cddf838e-- --===============4697995513818285935== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4697995513818285935==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 03:43:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 03:43:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVwXc-0005ZD-6u; Wed, 07 Nov 2012 03:43:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVwXa-0005Z8-Lf for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 03:42:58 +0000 Received: from [85.158.143.99:18468] by server-2.bemta-4.messagelabs.com id 0B/EC-28922-2C8D9905; Wed, 07 Nov 2012 03:42:58 +0000 X-Env-Sender: vip2442@gmail.com X-Msg-Ref: server-10.tower-216.messagelabs.com!1352259776!22514250!1 X-Originating-IP: [209.85.214.171] X-SpamReason: No, hits=0.9 required=7.0 tests=HTML_40_50,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11124 invoked from network); 7 Nov 2012 03:42:57 -0000 Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by server-10.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 03:42:57 -0000 Received: by mail-ob0-f171.google.com with SMTP id 16so1573717obc.30 for ; Tue, 06 Nov 2012 19:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=PrkI7XORczE+CHxQugjVna31pQolxVQ1xtCIcR+IEVE=; b=di+mkg0OTkdViH8jr+53oQMwz3gJoJp0KEFeZ4veYvs1mbe76L3frQX1xjgv99Vh0y /DkhmedCB/vWq0AFcZR+wqw6OM8XoAdP5lO5d84Bm0B2IhSb7sEjlrWCm6wXJxpqyoAR NFYGuHBgUXgXrCJMcGDLWNQ1TQobgF6n0xHdwd7k5tS5l3cruk3+59YarBmGetFbRDlw Hli8DsW+u8Qd/mmlAtKrpFDn5NE0YOCC4xvV7tMQcBnLUXVGDDdk1BnJxMk0OpuSbZJV YtogKC61KUF0A+AHIMxdnpEV/7kAtCkrdLUvycsW3fUvA2PKJNyqTk9xaAXG0X4v+MTx dPLQ== MIME-Version: 1.0 Received: by 10.60.169.234 with SMTP id ah10mr905455oec.12.1352259775985; Tue, 06 Nov 2012 19:42:55 -0800 (PST) Received: by 10.76.86.164 with HTTP; Tue, 6 Nov 2012 19:42:55 -0800 (PST) Date: Tue, 6 Nov 2012 19:42:55 -0800 Message-ID: From: "Muneer A. Alshowkan" To: xen-devel@lists.xensource.com Subject: [Xen-devel] What do I need to write and compile code for xen hypercalls ? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4697995513818285935==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4697995513818285935== Content-Type: multipart/alternative; boundary=bcaec54d4d8e9778de04cddf838e --bcaec54d4d8e9778de04cddf838e Content-Type: text/plain; charset=ISO-8859-1 I want to write a code that list any hypercall happen from Domain U. I have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I need to write that code and compile it? Thanks. --bcaec54d4d8e9778de04cddf838e Content-Type: text/html; charset=ISO-8859-1

I want to write a code that list any hypercall happen from Domain U. I have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I need to write that code and compile it?



Thanks.
--bcaec54d4d8e9778de04cddf838e-- --===============4697995513818285935== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4697995513818285935==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 05:31:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 05:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVyEX-0006FA-RX; Wed, 07 Nov 2012 05:31:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVyEW-0006F5-W4 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 05:31:25 +0000 Received: from [85.158.139.211:57470] by server-6.bemta-5.messagelabs.com id 08/46-19321-C22F9905; Wed, 07 Nov 2012 05:31:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352266283!15194658!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc1Nzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23008 invoked from network); 7 Nov 2012 05:31:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 05:31:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,726,1344211200"; d="scan'208";a="15628646" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 05:31:21 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 05:31:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVyET-0003Zq-BH; Wed, 07 Nov 2012 05:31:21 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVyET-0005HO-2x; Wed, 07 Nov 2012 05:31:21 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 7 Nov 2012 05:31:21 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14371: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14371 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14371/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14368 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14368 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14368 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14368 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 05:31:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 05:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVyEX-0006FA-RX; Wed, 07 Nov 2012 05:31:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVyEW-0006F5-W4 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 05:31:25 +0000 Received: from [85.158.139.211:57470] by server-6.bemta-5.messagelabs.com id 08/46-19321-C22F9905; Wed, 07 Nov 2012 05:31:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352266283!15194658!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc1Nzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23008 invoked from network); 7 Nov 2012 05:31:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 05:31:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,726,1344211200"; d="scan'208";a="15628646" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 05:31:21 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 05:31:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TVyET-0003Zq-BH; Wed, 07 Nov 2012 05:31:21 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TVyET-0005HO-2x; Wed, 07 Nov 2012 05:31:21 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 7 Nov 2012 05:31:21 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14371: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14371 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14371/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14368 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14368 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14368 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14368 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:22:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzxa-0006uP-GV; Wed, 07 Nov 2012 07:22:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzxY-0006uK-EW for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:22:00 +0000 Received: from [85.158.143.99:59823] by server-2.bemta-4.messagelabs.com id 15/E2-28922-71C0A905; Wed, 07 Nov 2012 07:21:59 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1352272918!21402661!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10464 invoked from network); 7 Nov 2012 07:21:59 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:21:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213699955" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:21:57 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:21:57 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzxU-0004ms-9N; Wed, 07 Nov 2012 07:21:57 +0000 Message-ID: <1352272794.12977.17.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Wed, 7 Nov 2012 08:19:54 +0100 In-Reply-To: <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > As there is no need for it (the fallback code is for older > hypervisors and they won't run under ARM), I think more specifically they won't run on anything other than x86. [...] > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 46de6cd..273d2b9 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -1,8 +1,8 @@ > ifneq ($(CONFIG_ARM),y) > -obj-y += manage.o balloon.o > +obj-y += manage.o balloon.o fallback.o > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > endif I think : obj-$(CONFIG_X86) += fallback.o would better reflect what is going on here. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:22:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzxa-0006uP-GV; Wed, 07 Nov 2012 07:22:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzxY-0006uK-EW for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:22:00 +0000 Received: from [85.158.143.99:59823] by server-2.bemta-4.messagelabs.com id 15/E2-28922-71C0A905; Wed, 07 Nov 2012 07:21:59 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1352272918!21402661!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10464 invoked from network); 7 Nov 2012 07:21:59 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:21:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213699955" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:21:57 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:21:57 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzxU-0004ms-9N; Wed, 07 Nov 2012 07:21:57 +0000 Message-ID: <1352272794.12977.17.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Wed, 7 Nov 2012 08:19:54 +0100 In-Reply-To: <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > As there is no need for it (the fallback code is for older > hypervisors and they won't run under ARM), I think more specifically they won't run on anything other than x86. [...] > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 46de6cd..273d2b9 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -1,8 +1,8 @@ > ifneq ($(CONFIG_ARM),y) > -obj-y += manage.o balloon.o > +obj-y += manage.o balloon.o fallback.o > obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > endif I think : obj-$(CONFIG_X86) += fallback.o would better reflect what is going on here. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:24:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:24:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzzJ-0006zP-50; Wed, 07 Nov 2012 07:23:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzzI-0006zE-8Y for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:23:48 +0000 Received: from [85.158.143.99:43792] by server-3.bemta-4.messagelabs.com id 15/72-06841-38C0A905; Wed, 07 Nov 2012 07:23:47 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352273025!17723407!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8144 invoked from network); 7 Nov 2012 07:23:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:23:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43746809" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:23:24 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:23:24 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzyt-0004oR-J3; Wed, 07 Nov 2012 07:23:24 +0000 Message-ID: <1352272882.12977.19.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Wed, 7 Nov 2012 08:21:22 +0100 In-Reply-To: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org CCing Russell since I believe this is the fix for the "BUG: ARM build failures due to Xen" failure he reported yesterday, On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell > --- > arch/arm/xen/enlighten.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..96d969d 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > *pages = NULL; > } > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > + > +/* In the hypervisor.S file. */ > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > +EXPORT_SYMBOL_GPL(privcmd_call); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:24:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:24:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzzJ-0006zP-50; Wed, 07 Nov 2012 07:23:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TVzzI-0006zE-8Y for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:23:48 +0000 Received: from [85.158.143.99:43792] by server-3.bemta-4.messagelabs.com id 15/72-06841-38C0A905; Wed, 07 Nov 2012 07:23:47 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352273025!17723407!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8144 invoked from network); 7 Nov 2012 07:23:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:23:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43746809" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:23:24 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:23:24 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzyt-0004oR-J3; Wed, 07 Nov 2012 07:23:24 +0000 Message-ID: <1352272882.12977.19.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Wed, 7 Nov 2012 08:21:22 +0100 In-Reply-To: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org CCing Russell since I believe this is the fix for the "BUG: ARM build failures due to Xen" failure he reported yesterday, On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell > --- > arch/arm/xen/enlighten.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..96d969d 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > *pages = NULL; > } > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > + > +/* In the hypervisor.S file. */ > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > +EXPORT_SYMBOL_GPL(privcmd_call); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:25:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW00D-00073R-Jb; Wed, 07 Nov 2012 07:24:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW00C-00073G-48 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 07:24:44 +0000 Received: from [193.109.254.147:4343] by server-3.bemta-14.messagelabs.com id 26/C5-01317-BBC0A905; Wed, 07 Nov 2012 07:24:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352273070!9978960!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10978 invoked from network); 7 Nov 2012 07:24:33 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:24:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213700076" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:24:30 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:24:29 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzzx-0004pH-26; Wed, 07 Nov 2012 07:24:29 +0000 Message-ID: <1352272948.12977.20.camel@hastur.hellion.org.uk> From: Ian Campbell To: "greg@enjellic.com" Date: Wed, 7 Nov 2012 08:22:28 +0100 In-Reply-To: <201211070206.qA7261Bp028589@wind.enjellic.com> References: <201211070206.qA7261Bp028589@wind.enjellic.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 02:06 +0000, Dr. Greg Wettstein wrote: > --------------------------------------------------------------------------- > Backport of the following patch from development: > > # User Ian Campbell <[hidden email]> > # Date 1309968705 -3600 > # Node ID e4781aedf817c5ab36f6f3077e44c43c566a2812 > # Parent 700d0f03d50aa6619d313c1ff6aea7fd429d28a7 > libxl: attempt to cleanup tapdisk processes on disk backend destroy. > > This patch properly terminates the tapdisk2 process(es) started > to service a virtual block device. > > Signed-off-by: Greg Wettstein Signed-off-by: Ian Campbell > > diff -r 700d0f03d50a tools/blktap2/control/tap-ctl-list.c > --- a/tools/blktap2/control/tap-ctl-list.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/blktap2/control/tap-ctl-list.c Tue Nov 06 19:52:48 2012 -0600 > @@ -506,17 +506,15 @@ out: > } > > int > -tap_ctl_find_minor(const char *type, const char *path) > +tap_ctl_find(const char *type, const char *path, tap_list_t *tap) > { > tap_list_t **list, **_entry; > - int minor, err; > + int ret = -ENOENT, err; > > err = tap_ctl_list(&list); > if (err) > return err; > > - minor = -1; > - > for (_entry = list; *_entry != NULL; ++_entry) { > tap_list_t *entry = *_entry; > > @@ -526,11 +524,13 @@ tap_ctl_find_minor(const char *type, con > if (path && (!entry->path || strcmp(entry->path, path))) > continue; > > - minor = entry->minor; > + *tap = *entry; > + tap->type = tap->path = NULL; > + ret = 0; > break; > } > > tap_ctl_free_list(list); > > - return minor >= 0 ? minor : -ENOENT; > + return ret; > } > diff -r 700d0f03d50a tools/blktap2/control/tap-ctl.h > --- a/tools/blktap2/control/tap-ctl.h Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/blktap2/control/tap-ctl.h Tue Nov 06 19:52:48 2012 -0600 > @@ -76,7 +76,7 @@ int tap_ctl_get_driver_id(const char *ha > > int tap_ctl_list(tap_list_t ***list); > void tap_ctl_free_list(tap_list_t **list); > -int tap_ctl_find_minor(const char *type, const char *path); > +int tap_ctl_find(const char *type, const char *path, tap_list_t *tap); > > int tap_ctl_allocate(int *minor, char **devname); > int tap_ctl_free(const int minor); > diff -r 700d0f03d50a tools/libxl/libxl_blktap2.c > --- a/tools/libxl/libxl_blktap2.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:52:48 2012 -0600 > @@ -18,6 +18,8 @@ > > #include "tap-ctl.h" > > +#include > + > int libxl__blktap_enabled(libxl__gc *gc) > { > const char *msg; > @@ -30,12 +32,13 @@ const char *libxl__blktap_devpath(libxl_ > { > const char *type; > char *params, *devname = NULL; > - int minor, err; > + tap_list_t tap; > + int err; > > type = libxl__device_disk_string_of_format(format); > - minor = tap_ctl_find_minor(type, disk); > - if (minor >= 0) { > - devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", minor); > + err = tap_ctl_find(type, disk, &tap); > + if (err == 0) { > + devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", tap.minor); > if (devname) > return devname; > } > @@ -49,3 +52,28 @@ const char *libxl__blktap_devpath(libxl_ > > return NULL; > } > + > + > +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) > +{ > + char *path, *params, *type, *disk; > + int err; > + tap_list_t tap; > + > + path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); > + if (!path) return; > + > + params = libxl__xs_read(gc, XBT_NULL, path); > + if (!params) return; > + > + type = params; > + disk = strchr(params, ':'); > + if (!disk) return; > + > + *disk++ = '\0'; > + > + err = tap_ctl_find(type, disk, &tap); > + if (err < 0) return; > + > + tap_ctl_destroy(tap.id, tap.minor); > +} > diff -r 700d0f03d50a tools/libxl/libxl_device.c > --- a/tools/libxl/libxl_device.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:52:48 2012 -0600 > @@ -250,6 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx > if (!state) > goto out; > if (atoi(state) != 4) { > + libxl__device_destroy_tapdisk(&gc, be_path); > xs_rm(ctx->xsh, XBT_NULL, be_path); > goto out; > } > @@ -368,6 +369,7 @@ int libxl__devices_destroy(libxl_ctx *ct > } > } > } > + libxl__device_destroy_tapdisk(&gc, be_path); > out: > libxl__free_all(&gc); > return 0; > diff -r 700d0f03d50a tools/libxl/libxl_internal.h > --- a/tools/libxl/libxl_internal.h Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_internal.h Tue Nov 06 19:52:48 2012 -0600 > @@ -314,6 +314,12 @@ _hidden const char *libxl__blktap_devpat > const char *disk, > libxl_disk_format format); > > +/* libxl__device_destroy_tapdisk: > + * Destroys any tapdisk process associated with the backend represented > + * by be_path. > + */ > +_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); > + > _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); > > struct libxl__xen_console_reader { > diff -r 700d0f03d50a tools/libxl/libxl_noblktap2.c > --- a/tools/libxl/libxl_noblktap2.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_noblktap2.c Tue Nov 06 19:52:48 2012 -0600 > @@ -27,3 +27,7 @@ const char *libxl__blktap_devpath(libxl_ > { > return NULL; > } > + > +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) > +{ > +} > --------------------------------------------------------------------------- > > As always, > Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. > 4206 N. 19th Ave. Specializing in information infra-structure > Fargo, ND 58102 development. > PH: 701-281-1686 > FAX: 701-281-3949 EMAIL: greg@enjellic.com > ------------------------------------------------------------------------------ > "Man, despite his artistic pretensions, his sophistication and many > accomplishments, owes the fact of his existence to a six-inch layer of > topsoil and the fact that it rains." > -- Anonymous writer on perspective. > GAUSSIAN quote. > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:25:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW00D-00073R-Jb; Wed, 07 Nov 2012 07:24:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW00C-00073G-48 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 07:24:44 +0000 Received: from [193.109.254.147:4343] by server-3.bemta-14.messagelabs.com id 26/C5-01317-BBC0A905; Wed, 07 Nov 2012 07:24:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352273070!9978960!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10978 invoked from network); 7 Nov 2012 07:24:33 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:24:33 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213700076" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:24:30 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:24:29 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TVzzx-0004pH-26; Wed, 07 Nov 2012 07:24:29 +0000 Message-ID: <1352272948.12977.20.camel@hastur.hellion.org.uk> From: Ian Campbell To: "greg@enjellic.com" Date: Wed, 7 Nov 2012 08:22:28 +0100 In-Reply-To: <201211070206.qA7261Bp028589@wind.enjellic.com> References: <201211070206.qA7261Bp028589@wind.enjellic.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 1/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 02:06 +0000, Dr. Greg Wettstein wrote: > --------------------------------------------------------------------------- > Backport of the following patch from development: > > # User Ian Campbell <[hidden email]> > # Date 1309968705 -3600 > # Node ID e4781aedf817c5ab36f6f3077e44c43c566a2812 > # Parent 700d0f03d50aa6619d313c1ff6aea7fd429d28a7 > libxl: attempt to cleanup tapdisk processes on disk backend destroy. > > This patch properly terminates the tapdisk2 process(es) started > to service a virtual block device. > > Signed-off-by: Greg Wettstein Signed-off-by: Ian Campbell > > diff -r 700d0f03d50a tools/blktap2/control/tap-ctl-list.c > --- a/tools/blktap2/control/tap-ctl-list.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/blktap2/control/tap-ctl-list.c Tue Nov 06 19:52:48 2012 -0600 > @@ -506,17 +506,15 @@ out: > } > > int > -tap_ctl_find_minor(const char *type, const char *path) > +tap_ctl_find(const char *type, const char *path, tap_list_t *tap) > { > tap_list_t **list, **_entry; > - int minor, err; > + int ret = -ENOENT, err; > > err = tap_ctl_list(&list); > if (err) > return err; > > - minor = -1; > - > for (_entry = list; *_entry != NULL; ++_entry) { > tap_list_t *entry = *_entry; > > @@ -526,11 +524,13 @@ tap_ctl_find_minor(const char *type, con > if (path && (!entry->path || strcmp(entry->path, path))) > continue; > > - minor = entry->minor; > + *tap = *entry; > + tap->type = tap->path = NULL; > + ret = 0; > break; > } > > tap_ctl_free_list(list); > > - return minor >= 0 ? minor : -ENOENT; > + return ret; > } > diff -r 700d0f03d50a tools/blktap2/control/tap-ctl.h > --- a/tools/blktap2/control/tap-ctl.h Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/blktap2/control/tap-ctl.h Tue Nov 06 19:52:48 2012 -0600 > @@ -76,7 +76,7 @@ int tap_ctl_get_driver_id(const char *ha > > int tap_ctl_list(tap_list_t ***list); > void tap_ctl_free_list(tap_list_t **list); > -int tap_ctl_find_minor(const char *type, const char *path); > +int tap_ctl_find(const char *type, const char *path, tap_list_t *tap); > > int tap_ctl_allocate(int *minor, char **devname); > int tap_ctl_free(const int minor); > diff -r 700d0f03d50a tools/libxl/libxl_blktap2.c > --- a/tools/libxl/libxl_blktap2.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:52:48 2012 -0600 > @@ -18,6 +18,8 @@ > > #include "tap-ctl.h" > > +#include > + > int libxl__blktap_enabled(libxl__gc *gc) > { > const char *msg; > @@ -30,12 +32,13 @@ const char *libxl__blktap_devpath(libxl_ > { > const char *type; > char *params, *devname = NULL; > - int minor, err; > + tap_list_t tap; > + int err; > > type = libxl__device_disk_string_of_format(format); > - minor = tap_ctl_find_minor(type, disk); > - if (minor >= 0) { > - devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", minor); > + err = tap_ctl_find(type, disk, &tap); > + if (err == 0) { > + devname = libxl__sprintf(gc, "/dev/xen/blktap-2/tapdev%d", tap.minor); > if (devname) > return devname; > } > @@ -49,3 +52,28 @@ const char *libxl__blktap_devpath(libxl_ > > return NULL; > } > + > + > +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) > +{ > + char *path, *params, *type, *disk; > + int err; > + tap_list_t tap; > + > + path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); > + if (!path) return; > + > + params = libxl__xs_read(gc, XBT_NULL, path); > + if (!params) return; > + > + type = params; > + disk = strchr(params, ':'); > + if (!disk) return; > + > + *disk++ = '\0'; > + > + err = tap_ctl_find(type, disk, &tap); > + if (err < 0) return; > + > + tap_ctl_destroy(tap.id, tap.minor); > +} > diff -r 700d0f03d50a tools/libxl/libxl_device.c > --- a/tools/libxl/libxl_device.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:52:48 2012 -0600 > @@ -250,6 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx > if (!state) > goto out; > if (atoi(state) != 4) { > + libxl__device_destroy_tapdisk(&gc, be_path); > xs_rm(ctx->xsh, XBT_NULL, be_path); > goto out; > } > @@ -368,6 +369,7 @@ int libxl__devices_destroy(libxl_ctx *ct > } > } > } > + libxl__device_destroy_tapdisk(&gc, be_path); > out: > libxl__free_all(&gc); > return 0; > diff -r 700d0f03d50a tools/libxl/libxl_internal.h > --- a/tools/libxl/libxl_internal.h Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_internal.h Tue Nov 06 19:52:48 2012 -0600 > @@ -314,6 +314,12 @@ _hidden const char *libxl__blktap_devpat > const char *disk, > libxl_disk_format format); > > +/* libxl__device_destroy_tapdisk: > + * Destroys any tapdisk process associated with the backend represented > + * by be_path. > + */ > +_hidden void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path); > + > _hidden char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid); > > struct libxl__xen_console_reader { > diff -r 700d0f03d50a tools/libxl/libxl_noblktap2.c > --- a/tools/libxl/libxl_noblktap2.c Mon Oct 29 09:04:48 2012 +0100 > +++ b/tools/libxl/libxl_noblktap2.c Tue Nov 06 19:52:48 2012 -0600 > @@ -27,3 +27,7 @@ const char *libxl__blktap_devpath(libxl_ > { > return NULL; > } > + > +void libxl__device_destroy_tapdisk(libxl__gc *gc, char *be_path) > +{ > +} > --------------------------------------------------------------------------- > > As always, > Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. > 4206 N. 19th Ave. Specializing in information infra-structure > Fargo, ND 58102 development. > PH: 701-281-1686 > FAX: 701-281-3949 EMAIL: greg@enjellic.com > ------------------------------------------------------------------------------ > "Man, despite his artistic pretensions, his sophistication and many > accomplishments, owes the fact of his existence to a six-inch layer of > topsoil and the fact that it rains." > -- Anonymous writer on perspective. > GAUSSIAN quote. > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:26:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:26:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW019-00078K-1a; Wed, 07 Nov 2012 07:25:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW017-000783-B9 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 07:25:41 +0000 Received: from [85.158.138.51:22310] by server-12.bemta-3.messagelabs.com id 73/6E-22757-4FC0A905; Wed, 07 Nov 2012 07:25:40 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352273138!28963810!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7709 invoked from network); 7 Nov 2012 07:25:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:25:39 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43746962" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:25:38 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:25:37 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW013-0004px-Bt; Wed, 07 Nov 2012 07:25:37 +0000 Message-ID: <1352273016.12977.21.camel@hastur.hellion.org.uk> From: Ian Campbell To: "greg@enjellic.com" Date: Wed, 7 Nov 2012 08:23:36 +0100 In-Reply-To: <201211070207.qA727wF1028601@wind.enjellic.com> References: <201211070207.qA727wF1028601@wind.enjellic.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 02:07 +0000, Dr. Greg Wettstein wrote: > --------------------------------------------------------------------------- > The following patch when applied on top of: > > libxl: attempt to cleanup tapdisk processes on disk backend destroy. > > Establishes correct cleanup behavior for blktap devices. This patch > implements the release of the backend device before calling for > the destruction of the userspace component of the blktap device. > > Without this patch the kernel xen-blkback driver deadlocks with > the blktap2 user control plane until the IPC channel is terminated by the > timeout on the select() call. This results in a noticeable delay > in the termination of the guest and causes the blktap minor > number which had been allocated to be orphaned. > > Signed-off-by: Greg Wettstein Acked-by: Ian Campbell > diff -r b184698e0893 tools/libxl/libxl_blktap2.c > --- a/tools/libxl/libxl_blktap2.c Tue Nov 06 19:53:48 2012 -0600 > +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:54:23 2012 -0600 > @@ -59,6 +59,7 @@ void libxl__device_destroy_tapdisk(libxl > char *path, *params, *type, *disk; > int err; > tap_list_t tap; > + libxl_ctx *ctx = libxl__gc_owner(gc); > > path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); > if (!path) return; > @@ -75,5 +76,11 @@ void libxl__device_destroy_tapdisk(libxl > err = tap_ctl_find(type, disk, &tap); > if (err < 0) return; > > + /* > + * Remove the instance of the backend device to avoid a deadlock with the > + * removal of the tap device. > + */ > + xs_rm(ctx->xsh, XBT_NULL, be_path); > + > tap_ctl_destroy(tap.id, tap.minor); > } > diff -r b184698e0893 tools/libxl/libxl_device.c > --- a/tools/libxl/libxl_device.c Tue Nov 06 19:53:48 2012 -0600 > +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:54:23 2012 -0600 > @@ -250,8 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx > if (!state) > goto out; > if (atoi(state) != 4) { > - libxl__device_destroy_tapdisk(&gc, be_path); > - xs_rm(ctx->xsh, XBT_NULL, be_path); > + libxl__device_destroy_tapdisk(&gc, be_path); > goto out; > } > > --------------------------------------------------------------------------- > > As always, > Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. > 4206 N. 19th Ave. Specializing in information infra-structure > Fargo, ND 58102 development. > PH: 701-281-1686 > FAX: 701-281-3949 EMAIL: greg@enjellic.com > ------------------------------------------------------------------------------ > "Fungus doesn't take a vacation." > -- Rob Pike > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:26:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:26:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW019-00078K-1a; Wed, 07 Nov 2012 07:25:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW017-000783-B9 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 07:25:41 +0000 Received: from [85.158.138.51:22310] by server-12.bemta-3.messagelabs.com id 73/6E-22757-4FC0A905; Wed, 07 Nov 2012 07:25:40 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352273138!28963810!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7709 invoked from network); 7 Nov 2012 07:25:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:25:39 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43746962" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:25:38 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:25:37 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW013-0004px-Bt; Wed, 07 Nov 2012 07:25:37 +0000 Message-ID: <1352273016.12977.21.camel@hastur.hellion.org.uk> From: Ian Campbell To: "greg@enjellic.com" Date: Wed, 7 Nov 2012 08:23:36 +0100 In-Reply-To: <201211070207.qA727wF1028601@wind.enjellic.com> References: <201211070207.qA727wF1028601@wind.enjellic.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Keir \(Xen.org\)" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2/2] 4.1.2 blktap2 cleanup fixes. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 02:07 +0000, Dr. Greg Wettstein wrote: > --------------------------------------------------------------------------- > The following patch when applied on top of: > > libxl: attempt to cleanup tapdisk processes on disk backend destroy. > > Establishes correct cleanup behavior for blktap devices. This patch > implements the release of the backend device before calling for > the destruction of the userspace component of the blktap device. > > Without this patch the kernel xen-blkback driver deadlocks with > the blktap2 user control plane until the IPC channel is terminated by the > timeout on the select() call. This results in a noticeable delay > in the termination of the guest and causes the blktap minor > number which had been allocated to be orphaned. > > Signed-off-by: Greg Wettstein Acked-by: Ian Campbell > diff -r b184698e0893 tools/libxl/libxl_blktap2.c > --- a/tools/libxl/libxl_blktap2.c Tue Nov 06 19:53:48 2012 -0600 > +++ b/tools/libxl/libxl_blktap2.c Tue Nov 06 19:54:23 2012 -0600 > @@ -59,6 +59,7 @@ void libxl__device_destroy_tapdisk(libxl > char *path, *params, *type, *disk; > int err; > tap_list_t tap; > + libxl_ctx *ctx = libxl__gc_owner(gc); > > path = libxl__sprintf(gc, "%s/tapdisk-params", be_path); > if (!path) return; > @@ -75,5 +76,11 @@ void libxl__device_destroy_tapdisk(libxl > err = tap_ctl_find(type, disk, &tap); > if (err < 0) return; > > + /* > + * Remove the instance of the backend device to avoid a deadlock with the > + * removal of the tap device. > + */ > + xs_rm(ctx->xsh, XBT_NULL, be_path); > + > tap_ctl_destroy(tap.id, tap.minor); > } > diff -r b184698e0893 tools/libxl/libxl_device.c > --- a/tools/libxl/libxl_device.c Tue Nov 06 19:53:48 2012 -0600 > +++ b/tools/libxl/libxl_device.c Tue Nov 06 19:54:23 2012 -0600 > @@ -250,8 +250,7 @@ int libxl__device_destroy(libxl_ctx *ctx > if (!state) > goto out; > if (atoi(state) != 4) { > - libxl__device_destroy_tapdisk(&gc, be_path); > - xs_rm(ctx->xsh, XBT_NULL, be_path); > + libxl__device_destroy_tapdisk(&gc, be_path); > goto out; > } > > --------------------------------------------------------------------------- > > As always, > Dr. G.W. Wettstein, Ph.D. Enjellic Systems Development, LLC. > 4206 N. 19th Ave. Specializing in information infra-structure > Fargo, ND 58102 development. > PH: 701-281-1686 > FAX: 701-281-3949 EMAIL: greg@enjellic.com > ------------------------------------------------------------------------------ > "Fungus doesn't take a vacation." > -- Rob Pike > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:28:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:28:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW03S-0007Mt-JI; Wed, 07 Nov 2012 07:28:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW03R-0007Mh-2N for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:28:05 +0000 Received: from [85.158.137.99:54362] by server-13.bemta-3.messagelabs.com id 34/EF-24887-48D0A905; Wed, 07 Nov 2012 07:28:04 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352273282!17946767!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29774 invoked from network); 7 Nov 2012 07:28:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:28:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43747072" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:28:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:28:01 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW03M-0004s6-OF; Wed, 07 Nov 2012 07:28:01 +0000 Message-ID: <1352273160.12977.23.camel@hastur.hellion.org.uk> From: Ian Campbell To: "Muneer A. Alshowkan" Date: Wed, 7 Nov 2012 08:26:00 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] What do I need to write and compile code for xen hypercalls ? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 03:42 +0000, Muneer A. Alshowkan wrote: > I want to write a code that list any hypercall happen from Domain U. I > have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I > need to write that code and compile it? I'm afraid this questions is far to broad for anyone to be able to give a useful answer. I'd recommend that you start by reading http://wiki.xen.org/wiki/Asking_Xen_Devel_Questions and speaking to your advisor. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:28:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:28:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW03S-0007Mt-JI; Wed, 07 Nov 2012 07:28:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW03R-0007Mh-2N for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:28:05 +0000 Received: from [85.158.137.99:54362] by server-13.bemta-3.messagelabs.com id 34/EF-24887-48D0A905; Wed, 07 Nov 2012 07:28:04 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352273282!17946767!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODE4NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29774 invoked from network); 7 Nov 2012 07:28:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:28:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="43747072" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:28:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:28:01 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW03M-0004s6-OF; Wed, 07 Nov 2012 07:28:01 +0000 Message-ID: <1352273160.12977.23.camel@hastur.hellion.org.uk> From: Ian Campbell To: "Muneer A. Alshowkan" Date: Wed, 7 Nov 2012 08:26:00 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] What do I need to write and compile code for xen hypercalls ? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 03:42 +0000, Muneer A. Alshowkan wrote: > I want to write a code that list any hypercall happen from Domain U. I > have xen 4.1 installed on Ubuntu 12.04. What are the extra tools I > need to write that code and compile it? I'm afraid this questions is far to broad for anyone to be able to give a useful answer. I'd recommend that you start by reading http://wiki.xen.org/wiki/Asking_Xen_Devel_Questions and speaking to your advisor. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:32:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:32:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW07X-0007ct-8w; Wed, 07 Nov 2012 07:32:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW07W-0007ck-3L for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:32:18 +0000 Received: from [85.158.139.211:63130] by server-13.bemta-5.messagelabs.com id 4A/AD-27809-18E0A905; Wed, 07 Nov 2012 07:32:17 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352273535!19206643!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8377 invoked from network); 7 Nov 2012 07:32:16 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:32:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213700382" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:32:15 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:32:14 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW07S-0004w3-6Z; Wed, 07 Nov 2012 07:32:14 +0000 Message-ID: <1352273413.12977.27.camel@hastur.hellion.org.uk> From: Ian Campbell To: Liu Jinsong Date: Wed, 7 Nov 2012 08:30:13 +0100 In-Reply-To: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > At the target > it would set p2m as p2m_ram_broken for broken page, so that if guest > access the broken page again, it would kill itself as expected. Can you add a few words here about why this is preferable to just ignoring the issue and populating a regular page non-broken page on the target? I think I know why but it would be useful to be explicit in the changelog. I also spotted a typo: > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, brokan broken Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 07:32:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 07:32:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW07X-0007ct-8w; Wed, 07 Nov 2012 07:32:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW07W-0007ck-3L for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 07:32:18 +0000 Received: from [85.158.139.211:63130] by server-13.bemta-5.messagelabs.com id 4A/AD-27809-18E0A905; Wed, 07 Nov 2012 07:32:17 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352273535!19206643!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ1NjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8377 invoked from network); 7 Nov 2012 07:32:16 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 07:32:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,727,1344211200"; d="scan'208";a="213700382" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 07:32:15 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 02:32:14 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW07S-0004w3-6Z; Wed, 07 Nov 2012 07:32:14 +0000 Message-ID: <1352273413.12977.27.camel@hastur.hellion.org.uk> From: Ian Campbell To: Liu Jinsong Date: Wed, 7 Nov 2012 08:30:13 +0100 In-Reply-To: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > At the target > it would set p2m as p2m_ram_broken for broken page, so that if guest > access the broken page again, it would kill itself as expected. Can you add a few words here about why this is preferable to just ignoring the issue and populating a regular page non-broken page on the target? I think I know why but it would be useful to be explicit in the changelog. I also spotted a typo: > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, brokan broken Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:26:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:26:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0xQ-0008Ky-9D; Wed, 07 Nov 2012 08:25:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0xO-0008Kt-Ir for xen-devel@lists.xen.org; Wed, 07 Nov 2012 08:25:54 +0000 Received: from [85.158.137.99:28048] by server-14.bemta-3.messagelabs.com id 96/FE-12788-11B1A905; Wed, 07 Nov 2012 08:25:53 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352276753!13264489!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQyMjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21183 invoked from network); 7 Nov 2012 08:25:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-217.messagelabs.com with SMTP; 7 Nov 2012 08:25:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 08:25:56 +0000 Message-Id: <509A291F02000078000A6E9A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 08:25:51 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> <5098E9FC02000078000A69A7@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 21:40, Dan Magenheimer wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> Sent: Tuesday, November 06, 2012 2:44 AM >> To: Dan Magenheimer >> Cc: xen-devel@lists.xen.org; keir@xen.org >> Subject: RE: 32bit xen and "claim" >> >> >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: >> > Does it make sense to have a runtime option that unsets the >> > physical limit but disallows legacy PV guests? If this >> > defaults to false for machines with RAM<=5TB but to true >> > for machines with RAM>5TB, then the feature is "done" >> > (AND we have put a stake in the ground to begin the >> > slow obsolescence of PV functionality). >> >> That would be interesting: Mukesh's PVH code wasn't even >> posted yet, i.e. you're proposing to render systems with more >> than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 >> kernel runnable in that environment). > > Good point. BUT... couldn't a PV dom0 started with dom0_mem=X > (where X is smaller than 5GB) still work? No - Xen would still need to be able to access all memory when in the context of such a Dom0 (even address restricting that Dom0 just like we do for 32-bit PV guests wouldn't help, as e.g. granted pages from DomU-s may need accessing in Xen in the context of Dom0). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:26:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:26:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0xQ-0008Ky-9D; Wed, 07 Nov 2012 08:25:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0xO-0008Kt-Ir for xen-devel@lists.xen.org; Wed, 07 Nov 2012 08:25:54 +0000 Received: from [85.158.137.99:28048] by server-14.bemta-3.messagelabs.com id 96/FE-12788-11B1A905; Wed, 07 Nov 2012 08:25:53 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352276753!13264489!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQyMjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21183 invoked from network); 7 Nov 2012 08:25:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-217.messagelabs.com with SMTP; 7 Nov 2012 08:25:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 08:25:56 +0000 Message-Id: <509A291F02000078000A6E9A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 08:25:51 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <620abc58-07b9-4102-b883-0bfcd8e78471@default> <5092DE7E020000780008EB96@nat28.tlf.novell.com> <75058642-ad3b-4df9-a24a-7dbdc5f6e8c5@default> <5093954902000078000A5F45@nat28.tlf.novell.com> <00c25fab-a110-4f4b-a596-6cdfeb5b0d26@default> <5098E9FC02000078000A69A7@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] 32bit xen and "claim" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 06.11.12 at 21:40, Dan Magenheimer wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> Sent: Tuesday, November 06, 2012 2:44 AM >> To: Dan Magenheimer >> Cc: xen-devel@lists.xen.org; keir@xen.org >> Subject: RE: 32bit xen and "claim" >> >> >>> On 05.11.12 at 20:16, Dan Magenheimer wrote: >> > Does it make sense to have a runtime option that unsets the >> > physical limit but disallows legacy PV guests? If this >> > defaults to false for machines with RAM<=5TB but to true >> > for machines with RAM>5TB, then the feature is "done" >> > (AND we have put a stake in the ground to begin the >> > slow obsolescence of PV functionality). >> >> That would be interesting: Mukesh's PVH code wasn't even >> posted yet, i.e. you're proposing to render systems with more >> than 5Tb unbootable (for the lack of a - necessarily PV - Dom0 >> kernel runnable in that environment). > > Good point. BUT... couldn't a PV dom0 started with dom0_mem=X > (where X is smaller than 5GB) still work? No - Xen would still need to be able to access all memory when in the context of such a Dom0 (even address restricting that Dom0 just like we do for 32-bit PV guests wouldn't help, as e.g. granted pages from DomU-s may need accessing in Xen in the context of Dom0). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:39:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:39:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW19s-0008Ua-Mr; Wed, 07 Nov 2012 08:38:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW19r-0008UV-W7 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 08:38:48 +0000 Received: from [85.158.139.83:45839] by server-1.bemta-5.messagelabs.com id D6/B8-05877-71E1A905; Wed, 07 Nov 2012 08:38:47 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352277526!26420888!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQyMjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22121 invoked from network); 7 Nov 2012 08:38:46 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-182.messagelabs.com with SMTP; 7 Nov 2012 08:38:46 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 08:38:51 +0000 Message-Id: <509A2C2402000078000A6EB9@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 08:38:44 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> <1352272794.12977.17.camel@hastur.hellion.org.uk> In-Reply-To: <1352272794.12977.17.camel@hastur.hellion.org.uk> Mime-Version: 1.0 Content-Disposition: inline Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 08:19, Ian Campbell wrote: > On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: >> As there is no need for it (the fallback code is for older >> hypervisors and they won't run under ARM), > > I think more specifically they won't run on anything other than x86. > > [...] >> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >> index 46de6cd..273d2b9 100644 >> --- a/drivers/xen/Makefile >> +++ b/drivers/xen/Makefile >> @@ -1,8 +1,8 @@ >> ifneq ($(CONFIG_ARM),y) >> -obj-y += manage.o balloon.o >> +obj-y += manage.o balloon.o fallback.o >> obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o >> endif > > I think : > obj-$(CONFIG_X86) += fallback.o > would better reflect what is going on here. Yes please. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:39:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:39:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW19s-0008Ua-Mr; Wed, 07 Nov 2012 08:38:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW19r-0008UV-W7 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 08:38:48 +0000 Received: from [85.158.139.83:45839] by server-1.bemta-5.messagelabs.com id D6/B8-05877-71E1A905; Wed, 07 Nov 2012 08:38:47 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352277526!26420888!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQyMjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22121 invoked from network); 7 Nov 2012 08:38:46 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-182.messagelabs.com with SMTP; 7 Nov 2012 08:38:46 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 08:38:51 +0000 Message-Id: <509A2C2402000078000A6EB9@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 08:38:44 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> <1352272794.12977.17.camel@hastur.hellion.org.uk> In-Reply-To: <1352272794.12977.17.camel@hastur.hellion.org.uk> Mime-Version: 1.0 Content-Disposition: inline Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 08:19, Ian Campbell wrote: > On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: >> As there is no need for it (the fallback code is for older >> hypervisors and they won't run under ARM), > > I think more specifically they won't run on anything other than x86. > > [...] >> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile >> index 46de6cd..273d2b9 100644 >> --- a/drivers/xen/Makefile >> +++ b/drivers/xen/Makefile >> @@ -1,8 +1,8 @@ >> ifneq ($(CONFIG_ARM),y) >> -obj-y += manage.o balloon.o >> +obj-y += manage.o balloon.o fallback.o >> obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o >> endif > > I think : > obj-$(CONFIG_X86) += fallback.o > would better reflect what is going on here. Yes please. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:45:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:45:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW1G1-0000E1-An; Wed, 07 Nov 2012 08:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW1G0-0000Dw-Fg for xen-devel@lists.xen.org; Wed, 07 Nov 2012 08:45:08 +0000 Received: from [85.158.139.211:48266] by server-7.bemta-5.messagelabs.com id CF/12-23096-39F1A905; Wed, 07 Nov 2012 08:45:07 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-3.tower-206.messagelabs.com!1352277906!19192350!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDI4MTA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23887 invoked from network); 7 Nov 2012 08:45:07 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 08:45:07 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id C31482622; Wed, 7 Nov 2012 10:45:05 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id 7097D2005D; Wed, 7 Nov 2012 10:45:05 +0200 (EET) Date: Wed, 7 Nov 2012 10:45:05 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: greg@enjellic.com Message-ID: <20121107084505.GH8912@reaktio.net> References: <201211070217.qA72HoqS028647@wind.enjellic.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201211070217.qA72HoqS028647@wind.enjellic.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 08:17:50PM -0600, Dr. Greg Wettstein wrote: > On Nov 5, 2:26pm, Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= wrote: > } Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. > > Hi Pasi, hope this note finds your week going well. > > > Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you > > can re-submit these blktap2 bugfix patches for inclusion! > > Yes, my apologies for being more then a bit tardy on this. I have > been consumed with getting 4.2 validated in our development > environment. > > I just sent a pair of patches to the list which I refreshed against > the top of the xen-4.1.testing Mercurial repository which contain the > blktap2 patches. With both applied 4.1.x shows correct behavior with > respect to blktap2 cleanup and termination. > Great, thanks a lot! I'm sure the maintainers will comment on the new patches. -- Pasi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 08:45:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 08:45:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW1G1-0000E1-An; Wed, 07 Nov 2012 08:45:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW1G0-0000Dw-Fg for xen-devel@lists.xen.org; Wed, 07 Nov 2012 08:45:08 +0000 Received: from [85.158.139.211:48266] by server-7.bemta-5.messagelabs.com id CF/12-23096-39F1A905; Wed, 07 Nov 2012 08:45:07 +0000 X-Env-Sender: pasik@iki.fi X-Msg-Ref: server-3.tower-206.messagelabs.com!1352277906!19192350!1 X-Originating-IP: [192.89.123.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjg5LjEyMy4yNSA9PiA1MDI4MTA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23887 invoked from network); 7 Nov 2012 08:45:07 -0000 Received: from smtp.tele.fi (HELO smtp.tele.fi) (192.89.123.25) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 08:45:07 -0000 X-Originating-Ip: [194.89.68.22] Received: from ydin.reaktio.net (reaktio.net [194.89.68.22]) by smtp.tele.fi (Postfix) with ESMTP id C31482622; Wed, 7 Nov 2012 10:45:05 +0200 (EET) Received: by ydin.reaktio.net (Postfix, from userid 1001) id 7097D2005D; Wed, 7 Nov 2012 10:45:05 +0200 (EET) Date: Wed, 7 Nov 2012 10:45:05 +0200 From: Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= To: greg@enjellic.com Message-ID: <20121107084505.GH8912@reaktio.net> References: <201211070217.qA72HoqS028647@wind.enjellic.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201211070217.qA72HoqS028647@wind.enjellic.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Ian Jackson , Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, 2012 at 08:17:50PM -0600, Dr. Greg Wettstein wrote: > On Nov 5, 2:26pm, Pasi =?iso-8859-1?Q?K=E4rkk=E4inen?= wrote: > } Subject: Re: [Xen-devel] XEN 4.1.3 blktap2 patches. > > Hi Pasi, hope this note finds your week going well. > > > Dr. Greg: RC1 for Xen 4.1.4 is being prepared atm, so hopefully you > > can re-submit these blktap2 bugfix patches for inclusion! > > Yes, my apologies for being more then a bit tardy on this. I have > been consumed with getting 4.2 validated in our development > environment. > > I just sent a pair of patches to the list which I refreshed against > the top of the xen-4.1.testing Mercurial repository which contain the > blktap2 patches. With both applied 4.1.x shows correct behavior with > respect to blktap2 cleanup and termination. > Great, thanks a lot! I'm sure the maintainers will comment on the new patches. -- Pasi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 09:44:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 09:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2B7-0000XH-8r; Wed, 07 Nov 2012 09:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0bW-0008Hw-NF for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 08:03:18 +0000 Received: from [85.158.138.51:36222] by server-8.bemta-3.messagelabs.com id BA/E7-07786-5C51A905; Wed, 07 Nov 2012 08:03:17 +0000 X-Env-Sender: qiumojiong@gmail.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352275395!20124933!1 X-Originating-IP: [209.85.210.171] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14484 invoked from network); 7 Nov 2012 08:03:17 -0000 Received: from mail-ia0-f171.google.com (HELO mail-ia0-f171.google.com) (209.85.210.171) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 08:03:17 -0000 Received: by mail-ia0-f171.google.com with SMTP id u21so1178952ial.30 for ; Wed, 07 Nov 2012 00:03:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=igg1Bhvdtj4dLP0f9ouXaNPdtsSQNpyl/JlMSmMqKpM=; b=YtDB0FIch70Rydtq9iD5YUccR5Iv/y/fiqBYxq0rbLE9dd73b4p549FbWfXnLv2jd3 /+WvGlpE1j54Bog3Vl9LLR0kpnbgy5YuyDcmcZAehHTlY1p+DpsSYXRFL2dwCA2/gsfq HlsgN4YsQkEyXSqKjuxbQG9Rc6/lE5wIn3koUdb3KCuQ+2gRlK1I78fcFoWbVLtENd5m KsFPyi9q6kMO1lGf+lvGNQwZO9r44NTB9QZkvnu4l9oqeVCmXt39LIeb+mnKuVLN1hRd T9qG1hKPhJzOJqSKfSuNSVYOwPQIQ7vx7AeZI8f22UYt4GUOeO2oCvcprJacMoFc60sD O1TA== MIME-Version: 1.0 Received: by 10.50.46.129 with SMTP id v1mr1238298igm.42.1352275395261; Wed, 07 Nov 2012 00:03:15 -0800 (PST) Received: by 10.231.165.202 with HTTP; Wed, 7 Nov 2012 00:03:15 -0800 (PST) In-Reply-To: <20121106161742.GJ9966@phenom.dumpdata.com> References: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> <20121106161742.GJ9966@phenom.dumpdata.com> Date: Wed, 7 Nov 2012 16:03:15 +0800 Message-ID: From: =?UTF-8?B?6YKx5qih54Kv?= To: Konrad Rzeszutek Wilk X-Mailman-Approved-At: Wed, 07 Nov 2012 09:44:08 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Mojiong Qiu , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: Re: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thanks Konrad. You are right, commit 98ad1cc14 missed the xen case. And before merging, please modify the title a bit. one redundant "xen/events" there. "xen/events: xen/events: fix RCU warning" -> "xen/events: fix RCU warning" >> Cc: stable@kernel.org (at least to 3.0.y) > ^^^- vger.kernel.org > > You mean 3.3.x This is my mistake. 3.0.y is OK. please ignore it. On Wed, Nov 7, 2012 at 12:17 AM, Konrad Rzeszutek Wilk wrote: > On Tue, Nov 06, 2012 at 04:08:15PM +0800, Mojiong Qiu wrote: >> exit_idle() should be called after irq_enter(), otherwise it throws: > > That seems odd - wouldn't "smp_x86_platform_ipi" > also need the same treatment [edit: I was looking at 3.0 kernel code] ? > > Ah, this is caused by > > commit 98ad1cc14a5c4fd658f9d72c6ba5c86dfd3ce0d5 > Author: Frederic Weisbecker > Date: Fri Oct 7 18:22:09 2011 +0200 > > x86: Call idle notifier after irq_enter() > > > and it missed the xen-case > > which means that any kernel v3.3 and newer need this, but earlier do > not. > > Thx. Will put in 3.7 tree. > >> >> [ 2.513020] [ INFO: suspicious RCU usage. ] >> [ 2.513076] 3.6.5 #1 Not tainted >> [ 2.513128] ------------------------------- >> [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! >> [ 2.513271] >> [ 2.513271] other info that might help us debug this: >> [ 2.513271] >> [ 2.513388] >> [ 2.513388] RCU used illegally from idle CPU! >> [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 >> [ 2.513511] RCU used illegally from extended quiescent state! >> [ 2.513572] 1 lock held by swapper/0/0: >> [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 >> [ 2.513815] >> [ 2.513815] stack backtrace: >> [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 >> [ 2.513954] Call Trace: >> [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 >> [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 >> [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 >> [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 >> [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 >> [ 2.514381] [] exit_idle+0x43/0x50 >> [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 >> [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 >> [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 >> [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 >> [ 2.514722] [] ? xen_safe_halt+0x10/0x20 >> [ 2.514782] [] ? default_idle+0xba/0x570 >> [ 2.514841] [] ? cpu_idle+0xdf/0x140 >> [ 2.514900] [] ? rest_init+0x135/0x144 >> [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c >> [ 2.515022] [] ? start_kernel+0x3db/0x3e8 >> [ 2.515081] [] ? repair_env_string+0x5a/0x5a >> [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 >> [ 2.515202] [] ? xen_start_kernel+0x465/0x46 >> >> Signed-off-by: Mojiong Qiu >> Cc: Konrad Rzeszutek Wilk >> Cc: Jeremy Fitzhardinge >> Cc: xen-devel@lists.xensource.com >> Cc: virtualization@lists.linux-foundation.org >> Cc: linux-kernel@vger.kernel.org >> Cc: stable@kernel.org (at least to 3.0.y) > ^^^- vger.kernel.org > > You mean 3.3.x > >> --- >> drivers/xen/events.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/xen/events.c b/drivers/xen/events.c >> index 912ac81..0be4df3 100644 >> --- a/drivers/xen/events.c >> +++ b/drivers/xen/events.c >> @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) >> { >> struct pt_regs *old_regs = set_irq_regs(regs); >> >> + irq_enter(); >> #ifdef CONFIG_X86 >> exit_idle(); >> #endif >> - irq_enter(); >> >> __xen_evtchn_do_upcall(); >> >> -- >> 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 09:44:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 09:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2B7-0000XH-8r; Wed, 07 Nov 2012 09:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW0bW-0008Hw-NF for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 08:03:18 +0000 Received: from [85.158.138.51:36222] by server-8.bemta-3.messagelabs.com id BA/E7-07786-5C51A905; Wed, 07 Nov 2012 08:03:17 +0000 X-Env-Sender: qiumojiong@gmail.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352275395!20124933!1 X-Originating-IP: [209.85.210.171] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14484 invoked from network); 7 Nov 2012 08:03:17 -0000 Received: from mail-ia0-f171.google.com (HELO mail-ia0-f171.google.com) (209.85.210.171) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 08:03:17 -0000 Received: by mail-ia0-f171.google.com with SMTP id u21so1178952ial.30 for ; Wed, 07 Nov 2012 00:03:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=igg1Bhvdtj4dLP0f9ouXaNPdtsSQNpyl/JlMSmMqKpM=; b=YtDB0FIch70Rydtq9iD5YUccR5Iv/y/fiqBYxq0rbLE9dd73b4p549FbWfXnLv2jd3 /+WvGlpE1j54Bog3Vl9LLR0kpnbgy5YuyDcmcZAehHTlY1p+DpsSYXRFL2dwCA2/gsfq HlsgN4YsQkEyXSqKjuxbQG9Rc6/lE5wIn3koUdb3KCuQ+2gRlK1I78fcFoWbVLtENd5m KsFPyi9q6kMO1lGf+lvGNQwZO9r44NTB9QZkvnu4l9oqeVCmXt39LIeb+mnKuVLN1hRd T9qG1hKPhJzOJqSKfSuNSVYOwPQIQ7vx7AeZI8f22UYt4GUOeO2oCvcprJacMoFc60sD O1TA== MIME-Version: 1.0 Received: by 10.50.46.129 with SMTP id v1mr1238298igm.42.1352275395261; Wed, 07 Nov 2012 00:03:15 -0800 (PST) Received: by 10.231.165.202 with HTTP; Wed, 7 Nov 2012 00:03:15 -0800 (PST) In-Reply-To: <20121106161742.GJ9966@phenom.dumpdata.com> References: <1352189295-7111-1-git-send-email-qiumojiong@gmail.com> <20121106161742.GJ9966@phenom.dumpdata.com> Date: Wed, 7 Nov 2012 16:03:15 +0800 Message-ID: From: =?UTF-8?B?6YKx5qih54Kv?= To: Konrad Rzeszutek Wilk X-Mailman-Approved-At: Wed, 07 Nov 2012 09:44:08 +0000 Cc: Jeremy Fitzhardinge , xen-devel@lists.xensource.com, Mojiong Qiu , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, "at least to 3.0.y" Subject: Re: [Xen-devel] [PATCH] xen/events: xen/events: fix RCU warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thanks Konrad. You are right, commit 98ad1cc14 missed the xen case. And before merging, please modify the title a bit. one redundant "xen/events" there. "xen/events: xen/events: fix RCU warning" -> "xen/events: fix RCU warning" >> Cc: stable@kernel.org (at least to 3.0.y) > ^^^- vger.kernel.org > > You mean 3.3.x This is my mistake. 3.0.y is OK. please ignore it. On Wed, Nov 7, 2012 at 12:17 AM, Konrad Rzeszutek Wilk wrote: > On Tue, Nov 06, 2012 at 04:08:15PM +0800, Mojiong Qiu wrote: >> exit_idle() should be called after irq_enter(), otherwise it throws: > > That seems odd - wouldn't "smp_x86_platform_ipi" > also need the same treatment [edit: I was looking at 3.0 kernel code] ? > > Ah, this is caused by > > commit 98ad1cc14a5c4fd658f9d72c6ba5c86dfd3ce0d5 > Author: Frederic Weisbecker > Date: Fri Oct 7 18:22:09 2011 +0200 > > x86: Call idle notifier after irq_enter() > > > and it missed the xen-case > > which means that any kernel v3.3 and newer need this, but earlier do > not. > > Thx. Will put in 3.7 tree. > >> >> [ 2.513020] [ INFO: suspicious RCU usage. ] >> [ 2.513076] 3.6.5 #1 Not tainted >> [ 2.513128] ------------------------------- >> [ 2.513183] include/linux/rcupdate.h:725 rcu_read_lock() used illegally while idle! >> [ 2.513271] >> [ 2.513271] other info that might help us debug this: >> [ 2.513271] >> [ 2.513388] >> [ 2.513388] RCU used illegally from idle CPU! >> [ 2.513388] rcu_scheduler_active = 1, debug_locks = 1 >> [ 2.513511] RCU used illegally from extended quiescent state! >> [ 2.513572] 1 lock held by swapper/0/0: >> [ 2.513626] #0: (rcu_read_lock){......}, at: [] __atomic_notifier_call_chain+0x0/0x140 >> [ 2.513815] >> [ 2.513815] stack backtrace: >> [ 2.513897] Pid: 0, comm: swapper/0 Not tainted 3.6.5 #1 >> [ 2.513954] Call Trace: >> [ 2.514005] [] lockdep_rcu_suspicious+0xe2/0x130 >> [ 2.514107] [] __atomic_notifier_call_chain+0x12c/0x140 >> [ 2.514169] [] ? atomic_notifier_chain_unregister+0x90/0x90 >> [ 2.514258] [] ? trace_hardirqs_off+0xd/0x10 >> [ 2.514318] [] atomic_notifier_call_chain+0x16/0x20 >> [ 2.514381] [] exit_idle+0x43/0x50 >> [ 2.514441] [] xen_evtchn_do_upcall+0x25/0x50 >> [ 2.514503] [] xen_do_hypervisor_callback+0x1e/0x30 >> [ 2.514562] [] ? hypercall_page+0x3aa/0x1000 >> [ 2.514662] [] ? hypercall_page+0x3aa/0x1000 >> [ 2.514722] [] ? xen_safe_halt+0x10/0x20 >> [ 2.514782] [] ? default_idle+0xba/0x570 >> [ 2.514841] [] ? cpu_idle+0xdf/0x140 >> [ 2.514900] [] ? rest_init+0x135/0x144 >> [ 2.514960] [] ? csum_partial_copy_generic+0x16c/0x16c >> [ 2.515022] [] ? start_kernel+0x3db/0x3e8 >> [ 2.515081] [] ? repair_env_string+0x5a/0x5a >> [ 2.515141] [] ? x86_64_start_reservations+0x131/0x135 >> [ 2.515202] [] ? xen_start_kernel+0x465/0x46 >> >> Signed-off-by: Mojiong Qiu >> Cc: Konrad Rzeszutek Wilk >> Cc: Jeremy Fitzhardinge >> Cc: xen-devel@lists.xensource.com >> Cc: virtualization@lists.linux-foundation.org >> Cc: linux-kernel@vger.kernel.org >> Cc: stable@kernel.org (at least to 3.0.y) > ^^^- vger.kernel.org > > You mean 3.3.x > >> --- >> drivers/xen/events.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/xen/events.c b/drivers/xen/events.c >> index 912ac81..0be4df3 100644 >> --- a/drivers/xen/events.c >> +++ b/drivers/xen/events.c >> @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) >> { >> struct pt_regs *old_regs = set_irq_regs(regs); >> >> + irq_enter(); >> #ifdef CONFIG_X86 >> exit_idle(); >> #endif >> - irq_enter(); >> >> __xen_evtchn_do_upcall(); >> >> -- >> 1.6.3.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 10:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2bC-0000n4-LK; Wed, 07 Nov 2012 10:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2bA-0000mz-Sj for xen-devel@lists.xen.org; Wed, 07 Nov 2012 10:11:05 +0000 Received: from [85.158.143.35:45441] by server-2.bemta-4.messagelabs.com id 6D/32-28922-8B33A905; Wed, 07 Nov 2012 10:11:04 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352283057!12606639!1 X-Originating-IP: [193.222.81.110] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMTAgPT4gMTAxODMx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32149 invoked from network); 7 Nov 2012 10:10:58 -0000 Received: from outmail110.swisscom.com (HELO mail.swisscom.com) (193.222.81.110) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 10:10:58 -0000 Received: by mail.swisscom.com; Wed, 7 Nov 2012 11:10:32 +0100 From: To: , Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQ== Date: Wed, 7 Nov 2012 10:10:32 +0000 Message-ID: Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Ian i compiled a patched hypervisor for Mauro, it is running since many days and the overflow occured, without clock jumps > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > tsc_stamp=e3839fcb0273 (below is the complete xm dmesg output) did that help you ? do you need more info ? thanks and regards Philippe > -----Original Message----- > From: Mauro [mailto:mrsanna1@gmail.com] > Sent: Wednesday, November 07, 2012 10:12 AM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > Subject: Re: [Xen-devel] [Xen-users] Re: Xen 4 TSC problems > > Hello, no news until now there aren't clock jumps. > Here is xm dmesg: > > xm dmesg > (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc > version 4.4.5 (Debian 4.4.5-8) ) Mon Oct 29 14:42:12 CET 2012 > (XEN) Bootloader: GRUB 1.98+20100804-14+squeeze1 > (XEN) Command line: placeholder dom0_mem=3072M loglvl=warning > guest_loglvl=warning > (XEN) Video information: > (XEN) VGA is text mode 80x25, font 8x16 > (XEN) VBE/DDC methods: V2; EDID transfer time: 2 seconds > (XEN) Disc information: > (XEN) Found 2 MBR signatures > (XEN) Found 2 EDD information structures > (XEN) Xen-e820 RAM map: > (XEN) 0000000000000000 - 000000000009f400 (usable) > (XEN) 000000000009f400 - 00000000000a0000 (reserved) > (XEN) 00000000000f0000 - 0000000000100000 (reserved) > (XEN) 0000000000100000 - 00000000cfd43000 (usable) > (XEN) 00000000cfd43000 - 00000000cfd4c000 (ACPI data) > (XEN) 00000000cfd4c000 - 00000000cfd4d000 (usable) > (XEN) 00000000cfd4d000 - 00000000d0000000 (reserved) > (XEN) 00000000e0000000 - 00000000f0000000 (reserved) > (XEN) 00000000fec00000 - 00000000fed00000 (reserved) > (XEN) 00000000fee00000 - 00000000fee10000 (reserved) > (XEN) 00000000ffc00000 - 0000000100000000 (reserved) > (XEN) 0000000100000000 - 000000102ffff000 (usable) > (XEN) ACPI: RSDP 000F4F20, 0024 (r2 HP ) > (XEN) ACPI: XSDT CFD43900, 007C (r1 HP ProLiant 2 162E) > (XEN) ACPI: FACP CFD439C0, 00F4 (r3 HP ProLiant 2 162E) > (XEN) ACPI: DSDT CFD43AC0, 30C9 (r1 HP DSDT 1 INTL 20030228) > (XEN) ACPI: FACS CFD43100, 0040 > (XEN) ACPI: SPCR CFD43140, 0050 (r1 HP SPCRRBSU 1 162E) > (XEN) ACPI: MCFG CFD431C0, 003C (r1 HP ProLiant 1 0) > (XEN) ACPI: HPET CFD43200, 0038 (r1 HP ProLiant 2 162E) > (XEN) ACPI: FFFF CFD43240, 0064 (r2 HP P61 2 162E) > (XEN) ACPI: SPMI CFD432C0, 0040 (r5 HP ProLiant 1 162E) > (XEN) ACPI: ERST CFD43300, 01D0 (r1 HP ProLiant 1 162E) > (XEN) ACPI: APIC CFD43500, 0176 (r1 HP ProLiant 2 0) > (XEN) ACPI: FFFF CFD43680, 0176 (r1 HP ProLiant 1 162E) > (XEN) ACPI: BERT CFD43800, 0030 (r1 HP ProLiant 1 162E) > (XEN) ACPI: HEST CFD43840, 00BC (r1 HP ProLiant 1 162E) > (XEN) System RAM: 65532MB (67105672kB) > (XEN) Domain heap initialised > (XEN) Processor #0 6:15 APIC version 20 > (XEN) Processor #8 6:15 APIC version 20 > (XEN) Processor #16 6:15 APIC version 20 > (XEN) Processor #24 6:15 APIC version 20 > (XEN) Processor #1 6:15 APIC version 20 > (XEN) Processor #9 6:15 APIC version 20 > (XEN) Processor #17 6:15 APIC version 20 > (XEN) Processor #25 6:15 APIC version 20 > (XEN) Processor #2 6:15 APIC version 20 > (XEN) Processor #10 6:15 APIC version 20 > (XEN) Processor #18 6:15 APIC version 20 > (XEN) Processor #26 6:15 APIC version 20 > (XEN) Processor #3 6:15 APIC version 20 > (XEN) Processor #11 6:15 APIC version 20 > (XEN) Processor #19 6:15 APIC version 20 > (XEN) Processor #27 6:15 APIC version 20 > (XEN) IOAPIC[0]: apic_id 1, version 32, address 0xfec00000, GSI 0-23 > (XEN) IOAPIC[1]: apic_id 2, version 32, address 0xfec80000, GSI 24-47 > (XEN) IOAPIC[2]: apic_id 3, version 32, address 0xfec81000, GSI 48-71 > (XEN) IOAPIC[3]: apic_id 4, version 32, address 0xfec81800, GSI 72-95 > (XEN) Enabling APIC mode: Phys. Using 4 I/O APICs > (XEN) Using scheduler: SMP Credit Scheduler (credit) > (XEN) Detected 2400.128 MHz processor. > (XEN) Initing memory sharing. > (XEN) VMX: Supported advanced features: > (XEN) - APIC MMIO access virtualisation > (XEN) - APIC TPR shadow > (XEN) - Virtual NMI > (XEN) - MSR direct-access bitmap > (XEN) HVM: ASIDs disabled. > (XEN) HVM: VMX enabled > (XEN) I/O virtualisation disabled > (XEN) Total of 16 processors activated. > (XEN) ENABLING IO-APIC IRQs > (XEN) -> Using new ACK method > (XEN) checking TSC synchronization across 16 CPUs: > (XEN) CPU#14 had 3 usecs TSC skew, fixed it up. > (XEN) Platform timer is 14.318MHz HPET > (XEN) Allocated console ring of 32 KiB. > (XEN) Brought up 16 CPUs > (XEN) *** LOADING DOMAIN 0 *** > (XEN) Xen kernel: 64-bit, lsb, compat32 > (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x1708000 > (XEN) PHYSICAL MEMORY ARRANGEMENT: > (XEN) Dom0 alloc.: 000000083c000000->0000000840000000 (770048 pages > to be allocated) > (XEN) VIRTUAL MEMORY ARRANGEMENT: > (XEN) Loaded kernel: ffffffff81000000->ffffffff81708000 > (XEN) Init. ramdisk: ffffffff81708000->ffffffff81efb000 > (XEN) Phys-Mach map: ffffffff81efb000->ffffffff824fb000 > (XEN) Start info: ffffffff824fb000->ffffffff824fb4b4 > (XEN) Page tables: ffffffff824fc000->ffffffff82513000 > (XEN) Boot stack: ffffffff82513000->ffffffff82514000 > (XEN) TOTAL: ffffffff80000000->ffffffff82800000 > (XEN) ENTRY ADDRESS: ffffffff81531200 > (XEN) Dom0 has maximum 16 VCPUs > (XEN) Scrubbing Free RAM: > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ................................done. > (XEN) Xen trace buffers: disabled > (XEN) Std. Loglevel: Errors and warnings > (XEN) Guest Loglevel: Errors and warnings > (XEN) Xen is relinquishing VGA console. > (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to > Xen) > (XEN) Freed 176kB init memory. > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > tsc_stamp=e3839fcb0273 > > > -----Original Message----- > From: xen-devel-bounces@lists.xen.org [mailto:xen-devel- > bounces@lists.xen.org] On Behalf Of Ian Campbell > Sent: Friday, October 26, 2012 3:00 PM > To: xen-devel@lists.xen.org > Cc: 599161@bugs.debian.org > Subject: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > minutes" bug. > > Hi all, > > I've BCC'd a number of people who have reported seeing this bug at various > times in the past. > > If you can still repro I'd appreciate it if you could give the patch in > http://marc.info/?l=xen-devel&m=135049062216685&w=2 (also attached) a > go and report back success/failure and the output of the debugging > messages produced. > > Thanks, > Ian. > > -- > Ian Campbell > Current Noise: Death - Evil Dead > > Executive ability is prominent in your make-up. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 10:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 10:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2bC-0000n4-LK; Wed, 07 Nov 2012 10:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2bA-0000mz-Sj for xen-devel@lists.xen.org; Wed, 07 Nov 2012 10:11:05 +0000 Received: from [85.158.143.35:45441] by server-2.bemta-4.messagelabs.com id 6D/32-28922-8B33A905; Wed, 07 Nov 2012 10:11:04 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352283057!12606639!1 X-Originating-IP: [193.222.81.110] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMTAgPT4gMTAxODMx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32149 invoked from network); 7 Nov 2012 10:10:58 -0000 Received: from outmail110.swisscom.com (HELO mail.swisscom.com) (193.222.81.110) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 10:10:58 -0000 Received: by mail.swisscom.com; Wed, 7 Nov 2012 11:10:32 +0100 From: To: , Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQ== Date: Wed, 7 Nov 2012 10:10:32 +0000 Message-ID: Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Ian i compiled a patched hypervisor for Mauro, it is running since many days and the overflow occured, without clock jumps > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > tsc_stamp=e3839fcb0273 (below is the complete xm dmesg output) did that help you ? do you need more info ? thanks and regards Philippe > -----Original Message----- > From: Mauro [mailto:mrsanna1@gmail.com] > Sent: Wednesday, November 07, 2012 10:12 AM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > Subject: Re: [Xen-devel] [Xen-users] Re: Xen 4 TSC problems > > Hello, no news until now there aren't clock jumps. > Here is xm dmesg: > > xm dmesg > (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc > version 4.4.5 (Debian 4.4.5-8) ) Mon Oct 29 14:42:12 CET 2012 > (XEN) Bootloader: GRUB 1.98+20100804-14+squeeze1 > (XEN) Command line: placeholder dom0_mem=3072M loglvl=warning > guest_loglvl=warning > (XEN) Video information: > (XEN) VGA is text mode 80x25, font 8x16 > (XEN) VBE/DDC methods: V2; EDID transfer time: 2 seconds > (XEN) Disc information: > (XEN) Found 2 MBR signatures > (XEN) Found 2 EDD information structures > (XEN) Xen-e820 RAM map: > (XEN) 0000000000000000 - 000000000009f400 (usable) > (XEN) 000000000009f400 - 00000000000a0000 (reserved) > (XEN) 00000000000f0000 - 0000000000100000 (reserved) > (XEN) 0000000000100000 - 00000000cfd43000 (usable) > (XEN) 00000000cfd43000 - 00000000cfd4c000 (ACPI data) > (XEN) 00000000cfd4c000 - 00000000cfd4d000 (usable) > (XEN) 00000000cfd4d000 - 00000000d0000000 (reserved) > (XEN) 00000000e0000000 - 00000000f0000000 (reserved) > (XEN) 00000000fec00000 - 00000000fed00000 (reserved) > (XEN) 00000000fee00000 - 00000000fee10000 (reserved) > (XEN) 00000000ffc00000 - 0000000100000000 (reserved) > (XEN) 0000000100000000 - 000000102ffff000 (usable) > (XEN) ACPI: RSDP 000F4F20, 0024 (r2 HP ) > (XEN) ACPI: XSDT CFD43900, 007C (r1 HP ProLiant 2 162E) > (XEN) ACPI: FACP CFD439C0, 00F4 (r3 HP ProLiant 2 162E) > (XEN) ACPI: DSDT CFD43AC0, 30C9 (r1 HP DSDT 1 INTL 20030228) > (XEN) ACPI: FACS CFD43100, 0040 > (XEN) ACPI: SPCR CFD43140, 0050 (r1 HP SPCRRBSU 1 162E) > (XEN) ACPI: MCFG CFD431C0, 003C (r1 HP ProLiant 1 0) > (XEN) ACPI: HPET CFD43200, 0038 (r1 HP ProLiant 2 162E) > (XEN) ACPI: FFFF CFD43240, 0064 (r2 HP P61 2 162E) > (XEN) ACPI: SPMI CFD432C0, 0040 (r5 HP ProLiant 1 162E) > (XEN) ACPI: ERST CFD43300, 01D0 (r1 HP ProLiant 1 162E) > (XEN) ACPI: APIC CFD43500, 0176 (r1 HP ProLiant 2 0) > (XEN) ACPI: FFFF CFD43680, 0176 (r1 HP ProLiant 1 162E) > (XEN) ACPI: BERT CFD43800, 0030 (r1 HP ProLiant 1 162E) > (XEN) ACPI: HEST CFD43840, 00BC (r1 HP ProLiant 1 162E) > (XEN) System RAM: 65532MB (67105672kB) > (XEN) Domain heap initialised > (XEN) Processor #0 6:15 APIC version 20 > (XEN) Processor #8 6:15 APIC version 20 > (XEN) Processor #16 6:15 APIC version 20 > (XEN) Processor #24 6:15 APIC version 20 > (XEN) Processor #1 6:15 APIC version 20 > (XEN) Processor #9 6:15 APIC version 20 > (XEN) Processor #17 6:15 APIC version 20 > (XEN) Processor #25 6:15 APIC version 20 > (XEN) Processor #2 6:15 APIC version 20 > (XEN) Processor #10 6:15 APIC version 20 > (XEN) Processor #18 6:15 APIC version 20 > (XEN) Processor #26 6:15 APIC version 20 > (XEN) Processor #3 6:15 APIC version 20 > (XEN) Processor #11 6:15 APIC version 20 > (XEN) Processor #19 6:15 APIC version 20 > (XEN) Processor #27 6:15 APIC version 20 > (XEN) IOAPIC[0]: apic_id 1, version 32, address 0xfec00000, GSI 0-23 > (XEN) IOAPIC[1]: apic_id 2, version 32, address 0xfec80000, GSI 24-47 > (XEN) IOAPIC[2]: apic_id 3, version 32, address 0xfec81000, GSI 48-71 > (XEN) IOAPIC[3]: apic_id 4, version 32, address 0xfec81800, GSI 72-95 > (XEN) Enabling APIC mode: Phys. Using 4 I/O APICs > (XEN) Using scheduler: SMP Credit Scheduler (credit) > (XEN) Detected 2400.128 MHz processor. > (XEN) Initing memory sharing. > (XEN) VMX: Supported advanced features: > (XEN) - APIC MMIO access virtualisation > (XEN) - APIC TPR shadow > (XEN) - Virtual NMI > (XEN) - MSR direct-access bitmap > (XEN) HVM: ASIDs disabled. > (XEN) HVM: VMX enabled > (XEN) I/O virtualisation disabled > (XEN) Total of 16 processors activated. > (XEN) ENABLING IO-APIC IRQs > (XEN) -> Using new ACK method > (XEN) checking TSC synchronization across 16 CPUs: > (XEN) CPU#14 had 3 usecs TSC skew, fixed it up. > (XEN) Platform timer is 14.318MHz HPET > (XEN) Allocated console ring of 32 KiB. > (XEN) Brought up 16 CPUs > (XEN) *** LOADING DOMAIN 0 *** > (XEN) Xen kernel: 64-bit, lsb, compat32 > (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x1708000 > (XEN) PHYSICAL MEMORY ARRANGEMENT: > (XEN) Dom0 alloc.: 000000083c000000->0000000840000000 (770048 pages > to be allocated) > (XEN) VIRTUAL MEMORY ARRANGEMENT: > (XEN) Loaded kernel: ffffffff81000000->ffffffff81708000 > (XEN) Init. ramdisk: ffffffff81708000->ffffffff81efb000 > (XEN) Phys-Mach map: ffffffff81efb000->ffffffff824fb000 > (XEN) Start info: ffffffff824fb000->ffffffff824fb4b4 > (XEN) Page tables: ffffffff824fc000->ffffffff82513000 > (XEN) Boot stack: ffffffff82513000->ffffffff82514000 > (XEN) TOTAL: ffffffff80000000->ffffffff82800000 > (XEN) ENTRY ADDRESS: ffffffff81531200 > (XEN) Dom0 has maximum 16 VCPUs > (XEN) Scrubbing Free RAM: > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ..................................................................................................................... > ................................done. > (XEN) Xen trace buffers: disabled > (XEN) Std. Loglevel: Errors and warnings > (XEN) Guest Loglevel: Errors and warnings > (XEN) Xen is relinquishing VGA console. > (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to > Xen) > (XEN) Freed 176kB init memory. > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > tsc_stamp=e3839fcb0273 > > > -----Original Message----- > From: xen-devel-bounces@lists.xen.org [mailto:xen-devel- > bounces@lists.xen.org] On Behalf Of Ian Campbell > Sent: Friday, October 26, 2012 3:00 PM > To: xen-devel@lists.xen.org > Cc: 599161@bugs.debian.org > Subject: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > minutes" bug. > > Hi all, > > I've BCC'd a number of people who have reported seeing this bug at various > times in the past. > > If you can still repro I'd appreciate it if you could give the patch in > http://marc.info/?l=xen-devel&m=135049062216685&w=2 (also attached) a > go and report back success/failure and the output of the debugging > messages produced. > > Thanks, > Ian. > > -- > Ian Campbell > Current Noise: Death - Evil Dead > > Executive ability is prominent in your make-up. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 10:27:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 10:27:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2qH-0000xV-5g; Wed, 07 Nov 2012 10:26:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2qF-0000xQ-M8 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 10:26:39 +0000 Received: from [85.158.139.83:38646] by server-10.bemta-5.messagelabs.com id 32/1F-09257-E573A905; Wed, 07 Nov 2012 10:26:38 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352283994!28604258!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14548 invoked from network); 7 Nov 2012 10:26:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 10:26:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,728,1344211200"; d="scan'208";a="213710349" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 07 Nov 2012 10:26:34 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Wed, 7 Nov 2012 05:26:33 -0500 Date: Wed, 7 Nov 2012 10:25:49 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk In-Reply-To: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> Message-ID: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk Thank you very much for going out of your way to fix this issue (I am currently at LinuxCon). > arch/arm/xen/enlighten.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..96d969d 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > *pages = NULL; > } > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > + > +/* In the hypervisor.S file. */ > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > +EXPORT_SYMBOL_GPL(privcmd_call); I think the patch is OK and I tested it: it fixes the issue reported by Russell. However I am wondering, does it actually make sense only to export 3 hypercalls among the set implemented in hypercall.S? Maybe it does make sense only to export a subset, but I wouldn't necessarly do the differentiation here, I would just export all the hypercalls implemented in hypercalls.S. In fact if we separate the hypercalls in two sets, I would like to see a similar differentiation on x86 too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 10:27:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 10:27:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2qH-0000xV-5g; Wed, 07 Nov 2012 10:26:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW2qF-0000xQ-M8 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 10:26:39 +0000 Received: from [85.158.139.83:38646] by server-10.bemta-5.messagelabs.com id 32/1F-09257-E573A905; Wed, 07 Nov 2012 10:26:38 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352283994!28604258!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14548 invoked from network); 7 Nov 2012 10:26:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 10:26:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,728,1344211200"; d="scan'208";a="213710349" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 07 Nov 2012 10:26:34 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Wed, 7 Nov 2012 05:26:33 -0500 Date: Wed, 7 Nov 2012 10:25:49 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Konrad Rzeszutek Wilk In-Reply-To: <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> Message-ID: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk Thank you very much for going out of your way to fix this issue (I am currently at LinuxCon). > arch/arm/xen/enlighten.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..96d969d 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > *pages = NULL; > } > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > + > +/* In the hypervisor.S file. */ > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > +EXPORT_SYMBOL_GPL(privcmd_call); I think the patch is OK and I tested it: it fixes the issue reported by Russell. However I am wondering, does it actually make sense only to export 3 hypercalls among the set implemented in hypercall.S? Maybe it does make sense only to export a subset, but I wouldn't necessarly do the differentiation here, I would just export all the hypercalls implemented in hypercalls.S. In fact if we separate the hypercalls in two sets, I would like to see a similar differentiation on x86 too. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 11:00:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 11:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW3MI-0001F6-6v; Wed, 07 Nov 2012 10:59:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW3MG-0001F1-Al for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 10:59:44 +0000 Received: from [85.158.139.83:18638] by server-12.bemta-5.messagelabs.com id CE/E5-02886-F1F3A905; Wed, 07 Nov 2012 10:59:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352285981!26450280!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28750 invoked from network); 7 Nov 2012 10:59:42 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 10:59:42 -0000 X-IronPort-AV: E=Sophos;i="4.80,728,1344211200"; d="scan'208";a="213712671" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 10:59:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 05:59:41 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW3MB-0007iJ-To; Wed, 07 Nov 2012 10:59:40 +0000 Message-ID: <1352285859.12977.45.camel@hastur.hellion.org.uk> From: Ian Campbell To: Stefano Stabellini Date: Wed, 7 Nov 2012 11:57:39 +0100 In-Reply-To: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 10:25 +0000, Stefano Stabellini wrote: > On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > > We end up with: > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > Signed-off-by: Konrad Rzeszutek Wilk > > Thank you very much for going out of your way to fix this issue (I am > currently at LinuxCon). > > > > arch/arm/xen/enlighten.c | 5 +++++ > > 1 files changed, 5 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > > index 59bcb96..96d969d 100644 > > --- a/arch/arm/xen/enlighten.c > > +++ b/arch/arm/xen/enlighten.c > > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > > *pages = NULL; > > } > > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > > + > > +/* In the hypervisor.S file. */ > > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > > +EXPORT_SYMBOL_GPL(privcmd_call); > > I think the patch is OK and I tested it: it fixes the issue reported > by Russell. > However I am wondering, does it actually make sense only to export 3 > hypercalls among the set implemented in hypercall.S? > Maybe it does make sense only to export a subset, but I wouldn't > necessarly do the differentiation here, I would just export all the > hypercalls implemented in hypercalls.S. > In fact if we separate the hypercalls in two sets, I would like to > see a similar differentiation on x86 too. On x86 these functions are static inline (all of them, I think) so exporting them is not necessary or possible. I don't think you can export from a .S, otherwise the obvious answer would be to integrate it with the macro in hypercall.S. Possibly mad idea: auto-generate hypercall.[Sc] (.S=stubs & .c=exports) from include/xen/interface/xen.h:HYPERVISOR_* ? (Aside: the whitespace in hypercall.S is a bit fubarred, wrt the line wrapping in the macros) Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 11:00:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 11:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW3MI-0001F6-6v; Wed, 07 Nov 2012 10:59:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW3MG-0001F1-Al for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 10:59:44 +0000 Received: from [85.158.139.83:18638] by server-12.bemta-5.messagelabs.com id CE/E5-02886-F1F3A905; Wed, 07 Nov 2012 10:59:43 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352285981!26450280!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28750 invoked from network); 7 Nov 2012 10:59:42 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 10:59:42 -0000 X-IronPort-AV: E=Sophos;i="4.80,728,1344211200"; d="scan'208";a="213712671" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 10:59:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 05:59:41 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW3MB-0007iJ-To; Wed, 07 Nov 2012 10:59:40 +0000 Message-ID: <1352285859.12977.45.camel@hastur.hellion.org.uk> From: Ian Campbell To: Stefano Stabellini Date: Wed, 7 Nov 2012 11:57:39 +0100 In-Reply-To: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 10:25 +0000, Stefano Stabellini wrote: > On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > > We end up with: > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > Signed-off-by: Konrad Rzeszutek Wilk > > Thank you very much for going out of your way to fix this issue (I am > currently at LinuxCon). > > > > arch/arm/xen/enlighten.c | 5 +++++ > > 1 files changed, 5 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > > index 59bcb96..96d969d 100644 > > --- a/arch/arm/xen/enlighten.c > > +++ b/arch/arm/xen/enlighten.c > > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > > *pages = NULL; > > } > > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > > + > > +/* In the hypervisor.S file. */ > > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > > +EXPORT_SYMBOL_GPL(privcmd_call); > > I think the patch is OK and I tested it: it fixes the issue reported > by Russell. > However I am wondering, does it actually make sense only to export 3 > hypercalls among the set implemented in hypercall.S? > Maybe it does make sense only to export a subset, but I wouldn't > necessarly do the differentiation here, I would just export all the > hypercalls implemented in hypercalls.S. > In fact if we separate the hypercalls in two sets, I would like to > see a similar differentiation on x86 too. On x86 these functions are static inline (all of them, I think) so exporting them is not necessary or possible. I don't think you can export from a .S, otherwise the obvious answer would be to integrate it with the macro in hypercall.S. Possibly mad idea: auto-generate hypercall.[Sc] (.S=stubs & .c=exports) from include/xen/interface/xen.h:HYPERVISOR_* ? (Aside: the whitespace in hypercall.S is a bit fubarred, wrt the line wrapping in the macros) Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 12:59:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 12:59:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5DA-0001zy-N9; Wed, 07 Nov 2012 12:58:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5D8-0001zt-CM for xen-devel@lists.xen.org; Wed, 07 Nov 2012 12:58:26 +0000 Received: from [85.158.138.51:47811] by server-4.bemta-3.messagelabs.com id A2/24-30023-1FA5A905; Wed, 07 Nov 2012 12:58:25 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352293102!21131538!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3Mjk4Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22481 invoked from network); 7 Nov 2012 12:58:23 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-12.tower-174.messagelabs.com with SMTP; 7 Nov 2012 12:58:23 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 07 Nov 2012 04:58:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208,223";a="243622347" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2012 04:58:21 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 04:58:21 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 20:58:20 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvD3JTi91BiFLfUibRvXA4zlK85feVKOg Date: Wed, 7 Nov 2012 12:58:19 +0000 Message-ID: References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> In-Reply-To: <20121106164303.GO9966@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable >>>=20 >>> If it is generic ACPI code, than it can depend only on ACPI. >>> If it is ACPI code that contains X86 specific info, than it needs to >>> depend on X86 too. >>=20 >> No x86 specific so let's depend on ACPI. >=20 > Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > spec, but only x86 does it right? OK, updated w/ ACPI & X86 dependency, and per other comments. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From d5f462cc8029863955a574f1541bece72aafb986 Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 8 Nov 2012 04:29:07 +0800 Subject: [PATCH 1/2] Xen acpi pad implement PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and thin logic level, would take over acpi pad logic. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object to get the expected idle cpu number, and then hypercall to hypervisor. Xen hypervisor would then do the rest work, say, core parking, to idle specific number of cpus on its own policy. Signed-off-by: Jan Beulich Signed-off-by: Liu Jinsong --- drivers/xen/Makefile | 3 +- drivers/xen/xen-acpi-pad.c | 186 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 ++++ include/xen/interface/version.h | 15 +++ 4 files changed, 220 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xen-acpi-pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..3c39717 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -10,7 +10,8 @@ CFLAGS_features.o :=3D $(nostackp) =20 dom0-$(CONFIG_PCI) +=3D pci.o dom0-$(CONFIG_USB_SUPPORT) +=3D dbgp.o -dom0-$(CONFIG_ACPI) +=3D acpi.o +dom0-$(CONFIG_ACPI) +=3D acpi.o $(xen-pad-y) +xen-pad-$(CONFIG_X86) +=3D xen-acpi-pad.o dom0-$(CONFIG_X86) +=3D pcpu.o obj-$(CONFIG_XEN_DOM0) +=3D $(dom0-y) obj-$(CONFIG_BLOCK) +=3D biomerge.o diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c new file mode 100644 index 0000000..f02d3ff --- /dev/null +++ b/drivers/xen/xen-acpi-pad.c @@ -0,0 +1,186 @@ +/* + * xen-acpi-pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 + +static DEFINE_MUTEX(xen_cpu_lock); + +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D idle_nums; + + return HYPERVISOR_dom0_op(&op); +} + +static int xen_acpi_pad_idle_cpus_num(void) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + + return HYPERVISOR_dom0_op(&op) + ?: op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_nums) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_nums; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void acpi_pad_handle_notify(acpi_handle handle) +{ + int idle_nums; + + mutex_lock(&xen_cpu_lock); + idle_nums =3D acpi_pad_pur(handle); + if (idle_nums < 0) { + mutex_unlock(&xen_cpu_lock); + return; + } + + idle_nums =3D xen_acpi_pad_idle_cpus(idle_nums) + ?: xen_acpi_pad_idle_cpus_num(); + if (idle_nums >=3D 0) + acpi_pad_ost(handle, 0, idle_nums); + mutex_unlock(&xen_cpu_lock); +} + +static void acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_cpu_lock); + xen_acpi_pad_idle_cpus(0); + mutex_unlock(&xen_cpu_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D acpi_pad_add, + .remove =3D acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + /* Only DOM0 and Xen4.2 or later support Xen acpi pad */ + if (!xen_initial_domain() || + !xen_running_on_version_or_later(4, 2)) + return -ENODEV; + + return acpi_bus_register_driver(&acpi_pad_driver); +} +subsys_initcall(xen_acpi_pad_init); + diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..5e36932 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; diff --git a/include/xen/interface/version.h b/include/xen/interface/versio= n.h index 7ff6498..96d8d3d 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -63,4 +63,19 @@ struct xen_feature_info { /* arg =3D=3D xen_domain_handle_t. */ #define XENVER_guest_handle 8 =20 +/* Check if running on Xen version (major, minor) or later */ +static inline bool +xen_running_on_version_or_later(unsigned int major, unsigned int minor) +{ + unsigned int version; + + if (!xen_domain()) + return false; + + version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + if ((((version >> 16) =3D=3D major) && ((version & 0xffff) >=3D minor)) |= | + ((version >> 16) > major)) + return true; + return false; +} #endif /* __XEN_PUBLIC_VERSION_H__ */ --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-pad-implement.patch" Content-Description: 0001-Xen-acpi-pad-implement.patch Content-Disposition: attachment; filename="0001-Xen-acpi-pad-implement.patch"; size=8743; creation-date="Wed, 07 Nov 2012 12:49:11 GMT"; modification-date="Wed, 07 Nov 2012 20:32:34 GMT" Content-Transfer-Encoding: base64 RnJvbSBkNWY0NjJjYzgwMjk4NjM5NTVhNTc0ZjE1NDFiZWNlNzJhYWZiOTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA0OjI5OjA3ICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbiBhY3BpIHBhZCBpbXBsZW1lbnQKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdhdG9y IERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRoZSBw bGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFuZCBj b250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0uCgpU aGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVubmlu ZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90IHdv cmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHRoaW4gbG9n aWMgbGV2ZWwsIHdvdWxkIHRha2Ugb3ZlciBhY3BpIHBhZCBsb2dpYy4KCldoZW4gYWNwaSBwYWQg bm90aWZ5IE9TUE0sIHhlbiBwYWQgbG9naWMgaW50ZXJjZXB0IGFuZCBwYXJzZSBfUFVSIG9iamVj dAp0byBnZXQgdGhlIGV4cGVjdGVkIGlkbGUgY3B1IG51bWJlciwgYW5kIHRoZW4gaHlwZXJjYWxs IHRvIGh5cGVydmlzb3IuClhlbiBoeXBlcnZpc29yIHdvdWxkIHRoZW4gZG8gdGhlIHJlc3Qgd29y aywgc2F5LCBjb3JlIHBhcmtpbmcsIHRvIGlkbGUKc3BlY2lmaWMgbnVtYmVyIG9mIGNwdXMgb24g aXRzIG93biBwb2xpY3kuCgpTaWduZWQtb2ZmLWJ5OiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3Vz ZS5jb20+ClNpZ25lZC1vZmYtYnk6IExpdSBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy94ZW4vTWFrZWZpbGUgICAgICAgICAgICAgfCAgICAzICstCiBkcml2ZXJz L3hlbi94ZW4tYWNwaS1wYWQuYyAgICAgICB8ICAxODYgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIGluY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIHwgICAxNyAr KysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oICB8ICAgMTUgKysrCiA0IGZpbGVz IGNoYW5nZWQsIDIyMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IGRyaXZlcnMveGVuL3hlbi1hY3BpLXBhZC5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy94 ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQppbmRleCAwZTg2MzcwLi4zYzM5NzE3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmlsZQorKysgYi9kcml2ZXJzL3hlbi9NYWtl ZmlsZQpAQCAtMTAsNyArMTAsOCBAQCBDRkxBR1NfZmVhdHVyZXMubwkJCTo9ICQobm9zdGFja3Ap CiAKIGRvbTAtJChDT05GSUdfUENJKSArPSBwY2kubwogZG9tMC0kKENPTkZJR19VU0JfU1VQUE9S VCkgKz0gZGJncC5vCi1kb20wLSQoQ09ORklHX0FDUEkpICs9IGFjcGkubworZG9tMC0kKENPTkZJ R19BQ1BJKSArPSBhY3BpLm8gJCh4ZW4tcGFkLXkpCit4ZW4tcGFkLSQoQ09ORklHX1g4NikgKz0g eGVuLWFjcGktcGFkLm8KIGRvbTAtJChDT05GSUdfWDg2KSArPSBwY3B1Lm8KIG9iai0kKENPTkZJ R19YRU5fRE9NMCkJCQkrPSAkKGRvbTAteSkKIG9iai0kKENPTkZJR19CTE9DSykJCQkrPSBiaW9t ZXJnZS5vCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyBiL2RyaXZlcnMv eGVuL3hlbi1hY3BpLXBhZC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYw MmQzZmYKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYwpAQCAt MCwwICsxLDE4NiBAQAorLyoKKyAqIHhlbi1hY3BpLXBhZC5jIC0gWGVuIHBhZCBpbnRlcmZhY2UK KyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTIsIEludGVsIENvcnBvcmF0aW9uLgorICogICAgQXV0 aG9yOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KKyAqCisgKiBUaGlzIHBy b2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1v ZGlmeSBpdAorICogdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBHTlUgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSwKKyAqIHZlcnNpb24gMiwgYXMgcHVibGlzaGVkIGJ5IHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1 dGVkIGluIHRoZSBob3BlIGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAorICogQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRBQklM SVRZIG9yCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05V IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yCisgKiBtb3JlIGRldGFpbHMuCisgKgorICogWW91 IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExp Y2Vuc2UgYWxvbmcgd2l0aAorICogdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdyaXRlIHRvIHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sCisgKiA1MSBGcmFua2xpbiBTdCAtIEZpZnRo IEZsb29yLCBCb3N0b24sIE1BIDAyMTEwLTEzMDEgVVNBLgorICoKKyAqLworCisjaW5jbHVkZSA8 bGludXgva2VybmVsLmg+CisjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KKyNpbmNsdWRlIDxhY3Bp L2FjcGlfYnVzLmg+CisjaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4KKyNpbmNsdWRlIDxh c20veGVuL2h5cGVyY2FsbC5oPgorI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UvdmVyc2lvbi5oPgor CisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfQ0xBU1MJImFjcGlfcGFkIgorI2Rl ZmluZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0RFVklDRV9OQU1FICJQcm9jZXNzb3IgQWdn cmVnYXRvciIKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlkgMHg4MAor CitzdGF0aWMgREVGSU5FX01VVEVYKHhlbl9jcHVfbG9jayk7CisKK3N0YXRpYyBpbnQgeGVuX2Fj cGlfcGFkX2lkbGVfY3B1cyh1bnNpZ25lZCBpbnQgaWRsZV9udW1zKQoreworCXN0cnVjdCB4ZW5f cGxhdGZvcm1fb3Agb3A7CisKKwlvcC5jbWQgPSBYRU5QRl9jb3JlX3Bhcmtpbmc7CisJb3AudS5j b3JlX3BhcmtpbmcudHlwZSA9IFhFTl9DT1JFX1BBUktJTkdfU0VUOworCW9wLnUuY29yZV9wYXJr aW5nLmlkbGVfbnVtcyA9IGlkbGVfbnVtczsKKworCXJldHVybiBIWVBFUlZJU09SX2RvbTBfb3Ao Jm9wKTsKK30KKworc3RhdGljIGludCB4ZW5fYWNwaV9wYWRfaWRsZV9jcHVzX251bSh2b2lkKQor eworCXN0cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3A7CisKKwlvcC5jbWQgPSBYRU5QRl9jb3JlX3Bh cmtpbmc7CisJb3AudS5jb3JlX3BhcmtpbmcudHlwZSA9IFhFTl9DT1JFX1BBUktJTkdfR0VUOwor CisJcmV0dXJuIEhZUEVSVklTT1JfZG9tMF9vcCgmb3ApCisJICAgICAgID86IG9wLnUuY29yZV9w YXJraW5nLmlkbGVfbnVtczsKK30KKworLyoKKyAqIFF1ZXJ5IGZpcm13YXJlIGhvdyBtYW55IENQ VXMgc2hvdWxkIGJlIGlkbGUKKyAqIHJldHVybiAtMSBvbiBmYWlsdXJlCisgKi8KK3N0YXRpYyBp bnQgYWNwaV9wYWRfcHVyKGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlzdHJ1Y3QgYWNwaV9idWZm ZXIgYnVmZmVyID0ge0FDUElfQUxMT0NBVEVfQlVGRkVSLCBOVUxMfTsKKwl1bmlvbiBhY3BpX29i amVjdCAqcGFja2FnZTsKKwlpbnQgbnVtID0gLTE7CisKKwlpZiAoQUNQSV9GQUlMVVJFKGFjcGlf ZXZhbHVhdGVfb2JqZWN0KGhhbmRsZSwgIl9QVVIiLCBOVUxMLCAmYnVmZmVyKSkpCisJCXJldHVy biBudW07CisKKwlpZiAoIWJ1ZmZlci5sZW5ndGggfHwgIWJ1ZmZlci5wb2ludGVyKQorCQlyZXR1 cm4gbnVtOworCisJcGFja2FnZSA9IGJ1ZmZlci5wb2ludGVyOworCisJaWYgKHBhY2thZ2UtPnR5 cGUgPT0gQUNQSV9UWVBFX1BBQ0tBR0UgJiYKKwkJcGFja2FnZS0+cGFja2FnZS5jb3VudCA9PSAy ICYmCisJCXBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMF0uaW50ZWdlci52YWx1ZSA9PSAxKSAv KiByZXYgMSAqLworCisJCW51bSA9IHBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMV0uaW50ZWdl ci52YWx1ZTsKKworCWtmcmVlKGJ1ZmZlci5wb2ludGVyKTsKKwlyZXR1cm4gbnVtOworfQorCisv KiBOb3RpZnkgZmlybXdhcmUgaG93IG1hbnkgQ1BVcyBhcmUgaWRsZSAqLworc3RhdGljIHZvaWQg YWNwaV9wYWRfb3N0KGFjcGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMyX3QgaWRs ZV9udW1zKQoreworCXVuaW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50eXBlID0g QUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJ ey50eXBlID0gQUNQSV9UWVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2JqZWN0X2xp c3QgYXJnX2xpc3QgPSB7MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZhbHVlID0g QUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVnZXIudmFs dWUgPSAgc3RhdDsKKwlwYXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1zWzJdLmJ1 ZmZlci5wb2ludGVyID0gKHZvaWQgKikmaWRsZV9udW1zOworCWFjcGlfZXZhbHVhdGVfb2JqZWN0 KGhhbmRsZSwgIl9PU1QiLCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9pZCBhY3Bp X3BhZF9oYW5kbGVfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlpbnQgaWRsZV9udW1z OworCisJbXV0ZXhfbG9jaygmeGVuX2NwdV9sb2NrKTsKKwlpZGxlX251bXMgPSBhY3BpX3BhZF9w dXIoaGFuZGxlKTsKKwlpZiAoaWRsZV9udW1zIDwgMCkgeworCQltdXRleF91bmxvY2soJnhlbl9j cHVfbG9jayk7CisJCXJldHVybjsKKwl9CisKKwlpZGxlX251bXMgPSB4ZW5fYWNwaV9wYWRfaWRs ZV9jcHVzKGlkbGVfbnVtcykKKwkJICAgID86IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNfbnVtKCk7 CisJaWYgKGlkbGVfbnVtcyA+PSAwKQorCQlhY3BpX3BhZF9vc3QoaGFuZGxlLCAwLCBpZGxlX251 bXMpOworCW11dGV4X3VubG9jaygmeGVuX2NwdV9sb2NrKTsKK30KKworc3RhdGljIHZvaWQgYWNw aV9wYWRfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSwgdTMyIGV2ZW50LAorCXZvaWQgKmRhdGEp Cit7CisJc3dpdGNoIChldmVudCkgeworCWNhc2UgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9O T1RJRlk6CisJCWFjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7CisJZGVm YXVsdDoKKwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVudCk7CisJ CWJyZWFrOworCX0KK30KKworc3RhdGljIGludCBhY3BpX3BhZF9hZGQoc3RydWN0IGFjcGlfZGV2 aWNlICpkZXZpY2UpCit7CisJYWNwaV9zdGF0dXMgc3RhdHVzOworCisJc3RyY3B5KGFjcGlfZGV2 aWNlX25hbWUoZGV2aWNlKSwgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0VfTkFNRSk7 CisJc3RyY3B5KGFjcGlfZGV2aWNlX2NsYXNzKGRldmljZSksIEFDUElfUFJPQ0VTU09SX0FHR1JF R0FUT1JfQ0xBU1MpOworCisJc3RhdHVzID0gYWNwaV9pbnN0YWxsX25vdGlmeV9oYW5kbGVyKGRl dmljZS0+aGFuZGxlLAorCQlBQ1BJX0RFVklDRV9OT1RJRlksIGFjcGlfcGFkX25vdGlmeSwgZGV2 aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVWOworCisJ cmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgYWNwaV9wYWRfcmVtb3ZlKHN0cnVjdCBhY3BpX2Rl dmljZSAqZGV2aWNlLAorCWludCB0eXBlKQoreworCW11dGV4X2xvY2soJnhlbl9jcHVfbG9jayk7 CisJeGVuX2FjcGlfcGFkX2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9jcHVfbG9j ayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwKKwkJQUNQ SV9ERVZJQ0VfTk9USUZZLCBhY3BpX3BhZF9ub3RpZnkpOworCXJldHVybiAwOworfQorCitzdGF0 aWMgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkIHBhZF9kZXZpY2VfaWRzW10gPSB7CisJeyJB Q1BJMDAwQyIsIDB9LAorCXsiIiwgMH0sCit9OworCitzdGF0aWMgc3RydWN0IGFjcGlfZHJpdmVy IGFjcGlfcGFkX2RyaXZlciA9IHsKKwkubmFtZSA9ICJwcm9jZXNzb3JfYWdncmVnYXRvciIsCisJ LmNsYXNzID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9DTEFTUywKKwkuaWRzID0gcGFkX2Rl dmljZV9pZHMsCisJLm9wcyA9IHsKKwkJLmFkZCA9IGFjcGlfcGFkX2FkZCwKKwkJLnJlbW92ZSA9 IGFjcGlfcGFkX3JlbW92ZSwKKwl9LAorfTsKKworc3RhdGljIGludCBfX2luaXQgeGVuX2FjcGlf cGFkX2luaXQodm9pZCkKK3sKKwkvKiBPbmx5IERPTTAgYW5kIFhlbjQuMiBvciBsYXRlciBzdXBw b3J0IFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkgfHwKKwkJIXhl bl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwgMikpCisJCXJldHVybiAtRU5PREVWOwor CisJcmV0dXJuIGFjcGlfYnVzX3JlZ2lzdGVyX2RyaXZlcigmYWNwaV9wYWRfZHJpdmVyKTsKK30K K3N1YnN5c19pbml0Y2FsbCh4ZW5fYWNwaV9wYWRfaW5pdCk7CisKZGlmZiAtLWdpdCBhL2luY2x1 ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIGIvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3BsYXRm b3JtLmgKaW5kZXggNDc1NWI1Zi4uNWUzNjkzMiAxMDA2NDQKLS0tIGEvaW5jbHVkZS94ZW4vaW50 ZXJmYWNlL3BsYXRmb3JtLmgKKysrIGIvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3BsYXRmb3JtLmgK QEAgLTMyNCw2ICszMjQsMjIgQEAgc3RydWN0IHhlbnBmX2NwdV9vbCB7CiB9OwogREVGSU5FX0dV RVNUX0hBTkRMRV9TVFJVQ1QoeGVucGZfY3B1X29sKTsKIAorLyoKKyAqIENNRCA1OCBhbmQgNTkg YXJlIHJlc2VydmVkIGZvciBjcHUgaG90YWRkIGFuZCBtZW1vcnkgaG90YWRkLAorICogd2hpY2gg YXJlIGFscmVhZHkgb2NjdXBpZWQgYXQgWGVuIGh5cGVydmlzb3Igc2lkZS4KKyAqLworI2RlZmlu ZSBYRU5QRl9jb3JlX3BhcmtpbmcgICAgIDYwCitzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nIHsK KwkvKiBJTiB2YXJpYWJsZXMgKi8KKyNkZWZpbmUgWEVOX0NPUkVfUEFSS0lOR19TRVQgICAxCisj ZGVmaW5lIFhFTl9DT1JFX1BBUktJTkdfR0VUICAgMgorCXVpbnQzMl90IHR5cGU7CisJLyogSU4g dmFyaWFibGVzOiAgc2V0IGNwdSBudW1zIGV4cGVjdGVkIHRvIGJlIGlkbGVkICovCisJLyogT1VU IHZhcmlhYmxlczogZ2V0IGNwdSBudW1zIGFjdHVhbGx5IGJlIGlkbGVkICovCisJdWludDMyX3Qg aWRsZV9udW1zOworfTsKK0RFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBmX2NvcmVfcGFy a2luZyk7CisKIHN0cnVjdCB4ZW5fcGxhdGZvcm1fb3AgewogCXVpbnQzMl90IGNtZDsKIAl1aW50 MzJfdCBpbnRlcmZhY2VfdmVyc2lvbjsgLyogWEVOUEZfSU5URVJGQUNFX1ZFUlNJT04gKi8KQEAg LTM0MSw2ICszNTcsNyBAQCBzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIHsKIAkJc3RydWN0IHhlbnBm X3NldF9wcm9jZXNzb3JfcG1pbmZvIHNldF9wbWluZm87CiAJCXN0cnVjdCB4ZW5wZl9wY3B1aW5m byAgICAgICAgICBwY3B1X2luZm87CiAJCXN0cnVjdCB4ZW5wZl9jcHVfb2wgICAgICAgICAgICBj cHVfb2w7CisJCXN0cnVjdCB4ZW5wZl9jb3JlX3BhcmtpbmcgICAgICBjb3JlX3Bhcmtpbmc7CiAJ CXVpbnQ4X3QgICAgICAgICAgICAgICAgICAgICAgICBwYWRbMTI4XTsKIAl9IHU7CiB9OwpkaWZm IC0tZ2l0IGEvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3ZlcnNpb24uaCBiL2luY2x1ZGUveGVuL2lu dGVyZmFjZS92ZXJzaW9uLmgKaW5kZXggN2ZmNjQ5OC4uOTZkOGQzZCAxMDA2NDQKLS0tIGEvaW5j bHVkZS94ZW4vaW50ZXJmYWNlL3ZlcnNpb24uaAorKysgYi9pbmNsdWRlL3hlbi9pbnRlcmZhY2Uv dmVyc2lvbi5oCkBAIC02Myw0ICs2MywxOSBAQCBzdHJ1Y3QgeGVuX2ZlYXR1cmVfaW5mbyB7CiAv KiBhcmcgPT0geGVuX2RvbWFpbl9oYW5kbGVfdC4gKi8KICNkZWZpbmUgWEVOVkVSX2d1ZXN0X2hh bmRsZSA4CiAKKy8qIENoZWNrIGlmIHJ1bm5pbmcgb24gWGVuIHZlcnNpb24gKG1ham9yLCBtaW5v cikgb3IgbGF0ZXIgKi8KK3N0YXRpYyBpbmxpbmUgYm9vbAoreGVuX3J1bm5pbmdfb25fdmVyc2lv bl9vcl9sYXRlcih1bnNpZ25lZCBpbnQgbWFqb3IsIHVuc2lnbmVkIGludCBtaW5vcikKK3sKKwl1 bnNpZ25lZCBpbnQgdmVyc2lvbjsKKworCWlmICgheGVuX2RvbWFpbigpKQorCQlyZXR1cm4gZmFs c2U7CisKKwl2ZXJzaW9uID0gSFlQRVJWSVNPUl94ZW5fdmVyc2lvbihYRU5WRVJfdmVyc2lvbiwg TlVMTCk7CisJaWYgKCgoKHZlcnNpb24gPj4gMTYpID09IG1ham9yKSAmJiAoKHZlcnNpb24gJiAw eGZmZmYpID49IG1pbm9yKSkgfHwKKwkJKCh2ZXJzaW9uID4+IDE2KSA+IG1ham9yKSkKKwkJcmV0 dXJuIHRydWU7CisJcmV0dXJuIGZhbHNlOworfQogI2VuZGlmIC8qIF9fWEVOX1BVQkxJQ19WRVJT SU9OX0hfXyAqLwotLSAKMS43LjEKCg== --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 12:59:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 12:59:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5DA-0001zy-N9; Wed, 07 Nov 2012 12:58:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5D8-0001zt-CM for xen-devel@lists.xen.org; Wed, 07 Nov 2012 12:58:26 +0000 Received: from [85.158.138.51:47811] by server-4.bemta-3.messagelabs.com id A2/24-30023-1FA5A905; Wed, 07 Nov 2012 12:58:25 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352293102!21131538!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3Mjk4Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22481 invoked from network); 7 Nov 2012 12:58:23 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-12.tower-174.messagelabs.com with SMTP; 7 Nov 2012 12:58:23 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 07 Nov 2012 04:58:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208,223";a="243622347" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by fmsmga001.fm.intel.com with ESMTP; 07 Nov 2012 04:58:21 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 04:58:21 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 20:58:20 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvD3JTi91BiFLfUibRvXA4zlK85feVKOg Date: Wed, 7 Nov 2012 12:58:19 +0000 Message-ID: References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> In-Reply-To: <20121106164303.GO9966@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable >>>=20 >>> If it is generic ACPI code, than it can depend only on ACPI. >>> If it is ACPI code that contains X86 specific info, than it needs to >>> depend on X86 too. >>=20 >> No x86 specific so let's depend on ACPI. >=20 > Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > spec, but only x86 does it right? OK, updated w/ ACPI & X86 dependency, and per other comments. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From d5f462cc8029863955a574f1541bece72aafb986 Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 8 Nov 2012 04:29:07 +0800 Subject: [PATCH 1/2] Xen acpi pad implement PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and thin logic level, would take over acpi pad logic. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object to get the expected idle cpu number, and then hypercall to hypervisor. Xen hypervisor would then do the rest work, say, core parking, to idle specific number of cpus on its own policy. Signed-off-by: Jan Beulich Signed-off-by: Liu Jinsong --- drivers/xen/Makefile | 3 +- drivers/xen/xen-acpi-pad.c | 186 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 ++++ include/xen/interface/version.h | 15 +++ 4 files changed, 220 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xen-acpi-pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..3c39717 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -10,7 +10,8 @@ CFLAGS_features.o :=3D $(nostackp) =20 dom0-$(CONFIG_PCI) +=3D pci.o dom0-$(CONFIG_USB_SUPPORT) +=3D dbgp.o -dom0-$(CONFIG_ACPI) +=3D acpi.o +dom0-$(CONFIG_ACPI) +=3D acpi.o $(xen-pad-y) +xen-pad-$(CONFIG_X86) +=3D xen-acpi-pad.o dom0-$(CONFIG_X86) +=3D pcpu.o obj-$(CONFIG_XEN_DOM0) +=3D $(dom0-y) obj-$(CONFIG_BLOCK) +=3D biomerge.o diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c new file mode 100644 index 0000000..f02d3ff --- /dev/null +++ b/drivers/xen/xen-acpi-pad.c @@ -0,0 +1,186 @@ +/* + * xen-acpi-pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 + +static DEFINE_MUTEX(xen_cpu_lock); + +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D idle_nums; + + return HYPERVISOR_dom0_op(&op); +} + +static int xen_acpi_pad_idle_cpus_num(void) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + + return HYPERVISOR_dom0_op(&op) + ?: op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_nums) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_nums; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void acpi_pad_handle_notify(acpi_handle handle) +{ + int idle_nums; + + mutex_lock(&xen_cpu_lock); + idle_nums =3D acpi_pad_pur(handle); + if (idle_nums < 0) { + mutex_unlock(&xen_cpu_lock); + return; + } + + idle_nums =3D xen_acpi_pad_idle_cpus(idle_nums) + ?: xen_acpi_pad_idle_cpus_num(); + if (idle_nums >=3D 0) + acpi_pad_ost(handle, 0, idle_nums); + mutex_unlock(&xen_cpu_lock); +} + +static void acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_cpu_lock); + xen_acpi_pad_idle_cpus(0); + mutex_unlock(&xen_cpu_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D acpi_pad_add, + .remove =3D acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + /* Only DOM0 and Xen4.2 or later support Xen acpi pad */ + if (!xen_initial_domain() || + !xen_running_on_version_or_later(4, 2)) + return -ENODEV; + + return acpi_bus_register_driver(&acpi_pad_driver); +} +subsys_initcall(xen_acpi_pad_init); + diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..5e36932 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; diff --git a/include/xen/interface/version.h b/include/xen/interface/versio= n.h index 7ff6498..96d8d3d 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -63,4 +63,19 @@ struct xen_feature_info { /* arg =3D=3D xen_domain_handle_t. */ #define XENVER_guest_handle 8 =20 +/* Check if running on Xen version (major, minor) or later */ +static inline bool +xen_running_on_version_or_later(unsigned int major, unsigned int minor) +{ + unsigned int version; + + if (!xen_domain()) + return false; + + version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + if ((((version >> 16) =3D=3D major) && ((version & 0xffff) >=3D minor)) |= | + ((version >> 16) > major)) + return true; + return false; +} #endif /* __XEN_PUBLIC_VERSION_H__ */ --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-pad-implement.patch" Content-Description: 0001-Xen-acpi-pad-implement.patch Content-Disposition: attachment; filename="0001-Xen-acpi-pad-implement.patch"; size=8743; creation-date="Wed, 07 Nov 2012 12:49:11 GMT"; modification-date="Wed, 07 Nov 2012 20:32:34 GMT" Content-Transfer-Encoding: base64 RnJvbSBkNWY0NjJjYzgwMjk4NjM5NTVhNTc0ZjE1NDFiZWNlNzJhYWZiOTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA0OjI5OjA3ICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbiBhY3BpIHBhZCBpbXBsZW1lbnQKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdhdG9y IERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRoZSBw bGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFuZCBj b250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0uCgpU aGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVubmlu ZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90IHdv cmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHRoaW4gbG9n aWMgbGV2ZWwsIHdvdWxkIHRha2Ugb3ZlciBhY3BpIHBhZCBsb2dpYy4KCldoZW4gYWNwaSBwYWQg bm90aWZ5IE9TUE0sIHhlbiBwYWQgbG9naWMgaW50ZXJjZXB0IGFuZCBwYXJzZSBfUFVSIG9iamVj dAp0byBnZXQgdGhlIGV4cGVjdGVkIGlkbGUgY3B1IG51bWJlciwgYW5kIHRoZW4gaHlwZXJjYWxs IHRvIGh5cGVydmlzb3IuClhlbiBoeXBlcnZpc29yIHdvdWxkIHRoZW4gZG8gdGhlIHJlc3Qgd29y aywgc2F5LCBjb3JlIHBhcmtpbmcsIHRvIGlkbGUKc3BlY2lmaWMgbnVtYmVyIG9mIGNwdXMgb24g aXRzIG93biBwb2xpY3kuCgpTaWduZWQtb2ZmLWJ5OiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3Vz ZS5jb20+ClNpZ25lZC1vZmYtYnk6IExpdSBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy94ZW4vTWFrZWZpbGUgICAgICAgICAgICAgfCAgICAzICstCiBkcml2ZXJz L3hlbi94ZW4tYWNwaS1wYWQuYyAgICAgICB8ICAxODYgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIGluY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIHwgICAxNyAr KysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oICB8ICAgMTUgKysrCiA0IGZpbGVz IGNoYW5nZWQsIDIyMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUg MTAwNjQ0IGRyaXZlcnMveGVuL3hlbi1hY3BpLXBhZC5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy94 ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQppbmRleCAwZTg2MzcwLi4zYzM5NzE3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmlsZQorKysgYi9kcml2ZXJzL3hlbi9NYWtl ZmlsZQpAQCAtMTAsNyArMTAsOCBAQCBDRkxBR1NfZmVhdHVyZXMubwkJCTo9ICQobm9zdGFja3Ap CiAKIGRvbTAtJChDT05GSUdfUENJKSArPSBwY2kubwogZG9tMC0kKENPTkZJR19VU0JfU1VQUE9S VCkgKz0gZGJncC5vCi1kb20wLSQoQ09ORklHX0FDUEkpICs9IGFjcGkubworZG9tMC0kKENPTkZJ R19BQ1BJKSArPSBhY3BpLm8gJCh4ZW4tcGFkLXkpCit4ZW4tcGFkLSQoQ09ORklHX1g4NikgKz0g eGVuLWFjcGktcGFkLm8KIGRvbTAtJChDT05GSUdfWDg2KSArPSBwY3B1Lm8KIG9iai0kKENPTkZJ R19YRU5fRE9NMCkJCQkrPSAkKGRvbTAteSkKIG9iai0kKENPTkZJR19CTE9DSykJCQkrPSBiaW9t ZXJnZS5vCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyBiL2RyaXZlcnMv eGVuL3hlbi1hY3BpLXBhZC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYw MmQzZmYKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYwpAQCAt MCwwICsxLDE4NiBAQAorLyoKKyAqIHhlbi1hY3BpLXBhZC5jIC0gWGVuIHBhZCBpbnRlcmZhY2UK KyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTIsIEludGVsIENvcnBvcmF0aW9uLgorICogICAgQXV0 aG9yOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KKyAqCisgKiBUaGlzIHBy b2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1v ZGlmeSBpdAorICogdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBHTlUgR2Vu ZXJhbCBQdWJsaWMgTGljZW5zZSwKKyAqIHZlcnNpb24gMiwgYXMgcHVibGlzaGVkIGJ5IHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1 dGVkIGluIHRoZSBob3BlIGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAorICogQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRBQklM SVRZIG9yCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05V IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yCisgKiBtb3JlIGRldGFpbHMuCisgKgorICogWW91 IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExp Y2Vuc2UgYWxvbmcgd2l0aAorICogdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdyaXRlIHRvIHRoZSBG cmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sCisgKiA1MSBGcmFua2xpbiBTdCAtIEZpZnRo IEZsb29yLCBCb3N0b24sIE1BIDAyMTEwLTEzMDEgVVNBLgorICoKKyAqLworCisjaW5jbHVkZSA8 bGludXgva2VybmVsLmg+CisjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KKyNpbmNsdWRlIDxhY3Bp L2FjcGlfYnVzLmg+CisjaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4KKyNpbmNsdWRlIDxh c20veGVuL2h5cGVyY2FsbC5oPgorI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UvdmVyc2lvbi5oPgor CisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfQ0xBU1MJImFjcGlfcGFkIgorI2Rl ZmluZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0RFVklDRV9OQU1FICJQcm9jZXNzb3IgQWdn cmVnYXRvciIKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlkgMHg4MAor CitzdGF0aWMgREVGSU5FX01VVEVYKHhlbl9jcHVfbG9jayk7CisKK3N0YXRpYyBpbnQgeGVuX2Fj cGlfcGFkX2lkbGVfY3B1cyh1bnNpZ25lZCBpbnQgaWRsZV9udW1zKQoreworCXN0cnVjdCB4ZW5f cGxhdGZvcm1fb3Agb3A7CisKKwlvcC5jbWQgPSBYRU5QRl9jb3JlX3Bhcmtpbmc7CisJb3AudS5j b3JlX3BhcmtpbmcudHlwZSA9IFhFTl9DT1JFX1BBUktJTkdfU0VUOworCW9wLnUuY29yZV9wYXJr aW5nLmlkbGVfbnVtcyA9IGlkbGVfbnVtczsKKworCXJldHVybiBIWVBFUlZJU09SX2RvbTBfb3Ao Jm9wKTsKK30KKworc3RhdGljIGludCB4ZW5fYWNwaV9wYWRfaWRsZV9jcHVzX251bSh2b2lkKQor eworCXN0cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3A7CisKKwlvcC5jbWQgPSBYRU5QRl9jb3JlX3Bh cmtpbmc7CisJb3AudS5jb3JlX3BhcmtpbmcudHlwZSA9IFhFTl9DT1JFX1BBUktJTkdfR0VUOwor CisJcmV0dXJuIEhZUEVSVklTT1JfZG9tMF9vcCgmb3ApCisJICAgICAgID86IG9wLnUuY29yZV9w YXJraW5nLmlkbGVfbnVtczsKK30KKworLyoKKyAqIFF1ZXJ5IGZpcm13YXJlIGhvdyBtYW55IENQ VXMgc2hvdWxkIGJlIGlkbGUKKyAqIHJldHVybiAtMSBvbiBmYWlsdXJlCisgKi8KK3N0YXRpYyBp bnQgYWNwaV9wYWRfcHVyKGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlzdHJ1Y3QgYWNwaV9idWZm ZXIgYnVmZmVyID0ge0FDUElfQUxMT0NBVEVfQlVGRkVSLCBOVUxMfTsKKwl1bmlvbiBhY3BpX29i amVjdCAqcGFja2FnZTsKKwlpbnQgbnVtID0gLTE7CisKKwlpZiAoQUNQSV9GQUlMVVJFKGFjcGlf ZXZhbHVhdGVfb2JqZWN0KGhhbmRsZSwgIl9QVVIiLCBOVUxMLCAmYnVmZmVyKSkpCisJCXJldHVy biBudW07CisKKwlpZiAoIWJ1ZmZlci5sZW5ndGggfHwgIWJ1ZmZlci5wb2ludGVyKQorCQlyZXR1 cm4gbnVtOworCisJcGFja2FnZSA9IGJ1ZmZlci5wb2ludGVyOworCisJaWYgKHBhY2thZ2UtPnR5 cGUgPT0gQUNQSV9UWVBFX1BBQ0tBR0UgJiYKKwkJcGFja2FnZS0+cGFja2FnZS5jb3VudCA9PSAy ICYmCisJCXBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMF0uaW50ZWdlci52YWx1ZSA9PSAxKSAv KiByZXYgMSAqLworCisJCW51bSA9IHBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMV0uaW50ZWdl ci52YWx1ZTsKKworCWtmcmVlKGJ1ZmZlci5wb2ludGVyKTsKKwlyZXR1cm4gbnVtOworfQorCisv KiBOb3RpZnkgZmlybXdhcmUgaG93IG1hbnkgQ1BVcyBhcmUgaWRsZSAqLworc3RhdGljIHZvaWQg YWNwaV9wYWRfb3N0KGFjcGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMyX3QgaWRs ZV9udW1zKQoreworCXVuaW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50eXBlID0g QUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJ ey50eXBlID0gQUNQSV9UWVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2JqZWN0X2xp c3QgYXJnX2xpc3QgPSB7MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZhbHVlID0g QUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVnZXIudmFs dWUgPSAgc3RhdDsKKwlwYXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1zWzJdLmJ1 ZmZlci5wb2ludGVyID0gKHZvaWQgKikmaWRsZV9udW1zOworCWFjcGlfZXZhbHVhdGVfb2JqZWN0 KGhhbmRsZSwgIl9PU1QiLCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9pZCBhY3Bp X3BhZF9oYW5kbGVfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlpbnQgaWRsZV9udW1z OworCisJbXV0ZXhfbG9jaygmeGVuX2NwdV9sb2NrKTsKKwlpZGxlX251bXMgPSBhY3BpX3BhZF9w dXIoaGFuZGxlKTsKKwlpZiAoaWRsZV9udW1zIDwgMCkgeworCQltdXRleF91bmxvY2soJnhlbl9j cHVfbG9jayk7CisJCXJldHVybjsKKwl9CisKKwlpZGxlX251bXMgPSB4ZW5fYWNwaV9wYWRfaWRs ZV9jcHVzKGlkbGVfbnVtcykKKwkJICAgID86IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNfbnVtKCk7 CisJaWYgKGlkbGVfbnVtcyA+PSAwKQorCQlhY3BpX3BhZF9vc3QoaGFuZGxlLCAwLCBpZGxlX251 bXMpOworCW11dGV4X3VubG9jaygmeGVuX2NwdV9sb2NrKTsKK30KKworc3RhdGljIHZvaWQgYWNw aV9wYWRfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSwgdTMyIGV2ZW50LAorCXZvaWQgKmRhdGEp Cit7CisJc3dpdGNoIChldmVudCkgeworCWNhc2UgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9O T1RJRlk6CisJCWFjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7CisJZGVm YXVsdDoKKwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVudCk7CisJ CWJyZWFrOworCX0KK30KKworc3RhdGljIGludCBhY3BpX3BhZF9hZGQoc3RydWN0IGFjcGlfZGV2 aWNlICpkZXZpY2UpCit7CisJYWNwaV9zdGF0dXMgc3RhdHVzOworCisJc3RyY3B5KGFjcGlfZGV2 aWNlX25hbWUoZGV2aWNlKSwgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0VfTkFNRSk7 CisJc3RyY3B5KGFjcGlfZGV2aWNlX2NsYXNzKGRldmljZSksIEFDUElfUFJPQ0VTU09SX0FHR1JF R0FUT1JfQ0xBU1MpOworCisJc3RhdHVzID0gYWNwaV9pbnN0YWxsX25vdGlmeV9oYW5kbGVyKGRl dmljZS0+aGFuZGxlLAorCQlBQ1BJX0RFVklDRV9OT1RJRlksIGFjcGlfcGFkX25vdGlmeSwgZGV2 aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVWOworCisJ cmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgYWNwaV9wYWRfcmVtb3ZlKHN0cnVjdCBhY3BpX2Rl dmljZSAqZGV2aWNlLAorCWludCB0eXBlKQoreworCW11dGV4X2xvY2soJnhlbl9jcHVfbG9jayk7 CisJeGVuX2FjcGlfcGFkX2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9jcHVfbG9j ayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwKKwkJQUNQ SV9ERVZJQ0VfTk9USUZZLCBhY3BpX3BhZF9ub3RpZnkpOworCXJldHVybiAwOworfQorCitzdGF0 aWMgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkIHBhZF9kZXZpY2VfaWRzW10gPSB7CisJeyJB Q1BJMDAwQyIsIDB9LAorCXsiIiwgMH0sCit9OworCitzdGF0aWMgc3RydWN0IGFjcGlfZHJpdmVy IGFjcGlfcGFkX2RyaXZlciA9IHsKKwkubmFtZSA9ICJwcm9jZXNzb3JfYWdncmVnYXRvciIsCisJ LmNsYXNzID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9DTEFTUywKKwkuaWRzID0gcGFkX2Rl dmljZV9pZHMsCisJLm9wcyA9IHsKKwkJLmFkZCA9IGFjcGlfcGFkX2FkZCwKKwkJLnJlbW92ZSA9 IGFjcGlfcGFkX3JlbW92ZSwKKwl9LAorfTsKKworc3RhdGljIGludCBfX2luaXQgeGVuX2FjcGlf cGFkX2luaXQodm9pZCkKK3sKKwkvKiBPbmx5IERPTTAgYW5kIFhlbjQuMiBvciBsYXRlciBzdXBw b3J0IFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkgfHwKKwkJIXhl bl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwgMikpCisJCXJldHVybiAtRU5PREVWOwor CisJcmV0dXJuIGFjcGlfYnVzX3JlZ2lzdGVyX2RyaXZlcigmYWNwaV9wYWRfZHJpdmVyKTsKK30K K3N1YnN5c19pbml0Y2FsbCh4ZW5fYWNwaV9wYWRfaW5pdCk7CisKZGlmZiAtLWdpdCBhL2luY2x1 ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIGIvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3BsYXRm b3JtLmgKaW5kZXggNDc1NWI1Zi4uNWUzNjkzMiAxMDA2NDQKLS0tIGEvaW5jbHVkZS94ZW4vaW50 ZXJmYWNlL3BsYXRmb3JtLmgKKysrIGIvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3BsYXRmb3JtLmgK QEAgLTMyNCw2ICszMjQsMjIgQEAgc3RydWN0IHhlbnBmX2NwdV9vbCB7CiB9OwogREVGSU5FX0dV RVNUX0hBTkRMRV9TVFJVQ1QoeGVucGZfY3B1X29sKTsKIAorLyoKKyAqIENNRCA1OCBhbmQgNTkg YXJlIHJlc2VydmVkIGZvciBjcHUgaG90YWRkIGFuZCBtZW1vcnkgaG90YWRkLAorICogd2hpY2gg YXJlIGFscmVhZHkgb2NjdXBpZWQgYXQgWGVuIGh5cGVydmlzb3Igc2lkZS4KKyAqLworI2RlZmlu ZSBYRU5QRl9jb3JlX3BhcmtpbmcgICAgIDYwCitzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nIHsK KwkvKiBJTiB2YXJpYWJsZXMgKi8KKyNkZWZpbmUgWEVOX0NPUkVfUEFSS0lOR19TRVQgICAxCisj ZGVmaW5lIFhFTl9DT1JFX1BBUktJTkdfR0VUICAgMgorCXVpbnQzMl90IHR5cGU7CisJLyogSU4g dmFyaWFibGVzOiAgc2V0IGNwdSBudW1zIGV4cGVjdGVkIHRvIGJlIGlkbGVkICovCisJLyogT1VU IHZhcmlhYmxlczogZ2V0IGNwdSBudW1zIGFjdHVhbGx5IGJlIGlkbGVkICovCisJdWludDMyX3Qg aWRsZV9udW1zOworfTsKK0RFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBmX2NvcmVfcGFy a2luZyk7CisKIHN0cnVjdCB4ZW5fcGxhdGZvcm1fb3AgewogCXVpbnQzMl90IGNtZDsKIAl1aW50 MzJfdCBpbnRlcmZhY2VfdmVyc2lvbjsgLyogWEVOUEZfSU5URVJGQUNFX1ZFUlNJT04gKi8KQEAg LTM0MSw2ICszNTcsNyBAQCBzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIHsKIAkJc3RydWN0IHhlbnBm X3NldF9wcm9jZXNzb3JfcG1pbmZvIHNldF9wbWluZm87CiAJCXN0cnVjdCB4ZW5wZl9wY3B1aW5m byAgICAgICAgICBwY3B1X2luZm87CiAJCXN0cnVjdCB4ZW5wZl9jcHVfb2wgICAgICAgICAgICBj cHVfb2w7CisJCXN0cnVjdCB4ZW5wZl9jb3JlX3BhcmtpbmcgICAgICBjb3JlX3Bhcmtpbmc7CiAJ CXVpbnQ4X3QgICAgICAgICAgICAgICAgICAgICAgICBwYWRbMTI4XTsKIAl9IHU7CiB9OwpkaWZm IC0tZ2l0IGEvaW5jbHVkZS94ZW4vaW50ZXJmYWNlL3ZlcnNpb24uaCBiL2luY2x1ZGUveGVuL2lu dGVyZmFjZS92ZXJzaW9uLmgKaW5kZXggN2ZmNjQ5OC4uOTZkOGQzZCAxMDA2NDQKLS0tIGEvaW5j bHVkZS94ZW4vaW50ZXJmYWNlL3ZlcnNpb24uaAorKysgYi9pbmNsdWRlL3hlbi9pbnRlcmZhY2Uv dmVyc2lvbi5oCkBAIC02Myw0ICs2MywxOSBAQCBzdHJ1Y3QgeGVuX2ZlYXR1cmVfaW5mbyB7CiAv KiBhcmcgPT0geGVuX2RvbWFpbl9oYW5kbGVfdC4gKi8KICNkZWZpbmUgWEVOVkVSX2d1ZXN0X2hh bmRsZSA4CiAKKy8qIENoZWNrIGlmIHJ1bm5pbmcgb24gWGVuIHZlcnNpb24gKG1ham9yLCBtaW5v cikgb3IgbGF0ZXIgKi8KK3N0YXRpYyBpbmxpbmUgYm9vbAoreGVuX3J1bm5pbmdfb25fdmVyc2lv bl9vcl9sYXRlcih1bnNpZ25lZCBpbnQgbWFqb3IsIHVuc2lnbmVkIGludCBtaW5vcikKK3sKKwl1 bnNpZ25lZCBpbnQgdmVyc2lvbjsKKworCWlmICgheGVuX2RvbWFpbigpKQorCQlyZXR1cm4gZmFs c2U7CisKKwl2ZXJzaW9uID0gSFlQRVJWSVNPUl94ZW5fdmVyc2lvbihYRU5WRVJfdmVyc2lvbiwg TlVMTCk7CisJaWYgKCgoKHZlcnNpb24gPj4gMTYpID09IG1ham9yKSAmJiAoKHZlcnNpb24gJiAw eGZmZmYpID49IG1pbm9yKSkgfHwKKwkJKCh2ZXJzaW9uID4+IDE2KSA+IG1ham9yKSkKKwkJcmV0 dXJuIHRydWU7CisJcmV0dXJuIGZhbHNlOworfQogI2VuZGlmIC8qIF9fWEVOX1BVQkxJQ19WRVJT SU9OX0hfXyAqLwotLSAKMS43LjEKCg== --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537B99ESHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 13:02:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:02:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Gr-0002Cd-Hv; Wed, 07 Nov 2012 13:02:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Gq-0002CX-J3 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:02:16 +0000 Received: from [85.158.139.83:60586] by server-12.bemta-5.messagelabs.com id 4E/44-02886-7DB5A905; Wed, 07 Nov 2012 13:02:15 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352293333!28635698!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI4MjQ5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2647 invoked from network); 7 Nov 2012 13:02:14 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-13.tower-182.messagelabs.com with SMTP; 7 Nov 2012 13:02:14 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 07 Nov 2012 05:02:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208,223";a="165488182" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by AZSMGA002.ch.intel.com with ESMTP; 07 Nov 2012 05:02:12 -0800 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:02:12 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:02:12 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 21:02:06 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xensource.com" Thread-Topic: [PATCH 2/2] Revert pad config check in xen_check_mwait Thread-Index: Ac2yq1FN1e+6ZP87QOCrcigNApJpmAKPGhiQ Date: Wed, 7 Nov 2012 13:02:05 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_" MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] Revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Add xen version check for xen_check_mwait. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D >From b8288c4b8bce46468e5abbb95fae4c9c748bafaa Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 8 Nov 2012 04:31:11 +0800 Subject: [PATCH 2/2] Revert pad config check in xen_check_mwait With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..548296f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -309,6 +308,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (!xen_running_on_version_or_later(4, 2)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Revert-pad-config-check-in-xen_check_mwait.patch"; size=1699; creation-date="Wed, 07 Nov 2012 12:49:11 GMT"; modification-date="Wed, 07 Nov 2012 20:32:34 GMT" Content-Transfer-Encoding: base64 RnJvbSBiODI4OGM0YjhiY2U0NjQ2OGU1YWJiYjk1ZmFlNGM5Yzc0OGJhZmFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA0OjMxOjExICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFJldmVydCBwYWQgY29uZmlnIGNoZWNrIGluIHhlbl9jaGVja19td2FpdAoKV2l0aCBYZW4gYWNw aSBwYWQgbG9naWMgYWRkZWQgaW50byBrZXJuZWwsIHdlIGNhbiBub3cgcmV2ZXJ0IHhlbiBtd2Fp dCByZWxhdGVkCnBhdGNoIGRmODhiMmQ5NmUzNmQ5YTllMzI1YmZjZDEyZWI0NTY3MWNiYmM5Mzcu IFRoZSByZWFzb24gaXMsIHdoZW4gcnVubmluZyB1bmRlcgpuZXdlciBYZW4gcGxhdGZvcm0sIFhl biBwYWQgZHJpdmVyIHdvdWxkIGJlIGVhcmx5IGxvYWRlZCwgc28gbmF0aXZlIHBhZCBkcml2ZXIK d291bGQgZmFpbCB0byBiZSBsb2FkZWQsIGFuZCBoZW5jZSBubyBtd2FpdC9tb25pdG9yICNVRCBy aXNrIGFnYWluLgoKQW5vdGhlciBwb2ludCBpcywgb25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9y dCBYZW4gYWNwaSBwYWQsIHNvIHdlIHdvbid0IGV4cG9zZQptd2FpdCBjcHVpZCBjYXBhYmlsaXR5 IHdoZW4gcnVubmluZyB1bmRlciBvbGRlciBYZW4gcGxhdGZvcm0uCgpTaWduZWQtb2ZmLWJ5OiBM aXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vZW5s aWdodGVuLmMgfCAgIDEwICsrKysrKysrLS0KIDEgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4u YyBiL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYwppbmRleCA1ODZkODM4Li41NDgyOTZmIDEwMDY0 NAotLS0gYS9hcmNoL3g4Ni94ZW4vZW5saWdodGVuLmMKKysrIGIvYXJjaC94ODYveGVuL2VubGln aHRlbi5jCkBAIC0yODcsOCArMjg3LDcgQEAgc3RhdGljIHZvaWQgeGVuX2NwdWlkKHVuc2lnbmVk IGludCAqYXgsIHVuc2lnbmVkIGludCAqYngsCiAKIHN0YXRpYyBib29sIF9faW5pdCB4ZW5fY2hl Y2tfbXdhaXQodm9pZCkKIHsKLSNpZiBkZWZpbmVkKENPTkZJR19BQ1BJKSAmJiAhZGVmaW5lZChD T05GSUdfQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUikgJiYgXAotCSFkZWZpbmVkKENPTkZJR19B Q1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX01PRFVMRSkKKyNpZmRlZiBDT05GSUdfQUNQSQogCXN0 cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3AgPSB7CiAJCS5jbWQJCQk9IFhFTlBGX3NldF9wcm9jZXNz b3JfcG1pbmZvLAogCQkudS5zZXRfcG1pbmZvLmlkCT0gLTEsCkBAIC0zMDksNiArMzA4LDEzIEBA IHN0YXRpYyBib29sIF9faW5pdCB4ZW5fY2hlY2tfbXdhaXQodm9pZCkKIAlpZiAoIXhlbl9pbml0 aWFsX2RvbWFpbigpKQogCQlyZXR1cm4gZmFsc2U7CiAKKwkvKgorCSAqIFdoZW4gcnVubmluZyB1 bmRlciBwbGF0Zm9ybSBlYXJsaWVyIHRoYW4gWGVuNC4yLCBkbyBub3QgZXhwb3NlCisJICogbXdh aXQsIHRvIGF2b2lkIHRoZSByaXNrIG9mIGxvYWRpbmcgbmF0aXZlIGFjcGkgcGFkIGRyaXZlcgor CSAqLworCWlmICgheGVuX3J1bm5pbmdfb25fdmVyc2lvbl9vcl9sYXRlcig0LCAyKSkKKwkJcmV0 dXJuIGZhbHNlOworCiAJYXggPSAxOwogCWN4ID0gMDsKIAotLSAKMS43LjEKCg== --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 13:02:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:02:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Gr-0002Cd-Hv; Wed, 07 Nov 2012 13:02:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Gq-0002CX-J3 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:02:16 +0000 Received: from [85.158.139.83:60586] by server-12.bemta-5.messagelabs.com id 4E/44-02886-7DB5A905; Wed, 07 Nov 2012 13:02:15 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352293333!28635698!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjI4MjQ5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2647 invoked from network); 7 Nov 2012 13:02:14 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-13.tower-182.messagelabs.com with SMTP; 7 Nov 2012 13:02:14 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 07 Nov 2012 05:02:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208,223";a="165488182" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by AZSMGA002.ch.intel.com with ESMTP; 07 Nov 2012 05:02:12 -0800 Received: from fmsmsx119.amr.corp.intel.com (10.18.22.143) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:02:12 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx119.amr.corp.intel.com (10.18.22.143) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:02:12 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 21:02:06 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "xen-devel@lists.xensource.com" Thread-Topic: [PATCH 2/2] Revert pad config check in xen_check_mwait Thread-Index: Ac2yq1FN1e+6ZP87QOCrcigNApJpmAKPGhiQ Date: Wed, 7 Nov 2012 13:02:05 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_" MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] Revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Add xen version check for xen_check_mwait. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D >From b8288c4b8bce46468e5abbb95fae4c9c748bafaa Mon Sep 17 00:00:00 2001 From: Liu, Jinsong Date: Thu, 8 Nov 2012 04:31:11 +0800 Subject: [PATCH 2/2] Revert pad config check in xen_check_mwait With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..548296f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -309,6 +308,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (!xen_running_on_version_or_later(4, 2)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Revert-pad-config-check-in-xen_check_mwait.patch"; size=1699; creation-date="Wed, 07 Nov 2012 12:49:11 GMT"; modification-date="Wed, 07 Nov 2012 20:32:34 GMT" Content-Transfer-Encoding: base64 RnJvbSBiODI4OGM0YjhiY2U0NjQ2OGU1YWJiYjk1ZmFlNGM5Yzc0OGJhZmFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA0OjMxOjExICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFJldmVydCBwYWQgY29uZmlnIGNoZWNrIGluIHhlbl9jaGVja19td2FpdAoKV2l0aCBYZW4gYWNw aSBwYWQgbG9naWMgYWRkZWQgaW50byBrZXJuZWwsIHdlIGNhbiBub3cgcmV2ZXJ0IHhlbiBtd2Fp dCByZWxhdGVkCnBhdGNoIGRmODhiMmQ5NmUzNmQ5YTllMzI1YmZjZDEyZWI0NTY3MWNiYmM5Mzcu IFRoZSByZWFzb24gaXMsIHdoZW4gcnVubmluZyB1bmRlcgpuZXdlciBYZW4gcGxhdGZvcm0sIFhl biBwYWQgZHJpdmVyIHdvdWxkIGJlIGVhcmx5IGxvYWRlZCwgc28gbmF0aXZlIHBhZCBkcml2ZXIK d291bGQgZmFpbCB0byBiZSBsb2FkZWQsIGFuZCBoZW5jZSBubyBtd2FpdC9tb25pdG9yICNVRCBy aXNrIGFnYWluLgoKQW5vdGhlciBwb2ludCBpcywgb25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9y dCBYZW4gYWNwaSBwYWQsIHNvIHdlIHdvbid0IGV4cG9zZQptd2FpdCBjcHVpZCBjYXBhYmlsaXR5 IHdoZW4gcnVubmluZyB1bmRlciBvbGRlciBYZW4gcGxhdGZvcm0uCgpTaWduZWQtb2ZmLWJ5OiBM aXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vZW5s aWdodGVuLmMgfCAgIDEwICsrKysrKysrLS0KIDEgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4u YyBiL2FyY2gveDg2L3hlbi9lbmxpZ2h0ZW4uYwppbmRleCA1ODZkODM4Li41NDgyOTZmIDEwMDY0 NAotLS0gYS9hcmNoL3g4Ni94ZW4vZW5saWdodGVuLmMKKysrIGIvYXJjaC94ODYveGVuL2VubGln aHRlbi5jCkBAIC0yODcsOCArMjg3LDcgQEAgc3RhdGljIHZvaWQgeGVuX2NwdWlkKHVuc2lnbmVk IGludCAqYXgsIHVuc2lnbmVkIGludCAqYngsCiAKIHN0YXRpYyBib29sIF9faW5pdCB4ZW5fY2hl Y2tfbXdhaXQodm9pZCkKIHsKLSNpZiBkZWZpbmVkKENPTkZJR19BQ1BJKSAmJiAhZGVmaW5lZChD T05GSUdfQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUikgJiYgXAotCSFkZWZpbmVkKENPTkZJR19B Q1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX01PRFVMRSkKKyNpZmRlZiBDT05GSUdfQUNQSQogCXN0 cnVjdCB4ZW5fcGxhdGZvcm1fb3Agb3AgPSB7CiAJCS5jbWQJCQk9IFhFTlBGX3NldF9wcm9jZXNz b3JfcG1pbmZvLAogCQkudS5zZXRfcG1pbmZvLmlkCT0gLTEsCkBAIC0zMDksNiArMzA4LDEzIEBA IHN0YXRpYyBib29sIF9faW5pdCB4ZW5fY2hlY2tfbXdhaXQodm9pZCkKIAlpZiAoIXhlbl9pbml0 aWFsX2RvbWFpbigpKQogCQlyZXR1cm4gZmFsc2U7CiAKKwkvKgorCSAqIFdoZW4gcnVubmluZyB1 bmRlciBwbGF0Zm9ybSBlYXJsaWVyIHRoYW4gWGVuNC4yLCBkbyBub3QgZXhwb3NlCisJICogbXdh aXQsIHRvIGF2b2lkIHRoZSByaXNrIG9mIGxvYWRpbmcgbmF0aXZlIGFjcGkgcGFkIGRyaXZlcgor CSAqLworCWlmICgheGVuX3J1bm5pbmdfb25fdmVyc2lvbl9vcl9sYXRlcig0LCAyKSkKKwkJcmV0 dXJuIGZhbHNlOworCiAJYXggPSAxOwogCWN4ID0gMDsKIAotLSAKMS43LjEKCg== --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537B9B8SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 13:03:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:03:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Hi-0002Gq-5H; Wed, 07 Nov 2012 13:03:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Hg-0002Ge-TL for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:03:09 +0000 Received: from [85.158.143.35:6103] by server-3.bemta-4.messagelabs.com id 08/F8-06841-C0C5A905; Wed, 07 Nov 2012 13:03:08 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352293326!13927577!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10286 invoked from network); 7 Nov 2012 13:02:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 13:02:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="43771073" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 07 Nov 2012 13:02:06 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Wed, 7 Nov 2012 08:02:05 -0500 Date: Wed, 7 Nov 2012 13:01:21 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352285859.12977.45.camel@hastur.hellion.org.uk> Message-ID: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> <1352285859.12977.45.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk , "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 7 Nov 2012, Ian Campbell wrote: > On Wed, 2012-11-07 at 10:25 +0000, Stefano Stabellini wrote: > > On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > > > We end up with: > > > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > > > Signed-off-by: Konrad Rzeszutek Wilk > > > > Thank you very much for going out of your way to fix this issue (I am > > currently at LinuxCon). > > > > > > > arch/arm/xen/enlighten.c | 5 +++++ > > > 1 files changed, 5 insertions(+), 0 deletions(-) > > > > > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > > > index 59bcb96..96d969d 100644 > > > --- a/arch/arm/xen/enlighten.c > > > +++ b/arch/arm/xen/enlighten.c > > > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > > > *pages = NULL; > > > } > > > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > > > + > > > +/* In the hypervisor.S file. */ > > > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > > > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > > > +EXPORT_SYMBOL_GPL(privcmd_call); > > > > I think the patch is OK and I tested it: it fixes the issue reported > > by Russell. > > However I am wondering, does it actually make sense only to export 3 > > hypercalls among the set implemented in hypercall.S? > > Maybe it does make sense only to export a subset, but I wouldn't > > necessarly do the differentiation here, I would just export all the > > hypercalls implemented in hypercalls.S. > > In fact if we separate the hypercalls in two sets, I would like to > > see a similar differentiation on x86 too. > > On x86 these functions are static inline (all of them, I think) so > exporting them is not necessary or possible. What I meant is that on x86 we could move some of the hypercalls out of hypercall.h. That would be similar to the split that this patch is introducing. > I don't think you can export from a .S, otherwise the obvious answer > would be to integrate it with the macro in hypercall.S. yeah.. > Possibly mad idea: auto-generate hypercall.[Sc] (.S=stubs & .c=exports) > from include/xen/interface/xen.h:HYPERVISOR_* ? > > (Aside: the whitespace in hypercall.S is a bit fubarred, wrt the line > wrapping in the macros) I would leave this idea aside for the moment :) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:03:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:03:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Hi-0002Gq-5H; Wed, 07 Nov 2012 13:03:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5Hg-0002Ge-TL for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:03:09 +0000 Received: from [85.158.143.35:6103] by server-3.bemta-4.messagelabs.com id 08/F8-06841-C0C5A905; Wed, 07 Nov 2012 13:03:08 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352293326!13927577!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10286 invoked from network); 7 Nov 2012 13:02:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 13:02:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="43771073" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 07 Nov 2012 13:02:06 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Wed, 7 Nov 2012 08:02:05 -0500 Date: Wed, 7 Nov 2012 13:01:21 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352285859.12977.45.camel@hastur.hellion.org.uk> Message-ID: References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-3-git-send-email-konrad.wilk@oracle.com> <1352285859.12977.45.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk , "xen-devel@lists.xensource.com" , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 2/2] xen/arm: Fix compile errors when drivers are compiled as modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 7 Nov 2012, Ian Campbell wrote: > On Wed, 2012-11-07 at 10:25 +0000, Stefano Stabellini wrote: > > On Tue, 6 Nov 2012, Konrad Rzeszutek Wilk wrote: > > > We end up with: > > > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > > > Signed-off-by: Konrad Rzeszutek Wilk > > > > Thank you very much for going out of your way to fix this issue (I am > > currently at LinuxCon). > > > > > > > arch/arm/xen/enlighten.c | 5 +++++ > > > 1 files changed, 5 insertions(+), 0 deletions(-) > > > > > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > > > index 59bcb96..96d969d 100644 > > > --- a/arch/arm/xen/enlighten.c > > > +++ b/arch/arm/xen/enlighten.c > > > @@ -166,3 +166,8 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) > > > *pages = NULL; > > > } > > > EXPORT_SYMBOL_GPL(free_xenballooned_pages); > > > + > > > +/* In the hypervisor.S file. */ > > > +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); > > > +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); > > > +EXPORT_SYMBOL_GPL(privcmd_call); > > > > I think the patch is OK and I tested it: it fixes the issue reported > > by Russell. > > However I am wondering, does it actually make sense only to export 3 > > hypercalls among the set implemented in hypercall.S? > > Maybe it does make sense only to export a subset, but I wouldn't > > necessarly do the differentiation here, I would just export all the > > hypercalls implemented in hypercalls.S. > > In fact if we separate the hypercalls in two sets, I would like to > > see a similar differentiation on x86 too. > > On x86 these functions are static inline (all of them, I think) so > exporting them is not necessary or possible. What I meant is that on x86 we could move some of the hypercalls out of hypercall.h. That would be similar to the split that this patch is introducing. > I don't think you can export from a .S, otherwise the obvious answer > would be to integrate it with the macro in hypercall.S. yeah.. > Possibly mad idea: auto-generate hypercall.[Sc] (.S=stubs & .c=exports) > from include/xen/interface/xen.h:HYPERVISOR_* ? > > (Aside: the whitespace in hypercall.S is a bit fubarred, wrt the line > wrapping in the macros) I would leave this idea aside for the moment :) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:07:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:07:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5LK-0002VV-Q2; Wed, 07 Nov 2012 13:06:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5LI-0002VO-TU for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:06:53 +0000 Received: from [85.158.139.211:22391] by server-11.bemta-5.messagelabs.com id C3/CB-03409-CEC5A905; Wed, 07 Nov 2012 13:06:52 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352293610!19196651!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyNjkz\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10669 invoked from network); 7 Nov 2012 13:06:51 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-14.tower-206.messagelabs.com with SMTP; 7 Nov 2012 13:06:51 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 05:06:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="216294149" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 05:06:49 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:06:49 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:06:49 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 21:06:47 +0800 From: "Liu, Jinsong" To: Shuah Khan Thread-Topic: [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvEyBXY6qKU083U+UjDldvhm0q5feV85A Date: Wed, 7 Nov 2012 13:06:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Shuah Khan wrote: > On Thu, Oct 25, 2012 at 6:19 AM, Liu, Jinsong > wrote: >> From f233ad06cf924116693d7d38be9ae9d8c11f8a9b Mon Sep 17 00:00:00 >> 2001 >> From: Liu, Jinsong >> Date: Fri, 26 Oct 2012 02:32:48 +0800 >> Subject: [PATCH 1/2] Xen acpi pad implement >> >> PAD is acpi Processor Aggregator Device which provides a control >> point >> that enables the platform to perform specific processor configuration >> and control that applies to all processors in the platform. >> >> This patch is to implement Xen acpi pad logic. When running under Xen >> virt platform, native pad driver would not work. Instead Xen pad >> driver, >> a self-contained and very thin logic level, would take over acpi pad >> staff. > > "logic" instead of staff (guessing this is supposed to stuff) > Yes. >> When acpi pad notify OSPM, xen pad logic intercept and parse _PUR >> object >> and then hypercall to hyervisor for the rest work, say, core parking. > hypervisor > rest of the work? - could you add more details on what is handled by > this think PAD driver and what would be left to the host pad driver. OK, add at updated patch. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:07:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:07:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5LK-0002VV-Q2; Wed, 07 Nov 2012 13:06:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5LI-0002VO-TU for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 13:06:53 +0000 Received: from [85.158.139.211:22391] by server-11.bemta-5.messagelabs.com id C3/CB-03409-CEC5A905; Wed, 07 Nov 2012 13:06:52 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352293610!19196651!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyNjkz\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10669 invoked from network); 7 Nov 2012 13:06:51 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-14.tower-206.messagelabs.com with SMTP; 7 Nov 2012 13:06:51 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 05:06:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="216294149" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 05:06:49 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:06:49 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 05:06:49 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 21:06:47 +0800 From: "Liu, Jinsong" To: Shuah Khan Thread-Topic: [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvEyBXY6qKU083U+UjDldvhm0q5feV85A Date: Wed, 7 Nov 2012 13:06:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Shuah Khan wrote: > On Thu, Oct 25, 2012 at 6:19 AM, Liu, Jinsong > wrote: >> From f233ad06cf924116693d7d38be9ae9d8c11f8a9b Mon Sep 17 00:00:00 >> 2001 >> From: Liu, Jinsong >> Date: Fri, 26 Oct 2012 02:32:48 +0800 >> Subject: [PATCH 1/2] Xen acpi pad implement >> >> PAD is acpi Processor Aggregator Device which provides a control >> point >> that enables the platform to perform specific processor configuration >> and control that applies to all processors in the platform. >> >> This patch is to implement Xen acpi pad logic. When running under Xen >> virt platform, native pad driver would not work. Instead Xen pad >> driver, >> a self-contained and very thin logic level, would take over acpi pad >> staff. > > "logic" instead of staff (guessing this is supposed to stuff) > Yes. >> When acpi pad notify OSPM, xen pad logic intercept and parse _PUR >> object >> and then hypercall to hyervisor for the rest work, say, core parking. > hypervisor > rest of the work? - could you add more details on what is handled by > this think PAD driver and what would be left to the host pad driver. OK, add at updated patch. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:25:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:25:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5cY-0002nX-MO; Wed, 07 Nov 2012 13:24:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5cX-0002nS-LN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 13:24:41 +0000 Received: from [85.158.139.83:40579] by server-11.bemta-5.messagelabs.com id 28/B5-03409-8116A905; Wed, 07 Nov 2012 13:24:40 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-9.tower-182.messagelabs.com!1352294679!28488269!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD, ML_RADAR_SPEW_LINKS_22,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5401 invoked from network); 7 Nov 2012 13:24:39 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Nov 2012 13:24:39 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TW5cV-0005QI-2P; Wed, 07 Nov 2012 13:24:39 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TW5cN-0005jt-Is; Wed, 07 Nov 2012 13:24:38 +0000 Message-ID: <1352294551.12977.61.camel@hastur.hellion.org.uk> From: Ian Campbell To: Philippe.Simonet@swisscom.com Date: Wed, 07 Nov 2012 14:22:31 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: 599161@bugs.debian.org, Keir Fraser , mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 10:10 +0000, Philippe.Simonet@swisscom.com wrote: > Hi Ian Thanks for doing this test. > i compiled a patched hypervisor for Mauro, it is running since many > days and the overflow occured, without clock jumps So just to be clear you saw this logging occur *without* the 50 minute jump in time? That's good! > > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > tsc_stamp=e3839fcb0273 > > (below is the complete xm dmesg output) > > did that help you ? do you need more info ? I'll leave this to Keir (who wrote the debugging patch) to answer but it looks to me like it should be useful! Thanks again. Ian. > thanks and regards > > Philippe > > > > -----Original Message----- > > From: Mauro [mailto:mrsanna1@gmail.com] > > Sent: Wednesday, November 07, 2012 10:12 AM > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > > Subject: Re: [Xen-devel] [Xen-users] Re: Xen 4 TSC problems > > > > Hello, no news until now there aren't clock jumps. > > Here is xm dmesg: > > > > xm dmesg > > (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc > > version 4.4.5 (Debian 4.4.5-8) ) Mon Oct 29 14:42:12 CET 2012 > > (XEN) Bootloader: GRUB 1.98+20100804-14+squeeze1 > > (XEN) Command line: placeholder dom0_mem=3072M loglvl=warning > > guest_loglvl=warning > > (XEN) Video information: > > (XEN) VGA is text mode 80x25, font 8x16 > > (XEN) VBE/DDC methods: V2; EDID transfer time: 2 seconds > > (XEN) Disc information: > > (XEN) Found 2 MBR signatures > > (XEN) Found 2 EDD information structures > > (XEN) Xen-e820 RAM map: > > (XEN) 0000000000000000 - 000000000009f400 (usable) > > (XEN) 000000000009f400 - 00000000000a0000 (reserved) > > (XEN) 00000000000f0000 - 0000000000100000 (reserved) > > (XEN) 0000000000100000 - 00000000cfd43000 (usable) > > (XEN) 00000000cfd43000 - 00000000cfd4c000 (ACPI data) > > (XEN) 00000000cfd4c000 - 00000000cfd4d000 (usable) > > (XEN) 00000000cfd4d000 - 00000000d0000000 (reserved) > > (XEN) 00000000e0000000 - 00000000f0000000 (reserved) > > (XEN) 00000000fec00000 - 00000000fed00000 (reserved) > > (XEN) 00000000fee00000 - 00000000fee10000 (reserved) > > (XEN) 00000000ffc00000 - 0000000100000000 (reserved) > > (XEN) 0000000100000000 - 000000102ffff000 (usable) > > (XEN) ACPI: RSDP 000F4F20, 0024 (r2 HP ) > > (XEN) ACPI: XSDT CFD43900, 007C (r1 HP ProLiant 2 162E) > > (XEN) ACPI: FACP CFD439C0, 00F4 (r3 HP ProLiant 2 162E) > > (XEN) ACPI: DSDT CFD43AC0, 30C9 (r1 HP DSDT 1 INTL 20030228) > > (XEN) ACPI: FACS CFD43100, 0040 > > (XEN) ACPI: SPCR CFD43140, 0050 (r1 HP SPCRRBSU 1 162E) > > (XEN) ACPI: MCFG CFD431C0, 003C (r1 HP ProLiant 1 0) > > (XEN) ACPI: HPET CFD43200, 0038 (r1 HP ProLiant 2 162E) > > (XEN) ACPI: FFFF CFD43240, 0064 (r2 HP P61 2 162E) > > (XEN) ACPI: SPMI CFD432C0, 0040 (r5 HP ProLiant 1 162E) > > (XEN) ACPI: ERST CFD43300, 01D0 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: APIC CFD43500, 0176 (r1 HP ProLiant 2 0) > > (XEN) ACPI: FFFF CFD43680, 0176 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: BERT CFD43800, 0030 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: HEST CFD43840, 00BC (r1 HP ProLiant 1 162E) > > (XEN) System RAM: 65532MB (67105672kB) > > (XEN) Domain heap initialised > > (XEN) Processor #0 6:15 APIC version 20 > > (XEN) Processor #8 6:15 APIC version 20 > > (XEN) Processor #16 6:15 APIC version 20 > > (XEN) Processor #24 6:15 APIC version 20 > > (XEN) Processor #1 6:15 APIC version 20 > > (XEN) Processor #9 6:15 APIC version 20 > > (XEN) Processor #17 6:15 APIC version 20 > > (XEN) Processor #25 6:15 APIC version 20 > > (XEN) Processor #2 6:15 APIC version 20 > > (XEN) Processor #10 6:15 APIC version 20 > > (XEN) Processor #18 6:15 APIC version 20 > > (XEN) Processor #26 6:15 APIC version 20 > > (XEN) Processor #3 6:15 APIC version 20 > > (XEN) Processor #11 6:15 APIC version 20 > > (XEN) Processor #19 6:15 APIC version 20 > > (XEN) Processor #27 6:15 APIC version 20 > > (XEN) IOAPIC[0]: apic_id 1, version 32, address 0xfec00000, GSI 0-23 > > (XEN) IOAPIC[1]: apic_id 2, version 32, address 0xfec80000, GSI 24-47 > > (XEN) IOAPIC[2]: apic_id 3, version 32, address 0xfec81000, GSI 48-71 > > (XEN) IOAPIC[3]: apic_id 4, version 32, address 0xfec81800, GSI 72-95 > > (XEN) Enabling APIC mode: Phys. Using 4 I/O APICs > > (XEN) Using scheduler: SMP Credit Scheduler (credit) > > (XEN) Detected 2400.128 MHz processor. > > (XEN) Initing memory sharing. > > (XEN) VMX: Supported advanced features: > > (XEN) - APIC MMIO access virtualisation > > (XEN) - APIC TPR shadow > > (XEN) - Virtual NMI > > (XEN) - MSR direct-access bitmap > > (XEN) HVM: ASIDs disabled. > > (XEN) HVM: VMX enabled > > (XEN) I/O virtualisation disabled > > (XEN) Total of 16 processors activated. > > (XEN) ENABLING IO-APIC IRQs > > (XEN) -> Using new ACK method > > (XEN) checking TSC synchronization across 16 CPUs: > > (XEN) CPU#14 had 3 usecs TSC skew, fixed it up. > > (XEN) Platform timer is 14.318MHz HPET > > (XEN) Allocated console ring of 32 KiB. > > (XEN) Brought up 16 CPUs > > (XEN) *** LOADING DOMAIN 0 *** > > (XEN) Xen kernel: 64-bit, lsb, compat32 > > (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x1708000 > > (XEN) PHYSICAL MEMORY ARRANGEMENT: > > (XEN) Dom0 alloc.: 000000083c000000->0000000840000000 (770048 pages > > to be allocated) > > (XEN) VIRTUAL MEMORY ARRANGEMENT: > > (XEN) Loaded kernel: ffffffff81000000->ffffffff81708000 > > (XEN) Init. ramdisk: ffffffff81708000->ffffffff81efb000 > > (XEN) Phys-Mach map: ffffffff81efb000->ffffffff824fb000 > > (XEN) Start info: ffffffff824fb000->ffffffff824fb4b4 > > (XEN) Page tables: ffffffff824fc000->ffffffff82513000 > > (XEN) Boot stack: ffffffff82513000->ffffffff82514000 > > (XEN) TOTAL: ffffffff80000000->ffffffff82800000 > > (XEN) ENTRY ADDRESS: ffffffff81531200 > > (XEN) Dom0 has maximum 16 VCPUs > > (XEN) Scrubbing Free RAM: > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ................................done. > > (XEN) Xen trace buffers: disabled > > (XEN) Std. Loglevel: Errors and warnings > > (XEN) Guest Loglevel: Errors and warnings > > (XEN) Xen is relinquishing VGA console. > > (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to > > Xen) > > (XEN) Freed 176kB init memory. > > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > tsc_stamp=e3839fcb0273 > > > > > > > > > > > -----Original Message----- > > From: xen-devel-bounces@lists.xen.org [mailto:xen-devel- > > bounces@lists.xen.org] On Behalf Of Ian Campbell > > Sent: Friday, October 26, 2012 3:00 PM > > To: xen-devel@lists.xen.org > > Cc: 599161@bugs.debian.org > > Subject: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > > minutes" bug. > > > > Hi all, > > > > I've BCC'd a number of people who have reported seeing this bug at various > > times in the past. > > > > If you can still repro I'd appreciate it if you could give the patch in > > http://marc.info/?l=xen-devel&m=135049062216685&w=2 (also attached) a > > go and report back success/failure and the output of the debugging > > messages produced. > > > > Thanks, > > Ian. > > > > -- > > Ian Campbell > > Current Noise: Death - Evil Dead > > > > Executive ability is prominent in your make-up. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:25:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:25:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5cY-0002nX-MO; Wed, 07 Nov 2012 13:24:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5cX-0002nS-LN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 13:24:41 +0000 Received: from [85.158.139.83:40579] by server-11.bemta-5.messagelabs.com id 28/B5-03409-8116A905; Wed, 07 Nov 2012 13:24:40 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-9.tower-182.messagelabs.com!1352294679!28488269!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=1.4 required=7.0 tests=INFO_TLD, ML_RADAR_SPEW_LINKS_22,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5401 invoked from network); 7 Nov 2012 13:24:39 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-9.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Nov 2012 13:24:39 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TW5cV-0005QI-2P; Wed, 07 Nov 2012 13:24:39 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TW5cN-0005jt-Is; Wed, 07 Nov 2012 13:24:38 +0000 Message-ID: <1352294551.12977.61.camel@hastur.hellion.org.uk> From: Ian Campbell To: Philippe.Simonet@swisscom.com Date: Wed, 07 Nov 2012 14:22:31 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: 599161@bugs.debian.org, Keir Fraser , mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 10:10 +0000, Philippe.Simonet@swisscom.com wrote: > Hi Ian Thanks for doing this test. > i compiled a patched hypervisor for Mauro, it is running since many > days and the overflow occured, without clock jumps So just to be clear you saw this logging occur *without* the 50 minute jump in time? That's good! > > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > tsc_stamp=e3839fcb0273 > > (below is the complete xm dmesg output) > > did that help you ? do you need more info ? I'll leave this to Keir (who wrote the debugging patch) to answer but it looks to me like it should be useful! Thanks again. Ian. > thanks and regards > > Philippe > > > > -----Original Message----- > > From: Mauro [mailto:mrsanna1@gmail.com] > > Sent: Wednesday, November 07, 2012 10:12 AM > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > > Subject: Re: [Xen-devel] [Xen-users] Re: Xen 4 TSC problems > > > > Hello, no news until now there aren't clock jumps. > > Here is xm dmesg: > > > > xm dmesg > > (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc > > version 4.4.5 (Debian 4.4.5-8) ) Mon Oct 29 14:42:12 CET 2012 > > (XEN) Bootloader: GRUB 1.98+20100804-14+squeeze1 > > (XEN) Command line: placeholder dom0_mem=3072M loglvl=warning > > guest_loglvl=warning > > (XEN) Video information: > > (XEN) VGA is text mode 80x25, font 8x16 > > (XEN) VBE/DDC methods: V2; EDID transfer time: 2 seconds > > (XEN) Disc information: > > (XEN) Found 2 MBR signatures > > (XEN) Found 2 EDD information structures > > (XEN) Xen-e820 RAM map: > > (XEN) 0000000000000000 - 000000000009f400 (usable) > > (XEN) 000000000009f400 - 00000000000a0000 (reserved) > > (XEN) 00000000000f0000 - 0000000000100000 (reserved) > > (XEN) 0000000000100000 - 00000000cfd43000 (usable) > > (XEN) 00000000cfd43000 - 00000000cfd4c000 (ACPI data) > > (XEN) 00000000cfd4c000 - 00000000cfd4d000 (usable) > > (XEN) 00000000cfd4d000 - 00000000d0000000 (reserved) > > (XEN) 00000000e0000000 - 00000000f0000000 (reserved) > > (XEN) 00000000fec00000 - 00000000fed00000 (reserved) > > (XEN) 00000000fee00000 - 00000000fee10000 (reserved) > > (XEN) 00000000ffc00000 - 0000000100000000 (reserved) > > (XEN) 0000000100000000 - 000000102ffff000 (usable) > > (XEN) ACPI: RSDP 000F4F20, 0024 (r2 HP ) > > (XEN) ACPI: XSDT CFD43900, 007C (r1 HP ProLiant 2 162E) > > (XEN) ACPI: FACP CFD439C0, 00F4 (r3 HP ProLiant 2 162E) > > (XEN) ACPI: DSDT CFD43AC0, 30C9 (r1 HP DSDT 1 INTL 20030228) > > (XEN) ACPI: FACS CFD43100, 0040 > > (XEN) ACPI: SPCR CFD43140, 0050 (r1 HP SPCRRBSU 1 162E) > > (XEN) ACPI: MCFG CFD431C0, 003C (r1 HP ProLiant 1 0) > > (XEN) ACPI: HPET CFD43200, 0038 (r1 HP ProLiant 2 162E) > > (XEN) ACPI: FFFF CFD43240, 0064 (r2 HP P61 2 162E) > > (XEN) ACPI: SPMI CFD432C0, 0040 (r5 HP ProLiant 1 162E) > > (XEN) ACPI: ERST CFD43300, 01D0 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: APIC CFD43500, 0176 (r1 HP ProLiant 2 0) > > (XEN) ACPI: FFFF CFD43680, 0176 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: BERT CFD43800, 0030 (r1 HP ProLiant 1 162E) > > (XEN) ACPI: HEST CFD43840, 00BC (r1 HP ProLiant 1 162E) > > (XEN) System RAM: 65532MB (67105672kB) > > (XEN) Domain heap initialised > > (XEN) Processor #0 6:15 APIC version 20 > > (XEN) Processor #8 6:15 APIC version 20 > > (XEN) Processor #16 6:15 APIC version 20 > > (XEN) Processor #24 6:15 APIC version 20 > > (XEN) Processor #1 6:15 APIC version 20 > > (XEN) Processor #9 6:15 APIC version 20 > > (XEN) Processor #17 6:15 APIC version 20 > > (XEN) Processor #25 6:15 APIC version 20 > > (XEN) Processor #2 6:15 APIC version 20 > > (XEN) Processor #10 6:15 APIC version 20 > > (XEN) Processor #18 6:15 APIC version 20 > > (XEN) Processor #26 6:15 APIC version 20 > > (XEN) Processor #3 6:15 APIC version 20 > > (XEN) Processor #11 6:15 APIC version 20 > > (XEN) Processor #19 6:15 APIC version 20 > > (XEN) Processor #27 6:15 APIC version 20 > > (XEN) IOAPIC[0]: apic_id 1, version 32, address 0xfec00000, GSI 0-23 > > (XEN) IOAPIC[1]: apic_id 2, version 32, address 0xfec80000, GSI 24-47 > > (XEN) IOAPIC[2]: apic_id 3, version 32, address 0xfec81000, GSI 48-71 > > (XEN) IOAPIC[3]: apic_id 4, version 32, address 0xfec81800, GSI 72-95 > > (XEN) Enabling APIC mode: Phys. Using 4 I/O APICs > > (XEN) Using scheduler: SMP Credit Scheduler (credit) > > (XEN) Detected 2400.128 MHz processor. > > (XEN) Initing memory sharing. > > (XEN) VMX: Supported advanced features: > > (XEN) - APIC MMIO access virtualisation > > (XEN) - APIC TPR shadow > > (XEN) - Virtual NMI > > (XEN) - MSR direct-access bitmap > > (XEN) HVM: ASIDs disabled. > > (XEN) HVM: VMX enabled > > (XEN) I/O virtualisation disabled > > (XEN) Total of 16 processors activated. > > (XEN) ENABLING IO-APIC IRQs > > (XEN) -> Using new ACK method > > (XEN) checking TSC synchronization across 16 CPUs: > > (XEN) CPU#14 had 3 usecs TSC skew, fixed it up. > > (XEN) Platform timer is 14.318MHz HPET > > (XEN) Allocated console ring of 32 KiB. > > (XEN) Brought up 16 CPUs > > (XEN) *** LOADING DOMAIN 0 *** > > (XEN) Xen kernel: 64-bit, lsb, compat32 > > (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x1708000 > > (XEN) PHYSICAL MEMORY ARRANGEMENT: > > (XEN) Dom0 alloc.: 000000083c000000->0000000840000000 (770048 pages > > to be allocated) > > (XEN) VIRTUAL MEMORY ARRANGEMENT: > > (XEN) Loaded kernel: ffffffff81000000->ffffffff81708000 > > (XEN) Init. ramdisk: ffffffff81708000->ffffffff81efb000 > > (XEN) Phys-Mach map: ffffffff81efb000->ffffffff824fb000 > > (XEN) Start info: ffffffff824fb000->ffffffff824fb4b4 > > (XEN) Page tables: ffffffff824fc000->ffffffff82513000 > > (XEN) Boot stack: ffffffff82513000->ffffffff82514000 > > (XEN) TOTAL: ffffffff80000000->ffffffff82800000 > > (XEN) ENTRY ADDRESS: ffffffff81531200 > > (XEN) Dom0 has maximum 16 VCPUs > > (XEN) Scrubbing Free RAM: > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ..................................................................................................................... > > ................................done. > > (XEN) Xen trace buffers: disabled > > (XEN) Std. Loglevel: Errors and warnings > > (XEN) Guest Loglevel: Errors and warnings > > (XEN) Xen is relinquishing VGA console. > > (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to > > Xen) > > (XEN) Freed 176kB init memory. > > (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > > now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > tsc_stamp=e3839fcb0273 > > > > > > > > > > > -----Original Message----- > > From: xen-devel-bounces@lists.xen.org [mailto:xen-devel- > > bounces@lists.xen.org] On Behalf Of Ian Campbell > > Sent: Friday, October 26, 2012 3:00 PM > > To: xen-devel@lists.xen.org > > Cc: 599161@bugs.debian.org > > Subject: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > > minutes" bug. > > > > Hi all, > > > > I've BCC'd a number of people who have reported seeing this bug at various > > times in the past. > > > > If you can still repro I'd appreciate it if you could give the patch in > > http://marc.info/?l=xen-devel&m=135049062216685&w=2 (also attached) a > > go and report back success/failure and the output of the debugging > > messages produced. > > > > Thanks, > > Ian. > > > > -- > > Ian Campbell > > Current Noise: Death - Evil Dead > > > > Executive ability is prominent in your make-up. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:45:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5wC-0002yv-Hf; Wed, 07 Nov 2012 13:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5wA-0002yq-K4 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 13:44:58 +0000 Received: from [193.109.254.147:49438] by server-6.bemta-14.messagelabs.com id 47/68-08829-9D56A905; Wed, 07 Nov 2012 13:44:57 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352295895!8800336!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9741 invoked from network); 7 Nov 2012 13:44:57 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 13:44:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="213727938" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 13:44:55 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 08:44:55 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW5w6-0001Zs-Lh; Wed, 07 Nov 2012 13:44:54 +0000 Message-ID: <509A65D6.6050505@citrix.com> Date: Wed, 7 Nov 2012 13:44:54 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Dan Magenheimer References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> In-Reply-To: <721bf725-662f-41cb-a1a3-7c908e05c188@default> X-Enigmail-Version: 1.4.5 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/12 23:41, Dan Magenheimer wrote: >> From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] >> Sent: Tuesday, November 06, 2012 4:19 PM >> To: xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] reliable live migration of large and busy guests >> >> As potential food for thought: >> >> Is there wisdom in having a new kind of live migrate which, when pausing >> the VM on the source host, resumes the VM on the destination host. Xen >> would have to track not-yet-sent pages and pause the guest on pagefault, >> and request the required page as a matter of priority. >> >> The advantages of this approach would be that a timing sensitive >> workloads would be paused for far less time. Even if it was frequently >> being paused for pagefaults, the time to get a single page over the LAN >> would be far quicker than the entire dirty set, at which point on >> resume, the interrupt paths would fire again; The timing paths would >> quickly become fully populated. Further to that, a busy workload in the >> guest dirtying a page which has already been sent will not result in any >> further network traffic. > Something like this? > > http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 Oh wow - something quite like that. Thankyou very much. I will read the paper in full when I get a free moment, but the abstract looks very interesting. >From an idealistic point of view, it might be quite nice to have several live migrate mechanisms, so the user can choose whether they value minimum downtime, minimum network utilisation, or maximum safety. -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 13:45:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 13:45:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5wC-0002yv-Hf; Wed, 07 Nov 2012 13:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW5wA-0002yq-K4 for xen-devel@lists.xen.org; Wed, 07 Nov 2012 13:44:58 +0000 Received: from [193.109.254.147:49438] by server-6.bemta-14.messagelabs.com id 47/68-08829-9D56A905; Wed, 07 Nov 2012 13:44:57 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352295895!8800336!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9741 invoked from network); 7 Nov 2012 13:44:57 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 13:44:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="213727938" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 13:44:55 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 08:44:55 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW5w6-0001Zs-Lh; Wed, 07 Nov 2012 13:44:54 +0000 Message-ID: <509A65D6.6050505@citrix.com> Date: Wed, 7 Nov 2012 13:44:54 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Dan Magenheimer References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> In-Reply-To: <721bf725-662f-41cb-a1a3-7c908e05c188@default> X-Enigmail-Version: 1.4.5 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 06/11/12 23:41, Dan Magenheimer wrote: >> From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] >> Sent: Tuesday, November 06, 2012 4:19 PM >> To: xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] reliable live migration of large and busy guests >> >> As potential food for thought: >> >> Is there wisdom in having a new kind of live migrate which, when pausing >> the VM on the source host, resumes the VM on the destination host. Xen >> would have to track not-yet-sent pages and pause the guest on pagefault, >> and request the required page as a matter of priority. >> >> The advantages of this approach would be that a timing sensitive >> workloads would be paused for far less time. Even if it was frequently >> being paused for pagefaults, the time to get a single page over the LAN >> would be far quicker than the entire dirty set, at which point on >> resume, the interrupt paths would fire again; The timing paths would >> quickly become fully populated. Further to that, a busy workload in the >> guest dirtying a page which has already been sent will not result in any >> further network traffic. > Something like this? > > http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 Oh wow - something quite like that. Thankyou very much. I will read the paper in full when I get a free moment, but the abstract looks very interesting. >From an idealistic point of view, it might be quite nice to have several live migrate mechanisms, so the user can choose whether they value minimum downtime, minimum network utilisation, or maximum safety. -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:06:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:06:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Gz-0003JA-KY; Wed, 07 Nov 2012 14:06:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Gy-0003J5-Fs for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:06:28 +0000 Received: from [85.158.138.51:38864] by server-14.bemta-3.messagelabs.com id 1A/F3-12788-3EA6A905; Wed, 07 Nov 2012 14:06:27 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-15.tower-174.messagelabs.com!1352297184!27175980!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27816 invoked from network); 7 Nov 2012 14:06:26 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-15.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:06:26 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156766539; Wed, 07 Nov 2012 09:05:26 -0500 Message-ID: <509A6AA6.2000208@jhuapl.edu> Date: Wed, 07 Nov 2012 09:05:26 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> In-Reply-To: <20121106193921.GC28473@phenom.dumpdata.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1318582037495756032==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============1318582037495756032== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090304070505020605000709" This is a cryptographically signed message in MIME format. --------------ms090304070505020605000709 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. > So how does on test it ? Set it up? Use it? Is there some documentation= > about it - if so it should be in the patch description. Thats actually a question I had. To use this driver now you have to use=20 my vtpm mini-os domains which are currently being evaluated in the=20 xen-devel mailing list. Once they are accepted I will submit a=20 documentation update to the Xen tree. Whats the best practice for documentation in this case? All in xen? Some = linux/some xen? If the latter, how much goes in linux and where? > > I did a very very cursory look at it, see some of the comments. > >> >> + >> + >> +static inline struct transmission *transmission_alloc(void) >> +{ >> + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); >> +} >> + >> + static unsigned char * > > That is very weird tabbing? Did you run this patch through > scripts/checkpatch.pl ? Wow thats ugly. I ran the check script and it looks like it didn't pick=20 this up. For some reason my editor wants to autoindent like that. Fixed. > >> + >> +static const struct file_operations vtpm_ops =3D { >> + .owner =3D THIS_MODULE, >> + .llseek =3D no_llseek, >> + .open =3D tpm_open, >> + .read =3D tpm_read, >> + .write =3D tpm_write, >> + .release =3D tpm_release, >> +}; >> + >> +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); >> +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); >> +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); >> +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); >> +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); >> +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivat= ed, >> + NULL); >> +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); >> +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel)= ; >> + >> +static struct attribute *vtpm_attrs[] =3D { >> + &dev_attr_pubek.attr, >> + &dev_attr_pcrs.attr, >> + &dev_attr_enabled.attr, >> + &dev_attr_active.attr, >> + &dev_attr_owned.attr, >> + &dev_attr_temp_deactivated.attr, >> + &dev_attr_caps.attr, >> + &dev_attr_cancel.attr, >> + NULL, > So are these going to show up in SysFS? If so, there should also be > a corresponding file in Documentation/.../sysfs/something. These are similar to the entries made by the other tpm drivers. I don't=20 see any documentation about those either. TPM maintainers, any guidance=20 there? > >> +#include "tpm.h" >> +#include "tpm_vtpm.h" >> + >> +#undef DEBUG >> + >> +#define GRANT_INVALID_REF 0 > Interesting. The 0 grant value is actually a valid one. I think you > want (-1ULL). Is it? drivers/block/xen-blkfront.c and drivers/net/xen-netfront.c do the exact same thing >> + >> + init_tpm_xenbus(); >> + return 0; >> +} >> + >> + >> +module_init(tpmif_init); > no module_exit? Will fix --------------ms090304070505020605000709 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNzE0MDUyNlowIwYJKoZIhvcNAQkEMRYEFHdMkvadKJyn6YMR x0DY9ptWYUDMMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYBNC0Nqasgx9YOHcyVfJpp3/MvXowpiPeXf hVU22sUXmVAv0NLbdXWcjnrPyg/jgK2SyoPhTanMCEswHJ+0zNWnaF2mt0PM79pVu3iW8bxW ETHXLDbhHYn4VTYlP5g5ogMhhpFXqGwWSpbuNAoH6C5ITckRbv9Tew+v2PCrMIQ7QAAAAAAA AA== --------------ms090304070505020605000709-- --===============1318582037495756032== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1318582037495756032==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 14:06:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:06:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Gz-0003JA-KY; Wed, 07 Nov 2012 14:06:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Gy-0003J5-Fs for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:06:28 +0000 Received: from [85.158.138.51:38864] by server-14.bemta-3.messagelabs.com id 1A/F3-12788-3EA6A905; Wed, 07 Nov 2012 14:06:27 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-15.tower-174.messagelabs.com!1352297184!27175980!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27816 invoked from network); 7 Nov 2012 14:06:26 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-15.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:06:26 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156766539; Wed, 07 Nov 2012 09:05:26 -0500 Message-ID: <509A6AA6.2000208@jhuapl.edu> Date: Wed, 07 Nov 2012 09:05:26 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> In-Reply-To: <20121106193921.GC28473@phenom.dumpdata.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1318582037495756032==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============1318582037495756032== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090304070505020605000709" This is a cryptographically signed message in MIME format. --------------ms090304070505020605000709 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. > So how does on test it ? Set it up? Use it? Is there some documentation= > about it - if so it should be in the patch description. Thats actually a question I had. To use this driver now you have to use=20 my vtpm mini-os domains which are currently being evaluated in the=20 xen-devel mailing list. Once they are accepted I will submit a=20 documentation update to the Xen tree. Whats the best practice for documentation in this case? All in xen? Some = linux/some xen? If the latter, how much goes in linux and where? > > I did a very very cursory look at it, see some of the comments. > >> >> + >> + >> +static inline struct transmission *transmission_alloc(void) >> +{ >> + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); >> +} >> + >> + static unsigned char * > > That is very weird tabbing? Did you run this patch through > scripts/checkpatch.pl ? Wow thats ugly. I ran the check script and it looks like it didn't pick=20 this up. For some reason my editor wants to autoindent like that. Fixed. > >> + >> +static const struct file_operations vtpm_ops =3D { >> + .owner =3D THIS_MODULE, >> + .llseek =3D no_llseek, >> + .open =3D tpm_open, >> + .read =3D tpm_read, >> + .write =3D tpm_write, >> + .release =3D tpm_release, >> +}; >> + >> +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); >> +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); >> +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); >> +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); >> +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); >> +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivat= ed, >> + NULL); >> +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); >> +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel)= ; >> + >> +static struct attribute *vtpm_attrs[] =3D { >> + &dev_attr_pubek.attr, >> + &dev_attr_pcrs.attr, >> + &dev_attr_enabled.attr, >> + &dev_attr_active.attr, >> + &dev_attr_owned.attr, >> + &dev_attr_temp_deactivated.attr, >> + &dev_attr_caps.attr, >> + &dev_attr_cancel.attr, >> + NULL, > So are these going to show up in SysFS? If so, there should also be > a corresponding file in Documentation/.../sysfs/something. These are similar to the entries made by the other tpm drivers. I don't=20 see any documentation about those either. TPM maintainers, any guidance=20 there? > >> +#include "tpm.h" >> +#include "tpm_vtpm.h" >> + >> +#undef DEBUG >> + >> +#define GRANT_INVALID_REF 0 > Interesting. The 0 grant value is actually a valid one. I think you > want (-1ULL). Is it? drivers/block/xen-blkfront.c and drivers/net/xen-netfront.c do the exact same thing >> + >> + init_tpm_xenbus(); >> + return 0; >> +} >> + >> + >> +module_init(tpmif_init); > no module_exit? Will fix --------------ms090304070505020605000709 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNzE0MDUyNlowIwYJKoZIhvcNAQkEMRYEFHdMkvadKJyn6YMR x0DY9ptWYUDMMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYBNC0Nqasgx9YOHcyVfJpp3/MvXowpiPeXf hVU22sUXmVAv0NLbdXWcjnrPyg/jgK2SyoPhTanMCEswHJ+0zNWnaF2mt0PM79pVu3iW8bxW ETHXLDbhHYn4VTYlP5g5ogMhhpFXqGwWSpbuNAoH6C5ITckRbv9Tew+v2PCrMIQ7QAAAAAAA AA== --------------ms090304070505020605000709-- --===============1318582037495756032== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1318582037495756032==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 14:14:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:14:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Oo-0003Uu-P4; Wed, 07 Nov 2012 14:14:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6On-0003Up-GQ for xen-devel@lists.xen.org; Wed, 07 Nov 2012 14:14:33 +0000 Received: from [193.109.254.147:36224] by server-1.bemta-14.messagelabs.com id D0/05-25314-8CC6A905; Wed, 07 Nov 2012 14:14:32 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-13.tower-27.messagelabs.com!1352297585!9948324!1 X-Originating-IP: [81.169.146.178] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTE2Mw==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19168 invoked from network); 7 Nov 2012 14:13:06 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.178) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:13:06 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV67U= Received: from probook.site (ip-80-226-24-1.vodafone-net.de [80.226.24.1]) by smtp.strato.de (joses mo48) (RZmta 31.1 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id R0100eoA7D23HT ; Wed, 7 Nov 2012 15:13:04 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7BCDB189BB; Wed, 7 Nov 2012 15:13:02 +0100 (CET) Date: Wed, 7 Nov 2012 15:13:02 +0100 From: Olaf Hering To: Andrew Cooper Message-ID: <20121107141302.GA24950@aepfle.de> References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50999ACF.4040106@citrix.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, Andrew Cooper wrote: > Is there wisdom in having a new kind of live migrate which, when pausing > the VM on the source host, resumes the VM on the destination host. Xen > would have to track not-yet-sent pages and pause the guest on pagefault, > and request the required page as a matter of priority. On the receiving side all missing pages could be handled as "paged" (just nominating a missing pfn should be enough). A pager can then request them from the sender host. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:14:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:14:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Oo-0003Uu-P4; Wed, 07 Nov 2012 14:14:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6On-0003Up-GQ for xen-devel@lists.xen.org; Wed, 07 Nov 2012 14:14:33 +0000 Received: from [193.109.254.147:36224] by server-1.bemta-14.messagelabs.com id D0/05-25314-8CC6A905; Wed, 07 Nov 2012 14:14:32 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-13.tower-27.messagelabs.com!1352297585!9948324!1 X-Originating-IP: [81.169.146.178] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTE2Mw==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19168 invoked from network); 7 Nov 2012 14:13:06 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.178) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:13:06 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV67U= Received: from probook.site (ip-80-226-24-1.vodafone-net.de [80.226.24.1]) by smtp.strato.de (joses mo48) (RZmta 31.1 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id R0100eoA7D23HT ; Wed, 7 Nov 2012 15:13:04 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 7BCDB189BB; Wed, 7 Nov 2012 15:13:02 +0100 (CET) Date: Wed, 7 Nov 2012 15:13:02 +0100 From: Olaf Hering To: Andrew Cooper Message-ID: <20121107141302.GA24950@aepfle.de> References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50999ACF.4040106@citrix.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 06, Andrew Cooper wrote: > Is there wisdom in having a new kind of live migrate which, when pausing > the VM on the source host, resumes the VM on the destination host. Xen > would have to track not-yet-sent pages and pause the guest on pagefault, > and request the required page as a matter of priority. On the receiving side all missing pages could be handled as "paged" (just nominating a missing pfn should be enough). A pager can then request them from the sender host. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:25:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:25:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Z9-0003l2-2E; Wed, 07 Nov 2012 14:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Z6-0003ku-Nv for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:25:13 +0000 Received: from [85.158.138.51:64404] by server-9.bemta-3.messagelabs.com id C0/86-02388-74F6A905; Wed, 07 Nov 2012 14:25:11 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352298309!21053628!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5NjA5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5094 invoked from network); 7 Nov 2012 14:25:10 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-6.tower-174.messagelabs.com with SMTP; 7 Nov 2012 14:25:10 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 07 Nov 2012 06:25:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="238543678" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by orsmga002.jf.intel.com with ESMTP; 07 Nov 2012 06:25:07 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.19.17.7) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 06:25:07 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX153.amr.corp.intel.com (10.19.17.7) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 06:25:06 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 22:25:05 +0800 From: "Liu, Jinsong" To: Ian Campbell Thread-Topic: [Xen-devel] [PATCH] Handle broken page with regard to migration Thread-Index: AQHNvLm5wo0CS0uWQ02/ywhb/M0oqpfebPDw Date: Wed, 7 Nov 2012 14:25:04 +0000 Message-ID: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> <1352273413.12977.27.camel@hastur.hellion.org.uk> In-Reply-To: <1352273413.12977.27.camel@hastur.hellion.org.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ian Campbell wrote: >> At the target >> it would set p2m as p2m_ram_broken for broken page, so that if >> guest access the broken page again, it would kill itself as >> expected.=20 >=20 > Can you add a few words here about why this is preferable to just > ignoring the issue and populating a regular page non-broken page on > the target? I think I know why but it would be useful to be explicit > in the changelog. >=20 > I also spotted a typo: >> + * vMCE occur during migration + =20 >> * + * At sender, it marks broken page to dirty >> bitmap, + * so that at copypages stage of >> migration, brokan=20 >=20 > =20 > broken=20 >=20 > Ian. OK, add some comments and correct typo. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Handle broken page with regard to migration Generally, there are 2 cases: 1. broken page occurs before migration 2. broken page occurs during migration At the sender For case 1, the broken page would be mapped but not copied to target (otherwise it may trigger more serious error, say, SRAR error). While its pfn_type and pfn number would be transferred to target so that target take appropriate action. For case 2, mce handler marks the broken page to dirty bitmap, so that at copypages stage of migration, its pfn_type and pfn number would be transferred to target and then take appropriate action. At the target When migration target would populate pages for guest. As for the case of broken page wrt migration, we prefer keep the corresponding page, for the sake of seamless migration. At target it would set p2m as p2m_ram_broken for broken page. Guest MCE may have good chance to handle its broken page, while if guest access the broken page again it would kill itself as expected. Suggested-by: George Dunlap Signed-off-by: Liu, Jinsong diff -r d675797494bd tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain.c Thu Nov 08 05:07:20 2012 +0800 @@ -283,6 +283,22 @@ return ret; } =20 +/* set broken page p2m */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn) +{ + int ret; + DECLARE_DOMCTL; + + domctl.cmd =3D XEN_DOMCTL_set_broken_page_p2m; + domctl.domain =3D (domid_t)domid; + domctl.u.set_broken_page_p2m.pfn =3D pfn; + ret =3D do_domctl(xch, &domctl); + + return ret ? -1 : 0; +} + /* get info from hvm guest for save */ int xc_domain_hvm_getcontext(xc_interface *xch, uint32_t domid, diff -r d675797494bd tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_restore.c Thu Nov 08 05:07:20 2012 +0800 @@ -962,9 +962,15 @@ =20 countpages =3D count; for (i =3D oldcount; i < buf->nr_pages; ++i) - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) =3D=3D XEN_D= OMCTL_PFINFO_XTAB - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) =3D=3D XEN= _DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; + + pagetype =3D buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; + if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_XTAB || + pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN || + pagetype =3D=3D XEN_DOMCTL_PFINFO_XALLOC ) --countpages; + } =20 if (!countpages) return count; @@ -1200,6 +1206,17 @@ /* a bogus/unmapped/allocate-only page: skip it */ continue; =20 + if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN ) + { + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + { + ERROR("Set p2m for broken page failed, " + "dom=3D%d, pfn=3D%lx\n", dom, pfn); + goto err_mapped; + } + continue; + } + if (pfn_err[i]) { ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_= mfn %lx", diff -r d675797494bd tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_save.c Thu Nov 08 05:07:20 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) gmfn =3D pfn_to_mfn(gmfn); =20 + if ( pfn_type[j] =3D=3D XEN_DOMCTL_PFINFO_BROKEN ) + { + pfn_type[j] |=3D pfn_batch[j]; + ++run; + continue; + } + if ( pfn_err[j] ) { if ( pfn_type[j] =3D=3D XEN_DOMCTL_PFINFO_XTAB ) @@ -1371,8 +1378,12 @@ } } =20 - /* skip pages that aren't present or are alloc-only */ + /* + * skip pages that aren't present, + * or are broken, or are alloc-only + */ if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_XTAB + || pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN || pagetype =3D=3D XEN_DOMCTL_PFINFO_XALLOC ) continue; =20 diff -r d675797494bd tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xenctrl.h Thu Nov 08 05:07:20 2012 +0800 @@ -575,6 +575,17 @@ xc_domaininfo_t *info); =20 /** + * This function set p2m for broken page + * &parm xch a handle to an open hypervisor interface + * @parm domid the domain id which broken page belong to + * @parm pfn the pfn number of the broken page + * @return 0 on success, -1 on failure + */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn); + +/** * This function returns information about the context of a hvm domain * @parm xch a handle to an open hypervisor interface * @parm domid the domain to get information from diff -r d675797494bd xen/arch/x86/cpu/mcheck/mcaction.c --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Thu Nov 08 05:07:20 2012 +0800 @@ -1,5 +1,6 @@ #include #include +#include #include "mcaction.h" #include "vmce.h" #include "mce.h" @@ -91,6 +92,24 @@ goto vmce_failed; } =20 + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && + paging_mode_log_dirty(d) ) + { + /* + * vMCE occur during migration + * + * At sender, it marks broken page to dirty bitmap, + * so that at copypages stage of migration, broken + * page's pfn_type and pfn number would be transferr= ed + * to target and then take appropriate action. + * + * At target, it would set p2m as p2m_ram_broken for + * broken page, so that if guest access the broken p= age + * again, it would kill itself as expected. + */ + paging_mark_dirty(d, mfn); + } + if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) { printk("Unmap broken memory %lx for DOM%d failed\n", diff -r d675797494bd xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/domctl.c Thu Nov 08 05:07:20 2012 +0800 @@ -209,12 +209,18 @@ for ( j =3D 0; j < k; j++ ) { unsigned long type =3D 0; + p2m_type_t t; =20 - page =3D get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC)= ; + page =3D get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); =20 if ( unlikely(!page) || unlikely(is_xen_heap_page(page)) ) - type =3D XEN_DOMCTL_PFINFO_XTAB; + { + if ( p2m_is_broken(t) ) + type =3D XEN_DOMCTL_PFINFO_BROKEN; + else + type =3D XEN_DOMCTL_PFINFO_XTAB; + } else { switch( page->u.inuse.type_info & PGT_type_mask ) @@ -235,6 +241,9 @@ =20 if ( page->u.inuse.type_info & PGT_pinned ) type |=3D XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type =3D XEN_DOMCTL_PFINFO_BROKEN; } =20 if ( page ) @@ -1568,6 +1577,29 @@ } break; =20 + case XEN_DOMCTL_set_broken_page_p2m: + { + struct domain *d; + =20 + d =3D rcu_lock_domain_by_id(domctl->domain); + if ( d !=3D NULL ) + { + p2m_type_t pt; + unsigned long pfn =3D domctl->u.set_broken_page_p2m.pfn; + mfn_t mfn =3D get_gfn_query(d, pfn, &pt); + + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || + (p2m_change_type(d, pfn, pt, p2m_ram_broken) !=3D= pt)) ) + ret =3D -EINVAL; + + put_gfn(d, pfn); + rcu_unlock_domain(d); + } + else + ret =3D -ESRCH; + } + break; + default: ret =3D iommu_do_domctl(domctl, u_domctl); break; diff -r d675797494bd xen/include/public/domctl.h --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/include/public/domctl.h Thu Nov 08 05:07:20 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) =20 @@ -835,6 +836,12 @@ typedef struct xen_domctl_set_access_required xen_domctl_set_access_requir= ed_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); =20 +struct xen_domctl_set_broken_page_p2m { + uint64_aligned_t pfn; +}; +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p= 2m_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -900,6 +907,7 @@ #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 #define XEN_DOMCTL_set_virq_handler 66 +#define XEN_DOMCTL_set_broken_page_p2m 67 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128];= --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="handle_broken_page_wrt_migration.patch" Content-Description: handle_broken_page_wrt_migration.patch Content-Disposition: attachment; filename="handle_broken_page_wrt_migration.patch"; size=10643; creation-date="Wed, 07 Nov 2012 14:20:54 GMT"; modification-date="Wed, 07 Nov 2012 22:09:14 GMT" Content-Transfer-Encoding: base64 SGFuZGxlIGJyb2tlbiBwYWdlIHdpdGggcmVnYXJkIHRvIG1pZ3JhdGlvbgoKR2VuZXJhbGx5LCB0 aGVyZSBhcmUgMiBjYXNlczoKMS4gYnJva2VuIHBhZ2Ugb2NjdXJzIGJlZm9yZSBtaWdyYXRpb24K Mi4gYnJva2VuIHBhZ2Ugb2NjdXJzIGR1cmluZyBtaWdyYXRpb24KCkF0IHRoZSBzZW5kZXIKICBG b3IgY2FzZSAxLCB0aGUgYnJva2VuIHBhZ2Ugd291bGQgYmUgbWFwcGVkIGJ1dCBub3QgY29waWVk IHRvIHRhcmdldAogIChvdGhlcndpc2UgaXQgbWF5IHRyaWdnZXIgbW9yZSBzZXJpb3VzIGVycm9y LCBzYXksIFNSQVIgZXJyb3IpLgogIFdoaWxlIGl0cyBwZm5fdHlwZSBhbmQgcGZuIG51bWJlciB3 b3VsZCBiZSB0cmFuc2ZlcnJlZCB0byB0YXJnZXQKICBzbyB0aGF0IHRhcmdldCB0YWtlIGFwcHJv cHJpYXRlIGFjdGlvbi4KCiAgRm9yIGNhc2UgMiwgbWNlIGhhbmRsZXIgbWFya3MgdGhlIGJyb2tl biBwYWdlIHRvIGRpcnR5IGJpdG1hcCwgc28gdGhhdAogIGF0IGNvcHlwYWdlcyBzdGFnZSBvZiBt aWdyYXRpb24sIGl0cyBwZm5fdHlwZSBhbmQgcGZuIG51bWJlciB3b3VsZCBiZQogIHRyYW5zZmVy cmVkIHRvIHRhcmdldCBhbmQgdGhlbiB0YWtlIGFwcHJvcHJpYXRlIGFjdGlvbi4KCkF0IHRoZSB0 YXJnZXQKICBXaGVuIG1pZ3JhdGlvbiB0YXJnZXQgd291bGQgcG9wdWxhdGUgcGFnZXMgZm9yIGd1 ZXN0LiBBcyBmb3IgdGhlIGNhc2UKICBvZiBicm9rZW4gcGFnZSB3cnQgbWlncmF0aW9uLCB3ZSBw cmVmZXIga2VlcCB0aGUgY29ycmVzcG9uZGluZyBwYWdlLAogIGZvciB0aGUgc2FrZSBvZiBzZWFt bGVzcyBtaWdyYXRpb24uCgogIEF0IHRhcmdldCBpdCB3b3VsZCBzZXQgcDJtIGFzIHAybV9yYW1f YnJva2VuIGZvciBicm9rZW4gcGFnZS4gR3Vlc3QgTUNFCiAgbWF5IGhhdmUgZ29vZCBjaGFuY2Ug dG8gaGFuZGxlIGl0cyBicm9rZW4gcGFnZSwgd2hpbGUgaWYgZ3Vlc3QgYWNjZXNzCiAgdGhlIGJy b2tlbiBwYWdlIGFnYWluIGl0IHdvdWxkIGtpbGwgaXRzZWxmIGFzIGV4cGVjdGVkLgoKU3VnZ2Vz dGVkLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+ClNpZ25l ZC1vZmYtYnk6IExpdSwgSmluc29uZyA8amluc29uZy5saXVAaW50ZWwuY29tPgoKZGlmZiAtciBk Njc1Nzk3NDk0YmQgdG9vbHMvbGlieGMveGNfZG9tYWluLmMKLS0tIGEvdG9vbHMvbGlieGMveGNf ZG9tYWluLmMJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICswODAwCisrKyBiL3Rvb2xzL2xpYnhj L3hjX2RvbWFpbi5jCVRodSBOb3YgMDggMDU6MDc6MjAgMjAxMiArMDgwMApAQCAtMjgzLDYgKzI4 MywyMiBAQAogICAgIHJldHVybiByZXQ7CiB9CiAKKy8qIHNldCBicm9rZW4gcGFnZSBwMm0gKi8K K2ludCB4Y19zZXRfYnJva2VuX3BhZ2VfcDJtKHhjX2ludGVyZmFjZSAqeGNoLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICB1bnNpZ25lZCBsb25nIHBmbikKK3sKKyAgICBpbnQgcmV0OworICAgIERFQ0xBUkVfRE9N Q1RMOworCisgICAgZG9tY3RsLmNtZCA9IFhFTl9ET01DVExfc2V0X2Jyb2tlbl9wYWdlX3AybTsK KyAgICBkb21jdGwuZG9tYWluID0gKGRvbWlkX3QpZG9taWQ7CisgICAgZG9tY3RsLnUuc2V0X2Jy b2tlbl9wYWdlX3AybS5wZm4gPSBwZm47CisgICAgcmV0ID0gZG9fZG9tY3RsKHhjaCwgJmRvbWN0 bCk7CisKKyAgICByZXR1cm4gcmV0ID8gLTEgOiAwOworfQorCiAvKiBnZXQgaW5mbyBmcm9tIGh2 bSBndWVzdCBmb3Igc2F2ZSAqLwogaW50IHhjX2RvbWFpbl9odm1fZ2V0Y29udGV4dCh4Y19pbnRl cmZhY2UgKnhjaCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQs CmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHRvb2xzL2xpYnhjL3hjX2RvbWFpbl9yZXN0b3JlLmMKLS0t IGEvdG9vbHMvbGlieGMveGNfZG9tYWluX3Jlc3RvcmUuYwlGcmkgTm92IDAyIDExOjA4OjM3IDIw MTIgKzA4MDAKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tYWluX3Jlc3RvcmUuYwlUaHUgTm92IDA4 IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTk2Miw5ICs5NjIsMTUgQEAKIAogICAgIGNvdW50cGFn ZXMgPSBjb3VudDsKICAgICBmb3IgKGkgPSBvbGRjb3VudDsgaSA8IGJ1Zi0+bnJfcGFnZXM7ICsr aSkKLSAgICAgICAgaWYgKChidWYtPnBmbl90eXBlc1tpXSAmIFhFTl9ET01DVExfUEZJTkZPX0xU QUJfTUFTSykgPT0gWEVOX0RPTUNUTF9QRklORk9fWFRBQgotICAgICAgICAgICAgfHwoYnVmLT5w Zm5fdHlwZXNbaV0gJiBYRU5fRE9NQ1RMX1BGSU5GT19MVEFCX01BU0spID09IFhFTl9ET01DVExf UEZJTkZPX1hBTExPQykKKyAgICB7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgcGFnZXR5cGU7CisK KyAgICAgICAgcGFnZXR5cGUgPSBidWYtPnBmbl90eXBlc1tpXSAmIFhFTl9ET01DVExfUEZJTkZP X0xUQUJfTUFTSzsKKyAgICAgICAgaWYgKCBwYWdldHlwZSA9PSBYRU5fRE9NQ1RMX1BGSU5GT19Y VEFCIHx8CisgICAgICAgICAgICAgcGFnZXR5cGUgPT0gWEVOX0RPTUNUTF9QRklORk9fQlJPS0VO IHx8CisgICAgICAgICAgICAgcGFnZXR5cGUgPT0gWEVOX0RPTUNUTF9QRklORk9fWEFMTE9DICkK ICAgICAgICAgICAgIC0tY291bnRwYWdlczsKKyAgICB9CiAKICAgICBpZiAoIWNvdW50cGFnZXMp CiAgICAgICAgIHJldHVybiBjb3VudDsKQEAgLTEyMDAsNiArMTIwNiwxNyBAQAogICAgICAgICAg ICAgLyogYSBib2d1cy91bm1hcHBlZC9hbGxvY2F0ZS1vbmx5IHBhZ2U6IHNraXAgaXQgKi8KICAg ICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIGlmICggcGFnZXR5cGUgPT0gWEVOX0RPTUNU TF9QRklORk9fQlJPS0VOICkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCB4Y19zZXRfYnJv a2VuX3BhZ2VfcDJtKHhjaCwgZG9tLCBwZm4pICkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBFUlJPUigiU2V0IHAybSBmb3IgYnJva2VuIHBhZ2UgZmFpbGVkLCAiCisgICAgICAgICAg ICAgICAgICAgICAgImRvbT0lZCwgcGZuPSVseFxuIiwgZG9tLCBwZm4pOworICAgICAgICAgICAg ICAgIGdvdG8gZXJyX21hcHBlZDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICB9CisKICAgICAgICAgaWYgKHBmbl9lcnJbaV0pCiAgICAgICAgIHsKICAgICAg ICAgICAgIEVSUk9SKCJ1bmV4cGVjdGVkIFBGTiBtYXBwaW5nIGZhaWx1cmUgcGZuICVseCBtYXBf bWZuICVseCBwMm1fbWZuICVseCIsCmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHRvb2xzL2xpYnhjL3hj X2RvbWFpbl9zYXZlLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tYWluX3NhdmUuYwlGcmkgTm92 IDAyIDExOjA4OjM3IDIwMTIgKzA4MDAKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tYWluX3NhdmUu YwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTEyNzcsNiArMTI3NywxMyBAQAog ICAgICAgICAgICAgICAgIGlmICggIWh2bSApCiAgICAgICAgICAgICAgICAgICAgIGdtZm4gPSBw Zm5fdG9fbWZuKGdtZm4pOwogCisgICAgICAgICAgICAgICAgaWYgKCBwZm5fdHlwZVtqXSA9PSBY RU5fRE9NQ1RMX1BGSU5GT19CUk9LRU4gKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgcGZuX3R5cGVbal0gfD0gcGZuX2JhdGNoW2pdOworICAgICAgICAgICAgICAgICAg ICArK3J1bjsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg fQorCiAgICAgICAgICAgICAgICAgaWYgKCBwZm5fZXJyW2pdICkKICAgICAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgICAgIGlmICggcGZuX3R5cGVbal0gPT0gWEVOX0RPTUNUTF9QRklO Rk9fWFRBQiApCkBAIC0xMzcxLDggKzEzNzgsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIC8qIHNraXAgcGFnZXMgdGhhdCBh cmVuJ3QgcHJlc2VudCBvciBhcmUgYWxsb2Mtb25seSAqLworICAgICAgICAgICAgICAgIC8qCisg ICAgICAgICAgICAgICAgICogc2tpcCBwYWdlcyB0aGF0IGFyZW4ndCBwcmVzZW50LAorICAgICAg ICAgICAgICAgICAqIG9yIGFyZSBicm9rZW4sIG9yIGFyZSBhbGxvYy1vbmx5CisgICAgICAgICAg ICAgICAgICovCiAgICAgICAgICAgICAgICAgaWYgKCBwYWdldHlwZSA9PSBYRU5fRE9NQ1RMX1BG SU5GT19YVEFCCisgICAgICAgICAgICAgICAgICAgIHx8IHBhZ2V0eXBlID09IFhFTl9ET01DVExf UEZJTkZPX0JST0tFTgogICAgICAgICAgICAgICAgICAgICB8fCBwYWdldHlwZSA9PSBYRU5fRE9N Q1RMX1BGSU5GT19YQUxMT0MgKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApkaWZm IC1yIGQ2NzU3OTc0OTRiZCB0b29scy9saWJ4Yy94ZW5jdHJsLmgKLS0tIGEvdG9vbHMvbGlieGMv eGVuY3RybC5oCUZyaSBOb3YgMDIgMTE6MDg6MzcgMjAxMiArMDgwMAorKysgYi90b29scy9saWJ4 Yy94ZW5jdHJsLmgJVGh1IE5vdiAwOCAwNTowNzoyMCAyMDEyICswODAwCkBAIC01NzUsNiArNTc1 LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjX2RvbWFpbmluZm9fdCAqaW5mbyk7 CiAKIC8qKgorICogVGhpcyBmdW5jdGlvbiBzZXQgcDJtIGZvciBicm9rZW4gcGFnZQorICogJnBh cm0geGNoIGEgaGFuZGxlIHRvIGFuIG9wZW4gaHlwZXJ2aXNvciBpbnRlcmZhY2UKKyAqIEBwYXJt IGRvbWlkIHRoZSBkb21haW4gaWQgd2hpY2ggYnJva2VuIHBhZ2UgYmVsb25nIHRvCisgKiBAcGFy bSBwZm4gdGhlIHBmbiBudW1iZXIgb2YgdGhlIGJyb2tlbiBwYWdlCisgKiBAcmV0dXJuIDAgb24g c3VjY2VzcywgLTEgb24gZmFpbHVyZQorICovCitpbnQgeGNfc2V0X2Jyb2tlbl9wYWdlX3AybSh4 Y19pbnRlcmZhY2UgKnhjaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRv bWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBwZm4pOworCisv KioKICAqIFRoaXMgZnVuY3Rpb24gcmV0dXJucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgY29udGV4 dCBvZiBhIGh2bSBkb21haW4KICAqIEBwYXJtIHhjaCBhIGhhbmRsZSB0byBhbiBvcGVuIGh5cGVy dmlzb3IgaW50ZXJmYWNlCiAgKiBAcGFybSBkb21pZCB0aGUgZG9tYWluIHRvIGdldCBpbmZvcm1h dGlvbiBmcm9tCmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHhlbi9hcmNoL3g4Ni9jcHUvbWNoZWNrL21j YWN0aW9uLmMKLS0tIGEveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svbWNhY3Rpb24uYwlGcmkgTm92 IDAyIDExOjA4OjM3IDIwMTIgKzA4MDAKKysrIGIveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svbWNh Y3Rpb24uYwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTEsNSArMSw2IEBACiAj aW5jbHVkZSA8eGVuL3R5cGVzLmg+CiAjaW5jbHVkZSA8eGVuL3NjaGVkLmg+CisjaW5jbHVkZSA8 YXNtL3AybS5oPgogI2luY2x1ZGUgIm1jYWN0aW9uLmgiCiAjaW5jbHVkZSAidm1jZS5oIgogI2lu Y2x1ZGUgIm1jZS5oIgpAQCAtOTEsNiArOTIsMjQgQEAKICAgICAgICAgICAgICAgICAgICAgZ290 byB2bWNlX2ZhaWxlZDsKICAgICAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICAgICBpZiAo IGlzX2h2bV9kb21haW4oZCkgJiYgIWQtPmFyY2guaHZtX2RvbWFpbi5kaXJ0eV92cmFtICYmCisg ICAgICAgICAgICAgICAgICAgICBwYWdpbmdfbW9kZV9sb2dfZGlydHkoZCkgKQorICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAgICAgICAgICog dk1DRSBvY2N1ciBkdXJpbmcgbWlncmF0aW9uCisgICAgICAgICAgICAgICAgICAgICAqCisgICAg ICAgICAgICAgICAgICAgICAqICAgQXQgc2VuZGVyLCBpdCBtYXJrcyBicm9rZW4gcGFnZSB0byBk aXJ0eSBiaXRtYXAsCisgICAgICAgICAgICAgICAgICAgICAqICAgc28gdGhhdCBhdCBjb3B5cGFn ZXMgc3RhZ2Ugb2YgbWlncmF0aW9uLCBicm9rZW4KKyAgICAgICAgICAgICAgICAgICAgICogICBw YWdlJ3MgcGZuX3R5cGUgYW5kIHBmbiBudW1iZXIgd291bGQgYmUgdHJhbnNmZXJyZWQKKyAgICAg ICAgICAgICAgICAgICAgICogICB0byB0YXJnZXQgYW5kIHRoZW4gdGFrZSBhcHByb3ByaWF0ZSBh Y3Rpb24uCisgICAgICAgICAgICAgICAgICAgICAqCisgICAgICAgICAgICAgICAgICAgICAqICAg QXQgdGFyZ2V0LCBpdCB3b3VsZCBzZXQgcDJtIGFzIHAybV9yYW1fYnJva2VuIGZvcgorICAgICAg ICAgICAgICAgICAgICAgKiAgIGJyb2tlbiBwYWdlLCBzbyB0aGF0IGlmIGd1ZXN0IGFjY2VzcyB0 aGUgYnJva2VuIHBhZ2UKKyAgICAgICAgICAgICAgICAgICAgICogICBhZ2FpbiwgaXQgd291bGQg a2lsbCBpdHNlbGYgYXMgZXhwZWN0ZWQuCisgICAgICAgICAgICAgICAgICAgICAqLworICAgICAg ICAgICAgICAgICAgICBwYWdpbmdfbWFya19kaXJ0eShkLCBtZm4pOworICAgICAgICAgICAgICAg IH0KKwogICAgICAgICAgICAgICAgIGlmICggdW5tbWFwX2Jyb2tlbl9wYWdlKGQsIF9tZm4obWZu KSwgZ2ZuKSApCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBwcmludGso IlVubWFwIGJyb2tlbiBtZW1vcnkgJWx4IGZvciBET00lZCBmYWlsZWRcbiIsCmRpZmYgLXIgZDY3 NTc5NzQ5NGJkIHhlbi9hcmNoL3g4Ni9kb21jdGwuYwotLS0gYS94ZW4vYXJjaC94ODYvZG9tY3Rs LmMJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICswODAwCisrKyBiL3hlbi9hcmNoL3g4Ni9kb21j dGwuYwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTIwOSwxMiArMjA5LDE4IEBA CiAgICAgICAgICAgICAgICAgZm9yICggaiA9IDA7IGogPCBrOyBqKysgKQogICAgICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyB0eXBlID0gMDsKKyAgICAg ICAgICAgICAgICAgICAgcDJtX3R5cGVfdCB0OwogCi0gICAgICAgICAgICAgICAgICAgIHBhZ2Ug PSBnZXRfcGFnZV9mcm9tX2dmbihkLCBhcnJbal0sIE5VTEwsIFAyTV9BTExPQyk7CisgICAgICAg ICAgICAgICAgICAgIHBhZ2UgPSBnZXRfcGFnZV9mcm9tX2dmbihkLCBhcnJbal0sICZ0LCBQMk1f QUxMT0MpOwogCiAgICAgICAgICAgICAgICAgICAgIGlmICggdW5saWtlbHkoIXBhZ2UpIHx8CiAg ICAgICAgICAgICAgICAgICAgICAgICAgdW5saWtlbHkoaXNfeGVuX2hlYXBfcGFnZShwYWdlKSkg KQotICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSA9IFhFTl9ET01DVExfUEZJTkZPX1hUQUI7 CisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICggcDJt X2lzX2Jyb2tlbih0KSApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSA9IFhFTl9E T01DVExfUEZJTkZPX0JST0tFTjsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0eXBlID0gWEVOX0RPTUNUTF9QRklORk9fWFRBQjsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHN3aXRjaCggcGFnZS0+dS5pbnVz ZS50eXBlX2luZm8gJiBQR1RfdHlwZV9tYXNrICkKQEAgLTIzNSw2ICsyNDEsOSBAQAogCiAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIHBhZ2UtPnUuaW51c2UudHlwZV9pbmZvICYgUEdUX3Bp bm5lZCApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSB8PSBYRU5fRE9NQ1RMX1BG SU5GT19MUElOVEFCOworCisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIHBhZ2UtPmNvdW50 X2luZm8gJiBQR0NfYnJva2VuICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlID0g WEVOX0RPTUNUTF9QRklORk9fQlJPS0VOOwogICAgICAgICAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgICAgICAgICAgaWYgKCBwYWdlICkKQEAgLTE1NjgsNiArMTU3NywyOSBAQAogICAgIH0K ICAgICBicmVhazsKIAorICAgIGNhc2UgWEVOX0RPTUNUTF9zZXRfYnJva2VuX3BhZ2VfcDJtOgor ICAgIHsKKyAgICAgICAgc3RydWN0IGRvbWFpbiAqZDsKKyAgICAgICAgCisgICAgICAgIGQgPSBy Y3VfbG9ja19kb21haW5fYnlfaWQoZG9tY3RsLT5kb21haW4pOworICAgICAgICBpZiAoIGQgIT0g TlVMTCApCisgICAgICAgIHsKKyAgICAgICAgICAgIHAybV90eXBlX3QgcHQ7CisgICAgICAgICAg ICB1bnNpZ25lZCBsb25nIHBmbiA9IGRvbWN0bC0+dS5zZXRfYnJva2VuX3BhZ2VfcDJtLnBmbjsK KyAgICAgICAgICAgIG1mbl90IG1mbiA9IGdldF9nZm5fcXVlcnkoZCwgcGZuLCAmcHQpOworCisg ICAgICAgICAgICBpZiAoIHVubGlrZWx5KCFtZm5fdmFsaWQobWZuX3gobWZuKSkgfHwgIXAybV9p c19yYW0ocHQpIHx8CisgICAgICAgICAgICAgICAgICAgICAgICAgKHAybV9jaGFuZ2VfdHlwZShk LCBwZm4sIHB0LCBwMm1fcmFtX2Jyb2tlbikgIT0gcHQpKSApCisgICAgICAgICAgICAgICAgcmV0 ID0gLUVJTlZBTDsKKworICAgICAgICAgICAgcHV0X2dmbihkLCBwZm4pOworICAgICAgICAgICAg cmN1X3VubG9ja19kb21haW4oZCk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgcmV0ID0gLUVTUkNIOworICAgIH0KKyAgICBicmVhazsKKwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIHJldCA9IGlvbW11X2RvX2RvbWN0bChkb21jdGwsIHVfZG9tY3RsKTsKICAgICAgICAgYnJl YWs7CmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHhlbi9pbmNsdWRlL3B1YmxpYy9kb21jdGwuaAotLS0g YS94ZW4vaW5jbHVkZS9wdWJsaWMvZG9tY3RsLmgJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICsw ODAwCisrKyBiL3hlbi9pbmNsdWRlL3B1YmxpYy9kb21jdGwuaAlUaHUgTm92IDA4IDA1OjA3OjIw IDIwMTIgKzA4MDAKQEAgLTEzNiw2ICsxMzYsNyBAQAogI2RlZmluZSBYRU5fRE9NQ1RMX1BGSU5G T19MUElOVEFCICgweDFVPDwzMSkKICNkZWZpbmUgWEVOX0RPTUNUTF9QRklORk9fWFRBQiAgICAo MHhmVTw8MjgpIC8qIGludmFsaWQgcGFnZSAqLwogI2RlZmluZSBYRU5fRE9NQ1RMX1BGSU5GT19Y QUxMT0MgICgweGVVPDwyOCkgLyogYWxsb2NhdGUtb25seSBwYWdlICovCisjZGVmaW5lIFhFTl9E T01DVExfUEZJTkZPX0JST0tFTiAgKDB4ZFU8PDI4KSAvKiBicm9rZW4gcGFnZSAqLwogI2RlZmlu ZSBYRU5fRE9NQ1RMX1BGSU5GT19QQUdFRFRBQiAoMHg4VTw8MjgpCiAjZGVmaW5lIFhFTl9ET01D VExfUEZJTkZPX0xUQUJfTUFTSyAoMHhmVTw8MjgpCiAKQEAgLTgzNSw2ICs4MzYsMTIgQEAKIHR5 cGVkZWYgc3RydWN0IHhlbl9kb21jdGxfc2V0X2FjY2Vzc19yZXF1aXJlZCB4ZW5fZG9tY3RsX3Nl dF9hY2Nlc3NfcmVxdWlyZWRfdDsKIERFRklORV9YRU5fR1VFU1RfSEFORExFKHhlbl9kb21jdGxf c2V0X2FjY2Vzc19yZXF1aXJlZF90KTsKIAorc3RydWN0IHhlbl9kb21jdGxfc2V0X2Jyb2tlbl9w YWdlX3AybSB7CisgICAgdWludDY0X2FsaWduZWRfdCBwZm47Cit9OwordHlwZWRlZiBzdHJ1Y3Qg eGVuX2RvbWN0bF9zZXRfYnJva2VuX3BhZ2VfcDJtIHhlbl9kb21jdGxfc2V0X2Jyb2tlbl9wYWdl X3AybV90OworREVGSU5FX1hFTl9HVUVTVF9IQU5ETEUoeGVuX2RvbWN0bF9zZXRfYnJva2VuX3Bh Z2VfcDJtX3QpOworCiBzdHJ1Y3QgeGVuX2RvbWN0bCB7CiAgICAgdWludDMyX3QgY21kOwogI2Rl ZmluZSBYRU5fRE9NQ1RMX2NyZWF0ZWRvbWFpbiAgICAgICAgICAgICAgICAgICAxCkBAIC05MDAs NiArOTA3LDcgQEAKICNkZWZpbmUgWEVOX0RPTUNUTF9zZXRfYWNjZXNzX3JlcXVpcmVkICAgICAg ICAgICA2NAogI2RlZmluZSBYRU5fRE9NQ1RMX2F1ZGl0X3AybSAgICAgICAgICAgICAgICAgICAg IDY1CiAjZGVmaW5lIFhFTl9ET01DVExfc2V0X3ZpcnFfaGFuZGxlciAgICAgICAgICAgICAgNjYK KyNkZWZpbmUgWEVOX0RPTUNUTF9zZXRfYnJva2VuX3BhZ2VfcDJtICAgICAgICAgICA2NwogI2Rl ZmluZSBYRU5fRE9NQ1RMX2dkYnN4X2d1ZXN0bWVtaW8gICAgICAgICAgICAxMDAwCiAjZGVmaW5l IFhFTl9ET01DVExfZ2Ric3hfcGF1c2V2Y3B1ICAgICAgICAgICAgIDEwMDEKICNkZWZpbmUgWEVO X0RPTUNUTF9nZGJzeF91bnBhdXNldmNwdSAgICAgICAgICAgMTAwMgpAQCAtOTU1LDYgKzk2Myw3 IEBACiAgICAgICAgIHN0cnVjdCB4ZW5fZG9tY3RsX2F1ZGl0X3AybSAgICAgICAgIGF1ZGl0X3Ay bTsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfc2V0X3ZpcnFfaGFuZGxlciAgc2V0X3ZpcnFf aGFuZGxlcjsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfZ2Ric3hfbWVtaW8gICAgICAgZ2Ri c3hfZ3Vlc3RfbWVtaW87CisgICAgICAgIHN0cnVjdCB4ZW5fZG9tY3RsX3NldF9icm9rZW5fcGFn ZV9wMm0gc2V0X2Jyb2tlbl9wYWdlX3AybTsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfZ2Ri c3hfcGF1c2V1bnBfdmNwdSBnZGJzeF9wYXVzZXVucF92Y3B1OwogICAgICAgICBzdHJ1Y3QgeGVu X2RvbWN0bF9nZGJzeF9kb21zdGF0dXMgICBnZGJzeF9kb21zdGF0dXM7CiAgICAgICAgIHVpbnQ4 X3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhZFsxMjhdOwo= --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 14:25:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:25:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Z9-0003l2-2E; Wed, 07 Nov 2012 14:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6Z6-0003ku-Nv for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:25:13 +0000 Received: from [85.158.138.51:64404] by server-9.bemta-3.messagelabs.com id C0/86-02388-74F6A905; Wed, 07 Nov 2012 14:25:11 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352298309!21053628!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5NjA5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5094 invoked from network); 7 Nov 2012 14:25:10 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-6.tower-174.messagelabs.com with SMTP; 7 Nov 2012 14:25:10 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 07 Nov 2012 06:25:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="238543678" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by orsmga002.jf.intel.com with ESMTP; 07 Nov 2012 06:25:07 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.19.17.7) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 06:25:07 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX153.amr.corp.intel.com (10.19.17.7) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 06:25:06 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Wed, 7 Nov 2012 22:25:05 +0800 From: "Liu, Jinsong" To: Ian Campbell Thread-Topic: [Xen-devel] [PATCH] Handle broken page with regard to migration Thread-Index: AQHNvLm5wo0CS0uWQ02/ywhb/M0oqpfebPDw Date: Wed, 7 Nov 2012 14:25:04 +0000 Message-ID: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> <1352273413.12977.27.camel@hastur.hellion.org.uk> In-Reply-To: <1352273413.12977.27.camel@hastur.hellion.org.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ian Campbell wrote: >> At the target >> it would set p2m as p2m_ram_broken for broken page, so that if >> guest access the broken page again, it would kill itself as >> expected.=20 >=20 > Can you add a few words here about why this is preferable to just > ignoring the issue and populating a regular page non-broken page on > the target? I think I know why but it would be useful to be explicit > in the changelog. >=20 > I also spotted a typo: >> + * vMCE occur during migration + =20 >> * + * At sender, it marks broken page to dirty >> bitmap, + * so that at copypages stage of >> migration, brokan=20 >=20 > =20 > broken=20 >=20 > Ian. OK, add some comments and correct typo. Thanks, Jinsong =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Handle broken page with regard to migration Generally, there are 2 cases: 1. broken page occurs before migration 2. broken page occurs during migration At the sender For case 1, the broken page would be mapped but not copied to target (otherwise it may trigger more serious error, say, SRAR error). While its pfn_type and pfn number would be transferred to target so that target take appropriate action. For case 2, mce handler marks the broken page to dirty bitmap, so that at copypages stage of migration, its pfn_type and pfn number would be transferred to target and then take appropriate action. At the target When migration target would populate pages for guest. As for the case of broken page wrt migration, we prefer keep the corresponding page, for the sake of seamless migration. At target it would set p2m as p2m_ram_broken for broken page. Guest MCE may have good chance to handle its broken page, while if guest access the broken page again it would kill itself as expected. Suggested-by: George Dunlap Signed-off-by: Liu, Jinsong diff -r d675797494bd tools/libxc/xc_domain.c --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain.c Thu Nov 08 05:07:20 2012 +0800 @@ -283,6 +283,22 @@ return ret; } =20 +/* set broken page p2m */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn) +{ + int ret; + DECLARE_DOMCTL; + + domctl.cmd =3D XEN_DOMCTL_set_broken_page_p2m; + domctl.domain =3D (domid_t)domid; + domctl.u.set_broken_page_p2m.pfn =3D pfn; + ret =3D do_domctl(xch, &domctl); + + return ret ? -1 : 0; +} + /* get info from hvm guest for save */ int xc_domain_hvm_getcontext(xc_interface *xch, uint32_t domid, diff -r d675797494bd tools/libxc/xc_domain_restore.c --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_restore.c Thu Nov 08 05:07:20 2012 +0800 @@ -962,9 +962,15 @@ =20 countpages =3D count; for (i =3D oldcount; i < buf->nr_pages; ++i) - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) =3D=3D XEN_D= OMCTL_PFINFO_XTAB - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) =3D=3D XEN= _DOMCTL_PFINFO_XALLOC) + { + unsigned long pagetype; + + pagetype =3D buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; + if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_XTAB || + pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN || + pagetype =3D=3D XEN_DOMCTL_PFINFO_XALLOC ) --countpages; + } =20 if (!countpages) return count; @@ -1200,6 +1206,17 @@ /* a bogus/unmapped/allocate-only page: skip it */ continue; =20 + if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN ) + { + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) + { + ERROR("Set p2m for broken page failed, " + "dom=3D%d, pfn=3D%lx\n", dom, pfn); + goto err_mapped; + } + continue; + } + if (pfn_err[i]) { ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_= mfn %lx", diff -r d675797494bd tools/libxc/xc_domain_save.c --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xc_domain_save.c Thu Nov 08 05:07:20 2012 +0800 @@ -1277,6 +1277,13 @@ if ( !hvm ) gmfn =3D pfn_to_mfn(gmfn); =20 + if ( pfn_type[j] =3D=3D XEN_DOMCTL_PFINFO_BROKEN ) + { + pfn_type[j] |=3D pfn_batch[j]; + ++run; + continue; + } + if ( pfn_err[j] ) { if ( pfn_type[j] =3D=3D XEN_DOMCTL_PFINFO_XTAB ) @@ -1371,8 +1378,12 @@ } } =20 - /* skip pages that aren't present or are alloc-only */ + /* + * skip pages that aren't present, + * or are broken, or are alloc-only + */ if ( pagetype =3D=3D XEN_DOMCTL_PFINFO_XTAB + || pagetype =3D=3D XEN_DOMCTL_PFINFO_BROKEN || pagetype =3D=3D XEN_DOMCTL_PFINFO_XALLOC ) continue; =20 diff -r d675797494bd tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/tools/libxc/xenctrl.h Thu Nov 08 05:07:20 2012 +0800 @@ -575,6 +575,17 @@ xc_domaininfo_t *info); =20 /** + * This function set p2m for broken page + * &parm xch a handle to an open hypervisor interface + * @parm domid the domain id which broken page belong to + * @parm pfn the pfn number of the broken page + * @return 0 on success, -1 on failure + */ +int xc_set_broken_page_p2m(xc_interface *xch, + uint32_t domid, + unsigned long pfn); + +/** * This function returns information about the context of a hvm domain * @parm xch a handle to an open hypervisor interface * @parm domid the domain to get information from diff -r d675797494bd xen/arch/x86/cpu/mcheck/mcaction.c --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Thu Nov 08 05:07:20 2012 +0800 @@ -1,5 +1,6 @@ #include #include +#include #include "mcaction.h" #include "vmce.h" #include "mce.h" @@ -91,6 +92,24 @@ goto vmce_failed; } =20 + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && + paging_mode_log_dirty(d) ) + { + /* + * vMCE occur during migration + * + * At sender, it marks broken page to dirty bitmap, + * so that at copypages stage of migration, broken + * page's pfn_type and pfn number would be transferr= ed + * to target and then take appropriate action. + * + * At target, it would set p2m as p2m_ram_broken for + * broken page, so that if guest access the broken p= age + * again, it would kill itself as expected. + */ + paging_mark_dirty(d, mfn); + } + if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) { printk("Unmap broken memory %lx for DOM%d failed\n", diff -r d675797494bd xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/arch/x86/domctl.c Thu Nov 08 05:07:20 2012 +0800 @@ -209,12 +209,18 @@ for ( j =3D 0; j < k; j++ ) { unsigned long type =3D 0; + p2m_type_t t; =20 - page =3D get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC)= ; + page =3D get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); =20 if ( unlikely(!page) || unlikely(is_xen_heap_page(page)) ) - type =3D XEN_DOMCTL_PFINFO_XTAB; + { + if ( p2m_is_broken(t) ) + type =3D XEN_DOMCTL_PFINFO_BROKEN; + else + type =3D XEN_DOMCTL_PFINFO_XTAB; + } else { switch( page->u.inuse.type_info & PGT_type_mask ) @@ -235,6 +241,9 @@ =20 if ( page->u.inuse.type_info & PGT_pinned ) type |=3D XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type =3D XEN_DOMCTL_PFINFO_BROKEN; } =20 if ( page ) @@ -1568,6 +1577,29 @@ } break; =20 + case XEN_DOMCTL_set_broken_page_p2m: + { + struct domain *d; + =20 + d =3D rcu_lock_domain_by_id(domctl->domain); + if ( d !=3D NULL ) + { + p2m_type_t pt; + unsigned long pfn =3D domctl->u.set_broken_page_p2m.pfn; + mfn_t mfn =3D get_gfn_query(d, pfn, &pt); + + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || + (p2m_change_type(d, pfn, pt, p2m_ram_broken) !=3D= pt)) ) + ret =3D -EINVAL; + + put_gfn(d, pfn); + rcu_unlock_domain(d); + } + else + ret =3D -ESRCH; + } + break; + default: ret =3D iommu_do_domctl(domctl, u_domctl); break; diff -r d675797494bd xen/include/public/domctl.h --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 +++ b/xen/include/public/domctl.h Thu Nov 08 05:07:20 2012 +0800 @@ -136,6 +136,7 @@ #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) =20 @@ -835,6 +836,12 @@ typedef struct xen_domctl_set_access_required xen_domctl_set_access_requir= ed_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); =20 +struct xen_domctl_set_broken_page_p2m { + uint64_aligned_t pfn; +}; +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p= 2m_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -900,6 +907,7 @@ #define XEN_DOMCTL_set_access_required 64 #define XEN_DOMCTL_audit_p2m 65 #define XEN_DOMCTL_set_virq_handler 66 +#define XEN_DOMCTL_set_broken_page_p2m 67 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -955,6 +963,7 @@ struct xen_domctl_audit_p2m audit_p2m; struct xen_domctl_set_virq_handler set_virq_handler; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128];= --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="handle_broken_page_wrt_migration.patch" Content-Description: handle_broken_page_wrt_migration.patch Content-Disposition: attachment; filename="handle_broken_page_wrt_migration.patch"; size=10643; creation-date="Wed, 07 Nov 2012 14:20:54 GMT"; modification-date="Wed, 07 Nov 2012 22:09:14 GMT" Content-Transfer-Encoding: base64 SGFuZGxlIGJyb2tlbiBwYWdlIHdpdGggcmVnYXJkIHRvIG1pZ3JhdGlvbgoKR2VuZXJhbGx5LCB0 aGVyZSBhcmUgMiBjYXNlczoKMS4gYnJva2VuIHBhZ2Ugb2NjdXJzIGJlZm9yZSBtaWdyYXRpb24K Mi4gYnJva2VuIHBhZ2Ugb2NjdXJzIGR1cmluZyBtaWdyYXRpb24KCkF0IHRoZSBzZW5kZXIKICBG b3IgY2FzZSAxLCB0aGUgYnJva2VuIHBhZ2Ugd291bGQgYmUgbWFwcGVkIGJ1dCBub3QgY29waWVk IHRvIHRhcmdldAogIChvdGhlcndpc2UgaXQgbWF5IHRyaWdnZXIgbW9yZSBzZXJpb3VzIGVycm9y LCBzYXksIFNSQVIgZXJyb3IpLgogIFdoaWxlIGl0cyBwZm5fdHlwZSBhbmQgcGZuIG51bWJlciB3 b3VsZCBiZSB0cmFuc2ZlcnJlZCB0byB0YXJnZXQKICBzbyB0aGF0IHRhcmdldCB0YWtlIGFwcHJv cHJpYXRlIGFjdGlvbi4KCiAgRm9yIGNhc2UgMiwgbWNlIGhhbmRsZXIgbWFya3MgdGhlIGJyb2tl biBwYWdlIHRvIGRpcnR5IGJpdG1hcCwgc28gdGhhdAogIGF0IGNvcHlwYWdlcyBzdGFnZSBvZiBt aWdyYXRpb24sIGl0cyBwZm5fdHlwZSBhbmQgcGZuIG51bWJlciB3b3VsZCBiZQogIHRyYW5zZmVy cmVkIHRvIHRhcmdldCBhbmQgdGhlbiB0YWtlIGFwcHJvcHJpYXRlIGFjdGlvbi4KCkF0IHRoZSB0 YXJnZXQKICBXaGVuIG1pZ3JhdGlvbiB0YXJnZXQgd291bGQgcG9wdWxhdGUgcGFnZXMgZm9yIGd1 ZXN0LiBBcyBmb3IgdGhlIGNhc2UKICBvZiBicm9rZW4gcGFnZSB3cnQgbWlncmF0aW9uLCB3ZSBw cmVmZXIga2VlcCB0aGUgY29ycmVzcG9uZGluZyBwYWdlLAogIGZvciB0aGUgc2FrZSBvZiBzZWFt bGVzcyBtaWdyYXRpb24uCgogIEF0IHRhcmdldCBpdCB3b3VsZCBzZXQgcDJtIGFzIHAybV9yYW1f YnJva2VuIGZvciBicm9rZW4gcGFnZS4gR3Vlc3QgTUNFCiAgbWF5IGhhdmUgZ29vZCBjaGFuY2Ug dG8gaGFuZGxlIGl0cyBicm9rZW4gcGFnZSwgd2hpbGUgaWYgZ3Vlc3QgYWNjZXNzCiAgdGhlIGJy b2tlbiBwYWdlIGFnYWluIGl0IHdvdWxkIGtpbGwgaXRzZWxmIGFzIGV4cGVjdGVkLgoKU3VnZ2Vz dGVkLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+ClNpZ25l ZC1vZmYtYnk6IExpdSwgSmluc29uZyA8amluc29uZy5saXVAaW50ZWwuY29tPgoKZGlmZiAtciBk Njc1Nzk3NDk0YmQgdG9vbHMvbGlieGMveGNfZG9tYWluLmMKLS0tIGEvdG9vbHMvbGlieGMveGNf ZG9tYWluLmMJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICswODAwCisrKyBiL3Rvb2xzL2xpYnhj L3hjX2RvbWFpbi5jCVRodSBOb3YgMDggMDU6MDc6MjAgMjAxMiArMDgwMApAQCAtMjgzLDYgKzI4 MywyMiBAQAogICAgIHJldHVybiByZXQ7CiB9CiAKKy8qIHNldCBicm9rZW4gcGFnZSBwMm0gKi8K K2ludCB4Y19zZXRfYnJva2VuX3BhZ2VfcDJtKHhjX2ludGVyZmFjZSAqeGNoLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICB1bnNpZ25lZCBsb25nIHBmbikKK3sKKyAgICBpbnQgcmV0OworICAgIERFQ0xBUkVfRE9N Q1RMOworCisgICAgZG9tY3RsLmNtZCA9IFhFTl9ET01DVExfc2V0X2Jyb2tlbl9wYWdlX3AybTsK KyAgICBkb21jdGwuZG9tYWluID0gKGRvbWlkX3QpZG9taWQ7CisgICAgZG9tY3RsLnUuc2V0X2Jy b2tlbl9wYWdlX3AybS5wZm4gPSBwZm47CisgICAgcmV0ID0gZG9fZG9tY3RsKHhjaCwgJmRvbWN0 bCk7CisKKyAgICByZXR1cm4gcmV0ID8gLTEgOiAwOworfQorCiAvKiBnZXQgaW5mbyBmcm9tIGh2 bSBndWVzdCBmb3Igc2F2ZSAqLwogaW50IHhjX2RvbWFpbl9odm1fZ2V0Y29udGV4dCh4Y19pbnRl cmZhY2UgKnhjaCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgZG9taWQs CmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHRvb2xzL2xpYnhjL3hjX2RvbWFpbl9yZXN0b3JlLmMKLS0t IGEvdG9vbHMvbGlieGMveGNfZG9tYWluX3Jlc3RvcmUuYwlGcmkgTm92IDAyIDExOjA4OjM3IDIw MTIgKzA4MDAKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tYWluX3Jlc3RvcmUuYwlUaHUgTm92IDA4 IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTk2Miw5ICs5NjIsMTUgQEAKIAogICAgIGNvdW50cGFn ZXMgPSBjb3VudDsKICAgICBmb3IgKGkgPSBvbGRjb3VudDsgaSA8IGJ1Zi0+bnJfcGFnZXM7ICsr aSkKLSAgICAgICAgaWYgKChidWYtPnBmbl90eXBlc1tpXSAmIFhFTl9ET01DVExfUEZJTkZPX0xU QUJfTUFTSykgPT0gWEVOX0RPTUNUTF9QRklORk9fWFRBQgotICAgICAgICAgICAgfHwoYnVmLT5w Zm5fdHlwZXNbaV0gJiBYRU5fRE9NQ1RMX1BGSU5GT19MVEFCX01BU0spID09IFhFTl9ET01DVExf UEZJTkZPX1hBTExPQykKKyAgICB7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgcGFnZXR5cGU7CisK KyAgICAgICAgcGFnZXR5cGUgPSBidWYtPnBmbl90eXBlc1tpXSAmIFhFTl9ET01DVExfUEZJTkZP X0xUQUJfTUFTSzsKKyAgICAgICAgaWYgKCBwYWdldHlwZSA9PSBYRU5fRE9NQ1RMX1BGSU5GT19Y VEFCIHx8CisgICAgICAgICAgICAgcGFnZXR5cGUgPT0gWEVOX0RPTUNUTF9QRklORk9fQlJPS0VO IHx8CisgICAgICAgICAgICAgcGFnZXR5cGUgPT0gWEVOX0RPTUNUTF9QRklORk9fWEFMTE9DICkK ICAgICAgICAgICAgIC0tY291bnRwYWdlczsKKyAgICB9CiAKICAgICBpZiAoIWNvdW50cGFnZXMp CiAgICAgICAgIHJldHVybiBjb3VudDsKQEAgLTEyMDAsNiArMTIwNiwxNyBAQAogICAgICAgICAg ICAgLyogYSBib2d1cy91bm1hcHBlZC9hbGxvY2F0ZS1vbmx5IHBhZ2U6IHNraXAgaXQgKi8KICAg ICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIGlmICggcGFnZXR5cGUgPT0gWEVOX0RPTUNU TF9QRklORk9fQlJPS0VOICkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCB4Y19zZXRfYnJv a2VuX3BhZ2VfcDJtKHhjaCwgZG9tLCBwZm4pICkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBFUlJPUigiU2V0IHAybSBmb3IgYnJva2VuIHBhZ2UgZmFpbGVkLCAiCisgICAgICAgICAg ICAgICAgICAgICAgImRvbT0lZCwgcGZuPSVseFxuIiwgZG9tLCBwZm4pOworICAgICAgICAgICAg ICAgIGdvdG8gZXJyX21hcHBlZDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICB9CisKICAgICAgICAgaWYgKHBmbl9lcnJbaV0pCiAgICAgICAgIHsKICAgICAg ICAgICAgIEVSUk9SKCJ1bmV4cGVjdGVkIFBGTiBtYXBwaW5nIGZhaWx1cmUgcGZuICVseCBtYXBf bWZuICVseCBwMm1fbWZuICVseCIsCmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHRvb2xzL2xpYnhjL3hj X2RvbWFpbl9zYXZlLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tYWluX3NhdmUuYwlGcmkgTm92 IDAyIDExOjA4OjM3IDIwMTIgKzA4MDAKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tYWluX3NhdmUu YwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTEyNzcsNiArMTI3NywxMyBAQAog ICAgICAgICAgICAgICAgIGlmICggIWh2bSApCiAgICAgICAgICAgICAgICAgICAgIGdtZm4gPSBw Zm5fdG9fbWZuKGdtZm4pOwogCisgICAgICAgICAgICAgICAgaWYgKCBwZm5fdHlwZVtqXSA9PSBY RU5fRE9NQ1RMX1BGSU5GT19CUk9LRU4gKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgcGZuX3R5cGVbal0gfD0gcGZuX2JhdGNoW2pdOworICAgICAgICAgICAgICAgICAg ICArK3J1bjsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg fQorCiAgICAgICAgICAgICAgICAgaWYgKCBwZm5fZXJyW2pdICkKICAgICAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgICAgIGlmICggcGZuX3R5cGVbal0gPT0gWEVOX0RPTUNUTF9QRklO Rk9fWFRBQiApCkBAIC0xMzcxLDggKzEzNzgsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgIC8qIHNraXAgcGFnZXMgdGhhdCBh cmVuJ3QgcHJlc2VudCBvciBhcmUgYWxsb2Mtb25seSAqLworICAgICAgICAgICAgICAgIC8qCisg ICAgICAgICAgICAgICAgICogc2tpcCBwYWdlcyB0aGF0IGFyZW4ndCBwcmVzZW50LAorICAgICAg ICAgICAgICAgICAqIG9yIGFyZSBicm9rZW4sIG9yIGFyZSBhbGxvYy1vbmx5CisgICAgICAgICAg ICAgICAgICovCiAgICAgICAgICAgICAgICAgaWYgKCBwYWdldHlwZSA9PSBYRU5fRE9NQ1RMX1BG SU5GT19YVEFCCisgICAgICAgICAgICAgICAgICAgIHx8IHBhZ2V0eXBlID09IFhFTl9ET01DVExf UEZJTkZPX0JST0tFTgogICAgICAgICAgICAgICAgICAgICB8fCBwYWdldHlwZSA9PSBYRU5fRE9N Q1RMX1BGSU5GT19YQUxMT0MgKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIApkaWZm IC1yIGQ2NzU3OTc0OTRiZCB0b29scy9saWJ4Yy94ZW5jdHJsLmgKLS0tIGEvdG9vbHMvbGlieGMv eGVuY3RybC5oCUZyaSBOb3YgMDIgMTE6MDg6MzcgMjAxMiArMDgwMAorKysgYi90b29scy9saWJ4 Yy94ZW5jdHJsLmgJVGh1IE5vdiAwOCAwNTowNzoyMCAyMDEyICswODAwCkBAIC01NzUsNiArNTc1 LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjX2RvbWFpbmluZm9fdCAqaW5mbyk7 CiAKIC8qKgorICogVGhpcyBmdW5jdGlvbiBzZXQgcDJtIGZvciBicm9rZW4gcGFnZQorICogJnBh cm0geGNoIGEgaGFuZGxlIHRvIGFuIG9wZW4gaHlwZXJ2aXNvciBpbnRlcmZhY2UKKyAqIEBwYXJt IGRvbWlkIHRoZSBkb21haW4gaWQgd2hpY2ggYnJva2VuIHBhZ2UgYmVsb25nIHRvCisgKiBAcGFy bSBwZm4gdGhlIHBmbiBudW1iZXIgb2YgdGhlIGJyb2tlbiBwYWdlCisgKiBAcmV0dXJuIDAgb24g c3VjY2VzcywgLTEgb24gZmFpbHVyZQorICovCitpbnQgeGNfc2V0X2Jyb2tlbl9wYWdlX3AybSh4 Y19pbnRlcmZhY2UgKnhjaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGRv bWlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBwZm4pOworCisv KioKICAqIFRoaXMgZnVuY3Rpb24gcmV0dXJucyBpbmZvcm1hdGlvbiBhYm91dCB0aGUgY29udGV4 dCBvZiBhIGh2bSBkb21haW4KICAqIEBwYXJtIHhjaCBhIGhhbmRsZSB0byBhbiBvcGVuIGh5cGVy dmlzb3IgaW50ZXJmYWNlCiAgKiBAcGFybSBkb21pZCB0aGUgZG9tYWluIHRvIGdldCBpbmZvcm1h dGlvbiBmcm9tCmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHhlbi9hcmNoL3g4Ni9jcHUvbWNoZWNrL21j YWN0aW9uLmMKLS0tIGEveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svbWNhY3Rpb24uYwlGcmkgTm92 IDAyIDExOjA4OjM3IDIwMTIgKzA4MDAKKysrIGIveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svbWNh Y3Rpb24uYwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTEsNSArMSw2IEBACiAj aW5jbHVkZSA8eGVuL3R5cGVzLmg+CiAjaW5jbHVkZSA8eGVuL3NjaGVkLmg+CisjaW5jbHVkZSA8 YXNtL3AybS5oPgogI2luY2x1ZGUgIm1jYWN0aW9uLmgiCiAjaW5jbHVkZSAidm1jZS5oIgogI2lu Y2x1ZGUgIm1jZS5oIgpAQCAtOTEsNiArOTIsMjQgQEAKICAgICAgICAgICAgICAgICAgICAgZ290 byB2bWNlX2ZhaWxlZDsKICAgICAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICAgICBpZiAo IGlzX2h2bV9kb21haW4oZCkgJiYgIWQtPmFyY2guaHZtX2RvbWFpbi5kaXJ0eV92cmFtICYmCisg ICAgICAgICAgICAgICAgICAgICBwYWdpbmdfbW9kZV9sb2dfZGlydHkoZCkgKQorICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAgICAgICAgICog dk1DRSBvY2N1ciBkdXJpbmcgbWlncmF0aW9uCisgICAgICAgICAgICAgICAgICAgICAqCisgICAg ICAgICAgICAgICAgICAgICAqICAgQXQgc2VuZGVyLCBpdCBtYXJrcyBicm9rZW4gcGFnZSB0byBk aXJ0eSBiaXRtYXAsCisgICAgICAgICAgICAgICAgICAgICAqICAgc28gdGhhdCBhdCBjb3B5cGFn ZXMgc3RhZ2Ugb2YgbWlncmF0aW9uLCBicm9rZW4KKyAgICAgICAgICAgICAgICAgICAgICogICBw YWdlJ3MgcGZuX3R5cGUgYW5kIHBmbiBudW1iZXIgd291bGQgYmUgdHJhbnNmZXJyZWQKKyAgICAg ICAgICAgICAgICAgICAgICogICB0byB0YXJnZXQgYW5kIHRoZW4gdGFrZSBhcHByb3ByaWF0ZSBh Y3Rpb24uCisgICAgICAgICAgICAgICAgICAgICAqCisgICAgICAgICAgICAgICAgICAgICAqICAg QXQgdGFyZ2V0LCBpdCB3b3VsZCBzZXQgcDJtIGFzIHAybV9yYW1fYnJva2VuIGZvcgorICAgICAg ICAgICAgICAgICAgICAgKiAgIGJyb2tlbiBwYWdlLCBzbyB0aGF0IGlmIGd1ZXN0IGFjY2VzcyB0 aGUgYnJva2VuIHBhZ2UKKyAgICAgICAgICAgICAgICAgICAgICogICBhZ2FpbiwgaXQgd291bGQg a2lsbCBpdHNlbGYgYXMgZXhwZWN0ZWQuCisgICAgICAgICAgICAgICAgICAgICAqLworICAgICAg ICAgICAgICAgICAgICBwYWdpbmdfbWFya19kaXJ0eShkLCBtZm4pOworICAgICAgICAgICAgICAg IH0KKwogICAgICAgICAgICAgICAgIGlmICggdW5tbWFwX2Jyb2tlbl9wYWdlKGQsIF9tZm4obWZu KSwgZ2ZuKSApCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBwcmludGso IlVubWFwIGJyb2tlbiBtZW1vcnkgJWx4IGZvciBET00lZCBmYWlsZWRcbiIsCmRpZmYgLXIgZDY3 NTc5NzQ5NGJkIHhlbi9hcmNoL3g4Ni9kb21jdGwuYwotLS0gYS94ZW4vYXJjaC94ODYvZG9tY3Rs LmMJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICswODAwCisrKyBiL3hlbi9hcmNoL3g4Ni9kb21j dGwuYwlUaHUgTm92IDA4IDA1OjA3OjIwIDIwMTIgKzA4MDAKQEAgLTIwOSwxMiArMjA5LDE4IEBA CiAgICAgICAgICAgICAgICAgZm9yICggaiA9IDA7IGogPCBrOyBqKysgKQogICAgICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyB0eXBlID0gMDsKKyAgICAg ICAgICAgICAgICAgICAgcDJtX3R5cGVfdCB0OwogCi0gICAgICAgICAgICAgICAgICAgIHBhZ2Ug PSBnZXRfcGFnZV9mcm9tX2dmbihkLCBhcnJbal0sIE5VTEwsIFAyTV9BTExPQyk7CisgICAgICAg ICAgICAgICAgICAgIHBhZ2UgPSBnZXRfcGFnZV9mcm9tX2dmbihkLCBhcnJbal0sICZ0LCBQMk1f QUxMT0MpOwogCiAgICAgICAgICAgICAgICAgICAgIGlmICggdW5saWtlbHkoIXBhZ2UpIHx8CiAg ICAgICAgICAgICAgICAgICAgICAgICAgdW5saWtlbHkoaXNfeGVuX2hlYXBfcGFnZShwYWdlKSkg KQotICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSA9IFhFTl9ET01DVExfUEZJTkZPX1hUQUI7 CisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICggcDJt X2lzX2Jyb2tlbih0KSApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSA9IFhFTl9E T01DVExfUEZJTkZPX0JST0tFTjsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0eXBlID0gWEVOX0RPTUNUTF9QRklORk9fWFRBQjsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHN3aXRjaCggcGFnZS0+dS5pbnVz ZS50eXBlX2luZm8gJiBQR1RfdHlwZV9tYXNrICkKQEAgLTIzNSw2ICsyNDEsOSBAQAogCiAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIHBhZ2UtPnUuaW51c2UudHlwZV9pbmZvICYgUEdUX3Bp bm5lZCApCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSB8PSBYRU5fRE9NQ1RMX1BG SU5GT19MUElOVEFCOworCisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIHBhZ2UtPmNvdW50 X2luZm8gJiBQR0NfYnJva2VuICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlID0g WEVOX0RPTUNUTF9QRklORk9fQlJPS0VOOwogICAgICAgICAgICAgICAgICAgICB9CiAKICAgICAg ICAgICAgICAgICAgICAgaWYgKCBwYWdlICkKQEAgLTE1NjgsNiArMTU3NywyOSBAQAogICAgIH0K ICAgICBicmVhazsKIAorICAgIGNhc2UgWEVOX0RPTUNUTF9zZXRfYnJva2VuX3BhZ2VfcDJtOgor ICAgIHsKKyAgICAgICAgc3RydWN0IGRvbWFpbiAqZDsKKyAgICAgICAgCisgICAgICAgIGQgPSBy Y3VfbG9ja19kb21haW5fYnlfaWQoZG9tY3RsLT5kb21haW4pOworICAgICAgICBpZiAoIGQgIT0g TlVMTCApCisgICAgICAgIHsKKyAgICAgICAgICAgIHAybV90eXBlX3QgcHQ7CisgICAgICAgICAg ICB1bnNpZ25lZCBsb25nIHBmbiA9IGRvbWN0bC0+dS5zZXRfYnJva2VuX3BhZ2VfcDJtLnBmbjsK KyAgICAgICAgICAgIG1mbl90IG1mbiA9IGdldF9nZm5fcXVlcnkoZCwgcGZuLCAmcHQpOworCisg ICAgICAgICAgICBpZiAoIHVubGlrZWx5KCFtZm5fdmFsaWQobWZuX3gobWZuKSkgfHwgIXAybV9p c19yYW0ocHQpIHx8CisgICAgICAgICAgICAgICAgICAgICAgICAgKHAybV9jaGFuZ2VfdHlwZShk LCBwZm4sIHB0LCBwMm1fcmFtX2Jyb2tlbikgIT0gcHQpKSApCisgICAgICAgICAgICAgICAgcmV0 ID0gLUVJTlZBTDsKKworICAgICAgICAgICAgcHV0X2dmbihkLCBwZm4pOworICAgICAgICAgICAg cmN1X3VubG9ja19kb21haW4oZCk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgcmV0ID0gLUVTUkNIOworICAgIH0KKyAgICBicmVhazsKKwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIHJldCA9IGlvbW11X2RvX2RvbWN0bChkb21jdGwsIHVfZG9tY3RsKTsKICAgICAgICAgYnJl YWs7CmRpZmYgLXIgZDY3NTc5NzQ5NGJkIHhlbi9pbmNsdWRlL3B1YmxpYy9kb21jdGwuaAotLS0g YS94ZW4vaW5jbHVkZS9wdWJsaWMvZG9tY3RsLmgJRnJpIE5vdiAwMiAxMTowODozNyAyMDEyICsw ODAwCisrKyBiL3hlbi9pbmNsdWRlL3B1YmxpYy9kb21jdGwuaAlUaHUgTm92IDA4IDA1OjA3OjIw IDIwMTIgKzA4MDAKQEAgLTEzNiw2ICsxMzYsNyBAQAogI2RlZmluZSBYRU5fRE9NQ1RMX1BGSU5G T19MUElOVEFCICgweDFVPDwzMSkKICNkZWZpbmUgWEVOX0RPTUNUTF9QRklORk9fWFRBQiAgICAo MHhmVTw8MjgpIC8qIGludmFsaWQgcGFnZSAqLwogI2RlZmluZSBYRU5fRE9NQ1RMX1BGSU5GT19Y QUxMT0MgICgweGVVPDwyOCkgLyogYWxsb2NhdGUtb25seSBwYWdlICovCisjZGVmaW5lIFhFTl9E T01DVExfUEZJTkZPX0JST0tFTiAgKDB4ZFU8PDI4KSAvKiBicm9rZW4gcGFnZSAqLwogI2RlZmlu ZSBYRU5fRE9NQ1RMX1BGSU5GT19QQUdFRFRBQiAoMHg4VTw8MjgpCiAjZGVmaW5lIFhFTl9ET01D VExfUEZJTkZPX0xUQUJfTUFTSyAoMHhmVTw8MjgpCiAKQEAgLTgzNSw2ICs4MzYsMTIgQEAKIHR5 cGVkZWYgc3RydWN0IHhlbl9kb21jdGxfc2V0X2FjY2Vzc19yZXF1aXJlZCB4ZW5fZG9tY3RsX3Nl dF9hY2Nlc3NfcmVxdWlyZWRfdDsKIERFRklORV9YRU5fR1VFU1RfSEFORExFKHhlbl9kb21jdGxf c2V0X2FjY2Vzc19yZXF1aXJlZF90KTsKIAorc3RydWN0IHhlbl9kb21jdGxfc2V0X2Jyb2tlbl9w YWdlX3AybSB7CisgICAgdWludDY0X2FsaWduZWRfdCBwZm47Cit9OwordHlwZWRlZiBzdHJ1Y3Qg eGVuX2RvbWN0bF9zZXRfYnJva2VuX3BhZ2VfcDJtIHhlbl9kb21jdGxfc2V0X2Jyb2tlbl9wYWdl X3AybV90OworREVGSU5FX1hFTl9HVUVTVF9IQU5ETEUoeGVuX2RvbWN0bF9zZXRfYnJva2VuX3Bh Z2VfcDJtX3QpOworCiBzdHJ1Y3QgeGVuX2RvbWN0bCB7CiAgICAgdWludDMyX3QgY21kOwogI2Rl ZmluZSBYRU5fRE9NQ1RMX2NyZWF0ZWRvbWFpbiAgICAgICAgICAgICAgICAgICAxCkBAIC05MDAs NiArOTA3LDcgQEAKICNkZWZpbmUgWEVOX0RPTUNUTF9zZXRfYWNjZXNzX3JlcXVpcmVkICAgICAg ICAgICA2NAogI2RlZmluZSBYRU5fRE9NQ1RMX2F1ZGl0X3AybSAgICAgICAgICAgICAgICAgICAg IDY1CiAjZGVmaW5lIFhFTl9ET01DVExfc2V0X3ZpcnFfaGFuZGxlciAgICAgICAgICAgICAgNjYK KyNkZWZpbmUgWEVOX0RPTUNUTF9zZXRfYnJva2VuX3BhZ2VfcDJtICAgICAgICAgICA2NwogI2Rl ZmluZSBYRU5fRE9NQ1RMX2dkYnN4X2d1ZXN0bWVtaW8gICAgICAgICAgICAxMDAwCiAjZGVmaW5l IFhFTl9ET01DVExfZ2Ric3hfcGF1c2V2Y3B1ICAgICAgICAgICAgIDEwMDEKICNkZWZpbmUgWEVO X0RPTUNUTF9nZGJzeF91bnBhdXNldmNwdSAgICAgICAgICAgMTAwMgpAQCAtOTU1LDYgKzk2Myw3 IEBACiAgICAgICAgIHN0cnVjdCB4ZW5fZG9tY3RsX2F1ZGl0X3AybSAgICAgICAgIGF1ZGl0X3Ay bTsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfc2V0X3ZpcnFfaGFuZGxlciAgc2V0X3ZpcnFf aGFuZGxlcjsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfZ2Ric3hfbWVtaW8gICAgICAgZ2Ri c3hfZ3Vlc3RfbWVtaW87CisgICAgICAgIHN0cnVjdCB4ZW5fZG9tY3RsX3NldF9icm9rZW5fcGFn ZV9wMm0gc2V0X2Jyb2tlbl9wYWdlX3AybTsKICAgICAgICAgc3RydWN0IHhlbl9kb21jdGxfZ2Ri c3hfcGF1c2V1bnBfdmNwdSBnZGJzeF9wYXVzZXVucF92Y3B1OwogICAgICAgICBzdHJ1Y3QgeGVu X2RvbWN0bF9nZGJzeF9kb21zdGF0dXMgICBnZGJzeF9kb21zdGF0dXM7CiAgICAgICAgIHVpbnQ4 X3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhZFsxMjhdOwo= --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BA4ESHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Wed Nov 07 14:58:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW75N-00041R-6J; Wed, 07 Nov 2012 14:58:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6uV-0003z2-O5 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:47:20 +0000 Received: from [193.109.254.147:14107] by server-4.bemta-14.messagelabs.com id 28/F9-18856-7747A905; Wed, 07 Nov 2012 14:47:19 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352299631!3210001!1 X-Originating-IP: [32.97.182.139] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjEzOSA9PiA2NzgxMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17069 invoked from network); 7 Nov 2012 14:47:12 -0000 Received: from e9.ny.us.ibm.com (HELO e9.ny.us.ibm.com) (32.97.182.139) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:47:12 -0000 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Nov 2012 09:47:10 -0500 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Nov 2012 09:47:08 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 2D30238C8042 for ; Wed, 7 Nov 2012 09:47:07 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA7El6Tv283140 for ; Wed, 7 Nov 2012 09:47:06 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA7El2GM008767 for ; Wed, 7 Nov 2012 09:47:06 -0500 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA7El1qo008493; Wed, 7 Nov 2012 09:47:01 -0500 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id 195662C0A93; Wed, 7 Nov 2012 08:46:28 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA7EkQVx003546; Wed, 7 Nov 2012 08:46:26 -0600 Date: Wed, 7 Nov 2012 08:46:26 -0600 From: Kent Yoder To: Matthew Fioravante Message-ID: <20121107144625.GA14628@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110714-7182-0000-0000-0000031E24EB X-Mailman-Approved-At: Wed, 07 Nov 2012 14:58:32 +0000 Cc: jeremy@goop.org, xen-devel@lists.xensource.com, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Matthew, On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 9 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 15 + > drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > drivers/char/tpm/tpm_vtpm.h | 55 +++ > drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/io/tpmif.h | 77 +++++ > 7 files changed, 1391 insertions(+) > create mode 100644 drivers/char/tpm/tpm_vtpm.c > create mode 100644 drivers/char/tpm/tpm_vtpm.h > create mode 100644 drivers/char/tpm/tpm_xen.c > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..08c1010 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,13 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. > + To compile this driver as a module, choose M here; the module > + will be called tpm_xenu. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..16911c5 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > +tpm_xenu-y = tpm_xen.o tpm_vtpm.o Let's match the naming convention of the other drivers if we can, so this would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..2e5a47a 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -130,6 +130,9 @@ struct tpm_chip { > > struct list_head list; > void (*release) (struct device *); > +#if CONFIG_XEN > + void *priv; > +#endif Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is already using that as a priv pointer. I should probably change that name to make it more obvious what that's used for. > }; > > #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > @@ -310,6 +313,18 @@ struct tpm_cmd_t { > > ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > > +#ifdef CONFIG_XEN > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->priv; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->priv = priv; > +} > +#endif Can you put these in tpm_vtpm.c please? One less #define. :-) [cut] > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +typedef struct tpmif_tx_request tpmif_tx_request_t; checkpatch warned on this new typedef - please run through checkpatch and fix up that stuff. > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +typedef uint32_t TPMIF_RING_IDX; > + > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +typedef struct tpmif_ring tpmif_ring_t; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +typedef struct tpmif_tx_interface tpmif_tx_interface_t; > + > +#endif > + > +/* > + * Local variables: > + * mode: C > + * c-set-style: "BSD" > + * c-basic-offset: 4 > + * tab-width: 4 > + * indent-tabs-mode: nil > + * End: > + */ Please take this comment out, see Documentation/CodingStyle. Thanks, Kent > -- > 1.7.10.4 > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:58:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW75N-00041R-6J; Wed, 07 Nov 2012 14:58:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6uV-0003z2-O5 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:47:20 +0000 Received: from [193.109.254.147:14107] by server-4.bemta-14.messagelabs.com id 28/F9-18856-7747A905; Wed, 07 Nov 2012 14:47:19 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352299631!3210001!1 X-Originating-IP: [32.97.182.139] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjEzOSA9PiA2NzgxMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17069 invoked from network); 7 Nov 2012 14:47:12 -0000 Received: from e9.ny.us.ibm.com (HELO e9.ny.us.ibm.com) (32.97.182.139) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:47:12 -0000 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Nov 2012 09:47:10 -0500 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Nov 2012 09:47:08 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 2D30238C8042 for ; Wed, 7 Nov 2012 09:47:07 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA7El6Tv283140 for ; Wed, 7 Nov 2012 09:47:06 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA7El2GM008767 for ; Wed, 7 Nov 2012 09:47:06 -0500 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA7El1qo008493; Wed, 7 Nov 2012 09:47:01 -0500 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id 195662C0A93; Wed, 7 Nov 2012 08:46:28 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA7EkQVx003546; Wed, 7 Nov 2012 08:46:26 -0600 Date: Wed, 7 Nov 2012 08:46:26 -0600 From: Kent Yoder To: Matthew Fioravante Message-ID: <20121107144625.GA14628@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110714-7182-0000-0000-0000031E24EB X-Mailman-Approved-At: Wed, 07 Nov 2012 14:58:32 +0000 Cc: jeremy@goop.org, xen-devel@lists.xensource.com, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Matthew, On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 9 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 15 + > drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > drivers/char/tpm/tpm_vtpm.h | 55 +++ > drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/io/tpmif.h | 77 +++++ > 7 files changed, 1391 insertions(+) > create mode 100644 drivers/char/tpm/tpm_vtpm.c > create mode 100644 drivers/char/tpm/tpm_vtpm.h > create mode 100644 drivers/char/tpm/tpm_xen.c > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..08c1010 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,13 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. > + To compile this driver as a module, choose M here; the module > + will be called tpm_xenu. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..16911c5 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > +tpm_xenu-y = tpm_xen.o tpm_vtpm.o Let's match the naming convention of the other drivers if we can, so this would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..2e5a47a 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -130,6 +130,9 @@ struct tpm_chip { > > struct list_head list; > void (*release) (struct device *); > +#if CONFIG_XEN > + void *priv; > +#endif Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is already using that as a priv pointer. I should probably change that name to make it more obvious what that's used for. > }; > > #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > @@ -310,6 +313,18 @@ struct tpm_cmd_t { > > ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > > +#ifdef CONFIG_XEN > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->priv; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->priv = priv; > +} > +#endif Can you put these in tpm_vtpm.c please? One less #define. :-) [cut] > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +typedef struct tpmif_tx_request tpmif_tx_request_t; checkpatch warned on this new typedef - please run through checkpatch and fix up that stuff. > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +typedef uint32_t TPMIF_RING_IDX; > + > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +typedef struct tpmif_ring tpmif_ring_t; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +typedef struct tpmif_tx_interface tpmif_tx_interface_t; > + > +#endif > + > +/* > + * Local variables: > + * mode: C > + * c-set-style: "BSD" > + * c-basic-offset: 4 > + * tab-width: 4 > + * indent-tabs-mode: nil > + * End: > + */ Please take this comment out, see Documentation/CodingStyle. Thanks, Kent > -- > 1.7.10.4 > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:58:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW75N-00041Y-Hw; Wed, 07 Nov 2012 14:58:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6wT-0003zY-Pv for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:49:22 +0000 Received: from [85.158.137.99:19689] by server-13.bemta-3.messagelabs.com id D9/06-24887-CE47A905; Wed, 07 Nov 2012 14:49:16 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352299755!13392571!1 X-Originating-IP: [32.97.182.139] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjEzOSA9PiA2NzgxMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12156 invoked from network); 7 Nov 2012 14:49:16 -0000 Received: from e9.ny.us.ibm.com (HELO e9.ny.us.ibm.com) (32.97.182.139) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:49:16 -0000 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Nov 2012 09:49:14 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Nov 2012 09:49:12 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 130ED6E805C for ; Wed, 7 Nov 2012 09:49:10 -0500 (EST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA7En8OR273432 for ; Wed, 7 Nov 2012 09:49:08 -0500 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA7En5Rc022464 for ; Wed, 7 Nov 2012 07:49:06 -0700 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA7En5PB022448; Wed, 7 Nov 2012 07:49:05 -0700 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id AE3BE2C0A93; Wed, 7 Nov 2012 08:48:32 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA7EmVvo003797; Wed, 7 Nov 2012 08:48:31 -0600 Date: Wed, 7 Nov 2012 08:48:31 -0600 From: Kent Yoder To: Matthew Fioravante Message-ID: <20121107144831.GB14628@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A6AA6.2000208@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110714-7182-0000-0000-0000031E2B4C X-Mailman-Approved-At: Wed, 07 Nov 2012 14:58:32 +0000 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be > >a corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? Yep, those show up in sysfs. I'll put docs on my todo list. Kent > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 14:58:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 14:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW75N-00041Y-Hw; Wed, 07 Nov 2012 14:58:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW6wT-0003zY-Pv for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 14:49:22 +0000 Received: from [85.158.137.99:19689] by server-13.bemta-3.messagelabs.com id D9/06-24887-CE47A905; Wed, 07 Nov 2012 14:49:16 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352299755!13392571!1 X-Originating-IP: [32.97.182.139] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjEzOSA9PiA2NzgxMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12156 invoked from network); 7 Nov 2012 14:49:16 -0000 Received: from e9.ny.us.ibm.com (HELO e9.ny.us.ibm.com) (32.97.182.139) by server-5.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 14:49:16 -0000 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Nov 2012 09:49:14 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Nov 2012 09:49:12 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 130ED6E805C for ; Wed, 7 Nov 2012 09:49:10 -0500 (EST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA7En8OR273432 for ; Wed, 7 Nov 2012 09:49:08 -0500 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA7En5Rc022464 for ; Wed, 7 Nov 2012 07:49:06 -0700 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA7En5PB022448; Wed, 7 Nov 2012 07:49:05 -0700 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id AE3BE2C0A93; Wed, 7 Nov 2012 08:48:32 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA7EmVvo003797; Wed, 7 Nov 2012 08:48:31 -0600 Date: Wed, 7 Nov 2012 08:48:31 -0600 From: Kent Yoder To: Matthew Fioravante Message-ID: <20121107144831.GB14628@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A6AA6.2000208@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110714-7182-0000-0000-0000031E2B4C X-Mailman-Approved-At: Wed, 07 Nov 2012 14:58:32 +0000 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , Konrad Rzeszutek Wilk , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be > >a corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? Yep, those show up in sysfs. I'll put docs on my todo list. Kent > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 15:12:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 15:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW7IG-0004RU-70; Wed, 07 Nov 2012 15:11:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW7IF-0004RN-5k for xen-devel@lists.xen.org; Wed, 07 Nov 2012 15:11:51 +0000 Received: from [85.158.143.35:27931] by server-1.bemta-4.messagelabs.com id 7C/91-27934-63A7A905; Wed, 07 Nov 2012 15:11:50 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352301039!16850827!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15893 invoked from network); 7 Nov 2012 15:10:41 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 15:10:41 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7FAZin009079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 15:10:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7FAZjZ015528 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 15:10:35 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7FAZLJ009389; Wed, 7 Nov 2012 09:10:35 -0600 MIME-Version: 1.0 Message-ID: <73e55d7f-737f-4690-8b69-0252e0b749dd@default> Date: Wed, 7 Nov 2012 07:10:33 -0800 (PST) From: Dan Magenheimer To: Andrew Cooper References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> In-Reply-To: <509A65D6.6050505@citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > On 06/11/12 23:41, Dan Magenheimer wrote: > >> From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > >> Sent: Tuesday, November 06, 2012 4:19 PM > >> To: xen-devel@lists.xen.org > >> Subject: Re: [Xen-devel] reliable live migration of large and busy guests > >> > >> As potential food for thought: > >> > >> Is there wisdom in having a new kind of live migrate which, when pausing > >> the VM on the source host, resumes the VM on the destination host. Xen > >> would have to track not-yet-sent pages and pause the guest on pagefault, > >> and request the required page as a matter of priority. > >> > >> The advantages of this approach would be that a timing sensitive > >> workloads would be paused for far less time. Even if it was frequently > >> being paused for pagefaults, the time to get a single page over the LAN > >> would be far quicker than the entire dirty set, at which point on > >> resume, the interrupt paths would fire again; The timing paths would > >> quickly become fully populated. Further to that, a busy workload in the > >> guest dirtying a page which has already been sent will not result in any > >> further network traffic. > > Something like this? > > > > http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 > > Oh wow - something quite like that. Thankyou very much. I will read > the paper in full when I get a free moment, but the abstract looks very > interesting. Hi Andrew -- FYI, selfballooning is now built into the Linux kernel (since about summer of 2011, so may not be in many distros yet). It is currently tied to tmem (transcendent memory), which is not turned on by default but if you start developing something like post-copy migration, let me know. AFAIK, there is no way to do selfballooning in Windows (not even in userspace I think, since IIRC, unlike Linux sysfs, there is no way to adjust the balloon size outside the kernel... but I know nothing about Windows ;-) > From an idealistic point of view, it might be quite nice to have several > live migrate mechanisms, so the user can choose whether they value > minimum downtime, minimum network utilisation, or maximum safety. Agreed. IIRC, when post-copy was suggested for Xen years ago, Ian Pratt was against it, though I don't recall why, so Michael Hines work was never pursued (outside of academia). Probably worth asking IanP before investing too much time into it. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 15:12:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 15:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW7IG-0004RU-70; Wed, 07 Nov 2012 15:11:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW7IF-0004RN-5k for xen-devel@lists.xen.org; Wed, 07 Nov 2012 15:11:51 +0000 Received: from [85.158.143.35:27931] by server-1.bemta-4.messagelabs.com id 7C/91-27934-63A7A905; Wed, 07 Nov 2012 15:11:50 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352301039!16850827!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15893 invoked from network); 7 Nov 2012 15:10:41 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 15:10:41 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7FAZin009079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 15:10:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7FAZjZ015528 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 15:10:35 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7FAZLJ009389; Wed, 7 Nov 2012 09:10:35 -0600 MIME-Version: 1.0 Message-ID: <73e55d7f-737f-4690-8b69-0252e0b749dd@default> Date: Wed, 7 Nov 2012 07:10:33 -0800 (PST) From: Dan Magenheimer To: Andrew Cooper References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> In-Reply-To: <509A65D6.6050505@citrix.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > On 06/11/12 23:41, Dan Magenheimer wrote: > >> From: Andrew Cooper [mailto:andrew.cooper3@citrix.com] > >> Sent: Tuesday, November 06, 2012 4:19 PM > >> To: xen-devel@lists.xen.org > >> Subject: Re: [Xen-devel] reliable live migration of large and busy guests > >> > >> As potential food for thought: > >> > >> Is there wisdom in having a new kind of live migrate which, when pausing > >> the VM on the source host, resumes the VM on the destination host. Xen > >> would have to track not-yet-sent pages and pause the guest on pagefault, > >> and request the required page as a matter of priority. > >> > >> The advantages of this approach would be that a timing sensitive > >> workloads would be paused for far less time. Even if it was frequently > >> being paused for pagefaults, the time to get a single page over the LAN > >> would be far quicker than the entire dirty set, at which point on > >> resume, the interrupt paths would fire again; The timing paths would > >> quickly become fully populated. Further to that, a busy workload in the > >> guest dirtying a page which has already been sent will not result in any > >> further network traffic. > > Something like this? > > > > http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.184.2368 > > Oh wow - something quite like that. Thankyou very much. I will read > the paper in full when I get a free moment, but the abstract looks very > interesting. Hi Andrew -- FYI, selfballooning is now built into the Linux kernel (since about summer of 2011, so may not be in many distros yet). It is currently tied to tmem (transcendent memory), which is not turned on by default but if you start developing something like post-copy migration, let me know. AFAIK, there is no way to do selfballooning in Windows (not even in userspace I think, since IIRC, unlike Linux sysfs, there is no way to adjust the balloon size outside the kernel... but I know nothing about Windows ;-) > From an idealistic point of view, it might be quite nice to have several > live migrate mechanisms, so the user can choose whether they value > minimum downtime, minimum network utilisation, or maximum safety. Agreed. IIRC, when post-copy was suggested for Xen years ago, Ian Pratt was against it, though I don't recall why, so Michael Hines work was never pursued (outside of academia). Probably worth asking IanP before investing too much time into it. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW82m-0004lE-4M; Wed, 07 Nov 2012 15:59:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW82k-0004l9-K7 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 15:59:54 +0000 Received: from [193.109.254.147:51453] by server-12.bemta-14.messagelabs.com id 27/5A-00510-9758A905; Wed, 07 Nov 2012 15:59:53 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352303991!9294420!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30583 invoked from network); 7 Nov 2012 15:59:53 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 15:59:53 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7Fxm1b009019 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 15:59:49 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7FxlbH011959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 15:59:48 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7Fxllq008740; Wed, 7 Nov 2012 09:59:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 07:59:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 8170C40157; Wed, 7 Nov 2012 10:47:01 -0500 (EST) Date: Wed, 7 Nov 2012 10:47:01 -0500 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121107154701.GA18615@phenom.dumpdata.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> <1352272794.12977.17.camel@hastur.hellion.org.uk> <509A2C2402000078000A6EB9@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A2C2402000078000A6EB9@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "xen-devel@lists.xensource.com" , Ian Campbell , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 08:38:44AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 08:19, Ian Campbell wrote: > > On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > >> As there is no need for it (the fallback code is for older > >> hypervisors and they won't run under ARM), > > > > I think more specifically they won't run on anything other than x86. > > > > [...] > >> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >> index 46de6cd..273d2b9 100644 > >> --- a/drivers/xen/Makefile > >> +++ b/drivers/xen/Makefile > >> @@ -1,8 +1,8 @@ > >> ifneq ($(CONFIG_ARM),y) > >> -obj-y += manage.o balloon.o > >> +obj-y += manage.o balloon.o fallback.o > >> obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > >> endif > > > > I think : > > obj-$(CONFIG_X86) += fallback.o > > would better reflect what is going on here. > > Yes please. >From 6bf926ddd44ddc67edbeb28d4069f207f2c6e07e Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 6 Nov 2012 15:49:27 -0500 Subject: [PATCH 1/2] xen/generic: Disable fallback build on ARM. As there is no need for it (the fallback code is for older hypervisors and they only run under x86), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more [v1: Moved the enablement to be covered by CONFIG_X86 per Ian's suggestion] Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..7435470 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,7 +2,8 @@ ifneq ($(CONFIG_ARM),y) obj-y += manage.o balloon.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-$(CONFIG_X86) += fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) -- 1.7.7.6 > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW82m-0004lE-4M; Wed, 07 Nov 2012 15:59:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW82k-0004l9-K7 for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 15:59:54 +0000 Received: from [193.109.254.147:51453] by server-12.bemta-14.messagelabs.com id 27/5A-00510-9758A905; Wed, 07 Nov 2012 15:59:53 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352303991!9294420!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30583 invoked from network); 7 Nov 2012 15:59:53 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 15:59:53 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7Fxm1b009019 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 15:59:49 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7FxlbH011959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 15:59:48 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7Fxllq008740; Wed, 7 Nov 2012 09:59:47 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 07:59:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 8170C40157; Wed, 7 Nov 2012 10:47:01 -0500 (EST) Date: Wed, 7 Nov 2012 10:47:01 -0500 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121107154701.GA18615@phenom.dumpdata.com> References: <1352239982-17389-1-git-send-email-konrad.wilk@oracle.com> <1352239982-17389-2-git-send-email-konrad.wilk@oracle.com> <1352272794.12977.17.camel@hastur.hellion.org.uk> <509A2C2402000078000A6EB9@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A2C2402000078000A6EB9@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "xen-devel@lists.xensource.com" , Ian Campbell , "linux-kernel@vger.kernel.org" Subject: Re: [Xen-devel] [PATCH 1/2] xen/generic: Disable fallback build on ARM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 08:38:44AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 08:19, Ian Campbell wrote: > > On Tue, 2012-11-06 at 22:13 +0000, Konrad Rzeszutek Wilk wrote: > >> As there is no need for it (the fallback code is for older > >> hypervisors and they won't run under ARM), > > > > I think more specifically they won't run on anything other than x86. > > > > [...] > >> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > >> index 46de6cd..273d2b9 100644 > >> --- a/drivers/xen/Makefile > >> +++ b/drivers/xen/Makefile > >> @@ -1,8 +1,8 @@ > >> ifneq ($(CONFIG_ARM),y) > >> -obj-y += manage.o balloon.o > >> +obj-y += manage.o balloon.o fallback.o > >> obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > >> endif > > > > I think : > > obj-$(CONFIG_X86) += fallback.o > > would better reflect what is going on here. > > Yes please. >From 6bf926ddd44ddc67edbeb28d4069f207f2c6e07e Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 6 Nov 2012 15:49:27 -0500 Subject: [PATCH 1/2] xen/generic: Disable fallback build on ARM. As there is no need for it (the fallback code is for older hypervisors and they only run under x86), and also b/c we get: drivers/xen/fallback.c: In function 'xen_event_channel_op_compat': drivers/xen/fallback.c:10:19: error: storage size of 'op' isn't known drivers/xen/fallback.c:15:2: error: implicit declaration of function '_hypercall1' [-Werror=implicit-function-declaration] drivers/xen/fallback.c:15:19: error: expected expression before 'int' drivers/xen/fallback.c:18:7: error: 'EVTCHNOP_close' undeclared (first use in this function) drivers/xen/fallback.c:18:7: note: each undeclared identifier is reported only once for each function it appears in .. and more [v1: Moved the enablement to be covered by CONFIG_X86 per Ian's suggestion] Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 46de6cd..7435470 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -2,7 +2,8 @@ ifneq ($(CONFIG_ARM),y) obj-y += manage.o balloon.o obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o endif -obj-y += grant-table.o features.o events.o fallback.o +obj-$(CONFIG_X86) += fallback.o +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) -- 1.7.7.6 > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:06:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:06:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW88c-0005JX-Ty; Wed, 07 Nov 2012 16:05:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW88b-0005JR-0I for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:05:57 +0000 Received: from [85.158.138.51:46031] by server-10.bemta-3.messagelabs.com id 6F/A9-19806-4E68A905; Wed, 07 Nov 2012 16:05:56 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-174.messagelabs.com!1352304354!29165329!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11642 invoked from network); 7 Nov 2012 16:05:54 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-174.messagelabs.com with SMTP; 7 Nov 2012 16:05:54 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:05:54 +0000 Message-Id: <509A94F002000078000A702A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:05:52 +0000 From: "Jan Beulich" To: "xen-devel" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartD4E513F0.4__=" Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartD4E513F0.4__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Instead, give the owning domain at least a small opportunity of fixing things up, and allow for rare faults to not bring down the device at all. The amount of faults tolerated within a given time period (all numbers are made up with no specific rationale) is higher for Dom0 than for DomU-s. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ =20 static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) { - u16 domain_id, device_id, bdf, cword, flags; + u16 domain_id, device_id, bdf, flags; u32 code; u64 *addr; int count =3D 0; @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct "fault address =3D %#"PRIx64", flags =3D %#x\n", event_str[code-1], domain_id, device_id, *addr, flags); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ ) if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id ) - { - cword =3D pci_conf_read16(iommu->seg, PCI_BUS(bdf), - PCI_SLOT(bdf), PCI_FUNC(bdf), - PCI_COMMAND); - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), - PCI_FUNC(bdf), PCI_COMMAND,=20 - cword & ~PCI_COMMAND_MASTER); - } + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), + PCI_DEVFN2(bdf)); } else { --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) { struct hvm_iommu *hd =3D domain_hvm_iommu(d); + struct pci_dev *pdev; int rc =3D 0; =20 if ( !iommu_enabled || !hd->platform_ops ) @@ -228,6 +229,13 @@ static int assign_device(struct domain * return -EXDEV; =20 spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(seg, bus, devfn); + if ( pdev ) + { + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_UNPRIV; + pdev->fault.count =3D 0; + } + if ( (rc =3D hd->platform_ops->assign_device(d, seg, bus, devfn)) ) goto done; =20 @@ -239,6 +247,8 @@ static int assign_device(struct domain * goto done; } done: + if ( pdev && pdev->domain !=3D d ) + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; spin_unlock(&pcidevs_lock); return rc; } @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 return ret; } =20 + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; + pdev->fault.count =3D 0; + if ( !has_arch_pdevs(d) && need_iommu(d) ) { d->need_iommu =3D 0; --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct *((u8*) &pdev->bus) =3D bus; *((u8*) &pdev->devfn) =3D devfn; pdev->domain =3D NULL; + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; INIT_LIST_HEAD(&pdev->msi_list); list_add(&pdev->alldevs_list, &pseg->alldevs_list); spin_lock_init(&pdev->msix_table_lock); @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 return 1; } =20 +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) +{ + struct pci_dev *pdev; + s_time_t now =3D NOW(); + u16 cword; + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(seg, bus, devfn); + if ( pdev ) + { + if ( now < pdev->fault.time || + now - pdev->fault.time > MILLISECS(10) ) + pdev->fault.count >>=3D 1; + pdev->fault.time =3D now; + if ( ++pdev->fault.count < pdev->fault.threshold ) + pdev =3D NULL; + } + spin_unlock(&pcidevs_lock); + + if ( !pdev ) + return; + + /* Tell the device to stop DMAing; we can't rely on the guest to + * control it for us. */ + cword =3D pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + PCI_COMMAND); + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); +} + /* * scan pci devices to add all existed PCI devices to alldevs_list, * and setup pci hierarchy in array bus2bridge. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct while (1) { u8 fault_reason; - u16 source_id, cword; + u16 source_id; u32 data; u64 guest_addr; int type; @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct iommu_page_fault_do_one(iommu, type, fault_reason, source_id, guest_addr); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ - cword =3D pci_conf_read16(iommu->intel->drhd->segment, - PCI_BUS(source_id), PCI_SLOT(source_id), - PCI_FUNC(source_id), PCI_COMMAND); - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), - PCI_SLOT(source_id), PCI_FUNC(source_id), - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + pci_check_disable_device(iommu->intel->drhd->segment, + PCI_BUS(source_id), PCI_DEVFN2(source_id)= ); =20 fault_index++; if ( fault_index > cap_num_fault_regs(iommu->cap) ) --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -64,6 +64,13 @@ struct pci_dev { const u8 devfn; struct pci_dev_info info; struct arch_pci_dev arch; + struct { + s_time_t time; + unsigned int threshold; +#define PT_FAULT_THRESHOLD_PRIV 10 +#define PT_FAULT_THRESHOLD_UNPRIV 3 + unsigned int count; + } fault; u64 vf_rlen[6]; }; =20 @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); struct pci_dev *pci_get_pdev_by_domain( struct domain *, int seg, int bus, int devfn); +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); =20 uint8_t pci_conf_read8( unsigned int seg, unsigned int bus, unsigned int dev, unsigned int = func, --=__PartD4E513F0.4__= Content-Type: text/plain; name="IOMMU-defer-BM-disable.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="IOMMU-defer-BM-disable.patch" IOMMU: don't immediately disable bus mastering on faults=0A=0AInstead, = give the owning domain at least a small opportunity of fixing=0Athings up, = and allow for rare faults to not bring down the device at=0Aall. The = amount of faults tolerated within a given time period (all=0Anumbers are = made up with no specific rationale) is higher for Dom0 than=0Afor = DomU-s.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/drivers/passthrough/amd/iommu_init.c=0A+++ b/xen/drivers/passthrough/= amd/iommu_init.c=0A@@ -566,7 +566,7 @@ static hw_irq_controller iommu_maska= ble_=0A =0A static void parse_event_log_entry(struct amd_iommu *iommu, u32 = entry[])=0A {=0A- u16 domain_id, device_id, bdf, cword, flags;=0A+ = u16 domain_id, device_id, bdf, flags;=0A u32 code;=0A u64 = *addr;=0A int count =3D 0;=0A@@ -620,18 +620,10 @@ static void = parse_event_log_entry(struct=0A "fault address =3D = %#"PRIx64", flags =3D %#x\n",=0A event_str[code-1], = domain_id, device_id, *addr, flags);=0A =0A- /* Tell the device to = stop DMAing; we can't rely on the guest to=0A- * control it for = us. */=0A for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ )=0A = if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id )=0A- = {=0A- cword =3D pci_conf_read16(iommu->seg, = PCI_BUS(bdf),=0A- PCI_SLOT(bdf), = PCI_FUNC(bdf),=0A- PCI_COMMAND);=0A-= pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf),= =0A- PCI_FUNC(bdf), PCI_COMMAND, =0A- = cword & ~PCI_COMMAND_MASTER);=0A- = }=0A+ pci_check_disable_device(iommu->seg, PCI_BUS(bdf),=0A+= PCI_DEVFN2(bdf));=0A }=0A = else=0A {=0A--- a/xen/drivers/passthrough/iommu.c=0A+++ b/xen/drivers/p= assthrough/iommu.c=0A@@ -215,6 +215,7 @@ static int device_assigned(u16 = seg, u8 b=0A static int assign_device(struct domain *d, u16 seg, u8 bus, = u8 devfn)=0A {=0A struct hvm_iommu *hd =3D domain_hvm_iommu(d);=0A+ = struct pci_dev *pdev;=0A int rc =3D 0;=0A =0A if ( !iommu_enabled = || !hd->platform_ops )=0A@@ -228,6 +229,13 @@ static int assign_device(stru= ct domain *=0A return -EXDEV;=0A =0A spin_lock(&pcidevs_lock);= =0A+ pdev =3D pci_get_pdev(seg, bus, devfn);=0A+ if ( pdev )=0A+ = {=0A+ pdev->fault.threshold =3D PT_FAULT_THRESHOLD_UNPRIV;=0A+ = pdev->fault.count =3D 0;=0A+ }=0A+=0A if ( (rc =3D hd->platfor= m_ops->assign_device(d, seg, bus, devfn)) )=0A goto done;=0A =0A@@ = -239,6 +247,8 @@ static int assign_device(struct domain *=0A goto = done;=0A }=0A done:=0A+ if ( pdev && pdev->domain !=3D d )=0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A spin_unlock(&pc= idevs_lock);=0A return rc;=0A }=0A@@ -379,6 +389,9 @@ int deassign_devi= ce(struct domain *d, u1=0A return ret;=0A }=0A =0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A+ pdev->fault.count= =3D 0;=0A+=0A if ( !has_arch_pdevs(d) && need_iommu(d) )=0A = {=0A d->need_iommu =3D 0;=0A--- a/xen/drivers/passthrough/pci.c=0A+= ++ b/xen/drivers/passthrough/pci.c=0A@@ -137,6 +137,7 @@ static struct = pci_dev *alloc_pdev(struct=0A *((u8*) &pdev->bus) =3D bus;=0A = *((u8*) &pdev->devfn) =3D devfn;=0A pdev->domain =3D NULL;=0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A INIT_LIST_HEAD(&p= dev->msi_list);=0A list_add(&pdev->alldevs_list, &pseg->alldevs_list);= =0A spin_lock_init(&pdev->msix_table_lock);=0A@@ -672,6 +673,36 @@ int = __init pci_device_detect(u16 seg, u8=0A return 1;=0A }=0A =0A+void = pci_check_disable_device(u16 seg, u8 bus, u8 devfn)=0A+{=0A+ struct = pci_dev *pdev;=0A+ s_time_t now =3D NOW();=0A+ u16 cword;=0A+=0A+ = spin_lock(&pcidevs_lock);=0A+ pdev =3D pci_get_pdev(seg, bus, devfn);=0A= + if ( pdev )=0A+ {=0A+ if ( now < pdev->fault.time ||=0A+ = now - pdev->fault.time > MILLISECS(10) )=0A+ pdev->faul= t.count >>=3D 1;=0A+ pdev->fault.time =3D now;=0A+ if ( = ++pdev->fault.count < pdev->fault.threshold )=0A+ pdev =3D = NULL;=0A+ }=0A+ spin_unlock(&pcidevs_lock);=0A+=0A+ if ( !pdev = )=0A+ return;=0A+=0A+ /* Tell the device to stop DMAing; we = can't rely on the guest to=0A+ * control it for us. */=0A+ cword = =3D pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn),=0A+ = PCI_COMMAND);=0A+ pci_conf_write16(seg, bus, = PCI_SLOT(devfn), PCI_FUNC(devfn),=0A+ PCI_COMMAND, = cword & ~PCI_COMMAND_MASTER);=0A+}=0A+=0A /*=0A * scan pci devices to add = all existed PCI devices to alldevs_list,=0A * and setup pci hierarchy in = array bus2bridge.=0A--- a/xen/drivers/passthrough/vtd/iommu.c=0A+++ = b/xen/drivers/passthrough/vtd/iommu.c=0A@@ -917,7 +917,7 @@ static void = __do_iommu_page_fault(struct=0A while (1)=0A {=0A u8 = fault_reason;=0A- u16 source_id, cword;=0A+ u16 source_id;=0A= u32 data;=0A u64 guest_addr;=0A int type;=0A@@ = -950,14 +950,8 @@ static void __do_iommu_page_fault(struct=0A = iommu_page_fault_do_one(iommu, type, fault_reason,=0A = source_id, guest_addr);=0A =0A- /* Tell the device to = stop DMAing; we can't rely on the guest to=0A- * control it for = us. */=0A- cword =3D pci_conf_read16(iommu->intel->drhd->segment,=0A= - PCI_BUS(source_id), PCI_SLOT(source_id),= =0A- PCI_FUNC(source_id), PCI_COMMAND);=0A- = pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id),=0A= - PCI_SLOT(source_id), PCI_FUNC(source_id),=0A- = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ = pci_check_disable_device(iommu->intel->drhd->segment,=0A+ = PCI_BUS(source_id), PCI_DEVFN2(source_id));=0A =0A = fault_index++;=0A if ( fault_index > cap_num_fault_regs(iommu->cap)= )=0A--- a/xen/include/xen/pci.h=0A+++ b/xen/include/xen/pci.h=0A@@ -64,6 = +64,13 @@ struct pci_dev {=0A const u8 devfn;=0A struct pci_dev_inf= o info;=0A struct arch_pci_dev arch;=0A+ struct {=0A+ = s_time_t time;=0A+ unsigned int threshold;=0A+#define PT_FAULT_THRES= HOLD_PRIV 10=0A+#define PT_FAULT_THRESHOLD_UNPRIV 3=0A+ unsigned = int count;=0A+ } fault;=0A u64 vf_rlen[6];=0A };=0A =0A@@ -107,6 = +114,7 @@ int pci_hide_device(int bus, int devfn);=0A struct pci_dev = *pci_get_pdev(int seg, int bus, int devfn);=0A struct pci_dev *pci_get_pdev= _by_domain(=0A struct domain *, int seg, int bus, int devfn);=0A+void = pci_check_disable_device(u16 seg, u8 bus, u8 devfn);=0A =0A uint8_t = pci_conf_read8(=0A unsigned int seg, unsigned int bus, unsigned int = dev, unsigned int func,=0A --=__PartD4E513F0.4__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartD4E513F0.4__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:06:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:06:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW88c-0005JX-Ty; Wed, 07 Nov 2012 16:05:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW88b-0005JR-0I for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:05:57 +0000 Received: from [85.158.138.51:46031] by server-10.bemta-3.messagelabs.com id 6F/A9-19806-4E68A905; Wed, 07 Nov 2012 16:05:56 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-174.messagelabs.com!1352304354!29165329!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11642 invoked from network); 7 Nov 2012 16:05:54 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-174.messagelabs.com with SMTP; 7 Nov 2012 16:05:54 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:05:54 +0000 Message-Id: <509A94F002000078000A702A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:05:52 +0000 From: "Jan Beulich" To: "xen-devel" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> In-Reply-To: <20121106094456.GA45690@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartD4E513F0.4__=" Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartD4E513F0.4__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Instead, give the owning domain at least a small opportunity of fixing things up, and allow for rare faults to not bring down the device at all. The amount of faults tolerated within a given time period (all numbers are made up with no specific rationale) is higher for Dom0 than for DomU-s. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ =20 static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) { - u16 domain_id, device_id, bdf, cword, flags; + u16 domain_id, device_id, bdf, flags; u32 code; u64 *addr; int count =3D 0; @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct "fault address =3D %#"PRIx64", flags =3D %#x\n", event_str[code-1], domain_id, device_id, *addr, flags); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ ) if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id ) - { - cword =3D pci_conf_read16(iommu->seg, PCI_BUS(bdf), - PCI_SLOT(bdf), PCI_FUNC(bdf), - PCI_COMMAND); - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), - PCI_FUNC(bdf), PCI_COMMAND,=20 - cword & ~PCI_COMMAND_MASTER); - } + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), + PCI_DEVFN2(bdf)); } else { --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) { struct hvm_iommu *hd =3D domain_hvm_iommu(d); + struct pci_dev *pdev; int rc =3D 0; =20 if ( !iommu_enabled || !hd->platform_ops ) @@ -228,6 +229,13 @@ static int assign_device(struct domain * return -EXDEV; =20 spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(seg, bus, devfn); + if ( pdev ) + { + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_UNPRIV; + pdev->fault.count =3D 0; + } + if ( (rc =3D hd->platform_ops->assign_device(d, seg, bus, devfn)) ) goto done; =20 @@ -239,6 +247,8 @@ static int assign_device(struct domain * goto done; } done: + if ( pdev && pdev->domain !=3D d ) + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; spin_unlock(&pcidevs_lock); return rc; } @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 return ret; } =20 + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; + pdev->fault.count =3D 0; + if ( !has_arch_pdevs(d) && need_iommu(d) ) { d->need_iommu =3D 0; --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct *((u8*) &pdev->bus) =3D bus; *((u8*) &pdev->devfn) =3D devfn; pdev->domain =3D NULL; + pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV; INIT_LIST_HEAD(&pdev->msi_list); list_add(&pdev->alldevs_list, &pseg->alldevs_list); spin_lock_init(&pdev->msix_table_lock); @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 return 1; } =20 +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) +{ + struct pci_dev *pdev; + s_time_t now =3D NOW(); + u16 cword; + + spin_lock(&pcidevs_lock); + pdev =3D pci_get_pdev(seg, bus, devfn); + if ( pdev ) + { + if ( now < pdev->fault.time || + now - pdev->fault.time > MILLISECS(10) ) + pdev->fault.count >>=3D 1; + pdev->fault.time =3D now; + if ( ++pdev->fault.count < pdev->fault.threshold ) + pdev =3D NULL; + } + spin_unlock(&pcidevs_lock); + + if ( !pdev ) + return; + + /* Tell the device to stop DMAing; we can't rely on the guest to + * control it for us. */ + cword =3D pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + PCI_COMMAND); + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); +} + /* * scan pci devices to add all existed PCI devices to alldevs_list, * and setup pci hierarchy in array bus2bridge. --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct while (1) { u8 fault_reason; - u16 source_id, cword; + u16 source_id; u32 data; u64 guest_addr; int type; @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct iommu_page_fault_do_one(iommu, type, fault_reason, source_id, guest_addr); =20 - /* Tell the device to stop DMAing; we can't rely on the guest to - * control it for us. */ - cword =3D pci_conf_read16(iommu->intel->drhd->segment, - PCI_BUS(source_id), PCI_SLOT(source_id), - PCI_FUNC(source_id), PCI_COMMAND); - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), - PCI_SLOT(source_id), PCI_FUNC(source_id), - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); + pci_check_disable_device(iommu->intel->drhd->segment, + PCI_BUS(source_id), PCI_DEVFN2(source_id)= ); =20 fault_index++; if ( fault_index > cap_num_fault_regs(iommu->cap) ) --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -64,6 +64,13 @@ struct pci_dev { const u8 devfn; struct pci_dev_info info; struct arch_pci_dev arch; + struct { + s_time_t time; + unsigned int threshold; +#define PT_FAULT_THRESHOLD_PRIV 10 +#define PT_FAULT_THRESHOLD_UNPRIV 3 + unsigned int count; + } fault; u64 vf_rlen[6]; }; =20 @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); struct pci_dev *pci_get_pdev_by_domain( struct domain *, int seg, int bus, int devfn); +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); =20 uint8_t pci_conf_read8( unsigned int seg, unsigned int bus, unsigned int dev, unsigned int = func, --=__PartD4E513F0.4__= Content-Type: text/plain; name="IOMMU-defer-BM-disable.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="IOMMU-defer-BM-disable.patch" IOMMU: don't immediately disable bus mastering on faults=0A=0AInstead, = give the owning domain at least a small opportunity of fixing=0Athings up, = and allow for rare faults to not bring down the device at=0Aall. The = amount of faults tolerated within a given time period (all=0Anumbers are = made up with no specific rationale) is higher for Dom0 than=0Afor = DomU-s.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/drivers/passthrough/amd/iommu_init.c=0A+++ b/xen/drivers/passthrough/= amd/iommu_init.c=0A@@ -566,7 +566,7 @@ static hw_irq_controller iommu_maska= ble_=0A =0A static void parse_event_log_entry(struct amd_iommu *iommu, u32 = entry[])=0A {=0A- u16 domain_id, device_id, bdf, cword, flags;=0A+ = u16 domain_id, device_id, bdf, flags;=0A u32 code;=0A u64 = *addr;=0A int count =3D 0;=0A@@ -620,18 +620,10 @@ static void = parse_event_log_entry(struct=0A "fault address =3D = %#"PRIx64", flags =3D %#x\n",=0A event_str[code-1], = domain_id, device_id, *addr, flags);=0A =0A- /* Tell the device to = stop DMAing; we can't rely on the guest to=0A- * control it for = us. */=0A for ( bdf =3D 0; bdf < ivrs_bdf_entries; bdf++ )=0A = if ( get_dma_requestor_id(iommu->seg, bdf) =3D=3D device_id )=0A- = {=0A- cword =3D pci_conf_read16(iommu->seg, = PCI_BUS(bdf),=0A- PCI_SLOT(bdf), = PCI_FUNC(bdf),=0A- PCI_COMMAND);=0A-= pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf),= =0A- PCI_FUNC(bdf), PCI_COMMAND, =0A- = cword & ~PCI_COMMAND_MASTER);=0A- = }=0A+ pci_check_disable_device(iommu->seg, PCI_BUS(bdf),=0A+= PCI_DEVFN2(bdf));=0A }=0A = else=0A {=0A--- a/xen/drivers/passthrough/iommu.c=0A+++ b/xen/drivers/p= assthrough/iommu.c=0A@@ -215,6 +215,7 @@ static int device_assigned(u16 = seg, u8 b=0A static int assign_device(struct domain *d, u16 seg, u8 bus, = u8 devfn)=0A {=0A struct hvm_iommu *hd =3D domain_hvm_iommu(d);=0A+ = struct pci_dev *pdev;=0A int rc =3D 0;=0A =0A if ( !iommu_enabled = || !hd->platform_ops )=0A@@ -228,6 +229,13 @@ static int assign_device(stru= ct domain *=0A return -EXDEV;=0A =0A spin_lock(&pcidevs_lock);= =0A+ pdev =3D pci_get_pdev(seg, bus, devfn);=0A+ if ( pdev )=0A+ = {=0A+ pdev->fault.threshold =3D PT_FAULT_THRESHOLD_UNPRIV;=0A+ = pdev->fault.count =3D 0;=0A+ }=0A+=0A if ( (rc =3D hd->platfor= m_ops->assign_device(d, seg, bus, devfn)) )=0A goto done;=0A =0A@@ = -239,6 +247,8 @@ static int assign_device(struct domain *=0A goto = done;=0A }=0A done:=0A+ if ( pdev && pdev->domain !=3D d )=0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A spin_unlock(&pc= idevs_lock);=0A return rc;=0A }=0A@@ -379,6 +389,9 @@ int deassign_devi= ce(struct domain *d, u1=0A return ret;=0A }=0A =0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A+ pdev->fault.count= =3D 0;=0A+=0A if ( !has_arch_pdevs(d) && need_iommu(d) )=0A = {=0A d->need_iommu =3D 0;=0A--- a/xen/drivers/passthrough/pci.c=0A+= ++ b/xen/drivers/passthrough/pci.c=0A@@ -137,6 +137,7 @@ static struct = pci_dev *alloc_pdev(struct=0A *((u8*) &pdev->bus) =3D bus;=0A = *((u8*) &pdev->devfn) =3D devfn;=0A pdev->domain =3D NULL;=0A+ = pdev->fault.threshold =3D PT_FAULT_THRESHOLD_PRIV;=0A INIT_LIST_HEAD(&p= dev->msi_list);=0A list_add(&pdev->alldevs_list, &pseg->alldevs_list);= =0A spin_lock_init(&pdev->msix_table_lock);=0A@@ -672,6 +673,36 @@ int = __init pci_device_detect(u16 seg, u8=0A return 1;=0A }=0A =0A+void = pci_check_disable_device(u16 seg, u8 bus, u8 devfn)=0A+{=0A+ struct = pci_dev *pdev;=0A+ s_time_t now =3D NOW();=0A+ u16 cword;=0A+=0A+ = spin_lock(&pcidevs_lock);=0A+ pdev =3D pci_get_pdev(seg, bus, devfn);=0A= + if ( pdev )=0A+ {=0A+ if ( now < pdev->fault.time ||=0A+ = now - pdev->fault.time > MILLISECS(10) )=0A+ pdev->faul= t.count >>=3D 1;=0A+ pdev->fault.time =3D now;=0A+ if ( = ++pdev->fault.count < pdev->fault.threshold )=0A+ pdev =3D = NULL;=0A+ }=0A+ spin_unlock(&pcidevs_lock);=0A+=0A+ if ( !pdev = )=0A+ return;=0A+=0A+ /* Tell the device to stop DMAing; we = can't rely on the guest to=0A+ * control it for us. */=0A+ cword = =3D pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn),=0A+ = PCI_COMMAND);=0A+ pci_conf_write16(seg, bus, = PCI_SLOT(devfn), PCI_FUNC(devfn),=0A+ PCI_COMMAND, = cword & ~PCI_COMMAND_MASTER);=0A+}=0A+=0A /*=0A * scan pci devices to add = all existed PCI devices to alldevs_list,=0A * and setup pci hierarchy in = array bus2bridge.=0A--- a/xen/drivers/passthrough/vtd/iommu.c=0A+++ = b/xen/drivers/passthrough/vtd/iommu.c=0A@@ -917,7 +917,7 @@ static void = __do_iommu_page_fault(struct=0A while (1)=0A {=0A u8 = fault_reason;=0A- u16 source_id, cword;=0A+ u16 source_id;=0A= u32 data;=0A u64 guest_addr;=0A int type;=0A@@ = -950,14 +950,8 @@ static void __do_iommu_page_fault(struct=0A = iommu_page_fault_do_one(iommu, type, fault_reason,=0A = source_id, guest_addr);=0A =0A- /* Tell the device to = stop DMAing; we can't rely on the guest to=0A- * control it for = us. */=0A- cword =3D pci_conf_read16(iommu->intel->drhd->segment,=0A= - PCI_BUS(source_id), PCI_SLOT(source_id),= =0A- PCI_FUNC(source_id), PCI_COMMAND);=0A- = pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id),=0A= - PCI_SLOT(source_id), PCI_FUNC(source_id),=0A- = PCI_COMMAND, cword & ~PCI_COMMAND_MASTER);=0A+ = pci_check_disable_device(iommu->intel->drhd->segment,=0A+ = PCI_BUS(source_id), PCI_DEVFN2(source_id));=0A =0A = fault_index++;=0A if ( fault_index > cap_num_fault_regs(iommu->cap)= )=0A--- a/xen/include/xen/pci.h=0A+++ b/xen/include/xen/pci.h=0A@@ -64,6 = +64,13 @@ struct pci_dev {=0A const u8 devfn;=0A struct pci_dev_inf= o info;=0A struct arch_pci_dev arch;=0A+ struct {=0A+ = s_time_t time;=0A+ unsigned int threshold;=0A+#define PT_FAULT_THRES= HOLD_PRIV 10=0A+#define PT_FAULT_THRESHOLD_UNPRIV 3=0A+ unsigned = int count;=0A+ } fault;=0A u64 vf_rlen[6];=0A };=0A =0A@@ -107,6 = +114,7 @@ int pci_hide_device(int bus, int devfn);=0A struct pci_dev = *pci_get_pdev(int seg, int bus, int devfn);=0A struct pci_dev *pci_get_pdev= _by_domain(=0A struct domain *, int seg, int bus, int devfn);=0A+void = pci_check_disable_device(u16 seg, u8 bus, u8 devfn);=0A =0A uint8_t = pci_conf_read8(=0A unsigned int seg, unsigned int bus, unsigned int = dev, unsigned int func,=0A --=__PartD4E513F0.4__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartD4E513F0.4__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:08:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:08:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8B5-0005RH-KX; Wed, 07 Nov 2012 16:08:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8B4-0005RC-Ro for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:08:31 +0000 Received: from [85.158.143.99:7172] by server-2.bemta-4.messagelabs.com id BB/5D-28922-E778A905; Wed, 07 Nov 2012 16:08:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352304509!23703723!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23545 invoked from network); 7 Nov 2012 16:08:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-216.messagelabs.com with SMTP; 7 Nov 2012 16:08:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:08:29 +0000 Message-Id: <509A958E02000078000A7039@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:08:30 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part4B7A8C6E.0__=" Subject: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part4B7A8C6E.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This opcode neither support 1-byte operands, nor does it support 8-byte ones (since the opcode is undefined in 64-bit mode). Simplify the code accordingly. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1996,13 +1996,10 @@ x86_emulate( if ( (rc =3D read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) !=3D 0 = ) goto done; - switch ( op_bytes ) - { - case 1: *(uint8_t *)regs[i] =3D (uint8_t)dst.val; break; - case 2: *(uint16_t *)regs[i] =3D (uint16_t)dst.val; break; - case 4: *regs[i] =3D (uint32_t)dst.val; break; /* 64b: = zero-ext */ - case 8: *regs[i] =3D dst.val; break; - } + if ( op_bytes !=3D 2 ) + *regs[i] =3D (uint32_t)dst.val; /* 64b: zero-ext */ + else + *(uint16_t *)regs[i] =3D (uint16_t)dst.val; } break; } --=__Part4B7A8C6E.0__= Content-Type: text/plain; name="x86-emul-popa-sizes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-emul-popa-sizes.patch" x86/emul: only emulate possibly operand sizes for POPA=0A=0AThis opcode = neither support 1-byte operands, nor does it support 8-byte=0Aones (since = the opcode is undefined in 64-bit mode). Simplify the code=0Aaccordingly.= =0A=0ASigned-off-by: Jan Beulich =0A=0A--- a/xen/arch/x8= 6/x86_emulate/x86_emulate.c=0A+++ b/xen/arch/x86/x86_emulate/x86_emulate.c= =0A@@ -1996,13 +1996,10 @@ x86_emulate(=0A if ( (rc =3D = read_ulong(x86_seg_ss, sp_post_inc(op_bytes),=0A = &dst.val, op_bytes, ctxt, ops)) !=3D 0 )=0A goto = done;=0A- switch ( op_bytes )=0A- {=0A- = case 1: *(uint8_t *)regs[i] =3D (uint8_t)dst.val; break;=0A- = case 2: *(uint16_t *)regs[i] =3D (uint16_t)dst.val; break;=0A- = case 4: *regs[i] =3D (uint32_t)dst.val; break; /* 64b: zero-ext */=0A- = case 8: *regs[i] =3D dst.val; break;=0A- }=0A+ = if ( op_bytes !=3D 2 )=0A+ *regs[i] =3D (uint32_t)dst.val; = /* 64b: zero-ext */=0A+ else=0A+ *(uint16_t = *)regs[i] =3D (uint16_t)dst.val;=0A }=0A break;=0A }=0A --=__Part4B7A8C6E.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part4B7A8C6E.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:08:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:08:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8B5-0005RH-KX; Wed, 07 Nov 2012 16:08:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8B4-0005RC-Ro for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:08:31 +0000 Received: from [85.158.143.99:7172] by server-2.bemta-4.messagelabs.com id BB/5D-28922-E778A905; Wed, 07 Nov 2012 16:08:30 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352304509!23703723!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23545 invoked from network); 7 Nov 2012 16:08:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-216.messagelabs.com with SMTP; 7 Nov 2012 16:08:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:08:29 +0000 Message-Id: <509A958E02000078000A7039@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:08:30 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part4B7A8C6E.0__=" Subject: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part4B7A8C6E.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This opcode neither support 1-byte operands, nor does it support 8-byte ones (since the opcode is undefined in 64-bit mode). Simplify the code accordingly. Signed-off-by: Jan Beulich --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1996,13 +1996,10 @@ x86_emulate( if ( (rc =3D read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) !=3D 0 = ) goto done; - switch ( op_bytes ) - { - case 1: *(uint8_t *)regs[i] =3D (uint8_t)dst.val; break; - case 2: *(uint16_t *)regs[i] =3D (uint16_t)dst.val; break; - case 4: *regs[i] =3D (uint32_t)dst.val; break; /* 64b: = zero-ext */ - case 8: *regs[i] =3D dst.val; break; - } + if ( op_bytes !=3D 2 ) + *regs[i] =3D (uint32_t)dst.val; /* 64b: zero-ext */ + else + *(uint16_t *)regs[i] =3D (uint16_t)dst.val; } break; } --=__Part4B7A8C6E.0__= Content-Type: text/plain; name="x86-emul-popa-sizes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-emul-popa-sizes.patch" x86/emul: only emulate possibly operand sizes for POPA=0A=0AThis opcode = neither support 1-byte operands, nor does it support 8-byte=0Aones (since = the opcode is undefined in 64-bit mode). Simplify the code=0Aaccordingly.= =0A=0ASigned-off-by: Jan Beulich =0A=0A--- a/xen/arch/x8= 6/x86_emulate/x86_emulate.c=0A+++ b/xen/arch/x86/x86_emulate/x86_emulate.c= =0A@@ -1996,13 +1996,10 @@ x86_emulate(=0A if ( (rc =3D = read_ulong(x86_seg_ss, sp_post_inc(op_bytes),=0A = &dst.val, op_bytes, ctxt, ops)) !=3D 0 )=0A goto = done;=0A- switch ( op_bytes )=0A- {=0A- = case 1: *(uint8_t *)regs[i] =3D (uint8_t)dst.val; break;=0A- = case 2: *(uint16_t *)regs[i] =3D (uint16_t)dst.val; break;=0A- = case 4: *regs[i] =3D (uint32_t)dst.val; break; /* 64b: zero-ext */=0A- = case 8: *regs[i] =3D dst.val; break;=0A- }=0A+ = if ( op_bytes !=3D 2 )=0A+ *regs[i] =3D (uint32_t)dst.val; = /* 64b: zero-ext */=0A+ else=0A+ *(uint16_t = *)regs[i] =3D (uint16_t)dst.val;=0A }=0A break;=0A }=0A --=__Part4B7A8C6E.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part4B7A8C6E.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:14:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:14:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8GU-0005eO-DI; Wed, 07 Nov 2012 16:14:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8GT-0005eF-4v for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 16:14:05 +0000 Received: from [85.158.138.51:40548] by server-12.bemta-3.messagelabs.com id 6D/CF-22757-CC88A905; Wed, 07 Nov 2012 16:14:04 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352304842!21010432!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc3Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8269 invoked from network); 7 Nov 2012 16:14:03 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 16:14:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="15645532" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 16:13:57 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 16:13:56 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TW8GK-0007PV-Ue; Wed, 07 Nov 2012 16:13:56 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TW8GK-0008Gm-JY; Wed, 07 Nov 2012 16:13:56 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 7 Nov 2012 16:13:56 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14372: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14372 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14372/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14354 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14354 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14354 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=linux-3.0 + revision=ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push linux-3.0 ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + branch=linux-3.0 + revision=ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=linux + xenbranch=xen-unstable + '[' xlinux = xlinux ']' + linuxbranch=linux-3.0 + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.linux-3.0 ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.linux-3.0 + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree linux-3.0 + case $1 in + : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + : linux-3.0.y + : linux-3.0.y + : git + : git + : git://xenbits.xen.org/linux-pvops.git + : xen@xenbits.xensource.com:git/linux-pvops.git + : tested/linux-3.0 + : tested/linux-3.0 + return 0 + cd /export/home/osstest/repos/linux + git push xen@xenbits.xensource.com:git/linux-pvops.git ac7b56f4149a2f0e331a9b640f65aed57ed15eb4:tested/linux-3.0 Counting objects: 1 Counting objects: 45 Counting objects: 57, done. Compressing objects: 9% (1/11) Compressing objects: 18% (2/11) Compressing objects: 27% (3/11) Compressing objects: 36% (4/11) Compressing objects: 45% (5/11) Compressing objects: 54% (6/11) Compressing objects: 63% (7/11) Compressing objects: 72% (8/11) Compressing objects: 81% (9/11) Compressing objects: 90% (10/11) Compressing objects: 100% (11/11) Compressing objects: 100% (11/11), done. Writing objects: 2% (1/35) Writing objects: 5% (2/35) Writing objects: 8% (3/35) Writing objects: 11% (4/35) Writing objects: 14% (5/35) Writing objects: 17% (6/35) Writing objects: 20% (7/35) Writing objects: 22% (8/35) Writing objects: 25% (9/35) Writing objects: 28% (10/35) Writing objects: 31% (11/35) Writing objects: 34% (12/35) Writing objects: 37% (13/35) Writing objects: 40% (14/35) Writing objects: 42% (15/35) Writing objects: 45% (16/35) Writing objects: 48% (17/35) Writing objects: 51% (18/35) Writing objects: 57% (20/35) Writing objects: 60% (21/35) Writing objects: 62% (22/35) Writing objects: 65% (23/35) Writing objects: 68% (24/35) Writing objects: 71% (25/35) Writing objects: 74% (26/35) Writing objects: 77% (27/35) Writing objects: 80% (28/35) Writing objects: 82% (29/35) Writing objects: 85% (30/35) Writing objects: 88% (31/35) Writing objects: 91% (32/35) Writing objects: 94% (33/35) Writing objects: 97% (34/35) Writing objects: 100% (35/35) Writing objects: 100% (35/35), 5.83 KiB, done. Total 35 (delta 28), reused 28 (delta 23) To xen@xenbits.xensource.com:git/linux-pvops.git 27d0858..ac7b56f ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 -> tested/linux-3.0 + exit 0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:14:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:14:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8GU-0005eO-DI; Wed, 07 Nov 2012 16:14:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8GT-0005eF-4v for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 16:14:05 +0000 Received: from [85.158.138.51:40548] by server-12.bemta-3.messagelabs.com id 6D/CF-22757-CC88A905; Wed, 07 Nov 2012 16:14:04 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352304842!21010432!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc3Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8269 invoked from network); 7 Nov 2012 16:14:03 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 16:14:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="15645532" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 16:13:57 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 16:13:56 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TW8GK-0007PV-Ue; Wed, 07 Nov 2012 16:13:56 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TW8GK-0008Gm-JY; Wed, 07 Nov 2012 16:13:56 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 7 Nov 2012 16:13:56 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [linux-3.0 test] 14372: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14372 linux-3.0 real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14372/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14354 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14354 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14354 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14354 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass version targeted for testing: linux ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 baseline version: linux 27d0858dbcf199838b8c50a3e94d397bf326d986 ------------------------------------------------------------ People who touched revisions under test: ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=linux-3.0 + revision=ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push linux-3.0 ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + branch=linux-3.0 + revision=ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=linux + xenbranch=xen-unstable + '[' xlinux = xlinux ']' + linuxbranch=linux-3.0 + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.linux-3.0 ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.linux-3.0 + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree linux-3.0 + case $1 in + : git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + : linux-3.0.y + : linux-3.0.y + : git + : git + : git://xenbits.xen.org/linux-pvops.git + : xen@xenbits.xensource.com:git/linux-pvops.git + : tested/linux-3.0 + : tested/linux-3.0 + return 0 + cd /export/home/osstest/repos/linux + git push xen@xenbits.xensource.com:git/linux-pvops.git ac7b56f4149a2f0e331a9b640f65aed57ed15eb4:tested/linux-3.0 Counting objects: 1 Counting objects: 45 Counting objects: 57, done. Compressing objects: 9% (1/11) Compressing objects: 18% (2/11) Compressing objects: 27% (3/11) Compressing objects: 36% (4/11) Compressing objects: 45% (5/11) Compressing objects: 54% (6/11) Compressing objects: 63% (7/11) Compressing objects: 72% (8/11) Compressing objects: 81% (9/11) Compressing objects: 90% (10/11) Compressing objects: 100% (11/11) Compressing objects: 100% (11/11), done. Writing objects: 2% (1/35) Writing objects: 5% (2/35) Writing objects: 8% (3/35) Writing objects: 11% (4/35) Writing objects: 14% (5/35) Writing objects: 17% (6/35) Writing objects: 20% (7/35) Writing objects: 22% (8/35) Writing objects: 25% (9/35) Writing objects: 28% (10/35) Writing objects: 31% (11/35) Writing objects: 34% (12/35) Writing objects: 37% (13/35) Writing objects: 40% (14/35) Writing objects: 42% (15/35) Writing objects: 45% (16/35) Writing objects: 48% (17/35) Writing objects: 51% (18/35) Writing objects: 57% (20/35) Writing objects: 60% (21/35) Writing objects: 62% (22/35) Writing objects: 65% (23/35) Writing objects: 68% (24/35) Writing objects: 71% (25/35) Writing objects: 74% (26/35) Writing objects: 77% (27/35) Writing objects: 80% (28/35) Writing objects: 82% (29/35) Writing objects: 85% (30/35) Writing objects: 88% (31/35) Writing objects: 91% (32/35) Writing objects: 94% (33/35) Writing objects: 97% (34/35) Writing objects: 100% (35/35) Writing objects: 100% (35/35), 5.83 KiB, done. Total 35 (delta 28), reused 28 (delta 23) To xen@xenbits.xensource.com:git/linux-pvops.git 27d0858..ac7b56f ac7b56f4149a2f0e331a9b640f65aed57ed15eb4 -> tested/linux-3.0 + exit 0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:16:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:16:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8IV-0005jR-Tv; Wed, 07 Nov 2012 16:16:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8IT-0005jL-KX for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:16:09 +0000 Received: from [85.158.139.211:56487] by server-7.bemta-5.messagelabs.com id 36/F0-23096-8498A905; Wed, 07 Nov 2012 16:16:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352304966!15288862!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18372 invoked from network); 7 Nov 2012 16:16:07 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-13.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 16:16:07 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7GFmos001268 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 16:15:49 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7GFlAe016910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 16:15:47 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7GFkM0032547; Wed, 7 Nov 2012 10:15:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 08:15:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 64FA440157; Wed, 7 Nov 2012 11:03:01 -0500 (EST) Date: Wed, 7 Nov 2012 11:03:01 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121107160301.GF18615@phenom.dumpdata.com> References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: > >>> > >>> If it is generic ACPI code, than it can depend only on ACPI. > >>> If it is ACPI code that contains X86 specific info, than it needs to > >>> depend on X86 too. > >> > >> No x86 specific so let's depend on ACPI. > > > > Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > > spec, but only x86 does it right? > > OK, updated w/ ACPI & X86 dependency, and per other comments. Ok. Could you send all the patchset in one go. I am bit lost of which one to review as none of them seem to have the version information [vX: Did this yyy] right above your name or in the title: [PATCH vX 1/2]: yyyy anyhow, some comments below. > > Thanks, > Jinsong > > ================= > > >From d5f462cc8029863955a574f1541bece72aafb986 Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Thu, 8 Nov 2012 04:29:07 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement The title should be: xen/acpi: ACPI PAD driver > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and thin logic level, would take over acpi pad logic. > > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > to get the expected idle cpu number, and then hypercall to hypervisor. > Xen hypervisor would then do the rest work, say, core parking, to idle > specific number of cpus on its own policy. > > Signed-off-by: Jan Beulich > Signed-off-by: Liu Jinsong > --- > drivers/xen/Makefile | 3 +- > drivers/xen/xen-acpi-pad.c | 186 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 ++++ > include/xen/interface/version.h | 15 +++ > 4 files changed, 220 insertions(+), 1 deletions(-) > create mode 100644 drivers/xen/xen-acpi-pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..3c39717 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -10,7 +10,8 @@ CFLAGS_features.o := $(nostackp) > > dom0-$(CONFIG_PCI) += pci.o > dom0-$(CONFIG_USB_SUPPORT) += dbgp.o > -dom0-$(CONFIG_ACPI) += acpi.o > +dom0-$(CONFIG_ACPI) += acpi.o $(xen-pad-y) > +xen-pad-$(CONFIG_X86) += xen-acpi-pad.o > dom0-$(CONFIG_X86) += pcpu.o > obj-$(CONFIG_XEN_DOM0) += $(dom0-y) > obj-$(CONFIG_BLOCK) += biomerge.o > diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c > new file mode 100644 > index 0000000..f02d3ff > --- /dev/null > +++ b/drivers/xen/xen-acpi-pad.c > @@ -0,0 +1,186 @@ > +/* > + * xen-acpi-pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. No address pls. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static DEFINE_MUTEX(xen_cpu_lock); > + > +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) > +{ > + struct xen_platform_op op; > + > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = idle_nums; > + > + return HYPERVISOR_dom0_op(&op); > +} > + > +static int xen_acpi_pad_idle_cpus_num(void) > +{ > + struct xen_platform_op op; > + > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + > + return HYPERVISOR_dom0_op(&op) > + ?: op.u.core_parking.idle_nums; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_nums) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_nums; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void acpi_pad_handle_notify(acpi_handle handle) > +{ > + int idle_nums; > + > + mutex_lock(&xen_cpu_lock); > + idle_nums = acpi_pad_pur(handle); > + if (idle_nums < 0) { > + mutex_unlock(&xen_cpu_lock); > + return; > + } > + > + idle_nums = xen_acpi_pad_idle_cpus(idle_nums) > + ?: xen_acpi_pad_idle_cpus_num(); > + if (idle_nums >= 0) > + acpi_pad_ost(handle, 0, idle_nums); > + mutex_unlock(&xen_cpu_lock); > +} > + > +static void acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static int acpi_pad_remove(struct acpi_device *device, > + int type) > +{ > + mutex_lock(&xen_cpu_lock); > + xen_acpi_pad_idle_cpus(0); > + mutex_unlock(&xen_cpu_lock); > + > + acpi_remove_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, acpi_pad_notify); > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = acpi_pad_add, > + .remove = acpi_pad_remove, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + /* Only DOM0 and Xen4.2 or later support Xen acpi pad */ > + if (!xen_initial_domain() || > + !xen_running_on_version_or_later(4, 2)) > + return -ENODEV; Please restructure this. Just make it if (!xen_initial_domain()) return -ENODEV; if (!xen_running..) return -ENODEV; I know the compiler will end up with code that looks exactly the same but it is easier to read than the '!' and '||' logic. > + > + return acpi_bus_register_driver(&acpi_pad_driver); > +} > +subsys_initcall(xen_acpi_pad_init); > + > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..5e36932 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which are already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h > index 7ff6498..96d8d3d 100644 > --- a/include/xen/interface/version.h > +++ b/include/xen/interface/version.h > @@ -63,4 +63,19 @@ struct xen_feature_info { > /* arg == xen_domain_handle_t. */ > #define XENVER_guest_handle 8 > > +/* Check if running on Xen version (major, minor) or later */ > +static inline bool > +xen_running_on_version_or_later(unsigned int major, unsigned int minor) > +{ > + unsigned int version; > + > + if (!xen_domain()) > + return false; > + > + version = HYPERVISOR_xen_version(XENVER_version, NULL); > + if ((((version >> 16) == major) && ((version & 0xffff) >= minor)) || > + ((version >> 16) > major)) > + return true; > + return false; > +} > #endif /* __XEN_PUBLIC_VERSION_H__ */ > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:16:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:16:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8IV-0005jR-Tv; Wed, 07 Nov 2012 16:16:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8IT-0005jL-KX for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:16:09 +0000 Received: from [85.158.139.211:56487] by server-7.bemta-5.messagelabs.com id 36/F0-23096-8498A905; Wed, 07 Nov 2012 16:16:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352304966!15288862!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NTI3Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18372 invoked from network); 7 Nov 2012 16:16:07 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-13.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 16:16:07 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7GFmos001268 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 16:15:49 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7GFlAe016910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 16:15:47 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7GFkM0032547; Wed, 7 Nov 2012 10:15:46 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 08:15:46 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 64FA440157; Wed, 7 Nov 2012 11:03:01 -0500 (EST) Date: Wed, 7 Nov 2012 11:03:01 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121107160301.GF18615@phenom.dumpdata.com> References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: > >>> > >>> If it is generic ACPI code, than it can depend only on ACPI. > >>> If it is ACPI code that contains X86 specific info, than it needs to > >>> depend on X86 too. > >> > >> No x86 specific so let's depend on ACPI. > > > > Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > > spec, but only x86 does it right? > > OK, updated w/ ACPI & X86 dependency, and per other comments. Ok. Could you send all the patchset in one go. I am bit lost of which one to review as none of them seem to have the version information [vX: Did this yyy] right above your name or in the title: [PATCH vX 1/2]: yyyy anyhow, some comments below. > > Thanks, > Jinsong > > ================= > > >From d5f462cc8029863955a574f1541bece72aafb986 Mon Sep 17 00:00:00 2001 > From: Liu, Jinsong > Date: Thu, 8 Nov 2012 04:29:07 +0800 > Subject: [PATCH 1/2] Xen acpi pad implement The title should be: xen/acpi: ACPI PAD driver > > PAD is acpi Processor Aggregator Device which provides a control point > that enables the platform to perform specific processor configuration > and control that applies to all processors in the platform. > > This patch is to implement Xen acpi pad logic. When running under Xen > virt platform, native pad driver would not work. Instead Xen pad driver, > a self-contained and thin logic level, would take over acpi pad logic. > > When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object > to get the expected idle cpu number, and then hypercall to hypervisor. > Xen hypervisor would then do the rest work, say, core parking, to idle > specific number of cpus on its own policy. > > Signed-off-by: Jan Beulich > Signed-off-by: Liu Jinsong > --- > drivers/xen/Makefile | 3 +- > drivers/xen/xen-acpi-pad.c | 186 ++++++++++++++++++++++++++++++++++++++ > include/xen/interface/platform.h | 17 ++++ > include/xen/interface/version.h | 15 +++ > 4 files changed, 220 insertions(+), 1 deletions(-) > create mode 100644 drivers/xen/xen-acpi-pad.c > > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 0e86370..3c39717 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -10,7 +10,8 @@ CFLAGS_features.o := $(nostackp) > > dom0-$(CONFIG_PCI) += pci.o > dom0-$(CONFIG_USB_SUPPORT) += dbgp.o > -dom0-$(CONFIG_ACPI) += acpi.o > +dom0-$(CONFIG_ACPI) += acpi.o $(xen-pad-y) > +xen-pad-$(CONFIG_X86) += xen-acpi-pad.o > dom0-$(CONFIG_X86) += pcpu.o > obj-$(CONFIG_XEN_DOM0) += $(dom0-y) > obj-$(CONFIG_BLOCK) += biomerge.o > diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c > new file mode 100644 > index 0000000..f02d3ff > --- /dev/null > +++ b/drivers/xen/xen-acpi-pad.c > @@ -0,0 +1,186 @@ > +/* > + * xen-acpi-pad.c - Xen pad interface > + * > + * Copyright (c) 2012, Intel Corporation. > + * Author: Liu, Jinsong > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program; if not, write to the Free Software Foundation, Inc., > + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. No address pls. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" > +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 > + > +static DEFINE_MUTEX(xen_cpu_lock); > + > +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) > +{ > + struct xen_platform_op op; > + > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_SET; > + op.u.core_parking.idle_nums = idle_nums; > + > + return HYPERVISOR_dom0_op(&op); > +} > + > +static int xen_acpi_pad_idle_cpus_num(void) > +{ > + struct xen_platform_op op; > + > + op.cmd = XENPF_core_parking; > + op.u.core_parking.type = XEN_CORE_PARKING_GET; > + > + return HYPERVISOR_dom0_op(&op) > + ?: op.u.core_parking.idle_nums; > +} > + > +/* > + * Query firmware how many CPUs should be idle > + * return -1 on failure > + */ > +static int acpi_pad_pur(acpi_handle handle) > +{ > + struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; > + union acpi_object *package; > + int num = -1; > + > + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) > + return num; > + > + if (!buffer.length || !buffer.pointer) > + return num; > + > + package = buffer.pointer; > + > + if (package->type == ACPI_TYPE_PACKAGE && > + package->package.count == 2 && > + package->package.elements[0].integer.value == 1) /* rev 1 */ > + > + num = package->package.elements[1].integer.value; > + > + kfree(buffer.pointer); > + return num; > +} > + > +/* Notify firmware how many CPUs are idle */ > +static void acpi_pad_ost(acpi_handle handle, int stat, > + uint32_t idle_nums) > +{ > + union acpi_object params[3] = { > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_INTEGER,}, > + {.type = ACPI_TYPE_BUFFER,}, > + }; > + struct acpi_object_list arg_list = {3, params}; > + > + params[0].integer.value = ACPI_PROCESSOR_AGGREGATOR_NOTIFY; > + params[1].integer.value = stat; > + params[2].buffer.length = 4; > + params[2].buffer.pointer = (void *)&idle_nums; > + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); > +} > + > +static void acpi_pad_handle_notify(acpi_handle handle) > +{ > + int idle_nums; > + > + mutex_lock(&xen_cpu_lock); > + idle_nums = acpi_pad_pur(handle); > + if (idle_nums < 0) { > + mutex_unlock(&xen_cpu_lock); > + return; > + } > + > + idle_nums = xen_acpi_pad_idle_cpus(idle_nums) > + ?: xen_acpi_pad_idle_cpus_num(); > + if (idle_nums >= 0) > + acpi_pad_ost(handle, 0, idle_nums); > + mutex_unlock(&xen_cpu_lock); > +} > + > +static void acpi_pad_notify(acpi_handle handle, u32 event, > + void *data) > +{ > + switch (event) { > + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: > + acpi_pad_handle_notify(handle); > + break; > + default: > + pr_warn("Unsupported event [0x%x]\n", event); > + break; > + } > +} > + > +static int acpi_pad_add(struct acpi_device *device) > +{ > + acpi_status status; > + > + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); > + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); > + > + status = acpi_install_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); > + if (ACPI_FAILURE(status)) > + return -ENODEV; > + > + return 0; > +} > + > +static int acpi_pad_remove(struct acpi_device *device, > + int type) > +{ > + mutex_lock(&xen_cpu_lock); > + xen_acpi_pad_idle_cpus(0); > + mutex_unlock(&xen_cpu_lock); > + > + acpi_remove_notify_handler(device->handle, > + ACPI_DEVICE_NOTIFY, acpi_pad_notify); > + return 0; > +} > + > +static const struct acpi_device_id pad_device_ids[] = { > + {"ACPI000C", 0}, > + {"", 0}, > +}; > + > +static struct acpi_driver acpi_pad_driver = { > + .name = "processor_aggregator", > + .class = ACPI_PROCESSOR_AGGREGATOR_CLASS, > + .ids = pad_device_ids, > + .ops = { > + .add = acpi_pad_add, > + .remove = acpi_pad_remove, > + }, > +}; > + > +static int __init xen_acpi_pad_init(void) > +{ > + /* Only DOM0 and Xen4.2 or later support Xen acpi pad */ > + if (!xen_initial_domain() || > + !xen_running_on_version_or_later(4, 2)) > + return -ENODEV; Please restructure this. Just make it if (!xen_initial_domain()) return -ENODEV; if (!xen_running..) return -ENODEV; I know the compiler will end up with code that looks exactly the same but it is easier to read than the '!' and '||' logic. > + > + return acpi_bus_register_driver(&acpi_pad_driver); > +} > +subsys_initcall(xen_acpi_pad_init); > + > diff --git a/include/xen/interface/platform.h b/include/xen/interface/platform.h > index 4755b5f..5e36932 100644 > --- a/include/xen/interface/platform.h > +++ b/include/xen/interface/platform.h > @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { > }; > DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); > > +/* > + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, > + * which are already occupied at Xen hypervisor side. > + */ > +#define XENPF_core_parking 60 > +struct xenpf_core_parking { > + /* IN variables */ > +#define XEN_CORE_PARKING_SET 1 > +#define XEN_CORE_PARKING_GET 2 > + uint32_t type; > + /* IN variables: set cpu nums expected to be idled */ > + /* OUT variables: get cpu nums actually be idled */ > + uint32_t idle_nums; > +}; > +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); > + > struct xen_platform_op { > uint32_t cmd; > uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ > @@ -341,6 +357,7 @@ struct xen_platform_op { > struct xenpf_set_processor_pminfo set_pminfo; > struct xenpf_pcpuinfo pcpu_info; > struct xenpf_cpu_ol cpu_ol; > + struct xenpf_core_parking core_parking; > uint8_t pad[128]; > } u; > }; > diff --git a/include/xen/interface/version.h b/include/xen/interface/version.h > index 7ff6498..96d8d3d 100644 > --- a/include/xen/interface/version.h > +++ b/include/xen/interface/version.h > @@ -63,4 +63,19 @@ struct xen_feature_info { > /* arg == xen_domain_handle_t. */ > #define XENVER_guest_handle 8 > > +/* Check if running on Xen version (major, minor) or later */ > +static inline bool > +xen_running_on_version_or_later(unsigned int major, unsigned int minor) > +{ > + unsigned int version; > + > + if (!xen_domain()) > + return false; > + > + version = HYPERVISOR_xen_version(XENVER_version, NULL); > + if ((((version >> 16) == major) && ((version & 0xffff) >= minor)) || > + ((version >> 16) > major)) > + return true; > + return false; > +} > #endif /* __XEN_PUBLIC_VERSION_H__ */ > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:21:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:21:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8NY-0005wO-Lr; Wed, 07 Nov 2012 16:21:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8NX-0005wG-Dh for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 16:21:23 +0000 Received: from [85.158.138.51:39627] by server-9.bemta-3.messagelabs.com id 6D/22-02388-D7A8A905; Wed, 07 Nov 2012 16:21:17 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352305271!27198623!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzE4MjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14482 invoked from network); 7 Nov 2012 16:21:16 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 16:21:16 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7GJoTI010655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 16:19:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7GJlUU006142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 16:19:48 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7GJjtq026569; Wed, 7 Nov 2012 10:19:45 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 08:19:45 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 2C63A4019F; Wed, 7 Nov 2012 11:07:00 -0500 (EST) Date: Wed, 7 Nov 2012 11:07:00 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121107160659.GH18615@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A6AA6.2000208@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 09:05:26AM -0500, Matthew Fioravante wrote: > On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux > >>from the linux-2.6.18-xen.hg tree to linux-stable. > >So how does on test it ? Set it up? Use it? Is there some documentation > >about it - if so it should be in the patch description. > Thats actually a question I had. To use this driver now you have to > use my vtpm mini-os domains which are currently being evaluated in > the xen-devel mailing list. Once they are accepted I will submit a > documentation update to the Xen tree. > > Whats the best practice for documentation in this case? All in xen? > Some linux/some xen? If the latter, how much goes in linux and > where? As much as possible. I would say stick both of them in Xen and in Linux. And you can designate one of them as primary (say the Xen one) and say in the Linux: "For up-to-date information, please refer to XXYYZZ" > > > >I did a very very cursory look at it, see some of the comments. > > > >> > >>+ > >>+ > >>+static inline struct transmission *transmission_alloc(void) > >>+{ > >>+ return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > >>+} > >>+ > >>+ static unsigned char * > > > >That is very weird tabbing? Did you run this patch through > >scripts/checkpatch.pl ? > Wow thats ugly. I ran the check script and it looks like it didn't > pick this up. For some reason my editor wants to autoindent like > that. > Fixed. > > > >>+ > >>+static const struct file_operations vtpm_ops = { > >>+ .owner = THIS_MODULE, > >>+ .llseek = no_llseek, > >>+ .open = tpm_open, > >>+ .read = tpm_read, > >>+ .write = tpm_write, > >>+ .release = tpm_release, > >>+}; > >>+ > >>+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > >>+static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > >>+static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > >>+static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > >>+static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > >>+static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > >>+ NULL); > >>+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > >>+static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > >>+ > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be > >a corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing You are right. Just leave it as that then. > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:21:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:21:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8NY-0005wO-Lr; Wed, 07 Nov 2012 16:21:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8NX-0005wG-Dh for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 16:21:23 +0000 Received: from [85.158.138.51:39627] by server-9.bemta-3.messagelabs.com id 6D/22-02388-D7A8A905; Wed, 07 Nov 2012 16:21:17 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352305271!27198623!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzE4MjE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14482 invoked from network); 7 Nov 2012 16:21:16 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 16:21:16 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7GJoTI010655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 16:19:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7GJlUU006142 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 16:19:48 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7GJjtq026569; Wed, 7 Nov 2012 10:19:45 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 08:19:45 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 2C63A4019F; Wed, 7 Nov 2012 11:07:00 -0500 (EST) Date: Wed, 7 Nov 2012 11:07:00 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121107160659.GH18615@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A6AA6.2000208@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 09:05:26AM -0500, Matthew Fioravante wrote: > On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux > >>from the linux-2.6.18-xen.hg tree to linux-stable. > >So how does on test it ? Set it up? Use it? Is there some documentation > >about it - if so it should be in the patch description. > Thats actually a question I had. To use this driver now you have to > use my vtpm mini-os domains which are currently being evaluated in > the xen-devel mailing list. Once they are accepted I will submit a > documentation update to the Xen tree. > > Whats the best practice for documentation in this case? All in xen? > Some linux/some xen? If the latter, how much goes in linux and > where? As much as possible. I would say stick both of them in Xen and in Linux. And you can designate one of them as primary (say the Xen one) and say in the Linux: "For up-to-date information, please refer to XXYYZZ" > > > >I did a very very cursory look at it, see some of the comments. > > > >> > >>+ > >>+ > >>+static inline struct transmission *transmission_alloc(void) > >>+{ > >>+ return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > >>+} > >>+ > >>+ static unsigned char * > > > >That is very weird tabbing? Did you run this patch through > >scripts/checkpatch.pl ? > Wow thats ugly. I ran the check script and it looks like it didn't > pick this up. For some reason my editor wants to autoindent like > that. > Fixed. > > > >>+ > >>+static const struct file_operations vtpm_ops = { > >>+ .owner = THIS_MODULE, > >>+ .llseek = no_llseek, > >>+ .open = tpm_open, > >>+ .read = tpm_read, > >>+ .write = tpm_write, > >>+ .release = tpm_release, > >>+}; > >>+ > >>+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > >>+static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > >>+static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > >>+static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > >>+static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > >>+static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > >>+ NULL); > >>+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > >>+static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > >>+ > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be > >a corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing You are right. Just leave it as that then. > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:22:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8Og-00063N-FI; Wed, 07 Nov 2012 16:22:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8Oe-000635-DI for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:22:32 +0000 Received: from [85.158.137.99:22495] by server-11.bemta-3.messagelabs.com id 38/29-19361-7CA8A905; Wed, 07 Nov 2012 16:22:31 +0000 X-Env-Sender: ben.guthro@gmail.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352305348!18174717!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10043 invoked from network); 7 Nov 2012 16:22:30 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 16:22:30 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3160640iea.32 for ; Wed, 07 Nov 2012 08:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; bh=YQK07g2BSlmBi0YQdF4jrSd8sesp1MX44prse8KHIIk=; b=sWEN1ZJvvYdNOCIbxiKVVSroQwah9B3N+EqarNaAuZPk59ciFjCuj4zzPCszI4V+rG C/OfkvXzWEWdx2XhtDMMZBipAL0rz3WxLZLFJ8YmrXescBAd5qordU8g98hooAsXjBQb fTDS/iQpGYg0AkNLxAhPRELWZRduIeBuK/6GfQ8S36bN9uyP1uniXR4+WfC3gpPVbX+9 tzO8jE53edGnhdQkHWHSkh8LXZe9dJT4ecFtsRNMACasXR5UtUvTcVowHqCQ66mOrt0i m9ij21U/KlirTrOxHkoTspCk78sZoG4bH6KzF9uq+2YdQFWfNj78OaPXMqqNPqxqn6Sm bHYw== MIME-Version: 1.0 Received: by 10.50.40.225 with SMTP id a1mr17090604igl.7.1352305347943; Wed, 07 Nov 2012 08:22:27 -0800 (PST) Received: by 10.231.10.130 with HTTP; Wed, 7 Nov 2012 08:22:27 -0800 (PST) Date: Wed, 7 Nov 2012 11:22:27 -0500 X-Google-Sender-Auth: pJU4RgwU9pc0oBwq2DoEYGSOxm0 Message-ID: From: Ben Guthro To: xen-devel , intel-gfx@lists.freedesktop.org Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] S3 causing IRQ delivery mismatch - i915 hotplug storm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7311888765167059898==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7311888765167059898== Content-Type: multipart/alternative; boundary=14dae9340cb7e45e4404cdea1fc5 --14dae9340cb7e45e4404cdea1fc5 Content-Type: text/plain; charset=ISO-8859-1 I'm trying to debug an issue on an older lapop (Toshiba Satellite A505) - that has an i3 processor (M330) - and intel graphics. This is running under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduced using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4 (I have cross posted here, because I am not yet sure if this is a Xen, pvops, or i915 issue - and would appreciate opinions in sorting it out.) The symptoms of the problem exhibit themselves by a lagging mouse in X11 after resume, when using the trackpad. After digging in a bit, the problem seems a bit more insidious - the i915 kworker responsible for hotplug detection (i915_hotplug_work_func) seems to be getting triggered for every PS2 IRQ - every trackpad mouse movement, and keypress triggers tracing (with drm.debug=0x06) like the following: Nov 6 21:41:58 rusting kernel: [ 263.924454] [drm:i915_hotplug_work_func], running encoder hotplug functions Nov 6 21:41:58 rusting kernel: [ 263.924468] [drm:intel_ironlake_crt_detect_hotplug], ironlake hotplug adpa=0xf40018, result 0 Nov 6 21:41:58 rusting kernel: [ 263.924472] [drm:intel_crt_detect], CRT not detected via hotplug Nov 6 21:41:58 rusting kernel: [ 263.924475] [drm:output_poll_execute], [CONNECTOR:11:VGA-1] status updated from 2 to 2 Nov 6 21:41:58 rusting kernel: [ 263.926771] [drm:drm_do_probe_ddc_edid], drm: skipping non-existent adapter i915 gmbus dpc Nov 6 21:41:58 rusting kernel: [ 263.926775] [drm:output_poll_execute], [CONNECTOR:14:HDMI-A-1] status updated from 2 to 2 Nov 6 21:41:58 rusting kernel: [ 263.927291] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.944207] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.964201] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.983694] [drm:intel_dp_detect], DPCD: 0000000000000000 Nov 6 21:41:58 rusting kernel: [ 263.983704] [drm:output_poll_execute], [CONNECTOR:17:DP-1] status updated from 2 to 2 Additionally, this same trace stack is printed out at a regular 10s interval, after resume - where prior to resuming from S3 it is printed out once at boot time. This kworker consumes a significant portion of the cpu, and essentially grinds Xorg to a halt, until the probing can catch up with the user moving the cursor. There seems to be a mismatch for these IRQ delivery - or at least exhibits the behavior similar to such a problem. Does anyone have any thoughts as to where in the software stack I should start to dig in? Any opinions on which component likely contains the issue is appreciated. /btg --14dae9340cb7e45e4404cdea1fc5 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I'm trying to debug an issue on an older lapop (Toshiba Satellite A505)= - that has an i3 processor (M330) - and intel graphics.
This is runnin= g under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduc= ed using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4

(I have cross posted here, because I am not yet sure if= this is a Xen, pvops, or i915 issue - and would appreciate opinions in sor= ting it out.)

The symptoms of the problem exhibit th= emselves by a lagging mouse in X11 after resume, when using the trackpad.

After digging in a bit, the problem seems a bit more in= sidious - the i915 kworker responsible for hotplug detection (i915_hotplug_= work_func) seems to be getting triggered for every PS2 IRQ - every trackpad= mouse movement, and keypress triggers tracing (with drm.debug=3D0x06) like= the following:

Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924= 454] [drm:i915_hotplug_work_func], running encoder hotplug functions=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924468] [drm:intel_ironlake= _crt_detect_hotplug], ironlake hotplug adpa=3D0xf40018, result 0=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924472] [drm:intel_crt_detect= ], CRT not detected via hotplug=A0
Nov 6 21:41:58=A0rusting=A0ker= nel: [ 263.924475] [drm:output_poll_execute], [CONNECTOR:11:VGA-1] status u= pdated from 2 to 2=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.926771] [drm:drm_do_probe_ddc= _edid], drm: skipping non-existent adapter i915 gmbus dpc=A0
Nov = 6 21:41:58=A0rusting=A0kernel: [ 263.926775] [drm:output_poll_execute], [CO= NNECTOR:14:HDMI-A-1] status updated from 2 to 2=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.927291] [drm:intel_dp_aux_ch]= , dp_aux_ch timeout status 0x5145003e=A0
Nov 6 21:41:58=A0rusting= =A0kernel: [ 263.944207] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x= 5145003e=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.964201] [drm:intel_dp_aux_ch]= , dp_aux_ch timeout status 0x5145003e=A0
Nov 6 21:41:58=A0rusting= =A0kernel: [ 263.983694] [drm:intel_dp_detect], DPCD: 0000000000000000=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.983704] [drm:output_poll_execute],= [CONNECTOR:17:DP-1] status updated from 2 to 2

<= div>Additionally, this same trace stack is printed out at a regular 10s int= erval, after resume - where prior to resuming from S3 it is printed out onc= e at boot time.

This kworker consumes a significant portion of the cpu,= and essentially grinds Xorg to a halt, until the probing can catch up with= the user moving the cursor.


There = seems to be a mismatch for these IRQ delivery - or at least exhibits the be= havior similar to such a problem.


Does anyone have any thoughts as to wher= e in the software stack I should start to dig in?
Any opinions on= which component likely contains the issue is appreciated.


/btg

--14dae9340cb7e45e4404cdea1fc5-- --===============7311888765167059898== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7311888765167059898==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:22:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8Og-00063N-FI; Wed, 07 Nov 2012 16:22:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8Oe-000635-DI for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:22:32 +0000 Received: from [85.158.137.99:22495] by server-11.bemta-3.messagelabs.com id 38/29-19361-7CA8A905; Wed, 07 Nov 2012 16:22:31 +0000 X-Env-Sender: ben.guthro@gmail.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352305348!18174717!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10043 invoked from network); 7 Nov 2012 16:22:30 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 16:22:30 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3160640iea.32 for ; Wed, 07 Nov 2012 08:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; bh=YQK07g2BSlmBi0YQdF4jrSd8sesp1MX44prse8KHIIk=; b=sWEN1ZJvvYdNOCIbxiKVVSroQwah9B3N+EqarNaAuZPk59ciFjCuj4zzPCszI4V+rG C/OfkvXzWEWdx2XhtDMMZBipAL0rz3WxLZLFJ8YmrXescBAd5qordU8g98hooAsXjBQb fTDS/iQpGYg0AkNLxAhPRELWZRduIeBuK/6GfQ8S36bN9uyP1uniXR4+WfC3gpPVbX+9 tzO8jE53edGnhdQkHWHSkh8LXZe9dJT4ecFtsRNMACasXR5UtUvTcVowHqCQ66mOrt0i m9ij21U/KlirTrOxHkoTspCk78sZoG4bH6KzF9uq+2YdQFWfNj78OaPXMqqNPqxqn6Sm bHYw== MIME-Version: 1.0 Received: by 10.50.40.225 with SMTP id a1mr17090604igl.7.1352305347943; Wed, 07 Nov 2012 08:22:27 -0800 (PST) Received: by 10.231.10.130 with HTTP; Wed, 7 Nov 2012 08:22:27 -0800 (PST) Date: Wed, 7 Nov 2012 11:22:27 -0500 X-Google-Sender-Auth: pJU4RgwU9pc0oBwq2DoEYGSOxm0 Message-ID: From: Ben Guthro To: xen-devel , intel-gfx@lists.freedesktop.org Cc: Konrad Rzeszutek Wilk Subject: [Xen-devel] S3 causing IRQ delivery mismatch - i915 hotplug storm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7311888765167059898==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7311888765167059898== Content-Type: multipart/alternative; boundary=14dae9340cb7e45e4404cdea1fc5 --14dae9340cb7e45e4404cdea1fc5 Content-Type: text/plain; charset=ISO-8859-1 I'm trying to debug an issue on an older lapop (Toshiba Satellite A505) - that has an i3 processor (M330) - and intel graphics. This is running under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduced using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4 (I have cross posted here, because I am not yet sure if this is a Xen, pvops, or i915 issue - and would appreciate opinions in sorting it out.) The symptoms of the problem exhibit themselves by a lagging mouse in X11 after resume, when using the trackpad. After digging in a bit, the problem seems a bit more insidious - the i915 kworker responsible for hotplug detection (i915_hotplug_work_func) seems to be getting triggered for every PS2 IRQ - every trackpad mouse movement, and keypress triggers tracing (with drm.debug=0x06) like the following: Nov 6 21:41:58 rusting kernel: [ 263.924454] [drm:i915_hotplug_work_func], running encoder hotplug functions Nov 6 21:41:58 rusting kernel: [ 263.924468] [drm:intel_ironlake_crt_detect_hotplug], ironlake hotplug adpa=0xf40018, result 0 Nov 6 21:41:58 rusting kernel: [ 263.924472] [drm:intel_crt_detect], CRT not detected via hotplug Nov 6 21:41:58 rusting kernel: [ 263.924475] [drm:output_poll_execute], [CONNECTOR:11:VGA-1] status updated from 2 to 2 Nov 6 21:41:58 rusting kernel: [ 263.926771] [drm:drm_do_probe_ddc_edid], drm: skipping non-existent adapter i915 gmbus dpc Nov 6 21:41:58 rusting kernel: [ 263.926775] [drm:output_poll_execute], [CONNECTOR:14:HDMI-A-1] status updated from 2 to 2 Nov 6 21:41:58 rusting kernel: [ 263.927291] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.944207] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.964201] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e Nov 6 21:41:58 rusting kernel: [ 263.983694] [drm:intel_dp_detect], DPCD: 0000000000000000 Nov 6 21:41:58 rusting kernel: [ 263.983704] [drm:output_poll_execute], [CONNECTOR:17:DP-1] status updated from 2 to 2 Additionally, this same trace stack is printed out at a regular 10s interval, after resume - where prior to resuming from S3 it is printed out once at boot time. This kworker consumes a significant portion of the cpu, and essentially grinds Xorg to a halt, until the probing can catch up with the user moving the cursor. There seems to be a mismatch for these IRQ delivery - or at least exhibits the behavior similar to such a problem. Does anyone have any thoughts as to where in the software stack I should start to dig in? Any opinions on which component likely contains the issue is appreciated. /btg --14dae9340cb7e45e4404cdea1fc5 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I'm trying to debug an issue on an older lapop (Toshiba Satellite A505)= - that has an i3 processor (M330) - and intel graphics.
This is runnin= g under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduc= ed using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4

(I have cross posted here, because I am not yet sure if= this is a Xen, pvops, or i915 issue - and would appreciate opinions in sor= ting it out.)

The symptoms of the problem exhibit th= emselves by a lagging mouse in X11 after resume, when using the trackpad.

After digging in a bit, the problem seems a bit more in= sidious - the i915 kworker responsible for hotplug detection (i915_hotplug_= work_func) seems to be getting triggered for every PS2 IRQ - every trackpad= mouse movement, and keypress triggers tracing (with drm.debug=3D0x06) like= the following:

Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924= 454] [drm:i915_hotplug_work_func], running encoder hotplug functions=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924468] [drm:intel_ironlake= _crt_detect_hotplug], ironlake hotplug adpa=3D0xf40018, result 0=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.924472] [drm:intel_crt_detect= ], CRT not detected via hotplug=A0
Nov 6 21:41:58=A0rusting=A0ker= nel: [ 263.924475] [drm:output_poll_execute], [CONNECTOR:11:VGA-1] status u= pdated from 2 to 2=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.926771] [drm:drm_do_probe_ddc= _edid], drm: skipping non-existent adapter i915 gmbus dpc=A0
Nov = 6 21:41:58=A0rusting=A0kernel: [ 263.926775] [drm:output_poll_execute], [CO= NNECTOR:14:HDMI-A-1] status updated from 2 to 2=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.927291] [drm:intel_dp_aux_ch]= , dp_aux_ch timeout status 0x5145003e=A0
Nov 6 21:41:58=A0rusting= =A0kernel: [ 263.944207] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x= 5145003e=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.964201] [drm:intel_dp_aux_ch]= , dp_aux_ch timeout status 0x5145003e=A0
Nov 6 21:41:58=A0rusting= =A0kernel: [ 263.983694] [drm:intel_dp_detect], DPCD: 0000000000000000=A0
Nov 6 21:41:58=A0rusting=A0kernel: [ 263.983704] [drm:output_poll_execute],= [CONNECTOR:17:DP-1] status updated from 2 to 2

<= div>Additionally, this same trace stack is printed out at a regular 10s int= erval, after resume - where prior to resuming from S3 it is printed out onc= e at boot time.

This kworker consumes a significant portion of the cpu,= and essentially grinds Xorg to a halt, until the probing can catch up with= the user moving the cursor.


There = seems to be a mismatch for these IRQ delivery - or at least exhibits the be= havior similar to such a problem.


Does anyone have any thoughts as to wher= e in the software stack I should start to dig in?
Any opinions on= which component likely contains the issue is appreciated.


/btg

--14dae9340cb7e45e4404cdea1fc5-- --===============7311888765167059898== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7311888765167059898==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:40:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:40:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8fJ-0006Nx-3W; Wed, 07 Nov 2012 16:39:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8fG-0006Ns-Gq for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:39:42 +0000 Received: from [85.158.143.99:28776] by server-3.bemta-4.messagelabs.com id 09/8F-06841-DCE8A905; Wed, 07 Nov 2012 16:39:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352306380!25642286!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10032 invoked from network); 7 Nov 2012 16:39:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 7 Nov 2012 16:39:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:39:39 +0000 Message-Id: <509A9CDA02000078000A706A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:39:38 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartF6C731DA.0__=" Subject: [Xen-devel] [PATCH v2] x86/ACPI: invalidate BGRT if necessary X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartF6C731DA.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since the image pointed to may live in boot services memory (which we add to the global memory pool long before ACPI tables get looked at), we should prevent Dom0 from trying to retrieve the image data in that case. The alternatives would be to - not add boot services memory to the global pool at all, or - defer adding boot services memory until Dom0 indicates it is safe to do so, or - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid adding that specific region to the E820 table. None of these are really attractive, and as Xen commonly prints to the video console anyway (without trying to avoid any regions on the screen), the invalidation would need to be done conditionally anyway. (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) Signed-off-by: Jan Beulich --- v2: Only invalidate if the image lives in RAM, and do the invalidation by clearing both the valid bit and the image address. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -286,6 +287,27 @@ static int __init acpi_parse_hpet(struct #define acpi_parse_hpet NULL #endif =20 +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) +{ + struct acpi_table_bgrt *bgrt_tbl =3D + container_of(table, struct acpi_table_bgrt, header); + + if (table->length < sizeof(*bgrt_tbl)) + return -1; + + if (bgrt_tbl->version =3D=3D 1 && bgrt_tbl->image_address + && !page_is_ram_type(PFN_DOWN(bgrt_tbl->image_address), + RAM_TYPE_CONVENTIONAL)) + return 0; + + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64"= \n", + bgrt_tbl->version, bgrt_tbl->image_address); + bgrt_tbl->image_address =3D 0; + bgrt_tbl->status &=3D ~1; + + return 0; +} + #ifdef CONFIG_ACPI_SLEEP #define acpi_fadt_copy_address(dst, src, len) do { \ if (fadt->header.revision >=3D FADT2_REVISION_ID) = \ @@ -653,5 +675,7 @@ int __init acpi_boot_init(void) =20 erst_init(); =20 + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); + return 0; } --- a/xen/include/acpi/actbl.h +++ b/xen/include/acpi/actbl.h @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { =20 #include #include +#include =20 /* * Sizes of the various flavors of FADT. We need to look closely --- /dev/null +++ b/xen/include/acpi/actbl3.h @@ -0,0 +1,557 @@ +/*************************************************************************= ***** + * + * Name: actbl3.h - ACPI Table Definitions + * + *************************************************************************= ****/ + +/* + * Copyright (C) 2000 - 2012, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for = further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the = names + * of any contributors may be used to endorse or promote products = derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#ifndef __ACTBL3_H__ +#define __ACTBL3_H__ + +/*************************************************************************= ****** + * + * Additional ACPI Tables (3) + * + * These tables are not consumed directly by the ACPICA subsystem, but = are + * included here to support device drivers and the AML disassembler. + * + * The tables in this file are fully defined within the ACPI specification= . + * + *************************************************************************= *****/ + +/* + * Values for description table header signatures for tables defined in = this + * file. Useful because they make it more difficult to inadvertently type = in + * the wrong signature. + */ +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for = Measurement table */ +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table = */ +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table = */ +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel = Table */ +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table = */ +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ + +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ + +/* Reserved table signatures */ + +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation = Table */ +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table = */ +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table = */ + +/* + * All tables must be byte-packed to match the ACPI specification, since + * the tables are provided by the system BIOS. + */ +#pragma pack(1) + +/* + * Note: C bitfields are not used for this reason: + * + * "Bitfields are great and easy to read, but unfortunately the C = language + * does not specify the layout of bitfields in memory, which means they = are + * essentially useless for dealing with packed data in on-disk formats or + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, + * this decision was a design error in C. Ritchie could have picked an = order + * and stuck with it." Norman Ramsey. + * See http://stackoverflow.com/a/1053662/41661=20 + */ + +/*************************************************************************= ****** + * + * BGRT - Boot Graphics Resource Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_bgrt { + struct acpi_table_header header; /* Common ACPI table = header */ + u16 version; + u8 status; + u8 image_type; + u64 image_address; + u32 image_offset_x; + u32 image_offset_y; +}; + +/*************************************************************************= ****** + * + * DRTM - Dynamic Root of Trust for Measurement table + * + *************************************************************************= *****/ + +struct acpi_table_drtm { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 entry_base_address; + u64 entry_length; + u32 entry_address32; + u64 entry_address64; + u64 exit_address; + u64 log_area_address; + u32 log_area_length; + u64 arch_dependent_address; + u32 flags; +}; + +/* 1) Validated Tables List */ + +struct acpi_drtm_vtl_list { + u32 validated_table_list_count; +}; + +/* 2) Resources List */ + +struct acpi_drtm_resource_list { + u32 resource_list_count; +}; + +/* 3) Platform-specific Identifiers List */ + +struct acpi_drtm_id_list { + u32 id_list_count; +}; + +/*************************************************************************= ****** + * + * FPDT - Firmware Performance Data Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_fpdt { + struct acpi_table_header header; /* Common ACPI table = header */ +}; + +/* FPDT subtable header */ + +struct acpi_fpdt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_fpdt_type { + ACPI_FPDT_TYPE_BOOT =3D 0, + ACPI_FPDT_TYPE_S3PERF =3D 1, +}; + +/* + * FPDT subtables + */ + +/* 0: Firmware Basic Boot Performance Record */ + +struct acpi_fpdt_boot { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 reset_end; + u64 load_start; + u64 startup_start; + u64 exit_services_entry; + u64 exit_services_exit; +}; + +/* 1: S3 Performance Table Pointer Record */ + +struct acpi_fpdt_s3pt_ptr { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 address; +}; + +/* + * S3PT - S3 Performance Table. This table is pointed to by the + * FPDT S3 Pointer Record above. + */ +struct acpi_table_s3pt { + u8 signature[4]; /* "S3PT" */ + u32 length; +}; + +/* + * S3PT Subtables + */ +struct acpi_s3pt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_s3pt_type { + ACPI_S3PT_TYPE_RESUME =3D 0, + ACPI_S3PT_TYPE_SUSPEND =3D 1, +}; + +struct acpi_s3pt_resume { + struct acpi_s3pt_header header; + u32 resume_count; + u64 full_resume; + u64 average_resume; +}; + +struct acpi_s3pt_suspend { + struct acpi_s3pt_header header; + u64 suspend_start; + u64 suspend_end; +}; + +/*************************************************************************= ****** + * + * GTDT - Generic Timer Description Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_gtdt { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 address; + u32 flags; + u32 secure_pl1_interrupt; + u32 secure_pl1_flags; + u32 non_secure_pl1_interrupt; + u32 non_secure_pl1_flags; + u32 virtual_timer_interrupt; + u32 virtual_timer_flags; + u32 non_secure_pl2_interrupt; + u32 non_secure_pl2_flags; +}; + +/* Values for Flags field above */ + +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 + +/* Values for all "TimerFlags" fields above */ + +#define ACPI_GTDT_INTERRUPT_MODE 1 +#define ACPI_GTDT_INTERRUPT_POLARITY 2 + +/*************************************************************************= ****** + * + * MPST - Memory Power State Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +#define ACPI_MPST_CHANNEL_INFO \ + u16 reserved1; \ + u8 channel_id; \ + u8 reserved2; \ + u16 power_node_count; + +/* Main table */ + +struct acpi_table_mpst { + struct acpi_table_header header; /* Common ACPI table = header */ + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Platform Communication Channel Info */ + +struct acpi_mpst_channel { + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Power Node Structure */ + +struct acpi_mpst_power_node { + u8 flags; + u8 reserved1; + u16 node_id; + u32 length; + u64 range_address; + u64 range_length; + u8 num_power_states; + u8 num_physical_components; + u16 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_ENABLED 1 +#define ACPI_MPST_POWER_MANAGED 2 +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 + +/* Memory Power State Structure (follows POWER_NODE above) */ + +struct acpi_mpst_power_state { + u8 power_state; + u8 info_index; +}; + +/* Physical Component ID Structure (follows POWER_STATE above) */ + +struct acpi_mpst_component { + u16 component_id; +}; + +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) = */ + +struct acpi_mpst_data_hdr { + u16 characteristics_count; +}; + +struct acpi_mpst_power_data { + u8 revision; + u8 flags; + u16 reserved1; + u32 average_power; + u32 power_saving; + u64 exit_latency; + u64 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_PRESERVE 1 +#define ACPI_MPST_AUTOENTRY 2 +#define ACPI_MPST_AUTOEXIT 4 + +/* Shared Memory Region (not part of an ACPI table) */ + +struct acpi_mpst_shared { + u32 signature; + u16 pcc_command; + u16 pcc_status; + u16 command_register; + u16 status_register; + u16 power_state_id; + u16 power_node_id; + u64 energy_consumed; + u64 average_power; +}; + +/*************************************************************************= ****** + * + * PCCT - Platform Communications Channel Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pcct { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 flags; + u32 latency; + u32 reserved; +}; + +/* Values for Flags field above */ + +#define ACPI_PCCT_DOORBELL 1 + +/* + * PCCT subtables + */ + +/* 0: Generic Communications Subspace */ + +struct acpi_pcct_subspace { + struct acpi_subtable_header header; + u8 reserved[6]; + u64 base_address; + u64 length; + struct acpi_generic_address doorbell_register; + u64 preserve_mask; + u64 write_mask; +}; + +/* + * PCC memory structures (not part of the ACPI table) + */ + +/* Shared Memory Region */ + +struct acpi_pcct_shared_memory { + u32 signature; + u16 command; + u16 status; +}; + +/*************************************************************************= ****** + * + * PMTT - Platform Memory Topology Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pmtt { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 reserved; +}; + +/* Common header for PMTT subtables that follow main table */ + +struct acpi_pmtt_header { + u8 type; + u8 reserved1; + u16 length; + u16 flags; + u16 reserved2; +}; + +/* Values for Type field above */ + +#define ACPI_PMTT_TYPE_SOCKET 0 +#define ACPI_PMTT_TYPE_CONTROLLER 1 +#define ACPI_PMTT_TYPE_DIMM 2 +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved = */ + +/* Values for Flags field above */ + +#define ACPI_PMTT_TOP_LEVEL 0x0001 +#define ACPI_PMTT_PHYSICAL 0x0002 +#define ACPI_PMTT_MEMORY_TYPE 0x000C + +/* + * PMTT subtables, correspond to Type in struct acpi_pmtt_header + */ + +/* 0: Socket Structure */ + +struct acpi_pmtt_socket { + struct acpi_pmtt_header header; + u16 socket_id; + u16 reserved; +}; + +/* 1: Memory Controller subtable */ + +struct acpi_pmtt_controller { + struct acpi_pmtt_header header; + u32 read_latency; + u32 write_latency; + u32 read_bandwidth; + u32 write_bandwidth; + u16 access_width; + u16 alignment; + u16 reserved; + u16 domain_count; +}; + +/* 1a: Proximity Domain substructure */ + +struct acpi_pmtt_domain { + u32 proximity_domain; +}; + +/* 2: Physical Component Identifier (DIMM) */ + +struct acpi_pmtt_physical_component { + struct acpi_pmtt_header header; + u16 component_id; + u16 reserved; + u32 memory_size; + u32 bios_handle; +}; + +/*************************************************************************= ****** + * + * RASF - RAS Feature Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_rasf { + struct acpi_table_header header; /* Common ACPI table = header */ + u8 channel_id[12]; +}; + +/* RASF Platform Communication Channel Shared Memory Region */ + +struct acpi_rasf_shared_memory { + u32 signature; + u16 command; + u16 status; + u64 requested_address; + u64 requested_length; + u64 actual_address; + u64 actual_length; + u16 flags; + u8 speed; +}; + +/* Masks for Flags and Speed fields above */ + +#define ACPI_RASF_SCRUBBER_RUNNING 1 +#define ACPI_RASF_SPEED (7<<1) + +/* Channel Commands */ + +enum acpi_rasf_commands { + ACPI_RASF_GET_RAS_CAPABILITIES =3D 1, + ACPI_RASF_GET_PATROL_PARAMETERS =3D 2, + ACPI_RASF_START_PATROL_SCRUBBER =3D 3, + ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4 +}; + +/* Channel Command flags */ + +#define ACPI_RASF_GENERATE_SCI (1<<15) + +/* Status values */ + +enum acpi_rasf_status { + ACPI_RASF_SUCCESS =3D 0, + ACPI_RASF_NOT_VALID =3D 1, + ACPI_RASF_NOT_SUPPORTED =3D 2, + ACPI_RASF_BUSY =3D 3, + ACPI_RASF_FAILED =3D 4, + ACPI_RASF_ABORTED =3D 5, + ACPI_RASF_INVALID_DATA =3D 6 +}; + +/* Status flags */ + +#define ACPI_RASF_COMMAND_COMPLETE (1) +#define ACPI_RASF_SCI_DOORBELL (1<<1) +#define ACPI_RASF_ERROR (1<<2) +#define ACPI_RASF_STATUS (0x1F<<3) + +/* Reset to default packing */ + +#pragma pack() + +#endif /* __ACTBL3_H__ */ --=__PartF6C731DA.0__= Content-Type: text/plain; name="ACPI-BGRT-invalidate.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-BGRT-invalidate.patch" x86/ACPI: invalidate BGRT if necessary=0A=0ASince the image pointed to may = live in boot services memory (which we=0Aadd to the global memory pool = long before ACPI tables get looked at),=0Awe should prevent Dom0 from = trying to retrieve the image data in that=0Acase.=0A=0AThe alternatives = would be to=0A- not add boot services memory to the global pool at all, = or=0A- defer adding boot services memory until Dom0 indicates it is safe = to=0A do so, or=0A- find and parse the BGRT table in xen/arch/x86/efi/boot= .c, and avoid=0A adding that specific region to the E820 table.=0ANone of = these are really attractive, and as Xen commonly prints to the=0Avideo = console anyway (without trying to avoid any regions on the=0Ascreen), the = invalidation would need to be done conditionally anyway.=0A=0A(xen/include/= acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4)=0A=0ASigned-off-by: = Jan Beulich =0A---=0Av2: Only invalidate if the image = lives in RAM, and do the invalidation=0A by clearing both the valid bit = and the image address.=0A=0A--- a/xen/arch/x86/acpi/boot.c=0A+++ b/xen/arch= /x86/acpi/boot.c=0A@@ -28,6 +28,7 @@=0A #include =0A #include = =0A #include =0A+#include =0A #include = =0A #include =0A #include =0A@@ = -286,6 +287,27 @@ static int __init acpi_parse_hpet(struct=0A #define = acpi_parse_hpet NULL=0A #endif=0A =0A+static int __init acpi_invalidate_bgr= t(struct acpi_table_header *table)=0A+{=0A+ struct acpi_table_bgrt = *bgrt_tbl =3D=0A+ container_of(table, struct acpi_table_bgrt,= header);=0A+=0A+ if (table->length < sizeof(*bgrt_tbl))=0A+ = return -1;=0A+=0A+ if (bgrt_tbl->version =3D=3D 1 && bgrt_tbl->image_a= ddress=0A+ && !page_is_ram_type(PFN_DOWN(bgrt_tbl->image_address),= =0A+ RAM_TYPE_CONVENTIONAL))=0A+ = return 0;=0A+=0A+ printk(KERN_INFO PREFIX "BGRT: invalidating v%d = image at %#"PRIx64"\n",=0A+ bgrt_tbl->version, bgrt_tbl->image_a= ddress);=0A+ bgrt_tbl->image_address =3D 0;=0A+ bgrt_tbl->status = &=3D ~1;=0A+=0A+ return 0;=0A+}=0A+=0A #ifdef CONFIG_ACPI_SLEEP=0A = #define acpi_fadt_copy_address(dst, src, len) do { = \=0A if (fadt->header.revision >=3D FADT2_REVISION_ID) = \=0A@@ -653,5 +675,7 @@ int __init acpi_boot_init(void)=0A =0A erst_init()= ;=0A =0A+ acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt);=0A+= =0A return 0;=0A }=0A--- a/xen/include/acpi/actbl.h=0A+++ b/xen/include= /acpi/actbl.h=0A@@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles {=0A = =0A #include =0A #include =0A+#include = =0A =0A /*=0A * Sizes of the various flavors of FADT. We = need to look closely=0A--- /dev/null=0A+++ b/xen/include/acpi/actbl3.h=0A@@= -0,0 +1,557 @@=0A+/*******************************************************= ***********************=0A+ *=0A+ * Name: actbl3.h - ACPI Table Definitions= =0A+ *=0A+ ****************************************************************= *************/=0A+=0A+/*=0A+ * Copyright (C) 2000 - 2012, Intel Corp.=0A+ = * All rights reserved.=0A+ *=0A+ * Redistribution and use in source and = binary forms, with or without=0A+ * modification, are permitted provided = that the following conditions=0A+ * are met:=0A+ * 1. Redistributions of = source code must retain the above copyright=0A+ * notice, this list of = conditions, and the following disclaimer,=0A+ * without modification.=0A= + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer=0A+ * substantially similar to the "NO WARRANTY" disclaimer = below=0A+ * ("Disclaimer") and any redistribution must be conditioned = upon=0A+ * including a substantially similar Disclaimer requirement for = further=0A+ * binary redistribution.=0A+ * 3. Neither the names of the = above-listed copyright holders nor the names=0A+ * of any contributors = may be used to endorse or promote products derived=0A+ * from this = software without specific prior written permission.=0A+ *=0A+ * Alternative= ly, this software may be distributed under the terms of the=0A+ * GNU = General Public License ("GPL") version 2 as published by the Free=0A+ * = Software Foundation.=0A+ *=0A+ * NO WARRANTY=0A+ * THIS SOFTWARE IS = PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS=0A+ * "AS IS" AND ANY = EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT=0A+ * LIMITED TO, THE = IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR=0A+ * A PARTICULAR = PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT=0A+ * HOLDERS OR = CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL=0A+ * = DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS=0A+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION)=0A+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER = IN CONTRACT,=0A+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR = OTHERWISE) ARISING=0A+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN = IF ADVISED OF THE=0A+ * POSSIBILITY OF SUCH DAMAGES.=0A+ */=0A+=0A+#ifndef = __ACTBL3_H__=0A+#define __ACTBL3_H__=0A+=0A+/******************************= *************************************************=0A+ *=0A+ * Additional = ACPI Tables (3)=0A+ *=0A+ * These tables are not consumed directly by the = ACPICA subsystem, but are=0A+ * included here to support device drivers = and the AML disassembler.=0A+ *=0A+ * The tables in this file are fully = defined within the ACPI specification.=0A+ *=0A+ **************************= ****************************************************/=0A+=0A+/*=0A+ * = Values for description table header signatures for tables defined in = this=0A+ * file. Useful because they make it more difficult to inadvertentl= y type in=0A+ * the wrong signature.=0A+ */=0A+#define ACPI_SIG_BGRT = "BGRT" /* Boot Graphics Resource Table */=0A+#define ACPI_SIG_DRTM= "DRTM" /* Dynamic Root of Trust for Measurement table = */=0A+#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance = Data Table */=0A+#define ACPI_SIG_GTDT "GTDT" /* Generic Timer = Description Table */=0A+#define ACPI_SIG_MPST "MPST" /* Memory = Power State Table */=0A+#define ACPI_SIG_PCCT "PCCT" /* = Platform Communications Channel Table */=0A+#define ACPI_SIG_PMTT = "PMTT" /* Platform Memory Topology Table */=0A+#define ACPI_SIG_RASF = "RASF" /* RAS Feature table */=0A+=0A+#define ACPI_SIG_S3PT = "S3PT" /* S3 Performance (sub)Table */=0A+#define ACPI_SIG_PCCS = "PCC" /* PCC Shared Memory Region */=0A+=0A+/* Reserved table = signatures */=0A+=0A+#define ACPI_SIG_CSRT "CSRT" /* Core = System Resources Table */=0A+#define ACPI_SIG_MATR "MATR" /* = Memory Address Translation Table */=0A+#define ACPI_SIG_MSDM = "MSDM" /* Microsoft Data Management Table */=0A+#define ACPI_SIG_WPBT = "WPBT" /* Windows Platform Binary Table */=0A+=0A+/*=0A+ * All = tables must be byte-packed to match the ACPI specification, since=0A+ * = the tables are provided by the system BIOS.=0A+ */=0A+#pragma pack(1)=0A+= =0A+/*=0A+ * Note: C bitfields are not used for this reason:=0A+ *=0A+ * = "Bitfields are great and easy to read, but unfortunately the C language=0A+= * does not specify the layout of bitfields in memory, which means they = are=0A+ * essentially useless for dealing with packed data in on-disk = formats or=0A+ * binary wire protocols." (Or ACPI tables and buffers.) "If = you ask me,=0A+ * this decision was a design error in C. Ritchie could = have picked an order=0A+ * and stuck with it." Norman Ramsey.=0A+ * See = http://stackoverflow.com/a/1053662/41661=0A+ */=0A+=0A+/*******************= ************************************************************=0A+ *=0A+ * = BGRT - Boot Graphics Resource Table (ACPI 5.0)=0A+ * Version 1=0A+ = *=0A+ *********************************************************************= *********/=0A+=0A+struct acpi_table_bgrt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u16 version;=0A+ u8 = status;=0A+ u8 image_type;=0A+ u64 image_address;=0A+ u32 = image_offset_x;=0A+ u32 image_offset_y;=0A+};=0A+=0A+/*****************= **************************************************************=0A+ *=0A+ * = DRTM - Dynamic Root of Trust for Measurement table=0A+ *=0A+ **************= ****************************************************************/=0A+=0A+st= ruct acpi_table_drtm {=0A+ struct acpi_table_header header; /* = Common ACPI table header */=0A+ u64 entry_base_address;=0A+ u64 = entry_length;=0A+ u32 entry_address32;=0A+ u64 entry_address64= ;=0A+ u64 exit_address;=0A+ u64 log_area_address;=0A+ u32 = log_area_length;=0A+ u64 arch_dependent_address;=0A+ u32 flags;=0A+};=0A= +=0A+/* 1) Validated Tables List */=0A+=0A+struct acpi_drtm_vtl_list {=0A+ = u32 validated_table_list_count;=0A+};=0A+=0A+/* 2) Resources List = */=0A+=0A+struct acpi_drtm_resource_list {=0A+ u32 resource_list_count;=0A= +};=0A+=0A+/* 3) Platform-specific Identifiers List */=0A+=0A+struct = acpi_drtm_id_list {=0A+ u32 id_list_count;=0A+};=0A+=0A+/******************= *************************************************************=0A+ *=0A+ * = FPDT - Firmware Performance Data Table (ACPI 5.0)=0A+ * Version = 1=0A+ *=0A+ ***************************************************************= ***************/=0A+=0A+struct acpi_table_fpdt {=0A+ struct acpi_table_h= eader header; /* Common ACPI table header */=0A+};=0A+=0A+/* FPDT = subtable header */=0A+=0A+struct acpi_fpdt_header {=0A+ u16 type;=0A+ u8 = length;=0A+ u8 revision;=0A+};=0A+=0A+/* Values for Type field above = */=0A+=0A+enum acpi_fpdt_type {=0A+ ACPI_FPDT_TYPE_BOOT =3D 0,=0A+ = ACPI_FPDT_TYPE_S3PERF =3D 1,=0A+};=0A+=0A+/*=0A+ * FPDT subtables=0A+ = */=0A+=0A+/* 0: Firmware Basic Boot Performance Record */=0A+=0A+struct = acpi_fpdt_boot {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 reset_end;=0A+ u64 load_start;=0A+ = u64 startup_start;=0A+ u64 exit_services_entry;=0A+ u64 exit_services_e= xit;=0A+};=0A+=0A+/* 1: S3 Performance Table Pointer Record */=0A+=0A+struc= t acpi_fpdt_s3pt_ptr {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 address;=0A+};=0A+=0A+/*=0A+ * S3PT - S3 = Performance Table. This table is pointed to by the=0A+ * FPDT S3 Pointer = Record above.=0A+ */=0A+struct acpi_table_s3pt {=0A+ u8 signature[4]; = /* "S3PT" */=0A+ u32 length;=0A+};=0A+=0A+/*=0A+ * S3PT Subtables=0A= + */=0A+struct acpi_s3pt_header {=0A+ u16 type;=0A+ u8 length;=0A+ u8 = revision;=0A+};=0A+=0A+/* Values for Type field above */=0A+=0A+enum = acpi_s3pt_type {=0A+ ACPI_S3PT_TYPE_RESUME =3D 0,=0A+ ACPI_S3PT_T= YPE_SUSPEND =3D 1,=0A+};=0A+=0A+struct acpi_s3pt_resume {=0A+ struct = acpi_s3pt_header header;=0A+ u32 resume_count;=0A+ u64 full_resume;=0A= + u64 average_resume;=0A+};=0A+=0A+struct acpi_s3pt_suspend {=0A+ = struct acpi_s3pt_header header;=0A+ u64 suspend_start;=0A+ u64 = suspend_end;=0A+};=0A+=0A+/************************************************= *******************************=0A+ *=0A+ * GTDT - Generic Timer Descriptio= n Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ ***********************= *******************************************************/=0A+=0A+struct = acpi_table_gtdt {=0A+ struct acpi_table_header header; /* Common = ACPI table header */=0A+ u64 address;=0A+ u32 flags;=0A+ = u32 secure_pl1_interrupt;=0A+ u32 secure_pl1_flags;=0A+ u32 = non_secure_pl1_interrupt;=0A+ u32 non_secure_pl1_flags;=0A+ u32 = virtual_timer_interrupt;=0A+ u32 virtual_timer_flags;=0A+ u32 = non_secure_pl2_interrupt;=0A+ u32 non_secure_pl2_flags;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_GTDT_MAPPED_BLOCK_PRESE= NT 1=0A+=0A+/* Values for all "TimerFlags" fields above */=0A+=0A+#def= ine ACPI_GTDT_INTERRUPT_MODE 1=0A+#define ACPI_GTDT_INTERRUPT_PO= LARITY 2=0A+=0A+/***************************************************= ****************************=0A+ *=0A+ * MPST - Memory Power State Table = (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ *******************************= ***********************************************/=0A+=0A+#define ACPI_MPST_C= HANNEL_INFO \=0A+ u16 reserved1; \=0A+ = u8 channel_id; \=0A+ u8 = reserved2; \=0A+ u16 power_node_= count;=0A+=0A+/* Main table */=0A+=0A+struct acpi_table_mpst {=0A+ = struct acpi_table_header header; /* Common ACPI table header */=0A+ = ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */=0A+};=0A+=0A+/= * Memory Platform Communication Channel Info */=0A+=0A+struct acpi_mpst_cha= nnel {=0A+ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel = */=0A+};=0A+=0A+/* Memory Power Node Structure */=0A+=0A+struct acpi_mpst_p= ower_node {=0A+ u8 flags;=0A+ u8 reserved1;=0A+ u16 node_id;=0A+ = u32 length;=0A+ u64 range_address;=0A+ u64 range_length;=0A+ u8 = num_power_states;=0A+ u8 num_physical_components;=0A+ u16 reserved2;=0A+}= ;=0A+=0A+/* Values for Flags field above */=0A+=0A+#define ACPI_MPST_ENABLE= D 1=0A+#define ACPI_MPST_POWER_MANAGED 2=0A+#define = ACPI_MPST_HOT_PLUG_CAPABLE 4=0A+=0A+/* Memory Power State Structure = (follows POWER_NODE above) */=0A+=0A+struct acpi_mpst_power_state {=0A+ u8 = power_state;=0A+ u8 info_index;=0A+};=0A+=0A+/* Physical Component = ID Structure (follows POWER_STATE above) */=0A+=0A+struct acpi_mpst_compone= nt {=0A+ u16 component_id;=0A+};=0A+=0A+/* Memory Power State = Characteristics Structure (follows all POWER_NODEs) */=0A+=0A+struct = acpi_mpst_data_hdr {=0A+ u16 characteristics_count;=0A+};=0A+=0A+str= uct acpi_mpst_power_data {=0A+ u8 revision;=0A+ u8 flags;=0A+ = u16 reserved1;=0A+ u32 average_power;=0A+ u32 power_saving;=0A+ = u64 exit_latency;=0A+ u64 reserved2;=0A+};=0A+=0A+/* Values for Flags = field above */=0A+=0A+#define ACPI_MPST_PRESERVE 1=0A+#define = ACPI_MPST_AUTOENTRY 2=0A+#define ACPI_MPST_AUTOEXIT = 4=0A+=0A+/* Shared Memory Region (not part of an ACPI table) */=0A+=0A+st= ruct acpi_mpst_shared {=0A+ u32 signature;=0A+ u16 pcc_command;=0A= + u16 pcc_status;=0A+ u16 command_register;=0A+ u16 = status_register;=0A+ u16 power_state_id;=0A+ u16 power_node_id;=0A+ = u64 energy_consumed;=0A+ u64 average_power;=0A+};=0A+=0A+/**********= *********************************************************************=0A+ = *=0A+ * PCCT - Platform Communications Channel Table (ACPI 5.0)=0A+ * = Version 1=0A+ *=0A+ *****************************************************= *************************/=0A+=0A+struct acpi_table_pcct {=0A+ struct = acpi_table_header header; /* Common ACPI table header */=0A+ = u32 flags;=0A+ u32 latency;=0A+ u32 reserved;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_PCCT_DOORBELL = 1=0A+=0A+/*=0A+ * PCCT subtables=0A+ */=0A+=0A+/* 0: Generic Communicat= ions Subspace */=0A+=0A+struct acpi_pcct_subspace {=0A+ struct acpi_subtabl= e_header header;=0A+ u8 reserved[6];=0A+ u64 base_address;=0A+ = u64 length;=0A+ struct acpi_generic_address doorbell_register;=0A+ = u64 preserve_mask;=0A+ u64 write_mask;=0A+};=0A+=0A+/*=0A+ * PCC memory = structures (not part of the ACPI table)=0A+ */=0A+=0A+/* Shared Memory = Region */=0A+=0A+struct acpi_pcct_shared_memory {=0A+ u32 signature;=0A+ = u16 command;=0A+ u16 status;=0A+};=0A+=0A+/*************************= ******************************************************=0A+ *=0A+ * PMTT - = Platform Memory Topology Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_pmtt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u32 reserved;=0A+};=0A+=0A+= /* Common header for PMTT subtables that follow main table */=0A+=0A+struct= acpi_pmtt_header {=0A+ u8 type;=0A+ u8 reserved1;=0A+ u16 = length;=0A+ u16 flags;=0A+ u16 reserved2;=0A+};=0A+=0A+/* Values for = Type field above */=0A+=0A+#define ACPI_PMTT_TYPE_SOCKET = 0=0A+#define ACPI_PMTT_TYPE_CONTROLLER 1=0A+#define ACPI_PMTT_TYPE_DI= MM 2=0A+#define ACPI_PMTT_TYPE_RESERVED 3 /* = 0x03-0xFF are reserved */=0A+=0A+/* Values for Flags field above */=0A+=0A+= #define ACPI_PMTT_TOP_LEVEL 0x0001=0A+#define ACPI_PMTT_PHYSICA= L 0x0002=0A+#define ACPI_PMTT_MEMORY_TYPE 0x000C=0A+= =0A+/*=0A+ * PMTT subtables, correspond to Type in struct acpi_pmtt_header= =0A+ */=0A+=0A+/* 0: Socket Structure */=0A+=0A+struct acpi_pmtt_socket = {=0A+ struct acpi_pmtt_header header;=0A+ u16 socket_id;=0A+ = u16 reserved;=0A+};=0A+=0A+/* 1: Memory Controller subtable */=0A+=0A+struc= t acpi_pmtt_controller {=0A+ struct acpi_pmtt_header header;=0A+ = u32 read_latency;=0A+ u32 write_latency;=0A+ u32 read_bandwidth;=0A+ = u32 write_bandwidth;=0A+ u16 access_width;=0A+ u16 alignment;=0A+ = u16 reserved;=0A+ u16 domain_count;=0A+};=0A+=0A+/* 1a: Proximity = Domain substructure */=0A+=0A+struct acpi_pmtt_domain {=0A+ u32 = proximity_domain;=0A+};=0A+=0A+/* 2: Physical Component Identifier (DIMM) = */=0A+=0A+struct acpi_pmtt_physical_component {=0A+ struct acpi_pmtt_he= ader header;=0A+ u16 component_id;=0A+ u16 reserved;=0A+ = u32 memory_size;=0A+ u32 bios_handle;=0A+};=0A+=0A+/********************= ***********************************************************=0A+ *=0A+ * = RASF - RAS Feature Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_rasf {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u8 channel_id[12];=0A+};=0A= +=0A+/* RASF Platform Communication Channel Shared Memory Region */=0A+=0A+= struct acpi_rasf_shared_memory {=0A+ u32 signature;=0A+ u16 = command;=0A+ u16 status;=0A+ u64 requested_address;=0A+ u64 = requested_length;=0A+ u64 actual_address;=0A+ u64 actual_length;=0A+ = u16 flags;=0A+ u8 speed;=0A+};=0A+=0A+/* Masks for Flags and Speed fields = above */=0A+=0A+#define ACPI_RASF_SCRUBBER_RUNNING 1=0A+#define = ACPI_RASF_SPEED (7<<1)=0A+=0A+/* Channel Commands = */=0A+=0A+enum acpi_rasf_commands {=0A+ ACPI_RASF_GET_RAS_CAPABILITIES =3D = 1,=0A+ ACPI_RASF_GET_PATROL_PARAMETERS =3D 2,=0A+ ACPI_RASF_START_PAT= ROL_SCRUBBER =3D 3,=0A+ ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4=0A+};=0A+=0A+/= * Channel Command flags */=0A+=0A+#define ACPI_RASF_GENERATE_SCI = (1<<15)=0A+=0A+/* Status values */=0A+=0A+enum acpi_rasf_status {=0A+ = ACPI_RASF_SUCCESS =3D 0,=0A+ ACPI_RASF_NOT_VALID =3D 1,=0A+ ACPI_RASF_N= OT_SUPPORTED =3D 2,=0A+ ACPI_RASF_BUSY =3D 3,=0A+ ACPI_RASF_FAILED = =3D 4,=0A+ ACPI_RASF_ABORTED =3D 5,=0A+ ACPI_RASF_INVALID_DATA =3D = 6=0A+};=0A+=0A+/* Status flags */=0A+=0A+#define ACPI_RASF_COMMAND_COMPLETE= (1)=0A+#define ACPI_RASF_SCI_DOORBELL (1<<1)=0A+#define = ACPI_RASF_ERROR (1<<2)=0A+#define ACPI_RASF_STATUS = (0x1F<<3)=0A+=0A+/* Reset to default packing */=0A+=0A+#pragma = pack()=0A+=0A+#endif /* __ACTBL3_H__ */=0A --=__PartF6C731DA.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartF6C731DA.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:40:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:40:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8fJ-0006Nx-3W; Wed, 07 Nov 2012 16:39:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8fG-0006Ns-Gq for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:39:42 +0000 Received: from [85.158.143.99:28776] by server-3.bemta-4.messagelabs.com id 09/8F-06841-DCE8A905; Wed, 07 Nov 2012 16:39:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352306380!25642286!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10032 invoked from network); 7 Nov 2012 16:39:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 7 Nov 2012 16:39:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 16:39:39 +0000 Message-Id: <509A9CDA02000078000A706A@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 16:39:38 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartF6C731DA.0__=" Subject: [Xen-devel] [PATCH v2] x86/ACPI: invalidate BGRT if necessary X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartF6C731DA.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Since the image pointed to may live in boot services memory (which we add to the global memory pool long before ACPI tables get looked at), we should prevent Dom0 from trying to retrieve the image data in that case. The alternatives would be to - not add boot services memory to the global pool at all, or - defer adding boot services memory until Dom0 indicates it is safe to do so, or - find and parse the BGRT table in xen/arch/x86/efi/boot.c, and avoid adding that specific region to the E820 table. None of these are really attractive, and as Xen commonly prints to the video console anyway (without trying to avoid any regions on the screen), the invalidation would need to be done conditionally anyway. (xen/include/acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4) Signed-off-by: Jan Beulich --- v2: Only invalidate if the image lives in RAM, and do the invalidation by clearing both the valid bit and the image address. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -286,6 +287,27 @@ static int __init acpi_parse_hpet(struct #define acpi_parse_hpet NULL #endif =20 +static int __init acpi_invalidate_bgrt(struct acpi_table_header *table) +{ + struct acpi_table_bgrt *bgrt_tbl =3D + container_of(table, struct acpi_table_bgrt, header); + + if (table->length < sizeof(*bgrt_tbl)) + return -1; + + if (bgrt_tbl->version =3D=3D 1 && bgrt_tbl->image_address + && !page_is_ram_type(PFN_DOWN(bgrt_tbl->image_address), + RAM_TYPE_CONVENTIONAL)) + return 0; + + printk(KERN_INFO PREFIX "BGRT: invalidating v%d image at %#"PRIx64"= \n", + bgrt_tbl->version, bgrt_tbl->image_address); + bgrt_tbl->image_address =3D 0; + bgrt_tbl->status &=3D ~1; + + return 0; +} + #ifdef CONFIG_ACPI_SLEEP #define acpi_fadt_copy_address(dst, src, len) do { \ if (fadt->header.revision >=3D FADT2_REVISION_ID) = \ @@ -653,5 +675,7 @@ int __init acpi_boot_init(void) =20 erst_init(); =20 + acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt); + return 0; } --- a/xen/include/acpi/actbl.h +++ b/xen/include/acpi/actbl.h @@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles { =20 #include #include +#include =20 /* * Sizes of the various flavors of FADT. We need to look closely --- /dev/null +++ b/xen/include/acpi/actbl3.h @@ -0,0 +1,557 @@ +/*************************************************************************= ***** + * + * Name: actbl3.h - ACPI Table Definitions + * + *************************************************************************= ****/ + +/* + * Copyright (C) 2000 - 2012, Intel Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for = further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the = names + * of any contributors may be used to endorse or promote products = derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENT= IAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + */ + +#ifndef __ACTBL3_H__ +#define __ACTBL3_H__ + +/*************************************************************************= ****** + * + * Additional ACPI Tables (3) + * + * These tables are not consumed directly by the ACPICA subsystem, but = are + * included here to support device drivers and the AML disassembler. + * + * The tables in this file are fully defined within the ACPI specification= . + * + *************************************************************************= *****/ + +/* + * Values for description table header signatures for tables defined in = this + * file. Useful because they make it more difficult to inadvertently type = in + * the wrong signature. + */ +#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */ +#define ACPI_SIG_DRTM "DRTM" /* Dynamic Root of Trust for = Measurement table */ +#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance Data Table = */ +#define ACPI_SIG_GTDT "GTDT" /* Generic Timer Description Table = */ +#define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ +#define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel = Table */ +#define ACPI_SIG_PMTT "PMTT" /* Platform Memory Topology Table = */ +#define ACPI_SIG_RASF "RASF" /* RAS Feature table */ + +#define ACPI_SIG_S3PT "S3PT" /* S3 Performance (sub)Table */ +#define ACPI_SIG_PCCS "PCC" /* PCC Shared Memory Region */ + +/* Reserved table signatures */ + +#define ACPI_SIG_CSRT "CSRT" /* Core System Resources Table */ +#define ACPI_SIG_MATR "MATR" /* Memory Address Translation = Table */ +#define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table = */ +#define ACPI_SIG_WPBT "WPBT" /* Windows Platform Binary Table = */ + +/* + * All tables must be byte-packed to match the ACPI specification, since + * the tables are provided by the system BIOS. + */ +#pragma pack(1) + +/* + * Note: C bitfields are not used for this reason: + * + * "Bitfields are great and easy to read, but unfortunately the C = language + * does not specify the layout of bitfields in memory, which means they = are + * essentially useless for dealing with packed data in on-disk formats or + * binary wire protocols." (Or ACPI tables and buffers.) "If you ask me, + * this decision was a design error in C. Ritchie could have picked an = order + * and stuck with it." Norman Ramsey. + * See http://stackoverflow.com/a/1053662/41661=20 + */ + +/*************************************************************************= ****** + * + * BGRT - Boot Graphics Resource Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_bgrt { + struct acpi_table_header header; /* Common ACPI table = header */ + u16 version; + u8 status; + u8 image_type; + u64 image_address; + u32 image_offset_x; + u32 image_offset_y; +}; + +/*************************************************************************= ****** + * + * DRTM - Dynamic Root of Trust for Measurement table + * + *************************************************************************= *****/ + +struct acpi_table_drtm { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 entry_base_address; + u64 entry_length; + u32 entry_address32; + u64 entry_address64; + u64 exit_address; + u64 log_area_address; + u32 log_area_length; + u64 arch_dependent_address; + u32 flags; +}; + +/* 1) Validated Tables List */ + +struct acpi_drtm_vtl_list { + u32 validated_table_list_count; +}; + +/* 2) Resources List */ + +struct acpi_drtm_resource_list { + u32 resource_list_count; +}; + +/* 3) Platform-specific Identifiers List */ + +struct acpi_drtm_id_list { + u32 id_list_count; +}; + +/*************************************************************************= ****** + * + * FPDT - Firmware Performance Data Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_fpdt { + struct acpi_table_header header; /* Common ACPI table = header */ +}; + +/* FPDT subtable header */ + +struct acpi_fpdt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_fpdt_type { + ACPI_FPDT_TYPE_BOOT =3D 0, + ACPI_FPDT_TYPE_S3PERF =3D 1, +}; + +/* + * FPDT subtables + */ + +/* 0: Firmware Basic Boot Performance Record */ + +struct acpi_fpdt_boot { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 reset_end; + u64 load_start; + u64 startup_start; + u64 exit_services_entry; + u64 exit_services_exit; +}; + +/* 1: S3 Performance Table Pointer Record */ + +struct acpi_fpdt_s3pt_ptr { + struct acpi_fpdt_header header; + u8 reserved[4]; + u64 address; +}; + +/* + * S3PT - S3 Performance Table. This table is pointed to by the + * FPDT S3 Pointer Record above. + */ +struct acpi_table_s3pt { + u8 signature[4]; /* "S3PT" */ + u32 length; +}; + +/* + * S3PT Subtables + */ +struct acpi_s3pt_header { + u16 type; + u8 length; + u8 revision; +}; + +/* Values for Type field above */ + +enum acpi_s3pt_type { + ACPI_S3PT_TYPE_RESUME =3D 0, + ACPI_S3PT_TYPE_SUSPEND =3D 1, +}; + +struct acpi_s3pt_resume { + struct acpi_s3pt_header header; + u32 resume_count; + u64 full_resume; + u64 average_resume; +}; + +struct acpi_s3pt_suspend { + struct acpi_s3pt_header header; + u64 suspend_start; + u64 suspend_end; +}; + +/*************************************************************************= ****** + * + * GTDT - Generic Timer Description Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_gtdt { + struct acpi_table_header header; /* Common ACPI table = header */ + u64 address; + u32 flags; + u32 secure_pl1_interrupt; + u32 secure_pl1_flags; + u32 non_secure_pl1_interrupt; + u32 non_secure_pl1_flags; + u32 virtual_timer_interrupt; + u32 virtual_timer_flags; + u32 non_secure_pl2_interrupt; + u32 non_secure_pl2_flags; +}; + +/* Values for Flags field above */ + +#define ACPI_GTDT_MAPPED_BLOCK_PRESENT 1 + +/* Values for all "TimerFlags" fields above */ + +#define ACPI_GTDT_INTERRUPT_MODE 1 +#define ACPI_GTDT_INTERRUPT_POLARITY 2 + +/*************************************************************************= ****** + * + * MPST - Memory Power State Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +#define ACPI_MPST_CHANNEL_INFO \ + u16 reserved1; \ + u8 channel_id; \ + u8 reserved2; \ + u16 power_node_count; + +/* Main table */ + +struct acpi_table_mpst { + struct acpi_table_header header; /* Common ACPI table = header */ + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Platform Communication Channel Info */ + +struct acpi_mpst_channel { + ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */ +}; + +/* Memory Power Node Structure */ + +struct acpi_mpst_power_node { + u8 flags; + u8 reserved1; + u16 node_id; + u32 length; + u64 range_address; + u64 range_length; + u8 num_power_states; + u8 num_physical_components; + u16 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_ENABLED 1 +#define ACPI_MPST_POWER_MANAGED 2 +#define ACPI_MPST_HOT_PLUG_CAPABLE 4 + +/* Memory Power State Structure (follows POWER_NODE above) */ + +struct acpi_mpst_power_state { + u8 power_state; + u8 info_index; +}; + +/* Physical Component ID Structure (follows POWER_STATE above) */ + +struct acpi_mpst_component { + u16 component_id; +}; + +/* Memory Power State Characteristics Structure (follows all POWER_NODEs) = */ + +struct acpi_mpst_data_hdr { + u16 characteristics_count; +}; + +struct acpi_mpst_power_data { + u8 revision; + u8 flags; + u16 reserved1; + u32 average_power; + u32 power_saving; + u64 exit_latency; + u64 reserved2; +}; + +/* Values for Flags field above */ + +#define ACPI_MPST_PRESERVE 1 +#define ACPI_MPST_AUTOENTRY 2 +#define ACPI_MPST_AUTOEXIT 4 + +/* Shared Memory Region (not part of an ACPI table) */ + +struct acpi_mpst_shared { + u32 signature; + u16 pcc_command; + u16 pcc_status; + u16 command_register; + u16 status_register; + u16 power_state_id; + u16 power_node_id; + u64 energy_consumed; + u64 average_power; +}; + +/*************************************************************************= ****** + * + * PCCT - Platform Communications Channel Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pcct { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 flags; + u32 latency; + u32 reserved; +}; + +/* Values for Flags field above */ + +#define ACPI_PCCT_DOORBELL 1 + +/* + * PCCT subtables + */ + +/* 0: Generic Communications Subspace */ + +struct acpi_pcct_subspace { + struct acpi_subtable_header header; + u8 reserved[6]; + u64 base_address; + u64 length; + struct acpi_generic_address doorbell_register; + u64 preserve_mask; + u64 write_mask; +}; + +/* + * PCC memory structures (not part of the ACPI table) + */ + +/* Shared Memory Region */ + +struct acpi_pcct_shared_memory { + u32 signature; + u16 command; + u16 status; +}; + +/*************************************************************************= ****** + * + * PMTT - Platform Memory Topology Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_pmtt { + struct acpi_table_header header; /* Common ACPI table = header */ + u32 reserved; +}; + +/* Common header for PMTT subtables that follow main table */ + +struct acpi_pmtt_header { + u8 type; + u8 reserved1; + u16 length; + u16 flags; + u16 reserved2; +}; + +/* Values for Type field above */ + +#define ACPI_PMTT_TYPE_SOCKET 0 +#define ACPI_PMTT_TYPE_CONTROLLER 1 +#define ACPI_PMTT_TYPE_DIMM 2 +#define ACPI_PMTT_TYPE_RESERVED 3 /* 0x03-0xFF are reserved = */ + +/* Values for Flags field above */ + +#define ACPI_PMTT_TOP_LEVEL 0x0001 +#define ACPI_PMTT_PHYSICAL 0x0002 +#define ACPI_PMTT_MEMORY_TYPE 0x000C + +/* + * PMTT subtables, correspond to Type in struct acpi_pmtt_header + */ + +/* 0: Socket Structure */ + +struct acpi_pmtt_socket { + struct acpi_pmtt_header header; + u16 socket_id; + u16 reserved; +}; + +/* 1: Memory Controller subtable */ + +struct acpi_pmtt_controller { + struct acpi_pmtt_header header; + u32 read_latency; + u32 write_latency; + u32 read_bandwidth; + u32 write_bandwidth; + u16 access_width; + u16 alignment; + u16 reserved; + u16 domain_count; +}; + +/* 1a: Proximity Domain substructure */ + +struct acpi_pmtt_domain { + u32 proximity_domain; +}; + +/* 2: Physical Component Identifier (DIMM) */ + +struct acpi_pmtt_physical_component { + struct acpi_pmtt_header header; + u16 component_id; + u16 reserved; + u32 memory_size; + u32 bios_handle; +}; + +/*************************************************************************= ****** + * + * RASF - RAS Feature Table (ACPI 5.0) + * Version 1 + * + *************************************************************************= *****/ + +struct acpi_table_rasf { + struct acpi_table_header header; /* Common ACPI table = header */ + u8 channel_id[12]; +}; + +/* RASF Platform Communication Channel Shared Memory Region */ + +struct acpi_rasf_shared_memory { + u32 signature; + u16 command; + u16 status; + u64 requested_address; + u64 requested_length; + u64 actual_address; + u64 actual_length; + u16 flags; + u8 speed; +}; + +/* Masks for Flags and Speed fields above */ + +#define ACPI_RASF_SCRUBBER_RUNNING 1 +#define ACPI_RASF_SPEED (7<<1) + +/* Channel Commands */ + +enum acpi_rasf_commands { + ACPI_RASF_GET_RAS_CAPABILITIES =3D 1, + ACPI_RASF_GET_PATROL_PARAMETERS =3D 2, + ACPI_RASF_START_PATROL_SCRUBBER =3D 3, + ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4 +}; + +/* Channel Command flags */ + +#define ACPI_RASF_GENERATE_SCI (1<<15) + +/* Status values */ + +enum acpi_rasf_status { + ACPI_RASF_SUCCESS =3D 0, + ACPI_RASF_NOT_VALID =3D 1, + ACPI_RASF_NOT_SUPPORTED =3D 2, + ACPI_RASF_BUSY =3D 3, + ACPI_RASF_FAILED =3D 4, + ACPI_RASF_ABORTED =3D 5, + ACPI_RASF_INVALID_DATA =3D 6 +}; + +/* Status flags */ + +#define ACPI_RASF_COMMAND_COMPLETE (1) +#define ACPI_RASF_SCI_DOORBELL (1<<1) +#define ACPI_RASF_ERROR (1<<2) +#define ACPI_RASF_STATUS (0x1F<<3) + +/* Reset to default packing */ + +#pragma pack() + +#endif /* __ACTBL3_H__ */ --=__PartF6C731DA.0__= Content-Type: text/plain; name="ACPI-BGRT-invalidate.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ACPI-BGRT-invalidate.patch" x86/ACPI: invalidate BGRT if necessary=0A=0ASince the image pointed to may = live in boot services memory (which we=0Aadd to the global memory pool = long before ACPI tables get looked at),=0Awe should prevent Dom0 from = trying to retrieve the image data in that=0Acase.=0A=0AThe alternatives = would be to=0A- not add boot services memory to the global pool at all, = or=0A- defer adding boot services memory until Dom0 indicates it is safe = to=0A do so, or=0A- find and parse the BGRT table in xen/arch/x86/efi/boot= .c, and avoid=0A adding that specific region to the E820 table.=0ANone of = these are really attractive, and as Xen commonly prints to the=0Avideo = console anyway (without trying to avoid any regions on the=0Ascreen), the = invalidation would need to be done conditionally anyway.=0A=0A(xen/include/= acpi/actbl3.h is a verbatim copy from Linux 3.7-rc4)=0A=0ASigned-off-by: = Jan Beulich =0A---=0Av2: Only invalidate if the image = lives in RAM, and do the invalidation=0A by clearing both the valid bit = and the image address.=0A=0A--- a/xen/arch/x86/acpi/boot.c=0A+++ b/xen/arch= /x86/acpi/boot.c=0A@@ -28,6 +28,7 @@=0A #include =0A #include = =0A #include =0A+#include =0A #include = =0A #include =0A #include =0A@@ = -286,6 +287,27 @@ static int __init acpi_parse_hpet(struct=0A #define = acpi_parse_hpet NULL=0A #endif=0A =0A+static int __init acpi_invalidate_bgr= t(struct acpi_table_header *table)=0A+{=0A+ struct acpi_table_bgrt = *bgrt_tbl =3D=0A+ container_of(table, struct acpi_table_bgrt,= header);=0A+=0A+ if (table->length < sizeof(*bgrt_tbl))=0A+ = return -1;=0A+=0A+ if (bgrt_tbl->version =3D=3D 1 && bgrt_tbl->image_a= ddress=0A+ && !page_is_ram_type(PFN_DOWN(bgrt_tbl->image_address),= =0A+ RAM_TYPE_CONVENTIONAL))=0A+ = return 0;=0A+=0A+ printk(KERN_INFO PREFIX "BGRT: invalidating v%d = image at %#"PRIx64"\n",=0A+ bgrt_tbl->version, bgrt_tbl->image_a= ddress);=0A+ bgrt_tbl->image_address =3D 0;=0A+ bgrt_tbl->status = &=3D ~1;=0A+=0A+ return 0;=0A+}=0A+=0A #ifdef CONFIG_ACPI_SLEEP=0A = #define acpi_fadt_copy_address(dst, src, len) do { = \=0A if (fadt->header.revision >=3D FADT2_REVISION_ID) = \=0A@@ -653,5 +675,7 @@ int __init acpi_boot_init(void)=0A =0A erst_init()= ;=0A =0A+ acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt);=0A+= =0A return 0;=0A }=0A--- a/xen/include/acpi/actbl.h=0A+++ b/xen/include= /acpi/actbl.h=0A@@ -314,6 +314,7 @@ enum acpi_prefered_pm_profiles {=0A = =0A #include =0A #include =0A+#include = =0A =0A /*=0A * Sizes of the various flavors of FADT. We = need to look closely=0A--- /dev/null=0A+++ b/xen/include/acpi/actbl3.h=0A@@= -0,0 +1,557 @@=0A+/*******************************************************= ***********************=0A+ *=0A+ * Name: actbl3.h - ACPI Table Definitions= =0A+ *=0A+ ****************************************************************= *************/=0A+=0A+/*=0A+ * Copyright (C) 2000 - 2012, Intel Corp.=0A+ = * All rights reserved.=0A+ *=0A+ * Redistribution and use in source and = binary forms, with or without=0A+ * modification, are permitted provided = that the following conditions=0A+ * are met:=0A+ * 1. Redistributions of = source code must retain the above copyright=0A+ * notice, this list of = conditions, and the following disclaimer,=0A+ * without modification.=0A= + * 2. Redistributions in binary form must reproduce at minimum a = disclaimer=0A+ * substantially similar to the "NO WARRANTY" disclaimer = below=0A+ * ("Disclaimer") and any redistribution must be conditioned = upon=0A+ * including a substantially similar Disclaimer requirement for = further=0A+ * binary redistribution.=0A+ * 3. Neither the names of the = above-listed copyright holders nor the names=0A+ * of any contributors = may be used to endorse or promote products derived=0A+ * from this = software without specific prior written permission.=0A+ *=0A+ * Alternative= ly, this software may be distributed under the terms of the=0A+ * GNU = General Public License ("GPL") version 2 as published by the Free=0A+ * = Software Foundation.=0A+ *=0A+ * NO WARRANTY=0A+ * THIS SOFTWARE IS = PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS=0A+ * "AS IS" AND ANY = EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT=0A+ * LIMITED TO, THE = IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR=0A+ * A PARTICULAR = PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT=0A+ * HOLDERS OR = CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL=0A+ * = DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS=0A+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION)=0A+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER = IN CONTRACT,=0A+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR = OTHERWISE) ARISING=0A+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN = IF ADVISED OF THE=0A+ * POSSIBILITY OF SUCH DAMAGES.=0A+ */=0A+=0A+#ifndef = __ACTBL3_H__=0A+#define __ACTBL3_H__=0A+=0A+/******************************= *************************************************=0A+ *=0A+ * Additional = ACPI Tables (3)=0A+ *=0A+ * These tables are not consumed directly by the = ACPICA subsystem, but are=0A+ * included here to support device drivers = and the AML disassembler.=0A+ *=0A+ * The tables in this file are fully = defined within the ACPI specification.=0A+ *=0A+ **************************= ****************************************************/=0A+=0A+/*=0A+ * = Values for description table header signatures for tables defined in = this=0A+ * file. Useful because they make it more difficult to inadvertentl= y type in=0A+ * the wrong signature.=0A+ */=0A+#define ACPI_SIG_BGRT = "BGRT" /* Boot Graphics Resource Table */=0A+#define ACPI_SIG_DRTM= "DRTM" /* Dynamic Root of Trust for Measurement table = */=0A+#define ACPI_SIG_FPDT "FPDT" /* Firmware Performance = Data Table */=0A+#define ACPI_SIG_GTDT "GTDT" /* Generic Timer = Description Table */=0A+#define ACPI_SIG_MPST "MPST" /* Memory = Power State Table */=0A+#define ACPI_SIG_PCCT "PCCT" /* = Platform Communications Channel Table */=0A+#define ACPI_SIG_PMTT = "PMTT" /* Platform Memory Topology Table */=0A+#define ACPI_SIG_RASF = "RASF" /* RAS Feature table */=0A+=0A+#define ACPI_SIG_S3PT = "S3PT" /* S3 Performance (sub)Table */=0A+#define ACPI_SIG_PCCS = "PCC" /* PCC Shared Memory Region */=0A+=0A+/* Reserved table = signatures */=0A+=0A+#define ACPI_SIG_CSRT "CSRT" /* Core = System Resources Table */=0A+#define ACPI_SIG_MATR "MATR" /* = Memory Address Translation Table */=0A+#define ACPI_SIG_MSDM = "MSDM" /* Microsoft Data Management Table */=0A+#define ACPI_SIG_WPBT = "WPBT" /* Windows Platform Binary Table */=0A+=0A+/*=0A+ * All = tables must be byte-packed to match the ACPI specification, since=0A+ * = the tables are provided by the system BIOS.=0A+ */=0A+#pragma pack(1)=0A+= =0A+/*=0A+ * Note: C bitfields are not used for this reason:=0A+ *=0A+ * = "Bitfields are great and easy to read, but unfortunately the C language=0A+= * does not specify the layout of bitfields in memory, which means they = are=0A+ * essentially useless for dealing with packed data in on-disk = formats or=0A+ * binary wire protocols." (Or ACPI tables and buffers.) "If = you ask me,=0A+ * this decision was a design error in C. Ritchie could = have picked an order=0A+ * and stuck with it." Norman Ramsey.=0A+ * See = http://stackoverflow.com/a/1053662/41661=0A+ */=0A+=0A+/*******************= ************************************************************=0A+ *=0A+ * = BGRT - Boot Graphics Resource Table (ACPI 5.0)=0A+ * Version 1=0A+ = *=0A+ *********************************************************************= *********/=0A+=0A+struct acpi_table_bgrt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u16 version;=0A+ u8 = status;=0A+ u8 image_type;=0A+ u64 image_address;=0A+ u32 = image_offset_x;=0A+ u32 image_offset_y;=0A+};=0A+=0A+/*****************= **************************************************************=0A+ *=0A+ * = DRTM - Dynamic Root of Trust for Measurement table=0A+ *=0A+ **************= ****************************************************************/=0A+=0A+st= ruct acpi_table_drtm {=0A+ struct acpi_table_header header; /* = Common ACPI table header */=0A+ u64 entry_base_address;=0A+ u64 = entry_length;=0A+ u32 entry_address32;=0A+ u64 entry_address64= ;=0A+ u64 exit_address;=0A+ u64 log_area_address;=0A+ u32 = log_area_length;=0A+ u64 arch_dependent_address;=0A+ u32 flags;=0A+};=0A= +=0A+/* 1) Validated Tables List */=0A+=0A+struct acpi_drtm_vtl_list {=0A+ = u32 validated_table_list_count;=0A+};=0A+=0A+/* 2) Resources List = */=0A+=0A+struct acpi_drtm_resource_list {=0A+ u32 resource_list_count;=0A= +};=0A+=0A+/* 3) Platform-specific Identifiers List */=0A+=0A+struct = acpi_drtm_id_list {=0A+ u32 id_list_count;=0A+};=0A+=0A+/******************= *************************************************************=0A+ *=0A+ * = FPDT - Firmware Performance Data Table (ACPI 5.0)=0A+ * Version = 1=0A+ *=0A+ ***************************************************************= ***************/=0A+=0A+struct acpi_table_fpdt {=0A+ struct acpi_table_h= eader header; /* Common ACPI table header */=0A+};=0A+=0A+/* FPDT = subtable header */=0A+=0A+struct acpi_fpdt_header {=0A+ u16 type;=0A+ u8 = length;=0A+ u8 revision;=0A+};=0A+=0A+/* Values for Type field above = */=0A+=0A+enum acpi_fpdt_type {=0A+ ACPI_FPDT_TYPE_BOOT =3D 0,=0A+ = ACPI_FPDT_TYPE_S3PERF =3D 1,=0A+};=0A+=0A+/*=0A+ * FPDT subtables=0A+ = */=0A+=0A+/* 0: Firmware Basic Boot Performance Record */=0A+=0A+struct = acpi_fpdt_boot {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 reset_end;=0A+ u64 load_start;=0A+ = u64 startup_start;=0A+ u64 exit_services_entry;=0A+ u64 exit_services_e= xit;=0A+};=0A+=0A+/* 1: S3 Performance Table Pointer Record */=0A+=0A+struc= t acpi_fpdt_s3pt_ptr {=0A+ struct acpi_fpdt_header header;=0A+ u8 = reserved[4];=0A+ u64 address;=0A+};=0A+=0A+/*=0A+ * S3PT - S3 = Performance Table. This table is pointed to by the=0A+ * FPDT S3 Pointer = Record above.=0A+ */=0A+struct acpi_table_s3pt {=0A+ u8 signature[4]; = /* "S3PT" */=0A+ u32 length;=0A+};=0A+=0A+/*=0A+ * S3PT Subtables=0A= + */=0A+struct acpi_s3pt_header {=0A+ u16 type;=0A+ u8 length;=0A+ u8 = revision;=0A+};=0A+=0A+/* Values for Type field above */=0A+=0A+enum = acpi_s3pt_type {=0A+ ACPI_S3PT_TYPE_RESUME =3D 0,=0A+ ACPI_S3PT_T= YPE_SUSPEND =3D 1,=0A+};=0A+=0A+struct acpi_s3pt_resume {=0A+ struct = acpi_s3pt_header header;=0A+ u32 resume_count;=0A+ u64 full_resume;=0A= + u64 average_resume;=0A+};=0A+=0A+struct acpi_s3pt_suspend {=0A+ = struct acpi_s3pt_header header;=0A+ u64 suspend_start;=0A+ u64 = suspend_end;=0A+};=0A+=0A+/************************************************= *******************************=0A+ *=0A+ * GTDT - Generic Timer Descriptio= n Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ ***********************= *******************************************************/=0A+=0A+struct = acpi_table_gtdt {=0A+ struct acpi_table_header header; /* Common = ACPI table header */=0A+ u64 address;=0A+ u32 flags;=0A+ = u32 secure_pl1_interrupt;=0A+ u32 secure_pl1_flags;=0A+ u32 = non_secure_pl1_interrupt;=0A+ u32 non_secure_pl1_flags;=0A+ u32 = virtual_timer_interrupt;=0A+ u32 virtual_timer_flags;=0A+ u32 = non_secure_pl2_interrupt;=0A+ u32 non_secure_pl2_flags;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_GTDT_MAPPED_BLOCK_PRESE= NT 1=0A+=0A+/* Values for all "TimerFlags" fields above */=0A+=0A+#def= ine ACPI_GTDT_INTERRUPT_MODE 1=0A+#define ACPI_GTDT_INTERRUPT_PO= LARITY 2=0A+=0A+/***************************************************= ****************************=0A+ *=0A+ * MPST - Memory Power State Table = (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ *******************************= ***********************************************/=0A+=0A+#define ACPI_MPST_C= HANNEL_INFO \=0A+ u16 reserved1; \=0A+ = u8 channel_id; \=0A+ u8 = reserved2; \=0A+ u16 power_node_= count;=0A+=0A+/* Main table */=0A+=0A+struct acpi_table_mpst {=0A+ = struct acpi_table_header header; /* Common ACPI table header */=0A+ = ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel */=0A+};=0A+=0A+/= * Memory Platform Communication Channel Info */=0A+=0A+struct acpi_mpst_cha= nnel {=0A+ ACPI_MPST_CHANNEL_INFO /* Platform Communication Channel = */=0A+};=0A+=0A+/* Memory Power Node Structure */=0A+=0A+struct acpi_mpst_p= ower_node {=0A+ u8 flags;=0A+ u8 reserved1;=0A+ u16 node_id;=0A+ = u32 length;=0A+ u64 range_address;=0A+ u64 range_length;=0A+ u8 = num_power_states;=0A+ u8 num_physical_components;=0A+ u16 reserved2;=0A+}= ;=0A+=0A+/* Values for Flags field above */=0A+=0A+#define ACPI_MPST_ENABLE= D 1=0A+#define ACPI_MPST_POWER_MANAGED 2=0A+#define = ACPI_MPST_HOT_PLUG_CAPABLE 4=0A+=0A+/* Memory Power State Structure = (follows POWER_NODE above) */=0A+=0A+struct acpi_mpst_power_state {=0A+ u8 = power_state;=0A+ u8 info_index;=0A+};=0A+=0A+/* Physical Component = ID Structure (follows POWER_STATE above) */=0A+=0A+struct acpi_mpst_compone= nt {=0A+ u16 component_id;=0A+};=0A+=0A+/* Memory Power State = Characteristics Structure (follows all POWER_NODEs) */=0A+=0A+struct = acpi_mpst_data_hdr {=0A+ u16 characteristics_count;=0A+};=0A+=0A+str= uct acpi_mpst_power_data {=0A+ u8 revision;=0A+ u8 flags;=0A+ = u16 reserved1;=0A+ u32 average_power;=0A+ u32 power_saving;=0A+ = u64 exit_latency;=0A+ u64 reserved2;=0A+};=0A+=0A+/* Values for Flags = field above */=0A+=0A+#define ACPI_MPST_PRESERVE 1=0A+#define = ACPI_MPST_AUTOENTRY 2=0A+#define ACPI_MPST_AUTOEXIT = 4=0A+=0A+/* Shared Memory Region (not part of an ACPI table) */=0A+=0A+st= ruct acpi_mpst_shared {=0A+ u32 signature;=0A+ u16 pcc_command;=0A= + u16 pcc_status;=0A+ u16 command_register;=0A+ u16 = status_register;=0A+ u16 power_state_id;=0A+ u16 power_node_id;=0A+ = u64 energy_consumed;=0A+ u64 average_power;=0A+};=0A+=0A+/**********= *********************************************************************=0A+ = *=0A+ * PCCT - Platform Communications Channel Table (ACPI 5.0)=0A+ * = Version 1=0A+ *=0A+ *****************************************************= *************************/=0A+=0A+struct acpi_table_pcct {=0A+ struct = acpi_table_header header; /* Common ACPI table header */=0A+ = u32 flags;=0A+ u32 latency;=0A+ u32 reserved;=0A+};=0A+=0A+/* = Values for Flags field above */=0A+=0A+#define ACPI_PCCT_DOORBELL = 1=0A+=0A+/*=0A+ * PCCT subtables=0A+ */=0A+=0A+/* 0: Generic Communicat= ions Subspace */=0A+=0A+struct acpi_pcct_subspace {=0A+ struct acpi_subtabl= e_header header;=0A+ u8 reserved[6];=0A+ u64 base_address;=0A+ = u64 length;=0A+ struct acpi_generic_address doorbell_register;=0A+ = u64 preserve_mask;=0A+ u64 write_mask;=0A+};=0A+=0A+/*=0A+ * PCC memory = structures (not part of the ACPI table)=0A+ */=0A+=0A+/* Shared Memory = Region */=0A+=0A+struct acpi_pcct_shared_memory {=0A+ u32 signature;=0A+ = u16 command;=0A+ u16 status;=0A+};=0A+=0A+/*************************= ******************************************************=0A+ *=0A+ * PMTT - = Platform Memory Topology Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_pmtt {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u32 reserved;=0A+};=0A+=0A+= /* Common header for PMTT subtables that follow main table */=0A+=0A+struct= acpi_pmtt_header {=0A+ u8 type;=0A+ u8 reserved1;=0A+ u16 = length;=0A+ u16 flags;=0A+ u16 reserved2;=0A+};=0A+=0A+/* Values for = Type field above */=0A+=0A+#define ACPI_PMTT_TYPE_SOCKET = 0=0A+#define ACPI_PMTT_TYPE_CONTROLLER 1=0A+#define ACPI_PMTT_TYPE_DI= MM 2=0A+#define ACPI_PMTT_TYPE_RESERVED 3 /* = 0x03-0xFF are reserved */=0A+=0A+/* Values for Flags field above */=0A+=0A+= #define ACPI_PMTT_TOP_LEVEL 0x0001=0A+#define ACPI_PMTT_PHYSICA= L 0x0002=0A+#define ACPI_PMTT_MEMORY_TYPE 0x000C=0A+= =0A+/*=0A+ * PMTT subtables, correspond to Type in struct acpi_pmtt_header= =0A+ */=0A+=0A+/* 0: Socket Structure */=0A+=0A+struct acpi_pmtt_socket = {=0A+ struct acpi_pmtt_header header;=0A+ u16 socket_id;=0A+ = u16 reserved;=0A+};=0A+=0A+/* 1: Memory Controller subtable */=0A+=0A+struc= t acpi_pmtt_controller {=0A+ struct acpi_pmtt_header header;=0A+ = u32 read_latency;=0A+ u32 write_latency;=0A+ u32 read_bandwidth;=0A+ = u32 write_bandwidth;=0A+ u16 access_width;=0A+ u16 alignment;=0A+ = u16 reserved;=0A+ u16 domain_count;=0A+};=0A+=0A+/* 1a: Proximity = Domain substructure */=0A+=0A+struct acpi_pmtt_domain {=0A+ u32 = proximity_domain;=0A+};=0A+=0A+/* 2: Physical Component Identifier (DIMM) = */=0A+=0A+struct acpi_pmtt_physical_component {=0A+ struct acpi_pmtt_he= ader header;=0A+ u16 component_id;=0A+ u16 reserved;=0A+ = u32 memory_size;=0A+ u32 bios_handle;=0A+};=0A+=0A+/********************= ***********************************************************=0A+ *=0A+ * = RASF - RAS Feature Table (ACPI 5.0)=0A+ * Version 1=0A+ *=0A+ = ***************************************************************************= ***/=0A+=0A+struct acpi_table_rasf {=0A+ struct acpi_table_header = header; /* Common ACPI table header */=0A+ u8 channel_id[12];=0A+};=0A= +=0A+/* RASF Platform Communication Channel Shared Memory Region */=0A+=0A+= struct acpi_rasf_shared_memory {=0A+ u32 signature;=0A+ u16 = command;=0A+ u16 status;=0A+ u64 requested_address;=0A+ u64 = requested_length;=0A+ u64 actual_address;=0A+ u64 actual_length;=0A+ = u16 flags;=0A+ u8 speed;=0A+};=0A+=0A+/* Masks for Flags and Speed fields = above */=0A+=0A+#define ACPI_RASF_SCRUBBER_RUNNING 1=0A+#define = ACPI_RASF_SPEED (7<<1)=0A+=0A+/* Channel Commands = */=0A+=0A+enum acpi_rasf_commands {=0A+ ACPI_RASF_GET_RAS_CAPABILITIES =3D = 1,=0A+ ACPI_RASF_GET_PATROL_PARAMETERS =3D 2,=0A+ ACPI_RASF_START_PAT= ROL_SCRUBBER =3D 3,=0A+ ACPI_RASF_STOP_PATROL_SCRUBBER =3D 4=0A+};=0A+=0A+/= * Channel Command flags */=0A+=0A+#define ACPI_RASF_GENERATE_SCI = (1<<15)=0A+=0A+/* Status values */=0A+=0A+enum acpi_rasf_status {=0A+ = ACPI_RASF_SUCCESS =3D 0,=0A+ ACPI_RASF_NOT_VALID =3D 1,=0A+ ACPI_RASF_N= OT_SUPPORTED =3D 2,=0A+ ACPI_RASF_BUSY =3D 3,=0A+ ACPI_RASF_FAILED = =3D 4,=0A+ ACPI_RASF_ABORTED =3D 5,=0A+ ACPI_RASF_INVALID_DATA =3D = 6=0A+};=0A+=0A+/* Status flags */=0A+=0A+#define ACPI_RASF_COMMAND_COMPLETE= (1)=0A+#define ACPI_RASF_SCI_DOORBELL (1<<1)=0A+#define = ACPI_RASF_ERROR (1<<2)=0A+#define ACPI_RASF_STATUS = (0x1F<<3)=0A+=0A+/* Reset to default packing */=0A+=0A+#pragma = pack()=0A+=0A+#endif /* __ACTBL3_H__ */=0A --=__PartF6C731DA.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartF6C731DA.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 07 16:53:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:53:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8s7-0006bn-MT; Wed, 07 Nov 2012 16:52:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8s6-0006bi-LO for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:52:58 +0000 Received: from [85.158.137.99:55510] by server-6.bemta-3.messagelabs.com id D2/DD-28265-8E19A905; Wed, 07 Nov 2012 16:52:56 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352307175!17278506!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5NjA5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22372 invoked from network); 7 Nov 2012 16:52:56 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-11.tower-217.messagelabs.com with SMTP; 7 Nov 2012 16:52:56 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 07 Nov 2012 08:52:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="216385186" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 08:52:52 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 08:52:52 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 00:52:50 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvQFcTi91BiFLfUibRvXA4zlK85felYuw Date: Wed, 7 Nov 2012 16:52:50 +0000 Message-ID: References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> <20121107160301.GF18615@phenom.dumpdata.com> In-Reply-To: <20121107160301.GF18615@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Konrad Rzeszutek Wilk wrote: > On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: >>>>> >>>>> If it is generic ACPI code, than it can depend only on ACPI. >>>>> If it is ACPI code that contains X86 specific info, than it needs >>>>> to depend on X86 too. >>>> >>>> No x86 specific so let's depend on ACPI. >>> >>> Huh? This feature is x86 specific isn't it? I mean it is in the ACPI >>> spec, but only x86 does it right? >> >> OK, updated w/ ACPI & X86 dependency, and per other comments. > > Ok. Could you send all the patchset in one go. I am bit lost of which > one to review as none of them seem to have the version information > [vX: Did this yyy] Not quite clear your meaning, do you mean not reply old email and start a new thread with title like [PATCH vX 1/2]: xen/acpi: ACPI PAD driver [PATCH vX 2/2]: ... ? > > right above your name or in the title: > [PATCH vX 1/2]: yyyy > > anyhow, some comments below. > OK. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 16:53:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 16:53:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8s7-0006bn-MT; Wed, 07 Nov 2012 16:52:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW8s6-0006bi-LO for xen-devel@lists.xen.org; Wed, 07 Nov 2012 16:52:58 +0000 Received: from [85.158.137.99:55510] by server-6.bemta-3.messagelabs.com id D2/DD-28265-8E19A905; Wed, 07 Nov 2012 16:52:56 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352307175!17278506!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzE5NjA5\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22372 invoked from network); 7 Nov 2012 16:52:56 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-11.tower-217.messagelabs.com with SMTP; 7 Nov 2012 16:52:56 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 07 Nov 2012 08:52:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,730,1344236400"; d="scan'208";a="216385186" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 08:52:52 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 08:52:52 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 00:52:50 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [Xen-devel] [PATCH 1/2] Xen acpi pad implement Thread-Index: AQHNvQFcTi91BiFLfUibRvXA4zlK85felYuw Date: Wed, 7 Nov 2012 16:52:50 +0000 Message-ID: References: <20121026201409.GF2708@phenom.dumpdata.com> <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> <20121107160301.GF18615@phenom.dumpdata.com> In-Reply-To: <20121107160301.GF18615@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Konrad Rzeszutek Wilk wrote: > On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: >>>>> >>>>> If it is generic ACPI code, than it can depend only on ACPI. >>>>> If it is ACPI code that contains X86 specific info, than it needs >>>>> to depend on X86 too. >>>> >>>> No x86 specific so let's depend on ACPI. >>> >>> Huh? This feature is x86 specific isn't it? I mean it is in the ACPI >>> spec, but only x86 does it right? >> >> OK, updated w/ ACPI & X86 dependency, and per other comments. > > Ok. Could you send all the patchset in one go. I am bit lost of which > one to review as none of them seem to have the version information > [vX: Did this yyy] Not quite clear your meaning, do you mean not reply old email and start a new thread with title like [PATCH vX 1/2]: xen/acpi: ACPI PAD driver [PATCH vX 2/2]: ... ? > > right above your name or in the title: > [PATCH vX 1/2]: yyyy > > anyhow, some comments below. > OK. Thanks, Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:03:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW91Z-0006qQ-SN; Wed, 07 Nov 2012 17:02:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW91Y-0006qL-Am for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 17:02:44 +0000 Received: from [85.158.138.51:31415] by server-11.bemta-3.messagelabs.com id A3/0E-19361-3349A905; Wed, 07 Nov 2012 17:02:43 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352307761!9388328!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26324 invoked from network); 7 Nov 2012 17:02:42 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:02:42 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="213764264" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 17:02:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 12:02:41 -0500 Received: from elijah.uk.xensource.com ([10.80.2.24] helo=[127.0.1.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW91U-0004bk-9r; Wed, 07 Nov 2012 17:02:40 +0000 MIME-Version: 1.0 X-Mercurial-Node: 71eeac989efca6a590051edc3dd132df1bd55f7b Message-ID: <71eeac989efca6a59005.1352307432@elijah> User-Agent: Mercurial-patchbomb/2.0.2 Date: Wed, 7 Nov 2012 16:57:12 +0000 From: George Dunlap To: xen-devel@lists.xensource.com Cc: george.dunlap@eu.citrix.com Subject: [Xen-devel] [PATCH] xenalyze: Make eip_list output more useful X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1352307402 0 # Node ID 71eeac989efca6a590051edc3dd132df1bd55f7b # Parent 2080678babbfd5234536af913a768a7f18cca690 xenalyze: Make eip_list output more useful 1. Count the total number of samples 2. If the samples don't have associated cycle data, print the percentage of samples of the total 3. Use 12 characters, so 64-bit addresses are aligned properly. Signed-off-by: George Dunlap diff --git a/xenalyze.c b/xenalyze.c --- a/xenalyze.c +++ b/xenalyze.c @@ -2962,6 +2962,7 @@ void update_eip(struct eip_list_struct * void dump_eip(struct eip_list_struct *head) { struct eip_list_struct *p; int i; + int total = 0; struct eip_list_struct **qsort_array; int N=0; @@ -2984,7 +2985,10 @@ void dump_eip(struct eip_list_struct *he } for(p=head; p; p=p->next) + { + total += p->summary.count; N++; + } if(!N) return; @@ -3003,11 +3007,25 @@ void dump_eip(struct eip_list_struct *he N=opt.summary_eip_limit; #endif + printf(" Total samples: %d\n", total); + for(i=0; isummary, " %8llx%-45s: ", - p->eip, - find_symbol(p->eip)); + if ( p->summary.cycles ) + PRINT_SUMMARY(p->summary, " %12llx%-45s: ", + p->eip, + find_symbol(p->eip)); + else + { + printf(" %12llx%-45s: ", + p->eip, + find_symbol(p->eip)); + printf(" %7d %5.2lf%%\n", + p->summary.count, + ((double)p->summary.count*100)/total); + } + + if(eip_list_type[p->type].dump) { eip_list_type[p->type].dump(p); } _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:03:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW91Z-0006qQ-SN; Wed, 07 Nov 2012 17:02:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW91Y-0006qL-Am for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 17:02:44 +0000 Received: from [85.158.138.51:31415] by server-11.bemta-3.messagelabs.com id A3/0E-19361-3349A905; Wed, 07 Nov 2012 17:02:43 +0000 X-Env-Sender: George.Dunlap@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352307761!9388328!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ3MzM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26324 invoked from network); 7 Nov 2012 17:02:42 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:02:42 -0000 X-IronPort-AV: E=Sophos;i="4.80,730,1344211200"; d="scan'208";a="213764264" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 17:02:41 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Wed, 7 Nov 2012 12:02:41 -0500 Received: from elijah.uk.xensource.com ([10.80.2.24] helo=[127.0.1.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TW91U-0004bk-9r; Wed, 07 Nov 2012 17:02:40 +0000 MIME-Version: 1.0 X-Mercurial-Node: 71eeac989efca6a590051edc3dd132df1bd55f7b Message-ID: <71eeac989efca6a59005.1352307432@elijah> User-Agent: Mercurial-patchbomb/2.0.2 Date: Wed, 7 Nov 2012 16:57:12 +0000 From: George Dunlap To: xen-devel@lists.xensource.com Cc: george.dunlap@eu.citrix.com Subject: [Xen-devel] [PATCH] xenalyze: Make eip_list output more useful X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org # HG changeset patch # User George Dunlap # Date 1352307402 0 # Node ID 71eeac989efca6a590051edc3dd132df1bd55f7b # Parent 2080678babbfd5234536af913a768a7f18cca690 xenalyze: Make eip_list output more useful 1. Count the total number of samples 2. If the samples don't have associated cycle data, print the percentage of samples of the total 3. Use 12 characters, so 64-bit addresses are aligned properly. Signed-off-by: George Dunlap diff --git a/xenalyze.c b/xenalyze.c --- a/xenalyze.c +++ b/xenalyze.c @@ -2962,6 +2962,7 @@ void update_eip(struct eip_list_struct * void dump_eip(struct eip_list_struct *head) { struct eip_list_struct *p; int i; + int total = 0; struct eip_list_struct **qsort_array; int N=0; @@ -2984,7 +2985,10 @@ void dump_eip(struct eip_list_struct *he } for(p=head; p; p=p->next) + { + total += p->summary.count; N++; + } if(!N) return; @@ -3003,11 +3007,25 @@ void dump_eip(struct eip_list_struct *he N=opt.summary_eip_limit; #endif + printf(" Total samples: %d\n", total); + for(i=0; isummary, " %8llx%-45s: ", - p->eip, - find_symbol(p->eip)); + if ( p->summary.cycles ) + PRINT_SUMMARY(p->summary, " %12llx%-45s: ", + p->eip, + find_symbol(p->eip)); + else + { + printf(" %12llx%-45s: ", + p->eip, + find_symbol(p->eip)); + printf(" %7d %5.2lf%%\n", + p->summary.count, + ((double)p->summary.count*100)/total); + } + + if(eip_list_type[p->type].dump) { eip_list_type[p->type].dump(p); } _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:07:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:07:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW967-0006yF-Ic; Wed, 07 Nov 2012 17:07:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW965-0006yA-Tk for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:07:26 +0000 Received: from [85.158.139.83:62608] by server-1.bemta-5.messagelabs.com id B6/CF-05877-C459A905; Wed, 07 Nov 2012 17:07:24 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352308044!28529338!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7393 invoked from network); 7 Nov 2012 17:07:24 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 7 Nov 2012 17:07:24 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 17:07:23 +0000 Message-Id: <509AA35B02000078000A7092@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 17:07:23 +0000 From: "Jan Beulich" To: ,"Keir Fraser" References: In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 11:10, wrote: > i compiled a patched hypervisor for Mauro, it is running since many days > and the overflow occured, > without clock jumps > >> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >> tsc_stamp=e3839fcb0273 i.e. we have (in order of time) plt_wrap=5ece12d09306 now=5ece12d16292 plt_now=5ece12d34128 which is exactly the inverse order of how things should be (now not necessarily being in the middle). Nor should plt_now and plt_wrap be that close together. So far I have no idea how this can be explained. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:07:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:07:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW967-0006yF-Ic; Wed, 07 Nov 2012 17:07:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW965-0006yA-Tk for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:07:26 +0000 Received: from [85.158.139.83:62608] by server-1.bemta-5.messagelabs.com id B6/CF-05877-C459A905; Wed, 07 Nov 2012 17:07:24 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352308044!28529338!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDQxODI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7393 invoked from network); 7 Nov 2012 17:07:24 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 7 Nov 2012 17:07:24 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 07 Nov 2012 17:07:23 +0000 Message-Id: <509AA35B02000078000A7092@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 07 Nov 2012 17:07:23 +0000 From: "Jan Beulich" To: ,"Keir Fraser" References: In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 11:10, wrote: > i compiled a patched hypervisor for Mauro, it is running since many days > and the overflow occured, > without clock jumps > >> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >> tsc_stamp=e3839fcb0273 i.e. we have (in order of time) plt_wrap=5ece12d09306 now=5ece12d16292 plt_now=5ece12d34128 which is exactly the inverse order of how things should be (now not necessarily being in the middle). Nor should plt_now and plt_wrap be that close together. So far I have no idea how this can be explained. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:11:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW99X-000772-6E; Wed, 07 Nov 2012 17:10:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW99V-00076x-QN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:10:58 +0000 Received: from [85.158.138.51:17961] by server-14.bemta-3.messagelabs.com id EF/6B-12788-0269A905; Wed, 07 Nov 2012 17:10:56 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352308256!20217765!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2006 invoked from network); 7 Nov 2012 17:10:56 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:10:56 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so1429831wib.14 for ; Wed, 07 Nov 2012 09:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=TZtqZFJQNA0iTLciQzg1whMDHu+neOqvbM00cVB03Hs=; b=p8RsIRdavUPbR7otqvEZW5T4DRG/ZsvAWO+6tgfUbWzGMYRpD/stkx48ZXrKyu6B6p 54/mBan5qKOGn/w+zlPgYDAUAzZLf6zN6UxgQtf3jMd9JGugQwGsPMV6T0ZFIPAn9fw8 cN+Bhx92pblowGzzjCKN9Tc9x7uCH88PQ3mr/nQjbTE5v9wHZmZAYFbTtZ2e/XBTREJM loDlM1xkU94PaMaQxfzyfVlnLD3ItFahDBZ2Aad63FBkljtHWeyeAip42MVS2nCLAhgW nCnIAzM2X0ceNZSADiKYl7XvjK9OmnChda1W3gGR1EdbSMBSw2vh2A+ONDTGo+05j2Cv PTsw== Received: by 10.180.100.101 with SMTP id ex5mr26080338wib.16.1352308256082; Wed, 07 Nov 2012 09:10:56 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ey2sm4388898wib.9.2012.11.07.09.10.46 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 09:10:55 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 07 Nov 2012 17:10:37 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29Cs4t6m1er+1jFkW1p63knl/Vqg== In-Reply-To: <509A958E02000078000A7039@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 16:08, "Jan Beulich" wrote: > This opcode neither support 1-byte operands, nor does it support 8-byte > ones (since the opcode is undefined in 64-bit mode). Simplify the code > accordingly. > > Signed-off-by: Jan Beulich > > --- a/xen/arch/x86/x86_emulate/x86_emulate.c > +++ b/xen/arch/x86/x86_emulate/x86_emulate.c > @@ -1996,13 +1996,10 @@ x86_emulate( > if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), > &dst.val, op_bytes, ctxt, ops)) != 0 ) > goto done; > - switch ( op_bytes ) > - { > - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; > - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; > - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ > - case 8: *regs[i] = dst.val; break; > - } > + if ( op_bytes != 2 ) > + *regs[i] = (uint32_t)dst.val; /* 64b: zero-ext */ > + else > + *(uint16_t *)regs[i] = (uint16_t)dst.val; Would prefer: if ( op_bytes == 2 ) *(uint16_t *)regs[i] = (uint16_t)dst.val; else *regs[i] = dst.val; Handles the exceptional case immediately after its predicate. And the cast from uint32_t, and 64b-related comment, are pointless and in fact misleading in the default case, since as you say the instruction is invalid in 64-bit mode. Apart from that: Acked-by: Keir Fraser -- Keir > } > break; > } > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:11:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW99X-000772-6E; Wed, 07 Nov 2012 17:10:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW99V-00076x-QN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:10:58 +0000 Received: from [85.158.138.51:17961] by server-14.bemta-3.messagelabs.com id EF/6B-12788-0269A905; Wed, 07 Nov 2012 17:10:56 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352308256!20217765!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2006 invoked from network); 7 Nov 2012 17:10:56 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:10:56 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so1429831wib.14 for ; Wed, 07 Nov 2012 09:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=TZtqZFJQNA0iTLciQzg1whMDHu+neOqvbM00cVB03Hs=; b=p8RsIRdavUPbR7otqvEZW5T4DRG/ZsvAWO+6tgfUbWzGMYRpD/stkx48ZXrKyu6B6p 54/mBan5qKOGn/w+zlPgYDAUAzZLf6zN6UxgQtf3jMd9JGugQwGsPMV6T0ZFIPAn9fw8 cN+Bhx92pblowGzzjCKN9Tc9x7uCH88PQ3mr/nQjbTE5v9wHZmZAYFbTtZ2e/XBTREJM loDlM1xkU94PaMaQxfzyfVlnLD3ItFahDBZ2Aad63FBkljtHWeyeAip42MVS2nCLAhgW nCnIAzM2X0ceNZSADiKYl7XvjK9OmnChda1W3gGR1EdbSMBSw2vh2A+ONDTGo+05j2Cv PTsw== Received: by 10.180.100.101 with SMTP id ex5mr26080338wib.16.1352308256082; Wed, 07 Nov 2012 09:10:56 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ey2sm4388898wib.9.2012.11.07.09.10.46 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 09:10:55 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 07 Nov 2012 17:10:37 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29Cs4t6m1er+1jFkW1p63knl/Vqg== In-Reply-To: <509A958E02000078000A7039@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 16:08, "Jan Beulich" wrote: > This opcode neither support 1-byte operands, nor does it support 8-byte > ones (since the opcode is undefined in 64-bit mode). Simplify the code > accordingly. > > Signed-off-by: Jan Beulich > > --- a/xen/arch/x86/x86_emulate/x86_emulate.c > +++ b/xen/arch/x86/x86_emulate/x86_emulate.c > @@ -1996,13 +1996,10 @@ x86_emulate( > if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), > &dst.val, op_bytes, ctxt, ops)) != 0 ) > goto done; > - switch ( op_bytes ) > - { > - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; > - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; > - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ > - case 8: *regs[i] = dst.val; break; > - } > + if ( op_bytes != 2 ) > + *regs[i] = (uint32_t)dst.val; /* 64b: zero-ext */ > + else > + *(uint16_t *)regs[i] = (uint16_t)dst.val; Would prefer: if ( op_bytes == 2 ) *(uint16_t *)regs[i] = (uint16_t)dst.val; else *regs[i] = dst.val; Handles the exceptional case immediately after its predicate. And the cast from uint32_t, and 64b-related comment, are pointless and in fact misleading in the default case, since as you say the instruction is invalid in 64-bit mode. Apart from that: Acked-by: Keir Fraser -- Keir > } > break; > } > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:41:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:41:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW9cH-0007Vj-0U; Wed, 07 Nov 2012 17:40:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW9cE-0007Ve-Uw for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:40:39 +0000 Received: from [193.109.254.147:54802] by server-9.bemta-14.messagelabs.com id 17/4F-30773-61D9A905; Wed, 07 Nov 2012 17:40:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352310036!7403570!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3863 invoked from network); 7 Nov 2012 17:40:37 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:40:37 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so261638wib.14 for ; Wed, 07 Nov 2012 09:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=UI5jfsVhK+goZ+Ms7PxzpGI8nZjrmYsxGng4mWz4B8I=; b=krAwbnativD+yTdmVQVIW8u61tKpzZLU0mlCT4DJMBo/rUGcI2cpTUE1pun0ImUI0b DMQkIsB4hKav7oDcSZg1EbgV7wwDUfp/v1tzsJ4qTNOumq4OC6dbS5s/0tEKp5xsVJlu w67H+LnbNNZ/PQI6+Qbdh5IXKz0kihS/JTz40ADKYtfZeq1ioheusZXa6nJkXOvLYaEN +HeRusf2kmVb7z36Fhd0h4T4/t8DLkFg3NWIGYXnBcI7G2BlU0JxyYmln1jr+x9vbBWG KvOl5SMJ6hGJlygNHJaPEcjtQ75eXV3VJfhBVrtCPvP9Er4LIoaef+aomr/9tQEEyfgE oROg== Received: by 10.180.19.71 with SMTP id c7mr26197082wie.2.1352310036646; Wed, 07 Nov 2012 09:40:36 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id f1sm4010652wiy.2.2012.11.07.09.40.34 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 09:40:35 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 07 Nov 2012 17:40:30 +0000 From: Keir Fraser To: Ian Campbell , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29DvrjqeBG3H6QAUStnBaJP3k+kw== In-Reply-To: <1352294551.12977.61.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 13:22, "Ian Campbell" wrote: >>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>> tsc_stamp=e3839fcb0273 >> >> (below is the complete xm dmesg output) >> >> did that help you ? do you need more info ? > > I'll leave this to Keir (who wrote the debugging patch) to answer but it > looks to me like it should be useful! I'm scratching my head. plt_wrap is earlier than plt_now, which should be impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That seems very very improbable! I wonder whether the overflow handling should just be removed, or made conditional on a command-line parameter, or on the 32-bit platform counter being at least somewhat likely to overflow before a softirq occurs -- it seems lots of systems are using 14MHz HPET, and that gives us a couple of minutes for the plt_overflow softirq to do its work before overflow occurs. I think we would notice that outage in other ways. :) -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 17:41:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 17:41:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW9cH-0007Vj-0U; Wed, 07 Nov 2012 17:40:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TW9cE-0007Ve-Uw for xen-devel@lists.xen.org; Wed, 07 Nov 2012 17:40:39 +0000 Received: from [193.109.254.147:54802] by server-9.bemta-14.messagelabs.com id 17/4F-30773-61D9A905; Wed, 07 Nov 2012 17:40:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352310036!7403570!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3863 invoked from network); 7 Nov 2012 17:40:37 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 17:40:37 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so261638wib.14 for ; Wed, 07 Nov 2012 09:40:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=UI5jfsVhK+goZ+Ms7PxzpGI8nZjrmYsxGng4mWz4B8I=; b=krAwbnativD+yTdmVQVIW8u61tKpzZLU0mlCT4DJMBo/rUGcI2cpTUE1pun0ImUI0b DMQkIsB4hKav7oDcSZg1EbgV7wwDUfp/v1tzsJ4qTNOumq4OC6dbS5s/0tEKp5xsVJlu w67H+LnbNNZ/PQI6+Qbdh5IXKz0kihS/JTz40ADKYtfZeq1ioheusZXa6nJkXOvLYaEN +HeRusf2kmVb7z36Fhd0h4T4/t8DLkFg3NWIGYXnBcI7G2BlU0JxyYmln1jr+x9vbBWG KvOl5SMJ6hGJlygNHJaPEcjtQ75eXV3VJfhBVrtCPvP9Er4LIoaef+aomr/9tQEEyfgE oROg== Received: by 10.180.19.71 with SMTP id c7mr26197082wie.2.1352310036646; Wed, 07 Nov 2012 09:40:36 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id f1sm4010652wiy.2.2012.11.07.09.40.34 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 09:40:35 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 07 Nov 2012 17:40:30 +0000 From: Keir Fraser To: Ian Campbell , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29DvrjqeBG3H6QAUStnBaJP3k+kw== In-Reply-To: <1352294551.12977.61.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 13:22, "Ian Campbell" wrote: >>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>> tsc_stamp=e3839fcb0273 >> >> (below is the complete xm dmesg output) >> >> did that help you ? do you need more info ? > > I'll leave this to Keir (who wrote the debugging patch) to answer but it > looks to me like it should be useful! I'm scratching my head. plt_wrap is earlier than plt_now, which should be impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That seems very very improbable! I wonder whether the overflow handling should just be removed, or made conditional on a command-line parameter, or on the 32-bit platform counter being at least somewhat likely to overflow before a softirq occurs -- it seems lots of systems are using 14MHz HPET, and that gives us a couple of minutes for the plt_overflow softirq to do its work before overflow occurs. I think we would notice that outage in other ways. :) -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 18:16:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 18:16:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWAA5-0007sZ-U8; Wed, 07 Nov 2012 18:15:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWAA3-0007sU-Pr for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 18:15:36 +0000 Received: from [85.158.139.83:54930] by server-10.bemta-5.messagelabs.com id 75/66-09257-645AA905; Wed, 07 Nov 2012 18:15:34 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-5.tower-182.messagelabs.com!1352312132!29267880!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7439 invoked from network); 7 Nov 2012 18:15:33 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-5.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 18:15:33 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156793615; Wed, 07 Nov 2012 13:14:25 -0500 Message-ID: <509AA501.1090701@jhuapl.edu> Date: Wed, 07 Nov 2012 13:14:25 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Kent Yoder References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> In-Reply-To: <20121107144625.GA14628@ennui.austin.ibm.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============2891601273189910868==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============2891601273189910868== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms080608050803030603010205" This is a cryptographically signed message in MIME format. --------------ms080608050803030603010205 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/07/2012 09:46 AM, Kent Yoder wrote: > Hi Matthew, > > On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. >> >> Signed-off-by: Matthew Fioravante >> --- >> drivers/char/tpm/Kconfig | 9 + >> drivers/char/tpm/Makefile | 2 + >> drivers/char/tpm/tpm.h | 15 + >> drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++= ++ >> drivers/char/tpm/tpm_vtpm.h | 55 +++ >> drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++= ++++++++++ >> include/xen/interface/io/tpmif.h | 77 +++++ >> 7 files changed, 1391 insertions(+) >> create mode 100644 drivers/char/tpm/tpm_vtpm.c >> create mode 100644 drivers/char/tpm/tpm_vtpm.h >> create mode 100644 drivers/char/tpm/tpm_xen.c >> create mode 100644 include/xen/interface/io/tpmif.h >> >> diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig >> index 915875e..08c1010 100644 >> --- a/drivers/char/tpm/Kconfig >> +++ b/drivers/char/tpm/Kconfig >> @@ -81,4 +81,13 @@ config TCG_IBMVTPM >> will be accessible from within Linux. To compile this driver >> as a module, choose M here; the module will be called tpm_ibmvtpm= =2E >> >> +config TCG_XEN >> + tristate "XEN TPM Interface" >> + depends on TCG_TPM && XEN >> + ---help--- >> + If you want to make TPM support available to a Xen user domain, >> + say Yes and it will be accessible from within Linux. >> + To compile this driver as a module, choose M here; the module >> + will be called tpm_xenu. >> + >> endif # TCG_TPM >> diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile >> index 5b3fc8b..16911c5 100644 >> --- a/drivers/char/tpm/Makefile >> +++ b/drivers/char/tpm/Makefile >> @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) +=3D tpm_nsc.o >> obj-$(CONFIG_TCG_ATMEL) +=3D tpm_atmel.o >> obj-$(CONFIG_TCG_INFINEON) +=3D tpm_infineon.o >> obj-$(CONFIG_TCG_IBMVTPM) +=3D tpm_ibmvtpm.o >> +obj-$(CONFIG_TCG_XEN) +=3D tpm_xenu.o >> +tpm_xenu-y =3D tpm_xen.o tpm_vtpm.o > Let's match the naming convention of the other drivers if we can, so = this > would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... Makes sense, fixed. > >> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h >> index 8ef7649..2e5a47a 100644 >> --- a/drivers/char/tpm/tpm.h >> +++ b/drivers/char/tpm/tpm.h >> @@ -130,6 +130,9 @@ struct tpm_chip { >> >> struct list_head list; >> void (*release) (struct device *); >> +#if CONFIG_XEN >> + void *priv; >> +#endif > Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm i= s > already using that as a priv pointer. I should probably change that nam= e > to make it more obvious what that's used for. That makes more sense. I'm guessing your data pointer didn't exist=20 during the 2.6.18 kernel which is why they added their own priv pointer. > >> }; >> >> #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) >> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >> >> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >> >> +#ifdef CONFIG_XEN >> +static inline void *chip_get_private(const struct tpm_chip *chip) >> +{ >> + return chip->priv; >> +} >> + >> +static inline void chip_set_private(struct tpm_chip *chip, void *priv= ) >> +{ >> + chip->priv =3D priv; >> +} >> +#endif > Can you put these in tpm_vtpm.c please? One less #define. :-) Agreed, I'd rather not have to modify your shared tpm.h interface at all.= > > [cut] >> +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ >> +#define __XEN_PUBLIC_IO_TPMIF_H__ >> + >> +#include "../grant_table.h" >> + >> +struct tpmif_tx_request { >> + unsigned long addr; /* Machine address of packet. */ >> + grant_ref_t ref; /* grant table access reference */ >> + uint16_t unused; >> + uint16_t size; /* Packet size in bytes. */ >> +}; >> +typedef struct tpmif_tx_request tpmif_tx_request_t; > checkpatch warned on this new typedef - please run through checkpatc= h > and fix up that stuff. tpmif.h has a couple of typedefs which do trigger checkpatch warnings.=20 However it looks like the paradigm for xen is to have these=20 interface/io/if.h files and all of them have typedefs. I think in=20 this case the typedef should probably stay. Konrad your thoughts here? > >> + >> +/* >> + * The TPMIF_TX_RING_SIZE defines the number of pages the >> + * front-end and backend can exchange (=3D size of array). >> + */ >> +typedef uint32_t TPMIF_RING_IDX; >> + >> +#define TPMIF_TX_RING_SIZE 1 >> + >> +/* This structure must fit in a memory page. */ >> + >> +struct tpmif_ring { >> + struct tpmif_tx_request req; >> +}; >> +typedef struct tpmif_ring tpmif_ring_t; >> + >> +struct tpmif_tx_interface { >> + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; >> +}; >> +typedef struct tpmif_tx_interface tpmif_tx_interface_t; >> + >> +#endif >> + >> +/* >> + * Local variables: >> + * mode: C >> + * c-set-style: "BSD" >> + * c-basic-offset: 4 >> + * tab-width: 4 >> + * indent-tabs-mode: nil >> + * End: >> + */ > Please take this comment out, see Documentation/CodingStyle. Fixed > > Thanks, > Kent > >> --=20 >> 1.7.10.4 >> >> --------------ms080608050803030603010205 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNzE4MTQyNVowIwYJKoZIhvcNAQkEMRYEFBwk6zhe4ThjAtby xJcPImgIpUAuMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYCV7QCgPV0a6wjPTkin2QRV0fkmRegK/e7z bG7NkhPNHIZy8Ev6rCNqrX3/Xamy2lJ2pssnjMa1+XPf9am1R9YdvDDbvp2Vkzd+rnosQirI w0lt1L3M1ZMsGQElentQKt9VDlXpBYy+bljrqxZmVlBMa/atysXrJBKJAjtlQbsd+wAAAAAA AA== --------------ms080608050803030603010205-- --===============2891601273189910868== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============2891601273189910868==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 18:16:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 18:16:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWAA5-0007sZ-U8; Wed, 07 Nov 2012 18:15:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWAA3-0007sU-Pr for xen-devel@lists.xensource.com; Wed, 07 Nov 2012 18:15:36 +0000 Received: from [85.158.139.83:54930] by server-10.bemta-5.messagelabs.com id 75/66-09257-645AA905; Wed, 07 Nov 2012 18:15:34 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-5.tower-182.messagelabs.com!1352312132!29267880!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7439 invoked from network); 7 Nov 2012 18:15:33 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-5.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 18:15:33 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156793615; Wed, 07 Nov 2012 13:14:25 -0500 Message-ID: <509AA501.1090701@jhuapl.edu> Date: Wed, 07 Nov 2012 13:14:25 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Kent Yoder References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> In-Reply-To: <20121107144625.GA14628@ennui.austin.ibm.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============2891601273189910868==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============2891601273189910868== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms080608050803030603010205" This is a cryptographically signed message in MIME format. --------------ms080608050803030603010205 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/07/2012 09:46 AM, Kent Yoder wrote: > Hi Matthew, > > On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. >> >> Signed-off-by: Matthew Fioravante >> --- >> drivers/char/tpm/Kconfig | 9 + >> drivers/char/tpm/Makefile | 2 + >> drivers/char/tpm/tpm.h | 15 + >> drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++= ++ >> drivers/char/tpm/tpm_vtpm.h | 55 +++ >> drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++= ++++++++++ >> include/xen/interface/io/tpmif.h | 77 +++++ >> 7 files changed, 1391 insertions(+) >> create mode 100644 drivers/char/tpm/tpm_vtpm.c >> create mode 100644 drivers/char/tpm/tpm_vtpm.h >> create mode 100644 drivers/char/tpm/tpm_xen.c >> create mode 100644 include/xen/interface/io/tpmif.h >> >> diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig >> index 915875e..08c1010 100644 >> --- a/drivers/char/tpm/Kconfig >> +++ b/drivers/char/tpm/Kconfig >> @@ -81,4 +81,13 @@ config TCG_IBMVTPM >> will be accessible from within Linux. To compile this driver >> as a module, choose M here; the module will be called tpm_ibmvtpm= =2E >> >> +config TCG_XEN >> + tristate "XEN TPM Interface" >> + depends on TCG_TPM && XEN >> + ---help--- >> + If you want to make TPM support available to a Xen user domain, >> + say Yes and it will be accessible from within Linux. >> + To compile this driver as a module, choose M here; the module >> + will be called tpm_xenu. >> + >> endif # TCG_TPM >> diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile >> index 5b3fc8b..16911c5 100644 >> --- a/drivers/char/tpm/Makefile >> +++ b/drivers/char/tpm/Makefile >> @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) +=3D tpm_nsc.o >> obj-$(CONFIG_TCG_ATMEL) +=3D tpm_atmel.o >> obj-$(CONFIG_TCG_INFINEON) +=3D tpm_infineon.o >> obj-$(CONFIG_TCG_IBMVTPM) +=3D tpm_ibmvtpm.o >> +obj-$(CONFIG_TCG_XEN) +=3D tpm_xenu.o >> +tpm_xenu-y =3D tpm_xen.o tpm_vtpm.o > Let's match the naming convention of the other drivers if we can, so = this > would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... Makes sense, fixed. > >> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h >> index 8ef7649..2e5a47a 100644 >> --- a/drivers/char/tpm/tpm.h >> +++ b/drivers/char/tpm/tpm.h >> @@ -130,6 +130,9 @@ struct tpm_chip { >> >> struct list_head list; >> void (*release) (struct device *); >> +#if CONFIG_XEN >> + void *priv; >> +#endif > Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm i= s > already using that as a priv pointer. I should probably change that nam= e > to make it more obvious what that's used for. That makes more sense. I'm guessing your data pointer didn't exist=20 during the 2.6.18 kernel which is why they added their own priv pointer. > >> }; >> >> #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) >> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >> >> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >> >> +#ifdef CONFIG_XEN >> +static inline void *chip_get_private(const struct tpm_chip *chip) >> +{ >> + return chip->priv; >> +} >> + >> +static inline void chip_set_private(struct tpm_chip *chip, void *priv= ) >> +{ >> + chip->priv =3D priv; >> +} >> +#endif > Can you put these in tpm_vtpm.c please? One less #define. :-) Agreed, I'd rather not have to modify your shared tpm.h interface at all.= > > [cut] >> +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ >> +#define __XEN_PUBLIC_IO_TPMIF_H__ >> + >> +#include "../grant_table.h" >> + >> +struct tpmif_tx_request { >> + unsigned long addr; /* Machine address of packet. */ >> + grant_ref_t ref; /* grant table access reference */ >> + uint16_t unused; >> + uint16_t size; /* Packet size in bytes. */ >> +}; >> +typedef struct tpmif_tx_request tpmif_tx_request_t; > checkpatch warned on this new typedef - please run through checkpatc= h > and fix up that stuff. tpmif.h has a couple of typedefs which do trigger checkpatch warnings.=20 However it looks like the paradigm for xen is to have these=20 interface/io/if.h files and all of them have typedefs. I think in=20 this case the typedef should probably stay. Konrad your thoughts here? > >> + >> +/* >> + * The TPMIF_TX_RING_SIZE defines the number of pages the >> + * front-end and backend can exchange (=3D size of array). >> + */ >> +typedef uint32_t TPMIF_RING_IDX; >> + >> +#define TPMIF_TX_RING_SIZE 1 >> + >> +/* This structure must fit in a memory page. */ >> + >> +struct tpmif_ring { >> + struct tpmif_tx_request req; >> +}; >> +typedef struct tpmif_ring tpmif_ring_t; >> + >> +struct tpmif_tx_interface { >> + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; >> +}; >> +typedef struct tpmif_tx_interface tpmif_tx_interface_t; >> + >> +#endif >> + >> +/* >> + * Local variables: >> + * mode: C >> + * c-set-style: "BSD" >> + * c-basic-offset: 4 >> + * tab-width: 4 >> + * indent-tabs-mode: nil >> + * End: >> + */ > Please take this comment out, see Documentation/CodingStyle. Fixed > > Thanks, > Kent > >> --=20 >> 1.7.10.4 >> >> --------------ms080608050803030603010205 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTEwNzE4MTQyNVowIwYJKoZIhvcNAQkEMRYEFBwk6zhe4ThjAtby xJcPImgIpUAuMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYCV7QCgPV0a6wjPTkin2QRV0fkmRegK/e7z bG7NkhPNHIZy8Ev6rCNqrX3/Xamy2lJ2pssnjMa1+XPf9am1R9YdvDDbvp2Vkzd+rnosQirI w0lt1L3M1ZMsGQElentQKt9VDlXpBYy+bljrqxZmVlBMa/atysXrJBKJAjtlQbsd+wAAAAAA AA== --------------ms080608050803030603010205-- --===============2891601273189910868== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============2891601273189910868==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 19:43:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 19:43:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWBWm-00004y-4Q; Wed, 07 Nov 2012 19:43:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWBWj-00004t-VM for xen-devel@lists.xen.org; Wed, 07 Nov 2012 19:43:06 +0000 Received: from [85.158.137.99:8226] by server-3.bemta-3.messagelabs.com id B7/9E-31566-9C9BA905; Wed, 07 Nov 2012 19:43:05 +0000 X-Env-Sender: ben.guthro@gmail.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352317383!18058905!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25296 invoked from network); 7 Nov 2012 19:43:04 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 19:43:04 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so906270wgb.32 for ; Wed, 07 Nov 2012 11:43:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=0NZjMx+SboPVcJdhM4Ub2mskmCSeTpBK4lJpxMVc12c=; b=Ti6FK0ml3JKWQbSt8YRUCiLkTo8rVuqSAvFIVC6QacY3iyoPSloBypfeXJ7qZ9fr2P 5gHf/rRLY3H/Sg+/quW5Y5WD0TRY3vC2K2DNkn5m2N/wJUNkBR4R+T07Ubh5NI8wdqBy hivzBiJFjEBJnFVOsCExeCANLOeqiWBToLpWZKZoO31DE7dkx54k1B7sNN9py5ffc1TJ sx4ZSRPXlSYEkc+81Gpt7tcDQHLllJ4iiKZNiZDa3fhDEH8JFvSEAeGmdnZukGmqImI/ wuKcxISEZgE/6hsME6mQjk5kKETZd7cFw6Tw3til7GquPNMGWleDeFQIZA4TaCEtpmiy zYJw== MIME-Version: 1.0 Received: by 10.180.86.69 with SMTP id n5mr9516129wiz.0.1352317383530; Wed, 07 Nov 2012 11:43:03 -0800 (PST) Received: by 10.216.97.199 with HTTP; Wed, 7 Nov 2012 11:43:03 -0800 (PST) In-Reply-To: References: Date: Wed, 7 Nov 2012 14:43:03 -0500 X-Google-Sender-Auth: bptl82YvALEl_m9_b7LurCBYm1A Message-ID: From: Ben Guthro To: xen-devel , intel-gfx@lists.freedesktop.org Cc: Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] S3 causing IRQ delivery mismatch - i915 hotplug storm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1727707612959540151==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============1727707612959540151== Content-Type: multipart/alternative; boundary=f46d04428d2244da0d04cdeced64 --f46d04428d2244da0d04cdeced64 Content-Type: text/plain; charset=ISO-8859-1 On Wed, Nov 7, 2012 at 11:22 AM, Ben Guthro wrote: > I'm trying to debug an issue on an older lapop (Toshiba Satellite A505) - > that has an i3 processor (M330) - and intel graphics. > This is running under Xen-unstable, and a 3.7-rc4 pvops kernel - but can > also be reproduced using kernels as old as 3.2.23 - and hypervisors as old > as 4.0.4 > > (I have cross posted here, because I am not yet sure if this is a Xen, > pvops, or i915 issue - and would appreciate opinions in sorting it out.) > > This appears to be unrelated to Xen / pvops, at the moment, after some additional debugging, and appears to be an issue with the i915 driver with older hardware. I'll remove xen-devel, and Konrad from future replies to this thread. > > Additionally, this same trace stack is printed out at a regular 10s > interval, after resume - where prior to resuming from S3 it is printed out > once at boot time. > > 10*HZ seems to be the normal hotplug interval, when an interrupt doesn't fire > > There seems to be a mismatch for these IRQ delivery - or at least exhibits > the behavior similar to such a problem. > > I was mistaken here. The i8042 IRQ would just start up the IRQ handling - but the i915 driver always thinks it has pending work, and schedules it. It seems that the hotplug mask is not getting cleared in pch_iir (in i915_irq.c) Manually clearing this bit with pch_iir = pch_iir ^ hotplug_mask; in the ironlake_irq_handler() function seems to resolve the issue - making it so I don't get the flurry of hotplug work bogging down the system. ...but is this disabling hotplug detection entirely? --f46d04428d2244da0d04cdeced64 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On Wed, Nov 7, 2012 at 11:22 AM, Ben Gut= hro <ben@guthro.net> wrote:
I'm trying to debug an issue on an older lapop (Toshiba Satellite A505)= - that has an i3 processor (M330) - and intel graphics.
This is runnin= g under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduc= ed using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4

(I have cross posted here, because I am not yet sure if= this is a Xen, pvops, or i915 issue - and would appreciate opinions in sor= ting it out.)


This appears to be unrelated to Xen / pvops, at the moment, after some addi= tional debugging, and appears to be an issue with the i915 driver with olde= r hardware.
I'll remove xen-devel, and Konrad from future rep= lies to this thread.

=A0

=
Additionally, this same trace stack is printed out at a regular 10s in= terval, after resume - where prior to resuming from S3 it is printed out on= ce at boot time.


10*HZ seems to be the norma= l hotplug interval, when an interrupt doesn't fire
=A0
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">

There seems to be a mismatch for these IRQ d= elivery - or at least exhibits the behavior similar to such a problem.


I was mistaken here. The i8= 042 IRQ would just start up the IRQ handling - but the i915 driver always t= hinks it has pending work, and schedules it.
It seems that the ho= tplug mask is not getting cleared in pch_iir (in i915_irq.c)

Manually clearing this bit with
pch_iir =3D p= ch_iir ^ hotplug_mask;
in the=A0ironlake_irq_handler() function

seems to resolve the issue - making it so I don'= ;t get the flurry of hotplug work bogging down the system.
...but is this disabling hotplug detection entirely?


--f46d04428d2244da0d04cdeced64-- --===============1727707612959540151== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1727707612959540151==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 19:43:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 19:43:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWBWm-00004y-4Q; Wed, 07 Nov 2012 19:43:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWBWj-00004t-VM for xen-devel@lists.xen.org; Wed, 07 Nov 2012 19:43:06 +0000 Received: from [85.158.137.99:8226] by server-3.bemta-3.messagelabs.com id B7/9E-31566-9C9BA905; Wed, 07 Nov 2012 19:43:05 +0000 X-Env-Sender: ben.guthro@gmail.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352317383!18058905!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25296 invoked from network); 7 Nov 2012 19:43:04 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-14.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 19:43:04 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so906270wgb.32 for ; Wed, 07 Nov 2012 11:43:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=0NZjMx+SboPVcJdhM4Ub2mskmCSeTpBK4lJpxMVc12c=; b=Ti6FK0ml3JKWQbSt8YRUCiLkTo8rVuqSAvFIVC6QacY3iyoPSloBypfeXJ7qZ9fr2P 5gHf/rRLY3H/Sg+/quW5Y5WD0TRY3vC2K2DNkn5m2N/wJUNkBR4R+T07Ubh5NI8wdqBy hivzBiJFjEBJnFVOsCExeCANLOeqiWBToLpWZKZoO31DE7dkx54k1B7sNN9py5ffc1TJ sx4ZSRPXlSYEkc+81Gpt7tcDQHLllJ4iiKZNiZDa3fhDEH8JFvSEAeGmdnZukGmqImI/ wuKcxISEZgE/6hsME6mQjk5kKETZd7cFw6Tw3til7GquPNMGWleDeFQIZA4TaCEtpmiy zYJw== MIME-Version: 1.0 Received: by 10.180.86.69 with SMTP id n5mr9516129wiz.0.1352317383530; Wed, 07 Nov 2012 11:43:03 -0800 (PST) Received: by 10.216.97.199 with HTTP; Wed, 7 Nov 2012 11:43:03 -0800 (PST) In-Reply-To: References: Date: Wed, 7 Nov 2012 14:43:03 -0500 X-Google-Sender-Auth: bptl82YvALEl_m9_b7LurCBYm1A Message-ID: From: Ben Guthro To: xen-devel , intel-gfx@lists.freedesktop.org Cc: Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] S3 causing IRQ delivery mismatch - i915 hotplug storm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1727707612959540151==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============1727707612959540151== Content-Type: multipart/alternative; boundary=f46d04428d2244da0d04cdeced64 --f46d04428d2244da0d04cdeced64 Content-Type: text/plain; charset=ISO-8859-1 On Wed, Nov 7, 2012 at 11:22 AM, Ben Guthro wrote: > I'm trying to debug an issue on an older lapop (Toshiba Satellite A505) - > that has an i3 processor (M330) - and intel graphics. > This is running under Xen-unstable, and a 3.7-rc4 pvops kernel - but can > also be reproduced using kernels as old as 3.2.23 - and hypervisors as old > as 4.0.4 > > (I have cross posted here, because I am not yet sure if this is a Xen, > pvops, or i915 issue - and would appreciate opinions in sorting it out.) > > This appears to be unrelated to Xen / pvops, at the moment, after some additional debugging, and appears to be an issue with the i915 driver with older hardware. I'll remove xen-devel, and Konrad from future replies to this thread. > > Additionally, this same trace stack is printed out at a regular 10s > interval, after resume - where prior to resuming from S3 it is printed out > once at boot time. > > 10*HZ seems to be the normal hotplug interval, when an interrupt doesn't fire > > There seems to be a mismatch for these IRQ delivery - or at least exhibits > the behavior similar to such a problem. > > I was mistaken here. The i8042 IRQ would just start up the IRQ handling - but the i915 driver always thinks it has pending work, and schedules it. It seems that the hotplug mask is not getting cleared in pch_iir (in i915_irq.c) Manually clearing this bit with pch_iir = pch_iir ^ hotplug_mask; in the ironlake_irq_handler() function seems to resolve the issue - making it so I don't get the flurry of hotplug work bogging down the system. ...but is this disabling hotplug detection entirely? --f46d04428d2244da0d04cdeced64 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable

On Wed, Nov 7, 2012 at 11:22 AM, Ben Gut= hro <ben@guthro.net> wrote:
I'm trying to debug an issue on an older lapop (Toshiba Satellite A505)= - that has an i3 processor (M330) - and intel graphics.
This is runnin= g under Xen-unstable, and a 3.7-rc4 pvops kernel - but can also be reproduc= ed using kernels as old as 3.2.23 - and hypervisors as old as 4.0.4

(I have cross posted here, because I am not yet sure if= this is a Xen, pvops, or i915 issue - and would appreciate opinions in sor= ting it out.)


This appears to be unrelated to Xen / pvops, at the moment, after some addi= tional debugging, and appears to be an issue with the i915 driver with olde= r hardware.
I'll remove xen-devel, and Konrad from future rep= lies to this thread.

=A0

=
Additionally, this same trace stack is printed out at a regular 10s in= terval, after resume - where prior to resuming from S3 it is printed out on= ce at boot time.


10*HZ seems to be the norma= l hotplug interval, when an interrupt doesn't fire
=A0
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">

There seems to be a mismatch for these IRQ d= elivery - or at least exhibits the behavior similar to such a problem.


I was mistaken here. The i8= 042 IRQ would just start up the IRQ handling - but the i915 driver always t= hinks it has pending work, and schedules it.
It seems that the ho= tplug mask is not getting cleared in pch_iir (in i915_irq.c)

Manually clearing this bit with
pch_iir =3D p= ch_iir ^ hotplug_mask;
in the=A0ironlake_irq_handler() function

seems to resolve the issue - making it so I don'= ;t get the flurry of hotplug work bogging down the system.
...but is this disabling hotplug detection entirely?


--f46d04428d2244da0d04cdeced64-- --===============1727707612959540151== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1727707612959540151==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 20:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMu-0000VV-9n; Wed, 07 Nov 2012 20:37:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMs-0000VD-KL for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:36:59 +0000 Received: from [85.158.139.83:61379] by server-15.bemta-5.messagelabs.com id 98/04-26920-966CA905; Wed, 07 Nov 2012 20:36:57 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352320602!29243370!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16827 invoked from network); 7 Nov 2012 20:36:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:36:55 -0000 X-SBRS: -2.2 X-MesageID: 43849546 X-Ironport-Server: ftlpip01.citrite.net X-Remote-IP: 75.150.106.249 X-Policy: $Relay X-IronPort-AV: E=Sophos;i="4.80,732,1344211200"; d="scan'208";a="43849546" Received: from 75-150-106-249-newengland.hfc.comcastbusiness.net (HELO paine.oldroadcomputing.net) ([75.150.106.249]) by SMTP.CITRIX.COM with ESMTP; 07 Nov 2012 20:36:28 +0000 From: Robert Phillips To: xen-devel@lists.xen.org Date: Wed, 7 Nov 2012 15:36:08 -0500 Message-Id: <1352320568-653-1-git-send-email-robert.phillips@citrix.com> X-Mailer: git-send-email 1.7.9.5 Cc: Robert Phillips Subject: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Support is provided for both shadow and hardware assisted paging (HAP) modes. This code bookkeeps the set of video frame buffers (vram), detects when the guest has modified any of those buffers and, upon request, returns a bitmap of the modified pages. This lets other software components re-paint the portions of the monitor (or monitors) that have changed. Each monitor has a frame buffer of some size at some position in guest physical memory. The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. (Version 2 of this patch.) Signed-Off-By: Robert Phillips --- tools/libxc/xenctrl.h | 17 +- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/hvm.c | 4 +- xen/arch/x86/mm/Makefile | 1 + xen/arch/x86/mm/dirty_vram.c | 951 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/hap/hap.c | 140 +----- xen/arch/x86/mm/paging.c | 236 ++++------ xen/arch/x86/mm/shadow/common.c | 335 ++++++++------ xen/arch/x86/mm/shadow/multi.c | 174 ++++--- xen/arch/x86/mm/shadow/multi.h | 7 +- xen/arch/x86/mm/shadow/types.h | 1 + xen/include/asm-x86/dirty_vram.h | 196 ++++++++ xen/include/asm-x86/hap.h | 4 - xen/include/asm-x86/hvm/domain.h | 2 +- xen/include/asm-x86/paging.h | 22 +- xen/include/asm-x86/shadow.h | 6 - 16 files changed, 1535 insertions(+), 563 deletions(-) create mode 100644 xen/arch/x86/mm/dirty_vram.c create mode 100644 xen/include/asm-x86/dirty_vram.h diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7eb5743..693d7fe 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1552,15 +1552,20 @@ int xc_hvm_inject_msi( xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data); /* - * Track dirty bit changes in the VRAM area + * Track dirty bit changes in a VRAM region defined by + * [ first_pfn : first_pfn + nr - 1 ] * * All of this is done atomically: - * - get the dirty bitmap since the last call - * - set up dirty tracking area for period up to the next call - * - clear the dirty tracking area. + * - gets the dirty bitmap since the last call, all zeroes for + * the first call with some new region + * - sets up a dirty tracking region for period up to the next call + * - clears the specified dirty tracking region. * - * Returns -ENODATA and does not fill bitmap if the area has changed since the - * last call. + * Creating a new region causes any existing regions that it overlaps + * to be discarded. + * + * Specifying nr == 0 causes all regions to be discarded and + * disables dirty bit tracking. */ int xc_hvm_track_dirty_vram( xc_interface *xch, domid_t dom, diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index eea5555..e374aac 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -22,4 +22,4 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o \ No newline at end of file +obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 34da2f5..b12e3b6 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -1433,8 +1434,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, */ if ( access_w ) { - paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_mark_dirty_hap(v->domain, gfn, mfn_x(mfn)); } rc = 1; goto out_put_gfn; diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 73dcdf4..becd0c9 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -5,6 +5,7 @@ obj-y += paging.o obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o obj-y += guest_walk_2.o obj-y += guest_walk_3.o +obj-y += dirty_vram.o obj-$(x86_64) += guest_walk_4.o obj-$(x86_64) += mem_event.o obj-$(x86_64) += mem_paging.o diff --git a/xen/arch/x86/mm/dirty_vram.c b/xen/arch/x86/mm/dirty_vram.c new file mode 100644 index 0000000..72bcf4e --- /dev/null +++ b/xen/arch/x86/mm/dirty_vram.c @@ -0,0 +1,951 @@ +/* + * arch/x86/mm/dirty_vram.c: Bookkeep/query dirty VRAM pages + * with support for multiple frame buffers. + * + * Copyright (c) 2012, Citrix Systems, Inc. (Robert Phillips) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ + + +#include +#include +#include +#include +#include +#include "mm-locks.h" + +#define DEBUG_stop_tracking_all_vram 1 +#define DEBUG_allocating_dirty_vram_range 1 +#define DEBUG_high_water_mark_for_vram_ranges 1 +#define DEBUG_freeing_dirty_vram_range 1 +#define DEBUG_allocate_paddr_links_page 0 +#define DEBUG_update_vram_mapping 0 + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram; + ASSERT( paging_locked_by_me(d) ); + dirty_vram = d->arch.hvm_domain.dirty_vram = xzalloc(dv_dirty_vram_t); + if ( dirty_vram ) + { + INIT_LIST_HEAD(&dirty_vram->range_head); + INIT_LIST_HEAD(&dirty_vram->ext_head); + } + return dirty_vram; +} + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( !dirty_vram ) + dirty_vram = dirty_vram_alloc(d); + return dirty_vram; +} + + +/* Free domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr, *next; + /* Free all the ranges */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); +#if DEBUG_stop_tracking_all_vram + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] stop tracking all vram\n", + range->begin_pfn, range->end_pfn); +#endif + xfree(range->pl_tab); + xfree(range); + } + /* Free all the extension pages */ + list_for_each_safe(curr, next, &dirty_vram->ext_head) + { + struct dv_paddr_link_ext *ext = + container_of( + curr, struct dv_paddr_link_ext, ext_link); + struct page_info *pg = __virt_to_page(ext); + d->arch.paging.free_page(d, pg); + } + + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } +} + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn) +{ + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( gfn >= range->begin_pfn && + gfn < range->end_pfn ) + return range; + } + } + return NULL; +} + +/* + * Returns pointer to dirty vram range matching [begin_pfn .. end_pfn ), + * NULL if none. + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( begin_pfn == range->begin_pfn && + end_pfn == range->end_pfn ) + return range; + } + } + return NULL; +} + +/* Allocate specified dirty_vram range */ +static dv_range_t * +_dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range = NULL; + unsigned long end_pfn = begin_pfn + nr; + dv_paddr_link_t *pl_tab = NULL; + int i; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + +#if DEBUG_allocating_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Allocating dirty vram range hap:%d\n", + begin_pfn, end_pfn, + d->arch.hvm_domain.hap_enabled); +#endif + + range = xzalloc(dv_range_t); + if ( range == NULL ) + goto err_out; + + INIT_LIST_HEAD(&range->range_link); + + range->begin_pfn = begin_pfn; + range->end_pfn = end_pfn; + + if ( !hap_enabled(d) ) + { + if ( (pl_tab = xzalloc_array(dv_paddr_link_t, nr)) == NULL ) + goto err_out; + + for ( i = 0; i != nr; i++ ) + { + pl_tab[i].sl1ma = INVALID_PADDR; + } + } + + range->pl_tab = pl_tab; + range->mappings_hwm = 1; + + list_add(&range->range_link, &dirty_vram->range_head); + if ( ++dirty_vram->nr_ranges > dirty_vram->ranges_hwm ) + { + dirty_vram->ranges_hwm = dirty_vram->nr_ranges; +#if DEBUG_high_water_mark_for_vram_ranges + gdprintk(XENLOG_DEBUG, + "High water mark for number of vram ranges is now:%d\n", + dirty_vram->ranges_hwm); +#endif + } + return range; + + err_out: + xfree(pl_tab); + xfree(range); + return NULL; +} + + +/* Frees specified dirty_vram range */ +void dirty_vram_range_free(struct domain *d, + dv_range_t *range) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + int i, nr = range->end_pfn - range->begin_pfn; + +#if DEBUG_freeing_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Freeing dirty vram range\n", + range->begin_pfn, range->end_pfn); +#endif + + if ( range->pl_tab ) + { + for ( i = 0; i != nr; i++ ) + { + dv_paddr_link_t *plx; + plx = range->pl_tab[i].pl_next; + /* Does current FB page have multiple mappings? */ + if ( plx ) /* yes */ + { + /* Find the last element in singly-linked list */ + while ( plx->pl_next != NULL ) + plx = plx->pl_next; + + /* Prepend whole list to the free list */ + plx->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = range->pl_tab[i].pl_next; + } + } + xfree(range->pl_tab); + range->pl_tab = NULL; + } + + /* Remove range from the linked list, free it, and adjust count*/ + list_del(&range->range_link); + xfree(range); + dirty_vram->nr_ranges--; + } +} + +/* + * dirty_vram_range_alloc() + * This function ensures that the new range does not overlap any existing + * ranges -- deleting them if necessary -- and then calls + * _dirty_vram_range_alloc to actually allocate the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + struct list_head *curr, *next; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + + /* + * Ranges cannot overlap so + * free any range that overlaps [ begin_pfn .. end_pfn ) + */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *rng = list_entry(curr, dv_range_t, range_link); + if ( ( ( rng->begin_pfn <= begin_pfn ) && + ( begin_pfn < rng->end_pfn ) + ) || + ( ( begin_pfn <= rng->begin_pfn ) && + ( rng->begin_pfn < end_pfn ) + ) ) + { + /* Different tracking, tear the previous down. */ + dirty_vram_range_free(d, rng); + } + } + + range = _dirty_vram_range_alloc(d, begin_pfn, nr); + if ( !range ) + goto out; + + out: + return range; +} + +/* + * dirty_vram_range_find_or_alloc() + * Find the range for [begin_pfn:begin_pfn+nr). + * If it doesn't exists, create it. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_range_t *range; + ASSERT( paging_locked_by_me(d) ); + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + range = dirty_vram_range_alloc(d, begin_pfn, nr); + + return range; +} + + + +/* Allocate a dv_paddr_link struct */ +static dv_paddr_link_t * +alloc_paddr_link(struct domain *d) +{ + dv_paddr_link_t * pl = NULL; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + + ASSERT( paging_locked_by_me(d) ); + BUILD_BUG_ON(sizeof(dv_paddr_link_ext_t) > PAGE_SIZE); + /* Is the list of free pl's empty? */ + if ( dirty_vram->pl_free == NULL ) /* yes */ + { + /* + * Allocate another page of pl's. + * Link them all together and point the free list head at them + */ + int i; + struct page_info *pg = d->arch.paging.alloc_page(d); + dv_paddr_link_ext_t *ext = __page_to_virt(pg); + if ( ext == NULL ) + goto out; + +#if DEBUG_allocate_paddr_links_page + gdprintk(XENLOG_DEBUG, "Allocated another page of paddr_links\n"); +#endif + list_add(&ext->ext_link, &dirty_vram->ext_head); + + /* initialize and link together the new pl entries */ + for ( i = 0; i != ARRAY_SIZE(ext->entries); i++ ) + { + ext->entries[i].sl1ma = INVALID_PADDR; + ext->entries[i].pl_next = &ext->entries[i+1]; + } + ext->entries[ARRAY_SIZE(ext->entries) - 1].pl_next = NULL; + dirty_vram->pl_free = &ext->entries[0]; + } + pl = dirty_vram->pl_free; + dirty_vram->pl_free = pl->pl_next; + + pl->sl1ma = INVALID_PADDR; + pl->pl_next = NULL; + out: + return pl; +} + + +/* + * Free a paddr_link struct. + * + * The caller has walked the singly-linked list of elements + * that have, as their head, an element in a pl_tab cell. + * The list walks has reached the element to be freed. + * (Each element is a dv_paddr_link_t struct.) + * + * @pl points to the element to be freed. + * @ppl points to its predecessor element's next member. + * + * After linking the precessor to the element's successor, + * we can free @pl by prepending it to the list of free + * elements. + * + * As a boundary case (which happens to be the common case), + * @pl points to a cell in the pl_tab rather than to some + * extension element danging from that cell. + * We recognize this case because @ppl is NULL. + * In that case we promote the first extension element by + * copying it into the pl_tab cell and free it. + */ + +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_paddr_link_t *npl; /* next pl */ + + ASSERT( paging_locked_by_me(d) ); + /* extension mapping? */ + if ( ppl ) /* yes. free it */ + { + ASSERT(pl == (*ppl)); + (*ppl) = npl = pl->pl_next; + } + else /* main table */ + { + /* + * move 2nd mapping to main table. + * and free 2nd mapping + */ + dv_paddr_link_t * spl; + spl = pl->pl_next; + if ( spl == NULL ) + { + pl->sl1ma = INVALID_PADDR; + return pl; + } + pl->sl1ma = spl->sl1ma; + pl->pl_next = spl->pl_next; + npl = pl; /* reprocess main table entry again */ + pl = spl; + } + pl->sl1ma = INVALID_PADDR; + pl->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = pl; + return npl; +} + + +/* + * dirty_vram_range_update() + * + * This is called whenever a level 1 page table entry is modified. + * If the L1PTE is being cleared, the function removes any paddr_links + * that refer to it. + * If the L1PTE is being set to a frame buffer page, a paddr_link is + * created for that page's entry in pl_tab. + * Returns 1 iff entry found and set or cleared. + */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set) +{ + int effective = 0; + dv_range_t *range; + unsigned long i; + dv_paddr_link_t *pl; + dv_paddr_link_t **ppl; + int len = 0; + + ASSERT(paging_locked_by_me(d)); + range = dirty_vram_range_find_gfn(d, gfn); + if ( !range ) + return effective; + + + i = gfn - range->begin_pfn; + pl = &range->pl_tab[ i ]; + ppl = NULL; + + /* + * find matching entry (pl), if any, and its predecessor + * in linked list (ppl) + */ + while ( pl != NULL ) + { + if ( pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) + break; + + ppl = &pl->pl_next; + pl = *ppl; + len++; + } + + if ( set ) + { + /* Did we find sl1ma in either the main table or the linked list? */ + if ( pl == NULL ) /* no, so we'll need to alloc a link */ + { + ASSERT(ppl != NULL); + /* + * Have we reached the limit of mappings we're willing + * to bookkeep? + */ + if (len > DV_ADDR_LINK_LIST_LIMIT) /* yes */ + /* + * The side effect of failing to record this mapping + * is that we will not detect any changes to the frame + * buffer made through the mapping so + * areas of a monitor may not get refreshed. + * In practice this should never happen. + */ + goto out; + + /* alloc link and append it to list */ + (*ppl) = pl = alloc_paddr_link(d); + if ( pl == NULL ) + goto out; + } + if ( pl->sl1ma != sl1ma ) + { + ASSERT(pl->sl1ma == INVALID_PADDR); + pl->sl1ma = sl1ma; + range->nr_mappings++; + } + effective = 1; + if ( len > range->mappings_hwm ) + { + range->mappings_hwm = len; +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", + gfn, sl1ma, + range->mappings_hwm, + range->nr_mappings, + d->arch.paging.shadow.free_pages); +#endif + } + } + else /* clear */ + { + if ( pl && pl->sl1ma == sl1ma ) + { +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] clear sl1ma:%lx mappings:%d\n", + gfn, sl1ma, + range->nr_mappings - 1); +#endif + free_paddr_link(d, ppl, pl); + if ( --range->nr_mappings == 0 ) + { + dirty_vram_range_free(d, range); + } + effective = 1; + } + } + out: + return effective; +} + + +/* + * shadow_scan_dirty_flags() + * This produces a dirty bitmap for the range by examining every + * L1PTE referenced by some dv_paddr_link in the range's pl_tab table. + * It tests and clears each such L1PTE's dirty flag. + */ +static int shadow_scan_dirty_flags(struct domain *d, + dv_range_t *range, + uint8_t *dirty_bitmap) +{ + int flush_tlb = 0; + unsigned long i; + unsigned long nr = range->end_pfn - range->begin_pfn; + + ASSERT( paging_locked_by_me(d) ); + /* Iterate over VRAM to track dirty bits. */ + for ( i = 0; i < nr; i++ ) + { + int dirty = 0, len = 1; + dv_paddr_link_t *pl; + for ( pl = &range->pl_tab[i]; pl; pl = pl->pl_next, len++ ) + { + l1_pgentry_t *sl1e; + paddr_t sl1ma = pl->sl1ma; + if (sl1ma == INVALID_PADDR) /* FB page is unmapped */ + continue; + sl1e = maddr_to_virt(sl1ma); + if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) + { + dirty = 1; + /* Clear dirty so we can detect if page gets re-dirtied. + * Note: this is atomic, so we may clear a + * _PAGE_ACCESSED set by another processor. + */ + l1e_remove_flags(*sl1e, _PAGE_DIRTY); + flush_tlb = 1; + } + } /* for */ + + if ( dirty ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + + } + + return flush_tlb; +} + + +/* + * shadow_track_dirty_vram() + * This is the API called by the guest to determine which pages in the range + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. + * It creates the domain's dv_dirty_vram on demand. + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). + * It copies the dirty bitmask into guest storage. + */ +int shadow_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + int rc = 0; + unsigned long end_pfn = begin_pfn + nr; + int flush_tlb = 0; + dv_range_t *range; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + /* + * This range test is tricky. + * + * The range [begin_pfn..end_pfn) is an open interval, so end_pfn is a pfn + * beyond the end of the range. + * + * p2m->max_mapped_pfn is a valid PFN so p2m->max_mapped_pfn + 1 is an + * invalid PFN. + * + * If end_pfn is beyond *that* then the range is invalid. + */ + if ( end_pfn < begin_pfn + || begin_pfn > p2m->max_mapped_pfn + || end_pfn > p2m->max_mapped_pfn + 1 ) + return -EINVAL; + + paging_lock(d); + + if (!nr) + { + dirty_vram_free(d); + goto out; + } + + if ( guest_handle_is_null(guest_dirty_bitmap) ) + goto out; + + if ( !dirty_vram_find_or_alloc(d) ) + { + rc = -ENOMEM; + goto out; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + range = dirty_vram_range_alloc(d, begin_pfn, nr); + if ( range ) + sh_find_all_vram_mappings(d->vcpu[0], range); + } + if ( range ) + { + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; + unsigned long dirty_bitmap[size]; + + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); + + flush_tlb |= shadow_scan_dirty_flags(d, range, (uint8_t*)dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + (uint8_t*)dirty_bitmap, + size * BYTES_PER_LONG) == 0 ) + rc = 0; + } + + if ( flush_tlb ) + flush_tlb_mask(d->domain_dirty_cpumask); + +out: + paging_unlock(d); + return rc; +} + + +/************************************************/ +/* HAP VRAM TRACKING SUPPORT */ +/************************************************/ + +/* + * hap_enable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-only. + */ +static int hap_enable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + /* turn on PG_log_dirty bit in paging mode */ + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + + /* + * dirty_vram != NULL iff we're tracking dirty vram. + * If we start tracking dirty pages for all memory then + * the dirty_vram structure is freed. + */ + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table to be read-only. */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] enable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_rw, p2m_ram_logdirty); + } + + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_disable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-write. + */ +static int hap_disable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table with normal mode */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] disable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_logdirty, p2m_ram_rw); + } + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_clean_vram_tracking_range() + * For all the pages in the range specified by [begin_pfn,nr), + * note in the dirty bitmap any page that has been marked as read-write, + * which signifies that the page has been dirtied, and reset the page + * to ram_logdirty. + */ +void hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) +{ + int i; + unsigned long pfn; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); + ASSERT(paging_locked_by_me(d)); + + if ( !dirty_vram ) + { + gdprintk(XENLOG_DEBUG, + "Should only be called while tracking dirty vram.\n"); + return; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + return; + + /* set l1e entries of P2M table to be read-only. */ + /* + * On first write, it page faults, its entry is changed to read-write, + * its bit in the dirty bitmap is set, and on retry the write succeeds. + */ + for ( i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++ ) + { + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + } + flush_tlb_mask(d->domain_dirty_cpumask); +} + +static void hap_vram_tracking_init(struct domain *d) +{ + paging_log_dirty_init(d, hap_enable_vram_tracking, + hap_disable_vram_tracking, + NULL); +} + +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(). + */ +int hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + long rc = 0; + dv_dirty_vram_t *dirty_vram; + + paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( nr ) + { + dv_range_t *range = NULL; + int size = ( nr + BITS_PER_LONG - 1 ) & ~( BITS_PER_LONG - 1 ); + uint8_t dirty_bitmap[size]; + + /* Already tracking dirty vram? */ + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ + { + /* Handle the addition of another range */ + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + rc = -ENOMEM; + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) + goto param_fail; + } + } + /* Just starting to track dirty vram? */ + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ + { + rc = -ENOMEM; + if ( !(dirty_vram = dirty_vram_alloc(d)) ) + goto param_fail; + + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) + goto param_fail; + + /* Initialize callbacks for vram tracking */ + hap_vram_tracking_init(d); + + /* Enable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_enable(d); + paging_lock(d); + + if ( rc != 0 ) + goto param_fail; + } + else + { + /* Test for invalid combination */ + if ( !paging_mode_log_dirty(d) && dirty_vram ) + rc = -EINVAL; + else /* logging dirty of all memory, not tracking dirty vram */ + rc = -ENODATA; + goto param_fail; + } + + paging_unlock(d); + memset(dirty_bitmap, 0x00, size); + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + dirty_bitmap, + size) == 0 ) + { + rc = 0; + } + } + else + { + /* + * If zero pages specified while already tracking dirty vram + * then stop tracking + */ + if ( paging_mode_log_dirty(d) && dirty_vram ) + { + /* Disable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_disable(d); + paging_lock(d); + + dirty_vram_free(d); + } + else /* benign no-op */ + { + rc = 0; + } + paging_unlock(d); + } + + return rc; + +param_fail: + dirty_vram_free(d); + paging_unlock(d); + return rc; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index fd99cde..09cdba2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "private.h" @@ -53,139 +54,6 @@ #define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) /************************************************/ -/* HAP VRAM TRACKING SUPPORT */ -/************************************************/ - -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} - -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( nr ) - { - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) - { - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; - - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - else - { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; - } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); - } - else - { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } - - return rc; - -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } - return rc; -} - -/************************************************/ /* HAP LOG DIRTY SUPPORT */ /************************************************/ @@ -223,14 +91,12 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; if ( paging_mode_log_dirty(d) && dirty_vram ) { paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + dirty_vram_free(d); } - /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, hap_disable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ea44e39..5e76609 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -278,6 +279,46 @@ out: } +/* paging_mark_dirty_hap() + * Make a hap page writeable and mark it as dirty. + * This done atomically under the p2m and paging locks to avoid leaving + * a window where the page might be modified without being counted as dirty. + */ +void paging_mark_dirty_hap(struct domain *d, + unsigned long pfn, + unsigned long guest_mfn) +{ + mfn_t gmfn; + p2m_type_t pt; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + if ( !paging_mode_log_dirty(d) ) + return; + + gmfn = _mfn(guest_mfn); + + ASSERT( mfn_valid(gmfn) && + page_get_owner(mfn_to_page(gmfn)) == d ); + + p2m_lock(p2m); + pt = p2m_change_type(d, pfn, p2m_ram_logdirty, p2m_ram_rw); + paging_lock(d); + if ( pt == p2m_ram_logdirty ) + { + dv_range_t *range; + PAGING_DEBUG(LOGDIRTY, + "marked mfn %" PRI_mfn " (pfn=%lx), dom %d\n", + mfn_x(gmfn), pfn, d->domain_id); + d->arch.paging.log_dirty.dirty_count++; + range = dirty_vram_range_find_gfn(d, pfn); + if ( range ) + range->dirty_count++; + } + paging_mark_dirty(d, guest_mfn); + paging_unlock(d); + p2m_unlock(p2m); +} + /* Is this guest page dirty? */ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) { @@ -333,8 +374,11 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) mfn_t *l4, *l3, *l2; unsigned long *l1; int i4, i3, i2; + struct p2m_domain *p2m = p2m_get_hostp2m(d); domain_pause(d); + /* Locking hierarchy requires p2m lock to be taken first */ + p2m_lock(p2m); paging_lock(d); clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); @@ -345,6 +389,14 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) d->arch.paging.log_dirty.fault_count, d->arch.paging.log_dirty.dirty_count); + if ( hap_enabled(d) && d->arch.hvm_domain.dirty_vram ) + { + /* If we're cleaning/peeking all guest memory, we should not be tracking + * dirty vram. */ + rv = -EINVAL; + goto out; + } + sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; @@ -424,170 +476,64 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) if ( clean ) { - /* We need to further call clean_dirty_bitmap() functions of specific - * paging modes (shadow or hap). Safe because the domain is paused. */ - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + /* Is null if tracking dirty vram */ + if ( d->arch.paging.log_dirty.clean_dirty_bitmap ) + { + /* + * We need to call clean_dirty_bitmap() functions of specific + * paging modes (shadow or hap). + * Safe because the domain is paused. + */ + d->arch.paging.log_dirty.clean_dirty_bitmap(d); + } } domain_unpause(d); return rv; out: paging_unlock(d); + p2m_unlock(p2m); domain_unpause(d); return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + dv_range_t *range; + unsigned int range_dirty_count = 0; + + p2m_lock(p2m); paging_lock(d); - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); - - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); - - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + /* Only called when tracking dirty vram in HAP mode */ + ASSERT(hap_enabled(d) && d->arch.hvm_domain.dirty_vram); + + range = dirty_vram_range_find_gfn(d, begin_pfn); + if ( range ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + range_dirty_count = range->dirty_count; + range->dirty_count = 0; } - if ( l4 ) - unmap_domain_page(l4); - - paging_unlock(d); + + if ( !range_dirty_count) + goto out; - return rv; + PAGING_DEBUG(LOGDIRTY, + "log-dirty-range: dom %u [%05lx:%05lx] range_dirty=%u\n", + d->domain_id, + begin_pfn, + range->end_pfn, + range_dirty_count); + hap_clean_vram_tracking_range(d, begin_pfn, nr, dirty_bitmap); out: paging_unlock(d); - return rv; + p2m_unlock(p2m); + return; } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index ce79131..4e40f43 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "private.h" @@ -3121,12 +3122,7 @@ void shadow_teardown(struct domain *d) * calls now that we've torn down the bitmap */ d->arch.paging.mode &= ~PG_log_dirty; - if (d->arch.hvm_domain.dirty_vram) { - xfree(d->arch.hvm_domain.dirty_vram->sl1ma); - xfree(d->arch.hvm_domain.dirty_vram->dirty_bitmap); - xfree(d->arch.hvm_domain.dirty_vram); - d->arch.hvm_domain.dirty_vram = NULL; - } + dirty_vram_free(d); paging_unlock(d); @@ -3463,179 +3459,212 @@ void shadow_clean_dirty_bitmap(struct domain *d) /**************************************************************************/ -/* VRAM dirty tracking support */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - int rc; - unsigned long end_pfn = begin_pfn + nr; - unsigned long dirty_size = (nr + 7) / 8; - int flush_tlb = 0; - unsigned long i; - p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - if (end_pfn < begin_pfn - || begin_pfn > p2m->max_mapped_pfn - || end_pfn >= p2m->max_mapped_pfn) - return -EINVAL; - - /* We perform p2m lookups, so lock the p2m upfront to avoid deadlock */ - p2m_lock(p2m_get_hostp2m(d)); - paging_lock(d); +/* Support functions for shadow-based dirty VRAM code */ - if ( dirty_vram && (!nr || - ( begin_pfn != dirty_vram->begin_pfn - || end_pfn != dirty_vram->end_pfn )) ) - { - /* Different tracking, tear the previous down. */ - gdprintk(XENLOG_INFO, "stopping tracking VRAM %lx - %lx\n", dirty_vram->begin_pfn, dirty_vram->end_pfn); - xfree(dirty_vram->sl1ma); - xfree(dirty_vram->dirty_bitmap); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } +#define DEBUG_unshadow_sl1ma 0 +#define DEBUG_unshadow_sl1ma_detail 0 +#define DEBUG_count_initial_mappings 1 - if ( !nr ) +/* smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn) +{ + static unsigned int l1_shadow_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + struct domain *d = v->domain; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr, *next; + + ASSERT(paging_locked_by_me(d)); + /* Ignore all but level 1 shadows */ + + if ( (l1_shadow_mask & (1 << shadow_type)) == 0 ) { - rc = 0; goto out; } - /* This should happen seldomly (Video mode change), - * no need to be careful. */ + dirty_vram = d->arch.hvm_domain.dirty_vram; if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them - * up to nr times getting rid of mappings of each pfn */ - shadow_blow_tables(d); - - gdprintk(XENLOG_INFO, "tracking VRAM %lx - %lx\n", begin_pfn, end_pfn); - - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto out; - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = end_pfn; - d->arch.hvm_domain.dirty_vram = dirty_vram; - - if ( (dirty_vram->sl1ma = xmalloc_array(paddr_t, nr)) == NULL ) - goto out_dirty_vram; - memset(dirty_vram->sl1ma, ~0, sizeof(paddr_t) * nr); - - if ( (dirty_vram->dirty_bitmap = xzalloc_array(uint8_t, dirty_size)) == NULL ) - goto out_sl1ma; - - dirty_vram->last_dirty = NOW(); - - /* Tell the caller that this time we could not track dirty bits. */ - rc = -ENODATA; - } - else if (dirty_vram->last_dirty == -1) - { - /* still completely clean, just copy our empty bitmap */ - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) - rc = 0; + goto out; } - else + + list_for_each_safe(curr, next, &dirty_vram->range_head) { - /* Iterate over VRAM to track dirty bits. */ - for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); - struct page_info *page; - int dirty = 0; - paddr_t sl1ma = dirty_vram->sl1ma[i]; - - if (mfn_x(mfn) == INVALID_MFN) - { - dirty = 1; - } - else + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + unsigned long i; + int max_mappings = 1, mappings = 0; + int unshadowed = 0; + for ( i = 0; i != range->end_pfn - range->begin_pfn; i++ ) + { + dv_paddr_link_t *pl = &range->pl_tab[ i ]; + dv_paddr_link_t **ppl = NULL; + mappings = 0; + + while ( pl != NULL ) { - page = mfn_to_page(mfn); - switch (page->u.inuse.type_info & PGT_count_mask) - { - case 0: - /* No guest reference, nothing to track. */ - break; - case 1: - /* One guest reference. */ - if ( sl1ma == INVALID_PADDR ) - { - /* We don't know which sl1e points to this, too bad. */ - dirty = 1; - /* TODO: Heuristics for finding the single mapping of - * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); - } - else - { - /* Hopefully the most common case: only one mapping, - * whose dirty bit we can use. */ - l1_pgentry_t *sl1e = maddr_to_virt(sl1ma); - - if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) - { - dirty = 1; - /* Note: this is atomic, so we may clear a - * _PAGE_ACCESSED set by another processor. */ - l1e_remove_flags(*sl1e, _PAGE_DIRTY); - flush_tlb = 1; - } - } - break; - default: - /* More than one guest reference, - * we don't afford tracking that. */ - dirty = 1; + paddr_t sl1ma = pl->sl1ma; + unsigned long sl1mn; + + if ( sl1ma == INVALID_PADDR ) break; + + sl1mn = sl1ma >> PAGE_SHIFT; + if ( sl1mn == mfn_x(smfn) ) { +#if DEBUG_unshadow_sl1ma_detail + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%lx] unshadow sl1ma:%lx\n", + mfn_x(smfn), + range->begin_pfn + i, + sl1ma); +#endif + unshadowed++; + pl = free_paddr_link(d, ppl, pl); + --range->nr_mappings; + } + else + { + ppl = &pl->pl_next; + pl = *ppl; + mappings++; } } - - if ( dirty ) + } + if ( mappings > max_mappings ) + max_mappings = mappings; + + if ( unshadowed ) { +#if DEBUG_unshadow_sl1ma + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%05lx:%05lx] unshadowed:%d mappings:0x%x max_mappings:%d\n", + mfn_x(smfn), + range->begin_pfn, range->end_pfn, + unshadowed, range->nr_mappings, max_mappings); +#endif + if ( range->nr_mappings == 0 ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + dirty_vram_range_free(d, range); } } + } + out: + return; +} + + +typedef int (*hash_pfn_callback_t)(struct vcpu *v, + mfn_t smfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); + +static int hash_pfn_foreach(struct vcpu *v, + unsigned int callback_mask, + hash_pfn_callback_t callbacks[], + unsigned long begin_pfn, + unsigned long end_pfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0, removed = 0; + struct domain *d = v->domain; + struct page_info *x; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(paging_locked_by_me(d)); + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i = begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); - } - dirty_vram->last_dirty = -1; + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](v, page_to_mfn(x), + begin_pfn, end_pfn, + &removed); + if ( done ) break; } - rc = 0; } + if ( done ) break; } - if ( flush_tlb ) - flush_tlb_mask(d->domain_dirty_cpumask); - goto out; + d->arch.paging.shadow.hash_walking = 0; + return removed; +} -out_sl1ma: - xfree(dirty_vram->sl1ma); -out_dirty_vram: - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range) +{ + /* Dispatch table for getting per-type functions */ + static hash_pfn_callback_t callbacks[SH_type_unused] = { + NULL, /* none */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* l1_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* fl1_32 */ + NULL, /* l2_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* l1_pae */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* fl1_pae */ + NULL, /* l2_pae */ + NULL, /* l2h_pae */ +#if CONFIG_PAGING_LEVELS >= 4 + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* l1_64 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* fl1_64 */ +#else + NULL, /* l1_64 */ + NULL, /* fl1_64 */ +#endif + NULL, /* l2_64 */ + NULL, /* l2h_64 */ + NULL, /* l3_64 */ + NULL, /* l4_64 */ + NULL, /* p2m */ + NULL /* unused */ + }; -out: - paging_unlock(d); - p2m_unlock(p2m_get_hostp2m(d)); - return rc; + static unsigned int callback_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + + perfc_incr(shadow_mappings); + + hash_pfn_foreach(v, callback_mask, callbacks, + range->begin_pfn, + range->end_pfn); + +#if DEBUG_count_initial_mappings + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] count of initial mappings:%d\n", + range->begin_pfn, range->end_pfn, + range->nr_mappings); +#endif } + /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..9c00574 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +150,10 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } @@ -160,6 +165,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) @@ -516,7 +525,6 @@ _sh_propagate(struct vcpu *v, guest_l1e_t guest_entry = { guest_intpte }; shadow_l1e_t *sp = shadow_entry_ptr; struct domain *d = v->domain; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; gfn_t target_gfn = guest_l1e_get_gfn(guest_entry); u32 pass_thru_flags; u32 gflags, sflags; @@ -663,17 +671,6 @@ _sh_propagate(struct vcpu *v, } } - if ( unlikely((level == 1) && dirty_vram - && dirty_vram->last_dirty == -1 - && gfn_x(target_gfn) >= dirty_vram->begin_pfn - && gfn_x(target_gfn) < dirty_vram->end_pfn) ) - { - if ( ft & FETCH_TYPE_WRITE ) - dirty_vram->last_dirty = NOW(); - else - sflags &= ~_PAGE_RW; - } - /* Read-only memory */ if ( p2m_is_readonly(p2mt) || (p2mt == p2m_mmio_direct && @@ -1072,101 +1069,60 @@ static int shadow_set_l2e(struct vcpu *v, return flags; } -static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, +/* shadow_vram_fix_l1e() + * + * Tests L1PTEs as they are modified, looking for when they start to + * (or cease to) point to frame buffer pages. If the old and new gfns differ, + * calls dirty_vram_range_update() to updates the dirty_vram structures. + */ +static inline void shadow_vram_fix_l1e(shadow_l1e_t old_sl1e, + shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) { - mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); - int flags = shadow_l1e_get_flags(new_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + mfn_t new_mfn, old_mfn; + unsigned long new_gfn = INVALID_M2P_ENTRY, old_gfn = INVALID_M2P_ENTRY; + paddr_t sl1ma; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ + if ( !dirty_vram ) return; - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); + sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) | ((unsigned long)sl1e & ~PAGE_MASK); - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + old_mfn = shadow_l1e_get_mfn(old_sl1e); + + if ( !sh_l1e_is_magic(old_sl1e) && + (l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && + mfn_valid(old_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - /* Initial guest reference, record it */ - dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + old_gfn = mfn_to_gfn(d, old_mfn); } -} - -static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, - shadow_l1e_t *sl1e, - mfn_t sl1mfn, - struct domain *d) -{ - mfn_t mfn = shadow_l1e_get_mfn(old_sl1e); - int flags = shadow_l1e_get_flags(old_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ - return; - - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); - - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + + new_mfn = shadow_l1e_get_mfn(new_sl1e); + if ( !sh_l1e_is_magic(new_sl1e) && + (l1e_get_flags(new_sl1e) & _PAGE_PRESENT) && + mfn_valid(new_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - int dirty = 0; - paddr_t sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + new_gfn = mfn_to_gfn(d, new_mfn); + } - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - { - /* Last reference */ - if ( dirty_vram->sl1ma[i] == INVALID_PADDR ) { - /* We didn't know it was that one, let's say it is dirty */ - dirty = 1; - } - else - { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); - dirty_vram->sl1ma[i] = INVALID_PADDR; - if ( flags & _PAGE_DIRTY ) - dirty = 1; - } - } - else + if ( old_gfn == new_gfn ) return; + + if ( VALID_M2P(old_gfn) ) + if ( dirty_vram_range_update(d, old_gfn, sl1ma, 0/*clear*/) ) { - /* We had more than one reference, just consider the page dirty. */ - dirty = 1; - /* Check that it's not the one we recorded. */ - if ( dirty_vram->sl1ma[i] == sl1ma ) - { - /* Too bad, we remembered the wrong one... */ - dirty_vram->sl1ma[i] = INVALID_PADDR; - } - else - { - /* Ok, our recorded sl1e is still pointing to this page, let's - * just hope it will remain. */ - } + SHADOW_PRINTK("gfn %lx (mfn %lx) cleared vram pte\n", + old_gfn, mfn_x(old_mfn)); } - if ( dirty ) + + if ( VALID_M2P(new_gfn) ) + if ( dirty_vram_range_update(d, new_gfn, sl1ma, 1/*set*/) ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + SHADOW_PRINTK("gfn %lx (mfn %lx) set vram pte\n", + new_gfn, mfn_x(new_mfn)); } - } } static int shadow_set_l1e(struct vcpu *v, @@ -1211,12 +1167,13 @@ static int shadow_set_l1e(struct vcpu *v, shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); /* fall through */ case 0: - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); break; } } } + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); + /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; @@ -1231,7 +1188,6 @@ static int shadow_set_l1e(struct vcpu *v, * trigger a flush later. */ if ( shadow_mode_refcounts(d) ) { - shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); } @@ -2018,7 +1974,6 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { - shadow_vram_put_l1e(*sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(*sl1e, d); } }); @@ -4336,6 +4291,37 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) return done; } + +int sh_find_vram_mappings_in_l1(struct vcpu *v, + mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed) +/* Find all VRAM mappings in this shadow l1 table */ +{ + struct domain *d = v->domain; + shadow_l1e_t *sl1e; + int done = 0; + + /* only returns _PAGE_PRESENT entries */ + SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, done, + { + unsigned long gfn; + mfn_t gmfn = shadow_l1e_get_mfn(*sl1e); + if ( !mfn_valid(gmfn) ) + continue; + gfn = mfn_to_gfn(d, gmfn); + if ( VALID_M2P(gfn) && (begin_pfn <= gfn) && (gfn < end_pfn) ) + { + paddr_t sl1ma = + pfn_to_paddr(mfn_x(sl1mfn)) | + ( (unsigned long)sl1e & ~PAGE_MASK ); + dirty_vram_range_update(v->domain, gfn, sl1ma, 1/*set*/); + } + }); + return 0; +} + /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 835121e..436a4ac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -66,7 +66,12 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); - +extern int +SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, GUEST_LEVELS) + (struct vcpu *v, mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) (struct vcpu *v, void *ep, mfn_t smfn); diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 43ce1db..5b0f9f7 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -229,6 +229,7 @@ static inline shadow_l4e_t shadow_l4e_from_mfn(mfn_t mfn, u32 flags) #define sh_update_cr3 INTERNAL_NAME(sh_update_cr3) #define sh_rm_write_access_from_l1 INTERNAL_NAME(sh_rm_write_access_from_l1) #define sh_rm_mappings_from_l1 INTERNAL_NAME(sh_rm_mappings_from_l1) +#define sh_find_vram_mappings_in_l1 INTERNAL_NAME(sh_find_vram_mappings_in_l1) #define sh_remove_l1_shadow INTERNAL_NAME(sh_remove_l1_shadow) #define sh_remove_l2_shadow INTERNAL_NAME(sh_remove_l2_shadow) #define sh_remove_l3_shadow INTERNAL_NAME(sh_remove_l3_shadow) diff --git a/xen/include/asm-x86/dirty_vram.h b/xen/include/asm-x86/dirty_vram.h new file mode 100644 index 0000000..7f3ccf9 --- /dev/null +++ b/xen/include/asm-x86/dirty_vram.h @@ -0,0 +1,196 @@ +/****************************************************************************** + * include/asm-x86/dirty_vram.h + * + * Interface for tracking dirty VRAM pages + * + * Copyright (c) 2012 Citrix Systems, Inc. (Robert Phillips) + * Parts of this code are Copyright (c) 2006 by XenSource Inc. + * Parts of this code are Copyright (c) 2006 by Michael A Fetterman + * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DIRTY_VRAM_H +#define _DIRTY_VRAM_H + +/* + * In shadow mode we need to bookkeep all the L1 page table entries that + * map a frame buffer page. Struct dv_paddr_link does this + * by recording the address of a L1 page table entry for some frame buffer page. + * Also has a link to additional pl entries if the frame buffer page + * has multiple mappings. + * In practice very few pages have multiple mappings. + * But to rule out some pathological situation, we limit the number of + * mappings we're willing to bookkeep. + */ + +#define DV_ADDR_LINK_LIST_LIMIT 20 + +typedef struct dv_paddr_link { + paddr_t sl1ma; + struct dv_paddr_link *pl_next; +} dv_paddr_link_t; + +/* + * This defines an extension page of pl entries for FB pages with multiple + * mappings. All such pages (of a domain) are linked together. + */ +typedef struct dv_paddr_link_ext { + struct list_head ext_link; + dv_paddr_link_t entries[ ( PAGE_SIZE - sizeof( struct list_head ) ) / + sizeof( dv_paddr_link_t ) ]; +} dv_paddr_link_ext_t; + +/* + * This defines a single frame buffer range. It bookkeeps all the level 1 PTEs + * that map guest pages within that range. + * All such ranges (of a domain) are linked together. + */ +typedef struct dv_range { + struct list_head range_link; /* the several ranges form a linked list */ + unsigned long begin_pfn; + unsigned long end_pfn; + dv_paddr_link_t *pl_tab; /* table has 1 pl entry per pfn in range */ + int nr_mappings; /* total number of mappings in this range */ + int mappings_hwm; /* high water mark of max mapping count */ + unsigned int dirty_count; +} dv_range_t; + +/* + * This contains all the data structures required by a domain to + * bookkeep the dirty pages within its frame buffers. + */ +typedef struct dv_dirty_vram { + struct list_head range_head; /* head of the linked list of ranges */ + struct list_head ext_head; /* head of list of extension pages */ + dv_paddr_link_t *pl_free; /* free list of pl's within extension pages */ + int nr_ranges; /* bookkeeps number of ranges */ + int ranges_hwm; /* high water mark of max number of ranges */ +} dv_dirty_vram_t; + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d); + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d); + +/* Frees domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d); + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * NULL if none + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Allocate dirty vram range containing [ begin_pfn .. begin_pfn+nr ), + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * creating a range if none already exists and + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +void dirty_vram_range_free(struct domain *d, + dv_range_t *range); + +/* Bookkeep PTE address of a frame buffer page */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set); + +/* + * smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. + */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn); + + +/* + * Scan all the L1 tables looking for VRAM mappings. + * Record them in the domain's dv_dirty_vram structure + */ +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range); + +/* + * Free a paddr_link struct, given address of its + * predecessor in singly-linked list + */ +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl); + + +/* Enable VRAM dirty tracking. */ +int +shadow_track_dirty_vram(struct domain *d, + unsigned long first_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +int +hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +void +hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); + +#endif /* _DIRTY_VRAM_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 916a35b..3e3a1f5 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -57,10 +57,6 @@ void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); void hap_logdirty_init(struct domain *d); -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..6146542 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -74,7 +74,7 @@ struct hvm_domain { struct list_head pinned_cacheattr_ranges; /* VRAM dirty support. */ - struct sh_dirty_vram *dirty_vram; + struct dv_dirty_vram * dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or * mtrr/pat between vcpus is not the same, set is_in_uc_mode diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9a40f2c..f804104 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -137,10 +137,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); @@ -161,6 +161,11 @@ void paging_mark_dirty(struct domain *d, unsigned long guest_mfn); * This is called from inside paging code, with the paging lock held. */ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); +/* mark a page as dirty, from hap page fault handler */ +void paging_mark_dirty_hap(struct domain *d, + unsigned long pfn, + unsigned long guest_mfn); + /* * Log-dirty radix tree indexing: * All tree nodes are PAGE_SIZE bytes, mapped on-demand. @@ -183,15 +188,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); #define L4_LOGDIRTY_IDX(pfn) 0 #endif -/* VRAM dirty tracking support */ -struct sh_dirty_vram { - unsigned long begin_pfn; - unsigned long end_pfn; - paddr_t *sl1ma; - uint8_t *dirty_bitmap; - s_time_t last_dirty; -}; - /***************************************************************************** * Entry points into the paging-assistance code */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 2eb6efc..940d7fd 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -62,12 +62,6 @@ void shadow_vcpu_init(struct vcpu *v); /* Enable an arbitrary shadow mode. Call once at domain creation. */ int shadow_enable(struct domain *d, u32 mode); -/* Enable VRAM dirty bit tracking. */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long first_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); - /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 20:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMu-0000VV-9n; Wed, 07 Nov 2012 20:37:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMs-0000VD-KL for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:36:59 +0000 Received: from [85.158.139.83:61379] by server-15.bemta-5.messagelabs.com id 98/04-26920-966CA905; Wed, 07 Nov 2012 20:36:57 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352320602!29243370!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16827 invoked from network); 7 Nov 2012 20:36:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:36:55 -0000 X-SBRS: -2.2 X-MesageID: 43849546 X-Ironport-Server: ftlpip01.citrite.net X-Remote-IP: 75.150.106.249 X-Policy: $Relay X-IronPort-AV: E=Sophos;i="4.80,732,1344211200"; d="scan'208";a="43849546" Received: from 75-150-106-249-newengland.hfc.comcastbusiness.net (HELO paine.oldroadcomputing.net) ([75.150.106.249]) by SMTP.CITRIX.COM with ESMTP; 07 Nov 2012 20:36:28 +0000 From: Robert Phillips To: xen-devel@lists.xen.org Date: Wed, 7 Nov 2012 15:36:08 -0500 Message-Id: <1352320568-653-1-git-send-email-robert.phillips@citrix.com> X-Mailer: git-send-email 1.7.9.5 Cc: Robert Phillips Subject: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Support is provided for both shadow and hardware assisted paging (HAP) modes. This code bookkeeps the set of video frame buffers (vram), detects when the guest has modified any of those buffers and, upon request, returns a bitmap of the modified pages. This lets other software components re-paint the portions of the monitor (or monitors) that have changed. Each monitor has a frame buffer of some size at some position in guest physical memory. The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. (Version 2 of this patch.) Signed-Off-By: Robert Phillips --- tools/libxc/xenctrl.h | 17 +- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/hvm.c | 4 +- xen/arch/x86/mm/Makefile | 1 + xen/arch/x86/mm/dirty_vram.c | 951 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/hap/hap.c | 140 +----- xen/arch/x86/mm/paging.c | 236 ++++------ xen/arch/x86/mm/shadow/common.c | 335 ++++++++------ xen/arch/x86/mm/shadow/multi.c | 174 ++++--- xen/arch/x86/mm/shadow/multi.h | 7 +- xen/arch/x86/mm/shadow/types.h | 1 + xen/include/asm-x86/dirty_vram.h | 196 ++++++++ xen/include/asm-x86/hap.h | 4 - xen/include/asm-x86/hvm/domain.h | 2 +- xen/include/asm-x86/paging.h | 22 +- xen/include/asm-x86/shadow.h | 6 - 16 files changed, 1535 insertions(+), 563 deletions(-) create mode 100644 xen/arch/x86/mm/dirty_vram.c create mode 100644 xen/include/asm-x86/dirty_vram.h diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7eb5743..693d7fe 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1552,15 +1552,20 @@ int xc_hvm_inject_msi( xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data); /* - * Track dirty bit changes in the VRAM area + * Track dirty bit changes in a VRAM region defined by + * [ first_pfn : first_pfn + nr - 1 ] * * All of this is done atomically: - * - get the dirty bitmap since the last call - * - set up dirty tracking area for period up to the next call - * - clear the dirty tracking area. + * - gets the dirty bitmap since the last call, all zeroes for + * the first call with some new region + * - sets up a dirty tracking region for period up to the next call + * - clears the specified dirty tracking region. * - * Returns -ENODATA and does not fill bitmap if the area has changed since the - * last call. + * Creating a new region causes any existing regions that it overlaps + * to be discarded. + * + * Specifying nr == 0 causes all regions to be discarded and + * disables dirty bit tracking. */ int xc_hvm_track_dirty_vram( xc_interface *xch, domid_t dom, diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index eea5555..e374aac 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -22,4 +22,4 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o \ No newline at end of file +obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 34da2f5..b12e3b6 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -1433,8 +1434,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, */ if ( access_w ) { - paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_mark_dirty_hap(v->domain, gfn, mfn_x(mfn)); } rc = 1; goto out_put_gfn; diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 73dcdf4..becd0c9 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -5,6 +5,7 @@ obj-y += paging.o obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o obj-y += guest_walk_2.o obj-y += guest_walk_3.o +obj-y += dirty_vram.o obj-$(x86_64) += guest_walk_4.o obj-$(x86_64) += mem_event.o obj-$(x86_64) += mem_paging.o diff --git a/xen/arch/x86/mm/dirty_vram.c b/xen/arch/x86/mm/dirty_vram.c new file mode 100644 index 0000000..72bcf4e --- /dev/null +++ b/xen/arch/x86/mm/dirty_vram.c @@ -0,0 +1,951 @@ +/* + * arch/x86/mm/dirty_vram.c: Bookkeep/query dirty VRAM pages + * with support for multiple frame buffers. + * + * Copyright (c) 2012, Citrix Systems, Inc. (Robert Phillips) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ + + +#include +#include +#include +#include +#include +#include "mm-locks.h" + +#define DEBUG_stop_tracking_all_vram 1 +#define DEBUG_allocating_dirty_vram_range 1 +#define DEBUG_high_water_mark_for_vram_ranges 1 +#define DEBUG_freeing_dirty_vram_range 1 +#define DEBUG_allocate_paddr_links_page 0 +#define DEBUG_update_vram_mapping 0 + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram; + ASSERT( paging_locked_by_me(d) ); + dirty_vram = d->arch.hvm_domain.dirty_vram = xzalloc(dv_dirty_vram_t); + if ( dirty_vram ) + { + INIT_LIST_HEAD(&dirty_vram->range_head); + INIT_LIST_HEAD(&dirty_vram->ext_head); + } + return dirty_vram; +} + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( !dirty_vram ) + dirty_vram = dirty_vram_alloc(d); + return dirty_vram; +} + + +/* Free domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr, *next; + /* Free all the ranges */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); +#if DEBUG_stop_tracking_all_vram + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] stop tracking all vram\n", + range->begin_pfn, range->end_pfn); +#endif + xfree(range->pl_tab); + xfree(range); + } + /* Free all the extension pages */ + list_for_each_safe(curr, next, &dirty_vram->ext_head) + { + struct dv_paddr_link_ext *ext = + container_of( + curr, struct dv_paddr_link_ext, ext_link); + struct page_info *pg = __virt_to_page(ext); + d->arch.paging.free_page(d, pg); + } + + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } +} + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn) +{ + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( gfn >= range->begin_pfn && + gfn < range->end_pfn ) + return range; + } + } + return NULL; +} + +/* + * Returns pointer to dirty vram range matching [begin_pfn .. end_pfn ), + * NULL if none. + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( begin_pfn == range->begin_pfn && + end_pfn == range->end_pfn ) + return range; + } + } + return NULL; +} + +/* Allocate specified dirty_vram range */ +static dv_range_t * +_dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range = NULL; + unsigned long end_pfn = begin_pfn + nr; + dv_paddr_link_t *pl_tab = NULL; + int i; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + +#if DEBUG_allocating_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Allocating dirty vram range hap:%d\n", + begin_pfn, end_pfn, + d->arch.hvm_domain.hap_enabled); +#endif + + range = xzalloc(dv_range_t); + if ( range == NULL ) + goto err_out; + + INIT_LIST_HEAD(&range->range_link); + + range->begin_pfn = begin_pfn; + range->end_pfn = end_pfn; + + if ( !hap_enabled(d) ) + { + if ( (pl_tab = xzalloc_array(dv_paddr_link_t, nr)) == NULL ) + goto err_out; + + for ( i = 0; i != nr; i++ ) + { + pl_tab[i].sl1ma = INVALID_PADDR; + } + } + + range->pl_tab = pl_tab; + range->mappings_hwm = 1; + + list_add(&range->range_link, &dirty_vram->range_head); + if ( ++dirty_vram->nr_ranges > dirty_vram->ranges_hwm ) + { + dirty_vram->ranges_hwm = dirty_vram->nr_ranges; +#if DEBUG_high_water_mark_for_vram_ranges + gdprintk(XENLOG_DEBUG, + "High water mark for number of vram ranges is now:%d\n", + dirty_vram->ranges_hwm); +#endif + } + return range; + + err_out: + xfree(pl_tab); + xfree(range); + return NULL; +} + + +/* Frees specified dirty_vram range */ +void dirty_vram_range_free(struct domain *d, + dv_range_t *range) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + int i, nr = range->end_pfn - range->begin_pfn; + +#if DEBUG_freeing_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Freeing dirty vram range\n", + range->begin_pfn, range->end_pfn); +#endif + + if ( range->pl_tab ) + { + for ( i = 0; i != nr; i++ ) + { + dv_paddr_link_t *plx; + plx = range->pl_tab[i].pl_next; + /* Does current FB page have multiple mappings? */ + if ( plx ) /* yes */ + { + /* Find the last element in singly-linked list */ + while ( plx->pl_next != NULL ) + plx = plx->pl_next; + + /* Prepend whole list to the free list */ + plx->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = range->pl_tab[i].pl_next; + } + } + xfree(range->pl_tab); + range->pl_tab = NULL; + } + + /* Remove range from the linked list, free it, and adjust count*/ + list_del(&range->range_link); + xfree(range); + dirty_vram->nr_ranges--; + } +} + +/* + * dirty_vram_range_alloc() + * This function ensures that the new range does not overlap any existing + * ranges -- deleting them if necessary -- and then calls + * _dirty_vram_range_alloc to actually allocate the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + struct list_head *curr, *next; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + + /* + * Ranges cannot overlap so + * free any range that overlaps [ begin_pfn .. end_pfn ) + */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *rng = list_entry(curr, dv_range_t, range_link); + if ( ( ( rng->begin_pfn <= begin_pfn ) && + ( begin_pfn < rng->end_pfn ) + ) || + ( ( begin_pfn <= rng->begin_pfn ) && + ( rng->begin_pfn < end_pfn ) + ) ) + { + /* Different tracking, tear the previous down. */ + dirty_vram_range_free(d, rng); + } + } + + range = _dirty_vram_range_alloc(d, begin_pfn, nr); + if ( !range ) + goto out; + + out: + return range; +} + +/* + * dirty_vram_range_find_or_alloc() + * Find the range for [begin_pfn:begin_pfn+nr). + * If it doesn't exists, create it. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_range_t *range; + ASSERT( paging_locked_by_me(d) ); + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + range = dirty_vram_range_alloc(d, begin_pfn, nr); + + return range; +} + + + +/* Allocate a dv_paddr_link struct */ +static dv_paddr_link_t * +alloc_paddr_link(struct domain *d) +{ + dv_paddr_link_t * pl = NULL; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + + ASSERT( paging_locked_by_me(d) ); + BUILD_BUG_ON(sizeof(dv_paddr_link_ext_t) > PAGE_SIZE); + /* Is the list of free pl's empty? */ + if ( dirty_vram->pl_free == NULL ) /* yes */ + { + /* + * Allocate another page of pl's. + * Link them all together and point the free list head at them + */ + int i; + struct page_info *pg = d->arch.paging.alloc_page(d); + dv_paddr_link_ext_t *ext = __page_to_virt(pg); + if ( ext == NULL ) + goto out; + +#if DEBUG_allocate_paddr_links_page + gdprintk(XENLOG_DEBUG, "Allocated another page of paddr_links\n"); +#endif + list_add(&ext->ext_link, &dirty_vram->ext_head); + + /* initialize and link together the new pl entries */ + for ( i = 0; i != ARRAY_SIZE(ext->entries); i++ ) + { + ext->entries[i].sl1ma = INVALID_PADDR; + ext->entries[i].pl_next = &ext->entries[i+1]; + } + ext->entries[ARRAY_SIZE(ext->entries) - 1].pl_next = NULL; + dirty_vram->pl_free = &ext->entries[0]; + } + pl = dirty_vram->pl_free; + dirty_vram->pl_free = pl->pl_next; + + pl->sl1ma = INVALID_PADDR; + pl->pl_next = NULL; + out: + return pl; +} + + +/* + * Free a paddr_link struct. + * + * The caller has walked the singly-linked list of elements + * that have, as their head, an element in a pl_tab cell. + * The list walks has reached the element to be freed. + * (Each element is a dv_paddr_link_t struct.) + * + * @pl points to the element to be freed. + * @ppl points to its predecessor element's next member. + * + * After linking the precessor to the element's successor, + * we can free @pl by prepending it to the list of free + * elements. + * + * As a boundary case (which happens to be the common case), + * @pl points to a cell in the pl_tab rather than to some + * extension element danging from that cell. + * We recognize this case because @ppl is NULL. + * In that case we promote the first extension element by + * copying it into the pl_tab cell and free it. + */ + +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_paddr_link_t *npl; /* next pl */ + + ASSERT( paging_locked_by_me(d) ); + /* extension mapping? */ + if ( ppl ) /* yes. free it */ + { + ASSERT(pl == (*ppl)); + (*ppl) = npl = pl->pl_next; + } + else /* main table */ + { + /* + * move 2nd mapping to main table. + * and free 2nd mapping + */ + dv_paddr_link_t * spl; + spl = pl->pl_next; + if ( spl == NULL ) + { + pl->sl1ma = INVALID_PADDR; + return pl; + } + pl->sl1ma = spl->sl1ma; + pl->pl_next = spl->pl_next; + npl = pl; /* reprocess main table entry again */ + pl = spl; + } + pl->sl1ma = INVALID_PADDR; + pl->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = pl; + return npl; +} + + +/* + * dirty_vram_range_update() + * + * This is called whenever a level 1 page table entry is modified. + * If the L1PTE is being cleared, the function removes any paddr_links + * that refer to it. + * If the L1PTE is being set to a frame buffer page, a paddr_link is + * created for that page's entry in pl_tab. + * Returns 1 iff entry found and set or cleared. + */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set) +{ + int effective = 0; + dv_range_t *range; + unsigned long i; + dv_paddr_link_t *pl; + dv_paddr_link_t **ppl; + int len = 0; + + ASSERT(paging_locked_by_me(d)); + range = dirty_vram_range_find_gfn(d, gfn); + if ( !range ) + return effective; + + + i = gfn - range->begin_pfn; + pl = &range->pl_tab[ i ]; + ppl = NULL; + + /* + * find matching entry (pl), if any, and its predecessor + * in linked list (ppl) + */ + while ( pl != NULL ) + { + if ( pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) + break; + + ppl = &pl->pl_next; + pl = *ppl; + len++; + } + + if ( set ) + { + /* Did we find sl1ma in either the main table or the linked list? */ + if ( pl == NULL ) /* no, so we'll need to alloc a link */ + { + ASSERT(ppl != NULL); + /* + * Have we reached the limit of mappings we're willing + * to bookkeep? + */ + if (len > DV_ADDR_LINK_LIST_LIMIT) /* yes */ + /* + * The side effect of failing to record this mapping + * is that we will not detect any changes to the frame + * buffer made through the mapping so + * areas of a monitor may not get refreshed. + * In practice this should never happen. + */ + goto out; + + /* alloc link and append it to list */ + (*ppl) = pl = alloc_paddr_link(d); + if ( pl == NULL ) + goto out; + } + if ( pl->sl1ma != sl1ma ) + { + ASSERT(pl->sl1ma == INVALID_PADDR); + pl->sl1ma = sl1ma; + range->nr_mappings++; + } + effective = 1; + if ( len > range->mappings_hwm ) + { + range->mappings_hwm = len; +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", + gfn, sl1ma, + range->mappings_hwm, + range->nr_mappings, + d->arch.paging.shadow.free_pages); +#endif + } + } + else /* clear */ + { + if ( pl && pl->sl1ma == sl1ma ) + { +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] clear sl1ma:%lx mappings:%d\n", + gfn, sl1ma, + range->nr_mappings - 1); +#endif + free_paddr_link(d, ppl, pl); + if ( --range->nr_mappings == 0 ) + { + dirty_vram_range_free(d, range); + } + effective = 1; + } + } + out: + return effective; +} + + +/* + * shadow_scan_dirty_flags() + * This produces a dirty bitmap for the range by examining every + * L1PTE referenced by some dv_paddr_link in the range's pl_tab table. + * It tests and clears each such L1PTE's dirty flag. + */ +static int shadow_scan_dirty_flags(struct domain *d, + dv_range_t *range, + uint8_t *dirty_bitmap) +{ + int flush_tlb = 0; + unsigned long i; + unsigned long nr = range->end_pfn - range->begin_pfn; + + ASSERT( paging_locked_by_me(d) ); + /* Iterate over VRAM to track dirty bits. */ + for ( i = 0; i < nr; i++ ) + { + int dirty = 0, len = 1; + dv_paddr_link_t *pl; + for ( pl = &range->pl_tab[i]; pl; pl = pl->pl_next, len++ ) + { + l1_pgentry_t *sl1e; + paddr_t sl1ma = pl->sl1ma; + if (sl1ma == INVALID_PADDR) /* FB page is unmapped */ + continue; + sl1e = maddr_to_virt(sl1ma); + if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) + { + dirty = 1; + /* Clear dirty so we can detect if page gets re-dirtied. + * Note: this is atomic, so we may clear a + * _PAGE_ACCESSED set by another processor. + */ + l1e_remove_flags(*sl1e, _PAGE_DIRTY); + flush_tlb = 1; + } + } /* for */ + + if ( dirty ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + + } + + return flush_tlb; +} + + +/* + * shadow_track_dirty_vram() + * This is the API called by the guest to determine which pages in the range + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. + * It creates the domain's dv_dirty_vram on demand. + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). + * It copies the dirty bitmask into guest storage. + */ +int shadow_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + int rc = 0; + unsigned long end_pfn = begin_pfn + nr; + int flush_tlb = 0; + dv_range_t *range; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + /* + * This range test is tricky. + * + * The range [begin_pfn..end_pfn) is an open interval, so end_pfn is a pfn + * beyond the end of the range. + * + * p2m->max_mapped_pfn is a valid PFN so p2m->max_mapped_pfn + 1 is an + * invalid PFN. + * + * If end_pfn is beyond *that* then the range is invalid. + */ + if ( end_pfn < begin_pfn + || begin_pfn > p2m->max_mapped_pfn + || end_pfn > p2m->max_mapped_pfn + 1 ) + return -EINVAL; + + paging_lock(d); + + if (!nr) + { + dirty_vram_free(d); + goto out; + } + + if ( guest_handle_is_null(guest_dirty_bitmap) ) + goto out; + + if ( !dirty_vram_find_or_alloc(d) ) + { + rc = -ENOMEM; + goto out; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + range = dirty_vram_range_alloc(d, begin_pfn, nr); + if ( range ) + sh_find_all_vram_mappings(d->vcpu[0], range); + } + if ( range ) + { + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; + unsigned long dirty_bitmap[size]; + + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); + + flush_tlb |= shadow_scan_dirty_flags(d, range, (uint8_t*)dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + (uint8_t*)dirty_bitmap, + size * BYTES_PER_LONG) == 0 ) + rc = 0; + } + + if ( flush_tlb ) + flush_tlb_mask(d->domain_dirty_cpumask); + +out: + paging_unlock(d); + return rc; +} + + +/************************************************/ +/* HAP VRAM TRACKING SUPPORT */ +/************************************************/ + +/* + * hap_enable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-only. + */ +static int hap_enable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + /* turn on PG_log_dirty bit in paging mode */ + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + + /* + * dirty_vram != NULL iff we're tracking dirty vram. + * If we start tracking dirty pages for all memory then + * the dirty_vram structure is freed. + */ + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table to be read-only. */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] enable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_rw, p2m_ram_logdirty); + } + + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_disable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-write. + */ +static int hap_disable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table with normal mode */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] disable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_logdirty, p2m_ram_rw); + } + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_clean_vram_tracking_range() + * For all the pages in the range specified by [begin_pfn,nr), + * note in the dirty bitmap any page that has been marked as read-write, + * which signifies that the page has been dirtied, and reset the page + * to ram_logdirty. + */ +void hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) +{ + int i; + unsigned long pfn; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); + ASSERT(paging_locked_by_me(d)); + + if ( !dirty_vram ) + { + gdprintk(XENLOG_DEBUG, + "Should only be called while tracking dirty vram.\n"); + return; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + return; + + /* set l1e entries of P2M table to be read-only. */ + /* + * On first write, it page faults, its entry is changed to read-write, + * its bit in the dirty bitmap is set, and on retry the write succeeds. + */ + for ( i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++ ) + { + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + } + flush_tlb_mask(d->domain_dirty_cpumask); +} + +static void hap_vram_tracking_init(struct domain *d) +{ + paging_log_dirty_init(d, hap_enable_vram_tracking, + hap_disable_vram_tracking, + NULL); +} + +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(). + */ +int hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + long rc = 0; + dv_dirty_vram_t *dirty_vram; + + paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( nr ) + { + dv_range_t *range = NULL; + int size = ( nr + BITS_PER_LONG - 1 ) & ~( BITS_PER_LONG - 1 ); + uint8_t dirty_bitmap[size]; + + /* Already tracking dirty vram? */ + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ + { + /* Handle the addition of another range */ + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + rc = -ENOMEM; + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) + goto param_fail; + } + } + /* Just starting to track dirty vram? */ + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ + { + rc = -ENOMEM; + if ( !(dirty_vram = dirty_vram_alloc(d)) ) + goto param_fail; + + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) + goto param_fail; + + /* Initialize callbacks for vram tracking */ + hap_vram_tracking_init(d); + + /* Enable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_enable(d); + paging_lock(d); + + if ( rc != 0 ) + goto param_fail; + } + else + { + /* Test for invalid combination */ + if ( !paging_mode_log_dirty(d) && dirty_vram ) + rc = -EINVAL; + else /* logging dirty of all memory, not tracking dirty vram */ + rc = -ENODATA; + goto param_fail; + } + + paging_unlock(d); + memset(dirty_bitmap, 0x00, size); + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + dirty_bitmap, + size) == 0 ) + { + rc = 0; + } + } + else + { + /* + * If zero pages specified while already tracking dirty vram + * then stop tracking + */ + if ( paging_mode_log_dirty(d) && dirty_vram ) + { + /* Disable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_disable(d); + paging_lock(d); + + dirty_vram_free(d); + } + else /* benign no-op */ + { + rc = 0; + } + paging_unlock(d); + } + + return rc; + +param_fail: + dirty_vram_free(d); + paging_unlock(d); + return rc; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index fd99cde..09cdba2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "private.h" @@ -53,139 +54,6 @@ #define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) /************************************************/ -/* HAP VRAM TRACKING SUPPORT */ -/************************************************/ - -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} - -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( nr ) - { - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) - { - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; - - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - else - { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; - } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); - } - else - { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } - - return rc; - -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } - return rc; -} - -/************************************************/ /* HAP LOG DIRTY SUPPORT */ /************************************************/ @@ -223,14 +91,12 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; if ( paging_mode_log_dirty(d) && dirty_vram ) { paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + dirty_vram_free(d); } - /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, hap_disable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ea44e39..5e76609 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -278,6 +279,46 @@ out: } +/* paging_mark_dirty_hap() + * Make a hap page writeable and mark it as dirty. + * This done atomically under the p2m and paging locks to avoid leaving + * a window where the page might be modified without being counted as dirty. + */ +void paging_mark_dirty_hap(struct domain *d, + unsigned long pfn, + unsigned long guest_mfn) +{ + mfn_t gmfn; + p2m_type_t pt; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + if ( !paging_mode_log_dirty(d) ) + return; + + gmfn = _mfn(guest_mfn); + + ASSERT( mfn_valid(gmfn) && + page_get_owner(mfn_to_page(gmfn)) == d ); + + p2m_lock(p2m); + pt = p2m_change_type(d, pfn, p2m_ram_logdirty, p2m_ram_rw); + paging_lock(d); + if ( pt == p2m_ram_logdirty ) + { + dv_range_t *range; + PAGING_DEBUG(LOGDIRTY, + "marked mfn %" PRI_mfn " (pfn=%lx), dom %d\n", + mfn_x(gmfn), pfn, d->domain_id); + d->arch.paging.log_dirty.dirty_count++; + range = dirty_vram_range_find_gfn(d, pfn); + if ( range ) + range->dirty_count++; + } + paging_mark_dirty(d, guest_mfn); + paging_unlock(d); + p2m_unlock(p2m); +} + /* Is this guest page dirty? */ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) { @@ -333,8 +374,11 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) mfn_t *l4, *l3, *l2; unsigned long *l1; int i4, i3, i2; + struct p2m_domain *p2m = p2m_get_hostp2m(d); domain_pause(d); + /* Locking hierarchy requires p2m lock to be taken first */ + p2m_lock(p2m); paging_lock(d); clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); @@ -345,6 +389,14 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) d->arch.paging.log_dirty.fault_count, d->arch.paging.log_dirty.dirty_count); + if ( hap_enabled(d) && d->arch.hvm_domain.dirty_vram ) + { + /* If we're cleaning/peeking all guest memory, we should not be tracking + * dirty vram. */ + rv = -EINVAL; + goto out; + } + sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; @@ -424,170 +476,64 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) if ( clean ) { - /* We need to further call clean_dirty_bitmap() functions of specific - * paging modes (shadow or hap). Safe because the domain is paused. */ - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + /* Is null if tracking dirty vram */ + if ( d->arch.paging.log_dirty.clean_dirty_bitmap ) + { + /* + * We need to call clean_dirty_bitmap() functions of specific + * paging modes (shadow or hap). + * Safe because the domain is paused. + */ + d->arch.paging.log_dirty.clean_dirty_bitmap(d); + } } domain_unpause(d); return rv; out: paging_unlock(d); + p2m_unlock(p2m); domain_unpause(d); return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + dv_range_t *range; + unsigned int range_dirty_count = 0; + + p2m_lock(p2m); paging_lock(d); - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); - - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); - - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + /* Only called when tracking dirty vram in HAP mode */ + ASSERT(hap_enabled(d) && d->arch.hvm_domain.dirty_vram); + + range = dirty_vram_range_find_gfn(d, begin_pfn); + if ( range ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + range_dirty_count = range->dirty_count; + range->dirty_count = 0; } - if ( l4 ) - unmap_domain_page(l4); - - paging_unlock(d); + + if ( !range_dirty_count) + goto out; - return rv; + PAGING_DEBUG(LOGDIRTY, + "log-dirty-range: dom %u [%05lx:%05lx] range_dirty=%u\n", + d->domain_id, + begin_pfn, + range->end_pfn, + range_dirty_count); + hap_clean_vram_tracking_range(d, begin_pfn, nr, dirty_bitmap); out: paging_unlock(d); - return rv; + p2m_unlock(p2m); + return; } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index ce79131..4e40f43 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "private.h" @@ -3121,12 +3122,7 @@ void shadow_teardown(struct domain *d) * calls now that we've torn down the bitmap */ d->arch.paging.mode &= ~PG_log_dirty; - if (d->arch.hvm_domain.dirty_vram) { - xfree(d->arch.hvm_domain.dirty_vram->sl1ma); - xfree(d->arch.hvm_domain.dirty_vram->dirty_bitmap); - xfree(d->arch.hvm_domain.dirty_vram); - d->arch.hvm_domain.dirty_vram = NULL; - } + dirty_vram_free(d); paging_unlock(d); @@ -3463,179 +3459,212 @@ void shadow_clean_dirty_bitmap(struct domain *d) /**************************************************************************/ -/* VRAM dirty tracking support */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - int rc; - unsigned long end_pfn = begin_pfn + nr; - unsigned long dirty_size = (nr + 7) / 8; - int flush_tlb = 0; - unsigned long i; - p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - if (end_pfn < begin_pfn - || begin_pfn > p2m->max_mapped_pfn - || end_pfn >= p2m->max_mapped_pfn) - return -EINVAL; - - /* We perform p2m lookups, so lock the p2m upfront to avoid deadlock */ - p2m_lock(p2m_get_hostp2m(d)); - paging_lock(d); +/* Support functions for shadow-based dirty VRAM code */ - if ( dirty_vram && (!nr || - ( begin_pfn != dirty_vram->begin_pfn - || end_pfn != dirty_vram->end_pfn )) ) - { - /* Different tracking, tear the previous down. */ - gdprintk(XENLOG_INFO, "stopping tracking VRAM %lx - %lx\n", dirty_vram->begin_pfn, dirty_vram->end_pfn); - xfree(dirty_vram->sl1ma); - xfree(dirty_vram->dirty_bitmap); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } +#define DEBUG_unshadow_sl1ma 0 +#define DEBUG_unshadow_sl1ma_detail 0 +#define DEBUG_count_initial_mappings 1 - if ( !nr ) +/* smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn) +{ + static unsigned int l1_shadow_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + struct domain *d = v->domain; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr, *next; + + ASSERT(paging_locked_by_me(d)); + /* Ignore all but level 1 shadows */ + + if ( (l1_shadow_mask & (1 << shadow_type)) == 0 ) { - rc = 0; goto out; } - /* This should happen seldomly (Video mode change), - * no need to be careful. */ + dirty_vram = d->arch.hvm_domain.dirty_vram; if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them - * up to nr times getting rid of mappings of each pfn */ - shadow_blow_tables(d); - - gdprintk(XENLOG_INFO, "tracking VRAM %lx - %lx\n", begin_pfn, end_pfn); - - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto out; - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = end_pfn; - d->arch.hvm_domain.dirty_vram = dirty_vram; - - if ( (dirty_vram->sl1ma = xmalloc_array(paddr_t, nr)) == NULL ) - goto out_dirty_vram; - memset(dirty_vram->sl1ma, ~0, sizeof(paddr_t) * nr); - - if ( (dirty_vram->dirty_bitmap = xzalloc_array(uint8_t, dirty_size)) == NULL ) - goto out_sl1ma; - - dirty_vram->last_dirty = NOW(); - - /* Tell the caller that this time we could not track dirty bits. */ - rc = -ENODATA; - } - else if (dirty_vram->last_dirty == -1) - { - /* still completely clean, just copy our empty bitmap */ - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) - rc = 0; + goto out; } - else + + list_for_each_safe(curr, next, &dirty_vram->range_head) { - /* Iterate over VRAM to track dirty bits. */ - for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); - struct page_info *page; - int dirty = 0; - paddr_t sl1ma = dirty_vram->sl1ma[i]; - - if (mfn_x(mfn) == INVALID_MFN) - { - dirty = 1; - } - else + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + unsigned long i; + int max_mappings = 1, mappings = 0; + int unshadowed = 0; + for ( i = 0; i != range->end_pfn - range->begin_pfn; i++ ) + { + dv_paddr_link_t *pl = &range->pl_tab[ i ]; + dv_paddr_link_t **ppl = NULL; + mappings = 0; + + while ( pl != NULL ) { - page = mfn_to_page(mfn); - switch (page->u.inuse.type_info & PGT_count_mask) - { - case 0: - /* No guest reference, nothing to track. */ - break; - case 1: - /* One guest reference. */ - if ( sl1ma == INVALID_PADDR ) - { - /* We don't know which sl1e points to this, too bad. */ - dirty = 1; - /* TODO: Heuristics for finding the single mapping of - * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); - } - else - { - /* Hopefully the most common case: only one mapping, - * whose dirty bit we can use. */ - l1_pgentry_t *sl1e = maddr_to_virt(sl1ma); - - if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) - { - dirty = 1; - /* Note: this is atomic, so we may clear a - * _PAGE_ACCESSED set by another processor. */ - l1e_remove_flags(*sl1e, _PAGE_DIRTY); - flush_tlb = 1; - } - } - break; - default: - /* More than one guest reference, - * we don't afford tracking that. */ - dirty = 1; + paddr_t sl1ma = pl->sl1ma; + unsigned long sl1mn; + + if ( sl1ma == INVALID_PADDR ) break; + + sl1mn = sl1ma >> PAGE_SHIFT; + if ( sl1mn == mfn_x(smfn) ) { +#if DEBUG_unshadow_sl1ma_detail + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%lx] unshadow sl1ma:%lx\n", + mfn_x(smfn), + range->begin_pfn + i, + sl1ma); +#endif + unshadowed++; + pl = free_paddr_link(d, ppl, pl); + --range->nr_mappings; + } + else + { + ppl = &pl->pl_next; + pl = *ppl; + mappings++; } } - - if ( dirty ) + } + if ( mappings > max_mappings ) + max_mappings = mappings; + + if ( unshadowed ) { +#if DEBUG_unshadow_sl1ma + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%05lx:%05lx] unshadowed:%d mappings:0x%x max_mappings:%d\n", + mfn_x(smfn), + range->begin_pfn, range->end_pfn, + unshadowed, range->nr_mappings, max_mappings); +#endif + if ( range->nr_mappings == 0 ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + dirty_vram_range_free(d, range); } } + } + out: + return; +} + + +typedef int (*hash_pfn_callback_t)(struct vcpu *v, + mfn_t smfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); + +static int hash_pfn_foreach(struct vcpu *v, + unsigned int callback_mask, + hash_pfn_callback_t callbacks[], + unsigned long begin_pfn, + unsigned long end_pfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0, removed = 0; + struct domain *d = v->domain; + struct page_info *x; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(paging_locked_by_me(d)); + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i = begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); - } - dirty_vram->last_dirty = -1; + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](v, page_to_mfn(x), + begin_pfn, end_pfn, + &removed); + if ( done ) break; } - rc = 0; } + if ( done ) break; } - if ( flush_tlb ) - flush_tlb_mask(d->domain_dirty_cpumask); - goto out; + d->arch.paging.shadow.hash_walking = 0; + return removed; +} -out_sl1ma: - xfree(dirty_vram->sl1ma); -out_dirty_vram: - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range) +{ + /* Dispatch table for getting per-type functions */ + static hash_pfn_callback_t callbacks[SH_type_unused] = { + NULL, /* none */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* l1_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* fl1_32 */ + NULL, /* l2_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* l1_pae */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* fl1_pae */ + NULL, /* l2_pae */ + NULL, /* l2h_pae */ +#if CONFIG_PAGING_LEVELS >= 4 + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* l1_64 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* fl1_64 */ +#else + NULL, /* l1_64 */ + NULL, /* fl1_64 */ +#endif + NULL, /* l2_64 */ + NULL, /* l2h_64 */ + NULL, /* l3_64 */ + NULL, /* l4_64 */ + NULL, /* p2m */ + NULL /* unused */ + }; -out: - paging_unlock(d); - p2m_unlock(p2m_get_hostp2m(d)); - return rc; + static unsigned int callback_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + + perfc_incr(shadow_mappings); + + hash_pfn_foreach(v, callback_mask, callbacks, + range->begin_pfn, + range->end_pfn); + +#if DEBUG_count_initial_mappings + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] count of initial mappings:%d\n", + range->begin_pfn, range->end_pfn, + range->nr_mappings); +#endif } + /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..9c00574 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +150,10 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } @@ -160,6 +165,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) @@ -516,7 +525,6 @@ _sh_propagate(struct vcpu *v, guest_l1e_t guest_entry = { guest_intpte }; shadow_l1e_t *sp = shadow_entry_ptr; struct domain *d = v->domain; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; gfn_t target_gfn = guest_l1e_get_gfn(guest_entry); u32 pass_thru_flags; u32 gflags, sflags; @@ -663,17 +671,6 @@ _sh_propagate(struct vcpu *v, } } - if ( unlikely((level == 1) && dirty_vram - && dirty_vram->last_dirty == -1 - && gfn_x(target_gfn) >= dirty_vram->begin_pfn - && gfn_x(target_gfn) < dirty_vram->end_pfn) ) - { - if ( ft & FETCH_TYPE_WRITE ) - dirty_vram->last_dirty = NOW(); - else - sflags &= ~_PAGE_RW; - } - /* Read-only memory */ if ( p2m_is_readonly(p2mt) || (p2mt == p2m_mmio_direct && @@ -1072,101 +1069,60 @@ static int shadow_set_l2e(struct vcpu *v, return flags; } -static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, +/* shadow_vram_fix_l1e() + * + * Tests L1PTEs as they are modified, looking for when they start to + * (or cease to) point to frame buffer pages. If the old and new gfns differ, + * calls dirty_vram_range_update() to updates the dirty_vram structures. + */ +static inline void shadow_vram_fix_l1e(shadow_l1e_t old_sl1e, + shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) { - mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); - int flags = shadow_l1e_get_flags(new_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + mfn_t new_mfn, old_mfn; + unsigned long new_gfn = INVALID_M2P_ENTRY, old_gfn = INVALID_M2P_ENTRY; + paddr_t sl1ma; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ + if ( !dirty_vram ) return; - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); + sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) | ((unsigned long)sl1e & ~PAGE_MASK); - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + old_mfn = shadow_l1e_get_mfn(old_sl1e); + + if ( !sh_l1e_is_magic(old_sl1e) && + (l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && + mfn_valid(old_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - /* Initial guest reference, record it */ - dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + old_gfn = mfn_to_gfn(d, old_mfn); } -} - -static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, - shadow_l1e_t *sl1e, - mfn_t sl1mfn, - struct domain *d) -{ - mfn_t mfn = shadow_l1e_get_mfn(old_sl1e); - int flags = shadow_l1e_get_flags(old_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ - return; - - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); - - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + + new_mfn = shadow_l1e_get_mfn(new_sl1e); + if ( !sh_l1e_is_magic(new_sl1e) && + (l1e_get_flags(new_sl1e) & _PAGE_PRESENT) && + mfn_valid(new_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - int dirty = 0; - paddr_t sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + new_gfn = mfn_to_gfn(d, new_mfn); + } - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - { - /* Last reference */ - if ( dirty_vram->sl1ma[i] == INVALID_PADDR ) { - /* We didn't know it was that one, let's say it is dirty */ - dirty = 1; - } - else - { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); - dirty_vram->sl1ma[i] = INVALID_PADDR; - if ( flags & _PAGE_DIRTY ) - dirty = 1; - } - } - else + if ( old_gfn == new_gfn ) return; + + if ( VALID_M2P(old_gfn) ) + if ( dirty_vram_range_update(d, old_gfn, sl1ma, 0/*clear*/) ) { - /* We had more than one reference, just consider the page dirty. */ - dirty = 1; - /* Check that it's not the one we recorded. */ - if ( dirty_vram->sl1ma[i] == sl1ma ) - { - /* Too bad, we remembered the wrong one... */ - dirty_vram->sl1ma[i] = INVALID_PADDR; - } - else - { - /* Ok, our recorded sl1e is still pointing to this page, let's - * just hope it will remain. */ - } + SHADOW_PRINTK("gfn %lx (mfn %lx) cleared vram pte\n", + old_gfn, mfn_x(old_mfn)); } - if ( dirty ) + + if ( VALID_M2P(new_gfn) ) + if ( dirty_vram_range_update(d, new_gfn, sl1ma, 1/*set*/) ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + SHADOW_PRINTK("gfn %lx (mfn %lx) set vram pte\n", + new_gfn, mfn_x(new_mfn)); } - } } static int shadow_set_l1e(struct vcpu *v, @@ -1211,12 +1167,13 @@ static int shadow_set_l1e(struct vcpu *v, shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); /* fall through */ case 0: - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); break; } } } + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); + /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; @@ -1231,7 +1188,6 @@ static int shadow_set_l1e(struct vcpu *v, * trigger a flush later. */ if ( shadow_mode_refcounts(d) ) { - shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); } @@ -2018,7 +1974,6 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { - shadow_vram_put_l1e(*sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(*sl1e, d); } }); @@ -4336,6 +4291,37 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) return done; } + +int sh_find_vram_mappings_in_l1(struct vcpu *v, + mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed) +/* Find all VRAM mappings in this shadow l1 table */ +{ + struct domain *d = v->domain; + shadow_l1e_t *sl1e; + int done = 0; + + /* only returns _PAGE_PRESENT entries */ + SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, done, + { + unsigned long gfn; + mfn_t gmfn = shadow_l1e_get_mfn(*sl1e); + if ( !mfn_valid(gmfn) ) + continue; + gfn = mfn_to_gfn(d, gmfn); + if ( VALID_M2P(gfn) && (begin_pfn <= gfn) && (gfn < end_pfn) ) + { + paddr_t sl1ma = + pfn_to_paddr(mfn_x(sl1mfn)) | + ( (unsigned long)sl1e & ~PAGE_MASK ); + dirty_vram_range_update(v->domain, gfn, sl1ma, 1/*set*/); + } + }); + return 0; +} + /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 835121e..436a4ac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -66,7 +66,12 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); - +extern int +SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, GUEST_LEVELS) + (struct vcpu *v, mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) (struct vcpu *v, void *ep, mfn_t smfn); diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 43ce1db..5b0f9f7 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -229,6 +229,7 @@ static inline shadow_l4e_t shadow_l4e_from_mfn(mfn_t mfn, u32 flags) #define sh_update_cr3 INTERNAL_NAME(sh_update_cr3) #define sh_rm_write_access_from_l1 INTERNAL_NAME(sh_rm_write_access_from_l1) #define sh_rm_mappings_from_l1 INTERNAL_NAME(sh_rm_mappings_from_l1) +#define sh_find_vram_mappings_in_l1 INTERNAL_NAME(sh_find_vram_mappings_in_l1) #define sh_remove_l1_shadow INTERNAL_NAME(sh_remove_l1_shadow) #define sh_remove_l2_shadow INTERNAL_NAME(sh_remove_l2_shadow) #define sh_remove_l3_shadow INTERNAL_NAME(sh_remove_l3_shadow) diff --git a/xen/include/asm-x86/dirty_vram.h b/xen/include/asm-x86/dirty_vram.h new file mode 100644 index 0000000..7f3ccf9 --- /dev/null +++ b/xen/include/asm-x86/dirty_vram.h @@ -0,0 +1,196 @@ +/****************************************************************************** + * include/asm-x86/dirty_vram.h + * + * Interface for tracking dirty VRAM pages + * + * Copyright (c) 2012 Citrix Systems, Inc. (Robert Phillips) + * Parts of this code are Copyright (c) 2006 by XenSource Inc. + * Parts of this code are Copyright (c) 2006 by Michael A Fetterman + * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DIRTY_VRAM_H +#define _DIRTY_VRAM_H + +/* + * In shadow mode we need to bookkeep all the L1 page table entries that + * map a frame buffer page. Struct dv_paddr_link does this + * by recording the address of a L1 page table entry for some frame buffer page. + * Also has a link to additional pl entries if the frame buffer page + * has multiple mappings. + * In practice very few pages have multiple mappings. + * But to rule out some pathological situation, we limit the number of + * mappings we're willing to bookkeep. + */ + +#define DV_ADDR_LINK_LIST_LIMIT 20 + +typedef struct dv_paddr_link { + paddr_t sl1ma; + struct dv_paddr_link *pl_next; +} dv_paddr_link_t; + +/* + * This defines an extension page of pl entries for FB pages with multiple + * mappings. All such pages (of a domain) are linked together. + */ +typedef struct dv_paddr_link_ext { + struct list_head ext_link; + dv_paddr_link_t entries[ ( PAGE_SIZE - sizeof( struct list_head ) ) / + sizeof( dv_paddr_link_t ) ]; +} dv_paddr_link_ext_t; + +/* + * This defines a single frame buffer range. It bookkeeps all the level 1 PTEs + * that map guest pages within that range. + * All such ranges (of a domain) are linked together. + */ +typedef struct dv_range { + struct list_head range_link; /* the several ranges form a linked list */ + unsigned long begin_pfn; + unsigned long end_pfn; + dv_paddr_link_t *pl_tab; /* table has 1 pl entry per pfn in range */ + int nr_mappings; /* total number of mappings in this range */ + int mappings_hwm; /* high water mark of max mapping count */ + unsigned int dirty_count; +} dv_range_t; + +/* + * This contains all the data structures required by a domain to + * bookkeep the dirty pages within its frame buffers. + */ +typedef struct dv_dirty_vram { + struct list_head range_head; /* head of the linked list of ranges */ + struct list_head ext_head; /* head of list of extension pages */ + dv_paddr_link_t *pl_free; /* free list of pl's within extension pages */ + int nr_ranges; /* bookkeeps number of ranges */ + int ranges_hwm; /* high water mark of max number of ranges */ +} dv_dirty_vram_t; + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d); + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d); + +/* Frees domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d); + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * NULL if none + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Allocate dirty vram range containing [ begin_pfn .. begin_pfn+nr ), + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * creating a range if none already exists and + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +void dirty_vram_range_free(struct domain *d, + dv_range_t *range); + +/* Bookkeep PTE address of a frame buffer page */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set); + +/* + * smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. + */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn); + + +/* + * Scan all the L1 tables looking for VRAM mappings. + * Record them in the domain's dv_dirty_vram structure + */ +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range); + +/* + * Free a paddr_link struct, given address of its + * predecessor in singly-linked list + */ +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl); + + +/* Enable VRAM dirty tracking. */ +int +shadow_track_dirty_vram(struct domain *d, + unsigned long first_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +int +hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +void +hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); + +#endif /* _DIRTY_VRAM_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 916a35b..3e3a1f5 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -57,10 +57,6 @@ void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); void hap_logdirty_init(struct domain *d); -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..6146542 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -74,7 +74,7 @@ struct hvm_domain { struct list_head pinned_cacheattr_ranges; /* VRAM dirty support. */ - struct sh_dirty_vram *dirty_vram; + struct dv_dirty_vram * dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or * mtrr/pat between vcpus is not the same, set is_in_uc_mode diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9a40f2c..f804104 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -137,10 +137,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); @@ -161,6 +161,11 @@ void paging_mark_dirty(struct domain *d, unsigned long guest_mfn); * This is called from inside paging code, with the paging lock held. */ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); +/* mark a page as dirty, from hap page fault handler */ +void paging_mark_dirty_hap(struct domain *d, + unsigned long pfn, + unsigned long guest_mfn); + /* * Log-dirty radix tree indexing: * All tree nodes are PAGE_SIZE bytes, mapped on-demand. @@ -183,15 +188,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); #define L4_LOGDIRTY_IDX(pfn) 0 #endif -/* VRAM dirty tracking support */ -struct sh_dirty_vram { - unsigned long begin_pfn; - unsigned long end_pfn; - paddr_t *sl1ma; - uint8_t *dirty_bitmap; - s_time_t last_dirty; -}; - /***************************************************************************** * Entry points into the paging-assistance code */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 2eb6efc..940d7fd 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -62,12 +62,6 @@ void shadow_vcpu_init(struct vcpu *v); /* Enable an arbitrary shadow mode. Call once at domain creation. */ int shadow_enable(struct domain *d, u32 mode); -/* Enable VRAM dirty bit tracking. */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long first_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); - /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 20:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMq-0000V3-Ny; Wed, 07 Nov 2012 20:36:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMp-0000Uy-CN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:36:55 +0000 Received: from [85.158.139.83:39359] by server-13.bemta-5.messagelabs.com id 86/6D-27809-666CA905; Wed, 07 Nov 2012 20:36:54 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352320602!29243370!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16396 invoked from network); 7 Nov 2012 20:36:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:36:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,732,1344211200"; d="scan'208";a="43849505" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 20:36:20 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX02.citrite.net ([10.13.107.66]) with mapi; Wed, 7 Nov 2012 15:36:19 -0500 From: Robert Phillips To: "Tim (Xen.org)" Date: Wed, 7 Nov 2012 15:36:17 -0500 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac24PKA5ayC8XObNQZ+VpcHo9Jvt8AEuwCHA Message-ID: <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> In-Reply-To: <20121101142434.GC61948@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Tim, Thank you for your in-depth review. Concurrent with this email I will submit a revised patch (version 2) containing the changes I mention below. -- rsp > -----Original Message----- > From: Tim Deegan [mailto:tim@xen.org] > Sent: Thursday, November 01, 2012 10:25 AM > To: Robert Phillips > Cc: xen-devel@lists.xen.org; Robert Phillips > Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers > in Xen. > > Hi, > > At 14:15 -0400 on 16 Oct (1350396902), Robert Phillips wrote: > > From: Robert Phillips > > > > Support is provided for both shadow and hardware assisted paging (HAP) > modes. > > This code bookkeeps the set of video frame buffers (vram), > > detects when the guest has modified any of those buffers and, upon > request, > > returns a bitmap of the modified pages. > > > > This lets other software components re-paint the portions of the monitor > (or monitors) that have changed. > > Each monitor has a frame buffer of some size at some position in guest > physical memory. > > The set of frame buffers being tracked can change over time as monitors > are plugged and unplugged. > > Having read through this in detail, it's looking very plausible. :) > A few style nits: [ Done > - please use the Xen spacings around 'if ( foo )' and 'for ( x; y; z )'; > - there's a bit of trailing whitespace in the new file, and a few > places where indentation seems to have gone a bit wrong; > - please make sure the whole thing is linewrapped to <80 characters; and > - there's no need for braces around single-line blocks. ] Done > > More substantive comments: > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > an indicator that this is really MM code. I have moved dirty_vram.c under mm/ I have moved dirty_vram.h under include/asm-x86 . In that location it is available to modules like hvm.c > - Please use xzalloc() rather than xmalloc() + memset(0). It avoids > the sizes of alloc and memset getting out of sync. Done > - The i386 build is dead, so you can drop some #ifdef __i386__ sections. Done > - There really ought to be some limit on how many PTEs you're willing > to track. Otherwise a large guest can consume lots and lots of Xen's > memory by making lots of PTEs that point to framebuffers. That > might also lead to performance problems, e.g. in the unshadow > function that walks over all those liked lists. Done but see note below in the comment starting "This needs to signal some sort of error". > Also, I think that the memory for the paddr_links ought to come from > the shadow pool (i.e. using domain->arch.paging.alloc_page()) > rather than soaking up otherwise free memory. Done > > A few other detailed comments below... > > > +/* Free a paddr_link struct, given address of its predecessor in linked list > */ > > +dv_paddr_link_t * > > +free_paddr_link(struct domain *d, > > + dv_paddr_link_t **ppl, > > + dv_paddr_link_t *pl) > > +{ > > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > > + dv_paddr_link_t *npl; /* next pl */ > > + > > + ASSERT( paging_locked_by_me(d) ); > > + /* extension mapping? */ > > + if (ppl) /* yes. free it */ > > + { > > + pl = (*ppl); > > This assignment seems like it should always be a noop. Would it be > correct to replace it with ASSERT(pl == *ppl)? Yes, Done. > > > + (*ppl) = npl = pl->pl_next; > > + } > > + else /* main table */ > > + { > > + /* move 2nd mapping to main table. > > + * and free 2nd mapping */ > > + dv_paddr_link_t * spl; > > + spl = pl->pl_next; > > + if (spl == NULL) > > + { > > + pl->sl1ma = INVALID_PADDR; > > + return pl; > > + } > > + pl->sl1ma = spl->sl1ma; > > + pl->pl_next = spl->pl_next; > > + npl = pl; /* reprocess main table entry again */ > > + pl = spl; > > OK, that took a lot of staring at to be sure it's right. :) I added some comments. Reading code shouldn't be so taxing. > I'd be > inclined to just put all paddr_links in the linked list (and have an > array of pointers rather than an array of paddr_link_ts). Is it worth > having the extra complexity here, and at the callers, to avoid a single > memory read? Almost all frame buffer pages have a single mapping so the algorithm's common case is met by constructing pl_tab as an array of paddr_links. That is, the table's paddr_links will rarely point to a chain of extension paddr_links. The code encapsulates the complexity in a single function. Sorry it required so much staring. Even if all paddr_links were stored in a linked list, the caller would have to walk that linked list, so would be just as complex. > > > + } > > + pl->sl1ma = INVALID_PADDR; > > + pl->pl_next = dirty_vram->pl_free; > > + dirty_vram->pl_free = pl; > > + return npl; > > +} > > + > > + > > +/* dirty_vram_range_update() > > + * This is called whenever a level 1 page table entry is modified. > > + * If the L1PTE is being cleared, the function removes any paddr_links > > + * that refer to it. > > + * If the L1PTE is being set to a frame buffer page, a paddr_link is > > + * created for that page's entry in pl_tab. > > + * Returns 1 iff entry found and set or cleared. > > + */ > > +int dirty_vram_range_update(struct domain *d, > > + unsigned long gfn, > > + paddr_t sl1ma, > > + int set) > > +{ > > + int effective = 0; > > + dv_range_t *range; > > + > > + ASSERT(paging_locked_by_me(d)); > > + range = dirty_vram_range_find_gfn(d, gfn); > > + if ( range ) > > + { > > I think this would be more readable as 'if ( !range ) return 0' here > rather than indenting most of the function. Done. > > > + unsigned long i = gfn - range->begin_pfn; > > + dv_paddr_link_t *pl = &range->pl_tab[ i ]; > > + dv_paddr_link_t **ppl = NULL; > > + int len = 0; > > + > > + /* find matching entry (pl), if any, and its predecessor > > + * in linked list (ppl) */ > > + while (pl != NULL) > > + { > > + if (pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) > > + break; > > + ppl = &pl->pl_next; > > + pl = *ppl; > > + len++; > > + } > > + > > + if (set) > > + { > > + /* Did we find sl1ma in either the main table or the linked list? */ > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > + { > > + ASSERT(ppl != NULL); > > + /* alloc link and append it to list */ > > + (*ppl) = pl = alloc_paddr_link(d); > > + if (pl == NULL) > > + goto out; > > This needs to signal some sort of error. Otherwise, if we can't add > this sl1e to the list we'll just silently fail to track it. I don't know what sort of error we can signal. The immediate symptom would be that areas of the monitor would not be refreshed. But, since we're running out of memory, that might be the least of the quests's woes. The updated patch actually makes the symptom more likely (though still very unlikely) by putting an arbitrary bound on the length of paddr_link chains. It handles a rogue process, one that has an arbitrarily large number of mappings for frame buffer pages, by simply not recording the excessive mappings. If that results in unrefreshed blocks on the monitor, so be it. > > > + } > > + if ( pl->sl1ma != sl1ma ) > > + { > > ASSERT(pl->sl1ma == INVALID_PADDR) ? Yes, Done. > > > + pl->sl1ma = sl1ma; > > + range->nr_mappings++; > > + } > > + effective = 1; > > + if (len > range->mappings_hwm) > > + { > > + range->mappings_hwm = len; > > +#if DEBUG_update_vram_mapping > > + gdprintk(XENLOG_DEBUG, > > + "[%lx] set sl1ma:%lx hwm:%d mappings:%d > freepages:%d\n", > > + gfn, sl1ma, > > + range->mappings_hwm, > > + range->nr_mappings, > > + d->arch.paging.shadow.free_pages); > > +#endif > > + } > > + } > > + else /* clear */ > > + { > > + if (pl && pl->sl1ma == sl1ma ) > > + { > > +#if DEBUG_update_vram_mapping > > + gdprintk(XENLOG_DEBUG, > > + "[%lx] clear sl1ma:%lx mappings:%d\n", > > + gfn, sl1ma, > > + range->nr_mappings-1); > > +#endif > > + free_paddr_link(d, ppl, pl); > > + if ( --range->nr_mappings == 0 ) > > + { > > + dirty_vram_range_free(d, range); > > What's this for? If the guest unmaps the framebuffer and remaps it (or > if the shadow PTs of the mappings are temporarily discarded) this will > stop us from tracking the new mappings until the toolstack asks for the > bitmap (and then it will be expensive to go and find the mappings). > I don't see this happening. If the guest unmaps the framebuffer, the shadow code lazily recovers the shadow pages, so tracking will continue until it decides a page is no longer a shadow page. That is when this code is invoked. It tears down the mappings to that page and if some range ends up with no mappings then the range is useless. Vram ranges are generated willy-nilly as needed. This is the only mechanism for cleaning them up. > > + } > > + effective = 1; > > + } > > + } > > + } > > + out: > > + return effective; > > +} > > > +/* shadow_track_dirty_vram() > > + * This is the API called by the guest to determine which pages in the > range > > + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. > > + * It creates the domain's dv_dirty_vram on demand. > > + * It creates ranges on demand when some [begin_pfn:nr) is first > encountered. > > + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). > > + * It copies the dirty bitmask into guest storage. > > + */ > > +int shadow_track_dirty_vram(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > > +{ > > + int rc = 0; > > + unsigned long end_pfn = begin_pfn + nr; > > + int flush_tlb = 0; > > + dv_range_t *range; > > + struct p2m_domain *p2m = p2m_get_hostp2m(d); > > + > > + if (end_pfn < begin_pfn > > + || begin_pfn > p2m->max_mapped_pfn > > + || end_pfn >= p2m->max_mapped_pfn) > > I know you just copied this from the old definition but the limits seem > wrong here -- I think it should be: > > if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) You're right. Done. And commented because it's pretty obscure. > > > > +/* hap_clean_vram_tracking_range() > > + * For all the pages in the range specified by [begin_pfn,nr), > > + * note in the dirty bitmap any page that has been marked as read-write, > > + * which signifies that the page has been dirtied, and reset the page > > + * to ram_logdirty. > > + */ > > +void hap_clean_vram_tracking_range(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + uint8_t *dirty_bitmap) > > +{ > > + int i; > > + unsigned long pfn; > > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > > + dv_range_t *range; > > + > > + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); > > + ASSERT(paging_locked_by_me(d)); > > + > > + if ( !dirty_vram ) > > + { > > + gdprintk(XENLOG_DEBUG, "Should only be called while tracking dirty > vram.\n"); > > + return; > > + } > > + > > + range = dirty_vram_range_find(d, begin_pfn, nr); > > + if (!range) > > + return; > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > currently being tracked we should conservatively assume it's all dirty, > right? The callers will should ensure that the range exists. This is just a conservative test. Anyway, it begs the question of whether a new range should be considered all dirty or all clean. Intuitively "all dirty" seems the right answer but in practice it works fine as written since the guest is busy updating the whole frame buffer. > > > + > > + /* set l1e entries of P2M table to be read-only. */ > > + /* On first write, it page faults, its entry is changed to read-write, > > + * its bit in the dirty bitmap is set, and on retry the write succeeds. */ > > + for (i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++) > > + { > > + p2m_type_t pt; > > + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); > > + if (pt == p2m_ram_rw) > > + dirty_bitmap[i >> 3] |= (1 << (i & 7)); > > + } > > + flush_tlb_mask(d->domain_dirty_cpumask); > > +} > > + > > +static void hap_vram_tracking_init(struct domain *d) > > +{ > > + paging_log_dirty_init(d, hap_enable_vram_tracking, > > + hap_disable_vram_tracking, > > + NULL); > > +} > > + > > +/* hap_track_dirty_vram() > > + * Create the domain's dv_dirty_vram struct on demand. > > + * Create a dirty vram range on demand when some > [begin_pfn:begin_pfn+nr] is first encountered. > > + * Collect the guest_dirty bitmask, a bit mask of the dirties vram pages, by > > + * calling paging_log_dirty_range(). > > + */ > > +int hap_track_dirty_vram(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > > +{ > > + long rc = 0; > > + dv_dirty_vram_t *dirty_vram; > > + int restart_log_dirty = 0; > > + > > + paging_lock(d); > > + dirty_vram = d->arch.hvm_domain.dirty_vram; > > + if ( nr ) > > + { > > + dv_range_t *range = NULL; > > + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; > > + unsigned long dirty_bitmap[size]; > > All the users of this array cast to (uint8_t *) -- just declare it as > uint8_t * instead? Yes, done. The original code seemed overly fond of using LONGs ... > > > + > > + /* Already tracking dirty vram? */ > > + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ > > + { > > + /* Handle the addition of another range */ > > + range = dirty_vram_range_find(d, begin_pfn, nr); > > + if ( !range ) > > + { > > + rc = -ENOMEM; > > + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) > > + goto param_fail; > > + restart_log_dirty = 1; > > + } > > + } > > + /* Just starting to track dirty vram? */ > > + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ > > + { > > + rc = -ENOMEM; > > + if ( !(dirty_vram = dirty_vram_alloc(d)) ) > > + goto param_fail; > > + > > + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) > > + goto param_fail; > > + > > + restart_log_dirty = 1; > > + /* Initialize callbacks for vram tracking */ > > + hap_vram_tracking_init(d); > > + } > > + else > > + { > > + /* Test for invalid combination */ > > + if ( !paging_mode_log_dirty(d) && dirty_vram ) > > + rc = -EINVAL; > > + else /* logging dirty of all memory, not tracking dirty vram */ > > + rc = -ENODATA; > > + goto param_fail; > > + } > > + > > + if (restart_log_dirty) > > + { > > + /* disable then enable log dirty */ > > Why disable and re-enable? The call to paging_log_dirty_range() below > will reset the p2m entries of the range you care about, so I think all > you need to do is enable it in the 'just starting' case above. Done. > > And, since you know you're in HAP mode, not in log-dirty mode, and > already have the paging lock, you can just set > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > the paging_log_dirty_enable() path and messing with locks. No, paging_log_dirty_enable() goes through several layers of functions and ends up calling hap_enable_vram_tracking(), which does quite a bit of stuff. > > > + paging_unlock(d); > > + if (paging_mode_log_dirty(d)) > > + paging_log_dirty_disable(d); > > + > > + rc = paging_log_dirty_enable(d); > > + paging_lock(d); > > + if (rc != 0) > > + goto param_fail; > > + } > > + > > + paging_unlock(d); > > + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); > > + paging_log_dirty_range(d, begin_pfn, nr, (uint8_t*)dirty_bitmap); > > + rc = -EFAULT; > > + if ( copy_to_guest(guest_dirty_bitmap, > > + (uint8_t*)dirty_bitmap, > > + size * BYTES_PER_LONG) == 0 ) > > + { > > + rc = 0; > > + } > > + } > > + else > > + { > > + /* If zero pages specified while already tracking dirty vram > > + * then stop tracking */ > > + if ( paging_mode_log_dirty(d) && dirty_vram ) { > > + paging_unlock(d); > > + rc = paging_log_dirty_disable(d); > > + paging_lock(d); > > + dirty_vram_free(d); > > This is different from the shadow case -- there, IIUC, you just ignore > requests where nr == 0; here, you tear down all vram tracking. > Can you choose one of those, and document it in the public header? Done. I changed the shadow code to tear down if nr == 0. (The HAP code seemed to expect that behavior and the shadow code didn't seem to care.) And updated the public header. > > > + } else /* benign no-op */ > > + { > > + rc = 0; > > + } > > + paging_unlock(d); > > + } > > + > > + return rc; > > > > +/* paging_mark_dirty_hap() > > + * Make a hap page writeable and mark it as dirty. > > + * This done atomically under the p2m and paging locks to avoid leaving > > + * a window where the page might be modified without being marked as > dirty. > > + */ > > I'm perplexed by this -- AFAICT it's either not necessary (because all > log-dirty read/clean ops are done with the domain paused) or not sufficient > (because although the bitmap and the PTE are updated under the p2m lock, > the actual dirtying of the page happens at some other time). Can you > spell out for me exactly what this is protecting against? The comment over-stated the problem so I've toned it down from "without being marked" to "without being counted". paging_mark_dirty_hap() is in the page fault path and has two steps: (1) It calls p2m_change_type() to re-mark some pfn as writeable (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. This must be done under the p2m_lock. (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then it bumps two dirty counts. And it marks the page as dirty. This must be done under the paging lock. As an invariant, the dirty counts should be precisely the number of pages made writeable. With this patch, step (2) is also done under the p2m_lock. This avoids having a window between steps (1) and (2), in which hap_track_dirty_vram() might get in and would break the invariant by clearing the range's dirty count. It may be that this invariant is not particularly useful, that things will just work out. But I do wonder if, without it, we'll have situations where the dirty counts will indicate dirty pages when there are none, or no dirty pages when there are some. > > > +typedef int (*hash_pfn_callback_t)(struct vcpu *v, > > + mfn_t smfn, > > + unsigned long begin_pfn, > > + unsigned long end_pfn, > > + int *removed); > > + > > +static int hash_pfn_foreach(struct vcpu *v, > > + unsigned int callback_mask, > > + hash_pfn_callback_t callbacks[], > > + unsigned long begin_pfn, > > + unsigned long end_pfn) > > +/* Walk the hash table looking at the types of the entries and > > + * calling the appropriate callback function for each entry. > > + * The mask determines which shadow types we call back for, and the > array > > + * of callbacks tells us which function to call. > > + * Any callback may return non-zero to let us skip the rest of the scan. > > + * > > + * WARNING: Callbacks MUST NOT add or remove hash entries unless > they > > + * then return non-zero to terminate the scan. */ > > This code duplication is a bit much. I think you should recast the > existing hash_foreach() function to take a pointer as its fourth > argument instead of an MFN, and then make the existing callers just cast > their MFN argument as a pointer. The you can use the same function, > passing a pointer to a struct { begin, end, removed }. > > Please make the changes to hash_foreach() in a separate patch from the > dirty_vram stuff. Yes, I'd be happy to submit a patch as you suggest after we're done with this one. > > > @@ -1211,12 +1164,14 @@ static int shadow_set_l1e(struct vcpu *v, > > shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); > > /* fall through */ > > case 0: > > - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > > break; > > } > > } > > } > > > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > > Why is this being called twice here? Stupidity. I've eliminated the first of the two. > > Cheers, > > Tim. Thanks again. -- rsp _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 20:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMq-0000V3-Ny; Wed, 07 Nov 2012 20:36:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCMp-0000Uy-CN for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:36:55 +0000 Received: from [85.158.139.83:39359] by server-13.bemta-5.messagelabs.com id 86/6D-27809-666CA905; Wed, 07 Nov 2012 20:36:54 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352320602!29243370!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIwMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16396 invoked from network); 7 Nov 2012 20:36:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:36:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,732,1344211200"; d="scan'208";a="43849505" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 07 Nov 2012 20:36:20 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX02.citrite.net ([10.13.107.66]) with mapi; Wed, 7 Nov 2012 15:36:19 -0500 From: Robert Phillips To: "Tim (Xen.org)" Date: Wed, 7 Nov 2012 15:36:17 -0500 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac24PKA5ayC8XObNQZ+VpcHo9Jvt8AEuwCHA Message-ID: <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> In-Reply-To: <20121101142434.GC61948@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Tim, Thank you for your in-depth review. Concurrent with this email I will submit a revised patch (version 2) containing the changes I mention below. -- rsp > -----Original Message----- > From: Tim Deegan [mailto:tim@xen.org] > Sent: Thursday, November 01, 2012 10:25 AM > To: Robert Phillips > Cc: xen-devel@lists.xen.org; Robert Phillips > Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers > in Xen. > > Hi, > > At 14:15 -0400 on 16 Oct (1350396902), Robert Phillips wrote: > > From: Robert Phillips > > > > Support is provided for both shadow and hardware assisted paging (HAP) > modes. > > This code bookkeeps the set of video frame buffers (vram), > > detects when the guest has modified any of those buffers and, upon > request, > > returns a bitmap of the modified pages. > > > > This lets other software components re-paint the portions of the monitor > (or monitors) that have changed. > > Each monitor has a frame buffer of some size at some position in guest > physical memory. > > The set of frame buffers being tracked can change over time as monitors > are plugged and unplugged. > > Having read through this in detail, it's looking very plausible. :) > A few style nits: [ Done > - please use the Xen spacings around 'if ( foo )' and 'for ( x; y; z )'; > - there's a bit of trailing whitespace in the new file, and a few > places where indentation seems to have gone a bit wrong; > - please make sure the whole thing is linewrapped to <80 characters; and > - there's no need for braces around single-line blocks. ] Done > > More substantive comments: > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > an indicator that this is really MM code. I have moved dirty_vram.c under mm/ I have moved dirty_vram.h under include/asm-x86 . In that location it is available to modules like hvm.c > - Please use xzalloc() rather than xmalloc() + memset(0). It avoids > the sizes of alloc and memset getting out of sync. Done > - The i386 build is dead, so you can drop some #ifdef __i386__ sections. Done > - There really ought to be some limit on how many PTEs you're willing > to track. Otherwise a large guest can consume lots and lots of Xen's > memory by making lots of PTEs that point to framebuffers. That > might also lead to performance problems, e.g. in the unshadow > function that walks over all those liked lists. Done but see note below in the comment starting "This needs to signal some sort of error". > Also, I think that the memory for the paddr_links ought to come from > the shadow pool (i.e. using domain->arch.paging.alloc_page()) > rather than soaking up otherwise free memory. Done > > A few other detailed comments below... > > > +/* Free a paddr_link struct, given address of its predecessor in linked list > */ > > +dv_paddr_link_t * > > +free_paddr_link(struct domain *d, > > + dv_paddr_link_t **ppl, > > + dv_paddr_link_t *pl) > > +{ > > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > > + dv_paddr_link_t *npl; /* next pl */ > > + > > + ASSERT( paging_locked_by_me(d) ); > > + /* extension mapping? */ > > + if (ppl) /* yes. free it */ > > + { > > + pl = (*ppl); > > This assignment seems like it should always be a noop. Would it be > correct to replace it with ASSERT(pl == *ppl)? Yes, Done. > > > + (*ppl) = npl = pl->pl_next; > > + } > > + else /* main table */ > > + { > > + /* move 2nd mapping to main table. > > + * and free 2nd mapping */ > > + dv_paddr_link_t * spl; > > + spl = pl->pl_next; > > + if (spl == NULL) > > + { > > + pl->sl1ma = INVALID_PADDR; > > + return pl; > > + } > > + pl->sl1ma = spl->sl1ma; > > + pl->pl_next = spl->pl_next; > > + npl = pl; /* reprocess main table entry again */ > > + pl = spl; > > OK, that took a lot of staring at to be sure it's right. :) I added some comments. Reading code shouldn't be so taxing. > I'd be > inclined to just put all paddr_links in the linked list (and have an > array of pointers rather than an array of paddr_link_ts). Is it worth > having the extra complexity here, and at the callers, to avoid a single > memory read? Almost all frame buffer pages have a single mapping so the algorithm's common case is met by constructing pl_tab as an array of paddr_links. That is, the table's paddr_links will rarely point to a chain of extension paddr_links. The code encapsulates the complexity in a single function. Sorry it required so much staring. Even if all paddr_links were stored in a linked list, the caller would have to walk that linked list, so would be just as complex. > > > + } > > + pl->sl1ma = INVALID_PADDR; > > + pl->pl_next = dirty_vram->pl_free; > > + dirty_vram->pl_free = pl; > > + return npl; > > +} > > + > > + > > +/* dirty_vram_range_update() > > + * This is called whenever a level 1 page table entry is modified. > > + * If the L1PTE is being cleared, the function removes any paddr_links > > + * that refer to it. > > + * If the L1PTE is being set to a frame buffer page, a paddr_link is > > + * created for that page's entry in pl_tab. > > + * Returns 1 iff entry found and set or cleared. > > + */ > > +int dirty_vram_range_update(struct domain *d, > > + unsigned long gfn, > > + paddr_t sl1ma, > > + int set) > > +{ > > + int effective = 0; > > + dv_range_t *range; > > + > > + ASSERT(paging_locked_by_me(d)); > > + range = dirty_vram_range_find_gfn(d, gfn); > > + if ( range ) > > + { > > I think this would be more readable as 'if ( !range ) return 0' here > rather than indenting most of the function. Done. > > > + unsigned long i = gfn - range->begin_pfn; > > + dv_paddr_link_t *pl = &range->pl_tab[ i ]; > > + dv_paddr_link_t **ppl = NULL; > > + int len = 0; > > + > > + /* find matching entry (pl), if any, and its predecessor > > + * in linked list (ppl) */ > > + while (pl != NULL) > > + { > > + if (pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) > > + break; > > + ppl = &pl->pl_next; > > + pl = *ppl; > > + len++; > > + } > > + > > + if (set) > > + { > > + /* Did we find sl1ma in either the main table or the linked list? */ > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > + { > > + ASSERT(ppl != NULL); > > + /* alloc link and append it to list */ > > + (*ppl) = pl = alloc_paddr_link(d); > > + if (pl == NULL) > > + goto out; > > This needs to signal some sort of error. Otherwise, if we can't add > this sl1e to the list we'll just silently fail to track it. I don't know what sort of error we can signal. The immediate symptom would be that areas of the monitor would not be refreshed. But, since we're running out of memory, that might be the least of the quests's woes. The updated patch actually makes the symptom more likely (though still very unlikely) by putting an arbitrary bound on the length of paddr_link chains. It handles a rogue process, one that has an arbitrarily large number of mappings for frame buffer pages, by simply not recording the excessive mappings. If that results in unrefreshed blocks on the monitor, so be it. > > > + } > > + if ( pl->sl1ma != sl1ma ) > > + { > > ASSERT(pl->sl1ma == INVALID_PADDR) ? Yes, Done. > > > + pl->sl1ma = sl1ma; > > + range->nr_mappings++; > > + } > > + effective = 1; > > + if (len > range->mappings_hwm) > > + { > > + range->mappings_hwm = len; > > +#if DEBUG_update_vram_mapping > > + gdprintk(XENLOG_DEBUG, > > + "[%lx] set sl1ma:%lx hwm:%d mappings:%d > freepages:%d\n", > > + gfn, sl1ma, > > + range->mappings_hwm, > > + range->nr_mappings, > > + d->arch.paging.shadow.free_pages); > > +#endif > > + } > > + } > > + else /* clear */ > > + { > > + if (pl && pl->sl1ma == sl1ma ) > > + { > > +#if DEBUG_update_vram_mapping > > + gdprintk(XENLOG_DEBUG, > > + "[%lx] clear sl1ma:%lx mappings:%d\n", > > + gfn, sl1ma, > > + range->nr_mappings-1); > > +#endif > > + free_paddr_link(d, ppl, pl); > > + if ( --range->nr_mappings == 0 ) > > + { > > + dirty_vram_range_free(d, range); > > What's this for? If the guest unmaps the framebuffer and remaps it (or > if the shadow PTs of the mappings are temporarily discarded) this will > stop us from tracking the new mappings until the toolstack asks for the > bitmap (and then it will be expensive to go and find the mappings). > I don't see this happening. If the guest unmaps the framebuffer, the shadow code lazily recovers the shadow pages, so tracking will continue until it decides a page is no longer a shadow page. That is when this code is invoked. It tears down the mappings to that page and if some range ends up with no mappings then the range is useless. Vram ranges are generated willy-nilly as needed. This is the only mechanism for cleaning them up. > > + } > > + effective = 1; > > + } > > + } > > + } > > + out: > > + return effective; > > +} > > > +/* shadow_track_dirty_vram() > > + * This is the API called by the guest to determine which pages in the > range > > + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. > > + * It creates the domain's dv_dirty_vram on demand. > > + * It creates ranges on demand when some [begin_pfn:nr) is first > encountered. > > + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). > > + * It copies the dirty bitmask into guest storage. > > + */ > > +int shadow_track_dirty_vram(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > > +{ > > + int rc = 0; > > + unsigned long end_pfn = begin_pfn + nr; > > + int flush_tlb = 0; > > + dv_range_t *range; > > + struct p2m_domain *p2m = p2m_get_hostp2m(d); > > + > > + if (end_pfn < begin_pfn > > + || begin_pfn > p2m->max_mapped_pfn > > + || end_pfn >= p2m->max_mapped_pfn) > > I know you just copied this from the old definition but the limits seem > wrong here -- I think it should be: > > if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) You're right. Done. And commented because it's pretty obscure. > > > > +/* hap_clean_vram_tracking_range() > > + * For all the pages in the range specified by [begin_pfn,nr), > > + * note in the dirty bitmap any page that has been marked as read-write, > > + * which signifies that the page has been dirtied, and reset the page > > + * to ram_logdirty. > > + */ > > +void hap_clean_vram_tracking_range(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + uint8_t *dirty_bitmap) > > +{ > > + int i; > > + unsigned long pfn; > > + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; > > + dv_range_t *range; > > + > > + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); > > + ASSERT(paging_locked_by_me(d)); > > + > > + if ( !dirty_vram ) > > + { > > + gdprintk(XENLOG_DEBUG, "Should only be called while tracking dirty > vram.\n"); > > + return; > > + } > > + > > + range = dirty_vram_range_find(d, begin_pfn, nr); > > + if (!range) > > + return; > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > currently being tracked we should conservatively assume it's all dirty, > right? The callers will should ensure that the range exists. This is just a conservative test. Anyway, it begs the question of whether a new range should be considered all dirty or all clean. Intuitively "all dirty" seems the right answer but in practice it works fine as written since the guest is busy updating the whole frame buffer. > > > + > > + /* set l1e entries of P2M table to be read-only. */ > > + /* On first write, it page faults, its entry is changed to read-write, > > + * its bit in the dirty bitmap is set, and on retry the write succeeds. */ > > + for (i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++) > > + { > > + p2m_type_t pt; > > + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); > > + if (pt == p2m_ram_rw) > > + dirty_bitmap[i >> 3] |= (1 << (i & 7)); > > + } > > + flush_tlb_mask(d->domain_dirty_cpumask); > > +} > > + > > +static void hap_vram_tracking_init(struct domain *d) > > +{ > > + paging_log_dirty_init(d, hap_enable_vram_tracking, > > + hap_disable_vram_tracking, > > + NULL); > > +} > > + > > +/* hap_track_dirty_vram() > > + * Create the domain's dv_dirty_vram struct on demand. > > + * Create a dirty vram range on demand when some > [begin_pfn:begin_pfn+nr] is first encountered. > > + * Collect the guest_dirty bitmask, a bit mask of the dirties vram pages, by > > + * calling paging_log_dirty_range(). > > + */ > > +int hap_track_dirty_vram(struct domain *d, > > + unsigned long begin_pfn, > > + unsigned long nr, > > + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) > > +{ > > + long rc = 0; > > + dv_dirty_vram_t *dirty_vram; > > + int restart_log_dirty = 0; > > + > > + paging_lock(d); > > + dirty_vram = d->arch.hvm_domain.dirty_vram; > > + if ( nr ) > > + { > > + dv_range_t *range = NULL; > > + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; > > + unsigned long dirty_bitmap[size]; > > All the users of this array cast to (uint8_t *) -- just declare it as > uint8_t * instead? Yes, done. The original code seemed overly fond of using LONGs ... > > > + > > + /* Already tracking dirty vram? */ > > + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ > > + { > > + /* Handle the addition of another range */ > > + range = dirty_vram_range_find(d, begin_pfn, nr); > > + if ( !range ) > > + { > > + rc = -ENOMEM; > > + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) > > + goto param_fail; > > + restart_log_dirty = 1; > > + } > > + } > > + /* Just starting to track dirty vram? */ > > + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ > > + { > > + rc = -ENOMEM; > > + if ( !(dirty_vram = dirty_vram_alloc(d)) ) > > + goto param_fail; > > + > > + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) > > + goto param_fail; > > + > > + restart_log_dirty = 1; > > + /* Initialize callbacks for vram tracking */ > > + hap_vram_tracking_init(d); > > + } > > + else > > + { > > + /* Test for invalid combination */ > > + if ( !paging_mode_log_dirty(d) && dirty_vram ) > > + rc = -EINVAL; > > + else /* logging dirty of all memory, not tracking dirty vram */ > > + rc = -ENODATA; > > + goto param_fail; > > + } > > + > > + if (restart_log_dirty) > > + { > > + /* disable then enable log dirty */ > > Why disable and re-enable? The call to paging_log_dirty_range() below > will reset the p2m entries of the range you care about, so I think all > you need to do is enable it in the 'just starting' case above. Done. > > And, since you know you're in HAP mode, not in log-dirty mode, and > already have the paging lock, you can just set > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > the paging_log_dirty_enable() path and messing with locks. No, paging_log_dirty_enable() goes through several layers of functions and ends up calling hap_enable_vram_tracking(), which does quite a bit of stuff. > > > + paging_unlock(d); > > + if (paging_mode_log_dirty(d)) > > + paging_log_dirty_disable(d); > > + > > + rc = paging_log_dirty_enable(d); > > + paging_lock(d); > > + if (rc != 0) > > + goto param_fail; > > + } > > + > > + paging_unlock(d); > > + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); > > + paging_log_dirty_range(d, begin_pfn, nr, (uint8_t*)dirty_bitmap); > > + rc = -EFAULT; > > + if ( copy_to_guest(guest_dirty_bitmap, > > + (uint8_t*)dirty_bitmap, > > + size * BYTES_PER_LONG) == 0 ) > > + { > > + rc = 0; > > + } > > + } > > + else > > + { > > + /* If zero pages specified while already tracking dirty vram > > + * then stop tracking */ > > + if ( paging_mode_log_dirty(d) && dirty_vram ) { > > + paging_unlock(d); > > + rc = paging_log_dirty_disable(d); > > + paging_lock(d); > > + dirty_vram_free(d); > > This is different from the shadow case -- there, IIUC, you just ignore > requests where nr == 0; here, you tear down all vram tracking. > Can you choose one of those, and document it in the public header? Done. I changed the shadow code to tear down if nr == 0. (The HAP code seemed to expect that behavior and the shadow code didn't seem to care.) And updated the public header. > > > + } else /* benign no-op */ > > + { > > + rc = 0; > > + } > > + paging_unlock(d); > > + } > > + > > + return rc; > > > > +/* paging_mark_dirty_hap() > > + * Make a hap page writeable and mark it as dirty. > > + * This done atomically under the p2m and paging locks to avoid leaving > > + * a window where the page might be modified without being marked as > dirty. > > + */ > > I'm perplexed by this -- AFAICT it's either not necessary (because all > log-dirty read/clean ops are done with the domain paused) or not sufficient > (because although the bitmap and the PTE are updated under the p2m lock, > the actual dirtying of the page happens at some other time). Can you > spell out for me exactly what this is protecting against? The comment over-stated the problem so I've toned it down from "without being marked" to "without being counted". paging_mark_dirty_hap() is in the page fault path and has two steps: (1) It calls p2m_change_type() to re-mark some pfn as writeable (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. This must be done under the p2m_lock. (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then it bumps two dirty counts. And it marks the page as dirty. This must be done under the paging lock. As an invariant, the dirty counts should be precisely the number of pages made writeable. With this patch, step (2) is also done under the p2m_lock. This avoids having a window between steps (1) and (2), in which hap_track_dirty_vram() might get in and would break the invariant by clearing the range's dirty count. It may be that this invariant is not particularly useful, that things will just work out. But I do wonder if, without it, we'll have situations where the dirty counts will indicate dirty pages when there are none, or no dirty pages when there are some. > > > +typedef int (*hash_pfn_callback_t)(struct vcpu *v, > > + mfn_t smfn, > > + unsigned long begin_pfn, > > + unsigned long end_pfn, > > + int *removed); > > + > > +static int hash_pfn_foreach(struct vcpu *v, > > + unsigned int callback_mask, > > + hash_pfn_callback_t callbacks[], > > + unsigned long begin_pfn, > > + unsigned long end_pfn) > > +/* Walk the hash table looking at the types of the entries and > > + * calling the appropriate callback function for each entry. > > + * The mask determines which shadow types we call back for, and the > array > > + * of callbacks tells us which function to call. > > + * Any callback may return non-zero to let us skip the rest of the scan. > > + * > > + * WARNING: Callbacks MUST NOT add or remove hash entries unless > they > > + * then return non-zero to terminate the scan. */ > > This code duplication is a bit much. I think you should recast the > existing hash_foreach() function to take a pointer as its fourth > argument instead of an MFN, and then make the existing callers just cast > their MFN argument as a pointer. The you can use the same function, > passing a pointer to a struct { begin, end, removed }. > > Please make the changes to hash_foreach() in a separate patch from the > dirty_vram stuff. Yes, I'd be happy to submit a patch as you suggest after we're done with this one. > > > @@ -1211,12 +1164,14 @@ static int shadow_set_l1e(struct vcpu *v, > > shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); > > /* fall through */ > > case 0: > > - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > > break; > > } > > } > > } > > > > + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); > > Why is this being called twice here? Stupidity. I've eliminated the first of the two. > > Cheers, > > Tim. Thanks again. -- rsp _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 20:54:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:54:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCdv-0000tr-Bm; Wed, 07 Nov 2012 20:54:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCdt-0000tm-TG for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:54:34 +0000 Received: from [85.158.143.99:64803] by server-1.bemta-4.messagelabs.com id AB/03-27934-98ACA905; Wed, 07 Nov 2012 20:54:33 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-4.tower-216.messagelabs.com!1352321657!23766159!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31103 invoked from network); 7 Nov 2012 20:54:22 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:54:22 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3696835iea.32 for ; Wed, 07 Nov 2012 12:54:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:message-id:date :to:mime-version:x-mailer:x-gm-message-state; bh=VhoPIxArh3rHTeiGGJuddyYE4dP8L5DN8vRThZScFJc=; b=OIG3i6eSYhnqL31pvSrJj29gKuFnWgPgP21PZJoC+t2NhhO2r6z3Fh6U3eLjNX8q6c 1bmlXULHp2YCmzmXMUuQFyMAwj0bYPnN9yiRm4A45EJdGm3kUVqSL4WRtWqWFDKAJavC bvOV9TDoZbapxiU48Cn6nSpuCre6+1FjE7xgtOKHgPPhj6/ABkRDX3mXEd5TK++Gqy0Q JnlxXwyLVKj1h4ruQ3GQ1wu9HRadPlIs+EIok5h96uJifwaQzJ0WLhqTKjtX84DhBlQY gqc+DI0u9RTR6qlSn0AvYVNMO542NdKyeXM1JIDVLgDJlYiFwS1VGfG99d4TZYbX0r0u GsBw== Received: by 10.50.219.129 with SMTP id po1mr17694418igc.35.1352321656922; Wed, 07 Nov 2012 12:54:16 -0800 (PST) Received: from [192.168.4.87] ([206.223.182.18]) by mx.google.com with ESMTPS id o9sm2774086igd.7.2012.11.07.12.54.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 12:54:16 -0800 (PST) From: Andres Lagar-Cavilla Message-Id: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> Date: Wed, 7 Nov 2012 15:54:22 -0500 To: Tim Deegan , "Keir (Xen.org)" , Jan Beulich , "xen-devel@lists.xen.org" Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQk9W6ApSFSZqRvWxH6REIaXdQF2af9tCbCHkW/7TkY5d6s4Np+hI97RZm1ZEbbF/U5uwreS Subject: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, we currently have a problem in the (x86) mm layer. Callers may request the p2m to perform a translation of a gfn to an mfn. Such translation may need to wait for a third party to service it. This happens when: - a page needs to be paged in - a CoW breaking of a shared page fails due to lack of memory Note that paging in may also fail due to lack of memory. In both ENOMEM cases, all the plumbing for a toolstack to be notified and take some corrective action to release some memory and retry is in place. We also have plumbing for pagers in place. Ideally we want the internals to be self-contained, so that callers need not be concerned with any of this. A request for a p2m translation may or may not sleep, but on exit from the p2m the caller either has an mfn with a page ref, or an error code due to some other condition. Wait queue support in (x86) Xen prevents sleeping on a wait queue if any locks are held, including RCU read-side locks (i.e. BUG_ON(!in_atomic()). For this reason, we have not yet implemented sleeping on the p2m. Callers may get errors telling them to retry. A lot of (imho) ugly code is peppered around the hypervisor to deal with the consequences of this. More fundamentally, in some cases there is no possible elegant handling, and guests are crashed (for example, if a page table page is paged out and the hypervisor needs to translate a guest virtual address to a gfn). This limits the applicability of memory paging and sharing. One way to solve this would be to ensure no code path liable to sleep in a wait queue is holding any locks at wait queue sleep time. I believe this is doomed. Not just because this is a herculean task. It also makes writing hypervisor code *very* difficult. Anyone trying to throw a p2m translation into a code path needs to think of all possible upstream call sequences. Not even RCU read locks are allowed. I'd like to propose an approach that ensures that as long some properties are met, arbitrary wait queue sleep is allowed. Here are the properties: 1. Third parties servicing a wait queue sleep are indeed third parties. In other words, dom0 does not do paging. 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait queue during a foreign map. 3. A guest vcpu may go to sleep on a wait queue holding any kinds of locks as long as it does not hold the p2m lock. 4. "Kick" routines in the hypervisor by which service domains effectively wake up a vcpu may only take the p2m lock to do a fix up of the p2m. 5. Wait queues can be awakened on a special domain destroy condition. Property 1. is hopefully self-evident, and although not enforced in the code it is reasonably simple to do so. Property 2. is also self-evident and enforced in the code today. Property 3. simplifies reasoning about p2m translations and wait queue sleeping. Provides a clean model for reasoning about what might or might not happen. It will require us to restructure some code paths (i.e. XENMEM_add_to_physmap) that require multiple p2m translations in a single critical region to perform all translations up front. Property 4. is already enforced in the code as is right now. Property 5. needs adding some logic to the top of domain destruction: set a flag, wake up all vcpus in wait queues. Extra logic on the wait queue side will exit the wait if the destroy flag is set, with an error. Most if not all callers can deal right now with a p2m translation error (other than paging), and unwind and release all their locks. I confess my understanding of RCU is not 100% there and I am not sure what will happen to force_quiescent_state. I also understand there is a impedance mismatch wrt to "saving" and "restoring" the physical CPU preempt count. Thanks, Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 20:54:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 20:54:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCdv-0000tr-Bm; Wed, 07 Nov 2012 20:54:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCdt-0000tm-TG for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:54:34 +0000 Received: from [85.158.143.99:64803] by server-1.bemta-4.messagelabs.com id AB/03-27934-98ACA905; Wed, 07 Nov 2012 20:54:33 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-4.tower-216.messagelabs.com!1352321657!23766159!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31103 invoked from network); 7 Nov 2012 20:54:22 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:54:22 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3696835iea.32 for ; Wed, 07 Nov 2012 12:54:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:content-type:content-transfer-encoding:subject:message-id:date :to:mime-version:x-mailer:x-gm-message-state; bh=VhoPIxArh3rHTeiGGJuddyYE4dP8L5DN8vRThZScFJc=; b=OIG3i6eSYhnqL31pvSrJj29gKuFnWgPgP21PZJoC+t2NhhO2r6z3Fh6U3eLjNX8q6c 1bmlXULHp2YCmzmXMUuQFyMAwj0bYPnN9yiRm4A45EJdGm3kUVqSL4WRtWqWFDKAJavC bvOV9TDoZbapxiU48Cn6nSpuCre6+1FjE7xgtOKHgPPhj6/ABkRDX3mXEd5TK++Gqy0Q JnlxXwyLVKj1h4ruQ3GQ1wu9HRadPlIs+EIok5h96uJifwaQzJ0WLhqTKjtX84DhBlQY gqc+DI0u9RTR6qlSn0AvYVNMO542NdKyeXM1JIDVLgDJlYiFwS1VGfG99d4TZYbX0r0u GsBw== Received: by 10.50.219.129 with SMTP id po1mr17694418igc.35.1352321656922; Wed, 07 Nov 2012 12:54:16 -0800 (PST) Received: from [192.168.4.87] ([206.223.182.18]) by mx.google.com with ESMTPS id o9sm2774086igd.7.2012.11.07.12.54.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 12:54:16 -0800 (PST) From: Andres Lagar-Cavilla Message-Id: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> Date: Wed, 7 Nov 2012 15:54:22 -0500 To: Tim Deegan , "Keir (Xen.org)" , Jan Beulich , "xen-devel@lists.xen.org" Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQk9W6ApSFSZqRvWxH6REIaXdQF2af9tCbCHkW/7TkY5d6s4Np+hI97RZm1ZEbbF/U5uwreS Subject: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, we currently have a problem in the (x86) mm layer. Callers may request the p2m to perform a translation of a gfn to an mfn. Such translation may need to wait for a third party to service it. This happens when: - a page needs to be paged in - a CoW breaking of a shared page fails due to lack of memory Note that paging in may also fail due to lack of memory. In both ENOMEM cases, all the plumbing for a toolstack to be notified and take some corrective action to release some memory and retry is in place. We also have plumbing for pagers in place. Ideally we want the internals to be self-contained, so that callers need not be concerned with any of this. A request for a p2m translation may or may not sleep, but on exit from the p2m the caller either has an mfn with a page ref, or an error code due to some other condition. Wait queue support in (x86) Xen prevents sleeping on a wait queue if any locks are held, including RCU read-side locks (i.e. BUG_ON(!in_atomic()). For this reason, we have not yet implemented sleeping on the p2m. Callers may get errors telling them to retry. A lot of (imho) ugly code is peppered around the hypervisor to deal with the consequences of this. More fundamentally, in some cases there is no possible elegant handling, and guests are crashed (for example, if a page table page is paged out and the hypervisor needs to translate a guest virtual address to a gfn). This limits the applicability of memory paging and sharing. One way to solve this would be to ensure no code path liable to sleep in a wait queue is holding any locks at wait queue sleep time. I believe this is doomed. Not just because this is a herculean task. It also makes writing hypervisor code *very* difficult. Anyone trying to throw a p2m translation into a code path needs to think of all possible upstream call sequences. Not even RCU read locks are allowed. I'd like to propose an approach that ensures that as long some properties are met, arbitrary wait queue sleep is allowed. Here are the properties: 1. Third parties servicing a wait queue sleep are indeed third parties. In other words, dom0 does not do paging. 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait queue during a foreign map. 3. A guest vcpu may go to sleep on a wait queue holding any kinds of locks as long as it does not hold the p2m lock. 4. "Kick" routines in the hypervisor by which service domains effectively wake up a vcpu may only take the p2m lock to do a fix up of the p2m. 5. Wait queues can be awakened on a special domain destroy condition. Property 1. is hopefully self-evident, and although not enforced in the code it is reasonably simple to do so. Property 2. is also self-evident and enforced in the code today. Property 3. simplifies reasoning about p2m translations and wait queue sleeping. Provides a clean model for reasoning about what might or might not happen. It will require us to restructure some code paths (i.e. XENMEM_add_to_physmap) that require multiple p2m translations in a single critical region to perform all translations up front. Property 4. is already enforced in the code as is right now. Property 5. needs adding some logic to the top of domain destruction: set a flag, wake up all vcpus in wait queues. Extra logic on the wait queue side will exit the wait if the destroy flag is set, with an error. Most if not all callers can deal right now with a p2m translation error (other than paging), and unwind and release all their locks. I confess my understanding of RCU is not 100% there and I am not sure what will happen to force_quiescent_state. I also understand there is a impedance mismatch wrt to "saving" and "restoring" the physical CPU preempt count. Thanks, Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 22:18:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 22:18:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWDwb-0001jP-Rc; Wed, 07 Nov 2012 22:17:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWDwa-0001jK-9e for xen-devel@lists.xen.org; Wed, 07 Nov 2012 22:17:56 +0000 Received: from [85.158.143.35:15809] by server-3.bemta-4.messagelabs.com id BE/2C-06841-31EDA905; Wed, 07 Nov 2012 22:17:55 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1352326670!14966792!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1973 invoked from network); 7 Nov 2012 22:17:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 22:17:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7MHaWh004402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 22:17:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7MHYZo021772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 22:17:35 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7MHYpf025941; Wed, 7 Nov 2012 16:17:34 -0600 MIME-Version: 1.0 Message-ID: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Date: Wed, 7 Nov 2012 14:17:32 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> In-Reply-To: <509791F902000078000A64D4@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: Proposed new "memory capacity claim" hypercall/feature > > > Aren't we getting a little sidetracked here? (Maybe my fault for > > looking at whether this specific loop is fast enough...) > > > > This loop handles only order=N chunks of RAM. Speeding up this > > loop and holding the heap_lock here for a shorter period only helps > > the TOCTOU race if the entire domain can be allocated as a > > single order-N allocation. > > > > Domain creation is supposed to succeed as long as there is > > sufficient RAM, _regardless_ of the state of memory fragmentation, > > correct? > > > > So unless the code for the _entire_ memory allocation path can > > be optimized so that the heap_lock can be held across _all_ the > > allocations necessary to create an arbitrary-sized domain, for > > any arbitrary state of memory fragmentation, the original > > problem has not been solved. > > > > Or am I misunderstanding? > > I think we got here via questioning whether suppressing certain > activities (like tmem causing the allocator visible amount of > available memory) for a brief period of time would be acceptable, > and while that indeed depends on the overall latency of memory > allocation for the domain as a whole, I would be somewhat > tolerant for it to involve a longer suspension period on a highly > fragmented system. > > But of course, if this can be made work uniformly, that would be > preferred. Hi Jan and Keir -- OK, here's a status update. Sorry for the delay but it took awhile for me to refamiliarize myself with the code paths. It appears that the attempt to use 2MB and 1GB pages is done in the toolstack, and if the hypervisor rejects it, toolstack tries smaller pages. Thus, if physical memory is highly fragmented (few or no order>=9 allocations available), this will result in one hypercall per 4k page so a 256GB domain would require 64 million hypercalls. And, since AFAICT, there is no sane way to hold the heap_lock across even two hypercalls, speeding up the in-hypervisor allocation path, by itself, will not solve the TOCTOU race. One option to avoid the 64M hypercalls is to change the Xen ABI to add a new memory hypercall/subop to populate_physmap an arbitrary amount of physical RAM, and have Xen (optionally) try order==18, then order==9, then order==0. I suspect that, even with the overhead of hypercalls removed, the steps required to allocate 64 million pages (including, for example, removing a page from a xen list and adding it to the domain's page list) will consume enough time that holding the heap_lock and/or suppressing micro-allocations for the entire macro-allocation on a fragmented system will still be unacceptable (e.g. at least tens of seconds). However, I am speculating, and I think I can measure it if you (Jan or Keir) feel a measurement is necessary to fully convince you. I think this brings us back to the proposed "claim" hypercall/subop. Unless there are further objections or suggestions for different approaches, I'll commence prototyping it, OK? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 22:18:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 22:18:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWDwb-0001jP-Rc; Wed, 07 Nov 2012 22:17:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWDwa-0001jK-9e for xen-devel@lists.xen.org; Wed, 07 Nov 2012 22:17:56 +0000 Received: from [85.158.143.35:15809] by server-3.bemta-4.messagelabs.com id BE/2C-06841-31EDA905; Wed, 07 Nov 2012 22:17:55 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1352326670!14966792!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1973 invoked from network); 7 Nov 2012 22:17:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 7 Nov 2012 22:17:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA7MHaWh004402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Nov 2012 22:17:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA7MHYZo021772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Nov 2012 22:17:35 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA7MHYpf025941; Wed, 7 Nov 2012 16:17:34 -0600 MIME-Version: 1.0 Message-ID: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Date: Wed, 7 Nov 2012 14:17:32 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> In-Reply-To: <509791F902000078000A64D4@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: Proposed new "memory capacity claim" hypercall/feature > > > Aren't we getting a little sidetracked here? (Maybe my fault for > > looking at whether this specific loop is fast enough...) > > > > This loop handles only order=N chunks of RAM. Speeding up this > > loop and holding the heap_lock here for a shorter period only helps > > the TOCTOU race if the entire domain can be allocated as a > > single order-N allocation. > > > > Domain creation is supposed to succeed as long as there is > > sufficient RAM, _regardless_ of the state of memory fragmentation, > > correct? > > > > So unless the code for the _entire_ memory allocation path can > > be optimized so that the heap_lock can be held across _all_ the > > allocations necessary to create an arbitrary-sized domain, for > > any arbitrary state of memory fragmentation, the original > > problem has not been solved. > > > > Or am I misunderstanding? > > I think we got here via questioning whether suppressing certain > activities (like tmem causing the allocator visible amount of > available memory) for a brief period of time would be acceptable, > and while that indeed depends on the overall latency of memory > allocation for the domain as a whole, I would be somewhat > tolerant for it to involve a longer suspension period on a highly > fragmented system. > > But of course, if this can be made work uniformly, that would be > preferred. Hi Jan and Keir -- OK, here's a status update. Sorry for the delay but it took awhile for me to refamiliarize myself with the code paths. It appears that the attempt to use 2MB and 1GB pages is done in the toolstack, and if the hypervisor rejects it, toolstack tries smaller pages. Thus, if physical memory is highly fragmented (few or no order>=9 allocations available), this will result in one hypercall per 4k page so a 256GB domain would require 64 million hypercalls. And, since AFAICT, there is no sane way to hold the heap_lock across even two hypercalls, speeding up the in-hypervisor allocation path, by itself, will not solve the TOCTOU race. One option to avoid the 64M hypercalls is to change the Xen ABI to add a new memory hypercall/subop to populate_physmap an arbitrary amount of physical RAM, and have Xen (optionally) try order==18, then order==9, then order==0. I suspect that, even with the overhead of hypercalls removed, the steps required to allocate 64 million pages (including, for example, removing a page from a xen list and adding it to the domain's page list) will consume enough time that holding the heap_lock and/or suppressing micro-allocations for the entire macro-allocation on a fragmented system will still be unacceptable (e.g. at least tens of seconds). However, I am speculating, and I think I can measure it if you (Jan or Keir) feel a measurement is necessary to fully convince you. I think this brings us back to the proposed "claim" hypercall/subop. Unless there are further objections or suggestions for different approaches, I'll commence prototyping it, OK? Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 22:55:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 22:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWEWF-0001zh-Sm; Wed, 07 Nov 2012 22:54:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCZD-0000rj-QA for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:49:43 +0000 Received: from [85.158.143.35:3297] by server-1.bemta-4.messagelabs.com id BC/E0-27934-769CA905; Wed, 07 Nov 2012 20:49:43 +0000 X-Env-Sender: bmeyres@gmail.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1352321382!14234367!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30646 invoked from network); 7 Nov 2012 20:49:42 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:49:42 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so402654wib.14 for ; Wed, 07 Nov 2012 12:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=Q0RmtUIHwT23uerz7RFVg7ai8mtsxYfPME+FAIbYPag=; b=JdmpMJfTuzrkwsZOe9Rn9vJI+nUUApdgVXw/UAskbGBQ1s0juSrziQ7nKdB6b1bUzu HcUfT1CuMTW0lMrSKAnpWNNh5dn4yZTL511/PdgbqM26WtNQoDcGR/A6Bp2mcTUE8q+b mU2JpDvoy1E36Hxj8Vp8m5QBv1B1+wAVdln2kd1/Kl9ih5txJgsqZXqAUpzrQdjvAMY9 63gMeEyxOaXWxuCJcYJNbVXNk1yRQjsZstOfpalQNd1sjgTnV+1JdXEaip6km37BwB6n MUhMcsTs+Ymtk9pmKmMKDpHEfG0PsPws3UPWRtm710nDqOrqfRodgsmqzkXfKHcC14Bd deOQ== MIME-Version: 1.0 Received: by 10.216.209.40 with SMTP id r40mr2456270weo.144.1352321382326; Wed, 07 Nov 2012 12:49:42 -0800 (PST) Received: by 10.216.106.130 with HTTP; Wed, 7 Nov 2012 12:49:42 -0800 (PST) Date: Wed, 7 Nov 2012 20:49:42 +0000 Message-ID: From: Ben Eyres To: xen-devel@lists.xen.org X-Mailman-Approved-At: Wed, 07 Nov 2012 22:54:47 +0000 Subject: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0467306419086526176==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0467306419086526176== Content-Type: multipart/alternative; boundary=0016e6d9a1189d9fe804cdeddb61 --0016e6d9a1189d9fe804cdeddb61 Content-Type: text/plain; charset=ISO-8859-1 Hello, This is probably quite a vague and simple question but here goes...Can anyone tell me where in the Xen-4.2.0 source files i can find source code for the virtual switching (Vif/Pif')? This is the first time i have worked with the Xen source code so struggling to work my way around the system. Thanks very much!! Ben --0016e6d9a1189d9fe804cdeddb61 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hello,

This is probably quite a vague and simple q= uestion but here goes...Can anyone tell me where in the Xen-4.2.0 source fi= les i can find source code for the virtual switching (Vif/Pif')? This i= s the first time i have worked with the Xen source code so struggling to wo= rk my way around the system.

Thanks very much!!
Ben
--0016e6d9a1189d9fe804cdeddb61-- --===============0467306419086526176== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0467306419086526176==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 22:55:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 22:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWEWF-0001zh-Sm; Wed, 07 Nov 2012 22:54:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWCZD-0000rj-QA for xen-devel@lists.xen.org; Wed, 07 Nov 2012 20:49:43 +0000 Received: from [85.158.143.35:3297] by server-1.bemta-4.messagelabs.com id BC/E0-27934-769CA905; Wed, 07 Nov 2012 20:49:43 +0000 X-Env-Sender: bmeyres@gmail.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1352321382!14234367!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30646 invoked from network); 7 Nov 2012 20:49:42 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 20:49:42 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so402654wib.14 for ; Wed, 07 Nov 2012 12:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=Q0RmtUIHwT23uerz7RFVg7ai8mtsxYfPME+FAIbYPag=; b=JdmpMJfTuzrkwsZOe9Rn9vJI+nUUApdgVXw/UAskbGBQ1s0juSrziQ7nKdB6b1bUzu HcUfT1CuMTW0lMrSKAnpWNNh5dn4yZTL511/PdgbqM26WtNQoDcGR/A6Bp2mcTUE8q+b mU2JpDvoy1E36Hxj8Vp8m5QBv1B1+wAVdln2kd1/Kl9ih5txJgsqZXqAUpzrQdjvAMY9 63gMeEyxOaXWxuCJcYJNbVXNk1yRQjsZstOfpalQNd1sjgTnV+1JdXEaip6km37BwB6n MUhMcsTs+Ymtk9pmKmMKDpHEfG0PsPws3UPWRtm710nDqOrqfRodgsmqzkXfKHcC14Bd deOQ== MIME-Version: 1.0 Received: by 10.216.209.40 with SMTP id r40mr2456270weo.144.1352321382326; Wed, 07 Nov 2012 12:49:42 -0800 (PST) Received: by 10.216.106.130 with HTTP; Wed, 7 Nov 2012 12:49:42 -0800 (PST) Date: Wed, 7 Nov 2012 20:49:42 +0000 Message-ID: From: Ben Eyres To: xen-devel@lists.xen.org X-Mailman-Approved-At: Wed, 07 Nov 2012 22:54:47 +0000 Subject: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0467306419086526176==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0467306419086526176== Content-Type: multipart/alternative; boundary=0016e6d9a1189d9fe804cdeddb61 --0016e6d9a1189d9fe804cdeddb61 Content-Type: text/plain; charset=ISO-8859-1 Hello, This is probably quite a vague and simple question but here goes...Can anyone tell me where in the Xen-4.2.0 source files i can find source code for the virtual switching (Vif/Pif')? This is the first time i have worked with the Xen source code so struggling to work my way around the system. Thanks very much!! Ben --0016e6d9a1189d9fe804cdeddb61 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hello,

This is probably quite a vague and simple q= uestion but here goes...Can anyone tell me where in the Xen-4.2.0 source fi= les i can find source code for the virtual switching (Vif/Pif')? This i= s the first time i have worked with the Xen source code so struggling to wo= rk my way around the system.

Thanks very much!!
Ben
--0016e6d9a1189d9fe804cdeddb61-- --===============0467306419086526176== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0467306419086526176==-- From xen-devel-bounces@lists.xen.org Wed Nov 07 23:33:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 23:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWF7V-0002Lb-As; Wed, 07 Nov 2012 23:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWF7T-0002LW-KI for xen-devel@lists.xen.org; Wed, 07 Nov 2012 23:33:15 +0000 Received: from [85.158.143.35:5942] by server-1.bemta-4.messagelabs.com id 79/62-27934-ABFEA905; Wed, 07 Nov 2012 23:33:14 +0000 X-Env-Sender: joseph.glanville@orionvm.com.au X-Msg-Ref: server-12.tower-21.messagelabs.com!1352331192!12700870!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3178 invoked from network); 7 Nov 2012 23:33:13 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 23:33:13 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3950699iea.32 for ; Wed, 07 Nov 2012 15:33:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=4WR14jUDB+HWDU7Nf2zUVkdMfhPVVJwrAYYhAkVjXoI=; b=S9sjaStb6XGscni+nv4SmKF1I6d1YRTACHipAo6pUDXIomMJ0ado7+Q8TrE4HZjFel gYyKeYx3pyAISZy0ZHMhYWaaQe47sGLRYBklXGuqZ93D7+TOJUzGlAF5KdXmfnQg+0ja EFzdj0yWfy/nK2nekXU/BkdNj6DSWl0rY9JfKo0I9i98DQk7lA1lriyz8bWe2ow3PX1/ T3pFw05clD7q4xKOMOiJqvKRiyxOT4lAhgsS18rUcUTUBd20Ea+SRX7zbkL2WvIk7C1c TqYTcJjwVmO9n7AU1xzEMnMhmrhgwJDIiNtCYomj/xVNIa0y0NReZ6No0dSqy3ibOdi2 KCBw== MIME-Version: 1.0 Received: by 10.50.168.10 with SMTP id zs10mr3779480igb.31.1352331190573; Wed, 07 Nov 2012 15:33:10 -0800 (PST) Received: by 10.50.20.165 with HTTP; Wed, 7 Nov 2012 15:33:10 -0800 (PST) X-Originating-IP: [121.44.2.128] In-Reply-To: References: Date: Thu, 8 Nov 2012 10:33:10 +1100 Message-ID: From: Joseph Glanville To: Ben Eyres X-Gm-Message-State: ALoCoQmFoVpeawOtyrgtKD0tsgBO3jKH3VujCCRKw8gvu6bTrR0CcYUW47Ex16TRVA3WfUAjpEai Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 8 November 2012 07:49, Ben Eyres wrote: > Hello, > > This is probably quite a vague and simple question but here goes...Can > anyone tell me where in the Xen-4.2.0 source files i can find source code > for the virtual switching (Vif/Pif')? This is the first time i have worked > with the Xen source code so struggling to work my way around the system. The virtual switching is not done by Xen but rather by the Linux bridge module or Open vSwitch etc. If you are interested in how virtual adapters are created and packets transfered from domU to domO I suggest looking at the Linux source tree in drivers/net/ for netback/netfront. > > Thanks very much!! > Ben > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > -- CTO | Orion Virtualisation Solutions | www.orionvm.com.au Phone: 1300 56 99 52 | Mobile: 0428 754 846 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 07 23:33:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 07 Nov 2012 23:33:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWF7V-0002Lb-As; Wed, 07 Nov 2012 23:33:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWF7T-0002LW-KI for xen-devel@lists.xen.org; Wed, 07 Nov 2012 23:33:15 +0000 Received: from [85.158.143.35:5942] by server-1.bemta-4.messagelabs.com id 79/62-27934-ABFEA905; Wed, 07 Nov 2012 23:33:14 +0000 X-Env-Sender: joseph.glanville@orionvm.com.au X-Msg-Ref: server-12.tower-21.messagelabs.com!1352331192!12700870!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3178 invoked from network); 7 Nov 2012 23:33:13 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2012 23:33:13 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so3950699iea.32 for ; Wed, 07 Nov 2012 15:33:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=4WR14jUDB+HWDU7Nf2zUVkdMfhPVVJwrAYYhAkVjXoI=; b=S9sjaStb6XGscni+nv4SmKF1I6d1YRTACHipAo6pUDXIomMJ0ado7+Q8TrE4HZjFel gYyKeYx3pyAISZy0ZHMhYWaaQe47sGLRYBklXGuqZ93D7+TOJUzGlAF5KdXmfnQg+0ja EFzdj0yWfy/nK2nekXU/BkdNj6DSWl0rY9JfKo0I9i98DQk7lA1lriyz8bWe2ow3PX1/ T3pFw05clD7q4xKOMOiJqvKRiyxOT4lAhgsS18rUcUTUBd20Ea+SRX7zbkL2WvIk7C1c TqYTcJjwVmO9n7AU1xzEMnMhmrhgwJDIiNtCYomj/xVNIa0y0NReZ6No0dSqy3ibOdi2 KCBw== MIME-Version: 1.0 Received: by 10.50.168.10 with SMTP id zs10mr3779480igb.31.1352331190573; Wed, 07 Nov 2012 15:33:10 -0800 (PST) Received: by 10.50.20.165 with HTTP; Wed, 7 Nov 2012 15:33:10 -0800 (PST) X-Originating-IP: [121.44.2.128] In-Reply-To: References: Date: Thu, 8 Nov 2012 10:33:10 +1100 Message-ID: From: Joseph Glanville To: Ben Eyres X-Gm-Message-State: ALoCoQmFoVpeawOtyrgtKD0tsgBO3jKH3VujCCRKw8gvu6bTrR0CcYUW47Ex16TRVA3WfUAjpEai Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 8 November 2012 07:49, Ben Eyres wrote: > Hello, > > This is probably quite a vague and simple question but here goes...Can > anyone tell me where in the Xen-4.2.0 source files i can find source code > for the virtual switching (Vif/Pif')? This is the first time i have worked > with the Xen source code so struggling to work my way around the system. The virtual switching is not done by Xen but rather by the Linux bridge module or Open vSwitch etc. If you are interested in how virtual adapters are created and packets transfered from domU to domO I suggest looking at the Linux source tree in drivers/net/ for netback/netfront. > > Thanks very much!! > Ben > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > -- CTO | Orion Virtualisation Solutions | www.orionvm.com.au Phone: 1300 56 99 52 | Mobile: 0428 754 846 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 01:22:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 01:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGof-0006vr-Ka; Thu, 08 Nov 2012 01:21:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGod-0006vm-QS for xen-devel@lists.xen.org; Thu, 08 Nov 2012 01:21:56 +0000 Received: from [85.158.137.99:25814] by server-5.bemta-3.messagelabs.com id 0A/C9-26311-E290B905; Thu, 08 Nov 2012 01:21:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352337708!18195291!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1668 invoked from network); 8 Nov 2012 01:21:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 01:21:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA81LOCd030236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 01:21:25 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA81LNjv004998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 01:21:24 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA81LNWK003666; Wed, 7 Nov 2012 19:21:23 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 17:21:23 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E4E664019F; Wed, 7 Nov 2012 20:08:36 -0500 (EST) Date: Wed, 7 Nov 2012 20:08:36 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121108010836.GB21302@phenom.dumpdata.com> References: <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> <20121107160301.GF18615@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 04:52:50PM +0000, Liu, Jinsong wrote: > Konrad Rzeszutek Wilk wrote: > > On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: > >>>>> > >>>>> If it is generic ACPI code, than it can depend only on ACPI. > >>>>> If it is ACPI code that contains X86 specific info, than it needs > >>>>> to depend on X86 too. > >>>> > >>>> No x86 specific so let's depend on ACPI. > >>> > >>> Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > >>> spec, but only x86 does it right? > >> > >> OK, updated w/ ACPI & X86 dependency, and per other comments. > > > > Ok. Could you send all the patchset in one go. I am bit lost of which > > one to review as none of them seem to have the version information > > [vX: Did this yyy] > > Not quite clear your meaning, do you mean not reply old email and start a new thread with title like > [PATCH vX 1/2]: xen/acpi: ACPI PAD driver > [PATCH vX 2/2]: ... Have you ever used git-send email? If you repost them all it comes out threaded and it makes it easy to apply the whole patchset in one go. > ? > > > > > right above your name or in the title: > > [PATCH vX 1/2]: yyyy > > > > anyhow, some comments below. > > > > OK. > > Thanks, > Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 01:22:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 01:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGof-0006vr-Ka; Thu, 08 Nov 2012 01:21:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGod-0006vm-QS for xen-devel@lists.xen.org; Thu, 08 Nov 2012 01:21:56 +0000 Received: from [85.158.137.99:25814] by server-5.bemta-3.messagelabs.com id 0A/C9-26311-E290B905; Thu, 08 Nov 2012 01:21:50 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-16.tower-217.messagelabs.com!1352337708!18195291!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1668 invoked from network); 8 Nov 2012 01:21:49 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 01:21:49 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA81LOCd030236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 01:21:25 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA81LNjv004998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 01:21:24 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA81LNWK003666; Wed, 7 Nov 2012 19:21:23 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 17:21:23 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E4E664019F; Wed, 7 Nov 2012 20:08:36 -0500 (EST) Date: Wed, 7 Nov 2012 20:08:36 -0500 From: Konrad Rzeszutek Wilk To: "Liu, Jinsong" Message-ID: <20121108010836.GB21302@phenom.dumpdata.com> References: <20121102164937.GC27213@konrad-lan.dumpdata.com> <20121106164303.GO9966@phenom.dumpdata.com> <20121107160301.GF18615@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Konrad Rzeszutek Wilk , "xen-devel@lists.xen.org" , "linux-kernel@vger.kernel.org" , Jan Beulich , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/2] Xen acpi pad implement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 04:52:50PM +0000, Liu, Jinsong wrote: > Konrad Rzeszutek Wilk wrote: > > On Wed, Nov 07, 2012 at 12:58:19PM +0000, Liu, Jinsong wrote: > >>>>> > >>>>> If it is generic ACPI code, than it can depend only on ACPI. > >>>>> If it is ACPI code that contains X86 specific info, than it needs > >>>>> to depend on X86 too. > >>>> > >>>> No x86 specific so let's depend on ACPI. > >>> > >>> Huh? This feature is x86 specific isn't it? I mean it is in the ACPI > >>> spec, but only x86 does it right? > >> > >> OK, updated w/ ACPI & X86 dependency, and per other comments. > > > > Ok. Could you send all the patchset in one go. I am bit lost of which > > one to review as none of them seem to have the version information > > [vX: Did this yyy] > > Not quite clear your meaning, do you mean not reply old email and start a new thread with title like > [PATCH vX 1/2]: xen/acpi: ACPI PAD driver > [PATCH vX 2/2]: ... Have you ever used git-send email? If you repost them all it comes out threaded and it makes it easy to apply the whole patchset in one go. > ? > > > > > right above your name or in the title: > > [PATCH vX 1/2]: yyyy > > > > anyhow, some comments below. > > > > OK. > > Thanks, > Jinsong _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 01:23:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 01:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGpy-0006zS-3m; Thu, 08 Nov 2012 01:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGpw-0006zK-Vi for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 01:23:17 +0000 Received: from [85.158.139.211:57657] by server-12.bemta-5.messagelabs.com id D1/7F-02886-4890B905; Thu, 08 Nov 2012 01:23:16 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1352337793!19254806!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 921 invoked from network); 8 Nov 2012 01:23:15 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 01:23:15 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA81MvrQ031243 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 01:22:58 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA81MtjN025116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 01:22:56 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA81MrSS025719; Wed, 7 Nov 2012 19:22:53 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 17:22:53 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id AC6FF4019F; Wed, 7 Nov 2012 20:10:06 -0500 (EST) Date: Wed, 7 Nov 2012 20:10:06 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121108011006.GC21302@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509AA501.1090701@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 01:14:25PM -0500, Matthew Fioravante wrote: > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >Hi Matthew, > > > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux > >>from the linux-2.6.18-xen.hg tree to linux-stable. > >> > >>Signed-off-by: Matthew Fioravante > >>--- > >> drivers/char/tpm/Kconfig | 9 + > >> drivers/char/tpm/Makefile | 2 + > >> drivers/char/tpm/tpm.h | 15 + > >> drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > >> drivers/char/tpm/tpm_vtpm.h | 55 +++ > >> drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > >> include/xen/interface/io/tpmif.h | 77 +++++ > >> 7 files changed, 1391 insertions(+) > >> create mode 100644 drivers/char/tpm/tpm_vtpm.c > >> create mode 100644 drivers/char/tpm/tpm_vtpm.h > >> create mode 100644 drivers/char/tpm/tpm_xen.c > >> create mode 100644 include/xen/interface/io/tpmif.h > >> > >>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > >>index 915875e..08c1010 100644 > >>--- a/drivers/char/tpm/Kconfig > >>+++ b/drivers/char/tpm/Kconfig > >>@@ -81,4 +81,13 @@ config TCG_IBMVTPM > >> will be accessible from within Linux. To compile this driver > >> as a module, choose M here; the module will be called tpm_ibmvtpm. > >> > >>+config TCG_XEN > >>+ tristate "XEN TPM Interface" > >>+ depends on TCG_TPM && XEN > >>+ ---help--- > >>+ If you want to make TPM support available to a Xen user domain, > >>+ say Yes and it will be accessible from within Linux. > >>+ To compile this driver as a module, choose M here; the module > >>+ will be called tpm_xenu. > >>+ > >> endif # TCG_TPM > >>diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > >>index 5b3fc8b..16911c5 100644 > >>--- a/drivers/char/tpm/Makefile > >>+++ b/drivers/char/tpm/Makefile > >>@@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > >> obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > >> obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > >> obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > >>+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > >>+tpm_xenu-y = tpm_xen.o tpm_vtpm.o > > Let's match the naming convention of the other drivers if we can, so this > >would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... > Makes sense, fixed. > > > >>diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > >>index 8ef7649..2e5a47a 100644 > >>--- a/drivers/char/tpm/tpm.h > >>+++ b/drivers/char/tpm/tpm.h > >>@@ -130,6 +130,9 @@ struct tpm_chip { > >> > >> struct list_head list; > >> void (*release) (struct device *); > >>+#if CONFIG_XEN > >>+ void *priv; > >>+#endif > > Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is > >already using that as a priv pointer. I should probably change that name > >to make it more obvious what that's used for. > That makes more sense. I'm guessing your data pointer didn't exist > during the 2.6.18 kernel which is why they added their own priv > pointer. > > > >> }; > >> > >> #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > >>@@ -310,6 +313,18 @@ struct tpm_cmd_t { > >> > >> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >> > >>+#ifdef CONFIG_XEN > >>+static inline void *chip_get_private(const struct tpm_chip *chip) > >>+{ > >>+ return chip->priv; > >>+} > >>+ > >>+static inline void chip_set_private(struct tpm_chip *chip, void *priv) > >>+{ > >>+ chip->priv = priv; > >>+} > >>+#endif > > Can you put these in tpm_vtpm.c please? One less #define. :-) > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > > >[cut] > >>+#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > >>+#define __XEN_PUBLIC_IO_TPMIF_H__ > >>+ > >>+#include "../grant_table.h" > >>+ > >>+struct tpmif_tx_request { > >>+ unsigned long addr; /* Machine address of packet. */ > >>+ grant_ref_t ref; /* grant table access reference */ > >>+ uint16_t unused; > >>+ uint16_t size; /* Packet size in bytes. */ > >>+}; > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > checkpatch warned on this new typedef - please run through checkpatch > >and fix up that stuff. > tpmif.h has a couple of typedefs which do trigger checkpatch > warnings. However it looks like the paradigm for xen is to have > these interface/io/if.h files and all of them have typedefs. I > think in this case the typedef should probably stay. > > Konrad your thoughts here? Rip them out plea > > > >>+ > >>+/* > >>+ * The TPMIF_TX_RING_SIZE defines the number of pages the > >>+ * front-end and backend can exchange (= size of array). > >>+ */ > >>+typedef uint32_t TPMIF_RING_IDX; > >>+ > >>+#define TPMIF_TX_RING_SIZE 1 > >>+ > >>+/* This structure must fit in a memory page. */ > >>+ > >>+struct tpmif_ring { > >>+ struct tpmif_tx_request req; > >>+}; > >>+typedef struct tpmif_ring tpmif_ring_t; > >>+ > >>+struct tpmif_tx_interface { > >>+ struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > >>+}; > >>+typedef struct tpmif_tx_interface tpmif_tx_interface_t; > >>+ > >>+#endif > >>+ > >>+/* > >>+ * Local variables: > >>+ * mode: C > >>+ * c-set-style: "BSD" > >>+ * c-basic-offset: 4 > >>+ * tab-width: 4 > >>+ * indent-tabs-mode: nil > >>+ * End: > >>+ */ > > Please take this comment out, see Documentation/CodingStyle. > Fixed > > > >Thanks, > >Kent > > > >>-- > >>1.7.10.4 > >> > >> > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 01:23:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 01:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGpy-0006zS-3m; Thu, 08 Nov 2012 01:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWGpw-0006zK-Vi for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 01:23:17 +0000 Received: from [85.158.139.211:57657] by server-12.bemta-5.messagelabs.com id D1/7F-02886-4890B905; Thu, 08 Nov 2012 01:23:16 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1352337793!19254806!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0NzE2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 921 invoked from network); 8 Nov 2012 01:23:15 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 01:23:15 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA81MvrQ031243 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 01:22:58 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA81MtjN025116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 01:22:56 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA81MrSS025719; Wed, 7 Nov 2012 19:22:53 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2012 17:22:53 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id AC6FF4019F; Wed, 7 Nov 2012 20:10:06 -0500 (EST) Date: Wed, 7 Nov 2012 20:10:06 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121108011006.GC21302@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509AA501.1090701@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, Nov 07, 2012 at 01:14:25PM -0500, Matthew Fioravante wrote: > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >Hi Matthew, > > > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux > >>from the linux-2.6.18-xen.hg tree to linux-stable. > >> > >>Signed-off-by: Matthew Fioravante > >>--- > >> drivers/char/tpm/Kconfig | 9 + > >> drivers/char/tpm/Makefile | 2 + > >> drivers/char/tpm/tpm.h | 15 + > >> drivers/char/tpm/tpm_vtpm.c | 543 ++++++++++++++++++++++++++++++ > >> drivers/char/tpm/tpm_vtpm.h | 55 +++ > >> drivers/char/tpm/tpm_xen.c | 690 ++++++++++++++++++++++++++++++++++++++ > >> include/xen/interface/io/tpmif.h | 77 +++++ > >> 7 files changed, 1391 insertions(+) > >> create mode 100644 drivers/char/tpm/tpm_vtpm.c > >> create mode 100644 drivers/char/tpm/tpm_vtpm.h > >> create mode 100644 drivers/char/tpm/tpm_xen.c > >> create mode 100644 include/xen/interface/io/tpmif.h > >> > >>diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > >>index 915875e..08c1010 100644 > >>--- a/drivers/char/tpm/Kconfig > >>+++ b/drivers/char/tpm/Kconfig > >>@@ -81,4 +81,13 @@ config TCG_IBMVTPM > >> will be accessible from within Linux. To compile this driver > >> as a module, choose M here; the module will be called tpm_ibmvtpm. > >> > >>+config TCG_XEN > >>+ tristate "XEN TPM Interface" > >>+ depends on TCG_TPM && XEN > >>+ ---help--- > >>+ If you want to make TPM support available to a Xen user domain, > >>+ say Yes and it will be accessible from within Linux. > >>+ To compile this driver as a module, choose M here; the module > >>+ will be called tpm_xenu. > >>+ > >> endif # TCG_TPM > >>diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > >>index 5b3fc8b..16911c5 100644 > >>--- a/drivers/char/tpm/Makefile > >>+++ b/drivers/char/tpm/Makefile > >>@@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > >> obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > >> obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > >> obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > >>+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o > >>+tpm_xenu-y = tpm_xen.o tpm_vtpm.o > > Let's match the naming convention of the other drivers if we can, so this > >would be something like tpm_xenvtpm.c. tpm_vtpm is too generic... > Makes sense, fixed. > > > >>diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > >>index 8ef7649..2e5a47a 100644 > >>--- a/drivers/char/tpm/tpm.h > >>+++ b/drivers/char/tpm/tpm.h > >>@@ -130,6 +130,9 @@ struct tpm_chip { > >> > >> struct list_head list; > >> void (*release) (struct device *); > >>+#if CONFIG_XEN > >>+ void *priv; > >>+#endif > > Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is > >already using that as a priv pointer. I should probably change that name > >to make it more obvious what that's used for. > That makes more sense. I'm guessing your data pointer didn't exist > during the 2.6.18 kernel which is why they added their own priv > pointer. > > > >> }; > >> > >> #define to_tpm_chip(n) container_of(n, struct tpm_chip, vendor) > >>@@ -310,6 +313,18 @@ struct tpm_cmd_t { > >> > >> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >> > >>+#ifdef CONFIG_XEN > >>+static inline void *chip_get_private(const struct tpm_chip *chip) > >>+{ > >>+ return chip->priv; > >>+} > >>+ > >>+static inline void chip_set_private(struct tpm_chip *chip, void *priv) > >>+{ > >>+ chip->priv = priv; > >>+} > >>+#endif > > Can you put these in tpm_vtpm.c please? One less #define. :-) > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > > >[cut] > >>+#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > >>+#define __XEN_PUBLIC_IO_TPMIF_H__ > >>+ > >>+#include "../grant_table.h" > >>+ > >>+struct tpmif_tx_request { > >>+ unsigned long addr; /* Machine address of packet. */ > >>+ grant_ref_t ref; /* grant table access reference */ > >>+ uint16_t unused; > >>+ uint16_t size; /* Packet size in bytes. */ > >>+}; > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > checkpatch warned on this new typedef - please run through checkpatch > >and fix up that stuff. > tpmif.h has a couple of typedefs which do trigger checkpatch > warnings. However it looks like the paradigm for xen is to have > these interface/io/if.h files and all of them have typedefs. I > think in this case the typedef should probably stay. > > Konrad your thoughts here? Rip them out plea > > > >>+ > >>+/* > >>+ * The TPMIF_TX_RING_SIZE defines the number of pages the > >>+ * front-end and backend can exchange (= size of array). > >>+ */ > >>+typedef uint32_t TPMIF_RING_IDX; > >>+ > >>+#define TPMIF_TX_RING_SIZE 1 > >>+ > >>+/* This structure must fit in a memory page. */ > >>+ > >>+struct tpmif_ring { > >>+ struct tpmif_tx_request req; > >>+}; > >>+typedef struct tpmif_ring tpmif_ring_t; > >>+ > >>+struct tpmif_tx_interface { > >>+ struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > >>+}; > >>+typedef struct tpmif_tx_interface tpmif_tx_interface_t; > >>+ > >>+#endif > >>+ > >>+/* > >>+ * Local variables: > >>+ * mode: C > >>+ * c-set-style: "BSD" > >>+ * c-basic-offset: 4 > >>+ * tab-width: 4 > >>+ * indent-tabs-mode: nil > >>+ * End: > >>+ */ > > Please take this comment out, see Documentation/CodingStyle. > Fixed > > > >Thanks, > >Kent > > > >>-- > >>1.7.10.4 > >> > >> > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 03:23:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 03:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWIhe-0007z9-Ta; Thu, 08 Nov 2012 03:22:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWIhd-0007z4-4C for xen-devel@lists.xen.org; Thu, 08 Nov 2012 03:22:49 +0000 Received: from [85.158.139.83:47214] by server-13.bemta-5.messagelabs.com id 31/1B-27809-8852B905; Thu, 08 Nov 2012 03:22:48 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-3.tower-182.messagelabs.com!1352344965!29271185!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25549 invoked from network); 8 Nov 2012 03:22:47 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 03:22:47 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so1946631iam.32 for ; Wed, 07 Nov 2012 19:22:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=2FRcr7ShBuwdj1aoiqH/zclE1VC1zCp+Bul6VsnkKOs=; b=pndh3K1OTikWw1fUzRQewJbjSXC3hN8U16N1sG7DKy6QKwaimgsysKgx0/d9tH7mH2 V8Kue72zvueOqF+DbhDNq1rRD5SGL7mdOsN0IvqlaqIHiR8k7IkJd0seZ2PFJ1yzfDk8 jf9G04G/yRlTAwEQcERASEm+Dy0Bkuhy3OaOCHxYV3slPkNvhD8vfoTKjsxoUjHttVNm VrwKc4s4pegHEB+pU0wuUk+7tRtwiRHZ3SClbAGhq20D6JIq31gQvtPHJLUTdj+j6KSm JE0EACoeO0qQzI581wgKk5UgZfTEGUubOLR4wGwhgPIR2RJTRR8iTXjZ0UJ82fpFJG6W JZWQ== Received: by 10.50.237.6 with SMTP id uy6mr4226944igc.31.1352344965163; Wed, 07 Nov 2012 19:22:45 -0800 (PST) Received: from [192.168.1.101] (206-248-157-158.dsl.teksavvy.com. [206.248.157.158]) by mx.google.com with ESMTPS id kp4sm3789056igc.1.2012.11.07.19.22.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 19:22:44 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> Date: Wed, 7 Nov 2012 22:22:51 -0500 Message-Id: <25D45C62-FB0E-4345-A5A1-9A37F219477B@gridcentric.ca> References: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> To: Tim Deegan , "Keir (Xen.org)" , Jan Beulich , "xen-devel@lists.xen.org" X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQmyecRSUPRp+DjKx4LEWUHGqV7lLj9qyJr118+VgbHZbNjTZcWNQFtZDfD7Y97q69CAfFjl Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 7, 2012, at 3:54 PM, Andres Lagar-Cavilla wr= ote: > Hi all, > we currently have a problem in the (x86) mm layer. Callers may request th= e p2m to perform a translation of a gfn to an mfn. Such translation may nee= d to wait for a third party to service it. This happens when: > = > - a page needs to be paged in > - a CoW breaking of a shared page fails due to lack of memory > = > Note that paging in may also fail due to lack of memory. In both ENOMEM c= ases, all the plumbing for a toolstack to be notified and take some correct= ive action to release some memory and retry is in place. We also have plumb= ing for pagers in place. > = > Ideally we want the internals to be self-contained, so that callers need = not be concerned with any of this. A request for a p2m translation may or m= ay not sleep, but on exit from the p2m the caller either has an mfn with a = page ref, or an error code due to some other condition. > = > Wait queue support in (x86) Xen prevents sleeping on a wait queue if any = locks are held, including RCU read-side locks (i.e. BUG_ON(!in_atomic()). > = > For this reason, we have not yet implemented sleeping on the p2m. Callers= may get errors telling them to retry. A lot of (imho) ugly code is peppere= d around the hypervisor to deal with the consequences of this. More fundame= ntally, in some cases there is no possible elegant handling, and guests are= crashed (for example, if a page table page is paged out and the hypervisor= needs to translate a guest virtual address to a gfn). This limits the appl= icability of memory paging and sharing. > = > One way to solve this would be to ensure no code path liable to sleep in = a wait queue is holding any locks at wait queue sleep time. I believe this = is doomed. Not just because this is a herculean task. It also makes writing= hypervisor code *very* difficult. Anyone trying to throw a p2m translation= into a code path needs to think of all possible upstream call sequences. N= ot even RCU read locks are allowed. > = > I'd like to propose an approach that ensures that as long some properties= are met, arbitrary wait queue sleep is allowed. Here are the properties: > 1. Third parties servicing a wait queue sleep are indeed third parties. I= n other words, dom0 does not do paging. > 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait= queue during a foreign map. > 3. A guest vcpu may go to sleep on a wait queue holding any kinds of lock= s as long as it does not hold the p2m lock. N.B: I understand (now) this may cause any other vcpu contending on a lock = held by the wait queue sleeper to not yield to the scheduler and pin its ph= ysical cpu. What I am struggling with is coming up with a solution that doesn't turn hy= pervisor mm hacking into a locking minefield. Linux fixes this with many kinds of sleeping synchronization primitives. A = task can, for example, hold the mmap semaphore and sleep on a wait queue. I= s this the only way out of this mess? Not if wait queues force the vcpu to = wake up on the same phys cpu it was using at the time of sleeping=85. Andres > 4. "Kick" routines in the hypervisor by which service domains effectively= wake up a vcpu may only take the p2m lock to do a fix up of the p2m. > 5. Wait queues can be awakened on a special domain destroy condition. > = > Property 1. is hopefully self-evident, and although not enforced in the c= ode it is reasonably simple to do so. > = > Property 2. is also self-evident and enforced in the code today. > = > Property 3. simplifies reasoning about p2m translations and wait queue sl= eeping. Provides a clean model for reasoning about what might or might not = happen. It will require us to restructure some code paths (i.e. XENMEM_add_= to_physmap) that require multiple p2m translations in a single critical reg= ion to perform all translations up front. > = > Property 4. is already enforced in the code as is right now. > = > Property 5. needs adding some logic to the top of domain destruction: set= a flag, wake up all vcpus in wait queues. Extra logic on the wait queue si= de will exit the wait if the destroy flag is set, with an error. Most if no= t all callers can deal right now with a p2m translation error (other than p= aging), and unwind and release all their locks. > = > I confess my understanding of RCU is not 100% there and I am not sure wha= t will happen to force_quiescent_state. I also understand there is a impeda= nce mismatch wrt to "saving" and "restoring" the physical CPU preempt count. > = > Thanks, > Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 03:23:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 03:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWIhe-0007z9-Ta; Thu, 08 Nov 2012 03:22:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWIhd-0007z4-4C for xen-devel@lists.xen.org; Thu, 08 Nov 2012 03:22:49 +0000 Received: from [85.158.139.83:47214] by server-13.bemta-5.messagelabs.com id 31/1B-27809-8852B905; Thu, 08 Nov 2012 03:22:48 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-3.tower-182.messagelabs.com!1352344965!29271185!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25549 invoked from network); 8 Nov 2012 03:22:47 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 03:22:47 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so1946631iam.32 for ; Wed, 07 Nov 2012 19:22:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=2FRcr7ShBuwdj1aoiqH/zclE1VC1zCp+Bul6VsnkKOs=; b=pndh3K1OTikWw1fUzRQewJbjSXC3hN8U16N1sG7DKy6QKwaimgsysKgx0/d9tH7mH2 V8Kue72zvueOqF+DbhDNq1rRD5SGL7mdOsN0IvqlaqIHiR8k7IkJd0seZ2PFJ1yzfDk8 jf9G04G/yRlTAwEQcERASEm+Dy0Bkuhy3OaOCHxYV3slPkNvhD8vfoTKjsxoUjHttVNm VrwKc4s4pegHEB+pU0wuUk+7tRtwiRHZ3SClbAGhq20D6JIq31gQvtPHJLUTdj+j6KSm JE0EACoeO0qQzI581wgKk5UgZfTEGUubOLR4wGwhgPIR2RJTRR8iTXjZ0UJ82fpFJG6W JZWQ== Received: by 10.50.237.6 with SMTP id uy6mr4226944igc.31.1352344965163; Wed, 07 Nov 2012 19:22:45 -0800 (PST) Received: from [192.168.1.101] (206-248-157-158.dsl.teksavvy.com. [206.248.157.158]) by mx.google.com with ESMTPS id kp4sm3789056igc.1.2012.11.07.19.22.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 19:22:44 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> Date: Wed, 7 Nov 2012 22:22:51 -0500 Message-Id: <25D45C62-FB0E-4345-A5A1-9A37F219477B@gridcentric.ca> References: <521A2B7F-054A-4CFC-9631-615CC7444595@gridcentric.ca> To: Tim Deegan , "Keir (Xen.org)" , Jan Beulich , "xen-devel@lists.xen.org" X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQmyecRSUPRp+DjKx4LEWUHGqV7lLj9qyJr118+VgbHZbNjTZcWNQFtZDfD7Y97q69CAfFjl Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 7, 2012, at 3:54 PM, Andres Lagar-Cavilla wr= ote: > Hi all, > we currently have a problem in the (x86) mm layer. Callers may request th= e p2m to perform a translation of a gfn to an mfn. Such translation may nee= d to wait for a third party to service it. This happens when: > = > - a page needs to be paged in > - a CoW breaking of a shared page fails due to lack of memory > = > Note that paging in may also fail due to lack of memory. In both ENOMEM c= ases, all the plumbing for a toolstack to be notified and take some correct= ive action to release some memory and retry is in place. We also have plumb= ing for pagers in place. > = > Ideally we want the internals to be self-contained, so that callers need = not be concerned with any of this. A request for a p2m translation may or m= ay not sleep, but on exit from the p2m the caller either has an mfn with a = page ref, or an error code due to some other condition. > = > Wait queue support in (x86) Xen prevents sleeping on a wait queue if any = locks are held, including RCU read-side locks (i.e. BUG_ON(!in_atomic()). > = > For this reason, we have not yet implemented sleeping on the p2m. Callers= may get errors telling them to retry. A lot of (imho) ugly code is peppere= d around the hypervisor to deal with the consequences of this. More fundame= ntally, in some cases there is no possible elegant handling, and guests are= crashed (for example, if a page table page is paged out and the hypervisor= needs to translate a guest virtual address to a gfn). This limits the appl= icability of memory paging and sharing. > = > One way to solve this would be to ensure no code path liable to sleep in = a wait queue is holding any locks at wait queue sleep time. I believe this = is doomed. Not just because this is a herculean task. It also makes writing= hypervisor code *very* difficult. Anyone trying to throw a p2m translation= into a code path needs to think of all possible upstream call sequences. N= ot even RCU read locks are allowed. > = > I'd like to propose an approach that ensures that as long some properties= are met, arbitrary wait queue sleep is allowed. Here are the properties: > 1. Third parties servicing a wait queue sleep are indeed third parties. I= n other words, dom0 does not do paging. > 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait= queue during a foreign map. > 3. A guest vcpu may go to sleep on a wait queue holding any kinds of lock= s as long as it does not hold the p2m lock. N.B: I understand (now) this may cause any other vcpu contending on a lock = held by the wait queue sleeper to not yield to the scheduler and pin its ph= ysical cpu. What I am struggling with is coming up with a solution that doesn't turn hy= pervisor mm hacking into a locking minefield. Linux fixes this with many kinds of sleeping synchronization primitives. A = task can, for example, hold the mmap semaphore and sleep on a wait queue. I= s this the only way out of this mess? Not if wait queues force the vcpu to = wake up on the same phys cpu it was using at the time of sleeping=85. Andres > 4. "Kick" routines in the hypervisor by which service domains effectively= wake up a vcpu may only take the p2m lock to do a fix up of the p2m. > 5. Wait queues can be awakened on a special domain destroy condition. > = > Property 1. is hopefully self-evident, and although not enforced in the c= ode it is reasonably simple to do so. > = > Property 2. is also self-evident and enforced in the code today. > = > Property 3. simplifies reasoning about p2m translations and wait queue sl= eeping. Provides a clean model for reasoning about what might or might not = happen. It will require us to restructure some code paths (i.e. XENMEM_add_= to_physmap) that require multiple p2m translations in a single critical reg= ion to perform all translations up front. > = > Property 4. is already enforced in the code as is right now. > = > Property 5. needs adding some logic to the top of domain destruction: set= a flag, wake up all vcpus in wait queues. Extra logic on the wait queue si= de will exit the wait if the destroy flag is set, with an error. Most if no= t all callers can deal right now with a p2m translation error (other than p= aging), and unwind and release all their locks. > = > I confess my understanding of RCU is not 100% there and I am not sure wha= t will happen to force_quiescent_state. I also understand there is a impeda= nce mismatch wrt to "saving" and "restoring" the physical CPU preempt count. > = > Thanks, > Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 05:29:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:29:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKfz-0000BM-Rx; Thu, 08 Nov 2012 05:29:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKfx-0000BH-UR for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:29:14 +0000 Received: from [85.158.138.51:61041] by server-4.bemta-3.messagelabs.com id DB/9A-30023-6234B905; Thu, 08 Nov 2012 05:29:10 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1352352549!22810933!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc4Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31117 invoked from network); 8 Nov 2012 05:29:09 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 05:29:09 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="15658759" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 05:28:57 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 05:28:56 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWKfh-0003OW-6B; Thu, 08 Nov 2012 05:28:57 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWKfh-00089e-27; Thu, 08 Nov 2012 05:28:57 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 8 Nov 2012 05:28:57 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14373: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14373 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14373/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-win7-amd64 12 guest-localmigrate/x10 fail pass in 14371 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14371 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14371 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14371 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14371 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail in 14371 never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 05:29:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:29:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKfz-0000BM-Rx; Thu, 08 Nov 2012 05:29:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKfx-0000BH-UR for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:29:14 +0000 Received: from [85.158.138.51:61041] by server-4.bemta-3.messagelabs.com id DB/9A-30023-6234B905; Thu, 08 Nov 2012 05:29:10 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1352352549!22810933!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc4Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31117 invoked from network); 8 Nov 2012 05:29:09 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 05:29:09 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="15658759" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 05:28:57 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 05:28:56 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWKfh-0003OW-6B; Thu, 08 Nov 2012 05:28:57 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWKfh-00089e-27; Thu, 08 Nov 2012 05:28:57 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 8 Nov 2012 05:28:57 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14373: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14373 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14373/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-win7-amd64 12 guest-localmigrate/x10 fail pass in 14371 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14371 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14371 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14371 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14371 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail in 14371 never pass version targeted for testing: xen bd78e5630a5b baseline version: xen bd78e5630a5b jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 05:41:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:41:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKrh-0000LU-3h; Thu, 08 Nov 2012 05:41:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKrf-0000LP-Bv for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:41:19 +0000 Received: from [85.158.137.99:13376] by server-4.bemta-3.messagelabs.com id F7/01-30023-EF54B905; Thu, 08 Nov 2012 05:41:18 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352353276!15053166!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyOTk3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12560 invoked from network); 8 Nov 2012 05:41:16 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-9.tower-217.messagelabs.com with SMTP; 8 Nov 2012 05:41:16 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 21:40:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,736,1344236400"; d="scan'208,223";a="238866839" Received: from fmsmsx104.amr.corp.intel.com ([10.19.9.35]) by orsmga002.jf.intel.com with ESMTP; 07 Nov 2012 21:41:14 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX104.amr.corp.intel.com (10.19.9.35) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 21:41:14 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 13:41:13 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [PATCH v2 1/2] Xen/acpi: ACPI PAD driver Thread-Index: Ac29c6k/ou550tv2Qn224u0n9s+KjA== Date: Thu, 8 Nov 2012 05:41:13 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Jan Beulich Subject: [Xen-devel] [PATCH v2 1/2] Xen/acpi: ACPI PAD driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and thin logic level, would take over acpi pad logic. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object to get the expected idle cpu number, and then hypercall to hypervisor. Xen hypervisor would then do the rest work, say, core parking, to idle specific number of cpus on its own policy. Signed-off-by: Jan Beulich Signed-off-by: Liu Jinsong --- drivers/xen/Makefile | 3 +- drivers/xen/xen-acpi-pad.c | 181 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 ++++ include/xen/interface/version.h | 15 +++ 4 files changed, 215 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xen-acpi-pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..3c39717 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -10,7 +10,8 @@ CFLAGS_features.o :=3D $(nostackp) =20 dom0-$(CONFIG_PCI) +=3D pci.o dom0-$(CONFIG_USB_SUPPORT) +=3D dbgp.o -dom0-$(CONFIG_ACPI) +=3D acpi.o +dom0-$(CONFIG_ACPI) +=3D acpi.o $(xen-pad-y) +xen-pad-$(CONFIG_X86) +=3D xen-acpi-pad.o dom0-$(CONFIG_X86) +=3D pcpu.o obj-$(CONFIG_XEN_DOM0) +=3D $(dom0-y) obj-$(CONFIG_BLOCK) +=3D biomerge.o diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c new file mode 100644 index 0000000..f23ecf3 --- /dev/null +++ b/drivers/xen/xen-acpi-pad.c @@ -0,0 +1,181 @@ +/* + * xen-acpi-pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 +static DEFINE_MUTEX(xen_cpu_lock); + +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D idle_nums; + + return HYPERVISOR_dom0_op(&op); +} + +static int xen_acpi_pad_idle_cpus_num(void) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + + return HYPERVISOR_dom0_op(&op) + ?: op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_nums) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_nums; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void acpi_pad_handle_notify(acpi_handle handle) +{ + int idle_nums; + + mutex_lock(&xen_cpu_lock); + idle_nums =3D acpi_pad_pur(handle); + if (idle_nums < 0) { + mutex_unlock(&xen_cpu_lock); + return; + } + + idle_nums =3D xen_acpi_pad_idle_cpus(idle_nums) + ?: xen_acpi_pad_idle_cpus_num(); + if (idle_nums >=3D 0) + acpi_pad_ost(handle, 0, idle_nums); + mutex_unlock(&xen_cpu_lock); +} + +static void acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_cpu_lock); + xen_acpi_pad_idle_cpus(0); + mutex_unlock(&xen_cpu_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D acpi_pad_add, + .remove =3D acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + /* Only DOM0 is responsible for Xen acpi pad */ + if (!xen_initial_domain()) + return -ENODEV; + + /* Only Xen4.2 or later support Xen acpi pad */ + if (!xen_running_on_version_or_later(4, 2)) + return -ENODEV; + + return acpi_bus_register_driver(&acpi_pad_driver); +} +subsys_initcall(xen_acpi_pad_init); diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..5e36932 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; diff --git a/include/xen/interface/version.h b/include/xen/interface/versio= n.h index 7ff6498..96d8d3d 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -63,4 +63,19 @@ struct xen_feature_info { /* arg =3D=3D xen_domain_handle_t. */ #define XENVER_guest_handle 8 =20 +/* Check if running on Xen version (major, minor) or later */ +static inline bool +xen_running_on_version_or_later(unsigned int major, unsigned int minor) +{ + unsigned int version; + + if (!xen_domain()) + return false; + + version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + if ((((version >> 16) =3D=3D major) && ((version & 0xffff) >=3D minor)) |= | + ((version >> 16) > major)) + return true; + return false; +} #endif /* __XEN_PUBLIC_VERSION_H__ */ --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-ACPI-PAD-driver.patch" Content-Description: 0001-Xen-acpi-ACPI-PAD-driver.patch Content-Disposition: attachment; filename="0001-Xen-acpi-ACPI-PAD-driver.patch"; size=8582; creation-date="Wed, 07 Nov 2012 17:23:53 GMT"; modification-date="Thu, 08 Nov 2012 01:12:02 GMT" Content-Transfer-Encoding: base64 RnJvbSA3NzZiOGYzMTg1OGY5OTIwZTA3MTJhMjIzMmZjNWZiZDg1MDE4NzVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA5OjA2OjIyICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbi9hY3BpOiBBQ1BJIFBBRCBkcml2ZXIKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdh dG9yIERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRo ZSBwbGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFu ZCBjb250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0u CgpUaGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVu bmluZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90 IHdvcmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHRoaW4g bG9naWMgbGV2ZWwsIHdvdWxkIHRha2Ugb3ZlciBhY3BpIHBhZCBsb2dpYy4KCldoZW4gYWNwaSBw YWQgbm90aWZ5IE9TUE0sIHhlbiBwYWQgbG9naWMgaW50ZXJjZXB0IGFuZCBwYXJzZSBfUFVSIG9i amVjdAp0byBnZXQgdGhlIGV4cGVjdGVkIGlkbGUgY3B1IG51bWJlciwgYW5kIHRoZW4gaHlwZXJj YWxsIHRvIGh5cGVydmlzb3IuClhlbiBoeXBlcnZpc29yIHdvdWxkIHRoZW4gZG8gdGhlIHJlc3Qg d29yaywgc2F5LCBjb3JlIHBhcmtpbmcsIHRvIGlkbGUKc3BlY2lmaWMgbnVtYmVyIG9mIGNwdXMg b24gaXRzIG93biBwb2xpY3kuCgpTaWduZWQtb2ZmLWJ5OiBKYW4gQmV1bGljaCA8SkJldWxpY2hA c3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IExpdSBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy94ZW4vTWFrZWZpbGUgICAgICAgICAgICAgfCAgICAzICstCiBkcml2 ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyAgICAgICB8ICAxODEgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIGluY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIHwgICAx NyArKysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oICB8ICAgMTUgKysrCiA0IGZp bGVzIGNoYW5nZWQsIDIxNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQogY3JlYXRlIG1v ZGUgMTAwNjQ0IGRyaXZlcnMveGVuL3hlbi1hY3BpLXBhZC5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy94ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQppbmRleCAwZTg2MzcwLi4zYzM5 NzE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmlsZQorKysgYi9kcml2ZXJzL3hlbi9N YWtlZmlsZQpAQCAtMTAsNyArMTAsOCBAQCBDRkxBR1NfZmVhdHVyZXMubwkJCTo9ICQobm9zdGFj a3ApCiAKIGRvbTAtJChDT05GSUdfUENJKSArPSBwY2kubwogZG9tMC0kKENPTkZJR19VU0JfU1VQ UE9SVCkgKz0gZGJncC5vCi1kb20wLSQoQ09ORklHX0FDUEkpICs9IGFjcGkubworZG9tMC0kKENP TkZJR19BQ1BJKSArPSBhY3BpLm8gJCh4ZW4tcGFkLXkpCit4ZW4tcGFkLSQoQ09ORklHX1g4Nikg Kz0geGVuLWFjcGktcGFkLm8KIGRvbTAtJChDT05GSUdfWDg2KSArPSBwY3B1Lm8KIG9iai0kKENP TkZJR19YRU5fRE9NMCkJCQkrPSAkKGRvbTAteSkKIG9iai0kKENPTkZJR19CTE9DSykJCQkrPSBi aW9tZXJnZS5vCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyBiL2RyaXZl cnMveGVuL3hlbi1hY3BpLXBhZC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmYyM2VjZjMKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYwpA QCAtMCwwICsxLDE4MSBAQAorLyoKKyAqIHhlbi1hY3BpLXBhZC5jIC0gWGVuIHBhZCBpbnRlcmZh Y2UKKyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTIsIEludGVsIENvcnBvcmF0aW9uLgorICogICAg QXV0aG9yOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KKyAqCisgKiBUaGlz IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y IG1vZGlmeSBpdAorICogdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSwKKyAqIHZlcnNpb24gMiwgYXMgcHVibGlzaGVkIGJ5IHRo ZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3Ry aWJ1dGVkIGluIHRoZSBob3BlIGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAorICogQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRB QklMSVRZIG9yCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUg R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yCisgKiBtb3JlIGRldGFpbHMuCisgKi8KKwor I2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgorI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisjaW5j bHVkZSA8YWNwaS9hY3BpX2J1cy5oPgorI2luY2x1ZGUgPGFjcGkvYWNwaV9kcml2ZXJzLmg+Cisj aW5jbHVkZSA8YXNtL3hlbi9oeXBlcmNhbGwuaD4KKyNpbmNsdWRlIDx4ZW4vaW50ZXJmYWNlL3Zl cnNpb24uaD4KKworI2RlZmluZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0NMQVNTCSJhY3Bp X3BhZCIKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0VfTkFNRSAiUHJv Y2Vzc29yIEFnZ3JlZ2F0b3IiCisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfTk9U SUZZIDB4ODAKK3N0YXRpYyBERUZJTkVfTVVURVgoeGVuX2NwdV9sb2NrKTsKKworc3RhdGljIGlu dCB4ZW5fYWNwaV9wYWRfaWRsZV9jcHVzKHVuc2lnbmVkIGludCBpZGxlX251bXMpCit7CisJc3Ry dWN0IHhlbl9wbGF0Zm9ybV9vcCBvcDsKKworCW9wLmNtZCA9IFhFTlBGX2NvcmVfcGFya2luZzsK KwlvcC51LmNvcmVfcGFya2luZy50eXBlID0gWEVOX0NPUkVfUEFSS0lOR19TRVQ7CisJb3AudS5j b3JlX3BhcmtpbmcuaWRsZV9udW1zID0gaWRsZV9udW1zOworCisJcmV0dXJuIEhZUEVSVklTT1Jf ZG9tMF9vcCgmb3ApOworfQorCitzdGF0aWMgaW50IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNfbnVt KHZvaWQpCit7CisJc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCBvcDsKKworCW9wLmNtZCA9IFhFTlBG X2NvcmVfcGFya2luZzsKKwlvcC51LmNvcmVfcGFya2luZy50eXBlID0gWEVOX0NPUkVfUEFSS0lO R19HRVQ7CisKKwlyZXR1cm4gSFlQRVJWSVNPUl9kb20wX29wKCZvcCkKKwkgICAgICAgPzogb3Au dS5jb3JlX3BhcmtpbmcuaWRsZV9udW1zOworfQorCisvKgorICogUXVlcnkgZmlybXdhcmUgaG93 IG1hbnkgQ1BVcyBzaG91bGQgYmUgaWRsZQorICogcmV0dXJuIC0xIG9uIGZhaWx1cmUKKyAqLwor c3RhdGljIGludCBhY3BpX3BhZF9wdXIoYWNwaV9oYW5kbGUgaGFuZGxlKQoreworCXN0cnVjdCBh Y3BpX2J1ZmZlciBidWZmZXIgPSB7QUNQSV9BTExPQ0FURV9CVUZGRVIsIE5VTEx9OworCXVuaW9u IGFjcGlfb2JqZWN0ICpwYWNrYWdlOworCWludCBudW0gPSAtMTsKKworCWlmIChBQ1BJX0ZBSUxV UkUoYWNwaV9ldmFsdWF0ZV9vYmplY3QoaGFuZGxlLCAiX1BVUiIsIE5VTEwsICZidWZmZXIpKSkK KwkJcmV0dXJuIG51bTsKKworCWlmICghYnVmZmVyLmxlbmd0aCB8fCAhYnVmZmVyLnBvaW50ZXIp CisJCXJldHVybiBudW07CisKKwlwYWNrYWdlID0gYnVmZmVyLnBvaW50ZXI7CisKKwlpZiAocGFj a2FnZS0+dHlwZSA9PSBBQ1BJX1RZUEVfUEFDS0FHRSAmJgorCQlwYWNrYWdlLT5wYWNrYWdlLmNv dW50ID09IDIgJiYKKwkJcGFja2FnZS0+cGFja2FnZS5lbGVtZW50c1swXS5pbnRlZ2VyLnZhbHVl ID09IDEpIC8qIHJldiAxICovCisJCW51bSA9IHBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMV0u aW50ZWdlci52YWx1ZTsKKworCWtmcmVlKGJ1ZmZlci5wb2ludGVyKTsKKwlyZXR1cm4gbnVtOwor fQorCisvKiBOb3RpZnkgZmlybXdhcmUgaG93IG1hbnkgQ1BVcyBhcmUgaWRsZSAqLworc3RhdGlj IHZvaWQgYWNwaV9wYWRfb3N0KGFjcGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMy X3QgaWRsZV9udW1zKQoreworCXVuaW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50 eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIs fSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2Jq ZWN0X2xpc3QgYXJnX2xpc3QgPSB7MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZh bHVlID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVn ZXIudmFsdWUgPSAgc3RhdDsKKwlwYXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1z WzJdLmJ1ZmZlci5wb2ludGVyID0gKHZvaWQgKikmaWRsZV9udW1zOworCWFjcGlfZXZhbHVhdGVf b2JqZWN0KGhhbmRsZSwgIl9PU1QiLCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9p ZCBhY3BpX3BhZF9oYW5kbGVfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlpbnQgaWRs ZV9udW1zOworCisJbXV0ZXhfbG9jaygmeGVuX2NwdV9sb2NrKTsKKwlpZGxlX251bXMgPSBhY3Bp X3BhZF9wdXIoaGFuZGxlKTsKKwlpZiAoaWRsZV9udW1zIDwgMCkgeworCQltdXRleF91bmxvY2so Jnhlbl9jcHVfbG9jayk7CisJCXJldHVybjsKKwl9CisKKwlpZGxlX251bXMgPSB4ZW5fYWNwaV9w YWRfaWRsZV9jcHVzKGlkbGVfbnVtcykKKwkJICAgID86IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNf bnVtKCk7CisJaWYgKGlkbGVfbnVtcyA+PSAwKQorCQlhY3BpX3BhZF9vc3QoaGFuZGxlLCAwLCBp ZGxlX251bXMpOworCW11dGV4X3VubG9jaygmeGVuX2NwdV9sb2NrKTsKK30KKworc3RhdGljIHZv aWQgYWNwaV9wYWRfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSwgdTMyIGV2ZW50LAorCXZvaWQg KmRhdGEpCit7CisJc3dpdGNoIChldmVudCkgeworCWNhc2UgQUNQSV9QUk9DRVNTT1JfQUdHUkVH QVRPUl9OT1RJRlk6CisJCWFjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7 CisJZGVmYXVsdDoKKwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVu dCk7CisJCWJyZWFrOworCX0KK30KKworc3RhdGljIGludCBhY3BpX3BhZF9hZGQoc3RydWN0IGFj cGlfZGV2aWNlICpkZXZpY2UpCit7CisJYWNwaV9zdGF0dXMgc3RhdHVzOworCisJc3RyY3B5KGFj cGlfZGV2aWNlX25hbWUoZGV2aWNlKSwgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0Vf TkFNRSk7CisJc3RyY3B5KGFjcGlfZGV2aWNlX2NsYXNzKGRldmljZSksIEFDUElfUFJPQ0VTU09S X0FHR1JFR0FUT1JfQ0xBU1MpOworCisJc3RhdHVzID0gYWNwaV9pbnN0YWxsX25vdGlmeV9oYW5k bGVyKGRldmljZS0+aGFuZGxlLAorCQlBQ1BJX0RFVklDRV9OT1RJRlksIGFjcGlfcGFkX25vdGlm eSwgZGV2aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVW OworCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgYWNwaV9wYWRfcmVtb3ZlKHN0cnVjdCBh Y3BpX2RldmljZSAqZGV2aWNlLAorCWludCB0eXBlKQoreworCW11dGV4X2xvY2soJnhlbl9jcHVf bG9jayk7CisJeGVuX2FjcGlfcGFkX2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9j cHVfbG9jayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwK KwkJQUNQSV9ERVZJQ0VfTk9USUZZLCBhY3BpX3BhZF9ub3RpZnkpOworCXJldHVybiAwOworfQor CitzdGF0aWMgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkIHBhZF9kZXZpY2VfaWRzW10gPSB7 CisJeyJBQ1BJMDAwQyIsIDB9LAorCXsiIiwgMH0sCit9OworCitzdGF0aWMgc3RydWN0IGFjcGlf ZHJpdmVyIGFjcGlfcGFkX2RyaXZlciA9IHsKKwkubmFtZSA9ICJwcm9jZXNzb3JfYWdncmVnYXRv ciIsCisJLmNsYXNzID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9DTEFTUywKKwkuaWRzID0g cGFkX2RldmljZV9pZHMsCisJLm9wcyA9IHsKKwkJLmFkZCA9IGFjcGlfcGFkX2FkZCwKKwkJLnJl bW92ZSA9IGFjcGlfcGFkX3JlbW92ZSwKKwl9LAorfTsKKworc3RhdGljIGludCBfX2luaXQgeGVu X2FjcGlfcGFkX2luaXQodm9pZCkKK3sKKwkvKiBPbmx5IERPTTAgaXMgcmVzcG9uc2libGUgZm9y IFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkpCisJCXJldHVybiAt RU5PREVWOworCisJLyogT25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9ydCBYZW4gYWNwaSBwYWQg Ki8KKwlpZiAoIXhlbl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwgMikpCisJCXJldHVy biAtRU5PREVWOworCisJcmV0dXJuIGFjcGlfYnVzX3JlZ2lzdGVyX2RyaXZlcigmYWNwaV9wYWRf ZHJpdmVyKTsKK30KK3N1YnN5c19pbml0Y2FsbCh4ZW5fYWNwaV9wYWRfaW5pdCk7CmRpZmYgLS1n aXQgYS9pbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZvcm0uaCBiL2luY2x1ZGUveGVuL2ludGVy ZmFjZS9wbGF0Zm9ybS5oCmluZGV4IDQ3NTViNWYuLjVlMzY5MzIgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCisrKyBiL2luY2x1ZGUveGVuL2ludGVyZmFjZS9w bGF0Zm9ybS5oCkBAIC0zMjQsNiArMzI0LDIyIEBAIHN0cnVjdCB4ZW5wZl9jcHVfb2wgewogfTsK IERFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBmX2NwdV9vbCk7CiAKKy8qCisgKiBDTUQg NTggYW5kIDU5IGFyZSByZXNlcnZlZCBmb3IgY3B1IGhvdGFkZCBhbmQgbWVtb3J5IGhvdGFkZCwK KyAqIHdoaWNoIGFyZSBhbHJlYWR5IG9jY3VwaWVkIGF0IFhlbiBoeXBlcnZpc29yIHNpZGUuCisg Ki8KKyNkZWZpbmUgWEVOUEZfY29yZV9wYXJraW5nICAgICA2MAorc3RydWN0IHhlbnBmX2NvcmVf cGFya2luZyB7CisJLyogSU4gdmFyaWFibGVzICovCisjZGVmaW5lIFhFTl9DT1JFX1BBUktJTkdf U0VUICAgMQorI2RlZmluZSBYRU5fQ09SRV9QQVJLSU5HX0dFVCAgIDIKKwl1aW50MzJfdCB0eXBl OworCS8qIElOIHZhcmlhYmxlczogIHNldCBjcHUgbnVtcyBleHBlY3RlZCB0byBiZSBpZGxlZCAq LworCS8qIE9VVCB2YXJpYWJsZXM6IGdldCBjcHUgbnVtcyBhY3R1YWxseSBiZSBpZGxlZCAqLwor CXVpbnQzMl90IGlkbGVfbnVtczsKK307CitERUZJTkVfR1VFU1RfSEFORExFX1NUUlVDVCh4ZW5w Zl9jb3JlX3BhcmtpbmcpOworCiBzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIHsKIAl1aW50MzJfdCBj bWQ7CiAJdWludDMyX3QgaW50ZXJmYWNlX3ZlcnNpb247IC8qIFhFTlBGX0lOVEVSRkFDRV9WRVJT SU9OICovCkBAIC0zNDEsNiArMzU3LDcgQEAgc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCB7CiAJCXN0 cnVjdCB4ZW5wZl9zZXRfcHJvY2Vzc29yX3BtaW5mbyBzZXRfcG1pbmZvOwogCQlzdHJ1Y3QgeGVu cGZfcGNwdWluZm8gICAgICAgICAgcGNwdV9pbmZvOwogCQlzdHJ1Y3QgeGVucGZfY3B1X29sICAg ICAgICAgICAgY3B1X29sOworCQlzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nICAgICAgY29yZV9w YXJraW5nOwogCQl1aW50OF90ICAgICAgICAgICAgICAgICAgICAgICAgcGFkWzEyOF07CiAJfSB1 OwogfTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS92ZXJzaW9uLmggYi9pbmNs dWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oCmluZGV4IDdmZjY0OTguLjk2ZDhkM2QgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS92ZXJzaW9uLmgKKysrIGIvaW5jbHVkZS94ZW4v aW50ZXJmYWNlL3ZlcnNpb24uaApAQCAtNjMsNCArNjMsMTkgQEAgc3RydWN0IHhlbl9mZWF0dXJl X2luZm8gewogLyogYXJnID09IHhlbl9kb21haW5faGFuZGxlX3QuICovCiAjZGVmaW5lIFhFTlZF Ul9ndWVzdF9oYW5kbGUgOAogCisvKiBDaGVjayBpZiBydW5uaW5nIG9uIFhlbiB2ZXJzaW9uICht YWpvciwgbWlub3IpIG9yIGxhdGVyICovCitzdGF0aWMgaW5saW5lIGJvb2wKK3hlbl9ydW5uaW5n X29uX3ZlcnNpb25fb3JfbGF0ZXIodW5zaWduZWQgaW50IG1ham9yLCB1bnNpZ25lZCBpbnQgbWlu b3IpCit7CisJdW5zaWduZWQgaW50IHZlcnNpb247CisKKwlpZiAoIXhlbl9kb21haW4oKSkKKwkJ cmV0dXJuIGZhbHNlOworCisJdmVyc2lvbiA9IEhZUEVSVklTT1JfeGVuX3ZlcnNpb24oWEVOVkVS X3ZlcnNpb24sIE5VTEwpOworCWlmICgoKCh2ZXJzaW9uID4+IDE2KSA9PSBtYWpvcikgJiYgKCh2 ZXJzaW9uICYgMHhmZmZmKSA+PSBtaW5vcikpIHx8CisJCSgodmVyc2lvbiA+PiAxNikgPiBtYWpv cikpCisJCXJldHVybiB0cnVlOworCXJldHVybiBmYWxzZTsKK30KICNlbmRpZiAvKiBfX1hFTl9Q VUJMSUNfVkVSU0lPTl9IX18gKi8KLS0gCjEuNy4xCgo= --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 08 05:41:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:41:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKrh-0000LU-3h; Thu, 08 Nov 2012 05:41:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKrf-0000LP-Bv for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:41:19 +0000 Received: from [85.158.137.99:13376] by server-4.bemta-3.messagelabs.com id F7/01-30023-EF54B905; Thu, 08 Nov 2012 05:41:18 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352353276!15053166!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyOTk3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12560 invoked from network); 8 Nov 2012 05:41:16 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-9.tower-217.messagelabs.com with SMTP; 8 Nov 2012 05:41:16 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 21:40:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,736,1344236400"; d="scan'208,223";a="238866839" Received: from fmsmsx104.amr.corp.intel.com ([10.19.9.35]) by orsmga002.jf.intel.com with ESMTP; 07 Nov 2012 21:41:14 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX104.amr.corp.intel.com (10.19.9.35) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 21:41:14 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 13:41:13 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [PATCH v2 1/2] Xen/acpi: ACPI PAD driver Thread-Index: Ac29c6k/ou550tv2Qn224u0n9s+KjA== Date: Thu, 8 Nov 2012 05:41:13 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Jan Beulich Subject: [Xen-devel] [PATCH v2 1/2] Xen/acpi: ACPI PAD driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable PAD is acpi Processor Aggregator Device which provides a control point that enables the platform to perform specific processor configuration and control that applies to all processors in the platform. This patch is to implement Xen acpi pad logic. When running under Xen virt platform, native pad driver would not work. Instead Xen pad driver, a self-contained and thin logic level, would take over acpi pad logic. When acpi pad notify OSPM, xen pad logic intercept and parse _PUR object to get the expected idle cpu number, and then hypercall to hypervisor. Xen hypervisor would then do the rest work, say, core parking, to idle specific number of cpus on its own policy. Signed-off-by: Jan Beulich Signed-off-by: Liu Jinsong --- drivers/xen/Makefile | 3 +- drivers/xen/xen-acpi-pad.c | 181 ++++++++++++++++++++++++++++++++++= ++++ include/xen/interface/platform.h | 17 ++++ include/xen/interface/version.h | 15 +++ 4 files changed, 215 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/xen-acpi-pad.c diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0e86370..3c39717 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -10,7 +10,8 @@ CFLAGS_features.o :=3D $(nostackp) =20 dom0-$(CONFIG_PCI) +=3D pci.o dom0-$(CONFIG_USB_SUPPORT) +=3D dbgp.o -dom0-$(CONFIG_ACPI) +=3D acpi.o +dom0-$(CONFIG_ACPI) +=3D acpi.o $(xen-pad-y) +xen-pad-$(CONFIG_X86) +=3D xen-acpi-pad.o dom0-$(CONFIG_X86) +=3D pcpu.o obj-$(CONFIG_XEN_DOM0) +=3D $(dom0-y) obj-$(CONFIG_BLOCK) +=3D biomerge.o diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c new file mode 100644 index 0000000..f23ecf3 --- /dev/null +++ b/drivers/xen/xen-acpi-pad.c @@ -0,0 +1,181 @@ +/* + * xen-acpi-pad.c - Xen pad interface + * + * Copyright (c) 2012, Intel Corporation. + * Author: Liu, Jinsong + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + */ + +#include +#include +#include +#include +#include +#include + +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" +#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 +static DEFINE_MUTEX(xen_cpu_lock); + +static int xen_acpi_pad_idle_cpus(unsigned int idle_nums) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_SET; + op.u.core_parking.idle_nums =3D idle_nums; + + return HYPERVISOR_dom0_op(&op); +} + +static int xen_acpi_pad_idle_cpus_num(void) +{ + struct xen_platform_op op; + + op.cmd =3D XENPF_core_parking; + op.u.core_parking.type =3D XEN_CORE_PARKING_GET; + + return HYPERVISOR_dom0_op(&op) + ?: op.u.core_parking.idle_nums; +} + +/* + * Query firmware how many CPUs should be idle + * return -1 on failure + */ +static int acpi_pad_pur(acpi_handle handle) +{ + struct acpi_buffer buffer =3D {ACPI_ALLOCATE_BUFFER, NULL}; + union acpi_object *package; + int num =3D -1; + + if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer))) + return num; + + if (!buffer.length || !buffer.pointer) + return num; + + package =3D buffer.pointer; + + if (package->type =3D=3D ACPI_TYPE_PACKAGE && + package->package.count =3D=3D 2 && + package->package.elements[0].integer.value =3D=3D 1) /* rev 1 */ + num =3D package->package.elements[1].integer.value; + + kfree(buffer.pointer); + return num; +} + +/* Notify firmware how many CPUs are idle */ +static void acpi_pad_ost(acpi_handle handle, int stat, + uint32_t idle_nums) +{ + union acpi_object params[3] =3D { + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_INTEGER,}, + {.type =3D ACPI_TYPE_BUFFER,}, + }; + struct acpi_object_list arg_list =3D {3, params}; + + params[0].integer.value =3D ACPI_PROCESSOR_AGGREGATOR_NOTIFY; + params[1].integer.value =3D stat; + params[2].buffer.length =3D 4; + params[2].buffer.pointer =3D (void *)&idle_nums; + acpi_evaluate_object(handle, "_OST", &arg_list, NULL); +} + +static void acpi_pad_handle_notify(acpi_handle handle) +{ + int idle_nums; + + mutex_lock(&xen_cpu_lock); + idle_nums =3D acpi_pad_pur(handle); + if (idle_nums < 0) { + mutex_unlock(&xen_cpu_lock); + return; + } + + idle_nums =3D xen_acpi_pad_idle_cpus(idle_nums) + ?: xen_acpi_pad_idle_cpus_num(); + if (idle_nums >=3D 0) + acpi_pad_ost(handle, 0, idle_nums); + mutex_unlock(&xen_cpu_lock); +} + +static void acpi_pad_notify(acpi_handle handle, u32 event, + void *data) +{ + switch (event) { + case ACPI_PROCESSOR_AGGREGATOR_NOTIFY: + acpi_pad_handle_notify(handle); + break; + default: + pr_warn("Unsupported event [0x%x]\n", event); + break; + } +} + +static int acpi_pad_add(struct acpi_device *device) +{ + acpi_status status; + + strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME); + strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS); + + status =3D acpi_install_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify, device); + if (ACPI_FAILURE(status)) + return -ENODEV; + + return 0; +} + +static int acpi_pad_remove(struct acpi_device *device, + int type) +{ + mutex_lock(&xen_cpu_lock); + xen_acpi_pad_idle_cpus(0); + mutex_unlock(&xen_cpu_lock); + + acpi_remove_notify_handler(device->handle, + ACPI_DEVICE_NOTIFY, acpi_pad_notify); + return 0; +} + +static const struct acpi_device_id pad_device_ids[] =3D { + {"ACPI000C", 0}, + {"", 0}, +}; + +static struct acpi_driver acpi_pad_driver =3D { + .name =3D "processor_aggregator", + .class =3D ACPI_PROCESSOR_AGGREGATOR_CLASS, + .ids =3D pad_device_ids, + .ops =3D { + .add =3D acpi_pad_add, + .remove =3D acpi_pad_remove, + }, +}; + +static int __init xen_acpi_pad_init(void) +{ + /* Only DOM0 is responsible for Xen acpi pad */ + if (!xen_initial_domain()) + return -ENODEV; + + /* Only Xen4.2 or later support Xen acpi pad */ + if (!xen_running_on_version_or_later(4, 2)) + return -ENODEV; + + return acpi_bus_register_driver(&acpi_pad_driver); +} +subsys_initcall(xen_acpi_pad_init); diff --git a/include/xen/interface/platform.h b/include/xen/interface/platf= orm.h index 4755b5f..5e36932 100644 --- a/include/xen/interface/platform.h +++ b/include/xen/interface/platform.h @@ -324,6 +324,22 @@ struct xenpf_cpu_ol { }; DEFINE_GUEST_HANDLE_STRUCT(xenpf_cpu_ol); =20 +/* + * CMD 58 and 59 are reserved for cpu hotadd and memory hotadd, + * which are already occupied at Xen hypervisor side. + */ +#define XENPF_core_parking 60 +struct xenpf_core_parking { + /* IN variables */ +#define XEN_CORE_PARKING_SET 1 +#define XEN_CORE_PARKING_GET 2 + uint32_t type; + /* IN variables: set cpu nums expected to be idled */ + /* OUT variables: get cpu nums actually be idled */ + uint32_t idle_nums; +}; +DEFINE_GUEST_HANDLE_STRUCT(xenpf_core_parking); + struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ @@ -341,6 +357,7 @@ struct xen_platform_op { struct xenpf_set_processor_pminfo set_pminfo; struct xenpf_pcpuinfo pcpu_info; struct xenpf_cpu_ol cpu_ol; + struct xenpf_core_parking core_parking; uint8_t pad[128]; } u; }; diff --git a/include/xen/interface/version.h b/include/xen/interface/versio= n.h index 7ff6498..96d8d3d 100644 --- a/include/xen/interface/version.h +++ b/include/xen/interface/version.h @@ -63,4 +63,19 @@ struct xen_feature_info { /* arg =3D=3D xen_domain_handle_t. */ #define XENVER_guest_handle 8 =20 +/* Check if running on Xen version (major, minor) or later */ +static inline bool +xen_running_on_version_or_later(unsigned int major, unsigned int minor) +{ + unsigned int version; + + if (!xen_domain()) + return false; + + version =3D HYPERVISOR_xen_version(XENVER_version, NULL); + if ((((version >> 16) =3D=3D major) && ((version & 0xffff) >=3D minor)) |= | + ((version >> 16) > major)) + return true; + return false; +} #endif /* __XEN_PUBLIC_VERSION_H__ */ --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0001-Xen-acpi-ACPI-PAD-driver.patch" Content-Description: 0001-Xen-acpi-ACPI-PAD-driver.patch Content-Disposition: attachment; filename="0001-Xen-acpi-ACPI-PAD-driver.patch"; size=8582; creation-date="Wed, 07 Nov 2012 17:23:53 GMT"; modification-date="Thu, 08 Nov 2012 01:12:02 GMT" Content-Transfer-Encoding: base64 RnJvbSA3NzZiOGYzMTg1OGY5OTIwZTA3MTJhMjIzMmZjNWZiZDg1MDE4NzVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA5OjA2OjIyICswODAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IFhlbi9hY3BpOiBBQ1BJIFBBRCBkcml2ZXIKClBBRCBpcyBhY3BpIFByb2Nlc3NvciBBZ2dyZWdh dG9yIERldmljZSB3aGljaCBwcm92aWRlcyBhIGNvbnRyb2wgcG9pbnQKdGhhdCBlbmFibGVzIHRo ZSBwbGF0Zm9ybSB0byBwZXJmb3JtIHNwZWNpZmljIHByb2Nlc3NvciBjb25maWd1cmF0aW9uCmFu ZCBjb250cm9sIHRoYXQgYXBwbGllcyB0byBhbGwgcHJvY2Vzc29ycyBpbiB0aGUgcGxhdGZvcm0u CgpUaGlzIHBhdGNoIGlzIHRvIGltcGxlbWVudCBYZW4gYWNwaSBwYWQgbG9naWMuIFdoZW4gcnVu bmluZyB1bmRlciBYZW4KdmlydCBwbGF0Zm9ybSwgbmF0aXZlIHBhZCBkcml2ZXIgd291bGQgbm90 IHdvcmsuIEluc3RlYWQgWGVuIHBhZCBkcml2ZXIsCmEgc2VsZi1jb250YWluZWQgYW5kIHRoaW4g bG9naWMgbGV2ZWwsIHdvdWxkIHRha2Ugb3ZlciBhY3BpIHBhZCBsb2dpYy4KCldoZW4gYWNwaSBw YWQgbm90aWZ5IE9TUE0sIHhlbiBwYWQgbG9naWMgaW50ZXJjZXB0IGFuZCBwYXJzZSBfUFVSIG9i amVjdAp0byBnZXQgdGhlIGV4cGVjdGVkIGlkbGUgY3B1IG51bWJlciwgYW5kIHRoZW4gaHlwZXJj YWxsIHRvIGh5cGVydmlzb3IuClhlbiBoeXBlcnZpc29yIHdvdWxkIHRoZW4gZG8gdGhlIHJlc3Qg d29yaywgc2F5LCBjb3JlIHBhcmtpbmcsIHRvIGlkbGUKc3BlY2lmaWMgbnVtYmVyIG9mIGNwdXMg b24gaXRzIG93biBwb2xpY3kuCgpTaWduZWQtb2ZmLWJ5OiBKYW4gQmV1bGljaCA8SkJldWxpY2hA c3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IExpdSBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy94ZW4vTWFrZWZpbGUgICAgICAgICAgICAgfCAgICAzICstCiBkcml2 ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyAgICAgICB8ICAxODEgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIGluY2x1ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oIHwgICAx NyArKysrCiBpbmNsdWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oICB8ICAgMTUgKysrCiA0IGZp bGVzIGNoYW5nZWQsIDIxNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQogY3JlYXRlIG1v ZGUgMTAwNjQ0IGRyaXZlcnMveGVuL3hlbi1hY3BpLXBhZC5jCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy94ZW4vTWFrZWZpbGUgYi9kcml2ZXJzL3hlbi9NYWtlZmlsZQppbmRleCAwZTg2MzcwLi4zYzM5 NzE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9NYWtlZmlsZQorKysgYi9kcml2ZXJzL3hlbi9N YWtlZmlsZQpAQCAtMTAsNyArMTAsOCBAQCBDRkxBR1NfZmVhdHVyZXMubwkJCTo9ICQobm9zdGFj a3ApCiAKIGRvbTAtJChDT05GSUdfUENJKSArPSBwY2kubwogZG9tMC0kKENPTkZJR19VU0JfU1VQ UE9SVCkgKz0gZGJncC5vCi1kb20wLSQoQ09ORklHX0FDUEkpICs9IGFjcGkubworZG9tMC0kKENP TkZJR19BQ1BJKSArPSBhY3BpLm8gJCh4ZW4tcGFkLXkpCit4ZW4tcGFkLSQoQ09ORklHX1g4Nikg Kz0geGVuLWFjcGktcGFkLm8KIGRvbTAtJChDT05GSUdfWDg2KSArPSBwY3B1Lm8KIG9iai0kKENP TkZJR19YRU5fRE9NMCkJCQkrPSAkKGRvbTAteSkKIG9iai0kKENPTkZJR19CTE9DSykJCQkrPSBi aW9tZXJnZS5vCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYyBiL2RyaXZl cnMveGVuL3hlbi1hY3BpLXBhZC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAu LmYyM2VjZjMKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL3hlbi94ZW4tYWNwaS1wYWQuYwpA QCAtMCwwICsxLDE4MSBAQAorLyoKKyAqIHhlbi1hY3BpLXBhZC5jIC0gWGVuIHBhZCBpbnRlcmZh Y2UKKyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMTIsIEludGVsIENvcnBvcmF0aW9uLgorICogICAg QXV0aG9yOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4KKyAqCisgKiBUaGlz IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y IG1vZGlmeSBpdAorICogdW5kZXIgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSwKKyAqIHZlcnNpb24gMiwgYXMgcHVibGlzaGVkIGJ5IHRo ZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24uCisgKgorICogVGhpcyBwcm9ncmFtIGlzIGRpc3Ry aWJ1dGVkIGluIHRoZSBob3BlIGl0IHdpbGwgYmUgdXNlZnVsLCBidXQgV0lUSE9VVAorICogQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YgTUVSQ0hBTlRB QklMSVRZIG9yCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUg R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yCisgKiBtb3JlIGRldGFpbHMuCisgKi8KKwor I2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgorI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisjaW5j bHVkZSA8YWNwaS9hY3BpX2J1cy5oPgorI2luY2x1ZGUgPGFjcGkvYWNwaV9kcml2ZXJzLmg+Cisj aW5jbHVkZSA8YXNtL3hlbi9oeXBlcmNhbGwuaD4KKyNpbmNsdWRlIDx4ZW4vaW50ZXJmYWNlL3Zl cnNpb24uaD4KKworI2RlZmluZSBBQ1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SX0NMQVNTCSJhY3Bp X3BhZCIKKyNkZWZpbmUgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0VfTkFNRSAiUHJv Y2Vzc29yIEFnZ3JlZ2F0b3IiCisjZGVmaW5lIEFDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1JfTk9U SUZZIDB4ODAKK3N0YXRpYyBERUZJTkVfTVVURVgoeGVuX2NwdV9sb2NrKTsKKworc3RhdGljIGlu dCB4ZW5fYWNwaV9wYWRfaWRsZV9jcHVzKHVuc2lnbmVkIGludCBpZGxlX251bXMpCit7CisJc3Ry dWN0IHhlbl9wbGF0Zm9ybV9vcCBvcDsKKworCW9wLmNtZCA9IFhFTlBGX2NvcmVfcGFya2luZzsK KwlvcC51LmNvcmVfcGFya2luZy50eXBlID0gWEVOX0NPUkVfUEFSS0lOR19TRVQ7CisJb3AudS5j b3JlX3BhcmtpbmcuaWRsZV9udW1zID0gaWRsZV9udW1zOworCisJcmV0dXJuIEhZUEVSVklTT1Jf ZG9tMF9vcCgmb3ApOworfQorCitzdGF0aWMgaW50IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNfbnVt KHZvaWQpCit7CisJc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCBvcDsKKworCW9wLmNtZCA9IFhFTlBG X2NvcmVfcGFya2luZzsKKwlvcC51LmNvcmVfcGFya2luZy50eXBlID0gWEVOX0NPUkVfUEFSS0lO R19HRVQ7CisKKwlyZXR1cm4gSFlQRVJWSVNPUl9kb20wX29wKCZvcCkKKwkgICAgICAgPzogb3Au dS5jb3JlX3BhcmtpbmcuaWRsZV9udW1zOworfQorCisvKgorICogUXVlcnkgZmlybXdhcmUgaG93 IG1hbnkgQ1BVcyBzaG91bGQgYmUgaWRsZQorICogcmV0dXJuIC0xIG9uIGZhaWx1cmUKKyAqLwor c3RhdGljIGludCBhY3BpX3BhZF9wdXIoYWNwaV9oYW5kbGUgaGFuZGxlKQoreworCXN0cnVjdCBh Y3BpX2J1ZmZlciBidWZmZXIgPSB7QUNQSV9BTExPQ0FURV9CVUZGRVIsIE5VTEx9OworCXVuaW9u IGFjcGlfb2JqZWN0ICpwYWNrYWdlOworCWludCBudW0gPSAtMTsKKworCWlmIChBQ1BJX0ZBSUxV UkUoYWNwaV9ldmFsdWF0ZV9vYmplY3QoaGFuZGxlLCAiX1BVUiIsIE5VTEwsICZidWZmZXIpKSkK KwkJcmV0dXJuIG51bTsKKworCWlmICghYnVmZmVyLmxlbmd0aCB8fCAhYnVmZmVyLnBvaW50ZXIp CisJCXJldHVybiBudW07CisKKwlwYWNrYWdlID0gYnVmZmVyLnBvaW50ZXI7CisKKwlpZiAocGFj a2FnZS0+dHlwZSA9PSBBQ1BJX1RZUEVfUEFDS0FHRSAmJgorCQlwYWNrYWdlLT5wYWNrYWdlLmNv dW50ID09IDIgJiYKKwkJcGFja2FnZS0+cGFja2FnZS5lbGVtZW50c1swXS5pbnRlZ2VyLnZhbHVl ID09IDEpIC8qIHJldiAxICovCisJCW51bSA9IHBhY2thZ2UtPnBhY2thZ2UuZWxlbWVudHNbMV0u aW50ZWdlci52YWx1ZTsKKworCWtmcmVlKGJ1ZmZlci5wb2ludGVyKTsKKwlyZXR1cm4gbnVtOwor fQorCisvKiBOb3RpZnkgZmlybXdhcmUgaG93IG1hbnkgQ1BVcyBhcmUgaWRsZSAqLworc3RhdGlj IHZvaWQgYWNwaV9wYWRfb3N0KGFjcGlfaGFuZGxlIGhhbmRsZSwgaW50IHN0YXQsCisJdWludDMy X3QgaWRsZV9udW1zKQoreworCXVuaW9uIGFjcGlfb2JqZWN0IHBhcmFtc1szXSA9IHsKKwkJey50 eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIsfSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0lOVEVHRVIs fSwKKwkJey50eXBlID0gQUNQSV9UWVBFX0JVRkZFUix9LAorCX07CisJc3RydWN0IGFjcGlfb2Jq ZWN0X2xpc3QgYXJnX2xpc3QgPSB7MywgcGFyYW1zfTsKKworCXBhcmFtc1swXS5pbnRlZ2VyLnZh bHVlID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9OT1RJRlk7CisJcGFyYW1zWzFdLmludGVn ZXIudmFsdWUgPSAgc3RhdDsKKwlwYXJhbXNbMl0uYnVmZmVyLmxlbmd0aCA9IDQ7CisJcGFyYW1z WzJdLmJ1ZmZlci5wb2ludGVyID0gKHZvaWQgKikmaWRsZV9udW1zOworCWFjcGlfZXZhbHVhdGVf b2JqZWN0KGhhbmRsZSwgIl9PU1QiLCAmYXJnX2xpc3QsIE5VTEwpOworfQorCitzdGF0aWMgdm9p ZCBhY3BpX3BhZF9oYW5kbGVfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSkKK3sKKwlpbnQgaWRs ZV9udW1zOworCisJbXV0ZXhfbG9jaygmeGVuX2NwdV9sb2NrKTsKKwlpZGxlX251bXMgPSBhY3Bp X3BhZF9wdXIoaGFuZGxlKTsKKwlpZiAoaWRsZV9udW1zIDwgMCkgeworCQltdXRleF91bmxvY2so Jnhlbl9jcHVfbG9jayk7CisJCXJldHVybjsKKwl9CisKKwlpZGxlX251bXMgPSB4ZW5fYWNwaV9w YWRfaWRsZV9jcHVzKGlkbGVfbnVtcykKKwkJICAgID86IHhlbl9hY3BpX3BhZF9pZGxlX2NwdXNf bnVtKCk7CisJaWYgKGlkbGVfbnVtcyA+PSAwKQorCQlhY3BpX3BhZF9vc3QoaGFuZGxlLCAwLCBp ZGxlX251bXMpOworCW11dGV4X3VubG9jaygmeGVuX2NwdV9sb2NrKTsKK30KKworc3RhdGljIHZv aWQgYWNwaV9wYWRfbm90aWZ5KGFjcGlfaGFuZGxlIGhhbmRsZSwgdTMyIGV2ZW50LAorCXZvaWQg KmRhdGEpCit7CisJc3dpdGNoIChldmVudCkgeworCWNhc2UgQUNQSV9QUk9DRVNTT1JfQUdHUkVH QVRPUl9OT1RJRlk6CisJCWFjcGlfcGFkX2hhbmRsZV9ub3RpZnkoaGFuZGxlKTsKKwkJYnJlYWs7 CisJZGVmYXVsdDoKKwkJcHJfd2FybigiVW5zdXBwb3J0ZWQgZXZlbnQgWzB4JXhdXG4iLCBldmVu dCk7CisJCWJyZWFrOworCX0KK30KKworc3RhdGljIGludCBhY3BpX3BhZF9hZGQoc3RydWN0IGFj cGlfZGV2aWNlICpkZXZpY2UpCit7CisJYWNwaV9zdGF0dXMgc3RhdHVzOworCisJc3RyY3B5KGFj cGlfZGV2aWNlX25hbWUoZGV2aWNlKSwgQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9ERVZJQ0Vf TkFNRSk7CisJc3RyY3B5KGFjcGlfZGV2aWNlX2NsYXNzKGRldmljZSksIEFDUElfUFJPQ0VTU09S X0FHR1JFR0FUT1JfQ0xBU1MpOworCisJc3RhdHVzID0gYWNwaV9pbnN0YWxsX25vdGlmeV9oYW5k bGVyKGRldmljZS0+aGFuZGxlLAorCQlBQ1BJX0RFVklDRV9OT1RJRlksIGFjcGlfcGFkX25vdGlm eSwgZGV2aWNlKTsKKwlpZiAoQUNQSV9GQUlMVVJFKHN0YXR1cykpCisJCXJldHVybiAtRU5PREVW OworCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQgYWNwaV9wYWRfcmVtb3ZlKHN0cnVjdCBh Y3BpX2RldmljZSAqZGV2aWNlLAorCWludCB0eXBlKQoreworCW11dGV4X2xvY2soJnhlbl9jcHVf bG9jayk7CisJeGVuX2FjcGlfcGFkX2lkbGVfY3B1cygwKTsKKwltdXRleF91bmxvY2soJnhlbl9j cHVfbG9jayk7CisKKwlhY3BpX3JlbW92ZV9ub3RpZnlfaGFuZGxlcihkZXZpY2UtPmhhbmRsZSwK KwkJQUNQSV9ERVZJQ0VfTk9USUZZLCBhY3BpX3BhZF9ub3RpZnkpOworCXJldHVybiAwOworfQor CitzdGF0aWMgY29uc3Qgc3RydWN0IGFjcGlfZGV2aWNlX2lkIHBhZF9kZXZpY2VfaWRzW10gPSB7 CisJeyJBQ1BJMDAwQyIsIDB9LAorCXsiIiwgMH0sCit9OworCitzdGF0aWMgc3RydWN0IGFjcGlf ZHJpdmVyIGFjcGlfcGFkX2RyaXZlciA9IHsKKwkubmFtZSA9ICJwcm9jZXNzb3JfYWdncmVnYXRv ciIsCisJLmNsYXNzID0gQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9DTEFTUywKKwkuaWRzID0g cGFkX2RldmljZV9pZHMsCisJLm9wcyA9IHsKKwkJLmFkZCA9IGFjcGlfcGFkX2FkZCwKKwkJLnJl bW92ZSA9IGFjcGlfcGFkX3JlbW92ZSwKKwl9LAorfTsKKworc3RhdGljIGludCBfX2luaXQgeGVu X2FjcGlfcGFkX2luaXQodm9pZCkKK3sKKwkvKiBPbmx5IERPTTAgaXMgcmVzcG9uc2libGUgZm9y IFhlbiBhY3BpIHBhZCAqLworCWlmICgheGVuX2luaXRpYWxfZG9tYWluKCkpCisJCXJldHVybiAt RU5PREVWOworCisJLyogT25seSBYZW40LjIgb3IgbGF0ZXIgc3VwcG9ydCBYZW4gYWNwaSBwYWQg Ki8KKwlpZiAoIXhlbl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwgMikpCisJCXJldHVy biAtRU5PREVWOworCisJcmV0dXJuIGFjcGlfYnVzX3JlZ2lzdGVyX2RyaXZlcigmYWNwaV9wYWRf ZHJpdmVyKTsKK30KK3N1YnN5c19pbml0Y2FsbCh4ZW5fYWNwaV9wYWRfaW5pdCk7CmRpZmYgLS1n aXQgYS9pbmNsdWRlL3hlbi9pbnRlcmZhY2UvcGxhdGZvcm0uaCBiL2luY2x1ZGUveGVuL2ludGVy ZmFjZS9wbGF0Zm9ybS5oCmluZGV4IDQ3NTViNWYuLjVlMzY5MzIgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUveGVuL2ludGVyZmFjZS9wbGF0Zm9ybS5oCisrKyBiL2luY2x1ZGUveGVuL2ludGVyZmFjZS9w bGF0Zm9ybS5oCkBAIC0zMjQsNiArMzI0LDIyIEBAIHN0cnVjdCB4ZW5wZl9jcHVfb2wgewogfTsK IERFRklORV9HVUVTVF9IQU5ETEVfU1RSVUNUKHhlbnBmX2NwdV9vbCk7CiAKKy8qCisgKiBDTUQg NTggYW5kIDU5IGFyZSByZXNlcnZlZCBmb3IgY3B1IGhvdGFkZCBhbmQgbWVtb3J5IGhvdGFkZCwK KyAqIHdoaWNoIGFyZSBhbHJlYWR5IG9jY3VwaWVkIGF0IFhlbiBoeXBlcnZpc29yIHNpZGUuCisg Ki8KKyNkZWZpbmUgWEVOUEZfY29yZV9wYXJraW5nICAgICA2MAorc3RydWN0IHhlbnBmX2NvcmVf cGFya2luZyB7CisJLyogSU4gdmFyaWFibGVzICovCisjZGVmaW5lIFhFTl9DT1JFX1BBUktJTkdf U0VUICAgMQorI2RlZmluZSBYRU5fQ09SRV9QQVJLSU5HX0dFVCAgIDIKKwl1aW50MzJfdCB0eXBl OworCS8qIElOIHZhcmlhYmxlczogIHNldCBjcHUgbnVtcyBleHBlY3RlZCB0byBiZSBpZGxlZCAq LworCS8qIE9VVCB2YXJpYWJsZXM6IGdldCBjcHUgbnVtcyBhY3R1YWxseSBiZSBpZGxlZCAqLwor CXVpbnQzMl90IGlkbGVfbnVtczsKK307CitERUZJTkVfR1VFU1RfSEFORExFX1NUUlVDVCh4ZW5w Zl9jb3JlX3BhcmtpbmcpOworCiBzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIHsKIAl1aW50MzJfdCBj bWQ7CiAJdWludDMyX3QgaW50ZXJmYWNlX3ZlcnNpb247IC8qIFhFTlBGX0lOVEVSRkFDRV9WRVJT SU9OICovCkBAIC0zNDEsNiArMzU3LDcgQEAgc3RydWN0IHhlbl9wbGF0Zm9ybV9vcCB7CiAJCXN0 cnVjdCB4ZW5wZl9zZXRfcHJvY2Vzc29yX3BtaW5mbyBzZXRfcG1pbmZvOwogCQlzdHJ1Y3QgeGVu cGZfcGNwdWluZm8gICAgICAgICAgcGNwdV9pbmZvOwogCQlzdHJ1Y3QgeGVucGZfY3B1X29sICAg ICAgICAgICAgY3B1X29sOworCQlzdHJ1Y3QgeGVucGZfY29yZV9wYXJraW5nICAgICAgY29yZV9w YXJraW5nOwogCQl1aW50OF90ICAgICAgICAgICAgICAgICAgICAgICAgcGFkWzEyOF07CiAJfSB1 OwogfTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS92ZXJzaW9uLmggYi9pbmNs dWRlL3hlbi9pbnRlcmZhY2UvdmVyc2lvbi5oCmluZGV4IDdmZjY0OTguLjk2ZDhkM2QgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUveGVuL2ludGVyZmFjZS92ZXJzaW9uLmgKKysrIGIvaW5jbHVkZS94ZW4v aW50ZXJmYWNlL3ZlcnNpb24uaApAQCAtNjMsNCArNjMsMTkgQEAgc3RydWN0IHhlbl9mZWF0dXJl X2luZm8gewogLyogYXJnID09IHhlbl9kb21haW5faGFuZGxlX3QuICovCiAjZGVmaW5lIFhFTlZF Ul9ndWVzdF9oYW5kbGUgOAogCisvKiBDaGVjayBpZiBydW5uaW5nIG9uIFhlbiB2ZXJzaW9uICht YWpvciwgbWlub3IpIG9yIGxhdGVyICovCitzdGF0aWMgaW5saW5lIGJvb2wKK3hlbl9ydW5uaW5n X29uX3ZlcnNpb25fb3JfbGF0ZXIodW5zaWduZWQgaW50IG1ham9yLCB1bnNpZ25lZCBpbnQgbWlu b3IpCit7CisJdW5zaWduZWQgaW50IHZlcnNpb247CisKKwlpZiAoIXhlbl9kb21haW4oKSkKKwkJ cmV0dXJuIGZhbHNlOworCisJdmVyc2lvbiA9IEhZUEVSVklTT1JfeGVuX3ZlcnNpb24oWEVOVkVS X3ZlcnNpb24sIE5VTEwpOworCWlmICgoKCh2ZXJzaW9uID4+IDE2KSA9PSBtYWpvcikgJiYgKCh2 ZXJzaW9uICYgMHhmZmZmKSA+PSBtaW5vcikpIHx8CisJCSgodmVyc2lvbiA+PiAxNikgPiBtYWpv cikpCisJCXJldHVybiB0cnVlOworCXJldHVybiBmYWxzZTsKK30KICNlbmRpZiAvKiBfX1hFTl9Q VUJMSUNfVkVSU0lPTl9IX18gKi8KLS0gCjEuNy4xCgo= --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BF47SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 08 05:44:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKuo-0000TH-Rc; Thu, 08 Nov 2012 05:44:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKun-0000T8-Oi for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:44:33 +0000 Received: from [85.158.143.35:37857] by server-1.bemta-4.messagelabs.com id 8D/A4-27934-1C64B905; Thu, 08 Nov 2012 05:44:33 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1352353471!5729140!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyOTk3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10323 invoked from network); 8 Nov 2012 05:44:32 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-5.tower-21.messagelabs.com with SMTP; 8 Nov 2012 05:44:32 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 21:43:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,736,1344236400"; d="scan'208,223";a="216653655" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 21:44:30 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 21:44:29 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 13:44:28 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [PATCH v2 2/2] Xen/acpi: revert pad config check in xen_check_mwait Thread-Index: Ac29dB4WcWRk6UxxSqmLuVimXOjUhQ== Date: Thu, 8 Nov 2012 05:44:28 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Jan Beulich Subject: [Xen-devel] [PATCH v2 2/2] Xen/acpi: revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..548296f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -309,6 +308,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (!xen_running_on_version_or_later(4, 2)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch"; size=1709; creation-date="Wed, 07 Nov 2012 17:23:53 GMT"; modification-date="Thu, 08 Nov 2012 01:12:02 GMT" Content-Transfer-Encoding: base64 RnJvbSBlODA0ZDU0N2JmZjBmN2NlMTA4ZTJiYjk1ODNmNjU3NzBkYzk3NDRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA5OjA5OjE5ICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFhlbi9hY3BpOiByZXZlcnQgcGFkIGNvbmZpZyBjaGVjayBpbiB4ZW5fY2hlY2tfbXdhaXQKCldp dGggWGVuIGFjcGkgcGFkIGxvZ2ljIGFkZGVkIGludG8ga2VybmVsLCB3ZSBjYW4gbm93IHJldmVy dCB4ZW4gbXdhaXQgcmVsYXRlZApwYXRjaCBkZjg4YjJkOTZlMzZkOWE5ZTMyNWJmY2QxMmViNDU2 NzFjYmJjOTM3LiBUaGUgcmVhc29uIGlzLCB3aGVuIHJ1bm5pbmcgdW5kZXIKbmV3ZXIgWGVuIHBs YXRmb3JtLCBYZW4gcGFkIGRyaXZlciB3b3VsZCBiZSBlYXJseSBsb2FkZWQsIHNvIG5hdGl2ZSBw YWQgZHJpdmVyCndvdWxkIGZhaWwgdG8gYmUgbG9hZGVkLCBhbmQgaGVuY2Ugbm8gbXdhaXQvbW9u aXRvciAjVUQgcmlzayBhZ2Fpbi4KCkFub3RoZXIgcG9pbnQgaXMsIG9ubHkgWGVuNC4yIG9yIGxh dGVyIHN1cHBvcnQgWGVuIGFjcGkgcGFkLCBzbyB3ZSB3b24ndCBleHBvc2UKbXdhaXQgY3B1aWQg Y2FwYWJpbGl0eSB3aGVuIHJ1bm5pbmcgdW5kZXIgb2xkZXIgWGVuIHBsYXRmb3JtLgoKU2lnbmVk LW9mZi1ieTogTGl1LCBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5jb20+Ci0tLQogYXJjaC94 ODYveGVuL2VubGlnaHRlbi5jIHwgICAxMCArKysrKysrKy0tCiAxIGZpbGVzIGNoYW5nZWQsIDgg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4v ZW5saWdodGVuLmMgYi9hcmNoL3g4Ni94ZW4vZW5saWdodGVuLmMKaW5kZXggNTg2ZDgzOC4uNTQ4 Mjk2ZiAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCisrKyBiL2FyY2gveDg2 L3hlbi9lbmxpZ2h0ZW4uYwpAQCAtMjg3LDggKzI4Nyw3IEBAIHN0YXRpYyB2b2lkIHhlbl9jcHVp ZCh1bnNpZ25lZCBpbnQgKmF4LCB1bnNpZ25lZCBpbnQgKmJ4LAogCiBzdGF0aWMgYm9vbCBfX2lu aXQgeGVuX2NoZWNrX213YWl0KHZvaWQpCiB7Ci0jaWYgZGVmaW5lZChDT05GSUdfQUNQSSkgJiYg IWRlZmluZWQoQ09ORklHX0FDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1IpICYmIFwKLQkhZGVmaW5l ZChDT05GSUdfQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9NT0RVTEUpCisjaWZkZWYgQ09ORklH X0FDUEkKIAlzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIG9wID0gewogCQkuY21kCQkJPSBYRU5QRl9z ZXRfcHJvY2Vzc29yX3BtaW5mbywKIAkJLnUuc2V0X3BtaW5mby5pZAk9IC0xLApAQCAtMzA5LDYg KzMwOCwxMyBAQCBzdGF0aWMgYm9vbCBfX2luaXQgeGVuX2NoZWNrX213YWl0KHZvaWQpCiAJaWYg KCF4ZW5faW5pdGlhbF9kb21haW4oKSkKIAkJcmV0dXJuIGZhbHNlOwogCisJLyoKKwkgKiBXaGVu IHJ1bm5pbmcgdW5kZXIgcGxhdGZvcm0gZWFybGllciB0aGFuIFhlbjQuMiwgZG8gbm90IGV4cG9z ZQorCSAqIG13YWl0LCB0byBhdm9pZCB0aGUgcmlzayBvZiBsb2FkaW5nIG5hdGl2ZSBhY3BpIHBh ZCBkcml2ZXIKKwkgKi8KKwlpZiAoIXhlbl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwg MikpCisJCXJldHVybiBmYWxzZTsKKwogCWF4ID0gMTsKIAljeCA9IDA7CiAKLS0gCjEuNy4xCgo= --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 08 05:44:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 05:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKuo-0000TH-Rc; Thu, 08 Nov 2012 05:44:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWKun-0000T8-Oi for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 05:44:33 +0000 Received: from [85.158.143.35:37857] by server-1.bemta-4.messagelabs.com id 8D/A4-27934-1C64B905; Thu, 08 Nov 2012 05:44:33 +0000 X-Env-Sender: jinsong.liu@intel.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1352353471!5729140!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzYyOTk3\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10323 invoked from network); 8 Nov 2012 05:44:32 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-5.tower-21.messagelabs.com with SMTP; 8 Nov 2012 05:44:32 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 07 Nov 2012 21:43:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,736,1344236400"; d="scan'208,223";a="216653655" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by orsmga001.jf.intel.com with ESMTP; 07 Nov 2012 21:44:30 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Wed, 7 Nov 2012 21:44:29 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Thu, 8 Nov 2012 13:44:28 +0800 From: "Liu, Jinsong" To: Konrad Rzeszutek Wilk Thread-Topic: [PATCH v2 2/2] Xen/acpi: revert pad config check in xen_check_mwait Thread-Index: Ac29dB4WcWRk6UxxSqmLuVimXOjUhQ== Date: Thu, 8 Nov 2012 05:44:28 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: multipart/mixed; boundary="_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_" MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , Jan Beulich Subject: [Xen-devel] [PATCH v2 2/2] Xen/acpi: revert pad config check in xen_check_mwait X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable With Xen acpi pad logic added into kernel, we can now revert xen mwait rela= ted patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when running= under newer Xen platform, Xen pad driver would be early loaded, so native pad dri= ver would fail to be loaded, and hence no mwait/monitor #UD risk again. Another point is, only Xen4.2 or later support Xen acpi pad, so we won't ex= pose mwait cpuid capability when running under older Xen platform. Signed-off-by: Liu, Jinsong --- arch/x86/xen/enlighten.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 586d838..548296f 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 static bool __init xen_check_mwait(void) { -#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && = \ - !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) +#ifdef CONFIG_ACPI struct xen_platform_op op =3D { .cmd =3D XENPF_set_processor_pminfo, .u.set_pminfo.id =3D -1, @@ -309,6 +308,13 @@ static bool __init xen_check_mwait(void) if (!xen_initial_domain()) return false; =20 + /* + * When running under platform earlier than Xen4.2, do not expose + * mwait, to avoid the risk of loading native acpi pad driver + */ + if (!xen_running_on_version_or_later(4, 2)) + return false; + ax =3D 1; cx =3D 0; =20 --=20 1.7.1 --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: application/octet-stream; name="0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch" Content-Description: 0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch Content-Disposition: attachment; filename="0002-Xen-acpi-revert-pad-config-check-in-xen_check_mwait.patch"; size=1709; creation-date="Wed, 07 Nov 2012 17:23:53 GMT"; modification-date="Thu, 08 Nov 2012 01:12:02 GMT" Content-Transfer-Encoding: base64 RnJvbSBlODA0ZDU0N2JmZjBmN2NlMTA4ZTJiYjk1ODNmNjU3NzBkYzk3NDRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUsIEppbnNvbmcgPGppbnNvbmcubGl1QGludGVsLmNvbT4K RGF0ZTogVGh1LCA4IE5vdiAyMDEyIDA5OjA5OjE5ICswODAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IFhlbi9hY3BpOiByZXZlcnQgcGFkIGNvbmZpZyBjaGVjayBpbiB4ZW5fY2hlY2tfbXdhaXQKCldp dGggWGVuIGFjcGkgcGFkIGxvZ2ljIGFkZGVkIGludG8ga2VybmVsLCB3ZSBjYW4gbm93IHJldmVy dCB4ZW4gbXdhaXQgcmVsYXRlZApwYXRjaCBkZjg4YjJkOTZlMzZkOWE5ZTMyNWJmY2QxMmViNDU2 NzFjYmJjOTM3LiBUaGUgcmVhc29uIGlzLCB3aGVuIHJ1bm5pbmcgdW5kZXIKbmV3ZXIgWGVuIHBs YXRmb3JtLCBYZW4gcGFkIGRyaXZlciB3b3VsZCBiZSBlYXJseSBsb2FkZWQsIHNvIG5hdGl2ZSBw YWQgZHJpdmVyCndvdWxkIGZhaWwgdG8gYmUgbG9hZGVkLCBhbmQgaGVuY2Ugbm8gbXdhaXQvbW9u aXRvciAjVUQgcmlzayBhZ2Fpbi4KCkFub3RoZXIgcG9pbnQgaXMsIG9ubHkgWGVuNC4yIG9yIGxh dGVyIHN1cHBvcnQgWGVuIGFjcGkgcGFkLCBzbyB3ZSB3b24ndCBleHBvc2UKbXdhaXQgY3B1aWQg Y2FwYWJpbGl0eSB3aGVuIHJ1bm5pbmcgdW5kZXIgb2xkZXIgWGVuIHBsYXRmb3JtLgoKU2lnbmVk LW9mZi1ieTogTGl1LCBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5jb20+Ci0tLQogYXJjaC94 ODYveGVuL2VubGlnaHRlbi5jIHwgICAxMCArKysrKysrKy0tCiAxIGZpbGVzIGNoYW5nZWQsIDgg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4v ZW5saWdodGVuLmMgYi9hcmNoL3g4Ni94ZW4vZW5saWdodGVuLmMKaW5kZXggNTg2ZDgzOC4uNTQ4 Mjk2ZiAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL2VubGlnaHRlbi5jCisrKyBiL2FyY2gveDg2 L3hlbi9lbmxpZ2h0ZW4uYwpAQCAtMjg3LDggKzI4Nyw3IEBAIHN0YXRpYyB2b2lkIHhlbl9jcHVp ZCh1bnNpZ25lZCBpbnQgKmF4LCB1bnNpZ25lZCBpbnQgKmJ4LAogCiBzdGF0aWMgYm9vbCBfX2lu aXQgeGVuX2NoZWNrX213YWl0KHZvaWQpCiB7Ci0jaWYgZGVmaW5lZChDT05GSUdfQUNQSSkgJiYg IWRlZmluZWQoQ09ORklHX0FDUElfUFJPQ0VTU09SX0FHR1JFR0FUT1IpICYmIFwKLQkhZGVmaW5l ZChDT05GSUdfQUNQSV9QUk9DRVNTT1JfQUdHUkVHQVRPUl9NT0RVTEUpCisjaWZkZWYgQ09ORklH X0FDUEkKIAlzdHJ1Y3QgeGVuX3BsYXRmb3JtX29wIG9wID0gewogCQkuY21kCQkJPSBYRU5QRl9z ZXRfcHJvY2Vzc29yX3BtaW5mbywKIAkJLnUuc2V0X3BtaW5mby5pZAk9IC0xLApAQCAtMzA5LDYg KzMwOCwxMyBAQCBzdGF0aWMgYm9vbCBfX2luaXQgeGVuX2NoZWNrX213YWl0KHZvaWQpCiAJaWYg KCF4ZW5faW5pdGlhbF9kb21haW4oKSkKIAkJcmV0dXJuIGZhbHNlOwogCisJLyoKKwkgKiBXaGVu IHJ1bm5pbmcgdW5kZXIgcGxhdGZvcm0gZWFybGllciB0aGFuIFhlbjQuMiwgZG8gbm90IGV4cG9z ZQorCSAqIG13YWl0LCB0byBhdm9pZCB0aGUgcmlzayBvZiBsb2FkaW5nIG5hdGl2ZSBhY3BpIHBh ZCBkcml2ZXIKKwkgKi8KKwlpZiAoIXhlbl9ydW5uaW5nX29uX3ZlcnNpb25fb3JfbGF0ZXIoNCwg MikpCisJCXJldHVybiBmYWxzZTsKKwogCWF4ID0gMTsKIAljeCA9IDA7CiAKLS0gCjEuNy4xCgo= --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_DE8DF0795D48FD4CA783C40EC829233537BF64SHSMSX101ccrcorpi_-- From xen-devel-bounces@lists.xen.org Thu Nov 08 07:35:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:35:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMdi-00017f-Nt; Thu, 08 Nov 2012 07:35:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMdg-00017a-Dm for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:35:00 +0000 Received: from [85.158.143.99:14261] by server-3.bemta-4.messagelabs.com id A3/A5-06841-3A06B905; Thu, 08 Nov 2012 07:34:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352360099!28515188!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30950 invoked from network); 8 Nov 2012 07:34:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 8 Nov 2012 07:34:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 07:34:58 +0000 Message-Id: <509B6EB002000078000A71CB@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 07:34:56 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509A958E02000078000A7039@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 18:10, Keir Fraser wrote: > On 07/11/2012 16:08, "Jan Beulich" wrote: > >> This opcode neither support 1-byte operands, nor does it support 8-byte >> ones (since the opcode is undefined in 64-bit mode). Simplify the code >> accordingly. >> >> Signed-off-by: Jan Beulich >> >> --- a/xen/arch/x86/x86_emulate/x86_emulate.c >> +++ b/xen/arch/x86/x86_emulate/x86_emulate.c >> @@ -1996,13 +1996,10 @@ x86_emulate( >> if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), >> &dst.val, op_bytes, ctxt, ops)) != 0 ) >> goto done; >> - switch ( op_bytes ) >> - { >> - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; >> - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; >> - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ >> - case 8: *regs[i] = dst.val; break; >> - } >> + if ( op_bytes != 2 ) >> + *regs[i] = (uint32_t)dst.val; /* 64b: zero-ext */ >> + else >> + *(uint16_t *)regs[i] = (uint16_t)dst.val; > > Would prefer: > if ( op_bytes == 2 ) > *(uint16_t *)regs[i] = (uint16_t)dst.val; > else > *regs[i] = dst.val; > > Handles the exceptional case immediately after its predicate. I had it that way first, but compilers tend to prefer (in terms of static branch prediction) the if() body over the else one. Doesn't matter that much here of course, but I'm generally trying to follow such guidelines even in non performance critical paths so that in case code gets cloned elsewhere it doesn't require extra reviewing or adjustment. > And the cast > from uint32_t, and 64b-related comment, are pointless and in fact misleading > in the default case, since as you say the instruction is invalid in 64-bit > mode. And I considered that aspect too: Even if invalid in 64-bit mode, it is valid in compatibility mode, and in that case the zero-extension makes sense (as does the comment). Jan > Apart from that: > Acked-by: Keir Fraser > > -- Keir > >> } >> break; >> } >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:35:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:35:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMdi-00017f-Nt; Thu, 08 Nov 2012 07:35:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMdg-00017a-Dm for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:35:00 +0000 Received: from [85.158.143.99:14261] by server-3.bemta-4.messagelabs.com id A3/A5-06841-3A06B905; Thu, 08 Nov 2012 07:34:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352360099!28515188!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30950 invoked from network); 8 Nov 2012 07:34:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 8 Nov 2012 07:34:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 07:34:58 +0000 Message-Id: <509B6EB002000078000A71CB@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 07:34:56 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509A958E02000078000A7039@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 18:10, Keir Fraser wrote: > On 07/11/2012 16:08, "Jan Beulich" wrote: > >> This opcode neither support 1-byte operands, nor does it support 8-byte >> ones (since the opcode is undefined in 64-bit mode). Simplify the code >> accordingly. >> >> Signed-off-by: Jan Beulich >> >> --- a/xen/arch/x86/x86_emulate/x86_emulate.c >> +++ b/xen/arch/x86/x86_emulate/x86_emulate.c >> @@ -1996,13 +1996,10 @@ x86_emulate( >> if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), >> &dst.val, op_bytes, ctxt, ops)) != 0 ) >> goto done; >> - switch ( op_bytes ) >> - { >> - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; >> - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; >> - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ >> - case 8: *regs[i] = dst.val; break; >> - } >> + if ( op_bytes != 2 ) >> + *regs[i] = (uint32_t)dst.val; /* 64b: zero-ext */ >> + else >> + *(uint16_t *)regs[i] = (uint16_t)dst.val; > > Would prefer: > if ( op_bytes == 2 ) > *(uint16_t *)regs[i] = (uint16_t)dst.val; > else > *regs[i] = dst.val; > > Handles the exceptional case immediately after its predicate. I had it that way first, but compilers tend to prefer (in terms of static branch prediction) the if() body over the else one. Doesn't matter that much here of course, but I'm generally trying to follow such guidelines even in non performance critical paths so that in case code gets cloned elsewhere it doesn't require extra reviewing or adjustment. > And the cast > from uint32_t, and 64b-related comment, are pointless and in fact misleading > in the default case, since as you say the instruction is invalid in 64-bit > mode. And I considered that aspect too: Even if invalid in 64-bit mode, it is valid in compatibility mode, and in that case the zero-extension makes sense (as does the comment). Jan > Apart from that: > Acked-by: Keir Fraser > > -- Keir > >> } >> break; >> } >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:38:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:38:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMgC-0001Ck-9U; Thu, 08 Nov 2012 07:37:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMgA-0001Cf-TT for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:37:35 +0000 Received: from [85.158.137.99:44051] by server-11.bemta-3.messagelabs.com id 1B/5A-19361-E316B905; Thu, 08 Nov 2012 07:37:34 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352360253!15089800!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16473 invoked from network); 8 Nov 2012 07:37:33 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-12.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:37:33 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so1891566wib.14 for ; Wed, 07 Nov 2012 23:37:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=dkEYtIGXkZja80+225f6HTVoWLULU4NqUAACnpeWEkI=; b=05IGUNGocwQb/M88cIEsmheXiS2eVJh+Iu04wLcjpMxf/SEYJzM5x2wG2Qx+z2gB1g IX6lDuzXJYzZUtZHYtJ7X/3Gkbnz4LVBjIfwzx+/pAR4oV+7o1WdwaAV9MwVgZOQ4KA8 4fF1kufHAbNa06WGbXZ2XOYophq8R07JNQ2TM7bNFpvnQdVO4S5L2PQx2z5forFyE6G5 /t8QA8uhJulCX3N2tqCq0LsORMvm+TMR36xiipHjGb/DfAQX7fkDjcGDN5nlao0VpLDM myrvb9EVd4aoeDNjZz1mpts5Siio7qiz4oXcxOqBNLQLTG9YN5a4W9Gx8qhAkV0A7TpA lNzA== Received: by 10.180.84.41 with SMTP id v9mr11569010wiy.8.1352360226735; Wed, 07 Nov 2012 23:37:06 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id en20sm7014237wid.4.2012.11.07.23.36.58 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:37:06 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:36:57 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29g9SrP69REaOlQ0SR3bcqFiIGyA== In-Reply-To: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 22:17, "Dan Magenheimer" wrote: > I think this brings us back to the proposed "claim" hypercall/subop. > Unless there are further objections or suggestions for different > approaches, I'll commence prototyping it, OK? Yes, in fact I thought you'd started already! K. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:38:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:38:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMgC-0001Ck-9U; Thu, 08 Nov 2012 07:37:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMgA-0001Cf-TT for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:37:35 +0000 Received: from [85.158.137.99:44051] by server-11.bemta-3.messagelabs.com id 1B/5A-19361-E316B905; Thu, 08 Nov 2012 07:37:34 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352360253!15089800!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16473 invoked from network); 8 Nov 2012 07:37:33 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-12.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:37:33 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so1891566wib.14 for ; Wed, 07 Nov 2012 23:37:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=dkEYtIGXkZja80+225f6HTVoWLULU4NqUAACnpeWEkI=; b=05IGUNGocwQb/M88cIEsmheXiS2eVJh+Iu04wLcjpMxf/SEYJzM5x2wG2Qx+z2gB1g IX6lDuzXJYzZUtZHYtJ7X/3Gkbnz4LVBjIfwzx+/pAR4oV+7o1WdwaAV9MwVgZOQ4KA8 4fF1kufHAbNa06WGbXZ2XOYophq8R07JNQ2TM7bNFpvnQdVO4S5L2PQx2z5forFyE6G5 /t8QA8uhJulCX3N2tqCq0LsORMvm+TMR36xiipHjGb/DfAQX7fkDjcGDN5nlao0VpLDM myrvb9EVd4aoeDNjZz1mpts5Siio7qiz4oXcxOqBNLQLTG9YN5a4W9Gx8qhAkV0A7TpA lNzA== Received: by 10.180.84.41 with SMTP id v9mr11569010wiy.8.1352360226735; Wed, 07 Nov 2012 23:37:06 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id en20sm7014237wid.4.2012.11.07.23.36.58 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:37:06 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:36:57 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29g9SrP69REaOlQ0SR3bcqFiIGyA== In-Reply-To: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 22:17, "Dan Magenheimer" wrote: > I think this brings us back to the proposed "claim" hypercall/subop. > Unless there are further objections or suggestions for different > approaches, I'll commence prototyping it, OK? Yes, in fact I thought you'd started already! K. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:43:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMl7-0001Ok-0y; Thu, 08 Nov 2012 07:42:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMl5-0001Ob-Ch for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:42:39 +0000 Received: from [85.158.138.51:45223] by server-14.bemta-3.messagelabs.com id 05/DD-12788-E626B905; Thu, 08 Nov 2012 07:42:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1352360557!29153547!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2328 invoked from network); 8 Nov 2012 07:42:38 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-9.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:42:38 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so692759wib.14 for ; Wed, 07 Nov 2012 23:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=SFR0O6a5UBzZzOncaD7u/kbu8ZAIEyJfGEbkR3UdHjg=; b=w2T0umpTOJMTfo3zhlIM38u5+vMmPywss0ORhf6STEOWZcLk6Q3dOxxhe9GWoFHFq6 ZqmDrh/gLyBosvg8aIVy9sBbAgyhyIc2ckZJ/TRgQ57Se8iS+ex5vMOalqjlz4N7lqF5 ohEUSe4xINcthB9RcBQY5GpufdRTBDXtPEMgQA11+ZePgNImI/drGjLIPx+l91CZBQrG uFwbQ7arh+NYZHqRSQDSpNPPFi6IWOBbRFt4QclVkuDVKvfGbL08Ekdu+kLSkdBoyCpb cF86kRfQk0umtDn3mrahyDVZtTjI71dhmOy+FU8HR+zCeVe4C+4cl81m1JVmdFz0Wn8C svog== Received: by 10.216.199.10 with SMTP id w10mr2954063wen.198.1352360557668; Wed, 07 Nov 2012 23:42:37 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id w8sm6176643wiv.8.2012.11.07.23.42.36 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:42:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:42:35 +0000 From: Keir Fraser To: Andres Lagar-Cavilla , Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Message-ID: Thread-Topic: Wait Queues Thread-Index: Ac29hJ4imi/5WZj6yUCLAsgySkLPxg== In-Reply-To: <25D45C62-FB0E-4345-A5A1-9A37F219477B@gridcentric.ca> Mime-version: 1.0 Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 03:22, "Andres Lagar-Cavilla" wrote: >> I'd like to propose an approach that ensures that as long some propertie= s are >> met, arbitrary wait queue sleep is allowed. Here are the properties: >> 1. Third parties servicing a wait queue sleep are indeed third parties. = In >> other words, dom0 does not do paging. >> 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait >> queue during a foreign map. >> 3. A guest vcpu may go to sleep on a wait queue holding any kinds of loc= ks as >> long as it does not hold the p2m lock. > = > N.B: I understand (now) this may cause any other vcpu contending on a lock > held by the wait queue sleeper to not yield to the scheduler and pin its > physical cpu. > = > What I am struggling with is coming up with a solution that doesn't turn > hypervisor mm hacking into a locking minefield. > = > Linux fixes this with many kinds of sleeping synchronization primitives. A > task can, for example, hold the mmap semaphore and sleep on a wait queue.= Is > this the only way out of this mess? Not if wait queues force the vcpu to = wake > up on the same phys cpu it was using at the time of sleeping=8A. Well, the forcing to wake up on same phys cpu it slept on is going to be fixed. But it's not clear to me how that current restriction makes the problem harder? What if you were running on a single-phys-cpu system? As you have realised, the fact that all locks in Xen are spinlocks makes the potential for deadlock very obvious. Someone else gets scheduled and takes out the phys cpu by spinning on a lock that someone else is holding while they are descheduled. Linux-style sleeping mutexes might help. We could add those. They don't help as readily as in the Linux case however! In some ways they push the deadlock up one level of abstraction, to the virt cpu (vcpu). Consider single-vcpu dom0 running a pager -- even if you are careful that the pager itself does not acquire any locks that one of its clients may hold-while-sleeping, if *anything* running in dom0 can acquire such a lock, you have an obvious deadlock, as that will take out the dom0 vcpu and leave it blocked forever waiting for a lock that is held while its holder waits for service from the dom0 vcpu.... I don't think there is an easy solution here! -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:43:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMl7-0001Ok-0y; Thu, 08 Nov 2012 07:42:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMl5-0001Ob-Ch for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:42:39 +0000 Received: from [85.158.138.51:45223] by server-14.bemta-3.messagelabs.com id 05/DD-12788-E626B905; Thu, 08 Nov 2012 07:42:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1352360557!29153547!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2328 invoked from network); 8 Nov 2012 07:42:38 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-9.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:42:38 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so692759wib.14 for ; Wed, 07 Nov 2012 23:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=SFR0O6a5UBzZzOncaD7u/kbu8ZAIEyJfGEbkR3UdHjg=; b=w2T0umpTOJMTfo3zhlIM38u5+vMmPywss0ORhf6STEOWZcLk6Q3dOxxhe9GWoFHFq6 ZqmDrh/gLyBosvg8aIVy9sBbAgyhyIc2ckZJ/TRgQ57Se8iS+ex5vMOalqjlz4N7lqF5 ohEUSe4xINcthB9RcBQY5GpufdRTBDXtPEMgQA11+ZePgNImI/drGjLIPx+l91CZBQrG uFwbQ7arh+NYZHqRSQDSpNPPFi6IWOBbRFt4QclVkuDVKvfGbL08Ekdu+kLSkdBoyCpb cF86kRfQk0umtDn3mrahyDVZtTjI71dhmOy+FU8HR+zCeVe4C+4cl81m1JVmdFz0Wn8C svog== Received: by 10.216.199.10 with SMTP id w10mr2954063wen.198.1352360557668; Wed, 07 Nov 2012 23:42:37 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id w8sm6176643wiv.8.2012.11.07.23.42.36 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:42:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:42:35 +0000 From: Keir Fraser To: Andres Lagar-Cavilla , Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Message-ID: Thread-Topic: Wait Queues Thread-Index: Ac29hJ4imi/5WZj6yUCLAsgySkLPxg== In-Reply-To: <25D45C62-FB0E-4345-A5A1-9A37F219477B@gridcentric.ca> Mime-version: 1.0 Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 03:22, "Andres Lagar-Cavilla" wrote: >> I'd like to propose an approach that ensures that as long some propertie= s are >> met, arbitrary wait queue sleep is allowed. Here are the properties: >> 1. Third parties servicing a wait queue sleep are indeed third parties. = In >> other words, dom0 does not do paging. >> 2. Vcpus of a wait queue servicing domain may never go to sleep on a wait >> queue during a foreign map. >> 3. A guest vcpu may go to sleep on a wait queue holding any kinds of loc= ks as >> long as it does not hold the p2m lock. > = > N.B: I understand (now) this may cause any other vcpu contending on a lock > held by the wait queue sleeper to not yield to the scheduler and pin its > physical cpu. > = > What I am struggling with is coming up with a solution that doesn't turn > hypervisor mm hacking into a locking minefield. > = > Linux fixes this with many kinds of sleeping synchronization primitives. A > task can, for example, hold the mmap semaphore and sleep on a wait queue.= Is > this the only way out of this mess? Not if wait queues force the vcpu to = wake > up on the same phys cpu it was using at the time of sleeping=8A. Well, the forcing to wake up on same phys cpu it slept on is going to be fixed. But it's not clear to me how that current restriction makes the problem harder? What if you were running on a single-phys-cpu system? As you have realised, the fact that all locks in Xen are spinlocks makes the potential for deadlock very obvious. Someone else gets scheduled and takes out the phys cpu by spinning on a lock that someone else is holding while they are descheduled. Linux-style sleeping mutexes might help. We could add those. They don't help as readily as in the Linux case however! In some ways they push the deadlock up one level of abstraction, to the virt cpu (vcpu). Consider single-vcpu dom0 running a pager -- even if you are careful that the pager itself does not acquire any locks that one of its clients may hold-while-sleeping, if *anything* running in dom0 can acquire such a lock, you have an obvious deadlock, as that will take out the dom0 vcpu and leave it blocked forever waiting for a lock that is held while its holder waits for service from the dom0 vcpu.... I don't think there is an easy solution here! -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:48:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:48:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMqk-0001Xl-QC; Thu, 08 Nov 2012 07:48:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMqj-0001Xf-6u for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:48:29 +0000 Received: from [85.158.143.99:28877] by server-1.bemta-4.messagelabs.com id 2D/09-27934-CC36B905; Thu, 08 Nov 2012 07:48:28 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352360907!18140530!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20021 invoked from network); 8 Nov 2012 07:48:27 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-8.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:48:27 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1322036wey.32 for ; Wed, 07 Nov 2012 23:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CiRFaG1bw3n11a05J0vIqYUevjm4eM2lapgdc970lBo=; b=j9q2BH+nxZNLxTxHd/wdo+sT+TyXF0hu3VQ9P/CLJuS2fIGibZnRc8RGBxf1KRyYt2 o3K5qT1DaaTb82kjuonvwPk7ORSQ9+lIiHdOpntXrTcw4PuhMUpKFg+WnWau7HW9MEh8 9djegs9XqJJYy9NSPAIT4cHNN2h/mXkJdqbO16MItcovqrVGH/gQpNH5lvOkXsQ3gh9A qIG6+CvfgQyvW2G/kQam/a1rp3oj6rNVYz5MVDS+o7F6Gb9rYdIHF1zMBi7t0YPf10BW 66yfsm4jAoCkyty6Y7KeKQr73N9l45GQNLfpGI3eR3LFryQTckKV3ZZrqxUjD7JtRXWg Rp5w== Received: by 10.180.82.162 with SMTP id j2mr11613216wiy.14.1352360907435; Wed, 07 Nov 2012 23:48:27 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id r10sm7066551wiz.0.2012.11.07.23.48.26 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:48:26 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:48:23 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29hW2O/l9HTu14qkKyDgnFBX+aiQ== In-Reply-To: <509B6EB002000078000A71CB@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 07:34, "Jan Beulich" wrote: >> Would prefer: >> if ( op_bytes == 2 ) >> *(uint16_t *)regs[i] = (uint16_t)dst.val; >> else >> *regs[i] = dst.val; >> >> Handles the exceptional case immediately after its predicate. > > I had it that way first, but compilers tend to prefer (in terms of > static branch prediction) the if() body over the else one. Doesn't > matter that much here of course, but I'm generally trying to > follow such guidelines even in non performance critical paths so > that in case code gets cloned elsewhere it doesn't require extra > reviewing or adjustment. Should follow such guidelines where the optimisation matters. I think shaping code to follow such guidelines all the time, is misguided. I'd rather have the fractionally more readable version than the possibly-fractionally faster version. >> And the cast >> from uint32_t, and 64b-related comment, are pointless and in fact misleading >> in the default case, since as you say the instruction is invalid in 64-bit >> mode. > > And I considered that aspect too: Even if invalid in 64-bit mode, it > is valid in compatibility mode, and in that case the zero-extension > makes sense (as does the comment). I did wonder. The top halves of 64b registers are not used in compatibility mode. Are their contents at all guaranteed to be maintained/updated/preserved in any meaningful way across transitions into and out of compatibility mode? I wasn't aware they were, and in that case the cast and comment are indeed pointless. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:48:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:48:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMqk-0001Xl-QC; Thu, 08 Nov 2012 07:48:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMqj-0001Xf-6u for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:48:29 +0000 Received: from [85.158.143.99:28877] by server-1.bemta-4.messagelabs.com id 2D/09-27934-CC36B905; Thu, 08 Nov 2012 07:48:28 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352360907!18140530!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20021 invoked from network); 8 Nov 2012 07:48:27 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-8.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:48:27 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1322036wey.32 for ; Wed, 07 Nov 2012 23:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CiRFaG1bw3n11a05J0vIqYUevjm4eM2lapgdc970lBo=; b=j9q2BH+nxZNLxTxHd/wdo+sT+TyXF0hu3VQ9P/CLJuS2fIGibZnRc8RGBxf1KRyYt2 o3K5qT1DaaTb82kjuonvwPk7ORSQ9+lIiHdOpntXrTcw4PuhMUpKFg+WnWau7HW9MEh8 9djegs9XqJJYy9NSPAIT4cHNN2h/mXkJdqbO16MItcovqrVGH/gQpNH5lvOkXsQ3gh9A qIG6+CvfgQyvW2G/kQam/a1rp3oj6rNVYz5MVDS+o7F6Gb9rYdIHF1zMBi7t0YPf10BW 66yfsm4jAoCkyty6Y7KeKQr73N9l45GQNLfpGI3eR3LFryQTckKV3ZZrqxUjD7JtRXWg Rp5w== Received: by 10.180.82.162 with SMTP id j2mr11613216wiy.14.1352360907435; Wed, 07 Nov 2012 23:48:27 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id r10sm7066551wiz.0.2012.11.07.23.48.26 (version=SSLv3 cipher=OTHER); Wed, 07 Nov 2012 23:48:26 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 07:48:23 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29hW2O/l9HTu14qkKyDgnFBX+aiQ== In-Reply-To: <509B6EB002000078000A71CB@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 07:34, "Jan Beulich" wrote: >> Would prefer: >> if ( op_bytes == 2 ) >> *(uint16_t *)regs[i] = (uint16_t)dst.val; >> else >> *regs[i] = dst.val; >> >> Handles the exceptional case immediately after its predicate. > > I had it that way first, but compilers tend to prefer (in terms of > static branch prediction) the if() body over the else one. Doesn't > matter that much here of course, but I'm generally trying to > follow such guidelines even in non performance critical paths so > that in case code gets cloned elsewhere it doesn't require extra > reviewing or adjustment. Should follow such guidelines where the optimisation matters. I think shaping code to follow such guidelines all the time, is misguided. I'd rather have the fractionally more readable version than the possibly-fractionally faster version. >> And the cast >> from uint32_t, and 64b-related comment, are pointless and in fact misleading >> in the default case, since as you say the instruction is invalid in 64-bit >> mode. > > And I considered that aspect too: Even if invalid in 64-bit mode, it > is valid in compatibility mode, and in that case the zero-extension > makes sense (as does the comment). I did wonder. The top halves of 64b registers are not used in compatibility mode. Are their contents at all guaranteed to be maintained/updated/preserved in any meaningful way across transitions into and out of compatibility mode? I wasn't aware they were, and in that case the cast and comment are indeed pointless. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:52:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:52:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMuM-0001fq-EN; Thu, 08 Nov 2012 07:52:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMuK-0001fi-Oq for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:52:12 +0000 Received: from [85.158.143.99:32491] by server-3.bemta-4.messagelabs.com id 9D/D4-06841-CA46B905; Thu, 08 Nov 2012 07:52:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352361129!18286710!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIxNDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3891 invoked from network); 8 Nov 2012 07:52:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:52:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="43903695" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 07:51:59 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 02:51:59 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWMu6-0000T6-Pv; Thu, 08 Nov 2012 07:51:58 +0000 Message-ID: <1352360998.12977.81.camel@hastur.hellion.org.uk> From: Ian Campbell To: Joseph Glanville Date: Thu, 8 Nov 2012 08:49:58 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , Ben Eyres Subject: Re: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 23:33 +0000, Joseph Glanville wrote: > On 8 November 2012 07:49, Ben Eyres wrote: > > This is probably quite a vague and simple question but here goes...Can > > anyone tell me where in the Xen-4.2.0 source files i can find source code > > for the virtual switching (Vif/Pif')? This is the first time i have worked > > with the Xen source code so struggling to work my way around the system. > > The virtual switching is not done by Xen but rather by the Linux > bridge module or Open vSwitch etc. > If you are interested in how virtual adapters are created and packets > transfered from domU to domO I suggest looking at the Linux source > tree in drivers/net/ for netback/netfront. Also http://wiki.xen.org/wiki/Xen_Networking should provide a useful guide to how the various bits work together. The use of the Vif/Pif terminology makes me wonder if you are using xapi/XCP -- in which case you may find the xen-api@ list is more likely to have people who can point you to the code which manages those in the xapi toolstack. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 07:52:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 07:52:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMuM-0001fq-EN; Thu, 08 Nov 2012 07:52:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWMuK-0001fi-Oq for xen-devel@lists.xen.org; Thu, 08 Nov 2012 07:52:12 +0000 Received: from [85.158.143.99:32491] by server-3.bemta-4.messagelabs.com id 9D/D4-06841-CA46B905; Thu, 08 Nov 2012 07:52:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352361129!18286710!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIxNDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3891 invoked from network); 8 Nov 2012 07:52:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 07:52:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="43903695" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 07:51:59 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 02:51:59 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWMu6-0000T6-Pv; Thu, 08 Nov 2012 07:51:58 +0000 Message-ID: <1352360998.12977.81.camel@hastur.hellion.org.uk> From: Ian Campbell To: Joseph Glanville Date: Thu, 8 Nov 2012 08:49:58 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" , Ben Eyres Subject: Re: [Xen-devel] Virtual Networking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 23:33 +0000, Joseph Glanville wrote: > On 8 November 2012 07:49, Ben Eyres wrote: > > This is probably quite a vague and simple question but here goes...Can > > anyone tell me where in the Xen-4.2.0 source files i can find source code > > for the virtual switching (Vif/Pif')? This is the first time i have worked > > with the Xen source code so struggling to work my way around the system. > > The virtual switching is not done by Xen but rather by the Linux > bridge module or Open vSwitch etc. > If you are interested in how virtual adapters are created and packets > transfered from domU to domO I suggest looking at the Linux source > tree in drivers/net/ for netback/netfront. Also http://wiki.xen.org/wiki/Xen_Networking should provide a useful guide to how the various bits work together. The use of the Vif/Pif terminology makes me wonder if you are using xapi/XCP -- in which case you may find the xen-api@ list is more likely to have people who can point you to the code which manages those in the xapi toolstack. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:00:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWN2Z-0002Id-2P; Thu, 08 Nov 2012 08:00:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWN2W-0002IY-Ts for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:00:41 +0000 Received: from [85.158.137.99:40822] by server-1.bemta-3.messagelabs.com id C0/DD-12169-8A66B905; Thu, 08 Nov 2012 08:00:40 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352361638!18121142!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21096 invoked from network); 8 Nov 2012 08:00:38 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-217.messagelabs.com with SMTP; 8 Nov 2012 08:00:38 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:00:37 +0000 Message-Id: <509B74B402000078000A7206@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:00:36 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> In-Reply-To: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 23:17, Dan Magenheimer wrote: > It appears that the attempt to use 2MB and 1GB pages is done in > the toolstack, and if the hypervisor rejects it, toolstack tries > smaller pages. Thus, if physical memory is highly fragmented > (few or no order>=9 allocations available), this will result > in one hypercall per 4k page so a 256GB domain would require > 64 million hypercalls. And, since AFAICT, there is no sane > way to hold the heap_lock across even two hypercalls, speeding > up the in-hypervisor allocation path, by itself, will not solve > the TOCTOU race. No, even in the absence of large pages, the tool stack will do 8M allocations, just without requesting them to be contiguous. Whether 8M is a suitable value is another aspect; that value may predate hypercall preemption, and I don't immediately see why the tool stack shouldn't be able to request larger chunks (up to the whole amount at once). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:00:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:00:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWN2Z-0002Id-2P; Thu, 08 Nov 2012 08:00:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWN2W-0002IY-Ts for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:00:41 +0000 Received: from [85.158.137.99:40822] by server-1.bemta-3.messagelabs.com id C0/DD-12169-8A66B905; Thu, 08 Nov 2012 08:00:40 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352361638!18121142!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21096 invoked from network); 8 Nov 2012 08:00:38 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-217.messagelabs.com with SMTP; 8 Nov 2012 08:00:38 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:00:37 +0000 Message-Id: <509B74B402000078000A7206@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:00:36 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> In-Reply-To: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 23:17, Dan Magenheimer wrote: > It appears that the attempt to use 2MB and 1GB pages is done in > the toolstack, and if the hypervisor rejects it, toolstack tries > smaller pages. Thus, if physical memory is highly fragmented > (few or no order>=9 allocations available), this will result > in one hypercall per 4k page so a 256GB domain would require > 64 million hypercalls. And, since AFAICT, there is no sane > way to hold the heap_lock across even two hypercalls, speeding > up the in-hypervisor allocation path, by itself, will not solve > the TOCTOU race. No, even in the absence of large pages, the tool stack will do 8M allocations, just without requesting them to be contiguous. Whether 8M is a suitable value is another aspect; that value may predate hypercall preemption, and I don't immediately see why the tool stack shouldn't be able to request larger chunks (up to the whole amount at once). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:17:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:17:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNIv-0002VT-Qp; Thu, 08 Nov 2012 08:17:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNIu-0002VO-6x for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 08:17:36 +0000 Received: from [85.158.138.51:2119] by server-10.bemta-3.messagelabs.com id 9B/F1-19806-F9A6B905; Thu, 08 Nov 2012 08:17:35 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352362654!27274490!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19701 invoked from network); 8 Nov 2012 08:17:34 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-174.messagelabs.com with SMTP; 8 Nov 2012 08:17:34 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:17:33 +0000 Message-Id: <509B78AC02000078000A723C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:17:32 +0000 From: "Jan Beulich" To: "Matthew Fioravante" References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> In-Reply-To: <509AA501.1090701@jhuapl.edu> Mime-Version: 1.0 Content-Disposition: inline Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > On 11/07/2012 09:46 AM, Kent Yoder wrote: >>> --- a/drivers/char/tpm/tpm.h >>> +++ b/drivers/char/tpm/tpm.h >>> @@ -130,6 +130,9 @@ struct tpm_chip { >>> >>> struct list_head list; >>> void (*release) (struct device *); >>> +#if CONFIG_XEN >>> + void *priv; >>> +#endif >> Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is >> already using that as a priv pointer. I should probably change that name >> to make it more obvious what that's used for. > That makes more sense. I'm guessing your data pointer didn't exist > during the 2.6.18 kernel which is why they added their own priv pointer. It got introduced with 3.7-rc. >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >>> >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >>> >>> +#ifdef CONFIG_XEN >>> +static inline void *chip_get_private(const struct tpm_chip *chip) >>> +{ >>> + return chip->priv; >>> +} >>> + >>> +static inline void chip_set_private(struct tpm_chip *chip, void *priv) >>> +{ >>> + chip->priv = priv; >>> +} >>> +#endif >> Can you put these in tpm_vtpm.c please? One less #define. :-) > Agreed, I'd rather not have to modify your shared tpm.h interface at all. Either such accessors should be defined here, for everyone to use (and tpm_ibmvtpm.c get changed accordingly), or the Xen code should access the field without wrappers too (for consistency). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:17:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:17:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNIv-0002VT-Qp; Thu, 08 Nov 2012 08:17:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNIu-0002VO-6x for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 08:17:36 +0000 Received: from [85.158.138.51:2119] by server-10.bemta-3.messagelabs.com id 9B/F1-19806-F9A6B905; Thu, 08 Nov 2012 08:17:35 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352362654!27274490!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19701 invoked from network); 8 Nov 2012 08:17:34 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-174.messagelabs.com with SMTP; 8 Nov 2012 08:17:34 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:17:33 +0000 Message-Id: <509B78AC02000078000A723C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:17:32 +0000 From: "Jan Beulich" To: "Matthew Fioravante" References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> In-Reply-To: <509AA501.1090701@jhuapl.edu> Mime-Version: 1.0 Content-Disposition: inline Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > On 11/07/2012 09:46 AM, Kent Yoder wrote: >>> --- a/drivers/char/tpm/tpm.h >>> +++ b/drivers/char/tpm/tpm.h >>> @@ -130,6 +130,9 @@ struct tpm_chip { >>> >>> struct list_head list; >>> void (*release) (struct device *); >>> +#if CONFIG_XEN >>> + void *priv; >>> +#endif >> Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is >> already using that as a priv pointer. I should probably change that name >> to make it more obvious what that's used for. > That makes more sense. I'm guessing your data pointer didn't exist > during the 2.6.18 kernel which is why they added their own priv pointer. It got introduced with 3.7-rc. >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >>> >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >>> >>> +#ifdef CONFIG_XEN >>> +static inline void *chip_get_private(const struct tpm_chip *chip) >>> +{ >>> + return chip->priv; >>> +} >>> + >>> +static inline void chip_set_private(struct tpm_chip *chip, void *priv) >>> +{ >>> + chip->priv = priv; >>> +} >>> +#endif >> Can you put these in tpm_vtpm.c please? One less #define. :-) > Agreed, I'd rather not have to modify your shared tpm.h interface at all. Either such accessors should be defined here, for everyone to use (and tpm_ibmvtpm.c get changed accordingly), or the Xen code should access the field without wrappers too (for consistency). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:18:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:18:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNJs-0002YD-9D; Thu, 08 Nov 2012 08:18:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNJq-0002Y2-Mz for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:18:35 +0000 Received: from [85.158.138.51:5727] by server-3.bemta-3.messagelabs.com id 61/1E-31566-9DA6B905; Thu, 08 Nov 2012 08:18:33 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352362713!29178920!1 X-Originating-IP: [209.85.212.169] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19652 invoked from network); 8 Nov 2012 08:18:33 -0000 Received: from mail-wi0-f169.google.com (HELO mail-wi0-f169.google.com) (209.85.212.169) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:18:33 -0000 Received: by mail-wi0-f169.google.com with SMTP id hq4so5462523wib.2 for ; Thu, 08 Nov 2012 00:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=YAhkxcVxdb0yCsDxp/5PoO1a1bB8yftZuQ3zO4G8TNo=; b=v9Qk1ieHChXxxwzOEQanfw1gNEG4iAsAr2p2UMbyo3NzqGAeMdZBBWsHUnekA0ANuS EBEGnSr9bL0KTPNAVTvlzsYqrP0czlRZ5eOQX6s9QrhNhFZTfsgBQytJ1ZknBCH5m8XJ kaHufMlyQoeCWgywSJ40JBakxNHLDzzNb++TT4ykSOOVt5Rk8T7ObWdXi9bk00Fphj/W QLcpz7bMTTNpwJ7oOjqY7IAJAeZzvyPioxJDvw4h14k9daYcVaOXvrVfVdTOj2v6J9gl 3eCmutMqPCuiu1H1MwaCcHpOarJ7OCNPxOVKZ8Nj9DCmp3F+3tSC++8qigIh8y/xvNzr xZ7A== Received: by 10.180.84.34 with SMTP id v2mr11696561wiy.20.1352362712931; Thu, 08 Nov 2012 00:18:32 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fn7sm6292975wib.9.2012.11.08.00.18.30 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 00:18:32 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 08:18:29 +0000 From: Keir Fraser To: Jan Beulich , Dan Magenheimer Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29iaIE5Z8jxEKZGUy+V3xoaL/D1w== In-Reply-To: <509B74B402000078000A7206@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:00, "Jan Beulich" wrote: >>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >> It appears that the attempt to use 2MB and 1GB pages is done in >> the toolstack, and if the hypervisor rejects it, toolstack tries >> smaller pages. Thus, if physical memory is highly fragmented >> (few or no order>=9 allocations available), this will result >> in one hypercall per 4k page so a 256GB domain would require >> 64 million hypercalls. And, since AFAICT, there is no sane >> way to hold the heap_lock across even two hypercalls, speeding >> up the in-hypervisor allocation path, by itself, will not solve >> the TOCTOU race. > > No, even in the absence of large pages, the tool stack will do 8M > allocations, just without requesting them to be contiguous. > Whether 8M is a suitable value is another aspect; that value may > predate hypercall preemption, and I don't immediately see why > the tool stack shouldn't be able to request larger chunks (up to > the whole amount at once). It is probably to allow other dom0 processing (including softirqs) to preempt the toolstack task, in the case that the kernel was not built with involuntary preemption enabled (having it disabled is the common case I believe?). 8M batches may provide enough returns to user space to allow other work to get a look-in. > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:18:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:18:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNJs-0002YD-9D; Thu, 08 Nov 2012 08:18:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNJq-0002Y2-Mz for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:18:35 +0000 Received: from [85.158.138.51:5727] by server-3.bemta-3.messagelabs.com id 61/1E-31566-9DA6B905; Thu, 08 Nov 2012 08:18:33 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352362713!29178920!1 X-Originating-IP: [209.85.212.169] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19652 invoked from network); 8 Nov 2012 08:18:33 -0000 Received: from mail-wi0-f169.google.com (HELO mail-wi0-f169.google.com) (209.85.212.169) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:18:33 -0000 Received: by mail-wi0-f169.google.com with SMTP id hq4so5462523wib.2 for ; Thu, 08 Nov 2012 00:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=YAhkxcVxdb0yCsDxp/5PoO1a1bB8yftZuQ3zO4G8TNo=; b=v9Qk1ieHChXxxwzOEQanfw1gNEG4iAsAr2p2UMbyo3NzqGAeMdZBBWsHUnekA0ANuS EBEGnSr9bL0KTPNAVTvlzsYqrP0czlRZ5eOQX6s9QrhNhFZTfsgBQytJ1ZknBCH5m8XJ kaHufMlyQoeCWgywSJ40JBakxNHLDzzNb++TT4ykSOOVt5Rk8T7ObWdXi9bk00Fphj/W QLcpz7bMTTNpwJ7oOjqY7IAJAeZzvyPioxJDvw4h14k9daYcVaOXvrVfVdTOj2v6J9gl 3eCmutMqPCuiu1H1MwaCcHpOarJ7OCNPxOVKZ8Nj9DCmp3F+3tSC++8qigIh8y/xvNzr xZ7A== Received: by 10.180.84.34 with SMTP id v2mr11696561wiy.20.1352362712931; Thu, 08 Nov 2012 00:18:32 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fn7sm6292975wib.9.2012.11.08.00.18.30 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 00:18:32 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 08:18:29 +0000 From: Keir Fraser To: Jan Beulich , Dan Magenheimer Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29iaIE5Z8jxEKZGUy+V3xoaL/D1w== In-Reply-To: <509B74B402000078000A7206@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:00, "Jan Beulich" wrote: >>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >> It appears that the attempt to use 2MB and 1GB pages is done in >> the toolstack, and if the hypervisor rejects it, toolstack tries >> smaller pages. Thus, if physical memory is highly fragmented >> (few or no order>=9 allocations available), this will result >> in one hypercall per 4k page so a 256GB domain would require >> 64 million hypercalls. And, since AFAICT, there is no sane >> way to hold the heap_lock across even two hypercalls, speeding >> up the in-hypervisor allocation path, by itself, will not solve >> the TOCTOU race. > > No, even in the absence of large pages, the tool stack will do 8M > allocations, just without requesting them to be contiguous. > Whether 8M is a suitable value is another aspect; that value may > predate hypercall preemption, and I don't immediately see why > the tool stack shouldn't be able to request larger chunks (up to > the whole amount at once). It is probably to allow other dom0 processing (including softirqs) to preempt the toolstack task, in the case that the kernel was not built with involuntary preemption enabled (having it disabled is the common case I believe?). 8M batches may provide enough returns to user space to allow other work to get a look-in. > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:28:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:28:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNTG-0002oA-BP; Thu, 08 Nov 2012 08:28:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNTE-0002o5-BW for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:28:16 +0000 Received: from [193.109.254.147:16174] by server-11.bemta-14.messagelabs.com id 47/1A-29027-F1D6B905; Thu, 08 Nov 2012 08:28:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352363293!10147670!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIxNDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3524 invoked from network); 8 Nov 2012 08:28:14 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:28:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="43906727" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 08:28:13 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 03:28:13 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWNTA-0000xn-ET; Thu, 08 Nov 2012 08:28:12 +0000 Message-ID: <1352363172.12977.87.camel@hastur.hellion.org.uk> From: Ian Campbell To: Sylvain Munaut , Roger Pau Monne Date: Thu, 8 Nov 2012 09:26:12 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: > Hi, > > I'm using a custom block script in my xen setup and when started, it > creates a new device node pointing to some network resources. > > Now I noticed that the script is called twice for the root block, the > first time for pygrub most likely, but is only stopped once ... I > don't mind creating two devices node, but then I need to destroy both > ... > > Is this a known issue ? Not one I've heard. Running "xl -vvv create" might provide some logs which give an idea what is going on, likewise the logging in /var/log/xen/... Roger -- any ideas? Ian. > > Cheers, > > Sylvain > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:28:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:28:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNTG-0002oA-BP; Thu, 08 Nov 2012 08:28:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNTE-0002o5-BW for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:28:16 +0000 Received: from [193.109.254.147:16174] by server-11.bemta-14.messagelabs.com id 47/1A-29027-F1D6B905; Thu, 08 Nov 2012 08:28:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352363293!10147670!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIxNDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3524 invoked from network); 8 Nov 2012 08:28:14 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:28:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="43906727" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 08:28:13 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 03:28:13 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWNTA-0000xn-ET; Thu, 08 Nov 2012 08:28:12 +0000 Message-ID: <1352363172.12977.87.camel@hastur.hellion.org.uk> From: Ian Campbell To: Sylvain Munaut , Roger Pau Monne Date: Thu, 8 Nov 2012 09:26:12 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: > Hi, > > I'm using a custom block script in my xen setup and when started, it > creates a new device node pointing to some network resources. > > Now I noticed that the script is called twice for the root block, the > first time for pygrub most likely, but is only stopped once ... I > don't mind creating two devices node, but then I need to destroy both > ... > > Is this a known issue ? Not one I've heard. Running "xl -vvv create" might provide some logs which give an idea what is going on, likewise the logging in /var/log/xen/... Roger -- any ideas? Ian. > > Cheers, > > Sylvain > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:34:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNZB-0002y9-9A; Thu, 08 Nov 2012 08:34:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNZA-0002y4-8l for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:34:24 +0000 Received: from [85.158.139.83:38401] by server-13.bemta-5.messagelabs.com id BF/20-27809-F8E6B905; Thu, 08 Nov 2012 08:34:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1352363662!29338470!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31883 invoked from network); 8 Nov 2012 08:34:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-182.messagelabs.com with SMTP; 8 Nov 2012 08:34:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:34:21 +0000 Message-Id: <509B7C9C02000078000A725F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:34:20 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B6EB002000078000A71CB@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 08:48, Keir Fraser wrote: > On 08/11/2012 07:34, "Jan Beulich" wrote: > >>> Would prefer: >>> if ( op_bytes == 2 ) >>> *(uint16_t *)regs[i] = (uint16_t)dst.val; >>> else >>> *regs[i] = dst.val; >>> >>> Handles the exceptional case immediately after its predicate. >> >> I had it that way first, but compilers tend to prefer (in terms of >> static branch prediction) the if() body over the else one. Doesn't >> matter that much here of course, but I'm generally trying to >> follow such guidelines even in non performance critical paths so >> that in case code gets cloned elsewhere it doesn't require extra >> reviewing or adjustment. > > Should follow such guidelines where the optimisation matters. I think > shaping code to follow such guidelines all the time, is misguided. I'd > rather have the fractionally more readable version than the > possibly-fractionally faster version. Okay, will adjust accordingly then. >>> And the cast >>> from uint32_t, and 64b-related comment, are pointless and in fact misleading >>> in the default case, since as you say the instruction is invalid in 64-bit >>> mode. >> >> And I considered that aspect too: Even if invalid in 64-bit mode, it >> is valid in compatibility mode, and in that case the zero-extension >> makes sense (as does the comment). > > I did wonder. The top halves of 64b registers are not used in compatibility > mode. Are their contents at all guaranteed to be > maintained/updated/preserved in any meaningful way across transitions into > and out of compatibility mode? I wasn't aware they were, and in that case > the cast and comment are indeed pointless. There's no architectural guarantee, but that's how CPUs work. The important aspect (from an information leak perspective) is that upper halves don't get zeroed explicitly when switching between compatibility and 64-bit modes. Now we can of course utilize that read_ulong() already does the zero extension (but if it didn't, we would leak stack contents here, so it may still be worth a comment), to the net effect of --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1996,13 +1996,11 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - switch ( op_bytes ) - { - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ - case 8: *regs[i] = dst.val; break; - } + if ( op_bytes == 2 ) + *(uint16_t *)regs[i] = (uint16_t)dst.val; + else + /* No need for zero-extension - read_ulong() already did so. */ + *regs[i] = dst.val; } break; } Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:34:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:34:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNZB-0002y9-9A; Thu, 08 Nov 2012 08:34:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNZA-0002y4-8l for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:34:24 +0000 Received: from [85.158.139.83:38401] by server-13.bemta-5.messagelabs.com id BF/20-27809-F8E6B905; Thu, 08 Nov 2012 08:34:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1352363662!29338470!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31883 invoked from network); 8 Nov 2012 08:34:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-182.messagelabs.com with SMTP; 8 Nov 2012 08:34:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:34:21 +0000 Message-Id: <509B7C9C02000078000A725F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:34:20 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B6EB002000078000A71CB@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 08:48, Keir Fraser wrote: > On 08/11/2012 07:34, "Jan Beulich" wrote: > >>> Would prefer: >>> if ( op_bytes == 2 ) >>> *(uint16_t *)regs[i] = (uint16_t)dst.val; >>> else >>> *regs[i] = dst.val; >>> >>> Handles the exceptional case immediately after its predicate. >> >> I had it that way first, but compilers tend to prefer (in terms of >> static branch prediction) the if() body over the else one. Doesn't >> matter that much here of course, but I'm generally trying to >> follow such guidelines even in non performance critical paths so >> that in case code gets cloned elsewhere it doesn't require extra >> reviewing or adjustment. > > Should follow such guidelines where the optimisation matters. I think > shaping code to follow such guidelines all the time, is misguided. I'd > rather have the fractionally more readable version than the > possibly-fractionally faster version. Okay, will adjust accordingly then. >>> And the cast >>> from uint32_t, and 64b-related comment, are pointless and in fact misleading >>> in the default case, since as you say the instruction is invalid in 64-bit >>> mode. >> >> And I considered that aspect too: Even if invalid in 64-bit mode, it >> is valid in compatibility mode, and in that case the zero-extension >> makes sense (as does the comment). > > I did wonder. The top halves of 64b registers are not used in compatibility > mode. Are their contents at all guaranteed to be > maintained/updated/preserved in any meaningful way across transitions into > and out of compatibility mode? I wasn't aware they were, and in that case > the cast and comment are indeed pointless. There's no architectural guarantee, but that's how CPUs work. The important aspect (from an information leak perspective) is that upper halves don't get zeroed explicitly when switching between compatibility and 64-bit modes. Now we can of course utilize that read_ulong() already does the zero extension (but if it didn't, we would leak stack contents here, so it may still be worth a comment), to the net effect of --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1996,13 +1996,11 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - switch ( op_bytes ) - { - case 1: *(uint8_t *)regs[i] = (uint8_t)dst.val; break; - case 2: *(uint16_t *)regs[i] = (uint16_t)dst.val; break; - case 4: *regs[i] = (uint32_t)dst.val; break; /* 64b: zero-ext */ - case 8: *regs[i] = dst.val; break; - } + if ( op_bytes == 2 ) + *(uint16_t *)regs[i] = (uint16_t)dst.val; + else + /* No need for zero-extension - read_ulong() already did so. */ + *regs[i] = dst.val; } break; } Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:43:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:43:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNhf-00038J-AA; Thu, 08 Nov 2012 08:43:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNhd-00038B-Js for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:43:09 +0000 Received: from [85.158.137.99:60172] by server-5.bemta-3.messagelabs.com id C1/04-26311-C907B905; Thu, 08 Nov 2012 08:43:08 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-8.tower-217.messagelabs.com!1352364186!11768074!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2438 invoked from network); 8 Nov 2012 08:43:07 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 08:43:07 -0000 Received: from localhost (jajo.ipv6.eggsoft.pl [IPv6:2001:6a0:117::1]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id 58FB25002 for ; Thu, 8 Nov 2012 09:43:05 +0100 (CET) Date: Thu, 8 Nov 2012 09:42:58 +0100 From: Jacek Konieczny To: xen-devel@lists.xen.org Message-ID: <20121108084258.GA5544@jajo.eggsoft> Mail-Followup-To: xen-devel@lists.xen.org References: <507C075302000078000A1593@nat28.tlf.novell.com> <5081271C02000078000A2844@nat28.tlf.novell.com> <20121019173307.GT26830@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121019173307.GT26830@phenom.dumpdata.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [Xen-devel] Xen 4.2 with EFI on IBM x3650 ACPI Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org SGVsbG8sCgpJIGFtIGRpZ2dpbmcgdXAgdGhlIG9sZCB0aHJlYWQgIGp1c3QgdG8gc2hvdyBhIHdv cmthcm91bmQgZm9yIHRoZQpJQk0geFNlcmllcyBBQ1BJIHByb2JsZW0gdW5kZXIgRUZJ4oCmCgpP biBGcmksIE9jdCAxOSwgMjAxMiBhdCAwMTozMzowN1BNIC0wNDAwLCBLb25yYWQgUnplc3p1dGVr IFdpbGsgd3JvdGU6Cj4gT24gRnJpLCBPY3QgMTksIDIwMTIgYXQgMDk6MTA6MzZBTSArMDEwMCwg SmFuIEJldWxpY2ggd3JvdGU6Cj4gPiA+Pj4gT24gMTkuMTAuMTIgYXQgMDE6NDMsIEFsbGFuIFNj aGVpZCA8YXZzLjAwOUBnbWFpbC5jb20+IHdyb3RlOgo+ID4gPiBCYWQgbmV3cywgaSBhbSBzZWVp bmcgdGhlIGxvZyBvdXRwdXQgYW5kIGFmdGVyIHRoZSB4ZW4uZWZpIGJvb3QgdGhpcyBzdGlsbAo+ ID4gPiBhcHBlYXJzIG9uIGxvZzoKPiA+ID4gCj4gPiA+IEludG8gbWVzc2FnZXM6Cj4gPiA+IE9j dCAxOCAyMDoyNzozNiBsY2EtZncga2VybmVsOiBbICAgIDAuMDAwMDAwXSBBQ1BJIEJJT1MgQnVn OiBFcnJvcjogQSB2YWxpZAo+ID4gPiBSU0RQIHdhcyBub3QgZm91bmQgKDIwMTIwNzExL3RieGZy b290LTIxOSkKPiA+ID4gT2N0IDE4IDIwOjI3OjM2IGxjYS1mdyBrZXJuZWw6IFsgICAgMC4wMDAw MDBdIE5VTUEgdHVybmVkIG9mZgo+ID4gPiBPY3QgMTggMjA6Mjc6MzYgbGNhLWZ3IGtlcm5lbDog WyAgICAzLjc1OTc1MF0gcGNpIDAwMDA6MDA6MDEuMDogY2FuJ3QgZmluZAo+ID4gPiBJUlEgZm9y IFBDSSBJTlQgQTsgcGxlYXNlIHRyeSB1c2luZyBwY2k9Ymlvc2lycQo+ID4gPiBPY3QgMTggMjA6 Mjc6MzYgbGNhLWZ3IGtlcm5lbDogWyAgICAzLjc2NDAxMV0gcGNpIDAwMDA6MDA6MWEuMDogY2Fu J3QgZmluZAo+ID4gPiBJUlEgZm9yIFBDSSBJTlQgQTsgcGxlYXNlIHRyeSB1c2luZyBwY2k9Ymlv c2lycQoKSVJRcyBhcmUgbm90IHRoZSBvbmx5IHByb2JsZW0uIE9ubHkgYSBzaW5nbGUgQ1BVIHdv dWxkIGJlIGRldGVjdGVkCndpdGhvdXQgQUNQSS4KCj4gPiBPZiBjb3Vyc2UgLSB5b3UgYWxzbyBu ZWVkIHRoZSBrZXJuZWwgdG8gYmUgY2FwYWJsZSBvZiBvYnRhaW5pbmcKPiA+IHRoZSBuZWNlc3Nh cnkgRUZJIGluZm9ybWF0aW9uIGZyb20gWGVuLiBUaGF0J3MgYSBzZXBhcmF0ZSBwYXRjaAo+ID4g KGFuIGVhcmx5IHBvcnQgb2YgdGhlIG9uZSB3ZSBoYXZlIHRvIHRoZSBwdm9wcyBrZXJuZWwgd2Fz Cj4gPiBwb3N0ZWQgb24gdGhlIGxpc3QgYSBmZXcgbW9udGhzIGFnbywgYnV0IEkgZG9uJ3Qga25v dyB3aGF0IGl0cwo+ID4gc3RhdHVzIG9yIGRpc3Bvc2l0aW9uIGlzIC0gS29ucmFkPykuCgpZZWFo 4oCmIGl0IHdpbGwgYmUgZ3JlYXQgdG8gc2VlIHRoaXMgcGF0Y2ggc2V0IHVwZGF0ZWQgYW5kIGlu Y2x1ZGVkCnVwc3RyZWFtLgoKPiAKPiBEYW5pZWwgaXMgdGFraW5nIGEgc3RhYiBhdCBpdC4gSGUg Z290IHRoZSBoYXJkd2FyZS4gQnV0IHRoaXMgaXMgZ29vZAo+IHRvIGtub3cgdGhhdCB0aGVyZSBp cyBoYXJkd2FyZSB0aGF0IHJlbW92ZXMgdGhlIFJTRFQgZnJvbSB0aGUgbG93IG1lbW9yeQo+IGFu ZCBvbmx5IGFsbG93cyB0byBnZXQgaXQgZnJvbSB0aGUgRUZJLiAKClRoZSBmaXJtd2FyZSByYXRo ZXIgZG9lcyBub3QgY29weSB0aGUgUlNEVCB0byB0aGUgbG93IG1lbW9yeSBiZWZvcmUKdHJ5aW5n IHRvIGJvb3QgaW4gdGhlIGxlZ2FjeSBCSU9TIG1vZGUuCgoKCkFuZCBoZXJlIGlzIHRoZSB3b3Jr YXJvdW5kLCB3aGljaCBkb2VzIG5vdCByZXF1aXJlIGtlcm5lbCBwYXRjaGluZzoKCjEuIE1ha2Ug c3VyZSB5b3VyIGtlcm5lbCBpcyBjb21waWxlZCB3aXRoIENPTkZJR19LRVhFQz15IChrZXhlYyBp cyBub3QKbmVlZGVkIGZvciB0aGUgd29ya2Fyb3VuZCwgYnV0IGl0IGVuYWJsZXMgdGhlIExpbnV4 IGtlcm5lbCBjb21tYW5kLWxpbmUKb3B0aW9uIHVzZWQgbGF0ZXIpCgoyLiBCb290IHhlbiBuYXRp dmVseSB2aWEgRUZJIOKAkyB1c2UgeGVuLmVmaSBub3QgR1JVQiBtdWx0aWJvb3QgKEdSVUIKRUZJ IGNoYWlubG9hZGVyIHdpbGwgYmUgb2sgdG9vKQoKMy4gTm90ZSB0aGUgUlNEUCBhZGRyZXNzIGZv dW5kIGJ5IFhlbjoKCiMgeGwgZG1lc2cgfCBncmVwIFJTRFAKKFhFTikgQUNQSTogUlNEUCA3RjdG RTAxNCwgMDAyNCAocjIgSUJNICAgKQoKNC4gQWRkIHRoaXMgdG8gdGhlIGRvbTAga2VybmVsIGNv bW1hbmQtbGluZSAoaW4gdGhlIHhlbi5jZmcgZmlsZSB1c2VkIGJ5Cnhlbi5lZmkpOgoKICAgYWNw aV9yc2RwPTB4N0Y3RkUwMTQKClRoZSBMaW51eCBrZXJuZWwgd2lsbCBmaW5kIHRoZSBBQ1BJIFJT RFAgYW5kIHdpbGwgYmUgYWJsZSB0byBpbml0aWFsaXplCklSUXMgYW5kIFNNUCBwcm9wZXJseS4g IFRoaXMgc3RpbGwgd29uJ3QgYmUgYSBwcm9wZXIgRUZJIGludGVyZmFjZSwgc28KdGhlICdlZml2 YXJzJyBtb2R1bGUgYW5kICdlZmlib290bWdyJyB1dGlsaXR5IHdvbid0IHdvcmssIGJ1dCB0aGlz IGlzCm5vdCBhcyBjcml0aWNhbCBhcyBBQ1BJLgoKR3JlZXRzLAogICAgICAgIEphY2VrCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo= From xen-devel-bounces@lists.xen.org Thu Nov 08 08:43:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:43:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNhf-00038J-AA; Thu, 08 Nov 2012 08:43:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNhd-00038B-Js for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:43:09 +0000 Received: from [85.158.137.99:60172] by server-5.bemta-3.messagelabs.com id C1/04-26311-C907B905; Thu, 08 Nov 2012 08:43:08 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-8.tower-217.messagelabs.com!1352364186!11768074!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2438 invoked from network); 8 Nov 2012 08:43:07 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 08:43:07 -0000 Received: from localhost (jajo.ipv6.eggsoft.pl [IPv6:2001:6a0:117::1]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id 58FB25002 for ; Thu, 8 Nov 2012 09:43:05 +0100 (CET) Date: Thu, 8 Nov 2012 09:42:58 +0100 From: Jacek Konieczny To: xen-devel@lists.xen.org Message-ID: <20121108084258.GA5544@jajo.eggsoft> Mail-Followup-To: xen-devel@lists.xen.org References: <507C075302000078000A1593@nat28.tlf.novell.com> <5081271C02000078000A2844@nat28.tlf.novell.com> <20121019173307.GT26830@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121019173307.GT26830@phenom.dumpdata.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [Xen-devel] Xen 4.2 with EFI on IBM x3650 ACPI Bug X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org SGVsbG8sCgpJIGFtIGRpZ2dpbmcgdXAgdGhlIG9sZCB0aHJlYWQgIGp1c3QgdG8gc2hvdyBhIHdv cmthcm91bmQgZm9yIHRoZQpJQk0geFNlcmllcyBBQ1BJIHByb2JsZW0gdW5kZXIgRUZJ4oCmCgpP biBGcmksIE9jdCAxOSwgMjAxMiBhdCAwMTozMzowN1BNIC0wNDAwLCBLb25yYWQgUnplc3p1dGVr IFdpbGsgd3JvdGU6Cj4gT24gRnJpLCBPY3QgMTksIDIwMTIgYXQgMDk6MTA6MzZBTSArMDEwMCwg SmFuIEJldWxpY2ggd3JvdGU6Cj4gPiA+Pj4gT24gMTkuMTAuMTIgYXQgMDE6NDMsIEFsbGFuIFNj aGVpZCA8YXZzLjAwOUBnbWFpbC5jb20+IHdyb3RlOgo+ID4gPiBCYWQgbmV3cywgaSBhbSBzZWVp bmcgdGhlIGxvZyBvdXRwdXQgYW5kIGFmdGVyIHRoZSB4ZW4uZWZpIGJvb3QgdGhpcyBzdGlsbAo+ ID4gPiBhcHBlYXJzIG9uIGxvZzoKPiA+ID4gCj4gPiA+IEludG8gbWVzc2FnZXM6Cj4gPiA+IE9j dCAxOCAyMDoyNzozNiBsY2EtZncga2VybmVsOiBbICAgIDAuMDAwMDAwXSBBQ1BJIEJJT1MgQnVn OiBFcnJvcjogQSB2YWxpZAo+ID4gPiBSU0RQIHdhcyBub3QgZm91bmQgKDIwMTIwNzExL3RieGZy b290LTIxOSkKPiA+ID4gT2N0IDE4IDIwOjI3OjM2IGxjYS1mdyBrZXJuZWw6IFsgICAgMC4wMDAw MDBdIE5VTUEgdHVybmVkIG9mZgo+ID4gPiBPY3QgMTggMjA6Mjc6MzYgbGNhLWZ3IGtlcm5lbDog WyAgICAzLjc1OTc1MF0gcGNpIDAwMDA6MDA6MDEuMDogY2FuJ3QgZmluZAo+ID4gPiBJUlEgZm9y IFBDSSBJTlQgQTsgcGxlYXNlIHRyeSB1c2luZyBwY2k9Ymlvc2lycQo+ID4gPiBPY3QgMTggMjA6 Mjc6MzYgbGNhLWZ3IGtlcm5lbDogWyAgICAzLjc2NDAxMV0gcGNpIDAwMDA6MDA6MWEuMDogY2Fu J3QgZmluZAo+ID4gPiBJUlEgZm9yIFBDSSBJTlQgQTsgcGxlYXNlIHRyeSB1c2luZyBwY2k9Ymlv c2lycQoKSVJRcyBhcmUgbm90IHRoZSBvbmx5IHByb2JsZW0uIE9ubHkgYSBzaW5nbGUgQ1BVIHdv dWxkIGJlIGRldGVjdGVkCndpdGhvdXQgQUNQSS4KCj4gPiBPZiBjb3Vyc2UgLSB5b3UgYWxzbyBu ZWVkIHRoZSBrZXJuZWwgdG8gYmUgY2FwYWJsZSBvZiBvYnRhaW5pbmcKPiA+IHRoZSBuZWNlc3Nh cnkgRUZJIGluZm9ybWF0aW9uIGZyb20gWGVuLiBUaGF0J3MgYSBzZXBhcmF0ZSBwYXRjaAo+ID4g KGFuIGVhcmx5IHBvcnQgb2YgdGhlIG9uZSB3ZSBoYXZlIHRvIHRoZSBwdm9wcyBrZXJuZWwgd2Fz Cj4gPiBwb3N0ZWQgb24gdGhlIGxpc3QgYSBmZXcgbW9udGhzIGFnbywgYnV0IEkgZG9uJ3Qga25v dyB3aGF0IGl0cwo+ID4gc3RhdHVzIG9yIGRpc3Bvc2l0aW9uIGlzIC0gS29ucmFkPykuCgpZZWFo 4oCmIGl0IHdpbGwgYmUgZ3JlYXQgdG8gc2VlIHRoaXMgcGF0Y2ggc2V0IHVwZGF0ZWQgYW5kIGlu Y2x1ZGVkCnVwc3RyZWFtLgoKPiAKPiBEYW5pZWwgaXMgdGFraW5nIGEgc3RhYiBhdCBpdC4gSGUg Z290IHRoZSBoYXJkd2FyZS4gQnV0IHRoaXMgaXMgZ29vZAo+IHRvIGtub3cgdGhhdCB0aGVyZSBp cyBoYXJkd2FyZSB0aGF0IHJlbW92ZXMgdGhlIFJTRFQgZnJvbSB0aGUgbG93IG1lbW9yeQo+IGFu ZCBvbmx5IGFsbG93cyB0byBnZXQgaXQgZnJvbSB0aGUgRUZJLiAKClRoZSBmaXJtd2FyZSByYXRo ZXIgZG9lcyBub3QgY29weSB0aGUgUlNEVCB0byB0aGUgbG93IG1lbW9yeSBiZWZvcmUKdHJ5aW5n IHRvIGJvb3QgaW4gdGhlIGxlZ2FjeSBCSU9TIG1vZGUuCgoKCkFuZCBoZXJlIGlzIHRoZSB3b3Jr YXJvdW5kLCB3aGljaCBkb2VzIG5vdCByZXF1aXJlIGtlcm5lbCBwYXRjaGluZzoKCjEuIE1ha2Ug c3VyZSB5b3VyIGtlcm5lbCBpcyBjb21waWxlZCB3aXRoIENPTkZJR19LRVhFQz15IChrZXhlYyBp cyBub3QKbmVlZGVkIGZvciB0aGUgd29ya2Fyb3VuZCwgYnV0IGl0IGVuYWJsZXMgdGhlIExpbnV4 IGtlcm5lbCBjb21tYW5kLWxpbmUKb3B0aW9uIHVzZWQgbGF0ZXIpCgoyLiBCb290IHhlbiBuYXRp dmVseSB2aWEgRUZJIOKAkyB1c2UgeGVuLmVmaSBub3QgR1JVQiBtdWx0aWJvb3QgKEdSVUIKRUZJ IGNoYWlubG9hZGVyIHdpbGwgYmUgb2sgdG9vKQoKMy4gTm90ZSB0aGUgUlNEUCBhZGRyZXNzIGZv dW5kIGJ5IFhlbjoKCiMgeGwgZG1lc2cgfCBncmVwIFJTRFAKKFhFTikgQUNQSTogUlNEUCA3RjdG RTAxNCwgMDAyNCAocjIgSUJNICAgKQoKNC4gQWRkIHRoaXMgdG8gdGhlIGRvbTAga2VybmVsIGNv bW1hbmQtbGluZSAoaW4gdGhlIHhlbi5jZmcgZmlsZSB1c2VkIGJ5Cnhlbi5lZmkpOgoKICAgYWNw aV9yc2RwPTB4N0Y3RkUwMTQKClRoZSBMaW51eCBrZXJuZWwgd2lsbCBmaW5kIHRoZSBBQ1BJIFJT RFAgYW5kIHdpbGwgYmUgYWJsZSB0byBpbml0aWFsaXplCklSUXMgYW5kIFNNUCBwcm9wZXJseS4g IFRoaXMgc3RpbGwgd29uJ3QgYmUgYSBwcm9wZXIgRUZJIGludGVyZmFjZSwgc28KdGhlICdlZml2 YXJzJyBtb2R1bGUgYW5kICdlZmlib290bWdyJyB1dGlsaXR5IHdvbid0IHdvcmssIGJ1dCB0aGlz IGlzCm5vdCBhcyBjcml0aWNhbCBhcyBBQ1BJLgoKR3JlZXRzLAogICAgICAgIEphY2VrCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo= From xen-devel-bounces@lists.xen.org Thu Nov 08 08:48:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:48:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNmf-0003NG-LW; Thu, 08 Nov 2012 08:48:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNme-0003N8-K7 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 08:48:20 +0000 Received: from [85.158.137.99:53611] by server-10.bemta-3.messagelabs.com id 30/71-19806-3D17B905; Thu, 08 Nov 2012 08:48:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352364498!15074107!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ4NDk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5399 invoked from network); 8 Nov 2012 08:48:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:48:19 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="213851270" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 08:48:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 03:48:17 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWNmb-0001EJ-1l; Thu, 08 Nov 2012 08:48:17 +0000 Message-ID: <1352364376.12977.93.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Thu, 8 Nov 2012 09:46:16 +0100 In-Reply-To: <20121108011006.GC21302@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <20121108011006.GC21302@phenom.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > > checkpatch warned on this new typedef - please run through checkpatch > > >and fix up that stuff. > > tpmif.h has a couple of typedefs which do trigger checkpatch > > warnings. However it looks like the paradigm for xen is to have > > these interface/io/if.h files and all of them have typedefs. I > > think in this case the typedef should probably stay. > > > > Konrad your thoughts here? > > Rip them out plea This is somewhere that Linux coding style and Xen coding style differ, so the typedefs should be removed from the Linux copy of these interfaces to match the Linux coding style, but they should stay in the Xen side canonical copy though. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:48:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:48:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNmf-0003NG-LW; Thu, 08 Nov 2012 08:48:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNme-0003N8-K7 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 08:48:20 +0000 Received: from [85.158.137.99:53611] by server-10.bemta-3.messagelabs.com id 30/71-19806-3D17B905; Thu, 08 Nov 2012 08:48:19 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352364498!15074107!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODQ4NDk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5399 invoked from network); 8 Nov 2012 08:48:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 08:48:19 -0000 X-IronPort-AV: E=Sophos;i="4.80,736,1344211200"; d="scan'208";a="213851270" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 08:48:17 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 03:48:17 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWNmb-0001EJ-1l; Thu, 08 Nov 2012 08:48:17 +0000 Message-ID: <1352364376.12977.93.camel@hastur.hellion.org.uk> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Thu, 8 Nov 2012 09:46:16 +0100 In-Reply-To: <20121108011006.GC21302@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <20121108011006.GC21302@phenom.dumpdata.com> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > > checkpatch warned on this new typedef - please run through checkpatch > > >and fix up that stuff. > > tpmif.h has a couple of typedefs which do trigger checkpatch > > warnings. However it looks like the paradigm for xen is to have > > these interface/io/if.h files and all of them have typedefs. I > > think in this case the typedef should probably stay. > > > > Konrad your thoughts here? > > Rip them out plea This is somewhere that Linux coding style and Xen coding style differ, so the typedefs should be removed from the Linux copy of these interfaces to match the Linux coding style, but they should stay in the Xen side canonical copy though. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:54:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:54:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNsM-0003fG-Fh; Thu, 08 Nov 2012 08:54:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNsK-0003fB-Eh for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:54:12 +0000 Received: from [85.158.139.211:42049] by server-8.bemta-5.messagelabs.com id 3F/95-06050-3337B905; Thu, 08 Nov 2012 08:54:11 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352364850!18913036!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7235 invoked from network); 8 Nov 2012 08:54:10 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-206.messagelabs.com with SMTP; 8 Nov 2012 08:54:10 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:54:06 +0000 Message-Id: <509B813B02000078000A7279@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:54:03 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B74B402000078000A7206@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 09:18, Keir Fraser wrote: > On 08/11/2012 08:00, "Jan Beulich" wrote: > >>>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >>> It appears that the attempt to use 2MB and 1GB pages is done in >>> the toolstack, and if the hypervisor rejects it, toolstack tries >>> smaller pages. Thus, if physical memory is highly fragmented >>> (few or no order>=9 allocations available), this will result >>> in one hypercall per 4k page so a 256GB domain would require >>> 64 million hypercalls. And, since AFAICT, there is no sane >>> way to hold the heap_lock across even two hypercalls, speeding >>> up the in-hypervisor allocation path, by itself, will not solve >>> the TOCTOU race. >> >> No, even in the absence of large pages, the tool stack will do 8M >> allocations, just without requesting them to be contiguous. >> Whether 8M is a suitable value is another aspect; that value may >> predate hypercall preemption, and I don't immediately see why >> the tool stack shouldn't be able to request larger chunks (up to >> the whole amount at once). > > It is probably to allow other dom0 processing (including softirqs) to > preempt the toolstack task, in the case that the kernel was not built with > involuntary preemption enabled (having it disabled is the common case I > believe?). 8M batches may provide enough returns to user space to allow > other work to get a look-in. That may have mattered when ioctl-s were run with the big kernel lock held, but even 2.6.18 didn't do that anymore (using the .unlocked_ioctl field of struct file_operations), which means that even softirqs will get serviced in Dom0 since the preempted hypercall gets restarted via exiting to the guest (i.e. events get delivered). Scheduling is what indeed wouldn't happen, but if allocation latency can be brought down, 8M might turn out pretty small a chunk size. If we do care about Dom0-s running even older kernels (assuming there ever was a privcmd implementation that didn't use the unlocked path), or if we have to assume non-Linux Dom0-s might have issues here, making the tool stack behavior kernel kind/ version dependent without strong need of course wouldn't sound very attractive. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 08:54:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 08:54:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNsM-0003fG-Fh; Thu, 08 Nov 2012 08:54:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWNsK-0003fB-Eh for xen-devel@lists.xen.org; Thu, 08 Nov 2012 08:54:12 +0000 Received: from [85.158.139.211:42049] by server-8.bemta-5.messagelabs.com id 3F/95-06050-3337B905; Thu, 08 Nov 2012 08:54:11 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352364850!18913036!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7235 invoked from network); 8 Nov 2012 08:54:10 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-206.messagelabs.com with SMTP; 8 Nov 2012 08:54:10 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 08:54:06 +0000 Message-Id: <509B813B02000078000A7279@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 08:54:03 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B74B402000078000A7206@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 09:18, Keir Fraser wrote: > On 08/11/2012 08:00, "Jan Beulich" wrote: > >>>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >>> It appears that the attempt to use 2MB and 1GB pages is done in >>> the toolstack, and if the hypervisor rejects it, toolstack tries >>> smaller pages. Thus, if physical memory is highly fragmented >>> (few or no order>=9 allocations available), this will result >>> in one hypercall per 4k page so a 256GB domain would require >>> 64 million hypercalls. And, since AFAICT, there is no sane >>> way to hold the heap_lock across even two hypercalls, speeding >>> up the in-hypervisor allocation path, by itself, will not solve >>> the TOCTOU race. >> >> No, even in the absence of large pages, the tool stack will do 8M >> allocations, just without requesting them to be contiguous. >> Whether 8M is a suitable value is another aspect; that value may >> predate hypercall preemption, and I don't immediately see why >> the tool stack shouldn't be able to request larger chunks (up to >> the whole amount at once). > > It is probably to allow other dom0 processing (including softirqs) to > preempt the toolstack task, in the case that the kernel was not built with > involuntary preemption enabled (having it disabled is the common case I > believe?). 8M batches may provide enough returns to user space to allow > other work to get a look-in. That may have mattered when ioctl-s were run with the big kernel lock held, but even 2.6.18 didn't do that anymore (using the .unlocked_ioctl field of struct file_operations), which means that even softirqs will get serviced in Dom0 since the preempted hypercall gets restarted via exiting to the guest (i.e. events get delivered). Scheduling is what indeed wouldn't happen, but if allocation latency can be brought down, 8M might turn out pretty small a chunk size. If we do care about Dom0-s running even older kernels (assuming there ever was a privcmd implementation that didn't use the unlocked path), or if we have to assume non-Linux Dom0-s might have issues here, making the tool stack behavior kernel kind/ version dependent without strong need of course wouldn't sound very attractive. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:08:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:08:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWO6L-0003zh-60; Thu, 08 Nov 2012 09:08:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWO6K-0003zc-BU for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:08:40 +0000 Received: from [85.158.143.99:6814] by server-1.bemta-4.messagelabs.com id 6A/FF-27934-7967B905; Thu, 08 Nov 2012 09:08:39 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352365718!17889549!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28975 invoked from network); 8 Nov 2012 09:08:39 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 09:08:39 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1357285wey.32 for ; Thu, 08 Nov 2012 01:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CYwpUvgqprF8meFDXm4aQGjDGZIGeXxnSAOcSfo052U=; b=kY0bJG9Re2C1OmiGMel/8/PeP3vyrOWmRYYexGcPQQrwCmf6Pf0WiC31a4QDM7y/ZZ tB0BtGRH592f/P3Yz8nJOZotkf1cGGMlJ4xczqdMtSUTNvc1ytdngzxvO09ySaz3VOzT GU7faga7IXwimdXJvkgx96j8wBr+GRN7gVZGQK5qo3p4+yfy+b2YyJknfTx2FOld9JmL ickxH/yqGxv+pazTF4gBGFSpIlVt5bjFQrAtx46PqGBP59w/5sLMuNmJN78zEYcJnvko 6g42cLwF3HBoPX5eQjw6VddfNf/wPuN27hHnFJgi8H3krdTBDLZmd0mctGSLKuGXs30d vSLg== Received: by 10.181.11.233 with SMTP id el9mr11992841wid.3.1352365718654; Thu, 08 Nov 2012 01:08:38 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hf10sm6971789wib.0.2012.11.08.01.08.37 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 01:08:38 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 09:08:34 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29kKEjZirPQ1mIOEuOmgIBKueZCA== In-Reply-To: <509B7C9C02000078000A725F@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:34, "Jan Beulich" wrote: >> I did wonder. The top halves of 64b registers are not used in compatibility >> mode. Are their contents at all guaranteed to be >> maintained/updated/preserved in any meaningful way across transitions into >> and out of compatibility mode? I wasn't aware they were, and in that case >> the cast and comment are indeed pointless. > > There's no architectural guarantee, but that's how CPUs work. > The important aspect (from an information leak perspective) is > that upper halves don't get zeroed explicitly when switching > between compatibility and 64-bit modes. > > Now we can of course utilize that read_ulong() already does the > zero extension (but if it didn't, we would leak stack contents here, > so it may still be worth a comment), to the net effect of The concern over information leak is fair. Just leave the code line as-is then with the explicit cast and end-of-line comment. K. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:08:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:08:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWO6L-0003zh-60; Thu, 08 Nov 2012 09:08:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWO6K-0003zc-BU for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:08:40 +0000 Received: from [85.158.143.99:6814] by server-1.bemta-4.messagelabs.com id 6A/FF-27934-7967B905; Thu, 08 Nov 2012 09:08:39 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352365718!17889549!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28975 invoked from network); 8 Nov 2012 09:08:39 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 09:08:39 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1357285wey.32 for ; Thu, 08 Nov 2012 01:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CYwpUvgqprF8meFDXm4aQGjDGZIGeXxnSAOcSfo052U=; b=kY0bJG9Re2C1OmiGMel/8/PeP3vyrOWmRYYexGcPQQrwCmf6Pf0WiC31a4QDM7y/ZZ tB0BtGRH592f/P3Yz8nJOZotkf1cGGMlJ4xczqdMtSUTNvc1ytdngzxvO09ySaz3VOzT GU7faga7IXwimdXJvkgx96j8wBr+GRN7gVZGQK5qo3p4+yfy+b2YyJknfTx2FOld9JmL ickxH/yqGxv+pazTF4gBGFSpIlVt5bjFQrAtx46PqGBP59w/5sLMuNmJN78zEYcJnvko 6g42cLwF3HBoPX5eQjw6VddfNf/wPuN27hHnFJgi8H3krdTBDLZmd0mctGSLKuGXs30d vSLg== Received: by 10.181.11.233 with SMTP id el9mr11992841wid.3.1352365718654; Thu, 08 Nov 2012 01:08:38 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hf10sm6971789wib.0.2012.11.08.01.08.37 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 01:08:38 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 09:08:34 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA Thread-Index: Ac29kKEjZirPQ1mIOEuOmgIBKueZCA== In-Reply-To: <509B7C9C02000078000A725F@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH] x86/emul: only emulate possibly operand sizes for POPA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:34, "Jan Beulich" wrote: >> I did wonder. The top halves of 64b registers are not used in compatibility >> mode. Are their contents at all guaranteed to be >> maintained/updated/preserved in any meaningful way across transitions into >> and out of compatibility mode? I wasn't aware they were, and in that case >> the cast and comment are indeed pointless. > > There's no architectural guarantee, but that's how CPUs work. > The important aspect (from an information leak perspective) is > that upper halves don't get zeroed explicitly when switching > between compatibility and 64-bit modes. > > Now we can of course utilize that read_ulong() already does the > zero extension (but if it didn't, we would leak stack contents here, > so it may still be worth a comment), to the net effect of The concern over information leak is fair. Just leave the code line as-is then with the explicit cast and end-of-line comment. K. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:12:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:12:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOAC-00048E-RB; Thu, 08 Nov 2012 09:12:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOAB-000488-Ec for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:12:39 +0000 Received: from [85.158.139.83:45654] by server-14.bemta-5.messagelabs.com id D7/52-21768-6877B905; Thu, 08 Nov 2012 09:12:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352365957!29035686!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1557 invoked from network); 8 Nov 2012 09:12:37 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-15.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 09:12:37 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1696272eek.32 for ; Thu, 08 Nov 2012 01:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=U3i+FGNcZksjN7/BZkn3KYZ8e//dFwK3WHsQgqeWXCQ=; b=H2m5Qm0EJkXp3kwrvS+xQm2qWGSfTJ3ErcAKUpJn+RBjfw7qhlkvLZT7WA+8BW9Vay ydqqDmLN6nmWIOWZrRNEV0zxSsrREGXxktZZWlX2oTW1dvSct/AhNBBW4dx2HgUl/KLW TvPO9SYI1bJvooyAcuygSxZsp/IfAmX0IHkBOWM6beILu7CwZZK31mULq1yGJYMALgyw sHm6NeLoOWAQQM6jRuY1KkKlVRIFYf4sGOo8hJbOvecyuCTEc3K1tN8DzbYz2RkxiswS 8uICvGaDTXYiaJxCCqqVY0J6B+rtjlFWtBAmnR+nhhg6AF4oNMcIsA8Bme7Qrk6HnBEL kUTg== Received: by 10.14.221.194 with SMTP id r42mr25461452eep.25.1352365957724; Thu, 08 Nov 2012 01:12:37 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id 42sm69222310eee.0.2012.11.08.01.12.34 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 01:12:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 09:12:30 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29kS3OaojRhIaOx0SFTPFp5cd21w== In-Reply-To: <509B813B02000078000A7279@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:54, "Jan Beulich" wrote: >>>> On 08.11.12 at 09:18, Keir Fraser wrote: >> On 08/11/2012 08:00, "Jan Beulich" wrote: >> >>>>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >>>> It appears that the attempt to use 2MB and 1GB pages is done in >>>> the toolstack, and if the hypervisor rejects it, toolstack tries >>>> smaller pages. Thus, if physical memory is highly fragmented >>>> (few or no order>=9 allocations available), this will result >>>> in one hypercall per 4k page so a 256GB domain would require >>>> 64 million hypercalls. And, since AFAICT, there is no sane >>>> way to hold the heap_lock across even two hypercalls, speeding >>>> up the in-hypervisor allocation path, by itself, will not solve >>>> the TOCTOU race. >>> >>> No, even in the absence of large pages, the tool stack will do 8M >>> allocations, just without requesting them to be contiguous. >>> Whether 8M is a suitable value is another aspect; that value may >>> predate hypercall preemption, and I don't immediately see why >>> the tool stack shouldn't be able to request larger chunks (up to >>> the whole amount at once). >> >> It is probably to allow other dom0 processing (including softirqs) to >> preempt the toolstack task, in the case that the kernel was not built with >> involuntary preemption enabled (having it disabled is the common case I >> believe?). 8M batches may provide enough returns to user space to allow >> other work to get a look-in. > > That may have mattered when ioctl-s were run with the big kernel > lock held, but even 2.6.18 didn't do that anymore (using the > .unlocked_ioctl field of struct file_operations), which means > that even softirqs will get serviced in Dom0 since the preempted > hypercall gets restarted via exiting to the guest (i.e. events get > delivered). Scheduling is what indeed wouldn't happen, but if > allocation latency can be brought down, 8M might turn out pretty > small a chunk size. Ah, then I am out of date on how Linux services softirqs and preemption? Can softirqs/preemption occur any time, even in kernel mode, so long as no locks are held? I thought softirq-type work only happened during event servicing, only if the event servicing had interrupted user context (ie, would not happen if started from within kernel mode). So the restart of the hypercall trap instruction would be an opportunity to service hardirqs, but not softirqs or scheduler... -- Keir > If we do care about Dom0-s running even older kernels (assuming > there ever was a privcmd implementation that didn't use the > unlocked path), or if we have to assume non-Linux Dom0-s might > have issues here, making the tool stack behavior kernel kind/ > version dependent without strong need of course wouldn't sound > very attractive. > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:12:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:12:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOAC-00048E-RB; Thu, 08 Nov 2012 09:12:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOAB-000488-Ec for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:12:39 +0000 Received: from [85.158.139.83:45654] by server-14.bemta-5.messagelabs.com id D7/52-21768-6877B905; Thu, 08 Nov 2012 09:12:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352365957!29035686!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1557 invoked from network); 8 Nov 2012 09:12:37 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-15.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 09:12:37 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1696272eek.32 for ; Thu, 08 Nov 2012 01:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=U3i+FGNcZksjN7/BZkn3KYZ8e//dFwK3WHsQgqeWXCQ=; b=H2m5Qm0EJkXp3kwrvS+xQm2qWGSfTJ3ErcAKUpJn+RBjfw7qhlkvLZT7WA+8BW9Vay ydqqDmLN6nmWIOWZrRNEV0zxSsrREGXxktZZWlX2oTW1dvSct/AhNBBW4dx2HgUl/KLW TvPO9SYI1bJvooyAcuygSxZsp/IfAmX0IHkBOWM6beILu7CwZZK31mULq1yGJYMALgyw sHm6NeLoOWAQQM6jRuY1KkKlVRIFYf4sGOo8hJbOvecyuCTEc3K1tN8DzbYz2RkxiswS 8uICvGaDTXYiaJxCCqqVY0J6B+rtjlFWtBAmnR+nhhg6AF4oNMcIsA8Bme7Qrk6HnBEL kUTg== Received: by 10.14.221.194 with SMTP id r42mr25461452eep.25.1352365957724; Thu, 08 Nov 2012 01:12:37 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id 42sm69222310eee.0.2012.11.08.01.12.34 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 01:12:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 09:12:30 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29kS3OaojRhIaOx0SFTPFp5cd21w== In-Reply-To: <509B813B02000078000A7279@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 08:54, "Jan Beulich" wrote: >>>> On 08.11.12 at 09:18, Keir Fraser wrote: >> On 08/11/2012 08:00, "Jan Beulich" wrote: >> >>>>>> On 07.11.12 at 23:17, Dan Magenheimer wrote: >>>> It appears that the attempt to use 2MB and 1GB pages is done in >>>> the toolstack, and if the hypervisor rejects it, toolstack tries >>>> smaller pages. Thus, if physical memory is highly fragmented >>>> (few or no order>=9 allocations available), this will result >>>> in one hypercall per 4k page so a 256GB domain would require >>>> 64 million hypercalls. And, since AFAICT, there is no sane >>>> way to hold the heap_lock across even two hypercalls, speeding >>>> up the in-hypervisor allocation path, by itself, will not solve >>>> the TOCTOU race. >>> >>> No, even in the absence of large pages, the tool stack will do 8M >>> allocations, just without requesting them to be contiguous. >>> Whether 8M is a suitable value is another aspect; that value may >>> predate hypercall preemption, and I don't immediately see why >>> the tool stack shouldn't be able to request larger chunks (up to >>> the whole amount at once). >> >> It is probably to allow other dom0 processing (including softirqs) to >> preempt the toolstack task, in the case that the kernel was not built with >> involuntary preemption enabled (having it disabled is the common case I >> believe?). 8M batches may provide enough returns to user space to allow >> other work to get a look-in. > > That may have mattered when ioctl-s were run with the big kernel > lock held, but even 2.6.18 didn't do that anymore (using the > .unlocked_ioctl field of struct file_operations), which means > that even softirqs will get serviced in Dom0 since the preempted > hypercall gets restarted via exiting to the guest (i.e. events get > delivered). Scheduling is what indeed wouldn't happen, but if > allocation latency can be brought down, 8M might turn out pretty > small a chunk size. Ah, then I am out of date on how Linux services softirqs and preemption? Can softirqs/preemption occur any time, even in kernel mode, so long as no locks are held? I thought softirq-type work only happened during event servicing, only if the event servicing had interrupted user context (ie, would not happen if started from within kernel mode). So the restart of the hypercall trap instruction would be an opportunity to service hardirqs, but not softirqs or scheduler... -- Keir > If we do care about Dom0-s running even older kernels (assuming > there ever was a privcmd implementation that didn't use the > unlocked path), or if we have to assume non-Linux Dom0-s might > have issues here, making the tool stack behavior kernel kind/ > version dependent without strong need of course wouldn't sound > very attractive. > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:40:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:40:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOao-0004Mm-5s; Thu, 08 Nov 2012 09:40:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOam-0004Mh-6m for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:40:08 +0000 Received: from [85.158.143.35:6478] by server-1.bemta-4.messagelabs.com id 53/23-27934-7FD7B905; Thu, 08 Nov 2012 09:40:07 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352367594!16835318!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30757 invoked from network); 8 Nov 2012 09:39:54 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 8 Nov 2012 09:39:54 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 09:39:53 +0000 Message-Id: <509B8BF802000078000A72A3@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 09:39:52 +0000 From: "Jan Beulich" To: ,"Keir Fraser" References: <1352294551.12977.61.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 18:40, Keir Fraser wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>> tsc_stamp=e3839fcb0273 >>> >>> (below is the complete xm dmesg output) >>> >>> did that help you ? do you need more info ? >> >> I'll leave this to Keir (who wrote the debugging patch) to answer but it >> looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Is it? My understanding was that plt_stamp64 is just a software extension to the more narrow HW counter, and hence the low plt_mask bits would always be expected to be identical. The plt_wrap < plt_now thing of course is entirely unexplainable to me too: Considering that plt_scale doesn't change at all post- boot, apart from memory corruption I could only see an memory access ordering problem to be the reason (platform_timer_stamp and/or stime_platform_stamp changing despite platform_timer_lock being held. So maybe taking a snapshot of all three static values involved in the calculation in __read_platform_stime() between acquiring the lock and the first call to __read_platform_stime(), and printing them together with the "live" values in a second printk() after the one your original patch added could rule that out. But the box doesn't even seem to be NUMA (of course it also doesn't help that the log level was kept restricted - hint, hint, Philippe), not does there appear to be any S3 cycle or pCPU bring-up/-down in between... Philippe, could you clarify again what CPU model(s) this is being observed on (the long times between individual steps forward with this problem perhaps warrant repeating the basics each time, as it's otherwise quite cumbersome to always look up old pieces of information). > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) Iirc we added this for a good reason - to cover the, however unlikely, event of Xen running for very long without preemption. Presumably most of the cases got fixed meanwhile, and indeed a wraparound time on the order of minutes should make this superfluous, but as the case here shows that code did spot a severe anomaly (whatever that may turn out to be). Also recall that there are HPET implementations around that tick at a much higher frequency than 14MHz. So unless we finally reach the understanding that the code is flawed, I would rather want to keep it. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 09:40:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 09:40:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOao-0004Mm-5s; Thu, 08 Nov 2012 09:40:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWOam-0004Mh-6m for xen-devel@lists.xen.org; Thu, 08 Nov 2012 09:40:08 +0000 Received: from [85.158.143.35:6478] by server-1.bemta-4.messagelabs.com id 53/23-27934-7FD7B905; Thu, 08 Nov 2012 09:40:07 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352367594!16835318!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30757 invoked from network); 8 Nov 2012 09:39:54 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-6.tower-21.messagelabs.com with SMTP; 8 Nov 2012 09:39:54 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 09:39:53 +0000 Message-Id: <509B8BF802000078000A72A3@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 09:39:52 +0000 From: "Jan Beulich" To: ,"Keir Fraser" References: <1352294551.12977.61.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 07.11.12 at 18:40, Keir Fraser wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>> tsc_stamp=e3839fcb0273 >>> >>> (below is the complete xm dmesg output) >>> >>> did that help you ? do you need more info ? >> >> I'll leave this to Keir (who wrote the debugging patch) to answer but it >> looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Is it? My understanding was that plt_stamp64 is just a software extension to the more narrow HW counter, and hence the low plt_mask bits would always be expected to be identical. The plt_wrap < plt_now thing of course is entirely unexplainable to me too: Considering that plt_scale doesn't change at all post- boot, apart from memory corruption I could only see an memory access ordering problem to be the reason (platform_timer_stamp and/or stime_platform_stamp changing despite platform_timer_lock being held. So maybe taking a snapshot of all three static values involved in the calculation in __read_platform_stime() between acquiring the lock and the first call to __read_platform_stime(), and printing them together with the "live" values in a second printk() after the one your original patch added could rule that out. But the box doesn't even seem to be NUMA (of course it also doesn't help that the log level was kept restricted - hint, hint, Philippe), not does there appear to be any S3 cycle or pCPU bring-up/-down in between... Philippe, could you clarify again what CPU model(s) this is being observed on (the long times between individual steps forward with this problem perhaps warrant repeating the basics each time, as it's otherwise quite cumbersome to always look up old pieces of information). > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) Iirc we added this for a good reason - to cover the, however unlikely, event of Xen running for very long without preemption. Presumably most of the cases got fixed meanwhile, and indeed a wraparound time on the order of minutes should make this superfluous, but as the case here shows that code did spot a severe anomaly (whatever that may turn out to be). Also recall that there are HPET implementations around that tick at a much higher frequency than 14MHz. So unless we finally reach the understanding that the code is flawed, I would rather want to keep it. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:12:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:12:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWP5I-0004i9-0h; Thu, 08 Nov 2012 10:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWP5G-0004i4-VH for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:11:39 +0000 Received: from [85.158.139.83:17731] by server-12.bemta-5.messagelabs.com id 24/3B-02886-9558B905; Thu, 08 Nov 2012 10:11:37 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352369497!29319334!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31487 invoked from network); 8 Nov 2012 10:11:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:11:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,737,1344211200"; d="scan'208";a="15664090" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 10:11:33 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 10:11:33 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWP5B-00053s-Df; Thu, 08 Nov 2012 10:11:33 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TWP5B-00007M-7y; Thu, 08 Nov 2012 10:11:33 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20635.34133.118531.778138@mariner.uk.xensource.com> Date: Thu, 8 Nov 2012 10:11:33 +0000 To: Keir Fraser In-Reply-To: References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: "Tim \(Xen.org\)" , Dan Magenheimer , Ian Campbell , Konrad Rzeszutek Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Keir Fraser writes ("Re: Proposed new "memory capacity claim" hypercall/feature"): > On 07/11/2012 22:17, "Dan Magenheimer" wrote: > > I think this brings us back to the proposed "claim" hypercall/subop. > > Unless there are further objections or suggestions for different > > approaches, I'll commence prototyping it, OK? > > Yes, in fact I thought you'd started already! Sorry to play bad cop here but I am still far from convinced that a new hypercall is necessary or desirable. A lot of words have been written but the concrete, detailed, technical argument remains to be made IMO. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:12:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:12:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWP5I-0004i9-0h; Thu, 08 Nov 2012 10:11:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWP5G-0004i4-VH for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:11:39 +0000 Received: from [85.158.139.83:17731] by server-12.bemta-5.messagelabs.com id 24/3B-02886-9558B905; Thu, 08 Nov 2012 10:11:37 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352369497!29319334!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31487 invoked from network); 8 Nov 2012 10:11:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:11:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,737,1344211200"; d="scan'208";a="15664090" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 10:11:33 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 10:11:33 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWP5B-00053s-Df; Thu, 08 Nov 2012 10:11:33 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TWP5B-00007M-7y; Thu, 08 Nov 2012 10:11:33 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20635.34133.118531.778138@mariner.uk.xensource.com> Date: Thu, 8 Nov 2012 10:11:33 +0000 To: Keir Fraser In-Reply-To: References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: "Tim \(Xen.org\)" , Dan Magenheimer , Ian Campbell , Konrad Rzeszutek Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Keir Fraser writes ("Re: Proposed new "memory capacity claim" hypercall/feature"): > On 07/11/2012 22:17, "Dan Magenheimer" wrote: > > I think this brings us back to the proposed "claim" hypercall/subop. > > Unless there are further objections or suggestions for different > > approaches, I'll commence prototyping it, OK? > > Yes, in fact I thought you'd started already! Sorry to play bad cop here but I am still far from convinced that a new hypercall is necessary or desirable. A lot of words have been written but the concrete, detailed, technical argument remains to be made IMO. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:39:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:39:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPVK-0004uC-Fc; Thu, 08 Nov 2012 10:38:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPVJ-0004u7-78 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:38:33 +0000 Received: from [85.158.143.99:11122] by server-1.bemta-4.messagelabs.com id 19/CB-27934-8AB8B905; Thu, 08 Nov 2012 10:38:32 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352371108!18313483!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8548 invoked from network); 8 Nov 2012 10:38:30 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:38:30 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1748669eek.32 for ; Thu, 08 Nov 2012 02:38:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=Sz+JxiBExWoCe2GqOs2Hh8iPCNVo+h9Ki2R/EkPn0gs=; b=zb6iCTQiGA2seiPVKpVzues07AeryDR7Inato7wonomVKrqtkRR68J2mxi/Uhs4h+z psIWfkfmbrJhoI5q4LqxiMbrENr2cE33DfT2buoL8I4/gqvAPqXFhdmmA0zGUwpuNa11 WtGI61MIlmevfc8eq/0Y17EsvQ4RnM1dZw0H+Aj9P8YF9FrAvuzl7NFYYhX4nQkZU4Dw 70XW7MvJJQlK0W+et11vVtRnDrXC3c0JE3Cr13HoqHoIBbJSfPTiG8KJ+ZKaBuLEXu7e J9Y25VsIdPuBPaBjlE2wxG52rMzbIQk+pF7qaMbMsVLjYNGb2Cmxd8GksOMh6yioTrO2 gBrw== Received: by 10.14.178.195 with SMTP id f43mr26107050eem.44.1352371105718; Thu, 08 Nov 2012 02:38:25 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id g5sm69597470eem.4.2012.11.08.02.38.23 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:38:25 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:38:20 +0000 From: Keir Fraser To: Jan Beulich , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29nStxcTMLLQIYPEKZ2yhC5XkHjg== In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> Mime-version: 1.0 Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 09:39, "Jan Beulich" wrote: >>>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>>> tsc_stamp=e3839fcb0273 >>>> >>>> (below is the complete xm dmesg output) >>>> >>>> did that help you ? do you need more info ? >>> >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>> looks to me like it should be useful! >> >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >> impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That >> seems very very improbable! > > Is it? My understanding was that plt_stamp64 is just a software > extension to the more narrow HW counter, and hence the low > plt_mask bits would always be expected to be identical. No, plt_stamp is simply the HW counter time at which plt_stamp64 was last brought up to date. Hence plt_stamp64 is updated as: plt_stamp64 += (new_stamp - old_stamp) & plt_mask; Hence why seeing plt_stamp64&plt_mask == new_stamp is very unexpected! -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:39:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:39:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPVK-0004uC-Fc; Thu, 08 Nov 2012 10:38:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPVJ-0004u7-78 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:38:33 +0000 Received: from [85.158.143.99:11122] by server-1.bemta-4.messagelabs.com id 19/CB-27934-8AB8B905; Thu, 08 Nov 2012 10:38:32 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352371108!18313483!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8548 invoked from network); 8 Nov 2012 10:38:30 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-14.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:38:30 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1748669eek.32 for ; Thu, 08 Nov 2012 02:38:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=Sz+JxiBExWoCe2GqOs2Hh8iPCNVo+h9Ki2R/EkPn0gs=; b=zb6iCTQiGA2seiPVKpVzues07AeryDR7Inato7wonomVKrqtkRR68J2mxi/Uhs4h+z psIWfkfmbrJhoI5q4LqxiMbrENr2cE33DfT2buoL8I4/gqvAPqXFhdmmA0zGUwpuNa11 WtGI61MIlmevfc8eq/0Y17EsvQ4RnM1dZw0H+Aj9P8YF9FrAvuzl7NFYYhX4nQkZU4Dw 70XW7MvJJQlK0W+et11vVtRnDrXC3c0JE3Cr13HoqHoIBbJSfPTiG8KJ+ZKaBuLEXu7e J9Y25VsIdPuBPaBjlE2wxG52rMzbIQk+pF7qaMbMsVLjYNGb2Cmxd8GksOMh6yioTrO2 gBrw== Received: by 10.14.178.195 with SMTP id f43mr26107050eem.44.1352371105718; Thu, 08 Nov 2012 02:38:25 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id g5sm69597470eem.4.2012.11.08.02.38.23 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:38:25 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:38:20 +0000 From: Keir Fraser To: Jan Beulich , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29nStxcTMLLQIYPEKZ2yhC5XkHjg== In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> Mime-version: 1.0 Cc: 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 09:39, "Jan Beulich" wrote: >>>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>>> tsc_stamp=e3839fcb0273 >>>> >>>> (below is the complete xm dmesg output) >>>> >>>> did that help you ? do you need more info ? >>> >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>> looks to me like it should be useful! >> >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >> impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That >> seems very very improbable! > > Is it? My understanding was that plt_stamp64 is just a software > extension to the more narrow HW counter, and hence the low > plt_mask bits would always be expected to be identical. No, plt_stamp is simply the HW counter time at which plt_stamp64 was last brought up to date. Hence plt_stamp64 is updated as: plt_stamp64 += (new_stamp - old_stamp) & plt_mask; Hence why seeing plt_stamp64&plt_mask == new_stamp is very unexpected! -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:50:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:50:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPgk-000547-Mf; Thu, 08 Nov 2012 10:50:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPgi-000542-OG for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:50:20 +0000 Received: from [193.109.254.147:32658] by server-10.bemta-14.messagelabs.com id A1/B3-31741-C6E8B905; Thu, 08 Nov 2012 10:50:20 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352371818!3317757!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16970 invoked from network); 8 Nov 2012 10:50:19 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:50:19 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so2013313wib.14 for ; Thu, 08 Nov 2012 02:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=+0a9RdB+MA4meGrPOSTtwSwhLKXuXETi1ncF8nnDFiY=; b=QSaFuflyswWjF7kJSya2hZGojsR4JXFg3Xoh5fcT3axZPSMDR0OCHw6kujDqeyw+EP x1vemrWXy0a6P9Dy6s9RJkPUCNCfsUoPM8ERVS63iPJ0rw75qyhBqZw5ZgUvwxq75NX6 B+SRGF/UWRfeagtQQVTwRkGH8KB1A2dw5VL+NPe+9T2TCpX7i8Y0ylANPuKeve0WrcXD 1AwUebO1YRsccEvn9w/DtrwDIDuK5sLULprX28vG+eUnrG6Hrxiy/HuuN9GxsirqAXp0 IjcDimx9eMD5bp/QgAoptMjl9OuYng8DgHMVGD2MVTkUAbJJCZ9x46V0Xln9n2tu2xuk +NHw== Received: by 10.216.150.197 with SMTP id z47mr3009947wej.221.1352371818360; Thu, 08 Nov 2012 02:50:18 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fg6sm6813675wib.3.2012.11.08.02.50.11 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:50:17 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:50:03 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29ns529FV2PwxXckCa5cHvwPQcsw== In-Reply-To: <509B8DC102000078000A72BA@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 09:47, "Jan Beulich" wrote: >> Ah, then I am out of date on how Linux services softirqs and preemption? Can >> softirqs/preemption occur any time, even in kernel mode, so long as no locks >> are held? >> >> I thought softirq-type work only happened during event servicing, only if >> the event servicing had interrupted user context (ie, would not happen if >> started from within kernel mode). So the restart of the hypercall trap >> instruction would be an opportunity to service hardirqs, but not softirqs or >> scheduler... > > No, irq_exit() can invoke softirqs, provided this isn't a nested IRQ > (soft as well as hard) or softirqs weren't disabled in the interrupted > context. Ah, okay. In fact maybe that's always been the case and I have misremembered this detail, since condition for softirq entry in Xen has always been more strict than this. > The only thing that indeed is - on non-preemptible kernels - done > only on exit to user mode is the eventual entering of the scheduler. That alone may still be an argument for restricting the batch size from the toolstack? -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:50:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:50:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPgk-000547-Mf; Thu, 08 Nov 2012 10:50:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPgi-000542-OG for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:50:20 +0000 Received: from [193.109.254.147:32658] by server-10.bemta-14.messagelabs.com id A1/B3-31741-C6E8B905; Thu, 08 Nov 2012 10:50:20 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352371818!3317757!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16970 invoked from network); 8 Nov 2012 10:50:19 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:50:19 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so2013313wib.14 for ; Thu, 08 Nov 2012 02:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=+0a9RdB+MA4meGrPOSTtwSwhLKXuXETi1ncF8nnDFiY=; b=QSaFuflyswWjF7kJSya2hZGojsR4JXFg3Xoh5fcT3axZPSMDR0OCHw6kujDqeyw+EP x1vemrWXy0a6P9Dy6s9RJkPUCNCfsUoPM8ERVS63iPJ0rw75qyhBqZw5ZgUvwxq75NX6 B+SRGF/UWRfeagtQQVTwRkGH8KB1A2dw5VL+NPe+9T2TCpX7i8Y0ylANPuKeve0WrcXD 1AwUebO1YRsccEvn9w/DtrwDIDuK5sLULprX28vG+eUnrG6Hrxiy/HuuN9GxsirqAXp0 IjcDimx9eMD5bp/QgAoptMjl9OuYng8DgHMVGD2MVTkUAbJJCZ9x46V0Xln9n2tu2xuk +NHw== Received: by 10.216.150.197 with SMTP id z47mr3009947wej.221.1352371818360; Thu, 08 Nov 2012 02:50:18 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fg6sm6813675wib.3.2012.11.08.02.50.11 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:50:17 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:50:03 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29ns529FV2PwxXckCa5cHvwPQcsw== In-Reply-To: <509B8DC102000078000A72BA@nat28.tlf.novell.com> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 09:47, "Jan Beulich" wrote: >> Ah, then I am out of date on how Linux services softirqs and preemption? Can >> softirqs/preemption occur any time, even in kernel mode, so long as no locks >> are held? >> >> I thought softirq-type work only happened during event servicing, only if >> the event servicing had interrupted user context (ie, would not happen if >> started from within kernel mode). So the restart of the hypercall trap >> instruction would be an opportunity to service hardirqs, but not softirqs or >> scheduler... > > No, irq_exit() can invoke softirqs, provided this isn't a nested IRQ > (soft as well as hard) or softirqs weren't disabled in the interrupted > context. Ah, okay. In fact maybe that's always been the case and I have misremembered this detail, since condition for softirq entry in Xen has always been more strict than this. > The only thing that indeed is - on non-preemptible kernels - done > only on exit to user mode is the eventual entering of the scheduler. That alone may still be an argument for restricting the batch size from the toolstack? -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:58:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:58:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPny-0005DQ-JO; Thu, 08 Nov 2012 10:57:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPnx-0005DL-14 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:57:49 +0000 Received: from [85.158.137.99:25775] by server-15.bemta-3.messagelabs.com id AD/F9-09445-C209B905; Thu, 08 Nov 2012 10:57:48 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352372265!18276980!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16679 invoked from network); 8 Nov 2012 10:57:46 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:57:46 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1409544wey.32 for ; Thu, 08 Nov 2012 02:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=QpW/n7y2eqGM9yW4XesiSLBAXx+f6Do7b4M3uFUI56U=; b=DgFNUKyOAtggGi53wv5TGHjdSjHPab5vj0ZtDjHWdh1zEHdnmL2GoIM+k39ZDSpqNo QxVlJS61F1toDeT7rt4U4BPEAzWuQKjDJQxDe/1nmW4m4pif9W8xxHMKSFjf95mAyZ3Q 7Yg2b7fnXpitVj9zIcMXCb6lL/mLr9L5orcHMrTjZ/uFS/cT5qCA03OksEo8QqwlxL08 VuX7gR7d1VASFST4qxow5uzJ2RzRUHIEzu3/0BbWNnrBZ09GVEWyNC67m8Rugp+/3KA5 Nt73iIgwD/mHWg09Lm4wpSydgJCpEscSTbPKziaC9/y0kWalubpnPG3pxf1a8XZXIada 4rvA== Received: by 10.180.99.5 with SMTP id em5mr9571456wib.8.1352372265718; Thu, 08 Nov 2012 02:57:45 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ei1sm7744936wid.7.2012.11.08.02.57.41 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:57:45 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:57:33 +0000 From: Keir Fraser To: Ian Jackson Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29n9qvnNzXg08EC0eB8s+zP+/R0g== In-Reply-To: <20635.34133.118531.778138@mariner.uk.xensource.com> Mime-version: 1.0 Cc: "Tim \(Xen.org\)" , Dan Magenheimer , Ian Campbell , Konrad Rzeszutek Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 10:11, "Ian Jackson" wrote: > Keir Fraser writes ("Re: Proposed new "memory capacity claim" > hypercall/feature"): >> On 07/11/2012 22:17, "Dan Magenheimer" wrote: >>> I think this brings us back to the proposed "claim" hypercall/subop. >>> Unless there are further objections or suggestions for different >>> approaches, I'll commence prototyping it, OK? >> >> Yes, in fact I thought you'd started already! > > Sorry to play bad cop here but I am still far from convinced that a > new hypercall is necessary or desirable. > > A lot of words have been written but the concrete, detailed, technical > argument remains to be made IMO. I agree but prototyping != acceptance, and at least it gives something concrete to hang the discussion on. Otherwise this longwinded thread is going nowhere. > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 10:58:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 10:58:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPny-0005DQ-JO; Thu, 08 Nov 2012 10:57:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPnx-0005DL-14 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 10:57:49 +0000 Received: from [85.158.137.99:25775] by server-15.bemta-3.messagelabs.com id AD/F9-09445-C209B905; Thu, 08 Nov 2012 10:57:48 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352372265!18276980!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16679 invoked from network); 8 Nov 2012 10:57:46 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:57:46 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1409544wey.32 for ; Thu, 08 Nov 2012 02:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=QpW/n7y2eqGM9yW4XesiSLBAXx+f6Do7b4M3uFUI56U=; b=DgFNUKyOAtggGi53wv5TGHjdSjHPab5vj0ZtDjHWdh1zEHdnmL2GoIM+k39ZDSpqNo QxVlJS61F1toDeT7rt4U4BPEAzWuQKjDJQxDe/1nmW4m4pif9W8xxHMKSFjf95mAyZ3Q 7Yg2b7fnXpitVj9zIcMXCb6lL/mLr9L5orcHMrTjZ/uFS/cT5qCA03OksEo8QqwlxL08 VuX7gR7d1VASFST4qxow5uzJ2RzRUHIEzu3/0BbWNnrBZ09GVEWyNC67m8Rugp+/3KA5 Nt73iIgwD/mHWg09Lm4wpSydgJCpEscSTbPKziaC9/y0kWalubpnPG3pxf1a8XZXIada 4rvA== Received: by 10.180.99.5 with SMTP id em5mr9571456wib.8.1352372265718; Thu, 08 Nov 2012 02:57:45 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ei1sm7744936wid.7.2012.11.08.02.57.41 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 02:57:45 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 10:57:33 +0000 From: Keir Fraser To: Ian Jackson Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac29n9qvnNzXg08EC0eB8s+zP+/R0g== In-Reply-To: <20635.34133.118531.778138@mariner.uk.xensource.com> Mime-version: 1.0 Cc: "Tim \(Xen.org\)" , Dan Magenheimer , Ian Campbell , Konrad Rzeszutek Wilk , George Dunlap , Kurt Hackel , George Shuklin , Olaf Hering , "xen-devel@lists.xen.org" , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 10:11, "Ian Jackson" wrote: > Keir Fraser writes ("Re: Proposed new "memory capacity claim" > hypercall/feature"): >> On 07/11/2012 22:17, "Dan Magenheimer" wrote: >>> I think this brings us back to the proposed "claim" hypercall/subop. >>> Unless there are further objections or suggestions for different >>> approaches, I'll commence prototyping it, OK? >> >> Yes, in fact I thought you'd started already! > > Sorry to play bad cop here but I am still far from convinced that a > new hypercall is necessary or desirable. > > A lot of words have been written but the concrete, detailed, technical > argument remains to be made IMO. I agree but prototyping != acceptance, and at least it gives something concrete to hang the discussion on. Otherwise this longwinded thread is going nowhere. > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 11:02:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:02:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPrq-0005OY-EU; Thu, 08 Nov 2012 11:01:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPro-0005OR-DN for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:01:48 +0000 Received: from [85.158.143.35:34435] by server-1.bemta-4.messagelabs.com id 06/33-27934-B119B905; Thu, 08 Nov 2012 11:01:47 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352372302!11715237!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_20_30,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4804 invoked from network); 8 Nov 2012 10:58:22 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:58:22 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1409816wey.32 for ; Thu, 08 Nov 2012 02:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=CNY/vKe1E9pjhllh/Om954i///qsq+ZIQthBSSYS0/0=; b=C6okH6aOgm4wi492xZKDySjNF2adP9d778eO6pleWFG4vAKiAMuSzufLKxWz8daNMU SdL3c5tUIC8/NGxCeq+M/+f+IDXxmGkfWetF6utdoCwN7UPlHMhDxZ1X2VzeRWpHJoGb 28xjAsJDaMNy/RZaWyutyyGcMGDNIkuPthQjMD6jwDa1+CTIzZinGxUX/nEEhdJNKEmO Pme71BojZXBBWpsY38nbzN2c6wSba4K33CqHdH1NuBU7rkwVO3aZFvt5VmUr7OR2C0BQ ICkvlyO/1D5IxjJPRDXvrmSW3zDw6lvaUWAWiOAp+Z2/BwcK7bGeJ3RQ2HLadi2gmhLT YjXQ== MIME-Version: 1.0 Received: by 10.216.228.201 with SMTP id f51mr3046583weq.26.1352372302088; Thu, 08 Nov 2012 02:58:22 -0800 (PST) Received: by 10.227.200.1 with HTTP; Thu, 8 Nov 2012 02:58:22 -0800 (PST) In-Reply-To: <73e55d7f-737f-4690-8b69-0252e0b749dd@default> References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> <73e55d7f-737f-4690-8b69-0252e0b749dd@default> Date: Thu, 8 Nov 2012 10:58:22 +0000 X-Google-Sender-Auth: EcvHVYa9BPnpfgga7HX7y-EOQE0 Message-ID: From: George Dunlap To: Dan Magenheimer Cc: Andrew Cooper , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6528999157642038205==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============6528999157642038205== Content-Type: multipart/alternative; boundary=0016e6d64463ab8a3204cdf9b6b5 --0016e6d64463ab8a3204cdf9b6b5 Content-Type: text/plain; charset=ISO-8859-1 On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer wrote: > > From an idealistic point of view, it might be quite nice to have several > > live migrate mechanisms, so the user can choose whether they value > > minimum downtime, minimum network utilisation, or maximum safety. > > Agreed. IIRC, when post-copy was suggested for Xen years ago, > Ian Pratt was against it, though I don't recall why, so Michael > Hines work was never pursued (outside of academia). Probably > worth asking IanP before investing too much time into it. > Was he against a hybrid approach, where you "push" things first, and then "pull" things later? Or just against a pure "pull" approach? I'm pretty sure a pure "pull" approach would result in lower performance during the migration. Just tossing another idea out there: What about throttling the VM if it's dirtying too many pages? You can use the "cap" feature of the credit1 scheduler to reduce the amount of cpu time a given VM gets, even if there is free cpu time available. You could play around with doing N iterations, and then cranking down the cap on each iteration after that; then the application wouldn't have a several-second pause, it would just be "running slowly" for some period of time. Overall doing a hybrid "send dirty pages for a while, then move and pull the rest in" seems like the best approach in the long-run, but it's fairly complicated. A throttling approach is probably less optimal but simpler to get working as a temporary measure. -George --0016e6d64463ab8a3204cdf9b6b5 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer <dan.magenheimer@= oracle.com> wrote:
> From an idealistic p= oint of view, it might be quite nice to have several
> live migrate mechanisms, so the user can choose whether they value
> minimum downtime, minimum network utilisation, or maximum safety.

Agreed. =A0IIRC, when post-copy was suggested for Xen years ago,
Ian Pratt was against it, though I don't recall why, so Michael
Hines work was never pursued (outside of academia). =A0Probably
worth asking IanP before investing too much time into it.
<= br>

Was he against a hybrid approach, where you "push" t= hings first, and then "pull" things later?=A0 Or just against a p= ure "pull" approach?=A0 I'm pretty sure a pure "pull&quo= t; approach would result in lower performance during the migration.

Just tossing another idea out there: What about throttling the VM if it= 's dirtying too many pages?=A0 You can use the "cap" feature = of the credit1 scheduler to reduce the amount of cpu time a given VM gets, = even if there is free cpu time available.=A0 You could play around with doi= ng N iterations, and then cranking down the cap on each iteration after tha= t; then the application wouldn't have a several-second pause, it would = just be "running slowly" for some period of time.

Overall doing a hybrid "send dirty pages for a while, then move an= d pull the rest in" seems like the best approach in the long-run, but = it's fairly complicated.=A0 A throttling approach is probably less opti= mal but simpler to get working as a temporary measure.

=A0-George
--0016e6d64463ab8a3204cdf9b6b5-- --===============6528999157642038205== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6528999157642038205==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 11:02:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:02:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPrq-0005OY-EU; Thu, 08 Nov 2012 11:01:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWPro-0005OR-DN for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:01:48 +0000 Received: from [85.158.143.35:34435] by server-1.bemta-4.messagelabs.com id 06/33-27934-B119B905; Thu, 08 Nov 2012 11:01:47 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352372302!11715237!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_20_30,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4804 invoked from network); 8 Nov 2012 10:58:22 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 10:58:22 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so1409816wey.32 for ; Thu, 08 Nov 2012 02:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=CNY/vKe1E9pjhllh/Om954i///qsq+ZIQthBSSYS0/0=; b=C6okH6aOgm4wi492xZKDySjNF2adP9d778eO6pleWFG4vAKiAMuSzufLKxWz8daNMU SdL3c5tUIC8/NGxCeq+M/+f+IDXxmGkfWetF6utdoCwN7UPlHMhDxZ1X2VzeRWpHJoGb 28xjAsJDaMNy/RZaWyutyyGcMGDNIkuPthQjMD6jwDa1+CTIzZinGxUX/nEEhdJNKEmO Pme71BojZXBBWpsY38nbzN2c6wSba4K33CqHdH1NuBU7rkwVO3aZFvt5VmUr7OR2C0BQ ICkvlyO/1D5IxjJPRDXvrmSW3zDw6lvaUWAWiOAp+Z2/BwcK7bGeJ3RQ2HLadi2gmhLT YjXQ== MIME-Version: 1.0 Received: by 10.216.228.201 with SMTP id f51mr3046583weq.26.1352372302088; Thu, 08 Nov 2012 02:58:22 -0800 (PST) Received: by 10.227.200.1 with HTTP; Thu, 8 Nov 2012 02:58:22 -0800 (PST) In-Reply-To: <73e55d7f-737f-4690-8b69-0252e0b749dd@default> References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> <73e55d7f-737f-4690-8b69-0252e0b749dd@default> Date: Thu, 8 Nov 2012 10:58:22 +0000 X-Google-Sender-Auth: EcvHVYa9BPnpfgga7HX7y-EOQE0 Message-ID: From: George Dunlap To: Dan Magenheimer Cc: Andrew Cooper , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6528999157642038205==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============6528999157642038205== Content-Type: multipart/alternative; boundary=0016e6d64463ab8a3204cdf9b6b5 --0016e6d64463ab8a3204cdf9b6b5 Content-Type: text/plain; charset=ISO-8859-1 On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer wrote: > > From an idealistic point of view, it might be quite nice to have several > > live migrate mechanisms, so the user can choose whether they value > > minimum downtime, minimum network utilisation, or maximum safety. > > Agreed. IIRC, when post-copy was suggested for Xen years ago, > Ian Pratt was against it, though I don't recall why, so Michael > Hines work was never pursued (outside of academia). Probably > worth asking IanP before investing too much time into it. > Was he against a hybrid approach, where you "push" things first, and then "pull" things later? Or just against a pure "pull" approach? I'm pretty sure a pure "pull" approach would result in lower performance during the migration. Just tossing another idea out there: What about throttling the VM if it's dirtying too many pages? You can use the "cap" feature of the credit1 scheduler to reduce the amount of cpu time a given VM gets, even if there is free cpu time available. You could play around with doing N iterations, and then cranking down the cap on each iteration after that; then the application wouldn't have a several-second pause, it would just be "running slowly" for some period of time. Overall doing a hybrid "send dirty pages for a while, then move and pull the rest in" seems like the best approach in the long-run, but it's fairly complicated. A throttling approach is probably less optimal but simpler to get working as a temporary measure. -George --0016e6d64463ab8a3204cdf9b6b5 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer <dan.magenheimer@= oracle.com> wrote:
> From an idealistic p= oint of view, it might be quite nice to have several
> live migrate mechanisms, so the user can choose whether they value
> minimum downtime, minimum network utilisation, or maximum safety.

Agreed. =A0IIRC, when post-copy was suggested for Xen years ago,
Ian Pratt was against it, though I don't recall why, so Michael
Hines work was never pursued (outside of academia). =A0Probably
worth asking IanP before investing too much time into it.
<= br>

Was he against a hybrid approach, where you "push" t= hings first, and then "pull" things later?=A0 Or just against a p= ure "pull" approach?=A0 I'm pretty sure a pure "pull&quo= t; approach would result in lower performance during the migration.

Just tossing another idea out there: What about throttling the VM if it= 's dirtying too many pages?=A0 You can use the "cap" feature = of the credit1 scheduler to reduce the amount of cpu time a given VM gets, = even if there is free cpu time available.=A0 You could play around with doi= ng N iterations, and then cranking down the cap on each iteration after tha= t; then the application wouldn't have a several-second pause, it would = just be "running slowly" for some period of time.

Overall doing a hybrid "send dirty pages for a while, then move an= d pull the rest in" seems like the best approach in the long-run, but = it's fairly complicated.=A0 A throttling approach is probably less opti= mal but simpler to get working as a temporary measure.

=A0-George
--0016e6d64463ab8a3204cdf9b6b5-- --===============6528999157642038205== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6528999157642038205==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 11:46:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:46:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQYJ-0005jY-Cy; Thu, 08 Nov 2012 11:45:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQYI-0005jT-8f for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:45:42 +0000 Received: from [85.158.143.99:14667] by server-1.bemta-4.messagelabs.com id 39/F5-27934-56B9B905; Thu, 08 Nov 2012 11:45:41 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-11.tower-216.messagelabs.com!1352375139!21601697!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19874 invoked from network); 8 Nov 2012 11:45:40 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 11:45:40 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWQYF-00050C-9S; Thu, 08 Nov 2012 11:45:39 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWQY8-0005Wq-IA; Thu, 08 Nov 2012 11:45:38 +0000 Message-ID: <1352375011.12977.95.camel@hastur.hellion.org.uk> From: Ian Campbell To: Keir Fraser Date: Thu, 08 Nov 2012 12:43:31 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 17:40 +0000, Keir Fraser wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > > >>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > >>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > >>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > >>> tsc_stamp=e3839fcb0273 > >> > >> (below is the complete xm dmesg output) > >> > >> did that help you ? do you need more info ? > > > > I'll leave this to Keir (who wrote the debugging patch) to answer but it > > looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. impossible due to guarantees made by the h/w or by construction in Xen. There appears to be a certain amount of hardware-specificness to the issue -- so I'm wondering if maybe there are some platforms whose tsc is not as monotonically increasing as it needs to be... > plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Does this code run on all cpus or just one? Is it always the same one? > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) > > -- Keir > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 11:46:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:46:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQYJ-0005jY-Cy; Thu, 08 Nov 2012 11:45:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQYI-0005jT-8f for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:45:42 +0000 Received: from [85.158.143.99:14667] by server-1.bemta-4.messagelabs.com id 39/F5-27934-56B9B905; Thu, 08 Nov 2012 11:45:41 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-11.tower-216.messagelabs.com!1352375139!21601697!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19874 invoked from network); 8 Nov 2012 11:45:40 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 11:45:40 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWQYF-00050C-9S; Thu, 08 Nov 2012 11:45:39 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWQY8-0005Wq-IA; Thu, 08 Nov 2012 11:45:38 +0000 Message-ID: <1352375011.12977.95.camel@hastur.hellion.org.uk> From: Ian Campbell To: Keir Fraser Date: Thu, 08 Nov 2012 12:43:31 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 17:40 +0000, Keir Fraser wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > > >>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 > >>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > >>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > >>> tsc_stamp=e3839fcb0273 > >> > >> (below is the complete xm dmesg output) > >> > >> did that help you ? do you need more info ? > > > > I'll leave this to Keir (who wrote the debugging patch) to answer but it > > looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. impossible due to guarantees made by the h/w or by construction in Xen. There appears to be a certain amount of hardware-specificness to the issue -- so I'm wondering if maybe there are some platforms whose tsc is not as monotonically increasing as it needs to be... > plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Does this code run on all cpus or just one? Is it always the same one? > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) > > -- Keir > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 11:50:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:50:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQcQ-0005qk-AG; Thu, 08 Nov 2012 11:49:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQcO-0005qa-Da for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:49:56 +0000 Received: from [85.158.143.35:13746] by server-2.bemta-4.messagelabs.com id A3/E2-28922-36C9B905; Thu, 08 Nov 2012 11:49:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352375297!16965789!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8849 invoked from network); 8 Nov 2012 11:48:18 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-21.messagelabs.com with SMTP; 8 Nov 2012 11:48:18 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 09:47:30 +0000 Message-Id: <509B8DC102000078000A72BA@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 09:47:29 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B813B02000078000A7279@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 10:12, Keir Fraser wrote: > On 08/11/2012 08:54, "Jan Beulich" wrote: >> That may have mattered when ioctl-s were run with the big kernel >> lock held, but even 2.6.18 didn't do that anymore (using the >> .unlocked_ioctl field of struct file_operations), which means >> that even softirqs will get serviced in Dom0 since the preempted >> hypercall gets restarted via exiting to the guest (i.e. events get >> delivered). Scheduling is what indeed wouldn't happen, but if >> allocation latency can be brought down, 8M might turn out pretty >> small a chunk size. > > Ah, then I am out of date on how Linux services softirqs and preemption? Can > softirqs/preemption occur any time, even in kernel mode, so long as no locks > are held? > > I thought softirq-type work only happened during event servicing, only if > the event servicing had interrupted user context (ie, would not happen if > started from within kernel mode). So the restart of the hypercall trap > instruction would be an opportunity to service hardirqs, but not softirqs or > scheduler... No, irq_exit() can invoke softirqs, provided this isn't a nested IRQ (soft as well as hard) or softirqs weren't disabled in the interrupted context. The only thing that indeed is - on non-preemptible kernels - done only on exit to user mode is the eventual entering of the scheduler. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 11:50:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 11:50:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQcQ-0005qk-AG; Thu, 08 Nov 2012 11:49:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWQcO-0005qa-Da for xen-devel@lists.xen.org; Thu, 08 Nov 2012 11:49:56 +0000 Received: from [85.158.143.35:13746] by server-2.bemta-4.messagelabs.com id A3/E2-28922-36C9B905; Thu, 08 Nov 2012 11:49:55 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352375297!16965789!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8849 invoked from network); 8 Nov 2012 11:48:18 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-21.messagelabs.com with SMTP; 8 Nov 2012 11:48:18 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 09:47:30 +0000 Message-Id: <509B8DC102000078000A72BA@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 09:47:29 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B813B02000078000A7279@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 10:12, Keir Fraser wrote: > On 08/11/2012 08:54, "Jan Beulich" wrote: >> That may have mattered when ioctl-s were run with the big kernel >> lock held, but even 2.6.18 didn't do that anymore (using the >> .unlocked_ioctl field of struct file_operations), which means >> that even softirqs will get serviced in Dom0 since the preempted >> hypercall gets restarted via exiting to the guest (i.e. events get >> delivered). Scheduling is what indeed wouldn't happen, but if >> allocation latency can be brought down, 8M might turn out pretty >> small a chunk size. > > Ah, then I am out of date on how Linux services softirqs and preemption? Can > softirqs/preemption occur any time, even in kernel mode, so long as no locks > are held? > > I thought softirq-type work only happened during event servicing, only if > the event servicing had interrupted user context (ie, would not happen if > started from within kernel mode). So the restart of the hypercall trap > instruction would be an opportunity to service hardirqs, but not softirqs or > scheduler... No, irq_exit() can invoke softirqs, provided this isn't a nested IRQ (soft as well as hard) or softirqs weren't disabled in the interrupted context. The only thing that indeed is - on non-preemptible kernels - done only on exit to user mode is the eventual entering of the scheduler. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:43:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:43:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRRo-0006JC-FZ; Thu, 08 Nov 2012 12:43:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRRm-0006J7-Vw for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:43:03 +0000 Received: from [85.158.143.35:21611] by server-2.bemta-4.messagelabs.com id F2/D7-28922-6D8AB905; Thu, 08 Nov 2012 12:43:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1352378579!16974279!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4007 invoked from network); 8 Nov 2012 12:43:00 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 12:43:00 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWRRa-000KUa-Bq; Thu, 08 Nov 2012 12:42:50 +0000 Date: Thu, 8 Nov 2012 12:42:50 +0000 From: Tim Deegan To: Dario Faggioli Message-ID: <20121108124250.GE76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> <50992A2302000078000A6B78@nat28.tlf.novell.com> <1352212160.2155.18.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352212160.2155.18.camel@Solace> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , xen-devel , Jan Beulich , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 15:29 +0100 on 06 Nov (1352215760), Dario Faggioli wrote: > On Tue, 2012-11-06 at 14:17 +0000, Jan Beulich wrote: > > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > > > handler acknowledges the error, but if the softirq handler doesn't > > > disable the device, it will take another IOMMU interrupt immediately. > > > I thought the AMD side behaved eth same but clearly not -- I'll try to > > > take a look at that later in the week. > > > > I don't think AMD's behaves much different, it's just that for the > > PPR case nothing is being done in that regard (and it's unclear > > whether or under what circumstances a high rate of these could > > occur). > > > Indeed. I just double checked the code and yes, both faults and PPRs are > handled that way, and new interrupts are disabled until the tasklet > handles the request and re-enables them. > > The difference, as Jan is saying, is there is no PPR equivalent of > disabling bus mastering that can ensure livelock safeness when it comes > to them. Right, I see. We could always disable the card entirely. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:43:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:43:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRRo-0006JC-FZ; Thu, 08 Nov 2012 12:43:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRRm-0006J7-Vw for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:43:03 +0000 Received: from [85.158.143.35:21611] by server-2.bemta-4.messagelabs.com id F2/D7-28922-6D8AB905; Thu, 08 Nov 2012 12:43:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1352378579!16974279!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4007 invoked from network); 8 Nov 2012 12:43:00 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 12:43:00 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWRRa-000KUa-Bq; Thu, 08 Nov 2012 12:42:50 +0000 Date: Thu, 8 Nov 2012 12:42:50 +0000 From: Tim Deegan To: Dario Faggioli Message-ID: <20121108124250.GE76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <1352203585.505.5.camel@Solace> <509915CD02000078000A6ABF@nat28.tlf.novell.com> <20121106135842.GB45690@ocelot.phlegethon.org> <50992A2302000078000A6B78@nat28.tlf.novell.com> <1352212160.2155.18.camel@Solace> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352212160.2155.18.camel@Solace> User-Agent: Mutt/1.4.2.1i Cc: "Keir \(Xen.org\)" , "wei.huang2@amd.com" , xen-devel , Jan Beulich , "weiwang.dd@gmail.com" , "xiantao.zhang@intel.com" Subject: Re: [Xen-devel] [PATCH] IOMMU: don't disable bus mastering on faults for devices used by Xen or Dom0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 15:29 +0100 on 06 Nov (1352215760), Dario Faggioli wrote: > On Tue, 2012-11-06 at 14:17 +0000, Jan Beulich wrote: > > > Indeed. (Intel) IOMMU interrupts are suppressed until the softirq > > > handler acknowledges the error, but if the softirq handler doesn't > > > disable the device, it will take another IOMMU interrupt immediately. > > > I thought the AMD side behaved eth same but clearly not -- I'll try to > > > take a look at that later in the week. > > > > I don't think AMD's behaves much different, it's just that for the > > PPR case nothing is being done in that regard (and it's unclear > > whether or under what circumstances a high rate of these could > > occur). > > > Indeed. I just double checked the code and yes, both faults and PPRs are > handled that way, and new interrupts are disabled until the tasklet > handles the request and re-enables them. > > The difference, as Jan is saying, is there is no PPR equivalent of > disabling bus mastering that can ensure livelock safeness when it comes > to them. Right, I see. We could always disable the card entirely. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:47:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:47:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRVJ-0006Wl-RB; Thu, 08 Nov 2012 12:46:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRVH-0006WS-Kb for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:46:40 +0000 Received: from [85.158.137.99:58305] by server-7.bemta-3.messagelabs.com id A2/4C-01713-EA9AB905; Thu, 08 Nov 2012 12:46:38 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-7.tower-217.messagelabs.com!1352378797!13473080!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31634 invoked from network); 8 Nov 2012 12:46:37 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-7.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 12:46:37 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWRVB-000KVa-NN; Thu, 08 Nov 2012 12:46:33 +0000 Date: Thu, 8 Nov 2012 12:46:33 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108124633.GF76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A94F002000078000A702A@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. > > Signed-off-by: Jan Beulich Looks good to me, though I don't think dom0 should have any special treatment here. I'd be inclined to set the threshold to 10 for everyone. Tim. > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ > > static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) > { > - u16 domain_id, device_id, bdf, cword, flags; > + u16 domain_id, device_id, bdf, flags; > u32 code; > u64 *addr; > int count = 0; > @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct > "fault address = %#"PRIx64", flags = %#x\n", > event_str[code-1], domain_id, device_id, *addr, flags); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > - { > - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > - PCI_SLOT(bdf), PCI_FUNC(bdf), > - PCI_COMMAND); > - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), > - PCI_FUNC(bdf), PCI_COMMAND, > - cword & ~PCI_COMMAND_MASTER); > - } > + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), > + PCI_DEVFN2(bdf)); > } > else > { > --- a/xen/drivers/passthrough/iommu.c > +++ b/xen/drivers/passthrough/iommu.c > @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b > static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) > { > struct hvm_iommu *hd = domain_hvm_iommu(d); > + struct pci_dev *pdev; > int rc = 0; > > if ( !iommu_enabled || !hd->platform_ops ) > @@ -228,6 +229,13 @@ static int assign_device(struct domain * > return -EXDEV; > > spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; > + pdev->fault.count = 0; > + } > + > if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) > goto done; > > @@ -239,6 +247,8 @@ static int assign_device(struct domain * > goto done; > } > done: > + if ( pdev && pdev->domain != d ) > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > spin_unlock(&pcidevs_lock); > return rc; > } > @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 > return ret; > } > > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > + pdev->fault.count = 0; > + > if ( !has_arch_pdevs(d) && need_iommu(d) ) > { > d->need_iommu = 0; > --- a/xen/drivers/passthrough/pci.c > +++ b/xen/drivers/passthrough/pci.c > @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct > *((u8*) &pdev->bus) = bus; > *((u8*) &pdev->devfn) = devfn; > pdev->domain = NULL; > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > INIT_LIST_HEAD(&pdev->msi_list); > list_add(&pdev->alldevs_list, &pseg->alldevs_list); > spin_lock_init(&pdev->msix_table_lock); > @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 > return 1; > } > > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) > +{ > + struct pci_dev *pdev; > + s_time_t now = NOW(); > + u16 cword; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + if ( now < pdev->fault.time || > + now - pdev->fault.time > MILLISECS(10) ) > + pdev->fault.count >>= 1; > + pdev->fault.time = now; > + if ( ++pdev->fault.count < pdev->fault.threshold ) > + pdev = NULL; > + } > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + return; > + > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND); > + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > +} > + > /* > * scan pci devices to add all existed PCI devices to alldevs_list, > * and setup pci hierarchy in array bus2bridge. > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct > while (1) > { > u8 fault_reason; > - u16 source_id, cword; > + u16 source_id; > u32 data; > u64 guest_addr; > int type; > @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + pci_check_disable_device(iommu->intel->drhd->segment, > + PCI_BUS(source_id), PCI_DEVFN2(source_id)); > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > --- a/xen/include/xen/pci.h > +++ b/xen/include/xen/pci.h > @@ -64,6 +64,13 @@ struct pci_dev { > const u8 devfn; > struct pci_dev_info info; > struct arch_pci_dev arch; > + struct { > + s_time_t time; > + unsigned int threshold; > +#define PT_FAULT_THRESHOLD_PRIV 10 > +#define PT_FAULT_THRESHOLD_UNPRIV 3 > + unsigned int count; > + } fault; > u64 vf_rlen[6]; > }; > > @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); > struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); > struct pci_dev *pci_get_pdev_by_domain( > struct domain *, int seg, int bus, int devfn); > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); > > uint8_t pci_conf_read8( > unsigned int seg, unsigned int bus, unsigned int dev, unsigned int func, > > > IOMMU: don't immediately disable bus mastering on faults > > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. > > Signed-off-by: Jan Beulich > > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ > > static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) > { > - u16 domain_id, device_id, bdf, cword, flags; > + u16 domain_id, device_id, bdf, flags; > u32 code; > u64 *addr; > int count = 0; > @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct > "fault address = %#"PRIx64", flags = %#x\n", > event_str[code-1], domain_id, device_id, *addr, flags); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > - { > - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > - PCI_SLOT(bdf), PCI_FUNC(bdf), > - PCI_COMMAND); > - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), > - PCI_FUNC(bdf), PCI_COMMAND, > - cword & ~PCI_COMMAND_MASTER); > - } > + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), > + PCI_DEVFN2(bdf)); > } > else > { > --- a/xen/drivers/passthrough/iommu.c > +++ b/xen/drivers/passthrough/iommu.c > @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b > static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) > { > struct hvm_iommu *hd = domain_hvm_iommu(d); > + struct pci_dev *pdev; > int rc = 0; > > if ( !iommu_enabled || !hd->platform_ops ) > @@ -228,6 +229,13 @@ static int assign_device(struct domain * > return -EXDEV; > > spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; > + pdev->fault.count = 0; > + } > + > if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) > goto done; > > @@ -239,6 +247,8 @@ static int assign_device(struct domain * > goto done; > } > done: > + if ( pdev && pdev->domain != d ) > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > spin_unlock(&pcidevs_lock); > return rc; > } > @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 > return ret; > } > > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > + pdev->fault.count = 0; > + > if ( !has_arch_pdevs(d) && need_iommu(d) ) > { > d->need_iommu = 0; > --- a/xen/drivers/passthrough/pci.c > +++ b/xen/drivers/passthrough/pci.c > @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct > *((u8*) &pdev->bus) = bus; > *((u8*) &pdev->devfn) = devfn; > pdev->domain = NULL; > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > INIT_LIST_HEAD(&pdev->msi_list); > list_add(&pdev->alldevs_list, &pseg->alldevs_list); > spin_lock_init(&pdev->msix_table_lock); > @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 > return 1; > } > > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) > +{ > + struct pci_dev *pdev; > + s_time_t now = NOW(); > + u16 cword; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + if ( now < pdev->fault.time || > + now - pdev->fault.time > MILLISECS(10) ) > + pdev->fault.count >>= 1; > + pdev->fault.time = now; > + if ( ++pdev->fault.count < pdev->fault.threshold ) > + pdev = NULL; > + } > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + return; > + > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND); > + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > +} > + > /* > * scan pci devices to add all existed PCI devices to alldevs_list, > * and setup pci hierarchy in array bus2bridge. > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct > while (1) > { > u8 fault_reason; > - u16 source_id, cword; > + u16 source_id; > u32 data; > u64 guest_addr; > int type; > @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + pci_check_disable_device(iommu->intel->drhd->segment, > + PCI_BUS(source_id), PCI_DEVFN2(source_id)); > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > --- a/xen/include/xen/pci.h > +++ b/xen/include/xen/pci.h > @@ -64,6 +64,13 @@ struct pci_dev { > const u8 devfn; > struct pci_dev_info info; > struct arch_pci_dev arch; > + struct { > + s_time_t time; > + unsigned int threshold; > +#define PT_FAULT_THRESHOLD_PRIV 10 > +#define PT_FAULT_THRESHOLD_UNPRIV 3 > + unsigned int count; > + } fault; > u64 vf_rlen[6]; > }; > > @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); > struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); > struct pci_dev *pci_get_pdev_by_domain( > struct domain *, int seg, int bus, int devfn); > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); > > uint8_t pci_conf_read8( > unsigned int seg, unsigned int bus, unsigned int dev, unsigned int func, _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:47:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:47:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRVJ-0006Wl-RB; Thu, 08 Nov 2012 12:46:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRVH-0006WS-Kb for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:46:40 +0000 Received: from [85.158.137.99:58305] by server-7.bemta-3.messagelabs.com id A2/4C-01713-EA9AB905; Thu, 08 Nov 2012 12:46:38 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-7.tower-217.messagelabs.com!1352378797!13473080!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31634 invoked from network); 8 Nov 2012 12:46:37 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-7.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 12:46:37 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWRVB-000KVa-NN; Thu, 08 Nov 2012 12:46:33 +0000 Date: Thu, 8 Nov 2012 12:46:33 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108124633.GF76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509A94F002000078000A702A@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. > > Signed-off-by: Jan Beulich Looks good to me, though I don't think dom0 should have any special treatment here. I'd be inclined to set the threshold to 10 for everyone. Tim. > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ > > static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) > { > - u16 domain_id, device_id, bdf, cword, flags; > + u16 domain_id, device_id, bdf, flags; > u32 code; > u64 *addr; > int count = 0; > @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct > "fault address = %#"PRIx64", flags = %#x\n", > event_str[code-1], domain_id, device_id, *addr, flags); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > - { > - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > - PCI_SLOT(bdf), PCI_FUNC(bdf), > - PCI_COMMAND); > - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), > - PCI_FUNC(bdf), PCI_COMMAND, > - cword & ~PCI_COMMAND_MASTER); > - } > + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), > + PCI_DEVFN2(bdf)); > } > else > { > --- a/xen/drivers/passthrough/iommu.c > +++ b/xen/drivers/passthrough/iommu.c > @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b > static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) > { > struct hvm_iommu *hd = domain_hvm_iommu(d); > + struct pci_dev *pdev; > int rc = 0; > > if ( !iommu_enabled || !hd->platform_ops ) > @@ -228,6 +229,13 @@ static int assign_device(struct domain * > return -EXDEV; > > spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; > + pdev->fault.count = 0; > + } > + > if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) > goto done; > > @@ -239,6 +247,8 @@ static int assign_device(struct domain * > goto done; > } > done: > + if ( pdev && pdev->domain != d ) > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > spin_unlock(&pcidevs_lock); > return rc; > } > @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 > return ret; > } > > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > + pdev->fault.count = 0; > + > if ( !has_arch_pdevs(d) && need_iommu(d) ) > { > d->need_iommu = 0; > --- a/xen/drivers/passthrough/pci.c > +++ b/xen/drivers/passthrough/pci.c > @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct > *((u8*) &pdev->bus) = bus; > *((u8*) &pdev->devfn) = devfn; > pdev->domain = NULL; > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > INIT_LIST_HEAD(&pdev->msi_list); > list_add(&pdev->alldevs_list, &pseg->alldevs_list); > spin_lock_init(&pdev->msix_table_lock); > @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 > return 1; > } > > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) > +{ > + struct pci_dev *pdev; > + s_time_t now = NOW(); > + u16 cword; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + if ( now < pdev->fault.time || > + now - pdev->fault.time > MILLISECS(10) ) > + pdev->fault.count >>= 1; > + pdev->fault.time = now; > + if ( ++pdev->fault.count < pdev->fault.threshold ) > + pdev = NULL; > + } > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + return; > + > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND); > + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > +} > + > /* > * scan pci devices to add all existed PCI devices to alldevs_list, > * and setup pci hierarchy in array bus2bridge. > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct > while (1) > { > u8 fault_reason; > - u16 source_id, cword; > + u16 source_id; > u32 data; > u64 guest_addr; > int type; > @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + pci_check_disable_device(iommu->intel->drhd->segment, > + PCI_BUS(source_id), PCI_DEVFN2(source_id)); > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > --- a/xen/include/xen/pci.h > +++ b/xen/include/xen/pci.h > @@ -64,6 +64,13 @@ struct pci_dev { > const u8 devfn; > struct pci_dev_info info; > struct arch_pci_dev arch; > + struct { > + s_time_t time; > + unsigned int threshold; > +#define PT_FAULT_THRESHOLD_PRIV 10 > +#define PT_FAULT_THRESHOLD_UNPRIV 3 > + unsigned int count; > + } fault; > u64 vf_rlen[6]; > }; > > @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); > struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); > struct pci_dev *pci_get_pdev_by_domain( > struct domain *, int seg, int bus, int devfn); > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); > > uint8_t pci_conf_read8( > unsigned int seg, unsigned int bus, unsigned int dev, unsigned int func, > > > IOMMU: don't immediately disable bus mastering on faults > > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. > > Signed-off-by: Jan Beulich > > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ > > static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) > { > - u16 domain_id, device_id, bdf, cword, flags; > + u16 domain_id, device_id, bdf, flags; > u32 code; > u64 *addr; > int count = 0; > @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct > "fault address = %#"PRIx64", flags = %#x\n", > event_str[code-1], domain_id, device_id, *addr, flags); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) > if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) > - { > - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), > - PCI_SLOT(bdf), PCI_FUNC(bdf), > - PCI_COMMAND); > - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), > - PCI_FUNC(bdf), PCI_COMMAND, > - cword & ~PCI_COMMAND_MASTER); > - } > + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), > + PCI_DEVFN2(bdf)); > } > else > { > --- a/xen/drivers/passthrough/iommu.c > +++ b/xen/drivers/passthrough/iommu.c > @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b > static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) > { > struct hvm_iommu *hd = domain_hvm_iommu(d); > + struct pci_dev *pdev; > int rc = 0; > > if ( !iommu_enabled || !hd->platform_ops ) > @@ -228,6 +229,13 @@ static int assign_device(struct domain * > return -EXDEV; > > spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; > + pdev->fault.count = 0; > + } > + > if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) > goto done; > > @@ -239,6 +247,8 @@ static int assign_device(struct domain * > goto done; > } > done: > + if ( pdev && pdev->domain != d ) > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > spin_unlock(&pcidevs_lock); > return rc; > } > @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 > return ret; > } > > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > + pdev->fault.count = 0; > + > if ( !has_arch_pdevs(d) && need_iommu(d) ) > { > d->need_iommu = 0; > --- a/xen/drivers/passthrough/pci.c > +++ b/xen/drivers/passthrough/pci.c > @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct > *((u8*) &pdev->bus) = bus; > *((u8*) &pdev->devfn) = devfn; > pdev->domain = NULL; > + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; > INIT_LIST_HEAD(&pdev->msi_list); > list_add(&pdev->alldevs_list, &pseg->alldevs_list); > spin_lock_init(&pdev->msix_table_lock); > @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 > return 1; > } > > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) > +{ > + struct pci_dev *pdev; > + s_time_t now = NOW(); > + u16 cword; > + > + spin_lock(&pcidevs_lock); > + pdev = pci_get_pdev(seg, bus, devfn); > + if ( pdev ) > + { > + if ( now < pdev->fault.time || > + now - pdev->fault.time > MILLISECS(10) ) > + pdev->fault.count >>= 1; > + pdev->fault.time = now; > + if ( ++pdev->fault.count < pdev->fault.threshold ) > + pdev = NULL; > + } > + spin_unlock(&pcidevs_lock); > + > + if ( !pdev ) > + return; > + > + /* Tell the device to stop DMAing; we can't rely on the guest to > + * control it for us. */ > + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND); > + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), > + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > +} > + > /* > * scan pci devices to add all existed PCI devices to alldevs_list, > * and setup pci hierarchy in array bus2bridge. > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct > while (1) > { > u8 fault_reason; > - u16 source_id, cword; > + u16 source_id; > u32 data; > u64 guest_addr; > int type; > @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct > iommu_page_fault_do_one(iommu, type, fault_reason, > source_id, guest_addr); > > - /* Tell the device to stop DMAing; we can't rely on the guest to > - * control it for us. */ > - cword = pci_conf_read16(iommu->intel->drhd->segment, > - PCI_BUS(source_id), PCI_SLOT(source_id), > - PCI_FUNC(source_id), PCI_COMMAND); > - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), > - PCI_SLOT(source_id), PCI_FUNC(source_id), > - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); > + pci_check_disable_device(iommu->intel->drhd->segment, > + PCI_BUS(source_id), PCI_DEVFN2(source_id)); > > fault_index++; > if ( fault_index > cap_num_fault_regs(iommu->cap) ) > --- a/xen/include/xen/pci.h > +++ b/xen/include/xen/pci.h > @@ -64,6 +64,13 @@ struct pci_dev { > const u8 devfn; > struct pci_dev_info info; > struct arch_pci_dev arch; > + struct { > + s_time_t time; > + unsigned int threshold; > +#define PT_FAULT_THRESHOLD_PRIV 10 > +#define PT_FAULT_THRESHOLD_UNPRIV 3 > + unsigned int count; > + } fault; > u64 vf_rlen[6]; > }; > > @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); > struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); > struct pci_dev *pci_get_pdev_by_domain( > struct domain *, int seg, int bus, int devfn); > +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); > > uint8_t pci_conf_read8( > unsigned int seg, unsigned int bus, unsigned int dev, unsigned int func, _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:54:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:54:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRd1-0006u5-QI; Thu, 08 Nov 2012 12:54:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRd0-0006u0-Hj for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:54:38 +0000 Received: from [85.158.137.99:40326] by server-16.bemta-3.messagelabs.com id D3/FE-07461-D8BAB905; Thu, 08 Nov 2012 12:54:37 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352379263!18284693!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25838 invoked from network); 8 Nov 2012 12:54:23 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 12:54:23 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so1248565wgb.32 for ; Thu, 08 Nov 2012 04:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=9d6prnmHFr8DR6XfxlkIYrjEienDESGvECV+9FE8tJ8=; b=ouxYOlC40gtl5/T1FVaVXUnO0kLzcU2o1Ang2yW24da28Yb6zUN3zz12dV6PU3YNPW vVLd0so8WZMmUpuEJdEI/MRqCXU1J1Qx95tHcei+i0P0toNuB+xTKNLeiA7jTS/vttOf qD2MHCXy1chUDMeoEgvOJaylBUOe8t+w4OCvSNFMsuiVxTb28RGtdxKVmSdgVeVK99h0 YrFy2kkW3ZYwHHAe8pdNDuOnq9+W9j1gyquGtzwglsRmu4TlkgBFY60bDaZq/zLcn8O3 HTS2Cd8Kx/A/AWDEkKvMz10DZbGy2OSI6i90KIhCwcvXz51LPydCfFu6Sc9Y2spbD4dH bOBw== Received: by 10.216.139.137 with SMTP id c9mr3210106wej.54.1352379262952; Thu, 08 Nov 2012 04:54:22 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id s12sm1217579wik.11.2012.11.08.04.54.20 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 04:54:22 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 12:54:17 +0000 From: Keir Fraser To: Ian Campbell Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29sCllxNbWGQNZx0KyqMxwy0qRWg== In-Reply-To: <1352375011.12977.95.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 11:43, "Ian Campbell" wrote: >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>> looks to me like it should be useful! >> >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >> impossible. > > impossible due to guarantees made by the h/w or by construction in Xen. That's a question, right? By construction in Xen. > There appears to be a certain amount of hardware-specificness to the > issue -- so I'm wondering if maybe there are some platforms whose tsc is > not as monotonically increasing as it needs to be... plt_* timestamps are not derived from TSC at all. >> plt_stamp64 oddly has low 32 bits identical to new_stamp. That >> seems very very improbable! > > Does this code run on all cpus or just one? Is it always the same one? Always cpu0. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 12:54:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 12:54:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRd1-0006u5-QI; Thu, 08 Nov 2012 12:54:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWRd0-0006u0-Hj for xen-devel@lists.xen.org; Thu, 08 Nov 2012 12:54:38 +0000 Received: from [85.158.137.99:40326] by server-16.bemta-3.messagelabs.com id D3/FE-07461-D8BAB905; Thu, 08 Nov 2012 12:54:37 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352379263!18284693!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25838 invoked from network); 8 Nov 2012 12:54:23 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 12:54:23 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so1248565wgb.32 for ; Thu, 08 Nov 2012 04:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=9d6prnmHFr8DR6XfxlkIYrjEienDESGvECV+9FE8tJ8=; b=ouxYOlC40gtl5/T1FVaVXUnO0kLzcU2o1Ang2yW24da28Yb6zUN3zz12dV6PU3YNPW vVLd0so8WZMmUpuEJdEI/MRqCXU1J1Qx95tHcei+i0P0toNuB+xTKNLeiA7jTS/vttOf qD2MHCXy1chUDMeoEgvOJaylBUOe8t+w4OCvSNFMsuiVxTb28RGtdxKVmSdgVeVK99h0 YrFy2kkW3ZYwHHAe8pdNDuOnq9+W9j1gyquGtzwglsRmu4TlkgBFY60bDaZq/zLcn8O3 HTS2Cd8Kx/A/AWDEkKvMz10DZbGy2OSI6i90KIhCwcvXz51LPydCfFu6Sc9Y2spbD4dH bOBw== Received: by 10.216.139.137 with SMTP id c9mr3210106wej.54.1352379262952; Thu, 08 Nov 2012 04:54:22 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id s12sm1217579wik.11.2012.11.08.04.54.20 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 04:54:22 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 12:54:17 +0000 From: Keir Fraser To: Ian Campbell Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29sCllxNbWGQNZx0KyqMxwy0qRWg== In-Reply-To: <1352375011.12977.95.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 11:43, "Ian Campbell" wrote: >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>> looks to me like it should be useful! >> >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >> impossible. > > impossible due to guarantees made by the h/w or by construction in Xen. That's a question, right? By construction in Xen. > There appears to be a certain amount of hardware-specificness to the > issue -- so I'm wondering if maybe there are some platforms whose tsc is > not as monotonically increasing as it needs to be... plt_* timestamps are not derived from TSC at all. >> plt_stamp64 oddly has low 32 bits identical to new_stamp. That >> seems very very improbable! > > Does this code run on all cpus or just one? Is it always the same one? Always cpu0. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:25:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWS6p-0007Kq-E1; Thu, 08 Nov 2012 13:25:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWS6n-0007Kl-UF for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:25:26 +0000 Received: from [85.158.139.211:53244] by server-4.bemta-5.messagelabs.com id 6A/A6-15011-5C2BB905; Thu, 08 Nov 2012 13:25:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-10.tower-206.messagelabs.com!1352381123!19375982!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10089 invoked from network); 8 Nov 2012 13:25:24 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-10.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:25:24 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWS6k-000Kc7-3X; Thu, 08 Nov 2012 13:25:22 +0000 Date: Thu, 8 Nov 2012 13:25:22 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121108132522.GG76638@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Thanks for the update patch. At 15:36 -0500 on 07 Nov (1352302577), Robert Phillips wrote: > > More substantive comments: > > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > > an indicator that this is really MM code. > > I have moved dirty_vram.c under mm/ > I have moved dirty_vram.h under include/asm-x86 . In that location it > is available to modules like hvm.c Sure, that seems sgood. > > I'd be > > inclined to just put all paddr_links in the linked list (and have an > > array of pointers rather than an array of paddr_link_ts). Is it worth > > having the extra complexity here, and at the callers, to avoid a single > > memory read? > > Almost all frame buffer pages have a single mapping so the algorithm's > common case is met by constructing pl_tab as an array of paddr_links. > That is, the table's paddr_links will rarely point to a chain of > extension paddr_links. The code encapsulates the complexity in a > single function. Sorry it required so much staring. Even if all > paddr_links were stored in a linked list, the caller would have to > walk that linked list, so would be just as complex. OK. > > > + if (set) > > > + { > > > + /* Did we find sl1ma in either the main table or the linked list? */ > > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > > + { > > > + ASSERT(ppl != NULL); > > > + /* alloc link and append it to list */ > > > + (*ppl) = pl = alloc_paddr_link(d); > > > + if (pl == NULL) > > > + goto out; > > > > This needs to signal some sort of error. Otherwise, if we can't add > > this sl1e to the list we'll just silently fail to track it. > > I don't know what sort of error we can signal. > > The immediate symptom would be that areas of the monitor would not be > refreshed. But, since we're running out of memory, that might be the > least of the quests's woes. The updated patch actually makes the > symptom more likely (though still very unlikely) by putting an > arbitrary bound on the length of paddr_link chains. It handles a > rogue process, one that has an arbitrarily large number of mappings > for frame buffer pages, by simply not recording the excessive > mappings. If that results in unrefreshed blocks on the monitor, so be > it. I think the correct behaviour would be to report these pages as dirty. That way anything that relies on seeing all changes will behave correctly, though less efficiently. > > > +#endif > > > + free_paddr_link(d, ppl, pl); > > > + if ( --range->nr_mappings == 0 ) > > > + { > > > + dirty_vram_range_free(d, range); > > > > What's this for? If the guest unmaps the framebuffer and remaps it (or > > if the shadow PTs of the mappings are temporarily discarded) this will > > stop us from tracking the new mappings until the toolstack asks for the > > bitmap (and then it will be expensive to go and find the mappings). > > > > I don't see this happening. If the guest unmaps the framebuffer, the > shadow code lazily recovers the shadow pages, so tracking will > continue until it decides a page is no longer a shadow page. That is > when this code is invoked. If the guest unmaps the buffer by clearing the PTEs then when the PTE changes are propagated into the shadows this will cause nr_mappings to fall to zero here. If we _don't_ free the range, then when the FB is mapped again we'll spot the new PTEs as they're shadowed and DTRT. If we _do_ free the range we end up walking all shadows looking for the mappings. > It tears down the mappings to that page and if some range ends up > with no mappings then the range is useless. Vram ranges are generated > willy-nilly as needed. This is the only mechanism for cleaning them up. Shouldn't there be some way for the tools to indicate that they're done with a range? I guess they can tear down the whole lot and then start again with whatever ranges are still in use. > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > > currently being tracked we should conservatively assume it's all dirty, > > right? > > The callers will should ensure that the range exists. This is just a > conservative test. OK. > Anyway, it begs the question of whether a new range should be > considered all dirty or all clean. Intuitively "all dirty" seems the > right answer but in practice it works fine as written since the guest > is busy updating the whole frame buffer. What if the guest's not writing to the framebuffer at the moment, or only to a part of it? Shouldn't the tools see the existing content? > > And, since you know you're in HAP mode, not in log-dirty mode, and > > already have the paging lock, you can just set > > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > > the paging_log_dirty_enable() path and messing with locks. > > No, paging_log_dirty_enable() goes through several layers of functions and > ends up calling hap_enable_vram_tracking(), which does quite a bit of stuff. OK. > > > +/* paging_mark_dirty_hap() > > > + * Make a hap page writeable and mark it as dirty. > > > + * This done atomically under the p2m and paging locks to avoid leaving > > > + * a window where the page might be modified without being marked as > > dirty. > > > + */ > > > > I'm perplexed by this -- AFAICT it's either not necessary (because all > > log-dirty read/clean ops are done with the domain paused) or not sufficient > > (because although the bitmap and the PTE are updated under the p2m lock, > > the actual dirtying of the page happens at some other time). Can you > > spell out for me exactly what this is protecting against? > > The comment over-stated the problem so I've toned it down > from "without being marked" to "without being counted". > > paging_mark_dirty_hap() is in the page fault path and has two steps: > > (1) It calls p2m_change_type() to re-mark some pfn as writeable > (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. > This must be done under the p2m_lock. > > (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then > it bumps two dirty counts. And it marks the page as dirty. This must > be done under the paging lock. > > As an invariant, the dirty counts should be precisely the number of pages > made writeable. That invariant is already doomed -- any other agent (including the guest itself) can change the p2m mappings for one of the pfns, or mark the pfn dirty, without going through the NPF fault handler. AFAICS the counts could just as well be implemented as flags, to say 'something in this range was dirtied'; the only interesting case is when they're 0. > It may be that this invariant is not particularly useful, that things > will just work out. But I do wonder if, without it, we'll have > situations where the dirty counts will indicate dirty pages when there > are none, or no dirty pages when there are some. The second of those cases would be the bad one; I think that can be avoided by just switching the order of paging_mark_dirty() and p2m_change_type() in hvm_hap_nested_page_fault(), and maybe putting a wmb() between them. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:25:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWS6p-0007Kq-E1; Thu, 08 Nov 2012 13:25:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWS6n-0007Kl-UF for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:25:26 +0000 Received: from [85.158.139.211:53244] by server-4.bemta-5.messagelabs.com id 6A/A6-15011-5C2BB905; Thu, 08 Nov 2012 13:25:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-10.tower-206.messagelabs.com!1352381123!19375982!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10089 invoked from network); 8 Nov 2012 13:25:24 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-10.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:25:24 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWS6k-000Kc7-3X; Thu, 08 Nov 2012 13:25:22 +0000 Date: Thu, 8 Nov 2012 13:25:22 +0000 From: Tim Deegan To: Robert Phillips Message-ID: <20121108132522.GG76638@ocelot.phlegethon.org> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Thanks for the update patch. At 15:36 -0500 on 07 Nov (1352302577), Robert Phillips wrote: > > More substantive comments: > > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > > an indicator that this is really MM code. > > I have moved dirty_vram.c under mm/ > I have moved dirty_vram.h under include/asm-x86 . In that location it > is available to modules like hvm.c Sure, that seems sgood. > > I'd be > > inclined to just put all paddr_links in the linked list (and have an > > array of pointers rather than an array of paddr_link_ts). Is it worth > > having the extra complexity here, and at the callers, to avoid a single > > memory read? > > Almost all frame buffer pages have a single mapping so the algorithm's > common case is met by constructing pl_tab as an array of paddr_links. > That is, the table's paddr_links will rarely point to a chain of > extension paddr_links. The code encapsulates the complexity in a > single function. Sorry it required so much staring. Even if all > paddr_links were stored in a linked list, the caller would have to > walk that linked list, so would be just as complex. OK. > > > + if (set) > > > + { > > > + /* Did we find sl1ma in either the main table or the linked list? */ > > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > > + { > > > + ASSERT(ppl != NULL); > > > + /* alloc link and append it to list */ > > > + (*ppl) = pl = alloc_paddr_link(d); > > > + if (pl == NULL) > > > + goto out; > > > > This needs to signal some sort of error. Otherwise, if we can't add > > this sl1e to the list we'll just silently fail to track it. > > I don't know what sort of error we can signal. > > The immediate symptom would be that areas of the monitor would not be > refreshed. But, since we're running out of memory, that might be the > least of the quests's woes. The updated patch actually makes the > symptom more likely (though still very unlikely) by putting an > arbitrary bound on the length of paddr_link chains. It handles a > rogue process, one that has an arbitrarily large number of mappings > for frame buffer pages, by simply not recording the excessive > mappings. If that results in unrefreshed blocks on the monitor, so be > it. I think the correct behaviour would be to report these pages as dirty. That way anything that relies on seeing all changes will behave correctly, though less efficiently. > > > +#endif > > > + free_paddr_link(d, ppl, pl); > > > + if ( --range->nr_mappings == 0 ) > > > + { > > > + dirty_vram_range_free(d, range); > > > > What's this for? If the guest unmaps the framebuffer and remaps it (or > > if the shadow PTs of the mappings are temporarily discarded) this will > > stop us from tracking the new mappings until the toolstack asks for the > > bitmap (and then it will be expensive to go and find the mappings). > > > > I don't see this happening. If the guest unmaps the framebuffer, the > shadow code lazily recovers the shadow pages, so tracking will > continue until it decides a page is no longer a shadow page. That is > when this code is invoked. If the guest unmaps the buffer by clearing the PTEs then when the PTE changes are propagated into the shadows this will cause nr_mappings to fall to zero here. If we _don't_ free the range, then when the FB is mapped again we'll spot the new PTEs as they're shadowed and DTRT. If we _do_ free the range we end up walking all shadows looking for the mappings. > It tears down the mappings to that page and if some range ends up > with no mappings then the range is useless. Vram ranges are generated > willy-nilly as needed. This is the only mechanism for cleaning them up. Shouldn't there be some way for the tools to indicate that they're done with a range? I guess they can tear down the whole lot and then start again with whatever ranges are still in use. > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > > currently being tracked we should conservatively assume it's all dirty, > > right? > > The callers will should ensure that the range exists. This is just a > conservative test. OK. > Anyway, it begs the question of whether a new range should be > considered all dirty or all clean. Intuitively "all dirty" seems the > right answer but in practice it works fine as written since the guest > is busy updating the whole frame buffer. What if the guest's not writing to the framebuffer at the moment, or only to a part of it? Shouldn't the tools see the existing content? > > And, since you know you're in HAP mode, not in log-dirty mode, and > > already have the paging lock, you can just set > > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > > the paging_log_dirty_enable() path and messing with locks. > > No, paging_log_dirty_enable() goes through several layers of functions and > ends up calling hap_enable_vram_tracking(), which does quite a bit of stuff. OK. > > > +/* paging_mark_dirty_hap() > > > + * Make a hap page writeable and mark it as dirty. > > > + * This done atomically under the p2m and paging locks to avoid leaving > > > + * a window where the page might be modified without being marked as > > dirty. > > > + */ > > > > I'm perplexed by this -- AFAICT it's either not necessary (because all > > log-dirty read/clean ops are done with the domain paused) or not sufficient > > (because although the bitmap and the PTE are updated under the p2m lock, > > the actual dirtying of the page happens at some other time). Can you > > spell out for me exactly what this is protecting against? > > The comment over-stated the problem so I've toned it down > from "without being marked" to "without being counted". > > paging_mark_dirty_hap() is in the page fault path and has two steps: > > (1) It calls p2m_change_type() to re-mark some pfn as writeable > (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. > This must be done under the p2m_lock. > > (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then > it bumps two dirty counts. And it marks the page as dirty. This must > be done under the paging lock. > > As an invariant, the dirty counts should be precisely the number of pages > made writeable. That invariant is already doomed -- any other agent (including the guest itself) can change the p2m mappings for one of the pfns, or mark the pfn dirty, without going through the NPF fault handler. AFAICS the counts could just as well be implemented as flags, to say 'something in this range was dirtied'; the only interesting case is when they're 0. > It may be that this invariant is not particularly useful, that things > will just work out. But I do wonder if, without it, we'll have > situations where the dirty counts will indicate dirty pages when there > are none, or no dirty pages when there are some. The second of those cases would be the bad one; I think that can be avoided by just switching the order of paging_mark_dirty() and p2m_change_type() in hvm_hap_nested_page_fault(), and maybe putting a wmb() between them. Cheers, Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:32:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSDN-0007VY-F1; Thu, 08 Nov 2012 13:32:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSDL-0007VS-FY for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 13:32:11 +0000 Received: from [85.158.138.51:4278] by server-11.bemta-3.messagelabs.com id 32/7C-19361-A54BB905; Thu, 08 Nov 2012 13:32:10 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352381527!21201783!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5507 invoked from network); 8 Nov 2012 13:32:09 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:32:09 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8DVpUu030168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 13:31:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8DVpQq025328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 13:31:51 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8DVmBf021421; Thu, 8 Nov 2012 07:31:48 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 05:31:48 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E41154037A; Thu, 8 Nov 2012 08:31:45 -0500 (EST) Date: Thu, 8 Nov 2012 08:31:45 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121108133145.GC3081@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <20121108011006.GC21302@phenom.dumpdata.com> <1352364376.12977.93.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352364376.12977.93.camel@hastur.hellion.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 09:46:16AM +0100, Ian Campbell wrote: > > > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > > > checkpatch warned on this new typedef - please run through checkpatch > > > >and fix up that stuff. > > > tpmif.h has a couple of typedefs which do trigger checkpatch > > > warnings. However it looks like the paradigm for xen is to have > > > these interface/io/if.h files and all of them have typedefs. I > > > think in this case the typedef should probably stay. > > > > > > Konrad your thoughts here? > > > > Rip them out plea > > This is somewhere that Linux coding style and Xen coding style differ, > so the typedefs should be removed from the Linux copy of these > interfaces to match the Linux coding style, but they should stay in the > Xen side canonical copy though. Yes. Sorry for not making that clear. > > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:32:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSDN-0007VY-F1; Thu, 08 Nov 2012 13:32:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSDL-0007VS-FY for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 13:32:11 +0000 Received: from [85.158.138.51:4278] by server-11.bemta-3.messagelabs.com id 32/7C-19361-A54BB905; Thu, 08 Nov 2012 13:32:10 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-6.tower-174.messagelabs.com!1352381527!21201783!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5507 invoked from network); 8 Nov 2012 13:32:09 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:32:09 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8DVpUu030168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 13:31:52 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8DVpQq025328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 13:31:51 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8DVmBf021421; Thu, 8 Nov 2012 07:31:48 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 05:31:48 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E41154037A; Thu, 8 Nov 2012 08:31:45 -0500 (EST) Date: Thu, 8 Nov 2012 08:31:45 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121108133145.GC3081@phenom.dumpdata.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <20121108011006.GC21302@phenom.dumpdata.com> <1352364376.12977.93.camel@hastur.hellion.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352364376.12977.93.camel@hastur.hellion.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Kent Yoder Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 09:46:16AM +0100, Ian Campbell wrote: > > > >>+typedef struct tpmif_tx_request tpmif_tx_request_t; > > > > checkpatch warned on this new typedef - please run through checkpatch > > > >and fix up that stuff. > > > tpmif.h has a couple of typedefs which do trigger checkpatch > > > warnings. However it looks like the paradigm for xen is to have > > > these interface/io/if.h files and all of them have typedefs. I > > > think in this case the typedef should probably stay. > > > > > > Konrad your thoughts here? > > > > Rip them out plea > > This is somewhere that Linux coding style and Xen coding style differ, > so the typedefs should be removed from the Linux copy of these > interfaces to match the Linux coding style, but they should stay in the > Xen side canonical copy though. Yes. Sorry for not making that clear. > > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:46:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:46:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSQy-0007gC-SP; Thu, 08 Nov 2012 13:46:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSQw-0007g7-Q5 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:46:15 +0000 Received: from [85.158.139.83:13954] by server-11.bemta-5.messagelabs.com id F4/97-03409-6A7BB905; Thu, 08 Nov 2012 13:46:14 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352382372!29641358!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7433 invoked from network); 8 Nov 2012 13:46:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-182.messagelabs.com with SMTP; 8 Nov 2012 13:46:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:46:12 +0000 Message-Id: <509BC5B402000078000A7396@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:46:12 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> <20121108124633.GF76638@ocelot.phlegethon.org> In-Reply-To: <20121108124633.GF76638@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 13:46, Tim Deegan wrote: > At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: >> Instead, give the owning domain at least a small opportunity of fixing >> things up, and allow for rare faults to not bring down the device at >> all. The amount of faults tolerated within a given time period (all >> numbers are made up with no specific rationale) is higher for Dom0 than >> for DomU-s. >> >> Signed-off-by: Jan Beulich > > Looks good to me, though I don't think dom0 should have any special > treatment here. I'd be inclined to set the threshold to 10 for > everyone. No problem. I'll wait for the IOMMU folks to give some feedback, and either re-submit (if further changes are requested), or commit with their acks (and the change as you suggest, if they're in agreement). Of course, if they disagree we'll have to get to a common position anyway first. If no other changes are requested, do I take the above as an "ack-with-that-change"? Jan >> --- a/xen/drivers/passthrough/amd/iommu_init.c >> +++ b/xen/drivers/passthrough/amd/iommu_init.c >> @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ >> >> static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) >> { >> - u16 domain_id, device_id, bdf, cword, flags; >> + u16 domain_id, device_id, bdf, flags; >> u32 code; >> u64 *addr; >> int count = 0; >> @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct >> "fault address = %#"PRIx64", flags = %#x\n", >> event_str[code-1], domain_id, device_id, *addr, flags); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) >> if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) >> - { >> - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), >> - PCI_SLOT(bdf), PCI_FUNC(bdf), >> - PCI_COMMAND); >> - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), >> - PCI_FUNC(bdf), PCI_COMMAND, >> - cword & ~PCI_COMMAND_MASTER); >> - } >> + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), >> + PCI_DEVFN2(bdf)); >> } >> else >> { >> --- a/xen/drivers/passthrough/iommu.c >> +++ b/xen/drivers/passthrough/iommu.c >> @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b >> static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) >> { >> struct hvm_iommu *hd = domain_hvm_iommu(d); >> + struct pci_dev *pdev; >> int rc = 0; >> >> if ( !iommu_enabled || !hd->platform_ops ) >> @@ -228,6 +229,13 @@ static int assign_device(struct domain * >> return -EXDEV; >> >> spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; >> + pdev->fault.count = 0; >> + } >> + >> if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) >> goto done; >> >> @@ -239,6 +247,8 @@ static int assign_device(struct domain * >> goto done; >> } >> done: >> + if ( pdev && pdev->domain != d ) >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> spin_unlock(&pcidevs_lock); >> return rc; >> } >> @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 >> return ret; >> } >> >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> + pdev->fault.count = 0; >> + >> if ( !has_arch_pdevs(d) && need_iommu(d) ) >> { >> d->need_iommu = 0; >> --- a/xen/drivers/passthrough/pci.c >> +++ b/xen/drivers/passthrough/pci.c >> @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct >> *((u8*) &pdev->bus) = bus; >> *((u8*) &pdev->devfn) = devfn; >> pdev->domain = NULL; >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> INIT_LIST_HEAD(&pdev->msi_list); >> list_add(&pdev->alldevs_list, &pseg->alldevs_list); >> spin_lock_init(&pdev->msix_table_lock); >> @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 >> return 1; >> } >> >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) >> +{ >> + struct pci_dev *pdev; >> + s_time_t now = NOW(); >> + u16 cword; >> + >> + spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + if ( now < pdev->fault.time || >> + now - pdev->fault.time > MILLISECS(10) ) >> + pdev->fault.count >>= 1; >> + pdev->fault.time = now; >> + if ( ++pdev->fault.count < pdev->fault.threshold ) >> + pdev = NULL; >> + } >> + spin_unlock(&pcidevs_lock); >> + >> + if ( !pdev ) >> + return; >> + >> + /* Tell the device to stop DMAing; we can't rely on the guest to >> + * control it for us. */ >> + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND); >> + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> +} >> + >> /* >> * scan pci devices to add all existed PCI devices to alldevs_list, >> * and setup pci hierarchy in array bus2bridge. >> --- a/xen/drivers/passthrough/vtd/iommu.c >> +++ b/xen/drivers/passthrough/vtd/iommu.c >> @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct >> while (1) >> { >> u8 fault_reason; >> - u16 source_id, cword; >> + u16 source_id; >> u32 data; >> u64 guest_addr; >> int type; >> @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct >> iommu_page_fault_do_one(iommu, type, fault_reason, >> source_id, guest_addr); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> - cword = pci_conf_read16(iommu->intel->drhd->segment, >> - PCI_BUS(source_id), PCI_SLOT(source_id), >> - PCI_FUNC(source_id), PCI_COMMAND); >> - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), >> - PCI_SLOT(source_id), PCI_FUNC(source_id), >> - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> + pci_check_disable_device(iommu->intel->drhd->segment, >> + PCI_BUS(source_id), > PCI_DEVFN2(source_id)); >> >> fault_index++; >> if ( fault_index > cap_num_fault_regs(iommu->cap) ) >> --- a/xen/include/xen/pci.h >> +++ b/xen/include/xen/pci.h >> @@ -64,6 +64,13 @@ struct pci_dev { >> const u8 devfn; >> struct pci_dev_info info; >> struct arch_pci_dev arch; >> + struct { >> + s_time_t time; >> + unsigned int threshold; >> +#define PT_FAULT_THRESHOLD_PRIV 10 >> +#define PT_FAULT_THRESHOLD_UNPRIV 3 >> + unsigned int count; >> + } fault; >> u64 vf_rlen[6]; >> }; >> >> @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); >> struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); >> struct pci_dev *pci_get_pdev_by_domain( >> struct domain *, int seg, int bus, int devfn); >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); >> >> uint8_t pci_conf_read8( >> unsigned int seg, unsigned int bus, unsigned int dev, unsigned int > func, >> >> > >> IOMMU: don't immediately disable bus mastering on faults >> >> Instead, give the owning domain at least a small opportunity of fixing >> things up, and allow for rare faults to not bring down the device at >> all. The amount of faults tolerated within a given time period (all >> numbers are made up with no specific rationale) is higher for Dom0 than >> for DomU-s. >> >> Signed-off-by: Jan Beulich >> >> --- a/xen/drivers/passthrough/amd/iommu_init.c >> +++ b/xen/drivers/passthrough/amd/iommu_init.c >> @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ >> >> static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) >> { >> - u16 domain_id, device_id, bdf, cword, flags; >> + u16 domain_id, device_id, bdf, flags; >> u32 code; >> u64 *addr; >> int count = 0; >> @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct >> "fault address = %#"PRIx64", flags = %#x\n", >> event_str[code-1], domain_id, device_id, *addr, flags); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) >> if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) >> - { >> - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), >> - PCI_SLOT(bdf), PCI_FUNC(bdf), >> - PCI_COMMAND); >> - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), >> - PCI_FUNC(bdf), PCI_COMMAND, >> - cword & ~PCI_COMMAND_MASTER); >> - } >> + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), >> + PCI_DEVFN2(bdf)); >> } >> else >> { >> --- a/xen/drivers/passthrough/iommu.c >> +++ b/xen/drivers/passthrough/iommu.c >> @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b >> static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) >> { >> struct hvm_iommu *hd = domain_hvm_iommu(d); >> + struct pci_dev *pdev; >> int rc = 0; >> >> if ( !iommu_enabled || !hd->platform_ops ) >> @@ -228,6 +229,13 @@ static int assign_device(struct domain * >> return -EXDEV; >> >> spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; >> + pdev->fault.count = 0; >> + } >> + >> if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) >> goto done; >> >> @@ -239,6 +247,8 @@ static int assign_device(struct domain * >> goto done; >> } >> done: >> + if ( pdev && pdev->domain != d ) >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> spin_unlock(&pcidevs_lock); >> return rc; >> } >> @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 >> return ret; >> } >> >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> + pdev->fault.count = 0; >> + >> if ( !has_arch_pdevs(d) && need_iommu(d) ) >> { >> d->need_iommu = 0; >> --- a/xen/drivers/passthrough/pci.c >> +++ b/xen/drivers/passthrough/pci.c >> @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct >> *((u8*) &pdev->bus) = bus; >> *((u8*) &pdev->devfn) = devfn; >> pdev->domain = NULL; >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> INIT_LIST_HEAD(&pdev->msi_list); >> list_add(&pdev->alldevs_list, &pseg->alldevs_list); >> spin_lock_init(&pdev->msix_table_lock); >> @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 >> return 1; >> } >> >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) >> +{ >> + struct pci_dev *pdev; >> + s_time_t now = NOW(); >> + u16 cword; >> + >> + spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + if ( now < pdev->fault.time || >> + now - pdev->fault.time > MILLISECS(10) ) >> + pdev->fault.count >>= 1; >> + pdev->fault.time = now; >> + if ( ++pdev->fault.count < pdev->fault.threshold ) >> + pdev = NULL; >> + } >> + spin_unlock(&pcidevs_lock); >> + >> + if ( !pdev ) >> + return; >> + >> + /* Tell the device to stop DMAing; we can't rely on the guest to >> + * control it for us. */ >> + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND); >> + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> +} >> + >> /* >> * scan pci devices to add all existed PCI devices to alldevs_list, >> * and setup pci hierarchy in array bus2bridge. >> --- a/xen/drivers/passthrough/vtd/iommu.c >> +++ b/xen/drivers/passthrough/vtd/iommu.c >> @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct >> while (1) >> { >> u8 fault_reason; >> - u16 source_id, cword; >> + u16 source_id; >> u32 data; >> u64 guest_addr; >> int type; >> @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct >> iommu_page_fault_do_one(iommu, type, fault_reason, >> source_id, guest_addr); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> - cword = pci_conf_read16(iommu->intel->drhd->segment, >> - PCI_BUS(source_id), PCI_SLOT(source_id), >> - PCI_FUNC(source_id), PCI_COMMAND); >> - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), >> - PCI_SLOT(source_id), PCI_FUNC(source_id), >> - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> + pci_check_disable_device(iommu->intel->drhd->segment, >> + PCI_BUS(source_id), > PCI_DEVFN2(source_id)); >> >> fault_index++; >> if ( fault_index > cap_num_fault_regs(iommu->cap) ) >> --- a/xen/include/xen/pci.h >> +++ b/xen/include/xen/pci.h >> @@ -64,6 +64,13 @@ struct pci_dev { >> const u8 devfn; >> struct pci_dev_info info; >> struct arch_pci_dev arch; >> + struct { >> + s_time_t time; >> + unsigned int threshold; >> +#define PT_FAULT_THRESHOLD_PRIV 10 >> +#define PT_FAULT_THRESHOLD_UNPRIV 3 >> + unsigned int count; >> + } fault; >> u64 vf_rlen[6]; >> }; >> >> @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); >> struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); >> struct pci_dev *pci_get_pdev_by_domain( >> struct domain *, int seg, int bus, int devfn); >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); >> >> uint8_t pci_conf_read8( >> unsigned int seg, unsigned int bus, unsigned int dev, unsigned int > func, _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:46:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:46:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSQy-0007gC-SP; Thu, 08 Nov 2012 13:46:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSQw-0007g7-Q5 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:46:15 +0000 Received: from [85.158.139.83:13954] by server-11.bemta-5.messagelabs.com id F4/97-03409-6A7BB905; Thu, 08 Nov 2012 13:46:14 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352382372!29641358!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7433 invoked from network); 8 Nov 2012 13:46:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-182.messagelabs.com with SMTP; 8 Nov 2012 13:46:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:46:12 +0000 Message-Id: <509BC5B402000078000A7396@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:46:12 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> <20121108124633.GF76638@ocelot.phlegethon.org> In-Reply-To: <20121108124633.GF76638@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 13:46, Tim Deegan wrote: > At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: >> Instead, give the owning domain at least a small opportunity of fixing >> things up, and allow for rare faults to not bring down the device at >> all. The amount of faults tolerated within a given time period (all >> numbers are made up with no specific rationale) is higher for Dom0 than >> for DomU-s. >> >> Signed-off-by: Jan Beulich > > Looks good to me, though I don't think dom0 should have any special > treatment here. I'd be inclined to set the threshold to 10 for > everyone. No problem. I'll wait for the IOMMU folks to give some feedback, and either re-submit (if further changes are requested), or commit with their acks (and the change as you suggest, if they're in agreement). Of course, if they disagree we'll have to get to a common position anyway first. If no other changes are requested, do I take the above as an "ack-with-that-change"? Jan >> --- a/xen/drivers/passthrough/amd/iommu_init.c >> +++ b/xen/drivers/passthrough/amd/iommu_init.c >> @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ >> >> static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) >> { >> - u16 domain_id, device_id, bdf, cword, flags; >> + u16 domain_id, device_id, bdf, flags; >> u32 code; >> u64 *addr; >> int count = 0; >> @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct >> "fault address = %#"PRIx64", flags = %#x\n", >> event_str[code-1], domain_id, device_id, *addr, flags); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) >> if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) >> - { >> - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), >> - PCI_SLOT(bdf), PCI_FUNC(bdf), >> - PCI_COMMAND); >> - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), >> - PCI_FUNC(bdf), PCI_COMMAND, >> - cword & ~PCI_COMMAND_MASTER); >> - } >> + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), >> + PCI_DEVFN2(bdf)); >> } >> else >> { >> --- a/xen/drivers/passthrough/iommu.c >> +++ b/xen/drivers/passthrough/iommu.c >> @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b >> static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) >> { >> struct hvm_iommu *hd = domain_hvm_iommu(d); >> + struct pci_dev *pdev; >> int rc = 0; >> >> if ( !iommu_enabled || !hd->platform_ops ) >> @@ -228,6 +229,13 @@ static int assign_device(struct domain * >> return -EXDEV; >> >> spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; >> + pdev->fault.count = 0; >> + } >> + >> if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) >> goto done; >> >> @@ -239,6 +247,8 @@ static int assign_device(struct domain * >> goto done; >> } >> done: >> + if ( pdev && pdev->domain != d ) >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> spin_unlock(&pcidevs_lock); >> return rc; >> } >> @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 >> return ret; >> } >> >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> + pdev->fault.count = 0; >> + >> if ( !has_arch_pdevs(d) && need_iommu(d) ) >> { >> d->need_iommu = 0; >> --- a/xen/drivers/passthrough/pci.c >> +++ b/xen/drivers/passthrough/pci.c >> @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct >> *((u8*) &pdev->bus) = bus; >> *((u8*) &pdev->devfn) = devfn; >> pdev->domain = NULL; >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> INIT_LIST_HEAD(&pdev->msi_list); >> list_add(&pdev->alldevs_list, &pseg->alldevs_list); >> spin_lock_init(&pdev->msix_table_lock); >> @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 >> return 1; >> } >> >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) >> +{ >> + struct pci_dev *pdev; >> + s_time_t now = NOW(); >> + u16 cword; >> + >> + spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + if ( now < pdev->fault.time || >> + now - pdev->fault.time > MILLISECS(10) ) >> + pdev->fault.count >>= 1; >> + pdev->fault.time = now; >> + if ( ++pdev->fault.count < pdev->fault.threshold ) >> + pdev = NULL; >> + } >> + spin_unlock(&pcidevs_lock); >> + >> + if ( !pdev ) >> + return; >> + >> + /* Tell the device to stop DMAing; we can't rely on the guest to >> + * control it for us. */ >> + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND); >> + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> +} >> + >> /* >> * scan pci devices to add all existed PCI devices to alldevs_list, >> * and setup pci hierarchy in array bus2bridge. >> --- a/xen/drivers/passthrough/vtd/iommu.c >> +++ b/xen/drivers/passthrough/vtd/iommu.c >> @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct >> while (1) >> { >> u8 fault_reason; >> - u16 source_id, cword; >> + u16 source_id; >> u32 data; >> u64 guest_addr; >> int type; >> @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct >> iommu_page_fault_do_one(iommu, type, fault_reason, >> source_id, guest_addr); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> - cword = pci_conf_read16(iommu->intel->drhd->segment, >> - PCI_BUS(source_id), PCI_SLOT(source_id), >> - PCI_FUNC(source_id), PCI_COMMAND); >> - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), >> - PCI_SLOT(source_id), PCI_FUNC(source_id), >> - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> + pci_check_disable_device(iommu->intel->drhd->segment, >> + PCI_BUS(source_id), > PCI_DEVFN2(source_id)); >> >> fault_index++; >> if ( fault_index > cap_num_fault_regs(iommu->cap) ) >> --- a/xen/include/xen/pci.h >> +++ b/xen/include/xen/pci.h >> @@ -64,6 +64,13 @@ struct pci_dev { >> const u8 devfn; >> struct pci_dev_info info; >> struct arch_pci_dev arch; >> + struct { >> + s_time_t time; >> + unsigned int threshold; >> +#define PT_FAULT_THRESHOLD_PRIV 10 >> +#define PT_FAULT_THRESHOLD_UNPRIV 3 >> + unsigned int count; >> + } fault; >> u64 vf_rlen[6]; >> }; >> >> @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); >> struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); >> struct pci_dev *pci_get_pdev_by_domain( >> struct domain *, int seg, int bus, int devfn); >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); >> >> uint8_t pci_conf_read8( >> unsigned int seg, unsigned int bus, unsigned int dev, unsigned int > func, >> >> > >> IOMMU: don't immediately disable bus mastering on faults >> >> Instead, give the owning domain at least a small opportunity of fixing >> things up, and allow for rare faults to not bring down the device at >> all. The amount of faults tolerated within a given time period (all >> numbers are made up with no specific rationale) is higher for Dom0 than >> for DomU-s. >> >> Signed-off-by: Jan Beulich >> >> --- a/xen/drivers/passthrough/amd/iommu_init.c >> +++ b/xen/drivers/passthrough/amd/iommu_init.c >> @@ -566,7 +566,7 @@ static hw_irq_controller iommu_maskable_ >> >> static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) >> { >> - u16 domain_id, device_id, bdf, cword, flags; >> + u16 domain_id, device_id, bdf, flags; >> u32 code; >> u64 *addr; >> int count = 0; >> @@ -620,18 +620,10 @@ static void parse_event_log_entry(struct >> "fault address = %#"PRIx64", flags = %#x\n", >> event_str[code-1], domain_id, device_id, *addr, flags); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) >> if ( get_dma_requestor_id(iommu->seg, bdf) == device_id ) >> - { >> - cword = pci_conf_read16(iommu->seg, PCI_BUS(bdf), >> - PCI_SLOT(bdf), PCI_FUNC(bdf), >> - PCI_COMMAND); >> - pci_conf_write16(iommu->seg, PCI_BUS(bdf), PCI_SLOT(bdf), >> - PCI_FUNC(bdf), PCI_COMMAND, >> - cword & ~PCI_COMMAND_MASTER); >> - } >> + pci_check_disable_device(iommu->seg, PCI_BUS(bdf), >> + PCI_DEVFN2(bdf)); >> } >> else >> { >> --- a/xen/drivers/passthrough/iommu.c >> +++ b/xen/drivers/passthrough/iommu.c >> @@ -215,6 +215,7 @@ static int device_assigned(u16 seg, u8 b >> static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn) >> { >> struct hvm_iommu *hd = domain_hvm_iommu(d); >> + struct pci_dev *pdev; >> int rc = 0; >> >> if ( !iommu_enabled || !hd->platform_ops ) >> @@ -228,6 +229,13 @@ static int assign_device(struct domain * >> return -EXDEV; >> >> spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_UNPRIV; >> + pdev->fault.count = 0; >> + } >> + >> if ( (rc = hd->platform_ops->assign_device(d, seg, bus, devfn)) ) >> goto done; >> >> @@ -239,6 +247,8 @@ static int assign_device(struct domain * >> goto done; >> } >> done: >> + if ( pdev && pdev->domain != d ) >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> spin_unlock(&pcidevs_lock); >> return rc; >> } >> @@ -379,6 +389,9 @@ int deassign_device(struct domain *d, u1 >> return ret; >> } >> >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> + pdev->fault.count = 0; >> + >> if ( !has_arch_pdevs(d) && need_iommu(d) ) >> { >> d->need_iommu = 0; >> --- a/xen/drivers/passthrough/pci.c >> +++ b/xen/drivers/passthrough/pci.c >> @@ -137,6 +137,7 @@ static struct pci_dev *alloc_pdev(struct >> *((u8*) &pdev->bus) = bus; >> *((u8*) &pdev->devfn) = devfn; >> pdev->domain = NULL; >> + pdev->fault.threshold = PT_FAULT_THRESHOLD_PRIV; >> INIT_LIST_HEAD(&pdev->msi_list); >> list_add(&pdev->alldevs_list, &pseg->alldevs_list); >> spin_lock_init(&pdev->msix_table_lock); >> @@ -672,6 +673,36 @@ int __init pci_device_detect(u16 seg, u8 >> return 1; >> } >> >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn) >> +{ >> + struct pci_dev *pdev; >> + s_time_t now = NOW(); >> + u16 cword; >> + >> + spin_lock(&pcidevs_lock); >> + pdev = pci_get_pdev(seg, bus, devfn); >> + if ( pdev ) >> + { >> + if ( now < pdev->fault.time || >> + now - pdev->fault.time > MILLISECS(10) ) >> + pdev->fault.count >>= 1; >> + pdev->fault.time = now; >> + if ( ++pdev->fault.count < pdev->fault.threshold ) >> + pdev = NULL; >> + } >> + spin_unlock(&pcidevs_lock); >> + >> + if ( !pdev ) >> + return; >> + >> + /* Tell the device to stop DMAing; we can't rely on the guest to >> + * control it for us. */ >> + cword = pci_conf_read16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND); >> + pci_conf_write16(seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), >> + PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> +} >> + >> /* >> * scan pci devices to add all existed PCI devices to alldevs_list, >> * and setup pci hierarchy in array bus2bridge. >> --- a/xen/drivers/passthrough/vtd/iommu.c >> +++ b/xen/drivers/passthrough/vtd/iommu.c >> @@ -917,7 +917,7 @@ static void __do_iommu_page_fault(struct >> while (1) >> { >> u8 fault_reason; >> - u16 source_id, cword; >> + u16 source_id; >> u32 data; >> u64 guest_addr; >> int type; >> @@ -950,14 +950,8 @@ static void __do_iommu_page_fault(struct >> iommu_page_fault_do_one(iommu, type, fault_reason, >> source_id, guest_addr); >> >> - /* Tell the device to stop DMAing; we can't rely on the guest to >> - * control it for us. */ >> - cword = pci_conf_read16(iommu->intel->drhd->segment, >> - PCI_BUS(source_id), PCI_SLOT(source_id), >> - PCI_FUNC(source_id), PCI_COMMAND); >> - pci_conf_write16(iommu->intel->drhd->segment, PCI_BUS(source_id), >> - PCI_SLOT(source_id), PCI_FUNC(source_id), >> - PCI_COMMAND, cword & ~PCI_COMMAND_MASTER); >> + pci_check_disable_device(iommu->intel->drhd->segment, >> + PCI_BUS(source_id), > PCI_DEVFN2(source_id)); >> >> fault_index++; >> if ( fault_index > cap_num_fault_regs(iommu->cap) ) >> --- a/xen/include/xen/pci.h >> +++ b/xen/include/xen/pci.h >> @@ -64,6 +64,13 @@ struct pci_dev { >> const u8 devfn; >> struct pci_dev_info info; >> struct arch_pci_dev arch; >> + struct { >> + s_time_t time; >> + unsigned int threshold; >> +#define PT_FAULT_THRESHOLD_PRIV 10 >> +#define PT_FAULT_THRESHOLD_UNPRIV 3 >> + unsigned int count; >> + } fault; >> u64 vf_rlen[6]; >> }; >> >> @@ -107,6 +114,7 @@ int pci_hide_device(int bus, int devfn); >> struct pci_dev *pci_get_pdev(int seg, int bus, int devfn); >> struct pci_dev *pci_get_pdev_by_domain( >> struct domain *, int seg, int bus, int devfn); >> +void pci_check_disable_device(u16 seg, u8 bus, u8 devfn); >> >> uint8_t pci_conf_read8( >> unsigned int seg, unsigned int bus, unsigned int dev, unsigned int > func, _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:48:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:48:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSSX-0007kF-Bi; Thu, 08 Nov 2012 13:47:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSSW-0007k9-N7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:47:52 +0000 Received: from [85.158.139.83:36348] by server-16.bemta-5.messagelabs.com id 73/45-04786-708BB905; Thu, 08 Nov 2012 13:47:51 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352382471!29641660!1 X-Originating-IP: [193.222.81.100] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMDAgPT4gOTk5OTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14964 invoked from network); 8 Nov 2012 13:47:51 -0000 Received: from outmail100.swisscom.com (HELO mail.swisscom.com) (193.222.81.100) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:47:51 -0000 Received: by mail.swisscom.com; Thu, 8 Nov 2012 14:47:27 +0100 From: To: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQAEnBqAAAkCjQAAIYFoAAAKGgkA Date: Thu, 8 Nov 2012 13:47:26 +0000 Message-ID: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, JBeulich@suse.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Mauro, that's a question for you : > Philippe, could you clarify again what CPU model(s) this is being observed on > (the long times between individual steps forward with this problem perhaps > warrant repeating the basics each time, as it's otherwise quite cumbersome > to always look up old pieces of information). can you provide this information ? cat /proc/cpuinfo cat /proc/meminfo hardware information (manufacturer, model, urls, ...) Thanks, Philippe > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Thursday, November 08, 2012 10:40 AM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > devel@lists.xen.org > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > minutes" bug. > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > plt_wrap=5ece12d09306 > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > >>>> tsc_stamp=e3839fcb0273 > >>> > >>> (below is the complete xm dmesg output) > >>> > >>> did that help you ? do you need more info ? > >> > >> I'll leave this to Keir (who wrote the debugging patch) to answer but > >> it looks to me like it should be useful! > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which should > > be impossible. plt_stamp64 oddly has low 32 bits identical to > > new_stamp. That seems very very improbable! > > Is it? My understanding was that plt_stamp64 is just a software extension to > the more narrow HW counter, and hence the low plt_mask bits would always > be expected to be identical. > > The plt_wrap < plt_now thing of course is entirely unexplainable to me too: > Considering that plt_scale doesn't change at all post- boot, apart from > memory corruption I could only see an memory access ordering problem to > be the reason (platform_timer_stamp and/or stime_platform_stamp > changing despite platform_timer_lock being held. So maybe taking a > snapshot of all three static values involved in the calculation in > __read_platform_stime() between acquiring the lock and the first call to > __read_platform_stime(), and printing them together with the "live" values > in a second > printk() after the one your original patch added could rule that out. > > But the box doesn't even seem to be NUMA (of course it also doesn't help > that the log level was kept restricted - hint, hint, Philippe), not does there > appear to be any S3 cycle or pCPU bring-up/-down in between... > > Philippe, could you clarify again what CPU model(s) this is being observed on > (the long times between individual steps forward with this problem perhaps > warrant repeating the basics each time, as it's otherwise quite cumbersome > to always look up old pieces of information). > > > I wonder whether the overflow handling should just be removed, or made > > conditional on a command-line parameter, or on the 32-bit platform > > counter being at least somewhat likely to overflow before a softirq > > occurs -- it seems lots of systems are using 14MHz HPET, and that > > gives us a couple of minutes for the plt_overflow softirq to do its work > before overflow occurs. > > I think we would notice that outage in other ways. :) > > Iirc we added this for a good reason - to cover the, however unlikely, event > of Xen running for very long without preemption. > Presumably most of the cases got fixed meanwhile, and indeed a > wraparound time on the order of minutes should make this superfluous, but > as the case here shows that code did spot a severe anomaly (whatever that > may turn out to be). > > Also recall that there are HPET implementations around that tick at a much > higher frequency than 14MHz. > > So unless we finally reach the understanding that the code is flawed, I would > rather want to keep it. > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:48:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:48:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSSX-0007kF-Bi; Thu, 08 Nov 2012 13:47:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSSW-0007k9-N7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:47:52 +0000 Received: from [85.158.139.83:36348] by server-16.bemta-5.messagelabs.com id 73/45-04786-708BB905; Thu, 08 Nov 2012 13:47:51 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352382471!29641660!1 X-Originating-IP: [193.222.81.100] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMDAgPT4gOTk5OTk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14964 invoked from network); 8 Nov 2012 13:47:51 -0000 Received: from outmail100.swisscom.com (HELO mail.swisscom.com) (193.222.81.100) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 13:47:51 -0000 Received: by mail.swisscom.com; Thu, 8 Nov 2012 14:47:27 +0100 From: To: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQAEnBqAAAkCjQAAIYFoAAAKGgkA Date: Thu, 8 Nov 2012 13:47:26 +0000 Message-ID: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, JBeulich@suse.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi Mauro, that's a question for you : > Philippe, could you clarify again what CPU model(s) this is being observed on > (the long times between individual steps forward with this problem perhaps > warrant repeating the basics each time, as it's otherwise quite cumbersome > to always look up old pieces of information). can you provide this information ? cat /proc/cpuinfo cat /proc/meminfo hardware information (manufacturer, model, urls, ...) Thanks, Philippe > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Thursday, November 08, 2012 10:40 AM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > devel@lists.xen.org > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > minutes" bug. > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > plt_wrap=5ece12d09306 > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > >>>> tsc_stamp=e3839fcb0273 > >>> > >>> (below is the complete xm dmesg output) > >>> > >>> did that help you ? do you need more info ? > >> > >> I'll leave this to Keir (who wrote the debugging patch) to answer but > >> it looks to me like it should be useful! > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which should > > be impossible. plt_stamp64 oddly has low 32 bits identical to > > new_stamp. That seems very very improbable! > > Is it? My understanding was that plt_stamp64 is just a software extension to > the more narrow HW counter, and hence the low plt_mask bits would always > be expected to be identical. > > The plt_wrap < plt_now thing of course is entirely unexplainable to me too: > Considering that plt_scale doesn't change at all post- boot, apart from > memory corruption I could only see an memory access ordering problem to > be the reason (platform_timer_stamp and/or stime_platform_stamp > changing despite platform_timer_lock being held. So maybe taking a > snapshot of all three static values involved in the calculation in > __read_platform_stime() between acquiring the lock and the first call to > __read_platform_stime(), and printing them together with the "live" values > in a second > printk() after the one your original patch added could rule that out. > > But the box doesn't even seem to be NUMA (of course it also doesn't help > that the log level was kept restricted - hint, hint, Philippe), not does there > appear to be any S3 cycle or pCPU bring-up/-down in between... > > Philippe, could you clarify again what CPU model(s) this is being observed on > (the long times between individual steps forward with this problem perhaps > warrant repeating the basics each time, as it's otherwise quite cumbersome > to always look up old pieces of information). > > > I wonder whether the overflow handling should just be removed, or made > > conditional on a command-line parameter, or on the 32-bit platform > > counter being at least somewhat likely to overflow before a softirq > > occurs -- it seems lots of systems are using 14MHz HPET, and that > > gives us a couple of minutes for the plt_overflow softirq to do its work > before overflow occurs. > > I think we would notice that outage in other ways. :) > > Iirc we added this for a good reason - to cover the, however unlikely, event > of Xen running for very long without preemption. > Presumably most of the cases got fixed meanwhile, and indeed a > wraparound time on the order of minutes should make this superfluous, but > as the case here shows that code did spot a severe anomaly (whatever that > may turn out to be). > > Also recall that there are HPET implementations around that tick at a much > higher frequency than 14MHz. > > So unless we finally reach the understanding that the code is flawed, I would > rather want to keep it. > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:49:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:49:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSTc-0007pd-Pu; Thu, 08 Nov 2012 13:49:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSTb-0007pS-O7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:48:59 +0000 Received: from [85.158.138.51:28835] by server-10.bemta-3.messagelabs.com id 5C/78-19806-648BB905; Thu, 08 Nov 2012 13:48:54 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1352382533!29228141!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30167 invoked from network); 8 Nov 2012 13:48:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-174.messagelabs.com with SMTP; 8 Nov 2012 13:48:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:48:53 +0000 Message-Id: <509BC65402000078000A73A4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:48:52 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 11:50, Keir Fraser wrote: > On 08/11/2012 09:47, "Jan Beulich" wrote: >> The only thing that indeed is - on non-preemptible kernels - done >> only on exit to user mode is the eventual entering of the scheduler. > > That alone may still be an argument for restricting the batch size from the > toolstack? Yes, this clearly prohibits unlimited batches. But not being able to schedule should be less restrictive than not being able to run softirqs, so I'd still put under question whether the limit shouldn't be bumped. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:49:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:49:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSTc-0007pd-Pu; Thu, 08 Nov 2012 13:49:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSTb-0007pS-O7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:48:59 +0000 Received: from [85.158.138.51:28835] by server-10.bemta-3.messagelabs.com id 5C/78-19806-648BB905; Thu, 08 Nov 2012 13:48:54 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1352382533!29228141!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30167 invoked from network); 8 Nov 2012 13:48:53 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-174.messagelabs.com with SMTP; 8 Nov 2012 13:48:53 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:48:53 +0000 Message-Id: <509BC65402000078000A73A4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:48:52 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , Dan Magenheimer , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 11:50, Keir Fraser wrote: > On 08/11/2012 09:47, "Jan Beulich" wrote: >> The only thing that indeed is - on non-preemptible kernels - done >> only on exit to user mode is the eventual entering of the scheduler. > > That alone may still be an argument for restricting the batch size from the > toolstack? Yes, this clearly prohibits unlimited batches. But not being able to schedule should be less restrictive than not being able to run softirqs, so I'd still put under question whether the limit shouldn't be bumped. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:53:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:53:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSXy-00087t-MO; Thu, 08 Nov 2012 13:53:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSXx-00087n-0e for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:53:29 +0000 Received: from [193.109.254.147:27553] by server-1.bemta-14.messagelabs.com id 21/D7-25314-859BB905; Thu, 08 Nov 2012 13:53:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1352382807!3251118!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15159 invoked from network); 8 Nov 2012 13:53:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-27.messagelabs.com with SMTP; 8 Nov 2012 13:53:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:53:26 +0000 Message-Id: <509BC76602000078000A73C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:53:26 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B8BF802000078000A72A3@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 11:38, Keir Fraser wrote: > On 08/11/2012 09:39, "Jan Beulich" wrote: > >>>>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>>>> tsc_stamp=e3839fcb0273 >>>>> >>>>> (below is the complete xm dmesg output) >>>>> >>>>> did that help you ? do you need more info ? >>>> >>>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>>> looks to me like it should be useful! >>> >>> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >>> impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That >>> seems very very improbable! >> >> Is it? My understanding was that plt_stamp64 is just a software >> extension to the more narrow HW counter, and hence the low >> plt_mask bits would always be expected to be identical. > > No, plt_stamp is simply the HW counter time at which plt_stamp64 was last > brought up to date. Hence plt_stamp64 is updated as: > plt_stamp64 += (new_stamp - old_stamp) & plt_mask; I concur: Given that what old_stamp is here was new_stamp for the last update, we should simply have stamp64 = s0 + (s1 - s0) + (s2 - s1) + ... (of course with the mask applied on each addend), which (for the low bits) is the same as just new_stamp. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 13:53:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 13:53:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSXy-00087t-MO; Thu, 08 Nov 2012 13:53:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSXx-00087n-0e for xen-devel@lists.xen.org; Thu, 08 Nov 2012 13:53:29 +0000 Received: from [193.109.254.147:27553] by server-1.bemta-14.messagelabs.com id 21/D7-25314-859BB905; Thu, 08 Nov 2012 13:53:28 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1352382807!3251118!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15159 invoked from network); 8 Nov 2012 13:53:27 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-27.messagelabs.com with SMTP; 8 Nov 2012 13:53:27 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 13:53:26 +0000 Message-Id: <509BC76602000078000A73C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 13:53:26 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509B8BF802000078000A72A3@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 11:38, Keir Fraser wrote: > On 08/11/2012 09:39, "Jan Beulich" wrote: > >>>>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>>>> tsc_stamp=e3839fcb0273 >>>>> >>>>> (below is the complete xm dmesg output) >>>>> >>>>> did that help you ? do you need more info ? >>>> >>>> I'll leave this to Keir (who wrote the debugging patch) to answer but it >>>> looks to me like it should be useful! >>> >>> I'm scratching my head. plt_wrap is earlier than plt_now, which should be >>> impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That >>> seems very very improbable! >> >> Is it? My understanding was that plt_stamp64 is just a software >> extension to the more narrow HW counter, and hence the low >> plt_mask bits would always be expected to be identical. > > No, plt_stamp is simply the HW counter time at which plt_stamp64 was last > brought up to date. Hence plt_stamp64 is updated as: > plt_stamp64 += (new_stamp - old_stamp) & plt_mask; I concur: Given that what old_stamp is here was new_stamp for the last update, we should simply have stamp64 = s0 + (s1 - s0) + (s2 - s1) + ... (of course with the mask applied on each addend), which (for the low bits) is the same as just new_stamp. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:05:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:05:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSj9-0008Mo-SE; Thu, 08 Nov 2012 14:05:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSj9-0008Mj-1G for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:05:03 +0000 Received: from [85.158.139.211:16815] by server-9.bemta-5.messagelabs.com id 38/4D-29295-E0CBB905; Thu, 08 Nov 2012 14:05:02 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352383501!19352403!1 X-Originating-IP: [74.125.82.41] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9406 invoked from network); 8 Nov 2012 14:05:01 -0000 Received: from mail-wg0-f41.google.com (HELO mail-wg0-f41.google.com) (74.125.82.41) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:05:01 -0000 Received: by mail-wg0-f41.google.com with SMTP id ds1so3901709wgb.2 for ; Thu, 08 Nov 2012 06:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=zK0Kf+iHbT+UnN2E9BFQzqHfYHyI9pR4G1wAaDlWqLE=; b=WwWmubzSAtQhUb7cBlO8zav7bqBzJr/xI6jQR/9l3ua54+M3uquIkfdncQpfg1Mmvu L930tCo9aovVaxtawuiNIs7ruXEiGsILYs5wo4cjisRx3pv/PUjtvTKjo5VJwOPezR7r fgTbCxQ0E7vvh1iZHl1taMvt9FwU/HrYodWgaZf2Tc+eY2CnvQUalj1p/NZtrjH4pOyi 1Evck3yqyDYumY1m+mfM1mQ2j8hpk/VPe80xxMXGLGyJu2g1OO6Vo0uzF4n+1XAKQf4x wSq7UPi4oLczI6QjoaLyw7HFSeY4eVmgBRKNKXpbyudGUZZ7diSz2Qq8DoVCVOpUEkN6 dflw== Received: by 10.180.94.169 with SMTP id dd9mr29799265wib.14.1352383501116; Thu, 08 Nov 2012 06:05:01 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hv4sm7496330wib.0.2012.11.08.06.04.59 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:05:00 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:04:52 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29ugWmob2jFIUQk0yctPCf+qhDzQ== In-Reply-To: <509BC76602000078000A73C7@nat28.tlf.novell.com> Mime-version: 1.0 Cc: Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 13:53, "Jan Beulich" wrote: >>> Is it? My understanding was that plt_stamp64 is just a software >>> extension to the more narrow HW counter, and hence the low >>> plt_mask bits would always be expected to be identical. >> >> No, plt_stamp is simply the HW counter time at which plt_stamp64 was last >> brought up to date. Hence plt_stamp64 is updated as: >> plt_stamp64 += (new_stamp - old_stamp) & plt_mask; > > I concur Well, no, you don't really. You're about to point out the flaw in my reasoning... > : Given that what old_stamp is here was new_stamp for > the last update, we should simply have > > stamp64 = s0 + (s1 - s0) + (s2 - s1) + ... > > (of course with the mask applied on each addend), which (for the > low bits) is the same as just new_stamp. Very good point. Silly me. Then the observed value of plt_stamp64 makes perfect sense. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:05:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:05:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSj9-0008Mo-SE; Thu, 08 Nov 2012 14:05:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSj9-0008Mj-1G for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:05:03 +0000 Received: from [85.158.139.211:16815] by server-9.bemta-5.messagelabs.com id 38/4D-29295-E0CBB905; Thu, 08 Nov 2012 14:05:02 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352383501!19352403!1 X-Originating-IP: [74.125.82.41] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9406 invoked from network); 8 Nov 2012 14:05:01 -0000 Received: from mail-wg0-f41.google.com (HELO mail-wg0-f41.google.com) (74.125.82.41) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:05:01 -0000 Received: by mail-wg0-f41.google.com with SMTP id ds1so3901709wgb.2 for ; Thu, 08 Nov 2012 06:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=zK0Kf+iHbT+UnN2E9BFQzqHfYHyI9pR4G1wAaDlWqLE=; b=WwWmubzSAtQhUb7cBlO8zav7bqBzJr/xI6jQR/9l3ua54+M3uquIkfdncQpfg1Mmvu L930tCo9aovVaxtawuiNIs7ruXEiGsILYs5wo4cjisRx3pv/PUjtvTKjo5VJwOPezR7r fgTbCxQ0E7vvh1iZHl1taMvt9FwU/HrYodWgaZf2Tc+eY2CnvQUalj1p/NZtrjH4pOyi 1Evck3yqyDYumY1m+mfM1mQ2j8hpk/VPe80xxMXGLGyJu2g1OO6Vo0uzF4n+1XAKQf4x wSq7UPi4oLczI6QjoaLyw7HFSeY4eVmgBRKNKXpbyudGUZZ7diSz2Qq8DoVCVOpUEkN6 dflw== Received: by 10.180.94.169 with SMTP id dd9mr29799265wib.14.1352383501116; Thu, 08 Nov 2012 06:05:01 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id hv4sm7496330wib.0.2012.11.08.06.04.59 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:05:00 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:04:52 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29ugWmob2jFIUQk0yctPCf+qhDzQ== In-Reply-To: <509BC76602000078000A73C7@nat28.tlf.novell.com> Mime-version: 1.0 Cc: Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 13:53, "Jan Beulich" wrote: >>> Is it? My understanding was that plt_stamp64 is just a software >>> extension to the more narrow HW counter, and hence the low >>> plt_mask bits would always be expected to be identical. >> >> No, plt_stamp is simply the HW counter time at which plt_stamp64 was last >> brought up to date. Hence plt_stamp64 is updated as: >> plt_stamp64 += (new_stamp - old_stamp) & plt_mask; > > I concur Well, no, you don't really. You're about to point out the flaw in my reasoning... > : Given that what old_stamp is here was new_stamp for > the last update, we should simply have > > stamp64 = s0 + (s1 - s0) + (s2 - s1) + ... > > (of course with the mask applied on each addend), which (for the > low bits) is the same as just new_stamp. Very good point. Silly me. Then the observed value of plt_stamp64 makes perfect sense. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:20:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:20:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSyA-0000Aa-2k; Thu, 08 Nov 2012 14:20:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSy8-0000AQ-BT for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:20:32 +0000 Received: from [85.158.143.99:32280] by server-3.bemta-4.messagelabs.com id 9B/F0-06841-FAFBB905; Thu, 08 Nov 2012 14:20:31 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352384430!28583181!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5928 invoked from network); 8 Nov 2012 14:20:30 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:20:30 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so964845wib.14 for ; Thu, 08 Nov 2012 06:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=3u5WtJh4ciLB70YlAZWI0wRreH7uVHkBda3/nZcLpa4=; b=NV5V8o6tcFrkkFHrWlBZhf7jmt3neeaj4MUOdpc/9+VNj5v6eXKkiU/CsShqytLlq9 umM2JyA5ZvNXKdDNMMC5mJWF6lormyrvpGCvNgUzanbkbvwkMQdL8tNRxhkJuGlGIbB1 z6Miukq1yzE0tq15u1hPpyLFnb19hiKeQYhlbjIF5VqJjpXkD/ybaWhXBegQk8H+ldjV CeWJwdslt8OMYPTcb9u9btgAvnkMKdY6HYUsR2Mh21TVtQ1BTh9R11ZcvMjJJnLe4pDT SLzxNBUqJ3zc2N179ZY/UjLUHLDGI28kQ9PMooG2OMcAZhmR9h3UEjiurnrVPupQME/0 ey/w== Received: by 10.180.101.165 with SMTP id fh5mr13610412wib.7.1352384429839; Thu, 08 Nov 2012 06:20:29 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fg6sm7538939wib.3.2012.11.08.06.20.26 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:20:29 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:20:14 +0000 From: Keir Fraser To: Ian Campbell , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29DvrjqeBG3H6QAUStnBaJP3k+kwArTBTs In-Reply-To: Mime-version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 17:40, "Keir Fraser" wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>> tsc_stamp=e3839fcb0273 >>> >>> (below is the complete xm dmesg output) >>> >>> did that help you ? do you need more info ? >> >> I'll leave this to Keir (who wrote the debugging patch) to answer but it >> looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Jan has pointed out that the value of plt_stamp64 makes perfect sense, and will in fact always have low 32 bits identical to new_stamp. At least that is explained. So, the question is then why plt_now (== __read_platform_stime(15b800366a5)) is greater than plt_wrap (== __read_platform_stime(15c800366a5)). Perhaps the scale_delta() logic is failing for some reason, but we do use it a lot elsewhere! -- Keir > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) > > -- Keir > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:20:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:20:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSyA-0000Aa-2k; Thu, 08 Nov 2012 14:20:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWSy8-0000AQ-BT for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:20:32 +0000 Received: from [85.158.143.99:32280] by server-3.bemta-4.messagelabs.com id 9B/F0-06841-FAFBB905; Thu, 08 Nov 2012 14:20:31 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352384430!28583181!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5928 invoked from network); 8 Nov 2012 14:20:30 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:20:30 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so964845wib.14 for ; Thu, 08 Nov 2012 06:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=3u5WtJh4ciLB70YlAZWI0wRreH7uVHkBda3/nZcLpa4=; b=NV5V8o6tcFrkkFHrWlBZhf7jmt3neeaj4MUOdpc/9+VNj5v6eXKkiU/CsShqytLlq9 umM2JyA5ZvNXKdDNMMC5mJWF6lormyrvpGCvNgUzanbkbvwkMQdL8tNRxhkJuGlGIbB1 z6Miukq1yzE0tq15u1hPpyLFnb19hiKeQYhlbjIF5VqJjpXkD/ybaWhXBegQk8H+ldjV CeWJwdslt8OMYPTcb9u9btgAvnkMKdY6HYUsR2Mh21TVtQ1BTh9R11ZcvMjJJnLe4pDT SLzxNBUqJ3zc2N179ZY/UjLUHLDGI28kQ9PMooG2OMcAZhmR9h3UEjiurnrVPupQME/0 ey/w== Received: by 10.180.101.165 with SMTP id fh5mr13610412wib.7.1352384429839; Thu, 08 Nov 2012 06:20:29 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id fg6sm7538939wib.3.2012.11.08.06.20.26 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:20:29 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:20:14 +0000 From: Keir Fraser To: Ian Campbell , Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29DvrjqeBG3H6QAUStnBaJP3k+kwArTBTs In-Reply-To: Mime-version: 1.0 Cc: 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 07/11/2012 17:40, "Keir Fraser" wrote: > On 07/11/2012 13:22, "Ian Campbell" wrote: > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 plt_wrap=5ece12d09306 >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 >>>> tsc_stamp=e3839fcb0273 >>> >>> (below is the complete xm dmesg output) >>> >>> did that help you ? do you need more info ? >> >> I'll leave this to Keir (who wrote the debugging patch) to answer but it >> looks to me like it should be useful! > > I'm scratching my head. plt_wrap is earlier than plt_now, which should be > impossible. plt_stamp64 oddly has low 32 bits identical to new_stamp. That > seems very very improbable! Jan has pointed out that the value of plt_stamp64 makes perfect sense, and will in fact always have low 32 bits identical to new_stamp. At least that is explained. So, the question is then why plt_now (== __read_platform_stime(15b800366a5)) is greater than plt_wrap (== __read_platform_stime(15c800366a5)). Perhaps the scale_delta() logic is failing for some reason, but we do use it a lot elsewhere! -- Keir > I wonder whether the overflow handling should just be removed, or made > conditional on a command-line parameter, or on the 32-bit platform counter > being at least somewhat likely to overflow before a softirq occurs -- it > seems lots of systems are using 14MHz HPET, and that gives us a couple of > minutes for the plt_overflow softirq to do its work before overflow occurs. > I think we would notice that outage in other ways. :) > > -- Keir > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:23:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT0g-0000Gv-Ko; Thu, 08 Nov 2012 14:23:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT0f-0000Gq-Nw for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:23:09 +0000 Received: from [85.158.139.83:10147] by server-11.bemta-5.messagelabs.com id 9B/79-03409-D40CB905; Thu, 08 Nov 2012 14:23:09 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1352384588!29100032!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26502 invoked from network); 8 Nov 2012 14:23:08 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-15.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 14:23:08 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWT0W-000Kqi-QZ; Thu, 08 Nov 2012 14:23:00 +0000 Date: Thu, 8 Nov 2012 14:23:00 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108142300.GH76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> <20121108124633.GF76638@ocelot.phlegethon.org> <509BC5B402000078000A7396@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509BC5B402000078000A7396@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:46 +0000 on 08 Nov (1352382372), Jan Beulich wrote: > >>> On 08.11.12 at 13:46, Tim Deegan wrote: > > At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: > >> Instead, give the owning domain at least a small opportunity of fixing > >> things up, and allow for rare faults to not bring down the device at > >> all. The amount of faults tolerated within a given time period (all > >> numbers are made up with no specific rationale) is higher for Dom0 than > >> for DomU-s. > >> > >> Signed-off-by: Jan Beulich > > > > Looks good to me, though I don't think dom0 should have any special > > treatment here. I'd be inclined to set the threshold to 10 for > > everyone. > > No problem. I'll wait for the IOMMU folks to give some feedback, > and either re-submit (if further changes are requested), or commit > with their acks (and the change as you suggest, if they're in > agreement). > > Of course, if they disagree we'll have to get to a common position > anyway first. > > If no other changes are requested, do I take the above as an > "ack-with-that-change"? Yes, please do. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:23:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT0g-0000Gv-Ko; Thu, 08 Nov 2012 14:23:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT0f-0000Gq-Nw for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:23:09 +0000 Received: from [85.158.139.83:10147] by server-11.bemta-5.messagelabs.com id 9B/79-03409-D40CB905; Thu, 08 Nov 2012 14:23:09 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1352384588!29100032!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26502 invoked from network); 8 Nov 2012 14:23:08 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-15.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 14:23:08 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWT0W-000Kqi-QZ; Thu, 08 Nov 2012 14:23:00 +0000 Date: Thu, 8 Nov 2012 14:23:00 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108142300.GH76638@ocelot.phlegethon.org> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> <20121108124633.GF76638@ocelot.phlegethon.org> <509BC5B402000078000A7396@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509BC5B402000078000A7396@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Keir Fraser , wei.huang2@amd.com, xen-devel , Dario Faggioli , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:46 +0000 on 08 Nov (1352382372), Jan Beulich wrote: > >>> On 08.11.12 at 13:46, Tim Deegan wrote: > > At 16:05 +0000 on 07 Nov (1352304352), Jan Beulich wrote: > >> Instead, give the owning domain at least a small opportunity of fixing > >> things up, and allow for rare faults to not bring down the device at > >> all. The amount of faults tolerated within a given time period (all > >> numbers are made up with no specific rationale) is higher for Dom0 than > >> for DomU-s. > >> > >> Signed-off-by: Jan Beulich > > > > Looks good to me, though I don't think dom0 should have any special > > treatment here. I'd be inclined to set the threshold to 10 for > > everyone. > > No problem. I'll wait for the IOMMU folks to give some feedback, > and either re-submit (if further changes are requested), or commit > with their acks (and the change as you suggest, if they're in > agreement). > > Of course, if they disagree we'll have to get to a common position > anyway first. > > If no other changes are requested, do I take the above as an > "ack-with-that-change"? Yes, please do. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:31:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:31:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT87-0000U8-Hy; Thu, 08 Nov 2012 14:30:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT86-0000U2-9J for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:30:50 +0000 Received: from [85.158.138.51:60243] by server-3.bemta-3.messagelabs.com id 99/DD-31566-912CB905; Thu, 08 Nov 2012 14:30:49 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-15.tower-174.messagelabs.com!1352385048!27334990!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24998 invoked from network); 8 Nov 2012 14:30:48 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 14:30:48 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWT84-0006pn-1h; Thu, 08 Nov 2012 14:30:48 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWT80-00065M-S0; Thu, 08 Nov 2012 14:30:47 +0000 Message-ID: <1352384924.12977.103.camel@hastur.hellion.org.uk> From: Ian Campbell To: Keir Fraser Date: Thu, 08 Nov 2012 15:28:44 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 12:54 +0000, Keir Fraser wrote: > On 08/11/2012 11:43, "Ian Campbell" wrote: > > >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it > >>> looks to me like it should be useful! > >> > >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be > >> impossible. > > > > impossible due to guarantees made by the h/w or by construction in Xen. > > That's a question, right? Yes, sorry. > By construction in Xen. > > > There appears to be a certain amount of hardware-specificness to the > > issue -- so I'm wondering if maybe there are some platforms whose tsc is > > not as monotonically increasing as it needs to be... > > plt_* timestamps are not derived from TSC at all. I see, rather it is derived from the platform_timesource which could be HPET, pmtimer, pit etc but in this case (according to the provided xm dmesg) appears to be a 14MHz HPET. So I guess s/tsc/HPET/ in my original thought... > >> plt_stamp64 oddly has low 32 bits identical to new_stamp. That > >> seems very very improbable! > > > > Does this code run on all cpus or just one? Is it always the same one? > > Always cpu0. So it's not cross cpu drift then. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:31:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:31:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT87-0000U8-Hy; Thu, 08 Nov 2012 14:30:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWT86-0000U2-9J for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:30:50 +0000 Received: from [85.158.138.51:60243] by server-3.bemta-3.messagelabs.com id 99/DD-31566-912CB905; Thu, 08 Nov 2012 14:30:49 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-15.tower-174.messagelabs.com!1352385048!27334990!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24998 invoked from network); 8 Nov 2012 14:30:48 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-15.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 14:30:48 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWT84-0006pn-1h; Thu, 08 Nov 2012 14:30:48 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWT80-00065M-S0; Thu, 08 Nov 2012 14:30:47 +0000 Message-ID: <1352384924.12977.103.camel@hastur.hellion.org.uk> From: Ian Campbell To: Keir Fraser Date: Thu, 08 Nov 2012 15:28:44 +0100 In-Reply-To: References: X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 12:54 +0000, Keir Fraser wrote: > On 08/11/2012 11:43, "Ian Campbell" wrote: > > >>> I'll leave this to Keir (who wrote the debugging patch) to answer but it > >>> looks to me like it should be useful! > >> > >> I'm scratching my head. plt_wrap is earlier than plt_now, which should be > >> impossible. > > > > impossible due to guarantees made by the h/w or by construction in Xen. > > That's a question, right? Yes, sorry. > By construction in Xen. > > > There appears to be a certain amount of hardware-specificness to the > > issue -- so I'm wondering if maybe there are some platforms whose tsc is > > not as monotonically increasing as it needs to be... > > plt_* timestamps are not derived from TSC at all. I see, rather it is derived from the platform_timesource which could be HPET, pmtimer, pit etc but in this case (according to the provided xm dmesg) appears to be a 14MHz HPET. So I guess s/tsc/HPET/ in my original thought... > >> plt_stamp64 oddly has low 32 bits identical to new_stamp. That > >> seems very very improbable! > > > > Does this code run on all cpus or just one? Is it always the same one? > > Always cpu0. So it's not cross cpu drift then. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:34:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:34:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTAv-0000aW-4Q; Thu, 08 Nov 2012 14:33:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTAt-0000aO-GI for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:33:43 +0000 Received: from [193.109.254.147:36552] by server-16.bemta-14.messagelabs.com id B8/48-09215-6C2CB905; Thu, 08 Nov 2012 14:33:42 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-15.tower-27.messagelabs.com!1352385098!2265369!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32135 invoked from network); 8 Nov 2012 14:31:39 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 14:31:39 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWT8p-0006py-DF; Thu, 08 Nov 2012 14:31:35 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWT8j-00065Q-8E; Thu, 08 Nov 2012 14:31:34 +0000 Message-ID: <1352384968.12977.104.camel@hastur.hellion.org.uk> From: Ian Campbell To: Philippe.Simonet@swisscom.com Date: Thu, 08 Nov 2012 15:29:28 +0100 In-Reply-To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: 599161@bugs.debian.org, keir@xen.org, JBeulich@suse.com, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 13:47 +0000, Philippe.Simonet@swisscom.com wrote: > Hi Mauro, > > that's a question for you : I think Jan was asking for information relating to the system you saw this on -- or are you working on the same systems as Mauro? Of course additional information from Mauro would be useful too in order to help spotting any patterns. > > Philippe, could you clarify again what CPU model(s) this is being observed on > > (the long times between individual steps forward with this problem perhaps > > warrant repeating the basics each time, as it's otherwise quite cumbersome > > to always look up old pieces of information). > > can you provide this information ? > cat /proc/cpuinfo > cat /proc/meminfo > hardware information (manufacturer, model, urls, ...) > > Thanks, Philippe > > > > -----Original Message----- > > From: Jan Beulich [mailto:JBeulich@suse.com] > > Sent: Thursday, November 08, 2012 10:40 AM > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > > devel@lists.xen.org > > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > > minutes" bug. > > > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > > plt_wrap=5ece12d09306 > > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > >>>> tsc_stamp=e3839fcb0273 > > >>> > > >>> (below is the complete xm dmesg output) > > >>> > > >>> did that help you ? do you need more info ? > > >> > > >> I'll leave this to Keir (who wrote the debugging patch) to answer but > > >> it looks to me like it should be useful! > > > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which should > > > be impossible. plt_stamp64 oddly has low 32 bits identical to > > > new_stamp. That seems very very improbable! > > > > Is it? My understanding was that plt_stamp64 is just a software extension to > > the more narrow HW counter, and hence the low plt_mask bits would always > > be expected to be identical. > > > > The plt_wrap < plt_now thing of course is entirely unexplainable to me too: > > Considering that plt_scale doesn't change at all post- boot, apart from > > memory corruption I could only see an memory access ordering problem to > > be the reason (platform_timer_stamp and/or stime_platform_stamp > > changing despite platform_timer_lock being held. So maybe taking a > > snapshot of all three static values involved in the calculation in > > __read_platform_stime() between acquiring the lock and the first call to > > __read_platform_stime(), and printing them together with the "live" values > > in a second > > printk() after the one your original patch added could rule that out. > > > > But the box doesn't even seem to be NUMA (of course it also doesn't help > > that the log level was kept restricted - hint, hint, Philippe), not does there > > appear to be any S3 cycle or pCPU bring-up/-down in between... > > > > Philippe, could you clarify again what CPU model(s) this is being observed on > > (the long times between individual steps forward with this problem perhaps > > warrant repeating the basics each time, as it's otherwise quite cumbersome > > to always look up old pieces of information). > > > > > I wonder whether the overflow handling should just be removed, or made > > > conditional on a command-line parameter, or on the 32-bit platform > > > counter being at least somewhat likely to overflow before a softirq > > > occurs -- it seems lots of systems are using 14MHz HPET, and that > > > gives us a couple of minutes for the plt_overflow softirq to do its work > > before overflow occurs. > > > I think we would notice that outage in other ways. :) > > > > Iirc we added this for a good reason - to cover the, however unlikely, event > > of Xen running for very long without preemption. > > Presumably most of the cases got fixed meanwhile, and indeed a > > wraparound time on the order of minutes should make this superfluous, but > > as the case here shows that code did spot a severe anomaly (whatever that > > may turn out to be). > > > > Also recall that there are HPET implementations around that tick at a much > > higher frequency than 14MHz. > > > > So unless we finally reach the understanding that the code is flawed, I would > > rather want to keep it. > > > > Jan > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:34:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:34:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTAv-0000aW-4Q; Thu, 08 Nov 2012 14:33:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTAt-0000aO-GI for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:33:43 +0000 Received: from [193.109.254.147:36552] by server-16.bemta-14.messagelabs.com id B8/48-09215-6C2CB905; Thu, 08 Nov 2012 14:33:42 +0000 X-Env-Sender: ijc@hellion.org.uk X-Msg-Ref: server-15.tower-27.messagelabs.com!1352385098!2265369!1 X-Originating-IP: [212.110.190.137] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32135 invoked from network); 8 Nov 2012 14:31:39 -0000 Received: from benson.vm.bytemark.co.uk (HELO benson.vm.bytemark.co.uk) (212.110.190.137) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Nov 2012 14:31:39 -0000 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginmedia.com ([86.6.25.227] helo=hopkins.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TWT8p-0006py-DF; Thu, 08 Nov 2012 14:31:35 +0000 Received: from yog-sothoth.hellion.org.uk ([192.168.1.1] helo=[127.0.0.1]) by hopkins.hellion.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1TWT8j-00065Q-8E; Thu, 08 Nov 2012 14:31:34 +0000 Message-ID: <1352384968.12977.104.camel@hastur.hellion.org.uk> From: Ian Campbell To: Philippe.Simonet@swisscom.com Date: Thu, 08 Nov 2012 15:29:28 +0100 In-Reply-To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.1.1 X-SA-Exim-Mail-From: ijc@hellion.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on hopkins.hellion.org.uk) Cc: 599161@bugs.debian.org, keir@xen.org, JBeulich@suse.com, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 13:47 +0000, Philippe.Simonet@swisscom.com wrote: > Hi Mauro, > > that's a question for you : I think Jan was asking for information relating to the system you saw this on -- or are you working on the same systems as Mauro? Of course additional information from Mauro would be useful too in order to help spotting any patterns. > > Philippe, could you clarify again what CPU model(s) this is being observed on > > (the long times between individual steps forward with this problem perhaps > > warrant repeating the basics each time, as it's otherwise quite cumbersome > > to always look up old pieces of information). > > can you provide this information ? > cat /proc/cpuinfo > cat /proc/meminfo > hardware information (manufacturer, model, urls, ...) > > Thanks, Philippe > > > > -----Original Message----- > > From: Jan Beulich [mailto:JBeulich@suse.com] > > Sent: Thursday, November 08, 2012 10:40 AM > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > > devel@lists.xen.org > > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 > > minutes" bug. > > > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > > plt_wrap=5ece12d09306 > > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > >>>> tsc_stamp=e3839fcb0273 > > >>> > > >>> (below is the complete xm dmesg output) > > >>> > > >>> did that help you ? do you need more info ? > > >> > > >> I'll leave this to Keir (who wrote the debugging patch) to answer but > > >> it looks to me like it should be useful! > > > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which should > > > be impossible. plt_stamp64 oddly has low 32 bits identical to > > > new_stamp. That seems very very improbable! > > > > Is it? My understanding was that plt_stamp64 is just a software extension to > > the more narrow HW counter, and hence the low plt_mask bits would always > > be expected to be identical. > > > > The plt_wrap < plt_now thing of course is entirely unexplainable to me too: > > Considering that plt_scale doesn't change at all post- boot, apart from > > memory corruption I could only see an memory access ordering problem to > > be the reason (platform_timer_stamp and/or stime_platform_stamp > > changing despite platform_timer_lock being held. So maybe taking a > > snapshot of all three static values involved in the calculation in > > __read_platform_stime() between acquiring the lock and the first call to > > __read_platform_stime(), and printing them together with the "live" values > > in a second > > printk() after the one your original patch added could rule that out. > > > > But the box doesn't even seem to be NUMA (of course it also doesn't help > > that the log level was kept restricted - hint, hint, Philippe), not does there > > appear to be any S3 cycle or pCPU bring-up/-down in between... > > > > Philippe, could you clarify again what CPU model(s) this is being observed on > > (the long times between individual steps forward with this problem perhaps > > warrant repeating the basics each time, as it's otherwise quite cumbersome > > to always look up old pieces of information). > > > > > I wonder whether the overflow handling should just be removed, or made > > > conditional on a command-line parameter, or on the 32-bit platform > > > counter being at least somewhat likely to overflow before a softirq > > > occurs -- it seems lots of systems are using 14MHz HPET, and that > > > gives us a couple of minutes for the plt_overflow softirq to do its work > > before overflow occurs. > > > I think we would notice that outage in other ways. :) > > > > Iirc we added this for a good reason - to cover the, however unlikely, event > > of Xen running for very long without preemption. > > Presumably most of the cases got fixed meanwhile, and indeed a > > wraparound time on the order of minutes should make this superfluous, but > > as the case here shows that code did spot a severe anomaly (whatever that > > may turn out to be). > > > > Also recall that there are HPET implementations around that tick at a much > > higher frequency than 14MHz. > > > > So unless we finally reach the understanding that the code is flawed, I would > > rather want to keep it. > > > > Jan > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:35:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:35:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTC1-0000fr-IL; Thu, 08 Nov 2012 14:34:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTC0-0000fj-QL for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:34:53 +0000 Received: from [85.158.143.35:15973] by server-2.bemta-4.messagelabs.com id B3/9B-28922-C03CB905; Thu, 08 Nov 2012 14:34:52 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1352385291!6363312!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7814 invoked from network); 8 Nov 2012 14:34:51 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:34:51 -0000 Received: by mail-ea0-f173.google.com with SMTP id a1so1300917eaa.32 for ; Thu, 08 Nov 2012 06:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CVzApulxQtM16B27mZTQsiA0Q0i00u/XYjMBuW2ztOU=; b=mhj+mX47xG9W2t6XNk3zsmpid9edu2FIZxqMO+Lz4DAiQyipxiI+/qOCbOlMseouxm Bq9h+NBifBzoxBSSNNDcDrCIoQtiIYqRcpFlXalT14byasjxZ+5L8zmdqEH6aqPOGH4o gaFuzgP37jnTN7r4Ybka4QiPRNFCtoQRiMokiSbYN6qjjPfiSFz0x7HkAvNKlGwSCepl nBoGmF/joIutW7O5Gjg9cGPF0vWlpNPn7KRpET23q3f5kjOBvvSjfIKyTHmsq5yAVke8 S8Yan56rU4GUhNIr4h9YVGTGeIny/+CfoutiQp6SDfHahArMPhV+rdj1Gmb4Tcybqno8 bh0g== Received: by 10.14.172.195 with SMTP id t43mr28126643eel.17.1352385291373; Thu, 08 Nov 2012 06:34:51 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id o47sm70643207eem.11.2012.11.08.06.34.49 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:34:50 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:34:46 +0000 From: Keir Fraser To: Ian Campbell Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29vjL1l22/R/nQSEedLeGaK4Z9HA== In-Reply-To: <1352384924.12977.103.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 14:28, "Ian Campbell" wrote: >>> There appears to be a certain amount of hardware-specificness to the >>> issue -- so I'm wondering if maybe there are some platforms whose tsc is >>> not as monotonically increasing as it needs to be... >> >> plt_* timestamps are not derived from TSC at all. > > I see, rather it is derived from the platform_timesource which could be > HPET, pmtimer, pit etc but in this case (according to the provided xm > dmesg) appears to be a 14MHz HPET. > > So I guess s/tsc/HPET/ in my original thought... In fact plt_now and plt_wrap are both derived from the same value of plt_stamp64. One is derived from it directly, and the other from plt_stamp64+plt_mask+1 (== plt_stamp64+(1<<32)). -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:35:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:35:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTC1-0000fr-IL; Thu, 08 Nov 2012 14:34:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTC0-0000fj-QL for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:34:53 +0000 Received: from [85.158.143.35:15973] by server-2.bemta-4.messagelabs.com id B3/9B-28922-C03CB905; Thu, 08 Nov 2012 14:34:52 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1352385291!6363312!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7814 invoked from network); 8 Nov 2012 14:34:51 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 14:34:51 -0000 Received: by mail-ea0-f173.google.com with SMTP id a1so1300917eaa.32 for ; Thu, 08 Nov 2012 06:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CVzApulxQtM16B27mZTQsiA0Q0i00u/XYjMBuW2ztOU=; b=mhj+mX47xG9W2t6XNk3zsmpid9edu2FIZxqMO+Lz4DAiQyipxiI+/qOCbOlMseouxm Bq9h+NBifBzoxBSSNNDcDrCIoQtiIYqRcpFlXalT14byasjxZ+5L8zmdqEH6aqPOGH4o gaFuzgP37jnTN7r4Ybka4QiPRNFCtoQRiMokiSbYN6qjjPfiSFz0x7HkAvNKlGwSCepl nBoGmF/joIutW7O5Gjg9cGPF0vWlpNPn7KRpET23q3f5kjOBvvSjfIKyTHmsq5yAVke8 S8Yan56rU4GUhNIr4h9YVGTGeIny/+CfoutiQp6SDfHahArMPhV+rdj1Gmb4Tcybqno8 bh0g== Received: by 10.14.172.195 with SMTP id t43mr28126643eel.17.1352385291373; Thu, 08 Nov 2012 06:34:51 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id o47sm70643207eem.11.2012.11.08.06.34.49 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 06:34:50 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 14:34:46 +0000 From: Keir Fraser To: Ian Campbell Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac29vjL1l22/R/nQSEedLeGaK4Z9HA== In-Reply-To: <1352384924.12977.103.camel@hastur.hellion.org.uk> Mime-version: 1.0 Cc: "Philippe.Simonet@swisscom.com" , "599161@bugs.debian.org" <599161@bugs.debian.org>, "mrsanna1@gmail.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 14:28, "Ian Campbell" wrote: >>> There appears to be a certain amount of hardware-specificness to the >>> issue -- so I'm wondering if maybe there are some platforms whose tsc is >>> not as monotonically increasing as it needs to be... >> >> plt_* timestamps are not derived from TSC at all. > > I see, rather it is derived from the platform_timesource which could be > HPET, pmtimer, pit etc but in this case (according to the provided xm > dmesg) appears to be a 14MHz HPET. > > So I guess s/tsc/HPET/ in my original thought... In fact plt_now and plt_wrap are both derived from the same value of plt_stamp64. One is derived from it directly, and the other from plt_stamp64+plt_mask+1 (== plt_stamp64+(1<<32)). -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:59:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:59:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTZy-0000zk-UU; Thu, 08 Nov 2012 14:59:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTZx-0000zf-Ly for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:59:37 +0000 Received: from [85.158.139.83:40742] by server-16.bemta-5.messagelabs.com id 39/96-04786-8D8CB905; Thu, 08 Nov 2012 14:59:36 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352386776!26676255!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2048 invoked from network); 8 Nov 2012 14:59:36 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-182.messagelabs.com with SMTP; 8 Nov 2012 14:59:36 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 14:59:35 +0000 Message-Id: <509BD6E702000078000A742E@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 14:59:35 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Disposition: inline Subject: [Xen-devel] [PATCH 0/2] x86: x2apic improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 1: make cpu_2_logical_apicid private to x2apic code 2: x2apic: properly implement cluster mode Signed-off-by: Jan Beulich _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 14:59:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 14:59:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTZy-0000zk-UU; Thu, 08 Nov 2012 14:59:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTZx-0000zf-Ly for xen-devel@lists.xen.org; Thu, 08 Nov 2012 14:59:37 +0000 Received: from [85.158.139.83:40742] by server-16.bemta-5.messagelabs.com id 39/96-04786-8D8CB905; Thu, 08 Nov 2012 14:59:36 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352386776!26676255!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2048 invoked from network); 8 Nov 2012 14:59:36 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-182.messagelabs.com with SMTP; 8 Nov 2012 14:59:36 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 14:59:35 +0000 Message-Id: <509BD6E702000078000A742E@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 14:59:35 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Disposition: inline Subject: [Xen-devel] [PATCH 0/2] x86: x2apic improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 1: make cpu_2_logical_apicid private to x2apic code 2: x2apic: properly implement cluster mode Signed-off-by: Jan Beulich _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:02:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:02:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTcy-000185-HC; Thu, 08 Nov 2012 15:02:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTcw-00017y-EB for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:02:42 +0000 Received: from [85.158.137.99:16079] by server-13.bemta-3.messagelabs.com id 4D/7B-24887-199CB905; Thu, 08 Nov 2012 15:02:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352386960!11834786!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17366 invoked from network); 8 Nov 2012 15:02:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-217.messagelabs.com with SMTP; 8 Nov 2012 15:02:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:02:40 +0000 Message-Id: <509BD7A002000078000A743C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:02:40 +0000 From: "Jan Beulich" To: "xen-devel" References: <509BD6E702000078000A742E@nat28.tlf.novell.com> In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartEADB2C80.0__=" Subject: [Xen-devel] [PATCH 1/2] x86: make cpu_2_logical_apicid private to x2apic code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartEADB2C80.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline ... as it in fact is only being used there. While moving it, also make it a per-CPU variable rather than a NR_CPUS-sized array. Signed-off-by: Jan Beulich --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1024,7 +1024,6 @@ __next: if (boot_cpu_physical_apicid =3D=3D -1U) boot_cpu_physical_apicid =3D get_apic_id(); x86_cpu_to_apicid[0] =3D get_apic_id(); - cpu_2_logical_apicid[0] =3D get_logical_apic_id(); =20 init_ioapic_mappings(); } --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -32,14 +32,15 @@ static bool_t __initdata x2apic_phys; /* By default we use logical = cluster mode. */ boolean_param("x2apic_phys", x2apic_phys); =20 +static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); + static void init_apic_ldr_x2apic_phys(void) { } =20 static void init_apic_ldr_x2apic_cluster(void) { - int cpu =3D smp_processor_id(); - cpu_2_logical_apicid[cpu] =3D apic_read(APIC_LDR); + this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR); } =20 static void __init clustered_apic_check_x2apic(void) @@ -48,7 +49,7 @@ static void __init clustered_apic_check_ =20 static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t = *cpumask) { - return cpu_2_logical_apicid[cpumask_first(cpumask)]; + return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); } =20 static void __send_IPI_mask_x2apic( @@ -77,7 +78,7 @@ static void __send_IPI_mask_x2apic( if ( !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) ) continue; msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL) - ? cpu_physical_id(cpu) : cpu_2_logical_apicid[cpu]; + ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector; apic_wrmsr(APIC_ICR, msr_content); } --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -28,11 +28,6 @@ int hard_smp_processor_id(void) return get_apic_id(); } =20 -int logical_smp_processor_id(void) -{ - return get_logical_apic_id(); -} - /* * send_IPI_mask(cpumask, vector): sends @vector IPI to CPUs in @cpumask, * excluding the local CPU. @cpumask may be empty. --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -64,8 +64,6 @@ struct cpuinfo_x86 cpu_data[NR_CPUS]; u32 x86_cpu_to_apicid[NR_CPUS] __read_mostly =3D { [0 ... NR_CPUS-1] =3D BAD_APICID }; =20 -static void map_cpu_to_logical_apicid(void); - static int cpu_error; static enum cpu_state { CPU_STATE_DYING, /* slave -> master: I am dying */ @@ -202,7 +200,6 @@ static void smp_callin(void) Dprintk("CALLIN, before setup_local_APIC().\n"); x2apic_ap_setup(); setup_local_APIC(); - map_cpu_to_logical_apicid(); =20 /* Save our processor parameters. */ smp_store_cpu_info(cpu); @@ -401,22 +398,6 @@ extern struct { unsigned short ss; } stack_start; =20 -u32 cpu_2_logical_apicid[NR_CPUS] __read_mostly =3D - { [0 ... NR_CPUS-1] =3D BAD_APICID }; - -static void map_cpu_to_logical_apicid(void) -{ - int cpu =3D smp_processor_id(); - int apicid =3D logical_smp_processor_id(); - - cpu_2_logical_apicid[cpu] =3D apicid; -} - -static void unmap_cpu_to_logical_apicid(int cpu) -{ - cpu_2_logical_apicid[cpu] =3D BAD_APICID; -} - static int wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) { unsigned long send_status =3D 0, accept_status =3D 0; @@ -646,7 +627,6 @@ static int do_boot_cpu(int apicid, int c void cpu_exit_clear(unsigned int cpu) { cpu_uninit(cpu); - unmap_cpu_to_logical_apicid(cpu); set_cpu_state(CPU_STATE_DEAD); } =20 @@ -775,7 +755,6 @@ void __init smp_prepare_cpus(unsigned in if (APIC_init_uniprocessor()) printk(KERN_NOTICE "Local APIC not detected." " Using dummy APIC emulation.\n"); - map_cpu_to_logical_apicid(); return; } =20 @@ -804,7 +783,6 @@ void __init smp_prepare_cpus(unsigned in =20 connect_bsp_APIC(); setup_local_APIC(); - map_cpu_to_logical_apicid(); =20 smpboot_setup_io_apic(); =20 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -158,12 +158,6 @@ static __inline u32 get_apic_id(void) /* return x2apic_enabled ? id : GET_xAPIC_ID(id); } =20 -static __inline u32 get_logical_apic_id(void) -{ - u32 logical_id =3D apic_read(APIC_LDR); - return x2apic_enabled ? logical_id : GET_xAPIC_LOGICAL_ID(logical_id);= -} - void apic_wait_icr_idle(void); =20 int get_physical_broadcast(void); --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -37,7 +37,6 @@ extern void zap_low_mappings(void); =20 #define MAX_APICID 256 extern u32 x86_cpu_to_apicid[]; -extern u32 cpu_2_logical_apicid[]; =20 #define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] =20 @@ -54,7 +53,6 @@ int cpu_add(uint32_t apic_id, uint32_t a #define raw_smp_processor_id() (get_processor_id()) =20 int hard_smp_processor_id(void); -int logical_smp_processor_id(void); =20 void __stop_this_cpu(void); =20 --=__PartEADB2C80.0__= Content-Type: text/plain; name="x86-cpu2lapicid.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-cpu2lapicid.patch" x86: make cpu_2_logical_apicid private to x2apic code=0A=0A... as it in = fact is only being used there. While moving it, also make=0Ait a per-CPU = variable rather than a NR_CPUS-sized array.=0A=0ASigned-off-by: Jan = Beulich =0A=0A--- a/xen/arch/x86/apic.c=0A+++ b/xen/arch= /x86/apic.c=0A@@ -1024,7 +1024,6 @@ __next:=0A if (boot_cpu_physical_ap= icid =3D=3D -1U)=0A boot_cpu_physical_apicid =3D get_apic_id();=0A = x86_cpu_to_apicid[0] =3D get_apic_id();=0A- cpu_2_logical_apicid[0] = =3D get_logical_apic_id();=0A =0A init_ioapic_mappings();=0A }=0A--- = a/xen/arch/x86/genapic/x2apic.c=0A+++ b/xen/arch/x86/genapic/x2apic.c=0A@@ = -32,14 +32,15 @@=0A static bool_t __initdata x2apic_phys; /* By default we = use logical cluster mode. */=0A boolean_param("x2apic_phys", x2apic_phys);= =0A =0A+static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid);=0A+= =0A static void init_apic_ldr_x2apic_phys(void)=0A {=0A }=0A =0A static = void init_apic_ldr_x2apic_cluster(void)=0A {=0A- int cpu =3D smp_process= or_id();=0A- cpu_2_logical_apicid[cpu] =3D apic_read(APIC_LDR);=0A+ = this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR);=0A }=0A =0A static = void __init clustered_apic_check_x2apic(void)=0A@@ -48,7 +49,7 @@ static = void __init clustered_apic_check_=0A =0A static unsigned int cpu_mask_to_ap= icid_x2apic_cluster(const cpumask_t *cpumask)=0A {=0A- return cpu_2_logi= cal_apicid[cpumask_first(cpumask)];=0A+ return per_cpu(cpu_2_logical_api= cid, cpumask_first(cpumask));=0A }=0A =0A static void __send_IPI_mask_x2api= c(=0A@@ -77,7 +78,7 @@ static void __send_IPI_mask_x2apic(=0A if ( = !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) )=0A = continue;=0A msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL)= =0A- ? cpu_physical_id(cpu) : cpu_2_logical_apicid[cpu];=0A+ = ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu);=0A = msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector;=0A apic_wrmsr(APIC_ICR, msr_content);=0A }=0A--- = a/xen/arch/x86/smp.c=0A+++ b/xen/arch/x86/smp.c=0A@@ -28,11 +28,6 @@ int = hard_smp_processor_id(void)=0A return get_apic_id();=0A }=0A =0A-int = logical_smp_processor_id(void)=0A-{=0A- return get_logical_apic_id();=0A= -}=0A-=0A /*=0A * send_IPI_mask(cpumask, vector): sends @vector IPI to = CPUs in @cpumask,=0A * excluding the local CPU. @cpumask may be empty.=0A-= -- a/xen/arch/x86/smpboot.c=0A+++ b/xen/arch/x86/smpboot.c=0A@@ -64,8 = +64,6 @@ struct cpuinfo_x86 cpu_data[NR_CPUS];=0A u32 x86_cpu_to_apicid[NR_= CPUS] __read_mostly =3D=0A { [0 ... NR_CPUS-1] =3D BAD_APICID };=0A = =0A-static void map_cpu_to_logical_apicid(void);=0A-=0A static int = cpu_error;=0A static enum cpu_state {=0A CPU_STATE_DYING, /* slave = -> master: I am dying */=0A@@ -202,7 +200,6 @@ static void smp_callin(void)= =0A Dprintk("CALLIN, before setup_local_APIC().\n");=0A x2apic_ap_s= etup();=0A setup_local_APIC();=0A- map_cpu_to_logical_apicid();=0A = =0A /* Save our processor parameters. */=0A smp_store_cpu_info(cpu)= ;=0A@@ -401,22 +398,6 @@ extern struct {=0A unsigned short ss;=0A } = stack_start;=0A =0A-u32 cpu_2_logical_apicid[NR_CPUS] __read_mostly = =3D=0A- { [0 ... NR_CPUS-1] =3D BAD_APICID };=0A-=0A-static void = map_cpu_to_logical_apicid(void)=0A-{=0A- int cpu =3D smp_processor_id();= =0A- int apicid =3D logical_smp_processor_id();=0A-=0A- cpu_2_logical= _apicid[cpu] =3D apicid;=0A-}=0A-=0A-static void unmap_cpu_to_logical_apici= d(int cpu)=0A-{=0A- cpu_2_logical_apicid[cpu] =3D BAD_APICID;=0A-}=0A-= =0A static int wakeup_secondary_cpu(int phys_apicid, unsigned long = start_eip)=0A {=0A unsigned long send_status =3D 0, accept_status =3D = 0;=0A@@ -646,7 +627,6 @@ static int do_boot_cpu(int apicid, int c=0A void = cpu_exit_clear(unsigned int cpu)=0A {=0A cpu_uninit(cpu);=0A- = unmap_cpu_to_logical_apicid(cpu);=0A set_cpu_state(CPU_STATE_DEAD);=0A = }=0A =0A@@ -775,7 +755,6 @@ void __init smp_prepare_cpus(unsigned in=0A = if (APIC_init_uniprocessor())=0A printk(KERN_NOTICE = "Local APIC not detected."=0A " Using dummy APIC = emulation.\n");=0A- map_cpu_to_logical_apicid();=0A = return;=0A }=0A =0A@@ -804,7 +783,6 @@ void __init smp_prepare_cpus(uns= igned in=0A =0A connect_bsp_APIC();=0A setup_local_APIC();=0A- = map_cpu_to_logical_apicid();=0A =0A smpboot_setup_io_apic();=0A =0A--- = a/xen/include/asm-x86/apic.h=0A+++ b/xen/include/asm-x86/apic.h=0A@@ = -158,12 +158,6 @@ static __inline u32 get_apic_id(void) /*=0A return = x2apic_enabled ? id : GET_xAPIC_ID(id);=0A }=0A =0A-static __inline u32 = get_logical_apic_id(void)=0A-{=0A- u32 logical_id =3D apic_read(APIC_LDR= );=0A- return x2apic_enabled ? logical_id : GET_xAPIC_LOGICAL_ID(logical= _id);=0A-}=0A-=0A void apic_wait_icr_idle(void);=0A =0A int get_physical_br= oadcast(void);=0A--- a/xen/include/asm-x86/smp.h=0A+++ b/xen/include/asm-x8= 6/smp.h=0A@@ -37,7 +37,6 @@ extern void zap_low_mappings(void);=0A =0A = #define MAX_APICID 256=0A extern u32 x86_cpu_to_apicid[];=0A-extern u32 = cpu_2_logical_apicid[];=0A =0A #define cpu_physical_id(cpu) x86_cpu_to_= apicid[cpu]=0A =0A@@ -54,7 +53,6 @@ int cpu_add(uint32_t apic_id, uint32_t = a=0A #define raw_smp_processor_id() (get_processor_id())=0A =0A int = hard_smp_processor_id(void);=0A-int logical_smp_processor_id(void);=0A =0A = void __stop_this_cpu(void);=0A =0A --=__PartEADB2C80.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartEADB2C80.0__=-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:02:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:02:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTcy-000185-HC; Thu, 08 Nov 2012 15:02:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTcw-00017y-EB for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:02:42 +0000 Received: from [85.158.137.99:16079] by server-13.bemta-3.messagelabs.com id 4D/7B-24887-199CB905; Thu, 08 Nov 2012 15:02:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352386960!11834786!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17366 invoked from network); 8 Nov 2012 15:02:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-217.messagelabs.com with SMTP; 8 Nov 2012 15:02:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:02:40 +0000 Message-Id: <509BD7A002000078000A743C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:02:40 +0000 From: "Jan Beulich" To: "xen-devel" References: <509BD6E702000078000A742E@nat28.tlf.novell.com> In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartEADB2C80.0__=" Subject: [Xen-devel] [PATCH 1/2] x86: make cpu_2_logical_apicid private to x2apic code X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartEADB2C80.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline ... as it in fact is only being used there. While moving it, also make it a per-CPU variable rather than a NR_CPUS-sized array. Signed-off-by: Jan Beulich --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1024,7 +1024,6 @@ __next: if (boot_cpu_physical_apicid =3D=3D -1U) boot_cpu_physical_apicid =3D get_apic_id(); x86_cpu_to_apicid[0] =3D get_apic_id(); - cpu_2_logical_apicid[0] =3D get_logical_apic_id(); =20 init_ioapic_mappings(); } --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -32,14 +32,15 @@ static bool_t __initdata x2apic_phys; /* By default we use logical = cluster mode. */ boolean_param("x2apic_phys", x2apic_phys); =20 +static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); + static void init_apic_ldr_x2apic_phys(void) { } =20 static void init_apic_ldr_x2apic_cluster(void) { - int cpu =3D smp_processor_id(); - cpu_2_logical_apicid[cpu] =3D apic_read(APIC_LDR); + this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR); } =20 static void __init clustered_apic_check_x2apic(void) @@ -48,7 +49,7 @@ static void __init clustered_apic_check_ =20 static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t = *cpumask) { - return cpu_2_logical_apicid[cpumask_first(cpumask)]; + return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); } =20 static void __send_IPI_mask_x2apic( @@ -77,7 +78,7 @@ static void __send_IPI_mask_x2apic( if ( !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) ) continue; msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL) - ? cpu_physical_id(cpu) : cpu_2_logical_apicid[cpu]; + ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector; apic_wrmsr(APIC_ICR, msr_content); } --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -28,11 +28,6 @@ int hard_smp_processor_id(void) return get_apic_id(); } =20 -int logical_smp_processor_id(void) -{ - return get_logical_apic_id(); -} - /* * send_IPI_mask(cpumask, vector): sends @vector IPI to CPUs in @cpumask, * excluding the local CPU. @cpumask may be empty. --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -64,8 +64,6 @@ struct cpuinfo_x86 cpu_data[NR_CPUS]; u32 x86_cpu_to_apicid[NR_CPUS] __read_mostly =3D { [0 ... NR_CPUS-1] =3D BAD_APICID }; =20 -static void map_cpu_to_logical_apicid(void); - static int cpu_error; static enum cpu_state { CPU_STATE_DYING, /* slave -> master: I am dying */ @@ -202,7 +200,6 @@ static void smp_callin(void) Dprintk("CALLIN, before setup_local_APIC().\n"); x2apic_ap_setup(); setup_local_APIC(); - map_cpu_to_logical_apicid(); =20 /* Save our processor parameters. */ smp_store_cpu_info(cpu); @@ -401,22 +398,6 @@ extern struct { unsigned short ss; } stack_start; =20 -u32 cpu_2_logical_apicid[NR_CPUS] __read_mostly =3D - { [0 ... NR_CPUS-1] =3D BAD_APICID }; - -static void map_cpu_to_logical_apicid(void) -{ - int cpu =3D smp_processor_id(); - int apicid =3D logical_smp_processor_id(); - - cpu_2_logical_apicid[cpu] =3D apicid; -} - -static void unmap_cpu_to_logical_apicid(int cpu) -{ - cpu_2_logical_apicid[cpu] =3D BAD_APICID; -} - static int wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) { unsigned long send_status =3D 0, accept_status =3D 0; @@ -646,7 +627,6 @@ static int do_boot_cpu(int apicid, int c void cpu_exit_clear(unsigned int cpu) { cpu_uninit(cpu); - unmap_cpu_to_logical_apicid(cpu); set_cpu_state(CPU_STATE_DEAD); } =20 @@ -775,7 +755,6 @@ void __init smp_prepare_cpus(unsigned in if (APIC_init_uniprocessor()) printk(KERN_NOTICE "Local APIC not detected." " Using dummy APIC emulation.\n"); - map_cpu_to_logical_apicid(); return; } =20 @@ -804,7 +783,6 @@ void __init smp_prepare_cpus(unsigned in =20 connect_bsp_APIC(); setup_local_APIC(); - map_cpu_to_logical_apicid(); =20 smpboot_setup_io_apic(); =20 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -158,12 +158,6 @@ static __inline u32 get_apic_id(void) /* return x2apic_enabled ? id : GET_xAPIC_ID(id); } =20 -static __inline u32 get_logical_apic_id(void) -{ - u32 logical_id =3D apic_read(APIC_LDR); - return x2apic_enabled ? logical_id : GET_xAPIC_LOGICAL_ID(logical_id);= -} - void apic_wait_icr_idle(void); =20 int get_physical_broadcast(void); --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -37,7 +37,6 @@ extern void zap_low_mappings(void); =20 #define MAX_APICID 256 extern u32 x86_cpu_to_apicid[]; -extern u32 cpu_2_logical_apicid[]; =20 #define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] =20 @@ -54,7 +53,6 @@ int cpu_add(uint32_t apic_id, uint32_t a #define raw_smp_processor_id() (get_processor_id()) =20 int hard_smp_processor_id(void); -int logical_smp_processor_id(void); =20 void __stop_this_cpu(void); =20 --=__PartEADB2C80.0__= Content-Type: text/plain; name="x86-cpu2lapicid.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-cpu2lapicid.patch" x86: make cpu_2_logical_apicid private to x2apic code=0A=0A... as it in = fact is only being used there. While moving it, also make=0Ait a per-CPU = variable rather than a NR_CPUS-sized array.=0A=0ASigned-off-by: Jan = Beulich =0A=0A--- a/xen/arch/x86/apic.c=0A+++ b/xen/arch= /x86/apic.c=0A@@ -1024,7 +1024,6 @@ __next:=0A if (boot_cpu_physical_ap= icid =3D=3D -1U)=0A boot_cpu_physical_apicid =3D get_apic_id();=0A = x86_cpu_to_apicid[0] =3D get_apic_id();=0A- cpu_2_logical_apicid[0] = =3D get_logical_apic_id();=0A =0A init_ioapic_mappings();=0A }=0A--- = a/xen/arch/x86/genapic/x2apic.c=0A+++ b/xen/arch/x86/genapic/x2apic.c=0A@@ = -32,14 +32,15 @@=0A static bool_t __initdata x2apic_phys; /* By default we = use logical cluster mode. */=0A boolean_param("x2apic_phys", x2apic_phys);= =0A =0A+static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid);=0A+= =0A static void init_apic_ldr_x2apic_phys(void)=0A {=0A }=0A =0A static = void init_apic_ldr_x2apic_cluster(void)=0A {=0A- int cpu =3D smp_process= or_id();=0A- cpu_2_logical_apicid[cpu] =3D apic_read(APIC_LDR);=0A+ = this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR);=0A }=0A =0A static = void __init clustered_apic_check_x2apic(void)=0A@@ -48,7 +49,7 @@ static = void __init clustered_apic_check_=0A =0A static unsigned int cpu_mask_to_ap= icid_x2apic_cluster(const cpumask_t *cpumask)=0A {=0A- return cpu_2_logi= cal_apicid[cpumask_first(cpumask)];=0A+ return per_cpu(cpu_2_logical_api= cid, cpumask_first(cpumask));=0A }=0A =0A static void __send_IPI_mask_x2api= c(=0A@@ -77,7 +78,7 @@ static void __send_IPI_mask_x2apic(=0A if ( = !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) )=0A = continue;=0A msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL)= =0A- ? cpu_physical_id(cpu) : cpu_2_logical_apicid[cpu];=0A+ = ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu);=0A = msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector;=0A apic_wrmsr(APIC_ICR, msr_content);=0A }=0A--- = a/xen/arch/x86/smp.c=0A+++ b/xen/arch/x86/smp.c=0A@@ -28,11 +28,6 @@ int = hard_smp_processor_id(void)=0A return get_apic_id();=0A }=0A =0A-int = logical_smp_processor_id(void)=0A-{=0A- return get_logical_apic_id();=0A= -}=0A-=0A /*=0A * send_IPI_mask(cpumask, vector): sends @vector IPI to = CPUs in @cpumask,=0A * excluding the local CPU. @cpumask may be empty.=0A-= -- a/xen/arch/x86/smpboot.c=0A+++ b/xen/arch/x86/smpboot.c=0A@@ -64,8 = +64,6 @@ struct cpuinfo_x86 cpu_data[NR_CPUS];=0A u32 x86_cpu_to_apicid[NR_= CPUS] __read_mostly =3D=0A { [0 ... NR_CPUS-1] =3D BAD_APICID };=0A = =0A-static void map_cpu_to_logical_apicid(void);=0A-=0A static int = cpu_error;=0A static enum cpu_state {=0A CPU_STATE_DYING, /* slave = -> master: I am dying */=0A@@ -202,7 +200,6 @@ static void smp_callin(void)= =0A Dprintk("CALLIN, before setup_local_APIC().\n");=0A x2apic_ap_s= etup();=0A setup_local_APIC();=0A- map_cpu_to_logical_apicid();=0A = =0A /* Save our processor parameters. */=0A smp_store_cpu_info(cpu)= ;=0A@@ -401,22 +398,6 @@ extern struct {=0A unsigned short ss;=0A } = stack_start;=0A =0A-u32 cpu_2_logical_apicid[NR_CPUS] __read_mostly = =3D=0A- { [0 ... NR_CPUS-1] =3D BAD_APICID };=0A-=0A-static void = map_cpu_to_logical_apicid(void)=0A-{=0A- int cpu =3D smp_processor_id();= =0A- int apicid =3D logical_smp_processor_id();=0A-=0A- cpu_2_logical= _apicid[cpu] =3D apicid;=0A-}=0A-=0A-static void unmap_cpu_to_logical_apici= d(int cpu)=0A-{=0A- cpu_2_logical_apicid[cpu] =3D BAD_APICID;=0A-}=0A-= =0A static int wakeup_secondary_cpu(int phys_apicid, unsigned long = start_eip)=0A {=0A unsigned long send_status =3D 0, accept_status =3D = 0;=0A@@ -646,7 +627,6 @@ static int do_boot_cpu(int apicid, int c=0A void = cpu_exit_clear(unsigned int cpu)=0A {=0A cpu_uninit(cpu);=0A- = unmap_cpu_to_logical_apicid(cpu);=0A set_cpu_state(CPU_STATE_DEAD);=0A = }=0A =0A@@ -775,7 +755,6 @@ void __init smp_prepare_cpus(unsigned in=0A = if (APIC_init_uniprocessor())=0A printk(KERN_NOTICE = "Local APIC not detected."=0A " Using dummy APIC = emulation.\n");=0A- map_cpu_to_logical_apicid();=0A = return;=0A }=0A =0A@@ -804,7 +783,6 @@ void __init smp_prepare_cpus(uns= igned in=0A =0A connect_bsp_APIC();=0A setup_local_APIC();=0A- = map_cpu_to_logical_apicid();=0A =0A smpboot_setup_io_apic();=0A =0A--- = a/xen/include/asm-x86/apic.h=0A+++ b/xen/include/asm-x86/apic.h=0A@@ = -158,12 +158,6 @@ static __inline u32 get_apic_id(void) /*=0A return = x2apic_enabled ? id : GET_xAPIC_ID(id);=0A }=0A =0A-static __inline u32 = get_logical_apic_id(void)=0A-{=0A- u32 logical_id =3D apic_read(APIC_LDR= );=0A- return x2apic_enabled ? logical_id : GET_xAPIC_LOGICAL_ID(logical= _id);=0A-}=0A-=0A void apic_wait_icr_idle(void);=0A =0A int get_physical_br= oadcast(void);=0A--- a/xen/include/asm-x86/smp.h=0A+++ b/xen/include/asm-x8= 6/smp.h=0A@@ -37,7 +37,6 @@ extern void zap_low_mappings(void);=0A =0A = #define MAX_APICID 256=0A extern u32 x86_cpu_to_apicid[];=0A-extern u32 = cpu_2_logical_apicid[];=0A =0A #define cpu_physical_id(cpu) x86_cpu_to_= apicid[cpu]=0A =0A@@ -54,7 +53,6 @@ int cpu_add(uint32_t apic_id, uint32_t = a=0A #define raw_smp_processor_id() (get_processor_id())=0A =0A int = hard_smp_processor_id(void);=0A-int logical_smp_processor_id(void);=0A =0A = void __stop_this_cpu(void);=0A =0A --=__PartEADB2C80.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartEADB2C80.0__=-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:03:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:03:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTdl-0001Bl-0V; Thu, 08 Nov 2012 15:03:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTdk-0001BX-0L for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:03:32 +0000 Received: from [85.158.137.99:31040] by server-6.bemta-3.messagelabs.com id 08/1A-28265-3C9CB905; Thu, 08 Nov 2012 15:03:31 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352387009!18185160!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1010 invoked from network); 8 Nov 2012 15:03:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-217.messagelabs.com with SMTP; 8 Nov 2012 15:03:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:03:29 +0000 Message-Id: <509BD7D102000078000A7440@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:03:29 +0000 From: "Jan Beulich" To: "xen-devel" References: <509BD6E702000078000A742E@nat28.tlf.novell.com> In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartBB8A7DD1.0__=" Subject: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartBB8A7DD1.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline So far, cluster mode was just an alternative implementation of physical mode: Allowing only single CPU interrupt targets, and sending IPIs to each target CPU separately. Take advantage of what cluster mode really can do in that regard. Signed-off-by: Jan Beulich --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -19,6 +19,7 @@ =20 #include #include +#include #include #include #include @@ -33,6 +34,14 @@ static bool_t __initdata x2apic_phys; /* boolean_param("x2apic_phys", x2apic_phys); =20 static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); +static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); +static cpumask_t *cluster_cpus_spare; +static DEFINE_PER_CPU(cpumask_var_t, scratch_mask); + +static inline u32 x2apic_cluster(unsigned int cpu) +{ + return per_cpu(cpu_2_logical_apicid, cpu) >> 16; +} =20 static void init_apic_ldr_x2apic_phys(void) { @@ -40,20 +49,53 @@ static void init_apic_ldr_x2apic_phys(vo =20 static void init_apic_ldr_x2apic_cluster(void) { - this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR); + unsigned int cpu, this_cpu =3D smp_processor_id(); + + per_cpu(cpu_2_logical_apicid, this_cpu) =3D apic_read(APIC_LDR); + + if ( per_cpu(cluster_cpus, this_cpu) ) + { + ASSERT(cpumask_test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))= ); + return; + } + + per_cpu(cluster_cpus, this_cpu) =3D cluster_cpus_spare; + for_each_online_cpu ( cpu ) + { + if (this_cpu =3D=3D cpu || x2apic_cluster(this_cpu) !=3D = x2apic_cluster(cpu)) + continue; + per_cpu(cluster_cpus, this_cpu) =3D per_cpu(cluster_cpus, cpu); + break; + } + if ( per_cpu(cluster_cpus, this_cpu) =3D=3D cluster_cpus_spare ) + cluster_cpus_spare =3D NULL; + + cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); } =20 static void __init clustered_apic_check_x2apic(void) { } =20 +static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) +{ + return per_cpu(cluster_cpus, cpu); +} + static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t = *cpumask) { - return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); + unsigned int cpu =3D cpumask_first(cpumask); + unsigned int dest =3D per_cpu(cpu_2_logical_apicid, cpu); + const cpumask_t *cluster_cpus =3D per_cpu(cluster_cpus, cpu); + + for_each_cpu ( cpu, cluster_cpus ) + if ( cpumask_test_cpu(cpu, cpumask) ) + dest |=3D per_cpu(cpu_2_logical_apicid, cpu); + + return dest; } =20 -static void __send_IPI_mask_x2apic( - const cpumask_t *cpumask, int vector, unsigned int dest_mode) +static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int = vector) { unsigned int cpu; unsigned long flags; @@ -77,23 +119,48 @@ static void __send_IPI_mask_x2apic( { if ( !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) ) continue; - msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL) - ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); - msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector; + msr_content =3D cpu_physical_id(cpu); + msr_content =3D (msr_content << 32) | APIC_DM_FIXED | + APIC_DEST_PHYSICAL | vector; apic_wrmsr(APIC_ICR, msr_content); } =20 local_irq_restore(flags); } =20 -static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int = vector) -{ - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_PHYSICAL); -} - static void send_IPI_mask_x2apic_cluster(const cpumask_t *cpumask, int = vector) { - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_LOGICAL); + unsigned int cpu =3D smp_processor_id(); + cpumask_t *ipimask =3D per_cpu(scratch_mask, cpu); + const cpumask_t *cluster_cpus; + unsigned long flags; + + mb(); /* See above for an explanation. */ + + local_irq_save(flags); + + cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu)); + + for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty(ipimask);= + cpumask_andnot(ipimask, ipimask, cluster_cpus) ) + { + uint64_t msr_content =3D 0; + + cluster_cpus =3D per_cpu(cluster_cpus, cpumask_first(ipimask)); + for_each_cpu ( cpu, cluster_cpus ) + { + if ( !cpumask_test_cpu(cpu, ipimask) ) + continue; + msr_content |=3D per_cpu(cpu_2_logical_apicid, cpu); + } + + BUG_ON(!msr_content); + msr_content =3D (msr_content << 32) | APIC_DM_FIXED | + APIC_DEST_LOGICAL | vector; + apic_wrmsr(APIC_ICR, msr_content); + } + + local_irq_restore(flags); } =20 static const struct genapic apic_x2apic_phys =3D { @@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_ .init_apic_ldr =3D init_apic_ldr_x2apic_cluster, .clustered_apic_check =3D clustered_apic_check_x2apic, .target_cpus =3D target_cpus_all, - .vector_allocation_cpumask =3D vector_allocation_cpumask_phys, + .vector_allocation_cpumask =3D vector_allocation_cpumask_x2apic_cluste= r, .cpu_mask_to_apicid =3D cpu_mask_to_apicid_x2apic_cluster, .send_IPI_mask =3D send_IPI_mask_x2apic_cluster, .send_IPI_self =3D send_IPI_self_x2apic }; =20 +static int update_clusterinfo( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu =3D (unsigned long)hcpu; + int err =3D 0; + + switch (action) { + case CPU_UP_PREPARE: + per_cpu(cpu_2_logical_apicid, cpu) =3D BAD_APICID; + if ( !cluster_cpus_spare ) + cluster_cpus_spare =3D xzalloc(cpumask_t); + if ( !cluster_cpus_spare || + !alloc_cpumask_var(&per_cpu(scratch_mask, cpu)) ) + err =3D -ENOMEM; + break; + case CPU_UP_CANCELED: + case CPU_DEAD: + if ( per_cpu(cluster_cpus, cpu) ) + { + cpumask_clear_cpu(cpu, per_cpu(cluster_cpus, cpu)); + if ( cpumask_empty(per_cpu(cluster_cpus, cpu)) ) + xfree(per_cpu(cluster_cpus, cpu)); + } + free_cpumask_var(per_cpu(scratch_mask, cpu)); + break; + } + + return !err ? NOTIFY_DONE : notifier_from_errno(err); +} + +static struct notifier_block x2apic_cpu_nfb =3D { + .notifier_call =3D update_clusterinfo +}; + const struct genapic *__init apic_x2apic_probe(void) { - return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; + if ( x2apic_phys ) + return &apic_x2apic_phys; + + if ( !this_cpu(cluster_cpus) ) + { + update_clusterinfo(NULL, CPU_UP_PREPARE, + (void *)(long)smp_processor_id()); + init_apic_ldr_x2apic_cluster(); + register_cpu_notifier(&x2apic_cpu_nfb); + } + + return &apic_x2apic_cluster; } =20 void __init check_x2apic_preenabled(void) --=__PartBB8A7DD1.0__= Content-Type: text/plain; name="x86-x2apic-cluster.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-x2apic-cluster.patch" x86/x2apic: properly implement cluster mode=0A=0ASo far, cluster mode was = just an alternative implementation of=0Aphysical mode: Allowing only = single CPU interrupt targets, and sending=0AIPIs to each target CPU = separately. Take advantage of what cluster=0Amode really can do in that = regard.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/arch/x86/genapic/x2apic.c=0A+++ b/xen/arch/x86/genapic/x2apic.c=0A@@ = -19,6 +19,7 @@=0A =0A #include =0A #include =0A+#= include =0A #include =0A #include = =0A #include =0A@@ -33,6 +34,14 @@ static bool_t __initdata = x2apic_phys; /*=0A boolean_param("x2apic_phys", x2apic_phys);=0A =0A = static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid);=0A+static = DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus);=0A+static cpumask_t = *cluster_cpus_spare;=0A+static DEFINE_PER_CPU(cpumask_var_t, scratch_mask);= =0A+=0A+static inline u32 x2apic_cluster(unsigned int cpu)=0A+{=0A+ = return per_cpu(cpu_2_logical_apicid, cpu) >> 16;=0A+}=0A =0A static void = init_apic_ldr_x2apic_phys(void)=0A {=0A@@ -40,20 +49,53 @@ static void = init_apic_ldr_x2apic_phys(vo=0A =0A static void init_apic_ldr_x2apic_cluste= r(void)=0A {=0A- this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR);= =0A+ unsigned int cpu, this_cpu =3D smp_processor_id();=0A+=0A+ = per_cpu(cpu_2_logical_apicid, this_cpu) =3D apic_read(APIC_LDR);=0A+=0A+ = if ( per_cpu(cluster_cpus, this_cpu) )=0A+ {=0A+ ASSERT(cpumask_= test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)));=0A+ return;=0A= + }=0A+=0A+ per_cpu(cluster_cpus, this_cpu) =3D cluster_cpus_spare;= =0A+ for_each_online_cpu ( cpu )=0A+ {=0A+ if (this_cpu = =3D=3D cpu || x2apic_cluster(this_cpu) !=3D x2apic_cluster(cpu))=0A+ = continue;=0A+ per_cpu(cluster_cpus, this_cpu) =3D per_cpu(clust= er_cpus, cpu);=0A+ break;=0A+ }=0A+ if ( per_cpu(cluster_cpus,= this_cpu) =3D=3D cluster_cpus_spare )=0A+ cluster_cpus_spare =3D = NULL;=0A+=0A+ cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))= ;=0A }=0A =0A static void __init clustered_apic_check_x2apic(void)=0A {=0A = }=0A =0A+static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(i= nt cpu)=0A+{=0A+ return per_cpu(cluster_cpus, cpu);=0A+}=0A+=0A static = unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask)=0A= {=0A- return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask));=0A+= unsigned int cpu =3D cpumask_first(cpumask);=0A+ unsigned int dest = =3D per_cpu(cpu_2_logical_apicid, cpu);=0A+ const cpumask_t *cluster_cpu= s =3D per_cpu(cluster_cpus, cpu);=0A+=0A+ for_each_cpu ( cpu, cluster_cp= us )=0A+ if ( cpumask_test_cpu(cpu, cpumask) )=0A+ dest = |=3D per_cpu(cpu_2_logical_apicid, cpu);=0A+=0A+ return dest;=0A }=0A = =0A-static void __send_IPI_mask_x2apic(=0A- const cpumask_t *cpumask, = int vector, unsigned int dest_mode)=0A+static void send_IPI_mask_x2apic_phy= s(const cpumask_t *cpumask, int vector)=0A {=0A unsigned int cpu;=0A = unsigned long flags;=0A@@ -77,23 +119,48 @@ static void __send_IPI_mask_x= 2apic(=0A {=0A if ( !cpu_online(cpu) || (cpu =3D=3D smp_process= or_id()) )=0A continue;=0A- msr_content =3D (dest_mode = =3D=3D APIC_DEST_PHYSICAL)=0A- ? cpu_physical_id(cpu) : = per_cpu(cpu_2_logical_apicid, cpu);=0A- msr_content =3D (msr_content= << 32) | APIC_DM_FIXED | dest_mode | vector;=0A+ msr_content =3D = cpu_physical_id(cpu);=0A+ msr_content =3D (msr_content << 32) | = APIC_DM_FIXED |=0A+ APIC_DEST_PHYSICAL | vector;=0A = apic_wrmsr(APIC_ICR, msr_content);=0A }=0A =0A local_irq_rest= ore(flags);=0A }=0A =0A-static void send_IPI_mask_x2apic_phys(const = cpumask_t *cpumask, int vector)=0A-{=0A- __send_IPI_mask_x2apic(cpumask,= vector, APIC_DEST_PHYSICAL);=0A-}=0A-=0A static void send_IPI_mask_x2apic_= cluster(const cpumask_t *cpumask, int vector)=0A {=0A- __send_IPI_mask_x= 2apic(cpumask, vector, APIC_DEST_LOGICAL);=0A+ unsigned int cpu =3D = smp_processor_id();=0A+ cpumask_t *ipimask =3D per_cpu(scratch_mask, = cpu);=0A+ const cpumask_t *cluster_cpus;=0A+ unsigned long flags;=0A+= =0A+ mb(); /* See above for an explanation. */=0A+=0A+ local_irq_save= (flags);=0A+=0A+ cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu= ));=0A+=0A+ for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty= (ipimask);=0A+ cpumask_andnot(ipimask, ipimask, cluster_cpus) = )=0A+ {=0A+ uint64_t msr_content =3D 0;=0A+=0A+ cluster_cp= us =3D per_cpu(cluster_cpus, cpumask_first(ipimask));=0A+ for_each_c= pu ( cpu, cluster_cpus )=0A+ {=0A+ if ( !cpumask_test_cpu= (cpu, ipimask) )=0A+ continue;=0A+ msr_content = |=3D per_cpu(cpu_2_logical_apicid, cpu);=0A+ }=0A+=0A+ = BUG_ON(!msr_content);=0A+ msr_content =3D (msr_content << 32) | = APIC_DM_FIXED |=0A+ APIC_DEST_LOGICAL | vector;=0A+ = apic_wrmsr(APIC_ICR, msr_content);=0A+ }=0A+=0A+ local_irq_resto= re(flags);=0A }=0A =0A static const struct genapic apic_x2apic_phys =3D = {=0A@@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_=0A = .init_apic_ldr =3D init_apic_ldr_x2apic_cluster,=0A .clustered_apic_che= ck =3D clustered_apic_check_x2apic,=0A .target_cpus =3D target_cpus_all= ,=0A- .vector_allocation_cpumask =3D vector_allocation_cpumask_phys,=0A+= .vector_allocation_cpumask =3D vector_allocation_cpumask_x2apic_cluster= ,=0A .cpu_mask_to_apicid =3D cpu_mask_to_apicid_x2apic_cluster,=0A = .send_IPI_mask =3D send_IPI_mask_x2apic_cluster,=0A .send_IPI_self =3D = send_IPI_self_x2apic=0A };=0A =0A+static int update_clusterinfo(=0A+ = struct notifier_block *nfb, unsigned long action, void *hcpu)=0A+{=0A+ = unsigned int cpu =3D (unsigned long)hcpu;=0A+ int err =3D 0;=0A+=0A+ = switch (action) {=0A+ case CPU_UP_PREPARE:=0A+ per_cpu(cpu_2_logi= cal_apicid, cpu) =3D BAD_APICID;=0A+ if ( !cluster_cpus_spare )=0A+ = cluster_cpus_spare =3D xzalloc(cpumask_t);=0A+ if ( = !cluster_cpus_spare ||=0A+ !alloc_cpumask_var(&per_cpu(scratch_= mask, cpu)) )=0A+ err =3D -ENOMEM;=0A+ break;=0A+ = case CPU_UP_CANCELED:=0A+ case CPU_DEAD:=0A+ if ( per_cpu(cluster= _cpus, cpu) )=0A+ {=0A+ cpumask_clear_cpu(cpu, per_cpu(cl= uster_cpus, cpu));=0A+ if ( cpumask_empty(per_cpu(cluster_cpus, = cpu)) )=0A+ xfree(per_cpu(cluster_cpus, cpu));=0A+ = }=0A+ free_cpumask_var(per_cpu(scratch_mask, cpu));=0A+ = break;=0A+ }=0A+=0A+ return !err ? NOTIFY_DONE : notifier_from_errno(= err);=0A+}=0A+=0A+static struct notifier_block x2apic_cpu_nfb =3D {=0A+ = .notifier_call =3D update_clusterinfo=0A+};=0A+=0A const struct genapic = *__init apic_x2apic_probe(void)=0A {=0A- return x2apic_phys ? &apic_x2ap= ic_phys : &apic_x2apic_cluster;=0A+ if ( x2apic_phys )=0A+ = return &apic_x2apic_phys;=0A+=0A+ if ( !this_cpu(cluster_cpus) )=0A+ = {=0A+ update_clusterinfo(NULL, CPU_UP_PREPARE,=0A+ = (void *)(long)smp_processor_id());=0A+ init_apic_ldr_x2apic= _cluster();=0A+ register_cpu_notifier(&x2apic_cpu_nfb);=0A+ = }=0A+=0A+ return &apic_x2apic_cluster;=0A }=0A =0A void __init = check_x2apic_preenabled(void)=0A --=__PartBB8A7DD1.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartBB8A7DD1.0__=-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:03:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:03:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTdl-0001Bl-0V; Thu, 08 Nov 2012 15:03:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTdk-0001BX-0L for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:03:32 +0000 Received: from [85.158.137.99:31040] by server-6.bemta-3.messagelabs.com id 08/1A-28265-3C9CB905; Thu, 08 Nov 2012 15:03:31 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352387009!18185160!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1010 invoked from network); 8 Nov 2012 15:03:29 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-14.tower-217.messagelabs.com with SMTP; 8 Nov 2012 15:03:29 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:03:29 +0000 Message-Id: <509BD7D102000078000A7440@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:03:29 +0000 From: "Jan Beulich" To: "xen-devel" References: <509BD6E702000078000A742E@nat28.tlf.novell.com> In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartBB8A7DD1.0__=" Subject: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartBB8A7DD1.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline So far, cluster mode was just an alternative implementation of physical mode: Allowing only single CPU interrupt targets, and sending IPIs to each target CPU separately. Take advantage of what cluster mode really can do in that regard. Signed-off-by: Jan Beulich --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -19,6 +19,7 @@ =20 #include #include +#include #include #include #include @@ -33,6 +34,14 @@ static bool_t __initdata x2apic_phys; /* boolean_param("x2apic_phys", x2apic_phys); =20 static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); +static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); +static cpumask_t *cluster_cpus_spare; +static DEFINE_PER_CPU(cpumask_var_t, scratch_mask); + +static inline u32 x2apic_cluster(unsigned int cpu) +{ + return per_cpu(cpu_2_logical_apicid, cpu) >> 16; +} =20 static void init_apic_ldr_x2apic_phys(void) { @@ -40,20 +49,53 @@ static void init_apic_ldr_x2apic_phys(vo =20 static void init_apic_ldr_x2apic_cluster(void) { - this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR); + unsigned int cpu, this_cpu =3D smp_processor_id(); + + per_cpu(cpu_2_logical_apicid, this_cpu) =3D apic_read(APIC_LDR); + + if ( per_cpu(cluster_cpus, this_cpu) ) + { + ASSERT(cpumask_test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))= ); + return; + } + + per_cpu(cluster_cpus, this_cpu) =3D cluster_cpus_spare; + for_each_online_cpu ( cpu ) + { + if (this_cpu =3D=3D cpu || x2apic_cluster(this_cpu) !=3D = x2apic_cluster(cpu)) + continue; + per_cpu(cluster_cpus, this_cpu) =3D per_cpu(cluster_cpus, cpu); + break; + } + if ( per_cpu(cluster_cpus, this_cpu) =3D=3D cluster_cpus_spare ) + cluster_cpus_spare =3D NULL; + + cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); } =20 static void __init clustered_apic_check_x2apic(void) { } =20 +static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) +{ + return per_cpu(cluster_cpus, cpu); +} + static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t = *cpumask) { - return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); + unsigned int cpu =3D cpumask_first(cpumask); + unsigned int dest =3D per_cpu(cpu_2_logical_apicid, cpu); + const cpumask_t *cluster_cpus =3D per_cpu(cluster_cpus, cpu); + + for_each_cpu ( cpu, cluster_cpus ) + if ( cpumask_test_cpu(cpu, cpumask) ) + dest |=3D per_cpu(cpu_2_logical_apicid, cpu); + + return dest; } =20 -static void __send_IPI_mask_x2apic( - const cpumask_t *cpumask, int vector, unsigned int dest_mode) +static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int = vector) { unsigned int cpu; unsigned long flags; @@ -77,23 +119,48 @@ static void __send_IPI_mask_x2apic( { if ( !cpu_online(cpu) || (cpu =3D=3D smp_processor_id()) ) continue; - msr_content =3D (dest_mode =3D=3D APIC_DEST_PHYSICAL) - ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); - msr_content =3D (msr_content << 32) | APIC_DM_FIXED | dest_mode | = vector; + msr_content =3D cpu_physical_id(cpu); + msr_content =3D (msr_content << 32) | APIC_DM_FIXED | + APIC_DEST_PHYSICAL | vector; apic_wrmsr(APIC_ICR, msr_content); } =20 local_irq_restore(flags); } =20 -static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int = vector) -{ - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_PHYSICAL); -} - static void send_IPI_mask_x2apic_cluster(const cpumask_t *cpumask, int = vector) { - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_LOGICAL); + unsigned int cpu =3D smp_processor_id(); + cpumask_t *ipimask =3D per_cpu(scratch_mask, cpu); + const cpumask_t *cluster_cpus; + unsigned long flags; + + mb(); /* See above for an explanation. */ + + local_irq_save(flags); + + cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu)); + + for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty(ipimask);= + cpumask_andnot(ipimask, ipimask, cluster_cpus) ) + { + uint64_t msr_content =3D 0; + + cluster_cpus =3D per_cpu(cluster_cpus, cpumask_first(ipimask)); + for_each_cpu ( cpu, cluster_cpus ) + { + if ( !cpumask_test_cpu(cpu, ipimask) ) + continue; + msr_content |=3D per_cpu(cpu_2_logical_apicid, cpu); + } + + BUG_ON(!msr_content); + msr_content =3D (msr_content << 32) | APIC_DM_FIXED | + APIC_DEST_LOGICAL | vector; + apic_wrmsr(APIC_ICR, msr_content); + } + + local_irq_restore(flags); } =20 static const struct genapic apic_x2apic_phys =3D { @@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_ .init_apic_ldr =3D init_apic_ldr_x2apic_cluster, .clustered_apic_check =3D clustered_apic_check_x2apic, .target_cpus =3D target_cpus_all, - .vector_allocation_cpumask =3D vector_allocation_cpumask_phys, + .vector_allocation_cpumask =3D vector_allocation_cpumask_x2apic_cluste= r, .cpu_mask_to_apicid =3D cpu_mask_to_apicid_x2apic_cluster, .send_IPI_mask =3D send_IPI_mask_x2apic_cluster, .send_IPI_self =3D send_IPI_self_x2apic }; =20 +static int update_clusterinfo( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu =3D (unsigned long)hcpu; + int err =3D 0; + + switch (action) { + case CPU_UP_PREPARE: + per_cpu(cpu_2_logical_apicid, cpu) =3D BAD_APICID; + if ( !cluster_cpus_spare ) + cluster_cpus_spare =3D xzalloc(cpumask_t); + if ( !cluster_cpus_spare || + !alloc_cpumask_var(&per_cpu(scratch_mask, cpu)) ) + err =3D -ENOMEM; + break; + case CPU_UP_CANCELED: + case CPU_DEAD: + if ( per_cpu(cluster_cpus, cpu) ) + { + cpumask_clear_cpu(cpu, per_cpu(cluster_cpus, cpu)); + if ( cpumask_empty(per_cpu(cluster_cpus, cpu)) ) + xfree(per_cpu(cluster_cpus, cpu)); + } + free_cpumask_var(per_cpu(scratch_mask, cpu)); + break; + } + + return !err ? NOTIFY_DONE : notifier_from_errno(err); +} + +static struct notifier_block x2apic_cpu_nfb =3D { + .notifier_call =3D update_clusterinfo +}; + const struct genapic *__init apic_x2apic_probe(void) { - return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; + if ( x2apic_phys ) + return &apic_x2apic_phys; + + if ( !this_cpu(cluster_cpus) ) + { + update_clusterinfo(NULL, CPU_UP_PREPARE, + (void *)(long)smp_processor_id()); + init_apic_ldr_x2apic_cluster(); + register_cpu_notifier(&x2apic_cpu_nfb); + } + + return &apic_x2apic_cluster; } =20 void __init check_x2apic_preenabled(void) --=__PartBB8A7DD1.0__= Content-Type: text/plain; name="x86-x2apic-cluster.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="x86-x2apic-cluster.patch" x86/x2apic: properly implement cluster mode=0A=0ASo far, cluster mode was = just an alternative implementation of=0Aphysical mode: Allowing only = single CPU interrupt targets, and sending=0AIPIs to each target CPU = separately. Take advantage of what cluster=0Amode really can do in that = regard.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/arch/x86/genapic/x2apic.c=0A+++ b/xen/arch/x86/genapic/x2apic.c=0A@@ = -19,6 +19,7 @@=0A =0A #include =0A #include =0A+#= include =0A #include =0A #include = =0A #include =0A@@ -33,6 +34,14 @@ static bool_t __initdata = x2apic_phys; /*=0A boolean_param("x2apic_phys", x2apic_phys);=0A =0A = static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid);=0A+static = DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus);=0A+static cpumask_t = *cluster_cpus_spare;=0A+static DEFINE_PER_CPU(cpumask_var_t, scratch_mask);= =0A+=0A+static inline u32 x2apic_cluster(unsigned int cpu)=0A+{=0A+ = return per_cpu(cpu_2_logical_apicid, cpu) >> 16;=0A+}=0A =0A static void = init_apic_ldr_x2apic_phys(void)=0A {=0A@@ -40,20 +49,53 @@ static void = init_apic_ldr_x2apic_phys(vo=0A =0A static void init_apic_ldr_x2apic_cluste= r(void)=0A {=0A- this_cpu(cpu_2_logical_apicid) =3D apic_read(APIC_LDR);= =0A+ unsigned int cpu, this_cpu =3D smp_processor_id();=0A+=0A+ = per_cpu(cpu_2_logical_apicid, this_cpu) =3D apic_read(APIC_LDR);=0A+=0A+ = if ( per_cpu(cluster_cpus, this_cpu) )=0A+ {=0A+ ASSERT(cpumask_= test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)));=0A+ return;=0A= + }=0A+=0A+ per_cpu(cluster_cpus, this_cpu) =3D cluster_cpus_spare;= =0A+ for_each_online_cpu ( cpu )=0A+ {=0A+ if (this_cpu = =3D=3D cpu || x2apic_cluster(this_cpu) !=3D x2apic_cluster(cpu))=0A+ = continue;=0A+ per_cpu(cluster_cpus, this_cpu) =3D per_cpu(clust= er_cpus, cpu);=0A+ break;=0A+ }=0A+ if ( per_cpu(cluster_cpus,= this_cpu) =3D=3D cluster_cpus_spare )=0A+ cluster_cpus_spare =3D = NULL;=0A+=0A+ cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))= ;=0A }=0A =0A static void __init clustered_apic_check_x2apic(void)=0A {=0A = }=0A =0A+static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(i= nt cpu)=0A+{=0A+ return per_cpu(cluster_cpus, cpu);=0A+}=0A+=0A static = unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask)=0A= {=0A- return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask));=0A+= unsigned int cpu =3D cpumask_first(cpumask);=0A+ unsigned int dest = =3D per_cpu(cpu_2_logical_apicid, cpu);=0A+ const cpumask_t *cluster_cpu= s =3D per_cpu(cluster_cpus, cpu);=0A+=0A+ for_each_cpu ( cpu, cluster_cp= us )=0A+ if ( cpumask_test_cpu(cpu, cpumask) )=0A+ dest = |=3D per_cpu(cpu_2_logical_apicid, cpu);=0A+=0A+ return dest;=0A }=0A = =0A-static void __send_IPI_mask_x2apic(=0A- const cpumask_t *cpumask, = int vector, unsigned int dest_mode)=0A+static void send_IPI_mask_x2apic_phy= s(const cpumask_t *cpumask, int vector)=0A {=0A unsigned int cpu;=0A = unsigned long flags;=0A@@ -77,23 +119,48 @@ static void __send_IPI_mask_x= 2apic(=0A {=0A if ( !cpu_online(cpu) || (cpu =3D=3D smp_process= or_id()) )=0A continue;=0A- msr_content =3D (dest_mode = =3D=3D APIC_DEST_PHYSICAL)=0A- ? cpu_physical_id(cpu) : = per_cpu(cpu_2_logical_apicid, cpu);=0A- msr_content =3D (msr_content= << 32) | APIC_DM_FIXED | dest_mode | vector;=0A+ msr_content =3D = cpu_physical_id(cpu);=0A+ msr_content =3D (msr_content << 32) | = APIC_DM_FIXED |=0A+ APIC_DEST_PHYSICAL | vector;=0A = apic_wrmsr(APIC_ICR, msr_content);=0A }=0A =0A local_irq_rest= ore(flags);=0A }=0A =0A-static void send_IPI_mask_x2apic_phys(const = cpumask_t *cpumask, int vector)=0A-{=0A- __send_IPI_mask_x2apic(cpumask,= vector, APIC_DEST_PHYSICAL);=0A-}=0A-=0A static void send_IPI_mask_x2apic_= cluster(const cpumask_t *cpumask, int vector)=0A {=0A- __send_IPI_mask_x= 2apic(cpumask, vector, APIC_DEST_LOGICAL);=0A+ unsigned int cpu =3D = smp_processor_id();=0A+ cpumask_t *ipimask =3D per_cpu(scratch_mask, = cpu);=0A+ const cpumask_t *cluster_cpus;=0A+ unsigned long flags;=0A+= =0A+ mb(); /* See above for an explanation. */=0A+=0A+ local_irq_save= (flags);=0A+=0A+ cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu= ));=0A+=0A+ for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty= (ipimask);=0A+ cpumask_andnot(ipimask, ipimask, cluster_cpus) = )=0A+ {=0A+ uint64_t msr_content =3D 0;=0A+=0A+ cluster_cp= us =3D per_cpu(cluster_cpus, cpumask_first(ipimask));=0A+ for_each_c= pu ( cpu, cluster_cpus )=0A+ {=0A+ if ( !cpumask_test_cpu= (cpu, ipimask) )=0A+ continue;=0A+ msr_content = |=3D per_cpu(cpu_2_logical_apicid, cpu);=0A+ }=0A+=0A+ = BUG_ON(!msr_content);=0A+ msr_content =3D (msr_content << 32) | = APIC_DM_FIXED |=0A+ APIC_DEST_LOGICAL | vector;=0A+ = apic_wrmsr(APIC_ICR, msr_content);=0A+ }=0A+=0A+ local_irq_resto= re(flags);=0A }=0A =0A static const struct genapic apic_x2apic_phys =3D = {=0A@@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_=0A = .init_apic_ldr =3D init_apic_ldr_x2apic_cluster,=0A .clustered_apic_che= ck =3D clustered_apic_check_x2apic,=0A .target_cpus =3D target_cpus_all= ,=0A- .vector_allocation_cpumask =3D vector_allocation_cpumask_phys,=0A+= .vector_allocation_cpumask =3D vector_allocation_cpumask_x2apic_cluster= ,=0A .cpu_mask_to_apicid =3D cpu_mask_to_apicid_x2apic_cluster,=0A = .send_IPI_mask =3D send_IPI_mask_x2apic_cluster,=0A .send_IPI_self =3D = send_IPI_self_x2apic=0A };=0A =0A+static int update_clusterinfo(=0A+ = struct notifier_block *nfb, unsigned long action, void *hcpu)=0A+{=0A+ = unsigned int cpu =3D (unsigned long)hcpu;=0A+ int err =3D 0;=0A+=0A+ = switch (action) {=0A+ case CPU_UP_PREPARE:=0A+ per_cpu(cpu_2_logi= cal_apicid, cpu) =3D BAD_APICID;=0A+ if ( !cluster_cpus_spare )=0A+ = cluster_cpus_spare =3D xzalloc(cpumask_t);=0A+ if ( = !cluster_cpus_spare ||=0A+ !alloc_cpumask_var(&per_cpu(scratch_= mask, cpu)) )=0A+ err =3D -ENOMEM;=0A+ break;=0A+ = case CPU_UP_CANCELED:=0A+ case CPU_DEAD:=0A+ if ( per_cpu(cluster= _cpus, cpu) )=0A+ {=0A+ cpumask_clear_cpu(cpu, per_cpu(cl= uster_cpus, cpu));=0A+ if ( cpumask_empty(per_cpu(cluster_cpus, = cpu)) )=0A+ xfree(per_cpu(cluster_cpus, cpu));=0A+ = }=0A+ free_cpumask_var(per_cpu(scratch_mask, cpu));=0A+ = break;=0A+ }=0A+=0A+ return !err ? NOTIFY_DONE : notifier_from_errno(= err);=0A+}=0A+=0A+static struct notifier_block x2apic_cpu_nfb =3D {=0A+ = .notifier_call =3D update_clusterinfo=0A+};=0A+=0A const struct genapic = *__init apic_x2apic_probe(void)=0A {=0A- return x2apic_phys ? &apic_x2ap= ic_phys : &apic_x2apic_cluster;=0A+ if ( x2apic_phys )=0A+ = return &apic_x2apic_phys;=0A+=0A+ if ( !this_cpu(cluster_cpus) )=0A+ = {=0A+ update_clusterinfo(NULL, CPU_UP_PREPARE,=0A+ = (void *)(long)smp_processor_id());=0A+ init_apic_ldr_x2apic= _cluster();=0A+ register_cpu_notifier(&x2apic_cpu_nfb);=0A+ = }=0A+=0A+ return &apic_x2apic_cluster;=0A }=0A =0A void __init = check_x2apic_preenabled(void)=0A --=__PartBB8A7DD1.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartBB8A7DD1.0__=-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:18:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:18:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTrk-0001W4-Kz; Thu, 08 Nov 2012 15:18:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTrj-0001Vz-2Y for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:17:59 +0000 Received: from [85.158.139.83:20752] by server-14.bemta-5.messagelabs.com id 1B/1B-21768-62DCB905; Thu, 08 Nov 2012 15:17:58 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1352387877!24787396!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20382 invoked from network); 8 Nov 2012 15:17:57 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:17:57 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1946516eek.32 for ; Thu, 08 Nov 2012 07:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=/KUmASIQJWeijtV0H1Pn4m1h3+KNZc7k01iLXxoICMs=; b=jWfm6tOBv23PbloG4P4oU6tF2UQkcHTAQNqt8+iy1isp6OSHIdQS+W7YlFANZl5MlO 5b9itCO8f5Gp6ygu1yHbrOnNDlwv5McCk5xJau2bvWFqQJMrIxmsOxn+R+eDhvRr6aRE dbZ7iMTHVCKU4/HoMHZx/+XuR5Y/W3QXz7HFGlgqrtay65mTmuwEMCUscunj1GHXJyVF cALTV2edmW7bhbmxs79565N0TiWzQ80Dksvp9YhKW9TbVjpaf5uEs+zqDrmau2hey8ci 75lj4EjI9idzirBljekVELjqNvgaVbmtbU+8V+xKznDfI2tkq3oavrFRbpyC6VkpT6mT dCBA== Received: by 10.14.214.2 with SMTP id b2mr28363057eep.32.1352387877145; Thu, 08 Nov 2012 07:17:57 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id t7sm70843191eel.14.2012.11.08.07.17.55 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:17:56 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 15:17:45 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode Thread-Index: Ac29xDQp3gwAiOemPEStfcA1GgAuHQ== In-Reply-To: <509BD7D102000078000A7440@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:03, "Jan Beulich" wrote: > So far, cluster mode was just an alternative implementation of > physical mode: Allowing only single CPU interrupt targets, and sending > IPIs to each target CPU separately. Take advantage of what cluster > mode really can do in that regard. What does it allow? Multicast within certain constraints? I know it's not part of our coding style, but some comments would be nice. ;) -- Keir > Signed-off-by: Jan Beulich > > --- a/xen/arch/x86/genapic/x2apic.c > +++ b/xen/arch/x86/genapic/x2apic.c > @@ -19,6 +19,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -33,6 +34,14 @@ static bool_t __initdata x2apic_phys; /* > boolean_param("x2apic_phys", x2apic_phys); > > static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); > +static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); > +static cpumask_t *cluster_cpus_spare; > +static DEFINE_PER_CPU(cpumask_var_t, scratch_mask); > + > +static inline u32 x2apic_cluster(unsigned int cpu) > +{ > + return per_cpu(cpu_2_logical_apicid, cpu) >> 16; > +} > > static void init_apic_ldr_x2apic_phys(void) > { > @@ -40,20 +49,53 @@ static void init_apic_ldr_x2apic_phys(vo > > static void init_apic_ldr_x2apic_cluster(void) > { > - this_cpu(cpu_2_logical_apicid) = apic_read(APIC_LDR); > + unsigned int cpu, this_cpu = smp_processor_id(); > + > + per_cpu(cpu_2_logical_apicid, this_cpu) = apic_read(APIC_LDR); > + > + if ( per_cpu(cluster_cpus, this_cpu) ) > + { > + ASSERT(cpumask_test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))); > + return; > + } > + > + per_cpu(cluster_cpus, this_cpu) = cluster_cpus_spare; > + for_each_online_cpu ( cpu ) > + { > + if (this_cpu == cpu || x2apic_cluster(this_cpu) != > x2apic_cluster(cpu)) > + continue; > + per_cpu(cluster_cpus, this_cpu) = per_cpu(cluster_cpus, cpu); > + break; > + } > + if ( per_cpu(cluster_cpus, this_cpu) == cluster_cpus_spare ) > + cluster_cpus_spare = NULL; > + > + cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); > } > > static void __init clustered_apic_check_x2apic(void) > { > } > > +static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) > +{ > + return per_cpu(cluster_cpus, cpu); > +} > + > static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t > *cpumask) > { > - return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); > + unsigned int cpu = cpumask_first(cpumask); > + unsigned int dest = per_cpu(cpu_2_logical_apicid, cpu); > + const cpumask_t *cluster_cpus = per_cpu(cluster_cpus, cpu); > + > + for_each_cpu ( cpu, cluster_cpus ) > + if ( cpumask_test_cpu(cpu, cpumask) ) > + dest |= per_cpu(cpu_2_logical_apicid, cpu); > + > + return dest; > } > > -static void __send_IPI_mask_x2apic( > - const cpumask_t *cpumask, int vector, unsigned int dest_mode) > +static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) > { > unsigned int cpu; > unsigned long flags; > @@ -77,23 +119,48 @@ static void __send_IPI_mask_x2apic( > { > if ( !cpu_online(cpu) || (cpu == smp_processor_id()) ) > continue; > - msr_content = (dest_mode == APIC_DEST_PHYSICAL) > - ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); > - msr_content = (msr_content << 32) | APIC_DM_FIXED | dest_mode | > vector; > + msr_content = cpu_physical_id(cpu); > + msr_content = (msr_content << 32) | APIC_DM_FIXED | > + APIC_DEST_PHYSICAL | vector; > apic_wrmsr(APIC_ICR, msr_content); > } > > local_irq_restore(flags); > } > > -static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) > -{ > - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_PHYSICAL); > -} > - > static void send_IPI_mask_x2apic_cluster(const cpumask_t *cpumask, int > vector) > { > - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_LOGICAL); > + unsigned int cpu = smp_processor_id(); > + cpumask_t *ipimask = per_cpu(scratch_mask, cpu); > + const cpumask_t *cluster_cpus; > + unsigned long flags; > + > + mb(); /* See above for an explanation. */ > + > + local_irq_save(flags); > + > + cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu)); > + > + for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty(ipimask); > + cpumask_andnot(ipimask, ipimask, cluster_cpus) ) > + { > + uint64_t msr_content = 0; > + > + cluster_cpus = per_cpu(cluster_cpus, cpumask_first(ipimask)); > + for_each_cpu ( cpu, cluster_cpus ) > + { > + if ( !cpumask_test_cpu(cpu, ipimask) ) > + continue; > + msr_content |= per_cpu(cpu_2_logical_apicid, cpu); > + } > + > + BUG_ON(!msr_content); > + msr_content = (msr_content << 32) | APIC_DM_FIXED | > + APIC_DEST_LOGICAL | vector; > + apic_wrmsr(APIC_ICR, msr_content); > + } > + > + local_irq_restore(flags); > } > > static const struct genapic apic_x2apic_phys = { > @@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_ > .init_apic_ldr = init_apic_ldr_x2apic_cluster, > .clustered_apic_check = clustered_apic_check_x2apic, > .target_cpus = target_cpus_all, > - .vector_allocation_cpumask = vector_allocation_cpumask_phys, > + .vector_allocation_cpumask = vector_allocation_cpumask_x2apic_cluster, > .cpu_mask_to_apicid = cpu_mask_to_apicid_x2apic_cluster, > .send_IPI_mask = send_IPI_mask_x2apic_cluster, > .send_IPI_self = send_IPI_self_x2apic > }; > > +static int update_clusterinfo( > + struct notifier_block *nfb, unsigned long action, void *hcpu) > +{ > + unsigned int cpu = (unsigned long)hcpu; > + int err = 0; > + > + switch (action) { > + case CPU_UP_PREPARE: > + per_cpu(cpu_2_logical_apicid, cpu) = BAD_APICID; > + if ( !cluster_cpus_spare ) > + cluster_cpus_spare = xzalloc(cpumask_t); > + if ( !cluster_cpus_spare || > + !alloc_cpumask_var(&per_cpu(scratch_mask, cpu)) ) > + err = -ENOMEM; > + break; > + case CPU_UP_CANCELED: > + case CPU_DEAD: > + if ( per_cpu(cluster_cpus, cpu) ) > + { > + cpumask_clear_cpu(cpu, per_cpu(cluster_cpus, cpu)); > + if ( cpumask_empty(per_cpu(cluster_cpus, cpu)) ) > + xfree(per_cpu(cluster_cpus, cpu)); > + } > + free_cpumask_var(per_cpu(scratch_mask, cpu)); > + break; > + } > + > + return !err ? NOTIFY_DONE : notifier_from_errno(err); > +} > + > +static struct notifier_block x2apic_cpu_nfb = { > + .notifier_call = update_clusterinfo > +}; > + > const struct genapic *__init apic_x2apic_probe(void) > { > - return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; > + if ( x2apic_phys ) > + return &apic_x2apic_phys; > + > + if ( !this_cpu(cluster_cpus) ) > + { > + update_clusterinfo(NULL, CPU_UP_PREPARE, > + (void *)(long)smp_processor_id()); > + init_apic_ldr_x2apic_cluster(); > + register_cpu_notifier(&x2apic_cpu_nfb); > + } > + > + return &apic_x2apic_cluster; > } > > void __init check_x2apic_preenabled(void) > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:18:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:18:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTrk-0001W4-Kz; Thu, 08 Nov 2012 15:18:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTrj-0001Vz-2Y for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:17:59 +0000 Received: from [85.158.139.83:20752] by server-14.bemta-5.messagelabs.com id 1B/1B-21768-62DCB905; Thu, 08 Nov 2012 15:17:58 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1352387877!24787396!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20382 invoked from network); 8 Nov 2012 15:17:57 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:17:57 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so1946516eek.32 for ; Thu, 08 Nov 2012 07:17:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=/KUmASIQJWeijtV0H1Pn4m1h3+KNZc7k01iLXxoICMs=; b=jWfm6tOBv23PbloG4P4oU6tF2UQkcHTAQNqt8+iy1isp6OSHIdQS+W7YlFANZl5MlO 5b9itCO8f5Gp6ygu1yHbrOnNDlwv5McCk5xJau2bvWFqQJMrIxmsOxn+R+eDhvRr6aRE dbZ7iMTHVCKU4/HoMHZx/+XuR5Y/W3QXz7HFGlgqrtay65mTmuwEMCUscunj1GHXJyVF cALTV2edmW7bhbmxs79565N0TiWzQ80Dksvp9YhKW9TbVjpaf5uEs+zqDrmau2hey8ci 75lj4EjI9idzirBljekVELjqNvgaVbmtbU+8V+xKznDfI2tkq3oavrFRbpyC6VkpT6mT dCBA== Received: by 10.14.214.2 with SMTP id b2mr28363057eep.32.1352387877145; Thu, 08 Nov 2012 07:17:57 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id t7sm70843191eel.14.2012.11.08.07.17.55 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:17:56 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 15:17:45 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode Thread-Index: Ac29xDQp3gwAiOemPEStfcA1GgAuHQ== In-Reply-To: <509BD7D102000078000A7440@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:03, "Jan Beulich" wrote: > So far, cluster mode was just an alternative implementation of > physical mode: Allowing only single CPU interrupt targets, and sending > IPIs to each target CPU separately. Take advantage of what cluster > mode really can do in that regard. What does it allow? Multicast within certain constraints? I know it's not part of our coding style, but some comments would be nice. ;) -- Keir > Signed-off-by: Jan Beulich > > --- a/xen/arch/x86/genapic/x2apic.c > +++ b/xen/arch/x86/genapic/x2apic.c > @@ -19,6 +19,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -33,6 +34,14 @@ static bool_t __initdata x2apic_phys; /* > boolean_param("x2apic_phys", x2apic_phys); > > static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); > +static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); > +static cpumask_t *cluster_cpus_spare; > +static DEFINE_PER_CPU(cpumask_var_t, scratch_mask); > + > +static inline u32 x2apic_cluster(unsigned int cpu) > +{ > + return per_cpu(cpu_2_logical_apicid, cpu) >> 16; > +} > > static void init_apic_ldr_x2apic_phys(void) > { > @@ -40,20 +49,53 @@ static void init_apic_ldr_x2apic_phys(vo > > static void init_apic_ldr_x2apic_cluster(void) > { > - this_cpu(cpu_2_logical_apicid) = apic_read(APIC_LDR); > + unsigned int cpu, this_cpu = smp_processor_id(); > + > + per_cpu(cpu_2_logical_apicid, this_cpu) = apic_read(APIC_LDR); > + > + if ( per_cpu(cluster_cpus, this_cpu) ) > + { > + ASSERT(cpumask_test_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu))); > + return; > + } > + > + per_cpu(cluster_cpus, this_cpu) = cluster_cpus_spare; > + for_each_online_cpu ( cpu ) > + { > + if (this_cpu == cpu || x2apic_cluster(this_cpu) != > x2apic_cluster(cpu)) > + continue; > + per_cpu(cluster_cpus, this_cpu) = per_cpu(cluster_cpus, cpu); > + break; > + } > + if ( per_cpu(cluster_cpus, this_cpu) == cluster_cpus_spare ) > + cluster_cpus_spare = NULL; > + > + cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); > } > > static void __init clustered_apic_check_x2apic(void) > { > } > > +static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) > +{ > + return per_cpu(cluster_cpus, cpu); > +} > + > static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t > *cpumask) > { > - return per_cpu(cpu_2_logical_apicid, cpumask_first(cpumask)); > + unsigned int cpu = cpumask_first(cpumask); > + unsigned int dest = per_cpu(cpu_2_logical_apicid, cpu); > + const cpumask_t *cluster_cpus = per_cpu(cluster_cpus, cpu); > + > + for_each_cpu ( cpu, cluster_cpus ) > + if ( cpumask_test_cpu(cpu, cpumask) ) > + dest |= per_cpu(cpu_2_logical_apicid, cpu); > + > + return dest; > } > > -static void __send_IPI_mask_x2apic( > - const cpumask_t *cpumask, int vector, unsigned int dest_mode) > +static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) > { > unsigned int cpu; > unsigned long flags; > @@ -77,23 +119,48 @@ static void __send_IPI_mask_x2apic( > { > if ( !cpu_online(cpu) || (cpu == smp_processor_id()) ) > continue; > - msr_content = (dest_mode == APIC_DEST_PHYSICAL) > - ? cpu_physical_id(cpu) : per_cpu(cpu_2_logical_apicid, cpu); > - msr_content = (msr_content << 32) | APIC_DM_FIXED | dest_mode | > vector; > + msr_content = cpu_physical_id(cpu); > + msr_content = (msr_content << 32) | APIC_DM_FIXED | > + APIC_DEST_PHYSICAL | vector; > apic_wrmsr(APIC_ICR, msr_content); > } > > local_irq_restore(flags); > } > > -static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) > -{ > - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_PHYSICAL); > -} > - > static void send_IPI_mask_x2apic_cluster(const cpumask_t *cpumask, int > vector) > { > - __send_IPI_mask_x2apic(cpumask, vector, APIC_DEST_LOGICAL); > + unsigned int cpu = smp_processor_id(); > + cpumask_t *ipimask = per_cpu(scratch_mask, cpu); > + const cpumask_t *cluster_cpus; > + unsigned long flags; > + > + mb(); /* See above for an explanation. */ > + > + local_irq_save(flags); > + > + cpumask_andnot(ipimask, &cpu_online_map, cpumask_of(cpu)); > + > + for ( cpumask_and(ipimask, cpumask, ipimask); !cpumask_empty(ipimask); > + cpumask_andnot(ipimask, ipimask, cluster_cpus) ) > + { > + uint64_t msr_content = 0; > + > + cluster_cpus = per_cpu(cluster_cpus, cpumask_first(ipimask)); > + for_each_cpu ( cpu, cluster_cpus ) > + { > + if ( !cpumask_test_cpu(cpu, ipimask) ) > + continue; > + msr_content |= per_cpu(cpu_2_logical_apicid, cpu); > + } > + > + BUG_ON(!msr_content); > + msr_content = (msr_content << 32) | APIC_DM_FIXED | > + APIC_DEST_LOGICAL | vector; > + apic_wrmsr(APIC_ICR, msr_content); > + } > + > + local_irq_restore(flags); > } > > static const struct genapic apic_x2apic_phys = { > @@ -116,15 +183,60 @@ static const struct genapic apic_x2apic_ > .init_apic_ldr = init_apic_ldr_x2apic_cluster, > .clustered_apic_check = clustered_apic_check_x2apic, > .target_cpus = target_cpus_all, > - .vector_allocation_cpumask = vector_allocation_cpumask_phys, > + .vector_allocation_cpumask = vector_allocation_cpumask_x2apic_cluster, > .cpu_mask_to_apicid = cpu_mask_to_apicid_x2apic_cluster, > .send_IPI_mask = send_IPI_mask_x2apic_cluster, > .send_IPI_self = send_IPI_self_x2apic > }; > > +static int update_clusterinfo( > + struct notifier_block *nfb, unsigned long action, void *hcpu) > +{ > + unsigned int cpu = (unsigned long)hcpu; > + int err = 0; > + > + switch (action) { > + case CPU_UP_PREPARE: > + per_cpu(cpu_2_logical_apicid, cpu) = BAD_APICID; > + if ( !cluster_cpus_spare ) > + cluster_cpus_spare = xzalloc(cpumask_t); > + if ( !cluster_cpus_spare || > + !alloc_cpumask_var(&per_cpu(scratch_mask, cpu)) ) > + err = -ENOMEM; > + break; > + case CPU_UP_CANCELED: > + case CPU_DEAD: > + if ( per_cpu(cluster_cpus, cpu) ) > + { > + cpumask_clear_cpu(cpu, per_cpu(cluster_cpus, cpu)); > + if ( cpumask_empty(per_cpu(cluster_cpus, cpu)) ) > + xfree(per_cpu(cluster_cpus, cpu)); > + } > + free_cpumask_var(per_cpu(scratch_mask, cpu)); > + break; > + } > + > + return !err ? NOTIFY_DONE : notifier_from_errno(err); > +} > + > +static struct notifier_block x2apic_cpu_nfb = { > + .notifier_call = update_clusterinfo > +}; > + > const struct genapic *__init apic_x2apic_probe(void) > { > - return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster; > + if ( x2apic_phys ) > + return &apic_x2apic_phys; > + > + if ( !this_cpu(cluster_cpus) ) > + { > + update_clusterinfo(NULL, CPU_UP_PREPARE, > + (void *)(long)smp_processor_id()); > + init_apic_ldr_x2apic_cluster(); > + register_cpu_notifier(&x2apic_cpu_nfb); > + } > + > + return &apic_x2apic_cluster; > } > > void __init check_x2apic_preenabled(void) > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:18:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:18:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTs4-0001Wj-1W; Thu, 08 Nov 2012 15:18:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTs1-0001WY-VX for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:18:18 +0000 Received: from [85.158.139.83:26305] by server-4.bemta-5.messagelabs.com id 5B/76-15011-93DCB905; Thu, 08 Nov 2012 15:18:17 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352387896!28836877!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3814 invoked from network); 8 Nov 2012 15:18:16 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:18:16 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so1314298wgb.32 for ; Thu, 08 Nov 2012 07:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=jXJjpciHAyVG1oy4oFZ8I4OW41PST/WHMTZ2cT1Btks=; b=D6vPsuKhty69O2FnylwWRSL66hF4okguqLB+UV0HEYYMgFaqI9555nVCyKSiOPw+7Q /Fp47QXLpQef/Zh7y70l02DZowbYY8UyXFLXKO8+admlWTuJBnpYlzznn4QmAjMRNzG6 g1D2qoMqBa9z3abML0rkkFFKPj1K5Z/FuLltWT2Kzv4kEAewuFgR8Fk2HFUzBOEp492n KfulfvtrrXygMWQqH+iS1GgbHMPEjaZN0olK17gT0a6jpjVOETS0QdhwnhzuqC8xiTn3 HXT+V/yPPfZTpUsaveV4hb/sbzcaFjHHoDnPZXa+1LZavVFkYF9cUdMDvmojxC13G79N 4ykQ== Received: by 10.216.205.145 with SMTP id j17mr3276060weo.95.1352387896261; Thu, 08 Nov 2012 07:18:16 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ea9sm8729628wib.11.2012.11.08.07.18.14 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:18:15 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 15:18:10 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH 0/2] x86: x2apic improvements Thread-Index: Ac29xEMQrxUGbrIsPkCpY5HMWPW3iQ== In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH 0/2] x86: x2apic improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 14:59, "Jan Beulich" wrote: > 1: make cpu_2_logical_apicid private to x2apic code > 2: x2apic: properly implement cluster mode > > Signed-off-by: Jan Beulich Had a minor comment on patch 2, but apart from that... Acked-by: Keir Fraser > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:18:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:18:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTs4-0001Wj-1W; Thu, 08 Nov 2012 15:18:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTs1-0001WY-VX for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:18:18 +0000 Received: from [85.158.139.83:26305] by server-4.bemta-5.messagelabs.com id 5B/76-15011-93DCB905; Thu, 08 Nov 2012 15:18:17 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352387896!28836877!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3814 invoked from network); 8 Nov 2012 15:18:16 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:18:16 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so1314298wgb.32 for ; Thu, 08 Nov 2012 07:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=jXJjpciHAyVG1oy4oFZ8I4OW41PST/WHMTZ2cT1Btks=; b=D6vPsuKhty69O2FnylwWRSL66hF4okguqLB+UV0HEYYMgFaqI9555nVCyKSiOPw+7Q /Fp47QXLpQef/Zh7y70l02DZowbYY8UyXFLXKO8+admlWTuJBnpYlzznn4QmAjMRNzG6 g1D2qoMqBa9z3abML0rkkFFKPj1K5Z/FuLltWT2Kzv4kEAewuFgR8Fk2HFUzBOEp492n KfulfvtrrXygMWQqH+iS1GgbHMPEjaZN0olK17gT0a6jpjVOETS0QdhwnhzuqC8xiTn3 HXT+V/yPPfZTpUsaveV4hb/sbzcaFjHHoDnPZXa+1LZavVFkYF9cUdMDvmojxC13G79N 4ykQ== Received: by 10.216.205.145 with SMTP id j17mr3276060weo.95.1352387896261; Thu, 08 Nov 2012 07:18:16 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id ea9sm8729628wib.11.2012.11.08.07.18.14 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:18:15 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 15:18:10 +0000 From: Keir Fraser To: Jan Beulich , xen-devel Message-ID: Thread-Topic: [Xen-devel] [PATCH 0/2] x86: x2apic improvements Thread-Index: Ac29xEMQrxUGbrIsPkCpY5HMWPW3iQ== In-Reply-To: <509BD6E702000078000A742E@nat28.tlf.novell.com> Mime-version: 1.0 Subject: Re: [Xen-devel] [PATCH 0/2] x86: x2apic improvements X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 14:59, "Jan Beulich" wrote: > 1: make cpu_2_logical_apicid private to x2apic code > 2: x2apic: properly implement cluster mode > > Signed-off-by: Jan Beulich Had a minor comment on patch 2, but apart from that... Acked-by: Keir Fraser > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:22:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTvR-0001kB-MT; Thu, 08 Nov 2012 15:21:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTvQ-0001k4-0X for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:21:48 +0000 Received: from [85.158.143.99:32001] by server-1.bemta-4.messagelabs.com id 03/01-27934-B0ECB905; Thu, 08 Nov 2012 15:21:47 +0000 X-Env-Sender: mrsanna1@gmail.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352388104!23887831!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14291 invoked from network); 8 Nov 2012 15:21:45 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:21:45 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so3434705obb.32 for ; Thu, 08 Nov 2012 07:21:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=IyiMrhOcBa31S8PGEaWKKnB+wZws5YrpOQg4avT17Dc=; b=XAVF+6rCtAGQD+fVye4ZHkklmqwwV8olvPgMJyRIJqtg2Azer3jNo7gD+KsI4PCblf BP1Ws4r9uHs6vJZI6W+wEc6m33wnQoBNyAlt4GYDlgIdQBsgtP5bFVtcrkmU29u2pSJu oeOm/chUxe8Fc6EaY9X781tWOu3ymXCk+HVxVmnp0yRRZjdPoL9TZQ8CR0x6bKTHonrz S692Vq24NGg9ozWFcilZ2pvyKTPmKGF/uP846kw2xIaUb5EefsU2u5CvjtLJM6OkZkfH ioUGrNJHcsRKeYBMFuUVoCj9WZkIfCNhzmzGQqWDViykSdT1loJ7PJcDBvuQ6UyCkoQJ ZwPQ== MIME-Version: 1.0 Received: by 10.60.11.105 with SMTP id p9mr5314941oeb.128.1352388103952; Thu, 08 Nov 2012 07:21:43 -0800 (PST) Received: by 10.76.87.161 with HTTP; Thu, 8 Nov 2012 07:21:43 -0800 (PST) In-Reply-To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> Date: Thu, 8 Nov 2012 16:21:43 +0100 Message-ID: From: Mauro To: Philippe.Simonet@swisscom.com Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, JBeulich@suse.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 8 November 2012 14:47, wrote: > Hi Mauro, > > that's a question for you : > >> Philippe, could you clarify again what CPU model(s) this is being observed on >> (the long times between individual steps forward with this problem perhaps >> warrant repeating the basics each time, as it's otherwise quite cumbersome >> to always look up old pieces of information). > > can you provide this information ? > cat /proc/cpuinfo > cat /proc/meminfo > hardware information (manufacturer, model, urls, ...) > cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 1 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 2 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 3 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 4 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 5 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 6 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 7 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 8 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 9 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 10 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 11 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 12 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 13 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 14 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 15 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: cat /proc/meminfo MemTotal: 3127132 kB MemFree: 2697364 kB Buffers: 65816 kB Cached: 62188 kB SwapCached: 0 kB Active: 117156 kB Inactive: 46840 kB Active(anon): 28668 kB Inactive(anon): 16360 kB Active(file): 88488 kB Inactive(file): 30480 kB Unevictable: 18944 kB Mlocked: 18944 kB SwapTotal: 974840 kB SwapFree: 974840 kB Dirty: 0 kB Writeback: 0 kB AnonPages: 54936 kB Mapped: 14124 kB Shmem: 508 kB Slab: 66072 kB SReclaimable: 19732 kB SUnreclaim: 46340 kB KernelStack: 4016 kB PageTables: 4216 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 2538404 kB Committed_AS: 202468 kB VmallocTotal: 34359738367 kB VmallocUsed: 289904 kB VmallocChunk: 34359384628 kB HardwareCorrupted: 0 kB HugePages_Total: 0 HugePages_Free: 0 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB DirectMap4k: 3145728 kB DirectMap2M: 0 kB note that 3G is the mem reserved to dom0, the total amount of mem in the machine is 64G. The machine is a HP Proliant DL 580 G5, http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c01154573&lang=en&cc=us&taskId=&prodSeriesId=3454575&prodTypeId=15351 Thanks to all for the work. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:22:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTvR-0001kB-MT; Thu, 08 Nov 2012 15:21:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWTvQ-0001k4-0X for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:21:48 +0000 Received: from [85.158.143.99:32001] by server-1.bemta-4.messagelabs.com id 03/01-27934-B0ECB905; Thu, 08 Nov 2012 15:21:47 +0000 X-Env-Sender: mrsanna1@gmail.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352388104!23887831!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14291 invoked from network); 8 Nov 2012 15:21:45 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:21:45 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so3434705obb.32 for ; Thu, 08 Nov 2012 07:21:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=IyiMrhOcBa31S8PGEaWKKnB+wZws5YrpOQg4avT17Dc=; b=XAVF+6rCtAGQD+fVye4ZHkklmqwwV8olvPgMJyRIJqtg2Azer3jNo7gD+KsI4PCblf BP1Ws4r9uHs6vJZI6W+wEc6m33wnQoBNyAlt4GYDlgIdQBsgtP5bFVtcrkmU29u2pSJu oeOm/chUxe8Fc6EaY9X781tWOu3ymXCk+HVxVmnp0yRRZjdPoL9TZQ8CR0x6bKTHonrz S692Vq24NGg9ozWFcilZ2pvyKTPmKGF/uP846kw2xIaUb5EefsU2u5CvjtLJM6OkZkfH ioUGrNJHcsRKeYBMFuUVoCj9WZkIfCNhzmzGQqWDViykSdT1loJ7PJcDBvuQ6UyCkoQJ ZwPQ== MIME-Version: 1.0 Received: by 10.60.11.105 with SMTP id p9mr5314941oeb.128.1352388103952; Thu, 08 Nov 2012 07:21:43 -0800 (PST) Received: by 10.76.87.161 with HTTP; Thu, 8 Nov 2012 07:21:43 -0800 (PST) In-Reply-To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> Date: Thu, 8 Nov 2012 16:21:43 +0100 Message-ID: From: Mauro To: Philippe.Simonet@swisscom.com Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, JBeulich@suse.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 8 November 2012 14:47, wrote: > Hi Mauro, > > that's a question for you : > >> Philippe, could you clarify again what CPU model(s) this is being observed on >> (the long times between individual steps forward with this problem perhaps >> warrant repeating the basics each time, as it's otherwise quite cumbersome >> to always look up old pieces of information). > > can you provide this information ? > cat /proc/cpuinfo > cat /proc/meminfo > hardware information (manufacturer, model, urls, ...) > cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 1 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 2 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 3 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 4 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 5 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 6 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 7 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 8 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 9 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 10 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 11 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 12 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 13 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 14 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: processor : 15 vendor_id : GenuineIntel cpu family : 6 model : 15 model name : Intel(R) Xeon(R) CPU E7330 @ 2.40GHz stepping : 11 cpu MHz : 2400.128 cache size : 3072 KB fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu de tsc msr pae mce cx8 apic sep mtrr mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good aperfmperf pni est ssse3 cx16 hypervisor lahf_lm bogomips : 4800.25 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: cat /proc/meminfo MemTotal: 3127132 kB MemFree: 2697364 kB Buffers: 65816 kB Cached: 62188 kB SwapCached: 0 kB Active: 117156 kB Inactive: 46840 kB Active(anon): 28668 kB Inactive(anon): 16360 kB Active(file): 88488 kB Inactive(file): 30480 kB Unevictable: 18944 kB Mlocked: 18944 kB SwapTotal: 974840 kB SwapFree: 974840 kB Dirty: 0 kB Writeback: 0 kB AnonPages: 54936 kB Mapped: 14124 kB Shmem: 508 kB Slab: 66072 kB SReclaimable: 19732 kB SUnreclaim: 46340 kB KernelStack: 4016 kB PageTables: 4216 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 2538404 kB Committed_AS: 202468 kB VmallocTotal: 34359738367 kB VmallocUsed: 289904 kB VmallocChunk: 34359384628 kB HardwareCorrupted: 0 kB HugePages_Total: 0 HugePages_Free: 0 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB DirectMap4k: 3145728 kB DirectMap2M: 0 kB note that 3G is the mem reserved to dom0, the total amount of mem in the machine is 64G. The machine is a HP Proliant DL 580 G5, http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c01154573&lang=en&cc=us&taskId=&prodSeriesId=3454575&prodTypeId=15351 Thanks to all for the work. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:29:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:29:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU2I-0001wv-JE; Thu, 08 Nov 2012 15:28:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU2H-0001wo-CL for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:28:53 +0000 Received: from [85.158.138.51:37088] by server-14.bemta-3.messagelabs.com id 9B/42-12788-4BFCB905; Thu, 08 Nov 2012 15:28:52 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-14.tower-174.messagelabs.com!1352388531!22898906!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzMwNjk=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzMwNjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20429 invoked from network); 8 Nov 2012 15:28:51 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-14.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:28:51 -0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LiIi3-1T0lqD2pGN-00nOKS; Thu, 08 Nov 2012 16:28:34 +0100 From: Arnd Bergmann To: "Russell King - ARM Linux" Date: Thu, 8 Nov 2012 15:28:31 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <20121106175749.GO28327@n2100.arm.linux.org.uk> In-Reply-To: <20121106175749.GO28327@n2100.arm.linux.org.uk> MIME-Version: 1.0 Message-Id: <201211081528.31968.arnd@arndb.de> X-Provags-ID: V02:K0:fiS0mU5rhlBIrn+Ac7bOXpUdgrPIN7P/yWGBQEUTE7d nHUBJ6vJv+hPzbLHg7e0oiMS4lqxvWX1m2bmH8ntAKrrV94So4 o/T5w7wHptore0KSFrS+YbqBzzTP78PG6fLtcmg6QOTwGpI/GH G8h8WLWb/JORtObkFZ5cPSh1uDJc33R9jiH7emGuNK9y0RAKcQ hVAGYIL2fKUxPF00cD+8bNWa0rjk+w+zM49kKtD9pRXro67yyi Hm+rfeTj3KrusUBf3ymUPxRnaObEOz7bv2X0JRiTOHgOuxgvj7 EVEwzQHVQm84a0evPv1V3agwWa83fkKFX71/+wENSCia8Cf7M8 cTt4CA4d1uDyuGe/D6as= Cc: xen-devel@lists.xensource.com, arm@kernel.org, linux-arm-kernel@lists.infradead.org, Stefano Stabellini Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > My build system is giving me the following errors against an OMAP4 > randconfig build against the latest Linus' kernel plus arm-soc: > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > make[2]: *** [__modpost] Error 1 > make[2]: Target `_modpost' not remade because of errors. > make[1]: *** [modules] Error 2 > make: *** [sub-make] Error 2 > make: Target `uImage' not remade because of errors. > make: Target `modules' not remade because of errors. > > Full build results and configuration are here: > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > I can reproduce the same thing with mainline v3.7-rc4. 8<------ xen/arm: export privcmd_call privcmd_call may get called from a module, so it has to be exported. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..ff5e300 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -17,6 +17,9 @@ #include #include +/* from hypercall.S */ +EXPORT_SYMBOL_GPL(privcmd_call); + struct start_info _xen_start_info; struct start_info *xen_start_info = &_xen_start_info; EXPORT_SYMBOL_GPL(xen_start_info); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:29:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:29:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU2I-0001wv-JE; Thu, 08 Nov 2012 15:28:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU2H-0001wo-CL for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:28:53 +0000 Received: from [85.158.138.51:37088] by server-14.bemta-3.messagelabs.com id 9B/42-12788-4BFCB905; Thu, 08 Nov 2012 15:28:52 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-14.tower-174.messagelabs.com!1352388531!22898906!1 X-Originating-IP: [212.227.17.9] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzMwNjk=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjE3LjkgPT4gNzMwNjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20429 invoked from network); 8 Nov 2012 15:28:51 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.9) by server-14.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:28:51 -0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LiIi3-1T0lqD2pGN-00nOKS; Thu, 08 Nov 2012 16:28:34 +0100 From: Arnd Bergmann To: "Russell King - ARM Linux" Date: Thu, 8 Nov 2012 15:28:31 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <20121106175749.GO28327@n2100.arm.linux.org.uk> In-Reply-To: <20121106175749.GO28327@n2100.arm.linux.org.uk> MIME-Version: 1.0 Message-Id: <201211081528.31968.arnd@arndb.de> X-Provags-ID: V02:K0:fiS0mU5rhlBIrn+Ac7bOXpUdgrPIN7P/yWGBQEUTE7d nHUBJ6vJv+hPzbLHg7e0oiMS4lqxvWX1m2bmH8ntAKrrV94So4 o/T5w7wHptore0KSFrS+YbqBzzTP78PG6fLtcmg6QOTwGpI/GH G8h8WLWb/JORtObkFZ5cPSh1uDJc33R9jiH7emGuNK9y0RAKcQ hVAGYIL2fKUxPF00cD+8bNWa0rjk+w+zM49kKtD9pRXro67yyi Hm+rfeTj3KrusUBf3ymUPxRnaObEOz7bv2X0JRiTOHgOuxgvj7 EVEwzQHVQm84a0evPv1V3agwWa83fkKFX71/+wENSCia8Cf7M8 cTt4CA4d1uDyuGe/D6as= Cc: xen-devel@lists.xensource.com, arm@kernel.org, linux-arm-kernel@lists.infradead.org, Stefano Stabellini Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > My build system is giving me the following errors against an OMAP4 > randconfig build against the latest Linus' kernel plus arm-soc: > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > make[2]: *** [__modpost] Error 1 > make[2]: Target `_modpost' not remade because of errors. > make[1]: *** [modules] Error 2 > make: *** [sub-make] Error 2 > make: Target `uImage' not remade because of errors. > make: Target `modules' not remade because of errors. > > Full build results and configuration are here: > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > I can reproduce the same thing with mainline v3.7-rc4. 8<------ xen/arm: export privcmd_call privcmd_call may get called from a module, so it has to be exported. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..ff5e300 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -17,6 +17,9 @@ #include #include +/* from hypercall.S */ +EXPORT_SYMBOL_GPL(privcmd_call); + struct start_info _xen_start_info; struct start_info *xen_start_info = &_xen_start_info; EXPORT_SYMBOL_GPL(xen_start_info); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:32:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:32:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU5p-00026b-C9; Thu, 08 Nov 2012 15:32:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU5n-00026P-9N for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:32:31 +0000 Received: from [85.158.137.99:39430] by server-13.bemta-3.messagelabs.com id C2/7C-24887-E80DB905; Thu, 08 Nov 2012 15:32:30 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352388747!18199177!1 X-Originating-IP: [32.97.182.143] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjE0MyA9PiA1MzczNDU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12714 invoked from network); 8 Nov 2012 15:32:29 -0000 Received: from e3.ny.us.ibm.com (HELO e3.ny.us.ibm.com) (32.97.182.143) by server-2.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:32:29 -0000 Received: from /spool/local by e3.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Nov 2012 10:31:26 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e3.ny.us.ibm.com (192.168.1.103) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Nov 2012 10:30:18 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 2E6D06E80BA for ; Thu, 8 Nov 2012 10:29:56 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA8FTtdg297072 for ; Thu, 8 Nov 2012 10:29:55 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA8FT9BD021032 for ; Thu, 8 Nov 2012 10:29:09 -0500 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA8FT97u020948; Thu, 8 Nov 2012 10:29:09 -0500 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id 1DC2A2C0A95; Thu, 8 Nov 2012 09:28:37 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA8FSZav029145; Thu, 8 Nov 2012 09:28:35 -0600 Date: Thu, 8 Nov 2012 09:28:35 -0600 From: Kent Yoder To: Jan Beulich Message-ID: <20121108152835.GA28612@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509B78AC02000078000A723C@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110815-8974-0000-0000-000010D6E622 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000295; HX=3.00000198; KW=3.00000007; PH=3.00000001; SC=3.00000008; SDB=6.00189551; UDB=6.00042921; UTC=2012-11-08 15:31:23 Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 08:17:32AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >>> --- a/drivers/char/tpm/tpm.h > >>> +++ b/drivers/char/tpm/tpm.h > >>> @@ -130,6 +130,9 @@ struct tpm_chip { > >>> > >>> struct list_head list; > >>> void (*release) (struct device *); > >>> +#if CONFIG_XEN > >>> + void *priv; > >>> +#endif > >> Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is > >> already using that as a priv pointer. I should probably change that name > >> to make it more obvious what that's used for. > > That makes more sense. I'm guessing your data pointer didn't exist > > during the 2.6.18 kernel which is why they added their own priv pointer. > > It got introduced with 3.7-rc. > > >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { > >>> > >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >>> > >>> +#ifdef CONFIG_XEN > >>> +static inline void *chip_get_private(const struct tpm_chip *chip) > >>> +{ > >>> + return chip->priv; > >>> +} > >>> + > >>> +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > >>> +{ > >>> + chip->priv = priv; > >>> +} > >>> +#endif > >> Can you put these in tpm_vtpm.c please? One less #define. :-) > > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > Either such accessors should be defined here, for everyone to > use (and tpm_ibmvtpm.c get changed accordingly), or the Xen > code should access the field without wrappers too (for consistency). Agreed. I'll update tpm_ibmvtpm. Kent > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:32:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:32:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU5p-00026b-C9; Thu, 08 Nov 2012 15:32:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWU5n-00026P-9N for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:32:31 +0000 Received: from [85.158.137.99:39430] by server-13.bemta-3.messagelabs.com id C2/7C-24887-E80DB905; Thu, 08 Nov 2012 15:32:30 +0000 X-Env-Sender: key@linux.vnet.ibm.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352388747!18199177!1 X-Originating-IP: [32.97.182.143] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMzIuOTcuMTgyLjE0MyA9PiA1MzczNDU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12714 invoked from network); 8 Nov 2012 15:32:29 -0000 Received: from e3.ny.us.ibm.com (HELO e3.ny.us.ibm.com) (32.97.182.143) by server-2.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:32:29 -0000 Received: from /spool/local by e3.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Nov 2012 10:31:26 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e3.ny.us.ibm.com (192.168.1.103) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Nov 2012 10:30:18 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 2E6D06E80BA for ; Thu, 8 Nov 2012 10:29:56 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA8FTtdg297072 for ; Thu, 8 Nov 2012 10:29:55 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA8FT9BD021032 for ; Thu, 8 Nov 2012 10:29:09 -0500 Received: from key-ThinkPad-W510 (ennui.austin.ibm.com [9.53.105.11]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA8FT97u020948; Thu, 8 Nov 2012 10:29:09 -0500 Received: from ennui.austin.ibm.com (localhost [127.0.0.1]) by key-ThinkPad-W510 (Postfix) with ESMTP id 1DC2A2C0A95; Thu, 8 Nov 2012 09:28:37 -0600 (CST) Received: (from key@localhost) by ennui.austin.ibm.com (8.14.5/8.14.5/Submit) id qA8FSZav029145; Thu, 8 Nov 2012 09:28:35 -0600 Date: Thu, 8 Nov 2012 09:28:35 -0600 From: Kent Yoder To: Jan Beulich Message-ID: <20121108152835.GA28612@ennui.austin.ibm.com> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <509B78AC02000078000A723C@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110815-8974-0000-0000-000010D6E622 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000295; HX=3.00000198; KW=3.00000007; PH=3.00000001; SC=3.00000008; SDB=6.00189551; UDB=6.00042921; UTC=2012-11-08 15:31:23 Cc: Matthew Fioravante , "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 08:17:32AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >>> --- a/drivers/char/tpm/tpm.h > >>> +++ b/drivers/char/tpm/tpm.h > >>> @@ -130,6 +130,9 @@ struct tpm_chip { > >>> > >>> struct list_head list; > >>> void (*release) (struct device *); > >>> +#if CONFIG_XEN > >>> + void *priv; > >>> +#endif > >> Can you use the chip->vendor.data pointer here instead? tpm_ibmvtpm is > >> already using that as a priv pointer. I should probably change that name > >> to make it more obvious what that's used for. > > That makes more sense. I'm guessing your data pointer didn't exist > > during the 2.6.18 kernel which is why they added their own priv pointer. > > It got introduced with 3.7-rc. > > >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { > >>> > >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >>> > >>> +#ifdef CONFIG_XEN > >>> +static inline void *chip_get_private(const struct tpm_chip *chip) > >>> +{ > >>> + return chip->priv; > >>> +} > >>> + > >>> +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > >>> +{ > >>> + chip->priv = priv; > >>> +} > >>> +#endif > >> Can you put these in tpm_vtpm.c please? One less #define. :-) > > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > Either such accessors should be defined here, for everyone to > use (and tpm_ibmvtpm.c get changed accordingly), or the Xen > code should access the field without wrappers too (for consistency). Agreed. I'll update tpm_ibmvtpm. Kent > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:37:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:37:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUAq-0002Gw-49; Thu, 08 Nov 2012 15:37:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUAp-0002Gr-2V for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:37:43 +0000 Received: from [85.158.143.99:16690] by server-2.bemta-4.messagelabs.com id 5F/E0-28922-6C1DB905; Thu, 08 Nov 2012 15:37:42 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-9.tower-216.messagelabs.com!1352389060!29192249!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16960 invoked from network); 8 Nov 2012 15:37:41 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:37:41 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148501650; Thu, 08 Nov 2012 10:36:09 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Thu, 8 Nov 2012 10:36:09 -0500 From: "Fioravante, Matthew E." To: Kent Yoder , Jan Beulich Date: Thu, 8 Nov 2012 10:36:08 -0500 Thread-Topic: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver Thread-Index: Ac29xlmdArK70cUQRNaO8Lj2jl7+6AAAFq6g Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> <20121108152835.GA28612@ennui.austin.ibm.com> In-Reply-To: <20121108152835.GA28612@ennui.austin.ibm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org -----Original Message----- From: xen-devel-bounces@lists.xen.org [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of Kent Yoder Sent: Thursday, November 08, 2012 10:29 AM To: Jan Beulich Cc: Fioravante, Matthew E.; jeremy@goop.org; xen-devel@lists.xensource.com; konrad.wilk@oracle.com; linux-kernel@vger.kernel.org; mail@srajiv.net; tpmdd-devel@lists.sourceforge.net Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver On Thu, Nov 08, 2012 at 08:17:32AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >>> --- a/drivers/char/tpm/tpm.h > >>> +++ b/drivers/char/tpm/tpm.h > >>> @@ -130,6 +130,9 @@ struct tpm_chip { > >>> > >>> struct list_head list; > >>> void (*release) (struct device *); > >>> +#if CONFIG_XEN > >>> + void *priv; > >>> +#endif > >> Can you use the chip->vendor.data pointer here instead? > >> tpm_ibmvtpm is already using that as a priv pointer. I should > >> probably change that name to make it more obvious what that's used for. > > That makes more sense. I'm guessing your data pointer didn't exist > > during the 2.6.18 kernel which is why they added their own priv pointer. > > It got introduced with 3.7-rc. > > >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { > >>> > >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >>> > >>> +#ifdef CONFIG_XEN > >>> +static inline void *chip_get_private(const struct tpm_chip *chip) > >>> +{ > >>> + return chip->priv; > >>> +} > >>> + > >>> +static inline void chip_set_private(struct tpm_chip *chip, void > >>> +*priv) { > >>> + chip->priv = priv; > >>> +} > >>> +#endif > >> Can you put these in tpm_vtpm.c please? One less #define. :-) > > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > Either such accessors should be defined here, for everyone to use (and > tpm_ibmvtpm.c get changed accordingly), or the Xen code should access > the field without wrappers too (for consistency). Agreed. I'll update tpm_ibmvtpm. Kent So what is the consensus, you're going to use accessors in ibmvtpm? I was just about to remove them from my side. > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:37:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:37:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUAq-0002Gw-49; Thu, 08 Nov 2012 15:37:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUAp-0002Gr-2V for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:37:43 +0000 Received: from [85.158.143.99:16690] by server-2.bemta-4.messagelabs.com id 5F/E0-28922-6C1DB905; Thu, 08 Nov 2012 15:37:42 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-9.tower-216.messagelabs.com!1352389060!29192249!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16960 invoked from network); 8 Nov 2012 15:37:41 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:37:41 -0000 Received: from ([128.244.198.90]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148501650; Thu, 08 Nov 2012 10:36:09 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Thu, 8 Nov 2012 10:36:09 -0500 From: "Fioravante, Matthew E." To: Kent Yoder , Jan Beulich Date: Thu, 8 Nov 2012 10:36:08 -0500 Thread-Topic: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver Thread-Index: Ac29xlmdArK70cUQRNaO8Lj2jl7+6AAAFq6g Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> <20121108152835.GA28612@ennui.austin.ibm.com> In-Reply-To: <20121108152835.GA28612@ennui.austin.ibm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org -----Original Message----- From: xen-devel-bounces@lists.xen.org [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of Kent Yoder Sent: Thursday, November 08, 2012 10:29 AM To: Jan Beulich Cc: Fioravante, Matthew E.; jeremy@goop.org; xen-devel@lists.xensource.com; konrad.wilk@oracle.com; linux-kernel@vger.kernel.org; mail@srajiv.net; tpmdd-devel@lists.sourceforge.net Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver On Thu, Nov 08, 2012 at 08:17:32AM +0000, Jan Beulich wrote: > >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: > > On 11/07/2012 09:46 AM, Kent Yoder wrote: > >>> --- a/drivers/char/tpm/tpm.h > >>> +++ b/drivers/char/tpm/tpm.h > >>> @@ -130,6 +130,9 @@ struct tpm_chip { > >>> > >>> struct list_head list; > >>> void (*release) (struct device *); > >>> +#if CONFIG_XEN > >>> + void *priv; > >>> +#endif > >> Can you use the chip->vendor.data pointer here instead? > >> tpm_ibmvtpm is already using that as a priv pointer. I should > >> probably change that name to make it more obvious what that's used for. > > That makes more sense. I'm guessing your data pointer didn't exist > > during the 2.6.18 kernel which is why they added their own priv pointer. > > It got introduced with 3.7-rc. > > >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { > >>> > >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); > >>> > >>> +#ifdef CONFIG_XEN > >>> +static inline void *chip_get_private(const struct tpm_chip *chip) > >>> +{ > >>> + return chip->priv; > >>> +} > >>> + > >>> +static inline void chip_set_private(struct tpm_chip *chip, void > >>> +*priv) { > >>> + chip->priv = priv; > >>> +} > >>> +#endif > >> Can you put these in tpm_vtpm.c please? One less #define. :-) > > Agreed, I'd rather not have to modify your shared tpm.h interface at all. > > Either such accessors should be defined here, for everyone to use (and > tpm_ibmvtpm.c get changed accordingly), or the Xen code should access > the field without wrappers too (for consistency). Agreed. I'll update tpm_ibmvtpm. Kent So what is the consensus, you're going to use accessors in ibmvtpm? I was just about to remove them from my side. > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:38:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:38:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUBV-0002Jq-Ha; Thu, 08 Nov 2012 15:38:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUBT-0002Jf-T8 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:38:24 +0000 Received: from [85.158.138.51:33688] by server-5.bemta-3.messagelabs.com id 3A/62-26311-FE1DB905; Thu, 08 Nov 2012 15:38:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352389102!21163328!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14101 invoked from network); 8 Nov 2012 15:38:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 8 Nov 2012 15:38:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:38:21 +0000 Message-Id: <509BDFFC02000078000A7499@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:38:20 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509BD7D102000078000A7440@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 16:17, Keir Fraser wrote: > On 08/11/2012 15:03, "Jan Beulich" wrote: > >> So far, cluster mode was just an alternative implementation of >> physical mode: Allowing only single CPU interrupt targets, and sending >> IPIs to each target CPU separately. Take advantage of what cluster >> mode really can do in that regard. > > What does it allow? Multicast within certain constraints? For IPIs, yes. For interrupts, this gets things merely in line with cluster mode APIC, specifying more than one destination with lowest priority delivery. Without actively using the TPR, that should only affect nested interrupts (which previously would have got deferred until the outer one finished if their vector was a lower priority one than the one in service, whereas now they could get serviced by another CPU within the cluster). I also should have pointed out that this has a potential drawback - it might increase the pressure on vector allocation, since they're now being shared more heavily (within clusters). But if someone runs into problems with that, they ought to simply switch to physical mode (which previously really had no practical use at all). > I know it's not > part of our coding style, but some comments would be nice. ;) Hard to tell what specifically you would want to see commented, given that this really just extends the originally rather simplistic implementation. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:38:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:38:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUBV-0002Jq-Ha; Thu, 08 Nov 2012 15:38:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUBT-0002Jf-T8 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:38:24 +0000 Received: from [85.158.138.51:33688] by server-5.bemta-3.messagelabs.com id 3A/62-26311-FE1DB905; Thu, 08 Nov 2012 15:38:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352389102!21163328!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14101 invoked from network); 8 Nov 2012 15:38:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 8 Nov 2012 15:38:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Thu, 08 Nov 2012 15:38:21 +0000 Message-Id: <509BDFFC02000078000A7499@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Thu, 08 Nov 2012 15:38:20 +0000 From: "Jan Beulich" To: "Keir Fraser" References: <509BD7D102000078000A7440@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 16:17, Keir Fraser wrote: > On 08/11/2012 15:03, "Jan Beulich" wrote: > >> So far, cluster mode was just an alternative implementation of >> physical mode: Allowing only single CPU interrupt targets, and sending >> IPIs to each target CPU separately. Take advantage of what cluster >> mode really can do in that regard. > > What does it allow? Multicast within certain constraints? For IPIs, yes. For interrupts, this gets things merely in line with cluster mode APIC, specifying more than one destination with lowest priority delivery. Without actively using the TPR, that should only affect nested interrupts (which previously would have got deferred until the outer one finished if their vector was a lower priority one than the one in service, whereas now they could get serviced by another CPU within the cluster). I also should have pointed out that this has a potential drawback - it might increase the pressure on vector allocation, since they're now being shared more heavily (within clusters). But if someone runs into problems with that, they ought to simply switch to physical mode (which previously really had no practical use at all). > I know it's not > part of our coding style, but some comments would be nice. ;) Hard to tell what specifically you would want to see commented, given that this really just extends the originally rather simplistic implementation. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:39:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:39:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUCL-0002Ph-Vr; Thu, 08 Nov 2012 15:39:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUCK-0002PQ-Ea for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:39:16 +0000 Received: from [85.158.139.211:47587] by server-8.bemta-5.messagelabs.com id CD/3B-06050-322DB905; Thu, 08 Nov 2012 15:39:15 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-11.tower-206.messagelabs.com!1352389153!19430373!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14499 invoked from network); 8 Nov 2012 15:39:14 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:39:14 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so2423069iam.32 for ; Thu, 08 Nov 2012 07:39:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=Yp2BniOXxNH6dtKKqb1uimKwbCOv3IIJ+o2esGaNbvs=; b=FeUXtS2z1ULon4lmWqNpVEaY0Sg1ZximsGpqgF/TKr1YDmSCsKvBErYZ8k2YJLRzfS VoVn7VFEI1/os/11O19j7w+QTka09OLbkIAIO8vwfGk35I5Q/Fn/MCA071qZ3M/0gyBW 3VnrYIliVzJ/qodrodVSoGfq+/A/Tq/GdvwDzupX8E7T4kK1xRW2oPIcxMIi05qlGD5a eAIE1vVVgnXPkUklEIYu9bknnEX5WM5pWeP9P3MYzYwo7DMuKKgmI//uYmiXLtmrAlWV mxJ6yHvj1cBWqCigtTo6E1TbyYil//9mXGH6r3RLqySGn77+bVz0SM1tudZWC+AydNJF KHnQ== Received: by 10.50.1.200 with SMTP id 8mr20702130igo.36.1352389153197; Thu, 08 Nov 2012 07:39:13 -0800 (PST) Received: from [192.168.180.142] ([216.223.139.58]) by mx.google.com with ESMTPS id uj11sm4613934igb.15.2012.11.08.07.39.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:39:12 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: Date: Thu, 8 Nov 2012 10:39:23 -0500 Message-Id: References: To: Keir Fraser X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQlTKsWyb7PvUxAsSuBamSCTWtCVtF+ftovELlO3QPTVdM3PJKiPy1LeMiX400GWm5/LXZFS Cc: Andres Lagar-Cavilla , Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 8, 2012, at 2:42 AM, Keir Fraser wrote: > On 08/11/2012 03:22, "Andres Lagar-Cavilla" wro= te: > = >>> I'd like to propose an approach that ensures that as long some properti= es are >>> met, arbitrary wait queue sleep is allowed. Here are the properties: >>> 1. Third parties servicing a wait queue sleep are indeed third parties.= In >>> other words, dom0 does not do paging. >>> 2. Vcpus of a wait queue servicing domain may never go to sleep on a wa= it >>> queue during a foreign map. >>> 3. A guest vcpu may go to sleep on a wait queue holding any kinds of lo= cks as >>> long as it does not hold the p2m lock. >> = >> N.B: I understand (now) this may cause any other vcpu contending on a lo= ck >> held by the wait queue sleeper to not yield to the scheduler and pin its >> physical cpu. >> = >> What I am struggling with is coming up with a solution that doesn't turn >> hypervisor mm hacking into a locking minefield. >> = >> Linux fixes this with many kinds of sleeping synchronization primitives.= A >> task can, for example, hold the mmap semaphore and sleep on a wait queue= . Is >> this the only way out of this mess? Not if wait queues force the vcpu to= wake >> up on the same phys cpu it was using at the time of sleeping=8A. > = > Well, the forcing to wake up on same phys cpu it slept on is going to be > fixed. But it's not clear to me how that current restriction makes the > problem harder? What if you were running on a single-phys-cpu system? It's not a hard blocker. It's giving up efficiency otherwise. It's a "nice = to have" precondition. > = > As you have realised, the fact that all locks in Xen are spinlocks makes = the > potential for deadlock very obvious. Someone else gets scheduled and takes > out the phys cpu by spinning on a lock that someone else is holding while > they are descheduled. > = > Linux-style sleeping mutexes might help. We could add those. They don't h= elp > as readily as in the Linux case however! In some ways they push the deadl= ock > up one level of abstraction, to the virt cpu (vcpu). Consider single-vcpu > dom0 running a pager -- even if you are careful that the pager itself does > not acquire any locks that one of its clients may hold-while-sleeping, if > *anything* running in dom0 can acquire such a lock, you have an obvious > deadlock, as that will take out the dom0 vcpu and leave it blocked forever > waiting for a lock that is held while its holder waits for service from t= he > dom0 vcpu=85. Uhmm. But it seems there is _some_ method to the madness. Luckily mm locks = are all taken after the p2m lock (and enforced that way). dom0 can grab ...= the big domain lock? the grant table lock? Perhaps we can categorize locks between reflexive or foreign (not that we h= ave abundant space in the spin lock struct to stash more flags) and perform= some sort of enforcement like what goes on in the mm layer. Xen insults vi= a BUG_ON's are a strong conditioning tool for developers. It is certainly s= impler to tease out the locks that might deadlock dom0 than all possible lo= cks, including RCU read-locks. What I mean: BUG_ON(current->domain !=3D d && lock_is_reflexive) An example of a reflexive lock is the per page sharing lock. BUG_ON(prepare_to_wait && current->domain->holds_foreign_lock) An example of a transitive lock is the gran table lock. A third category would entail global locks like the domain list, which are = identical to a foreign lock wrt to this analysis. Another benefit of this is that only reflexive locks need to be made sleep-= capable, not everything under the sun. I.e. the possibility of livelock is = corralled to apply only to vcpus of the same domain, and then it's avoided = by making those lock holders re-schedulable. Andres > = > I don't think there is an easy solution here! > = > -- Keir > = > = _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:39:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:39:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUCL-0002Ph-Vr; Thu, 08 Nov 2012 15:39:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUCK-0002PQ-Ea for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:39:16 +0000 Received: from [85.158.139.211:47587] by server-8.bemta-5.messagelabs.com id CD/3B-06050-322DB905; Thu, 08 Nov 2012 15:39:15 +0000 X-Env-Sender: andreslc@gridcentric.ca X-Msg-Ref: server-11.tower-206.messagelabs.com!1352389153!19430373!1 X-Originating-IP: [209.85.210.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14499 invoked from network); 8 Nov 2012 15:39:14 -0000 Received: from mail-ia0-f173.google.com (HELO mail-ia0-f173.google.com) (209.85.210.173) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:39:14 -0000 Received: by mail-ia0-f173.google.com with SMTP id m10so2423069iam.32 for ; Thu, 08 Nov 2012 07:39:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer :x-gm-message-state; bh=Yp2BniOXxNH6dtKKqb1uimKwbCOv3IIJ+o2esGaNbvs=; b=FeUXtS2z1ULon4lmWqNpVEaY0Sg1ZximsGpqgF/TKr1YDmSCsKvBErYZ8k2YJLRzfS VoVn7VFEI1/os/11O19j7w+QTka09OLbkIAIO8vwfGk35I5Q/Fn/MCA071qZ3M/0gyBW 3VnrYIliVzJ/qodrodVSoGfq+/A/Tq/GdvwDzupX8E7T4kK1xRW2oPIcxMIi05qlGD5a eAIE1vVVgnXPkUklEIYu9bknnEX5WM5pWeP9P3MYzYwo7DMuKKgmI//uYmiXLtmrAlWV mxJ6yHvj1cBWqCigtTo6E1TbyYil//9mXGH6r3RLqySGn77+bVz0SM1tudZWC+AydNJF KHnQ== Received: by 10.50.1.200 with SMTP id 8mr20702130igo.36.1352389153197; Thu, 08 Nov 2012 07:39:13 -0800 (PST) Received: from [192.168.180.142] ([216.223.139.58]) by mx.google.com with ESMTPS id uj11sm4613934igb.15.2012.11.08.07.39.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Nov 2012 07:39:12 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) From: Andres Lagar-Cavilla In-Reply-To: Date: Thu, 8 Nov 2012 10:39:23 -0500 Message-Id: References: To: Keir Fraser X-Mailer: Apple Mail (2.1499) X-Gm-Message-State: ALoCoQlTKsWyb7PvUxAsSuBamSCTWtCVtF+ftovELlO3QPTVdM3PJKiPy1LeMiX400GWm5/LXZFS Cc: Andres Lagar-Cavilla , Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Nov 8, 2012, at 2:42 AM, Keir Fraser wrote: > On 08/11/2012 03:22, "Andres Lagar-Cavilla" wro= te: > = >>> I'd like to propose an approach that ensures that as long some properti= es are >>> met, arbitrary wait queue sleep is allowed. Here are the properties: >>> 1. Third parties servicing a wait queue sleep are indeed third parties.= In >>> other words, dom0 does not do paging. >>> 2. Vcpus of a wait queue servicing domain may never go to sleep on a wa= it >>> queue during a foreign map. >>> 3. A guest vcpu may go to sleep on a wait queue holding any kinds of lo= cks as >>> long as it does not hold the p2m lock. >> = >> N.B: I understand (now) this may cause any other vcpu contending on a lo= ck >> held by the wait queue sleeper to not yield to the scheduler and pin its >> physical cpu. >> = >> What I am struggling with is coming up with a solution that doesn't turn >> hypervisor mm hacking into a locking minefield. >> = >> Linux fixes this with many kinds of sleeping synchronization primitives.= A >> task can, for example, hold the mmap semaphore and sleep on a wait queue= . Is >> this the only way out of this mess? Not if wait queues force the vcpu to= wake >> up on the same phys cpu it was using at the time of sleeping=8A. > = > Well, the forcing to wake up on same phys cpu it slept on is going to be > fixed. But it's not clear to me how that current restriction makes the > problem harder? What if you were running on a single-phys-cpu system? It's not a hard blocker. It's giving up efficiency otherwise. It's a "nice = to have" precondition. > = > As you have realised, the fact that all locks in Xen are spinlocks makes = the > potential for deadlock very obvious. Someone else gets scheduled and takes > out the phys cpu by spinning on a lock that someone else is holding while > they are descheduled. > = > Linux-style sleeping mutexes might help. We could add those. They don't h= elp > as readily as in the Linux case however! In some ways they push the deadl= ock > up one level of abstraction, to the virt cpu (vcpu). Consider single-vcpu > dom0 running a pager -- even if you are careful that the pager itself does > not acquire any locks that one of its clients may hold-while-sleeping, if > *anything* running in dom0 can acquire such a lock, you have an obvious > deadlock, as that will take out the dom0 vcpu and leave it blocked forever > waiting for a lock that is held while its holder waits for service from t= he > dom0 vcpu=85. Uhmm. But it seems there is _some_ method to the madness. Luckily mm locks = are all taken after the p2m lock (and enforced that way). dom0 can grab ...= the big domain lock? the grant table lock? Perhaps we can categorize locks between reflexive or foreign (not that we h= ave abundant space in the spin lock struct to stash more flags) and perform= some sort of enforcement like what goes on in the mm layer. Xen insults vi= a BUG_ON's are a strong conditioning tool for developers. It is certainly s= impler to tease out the locks that might deadlock dom0 than all possible lo= cks, including RCU read-locks. What I mean: BUG_ON(current->domain !=3D d && lock_is_reflexive) An example of a reflexive lock is the per page sharing lock. BUG_ON(prepare_to_wait && current->domain->holds_foreign_lock) An example of a transitive lock is the gran table lock. A third category would entail global locks like the domain list, which are = identical to a foreign lock wrt to this analysis. Another benefit of this is that only reflexive locks need to be made sleep-= capable, not everything under the sun. I.e. the possibility of livelock is = corralled to apply only to vcpus of the same domain, and then it's avoided = by making those lock holders re-schedulable. Andres > = > I don't think there is an easy solution here! > = > -- Keir > = > = _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:42:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:42:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUEo-0002cr-Hz; Thu, 08 Nov 2012 15:41:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUEn-0002ci-HT for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:41:49 +0000 Received: from [85.158.143.35:30547] by server-3.bemta-4.messagelabs.com id AA/0D-06841-CB2DB905; Thu, 08 Nov 2012 15:41:48 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-3.tower-21.messagelabs.com!1352389305!14452162!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17605 invoked from network); 8 Nov 2012 15:41:47 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:41:47 -0000 Received: from ([128.244.198.90]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156869695; Thu, 08 Nov 2012 10:40:35 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Thu, 8 Nov 2012 10:40:35 -0500 From: "Fioravante, Matthew E." To: Konrad Rzeszutek Wilk Date: Thu, 8 Nov 2012 10:40:34 -0500 Thread-Topic: [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver Thread-Index: Ac29A74MlKXxsP0MQBeRIfuPxfA7IAAw1yJg Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E705@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> <20121107160659.GH18615@phenom.dumpdata.com> In-Reply-To: <20121107160659.GH18615@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org -----Original Message----- From: Konrad Rzeszutek Wilk [mailto:konrad.wilk@oracle.com] Sent: Wednesday, November 07, 2012 11:07 AM To: Fioravante, Matthew E. Cc: key@linux.vnet.ibm.com; mail@srajiv.net; jeremy@goop.org; tpmdd-devel@lists.sourceforge.net; xen-devel@lists.xensource.com; linux-kernel@vger.kernel.org Subject: Re: [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver On Wed, Nov 07, 2012 at 09:05:26AM -0500, Matthew Fioravante wrote: > On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux from the > >>linux-2.6.18-xen.hg tree to linux-stable. > >So how does on test it ? Set it up? Use it? Is there some > >documentation about it - if so it should be in the patch description. > Thats actually a question I had. To use this driver now you have to > use my vtpm mini-os domains which are currently being evaluated in the > xen-devel mailing list. Once they are accepted I will submit a > documentation update to the Xen tree. > > Whats the best practice for documentation in this case? All in xen? > Some linux/some xen? If the latter, how much goes in linux and where? As much as possible. I would say stick both of them in Xen and in Linux. And you can designate one of them as primary (say the Xen one) and say in the Linux: "For up-to-date information, please refer to XXYYZZ" I grepped through the linux source code and didn't see any documentation for the other xen drivers. I could put a "please refer to XXX in xen" line in the Kconfig or as a comment in the source code or both. Am I missing something or is there some standard way the xen devs handle this documentation issue for linux drivers? > > > >I did a very very cursory look at it, see some of the comments. > > > >> > >>+ > >>+ > >>+static inline struct transmission *transmission_alloc(void) { > >>+ return kzalloc(sizeof(struct transmission), GFP_ATOMIC); } > >>+ > >>+ static unsigned char * > > > >That is very weird tabbing? Did you run this patch through > >scripts/checkpatch.pl ? > Wow thats ugly. I ran the check script and it looks like it didn't > pick this up. For some reason my editor wants to autoindent like that. > Fixed. > > > >>+ > >>+static const struct file_operations vtpm_ops = { > >>+ .owner = THIS_MODULE, > >>+ .llseek = no_llseek, > >>+ .open = tpm_open, > >>+ .read = tpm_read, > >>+ .write = tpm_write, > >>+ .release = tpm_release, > >>+}; > >>+ > >>+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); static > >>+DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); static > >>+DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); static > >>+DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); static > >>+DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); static > >>+DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > >>+ NULL); > >>+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); static > >>+DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > >>+ > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be a > >corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing You are right. Just leave it as that then. > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:42:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:42:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUEo-0002cr-Hz; Thu, 08 Nov 2012 15:41:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUEn-0002ci-HT for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:41:49 +0000 Received: from [85.158.143.35:30547] by server-3.bemta-4.messagelabs.com id AA/0D-06841-CB2DB905; Thu, 08 Nov 2012 15:41:48 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-3.tower-21.messagelabs.com!1352389305!14452162!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17605 invoked from network); 8 Nov 2012 15:41:47 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:41:47 -0000 Received: from ([128.244.198.90]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156869695; Thu, 08 Nov 2012 10:40:35 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas1.dom1.jhuapl.edu ([128.244.198.90]) with mapi; Thu, 8 Nov 2012 10:40:35 -0500 From: "Fioravante, Matthew E." To: Konrad Rzeszutek Wilk Date: Thu, 8 Nov 2012 10:40:34 -0500 Thread-Topic: [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver Thread-Index: Ac29A74MlKXxsP0MQBeRIfuPxfA7IAAw1yJg Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E705@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106193921.GC28473@phenom.dumpdata.com> <509A6AA6.2000208@jhuapl.edu> <20121107160659.GH18615@phenom.dumpdata.com> In-Reply-To: <20121107160659.GH18615@phenom.dumpdata.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" Subject: Re: [Xen-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org -----Original Message----- From: Konrad Rzeszutek Wilk [mailto:konrad.wilk@oracle.com] Sent: Wednesday, November 07, 2012 11:07 AM To: Fioravante, Matthew E. Cc: key@linux.vnet.ibm.com; mail@srajiv.net; jeremy@goop.org; tpmdd-devel@lists.sourceforge.net; xen-devel@lists.xensource.com; linux-kernel@vger.kernel.org Subject: Re: [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver On Wed, Nov 07, 2012 at 09:05:26AM -0500, Matthew Fioravante wrote: > On 11/06/2012 02:39 PM, Konrad Rzeszutek Wilk wrote: > >On Mon, Nov 05, 2012 at 10:09:57AM -0500, Matthew Fioravante wrote: > >>This patch ports the xen vtpm frontend driver for linux from the > >>linux-2.6.18-xen.hg tree to linux-stable. > >So how does on test it ? Set it up? Use it? Is there some > >documentation about it - if so it should be in the patch description. > Thats actually a question I had. To use this driver now you have to > use my vtpm mini-os domains which are currently being evaluated in the > xen-devel mailing list. Once they are accepted I will submit a > documentation update to the Xen tree. > > Whats the best practice for documentation in this case? All in xen? > Some linux/some xen? If the latter, how much goes in linux and where? As much as possible. I would say stick both of them in Xen and in Linux. And you can designate one of them as primary (say the Xen one) and say in the Linux: "For up-to-date information, please refer to XXYYZZ" I grepped through the linux source code and didn't see any documentation for the other xen drivers. I could put a "please refer to XXX in xen" line in the Kconfig or as a comment in the source code or both. Am I missing something or is there some standard way the xen devs handle this documentation issue for linux drivers? > > > >I did a very very cursory look at it, see some of the comments. > > > >> > >>+ > >>+ > >>+static inline struct transmission *transmission_alloc(void) { > >>+ return kzalloc(sizeof(struct transmission), GFP_ATOMIC); } > >>+ > >>+ static unsigned char * > > > >That is very weird tabbing? Did you run this patch through > >scripts/checkpatch.pl ? > Wow thats ugly. I ran the check script and it looks like it didn't > pick this up. For some reason my editor wants to autoindent like that. > Fixed. > > > >>+ > >>+static const struct file_operations vtpm_ops = { > >>+ .owner = THIS_MODULE, > >>+ .llseek = no_llseek, > >>+ .open = tpm_open, > >>+ .read = tpm_read, > >>+ .write = tpm_write, > >>+ .release = tpm_release, > >>+}; > >>+ > >>+static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); static > >>+DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); static > >>+DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); static > >>+DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); static > >>+DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); static > >>+DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > >>+ NULL); > >>+static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); static > >>+DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > >>+ > >>+static struct attribute *vtpm_attrs[] = { > >>+ &dev_attr_pubek.attr, > >>+ &dev_attr_pcrs.attr, > >>+ &dev_attr_enabled.attr, > >>+ &dev_attr_active.attr, > >>+ &dev_attr_owned.attr, > >>+ &dev_attr_temp_deactivated.attr, > >>+ &dev_attr_caps.attr, > >>+ &dev_attr_cancel.attr, > >>+ NULL, > >So are these going to show up in SysFS? If so, there should also be a > >corresponding file in Documentation/.../sysfs/something. > These are similar to the entries made by the other tpm drivers. I > don't see any documentation about those either. TPM maintainers, any > guidance there? > > > >>+#include "tpm.h" > >>+#include "tpm_vtpm.h" > >>+ > >>+#undef DEBUG > >>+ > >>+#define GRANT_INVALID_REF 0 > >Interesting. The 0 grant value is actually a valid one. I think you > >want (-1ULL). > Is it? > drivers/block/xen-blkfront.c and > drivers/net/xen-netfront.c > > do the exact same thing You are right. Just leave it as that then. > >>+ > >>+ init_tpm_xenbus(); > >>+ return 0; > >>+} > >>+ > >>+ > >>+module_init(tpmif_init); > >no module_exit? > Will fix > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:43:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:43:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUG0-0002kB-0n; Thu, 08 Nov 2012 15:43:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUFz-0002k3-0U for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:43:03 +0000 Received: from [85.158.143.35:36829] by server-3.bemta-4.messagelabs.com id 78/8F-06841-603DB905; Thu, 08 Nov 2012 15:43:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352389368!16299417!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIzMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5032 invoked from network); 8 Nov 2012 15:42:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:42:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="43951664" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 15:42:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 10:42:47 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWUFi-0007AM-HZ; Thu, 08 Nov 2012 15:42:46 +0000 Message-ID: <1352389245.12977.106.camel@hastur.hellion.org.uk> From: Ian Campbell To: Arnd Bergmann Date: Thu, 8 Nov 2012 16:40:45 +0100 In-Reply-To: <201211081528.31968.arnd@arndb.de> References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Konrad Rzeszutek Wilk , Stefano Stabellini , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > My build system is giving me the following errors against an OMAP4 > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > make[2]: *** [__modpost] Error 1 > > make[2]: Target `_modpost' not remade because of errors. > > make[1]: *** [modules] Error 2 > > make: *** [sub-make] Error 2 > > make: Target `uImage' not remade because of errors. > > make: Target `modules' not remade because of errors. > > > > Full build results and configuration are here: > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > I can reproduce the same thing with mainline v3.7-rc4. > 8<------ > xen/arm: export privcmd_call Thanks, Konrad posted a fix for this on Tuesday which covers a few other cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I added Russell to my response but forgot to add l-a-k@ too, sorry. Is one of you going to pick it up and send to mainline? Ian. > privcmd_call may get called from a module, so it has to be exported. > > Signed-off-by: Arnd Bergmann > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..ff5e300 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -17,6 +17,9 @@ > #include > #include > > +/* from hypercall.S */ > +EXPORT_SYMBOL_GPL(privcmd_call); > + > struct start_info _xen_start_info; > struct start_info *xen_start_info = &_xen_start_info; > EXPORT_SYMBOL_GPL(xen_start_info); > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:43:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:43:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUG0-0002kB-0n; Thu, 08 Nov 2012 15:43:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUFz-0002k3-0U for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:43:03 +0000 Received: from [85.158.143.35:36829] by server-3.bemta-4.messagelabs.com id 78/8F-06841-603DB905; Thu, 08 Nov 2012 15:43:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352389368!16299417!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIzMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5032 invoked from network); 8 Nov 2012 15:42:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:42:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="43951664" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 15:42:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 10:42:47 -0500 Received: from gateway-1.uk.xensource.com ([10.80.16.66] helo=[127.0.0.1]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TWUFi-0007AM-HZ; Thu, 08 Nov 2012 15:42:46 +0000 Message-ID: <1352389245.12977.106.camel@hastur.hellion.org.uk> From: Ian Campbell To: Arnd Bergmann Date: Thu, 8 Nov 2012 16:40:45 +0100 In-Reply-To: <201211081528.31968.arnd@arndb.de> References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Konrad Rzeszutek Wilk , Stefano Stabellini , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > My build system is giving me the following errors against an OMAP4 > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > make[2]: *** [__modpost] Error 1 > > make[2]: Target `_modpost' not remade because of errors. > > make[1]: *** [modules] Error 2 > > make: *** [sub-make] Error 2 > > make: Target `uImage' not remade because of errors. > > make: Target `modules' not remade because of errors. > > > > Full build results and configuration are here: > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > I can reproduce the same thing with mainline v3.7-rc4. > 8<------ > xen/arm: export privcmd_call Thanks, Konrad posted a fix for this on Tuesday which covers a few other cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I added Russell to my response but forgot to add l-a-k@ too, sorry. Is one of you going to pick it up and send to mainline? Ian. > privcmd_call may get called from a module, so it has to be exported. > > Signed-off-by: Arnd Bergmann > > diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c > index 59bcb96..ff5e300 100644 > --- a/arch/arm/xen/enlighten.c > +++ b/arch/arm/xen/enlighten.c > @@ -17,6 +17,9 @@ > #include > #include > > +/* from hypercall.S */ > +EXPORT_SYMBOL_GPL(privcmd_call); > + > struct start_info _xen_start_info; > struct start_info *xen_start_info = &_xen_start_info; > EXPORT_SYMBOL_GPL(xen_start_info); > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:48:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:48:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUKl-00030l-Tr; Thu, 08 Nov 2012 15:47:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUKj-00030d-Ut for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:47:58 +0000 Received: from [85.158.139.83:62325] by server-1.bemta-5.messagelabs.com id 82/33-05877-D24DB905; Thu, 08 Nov 2012 15:47:57 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-182.messagelabs.com!1352389675!29664696!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=HTML_MESSAGE, UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32093 invoked from network); 8 Nov 2012 15:47:56 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:47:56 -0000 Received: from ([128.244.198.91]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156870633; Thu, 08 Nov 2012 10:47:39 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Thu, 8 Nov 2012 10:47:39 -0500 From: "Fioravante, Matthew E." To: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Date: Thu, 8 Nov 2012 10:47:38 -0500 Thread-Topic: Documenting vtpm Thread-Index: Ac29x3WiQ7d+R5IeTaOaAhaLY1tJtQ== Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E710@aplesstripe.dom1.jhuapl.edu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Subject: [Xen-devel] Documenting vtpm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0835153168193810554==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0835153168193810554== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_" --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I'd like to write some documentation for vtpm as a whole but wanted to ask = what your preference is on where it gets located and how its formatted. Right now the old vtpm uses docs/misc/vtpm.txt. I can just update this file= or do something else. Here are my current suggestions: READMEs in stubdom/vtpm and stubdom/vtpmmgr explaining their command line a= rguments and specifics. docs/misc/vtpm.txt explaining how to use the entire system. Another idea is to just forget the README files and put everything in docs/= misc/vtpm.txt It would also be helpful to have example config files. I see a lot of xm re= lated stuff in tools/examples/. Is that directory deprecated? I could put e= xample vtpm and vtpmmgr configs there or in the stubdom directories. --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I’d like t= o write some documentation for vtpm as a whole but wanted to ask what your = preference is on where it gets located and how its formatted.

 

Right now t= he old vtpm uses docs/misc/vtpm.txt. I can just update this file or do some= thing else.

 

Here are my current suggestions:

READMEs in stubdom/vtpm and stubdom/vtpmmgr explaining their comman= d line arguments and specifics.

docs/mis= c/vtpm.txt explaining how to use the entire system.

 

Another idea is to j= ust forget the README files and put everything in docs/misc/vtpm.txt

 

It w= ould also be helpful to have example config files. I see a lot of xm relate= d stuff in tools/examples/. Is that directory deprecated? I could put examp= le vtpm and vtpmmgr configs there or in the stubdom directories.=

 

= --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_-- --===============0835153168193810554== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0835153168193810554==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:48:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:48:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUKl-00030l-Tr; Thu, 08 Nov 2012 15:47:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUKj-00030d-Ut for xen-devel@lists.xen.org; Thu, 08 Nov 2012 15:47:58 +0000 Received: from [85.158.139.83:62325] by server-1.bemta-5.messagelabs.com id 82/33-05877-D24DB905; Thu, 08 Nov 2012 15:47:57 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-182.messagelabs.com!1352389675!29664696!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=HTML_MESSAGE, UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32093 invoked from network); 8 Nov 2012 15:47:56 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-10.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 15:47:56 -0000 Received: from ([128.244.198.91]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.156870633; Thu, 08 Nov 2012 10:47:39 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Thu, 8 Nov 2012 10:47:39 -0500 From: "Fioravante, Matthew E." To: "Ian.Campbell@citrix.com" , "xen-devel@lists.xen.org" Date: Thu, 8 Nov 2012 10:47:38 -0500 Thread-Topic: Documenting vtpm Thread-Index: Ac29x3WiQ7d+R5IeTaOaAhaLY1tJtQ== Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229E710@aplesstripe.dom1.jhuapl.edu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Subject: [Xen-devel] Documenting vtpm X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0835153168193810554==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0835153168193810554== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_" --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I'd like to write some documentation for vtpm as a whole but wanted to ask = what your preference is on where it gets located and how its formatted. Right now the old vtpm uses docs/misc/vtpm.txt. I can just update this file= or do something else. Here are my current suggestions: READMEs in stubdom/vtpm and stubdom/vtpmmgr explaining their command line a= rguments and specifics. docs/misc/vtpm.txt explaining how to use the entire system. Another idea is to just forget the README files and put everything in docs/= misc/vtpm.txt It would also be helpful to have example config files. I see a lot of xm re= lated stuff in tools/examples/. Is that directory deprecated? I could put e= xample vtpm and vtpmmgr configs there or in the stubdom directories. --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I’d like t= o write some documentation for vtpm as a whole but wanted to ask what your = preference is on where it gets located and how its formatted.

 

Right now t= he old vtpm uses docs/misc/vtpm.txt. I can just update this file or do some= thing else.

 

Here are my current suggestions:

READMEs in stubdom/vtpm and stubdom/vtpmmgr explaining their comman= d line arguments and specifics.

docs/mis= c/vtpm.txt explaining how to use the entire system.

 

Another idea is to j= ust forget the README files and put everything in docs/misc/vtpm.txt

 

It w= ould also be helpful to have example config files. I see a lot of xm relate= d stuff in tools/examples/. Is that directory deprecated? I could put examp= le vtpm and vtpmmgr configs there or in the stubdom directories.=

 

= --_000_068F06DC4D106941B297C0C5F9F446EA48A229E710aplesstripedo_-- --===============0835153168193810554== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0835153168193810554==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 15:49:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:49:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUMD-00035d-DW; Thu, 08 Nov 2012 15:49:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUMC-00035V-C9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:49:28 +0000 Received: from [85.158.139.83:14591] by server-14.bemta-5.messagelabs.com id 13/1C-21768-784DB905; Thu, 08 Nov 2012 15:49:27 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352389764!25443734!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIzMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23613 invoked from network); 8 Nov 2012 15:49:26 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:49:26 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="43952908" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 08 Nov 2012 15:49:24 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Thu, 8 Nov 2012 10:49:23 -0500 Date: Thu, 8 Nov 2012 15:48:36 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352389245.12977.106.camel@hastur.hellion.org.uk> Message-ID: References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> <1352389245.12977.106.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Arnd Bergmann , Stefano Stabellini , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 8 Nov 2012, Ian Campbell wrote: > On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > > My build system is giving me the following errors against an OMAP4 > > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > make[2]: *** [__modpost] Error 1 > > > make[2]: Target `_modpost' not remade because of errors. > > > make[1]: *** [modules] Error 2 > > > make: *** [sub-make] Error 2 > > > make: Target `uImage' not remade because of errors. > > > make: Target `modules' not remade because of errors. > > > > > > Full build results and configuration are here: > > > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > > > > I can reproduce the same thing with mainline v3.7-rc4. > > 8<------ > > xen/arm: export privcmd_call > > Thanks, Konrad posted a fix for this on Tuesday which covers a few other > cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I > added Russell to my response but forgot to add l-a-k@ too, sorry. Konrad, do you have time to respin a patch that exports all the 9 hypercalls? If not (maybe Konrad is away like me), then I am OK for Konrad's current patch to be applied as it is. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:49:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:49:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUMD-00035d-DW; Thu, 08 Nov 2012 15:49:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUMC-00035V-C9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:49:28 +0000 Received: from [85.158.139.83:14591] by server-14.bemta-5.messagelabs.com id 13/1C-21768-784DB905; Thu, 08 Nov 2012 15:49:27 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352389764!25443734!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODIzMDA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23613 invoked from network); 8 Nov 2012 15:49:26 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:49:26 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="43952908" Received: from unknown (HELO FTLPEX01CL03.citrite.net) ([10.13.107.80]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/AES128-SHA; 08 Nov 2012 15:49:24 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.318.1; Thu, 8 Nov 2012 10:49:23 -0500 Date: Thu, 8 Nov 2012 15:48:36 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352389245.12977.106.camel@hastur.hellion.org.uk> Message-ID: References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> <1352389245.12977.106.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Arnd Bergmann , Stefano Stabellini , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 8 Nov 2012, Ian Campbell wrote: > On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > > My build system is giving me the following errors against an OMAP4 > > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > make[2]: *** [__modpost] Error 1 > > > make[2]: Target `_modpost' not remade because of errors. > > > make[1]: *** [modules] Error 2 > > > make: *** [sub-make] Error 2 > > > make: Target `uImage' not remade because of errors. > > > make: Target `modules' not remade because of errors. > > > > > > Full build results and configuration are here: > > > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > > > > I can reproduce the same thing with mainline v3.7-rc4. > > 8<------ > > xen/arm: export privcmd_call > > Thanks, Konrad posted a fix for this on Tuesday which covers a few other > cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I > added Russell to my response but forgot to add l-a-k@ too, sorry. Konrad, do you have time to respin a patch that exports all the 9 hypercalls? If not (maybe Konrad is away like me), then I am OK for Konrad's current patch to be applied as it is. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:59:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:59:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUW9-0003LE-Lj; Thu, 08 Nov 2012 15:59:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUW8-0003L9-MO for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:59:44 +0000 Received: from [85.158.139.83:27681] by server-14.bemta-5.messagelabs.com id BB/B5-21768-FE6DB905; Thu, 08 Nov 2012 15:59:43 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352390382!29389900!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODUwMTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25194 invoked from network); 8 Nov 2012 15:59:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:59:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="213895629" Received: from ftlpex01cl01.citrite.net ([10.13.107.78]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 08 Nov 2012 15:59:41 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL01.citrite.net (10.13.107.78) with Microsoft SMTP Server id 14.2.318.1; Thu, 8 Nov 2012 10:59:41 -0500 Date: Thu, 8 Nov 2012 15:58:55 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Stefano Stabellini In-Reply-To: Message-ID: References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> <1352389245.12977.106.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Arnd Bergmann , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 8 Nov 2012, Stefano Stabellini wrote: > On Thu, 8 Nov 2012, Ian Campbell wrote: > > On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > > > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > > > My build system is giving me the following errors against an OMAP4 > > > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > > make[2]: *** [__modpost] Error 1 > > > > make[2]: Target `_modpost' not remade because of errors. > > > > make[1]: *** [modules] Error 2 > > > > make: *** [sub-make] Error 2 > > > > make: Target `uImage' not remade because of errors. > > > > make: Target `modules' not remade because of errors. > > > > > > > > Full build results and configuration are here: > > > > > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > > > > > > > I can reproduce the same thing with mainline v3.7-rc4. > > > 8<------ > > > xen/arm: export privcmd_call > > > > Thanks, Konrad posted a fix for this on Tuesday which covers a few other > > cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I > > added Russell to my response but forgot to add l-a-k@ too, sorry. > > Konrad, do you have time to respin a patch that exports all the 9 > hypercalls? This is the patch that I had in mind: --- From: Konrad Rzeszutek Wilk xen/arm: Fix compile errors when drivers are compiled as modules. We end up with: ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! and this patch exports said function (which is implemented in hypercall.S). Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..f576092 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -166,3 +166,14 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) *pages = NULL; } EXPORT_SYMBOL_GPL(free_xenballooned_pages); + +/* In the hypervisor.S file. */ +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_xen_version); +EXPORT_SYMBOL_GPL(HYPERVISOR_console_io); +EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op); +EXPORT_SYMBOL_GPL(privcmd_call); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 15:59:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 15:59:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUW9-0003LE-Lj; Thu, 08 Nov 2012 15:59:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWUW8-0003L9-MO for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 15:59:44 +0000 Received: from [85.158.139.83:27681] by server-14.bemta-5.messagelabs.com id BB/B5-21768-FE6DB905; Thu, 08 Nov 2012 15:59:43 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352390382!29389900!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODUwMTU=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25194 invoked from network); 8 Nov 2012 15:59:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 15:59:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="213895629" Received: from ftlpex01cl01.citrite.net ([10.13.107.78]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 08 Nov 2012 15:59:41 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by FTLPEX01CL01.citrite.net (10.13.107.78) with Microsoft SMTP Server id 14.2.318.1; Thu, 8 Nov 2012 10:59:41 -0500 Date: Thu, 8 Nov 2012 15:58:55 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Stefano Stabellini In-Reply-To: Message-ID: References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081528.31968.arnd@arndb.de> <1352389245.12977.106.camel@hastur.hellion.org.uk> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Originating-IP: [10.80.2.59] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Arnd Bergmann , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 8 Nov 2012, Stefano Stabellini wrote: > On Thu, 8 Nov 2012, Ian Campbell wrote: > > On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: > > > On Tuesday 06 November 2012, Russell King - ARM Linux wrote: > > > > My build system is giving me the following errors against an OMAP4 > > > > randconfig build against the latest Linus' kernel plus arm-soc: > > > > > > > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > > > make[2]: *** [__modpost] Error 1 > > > > make[2]: Target `_modpost' not remade because of errors. > > > > make[1]: *** [modules] Error 2 > > > > make: *** [sub-make] Error 2 > > > > make: Target `uImage' not remade because of errors. > > > > make: Target `modules' not remade because of errors. > > > > > > > > Full build results and configuration are here: > > > > > > > > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 > > > > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 > > > > > > > > > > I can reproduce the same thing with mainline v3.7-rc4. > > > 8<------ > > > xen/arm: export privcmd_call > > > > Thanks, Konrad posted a fix for this on Tuesday which covers a few other > > cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I > > added Russell to my response but forgot to add l-a-k@ too, sorry. > > Konrad, do you have time to respin a patch that exports all the 9 > hypercalls? This is the patch that I had in mind: --- From: Konrad Rzeszutek Wilk xen/arm: Fix compile errors when drivers are compiled as modules. We end up with: ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! and this patch exports said function (which is implemented in hypercall.S). Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 59bcb96..f576092 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -166,3 +166,14 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) *pages = NULL; } EXPORT_SYMBOL_GPL(free_xenballooned_pages); + +/* In the hypervisor.S file. */ +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_xen_version); +EXPORT_SYMBOL_GPL(HYPERVISOR_console_io); +EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op); +EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op); +EXPORT_SYMBOL_GPL(privcmd_call); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:37:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:37:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWV6d-00046f-UA; Thu, 08 Nov 2012 16:37:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWV6c-00046X-G9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 16:37:26 +0000 Received: from [193.109.254.147:39811] by server-8.bemta-14.messagelabs.com id B8/F4-05026-5CFDB905; Thu, 08 Nov 2012 16:37:25 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352392642!3374022!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10829 invoked from network); 8 Nov 2012 16:37:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:37:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="15676463" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 16:37:21 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 16:37:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWV4E-0007de-QL; Thu, 08 Nov 2012 16:34:58 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWV4E-0004c3-KH; Thu, 08 Nov 2012 16:34:58 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 8 Nov 2012 16:34:58 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14374: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14374 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14374/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14373 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14373 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14373 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14373 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 92163b114076 baseline version: xen bd78e5630a5b ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=92163b114076 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 92163b114076 + branch=xen-unstable + revision=92163b114076 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 92163b114076 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 4 changes to 4 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:37:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:37:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWV6d-00046f-UA; Thu, 08 Nov 2012 16:37:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWV6c-00046X-G9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 16:37:26 +0000 Received: from [193.109.254.147:39811] by server-8.bemta-14.messagelabs.com id B8/F4-05026-5CFDB905; Thu, 08 Nov 2012 16:37:25 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352392642!3374022!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10829 invoked from network); 8 Nov 2012 16:37:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:37:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,738,1344211200"; d="scan'208";a="15676463" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 16:37:21 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 16:37:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWV4E-0007de-QL; Thu, 08 Nov 2012 16:34:58 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWV4E-0004c3-KH; Thu, 08 Nov 2012 16:34:58 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Thu, 8 Nov 2012 16:34:58 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14374: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14374 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14374/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14373 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14373 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14373 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14373 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 92163b114076 baseline version: xen bd78e5630a5b ------------------------------------------------------------ People who touched revisions under test: "Huang2, Wei" Jan Beulich Keir Fraser Xiantao Zhang ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=92163b114076 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 92163b114076 + branch=xen-unstable + revision=92163b114076 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 92163b114076 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 4 changes to 4 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:46:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:46:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVF5-0004J6-0W; Thu, 08 Nov 2012 16:46:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVF2-0004J1-Ro for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:46:09 +0000 Received: from [85.158.137.99:17746] by server-13.bemta-3.messagelabs.com id AF/9B-24887-0D1EB905; Thu, 08 Nov 2012 16:46:08 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-217.messagelabs.com!1352393167!15181233!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20242 invoked from network); 8 Nov 2012 16:46:07 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 16:46:07 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWVEt-000Lax-V8; Thu, 08 Nov 2012 16:45:59 +0000 Date: Thu, 8 Nov 2012 16:45:59 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108164559.GK76638@ocelot.phlegethon.org> References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Philippe.Simonet@swisscom.com, Keir Fraser , mrsanna1@gmail.com, xen-devel@lists.xen.org, 599161@bugs.debian.org, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 09:39 +0000 on 08 Nov (1352367592), Jan Beulich wrote: > The plt_wrap < plt_now thing of course is entirely unexplainable > to me too: Considering that plt_scale doesn't change at all post- > boot, apart from memory corruption I could only see an memory > access ordering problem to be the reason (platform_timer_stamp > and/or stime_platform_stamp changing despite platform_timer_lock > being held. So maybe taking a snapshot of all three static values > involved in the calculation in __read_platform_stime() between > acquiring the lock and the first call to __read_platform_stime(), > and printing them together with the "live" values in a second > printk() after the one your original patch added could rule that > out. > > But the box doesn't even seem to be NUMA (of course it also > doesn't help that the log level was kept restricted - hint, hint, > Philippe), not does there appear to be any S3 cycle or pCPU > bring-up/-down in between... S3 looks like it might be a culprit, since resume_platform_timer() clobbers plt_stamp64 without taking the platform_timer_lock. But both the S3 resume code and the plt_overflow timer should only ever run on CPU 0, so even that should be safe (unless continue_hypercall_on_cpu() is broken...) Definitely having loglvl=all would have helped here, to eliminate S3 from our enquiries. > > I wonder whether the overflow handling should just be removed, or made > > conditional on a command-line parameter, or on the 32-bit platform counter > > being at least somewhat likely to overflow before a softirq occurs -- it > > seems lots of systems are using 14MHz HPET, and that gives us a couple of > > minutes for the plt_overflow softirq to do its work before overflow occurs. > > I think we would notice that outage in other ways. :) > > Iirc we added this for a good reason - to cover the, however > unlikely, event of Xen running for very long without preemption. > Presumably most of the cases got fixed meanwhile, and indeed > a wraparound time on the order of minutes should make this > superfluous, but as the case here shows that code did spot a > severe anomaly (whatever that may turn out to be). ISTR when this code went in we were dealing with a timer that had a period of about 4 seconds (ACPI PMTIMER?). It might well be OTT for the HPET, but if there's something weird going on I'd like to track it down while we have some sort of a handle on it. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:46:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:46:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVF5-0004J6-0W; Thu, 08 Nov 2012 16:46:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVF2-0004J1-Ro for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:46:09 +0000 Received: from [85.158.137.99:17746] by server-13.bemta-3.messagelabs.com id AF/9B-24887-0D1EB905; Thu, 08 Nov 2012 16:46:08 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-12.tower-217.messagelabs.com!1352393167!15181233!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20242 invoked from network); 8 Nov 2012 16:46:07 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 16:46:07 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TWVEt-000Lax-V8; Thu, 08 Nov 2012 16:45:59 +0000 Date: Thu, 8 Nov 2012 16:45:59 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121108164559.GK76638@ocelot.phlegethon.org> References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <509B8BF802000078000A72A3@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Philippe.Simonet@swisscom.com, Keir Fraser , mrsanna1@gmail.com, xen-devel@lists.xen.org, 599161@bugs.debian.org, Ian Campbell Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 09:39 +0000 on 08 Nov (1352367592), Jan Beulich wrote: > The plt_wrap < plt_now thing of course is entirely unexplainable > to me too: Considering that plt_scale doesn't change at all post- > boot, apart from memory corruption I could only see an memory > access ordering problem to be the reason (platform_timer_stamp > and/or stime_platform_stamp changing despite platform_timer_lock > being held. So maybe taking a snapshot of all three static values > involved in the calculation in __read_platform_stime() between > acquiring the lock and the first call to __read_platform_stime(), > and printing them together with the "live" values in a second > printk() after the one your original patch added could rule that > out. > > But the box doesn't even seem to be NUMA (of course it also > doesn't help that the log level was kept restricted - hint, hint, > Philippe), not does there appear to be any S3 cycle or pCPU > bring-up/-down in between... S3 looks like it might be a culprit, since resume_platform_timer() clobbers plt_stamp64 without taking the platform_timer_lock. But both the S3 resume code and the plt_overflow timer should only ever run on CPU 0, so even that should be safe (unless continue_hypercall_on_cpu() is broken...) Definitely having loglvl=all would have helped here, to eliminate S3 from our enquiries. > > I wonder whether the overflow handling should just be removed, or made > > conditional on a command-line parameter, or on the 32-bit platform counter > > being at least somewhat likely to overflow before a softirq occurs -- it > > seems lots of systems are using 14MHz HPET, and that gives us a couple of > > minutes for the plt_overflow softirq to do its work before overflow occurs. > > I think we would notice that outage in other ways. :) > > Iirc we added this for a good reason - to cover the, however > unlikely, event of Xen running for very long without preemption. > Presumably most of the cases got fixed meanwhile, and indeed > a wraparound time on the order of minutes should make this > superfluous, but as the case here shows that code did spot a > severe anomaly (whatever that may turn out to be). ISTR when this code went in we were dealing with a timer that had a period of about 4 seconds (ACPI PMTIMER?). It might well be OTT for the HPET, but if there's something weird going on I'd like to track it down while we have some sort of a handle on it. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:48:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:48:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVHC-0004Po-M7; Thu, 08 Nov 2012 16:48:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVHB-0004Pi-P7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:48:21 +0000 Received: from [85.158.143.35:58308] by server-1.bemta-4.messagelabs.com id 84/40-27934-552EB905; Thu, 08 Nov 2012 16:48:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352393299!11767195!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13188 invoked from network); 8 Nov 2012 16:48:20 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:48:20 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so2017501eek.32 for ; Thu, 08 Nov 2012 08:48:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=ows6BPYPRXK5skyhDzuUTtG202/W5cpTUH/YSpswJ4M=; b=aqaoYJNC6pc/TrXvkkaPUS/iDtGMMEisyavzL4tRRxNH/9BDeEkPGQEGwqrSW5hlWW aFPRyUCj1pErLVe5cuhvKQk6Wwbb1JqmUtJ3D2A/+SQUnQj7y37CRubWyVzIzsLDXUaZ z7ZjQfd75hhHacT9e0E+T5L/XXnpoFoova7u9yNqbjWYEAaerMOp4p3mCxCNILxqPAxt 8Ocgg+h3ZUWRqE/Ol2sUk70krW7BuXHHHJ/cpXCdHOTEysd+Yf2ImYxTg5L0n/dBS7Q7 WLvlSFEG+iwU6CRrPArVYNEqGq5/fw9PAwVSN2IFrXWdIHZEUa/BE87nP2D9cucG0Fm/ K88Q== Received: by 10.14.194.72 with SMTP id l48mr29406521een.9.1352393299593; Thu, 08 Nov 2012 08:48:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b44sm71245438eep.12.2012.11.08.08.48.17 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:48:18 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:48:13 +0000 From: Keir Fraser To: Andres Lagar-Cavilla Message-ID: Thread-Topic: Wait Queues Thread-Index: Ac290NeAq7isoAwBt0WGqsAc/EiPZQ== In-Reply-To: Mime-version: 1.0 Cc: Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:39, "Andres Lagar-Cavilla" wrote: >> dom0 vcpu=8A. > Uhmm. But it seems there is _some_ method to the madness. Luckily mm lock= s are > all taken after the p2m lock (and enforced that way). dom0 can grab ... t= he > big domain lock? the grant table lock? > = > Perhaps we can categorize locks between reflexive or foreign (not that we= have > abundant space in the spin lock struct to stash more flags) and perform s= ome > sort of enforcement like what goes on in the mm layer. Xen insults via > BUG_ON's are a strong conditioning tool for developers. It is certainly > simpler to tease out the locks that might deadlock dom0 than all possible > locks, including RCU read-locks. > = > What I mean: > = > BUG_ON(current->domain !=3D d && lock_is_reflexive) > An example of a reflexive lock is the per page sharing lock. > = > BUG_ON(prepare_to_wait && current->domain->holds_foreign_lock) > An example of a transitive lock is the gran table lock. > = > A third category would entail global locks like the domain list, which are > identical to a foreign lock wrt to this analysis. > = > Another benefit of this is that only reflexive locks need to be made > sleep-capable, not everything under the sun. I.e. the possibility of live= lock > is corralled to apply only to vcpus of the same domain, and then it's avo= ided > by making those lock holders re-schedulable. This sounds possible. RCU read locks will often count as global locks by the way, as they are most often used as an alternative to taking a global spinlock or multi-reader lock. So sleeping in RCU critical regions is generally not going to be a good idea. Perhaps it will turn out that such regions don't get in your way too often. > Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:48:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:48:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVHC-0004Po-M7; Thu, 08 Nov 2012 16:48:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVHB-0004Pi-P7 for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:48:21 +0000 Received: from [85.158.143.35:58308] by server-1.bemta-4.messagelabs.com id 84/40-27934-552EB905; Thu, 08 Nov 2012 16:48:21 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352393299!11767195!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13188 invoked from network); 8 Nov 2012 16:48:20 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:48:20 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so2017501eek.32 for ; Thu, 08 Nov 2012 08:48:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=ows6BPYPRXK5skyhDzuUTtG202/W5cpTUH/YSpswJ4M=; b=aqaoYJNC6pc/TrXvkkaPUS/iDtGMMEisyavzL4tRRxNH/9BDeEkPGQEGwqrSW5hlWW aFPRyUCj1pErLVe5cuhvKQk6Wwbb1JqmUtJ3D2A/+SQUnQj7y37CRubWyVzIzsLDXUaZ z7ZjQfd75hhHacT9e0E+T5L/XXnpoFoova7u9yNqbjWYEAaerMOp4p3mCxCNILxqPAxt 8Ocgg+h3ZUWRqE/Ol2sUk70krW7BuXHHHJ/cpXCdHOTEysd+Yf2ImYxTg5L0n/dBS7Q7 WLvlSFEG+iwU6CRrPArVYNEqGq5/fw9PAwVSN2IFrXWdIHZEUa/BE87nP2D9cucG0Fm/ K88Q== Received: by 10.14.194.72 with SMTP id l48mr29406521een.9.1352393299593; Thu, 08 Nov 2012 08:48:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b44sm71245438eep.12.2012.11.08.08.48.17 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:48:18 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:48:13 +0000 From: Keir Fraser To: Andres Lagar-Cavilla Message-ID: Thread-Topic: Wait Queues Thread-Index: Ac290NeAq7isoAwBt0WGqsAc/EiPZQ== In-Reply-To: Mime-version: 1.0 Cc: Tim Deegan , Jan Beulich , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Wait Queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:39, "Andres Lagar-Cavilla" wrote: >> dom0 vcpu=8A. > Uhmm. But it seems there is _some_ method to the madness. Luckily mm lock= s are > all taken after the p2m lock (and enforced that way). dom0 can grab ... t= he > big domain lock? the grant table lock? > = > Perhaps we can categorize locks between reflexive or foreign (not that we= have > abundant space in the spin lock struct to stash more flags) and perform s= ome > sort of enforcement like what goes on in the mm layer. Xen insults via > BUG_ON's are a strong conditioning tool for developers. It is certainly > simpler to tease out the locks that might deadlock dom0 than all possible > locks, including RCU read-locks. > = > What I mean: > = > BUG_ON(current->domain !=3D d && lock_is_reflexive) > An example of a reflexive lock is the per page sharing lock. > = > BUG_ON(prepare_to_wait && current->domain->holds_foreign_lock) > An example of a transitive lock is the gran table lock. > = > A third category would entail global locks like the domain list, which are > identical to a foreign lock wrt to this analysis. > = > Another benefit of this is that only reflexive locks need to be made > sleep-capable, not everything under the sun. I.e. the possibility of live= lock > is corralled to apply only to vcpus of the same domain, and then it's avo= ided > by making those lock holders re-schedulable. This sounds possible. RCU read locks will often count as global locks by the way, as they are most often used as an alternative to taking a global spinlock or multi-reader lock. So sleeping in RCU critical regions is generally not going to be a good idea. Perhaps it will turn out that such regions don't get in your way too often. > Andres _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:52:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:52:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVKs-0004c4-B8; Thu, 08 Nov 2012 16:52:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVKq-0004bv-8n for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:52:08 +0000 Received: from [85.158.139.83:2335] by server-11.bemta-5.messagelabs.com id 87/DB-03409-733EB905; Thu, 08 Nov 2012 16:52:07 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352393526!29676213!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16038 invoked from network); 8 Nov 2012 16:52:06 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:52:06 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so2310895wib.14 for ; Thu, 08 Nov 2012 08:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=DuB1Q76adv6CWCS8gID2uqsbN8OdprZ7kp3sRTLjdEE=; b=DmHelnTTeN6fdljT7lGDkeOuk18XwMpJbpe1EeiscT1YodhES8ZvBNaIxp3dm9pB2h L9mL6y00XaRzpUYWGnKF4WvnkeqMtRiP+VPJF2Pbhy1kjifL+gKomGvrYcnnzw4YbjSM bnoLaMlUKnXuhFCwWJBgIk7OZOO9BBZBgbiOu9gDR+o50M9PjsyGWj9wVdCWbh8bz1N/ sU+IjhaMW723EKj1hUpZ3B8GsUe3X1zJ5MHmTO0014DoqqZ12XeEKCP+QFx9vx2byZAZ sUqRnmjMIJ/PDSnaHwECTTOBCWar17ODTO/WsKRXnbfyR0nfScX4XL6lz4U+h9/QDeqk Q9Tw== Received: by 10.181.11.233 with SMTP id el9mr14484089wid.3.1352393526626; Thu, 08 Nov 2012 08:52:06 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm7845232wib.4.2012.11.08.08.52.05 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:52:06 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:52:00 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode Thread-Index: Ac290V7Od5EmuJeaTEKGw1qhthRb6g== In-Reply-To: <509BDFFC02000078000A7499@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:38, "Jan Beulich" wrote: >>>> On 08.11.12 at 16:17, Keir Fraser wrote: >> On 08/11/2012 15:03, "Jan Beulich" wrote: >> >>> So far, cluster mode was just an alternative implementation of >>> physical mode: Allowing only single CPU interrupt targets, and sending >>> IPIs to each target CPU separately. Take advantage of what cluster >>> mode really can do in that regard. >> >> What does it allow? Multicast within certain constraints? > > For IPIs, yes. For interrupts, this gets things merely in line with > cluster mode APIC, specifying more than one destination with > lowest priority delivery. Without actively using the TPR, that > should only affect nested interrupts (which previously would > have got deferred until the outer one finished if their vector > was a lower priority one than the one in service, whereas now > they could get serviced by another CPU within the cluster). > > I also should have pointed out that this has a potential drawback > - it might increase the pressure on vector allocation, since > they're now being shared more heavily (within clusters). But if > someone runs into problems with that, they ought to simply > switch to physical mode (which previously really had no practical > use at all). > >> I know it's not >> part of our coding style, but some comments would be nice. ;) > > Hard to tell what specifically you would want to see commented, > given that this really just extends the originally rather simplistic > implementation. Okay, yes, it doesn't look so complicated re-reading it again. I'm fine with it as it is. -- Keir > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:52:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:52:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVKs-0004c4-B8; Thu, 08 Nov 2012 16:52:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVKq-0004bv-8n for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:52:08 +0000 Received: from [85.158.139.83:2335] by server-11.bemta-5.messagelabs.com id 87/DB-03409-733EB905; Thu, 08 Nov 2012 16:52:07 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352393526!29676213!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16038 invoked from network); 8 Nov 2012 16:52:06 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:52:06 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so2310895wib.14 for ; Thu, 08 Nov 2012 08:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=DuB1Q76adv6CWCS8gID2uqsbN8OdprZ7kp3sRTLjdEE=; b=DmHelnTTeN6fdljT7lGDkeOuk18XwMpJbpe1EeiscT1YodhES8ZvBNaIxp3dm9pB2h L9mL6y00XaRzpUYWGnKF4WvnkeqMtRiP+VPJF2Pbhy1kjifL+gKomGvrYcnnzw4YbjSM bnoLaMlUKnXuhFCwWJBgIk7OZOO9BBZBgbiOu9gDR+o50M9PjsyGWj9wVdCWbh8bz1N/ sU+IjhaMW723EKj1hUpZ3B8GsUe3X1zJ5MHmTO0014DoqqZ12XeEKCP+QFx9vx2byZAZ sUqRnmjMIJ/PDSnaHwECTTOBCWar17ODTO/WsKRXnbfyR0nfScX4XL6lz4U+h9/QDeqk Q9Tw== Received: by 10.181.11.233 with SMTP id el9mr14484089wid.3.1352393526626; Thu, 08 Nov 2012 08:52:06 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm7845232wib.4.2012.11.08.08.52.05 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:52:06 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:52:00 +0000 From: Keir Fraser To: Jan Beulich Message-ID: Thread-Topic: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode Thread-Index: Ac290V7Od5EmuJeaTEKGw1qhthRb6g== In-Reply-To: <509BDFFC02000078000A7499@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] [PATCH 2/2] x86/x2apic: properly implement cluster mode X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 15:38, "Jan Beulich" wrote: >>>> On 08.11.12 at 16:17, Keir Fraser wrote: >> On 08/11/2012 15:03, "Jan Beulich" wrote: >> >>> So far, cluster mode was just an alternative implementation of >>> physical mode: Allowing only single CPU interrupt targets, and sending >>> IPIs to each target CPU separately. Take advantage of what cluster >>> mode really can do in that regard. >> >> What does it allow? Multicast within certain constraints? > > For IPIs, yes. For interrupts, this gets things merely in line with > cluster mode APIC, specifying more than one destination with > lowest priority delivery. Without actively using the TPR, that > should only affect nested interrupts (which previously would > have got deferred until the outer one finished if their vector > was a lower priority one than the one in service, whereas now > they could get serviced by another CPU within the cluster). > > I also should have pointed out that this has a potential drawback > - it might increase the pressure on vector allocation, since > they're now being shared more heavily (within clusters). But if > someone runs into problems with that, they ought to simply > switch to physical mode (which previously really had no practical > use at all). > >> I know it's not >> part of our coding style, but some comments would be nice. ;) > > Hard to tell what specifically you would want to see commented, > given that this really just extends the originally rather simplistic > implementation. Okay, yes, it doesn't look so complicated re-reading it again. I'm fine with it as it is. -- Keir > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:53:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:53:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVMK-0004hz-Qy; Thu, 08 Nov 2012 16:53:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVMJ-0004hp-Cb for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:53:39 +0000 Received: from [85.158.143.99:11181] by server-2.bemta-4.messagelabs.com id E9/5E-28922-293EB905; Thu, 08 Nov 2012 16:53:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352393617!23863472!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2639 invoked from network); 8 Nov 2012 16:53:38 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:53:38 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so2021502eek.32 for ; Thu, 08 Nov 2012 08:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=hHXLDEC0HG7pKLCZiUfLfatos+xcBrR84vZytFL+sFo=; b=lVC1btvsZzyrjriK4eXxlhVu+QZ7LhVA2eCI8k8SFiGDYvImjOKo+UXc0unfvxRMTy LeTDI0FM9n5e7cYkKeIXeFp4uKyz4PAiTBwT+1JSI9CWLqdtWLRAz62tFdtl7xaG7T5p VSJ8eMLfkx6b8kSx2dumKLx1Gs2rAJtq+/clopyC7YkeD1gqbPwQLo5JtFplRUxsIC4H BvPM/rrUILC4VcwK+cuhEmZBHlTANBGcoMhNEIouAgoqDsot6Es6dRfLfWWQwiaWJcsP 6wbntoJwaZbE7ftSSOt+olwr7h2YSYFmDBoepRpe1mdjYCWUILavliiSPnA8KNXCdRIx 9Gnw== Received: by 10.14.219.2 with SMTP id l2mr29586547eep.3.1352393617858; Thu, 08 Nov 2012 08:53:37 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id z43sm71300663een.16.2012.11.08.08.53.35 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:53:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:53:29 +0000 From: Keir Fraser To: Tim Deegan , Jan Beulich Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac290ZPaz6yRridHVUypoEk2TUkfPQ== In-Reply-To: <20121108164559.GK76638@ocelot.phlegethon.org> Mime-version: 1.0 Cc: Ian Campbell , Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 16:45, "Tim Deegan" wrote: >>> I wonder whether the overflow handling should just be removed, or made >>> conditional on a command-line parameter, or on the 32-bit platform counter >>> being at least somewhat likely to overflow before a softirq occurs -- it >>> seems lots of systems are using 14MHz HPET, and that gives us a couple of >>> minutes for the plt_overflow softirq to do its work before overflow occurs. >>> I think we would notice that outage in other ways. :) >> >> Iirc we added this for a good reason - to cover the, however >> unlikely, event of Xen running for very long without preemption. >> Presumably most of the cases got fixed meanwhile, and indeed >> a wraparound time on the order of minutes should make this >> superfluous, but as the case here shows that code did spot a >> severe anomaly (whatever that may turn out to be). > > ISTR when this code went in we were dealing with a timer that had a > period of about 4 seconds (ACPI PMTIMER?). It might well be OTT for the > HPET, but if there's something weird going on I'd like to track it down > while we have some sort of a handle on it. It must have been the PMTIMER. It's the only counter narrower than 32 bits (legacy PIT we simulate as a 32-bit counter behind the scenes). -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 16:53:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 16:53:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVMK-0004hz-Qy; Thu, 08 Nov 2012 16:53:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWVMJ-0004hp-Cb for xen-devel@lists.xen.org; Thu, 08 Nov 2012 16:53:39 +0000 Received: from [85.158.143.99:11181] by server-2.bemta-4.messagelabs.com id E9/5E-28922-293EB905; Thu, 08 Nov 2012 16:53:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352393617!23863472!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2639 invoked from network); 8 Nov 2012 16:53:38 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 16:53:38 -0000 Received: by mail-ee0-f45.google.com with SMTP id b47so2021502eek.32 for ; Thu, 08 Nov 2012 08:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=hHXLDEC0HG7pKLCZiUfLfatos+xcBrR84vZytFL+sFo=; b=lVC1btvsZzyrjriK4eXxlhVu+QZ7LhVA2eCI8k8SFiGDYvImjOKo+UXc0unfvxRMTy LeTDI0FM9n5e7cYkKeIXeFp4uKyz4PAiTBwT+1JSI9CWLqdtWLRAz62tFdtl7xaG7T5p VSJ8eMLfkx6b8kSx2dumKLx1Gs2rAJtq+/clopyC7YkeD1gqbPwQLo5JtFplRUxsIC4H BvPM/rrUILC4VcwK+cuhEmZBHlTANBGcoMhNEIouAgoqDsot6Es6dRfLfWWQwiaWJcsP 6wbntoJwaZbE7ftSSOt+olwr7h2YSYFmDBoepRpe1mdjYCWUILavliiSPnA8KNXCdRIx 9Gnw== Received: by 10.14.219.2 with SMTP id l2mr29586547eep.3.1352393617858; Thu, 08 Nov 2012 08:53:37 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id z43sm71300663een.16.2012.11.08.08.53.35 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 08:53:37 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 16:53:29 +0000 From: Keir Fraser To: Tim Deegan , Jan Beulich Message-ID: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac290ZPaz6yRridHVUypoEk2TUkfPQ== In-Reply-To: <20121108164559.GK76638@ocelot.phlegethon.org> Mime-version: 1.0 Cc: Ian Campbell , Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 16:45, "Tim Deegan" wrote: >>> I wonder whether the overflow handling should just be removed, or made >>> conditional on a command-line parameter, or on the 32-bit platform counter >>> being at least somewhat likely to overflow before a softirq occurs -- it >>> seems lots of systems are using 14MHz HPET, and that gives us a couple of >>> minutes for the plt_overflow softirq to do its work before overflow occurs. >>> I think we would notice that outage in other ways. :) >> >> Iirc we added this for a good reason - to cover the, however >> unlikely, event of Xen running for very long without preemption. >> Presumably most of the cases got fixed meanwhile, and indeed >> a wraparound time on the order of minutes should make this >> superfluous, but as the case here shows that code did spot a >> severe anomaly (whatever that may turn out to be). > > ISTR when this code went in we were dealing with a timer that had a > period of about 4 seconds (ACPI PMTIMER?). It might well be OTT for the > HPET, but if there's something weird going on I'd like to track it down > while we have some sort of a handle on it. It must have been the PMTIMER. It's the only counter narrower than 32 bits (legacy PIT we simulate as a 32-bit counter behind the scenes). -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 18:08:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:08:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWWWE-0005e3-Eq; Thu, 08 Nov 2012 18:07:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWWWC-0005dy-9F for xen-devel@lists.xen.org; Thu, 08 Nov 2012 18:07:56 +0000 Received: from [193.109.254.147:25554] by server-13.bemta-14.messagelabs.com id FF/64-11239-BF4FB905; Thu, 08 Nov 2012 18:07:55 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1352398074!3406262!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 8 Nov 2012 18:07:54 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 18:07:54 -0000 X-IronPort-AV: E=Sophos;i="4.80,739,1344211200"; d="asc'?scan'208";a="15679966" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 18:07:54 +0000 Received: from [IPv6:::1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 18:07:53 +0000 Message-ID: <1352398064.2774.2.camel@Abyss> From: Dario Faggioli To: Jan Beulich Date: Thu, 8 Nov 2012 19:07:44 +0100 In-Reply-To: <509A94F002000078000A702A@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7804927638820429400==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7804927638820429400== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-dZa8fWBeDh+BdeSZH1gv" --=-dZa8fWBeDh+BdeSZH1gv Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2012-11-07 at 16:05 +0000, Jan Beulich wrote:=20 > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. >=20 > Signed-off-by: Jan Beulich >=20 (For what it's worth) Acked-by: Dario Faggioli I don't really have a strong opinion about Dom0 and Xen needing special treatment or not, so the above applies to whatever solution you decide to go for. :-) Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-dZa8fWBeDh+BdeSZH1gv Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCb9PAACgkQk4XaBE3IOsTLSACcDJDPIGGWZ2NJ38p9FXuUppiX bLEAnjMDeWEP7cISAsFxTc1L8oJdFuZV =TGud -----END PGP SIGNATURE----- --=-dZa8fWBeDh+BdeSZH1gv-- --===============7804927638820429400== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7804927638820429400==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 18:08:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:08:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWWWE-0005e3-Eq; Thu, 08 Nov 2012 18:07:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWWWC-0005dy-9F for xen-devel@lists.xen.org; Thu, 08 Nov 2012 18:07:56 +0000 Received: from [193.109.254.147:25554] by server-13.bemta-14.messagelabs.com id FF/64-11239-BF4FB905; Thu, 08 Nov 2012 18:07:55 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1352398074!3406262!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5Mjg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 8 Nov 2012 18:07:54 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 18:07:54 -0000 X-IronPort-AV: E=Sophos;i="4.80,739,1344211200"; d="asc'?scan'208";a="15679966" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 18:07:54 +0000 Received: from [IPv6:::1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 18:07:53 +0000 Message-ID: <1352398064.2774.2.camel@Abyss> From: Dario Faggioli To: Jan Beulich Date: Thu, 8 Nov 2012 19:07:44 +0100 In-Reply-To: <509A94F002000078000A702A@nat28.tlf.novell.com> References: <5097FD2902000078000A66BF@nat28.tlf.novell.com> <5098E19D02000078000A697A@nat28.tlf.novell.com> <20121106094456.GA45690@ocelot.phlegethon.org> <509A94F002000078000A702A@nat28.tlf.novell.com> X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) MIME-Version: 1.0 Cc: Keir Fraser , wei.huang2@amd.com, Tim Deegan , xen-devel , weiwang.dd@gmail.com, xiantao.zhang@intel.com Subject: Re: [Xen-devel] [PATCH, v2] IOMMU: don't immediately disable bus mastering on faults X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7804927638820429400==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7804927638820429400== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-dZa8fWBeDh+BdeSZH1gv" --=-dZa8fWBeDh+BdeSZH1gv Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2012-11-07 at 16:05 +0000, Jan Beulich wrote:=20 > Instead, give the owning domain at least a small opportunity of fixing > things up, and allow for rare faults to not bring down the device at > all. The amount of faults tolerated within a given time period (all > numbers are made up with no specific rationale) is higher for Dom0 than > for DomU-s. >=20 > Signed-off-by: Jan Beulich >=20 (For what it's worth) Acked-by: Dario Faggioli I don't really have a strong opinion about Dom0 and Xen needing special treatment or not, so the above applies to whatever solution you decide to go for. :-) Thanks and Regards, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-dZa8fWBeDh+BdeSZH1gv Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCb9PAACgkQk4XaBE3IOsTLSACcDJDPIGGWZ2NJ38p9FXuUppiX bLEAnjMDeWEP7cISAsFxTc1L8oJdFuZV =TGud -----END PGP SIGNATURE----- --=-dZa8fWBeDh+BdeSZH1gv-- --===============7804927638820429400== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7804927638820429400==-- From xen-devel-bounces@lists.xen.org Thu Nov 08 18:39:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:39:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWX08-0006Jb-Gd; Thu, 08 Nov 2012 18:38:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWX07-0006JS-IW for xen-devel@lists.xen.org; Thu, 08 Nov 2012 18:38:51 +0000 Received: from [85.158.139.83:51504] by server-4.bemta-5.messagelabs.com id 29/D5-15011-A3CFB905; Thu, 08 Nov 2012 18:38:50 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352399928!25136154!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 730 invoked from network); 8 Nov 2012 18:38:50 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 18:38:50 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8IcUh7019576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 18:38:31 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8IcQao028894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 18:38:27 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8IcPB8024013; Thu, 8 Nov 2012 12:38:25 -0600 MIME-Version: 1.0 Message-ID: <092d8bc5-1643-40e0-a893-3e7ad78fe672@default> Date: Thu, 8 Nov 2012 10:38:22 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <509B74B402000078000A7206@nat28.tlf.novell.com> In-Reply-To: <509B74B402000078000A7206@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: Proposed new "memory capacity claim" hypercall/feature > > >>> On 07.11.12 at 23:17, Dan Magenheimer wrote: > > It appears that the attempt to use 2MB and 1GB pages is done in > > the toolstack, and if the hypervisor rejects it, toolstack tries > > smaller pages. Thus, if physical memory is highly fragmented > > (few or no order>=9 allocations available), this will result > > in one hypercall per 4k page so a 256GB domain would require > > 64 million hypercalls. And, since AFAICT, there is no sane > > way to hold the heap_lock across even two hypercalls, speeding > > up the in-hypervisor allocation path, by itself, will not solve > > the TOCTOU race. > > No, even in the absence of large pages, the tool stack will do 8M > allocations, just without requesting them to be contiguous. Rats, you are right (as usual). My debug code was poorly placed and missed this important point. So ignore the huge-number-of-hypercalls point and I think we return to: What is an upper time bound for holding the heap_lock and, for an arbitrary-sized domain in an arbitrarily-fragmented system, can the page allocation code be made fast enough to fit within that bound? I am in agreement that if the page allocation code can be fast enough so that the heap_lock can be held, this is a better solution than "claim". I am just skeptical that, in the presence of those two "arbitraries", it is possible. So I will proceed with more measurements before prototyping the "claim" stuff. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 18:39:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:39:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWX08-0006Jb-Gd; Thu, 08 Nov 2012 18:38:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWX07-0006JS-IW for xen-devel@lists.xen.org; Thu, 08 Nov 2012 18:38:51 +0000 Received: from [85.158.139.83:51504] by server-4.bemta-5.messagelabs.com id 29/D5-15011-A3CFB905; Thu, 08 Nov 2012 18:38:50 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352399928!25136154!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 730 invoked from network); 8 Nov 2012 18:38:50 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 18:38:50 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8IcUh7019576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 18:38:31 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8IcQao028894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 18:38:27 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8IcPB8024013; Thu, 8 Nov 2012 12:38:25 -0600 MIME-Version: 1.0 Message-ID: <092d8bc5-1643-40e0-a893-3e7ad78fe672@default> Date: Thu, 8 Nov 2012 10:38:22 -0800 (PST) From: Dan Magenheimer To: Jan Beulich References: <50939A1502000078000A5F61@nat28.tlf.novell.com> <7481128d-3f65-4cc3-ad96-1d4e9cd25094@default> <509791F902000078000A64D4@nat28.tlf.novell.com> <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <509B74B402000078000A7206@nat28.tlf.novell.com> In-Reply-To: <509B74B402000078000A7206@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: RE: Proposed new "memory capacity claim" hypercall/feature > > >>> On 07.11.12 at 23:17, Dan Magenheimer wrote: > > It appears that the attempt to use 2MB and 1GB pages is done in > > the toolstack, and if the hypervisor rejects it, toolstack tries > > smaller pages. Thus, if physical memory is highly fragmented > > (few or no order>=9 allocations available), this will result > > in one hypercall per 4k page so a 256GB domain would require > > 64 million hypercalls. And, since AFAICT, there is no sane > > way to hold the heap_lock across even two hypercalls, speeding > > up the in-hypervisor allocation path, by itself, will not solve > > the TOCTOU race. > > No, even in the absence of large pages, the tool stack will do 8M > allocations, just without requesting them to be contiguous. Rats, you are right (as usual). My debug code was poorly placed and missed this important point. So ignore the huge-number-of-hypercalls point and I think we return to: What is an upper time bound for holding the heap_lock and, for an arbitrary-sized domain in an arbitrarily-fragmented system, can the page allocation code be made fast enough to fit within that bound? I am in agreement that if the page allocation code can be fast enough so that the heap_lock can be held, this is a better solution than "claim". I am just skeptical that, in the presence of those two "arbitraries", it is possible. So I will proceed with more measurements before prototyping the "claim" stuff. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 18:55:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXGA-0006jC-5x; Thu, 08 Nov 2012 18:55:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXG9-0006j7-2t for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 18:55:25 +0000 Received: from [193.109.254.147:42477] by server-7.bemta-14.messagelabs.com id 1C/8E-02272-C100C905; Thu, 08 Nov 2012 18:55:24 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352400920!2298430!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0OTE5OQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19526 invoked from network); 8 Nov 2012 18:55:22 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 18:55:22 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8Isab4017800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 18:54:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8IsYGf007235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 18:54:34 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8IsXBk000397; Thu, 8 Nov 2012 12:54:33 -0600 Received: from [100.255.247.59] (/208.54.36.154) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 10:54:32 -0800 Date: Thu, 08 Nov 2012 13:54:29 -0500 Message-ID: <45w72guvowhjpvkrxs7vomxj.1352400869190@email.android.com> From: konrad To: Ian Campbell MIME-Version: 1.0 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "xen-devel@lists.xensource.com " , Russell King - ARM Linux , Arnd Bergmann , Stefano Stabellini , arm@kernel.org, "linux-arm-kernel@lists.infradead.org " Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Sorry about top posting - on the phone. I will send to Linus tomorrow. Ian Campbell wrote: >On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: >> On Tuesday 06 November 2012, Russell King - ARM Linux wrote: >> > My build system is giving me the following errors against an OMAP4 >> > randconfig build against the latest Linus' kernel plus arm-soc: >> > >> > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! >> > make[2]: *** [__modpost] Error 1 >> > make[2]: Target `_modpost' not remade because of errors. >> > make[1]: *** [modules] Error 2 >> > make: *** [sub-make] Error 2 >> > make: Target `uImage' not remade because of errors. >> > make: Target `modules' not remade because of errors. >> > >> > Full build results and configuration are here: >> > >> > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 >> > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 >> > >> >> I can reproduce the same thing with mainline v3.7-rc4. >> 8<------ >> xen/arm: export privcmd_call > >Thanks, Konrad posted a fix for this on Tuesday which covers a few other >cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I >added Russell to my response but forgot to add l-a-k@ too, sorry. > >Is one of you going to pick it up and send to mainline? > >Ian. > >> privcmd_call may get called from a module, so it has to be exported. >> >> Signed-off-by: Arnd Bergmann >> >> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c >> index 59bcb96..ff5e300 100644 >> --- a/arch/arm/xen/enlighten.c >> +++ b/arch/arm/xen/enlighten.c >> @@ -17,6 +17,9 @@ >> #include >> #include >> >> +/* from hypercall.S */ >> +EXPORT_SYMBOL_GPL(privcmd_call); >> + >> struct start_info _xen_start_info; >> struct start_info *xen_start_info = &_xen_start_info; >> EXPORT_SYMBOL_GPL(xen_start_info); >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 18:55:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 18:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXGA-0006jC-5x; Thu, 08 Nov 2012 18:55:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXG9-0006j7-2t for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 18:55:25 +0000 Received: from [193.109.254.147:42477] by server-7.bemta-14.messagelabs.com id 1C/8E-02272-C100C905; Thu, 08 Nov 2012 18:55:24 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352400920!2298430!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA0OTE5OQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19526 invoked from network); 8 Nov 2012 18:55:22 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 18:55:22 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8Isab4017800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 18:54:37 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8IsYGf007235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 18:54:34 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8IsXBk000397; Thu, 8 Nov 2012 12:54:33 -0600 Received: from [100.255.247.59] (/208.54.36.154) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 10:54:32 -0800 Date: Thu, 08 Nov 2012 13:54:29 -0500 Message-ID: <45w72guvowhjpvkrxs7vomxj.1352400869190@email.android.com> From: konrad To: Ian Campbell MIME-Version: 1.0 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: "xen-devel@lists.xensource.com " , Russell King - ARM Linux , Arnd Bergmann , Stefano Stabellini , arm@kernel.org, "linux-arm-kernel@lists.infradead.org " Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Sorry about top posting - on the phone. I will send to Linus tomorrow. Ian Campbell wrote: >On Thu, 2012-11-08 at 15:28 +0000, Arnd Bergmann wrote: >> On Tuesday 06 November 2012, Russell King - ARM Linux wrote: >> > My build system is giving me the following errors against an OMAP4 >> > randconfig build against the latest Linus' kernel plus arm-soc: >> > >> > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! >> > make[2]: *** [__modpost] Error 1 >> > make[2]: Target `_modpost' not remade because of errors. >> > make[1]: *** [modules] Error 2 >> > make: *** [sub-make] Error 2 >> > make: Target `uImage' not remade because of errors. >> > make: Target `modules' not remade because of errors. >> > >> > Full build results and configuration are here: >> > >> > http://www.arm.linux.org.uk/developer/build/result.php?type=build&idx=2627 >> > http://www.arm.linux.org.uk/developer/build/file.php?type=config&idx=2627 >> > >> >> I can reproduce the same thing with mainline v3.7-rc4. >> 8<------ >> xen/arm: export privcmd_call > >Thanks, Konrad posted a fix for this on Tuesday which covers a few other >cases too: http://marc.info/?l=linux-kernel&m=135224075902642&w=2 I >added Russell to my response but forgot to add l-a-k@ too, sorry. > >Is one of you going to pick it up and send to mainline? > >Ian. > >> privcmd_call may get called from a module, so it has to be exported. >> >> Signed-off-by: Arnd Bergmann >> >> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c >> index 59bcb96..ff5e300 100644 >> --- a/arch/arm/xen/enlighten.c >> +++ b/arch/arm/xen/enlighten.c >> @@ -17,6 +17,9 @@ >> #include >> #include >> >> +/* from hypercall.S */ >> +EXPORT_SYMBOL_GPL(privcmd_call); >> + >> struct start_info _xen_start_info; >> struct start_info *xen_start_info = &_xen_start_info; >> EXPORT_SYMBOL_GPL(xen_start_info); >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 19:17:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 19:17:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXax-00071Z-BE; Thu, 08 Nov 2012 19:16:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXav-00071R-Kf for xen-devel@lists.xen.org; Thu, 08 Nov 2012 19:16:53 +0000 Received: from [85.158.139.211:54114] by server-14.bemta-5.messagelabs.com id 84/3A-21768-4250C905; Thu, 08 Nov 2012 19:16:52 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352402210!19433465!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32639 invoked from network); 8 Nov 2012 19:16:52 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 19:16:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8JGeBQ026877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 19:16:41 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8JGdtI029015 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 19:16:39 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8JGbfn019900; Thu, 8 Nov 2012 13:16:38 -0600 MIME-Version: 1.0 Message-ID: <563639fd-fc13-49cd-88cf-431244534c2f@default> Date: Thu, 8 Nov 2012 11:16:34 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> <509BC65402000078000A73A4@nat28.tlf.novell.com> In-Reply-To: <509BC65402000078000A73A4@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Thursday, November 08, 2012 6:49 AM > To: Keir Fraser > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > devel@lists.xen.org; Dan Magenheimer; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; > TimDeegan > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > >>> On 08.11.12 at 11:50, Keir Fraser wrote: > > On 08/11/2012 09:47, "Jan Beulich" wrote: > >> The only thing that indeed is - on non-preemptible kernels - done > >> only on exit to user mode is the eventual entering of the scheduler. > > > > That alone may still be an argument for restricting the batch size from the > > toolstack? > > Yes, this clearly prohibits unlimited batches. But not being able to > schedule should be less restrictive than not being able to run > softirqs, so I'd still put under question whether the limit shouldn't > be bumped. Wait, please define unlimited. I think we are in agreement from previous discussion that, to solve the TOCTOU race, the heap_lock must be held for the entire allocation for a domain creation. True? So unless the limit is "bumped" to handle the largest supported physical memory size for a domain AND the allocation code in the hypervisor is rewritten to hold the heap_lock while allocating the entire extent, bumping the limit doesn't help the TOCTOU race, correct? Further, holding the heap_lock not only stops scheduling of this pcpu, but also blocks other domains/pcpus from doing any micro-allocations at all. True? Sorry if I am restating the obvious, but I am red-faced about the huge-number-of-hypercalls mistake, so want to ensure if I am understanding. Dan P.S. For PV domains, doesn't the toolstack already use a batch of up to 2^20 pages? (Or maybe I am misunderstanding/misreading the code in arch_setup_meminit() in xc_dom_x86.c?) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 19:17:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 19:17:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXax-00071Z-BE; Thu, 08 Nov 2012 19:16:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWXav-00071R-Kf for xen-devel@lists.xen.org; Thu, 08 Nov 2012 19:16:53 +0000 Received: from [85.158.139.211:54114] by server-14.bemta-5.messagelabs.com id 84/3A-21768-4250C905; Thu, 08 Nov 2012 19:16:52 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352402210!19433465!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzY2NDQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32639 invoked from network); 8 Nov 2012 19:16:52 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-3.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 19:16:52 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8JGeBQ026877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 19:16:41 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8JGdtI029015 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 19:16:39 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8JGbfn019900; Thu, 8 Nov 2012 13:16:38 -0600 MIME-Version: 1.0 Message-ID: <563639fd-fc13-49cd-88cf-431244534c2f@default> Date: Thu, 8 Nov 2012 11:16:34 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> <509BC65402000078000A73A4@nat28.tlf.novell.com> In-Reply-To: <509BC65402000078000A73A4@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Thursday, November 08, 2012 6:49 AM > To: Keir Fraser > Cc: Olaf Hering; IanCampbell; George Dunlap; Ian Jackson; George Shuklin; DarioFaggioli; xen- > devel@lists.xen.org; Dan Magenheimer; Konrad Rzeszutek Wilk; Kurt Hackel; Mukesh Rathor; Zhigang Wang; > TimDeegan > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > >>> On 08.11.12 at 11:50, Keir Fraser wrote: > > On 08/11/2012 09:47, "Jan Beulich" wrote: > >> The only thing that indeed is - on non-preemptible kernels - done > >> only on exit to user mode is the eventual entering of the scheduler. > > > > That alone may still be an argument for restricting the batch size from the > > toolstack? > > Yes, this clearly prohibits unlimited batches. But not being able to > schedule should be less restrictive than not being able to run > softirqs, so I'd still put under question whether the limit shouldn't > be bumped. Wait, please define unlimited. I think we are in agreement from previous discussion that, to solve the TOCTOU race, the heap_lock must be held for the entire allocation for a domain creation. True? So unless the limit is "bumped" to handle the largest supported physical memory size for a domain AND the allocation code in the hypervisor is rewritten to hold the heap_lock while allocating the entire extent, bumping the limit doesn't help the TOCTOU race, correct? Further, holding the heap_lock not only stops scheduling of this pcpu, but also blocks other domains/pcpus from doing any micro-allocations at all. True? Sorry if I am restating the obvious, but I am red-faced about the huge-number-of-hypercalls mistake, so want to ensure if I am understanding. Dan P.S. For PV domains, doesn't the toolstack already use a batch of up to 2^20 pages? (Or maybe I am misunderstanding/misreading the code in arch_setup_meminit() in xc_dom_x86.c?) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 20:45:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 20:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWYyf-0007wp-4f; Thu, 08 Nov 2012 20:45:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWYyc-0007wk-W8 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 20:45:27 +0000 Received: from [85.158.137.99:16103] by server-9.bemta-3.messagelabs.com id 5B/E3-02388-6E91C905; Thu, 08 Nov 2012 20:45:26 +0000 X-Env-Sender: lists.xen@nuclearfallout.net X-Msg-Ref: server-12.tower-217.messagelabs.com!1352407524!15205380!1 X-Originating-IP: [208.146.45.251] X-SpamReason: No, hits=0.0 required=7.0 tests=received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7834 invoked from network); 8 Nov 2012 20:45:24 -0000 Received: from mail.nuclearfallout.net (HELO mail.nuclearfallout.net) (208.146.45.251) by server-12.tower-217.messagelabs.com with SMTP; 8 Nov 2012 20:45:24 -0000 Message-ID: <509C19DE.6010108@nuclearfallout.net> Date: Thu, 08 Nov 2012 12:45:18 -0800 From: John Weekes User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121010 Thunderbird/16.0.1 MIME-Version: 1.0 To: "xen-devel@lists.xensource.com" Subject: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I'm having these problems when using "xl" in the latest c/s of 4.2 (25912:651d965ee2c0): - It's not allowing multiple domains to use the same images, at least under tapdisk2. If I start one domain using an image (a read-only CD-ROM image, for instance), then start another, I can see in "tap-ctl list" that only one of the domains actually receives the proper access. The other either never gets it, or it is disconnected after it's created -- I can't readily tell which. - When I use "xl destroy" on a domain that also has an associated stubdom, "xl" tries to destroy the tapdisk2 entries for both the domain and its stubdomain, resulting in errors like these: # xl destroy testvds4 libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/isos/DummyCD.iso: No such file or directory libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/customers/testvds4.img: No such file or directory libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/isos/DummyCD-2.iso: No such file or directory libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy failed for 19 libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy failed for 18 If I'm reading the source correctly, it seems as though the various destruction functions aren't passing down the domid and ultimately libxl__device_destroy_tapdisk is calling tap_ctl_find, which just globally matches based on the type and name of the image, causing the errors on destroy. I was trying to find a quick fix, but it looks like any proper one will require querying xenstore for the tapdisk entries specific to the domain, and I'm not immediately able to make that change, so I've personally just switched back to using "xm" for the time being. (I don't know if this relates to the first bug re: multiple domains using the same image files). Another, much more minor, bug in "xl" that I've found is that "xl uptime" will not run without an argument; it is supposed to just show all uptimes in this circumstance. This is an easy one-liner fix of modifying line: tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, "s", "uptime", 1)) != -1) { into this: tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, "s", "uptime", 0)) != -1) { Also, a couple of small typos in "xl" -- libxl.c:556: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:575: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:678: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:1393: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant domain %d", domid); Also, running "xl sched-credit" always gives me an error, even though it seems to work. Maybe it should be silent if cpu pools aren't defined? Maybe it's supposed to be creating a second cpupool for the second CPU in this system, and isn't? # xl sched-credit libxl: error: libxl.c:596:cpupool_info: failed to get info for cpupool1 : No such file or directory Cpupool Pool-0: tslice=5ms ratelimit=500us Name ID Weight Cap Domain-0 0 65535 0 As an additional note about 4.2 -- this isn't an "xl" issue, but rather a build problem -- even though I use "./configure --libdir=/usr/lib64", the build is still creating a "dist/install/usr/lib" directory, and because of this, running ./install.sh nukes my system's "/usr/lib" -> "/usr/lib64" softlink (which in turn causes all sorts of other problems until it's corrected). Files that are being put in that tree: xen-4.2-testing.hg # find dist/install/usr/lib dist/install/usr/lib dist/install/usr/lib/xen dist/install/usr/lib/xen/boot dist/install/usr/lib/xen/boot/xenstore-stubdom.gz dist/install/usr/lib/xen/boot/ioemu-stubdom.gz dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz dist/install/usr/lib/xen/boot/hvmloader dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz dist/install/usr/lib/xen/bin dist/install/usr/lib/xen/bin/stubdom-dm dist/install/usr/lib/xen/bin/qemu-io dist/install/usr/lib/xen/bin/qemu-nbd dist/install/usr/lib/xen/bin/qemu-img dist/install/usr/lib/xen/bin/xenpaging dist/install/usr/lib/xen/bin/qemu-dm dist/install/usr/lib/xen/bin/qemu-system-i386 dist/install/usr/lib/xen/bin/qemu-ga dist/install/usr/lib/xen/bin/stubdompath.sh -John _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 20:45:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 20:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWYyf-0007wp-4f; Thu, 08 Nov 2012 20:45:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWYyc-0007wk-W8 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 20:45:27 +0000 Received: from [85.158.137.99:16103] by server-9.bemta-3.messagelabs.com id 5B/E3-02388-6E91C905; Thu, 08 Nov 2012 20:45:26 +0000 X-Env-Sender: lists.xen@nuclearfallout.net X-Msg-Ref: server-12.tower-217.messagelabs.com!1352407524!15205380!1 X-Originating-IP: [208.146.45.251] X-SpamReason: No, hits=0.0 required=7.0 tests=received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7834 invoked from network); 8 Nov 2012 20:45:24 -0000 Received: from mail.nuclearfallout.net (HELO mail.nuclearfallout.net) (208.146.45.251) by server-12.tower-217.messagelabs.com with SMTP; 8 Nov 2012 20:45:24 -0000 Message-ID: <509C19DE.6010108@nuclearfallout.net> Date: Thu, 08 Nov 2012 12:45:18 -0800 From: John Weekes User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121010 Thunderbird/16.0.1 MIME-Version: 1.0 To: "xen-devel@lists.xensource.com" Subject: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I'm having these problems when using "xl" in the latest c/s of 4.2 (25912:651d965ee2c0): - It's not allowing multiple domains to use the same images, at least under tapdisk2. If I start one domain using an image (a read-only CD-ROM image, for instance), then start another, I can see in "tap-ctl list" that only one of the domains actually receives the proper access. The other either never gets it, or it is disconnected after it's created -- I can't readily tell which. - When I use "xl destroy" on a domain that also has an associated stubdom, "xl" tries to destroy the tapdisk2 entries for both the domain and its stubdomain, resulting in errors like these: # xl destroy testvds4 libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/isos/DummyCD.iso: No such file or directory libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/customers/testvds4.img: No such file or directory libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable to find type aio disk /servers/isos/DummyCD-2.iso: No such file or directory libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy failed for 19 libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy failed for 18 If I'm reading the source correctly, it seems as though the various destruction functions aren't passing down the domid and ultimately libxl__device_destroy_tapdisk is calling tap_ctl_find, which just globally matches based on the type and name of the image, causing the errors on destroy. I was trying to find a quick fix, but it looks like any proper one will require querying xenstore for the tapdisk entries specific to the domain, and I'm not immediately able to make that change, so I've personally just switched back to using "xm" for the time being. (I don't know if this relates to the first bug re: multiple domains using the same image files). Another, much more minor, bug in "xl" that I've found is that "xl uptime" will not run without an argument; it is supposed to just show all uptimes in this circumstance. This is an easy one-liner fix of modifying line: tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, "s", "uptime", 1)) != -1) { into this: tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, "s", "uptime", 0)) != -1) { Also, a couple of small typos in "xl" -- libxl.c:556: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:575: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:678: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); libxl.c:1393: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant domain %d", domid); Also, running "xl sched-credit" always gives me an error, even though it seems to work. Maybe it should be silent if cpu pools aren't defined? Maybe it's supposed to be creating a second cpupool for the second CPU in this system, and isn't? # xl sched-credit libxl: error: libxl.c:596:cpupool_info: failed to get info for cpupool1 : No such file or directory Cpupool Pool-0: tslice=5ms ratelimit=500us Name ID Weight Cap Domain-0 0 65535 0 As an additional note about 4.2 -- this isn't an "xl" issue, but rather a build problem -- even though I use "./configure --libdir=/usr/lib64", the build is still creating a "dist/install/usr/lib" directory, and because of this, running ./install.sh nukes my system's "/usr/lib" -> "/usr/lib64" softlink (which in turn causes all sorts of other problems until it's corrected). Files that are being put in that tree: xen-4.2-testing.hg # find dist/install/usr/lib dist/install/usr/lib dist/install/usr/lib/xen dist/install/usr/lib/xen/boot dist/install/usr/lib/xen/boot/xenstore-stubdom.gz dist/install/usr/lib/xen/boot/ioemu-stubdom.gz dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz dist/install/usr/lib/xen/boot/hvmloader dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz dist/install/usr/lib/xen/bin dist/install/usr/lib/xen/bin/stubdom-dm dist/install/usr/lib/xen/bin/qemu-io dist/install/usr/lib/xen/bin/qemu-nbd dist/install/usr/lib/xen/bin/qemu-img dist/install/usr/lib/xen/bin/xenpaging dist/install/usr/lib/xen/bin/qemu-dm dist/install/usr/lib/xen/bin/qemu-system-i386 dist/install/usr/lib/xen/bin/qemu-ga dist/install/usr/lib/xen/bin/stubdompath.sh -John _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 21:42:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 21:42:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZrl-0008LB-Tj; Thu, 08 Nov 2012 21:42:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZrk-0008L6-J9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 21:42:24 +0000 Received: from [85.158.137.99:42345] by server-9.bemta-3.messagelabs.com id 42/38-02388-F372C905; Thu, 08 Nov 2012 21:42:23 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352410942!13282940!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5OTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2489 invoked from network); 8 Nov 2012 21:42:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 21:42:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,740,1344211200"; d="scan'208";a="15683833" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 21:42:22 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 21:42:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWZrh-0000zC-VG; Thu, 08 Nov 2012 21:42:21 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWZrh-0008O2-PA; Thu, 08 Nov 2012 21:42:21 +0000 To: Message-ID: From: xen.org Date: Thu, 8 Nov 2012 21:42:21 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14375: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14375 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14375/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14374 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14374 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14374 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14374 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 92163b114076 ------------------------------------------------------------ People who touched revisions under test: Jan Beulich Keir Fraser ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=62885b3c34c8 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 62885b3c34c8 + branch=xen-unstable + revision=62885b3c34c8 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 62885b3c34c8 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 7 changes to 6 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 21:42:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 21:42:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZrl-0008LB-Tj; Thu, 08 Nov 2012 21:42:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZrk-0008L6-J9 for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 21:42:24 +0000 Received: from [85.158.137.99:42345] by server-9.bemta-3.messagelabs.com id 42/38-02388-F372C905; Thu, 08 Nov 2012 21:42:23 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352410942!13282940!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5OTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2489 invoked from network); 8 Nov 2012 21:42:23 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 21:42:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,740,1344211200"; d="scan'208";a="15683833" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Nov 2012 21:42:22 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Thu, 8 Nov 2012 21:42:21 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWZrh-0000zC-VG; Thu, 08 Nov 2012 21:42:21 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWZrh-0008O2-PA; Thu, 08 Nov 2012 21:42:21 +0000 To: Message-ID: From: xen.org Date: Thu, 8 Nov 2012 21:42:21 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14375: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14375 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14375/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14374 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14374 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14374 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14374 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 92163b114076 ------------------------------------------------------------ People who touched revisions under test: Jan Beulich Keir Fraser ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=62885b3c34c8 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 62885b3c34c8 + branch=xen-unstable + revision=62885b3c34c8 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 62885b3c34c8 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 7 changes to 6 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 21:46:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 21:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZup-0008Um-NK; Thu, 08 Nov 2012 21:45:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZun-0008Ug-Tu for xen-devel@lists.xen.org; Thu, 08 Nov 2012 21:45:34 +0000 Received: from [85.158.137.99:44864] by server-1.bemta-3.messagelabs.com id 45/EC-12169-DF72C905; Thu, 08 Nov 2012 21:45:33 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352411130!18229929!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MDg4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21326 invoked from network); 8 Nov 2012 21:45:32 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 21:45:32 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8LjABw009125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 21:45:10 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8Lj8jS004166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 21:45:09 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8Lj7hF027467; Thu, 8 Nov 2012 15:45:07 -0600 MIME-Version: 1.0 Message-ID: <88261052-b3f5-46f5-bd0e-b650d827062e@default> Date: Thu, 8 Nov 2012 13:45:05 -0800 (PST) From: Dan Magenheimer To: Ian Jackson , Keir Fraser References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <20635.34133.118531.778138@mariner.uk.xensource.com> In-Reply-To: <20635.34133.118531.778138@mariner.uk.xensource.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Tim \(Xen.org\)" , Olaf Hering , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Jackson [mailto:Ian.Jackson@eu.citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > Keir Fraser writes ("Re: Proposed new "memory capacity claim" hypercall/feature"): > > On 07/11/2012 22:17, "Dan Magenheimer" wrote: > > > I think this brings us back to the proposed "claim" hypercall/subop. > > > Unless there are further objections or suggestions for different > > > approaches, I'll commence prototyping it, OK? > > > > Yes, in fact I thought you'd started already! > > Sorry to play bad cop here but I am still far from convinced that a > new hypercall is necessary or desirable. > > A lot of words have been written but the concrete, detailed, technical > argument remains to be made IMO. Hi Ian -- I agree, a _lot_ of words have been written and this discussion has had a lot of side conversations so has gone back and forth into a lot of weed patches. I agree it would be worthwhile to restate the problem clearly, along with some of the proposed solutions/pros/cons. When I have a chance I will do that, but prototyping may either clarify some things or bring out some new unforeseen issues, so I think I will do some more coding first (and this may take a week or two due to some other constraints). But to ensure that any summary/restatement touches on your concerns, could you be more specific as to about what you are unconvinced? I.e. I still think the toolstack can manage all memory allocation; or, holding the heap_lock for a longer period should solve the problem; or I don't understand what the original problem is that you are trying to solve, etc. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 21:46:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 21:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZup-0008Um-NK; Thu, 08 Nov 2012 21:45:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWZun-0008Ug-Tu for xen-devel@lists.xen.org; Thu, 08 Nov 2012 21:45:34 +0000 Received: from [85.158.137.99:44864] by server-1.bemta-3.messagelabs.com id 45/EC-12169-DF72C905; Thu, 08 Nov 2012 21:45:33 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352411130!18229929!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MDg4Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21326 invoked from network); 8 Nov 2012 21:45:32 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 8 Nov 2012 21:45:32 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA8LjABw009125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Nov 2012 21:45:10 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA8Lj8jS004166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Nov 2012 21:45:09 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA8Lj7hF027467; Thu, 8 Nov 2012 15:45:07 -0600 MIME-Version: 1.0 Message-ID: <88261052-b3f5-46f5-bd0e-b650d827062e@default> Date: Thu, 8 Nov 2012 13:45:05 -0800 (PST) From: Dan Magenheimer To: Ian Jackson , Keir Fraser References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <20635.34133.118531.778138@mariner.uk.xensource.com> In-Reply-To: <20635.34133.118531.778138@mariner.uk.xensource.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Tim \(Xen.org\)" , Olaf Hering , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Ian Jackson [mailto:Ian.Jackson@eu.citrix.com] > Subject: Re: Proposed new "memory capacity claim" hypercall/feature > > Keir Fraser writes ("Re: Proposed new "memory capacity claim" hypercall/feature"): > > On 07/11/2012 22:17, "Dan Magenheimer" wrote: > > > I think this brings us back to the proposed "claim" hypercall/subop. > > > Unless there are further objections or suggestions for different > > > approaches, I'll commence prototyping it, OK? > > > > Yes, in fact I thought you'd started already! > > Sorry to play bad cop here but I am still far from convinced that a > new hypercall is necessary or desirable. > > A lot of words have been written but the concrete, detailed, technical > argument remains to be made IMO. Hi Ian -- I agree, a _lot_ of words have been written and this discussion has had a lot of side conversations so has gone back and forth into a lot of weed patches. I agree it would be worthwhile to restate the problem clearly, along with some of the proposed solutions/pros/cons. When I have a chance I will do that, but prototyping may either clarify some things or bring out some new unforeseen issues, so I think I will do some more coding first (and this may take a week or two due to some other constraints). But to ensure that any summary/restatement touches on your concerns, could you be more specific as to about what you are unconvinced? I.e. I still think the toolstack can manage all memory allocation; or, holding the heap_lock for a longer period should solve the problem; or I don't understand what the original problem is that you are trying to solve, etc. Thanks, Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 22:16:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 22:16:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaOM-0000NT-EY; Thu, 08 Nov 2012 22:16:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaEs-0000Kr-GQ for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 22:06:18 +0000 Received: from [85.158.143.35:61653] by server-1.bemta-4.messagelabs.com id 5B/1E-27934-9DC2C905; Thu, 08 Nov 2012 22:06:17 +0000 X-Env-Sender: shpedoikal@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352412375!16337914!1 X-Originating-IP: [209.85.223.171] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9774 invoked from network); 8 Nov 2012 22:06:16 -0000 Received: from mail-ie0-f171.google.com (HELO mail-ie0-f171.google.com) (209.85.223.171) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 22:06:16 -0000 Received: by mail-ie0-f171.google.com with SMTP id s9so6326179iec.30 for ; Thu, 08 Nov 2012 14:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Hg9d7JvXbXdAweNP+oJDjx99wOa2MHTx1dhvQ+7C2wE=; b=g0ApgnOnQy1zXGiADTIvXF9LaRjh/Wm90lMtMLVwArJ6nwt4OYgiVrK9VJ8meZ2VGl JXKm+kmiorNnrQkPL8sAADQvF8xTAugZIkWoxEsQO3SUt3RfvkcGGnZa6Cghidz6H5xw 3RbqC+2uGOpdHBdZQxHL7/iSR3bLB21TFIrtPycSS2MMc2Gn4FL4wvSKo7qdddRY8Let tEeV5IyqUGAVCNjGLUEPnmhk/CN1S90c+hY7oivnkPZvRq+ehlOt+qxTh+b6ASIGsBQB sengQm925AGWIpvQF75T0/sf6skCJ5gIh+jLGxJ+vM1ayDBMPVxu8wrrPR7USXrB/Qk7 FQXQ== MIME-Version: 1.0 Received: by 10.50.77.230 with SMTP id v6mr21471923igw.11.1352412374910; Thu, 08 Nov 2012 14:06:14 -0800 (PST) Received: by 10.50.95.233 with HTTP; Thu, 8 Nov 2012 14:06:14 -0800 (PST) In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> <20121108152835.GA28612@ennui.austin.ibm.com> <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> Date: Thu, 8 Nov 2012 16:06:14 -0600 Message-ID: From: Kent Yoder To: "Fioravante, Matthew E." X-Mailman-Approved-At: Thu, 08 Nov 2012 22:16:05 +0000 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Jan Beulich , Kent Yoder Subject: Re: [Xen-devel] [tpmdd-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 8, 2012 at 9:36 AM, Fioravante, Matthew E. wrote: >> >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: >> > On 11/07/2012 09:46 AM, Kent Yoder wrote: >> >>> --- a/drivers/char/tpm/tpm.h >> >>> +++ b/drivers/char/tpm/tpm.h >> >>> @@ -130,6 +130,9 @@ struct tpm_chip { >> >>> >> >>> struct list_head list; >> >>> void (*release) (struct device *); >> >>> +#if CONFIG_XEN >> >>> + void *priv; >> >>> +#endif >> >> Can you use the chip->vendor.data pointer here instead? >> >> tpm_ibmvtpm is already using that as a priv pointer. I should >> >> probably change that name to make it more obvious what that's used for. >> > That makes more sense. I'm guessing your data pointer didn't exist >> > during the 2.6.18 kernel which is why they added their own priv pointer. >> >> It got introduced with 3.7-rc. >> >> >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >> >>> >> >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >> >>> >> >>> +#ifdef CONFIG_XEN >> >>> +static inline void *chip_get_private(const struct tpm_chip *chip) >> >>> +{ >> >>> + return chip->priv; >> >>> +} >> >>> + >> >>> +static inline void chip_set_private(struct tpm_chip *chip, void >> >>> +*priv) { >> >>> + chip->priv = priv; >> >>> +} >> >>> +#endif >> >> Can you put these in tpm_vtpm.c please? One less #define. :-) >> > Agreed, I'd rather not have to modify your shared tpm.h interface at all. >> >> Either such accessors should be defined here, for everyone to use (and >> tpm_ibmvtpm.c get changed accordingly), or the Xen code should access >> the field without wrappers too (for consistency). > > Agreed. I'll update tpm_ibmvtpm. > > Kent > > So what is the consensus, you're going to use accessors in ibmvtpm? I was just about to remove them from my side. Yeah I'll use your accessor. Just modify it to use chip->vendor.data and I'll add suport to tpm_ibmvtpm after I integrate your patch. Thanks! Kent >> >> Jan >> > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_nov > _______________________________________________ > tpmdd-devel mailing list > tpmdd-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tpmdd-devel -- IBM LTC Security _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 22:16:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 22:16:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaOM-0000NT-EY; Thu, 08 Nov 2012 22:16:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaEs-0000Kr-GQ for xen-devel@lists.xensource.com; Thu, 08 Nov 2012 22:06:18 +0000 Received: from [85.158.143.35:61653] by server-1.bemta-4.messagelabs.com id 5B/1E-27934-9DC2C905; Thu, 08 Nov 2012 22:06:17 +0000 X-Env-Sender: shpedoikal@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352412375!16337914!1 X-Originating-IP: [209.85.223.171] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9774 invoked from network); 8 Nov 2012 22:06:16 -0000 Received: from mail-ie0-f171.google.com (HELO mail-ie0-f171.google.com) (209.85.223.171) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 22:06:16 -0000 Received: by mail-ie0-f171.google.com with SMTP id s9so6326179iec.30 for ; Thu, 08 Nov 2012 14:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Hg9d7JvXbXdAweNP+oJDjx99wOa2MHTx1dhvQ+7C2wE=; b=g0ApgnOnQy1zXGiADTIvXF9LaRjh/Wm90lMtMLVwArJ6nwt4OYgiVrK9VJ8meZ2VGl JXKm+kmiorNnrQkPL8sAADQvF8xTAugZIkWoxEsQO3SUt3RfvkcGGnZa6Cghidz6H5xw 3RbqC+2uGOpdHBdZQxHL7/iSR3bLB21TFIrtPycSS2MMc2Gn4FL4wvSKo7qdddRY8Let tEeV5IyqUGAVCNjGLUEPnmhk/CN1S90c+hY7oivnkPZvRq+ehlOt+qxTh+b6ASIGsBQB sengQm925AGWIpvQF75T0/sf6skCJ5gIh+jLGxJ+vM1ayDBMPVxu8wrrPR7USXrB/Qk7 FQXQ== MIME-Version: 1.0 Received: by 10.50.77.230 with SMTP id v6mr21471923igw.11.1352412374910; Thu, 08 Nov 2012 14:06:14 -0800 (PST) Received: by 10.50.95.233 with HTTP; Thu, 8 Nov 2012 14:06:14 -0800 (PST) In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> References: <1352128197-1539-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121107144625.GA14628@ennui.austin.ibm.com> <509AA501.1090701@jhuapl.edu> <509B78AC02000078000A723C@nat28.tlf.novell.com> <20121108152835.GA28612@ennui.austin.ibm.com> <068F06DC4D106941B297C0C5F9F446EA48A229E6FD@aplesstripe.dom1.jhuapl.edu> Date: Thu, 8 Nov 2012 16:06:14 -0600 Message-ID: From: Kent Yoder To: "Fioravante, Matthew E." X-Mailman-Approved-At: Thu, 08 Nov 2012 22:16:05 +0000 Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "konrad.wilk@oracle.com" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , Jan Beulich , Kent Yoder Subject: Re: [Xen-devel] [tpmdd-devel] [PATCH] add tpm_xenu.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 8, 2012 at 9:36 AM, Fioravante, Matthew E. wrote: >> >>> On 07.11.12 at 19:14, Matthew Fioravante wrote: >> > On 11/07/2012 09:46 AM, Kent Yoder wrote: >> >>> --- a/drivers/char/tpm/tpm.h >> >>> +++ b/drivers/char/tpm/tpm.h >> >>> @@ -130,6 +130,9 @@ struct tpm_chip { >> >>> >> >>> struct list_head list; >> >>> void (*release) (struct device *); >> >>> +#if CONFIG_XEN >> >>> + void *priv; >> >>> +#endif >> >> Can you use the chip->vendor.data pointer here instead? >> >> tpm_ibmvtpm is already using that as a priv pointer. I should >> >> probably change that name to make it more obvious what that's used for. >> > That makes more sense. I'm guessing your data pointer didn't exist >> > during the 2.6.18 kernel which is why they added their own priv pointer. >> >> It got introduced with 3.7-rc. >> >> >>> @@ -310,6 +313,18 @@ struct tpm_cmd_t { >> >>> >> >>> ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *); >> >>> >> >>> +#ifdef CONFIG_XEN >> >>> +static inline void *chip_get_private(const struct tpm_chip *chip) >> >>> +{ >> >>> + return chip->priv; >> >>> +} >> >>> + >> >>> +static inline void chip_set_private(struct tpm_chip *chip, void >> >>> +*priv) { >> >>> + chip->priv = priv; >> >>> +} >> >>> +#endif >> >> Can you put these in tpm_vtpm.c please? One less #define. :-) >> > Agreed, I'd rather not have to modify your shared tpm.h interface at all. >> >> Either such accessors should be defined here, for everyone to use (and >> tpm_ibmvtpm.c get changed accordingly), or the Xen code should access >> the field without wrappers too (for consistency). > > Agreed. I'll update tpm_ibmvtpm. > > Kent > > So what is the consensus, you're going to use accessors in ibmvtpm? I was just about to remove them from my side. Yeah I'll use your accessor. Just modify it to use chip->vendor.data and I'll add suport to tpm_ibmvtpm after I integrate your patch. Thanks! Kent >> >> Jan >> > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_d2d_nov > _______________________________________________ > tpmdd-devel mailing list > tpmdd-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tpmdd-devel -- IBM LTC Security _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 22:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 22:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaeR-0000a9-5j; Thu, 08 Nov 2012 22:32:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaeP-0000a4-5O for xen-devel@lists.xen.org; Thu, 08 Nov 2012 22:32:41 +0000 Received: from [85.158.139.83:39290] by server-14.bemta-5.messagelabs.com id 5F/E1-21768-8033C905; Thu, 08 Nov 2012 22:32:40 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352413959!29433821!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30389 invoked from network); 8 Nov 2012 22:32:39 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 22:32:39 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so5375wib.14 for ; Thu, 08 Nov 2012 14:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=MG9k9OFMJ28jAdYt8zoPW407h+uI8jg9pmdkNlZ48Wc=; b=UhkI91gR8ieDWlrBMZOalZlZGcRLsOdip3Hh2uyL0iPlHnwk57J94b30gXKbYHGGhX srU/h6LlQl3lpoDz3THH8d+qfwbQ/aljkHO6FkIN4JKF7evnIGWr8bZbjBH+3PKKbJ9j ul9eoZzPGNADWj51czet0qCzKJTsz0kvCbV83dxnKbBdk5Zx5qlJtQB9znyRZ7Z31b2N FuQWEZIF0YFrNQEV47KVrHbCOX8z4pRaZXnMHNZc99fZjOhkIvr8NNfcaa/V2tC/kLNt lfqXHTwf8iCbvjXQ6oqzoGfq/KuxDJ8p4v7kvSwzLnMuQRHmoX8sorYvP0w0iyZLrDBa UORQ== Received: by 10.216.141.152 with SMTP id g24mr4089692wej.113.1352413959446; Thu, 08 Nov 2012 14:32:39 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id i6sm381344wix.5.2012.11.08.14.32.35 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 14:32:38 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 22:32:32 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac2+APE6Tnwz7kQmHEuxdT0N2TPJvw== In-Reply-To: <563639fd-fc13-49cd-88cf-431244534c2f@default> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 19:16, "Dan Magenheimer" wrote: >> Yes, this clearly prohibits unlimited batches. But not being able to >> schedule should be less restrictive than not being able to run >> softirqs, so I'd still put under question whether the limit shouldn't >> be bumped. > > Wait, please define unlimited. > > I think we are in agreement from previous discussion that, to solve > the TOCTOU race, the heap_lock must be held for the entire allocation > for a domain creation. True? It's pretty obvious that this isn't going to be possible in the general case. E.g., a 40G domain being created out of 4k pages (eg. Because memory is fragmented) is going to be at least 40G/4k == 10M heap operations. Say each takes 10ns, which would be quick, we're talking 100ms of cpu work. Holding a lock that long can't be recommended really. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Thu Nov 08 22:33:09 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 08 Nov 2012 22:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaeR-0000a9-5j; Thu, 08 Nov 2012 22:32:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWaeP-0000a4-5O for xen-devel@lists.xen.org; Thu, 08 Nov 2012 22:32:41 +0000 Received: from [85.158.139.83:39290] by server-14.bemta-5.messagelabs.com id 5F/E1-21768-8033C905; Thu, 08 Nov 2012 22:32:40 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352413959!29433821!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30389 invoked from network); 8 Nov 2012 22:32:39 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-3.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2012 22:32:39 -0000 Received: by mail-wi0-f173.google.com with SMTP id cb5so5375wib.14 for ; Thu, 08 Nov 2012 14:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=MG9k9OFMJ28jAdYt8zoPW407h+uI8jg9pmdkNlZ48Wc=; b=UhkI91gR8ieDWlrBMZOalZlZGcRLsOdip3Hh2uyL0iPlHnwk57J94b30gXKbYHGGhX srU/h6LlQl3lpoDz3THH8d+qfwbQ/aljkHO6FkIN4JKF7evnIGWr8bZbjBH+3PKKbJ9j ul9eoZzPGNADWj51czet0qCzKJTsz0kvCbV83dxnKbBdk5Zx5qlJtQB9znyRZ7Z31b2N FuQWEZIF0YFrNQEV47KVrHbCOX8z4pRaZXnMHNZc99fZjOhkIvr8NNfcaa/V2tC/kLNt lfqXHTwf8iCbvjXQ6oqzoGfq/KuxDJ8p4v7kvSwzLnMuQRHmoX8sorYvP0w0iyZLrDBa UORQ== Received: by 10.216.141.152 with SMTP id g24mr4089692wej.113.1352413959446; Thu, 08 Nov 2012 14:32:39 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id i6sm381344wix.5.2012.11.08.14.32.35 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 14:32:38 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Thu, 08 Nov 2012 22:32:32 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich Message-ID: Thread-Topic: Proposed new "memory capacity claim" hypercall/feature Thread-Index: Ac2+APE6Tnwz7kQmHEuxdT0N2TPJvw== In-Reply-To: <563639fd-fc13-49cd-88cf-431244534c2f@default> Mime-version: 1.0 Cc: TimDeegan , Olaf Hering , IanCampbell , Konrad Rzeszutek Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/2012 19:16, "Dan Magenheimer" wrote: >> Yes, this clearly prohibits unlimited batches. But not being able to >> schedule should be less restrictive than not being able to run >> softirqs, so I'd still put under question whether the limit shouldn't >> be bumped. > > Wait, please define unlimited. > > I think we are in agreement from previous discussion that, to solve > the TOCTOU race, the heap_lock must be held for the entire allocation > for a domain creation. True? It's pretty obvious that this isn't going to be possible in the general case. E.g., a 40G domain being created out of 4k pages (eg. Because memory is fragmented) is going to be at least 40G/4k == 10M heap operations. Say each takes 10ns, which would be quick, we're talking 100ms of cpu work. Holding a lock that long can't be recommended really. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 01:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 01:00:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWcwy-0001uB-UW; Fri, 09 Nov 2012 01:00:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWcwx-0001u6-A4 for Xen-devel@lists.xensource.com; Fri, 09 Nov 2012 00:59:59 +0000 Received: from [85.158.143.35:63963] by server-1.bemta-4.messagelabs.com id E9/20-27934-E855C905; Fri, 09 Nov 2012 00:59:58 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352422796!14167204!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzg3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4492 invoked from network); 9 Nov 2012 00:59:57 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 00:59:57 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA90xtAI023380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 9 Nov 2012 00:59:56 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA90xsiV026538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 9 Nov 2012 00:59:55 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA90xsGR032074 for ; Thu, 8 Nov 2012 18:59:54 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 16:59:54 -0800 Date: Thu, 8 Nov 2012 16:59:53 -0800 From: Mukesh Rathor To: "Xen-devel@lists.xensource.com" Message-ID: <20121108165953.1d3e27cd@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] PVH update... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Just wanted go give quick PVH update. I refreshed my xen tree, mine was few months old. Lot of changes, so did the merge manually. Still it doesn't work, so debugging right now. Will send alpha patch as soon as I've something working. jfyi... thanks, mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 01:00:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 01:00:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWcwy-0001uB-UW; Fri, 09 Nov 2012 01:00:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWcwx-0001u6-A4 for Xen-devel@lists.xensource.com; Fri, 09 Nov 2012 00:59:59 +0000 Received: from [85.158.143.35:63963] by server-1.bemta-4.messagelabs.com id E9/20-27934-E855C905; Fri, 09 Nov 2012 00:59:58 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352422796!14167204!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMzg3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4492 invoked from network); 9 Nov 2012 00:59:57 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 00:59:57 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA90xtAI023380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 9 Nov 2012 00:59:56 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA90xsiV026538 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 9 Nov 2012 00:59:55 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA90xsGR032074 for ; Thu, 8 Nov 2012 18:59:54 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Nov 2012 16:59:54 -0800 Date: Thu, 8 Nov 2012 16:59:53 -0800 From: Mukesh Rathor To: "Xen-devel@lists.xensource.com" Message-ID: <20121108165953.1d3e27cd@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] PVH update... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Just wanted go give quick PVH update. I refreshed my xen tree, mine was few months old. Lot of changes, so did the merge manually. Still it doesn't work, so debugging right now. Will send alpha patch as soon as I've something working. jfyi... thanks, mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 04:03:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 04:03:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWfo3-0006pH-7B; Fri, 09 Nov 2012 04:02:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWfo1-0006pC-6p for xen-devel@lists.xen.org; Fri, 09 Nov 2012 04:02:57 +0000 Received: from [85.158.143.99:53573] by server-2.bemta-4.messagelabs.com id 9A/40-28922-0708C905; Fri, 09 Nov 2012 04:02:56 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352433772!25852532!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=1.7 required=7.0 tests=BODY_RANDOM_LONG, HTML_20_30, HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9880 invoked from network); 9 Nov 2012 04:02:53 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-7.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 04:02:53 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4215898vcb.32 for ; Thu, 08 Nov 2012 20:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=+HXEMaYIlS5rxaR1GT6PbHjB3RUuH3ACqdJHRtVL1bg=; b=k1qSIhPDxOpT2Vd+U/5KOq+yjolgX8DnEHL2EGKxPBDYQUbYa+wJHvs+d14sLAhNRl 8XkXOGlDn9QoKeCo34w6UG3bnUCpZvGOBJxWmrTdF7I92ZTXI0YEbzxz6lt+z60WW5P2 fOHWGhe2OIoLO2Mah6onljHBd8MotK9U9m+7Nw/1Y6BHoDkG8HBLzMRegFag8U1Z+U6+ BrR8ARWqvua0lVHyGjDB29rDDU42I2Gy4Z1F3x/Arc2DFZKZOrTRJGYpZsexdj+wcgcZ h4DJ8BYzPAZwJ2nrvTJQEDcUg+1nOqziobhP6nOZ29o3btv6vgkbVk6ccqVOxE+PBNJ6 SIGw== MIME-Version: 1.0 Received: by 10.52.70.48 with SMTP id j16mr8136138vdu.1.1352433771657; Thu, 08 Nov 2012 20:02:51 -0800 (PST) Received: by 10.220.37.8 with HTTP; Thu, 8 Nov 2012 20:02:51 -0800 (PST) Date: Thu, 8 Nov 2012 20:02:51 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5534640562881894256==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============5534640562881894256== Content-Type: multipart/alternative; boundary=20cf307f39968aba5704ce08063d --20cf307f39968aba5704ce08063d Content-Type: text/plain; charset=ISO-8859-1 Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. VGA passthrough previously working with 4.1 is no longer working with >4.2. Setup - Working: Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, xend Asus Radeon HD 7870 DirectCU. Works perfect. Benches on par with bare metal. Setup - Broken: Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl toolstack. Asus Radeon HD 7870 DirectCU. Some times the guest boots correctly but display is never enabled. Sometimes BSOD, doesn't seem to be any rhyme or reason? No errors in logs. Found the following in 'xl dmesg': (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = 0x1ac800000, flags = 0 Full 'xl dmesg' output: __ __ _ _ _____ _ _ _ \ \/ /___ _ __ | || | |___ / _ _ _ __ ___| |_ __ _| |__ | | ___ \ // _ \ '_ \ | || |_ |_ \ __| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ / \ __/ | | | |__ _| ___) |__| |_| | | | \__ \ || (_| | |_) | | __/ /_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| (XEN) Xen version 4.3-unstable (root@) (gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3) Wed Nov 7 21:13:35 PST 2012 (XEN) Latest ChangeSet: unavailable (XEN) Bootloader: GRUB 1.99-21ubuntu3.4 (XEN) Command line: xen-pciback=passthrough xen-pciback.hide=(06:00.0)(06.00.1) (XEN) Video information: (XEN) VGA is text mode 80x25, font 8x16 (XEN) VBE/DDC methods: V2; EDID transfer time: 1 seconds (XEN) Disc information: (XEN) Found 6 MBR signatures (XEN) Found 6 EDD information structures (XEN) Xen-e820 RAM map: (XEN) 0000000000000000 - 000000000009e800 (usable) (XEN) 000000000009e800 - 00000000000a0000 (reserved) (XEN) 00000000000e0000 - 0000000000100000 (reserved) (XEN) 0000000000100000 - 00000000bab4f000 (usable) (XEN) 00000000bab4f000 - 00000000baf83000 (reserved) (XEN) 00000000baf83000 - 00000000baf93000 (ACPI data) (XEN) 00000000baf93000 - 00000000bbcfa000 (ACPI NVS) (XEN) 00000000bbcfa000 - 00000000bca4f000 (reserved) (XEN) 00000000bca4f000 - 00000000bca50000 (usable) (XEN) 00000000bca50000 - 00000000bcc56000 (ACPI NVS) (XEN) 00000000bcc56000 - 00000000bd083000 (usable) (XEN) 00000000bd083000 - 00000000bd7f4000 (reserved) (XEN) 00000000bd7f4000 - 00000000bd800000 (usable) (XEN) 00000000f8000000 - 00000000fc000000 (reserved) (XEN) 00000000fec00000 - 00000000fec01000 (reserved) (XEN) 00000000fec10000 - 00000000fec11000 (reserved) (XEN) 00000000fec20000 - 00000000fec21000 (reserved) (XEN) 00000000fed00000 - 00000000fed01000 (reserved) (XEN) 00000000fed61000 - 00000000fed71000 (reserved) (XEN) 00000000fed80000 - 00000000fed90000 (reserved) (XEN) 00000000fef00000 - 0000000100000000 (reserved) (XEN) 0000000100001000 - 000000043f000000 (usable) (XEN) ACPI: RSDP 000F0490, 0024 (r2 ALASKA) (XEN) ACPI: XSDT BAF89070, 005C (r1 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: FACP BAF90BF8, 010C (r5 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI Warning (tbfadt-0232): FADT (revision 5) is longer than ACPI 2.0 version, truncating length 0x10C to 0xF4 [20070126] (XEN) ACPI Warning (tbfadt-0444): Optional field "Pm2ControlBlock" has zero address or length: 0000000000000000/1 [20070126] (XEN) ACPI: DSDT BAF89168, 7A8A (r2 ALASKA A M I 0 INTL 20051117) (XEN) ACPI: FACS BBCF4F80, 0040 (XEN) ACPI: APIC BAF90D08, 009E (r3 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: FPDT BAF90DA8, 0044 (r1 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: MCFG BAF90DF0, 003C (r1 ALASKA A M I 1072009 MSFT 10013) (XEN) ACPI: HPET BAF90E30, 0038 (r1 ALASKA A M I 1072009 AMI 5) (XEN) ACPI: SSDT BAF90FC0, 1714 (r1 AMD POWERNOW 1 AMD 1) (XEN) ACPI: IVRS BAF90EC0, 0100 (r1 AMD RD890S 202031 AMD 0) (XEN) System RAM: 16287MB (16678040kB) (XEN) No NUMA configuration found (XEN) Faking a node at 0000000000000000-000000043f000000 (XEN) Domain heap initialised (XEN) DMI 2.7 present. (XEN) Using APIC driver default (XEN) ACPI: PM-Timer IO Port: 0x808 (XEN) ACPI: ACPI SLEEP INFO: pm1x_cnt[804,0], pm1x_evt[800,0] (XEN) ACPI: 32/64X FACS address mismatch in FADT - bbcf4f80/0000000000000000, using 32 (XEN) ACPI: wakeup_vec[bbcf4f8c], vec_size[20] (XEN) ACPI: Local APIC address 0xfee00000 (XEN) ACPI: LAPIC (acpi_id[0x01] lapic_id[0x10] enabled) (XEN) Processor #16 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x02] lapic_id[0x11] enabled) (XEN) Processor #17 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x03] lapic_id[0x12] enabled) (XEN) Processor #18 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x04] lapic_id[0x13] enabled) (XEN) Processor #19 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x05] lapic_id[0x14] enabled) (XEN) Processor #20 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x06] lapic_id[0x15] enabled) (XEN) Processor #21 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x07] lapic_id[0x16] enabled) (XEN) Processor #22 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x08] lapic_id[0x17] enabled) (XEN) Processor #23 5:1 APIC version 16 (XEN) ACPI: LAPIC_NMI (acpi_id[0xff] high edge lint[0x1]) (XEN) ACPI: IOAPIC (id[0x09] address[0xfec00000] gsi_base[0]) (XEN) IOAPIC[0]: apic_id 9, version 33, address 0xfec00000, GSI 0-23 (XEN) ACPI: IOAPIC (id[0x0a] address[0xfec20000] gsi_base[24]) (XEN) IOAPIC[1]: apic_id 10, version 33, address 0xfec20000, GSI 24-55 (XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) (XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level) (XEN) ACPI: IRQ0 used by override. (XEN) ACPI: IRQ2 used by override. (XEN) ACPI: IRQ9 used by override. (XEN) Enabling APIC mode: Flat. Using 2 I/O APICs (XEN) ACPI: HPET id: 0x43538210 base: 0xfed00000 (XEN) Table is not found! (XEN) Using ACPI (MADT) for SMP configuration information (XEN) SMP: Allowing 8 CPUs (0 hotplug CPUs) (XEN) IRQ limits: 56 GSI, 1496 MSI/MSI-X (XEN) Using scheduler: SMP Credit Scheduler (credit) (XEN) Detected 3913.302 MHz processor. (XEN) Initing memory sharing. (XEN) xstate_init: using cntxt_size: 0x3c0 and states: 0x4000000000000007 (XEN) AMD Fam15h machine check reporting enabled (XEN) PCI: MCFG configuration 0: base e0000000 segment 0000 buses 00 - ff (XEN) PCI: Not using MCFG for segment 0000 bus 00-ff (XEN) AMD-Vi: IOMMU 0 Enabled. (XEN) AMD-Vi: Enabling global vector map (XEN) I/O virtualisation enabled (XEN) - Dom0 mode: Relaxed (XEN) ENABLING IO-APIC IRQs (XEN) -> Using new ACK method (XEN) ..TIMER: vector=0xF0 apic1=0 pin1=2 apic2=-1 pin2=-1 (XEN) Platform timer is 14.318MHz HPET (XEN) Allocated console ring of 64 KiB. (XEN) HVM: ASIDs enabled. (XEN) SVM: Supported advanced features: (XEN) - Nested Page Tables (NPT) (XEN) - Last Branch Record (LBR) Virtualisation (XEN) - Next-RIP Saved on #VMEXIT (XEN) - VMCB Clean Bits (XEN) - DecodeAssists (XEN) - Pause-Intercept Filter (XEN) - TSC Rate MSR (XEN) HVM: SVM enabled (XEN) HVM: Hardware Assisted Paging (HAP) detected (XEN) HVM: HAP page sizes: 4kB, 2MB, 1GB (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) Brought up 8 CPUs (XEN) ACPI sleep modes: S3 (XEN) MCA: Use hw thresholding to adjust polling frequency (XEN) mcheck_poll: Machine check polling timer started. (XEN) mtrr: your CPUs had inconsistent fixed MTRR settings (XEN) mtrr: probably your BIOS does not setup all CPUs. (XEN) mtrr: corrected configuration. (XEN) *** LOADING DOMAIN 0 *** (XEN) elf_parse_binary: phdr: paddr=0x1000000 memsz=0xad4000 (XEN) elf_parse_binary: phdr: paddr=0x1c00000 memsz=0xe50e0 (XEN) elf_parse_binary: phdr: paddr=0x1ce6000 memsz=0x144c0 (XEN) elf_parse_binary: phdr: paddr=0x1cfb000 memsz=0x365000 (XEN) elf_parse_binary: memory: 0x1000000 -> 0x2060000 (XEN) elf_xen_parse_note: GUEST_OS = "linux" (XEN) elf_xen_parse_note: GUEST_VERSION = "2.6" (XEN) elf_xen_parse_note: XEN_VERSION = "xen-3.0" (XEN) elf_xen_parse_note: VIRT_BASE = 0xffffffff80000000 (XEN) elf_xen_parse_note: ENTRY = 0xffffffff81cfb200 (XEN) elf_xen_parse_note: HYPERCALL_PAGE = 0xffffffff81001000 (XEN) elf_xen_parse_note: FEATURES = "!writable_page_tables|pae_pgdir_above_4gb" (XEN) elf_xen_parse_note: PAE_MODE = "yes" (XEN) elf_xen_parse_note: LOADER = "generic" (XEN) elf_xen_parse_note: unknown xen elf note (0xd) (XEN) elf_xen_parse_note: SUSPEND_CANCEL = 0x1 (XEN) elf_xen_parse_note: HV_START_LOW = 0xffff800000000000 (XEN) elf_xen_parse_note: PADDR_OFFSET = 0x0 (XEN) elf_xen_addr_calc_check: addresses: (XEN) virt_base = 0xffffffff80000000 (XEN) elf_paddr_offset = 0x0 (XEN) virt_offset = 0xffffffff80000000 (XEN) virt_kstart = 0xffffffff81000000 (XEN) virt_kend = 0xffffffff82060000 (XEN) virt_entry = 0xffffffff81cfb200 (XEN) p2m_base = 0xffffffffffffffff (XEN) Xen kernel: 64-bit, lsb, compat32 (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x2060000 (XEN) PHYSICAL MEMORY ARRANGEMENT: (XEN) Dom0 alloc.: 0000000420000000->0000000428000000 (4038356 pages to be allocated) (XEN) Init. ramdisk: 000000043c7e4000->000000043efff600 (XEN) VIRTUAL MEMORY ARRANGEMENT: (XEN) Loaded kernel: ffffffff81000000->ffffffff82060000 (XEN) Init. ramdisk: ffffffff82060000->ffffffff8487b600 (XEN) Phys-Mach map: ffffffff8487c000->ffffffff8679f780 (XEN) Start info: ffffffff867a0000->ffffffff867a04b4 (XEN) Page tables: ffffffff867a1000->ffffffff867da000 (XEN) Boot stack: ffffffff867da000->ffffffff867db000 (XEN) TOTAL: ffffffff80000000->ffffffff86c00000 (XEN) ENTRY ADDRESS: ffffffff81cfb200 (XEN) Dom0 has maximum 8 VCPUs (XEN) elf_load_binary: phdr 0 at 0xffffffff81000000 -> 0xffffffff81ad4000 (XEN) elf_load_binary: phdr 1 at 0xffffffff81c00000 -> 0xffffffff81ce50e0 (XEN) elf_load_binary: phdr 2 at 0xffffffff81ce6000 -> 0xffffffff81cfa4c0 (XEN) elf_load_binary: phdr 3 at 0xffffffff81cfb000 -> 0xffffffff81dd4000 (XEN) Scrubbing Free RAM: .done. (XEN) Initial low memory virq threshold set at 0x4000 pages. (XEN) Std. Loglevel: All (XEN) Guest Loglevel: All (XEN) Xen is relinquishing VGA console. (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to Xen) (XEN) Freed 244kB init memory. (XEN) traps.c:2486:d0 Domain attempted WRMSR 00000000c0010201 from 0x0000000000000000 to 0x000000000000abcd. (XEN) PCI add device 0000:00:00.0 (XEN) PCI add device 0000:00:00.2 (XEN) PCI add device 0000:00:02.0 (XEN) PCI add device 0000:00:04.0 (XEN) PCI add device 0000:00:05.0 (XEN) PCI add device 0000:00:09.0 (XEN) PCI add device 0000:00:0a.0 (XEN) PCI add device 0000:00:0b.0 (XEN) PCI add device 0000:00:0d.0 (XEN) PCI add device 0000:00:11.0 (XEN) PCI add device 0000:00:12.0 (XEN) PCI add device 0000:00:12.2 (XEN) PCI add device 0000:00:13.0 (XEN) PCI add device 0000:00:13.2 (XEN) PCI add device 0000:00:14.0 (XEN) PCI add device 0000:00:14.2 (XEN) PCI add device 0000:00:14.3 (XEN) PCI add device 0000:00:14.4 (XEN) PCI add device 0000:00:14.5 (XEN) PCI add device 0000:00:15.0 (XEN) PCI add device 0000:00:15.1 (XEN) PCI add device 0000:00:15.2 (XEN) PCI add device 0000:00:15.3 (XEN) PCI add device 0000:00:16.0 (XEN) PCI add device 0000:00:16.2 (XEN) PCI add device 0000:00:18.0 (XEN) PCI add device 0000:00:18.1 (XEN) PCI add device 0000:00:18.2 (XEN) PCI add device 0000:00:18.3 (XEN) PCI add device 0000:00:18.4 (XEN) PCI add device 0000:00:18.5 (XEN) PCI add device 0000:01:00.0 (XEN) PCI add device 0000:01:00.1 (XEN) PCI add device 0000:02:00.0 (XEN) PCI add device 0000:03:00.0 (XEN) PCI add device 0000:04:00.0 (XEN) PCI add device 0000:06:00.0 (XEN) PCI add device 0000:06:00.1 (XEN) PCI add device 0000:0a:00.0 (XEN) PCI add device 0000:0b:00.0 (XEN) PCI add device 0000:0c:00.0 (XEN) memory.c:131:d0 Could not allocate order=18 extent: id=1 memflags=0 (0 of 1) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (3 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (1 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=0 extent: id=1 memflags=0 (582 of 2048) (XEN) memory.c:131:d0 Could not allocate order=18 extent: id=2 memflags=0 (0 of 1) (XEN) HVM2: HVM Loader (XEN) HVM2: Detected Xen v4.3-unstable (XEN) HVM2: Xenbus rings @0xfeffc000, event channel 8 (XEN) HVM2: System requested ROMBIOS (XEN) HVM2: CPU speed is 3913 MHz (XEN) irq.c:270: Dom2 PCI link 0 changed 0 -> 5 (XEN) HVM2: PCI-ISA link 0 routed to IRQ5 (XEN) irq.c:270: Dom2 PCI link 1 changed 0 -> 10 (XEN) HVM2: PCI-ISA link 1 routed to IRQ10 (XEN) irq.c:270: Dom2 PCI link 2 changed 0 -> 11 (XEN) HVM2: PCI-ISA link 2 routed to IRQ11 (XEN) irq.c:270: Dom2 PCI link 3 changed 0 -> 5 (XEN) HVM2: PCI-ISA link 3 routed to IRQ5 (XEN) HVM2: pci dev 01:3 INTA->IRQ10 (XEN) HVM2: pci dev 03:0 INTA->IRQ5 (XEN) HVM2: pci dev 04:0 INTA->IRQ5 (XEN) HVM2: pci dev 05:0 INTA->IRQ10 (XEN) HVM2: pci dev 06:0 INTB->IRQ5 (XEN) HVM2: pci dev 05:0 bar 10 size lx: 10000000 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) HVM2: pci dev 02:0 bar 10 size lx: 02000000 (XEN) HVM2: pci dev 03:0 bar 14 size lx: 01000000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) HVM2: pci dev 05:0 bar 18 size lx: 00040000 (XEN) HVM2: pci dev 05:0 bar 30 size lx: 00020000 (XEN) HVM2: pci dev 06:0 bar 10 size lx: 00004000 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) HVM2: pci dev 02:0 bar 14 size lx: 00001000 (XEN) HVM2: pci dev 03:0 bar 10 size lx: 00000100 (XEN) HVM2: pci dev 04:0 bar 10 size lx: 00000100 (XEN) HVM2: pci dev 04:0 bar 14 size lx: 00000100 (XEN) HVM2: pci dev 05:0 bar 20 size lx: 00000100 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) HVM2: pci dev 01:1 bar 20 size lx: 00000010 (XEN) HVM2: Multiprocessor initialisation: (XEN) HVM2: - CPU0 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU1 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU2 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU3 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU4 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU5 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: Testing HVM environment: (XEN) HVM2: - REP INSB across page boundaries ... passed (XEN) HVM2: - GS base MSRs and SWAPGS ... passed (XEN) HVM2: Passed 2 of 2 tests (XEN) HVM2: Writing SMBIOS tables ... (XEN) HVM2: Loading ROMBIOS ... (XEN) HVM2: 12636 bytes of ROMBIOS high-memory extensions: (XEN) HVM2: Relocating to 0xfc001000-0xfc00415c ... done (XEN) HVM2: Creating MP tables ... (XEN) HVM2: Loading Cirrus VGABIOS ... (XEN) HVM2: Loading PCI Option ROM ... (XEN) HVM2: - Manufacturer: http://ipxe.org (XEN) HVM2: - Product name: iPXE (XEN) HVM2: Option ROMs: (XEN) HVM2: c0000-c8fff: VGA BIOS (XEN) HVM2: c9000-d8fff: Etherboot ROM (XEN) HVM2: Loading ACPI ... (XEN) HVM2: vm86 TSS at fc010280 (XEN) HVM2: BIOS map: (XEN) HVM2: f0000-fffff: Main BIOS (XEN) HVM2: E820 table: (XEN) HVM2: [00]: 00000000:00000000 - 00000000:0009e000: RAM (XEN) HVM2: [01]: 00000000:0009e000 - 00000000:000a0000: RESERVED (XEN) HVM2: HOLE: 00000000:000a0000 - 00000000:000e0000 (XEN) HVM2: [02]: 00000000:000e0000 - 00000000:00100000: RESERVED (XEN) HVM2: [03]: 00000000:00100000 - 00000000:e0000000: RAM (XEN) HVM2: HOLE: 00000000:e0000000 - 00000000:fc000000 (XEN) HVM2: [04]: 00000000:fc000000 - 00000001:00000000: RESERVED (XEN) HVM2: [05]: 00000001:00000000 - 00000002:19800000: RAM (XEN) HVM2: Invoking ROMBIOS ... (XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $ (XEN) stdvga.c:147:d2 entering stdvga and caching modes (XEN) HVM2: VGABios $Id: vgabios.c,v 1.67 2008/01/27 09:44:12 vruppert Exp $ (XEN) HVM2: Bochs BIOS - build: 06/23/99 (XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $ (XEN) HVM2: Options: apmbios pcibios eltorito PMM (XEN) HVM2: (XEN) HVM2: ata0-0: PCHS=16383/16/63 translation=lba LCHS=1024/255/63 (XEN) HVM2: ata0 master: QEMU HARDDISK ATA-7 Hard-Disk ( 115 GBytes) (XEN) HVM2: IDE time out (XEN) HVM2: (XEN) HVM2: (XEN) HVM2: (XEN) HVM2: Press F12 for boot menu. (XEN) HVM2: (XEN) HVM2: Booting from Hard Disk... (XEN) HVM2: Booting from 0000:7c00 (XEN) stdvga.c:151:d2 leaving stdvga (XEN) irq.c:270: Dom2 PCI link 0 changed 5 -> 0 (XEN) irq.c:270: Dom2 PCI link 1 changed 10 -> 0 (XEN) irq.c:270: Dom2 PCI link 2 changed 11 -> 0 (XEN) irq.c:270: Dom2 PCI link 3 changed 5 -> 0 (XEN) memory_map:remove: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:remove: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:remove: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:remove: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) grant_table.c:1266:d2 Expanding dom (2) grant table from (4) to (32) frames. (XEN) irq.c:375: Dom2 callback via changed to GSI 28 (XEN) memory_map:remove: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:remove: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:remove: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:remove: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = 0x1ac800000, flags = 0 I've noticed this has already flown around the mailing list but I've only recently subscribed and haven't seen a reply on previous posts about this issue. I apologise if I'm posting this erroneously. -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --20cf307f39968aba5704ce08063d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested against all three.=

VGA passthrough previously working with 4.1 is no longe= r working with >4.2.

Setup - Working:
Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, = xend
Asus Radeon HD 7870 DirectCU.
Works perfect. =A0Be= nches on par with bare metal.

Setup - Broken:
Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), = xl toolstack.
Asus Radeon HD 7870 DirectCU.
= Some times the guest boots correctly but display is never enabled. =A0Somet= imes BSOD, doesn't seem to be any rhyme or reason?

No errors in logs. =A0 Found the following in 'xl d= mesg':
(XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id = =3D 0x600, fault address =3D 0x1ac800000, flags =3D 0



Full 'xl dmesg&#= 39; output:

=A0__ =A0__ =A0 =A0 =A0 =A0 =A0 =A0_ = =A0_ =A0 =A0_____ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0_ =A0 =A0 =A0 =A0_= =A0 =A0 _ =A0 =A0 =A0
=A0\ \/ /___ _ __ =A0 | || | =A0|___ / =A0= =A0_ =A0 _ _ __ =A0___| |_ __ _| |__ | | ___=A0
=A0 \ =A0// _ \ '_ \ =A0| || |_ =A0 |_ \ __| | | | '_ \/ __| _= _/ _` | '_ \| |/ _ \
=A0 / =A0\ =A0__/ | | | |__ =A0 _| ___) = |__| |_| | | | \__ \ || (_| | |_) | | =A0__/
=A0/_/\_\___|_| |_| = =A0 =A0|_|(_)____/ =A0 =A0\__,_|_| |_|___/\__\__,_|_.__/|_|\___|
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0=A0
(XEN) Xen version 4.3-unstable (root@) (gcc (Ubuntu/Linar= o 4.6.3-1ubuntu5) 4.6.3) Wed Nov =A07 21:13:35 PST 2012
(XEN) Lat= est ChangeSet: unavailable
(XEN) Bootloader: GRUB 1.99-21ubuntu3.4
(XEN) Command line: = xen-pciback=3Dpassthrough xen-pciback.hide=3D(06:00.0)(06.00.1)
(= XEN) Video information:
(XEN) =A0VGA is text mode 80x25, font 8x1= 6
(XEN) =A0VBE/DDC methods: V2; EDID transfer time: 1 seconds
= (XEN) Disc information:
(XEN) =A0Found 6 MBR signatures
(XEN) =A0Found 6 EDD information structures
(XEN) Xen-e820 RAM m= ap:
(XEN) =A00000000000000000 - 000000000009e800 (usable)
(XEN) = =A0000000000009e800 - 00000000000a0000 (reserved)
(XEN) =A0000000= 00000e0000 - 0000000000100000 (reserved)
(XEN) =A0000000000010000= 0 - 00000000bab4f000 (usable)
(XEN) =A000000000bab4f000 - 00000000baf83000 (reserved)
(XEN= ) =A000000000baf83000 - 00000000baf93000 (ACPI data)
(XEN) =A0000= 00000baf93000 - 00000000bbcfa000 (ACPI NVS)
(XEN) =A000000000bbcf= a000 - 00000000bca4f000 (reserved)
(XEN) =A000000000bca4f000 - 00000000bca50000 (usable)
(XEN) = =A000000000bca50000 - 00000000bcc56000 (ACPI NVS)
(XEN) =A0000000= 00bcc56000 - 00000000bd083000 (usable)
(XEN) =A000000000bd083000 = - 00000000bd7f4000 (reserved)
(XEN) =A000000000bd7f4000 - 00000000bd800000 (usable)
(XEN) = =A000000000f8000000 - 00000000fc000000 (reserved)
(XEN) =A0000000= 00fec00000 - 00000000fec01000 (reserved)
(XEN) =A000000000fec1000= 0 - 00000000fec11000 (reserved)
(XEN) =A000000000fec20000 - 00000000fec21000 (reserved)
(XEN= ) =A000000000fed00000 - 00000000fed01000 (reserved)
(XEN) =A00000= 0000fed61000 - 00000000fed71000 (reserved)
(XEN) =A000000000fed80= 000 - 00000000fed90000 (reserved)
(XEN) =A000000000fef00000 - 0000000100000000 (reserved)
(XEN= ) =A00000000100001000 - 000000043f000000 (usable)
(XEN) ACPI: RSD= P 000F0490, 0024 (r2 ALASKA)
(XEN) ACPI: XSDT BAF89070, 005C (r1 = ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 10013)
(XEN) ACPI: FACP BAF90BF8, 010C (r5 ALASKA =A0 =A0A M I =A01072009 AMI= =A0 =A0 10013)
(XEN) ACPI Warning (tbfadt-0232): FADT (revision = 5) is longer than ACPI 2.0 version, truncating length 0x10C to 0xF4 [200701= 26]
(XEN) ACPI Warning (tbfadt-0444): Optional field "Pm2ControlBlock= " has zero address or length: 0000000000000000/1 [20070126]
= (XEN) ACPI: DSDT BAF89168, 7A8A (r2 ALASKA =A0 =A0A M I =A0 =A0 =A0 =A00 IN= TL 20051117)
(XEN) ACPI: FACS BBCF4F80, 0040
(XEN) ACPI: APIC BAF90D08, 0= 09E (r3 ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 10013)
(XEN) A= CPI: FPDT BAF90DA8, 0044 (r1 ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 100= 13)
(XEN) ACPI: MCFG BAF90DF0, 003C (r1 ALASKA =A0 =A0A M I =A010= 72009 MSFT =A0 =A010013)
(XEN) ACPI: HPET BAF90E30, 0038 (r1 ALASKA =A0 =A0A M I =A01072009 AMI= =A0 =A0 =A0 =A0 5)
(XEN) ACPI: SSDT BAF90FC0, 1714 (r1 AMD =A0 = =A0POWERNOW =A0 =A0 =A0 =A01 AMD =A0 =A0 =A0 =A0 1)
(XEN) ACPI: I= VRS BAF90EC0, 0100 (r1 =A0AMD =A0 =A0 RD890S =A0 202031 AMD =A0 =A0 =A0 =A0= 0)
(XEN) System RAM: 16287MB (16678040kB)
(XEN) No NUMA configu= ration found
(XEN) Faking a node at 0000000000000000-000000043f00= 0000
(XEN) Domain heap initialised
(XEN) DMI 2.7 presen= t.
(XEN) Using APIC driver default
(XEN) ACPI: PM-Timer IO Port= : 0x808
(XEN) ACPI: ACPI SLEEP INFO: pm1x_cnt[804,0], pm1x_evt[80= 0,0]
(XEN) ACPI: 32/64X FACS address mismatch in FADT - bbcf4f80/= 0000000000000000, using 32
(XEN) ACPI: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0wakeup_vec[bbcf4f8c], v= ec_size[20]
(XEN) ACPI: Local APIC address 0xfee00000
(= XEN) ACPI: LAPIC (acpi_id[0x01] lapic_id[0x10] enabled)
(XEN) Pro= cessor #16 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0x02] lapic_id[0x11] enabled)
(XE= N) Processor #17 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x03] lapic_id[0x12] enabled)
(XEN) Processor #18 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x04] lapic_id[0x13] enabled)
(XE= N) Processor #19 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x05] lapic_id[0x14] enabled)
(XEN) Processor #20 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x06] lapic_id[0x15] enabled)
(XE= N) Processor #21 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x07] lapic_id[0x16] enabled)
(XEN) Processor #22 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x08] lapic_id[0x17] enabled)
(XE= N) Processor #23 5:1 APIC version 16
(XEN) ACPI: LAPIC_NMI (acpi_= id[0xff] high edge lint[0x1])
(XEN) ACPI: IOAPIC (id[0x09] addres= s[0xfec00000] gsi_base[0])
(XEN) IOAPIC[0]: apic_id 9, version 33, address 0xfec00000, GSI 0-23
(XEN) ACPI: IOAPIC (id[0x0a] address[0xfec20000] gsi_base[24])
(XEN) IOAPIC[1]: apic_id 10, version 33, address 0xfec20000, GSI 24-= 55
(XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
(XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level)
(XEN) ACPI: IRQ0 used by override.
(XEN) ACPI: IRQ2 used by ov= erride.
(XEN) ACPI: IRQ9 used by override.
(XEN) Enabling APIC mode:= =A0Flat. =A0Using 2 I/O APICs
(XEN) ACPI: HPET id: 0x43538210 ba= se: 0xfed00000
(XEN) Table is not found!
(XEN) Using AC= PI (MADT) for SMP configuration information
(XEN) SMP: Allowing 8 CPUs (0 hotplug CPUs)
(XEN) IRQ limits= : 56 GSI, 1496 MSI/MSI-X
(XEN) Using scheduler: SMP Credit Schedu= ler (credit)
(XEN) Detected 3913.302 MHz processor.
(XEN) Initing memory sharing.
(XEN) xstate_init: using cntxt_size= : 0x3c0 and states: 0x4000000000000007
(XEN) AMD Fam15h machine c= heck reporting enabled
(XEN) PCI: MCFG configuration 0: base e000= 0000 segment 0000 buses 00 - ff
(XEN) PCI: Not using MCFG for segment 0000 bus 00-ff
(XEN) A= MD-Vi: IOMMU 0 Enabled.
(XEN) AMD-Vi: Enabling global vector map<= /div>
(XEN) I/O virtualisation enabled
(XEN) =A0- Dom0 mode: = Relaxed
(XEN) ENABLING IO-APIC IRQs
(XEN) =A0-> Using new ACK met= hod
(XEN) ..TIMER: vector=3D0xF0 apic1=3D0 pin1=3D2 apic2=3D-1 pi= n2=3D-1
(XEN) Platform timer is 14.318MHz HPET
(XEN) Al= located console ring of 64 KiB.
(XEN) HVM: ASIDs enabled.
(XEN) SVM: Supported advanced feat= ures:
(XEN) =A0- Nested Page Tables (NPT)
(XEN) =A0- La= st Branch Record (LBR) Virtualisation
(XEN) =A0- Next-RIP Saved o= n #VMEXIT
(XEN) =A0- VMCB Clean Bits
(XEN) =A0- DecodeAssists
(XEN) =A0- Pause-Intercept Filter
(XEN) =A0- TSC Rate MSR
=
(XEN) HVM: SVM enabled
(XEN) HVM: Hardware Assisted Paging (= HAP) detected
(XEN) HVM: HAP page sizes: 4kB, 2MB, 1GB
(XEN) microcode: co= llect_cpu_info: patch_id=3D0x6000629
(XEN) microcode: collect_cpu= _info: patch_id=3D0x6000629
(XEN) microcode: collect_cpu_info: pa= tch_id=3D0x6000629
(XEN) microcode: collect_cpu_info: patch_id=3D0x6000629
(XEN= ) microcode: collect_cpu_info: patch_id=3D0x6000629
(XEN) microco= de: collect_cpu_info: patch_id=3D0x6000629
(XEN) microcode: colle= ct_cpu_info: patch_id=3D0x6000629
(XEN) Brought up 8 CPUs
(XEN) ACPI sleep modes: S3
(XEN) MCA: Use hw thresholding to adjust polling frequency
(XEN)= mcheck_poll: Machine check polling timer started.
(XEN) mtrr: yo= ur CPUs had inconsistent fixed MTRR settings
(XEN) mtrr: probably your BIOS does not setup all CPUs.
(XEN= ) mtrr: corrected configuration.
(XEN) *** LOADING DOMAIN 0 ***
(XEN) elf_parse_binary: phdr: paddr=3D0x1000000 memsz=3D0xad4000
(XEN) elf_parse_binary: phdr: paddr=3D0x1c00000 memsz=3D0xe50e0
<= div>(XEN) elf_parse_binary: phdr: paddr=3D0x1ce6000 memsz=3D0x144c0
(XEN) elf_parse_binary: phdr: paddr=3D0x1cfb000 memsz=3D0x365000
(XEN) elf_parse_binary: memory: 0x1000000 -> 0x2060000
(XEN) elf_xen_parse_note: GUEST_OS =3D "linux"
(XE= N) elf_xen_parse_note: GUEST_VERSION =3D "2.6"
(XEN) el= f_xen_parse_note: XEN_VERSION =3D "xen-3.0"
(XEN) elf_x= en_parse_note: VIRT_BASE =3D 0xffffffff80000000
(XEN) elf_xen_parse_note: ENTRY =3D 0xffffffff81cfb200
(XEN)= elf_xen_parse_note: HYPERCALL_PAGE =3D 0xffffffff81001000
(XEN) = elf_xen_parse_note: FEATURES =3D "!writable_page_tables|pae_pgdir_abov= e_4gb"
(XEN) elf_xen_parse_note: PAE_MODE =3D "yes"
(XEN)= elf_xen_parse_note: LOADER =3D "generic"
(XEN) elf_xen= _parse_note: unknown xen elf note (0xd)
(XEN) elf_xen_parse_note:= SUSPEND_CANCEL =3D 0x1
(XEN) elf_xen_parse_note: HV_START_LOW =3D 0xffff800000000000
(XEN) elf_xen_parse_note: PADDR_OFFSET =3D 0x0
(XEN) elf_xen_ad= dr_calc_check: addresses:
(XEN) =A0 =A0 virt_base =A0 =A0 =A0 =A0= =3D 0xffffffff80000000
(XEN) =A0 =A0 elf_paddr_offset =3D 0x0
(XEN) =A0 =A0 virt_of= fset =A0 =A0 =A0=3D 0xffffffff80000000
(XEN) =A0 =A0 virt_kstart = =A0 =A0 =A0=3D 0xffffffff81000000
(XEN) =A0 =A0 virt_kend =A0 =A0= =A0 =A0=3D 0xffffffff82060000
(XEN) =A0 =A0 virt_entry =A0 =A0 =A0 =3D 0xffffffff81cfb200
(XEN)= =A0 =A0 p2m_base =A0 =A0 =A0 =A0 =3D 0xffffffffffffffff
(XEN) = =A0Xen =A0kernel: 64-bit, lsb, compat32
(XEN) =A0Dom0 kernel: 64-= bit, PAE, lsb, paddr 0x1000000 -> 0x2060000
(XEN) PHYSICAL MEMORY ARRANGEMENT:
(XEN) =A0Dom0 alloc.: =A0= 0000000420000000->0000000428000000 (4038356 pages to be allocated)
(XEN) =A0Init. ramdisk: 000000043c7e4000->000000043efff600
(XEN) VIRTUAL MEMORY ARRANGEMENT:
(XEN) =A0Loaded kernel: fffffff= f81000000->ffffffff82060000
(XEN) =A0Init. ramdisk: ffffffff82= 060000->ffffffff8487b600
(XEN) =A0Phys-Mach map: ffffffff8487c= 000->ffffffff8679f780
(XEN) =A0Start info: =A0 =A0ffffffff867a0000->ffffffff867a04b4
(XEN) =A0Page tables: =A0 ffffffff867a1000->ffffffff867da000
=
(XEN) =A0Boot stack: =A0 =A0ffffffff867da000->ffffffff867db000
(XEN) =A0TOTAL: =A0 =A0 =A0 =A0 ffffffff80000000->ffffffff86c00000=
(XEN) =A0ENTRY ADDRESS: ffffffff81cfb200
(XEN) Dom0 has maxi= mum 8 VCPUs
(XEN) elf_load_binary: phdr 0 at 0xffffffff81000000 -= > 0xffffffff81ad4000
(XEN) elf_load_binary: phdr 1 at 0xffffff= ff81c00000 -> 0xffffffff81ce50e0
(XEN) elf_load_binary: phdr 2 at 0xffffffff81ce6000 -> 0xffffffff81= cfa4c0
(XEN) elf_load_binary: phdr 3 at 0xffffffff81cfb000 -> = 0xffffffff81dd4000
(XEN) Scrubbing Free RAM: .done.
(XEN) Initial low memory virq threshold set at 0x4000 pages.
(XEN= ) Std. Loglevel: All
(XEN) Guest Loglevel: All
(XEN) Xe= n is relinquishing VGA console.
(XEN) *** Serial input -> DOM0= (type 'CTRL-a' three times to switch input to Xen)
(XEN) Freed 244kB init memory.
(XEN) traps.c:2486:d0 Domain = attempted WRMSR 00000000c0010201 from 0x0000000000000000 to 0x000000000000a= bcd.
(XEN) PCI add device 0000:00:00.0
(XEN) PCI add de= vice 0000:00:00.2
(XEN) PCI add device 0000:00:02.0
(XEN) PCI add device 0000:= 00:04.0
(XEN) PCI add device 0000:00:05.0
(XEN) PCI add= device 0000:00:09.0
(XEN) PCI add device 0000:00:0a.0
(XEN) PCI add device 0000:00:0b.0
(XEN) PCI add device 0000:00:0d= .0
(XEN) PCI add device 0000:00:11.0
(XEN) PCI add devi= ce 0000:00:12.0
(XEN) PCI add device 0000:00:12.2
(XEN)= PCI add device 0000:00:13.0
(XEN) PCI add device 0000:00:13.2
(XEN) PCI add device 0000:= 00:14.0
(XEN) PCI add device 0000:00:14.2
(XEN) PCI add= device 0000:00:14.3
(XEN) PCI add device 0000:00:14.4
(XEN) PCI add device 0000:00:14.5
(XEN) PCI add device 0000:00:15= .0
(XEN) PCI add device 0000:00:15.1
(XEN) PCI add devi= ce 0000:00:15.2
(XEN) PCI add device 0000:00:15.3
(XEN)= PCI add device 0000:00:16.0
(XEN) PCI add device 0000:00:16.2
(XEN) PCI add device 0000:= 00:18.0
(XEN) PCI add device 0000:00:18.1
(XEN) PCI add= device 0000:00:18.2
(XEN) PCI add device 0000:00:18.3
(XEN) PCI add device 0000:00:18.4
(XEN) PCI add device 0000:00:18= .5
(XEN) PCI add device 0000:01:00.0
(XEN) PCI add devi= ce 0000:01:00.1
(XEN) PCI add device 0000:02:00.0
(XEN)= PCI add device 0000:03:00.0
(XEN) PCI add device 0000:04:00.0
(XEN) PCI add device 0000:= 06:00.0
(XEN) PCI add device 0000:06:00.1
(XEN) PCI add= device 0000:0a:00.0
(XEN) PCI add device 0000:0b:00.0
(XEN) PCI add device 0000:0c:00.0
(XEN) memory.c:131:d0 Could not= allocate order=3D18 extent: id=3D1 memflags=3D0 (0 of 1)
(XEN) m= emory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memflags=3D0 (3 = of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (1 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D0 extent: id=3D1 memflags=3D0 (582 of 2048)
(XEN) memory.c:131= :d0 Could not allocate order=3D18 extent: id=3D2 memflags=3D0 (0 of 1)
(XEN) HVM2: HVM Loader
(XEN) HVM2: Detected Xen v4.3-unstabl= e
(XEN) HVM2: Xenbus rings @0xfeffc000, event channel 8
(XEN) HVM2: System requested ROMBIOS
(XEN) HVM2: CPU speed is 39= 13 MHz
(XEN) irq.c:270: Dom2 PCI link 0 changed 0 -> 5
(XEN) HVM= 2: PCI-ISA link 0 routed to IRQ5
(XEN) irq.c:270: Dom2 PCI link 1= changed 0 -> 10
(XEN) HVM2: PCI-ISA link 1 routed to IRQ10
(XEN) irq.c:270: Dom2 PCI link 2 changed 0 -> 11
(XEN) HV= M2: PCI-ISA link 2 routed to IRQ11
(XEN) irq.c:270: Dom2 PCI link= 3 changed 0 -> 5
(XEN) HVM2: PCI-ISA link 3 routed to IRQ5
(XEN) HVM2: pci dev 01:3 INTA->IRQ10
(XEN) HVM2: pci dev = 03:0 INTA->IRQ5
(XEN) HVM2: pci dev 04:0 INTA->IRQ5
(XEN) HVM2: pci dev 05:0 INTA->IRQ10
(XEN) HVM2: pci dev 06= :0 INTB->IRQ5
(XEN) HVM2: pci dev 05:0 bar 10 size lx: 10000000
(XEN) memo= ry_map:add: dom2 gfn=3De0000 mfn=3Dc0000 nr=3D10000
(XEN) HVM2: p= ci dev 02:0 bar 10 size lx: 02000000
(XEN) HVM2: pci dev 03:0 bar= 14 size lx: 01000000
(XEN) memory_map:add: dom2 gfn=3Df3000 mfn=3Dfe300 nr=3D40
(= XEN) HVM2: pci dev 05:0 bar 18 size lx: 00040000
(XEN) HVM2: pci = dev 05:0 bar 30 size lx: 00020000
(XEN) HVM2: pci dev 06:0 bar 10= size lx: 00004000
(XEN) memory_map:add: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(X= EN) HVM2: pci dev 02:0 bar 14 size lx: 00001000
(XEN) HVM2: pci d= ev 03:0 bar 10 size lx: 00000100
(XEN) HVM2: pci dev 04:0 bar 10 = size lx: 00000100
(XEN) HVM2: pci dev 04:0 bar 14 size lx: 00000100
(XEN) HVM2= : pci dev 05:0 bar 20 size lx: 00000100
(XEN) ioport_map:add: dom= 2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) HVM2: pci dev 01:1 bar= 20 size lx: 00000010
(XEN) HVM2: Multiprocessor initialisation:
(XEN) HVM2: =A0- = CPU0 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU1 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8]= ... done.
(XEN) HVM2: =A0- CPU2 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3= /8] ... done.
(XEN) HVM2: =A0- CPU3 ... 48-bit phys ... fixed MTR= Rs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU4 ... 48-bit= phys ... fixed MTRRs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU5 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3= /8] ... done.
(XEN) HVM2: Testing HVM environment:
(XEN= ) HVM2: =A0- REP INSB across page boundaries ... passed
(XEN) HVM= 2: =A0- GS base MSRs and SWAPGS ... passed
(XEN) HVM2: Passed 2 of 2 tests
(XEN) HVM2: Writing SMBIOS t= ables ...
(XEN) HVM2: Loading ROMBIOS ...
(XEN) HVM2: 1= 2636 bytes of ROMBIOS high-memory extensions:
(XEN) HVM2: =A0 Rel= ocating to 0xfc001000-0xfc00415c ... done
(XEN) HVM2: Creating MP tables ...
(XEN) HVM2: Loading Cirru= s VGABIOS ...
(XEN) HVM2: Loading PCI Option ROM ...
(X= EN) HVM2: =A0- Manufacturer: http://ipxe.org
(XEN) HVM2: =A0- Product name: iPXE
(XEN) HVM2: Option ROMs:=
(XEN) HVM2: =A0c0000-c8fff: VGA BIOS
(XEN) HVM2: =A0c9= 000-d8fff: Etherboot ROM
(XEN) HVM2: Loading ACPI ...
(= XEN) HVM2: vm86 TSS at fc010280
(XEN) HVM2: BIOS map:
(XEN) HVM2: =A0f0000-fffff: Main BIOS<= /div>
(XEN) HVM2: E820 table:
(XEN) HVM2: =A0[00]: 00000000:0= 0000000 - 00000000:0009e000: RAM
(XEN) HVM2: =A0[01]: 00000000:00= 09e000 - 00000000:000a0000: RESERVED
(XEN) HVM2: =A0HOLE: 00000000:000a0000 - 00000000:000e0000
(= XEN) HVM2: =A0[02]: 00000000:000e0000 - 00000000:00100000: RESERVED
(XEN) HVM2: =A0[03]: 00000000:00100000 - 00000000:e0000000: RAM
(XEN) HVM2: =A0HOLE: 00000000:e0000000 - 00000000:fc000000
(XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $
= (XEN) stdvga.c:147:d2 entering stdvga and caching modes
(XEN) HVM= 2: VGABios $Id: vgabios.c,v 1.67 2008/01/27 09:44:12 vruppert Exp $
(XEN) HVM2: Bochs BIOS - build: 06/23/99
(XEN) HVM2: $Revisi= on: 1.221 $ $Date: 2008/12/07 17:32:29 $
(XEN) HVM2: Options: apm= bios pcibios eltorito PMM=A0
(XEN) HVM2:=A0
(XEN) HVM2:= ata0-0: PCHS=3D16383/16/63 translation=3Dlba LCHS=3D1024/255/63
(XEN) HVM2: ata0 master: QEMU HARDDISK ATA-7 Hard-Disk ( 115 GBytes)
(XEN) HVM2: IDE time out
(XEN) HVM2:=A0
(XEN) = HVM2:=A0
(XEN) HVM2:=A0
(XEN) HVM2: Press F12 for boot = menu.
(XEN) HVM2:=A0
(XEN) HVM2: Booting from Hard Disk...
(XEN) HVM2: Booting from 0000:7c00
(XEN) stdvga.c:151:d2 leavi= ng stdvga
(XEN) irq.c:270: Dom2 PCI link 0 changed 5 -> 0
(XEN) irq.c:270: Dom2 PCI link 1 changed 10 -> 0
(XEN) ir= q.c:270: Dom2 PCI link 2 changed 11 -> 0
(XEN) irq.c:270: Dom2= PCI link 3 changed 5 -> 0
(XEN) memory_map:remove: dom2 gfn= =3De0000 mfn=3Dc0000 nr=3D10000
(XEN) memory_map:remove: dom2 gfn=3Df3000 mfn=3Dfe300 nr=3D40
(XEN) ioport_map:remove: dom2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) memory_map:add: dom2 gfn=3De0000 mfn=3Dc0000 nr=3D10000
(XEN) ioport_map:add: dom2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) memory_map:remove: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(XEN) memory_map:add: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(X= EN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x600, fault address= =3D 0x1ac800000, flags =3D 0


=
I've noticed this has already flown around the mailing list but I&= #39;ve only recently subscribed and haven't seen a reply on previous po= sts about this issue. =A0I apologise if I'm posting this erroneously. --
_____
Fact:
1. Ninjas are mammals.
2. Ninjas fight ALL the = time.
3. The purpose of the ninja is to flip out and kill people.
--20cf307f39968aba5704ce08063d-- --===============5534640562881894256== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5534640562881894256==-- From xen-devel-bounces@lists.xen.org Fri Nov 09 04:03:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 04:03:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWfo3-0006pH-7B; Fri, 09 Nov 2012 04:02:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWfo1-0006pC-6p for xen-devel@lists.xen.org; Fri, 09 Nov 2012 04:02:57 +0000 Received: from [85.158.143.99:53573] by server-2.bemta-4.messagelabs.com id 9A/40-28922-0708C905; Fri, 09 Nov 2012 04:02:56 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352433772!25852532!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=1.7 required=7.0 tests=BODY_RANDOM_LONG, HTML_20_30, HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9880 invoked from network); 9 Nov 2012 04:02:53 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-7.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 04:02:53 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so4215898vcb.32 for ; Thu, 08 Nov 2012 20:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=+HXEMaYIlS5rxaR1GT6PbHjB3RUuH3ACqdJHRtVL1bg=; b=k1qSIhPDxOpT2Vd+U/5KOq+yjolgX8DnEHL2EGKxPBDYQUbYa+wJHvs+d14sLAhNRl 8XkXOGlDn9QoKeCo34w6UG3bnUCpZvGOBJxWmrTdF7I92ZTXI0YEbzxz6lt+z60WW5P2 fOHWGhe2OIoLO2Mah6onljHBd8MotK9U9m+7Nw/1Y6BHoDkG8HBLzMRegFag8U1Z+U6+ BrR8ARWqvua0lVHyGjDB29rDDU42I2Gy4Z1F3x/Arc2DFZKZOrTRJGYpZsexdj+wcgcZ h4DJ8BYzPAZwJ2nrvTJQEDcUg+1nOqziobhP6nOZ29o3btv6vgkbVk6ccqVOxE+PBNJ6 SIGw== MIME-Version: 1.0 Received: by 10.52.70.48 with SMTP id j16mr8136138vdu.1.1352433771657; Thu, 08 Nov 2012 20:02:51 -0800 (PST) Received: by 10.220.37.8 with HTTP; Thu, 8 Nov 2012 20:02:51 -0800 (PST) Date: Thu, 8 Nov 2012 20:02:51 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5534640562881894256==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============5534640562881894256== Content-Type: multipart/alternative; boundary=20cf307f39968aba5704ce08063d --20cf307f39968aba5704ce08063d Content-Type: text/plain; charset=ISO-8859-1 Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. VGA passthrough previously working with 4.1 is no longer working with >4.2. Setup - Working: Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, xend Asus Radeon HD 7870 DirectCU. Works perfect. Benches on par with bare metal. Setup - Broken: Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl toolstack. Asus Radeon HD 7870 DirectCU. Some times the guest boots correctly but display is never enabled. Sometimes BSOD, doesn't seem to be any rhyme or reason? No errors in logs. Found the following in 'xl dmesg': (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = 0x1ac800000, flags = 0 Full 'xl dmesg' output: __ __ _ _ _____ _ _ _ \ \/ /___ _ __ | || | |___ / _ _ _ __ ___| |_ __ _| |__ | | ___ \ // _ \ '_ \ | || |_ |_ \ __| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ / \ __/ | | | |__ _| ___) |__| |_| | | | \__ \ || (_| | |_) | | __/ /_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| (XEN) Xen version 4.3-unstable (root@) (gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3) Wed Nov 7 21:13:35 PST 2012 (XEN) Latest ChangeSet: unavailable (XEN) Bootloader: GRUB 1.99-21ubuntu3.4 (XEN) Command line: xen-pciback=passthrough xen-pciback.hide=(06:00.0)(06.00.1) (XEN) Video information: (XEN) VGA is text mode 80x25, font 8x16 (XEN) VBE/DDC methods: V2; EDID transfer time: 1 seconds (XEN) Disc information: (XEN) Found 6 MBR signatures (XEN) Found 6 EDD information structures (XEN) Xen-e820 RAM map: (XEN) 0000000000000000 - 000000000009e800 (usable) (XEN) 000000000009e800 - 00000000000a0000 (reserved) (XEN) 00000000000e0000 - 0000000000100000 (reserved) (XEN) 0000000000100000 - 00000000bab4f000 (usable) (XEN) 00000000bab4f000 - 00000000baf83000 (reserved) (XEN) 00000000baf83000 - 00000000baf93000 (ACPI data) (XEN) 00000000baf93000 - 00000000bbcfa000 (ACPI NVS) (XEN) 00000000bbcfa000 - 00000000bca4f000 (reserved) (XEN) 00000000bca4f000 - 00000000bca50000 (usable) (XEN) 00000000bca50000 - 00000000bcc56000 (ACPI NVS) (XEN) 00000000bcc56000 - 00000000bd083000 (usable) (XEN) 00000000bd083000 - 00000000bd7f4000 (reserved) (XEN) 00000000bd7f4000 - 00000000bd800000 (usable) (XEN) 00000000f8000000 - 00000000fc000000 (reserved) (XEN) 00000000fec00000 - 00000000fec01000 (reserved) (XEN) 00000000fec10000 - 00000000fec11000 (reserved) (XEN) 00000000fec20000 - 00000000fec21000 (reserved) (XEN) 00000000fed00000 - 00000000fed01000 (reserved) (XEN) 00000000fed61000 - 00000000fed71000 (reserved) (XEN) 00000000fed80000 - 00000000fed90000 (reserved) (XEN) 00000000fef00000 - 0000000100000000 (reserved) (XEN) 0000000100001000 - 000000043f000000 (usable) (XEN) ACPI: RSDP 000F0490, 0024 (r2 ALASKA) (XEN) ACPI: XSDT BAF89070, 005C (r1 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: FACP BAF90BF8, 010C (r5 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI Warning (tbfadt-0232): FADT (revision 5) is longer than ACPI 2.0 version, truncating length 0x10C to 0xF4 [20070126] (XEN) ACPI Warning (tbfadt-0444): Optional field "Pm2ControlBlock" has zero address or length: 0000000000000000/1 [20070126] (XEN) ACPI: DSDT BAF89168, 7A8A (r2 ALASKA A M I 0 INTL 20051117) (XEN) ACPI: FACS BBCF4F80, 0040 (XEN) ACPI: APIC BAF90D08, 009E (r3 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: FPDT BAF90DA8, 0044 (r1 ALASKA A M I 1072009 AMI 10013) (XEN) ACPI: MCFG BAF90DF0, 003C (r1 ALASKA A M I 1072009 MSFT 10013) (XEN) ACPI: HPET BAF90E30, 0038 (r1 ALASKA A M I 1072009 AMI 5) (XEN) ACPI: SSDT BAF90FC0, 1714 (r1 AMD POWERNOW 1 AMD 1) (XEN) ACPI: IVRS BAF90EC0, 0100 (r1 AMD RD890S 202031 AMD 0) (XEN) System RAM: 16287MB (16678040kB) (XEN) No NUMA configuration found (XEN) Faking a node at 0000000000000000-000000043f000000 (XEN) Domain heap initialised (XEN) DMI 2.7 present. (XEN) Using APIC driver default (XEN) ACPI: PM-Timer IO Port: 0x808 (XEN) ACPI: ACPI SLEEP INFO: pm1x_cnt[804,0], pm1x_evt[800,0] (XEN) ACPI: 32/64X FACS address mismatch in FADT - bbcf4f80/0000000000000000, using 32 (XEN) ACPI: wakeup_vec[bbcf4f8c], vec_size[20] (XEN) ACPI: Local APIC address 0xfee00000 (XEN) ACPI: LAPIC (acpi_id[0x01] lapic_id[0x10] enabled) (XEN) Processor #16 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x02] lapic_id[0x11] enabled) (XEN) Processor #17 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x03] lapic_id[0x12] enabled) (XEN) Processor #18 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x04] lapic_id[0x13] enabled) (XEN) Processor #19 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x05] lapic_id[0x14] enabled) (XEN) Processor #20 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x06] lapic_id[0x15] enabled) (XEN) Processor #21 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x07] lapic_id[0x16] enabled) (XEN) Processor #22 5:1 APIC version 16 (XEN) ACPI: LAPIC (acpi_id[0x08] lapic_id[0x17] enabled) (XEN) Processor #23 5:1 APIC version 16 (XEN) ACPI: LAPIC_NMI (acpi_id[0xff] high edge lint[0x1]) (XEN) ACPI: IOAPIC (id[0x09] address[0xfec00000] gsi_base[0]) (XEN) IOAPIC[0]: apic_id 9, version 33, address 0xfec00000, GSI 0-23 (XEN) ACPI: IOAPIC (id[0x0a] address[0xfec20000] gsi_base[24]) (XEN) IOAPIC[1]: apic_id 10, version 33, address 0xfec20000, GSI 24-55 (XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl) (XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level) (XEN) ACPI: IRQ0 used by override. (XEN) ACPI: IRQ2 used by override. (XEN) ACPI: IRQ9 used by override. (XEN) Enabling APIC mode: Flat. Using 2 I/O APICs (XEN) ACPI: HPET id: 0x43538210 base: 0xfed00000 (XEN) Table is not found! (XEN) Using ACPI (MADT) for SMP configuration information (XEN) SMP: Allowing 8 CPUs (0 hotplug CPUs) (XEN) IRQ limits: 56 GSI, 1496 MSI/MSI-X (XEN) Using scheduler: SMP Credit Scheduler (credit) (XEN) Detected 3913.302 MHz processor. (XEN) Initing memory sharing. (XEN) xstate_init: using cntxt_size: 0x3c0 and states: 0x4000000000000007 (XEN) AMD Fam15h machine check reporting enabled (XEN) PCI: MCFG configuration 0: base e0000000 segment 0000 buses 00 - ff (XEN) PCI: Not using MCFG for segment 0000 bus 00-ff (XEN) AMD-Vi: IOMMU 0 Enabled. (XEN) AMD-Vi: Enabling global vector map (XEN) I/O virtualisation enabled (XEN) - Dom0 mode: Relaxed (XEN) ENABLING IO-APIC IRQs (XEN) -> Using new ACK method (XEN) ..TIMER: vector=0xF0 apic1=0 pin1=2 apic2=-1 pin2=-1 (XEN) Platform timer is 14.318MHz HPET (XEN) Allocated console ring of 64 KiB. (XEN) HVM: ASIDs enabled. (XEN) SVM: Supported advanced features: (XEN) - Nested Page Tables (NPT) (XEN) - Last Branch Record (LBR) Virtualisation (XEN) - Next-RIP Saved on #VMEXIT (XEN) - VMCB Clean Bits (XEN) - DecodeAssists (XEN) - Pause-Intercept Filter (XEN) - TSC Rate MSR (XEN) HVM: SVM enabled (XEN) HVM: Hardware Assisted Paging (HAP) detected (XEN) HVM: HAP page sizes: 4kB, 2MB, 1GB (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) microcode: collect_cpu_info: patch_id=0x6000629 (XEN) Brought up 8 CPUs (XEN) ACPI sleep modes: S3 (XEN) MCA: Use hw thresholding to adjust polling frequency (XEN) mcheck_poll: Machine check polling timer started. (XEN) mtrr: your CPUs had inconsistent fixed MTRR settings (XEN) mtrr: probably your BIOS does not setup all CPUs. (XEN) mtrr: corrected configuration. (XEN) *** LOADING DOMAIN 0 *** (XEN) elf_parse_binary: phdr: paddr=0x1000000 memsz=0xad4000 (XEN) elf_parse_binary: phdr: paddr=0x1c00000 memsz=0xe50e0 (XEN) elf_parse_binary: phdr: paddr=0x1ce6000 memsz=0x144c0 (XEN) elf_parse_binary: phdr: paddr=0x1cfb000 memsz=0x365000 (XEN) elf_parse_binary: memory: 0x1000000 -> 0x2060000 (XEN) elf_xen_parse_note: GUEST_OS = "linux" (XEN) elf_xen_parse_note: GUEST_VERSION = "2.6" (XEN) elf_xen_parse_note: XEN_VERSION = "xen-3.0" (XEN) elf_xen_parse_note: VIRT_BASE = 0xffffffff80000000 (XEN) elf_xen_parse_note: ENTRY = 0xffffffff81cfb200 (XEN) elf_xen_parse_note: HYPERCALL_PAGE = 0xffffffff81001000 (XEN) elf_xen_parse_note: FEATURES = "!writable_page_tables|pae_pgdir_above_4gb" (XEN) elf_xen_parse_note: PAE_MODE = "yes" (XEN) elf_xen_parse_note: LOADER = "generic" (XEN) elf_xen_parse_note: unknown xen elf note (0xd) (XEN) elf_xen_parse_note: SUSPEND_CANCEL = 0x1 (XEN) elf_xen_parse_note: HV_START_LOW = 0xffff800000000000 (XEN) elf_xen_parse_note: PADDR_OFFSET = 0x0 (XEN) elf_xen_addr_calc_check: addresses: (XEN) virt_base = 0xffffffff80000000 (XEN) elf_paddr_offset = 0x0 (XEN) virt_offset = 0xffffffff80000000 (XEN) virt_kstart = 0xffffffff81000000 (XEN) virt_kend = 0xffffffff82060000 (XEN) virt_entry = 0xffffffff81cfb200 (XEN) p2m_base = 0xffffffffffffffff (XEN) Xen kernel: 64-bit, lsb, compat32 (XEN) Dom0 kernel: 64-bit, PAE, lsb, paddr 0x1000000 -> 0x2060000 (XEN) PHYSICAL MEMORY ARRANGEMENT: (XEN) Dom0 alloc.: 0000000420000000->0000000428000000 (4038356 pages to be allocated) (XEN) Init. ramdisk: 000000043c7e4000->000000043efff600 (XEN) VIRTUAL MEMORY ARRANGEMENT: (XEN) Loaded kernel: ffffffff81000000->ffffffff82060000 (XEN) Init. ramdisk: ffffffff82060000->ffffffff8487b600 (XEN) Phys-Mach map: ffffffff8487c000->ffffffff8679f780 (XEN) Start info: ffffffff867a0000->ffffffff867a04b4 (XEN) Page tables: ffffffff867a1000->ffffffff867da000 (XEN) Boot stack: ffffffff867da000->ffffffff867db000 (XEN) TOTAL: ffffffff80000000->ffffffff86c00000 (XEN) ENTRY ADDRESS: ffffffff81cfb200 (XEN) Dom0 has maximum 8 VCPUs (XEN) elf_load_binary: phdr 0 at 0xffffffff81000000 -> 0xffffffff81ad4000 (XEN) elf_load_binary: phdr 1 at 0xffffffff81c00000 -> 0xffffffff81ce50e0 (XEN) elf_load_binary: phdr 2 at 0xffffffff81ce6000 -> 0xffffffff81cfa4c0 (XEN) elf_load_binary: phdr 3 at 0xffffffff81cfb000 -> 0xffffffff81dd4000 (XEN) Scrubbing Free RAM: .done. (XEN) Initial low memory virq threshold set at 0x4000 pages. (XEN) Std. Loglevel: All (XEN) Guest Loglevel: All (XEN) Xen is relinquishing VGA console. (XEN) *** Serial input -> DOM0 (type 'CTRL-a' three times to switch input to Xen) (XEN) Freed 244kB init memory. (XEN) traps.c:2486:d0 Domain attempted WRMSR 00000000c0010201 from 0x0000000000000000 to 0x000000000000abcd. (XEN) PCI add device 0000:00:00.0 (XEN) PCI add device 0000:00:00.2 (XEN) PCI add device 0000:00:02.0 (XEN) PCI add device 0000:00:04.0 (XEN) PCI add device 0000:00:05.0 (XEN) PCI add device 0000:00:09.0 (XEN) PCI add device 0000:00:0a.0 (XEN) PCI add device 0000:00:0b.0 (XEN) PCI add device 0000:00:0d.0 (XEN) PCI add device 0000:00:11.0 (XEN) PCI add device 0000:00:12.0 (XEN) PCI add device 0000:00:12.2 (XEN) PCI add device 0000:00:13.0 (XEN) PCI add device 0000:00:13.2 (XEN) PCI add device 0000:00:14.0 (XEN) PCI add device 0000:00:14.2 (XEN) PCI add device 0000:00:14.3 (XEN) PCI add device 0000:00:14.4 (XEN) PCI add device 0000:00:14.5 (XEN) PCI add device 0000:00:15.0 (XEN) PCI add device 0000:00:15.1 (XEN) PCI add device 0000:00:15.2 (XEN) PCI add device 0000:00:15.3 (XEN) PCI add device 0000:00:16.0 (XEN) PCI add device 0000:00:16.2 (XEN) PCI add device 0000:00:18.0 (XEN) PCI add device 0000:00:18.1 (XEN) PCI add device 0000:00:18.2 (XEN) PCI add device 0000:00:18.3 (XEN) PCI add device 0000:00:18.4 (XEN) PCI add device 0000:00:18.5 (XEN) PCI add device 0000:01:00.0 (XEN) PCI add device 0000:01:00.1 (XEN) PCI add device 0000:02:00.0 (XEN) PCI add device 0000:03:00.0 (XEN) PCI add device 0000:04:00.0 (XEN) PCI add device 0000:06:00.0 (XEN) PCI add device 0000:06:00.1 (XEN) PCI add device 0000:0a:00.0 (XEN) PCI add device 0000:0b:00.0 (XEN) PCI add device 0000:0c:00.0 (XEN) memory.c:131:d0 Could not allocate order=18 extent: id=1 memflags=0 (0 of 1) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (3 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (1 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=9 extent: id=1 memflags=0 (0 of 4) (XEN) memory.c:131:d0 Could not allocate order=0 extent: id=1 memflags=0 (582 of 2048) (XEN) memory.c:131:d0 Could not allocate order=18 extent: id=2 memflags=0 (0 of 1) (XEN) HVM2: HVM Loader (XEN) HVM2: Detected Xen v4.3-unstable (XEN) HVM2: Xenbus rings @0xfeffc000, event channel 8 (XEN) HVM2: System requested ROMBIOS (XEN) HVM2: CPU speed is 3913 MHz (XEN) irq.c:270: Dom2 PCI link 0 changed 0 -> 5 (XEN) HVM2: PCI-ISA link 0 routed to IRQ5 (XEN) irq.c:270: Dom2 PCI link 1 changed 0 -> 10 (XEN) HVM2: PCI-ISA link 1 routed to IRQ10 (XEN) irq.c:270: Dom2 PCI link 2 changed 0 -> 11 (XEN) HVM2: PCI-ISA link 2 routed to IRQ11 (XEN) irq.c:270: Dom2 PCI link 3 changed 0 -> 5 (XEN) HVM2: PCI-ISA link 3 routed to IRQ5 (XEN) HVM2: pci dev 01:3 INTA->IRQ10 (XEN) HVM2: pci dev 03:0 INTA->IRQ5 (XEN) HVM2: pci dev 04:0 INTA->IRQ5 (XEN) HVM2: pci dev 05:0 INTA->IRQ10 (XEN) HVM2: pci dev 06:0 INTB->IRQ5 (XEN) HVM2: pci dev 05:0 bar 10 size lx: 10000000 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) HVM2: pci dev 02:0 bar 10 size lx: 02000000 (XEN) HVM2: pci dev 03:0 bar 14 size lx: 01000000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) HVM2: pci dev 05:0 bar 18 size lx: 00040000 (XEN) HVM2: pci dev 05:0 bar 30 size lx: 00020000 (XEN) HVM2: pci dev 06:0 bar 10 size lx: 00004000 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) HVM2: pci dev 02:0 bar 14 size lx: 00001000 (XEN) HVM2: pci dev 03:0 bar 10 size lx: 00000100 (XEN) HVM2: pci dev 04:0 bar 10 size lx: 00000100 (XEN) HVM2: pci dev 04:0 bar 14 size lx: 00000100 (XEN) HVM2: pci dev 05:0 bar 20 size lx: 00000100 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) HVM2: pci dev 01:1 bar 20 size lx: 00000010 (XEN) HVM2: Multiprocessor initialisation: (XEN) HVM2: - CPU0 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU1 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU2 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU3 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU4 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: - CPU5 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done. (XEN) HVM2: Testing HVM environment: (XEN) HVM2: - REP INSB across page boundaries ... passed (XEN) HVM2: - GS base MSRs and SWAPGS ... passed (XEN) HVM2: Passed 2 of 2 tests (XEN) HVM2: Writing SMBIOS tables ... (XEN) HVM2: Loading ROMBIOS ... (XEN) HVM2: 12636 bytes of ROMBIOS high-memory extensions: (XEN) HVM2: Relocating to 0xfc001000-0xfc00415c ... done (XEN) HVM2: Creating MP tables ... (XEN) HVM2: Loading Cirrus VGABIOS ... (XEN) HVM2: Loading PCI Option ROM ... (XEN) HVM2: - Manufacturer: http://ipxe.org (XEN) HVM2: - Product name: iPXE (XEN) HVM2: Option ROMs: (XEN) HVM2: c0000-c8fff: VGA BIOS (XEN) HVM2: c9000-d8fff: Etherboot ROM (XEN) HVM2: Loading ACPI ... (XEN) HVM2: vm86 TSS at fc010280 (XEN) HVM2: BIOS map: (XEN) HVM2: f0000-fffff: Main BIOS (XEN) HVM2: E820 table: (XEN) HVM2: [00]: 00000000:00000000 - 00000000:0009e000: RAM (XEN) HVM2: [01]: 00000000:0009e000 - 00000000:000a0000: RESERVED (XEN) HVM2: HOLE: 00000000:000a0000 - 00000000:000e0000 (XEN) HVM2: [02]: 00000000:000e0000 - 00000000:00100000: RESERVED (XEN) HVM2: [03]: 00000000:00100000 - 00000000:e0000000: RAM (XEN) HVM2: HOLE: 00000000:e0000000 - 00000000:fc000000 (XEN) HVM2: [04]: 00000000:fc000000 - 00000001:00000000: RESERVED (XEN) HVM2: [05]: 00000001:00000000 - 00000002:19800000: RAM (XEN) HVM2: Invoking ROMBIOS ... (XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $ (XEN) stdvga.c:147:d2 entering stdvga and caching modes (XEN) HVM2: VGABios $Id: vgabios.c,v 1.67 2008/01/27 09:44:12 vruppert Exp $ (XEN) HVM2: Bochs BIOS - build: 06/23/99 (XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $ (XEN) HVM2: Options: apmbios pcibios eltorito PMM (XEN) HVM2: (XEN) HVM2: ata0-0: PCHS=16383/16/63 translation=lba LCHS=1024/255/63 (XEN) HVM2: ata0 master: QEMU HARDDISK ATA-7 Hard-Disk ( 115 GBytes) (XEN) HVM2: IDE time out (XEN) HVM2: (XEN) HVM2: (XEN) HVM2: (XEN) HVM2: Press F12 for boot menu. (XEN) HVM2: (XEN) HVM2: Booting from Hard Disk... (XEN) HVM2: Booting from 0000:7c00 (XEN) stdvga.c:151:d2 leaving stdvga (XEN) irq.c:270: Dom2 PCI link 0 changed 5 -> 0 (XEN) irq.c:270: Dom2 PCI link 1 changed 10 -> 0 (XEN) irq.c:270: Dom2 PCI link 2 changed 11 -> 0 (XEN) irq.c:270: Dom2 PCI link 3 changed 5 -> 0 (XEN) memory_map:remove: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:remove: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:remove: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:remove: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) grant_table.c:1266:d2 Expanding dom (2) grant table from (4) to (32) frames. (XEN) irq.c:375: Dom2 callback via changed to GSI 28 (XEN) memory_map:remove: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:remove: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:remove: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:add: dom2 gfn=e0000 mfn=c0000 nr=10000 (XEN) memory_map:add: dom2 gfn=f3000 mfn=fe300 nr=40 (XEN) ioport_map:add: dom2 gport=c200 mport=b000 nr=100 (XEN) memory_map:remove: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) memory_map:add: dom2 gfn=f3060 mfn=fe360 nr=4 (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = 0x1ac800000, flags = 0 I've noticed this has already flown around the mailing list but I've only recently subscribed and haven't seen a reply on previous posts about this issue. I apologise if I'm posting this erroneously. -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --20cf307f39968aba5704ce08063d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested against all three.=

VGA passthrough previously working with 4.1 is no longe= r working with >4.2.

Setup - Working:
Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, = xend

Setup - Broken:
Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), = xl toolstack.
Asus Radeon HD 7870 DirectCU.
= Some times the guest boots correctly but display is never enabled. =A0Somet= imes BSOD, doesn't seem to be any rhyme or reason?

No errors in logs. =A0 Found the following in 'xl d= mesg':
(XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id = =3D 0x600, fault address =3D 0x1ac800000, flags =3D 0



Full 'xl dmesg&#= 39; output:

=A0__ =A0__ =A0 =A0 =A0 =A0 =A0 =A0_ = =A0_ =A0 =A0_____ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0_ =A0 =A0 =A0 =A0_= =A0 =A0 _ =A0 =A0 =A0
=A0\ \/ /___ _ __ =A0 | || | =A0|___ / =A0= =A0_ =A0 _ _ __ =A0___| |_ __ _| |__ | | ___=A0
=A0 \ =A0// _ \ '_ \ =A0| || |_ =A0 |_ \ __| | | | '_ \/ __| _= _/ _` | '_ \| |/ _ \
=A0 / =A0\ =A0__/ | | | |__ =A0 _| ___) = |__| |_| | | | \__ \ || (_| | |_) | | =A0__/
=A0/_/\_\___|_| |_| = =A0 =A0|_|(_)____/ =A0 =A0\__,_|_| |_|___/\__\__,_|_.__/|_|\___|
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0=A0
(XEN) Xen version 4.3-unstable (root@) (gcc (Ubuntu/Linar= o 4.6.3-1ubuntu5) 4.6.3) Wed Nov =A07 21:13:35 PST 2012
(XEN) Lat= est ChangeSet: unavailable
(XEN) Bootloader: GRUB 1.99-21ubuntu3.4
(XEN) Command line: = xen-pciback=3Dpassthrough xen-pciback.hide=3D(06:00.0)(06.00.1)
(= XEN) Video information:
(XEN) =A0VGA is text mode 80x25, font 8x1= 6
(XEN) =A0VBE/DDC methods: V2; EDID transfer time: 1 seconds
= (XEN) Disc information:
(XEN) =A0Found 6 MBR signatures
(XEN) =A0Found 6 EDD information structures
(XEN) Xen-e820 RAM m= ap:
(XEN) =A00000000000000000 - 000000000009e800 (usable)
(XEN) = =A0000000000009e800 - 00000000000a0000 (reserved)
(XEN) =A0000000= 00000e0000 - 0000000000100000 (reserved)
(XEN) =A0000000000010000= 0 - 00000000bab4f000 (usable)
(XEN) =A000000000bab4f000 - 00000000baf83000 (reserved)
(XEN= ) =A000000000baf83000 - 00000000baf93000 (ACPI data)
(XEN) =A0000= 00000baf93000 - 00000000bbcfa000 (ACPI NVS)
(XEN) =A000000000bbcf= a000 - 00000000bca4f000 (reserved)
(XEN) =A000000000bca4f000 - 00000000bca50000 (usable)
(XEN) = =A000000000bca50000 - 00000000bcc56000 (ACPI NVS)
(XEN) =A0000000= 00bcc56000 - 00000000bd083000 (usable)
(XEN) =A000000000bd083000 = - 00000000bd7f4000 (reserved)
(XEN) =A000000000bd7f4000 - 00000000bd800000 (usable)
(XEN) = =A000000000f8000000 - 00000000fc000000 (reserved)
(XEN) =A0000000= 00fec00000 - 00000000fec01000 (reserved)
(XEN) =A000000000fec1000= 0 - 00000000fec11000 (reserved)
(XEN) =A000000000fec20000 - 00000000fec21000 (reserved)
(XEN= ) =A000000000fed00000 - 00000000fed01000 (reserved)
(XEN) =A00000= 0000fed61000 - 00000000fed71000 (reserved)
(XEN) =A000000000fed80= 000 - 00000000fed90000 (reserved)
(XEN) =A000000000fef00000 - 0000000100000000 (reserved)
(XEN= ) =A00000000100001000 - 000000043f000000 (usable)
(XEN) ACPI: RSD= P 000F0490, 0024 (r2 ALASKA)
(XEN) ACPI: XSDT BAF89070, 005C (r1 = ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 10013)
(XEN) ACPI: FACP BAF90BF8, 010C (r5 ALASKA =A0 =A0A M I =A01072009 AMI= =A0 =A0 10013)
(XEN) ACPI Warning (tbfadt-0232): FADT (revision = 5) is longer than ACPI 2.0 version, truncating length 0x10C to 0xF4 [200701= 26]
(XEN) ACPI Warning (tbfadt-0444): Optional field "Pm2ControlBlock= " has zero address or length: 0000000000000000/1 [20070126]
= (XEN) ACPI: DSDT BAF89168, 7A8A (r2 ALASKA =A0 =A0A M I =A0 =A0 =A0 =A00 IN= TL 20051117)
(XEN) ACPI: FACS BBCF4F80, 0040
(XEN) ACPI: APIC BAF90D08, 0= 09E (r3 ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 10013)
(XEN) A= CPI: FPDT BAF90DA8, 0044 (r1 ALASKA =A0 =A0A M I =A01072009 AMI =A0 =A0 100= 13)
(XEN) ACPI: MCFG BAF90DF0, 003C (r1 ALASKA =A0 =A0A M I =A010= 72009 MSFT =A0 =A010013)
(XEN) ACPI: HPET BAF90E30, 0038 (r1 ALASKA =A0 =A0A M I =A01072009 AMI= =A0 =A0 =A0 =A0 5)
(XEN) ACPI: SSDT BAF90FC0, 1714 (r1 AMD =A0 = =A0POWERNOW =A0 =A0 =A0 =A01 AMD =A0 =A0 =A0 =A0 1)
(XEN) ACPI: I= VRS BAF90EC0, 0100 (r1 =A0AMD =A0 =A0 RD890S =A0 202031 AMD =A0 =A0 =A0 =A0= 0)
(XEN) System RAM: 16287MB (16678040kB)
(XEN) No NUMA configu= ration found
(XEN) Faking a node at 0000000000000000-000000043f00= 0000
(XEN) Domain heap initialised
(XEN) DMI 2.7 presen= t.
(XEN) Using APIC driver default
(XEN) ACPI: PM-Timer IO Port= : 0x808
(XEN) ACPI: ACPI SLEEP INFO: pm1x_cnt[804,0], pm1x_evt[80= 0,0]
(XEN) ACPI: 32/64X FACS address mismatch in FADT - bbcf4f80/= 0000000000000000, using 32
(XEN) ACPI: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0wakeup_vec[bbcf4f8c], v= ec_size[20]
(XEN) ACPI: Local APIC address 0xfee00000
(= XEN) ACPI: LAPIC (acpi_id[0x01] lapic_id[0x10] enabled)
(XEN) Pro= cessor #16 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0x02] lapic_id[0x11] enabled)
(XE= N) Processor #17 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x03] lapic_id[0x12] enabled)
(XEN) Processor #18 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x04] lapic_id[0x13] enabled)
(XE= N) Processor #19 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x05] lapic_id[0x14] enabled)
(XEN) Processor #20 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x06] lapic_id[0x15] enabled)
(XE= N) Processor #21 5:1 APIC version 16
(XEN) ACPI: LAPIC (acpi_id[0= x07] lapic_id[0x16] enabled)
(XEN) Processor #22 5:1 APIC version= 16
(XEN) ACPI: LAPIC (acpi_id[0x08] lapic_id[0x17] enabled)
(XE= N) Processor #23 5:1 APIC version 16
(XEN) ACPI: LAPIC_NMI (acpi_= id[0xff] high edge lint[0x1])
(XEN) ACPI: IOAPIC (id[0x09] addres= s[0xfec00000] gsi_base[0])
(XEN) IOAPIC[0]: apic_id 9, version 33, address 0xfec00000, GSI 0-23
(XEN) ACPI: IOAPIC (id[0x0a] address[0xfec20000] gsi_base[24])
(XEN) IOAPIC[1]: apic_id 10, version 33, address 0xfec20000, GSI 24-= 55
(XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
(XEN) ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level)
(XEN) ACPI: IRQ0 used by override.
(XEN) ACPI: IRQ2 used by ov= erride.
(XEN) ACPI: IRQ9 used by override.
(XEN) Enabling APIC mode:= =A0Flat. =A0Using 2 I/O APICs
(XEN) ACPI: HPET id: 0x43538210 ba= se: 0xfed00000
(XEN) Table is not found!
(XEN) Using AC= PI (MADT) for SMP configuration information
(XEN) SMP: Allowing 8 CPUs (0 hotplug CPUs)
(XEN) IRQ limits= : 56 GSI, 1496 MSI/MSI-X
(XEN) Using scheduler: SMP Credit Schedu= ler (credit)
(XEN) Detected 3913.302 MHz processor.
(XEN) Initing memory sharing.
(XEN) xstate_init: using cntxt_size= : 0x3c0 and states: 0x4000000000000007
(XEN) AMD Fam15h machine c= heck reporting enabled
(XEN) PCI: MCFG configuration 0: base e000= 0000 segment 0000 buses 00 - ff
(XEN) PCI: Not using MCFG for segment 0000 bus 00-ff
(XEN) A= MD-Vi: IOMMU 0 Enabled.
(XEN) AMD-Vi: Enabling global vector map<= /div>
(XEN) I/O virtualisation enabled
(XEN) =A0- Dom0 mode: = Relaxed
(XEN) ENABLING IO-APIC IRQs
(XEN) =A0-> Using new ACK met= hod
(XEN) ..TIMER: vector=3D0xF0 apic1=3D0 pin1=3D2 apic2=3D-1 pi= n2=3D-1
(XEN) Platform timer is 14.318MHz HPET
(XEN) Al= located console ring of 64 KiB.
(XEN) HVM: ASIDs enabled.
(XEN) SVM: Supported advanced feat= ures:
(XEN) =A0- Nested Page Tables (NPT)
(XEN) =A0- La= st Branch Record (LBR) Virtualisation
(XEN) =A0- Next-RIP Saved o= n #VMEXIT
(XEN) =A0- VMCB Clean Bits
(XEN) =A0- DecodeAssists
(XEN) =A0- Pause-Intercept Filter
(XEN) =A0- TSC Rate MSR
=
(XEN) HVM: SVM enabled
(XEN) HVM: Hardware Assisted Paging (= HAP) detected
(XEN) HVM: HAP page sizes: 4kB, 2MB, 1GB
(XEN) microcode: co= llect_cpu_info: patch_id=3D0x6000629
(XEN) microcode: collect_cpu= _info: patch_id=3D0x6000629
(XEN) microcode: collect_cpu_info: pa= tch_id=3D0x6000629
(XEN) microcode: collect_cpu_info: patch_id=3D0x6000629
(XEN= ) microcode: collect_cpu_info: patch_id=3D0x6000629
(XEN) microco= de: collect_cpu_info: patch_id=3D0x6000629
(XEN) microcode: colle= ct_cpu_info: patch_id=3D0x6000629
(XEN) Brought up 8 CPUs
(XEN) ACPI sleep modes: S3
(XEN) MCA: Use hw thresholding to adjust polling frequency
(XEN)= mcheck_poll: Machine check polling timer started.
(XEN) mtrr: yo= ur CPUs had inconsistent fixed MTRR settings
(XEN) mtrr: probably your BIOS does not setup all CPUs.
(XEN= ) mtrr: corrected configuration.
(XEN) *** LOADING DOMAIN 0 ***
(XEN) elf_parse_binary: phdr: paddr=3D0x1000000 memsz=3D0xad4000
(XEN) elf_parse_binary: phdr: paddr=3D0x1c00000 memsz=3D0xe50e0
<= div>(XEN) elf_parse_binary: phdr: paddr=3D0x1ce6000 memsz=3D0x144c0
(XEN) elf_parse_binary: phdr: paddr=3D0x1cfb000 memsz=3D0x365000
(XEN) elf_parse_binary: memory: 0x1000000 -> 0x2060000
(XEN) elf_xen_parse_note: GUEST_OS =3D "linux"
(XE= N) elf_xen_parse_note: GUEST_VERSION =3D "2.6"
(XEN) el= f_xen_parse_note: XEN_VERSION =3D "xen-3.0"
(XEN) elf_x= en_parse_note: VIRT_BASE =3D 0xffffffff80000000
(XEN) elf_xen_parse_note: ENTRY =3D 0xffffffff81cfb200
(XEN)= elf_xen_parse_note: HYPERCALL_PAGE =3D 0xffffffff81001000
(XEN) = elf_xen_parse_note: FEATURES =3D "!writable_page_tables|pae_pgdir_abov= e_4gb"
(XEN) elf_xen_parse_note: PAE_MODE =3D "yes"
(XEN)= elf_xen_parse_note: LOADER =3D "generic"
(XEN) elf_xen= _parse_note: unknown xen elf note (0xd)
(XEN) elf_xen_parse_note:= SUSPEND_CANCEL =3D 0x1
(XEN) elf_xen_parse_note: HV_START_LOW =3D 0xffff800000000000
(XEN) elf_xen_parse_note: PADDR_OFFSET =3D 0x0
(XEN) =A0 =A0 elf_paddr_offset =3D 0x0
(XEN) =A0 =A0 virt_of= fset =A0 =A0 =A0=3D 0xffffffff80000000
(XEN) =A0 =A0 virt_kstart = =A0 =A0 =A0=3D 0xffffffff81000000
(XEN) =A0 =A0 virt_kend =A0 =A0= =A0 =A0=3D 0xffffffff82060000
(XEN) =A0 =A0 virt_entry =A0 =A0 =A0 =3D 0xffffffff81cfb200
(XEN)= =A0 =A0 p2m_base =A0 =A0 =A0 =A0 =3D 0xffffffffffffffff
(XEN) = =A0Xen =A0kernel: 64-bit, lsb, compat32
(XEN) =A0Dom0 kernel: 64-= bit, PAE, lsb, paddr 0x1000000 -> 0x2060000
(XEN) PHYSICAL MEMORY ARRANGEMENT:
(XEN) =A0Dom0 alloc.: =A0= 0000000420000000->0000000428000000 (4038356 pages to be allocated)
(XEN) =A0Init. ramdisk: 000000043c7e4000->000000043efff600
(XEN) VIRTUAL MEMORY ARRANGEMENT:
(XEN) =A0Loaded kernel: fffffff= f81000000->ffffffff82060000
(XEN) =A0Init. ramdisk: ffffffff82= 060000->ffffffff8487b600
(XEN) =A0Phys-Mach map: ffffffff8487c= 000->ffffffff8679f780
(XEN) =A0Start info: =A0 =A0ffffffff867a0000->ffffffff867a04b4
(XEN) =A0Page tables: =A0 ffffffff867a1000->ffffffff867da000
=
(XEN) =A0Boot stack: =A0 =A0ffffffff867da000->ffffffff867db000
(XEN) =A0TOTAL: =A0 =A0 =A0 =A0 ffffffff80000000->ffffffff86c00000=
(XEN) =A0ENTRY ADDRESS: ffffffff81cfb200
(XEN) Dom0 has maxi= mum 8 VCPUs
(XEN) elf_load_binary: phdr 0 at 0xffffffff81000000 -= > 0xffffffff81ad4000
(XEN) elf_load_binary: phdr 1 at 0xffffff= ff81c00000 -> 0xffffffff81ce50e0
(XEN) elf_load_binary: phdr 2 at 0xffffffff81ce6000 -> 0xffffffff81= cfa4c0
(XEN) elf_load_binary: phdr 3 at 0xffffffff81cfb000 -> = 0xffffffff81dd4000
(XEN) Scrubbing Free RAM: .done.
(XEN) Initial low memory virq threshold set at 0x4000 pages.
(XEN= ) Std. Loglevel: All
(XEN) Guest Loglevel: All
(XEN) Xe= n is relinquishing VGA console.
(XEN) *** Serial input -> DOM0= (type 'CTRL-a' three times to switch input to Xen)
(XEN) Freed 244kB init memory.
(XEN) traps.c:2486:d0 Domain = attempted WRMSR 00000000c0010201 from 0x0000000000000000 to 0x000000000000a= bcd.
(XEN) PCI add device 0000:00:00.0
(XEN) PCI add de= vice 0000:00:00.2
(XEN) PCI add device 0000:00:02.0
(XEN) PCI add device 0000:= 00:04.0
(XEN) PCI add device 0000:00:05.0
(XEN) PCI add= device 0000:00:09.0
(XEN) PCI add device 0000:00:0a.0
(XEN) PCI add device 0000:00:0b.0
(XEN) PCI add device 0000:00:0d= .0
(XEN) PCI add device 0000:00:11.0
(XEN) PCI add devi= ce 0000:00:12.0
(XEN) PCI add device 0000:00:12.2
(XEN)= PCI add device 0000:00:13.0
(XEN) PCI add device 0000:00:13.2
(XEN) PCI add device 0000:= 00:14.0
(XEN) PCI add device 0000:00:14.2
(XEN) PCI add= device 0000:00:14.3
(XEN) PCI add device 0000:00:14.4
(XEN) PCI add device 0000:00:14.5
(XEN) PCI add device 0000:00:15= .0
(XEN) PCI add device 0000:00:15.1
(XEN) PCI add devi= ce 0000:00:15.2
(XEN) PCI add device 0000:00:15.3
(XEN)= PCI add device 0000:00:16.0
(XEN) PCI add device 0000:00:16.2
(XEN) PCI add device 0000:= 00:18.0
(XEN) PCI add device 0000:00:18.1
(XEN) PCI add= device 0000:00:18.2
(XEN) PCI add device 0000:00:18.3
(XEN) PCI add device 0000:00:18.4
(XEN) PCI add device 0000:00:18= .5
(XEN) PCI add device 0000:01:00.0
(XEN) PCI add devi= ce 0000:01:00.1
(XEN) PCI add device 0000:02:00.0
(XEN)= PCI add device 0000:03:00.0
(XEN) PCI add device 0000:04:00.0
(XEN) PCI add device 0000:= 06:00.0
(XEN) PCI add device 0000:06:00.1
(XEN) PCI add= device 0000:0a:00.0
(XEN) PCI add device 0000:0b:00.0
(XEN) PCI add device 0000:0c:00.0
(XEN) memory.c:131:d0 Could not= allocate order=3D18 extent: id=3D1 memflags=3D0 (0 of 1)
(XEN) m= emory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memflags=3D0 (3 = of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (1 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 C= ould not allocate order=3D9 extent: id=3D1 memflags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order=3D9 extent: id=3D1 memf= lags=3D0 (0 of 4)
(XEN) memory.c:131:d0 Could not allocate order= =3D0 extent: id=3D1 memflags=3D0 (582 of 2048)
(XEN) memory.c:131= :d0 Could not allocate order=3D18 extent: id=3D2 memflags=3D0 (0 of 1)
(XEN) HVM2: HVM Loader
(XEN) HVM2: Detected Xen v4.3-unstabl= e
(XEN) HVM2: Xenbus rings @0xfeffc000, event channel 8
(XEN) HVM2: System requested ROMBIOS
(XEN) HVM2: CPU speed is 39= 13 MHz
(XEN) irq.c:270: Dom2 PCI link 0 changed 0 -> 5
(XEN) HVM= 2: PCI-ISA link 0 routed to IRQ5
(XEN) irq.c:270: Dom2 PCI link 1= changed 0 -> 10
(XEN) HVM2: PCI-ISA link 1 routed to IRQ10
(XEN) irq.c:270: Dom2 PCI link 2 changed 0 -> 11
(XEN) HV= M2: PCI-ISA link 2 routed to IRQ11
(XEN) irq.c:270: Dom2 PCI link= 3 changed 0 -> 5
(XEN) HVM2: PCI-ISA link 3 routed to IRQ5
(XEN) HVM2: pci dev 01:3 INTA->IRQ10
(XEN) HVM2: pci dev = 03:0 INTA->IRQ5
(XEN) HVM2: pci dev 04:0 INTA->IRQ5
(XEN) HVM2: pci dev 05:0 INTA->IRQ10
(XEN) HVM2: pci dev 06= :0 INTB->IRQ5
(XEN) HVM2: pci dev 05:0 bar 10 size lx: 10000000
(XEN) memo= ry_map:add: dom2 gfn=3De0000 mfn=3Dc0000 nr=3D10000
(XEN) HVM2: p= ci dev 02:0 bar 10 size lx: 02000000
(XEN) HVM2: pci dev 03:0 bar= 14 size lx: 01000000
(XEN) memory_map:add: dom2 gfn=3Df3000 mfn=3Dfe300 nr=3D40
(= XEN) HVM2: pci dev 05:0 bar 18 size lx: 00040000
(XEN) HVM2: pci = dev 05:0 bar 30 size lx: 00020000
(XEN) HVM2: pci dev 06:0 bar 10= size lx: 00004000
(XEN) memory_map:add: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(X= EN) HVM2: pci dev 02:0 bar 14 size lx: 00001000
(XEN) HVM2: pci d= ev 03:0 bar 10 size lx: 00000100
(XEN) HVM2: pci dev 04:0 bar 10 = size lx: 00000100
(XEN) HVM2: pci dev 04:0 bar 14 size lx: 00000100
(XEN) HVM2= : pci dev 05:0 bar 20 size lx: 00000100
(XEN) ioport_map:add: dom= 2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) HVM2: pci dev 01:1 bar= 20 size lx: 00000010
(XEN) HVM2: Multiprocessor initialisation:
(XEN) HVM2: =A0- = CPU0 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU1 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3/8]= ... done.
(XEN) HVM2: =A0- CPU2 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3= /8] ... done.
(XEN) HVM2: =A0- CPU3 ... 48-bit phys ... fixed MTR= Rs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU4 ... 48-bit= phys ... fixed MTRRs ... var MTRRs [3/8] ... done.
(XEN) HVM2: =A0- CPU5 ... 48-bit phys ... fixed MTRRs ... var MTRRs [3= /8] ... done.
(XEN) HVM2: Testing HVM environment:
(XEN= ) HVM2: =A0- REP INSB across page boundaries ... passed
(XEN) HVM= 2: =A0- GS base MSRs and SWAPGS ... passed
(XEN) HVM2: Passed 2 of 2 tests
(XEN) HVM2: Writing SMBIOS t= ables ...
(XEN) HVM2: Loading ROMBIOS ...
(XEN) HVM2: 1= 2636 bytes of ROMBIOS high-memory extensions:
(XEN) HVM2: =A0 Rel= ocating to 0xfc001000-0xfc00415c ... done
(XEN) HVM2: Creating MP tables ...
(XEN) HVM2: Loading Cirru= s VGABIOS ...
(XEN) HVM2: Loading PCI Option ROM ...
(XEN) HVM2: =A0- Product name: iPXE
(XEN) HVM2: Option ROMs:=
(XEN) HVM2: =A0c0000-c8fff: VGA BIOS
(XEN) HVM2: =A0c9= 000-d8fff: Etherboot ROM
(XEN) HVM2: Loading ACPI ...
(= XEN) HVM2: vm86 TSS at fc010280
(XEN) HVM2: BIOS map:
(XEN) HVM2: =A0f0000-fffff: Main BIOS<= /div>
(XEN) HVM2: E820 table:
(XEN) HVM2: =A0[00]: 00000000:0= 0000000 - 00000000:0009e000: RAM
(XEN) HVM2: =A0[01]: 00000000:00= 09e000 - 00000000:000a0000: RESERVED
(XEN) HVM2: =A0HOLE: 00000000:000a0000 - 00000000:000e0000
(= XEN) HVM2: =A0[02]: 00000000:000e0000 - 00000000:00100000: RESERVED
(XEN) HVM2: =A0[03]: 00000000:00100000 - 00000000:e0000000: RAM
(XEN) HVM2: =A0HOLE: 00000000:e0000000 - 00000000:fc000000
(XEN) HVM2: $Revision: 1.221 $ $Date: 2008/12/07 17:32:29 $
= (XEN) stdvga.c:147:d2 entering stdvga and caching modes
(XEN) HVM= 2: VGABios $Id: vgabios.c,v 1.67 2008/01/27 09:44:12 vruppert Exp $
(XEN) HVM2: Bochs BIOS - build: 06/23/99
(XEN) HVM2: $Revisi= on: 1.221 $ $Date: 2008/12/07 17:32:29 $
(XEN) HVM2: Options: apm= bios pcibios eltorito PMM=A0
(XEN) HVM2:=A0
(XEN) HVM2:= ata0-0: PCHS=3D16383/16/63 translation=3Dlba LCHS=3D1024/255/63
(XEN) HVM2: ata0 master: QEMU HARDDISK ATA-7 Hard-Disk ( 115 GBytes)
(XEN) HVM2: IDE time out
(XEN) HVM2:=A0
(XEN) = HVM2:=A0
(XEN) HVM2:=A0
(XEN) HVM2: Press F12 for boot = menu.
(XEN) HVM2:=A0
(XEN) HVM2: Booting from Hard Disk...
(XEN) HVM2: Booting from 0000:7c00
(XEN) stdvga.c:151:d2 leavi= ng stdvga
(XEN) irq.c:270: Dom2 PCI link 0 changed 5 -> 0
(XEN) irq.c:270: Dom2 PCI link 1 changed 10 -> 0
(XEN) ir= q.c:270: Dom2 PCI link 2 changed 11 -> 0
(XEN) irq.c:270: Dom2= PCI link 3 changed 5 -> 0
(XEN) memory_map:remove: dom2 gfn= =3De0000 mfn=3Dc0000 nr=3D10000
(XEN) memory_map:remove: dom2 gfn=3Df3000 mfn=3Dfe300 nr=3D40
(XEN) ioport_map:remove: dom2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) memory_map:add: dom2 gfn=3De0000 mfn=3Dc0000 nr=3D10000
(XEN) ioport_map:add: dom2 gport=3Dc200 mport=3Db000 nr=3D100
(XEN) memory_map:remove: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(XEN) memory_map:add: dom2 gfn=3Df3060 mfn=3Dfe360 nr=3D4
(X= EN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x600, fault address= =3D 0x1ac800000, flags =3D 0


=
I've noticed this has already flown around the mailing list but I&= #39;ve only recently subscribed and haven't seen a reply on previous po= sts about this issue. =A0I apologise if I'm posting this erroneously. --
_____
Fact:
1. Ninjas are mammals.
2. Ninjas fight ALL the = time.
3. The purpose of the ninja is to flip out and kill people.
--20cf307f39968aba5704ce08063d-- --===============5534640562881894256== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5534640562881894256==-- From xen-devel-bounces@lists.xen.org Fri Nov 09 05:45:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 05:45:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWhOk-0007Th-Bp; Fri, 09 Nov 2012 05:44:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWhOj-0007Tc-B0 for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 05:44:57 +0000 Received: from [85.158.138.51:10427] by server-10.bemta-3.messagelabs.com id 36/6D-19806-8589C905; Fri, 09 Nov 2012 05:44:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352439895!29268521!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5OTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10643 invoked from network); 9 Nov 2012 05:44:56 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 05:44:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,743,1344211200"; d="scan'208";a="15687677" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 05:44:31 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 05:44:30 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWhOJ-0003Y9-7U; Fri, 09 Nov 2012 05:44:31 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWhOI-000692-Ow; Fri, 09 Nov 2012 05:44:30 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 9 Nov 2012 05:44:30 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14376: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14376 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14376/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-i386-xl-winxpsp3-vcpus1 12 guest-localmigrate/x10 fail pass in 14375 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14375 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14375 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14375 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14375 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail in 14375 never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 05:45:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 05:45:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWhOk-0007Th-Bp; Fri, 09 Nov 2012 05:44:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWhOj-0007Tc-B0 for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 05:44:57 +0000 Received: from [85.158.138.51:10427] by server-10.bemta-3.messagelabs.com id 36/6D-19806-8589C905; Fri, 09 Nov 2012 05:44:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352439895!29268521!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTc5OTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10643 invoked from network); 9 Nov 2012 05:44:56 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 05:44:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,743,1344211200"; d="scan'208";a="15687677" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 05:44:31 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 05:44:30 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TWhOJ-0003Y9-7U; Fri, 09 Nov 2012 05:44:31 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TWhOI-000692-Ow; Fri, 09 Nov 2012 05:44:30 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Fri, 9 Nov 2012 05:44:30 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14376: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14376 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14376/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-i386-xl-winxpsp3-vcpus1 12 guest-localmigrate/x10 fail pass in 14375 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14375 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14375 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14375 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14375 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail in 14375 never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 07:52:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 07:52:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWjND-0000P1-A9; Fri, 09 Nov 2012 07:51:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWjNB-0000Ow-GN for xen-devel@lists.xen.org; Fri, 09 Nov 2012 07:51:29 +0000 Received: from [85.158.143.99:19247] by server-2.bemta-4.messagelabs.com id 70/99-28922-006BC905; Fri, 09 Nov 2012 07:51:28 +0000 X-Env-Sender: kouya@jp.fujitsu.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352447486!18035929!1 X-Originating-IP: [192.51.44.36] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjUxLjQ0LjM2ID0+IDM3MDE1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4022 invoked from network); 9 Nov 2012 07:51:28 -0000 Received: from fgwmail6.fujitsu.co.jp (HELO fgwmail6.fujitsu.co.jp) (192.51.44.36) by server-16.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 07:51:28 -0000 Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 80D2B3EE0B5 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 6704D45DE63 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 5115045DE61 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 4249B1DB804E for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from g01jpexchyt30.g01.fujitsu.local (g01jpexchyt30.g01.fujitsu.local [10.128.193.113]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id EBFEF1DB8043 for ; Fri, 9 Nov 2012 16:51:23 +0900 (JST) Received: from [10.33.110.234] (10.33.110.234) by g01jpexchyt30.g01.fujitsu.local (10.128.193.113) with Microsoft SMTP Server (TLS) id 14.2.309.2; Fri, 9 Nov 2012 16:51:18 +0900 Message-ID: <509CB5FB.7020404@jp.fujitsu.com> Date: Fri, 9 Nov 2012 16:51:23 +0900 From: Kouya Shimura User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Content-Type: multipart/mixed; boundary="------------090302050800080606010606" X-Originating-IP: [10.33.110.234] Subject: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------090302050800080606010606 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit The same problem was once fixed by c/s 23878:59c7213b5949 but c/s 25344:0f3b1e13d6af broke it. Signed-off-by: Kouya Shimura --------------090302050800080606010606 Content-Type: text/x-patch; name="fix_reboot.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fix_reboot.patch" diff -r 62885b3c34c8 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Nov 08 17:58:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Nov 09 16:11:04 2012 +0900 @@ -1927,7 +1927,7 @@ start: * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. */ - restore_file = NULL; + restoring = 0; }else{ ret = libxl_domain_create_new(ctx, &d_config, &domid, 0, autoconnect_console_how); --------------090302050800080606010606 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------090302050800080606010606-- From xen-devel-bounces@lists.xen.org Fri Nov 09 07:52:03 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 07:52:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWjND-0000P1-A9; Fri, 09 Nov 2012 07:51:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWjNB-0000Ow-GN for xen-devel@lists.xen.org; Fri, 09 Nov 2012 07:51:29 +0000 Received: from [85.158.143.99:19247] by server-2.bemta-4.messagelabs.com id 70/99-28922-006BC905; Fri, 09 Nov 2012 07:51:28 +0000 X-Env-Sender: kouya@jp.fujitsu.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352447486!18035929!1 X-Originating-IP: [192.51.44.36] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjUxLjQ0LjM2ID0+IDM3MDE1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4022 invoked from network); 9 Nov 2012 07:51:28 -0000 Received: from fgwmail6.fujitsu.co.jp (HELO fgwmail6.fujitsu.co.jp) (192.51.44.36) by server-16.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 07:51:28 -0000 Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 80D2B3EE0B5 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 6704D45DE63 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 5115045DE61 for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 4249B1DB804E for ; Fri, 9 Nov 2012 16:51:24 +0900 (JST) Received: from g01jpexchyt30.g01.fujitsu.local (g01jpexchyt30.g01.fujitsu.local [10.128.193.113]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id EBFEF1DB8043 for ; Fri, 9 Nov 2012 16:51:23 +0900 (JST) Received: from [10.33.110.234] (10.33.110.234) by g01jpexchyt30.g01.fujitsu.local (10.128.193.113) with Microsoft SMTP Server (TLS) id 14.2.309.2; Fri, 9 Nov 2012 16:51:18 +0900 Message-ID: <509CB5FB.7020404@jp.fujitsu.com> Date: Fri, 9 Nov 2012 16:51:23 +0900 From: Kouya Shimura User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Content-Type: multipart/mixed; boundary="------------090302050800080606010606" X-Originating-IP: [10.33.110.234] Subject: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------090302050800080606010606 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit The same problem was once fixed by c/s 23878:59c7213b5949 but c/s 25344:0f3b1e13d6af broke it. Signed-off-by: Kouya Shimura --------------090302050800080606010606 Content-Type: text/x-patch; name="fix_reboot.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fix_reboot.patch" diff -r 62885b3c34c8 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Thu Nov 08 17:58:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Nov 09 16:11:04 2012 +0900 @@ -1927,7 +1927,7 @@ start: * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. */ - restore_file = NULL; + restoring = 0; }else{ ret = libxl_domain_create_new(ctx, &d_config, &domid, 0, autoconnect_console_how); --------------090302050800080606010606 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------090302050800080606010606-- From xen-devel-bounces@lists.xen.org Fri Nov 09 09:04:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:04:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkVE-0001oY-5g; Fri, 09 Nov 2012 09:03:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkVD-0001oQ-4H for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:03:51 +0000 Received: from [85.158.137.99:31906] by server-13.bemta-3.messagelabs.com id 85/F5-24887-6F6CC905; Fri, 09 Nov 2012 09:03:50 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352451826!13336957!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18275 invoked from network); 9 Nov 2012 09:03:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:03:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:03:45 +0000 Message-Id: <509CD50302000078000A76E4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:03:47 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> In-Reply-To: <1350037688.14806.93.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 12.10.12 at 12:28, Ian Campbell wrote: > The following patch causes fairly large packet loss when transmitting > from dom0 to the physical network, at least with my tg3 hardware, but I > assume it can impact anything which uses this interface. > > I suspect that the issue is that the compound pages allocated in this > way are not backed by contiguous mfns and so things fall apart when the > driver tries to do DMA. Has this seen any sort of resolution yet? Despite having forced NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following your suggested patch, Ian), and with a different NIC (e1000e driven) I'm seeing similar packet loss/corruption on transmits, and only if running a debug hypervisor (in a non-debug one, MFNs are largely contiguous, so this issue should be observable there only very rarely). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:04:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:04:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkVE-0001oY-5g; Fri, 09 Nov 2012 09:03:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkVD-0001oQ-4H for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:03:51 +0000 Received: from [85.158.137.99:31906] by server-13.bemta-3.messagelabs.com id 85/F5-24887-6F6CC905; Fri, 09 Nov 2012 09:03:50 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352451826!13336957!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18275 invoked from network); 9 Nov 2012 09:03:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:03:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:03:45 +0000 Message-Id: <509CD50302000078000A76E4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:03:47 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> In-Reply-To: <1350037688.14806.93.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 12.10.12 at 12:28, Ian Campbell wrote: > The following patch causes fairly large packet loss when transmitting > from dom0 to the physical network, at least with my tg3 hardware, but I > assume it can impact anything which uses this interface. > > I suspect that the issue is that the compound pages allocated in this > way are not backed by contiguous mfns and so things fall apart when the > driver tries to do DMA. Has this seen any sort of resolution yet? Despite having forced NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following your suggested patch, Ian), and with a different NIC (e1000e driven) I'm seeing similar packet loss/corruption on transmits, and only if running a debug hypervisor (in a non-debug one, MFNs are largely contiguous, so this issue should be observable there only very rarely). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:08:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:08:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkZA-00022v-2o; Fri, 09 Nov 2012 09:07:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkZ8-00022X-CB for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:07:54 +0000 Received: from [193.109.254.147:38730] by server-6.bemta-14.messagelabs.com id 54/66-02788-9E7CC905; Fri, 09 Nov 2012 09:07:53 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352451984!2360886!1 X-Originating-IP: [193.222.81.110] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMTAgPT4gMTAyMjEz\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 9 Nov 2012 09:06:25 -0000 Received: from outmail110.swisscom.com (HELO mail.swisscom.com) (193.222.81.110) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 09:06:25 -0000 Received: by mail.swisscom.com; Fri, 9 Nov 2012 10:05:59 +0100 From: To: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQAEnBqAAAkCjQAAIYFoAAAKGgkAAAADMQAAKDdR8A== Date: Fri, 9 Nov 2012 09:05:58 +0000 Message-ID: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: <1352384968.12977.104.camel@hastur.hellion.org.uk> Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: 599161@bugs.debian.org, keir@xen.org, JBeulich@suse.com, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ian Campbell [mailto:ijc@hellion.org.uk] > Sent: Thursday, November 08, 2012 3:29 PM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > Cc: mrsanna1@gmail.com; 599161@bugs.debian.org; xen- > devel@lists.xen.org; keir@xen.org; JBeulich@suse.com > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. > > > I think Jan was asking for information relating to the system you saw this on - > - or are you working on the same systems as Mauro? oops, excuse me, here is a description : I have the problem on 4 systems, all with same hardware. the problem occured on each system, 1 time each 2 month in average. since January 2012, I decided to reboot them all monthly, and the clock jump occurred only once in February ... SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 cores, 16 GB MEMORY XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 GNU/Linux CPU processor : 0 vendor_id : AuthenticAMD cpu family : 16 model : 9 model name : AMD Opteron(tm) Processor 6174 stepping : 1 cpu MHz : 3791872.477 cache size : 512 KB fpu : yes fpu_exception : yes cpuid level : 5 wp : yes flags : fpu de tsc msr pae mce cx8 apic mtrr mca cmov pat clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt lm 3dnowext 3dnow constant_tsc rep_good nonstop_tsc extd_apicid amd_dcm pni cx16 popcnt hypervisor lahf_lm cmp_legacy extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch nodeid_msr bogomips : 4400.17 TLB size : 1024 4K pages clflush size : 64 cache_alignment : 64 address sizes : 48 bits physical, 48 bits virtual power management: ts ttp tm stc 100mhzsteps hwpstate > > Of course additional information from Mauro would be useful too in order to > help spotting any patterns. > > > > Philippe, could you clarify again what CPU model(s) this is being > > > observed on (the long times between individual steps forward with > > > this problem perhaps warrant repeating the basics each time, as it's > > > otherwise quite cumbersome to always look up old pieces of > information). > > > > can you provide this information ? > > cat /proc/cpuinfo > > cat /proc/meminfo > > hardware information (manufacturer, model, urls, ...) > > > > Thanks, Philippe > > > > > > > -----Original Message----- > > > From: Jan Beulich [mailto:JBeulich@suse.com] > > > Sent: Thursday, November 08, 2012 10:40 AM > > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > > > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > > > devel@lists.xen.org > > > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock > > > shifts by 50 minutes" bug. > > > > > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > > > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > > > plt_wrap=5ece12d09306 > > > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > > >>>> tsc_stamp=e3839fcb0273 > > > >>> > > > >>> (below is the complete xm dmesg output) > > > >>> > > > >>> did that help you ? do you need more info ? > > > >> > > > >> I'll leave this to Keir (who wrote the debugging patch) to answer > > > >> but it looks to me like it should be useful! > > > > > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which > > > > should be impossible. plt_stamp64 oddly has low 32 bits identical > > > > to new_stamp. That seems very very improbable! > > > > > > Is it? My understanding was that plt_stamp64 is just a software > > > extension to the more narrow HW counter, and hence the low plt_mask > > > bits would always be expected to be identical. > > > > > > The plt_wrap < plt_now thing of course is entirely unexplainable to me > too: > > > Considering that plt_scale doesn't change at all post- boot, apart > > > from memory corruption I could only see an memory access ordering > > > problem to be the reason (platform_timer_stamp and/or > > > stime_platform_stamp changing despite platform_timer_lock being > > > held. So maybe taking a snapshot of all three static values involved > > > in the calculation in > > > __read_platform_stime() between acquiring the lock and the first > > > call to __read_platform_stime(), and printing them together with the > > > "live" values in a second > > > printk() after the one your original patch added could rule that out. > > > > > > But the box doesn't even seem to be NUMA (of course it also doesn't > > > help that the log level was kept restricted - hint, hint, Philippe), > > > not does there appear to be any S3 cycle or pCPU bring-up/-down in > between... > > > > > > Philippe, could you clarify again what CPU model(s) this is being > > > observed on (the long times between individual steps forward with > > > this problem perhaps warrant repeating the basics each time, as it's > > > otherwise quite cumbersome to always look up old pieces of > information). > > > > > > > I wonder whether the overflow handling should just be removed, or > > > > made conditional on a command-line parameter, or on the 32-bit > > > > platform counter being at least somewhat likely to overflow before > > > > a softirq occurs -- it seems lots of systems are using 14MHz HPET, > > > > and that gives us a couple of minutes for the plt_overflow softirq > > > > to do its work > > > before overflow occurs. > > > > I think we would notice that outage in other ways. :) > > > > > > Iirc we added this for a good reason - to cover the, however > > > unlikely, event of Xen running for very long without preemption. > > > Presumably most of the cases got fixed meanwhile, and indeed a > > > wraparound time on the order of minutes should make this > > > superfluous, but as the case here shows that code did spot a severe > > > anomaly (whatever that may turn out to be). > > > > > > Also recall that there are HPET implementations around that tick at > > > a much higher frequency than 14MHz. > > > > > > So unless we finally reach the understanding that the code is > > > flawed, I would rather want to keep it. > > > > > > Jan > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:08:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:08:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkZA-00022v-2o; Fri, 09 Nov 2012 09:07:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkZ8-00022X-CB for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:07:54 +0000 Received: from [193.109.254.147:38730] by server-6.bemta-14.messagelabs.com id 54/66-02788-9E7CC905; Fri, 09 Nov 2012 09:07:53 +0000 X-Env-Sender: Philippe.Simonet@swisscom.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352451984!2360886!1 X-Originating-IP: [193.222.81.110] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkzLjIyMi44MS4xMTAgPT4gMTAyMjEz\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 9 Nov 2012 09:06:25 -0000 Received: from outmail110.swisscom.com (HELO mail.swisscom.com) (193.222.81.110) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 09:06:25 -0000 Received: by mail.swisscom.com; Fri, 9 Nov 2012 10:05:59 +0100 From: To: Thread-Topic: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. Thread-Index: Ac280B6CWUiPuRIkTkmJRMKB8zdEqQAEnBqAAAkCjQAAIYFoAAAKGgkAAAADMQAAKDdR8A== Date: Fri, 9 Nov 2012 09:05:58 +0000 Message-ID: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: <1352384968.12977.104.camel@hastur.hellion.org.uk> Accept-Language: en-US, de-CH Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.65.122.57] MIME-Version: 1.0 Cc: 599161@bugs.debian.org, keir@xen.org, JBeulich@suse.com, mrsanna1@gmail.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ian Campbell [mailto:ijc@hellion.org.uk] > Sent: Thursday, November 08, 2012 3:29 PM > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE > Cc: mrsanna1@gmail.com; 599161@bugs.debian.org; xen- > devel@lists.xen.org; keir@xen.org; JBeulich@suse.com > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. > > > I think Jan was asking for information relating to the system you saw this on - > - or are you working on the same systems as Mauro? oops, excuse me, here is a description : I have the problem on 4 systems, all with same hardware. the problem occured on each system, 1 time each 2 month in average. since January 2012, I decided to reboot them all monthly, and the clock jump occurred only once in February ... SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 cores, 16 GB MEMORY XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 GNU/Linux CPU processor : 0 vendor_id : AuthenticAMD cpu family : 16 model : 9 model name : AMD Opteron(tm) Processor 6174 stepping : 1 cpu MHz : 3791872.477 cache size : 512 KB fpu : yes fpu_exception : yes cpuid level : 5 wp : yes flags : fpu de tsc msr pae mce cx8 apic mtrr mca cmov pat clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt lm 3dnowext 3dnow constant_tsc rep_good nonstop_tsc extd_apicid amd_dcm pni cx16 popcnt hypervisor lahf_lm cmp_legacy extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch nodeid_msr bogomips : 4400.17 TLB size : 1024 4K pages clflush size : 64 cache_alignment : 64 address sizes : 48 bits physical, 48 bits virtual power management: ts ttp tm stc 100mhzsteps hwpstate > > Of course additional information from Mauro would be useful too in order to > help spotting any patterns. > > > > Philippe, could you clarify again what CPU model(s) this is being > > > observed on (the long times between individual steps forward with > > > this problem perhaps warrant repeating the basics each time, as it's > > > otherwise quite cumbersome to always look up old pieces of > information). > > > > can you provide this information ? > > cat /proc/cpuinfo > > cat /proc/meminfo > > hardware information (manufacturer, model, urls, ...) > > > > Thanks, Philippe > > > > > > > -----Original Message----- > > > From: Jan Beulich [mailto:JBeulich@suse.com] > > > Sent: Thursday, November 08, 2012 10:40 AM > > > To: Simonet Philippe, ITS-OUS-OP-IFM-NW-IPE; Keir Fraser > > > Cc: 599161@bugs.debian.org; mrsanna1@gmail.com; Ian Campbell; xen- > > > devel@lists.xen.org > > > Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock > > > shifts by 50 minutes" bug. > > > > > > >>> On 07.11.12 at 18:40, Keir Fraser wrote: > > > > On 07/11/2012 13:22, "Ian Campbell" wrote: > > > > > > > >>>> (XEN) XXX plt_overflow: plt_now=5ece12d34128 > > > plt_wrap=5ece12d09306 > > > >>>> now=5ece12d16292 old_stamp=35c7c new_stamp=800366a5 > > > >>>> plt_stamp64=15b800366a5 plt_mask=ffffffff tsc=e3839fd23854 > > > >>>> tsc_stamp=e3839fcb0273 > > > >>> > > > >>> (below is the complete xm dmesg output) > > > >>> > > > >>> did that help you ? do you need more info ? > > > >> > > > >> I'll leave this to Keir (who wrote the debugging patch) to answer > > > >> but it looks to me like it should be useful! > > > > > > > > I'm scratching my head. plt_wrap is earlier than plt_now, which > > > > should be impossible. plt_stamp64 oddly has low 32 bits identical > > > > to new_stamp. That seems very very improbable! > > > > > > Is it? My understanding was that plt_stamp64 is just a software > > > extension to the more narrow HW counter, and hence the low plt_mask > > > bits would always be expected to be identical. > > > > > > The plt_wrap < plt_now thing of course is entirely unexplainable to me > too: > > > Considering that plt_scale doesn't change at all post- boot, apart > > > from memory corruption I could only see an memory access ordering > > > problem to be the reason (platform_timer_stamp and/or > > > stime_platform_stamp changing despite platform_timer_lock being > > > held. So maybe taking a snapshot of all three static values involved > > > in the calculation in > > > __read_platform_stime() between acquiring the lock and the first > > > call to __read_platform_stime(), and printing them together with the > > > "live" values in a second > > > printk() after the one your original patch added could rule that out. > > > > > > But the box doesn't even seem to be NUMA (of course it also doesn't > > > help that the log level was kept restricted - hint, hint, Philippe), > > > not does there appear to be any S3 cycle or pCPU bring-up/-down in > between... > > > > > > Philippe, could you clarify again what CPU model(s) this is being > > > observed on (the long times between individual steps forward with > > > this problem perhaps warrant repeating the basics each time, as it's > > > otherwise quite cumbersome to always look up old pieces of > information). > > > > > > > I wonder whether the overflow handling should just be removed, or > > > > made conditional on a command-line parameter, or on the 32-bit > > > > platform counter being at least somewhat likely to overflow before > > > > a softirq occurs -- it seems lots of systems are using 14MHz HPET, > > > > and that gives us a couple of minutes for the plt_overflow softirq > > > > to do its work > > > before overflow occurs. > > > > I think we would notice that outage in other ways. :) > > > > > > Iirc we added this for a good reason - to cover the, however > > > unlikely, event of Xen running for very long without preemption. > > > Presumably most of the cases got fixed meanwhile, and indeed a > > > wraparound time on the order of minutes should make this > > > superfluous, but as the case here shows that code did spot a severe > > > anomaly (whatever that may turn out to be). > > > > > > Also recall that there are HPET implementations around that tick at > > > a much higher frequency than 14MHz. > > > > > > So unless we finally reach the understanding that the code is > > > flawed, I would rather want to keep it. > > > > > > Jan > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:13:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:13:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkeD-0002mL-7t; Fri, 09 Nov 2012 09:13:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkeB-0002lz-P3 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:13:07 +0000 Received: from [85.158.138.51:13485] by server-1.bemta-3.messagelabs.com id F6/0E-12169-E19CC905; Fri, 09 Nov 2012 09:13:02 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352452381!21253984!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15900 invoked from network); 9 Nov 2012 09:13:01 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 9 Nov 2012 09:13:01 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 08:47:58 +0000 Message-Id: <509CD14D02000078000A76C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 08:47:57 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> <509BC65402000078000A73A4@nat28.tlf.novell.com> <563639fd-fc13-49cd-88cf-431244534c2f@default> In-Reply-To: <563639fd-fc13-49cd-88cf-431244534c2f@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 20:16, Dan Magenheimer wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> >>> On 08.11.12 at 11:50, Keir Fraser wrote: >> > On 08/11/2012 09:47, "Jan Beulich" wrote: >> >> The only thing that indeed is - on non-preemptible kernels - done >> >> only on exit to user mode is the eventual entering of the scheduler. >> > >> > That alone may still be an argument for restricting the batch size from the >> > toolstack? >> >> Yes, this clearly prohibits unlimited batches. But not being able to >> schedule should be less restrictive than not being able to run >> softirqs, so I'd still put under question whether the limit shouldn't >> be bumped. > > Wait, please define unlimited. Unlimited as in unlimited. > I think we are in agreement from previous discussion that, to solve > the TOCTOU race, the heap_lock must be held for the entire allocation > for a domain creation. True? That's only one way (and as Keir already responded, not one that we should actually pursue). The point about being fast enough was rather made to allow a decision towards the feasibility of intermediately disabling tmem (or at least allocations originating from it) in particular (I'm not worried about micro-allocations - the tool stack has to provide some slack in its calculations for this anyway). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:13:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:13:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkeD-0002mL-7t; Fri, 09 Nov 2012 09:13:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkeB-0002lz-P3 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:13:07 +0000 Received: from [85.158.138.51:13485] by server-1.bemta-3.messagelabs.com id F6/0E-12169-E19CC905; Fri, 09 Nov 2012 09:13:02 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352452381!21253984!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15900 invoked from network); 9 Nov 2012 09:13:01 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 9 Nov 2012 09:13:01 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 08:47:58 +0000 Message-Id: <509CD14D02000078000A76C7@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 08:47:57 +0000 From: "Jan Beulich" To: "Dan Magenheimer" References: <509B8DC102000078000A72BA@nat28.tlf.novell.com> <509BC65402000078000A73A4@nat28.tlf.novell.com> <563639fd-fc13-49cd-88cf-431244534c2f@default> In-Reply-To: <563639fd-fc13-49cd-88cf-431244534c2f@default> Mime-Version: 1.0 Content-Disposition: inline Cc: TimDeegan , Olaf Hering , Keir Fraser , IanCampbell , Konrad Wilk , George Dunlap , Ian Jackson , George Shuklin , xen-devel@lists.xen.org, DarioFaggioli , Kurt Hackel , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 08.11.12 at 20:16, Dan Magenheimer wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> >>> On 08.11.12 at 11:50, Keir Fraser wrote: >> > On 08/11/2012 09:47, "Jan Beulich" wrote: >> >> The only thing that indeed is - on non-preemptible kernels - done >> >> only on exit to user mode is the eventual entering of the scheduler. >> > >> > That alone may still be an argument for restricting the batch size from the >> > toolstack? >> >> Yes, this clearly prohibits unlimited batches. But not being able to >> schedule should be less restrictive than not being able to run >> softirqs, so I'd still put under question whether the limit shouldn't >> be bumped. > > Wait, please define unlimited. Unlimited as in unlimited. > I think we are in agreement from previous discussion that, to solve > the TOCTOU race, the heap_lock must be held for the entire allocation > for a domain creation. True? That's only one way (and as Keir already responded, not one that we should actually pursue). The point about being fast enough was rather made to allow a decision towards the feasibility of intermediately disabling tmem (or at least allocations originating from it) in particular (I'm not worried about micro-allocations - the tool stack has to provide some slack in its calculations for this anyway). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:17:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:17:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkiC-0003HF-U8; Fri, 09 Nov 2012 09:17:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkiB-0003H1-1D for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:17:15 +0000 Received: from [85.158.139.211:30971] by server-14.bemta-5.messagelabs.com id 14/34-21768-A1ACC905; Fri, 09 Nov 2012 09:17:14 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352452633!19496526!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23788 invoked from network); 9 Nov 2012 09:17:13 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 09:17:13 -0000 X-IronPort-AV: E=Sophos;i="4.80,744,1344211200"; d="scan'208";a="15690467" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 09:16:14 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 09:16:13 +0000 Message-ID: <1352452573.21048.35.camel@dagon.hellion.org.uk> From: Ian Campbell To: Jan Beulich Date: Fri, 9 Nov 2012 09:16:13 +0000 In-Reply-To: <509CD50302000078000A76E4@nat28.tlf.novell.com> References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: xen-devel , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: > >>> On 12.10.12 at 12:28, Ian Campbell wrote: > > The following patch causes fairly large packet loss when transmitting > > from dom0 to the physical network, at least with my tg3 hardware, but I > > assume it can impact anything which uses this interface. > > > > I suspect that the issue is that the compound pages allocated in this > > way are not backed by contiguous mfns and so things fall apart when the > > driver tries to do DMA. > > Has this seen any sort of resolution yet? Despite having forced > NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following > your suggested patch, Ian), and with a different NIC (e1000e > driven) I'm seeing similar packet loss/corruption on transmits, > and only if running a debug hypervisor (in a non-debug one, > MFNs are largely contiguous, so this issue should be observable > there only very rarely). I think Konrad is still looking into the underlying swiotlb issue. If you want to go with the workaround then there is another order>0 to frob in net/core/sock.c #define SKB_FRAG_PAGE_ORDER get_order(32768) which might help. Dave Miller unequivocally rejected this approach so I haven't been pursuing it any further. Perhaps once the swiotlb fix is made it will be possible to make an argument for it based on actual performance numbers. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:17:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:17:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkiC-0003HF-U8; Fri, 09 Nov 2012 09:17:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWkiB-0003H1-1D for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:17:15 +0000 Received: from [85.158.139.211:30971] by server-14.bemta-5.messagelabs.com id 14/34-21768-A1ACC905; Fri, 09 Nov 2012 09:17:14 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352452633!19496526!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23788 invoked from network); 9 Nov 2012 09:17:13 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 09:17:13 -0000 X-IronPort-AV: E=Sophos;i="4.80,744,1344211200"; d="scan'208";a="15690467" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 09:16:14 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 09:16:13 +0000 Message-ID: <1352452573.21048.35.camel@dagon.hellion.org.uk> From: Ian Campbell To: Jan Beulich Date: Fri, 9 Nov 2012 09:16:13 +0000 In-Reply-To: <509CD50302000078000A76E4@nat28.tlf.novell.com> References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: xen-devel , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: > >>> On 12.10.12 at 12:28, Ian Campbell wrote: > > The following patch causes fairly large packet loss when transmitting > > from dom0 to the physical network, at least with my tg3 hardware, but I > > assume it can impact anything which uses this interface. > > > > I suspect that the issue is that the compound pages allocated in this > > way are not backed by contiguous mfns and so things fall apart when the > > driver tries to do DMA. > > Has this seen any sort of resolution yet? Despite having forced > NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following > your suggested patch, Ian), and with a different NIC (e1000e > driven) I'm seeing similar packet loss/corruption on transmits, > and only if running a debug hypervisor (in a non-debug one, > MFNs are largely contiguous, so this issue should be observable > there only very rarely). I think Konrad is still looking into the underlying swiotlb issue. If you want to go with the workaround then there is another order>0 to frob in net/core/sock.c #define SKB_FRAG_PAGE_ORDER get_order(32768) which might help. Dave Miller unequivocally rejected this approach so I haven't been pursuing it any further. Perhaps once the swiotlb fix is made it will be possible to make an argument for it based on actual performance numbers. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:41:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:41:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWl5D-0004jb-7L; Fri, 09 Nov 2012 09:41:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWl5B-0004jP-33 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:41:01 +0000 Received: from [85.158.137.99:43529] by server-4.bemta-3.messagelabs.com id 3B/71-30023-BAFCC905; Fri, 09 Nov 2012 09:40:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352454058!15247167!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18403 invoked from network); 9 Nov 2012 09:40:58 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:40:58 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:40:58 +0000 Message-Id: <509CDDBA02000078000A772C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:40:58 +0000 From: "Jan Beulich" To: "Ian Campbell" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> In-Reply-To: <1352452573.21048.35.camel@dagon.hellion.org.uk> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:16, Ian Campbell wrote: > On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: >> >>> On 12.10.12 at 12:28, Ian Campbell wrote: >> > The following patch causes fairly large packet loss when transmitting >> > from dom0 to the physical network, at least with my tg3 hardware, but I >> > assume it can impact anything which uses this interface. >> > >> > I suspect that the issue is that the compound pages allocated in this >> > way are not backed by contiguous mfns and so things fall apart when the >> > driver tries to do DMA. >> >> Has this seen any sort of resolution yet? Despite having forced >> NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following >> your suggested patch, Ian), and with a different NIC (e1000e >> driven) I'm seeing similar packet loss/corruption on transmits, >> and only if running a debug hypervisor (in a non-debug one, >> MFNs are largely contiguous, so this issue should be observable >> there only very rarely). > > I think Konrad is still looking into the underlying swiotlb issue. > > If you want to go with the workaround then there is another order>0 to > frob in net/core/sock.c > #define SKB_FRAG_PAGE_ORDER get_order(32768) > which might help. Thanks, that indeed helped. And gives me food for thought as well, since this should - if anything at all - be a performance improvement, not a something affecting correctness. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:41:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:41:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWl5D-0004jb-7L; Fri, 09 Nov 2012 09:41:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWl5B-0004jP-33 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:41:01 +0000 Received: from [85.158.137.99:43529] by server-4.bemta-3.messagelabs.com id 3B/71-30023-BAFCC905; Fri, 09 Nov 2012 09:40:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352454058!15247167!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18403 invoked from network); 9 Nov 2012 09:40:58 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:40:58 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:40:58 +0000 Message-Id: <509CDDBA02000078000A772C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:40:58 +0000 From: "Jan Beulich" To: "Ian Campbell" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> In-Reply-To: <1352452573.21048.35.camel@dagon.hellion.org.uk> Mime-Version: 1.0 Content-Disposition: inline Cc: Konrad Rzeszutek Wilk , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:16, Ian Campbell wrote: > On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: >> >>> On 12.10.12 at 12:28, Ian Campbell wrote: >> > The following patch causes fairly large packet loss when transmitting >> > from dom0 to the physical network, at least with my tg3 hardware, but I >> > assume it can impact anything which uses this interface. >> > >> > I suspect that the issue is that the compound pages allocated in this >> > way are not backed by contiguous mfns and so things fall apart when the >> > driver tries to do DMA. >> >> Has this seen any sort of resolution yet? Despite having forced >> NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following >> your suggested patch, Ian), and with a different NIC (e1000e >> driven) I'm seeing similar packet loss/corruption on transmits, >> and only if running a debug hypervisor (in a non-debug one, >> MFNs are largely contiguous, so this issue should be observable >> there only very rarely). > > I think Konrad is still looking into the underlying swiotlb issue. > > If you want to go with the workaround then there is another order>0 to > frob in net/core/sock.c > #define SKB_FRAG_PAGE_ORDER get_order(32768) > which might help. Thanks, that indeed helped. And gives me food for thought as well, since this should - if anything at all - be a performance improvement, not a something affecting correctness. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:47:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:47:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlBV-0005Dc-Mi; Fri, 09 Nov 2012 09:47:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlBU-0005DV-5O for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:47:32 +0000 Received: from [85.158.137.99:11705] by server-13.bemta-3.messagelabs.com id 18/E8-24887-331DC905; Fri, 09 Nov 2012 09:47:31 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352454450!18300482!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17511 invoked from network); 9 Nov 2012 09:47:31 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:47:31 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:47:30 +0000 Message-Id: <509CDF4302000078000A7741@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:47:31 +0000 From: "Jan Beulich" To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:05, wrote: > oops, excuse me, here is a description : I have the problem on 4 systems, > all with same hardware. > the problem occured on each system, 1 time each 2 month in average. since > January 2012, I decided to reboot them all monthly, > and the clock jump occurred only once in February ... > > SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 > cores, 16 GB MEMORY > XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) > (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 > DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 > GNU/Linux > CPU > processor : 0 > vendor_id : AuthenticAMD > cpu family : 16 > model : 9 > model name : AMD Opteron(tm) Processor 6174 Huh - so we have the problem on even different vendor CPUs (as Mauro's are Intel ones). But I take it that you haven't see an event yet with the debugging patch? Plus, what's puzzling me a little too - before the occurrence of the event on Mauro's system, I was under the impression that this requires quite a bit of uptime. Yet the event he observed occurred early on the second day after boot afaict. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:47:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:47:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlBV-0005Dc-Mi; Fri, 09 Nov 2012 09:47:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlBU-0005DV-5O for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:47:32 +0000 Received: from [85.158.137.99:11705] by server-13.bemta-3.messagelabs.com id 18/E8-24887-331DC905; Fri, 09 Nov 2012 09:47:31 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352454450!18300482!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17511 invoked from network); 9 Nov 2012 09:47:31 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-2.tower-217.messagelabs.com with SMTP; 9 Nov 2012 09:47:31 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 09:47:30 +0000 Message-Id: <509CDF4302000078000A7741@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 09:47:31 +0000 From: "Jan Beulich" To: References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, mrsanna1@gmail.com, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:05, wrote: > oops, excuse me, here is a description : I have the problem on 4 systems, > all with same hardware. > the problem occured on each system, 1 time each 2 month in average. since > January 2012, I decided to reboot them all monthly, > and the clock jump occurred only once in February ... > > SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 > cores, 16 GB MEMORY > XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) > (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 > DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 > GNU/Linux > CPU > processor : 0 > vendor_id : AuthenticAMD > cpu family : 16 > model : 9 > model name : AMD Opteron(tm) Processor 6174 Huh - so we have the problem on even different vendor CPUs (as Mauro's are Intel ones). But I take it that you haven't see an event yet with the debugging patch? Plus, what's puzzling me a little too - before the occurrence of the event on Mauro's system, I was under the impression that this requires quite a bit of uptime. Yet the event he observed occurred early on the second day after boot afaict. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:54:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:54:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlHr-0005eU-AT; Fri, 09 Nov 2012 09:54:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlHp-0005eD-Vu for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:54:06 +0000 Received: from [85.158.139.211:34673] by server-14.bemta-5.messagelabs.com id F5/B9-21768-DB2DC905; Fri, 09 Nov 2012 09:54:05 +0000 X-Env-Sender: mrsanna1@gmail.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352454840!15529465!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12536 invoked from network); 9 Nov 2012 09:54:02 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 09:54:02 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so4466726obb.32 for ; Fri, 09 Nov 2012 01:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=eWk/dCWS4u/NJKns9g//V85YWFG2NXAOeMKfIoofJaU=; b=YYBqZFiuXXrX2UXnGkZ/DsXTMR59VJp2YHrbCb4dz+/j3kCudmcoyQLWb4uBNLx9WB Ne4ri1zPgrESx5fnwLasKzVP4jXYr000sRxH4gDGWTZqgsjMd2yOdnooB0lo64OIj6Qj /54vqL1guTweyDdRkLCvG239S0ysPjE8KUA8en7GGSY5GUWGzfDU+ilplJ2skWoYVVpJ hmJoo7/HnArfgXq2v+VM77enxGx14BkQ93fZJuUTidZKt/8iIPwKWuyfoxH0Ey5RgiXD d/dcD4T7A/HfLm9DsdWsu/XpRLd/Yor/9PuQFqOgWpPe1p2DQ1qschlvDUKWclpWD7NF SPRw== MIME-Version: 1.0 Received: by 10.182.52.105 with SMTP id s9mr8129346obo.25.1352454840210; Fri, 09 Nov 2012 01:54:00 -0800 (PST) Received: by 10.76.87.161 with HTTP; Fri, 9 Nov 2012 01:54:00 -0800 (PST) In-Reply-To: <509CDF4302000078000A7741@nat28.tlf.novell.com> References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> <509CDF4302000078000A7741@nat28.tlf.novell.com> Date: Fri, 9 Nov 2012 10:54:00 +0100 Message-ID: From: Mauro To: Jan Beulich Cc: keir@xen.org, Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 9 November 2012 10:47, Jan Beulich wrote: >>>> On 09.11.12 at 10:05, wrote: >> oops, excuse me, here is a description : I have the problem on 4 systems, >> all with same hardware. >> the problem occured on each system, 1 time each 2 month in average. since >> January 2012, I decided to reboot them all monthly, >> and the clock jump occurred only once in February ... >> >> SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 >> cores, 16 GB MEMORY >> XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) >> (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 >> DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 >> GNU/Linux >> CPU >> processor : 0 >> vendor_id : AuthenticAMD >> cpu family : 16 >> model : 9 >> model name : AMD Opteron(tm) Processor 6174 > > Huh - so we have the problem on even different vendor CPUs (as > Mauro's are Intel ones). But I take it that you haven't see an event > yet with the debugging patch? > > Plus, what's puzzling me a little too - before the occurrence of the > event on Mauro's system, I was under the impression that this > requires quite a bit of uptime. Yet the event he observed occurred > early on the second day after boot afaict. Before the patch clock jumps on my systems occurred about once or twice at week. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 09:54:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 09:54:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlHr-0005eU-AT; Fri, 09 Nov 2012 09:54:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlHp-0005eD-Vu for xen-devel@lists.xen.org; Fri, 09 Nov 2012 09:54:06 +0000 Received: from [85.158.139.211:34673] by server-14.bemta-5.messagelabs.com id F5/B9-21768-DB2DC905; Fri, 09 Nov 2012 09:54:05 +0000 X-Env-Sender: mrsanna1@gmail.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1352454840!15529465!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12536 invoked from network); 9 Nov 2012 09:54:02 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-13.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 09:54:02 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so4466726obb.32 for ; Fri, 09 Nov 2012 01:54:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=eWk/dCWS4u/NJKns9g//V85YWFG2NXAOeMKfIoofJaU=; b=YYBqZFiuXXrX2UXnGkZ/DsXTMR59VJp2YHrbCb4dz+/j3kCudmcoyQLWb4uBNLx9WB Ne4ri1zPgrESx5fnwLasKzVP4jXYr000sRxH4gDGWTZqgsjMd2yOdnooB0lo64OIj6Qj /54vqL1guTweyDdRkLCvG239S0ysPjE8KUA8en7GGSY5GUWGzfDU+ilplJ2skWoYVVpJ hmJoo7/HnArfgXq2v+VM77enxGx14BkQ93fZJuUTidZKt/8iIPwKWuyfoxH0Ey5RgiXD d/dcD4T7A/HfLm9DsdWsu/XpRLd/Yor/9PuQFqOgWpPe1p2DQ1qschlvDUKWclpWD7NF SPRw== MIME-Version: 1.0 Received: by 10.182.52.105 with SMTP id s9mr8129346obo.25.1352454840210; Fri, 09 Nov 2012 01:54:00 -0800 (PST) Received: by 10.76.87.161 with HTTP; Fri, 9 Nov 2012 01:54:00 -0800 (PST) In-Reply-To: <509CDF4302000078000A7741@nat28.tlf.novell.com> References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> <509CDF4302000078000A7741@nat28.tlf.novell.com> Date: Fri, 9 Nov 2012 10:54:00 +0100 Message-ID: From: Mauro To: Jan Beulich Cc: keir@xen.org, Philippe.Simonet@swisscom.com, 599161@bugs.debian.org, xen-devel@lists.xen.org, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 9 November 2012 10:47, Jan Beulich wrote: >>>> On 09.11.12 at 10:05, wrote: >> oops, excuse me, here is a description : I have the problem on 4 systems, >> all with same hardware. >> the problem occured on each system, 1 time each 2 month in average. since >> January 2012, I decided to reboot them all monthly, >> and the clock jump occurred only once in February ... >> >> SYSTEM : HP ProLiant DL385 G7, with 2 * AMD Processor 6174 (12 cores) = 24 >> cores, 16 GB MEMORY >> XEN (XEN) Xen version 4.0.1 (Debian 4.0.1-5.4) (ultrotter@debian.org) >> (gcc version 4.4.5 (Debian 4.4.5-8) ) Sat Sep 8 19:15:46 UTC 2012 >> DOM0 Linux 2.6.32-5-xen-amd64 #1 SMP Sun Sep 23 13:49:30 UTC 2012 x86_64 >> GNU/Linux >> CPU >> processor : 0 >> vendor_id : AuthenticAMD >> cpu family : 16 >> model : 9 >> model name : AMD Opteron(tm) Processor 6174 > > Huh - so we have the problem on even different vendor CPUs (as > Mauro's are Intel ones). But I take it that you haven't see an event > yet with the debugging patch? > > Plus, what's puzzling me a little too - before the occurrence of the > event on Mauro's system, I was under the impression that this > requires quite a bit of uptime. Yet the event he observed occurred > early on the second day after boot afaict. Before the patch clock jumps on my systems occurred about once or twice at week. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 10:36:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 10:36:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlwl-000097-Tu; Fri, 09 Nov 2012 10:36:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlwj-00008x-Rw for xen-devel@lists.xen.org; Fri, 09 Nov 2012 10:36:22 +0000 Received: from [85.158.139.211:62238] by server-10.bemta-5.messagelabs.com id A2/11-09257-5ACDC905; Fri, 09 Nov 2012 10:36:21 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352457380!19492075!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 9 Nov 2012 10:36:20 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-206.messagelabs.com with SMTP; 9 Nov 2012 10:36:20 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 10:36:20 +0000 Message-Id: <509CEAB402000078000A7772@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 10:36:20 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> In-Reply-To: <509CDDBA02000078000A772C@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Ian Campbell , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:40, "Jan Beulich" wrote: >>>> On 09.11.12 at 10:16, Ian Campbell wrote: >> On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: >>> >>> On 12.10.12 at 12:28, Ian Campbell wrote: >>> > The following patch causes fairly large packet loss when transmitting >>> > from dom0 to the physical network, at least with my tg3 hardware, but I >>> > assume it can impact anything which uses this interface. >>> > >>> > I suspect that the issue is that the compound pages allocated in this >>> > way are not backed by contiguous mfns and so things fall apart when the >>> > driver tries to do DMA. >>> >>> Has this seen any sort of resolution yet? Despite having forced >>> NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following >>> your suggested patch, Ian), and with a different NIC (e1000e >>> driven) I'm seeing similar packet loss/corruption on transmits, >>> and only if running a debug hypervisor (in a non-debug one, >>> MFNs are largely contiguous, so this issue should be observable >>> there only very rarely). >> >> I think Konrad is still looking into the underlying swiotlb issue. >> >> If you want to go with the workaround then there is another order>0 to >> frob in net/core/sock.c >> #define SKB_FRAG_PAGE_ORDER get_order(32768) >> which might help. > > Thanks, that indeed helped. And gives me food for thought as > well, since this should - if anything at all - be a performance > improvement, not a something affecting correctness. Okay, one problem in the pv-ops case seems pretty obvious: dma_capable() does (potentially cross-page) arithmetic on a dma_addr_t value, ignoring dis-contiguity altogether. Specifically its first use in swiotlb_map_page() and its only use in swiotlb_map_sg_attrs() are problematic. In the forward ported kernels, those two checks are however accompanied by range_needs_mapping() (aka range_straddles_page_boundary()) checks, which ought to take care of this. There is brokenness there with the invocations of gnttab_dma_map_page(), but only if the initial offset is at least PAGE_SIZE - will have to check whether that occurs. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 10:36:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 10:36:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlwl-000097-Tu; Fri, 09 Nov 2012 10:36:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWlwj-00008x-Rw for xen-devel@lists.xen.org; Fri, 09 Nov 2012 10:36:22 +0000 Received: from [85.158.139.211:62238] by server-10.bemta-5.messagelabs.com id A2/11-09257-5ACDC905; Fri, 09 Nov 2012 10:36:21 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352457380!19492075!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 9 Nov 2012 10:36:20 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-8.tower-206.messagelabs.com with SMTP; 9 Nov 2012 10:36:20 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 10:36:20 +0000 Message-Id: <509CEAB402000078000A7772@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 10:36:20 +0000 From: "Jan Beulich" To: "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> In-Reply-To: <509CDDBA02000078000A772C@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Ian Campbell , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 10:40, "Jan Beulich" wrote: >>>> On 09.11.12 at 10:16, Ian Campbell wrote: >> On Fri, 2012-11-09 at 09:03 +0000, Jan Beulich wrote: >>> >>> On 12.10.12 at 12:28, Ian Campbell wrote: >>> > The following patch causes fairly large packet loss when transmitting >>> > from dom0 to the physical network, at least with my tg3 hardware, but I >>> > assume it can impact anything which uses this interface. >>> > >>> > I suspect that the issue is that the compound pages allocated in this >>> > way are not backed by contiguous mfns and so things fall apart when the >>> > driver tries to do DMA. >>> >>> Has this seen any sort of resolution yet? Despite having forced >>> NETDEV_FRAG_PAGE_MAX_ORDER to zero for Xen (following >>> your suggested patch, Ian), and with a different NIC (e1000e >>> driven) I'm seeing similar packet loss/corruption on transmits, >>> and only if running a debug hypervisor (in a non-debug one, >>> MFNs are largely contiguous, so this issue should be observable >>> there only very rarely). >> >> I think Konrad is still looking into the underlying swiotlb issue. >> >> If you want to go with the workaround then there is another order>0 to >> frob in net/core/sock.c >> #define SKB_FRAG_PAGE_ORDER get_order(32768) >> which might help. > > Thanks, that indeed helped. And gives me food for thought as > well, since this should - if anything at all - be a performance > improvement, not a something affecting correctness. Okay, one problem in the pv-ops case seems pretty obvious: dma_capable() does (potentially cross-page) arithmetic on a dma_addr_t value, ignoring dis-contiguity altogether. Specifically its first use in swiotlb_map_page() and its only use in swiotlb_map_sg_attrs() are problematic. In the forward ported kernels, those two checks are however accompanied by range_needs_mapping() (aka range_straddles_page_boundary()) checks, which ought to take care of this. There is brokenness there with the invocations of gnttab_dma_map_page(), but only if the initial offset is at least PAGE_SIZE - will have to check whether that occurs. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 11:44:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 11:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmzz-0002PX-3l; Fri, 09 Nov 2012 11:43:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmzx-0002PP-AO for xen-devel@lists.xen.org; Fri, 09 Nov 2012 11:43:45 +0000 Received: from [85.158.138.51:19358] by server-7.bemta-3.messagelabs.com id 68/37-01713-07CEC905; Fri, 09 Nov 2012 11:43:44 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352461419!21278908!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14423 invoked from network); 9 Nov 2012 11:43:39 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 9 Nov 2012 11:43:39 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 11:43:38 +0000 Message-Id: <509CFA7B02000078000A778C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 11:43:39 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> In-Reply-To: <509CEAB402000078000A7772@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > In the forward ported kernels, those two checks are however > accompanied by range_needs_mapping() (aka > range_straddles_page_boundary()) checks, which ought to > take care of this. There is brokenness there with the invocations > of gnttab_dma_map_page(), but only if the initial offset is at > least PAGE_SIZE - will have to check whether that occurs. And indeed, fixing this also makes the problem go away when the allocation order doesn't get forced to zero. So presumably there's also only that one problem I had pointed out in pv-ops. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 11:44:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 11:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmzz-0002PX-3l; Fri, 09 Nov 2012 11:43:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmzx-0002PP-AO for xen-devel@lists.xen.org; Fri, 09 Nov 2012 11:43:45 +0000 Received: from [85.158.138.51:19358] by server-7.bemta-3.messagelabs.com id 68/37-01713-07CEC905; Fri, 09 Nov 2012 11:43:44 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352461419!21278908!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14423 invoked from network); 9 Nov 2012 11:43:39 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-174.messagelabs.com with SMTP; 9 Nov 2012 11:43:39 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 11:43:38 +0000 Message-Id: <509CFA7B02000078000A778C@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 11:43:39 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Konrad Rzeszutek Wilk" References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> In-Reply-To: <509CEAB402000078000A7772@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > In the forward ported kernels, those two checks are however > accompanied by range_needs_mapping() (aka > range_straddles_page_boundary()) checks, which ought to > take care of this. There is brokenness there with the invocations > of gnttab_dma_map_page(), but only if the initial offset is at > least PAGE_SIZE - will have to check whether that occurs. And indeed, fixing this also makes the problem go away when the allocation order doesn't get forced to zero. So presumably there's also only that one problem I had pointed out in pv-ops. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 12:14:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 12:14:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWnT5-0003jF-6d; Fri, 09 Nov 2012 12:13:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWnT3-0003jA-JO for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 12:13:49 +0000 Received: from [85.158.138.51:63597] by server-9.bemta-3.messagelabs.com id 31/BA-02388-C73FC905; Fri, 09 Nov 2012 12:13:48 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-9.tower-174.messagelabs.com!1352463228!29354865!1 X-Originating-IP: [212.227.17.10] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjEyLjIyNy4xNy4xMCA9PiA3NjQ1MQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13414 invoked from network); 9 Nov 2012 12:13:48 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.10) by server-9.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 12:13:48 -0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MAidD-1TeByY3PWV-00Bmtm; Fri, 09 Nov 2012 13:13:33 +0100 From: Arnd Bergmann To: Stefano Stabellini Date: Thu, 8 Nov 2012 17:45:06 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <20121106175749.GO28327@n2100.arm.linux.org.uk> In-Reply-To: MIME-Version: 1.0 Message-Id: <201211081745.06518.arnd@arndb.de> X-Provags-ID: V02:K0:0ANu/2yDWfdGbxt+Zu0ph/t+O8fCyFxcCNH4NXC18Im GYgFKEKVgKvx+3QuLBo4Qh9Bn5WosP5LToOL13hly2O5uA+c6I C44IPuVv+npn/6I+rxMT6Z7z4LnpQ/iXDZC1hC7ZfVUY8/za/M 7ZZ8YgwHOTH/rLS1+xXJefceuImJbIEPwQEIWFXjdPYwWzzGvg lwhn8N+fDJKqfac2McZC/ojjcfTUvodZwjb9cXnuhy87xoyufy NX+96OyB0KxcWsKpB81Uijvl8N0OnBv/5ZuuAZxaCBlrd7km8u noHWm55UpHSnuLFx8eGpM2ATLiv/BrwZSDnu/cg2Y56cKqrgKk UrfiQ9m0QAAeW7z/otY4= Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thursday 08 November 2012, Stefano Stabellini wrote: > From: Konrad Rzeszutek Wilk > > xen/arm: Fix compile errors when drivers are compiled as modules. > > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk > Signed-off-by: Stefano Stabellini > Acked-by: Arnd Bergmann I guess it's best to merge that through the Xen tree. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 12:14:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 12:14:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWnT5-0003jF-6d; Fri, 09 Nov 2012 12:13:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWnT3-0003jA-JO for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 12:13:49 +0000 Received: from [85.158.138.51:63597] by server-9.bemta-3.messagelabs.com id 31/BA-02388-C73FC905; Fri, 09 Nov 2012 12:13:48 +0000 X-Env-Sender: arnd@arndb.de X-Msg-Ref: server-9.tower-174.messagelabs.com!1352463228!29354865!1 X-Originating-IP: [212.227.17.10] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjEyLjIyNy4xNy4xMCA9PiA3NjQ1MQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13414 invoked from network); 9 Nov 2012 12:13:48 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.17.10) by server-9.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 12:13:48 -0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MAidD-1TeByY3PWV-00Bmtm; Fri, 09 Nov 2012 13:13:33 +0100 From: Arnd Bergmann To: Stefano Stabellini Date: Thu, 8 Nov 2012 17:45:06 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <20121106175749.GO28327@n2100.arm.linux.org.uk> In-Reply-To: MIME-Version: 1.0 Message-Id: <201211081745.06518.arnd@arndb.de> X-Provags-ID: V02:K0:0ANu/2yDWfdGbxt+Zu0ph/t+O8fCyFxcCNH4NXC18Im GYgFKEKVgKvx+3QuLBo4Qh9Bn5WosP5LToOL13hly2O5uA+c6I C44IPuVv+npn/6I+rxMT6Z7z4LnpQ/iXDZC1hC7ZfVUY8/za/M 7ZZ8YgwHOTH/rLS1+xXJefceuImJbIEPwQEIWFXjdPYwWzzGvg lwhn8N+fDJKqfac2McZC/ojjcfTUvodZwjb9cXnuhy87xoyufy NX+96OyB0KxcWsKpB81Uijvl8N0OnBv/5ZuuAZxaCBlrd7km8u noHWm55UpHSnuLFx8eGpM2ATLiv/BrwZSDnu/cg2Y56cKqrgKk UrfiQ9m0QAAeW7z/otY4= Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Konrad Rzeszutek Wilk , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thursday 08 November 2012, Stefano Stabellini wrote: > From: Konrad Rzeszutek Wilk > > xen/arm: Fix compile errors when drivers are compiled as modules. > > We end up with: > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > and this patch exports said function (which is implemented in hypercall.S). > > Signed-off-by: Konrad Rzeszutek Wilk > Signed-off-by: Stefano Stabellini > Acked-by: Arnd Bergmann I guess it's best to merge that through the Xen tree. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 12:53:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 12:53:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWo50-0004XM-8P; Fri, 09 Nov 2012 12:53:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWo4y-0004XF-S1 for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 12:53:01 +0000 Received: from [85.158.139.83:36328] by server-13.bemta-5.messagelabs.com id AF/77-27809-CACFC905; Fri, 09 Nov 2012 12:53:00 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352465577!22308602!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDExMjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28686 invoked from network); 9 Nov 2012 12:52:59 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 12:52:59 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9Cocjb010830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 12:50:39 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9Cobra003397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 12:50:38 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9CoafA023623; Fri, 9 Nov 2012 06:50:37 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 04:50:36 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id CB1444037A; Fri, 9 Nov 2012 07:50:33 -0500 (EST) Date: Fri, 9 Nov 2012 07:50:33 -0500 From: Konrad Rzeszutek Wilk To: Arnd Bergmann Message-ID: <20121109125033.GA30634@phenom.dumpdata.com> References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081745.06518.arnd@arndb.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201211081745.06518.arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Stefano Stabellini , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 05:45:06PM +0000, Arnd Bergmann wrote: > On Thursday 08 November 2012, Stefano Stabellini wrote: > > From: Konrad Rzeszutek Wilk > > > > xen/arm: Fix compile errors when drivers are compiled as modules. > > > > We end up with: > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > Signed-off-by: Konrad Rzeszutek Wilk > > Signed-off-by: Stefano Stabellini > > > > Acked-by: Arnd Bergmann > > I guess it's best to merge that through the Xen tree. applied. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 12:53:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 12:53:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWo50-0004XM-8P; Fri, 09 Nov 2012 12:53:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWo4y-0004XF-S1 for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 12:53:01 +0000 Received: from [85.158.139.83:36328] by server-13.bemta-5.messagelabs.com id AF/77-27809-CACFC905; Fri, 09 Nov 2012 12:53:00 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352465577!22308602!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDExMjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28686 invoked from network); 9 Nov 2012 12:52:59 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 12:52:59 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9Cocjb010830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 12:50:39 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9Cobra003397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 12:50:38 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9CoafA023623; Fri, 9 Nov 2012 06:50:37 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 04:50:36 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id CB1444037A; Fri, 9 Nov 2012 07:50:33 -0500 (EST) Date: Fri, 9 Nov 2012 07:50:33 -0500 From: Konrad Rzeszutek Wilk To: Arnd Bergmann Message-ID: <20121109125033.GA30634@phenom.dumpdata.com> References: <20121106175749.GO28327@n2100.arm.linux.org.uk> <201211081745.06518.arnd@arndb.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201211081745.06518.arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "xen-devel@lists.xensource.com" , Russell King - ARM Linux , Ian Campbell , Stefano Stabellini , "arm@kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [Xen-devel] BUG: ARM build failures due to Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, Nov 08, 2012 at 05:45:06PM +0000, Arnd Bergmann wrote: > On Thursday 08 November 2012, Stefano Stabellini wrote: > > From: Konrad Rzeszutek Wilk > > > > xen/arm: Fix compile errors when drivers are compiled as modules. > > > > We end up with: > > > > ERROR: "HYPERVISOR_event_channel_op" [drivers/xen/xen-gntdev.ko] undefined! > > ERROR: "privcmd_call" [drivers/xen/xen-privcmd.ko] undefined! > > ERROR: "HYPERVISOR_grant_table_op" [drivers/net/xen-netback/xen-netback.ko] undefined! > > > > and this patch exports said function (which is implemented in hypercall.S). > > > > Signed-off-by: Konrad Rzeszutek Wilk > > Signed-off-by: Stefano Stabellini > > > > Acked-by: Arnd Bergmann > > I guess it's best to merge that through the Xen tree. applied. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 13:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWoWG-0004p0-0s; Fri, 09 Nov 2012 13:21:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWoWD-0004os-NR for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:21:10 +0000 Received: from [85.158.138.51:39794] by server-10.bemta-3.messagelabs.com id 63/71-19806-0430D905; Fri, 09 Nov 2012 13:21:04 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1352467263!25338108!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1171 invoked from network); 9 Nov 2012 13:21:03 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-174.messagelabs.com with SMTP; 9 Nov 2012 13:21:03 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 13:21:04 +0000 Message-Id: <509D114F02000078000A77CC@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 13:21:03 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part89B8492F.0__=" Subject: [Xen-devel] [PATCH] linux-2.6.18: make gnttab_dma_map_page() compound page aware X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part89B8492F.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline While this was found to be a problem in practice only on recent kernels, it was nevertheless a mistake from the beginning to not take into consideration compound pages. Signed-off-by: Jan Beulich --- a/arch/i386/kernel/pci-dma-xen.c +++ b/arch/i386/kernel/pci-dma-xen.c @@ -120,7 +120,7 @@ dma_map_sg(struct device *hwdev, struct=20 for (i =3D 0; i < nents; i++ ) { BUG_ON(!sg[i].page); sg[i].dma_address =3D - gnttab_dma_map_page(sg[i].page) + = sg[i].offset; + gnttab_dma_map_page(sg[i].page, sg[i].offse= t); sg[i].dma_length =3D sg[i].length; IOMMU_BUG_ON(address_needs_mapping( hwdev, sg[i].dma_address)); @@ -165,7 +165,7 @@ dma_map_page(struct device *dev, struct=20 dma_addr =3D swiotlb_map_page( dev, page, offset, size, direction); } else { - dma_addr =3D gnttab_dma_map_page(page) + offset; + dma_addr =3D gnttab_dma_map_page(page, offset); IOMMU_BUG_ON(address_needs_mapping(dev, dma_addr)); } =20 @@ -363,8 +363,8 @@ dma_map_single(struct device *dev, void=20 if (swiotlb) { dma =3D swiotlb_map_single(dev, ptr, size, direction); } else { - dma =3D gnttab_dma_map_page(virt_to_page(ptr)) + - offset_in_page(ptr); + dma =3D gnttab_dma_map_page(virt_to_page(ptr), + offset_in_page(ptr)); IOMMU_BUG_ON(range_straddles_page_boundary(__pa(ptr), = size)); IOMMU_BUG_ON(address_needs_mapping(dev, dma)); } --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -1522,7 +1522,7 @@ dma_map_sg(struct device *hwdev, struct=20 for (sg =3D sglist ; filled < nents ; filled++, sg++){ sg->dma_length =3D sg->length; #ifdef CONFIG_XEN - sg->dma_address =3D gnttab_dma_map_page(sg->page) = + sg->offset; + sg->dma_address =3D gnttab_dma_map_page(sg->page, = sg->offset); #else sg->dma_address =3D virt_to_bus(sba_sg_address(sg))= ; #endif --- a/arch/ia64/xen/xen_dma.c +++ b/arch/ia64/xen/xen_dma.c @@ -92,7 +92,7 @@ dma_map_sg(struct device *hwdev, struct=20 int i; =20 for (i =3D 0 ; i < nents ; i++) { - sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page) + = sg[i].offset; + sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page, = sg[i].offset); sg[i].dma_length =3D sg[i].length; =20 IOMMU_BUG_ON(address_needs_mapping(dev, sg[i].dma_address))= ; --- a/drivers/xen/core/gnttab.c +++ b/drivers/xen/core/gnttab.c @@ -705,6 +705,8 @@ void __gnttab_dma_map_page(struct page * if (!is_running_on_xen() || !PageForeign(page)) return; =20 + BUG_ON(PageCompound(page)); + do { seq =3D read_seqbegin(&gnttab_dma_lock); =20 --- a/include/asm-i386/mach-xen/asm/gnttab_dma.h +++ b/include/asm-i386/mach-xen/asm/gnttab_dma.h @@ -21,16 +21,24 @@ #ifndef _ASM_I386_GNTTAB_DMA_H #define _ASM_I386_GNTTAB_DMA_H =20 +#include + static inline int gnttab_dma_local_pfn(struct page *page) { /* Has it become a local MFN? */ return pfn_valid(mfn_to_local_pfn(pfn_to_mfn(page_to_pfn(page)))); } =20 -static inline maddr_t gnttab_dma_map_page(struct page *page) +static inline maddr_t gnttab_dma_map_page(struct page *page, + unsigned long offset) { + unsigned int pgnr =3D offset >> PAGE_SHIFT; + unsigned int order =3D PageCompound(page) ? (long)page[1].lru.prev = : 0; + + BUG_ON(pgnr >> order); __gnttab_dma_map_page(page); - return ((maddr_t)pfn_to_mfn(page_to_pfn(page)) << PAGE_SHIFT); + return ((maddr_t)pfn_to_mfn(page_to_pfn(page) + pgnr) << PAGE_SHIFT= ) + + (offset & ~PAGE_MASK); } =20 static inline void gnttab_dma_unmap_page(maddr_t maddr) --- a/include/asm-ia64/gnttab_dma.h +++ b/include/asm-ia64/gnttab_dma.h @@ -21,6 +21,8 @@ #ifndef _ASM_IA64_GNTTAB_DMA_H #define _ASM_IA64_GNTTAB_DMA_H =20 +#include + static inline int gnttab_dma_local_pfn(struct page *page) { return 0; @@ -32,10 +34,15 @@ __gnttab_dma_map_page(page); } =20 -static inline dma_addr_t gnttab_dma_map_page(struct page *page) +static inline dma_addr_t gnttab_dma_map_page(struct page *page, + unsigned long offset) { + unsigned int pgnr =3D offset >> PAGE_SHIFT; + unsigned int order =3D PageCompound(page) ? (long)page[1].lru.prev = : 0; + + BUG_ON(pgnr >> order); gnttab_dma_use_page(page); - return page_to_bus(page); + return page_to_bus(page + pgnr) + (offset & ~PAGE_MASK); } =20 static inline dma_addr_t gnttab_dma_map_virt(void *ptr) --- a/lib/swiotlb-xen.c +++ b/lib/swiotlb-xen.c @@ -501,8 +501,8 @@ swiotlb_full(struct device *dev, size_t=20 dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr, size_t size, int dir) { - dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr)) + - offset_in_page(ptr); + dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr), + offset_in_page(ptr)); void *map; struct phys_addr buffer; =20 @@ -613,7 +613,7 @@ swiotlb_map_sg(struct device *hwdev, str BUG_ON(dir =3D=3D DMA_NONE); =20 for (i =3D 0; i < nelems; i++, sg++) { - dev_addr =3D gnttab_dma_map_page(sg->page) + sg->offset; + dev_addr =3D gnttab_dma_map_page(sg->page, sg->offset); =20 if (range_straddles_page_boundary(page_to_pseudophys(sg->pa= ge) + sg->offset, sg->length)= @@ -705,7 +705,7 @@ swiotlb_map_page(struct device *hwdev, s dma_addr_t dev_addr; char *map; =20 - dev_addr =3D gnttab_dma_map_page(page) + offset; + dev_addr =3D gnttab_dma_map_page(page, offset); if (address_needs_mapping(hwdev, dev_addr)) { gnttab_dma_unmap_page(dev_addr); buffer.page =3D page; --=__Part89B8492F.0__= Content-Type: text/plain; name="xen-gnttab-map-compound-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-gnttab-map-compound-page.patch" make gnttab_dma_map_page() compound page aware=0A=0AWhile this was found = to be a problem in practice only on recent=0Akernels, it was nevertheless = a mistake from the beginning to not take=0Ainto consideration compound = pages.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/arch/i386/kernel/pci-dma-xen.c=0A+++ b/arch/i386/kernel/pci-dma-xen.c=0A@= @ -120,7 +120,7 @@ dma_map_sg(struct device *hwdev, struct =0A = for (i =3D 0; i < nents; i++ ) {=0A BUG_ON(!sg[i].page)= ;=0A sg[i].dma_address =3D=0A- = gnttab_dma_map_page(sg[i].page) + sg[i].offset;=0A+ = gnttab_dma_map_page(sg[i].page, sg[i].offset);=0A = sg[i].dma_length =3D sg[i].length;=0A IOMMU_BUG_ON(addres= s_needs_mapping(=0A hwdev, sg[i].dma_address));= =0A@@ -165,7 +165,7 @@ dma_map_page(struct device *dev, struct =0A = dma_addr =3D swiotlb_map_page(=0A dev, page, offset, = size, direction);=0A } else {=0A- dma_addr =3D gnttab_dma_map= _page(page) + offset;=0A+ dma_addr =3D gnttab_dma_map_page(pa= ge, offset);=0A IOMMU_BUG_ON(address_needs_mapping(dev, = dma_addr));=0A }=0A =0A@@ -363,8 +363,8 @@ dma_map_single(struct device = *dev, void =0A if (swiotlb) {=0A dma =3D swiotlb_map_single(= dev, ptr, size, direction);=0A } else {=0A- dma =3D gnttab_dma_= map_page(virt_to_page(ptr)) +=0A- offset_in_page(ptr);= =0A+ dma =3D gnttab_dma_map_page(virt_to_page(ptr),=0A+ = offset_in_page(ptr));=0A IOMMU_BUG_O= N(range_straddles_page_boundary(__pa(ptr), size));=0A IOMMU_BUG_O= N(address_needs_mapping(dev, dma));=0A }=0A--- a/arch/ia64/hp/common/sba_i= ommu.c=0A+++ b/arch/ia64/hp/common/sba_iommu.c=0A@@ -1522,7 +1522,7 @@ = dma_map_sg(struct device *hwdev, struct =0A for (sg =3D sglist = ; filled < nents ; filled++, sg++){=0A sg->dma_length =3D = sg->length;=0A #ifdef CONFIG_XEN=0A- sg->dma_address = =3D gnttab_dma_map_page(sg->page) + sg->offset;=0A+ = sg->dma_address =3D gnttab_dma_map_page(sg->page, sg->offset);=0A #else=0A = sg->dma_address =3D virt_to_bus(sba_sg_address(sg))= ;=0A #endif=0A--- a/arch/ia64/xen/xen_dma.c=0A+++ b/arch/ia64/xen/xen_dma.c= =0A@@ -92,7 +92,7 @@ dma_map_sg(struct device *hwdev, struct =0A = int i;=0A =0A for (i =3D 0 ; i < nents ; i++) {=0A- sg[i].dma_a= ddress =3D gnttab_dma_map_page(sg[i].page) + sg[i].offset;=0A+ = sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page, sg[i].offset);=0A = sg[i].dma_length =3D sg[i].length;=0A =0A IOMMU_BUG_O= N(address_needs_mapping(dev, sg[i].dma_address));=0A--- a/drivers/xen/core/= gnttab.c=0A+++ b/drivers/xen/core/gnttab.c=0A@@ -705,6 +705,8 @@ void = __gnttab_dma_map_page(struct page *=0A if (!is_running_on_xen() || = !PageForeign(page))=0A return;=0A =0A+ BUG_ON(PageCompound(page));= =0A+=0A do {=0A seq =3D read_seqbegin(&gnttab_dma_l= ock);=0A =0A--- a/include/asm-i386/mach-xen/asm/gnttab_dma.h=0A+++ = b/include/asm-i386/mach-xen/asm/gnttab_dma.h=0A@@ -21,16 +21,24 @@=0A = #ifndef _ASM_I386_GNTTAB_DMA_H=0A #define _ASM_I386_GNTTAB_DMA_H=0A = =0A+#include =0A+=0A static inline int gnttab_dma_local_pfn(stru= ct page *page)=0A {=0A /* Has it become a local MFN? */=0A return = pfn_valid(mfn_to_local_pfn(pfn_to_mfn(page_to_pfn(page))));=0A }=0A = =0A-static inline maddr_t gnttab_dma_map_page(struct page *page)=0A+static = inline maddr_t gnttab_dma_map_page(struct page *page,=0A+ = unsigned long offset)=0A {=0A+ unsigned int pgnr = =3D offset >> PAGE_SHIFT;=0A+ unsigned int order =3D PageCompound(page) = ? (long)page[1].lru.prev : 0;=0A+=0A+ BUG_ON(pgnr >> order);=0A = __gnttab_dma_map_page(page);=0A- return ((maddr_t)pfn_to_mfn(page_to= _pfn(page)) << PAGE_SHIFT);=0A+ return ((maddr_t)pfn_to_mfn(page_to_pfn(pag= e) + pgnr) << PAGE_SHIFT)=0A+ + (offset & ~PAGE_MASK);=0A }=0A = =0A static inline void gnttab_dma_unmap_page(maddr_t maddr)=0A--- = a/include/asm-ia64/gnttab_dma.h=0A+++ b/include/asm-ia64/gnttab_dma.h=0A@@ = -21,6 +21,8 @@=0A #ifndef _ASM_IA64_GNTTAB_DMA_H=0A #define _ASM_IA64_GNTTA= B_DMA_H=0A =0A+#include =0A+=0A static inline int gnttab_dma_loc= al_pfn(struct page *page)=0A {=0A return 0;=0A@@ -32,10 +34,15 @@=0A = __gnttab_dma_map_page(page);=0A }=0A =0A-static inline dma_addr_t = gnttab_dma_map_page(struct page *page)=0A+static inline dma_addr_t = gnttab_dma_map_page(struct page *page,=0A+ = unsigned long offset)=0A {=0A+ unsigned int pgnr =3D offset >> = PAGE_SHIFT;=0A+ unsigned int order =3D PageCompound(page) ? (long)page[1].l= ru.prev : 0;=0A+=0A+ BUG_ON(pgnr >> order);=0A gnttab_dma_use_page= (page);=0A- return page_to_bus(page);=0A+ return page_to_bus(page + = pgnr) + (offset & ~PAGE_MASK);=0A }=0A =0A static inline dma_addr_t = gnttab_dma_map_virt(void *ptr)=0A--- a/lib/swiotlb-xen.c=0A+++ b/lib/swiotl= b-xen.c=0A@@ -501,8 +501,8 @@ swiotlb_full(struct device *dev, size_t =0A = dma_addr_t=0A swiotlb_map_single(struct device *hwdev, void *ptr, size_t = size, int dir)=0A {=0A- dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to= _page(ptr)) +=0A- offset_in_page(ptr);=0A+ = dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr),=0A+ = offset_in_page(ptr));=0A void = *map;=0A struct phys_addr buffer;=0A =0A@@ -613,7 +613,7 @@ = swiotlb_map_sg(struct device *hwdev, str=0A BUG_ON(dir =3D=3D = DMA_NONE);=0A =0A for (i =3D 0; i < nelems; i++, sg++) {=0A- = dev_addr =3D gnttab_dma_map_page(sg->page) + sg->offset;=0A+ = dev_addr =3D gnttab_dma_map_page(sg->page, sg->offset);=0A =0A if = (range_straddles_page_boundary(page_to_pseudophys(sg->page)=0A = + sg->offset, sg->length)=0A@@ -705,7 +705,7 @@ = swiotlb_map_page(struct device *hwdev, s=0A dma_addr_t dev_addr;=0A = char *map;=0A =0A- dev_addr =3D gnttab_dma_map_page(page) + offset;=0A= + dev_addr =3D gnttab_dma_map_page(page, offset);=0A if = (address_needs_mapping(hwdev, dev_addr)) {=0A gnttab_dma_unmap_pa= ge(dev_addr);=0A buffer.page =3D page;=0A --=__Part89B8492F.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part89B8492F.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWoWG-0004p0-0s; Fri, 09 Nov 2012 13:21:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWoWD-0004os-NR for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:21:10 +0000 Received: from [85.158.138.51:39794] by server-10.bemta-3.messagelabs.com id 63/71-19806-0430D905; Fri, 09 Nov 2012 13:21:04 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-174.messagelabs.com!1352467263!25338108!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1171 invoked from network); 9 Nov 2012 13:21:03 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-10.tower-174.messagelabs.com with SMTP; 9 Nov 2012 13:21:03 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 13:21:04 +0000 Message-Id: <509D114F02000078000A77CC@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 13:21:03 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part89B8492F.0__=" Subject: [Xen-devel] [PATCH] linux-2.6.18: make gnttab_dma_map_page() compound page aware X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part89B8492F.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline While this was found to be a problem in practice only on recent kernels, it was nevertheless a mistake from the beginning to not take into consideration compound pages. Signed-off-by: Jan Beulich --- a/arch/i386/kernel/pci-dma-xen.c +++ b/arch/i386/kernel/pci-dma-xen.c @@ -120,7 +120,7 @@ dma_map_sg(struct device *hwdev, struct=20 for (i =3D 0; i < nents; i++ ) { BUG_ON(!sg[i].page); sg[i].dma_address =3D - gnttab_dma_map_page(sg[i].page) + = sg[i].offset; + gnttab_dma_map_page(sg[i].page, sg[i].offse= t); sg[i].dma_length =3D sg[i].length; IOMMU_BUG_ON(address_needs_mapping( hwdev, sg[i].dma_address)); @@ -165,7 +165,7 @@ dma_map_page(struct device *dev, struct=20 dma_addr =3D swiotlb_map_page( dev, page, offset, size, direction); } else { - dma_addr =3D gnttab_dma_map_page(page) + offset; + dma_addr =3D gnttab_dma_map_page(page, offset); IOMMU_BUG_ON(address_needs_mapping(dev, dma_addr)); } =20 @@ -363,8 +363,8 @@ dma_map_single(struct device *dev, void=20 if (swiotlb) { dma =3D swiotlb_map_single(dev, ptr, size, direction); } else { - dma =3D gnttab_dma_map_page(virt_to_page(ptr)) + - offset_in_page(ptr); + dma =3D gnttab_dma_map_page(virt_to_page(ptr), + offset_in_page(ptr)); IOMMU_BUG_ON(range_straddles_page_boundary(__pa(ptr), = size)); IOMMU_BUG_ON(address_needs_mapping(dev, dma)); } --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -1522,7 +1522,7 @@ dma_map_sg(struct device *hwdev, struct=20 for (sg =3D sglist ; filled < nents ; filled++, sg++){ sg->dma_length =3D sg->length; #ifdef CONFIG_XEN - sg->dma_address =3D gnttab_dma_map_page(sg->page) = + sg->offset; + sg->dma_address =3D gnttab_dma_map_page(sg->page, = sg->offset); #else sg->dma_address =3D virt_to_bus(sba_sg_address(sg))= ; #endif --- a/arch/ia64/xen/xen_dma.c +++ b/arch/ia64/xen/xen_dma.c @@ -92,7 +92,7 @@ dma_map_sg(struct device *hwdev, struct=20 int i; =20 for (i =3D 0 ; i < nents ; i++) { - sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page) + = sg[i].offset; + sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page, = sg[i].offset); sg[i].dma_length =3D sg[i].length; =20 IOMMU_BUG_ON(address_needs_mapping(dev, sg[i].dma_address))= ; --- a/drivers/xen/core/gnttab.c +++ b/drivers/xen/core/gnttab.c @@ -705,6 +705,8 @@ void __gnttab_dma_map_page(struct page * if (!is_running_on_xen() || !PageForeign(page)) return; =20 + BUG_ON(PageCompound(page)); + do { seq =3D read_seqbegin(&gnttab_dma_lock); =20 --- a/include/asm-i386/mach-xen/asm/gnttab_dma.h +++ b/include/asm-i386/mach-xen/asm/gnttab_dma.h @@ -21,16 +21,24 @@ #ifndef _ASM_I386_GNTTAB_DMA_H #define _ASM_I386_GNTTAB_DMA_H =20 +#include + static inline int gnttab_dma_local_pfn(struct page *page) { /* Has it become a local MFN? */ return pfn_valid(mfn_to_local_pfn(pfn_to_mfn(page_to_pfn(page)))); } =20 -static inline maddr_t gnttab_dma_map_page(struct page *page) +static inline maddr_t gnttab_dma_map_page(struct page *page, + unsigned long offset) { + unsigned int pgnr =3D offset >> PAGE_SHIFT; + unsigned int order =3D PageCompound(page) ? (long)page[1].lru.prev = : 0; + + BUG_ON(pgnr >> order); __gnttab_dma_map_page(page); - return ((maddr_t)pfn_to_mfn(page_to_pfn(page)) << PAGE_SHIFT); + return ((maddr_t)pfn_to_mfn(page_to_pfn(page) + pgnr) << PAGE_SHIFT= ) + + (offset & ~PAGE_MASK); } =20 static inline void gnttab_dma_unmap_page(maddr_t maddr) --- a/include/asm-ia64/gnttab_dma.h +++ b/include/asm-ia64/gnttab_dma.h @@ -21,6 +21,8 @@ #ifndef _ASM_IA64_GNTTAB_DMA_H #define _ASM_IA64_GNTTAB_DMA_H =20 +#include + static inline int gnttab_dma_local_pfn(struct page *page) { return 0; @@ -32,10 +34,15 @@ __gnttab_dma_map_page(page); } =20 -static inline dma_addr_t gnttab_dma_map_page(struct page *page) +static inline dma_addr_t gnttab_dma_map_page(struct page *page, + unsigned long offset) { + unsigned int pgnr =3D offset >> PAGE_SHIFT; + unsigned int order =3D PageCompound(page) ? (long)page[1].lru.prev = : 0; + + BUG_ON(pgnr >> order); gnttab_dma_use_page(page); - return page_to_bus(page); + return page_to_bus(page + pgnr) + (offset & ~PAGE_MASK); } =20 static inline dma_addr_t gnttab_dma_map_virt(void *ptr) --- a/lib/swiotlb-xen.c +++ b/lib/swiotlb-xen.c @@ -501,8 +501,8 @@ swiotlb_full(struct device *dev, size_t=20 dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr, size_t size, int dir) { - dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr)) + - offset_in_page(ptr); + dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr), + offset_in_page(ptr)); void *map; struct phys_addr buffer; =20 @@ -613,7 +613,7 @@ swiotlb_map_sg(struct device *hwdev, str BUG_ON(dir =3D=3D DMA_NONE); =20 for (i =3D 0; i < nelems; i++, sg++) { - dev_addr =3D gnttab_dma_map_page(sg->page) + sg->offset; + dev_addr =3D gnttab_dma_map_page(sg->page, sg->offset); =20 if (range_straddles_page_boundary(page_to_pseudophys(sg->pa= ge) + sg->offset, sg->length)= @@ -705,7 +705,7 @@ swiotlb_map_page(struct device *hwdev, s dma_addr_t dev_addr; char *map; =20 - dev_addr =3D gnttab_dma_map_page(page) + offset; + dev_addr =3D gnttab_dma_map_page(page, offset); if (address_needs_mapping(hwdev, dev_addr)) { gnttab_dma_unmap_page(dev_addr); buffer.page =3D page; --=__Part89B8492F.0__= Content-Type: text/plain; name="xen-gnttab-map-compound-page.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-gnttab-map-compound-page.patch" make gnttab_dma_map_page() compound page aware=0A=0AWhile this was found = to be a problem in practice only on recent=0Akernels, it was nevertheless = a mistake from the beginning to not take=0Ainto consideration compound = pages.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/arch/i386/kernel/pci-dma-xen.c=0A+++ b/arch/i386/kernel/pci-dma-xen.c=0A@= @ -120,7 +120,7 @@ dma_map_sg(struct device *hwdev, struct =0A = for (i =3D 0; i < nents; i++ ) {=0A BUG_ON(!sg[i].page)= ;=0A sg[i].dma_address =3D=0A- = gnttab_dma_map_page(sg[i].page) + sg[i].offset;=0A+ = gnttab_dma_map_page(sg[i].page, sg[i].offset);=0A = sg[i].dma_length =3D sg[i].length;=0A IOMMU_BUG_ON(addres= s_needs_mapping(=0A hwdev, sg[i].dma_address));= =0A@@ -165,7 +165,7 @@ dma_map_page(struct device *dev, struct =0A = dma_addr =3D swiotlb_map_page(=0A dev, page, offset, = size, direction);=0A } else {=0A- dma_addr =3D gnttab_dma_map= _page(page) + offset;=0A+ dma_addr =3D gnttab_dma_map_page(pa= ge, offset);=0A IOMMU_BUG_ON(address_needs_mapping(dev, = dma_addr));=0A }=0A =0A@@ -363,8 +363,8 @@ dma_map_single(struct device = *dev, void =0A if (swiotlb) {=0A dma =3D swiotlb_map_single(= dev, ptr, size, direction);=0A } else {=0A- dma =3D gnttab_dma_= map_page(virt_to_page(ptr)) +=0A- offset_in_page(ptr);= =0A+ dma =3D gnttab_dma_map_page(virt_to_page(ptr),=0A+ = offset_in_page(ptr));=0A IOMMU_BUG_O= N(range_straddles_page_boundary(__pa(ptr), size));=0A IOMMU_BUG_O= N(address_needs_mapping(dev, dma));=0A }=0A--- a/arch/ia64/hp/common/sba_i= ommu.c=0A+++ b/arch/ia64/hp/common/sba_iommu.c=0A@@ -1522,7 +1522,7 @@ = dma_map_sg(struct device *hwdev, struct =0A for (sg =3D sglist = ; filled < nents ; filled++, sg++){=0A sg->dma_length =3D = sg->length;=0A #ifdef CONFIG_XEN=0A- sg->dma_address = =3D gnttab_dma_map_page(sg->page) + sg->offset;=0A+ = sg->dma_address =3D gnttab_dma_map_page(sg->page, sg->offset);=0A #else=0A = sg->dma_address =3D virt_to_bus(sba_sg_address(sg))= ;=0A #endif=0A--- a/arch/ia64/xen/xen_dma.c=0A+++ b/arch/ia64/xen/xen_dma.c= =0A@@ -92,7 +92,7 @@ dma_map_sg(struct device *hwdev, struct =0A = int i;=0A =0A for (i =3D 0 ; i < nents ; i++) {=0A- sg[i].dma_a= ddress =3D gnttab_dma_map_page(sg[i].page) + sg[i].offset;=0A+ = sg[i].dma_address =3D gnttab_dma_map_page(sg[i].page, sg[i].offset);=0A = sg[i].dma_length =3D sg[i].length;=0A =0A IOMMU_BUG_O= N(address_needs_mapping(dev, sg[i].dma_address));=0A--- a/drivers/xen/core/= gnttab.c=0A+++ b/drivers/xen/core/gnttab.c=0A@@ -705,6 +705,8 @@ void = __gnttab_dma_map_page(struct page *=0A if (!is_running_on_xen() || = !PageForeign(page))=0A return;=0A =0A+ BUG_ON(PageCompound(page));= =0A+=0A do {=0A seq =3D read_seqbegin(&gnttab_dma_l= ock);=0A =0A--- a/include/asm-i386/mach-xen/asm/gnttab_dma.h=0A+++ = b/include/asm-i386/mach-xen/asm/gnttab_dma.h=0A@@ -21,16 +21,24 @@=0A = #ifndef _ASM_I386_GNTTAB_DMA_H=0A #define _ASM_I386_GNTTAB_DMA_H=0A = =0A+#include =0A+=0A static inline int gnttab_dma_local_pfn(stru= ct page *page)=0A {=0A /* Has it become a local MFN? */=0A return = pfn_valid(mfn_to_local_pfn(pfn_to_mfn(page_to_pfn(page))));=0A }=0A = =0A-static inline maddr_t gnttab_dma_map_page(struct page *page)=0A+static = inline maddr_t gnttab_dma_map_page(struct page *page,=0A+ = unsigned long offset)=0A {=0A+ unsigned int pgnr = =3D offset >> PAGE_SHIFT;=0A+ unsigned int order =3D PageCompound(page) = ? (long)page[1].lru.prev : 0;=0A+=0A+ BUG_ON(pgnr >> order);=0A = __gnttab_dma_map_page(page);=0A- return ((maddr_t)pfn_to_mfn(page_to= _pfn(page)) << PAGE_SHIFT);=0A+ return ((maddr_t)pfn_to_mfn(page_to_pfn(pag= e) + pgnr) << PAGE_SHIFT)=0A+ + (offset & ~PAGE_MASK);=0A }=0A = =0A static inline void gnttab_dma_unmap_page(maddr_t maddr)=0A--- = a/include/asm-ia64/gnttab_dma.h=0A+++ b/include/asm-ia64/gnttab_dma.h=0A@@ = -21,6 +21,8 @@=0A #ifndef _ASM_IA64_GNTTAB_DMA_H=0A #define _ASM_IA64_GNTTA= B_DMA_H=0A =0A+#include =0A+=0A static inline int gnttab_dma_loc= al_pfn(struct page *page)=0A {=0A return 0;=0A@@ -32,10 +34,15 @@=0A = __gnttab_dma_map_page(page);=0A }=0A =0A-static inline dma_addr_t = gnttab_dma_map_page(struct page *page)=0A+static inline dma_addr_t = gnttab_dma_map_page(struct page *page,=0A+ = unsigned long offset)=0A {=0A+ unsigned int pgnr =3D offset >> = PAGE_SHIFT;=0A+ unsigned int order =3D PageCompound(page) ? (long)page[1].l= ru.prev : 0;=0A+=0A+ BUG_ON(pgnr >> order);=0A gnttab_dma_use_page= (page);=0A- return page_to_bus(page);=0A+ return page_to_bus(page + = pgnr) + (offset & ~PAGE_MASK);=0A }=0A =0A static inline dma_addr_t = gnttab_dma_map_virt(void *ptr)=0A--- a/lib/swiotlb-xen.c=0A+++ b/lib/swiotl= b-xen.c=0A@@ -501,8 +501,8 @@ swiotlb_full(struct device *dev, size_t =0A = dma_addr_t=0A swiotlb_map_single(struct device *hwdev, void *ptr, size_t = size, int dir)=0A {=0A- dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to= _page(ptr)) +=0A- offset_in_page(ptr);=0A+ = dma_addr_t dev_addr =3D gnttab_dma_map_page(virt_to_page(ptr),=0A+ = offset_in_page(ptr));=0A void = *map;=0A struct phys_addr buffer;=0A =0A@@ -613,7 +613,7 @@ = swiotlb_map_sg(struct device *hwdev, str=0A BUG_ON(dir =3D=3D = DMA_NONE);=0A =0A for (i =3D 0; i < nelems; i++, sg++) {=0A- = dev_addr =3D gnttab_dma_map_page(sg->page) + sg->offset;=0A+ = dev_addr =3D gnttab_dma_map_page(sg->page, sg->offset);=0A =0A if = (range_straddles_page_boundary(page_to_pseudophys(sg->page)=0A = + sg->offset, sg->length)=0A@@ -705,7 +705,7 @@ = swiotlb_map_page(struct device *hwdev, s=0A dma_addr_t dev_addr;=0A = char *map;=0A =0A- dev_addr =3D gnttab_dma_map_page(page) + offset;=0A= + dev_addr =3D gnttab_dma_map_page(page, offset);=0A if = (address_needs_mapping(hwdev, dev_addr)) {=0A gnttab_dma_unmap_pa= ge(dev_addr);=0A buffer.page =3D page;=0A --=__Part89B8492F.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part89B8492F.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWod9-0004xp-Sx; Fri, 09 Nov 2012 13:28:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWod8-0004xj-FM for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:28:18 +0000 Received: from [193.109.254.147:5896] by server-5.bemta-14.messagelabs.com id B7/12-10257-1F40D905; Fri, 09 Nov 2012 13:28:17 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352467692!8585318!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16592 invoked from network); 9 Nov 2012 13:28:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-27.messagelabs.com with SMTP; 9 Nov 2012 13:28:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 13:28:12 +0000 Message-Id: <509D12FC02000078000A77E4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 13:28:12 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part5D6C9DFC.0__=" Subject: [Xen-devel] [PATCH] implement vmap() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part5D6C9DFC.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline ... and use it as basis for a proper ioremap() on x86. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -5460,6 +5561,32 @@ void __set_fixmap( map_pages_to_xen(fix_to_virt(idx), mfn, 1, flags); } =20 +void *__init arch_vmap_virt_end(void) +{ + return (void *)fix_to_virt(__end_of_fixed_addresses); +} + +void __iomem *ioremap(paddr_t pa, size_t len) +{ + unsigned long pfn =3D PFN_DOWN(pa); + void *va; + + WARN_ON(page_is_ram_type(pfn, RAM_TYPE_CONVENTIONAL)); + + /* The low first Mb is always mapped. */ + if ( !((pa + len - 1) >> 20) ) + va =3D __va(pa); + else + { + unsigned int offs =3D pa & (PAGE_SIZE - 1); + unsigned int nr =3D PFN_UP(offs + len); + + va =3D __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + } + + return (void __force __iomem *)va; +} + #ifdef MEMORY_GUARD =20 void memguard_init(void) --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1104,6 +1104,7 @@ void __init __start_xen(unsigned long mb end_boot_allocator(); system_state =3D SYS_STATE_boot; =20 + vm_init(); vesa_init(); =20 softirq_init(); --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -36,6 +36,7 @@ obj-y +=3D time.o obj-y +=3D timer.o obj-y +=3D trace.o obj-y +=3D version.o +obj-y +=3D vmap.o obj-y +=3D vsprintf.o obj-y +=3D wait.o obj-y +=3D xmalloc_tlsf.o --- /dev/null +++ b/xen/common/vmap.c @@ -0,0 +1,204 @@ +#ifdef VMAP_VIRT_START +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static DEFINE_SPINLOCK(vm_lock); +static void *__read_mostly vm_base; +#define vm_bitmap ((unsigned long *)vm_base) +/* highest allocated bit in the bitmap */ +static unsigned int __read_mostly vm_top; +/* total number of bits in the bitmap */ +static unsigned int __read_mostly vm_end; +/* lowest known clear bit in the bitmap */ +static unsigned int vm_low; + +void __init vm_init(void) +{ + unsigned int i, nr; + unsigned long va; + + vm_base =3D (void *)VMAP_VIRT_START; + vm_end =3D PFN_DOWN(arch_vmap_virt_end() - vm_base); + vm_low =3D PFN_UP((vm_end + 7) / 8); + nr =3D PFN_UP((vm_low + 7) / 8); + vm_top =3D nr * PAGE_SIZE * 8; + + for ( i =3D 0, va =3D (unsigned long)vm_bitmap; i < nr; ++i, va +=3D = PAGE_SIZE ) + { + struct page_info *pg =3D alloc_domheap_page(NULL, 0); + + map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR); + clear_page((void *)va); + } + bitmap_fill(vm_bitmap, vm_low); + + /* Populate page tables for the bitmap if necessary. */ + map_pages_to_xen(va, 0, vm_low - nr, MAP_SMALL_PAGES); +} + +void *vm_alloc(unsigned int nr, unsigned int align) +{ + unsigned int start, bit; + + if ( !align ) + align =3D 1; + else if ( align & (align - 1) ) + align &=3D -align; + + spin_lock(&vm_lock); + for ( ; ; ) + { + struct page_info *pg; + + ASSERT(!test_bit(vm_low, vm_bitmap)); + for ( start =3D vm_low; ; ) + { + bit =3D find_next_bit(vm_bitmap, vm_top, start + 1); + if ( bit > vm_top ) + bit =3D vm_top; + /* + * Note that this skips the first bit, making the + * corresponding page a guard one. + */ + start =3D (start + align) & ~(align - 1); + if ( start + nr <=3D bit ) + break; + start =3D bit < vm_top ? + find_next_zero_bit(vm_bitmap, vm_top, bit + 1) : bit; + if ( start >=3D vm_top ) + break; + } + + if ( start < vm_top ) + break; + + spin_unlock(&vm_lock); + + if ( vm_top >=3D vm_end ) + return NULL; + + pg =3D alloc_domheap_page(NULL, 0); + if ( !pg ) + return NULL; + + spin_lock(&vm_lock); + + if ( start >=3D vm_top ) + { + unsigned long va =3D (unsigned long)vm_bitmap + vm_top / 8; + + if ( !map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR= ) ) + { + clear_page((void *)va); + vm_top +=3D PAGE_SIZE * 8; + if ( vm_top > vm_end ) + vm_top =3D vm_end; + continue; + } + } + + free_domheap_page(pg); + + if ( start >=3D vm_top ) + { + spin_unlock(&vm_lock); + return NULL; + } + } + + for ( bit =3D start; bit < start + nr; ++bit ) + __set_bit(bit, vm_bitmap); + if ( start <=3D vm_low + 2 ) + vm_low =3D bit; + spin_unlock(&vm_lock); + + return vm_base + start * PAGE_SIZE; +} + +static unsigned int vm_index(const void *va) +{ + unsigned long addr =3D (unsigned long)va & ~(PAGE_SIZE - 1); + unsigned int idx; + + if ( addr < VMAP_VIRT_START + (vm_end / 8) || + addr >=3D VMAP_VIRT_START + vm_top * PAGE_SIZE ) + return 0; + + idx =3D PFN_DOWN(va - vm_base); + return !test_bit(idx - 1, vm_bitmap) && + test_bit(idx, vm_bitmap) ? idx : 0; +} + +static unsigned int vm_size(const void *va) +{ + unsigned int start =3D vm_index(va), end; + + if ( !start ) + return 0; + + end =3D find_next_zero_bit(vm_bitmap, vm_top, start + 1); + + return min(end, vm_top) - start; +} + +void vm_free(const void *va) +{ + unsigned int bit =3D vm_index(va); + + if ( !bit ) + { + WARN_ON(va !=3D NULL); + return; + } + + spin_lock(&vm_lock); + if ( bit < vm_low ) + { + vm_low =3D bit - 1; + while ( !test_bit(vm_low - 1, vm_bitmap) ) + --vm_low; + } + while ( __test_and_clear_bit(bit, vm_bitmap) ) + if ( ++bit =3D=3D vm_top ) + break; + spin_unlock(&vm_lock); +} + +void *__vmap(const unsigned long *mfn, unsigned int granularity, + unsigned int nr, unsigned int align, unsigned int flags) +{ + void *va =3D vm_alloc(nr * granularity, align); + unsigned long cur =3D (unsigned long)va; + + for ( ; va && nr--; ++mfn, cur +=3D PAGE_SIZE * granularity ) + { + if ( map_pages_to_xen(cur, *mfn, granularity, flags) ) + { + vunmap(va); + va =3D NULL; + } + } + + return va; +} + +void *vmap(const unsigned long *mfn, unsigned int nr) +{ + return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR); +} + +void vunmap(const void *va) +{ + unsigned long addr =3D (unsigned long)va; + + destroy_xen_mappings(addr, addr + PAGE_SIZE * vm_size(va)); + vm_free(va); +} +#endif --- a/xen/drivers/acpi/apei/erst.c +++ b/xen/drivers/acpi/apei/erst.c @@ -247,9 +247,6 @@ static int erst_exec_move_data(struct ap { int rc; u64 offset; -#ifdef CONFIG_X86 - enum fixed_addresses idx; -#endif void *src, *dst; =20 /* ioremap does not work in interrupt context */ @@ -263,39 +260,11 @@ static int erst_exec_move_data(struct ap if (rc) return rc; =20 -#ifdef CONFIG_X86 - switch (ctx->var2) { - case 0: - return 0; - case 1 ... PAGE_SIZE: - break; - default: - printk(KERN_WARNING - "MOVE_DATA cannot be used for %#"PRIx64" bytes of = data\n", - ctx->var2); - return -EOPNOTSUPP; - } - - src =3D __acpi_map_table(ctx->src_base + offset, ctx->var2); -#else src =3D ioremap(ctx->src_base + offset, ctx->var2); -#endif if (!src) return -ENOMEM; =20 -#ifdef CONFIG_X86 - BUILD_BUG_ON(FIX_ACPI_PAGES < 4); - idx =3D virt_to_fix((unsigned long)src + 2 * PAGE_SIZE); - offset +=3D ctx->dst_base; - dst =3D (void *)fix_to_virt(idx) + (offset & ~PAGE_MASK); - set_fixmap(idx, offset); - if (PFN_DOWN(offset) !=3D PFN_DOWN(offset + ctx->var2 - 1)) { - idx =3D virt_to_fix((unsigned long)dst + PAGE_SIZE); - set_fixmap(idx, offset + PAGE_SIZE); - } -#else dst =3D ioremap(ctx->dst_base + offset, ctx->var2); -#endif if (dst) { memmove(dst, src, ctx->var2); iounmap(dst); --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "font.h" =20 @@ -101,13 +102,11 @@ void __init vesa_init(void) if ( !line_len ) goto fail; =20 - if ( map_pages_to_xen(IOREMAP_VIRT_START, - vlfb_info.lfb_base >> PAGE_SHIFT, - vram_remap >> PAGE_SHIFT, - PAGE_HYPERVISOR_NOCACHE) ) + lfb =3D ioremap(vlfb_info.lfb_base, vram_remap); + if ( !lfb ) goto fail; =20 - lfb =3D memset((void *)IOREMAP_VIRT_START, 0, vram_remap); + memset(lfb, 0, vram_remap); =20 vga_puts =3D vesa_redraw_puts; =20 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -144,7 +144,7 @@ extern unsigned char boot_edid_info[128] * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 bytes, PML4:261] * Machine-to-phys translation table. * 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261] - * ioremap()/fixmap area. + * vmap()/ioremap()/fixmap area. * 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261] * Compatibility machine-to-phys translation table. * 0xffff82c440000000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261] @@ -205,11 +205,11 @@ extern unsigned char boot_edid_info[128] /* Slot 261: machine-to-phys conversion table (256GB). */ #define RDWR_MPT_VIRT_START (PML4_ADDR(261)) #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_START + MPT_VIRT_SIZE) -/* Slot 261: ioremap()/fixmap area (16GB). */ -#define IOREMAP_VIRT_START RDWR_MPT_VIRT_END -#define IOREMAP_VIRT_END (IOREMAP_VIRT_START + GB(16)) +/* Slot 261: vmap()/ioremap()/fixmap area (16GB). */ +#define VMAP_VIRT_START RDWR_MPT_VIRT_END +#define VMAP_VIRT_END (VMAP_VIRT_START + GB(16)) /* Slot 261: compatibility machine-to-phys conversion table (1GB). */ -#define RDWR_COMPAT_MPT_VIRT_START IOREMAP_VIRT_END +#define RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END #define RDWR_COMPAT_MPT_VIRT_END (RDWR_COMPAT_MPT_VIRT_START + GB(1)) /* Slot 261: high read-only compat machine-to-phys conversion table = (1GB). */ #define HIRO_COMPAT_MPT_VIRT_START RDWR_COMPAT_MPT_VIRT_END --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -15,7 +15,7 @@ #include #include =20 -#define FIXADDR_TOP (IOREMAP_VIRT_END - PAGE_SIZE) +#define FIXADDR_TOP (VMAP_VIRT_END - PAGE_SIZE) =20 #ifndef __ASSEMBLY__ =20 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -1,14 +1,10 @@ #ifndef _ASM_IO_H #define _ASM_IO_H =20 -#include +#include #include #include =20 -/* We don't need real ioremap() on Xen/x86. */ -#define ioremap(x,l) (__va(x)) -#define iounmap(p) ((void)0) - #define readb(x) (*(volatile char *)(x)) #define readw(x) (*(volatile short *)(x)) #define readl(x) (*(volatile int *)(x)) --- /dev/null +++ b/xen/include/xen/vmap.h @@ -0,0 +1,24 @@ +#if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) +#define __XEN_VMAP_H__ + +#include + +void *vm_alloc(unsigned int nr, unsigned int align); +void vm_free(const void *); + +void *__vmap(const unsigned long *mfn, unsigned int granularity, + unsigned int nr, unsigned int align, unsigned int flags); +void *vmap(const unsigned long *mfn, unsigned int nr); +void vunmap(const void *); + +void __iomem *ioremap(paddr_t, size_t); + +static inline void iounmap(void __iomem *va) +{ + vunmap((void __force *)va); +} + +void vm_init(void); +void *arch_vmap_virt_end(void); + +#endif /* __XEN_VMAP_H__ */ --=__Part5D6C9DFC.0__= Content-Type: text/plain; name="vmap.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="vmap.patch" implement vmap()=0A=0A... and use it as basis for a proper ioremap() on = x86.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/arch/x86/mm.c=0A+++ b/xen/arch/x86/mm.c=0A@@ -100,6 +100,7 @@=0A = #include =0A #include =0A #include = =0A+#include =0A #include =0A = #include =0A #include =0A@@ -5460,6 +5561,32 = @@ void __set_fixmap(=0A map_pages_to_xen(fix_to_virt(idx), mfn, 1, = flags);=0A }=0A =0A+void *__init arch_vmap_virt_end(void)=0A+{=0A+ = return (void *)fix_to_virt(__end_of_fixed_addresses);=0A+}=0A+=0A+void = __iomem *ioremap(paddr_t pa, size_t len)=0A+{=0A+ unsigned long pfn =3D = PFN_DOWN(pa);=0A+ void *va;=0A+=0A+ WARN_ON(page_is_ram_type(pfn, = RAM_TYPE_CONVENTIONAL));=0A+=0A+ /* The low first Mb is always mapped. = */=0A+ if ( !((pa + len - 1) >> 20) )=0A+ va =3D __va(pa);=0A+ = else=0A+ {=0A+ unsigned int offs =3D pa & (PAGE_SIZE - 1);=0A+ = unsigned int nr =3D PFN_UP(offs + len);=0A+=0A+ va =3D = __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs;=0A+ }=0A+=0A+ = return (void __force __iomem *)va;=0A+}=0A+=0A #ifdef MEMORY_GUARD=0A =0A = void memguard_init(void)=0A--- a/xen/arch/x86/setup.c=0A+++ b/xen/arch/x86/= setup.c=0A@@ -1104,6 +1104,7 @@ void __init __start_xen(unsigned long = mb=0A end_boot_allocator();=0A system_state =3D SYS_STATE_boot;=0A = =0A+ vm_init();=0A vesa_init();=0A =0A softirq_init();=0A--- = a/xen/common/Makefile=0A+++ b/xen/common/Makefile=0A@@ -36,6 +36,7 @@ = obj-y +=3D time.o=0A obj-y +=3D timer.o=0A obj-y +=3D trace.o=0A obj-y = +=3D version.o=0A+obj-y +=3D vmap.o=0A obj-y +=3D vsprintf.o=0A obj-y +=3D = wait.o=0A obj-y +=3D xmalloc_tlsf.o=0A--- /dev/null=0A+++ b/xen/common/vmap= .c=0A@@ -0,0 +1,204 @@=0A+#ifdef VMAP_VIRT_START=0A+#include = =0A+#include =0A+#include =0A+#include = =0A+#include =0A+#include =0A+#include = =0A+#include =0A+#include =0A+=0A+stat= ic DEFINE_SPINLOCK(vm_lock);=0A+static void *__read_mostly vm_base;=0A+#def= ine vm_bitmap ((unsigned long *)vm_base)=0A+/* highest allocated bit in = the bitmap */=0A+static unsigned int __read_mostly vm_top;=0A+/* total = number of bits in the bitmap */=0A+static unsigned int __read_mostly = vm_end;=0A+/* lowest known clear bit in the bitmap */=0A+static unsigned = int vm_low;=0A+=0A+void __init vm_init(void)=0A+{=0A+ unsigned int i, = nr;=0A+ unsigned long va;=0A+=0A+ vm_base =3D (void *)VMAP_VIRT_START= ;=0A+ vm_end =3D PFN_DOWN(arch_vmap_virt_end() - vm_base);=0A+ = vm_low =3D PFN_UP((vm_end + 7) / 8);=0A+ nr =3D PFN_UP((vm_low + 7) / = 8);=0A+ vm_top =3D nr * PAGE_SIZE * 8;=0A+=0A+ for ( i =3D 0, va =3D = (unsigned long)vm_bitmap; i < nr; ++i, va +=3D PAGE_SIZE )=0A+ {=0A+ = struct page_info *pg =3D alloc_domheap_page(NULL, 0);=0A+=0A+ = map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR);=0A+ = clear_page((void *)va);=0A+ }=0A+ bitmap_fill(vm_bitmap, vm_low);=0A+= =0A+ /* Populate page tables for the bitmap if necessary. */=0A+ = map_pages_to_xen(va, 0, vm_low - nr, MAP_SMALL_PAGES);=0A+}=0A+=0A+void = *vm_alloc(unsigned int nr, unsigned int align)=0A+{=0A+ unsigned int = start, bit;=0A+=0A+ if ( !align )=0A+ align =3D 1;=0A+ else = if ( align & (align - 1) )=0A+ align &=3D -align;=0A+=0A+ = spin_lock(&vm_lock);=0A+ for ( ; ; )=0A+ {=0A+ struct = page_info *pg;=0A+=0A+ ASSERT(!test_bit(vm_low, vm_bitmap));=0A+ = for ( start =3D vm_low; ; )=0A+ {=0A+ bit =3D = find_next_bit(vm_bitmap, vm_top, start + 1);=0A+ if ( bit > = vm_top )=0A+ bit =3D vm_top;=0A+ /*=0A+ = * Note that this skips the first bit, making the=0A+ * = corresponding page a guard one.=0A+ */=0A+ start = =3D (start + align) & ~(align - 1);=0A+ if ( start + nr <=3D = bit )=0A+ break;=0A+ start =3D bit < vm_top = ?=0A+ find_next_zero_bit(vm_bitmap, vm_top, bit + 1) : = bit;=0A+ if ( start >=3D vm_top )=0A+ break;=0A+ = }=0A+=0A+ if ( start < vm_top )=0A+ break;=0A+=0A+= spin_unlock(&vm_lock);=0A+=0A+ if ( vm_top >=3D vm_end = )=0A+ return NULL;=0A+=0A+ pg =3D alloc_domheap_page(NULL= , 0);=0A+ if ( !pg )=0A+ return NULL;=0A+=0A+ = spin_lock(&vm_lock);=0A+=0A+ if ( start >=3D vm_top )=0A+ = {=0A+ unsigned long va =3D (unsigned long)vm_bitmap + vm_top / = 8;=0A+=0A+ if ( !map_pages_to_xen(va, page_to_mfn(pg), 1, = PAGE_HYPERVISOR) )=0A+ {=0A+ clear_page((void = *)va);=0A+ vm_top +=3D PAGE_SIZE * 8;=0A+ if = ( vm_top > vm_end )=0A+ vm_top =3D vm_end;=0A+ = continue;=0A+ }=0A+ }=0A+=0A+ free_domheap_p= age(pg);=0A+=0A+ if ( start >=3D vm_top )=0A+ {=0A+ = spin_unlock(&vm_lock);=0A+ return NULL;=0A+ }=0A+ = }=0A+=0A+ for ( bit =3D start; bit < start + nr; ++bit )=0A+ = __set_bit(bit, vm_bitmap);=0A+ if ( start <=3D vm_low + 2 )=0A+ = vm_low =3D bit;=0A+ spin_unlock(&vm_lock);=0A+=0A+ return vm_base + = start * PAGE_SIZE;=0A+}=0A+=0A+static unsigned int vm_index(const void = *va)=0A+{=0A+ unsigned long addr =3D (unsigned long)va & ~(PAGE_SIZE - = 1);=0A+ unsigned int idx;=0A+=0A+ if ( addr < VMAP_VIRT_START + = (vm_end / 8) ||=0A+ addr >=3D VMAP_VIRT_START + vm_top * PAGE_SIZE = )=0A+ return 0;=0A+=0A+ idx =3D PFN_DOWN(va - vm_base);=0A+ = return !test_bit(idx - 1, vm_bitmap) &&=0A+ test_bit(idx, = vm_bitmap) ? idx : 0;=0A+}=0A+=0A+static unsigned int vm_size(const void = *va)=0A+{=0A+ unsigned int start =3D vm_index(va), end;=0A+=0A+ if ( = !start )=0A+ return 0;=0A+=0A+ end =3D find_next_zero_bit(vm_bitm= ap, vm_top, start + 1);=0A+=0A+ return min(end, vm_top) - start;=0A+}=0A= +=0A+void vm_free(const void *va)=0A+{=0A+ unsigned int bit =3D = vm_index(va);=0A+=0A+ if ( !bit )=0A+ {=0A+ WARN_ON(va !=3D = NULL);=0A+ return;=0A+ }=0A+=0A+ spin_lock(&vm_lock);=0A+ = if ( bit < vm_low )=0A+ {=0A+ vm_low =3D bit - 1;=0A+ = while ( !test_bit(vm_low - 1, vm_bitmap) )=0A+ --vm_low;=0A+ = }=0A+ while ( __test_and_clear_bit(bit, vm_bitmap) )=0A+ if ( = ++bit =3D=3D vm_top )=0A+ break;=0A+ spin_unlock(&vm_lock);= =0A+}=0A+=0A+void *__vmap(const unsigned long *mfn, unsigned int granularit= y,=0A+ unsigned int nr, unsigned int align, unsigned int = flags)=0A+{=0A+ void *va =3D vm_alloc(nr * granularity, align);=0A+ = unsigned long cur =3D (unsigned long)va;=0A+=0A+ for ( ; va && nr--; = ++mfn, cur +=3D PAGE_SIZE * granularity )=0A+ {=0A+ if ( = map_pages_to_xen(cur, *mfn, granularity, flags) )=0A+ {=0A+ = vunmap(va);=0A+ va =3D NULL;=0A+ }=0A+ }=0A+=0A+ = return va;=0A+}=0A+=0A+void *vmap(const unsigned long *mfn, unsigned int = nr)=0A+{=0A+ return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR);=0A+}=0A+=0A+= void vunmap(const void *va)=0A+{=0A+ unsigned long addr =3D (unsigned = long)va;=0A+=0A+ destroy_xen_mappings(addr, addr + PAGE_SIZE * = vm_size(va));=0A+ vm_free(va);=0A+}=0A+#endif=0A--- a/xen/drivers/acpi/a= pei/erst.c=0A+++ b/xen/drivers/acpi/apei/erst.c=0A@@ -247,9 +247,6 @@ = static int erst_exec_move_data(struct ap=0A {=0A int rc;=0A = u64 offset;=0A-#ifdef CONFIG_X86=0A- enum fixed_addresses idx;=0A-#endif= =0A void *src, *dst;=0A =0A /* ioremap does not work in = interrupt context */=0A@@ -263,39 +260,11 @@ static int erst_exec_move_data= (struct ap=0A if (rc)=0A return rc;=0A =0A-#ifdef CONFIG_X86= =0A- switch (ctx->var2) {=0A- case 0:=0A- return = 0;=0A- case 1 ... PAGE_SIZE:=0A- break;=0A- default:=0A= - printk(KERN_WARNING=0A- "MOVE_DATA cannot = be used for %#"PRIx64" bytes of data\n",=0A- ctx->var2);= =0A- return -EOPNOTSUPP;=0A- }=0A-=0A- src =3D __acpi_map_= table(ctx->src_base + offset, ctx->var2);=0A-#else=0A src =3D ioremap(ctx= ->src_base + offset, ctx->var2);=0A-#endif=0A if (!src)=0A = return -ENOMEM;=0A =0A-#ifdef CONFIG_X86=0A- BUILD_BUG_ON(FIX_ACPI_PAGES= < 4);=0A- idx =3D virt_to_fix((unsigned long)src + 2 * PAGE_SIZE);=0A= - offset +=3D ctx->dst_base;=0A- dst =3D (void *)fix_to_virt(idx) + = (offset & ~PAGE_MASK);=0A- set_fixmap(idx, offset);=0A- if = (PFN_DOWN(offset) !=3D PFN_DOWN(offset + ctx->var2 - 1)) {=0A- = idx =3D virt_to_fix((unsigned long)dst + PAGE_SIZE);=0A- = set_fixmap(idx, offset + PAGE_SIZE);=0A- }=0A-#else=0A dst =3D = ioremap(ctx->dst_base + offset, ctx->var2);=0A-#endif=0A if (dst) = {=0A memmove(dst, src, ctx->var2);=0A iounmap(dst= );=0A--- a/xen/drivers/video/vesa.c=0A+++ b/xen/drivers/video/vesa.c=0A@@ = -10,6 +10,7 @@=0A #include =0A #include =0A = #include =0A+#include =0A #include =0A = #include "font.h"=0A =0A@@ -101,13 +102,11 @@ void __init vesa_init(void)= =0A if ( !line_len )=0A goto fail;=0A =0A- if ( map_pages_to= _xen(IOREMAP_VIRT_START,=0A- vlfb_info.lfb_base = >> PAGE_SHIFT,=0A- vram_remap >> PAGE_SHIFT,=0A- = PAGE_HYPERVISOR_NOCACHE) )=0A+ lfb =3D = ioremap(vlfb_info.lfb_base, vram_remap);=0A+ if ( !lfb )=0A = goto fail;=0A =0A- lfb =3D memset((void *)IOREMAP_VIRT_START, 0, = vram_remap);=0A+ memset(lfb, 0, vram_remap);=0A =0A vga_puts =3D = vesa_redraw_puts;=0A =0A--- a/xen/include/asm-x86/config.h=0A+++ b/xen/incl= ude/asm-x86/config.h=0A@@ -144,7 +144,7 @@ extern unsigned char boot_edid_i= nfo[128]=0A * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 = bytes, PML4:261]=0A * Machine-to-phys translation table.=0A * = 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261]=0A- = * ioremap()/fixmap area.=0A+ * vmap()/ioremap()/fixmap area.=0A * = 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261]=0A = * Compatibility machine-to-phys translation table.=0A * 0xffff82c44000= 0000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261]=0A@@ -205,11 = +205,11 @@ extern unsigned char boot_edid_info[128]=0A /* Slot 261: = machine-to-phys conversion table (256GB). */=0A #define RDWR_MPT_VIRT_START= (PML4_ADDR(261))=0A #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_STA= RT + MPT_VIRT_SIZE)=0A-/* Slot 261: ioremap()/fixmap area (16GB). = */=0A-#define IOREMAP_VIRT_START RDWR_MPT_VIRT_END=0A-#define = IOREMAP_VIRT_END (IOREMAP_VIRT_START + GB(16))=0A+/* Slot 261: = vmap()/ioremap()/fixmap area (16GB). */=0A+#define VMAP_VIRT_START = RDWR_MPT_VIRT_END=0A+#define VMAP_VIRT_END (VMAP_VIRT_START + = GB(16))=0A /* Slot 261: compatibility machine-to-phys conversion table = (1GB). */=0A-#define RDWR_COMPAT_MPT_VIRT_START IOREMAP_VIRT_END=0A+#define= RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END=0A #define RDWR_COMPAT_MPT_VIRT_E= ND (RDWR_COMPAT_MPT_VIRT_START + GB(1))=0A /* Slot 261: high read-only = compat machine-to-phys conversion table (1GB). */=0A #define HIRO_COMPAT_MP= T_VIRT_START RDWR_COMPAT_MPT_VIRT_END=0A--- a/xen/include/asm-x86/fixmap.h= =0A+++ b/xen/include/asm-x86/fixmap.h=0A@@ -15,7 +15,7 @@=0A #include = =0A #include =0A =0A-#define FIXADDR_TOP = (IOREMAP_VIRT_END - PAGE_SIZE)=0A+#define FIXADDR_TOP (VMAP_VIRT_END - = PAGE_SIZE)=0A =0A #ifndef __ASSEMBLY__=0A =0A--- a/xen/include/asm-x86/io.h= =0A+++ b/xen/include/asm-x86/io.h=0A@@ -1,14 +1,10 @@=0A #ifndef = _ASM_IO_H=0A #define _ASM_IO_H=0A =0A-#include =0A+#include = =0A #include =0A #include =0A =0A-/* = We don't need real ioremap() on Xen/x86. */=0A-#define ioremap(x,l) = (__va(x))=0A-#define iounmap(p) ((void)0)=0A-=0A #define readb(x) = (*(volatile char *)(x))=0A #define readw(x) (*(volatile short *)(x))=0A = #define readl(x) (*(volatile int *)(x))=0A--- /dev/null=0A+++ b/xen/include= /xen/vmap.h=0A@@ -0,0 +1,24 @@=0A+#if !defined(__XEN_VMAP_H__) && = defined(VMAP_VIRT_START)=0A+#define __XEN_VMAP_H__=0A+=0A+#include = =0A+=0A+void *vm_alloc(unsigned int nr, unsigned int = align);=0A+void vm_free(const void *);=0A+=0A+void *__vmap(const unsigned = long *mfn, unsigned int granularity,=0A+ unsigned int nr, = unsigned int align, unsigned int flags);=0A+void *vmap(const unsigned long = *mfn, unsigned int nr);=0A+void vunmap(const void *);=0A+=0A+void __iomem = *ioremap(paddr_t, size_t);=0A+=0A+static inline void iounmap(void __iomem = *va)=0A+{=0A+ vunmap((void __force *)va);=0A+}=0A+=0A+void vm_init(void)= ;=0A+void *arch_vmap_virt_end(void);=0A+=0A+#endif /* __XEN_VMAP_H__ */=0A --=__Part5D6C9DFC.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part5D6C9DFC.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:28:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWod9-0004xp-Sx; Fri, 09 Nov 2012 13:28:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWod8-0004xj-FM for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:28:18 +0000 Received: from [193.109.254.147:5896] by server-5.bemta-14.messagelabs.com id B7/12-10257-1F40D905; Fri, 09 Nov 2012 13:28:17 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352467692!8585318!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16592 invoked from network); 9 Nov 2012 13:28:12 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-27.messagelabs.com with SMTP; 9 Nov 2012 13:28:12 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 13:28:12 +0000 Message-Id: <509D12FC02000078000A77E4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 13:28:12 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part5D6C9DFC.0__=" Subject: [Xen-devel] [PATCH] implement vmap() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part5D6C9DFC.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline ... and use it as basis for a proper ioremap() on x86. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -5460,6 +5561,32 @@ void __set_fixmap( map_pages_to_xen(fix_to_virt(idx), mfn, 1, flags); } =20 +void *__init arch_vmap_virt_end(void) +{ + return (void *)fix_to_virt(__end_of_fixed_addresses); +} + +void __iomem *ioremap(paddr_t pa, size_t len) +{ + unsigned long pfn =3D PFN_DOWN(pa); + void *va; + + WARN_ON(page_is_ram_type(pfn, RAM_TYPE_CONVENTIONAL)); + + /* The low first Mb is always mapped. */ + if ( !((pa + len - 1) >> 20) ) + va =3D __va(pa); + else + { + unsigned int offs =3D pa & (PAGE_SIZE - 1); + unsigned int nr =3D PFN_UP(offs + len); + + va =3D __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs; + } + + return (void __force __iomem *)va; +} + #ifdef MEMORY_GUARD =20 void memguard_init(void) --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1104,6 +1104,7 @@ void __init __start_xen(unsigned long mb end_boot_allocator(); system_state =3D SYS_STATE_boot; =20 + vm_init(); vesa_init(); =20 softirq_init(); --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -36,6 +36,7 @@ obj-y +=3D time.o obj-y +=3D timer.o obj-y +=3D trace.o obj-y +=3D version.o +obj-y +=3D vmap.o obj-y +=3D vsprintf.o obj-y +=3D wait.o obj-y +=3D xmalloc_tlsf.o --- /dev/null +++ b/xen/common/vmap.c @@ -0,0 +1,204 @@ +#ifdef VMAP_VIRT_START +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static DEFINE_SPINLOCK(vm_lock); +static void *__read_mostly vm_base; +#define vm_bitmap ((unsigned long *)vm_base) +/* highest allocated bit in the bitmap */ +static unsigned int __read_mostly vm_top; +/* total number of bits in the bitmap */ +static unsigned int __read_mostly vm_end; +/* lowest known clear bit in the bitmap */ +static unsigned int vm_low; + +void __init vm_init(void) +{ + unsigned int i, nr; + unsigned long va; + + vm_base =3D (void *)VMAP_VIRT_START; + vm_end =3D PFN_DOWN(arch_vmap_virt_end() - vm_base); + vm_low =3D PFN_UP((vm_end + 7) / 8); + nr =3D PFN_UP((vm_low + 7) / 8); + vm_top =3D nr * PAGE_SIZE * 8; + + for ( i =3D 0, va =3D (unsigned long)vm_bitmap; i < nr; ++i, va +=3D = PAGE_SIZE ) + { + struct page_info *pg =3D alloc_domheap_page(NULL, 0); + + map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR); + clear_page((void *)va); + } + bitmap_fill(vm_bitmap, vm_low); + + /* Populate page tables for the bitmap if necessary. */ + map_pages_to_xen(va, 0, vm_low - nr, MAP_SMALL_PAGES); +} + +void *vm_alloc(unsigned int nr, unsigned int align) +{ + unsigned int start, bit; + + if ( !align ) + align =3D 1; + else if ( align & (align - 1) ) + align &=3D -align; + + spin_lock(&vm_lock); + for ( ; ; ) + { + struct page_info *pg; + + ASSERT(!test_bit(vm_low, vm_bitmap)); + for ( start =3D vm_low; ; ) + { + bit =3D find_next_bit(vm_bitmap, vm_top, start + 1); + if ( bit > vm_top ) + bit =3D vm_top; + /* + * Note that this skips the first bit, making the + * corresponding page a guard one. + */ + start =3D (start + align) & ~(align - 1); + if ( start + nr <=3D bit ) + break; + start =3D bit < vm_top ? + find_next_zero_bit(vm_bitmap, vm_top, bit + 1) : bit; + if ( start >=3D vm_top ) + break; + } + + if ( start < vm_top ) + break; + + spin_unlock(&vm_lock); + + if ( vm_top >=3D vm_end ) + return NULL; + + pg =3D alloc_domheap_page(NULL, 0); + if ( !pg ) + return NULL; + + spin_lock(&vm_lock); + + if ( start >=3D vm_top ) + { + unsigned long va =3D (unsigned long)vm_bitmap + vm_top / 8; + + if ( !map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR= ) ) + { + clear_page((void *)va); + vm_top +=3D PAGE_SIZE * 8; + if ( vm_top > vm_end ) + vm_top =3D vm_end; + continue; + } + } + + free_domheap_page(pg); + + if ( start >=3D vm_top ) + { + spin_unlock(&vm_lock); + return NULL; + } + } + + for ( bit =3D start; bit < start + nr; ++bit ) + __set_bit(bit, vm_bitmap); + if ( start <=3D vm_low + 2 ) + vm_low =3D bit; + spin_unlock(&vm_lock); + + return vm_base + start * PAGE_SIZE; +} + +static unsigned int vm_index(const void *va) +{ + unsigned long addr =3D (unsigned long)va & ~(PAGE_SIZE - 1); + unsigned int idx; + + if ( addr < VMAP_VIRT_START + (vm_end / 8) || + addr >=3D VMAP_VIRT_START + vm_top * PAGE_SIZE ) + return 0; + + idx =3D PFN_DOWN(va - vm_base); + return !test_bit(idx - 1, vm_bitmap) && + test_bit(idx, vm_bitmap) ? idx : 0; +} + +static unsigned int vm_size(const void *va) +{ + unsigned int start =3D vm_index(va), end; + + if ( !start ) + return 0; + + end =3D find_next_zero_bit(vm_bitmap, vm_top, start + 1); + + return min(end, vm_top) - start; +} + +void vm_free(const void *va) +{ + unsigned int bit =3D vm_index(va); + + if ( !bit ) + { + WARN_ON(va !=3D NULL); + return; + } + + spin_lock(&vm_lock); + if ( bit < vm_low ) + { + vm_low =3D bit - 1; + while ( !test_bit(vm_low - 1, vm_bitmap) ) + --vm_low; + } + while ( __test_and_clear_bit(bit, vm_bitmap) ) + if ( ++bit =3D=3D vm_top ) + break; + spin_unlock(&vm_lock); +} + +void *__vmap(const unsigned long *mfn, unsigned int granularity, + unsigned int nr, unsigned int align, unsigned int flags) +{ + void *va =3D vm_alloc(nr * granularity, align); + unsigned long cur =3D (unsigned long)va; + + for ( ; va && nr--; ++mfn, cur +=3D PAGE_SIZE * granularity ) + { + if ( map_pages_to_xen(cur, *mfn, granularity, flags) ) + { + vunmap(va); + va =3D NULL; + } + } + + return va; +} + +void *vmap(const unsigned long *mfn, unsigned int nr) +{ + return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR); +} + +void vunmap(const void *va) +{ + unsigned long addr =3D (unsigned long)va; + + destroy_xen_mappings(addr, addr + PAGE_SIZE * vm_size(va)); + vm_free(va); +} +#endif --- a/xen/drivers/acpi/apei/erst.c +++ b/xen/drivers/acpi/apei/erst.c @@ -247,9 +247,6 @@ static int erst_exec_move_data(struct ap { int rc; u64 offset; -#ifdef CONFIG_X86 - enum fixed_addresses idx; -#endif void *src, *dst; =20 /* ioremap does not work in interrupt context */ @@ -263,39 +260,11 @@ static int erst_exec_move_data(struct ap if (rc) return rc; =20 -#ifdef CONFIG_X86 - switch (ctx->var2) { - case 0: - return 0; - case 1 ... PAGE_SIZE: - break; - default: - printk(KERN_WARNING - "MOVE_DATA cannot be used for %#"PRIx64" bytes of = data\n", - ctx->var2); - return -EOPNOTSUPP; - } - - src =3D __acpi_map_table(ctx->src_base + offset, ctx->var2); -#else src =3D ioremap(ctx->src_base + offset, ctx->var2); -#endif if (!src) return -ENOMEM; =20 -#ifdef CONFIG_X86 - BUILD_BUG_ON(FIX_ACPI_PAGES < 4); - idx =3D virt_to_fix((unsigned long)src + 2 * PAGE_SIZE); - offset +=3D ctx->dst_base; - dst =3D (void *)fix_to_virt(idx) + (offset & ~PAGE_MASK); - set_fixmap(idx, offset); - if (PFN_DOWN(offset) !=3D PFN_DOWN(offset + ctx->var2 - 1)) { - idx =3D virt_to_fix((unsigned long)dst + PAGE_SIZE); - set_fixmap(idx, offset + PAGE_SIZE); - } -#else dst =3D ioremap(ctx->dst_base + offset, ctx->var2); -#endif if (dst) { memmove(dst, src, ctx->var2); iounmap(dst); --- a/xen/drivers/video/vesa.c +++ b/xen/drivers/video/vesa.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "font.h" =20 @@ -101,13 +102,11 @@ void __init vesa_init(void) if ( !line_len ) goto fail; =20 - if ( map_pages_to_xen(IOREMAP_VIRT_START, - vlfb_info.lfb_base >> PAGE_SHIFT, - vram_remap >> PAGE_SHIFT, - PAGE_HYPERVISOR_NOCACHE) ) + lfb =3D ioremap(vlfb_info.lfb_base, vram_remap); + if ( !lfb ) goto fail; =20 - lfb =3D memset((void *)IOREMAP_VIRT_START, 0, vram_remap); + memset(lfb, 0, vram_remap); =20 vga_puts =3D vesa_redraw_puts; =20 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -144,7 +144,7 @@ extern unsigned char boot_edid_info[128] * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 bytes, PML4:261] * Machine-to-phys translation table. * 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261] - * ioremap()/fixmap area. + * vmap()/ioremap()/fixmap area. * 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261] * Compatibility machine-to-phys translation table. * 0xffff82c440000000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261] @@ -205,11 +205,11 @@ extern unsigned char boot_edid_info[128] /* Slot 261: machine-to-phys conversion table (256GB). */ #define RDWR_MPT_VIRT_START (PML4_ADDR(261)) #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_START + MPT_VIRT_SIZE) -/* Slot 261: ioremap()/fixmap area (16GB). */ -#define IOREMAP_VIRT_START RDWR_MPT_VIRT_END -#define IOREMAP_VIRT_END (IOREMAP_VIRT_START + GB(16)) +/* Slot 261: vmap()/ioremap()/fixmap area (16GB). */ +#define VMAP_VIRT_START RDWR_MPT_VIRT_END +#define VMAP_VIRT_END (VMAP_VIRT_START + GB(16)) /* Slot 261: compatibility machine-to-phys conversion table (1GB). */ -#define RDWR_COMPAT_MPT_VIRT_START IOREMAP_VIRT_END +#define RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END #define RDWR_COMPAT_MPT_VIRT_END (RDWR_COMPAT_MPT_VIRT_START + GB(1)) /* Slot 261: high read-only compat machine-to-phys conversion table = (1GB). */ #define HIRO_COMPAT_MPT_VIRT_START RDWR_COMPAT_MPT_VIRT_END --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -15,7 +15,7 @@ #include #include =20 -#define FIXADDR_TOP (IOREMAP_VIRT_END - PAGE_SIZE) +#define FIXADDR_TOP (VMAP_VIRT_END - PAGE_SIZE) =20 #ifndef __ASSEMBLY__ =20 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -1,14 +1,10 @@ #ifndef _ASM_IO_H #define _ASM_IO_H =20 -#include +#include #include #include =20 -/* We don't need real ioremap() on Xen/x86. */ -#define ioremap(x,l) (__va(x)) -#define iounmap(p) ((void)0) - #define readb(x) (*(volatile char *)(x)) #define readw(x) (*(volatile short *)(x)) #define readl(x) (*(volatile int *)(x)) --- /dev/null +++ b/xen/include/xen/vmap.h @@ -0,0 +1,24 @@ +#if !defined(__XEN_VMAP_H__) && defined(VMAP_VIRT_START) +#define __XEN_VMAP_H__ + +#include + +void *vm_alloc(unsigned int nr, unsigned int align); +void vm_free(const void *); + +void *__vmap(const unsigned long *mfn, unsigned int granularity, + unsigned int nr, unsigned int align, unsigned int flags); +void *vmap(const unsigned long *mfn, unsigned int nr); +void vunmap(const void *); + +void __iomem *ioremap(paddr_t, size_t); + +static inline void iounmap(void __iomem *va) +{ + vunmap((void __force *)va); +} + +void vm_init(void); +void *arch_vmap_virt_end(void); + +#endif /* __XEN_VMAP_H__ */ --=__Part5D6C9DFC.0__= Content-Type: text/plain; name="vmap.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="vmap.patch" implement vmap()=0A=0A... and use it as basis for a proper ioremap() on = x86.=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/xen/arch/x86/mm.c=0A+++ b/xen/arch/x86/mm.c=0A@@ -100,6 +100,7 @@=0A = #include =0A #include =0A #include = =0A+#include =0A #include =0A = #include =0A #include =0A@@ -5460,6 +5561,32 = @@ void __set_fixmap(=0A map_pages_to_xen(fix_to_virt(idx), mfn, 1, = flags);=0A }=0A =0A+void *__init arch_vmap_virt_end(void)=0A+{=0A+ = return (void *)fix_to_virt(__end_of_fixed_addresses);=0A+}=0A+=0A+void = __iomem *ioremap(paddr_t pa, size_t len)=0A+{=0A+ unsigned long pfn =3D = PFN_DOWN(pa);=0A+ void *va;=0A+=0A+ WARN_ON(page_is_ram_type(pfn, = RAM_TYPE_CONVENTIONAL));=0A+=0A+ /* The low first Mb is always mapped. = */=0A+ if ( !((pa + len - 1) >> 20) )=0A+ va =3D __va(pa);=0A+ = else=0A+ {=0A+ unsigned int offs =3D pa & (PAGE_SIZE - 1);=0A+ = unsigned int nr =3D PFN_UP(offs + len);=0A+=0A+ va =3D = __vmap(&pfn, nr, 1, 1, PAGE_HYPERVISOR_NOCACHE) + offs;=0A+ }=0A+=0A+ = return (void __force __iomem *)va;=0A+}=0A+=0A #ifdef MEMORY_GUARD=0A =0A = void memguard_init(void)=0A--- a/xen/arch/x86/setup.c=0A+++ b/xen/arch/x86/= setup.c=0A@@ -1104,6 +1104,7 @@ void __init __start_xen(unsigned long = mb=0A end_boot_allocator();=0A system_state =3D SYS_STATE_boot;=0A = =0A+ vm_init();=0A vesa_init();=0A =0A softirq_init();=0A--- = a/xen/common/Makefile=0A+++ b/xen/common/Makefile=0A@@ -36,6 +36,7 @@ = obj-y +=3D time.o=0A obj-y +=3D timer.o=0A obj-y +=3D trace.o=0A obj-y = +=3D version.o=0A+obj-y +=3D vmap.o=0A obj-y +=3D vsprintf.o=0A obj-y +=3D = wait.o=0A obj-y +=3D xmalloc_tlsf.o=0A--- /dev/null=0A+++ b/xen/common/vmap= .c=0A@@ -0,0 +1,204 @@=0A+#ifdef VMAP_VIRT_START=0A+#include = =0A+#include =0A+#include =0A+#include = =0A+#include =0A+#include =0A+#include = =0A+#include =0A+#include =0A+=0A+stat= ic DEFINE_SPINLOCK(vm_lock);=0A+static void *__read_mostly vm_base;=0A+#def= ine vm_bitmap ((unsigned long *)vm_base)=0A+/* highest allocated bit in = the bitmap */=0A+static unsigned int __read_mostly vm_top;=0A+/* total = number of bits in the bitmap */=0A+static unsigned int __read_mostly = vm_end;=0A+/* lowest known clear bit in the bitmap */=0A+static unsigned = int vm_low;=0A+=0A+void __init vm_init(void)=0A+{=0A+ unsigned int i, = nr;=0A+ unsigned long va;=0A+=0A+ vm_base =3D (void *)VMAP_VIRT_START= ;=0A+ vm_end =3D PFN_DOWN(arch_vmap_virt_end() - vm_base);=0A+ = vm_low =3D PFN_UP((vm_end + 7) / 8);=0A+ nr =3D PFN_UP((vm_low + 7) / = 8);=0A+ vm_top =3D nr * PAGE_SIZE * 8;=0A+=0A+ for ( i =3D 0, va =3D = (unsigned long)vm_bitmap; i < nr; ++i, va +=3D PAGE_SIZE )=0A+ {=0A+ = struct page_info *pg =3D alloc_domheap_page(NULL, 0);=0A+=0A+ = map_pages_to_xen(va, page_to_mfn(pg), 1, PAGE_HYPERVISOR);=0A+ = clear_page((void *)va);=0A+ }=0A+ bitmap_fill(vm_bitmap, vm_low);=0A+= =0A+ /* Populate page tables for the bitmap if necessary. */=0A+ = map_pages_to_xen(va, 0, vm_low - nr, MAP_SMALL_PAGES);=0A+}=0A+=0A+void = *vm_alloc(unsigned int nr, unsigned int align)=0A+{=0A+ unsigned int = start, bit;=0A+=0A+ if ( !align )=0A+ align =3D 1;=0A+ else = if ( align & (align - 1) )=0A+ align &=3D -align;=0A+=0A+ = spin_lock(&vm_lock);=0A+ for ( ; ; )=0A+ {=0A+ struct = page_info *pg;=0A+=0A+ ASSERT(!test_bit(vm_low, vm_bitmap));=0A+ = for ( start =3D vm_low; ; )=0A+ {=0A+ bit =3D = find_next_bit(vm_bitmap, vm_top, start + 1);=0A+ if ( bit > = vm_top )=0A+ bit =3D vm_top;=0A+ /*=0A+ = * Note that this skips the first bit, making the=0A+ * = corresponding page a guard one.=0A+ */=0A+ start = =3D (start + align) & ~(align - 1);=0A+ if ( start + nr <=3D = bit )=0A+ break;=0A+ start =3D bit < vm_top = ?=0A+ find_next_zero_bit(vm_bitmap, vm_top, bit + 1) : = bit;=0A+ if ( start >=3D vm_top )=0A+ break;=0A+ = }=0A+=0A+ if ( start < vm_top )=0A+ break;=0A+=0A+= spin_unlock(&vm_lock);=0A+=0A+ if ( vm_top >=3D vm_end = )=0A+ return NULL;=0A+=0A+ pg =3D alloc_domheap_page(NULL= , 0);=0A+ if ( !pg )=0A+ return NULL;=0A+=0A+ = spin_lock(&vm_lock);=0A+=0A+ if ( start >=3D vm_top )=0A+ = {=0A+ unsigned long va =3D (unsigned long)vm_bitmap + vm_top / = 8;=0A+=0A+ if ( !map_pages_to_xen(va, page_to_mfn(pg), 1, = PAGE_HYPERVISOR) )=0A+ {=0A+ clear_page((void = *)va);=0A+ vm_top +=3D PAGE_SIZE * 8;=0A+ if = ( vm_top > vm_end )=0A+ vm_top =3D vm_end;=0A+ = continue;=0A+ }=0A+ }=0A+=0A+ free_domheap_p= age(pg);=0A+=0A+ if ( start >=3D vm_top )=0A+ {=0A+ = spin_unlock(&vm_lock);=0A+ return NULL;=0A+ }=0A+ = }=0A+=0A+ for ( bit =3D start; bit < start + nr; ++bit )=0A+ = __set_bit(bit, vm_bitmap);=0A+ if ( start <=3D vm_low + 2 )=0A+ = vm_low =3D bit;=0A+ spin_unlock(&vm_lock);=0A+=0A+ return vm_base + = start * PAGE_SIZE;=0A+}=0A+=0A+static unsigned int vm_index(const void = *va)=0A+{=0A+ unsigned long addr =3D (unsigned long)va & ~(PAGE_SIZE - = 1);=0A+ unsigned int idx;=0A+=0A+ if ( addr < VMAP_VIRT_START + = (vm_end / 8) ||=0A+ addr >=3D VMAP_VIRT_START + vm_top * PAGE_SIZE = )=0A+ return 0;=0A+=0A+ idx =3D PFN_DOWN(va - vm_base);=0A+ = return !test_bit(idx - 1, vm_bitmap) &&=0A+ test_bit(idx, = vm_bitmap) ? idx : 0;=0A+}=0A+=0A+static unsigned int vm_size(const void = *va)=0A+{=0A+ unsigned int start =3D vm_index(va), end;=0A+=0A+ if ( = !start )=0A+ return 0;=0A+=0A+ end =3D find_next_zero_bit(vm_bitm= ap, vm_top, start + 1);=0A+=0A+ return min(end, vm_top) - start;=0A+}=0A= +=0A+void vm_free(const void *va)=0A+{=0A+ unsigned int bit =3D = vm_index(va);=0A+=0A+ if ( !bit )=0A+ {=0A+ WARN_ON(va !=3D = NULL);=0A+ return;=0A+ }=0A+=0A+ spin_lock(&vm_lock);=0A+ = if ( bit < vm_low )=0A+ {=0A+ vm_low =3D bit - 1;=0A+ = while ( !test_bit(vm_low - 1, vm_bitmap) )=0A+ --vm_low;=0A+ = }=0A+ while ( __test_and_clear_bit(bit, vm_bitmap) )=0A+ if ( = ++bit =3D=3D vm_top )=0A+ break;=0A+ spin_unlock(&vm_lock);= =0A+}=0A+=0A+void *__vmap(const unsigned long *mfn, unsigned int granularit= y,=0A+ unsigned int nr, unsigned int align, unsigned int = flags)=0A+{=0A+ void *va =3D vm_alloc(nr * granularity, align);=0A+ = unsigned long cur =3D (unsigned long)va;=0A+=0A+ for ( ; va && nr--; = ++mfn, cur +=3D PAGE_SIZE * granularity )=0A+ {=0A+ if ( = map_pages_to_xen(cur, *mfn, granularity, flags) )=0A+ {=0A+ = vunmap(va);=0A+ va =3D NULL;=0A+ }=0A+ }=0A+=0A+ = return va;=0A+}=0A+=0A+void *vmap(const unsigned long *mfn, unsigned int = nr)=0A+{=0A+ return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR);=0A+}=0A+=0A+= void vunmap(const void *va)=0A+{=0A+ unsigned long addr =3D (unsigned = long)va;=0A+=0A+ destroy_xen_mappings(addr, addr + PAGE_SIZE * = vm_size(va));=0A+ vm_free(va);=0A+}=0A+#endif=0A--- a/xen/drivers/acpi/a= pei/erst.c=0A+++ b/xen/drivers/acpi/apei/erst.c=0A@@ -247,9 +247,6 @@ = static int erst_exec_move_data(struct ap=0A {=0A int rc;=0A = u64 offset;=0A-#ifdef CONFIG_X86=0A- enum fixed_addresses idx;=0A-#endif= =0A void *src, *dst;=0A =0A /* ioremap does not work in = interrupt context */=0A@@ -263,39 +260,11 @@ static int erst_exec_move_data= (struct ap=0A if (rc)=0A return rc;=0A =0A-#ifdef CONFIG_X86= =0A- switch (ctx->var2) {=0A- case 0:=0A- return = 0;=0A- case 1 ... PAGE_SIZE:=0A- break;=0A- default:=0A= - printk(KERN_WARNING=0A- "MOVE_DATA cannot = be used for %#"PRIx64" bytes of data\n",=0A- ctx->var2);= =0A- return -EOPNOTSUPP;=0A- }=0A-=0A- src =3D __acpi_map_= table(ctx->src_base + offset, ctx->var2);=0A-#else=0A src =3D ioremap(ctx= ->src_base + offset, ctx->var2);=0A-#endif=0A if (!src)=0A = return -ENOMEM;=0A =0A-#ifdef CONFIG_X86=0A- BUILD_BUG_ON(FIX_ACPI_PAGES= < 4);=0A- idx =3D virt_to_fix((unsigned long)src + 2 * PAGE_SIZE);=0A= - offset +=3D ctx->dst_base;=0A- dst =3D (void *)fix_to_virt(idx) + = (offset & ~PAGE_MASK);=0A- set_fixmap(idx, offset);=0A- if = (PFN_DOWN(offset) !=3D PFN_DOWN(offset + ctx->var2 - 1)) {=0A- = idx =3D virt_to_fix((unsigned long)dst + PAGE_SIZE);=0A- = set_fixmap(idx, offset + PAGE_SIZE);=0A- }=0A-#else=0A dst =3D = ioremap(ctx->dst_base + offset, ctx->var2);=0A-#endif=0A if (dst) = {=0A memmove(dst, src, ctx->var2);=0A iounmap(dst= );=0A--- a/xen/drivers/video/vesa.c=0A+++ b/xen/drivers/video/vesa.c=0A@@ = -10,6 +10,7 @@=0A #include =0A #include =0A = #include =0A+#include =0A #include =0A = #include "font.h"=0A =0A@@ -101,13 +102,11 @@ void __init vesa_init(void)= =0A if ( !line_len )=0A goto fail;=0A =0A- if ( map_pages_to= _xen(IOREMAP_VIRT_START,=0A- vlfb_info.lfb_base = >> PAGE_SHIFT,=0A- vram_remap >> PAGE_SHIFT,=0A- = PAGE_HYPERVISOR_NOCACHE) )=0A+ lfb =3D = ioremap(vlfb_info.lfb_base, vram_remap);=0A+ if ( !lfb )=0A = goto fail;=0A =0A- lfb =3D memset((void *)IOREMAP_VIRT_START, 0, = vram_remap);=0A+ memset(lfb, 0, vram_remap);=0A =0A vga_puts =3D = vesa_redraw_puts;=0A =0A--- a/xen/include/asm-x86/config.h=0A+++ b/xen/incl= ude/asm-x86/config.h=0A@@ -144,7 +144,7 @@ extern unsigned char boot_edid_i= nfo[128]=0A * 0xffff828000000000 - 0xffff82bfffffffff [256GB, 2^38 = bytes, PML4:261]=0A * Machine-to-phys translation table.=0A * = 0xffff82c000000000 - 0xffff82c3ffffffff [16GB, 2^34 bytes, PML4:261]=0A- = * ioremap()/fixmap area.=0A+ * vmap()/ioremap()/fixmap area.=0A * = 0xffff82c400000000 - 0xffff82c43fffffff [1GB, 2^30 bytes, PML4:261]=0A = * Compatibility machine-to-phys translation table.=0A * 0xffff82c44000= 0000 - 0xffff82c47fffffff [1GB, 2^30 bytes, PML4:261]=0A@@ -205,11 = +205,11 @@ extern unsigned char boot_edid_info[128]=0A /* Slot 261: = machine-to-phys conversion table (256GB). */=0A #define RDWR_MPT_VIRT_START= (PML4_ADDR(261))=0A #define RDWR_MPT_VIRT_END (RDWR_MPT_VIRT_STA= RT + MPT_VIRT_SIZE)=0A-/* Slot 261: ioremap()/fixmap area (16GB). = */=0A-#define IOREMAP_VIRT_START RDWR_MPT_VIRT_END=0A-#define = IOREMAP_VIRT_END (IOREMAP_VIRT_START + GB(16))=0A+/* Slot 261: = vmap()/ioremap()/fixmap area (16GB). */=0A+#define VMAP_VIRT_START = RDWR_MPT_VIRT_END=0A+#define VMAP_VIRT_END (VMAP_VIRT_START + = GB(16))=0A /* Slot 261: compatibility machine-to-phys conversion table = (1GB). */=0A-#define RDWR_COMPAT_MPT_VIRT_START IOREMAP_VIRT_END=0A+#define= RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END=0A #define RDWR_COMPAT_MPT_VIRT_E= ND (RDWR_COMPAT_MPT_VIRT_START + GB(1))=0A /* Slot 261: high read-only = compat machine-to-phys conversion table (1GB). */=0A #define HIRO_COMPAT_MP= T_VIRT_START RDWR_COMPAT_MPT_VIRT_END=0A--- a/xen/include/asm-x86/fixmap.h= =0A+++ b/xen/include/asm-x86/fixmap.h=0A@@ -15,7 +15,7 @@=0A #include = =0A #include =0A =0A-#define FIXADDR_TOP = (IOREMAP_VIRT_END - PAGE_SIZE)=0A+#define FIXADDR_TOP (VMAP_VIRT_END - = PAGE_SIZE)=0A =0A #ifndef __ASSEMBLY__=0A =0A--- a/xen/include/asm-x86/io.h= =0A+++ b/xen/include/asm-x86/io.h=0A@@ -1,14 +1,10 @@=0A #ifndef = _ASM_IO_H=0A #define _ASM_IO_H=0A =0A-#include =0A+#include = =0A #include =0A #include =0A =0A-/* = We don't need real ioremap() on Xen/x86. */=0A-#define ioremap(x,l) = (__va(x))=0A-#define iounmap(p) ((void)0)=0A-=0A #define readb(x) = (*(volatile char *)(x))=0A #define readw(x) (*(volatile short *)(x))=0A = #define readl(x) (*(volatile int *)(x))=0A--- /dev/null=0A+++ b/xen/include= /xen/vmap.h=0A@@ -0,0 +1,24 @@=0A+#if !defined(__XEN_VMAP_H__) && = defined(VMAP_VIRT_START)=0A+#define __XEN_VMAP_H__=0A+=0A+#include = =0A+=0A+void *vm_alloc(unsigned int nr, unsigned int = align);=0A+void vm_free(const void *);=0A+=0A+void *__vmap(const unsigned = long *mfn, unsigned int granularity,=0A+ unsigned int nr, = unsigned int align, unsigned int flags);=0A+void *vmap(const unsigned long = *mfn, unsigned int nr);=0A+void vunmap(const void *);=0A+=0A+void __iomem = *ioremap(paddr_t, size_t);=0A+=0A+static inline void iounmap(void __iomem = *va)=0A+{=0A+ vunmap((void __force *)va);=0A+}=0A+=0A+void vm_init(void)= ;=0A+void *arch_vmap_virt_end(void);=0A+=0A+#endif /* __XEN_VMAP_H__ */=0A --=__Part5D6C9DFC.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part5D6C9DFC.0__=-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:31:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:31:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWog2-000562-MR; Fri, 09 Nov 2012 13:31:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWog1-00055w-DD for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 13:31:17 +0000 Received: from [85.158.138.51:33360] by server-4.bemta-3.messagelabs.com id 6E/06-30023-1A50D905; Fri, 09 Nov 2012 13:31:13 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1352467749!29378592!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12363 invoked from network); 9 Nov 2012 13:29:09 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 13:29:09 -0000 X-IronPort-AV: E=Sophos;i="4.80,745,1344211200"; d="scan'208";a="15697118" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 13:29:05 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 13:29:05 +0000 Message-ID: <1352467744.27833.21.camel@zakaz.uk.xensource.com> From: Ian Campbell To: John Weekes Date: Fri, 9 Nov 2012 13:29:04 +0000 In-Reply-To: <509C19DE.6010108@nuclearfallout.net> References: <509C19DE.6010108@nuclearfallout.net> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "george.dunlap@eu.citrix.com" , "xen-devel@lists.xensource.com" , Matt Wilson , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > - It's not allowing multiple domains to use the same images, at least > under tapdisk2. If I start one domain using an image (a read-only CD-ROM > image, for instance), then start another, I can see in "tap-ctl list" > that only one of the domains actually receives the proper access. The > other either never gets it, or it is disconnected after it's created -- > I can't readily tell which. > > - When I use "xl destroy" on a domain that also has an associated > stubdom, "xl" tries to destroy the tapdisk2 entries for both the domain > and its stubdomain, resulting in errors like these: > > # xl destroy testvds4 > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/isos/DummyCD.iso: No such file or directory > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/customers/testvds4.img: No such file or > directory > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/isos/DummyCD-2.iso: No such file or directory > libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy > failed for 19 > libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy > failed for 18 > > If I'm reading the source correctly, it seems as though the various > destruction functions aren't passing down the domid and ultimately > libxl__device_destroy_tapdisk is calling tap_ctl_find, which just > globally matches based on the type and name of the image, causing the > errors on destroy. Both of these sound like genuine bugs which should be fixed, thanks for reporting. Are either of them something you might be interested in tackling? I'm nore than happy to give guidance etc. For clarity it might be useful to have the config files for the various domains involved here. > Another, much more minor, bug in "xl" that I've found is that "xl > uptime" will not run without an argument; it is supposed to just show > all uptimes in this circumstance. This is an easy one-liner fix of > modifying line: > > tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, > "s", "uptime", 1)) != -1) { > > into this: > > tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, > "s", "uptime", 0)) != -1) { > > Also, a couple of small typos in "xl" -- > > libxl.c:556: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:575: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:678: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:1393: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant > domain %d", domid); Would you mind submitting patches for these two issues please? See http://wiki.xen.org/wiki/Submitting_Xen_Patches for some hints/tip/guidance. > Also, running "xl sched-credit" always gives me an error, even though it > seems to work. Maybe it should be silent if cpu pools aren't defined? George (CCd) submitted a fix for this a while back (see http://marc.info/?l=xen-devel&m=134502346714773). There is an outstanding question though. > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > a build problem -- even though I use "./configure --libdir=/usr/lib64", > the build is still creating a "dist/install/usr/lib" directory, and > because of this, running ./install.sh nukes my system's "/usr/lib" -> > "/usr/lib64" softlink (which in turn causes all sorts of other problems > until it's corrected). Files that are being put in that tree: > > xen-4.2-testing.hg # find dist/install/usr/lib > dist/install/usr/lib This is an interesting one. I'm not sure how we can avoid this behaviour, perhaps there is a tar option to cause it to follow rather than clobber synlinks? The only other choice I can think of is to change install.sh to use a (long) explicit list of $(FOO_DIR)/* entries instead of the single * to avoid including system directories, or to otherwise make install.sh more fragile and prone to bitrot :-( I must confess I didn't realise anyone used install.sh -- is there some advantage to it over make foo-install? OOI which distro has this lib->lib64 link and what issues does removing it create? > dist/install/usr/lib/xen This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you remember? Thanks again for reporting all these. Ian. > dist/install/usr/lib/xen/boot > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > dist/install/usr/lib/xen/boot/hvmloader > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > dist/install/usr/lib/xen/bin > dist/install/usr/lib/xen/bin/stubdom-dm > dist/install/usr/lib/xen/bin/qemu-io > dist/install/usr/lib/xen/bin/qemu-nbd > dist/install/usr/lib/xen/bin/qemu-img > dist/install/usr/lib/xen/bin/xenpaging > dist/install/usr/lib/xen/bin/qemu-dm > dist/install/usr/lib/xen/bin/qemu-system-i386 > dist/install/usr/lib/xen/bin/qemu-ga > dist/install/usr/lib/xen/bin/stubdompath.sh > > -John > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 13:31:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:31:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWog2-000562-MR; Fri, 09 Nov 2012 13:31:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWog1-00055w-DD for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 13:31:17 +0000 Received: from [85.158.138.51:33360] by server-4.bemta-3.messagelabs.com id 6E/06-30023-1A50D905; Fri, 09 Nov 2012 13:31:13 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-174.messagelabs.com!1352467749!29378592!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12363 invoked from network); 9 Nov 2012 13:29:09 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 13:29:09 -0000 X-IronPort-AV: E=Sophos;i="4.80,745,1344211200"; d="scan'208";a="15697118" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 13:29:05 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 13:29:05 +0000 Message-ID: <1352467744.27833.21.camel@zakaz.uk.xensource.com> From: Ian Campbell To: John Weekes Date: Fri, 9 Nov 2012 13:29:04 +0000 In-Reply-To: <509C19DE.6010108@nuclearfallout.net> References: <509C19DE.6010108@nuclearfallout.net> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "george.dunlap@eu.citrix.com" , "xen-devel@lists.xensource.com" , Matt Wilson , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > - It's not allowing multiple domains to use the same images, at least > under tapdisk2. If I start one domain using an image (a read-only CD-ROM > image, for instance), then start another, I can see in "tap-ctl list" > that only one of the domains actually receives the proper access. The > other either never gets it, or it is disconnected after it's created -- > I can't readily tell which. > > - When I use "xl destroy" on a domain that also has an associated > stubdom, "xl" tries to destroy the tapdisk2 entries for both the domain > and its stubdomain, resulting in errors like these: > > # xl destroy testvds4 > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/isos/DummyCD.iso: No such file or directory > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/customers/testvds4.img: No such file or > directory > libxl: error: libxl_blktap2.c:73:libxl__device_destroy_tapdisk: Unable > to find type aio disk /servers/isos/DummyCD-2.iso: No such file or directory > libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy > failed for 19 > libxl: error: libxl.c:1466:devices_destroy_cb: libxl__devices_destroy > failed for 18 > > If I'm reading the source correctly, it seems as though the various > destruction functions aren't passing down the domid and ultimately > libxl__device_destroy_tapdisk is calling tap_ctl_find, which just > globally matches based on the type and name of the image, causing the > errors on destroy. Both of these sound like genuine bugs which should be fixed, thanks for reporting. Are either of them something you might be interested in tackling? I'm nore than happy to give guidance etc. For clarity it might be useful to have the config files for the various domains involved here. > Another, much more minor, bug in "xl" that I've found is that "xl > uptime" will not run without an argument; it is supposed to just show > all uptimes in this circumstance. This is an easy one-liner fix of > modifying line: > > tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, > "s", "uptime", 1)) != -1) { > > into this: > > tools/libxl/xl_cmdimpl.c:5749: while ((opt = def_getopt(argc, argv, > "s", "uptime", 0)) != -1) { > > Also, a couple of small typos in "xl" -- > > libxl.c:556: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:575: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:678: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting > domain info list"); > libxl.c:1393: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "non-existant > domain %d", domid); Would you mind submitting patches for these two issues please? See http://wiki.xen.org/wiki/Submitting_Xen_Patches for some hints/tip/guidance. > Also, running "xl sched-credit" always gives me an error, even though it > seems to work. Maybe it should be silent if cpu pools aren't defined? George (CCd) submitted a fix for this a while back (see http://marc.info/?l=xen-devel&m=134502346714773). There is an outstanding question though. > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > a build problem -- even though I use "./configure --libdir=/usr/lib64", > the build is still creating a "dist/install/usr/lib" directory, and > because of this, running ./install.sh nukes my system's "/usr/lib" -> > "/usr/lib64" softlink (which in turn causes all sorts of other problems > until it's corrected). Files that are being put in that tree: > > xen-4.2-testing.hg # find dist/install/usr/lib > dist/install/usr/lib This is an interesting one. I'm not sure how we can avoid this behaviour, perhaps there is a tar option to cause it to follow rather than clobber synlinks? The only other choice I can think of is to change install.sh to use a (long) explicit list of $(FOO_DIR)/* entries instead of the single * to avoid including system directories, or to otherwise make install.sh more fragile and prone to bitrot :-( I must confess I didn't realise anyone used install.sh -- is there some advantage to it over make foo-install? OOI which distro has this lib->lib64 link and what issues does removing it create? > dist/install/usr/lib/xen This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you remember? Thanks again for reporting all these. Ian. > dist/install/usr/lib/xen/boot > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > dist/install/usr/lib/xen/boot/hvmloader > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > dist/install/usr/lib/xen/bin > dist/install/usr/lib/xen/bin/stubdom-dm > dist/install/usr/lib/xen/bin/qemu-io > dist/install/usr/lib/xen/bin/qemu-nbd > dist/install/usr/lib/xen/bin/qemu-img > dist/install/usr/lib/xen/bin/xenpaging > dist/install/usr/lib/xen/bin/qemu-dm > dist/install/usr/lib/xen/bin/qemu-system-i386 > dist/install/usr/lib/xen/bin/qemu-ga > dist/install/usr/lib/xen/bin/stubdompath.sh > > -John > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 13:49:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:49:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWowr-0005Js-A1; Fri, 09 Nov 2012 13:48:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWowp-0005Jn-TP for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:48:40 +0000 Received: from [85.158.138.51:32469] by server-5.bemta-3.messagelabs.com id A2/77-26311-7B90D905; Fri, 09 Nov 2012 13:48:39 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352468916!20498710!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26108 invoked from network); 9 Nov 2012 13:48:38 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 13:48:38 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9DmX8X014938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 13:48:34 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9DmWA7002488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 13:48:33 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9DmWxo016186; Fri, 9 Nov 2012 07:48:32 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 05:48:32 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E39774042D; Fri, 9 Nov 2012 08:48:29 -0500 (EST) Date: Fri, 9 Nov 2012 08:48:29 -0500 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121109134829.GB30634@phenom.dumpdata.com> References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> <509CFA7B02000078000A778C@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline In-Reply-To: <509CFA7B02000078000A778C@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Ian Campbell , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: > >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > > In the forward ported kernels, those two checks are however > > accompanied by range_needs_mapping() (aka > > range_straddles_page_boundary()) checks, which ought to > > take care of this. There is brokenness there with the invocations > > of gnttab_dma_map_page(), but only if the initial offset is at > > least PAGE_SIZE - will have to check whether that occurs. > > And indeed, fixing this also makes the problem go away when > the allocation order doesn't get forced to zero. So presumably > there's also only that one problem I had pointed out in pv-ops. The pvops one has this in the map-page variant (xen_swiotlb_map_page): 351 if (dma_capable(dev, dev_addr, size) && 352 !range_straddles_page_boundary(phys, size) && !swiotlb_force) 353 return dev_addr; and in the sg variant: 494 if (swiotlb_force || 495 !dma_capable(hwdev, dev_addr, sg->length) || 496 range_straddles_page_boundary(paddr, sg->length)) { 497 void *map = swiotlb_tbl_map_single(hwdev, So I think that check is OK. There is no gnttab_dma_map_page call - so that can't be the issue. I did play with this a bit and wrote this little driver (see attached) that forces allocation of large pages and it worked as expected on Xen-SWIOTLB. But while doing this I found that the 'skge' driver is busted - it does not even work on baremetal if you do 'iommu=soft swiotlb=force'. Since Xen-SWIOTLB would occasionaly use the bounce-buffer - and with greater than 0-page order - the bug in skge became more obvious. I hadn't narrowed down where the issue is with skge. > > Jan --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dma_test.c" #include #include #include #include #include #include #include #define DMA_TEST "0.1" MODULE_AUTHOR("Konrad Rzeszutek Wilk "); MODULE_DESCRIPTION("dma_test"); MODULE_LICENSE("GPL"); MODULE_VERSION(DMA_TEST); static struct bus_type fallback_bus_type = { .name = "fallback_bus:", }; static void fake_release(struct device *dev) { /* No kfree as the device was allocated on stack. */ } struct args { int len; enum dma_data_direction dir; }; #define MAGIC_DEVICE 0xffffffdd #define MAGIC_CPU 0xffffffcc static int dma_test_thread(void *arg) { struct page *page; dma_addr_t dma_addr = 0; struct device fake = { .coherent_dma_mask = DMA_BIT_MASK(32), .bus = &fallback_bus_type, .release = fake_release, }; gfp_t gfp = __GFP_COMP | __GFP_NOWARN | GFP_ATOMIC; int ret; int i; void *addr; struct page *p; struct args *args = (struct args *)arg; int dir = args->dir; int len = args->len; dev_set_name(&fake, "%s", dir == DMA_TO_DEVICE ? "to_dev" : "to_cpu"); fake.dma_mask = &fake.coherent_dma_mask; ret = device_register(&fake); if (ret) goto out; do { unsigned long prev_mfn = 0; bool bus_and_dma_same; page = alloc_pages(gfp, get_order(len)); p = page; /* Check that the bus addresses are contingous. */ for (i = 0; i < len / PAGE_SIZE; i++, p++) { unsigned long pfn, mfn; addr = page_address(p); pfn = PFN_DOWN(virt_to_phys(addr)); if (xen_domain()) mfn = pfn_to_mfn(pfn); else mfn = pfn; if (i != 0) { if (prev_mfn + 1 != mfn) dev_warn(&fake, "va: %lx (pfn:%lx, mfn:%lx) w.r.t prev mfn: %lx!\n", (unsigned long)addr, pfn, mfn, prev_mfn); } prev_mfn = mfn; } dma_addr = dma_map_page(&fake, page, 0 /* no offset */, len, dir); /* Note, dma_addr is the physical address ! */ if (dma_mapping_error(&fake, dma_addr)) { dev_warn(&fake, "DMA %lx for %lx is not right\n", (unsigned long)dma_addr, (unsigned long)page_address(page)); __free_pages(page, get_order(len)); page = NULL; } bus_and_dma_same = false; if (page) { unsigned long phys; unsigned long pfn, mfn, bus_addr_mfn; unsigned long bus_addr = 0; p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { void *bus_va; addr = page_address(p); phys = virt_to_phys(addr); pfn = PFN_DOWN(phys); bus_va = (void *)(dma_addr + (i * PAGE_SIZE)); if (xen_domain()) { void * tmp; /* Find the bus frame for the physical frame*/ mfn = pfn_to_mfn(pfn); /* and .. voodoo time! */ bus_addr_mfn = PFN_DOWN(dma_addr + (i * PAGE_SIZE)); bus_addr = PFN_PHYS(mfn_to_pfn(bus_addr_mfn)); tmp = __va(bus_addr); bus_va = mfn_to_virt(bus_addr_mfn); WARN(bus_va != tmp, "Expected %lx (%lx+%d*PAGE_SIZE), got: %lx (pfn: %lx, mfn: %lx)!\n", (unsigned long)bus_va, (unsigned long)dma_addr, i, (unsigned long)tmp, PFN_DOWN(bus_addr), bus_addr_mfn); } else { mfn = pfn; bus_addr = (unsigned long)bus_va; /* Assume DMA addr == physical addr */ bus_addr_mfn = PFN_DOWN(bus_addr); bus_va = __va(PFN_PHYS(bus_addr_mfn)); } dev_info(&fake, "%lx (pfn:%lx, bus frame: %lx) %s %lx (addr: %lx, frame: %lx)\n", (unsigned long)addr, pfn, mfn, dir == DMA_TO_DEVICE ? "=>" : "<=", (unsigned long)bus_va, bus_addr, bus_addr_mfn); if (!virt_addr_valid(bus_va)) break; if (!virt_addr_valid(addr)) break; /* CPU */ memset(addr, 0xCC, PAGE_SIZE); /* Device */ memset(bus_va, 0xDD, PAGE_SIZE); if (addr == bus_va) bus_and_dma_same = true; } } set_current_state(TASK_INTERRUPTIBLE); schedule_timeout_interruptible(5*HZ); if (!page) continue; p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { if (bus_and_dma_same) continue; addr = page_address(p); if (((char *)addr)[0] != MAGIC_CPU) dev_warn(&fake, "%lx with DMA (%lx) has %x (expected %lx)\n", (unsigned long)addr, (unsigned long)(dma_addr + (i * PAGE_SIZE)), ((char *)addr)[0], (unsigned long)MAGIC_CPU); } /* sync the page */ dma_sync_single_for_cpu(&fake, dma_addr, len, dir); p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { unsigned long check_val = MAGIC_DEVICE; addr = page_address(p); if (dir == DMA_TO_DEVICE) check_val = MAGIC_CPU; if (dir == DMA_FROM_DEVICE) check_val = MAGIC_DEVICE; dev_info(&fake, "%lx with DMA (%lx) has %x (expected %lx)\n", (unsigned long)addr, (unsigned long)(dma_addr + (i * PAGE_SIZE)), ((char *)addr)[0], check_val); } dma_unmap_page(&fake, dma_addr, len, dir); dma_addr = 0; __free_pages(page, get_order(len)); page = NULL; } while (!kthread_should_stop()); if (dma_addr) dma_unmap_page(&fake, dma_addr, len, dir); if (page) __free_pages(page, get_order(len)); put_device(&fake); device_unregister(&fake); out: return 0; } static struct task_struct *t[2]; static struct args a[2]; static int __init dma_test_init(void) { int ret; /* No point doing this without SWIOTLB */ if (!swiotlb_nr_tbl()) return -ENODEV; ret = bus_register(&fallback_bus_type); if (ret) return ret; a[0].dir = DMA_TO_DEVICE; a[0].len = 32768; t[0] = kthread_run(dma_test_thread, &a[0], "dma_test_dev"); a[1].len = 16384; a[1].dir = DMA_FROM_DEVICE; t[1] = kthread_run(dma_test_thread, &a[1], "dma_test_cpu"); return 0; } static void __exit dma_test_exit(void) { if (t[0]) kthread_stop(t[0]); if (t[1]) kthread_stop(t[1]); bus_unregister(&fallback_bus_type); } module_init(dma_test_init); module_exit(dma_test_exit); --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --5mCyUwZo2JvN/JJP-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:49:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:49:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWowr-0005Js-A1; Fri, 09 Nov 2012 13:48:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWowp-0005Jn-TP for xen-devel@lists.xen.org; Fri, 09 Nov 2012 13:48:40 +0000 Received: from [85.158.138.51:32469] by server-5.bemta-3.messagelabs.com id A2/77-26311-7B90D905; Fri, 09 Nov 2012 13:48:39 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352468916!20498710!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26108 invoked from network); 9 Nov 2012 13:48:38 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 13:48:38 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9DmX8X014938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 13:48:34 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9DmWA7002488 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 13:48:33 GMT Received: from abhmt103.oracle.com (abhmt103.oracle.com [141.146.116.55]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9DmWxo016186; Fri, 9 Nov 2012 07:48:32 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 05:48:32 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id E39774042D; Fri, 9 Nov 2012 08:48:29 -0500 (EST) Date: Fri, 9 Nov 2012 08:48:29 -0500 From: Konrad Rzeszutek Wilk To: Jan Beulich Message-ID: <20121109134829.GB30634@phenom.dumpdata.com> References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> <509CFA7B02000078000A778C@nat28.tlf.novell.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline In-Reply-To: <509CFA7B02000078000A778C@nat28.tlf.novell.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Ian Campbell , xen-devel Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: > >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > > In the forward ported kernels, those two checks are however > > accompanied by range_needs_mapping() (aka > > range_straddles_page_boundary()) checks, which ought to > > take care of this. There is brokenness there with the invocations > > of gnttab_dma_map_page(), but only if the initial offset is at > > least PAGE_SIZE - will have to check whether that occurs. > > And indeed, fixing this also makes the problem go away when > the allocation order doesn't get forced to zero. So presumably > there's also only that one problem I had pointed out in pv-ops. The pvops one has this in the map-page variant (xen_swiotlb_map_page): 351 if (dma_capable(dev, dev_addr, size) && 352 !range_straddles_page_boundary(phys, size) && !swiotlb_force) 353 return dev_addr; and in the sg variant: 494 if (swiotlb_force || 495 !dma_capable(hwdev, dev_addr, sg->length) || 496 range_straddles_page_boundary(paddr, sg->length)) { 497 void *map = swiotlb_tbl_map_single(hwdev, So I think that check is OK. There is no gnttab_dma_map_page call - so that can't be the issue. I did play with this a bit and wrote this little driver (see attached) that forces allocation of large pages and it worked as expected on Xen-SWIOTLB. But while doing this I found that the 'skge' driver is busted - it does not even work on baremetal if you do 'iommu=soft swiotlb=force'. Since Xen-SWIOTLB would occasionaly use the bounce-buffer - and with greater than 0-page order - the bug in skge became more obvious. I hadn't narrowed down where the issue is with skge. > > Jan --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dma_test.c" #include #include #include #include #include #include #include #define DMA_TEST "0.1" MODULE_AUTHOR("Konrad Rzeszutek Wilk "); MODULE_DESCRIPTION("dma_test"); MODULE_LICENSE("GPL"); MODULE_VERSION(DMA_TEST); static struct bus_type fallback_bus_type = { .name = "fallback_bus:", }; static void fake_release(struct device *dev) { /* No kfree as the device was allocated on stack. */ } struct args { int len; enum dma_data_direction dir; }; #define MAGIC_DEVICE 0xffffffdd #define MAGIC_CPU 0xffffffcc static int dma_test_thread(void *arg) { struct page *page; dma_addr_t dma_addr = 0; struct device fake = { .coherent_dma_mask = DMA_BIT_MASK(32), .bus = &fallback_bus_type, .release = fake_release, }; gfp_t gfp = __GFP_COMP | __GFP_NOWARN | GFP_ATOMIC; int ret; int i; void *addr; struct page *p; struct args *args = (struct args *)arg; int dir = args->dir; int len = args->len; dev_set_name(&fake, "%s", dir == DMA_TO_DEVICE ? "to_dev" : "to_cpu"); fake.dma_mask = &fake.coherent_dma_mask; ret = device_register(&fake); if (ret) goto out; do { unsigned long prev_mfn = 0; bool bus_and_dma_same; page = alloc_pages(gfp, get_order(len)); p = page; /* Check that the bus addresses are contingous. */ for (i = 0; i < len / PAGE_SIZE; i++, p++) { unsigned long pfn, mfn; addr = page_address(p); pfn = PFN_DOWN(virt_to_phys(addr)); if (xen_domain()) mfn = pfn_to_mfn(pfn); else mfn = pfn; if (i != 0) { if (prev_mfn + 1 != mfn) dev_warn(&fake, "va: %lx (pfn:%lx, mfn:%lx) w.r.t prev mfn: %lx!\n", (unsigned long)addr, pfn, mfn, prev_mfn); } prev_mfn = mfn; } dma_addr = dma_map_page(&fake, page, 0 /* no offset */, len, dir); /* Note, dma_addr is the physical address ! */ if (dma_mapping_error(&fake, dma_addr)) { dev_warn(&fake, "DMA %lx for %lx is not right\n", (unsigned long)dma_addr, (unsigned long)page_address(page)); __free_pages(page, get_order(len)); page = NULL; } bus_and_dma_same = false; if (page) { unsigned long phys; unsigned long pfn, mfn, bus_addr_mfn; unsigned long bus_addr = 0; p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { void *bus_va; addr = page_address(p); phys = virt_to_phys(addr); pfn = PFN_DOWN(phys); bus_va = (void *)(dma_addr + (i * PAGE_SIZE)); if (xen_domain()) { void * tmp; /* Find the bus frame for the physical frame*/ mfn = pfn_to_mfn(pfn); /* and .. voodoo time! */ bus_addr_mfn = PFN_DOWN(dma_addr + (i * PAGE_SIZE)); bus_addr = PFN_PHYS(mfn_to_pfn(bus_addr_mfn)); tmp = __va(bus_addr); bus_va = mfn_to_virt(bus_addr_mfn); WARN(bus_va != tmp, "Expected %lx (%lx+%d*PAGE_SIZE), got: %lx (pfn: %lx, mfn: %lx)!\n", (unsigned long)bus_va, (unsigned long)dma_addr, i, (unsigned long)tmp, PFN_DOWN(bus_addr), bus_addr_mfn); } else { mfn = pfn; bus_addr = (unsigned long)bus_va; /* Assume DMA addr == physical addr */ bus_addr_mfn = PFN_DOWN(bus_addr); bus_va = __va(PFN_PHYS(bus_addr_mfn)); } dev_info(&fake, "%lx (pfn:%lx, bus frame: %lx) %s %lx (addr: %lx, frame: %lx)\n", (unsigned long)addr, pfn, mfn, dir == DMA_TO_DEVICE ? "=>" : "<=", (unsigned long)bus_va, bus_addr, bus_addr_mfn); if (!virt_addr_valid(bus_va)) break; if (!virt_addr_valid(addr)) break; /* CPU */ memset(addr, 0xCC, PAGE_SIZE); /* Device */ memset(bus_va, 0xDD, PAGE_SIZE); if (addr == bus_va) bus_and_dma_same = true; } } set_current_state(TASK_INTERRUPTIBLE); schedule_timeout_interruptible(5*HZ); if (!page) continue; p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { if (bus_and_dma_same) continue; addr = page_address(p); if (((char *)addr)[0] != MAGIC_CPU) dev_warn(&fake, "%lx with DMA (%lx) has %x (expected %lx)\n", (unsigned long)addr, (unsigned long)(dma_addr + (i * PAGE_SIZE)), ((char *)addr)[0], (unsigned long)MAGIC_CPU); } /* sync the page */ dma_sync_single_for_cpu(&fake, dma_addr, len, dir); p = page; for (i = 0; i < len / PAGE_SIZE; i++, p++) { unsigned long check_val = MAGIC_DEVICE; addr = page_address(p); if (dir == DMA_TO_DEVICE) check_val = MAGIC_CPU; if (dir == DMA_FROM_DEVICE) check_val = MAGIC_DEVICE; dev_info(&fake, "%lx with DMA (%lx) has %x (expected %lx)\n", (unsigned long)addr, (unsigned long)(dma_addr + (i * PAGE_SIZE)), ((char *)addr)[0], check_val); } dma_unmap_page(&fake, dma_addr, len, dir); dma_addr = 0; __free_pages(page, get_order(len)); page = NULL; } while (!kthread_should_stop()); if (dma_addr) dma_unmap_page(&fake, dma_addr, len, dir); if (page) __free_pages(page, get_order(len)); put_device(&fake); device_unregister(&fake); out: return 0; } static struct task_struct *t[2]; static struct args a[2]; static int __init dma_test_init(void) { int ret; /* No point doing this without SWIOTLB */ if (!swiotlb_nr_tbl()) return -ENODEV; ret = bus_register(&fallback_bus_type); if (ret) return ret; a[0].dir = DMA_TO_DEVICE; a[0].len = 32768; t[0] = kthread_run(dma_test_thread, &a[0], "dma_test_dev"); a[1].len = 16384; a[1].dir = DMA_FROM_DEVICE; t[1] = kthread_run(dma_test_thread, &a[1], "dma_test_cpu"); return 0; } static void __exit dma_test_exit(void) { if (t[0]) kthread_stop(t[0]); if (t[1]) kthread_stop(t[1]); bus_unregister(&fallback_bus_type); } module_init(dma_test_init); module_exit(dma_test_exit); --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --5mCyUwZo2JvN/JJP-- From xen-devel-bounces@lists.xen.org Fri Nov 09 13:56:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:56:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWp4T-0005av-TG; Fri, 09 Nov 2012 13:56:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWp4S-0005am-4U for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 13:56:32 +0000 Received: from [85.158.139.83:48242] by server-15.bemta-5.messagelabs.com id 36/CC-26920-F8B0D905; Fri, 09 Nov 2012 13:56:31 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-9.tower-182.messagelabs.com!1352469390!28844870!1 X-Originating-IP: [212.106.158.142] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1428 invoked from network); 9 Nov 2012 13:56:30 -0000 Received: from eggsoft.sp.imz.pl (HELO jajo.eggsoft.pl) (212.106.158.142) by server-9.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 13:56:30 -0000 Received: by jajo.eggsoft.pl (Postfix, from userid 1000) id 55873B002; Fri, 9 Nov 2012 14:56:29 +0100 (CET) From: Jacek Konieczny To: xen-devel@lists.xensource.com Date: Fri, 9 Nov 2012 14:56:11 +0100 Message-Id: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> X-Mailer: git-send-email 1.7.12.4 Cc: Jacek Konieczny Subject: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The claim_lock() function would fail in the perl code with: Invalid argument at -e line 2. because the Perl snippet opens for reading the file descriptor, which was earlier opened for write (append). Signed-off-by: Jacek Konieczny --- tools/hotplug/Linux/locking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh index e34f155..122bcfb 100644 --- a/tools/hotplug/Linux/locking.sh +++ b/tools/hotplug/Linux/locking.sh @@ -44,7 +44,7 @@ claim_lock() # See below for a correctness proof. local rightfile while true; do - eval "exec $_lockfd>>$_lockfile" + eval "exec $_lockfd<>$_lockfile" flock -x $_lockfd || return $? # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or # use bash's test -ef because those all go through what is -- 1.7.12.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 13:56:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 13:56:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWp4T-0005av-TG; Fri, 09 Nov 2012 13:56:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWp4S-0005am-4U for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 13:56:32 +0000 Received: from [85.158.139.83:48242] by server-15.bemta-5.messagelabs.com id 36/CC-26920-F8B0D905; Fri, 09 Nov 2012 13:56:31 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-9.tower-182.messagelabs.com!1352469390!28844870!1 X-Originating-IP: [212.106.158.142] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1428 invoked from network); 9 Nov 2012 13:56:30 -0000 Received: from eggsoft.sp.imz.pl (HELO jajo.eggsoft.pl) (212.106.158.142) by server-9.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 13:56:30 -0000 Received: by jajo.eggsoft.pl (Postfix, from userid 1000) id 55873B002; Fri, 9 Nov 2012 14:56:29 +0100 (CET) From: Jacek Konieczny To: xen-devel@lists.xensource.com Date: Fri, 9 Nov 2012 14:56:11 +0100 Message-Id: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> X-Mailer: git-send-email 1.7.12.4 Cc: Jacek Konieczny Subject: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The claim_lock() function would fail in the perl code with: Invalid argument at -e line 2. because the Perl snippet opens for reading the file descriptor, which was earlier opened for write (append). Signed-off-by: Jacek Konieczny --- tools/hotplug/Linux/locking.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh index e34f155..122bcfb 100644 --- a/tools/hotplug/Linux/locking.sh +++ b/tools/hotplug/Linux/locking.sh @@ -44,7 +44,7 @@ claim_lock() # See below for a correctness proof. local rightfile while true; do - eval "exec $_lockfd>>$_lockfile" + eval "exec $_lockfd<>$_lockfile" flock -x $_lockfd || return $? # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or # use bash's test -ef because those all go through what is -- 1.7.12.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 14:11:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 14:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpJ5-0005zs-CX; Fri, 09 Nov 2012 14:11:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpJ3-0005zl-9k for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 14:11:37 +0000 Received: from [85.158.138.51:28973] by server-5.bemta-3.messagelabs.com id DD/89-26311-81F0D905; Fri, 09 Nov 2012 14:11:36 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352470293!9667191!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7372 invoked from network); 9 Nov 2012 14:11:35 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-13.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 14:11:35 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9EBV2Z009451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 14:11:32 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9EBUU5017075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 14:11:31 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9EBUph001995; Fri, 9 Nov 2012 08:11:30 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 06:11:30 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C4D054037A; Fri, 9 Nov 2012 09:11:27 -0500 (EST) Date: Fri, 9 Nov 2012 09:11:27 -0500 From: Konrad Rzeszutek Wilk To: Linus Torvalds , linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Message-ID: <20121109141127.GA16019@phenom.dumpdata.com> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [GIT PULL] (xen) stable/for-linus-3.7-rc5-tag X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0202461555952865438==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0202461555952865438== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="X1bOJ3K7DJ5YkBrT" Content-Disposition: inline --X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hey Linus, Please git pull the following tag: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-3.7-rc5-tag which has bug-fixes. There are three ARM compile fixes (we forgot to export certain functions and if the drivers are built as an module - we go belly-up). There is also an mismatch of irq_enter() / exit_idle() calls sequence - which were fixed some time ago in other piece of codes, but failed to appear in the Xen code. Lastly a fix for to help in the field with troubleshooting in case we cannot get the appropriate parameter and also fallback code when working with very old hypervisors. Please pull! arch/arm/xen/enlighten.c | 11 +++++ arch/x86/include/asm/xen/hypercall.h | 21 +++------ drivers/xen/Makefile | 1 + drivers/xen/events.c | 2 +- drivers/xen/fallback.c | 80 ++++++++++++++++++++++++++++++++++ include/xen/hvm.h | 34 +++++++++++++- 6 files changed, 132 insertions(+), 17 deletions(-) Jan Beulich (1): xen/hypercall: fix hypercall fallback code for very old hypervisors Konrad Rzeszutek Wilk (3): xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. xen/generic: Disable fallback build on ARM. xen/arm: Fix compile errors when drivers are compiled as modules. Mojiong Qiu (1): xen/events: fix RCU warning, or Call idle notifier after irq_enter() Stefano Stabellini (1): xen/arm: Fix compile errors when drivers are compiled as modules (export more). --X1bOJ3K7DJ5YkBrT Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAEBAgAGBQJQnQ8LAAoJEFjIrFwIi8fJz3oH/1Ij7c2u0KlRYRvgipf6Gmv4 emorzbz+I1CRQHEE9idaHCEI1tH/7Eb46L0Cq/P8sXZOaS2MhLbh1LRbnprExw7q 6ur2Cms0acmxtnIvrz+l3ntAgfxO+D/a6lhd0rlNVGfa05BvP41xWdntrUdLgCI9 4aDB0ZtSU70bbgSyRnLRENtqisD9tulg+q+XseSEYnbOnik3z9jJaFWtOibRwFZN udeFqbvji65KkpvvrjhvSx5MlMXx7oZRNdRmt9HP3wtTfSEhAxuXY/9nVv8NR6Xd J5lWACZC14pLFiL0HILbQmy3HHRaQQnjeOoRdvvuJubQSk2p9R0IUdKm5rXBkdA= =EBAd -----END PGP SIGNATURE----- --X1bOJ3K7DJ5YkBrT-- --===============0202461555952865438== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0202461555952865438==-- From xen-devel-bounces@lists.xen.org Fri Nov 09 14:11:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 14:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpJ5-0005zs-CX; Fri, 09 Nov 2012 14:11:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpJ3-0005zl-9k for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 14:11:37 +0000 Received: from [85.158.138.51:28973] by server-5.bemta-3.messagelabs.com id DD/89-26311-81F0D905; Fri, 09 Nov 2012 14:11:36 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1352470293!9667191!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7372 invoked from network); 9 Nov 2012 14:11:35 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-13.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 14:11:35 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9EBV2Z009451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 14:11:32 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9EBUU5017075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 14:11:31 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9EBUph001995; Fri, 9 Nov 2012 08:11:30 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 06:11:30 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id C4D054037A; Fri, 9 Nov 2012 09:11:27 -0500 (EST) Date: Fri, 9 Nov 2012 09:11:27 -0500 From: Konrad Rzeszutek Wilk To: Linus Torvalds , linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Message-ID: <20121109141127.GA16019@phenom.dumpdata.com> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [GIT PULL] (xen) stable/for-linus-3.7-rc5-tag X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0202461555952865438==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0202461555952865438== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="X1bOJ3K7DJ5YkBrT" Content-Disposition: inline --X1bOJ3K7DJ5YkBrT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hey Linus, Please git pull the following tag: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-3.7-rc5-tag which has bug-fixes. There are three ARM compile fixes (we forgot to export certain functions and if the drivers are built as an module - we go belly-up). There is also an mismatch of irq_enter() / exit_idle() calls sequence - which were fixed some time ago in other piece of codes, but failed to appear in the Xen code. Lastly a fix for to help in the field with troubleshooting in case we cannot get the appropriate parameter and also fallback code when working with very old hypervisors. Please pull! arch/arm/xen/enlighten.c | 11 +++++ arch/x86/include/asm/xen/hypercall.h | 21 +++------ drivers/xen/Makefile | 1 + drivers/xen/events.c | 2 +- drivers/xen/fallback.c | 80 ++++++++++++++++++++++++++++++++++ include/xen/hvm.h | 34 +++++++++++++- 6 files changed, 132 insertions(+), 17 deletions(-) Jan Beulich (1): xen/hypercall: fix hypercall fallback code for very old hypervisors Konrad Rzeszutek Wilk (3): xen/hvm: If we fail to fetch an HVM parameter print out which flag it is. xen/generic: Disable fallback build on ARM. xen/arm: Fix compile errors when drivers are compiled as modules. Mojiong Qiu (1): xen/events: fix RCU warning, or Call idle notifier after irq_enter() Stefano Stabellini (1): xen/arm: Fix compile errors when drivers are compiled as modules (export more). --X1bOJ3K7DJ5YkBrT Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAEBAgAGBQJQnQ8LAAoJEFjIrFwIi8fJz3oH/1Ij7c2u0KlRYRvgipf6Gmv4 emorzbz+I1CRQHEE9idaHCEI1tH/7Eb46L0Cq/P8sXZOaS2MhLbh1LRbnprExw7q 6ur2Cms0acmxtnIvrz+l3ntAgfxO+D/a6lhd0rlNVGfa05BvP41xWdntrUdLgCI9 4aDB0ZtSU70bbgSyRnLRENtqisD9tulg+q+XseSEYnbOnik3z9jJaFWtOibRwFZN udeFqbvji65KkpvvrjhvSx5MlMXx7oZRNdRmt9HP3wtTfSEhAxuXY/9nVv8NR6Xd J5lWACZC14pLFiL0HILbQmy3HHRaQQnjeOoRdvvuJubQSk2p9R0IUdKm5rXBkdA= =EBAd -----END PGP SIGNATURE----- --X1bOJ3K7DJ5YkBrT-- --===============0202461555952865438== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0202461555952865438==-- From xen-devel-bounces@lists.xen.org Fri Nov 09 14:56:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 14:56:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpzp-0006HR-52; Fri, 09 Nov 2012 14:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpzn-0006HM-JL for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 14:55:47 +0000 Received: from [85.158.137.99:54542] by server-12.bemta-3.messagelabs.com id C8/84-22757-F691D905; Fri, 09 Nov 2012 14:55:43 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352472941!13653499!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18631 invoked from network); 9 Nov 2012 14:55:42 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 14:55:42 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9EtXKb027141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 14:55:33 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9EtWET005925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 14:55:32 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9EtWWr029721; Fri, 9 Nov 2012 08:55:32 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 06:55:31 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id A74294037B; Fri, 9 Nov 2012 09:55:29 -0500 (EST) Date: Fri, 9 Nov 2012 09:55:29 -0500 From: Konrad Rzeszutek Wilk To: axboe@kernel.dk, linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Message-ID: <20121109145529.GB23023@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Subject: [Xen-devel] [GIT PULL] (xen) stable/for-jens-3.8 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Jens, Please git pull the following branch: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.8 which has a new feature of the blk[back|front] driver - it is called 'feature-persistent'. Roger and Oliver patch says: " This patch implements persistent grants for the xen-blk{front,back} mechanism. The effect of this change is to reduce the number of unmap operations performed, since they cause a (costly) TLB shootdown. This allows the I/O performance to scale better when a large number of VMs are performing I/O. Previously, the blkfront driver was supplied a bvec[] from the request queue. This was granted to dom0; dom0 performed the I/O and wrote directly into the grant-mapped memory and unmapped it; blkfront then removed foreign access for that grant. The cost of unmapping scales badly with the number of CPUs in Dom0. An experiment showed that when Dom0 has 24 VCPUs, and guests are performing parallel I/O to a ramdisk, the IPIs from performing unmap's is a bottleneck at 5 guests (at which point 650,000 IOPS are being performed in total). If more than 5 guests are used, the performance declines. By 10 guests, only 400,000 IOPS are being performed. This patch improves performance by only unmapping when the connection between blkfront and back is broken. " Note: You might get a conflict in the common.h file. It should be fairly easy to fix it - it should end up looking as this: 160 /* Cached size parameter. */ 161 sector_t size; 162 unsigned int flush_support:1; 163 unsigned int discard_secure:1; 164 unsigned int feature_gnt_persistent:1; 165 unsigned int overflow_max_grants:1; 166 }; Thanks! drivers/block/xen-blkback/blkback.c | 295 ++++++++++++++++++++++++++++++++--- drivers/block/xen-blkback/common.h | 17 ++ drivers/block/xen-blkback/xenbus.c | 23 +++- drivers/block/xen-blkfront.c | 198 ++++++++++++++++++++---- 4 files changed, 478 insertions(+), 55 deletions(-) Roger Pau Monne (2): xen/blkback: Persistent grant maps for xen blk drivers xen/blkback: persistent-grants fixes _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 14:56:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 14:56:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpzp-0006HR-52; Fri, 09 Nov 2012 14:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWpzn-0006HM-JL for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 14:55:47 +0000 Received: from [85.158.137.99:54542] by server-12.bemta-3.messagelabs.com id C8/84-22757-F691D905; Fri, 09 Nov 2012 14:55:43 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352472941!13653499!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1MjgxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18631 invoked from network); 9 Nov 2012 14:55:42 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 9 Nov 2012 14:55:42 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qA9EtXKb027141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 14:55:33 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qA9EtWET005925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Nov 2012 14:55:32 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qA9EtWWr029721; Fri, 9 Nov 2012 08:55:32 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 09 Nov 2012 06:55:31 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id A74294037B; Fri, 9 Nov 2012 09:55:29 -0500 (EST) Date: Fri, 9 Nov 2012 09:55:29 -0500 From: Konrad Rzeszutek Wilk To: axboe@kernel.dk, linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Message-ID: <20121109145529.GB23023@phenom.dumpdata.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Subject: [Xen-devel] [GIT PULL] (xen) stable/for-jens-3.8 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Jens, Please git pull the following branch: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.8 which has a new feature of the blk[back|front] driver - it is called 'feature-persistent'. Roger and Oliver patch says: " This patch implements persistent grants for the xen-blk{front,back} mechanism. The effect of this change is to reduce the number of unmap operations performed, since they cause a (costly) TLB shootdown. This allows the I/O performance to scale better when a large number of VMs are performing I/O. Previously, the blkfront driver was supplied a bvec[] from the request queue. This was granted to dom0; dom0 performed the I/O and wrote directly into the grant-mapped memory and unmapped it; blkfront then removed foreign access for that grant. The cost of unmapping scales badly with the number of CPUs in Dom0. An experiment showed that when Dom0 has 24 VCPUs, and guests are performing parallel I/O to a ramdisk, the IPIs from performing unmap's is a bottleneck at 5 guests (at which point 650,000 IOPS are being performed in total). If more than 5 guests are used, the performance declines. By 10 guests, only 400,000 IOPS are being performed. This patch improves performance by only unmapping when the connection between blkfront and back is broken. " Note: You might get a conflict in the common.h file. It should be fairly easy to fix it - it should end up looking as this: 160 /* Cached size parameter. */ 161 sector_t size; 162 unsigned int flush_support:1; 163 unsigned int discard_secure:1; 164 unsigned int feature_gnt_persistent:1; 165 unsigned int overflow_max_grants:1; 166 }; Thanks! drivers/block/xen-blkback/blkback.c | 295 ++++++++++++++++++++++++++++++++--- drivers/block/xen-blkback/common.h | 17 ++ drivers/block/xen-blkback/xenbus.c | 23 +++- drivers/block/xen-blkfront.c | 198 ++++++++++++++++++++---- 4 files changed, 478 insertions(+), 55 deletions(-) Roger Pau Monne (2): xen/blkback: Persistent grant maps for xen blk drivers xen/blkback: persistent-grants fixes _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:07:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:07:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqAt-0006Us-HL; Fri, 09 Nov 2012 15:07:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqAr-0006Un-Ca for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:07:13 +0000 Received: from [193.109.254.147:41881] by server-3.bemta-14.messagelabs.com id C7/17-01317-02C1D905; Fri, 09 Nov 2012 15:07:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352473632!10359996!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31566 invoked from network); 9 Nov 2012 15:07:12 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:07:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15700158" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:07:12 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:07:11 +0000 Message-ID: <1352473630.27833.74.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Fri, 9 Nov 2012 15:07:10 +0000 In-Reply-To: <1351508996-54975-1-git-send-email-roger.pau@citrix.com> References: <1351508996-54975-1-git-send-email-roger.pau@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] docs: document persistent grants X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-10-29 at 11:09 +0000, Roger Pau Monne wrote: > + * A value of "1" indicates that the backend can keep the grants used > + * by the frontend driver mapped, so the same set of grants should be > + * used in all transactions. The maximum number of grants the backend > + * can map persistently depends on the implementation, but ideally it > + * should be RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. Using this > + * feature the backend doesn't need to unmap each grant, preventing > + * costly TLB flushes. > > @@ -279,6 +301,13 @@ > * 'ring-ref' is used to communicate the grant reference for this > * page to the backend. When using a multi-page ring, the 'ring-ref' > * node is not created. Instead 'ring-ref0' - 'ring-refN' are used. > + * (7) When using persistent grants data has to be copied from/to the page > + * where the grant is currently mapped. The overhead of doing this copy > + * however doesn't suppress the speed improvement of not having to unmap > + * the grants. > + * (8) The frontend driver has to allow the backend driver to map all grants > + * with write access, even when they should be mapped read-only, since > + * further requests may reuse this grants and require write permisions. permissions It not clear if it is required to always reuse a grant or if the frontend can use a normal grant if it has run out of persistent slots. It's also not all that clear how a grant becomes persistent and who (front or back) gets to make that determination. AIUI the backend makes the decision whether to keep a grant mapped persistently or not while the frontend is expect to try and reuse grants as much as possible when persistent mode is enabled, is that right? Is there any provision for shrinking the size of the cached pool of mappings when usage is low? I suppose that's a backend implementation detail? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:07:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:07:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqAt-0006Us-HL; Fri, 09 Nov 2012 15:07:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqAr-0006Un-Ca for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:07:13 +0000 Received: from [193.109.254.147:41881] by server-3.bemta-14.messagelabs.com id C7/17-01317-02C1D905; Fri, 09 Nov 2012 15:07:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352473632!10359996!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31566 invoked from network); 9 Nov 2012 15:07:12 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:07:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15700158" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:07:12 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:07:11 +0000 Message-ID: <1352473630.27833.74.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Fri, 9 Nov 2012 15:07:10 +0000 In-Reply-To: <1351508996-54975-1-git-send-email-roger.pau@citrix.com> References: <1351508996-54975-1-git-send-email-roger.pau@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] docs: document persistent grants X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-10-29 at 11:09 +0000, Roger Pau Monne wrote: > + * A value of "1" indicates that the backend can keep the grants used > + * by the frontend driver mapped, so the same set of grants should be > + * used in all transactions. The maximum number of grants the backend > + * can map persistently depends on the implementation, but ideally it > + * should be RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. Using this > + * feature the backend doesn't need to unmap each grant, preventing > + * costly TLB flushes. > > @@ -279,6 +301,13 @@ > * 'ring-ref' is used to communicate the grant reference for this > * page to the backend. When using a multi-page ring, the 'ring-ref' > * node is not created. Instead 'ring-ref0' - 'ring-refN' are used. > + * (7) When using persistent grants data has to be copied from/to the page > + * where the grant is currently mapped. The overhead of doing this copy > + * however doesn't suppress the speed improvement of not having to unmap > + * the grants. > + * (8) The frontend driver has to allow the backend driver to map all grants > + * with write access, even when they should be mapped read-only, since > + * further requests may reuse this grants and require write permisions. permissions It not clear if it is required to always reuse a grant or if the frontend can use a normal grant if it has run out of persistent slots. It's also not all that clear how a grant becomes persistent and who (front or back) gets to make that determination. AIUI the backend makes the decision whether to keep a grant mapped persistently or not while the frontend is expect to try and reuse grants as much as possible when persistent mode is enabled, is that right? Is there any provision for shrinking the size of the cached pool of mappings when usage is low? I suppose that's a backend implementation detail? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:36:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:36:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqcu-00071o-O6; Fri, 09 Nov 2012 15:36:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqct-00071j-Fg for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:36:11 +0000 Received: from [85.158.137.99:59305] by server-13.bemta-3.messagelabs.com id 87/76-24887-AE22D905; Fri, 09 Nov 2012 15:36:10 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352475369!13335233!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18697 invoked from network); 9 Nov 2012 15:36:10 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:36:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15701016" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:36:05 +0000 Received: from Roger-2.local (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:36:04 +0000 Message-ID: <509D22E6.2090005@citrix.com> Date: Fri, 9 Nov 2012 16:36:06 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352363172.12977.87.camel@hastur.hellion.org.uk> In-Reply-To: <1352363172.12977.87.camel@hastur.hellion.org.uk> Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/12 09:26, Ian Campbell wrote: > On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: >> Hi, >> >> I'm using a custom block script in my xen setup and when started, it >> creates a new device node pointing to some network resources. >> >> Now I noticed that the script is called twice for the root block, the >> first time for pygrub most likely, but is only stopped once ... I >> don't mind creating two devices node, but then I need to destroy both >> ... >> >> Is this a known issue ? > > Not one I've heard. Running "xl -vvv create" might provide some logs > which give an idea what is going on, likewise the logging > in /var/log/xen/... > > Roger -- any ideas? Yes, I've been able to reproduce the error when using stubdoms, I'm currently working on a fix. Have you seen this when using stubdomains Sylvain? Also I've realized that when using stubdomains with disks that use file based backends ("file:/") it doesn't work, is this already known, or a regression? Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:36:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:36:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqcu-00071o-O6; Fri, 09 Nov 2012 15:36:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqct-00071j-Fg for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:36:11 +0000 Received: from [85.158.137.99:59305] by server-13.bemta-3.messagelabs.com id 87/76-24887-AE22D905; Fri, 09 Nov 2012 15:36:10 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352475369!13335233!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18697 invoked from network); 9 Nov 2012 15:36:10 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:36:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15701016" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:36:05 +0000 Received: from Roger-2.local (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:36:04 +0000 Message-ID: <509D22E6.2090005@citrix.com> Date: Fri, 9 Nov 2012 16:36:06 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352363172.12977.87.camel@hastur.hellion.org.uk> In-Reply-To: <1352363172.12977.87.camel@hastur.hellion.org.uk> Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 08/11/12 09:26, Ian Campbell wrote: > On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: >> Hi, >> >> I'm using a custom block script in my xen setup and when started, it >> creates a new device node pointing to some network resources. >> >> Now I noticed that the script is called twice for the root block, the >> first time for pygrub most likely, but is only stopped once ... I >> don't mind creating two devices node, but then I need to destroy both >> ... >> >> Is this a known issue ? > > Not one I've heard. Running "xl -vvv create" might provide some logs > which give an idea what is going on, likewise the logging > in /var/log/xen/... > > Roger -- any ideas? Yes, I've been able to reproduce the error when using stubdoms, I'm currently working on a fix. Have you seen this when using stubdomains Sylvain? Also I've realized that when using stubdomains with disks that use file based backends ("file:/") it doesn't work, is this already known, or a regression? Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:47:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:47:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqnJ-0007CY-Ss; Fri, 09 Nov 2012 15:46:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqnH-0007CT-SB for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:46:55 +0000 Received: from [85.158.139.211:40075] by server-15.bemta-5.messagelabs.com id D9/11-26920-E652D905; Fri, 09 Nov 2012 15:46:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1352476014!19517754!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3686 invoked from network); 9 Nov 2012 15:46:54 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:46:54 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15701272" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:46:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:46:53 +0000 Message-ID: <1352476012.27833.96.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Fri, 9 Nov 2012 15:46:52 +0000 In-Reply-To: <509D22E6.2090005@citrix.com> References: <1352363172.12977.87.camel@hastur.hellion.org.uk> <509D22E6.2090005@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 15:36 +0000, Roger Pau Monne wrote: > Also I've realized that when using stubdomains with disks that use > file based backends ("file:/") it doesn't work, is this already known, > or a regression? It's news to me... I don't know if it is a regression, but it seems like it ought to work. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 15:47:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 15:47:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqnJ-0007CY-Ss; Fri, 09 Nov 2012 15:46:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWqnH-0007CT-SB for xen-devel@lists.xen.org; Fri, 09 Nov 2012 15:46:55 +0000 Received: from [85.158.139.211:40075] by server-15.bemta-5.messagelabs.com id D9/11-26920-E652D905; Fri, 09 Nov 2012 15:46:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1352476014!19517754!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3686 invoked from network); 9 Nov 2012 15:46:54 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 15:46:54 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15701272" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 15:46:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 15:46:53 +0000 Message-ID: <1352476012.27833.96.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Fri, 9 Nov 2012 15:46:52 +0000 In-Reply-To: <509D22E6.2090005@citrix.com> References: <1352363172.12977.87.camel@hastur.hellion.org.uk> <509D22E6.2090005@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 15:36 +0000, Roger Pau Monne wrote: > Also I've realized that when using stubdomains with disks that use > file based backends ("file:/") it doesn't work, is this already known, > or a regression? It's news to me... I don't know if it is a regression, but it seems like it ought to work. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:13:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:13:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrCF-00087y-O3; Fri, 09 Nov 2012 16:12:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrCD-00087q-Rp; Fri, 09 Nov 2012 16:12:42 +0000 Received: from [85.158.137.99:22188] by server-4.bemta-3.messagelabs.com id 08/83-30023-77B2D905; Fri, 09 Nov 2012 16:12:39 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352477558!15309833!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25607 invoked from network); 9 Nov 2012 16:12:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 16:12:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15702160" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 16:12:33 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 16:12:32 +0000 Message-ID: <1352477552.27833.113.camel@zakaz.uk.xensource.com> From: Ian Campbell To: D K Date: Fri, 9 Nov 2012 16:12:32 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [Xen-users] Remus: Xen 4.2.1 with Debian 6.0 does not work X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Adding xen-devel since this is an xl segfault. Please can you not send html mail. Plain text is just fine. On Fri, 2012-11-02 at 12:32 +0000, D K wrote: > Xen: Version 4.2.-testing from mercurial Which version exactly ? There was a batch of backports recently which included some fixes to the ao infrastructure, including a fix for aoinprogress (which appears in your stack trace). So please can you try the most recent tip of 4.2-testing. > > > Guest: > > Config: http://pgb.game-host.org/xen/debian.cfg > > > Erroranalysis: > > > 1. Getting the vm started on PC1 with the following command works > fine: > > xl create debian.cfg > > 2. Remus does not: > > > xl remus 129.217.43.51 Does normal migration work? > > Segmentation fault > > xc: error: read_exact_timed failed (select returned 0): Internal error > xc: error: Error reading QEMU signature (110 = Connection timed out): Internal error > xc: error: error buffering image tail, finishing: Internal error > > migration target: Remus Failover for domain 3 It seems like there might be more than one issue here, the original failure and then a failure in the error path too. [...snip, I don't thin k w needed the whole story, just the resulting stacktrace...] Is this backtrace from the sending or the receiving xl? > #0 0xb7e4bfea in malloc_consolidate (av=) at malloc.c:5145 > #1 0xb7e4e21d in _int_malloc (av=, bytes=) at malloc.c:4373 > #2 0xb7e506f3 in *__GI___libc_malloc (bytes=1012) at malloc.c:3661 > #3 0xb7f9e011 in datacopier_readable (egc=0xbffff2bc, ev=0x806a92c, fd=21, events=1, revents=1) at libxl_aoutils.c:144 > #4 0xb7fa3072 in afterpoll_internal (egc=0xbffff2bc, poller=, nfds=6, fds=0x806bb10, now=...) > at libxl_event.c:948 > #5 0xb7fa3e1b in eventloop_iteration (egc=, poller=0x806a688) at libxl_event.c:1368 > #6 0xb7fa448f in libxl__ao_inprogress (ao=0x806a768, file=0xb7fb09cc "libxl.c", line=728, func=0xb7fb2c4f "libxl_domain_remus_start") at libxl_event.c:1614 > #7 0xb7f842bf in libxl_domain_remus_start (ctx=0x806a030, info=0xbffff3c4, domid=2, send_fd=10, recv_fd=11, ao_how=0x0) at libxl.c:728 > #8 0x0805045e in main_remus (argc=3, argv=0xbffff4f8) at xl_cmdimpl.c:6776 > #9 0x0804d2be in main (argc=4, argv=0xbffff4f4) at xl.c:267 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:13:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:13:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrCF-00087y-O3; Fri, 09 Nov 2012 16:12:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrCD-00087q-Rp; Fri, 09 Nov 2012 16:12:42 +0000 Received: from [85.158.137.99:22188] by server-4.bemta-3.messagelabs.com id 08/83-30023-77B2D905; Fri, 09 Nov 2012 16:12:39 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352477558!15309833!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25607 invoked from network); 9 Nov 2012 16:12:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 16:12:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15702160" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 16:12:33 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 16:12:32 +0000 Message-ID: <1352477552.27833.113.camel@zakaz.uk.xensource.com> From: Ian Campbell To: D K Date: Fri, 9 Nov 2012 16:12:32 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-users@lists.xen.org" , xen-devel Subject: Re: [Xen-devel] [Xen-users] Remus: Xen 4.2.1 with Debian 6.0 does not work X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Adding xen-devel since this is an xl segfault. Please can you not send html mail. Plain text is just fine. On Fri, 2012-11-02 at 12:32 +0000, D K wrote: > Xen: Version 4.2.-testing from mercurial Which version exactly ? There was a batch of backports recently which included some fixes to the ao infrastructure, including a fix for aoinprogress (which appears in your stack trace). So please can you try the most recent tip of 4.2-testing. > > > Guest: > > Config: http://pgb.game-host.org/xen/debian.cfg > > > Erroranalysis: > > > 1. Getting the vm started on PC1 with the following command works > fine: > > xl create debian.cfg > > 2. Remus does not: > > > xl remus 129.217.43.51 Does normal migration work? > > Segmentation fault > > xc: error: read_exact_timed failed (select returned 0): Internal error > xc: error: Error reading QEMU signature (110 = Connection timed out): Internal error > xc: error: error buffering image tail, finishing: Internal error > > migration target: Remus Failover for domain 3 It seems like there might be more than one issue here, the original failure and then a failure in the error path too. [...snip, I don't thin k w needed the whole story, just the resulting stacktrace...] Is this backtrace from the sending or the receiving xl? > #0 0xb7e4bfea in malloc_consolidate (av=) at malloc.c:5145 > #1 0xb7e4e21d in _int_malloc (av=, bytes=) at malloc.c:4373 > #2 0xb7e506f3 in *__GI___libc_malloc (bytes=1012) at malloc.c:3661 > #3 0xb7f9e011 in datacopier_readable (egc=0xbffff2bc, ev=0x806a92c, fd=21, events=1, revents=1) at libxl_aoutils.c:144 > #4 0xb7fa3072 in afterpoll_internal (egc=0xbffff2bc, poller=, nfds=6, fds=0x806bb10, now=...) > at libxl_event.c:948 > #5 0xb7fa3e1b in eventloop_iteration (egc=, poller=0x806a688) at libxl_event.c:1368 > #6 0xb7fa448f in libxl__ao_inprogress (ao=0x806a768, file=0xb7fb09cc "libxl.c", line=728, func=0xb7fb2c4f "libxl_domain_remus_start") at libxl_event.c:1614 > #7 0xb7f842bf in libxl_domain_remus_start (ctx=0x806a030, info=0xbffff3c4, domid=2, send_fd=10, recv_fd=11, ao_how=0x0) at libxl.c:728 > #8 0x0805045e in main_remus (argc=3, argv=0xbffff4f8) at xl_cmdimpl.c:6776 > #9 0x0804d2be in main (argc=4, argv=0xbffff4f4) at xl.c:267 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:25:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:25:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrOa-00006J-L8; Fri, 09 Nov 2012 16:25:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrOZ-00006D-HG for xen-devel@lists.xen.org; Fri, 09 Nov 2012 16:25:27 +0000 Received: from [85.158.139.83:4725] by server-12.bemta-5.messagelabs.com id AC/ED-02886-67E2D905; Fri, 09 Nov 2012 16:25:26 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-8.tower-182.messagelabs.com!1352478325!18296401!1 X-Originating-IP: [213.165.64.22] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n,sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n, ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14441 invoked from network); 9 Nov 2012 16:25:25 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.22) by server-8.tower-182.messagelabs.com with SMTP; 9 Nov 2012 16:25:25 -0000 Received: (qmail invoked by alias); 09 Nov 2012 16:25:25 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp016) with SMTP; 09 Nov 2012 17:25:25 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX19kQykpmOxkQ5h+9weCLynhr/YwvrNOpQTGnXhhBz UBFWEc2QdfKrSm From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 17:25:23 +0100 Message-ID: <1382625.svAp90pkVF@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thursday, 8. November 2012 20:02:51 feral wrote: > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > Setup - Working: > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > xend > Asus Radeon HD 7870 DirectCU. > Works perfect. Benches on par with bare metal. > > Setup - Broken: > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > toolstack. > Asus Radeon HD 7870 DirectCU. > Some times the guest boots correctly but display is never enabled. > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > No errors in logs. Found the following in 'xl dmesg': > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > 0x1ac800000, flags = 0 I had a similar problem since hg revision 25818:50adc933faaf which changes the qemu tag. It looks like the qemu commit 3e66da7266c84638c0e22a09c9d2b07529802576 (qemu-xen-trad: fix msi_translate with PV event delivery) causes this behavior. I solved the problem for me by using 'pci_msitranslate=0' in the domU config. In addition I had to reboot (perhaps poweroff?) the dom0 once the IO_PAGE_FAULT occured. Regards Hans _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:25:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:25:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrOa-00006J-L8; Fri, 09 Nov 2012 16:25:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrOZ-00006D-HG for xen-devel@lists.xen.org; Fri, 09 Nov 2012 16:25:27 +0000 Received: from [85.158.139.83:4725] by server-12.bemta-5.messagelabs.com id AC/ED-02886-67E2D905; Fri, 09 Nov 2012 16:25:26 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-8.tower-182.messagelabs.com!1352478325!18296401!1 X-Originating-IP: [213.165.64.22] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n,sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n, ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14441 invoked from network); 9 Nov 2012 16:25:25 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.22) by server-8.tower-182.messagelabs.com with SMTP; 9 Nov 2012 16:25:25 -0000 Received: (qmail invoked by alias); 09 Nov 2012 16:25:25 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp016) with SMTP; 09 Nov 2012 17:25:25 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX19kQykpmOxkQ5h+9weCLynhr/YwvrNOpQTGnXhhBz UBFWEc2QdfKrSm From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 17:25:23 +0100 Message-ID: <1382625.svAp90pkVF@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thursday, 8. November 2012 20:02:51 feral wrote: > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > Setup - Working: > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > xend > Asus Radeon HD 7870 DirectCU. > Works perfect. Benches on par with bare metal. > > Setup - Broken: > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > toolstack. > Asus Radeon HD 7870 DirectCU. > Some times the guest boots correctly but display is never enabled. > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > No errors in logs. Found the following in 'xl dmesg': > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > 0x1ac800000, flags = 0 I had a similar problem since hg revision 25818:50adc933faaf which changes the qemu tag. It looks like the qemu commit 3e66da7266c84638c0e22a09c9d2b07529802576 (qemu-xen-trad: fix msi_translate with PV event delivery) causes this behavior. I solved the problem for me by using 'pci_msitranslate=0' in the domU config. In addition I had to reboot (perhaps poweroff?) the dom0 once the IO_PAGE_FAULT occured. Regards Hans _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:34:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:34:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrWi-0000Jz-P4; Fri, 09 Nov 2012 16:33:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrWg-0000Ju-Q1 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 16:33:50 +0000 Received: from [85.158.143.35:29064] by server-3.bemta-4.messagelabs.com id 82/A0-06841-E603D905; Fri, 09 Nov 2012 16:33:50 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352478829!12971136!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11211 invoked from network); 9 Nov 2012 16:33:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 16:33:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15703064" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 16:33:49 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 16:33:48 +0000 Message-ID: <1352478827.27833.127.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Hans Mueller Date: Fri, 9 Nov 2012 16:33:47 +0000 In-Reply-To: <1382625.svAp90pkVF@sheik-lin> References: <1382625.svAp90pkVF@sheik-lin> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > On Thursday, 8. November 2012 20:02:51 feral wrote: > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > > > Setup - Working: > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > > xend > > Asus Radeon HD 7870 DirectCU. > > Works perfect. Benches on par with bare metal. > > > > Setup - Broken: > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > toolstack. > > Asus Radeon HD 7870 DirectCU. > > Some times the guest boots correctly but display is never enabled. > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > No errors in logs. Found the following in 'xl dmesg': > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > > 0x1ac800000, flags = 0 > > I had a similar problem since hg revision 25818:50adc933faaf which changes the > qemu tag. > It looks like the qemu commit > 3e66da7266c84638c0e22a09c9d2b07529802576 > (qemu-xen-trad: fix msi_translate with PV event delivery) > causes this behavior. > > I solved the problem for me by using 'pci_msitranslate=0' in the domU config. I don't follow this stuff closely but I could have sworn we had disabled msitranslate by default. In any case I don't think that changeset was intended to cause anything like this -- Stefano? > In addition I had to reboot (perhaps poweroff?) the dom0 once the IO_PAGE_FAULT > occured. > > Regards > Hans > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 16:34:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 16:34:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrWi-0000Jz-P4; Fri, 09 Nov 2012 16:33:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrWg-0000Ju-Q1 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 16:33:50 +0000 Received: from [85.158.143.35:29064] by server-3.bemta-4.messagelabs.com id 82/A0-06841-E603D905; Fri, 09 Nov 2012 16:33:50 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352478829!12971136!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzY=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11211 invoked from network); 9 Nov 2012 16:33:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 16:33:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,746,1344211200"; d="scan'208";a="15703064" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 09 Nov 2012 16:33:49 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Fri, 9 Nov 2012 16:33:48 +0000 Message-ID: <1352478827.27833.127.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Hans Mueller Date: Fri, 9 Nov 2012 16:33:47 +0000 In-Reply-To: <1382625.svAp90pkVF@sheik-lin> References: <1382625.svAp90pkVF@sheik-lin> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > On Thursday, 8. November 2012 20:02:51 feral wrote: > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > > > Setup - Working: > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > > xend > > Asus Radeon HD 7870 DirectCU. > > Works perfect. Benches on par with bare metal. > > > > Setup - Broken: > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > toolstack. > > Asus Radeon HD 7870 DirectCU. > > Some times the guest boots correctly but display is never enabled. > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > No errors in logs. Found the following in 'xl dmesg': > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > > 0x1ac800000, flags = 0 > > I had a similar problem since hg revision 25818:50adc933faaf which changes the > qemu tag. > It looks like the qemu commit > 3e66da7266c84638c0e22a09c9d2b07529802576 > (qemu-xen-trad: fix msi_translate with PV event delivery) > causes this behavior. > > I solved the problem for me by using 'pci_msitranslate=0' in the domU config. I don't follow this stuff closely but I could have sworn we had disabled msitranslate by default. In any case I don't think that changeset was intended to cause anything like this -- Stefano? > In addition I had to reboot (perhaps poweroff?) the dom0 once the IO_PAGE_FAULT > occured. > > Regards > Hans > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:03:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:03:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrz7-0000nP-VB; Fri, 09 Nov 2012 17:03:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrz6-0000nJ-QE for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:03:13 +0000 Received: from [85.158.138.51:23708] by server-9.bemta-3.messagelabs.com id D8/A8-02388-F473D905; Fri, 09 Nov 2012 17:03:11 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-7.tower-174.messagelabs.com!1352480591!20525806!1 X-Originating-IP: [213.165.64.23] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjEzLjE2NS42NC4yMyA9PiAyMjUwNTI=\n, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30696 invoked from network); 9 Nov 2012 17:03:11 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.23) by server-7.tower-174.messagelabs.com with SMTP; 9 Nov 2012 17:03:11 -0000 Received: (qmail invoked by alias); 09 Nov 2012 17:03:11 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp037) with SMTP; 09 Nov 2012 18:03:11 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX19dbEZ+ukZdnFEGRUHnHGI24PJ1dDfuleiF4XXbT0 bYKTDDkIatl6iL From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 18:03:09 +0100 Message-ID: <2009372.tbv8COfH3K@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes > > the qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > config. > > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. You're right - you don't have to explicitly disable msitranslate, you just may not enable it (which was the case in my domU config, not sure why it was enabled nor whether it was really required in the past - I think it was enabled during pci/gpu-passthrough testing and not changed back/disabled once it worked). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:03:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:03:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrz7-0000nP-VB; Fri, 09 Nov 2012 17:03:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrz6-0000nJ-QE for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:03:13 +0000 Received: from [85.158.138.51:23708] by server-9.bemta-3.messagelabs.com id D8/A8-02388-F473D905; Fri, 09 Nov 2012 17:03:11 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-7.tower-174.messagelabs.com!1352480591!20525806!1 X-Originating-IP: [213.165.64.23] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjEzLjE2NS42NC4yMyA9PiAyMjUwNTI=\n, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30696 invoked from network); 9 Nov 2012 17:03:11 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.23) by server-7.tower-174.messagelabs.com with SMTP; 9 Nov 2012 17:03:11 -0000 Received: (qmail invoked by alias); 09 Nov 2012 17:03:11 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp037) with SMTP; 09 Nov 2012 18:03:11 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX19dbEZ+ukZdnFEGRUHnHGI24PJ1dDfuleiF4XXbT0 bYKTDDkIatl6iL From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 18:03:09 +0100 Message-ID: <2009372.tbv8COfH3K@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes > > the qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > config. > > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. You're right - you don't have to explicitly disable msitranslate, you just may not enable it (which was the case in my domU config, not sure why it was enabled nor whether it was really required in the past - I think it was enabled during pci/gpu-passthrough testing and not changed back/disabled once it worked). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:03:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:03:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrzH-0000ny-BS; Fri, 09 Nov 2012 17:03:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrzE-0000nl-T2 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:03:21 +0000 Received: from [193.109.254.147:11717] by server-6.bemta-14.messagelabs.com id C6/8B-02788-7573D905; Fri, 09 Nov 2012 17:03:19 +0000 X-Env-Sender: pablo.llopis@gmail.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352480597!2631525!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30925 invoked from network); 9 Nov 2012 17:03:18 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 17:03:18 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so4958990obb.32 for ; Fri, 09 Nov 2012 09:03:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=EWWY5egPpnSG2mAhshPRwfHT64QAB5pQoEpIK/kX5qE=; b=ou2iSln5GgLw+1n2pCj1nndgyfWUcVAsHCl2HClkDvd9omgMX2BoeAwtMf2XeOh2LV r4tBEzhH+yU+X5rWytcqkx4am9oJ4cU1DKP+H8n5sl+0yECEA2emiaH81JI0wGHCm52N UsfRqFKW+49tn+VYBmXFpnHCPU9kdhE/60YU1+Vb8OnsgIqFP4zuoik+IssQW+KcBqqH pfvfu1oPtuakXYdjT2zvSljGrcTCOSKpFAbJeQWo08Sc4TJGK3bBFJQnPCgT2BcpJnkI UB1IiMV9i8JhRYLoSTptr9t5ewMRPEiIDt46Z0eOpFwu9XbtyNbxIZXrKyqL0CxxckyL PaUw== MIME-Version: 1.0 Received: by 10.182.141.73 with SMTP id rm9mr8922859obb.99.1352480596962; Fri, 09 Nov 2012 09:03:16 -0800 (PST) Received: by 10.182.87.129 with HTTP; Fri, 9 Nov 2012 09:03:16 -0800 (PST) Date: Fri, 9 Nov 2012 18:03:16 +0100 X-Google-Sender-Auth: XLWic76TycdbMCE4uQJZQEsLugs Message-ID: From: Pablo Llopis To: xen-devel@lists.xen.org Subject: [Xen-devel] Kernel Oops trying to share memory with gntalloc X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello Xen Developers, I am experiencing crashes when attempting to acquire a large number of grant table references through gntalloc. I tried this on a 3.2 kernel and on the most recent stable (3.6.6) kernel with the same result (Xen 4.1.1). A simple program, run from Dom0, which tries to create a shared buffer about 16MB or bigger with a DomU gives the kernel Oops included below. After the crash, I am not able to kill the process (stays in uninterruptible D state), and the xen-gntalloc module can not be removed (resource temporarily unavailable). A hard reboot is required as well, because the system will not reboot, and other programs will randomly block and never return. [ 260.681539] main[4448]: segfault at 0 ip 00007f0c13f7e03b sp 00007fff36608e88 error 6 in libc-2.13.so[7f0c13ef1000+199000] [ 292.498807] BUG: unable to handle kernel paging request at ffffc90206047fc8 [ 292.499020] IP: [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.499180] PGD fa6446067 PUD 0 [ 292.499365] Oops: 0000 [#1] SMP [ 292.499550] Modules linked in: xen_gntalloc xt_physdev xen_netback xen_blkback ib_cm ib_sa ib_uverbs ib_umad mdio ib_mthca ib_mad ib_core ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_state nf_conntrack ipt_REJECT xt_CHECKSUM iptable_mangle xt_tcpudp iptable_filter ip_tables x_tables bridge stp llc nfsv4 nfsd nfs_acl auth_rpcgss nfs fscache lockd sunrpc xenfs xen_privcmd xen_evtchn usb_storage xen_gntdev w83793 sp5100_tco dm_multipath hwmon_vid [last unloaded: xen_gntalloc] [ 292.502287] CPU 3 [ 292.502346] Pid: 4454, comm: main Tainted: G W 3.6.6 #3 Supermicro H8DGU/H8DGU [ 292.502554] RIP: e030:[] [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.502740] RSP: e02b:ffff880f8acf3db0 EFLAGS: 00010286 [ 292.502835] RAX: ffffc90006048000 RBX: ffff880e80a74a40 RCX: 0000000000002b4a [ 292.502935] RDX: 0000000000000000 RSI: ffff880e80a749c0 RDI: 00000000ffffffe4 [ 292.503039] RBP: ffff880f8acf3db8 R08: 0000000000016960 R09: ffffea003a029d00 [ 292.503138] R10: ffffffffa0206182 R11: 0000000000000002 R12: ffffffffffffffe4 [ 292.503238] R13: 0000000000001ff8 R14: 0000000000000000 R15: ffff880f9c2e8000 [ 292.503357] FS: 00007f97bc59eb40(0000) GS:ffff880faa860000(0000) knlGS:0000000000000000 [ 292.503487] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 292.503582] CR2: ffffc90206047fc8 CR3: 0000000e869d5000 CR4: 0000000000000660 [ 292.503682] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 292.503781] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 292.503885] Process main (pid: 4454, threadinfo ffff880f8acf2000, task ffff880f8c405b40) [ 292.504014] Stack: [ 292.504101] ffffffff813b6ab3 ffff880f8acf3df8 ffffffffa0206195 ffff880f8acf3df8 [ 292.504428] ffffffff813b7e70 ffff880e80a74a40 0000000000001ff8 ffff880e80a74a40 [ 292.504752] ffff880e80a74a40 ffff880f8acf3ea8 ffffffffa02069c8 00000000015717f0 [ 292.505074] Call Trace: [ 292.505161] [] ? gnttab_query_foreign_access+0x13/0x20 [ 292.505264] [] __del_gref+0xf5/0x140 [xen_gntalloc] [ 292.505364] [] ? gnttab_grant_foreign_access+0x30/0x70 [ 292.505464] [] gntalloc_ioctl+0x478/0x590 [xen_gntalloc] [ 292.505568] [] do_vfs_ioctl+0x8f/0x4f0 [ 292.505671] [] ? kmem_cache_free+0x2f/0x110 [ 292.505770] [] ? putname+0x33/0x50 [ 292.505864] [] sys_ioctl+0x91/0xa0 [ 292.505960] [] system_call_fastpath+0x16/0x1b [ 292.506055] Code: 90 48 8b 05 88 81 b4 00 89 ff 5d 0f b7 04 f8 83 e0 18 c3 0f 1f 44 00 00 55 48 89 e5 66 66 66 66 90 48 8b 05 78 81 b4 00 89 ff 5d <0f> b7 04 78 83 e0 18 c3 0f 1f 44 00 00 55 48 89 e5 66 66 66 66 [ 292.509405] RIP [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.509586] RSP [ 292.509673] CR2: ffffc90206047fc8 [ 292.509777] ---[ end trace d8a8651f22939589 ]--- The disassembly of the code looks something like this (function begin/end edited by me). If I did things right, the fault occurs in the movzwl instruction at <+43>): 0x00000000006010a0 <+0>: nop 0x00000000006010a1 <+1>: mov 0xb48188(%rip),%rax # 0x1149230 0x00000000006010a8 <+8>: mov %edi,%edi 0x00000000006010aa <+10>: pop %rbp 0x00000000006010ab <+11>: movzwl (%rax,%rdi,8),%eax 0x00000000006010af <+15>: and $0x18,%eax 0x00000000006010b2 <+18>: retq 0x00000000006010b3 <+19>: nopl 0x0(%rax,%rax,1) ------ begin gnttab_query_foreign_access 0x00000000006010b8 <+24>: push %rbp 0x00000000006010b9 <+25>: mov %rsp,%rbp 0x00000000006010bc <+28>: data32 data32 data32 xchg %ax,%ax 0x00000000006010c1 <+33>: mov 0xb48178(%rip),%rax # 0x1149240 0x00000000006010c8 <+40>: mov %edi,%edi 0x00000000006010ca <+42>: pop %rbp 0x00000000006010cb <+43>: movzwl (%rax,%rdi,2),%eax 0x00000000006010cf <+47>: and $0x18,%eax 0x00000000006010d2 <+50>: retq ------ end gnttab_query_foreign_access 0x00000000006010d3 <+51>: nopl 0x0(%rax,%rax,1) 0x00000000006010d8 <+56>: push %rbp 0x00000000006010d9 <+57>: mov %rsp,%rbp 0x00000000006010dc <+60>: data16 0x00000000006010dd <+61>: data16 0x00000000006010de <+62>: data16 0x00000000006010df <+63>: data16 0x00000000006010e0 <+64>: add %al,(%rax) I tried locating the bug, but could not: something is odd because in order for the call trace to be as it is, it seems to me that gntalloc_ioctl_alloc had to call add_grefs. add_grefs calls gnttab_grant_foreign_access and then __del_gref, who in turn does the call to gnttab_query_foreign_access, which seems to segfault. However, this did not seem logical to me, because the only way for add_grefs to call __del_gref would be for gnttab_grant_foreign_access to fail (gref->gref_id < 0), and in that case __del_gref does not call gnttab_query_foreign_access because it is only called if gref->gref_id > 0. In spite of this, I see no other way execution would result in this call trace (first gnttab_grant_foreign_access, then __del_gref, and then finally gnttab_query_foreign_access). I must have missed something. In case it is needed, my memory alloc code which interfaces with gntalloc looks like this: http://pastie.org/5351941 When loading xen-gntalloc, I am specifying the limit parameter with a value higher than 1024 and higher than the number of pages I request. This crash does not happen when I request a small amount of pages, but as soon as I specify a large number (about 4096 or more), the crash happens immediately. Regardless of the size, the crash happens eventually when enough grant references have been requested. Even if I am not deallocating things right (I think I am doing it right, though), this should probably not happen. I would appreciate any help for fixing this bug. Thank you in advance, Pablo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:03:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:03:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrzH-0000ny-BS; Fri, 09 Nov 2012 17:03:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWrzE-0000nl-T2 for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:03:21 +0000 Received: from [193.109.254.147:11717] by server-6.bemta-14.messagelabs.com id C6/8B-02788-7573D905; Fri, 09 Nov 2012 17:03:19 +0000 X-Env-Sender: pablo.llopis@gmail.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352480597!2631525!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30925 invoked from network); 9 Nov 2012 17:03:18 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 17:03:18 -0000 Received: by mail-ob0-f173.google.com with SMTP id wc18so4958990obb.32 for ; Fri, 09 Nov 2012 09:03:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=EWWY5egPpnSG2mAhshPRwfHT64QAB5pQoEpIK/kX5qE=; b=ou2iSln5GgLw+1n2pCj1nndgyfWUcVAsHCl2HClkDvd9omgMX2BoeAwtMf2XeOh2LV r4tBEzhH+yU+X5rWytcqkx4am9oJ4cU1DKP+H8n5sl+0yECEA2emiaH81JI0wGHCm52N UsfRqFKW+49tn+VYBmXFpnHCPU9kdhE/60YU1+Vb8OnsgIqFP4zuoik+IssQW+KcBqqH pfvfu1oPtuakXYdjT2zvSljGrcTCOSKpFAbJeQWo08Sc4TJGK3bBFJQnPCgT2BcpJnkI UB1IiMV9i8JhRYLoSTptr9t5ewMRPEiIDt46Z0eOpFwu9XbtyNbxIZXrKyqL0CxxckyL PaUw== MIME-Version: 1.0 Received: by 10.182.141.73 with SMTP id rm9mr8922859obb.99.1352480596962; Fri, 09 Nov 2012 09:03:16 -0800 (PST) Received: by 10.182.87.129 with HTTP; Fri, 9 Nov 2012 09:03:16 -0800 (PST) Date: Fri, 9 Nov 2012 18:03:16 +0100 X-Google-Sender-Auth: XLWic76TycdbMCE4uQJZQEsLugs Message-ID: From: Pablo Llopis To: xen-devel@lists.xen.org Subject: [Xen-devel] Kernel Oops trying to share memory with gntalloc X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello Xen Developers, I am experiencing crashes when attempting to acquire a large number of grant table references through gntalloc. I tried this on a 3.2 kernel and on the most recent stable (3.6.6) kernel with the same result (Xen 4.1.1). A simple program, run from Dom0, which tries to create a shared buffer about 16MB or bigger with a DomU gives the kernel Oops included below. After the crash, I am not able to kill the process (stays in uninterruptible D state), and the xen-gntalloc module can not be removed (resource temporarily unavailable). A hard reboot is required as well, because the system will not reboot, and other programs will randomly block and never return. [ 260.681539] main[4448]: segfault at 0 ip 00007f0c13f7e03b sp 00007fff36608e88 error 6 in libc-2.13.so[7f0c13ef1000+199000] [ 292.498807] BUG: unable to handle kernel paging request at ffffc90206047fc8 [ 292.499020] IP: [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.499180] PGD fa6446067 PUD 0 [ 292.499365] Oops: 0000 [#1] SMP [ 292.499550] Modules linked in: xen_gntalloc xt_physdev xen_netback xen_blkback ib_cm ib_sa ib_uverbs ib_umad mdio ib_mthca ib_mad ib_core ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_state nf_conntrack ipt_REJECT xt_CHECKSUM iptable_mangle xt_tcpudp iptable_filter ip_tables x_tables bridge stp llc nfsv4 nfsd nfs_acl auth_rpcgss nfs fscache lockd sunrpc xenfs xen_privcmd xen_evtchn usb_storage xen_gntdev w83793 sp5100_tco dm_multipath hwmon_vid [last unloaded: xen_gntalloc] [ 292.502287] CPU 3 [ 292.502346] Pid: 4454, comm: main Tainted: G W 3.6.6 #3 Supermicro H8DGU/H8DGU [ 292.502554] RIP: e030:[] [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.502740] RSP: e02b:ffff880f8acf3db0 EFLAGS: 00010286 [ 292.502835] RAX: ffffc90006048000 RBX: ffff880e80a74a40 RCX: 0000000000002b4a [ 292.502935] RDX: 0000000000000000 RSI: ffff880e80a749c0 RDI: 00000000ffffffe4 [ 292.503039] RBP: ffff880f8acf3db8 R08: 0000000000016960 R09: ffffea003a029d00 [ 292.503138] R10: ffffffffa0206182 R11: 0000000000000002 R12: ffffffffffffffe4 [ 292.503238] R13: 0000000000001ff8 R14: 0000000000000000 R15: ffff880f9c2e8000 [ 292.503357] FS: 00007f97bc59eb40(0000) GS:ffff880faa860000(0000) knlGS:0000000000000000 [ 292.503487] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 292.503582] CR2: ffffc90206047fc8 CR3: 0000000e869d5000 CR4: 0000000000000660 [ 292.503682] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 292.503781] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 292.503885] Process main (pid: 4454, threadinfo ffff880f8acf2000, task ffff880f8c405b40) [ 292.504014] Stack: [ 292.504101] ffffffff813b6ab3 ffff880f8acf3df8 ffffffffa0206195 ffff880f8acf3df8 [ 292.504428] ffffffff813b7e70 ffff880e80a74a40 0000000000001ff8 ffff880e80a74a40 [ 292.504752] ffff880e80a74a40 ffff880f8acf3ea8 ffffffffa02069c8 00000000015717f0 [ 292.505074] Call Trace: [ 292.505161] [] ? gnttab_query_foreign_access+0x13/0x20 [ 292.505264] [] __del_gref+0xf5/0x140 [xen_gntalloc] [ 292.505364] [] ? gnttab_grant_foreign_access+0x30/0x70 [ 292.505464] [] gntalloc_ioctl+0x478/0x590 [xen_gntalloc] [ 292.505568] [] do_vfs_ioctl+0x8f/0x4f0 [ 292.505671] [] ? kmem_cache_free+0x2f/0x110 [ 292.505770] [] ? putname+0x33/0x50 [ 292.505864] [] sys_ioctl+0x91/0xa0 [ 292.505960] [] system_call_fastpath+0x16/0x1b [ 292.506055] Code: 90 48 8b 05 88 81 b4 00 89 ff 5d 0f b7 04 f8 83 e0 18 c3 0f 1f 44 00 00 55 48 89 e5 66 66 66 66 90 48 8b 05 78 81 b4 00 89 ff 5d <0f> b7 04 78 83 e0 18 c3 0f 1f 44 00 00 55 48 89 e5 66 66 66 66 [ 292.509405] RIP [] gnttab_query_foreign_access_v2+0x13/0x20 [ 292.509586] RSP [ 292.509673] CR2: ffffc90206047fc8 [ 292.509777] ---[ end trace d8a8651f22939589 ]--- The disassembly of the code looks something like this (function begin/end edited by me). If I did things right, the fault occurs in the movzwl instruction at <+43>): 0x00000000006010a0 <+0>: nop 0x00000000006010a1 <+1>: mov 0xb48188(%rip),%rax # 0x1149230 0x00000000006010a8 <+8>: mov %edi,%edi 0x00000000006010aa <+10>: pop %rbp 0x00000000006010ab <+11>: movzwl (%rax,%rdi,8),%eax 0x00000000006010af <+15>: and $0x18,%eax 0x00000000006010b2 <+18>: retq 0x00000000006010b3 <+19>: nopl 0x0(%rax,%rax,1) ------ begin gnttab_query_foreign_access 0x00000000006010b8 <+24>: push %rbp 0x00000000006010b9 <+25>: mov %rsp,%rbp 0x00000000006010bc <+28>: data32 data32 data32 xchg %ax,%ax 0x00000000006010c1 <+33>: mov 0xb48178(%rip),%rax # 0x1149240 0x00000000006010c8 <+40>: mov %edi,%edi 0x00000000006010ca <+42>: pop %rbp 0x00000000006010cb <+43>: movzwl (%rax,%rdi,2),%eax 0x00000000006010cf <+47>: and $0x18,%eax 0x00000000006010d2 <+50>: retq ------ end gnttab_query_foreign_access 0x00000000006010d3 <+51>: nopl 0x0(%rax,%rax,1) 0x00000000006010d8 <+56>: push %rbp 0x00000000006010d9 <+57>: mov %rsp,%rbp 0x00000000006010dc <+60>: data16 0x00000000006010dd <+61>: data16 0x00000000006010de <+62>: data16 0x00000000006010df <+63>: data16 0x00000000006010e0 <+64>: add %al,(%rax) I tried locating the bug, but could not: something is odd because in order for the call trace to be as it is, it seems to me that gntalloc_ioctl_alloc had to call add_grefs. add_grefs calls gnttab_grant_foreign_access and then __del_gref, who in turn does the call to gnttab_query_foreign_access, which seems to segfault. However, this did not seem logical to me, because the only way for add_grefs to call __del_gref would be for gnttab_grant_foreign_access to fail (gref->gref_id < 0), and in that case __del_gref does not call gnttab_query_foreign_access because it is only called if gref->gref_id > 0. In spite of this, I see no other way execution would result in this call trace (first gnttab_grant_foreign_access, then __del_gref, and then finally gnttab_query_foreign_access). I must have missed something. In case it is needed, my memory alloc code which interfaces with gntalloc looks like this: http://pastie.org/5351941 When loading xen-gntalloc, I am specifying the limit parameter with a value higher than 1024 and higher than the number of pages I request. This crash does not happen when I request a small amount of pages, but as soon as I specify a large number (about 4096 or more), the crash happens immediately. Regardless of the size, the crash happens eventually when enough grant references have been requested. Even if I am not deallocating things right (I think I am doing it right, though), this should probably not happen. I would appreciate any help for fixing this bug. Thank you in advance, Pablo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:15:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:15:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsAF-0001CJ-Mk; Fri, 09 Nov 2012 17:14:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsAE-0001CE-9E for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:14:42 +0000 Received: from [85.158.138.51:17458] by server-7.bemta-3.messagelabs.com id DB/A3-01713-10A3D905; Fri, 09 Nov 2012 17:14:41 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-4.tower-174.messagelabs.com!1352481281!29393399!1 X-Originating-IP: [213.165.64.22] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n,sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n, ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28812 invoked from network); 9 Nov 2012 17:14:41 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.22) by server-4.tower-174.messagelabs.com with SMTP; 9 Nov 2012 17:14:41 -0000 Received: (qmail invoked by alias); 09 Nov 2012 17:14:40 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp010) with SMTP; 09 Nov 2012 18:14:40 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX1/G8tRp3ynGbllB5rrugNbd0adeUarpFJckh/5jlP fV1ydyDX3YpZ3l From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 18:14:39 +0100 Message-ID: <1871003.0Pup8WfsfS@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes > > the qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > config. > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. > > In any case I don't think that changeset was intended to cause anything > like this -- Stefano? > > > In addition I had to reboot (perhaps poweroff?) the dom0 once the > > IO_PAGE_FAULT occured. One more info for you - afair i noticed that it was not only the IO_PAGE_FAULT which occured but also the qemu process in dom0 crashed w/o any messages in the logs, perhaps feral can confirm this? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:15:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:15:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsAF-0001CJ-Mk; Fri, 09 Nov 2012 17:14:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsAE-0001CE-9E for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:14:42 +0000 Received: from [85.158.138.51:17458] by server-7.bemta-3.messagelabs.com id DB/A3-01713-10A3D905; Fri, 09 Nov 2012 17:14:41 +0000 X-Env-Sender: mcbeagle@gmx.de X-Msg-Ref: server-4.tower-174.messagelabs.com!1352481281!29393399!1 X-Originating-IP: [213.165.64.22] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n,sa_preprocessor: QmFkIElQOiAyMTMuMTY1LjY0LjIyID0+IDIzMDQyNQ==\n, ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28812 invoked from network); 9 Nov 2012 17:14:41 -0000 Received: from mailout-de.gmx.net (HELO mailout-de.gmx.net) (213.165.64.22) by server-4.tower-174.messagelabs.com with SMTP; 9 Nov 2012 17:14:41 -0000 Received: (qmail invoked by alias); 09 Nov 2012 17:14:40 -0000 Received: from e182033070.adsl.alicedsl.de (EHLO sheik-lin.localnet) [85.182.33.70] by mail.gmx.net (mp010) with SMTP; 09 Nov 2012 18:14:40 +0100 X-Authenticated: #432297 X-Provags-ID: V01U2FsdGVkX1/G8tRp3ynGbllB5rrugNbd0adeUarpFJckh/5jlP fV1ydyDX3YpZ3l From: Hans Mueller To: xen-devel@lists.xen.org Date: Fri, 09 Nov 2012 18:14:39 +0100 Message-ID: <1871003.0Pup8WfsfS@sheik-lin> User-Agent: KMail/4.9.2 (Linux/3.6.4-gentoo-c0; KDE/4.9.3; x86_64; ; ) In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes > > the qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > config. > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. > > In any case I don't think that changeset was intended to cause anything > like this -- Stefano? > > > In addition I had to reboot (perhaps poweroff?) the dom0 once the > > IO_PAGE_FAULT occured. One more info for you - afair i noticed that it was not only the IO_PAGE_FAULT which occured but also the qemu process in dom0 crashed w/o any messages in the logs, perhaps feral can confirm this? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:35:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:35:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsTZ-0001ZD-1Y; Fri, 09 Nov 2012 17:34:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsTX-0001Z8-2o for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:34:39 +0000 Received: from [193.109.254.147:33386] by server-1.bemta-14.messagelabs.com id EB/FE-25314-EAE3D905; Fri, 09 Nov 2012 17:34:38 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352482477!2634808!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18798 invoked from network); 9 Nov 2012 17:34:37 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-27.messagelabs.com with SMTP; 9 Nov 2012 17:34:37 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 17:34:37 +0000 Message-Id: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 17:34:35 +0000 From: "Jan Beulich" To: References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> <509CFA7B02000078000A778C@nat28.tlf.novell.com> <20121109134829.GB30634@phenom.dumpdata.com> In-Reply-To: <20121109134829.GB30634@phenom.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: >> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka >> > range_straddles_page_boundary()) checks, which ought to >> > take care of this. There is brokenness there with the invocations >> > of gnttab_dma_map_page(), but only if the initial offset is at >> > least PAGE_SIZE - will have to check whether that occurs. >> >> And indeed, fixing this also makes the problem go away when >> the allocation order doesn't get forced to zero. So presumably >> there's also only that one problem I had pointed out in pv-ops. > >The pvops one has this in the map-page variant (xen_swiotlb_map_page): > >351 if (dma_capable(dev, dev_addr, size) && >352 !range_straddles_page_boundary(phys, size) && !swiotlb_force) >353 return dev_addr; > >and in the sg variant: > >494 if (swiotlb_force || >495 !dma_capable(hwdev, dev_addr, sg->length) || >496 range_straddles_page_boundary(paddr, sg->length)) { >497 void *map = swiotlb_tbl_map_single(hwdev, Oh, right, I forgot that there's yet another clone of that code under drivers/xen/. >So I think that check is OK. There is no gnttab_dma_map_page call - so that >can't be the issue. Indeed. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 17:35:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 17:35:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsTZ-0001ZD-1Y; Fri, 09 Nov 2012 17:34:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWsTX-0001Z8-2o for xen-devel@lists.xen.org; Fri, 09 Nov 2012 17:34:39 +0000 Received: from [193.109.254.147:33386] by server-1.bemta-14.messagelabs.com id EB/FE-25314-EAE3D905; Fri, 09 Nov 2012 17:34:38 +0000 X-Env-Sender: jbeulich@suse.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352482477!2634808!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18798 invoked from network); 9 Nov 2012 17:34:37 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-27.messagelabs.com with SMTP; 9 Nov 2012 17:34:37 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Fri, 09 Nov 2012 17:34:37 +0000 Message-Id: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Fri, 09 Nov 2012 17:34:35 +0000 From: "Jan Beulich" To: References: <1350037688.14806.93.camel@zakaz.uk.xensource.com> <509CD50302000078000A76E4@nat28.tlf.novell.com> <1352452573.21048.35.camel@dagon.hellion.org.uk> <509CDDBA02000078000A772C@nat28.tlf.novell.com> <509CEAB402000078000A7772@nat28.tlf.novell.com> <509CFA7B02000078000A778C@nat28.tlf.novell.com> <20121109134829.GB30634@phenom.dumpdata.com> In-Reply-To: <20121109134829.GB30634@phenom.dumpdata.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something issue in 3.7-rc1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: >> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka >> > range_straddles_page_boundary()) checks, which ought to >> > take care of this. There is brokenness there with the invocations >> > of gnttab_dma_map_page(), but only if the initial offset is at >> > least PAGE_SIZE - will have to check whether that occurs. >> >> And indeed, fixing this also makes the problem go away when >> the allocation order doesn't get forced to zero. So presumably >> there's also only that one problem I had pointed out in pv-ops. > >The pvops one has this in the map-page variant (xen_swiotlb_map_page): > >351 if (dma_capable(dev, dev_addr, size) && >352 !range_straddles_page_boundary(phys, size) && !swiotlb_force) >353 return dev_addr; > >and in the sg variant: > >494 if (swiotlb_force || >495 !dma_capable(hwdev, dev_addr, sg->length) || >496 range_straddles_page_boundary(paddr, sg->length)) { >497 void *map = swiotlb_tbl_map_single(hwdev, Oh, right, I forgot that there's yet another clone of that code under drivers/xen/. >So I think that check is OK. There is no gnttab_dma_map_page call - so that >can't be the issue. Indeed. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 19:57:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 19:57:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWuhG-0002io-Ao; Fri, 09 Nov 2012 19:56:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWuhE-0002ih-SR for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 19:56:57 +0000 Received: from [85.158.143.99:52155] by server-2.bemta-4.messagelabs.com id D6/CF-28922-8006D905; Fri, 09 Nov 2012 19:56:56 +0000 X-Env-Sender: msw@amazon.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352491013!18133364!1 X-Originating-IP: [207.171.178.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA3LjE3MS4xNzguMjUgPT4gODYxODQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27185 invoked from network); 9 Nov 2012 19:56:55 -0000 Received: from smtp-fw-31001.amazon.com (HELO smtp-fw-31001.amazon.com) (207.171.178.25) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 19:56:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=msw@amazon.com; q=dns/txt; s=amazon201209; t=1352491015; x=1384027015; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=hz92b3blL4Ai1dIa7Rxiamj4GOk3hbB6hT5TIg2zwfU=; b=uthpp8MMw7FoiQ8F1Xt2MwNZpPud3+6H748OXXNxnk06OxYIjbzZIBIZ GQ6cXlu5oMwNzoRcOB+CLfuNvMdOpfcsMHsP/qrM41o8UTYkePCQkZ4yD hbdzc0Ts2EJUt+V97o+UaYceNcTCqGQzhEq5AH4AXD2UJ1qEattWCjaGN I=; X-IronPort-AV: E=McAfee;i="5400,1158,6891"; a="324057864" Received: from smtp-in-9003.sea19.amazon.com ([10.186.104.20]) by smtp-border-fw-out-31001.sea31.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 09 Nov 2012 19:56:50 +0000 Received: from ex10-hub-9004.ant.amazon.com (ex10-hub-9004.ant.amazon.com [10.185.137.182]) by smtp-in-9003.sea19.amazon.com (8.13.8/8.13.8) with ESMTP id qA9JuoYC013878 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK); Fri, 9 Nov 2012 19:56:50 GMT Received: from u109add4315675089e695.ant.amazon.com (172.17.1.114) by ex10-hub-9004.ant.amazon.com (10.185.137.182) with Microsoft SMTP Server id 14.2.247.3; Fri, 9 Nov 2012 11:55:55 -0800 Received: by u109add4315675089e695.ant.amazon.com (sSMTP sendmail emulation); Fri, 09 Nov 2012 11:55:55 -0800 Date: Fri, 9 Nov 2012 11:55:55 -0800 From: Matt Wilson To: Ian Campbell Message-ID: <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> References: <509C19DE.6010108@nuclearfallout.net> <1352467744.27833.21.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352467744.27833.21.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "george.dunlap@eu.citrix.com" , "xen-devel@lists.xensource.com" , John Weekes , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > the build is still creating a "dist/install/usr/lib" directory, and > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > until it's corrected). Files that are being put in that tree: > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > dist/install/usr/lib > > This is an interesting one. I'm not sure how we can avoid this > behaviour, perhaps there is a tar option to cause it to follow rather > than clobber synlinks? > > The only other choice I can think of is to change install.sh to use a > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > avoid including system directories, or to otherwise make install.sh more > fragile and prone to bitrot :-( Oh dear. If we find that there's not a good reason for it anymore, I'd think it would be better to remove install.sh instead. > I must confess I didn't realise anyone used install.sh -- is there some > advantage to it over make foo-install? > > OOI which distro has this lib->lib64 link and what issues does removing > it create? > > > dist/install/usr/lib/xen > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > remember? There's no need for these files to be multilib compatible, as they are not runtime DSOs. They're internal to Xen and I think that they should be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately there's not much agreement on the usefulness of /usr/libexec, so we'll need to make sure that packagers can adjust the paths for their systems' standards. For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time. Matt > Thanks again for reporting all these. > > Ian. > > > dist/install/usr/lib/xen/boot > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > > dist/install/usr/lib/xen/boot/hvmloader > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > > dist/install/usr/lib/xen/bin > > dist/install/usr/lib/xen/bin/stubdom-dm > > dist/install/usr/lib/xen/bin/qemu-io > > dist/install/usr/lib/xen/bin/qemu-nbd > > dist/install/usr/lib/xen/bin/qemu-img > > dist/install/usr/lib/xen/bin/xenpaging > > dist/install/usr/lib/xen/bin/qemu-dm > > dist/install/usr/lib/xen/bin/qemu-system-i386 > > dist/install/usr/lib/xen/bin/qemu-ga > > dist/install/usr/lib/xen/bin/stubdompath.sh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Fri Nov 09 19:57:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 09 Nov 2012 19:57:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWuhG-0002io-Ao; Fri, 09 Nov 2012 19:56:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWuhE-0002ih-SR for xen-devel@lists.xensource.com; Fri, 09 Nov 2012 19:56:57 +0000 Received: from [85.158.143.99:52155] by server-2.bemta-4.messagelabs.com id D6/CF-28922-8006D905; Fri, 09 Nov 2012 19:56:56 +0000 X-Env-Sender: msw@amazon.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352491013!18133364!1 X-Originating-IP: [207.171.178.25] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA3LjE3MS4xNzguMjUgPT4gODYxODQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27185 invoked from network); 9 Nov 2012 19:56:55 -0000 Received: from smtp-fw-31001.amazon.com (HELO smtp-fw-31001.amazon.com) (207.171.178.25) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2012 19:56:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=msw@amazon.com; q=dns/txt; s=amazon201209; t=1352491015; x=1384027015; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=hz92b3blL4Ai1dIa7Rxiamj4GOk3hbB6hT5TIg2zwfU=; b=uthpp8MMw7FoiQ8F1Xt2MwNZpPud3+6H748OXXNxnk06OxYIjbzZIBIZ GQ6cXlu5oMwNzoRcOB+CLfuNvMdOpfcsMHsP/qrM41o8UTYkePCQkZ4yD hbdzc0Ts2EJUt+V97o+UaYceNcTCqGQzhEq5AH4AXD2UJ1qEattWCjaGN I=; X-IronPort-AV: E=McAfee;i="5400,1158,6891"; a="324057864" Received: from smtp-in-9003.sea19.amazon.com ([10.186.104.20]) by smtp-border-fw-out-31001.sea31.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 09 Nov 2012 19:56:50 +0000 Received: from ex10-hub-9004.ant.amazon.com (ex10-hub-9004.ant.amazon.com [10.185.137.182]) by smtp-in-9003.sea19.amazon.com (8.13.8/8.13.8) with ESMTP id qA9JuoYC013878 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=OK); Fri, 9 Nov 2012 19:56:50 GMT Received: from u109add4315675089e695.ant.amazon.com (172.17.1.114) by ex10-hub-9004.ant.amazon.com (10.185.137.182) with Microsoft SMTP Server id 14.2.247.3; Fri, 9 Nov 2012 11:55:55 -0800 Received: by u109add4315675089e695.ant.amazon.com (sSMTP sendmail emulation); Fri, 09 Nov 2012 11:55:55 -0800 Date: Fri, 9 Nov 2012 11:55:55 -0800 From: Matt Wilson To: Ian Campbell Message-ID: <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> References: <509C19DE.6010108@nuclearfallout.net> <1352467744.27833.21.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352467744.27833.21.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "george.dunlap@eu.citrix.com" , "xen-devel@lists.xensource.com" , John Weekes , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > the build is still creating a "dist/install/usr/lib" directory, and > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > until it's corrected). Files that are being put in that tree: > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > dist/install/usr/lib > > This is an interesting one. I'm not sure how we can avoid this > behaviour, perhaps there is a tar option to cause it to follow rather > than clobber synlinks? > > The only other choice I can think of is to change install.sh to use a > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > avoid including system directories, or to otherwise make install.sh more > fragile and prone to bitrot :-( Oh dear. If we find that there's not a good reason for it anymore, I'd think it would be better to remove install.sh instead. > I must confess I didn't realise anyone used install.sh -- is there some > advantage to it over make foo-install? > > OOI which distro has this lib->lib64 link and what issues does removing > it create? > > > dist/install/usr/lib/xen > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > remember? There's no need for these files to be multilib compatible, as they are not runtime DSOs. They're internal to Xen and I think that they should be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately there's not much agreement on the usefulness of /usr/libexec, so we'll need to make sure that packagers can adjust the paths for their systems' standards. For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time. Matt > Thanks again for reporting all these. > > Ian. > > > dist/install/usr/lib/xen/boot > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > > dist/install/usr/lib/xen/boot/hvmloader > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > > dist/install/usr/lib/xen/bin > > dist/install/usr/lib/xen/bin/stubdom-dm > > dist/install/usr/lib/xen/bin/qemu-io > > dist/install/usr/lib/xen/bin/qemu-nbd > > dist/install/usr/lib/xen/bin/qemu-img > > dist/install/usr/lib/xen/bin/xenpaging > > dist/install/usr/lib/xen/bin/qemu-dm > > dist/install/usr/lib/xen/bin/qemu-system-i386 > > dist/install/usr/lib/xen/bin/qemu-ga > > dist/install/usr/lib/xen/bin/stubdompath.sh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 05:54:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 05:54:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX40l-00014i-FE; Sat, 10 Nov 2012 05:53:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX40k-00014d-Fp for xen-devel@lists.xensource.com; Sat, 10 Nov 2012 05:53:42 +0000 Received: from [85.158.139.83:7296] by server-15.bemta-5.messagelabs.com id 65/54-26920-5EBED905; Sat, 10 Nov 2012 05:53:41 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352526821!29900113!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21566 invoked from network); 10 Nov 2012 05:53:41 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 05:53:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,750,1344211200"; d="scan'208";a="15716517" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 10 Nov 2012 05:53:36 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 10 Nov 2012 05:53:36 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TX40e-00041l-7g; Sat, 10 Nov 2012 05:53:36 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TX40d-00061t-SZ; Sat, 10 Nov 2012 05:53:35 +0000 To: Message-ID: From: xen.org Date: Sat, 10 Nov 2012 05:53:35 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14377 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14376 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14376 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14376 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14376 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 05:54:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 05:54:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX40l-00014i-FE; Sat, 10 Nov 2012 05:53:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX40k-00014d-Fp for xen-devel@lists.xensource.com; Sat, 10 Nov 2012 05:53:42 +0000 Received: from [85.158.139.83:7296] by server-15.bemta-5.messagelabs.com id 65/54-26920-5EBED905; Sat, 10 Nov 2012 05:53:41 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352526821!29900113!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzA=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21566 invoked from network); 10 Nov 2012 05:53:41 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 05:53:41 -0000 X-IronPort-AV: E=Sophos;i="4.80,750,1344211200"; d="scan'208";a="15716517" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 10 Nov 2012 05:53:36 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sat, 10 Nov 2012 05:53:36 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TX40e-00041l-7g; Sat, 10 Nov 2012 05:53:36 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TX40d-00061t-SZ; Sat, 10 Nov 2012 05:53:35 +0000 To: Message-ID: From: xen.org Date: Sat, 10 Nov 2012 05:53:35 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14377 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14376 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14376 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14376 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14376 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 08:31:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 08:31:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX6TC-0002HI-OK; Sat, 10 Nov 2012 08:31:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmVl-00019B-5e for xen-devel@lists.xen.org; Fri, 09 Nov 2012 11:12:33 +0000 Received: from [85.158.137.99:48742] by server-8.bemta-3.messagelabs.com id 25/E3-07786-025EC905; Fri, 09 Nov 2012 11:12:32 +0000 X-Env-Sender: juan@jelsupport.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352459550!18305922!1 X-Originating-IP: [216.27.216.109] X-SpamReason: No, hits=0.3 required=7.0 tests=HTML_60_70,HTML_MESSAGE X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14556 invoked from network); 9 Nov 2012 11:12:31 -0000 Received: from 109.216.27.216.static.ip.tnltd.net (HELO server.jel.local) (216.27.216.109) by server-14.tower-217.messagelabs.com with SMTP; 9 Nov 2012 11:12:31 -0000 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Date: Fri, 9 Nov 2012 04:01:36 -0700 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: .vhd will not boot in VM thread-index: Ac2+awC5nDBqeGW4SVy2ZUtsw2WP+g== From: "Juan Lorenzana" To: X-Mailman-Approved-At: Sat, 10 Nov 2012 08:31:14 +0000 Subject: [Xen-devel] .vhd will not boot in VM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1250336337164974587==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --===============1250336337164974587== Content-class: urn:content-classes:message Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01CDBE69.965B71D2" This is a multi-part message in MIME format. ------_=_NextPart_001_01CDBE69.965B71D2 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which as NFS mounted lost its ability to export the filesystem with the VM images on it. =20 We contacted the vendor and we were able to restore it. However, they had recommended that we delete the XCP Pool, recreate it, add the hosts back in, and then mount the storage. =20 That is where we are at now. We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the metadata is lost. So we can not see which image or snap shot belongs to which VM. The names all are blank when we look at the storage. =20 Also, if I randomly mount an image to a VM, it does not boot. It produces an error that says: =20 Traceback (most recent call last): - File "/usr/binpygrub", line 808, in ? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: [Errno 95] Operation not supported. =20 The system kept the VM information as we destroyed the pool and then created a new one but it looks like we only see snapshots through XenCenter. Its like the real .vhd that were running are not showing up. =20 I know it is pretty bad. We should not have listened to the storage guys. =20 =20 Does anyone know someone that can help?=20 =20 Juan ------_=_NextPart_001_01CDBE69.965B71D2 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

We had a = XCP 1.5 pool with 2 machines as hosts.  The storage pool which as = NFS mounted lost its ability to export the filesystem with the VM images = on it.

 

We contacted the vendor and we were able to restore = it.  However, they had recommended that we delete the XCP Pool, = recreate it, add the hosts back in, and then mount the = storage.

 

That is where we are at now.  We can see the = storage and the VM images.  However in XCP Xen Center when looking = at the images is clear that the metadata is lost.  So we can not = see which image or snap shot belongs to which VM.  The names all = are blank when we look at the storage.

 

Also, if I = randomly mount an image to a VM, it does not boot.  It produces an = error that says:

 

Traceback = (most recent call last): - File “/usr/binpygrub”, line 808, = in ? – fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) = – IOError: [Errno 95] Operation not supported.

 

The system = kept the VM information as we destroyed the pool and then created a new = one but it looks like we only see snapshots through XenCenter.  Its = like the real .vhd that were running are not showing = up.

 

I know it is pretty bad.  We should not have = listened to the storage guys. 

 

Does anyone = know someone that can help?

 

Juan

------_=_NextPart_001_01CDBE69.965B71D2-- --===============1250336337164974587== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1250336337164974587==-- From xen-devel-bounces@lists.xen.org Sat Nov 10 08:31:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 08:31:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TX6TC-0002HI-OK; Sat, 10 Nov 2012 08:31:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TWmVl-00019B-5e for xen-devel@lists.xen.org; Fri, 09 Nov 2012 11:12:33 +0000 Received: from [85.158.137.99:48742] by server-8.bemta-3.messagelabs.com id 25/E3-07786-025EC905; Fri, 09 Nov 2012 11:12:32 +0000 X-Env-Sender: juan@jelsupport.com X-Msg-Ref: server-14.tower-217.messagelabs.com!1352459550!18305922!1 X-Originating-IP: [216.27.216.109] X-SpamReason: No, hits=0.3 required=7.0 tests=HTML_60_70,HTML_MESSAGE X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14556 invoked from network); 9 Nov 2012 11:12:31 -0000 Received: from 109.216.27.216.static.ip.tnltd.net (HELO server.jel.local) (216.27.216.109) by server-14.tower-217.messagelabs.com with SMTP; 9 Nov 2012 11:12:31 -0000 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Date: Fri, 9 Nov 2012 04:01:36 -0700 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: .vhd will not boot in VM thread-index: Ac2+awC5nDBqeGW4SVy2ZUtsw2WP+g== From: "Juan Lorenzana" To: X-Mailman-Approved-At: Sat, 10 Nov 2012 08:31:14 +0000 Subject: [Xen-devel] .vhd will not boot in VM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1250336337164974587==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --===============1250336337164974587== Content-class: urn:content-classes:message Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01CDBE69.965B71D2" This is a multi-part message in MIME format. ------_=_NextPart_001_01CDBE69.965B71D2 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which as NFS mounted lost its ability to export the filesystem with the VM images on it. =20 We contacted the vendor and we were able to restore it. However, they had recommended that we delete the XCP Pool, recreate it, add the hosts back in, and then mount the storage. =20 That is where we are at now. We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the metadata is lost. So we can not see which image or snap shot belongs to which VM. The names all are blank when we look at the storage. =20 Also, if I randomly mount an image to a VM, it does not boot. It produces an error that says: =20 Traceback (most recent call last): - File "/usr/binpygrub", line 808, in ? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: [Errno 95] Operation not supported. =20 The system kept the VM information as we destroyed the pool and then created a new one but it looks like we only see snapshots through XenCenter. Its like the real .vhd that were running are not showing up. =20 I know it is pretty bad. We should not have listened to the storage guys. =20 =20 Does anyone know someone that can help?=20 =20 Juan ------_=_NextPart_001_01CDBE69.965B71D2 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

We had a = XCP 1.5 pool with 2 machines as hosts.  The storage pool which as = NFS mounted lost its ability to export the filesystem with the VM images = on it.

 

We contacted the vendor and we were able to restore = it.  However, they had recommended that we delete the XCP Pool, = recreate it, add the hosts back in, and then mount the = storage.

 

That is where we are at now.  We can see the = storage and the VM images.  However in XCP Xen Center when looking = at the images is clear that the metadata is lost.  So we can not = see which image or snap shot belongs to which VM.  The names all = are blank when we look at the storage.

 

Also, if I = randomly mount an image to a VM, it does not boot.  It produces an = error that says:

 

Traceback = (most recent call last): - File “/usr/binpygrub”, line 808, = in ? – fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) = – IOError: [Errno 95] Operation not supported.

 

The system = kept the VM information as we destroyed the pool and then created a new = one but it looks like we only see snapshots through XenCenter.  Its = like the real .vhd that were running are not showing = up.

 

I know it is pretty bad.  We should not have = listened to the storage guys. 

 

Does anyone = know someone that can help?

 

Juan

------_=_NextPart_001_01CDBE69.965B71D2-- --===============1250336337164974587== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1250336337164974587==-- From xen-devel-bounces@lists.xen.org Sat Nov 10 14:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 14:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBb6-0003dE-DA; Sat, 10 Nov 2012 13:59:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBb4-0003d9-Vw for xen-devel@lists.xen.org; Sat, 10 Nov 2012 13:59:43 +0000 Received: from [85.158.139.83:7395] by server-16.bemta-5.messagelabs.com id 3F/A2-04786-DCD5E905; Sat, 10 Nov 2012 13:59:41 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352555979!29651600!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NTg3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24266 invoked from network); 10 Nov 2012 13:59:40 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 10 Nov 2012 13:59:40 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAADxZrf019766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 10 Nov 2012 13:59:36 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAADxZej011086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 10 Nov 2012 13:59:35 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAADxY5n008798; Sat, 10 Nov 2012 07:59:34 -0600 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 10 Nov 2012 05:59:34 -0800 Date: Sat, 10 Nov 2012 08:59:32 -0500 From: Konrad Rzeszutek Wilk To: annie.li@oracle.com, marcos.matsunaga@oracle.com, Ian.Campbell@citrix.com, xen-devel@lists.xen.org Message-ID: <20121110135931.GD23686@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Ian, Xen-devel mailingl list, I think the issue of 70% traffic lost was actually introduced in v3.6 or perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of the releases introduced this. The issue we are seeing is that a domU to domU communication breaks - this is with netperf/netserver talking to each other. Anyhow, I think the 3.7 compound page exacerbated the problem and also (at least on some of my test hardware) exposed existing issues with drivers. The issue I have is that the 'skge' driver has a bug that has been there for ages (I tested way back to 3.0 and still saw it) were it can not work with SWIOTLB. It is probably missing an pci_dma_sync somewhere. Anyhow the compound page got me to look at Xen-SWIOTLB and that looks OK. Even with synthetic driver (the fake one I posted somewhere) it dealt with compound pages properly (with debug or non-debug Xen hypervisor). So was wondering if you had looked at this in more details? Any ideas? Or would it be more prudent to ask that once we know for sure which Linux release introduced the communication failures between guests? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 14:00:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 14:00:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBb6-0003dE-DA; Sat, 10 Nov 2012 13:59:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBb4-0003d9-Vw for xen-devel@lists.xen.org; Sat, 10 Nov 2012 13:59:43 +0000 Received: from [85.158.139.83:7395] by server-16.bemta-5.messagelabs.com id 3F/A2-04786-DCD5E905; Sat, 10 Nov 2012 13:59:41 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352555979!29651600!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NTg3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24266 invoked from network); 10 Nov 2012 13:59:40 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 10 Nov 2012 13:59:40 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAADxZrf019766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 10 Nov 2012 13:59:36 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAADxZej011086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 10 Nov 2012 13:59:35 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAADxY5n008798; Sat, 10 Nov 2012 07:59:34 -0600 Received: from localhost.localdomain (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 10 Nov 2012 05:59:34 -0800 Date: Sat, 10 Nov 2012 08:59:32 -0500 From: Konrad Rzeszutek Wilk To: annie.li@oracle.com, marcos.matsunaga@oracle.com, Ian.Campbell@citrix.com, xen-devel@lists.xen.org Message-ID: <20121110135931.GD23686@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Ian, Xen-devel mailingl list, I think the issue of 70% traffic lost was actually introduced in v3.6 or perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of the releases introduced this. The issue we are seeing is that a domU to domU communication breaks - this is with netperf/netserver talking to each other. Anyhow, I think the 3.7 compound page exacerbated the problem and also (at least on some of my test hardware) exposed existing issues with drivers. The issue I have is that the 'skge' driver has a bug that has been there for ages (I tested way back to 3.0 and still saw it) were it can not work with SWIOTLB. It is probably missing an pci_dma_sync somewhere. Anyhow the compound page got me to look at Xen-SWIOTLB and that looks OK. Even with synthetic driver (the fake one I posted somewhere) it dealt with compound pages properly (with debug or non-debug Xen hypervisor). So was wondering if you had looked at this in more details? Any ideas? Or would it be more prudent to ask that once we know for sure which Linux release introduced the communication failures between guests? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 14:22:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 14:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBwD-0003sP-AE; Sat, 10 Nov 2012 14:21:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBwC-0003sK-4P for xen-devel@lists.xen.org; Sat, 10 Nov 2012 14:21:32 +0000 Received: from [85.158.143.99:52945] by server-1.bemta-4.messagelabs.com id 42/AB-27934-BE26E905; Sat, 10 Nov 2012 14:21:31 +0000 X-Env-Sender: bouyer@antioche.eu.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1352557290!24138153!1 X-Originating-IP: [132.227.60.30] X-SpamReason: No, hits=0.7 required=7.0 tests=DATE_IN_PAST_03_06 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32709 invoked from network); 10 Nov 2012 14:21:30 -0000 Received: from osiris.lip6.fr (HELO osiris.lip6.fr) (132.227.60.30) by server-12.tower-216.messagelabs.com with SMTP; 10 Nov 2012 14:21:30 -0000 Received: from tibre.lip6.fr (tibre.ipv6.lip6.fr [IPv6:2001:660:3302:282a:204:e2ff:fe09:d49f]) by osiris.lip6.fr (8.14.5/lip6) with ESMTP id qAAELMlR008040 ; Sat, 10 Nov 2012 15:21:26 +0100 (CET) X-pt: osiris.lip6.fr Received: from baladeur.antioche.eu.org (sphinx [132.227.74.253]) by tibre.lip6.fr (8.14.5/8.13.3) with ESMTP id qAAELBco004164; Sat, 10 Nov 2012 15:21:25 +0100 (MET) Received: (from bouyer@localhost) by baladeur.antioche.eu.org (8.14.3/8.12.8/Submit) id qAAAjaTg001195; Sat, 10 Nov 2012 11:45:36 +0100 (CET) Date: Sat, 10 Nov 2012 11:45:36 +0100 From: Manuel Bouyer To: Roger Pau Monne Message-ID: <20121110104536.GA1027@antioche.eu.org> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.2.7 (osiris.lip6.fr [IPv6:2001:660:3302:283c::1e]); Sat, 10 Nov 2012 15:21:26 +0100 (CET) X-Scanned-By: MIMEDefang 2.73 Cc: port-xen@NetBSD.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: > This patch implements persistent grants for xbd_xenbus (blkfront in > Linux terminology). The effect of this change is to reduce the number > of unmap operations performed, since they cause a (costly) TLB > shootdown. This allows the I/O performance to scale better when a > large number of VMs are performing I/O. > > On startup xbd_xenbus notifies the backend driver that it is using > persistent grants. If the backend driver is not capable of persistent > mapping, xbd_xenbus will still use the same grants, since it is > compatible with the previous protocol, and simplifies the code > complexity in xbd_xenbus. > > Each time a request is send to the backend driver, xbd_xenbus will > check if there are free grants already mapped and will try to use one > of those. If there are not enough grants already mapped, xbd_xenbus > will request new grants, and they will be added to the list of free > grants when the transaction is finished, so they can be reused. Data > has to be copied from the request (struct buf) to the mapped grant, or > from the mapped grant to the request, depending on the operation being > performed. > > To test the performance impact of this patch I've benchmarked the > number of IOPS performed simultaneously by 15 NetBSD DomU guests on a > Linux Dom0 that supports persistent grants. The backend used to > perform this tests was a ramdisk of size 1GB. > > Sum of IOPS > Non-persistent 336718 > Persistent 686010 > > As seen, there's a x2 increase in the total number of IOPS being > performed. As a reference, using exactly the same setup Linux DomUs > are able to achieve 1102019 IOPS, so there's still plenty of room for > improvement. I'd like to see a similar test run against a NetBSD dom0. Also, how big are your IOPs ? -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference -- _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 14:22:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 14:22:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBwD-0003sP-AE; Sat, 10 Nov 2012 14:21:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXBwC-0003sK-4P for xen-devel@lists.xen.org; Sat, 10 Nov 2012 14:21:32 +0000 Received: from [85.158.143.99:52945] by server-1.bemta-4.messagelabs.com id 42/AB-27934-BE26E905; Sat, 10 Nov 2012 14:21:31 +0000 X-Env-Sender: bouyer@antioche.eu.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1352557290!24138153!1 X-Originating-IP: [132.227.60.30] X-SpamReason: No, hits=0.7 required=7.0 tests=DATE_IN_PAST_03_06 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32709 invoked from network); 10 Nov 2012 14:21:30 -0000 Received: from osiris.lip6.fr (HELO osiris.lip6.fr) (132.227.60.30) by server-12.tower-216.messagelabs.com with SMTP; 10 Nov 2012 14:21:30 -0000 Received: from tibre.lip6.fr (tibre.ipv6.lip6.fr [IPv6:2001:660:3302:282a:204:e2ff:fe09:d49f]) by osiris.lip6.fr (8.14.5/lip6) with ESMTP id qAAELMlR008040 ; Sat, 10 Nov 2012 15:21:26 +0100 (CET) X-pt: osiris.lip6.fr Received: from baladeur.antioche.eu.org (sphinx [132.227.74.253]) by tibre.lip6.fr (8.14.5/8.13.3) with ESMTP id qAAELBco004164; Sat, 10 Nov 2012 15:21:25 +0100 (MET) Received: (from bouyer@localhost) by baladeur.antioche.eu.org (8.14.3/8.12.8/Submit) id qAAAjaTg001195; Sat, 10 Nov 2012 11:45:36 +0100 (CET) Date: Sat, 10 Nov 2012 11:45:36 +0100 From: Manuel Bouyer To: Roger Pau Monne Message-ID: <20121110104536.GA1027@antioche.eu.org> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.2.7 (osiris.lip6.fr [IPv6:2001:660:3302:283c::1e]); Sat, 10 Nov 2012 15:21:26 +0100 (CET) X-Scanned-By: MIMEDefang 2.73 Cc: port-xen@NetBSD.org, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: > This patch implements persistent grants for xbd_xenbus (blkfront in > Linux terminology). The effect of this change is to reduce the number > of unmap operations performed, since they cause a (costly) TLB > shootdown. This allows the I/O performance to scale better when a > large number of VMs are performing I/O. > > On startup xbd_xenbus notifies the backend driver that it is using > persistent grants. If the backend driver is not capable of persistent > mapping, xbd_xenbus will still use the same grants, since it is > compatible with the previous protocol, and simplifies the code > complexity in xbd_xenbus. > > Each time a request is send to the backend driver, xbd_xenbus will > check if there are free grants already mapped and will try to use one > of those. If there are not enough grants already mapped, xbd_xenbus > will request new grants, and they will be added to the list of free > grants when the transaction is finished, so they can be reused. Data > has to be copied from the request (struct buf) to the mapped grant, or > from the mapped grant to the request, depending on the operation being > performed. > > To test the performance impact of this patch I've benchmarked the > number of IOPS performed simultaneously by 15 NetBSD DomU guests on a > Linux Dom0 that supports persistent grants. The backend used to > perform this tests was a ramdisk of size 1GB. > > Sum of IOPS > Non-persistent 336718 > Persistent 686010 > > As seen, there's a x2 increase in the total number of IOPS being > performed. As a reference, using exactly the same setup Linux DomUs > are able to achieve 1102019 IOPS, so there's still plenty of room for > improvement. I'd like to see a similar test run against a NetBSD dom0. Also, how big are your IOPs ? -- Manuel Bouyer NetBSD: 26 ans d'experience feront toujours la difference -- _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 19:41:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 19:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGvX-0005uJ-Mf; Sat, 10 Nov 2012 19:41:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGvW-0005uB-Du for xen-devel@lists.xen.org; Sat, 10 Nov 2012 19:41:10 +0000 Received: from [193.109.254.147:56290] by server-3.bemta-14.messagelabs.com id E1/2A-01317-5DDAE905; Sat, 10 Nov 2012 19:41:09 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1352576468!2725011!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.7 required=7.0 tests=DATE_IN_PAST_03_06 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19144 invoked from network); 10 Nov 2012 19:41:09 -0000 Received: from toccata.ens-lyon.org (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 10 Nov 2012 19:41:09 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4F7B584094; Sat, 10 Nov 2012 20:41:08 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cV1kXDIKDcCc; Sat, 10 Nov 2012 20:41:08 +0100 (CET) Received: from type.ipv6 (unknown [38.121.228.2]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 019168408C; Sat, 10 Nov 2012 20:41:08 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TXBTu-0002d1-FA; Sat, 10 Nov 2012 14:52:18 +0100 Date: Sat, 10 Nov 2012 14:52:18 +0100 From: Samuel Thibault To: Xu Zhang Message-ID: <20121110135218.GA5436@type> Mail-Followup-To: Samuel Thibault , Xu Zhang , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5098A674.5090203@cs.uic.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: gm281@cam.ac.uk, "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, Xu Zhang, le Mon 05 Nov 2012 23:56:04 -0600, a =E9crit : > I haven't seen any updates on this matter, so I try to come up with a fix. Thanks! > Generally speaking, I want to mimic 32-bit mini-OS behaviour, Ok. Probably a good thing :) > The "git diff" output is attached to this email. I only did some naive > "tests" by running it inside gdb. Do you mean that you actually ran a stack merging, even if only in gdb? I would trust that well enough. > I am wondering is there a test suite for mini-OS? You can simply run it, giving it a blk dev (or also a fb dev), it will run app_main(), which keeps reading stuff, and draws squares on the fb. Ideally you should manage to trigger fixups, by stuffing a wait loop in the critical section. > A follow-up question is that given this fix, do you still need > hypercall iret? Actually it's worse than that, see below. > + movq %rbx,5*8(%rsp) ... > + > + # check against re-entrance > + movq RIP(%rsp),%rbx > + cmpq $scrit,%rbx > + jb 10f > + cmpq $ecrit,%rbx > + jb critical_region_fixup > + > +10: movq RBX(%rsp),%rbx # restore rbx Do we really need to restore %rbx? I don't think do_hypervisor_callback uses it. > + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + = (__HYPERVISOR_iret * 32) Here we would also need a fixup table for the code at hypercall_page! A nicer fix would be to inline the hypercall code here. That said, I have to say I don't know any detail about the NMI flag, I don't see it defined in the Intel manual, and I don't see it being set in the Xen hypervisor. Unless somebody knows more about it, I would assume that it currently never happens, and simply stuff a ud2 /* TODO: fix re-entrance fixup for hypercall in NMI case (when does tha= t happen actually?) */ before the jmp, to catch it if it ever does happen. Also, it would be good to check against critical section size change, in case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. For instance, stuff right after the table: .if (ecrit-scrit) !=3D (critical_fixup_table_end - critical_fixup_table) .error "The critical has changed, the fixup table needs updating" .endif More generally, some cleanup could go along the patch, but I'd say keep it as you have done, focused on only the fixup code, to have it as such in the repository history, and then we could clean some things afterwards. Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 19:41:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 19:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGvX-0005uJ-Mf; Sat, 10 Nov 2012 19:41:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGvW-0005uB-Du for xen-devel@lists.xen.org; Sat, 10 Nov 2012 19:41:10 +0000 Received: from [193.109.254.147:56290] by server-3.bemta-14.messagelabs.com id E1/2A-01317-5DDAE905; Sat, 10 Nov 2012 19:41:09 +0000 X-Env-Sender: samuel.thibault@ens-lyon.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1352576468!2725011!1 X-Originating-IP: [140.77.166.68] X-SpamReason: No, hits=0.7 required=7.0 tests=DATE_IN_PAST_03_06 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19144 invoked from network); 10 Nov 2012 19:41:09 -0000 Received: from toccata.ens-lyon.org (HELO toccata.ens-lyon.org) (140.77.166.68) by server-7.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 10 Nov 2012 19:41:09 -0000 Received: from localhost (localhost [127.0.0.1]) by toccata.ens-lyon.org (Postfix) with ESMTP id 4F7B584094; Sat, 10 Nov 2012 20:41:08 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org Received: from toccata.ens-lyon.org ([127.0.0.1]) by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cV1kXDIKDcCc; Sat, 10 Nov 2012 20:41:08 +0100 (CET) Received: from type.ipv6 (unknown [38.121.228.2]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by toccata.ens-lyon.org (Postfix) with ESMTPSA id 019168408C; Sat, 10 Nov 2012 20:41:08 +0100 (CET) Received: from samy by type.ipv6 with local (Exim 4.80) (envelope-from ) id 1TXBTu-0002d1-FA; Sat, 10 Nov 2012 14:52:18 +0100 Date: Sat, 10 Nov 2012 14:52:18 +0100 From: Samuel Thibault To: Xu Zhang Message-ID: <20121110135218.GA5436@type> Mail-Followup-To: Samuel Thibault , Xu Zhang , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5098A674.5090203@cs.uic.edu> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Cc: gm281@cam.ac.uk, "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, Xu Zhang, le Mon 05 Nov 2012 23:56:04 -0600, a =E9crit : > I haven't seen any updates on this matter, so I try to come up with a fix. Thanks! > Generally speaking, I want to mimic 32-bit mini-OS behaviour, Ok. Probably a good thing :) > The "git diff" output is attached to this email. I only did some naive > "tests" by running it inside gdb. Do you mean that you actually ran a stack merging, even if only in gdb? I would trust that well enough. > I am wondering is there a test suite for mini-OS? You can simply run it, giving it a blk dev (or also a fb dev), it will run app_main(), which keeps reading stuff, and draws squares on the fb. Ideally you should manage to trigger fixups, by stuffing a wait loop in the critical section. > A follow-up question is that given this fix, do you still need > hypercall iret? Actually it's worse than that, see below. > + movq %rbx,5*8(%rsp) ... > + > + # check against re-entrance > + movq RIP(%rsp),%rbx > + cmpq $scrit,%rbx > + jb 10f > + cmpq $ecrit,%rbx > + jb critical_region_fixup > + > +10: movq RBX(%rsp),%rbx # restore rbx Do we really need to restore %rbx? I don't think do_hypervisor_callback uses it. > + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + = (__HYPERVISOR_iret * 32) Here we would also need a fixup table for the code at hypercall_page! A nicer fix would be to inline the hypercall code here. That said, I have to say I don't know any detail about the NMI flag, I don't see it defined in the Intel manual, and I don't see it being set in the Xen hypervisor. Unless somebody knows more about it, I would assume that it currently never happens, and simply stuff a ud2 /* TODO: fix re-entrance fixup for hypercall in NMI case (when does tha= t happen actually?) */ before the jmp, to catch it if it ever does happen. Also, it would be good to check against critical section size change, in case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. For instance, stuff right after the table: .if (ecrit-scrit) !=3D (critical_fixup_table_end - critical_fixup_table) .error "The critical has changed, the fixup table needs updating" .endif More generally, some cleanup could go along the patch, but I'd say keep it as you have done, focused on only the fixup code, to have it as such in the repository history, and then we could clean some things afterwards. Samuel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sat Nov 10 19:43:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 19:43:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGx7-0005yM-6Q; Sat, 10 Nov 2012 19:42:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGx5-0005y9-4n for xen-devel@lists.xen.org; Sat, 10 Nov 2012 19:42:47 +0000 Received: from [85.158.143.35:20865] by server-2.bemta-4.messagelabs.com id 50/86-28922-63EAE905; Sat, 10 Nov 2012 19:42:46 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352576562!17158274!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14335 invoked from network); 10 Nov 2012 19:42:43 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 19:42:43 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so6047816vcb.32 for ; Sat, 10 Nov 2012 11:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=5yyyWY3RJnFqL+A3SpP7XLzL08nx9V3PwxPS3ofcR8E=; b=EQQskPvU/MTVEjPVnA2YrN+au0nH285gAa9pcT44MjrGURO6XoyT0KTlv/oTbE0Nze sLDxdZ0tH/2OC7iKkN7n5r6oMc6P7/snqX7KfRfkTi+2i3SAY4Ns6bVguQnTUSp/tPOo Q5SlPVfbDd3AsfOVNgniB80u72B/L0sqNqzaojxdOdc1xxs4XnUPFBeWuF2SlQtItGRZ O3nxTCRkq8as4VpU9woKuuzA/G8uinLiu0fvHRef7GykNpqGa1li/UGRiOGMA9hM0uxz gxBXluIZpnaoDv9fEAGKhrETvEpTwip/O6aDDx2iZMPpFQVwZtfXwNgLo+Fw9wvry8Ng J1Xw== MIME-Version: 1.0 Received: by 10.58.162.130 with SMTP id ya2mr11907149veb.2.1352576562572; Sat, 10 Nov 2012 11:42:42 -0800 (PST) Received: by 10.220.37.8 with HTTP; Sat, 10 Nov 2012 11:42:42 -0800 (PST) In-Reply-To: References: Date: Sat, 10 Nov 2012 11:42:42 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1728157406802910382==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============1728157406802910382== Content-Type: multipart/alternative; boundary=047d7b6766dc8b2e6104ce294575 --047d7b6766dc8b2e6104ce294575 Content-Type: text/plain; charset=ISO-8859-1 Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: (Hans Mueller) OMG, why do most messages only show up in the daily batch but not individually? @Hans As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. The machine is still pingable, but I suppose there's not much I can do to verify the DomU's state. Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today. On Sat, Nov 10, 2012 at 4:00 AM, wrote: > Send Xen-devel mailing list submissions to > xen-devel@lists.xen.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel > or, via email, send a message with subject or body 'help' to > xen-devel-request@lists.xen.org > > You can reach the person managing the list at > xen-devel-owner@lists.xen.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Xen-devel digest..." > > > Today's Topics: > > 1. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > 2. Re: Dom0 physical networking/swiotlb/something issue in > 3.7-rc1 (Jan Beulich) > 3. Re: Bugs in xl that affect stubdom+tapdisk2, and others > (Matt Wilson) > 4. [xen-unstable test] 14377: tolerable FAIL (xen.org) > 5. .vhd will not boot in VM (Juan Lorenzana) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 09 Nov 2012 18:14:39 +0100 > From: Hans Mueller > To: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) > AMD-Vi: IO_PAGE_FAULT: > Message-ID: <1871003.0Pup8WfsfS@sheik-lin> > Content-Type: text/plain; charset="us-ascii" > > On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > > three. > > > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > > >4.2. > > > > > > > > Setup - Working: > > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > > libvirt-bin, > > > > xend > > > > Asus Radeon HD 7870 DirectCU. > > > > Works perfect. Benches on par with bare metal. > > > > > > > > Setup - Broken: > > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from > GIT), xl > > > > toolstack. > > > > Asus Radeon HD 7870 DirectCU. > > > > Some times the guest boots correctly but display is never enabled. > > > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > > address = > > > > 0x1ac800000, flags = 0 > > > > > > I had a similar problem since hg revision 25818:50adc933faaf which > changes > > > the qemu tag. > > > It looks like the qemu commit > > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > > causes this behavior. > > > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > > config. > > I don't follow this stuff closely but I could have sworn we had disabled > > msitranslate by default. > > > > In any case I don't think that changeset was intended to cause anything > > like this -- Stefano? > > > > > In addition I had to reboot (perhaps poweroff?) the dom0 once the > > > IO_PAGE_FAULT occured. > > One more info for you - afair i noticed that it was not only the > IO_PAGE_FAULT > which occured but also the qemu process in dom0 crashed w/o any messages in > the logs, perhaps feral can confirm this? > > > > > ------------------------------ > > Message: 2 > Date: Fri, 09 Nov 2012 17:34:35 +0000 > From: "Jan Beulich" > To: > Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org > Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something > issue in 3.7-rc1 > Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> > Content-Type: text/plain; charset=US-ASCII > > >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> > >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: > >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > >> > In the forward ported kernels, those two checks are however > >> > accompanied by range_needs_mapping() (aka > >> > range_straddles_page_boundary()) checks, which ought to > >> > take care of this. There is brokenness there with the invocations > >> > of gnttab_dma_map_page(), but only if the initial offset is at > >> > least PAGE_SIZE - will have to check whether that occurs. > >> > >> And indeed, fixing this also makes the problem go away when > >> the allocation order doesn't get forced to zero. So presumably > >> there's also only that one problem I had pointed out in pv-ops. > > > >The pvops one has this in the map-page variant (xen_swiotlb_map_page): > > > >351 if (dma_capable(dev, dev_addr, size) && > >352 !range_straddles_page_boundary(phys, size) && > !swiotlb_force) > >353 return dev_addr; > > > >and in the sg variant: > > > >494 if (swiotlb_force || > >495 !dma_capable(hwdev, dev_addr, sg->length) || > >496 range_straddles_page_boundary(paddr, sg->length)) > { > >497 void *map = swiotlb_tbl_map_single(hwdev, > > Oh, right, I forgot that there's yet another clone of that code under > drivers/xen/. > > >So I think that check is OK. There is no gnttab_dma_map_page call - so > that > >can't be the issue. > > Indeed. > > Jan > > > > > ------------------------------ > > Message: 3 > Date: Fri, 9 Nov 2012 11:55:55 -0800 > From: Matt Wilson > To: Ian Campbell > Cc: "george.dunlap@eu.citrix.com" , > "xen-devel@lists.xensource.com" , > John > Weekes , Roger Pau Monne > > Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and > others > Message-ID: > <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> > Content-Type: text/plain; charset="us-ascii" > > On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > > the build is still creating a "dist/install/usr/lib" directory, and > > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > > until it's corrected). Files that are being put in that tree: > > > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > > dist/install/usr/lib > > > > This is an interesting one. I'm not sure how we can avoid this > > behaviour, perhaps there is a tar option to cause it to follow rather > > than clobber synlinks? > > > > The only other choice I can think of is to change install.sh to use a > > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > > avoid including system directories, or to otherwise make install.sh more > > fragile and prone to bitrot :-( > > Oh dear. If we find that there's not a good reason for it anymore, I'd > think it would be better to remove install.sh instead. > > > I must confess I didn't realise anyone used install.sh -- is there some > > advantage to it over make foo-install? > > > > OOI which distro has this lib->lib64 link and what issues does removing > > it create? > > > > > dist/install/usr/lib/xen > > > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > > remember? > > There's no need for these files to be multilib compatible, as they are > not runtime DSOs. They're internal to Xen and I think that they should > be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately > there's not much agreement on the usefulness of /usr/libexec, so we'll > need to make sure that packagers can adjust the paths for their > systems' standards. > > For 4.2 we didn't want to change where these files were being placed, > and I believe they've bin in $PREFIX/lib/ for quite some time. > > Matt > > > Thanks again for reporting all these. > > > > Ian. > > > > > dist/install/usr/lib/xen/boot > > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > > > dist/install/usr/lib/xen/boot/hvmloader > > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > > > dist/install/usr/lib/xen/bin > > > dist/install/usr/lib/xen/bin/stubdom-dm > > > dist/install/usr/lib/xen/bin/qemu-io > > > dist/install/usr/lib/xen/bin/qemu-nbd > > > dist/install/usr/lib/xen/bin/qemu-img > > > dist/install/usr/lib/xen/bin/xenpaging > > > dist/install/usr/lib/xen/bin/qemu-dm > > > dist/install/usr/lib/xen/bin/qemu-system-i386 > > > dist/install/usr/lib/xen/bin/qemu-ga > > > dist/install/usr/lib/xen/bin/stubdompath.sh > > > > ------------------------------ > > Message: 4 > Date: Sat, 10 Nov 2012 05:53:35 +0000 > From: xen.org > To: > Cc: ian.jackson@eu.citrix.com > Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL > Message-ID: > Content-Type: text/plain > > flight 14377 xen-unstable real [real] > http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ > > Failures :-/ but no regressions. > > Regressions which are regarded as allowable (not blocking): > test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like > 14376 > test-amd64-amd64-xl-sedf 5 xen-boot fail like > 14376 > test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like > 14376 > test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like > 14376 > > Tests which did not succeed, but are not blocking: > test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never > pass > test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never > pass > test-amd64-i386-win 16 leak-check/check fail never > pass > test-amd64-amd64-win 16 leak-check/check fail never > pass > test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never > pass > test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never > pass > test-amd64-i386-win-vcpus1 16 leak-check/check fail never > pass > test-amd64-i386-xl-win7-amd64 13 guest-stop fail never > pass > test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never > pass > test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never > pass > test-amd64-amd64-xl-win 13 guest-stop fail never > pass > > version targeted for testing: > xen 62885b3c34c8 > baseline version: > xen 62885b3c34c8 > > jobs: > build-amd64 pass > build-i386 pass > build-amd64-oldkern pass > build-i386-oldkern pass > build-amd64-pvops pass > build-i386-pvops pass > test-amd64-amd64-xl pass > test-amd64-i386-xl pass > test-amd64-i386-rhel6hvm-amd pass > test-amd64-i386-qemuu-rhel6hvm-amd pass > test-amd64-amd64-xl-qemuu-win7-amd64 fail > test-amd64-amd64-xl-win7-amd64 fail > test-amd64-i386-xl-win7-amd64 fail > test-amd64-i386-xl-credit2 pass > test-amd64-amd64-xl-pcipt-intel fail > test-amd64-i386-rhel6hvm-intel pass > test-amd64-i386-qemuu-rhel6hvm-intel pass > test-amd64-i386-xl-multivcpu pass > test-amd64-amd64-pair pass > test-amd64-i386-pair pass > test-amd64-amd64-xl-sedf-pin fail > test-amd64-amd64-pv pass > test-amd64-i386-pv pass > test-amd64-amd64-xl-sedf fail > test-amd64-i386-win-vcpus1 fail > test-amd64-i386-xl-win-vcpus1 fail > test-amd64-i386-xl-winxpsp3-vcpus1 fail > test-amd64-amd64-win fail > test-amd64-i386-win fail > test-amd64-amd64-xl-win fail > test-amd64-amd64-xl-qemuu-winxpsp3 fail > test-amd64-i386-xend-winxpsp3 fail > test-amd64-amd64-xl-winxpsp3 fail > > > ------------------------------------------------------------ > sg-report-flight on woking.cam.xci-test.com > logs: /home/xc_osstest/logs > images: /home/xc_osstest/images > > Logs, config files, etc. are available at > http://www.chiark.greenend.org.uk/~xensrcts/logs > > Test harness code can be found at > http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary > > > Published tested tree is already up to date. > > > > > ------------------------------ > > Message: 5 > Date: Fri, 9 Nov 2012 04:01:36 -0700 > From: "Juan Lorenzana" > To: > Subject: [Xen-devel] .vhd will not boot in VM > Message-ID: > Content-Type: text/plain; charset="us-ascii" > > We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which > as NFS mounted lost its ability to export the filesystem with the VM > images on it. > > > > We contacted the vendor and we were able to restore it. However, they > had recommended that we delete the XCP Pool, recreate it, add the hosts > back in, and then mount the storage. > > > > That is where we are at now. We can see the storage and the VM images. > However in XCP Xen Center when looking at the images is clear that the > metadata is lost. So we can not see which image or snap shot belongs to > which VM. The names all are blank when we look at the storage. > > > > Also, if I randomly mount an image to a VM, it does not boot. It > produces an error that says: > > > > Traceback (most recent call last): - File "/usr/binpygrub", line 808, in > ? - fs = fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: > [Errno 95] Operation not supported. > > > > The system kept the VM information as we destroyed the pool and then > created a new one but it looks like we only see snapshots through > XenCenter. Its like the real .vhd that were running are not showing up. > > > > I know it is pretty bad. We should not have listened to the storage > guys. > > > > Does anyone know someone that can help? > > > > Juan > > -------------- next part -------------- > An HTML attachment was scrubbed... > URL: < > http://lists.xen.org/archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html > > > > ------------------------------ > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > > > End of Xen-devel Digest, Vol 93, Issue 79 > ***************************************** > -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --047d7b6766dc8b2e6104ce294575 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Re: PCI/VGA pas= sthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
OMG, why d= o most messages only show up in the daily batch but not individually?
@Hans
As far as I can tell, the guest is running fine until we see the= =A0IO_PAGE_FAULT. =A0The machine is= still pingable, but I suppose there's not much I can do to verify the = DomU's state.
Going to try running the newer qemu w= ith Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today.


On Sat, Nov 1= 0, 2012 at 4:00 AM, <xen-devel-request@lists.xen.org>= ; wrote:
Send Xen-devel mailing list submissions to =A0 =A0 =A0 =A0 xen-devel@lists.= xen.org

To subscribe or unsubscribe via the World Wide Web, visit
=A0 =A0 =A0 =A0 http://lists.xen.org/cgi-bin/mailman/listinfo/xe= n-devel
or, via email, send a message with subject or body 'help' to
=A0 =A0 =A0 =A0 xen-deve= l-request@lists.xen.org

You can reach the person managing the list at
=A0 =A0 =A0 =A0 xen-devel-= owner@lists.xen.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Xen-devel digest..."


Today's Topics:

=A0 =A01. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
=A0 =A02. Re: Dom0 physical networking/swiotlb/something issue in
=A0 =A0 =A0 3.7-rc1 (Jan Beulich)
=A0 =A03. Re: Bugs in xl that affect stubdom+tapdisk2, and others
=A0 =A0 =A0 (Matt Wilson)
=A0 =A04. [xen-unstable test] 14377: tolerable FAIL (xen.org)
=A0 =A05. .vhd will not boot in VM (Juan Lorenzana)


----------------------------------------------------------------------

Message: 1
Date: Fri, 09 Nov 2012 18:14:39 +0100
From: Hans Mueller <mcbeagle@gmx.de>
To: xen-devel@lists.xen.org<= br> Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN)
=A0 =A0 =A0 =A0 AMD-Vi: IO_PAGE_FAULT:
Message-ID: <1871003.0Pup8WfsfS@sheik-lin>
Content-Type: text/plain; charset=3D"us-ascii"

On Friday, 9. November 2012 16:33:47 Ian Campbell wrote:
> On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote:
> > On Thursday, 8. November 2012 20:02:51 feral wrote:
> > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested aga= inst all
> > > three.
> > >
> > > VGA passthrough previously working with 4.1 is no longer wor= king with
> > > >4.2.
> > >
> > > Setup - Working:
> > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos)= ,
> > > libvirt-bin,
> > > xend
> > > Asus Radeon HD 7870 DirectCU.
> > > Works perfect. =A0Benches on par with bare metal.
> > >
> > > Setup - Broken:
> > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (f= rom GIT), xl
> > > toolstack.
> > > Asus Radeon HD 7870 DirectCU.
> > > Some times the guest boots correctly but display is never en= abled.
> > >
> > > =A0Sometimes BSOD, doesn't seem to be any rhyme or reaso= n?
> > >
> > > No errors in logs. =A0 Found the following in 'xl dmesg&= #39;:
> > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x6= 00, fault
> > > address =3D
> > > 0x1ac800000, flags =3D 0
> >
> > I had a similar problem since hg revision 25818:50adc933faaf whic= h changes
> > the qemu tag.
> > It looks like the qemu commit
> > 3e66da7266c84638c0e22a09c9d2b07529802576
> > (qemu-xen-trad: fix msi_translate with PV event delivery)
> > causes this behavior.
> >
> > I solved the problem for me by using 'pci_msitranslate=3D0= 9; in the domU
> > config.
> I don't follow this stuff closely but I could have sworn we had di= sabled
> msitranslate by default.
>
> In any case I don't think that changeset was intended to cause any= thing
> like this -- Stefano?
>
> > In addition I had to reboot (perhaps poweroff?) the dom0 once the=
> > IO_PAGE_FAULT occured.

One more info for you - afair i noticed that it was not only the IO_PAGE_FA= ULT
which occured but also the qemu process in dom0 crashed w/o any messages in=
the logs, perhaps feral can confirm this?




------------------------------

Message: 2
Date: Fri, 09 Nov 2012 17:34:35 +0000
From: "Jan Beulich" <jbeu= lich@suse.com>
To: <konrad.wilk@oracle.com>
Cc: Ian.Campbell@citrix.com,= xen-devel@lists.xen.org
Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something
=A0 =A0 =A0 =A0 issue in 3.7-rc1
Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com>
Content-Type: text/plain; charset=3DUS-ASCII

>>> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 11/09/12 2:48 PM >>>
>On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote:
>> >>> On 09.11.12 at 11:36, "Jan Beulich" <JBeulich@suse.com> wrote:
>> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka
>> > range_straddles_page_boundary()) checks, which ought to
>> > take care of this. There is brokenness there with the invocat= ions
>> > of gnttab_dma_map_page(), but only if the initial offset is a= t
>> > least PAGE_SIZE - will have to check whether that occurs.
>>
>> And indeed, fixing this also makes the problem go away when
>> the allocation order doesn't get forced to zero. So presumably=
>> there's also only that one problem I had pointed out in pv-ops= .
>
>The pvops one has this in the map-page variant (xen_swiotlb_map_page):<= br> >
>351 =A0 =A0 =A0 =A0 if (dma_capable(dev, dev_addr, size) &&
>352 =A0 =A0 =A0 =A0 =A0 =A0 !range_straddles_page_boundary(phys, size) = && !swiotlb_force)
>353 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return dev_addr;
>
>and in the sg variant:
>
>494 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (swiotlb_force ||
>495 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !dma_capable(hwdev, dev_add= r, sg->length) ||
>496 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 range_straddles_page_bounda= ry(paddr, sg->length)) {
>497 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 void *map =3D swiot= lb_tbl_map_single(hwdev,

Oh, right, I forgot that there's yet another clone of that code under d= rivers/xen/.

>So I think that check is OK. There is no gnttab_dma_map_page call - so = that
>can't be the issue.

Indeed.

Jan




------------------------------

Message: 3
Date: Fri, 9 Nov 2012 11:55:55 -0800
From: Matt Wilson <msw@amazon.com&= gt;
To: Ian Campbell <Ian.Campbel= l@citrix.com>
Cc: "george.dunlap@eu.c= itrix.com" <geor= ge.dunlap@eu.citrix.com>,
=A0 =A0 =A0 =A0 "xen-= devel@lists.xensource.com" <xen-devel@lists.xensource.com>, =A0 =A0 =A0 =A0John =A0 =A0 =A0 =A0 Weekes <= lists.xen@nuclearfallout.net>, =A0Roger Pau Monne
=A0 =A0 =A0 =A0 <roger.pau@citri= x.com>
Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and
=A0 =A0 =A0 =A0 others
Message-ID:
=A0 =A0 =A0 =A0 <20121109195553.GA11023@u109add4315675089e695.ant.am= azon.com>
Content-Type: text/plain; charset=3D"us-ascii"

On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote:
> On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote:
> > As an additional note about 4.2 -- this isn't an "xl&quo= t; issue, but rather
> > a build problem -- even though I use "./configure --libdir= =3D/usr/lib64",
> > the build is still creating a "dist/install/usr/lib" di= rectory, and
> > because of this, running ./install.sh nukes my system's "= ;/usr/lib" ->
> > "/usr/lib64" softlink (which in turn causes all sorts o= f other problems
> > until it's corrected). Files that are being put in that tree:=
> >
> > xen-4.2-testing.hg # find dist/install/usr/lib
> > dist/install/usr/lib
>
> This is an interesting one. I'm not sure how we can avoid this
> behaviour, perhaps there is a tar option to cause it to follow rather<= br> > than clobber synlinks?
>
> The only other choice I can think of is to change install.sh to use a<= br> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * t= o
> avoid including system directories, or to otherwise make install.sh mo= re
> fragile and prone to bitrot :-(

Oh dear. If we find that there's not a good reason for it anymore, I= 9;d
think it would be better to remove install.sh instead.

> I must confess I didn't realise anyone used install.sh -- is there= some
> advantage to it over make foo-install?
>
> OOI which distro has this lib->lib64 link and what issues does remo= ving
> it create?
>
> > dist/install/usr/lib/xen
>
> This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is<= br> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt = do you
> remember?

There's no need for these files to be multilib compatible, as they are<= br> not runtime DSOs. They're internal to Xen and I think that they should<= br> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately
there's not much agreement on the usefulness of /usr/libexec, so we'= ;ll
need to make sure that packagers can adjust the paths for their
systems' standards.

For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time.

Matt

> Thanks again for reporting all these.
>
> Ian.
>
> > dist/install/usr/lib/xen/boot
> > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz
> > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz
> > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz
> > dist/install/usr/lib/xen/boot/hvmloader
> > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz
> > dist/install/usr/lib/xen/bin
> > dist/install/usr/lib/xen/bin/stubdom-dm
> > dist/install/usr/lib/xen/bin/qemu-io
> > dist/install/usr/lib/xen/bin/qemu-nbd
> > dist/install/usr/lib/xen/bin/qemu-img
> > dist/install/usr/lib/xen/bin/xenpaging
> > dist/install/usr/lib/xen/bin/qemu-dm
> > dist/install/usr/lib/xen/bin/qemu-system-i386
> > dist/install/usr/lib/xen/bin/qemu-ga
> > dist/install/usr/lib/xen/bin/stubdompath.sh



------------------------------

Message: 4
Date: Sat, 10 Nov 2012 05:53:35 +0000
From: xen.org <ian.jackson@eu.citrix.com>
To: <xen-devel@lists.xe= nsource.com>
Cc: ian.jackson@eu.citrix.com<= /a>
Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL
Message-ID: <osstest= -14377-mainreport@xen.org>
Content-Type: text/plain

flight 14377 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/

Failures :-/ but no regressions.

Regressions which are regarded as allowable (not blocking):
=A0test-amd64-amd64-xl-sedf-pin 10 guest-saverestore =A0 =A0 =A0 =A0 =A0 = =A0fail =A0 like 14376
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A05 xen-boot =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail =A0 like 14376
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A09 guest-localmigrate =A0 =A0 =A0 f= ail like 14376
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A09 guest-localmigrate =A0 =A0 fai= l like 14376

Tests which did not succeed, but are not blocking:
=A0test-amd64-amd64-xl-pcipt-intel =A09 guest-start =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-xend-winxpsp3 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0never pass
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A016 leak-check/check =A0 =A0 =A0 = =A0 =A0 =A0 fail =A0 never pass
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 16 leak-check/check =A0 =A0 =A0 =A0= =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-win-vcpus1 =A0 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-winxpsp3 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 fail never pass
=A0test-amd64-amd64-xl-win =A0 =A0 =A013 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail =A0 never pass

version targeted for testing:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8
baseline version:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8

jobs:
=A0build-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail
=A0test-amd64-amd64-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-credit2 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-pcipt-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 pass
=A0test-amd64-i386-xl-multivcpu =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf-pin =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-winxpsp3-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xend-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail


------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
=A0 =A0 http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
=A0 =A0 http://xenbits.xensource.com/gitweb?p=3Dosstest.= git;a=3Dsummary


Published tested tree is already up to date.




------------------------------

Message: 5
Date: Fri, 9 Nov 2012 04:01:36 -0700
From: "Juan Lorenzana" <juan@jelsupport.com>
To: <xen-devel@lists.xen.org<= /a>>
Subject: [Xen-devel] .vhd will not boot in VM
Message-ID: <F2EF84CA5BCF824AA4197956E124073848F4AE@server.jel.local>=
Content-Type: text/plain; charset=3D"us-ascii"

We had a XCP 1.5 pool with 2 machines as hosts. =A0The storage pool which as NFS mounted lost its ability to export the filesystem with the VM
images on it.



We contacted the vendor and we were able to restore it. =A0However, they had recommended that we delete the XCP Pool, recreate it, add the hosts
back in, and then mount the storage.



That is where we are at now. =A0We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the
metadata is lost. =A0So we can not see which image or snap shot belongs to<= br> which VM. =A0The names all are blank when we look at the storage.



Also, if I randomly mount an image to a VM, it does not boot. =A0It
produces an error that says:



Traceback (most recent call last): - File "/usr/binpygrub", line = 808, in
? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError:
[Errno 95] Operation not supported.



The system kept the VM information as we destroyed the pool and then
created a new one but it looks like we only see snapshots through
XenCenter. =A0Its like the real .vhd that were running are not showing up.<= br>


I know it is pretty bad. =A0We should not have listened to the storage
guys.



Does anyone know someone that can help?



Juan

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.xen.org= /archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html&= gt;

------------------------------

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.x= en.org/xen-devel


End of Xen-devel Digest, Vol 93, Issue 79
*****************************************



--
_____
Fac= t:
1. Ninjas are mammals.
2. Ninjas fight ALL the time.
3. The pur= pose of the ninja is to flip out and kill people.
--047d7b6766dc8b2e6104ce294575-- --===============1728157406802910382== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1728157406802910382==-- From xen-devel-bounces@lists.xen.org Sat Nov 10 19:43:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 19:43:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGx7-0005yM-6Q; Sat, 10 Nov 2012 19:42:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXGx5-0005y9-4n for xen-devel@lists.xen.org; Sat, 10 Nov 2012 19:42:47 +0000 Received: from [85.158.143.35:20865] by server-2.bemta-4.messagelabs.com id 50/86-28922-63EAE905; Sat, 10 Nov 2012 19:42:46 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352576562!17158274!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14335 invoked from network); 10 Nov 2012 19:42:43 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 19:42:43 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so6047816vcb.32 for ; Sat, 10 Nov 2012 11:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=5yyyWY3RJnFqL+A3SpP7XLzL08nx9V3PwxPS3ofcR8E=; b=EQQskPvU/MTVEjPVnA2YrN+au0nH285gAa9pcT44MjrGURO6XoyT0KTlv/oTbE0Nze sLDxdZ0tH/2OC7iKkN7n5r6oMc6P7/snqX7KfRfkTi+2i3SAY4Ns6bVguQnTUSp/tPOo Q5SlPVfbDd3AsfOVNgniB80u72B/L0sqNqzaojxdOdc1xxs4XnUPFBeWuF2SlQtItGRZ O3nxTCRkq8as4VpU9woKuuzA/G8uinLiu0fvHRef7GykNpqGa1li/UGRiOGMA9hM0uxz gxBXluIZpnaoDv9fEAGKhrETvEpTwip/O6aDDx2iZMPpFQVwZtfXwNgLo+Fw9wvry8Ng J1Xw== MIME-Version: 1.0 Received: by 10.58.162.130 with SMTP id ya2mr11907149veb.2.1352576562572; Sat, 10 Nov 2012 11:42:42 -0800 (PST) Received: by 10.220.37.8 with HTTP; Sat, 10 Nov 2012 11:42:42 -0800 (PST) In-Reply-To: References: Date: Sat, 10 Nov 2012 11:42:42 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1728157406802910382==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============1728157406802910382== Content-Type: multipart/alternative; boundary=047d7b6766dc8b2e6104ce294575 --047d7b6766dc8b2e6104ce294575 Content-Type: text/plain; charset=ISO-8859-1 Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: (Hans Mueller) OMG, why do most messages only show up in the daily batch but not individually? @Hans As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. The machine is still pingable, but I suppose there's not much I can do to verify the DomU's state. Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today. On Sat, Nov 10, 2012 at 4:00 AM, wrote: > Send Xen-devel mailing list submissions to > xen-devel@lists.xen.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel > or, via email, send a message with subject or body 'help' to > xen-devel-request@lists.xen.org > > You can reach the person managing the list at > xen-devel-owner@lists.xen.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of Xen-devel digest..." > > > Today's Topics: > > 1. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > 2. Re: Dom0 physical networking/swiotlb/something issue in > 3.7-rc1 (Jan Beulich) > 3. Re: Bugs in xl that affect stubdom+tapdisk2, and others > (Matt Wilson) > 4. [xen-unstable test] 14377: tolerable FAIL (xen.org) > 5. .vhd will not boot in VM (Juan Lorenzana) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 09 Nov 2012 18:14:39 +0100 > From: Hans Mueller > To: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) > AMD-Vi: IO_PAGE_FAULT: > Message-ID: <1871003.0Pup8WfsfS@sheik-lin> > Content-Type: text/plain; charset="us-ascii" > > On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: > > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all > > > > three. > > > > > > > > VGA passthrough previously working with 4.1 is no longer working with > > > > >4.2. > > > > > > > > Setup - Working: > > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), > > > > libvirt-bin, > > > > xend > > > > Asus Radeon HD 7870 DirectCU. > > > > Works perfect. Benches on par with bare metal. > > > > > > > > Setup - Broken: > > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from > GIT), xl > > > > toolstack. > > > > Asus Radeon HD 7870 DirectCU. > > > > Some times the guest boots correctly but display is never enabled. > > > > > > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault > > > > address = > > > > 0x1ac800000, flags = 0 > > > > > > I had a similar problem since hg revision 25818:50adc933faaf which > changes > > > the qemu tag. > > > It looks like the qemu commit > > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > > causes this behavior. > > > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU > > > config. > > I don't follow this stuff closely but I could have sworn we had disabled > > msitranslate by default. > > > > In any case I don't think that changeset was intended to cause anything > > like this -- Stefano? > > > > > In addition I had to reboot (perhaps poweroff?) the dom0 once the > > > IO_PAGE_FAULT occured. > > One more info for you - afair i noticed that it was not only the > IO_PAGE_FAULT > which occured but also the qemu process in dom0 crashed w/o any messages in > the logs, perhaps feral can confirm this? > > > > > ------------------------------ > > Message: 2 > Date: Fri, 09 Nov 2012 17:34:35 +0000 > From: "Jan Beulich" > To: > Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org > Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something > issue in 3.7-rc1 > Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> > Content-Type: text/plain; charset=US-ASCII > > >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> > >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: > >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: > >> > In the forward ported kernels, those two checks are however > >> > accompanied by range_needs_mapping() (aka > >> > range_straddles_page_boundary()) checks, which ought to > >> > take care of this. There is brokenness there with the invocations > >> > of gnttab_dma_map_page(), but only if the initial offset is at > >> > least PAGE_SIZE - will have to check whether that occurs. > >> > >> And indeed, fixing this also makes the problem go away when > >> the allocation order doesn't get forced to zero. So presumably > >> there's also only that one problem I had pointed out in pv-ops. > > > >The pvops one has this in the map-page variant (xen_swiotlb_map_page): > > > >351 if (dma_capable(dev, dev_addr, size) && > >352 !range_straddles_page_boundary(phys, size) && > !swiotlb_force) > >353 return dev_addr; > > > >and in the sg variant: > > > >494 if (swiotlb_force || > >495 !dma_capable(hwdev, dev_addr, sg->length) || > >496 range_straddles_page_boundary(paddr, sg->length)) > { > >497 void *map = swiotlb_tbl_map_single(hwdev, > > Oh, right, I forgot that there's yet another clone of that code under > drivers/xen/. > > >So I think that check is OK. There is no gnttab_dma_map_page call - so > that > >can't be the issue. > > Indeed. > > Jan > > > > > ------------------------------ > > Message: 3 > Date: Fri, 9 Nov 2012 11:55:55 -0800 > From: Matt Wilson > To: Ian Campbell > Cc: "george.dunlap@eu.citrix.com" , > "xen-devel@lists.xensource.com" , > John > Weekes , Roger Pau Monne > > Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and > others > Message-ID: > <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> > Content-Type: text/plain; charset="us-ascii" > > On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > > the build is still creating a "dist/install/usr/lib" directory, and > > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > > until it's corrected). Files that are being put in that tree: > > > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > > dist/install/usr/lib > > > > This is an interesting one. I'm not sure how we can avoid this > > behaviour, perhaps there is a tar option to cause it to follow rather > > than clobber synlinks? > > > > The only other choice I can think of is to change install.sh to use a > > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > > avoid including system directories, or to otherwise make install.sh more > > fragile and prone to bitrot :-( > > Oh dear. If we find that there's not a good reason for it anymore, I'd > think it would be better to remove install.sh instead. > > > I must confess I didn't realise anyone used install.sh -- is there some > > advantage to it over make foo-install? > > > > OOI which distro has this lib->lib64 link and what issues does removing > > it create? > > > > > dist/install/usr/lib/xen > > > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > > remember? > > There's no need for these files to be multilib compatible, as they are > not runtime DSOs. They're internal to Xen and I think that they should > be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately > there's not much agreement on the usefulness of /usr/libexec, so we'll > need to make sure that packagers can adjust the paths for their > systems' standards. > > For 4.2 we didn't want to change where these files were being placed, > and I believe they've bin in $PREFIX/lib/ for quite some time. > > Matt > > > Thanks again for reporting all these. > > > > Ian. > > > > > dist/install/usr/lib/xen/boot > > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz > > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz > > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz > > > dist/install/usr/lib/xen/boot/hvmloader > > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz > > > dist/install/usr/lib/xen/bin > > > dist/install/usr/lib/xen/bin/stubdom-dm > > > dist/install/usr/lib/xen/bin/qemu-io > > > dist/install/usr/lib/xen/bin/qemu-nbd > > > dist/install/usr/lib/xen/bin/qemu-img > > > dist/install/usr/lib/xen/bin/xenpaging > > > dist/install/usr/lib/xen/bin/qemu-dm > > > dist/install/usr/lib/xen/bin/qemu-system-i386 > > > dist/install/usr/lib/xen/bin/qemu-ga > > > dist/install/usr/lib/xen/bin/stubdompath.sh > > > > ------------------------------ > > Message: 4 > Date: Sat, 10 Nov 2012 05:53:35 +0000 > From: xen.org > To: > Cc: ian.jackson@eu.citrix.com > Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL > Message-ID: > Content-Type: text/plain > > flight 14377 xen-unstable real [real] > http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ > > Failures :-/ but no regressions. > > Regressions which are regarded as allowable (not blocking): > test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like > 14376 > test-amd64-amd64-xl-sedf 5 xen-boot fail like > 14376 > test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like > 14376 > test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like > 14376 > > Tests which did not succeed, but are not blocking: > test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never > pass > test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never > pass > test-amd64-i386-win 16 leak-check/check fail never > pass > test-amd64-amd64-win 16 leak-check/check fail never > pass > test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never > pass > test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never > pass > test-amd64-i386-win-vcpus1 16 leak-check/check fail never > pass > test-amd64-i386-xl-win7-amd64 13 guest-stop fail never > pass > test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never > pass > test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never > pass > test-amd64-amd64-xl-win 13 guest-stop fail never > pass > > version targeted for testing: > xen 62885b3c34c8 > baseline version: > xen 62885b3c34c8 > > jobs: > build-amd64 pass > build-i386 pass > build-amd64-oldkern pass > build-i386-oldkern pass > build-amd64-pvops pass > build-i386-pvops pass > test-amd64-amd64-xl pass > test-amd64-i386-xl pass > test-amd64-i386-rhel6hvm-amd pass > test-amd64-i386-qemuu-rhel6hvm-amd pass > test-amd64-amd64-xl-qemuu-win7-amd64 fail > test-amd64-amd64-xl-win7-amd64 fail > test-amd64-i386-xl-win7-amd64 fail > test-amd64-i386-xl-credit2 pass > test-amd64-amd64-xl-pcipt-intel fail > test-amd64-i386-rhel6hvm-intel pass > test-amd64-i386-qemuu-rhel6hvm-intel pass > test-amd64-i386-xl-multivcpu pass > test-amd64-amd64-pair pass > test-amd64-i386-pair pass > test-amd64-amd64-xl-sedf-pin fail > test-amd64-amd64-pv pass > test-amd64-i386-pv pass > test-amd64-amd64-xl-sedf fail > test-amd64-i386-win-vcpus1 fail > test-amd64-i386-xl-win-vcpus1 fail > test-amd64-i386-xl-winxpsp3-vcpus1 fail > test-amd64-amd64-win fail > test-amd64-i386-win fail > test-amd64-amd64-xl-win fail > test-amd64-amd64-xl-qemuu-winxpsp3 fail > test-amd64-i386-xend-winxpsp3 fail > test-amd64-amd64-xl-winxpsp3 fail > > > ------------------------------------------------------------ > sg-report-flight on woking.cam.xci-test.com > logs: /home/xc_osstest/logs > images: /home/xc_osstest/images > > Logs, config files, etc. are available at > http://www.chiark.greenend.org.uk/~xensrcts/logs > > Test harness code can be found at > http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary > > > Published tested tree is already up to date. > > > > > ------------------------------ > > Message: 5 > Date: Fri, 9 Nov 2012 04:01:36 -0700 > From: "Juan Lorenzana" > To: > Subject: [Xen-devel] .vhd will not boot in VM > Message-ID: > Content-Type: text/plain; charset="us-ascii" > > We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which > as NFS mounted lost its ability to export the filesystem with the VM > images on it. > > > > We contacted the vendor and we were able to restore it. However, they > had recommended that we delete the XCP Pool, recreate it, add the hosts > back in, and then mount the storage. > > > > That is where we are at now. We can see the storage and the VM images. > However in XCP Xen Center when looking at the images is clear that the > metadata is lost. So we can not see which image or snap shot belongs to > which VM. The names all are blank when we look at the storage. > > > > Also, if I randomly mount an image to a VM, it does not boot. It > produces an error that says: > > > > Traceback (most recent call last): - File "/usr/binpygrub", line 808, in > ? - fs = fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: > [Errno 95] Operation not supported. > > > > The system kept the VM information as we destroyed the pool and then > created a new one but it looks like we only see snapshots through > XenCenter. Its like the real .vhd that were running are not showing up. > > > > I know it is pretty bad. We should not have listened to the storage > guys. > > > > Does anyone know someone that can help? > > > > Juan > > -------------- next part -------------- > An HTML attachment was scrubbed... > URL: < > http://lists.xen.org/archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html > > > > ------------------------------ > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > > > End of Xen-devel Digest, Vol 93, Issue 79 > ***************************************** > -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --047d7b6766dc8b2e6104ce294575 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Re: PCI/VGA pas= sthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
OMG, why d= o most messages only show up in the daily batch but not individually?
@Hans
As far as I can tell, the guest is running fine until we see the= =A0IO_PAGE_FAULT. =A0The machine is= still pingable, but I suppose there's not much I can do to verify the = DomU's state.
Going to try running the newer qemu w= ith Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today.


On Sat, Nov 1= 0, 2012 at 4:00 AM, <xen-devel-request@lists.xen.org>= ; wrote:
Send Xen-devel mailing list submissions to =A0 =A0 =A0 =A0 xen-devel@lists.= xen.org

To subscribe or unsubscribe via the World Wide Web, visit
=A0 =A0 =A0 =A0 http://lists.xen.org/cgi-bin/mailman/listinfo/xe= n-devel
or, via email, send a message with subject or body 'help' to
=A0 =A0 =A0 =A0 xen-deve= l-request@lists.xen.org

You can reach the person managing the list at
=A0 =A0 =A0 =A0 xen-devel-= owner@lists.xen.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Xen-devel digest..."


Today's Topics:

=A0 =A01. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
=A0 =A02. Re: Dom0 physical networking/swiotlb/something issue in
=A0 =A0 =A0 3.7-rc1 (Jan Beulich)
=A0 =A03. Re: Bugs in xl that affect stubdom+tapdisk2, and others
=A0 =A0 =A0 (Matt Wilson)
=A0 =A04. [xen-unstable test] 14377: tolerable FAIL (xen.org)
=A0 =A05. .vhd will not boot in VM (Juan Lorenzana)


----------------------------------------------------------------------

Message: 1
Date: Fri, 09 Nov 2012 18:14:39 +0100
From: Hans Mueller <mcbeagle@gmx.de>
To: xen-devel@lists.xen.org<= br> Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN)
=A0 =A0 =A0 =A0 AMD-Vi: IO_PAGE_FAULT:
Message-ID: <1871003.0Pup8WfsfS@sheik-lin>
Content-Type: text/plain; charset=3D"us-ascii"

On Friday, 9. November 2012 16:33:47 Ian Campbell wrote:
> On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote:
> > On Thursday, 8. November 2012 20:02:51 feral wrote:
> > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested aga= inst all
> > > three.
> > >
> > > VGA passthrough previously working with 4.1 is no longer wor= king with
> > > >4.2.
> > >
> > > Setup - Working:
> > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos)= ,
> > > libvirt-bin,
> > > xend
> > > Asus Radeon HD 7870 DirectCU.
> > > Works perfect. =A0Benches on par with bare metal.
> > >
> > > Setup - Broken:
> > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (f= rom GIT), xl
> > > toolstack.
> > > Asus Radeon HD 7870 DirectCU.
> > > Some times the guest boots correctly but display is never en= abled.
> > >
> > > =A0Sometimes BSOD, doesn't seem to be any rhyme or reaso= n?
> > >
> > > No errors in logs. =A0 Found the following in 'xl dmesg&= #39;:
> > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x6= 00, fault
> > > address =3D
> > > 0x1ac800000, flags =3D 0
> >
> > I had a similar problem since hg revision 25818:50adc933faaf whic= h changes
> > the qemu tag.
> > It looks like the qemu commit
> > 3e66da7266c84638c0e22a09c9d2b07529802576
> > (qemu-xen-trad: fix msi_translate with PV event delivery)
> > causes this behavior.
> >
> > I solved the problem for me by using 'pci_msitranslate=3D0= 9; in the domU
> > config.
> I don't follow this stuff closely but I could have sworn we had di= sabled
> msitranslate by default.
>
> In any case I don't think that changeset was intended to cause any= thing
> like this -- Stefano?
>
> > In addition I had to reboot (perhaps poweroff?) the dom0 once the=
> > IO_PAGE_FAULT occured.

One more info for you - afair i noticed that it was not only the IO_PAGE_FA= ULT
which occured but also the qemu process in dom0 crashed w/o any messages in=
the logs, perhaps feral can confirm this?




------------------------------

Message: 2
Date: Fri, 09 Nov 2012 17:34:35 +0000
From: "Jan Beulich" <jbeu= lich@suse.com>
To: <konrad.wilk@oracle.com>
Cc: Ian.Campbell@citrix.com,= xen-devel@lists.xen.org
Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something
=A0 =A0 =A0 =A0 issue in 3.7-rc1
Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com>
Content-Type: text/plain; charset=3DUS-ASCII

>>> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 11/09/12 2:48 PM >>>
>On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote:
>> >>> On 09.11.12 at 11:36, "Jan Beulich" <JBeulich@suse.com> wrote:
>> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka
>> > range_straddles_page_boundary()) checks, which ought to
>> > take care of this. There is brokenness there with the invocat= ions
>> > of gnttab_dma_map_page(), but only if the initial offset is a= t
>> > least PAGE_SIZE - will have to check whether that occurs.
>>
>> And indeed, fixing this also makes the problem go away when
>> the allocation order doesn't get forced to zero. So presumably=
>> there's also only that one problem I had pointed out in pv-ops= .
>
>The pvops one has this in the map-page variant (xen_swiotlb_map_page):<= br> >
>351 =A0 =A0 =A0 =A0 if (dma_capable(dev, dev_addr, size) &&
>352 =A0 =A0 =A0 =A0 =A0 =A0 !range_straddles_page_boundary(phys, size) = && !swiotlb_force)
>353 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return dev_addr;
>
>and in the sg variant:
>
>494 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (swiotlb_force ||
>495 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !dma_capable(hwdev, dev_add= r, sg->length) ||
>496 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 range_straddles_page_bounda= ry(paddr, sg->length)) {
>497 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 void *map =3D swiot= lb_tbl_map_single(hwdev,

Oh, right, I forgot that there's yet another clone of that code under d= rivers/xen/.

>So I think that check is OK. There is no gnttab_dma_map_page call - so = that
>can't be the issue.

Indeed.

Jan




------------------------------

Message: 3
Date: Fri, 9 Nov 2012 11:55:55 -0800
From: Matt Wilson <msw@amazon.com&= gt;
To: Ian Campbell <Ian.Campbel= l@citrix.com>
Cc: "george.dunlap@eu.c= itrix.com" <geor= ge.dunlap@eu.citrix.com>,
=A0 =A0 =A0 =A0 "xen-= devel@lists.xensource.com" <xen-devel@lists.xensource.com>, =A0 =A0 =A0 =A0John =A0 =A0 =A0 =A0 Weekes <= lists.xen@nuclearfallout.net>, =A0Roger Pau Monne
=A0 =A0 =A0 =A0 <roger.pau@citri= x.com>
Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and
=A0 =A0 =A0 =A0 others
Message-ID:
=A0 =A0 =A0 =A0 <20121109195553.GA11023@u109add4315675089e695.ant.am= azon.com>
Content-Type: text/plain; charset=3D"us-ascii"

On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote:
> On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote:
> > As an additional note about 4.2 -- this isn't an "xl&quo= t; issue, but rather
> > a build problem -- even though I use "./configure --libdir= =3D/usr/lib64",
> > the build is still creating a "dist/install/usr/lib" di= rectory, and
> > because of this, running ./install.sh nukes my system's "= ;/usr/lib" ->
> > "/usr/lib64" softlink (which in turn causes all sorts o= f other problems
> > until it's corrected). Files that are being put in that tree:=
> >
> > xen-4.2-testing.hg # find dist/install/usr/lib
> > dist/install/usr/lib
>
> This is an interesting one. I'm not sure how we can avoid this
> behaviour, perhaps there is a tar option to cause it to follow rather<= br> > than clobber synlinks?
>
> The only other choice I can think of is to change install.sh to use a<= br> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * t= o
> avoid including system directories, or to otherwise make install.sh mo= re
> fragile and prone to bitrot :-(

Oh dear. If we find that there's not a good reason for it anymore, I= 9;d
think it would be better to remove install.sh instead.

> I must confess I didn't realise anyone used install.sh -- is there= some
> advantage to it over make foo-install?
>
> OOI which distro has this lib->lib64 link and what issues does remo= ving
> it create?
>
> > dist/install/usr/lib/xen
>
> This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is<= br> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt = do you
> remember?

There's no need for these files to be multilib compatible, as they are<= br> not runtime DSOs. They're internal to Xen and I think that they should<= br> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately
there's not much agreement on the usefulness of /usr/libexec, so we'= ;ll
need to make sure that packagers can adjust the paths for their
systems' standards.

For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time.

Matt

> Thanks again for reporting all these.
>
> Ian.
>
> > dist/install/usr/lib/xen/boot
> > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz
> > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz
> > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz
> > dist/install/usr/lib/xen/boot/hvmloader
> > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz
> > dist/install/usr/lib/xen/bin
> > dist/install/usr/lib/xen/bin/stubdom-dm
> > dist/install/usr/lib/xen/bin/qemu-io
> > dist/install/usr/lib/xen/bin/qemu-nbd
> > dist/install/usr/lib/xen/bin/qemu-img
> > dist/install/usr/lib/xen/bin/xenpaging
> > dist/install/usr/lib/xen/bin/qemu-dm
> > dist/install/usr/lib/xen/bin/qemu-system-i386
> > dist/install/usr/lib/xen/bin/qemu-ga
> > dist/install/usr/lib/xen/bin/stubdompath.sh



------------------------------

Message: 4
Date: Sat, 10 Nov 2012 05:53:35 +0000
From: xen.org <ian.jackson@eu.citrix.com>
To: <xen-devel@lists.xe= nsource.com>
Cc: ian.jackson@eu.citrix.com<= /a>
Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL
Message-ID: <osstest= -14377-mainreport@xen.org>
Content-Type: text/plain

flight 14377 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/

Failures :-/ but no regressions.

Regressions which are regarded as allowable (not blocking):
=A0test-amd64-amd64-xl-sedf-pin 10 guest-saverestore =A0 =A0 =A0 =A0 =A0 = =A0fail =A0 like 14376
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A05 xen-boot =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail =A0 like 14376
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A09 guest-localmigrate =A0 =A0 =A0 f= ail like 14376
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A09 guest-localmigrate =A0 =A0 fai= l like 14376

Tests which did not succeed, but are not blocking:
=A0test-amd64-amd64-xl-pcipt-intel =A09 guest-start =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-xend-winxpsp3 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0never pass
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A016 leak-check/check =A0 =A0 =A0 = =A0 =A0 =A0 fail =A0 never pass
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 16 leak-check/check =A0 =A0 =A0 =A0= =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-win-vcpus1 =A0 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-winxpsp3 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 fail never pass
=A0test-amd64-amd64-xl-win =A0 =A0 =A013 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail =A0 never pass

version targeted for testing:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8
baseline version:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8

jobs:
=A0build-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail
=A0test-amd64-amd64-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-credit2 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-pcipt-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 pass
=A0test-amd64-i386-xl-multivcpu =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf-pin =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-winxpsp3-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xend-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail


------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
=A0 =A0 http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
=A0 =A0 http://xenbits.xensource.com/gitweb?p=3Dosstest.= git;a=3Dsummary


Published tested tree is already up to date.




------------------------------

Message: 5
Date: Fri, 9 Nov 2012 04:01:36 -0700
From: "Juan Lorenzana" <juan@jelsupport.com>
To: <xen-devel@lists.xen.org<= /a>>
Subject: [Xen-devel] .vhd will not boot in VM
Message-ID: <F2EF84CA5BCF824AA4197956E124073848F4AE@server.jel.local>=
Content-Type: text/plain; charset=3D"us-ascii"

We had a XCP 1.5 pool with 2 machines as hosts. =A0The storage pool which as NFS mounted lost its ability to export the filesystem with the VM
images on it.



We contacted the vendor and we were able to restore it. =A0However, they had recommended that we delete the XCP Pool, recreate it, add the hosts
back in, and then mount the storage.



That is where we are at now. =A0We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the
metadata is lost. =A0So we can not see which image or snap shot belongs to<= br> which VM. =A0The names all are blank when we look at the storage.



Also, if I randomly mount an image to a VM, it does not boot. =A0It
produces an error that says:



Traceback (most recent call last): - File "/usr/binpygrub", line = 808, in
? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError:
[Errno 95] Operation not supported.



The system kept the VM information as we destroyed the pool and then
created a new one but it looks like we only see snapshots through
XenCenter. =A0Its like the real .vhd that were running are not showing up.<= br>


I know it is pretty bad. =A0We should not have listened to the storage
guys.



Does anyone know someone that can help?



Juan

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.xen.org= /archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html&= gt;

------------------------------

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.x= en.org/xen-devel


End of Xen-devel Digest, Vol 93, Issue 79
*****************************************



--
_____
Fac= t:
1. Ninjas are mammals.
2. Ninjas fight ALL the time.
3. The pur= pose of the ninja is to flip out and kill people.
--047d7b6766dc8b2e6104ce294575-- --===============1728157406802910382== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1728157406802910382==-- From xen-devel-bounces@lists.xen.org Sat Nov 10 20:11:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 20:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXHOa-0006j3-Pq; Sat, 10 Nov 2012 20:11:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXHOZ-0006iy-4u for xen-devel@lists.xen.org; Sat, 10 Nov 2012 20:11:11 +0000 Received: from [85.158.143.35:20287] by server-2.bemta-4.messagelabs.com id 69/6C-28922-ED4BE905; Sat, 10 Nov 2012 20:11:10 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352578263!16565223!1 X-Originating-IP: [209.85.212.45] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1212 invoked from network); 10 Nov 2012 20:11:04 -0000 Received: from mail-vb0-f45.google.com (HELO mail-vb0-f45.google.com) (209.85.212.45) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 20:11:04 -0000 Received: by mail-vb0-f45.google.com with SMTP id p1so6043957vbi.32 for ; Sat, 10 Nov 2012 12:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=oKbV+h/PRTwEAtwKTOJojUJ5eJmLc/iHaYtmPGMZBLs=; b=iZ81VKDMaR84xxJHk7fEeNK3G5eIXqsv8vEyS3ecX82tEmE2qwSYheuPtHuyzAHkY0 KA6DD5Bo2TZT1QIE1NioL7nG4rfzwkAiVpTjFI8Ux9GzEZRgYoXfcH3kfQemjgi7FNVL WrPlTH24S3t59O+ArYF8JWJz9557kW/cET1y1Dmv29X9uU2Hnxq6VIq8aRu4LabhajNz vn8yr+Fywr8kpiAiYFSs8ZWNfODWnE18PZzwPr9GNpXHXmZMHMNZL7iyJolBoUkRHuSO zAc8GEfkEVB8bEOTeOA9FvakoiLvmrPt0xCxUxsvv/50vNNCnL/0ecg133yf2Yu0O8Tv j6Ng== MIME-Version: 1.0 Received: by 10.52.179.231 with SMTP id dj7mr14573430vdc.108.1352578262943; Sat, 10 Nov 2012 12:11:02 -0800 (PST) Received: by 10.220.37.8 with HTTP; Sat, 10 Nov 2012 12:11:02 -0800 (PST) In-Reply-To: References: Date: Sat, 10 Nov 2012 12:11:02 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0408609209009085176==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0408609209009085176== Content-Type: multipart/alternative; boundary=bcaec5014c71e4c85004ce29aa99 --bcaec5014c71e4c85004ce29aa99 Content-Type: text/plain; charset=ISO-8859-1 Can't run Xen-4.3 unstable kernel with old xm tools: WARING: Can't find version unstable of xen utils, fallback to default version! Error: Unable to connect to xend: No such file or directory. Is xend running? Guessing the same will be true of running the older 4.1 kernel with the new xl toolstack, so not sure how to proceed in testing. I should mention that the only reason I was testing 4.3 was because there is a bug in usb-linux.c compiled into qemu-dm from 4.1 where you are unable to attach a usb device which has a serial interface (eg: game controller with analog controls). My Logitech Driving Force GT wheel works fine in 4.1 but some Xbox controller couldn't be successfully passed through to the DomU. Perhaps I should be investigating some other avenue? I suppose this is very unlikely to be a big deal for anyone. I'm not using the controller, was just testing usb-passthrough of devices I knew would have a serial interface riding on top of usb. Problem was solved in KVM qemu with a very simple patch and was wondering if Xen had applied the same patch. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: (Hans Mueller) OMG, why do most messages only show up in the daily batch but not individually? @Hans As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. The machine is still pingable, but I suppose there's not much I can do to verify the DomU's state. Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today. On Sat, Nov 10, 2012 at 11:42 AM, feral wrote: > Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > OMG, why do most messages only show up in the daily batch but not > individually? > > @Hans > As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. > The machine is still pingable, but I suppose there's not much I can do to > verify the DomU's state. > Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with > the older qemu-dm today. > > > On Sat, Nov 10, 2012 at 4:00 AM, wrote: > >> Send Xen-devel mailing list submissions to >> xen-devel@lists.xen.org >> >> To subscribe or unsubscribe via the World Wide Web, visit >> http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel >> or, via email, send a message with subject or body 'help' to >> xen-devel-request@lists.xen.org >> >> You can reach the person managing the list at >> xen-devel-owner@lists.xen.org >> >> When replying, please edit your Subject line so it is more specific >> than "Re: Contents of Xen-devel digest..." >> >> >> Today's Topics: >> >> 1. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: >> IO_PAGE_FAULT: (Hans Mueller) >> 2. Re: Dom0 physical networking/swiotlb/something issue in >> 3.7-rc1 (Jan Beulich) >> 3. Re: Bugs in xl that affect stubdom+tapdisk2, and others >> (Matt Wilson) >> 4. [xen-unstable test] 14377: tolerable FAIL (xen.org) >> 5. .vhd will not boot in VM (Juan Lorenzana) >> >> >> ---------------------------------------------------------------------- >> >> Message: 1 >> Date: Fri, 09 Nov 2012 18:14:39 +0100 >> From: Hans Mueller >> To: xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) >> AMD-Vi: IO_PAGE_FAULT: >> Message-ID: <1871003.0Pup8WfsfS@sheik-lin> >> Content-Type: text/plain; charset="us-ascii" >> >> On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: >> > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: >> > > On Thursday, 8. November 2012 20:02:51 feral wrote: >> > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all >> > > > three. >> > > > >> > > > VGA passthrough previously working with 4.1 is no longer working >> with >> > > > >4.2. >> > > > >> > > > Setup - Working: >> > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), >> > > > libvirt-bin, >> > > > xend >> > > > Asus Radeon HD 7870 DirectCU. >> > > > Works perfect. Benches on par with bare metal. >> > > > >> > > > Setup - Broken: >> > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from >> GIT), xl >> > > > toolstack. >> > > > Asus Radeon HD 7870 DirectCU. >> > > > Some times the guest boots correctly but display is never enabled. >> > > > >> > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? >> > > > >> > > > No errors in logs. Found the following in 'xl dmesg': >> > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault >> > > > address = >> > > > 0x1ac800000, flags = 0 >> > > >> > > I had a similar problem since hg revision 25818:50adc933faaf which >> changes >> > > the qemu tag. >> > > It looks like the qemu commit >> > > 3e66da7266c84638c0e22a09c9d2b07529802576 >> > > (qemu-xen-trad: fix msi_translate with PV event delivery) >> > > causes this behavior. >> > > >> > > I solved the problem for me by using 'pci_msitranslate=0' in the domU >> > > config. >> > I don't follow this stuff closely but I could have sworn we had disabled >> > msitranslate by default. >> > >> > In any case I don't think that changeset was intended to cause anything >> > like this -- Stefano? >> > >> > > In addition I had to reboot (perhaps poweroff?) the dom0 once the >> > > IO_PAGE_FAULT occured. >> >> One more info for you - afair i noticed that it was not only the >> IO_PAGE_FAULT >> which occured but also the qemu process in dom0 crashed w/o any messages >> in >> the logs, perhaps feral can confirm this? >> >> >> >> >> ------------------------------ >> >> Message: 2 >> Date: Fri, 09 Nov 2012 17:34:35 +0000 >> From: "Jan Beulich" >> To: >> Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something >> issue in 3.7-rc1 >> Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> >> Content-Type: text/plain; charset=US-ASCII >> >> >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> >> >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: >> >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: >> >> > In the forward ported kernels, those two checks are however >> >> > accompanied by range_needs_mapping() (aka >> >> > range_straddles_page_boundary()) checks, which ought to >> >> > take care of this. There is brokenness there with the invocations >> >> > of gnttab_dma_map_page(), but only if the initial offset is at >> >> > least PAGE_SIZE - will have to check whether that occurs. >> >> >> >> And indeed, fixing this also makes the problem go away when >> >> the allocation order doesn't get forced to zero. So presumably >> >> there's also only that one problem I had pointed out in pv-ops. >> > >> >The pvops one has this in the map-page variant (xen_swiotlb_map_page): >> > >> >351 if (dma_capable(dev, dev_addr, size) && >> >352 !range_straddles_page_boundary(phys, size) && >> !swiotlb_force) >> >353 return dev_addr; >> > >> >and in the sg variant: >> > >> >494 if (swiotlb_force || >> >495 !dma_capable(hwdev, dev_addr, sg->length) || >> >496 range_straddles_page_boundary(paddr, >> sg->length)) { >> >497 void *map = swiotlb_tbl_map_single(hwdev, >> >> Oh, right, I forgot that there's yet another clone of that code under >> drivers/xen/. >> >> >So I think that check is OK. There is no gnttab_dma_map_page call - so >> that >> >can't be the issue. >> >> Indeed. >> >> Jan >> >> >> >> >> ------------------------------ >> >> Message: 3 >> Date: Fri, 9 Nov 2012 11:55:55 -0800 >> From: Matt Wilson >> To: Ian Campbell >> Cc: "george.dunlap@eu.citrix.com" , >> "xen-devel@lists.xensource.com" , >> John >> Weekes , Roger Pau Monne >> >> Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and >> others >> Message-ID: >> <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> >> Content-Type: text/plain; charset="us-ascii" >> >> On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: >> > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: >> > > As an additional note about 4.2 -- this isn't an "xl" issue, but >> rather >> > > a build problem -- even though I use "./configure >> --libdir=/usr/lib64", >> > > the build is still creating a "dist/install/usr/lib" directory, and >> > > because of this, running ./install.sh nukes my system's "/usr/lib" -> >> > > "/usr/lib64" softlink (which in turn causes all sorts of other >> problems >> > > until it's corrected). Files that are being put in that tree: >> > > >> > > xen-4.2-testing.hg # find dist/install/usr/lib >> > > dist/install/usr/lib >> > >> > This is an interesting one. I'm not sure how we can avoid this >> > behaviour, perhaps there is a tar option to cause it to follow rather >> > than clobber synlinks? >> > >> > The only other choice I can think of is to change install.sh to use a >> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to >> > avoid including system directories, or to otherwise make install.sh more >> > fragile and prone to bitrot :-( >> >> Oh dear. If we find that there's not a good reason for it anymore, I'd >> think it would be better to remove install.sh instead. >> >> > I must confess I didn't realise anyone used install.sh -- is there some >> > advantage to it over make foo-install? >> > >> > OOI which distro has this lib->lib64 link and what issues does removing >> > it create? >> > >> > > dist/install/usr/lib/xen >> > >> > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is >> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you >> > remember? >> >> There's no need for these files to be multilib compatible, as they are >> not runtime DSOs. They're internal to Xen and I think that they should >> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately >> there's not much agreement on the usefulness of /usr/libexec, so we'll >> need to make sure that packagers can adjust the paths for their >> systems' standards. >> >> For 4.2 we didn't want to change where these files were being placed, >> and I believe they've bin in $PREFIX/lib/ for quite some time. >> >> Matt >> >> > Thanks again for reporting all these. >> > >> > Ian. >> > >> > > dist/install/usr/lib/xen/boot >> > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz >> > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz >> > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz >> > > dist/install/usr/lib/xen/boot/hvmloader >> > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz >> > > dist/install/usr/lib/xen/bin >> > > dist/install/usr/lib/xen/bin/stubdom-dm >> > > dist/install/usr/lib/xen/bin/qemu-io >> > > dist/install/usr/lib/xen/bin/qemu-nbd >> > > dist/install/usr/lib/xen/bin/qemu-img >> > > dist/install/usr/lib/xen/bin/xenpaging >> > > dist/install/usr/lib/xen/bin/qemu-dm >> > > dist/install/usr/lib/xen/bin/qemu-system-i386 >> > > dist/install/usr/lib/xen/bin/qemu-ga >> > > dist/install/usr/lib/xen/bin/stubdompath.sh >> >> >> >> ------------------------------ >> >> Message: 4 >> Date: Sat, 10 Nov 2012 05:53:35 +0000 >> From: xen.org >> To: >> Cc: ian.jackson@eu.citrix.com >> Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL >> Message-ID: >> Content-Type: text/plain >> >> flight 14377 xen-unstable real [real] >> http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ >> >> Failures :-/ but no regressions. >> >> Regressions which are regarded as allowable (not blocking): >> test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like >> 14376 >> test-amd64-amd64-xl-sedf 5 xen-boot fail like >> 14376 >> test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like >> 14376 >> test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like >> 14376 >> >> Tests which did not succeed, but are not blocking: >> test-amd64-amd64-xl-pcipt-intel 9 guest-start fail >> never pass >> test-amd64-i386-xend-winxpsp3 16 leak-check/check fail >> never pass >> test-amd64-i386-win 16 leak-check/check fail >> never pass >> test-amd64-amd64-win 16 leak-check/check fail >> never pass >> test-amd64-i386-xl-win-vcpus1 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-win7-amd64 13 guest-stop fail >> never pass >> test-amd64-i386-win-vcpus1 16 leak-check/check fail >> never pass >> test-amd64-i386-xl-win7-amd64 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-winxpsp3 13 guest-stop fail >> never pass >> test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-win 13 guest-stop fail >> never pass >> >> version targeted for testing: >> xen 62885b3c34c8 >> baseline version: >> xen 62885b3c34c8 >> >> jobs: >> build-amd64 pass >> build-i386 pass >> build-amd64-oldkern pass >> build-i386-oldkern pass >> build-amd64-pvops pass >> build-i386-pvops pass >> test-amd64-amd64-xl pass >> test-amd64-i386-xl pass >> test-amd64-i386-rhel6hvm-amd pass >> test-amd64-i386-qemuu-rhel6hvm-amd pass >> test-amd64-amd64-xl-qemuu-win7-amd64 fail >> test-amd64-amd64-xl-win7-amd64 fail >> test-amd64-i386-xl-win7-amd64 fail >> test-amd64-i386-xl-credit2 pass >> test-amd64-amd64-xl-pcipt-intel fail >> test-amd64-i386-rhel6hvm-intel pass >> test-amd64-i386-qemuu-rhel6hvm-intel pass >> test-amd64-i386-xl-multivcpu pass >> test-amd64-amd64-pair pass >> test-amd64-i386-pair pass >> test-amd64-amd64-xl-sedf-pin fail >> test-amd64-amd64-pv pass >> test-amd64-i386-pv pass >> test-amd64-amd64-xl-sedf fail >> test-amd64-i386-win-vcpus1 fail >> test-amd64-i386-xl-win-vcpus1 fail >> test-amd64-i386-xl-winxpsp3-vcpus1 fail >> test-amd64-amd64-win fail >> test-amd64-i386-win fail >> test-amd64-amd64-xl-win fail >> test-amd64-amd64-xl-qemuu-winxpsp3 fail >> test-amd64-i386-xend-winxpsp3 fail >> test-amd64-amd64-xl-winxpsp3 fail >> >> >> ------------------------------------------------------------ >> sg-report-flight on woking.cam.xci-test.com >> logs: /home/xc_osstest/logs >> images: /home/xc_osstest/images >> >> Logs, config files, etc. are available at >> http://www.chiark.greenend.org.uk/~xensrcts/logs >> >> Test harness code can be found at >> http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary >> >> >> Published tested tree is already up to date. >> >> >> >> >> ------------------------------ >> >> Message: 5 >> Date: Fri, 9 Nov 2012 04:01:36 -0700 >> From: "Juan Lorenzana" >> To: >> Subject: [Xen-devel] .vhd will not boot in VM >> Message-ID: >> Content-Type: text/plain; charset="us-ascii" >> >> We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which >> as NFS mounted lost its ability to export the filesystem with the VM >> images on it. >> >> >> >> We contacted the vendor and we were able to restore it. However, they >> had recommended that we delete the XCP Pool, recreate it, add the hosts >> back in, and then mount the storage. >> >> >> >> That is where we are at now. We can see the storage and the VM images. >> However in XCP Xen Center when looking at the images is clear that the >> metadata is lost. So we can not see which image or snap shot belongs to >> which VM. The names all are blank when we look at the storage. >> >> >> >> Also, if I randomly mount an image to a VM, it does not boot. It >> produces an error that says: >> >> >> >> Traceback (most recent call last): - File "/usr/binpygrub", line 808, in >> ? - fs = fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: >> [Errno 95] Operation not supported. >> >> >> >> The system kept the VM information as we destroyed the pool and then >> created a new one but it looks like we only see snapshots through >> XenCenter. Its like the real .vhd that were running are not showing up. >> >> >> >> I know it is pretty bad. We should not have listened to the storage >> guys. >> >> >> >> Does anyone know someone that can help? >> >> >> >> Juan >> >> -------------- next part -------------- >> An HTML attachment was scrubbed... >> URL: < >> http://lists.xen.org/archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html >> > >> >> ------------------------------ >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel >> >> >> End of Xen-devel Digest, Vol 93, Issue 79 >> ***************************************** >> > > > > -- > _____ > Fact: > 1. Ninjas are mammals. > 2. Ninjas fight ALL the time. > 3. The purpose of the ninja is to flip out and kill people. > -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --bcaec5014c71e4c85004ce29aa99 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Can= 't run Xen-4.3 unstable kernel with old xm tools:
WARING: =A0Can't f= ind version unstable of xen utils, fallback to default version!
Error: Unable to connect= to xend: No such file or directory. Is xend running?

Guessing the same will be true of running the older 4.1 kernel with the new= xl toolstack, so not sure how to proceed in testing.

I should mention that the only reason I was testing 4.3 was because there i= s a bug in usb-linux.c compiled into qemu-dm from 4.1 where you are unable = to attach a usb device which has a serial interface (eg: game controller wi= th analog controls). =A0My Logitech Driving Force GT wheel works fine in 4.= 1 but some Xbox controller couldn't be successfully passed through to t= he DomU.
Perhaps I should= be investigating some other avenue? =A0
I suppose this is very unlikely= to be a big deal for anyone. =A0I'm not using the controller, was just= testing usb-passthrough of devices I knew would have a serial interface ri= ding on top of usb.
Problem was solv= ed in KVM qemu with a very simple patch and was wondering if Xen had applie= d the same patch.


Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0= =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
OMG, why d= o most messages only show up in the daily batch but not individually?
=

@Hans
As fa= r as I can tell, the guest is running fine until we see the=A0IO_PAGE_FAULT. =A0The machine is still pingable, but I = suppose there's not much I can do to verify the DomU's state.
Going to try running the newer qemu with Xen 4.1 and then = Xen-4.2/4.3 with the older qemu-dm today.





On Sat, Nov 10, 2012 at 11:42 AM, feral = <blistovmhz@gmail.com> wrote:
Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)=
OMG,= why do most messages only show up in the daily batch but not individually?=

@Hans
As far as I can tell, the guest is running fine until we see the= =A0IO_PAGE_FAULT. =A0The machine is= still pingable, but I suppose there's not much I can do to verify the = DomU's state.
Going to try running the newer qemu w= ith Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today.


On Sat, Nov 10, 2012 at 4:00 AM, <xen-devel-req= uest@lists.xen.org> wrote:
Send Xen-devel mailing list submissions to =A0 =A0 =A0 =A0 xen-devel@lists.xen.org

To subscribe or unsubscribe via the World Wide Web, visit
=A0 =A0 =A0 =A0 http://lists.xen.org/cgi-bin/mailman/listinfo/xe= n-devel
or, via email, send a message with subject or body 'help' to
=A0 =A0 =A0 =A0 xen-devel-request@lists.xen.org

You can reach the person managing the list at
=A0 =A0 =A0 =A0 xen-devel-owner@lists.xen.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Xen-devel digest..."


Today's Topics:

=A0 =A01. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
=A0 =A02. Re: Dom0 physical networking/swiotlb/something issue in
=A0 =A0 =A0 3.7-rc1 (Jan Beulich)
=A0 =A03. Re: Bugs in xl that affect stubdom+tapdisk2, and others
=A0 =A0 =A0 (Matt Wilson)
=A0 =A04. [xen-unstable test] 14377: tolerable FAIL (xen.org)
=A0 =A05. .vhd will not boot in VM (Juan Lorenzana)


----------------------------------------------------------------------

Message: 1
Date: Fri, 09 Nov 2012 18:14:39 +0100
From: Hans Mueller <mcbeagle@gmx.de>
To: xen-devel@= lists.xen.org
Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN)
=A0 =A0 =A0 =A0 AMD-Vi: IO_PAGE_FAULT:
Message-ID: <1871003.0Pup8WfsfS@sheik-lin>
Content-Type: text/plain; charset=3D"us-ascii"

On Friday, 9. November 2012 16:33:47 Ian Campbell wrote:
> On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote:
> > On Thursday, 8. November 2012 20:02:51 feral wrote:
> > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested aga= inst all
> > > three.
> > >
> > > VGA passthrough previously working with 4.1 is no longer wor= king with
> > > >4.2.
> > >
> > > Setup - Working:
> > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos)= ,
> > > libvirt-bin,
> > > xend
> > > Asus Radeon HD 7870 DirectCU.
> > > Works perfect. =A0Benches on par with bare metal.
> > >
> > > Setup - Broken:
> > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (f= rom GIT), xl
> > > toolstack.
> > > Asus Radeon HD 7870 DirectCU.
> > > Some times the guest boots correctly but display is never en= abled.
> > >
> > > =A0Sometimes BSOD, doesn't seem to be any rhyme or reaso= n?
> > >
> > > No errors in logs. =A0 Found the following in 'xl dmesg&= #39;:
> > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x6= 00, fault
> > > address =3D
> > > 0x1ac800000, flags =3D 0
> >
> > I had a similar problem since hg revision 25818:50adc933faaf whic= h changes
> > the qemu tag.
> > It looks like the qemu commit
> > 3e66da7266c84638c0e22a09c9d2b07529802576
> > (qemu-xen-trad: fix msi_translate with PV event delivery)
> > causes this behavior.
> >
> > I solved the problem for me by using 'pci_msitranslate=3D0= 9; in the domU
> > config.
> I don't follow this stuff closely but I could have sworn we had di= sabled
> msitranslate by default.
>
> In any case I don't think that changeset was intended to cause any= thing
> like this -- Stefano?
>
> > In addition I had to reboot (perhaps poweroff?) the dom0 once the=
> > IO_PAGE_FAULT occured.

One more info for you - afair i noticed that it was not only the IO_PAGE_FA= ULT
which occured but also the qemu process in dom0 crashed w/o any messages in=
the logs, perhaps feral can confirm this?




------------------------------

Message: 2
Date: Fri, 09 Nov 2012 17:34:35 +0000
From: "Jan Beulich" <jbeulich@suse.com>
To: <konrad.= wilk@oracle.com>
Cc: Ian.Campbe= ll@citrix.com, xen-devel@lists.xen.org
Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something
=A0 =A0 =A0 =A0 issue in 3.7-rc1
Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com&g= t;
Content-Type: text/plain; charset=3DUS-ASCII

>>> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 11/09/12 2:48 PM >= ;>>
>On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote:
>> >>> On 09.11.12 at 11:36, "Jan Beulich" <JBeulich@suse.com&g= t; wrote:
>> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka
>> > range_straddles_page_boundary()) checks, which ought to
>> > take care of this. There is brokenness there with the invocat= ions
>> > of gnttab_dma_map_page(), but only if the initial offset is a= t
>> > least PAGE_SIZE - will have to check whether that occurs.
>>
>> And indeed, fixing this also makes the problem go away when
>> the allocation order doesn't get forced to zero. So presumably=
>> there's also only that one problem I had pointed out in pv-ops= .
>
>The pvops one has this in the map-page variant (xen_swiotlb_map_page):<= br> >
>351 =A0 =A0 =A0 =A0 if (dma_capable(dev, dev_addr, size) &&
>352 =A0 =A0 =A0 =A0 =A0 =A0 !range_straddles_page_boundary(phys, size) = && !swiotlb_force)
>353 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return dev_addr;
>
>and in the sg variant:
>
>494 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (swiotlb_force ||
>495 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !dma_capable(hwdev, dev_add= r, sg->length) ||
>496 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 range_straddles_page_bounda= ry(paddr, sg->length)) {
>497 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 void *map =3D swiot= lb_tbl_map_single(hwdev,

Oh, right, I forgot that there's yet another clone of that code under d= rivers/xen/.

>So I think that check is OK. There is no gnttab_dma_map_page call - so = that
>can't be the issue.

Indeed.

Jan




------------------------------

Message: 3
Date: Fri, 9 Nov 2012 11:55:55 -0800
From: Matt Wilson <m= sw@amazon.com>
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: "= george.dunlap@eu.citrix.com" <george.dunlap@eu.citrix.com>,
=A0 =A0 =A0 =A0 "xen-devel@lists.xensource.com" <xen-devel@lists.xensource= .com>, =A0 =A0 =A0 =A0John
=A0 =A0 =A0 =A0 Weekes <lists.xen@nuclearfallout.net>, =A0Roger Pau Monne<= br> =A0 =A0 =A0 =A0 <roger.pau@citrix.com>
Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and
=A0 =A0 =A0 =A0 others
Message-ID:
=A0 =A0 =A0 =A0 <20121109195553.GA11023@u109add431= 5675089e695.ant.amazon.com>
Content-Type: text/plain; charset=3D"us-ascii"

On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote:
> On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote:
> > As an additional note about 4.2 -- this isn't an "xl&quo= t; issue, but rather
> > a build problem -- even though I use "./configure --libdir= =3D/usr/lib64",
> > the build is still creating a "dist/install/usr/lib" di= rectory, and
> > because of this, running ./install.sh nukes my system's "= ;/usr/lib" ->
> > "/usr/lib64" softlink (which in turn causes all sorts o= f other problems
> > until it's corrected). Files that are being put in that tree:=
> >
> > xen-4.2-testing.hg # find dist/install/usr/lib
> > dist/install/usr/lib
>
> This is an interesting one. I'm not sure how we can avoid this
> behaviour, perhaps there is a tar option to cause it to follow rather<= br> > than clobber synlinks?
>
> The only other choice I can think of is to change install.sh to use a<= br> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * t= o
> avoid including system directories, or to otherwise make install.sh mo= re
> fragile and prone to bitrot :-(

Oh dear. If we find that there's not a good reason for it anymore, I= 9;d
think it would be better to remove install.sh instead.

> I must confess I didn't realise anyone used install.sh -- is there= some
> advantage to it over make foo-install?
>
> OOI which distro has this lib->lib64 link and what issues does remo= ving
> it create?
>
> > dist/install/usr/lib/xen
>
> This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is<= br> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt = do you
> remember?

There's no need for these files to be multilib compatible, as they are<= br> not runtime DSOs. They're internal to Xen and I think that they should<= br> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately
there's not much agreement on the usefulness of /usr/libexec, so we'= ;ll
need to make sure that packagers can adjust the paths for their
systems' standards.

For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time.

Matt

> Thanks again for reporting all these.
>
> Ian.
>
> > dist/install/usr/lib/xen/boot
> > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz
> > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz
> > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz
> > dist/install/usr/lib/xen/boot/hvmloader
> > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz
> > dist/install/usr/lib/xen/bin
> > dist/install/usr/lib/xen/bin/stubdom-dm
> > dist/install/usr/lib/xen/bin/qemu-io
> > dist/install/usr/lib/xen/bin/qemu-nbd
> > dist/install/usr/lib/xen/bin/qemu-img
> > dist/install/usr/lib/xen/bin/xenpaging
> > dist/install/usr/lib/xen/bin/qemu-dm
> > dist/install/usr/lib/xen/bin/qemu-system-i386
> > dist/install/usr/lib/xen/bin/qemu-ga
> > dist/install/usr/lib/xen/bin/stubdompath.sh



------------------------------

Message: 4
Date: Sat, 10 Nov 2012 05:53:35 +0000
From: xen.org <ian.jackson@eu.citr= ix.com>
To: <= xen-devel@lists.xensource.com>
Cc: ian.jack= son@eu.citrix.com
Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL
Message-ID: <osstest-14377-mainreport@xen.org>
Content-Type: text/plain

flight 14377 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/

Failures :-/ but no regressions.

Regressions which are regarded as allowable (not blocking):
=A0test-amd64-amd64-xl-sedf-pin 10 guest-saverestore =A0 =A0 =A0 =A0 =A0 = =A0fail =A0 like 14376
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A05 xen-boot =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail =A0 like 14376
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A09 guest-localmigrate =A0 =A0 =A0 f= ail like 14376
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A09 guest-localmigrate =A0 =A0 fai= l like 14376

Tests which did not succeed, but are not blocking:
=A0test-amd64-amd64-xl-pcipt-intel =A09 guest-start =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-xend-winxpsp3 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0never pass
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A016 leak-check/check =A0 =A0 =A0 = =A0 =A0 =A0 fail =A0 never pass
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 16 leak-check/check =A0 =A0 =A0 =A0= =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-win-vcpus1 =A0 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-winxpsp3 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 fail never pass
=A0test-amd64-amd64-xl-win =A0 =A0 =A013 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail =A0 never pass

version targeted for testing:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8
baseline version:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8

jobs:
=A0build-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail
=A0test-amd64-amd64-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-credit2 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-pcipt-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 pass
=A0test-amd64-i386-xl-multivcpu =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf-pin =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-winxpsp3-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xend-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail


------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
=A0 =A0 http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
=A0 =A0 http://xenbits.xensource.com/gitweb?p=3Dosstest.= git;a=3Dsummary


Published tested tree is already up to date.




------------------------------

Message: 5
Date: Fri, 9 Nov 2012 04:01:36 -0700
From: "Juan Lorenzana" <juan@jelsupport.com>
To: <xen-de= vel@lists.xen.org>
Subject: [Xen-devel] .vhd will not boot in VM
Message-ID: <F2EF84CA5BCF824AA4197956E124073848F4AE@server.jel.local>=
Content-Type: text/plain; charset=3D"us-ascii"

We had a XCP 1.5 pool with 2 machines as hosts. =A0The storage pool which as NFS mounted lost its ability to export the filesystem with the VM
images on it.



We contacted the vendor and we were able to restore it. =A0However, they had recommended that we delete the XCP Pool, recreate it, add the hosts
back in, and then mount the storage.



That is where we are at now. =A0We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the
metadata is lost. =A0So we can not see which image or snap shot belongs to<= br> which VM. =A0The names all are blank when we look at the storage.



Also, if I randomly mount an image to a VM, it does not boot. =A0It
produces an error that says:



Traceback (most recent call last): - File "/usr/binpygrub", line = 808, in
? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError:
[Errno 95] Operation not supported.



The system kept the VM information as we destroyed the pool and then
created a new one but it looks like we only see snapshots through
XenCenter. =A0Its like the real .vhd that were running are not showing up.<= br>


I know it is pretty bad. =A0We should not have listened to the storage
guys.



Does anyone know someone that can help?



Juan

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.xen.org= /archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html&= gt;

------------------------------

_______________________________________________
Xen-devel mailing list
Xen-devel@list= s.xen.org
http://lists.x= en.org/xen-devel


End of Xen-devel Digest, Vol 93, Issue 79
*****************************************



--
_____
Fact:
1. Ninjas = are mammals.
2. Ninjas fight ALL the time.
3. The purpose of the ninj= a is to flip out and kill people.



--
_____
Fac= t:
1. Ninjas are mammals.
2. Ninjas fight ALL the time.
3. The pur= pose of the ninja is to flip out and kill people.
--bcaec5014c71e4c85004ce29aa99-- --===============0408609209009085176== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0408609209009085176==-- From xen-devel-bounces@lists.xen.org Sat Nov 10 20:11:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 10 Nov 2012 20:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXHOa-0006j3-Pq; Sat, 10 Nov 2012 20:11:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXHOZ-0006iy-4u for xen-devel@lists.xen.org; Sat, 10 Nov 2012 20:11:11 +0000 Received: from [85.158.143.35:20287] by server-2.bemta-4.messagelabs.com id 69/6C-28922-ED4BE905; Sat, 10 Nov 2012 20:11:10 +0000 X-Env-Sender: blistovmhz@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1352578263!16565223!1 X-Originating-IP: [209.85.212.45] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1212 invoked from network); 10 Nov 2012 20:11:04 -0000 Received: from mail-vb0-f45.google.com (HELO mail-vb0-f45.google.com) (209.85.212.45) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2012 20:11:04 -0000 Received: by mail-vb0-f45.google.com with SMTP id p1so6043957vbi.32 for ; Sat, 10 Nov 2012 12:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=oKbV+h/PRTwEAtwKTOJojUJ5eJmLc/iHaYtmPGMZBLs=; b=iZ81VKDMaR84xxJHk7fEeNK3G5eIXqsv8vEyS3ecX82tEmE2qwSYheuPtHuyzAHkY0 KA6DD5Bo2TZT1QIE1NioL7nG4rfzwkAiVpTjFI8Ux9GzEZRgYoXfcH3kfQemjgi7FNVL WrPlTH24S3t59O+ArYF8JWJz9557kW/cET1y1Dmv29X9uU2Hnxq6VIq8aRu4LabhajNz vn8yr+Fywr8kpiAiYFSs8ZWNfODWnE18PZzwPr9GNpXHXmZMHMNZL7iyJolBoUkRHuSO zAc8GEfkEVB8bEOTeOA9FvakoiLvmrPt0xCxUxsvv/50vNNCnL/0ecg133yf2Yu0O8Tv j6Ng== MIME-Version: 1.0 Received: by 10.52.179.231 with SMTP id dj7mr14573430vdc.108.1352578262943; Sat, 10 Nov 2012 12:11:02 -0800 (PST) Received: by 10.220.37.8 with HTTP; Sat, 10 Nov 2012 12:11:02 -0800 (PST) In-Reply-To: References: Date: Sat, 10 Nov 2012 12:11:02 -0800 Message-ID: From: feral To: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0408609209009085176==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0408609209009085176== Content-Type: multipart/alternative; boundary=bcaec5014c71e4c85004ce29aa99 --bcaec5014c71e4c85004ce29aa99 Content-Type: text/plain; charset=ISO-8859-1 Can't run Xen-4.3 unstable kernel with old xm tools: WARING: Can't find version unstable of xen utils, fallback to default version! Error: Unable to connect to xend: No such file or directory. Is xend running? Guessing the same will be true of running the older 4.1 kernel with the new xl toolstack, so not sure how to proceed in testing. I should mention that the only reason I was testing 4.3 was because there is a bug in usb-linux.c compiled into qemu-dm from 4.1 where you are unable to attach a usb device which has a serial interface (eg: game controller with analog controls). My Logitech Driving Force GT wheel works fine in 4.1 but some Xbox controller couldn't be successfully passed through to the DomU. Perhaps I should be investigating some other avenue? I suppose this is very unlikely to be a big deal for anyone. I'm not using the controller, was just testing usb-passthrough of devices I knew would have a serial interface riding on top of usb. Problem was solved in KVM qemu with a very simple patch and was wondering if Xen had applied the same patch. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: (Hans Mueller) OMG, why do most messages only show up in the daily batch but not individually? @Hans As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. The machine is still pingable, but I suppose there's not much I can do to verify the DomU's state. Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today. On Sat, Nov 10, 2012 at 11:42 AM, feral wrote: > Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > OMG, why do most messages only show up in the daily batch but not > individually? > > @Hans > As far as I can tell, the guest is running fine until we see the IO_PAGE_FAULT. > The machine is still pingable, but I suppose there's not much I can do to > verify the DomU's state. > Going to try running the newer qemu with Xen 4.1 and then Xen-4.2/4.3 with > the older qemu-dm today. > > > On Sat, Nov 10, 2012 at 4:00 AM, wrote: > >> Send Xen-devel mailing list submissions to >> xen-devel@lists.xen.org >> >> To subscribe or unsubscribe via the World Wide Web, visit >> http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel >> or, via email, send a message with subject or body 'help' to >> xen-devel-request@lists.xen.org >> >> You can reach the person managing the list at >> xen-devel-owner@lists.xen.org >> >> When replying, please edit your Subject line so it is more specific >> than "Re: Contents of Xen-devel digest..." >> >> >> Today's Topics: >> >> 1. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: >> IO_PAGE_FAULT: (Hans Mueller) >> 2. Re: Dom0 physical networking/swiotlb/something issue in >> 3.7-rc1 (Jan Beulich) >> 3. Re: Bugs in xl that affect stubdom+tapdisk2, and others >> (Matt Wilson) >> 4. [xen-unstable test] 14377: tolerable FAIL (xen.org) >> 5. .vhd will not boot in VM (Juan Lorenzana) >> >> >> ---------------------------------------------------------------------- >> >> Message: 1 >> Date: Fri, 09 Nov 2012 18:14:39 +0100 >> From: Hans Mueller >> To: xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) >> AMD-Vi: IO_PAGE_FAULT: >> Message-ID: <1871003.0Pup8WfsfS@sheik-lin> >> Content-Type: text/plain; charset="us-ascii" >> >> On Friday, 9. November 2012 16:33:47 Ian Campbell wrote: >> > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: >> > > On Thursday, 8. November 2012 20:02:51 feral wrote: >> > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all >> > > > three. >> > > > >> > > > VGA passthrough previously working with 4.1 is no longer working >> with >> > > > >4.2. >> > > > >> > > > Setup - Working: >> > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), >> > > > libvirt-bin, >> > > > xend >> > > > Asus Radeon HD 7870 DirectCU. >> > > > Works perfect. Benches on par with bare metal. >> > > > >> > > > Setup - Broken: >> > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from >> GIT), xl >> > > > toolstack. >> > > > Asus Radeon HD 7870 DirectCU. >> > > > Some times the guest boots correctly but display is never enabled. >> > > > >> > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? >> > > > >> > > > No errors in logs. Found the following in 'xl dmesg': >> > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault >> > > > address = >> > > > 0x1ac800000, flags = 0 >> > > >> > > I had a similar problem since hg revision 25818:50adc933faaf which >> changes >> > > the qemu tag. >> > > It looks like the qemu commit >> > > 3e66da7266c84638c0e22a09c9d2b07529802576 >> > > (qemu-xen-trad: fix msi_translate with PV event delivery) >> > > causes this behavior. >> > > >> > > I solved the problem for me by using 'pci_msitranslate=0' in the domU >> > > config. >> > I don't follow this stuff closely but I could have sworn we had disabled >> > msitranslate by default. >> > >> > In any case I don't think that changeset was intended to cause anything >> > like this -- Stefano? >> > >> > > In addition I had to reboot (perhaps poweroff?) the dom0 once the >> > > IO_PAGE_FAULT occured. >> >> One more info for you - afair i noticed that it was not only the >> IO_PAGE_FAULT >> which occured but also the qemu process in dom0 crashed w/o any messages >> in >> the logs, perhaps feral can confirm this? >> >> >> >> >> ------------------------------ >> >> Message: 2 >> Date: Fri, 09 Nov 2012 17:34:35 +0000 >> From: "Jan Beulich" >> To: >> Cc: Ian.Campbell@citrix.com, xen-devel@lists.xen.org >> Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something >> issue in 3.7-rc1 >> Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com> >> Content-Type: text/plain; charset=US-ASCII >> >> >>> Konrad Rzeszutek Wilk 11/09/12 2:48 PM >>> >> >On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote: >> >> >>> On 09.11.12 at 11:36, "Jan Beulich" wrote: >> >> > In the forward ported kernels, those two checks are however >> >> > accompanied by range_needs_mapping() (aka >> >> > range_straddles_page_boundary()) checks, which ought to >> >> > take care of this. There is brokenness there with the invocations >> >> > of gnttab_dma_map_page(), but only if the initial offset is at >> >> > least PAGE_SIZE - will have to check whether that occurs. >> >> >> >> And indeed, fixing this also makes the problem go away when >> >> the allocation order doesn't get forced to zero. So presumably >> >> there's also only that one problem I had pointed out in pv-ops. >> > >> >The pvops one has this in the map-page variant (xen_swiotlb_map_page): >> > >> >351 if (dma_capable(dev, dev_addr, size) && >> >352 !range_straddles_page_boundary(phys, size) && >> !swiotlb_force) >> >353 return dev_addr; >> > >> >and in the sg variant: >> > >> >494 if (swiotlb_force || >> >495 !dma_capable(hwdev, dev_addr, sg->length) || >> >496 range_straddles_page_boundary(paddr, >> sg->length)) { >> >497 void *map = swiotlb_tbl_map_single(hwdev, >> >> Oh, right, I forgot that there's yet another clone of that code under >> drivers/xen/. >> >> >So I think that check is OK. There is no gnttab_dma_map_page call - so >> that >> >can't be the issue. >> >> Indeed. >> >> Jan >> >> >> >> >> ------------------------------ >> >> Message: 3 >> Date: Fri, 9 Nov 2012 11:55:55 -0800 >> From: Matt Wilson >> To: Ian Campbell >> Cc: "george.dunlap@eu.citrix.com" , >> "xen-devel@lists.xensource.com" , >> John >> Weekes , Roger Pau Monne >> >> Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and >> others >> Message-ID: >> <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> >> Content-Type: text/plain; charset="us-ascii" >> >> On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: >> > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: >> > > As an additional note about 4.2 -- this isn't an "xl" issue, but >> rather >> > > a build problem -- even though I use "./configure >> --libdir=/usr/lib64", >> > > the build is still creating a "dist/install/usr/lib" directory, and >> > > because of this, running ./install.sh nukes my system's "/usr/lib" -> >> > > "/usr/lib64" softlink (which in turn causes all sorts of other >> problems >> > > until it's corrected). Files that are being put in that tree: >> > > >> > > xen-4.2-testing.hg # find dist/install/usr/lib >> > > dist/install/usr/lib >> > >> > This is an interesting one. I'm not sure how we can avoid this >> > behaviour, perhaps there is a tar option to cause it to follow rather >> > than clobber synlinks? >> > >> > The only other choice I can think of is to change install.sh to use a >> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to >> > avoid including system directories, or to otherwise make install.sh more >> > fragile and prone to bitrot :-( >> >> Oh dear. If we find that there's not a good reason for it anymore, I'd >> think it would be better to remove install.sh instead. >> >> > I must confess I didn't realise anyone used install.sh -- is there some >> > advantage to it over make foo-install? >> > >> > OOI which distro has this lib->lib64 link and what issues does removing >> > it create? >> > >> > > dist/install/usr/lib/xen >> > >> > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is >> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you >> > remember? >> >> There's no need for these files to be multilib compatible, as they are >> not runtime DSOs. They're internal to Xen and I think that they should >> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately >> there's not much agreement on the usefulness of /usr/libexec, so we'll >> need to make sure that packagers can adjust the paths for their >> systems' standards. >> >> For 4.2 we didn't want to change where these files were being placed, >> and I believe they've bin in $PREFIX/lib/ for quite some time. >> >> Matt >> >> > Thanks again for reporting all these. >> > >> > Ian. >> > >> > > dist/install/usr/lib/xen/boot >> > > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz >> > > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz >> > > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz >> > > dist/install/usr/lib/xen/boot/hvmloader >> > > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz >> > > dist/install/usr/lib/xen/bin >> > > dist/install/usr/lib/xen/bin/stubdom-dm >> > > dist/install/usr/lib/xen/bin/qemu-io >> > > dist/install/usr/lib/xen/bin/qemu-nbd >> > > dist/install/usr/lib/xen/bin/qemu-img >> > > dist/install/usr/lib/xen/bin/xenpaging >> > > dist/install/usr/lib/xen/bin/qemu-dm >> > > dist/install/usr/lib/xen/bin/qemu-system-i386 >> > > dist/install/usr/lib/xen/bin/qemu-ga >> > > dist/install/usr/lib/xen/bin/stubdompath.sh >> >> >> >> ------------------------------ >> >> Message: 4 >> Date: Sat, 10 Nov 2012 05:53:35 +0000 >> From: xen.org >> To: >> Cc: ian.jackson@eu.citrix.com >> Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL >> Message-ID: >> Content-Type: text/plain >> >> flight 14377 xen-unstable real [real] >> http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/ >> >> Failures :-/ but no regressions. >> >> Regressions which are regarded as allowable (not blocking): >> test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like >> 14376 >> test-amd64-amd64-xl-sedf 5 xen-boot fail like >> 14376 >> test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like >> 14376 >> test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like >> 14376 >> >> Tests which did not succeed, but are not blocking: >> test-amd64-amd64-xl-pcipt-intel 9 guest-start fail >> never pass >> test-amd64-i386-xend-winxpsp3 16 leak-check/check fail >> never pass >> test-amd64-i386-win 16 leak-check/check fail >> never pass >> test-amd64-amd64-win 16 leak-check/check fail >> never pass >> test-amd64-i386-xl-win-vcpus1 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-win7-amd64 13 guest-stop fail >> never pass >> test-amd64-i386-win-vcpus1 16 leak-check/check fail >> never pass >> test-amd64-i386-xl-win7-amd64 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-winxpsp3 13 guest-stop fail >> never pass >> test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail >> never pass >> test-amd64-amd64-xl-win 13 guest-stop fail >> never pass >> >> version targeted for testing: >> xen 62885b3c34c8 >> baseline version: >> xen 62885b3c34c8 >> >> jobs: >> build-amd64 pass >> build-i386 pass >> build-amd64-oldkern pass >> build-i386-oldkern pass >> build-amd64-pvops pass >> build-i386-pvops pass >> test-amd64-amd64-xl pass >> test-amd64-i386-xl pass >> test-amd64-i386-rhel6hvm-amd pass >> test-amd64-i386-qemuu-rhel6hvm-amd pass >> test-amd64-amd64-xl-qemuu-win7-amd64 fail >> test-amd64-amd64-xl-win7-amd64 fail >> test-amd64-i386-xl-win7-amd64 fail >> test-amd64-i386-xl-credit2 pass >> test-amd64-amd64-xl-pcipt-intel fail >> test-amd64-i386-rhel6hvm-intel pass >> test-amd64-i386-qemuu-rhel6hvm-intel pass >> test-amd64-i386-xl-multivcpu pass >> test-amd64-amd64-pair pass >> test-amd64-i386-pair pass >> test-amd64-amd64-xl-sedf-pin fail >> test-amd64-amd64-pv pass >> test-amd64-i386-pv pass >> test-amd64-amd64-xl-sedf fail >> test-amd64-i386-win-vcpus1 fail >> test-amd64-i386-xl-win-vcpus1 fail >> test-amd64-i386-xl-winxpsp3-vcpus1 fail >> test-amd64-amd64-win fail >> test-amd64-i386-win fail >> test-amd64-amd64-xl-win fail >> test-amd64-amd64-xl-qemuu-winxpsp3 fail >> test-amd64-i386-xend-winxpsp3 fail >> test-amd64-amd64-xl-winxpsp3 fail >> >> >> ------------------------------------------------------------ >> sg-report-flight on woking.cam.xci-test.com >> logs: /home/xc_osstest/logs >> images: /home/xc_osstest/images >> >> Logs, config files, etc. are available at >> http://www.chiark.greenend.org.uk/~xensrcts/logs >> >> Test harness code can be found at >> http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary >> >> >> Published tested tree is already up to date. >> >> >> >> >> ------------------------------ >> >> Message: 5 >> Date: Fri, 9 Nov 2012 04:01:36 -0700 >> From: "Juan Lorenzana" >> To: >> Subject: [Xen-devel] .vhd will not boot in VM >> Message-ID: >> Content-Type: text/plain; charset="us-ascii" >> >> We had a XCP 1.5 pool with 2 machines as hosts. The storage pool which >> as NFS mounted lost its ability to export the filesystem with the VM >> images on it. >> >> >> >> We contacted the vendor and we were able to restore it. However, they >> had recommended that we delete the XCP Pool, recreate it, add the hosts >> back in, and then mount the storage. >> >> >> >> That is where we are at now. We can see the storage and the VM images. >> However in XCP Xen Center when looking at the images is clear that the >> metadata is lost. So we can not see which image or snap shot belongs to >> which VM. The names all are blank when we look at the storage. >> >> >> >> Also, if I randomly mount an image to a VM, it does not boot. It >> produces an error that says: >> >> >> >> Traceback (most recent call last): - File "/usr/binpygrub", line 808, in >> ? - fs = fsimage.open(file,part_offs[0[, bootfsoptions) - IOError: >> [Errno 95] Operation not supported. >> >> >> >> The system kept the VM information as we destroyed the pool and then >> created a new one but it looks like we only see snapshots through >> XenCenter. Its like the real .vhd that were running are not showing up. >> >> >> >> I know it is pretty bad. We should not have listened to the storage >> guys. >> >> >> >> Does anyone know someone that can help? >> >> >> >> Juan >> >> -------------- next part -------------- >> An HTML attachment was scrubbed... >> URL: < >> http://lists.xen.org/archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html >> > >> >> ------------------------------ >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel >> >> >> End of Xen-devel Digest, Vol 93, Issue 79 >> ***************************************** >> > > > > -- > _____ > Fact: > 1. Ninjas are mammals. > 2. Ninjas fight ALL the time. > 3. The purpose of the ninja is to flip out and kill people. > -- _____ Fact: 1. Ninjas are mammals. 2. Ninjas fight ALL the time. 3. The purpose of the ninja is to flip out and kill people. --bcaec5014c71e4c85004ce29aa99 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Can= 't run Xen-4.3 unstable kernel with old xm tools:
WARING: =A0Can't f= ind version unstable of xen utils, fallback to default version!
Error: Unable to connect= to xend: No such file or directory. Is xend running?

Guessing the same will be true of running the older 4.1 kernel with the new= xl toolstack, so not sure how to proceed in testing.

I should mention that the only reason I was testing 4.3 was because there i= s a bug in usb-linux.c compiled into qemu-dm from 4.1 where you are unable = to attach a usb device which has a serial interface (eg: game controller wi= th analog controls). =A0My Logitech Driving Force GT wheel works fine in 4.= 1 but some Xbox controller couldn't be successfully passed through to t= he DomU.
Perhaps I should= be investigating some other avenue? =A0
I suppose this is very unlikely= to be a big deal for anyone. =A0I'm not using the controller, was just= testing usb-passthrough of devices I knew would have a serial interface ri= ding on top of usb.
Problem was solv= ed in KVM qemu with a very simple patch and was wondering if Xen had applie= d the same patch.


Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0= =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
OMG, why d= o most messages only show up in the daily batch but not individually?
=

@Hans
As fa= r as I can tell, the guest is running fine until we see the=A0IO_PAGE_FAULT. =A0The machine is still pingable, but I = suppose there's not much I can do to verify the DomU's state.
Going to try running the newer qemu with Xen 4.1 and then = Xen-4.2/4.3 with the older qemu-dm today.





On Sat, Nov 10, 2012 at 11:42 AM, feral = <blistovmhz@gmail.com> wrote:
Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)=
OMG,= why do most messages only show up in the daily batch but not individually?=

@Hans
As far as I can tell, the guest is running fine until we see the= =A0IO_PAGE_FAULT. =A0The machine is= still pingable, but I suppose there's not much I can do to verify the = DomU's state.
Going to try running the newer qemu w= ith Xen 4.1 and then Xen-4.2/4.3 with the older qemu-dm today.


On Sat, Nov 10, 2012 at 4:00 AM, <xen-devel-req= uest@lists.xen.org> wrote:
Send Xen-devel mailing list submissions to =A0 =A0 =A0 =A0 xen-devel@lists.xen.org

To subscribe or unsubscribe via the World Wide Web, visit
=A0 =A0 =A0 =A0 http://lists.xen.org/cgi-bin/mailman/listinfo/xe= n-devel
or, via email, send a message with subject or body 'help' to
=A0 =A0 =A0 =A0 xen-devel-request@lists.xen.org

You can reach the person managing the list at
=A0 =A0 =A0 =A0 xen-devel-owner@lists.xen.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Xen-devel digest..."


Today's Topics:

=A0 =A01. Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi:
=A0 =A0 =A0 IO_PAGE_FAULT: (Hans Mueller)
=A0 =A02. Re: Dom0 physical networking/swiotlb/something issue in
=A0 =A0 =A0 3.7-rc1 (Jan Beulich)
=A0 =A03. Re: Bugs in xl that affect stubdom+tapdisk2, and others
=A0 =A0 =A0 (Matt Wilson)
=A0 =A04. [xen-unstable test] 14377: tolerable FAIL (xen.org)
=A0 =A05. .vhd will not boot in VM (Juan Lorenzana)


----------------------------------------------------------------------

Message: 1
Date: Fri, 09 Nov 2012 18:14:39 +0100
From: Hans Mueller <mcbeagle@gmx.de>
To: xen-devel@= lists.xen.org
Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN)
=A0 =A0 =A0 =A0 AMD-Vi: IO_PAGE_FAULT:
Message-ID: <1871003.0Pup8WfsfS@sheik-lin>
Content-Type: text/plain; charset=3D"us-ascii"

On Friday, 9. November 2012 16:33:47 Ian Campbell wrote:
> On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote:
> > On Thursday, 8. November 2012 20:02:51 feral wrote:
> > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. =A0Tested aga= inst all
> > > three.
> > >
> > > VGA passthrough previously working with 4.1 is no longer wor= king with
> > > >4.2.
> > >
> > > Setup - Working:
> > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos)= ,
> > > libvirt-bin,
> > > xend
> > > Asus Radeon HD 7870 DirectCU.
> > > Works perfect. =A0Benches on par with bare metal.
> > >
> > > Setup - Broken:
> > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (f= rom GIT), xl
> > > toolstack.
> > > Asus Radeon HD 7870 DirectCU.
> > > Some times the guest boots correctly but display is never en= abled.
> > >
> > > =A0Sometimes BSOD, doesn't seem to be any rhyme or reaso= n?
> > >
> > > No errors in logs. =A0 Found the following in 'xl dmesg&= #39;:
> > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain =3D 2, device id =3D 0x6= 00, fault
> > > address =3D
> > > 0x1ac800000, flags =3D 0
> >
> > I had a similar problem since hg revision 25818:50adc933faaf whic= h changes
> > the qemu tag.
> > It looks like the qemu commit
> > 3e66da7266c84638c0e22a09c9d2b07529802576
> > (qemu-xen-trad: fix msi_translate with PV event delivery)
> > causes this behavior.
> >
> > I solved the problem for me by using 'pci_msitranslate=3D0= 9; in the domU
> > config.
> I don't follow this stuff closely but I could have sworn we had di= sabled
> msitranslate by default.
>
> In any case I don't think that changeset was intended to cause any= thing
> like this -- Stefano?
>
> > In addition I had to reboot (perhaps poweroff?) the dom0 once the=
> > IO_PAGE_FAULT occured.

One more info for you - afair i noticed that it was not only the IO_PAGE_FA= ULT
which occured but also the qemu process in dom0 crashed w/o any messages in=
the logs, perhaps feral can confirm this?




------------------------------

Message: 2
Date: Fri, 09 Nov 2012 17:34:35 +0000
From: "Jan Beulich" <jbeulich@suse.com>
To: <konrad.= wilk@oracle.com>
Cc: Ian.Campbe= ll@citrix.com, xen-devel@lists.xen.org
Subject: Re: [Xen-devel] Dom0 physical networking/swiotlb/something
=A0 =A0 =A0 =A0 issue in 3.7-rc1
Message-ID: <509D3EAB020000780008F4B6@nat28.tlf.novell.com&g= t;
Content-Type: text/plain; charset=3DUS-ASCII

>>> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 11/09/12 2:48 PM >= ;>>
>On Fri, Nov 09, 2012 at 11:43:39AM +0000, Jan Beulich wrote:
>> >>> On 09.11.12 at 11:36, "Jan Beulich" <JBeulich@suse.com&g= t; wrote:
>> > In the forward ported kernels, those two checks are however >> > accompanied by range_needs_mapping() (aka
>> > range_straddles_page_boundary()) checks, which ought to
>> > take care of this. There is brokenness there with the invocat= ions
>> > of gnttab_dma_map_page(), but only if the initial offset is a= t
>> > least PAGE_SIZE - will have to check whether that occurs.
>>
>> And indeed, fixing this also makes the problem go away when
>> the allocation order doesn't get forced to zero. So presumably=
>> there's also only that one problem I had pointed out in pv-ops= .
>
>The pvops one has this in the map-page variant (xen_swiotlb_map_page):<= br> >
>351 =A0 =A0 =A0 =A0 if (dma_capable(dev, dev_addr, size) &&
>352 =A0 =A0 =A0 =A0 =A0 =A0 !range_straddles_page_boundary(phys, size) = && !swiotlb_force)
>353 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return dev_addr;
>
>and in the sg variant:
>
>494 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (swiotlb_force ||
>495 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !dma_capable(hwdev, dev_add= r, sg->length) ||
>496 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 range_straddles_page_bounda= ry(paddr, sg->length)) {
>497 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 void *map =3D swiot= lb_tbl_map_single(hwdev,

Oh, right, I forgot that there's yet another clone of that code under d= rivers/xen/.

>So I think that check is OK. There is no gnttab_dma_map_page call - so = that
>can't be the issue.

Indeed.

Jan




------------------------------

Message: 3
Date: Fri, 9 Nov 2012 11:55:55 -0800
From: Matt Wilson <m= sw@amazon.com>
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: "= george.dunlap@eu.citrix.com" <george.dunlap@eu.citrix.com>,
=A0 =A0 =A0 =A0 "xen-devel@lists.xensource.com" <xen-devel@lists.xensource= .com>, =A0 =A0 =A0 =A0John
=A0 =A0 =A0 =A0 Weekes <lists.xen@nuclearfallout.net>, =A0Roger Pau Monne<= br> =A0 =A0 =A0 =A0 <roger.pau@citrix.com>
Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and
=A0 =A0 =A0 =A0 others
Message-ID:
=A0 =A0 =A0 =A0 <20121109195553.GA11023@u109add431= 5675089e695.ant.amazon.com>
Content-Type: text/plain; charset=3D"us-ascii"

On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote:
> On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote:
> > As an additional note about 4.2 -- this isn't an "xl&quo= t; issue, but rather
> > a build problem -- even though I use "./configure --libdir= =3D/usr/lib64",
> > the build is still creating a "dist/install/usr/lib" di= rectory, and
> > because of this, running ./install.sh nukes my system's "= ;/usr/lib" ->
> > "/usr/lib64" softlink (which in turn causes all sorts o= f other problems
> > until it's corrected). Files that are being put in that tree:=
> >
> > xen-4.2-testing.hg # find dist/install/usr/lib
> > dist/install/usr/lib
>
> This is an interesting one. I'm not sure how we can avoid this
> behaviour, perhaps there is a tar option to cause it to follow rather<= br> > than clobber synlinks?
>
> The only other choice I can think of is to change install.sh to use a<= br> > (long) explicit list of $(FOO_DIR)/* entries instead of the single * t= o
> avoid including system directories, or to otherwise make install.sh mo= re
> fragile and prone to bitrot :-(

Oh dear. If we find that there's not a good reason for it anymore, I= 9;d
think it would be better to remove install.sh instead.

> I must confess I didn't realise anyone used install.sh -- is there= some
> advantage to it over make foo-install?
>
> OOI which distro has this lib->lib64 link and what issues does remo= ving
> it create?
>
> > dist/install/usr/lib/xen
>
> This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is<= br> > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt = do you
> remember?

There's no need for these files to be multilib compatible, as they are<= br> not runtime DSOs. They're internal to Xen and I think that they should<= br> be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately
there's not much agreement on the usefulness of /usr/libexec, so we'= ;ll
need to make sure that packagers can adjust the paths for their
systems' standards.

For 4.2 we didn't want to change where these files were being placed, and I believe they've bin in $PREFIX/lib/ for quite some time.

Matt

> Thanks again for reporting all these.
>
> Ian.
>
> > dist/install/usr/lib/xen/boot
> > dist/install/usr/lib/xen/boot/xenstore-stubdom.gz
> > dist/install/usr/lib/xen/boot/ioemu-stubdom.gz
> > dist/install/usr/lib/xen/boot/pv-grub-x86_64.gz
> > dist/install/usr/lib/xen/boot/hvmloader
> > dist/install/usr/lib/xen/boot/pv-grub-x86_32.gz
> > dist/install/usr/lib/xen/bin
> > dist/install/usr/lib/xen/bin/stubdom-dm
> > dist/install/usr/lib/xen/bin/qemu-io
> > dist/install/usr/lib/xen/bin/qemu-nbd
> > dist/install/usr/lib/xen/bin/qemu-img
> > dist/install/usr/lib/xen/bin/xenpaging
> > dist/install/usr/lib/xen/bin/qemu-dm
> > dist/install/usr/lib/xen/bin/qemu-system-i386
> > dist/install/usr/lib/xen/bin/qemu-ga
> > dist/install/usr/lib/xen/bin/stubdompath.sh



------------------------------

Message: 4
Date: Sat, 10 Nov 2012 05:53:35 +0000
From: xen.org <ian.jackson@eu.citr= ix.com>
To: <= xen-devel@lists.xensource.com>
Cc: ian.jack= son@eu.citrix.com
Subject: [Xen-devel] [xen-unstable test] 14377: tolerable FAIL
Message-ID: <osstest-14377-mainreport@xen.org>
Content-Type: text/plain

flight 14377 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/14377/

Failures :-/ but no regressions.

Regressions which are regarded as allowable (not blocking):
=A0test-amd64-amd64-xl-sedf-pin 10 guest-saverestore =A0 =A0 =A0 =A0 =A0 = =A0fail =A0 like 14376
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A05 xen-boot =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail =A0 like 14376
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A09 guest-localmigrate =A0 =A0 =A0 f= ail like 14376
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A09 guest-localmigrate =A0 =A0 fai= l like 14376

Tests which did not succeed, but are not blocking:
=A0test-amd64-amd64-xl-pcipt-intel =A09 guest-start =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-xend-winxpsp3 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0never pass
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A016 leak-check/check =A0 =A0 =A0 = =A0 =A0 =A0 fail =A0 never pass
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 16 leak-check/check =A0 =A0 =A0 =A0= =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 fail never pass
=A0test-amd64-i386-win-vcpus1 =A0 16 leak-check/check =A0 =A0 =A0 =A0 =A0 = =A0 fail =A0 never pass
=A0test-amd64-i386-xl-win7-amd64 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0never pass
=A0test-amd64-amd64-xl-winxpsp3 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 fail =A0 never pass
=A0test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 fail never pass
=A0test-amd64-amd64-xl-win =A0 =A0 =A013 guest-stop =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail =A0 never pass

version targeted for testing:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8
baseline version:
=A0xen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A062885b3c34c8

jobs:
=A0build-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-oldkern =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0build-amd64-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0build-i386-pvops =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-xl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-amd =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-qemuu-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 fail
=A0test-amd64-amd64-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win7-amd64 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-credit2 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-pcipt-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-i386-qemuu-rhel6hvm-intel =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 pass
=A0test-amd64-i386-xl-multivcpu =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pair =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf-pin =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pass
=A0test-amd64-i386-pv =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pass
=A0test-amd64-amd64-xl-sedf =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xl-win-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-i386-xl-winxpsp3-vcpus1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-amd64-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-win =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-qemuu-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 fail
=A0test-amd64-i386-xend-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0fail
=A0test-amd64-amd64-xl-winxpsp3 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 fail


------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images

Logs, config files, etc. are available at
=A0 =A0 http://www.chiark.greenend.org.uk/~xensrcts/logs

Test harness code can be found at
=A0 =A0 http://xenbits.xensource.com/gitweb?p=3Dosstest.= git;a=3Dsummary


Published tested tree is already up to date.




------------------------------

Message: 5
Date: Fri, 9 Nov 2012 04:01:36 -0700
From: "Juan Lorenzana" <juan@jelsupport.com>
To: <xen-de= vel@lists.xen.org>
Subject: [Xen-devel] .vhd will not boot in VM
Message-ID: <F2EF84CA5BCF824AA4197956E124073848F4AE@server.jel.local>=
Content-Type: text/plain; charset=3D"us-ascii"

We had a XCP 1.5 pool with 2 machines as hosts. =A0The storage pool which as NFS mounted lost its ability to export the filesystem with the VM
images on it.



We contacted the vendor and we were able to restore it. =A0However, they had recommended that we delete the XCP Pool, recreate it, add the hosts
back in, and then mount the storage.



That is where we are at now. =A0We can see the storage and the VM images. However in XCP Xen Center when looking at the images is clear that the
metadata is lost. =A0So we can not see which image or snap shot belongs to<= br> which VM. =A0The names all are blank when we look at the storage.



Also, if I randomly mount an image to a VM, it does not boot. =A0It
produces an error that says:



Traceback (most recent call last): - File "/usr/binpygrub", line = 808, in
? - fs =3D fsimage.open(file,part_offs[0[, bootfsoptions) - IOError:
[Errno 95] Operation not supported.



The system kept the VM information as we destroyed the pool and then
created a new one but it looks like we only see snapshots through
XenCenter. =A0Its like the real .vhd that were running are not showing up.<= br>


I know it is pretty bad. =A0We should not have listened to the storage
guys.



Does anyone know someone that can help?



Juan

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.xen.org= /archives/html/xen-devel/attachments/20121109/a085ab22/attachment.html&= gt;

------------------------------

_______________________________________________
Xen-devel mailing list
Xen-devel@list= s.xen.org
http://lists.x= en.org/xen-devel


End of Xen-devel Digest, Vol 93, Issue 79
*****************************************



--
_____
Fact:
1. Ninjas = are mammals.
2. Ninjas fight ALL the time.
3. The purpose of the ninj= a is to flip out and kill people.



--
_____
Fac= t:
1. Ninjas are mammals.
2. Ninjas fight ALL the time.
3. The pur= pose of the ninja is to flip out and kill people.
--bcaec5014c71e4c85004ce29aa99-- --===============0408609209009085176== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0408609209009085176==-- From xen-devel-bounces@lists.xen.org Sun Nov 11 03:58:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 03:58:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXOgJ-0004Mi-BY; Sun, 11 Nov 2012 03:57:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXOgH-0004Md-6o for xen-devel@lists.xen.org; Sun, 11 Nov 2012 03:57:57 +0000 Received: from [85.158.139.211:19065] by server-13.bemta-5.messagelabs.com id CE/9B-27809-3422F905; Sun, 11 Nov 2012 03:57:55 +0000 X-Env-Sender: davidxu06@gmail.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352606274!19662073!1 X-Originating-IP: [209.85.216.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21909 invoked from network); 11 Nov 2012 03:57:55 -0000 Received: from mail-qc0-f173.google.com (HELO mail-qc0-f173.google.com) (209.85.216.173) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 03:57:55 -0000 Received: by mail-qc0-f173.google.com with SMTP id b12so3914227qca.32 for ; Sat, 10 Nov 2012 19:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=r+sXOpspWmLe/pCWNklKLkpLHYqheH0OIWPFO2k0T7I=; b=NscaizyHjJEtHbsdPkxyYuhG8p/Vt1LLZF4nFzZB8zHF2E6+BxE1oUbHcu6Yv+JmEz xkHSn8Qk//QZtpt4A0P6OFpho0TSc5PwGTRl8mm9tFQtFeLRF1yZ+mm+TjjaFzi5RnV6 /Yjj4nzhu3epO0ToyWNGfYHgImlXvwlFCKcF4d8yUbqkY/7EVOXyBdXF1p25ibFtLb23 /i3Dr+yJ9565qa45Y8DekEjfKXj/ek0Q1V94rTk7D4AI0lIotKj/q0ylXldXQJesecVQ PQZJuJU8aCNzG50c3huDxr95I9NQrunXvtvcy9OX+UowHEpZx/qqbTw0YM7vpBuuLdct 1Gqg== MIME-Version: 1.0 Received: by 10.229.78.221 with SMTP id m29mr4891228qck.4.1352606274019; Sat, 10 Nov 2012 19:57:54 -0800 (PST) Received: by 10.49.1.116 with HTTP; Sat, 10 Nov 2012 19:57:53 -0800 (PST) Date: Sat, 10 Nov 2012 22:57:53 -0500 Message-ID: From: David Xu To: xen-devel@lists.xen.org Subject: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4579465016845720189==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4579465016845720189== Content-Type: multipart/alternative; boundary=00235429d2bc7be09f04ce3030bb --00235429d2bc7be09f04ce3030bb Content-Type: text/plain; charset=ISO-8859-1 Hi all, I wonder if the state of process in guestOS will change when the corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its credits and its state become over, how about the process context or softirq context in guest OS on this vCPU? Does it still maintain the same running state? Thanks. Regards, Cong --00235429d2bc7be09f04ce3030bb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

Regards,
Cong
--00235429d2bc7be09f04ce3030bb-- --===============4579465016845720189== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4579465016845720189==-- From xen-devel-bounces@lists.xen.org Sun Nov 11 03:58:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 03:58:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXOgJ-0004Mi-BY; Sun, 11 Nov 2012 03:57:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXOgH-0004Md-6o for xen-devel@lists.xen.org; Sun, 11 Nov 2012 03:57:57 +0000 Received: from [85.158.139.211:19065] by server-13.bemta-5.messagelabs.com id CE/9B-27809-3422F905; Sun, 11 Nov 2012 03:57:55 +0000 X-Env-Sender: davidxu06@gmail.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352606274!19662073!1 X-Originating-IP: [209.85.216.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21909 invoked from network); 11 Nov 2012 03:57:55 -0000 Received: from mail-qc0-f173.google.com (HELO mail-qc0-f173.google.com) (209.85.216.173) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 03:57:55 -0000 Received: by mail-qc0-f173.google.com with SMTP id b12so3914227qca.32 for ; Sat, 10 Nov 2012 19:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=r+sXOpspWmLe/pCWNklKLkpLHYqheH0OIWPFO2k0T7I=; b=NscaizyHjJEtHbsdPkxyYuhG8p/Vt1LLZF4nFzZB8zHF2E6+BxE1oUbHcu6Yv+JmEz xkHSn8Qk//QZtpt4A0P6OFpho0TSc5PwGTRl8mm9tFQtFeLRF1yZ+mm+TjjaFzi5RnV6 /Yjj4nzhu3epO0ToyWNGfYHgImlXvwlFCKcF4d8yUbqkY/7EVOXyBdXF1p25ibFtLb23 /i3Dr+yJ9565qa45Y8DekEjfKXj/ek0Q1V94rTk7D4AI0lIotKj/q0ylXldXQJesecVQ PQZJuJU8aCNzG50c3huDxr95I9NQrunXvtvcy9OX+UowHEpZx/qqbTw0YM7vpBuuLdct 1Gqg== MIME-Version: 1.0 Received: by 10.229.78.221 with SMTP id m29mr4891228qck.4.1352606274019; Sat, 10 Nov 2012 19:57:54 -0800 (PST) Received: by 10.49.1.116 with HTTP; Sat, 10 Nov 2012 19:57:53 -0800 (PST) Date: Sat, 10 Nov 2012 22:57:53 -0500 Message-ID: From: David Xu To: xen-devel@lists.xen.org Subject: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4579465016845720189==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4579465016845720189== Content-Type: multipart/alternative; boundary=00235429d2bc7be09f04ce3030bb --00235429d2bc7be09f04ce3030bb Content-Type: text/plain; charset=ISO-8859-1 Hi all, I wonder if the state of process in guestOS will change when the corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its credits and its state become over, how about the process context or softirq context in guest OS on this vCPU? Does it still maintain the same running state? Thanks. Regards, Cong --00235429d2bc7be09f04ce3030bb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

Regards,
Cong
--00235429d2bc7be09f04ce3030bb-- --===============4579465016845720189== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4579465016845720189==-- From xen-devel-bounces@lists.xen.org Sun Nov 11 05:45:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 05:45:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXQLr-00055A-MT; Sun, 11 Nov 2012 05:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXQLq-000555-0I for xen-devel@lists.xensource.com; Sun, 11 Nov 2012 05:44:58 +0000 Received: from [85.158.137.99:49438] by server-16.bemta-3.messagelabs.com id A3/E9-07461-95B3F905; Sun, 11 Nov 2012 05:44:57 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352612696!11756997!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17219 invoked from network); 11 Nov 2012 05:44:56 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 05:44:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,756,1344211200"; d="scan'208";a="15727714" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Nov 2012 05:44:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 11 Nov 2012 05:44:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXQLj-00039Q-I5; Sun, 11 Nov 2012 05:44:51 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXQLj-0007HD-Bs; Sun, 11 Nov 2012 05:44:51 +0000 To: Message-ID: From: xen.org Date: Sun, 11 Nov 2012 05:44:51 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14378: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14378 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14378/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14377 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14377 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14377 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14377 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 05:45:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 05:45:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXQLr-00055A-MT; Sun, 11 Nov 2012 05:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXQLq-000555-0I for xen-devel@lists.xensource.com; Sun, 11 Nov 2012 05:44:58 +0000 Received: from [85.158.137.99:49438] by server-16.bemta-3.messagelabs.com id A3/E9-07461-95B3F905; Sun, 11 Nov 2012 05:44:57 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352612696!11756997!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17219 invoked from network); 11 Nov 2012 05:44:56 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 05:44:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,756,1344211200"; d="scan'208";a="15727714" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Nov 2012 05:44:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 11 Nov 2012 05:44:51 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXQLj-00039Q-I5; Sun, 11 Nov 2012 05:44:51 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXQLj-0007HD-Bs; Sun, 11 Nov 2012 05:44:51 +0000 To: Message-ID: From: xen.org Date: Sun, 11 Nov 2012 05:44:51 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14378: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14378 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14378/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14377 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14377 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14377 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14377 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 08:52:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 08:52:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXTGB-0006SZ-P9; Sun, 11 Nov 2012 08:51:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXTGA-0006SU-1c for xen-devel@lists.xen.org; Sun, 11 Nov 2012 08:51:18 +0000 Received: from [85.158.137.99:32862] by server-6.bemta-3.messagelabs.com id 2B/D2-28265-5076F905; Sun, 11 Nov 2012 08:51:17 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352623876!13868202!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20193 invoked from network); 11 Nov 2012 08:51:16 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 08:51:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,756,1344211200"; d="scan'208";a="15728674" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Nov 2012 08:51:12 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 11 Nov 2012 08:51:11 +0000 Message-ID: <1352623871.21048.43.camel@dagon.hellion.org.uk> From: Ian Campbell To: feral Date: Sun, 11 Nov 2012 08:51:11 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-10 at 19:42 +0000, feral wrote: > Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > OMG, why do most messages only show up in the daily batch but not > individually? Because you appear to have turned on the option to receive the digest version of the list. If you want individual messages then you need to login to your account at http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel and turn off that option. In any case please don't quote the *entire* digest when replying, it is doubly important to trim your quotes in this case. In this case you included thousands of pointless lines of quotes. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 08:52:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 08:52:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXTGB-0006SZ-P9; Sun, 11 Nov 2012 08:51:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXTGA-0006SU-1c for xen-devel@lists.xen.org; Sun, 11 Nov 2012 08:51:18 +0000 Received: from [85.158.137.99:32862] by server-6.bemta-3.messagelabs.com id 2B/D2-28265-5076F905; Sun, 11 Nov 2012 08:51:17 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352623876!13868202!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxMzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20193 invoked from network); 11 Nov 2012 08:51:16 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 08:51:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,756,1344211200"; d="scan'208";a="15728674" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 11 Nov 2012 08:51:12 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Sun, 11 Nov 2012 08:51:11 +0000 Message-ID: <1352623871.21048.43.camel@dagon.hellion.org.uk> From: Ian Campbell To: feral Date: Sun, 11 Nov 2012 08:51:11 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-10 at 19:42 +0000, feral wrote: > Re: PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: > IO_PAGE_FAULT: (Hans Mueller) > OMG, why do most messages only show up in the daily batch but not > individually? Because you appear to have turned on the option to receive the digest version of the list. If you want individual messages then you need to login to your account at http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel and turn off that option. In any case please don't quote the *entire* digest when replying, it is doubly important to trim your quotes in this case. In this case you included thousands of pointless lines of quotes. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 13:14:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 13:14:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXXLx-00081X-LS; Sun, 11 Nov 2012 13:13:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXXLu-00081S-P7 for xen-devel@lists.xen.org; Sun, 11 Nov 2012 13:13:31 +0000 Received: from [85.158.143.35:24101] by server-2.bemta-4.messagelabs.com id 83/02-28922-A74AF905; Sun, 11 Nov 2012 13:13:30 +0000 X-Env-Sender: abb@gremwell.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352639607!14434111!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4998 invoked from network); 11 Nov 2012 13:13:28 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 13:13:28 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so6470853vcb.32 for ; Sun, 11 Nov 2012 05:13:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=9ASChrrsuQA65GbCQNfdRXZZLHT415mwWX9EJmWP2OM=; b=cDNamct+nAMC+CftP7GXsD0iN/33GYUa7zOhNExCw4ZSnLpvLYZdoscZqxKLPn9w4q jU6bILxsR9sFoY5gLVLbB11l7v4HhGXt3RYYVsdRcqdo8c7SeK/Z6SdbSN1ek4FGQNpy 8Ty1qU+e7ze3QEM645IYB+saCansOwThNlOrH3cQTPBMzvYpuJgi4uUKqWa9+zOYRMO5 z5UBFEM7uFs68r9kemD9fITJwRE3lhF3iZPCytqdd6dI73pWPb2v+AUeQ/4ilPC/dGR5 WutV0b7QSOYqzKxOpqP3XNC45Ow66TTYdPSTJPfcXR+h8oVearHUTR4SybBA+dHT9eyr l26A== MIME-Version: 1.0 Received: by 10.220.208.141 with SMTP id gc13mr19788270vcb.55.1352639606631; Sun, 11 Nov 2012 05:13:26 -0800 (PST) Received: by 10.58.155.226 with HTTP; Sun, 11 Nov 2012 05:13:26 -0800 (PST) Date: Sun, 11 Nov 2012 14:13:26 +0100 Message-ID: From: Alexandre Bezroutchko To: xen-devel@lists.xen.org Content-Type: multipart/mixed; boundary=bcaec517a674432cc304ce37f3ed X-Gm-Message-State: ALoCoQkEytLqGO4nHjMmkbL2ydf8F2g4GKFJXDD1/zvwScvIRU01dEjWsTN2+TPOTFejcKRDrAui Cc: Marek Marczykowski Subject: [Xen-devel] [xen-devel] kernel 3.4.12 crashes if built debugging X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --bcaec517a674432cc304ce37f3ed Content-Type: multipart/alternative; boundary=bcaec517a674432cbf04ce37f3eb --bcaec517a674432cbf04ce37f3eb Content-Type: text/plain; charset=ISO-8859-1 Hi, Kernel 3.4.12 built with debugging options crashes during bootstrap. The issue is easily reproducible and also seems to affect 3.4.18. The "offending" debug option is 'page allocation', if I switch it off but leave other debugging options the kernel does not crash. +CONFIG_DEBUG_PAGEALLOC=y +CONFIG_WANT_PAGE_DEBUG_FLAGS=y +CONFIG_PAGE_GUARD=y The kernel is actually built from devel-3.4 branch of marmarek repo of Qubes, but all the patches are disabled, so it supposed to be equivalent to vanilla kernel. Partial error messages are below. The kernel config file and full log are attached. ---------------------------------------------------------------------------- [ 0.575221] debug: unmapping init memory ffffffff81879000..ffffffff81913000 [ 0.575474] Write protecting the kernel read-only data: 8192k [ 0.579226] debug: unmapping init memory ffff880001469000..ffff880001600000 [ 0.579825] debug: unmapping init memory ffff8800017fc000..ffff880001800000 [ 0.601666] BUG: unable to handle kernel paging request at ffff88000f66d000 [ 0.601678] IP: [] __tlb_remove_page+0x84/0xb0 [ 0.601689] PGD 180c067 PUD 1810067 PMD 861067 PTE 801000000f66d064 [ 0.601698] Oops: 0002 [#1] SMP DEBUG_PAGEALLOC [ 0.601705] CPU 5 [ 0.601708] Modules linked in: [ 0.601713] [ 0.601717] Pid: 60, comm: init Not tainted 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64 #1 [ 0.601726] RIP: e030:[] [] __tlb_remove_page+0x84/0xb0 [ 0.601736] RSP: e02b:ffff88000f645a78 EFLAGS: 00010286 [ 0.601741] RAX: ffff88000f66d000 RBX: ffff88000f645c30 RCX: 0000000000000000 [ 0.601747] RDX: ffff88000f66d000 RSI: 0000000000000010 RDI: 0000000000000200 [ 0.601754] RBP: ffff88000f645a88 R08: 0000000000000000 R09: ffff880000000000 [ 0.601760] R10: 0000000000000001 R11: 00000000581c6204 R12: ffff88000f62ec68 [ 0.601766] R13: 0000000193e49125 R14: ffff88000f5e3150 R15: 000000000042a000 [ 0.601777] FS: 00007fda48c7b740(0000) GS:ffff880018d40000(0000) knlGS:0000000000000000 [ 0.601784] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 0.605188] CR2: ffff88000f66d000 CR3: 000000000f665000 CR4: 0000000000002660 [ 0.605188] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 0.605188] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 0.605188] Process init (pid: 60, threadinfo ffff88000f644000, task ffff88000f6427c0) [ 0.605188] Stack: [ 0.605188] ffffea00003d78c0 ffffea000048a680 ffff88000f645b78 ffffffff8110b1d8 [ 0.605188] 000000009658ccc5 0000000000000100 0000000000000000 00000000000001ff [ 0.605188] 00000000004d9fff 00000000004da000 00000000004d9fff ffff88000f62f000 [ 0.605188] Call Trace: [ 0.605188] [] unmap_page_range+0x4a8/0x730 [ 0.605188] [] unmap_single_vma+0x63/0xb0 [ 0.605188] [] ? put_pages_list+0x30/0x30 [ 0.605188] [] unmap_vmas+0x5e/0xb0 [ 0.605188] [] exit_mmap+0x97/0x140 [ 0.605188] [] mmput+0x73/0xf0 [ 0.605188] [] flush_old_exec+0x3ed/0x720 [ 0.605188] [] load_elf_binary+0x31e/0x1840 [ 0.605188] [] ? load_elf_library+0x200/0x200 [ 0.605188] [] search_binary_handler+0xe7/0x2f0 [ 0.605188] [] do_execve_common.isra.32+0x3e3/0x4b0 [ 0.605188] [] do_execve+0x16/0x20 [ 0.605188] [] sys_execve+0x42/0x70 [ 0.605188] [] stub_execve+0x6c/0xc0 [ 0.605188] Code: 8b 47 10 48 8b 10 48 85 d2 74 0c 48 89 53 10 8b 42 0c 8b 52 08 eb bd 31 f6 bf 00 02 00 00 e8 d4 87 fe ff 48 85 c0 48 89 c2 74 1e <48> c7 00 00 00 00 00 c7 40 08 00 00 00 00 c7 40 0c fe 01 00 00 [ 0.605188] RIP [] __tlb_remove_page+0x84/0xb0 [ 0.605188] RSP [ 0.605188] CR2: ffff88000f66d000 [ 0.605188] ---[ end trace 555e8456cfdd3999 ]--- [ 0.634427] ------------[ cut here ]------------ [ 0.634435] kernel BUG at /rw/home/user/qubes/qubes-builder/qubes-src/kernel/kernel-3.4.12/linux-3.4.12/arch/x86/kernel/paravirt.c:244! [ 0.634445] invalid opcode: 0000 [#2] SMP DEBUG_PAGEALLOC [ 0.634451] CPU 5 [ 0.634453] Modules linked in: [ 0.634458] [ 0.634462] Pid: 60, comm: init Tainted: G D 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64 #1 [ 0.634472] RIP: e030:[] [] enter_lazy.part.4+0x4/0x6 [ 0.634483] RSP: e02b:ffff88000f645488 EFLAGS: 00010202 [ 0.634489] RAX: 0000000000000001 RBX: ffff88000f664c68 RCX: 00003ffffffff000 [ 0.634496] RDX: 0000000000000006 RSI: ffffea00003d9a80 RDI: ffffea00003d9ab0 [ 0.634502] RBP: ffff88000f645488 R08: 0000000000000000 R09: 0000000000000000 [ 0.634508] R10: ffffffff81871d00 R11: 0000000000000001 R12: ffff88000f669ff8 [ 0.634514] R13: ffff88000f664c68 R14: ffff88000f66afe8 R15: 00007fffffffd000 [ 0.634524] FS: 00007fda48c7b740(0000) GS:ffff880018d40000(0000) knlGS:0000000000000000 [ 0.634532] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 0.634537] CR2: ffff88000f66d000 CR3: 000000000180b000 CR4: 0000000000002660 [ 0.634544] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 0.634550] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 0.634557] Process init (pid: 60, threadinfo ffff88000f644000, task ffff88000f6427c0) [ 0.634564] Stack: [ 0.634567] ffff88000f645498 ffffffff81039bf2 ffff88000f645588 ffffffff8110b002 [ 0.634577] 0000000000000011 0000000000000100 0000000000000000 00000000000001ff [ 0.634586] 00007fffffffefff 00007ffffffff000 00007fffffffefff ffff88000f6657f8 [ 0.634596] Call Trace: [ 0.634602] [] paravirt_enter_lazy_mmu+0x22/0x30 [ 0.634609] [] unmap_page_range+0x2d2/0x730 [ 0.634617] [] ? release_pages+0x148/0x1c0 [ 0.634624] [] unmap_single_vma+0x63/0xb0 [ 0.634631] [] ? put_pages_list+0x30/0x30 [ 0.634637] [] unmap_vmas+0x5e/0xb0 [ 0.634644] [] exit_mmap+0x97/0x140 [ 0.634650] [] mmput+0x73/0xf0 [ 0.634657] [] exit_mm+0xfd/0x120 [ 0.634664] [] ? xen_irq_enable_direct_reloc+0x4/0x4 [ 0.634672] [] do_exit+0x164/0x8a0 [ 0.634680] [] ? _raw_spin_unlock_irqrestore+0x12/0x20 [ 0.634687] [] ? kmsg_dump+0x5a/0x100 [ 0.634694] [] oops_end+0x99/0xe0 [ 0.634700] [] no_context+0x24e/0x279 [ 0.634707] [] ? xen_pmd_val+0x9/0x10 [ 0.634713] [] __bad_area_nosemaphore+0x1ba/0x1d9 [ 0.634721] [] ? restore_args+0x30/0x30 [ 0.634727] [] bad_area_nosemaphore+0xe/0x10 [ 0.634734] [] do_page_fault+0x32b/0x4f0 [ 0.634741] [] ? pte_mfn_to_pfn+0x6a/0x100 [ 0.634748] [] ? __alloc_pages_nodemask+0x193/0x850 [ 0.634756] [] ? __d_lookup+0x7a/0x160 [ 0.634763] [] page_fault+0x25/0x30 [ 0.634769] [] ? __tlb_remove_page+0x84/0xb0 [ 0.634776] [] ? __tlb_remove_page+0x7c/0xb0 [ 0.634782] [] unmap_page_range+0x4a8/0x730 [ 0.634790] [] unmap_single_vma+0x63/0xb0 [ 0.634797] [] ? put_pages_list+0x30/0x30 [ 0.634803] [] unmap_vmas+0x5e/0xb0 [ 0.634809] [] exit_mmap+0x97/0x140 [ 0.634816] [] mmput+0x73/0xf0 [ 0.634822] [] flush_old_exec+0x3ed/0x720 [ 0.634830] [] load_elf_binary+0x31e/0x1840 [ 0.634838] [] ? load_elf_library+0x200/0x200 [ 0.634845] [] search_binary_handler+0xe7/0x2f0 [ 0.634852] [] do_execve_common.isra.32+0x3e3/0x4b0 [ 0.634858] [] do_execve+0x16/0x20 [ 0.634864] [] sys_execve+0x42/0x70 [ 0.634871] [] stub_execve+0x6c/0xc0 [ 0.634876] Code: fa 44 89 e6 48 c7 c7 a8 e3 75 81 31 c0 e8 0b 0f 00 00 48 83 c4 18 5b 41 5c 41 5d 41 5e 41 5f 5d c3 55 48 89 e5 0f 0b 55 48 89 e5 <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 41 55 41 54 53 31 db 48 85 [ 0.634932] RIP [] enter_lazy.part.4+0x4/0x6 [ 0.634938] RSP [ 0.634941] ---[ end trace 555e8456cfdd399a ]--- [ 0.634944] Fixing recursive fault but reboot is needed! ---------------------------------------------------------------------------- Regards, Alex --bcaec517a674432cbf04ce37f3eb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi,

Kernel 3.4.12 built with debugging options crashes during bootst= rap. The issue is easily reproducible and also seems to affect 3.4.18. The = "offending" debug option is 'page allocation', if I switc= h it off but leave other debugging options the kernel does not crash.

+CONFIG_DEBUG_PAGEALLOC=3Dy
+CONFIG_WANT_PAGE_DEBUG_FLAGS=3Dy
+CO= NFIG_PAGE_GUARD=3Dy

The kernel is actually built from devel-3.4 bran= ch of marmarek repo of Qubes, but all the patches are disabled, so it suppo= sed to be equivalent to vanilla kernel.

Partial error messages are below. The kernel config file and full log a= re attached.

-------------------------------------------------------= ---------------------
[=A0=A0=A0 0.575221] debug: unmapping init memory = ffffffff81879000..ffffffff81913000
[=A0=A0=A0 0.575474] Write protecting the kernel read-only data: 8192k
[= =A0=A0=A0 0.579226] debug: unmapping init memory ffff880001469000..ffff8800= 01600000
[=A0=A0=A0 0.579825] debug: unmapping init memory ffff8800017fc= 000..ffff880001800000
[=A0=A0=A0 0.601666] BUG: unable to handle kernel paging request at ffff880= 00f66d000
[=A0=A0=A0 0.601678] IP: [<ffffffff81109c64>] __tlb_remo= ve_page+0x84/0xb0
[=A0=A0=A0 0.601689] PGD 180c067 PUD 1810067 PMD 86106= 7 PTE 801000000f66d064
[=A0=A0=A0 0.601698] Oops: 0002 [#1] SMP DEBUG_PAGEALLOC
[=A0=A0=A0 0.60= 1705] CPU 5
[=A0=A0=A0 0.601708] Modules linked in:
[=A0=A0=A0 0.601= 713]
[=A0=A0=A0 0.601717] Pid: 60, comm: init Not tainted 3.4.12-1allde= bugnopvusb.pvops.qubes.x86_64 #1=A0
[=A0=A0=A0 0.601726] RIP: e030:[<ffffffff81109c64>]=A0 [<ffffffff8= 1109c64>] __tlb_remove_page+0x84/0xb0
[=A0=A0=A0 0.601736] RSP: e02b:= ffff88000f645a78=A0 EFLAGS: 00010286
[=A0=A0=A0 0.601741] RAX: ffff88000= f66d000 RBX: ffff88000f645c30 RCX: 0000000000000000
[=A0=A0=A0 0.601747] RDX: ffff88000f66d000 RSI: 0000000000000010 RDI: 00000= 00000000200
[=A0=A0=A0 0.601754] RBP: ffff88000f645a88 R08: 000000000000= 0000 R09: ffff880000000000
[=A0=A0=A0 0.601760] R10: 0000000000000001 R1= 1: 00000000581c6204 R12: ffff88000f62ec68
[=A0=A0=A0 0.601766] R13: 0000000193e49125 R14: ffff88000f5e3150 R15: 00000= 0000042a000
[=A0=A0=A0 0.601777] FS:=A0 00007fda48c7b740(0000) GS:ffff88= 0018d40000(0000) knlGS:0000000000000000
[=A0=A0=A0 0.601784] CS:=A0 e033= DS: 0000 ES: 0000 CR0: 000000008005003b
[=A0=A0=A0 0.605188] CR2: ffff88000f66d000 CR3: 000000000f665000 CR4: 00000= 00000002660
[=A0=A0=A0 0.605188] DR0: 0000000000000000 DR1: 000000000000= 0000 DR2: 0000000000000000
[=A0=A0=A0 0.605188] DR3: 0000000000000000 DR= 6: 00000000ffff0ff0 DR7: 0000000000000400
[=A0=A0=A0 0.605188] Process init (pid: 60, threadinfo ffff88000f644000, ta= sk ffff88000f6427c0)
[=A0=A0=A0 0.605188] Stack:
[=A0=A0=A0 0.605188]= =A0 ffffea00003d78c0 ffffea000048a680 ffff88000f645b78 ffffffff8110b1d8
= [=A0=A0=A0 0.605188]=A0 000000009658ccc5 0000000000000100 0000000000000000 = 00000000000001ff
[=A0=A0=A0 0.605188]=A0 00000000004d9fff 00000000004da000 00000000004d9fff = ffff88000f62f000
[=A0=A0=A0 0.605188] Call Trace:
[=A0=A0=A0 0.605188= ]=A0 [<ffffffff8110b1d8>] unmap_page_range+0x4a8/0x730
[=A0=A0=A0 = 0.605188]=A0 [<ffffffff8110b4c3>] unmap_single_vma+0x63/0xb0
[=A0=A0=A0 0.605188]=A0 [<ffffffff810f52b0>] ? put_pages_list+0x30/0x= 30
[=A0=A0=A0 0.605188]=A0 [<ffffffff8110bcde>] unmap_vmas+0x5e/0x= b0
[=A0=A0=A0 0.605188]=A0 [<ffffffff811131c7>] exit_mmap+0x97/0x1= 40
[=A0=A0=A0 0.605188]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0 [=A0=A0=A0 0.605188]=A0 [<ffffffff811396ad>] flush_old_exec+0x3ed/0x7= 20
[=A0=A0=A0 0.605188]=A0 [<ffffffff8117f8be>] load_elf_binary+0x= 31e/0x1840
[=A0=A0=A0 0.605188]=A0 [<ffffffff8117f5a0>] ? load_elf= _library+0x200/0x200
[=A0=A0=A0 0.605188]=A0 [<ffffffff81138dc7>] search_binary_handler+0x= e7/0x2f0
[=A0=A0=A0 0.605188]=A0 [<ffffffff8113a293>] do_execve_co= mmon.isra.32+0x3e3/0x4b0
[=A0=A0=A0 0.605188]=A0 [<ffffffff8113a376&g= t;] do_execve+0x16/0x20
[=A0=A0=A0 0.605188]=A0 [<ffffffff8101ad52>] sys_execve+0x42/0x70
= [=A0=A0=A0 0.605188]=A0 [<ffffffff81460c3c>] stub_execve+0x6c/0xc0[=A0=A0=A0 0.605188] Code: 8b 47 10 48 8b 10 48 85 d2 74 0c 48 89 53 10 8b= 42 0c 8b 52 08 eb bd 31 f6 bf 00 02 00 00 e8 d4 87 fe ff 48 85 c0 48 89 c2= 74 1e <48> c7 00 00 00 00 00 c7 40 08 00 00 00 00 c7 40 0c fe 01 00 = 00
[=A0=A0=A0 0.605188] RIP=A0 [<ffffffff81109c64>] __tlb_remove_page+0x= 84/0xb0
[=A0=A0=A0 0.605188]=A0 RSP <ffff88000f645a78>
[=A0=A0= =A0 0.605188] CR2: ffff88000f66d000
[=A0=A0=A0 0.605188] ---[ end trace = 555e8456cfdd3999 ]---
[=A0=A0=A0 0.634427] ------------[ cut here ]------------
[=A0=A0=A0 0.6= 34435] kernel BUG at /rw/home/user/qubes/qubes-builder/qubes-src/kernel/ker= nel-3.4.12/linux-3.4.12/arch/x86/kernel/paravirt.c:244!
[=A0=A0=A0 0.634= 445] invalid opcode: 0000 [#2] SMP DEBUG_PAGEALLOC
[=A0=A0=A0 0.634451] CPU 5
[=A0=A0=A0 0.634453] Modules linked in:
[= =A0=A0=A0 0.634458]
[=A0=A0=A0 0.634462] Pid: 60, comm: init Tainted: G= =A0=A0=A0=A0=A0 D=A0=A0=A0=A0=A0 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64= #1=A0
[=A0=A0=A0 0.634472] RIP: e030:[<ffffffff8144f3b7>]=A0 [&l= t;ffffffff8144f3b7>] enter_lazy.part.4+0x4/0x6
[=A0=A0=A0 0.634483] RSP: e02b:ffff88000f645488=A0 EFLAGS: 00010202
[=A0= =A0=A0 0.634489] RAX: 0000000000000001 RBX: ffff88000f664c68 RCX: 00003ffff= ffff000
[=A0=A0=A0 0.634496] RDX: 0000000000000006 RSI: ffffea00003d9a80= RDI: ffffea00003d9ab0
[=A0=A0=A0 0.634502] RBP: ffff88000f645488 R08: 0000000000000000 R09: 00000= 00000000000
[=A0=A0=A0 0.634508] R10: ffffffff81871d00 R11: 000000000000= 0001 R12: ffff88000f669ff8
[=A0=A0=A0 0.634514] R13: ffff88000f664c68 R1= 4: ffff88000f66afe8 R15: 00007fffffffd000
[=A0=A0=A0 0.634524] FS:=A0 00007fda48c7b740(0000) GS:ffff880018d40000(0000= ) knlGS:0000000000000000
[=A0=A0=A0 0.634532] CS:=A0 e033 DS: 0000 ES: 0= 000 CR0: 000000008005003b
[=A0=A0=A0 0.634537] CR2: ffff88000f66d000 CR3= : 000000000180b000 CR4: 0000000000002660
[=A0=A0=A0 0.634544] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 00000= 00000000000
[=A0=A0=A0 0.634550] DR3: 0000000000000000 DR6: 00000000ffff= 0ff0 DR7: 0000000000000400
[=A0=A0=A0 0.634557] Process init (pid: 60, t= hreadinfo ffff88000f644000, task ffff88000f6427c0)
[=A0=A0=A0 0.634564] Stack:
[=A0=A0=A0 0.634567]=A0 ffff88000f645498 fff= fffff81039bf2 ffff88000f645588 ffffffff8110b002
[=A0=A0=A0 0.634577]=A0 = 0000000000000011 0000000000000100 0000000000000000 00000000000001ff
[=A0= =A0=A0 0.634586]=A0 00007fffffffefff 00007ffffffff000 00007fffffffefff ffff= 88000f6657f8
[=A0=A0=A0 0.634596] Call Trace:
[=A0=A0=A0 0.634602]=A0 [<ffffffff81= 039bf2>] paravirt_enter_lazy_mmu+0x22/0x30
[=A0=A0=A0 0.634609]=A0 [&= lt;ffffffff8110b002>] unmap_page_range+0x2d2/0x730
[=A0=A0=A0 0.63461= 7]=A0 [<ffffffff810f5098>] ? release_pages+0x148/0x1c0
[=A0=A0=A0 0.634624]=A0 [<ffffffff8110b4c3>] unmap_single_vma+0x63/0x= b0
[=A0=A0=A0 0.634631]=A0 [<ffffffff810f52b0>] ? put_pages_list+0= x30/0x30
[=A0=A0=A0 0.634637]=A0 [<ffffffff8110bcde>] unmap_vmas+0= x5e/0xb0
[=A0=A0=A0 0.634644]=A0 [<ffffffff811131c7>] exit_mmap+0x= 97/0x140
[=A0=A0=A0 0.634650]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0
[=A0= =A0=A0 0.634657]=A0 [<ffffffff81049afd>] exit_mm+0xfd/0x120
[=A0= =A0=A0 0.634664]=A0 [<ffffffff81009dc9>] ? xen_irq_enable_direct_relo= c+0x4/0x4
[=A0=A0=A0 0.634672]=A0 [<ffffffff8104b244>] do_exit+0x1= 64/0x8a0
[=A0=A0=A0 0.634680]=A0 [<ffffffff81458c42>] ? _raw_spin_unlock_irqre= store+0x12/0x20
[=A0=A0=A0 0.634687]=A0 [<ffffffff810490fa>] ? kms= g_dump+0x5a/0x100
[=A0=A0=A0 0.634694]=A0 [<ffffffff81459eb9>] oop= s_end+0x99/0xe0
[=A0=A0=A0 0.634700]=A0 [<ffffffff8144fc9f>] no_co= ntext+0x24e/0x279
[=A0=A0=A0 0.634707]=A0 [<ffffffff81007339>] ? xen_pmd_val+0x9/0x10[=A0=A0=A0 0.634713]=A0 [<ffffffff8144fe84>] __bad_area_nosemaphore= +0x1ba/0x1d9
[=A0=A0=A0 0.634721]=A0 [<ffffffff81459169>] ? restor= e_args+0x30/0x30
[=A0=A0=A0 0.634727]=A0 [<ffffffff8144feb1>] bad_area_nosemaphore+0xe= /0x10
[=A0=A0=A0 0.634734]=A0 [<ffffffff8145c69b>] do_page_fault+0= x32b/0x4f0
[=A0=A0=A0 0.634741]=A0 [<ffffffff8100728a>] ? pte_mfn_= to_pfn+0x6a/0x100
[=A0=A0=A0 0.634748]=A0 [<ffffffff810f1cf3>] ? __alloc_pages_nodemask= +0x193/0x850
[=A0=A0=A0 0.634756]=A0 [<ffffffff8114997a>] ? __d_lo= okup+0x7a/0x160
[=A0=A0=A0 0.634763]=A0 [<ffffffff814593a5>] page_= fault+0x25/0x30
[=A0=A0=A0 0.634769]=A0 [<ffffffff81109c64>] ? __t= lb_remove_page+0x84/0xb0
[=A0=A0=A0 0.634776]=A0 [<ffffffff81109c5c>] ? __tlb_remove_page+0x7c= /0xb0
[=A0=A0=A0 0.634782]=A0 [<ffffffff8110b1d8>] unmap_page_rang= e+0x4a8/0x730
[=A0=A0=A0 0.634790]=A0 [<ffffffff8110b4c3>] unmap_s= ingle_vma+0x63/0xb0
[=A0=A0=A0 0.634797]=A0 [<ffffffff810f52b0>] ? put_pages_list+0x30/0x= 30
[=A0=A0=A0 0.634803]=A0 [<ffffffff8110bcde>] unmap_vmas+0x5e/0x= b0
[=A0=A0=A0 0.634809]=A0 [<ffffffff811131c7>] exit_mmap+0x97/0x1= 40
[=A0=A0=A0 0.634816]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0 [=A0=A0=A0 0.634822]=A0 [<ffffffff811396ad>] flush_old_exec+0x3ed/0x7= 20
[=A0=A0=A0 0.634830]=A0 [<ffffffff8117f8be>] load_elf_binary+0x= 31e/0x1840
[=A0=A0=A0 0.634838]=A0 [<ffffffff8117f5a0>] ? load_elf= _library+0x200/0x200
[=A0=A0=A0 0.634845]=A0 [<ffffffff81138dc7>] search_binary_handler+0x= e7/0x2f0
[=A0=A0=A0 0.634852]=A0 [<ffffffff8113a293>] do_execve_co= mmon.isra.32+0x3e3/0x4b0
[=A0=A0=A0 0.634858]=A0 [<ffffffff8113a376&g= t;] do_execve+0x16/0x20
[=A0=A0=A0 0.634864]=A0 [<ffffffff8101ad52>] sys_execve+0x42/0x70
= [=A0=A0=A0 0.634871]=A0 [<ffffffff81460c3c>] stub_execve+0x6c/0xc0[=A0=A0=A0 0.634876] Code: fa 44 89 e6 48 c7 c7 a8 e3 75 81 31 c0 e8 0b 0f= 00 00 48 83 c4 18 5b 41 5c 41 5d 41 5e 41 5f 5d c3 55 48 89 e5 0f 0b 55 48= 89 e5 <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 41 55 41 54 53 31 db 48 = 85
[=A0=A0=A0 0.634932] RIP=A0 [<ffffffff8144f3b7>] enter_lazy.part.4+0x= 4/0x6
[=A0=A0=A0 0.634938]=A0 RSP <ffff88000f645488>
[=A0=A0=A0= 0.634941] ---[ end trace 555e8456cfdd399a ]---
[=A0=A0=A0 0.634944] Fix= ing recursive fault but reboot is needed!
---------------------------------------------------------------------------= -

Regards,
Alex

--bcaec517a674432cbf04ce37f3eb-- --bcaec517a674432cc304ce37f3ed Content-Type: application/octet-stream; name="guest-work.log" Content-Disposition: attachment; filename="guest-work.log" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h9e6j5ne0 WyAgICAwLjAwMDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgY3B1c2V0DQpbICAgIDAu MDAwMDAwXSBJbml0aWFsaXppbmcgY2dyb3VwIHN1YnN5cyBjcHUNClsgICAgMC4wMDAwMDBdIExp bnV4IHZlcnNpb24gMy40LjEyLTFhbGxkZWJ1Z25vcHZ1c2IucHZvcHMucXViZXMueDg2XzY0ICh1 c2VyQHFkdnApIChnY2MgdmVyc2lvbiA0LjcuMiAyMDEyMDkyMSAoUmVkIEhhdCA0LjcuMi0yKSAo R0NDKSApICMxIFNNUCBTdW4gTm92IDExIDExOjU0OjEwIENFVCAyMDEyDQpbICAgIDAuMDAwMDAw XSBDb21tYW5kIGxpbmU6IHJvb3Q9L2Rldi9tYXBwZXIvZG1yb290IHJvIG5vbW9kZXNldCBjb25z b2xlPWh2YzAgcmRfTk9fUExZTU9VVEggMyANClsgICAgMC4wMDAwMDBdIEFDUEkgaW4gdW5wcml2 aWxlZ2VkIGRvbWFpbiBkaXNhYmxlZA0KWyAgICAwLjAwMDAwMF0gUmVsZWFzZWQgMCBwYWdlcyBv ZiB1bnVzZWQgbWVtb3J5DQpbICAgIDAuMDAwMDAwXSBTZXQgMCBwYWdlKHMpIHRvIDEtMSBtYXBw aW5nDQpbICAgIDAuMDAwMDAwXSBCSU9TLXByb3ZpZGVkIHBoeXNpY2FsIFJBTSBtYXA6DQpbICAg IDAuMDAwMDAwXSAgWGVuOiAwMDAwMDAwMDAwMDAwMDAwIC0gMDAwMDAwMDAwMDBhMDAwMCAodXNh YmxlKQ0KWyAgICAwLjAwMDAwMF0gIFhlbjogMDAwMDAwMDAwMDBhMDAwMCAtIDAwMDAwMDAwMDAx MDAwMDAgKHJlc2VydmVkKQ0KWyAgICAwLjAwMDAwMF0gIFhlbjogMDAwMDAwMDAwMDEwMDAwMCAt IDAwMDAwMDAwZmU2MDAwMDAgKHVzYWJsZSkNClsgICAgMC4wMDAwMDBdIE5YIChFeGVjdXRlIERp c2FibGUpIHByb3RlY3Rpb246IGFjdGl2ZQ0KWyAgICAwLjAwMDAwMF0gRE1JIG5vdCBwcmVzZW50 IG9yIGludmFsaWQuDQpbICAgIDAuMDAwMDAwXSBObyBBR1AgYnJpZGdlIGZvdW5kDQpbICAgIDAu MDAwMDAwXSBsYXN0X3BmbiA9IDB4ZmU2MDAgbWF4X2FyY2hfcGZuID0gMHg0MDAwMDAwMDANClsg ICAgMC4wMDAwMDBdIGluaXRfbWVtb3J5X21hcHBpbmc6IDAwMDAwMDAwMDAwMDAwMDAtMDAwMDAw MDBmZTYwMDAwMA0KWyAgICAwLjAwMDAwMF0gUkFNRElTSzogMDFlMjMwMDAgLSAwMzk1MDAwMA0K WyAgICAwLjAwMDAwMF0gWm9uZSBQRk4gcmFuZ2VzOg0KWyAgICAwLjAwMDAwMF0gICBETUEgICAg ICAweDAwMDAwMDEwIC0+IDB4MDAwMDEwMDANClsgICAgMC4wMDAwMDBdICAgRE1BMzIgICAgMHgw MDAwMTAwMCAtPiAweDAwMTAwMDAwDQpbICAgIDAuMDAwMDAwXSAgIE5vcm1hbCAgIGVtcHR5DQpb ICAgIDAuMDAwMDAwXSBNb3ZhYmxlIHpvbmUgc3RhcnQgUEZOIGZvciBlYWNoIG5vZGUNClsgICAg MC4wMDAwMDBdIEVhcmx5IG1lbW9yeSBQRk4gcmFuZ2VzDQpbICAgIDAuMDAwMDAwXSAgICAgMDog MHgwMDAwMDAxMCAtPiAweDAwMDAwMGEwDQpbICAgIDAuMDAwMDAwXSAgICAgMDogMHgwMDAwMDEw MCAtPiAweDAwMGZlNjAwDQpbICAgIDAuMDAwMDAwXSBTRkk6IFNpbXBsZSBGaXJtd2FyZSBJbnRl cmZhY2UgdjAuODEgaHR0cDovL3NpbXBsZWZpcm13YXJlLm9yZw0KWyAgICAwLjAwMDAwMF0gU01Q OiBBbGxvd2luZyA4IENQVXMsIDAgaG90cGx1ZyBDUFVzDQpbICAgIDAuMDAwMDAwXSBObyBsb2Nh bCBBUElDIHByZXNlbnQNClsgICAgMC4wMDAwMDBdIEFQSUM6IGRpc2FibGUgYXBpYyBmYWNpbGl0 eQ0KWyAgICAwLjAwMDAwMF0gQVBJQzogc3dpdGNoZWQgdG8gYXBpYyBOT09QDQpbICAgIDAuMDAw MDAwXSBBbGxvY2F0aW5nIFBDSSByZXNvdXJjZXMgc3RhcnRpbmcgYXQgZmU2MDAwMDAgKGdhcDog ZmU2MDAwMDA6MWEwMDAwMCkNClsgICAgMC4wMDAwMDBdIEJvb3RpbmcgcGFyYXZpcnR1YWxpemVk IGtlcm5lbCBvbiBYZW4NClsgICAgMC4wMDAwMDBdIFhlbiB2ZXJzaW9uOiA0LjEuMiAocHJlc2Vy dmUtQUQpDQpbICAgIDAuMDAwMDAwXSBzZXR1cF9wZXJjcHU6IE5SX0NQVVM6NTEyIG5yX2NwdW1h c2tfYml0czo1MTIgbnJfY3B1X2lkczo4IG5yX25vZGVfaWRzOjENClsgICAgMC4wMDAwMDBdIFBF UkNQVTogRW1iZWRkZWQgMjggcGFnZXMvY3B1IEBmZmZmODgwMDE4YzAwMDAwIHM4MjMwNCByODE5 MiBkMjQxOTIgdTI2MjE0NA0KWyAgICAwLjAwMDAwMF0gQnVpbHQgMSB6b25lbGlzdHMgaW4gWm9u ZSBvcmRlciwgbW9iaWxpdHkgZ3JvdXBpbmcgb24uICBUb3RhbCBwYWdlczogMTAyMzUxOQ0KWyAg ICAwLjAwMDAwMF0gS2VybmVsIGNvbW1hbmQgbGluZTogcm9vdD0vZGV2L21hcHBlci9kbXJvb3Qg cm8gbm9tb2Rlc2V0IGNvbnNvbGU9aHZjMCByZF9OT19QTFlNT1VUSCAzIA0KWyAgICAwLjAwMDAw MF0gUElEIGhhc2ggdGFibGUgZW50cmllczogNDA5NiAob3JkZXI6IDMsIDMyNzY4IGJ5dGVzKQ0K WyAgICAwLjAwMDAwMF0gRGVudHJ5IGNhY2hlIGhhc2ggdGFibGUgZW50cmllczogNTI0Mjg4IChv cmRlcjogMTAsIDQxOTQzMDQgYnl0ZXMpDQpbICAgIDAuMDAwMDAwXSBJbm9kZS1jYWNoZSBoYXNo IHRhYmxlIGVudHJpZXM6IDI2MjE0NCAob3JkZXI6IDksIDIwOTcxNTIgYnl0ZXMpDQpbICAgIDAu MDAwMDAwXSBDaGVja2luZyBhcGVydHVyZS4uLg0KWyAgICAwLjAwMDAwMF0gTm8gQUdQIGJyaWRn ZSBmb3VuZA0KWyAgICAwLjAwMDAwMF0gTWVtb3J5OiAyODkwNDhrLzQxNjc2ODBrIGF2YWlsYWJs ZSAoNDQ5N2sga2VybmVsIGNvZGUsIDQ0OGsgYWJzZW50LCAzODc4MTg0ayByZXNlcnZlZCwgNDE3 MmsgZGF0YSwgNjE2ayBpbml0KQ0KWyAgICAwLjAwMDAwMF0gSGllcmFyY2hpY2FsIFJDVSBpbXBs ZW1lbnRhdGlvbi4NClsgICAgMC4wMDAwMDBdIAlSQ1UgZHludGljay1pZGxlIGdyYWNlLXBlcmlv ZCBhY2NlbGVyYXRpb24gaXMgZW5hYmxlZC4NClsgICAgMC4wMDAwMDBdIE5SX0lSUVM6MzMwMjQg bnJfaXJxczozMzYgMTYNClsgICAgMC4wMDAwMDBdIGttZW1sZWFrOiBLZXJuZWwgbWVtb3J5IGxl YWsgZGV0ZWN0b3IgZGlzYWJsZWQNClsgICAgMC4wMDAwMDBdIENvbnNvbGU6IGNvbG91ciBkdW1t eSBkZXZpY2UgODB4MjUNClsgICAgMC4wMDAwMDBdIGNvbnNvbGUgW3R0eTBdIGVuYWJsZWQNClsg ICAgMC4wMDAwMDBdIGNvbnNvbGUgW2h2YzBdIGVuYWJsZWQNClsgICAgMC4wMDAwMDBdIGttZW1s ZWFrOiBFYXJseSBsb2cgYnVmZmVyIGV4Y2VlZGVkICg2NTYpLCBwbGVhc2UgaW5jcmVhc2UgREVC VUdfS01FTUxFQUtfRUFSTFlfTE9HX1NJWkUNClsgICAgMC4wMDAwMDBdIGluc3RhbGxpbmcgWGVu IHRpbWVyIGZvciBDUFUgMA0KWyAgICAwLjAwMDAwMF0gRGV0ZWN0ZWQgMTcyOS4wNTQgTUh6IHBy b2Nlc3Nvci4NClsgICAgMC4wMDQwMDBdIENhbGlicmF0aW5nIGRlbGF5IGxvb3AgKHNraXBwZWQp LCB2YWx1ZSBjYWxjdWxhdGVkIHVzaW5nIHRpbWVyIGZyZXF1ZW5jeS4uIDM0NTguMTAgQm9nb01J UFMgKGxwaj02OTE2MjE2KQ0KWyAgICAwLjAwNDAwMF0gcGlkX21heDogZGVmYXVsdDogMzI3Njgg bWluaW11bTogMzAxDQpbICAgIDAuMDA0MDAwXSBNb3VudC1jYWNoZSBoYXNoIHRhYmxlIGVudHJp ZXM6IDI1Ng0KWyAgICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgY3B1YWNj dA0KWyAgICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgZGV2aWNlcw0KWyAg ICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgZnJlZXplcg0KWyAgICAwLjAw NDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgbmV0X2Nscw0KWyAgICAwLjAwNDAwMF0g SW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgYmxraW8NClsgICAgMC4wMDQwMDBdIENQVTogUGh5 c2ljYWwgUHJvY2Vzc29yIElEOiAwDQpbICAgIDAuMDA0MDAwXSBDUFU6IFByb2Nlc3NvciBDb3Jl IElEOiAwDQpbICAgIDAuMDA0MDAwXSBTTVAgYWx0ZXJuYXRpdmVzOiBzd2l0Y2hpbmcgdG8gVVAg Y29kZQ0KWyAgICAwLjA1MjgxN10gUGVyZm9ybWFuY2UgRXZlbnRzOiB1bnN1cHBvcnRlZCBwNiBD UFUgbW9kZWwgMzAgbm8gUE1VIGRyaXZlciwgc29mdHdhcmUgZXZlbnRzIG9ubHkuDQpbICAgIDAu MDU0NTAwXSBOTUkgd2F0Y2hkb2c6IGRpc2FibGVkIChjcHUwKTogaGFyZHdhcmUgZXZlbnRzIG5v dCBlbmFibGVkDQpbICAgIDAuMDU2OTI2XSBpbnN0YWxsaW5nIFhlbiB0aW1lciBmb3IgQ1BVIDEN ClsgICAgMC4wNTcwNDldIFNNUCBhbHRlcm5hdGl2ZXM6IHN3aXRjaGluZyB0byBTTVAgY29kZQ0K WyAgICAwLjEyMDg0MF0gTk1JIHdhdGNoZG9nOiBkaXNhYmxlZCAoY3B1MSk6IGhhcmR3YXJlIGV2 ZW50cyBub3QgZW5hYmxlZA0KWyAgICAwLjEyNDIyN10gaW5zdGFsbGluZyBYZW4gdGltZXIgZm9y IENQVSAyDQpbICAgIDAuMTI0NzI5XSBOTUkgd2F0Y2hkb2c6IGRpc2FibGVkIChjcHUyKTogaGFy ZHdhcmUgZXZlbnRzIG5vdCBlbmFibGVkDQpbICAgIDAuMTI3OTEwXSBpbnN0YWxsaW5nIFhlbiB0 aW1lciBmb3IgQ1BVIDMNClsgICAgMC4xMjg0NzddIE5NSSB3YXRjaGRvZzogZGlzYWJsZWQgKGNw dTMpOiBoYXJkd2FyZSBldmVudHMgbm90IGVuYWJsZWQNClsgICAgMC4xMzA5NTldIGluc3RhbGxp bmcgWGVuIHRpbWVyIGZvciBDUFUgNA0KWyAgICAwLjEzMTMwOV0gTk1JIHdhdGNoZG9nOiBkaXNh YmxlZCAoY3B1NCk6IGhhcmR3YXJlIGV2ZW50cyBub3QgZW5hYmxlZA0KWyAgICAwLjEzNDUwMl0g aW5zdGFsbGluZyBYZW4gdGltZXIgZm9yIENQVSA1DQpbICAgIDAuMTM1MTE1XSBOTUkgd2F0Y2hk b2c6IGRpc2FibGVkIChjcHU1KTogaGFyZHdhcmUgZXZlbnRzIG5vdCBlbmFibGVkDQpbICAgIDAu MTM4MDQ3XSBpbnN0YWxsaW5nIFhlbiB0aW1lciBmb3IgQ1BVIDYNClsgICAgMC4xMzg1OTJdIE5N SSB3YXRjaGRvZzogZGlzYWJsZWQgKGNwdTYpOiBoYXJkd2FyZSBldmVudHMgbm90IGVuYWJsZWQN ClsgICAgMC4xNDExMjddIGluc3RhbGxpbmcgWGVuIHRpbWVyIGZvciBDUFUgNw0KWyAgICAwLjE0 MTczNl0gTk1JIHdhdGNoZG9nOiBkaXNhYmxlZCAoY3B1Nyk6IGhhcmR3YXJlIGV2ZW50cyBub3Qg ZW5hYmxlZA0KWyAgICAwLjE0MTk0MF0gQnJvdWdodCB1cCA4IENQVXMNClsgICAgMC4xNDQ1NDVd IGRldnRtcGZzOiBpbml0aWFsaXplZA0KWyAgICAwLjE1NDExMl0gR3JhbnQgdGFibGVzIHVzaW5n IHZlcnNpb24gMiBsYXlvdXQuDQpbICAgIDAuMTU0MTEyXSBHcmFudCB0YWJsZSBpbml0aWFsaXpl ZA0KWyAgICAwLjE1NDExMl0gZHVtbXk6IA0KWyAgICAwLjE3NDgzOV0gUlRDIHRpbWU6IDE2NTox NjU6MTY1LCBkYXRlOiAxNjUvMTY1LzY1DQpbICAgIDAuMTc1NjYzXSBORVQ6IFJlZ2lzdGVyZWQg cHJvdG9jb2wgZmFtaWx5IDE2DQpbICAgIDAuMTc2NTgwXSBQQ0k6IHNldHRpbmcgdXAgWGVuIFBD SSBmcm9udGVuZCBzdHViDQpbICAgIDAuMTgxMzQ5XSBiaW86IGNyZWF0ZSBzbGFiIDxiaW8tMD4g YXQgMA0KWyAgICAwLjE4NDA2N10gQUNQSTogSW50ZXJwcmV0ZXIgZGlzYWJsZWQuDQpbICAgIDAu MTg0MDkzXSB4ZW4vYmFsbG9vbjogSW5pdGlhbGlzaW5nIGJhbGxvb24gZHJpdmVyLg0KWyAgICAw LjIwMTEwN10geGVuLWJhbGxvb246IEluaXRpYWxpc2luZyBiYWxsb29uIGRyaXZlci4NClsgICAg MC4yMDQwNjddIHZnYWFyYjogbG9hZGVkDQpbICAgIDAuMjA0NTE3XSBQQ0k6IFN5c3RlbSBkb2Vz IG5vdCBzdXBwb3J0IFBDSQ0KWyAgICAwLjIwNDUxN10gUENJOiBTeXN0ZW0gZG9lcyBub3Qgc3Vw cG9ydCBQQ0kNClsgICAgMC4yMDQ2MTFdIFN3aXRjaGluZyB0byBjbG9ja3NvdXJjZSB4ZW4NClsg ICAgMC4yNTIxMzVdIHBucDogUG5QIEFDUEk6IGRpc2FibGVkDQpbICAgIDAuMjczMTY2XSBORVQ6 IFJlZ2lzdGVyZWQgcHJvdG9jb2wgZmFtaWx5IDINClsgICAgMC4yNzQwNzhdIElQIHJvdXRlIGNh Y2hlIGhhc2ggdGFibGUgZW50cmllczogMzI3NjggKG9yZGVyOiA2LCAyNjIxNDQgYnl0ZXMpDQpb ICAgIDAuMjc4MDMzXSBUQ1AgZXN0YWJsaXNoZWQgaGFzaCB0YWJsZSBlbnRyaWVzOiAxMzEwNzIg KG9yZGVyOiA5LCAyMDk3MTUyIGJ5dGVzKQ0KWyAgICAwLjI4MDQ5M10gVENQIGJpbmQgaGFzaCB0 YWJsZSBlbnRyaWVzOiA2NTUzNiAob3JkZXI6IDgsIDEwNDg1NzYgYnl0ZXMpDQpbICAgIDAuMjgx MzEyXSBUQ1A6IEhhc2ggdGFibGVzIGNvbmZpZ3VyZWQgKGVzdGFibGlzaGVkIDEzMTA3MiBiaW5k IDY1NTM2KQ0KWyAgICAwLjI4MTMyOF0gVENQOiByZW5vIHJlZ2lzdGVyZWQNClsgICAgMC4yODEz ODddIFVEUCBoYXNoIHRhYmxlIGVudHJpZXM6IDIwNDggKG9yZGVyOiA0LCA2NTUzNiBieXRlcykN ClsgICAgMC4yODE1MTVdIFVEUC1MaXRlIGhhc2ggdGFibGUgZW50cmllczogMjA0OCAob3JkZXI6 IDQsIDY1NTM2IGJ5dGVzKQ0KWyAgICAwLjI4Mzk0MF0gTkVUOiBSZWdpc3RlcmVkIHByb3RvY29s IGZhbWlseSAxDQpbICAgIDAuMjg0NzIzXSBVbnBhY2tpbmcgaW5pdHJhbWZzLi4uDQpbICAgIDAu NDMzOTgwXSBkZWJ1ZzogdW5tYXBwaW5nIGluaXQgbWVtb3J5IGZmZmY4ODAwMDFlMjMwMDAuLmZm ZmY4ODAwMDM5NTAwMDANClsgICAgMC40NDAxMTVdIHBsYXRmb3JtIHJ0Y19jbW9zOiByZWdpc3Rl cmVkIHBsYXRmb3JtIFJUQyBkZXZpY2UgKG5vIFBOUCBkZXZpY2UgZm91bmQpDQpbICAgIDAuNDQ4 NTYzXSBhdWRpdDogaW5pdGlhbGl6aW5nIG5ldGxpbmsgc29ja2V0IChkaXNhYmxlZCkNClsgICAg MC40NDg2ODhdIHR5cGU9MjAwMCBhdWRpdCgxMzUyNjM3NDI0LjM5NToxKTogaW5pdGlhbGl6ZWQN ClsgICAgMC40OTAxOTNdIFZGUzogRGlzayBxdW90YXMgZHF1b3RfNi41LjINClsgICAgMC40OTA0 NzldIERxdW90LWNhY2hlIGhhc2ggdGFibGUgZW50cmllczogNTEyIChvcmRlciAwLCA0MDk2IGJ5 dGVzKQ0KWyAgICAwLjQ5MjA4N10gbXNnbW5pIGhhcyBiZWVuIHNldCB0byA1NjQNClsgICAgMC40 OTMwMDldIEJsb2NrIGxheWVyIFNDU0kgZ2VuZXJpYyAoYnNnKSBkcml2ZXIgdmVyc2lvbiAwLjQg bG9hZGVkIChtYWpvciAyNTMpDQpbICAgIDAuNDkzMDIxXSBpbyBzY2hlZHVsZXIgbm9vcCByZWdp c3RlcmVkDQpbICAgIDAuNDkzMDI1XSBpbyBzY2hlZHVsZXIgZGVhZGxpbmUgcmVnaXN0ZXJlZA0K WyAgICAwLjQ5MzI2Ml0gaW8gc2NoZWR1bGVyIGNmcSByZWdpc3RlcmVkIChkZWZhdWx0KQ0KWyAg ICAwLjUwMDQ0OF0gcGNpZnJvbnQgcGNpLTA6IEluc3RhbGxpbmcgUENJIGZyb250ZW5kDQpbICAg IDAuNTAwODIxXSBwY2lmcm9udCBwY2ktMDogQ3JlYXRpbmcgUENJIEZyb250ZW5kIEJ1cyAwMDAw OjAwDQpbICAgIDAuNTAxMTA2XSBwY2lmcm9udCBwY2ktMDogUENJIGhvc3QgYnJpZGdlIHRvIGJ1 cyAwMDAwOjAwDQpbICAgIDAuNTAxMTI2XSBwY2lfYnVzIDAwMDA6MDA6IHJvb3QgYnVzIHJlc291 cmNlIFtpbyAgMHgwMDAwLTB4ZmZmZl0NClsgICAgMC41MDExMzldIHBjaV9idXMgMDAwMDowMDog cm9vdCBidXMgcmVzb3VyY2UgW21lbSAweDAwMDAwMDAwLTB4ZmZmZmZmZmZmXQ0KWyAgICAwLjUw MTk3MV0gTm9uLXZvbGF0aWxlIG1lbW9yeSBkcml2ZXIgdjEuMw0KWyAgICAwLjUwMjA5NF0gcmFt b29wczogcGxhdGZvcm0gZGV2aWNlIG5vdCBmb3VuZCwgdXNpbmcgbW9kdWxlIHBhcmFtZXRlcnMN ClsgICAgMC41MDIzMTddIHJhbW9vcHM6IFRoZSBtZW1vcnkgc2l6ZSBhbmQgdGhlIHJlY29yZCBz aXplIG11c3QgYmUgbm9uLXplcm8NClsgICAgMC41MDIzNDVdIHJhbW9vcHM6IHByb2JlIG9mIHJh bW9vcHMgZmFpbGVkIHdpdGggZXJyb3IgLTIyDQpbICAgIDAuNTA2ODQwXSBsb29wOiBtb2R1bGUg bG9hZGVkDQpbICAgIDAuNTA2OTcxXSBGaXhlZCBNRElPIEJ1czogcHJvYmVkDQpbICAgIDAuNTA3 MDg1XSBpODA0MjogUE5QOiBObyBQUy8yIGNvbnRyb2xsZXIgZm91bmQuIFByb2JpbmcgcG9ydHMg ZGlyZWN0bHkuDQpbICAgIDAuNTA3OTEwXSBpODA0MjogTm8gY29udHJvbGxlciBmb3VuZA0KWyAg ICAwLjUwODE4NV0gbW91c2VkZXY6IFBTLzIgbW91c2UgZGV2aWNlIGNvbW1vbiBmb3IgYWxsIG1p Y2UNClsgICAgMC41Njg0NTZdIHJ0Y19jbW9zIHJ0Y19jbW9zOiBydGMgY29yZTogcmVnaXN0ZXJl ZCBydGNfY21vcyBhcyBydGMwDQpbICAgIDAuNTY4NjIzXSBydGNfY21vczogcHJvYmUgb2YgcnRj X2Ntb3MgZmFpbGVkIHdpdGggZXJyb3IgLTM4DQpbICAgIDAuNTY5NzQxXSBkZXZpY2UtbWFwcGVy OiB1ZXZlbnQ6IHZlcnNpb24gMS4wLjMNClsgICAgMC41NzAzNzRdIGRldmljZS1tYXBwZXI6IGlv Y3RsOiA0LjIyLjAtaW9jdGwgKDIwMTEtMTAtMTkpIGluaXRpYWxpc2VkOiBkbS1kZXZlbEByZWRo YXQuY29tDQpbICAgIDAuNTcwNzg3XSBUQ1A6IGN1YmljIHJlZ2lzdGVyZWQNClsgICAgMC41NzE3 OTldIE5FVDogUmVnaXN0ZXJlZCBwcm90b2NvbCBmYW1pbHkgMTANClsgICAgMC41NzMzNjBdIFJl Z2lzdGVyaW5nIHRoZSBkbnNfcmVzb2x2ZXIga2V5IHR5cGUNClsgICAgMC41NzQxODVdIHJlZ2lz dGVyZWQgdGFza3N0YXRzIHZlcnNpb24gMQ0KWyAgICAwLjU3NDIyN10gWEVOQlVTOiBEZXZpY2Ug d2l0aCBubyBkcml2ZXI6IGRldmljZS92YmQvNTE3MTINClsgICAgMC41NzQyMzNdIFhFTkJVUzog RGV2aWNlIHdpdGggbm8gZHJpdmVyOiBkZXZpY2UvdmJkLzUxNzI4DQpbICAgIDAuNTc0MjM4XSBY RU5CVVM6IERldmljZSB3aXRoIG5vIGRyaXZlcjogZGV2aWNlL3ZiZC81MTc0NA0KWyAgICAwLjU3 NDI0M10gWEVOQlVTOiBEZXZpY2Ugd2l0aCBubyBkcml2ZXI6IGRldmljZS92YmQvNTE3NjANClsg ICAgMC41NzQyNDddIFhFTkJVUzogRGV2aWNlIHdpdGggbm8gZHJpdmVyOiBkZXZpY2UvdmlmLzAN ClsgICAgMC41NzQ1NDFdICAgTWFnaWMgbnVtYmVyOiAxOjI1MjozMTQxDQpbICAgIDAuNTc0NjA0 XSAvcncvaG9tZS91c2VyL3F1YmVzL3F1YmVzLWJ1aWxkZXIvcXViZXMtc3JjL2tlcm5lbC9rZXJu ZWwtMy40LjEyL2xpbnV4LTMuNC4xMi9kcml2ZXJzL3J0Yy9oY3Rvc3lzLmM6IHVuYWJsZSB0byBv cGVuIHJ0YyBkZXZpY2UgKHJ0YzApDQpbICAgIDAuNTc1MjIxXSBkZWJ1ZzogdW5tYXBwaW5nIGlu aXQgbWVtb3J5IGZmZmZmZmZmODE4NzkwMDAuLmZmZmZmZmZmODE5MTMwMDANClsgICAgMC41NzU0 NzRdIFdyaXRlIHByb3RlY3RpbmcgdGhlIGtlcm5lbCByZWFkLW9ubHkgZGF0YTogODE5MmsNClsg ICAgMC41NzkyMjZdIGRlYnVnOiB1bm1hcHBpbmcgaW5pdCBtZW1vcnkgZmZmZjg4MDAwMTQ2OTAw MC4uZmZmZjg4MDAwMTYwMDAwMA0KWyAgICAwLjU3OTgyNV0gZGVidWc6IHVubWFwcGluZyBpbml0 IG1lbW9yeSBmZmZmODgwMDAxN2ZjMDAwLi5mZmZmODgwMDAxODAwMDAwDQpbICAgIDAuNjAxNjY2 XSBCVUc6IHVuYWJsZSB0byBoYW5kbGUga2VybmVsIHBhZ2luZyByZXF1ZXN0IGF0IGZmZmY4ODAw MGY2NmQwMDANClsgICAgMC42MDE2NzhdIElQOiBbPGZmZmZmZmZmODExMDljNjQ+XSBfX3RsYl9y ZW1vdmVfcGFnZSsweDg0LzB4YjANClsgICAgMC42MDE2ODldIFBHRCAxODBjMDY3IFBVRCAxODEw MDY3IFBNRCA4NjEwNjcgUFRFIDgwMTAwMDAwMGY2NmQwNjQNClsgICAgMC42MDE2OThdIE9vcHM6 IDAwMDIgWyMxXSBTTVAgREVCVUdfUEFHRUFMTE9DDQpbICAgIDAuNjAxNzA1XSBDUFUgNSANClsg ICAgMC42MDE3MDhdIE1vZHVsZXMgbGlua2VkIGluOg0KWyAgICAwLjYwMTcxM10gDQpbICAgIDAu NjAxNzE3XSBQaWQ6IDYwLCBjb21tOiBpbml0IE5vdCB0YWludGVkIDMuNC4xMi0xYWxsZGVidWdu b3B2dXNiLnB2b3BzLnF1YmVzLng4Nl82NCAjMSAgDQpbICAgIDAuNjAxNzI2XSBSSVA6IGUwMzA6 WzxmZmZmZmZmZjgxMTA5YzY0Pl0gIFs8ZmZmZmZmZmY4MTEwOWM2ND5dIF9fdGxiX3JlbW92ZV9w YWdlKzB4ODQvMHhiMA0KWyAgICAwLjYwMTczNl0gUlNQOiBlMDJiOmZmZmY4ODAwMGY2NDVhNzgg IEVGTEFHUzogMDAwMTAyODYNClsgICAgMC42MDE3NDFdIFJBWDogZmZmZjg4MDAwZjY2ZDAwMCBS Qlg6IGZmZmY4ODAwMGY2NDVjMzAgUkNYOiAwMDAwMDAwMDAwMDAwMDAwDQpbICAgIDAuNjAxNzQ3 XSBSRFg6IGZmZmY4ODAwMGY2NmQwMDAgUlNJOiAwMDAwMDAwMDAwMDAwMDEwIFJESTogMDAwMDAw MDAwMDAwMDIwMA0KWyAgICAwLjYwMTc1NF0gUkJQOiBmZmZmODgwMDBmNjQ1YTg4IFIwODogMDAw MDAwMDAwMDAwMDAwMCBSMDk6IGZmZmY4ODAwMDAwMDAwMDANClsgICAgMC42MDE3NjBdIFIxMDog MDAwMDAwMDAwMDAwMDAwMSBSMTE6IDAwMDAwMDAwNTgxYzYyMDQgUjEyOiBmZmZmODgwMDBmNjJl YzY4DQpbICAgIDAuNjAxNzY2XSBSMTM6IDAwMDAwMDAxOTNlNDkxMjUgUjE0OiBmZmZmODgwMDBm NWUzMTUwIFIxNTogMDAwMDAwMDAwMDQyYTAwMA0KWyAgICAwLjYwMTc3N10gRlM6ICAwMDAwN2Zk YTQ4YzdiNzQwKDAwMDApIEdTOmZmZmY4ODAwMThkNDAwMDAoMDAwMCkga25sR1M6MDAwMDAwMDAw MDAwMDAwMA0KWyAgICAwLjYwMTc4NF0gQ1M6ICBlMDMzIERTOiAwMDAwIEVTOiAwMDAwIENSMDog MDAwMDAwMDA4MDA1MDAzYg0KWyAgICAwLjYwNTE4OF0gQ1IyOiBmZmZmODgwMDBmNjZkMDAwIENS MzogMDAwMDAwMDAwZjY2NTAwMCBDUjQ6IDAwMDAwMDAwMDAwMDI2NjANClsgICAgMC42MDUxODhd IERSMDogMDAwMDAwMDAwMDAwMDAwMCBEUjE6IDAwMDAwMDAwMDAwMDAwMDAgRFIyOiAwMDAwMDAw MDAwMDAwMDAwDQpbICAgIDAuNjA1MTg4XSBEUjM6IDAwMDAwMDAwMDAwMDAwMDAgRFI2OiAwMDAw MDAwMGZmZmYwZmYwIERSNzogMDAwMDAwMDAwMDAwMDQwMA0KWyAgICAwLjYwNTE4OF0gUHJvY2Vz cyBpbml0IChwaWQ6IDYwLCB0aHJlYWRpbmZvIGZmZmY4ODAwMGY2NDQwMDAsIHRhc2sgZmZmZjg4 MDAwZjY0MjdjMCkNClsgICAgMC42MDUxODhdIFN0YWNrOg0KWyAgICAwLjYwNTE4OF0gIGZmZmZl YTAwMDAzZDc4YzAgZmZmZmVhMDAwMDQ4YTY4MCBmZmZmODgwMDBmNjQ1Yjc4IGZmZmZmZmZmODEx MGIxZDgNClsgICAgMC42MDUxODhdICAwMDAwMDAwMDk2NThjY2M1IDAwMDAwMDAwMDAwMDAxMDAg MDAwMDAwMDAwMDAwMDAwMCAwMDAwMDAwMDAwMDAwMWZmDQpbICAgIDAuNjA1MTg4XSAgMDAwMDAw MDAwMDRkOWZmZiAwMDAwMDAwMDAwNGRhMDAwIDAwMDAwMDAwMDA0ZDlmZmYgZmZmZjg4MDAwZjYy ZjAwMA0KWyAgICAwLjYwNTE4OF0gQ2FsbCBUcmFjZToNClsgICAgMC42MDUxODhdICBbPGZmZmZm ZmZmODExMGIxZDg+XSB1bm1hcF9wYWdlX3JhbmdlKzB4NGE4LzB4NzMwDQpbICAgIDAuNjA1MTg4 XSAgWzxmZmZmZmZmZjgxMTBiNGMzPl0gdW5tYXBfc2luZ2xlX3ZtYSsweDYzLzB4YjANClsgICAg MC42MDUxODhdICBbPGZmZmZmZmZmODEwZjUyYjA+XSA/IHB1dF9wYWdlc19saXN0KzB4MzAvMHgz MA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTEwYmNkZT5dIHVubWFwX3ZtYXMrMHg1ZS8w eGIwDQpbICAgIDAuNjA1MTg4XSAgWzxmZmZmZmZmZjgxMTEzMWM3Pl0gZXhpdF9tbWFwKzB4OTcv MHgxNDANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODEwNDQ1YzM+XSBtbXB1dCsweDczLzB4 ZjANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODExMzk2YWQ+XSBmbHVzaF9vbGRfZXhlYysw eDNlZC8weDcyMA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTE3ZjhiZT5dIGxvYWRfZWxm X2JpbmFyeSsweDMxZS8weDE4NDANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODExN2Y1YTA+ XSA/IGxvYWRfZWxmX2xpYnJhcnkrMHgyMDAvMHgyMDANClsgICAgMC42MDUxODhdICBbPGZmZmZm ZmZmODExMzhkYzc+XSBzZWFyY2hfYmluYXJ5X2hhbmRsZXIrMHhlNy8weDJmMA0KWyAgICAwLjYw NTE4OF0gIFs8ZmZmZmZmZmY4MTEzYTI5Mz5dIGRvX2V4ZWN2ZV9jb21tb24uaXNyYS4zMisweDNl My8weDRiMA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTEzYTM3Nj5dIGRvX2V4ZWN2ZSsw eDE2LzB4MjANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODEwMWFkNTI+XSBzeXNfZXhlY3Zl KzB4NDIvMHg3MA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTQ2MGMzYz5dIHN0dWJfZXhl Y3ZlKzB4NmMvMHhjMA0KWyAgICAwLjYwNTE4OF0gQ29kZTogOGIgNDcgMTAgNDggOGIgMTAgNDgg ODUgZDIgNzQgMGMgNDggODkgNTMgMTAgOGIgNDIgMGMgOGIgNTIgMDggZWIgYmQgMzEgZjYgYmYg MDAgMDIgMDAgMDAgZTggZDQgODcgZmUgZmYgNDggODUgYzAgNDggODkgYzIgNzQgMWUgPDQ4PiBj NyAwMCAwMCAwMCAwMCAwMCBjNyA0MCAwOCAwMCAwMCAwMCAwMCBjNyA0MCAwYyBmZSAwMSAwMCAw MCANClsgICAgMC42MDUxODhdIFJJUCAgWzxmZmZmZmZmZjgxMTA5YzY0Pl0gX190bGJfcmVtb3Zl X3BhZ2UrMHg4NC8weGIwDQpbICAgIDAuNjA1MTg4XSAgUlNQIDxmZmZmODgwMDBmNjQ1YTc4Pg0K WyAgICAwLjYwNTE4OF0gQ1IyOiBmZmZmODgwMDBmNjZkMDAwDQpbICAgIDAuNjA1MTg4XSAtLS1b IGVuZCB0cmFjZSA1NTVlODQ1NmNmZGQzOTk5IF0tLS0NClsgICAgMC42MzQ0MjddIC0tLS0tLS0t LS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQ0KWyAgICAwLjYzNDQzNV0ga2VybmVsIEJVRyBh dCAvcncvaG9tZS91c2VyL3F1YmVzL3F1YmVzLWJ1aWxkZXIvcXViZXMtc3JjL2tlcm5lbC9rZXJu ZWwtMy40LjEyL2xpbnV4LTMuNC4xMi9hcmNoL3g4Ni9rZXJuZWwvcGFyYXZpcnQuYzoyNDQhDQpb ICAgIDAuNjM0NDQ1XSBpbnZhbGlkIG9wY29kZTogMDAwMCBbIzJdIFNNUCBERUJVR19QQUdFQUxM T0MNClsgICAgMC42MzQ0NTFdIENQVSA1IA0KWyAgICAwLjYzNDQ1M10gTW9kdWxlcyBsaW5rZWQg aW46DQpbICAgIDAuNjM0NDU4XSANClsgICAgMC42MzQ0NjJdIFBpZDogNjAsIGNvbW06IGluaXQg VGFpbnRlZDogRyAgICAgIEQgICAgICAzLjQuMTItMWFsbGRlYnVnbm9wdnVzYi5wdm9wcy5xdWJl cy54ODZfNjQgIzEgIA0KWyAgICAwLjYzNDQ3Ml0gUklQOiBlMDMwOls8ZmZmZmZmZmY4MTQ0ZjNi Nz5dICBbPGZmZmZmZmZmODE0NGYzYjc+XSBlbnRlcl9sYXp5LnBhcnQuNCsweDQvMHg2DQpbICAg IDAuNjM0NDgzXSBSU1A6IGUwMmI6ZmZmZjg4MDAwZjY0NTQ4OCAgRUZMQUdTOiAwMDAxMDIwMg0K WyAgICAwLjYzNDQ4OV0gUkFYOiAwMDAwMDAwMDAwMDAwMDAxIFJCWDogZmZmZjg4MDAwZjY2NGM2 OCBSQ1g6IDAwMDAzZmZmZmZmZmYwMDANClsgICAgMC42MzQ0OTZdIFJEWDogMDAwMDAwMDAwMDAw MDAwNiBSU0k6IGZmZmZlYTAwMDAzZDlhODAgUkRJOiBmZmZmZWEwMDAwM2Q5YWIwDQpbICAgIDAu NjM0NTAyXSBSQlA6IGZmZmY4ODAwMGY2NDU0ODggUjA4OiAwMDAwMDAwMDAwMDAwMDAwIFIwOTog MDAwMDAwMDAwMDAwMDAwMA0KWyAgICAwLjYzNDUwOF0gUjEwOiBmZmZmZmZmZjgxODcxZDAwIFIx MTogMDAwMDAwMDAwMDAwMDAwMSBSMTI6IGZmZmY4ODAwMGY2NjlmZjgNClsgICAgMC42MzQ1MTRd IFIxMzogZmZmZjg4MDAwZjY2NGM2OCBSMTQ6IGZmZmY4ODAwMGY2NmFmZTggUjE1OiAwMDAwN2Zm ZmZmZmZkMDAwDQpbICAgIDAuNjM0NTI0XSBGUzogIDAwMDA3ZmRhNDhjN2I3NDAoMDAwMCkgR1M6 ZmZmZjg4MDAxOGQ0MDAwMCgwMDAwKSBrbmxHUzowMDAwMDAwMDAwMDAwMDAwDQpbICAgIDAuNjM0 NTMyXSBDUzogIGUwMzMgRFM6IDAwMDAgRVM6IDAwMDAgQ1IwOiAwMDAwMDAwMDgwMDUwMDNiDQpb ICAgIDAuNjM0NTM3XSBDUjI6IGZmZmY4ODAwMGY2NmQwMDAgQ1IzOiAwMDAwMDAwMDAxODBiMDAw IENSNDogMDAwMDAwMDAwMDAwMjY2MA0KWyAgICAwLjYzNDU0NF0gRFIwOiAwMDAwMDAwMDAwMDAw MDAwIERSMTogMDAwMDAwMDAwMDAwMDAwMCBEUjI6IDAwMDAwMDAwMDAwMDAwMDANClsgICAgMC42 MzQ1NTBdIERSMzogMDAwMDAwMDAwMDAwMDAwMCBEUjY6IDAwMDAwMDAwZmZmZjBmZjAgRFI3OiAw MDAwMDAwMDAwMDAwNDAwDQpbICAgIDAuNjM0NTU3XSBQcm9jZXNzIGluaXQgKHBpZDogNjAsIHRo cmVhZGluZm8gZmZmZjg4MDAwZjY0NDAwMCwgdGFzayBmZmZmODgwMDBmNjQyN2MwKQ0KWyAgICAw LjYzNDU2NF0gU3RhY2s6DQpbICAgIDAuNjM0NTY3XSAgZmZmZjg4MDAwZjY0NTQ5OCBmZmZmZmZm ZjgxMDM5YmYyIGZmZmY4ODAwMGY2NDU1ODggZmZmZmZmZmY4MTEwYjAwMg0KWyAgICAwLjYzNDU3 N10gIDAwMDAwMDAwMDAwMDAwMTEgMDAwMDAwMDAwMDAwMDEwMCAwMDAwMDAwMDAwMDAwMDAwIDAw MDAwMDAwMDAwMDAxZmYNClsgICAgMC42MzQ1ODZdICAwMDAwN2ZmZmZmZmZlZmZmIDAwMDA3ZmZm ZmZmZmYwMDAgMDAwMDdmZmZmZmZmZWZmZiBmZmZmODgwMDBmNjY1N2Y4DQpbICAgIDAuNjM0NTk2 XSBDYWxsIFRyYWNlOg0KWyAgICAwLjYzNDYwMl0gIFs8ZmZmZmZmZmY4MTAzOWJmMj5dIHBhcmF2 aXJ0X2VudGVyX2xhenlfbW11KzB4MjIvMHgzMA0KWyAgICAwLjYzNDYwOV0gIFs8ZmZmZmZmZmY4 MTEwYjAwMj5dIHVubWFwX3BhZ2VfcmFuZ2UrMHgyZDIvMHg3MzANClsgICAgMC42MzQ2MTddICBb PGZmZmZmZmZmODEwZjUwOTg+XSA/IHJlbGVhc2VfcGFnZXMrMHgxNDgvMHgxYzANClsgICAgMC42 MzQ2MjRdICBbPGZmZmZmZmZmODExMGI0YzM+XSB1bm1hcF9zaW5nbGVfdm1hKzB4NjMvMHhiMA0K WyAgICAwLjYzNDYzMV0gIFs8ZmZmZmZmZmY4MTBmNTJiMD5dID8gcHV0X3BhZ2VzX2xpc3QrMHgz MC8weDMwDQpbICAgIDAuNjM0NjM3XSAgWzxmZmZmZmZmZjgxMTBiY2RlPl0gdW5tYXBfdm1hcysw eDVlLzB4YjANClsgICAgMC42MzQ2NDRdICBbPGZmZmZmZmZmODExMTMxYzc+XSBleGl0X21tYXAr MHg5Ny8weDE0MA0KWyAgICAwLjYzNDY1MF0gIFs8ZmZmZmZmZmY4MTA0NDVjMz5dIG1tcHV0KzB4 NzMvMHhmMA0KWyAgICAwLjYzNDY1N10gIFs8ZmZmZmZmZmY4MTA0OWFmZD5dIGV4aXRfbW0rMHhm ZC8weDEyMA0KWyAgICAwLjYzNDY2NF0gIFs8ZmZmZmZmZmY4MTAwOWRjOT5dID8geGVuX2lycV9l bmFibGVfZGlyZWN0X3JlbG9jKzB4NC8weDQNClsgICAgMC42MzQ2NzJdICBbPGZmZmZmZmZmODEw NGIyNDQ+XSBkb19leGl0KzB4MTY0LzB4OGEwDQpbICAgIDAuNjM0NjgwXSAgWzxmZmZmZmZmZjgx NDU4YzQyPl0gPyBfcmF3X3NwaW5fdW5sb2NrX2lycXJlc3RvcmUrMHgxMi8weDIwDQpbICAgIDAu NjM0Njg3XSAgWzxmZmZmZmZmZjgxMDQ5MGZhPl0gPyBrbXNnX2R1bXArMHg1YS8weDEwMA0KWyAg ICAwLjYzNDY5NF0gIFs8ZmZmZmZmZmY4MTQ1OWViOT5dIG9vcHNfZW5kKzB4OTkvMHhlMA0KWyAg ICAwLjYzNDcwMF0gIFs8ZmZmZmZmZmY4MTQ0ZmM5Zj5dIG5vX2NvbnRleHQrMHgyNGUvMHgyNzkN ClsgICAgMC42MzQ3MDddICBbPGZmZmZmZmZmODEwMDczMzk+XSA/IHhlbl9wbWRfdmFsKzB4OS8w eDEwDQpbICAgIDAuNjM0NzEzXSAgWzxmZmZmZmZmZjgxNDRmZTg0Pl0gX19iYWRfYXJlYV9ub3Nl bWFwaG9yZSsweDFiYS8weDFkOQ0KWyAgICAwLjYzNDcyMV0gIFs8ZmZmZmZmZmY4MTQ1OTE2OT5d ID8gcmVzdG9yZV9hcmdzKzB4MzAvMHgzMA0KWyAgICAwLjYzNDcyN10gIFs8ZmZmZmZmZmY4MTQ0 ZmViMT5dIGJhZF9hcmVhX25vc2VtYXBob3JlKzB4ZS8weDEwDQpbICAgIDAuNjM0NzM0XSAgWzxm ZmZmZmZmZjgxNDVjNjliPl0gZG9fcGFnZV9mYXVsdCsweDMyYi8weDRmMA0KWyAgICAwLjYzNDc0 MV0gIFs8ZmZmZmZmZmY4MTAwNzI4YT5dID8gcHRlX21mbl90b19wZm4rMHg2YS8weDEwMA0KWyAg ICAwLjYzNDc0OF0gIFs8ZmZmZmZmZmY4MTBmMWNmMz5dID8gX19hbGxvY19wYWdlc19ub2RlbWFz aysweDE5My8weDg1MA0KWyAgICAwLjYzNDc1Nl0gIFs8ZmZmZmZmZmY4MTE0OTk3YT5dID8gX19k X2xvb2t1cCsweDdhLzB4MTYwDQpbICAgIDAuNjM0NzYzXSAgWzxmZmZmZmZmZjgxNDU5M2E1Pl0g cGFnZV9mYXVsdCsweDI1LzB4MzANClsgICAgMC42MzQ3NjldICBbPGZmZmZmZmZmODExMDljNjQ+ XSA/IF9fdGxiX3JlbW92ZV9wYWdlKzB4ODQvMHhiMA0KWyAgICAwLjYzNDc3Nl0gIFs8ZmZmZmZm ZmY4MTEwOWM1Yz5dID8gX190bGJfcmVtb3ZlX3BhZ2UrMHg3Yy8weGIwDQpbICAgIDAuNjM0Nzgy XSAgWzxmZmZmZmZmZjgxMTBiMWQ4Pl0gdW5tYXBfcGFnZV9yYW5nZSsweDRhOC8weDczMA0KWyAg ICAwLjYzNDc5MF0gIFs8ZmZmZmZmZmY4MTEwYjRjMz5dIHVubWFwX3NpbmdsZV92bWErMHg2My8w eGIwDQpbICAgIDAuNjM0Nzk3XSAgWzxmZmZmZmZmZjgxMGY1MmIwPl0gPyBwdXRfcGFnZXNfbGlz dCsweDMwLzB4MzANClsgICAgMC42MzQ4MDNdICBbPGZmZmZmZmZmODExMGJjZGU+XSB1bm1hcF92 bWFzKzB4NWUvMHhiMA0KWyAgICAwLjYzNDgwOV0gIFs8ZmZmZmZmZmY4MTExMzFjNz5dIGV4aXRf bW1hcCsweDk3LzB4MTQwDQpbICAgIDAuNjM0ODE2XSAgWzxmZmZmZmZmZjgxMDQ0NWMzPl0gbW1w dXQrMHg3My8weGYwDQpbICAgIDAuNjM0ODIyXSAgWzxmZmZmZmZmZjgxMTM5NmFkPl0gZmx1c2hf b2xkX2V4ZWMrMHgzZWQvMHg3MjANClsgICAgMC42MzQ4MzBdICBbPGZmZmZmZmZmODExN2Y4YmU+ XSBsb2FkX2VsZl9iaW5hcnkrMHgzMWUvMHgxODQwDQpbICAgIDAuNjM0ODM4XSAgWzxmZmZmZmZm ZjgxMTdmNWEwPl0gPyBsb2FkX2VsZl9saWJyYXJ5KzB4MjAwLzB4MjAwDQpbICAgIDAuNjM0ODQ1 XSAgWzxmZmZmZmZmZjgxMTM4ZGM3Pl0gc2VhcmNoX2JpbmFyeV9oYW5kbGVyKzB4ZTcvMHgyZjAN ClsgICAgMC42MzQ4NTJdICBbPGZmZmZmZmZmODExM2EyOTM+XSBkb19leGVjdmVfY29tbW9uLmlz cmEuMzIrMHgzZTMvMHg0YjANClsgICAgMC42MzQ4NThdICBbPGZmZmZmZmZmODExM2EzNzY+XSBk b19leGVjdmUrMHgxNi8weDIwDQpbICAgIDAuNjM0ODY0XSAgWzxmZmZmZmZmZjgxMDFhZDUyPl0g c3lzX2V4ZWN2ZSsweDQyLzB4NzANClsgICAgMC42MzQ4NzFdICBbPGZmZmZmZmZmODE0NjBjM2M+ XSBzdHViX2V4ZWN2ZSsweDZjLzB4YzANClsgICAgMC42MzQ4NzZdIENvZGU6IGZhIDQ0IDg5IGU2 IDQ4IGM3IGM3IGE4IGUzIDc1IDgxIDMxIGMwIGU4IDBiIDBmIDAwIDAwIDQ4IDgzIGM0IDE4IDVi IDQxIDVjIDQxIDVkIDQxIDVlIDQxIDVmIDVkIGMzIDU1IDQ4IDg5IGU1IDBmIDBiIDU1IDQ4IDg5 IGU1IDwwZj4gMGIgNTUgNDggODkgZTUgMGYgMGIgNTUgNDggODkgZTUgNDEgNTUgNDEgNTQgNTMg MzEgZGIgNDggODUgDQpbICAgIDAuNjM0OTMyXSBSSVAgIFs8ZmZmZmZmZmY4MTQ0ZjNiNz5dIGVu dGVyX2xhenkucGFydC40KzB4NC8weDYNClsgICAgMC42MzQ5MzhdICBSU1AgPGZmZmY4ODAwMGY2 NDU0ODg+DQpbICAgIDAuNjM0OTQxXSAtLS1bIGVuZCB0cmFjZSA1NTVlODQ1NmNmZGQzOTlhIF0t LS0NClsgICAgMC42MzQ5NDRdIEZpeGluZyByZWN1cnNpdmUgZmF1bHQgYnV0IHJlYm9vdCBpcyBu ZWVkZWQhDQo= --bcaec517a674432cc304ce37f3ed Content-Type: application/octet-stream; name=config-pvops Content-Disposition: attachment; filename=config-pvops Content-Transfer-Encoding: base64 X-Attachment-Id: f_h9e6jk3w1 IwojIEF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZpbGU7IERPIE5PVCBFRElULgojIExpbnV4L3g4 Nl82NCAzLjQuMTggS2VybmVsIENvbmZpZ3VyYXRpb24KIwpDT05GSUdfNjRCSVQ9eQojIENPTkZJ R19YODZfMzIgaXMgbm90IHNldApDT05GSUdfWDg2XzY0PXkKQ09ORklHX1g4Nj15CkNPTkZJR19J TlNUUlVDVElPTl9ERUNPREVSPXkKQ09ORklHX09VVFBVVF9GT1JNQVQ9ImVsZjY0LXg4Ni02NCIK Q09ORklHX0FSQ0hfREVGQ09ORklHPSJhcmNoL3g4Ni9jb25maWdzL3g4Nl82NF9kZWZjb25maWci CkNPTkZJR19HRU5FUklDX0NNT1NfVVBEQVRFPXkKQ09ORklHX0NMT0NLU09VUkNFX1dBVENIRE9H PXkKQ09ORklHX0dFTkVSSUNfQ0xPQ0tFVkVOVFM9eQpDT05GSUdfQVJDSF9DTE9DS1NPVVJDRV9E QVRBPXkKQ09ORklHX0dFTkVSSUNfQ0xPQ0tFVkVOVFNfQlJPQURDQVNUPXkKQ09ORklHX0xPQ0tE RVBfU1VQUE9SVD15CkNPTkZJR19TVEFDS1RSQUNFX1NVUFBPUlQ9eQpDT05GSUdfSEFWRV9MQVRF TkNZVE9QX1NVUFBPUlQ9eQpDT05GSUdfTU1VPXkKQ09ORklHX05FRURfRE1BX01BUF9TVEFURT15 CkNPTkZJR19ORUVEX1NHX0RNQV9MRU5HVEg9eQpDT05GSUdfR0VORVJJQ19JU0FfRE1BPXkKQ09O RklHX0dFTkVSSUNfQlVHPXkKQ09ORklHX0dFTkVSSUNfQlVHX1JFTEFUSVZFX1BPSU5URVJTPXkK Q09ORklHX0dFTkVSSUNfSFdFSUdIVD15CkNPTkZJR19HRU5FUklDX0dQSU89eQpDT05GSUdfQVJD SF9NQVlfSEFWRV9QQ19GREM9eQojIENPTkZJR19SV1NFTV9HRU5FUklDX1NQSU5MT0NLIGlzIG5v dCBzZXQKQ09ORklHX1JXU0VNX1hDSEdBRERfQUxHT1JJVEhNPXkKQ09ORklHX0FSQ0hfSEFTX0NQ VV9JRExFX1dBSVQ9eQpDT05GSUdfR0VORVJJQ19DQUxJQlJBVEVfREVMQVk9eQpDT05GSUdfR0VO RVJJQ19USU1FX1ZTWVNDQUxMPXkKQ09ORklHX0FSQ0hfSEFTX0NQVV9SRUxBWD15CkNPTkZJR19B UkNIX0hBU19ERUZBVUxUX0lETEU9eQpDT05GSUdfQVJDSF9IQVNfQ0FDSEVfTElORV9TSVpFPXkK Q09ORklHX0FSQ0hfSEFTX0NQVV9BVVRPUFJPQkU9eQpDT05GSUdfSEFWRV9TRVRVUF9QRVJfQ1BV X0FSRUE9eQpDT05GSUdfTkVFRF9QRVJfQ1BVX0VNQkVEX0ZJUlNUX0NIVU5LPXkKQ09ORklHX05F RURfUEVSX0NQVV9QQUdFX0ZJUlNUX0NIVU5LPXkKQ09ORklHX0FSQ0hfSElCRVJOQVRJT05fUE9T U0lCTEU9eQpDT05GSUdfQVJDSF9TVVNQRU5EX1BPU1NJQkxFPXkKQ09ORklHX1pPTkVfRE1BMzI9 eQpDT05GSUdfQVVESVRfQVJDSD15CkNPTkZJR19BUkNIX1NVUFBPUlRTX09QVElNSVpFRF9JTkxJ TklORz15CkNPTkZJR19BUkNIX1NVUFBPUlRTX0RFQlVHX1BBR0VBTExPQz15CkNPTkZJR19IQVZF X0lOVEVMX1RYVD15CkNPTkZJR19YODZfNjRfU01QPXkKQ09ORklHX1g4Nl9IVD15CkNPTkZJR19B UkNIX0hXRUlHSFRfQ0ZMQUdTPSItZmNhbGwtc2F2ZWQtcmRpIC1mY2FsbC1zYXZlZC1yc2kgLWZj YWxsLXNhdmVkLXJkeCAtZmNhbGwtc2F2ZWQtcmN4IC1mY2FsbC1zYXZlZC1yOCAtZmNhbGwtc2F2 ZWQtcjkgLWZjYWxsLXNhdmVkLXIxMCAtZmNhbGwtc2F2ZWQtcjExIgojIENPTkZJR19LVElNRV9T Q0FMQVIgaXMgbm90IHNldApDT05GSUdfQVJDSF9DUFVfUFJPQkVfUkVMRUFTRT15CkNPTkZJR19E RUZDT05GSUdfTElTVD0iL2xpYi9tb2R1bGVzLyRVTkFNRV9SRUxFQVNFLy5jb25maWciCkNPTkZJ R19IQVZFX0lSUV9XT1JLPXkKQ09ORklHX0lSUV9XT1JLPXkKCiMKIyBHZW5lcmFsIHNldHVwCiMK Q09ORklHX0VYUEVSSU1FTlRBTD15CkNPTkZJR19JTklUX0VOVl9BUkdfTElNSVQ9MzIKQ09ORklH X0NST1NTX0NPTVBJTEU9IiIKQ09ORklHX0xPQ0FMVkVSU0lPTj0iLTEucHZvcHMucXViZXMueDg2 XzY0IgojIENPTkZJR19MT0NBTFZFUlNJT05fQVVUTyBpcyBub3Qgc2V0CkNPTkZJR19IQVZFX0tF Uk5FTF9HWklQPXkKQ09ORklHX0hBVkVfS0VSTkVMX0JaSVAyPXkKQ09ORklHX0hBVkVfS0VSTkVM X0xaTUE9eQpDT05GSUdfSEFWRV9LRVJORUxfWFo9eQpDT05GSUdfSEFWRV9LRVJORUxfTFpPPXkK Q09ORklHX0tFUk5FTF9HWklQPXkKIyBDT05GSUdfS0VSTkVMX0JaSVAyIGlzIG5vdCBzZXQKIyBD T05GSUdfS0VSTkVMX0xaTUEgaXMgbm90IHNldAojIENPTkZJR19LRVJORUxfWFogaXMgbm90IHNl dAojIENPTkZJR19LRVJORUxfTFpPIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfSE9TVE5BTUU9 Iihub25lKSIKQ09ORklHX1NXQVA9eQpDT05GSUdfU1lTVklQQz15CkNPTkZJR19TWVNWSVBDX1NZ U0NUTD15CkNPTkZJR19QT1NJWF9NUVVFVUU9eQpDT05GSUdfUE9TSVhfTVFVRVVFX1NZU0NUTD15 CkNPTkZJR19CU0RfUFJPQ0VTU19BQ0NUPXkKQ09ORklHX0JTRF9QUk9DRVNTX0FDQ1RfVjM9eQoj IENPTkZJR19GSEFORExFIGlzIG5vdCBzZXQKQ09ORklHX1RBU0tTVEFUUz15CkNPTkZJR19UQVNL X0RFTEFZX0FDQ1Q9eQpDT05GSUdfVEFTS19YQUNDVD15CkNPTkZJR19UQVNLX0lPX0FDQ09VTlRJ Tkc9eQpDT05GSUdfQVVESVQ9eQpDT05GSUdfQVVESVRTWVNDQUxMPXkKQ09ORklHX0FVRElUX1dB VENIPXkKQ09ORklHX0FVRElUX1RSRUU9eQpDT05GSUdfQVVESVRfTE9HSU5VSURfSU1NVVRBQkxF PXkKQ09ORklHX0hBVkVfR0VORVJJQ19IQVJESVJRUz15CgojCiMgSVJRIHN1YnN5c3RlbQojCkNP TkZJR19HRU5FUklDX0hBUkRJUlFTPXkKQ09ORklHX0dFTkVSSUNfSVJRX1BST0JFPXkKQ09ORklH X0dFTkVSSUNfSVJRX1NIT1c9eQpDT05GSUdfR0VORVJJQ19QRU5ESU5HX0lSUT15CkNPTkZJR19H RU5FUklDX0lSUV9DSElQPXkKQ09ORklHX0lSUV9GT1JDRURfVEhSRUFESU5HPXkKQ09ORklHX1NQ QVJTRV9JUlE9eQoKIwojIFJDVSBTdWJzeXN0ZW0KIwpDT05GSUdfVFJFRV9SQ1U9eQojIENPTkZJ R19QUkVFTVBUX1JDVSBpcyBub3Qgc2V0CkNPTkZJR19SQ1VfRkFOT1VUPTY0CiMgQ09ORklHX1JD VV9GQU5PVVRfRVhBQ1QgaXMgbm90IHNldApDT05GSUdfUkNVX0ZBU1RfTk9fSFo9eQojIENPTkZJ R19UUkVFX1JDVV9UUkFDRSBpcyBub3Qgc2V0CkNPTkZJR19JS0NPTkZJRz15CkNPTkZJR19JS0NP TkZJR19QUk9DPXkKQ09ORklHX0xPR19CVUZfU0hJRlQ9MTgKQ09ORklHX0hBVkVfVU5TVEFCTEVf U0NIRURfQ0xPQ0s9eQpDT05GSUdfQ0dST1VQUz15CiMgQ09ORklHX0NHUk9VUF9ERUJVRyBpcyBu b3Qgc2V0CkNPTkZJR19DR1JPVVBfRlJFRVpFUj15CkNPTkZJR19DR1JPVVBfREVWSUNFPXkKQ09O RklHX0NQVVNFVFM9eQpDT05GSUdfUFJPQ19QSURfQ1BVU0VUPXkKQ09ORklHX0NHUk9VUF9DUFVB Q0NUPXkKQ09ORklHX1JFU09VUkNFX0NPVU5URVJTPXkKIyBDT05GSUdfQ0dST1VQX01FTV9SRVNf Q1RMUiBpcyBub3Qgc2V0CiMgQ09ORklHX0NHUk9VUF9QRVJGIGlzIG5vdCBzZXQKQ09ORklHX0NH Uk9VUF9TQ0hFRD15CkNPTkZJR19GQUlSX0dST1VQX1NDSEVEPXkKQ09ORklHX0NGU19CQU5EV0lE VEg9eQpDT05GSUdfUlRfR1JPVVBfU0NIRUQ9eQpDT05GSUdfQkxLX0NHUk9VUD15CiMgQ09ORklH X0RFQlVHX0JMS19DR1JPVVAgaXMgbm90IHNldAojIENPTkZJR19DSEVDS1BPSU5UX1JFU1RPUkUg aXMgbm90IHNldApDT05GSUdfTkFNRVNQQUNFUz15CkNPTkZJR19VVFNfTlM9eQpDT05GSUdfSVBD X05TPXkKQ09ORklHX1VTRVJfTlM9eQpDT05GSUdfUElEX05TPXkKQ09ORklHX05FVF9OUz15CiMg Q09ORklHX1NDSEVEX0FVVE9HUk9VUCBpcyBub3Qgc2V0CiMgQ09ORklHX1NZU0ZTX0RFUFJFQ0FU RUQgaXMgbm90IHNldApDT05GSUdfUkVMQVk9eQpDT05GSUdfQkxLX0RFVl9JTklUUkQ9eQpDT05G SUdfSU5JVFJBTUZTX1NPVVJDRT0iIgpDT05GSUdfUkRfR1pJUD15CkNPTkZJR19SRF9CWklQMj15 CkNPTkZJR19SRF9MWk1BPXkKQ09ORklHX1JEX1haPXkKQ09ORklHX1JEX0xaTz15CiMgQ09ORklH X0NDX09QVElNSVpFX0ZPUl9TSVpFIGlzIG5vdCBzZXQKQ09ORklHX1NZU0NUTD15CkNPTkZJR19B Tk9OX0lOT0RFUz15CiMgQ09ORklHX0VYUEVSVCBpcyBub3Qgc2V0CkNPTkZJR19VSUQxNj15CiMg Q09ORklHX1NZU0NUTF9TWVNDQUxMIGlzIG5vdCBzZXQKQ09ORklHX0tBTExTWU1TPXkKQ09ORklH X0tBTExTWU1TX0FMTD15CkNPTkZJR19IT1RQTFVHPXkKQ09ORklHX1BSSU5USz15CkNPTkZJR19C VUc9eQpDT05GSUdfRUxGX0NPUkU9eQpDT05GSUdfUENTUEtSX1BMQVRGT1JNPXkKQ09ORklHX0hB VkVfUENTUEtSX1BMQVRGT1JNPXkKQ09ORklHX0JBU0VfRlVMTD15CkNPTkZJR19GVVRFWD15CkNP TkZJR19FUE9MTD15CkNPTkZJR19TSUdOQUxGRD15CkNPTkZJR19USU1FUkZEPXkKQ09ORklHX0VW RU5URkQ9eQpDT05GSUdfU0hNRU09eQpDT05GSUdfQUlPPXkKIyBDT05GSUdfRU1CRURERUQgaXMg bm90IHNldApDT05GSUdfSEFWRV9QRVJGX0VWRU5UUz15CgojCiMgS2VybmVsIFBlcmZvcm1hbmNl IEV2ZW50cyBBbmQgQ291bnRlcnMKIwpDT05GSUdfUEVSRl9FVkVOVFM9eQojIENPTkZJR19QRVJG X0NPVU5URVJTIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfUEVSRl9VU0VfVk1BTExPQyBpcyBu b3Qgc2V0CkNPTkZJR19WTV9FVkVOVF9DT1VOVEVSUz15CkNPTkZJR19QQ0lfUVVJUktTPXkKIyBD T05GSUdfQ09NUEFUX0JSSyBpcyBub3Qgc2V0CkNPTkZJR19TTEFCPXkKIyBDT05GSUdfU0xVQiBp cyBub3Qgc2V0CkNPTkZJR19QUk9GSUxJTkc9eQpDT05GSUdfVFJBQ0VQT0lOVFM9eQpDT05GSUdf T1BST0ZJTEU9bQojIENPTkZJR19PUFJPRklMRV9FVkVOVF9NVUxUSVBMRVggaXMgbm90IHNldApD T05GSUdfSEFWRV9PUFJPRklMRT15CkNPTkZJR19PUFJPRklMRV9OTUlfVElNRVI9eQpDT05GSUdf S1BST0JFUz15CiMgQ09ORklHX0pVTVBfTEFCRUwgaXMgbm90IHNldApDT05GSUdfT1BUUFJPQkVT PXkKQ09ORklHX0hBVkVfRUZGSUNJRU5UX1VOQUxJR05FRF9BQ0NFU1M9eQpDT05GSUdfS1JFVFBS T0JFUz15CkNPTkZJR19IQVZFX0lPUkVNQVBfUFJPVD15CkNPTkZJR19IQVZFX0tQUk9CRVM9eQpD T05GSUdfSEFWRV9LUkVUUFJPQkVTPXkKQ09ORklHX0hBVkVfT1BUUFJPQkVTPXkKQ09ORklHX0hB VkVfQVJDSF9UUkFDRUhPT0s9eQpDT05GSUdfSEFWRV9ETUFfQVRUUlM9eQpDT05GSUdfVVNFX0dF TkVSSUNfU01QX0hFTFBFUlM9eQpDT05GSUdfSEFWRV9SRUdTX0FORF9TVEFDS19BQ0NFU1NfQVBJ PXkKQ09ORklHX0hBVkVfRE1BX0FQSV9ERUJVRz15CkNPTkZJR19IQVZFX0hXX0JSRUFLUE9JTlQ9 eQpDT05GSUdfSEFWRV9NSVhFRF9CUkVBS1BPSU5UU19SRUdTPXkKQ09ORklHX0hBVkVfVVNFUl9S RVRVUk5fTk9USUZJRVI9eQpDT05GSUdfSEFWRV9QRVJGX0VWRU5UU19OTUk9eQpDT05GSUdfSEFW RV9BUkNIX0pVTVBfTEFCRUw9eQpDT05GSUdfQVJDSF9IQVZFX05NSV9TQUZFX0NNUFhDSEc9eQpD T05GSUdfSEFWRV9DTVBYQ0hHX0xPQ0FMPXkKQ09ORklHX0hBVkVfQ01QWENIR19ET1VCTEU9eQpD T05GSUdfQVJDSF9XQU5UX09MRF9DT01QQVRfSVBDPXkKCiMKIyBHQ09WLWJhc2VkIGtlcm5lbCBw cm9maWxpbmcKIwojIENPTkZJR19HQ09WX0tFUk5FTCBpcyBub3Qgc2V0CiMgQ09ORklHX0hBVkVf R0VORVJJQ19ETUFfQ09IRVJFTlQgaXMgbm90IHNldApDT05GSUdfU0xBQklORk89eQpDT05GSUdf UlRfTVVURVhFUz15CkNPTkZJR19CQVNFX1NNQUxMPTAKQ09ORklHX01PRFVMRVM9eQpDT05GSUdf TU9EVUxFX0ZPUkNFX0xPQUQ9eQpDT05GSUdfTU9EVUxFX1VOTE9BRD15CkNPTkZJR19NT0RVTEVf Rk9SQ0VfVU5MT0FEPXkKQ09ORklHX01PRFZFUlNJT05TPXkKQ09ORklHX01PRFVMRV9TUkNWRVJT SU9OX0FMTD15CkNPTkZJR19TVE9QX01BQ0hJTkU9eQpDT05GSUdfQkxPQ0s9eQpDT05GSUdfQkxL X0RFVl9CU0c9eQpDT05GSUdfQkxLX0RFVl9CU0dMSUI9eQpDT05GSUdfQkxLX0RFVl9JTlRFR1JJ VFk9eQojIENPTkZJR19CTEtfREVWX1RIUk9UVExJTkcgaXMgbm90IHNldAoKIwojIFBhcnRpdGlv biBUeXBlcwojCkNPTkZJR19QQVJUSVRJT05fQURWQU5DRUQ9eQojIENPTkZJR19BQ09STl9QQVJU SVRJT04gaXMgbm90IHNldApDT05GSUdfT1NGX1BBUlRJVElPTj15CiMgQ09ORklHX0FNSUdBX1BB UlRJVElPTiBpcyBub3Qgc2V0CkNPTkZJR19BVEFSSV9QQVJUSVRJT049eQpDT05GSUdfTUFDX1BB UlRJVElPTj15CkNPTkZJR19NU0RPU19QQVJUSVRJT049eQpDT05GSUdfQlNEX0RJU0tMQUJFTD15 CiMgQ09ORklHX01JTklYX1NVQlBBUlRJVElPTiBpcyBub3Qgc2V0CkNPTkZJR19TT0xBUklTX1g4 Nl9QQVJUSVRJT049eQpDT05GSUdfVU5JWFdBUkVfRElTS0xBQkVMPXkKQ09ORklHX0xETV9QQVJU SVRJT049eQojIENPTkZJR19MRE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfU0dJX1BBUlRJVElP Tj15CkNPTkZJR19VTFRSSVhfUEFSVElUSU9OPXkKQ09ORklHX1NVTl9QQVJUSVRJT049eQpDT05G SUdfS0FSTUFfUEFSVElUSU9OPXkKQ09ORklHX0VGSV9QQVJUSVRJT049eQpDT05GSUdfU1lTVjY4 X1BBUlRJVElPTj15CkNPTkZJR19CTE9DS19DT01QQVQ9eQoKIwojIElPIFNjaGVkdWxlcnMKIwpD T05GSUdfSU9TQ0hFRF9OT09QPXkKQ09ORklHX0lPU0NIRURfREVBRExJTkU9eQpDT05GSUdfSU9T Q0hFRF9DRlE9eQpDT05GSUdfQ0ZRX0dST1VQX0lPU0NIRUQ9eQojIENPTkZJR19ERUZBVUxUX0RF QURMSU5FIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfQ0ZRPXkKIyBDT05GSUdfREVGQVVMVF9O T09QIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfSU9TQ0hFRD0iY2ZxIgpDT05GSUdfUEFEQVRB PXkKIyBDT05GSUdfSU5MSU5FX1NQSU5fVFJZTE9DSyBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElO RV9TUElOX1RSWUxPQ0tfQkggaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfU1BJTl9MT0NLIGlz IG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fTE9DS19CSCBpcyBub3Qgc2V0CiMgQ09ORklH X0lOTElORV9TUElOX0xPQ0tfSVJRIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fTE9D S19JUlFTQVZFIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fVU5MT0NLX0JIIGlzIG5v dCBzZXQKQ09ORklHX0lOTElORV9TUElOX1VOTE9DS19JUlE9eQojIENPTkZJR19JTkxJTkVfU1BJ Tl9VTkxPQ0tfSVJRUkVTVE9SRSBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9SRUFEX1RSWUxP Q0sgaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfUkVBRF9MT0NLIGlzIG5vdCBzZXQKIyBDT05G SUdfSU5MSU5FX1JFQURfTE9DS19CSCBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9SRUFEX0xP Q0tfSVJRIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1JFQURfTE9DS19JUlFTQVZFIGlzIG5v dCBzZXQKQ09ORklHX0lOTElORV9SRUFEX1VOTE9DSz15CiMgQ09ORklHX0lOTElORV9SRUFEX1VO TE9DS19CSCBpcyBub3Qgc2V0CkNPTkZJR19JTkxJTkVfUkVBRF9VTkxPQ0tfSVJRPXkKIyBDT05G SUdfSU5MSU5FX1JFQURfVU5MT0NLX0lSUVJFU1RPUkUgaXMgbm90IHNldAojIENPTkZJR19JTkxJ TkVfV1JJVEVfVFJZTE9DSyBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9XUklURV9MT0NLIGlz IG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1dSSVRFX0xPQ0tfQkggaXMgbm90IHNldAojIENPTkZJ R19JTkxJTkVfV1JJVEVfTE9DS19JUlEgaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfV1JJVEVf TE9DS19JUlFTQVZFIGlzIG5vdCBzZXQKQ09ORklHX0lOTElORV9XUklURV9VTkxPQ0s9eQojIENP TkZJR19JTkxJTkVfV1JJVEVfVU5MT0NLX0JIIGlzIG5vdCBzZXQKQ09ORklHX0lOTElORV9XUklU RV9VTkxPQ0tfSVJRPXkKIyBDT05GSUdfSU5MSU5FX1dSSVRFX1VOTE9DS19JUlFSRVNUT1JFIGlz IG5vdCBzZXQKQ09ORklHX01VVEVYX1NQSU5fT05fT1dORVI9eQpDT05GSUdfRlJFRVpFUj15Cgoj CiMgUHJvY2Vzc29yIHR5cGUgYW5kIGZlYXR1cmVzCiMKQ09ORklHX1pPTkVfRE1BPXkKQ09ORklH X1RJQ0tfT05FU0hPVD15CkNPTkZJR19OT19IWj15CkNPTkZJR19ISUdIX1JFU19USU1FUlM9eQpD T05GSUdfR0VORVJJQ19DTE9DS0VWRU5UU19CVUlMRD15CkNPTkZJR19HRU5FUklDX0NMT0NLRVZF TlRTX01JTl9BREpVU1Q9eQpDT05GSUdfU01QPXkKQ09ORklHX1g4Nl9YMkFQSUM9eQpDT05GSUdf WDg2X01QUEFSU0U9eQpDT05GSUdfWDg2X0VYVEVOREVEX1BMQVRGT1JNPXkKIyBDT05GSUdfWDg2 X1ZTTVAgaXMgbm90IHNldApDT05GSUdfWDg2X1NVUFBPUlRTX01FTU9SWV9GQUlMVVJFPXkKQ09O RklHX1NDSEVEX09NSVRfRlJBTUVfUE9JTlRFUj15CkNPTkZJR19QQVJBVklSVF9HVUVTVD15CiMg Q09ORklHX1BBUkFWSVJUX1RJTUVfQUNDT1VOVElORyBpcyBub3Qgc2V0CkNPTkZJR19YRU49eQpD T05GSUdfWEVOX0RPTTA9eQpDT05GSUdfWEVOX1BSSVZJTEVHRURfR1VFU1Q9eQpDT05GSUdfWEVO X1BWSFZNPXkKQ09ORklHX1hFTl9NQVhfRE9NQUlOX01FTU9SWT01MDAKQ09ORklHX1hFTl9TQVZF X1JFU1RPUkU9eQojIENPTkZJR19YRU5fREVCVUdfRlMgaXMgbm90IHNldAojIENPTkZJR19LVk1f Q0xPQ0sgaXMgbm90IHNldAojIENPTkZJR19LVk1fR1VFU1QgaXMgbm90IHNldApDT05GSUdfUEFS QVZJUlQ9eQojIENPTkZJR19QQVJBVklSVF9TUElOTE9DS1MgaXMgbm90IHNldApDT05GSUdfUEFS QVZJUlRfQ0xPQ0s9eQojIENPTkZJR19QQVJBVklSVF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19O T19CT09UTUVNPXkKIyBDT05GSUdfTUVNVEVTVCBpcyBub3Qgc2V0CiMgQ09ORklHX01LOCBpcyBu b3Qgc2V0CiMgQ09ORklHX01QU0MgaXMgbm90IHNldAojIENPTkZJR19NQ09SRTIgaXMgbm90IHNl dAojIENPTkZJR19NQVRPTSBpcyBub3Qgc2V0CkNPTkZJR19HRU5FUklDX0NQVT15CkNPTkZJR19Y ODZfSU5URVJOT0RFX0NBQ0hFX1NISUZUPTYKQ09ORklHX1g4Nl9DTVBYQ0hHPXkKQ09ORklHX1g4 Nl9MMV9DQUNIRV9TSElGVD02CkNPTkZJR19YODZfWEFERD15CkNPTkZJR19YODZfV1BfV09SS1Nf T0s9eQpDT05GSUdfWDg2X1RTQz15CkNPTkZJR19YODZfQ01QWENIRzY0PXkKQ09ORklHX1g4Nl9D TU9WPXkKQ09ORklHX1g4Nl9NSU5JTVVNX0NQVV9GQU1JTFk9NjQKQ09ORklHX1g4Nl9ERUJVR0NU TE1TUj15CkNPTkZJR19DUFVfU1VQX0lOVEVMPXkKQ09ORklHX0NQVV9TVVBfQU1EPXkKQ09ORklH X0NQVV9TVVBfQ0VOVEFVUj15CkNPTkZJR19IUEVUX1RJTUVSPXkKQ09ORklHX0hQRVRfRU1VTEFU RV9SVEM9eQpDT05GSUdfRE1JPXkKQ09ORklHX0dBUlRfSU9NTVU9eQojIENPTkZJR19DQUxHQVJZ X0lPTU1VIGlzIG5vdCBzZXQKQ09ORklHX1NXSU9UTEI9eQpDT05GSUdfSU9NTVVfSEVMUEVSPXkK IyBDT05GSUdfTUFYU01QIGlzIG5vdCBzZXQKQ09ORklHX05SX0NQVVM9NTEyCiMgQ09ORklHX1ND SEVEX1NNVCBpcyBub3Qgc2V0CkNPTkZJR19TQ0hFRF9NQz15CiMgQ09ORklHX0lSUV9USU1FX0FD Q09VTlRJTkcgaXMgbm90IHNldAojIENPTkZJR19QUkVFTVBUX05PTkUgaXMgbm90IHNldApDT05G SUdfUFJFRU1QVF9WT0xVTlRBUlk9eQojIENPTkZJR19QUkVFTVBUIGlzIG5vdCBzZXQKQ09ORklH X1g4Nl9MT0NBTF9BUElDPXkKQ09ORklHX1g4Nl9JT19BUElDPXkKIyBDT05GSUdfWDg2X1JFUk9V VEVfRk9SX0JST0tFTl9CT09UX0lSUVMgaXMgbm90IHNldApDT05GSUdfWDg2X01DRT15CkNPTkZJ R19YODZfTUNFX0lOVEVMPXkKQ09ORklHX1g4Nl9NQ0VfQU1EPXkKQ09ORklHX1g4Nl9NQ0VfVEhS RVNIT0xEPXkKQ09ORklHX1g4Nl9NQ0VfSU5KRUNUPW0KQ09ORklHX1g4Nl9USEVSTUFMX1ZFQ1RP Uj15CkNPTkZJR19JOEs9bQpDT05GSUdfTUlDUk9DT0RFPW0KQ09ORklHX01JQ1JPQ09ERV9JTlRF TD15CkNPTkZJR19NSUNST0NPREVfQU1EPXkKQ09ORklHX01JQ1JPQ09ERV9PTERfSU5URVJGQUNF PXkKQ09ORklHX1g4Nl9NU1I9eQpDT05GSUdfWDg2X0NQVUlEPW0KQ09ORklHX0FSQ0hfUEhZU19B RERSX1RfNjRCSVQ9eQpDT05GSUdfQVJDSF9ETUFfQUREUl9UXzY0QklUPXkKQ09ORklHX0RJUkVD VF9HQlBBR0VTPXkKIyBDT05GSUdfTlVNQSBpcyBub3Qgc2V0CkNPTkZJR19BUkNIX1NQQVJTRU1F TV9FTkFCTEU9eQpDT05GSUdfQVJDSF9TUEFSU0VNRU1fREVGQVVMVD15CkNPTkZJR19BUkNIX1NF TEVDVF9NRU1PUllfTU9ERUw9eQpDT05GSUdfQVJDSF9NRU1PUllfUFJPQkU9eQpDT05GSUdfQVJD SF9QUk9DX0tDT1JFX1RFWFQ9eQpDT05GSUdfSUxMRUdBTF9QT0lOVEVSX1ZBTFVFPTB4ZGVhZDAw MDAwMDAwMDAwMApDT05GSUdfU0VMRUNUX01FTU9SWV9NT0RFTD15CkNPTkZJR19TUEFSU0VNRU1f TUFOVUFMPXkKQ09ORklHX1NQQVJTRU1FTT15CkNPTkZJR19IQVZFX01FTU9SWV9QUkVTRU5UPXkK Q09ORklHX1NQQVJTRU1FTV9FWFRSRU1FPXkKQ09ORklHX1NQQVJTRU1FTV9WTUVNTUFQX0VOQUJM RT15CkNPTkZJR19TUEFSU0VNRU1fQUxMT0NfTUVNX01BUF9UT0dFVEhFUj15CkNPTkZJR19TUEFS U0VNRU1fVk1FTU1BUD15CkNPTkZJR19IQVZFX01FTUJMT0NLPXkKQ09ORklHX0hBVkVfTUVNQkxP Q0tfTk9ERV9NQVA9eQpDT05GSUdfQVJDSF9ESVNDQVJEX01FTUJMT0NLPXkKQ09ORklHX01FTU9S WV9IT1RQTFVHPXkKQ09ORklHX01FTU9SWV9IT1RQTFVHX1NQQVJTRT15CkNPTkZJR19NRU1PUllf SE9UUkVNT1ZFPXkKQ09ORklHX1BBR0VGTEFHU19FWFRFTkRFRD15CkNPTkZJR19TUExJVF9QVExP Q0tfQ1BVUz00CkNPTkZJR19DT01QQUNUSU9OPXkKQ09ORklHX01JR1JBVElPTj15CkNPTkZJR19Q SFlTX0FERFJfVF82NEJJVD15CkNPTkZJR19aT05FX0RNQV9GTEFHPTEKQ09ORklHX0JPVU5DRT15 CkNPTkZJR19WSVJUX1RPX0JVUz15CkNPTkZJR19NTVVfTk9USUZJRVI9eQpDT05GSUdfS1NNPXkK Q09ORklHX0RFRkFVTFRfTU1BUF9NSU5fQUREUj02NTUzNgpDT05GSUdfQVJDSF9TVVBQT1JUU19N RU1PUllfRkFJTFVSRT15CkNPTkZJR19NRU1PUllfRkFJTFVSRT15CkNPTkZJR19IV1BPSVNPTl9J TkpFQ1Q9bQpDT05GSUdfVFJBTlNQQVJFTlRfSFVHRVBBR0U9eQpDT05GSUdfVFJBTlNQQVJFTlRf SFVHRVBBR0VfQUxXQVlTPXkKIyBDT05GSUdfVFJBTlNQQVJFTlRfSFVHRVBBR0VfTUFEVklTRSBp cyBub3Qgc2V0CkNPTkZJR19DTEVBTkNBQ0hFPXkKIyBDT05GSUdfWDg2X0NIRUNLX0JJT1NfQ09S UlVQVElPTiBpcyBub3Qgc2V0CkNPTkZJR19YODZfUkVTRVJWRV9MT1c9NjQKQ09ORklHX01UUlI9 eQpDT05GSUdfTVRSUl9TQU5JVElaRVI9eQpDT05GSUdfTVRSUl9TQU5JVElaRVJfRU5BQkxFX0RF RkFVTFQ9MApDT05GSUdfTVRSUl9TQU5JVElaRVJfU1BBUkVfUkVHX05SX0RFRkFVTFQ9MQpDT05G SUdfWDg2X1BBVD15CkNPTkZJR19BUkNIX1VTRVNfUEdfVU5DQUNIRUQ9eQpDT05GSUdfQVJDSF9S QU5ET009eQojIENPTkZJR19FRkkgaXMgbm90IHNldApDT05GSUdfU0VDQ09NUD15CiMgQ09ORklH X0NDX1NUQUNLUFJPVEVDVE9SIGlzIG5vdCBzZXQKIyBDT05GSUdfSFpfMTAwIGlzIG5vdCBzZXQK Q09ORklHX0haXzI1MD15CiMgQ09ORklHX0haXzMwMCBpcyBub3Qgc2V0CiMgQ09ORklHX0haXzEw MDAgaXMgbm90IHNldApDT05GSUdfSFo9MjUwCkNPTkZJR19TQ0hFRF9IUlRJQ0s9eQpDT05GSUdf S0VYRUM9eQojIENPTkZJR19DUkFTSF9EVU1QIGlzIG5vdCBzZXQKQ09ORklHX1BIWVNJQ0FMX1NU QVJUPTB4MTAwMDAwMApDT05GSUdfUkVMT0NBVEFCTEU9eQpDT05GSUdfUEhZU0lDQUxfQUxJR049 MHgxMDAwMDAwCkNPTkZJR19IT1RQTFVHX0NQVT15CkNPTkZJR19DT01QQVRfVkRTTz15CiMgQ09O RklHX0NNRExJTkVfQk9PTCBpcyBub3Qgc2V0CkNPTkZJR19BUkNIX0VOQUJMRV9NRU1PUllfSE9U UExVRz15CkNPTkZJR19BUkNIX0VOQUJMRV9NRU1PUllfSE9UUkVNT1ZFPXkKCiMKIyBQb3dlciBt YW5hZ2VtZW50IGFuZCBBQ1BJIG9wdGlvbnMKIwpDT05GSUdfU1VTUEVORD15CkNPTkZJR19TVVNQ RU5EX0ZSRUVaRVI9eQpDT05GSUdfSElCRVJOQVRFX0NBTExCQUNLUz15CiMgQ09ORklHX0hJQkVS TkFUSU9OIGlzIG5vdCBzZXQKQ09ORklHX1BNX1NMRUVQPXkKQ09ORklHX1BNX1NMRUVQX1NNUD15 CkNPTkZJR19QTV9SVU5USU1FPXkKQ09ORklHX1BNPXkKQ09ORklHX1BNX0RFQlVHPXkKQ09ORklH X1BNX0FEVkFOQ0VEX0RFQlVHPXkKIyBDT05GSUdfUE1fVEVTVF9TVVNQRU5EIGlzIG5vdCBzZXQK Q09ORklHX0NBTl9QTV9UUkFDRT15CkNPTkZJR19QTV9UUkFDRT15CkNPTkZJR19QTV9UUkFDRV9S VEM9eQpDT05GSUdfQUNQST15CkNPTkZJR19BQ1BJX1NMRUVQPXkKQ09ORklHX0FDUElfUFJPQ0ZT PXkKQ09ORklHX0FDUElfUFJPQ0ZTX1BPV0VSPXkKIyBDT05GSUdfQUNQSV9FQ19ERUJVR0ZTIGlz IG5vdCBzZXQKQ09ORklHX0FDUElfUFJPQ19FVkVOVD15CkNPTkZJR19BQ1BJX0FDPW0KQ09ORklH X0FDUElfQkFUVEVSWT1tCkNPTkZJR19BQ1BJX0JVVFRPTj1tCkNPTkZJR19BQ1BJX1ZJREVPPW0K Q09ORklHX0FDUElfRkFOPW0KQ09ORklHX0FDUElfRE9DSz15CkNPTkZJR19BQ1BJX1BST0NFU1NP Uj15CkNPTkZJR19BQ1BJX0lQTUk9bQpDT05GSUdfQUNQSV9IT1RQTFVHX0NQVT15CkNPTkZJR19B Q1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SPW0KQ09ORklHX0FDUElfVEhFUk1BTD1tCkNPTkZJR19B Q1BJX0NVU1RPTV9EU0RUX0ZJTEU9IiIKIyBDT05GSUdfQUNQSV9DVVNUT01fRFNEVCBpcyBub3Qg c2V0CkNPTkZJR19BQ1BJX0JMQUNLTElTVF9ZRUFSPTAKQ09ORklHX0FDUElfREVCVUc9eQojIENP TkZJR19BQ1BJX0RFQlVHX0ZVTkNfVFJBQ0UgaXMgbm90IHNldApDT05GSUdfQUNQSV9QQ0lfU0xP VD1tCkNPTkZJR19YODZfUE1fVElNRVI9eQpDT05GSUdfQUNQSV9DT05UQUlORVI9eQpDT05GSUdf QUNQSV9IT1RQTFVHX01FTU9SWT1tCkNPTkZJR19BQ1BJX1NCUz1tCiMgQ09ORklHX0FDUElfSEVE IGlzIG5vdCBzZXQKIyBDT05GSUdfQUNQSV9DVVNUT01fTUVUSE9EIGlzIG5vdCBzZXQKQ09ORklH X0FDUElfQkdSVD1tCiMgQ09ORklHX0FDUElfQVBFSSBpcyBub3Qgc2V0CkNPTkZJR19TRkk9eQoK IwojIENQVSBGcmVxdWVuY3kgc2NhbGluZwojCkNPTkZJR19DUFVfRlJFUT15CkNPTkZJR19DUFVf RlJFUV9UQUJMRT15CkNPTkZJR19DUFVfRlJFUV9TVEFUPXkKIyBDT05GSUdfQ1BVX0ZSRVFfU1RB VF9ERVRBSUxTIGlzIG5vdCBzZXQKQ09ORklHX0NQVV9GUkVRX0RFRkFVTFRfR09WX1BFUkZPUk1B TkNFPXkKIyBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfVVNFUlNQQUNFIGlzIG5vdCBzZXQK IyBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfT05ERU1BTkQgaXMgbm90IHNldAojIENPTkZJ R19DUFVfRlJFUV9ERUZBVUxUX0dPVl9DT05TRVJWQVRJVkUgaXMgbm90IHNldApDT05GSUdfQ1BV X0ZSRVFfR09WX1BFUkZPUk1BTkNFPXkKQ09ORklHX0NQVV9GUkVRX0dPVl9QT1dFUlNBVkU9bQpD T05GSUdfQ1BVX0ZSRVFfR09WX1VTRVJTUEFDRT1tCkNPTkZJR19DUFVfRlJFUV9HT1ZfT05ERU1B TkQ9bQpDT05GSUdfQ1BVX0ZSRVFfR09WX0NPTlNFUlZBVElWRT1tCgojCiMgeDg2IENQVSBmcmVx dWVuY3kgc2NhbGluZyBkcml2ZXJzCiMKQ09ORklHX1g4Nl9QQ0NfQ1BVRlJFUT1tCkNPTkZJR19Y ODZfQUNQSV9DUFVGUkVRPW0KQ09ORklHX1g4Nl9QT1dFUk5PV19LOD1tCkNPTkZJR19YODZfU1BF RURTVEVQX0NFTlRSSU5PPW0KQ09ORklHX1g4Nl9QNF9DTE9DS01PRD1tCgojCiMgc2hhcmVkIG9w dGlvbnMKIwpDT05GSUdfWDg2X1NQRUVEU1RFUF9MSUI9bQpDT05GSUdfQ1BVX0lETEU9eQpDT05G SUdfQ1BVX0lETEVfR09WX0xBRERFUj15CkNPTkZJR19DUFVfSURMRV9HT1ZfTUVOVT15CkNPTkZJ R19JTlRFTF9JRExFPXkKCiMKIyBNZW1vcnkgcG93ZXIgc2F2aW5ncwojCkNPTkZJR19JNzMwMF9J RExFX0lPQVRfQ0hBTk5FTD15CkNPTkZJR19JNzMwMF9JRExFPW0KCiMKIyBCdXMgb3B0aW9ucyAo UENJIGV0Yy4pCiMKQ09ORklHX1BDST15CkNPTkZJR19QQ0lfRElSRUNUPXkKQ09ORklHX1BDSV9N TUNPTkZJRz15CkNPTkZJR19QQ0lfWEVOPXkKQ09ORklHX1BDSV9ET01BSU5TPXkKIyBDT05GSUdf UENJX0NOQjIwTEVfUVVJUksgaXMgbm90IHNldApDT05GSUdfUENJRVBPUlRCVVM9eQpDT05GSUdf SE9UUExVR19QQ0lfUENJRT1tCkNPTkZJR19QQ0lFQUVSPXkKIyBDT05GSUdfUENJRV9FQ1JDIGlz IG5vdCBzZXQKQ09ORklHX1BDSUVBRVJfSU5KRUNUPW0KQ09ORklHX1BDSUVBU1BNPXkKIyBDT05G SUdfUENJRUFTUE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfUENJRUFTUE1fREVGQVVMVD15CiMg Q09ORklHX1BDSUVBU1BNX1BPV0VSU0FWRSBpcyBub3Qgc2V0CiMgQ09ORklHX1BDSUVBU1BNX1BF UkZPUk1BTkNFIGlzIG5vdCBzZXQKQ09ORklHX1BDSUVfUE1FPXkKQ09ORklHX0FSQ0hfU1VQUE9S VFNfTVNJPXkKQ09ORklHX1BDSV9NU0k9eQojIENPTkZJR19QQ0lfREVCVUcgaXMgbm90IHNldAoj IENPTkZJR19QQ0lfUkVBTExPQ19FTkFCTEVfQVVUTyBpcyBub3Qgc2V0CkNPTkZJR19QQ0lfU1RV Qj15CkNPTkZJR19YRU5fUENJREVWX0ZST05URU5EPXkKQ09ORklHX0hUX0lSUT15CkNPTkZJR19Q Q0lfQVRTPXkKQ09ORklHX1BDSV9JT1Y9eQpDT05GSUdfUENJX1BSST15CkNPTkZJR19QQ0lfUEFT SUQ9eQpDT05GSUdfUENJX0lPQVBJQz15CkNPTkZJR19QQ0lfTEFCRUw9eQpDT05GSUdfSVNBX0RN QV9BUEk9eQpDT05GSUdfQU1EX05CPXkKQ09ORklHX1BDQ0FSRD1tCkNPTkZJR19QQ01DSUE9bQpD T05GSUdfUENNQ0lBX0xPQURfQ0lTPXkKQ09ORklHX0NBUkRCVVM9eQoKIwojIFBDLWNhcmQgYnJp ZGdlcwojCkNPTkZJR19ZRU5UQT1tCkNPTkZJR19ZRU5UQV9PMj15CkNPTkZJR19ZRU5UQV9SSUNP SD15CkNPTkZJR19ZRU5UQV9UST15CkNPTkZJR19ZRU5UQV9FTkVfVFVORT15CkNPTkZJR19ZRU5U QV9UT1NISUJBPXkKQ09ORklHX1BENjcyOT1tCkNPTkZJR19JODIwOTI9bQpDT05GSUdfUENDQVJE X05PTlNUQVRJQz15CkNPTkZJR19IT1RQTFVHX1BDST1tCkNPTkZJR19IT1RQTFVHX1BDSV9GQUtF PW0KQ09ORklHX0hPVFBMVUdfUENJX0FDUEk9bQpDT05GSUdfSE9UUExVR19QQ0lfQUNQSV9JQk09 bQpDT05GSUdfSE9UUExVR19QQ0lfQ1BDST15CkNPTkZJR19IT1RQTFVHX1BDSV9DUENJX1pUNTU1 MD1tCkNPTkZJR19IT1RQTFVHX1BDSV9DUENJX0dFTkVSSUM9bQpDT05GSUdfSE9UUExVR19QQ0lf U0hQQz1tCiMgQ09ORklHX1JBUElESU8gaXMgbm90IHNldAoKIwojIEV4ZWN1dGFibGUgZmlsZSBm b3JtYXRzIC8gRW11bGF0aW9ucwojCkNPTkZJR19CSU5GTVRfRUxGPXkKQ09ORklHX0NPTVBBVF9C SU5GTVRfRUxGPXkKQ09ORklHX0FSQ0hfQklORk1UX0VMRl9SQU5ET01JWkVfUElFPXkKQ09ORklH X0NPUkVfRFVNUF9ERUZBVUxUX0VMRl9IRUFERVJTPXkKIyBDT05GSUdfSEFWRV9BT1VUIGlzIG5v dCBzZXQKQ09ORklHX0JJTkZNVF9NSVNDPW0KQ09ORklHX0lBMzJfRU1VTEFUSU9OPXkKQ09ORklH X0lBMzJfQU9VVD1tCiMgQ09ORklHX1g4Nl9YMzIgaXMgbm90IHNldApDT05GSUdfQ09NUEFUPXkK Q09ORklHX0NPTVBBVF9GT1JfVTY0X0FMSUdOTUVOVD15CkNPTkZJR19TWVNWSVBDX0NPTVBBVD15 CkNPTkZJR19LRVlTX0NPTVBBVD15CkNPTkZJR19IQVZFX1RFWFRfUE9LRV9TTVA9eQpDT05GSUdf TkVUPXkKQ09ORklHX0NPTVBBVF9ORVRMSU5LX01FU1NBR0VTPXkKCiMKIyBOZXR3b3JraW5nIG9w dGlvbnMKIwpDT05GSUdfUEFDS0VUPW0KQ09ORklHX1VOSVg9eQpDT05GSUdfVU5JWF9ESUFHPW0K Q09ORklHX1hGUk09eQpDT05GSUdfWEZSTV9VU0VSPW0KQ09ORklHX1hGUk1fU1VCX1BPTElDWT15 CkNPTkZJR19YRlJNX01JR1JBVEU9eQojIENPTkZJR19YRlJNX1NUQVRJU1RJQ1MgaXMgbm90IHNl dApDT05GSUdfWEZSTV9JUENPTVA9bQpDT05GSUdfTkVUX0tFWT1tCkNPTkZJR19ORVRfS0VZX01J R1JBVEU9eQpDT05GSUdfSU5FVD15CkNPTkZJR19JUF9NVUxUSUNBU1Q9eQpDT05GSUdfSVBfQURW QU5DRURfUk9VVEVSPXkKIyBDT05GSUdfSVBfRklCX1RSSUVfU1RBVFMgaXMgbm90IHNldApDT05G SUdfSVBfTVVMVElQTEVfVEFCTEVTPXkKQ09ORklHX0lQX1JPVVRFX01VTFRJUEFUSD15CkNPTkZJ R19JUF9ST1VURV9WRVJCT1NFPXkKQ09ORklHX0lQX1JPVVRFX0NMQVNTSUQ9eQpDT05GSUdfSVBf UE5QPXkKQ09ORklHX0lQX1BOUF9ESENQPXkKQ09ORklHX0lQX1BOUF9CT09UUD15CkNPTkZJR19J UF9QTlBfUkFSUD15CkNPTkZJR19ORVRfSVBJUD1tCiMgQ09ORklHX05FVF9JUEdSRV9ERU1VWCBp cyBub3Qgc2V0CkNPTkZJR19JUF9NUk9VVEU9eQojIENPTkZJR19JUF9NUk9VVEVfTVVMVElQTEVf VEFCTEVTIGlzIG5vdCBzZXQKQ09ORklHX0lQX1BJTVNNX1YxPXkKQ09ORklHX0lQX1BJTVNNX1Yy PXkKIyBDT05GSUdfQVJQRCBpcyBub3Qgc2V0CkNPTkZJR19TWU5fQ09PS0lFUz15CkNPTkZJR19J TkVUX0FIPW0KQ09ORklHX0lORVRfRVNQPW0KQ09ORklHX0lORVRfSVBDT01QPW0KQ09ORklHX0lO RVRfWEZSTV9UVU5ORUw9bQpDT05GSUdfSU5FVF9UVU5ORUw9bQpDT05GSUdfSU5FVF9YRlJNX01P REVfVFJBTlNQT1JUPW0KQ09ORklHX0lORVRfWEZSTV9NT0RFX1RVTk5FTD1tCkNPTkZJR19JTkVU X1hGUk1fTU9ERV9CRUVUPW0KQ09ORklHX0lORVRfTFJPPXkKQ09ORklHX0lORVRfRElBRz1tCkNP TkZJR19JTkVUX1RDUF9ESUFHPW0KQ09ORklHX0lORVRfVURQX0RJQUc9bQpDT05GSUdfVENQX0NP TkdfQURWQU5DRUQ9eQpDT05GSUdfVENQX0NPTkdfQklDPW0KQ09ORklHX1RDUF9DT05HX0NVQklD PXkKQ09ORklHX1RDUF9DT05HX1dFU1RXT09EPW0KQ09ORklHX1RDUF9DT05HX0hUQ1A9bQpDT05G SUdfVENQX0NPTkdfSFNUQ1A9bQpDT05GSUdfVENQX0NPTkdfSFlCTEE9bQpDT05GSUdfVENQX0NP TkdfVkVHQVM9bQpDT05GSUdfVENQX0NPTkdfU0NBTEFCTEU9bQpDT05GSUdfVENQX0NPTkdfTFA9 bQpDT05GSUdfVENQX0NPTkdfVkVOTz1tCkNPTkZJR19UQ1BfQ09OR19ZRUFIPW0KQ09ORklHX1RD UF9DT05HX0lMTElOT0lTPW0KQ09ORklHX0RFRkFVTFRfQ1VCSUM9eQojIENPTkZJR19ERUZBVUxU X1JFTk8gaXMgbm90IHNldApDT05GSUdfREVGQVVMVF9UQ1BfQ09ORz0iY3ViaWMiCiMgQ09ORklH X1RDUF9NRDVTSUcgaXMgbm90IHNldApDT05GSUdfSVBWNj15CkNPTkZJR19JUFY2X1BSSVZBQ1k9 eQpDT05GSUdfSVBWNl9ST1VURVJfUFJFRj15CkNPTkZJR19JUFY2X1JPVVRFX0lORk89eQojIENP TkZJR19JUFY2X09QVElNSVNUSUNfREFEIGlzIG5vdCBzZXQKQ09ORklHX0lORVQ2X0FIPW0KQ09O RklHX0lORVQ2X0VTUD1tCkNPTkZJR19JTkVUNl9JUENPTVA9bQpDT05GSUdfSVBWNl9NSVA2PW0K Q09ORklHX0lORVQ2X1hGUk1fVFVOTkVMPW0KQ09ORklHX0lORVQ2X1RVTk5FTD1tCkNPTkZJR19J TkVUNl9YRlJNX01PREVfVFJBTlNQT1JUPW0KQ09ORklHX0lORVQ2X1hGUk1fTU9ERV9UVU5ORUw9 bQpDT05GSUdfSU5FVDZfWEZSTV9NT0RFX0JFRVQ9bQpDT05GSUdfSU5FVDZfWEZSTV9NT0RFX1JP VVRFT1BUSU1JWkFUSU9OPW0KQ09ORklHX0lQVjZfU0lUPW0KIyBDT05GSUdfSVBWNl9TSVRfNlJE IGlzIG5vdCBzZXQKQ09ORklHX0lQVjZfTkRJU0NfTk9ERVRZUEU9eQpDT05GSUdfSVBWNl9UVU5O RUw9bQpDT05GSUdfSVBWNl9NVUxUSVBMRV9UQUJMRVM9eQpDT05GSUdfSVBWNl9TVUJUUkVFUz15 CiMgQ09ORklHX0lQVjZfTVJPVVRFIGlzIG5vdCBzZXQKQ09ORklHX05FVFdPUktfU0VDTUFSSz15 CiMgQ09ORklHX05FVFdPUktfUEhZX1RJTUVTVEFNUElORyBpcyBub3Qgc2V0CkNPTkZJR19ORVRG SUxURVI9eQojIENPTkZJR19ORVRGSUxURVJfREVCVUcgaXMgbm90IHNldApDT05GSUdfTkVURklM VEVSX0FEVkFOQ0VEPXkKQ09ORklHX0JSSURHRV9ORVRGSUxURVI9eQoKIwojIENvcmUgTmV0Zmls dGVyIENvbmZpZ3VyYXRpb24KIwpDT05GSUdfTkVURklMVEVSX05FVExJTks9bQpDT05GSUdfTkVU RklMVEVSX05FVExJTktfQUNDVD1tCkNPTkZJR19ORVRGSUxURVJfTkVUTElOS19RVUVVRT1tCkNP TkZJR19ORVRGSUxURVJfTkVUTElOS19MT0c9bQpDT05GSUdfTkZfQ09OTlRSQUNLPW0KQ09ORklH X05GX0NPTk5UUkFDS19NQVJLPXkKQ09ORklHX05GX0NPTk5UUkFDS19TRUNNQVJLPXkKQ09ORklH X05GX0NPTk5UUkFDS19aT05FUz15CkNPTkZJR19ORl9DT05OVFJBQ0tfUFJPQ0ZTPXkKQ09ORklH X05GX0NPTk5UUkFDS19FVkVOVFM9eQpDT05GSUdfTkZfQ09OTlRSQUNLX1RJTUVPVVQ9eQojIENP TkZJR19ORl9DT05OVFJBQ0tfVElNRVNUQU1QIGlzIG5vdCBzZXQKQ09ORklHX05GX0NUX1BST1RP X0RDQ1A9bQpDT05GSUdfTkZfQ1RfUFJPVE9fR1JFPW0KQ09ORklHX05GX0NUX1BST1RPX1NDVFA9 bQpDT05GSUdfTkZfQ1RfUFJPVE9fVURQTElURT1tCkNPTkZJR19ORl9DT05OVFJBQ0tfQU1BTkRB PW0KQ09ORklHX05GX0NPTk5UUkFDS19GVFA9bQpDT05GSUdfTkZfQ09OTlRSQUNLX0gzMjM9bQpD T05GSUdfTkZfQ09OTlRSQUNLX0lSQz1tCkNPTkZJR19ORl9DT05OVFJBQ0tfQlJPQURDQVNUPW0K Q09ORklHX05GX0NPTk5UUkFDS19ORVRCSU9TX05TPW0KQ09ORklHX05GX0NPTk5UUkFDS19TTk1Q PW0KQ09ORklHX05GX0NPTk5UUkFDS19QUFRQPW0KQ09ORklHX05GX0NPTk5UUkFDS19TQU5FPW0K Q09ORklHX05GX0NPTk5UUkFDS19TSVA9bQpDT05GSUdfTkZfQ09OTlRSQUNLX1RGVFA9bQpDT05G SUdfTkZfQ1RfTkVUTElOSz1tCkNPTkZJR19ORl9DVF9ORVRMSU5LX1RJTUVPVVQ9bQpDT05GSUdf TkVURklMVEVSX1RQUk9YWT1tCkNPTkZJR19ORVRGSUxURVJfWFRBQkxFUz1tCgojCiMgWHRhYmxl cyBjb21iaW5lZCBtb2R1bGVzCiMKQ09ORklHX05FVEZJTFRFUl9YVF9NQVJLPW0KQ09ORklHX05F VEZJTFRFUl9YVF9DT05OTUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfU0VUPW0KCiMKIyBYdGFi bGVzIHRhcmdldHMKIwojIENPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0FVRElUIGlzIG5vdCBz ZXQKIyBDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9DSEVDS1NVTSBpcyBub3Qgc2V0CkNPTkZJ R19ORVRGSUxURVJfWFRfVEFSR0VUX0NMQVNTSUZZPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJH RVRfQ09OTk1BUks9bQpDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9DT05OU0VDTUFSSz1tCkNP TkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0NUPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJHRVRf RFNDUD1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0hMPW0KIyBDT05GSUdfTkVURklMVEVS X1hUX1RBUkdFVF9JRExFVElNRVIgaXMgbm90IHNldApDT05GSUdfTkVURklMVEVSX1hUX1RBUkdF VF9MRUQ9bQpDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9MT0c9bQpDT05GSUdfTkVURklMVEVS X1hUX1RBUkdFVF9NQVJLPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJHRVRfTkZMT0c9bQpDT05G SUdfTkVURklMVEVSX1hUX1RBUkdFVF9ORlFVRVVFPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJH RVRfTk9UUkFDSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1JBVEVFU1Q9bQojIENPTkZJ R19ORVRGSUxURVJfWFRfVEFSR0VUX1RFRSBpcyBub3Qgc2V0CkNPTkZJR19ORVRGSUxURVJfWFRf VEFSR0VUX1RQUk9YWT1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1RSQUNFPW0KQ09ORklH X05FVEZJTFRFUl9YVF9UQVJHRVRfU0VDTUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VU X1RDUE1TUz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1RDUE9QVFNUUklQPW0KCiMKIyBY dGFibGVzIG1hdGNoZXMKIwpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0FERFJUWVBFPW0KQ09O RklHX05FVEZJTFRFUl9YVF9NQVRDSF9DTFVTVEVSPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRD SF9DT01NRU5UPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9DT05OQllURVM9bQpDT05GSUdf TkVURklMVEVSX1hUX01BVENIX0NPTk5MSU1JVD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf Q09OTk1BUks9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0NPTk5UUkFDSz1tCiMgQ09ORklH X05FVEZJTFRFUl9YVF9NQVRDSF9DUFUgaXMgbm90IHNldApDT05GSUdfTkVURklMVEVSX1hUX01B VENIX0RDQ1A9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0RFVkdST1VQPW0KQ09ORklHX05F VEZJTFRFUl9YVF9NQVRDSF9EU0NQPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9FQ049bQpD T05GSUdfTkVURklMVEVSX1hUX01BVENIX0VTUD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf SEFTSExJTUlUPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9IRUxQRVI9bQpDT05GSUdfTkVU RklMVEVSX1hUX01BVENIX0hMPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9JUFJBTkdFPW0K IyBDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0lQVlMgaXMgbm90IHNldApDT05GSUdfTkVURklM VEVSX1hUX01BVENIX0xFTkdUSD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfTElNSVQ9bQpD T05GSUdfTkVURklMVEVSX1hUX01BVENIX01BQz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf TUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfTVVMVElQT1JUPW0KQ09ORklHX05FVEZJ TFRFUl9YVF9NQVRDSF9ORkFDQ1Q9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX09TRj1tCkNP TkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfT1dORVI9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENI X1BPTElDWT1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfUEhZU0RFVj1tCkNPTkZJR19ORVRG SUxURVJfWFRfTUFUQ0hfUEtUVFlQRT1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfUVVPVEE9 bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1JBVEVFU1Q9bQpDT05GSUdfTkVURklMVEVSX1hU X01BVENIX1JFQUxNPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9SRUNFTlQ9bQpDT05GSUdf TkVURklMVEVSX1hUX01BVENIX1NDVFA9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1NPQ0tF VD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfU1RBVEU9bQpDT05GSUdfTkVURklMVEVSX1hU X01BVENIX1NUQVRJU1RJQz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfU1RSSU5HPW0KQ09O RklHX05FVEZJTFRFUl9YVF9NQVRDSF9UQ1BNU1M9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENI X1RJTUU9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1UzMj1tCkNPTkZJR19JUF9TRVQ9bQpD T05GSUdfSVBfU0VUX01BWD0yNTYKQ09ORklHX0lQX1NFVF9CSVRNQVBfSVA9bQpDT05GSUdfSVBf U0VUX0JJVE1BUF9JUE1BQz1tCkNPTkZJR19JUF9TRVRfQklUTUFQX1BPUlQ9bQpDT05GSUdfSVBf U0VUX0hBU0hfSVA9bQpDT05GSUdfSVBfU0VUX0hBU0hfSVBQT1JUPW0KQ09ORklHX0lQX1NFVF9I QVNIX0lQUE9SVElQPW0KQ09ORklHX0lQX1NFVF9IQVNIX0lQUE9SVE5FVD1tCkNPTkZJR19JUF9T RVRfSEFTSF9ORVQ9bQpDT05GSUdfSVBfU0VUX0hBU0hfTkVUUE9SVD1tCkNPTkZJR19JUF9TRVRf SEFTSF9ORVRJRkFDRT1tCkNPTkZJR19JUF9TRVRfTElTVF9TRVQ9bQpDT05GSUdfSVBfVlM9bQpD T05GSUdfSVBfVlNfSVBWNj15CiMgQ09ORklHX0lQX1ZTX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklH X0lQX1ZTX1RBQl9CSVRTPTEyCgojCiMgSVBWUyB0cmFuc3BvcnQgcHJvdG9jb2wgbG9hZCBiYWxh bmNpbmcgc3VwcG9ydAojCkNPTkZJR19JUF9WU19QUk9UT19UQ1A9eQpDT05GSUdfSVBfVlNfUFJP VE9fVURQPXkKQ09ORklHX0lQX1ZTX1BST1RPX0FIX0VTUD15CkNPTkZJR19JUF9WU19QUk9UT19F U1A9eQpDT05GSUdfSVBfVlNfUFJPVE9fQUg9eQpDT05GSUdfSVBfVlNfUFJPVE9fU0NUUD15Cgoj CiMgSVBWUyBzY2hlZHVsZXIKIwpDT05GSUdfSVBfVlNfUlI9bQpDT05GSUdfSVBfVlNfV1JSPW0K Q09ORklHX0lQX1ZTX0xDPW0KQ09ORklHX0lQX1ZTX1dMQz1tCkNPTkZJR19JUF9WU19MQkxDPW0K Q09ORklHX0lQX1ZTX0xCTENSPW0KQ09ORklHX0lQX1ZTX0RIPW0KQ09ORklHX0lQX1ZTX1NIPW0K Q09ORklHX0lQX1ZTX1NFRD1tCkNPTkZJR19JUF9WU19OUT1tCgojCiMgSVBWUyBTSCBzY2hlZHVs ZXIKIwpDT05GSUdfSVBfVlNfU0hfVEFCX0JJVFM9OAoKIwojIElQVlMgYXBwbGljYXRpb24gaGVs cGVyCiMKQ09ORklHX0lQX1ZTX0ZUUD1tCkNPTkZJR19JUF9WU19ORkNUPXkKIyBDT05GSUdfSVBf VlNfUEVfU0lQIGlzIG5vdCBzZXQKCiMKIyBJUDogTmV0ZmlsdGVyIENvbmZpZ3VyYXRpb24KIwpD T05GSUdfTkZfREVGUkFHX0lQVjQ9bQpDT05GSUdfTkZfQ09OTlRSQUNLX0lQVjQ9bQojIENPTkZJ R19ORl9DT05OVFJBQ0tfUFJPQ19DT01QQVQgaXMgbm90IHNldApDT05GSUdfSVBfTkZfUVVFVUU9 bQpDT05GSUdfSVBfTkZfSVBUQUJMRVM9bQpDT05GSUdfSVBfTkZfTUFUQ0hfQUg9bQpDT05GSUdf SVBfTkZfTUFUQ0hfRUNOPW0KQ09ORklHX0lQX05GX01BVENIX1JQRklMVEVSPW0KQ09ORklHX0lQ X05GX01BVENIX1RUTD1tCkNPTkZJR19JUF9ORl9GSUxURVI9bQpDT05GSUdfSVBfTkZfVEFSR0VU X1JFSkVDVD1tCkNPTkZJR19JUF9ORl9UQVJHRVRfVUxPRz1tCkNPTkZJR19ORl9OQVQ9bQpDT05G SUdfTkZfTkFUX05FRURFRD15CkNPTkZJR19JUF9ORl9UQVJHRVRfTUFTUVVFUkFERT1tCkNPTkZJ R19JUF9ORl9UQVJHRVRfTkVUTUFQPW0KQ09ORklHX0lQX05GX1RBUkdFVF9SRURJUkVDVD1tCkNP TkZJR19ORl9OQVRfU05NUF9CQVNJQz1tCkNPTkZJR19ORl9OQVRfUFJPVE9fRENDUD1tCkNPTkZJ R19ORl9OQVRfUFJPVE9fR1JFPW0KQ09ORklHX05GX05BVF9QUk9UT19VRFBMSVRFPW0KQ09ORklH X05GX05BVF9QUk9UT19TQ1RQPW0KQ09ORklHX05GX05BVF9GVFA9bQpDT05GSUdfTkZfTkFUX0lS Qz1tCkNPTkZJR19ORl9OQVRfVEZUUD1tCkNPTkZJR19ORl9OQVRfQU1BTkRBPW0KQ09ORklHX05G X05BVF9QUFRQPW0KQ09ORklHX05GX05BVF9IMzIzPW0KQ09ORklHX05GX05BVF9TSVA9bQpDT05G SUdfSVBfTkZfTUFOR0xFPW0KQ09ORklHX0lQX05GX1RBUkdFVF9DTFVTVEVSSVA9bQpDT05GSUdf SVBfTkZfVEFSR0VUX0VDTj1tCkNPTkZJR19JUF9ORl9UQVJHRVRfVFRMPW0KQ09ORklHX0lQX05G X1JBVz1tCkNPTkZJR19JUF9ORl9BUlBUQUJMRVM9bQpDT05GSUdfSVBfTkZfQVJQRklMVEVSPW0K Q09ORklHX0lQX05GX0FSUF9NQU5HTEU9bQoKIwojIElQdjY6IE5ldGZpbHRlciBDb25maWd1cmF0 aW9uCiMKQ09ORklHX05GX0RFRlJBR19JUFY2PW0KQ09ORklHX05GX0NPTk5UUkFDS19JUFY2PW0K Q09ORklHX0lQNl9ORl9RVUVVRT1tCkNPTkZJR19JUDZfTkZfSVBUQUJMRVM9bQpDT05GSUdfSVA2 X05GX01BVENIX0FIPW0KQ09ORklHX0lQNl9ORl9NQVRDSF9FVUk2ND1tCkNPTkZJR19JUDZfTkZf TUFUQ0hfRlJBRz1tCkNPTkZJR19JUDZfTkZfTUFUQ0hfT1BUUz1tCkNPTkZJR19JUDZfTkZfTUFU Q0hfSEw9bQpDT05GSUdfSVA2X05GX01BVENIX0lQVjZIRUFERVI9bQpDT05GSUdfSVA2X05GX01B VENIX01IPW0KQ09ORklHX0lQNl9ORl9NQVRDSF9SUEZJTFRFUj1tCkNPTkZJR19JUDZfTkZfTUFU Q0hfUlQ9bQpDT05GSUdfSVA2X05GX1RBUkdFVF9ITD1tCkNPTkZJR19JUDZfTkZfRklMVEVSPW0K Q09ORklHX0lQNl9ORl9UQVJHRVRfUkVKRUNUPW0KQ09ORklHX0lQNl9ORl9NQU5HTEU9bQpDT05G SUdfSVA2X05GX1JBVz1tCgojCiMgREVDbmV0OiBOZXRmaWx0ZXIgQ29uZmlndXJhdGlvbgojCiMg Q09ORklHX0RFQ05FVF9ORl9HUkFCVUxBVE9SIGlzIG5vdCBzZXQKQ09ORklHX0JSSURHRV9ORl9F QlRBQkxFUz1tCkNPTkZJR19CUklER0VfRUJUX0JST1VURT1tCkNPTkZJR19CUklER0VfRUJUX1Rf RklMVEVSPW0KQ09ORklHX0JSSURHRV9FQlRfVF9OQVQ9bQpDT05GSUdfQlJJREdFX0VCVF84MDJf Mz1tCkNPTkZJR19CUklER0VfRUJUX0FNT05HPW0KQ09ORklHX0JSSURHRV9FQlRfQVJQPW0KQ09O RklHX0JSSURHRV9FQlRfSVA9bQpDT05GSUdfQlJJREdFX0VCVF9JUDY9bQpDT05GSUdfQlJJREdF X0VCVF9MSU1JVD1tCkNPTkZJR19CUklER0VfRUJUX01BUks9bQpDT05GSUdfQlJJREdFX0VCVF9Q S1RUWVBFPW0KQ09ORklHX0JSSURHRV9FQlRfU1RQPW0KQ09ORklHX0JSSURHRV9FQlRfVkxBTj1t CkNPTkZJR19CUklER0VfRUJUX0FSUFJFUExZPW0KQ09ORklHX0JSSURHRV9FQlRfRE5BVD1tCkNP TkZJR19CUklER0VfRUJUX01BUktfVD1tCkNPTkZJR19CUklER0VfRUJUX1JFRElSRUNUPW0KQ09O RklHX0JSSURHRV9FQlRfU05BVD1tCkNPTkZJR19CUklER0VfRUJUX0xPRz1tCkNPTkZJR19CUklE R0VfRUJUX1VMT0c9bQpDT05GSUdfQlJJREdFX0VCVF9ORkxPRz1tCkNPTkZJR19JUF9EQ0NQPW0K Q09ORklHX0lORVRfRENDUF9ESUFHPW0KCiMKIyBEQ0NQIENDSURzIENvbmZpZ3VyYXRpb24gKEVY UEVSSU1FTlRBTCkKIwojIENPTkZJR19JUF9EQ0NQX0NDSUQyX0RFQlVHIGlzIG5vdCBzZXQKQ09O RklHX0lQX0RDQ1BfQ0NJRDM9eQojIENPTkZJR19JUF9EQ0NQX0NDSUQzX0RFQlVHIGlzIG5vdCBz ZXQKQ09ORklHX0lQX0RDQ1BfVEZSQ19MSUI9eQoKIwojIERDQ1AgS2VybmVsIEhhY2tpbmcKIwoj IENPTkZJR19JUF9EQ0NQX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfTkVUX0RDQ1BQUk9CRSBp cyBub3Qgc2V0CkNPTkZJR19JUF9TQ1RQPW0KIyBDT05GSUdfTkVUX1NDVFBQUk9CRSBpcyBub3Qg c2V0CiMgQ09ORklHX1NDVFBfREJHX01TRyBpcyBub3Qgc2V0CiMgQ09ORklHX1NDVFBfREJHX09C SkNOVCBpcyBub3Qgc2V0CiMgQ09ORklHX1NDVFBfSE1BQ19OT05FIGlzIG5vdCBzZXQKIyBDT05G SUdfU0NUUF9ITUFDX1NIQTEgaXMgbm90IHNldApDT05GSUdfU0NUUF9ITUFDX01ENT15CkNPTkZJ R19SRFM9bQpDT05GSUdfUkRTX1JETUE9bQpDT05GSUdfUkRTX1RDUD1tCiMgQ09ORklHX1JEU19E RUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX1RJUEMgaXMgbm90IHNldApDT05GSUdfQVRNPW0KQ09O RklHX0FUTV9DTElQPW0KIyBDT05GSUdfQVRNX0NMSVBfTk9fSUNNUCBpcyBub3Qgc2V0CkNPTkZJ R19BVE1fTEFORT1tCkNPTkZJR19BVE1fTVBPQT1tCkNPTkZJR19BVE1fQlIyNjg0PW0KIyBDT05G SUdfQVRNX0JSMjY4NF9JUEZJTFRFUiBpcyBub3Qgc2V0CiMgQ09ORklHX0wyVFAgaXMgbm90IHNl dApDT05GSUdfU1RQPW0KQ09ORklHX0dBUlA9bQpDT05GSUdfQlJJREdFPW0KQ09ORklHX0JSSURH RV9JR01QX1NOT09QSU5HPXkKQ09ORklHX05FVF9EU0E9eQpDT05GSUdfTkVUX0RTQV9UQUdfRFNB PXkKQ09ORklHX05FVF9EU0FfVEFHX0VEU0E9eQpDT05GSUdfTkVUX0RTQV9UQUdfVFJBSUxFUj15 CkNPTkZJR19WTEFOXzgwMjFRPW0KQ09ORklHX1ZMQU5fODAyMVFfR1ZSUD15CkNPTkZJR19ERUNO RVQ9bQojIENPTkZJR19ERUNORVRfUk9VVEVSIGlzIG5vdCBzZXQKQ09ORklHX0xMQz1tCkNPTkZJ R19MTEMyPW0KQ09ORklHX0lQWD1tCkNPTkZJR19JUFhfSU5URVJOPXkKQ09ORklHX0FUQUxLPW0K Q09ORklHX0RFVl9BUFBMRVRBTEs9bQpDT05GSUdfSVBERFA9bQpDT05GSUdfSVBERFBfRU5DQVA9 eQpDT05GSUdfSVBERFBfREVDQVA9eQpDT05GSUdfWDI1PW0KQ09ORklHX0xBUEI9bQojIENPTkZJ R19FQ09ORVQgaXMgbm90IHNldApDT05GSUdfV0FOX1JPVVRFUj1tCkNPTkZJR19QSE9ORVQ9bQpD T05GSUdfSUVFRTgwMjE1ND1tCkNPTkZJR19JRUVFODAyMTU0XzZMT1dQQU49bQpDT05GSUdfTkVU X1NDSEVEPXkKCiMKIyBRdWV1ZWluZy9TY2hlZHVsaW5nCiMKQ09ORklHX05FVF9TQ0hfQ0JRPW0K Q09ORklHX05FVF9TQ0hfSFRCPW0KQ09ORklHX05FVF9TQ0hfSEZTQz1tCkNPTkZJR19ORVRfU0NI X0FUTT1tCkNPTkZJR19ORVRfU0NIX1BSSU89bQpDT05GSUdfTkVUX1NDSF9NVUxUSVE9bQpDT05G SUdfTkVUX1NDSF9SRUQ9bQpDT05GSUdfTkVUX1NDSF9TRkI9bQpDT05GSUdfTkVUX1NDSF9TRlE9 bQpDT05GSUdfTkVUX1NDSF9URVFMPW0KQ09ORklHX05FVF9TQ0hfVEJGPW0KQ09ORklHX05FVF9T Q0hfR1JFRD1tCkNPTkZJR19ORVRfU0NIX0RTTUFSSz1tCkNPTkZJR19ORVRfU0NIX05FVEVNPW0K Q09ORklHX05FVF9TQ0hfRFJSPW0KQ09ORklHX05FVF9TQ0hfTVFQUklPPW0KQ09ORklHX05FVF9T Q0hfQ0hPS0U9bQpDT05GSUdfTkVUX1NDSF9RRlE9bQpDT05GSUdfTkVUX1NDSF9JTkdSRVNTPW0K Q09ORklHX05FVF9TQ0hfUExVRz1tCgojCiMgQ2xhc3NpZmljYXRpb24KIwpDT05GSUdfTkVUX0NM Uz15CkNPTkZJR19ORVRfQ0xTX0JBU0lDPW0KQ09ORklHX05FVF9DTFNfVENJTkRFWD1tCkNPTkZJ R19ORVRfQ0xTX1JPVVRFND1tCkNPTkZJR19ORVRfQ0xTX0ZXPW0KQ09ORklHX05FVF9DTFNfVTMy PW0KQ09ORklHX0NMU19VMzJfUEVSRj15CkNPTkZJR19DTFNfVTMyX01BUks9eQpDT05GSUdfTkVU X0NMU19SU1ZQPW0KQ09ORklHX05FVF9DTFNfUlNWUDY9bQpDT05GSUdfTkVUX0NMU19GTE9XPW0K Q09ORklHX05FVF9DTFNfQ0dST1VQPXkKQ09ORklHX05FVF9FTUFUQ0g9eQpDT05GSUdfTkVUX0VN QVRDSF9TVEFDSz0zMgpDT05GSUdfTkVUX0VNQVRDSF9DTVA9bQpDT05GSUdfTkVUX0VNQVRDSF9O QllURT1tCkNPTkZJR19ORVRfRU1BVENIX1UzMj1tCkNPTkZJR19ORVRfRU1BVENIX01FVEE9bQpD T05GSUdfTkVUX0VNQVRDSF9URVhUPW0KQ09ORklHX05FVF9DTFNfQUNUPXkKQ09ORklHX05FVF9B Q1RfUE9MSUNFPW0KQ09ORklHX05FVF9BQ1RfR0FDVD1tCkNPTkZJR19HQUNUX1BST0I9eQpDT05G SUdfTkVUX0FDVF9NSVJSRUQ9bQpDT05GSUdfTkVUX0FDVF9JUFQ9bQpDT05GSUdfTkVUX0FDVF9O QVQ9bQpDT05GSUdfTkVUX0FDVF9QRURJVD1tCkNPTkZJR19ORVRfQUNUX1NJTVA9bQpDT05GSUdf TkVUX0FDVF9TS0JFRElUPW0KIyBDT05GSUdfTkVUX0FDVF9DU1VNIGlzIG5vdCBzZXQKQ09ORklH X05FVF9DTFNfSU5EPXkKQ09ORklHX05FVF9TQ0hfRklGTz15CkNPTkZJR19EQ0I9eQpDT05GSUdf RE5TX1JFU09MVkVSPXkKQ09ORklHX0JBVE1BTl9BRFY9bQpDT05GSUdfQkFUTUFOX0FEVl9ERUJV Rz15CkNPTkZJR19PUEVOVlNXSVRDSD1tCkNPTkZJR19SUFM9eQpDT05GSUdfUkZTX0FDQ0VMPXkK Q09ORklHX1hQUz15CkNPTkZJR19ORVRQUklPX0NHUk9VUD1tCkNPTkZJR19CUUw9eQpDT05GSUdf SEFWRV9CUEZfSklUPXkKQ09ORklHX0JQRl9KSVQ9eQoKIwojIE5ldHdvcmsgdGVzdGluZwojCkNP TkZJR19ORVRfUEtUR0VOPW0KQ09ORklHX05FVF9UQ1BQUk9CRT1tCiMgQ09ORklHX05FVF9EUk9Q X01PTklUT1IgaXMgbm90IHNldApDT05GSUdfSEFNUkFESU89eQoKIwojIFBhY2tldCBSYWRpbyBw cm90b2NvbHMKIwpDT05GSUdfQVgyNT1tCkNPTkZJR19BWDI1X0RBTUFfU0xBVkU9eQpDT05GSUdf TkVUUk9NPW0KQ09ORklHX1JPU0U9bQoKIwojIEFYLjI1IG5ldHdvcmsgZGV2aWNlIGRyaXZlcnMK IwpDT05GSUdfTUtJU1M9bQpDT05GSUdfNlBBQ0s9bQpDT05GSUdfQlBRRVRIRVI9bQpDT05GSUdf QkFZQ09NX1NFUl9GRFg9bQpDT05GSUdfQkFZQ09NX1NFUl9IRFg9bQpDT05GSUdfQkFZQ09NX1BB Uj1tCkNPTkZJR19ZQU09bQpDT05GSUdfQ0FOPW0KQ09ORklHX0NBTl9SQVc9bQpDT05GSUdfQ0FO X0JDTT1tCkNPTkZJR19DQU5fR1c9bQoKIwojIENBTiBEZXZpY2UgRHJpdmVycwojCkNPTkZJR19D QU5fVkNBTj1tCiMgQ09ORklHX0NBTl9TTENBTiBpcyBub3Qgc2V0CkNPTkZJR19DQU5fREVWPW0K Q09ORklHX0NBTl9DQUxDX0JJVFRJTUlORz15CkNPTkZJR19DQU5fTUNQMjUxWD1tCkNPTkZJR19D QU5fSkFOWl9JQ0FOMz1tCiMgQ09ORklHX1BDSF9DQU4gaXMgbm90IHNldApDT05GSUdfQ0FOX1NK QTEwMDA9bQpDT05GSUdfQ0FOX1NKQTEwMDBfSVNBPW0KQ09ORklHX0NBTl9TSkExMDAwX1BMQVRG T1JNPW0KQ09ORklHX0NBTl9FTVNfUENNQ0lBPW0KQ09ORklHX0NBTl9FTVNfUENJPW0KQ09ORklH X0NBTl9QRUFLX1BDTUNJQT1tCkNPTkZJR19DQU5fUEVBS19QQ0k9bQpDT05GSUdfQ0FOX1BFQUtf UENJRUM9eQpDT05GSUdfQ0FOX0tWQVNFUl9QQ0k9bQpDT05GSUdfQ0FOX1BMWF9QQ0k9bQojIENP TkZJR19DQU5fQ19DQU4gaXMgbm90IHNldApDT05GSUdfQ0FOX0NDNzcwPW0KQ09ORklHX0NBTl9D Qzc3MF9JU0E9bQpDT05GSUdfQ0FOX0NDNzcwX1BMQVRGT1JNPW0KCiMKIyBDQU4gVVNCIGludGVy ZmFjZXMKIwpDT05GSUdfQ0FOX0VNU19VU0I9bQojIENPTkZJR19DQU5fRVNEX1VTQjIgaXMgbm90 IHNldApDT05GSUdfQ0FOX1BFQUtfVVNCPW0KIyBDT05GSUdfQ0FOX1NPRlRJTkcgaXMgbm90IHNl dAojIENPTkZJR19DQU5fREVCVUdfREVWSUNFUyBpcyBub3Qgc2V0CkNPTkZJR19JUkRBPW0KCiMK IyBJckRBIHByb3RvY29scwojCkNPTkZJR19JUkxBTj1tCkNPTkZJR19JUk5FVD1tCkNPTkZJR19J UkNPTU09bQpDT05GSUdfSVJEQV9VTFRSQT15CgojCiMgSXJEQSBvcHRpb25zCiMKQ09ORklHX0lS REFfQ0FDSEVfTEFTVF9MU0FQPXkKIyBDT05GSUdfSVJEQV9GQVNUX1JSIGlzIG5vdCBzZXQKIyBD T05GSUdfSVJEQV9ERUJVRyBpcyBub3Qgc2V0CgojCiMgSW5mcmFyZWQtcG9ydCBkZXZpY2UgZHJp dmVycwojCgojCiMgU0lSIGRldmljZSBkcml2ZXJzCiMKQ09ORklHX0lSVFRZX1NJUj1tCgojCiMg RG9uZ2xlIHN1cHBvcnQKIwpDT05GSUdfRE9OR0xFPXkKQ09ORklHX0VTSV9ET05HTEU9bQpDT05G SUdfQUNUSVNZU19ET05HTEU9bQpDT05GSUdfVEVLUkFNX0RPTkdMRT1tCkNPTkZJR19UT0lNMzIz Ml9ET05HTEU9bQpDT05GSUdfTElURUxJTktfRE9OR0xFPW0KQ09ORklHX01BNjAwX0RPTkdMRT1t CkNPTkZJR19HSVJCSUxfRE9OR0xFPW0KQ09ORklHX01DUDIxMjBfRE9OR0xFPW0KQ09ORklHX09M RF9CRUxLSU5fRE9OR0xFPW0KQ09ORklHX0FDVDIwMExfRE9OR0xFPW0KQ09ORklHX0tJTkdTVU5f RE9OR0xFPW0KQ09ORklHX0tTREFaWkxFX0RPTkdMRT1tCkNPTkZJR19LUzk1OV9ET05HTEU9bQoK IwojIEZJUiBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19VU0JfSVJEQT1tCkNPTkZJR19TSUdNQVRF TF9GSVI9bQpDT05GSUdfTlNDX0ZJUj1tCkNPTkZJR19XSU5CT05EX0ZJUj1tCkNPTkZJR19TTUNf SVJDQ19GSVI9bQpDT05GSUdfQUxJX0ZJUj1tCkNPTkZJR19WTFNJX0ZJUj1tCkNPTkZJR19WSUFf RklSPW0KQ09ORklHX01DU19GSVI9bQpDT05GSUdfQlQ9bQpDT05GSUdfQlRfUkZDT01NPW0KQ09O RklHX0JUX1JGQ09NTV9UVFk9eQpDT05GSUdfQlRfQk5FUD1tCkNPTkZJR19CVF9CTkVQX01DX0ZJ TFRFUj15CkNPTkZJR19CVF9CTkVQX1BST1RPX0ZJTFRFUj15CkNPTkZJR19CVF9DTVRQPW0KQ09O RklHX0JUX0hJRFA9bQoKIwojIEJsdWV0b290aCBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19CVF9I Q0lCVFVTQj1tCkNPTkZJR19CVF9IQ0lCVFNESU89bQpDT05GSUdfQlRfSENJVUFSVD1tCkNPTkZJ R19CVF9IQ0lVQVJUX0g0PXkKQ09ORklHX0JUX0hDSVVBUlRfQkNTUD15CiMgQ09ORklHX0JUX0hD SVVBUlRfQVRIM0sgaXMgbm90IHNldApDT05GSUdfQlRfSENJVUFSVF9MTD15CkNPTkZJR19CVF9I Q0lCQ00yMDNYPW0KQ09ORklHX0JUX0hDSUJQQTEwWD1tCkNPTkZJR19CVF9IQ0lCRlVTQj1tCkNP TkZJR19CVF9IQ0lEVEwxPW0KQ09ORklHX0JUX0hDSUJUM0M9bQpDT05GSUdfQlRfSENJQkxVRUNB UkQ9bQpDT05GSUdfQlRfSENJQlRVQVJUPW0KQ09ORklHX0JUX0hDSVZIQ0k9bQpDT05GSUdfQlRf TVJWTD1tCkNPTkZJR19CVF9NUlZMX1NESU89bQpDT05GSUdfQlRfQVRIM0s9bQpDT05GSUdfQlRf V0lMSU5LPW0KQ09ORklHX0FGX1JYUlBDPW0KIyBDT05GSUdfQUZfUlhSUENfREVCVUcgaXMgbm90 IHNldApDT05GSUdfUlhLQUQ9bQpDT05GSUdfRklCX1JVTEVTPXkKQ09ORklHX1dJUkVMRVNTPXkK Q09ORklHX1dJUkVMRVNTX0VYVD15CkNPTkZJR19XRVhUX0NPUkU9eQpDT05GSUdfV0VYVF9QUk9D PXkKQ09ORklHX1dFWFRfU1BZPXkKQ09ORklHX1dFWFRfUFJJVj15CkNPTkZJR19DRkc4MDIxMT1t CkNPTkZJR19OTDgwMjExX1RFU1RNT0RFPXkKIyBDT05GSUdfQ0ZHODAyMTFfREVWRUxPUEVSX1dB Uk5JTkdTIGlzIG5vdCBzZXQKIyBDT05GSUdfQ0ZHODAyMTFfUkVHX0RFQlVHIGlzIG5vdCBzZXQK Q09ORklHX0NGRzgwMjExX0RFRkFVTFRfUFM9eQojIENPTkZJR19DRkc4MDIxMV9ERUJVR0ZTIGlz IG5vdCBzZXQKIyBDT05GSUdfQ0ZHODAyMTFfSU5URVJOQUxfUkVHREIgaXMgbm90IHNldApDT05G SUdfQ0ZHODAyMTFfV0VYVD15CkNPTkZJR19XSVJFTEVTU19FWFRfU1lTRlM9eQpDT05GSUdfTElC ODAyMTE9bQpDT05GSUdfTElCODAyMTFfQ1JZUFRfV0VQPW0KQ09ORklHX0xJQjgwMjExX0NSWVBU X0NDTVA9bQpDT05GSUdfTElCODAyMTFfQ1JZUFRfVEtJUD1tCiMgQ09ORklHX0xJQjgwMjExX0RF QlVHIGlzIG5vdCBzZXQKQ09ORklHX01BQzgwMjExPW0KQ09ORklHX01BQzgwMjExX0hBU19SQz15 CkNPTkZJR19NQUM4MDIxMV9SQ19NSU5TVFJFTD15CkNPTkZJR19NQUM4MDIxMV9SQ19NSU5TVFJF TF9IVD15CkNPTkZJR19NQUM4MDIxMV9SQ19ERUZBVUxUX01JTlNUUkVMPXkKQ09ORklHX01BQzgw MjExX1JDX0RFRkFVTFQ9Im1pbnN0cmVsX2h0IgpDT05GSUdfTUFDODAyMTFfTUVTSD15CkNPTkZJ R19NQUM4MDIxMV9MRURTPXkKQ09ORklHX01BQzgwMjExX0RFQlVHRlM9eQojIENPTkZJR19NQUM4 MDIxMV9ERUJVR19NRU5VIGlzIG5vdCBzZXQKQ09ORklHX1dJTUFYPW0KQ09ORklHX1dJTUFYX0RF QlVHX0xFVkVMPTgKQ09ORklHX1JGS0lMTD1tCkNPTkZJR19SRktJTExfTEVEUz15CkNPTkZJR19S RktJTExfSU5QVVQ9eQpDT05GSUdfUkZLSUxMX1JFR1VMQVRPUj1tCkNPTkZJR19ORVRfOVA9bQpD T05GSUdfTkVUXzlQX1ZJUlRJTz1tCkNPTkZJR19ORVRfOVBfUkRNQT1tCiMgQ09ORklHX05FVF85 UF9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0NBSUYgaXMgbm90IHNldApDT05GSUdfQ0VQSF9M SUI9bQojIENPTkZJR19DRVBIX0xJQl9QUkVUVFlERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0NF UEhfTElCX1VTRV9ETlNfUkVTT0xWRVIgaXMgbm90IHNldApDT05GSUdfTkZDPW0KQ09ORklHX05G Q19OQ0k9bQojIENPTkZJR19ORkNfTExDUCBpcyBub3Qgc2V0CgojCiMgTmVhciBGaWVsZCBDb21t dW5pY2F0aW9uIChORkMpIGRldmljZXMKIwpDT05GSUdfUE41NDRfTkZDPW0KQ09ORklHX05GQ19Q TjUzMz1tCkNPTkZJR19ORkNfV0lMSU5LPW0KCiMKIyBEZXZpY2UgRHJpdmVycwojCgojCiMgR2Vu ZXJpYyBEcml2ZXIgT3B0aW9ucwojCkNPTkZJR19VRVZFTlRfSEVMUEVSX1BBVEg9IiIKQ09ORklH X0RFVlRNUEZTPXkKQ09ORklHX0RFVlRNUEZTX01PVU5UPXkKIyBDT05GSUdfU1RBTkRBTE9ORSBp cyBub3Qgc2V0CkNPTkZJR19QUkVWRU5UX0ZJUk1XQVJFX0JVSUxEPXkKQ09ORklHX0ZXX0xPQURF Uj15CiMgQ09ORklHX0ZJUk1XQVJFX0lOX0tFUk5FTCBpcyBub3Qgc2V0CkNPTkZJR19FWFRSQV9G SVJNV0FSRT0iIgojIENPTkZJR19ERUJVR19EUklWRVIgaXMgbm90IHNldAojIENPTkZJR19ERUJV R19ERVZSRVMgaXMgbm90IHNldApDT05GSUdfU1lTX0hZUEVSVklTT1I9eQojIENPTkZJR19HRU5F UklDX0NQVV9ERVZJQ0VTIGlzIG5vdCBzZXQKQ09ORklHX1JFR01BUD15CkNPTkZJR19SRUdNQVBf STJDPW0KQ09ORklHX1JFR01BUF9TUEk9eQpDT05GSUdfUkVHTUFQX0lSUT15CkNPTkZJR19ETUFf U0hBUkVEX0JVRkZFUj15CkNPTkZJR19DT05ORUNUT1I9eQpDT05GSUdfUFJPQ19FVkVOVFM9eQpD T05GSUdfTVREPW0KQ09ORklHX01URF9URVNUUz1tCkNPTkZJR19NVERfUkVEQk9PVF9QQVJUUz1t CkNPTkZJR19NVERfUkVEQk9PVF9ESVJFQ1RPUllfQkxPQ0s9LTEKIyBDT05GSUdfTVREX1JFREJP T1RfUEFSVFNfVU5BTExPQ0FURUQgaXMgbm90IHNldAojIENPTkZJR19NVERfUkVEQk9PVF9QQVJU U19SRUFET05MWSBpcyBub3Qgc2V0CkNPTkZJR19NVERfQVI3X1BBUlRTPW0KCiMKIyBVc2VyIE1v ZHVsZXMgQW5kIFRyYW5zbGF0aW9uIExheWVycwojCkNPTkZJR19NVERfQ0hBUj1tCkNPTkZJR19I QVZFX01URF9PVFA9eQpDT05GSUdfTVREX0JMS0RFVlM9bQpDT05GSUdfTVREX0JMT0NLPW0KQ09O RklHX01URF9CTE9DS19STz1tCkNPTkZJR19GVEw9bQpDT05GSUdfTkZUTD1tCkNPTkZJR19ORlRM X1JXPXkKQ09ORklHX0lORlRMPW0KQ09ORklHX1JGRF9GVEw9bQpDT05GSUdfU1NGREM9bQojIENP TkZJR19TTV9GVEwgaXMgbm90IHNldApDT05GSUdfTVREX09PUFM9bQpDT05GSUdfTVREX1NXQVA9 bQoKIwojIFJBTS9ST00vRmxhc2ggY2hpcCBkcml2ZXJzCiMKQ09ORklHX01URF9DRkk9bQpDT05G SUdfTVREX0pFREVDUFJPQkU9bQpDT05GSUdfTVREX0dFTl9QUk9CRT1tCkNPTkZJR19NVERfQ0ZJ X0FEVl9PUFRJT05TPXkKQ09ORklHX01URF9DRklfTk9TV0FQPXkKIyBDT05GSUdfTVREX0NGSV9C RV9CWVRFX1NXQVAgaXMgbm90IHNldAojIENPTkZJR19NVERfQ0ZJX0xFX0JZVEVfU1dBUCBpcyBu b3Qgc2V0CkNPTkZJR19NVERfQ0ZJX0dFT01FVFJZPXkKQ09ORklHX01URF9NQVBfQkFOS19XSURU SF8xPXkKQ09ORklHX01URF9NQVBfQkFOS19XSURUSF8yPXkKQ09ORklHX01URF9NQVBfQkFOS19X SURUSF80PXkKQ09ORklHX01URF9NQVBfQkFOS19XSURUSF84PXkKQ09ORklHX01URF9NQVBfQkFO S19XSURUSF8xNj15CkNPTkZJR19NVERfTUFQX0JBTktfV0lEVEhfMzI9eQpDT05GSUdfTVREX0NG SV9JMT15CkNPTkZJR19NVERfQ0ZJX0kyPXkKQ09ORklHX01URF9DRklfSTQ9eQpDT05GSUdfTVRE X0NGSV9JOD15CkNPTkZJR19NVERfT1RQPXkKQ09ORklHX01URF9DRklfSU5URUxFWFQ9bQpDT05G SUdfTVREX0NGSV9BTURTVEQ9bQpDT05GSUdfTVREX0NGSV9TVEFBPW0KQ09ORklHX01URF9DRklf VVRJTD1tCkNPTkZJR19NVERfUkFNPW0KQ09ORklHX01URF9ST009bQpDT05GSUdfTVREX0FCU0VO VD1tCgojCiMgTWFwcGluZyBkcml2ZXJzIGZvciBjaGlwIGFjY2VzcwojCkNPTkZJR19NVERfQ09N UExFWF9NQVBQSU5HUz15CkNPTkZJR19NVERfUEhZU01BUD1tCkNPTkZJR19NVERfUEhZU01BUF9D T01QQVQ9eQpDT05GSUdfTVREX1BIWVNNQVBfU1RBUlQ9MHg4MDAwMDAwCkNPTkZJR19NVERfUEhZ U01BUF9MRU49MApDT05GSUdfTVREX1BIWVNNQVBfQkFOS1dJRFRIPTIKQ09ORklHX01URF9TQzUy MENEUD1tCkNPTkZJR19NVERfTkVUU0M1MjA9bQpDT05GSUdfTVREX1RTNTUwMD1tCkNPTkZJR19N VERfU0JDX0dYWD1tCkNPTkZJR19NVERfQU1ENzZYUk9NPW0KQ09ORklHX01URF9JQ0hYUk9NPW0K Q09ORklHX01URF9FU0IyUk9NPW0KQ09ORklHX01URF9DSzgwNFhST009bQpDT05GSUdfTVREX1ND QjJfRkxBU0g9bQpDT05GSUdfTVREX05FVHRlbD1tCkNPTkZJR19NVERfTDQ0MEdYPW0KQ09ORklH X01URF9QQ0k9bQojIENPTkZJR19NVERfUENNQ0lBIGlzIG5vdCBzZXQKQ09ORklHX01URF9HUElP X0FERFI9bQpDT05GSUdfTVREX0lOVEVMX1ZSX05PUj1tCkNPTkZJR19NVERfUExBVFJBTT1tCkNP TkZJR19NVERfTEFUQ0hfQUREUj1tCgojCiMgU2VsZi1jb250YWluZWQgTVREIGRldmljZSBkcml2 ZXJzCiMKQ09ORklHX01URF9QTUM1NTE9bQpDT05GSUdfTVREX1BNQzU1MV9CVUdGSVg9eQojIENP TkZJR19NVERfUE1DNTUxX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX01URF9EQVRBRkxBU0g9bQpD T05GSUdfTVREX0RBVEFGTEFTSF9XUklURV9WRVJJRlk9eQpDT05GSUdfTVREX0RBVEFGTEFTSF9P VFA9eQpDT05GSUdfTVREX00yNVA4MD1tCkNPTkZJR19NMjVQWFhfVVNFX0ZBU1RfUkVBRD15CkNP TkZJR19NVERfU1NUMjVMPW0KQ09ORklHX01URF9TTFJBTT1tCkNPTkZJR19NVERfUEhSQU09bQpD T05GSUdfTVREX01URFJBTT1tCkNPTkZJR19NVERSQU1fVE9UQUxfU0laRT00MDk2CkNPTkZJR19N VERSQU1fRVJBU0VfU0laRT0xMjgKQ09ORklHX01URF9CTE9DSzJNVEQ9bQoKIwojIERpc2stT24t Q2hpcCBEZXZpY2UgRHJpdmVycwojCkNPTkZJR19NVERfRE9DMjAwMD1tCkNPTkZJR19NVERfRE9D MjAwMT1tCkNPTkZJR19NVERfRE9DMjAwMVBMVVM9bQpDT05GSUdfTVREX0RPQ0czPW0KQ09ORklH X0JDSF9DT05TVF9NPTE0CkNPTkZJR19CQ0hfQ09OU1RfVD00CkNPTkZJR19NVERfRE9DUFJPQkU9 bQpDT05GSUdfTVREX0RPQ0VDQz1tCkNPTkZJR19NVERfRE9DUFJPQkVfQURWQU5DRUQ9eQpDT05G SUdfTVREX0RPQ1BST0JFX0FERFJFU1M9MHgwMDAwCkNPTkZJR19NVERfRE9DUFJPQkVfSElHSD15 CkNPTkZJR19NVERfRE9DUFJPQkVfNTVBQT15CkNPTkZJR19NVERfTkFORF9FQ0M9bQpDT05GSUdf TVREX05BTkRfRUNDX1NNQz15CkNPTkZJR19NVERfTkFORD1tCkNPTkZJR19NVERfTkFORF9WRVJJ RllfV1JJVEU9eQojIENPTkZJR19NVERfTkFORF9FQ0NfQkNIIGlzIG5vdCBzZXQKIyBDT05GSUdf TVREX1NNX0NPTU1PTiBpcyBub3Qgc2V0CkNPTkZJR19NVERfTkFORF9NVVNFVU1fSURTPXkKIyBD T05GSUdfTVREX05BTkRfREVOQUxJIGlzIG5vdCBzZXQKQ09ORklHX01URF9OQU5EX0lEUz1tCiMg Q09ORklHX01URF9OQU5EX1JJQ09IIGlzIG5vdCBzZXQKQ09ORklHX01URF9OQU5EX0RJU0tPTkNI SVA9bQpDT05GSUdfTVREX05BTkRfRElTS09OQ0hJUF9QUk9CRV9BRFZBTkNFRD15CkNPTkZJR19N VERfTkFORF9ESVNLT05DSElQX1BST0JFX0FERFJFU1M9MApDT05GSUdfTVREX05BTkRfRElTS09O Q0hJUF9QUk9CRV9ISUdIPXkKQ09ORklHX01URF9OQU5EX0RJU0tPTkNISVBfQkJUV1JJVEU9eQpD T05GSUdfTVREX05BTkRfRE9DRzQ9bQpDT05GSUdfTVREX05BTkRfQ0FGRT1tCkNPTkZJR19NVERf TkFORF9OQU5EU0lNPW0KQ09ORklHX01URF9OQU5EX1BMQVRGT1JNPW0KQ09ORklHX01URF9BTEFV REE9bQpDT05GSUdfTVREX09ORU5BTkQ9bQpDT05GSUdfTVREX09ORU5BTkRfVkVSSUZZX1dSSVRF PXkKQ09ORklHX01URF9PTkVOQU5EX0dFTkVSSUM9bQpDT05GSUdfTVREX09ORU5BTkRfT1RQPXkK Q09ORklHX01URF9PTkVOQU5EXzJYX1BST0dSQU09eQpDT05GSUdfTVREX09ORU5BTkRfU0lNPW0K CiMKIyBMUEREUiBmbGFzaCBtZW1vcnkgZHJpdmVycwojCkNPTkZJR19NVERfTFBERFI9bQpDT05G SUdfTVREX1FJTkZPX1BST0JFPW0KQ09ORklHX01URF9VQkk9bQpDT05GSUdfTVREX1VCSV9XTF9U SFJFU0hPTEQ9NDA5NgpDT05GSUdfTVREX1VCSV9CRUJfUkVTRVJWRT0xCkNPTkZJR19NVERfVUJJ X0dMVUVCST1tCiMgQ09ORklHX01URF9VQklfREVCVUcgaXMgbm90IHNldApDT05GSUdfUEFSUE9S VD1tCkNPTkZJR19QQVJQT1JUX1BDPW0KQ09ORklHX1BBUlBPUlRfU0VSSUFMPW0KQ09ORklHX1BB UlBPUlRfUENfRklGTz15CkNPTkZJR19QQVJQT1JUX1BDX1NVUEVSSU89eQpDT05GSUdfUEFSUE9S VF9QQ19QQ01DSUE9bQojIENPTkZJR19QQVJQT1JUX0dTQyBpcyBub3Qgc2V0CkNPTkZJR19QQVJQ T1JUX0FYODg3OTY9bQpDT05GSUdfUEFSUE9SVF8xMjg0PXkKQ09ORklHX1BBUlBPUlRfTk9UX1BD PXkKQ09ORklHX1BOUD15CiMgQ09ORklHX1BOUF9ERUJVR19NRVNTQUdFUyBpcyBub3Qgc2V0Cgoj CiMgUHJvdG9jb2xzCiMKQ09ORklHX1BOUEFDUEk9eQpDT05GSUdfQkxLX0RFVj15CkNPTkZJR19C TEtfREVWX0ZEPW0KQ09ORklHX1BBUklERT1tCgojCiMgUGFyYWxsZWwgSURFIGhpZ2gtbGV2ZWwg ZHJpdmVycwojCkNPTkZJR19QQVJJREVfUEQ9bQpDT05GSUdfUEFSSURFX1BDRD1tCkNPTkZJR19Q QVJJREVfUEY9bQpDT05GSUdfUEFSSURFX1BUPW0KQ09ORklHX1BBUklERV9QRz1tCgojCiMgUGFy YWxsZWwgSURFIHByb3RvY29sIG1vZHVsZXMKIwpDT05GSUdfUEFSSURFX0FURU49bQpDT05GSUdf UEFSSURFX0JQQ0s9bQpDT05GSUdfUEFSSURFX0NPTU09bQpDT05GSUdfUEFSSURFX0RTVFI9bQpD T05GSUdfUEFSSURFX0ZJVDI9bQpDT05GSUdfUEFSSURFX0ZJVDM9bQpDT05GSUdfUEFSSURFX0VQ QVQ9bQpDT05GSUdfUEFSSURFX0VQQVRDOD15CkNPTkZJR19QQVJJREVfRVBJQT1tCkNPTkZJR19Q QVJJREVfRlJJUT1tCkNPTkZJR19QQVJJREVfRlJQVz1tCkNPTkZJR19QQVJJREVfS0JJQz1tCkNP TkZJR19QQVJJREVfS1RUST1tCkNPTkZJR19QQVJJREVfT04yMD1tCkNPTkZJR19QQVJJREVfT04y Nj1tCkNPTkZJR19CTEtfREVWX1BDSUVTU0RfTVRJUDMyWFg9bQpDT05GSUdfQkxLX0NQUV9EQT1t CkNPTkZJR19CTEtfQ1BRX0NJU1NfREE9bQpDT05GSUdfQ0lTU19TQ1NJX1RBUEU9eQpDT05GSUdf QkxLX0RFVl9EQUM5NjA9bQpDT05GSUdfQkxLX0RFVl9VTUVNPW0KIyBDT05GSUdfQkxLX0RFVl9D T1dfQ09NTU9OIGlzIG5vdCBzZXQKQ09ORklHX0JMS19ERVZfTE9PUD15CkNPTkZJR19CTEtfREVW X0xPT1BfTUlOX0NPVU5UPTgKQ09ORklHX0JMS19ERVZfQ1JZUFRPTE9PUD1tCkNPTkZJR19CTEtf REVWX0RSQkQ9bQojIENPTkZJR19EUkJEX0ZBVUxUX0lOSkVDVElPTiBpcyBub3Qgc2V0CkNPTkZJ R19CTEtfREVWX05CRD1tCkNPTkZJR19CTEtfREVWX05WTUU9bQpDT05GSUdfQkxLX0RFVl9PU0Q9 bQpDT05GSUdfQkxLX0RFVl9TWDg9bQojIENPTkZJR19CTEtfREVWX1VCIGlzIG5vdCBzZXQKQ09O RklHX0JMS19ERVZfUkFNPW0KQ09ORklHX0JMS19ERVZfUkFNX0NPVU5UPTE2CkNPTkZJR19CTEtf REVWX1JBTV9TSVpFPTEzMTA3MgpDT05GSUdfQkxLX0RFVl9YSVA9eQpDT05GSUdfQ0RST01fUEtU Q0RWRD1tCkNPTkZJR19DRFJPTV9QS1RDRFZEX0JVRkZFUlM9OApDT05GSUdfQ0RST01fUEtUQ0RW RF9XQ0FDSEU9eQpDT05GSUdfQVRBX09WRVJfRVRIPW0KQ09ORklHX1hFTl9CTEtERVZfRlJPTlRF TkQ9bQpDT05GSUdfWEVOX0JMS0RFVl9CQUNLRU5EPW0KQ09ORklHX1ZJUlRJT19CTEs9bQojIENP TkZJR19CTEtfREVWX0hEIGlzIG5vdCBzZXQKIyBDT05GSUdfQkxLX0RFVl9SQkQgaXMgbm90IHNl dAoKIwojIE1pc2MgZGV2aWNlcwojCkNPTkZJR19TRU5TT1JTX0xJUzNMVjAyRD1tCkNPTkZJR19B RDUyNVhfRFBPVD1tCiMgQ09ORklHX0FENTI1WF9EUE9UX0kyQyBpcyBub3Qgc2V0CiMgQ09ORklH X0FENTI1WF9EUE9UX1NQSSBpcyBub3Qgc2V0CkNPTkZJR19JQk1fQVNNPW0KQ09ORklHX1BIQU5U T009bQojIENPTkZJR19JTlRFTF9NSURfUFRJIGlzIG5vdCBzZXQKQ09ORklHX1NHSV9JT0M0PW0K Q09ORklHX1RJRk1fQ09SRT1tCkNPTkZJR19USUZNXzdYWDE9bQpDT05GSUdfSUNTOTMyUzQwMT1t CkNPTkZJR19FTkNMT1NVUkVfU0VSVklDRVM9bQpDT05GSUdfQ1M1NTM1X01GR1BUPW0KQ09ORklH X0NTNTUzNV9NRkdQVF9ERUZBVUxUX0lSUT03CkNPTkZJR19DUzU1MzVfQ0xPQ0tfRVZFTlRfU1JD PW0KQ09ORklHX0hQX0lMTz1tCkNPTkZJR19BUERTOTgwMkFMUz1tCiMgQ09ORklHX0lTTDI5MDAz IGlzIG5vdCBzZXQKQ09ORklHX0lTTDI5MDIwPW0KQ09ORklHX1NFTlNPUlNfVFNMMjU1MD1tCkNP TkZJR19TRU5TT1JTX0JIMTc4MD1tCkNPTkZJR19TRU5TT1JTX0JIMTc3MD1tCkNPTkZJR19TRU5T T1JTX0FQRFM5OTBYPW0KQ09ORklHX0hNQzYzNTI9bQpDT05GSUdfRFMxNjgyPW0KQ09ORklHX1RJ X0RBQzc1MTI9bQojIENPTkZJR19WTVdBUkVfQkFMTE9PTiBpcyBub3Qgc2V0CkNPTkZJR19CTVAw ODU9bQpDT05GSUdfUENIX1BIVUI9bQpDT05GSUdfVVNCX1NXSVRDSF9GU0E5NDgwPW0KQ09ORklH X0MyUE9SVD1tCkNPTkZJR19DMlBPUlRfRFVSQU1BUl8yMTUwPW0KCiMKIyBFRVBST00gc3VwcG9y dAojCkNPTkZJR19FRVBST01fQVQyND1tCkNPTkZJR19FRVBST01fQVQyNT1tCkNPTkZJR19FRVBS T01fTEVHQUNZPW0KQ09ORklHX0VFUFJPTV9NQVg2ODc1PW0KQ09ORklHX0VFUFJPTV85M0NYNj1t CkNPTkZJR19FRVBST01fOTNYWDQ2PW0KQ09ORklHX0NCNzEwX0NPUkU9bQojIENPTkZJR19DQjcx MF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19DQjcxMF9ERUJVR19BU1NVTVBUSU9OUz15CkNPTkZJ R19JV01DMzIwMFRPUD1tCiMgQ09ORklHX0lXTUMzMjAwVE9QX0RFQlVHIGlzIG5vdCBzZXQKIyBD T05GSUdfSVdNQzMyMDBUT1BfREVCVUdGUyBpcyBub3Qgc2V0CgojCiMgVGV4YXMgSW5zdHJ1bWVu dHMgc2hhcmVkIHRyYW5zcG9ydCBsaW5lIGRpc2NpcGxpbmUKIwpDT05GSUdfVElfU1Q9bQpDT05G SUdfU0VOU09SU19MSVMzX0kyQz1tCgojCiMgQWx0ZXJhIEZQR0EgZmlybXdhcmUgZG93bmxvYWQg bW9kdWxlCiMKQ09ORklHX0FMVEVSQV9TVEFQTD1tCkNPTkZJR19IQVZFX0lERT15CiMgQ09ORklH X0lERSBpcyBub3Qgc2V0CgojCiMgU0NTSSBkZXZpY2Ugc3VwcG9ydAojCkNPTkZJR19TQ1NJX01P RD1tCkNPTkZJR19SQUlEX0FUVFJTPW0KQ09ORklHX1NDU0k9bQpDT05GSUdfU0NTSV9ETUE9eQpD T05GSUdfU0NTSV9UR1Q9bQpDT05GSUdfU0NTSV9ORVRMSU5LPXkKQ09ORklHX1NDU0lfUFJPQ19G Uz15CgojCiMgU0NTSSBzdXBwb3J0IHR5cGUgKGRpc2ssIHRhcGUsIENELVJPTSkKIwpDT05GSUdf QkxLX0RFVl9TRD1tCkNPTkZJR19DSFJfREVWX1NUPW0KQ09ORklHX0NIUl9ERVZfT1NTVD1tCkNP TkZJR19CTEtfREVWX1NSPW0KIyBDT05GSUdfQkxLX0RFVl9TUl9WRU5ET1IgaXMgbm90IHNldApD T05GSUdfQ0hSX0RFVl9TRz1tCkNPTkZJR19DSFJfREVWX1NDSD1tCkNPTkZJR19TQ1NJX0VOQ0xP U1VSRT1tCkNPTkZJR19TQ1NJX01VTFRJX0xVTj15CkNPTkZJR19TQ1NJX0NPTlNUQU5UUz15CkNP TkZJR19TQ1NJX0xPR0dJTkc9eQojIENPTkZJR19TQ1NJX1NDQU5fQVNZTkMgaXMgbm90IHNldApD T05GSUdfU0NTSV9XQUlUX1NDQU49bQoKIwojIFNDU0kgVHJhbnNwb3J0cwojCkNPTkZJR19TQ1NJ X1NQSV9BVFRSUz1tCkNPTkZJR19TQ1NJX0ZDX0FUVFJTPW0KQ09ORklHX1NDU0lfRkNfVEdUX0FU VFJTPXkKQ09ORklHX1NDU0lfSVNDU0lfQVRUUlM9bQpDT05GSUdfU0NTSV9TQVNfQVRUUlM9bQpD T05GSUdfU0NTSV9TQVNfTElCU0FTPW0KQ09ORklHX1NDU0lfU0FTX0FUQT15CkNPTkZJR19TQ1NJ X1NBU19IT1NUX1NNUD15CkNPTkZJR19TQ1NJX1NSUF9BVFRSUz1tCkNPTkZJR19TQ1NJX1NSUF9U R1RfQVRUUlM9eQpDT05GSUdfU0NTSV9MT1dMRVZFTD15CkNPTkZJR19JU0NTSV9UQ1A9bQpDT05G SUdfSVNDU0lfQk9PVF9TWVNGUz1tCkNPTkZJR19TQ1NJX0NYR0IzX0lTQ1NJPW0KQ09ORklHX1ND U0lfQ1hHQjRfSVNDU0k9bQpDT05GSUdfU0NTSV9CTlgyX0lTQ1NJPW0KQ09ORklHX1NDU0lfQk5Y MlhfRkNPRT1tCkNPTkZJR19CRTJJU0NTST1tCkNPTkZJR19CTEtfREVWXzNXX1hYWFhfUkFJRD1t CkNPTkZJR19TQ1NJX0hQU0E9bQpDT05GSUdfU0NTSV8zV185WFhYPW0KQ09ORklHX1NDU0lfM1df U0FTPW0KQ09ORklHX1NDU0lfQUNBUkQ9bQpDT05GSUdfU0NTSV9BQUNSQUlEPW0KQ09ORklHX1ND U0lfQUlDN1hYWD1tCkNPTkZJR19BSUM3WFhYX0NNRFNfUEVSX0RFVklDRT0zMgpDT05GSUdfQUlD N1hYWF9SRVNFVF9ERUxBWV9NUz0xNTAwMAojIENPTkZJR19BSUM3WFhYX0RFQlVHX0VOQUJMRSBp cyBub3Qgc2V0CkNPTkZJR19BSUM3WFhYX0RFQlVHX01BU0s9MApDT05GSUdfQUlDN1hYWF9SRUdf UFJFVFRZX1BSSU5UPXkKQ09ORklHX1NDU0lfQUlDN1hYWF9PTEQ9bQpDT05GSUdfU0NTSV9BSUM3 OVhYPW0KQ09ORklHX0FJQzc5WFhfQ01EU19QRVJfREVWSUNFPTMyCkNPTkZJR19BSUM3OVhYX1JF U0VUX0RFTEFZX01TPTUwMDAKIyBDT05GSUdfQUlDNzlYWF9ERUJVR19FTkFCTEUgaXMgbm90IHNl dApDT05GSUdfQUlDNzlYWF9ERUJVR19NQVNLPTAKQ09ORklHX0FJQzc5WFhfUkVHX1BSRVRUWV9Q UklOVD15CkNPTkZJR19TQ1NJX0FJQzk0WFg9bQojIENPTkZJR19BSUM5NFhYX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX1NDU0lfTVZTQVM9bQojIENPTkZJR19TQ1NJX01WU0FTX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX1NDU0lfTVZTQVNfVEFTS0xFVD15CkNPTkZJR19TQ1NJX01WVU1JPW0KQ09O RklHX1NDU0lfRFBUX0kyTz1tCkNPTkZJR19TQ1NJX0FEVkFOU1lTPW0KQ09ORklHX1NDU0lfQVJD TVNSPW0KQ09ORklHX01FR0FSQUlEX05FV0dFTj15CkNPTkZJR19NRUdBUkFJRF9NTT1tCkNPTkZJ R19NRUdBUkFJRF9NQUlMQk9YPW0KQ09ORklHX01FR0FSQUlEX0xFR0FDWT1tCkNPTkZJR19NRUdB UkFJRF9TQVM9bQpDT05GSUdfU0NTSV9NUFQyU0FTPW0KQ09ORklHX1NDU0lfTVBUMlNBU19NQVhf U0dFPTEyOAojIENPTkZJR19TQ1NJX01QVDJTQVNfTE9HR0lORyBpcyBub3Qgc2V0CkNPTkZJR19T Q1NJX1VGU0hDRD1tCkNPTkZJR19TQ1NJX0hQVElPUD1tCkNPTkZJR19TQ1NJX0JVU0xPR0lDPW0K IyBDT05GSUdfVk1XQVJFX1BWU0NTSSBpcyBub3Qgc2V0CkNPTkZJR19MSUJGQz1tCkNPTkZJR19M SUJGQ09FPW0KQ09ORklHX0ZDT0U9bQpDT05GSUdfRkNPRV9GTklDPW0KQ09ORklHX1NDU0lfRE1Y MzE5MUQ9bQpDT05GSUdfU0NTSV9FQVRBPW0KQ09ORklHX1NDU0lfRUFUQV9UQUdHRURfUVVFVUU9 eQpDT05GSUdfU0NTSV9FQVRBX0xJTktFRF9DT01NQU5EUz15CkNPTkZJR19TQ1NJX0VBVEFfTUFY X1RBR1M9MTYKQ09ORklHX1NDU0lfRlVUVVJFX0RPTUFJTj1tCkNPTkZJR19TQ1NJX0dEVEg9bQpD T05GSUdfU0NTSV9JU0NJPW0KQ09ORklHX1NDU0lfSVBTPW0KQ09ORklHX1NDU0lfSU5JVElPPW0K Q09ORklHX1NDU0lfSU5JQTEwMD1tCkNPTkZJR19TQ1NJX1BQQT1tCkNPTkZJR19TQ1NJX0lNTT1t CiMgQ09ORklHX1NDU0lfSVpJUF9FUFAxNiBpcyBub3Qgc2V0CiMgQ09ORklHX1NDU0lfSVpJUF9T TE9XX0NUUiBpcyBub3Qgc2V0CkNPTkZJR19TQ1NJX1NURVg9bQpDT05GSUdfU0NTSV9TWU01M0M4 WFhfMj1tCkNPTkZJR19TQ1NJX1NZTTUzQzhYWF9ETUFfQUREUkVTU0lOR19NT0RFPTEKQ09ORklH X1NDU0lfU1lNNTNDOFhYX0RFRkFVTFRfVEFHUz0xNgpDT05GSUdfU0NTSV9TWU01M0M4WFhfTUFY X1RBR1M9NjQKQ09ORklHX1NDU0lfU1lNNTNDOFhYX01NSU89eQpDT05GSUdfU0NTSV9JUFI9bQpD T05GSUdfU0NTSV9JUFJfVFJBQ0U9eQpDT05GSUdfU0NTSV9JUFJfRFVNUD15CkNPTkZJR19TQ1NJ X1FMT0dJQ18xMjgwPW0KQ09ORklHX1NDU0lfUUxBX0ZDPW0KQ09ORklHX1NDU0lfUUxBX0lTQ1NJ PW0KQ09ORklHX1NDU0lfTFBGQz1tCiMgQ09ORklHX1NDU0lfTFBGQ19ERUJVR19GUyBpcyBub3Qg c2V0CkNPTkZJR19TQ1NJX0RDMzk1eD1tCkNPTkZJR19TQ1NJX0RDMzkwVD1tCkNPTkZJR19TQ1NJ X0RFQlVHPW0KQ09ORklHX1NDU0lfUE1DUkFJRD1tCkNPTkZJR19TQ1NJX1BNODAwMT1tCkNPTkZJ R19TQ1NJX1NSUD1tCkNPTkZJR19TQ1NJX0JGQV9GQz1tCkNPTkZJR19TQ1NJX1ZJUlRJTz1tCkNP TkZJR19TQ1NJX0xPV0xFVkVMX1BDTUNJQT15CkNPTkZJR19QQ01DSUFfQUhBMTUyWD1tCkNPTkZJ R19QQ01DSUFfRkRPTUFJTj1tCkNPTkZJR19QQ01DSUFfUUxPR0lDPW0KQ09ORklHX1BDTUNJQV9T WU01M0M1MDA9bQpDT05GSUdfU0NTSV9ESD1tCkNPTkZJR19TQ1NJX0RIX1JEQUM9bQpDT05GSUdf U0NTSV9ESF9IUF9TVz1tCkNPTkZJR19TQ1NJX0RIX0VNQz1tCkNPTkZJR19TQ1NJX0RIX0FMVUE9 bQpDT05GSUdfU0NTSV9PU0RfSU5JVElBVE9SPW0KQ09ORklHX1NDU0lfT1NEX1VMRD1tCkNPTkZJ R19TQ1NJX09TRF9EUFJJTlRfU0VOU0U9MQojIENPTkZJR19TQ1NJX09TRF9ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19BVEE9bQojIENPTkZJR19BVEFfTk9OU1RBTkRBUkQgaXMgbm90IHNldApDT05G SUdfQVRBX1ZFUkJPU0VfRVJST1I9eQpDT05GSUdfQVRBX0FDUEk9eQpDT05GSUdfU0FUQV9QTVA9 eQoKIwojIENvbnRyb2xsZXJzIHdpdGggbm9uLVNGRiBuYXRpdmUgaW50ZXJmYWNlCiMKQ09ORklH X1NBVEFfQUhDST1tCkNPTkZJR19TQVRBX0FIQ0lfUExBVEZPUk09bQpDT05GSUdfU0FUQV9JTklD MTYyWD1tCkNPTkZJR19TQVRBX0FDQVJEX0FIQ0k9bQpDT05GSUdfU0FUQV9TSUwyND1tCkNPTkZJ R19BVEFfU0ZGPXkKCiMKIyBTRkYgY29udHJvbGxlcnMgd2l0aCBjdXN0b20gRE1BIGludGVyZmFj ZQojCkNPTkZJR19QRENfQURNQT1tCkNPTkZJR19TQVRBX1FTVE9SPW0KQ09ORklHX1NBVEFfU1g0 PW0KQ09ORklHX0FUQV9CTURNQT15CgojCiMgU0FUQSBTRkYgY29udHJvbGxlcnMgd2l0aCBCTURN QQojCkNPTkZJR19BVEFfUElJWD1tCkNPTkZJR19TQVRBX01WPW0KQ09ORklHX1NBVEFfTlY9bQpD T05GSUdfU0FUQV9QUk9NSVNFPW0KQ09ORklHX1NBVEFfU0lMPW0KQ09ORklHX1NBVEFfU0lTPW0K Q09ORklHX1NBVEFfU1ZXPW0KQ09ORklHX1NBVEFfVUxJPW0KQ09ORklHX1NBVEFfVklBPW0KQ09O RklHX1NBVEFfVklURVNTRT1tCgojCiMgUEFUQSBTRkYgY29udHJvbGxlcnMgd2l0aCBCTURNQQoj CkNPTkZJR19QQVRBX0FMST1tCkNPTkZJR19QQVRBX0FNRD1tCkNPTkZJR19QQVRBX0FSQVNBTl9D Rj1tCkNPTkZJR19QQVRBX0FSVE9QPW0KQ09ORklHX1BBVEFfQVRJSVhQPW0KQ09ORklHX1BBVEFf QVRQODY3WD1tCkNPTkZJR19QQVRBX0NNRDY0WD1tCkNPTkZJR19QQVRBX0NTNTUyMD1tCkNPTkZJ R19QQVRBX0NTNTUzMD1tCkNPTkZJR19QQVRBX0NTNTUzNj1tCkNPTkZJR19QQVRBX0NZUFJFU1M9 bQpDT05GSUdfUEFUQV9FRkFSPW0KQ09ORklHX1BBVEFfSFBUMzY2PW0KQ09ORklHX1BBVEFfSFBU MzdYPW0KQ09ORklHX1BBVEFfSFBUM1gyTj1tCkNPTkZJR19QQVRBX0hQVDNYMz1tCiMgQ09ORklH X1BBVEFfSFBUM1gzX0RNQSBpcyBub3Qgc2V0CkNPTkZJR19QQVRBX0lUODIxMz1tCkNPTkZJR19Q QVRBX0lUODIxWD1tCkNPTkZJR19QQVRBX0pNSUNST049bQpDT05GSUdfUEFUQV9NQVJWRUxMPW0K Q09ORklHX1BBVEFfTkVUQ0VMTD1tCkNPTkZJR19QQVRBX05JTkpBMzI9bQpDT05GSUdfUEFUQV9O Uzg3NDE1PW0KQ09ORklHX1BBVEFfT0xEUElJWD1tCkNPTkZJR19QQVRBX09QVElETUE9bQpDT05G SUdfUEFUQV9QREMyMDI3WD1tCkNPTkZJR19QQVRBX1BEQ19PTEQ9bQpDT05GSUdfUEFUQV9SQURJ U1lTPW0KQ09ORklHX1BBVEFfUkRDPW0KQ09ORklHX1BBVEFfU0MxMjAwPW0KQ09ORklHX1BBVEFf U0NIPW0KQ09ORklHX1BBVEFfU0VSVkVSV09SS1M9bQpDT05GSUdfUEFUQV9TSUw2ODA9bQpDT05G SUdfUEFUQV9TSVM9bQpDT05GSUdfUEFUQV9UT1NISUJBPW0KQ09ORklHX1BBVEFfVFJJRkxFWD1t CkNPTkZJR19QQVRBX1ZJQT1tCkNPTkZJR19QQVRBX1dJTkJPTkQ9bQoKIwojIFBJTy1vbmx5IFNG RiBjb250cm9sbGVycwojCkNPTkZJR19QQVRBX0NNRDY0MF9QQ0k9bQpDT05GSUdfUEFUQV9NUElJ WD1tCkNPTkZJR19QQVRBX05TODc0MTA9bQpDT05GSUdfUEFUQV9PUFRJPW0KQ09ORklHX1BBVEFf UENNQ0lBPW0KQ09ORklHX1BBVEFfUloxMDAwPW0KCiMKIyBHZW5lcmljIGZhbGxiYWNrIC8gbGVn YWN5IGRyaXZlcnMKIwpDT05GSUdfUEFUQV9BQ1BJPW0KQ09ORklHX0FUQV9HRU5FUklDPW0KIyBD T05GSUdfUEFUQV9MRUdBQ1kgaXMgbm90IHNldApDT05GSUdfTUQ9eQpDT05GSUdfQkxLX0RFVl9N RD15CkNPTkZJR19NRF9BVVRPREVURUNUPXkKQ09ORklHX01EX0xJTkVBUj1tCkNPTkZJR19NRF9S QUlEMD1tCkNPTkZJR19NRF9SQUlEMT1tCkNPTkZJR19NRF9SQUlEMTA9bQpDT05GSUdfTURfUkFJ RDQ1Nj1tCiMgQ09ORklHX01VTFRJQ09SRV9SQUlENDU2IGlzIG5vdCBzZXQKQ09ORklHX01EX01V TFRJUEFUSD1tCkNPTkZJR19NRF9GQVVMVFk9bQpDT05GSUdfQkxLX0RFVl9ETT15CiMgQ09ORklH X0RNX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0RNX0JVRklPPW0KQ09ORklHX0RNX1BFUlNJU1RF TlRfREFUQT1tCkNPTkZJR19ETV9DUllQVD1tCkNPTkZJR19ETV9TTkFQU0hPVD1tCkNPTkZJR19E TV9USElOX1BST1ZJU0lPTklORz1tCiMgQ09ORklHX0RNX0RFQlVHX0JMT0NLX1NUQUNLX1RSQUNJ TkcgaXMgbm90IHNldAojIENPTkZJR19ETV9ERUJVR19TUEFDRV9NQVBTIGlzIG5vdCBzZXQKQ09O RklHX0RNX01JUlJPUj1tCkNPTkZJR19ETV9SQUlEPW0KQ09ORklHX0RNX0xPR19VU0VSU1BBQ0U9 bQpDT05GSUdfRE1fWkVSTz1tCkNPTkZJR19ETV9NVUxUSVBBVEg9bQpDT05GSUdfRE1fTVVMVElQ QVRIX1FMPW0KQ09ORklHX0RNX01VTFRJUEFUSF9TVD1tCkNPTkZJR19ETV9ERUxBWT1tCkNPTkZJ R19ETV9VRVZFTlQ9eQpDT05GSUdfRE1fRkxBS0VZPW0KQ09ORklHX0RNX1ZFUklUWT1tCiMgQ09O RklHX1RBUkdFVF9DT1JFIGlzIG5vdCBzZXQKQ09ORklHX0ZVU0lPTj15CkNPTkZJR19GVVNJT05f U1BJPW0KQ09ORklHX0ZVU0lPTl9GQz1tCkNPTkZJR19GVVNJT05fU0FTPW0KQ09ORklHX0ZVU0lP Tl9NQVhfU0dFPTEyOApDT05GSUdfRlVTSU9OX0NUTD1tCkNPTkZJR19GVVNJT05fTEFOPW0KIyBD T05GSUdfRlVTSU9OX0xPR0dJTkcgaXMgbm90IHNldAoKIwojIElFRUUgMTM5NCAoRmlyZVdpcmUp IHN1cHBvcnQKIwpDT05GSUdfRklSRVdJUkU9bQpDT05GSUdfRklSRVdJUkVfT0hDST1tCkNPTkZJ R19GSVJFV0lSRV9TQlAyPW0KQ09ORklHX0ZJUkVXSVJFX05FVD1tCiMgQ09ORklHX0ZJUkVXSVJF X05PU1kgaXMgbm90IHNldApDT05GSUdfSTJPPW0KQ09ORklHX0kyT19MQ1RfTk9USUZZX09OX0NI QU5HRVM9eQpDT05GSUdfSTJPX0VYVF9BREFQVEVDPXkKQ09ORklHX0kyT19FWFRfQURBUFRFQ19E TUE2ND15CkNPTkZJR19JMk9fQ09ORklHPW0KQ09ORklHX0kyT19DT05GSUdfT0xEX0lPQ1RMPXkK Q09ORklHX0kyT19CVVM9bQpDT05GSUdfSTJPX0JMT0NLPW0KQ09ORklHX0kyT19TQ1NJPW0KQ09O RklHX0kyT19QUk9DPW0KQ09ORklHX01BQ0lOVE9TSF9EUklWRVJTPXkKQ09ORklHX01BQ19FTVVN T1VTRUJUTj1tCkNPTkZJR19ORVRERVZJQ0VTPXkKQ09ORklHX05FVF9DT1JFPXkKQ09ORklHX0JP TkRJTkc9bQpDT05GSUdfRFVNTVk9bQpDT05GSUdfRVFVQUxJWkVSPW0KQ09ORklHX05FVF9GQz15 CkNPTkZJR19NSUk9eQpDT05GSUdfSUVFRTgwMjE1NF9EUklWRVJTPW0KQ09ORklHX0lFRUU4MDIx NTRfRkFLRUhBUkQ9bQpDT05GSUdfSUZCPW0KQ09ORklHX05FVF9URUFNPW0KQ09ORklHX05FVF9U RUFNX01PREVfUk9VTkRST0JJTj1tCkNPTkZJR19ORVRfVEVBTV9NT0RFX0FDVElWRUJBQ0tVUD1t CkNPTkZJR19NQUNWTEFOPW0KQ09ORklHX01BQ1ZUQVA9bQpDT05GSUdfTkVUQ09OU09MRT1tCkNP TkZJR19ORVRDT05TT0xFX0RZTkFNSUM9eQpDT05GSUdfTkVUUE9MTD15CkNPTkZJR19ORVRQT0xM X1RSQVA9eQpDT05GSUdfTkVUX1BPTExfQ09OVFJPTExFUj15CkNPTkZJR19UVU49bQpDT05GSUdf VkVUSD1tCkNPTkZJR19WSVJUSU9fTkVUPW0KQ09ORklHX1NVTkdFTV9QSFk9bQpDT05GSUdfQVJD TkVUPW0KQ09ORklHX0FSQ05FVF8xMjAxPW0KQ09ORklHX0FSQ05FVF8xMDUxPW0KQ09ORklHX0FS Q05FVF9SQVc9bQpDT05GSUdfQVJDTkVUX0NBUD1tCkNPTkZJR19BUkNORVRfQ09NOTB4eD1tCkNP TkZJR19BUkNORVRfQ09NOTB4eElPPW0KQ09ORklHX0FSQ05FVF9SSU1fST1tCiMgQ09ORklHX0FS Q05FVF9DT00yMDAyMCBpcyBub3Qgc2V0CkNPTkZJR19BVE1fRFJJVkVSUz15CkNPTkZJR19BVE1f RFVNTVk9bQpDT05GSUdfQVRNX1RDUD1tCkNPTkZJR19BVE1fTEFOQUk9bQpDT05GSUdfQVRNX0VO ST1tCiMgQ09ORklHX0FUTV9FTklfREVCVUcgaXMgbm90IHNldApDT05GSUdfQVRNX0VOSV9UVU5F X0JVUlNUPXkKQ09ORklHX0FUTV9FTklfQlVSU1RfVFhfMTZXPXkKQ09ORklHX0FUTV9FTklfQlVS U1RfVFhfOFc9eQpDT05GSUdfQVRNX0VOSV9CVVJTVF9UWF80Vz15CkNPTkZJR19BVE1fRU5JX0JV UlNUX1RYXzJXPXkKQ09ORklHX0FUTV9FTklfQlVSU1RfUlhfMTZXPXkKQ09ORklHX0FUTV9FTklf QlVSU1RfUlhfOFc9eQpDT05GSUdfQVRNX0VOSV9CVVJTVF9SWF80Vz15CkNPTkZJR19BVE1fRU5J X0JVUlNUX1JYXzJXPXkKQ09ORklHX0FUTV9GSVJFU1RSRUFNPW0KQ09ORklHX0FUTV9aQVRNPW0K IyBDT05GSUdfQVRNX1pBVE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfQVRNX05JQ1NUQVI9bQoj IENPTkZJR19BVE1fTklDU1RBUl9VU0VfU1VOSSBpcyBub3Qgc2V0CiMgQ09ORklHX0FUTV9OSUNT VEFSX1VTRV9JRFQ3NzEwNSBpcyBub3Qgc2V0CkNPTkZJR19BVE1fSURUNzcyNTI9bQojIENPTkZJ R19BVE1fSURUNzcyNTJfREVCVUcgaXMgbm90IHNldAojIENPTkZJR19BVE1fSURUNzcyNTJfUkNW X0FMTCBpcyBub3Qgc2V0CkNPTkZJR19BVE1fSURUNzcyNTJfVVNFX1NVTkk9eQpDT05GSUdfQVRN X0FNQkFTU0FET1I9bQojIENPTkZJR19BVE1fQU1CQVNTQURPUl9ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19BVE1fSE9SSVpPTj1tCiMgQ09ORklHX0FUTV9IT1JJWk9OX0RFQlVHIGlzIG5vdCBzZXQK Q09ORklHX0FUTV9JQT1tCiMgQ09ORklHX0FUTV9JQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19B VE1fRk9SRTIwMEU9bQpDT05GSUdfQVRNX0ZPUkUyMDBFX1VTRV9UQVNLTEVUPXkKQ09ORklHX0FU TV9GT1JFMjAwRV9UWF9SRVRSWT0xNgpDT05GSUdfQVRNX0ZPUkUyMDBFX0RFQlVHPTAKQ09ORklH X0FUTV9IRT1tCkNPTkZJR19BVE1fSEVfVVNFX1NVTkk9eQpDT05GSUdfQVRNX1NPTE9TPW0KCiMK IyBDQUlGIHRyYW5zcG9ydCBkcml2ZXJzCiMKCiMKIyBEaXN0cmlidXRlZCBTd2l0Y2ggQXJjaGl0 ZWN0dXJlIGRyaXZlcnMKIwpDT05GSUdfTkVUX0RTQV9NVjg4RTZYWFg9eQpDT05GSUdfTkVUX0RT QV9NVjg4RTYwNjA9eQpDT05GSUdfTkVUX0RTQV9NVjg4RTZYWFhfTkVFRF9QUFU9eQpDT05GSUdf TkVUX0RTQV9NVjg4RTYxMzE9eQpDT05GSUdfTkVUX0RTQV9NVjg4RTYxMjNfNjFfNjU9eQpDT05G SUdfRVRIRVJORVQ9eQpDT05GSUdfTURJTz1tCkNPTkZJR19ORVRfVkVORE9SXzNDT009eQpDT05G SUdfUENNQ0lBXzNDNTc0PW0KQ09ORklHX1BDTUNJQV8zQzU4OT1tCkNPTkZJR19WT1JURVg9bQpD T05GSUdfVFlQSE9PTj1tCkNPTkZJR19ORVRfVkVORE9SX0FEQVBURUM9eQpDT05GSUdfQURBUFRF Q19TVEFSRklSRT1tCkNPTkZJR19ORVRfVkVORE9SX0FMVEVPTj15CkNPTkZJR19BQ0VOSUM9bQoj IENPTkZJR19BQ0VOSUNfT01JVF9USUdPTl9JIGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5ET1Jf QU1EPXkKQ09ORklHX0FNRDgxMTFfRVRIPW0KQ09ORklHX1BDTkVUMzI9bQpDT05GSUdfUENNQ0lB X05NQ0xBTj1tCkNPTkZJR19ORVRfVkVORE9SX0FUSEVST1M9eQpDT05GSUdfQVRMMj1tCkNPTkZJ R19BVEwxPW0KQ09ORklHX0FUTDFFPW0KQ09ORklHX0FUTDFDPW0KQ09ORklHX05FVF9WRU5ET1Jf QlJPQURDT009eQpDT05GSUdfQjQ0PW0KQ09ORklHX0I0NF9QQ0lfQVVUT1NFTEVDVD15CkNPTkZJ R19CNDRfUENJQ09SRV9BVVRPU0VMRUNUPXkKQ09ORklHX0I0NF9QQ0k9eQpDT05GSUdfQk5YMj1t CkNPTkZJR19DTklDPW0KQ09ORklHX1RJR09OMz1tCkNPTkZJR19CTlgyWD1tCkNPTkZJR19ORVRf VkVORE9SX0JST0NBREU9eQpDT05GSUdfQk5BPW0KQ09ORklHX05FVF9DQUxYRURBX1hHTUFDPW0K Q09ORklHX05FVF9WRU5ET1JfQ0hFTFNJTz15CkNPTkZJR19DSEVMU0lPX1QxPW0KQ09ORklHX0NI RUxTSU9fVDFfMUc9eQpDT05GSUdfQ0hFTFNJT19UMz1tCkNPTkZJR19DSEVMU0lPX1Q0PW0KQ09O RklHX0NIRUxTSU9fVDRWRj1tCkNPTkZJR19ORVRfVkVORE9SX0NJU0NPPXkKQ09ORklHX0VOSUM9 bQpDT05GSUdfRE5FVD1tCkNPTkZJR19ORVRfVkVORE9SX0RFQz15CkNPTkZJR19ORVRfVFVMSVA9 eQpDT05GSUdfREUyMTA0WD1tCkNPTkZJR19ERTIxMDRYX0RTTD0wCkNPTkZJR19UVUxJUD1tCiMg Q09ORklHX1RVTElQX01XSSBpcyBub3Qgc2V0CiMgQ09ORklHX1RVTElQX01NSU8gaXMgbm90IHNl dApDT05GSUdfVFVMSVBfTkFQST15CkNPTkZJR19UVUxJUF9OQVBJX0hXX01JVElHQVRJT049eQpD T05GSUdfREU0WDU9bQpDT05GSUdfV0lOQk9ORF84NDA9bQpDT05GSUdfRE05MTAyPW0KQ09ORklH X1VMSTUyNlg9bQpDT05GSUdfUENNQ0lBX1hJUkNPTT1tCkNPTkZJR19ORVRfVkVORE9SX0RMSU5L PXkKQ09ORklHX0RFNjAwPW0KQ09ORklHX0RFNjIwPW0KQ09ORklHX0RMMks9bQpDT05GSUdfU1VO REFOQ0U9bQojIENPTkZJR19TVU5EQU5DRV9NTUlPIGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5E T1JfRU1VTEVYPXkKQ09ORklHX0JFMk5FVD1tCkNPTkZJR19ORVRfVkVORE9SX0VYQVI9eQpDT05G SUdfUzJJTz1tCkNPTkZJR19WWEdFPW0KIyBDT05GSUdfVlhHRV9ERUJVR19UUkFDRV9BTEwgaXMg bm90IHNldApDT05GSUdfTkVUX1ZFTkRPUl9GVUpJVFNVPXkKQ09ORklHX1BDTUNJQV9GTVZKMThY PW0KQ09ORklHX05FVF9WRU5ET1JfSFA9eQpDT05GSUdfSFAxMDA9bQpDT05GSUdfTkVUX1ZFTkRP Ul9JTlRFTD15CkNPTkZJR19FMTAwPW0KQ09ORklHX0UxMDAwPW0KQ09ORklHX0UxMDAwRT1tCkNP TkZJR19JR0I9bQpDT05GSUdfSUdCX0RDQT15CkNPTkZJR19JR0JWRj1tCkNPTkZJR19JWEdCPW0K Q09ORklHX0lYR0JFPW0KQ09ORklHX0lYR0JFX0RDQT15CkNPTkZJR19JWEdCRV9EQ0I9eQpDT05G SUdfSVhHQkVWRj1tCkNPTkZJR19ORVRfVkVORE9SX0k4MjVYWD15CkNPTkZJR19aTkVUPW0KQ09O RklHX0lQMTAwMD1tCkNPTkZJR19KTUU9bQpDT05GSUdfTkVUX1ZFTkRPUl9NQVJWRUxMPXkKQ09O RklHX1NLR0U9bQojIENPTkZJR19TS0dFX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1NLR0VfR0VO RVNJUz15CkNPTkZJR19TS1kyPW0KIyBDT05GSUdfU0tZMl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19ORVRfVkVORE9SX01FTExBTk9YPXkKQ09ORklHX01MWDRfRU49bQpDT05GSUdfTUxYNF9DT1JF PW0KQ09ORklHX01MWDRfREVCVUc9eQpDT05GSUdfTkVUX1ZFTkRPUl9NSUNSRUw9eQpDT05GSUdf S1M4ODQyPW0KQ09ORklHX0tTODg1MT1tCkNPTkZJR19LUzg4NTFfTUxMPW0KQ09ORklHX0tTWjg4 NFhfUENJPW0KQ09ORklHX05FVF9WRU5ET1JfTUlDUk9DSElQPXkKQ09ORklHX0VOQzI4SjYwPW0K IyBDT05GSUdfRU5DMjhKNjBfV1JJVEVWRVJJRlkgaXMgbm90IHNldApDT05GSUdfTkVUX1ZFTkRP Ul9NWVJJPXkKQ09ORklHX01ZUkkxMEdFPW0KQ09ORklHX01ZUkkxMEdFX0RDQT15CkNPTkZJR19G RUFMTlg9bQpDT05GSUdfTkVUX1ZFTkRPUl9OQVRTRU1JPXkKQ09ORklHX05BVFNFTUk9bQpDT05G SUdfTlM4MzgyMD1tCkNPTkZJR19ORVRfVkVORE9SXzgzOTA9eQpDT05GSUdfUENNQ0lBX0FYTkVU PW0KQ09ORklHX05FMktfUENJPW0KQ09ORklHX1BDTUNJQV9QQ05FVD1tCkNPTkZJR19ORVRfVkVO RE9SX05WSURJQT15CkNPTkZJR19GT1JDRURFVEg9bQpDT05GSUdfTkVUX1ZFTkRPUl9PS0k9eQpD T05GSUdfUENIX0dCRT1tCkNPTkZJR19FVEhPQz1tCiMgQ09ORklHX05FVF9QQUNLRVRfRU5HSU5F IGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5ET1JfUUxPR0lDPXkKQ09ORklHX1FMQTNYWFg9bQpD T05GSUdfUUxDTklDPW0KQ09ORklHX1FMR0U9bQpDT05GSUdfTkVUWEVOX05JQz1tCkNPTkZJR19O RVRfVkVORE9SX1JFQUxURUs9eQpDT05GSUdfQVRQPW0KQ09ORklHXzgxMzlDUD1tCkNPTkZJR184 MTM5VE9PPW0KIyBDT05GSUdfODEzOVRPT19QSU8gaXMgbm90IHNldAojIENPTkZJR184MTM5VE9P X1RVTkVfVFdJU1RFUiBpcyBub3Qgc2V0CkNPTkZJR184MTM5VE9PXzgxMjk9eQojIENPTkZJR184 MTM5X09MRF9SWF9SRVNFVCBpcyBub3Qgc2V0CkNPTkZJR19SODE2OT1tCkNPTkZJR19ORVRfVkVO RE9SX1JEQz15CkNPTkZJR19SNjA0MD1tCkNPTkZJR19ORVRfVkVORE9SX1NFRVE9eQpDT05GSUdf U0VFUTgwMDU9bQpDT05GSUdfTkVUX1ZFTkRPUl9TSUxBTj15CkNPTkZJR19TQzkyMDMxPW0KQ09O RklHX05FVF9WRU5ET1JfU0lTPXkKQ09ORklHX1NJUzkwMD1tCkNPTkZJR19TSVMxOTA9bQpDT05G SUdfU0ZDPW0KQ09ORklHX1NGQ19NVEQ9eQpDT05GSUdfU0ZDX01DRElfTU9OPXkKQ09ORklHX1NG Q19TUklPVj15CkNPTkZJR19ORVRfVkVORE9SX1NNU0M9eQpDT05GSUdfUENNQ0lBX1NNQzkxQzky PW0KQ09ORklHX0VQSUMxMDA9bQpDT05GSUdfU01TQzk0MjA9bQpDT05GSUdfTkVUX1ZFTkRPUl9T VE1JQ1JPPXkKQ09ORklHX1NUTU1BQ19FVEg9bQpDT05GSUdfU1RNTUFDX1BMQVRGT1JNPW0KQ09O RklHX1NUTU1BQ19QQ0k9bQojIENPTkZJR19TVE1NQUNfREVCVUdfRlMgaXMgbm90IHNldAojIENP TkZJR19TVE1NQUNfREEgaXMgbm90IHNldApDT05GSUdfU1RNTUFDX1JJTkc9eQojIENPTkZJR19T VE1NQUNfQ0hBSU5FRCBpcyBub3Qgc2V0CkNPTkZJR19ORVRfVkVORE9SX1NVTj15CkNPTkZJR19I QVBQWU1FQUw9bQpDT05GSUdfU1VOR0VNPW0KQ09ORklHX0NBU1NJTkk9bQpDT05GSUdfTklVPW0K Q09ORklHX05FVF9WRU5ET1JfVEVIVVRJPXkKQ09ORklHX1RFSFVUST1tCkNPTkZJR19ORVRfVkVO RE9SX1RJPXkKQ09ORklHX1RMQU49bQpDT05GSUdfTkVUX1ZFTkRPUl9WSUE9eQpDT05GSUdfVklB X1JISU5FPW0KQ09ORklHX1ZJQV9SSElORV9NTUlPPXkKQ09ORklHX1ZJQV9WRUxPQ0lUWT1tCkNP TkZJR19ORVRfVkVORE9SX1hJUkNPTT15CkNPTkZJR19QQ01DSUFfWElSQzJQUz1tCkNPTkZJR19G RERJPW0KQ09ORklHX0RFRlhYPW0KQ09ORklHX0RFRlhYX01NSU89eQpDT05GSUdfU0tGUD1tCkNP TkZJR19ISVBQST15CkNPTkZJR19ST0FEUlVOTkVSPW0KQ09ORklHX1JPQURSVU5ORVJfTEFSR0Vf UklOR1M9eQojIENPTkZJR19ORVRfU0IxMDAwIGlzIG5vdCBzZXQKQ09ORklHX1BIWUxJQj15Cgoj CiMgTUlJIFBIWSBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19BTURfUEhZPW0KQ09ORklHX01BUlZF TExfUEhZPW0KQ09ORklHX0RBVklDT01fUEhZPW0KQ09ORklHX1FTRU1JX1BIWT1tCkNPTkZJR19M WFRfUEhZPW0KQ09ORklHX0NJQ0FEQV9QSFk9bQpDT05GSUdfVklURVNTRV9QSFk9bQpDT05GSUdf U01TQ19QSFk9bQpDT05GSUdfQlJPQURDT01fUEhZPW0KQ09ORklHX0lDUExVU19QSFk9bQpDT05G SUdfUkVBTFRFS19QSFk9bQpDT05GSUdfTkFUSU9OQUxfUEhZPW0KQ09ORklHX1NURTEwWFA9bQpD T05GSUdfTFNJX0VUMTAxMUNfUEhZPW0KQ09ORklHX01JQ1JFTF9QSFk9bQpDT05GSUdfRklYRURf UEhZPXkKQ09ORklHX01ESU9fQklUQkFORz1tCkNPTkZJR19NRElPX0dQSU89bQpDT05GSUdfTUlD UkVMX0tTODk5NU1BPW0KQ09ORklHX1BMSVA9bQpDT05GSUdfUFBQPW0KQ09ORklHX1BQUF9CU0RD T01QPW0KQ09ORklHX1BQUF9ERUZMQVRFPW0KQ09ORklHX1BQUF9GSUxURVI9eQpDT05GSUdfUFBQ X01QUEU9bQpDT05GSUdfUFBQX01VTFRJTElOSz15CkNPTkZJR19QUFBPQVRNPW0KQ09ORklHX1BQ UE9FPW0KQ09ORklHX1BQUF9BU1lOQz1tCkNPTkZJR19QUFBfU1lOQ19UVFk9bQpDT05GSUdfU0xJ UD1tCkNPTkZJR19TTEhDPW0KQ09ORklHX1NMSVBfQ09NUFJFU1NFRD15CkNPTkZJR19TTElQX1NN QVJUPXkKQ09ORklHX1NMSVBfTU9ERV9TTElQNj15CiMgQ09ORklHX1RSIGlzIG5vdCBzZXQKCiMK IyBVU0IgTmV0d29yayBBZGFwdGVycwojCkNPTkZJR19VU0JfQ0FUQz1tCkNPTkZJR19VU0JfS0FX RVRIPW0KQ09ORklHX1VTQl9QRUdBU1VTPW0KQ09ORklHX1VTQl9SVEw4MTUwPW0KQ09ORklHX1VT Ql9VU0JORVQ9bQpDT05GSUdfVVNCX05FVF9BWDg4MTdYPW0KQ09ORklHX1VTQl9ORVRfQ0RDRVRI RVI9bQpDT05GSUdfVVNCX05FVF9DRENfRUVNPW0KQ09ORklHX1VTQl9ORVRfQ0RDX05DTT1tCkNP TkZJR19VU0JfTkVUX0RNOTYwMT1tCkNPTkZJR19VU0JfTkVUX1NNU0M3NVhYPW0KQ09ORklHX1VT Ql9ORVRfU01TQzk1WFg9bQpDT05GSUdfVVNCX05FVF9HTDYyMEE9bQpDT05GSUdfVVNCX05FVF9O RVQxMDgwPW0KQ09ORklHX1VTQl9ORVRfUExVU0I9bQpDT05GSUdfVVNCX05FVF9NQ1M3ODMwPW0K Q09ORklHX1VTQl9ORVRfUk5ESVNfSE9TVD1tCkNPTkZJR19VU0JfTkVUX0NEQ19TVUJTRVQ9bQpD T05GSUdfVVNCX0FMSV9NNTYzMj15CkNPTkZJR19VU0JfQU4yNzIwPXkKQ09ORklHX1VTQl9CRUxL SU49eQpDT05GSUdfVVNCX0FSTUxJTlVYPXkKQ09ORklHX1VTQl9FUFNPTjI4ODg9eQpDT05GSUdf VVNCX0tDMjE5MD15CkNPTkZJR19VU0JfTkVUX1pBVVJVUz1tCkNPTkZJR19VU0JfTkVUX0NYODIz MTBfRVRIPW0KQ09ORklHX1VTQl9ORVRfS0FMTUlBPW0KQ09ORklHX1VTQl9ORVRfUU1JX1dXQU49 bQpDT05GSUdfVVNCX0hTTz1tCkNPTkZJR19VU0JfTkVUX0lOVDUxWDE9bQpDT05GSUdfVVNCX0NE Q19QSE9ORVQ9bQpDT05GSUdfVVNCX0lQSEVUSD1tCkNPTkZJR19VU0JfU0lFUlJBX05FVD1tCkNP TkZJR19VU0JfVkw2MDA9bQpDT05GSUdfV0xBTj15CkNPTkZJR19QQ01DSUFfUkFZQ1M9bQpDT05G SUdfTElCRVJUQVNfVEhJTkZJUk09bQojIENPTkZJR19MSUJFUlRBU19USElORklSTV9ERUJVRyBp cyBub3Qgc2V0CkNPTkZJR19MSUJFUlRBU19USElORklSTV9VU0I9bQpDT05GSUdfQUlSTz1tCkNP TkZJR19BVE1FTD1tCkNPTkZJR19QQ0lfQVRNRUw9bQpDT05GSUdfUENNQ0lBX0FUTUVMPW0KQ09O RklHX0FUNzZDNTBYX1VTQj1tCkNPTkZJR19BSVJPX0NTPW0KQ09ORklHX1BDTUNJQV9XTDM1MDE9 bQpDT05GSUdfUFJJU001ND1tCkNPTkZJR19VU0JfWkQxMjAxPW0KQ09ORklHX1VTQl9ORVRfUk5E SVNfV0xBTj1tCkNPTkZJR19SVEw4MTgwPW0KQ09ORklHX1JUTDgxODc9bQpDT05GSUdfUlRMODE4 N19MRURTPXkKQ09ORklHX0FETTgyMTE9bQpDT05GSUdfTUFDODAyMTFfSFdTSU09bQpDT05GSUdf TVdMOEs9bQpDT05GSUdfQVRIX0NPTU1PTj1tCiMgQ09ORklHX0FUSF9ERUJVRyBpcyBub3Qgc2V0 CkNPTkZJR19BVEg1Sz1tCiMgQ09ORklHX0FUSDVLX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdf QVRINUtfVFJBQ0VSIGlzIG5vdCBzZXQKQ09ORklHX0FUSDVLX1BDST15CkNPTkZJR19BVEg5S19I Vz1tCkNPTkZJR19BVEg5S19DT01NT049bQpDT05GSUdfQVRIOUtfQlRDT0VYX1NVUFBPUlQ9eQpD T05GSUdfQVRIOUs9bQpDT05GSUdfQVRIOUtfUENJPXkKQ09ORklHX0FUSDlLX0FIQj15CiMgQ09O RklHX0FUSDlLX0RFQlVHRlMgaXMgbm90IHNldApDT05GSUdfQVRIOUtfUkFURV9DT05UUk9MPXkK Q09ORklHX0FUSDlLX0hUQz1tCiMgQ09ORklHX0FUSDlLX0hUQ19ERUJVR0ZTIGlzIG5vdCBzZXQK Q09ORklHX0NBUkw5MTcwPW0KQ09ORklHX0NBUkw5MTcwX0xFRFM9eQojIENPTkZJR19DQVJMOTE3 MF9ERUJVR0ZTIGlzIG5vdCBzZXQKQ09ORklHX0NBUkw5MTcwX1dQQz15CkNPTkZJR19DQVJMOTE3 MF9IV1JORz15CkNPTkZJR19BVEg2S0w9bQpDT05GSUdfQVRINktMX1NESU89bQpDT05GSUdfQVRI NktMX1VTQj1tCiMgQ09ORklHX0FUSDZLTF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19CNDM9bQpD T05GSUdfQjQzX1NTQj15CkNPTkZJR19CNDNfUENJX0FVVE9TRUxFQ1Q9eQpDT05GSUdfQjQzX1BD SUNPUkVfQVVUT1NFTEVDVD15CkNPTkZJR19CNDNfUENNQ0lBPXkKQ09ORklHX0I0M19TRElPPXkK Q09ORklHX0I0M19QSU89eQpDT05GSUdfQjQzX1BIWV9OPXkKQ09ORklHX0I0M19QSFlfTFA9eQpD T05GSUdfQjQzX1BIWV9IVD15CkNPTkZJR19CNDNfTEVEUz15CkNPTkZJR19CNDNfSFdSTkc9eQoj IENPTkZJR19CNDNfREVCVUcgaXMgbm90IHNldApDT05GSUdfQjQzTEVHQUNZPW0KQ09ORklHX0I0 M0xFR0FDWV9QQ0lfQVVUT1NFTEVDVD15CkNPTkZJR19CNDNMRUdBQ1lfUENJQ09SRV9BVVRPU0VM RUNUPXkKQ09ORklHX0I0M0xFR0FDWV9MRURTPXkKQ09ORklHX0I0M0xFR0FDWV9IV1JORz15CiMg Q09ORklHX0I0M0xFR0FDWV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19CNDNMRUdBQ1lfRE1BPXkK Q09ORklHX0I0M0xFR0FDWV9QSU89eQpDT05GSUdfQjQzTEVHQUNZX0RNQV9BTkRfUElPX01PREU9 eQojIENPTkZJR19CNDNMRUdBQ1lfRE1BX01PREUgaXMgbm90IHNldAojIENPTkZJR19CNDNMRUdB Q1lfUElPX01PREUgaXMgbm90IHNldAojIENPTkZJR19CUkNNRk1BQyBpcyBub3Qgc2V0CkNPTkZJ R19IT1NUQVA9bQpDT05GSUdfSE9TVEFQX0ZJUk1XQVJFPXkKQ09ORklHX0hPU1RBUF9GSVJNV0FS RV9OVlJBTT15CkNPTkZJR19IT1NUQVBfUExYPW0KQ09ORklHX0hPU1RBUF9QQ0k9bQpDT05GSUdf SE9TVEFQX0NTPW0KQ09ORklHX0lQVzIxMDA9bQpDT05GSUdfSVBXMjEwMF9NT05JVE9SPXkKIyBD T05GSUdfSVBXMjEwMF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19JUFcyMjAwPW0KQ09ORklHX0lQ VzIyMDBfTU9OSVRPUj15CkNPTkZJR19JUFcyMjAwX1JBRElPVEFQPXkKQ09ORklHX0lQVzIyMDBf UFJPTUlTQ1VPVVM9eQpDT05GSUdfSVBXMjIwMF9RT1M9eQojIENPTkZJR19JUFcyMjAwX0RFQlVH IGlzIG5vdCBzZXQKQ09ORklHX0xJQklQVz1tCiMgQ09ORklHX0xJQklQV19ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19JV0xXSUZJPW0KCiMKIyBEZWJ1Z2dpbmcgT3B0aW9ucwojCiMgQ09ORklHX0lX TFdJRklfREVCVUcgaXMgbm90IHNldApDT05GSUdfSVdMV0lGSV9ERUJVR0ZTPXkKIyBDT05GSUdf SVdMV0lGSV9ERVZJQ0VfVFJBQ0lORyBpcyBub3Qgc2V0CkNPTkZJR19JV0xXSUZJX0RFVklDRV9U RVNUTU9ERT15CiMgQ09ORklHX0lXTFdJRklfUDJQIGlzIG5vdCBzZXQKIyBDT05GSUdfSVdMV0lG SV9FWFBFUklNRU5UQUxfTUZQIGlzIG5vdCBzZXQKQ09ORklHX0lXTEVHQUNZPW0KQ09ORklHX0lX TDQ5NjU9bQpDT05GSUdfSVdMMzk0NT1tCgojCiMgaXdsMzk0NSAvIGl3bDQ5NjUgRGVidWdnaW5n IE9wdGlvbnMKIwojIENPTkZJR19JV0xFR0FDWV9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0lX TEVHQUNZX0RFQlVHRlMgaXMgbm90IHNldApDT05GSUdfSVdNPW0KIyBDT05GSUdfSVdNX0RFQlVH IGlzIG5vdCBzZXQKIyBDT05GSUdfSVdNX1RSQUNJTkcgaXMgbm90IHNldApDT05GSUdfTElCRVJU QVM9bQpDT05GSUdfTElCRVJUQVNfVVNCPW0KQ09ORklHX0xJQkVSVEFTX0NTPW0KQ09ORklHX0xJ QkVSVEFTX1NESU89bQpDT05GSUdfTElCRVJUQVNfU1BJPW0KIyBDT05GSUdfTElCRVJUQVNfREVC VUcgaXMgbm90IHNldApDT05GSUdfTElCRVJUQVNfTUVTSD15CkNPTkZJR19IRVJNRVM9bQojIENP TkZJR19IRVJNRVNfUFJJU00gaXMgbm90IHNldApDT05GSUdfSEVSTUVTX0NBQ0hFX0ZXX09OX0lO SVQ9eQpDT05GSUdfUExYX0hFUk1FUz1tCkNPTkZJR19UTURfSEVSTUVTPW0KQ09ORklHX05PUlRF TF9IRVJNRVM9bQpDT05GSUdfUENNQ0lBX0hFUk1FUz1tCkNPTkZJR19QQ01DSUFfU1BFQ1RSVU09 bQpDT05GSUdfT1JJTk9DT19VU0I9bQpDT05GSUdfUDU0X0NPTU1PTj1tCkNPTkZJR19QNTRfVVNC PW0KQ09ORklHX1A1NF9QQ0k9bQpDT05GSUdfUDU0X1NQST1tCiMgQ09ORklHX1A1NF9TUElfREVG QVVMVF9FRVBST00gaXMgbm90IHNldApDT05GSUdfUDU0X0xFRFM9eQpDT05GSUdfUlQyWDAwPW0K Q09ORklHX1JUMjQwMFBDST1tCkNPTkZJR19SVDI1MDBQQ0k9bQpDT05GSUdfUlQ2MVBDST1tCiMg Q09ORklHX1JUMjgwMFBDSSBpcyBub3Qgc2V0CkNPTkZJR19SVDI1MDBVU0I9bQpDT05GSUdfUlQ3 M1VTQj1tCkNPTkZJR19SVDI4MDBVU0I9bQpDT05GSUdfUlQyODAwVVNCX1JUMzNYWD15CiMgQ09O RklHX1JUMjgwMFVTQl9SVDM1WFggaXMgbm90IHNldApDT05GSUdfUlQyODAwVVNCX1JUNTNYWD15 CiMgQ09ORklHX1JUMjgwMFVTQl9VTktOT1dOIGlzIG5vdCBzZXQKQ09ORklHX1JUMjgwMF9MSUI9 bQpDT05GSUdfUlQyWDAwX0xJQl9QQ0k9bQpDT05GSUdfUlQyWDAwX0xJQl9VU0I9bQpDT05GSUdf UlQyWDAwX0xJQj1tCkNPTkZJR19SVDJYMDBfTElCX0ZJUk1XQVJFPXkKQ09ORklHX1JUMlgwMF9M SUJfQ1JZUFRPPXkKQ09ORklHX1JUMlgwMF9MSUJfTEVEUz15CiMgQ09ORklHX1JUMlgwMF9MSUJf REVCVUdGUyBpcyBub3Qgc2V0CiMgQ09ORklHX1JUMlgwMF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19SVEw4MTkyQ0U9bQpDT05GSUdfUlRMODE5MlNFPW0KQ09ORklHX1JUTDgxOTJERT1tCkNPTkZJ R19SVEw4MTkyQ1U9bQpDT05GSUdfUlRMV0lGST1tCiMgQ09ORklHX1JUTFdJRklfREVCVUcgaXMg bm90IHNldApDT05GSUdfUlRMODE5MkNfQ09NTU9OPW0KQ09ORklHX1dMMTI1MT1tCkNPTkZJR19X TDEyNTFfU1BJPW0KQ09ORklHX1dMMTI1MV9TRElPPW0KQ09ORklHX1dMMTJYWF9NRU5VPW0KQ09O RklHX1dMMTJYWD1tCiMgQ09ORklHX1dMMTJYWF9TUEkgaXMgbm90IHNldAojIENPTkZJR19XTDEy WFhfU0RJTyBpcyBub3Qgc2V0CkNPTkZJR19XTDEyWFhfUExBVEZPUk1fREFUQT15CkNPTkZJR19a RDEyMTFSVz1tCiMgQ09ORklHX1pEMTIxMVJXX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX01XSUZJ RVg9bQpDT05GSUdfTVdJRklFWF9TRElPPW0KQ09ORklHX01XSUZJRVhfUENJRT1tCgojCiMgV2lN QVggV2lyZWxlc3MgQnJvYWRiYW5kIGRldmljZXMKIwpDT05GSUdfV0lNQVhfSTI0MDBNPW0KQ09O RklHX1dJTUFYX0kyNDAwTV9VU0I9bQpDT05GSUdfV0lNQVhfSTI0MDBNX1NESU89bQpDT05GSUdf V0lNQVhfSVdNQzMyMDBfU0RJTz15CkNPTkZJR19XSU1BWF9JMjQwME1fREVCVUdfTEVWRUw9OApD T05GSUdfV0FOPXkKQ09ORklHX0xBTk1FRElBPW0KQ09ORklHX0hETEM9bQpDT05GSUdfSERMQ19S QVc9bQpDT05GSUdfSERMQ19SQVdfRVRIPW0KQ09ORklHX0hETENfQ0lTQ089bQpDT05GSUdfSERM Q19GUj1tCkNPTkZJR19IRExDX1BQUD1tCkNPTkZJR19IRExDX1gyNT1tCkNPTkZJR19QQ0kyMDBT WU49bQpDT05GSUdfV0FOWEw9bQpDT05GSUdfUEMzMDBUT089bQpDT05GSUdfRkFSU1lOQz1tCkNP TkZJR19EU0NDND1tCkNPTkZJR19EU0NDNF9QQ0lTWU5DPXkKQ09ORklHX0RTQ0M0X1BDSV9SU1Q9 eQpDT05GSUdfRExDST1tCkNPTkZJR19ETENJX01BWD04CiMgQ09ORklHX1dBTl9ST1VURVJfRFJJ VkVSUyBpcyBub3Qgc2V0CkNPTkZJR19MQVBCRVRIRVI9bQpDT05GSUdfWDI1X0FTWT1tCkNPTkZJ R19TQk5JPW0KQ09ORklHX1NCTklfTVVMVElMSU5FPXkKQ09ORklHX1hFTl9ORVRERVZfRlJPTlRF TkQ9bQpDT05GSUdfWEVOX05FVERFVl9CQUNLRU5EPW0KIyBDT05GSUdfVk1YTkVUMyBpcyBub3Qg c2V0CkNPTkZJR19JU0ROPXkKQ09ORklHX0lTRE5fSTRMPW0KQ09ORklHX0lTRE5fUFBQPXkKQ09O RklHX0lTRE5fUFBQX1ZKPXkKQ09ORklHX0lTRE5fTVBQPXkKQ09ORklHX0lQUFBfRklMVEVSPXkK Q09ORklHX0lTRE5fUFBQX0JTRENPTVA9bQpDT05GSUdfSVNETl9BVURJTz15CkNPTkZJR19JU0RO X1RUWV9GQVg9eQpDT05GSUdfSVNETl9YMjU9eQoKIwojIElTRE4gZmVhdHVyZSBzdWJtb2R1bGVz CiMKQ09ORklHX0lTRE5fRElWRVJTSU9OPW0KCiMKIyBJU0RONExpbnV4IGhhcmR3YXJlIGRyaXZl cnMKIwoKIwojIFBhc3NpdmUgY2FyZHMKIwpDT05GSUdfSVNETl9EUlZfSElTQVg9bQoKIwojIEQt Y2hhbm5lbCBwcm90b2NvbCBmZWF0dXJlcwojCkNPTkZJR19ISVNBWF9FVVJPPXkKQ09ORklHX0RF X0FPQz15CiMgQ09ORklHX0hJU0FYX05PX1NFTkRDT01QTEVURSBpcyBub3Qgc2V0CiMgQ09ORklH X0hJU0FYX05PX0xMQyBpcyBub3Qgc2V0CiMgQ09ORklHX0hJU0FYX05PX0tFWVBBRCBpcyBub3Qg c2V0CkNPTkZJR19ISVNBWF8xVFI2PXkKQ09ORklHX0hJU0FYX05JMT15CkNPTkZJR19ISVNBWF9N QVhfQ0FSRFM9OAoKIwojIEhpU2F4IHN1cHBvcnRlZCBjYXJkcwojCkNPTkZJR19ISVNBWF8xNl8z PXkKQ09ORklHX0hJU0FYX1RFTEVTUENJPXkKQ09ORklHX0hJU0FYX1MwQk9YPXkKQ09ORklHX0hJ U0FYX0ZSSVRaUENJPXkKQ09ORklHX0hJU0FYX0FWTV9BMV9QQ01DSUE9eQpDT05GSUdfSElTQVhf RUxTQT15CkNPTkZJR19ISVNBWF9ESUVITERJVkE9eQpDT05GSUdfSElTQVhfU0VETEJBVUVSPXkK Q09ORklHX0hJU0FYX05FVEpFVD15CkNPTkZJR19ISVNBWF9ORVRKRVRfVT15CkNPTkZJR19ISVNB WF9OSUNDWT15CkNPTkZJR19ISVNBWF9CS01fQTRUPXkKQ09ORklHX0hJU0FYX1NDVF9RVUFEUk89 eQpDT05GSUdfSElTQVhfR0FaRUw9eQpDT05GSUdfSElTQVhfSEZDX1BDST15CkNPTkZJR19ISVNB WF9XNjY5Mj15CkNPTkZJR19ISVNBWF9IRkNfU1g9eQpDT05GSUdfSElTQVhfRU5URVJOT1dfUENJ PXkKIyBDT05GSUdfSElTQVhfREVCVUcgaXMgbm90IHNldAoKIwojIEhpU2F4IFBDTUNJQSBjYXJk IHNlcnZpY2UgbW9kdWxlcwojCkNPTkZJR19ISVNBWF9TRURMQkFVRVJfQ1M9bQpDT05GSUdfSElT QVhfRUxTQV9DUz1tCkNPTkZJR19ISVNBWF9BVk1fQTFfQ1M9bQpDT05GSUdfSElTQVhfVEVMRVNf Q1M9bQoKIwojIEhpU2F4IHN1YiBkcml2ZXIgbW9kdWxlcwojCkNPTkZJR19ISVNBWF9TVDU0ODE9 bQpDT05GSUdfSElTQVhfSEZDVVNCPW0KQ09ORklHX0hJU0FYX0hGQzRTOFM9bQpDT05GSUdfSElT QVhfRlJJVFpfUENJUE5QPW0KCiMKIyBBY3RpdmUgY2FyZHMKIwpDT05GSUdfSVNETl9DQVBJPW0K Q09ORklHX0lTRE5fRFJWX0FWTUIxX1ZFUkJPU0VfUkVBU09OPXkKQ09ORklHX0NBUElfVFJBQ0U9 eQpDT05GSUdfSVNETl9DQVBJX01JRERMRVdBUkU9eQpDT05GSUdfSVNETl9DQVBJX0NBUEkyMD1t CkNPTkZJR19JU0ROX0NBUElfQ0FQSURSVj1tCgojCiMgQ0FQSSBoYXJkd2FyZSBkcml2ZXJzCiMK Q09ORklHX0NBUElfQVZNPXkKQ09ORklHX0lTRE5fRFJWX0FWTUIxX0IxUENJPW0KQ09ORklHX0lT RE5fRFJWX0FWTUIxX0IxUENJVjQ9eQpDT05GSUdfSVNETl9EUlZfQVZNQjFfQjFQQ01DSUE9bQpD T05GSUdfSVNETl9EUlZfQVZNQjFfQVZNX0NTPW0KQ09ORklHX0lTRE5fRFJWX0FWTUIxX1QxUENJ PW0KQ09ORklHX0lTRE5fRFJWX0FWTUIxX0M0PW0KQ09ORklHX0NBUElfRUlDT049eQpDT05GSUdf SVNETl9ESVZBUz1tCkNPTkZJR19JU0ROX0RJVkFTX0JSSVBDST15CkNPTkZJR19JU0ROX0RJVkFT X1BSSVBDST15CkNPTkZJR19JU0ROX0RJVkFTX0RJVkFDQVBJPW0KQ09ORklHX0lTRE5fRElWQVNf VVNFUklEST1tCkNPTkZJR19JU0ROX0RJVkFTX01BSU5UPW0KQ09ORklHX0lTRE5fRFJWX0dJR0FT RVQ9bQojIENPTkZJR19HSUdBU0VUX0NBUEkgaXMgbm90IHNldApDT05GSUdfR0lHQVNFVF9JNEw9 eQojIENPTkZJR19HSUdBU0VUX0RVTU1ZTEwgaXMgbm90IHNldApDT05GSUdfR0lHQVNFVF9CQVNF PW0KQ09ORklHX0dJR0FTRVRfTTEwNT1tCkNPTkZJR19HSUdBU0VUX00xMDE9bQojIENPTkZJR19H SUdBU0VUX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0hZU0ROPW0KQ09ORklHX0hZU0ROX0NBUEk9 eQpDT05GSUdfTUlTRE49bQpDT05GSUdfTUlTRE5fRFNQPW0KQ09ORklHX01JU0ROX0wxT0lQPW0K CiMKIyBtSVNETiBoYXJkd2FyZSBkcml2ZXJzCiMKQ09ORklHX01JU0ROX0hGQ1BDST1tCkNPTkZJ R19NSVNETl9IRkNNVUxUST1tCkNPTkZJR19NSVNETl9IRkNVU0I9bQpDT05GSUdfTUlTRE5fQVZN RlJJVFo9bQpDT05GSUdfTUlTRE5fU1BFRURGQVg9bQpDT05GSUdfTUlTRE5fSU5GSU5FT049bQpD T05GSUdfTUlTRE5fVzY2OTI9bQpDT05GSUdfTUlTRE5fTkVUSkVUPW0KQ09ORklHX01JU0ROX0lQ QUM9bQpDT05GSUdfTUlTRE5fSVNBUj1tCkNPTkZJR19JU0ROX0hETEM9bQoKIwojIElucHV0IGRl dmljZSBzdXBwb3J0CiMKQ09ORklHX0lOUFVUPXkKQ09ORklHX0lOUFVUX0ZGX01FTUxFU1M9bQpD T05GSUdfSU5QVVRfUE9MTERFVj1tCkNPTkZJR19JTlBVVF9TUEFSU0VLTUFQPW0KCiMKIyBVc2Vy bGFuZCBpbnRlcmZhY2VzCiMKQ09ORklHX0lOUFVUX01PVVNFREVWPXkKQ09ORklHX0lOUFVUX01P VVNFREVWX1BTQVVYPXkKQ09ORklHX0lOUFVUX01PVVNFREVWX1NDUkVFTl9YPTEwMjQKQ09ORklH X0lOUFVUX01PVVNFREVWX1NDUkVFTl9ZPTc2OApDT05GSUdfSU5QVVRfSk9ZREVWPW0KQ09ORklH X0lOUFVUX0VWREVWPXkKIyBDT05GSUdfSU5QVVRfRVZCVUcgaXMgbm90IHNldAoKIwojIElucHV0 IERldmljZSBEcml2ZXJzCiMKQ09ORklHX0lOUFVUX0tFWUJPQVJEPXkKQ09ORklHX0tFWUJPQVJE X0FEUDU1ODg9bQpDT05GSUdfS0VZQk9BUkRfQURQNTU4OT1tCkNPTkZJR19LRVlCT0FSRF9BVEtC RD15CkNPTkZJR19LRVlCT0FSRF9RVDEwNzA9bQpDT05GSUdfS0VZQk9BUkRfUVQyMTYwPW0KIyBD T05GSUdfS0VZQk9BUkRfTEtLQkQgaXMgbm90IHNldApDT05GSUdfS0VZQk9BUkRfR1BJTz1tCkNP TkZJR19LRVlCT0FSRF9HUElPX1BPTExFRD1tCkNPTkZJR19LRVlCT0FSRF9UQ0E2NDE2PW0KQ09O RklHX0tFWUJPQVJEX1RDQTg0MTg9bQpDT05GSUdfS0VZQk9BUkRfTUFUUklYPW0KQ09ORklHX0tF WUJPQVJEX0xNODMyMz1tCkNPTkZJR19LRVlCT0FSRF9NQVg3MzU5PW0KQ09ORklHX0tFWUJPQVJE X01DUz1tCkNPTkZJR19LRVlCT0FSRF9NUFIxMjE9bQpDT05GSUdfS0VZQk9BUkRfTkVXVE9OPW0K Q09ORklHX0tFWUJPQVJEX09QRU5DT1JFUz1tCiMgQ09ORklHX0tFWUJPQVJEX1NUT1dBV0FZIGlz IG5vdCBzZXQKQ09ORklHX0tFWUJPQVJEX1NVTktCRD1tCkNPTkZJR19LRVlCT0FSRF9TVE1QRT1t CkNPTkZJR19LRVlCT0FSRF9PTUFQND1tCkNPTkZJR19LRVlCT0FSRF9YVEtCRD1tCkNPTkZJR19J TlBVVF9NT1VTRT15CkNPTkZJR19NT1VTRV9QUzI9eQpDT05GSUdfTU9VU0VfUFMyX0FMUFM9eQpD T05GSUdfTU9VU0VfUFMyX0xPR0lQUzJQUD15CkNPTkZJR19NT1VTRV9QUzJfU1lOQVBUSUNTPXkK Q09ORklHX01PVVNFX1BTMl9MSUZFQk9PSz15CkNPTkZJR19NT1VTRV9QUzJfVFJBQ0tQT0lOVD15 CkNPTkZJR19NT1VTRV9QUzJfRUxBTlRFQ0g9eQpDT05GSUdfTU9VU0VfUFMyX1NFTlRFTElDPXkK Q09ORklHX01PVVNFX1BTMl9UT1VDSEtJVD15CkNPTkZJR19NT1VTRV9TRVJJQUw9bQpDT05GSUdf TU9VU0VfQVBQTEVUT1VDSD1tCkNPTkZJR19NT1VTRV9CQ001OTc0PW0KQ09ORklHX01PVVNFX1ZT WFhYQUE9bQpDT05GSUdfTU9VU0VfR1BJTz1tCkNPTkZJR19NT1VTRV9TWU5BUFRJQ1NfSTJDPW0K Q09ORklHX01PVVNFX1NZTkFQVElDU19VU0I9bQpDT05GSUdfSU5QVVRfSk9ZU1RJQ0s9eQpDT05G SUdfSk9ZU1RJQ0tfQU5BTE9HPW0KQ09ORklHX0pPWVNUSUNLX0EzRD1tCkNPTkZJR19KT1lTVElD S19BREk9bQpDT05GSUdfSk9ZU1RJQ0tfQ09CUkE9bQpDT05GSUdfSk9ZU1RJQ0tfR0YySz1tCkNP TkZJR19KT1lTVElDS19HUklQPW0KQ09ORklHX0pPWVNUSUNLX0dSSVBfTVA9bQpDT05GSUdfSk9Z U1RJQ0tfR1VJTExFTU9UPW0KQ09ORklHX0pPWVNUSUNLX0lOVEVSQUNUPW0KQ09ORklHX0pPWVNU SUNLX1NJREVXSU5ERVI9bQpDT05GSUdfSk9ZU1RJQ0tfVE1EQz1tCkNPTkZJR19KT1lTVElDS19J Rk9SQ0U9bQpDT05GSUdfSk9ZU1RJQ0tfSUZPUkNFX1VTQj15CkNPTkZJR19KT1lTVElDS19JRk9S Q0VfMjMyPXkKQ09ORklHX0pPWVNUSUNLX1dBUlJJT1I9bQpDT05GSUdfSk9ZU1RJQ0tfTUFHRUxM QU49bQpDT05GSUdfSk9ZU1RJQ0tfU1BBQ0VPUkI9bQpDT05GSUdfSk9ZU1RJQ0tfU1BBQ0VCQUxM PW0KQ09ORklHX0pPWVNUSUNLX1NUSU5HRVI9bQpDT05GSUdfSk9ZU1RJQ0tfVFdJREpPWT1tCkNP TkZJR19KT1lTVElDS19aSEVOSFVBPW0KQ09ORklHX0pPWVNUSUNLX0RCOT1tCkNPTkZJR19KT1lT VElDS19HQU1FQ09OPW0KQ09ORklHX0pPWVNUSUNLX1RVUkJPR1JBRlg9bQpDT05GSUdfSk9ZU1RJ Q0tfQVM1MDExPW0KQ09ORklHX0pPWVNUSUNLX0pPWURVTVA9bQpDT05GSUdfSk9ZU1RJQ0tfWFBB RD1tCkNPTkZJR19KT1lTVElDS19YUEFEX0ZGPXkKQ09ORklHX0pPWVNUSUNLX1hQQURfTEVEUz15 CkNPTkZJR19KT1lTVElDS19XQUxLRVJBMDcwMT1tCkNPTkZJR19JTlBVVF9UQUJMRVQ9eQpDT05G SUdfVEFCTEVUX1VTQl9BQ0VDQUQ9bQpDT05GSUdfVEFCTEVUX1VTQl9BSVBURUs9bQpDT05GSUdf VEFCTEVUX1VTQl9HVENPPW0KQ09ORklHX1RBQkxFVF9VU0JfSEFOV0FORz1tCkNPTkZJR19UQUJM RVRfVVNCX0tCVEFCPW0KQ09ORklHX1RBQkxFVF9VU0JfV0FDT009bQpDT05GSUdfSU5QVVRfVE9V Q0hTQ1JFRU49eQpDT05GSUdfVE9VQ0hTQ1JFRU5fQURTNzg0Nj1tCkNPTkZJR19UT1VDSFNDUkVF Tl9BRDc4Nzc9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQUQ3ODc5PW0KQ09ORklHX1RPVUNIU0NSRUVO X0FENzg3OV9JMkM9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQUQ3ODc5X1NQST1tCkNPTkZJR19UT1VD SFNDUkVFTl9BVE1FTF9NWFQ9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQVVPX1BJWENJUj1tCkNPTkZJ R19UT1VDSFNDUkVFTl9CVTIxMDEzPW0KQ09ORklHX1RPVUNIU0NSRUVOX0NZOENUTUcxMTA9bQpD T05GSUdfVE9VQ0hTQ1JFRU5fQ1lUVFNQX0NPUkU9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQ1lUVFNQ X0kyQz1tCkNPTkZJR19UT1VDSFNDUkVFTl9DWVRUU1BfU1BJPW0KQ09ORklHX1RPVUNIU0NSRUVO X0RZTkFQUk89bQpDT05GSUdfVE9VQ0hTQ1JFRU5fSEFNUFNISVJFPW0KQ09ORklHX1RPVUNIU0NS RUVOX0VFVEk9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fRUdBTEFYPW0KQ09ORklHX1RPVUNIU0NSRUVO X0ZVSklUU1U9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fSUxJMjEwWD1tCkNPTkZJR19UT1VDSFNDUkVF Tl9HVU5aRT1tCkNPTkZJR19UT1VDSFNDUkVFTl9FTE89bQpDT05GSUdfVE9VQ0hTQ1JFRU5fV0FD T01fVzgwMDE9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fTUFYMTE4MDE9bQpDT05GSUdfVE9VQ0hTQ1JF RU5fTUNTNTAwMD1tCkNPTkZJR19UT1VDSFNDUkVFTl9NVE9VQ0g9bQpDT05GSUdfVE9VQ0hTQ1JF RU5fSU5FWElPPW0KQ09ORklHX1RPVUNIU0NSRUVOX01LNzEyPW0KQ09ORklHX1RPVUNIU0NSRUVO X1BFTk1PVU5UPW0KQ09ORklHX1RPVUNIU0NSRUVOX1RPVUNIUklHSFQ9bQpDT05GSUdfVE9VQ0hT Q1JFRU5fVE9VQ0hXSU49bQpDT05GSUdfVE9VQ0hTQ1JFRU5fVUNCMTQwMD1tCkNPTkZJR19UT1VD SFNDUkVFTl9QSVhDSVI9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fV005N1hYPW0KQ09ORklHX1RPVUNI U0NSRUVOX1dNOTcwNT15CkNPTkZJR19UT1VDSFNDUkVFTl9XTTk3MTI9eQpDT05GSUdfVE9VQ0hT Q1JFRU5fV005NzEzPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VTQl9DT01QT1NJVEU9bQpDT05GSUdf VE9VQ0hTQ1JFRU5fTUMxMzc4Mz1tCkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfRUdBTEFYPXkKQ09O RklHX1RPVUNIU0NSRUVOX1VTQl9QQU5KSVQ9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCXzNNPXkK Q09ORklHX1RPVUNIU0NSRUVOX1VTQl9JVE09eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0VUVVJC Tz15CkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfR1VOWkU9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNC X0RNQ19UU0MxMD15CkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfSVJUT1VDSD15CkNPTkZJR19UT1VD SFNDUkVFTl9VU0JfSURFQUxURUs9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0dFTkVSQUxfVE9V Q0g9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0dPVE9QPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VT Ql9KQVNURUM9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0VMTz15CkNPTkZJR19UT1VDSFNDUkVF Tl9VU0JfRTJJPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VTQl9aWVRST05JQz15CkNPTkZJR19UT1VD SFNDUkVFTl9VU0JfRVRUX1RDNDVVU0I9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX05FWElPPXkK Q09ORklHX1RPVUNIU0NSRUVOX1VTQl9FQVNZVE9VQ0g9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVE9V Q0hJVDIxMz1tCkNPTkZJR19UT1VDSFNDUkVFTl9UU0NfU0VSSU89bQpDT05GSUdfVE9VQ0hTQ1JF RU5fVFNDMjAwNT1tCkNPTkZJR19UT1VDSFNDUkVFTl9UU0MyMDA3PW0KQ09ORklHX1RPVUNIU0NS RUVOX1BDQVA9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fU1QxMjMyPW0KQ09ORklHX1RPVUNIU0NSRUVO X1NUTVBFPW0KQ09ORklHX1RPVUNIU0NSRUVOX1RQUzY1MDdYPW0KQ09ORklHX0lOUFVUX01JU0M9 eQpDT05GSUdfSU5QVVRfQUQ3MTRYPW0KQ09ORklHX0lOUFVUX0FENzE0WF9JMkM9bQpDT05GSUdf SU5QVVRfQUQ3MTRYX1NQST1tCkNPTkZJR19JTlBVVF9CTUExNTA9bQpDT05GSUdfSU5QVVRfUENT UEtSPW0KQ09ORklHX0lOUFVUX01DMTM3ODNfUFdSQlVUVE9OPW0KQ09ORklHX0lOUFVUX01NQTg0 NTA9bQpDT05GSUdfSU5QVVRfTVBVMzA1MD1tCkNPTkZJR19JTlBVVF9BUEFORUw9bQpDT05GSUdf SU5QVVRfR1AyQT1tCkNPTkZJR19JTlBVVF9HUElPX1RJTFRfUE9MTEVEPW0KQ09ORklHX0lOUFVU X0FUTEFTX0JUTlM9bQpDT05GSUdfSU5QVVRfQVRJX1JFTU9URTI9bQpDT05GSUdfSU5QVVRfS0VZ U1BBTl9SRU1PVEU9bQpDT05GSUdfSU5QVVRfS1hUSjk9bQojIENPTkZJR19JTlBVVF9LWFRKOV9Q T0xMRURfTU9ERSBpcyBub3Qgc2V0CkNPTkZJR19JTlBVVF9QT1dFUk1BVEU9bQpDT05GSUdfSU5Q VVRfWUVBTElOSz1tCkNPTkZJR19JTlBVVF9DTTEwOT1tCkNPTkZJR19JTlBVVF9VSU5QVVQ9bQpD T05GSUdfSU5QVVRfUENGODU3ND1tCkNPTkZJR19JTlBVVF9HUElPX1JPVEFSWV9FTkNPREVSPW0K Q09ORklHX0lOUFVUX0RBOTA1Ml9PTktFWT1tCkNPTkZJR19JTlBVVF9QQ0FQPW0KQ09ORklHX0lO UFVUX0FEWEwzNFg9bQpDT05GSUdfSU5QVVRfQURYTDM0WF9JMkM9bQpDT05GSUdfSU5QVVRfQURY TDM0WF9TUEk9bQpDT05GSUdfSU5QVVRfQ01BMzAwMD1tCkNPTkZJR19JTlBVVF9DTUEzMDAwX0ky Qz1tCkNPTkZJR19JTlBVVF9YRU5fS0JEREVWX0ZST05URU5EPXkKCiMKIyBIYXJkd2FyZSBJL08g cG9ydHMKIwpDT05GSUdfU0VSSU89eQpDT05GSUdfU0VSSU9fSTgwNDI9eQpDT05GSUdfU0VSSU9f U0VSUE9SVD1tCkNPTkZJR19TRVJJT19DVDgyQzcxMD1tCkNPTkZJR19TRVJJT19QQVJLQkQ9bQpD T05GSUdfU0VSSU9fUENJUFMyPW0KQ09ORklHX1NFUklPX0xJQlBTMj15CkNPTkZJR19TRVJJT19S QVc9bQpDT05GSUdfU0VSSU9fQUxURVJBX1BTMj1tCkNPTkZJR19TRVJJT19QUzJNVUxUPW0KQ09O RklHX0dBTUVQT1JUPW0KQ09ORklHX0dBTUVQT1JUX05TNTU4PW0KQ09ORklHX0dBTUVQT1JUX0w0 PW0KQ09ORklHX0dBTUVQT1JUX0VNVTEwSzE9bQpDT05GSUdfR0FNRVBPUlRfRk04MDE9bQoKIwoj IENoYXJhY3RlciBkZXZpY2VzCiMKQ09ORklHX1ZUPXkKQ09ORklHX0NPTlNPTEVfVFJBTlNMQVRJ T05TPXkKQ09ORklHX1ZUX0NPTlNPTEU9eQpDT05GSUdfVlRfQ09OU09MRV9TTEVFUD15CkNPTkZJ R19IV19DT05TT0xFPXkKQ09ORklHX1ZUX0hXX0NPTlNPTEVfQklORElORz15CkNPTkZJR19VTklY OThfUFRZUz15CkNPTkZJR19ERVZQVFNfTVVMVElQTEVfSU5TVEFOQ0VTPXkKQ09ORklHX0xFR0FD WV9QVFlTPXkKQ09ORklHX0xFR0FDWV9QVFlfQ09VTlQ9MApDT05GSUdfU0VSSUFMX05PTlNUQU5E QVJEPXkKQ09ORklHX1JPQ0tFVFBPUlQ9bQpDT05GSUdfQ1lDTEFERVM9bQojIENPTkZJR19DWVpf SU5UUiBpcyBub3Qgc2V0CkNPTkZJR19NT1hBX0lOVEVMTElPPW0KQ09ORklHX01PWEFfU01BUlRJ Tz1tCkNPTkZJR19TWU5DTElOSz1tCkNPTkZJR19TWU5DTElOS01QPW0KQ09ORklHX1NZTkNMSU5L X0dUPW0KQ09ORklHX05PWk9NST1tCkNPTkZJR19JU0k9bQpDT05GSUdfTl9IRExDPW0KQ09ORklH X05fR1NNPW0KIyBDT05GSUdfVFJBQ0VfU0lOSyBpcyBub3Qgc2V0CkNPTkZJR19ERVZLTUVNPXkK Q09ORklHX1NUQUxEUlY9eQoKIwojIFNlcmlhbCBkcml2ZXJzCiMKQ09ORklHX1NFUklBTF84MjUw PW0KQ09ORklHX0ZJWF9FQVJMWUNPTl9NRU09eQpDT05GSUdfU0VSSUFMXzgyNTBfUENJPW0KQ09O RklHX1NFUklBTF84MjUwX1BOUD1tCkNPTkZJR19TRVJJQUxfODI1MF9DUz1tCkNPTkZJR19TRVJJ QUxfODI1MF9OUl9VQVJUUz0xNgpDT05GSUdfU0VSSUFMXzgyNTBfUlVOVElNRV9VQVJUUz04CiMg Q09ORklHX1NFUklBTF84MjUwX0VYVEVOREVEIGlzIG5vdCBzZXQKCiMKIyBOb24tODI1MCBzZXJp YWwgcG9ydCBzdXBwb3J0CiMKIyBDT05GSUdfU0VSSUFMX01BWDMxMDAgaXMgbm90IHNldAojIENP TkZJR19TRVJJQUxfTUFYMzEwNyBpcyBub3Qgc2V0CiMgQ09ORklHX1NFUklBTF9NUlNUX01BWDMx MTAgaXMgbm90IHNldAojIENPTkZJR19TRVJJQUxfTUZEX0hTVSBpcyBub3Qgc2V0CkNPTkZJR19T RVJJQUxfVUFSVExJVEU9bQpDT05GSUdfU0VSSUFMX0NPUkU9bQpDT05GSUdfU0VSSUFMX0pTTT1t CkNPTkZJR19TRVJJQUxfVElNQkVSREFMRT1tCkNPTkZJR19TRVJJQUxfQUxURVJBX0pUQUdVQVJU PW0KQ09ORklHX1NFUklBTF9BTFRFUkFfVUFSVD1tCkNPTkZJR19TRVJJQUxfQUxURVJBX1VBUlRf TUFYUE9SVFM9NApDT05GSUdfU0VSSUFMX0FMVEVSQV9VQVJUX0JBVURSQVRFPTExNTIwMApDT05G SUdfU0VSSUFMX0lGWDZYNjA9bQpDT05GSUdfU0VSSUFMX1BDSF9VQVJUPW0KQ09ORklHX1NFUklB TF9YSUxJTlhfUFNfVUFSVD1tCkNPTkZJR19QUklOVEVSPW0KIyBDT05GSUdfTFBfQ09OU09MRSBp cyBub3Qgc2V0CkNPTkZJR19QUERFVj1tCkNPTkZJR19IVkNfRFJJVkVSPXkKQ09ORklHX0hWQ19J UlE9eQpDT05GSUdfSFZDX1hFTj15CkNPTkZJR19IVkNfWEVOX0ZST05URU5EPXkKQ09ORklHX1ZJ UlRJT19DT05TT0xFPW0KQ09ORklHX0lQTUlfSEFORExFUj1tCkNPTkZJR19JUE1JX1BBTklDX0VW RU5UPXkKIyBDT05GSUdfSVBNSV9QQU5JQ19TVFJJTkcgaXMgbm90IHNldApDT05GSUdfSVBNSV9E RVZJQ0VfSU5URVJGQUNFPW0KQ09ORklHX0lQTUlfU0k9bQpDT05GSUdfSVBNSV9XQVRDSERPRz1t CkNPTkZJR19JUE1JX1BPV0VST0ZGPW0KQ09ORklHX0hXX1JBTkRPTT15CkNPTkZJR19IV19SQU5E T01fVElNRVJJT01FTT1tCkNPTkZJR19IV19SQU5ET01fSU5URUw9bQpDT05GSUdfSFdfUkFORE9N X0FNRD1tCkNPTkZJR19IV19SQU5ET01fVklBPW0KQ09ORklHX0hXX1JBTkRPTV9WSVJUSU89bQpD T05GSUdfTlZSQU09eQpDT05GSUdfUjM5NjQ9bQpDT05GSUdfQVBQTElDT009bQoKIwojIFBDTUNJ QSBjaGFyYWN0ZXIgZGV2aWNlcwojCkNPTkZJR19TWU5DTElOS19DUz1tCkNPTkZJR19DQVJETUFO XzQwMDA9bQpDT05GSUdfQ0FSRE1BTl80MDQwPW0KQ09ORklHX0lQV0lSRUxFU1M9bQpDT05GSUdf TVdBVkU9bQpDT05GSUdfUkFXX0RSSVZFUj1tCkNPTkZJR19NQVhfUkFXX0RFVlM9NDA5NgojIENP TkZJR19IUEVUIGlzIG5vdCBzZXQKQ09ORklHX0hBTkdDSEVDS19USU1FUj1tCkNPTkZJR19UQ0df VFBNPW0KQ09ORklHX1RDR19USVM9bQpDT05GSUdfVENHX05TQz1tCkNPTkZJR19UQ0dfQVRNRUw9 bQpDT05GSUdfVENHX0lORklORU9OPW0KQ09ORklHX1RFTENMT0NLPW0KQ09ORklHX0RFVlBPUlQ9 eQpDT05GSUdfUkFNT09QUz15CkNPTkZJR19JMkM9bQpDT05GSUdfSTJDX0JPQVJESU5GTz15CkNP TkZJR19JMkNfQ09NUEFUPXkKQ09ORklHX0kyQ19DSEFSREVWPW0KQ09ORklHX0kyQ19NVVg9bQoK IwojIE11bHRpcGxleGVyIEkyQyBDaGlwIHN1cHBvcnQKIwpDT05GSUdfSTJDX01VWF9HUElPPW0K Q09ORklHX0kyQ19NVVhfUENBOTU0MT1tCkNPTkZJR19JMkNfTVVYX1BDQTk1NHg9bQpDT05GSUdf STJDX0hFTFBFUl9BVVRPPXkKQ09ORklHX0kyQ19TTUJVUz1tCkNPTkZJR19JMkNfQUxHT0JJVD1t CkNPTkZJR19JMkNfQUxHT1BDQT1tCgojCiMgSTJDIEhhcmR3YXJlIEJ1cyBzdXBwb3J0CiMKCiMK IyBQQyBTTUJ1cyBob3N0IGNvbnRyb2xsZXIgZHJpdmVycwojCkNPTkZJR19JMkNfQUxJMTUzNT1t CkNPTkZJR19JMkNfQUxJMTU2Mz1tCkNPTkZJR19JMkNfQUxJMTVYMz1tCkNPTkZJR19JMkNfQU1E NzU2PW0KQ09ORklHX0kyQ19BTUQ3NTZfUzQ4ODI9bQpDT05GSUdfSTJDX0FNRDgxMTE9bQpDT05G SUdfSTJDX0k4MDE9bQpDT05GSUdfSTJDX0lTQ0g9bQpDT05GSUdfSTJDX1BJSVg0PW0KQ09ORklH X0kyQ19ORk9SQ0UyPW0KQ09ORklHX0kyQ19ORk9SQ0UyX1M0OTg1PW0KQ09ORklHX0kyQ19TSVM1 NTk1PW0KQ09ORklHX0kyQ19TSVM2MzA9bQpDT05GSUdfSTJDX1NJUzk2WD1tCkNPTkZJR19JMkNf VklBPW0KQ09ORklHX0kyQ19WSUFQUk89bQoKIwojIEFDUEkgZHJpdmVycwojCkNPTkZJR19JMkNf U0NNST1tCgojCiMgSTJDIHN5c3RlbSBidXMgZHJpdmVycyAobW9zdGx5IGVtYmVkZGVkIC8gc3lz dGVtLW9uLWNoaXApCiMKQ09ORklHX0kyQ19ERVNJR05XQVJFX0NPUkU9bQpDT05GSUdfSTJDX0RF U0lHTldBUkVfUENJPW0KQ09ORklHX0kyQ19FRzIwVD1tCkNPTkZJR19JMkNfR1BJTz1tCkNPTkZJ R19JMkNfSU5URUxfTUlEPW0KQ09ORklHX0kyQ19PQ09SRVM9bQpDT05GSUdfSTJDX1BDQV9QTEFU Rk9STT1tCiMgQ09ORklHX0kyQ19QWEFfUENJIGlzIG5vdCBzZXQKIyBDT05GSUdfSTJDX1NJTVRF QyBpcyBub3Qgc2V0CiMgQ09ORklHX0kyQ19YSUxJTlggaXMgbm90IHNldAoKIwojIEV4dGVybmFs IEkyQy9TTUJ1cyBhZGFwdGVyIGRyaXZlcnMKIwpDT05GSUdfSTJDX0RJT0xBTl9VMkM9bQpDT05G SUdfSTJDX1BBUlBPUlQ9bQpDT05GSUdfSTJDX1BBUlBPUlRfTElHSFQ9bQpDT05GSUdfSTJDX1RB T1NfRVZNPW0KQ09ORklHX0kyQ19USU5ZX1VTQj1tCgojCiMgT3RoZXIgSTJDL1NNQnVzIGJ1cyBk cml2ZXJzCiMKQ09ORklHX0kyQ19TVFVCPW0KIyBDT05GSUdfSTJDX0RFQlVHX0NPUkUgaXMgbm90 IHNldAojIENPTkZJR19JMkNfREVCVUdfQUxHTyBpcyBub3Qgc2V0CiMgQ09ORklHX0kyQ19ERUJV R19CVVMgaXMgbm90IHNldApDT05GSUdfU1BJPXkKIyBDT05GSUdfU1BJX0RFQlVHIGlzIG5vdCBz ZXQKQ09ORklHX1NQSV9NQVNURVI9eQoKIwojIFNQSSBNYXN0ZXIgQ29udHJvbGxlciBEcml2ZXJz CiMKQ09ORklHX1NQSV9BTFRFUkE9bQpDT05GSUdfU1BJX0JJVEJBTkc9bQpDT05GSUdfU1BJX0JV VFRFUkZMWT1tCkNPTkZJR19TUElfR1BJTz1tCkNPTkZJR19TUElfTE03MF9MTFA9bQpDT05GSUdf U1BJX09DX1RJTlk9bQojIENPTkZJR19TUElfUFhBMlhYX1BDSSBpcyBub3Qgc2V0CkNPTkZJR19T UElfVE9QQ0xJRkZfUENIPW0KQ09ORklHX1NQSV9YSUxJTlg9bQpDT05GSUdfU1BJX0RFU0lHTldB UkU9eQpDT05GSUdfU1BJX0RXX1BDST1tCiMgQ09ORklHX1NQSV9EV19NSURfRE1BIGlzIG5vdCBz ZXQKCiMKIyBTUEkgUHJvdG9jb2wgTWFzdGVycwojCkNPTkZJR19TUElfU1BJREVWPW0KQ09ORklH X1NQSV9UTEU2MlgwPW0KQ09ORklHX0hTST1tCkNPTkZJR19IU0lfQk9BUkRJTkZPPXkKCiMKIyBI U0kgY2xpZW50cwojCkNPTkZJR19IU0lfQ0hBUj1tCgojCiMgUFBTIHN1cHBvcnQKIwpDT05GSUdf UFBTPW0KIyBDT05GSUdfUFBTX0RFQlVHIGlzIG5vdCBzZXQKCiMKIyBQUFMgY2xpZW50cyBzdXBw b3J0CiMKIyBDT05GSUdfUFBTX0NMSUVOVF9LVElNRVIgaXMgbm90IHNldApDT05GSUdfUFBTX0NM SUVOVF9MRElTQz1tCkNPTkZJR19QUFNfQ0xJRU5UX1BBUlBPUlQ9bQpDT05GSUdfUFBTX0NMSUVO VF9HUElPPW0KCiMKIyBQUFMgZ2VuZXJhdG9ycyBzdXBwb3J0CiMKCiMKIyBQVFAgY2xvY2sgc3Vw cG9ydAojCiMgQ09ORklHX1BUUF8xNTg4X0NMT0NLIGlzIG5vdCBzZXQKQ09ORklHX0FSQ0hfV0FO VF9PUFRJT05BTF9HUElPTElCPXkKQ09ORklHX0dQSU9MSUI9eQojIENPTkZJR19ERUJVR19HUElP IGlzIG5vdCBzZXQKQ09ORklHX0dQSU9fU1lTRlM9eQpDT05GSUdfR1BJT19HRU5FUklDPW0KQ09O RklHX0dQSU9fTUFYNzMwWD1tCgojCiMgTWVtb3J5IG1hcHBlZCBHUElPIGRyaXZlcnM6CiMKQ09O RklHX0dQSU9fR0VORVJJQ19QTEFURk9STT1tCkNPTkZJR19HUElPX0lUODc2MUU9bQpDT05GSUdf R1BJT19TQ0g9bQpDT05GSUdfR1BJT19WWDg1NT1tCgojCiMgSTJDIEdQSU8gZXhwYW5kZXJzOgoj CkNPTkZJR19HUElPX01BWDczMDA9bQpDT05GSUdfR1BJT19NQVg3MzJYPW0KQ09ORklHX0dQSU9f UENBOTUzWD1tCkNPTkZJR19HUElPX1BDRjg1N1g9bQpDT05GSUdfR1BJT19TVE1QRT15CkNPTkZJ R19HUElPX1RQUzY1OTEyPW0KQ09ORklHX0dQSU9fQURQNTU4OD1tCgojCiMgUENJIEdQSU8gZXhw YW5kZXJzOgojCkNPTkZJR19HUElPX0NTNTUzNT1tCkNPTkZJR19HUElPX0xBTkdXRUxMPXkKQ09O RklHX0dQSU9fUENIPW0KQ09ORklHX0dQSU9fTUxfSU9IPW0KIyBDT05GSUdfR1BJT19USU1CRVJE QUxFIGlzIG5vdCBzZXQKQ09ORklHX0dQSU9fUkRDMzIxWD1tCgojCiMgU1BJIEdQSU8gZXhwYW5k ZXJzOgojCkNPTkZJR19HUElPX01BWDczMDE9bQpDT05GSUdfR1BJT19NQ1AyM1MwOD1tCkNPTkZJ R19HUElPX01DMzM4ODA9bQpDT05GSUdfR1BJT183NFgxNjQ9bQoKIwojIEFDOTcgR1BJTyBleHBh bmRlcnM6CiMKQ09ORklHX0dQSU9fVUNCMTQwMD15CgojCiMgTU9EVUxidXMgR1BJTyBleHBhbmRl cnM6CiMKQ09ORklHX0dQSU9fSkFOWl9UVEw9bQpDT05GSUdfVzE9bQpDT05GSUdfVzFfQ09OPXkK CiMKIyAxLXdpcmUgQnVzIE1hc3RlcnMKIwpDT05GSUdfVzFfTUFTVEVSX01BVFJPWD1tCkNPTkZJ R19XMV9NQVNURVJfRFMyNDkwPW0KQ09ORklHX1cxX01BU1RFUl9EUzI0ODI9bQojIENPTkZJR19X MV9NQVNURVJfRFMxV00gaXMgbm90IHNldApDT05GSUdfVzFfTUFTVEVSX0dQSU89bQoKIwojIDEt d2lyZSBTbGF2ZXMKIwpDT05GSUdfVzFfU0xBVkVfVEhFUk09bQpDT05GSUdfVzFfU0xBVkVfU01F TT1tCiMgQ09ORklHX1cxX1NMQVZFX0RTMjQwOCBpcyBub3Qgc2V0CkNPTkZJR19XMV9TTEFWRV9E UzI0MjM9bQpDT05GSUdfVzFfU0xBVkVfRFMyNDMxPW0KQ09ORklHX1cxX1NMQVZFX0RTMjQzMz1t CkNPTkZJR19XMV9TTEFWRV9EUzI0MzNfQ1JDPXkKQ09ORklHX1cxX1NMQVZFX0RTMjc2MD1tCiMg Q09ORklHX1cxX1NMQVZFX0RTMjc4MCBpcyBub3Qgc2V0CkNPTkZJR19XMV9TTEFWRV9EUzI3ODE9 bQpDT05GSUdfVzFfU0xBVkVfQlEyNzAwMD1tCkNPTkZJR19QT1dFUl9TVVBQTFk9eQojIENPTkZJ R19QT1dFUl9TVVBQTFlfREVCVUcgaXMgbm90IHNldApDT05GSUdfUERBX1BPV0VSPW0KIyBDT05G SUdfVEVTVF9QT1dFUiBpcyBub3Qgc2V0CkNPTkZJR19CQVRURVJZX0RTMjc2MD1tCiMgQ09ORklH X0JBVFRFUllfRFMyNzgwIGlzIG5vdCBzZXQKQ09ORklHX0JBVFRFUllfRFMyNzgxPW0KQ09ORklH X0JBVFRFUllfRFMyNzgyPW0KQ09ORklHX0JBVFRFUllfU0JTPW0KQ09ORklHX0JBVFRFUllfQlEy N3gwMD1tCkNPTkZJR19CQVRURVJZX0JRMjdYMDBfSTJDPXkKQ09ORklHX0JBVFRFUllfQlEyN1gw MF9QTEFURk9STT15CkNPTkZJR19CQVRURVJZX01BWDE3MDQwPW0KQ09ORklHX0JBVFRFUllfTUFY MTcwNDI9bQpDT05GSUdfQ0hBUkdFUl9NQVg4OTAzPW0KQ09ORklHX0NIQVJHRVJfTFA4NzI3PW0K Q09ORklHX0NIQVJHRVJfR1BJTz1tCkNPTkZJR19DSEFSR0VSX01BTkFHRVI9eQpDT05GSUdfQ0hB UkdFUl9TTUIzNDc9bQpDT05GSUdfSFdNT049bQpDT05GSUdfSFdNT05fVklEPW0KIyBDT05GSUdf SFdNT05fREVCVUdfQ0hJUCBpcyBub3Qgc2V0CgojCiMgTmF0aXZlIGRyaXZlcnMKIwpDT05GSUdf U0VOU09SU19BQklUVUdVUlU9bQpDT05GSUdfU0VOU09SU19BQklUVUdVUlUzPW0KQ09ORklHX1NF TlNPUlNfQUQ3MzE0PW0KQ09ORklHX1NFTlNPUlNfQUQ3NDE0PW0KQ09ORklHX1NFTlNPUlNfQUQ3 NDE4PW0KQ09ORklHX1NFTlNPUlNfQURDWFg9bQpDT05GSUdfU0VOU09SU19BRE0xMDIxPW0KQ09O RklHX1NFTlNPUlNfQURNMTAyNT1tCkNPTkZJR19TRU5TT1JTX0FETTEwMjY9bQpDT05GSUdfU0VO U09SU19BRE0xMDI5PW0KQ09ORklHX1NFTlNPUlNfQURNMTAzMT1tCkNPTkZJR19TRU5TT1JTX0FE TTkyNDA9bQpDT05GSUdfU0VOU09SU19BRFQ3NDExPW0KQ09ORklHX1NFTlNPUlNfQURUNzQ2Mj1t CkNPTkZJR19TRU5TT1JTX0FEVDc0NzA9bQpDT05GSUdfU0VOU09SU19BRFQ3NDc1PW0KQ09ORklH X1NFTlNPUlNfQVNDNzYyMT1tCkNPTkZJR19TRU5TT1JTX0s4VEVNUD1tCkNPTkZJR19TRU5TT1JT X0sxMFRFTVA9bQpDT05GSUdfU0VOU09SU19GQU0xNUhfUE9XRVI9bQpDT05GSUdfU0VOU09SU19B U0IxMDA9bQpDT05GSUdfU0VOU09SU19BVFhQMT1tCkNPTkZJR19TRU5TT1JTX0RTNjIwPW0KQ09O RklHX1NFTlNPUlNfRFMxNjIxPW0KQ09ORklHX1NFTlNPUlNfSTVLX0FNQj1tCkNPTkZJR19TRU5T T1JTX0Y3MTgwNUY9bQpDT05GSUdfU0VOU09SU19GNzE4ODJGRz1tCkNPTkZJR19TRU5TT1JTX0Y3 NTM3NVM9bQpDT05GSUdfU0VOU09SU19GU0NITUQ9bQpDT05GSUdfU0VOU09SU19HNzYwQT1tCkNP TkZJR19TRU5TT1JTX0dMNTE4U009bQpDT05GSUdfU0VOU09SU19HTDUyMFNNPW0KQ09ORklHX1NF TlNPUlNfR1BJT19GQU49bQpDT05GSUdfU0VOU09SU19DT1JFVEVNUD1tCkNPTkZJR19TRU5TT1JT X0lCTUFFTT1tCkNPTkZJR19TRU5TT1JTX0lCTVBFWD1tCkNPTkZJR19TRU5TT1JTX0lUODc9bQpD T05GSUdfU0VOU09SU19KQzQyPW0KQ09ORklHX1NFTlNPUlNfTElORUFHRT1tCkNPTkZJR19TRU5T T1JTX0xNNjM9bQpDT05GSUdfU0VOU09SU19MTTcwPW0KQ09ORklHX1NFTlNPUlNfTE03Mz1tCkNP TkZJR19TRU5TT1JTX0xNNzU9bQpDT05GSUdfU0VOU09SU19MTTc3PW0KQ09ORklHX1NFTlNPUlNf TE03OD1tCkNPTkZJR19TRU5TT1JTX0xNODA9bQpDT05GSUdfU0VOU09SU19MTTgzPW0KQ09ORklH X1NFTlNPUlNfTE04NT1tCkNPTkZJR19TRU5TT1JTX0xNODc9bQpDT05GSUdfU0VOU09SU19MTTkw PW0KQ09ORklHX1NFTlNPUlNfTE05Mj1tCkNPTkZJR19TRU5TT1JTX0xNOTM9bQpDT05GSUdfU0VO U09SU19MVEM0MTUxPW0KQ09ORklHX1NFTlNPUlNfTFRDNDIxNT1tCkNPTkZJR19TRU5TT1JTX0xU QzQyNDU9bQpDT05GSUdfU0VOU09SU19MVEM0MjYxPW0KQ09ORklHX1NFTlNPUlNfTE05NTI0MT1t CkNPTkZJR19TRU5TT1JTX0xNOTUyNDU9bQpDT05GSUdfU0VOU09SU19NQVgxMTExPW0KQ09ORklH X1NFTlNPUlNfTUFYMTYwNjU9bQpDT05GSUdfU0VOU09SU19NQVgxNjE5PW0KQ09ORklHX1NFTlNP UlNfTUFYMTY2OD1tCkNPTkZJR19TRU5TT1JTX01BWDY2Mzk9bQpDT05GSUdfU0VOU09SU19NQVg2 NjQyPW0KQ09ORklHX1NFTlNPUlNfTUFYNjY1MD1tCkNPTkZJR19TRU5TT1JTX01DUDMwMjE9bQpD T05GSUdfU0VOU09SU19OVENfVEhFUk1JU1RPUj1tCkNPTkZJR19TRU5TT1JTX1BDODczNjA9bQpD T05GSUdfU0VOU09SU19QQzg3NDI3PW0KQ09ORklHX1NFTlNPUlNfUENGODU5MT1tCkNPTkZJR19Q TUJVUz1tCkNPTkZJR19TRU5TT1JTX1BNQlVTPW0KQ09ORklHX1NFTlNPUlNfQURNMTI3NT1tCkNP TkZJR19TRU5TT1JTX0xNMjUwNjY9bQpDT05GSUdfU0VOU09SU19MVEMyOTc4PW0KQ09ORklHX1NF TlNPUlNfTUFYMTYwNjQ9bQpDT05GSUdfU0VOU09SU19NQVgzNDQ0MD1tCkNPTkZJR19TRU5TT1JT X01BWDg2ODg9bQpDT05GSUdfU0VOU09SU19VQ0Q5MDAwPW0KQ09ORklHX1NFTlNPUlNfVUNEOTIw MD1tCkNPTkZJR19TRU5TT1JTX1pMNjEwMD1tCkNPTkZJR19TRU5TT1JTX1NIVDE1PW0KQ09ORklH X1NFTlNPUlNfU0hUMjE9bQpDT05GSUdfU0VOU09SU19TSVM1NTk1PW0KQ09ORklHX1NFTlNPUlNf U01NNjY1PW0KQ09ORklHX1NFTlNPUlNfRE1FMTczNz1tCkNPTkZJR19TRU5TT1JTX0VNQzE0MDM9 bQpDT05GSUdfU0VOU09SU19FTUMyMTAzPW0KQ09ORklHX1NFTlNPUlNfRU1DNlcyMDE9bQpDT05G SUdfU0VOU09SU19TTVNDNDdNMT1tCkNPTkZJR19TRU5TT1JTX1NNU0M0N00xOTI9bQpDT05GSUdf U0VOU09SU19TTVNDNDdCMzk3PW0KQ09ORklHX1NFTlNPUlNfU0NINTZYWF9DT01NT049bQpDT05G SUdfU0VOU09SU19TQ0g1NjI3PW0KQ09ORklHX1NFTlNPUlNfU0NINTYzNj1tCkNPTkZJR19TRU5T T1JTX0FEUzEwMTU9bQpDT05GSUdfU0VOU09SU19BRFM3ODI4PW0KQ09ORklHX1NFTlNPUlNfQURT Nzg3MT1tCkNPTkZJR19TRU5TT1JTX0FNQzY4MjE9bQpDT05GSUdfU0VOU09SU19USE1DNTA9bQpD T05GSUdfU0VOU09SU19UTVAxMDI9bQpDT05GSUdfU0VOU09SU19UTVA0MDE9bQpDT05GSUdfU0VO U09SU19UTVA0MjE9bQpDT05GSUdfU0VOU09SU19WSUFfQ1BVVEVNUD1tCkNPTkZJR19TRU5TT1JT X1ZJQTY4NkE9bQpDT05GSUdfU0VOU09SU19WVDEyMTE9bQpDT05GSUdfU0VOU09SU19WVDgyMzE9 bQpDT05GSUdfU0VOU09SU19XODM3ODFEPW0KQ09ORklHX1NFTlNPUlNfVzgzNzkxRD1tCkNPTkZJ R19TRU5TT1JTX1c4Mzc5MkQ9bQpDT05GSUdfU0VOU09SU19XODM3OTM9bQpDT05GSUdfU0VOU09S U19XODM3OTU9bQpDT05GSUdfU0VOU09SU19XODM3OTVfRkFOQ1RSTD15CkNPTkZJR19TRU5TT1JT X1c4M0w3ODVUUz1tCkNPTkZJR19TRU5TT1JTX1c4M0w3ODZORz1tCkNPTkZJR19TRU5TT1JTX1c4 MzYyN0hGPW0KQ09ORklHX1NFTlNPUlNfVzgzNjI3RUhGPW0KQ09ORklHX1NFTlNPUlNfQVBQTEVT TUM9bQpDT05GSUdfU0VOU09SU19NQzEzNzgzX0FEQz1tCgojCiMgQUNQSSBkcml2ZXJzCiMKQ09O RklHX1NFTlNPUlNfQUNQSV9QT1dFUj1tCkNPTkZJR19TRU5TT1JTX0FUSzAxMTA9bQpDT05GSUdf VEhFUk1BTD15CkNPTkZJR19XQVRDSERPRz15CkNPTkZJR19XQVRDSERPR19DT1JFPXkKIyBDT05G SUdfV0FUQ0hET0dfTk9XQVlPVVQgaXMgbm90IHNldAoKIwojIFdhdGNoZG9nIERldmljZSBEcml2 ZXJzCiMKQ09ORklHX1NPRlRfV0FUQ0hET0c9bQpDT05GSUdfQUNRVUlSRV9XRFQ9bQpDT05GSUdf QURWQU5URUNIX1dEVD1tCkNPTkZJR19BTElNMTUzNV9XRFQ9bQpDT05GSUdfQUxJTTcxMDFfV0RU PW0KQ09ORklHX0Y3MTgwOEVfV0RUPW0KQ09ORklHX1NQNTEwMF9UQ089bQpDT05GSUdfR0VPREVf V0RUPW0KQ09ORklHX1NDNTIwX1dEVD1tCkNPTkZJR19TQkNfRklUUEMyX1dBVENIRE9HPW0KQ09O RklHX0VVUk9URUNIX1dEVD1tCkNPTkZJR19JQjcwMF9XRFQ9bQpDT05GSUdfSUJNQVNSPW0KQ09O RklHX1dBRkVSX1dEVD1tCkNPTkZJR19JNjMwMEVTQl9XRFQ9bQpDT05GSUdfSVRDT19XRFQ9bQpD T05GSUdfSVRDT19WRU5ET1JfU1VQUE9SVD15CkNPTkZJR19JVDg3MTJGX1dEVD1tCkNPTkZJR19J VDg3X1dEVD1tCkNPTkZJR19IUF9XQVRDSERPRz1tCiMgQ09ORklHX0hQV0RUX05NSV9ERUNPRElO RyBpcyBub3Qgc2V0CkNPTkZJR19TQzEyMDBfV0RUPW0KQ09ORklHX1BDODc0MTNfV0RUPW0KQ09O RklHX05WX1RDTz1tCkNPTkZJR182MFhYX1dEVD1tCkNPTkZJR19TQkM4MzYwX1dEVD1tCkNPTkZJ R19DUFU1X1dEVD1tCkNPTkZJR19TTVNDX1NDSDMxMVhfV0RUPW0KQ09ORklHX1NNU0MzN0I3ODdf V0RUPW0KQ09ORklHX1ZJQV9XRFQ9bQpDT05GSUdfVzgzNjI3SEZfV0RUPW0KQ09ORklHX1c4MzY5 N0hGX1dEVD1tCkNPTkZJR19XODM2OTdVR19XRFQ9bQpDT05GSUdfVzgzODc3Rl9XRFQ9bQpDT05G SUdfVzgzOTc3Rl9XRFQ9bQpDT05GSUdfTUFDSFpfV0RUPW0KQ09ORklHX1NCQ19FUFhfQzNfV0FU Q0hET0c9bQpDT05GSUdfWEVOX1dEVD1tCgojCiMgUENJLWJhc2VkIFdhdGNoZG9nIENhcmRzCiMK Q09ORklHX1BDSVBDV0FUQ0hET0c9bQpDT05GSUdfV0RUUENJPW0KCiMKIyBVU0ItYmFzZWQgV2F0 Y2hkb2cgQ2FyZHMKIwpDT05GSUdfVVNCUENXQVRDSERPRz1tCkNPTkZJR19TU0JfUE9TU0lCTEU9 eQoKIwojIFNvbmljcyBTaWxpY29uIEJhY2twbGFuZQojCkNPTkZJR19TU0I9bQpDT05GSUdfU1NC X1NQUk9NPXkKQ09ORklHX1NTQl9CTE9DS0lPPXkKQ09ORklHX1NTQl9QQ0lIT1NUX1BPU1NJQkxF PXkKQ09ORklHX1NTQl9QQ0lIT1NUPXkKQ09ORklHX1NTQl9CNDNfUENJX0JSSURHRT15CkNPTkZJ R19TU0JfUENNQ0lBSE9TVF9QT1NTSUJMRT15CkNPTkZJR19TU0JfUENNQ0lBSE9TVD15CkNPTkZJ R19TU0JfU0RJT0hPU1RfUE9TU0lCTEU9eQpDT05GSUdfU1NCX1NESU9IT1NUPXkKIyBDT05GSUdf U1NCX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1NTQl9EUklWRVJfUENJQ09SRV9QT1NTSUJMRT15 CkNPTkZJR19TU0JfRFJJVkVSX1BDSUNPUkU9eQpDT05GSUdfQkNNQV9QT1NTSUJMRT15CgojCiMg QnJvYWRjb20gc3BlY2lmaWMgQU1CQQojCiMgQ09ORklHX0JDTUEgaXMgbm90IHNldAoKIwojIE11 bHRpZnVuY3Rpb24gZGV2aWNlIGRyaXZlcnMKIwpDT05GSUdfTUZEX0NPUkU9eQpDT05GSUdfTUZE X1NNNTAxPW0KQ09ORklHX01GRF9TTTUwMV9HUElPPXkKQ09ORklHX0hUQ19QQVNJQzM9bQpDT05G SUdfVUNCMTQwMF9DT1JFPW0KQ09ORklHX1RQUzYxMDVYPW0KQ09ORklHX1RQUzY1MDEwPW0KQ09O RklHX1RQUzY1MDdYPW0KQ09ORklHX01GRF9UUFM2NTIxNz1tCkNPTkZJR19NRkRfVFBTNjU5MTI9 eQpDT05GSUdfTUZEX1RQUzY1OTEyX1NQST15CkNPTkZJR19NRkRfU1RNUEU9eQoKIwojIFNUTVBF IEludGVyZmFjZSBEcml2ZXJzCiMKQ09ORklHX1NUTVBFX1NQST15CiMgQ09ORklHX01GRF9UTUlP IGlzIG5vdCBzZXQKQ09ORklHX1BNSUNfREE5MDUyPXkKQ09ORklHX01GRF9EQTkwNTJfU1BJPXkK Q09ORklHX01GRF9XTTg0MDA9bQojIENPTkZJR19NRkRfV004MzFYX1NQSSBpcyBub3Qgc2V0CiMg Q09ORklHX01GRF9QQ0Y1MDYzMyBpcyBub3Qgc2V0CkNPTkZJR19NRkRfTUMxMzc4Mz1tCkNPTkZJ R19NRkRfTUMxM1hYWD1tCiMgQ09ORklHX0FCWDUwMF9DT1JFIGlzIG5vdCBzZXQKQ09ORklHX0Va WF9QQ0FQPXkKQ09ORklHX01GRF9DUzU1MzU9bQpDT05GSUdfTUZEX1RJTUJFUkRBTEU9bQpDT05G SUdfTFBDX1NDSD1tCkNPTkZJR19NRkRfUkRDMzIxWD1tCkNPTkZJR19NRkRfSkFOWl9DTU9ESU89 bQpDT05GSUdfTUZEX1ZYODU1PW0KQ09ORklHX01GRF9XTDEyNzNfQ09SRT1tCkNPTkZJR19SRUdV TEFUT1I9eQojIENPTkZJR19SRUdVTEFUT1JfREVCVUcgaXMgbm90IHNldApDT05GSUdfUkVHVUxB VE9SX0RVTU1ZPXkKQ09ORklHX1JFR1VMQVRPUl9GSVhFRF9WT0xUQUdFPW0KQ09ORklHX1JFR1VM QVRPUl9WSVJUVUFMX0NPTlNVTUVSPW0KQ09ORklHX1JFR1VMQVRPUl9VU0VSU1BBQ0VfQ09OU1VN RVI9bQpDT05GSUdfUkVHVUxBVE9SX0dQSU89bQpDT05GSUdfUkVHVUxBVE9SX0FENTM5OD1tCkNP TkZJR19SRUdVTEFUT1JfREE5MDUyPW0KQ09ORklHX1JFR1VMQVRPUl9NQzEzWFhYX0NPUkU9bQpD T05GSUdfUkVHVUxBVE9SX01DMTM3ODM9bQpDT05GSUdfUkVHVUxBVE9SX01DMTM4OTI9bQpDT05G SUdfUkVHVUxBVE9SX0lTTDYyNzFBPW0KQ09ORklHX1JFR1VMQVRPUl9NQVgxNTg2PW0KQ09ORklH X1JFR1VMQVRPUl9NQVg4NjQ5PW0KQ09ORklHX1JFR1VMQVRPUl9NQVg4NjYwPW0KQ09ORklHX1JF R1VMQVRPUl9NQVg4OTUyPW0KQ09ORklHX1JFR1VMQVRPUl9QQ0FQPW0KQ09ORklHX1JFR1VMQVRP Ul9MUDM5NzE9bQpDT05GSUdfUkVHVUxBVE9SX0xQMzk3Mj1tCkNPTkZJR19SRUdVTEFUT1JfVFBT NjEwNVg9bQpDT05GSUdfUkVHVUxBVE9SX1RQUzYyMzYwPW0KQ09ORklHX1JFR1VMQVRPUl9UUFM2 NTAyMz1tCkNPTkZJR19SRUdVTEFUT1JfVFBTNjUwN1g9bQpDT05GSUdfUkVHVUxBVE9SX1RQUzY1 MjE3PW0KQ09ORklHX1JFR1VMQVRPUl9UUFM2NTI0WD1tCkNPTkZJR19SRUdVTEFUT1JfVFBTNjU5 MTI9bQpDT05GSUdfUkVHVUxBVE9SX1dNODQwMD1tCkNPTkZJR19NRURJQV9TVVBQT1JUPW0KCiMK IyBNdWx0aW1lZGlhIGNvcmUgc3VwcG9ydAojCiMgQ09ORklHX01FRElBX0NPTlRST0xMRVIgaXMg bm90IHNldApDT05GSUdfVklERU9fREVWPW0KQ09ORklHX1ZJREVPX1Y0TDJfQ09NTU9OPW0KQ09O RklHX0RWQl9DT1JFPW0KQ09ORklHX0RWQl9ORVQ9eQpDT05GSUdfVklERU9fTUVESUE9bQoKIwoj IE11bHRpbWVkaWEgZHJpdmVycwojCkNPTkZJR19WSURFT19TQUE3MTQ2PW0KQ09ORklHX1ZJREVP X1NBQTcxNDZfVlY9bQpDT05GSUdfUkNfQ09SRT1tCkNPTkZJR19MSVJDPW0KQ09ORklHX1JDX01B UD1tCkNPTkZJR19JUl9ORUNfREVDT0RFUj1tCkNPTkZJR19JUl9SQzVfREVDT0RFUj1tCkNPTkZJ R19JUl9SQzZfREVDT0RFUj1tCkNPTkZJR19JUl9KVkNfREVDT0RFUj1tCkNPTkZJR19JUl9TT05Z X0RFQ09ERVI9bQpDT05GSUdfSVJfUkM1X1NaX0RFQ09ERVI9bQpDT05GSUdfSVJfU0FOWU9fREVD T0RFUj1tCkNPTkZJR19JUl9NQ0VfS0JEX0RFQ09ERVI9bQpDT05GSUdfSVJfTElSQ19DT0RFQz1t CkNPTkZJR19SQ19BVElfUkVNT1RFPW0KIyBDT05GSUdfSVJfRU5FIGlzIG5vdCBzZXQKQ09ORklH X0lSX0lNT049bQpDT05GSUdfSVJfTUNFVVNCPW0KQ09ORklHX0lSX0lURV9DSVI9bQpDT05GSUdf SVJfRklOVEVLPW0KQ09ORklHX0lSX05VVk9UT049bQpDT05GSUdfSVJfUkVEUkFUMz1tCkNPTkZJ R19JUl9TVFJFQU1aQVA9bQpDT05GSUdfSVJfV0lOQk9ORF9DSVI9bQpDT05GSUdfUkNfTE9PUEJB Q0s9bQpDT05GSUdfSVJfR1BJT19DSVI9bQpDT05GSUdfTUVESUFfQVRUQUNIPXkKQ09ORklHX01F RElBX1RVTkVSPW0KIyBDT05GSUdfTUVESUFfVFVORVJfQ1VTVE9NSVNFIGlzIG5vdCBzZXQKQ09O RklHX01FRElBX1RVTkVSX1NJTVBMRT1tCkNPTkZJR19NRURJQV9UVU5FUl9UREE4MjkwPW0KQ09O RklHX01FRElBX1RVTkVSX1REQTgyN1g9bQpDT05GSUdfTUVESUFfVFVORVJfVERBMTgyNzE9bQpD T05GSUdfTUVESUFfVFVORVJfVERBOTg4Nz1tCkNPTkZJR19NRURJQV9UVU5FUl9URUE1NzYxPW0K Q09ORklHX01FRElBX1RVTkVSX1RFQTU3Njc9bQpDT05GSUdfTUVESUFfVFVORVJfTVQyMFhYPW0K Q09ORklHX01FRElBX1RVTkVSX01UMjA2MD1tCkNPTkZJR19NRURJQV9UVU5FUl9NVDIwNjM9bQpD T05GSUdfTUVESUFfVFVORVJfTVQyMjY2PW0KQ09ORklHX01FRElBX1RVTkVSX01UMjEzMT1tCkNP TkZJR19NRURJQV9UVU5FUl9RVDEwMTA9bQpDT05GSUdfTUVESUFfVFVORVJfWEMyMDI4PW0KQ09O RklHX01FRElBX1RVTkVSX1hDNTAwMD1tCkNPTkZJR19NRURJQV9UVU5FUl9YQzQwMDA9bQpDT05G SUdfTUVESUFfVFVORVJfTVhMNTAwNVM9bQpDT05GSUdfTUVESUFfVFVORVJfTVhMNTAwN1Q9bQpD T05GSUdfTUVESUFfVFVORVJfTUM0NFM4MDM9bQpDT05GSUdfTUVESUFfVFVORVJfTUFYMjE2NT1t CkNPTkZJR19NRURJQV9UVU5FUl9UREExODIxOD1tCkNPTkZJR19NRURJQV9UVU5FUl9UREExODIx Mj1tCkNPTkZJR19WSURFT19WNEwyPW0KQ09ORklHX1ZJREVPQlVGX0dFTj1tCkNPTkZJR19WSURF T0JVRl9ETUFfU0c9bQpDT05GSUdfVklERU9CVUZfVk1BTExPQz1tCkNPTkZJR19WSURFT0JVRl9E VkI9bQpDT05GSUdfVklERU9fQlRDWD1tCkNPTkZJR19WSURFT19UVkVFUFJPTT1tCkNPTkZJR19W SURFT19UVU5FUj1tCkNPTkZJR19WSURFT0JVRjJfQ09SRT1tCkNPTkZJR19WSURFT0JVRjJfTUVN T1BTPW0KQ09ORklHX1ZJREVPQlVGMl9ETUFfQ09OVElHPW0KQ09ORklHX1ZJREVPQlVGMl9WTUFM TE9DPW0KQ09ORklHX1ZJREVPX0NBUFRVUkVfRFJJVkVSUz15CiMgQ09ORklHX1ZJREVPX0FEVl9E RUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX1ZJREVPX0ZJWEVEX01JTk9SX1JBTkdFUyBpcyBub3Qg c2V0CkNPTkZJR19WSURFT19IRUxQRVJfQ0hJUFNfQVVUTz15CkNPTkZJR19WSURFT19JUl9JMkM9 bQoKIwojIEF1ZGlvIGRlY29kZXJzLCBwcm9jZXNzb3JzIGFuZCBtaXhlcnMKIwpDT05GSUdfVklE RU9fVFZBVURJTz1tCkNPTkZJR19WSURFT19UREE3NDMyPW0KQ09ORklHX1ZJREVPX1REQTk4NDA9 bQpDT05GSUdfVklERU9fVEVBNjQxNUM9bQpDT05GSUdfVklERU9fVEVBNjQyMD1tCkNPTkZJR19W SURFT19NU1AzNDAwPW0KQ09ORklHX1ZJREVPX0NTNTM0NT1tCkNPTkZJR19WSURFT19DUzUzTDMy QT1tCkNPTkZJR19WSURFT19XTTg3NzU9bQpDT05GSUdfVklERU9fV004NzM5PW0KQ09ORklHX1ZJ REVPX1ZQMjdTTVBYPW0KCiMKIyBSRFMgZGVjb2RlcnMKIwpDT05GSUdfVklERU9fU0FBNjU4OD1t CgojCiMgVmlkZW8gZGVjb2RlcnMKIwpDT05GSUdfVklERU9fQlQ4MTk9bQpDT05GSUdfVklERU9f QlQ4NTY9bQpDT05GSUdfVklERU9fQlQ4NjY9bQpDT05GSUdfVklERU9fS1MwMTI3PW0KQ09ORklH X1ZJREVPX1NBQTcxMTA9bQpDT05GSUdfVklERU9fU0FBNzExWD1tCkNPTkZJR19WSURFT19UVlA1 MTUwPW0KQ09ORklHX1ZJREVPX1ZQWDMyMjA9bQoKIwojIFZpZGVvIGFuZCBhdWRpbyBkZWNvZGVy cwojCkNPTkZJR19WSURFT19TQUE3MTdYPW0KQ09ORklHX1ZJREVPX0NYMjU4NDA9bQoKIwojIE1Q RUcgdmlkZW8gZW5jb2RlcnMKIwpDT05GSUdfVklERU9fQ1gyMzQxWD1tCgojCiMgVmlkZW8gZW5j b2RlcnMKIwpDT05GSUdfVklERU9fU0FBNzEyNz1tCkNPTkZJR19WSURFT19TQUE3MTg1PW0KQ09O RklHX1ZJREVPX0FEVjcxNzA9bQpDT05GSUdfVklERU9fQURWNzE3NT1tCgojCiMgQ2FtZXJhIHNl bnNvciBkZXZpY2VzCiMKQ09ORklHX1ZJREVPX01UOVYwMTE9bQoKIwojIEZsYXNoIGRldmljZXMK IwoKIwojIFZpZGVvIGltcHJvdmVtZW50IGNoaXBzCiMKQ09ORklHX1ZJREVPX1VQRDY0MDMxQT1t CkNPTkZJR19WSURFT19VUEQ2NDA4Mz1tCgojCiMgTWlzY2VsYW5lb3VzIGhlbHBlciBjaGlwcwoj CkNPTkZJR19WSURFT19NNTI3OTA9bQpDT05GSUdfVklERU9fVklWST1tCkNPTkZJR19WNExfVVNC X0RSSVZFUlM9eQpDT05GSUdfVVNCX1ZJREVPX0NMQVNTPW0KQ09ORklHX1VTQl9WSURFT19DTEFT U19JTlBVVF9FVkRFVj15CkNPTkZJR19VU0JfR1NQQ0E9bQpDT05GSUdfVVNCX001NjAyPW0KQ09O RklHX1VTQl9TVFYwNlhYPW0KQ09ORklHX1VTQl9HTDg2MD1tCkNPTkZJR19VU0JfR1NQQ0FfQkVO UT1tCkNPTkZJR19VU0JfR1NQQ0FfQ09ORVg9bQpDT05GSUdfVVNCX0dTUENBX0NQSUExPW0KQ09O RklHX1VTQl9HU1BDQV9FVE9NUz1tCkNPTkZJR19VU0JfR1NQQ0FfRklORVBJWD1tCkNPTkZJR19V U0JfR1NQQ0FfSkVJTElOSj1tCkNPTkZJR19VU0JfR1NQQ0FfSkwyMDA1QkNEPW0KQ09ORklHX1VT Ql9HU1BDQV9LSU5FQ1Q9bQpDT05GSUdfVVNCX0dTUENBX0tPTklDQT1tCkNPTkZJR19VU0JfR1NQ Q0FfTUFSUz1tCkNPTkZJR19VU0JfR1NQQ0FfTVI5NzMxMEE9bQpDT05GSUdfVVNCX0dTUENBX05X ODBYPW0KQ09ORklHX1VTQl9HU1BDQV9PVjUxOT1tCkNPTkZJR19VU0JfR1NQQ0FfT1Y1MzQ9bQpD T05GSUdfVVNCX0dTUENBX09WNTM0Xzk9bQpDT05GSUdfVVNCX0dTUENBX1BBQzIwNz1tCkNPTkZJ R19VU0JfR1NQQ0FfUEFDNzMwMj1tCkNPTkZJR19VU0JfR1NQQ0FfUEFDNzMxMT1tCkNPTkZJR19V U0JfR1NQQ0FfU0U0MDE9bQpDT05GSUdfVVNCX0dTUENBX1NOOUMyMDI4PW0KQ09ORklHX1VTQl9H U1BDQV9TTjlDMjBYPW0KQ09ORklHX1VTQl9HU1BDQV9TT05JWEI9bQpDT05GSUdfVVNCX0dTUENB X1NPTklYSj1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwMD1tCkNPTkZJR19VU0JfR1NQQ0FfU1BD QTUwMT1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwNT1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUw Nj1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwOD1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTU2MT1t CkNPTkZJR19VU0JfR1NQQ0FfU1BDQTE1Mjg9bQpDT05GSUdfVVNCX0dTUENBX1NROTA1PW0KQ09O RklHX1VTQl9HU1BDQV9TUTkwNUM9bQpDT05GSUdfVVNCX0dTUENBX1NROTMwWD1tCkNPTkZJR19V U0JfR1NQQ0FfU1RLMDE0PW0KQ09ORklHX1VTQl9HU1BDQV9TVFYwNjgwPW0KQ09ORklHX1VTQl9H U1BDQV9TVU5QTFVTPW0KQ09ORklHX1VTQl9HU1BDQV9UNjEzPW0KQ09ORklHX1VTQl9HU1BDQV9U T1BSTz1tCkNPTkZJR19VU0JfR1NQQ0FfVFY4NTMyPW0KQ09ORklHX1VTQl9HU1BDQV9WQzAzMlg9 bQpDT05GSUdfVVNCX0dTUENBX1ZJQ0FNPW0KQ09ORklHX1VTQl9HU1BDQV9YSVJMSU5LX0NJVD1t CkNPTkZJR19VU0JfR1NQQ0FfWkMzWFg9bQpDT05GSUdfVklERU9fUFZSVVNCMj1tCkNPTkZJR19W SURFT19QVlJVU0IyX1NZU0ZTPXkKQ09ORklHX1ZJREVPX1BWUlVTQjJfRFZCPXkKIyBDT05GSUdf VklERU9fUFZSVVNCMl9ERUJVR0lGQyBpcyBub3Qgc2V0CkNPTkZJR19WSURFT19IRFBWUj1tCkNP TkZJR19WSURFT19FTTI4WFg9bQpDT05GSUdfVklERU9fRU0yOFhYX0FMU0E9bQpDT05GSUdfVklE RU9fRU0yOFhYX0RWQj1tCkNPTkZJR19WSURFT19FTTI4WFhfUkM9eQpDT05GSUdfVklERU9fVExH MjMwMD1tCkNPTkZJR19WSURFT19DWDIzMVhYPW0KQ09ORklHX1ZJREVPX0NYMjMxWFhfUkM9eQpD T05GSUdfVklERU9fQ1gyMzFYWF9BTFNBPW0KQ09ORklHX1ZJREVPX0NYMjMxWFhfRFZCPW0KQ09O RklHX1ZJREVPX1RNNjAwMD1tCkNPTkZJR19WSURFT19UTTYwMDBfQUxTQT1tCkNPTkZJR19WSURF T19UTTYwMDBfRFZCPW0KQ09ORklHX1ZJREVPX1VTQlZJU0lPTj1tCkNPTkZJR19VU0JfRVQ2MVgy NTE9bQpDT05GSUdfVVNCX1NOOUMxMDI9bQpDT05GSUdfVVNCX1BXQz1tCiMgQ09ORklHX1VTQl9Q V0NfREVCVUcgaXMgbm90IHNldApDT05GSUdfVVNCX1BXQ19JTlBVVF9FVkRFVj15CkNPTkZJR19W SURFT19DUElBMj1tCkNPTkZJR19VU0JfWlIzNjRYWD1tCkNPTkZJR19VU0JfU1RLV0VCQ0FNPW0K Q09ORklHX1VTQl9TMjI1NT1tCkNPTkZJR19WNExfUENJX0RSSVZFUlM9eQpDT05GSUdfVklERU9f QVUwODI4PW0KQ09ORklHX1ZJREVPX0JUODQ4PW0KQ09ORklHX1ZJREVPX0JUODQ4X0RWQj15CkNP TkZJR19WSURFT19DWDE4PW0KQ09ORklHX1ZJREVPX0NYMThfQUxTQT1tCkNPTkZJR19WSURFT19D WDIzODg1PW0KQ09ORklHX01FRElBX0FMVEVSQV9DST1tCkNPTkZJR19WSURFT19DWDI1ODIxPW0K Q09ORklHX1ZJREVPX0NYMjU4MjFfQUxTQT1tCkNPTkZJR19WSURFT19DWDg4PW0KQ09ORklHX1ZJ REVPX0NYODhfQUxTQT1tCkNPTkZJR19WSURFT19DWDg4X0JMQUNLQklSRD1tCkNPTkZJR19WSURF T19DWDg4X0RWQj1tCkNPTkZJR19WSURFT19DWDg4X1ZQMzA1ND1tCkNPTkZJR19WSURFT19DWDg4 X01QRUc9bQpDT05GSUdfVklERU9fSEVYSVVNX0dFTUlOST1tCkNPTkZJR19WSURFT19IRVhJVU1f T1JJT049bQpDT05GSUdfVklERU9fSVZUVj1tCkNPTkZJR19WSURFT19GQl9JVlRWPW0KQ09ORklH X1ZJREVPX01FWUU9bQpDT05GSUdfVklERU9fTVhCPW0KQ09ORklHX1ZJREVPX1NBQTcxMzQ9bQpD T05GSUdfVklERU9fU0FBNzEzNF9BTFNBPW0KQ09ORklHX1ZJREVPX1NBQTcxMzRfUkM9eQpDT05G SUdfVklERU9fU0FBNzEzNF9EVkI9bQpDT05GSUdfVklERU9fU0FBNzE2ND1tCkNPTkZJR19WSURF T19aT1JBTj1tCkNPTkZJR19WSURFT19aT1JBTl9EQzMwPW0KQ09ORklHX1ZJREVPX1pPUkFOX1pS MzYwNjA9bQpDT05GSUdfVklERU9fWk9SQU5fQlVaPW0KQ09ORklHX1ZJREVPX1pPUkFOX0RDMTA9 bQpDT05GSUdfVklERU9fWk9SQU5fTE1MMzM9bQpDT05GSUdfVklERU9fWk9SQU5fTE1MMzNSMTA9 bQpDT05GSUdfVklERU9fWk9SQU5fQVZTNkVZRVM9bQojIENPTkZJR19WNExfSVNBX1BBUlBPUlRf RFJJVkVSUyBpcyBub3Qgc2V0CiMgQ09ORklHX1Y0TF9QTEFURk9STV9EUklWRVJTIGlzIG5vdCBz ZXQKIyBDT05GSUdfVjRMX01FTTJNRU1fRFJJVkVSUyBpcyBub3Qgc2V0CkNPTkZJR19SQURJT19B REFQVEVSUz15CkNPTkZJR19SQURJT19TSTQ3MFg9eQpDT05GSUdfVVNCX1NJNDcwWD1tCkNPTkZJ R19JMkNfU0k0NzBYPW0KQ09ORklHX1VTQl9NUjgwMD1tCkNPTkZJR19VU0JfRFNCUj1tCkNPTkZJ R19SQURJT19NQVhJUkFESU89bQpDT05GSUdfSTJDX1NJNDcxMz1tCkNPTkZJR19SQURJT19TSTQ3 MTM9bQpDT05GSUdfVVNCX0tFRU5FPW0KQ09ORklHX1JBRElPX1RFQTU3NjQ9bQpDT05GSUdfUkFE SU9fU0FBNzcwNkg9bQpDT05GSUdfUkFESU9fVEVGNjg2Mj1tCkNPTkZJR19SQURJT19USU1CRVJE QUxFPW0KQ09ORklHX1JBRElPX1dMMTI3Mz1tCgojCiMgVGV4YXMgSW5zdHJ1bWVudHMgV0wxMjh4 IEZNIGRyaXZlciAoU1QgYmFzZWQpCiMKQ09ORklHX1JBRElPX1dMMTI4WD1tCkNPTkZJR19EVkJf TUFYX0FEQVBURVJTPTgKQ09ORklHX0RWQl9EWU5BTUlDX01JTk9SUz15CkNPTkZJR19EVkJfQ0FQ VFVSRV9EUklWRVJTPXkKCiMKIyBTdXBwb3J0ZWQgU0FBNzE0NiBiYXNlZCBQQ0kgQWRhcHRlcnMK IwpDT05GSUdfVFRQQ0lfRUVQUk9NPW0KQ09ORklHX0RWQl9BVjcxMTA9bQpDT05GSUdfRFZCX0FW NzExMF9PU0Q9eQpDT05GSUdfRFZCX0JVREdFVF9DT1JFPW0KQ09ORklHX0RWQl9CVURHRVQ9bQpD T05GSUdfRFZCX0JVREdFVF9DST1tCkNPTkZJR19EVkJfQlVER0VUX0FWPW0KQ09ORklHX0RWQl9C VURHRVRfUEFUQ0g9bQoKIwojIFN1cHBvcnRlZCBVU0IgQWRhcHRlcnMKIwpDT05GSUdfRFZCX1VT Qj1tCiMgQ09ORklHX0RWQl9VU0JfREVCVUcgaXMgbm90IHNldApDT05GSUdfRFZCX1VTQl9BODAw PW0KQ09ORklHX0RWQl9VU0JfRElCVVNCX01CPW0KIyBDT05GSUdfRFZCX1VTQl9ESUJVU0JfTUJf RkFVTFRZIGlzIG5vdCBzZXQKQ09ORklHX0RWQl9VU0JfRElCVVNCX01DPW0KQ09ORklHX0RWQl9V U0JfRElCMDcwMD1tCkNPTkZJR19EVkJfVVNCX1VNVF8wMTA9bQpDT05GSUdfRFZCX1VTQl9DWFVT Qj1tCkNPTkZJR19EVkJfVVNCX005MjBYPW0KQ09ORklHX0RWQl9VU0JfR0w4NjE9bQpDT05GSUdf RFZCX1VTQl9BVTY2MTA9bQpDT05GSUdfRFZCX1VTQl9ESUdJVFY9bQpDT05GSUdfRFZCX1VTQl9W UDcwNDU9bQpDT05GSUdfRFZCX1VTQl9WUDcwMlg9bQpDT05GSUdfRFZCX1VTQl9HUDhQU0s9bQpD T05GSUdfRFZCX1VTQl9OT1ZBX1RfVVNCMj1tCkNPTkZJR19EVkJfVVNCX1RUVVNCMj1tCkNPTkZJ R19EVkJfVVNCX0RUVDIwMFU9bQpDT05GSUdfRFZCX1VTQl9PUEVSQTE9bQpDT05GSUdfRFZCX1VT Ql9BRjkwMDU9bQpDT05GSUdfRFZCX1VTQl9BRjkwMDVfUkVNT1RFPW0KQ09ORklHX0RWQl9VU0Jf UENUVjQ1MkU9bQpDT05GSUdfRFZCX1VTQl9EVzIxMDI9bQpDT05GSUdfRFZCX1VTQl9DSU5FUkdZ X1QyPW0KQ09ORklHX0RWQl9VU0JfQU5ZU0VFPW0KQ09ORklHX0RWQl9VU0JfRFRWNTEwMD1tCkNP TkZJR19EVkJfVVNCX0FGOTAxNT1tCkNPTkZJR19EVkJfVVNCX0NFNjIzMD1tCkNPTkZJR19EVkJf VVNCX0ZSSUlPPW0KQ09ORklHX0RWQl9VU0JfRUMxNjg9bQpDT05GSUdfRFZCX1VTQl9BWjYwMDc9 bQpDT05GSUdfRFZCX1VTQl9BWjYwMjc9bQpDT05GSUdfRFZCX1VTQl9MTUUyNTEwPW0KQ09ORklH X0RWQl9VU0JfVEVDSE5JU0FUX1VTQjI9bQpDT05GSUdfRFZCX1VTQl9JVDkxM1g9bQpDT05GSUdf RFZCX1VTQl9NWEwxMTFTRj1tCkNPTkZJR19EVkJfVVNCX1JUTDI4WFhVPW0KQ09ORklHX0RWQl9U VFVTQl9CVURHRVQ9bQpDT05GSUdfRFZCX1RUVVNCX0RFQz1tCkNPTkZJR19TTVNfU0lBTk9fTURU Vj1tCgojCiMgU2lhbm8gbW9kdWxlIGNvbXBvbmVudHMKIwpDT05GSUdfU01TX1VTQl9EUlY9bQpD T05GSUdfU01TX1NESU9fRFJWPW0KCiMKIyBTdXBwb3J0ZWQgRmxleENvcElJIChCMkMyKSBBZGFw dGVycwojCkNPTkZJR19EVkJfQjJDMl9GTEVYQ09QPW0KQ09ORklHX0RWQl9CMkMyX0ZMRVhDT1Bf UENJPW0KQ09ORklHX0RWQl9CMkMyX0ZMRVhDT1BfVVNCPW0KIyBDT05GSUdfRFZCX0IyQzJfRkxF WENPUF9ERUJVRyBpcyBub3Qgc2V0CgojCiMgU3VwcG9ydGVkIEJUODc4IEFkYXB0ZXJzCiMKQ09O RklHX0RWQl9CVDhYWD1tCgojCiMgU3VwcG9ydGVkIFBsdXRvMiBBZGFwdGVycwojCkNPTkZJR19E VkJfUExVVE8yPW0KCiMKIyBTdXBwb3J0ZWQgU0RNQyBETTExMDUgQWRhcHRlcnMKIwpDT05GSUdf RFZCX0RNMTEwNT1tCgojCiMgU3VwcG9ydGVkIEZpcmVXaXJlIChJRUVFIDEzOTQpIEFkYXB0ZXJz CiMKQ09ORklHX0RWQl9GSVJFRFRWPW0KQ09ORklHX0RWQl9GSVJFRFRWX0lOUFVUPXkKCiMKIyBT dXBwb3J0ZWQgRWFydGhzb2Z0IFBUMSBBZGFwdGVycwojCkNPTkZJR19EVkJfUFQxPW0KCiMKIyBT dXBwb3J0ZWQgTWFudGlzIEFkYXB0ZXJzCiMKQ09ORklHX01BTlRJU19DT1JFPW0KQ09ORklHX0RW Ql9NQU5USVM9bQpDT05GSUdfRFZCX0hPUFBFUj1tCgojCiMgU3VwcG9ydGVkIG5HZW5lIEFkYXB0 ZXJzCiMKQ09ORklHX0RWQl9OR0VORT1tCgojCiMgU3VwcG9ydGVkIGRkYnJpZGdlICgnT2N0b3B1 cycpIEFkYXB0ZXJzCiMKQ09ORklHX0RWQl9EREJSSURHRT1tCgojCiMgU3VwcG9ydGVkIERWQiBG cm9udGVuZHMKIwojIENPTkZJR19EVkJfRkVfQ1VTVE9NSVNFIGlzIG5vdCBzZXQKCiMKIyBNdWx0 aXN0YW5kYXJkIChzYXRlbGxpdGUpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfU1RCMDg5OT1tCkNP TkZJR19EVkJfU1RCNjEwMD1tCkNPTkZJR19EVkJfU1RWMDkweD1tCkNPTkZJR19EVkJfU1RWNjEx MHg9bQoKIwojIE11bHRpc3RhbmRhcmQgKGNhYmxlICsgdGVycmVzdHJpYWwpIGZyb250ZW5kcwoj CkNPTkZJR19EVkJfRFJYSz1tCkNPTkZJR19EVkJfVERBMTgyNzFDMkREPW0KCiMKIyBEVkItUyAo c2F0ZWxsaXRlKSBmcm9udGVuZHMKIwpDT05GSUdfRFZCX0NYMjQxMTA9bQpDT05GSUdfRFZCX0NY MjQxMjM9bQpDT05GSUdfRFZCX01UMzEyPW0KQ09ORklHX0RWQl9aTDEwMDM2PW0KQ09ORklHX0RW Ql9aTDEwMDM5PW0KQ09ORklHX0RWQl9TNUgxNDIwPW0KQ09ORklHX0RWQl9TVFYwMjg4PW0KQ09O RklHX0RWQl9TVEI2MDAwPW0KQ09ORklHX0RWQl9TVFYwMjk5PW0KQ09ORklHX0RWQl9TVFY2MTEw PW0KQ09ORklHX0RWQl9TVFYwOTAwPW0KQ09ORklHX0RWQl9UREE4MDgzPW0KQ09ORklHX0RWQl9U REExMDA4Nj1tCkNPTkZJR19EVkJfVERBODI2MT1tCkNPTkZJR19EVkJfVkVTMVg5Mz1tCkNPTkZJ R19EVkJfVFVORVJfSVREMTAwMD1tCkNPTkZJR19EVkJfVFVORVJfQ1gyNDExMz1tCkNPTkZJR19E VkJfVERBODI2WD1tCkNPTkZJR19EVkJfVFVBNjEwMD1tCkNPTkZJR19EVkJfQ1gyNDExNj1tCkNP TkZJR19EVkJfU0kyMVhYPW0KQ09ORklHX0RWQl9EUzMwMDA9bQpDT05GSUdfRFZCX01CODZBMTY9 bQpDT05GSUdfRFZCX1REQTEwMDcxPW0KCiMKIyBEVkItVCAodGVycmVzdHJpYWwpIGZyb250ZW5k cwojCkNPTkZJR19EVkJfU1A4ODcwPW0KQ09ORklHX0RWQl9TUDg4N1g9bQpDT05GSUdfRFZCX0NY MjI3MDA9bQpDT05GSUdfRFZCX0NYMjI3MDI9bQpDT05GSUdfRFZCX0RSWEQ9bQpDT05GSUdfRFZC X0w2NDc4MT1tCkNPTkZJR19EVkJfVERBMTAwNFg9bQpDT05GSUdfRFZCX05YVDYwMDA9bQpDT05G SUdfRFZCX01UMzUyPW0KQ09ORklHX0RWQl9aTDEwMzUzPW0KQ09ORklHX0RWQl9ESUIzMDAwTUI9 bQpDT05GSUdfRFZCX0RJQjMwMDBNQz1tCkNPTkZJR19EVkJfRElCNzAwME09bQpDT05GSUdfRFZC X0RJQjcwMDBQPW0KQ09ORklHX0RWQl9UREExMDA0OD1tCkNPTkZJR19EVkJfQUY5MDEzPW0KQ09O RklHX0RWQl9FQzEwMD1tCkNPTkZJR19EVkJfU1RWMDM2Nz1tCkNPTkZJR19EVkJfQ1hEMjgyMFI9 bQpDT05GSUdfRFZCX1JUTDI4MzA9bQoKIwojIERWQi1DIChjYWJsZSkgZnJvbnRlbmRzCiMKQ09O RklHX0RWQl9WRVMxODIwPW0KQ09ORklHX0RWQl9UREExMDAyMT1tCkNPTkZJR19EVkJfVERBMTAw MjM9bQpDT05GSUdfRFZCX1NUVjAyOTc9bQoKIwojIEFUU0MgKE5vcnRoIEFtZXJpY2FuL0tvcmVh biBUZXJyZXN0cmlhbC9DYWJsZSBEVFYpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfTlhUMjAwWD1t CkNPTkZJR19EVkJfT1I1MTIxMT1tCkNPTkZJR19EVkJfT1I1MTEzMj1tCkNPTkZJR19EVkJfQkNN MzUxMD1tCkNPTkZJR19EVkJfTEdEVDMzMFg9bQpDT05GSUdfRFZCX0xHRFQzMzA1PW0KQ09ORklH X0RWQl9TNUgxNDA5PW0KQ09ORklHX0RWQl9BVTg1MjI9bQpDT05GSUdfRFZCX1M1SDE0MTE9bQoK IwojIElTREItVCAodGVycmVzdHJpYWwpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfUzkyMT1tCkNP TkZJR19EVkJfRElCODAwMD1tCkNPTkZJR19EVkJfTUI4NkEyMFM9bQoKIwojIERpZ2l0YWwgdGVy cmVzdHJpYWwgb25seSB0dW5lcnMvUExMCiMKQ09ORklHX0RWQl9QTEw9bQpDT05GSUdfRFZCX1RV TkVSX0RJQjAwNzA9bQpDT05GSUdfRFZCX1RVTkVSX0RJQjAwOTA9bQoKIwojIFNFQyBjb250cm9s IGRldmljZXMgZm9yIERWQi1TCiMKQ09ORklHX0RWQl9MTkJQMjE9bQpDT05GSUdfRFZCX0xOQlAy Mj1tCkNPTkZJR19EVkJfSVNMNjQwNT1tCkNPTkZJR19EVkJfSVNMNjQyMT1tCkNPTkZJR19EVkJf SVNMNjQyMz1tCkNPTkZJR19EVkJfQTgyOTM9bQpDT05GSUdfRFZCX0xHUzhHWFg9bQpDT05GSUdf RFZCX0FUQk04ODMwPW0KQ09ORklHX0RWQl9UREE2NjV4PW0KQ09ORklHX0RWQl9JWDI1MDVWPW0K Q09ORklHX0RWQl9JVDkxM1hfRkU9bQpDT05GSUdfRFZCX004OFJTMjAwMD1tCgojCiMgVG9vbHMg dG8gZGV2ZWxvcCBuZXcgZnJvbnRlbmRzCiMKIyBDT05GSUdfRFZCX0RVTU1ZX0ZFIGlzIG5vdCBz ZXQKCiMKIyBHcmFwaGljcyBzdXBwb3J0CiMKQ09ORklHX0FHUD1tCkNPTkZJR19BR1BfQU1ENjQ9 bQpDT05GSUdfQUdQX0lOVEVMPW0KQ09ORklHX0FHUF9TSVM9bQpDT05GSUdfQUdQX1ZJQT1tCkNP TkZJR19WR0FfQVJCPXkKQ09ORklHX1ZHQV9BUkJfTUFYX0dQVVM9MTYKQ09ORklHX1ZHQV9TV0lU Q0hFUk9PPXkKQ09ORklHX0RSTT1tCkNPTkZJR19EUk1fVVNCPW0KQ09ORklHX0RSTV9LTVNfSEVM UEVSPW0KIyBDT05GSUdfRFJNX0xPQURfRURJRF9GSVJNV0FSRSBpcyBub3Qgc2V0CkNPTkZJR19E Uk1fVFRNPW0KQ09ORklHX0RSTV9UREZYPW0KQ09ORklHX0RSTV9SMTI4PW0KQ09ORklHX0RSTV9S QURFT049bQpDT05GSUdfRFJNX1JBREVPTl9LTVM9eQpDT05GSUdfRFJNX05PVVZFQVU9bQpDT05G SUdfRFJNX05PVVZFQVVfQkFDS0xJR0hUPXkKIyBDT05GSUdfRFJNX05PVVZFQVVfREVCVUcgaXMg bm90IHNldAoKIwojIEkyQyBlbmNvZGVyIG9yIGhlbHBlciBjaGlwcwojCkNPTkZJR19EUk1fSTJD X0NINzAwNj1tCkNPTkZJR19EUk1fSTJDX1NJTDE2ND1tCkNPTkZJR19EUk1fSTgxMD1tCkNPTkZJ R19EUk1fSTkxNT1tCkNPTkZJR19EUk1fSTkxNV9LTVM9eQpDT05GSUdfRFJNX01HQT1tCkNPTkZJ R19EUk1fU0lTPW0KQ09ORklHX0RSTV9WSUE9bQpDT05GSUdfRFJNX1NBVkFHRT1tCiMgQ09ORklH X0RSTV9WTVdHRlggaXMgbm90IHNldApDT05GSUdfRFJNX0dNQTUwMD1tCkNPTkZJR19EUk1fR01B NjAwPXkKQ09ORklHX0RSTV9HTUEzNjAwPXkKQ09ORklHX0RSTV9VREw9bQpDT05GSUdfU1RVQl9Q T1VMU0JPPW0KQ09ORklHX1ZHQVNUQVRFPW0KQ09ORklHX1ZJREVPX09VVFBVVF9DT05UUk9MPW0K Q09ORklHX0ZCPXkKQ09ORklHX0ZJUk1XQVJFX0VESUQ9eQpDT05GSUdfRkJfRERDPW0KQ09ORklH X0ZCX0JPT1RfVkVTQV9TVVBQT1JUPXkKQ09ORklHX0ZCX0NGQl9GSUxMUkVDVD15CkNPTkZJR19G Ql9DRkJfQ09QWUFSRUE9eQpDT05GSUdfRkJfQ0ZCX0lNQUdFQkxJVD15CiMgQ09ORklHX0ZCX0NG Ql9SRVZfUElYRUxTX0lOX0JZVEUgaXMgbm90IHNldApDT05GSUdfRkJfU1lTX0ZJTExSRUNUPXkK Q09ORklHX0ZCX1NZU19DT1BZQVJFQT15CkNPTkZJR19GQl9TWVNfSU1BR0VCTElUPXkKIyBDT05G SUdfRkJfRk9SRUlHTl9FTkRJQU4gaXMgbm90IHNldApDT05GSUdfRkJfU1lTX0ZPUFM9eQojIENP TkZJR19GQl9XTVRfR0VfUk9QUyBpcyBub3Qgc2V0CkNPTkZJR19GQl9ERUZFUlJFRF9JTz15CkNP TkZJR19GQl9IRUNVQkE9bQpDT05GSUdfRkJfU1ZHQUxJQj1tCiMgQ09ORklHX0ZCX01BQ01PREVT IGlzIG5vdCBzZXQKQ09ORklHX0ZCX0JBQ0tMSUdIVD15CkNPTkZJR19GQl9NT0RFX0hFTFBFUlM9 eQpDT05GSUdfRkJfVElMRUJMSVRUSU5HPXkKCiMKIyBGcmFtZSBidWZmZXIgaGFyZHdhcmUgZHJp dmVycwojCkNPTkZJR19GQl9DSVJSVVM9bQpDT05GSUdfRkJfUE0yPW0KQ09ORklHX0ZCX1BNMl9G SUZPX0RJU0NPTk5FQ1Q9eQpDT05GSUdfRkJfQ1lCRVIyMDAwPW0KQ09ORklHX0ZCX0NZQkVSMjAw MF9EREM9eQpDT05GSUdfRkJfQVJDPW0KIyBDT05GSUdfRkJfQVNJTElBTlQgaXMgbm90IHNldAoj IENPTkZJR19GQl9JTVNUVCBpcyBub3Qgc2V0CkNPTkZJR19GQl9WR0ExNj1tCkNPTkZJR19GQl9V VkVTQT1tCkNPTkZJR19GQl9WRVNBPXkKQ09ORklHX0ZCX040MTE9bQpDT05GSUdfRkJfSEdBPW0K Q09ORklHX0ZCX1MxRDEzWFhYPW0KQ09ORklHX0ZCX05WSURJQT1tCkNPTkZJR19GQl9OVklESUFf STJDPXkKIyBDT05GSUdfRkJfTlZJRElBX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0ZCX05WSURJ QV9CQUNLTElHSFQ9eQpDT05GSUdfRkJfUklWQT1tCkNPTkZJR19GQl9SSVZBX0kyQz15CiMgQ09O RklHX0ZCX1JJVkFfREVCVUcgaXMgbm90IHNldApDT05GSUdfRkJfUklWQV9CQUNLTElHSFQ9eQpD T05GSUdfRkJfSTc0MD1tCkNPTkZJR19GQl9MRTgwNTc4PW0KQ09ORklHX0ZCX0NBUklMTE9fUkFO Q0g9bQpDT05GSUdfRkJfTUFUUk9YPW0KQ09ORklHX0ZCX01BVFJPWF9NSUxMRU5JVU09eQpDT05G SUdfRkJfTUFUUk9YX01ZU1RJUVVFPXkKQ09ORklHX0ZCX01BVFJPWF9HPXkKQ09ORklHX0ZCX01B VFJPWF9JMkM9bQpDT05GSUdfRkJfTUFUUk9YX01BVkVOPW0KQ09ORklHX0ZCX1JBREVPTj1tCkNP TkZJR19GQl9SQURFT05fSTJDPXkKQ09ORklHX0ZCX1JBREVPTl9CQUNLTElHSFQ9eQojIENPTkZJ R19GQl9SQURFT05fREVCVUcgaXMgbm90IHNldApDT05GSUdfRkJfQVRZMTI4PW0KQ09ORklHX0ZC X0FUWTEyOF9CQUNLTElHSFQ9eQpDT05GSUdfRkJfQVRZPW0KQ09ORklHX0ZCX0FUWV9DVD15CkNP TkZJR19GQl9BVFlfR0VORVJJQ19MQ0Q9eQpDT05GSUdfRkJfQVRZX0dYPXkKQ09ORklHX0ZCX0FU WV9CQUNLTElHSFQ9eQpDT05GSUdfRkJfUzM9bQpDT05GSUdfRkJfUzNfRERDPXkKQ09ORklHX0ZC X1NBVkFHRT1tCkNPTkZJR19GQl9TQVZBR0VfSTJDPXkKQ09ORklHX0ZCX1NBVkFHRV9BQ0NFTD15 CkNPTkZJR19GQl9TSVM9bQpDT05GSUdfRkJfU0lTXzMwMD15CkNPTkZJR19GQl9TSVNfMzE1PXkK Q09ORklHX0ZCX1ZJQT1tCiMgQ09ORklHX0ZCX1ZJQV9ESVJFQ1RfUFJPQ0ZTIGlzIG5vdCBzZXQK IyBDT05GSUdfRkJfVklBX1hfQ09NUEFUSUJJTElUWSBpcyBub3Qgc2V0CkNPTkZJR19GQl9ORU9N QUdJQz1tCkNPTkZJR19GQl9LWVJPPW0KQ09ORklHX0ZCXzNERlg9bQpDT05GSUdfRkJfM0RGWF9B Q0NFTD15CkNPTkZJR19GQl8zREZYX0kyQz15CkNPTkZJR19GQl9WT09ET08xPW0KQ09ORklHX0ZC X1ZUODYyMz1tCkNPTkZJR19GQl9UUklERU5UPW0KQ09ORklHX0ZCX0FSSz1tCkNPTkZJR19GQl9Q TTM9bQpDT05GSUdfRkJfQ0FSTUlORT1tCkNPTkZJR19GQl9DQVJNSU5FX0RSQU1fRVZBTD15CiMg Q09ORklHX0NBUk1JTkVfRFJBTV9DVVNUT00gaXMgbm90IHNldApDT05GSUdfRkJfR0VPREU9eQpD T05GSUdfRkJfR0VPREVfTFg9bQpDT05GSUdfRkJfR0VPREVfR1g9bQpDT05GSUdfRkJfR0VPREVf R1gxPW0KQ09ORklHX0ZCX1RNSU89bQpDT05GSUdfRkJfVE1JT19BQ0NFTEw9eQpDT05GSUdfRkJf U001MDE9bQpDT05GSUdfRkJfU01TQ1VGWD1tCkNPTkZJR19GQl9VREw9bQpDT05GSUdfRkJfVklS VFVBTD1tCkNPTkZJR19YRU5fRkJERVZfRlJPTlRFTkQ9eQpDT05GSUdfRkJfTUVUUk9OT01FPW0K Q09ORklHX0ZCX01CODYyWFg9bQpDT05GSUdfRkJfTUI4NjJYWF9QQ0lfR0RDPXkKQ09ORklHX0ZC X01CODYyWFhfSTJDPXkKQ09ORklHX0ZCX0JST0FEU0hFRVQ9bQojIENPTkZJR19FWFlOT1NfVklE RU8gaXMgbm90IHNldApDT05GSUdfQkFDS0xJR0hUX0xDRF9TVVBQT1JUPXkKQ09ORklHX0xDRF9D TEFTU19ERVZJQ0U9bQpDT05GSUdfTENEX0w0RjAwMjQyVDAzPW0KQ09ORklHX0xDRF9MTVMyODNH RjA1PW0KQ09ORklHX0xDRF9MVFYzNTBRVj1tCkNPTkZJR19MQ0RfSUxJOTMyMD1tCkNPTkZJR19M Q0RfVERPMjRNPW0KQ09ORklHX0xDRF9WR0cyNDMyQTQ9bQpDT05GSUdfTENEX1BMQVRGT1JNPW0K Q09ORklHX0xDRF9TNkU2M00wPW0KQ09ORklHX0xDRF9MRDkwNDA9bQpDT05GSUdfTENEX0FNUzM2 OUZHMDY9bQpDT05GSUdfQkFDS0xJR0hUX0NMQVNTX0RFVklDRT15CkNPTkZJR19CQUNLTElHSFRf R0VORVJJQz1tCkNPTkZJR19CQUNLTElHSFRfUFJPR0VBUj1tCkNPTkZJR19CQUNLTElHSFRfQ0FS SUxMT19SQU5DSD1tCkNPTkZJR19CQUNLTElHSFRfREE5MDUyPW0KQ09ORklHX0JBQ0tMSUdIVF9B UFBMRT1tCkNPTkZJR19CQUNLTElHSFRfU0FIQVJBPW0KQ09ORklHX0JBQ0tMSUdIVF9BRFA4ODYw PW0KQ09ORklHX0JBQ0tMSUdIVF9BRFA4ODcwPW0KQ09ORklHX0JBQ0tMSUdIVF9MUDg1NVg9bQpD T05GSUdfQkFDS0xJR0hUX09UMjAwPW0KCiMKIyBDb25zb2xlIGRpc3BsYXkgZHJpdmVyIHN1cHBv cnQKIwpDT05GSUdfVkdBX0NPTlNPTEU9eQpDT05GSUdfVkdBQ09OX1NPRlRfU0NST0xMQkFDSz15 CkNPTkZJR19WR0FDT05fU09GVF9TQ1JPTExCQUNLX1NJWkU9NjQKQ09ORklHX0RVTU1ZX0NPTlNP TEU9eQpDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRT15CkNPTkZJR19GUkFNRUJVRkZFUl9DT05T T0xFX0RFVEVDVF9QUklNQVJZPXkKIyBDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRV9ST1RBVElP TiBpcyBub3Qgc2V0CiMgQ09ORklHX0ZPTlRTIGlzIG5vdCBzZXQKQ09ORklHX0ZPTlRfOHg4PXkK Q09ORklHX0ZPTlRfOHgxNj15CiMgQ09ORklHX0xPR08gaXMgbm90IHNldApDT05GSUdfU09VTkQ9 bQpDT05GSUdfU09VTkRfT1NTX0NPUkU9eQojIENPTkZJR19TT1VORF9PU1NfQ09SRV9QUkVDTEFJ TSBpcyBub3Qgc2V0CkNPTkZJR19TTkQ9bQpDT05GSUdfU05EX1RJTUVSPW0KQ09ORklHX1NORF9Q Q009bQpDT05GSUdfU05EX0hXREVQPW0KQ09ORklHX1NORF9SQVdNSURJPW0KQ09ORklHX1NORF9K QUNLPXkKQ09ORklHX1NORF9TRVFVRU5DRVI9bQpDT05GSUdfU05EX1NFUV9EVU1NWT1tCkNPTkZJ R19TTkRfT1NTRU1VTD15CkNPTkZJR19TTkRfTUlYRVJfT1NTPW0KQ09ORklHX1NORF9QQ01fT1NT PW0KQ09ORklHX1NORF9QQ01fT1NTX1BMVUdJTlM9eQpDT05GSUdfU05EX1NFUVVFTkNFUl9PU1M9 eQpDT05GSUdfU05EX0hSVElNRVI9bQpDT05GSUdfU05EX1NFUV9IUlRJTUVSX0RFRkFVTFQ9eQpD T05GSUdfU05EX0RZTkFNSUNfTUlOT1JTPXkKQ09ORklHX1NORF9TVVBQT1JUX09MRF9BUEk9eQpD T05GSUdfU05EX1ZFUkJPU0VfUFJPQ0ZTPXkKQ09ORklHX1NORF9WRVJCT1NFX1BSSU5USz15CkNP TkZJR19TTkRfREVCVUc9eQojIENPTkZJR19TTkRfREVCVUdfVkVSQk9TRSBpcyBub3Qgc2V0CkNP TkZJR19TTkRfUENNX1hSVU5fREVCVUc9eQpDT05GSUdfU05EX1ZNQVNURVI9eQpDT05GSUdfU05E X0tDVExfSkFDSz15CkNPTkZJR19TTkRfRE1BX1NHQlVGPXkKQ09ORklHX1NORF9SQVdNSURJX1NF UT1tCkNPTkZJR19TTkRfT1BMM19MSUJfU0VRPW0KIyBDT05GSUdfU05EX09QTDRfTElCX1NFUSBp cyBub3Qgc2V0CiMgQ09ORklHX1NORF9TQkFXRV9TRVEgaXMgbm90IHNldApDT05GSUdfU05EX0VN VTEwSzFfU0VRPW0KQ09ORklHX1NORF9NUFU0MDFfVUFSVD1tCkNPTkZJR19TTkRfT1BMM19MSUI9 bQpDT05GSUdfU05EX1ZYX0xJQj1tCkNPTkZJR19TTkRfQUM5N19DT0RFQz1tCkNPTkZJR19TTkRf RFJJVkVSUz15CiMgQ09ORklHX1NORF9QQ1NQIGlzIG5vdCBzZXQKQ09ORklHX1NORF9EVU1NWT1t CkNPTkZJR19TTkRfQUxPT1A9bQpDT05GSUdfU05EX1ZJUk1JREk9bQpDT05GSUdfU05EX01UUEFW PW0KQ09ORklHX1NORF9NVFM2ND1tCkNPTkZJR19TTkRfU0VSSUFMX1UxNjU1MD1tCkNPTkZJR19T TkRfTVBVNDAxPW0KQ09ORklHX1NORF9QT1JUTUFOMlg0PW0KQ09ORklHX1NORF9BQzk3X1BPV0VS X1NBVkU9eQpDT05GSUdfU05EX0FDOTdfUE9XRVJfU0FWRV9ERUZBVUxUPTAKQ09ORklHX1NORF9T Ql9DT01NT049bQpDT05GSUdfU05EX1NCMTZfRFNQPW0KQ09ORklHX1NORF9URUE1NzVYPW0KQ09O RklHX1NORF9QQ0k9eQpDT05GSUdfU05EX0FEMTg4OT1tCkNPTkZJR19TTkRfQUxTMzAwPW0KQ09O RklHX1NORF9BTFM0MDAwPW0KQ09ORklHX1NORF9BTEk1NDUxPW0KQ09ORklHX1NORF9BU0lIUEk9 bQpDT05GSUdfU05EX0FUSUlYUD1tCkNPTkZJR19TTkRfQVRJSVhQX01PREVNPW0KQ09ORklHX1NO RF9BVTg4MTA9bQpDT05GSUdfU05EX0FVODgyMD1tCkNPTkZJR19TTkRfQVU4ODMwPW0KQ09ORklH X1NORF9BVzI9bQpDT05GSUdfU05EX0FaVDMzMjg9bQpDT05GSUdfU05EX0JUODdYPW0KIyBDT05G SUdfU05EX0JUODdYX09WRVJDTE9DSyBpcyBub3Qgc2V0CkNPTkZJR19TTkRfQ0EwMTA2PW0KQ09O RklHX1NORF9DTUlQQ0k9bQpDT05GSUdfU05EX09YWUdFTl9MSUI9bQpDT05GSUdfU05EX09YWUdF Tj1tCkNPTkZJR19TTkRfQ1M0MjgxPW0KQ09ORklHX1NORF9DUzQ2WFg9bQpDT05GSUdfU05EX0NT NDZYWF9ORVdfRFNQPXkKQ09ORklHX1NORF9DUzU1MzA9bQpDT05GSUdfU05EX0NTNTUzNUFVRElP PW0KQ09ORklHX1NORF9DVFhGST1tCkNPTkZJR19TTkRfREFSTEEyMD1tCkNPTkZJR19TTkRfR0lO QTIwPW0KQ09ORklHX1NORF9MQVlMQTIwPW0KQ09ORklHX1NORF9EQVJMQTI0PW0KQ09ORklHX1NO RF9HSU5BMjQ9bQpDT05GSUdfU05EX0xBWUxBMjQ9bQpDT05GSUdfU05EX01PTkE9bQpDT05GSUdf U05EX01JQT1tCkNPTkZJR19TTkRfRUNITzNHPW0KQ09ORklHX1NORF9JTkRJR089bQpDT05GSUdf U05EX0lORElHT0lPPW0KQ09ORklHX1NORF9JTkRJR09ESj1tCkNPTkZJR19TTkRfSU5ESUdPSU9Y PW0KQ09ORklHX1NORF9JTkRJR09ESlg9bQpDT05GSUdfU05EX0VNVTEwSzE9bQpDT05GSUdfU05E X0VNVTEwSzFYPW0KQ09ORklHX1NORF9FTlMxMzcwPW0KQ09ORklHX1NORF9FTlMxMzcxPW0KQ09O RklHX1NORF9FUzE5Mzg9bQpDT05GSUdfU05EX0VTMTk2OD1tCkNPTkZJR19TTkRfRVMxOTY4X0lO UFVUPXkKQ09ORklHX1NORF9FUzE5NjhfUkFESU89eQpDT05GSUdfU05EX0ZNODAxPW0KQ09ORklH X1NORF9GTTgwMV9URUE1NzVYX0JPT0w9eQpDT05GSUdfU05EX0hEQV9JTlRFTD1tCkNPTkZJR19T TkRfSERBX1BSRUFMTE9DX1NJWkU9NjQKQ09ORklHX1NORF9IREFfSFdERVA9eQpDT05GSUdfU05E X0hEQV9SRUNPTkZJRz15CkNPTkZJR19TTkRfSERBX0lOUFVUX0JFRVA9eQpDT05GSUdfU05EX0hE QV9JTlBVVF9CRUVQX01PREU9MgpDT05GSUdfU05EX0hEQV9JTlBVVF9KQUNLPXkKQ09ORklHX1NO RF9IREFfUEFUQ0hfTE9BREVSPXkKQ09ORklHX1NORF9IREFfQ09ERUNfUkVBTFRFSz15CkNPTkZJ R19TTkRfSERBX0VOQUJMRV9SRUFMVEVLX1FVSVJLUz15CkNPTkZJR19TTkRfSERBX0NPREVDX0FO QUxPRz15CkNPTkZJR19TTkRfSERBX0NPREVDX1NJR01BVEVMPXkKQ09ORklHX1NORF9IREFfQ09E RUNfVklBPXkKQ09ORklHX1NORF9IREFfQ09ERUNfSERNST15CkNPTkZJR19TTkRfSERBX0NPREVD X0NJUlJVUz15CkNPTkZJR19TTkRfSERBX0NPREVDX0NPTkVYQU5UPXkKQ09ORklHX1NORF9IREFf Q09ERUNfQ0EwMTEwPXkKQ09ORklHX1NORF9IREFfQ09ERUNfQ0EwMTMyPXkKQ09ORklHX1NORF9I REFfQ09ERUNfQ01FRElBPXkKQ09ORklHX1NORF9IREFfQ09ERUNfU0kzMDU0PXkKQ09ORklHX1NO RF9IREFfR0VORVJJQz15CkNPTkZJR19TTkRfSERBX1BPV0VSX1NBVkU9eQpDT05GSUdfU05EX0hE QV9QT1dFUl9TQVZFX0RFRkFVTFQ9MApDT05GSUdfU05EX0hEU1A9bQpDT05GSUdfU05EX0hEU1BN PW0KQ09ORklHX1NORF9JQ0UxNzEyPW0KQ09ORklHX1NORF9JQ0UxNzI0PW0KQ09ORklHX1NORF9J TlRFTDhYMD1tCkNPTkZJR19TTkRfSU5URUw4WDBNPW0KQ09ORklHX1NORF9LT1JHMTIxMj1tCkNP TkZJR19TTkRfTE9MQT1tCkNPTkZJR19TTkRfTFg2NDY0RVM9bQpDT05GSUdfU05EX01BRVNUUk8z PW0KQ09ORklHX1NORF9NQUVTVFJPM19JTlBVVD15CkNPTkZJR19TTkRfTUlYQVJUPW0KQ09ORklH X1NORF9OTTI1Nj1tCkNPTkZJR19TTkRfUENYSFI9bQpDT05GSUdfU05EX1JJUFRJREU9bQpDT05G SUdfU05EX1JNRTMyPW0KQ09ORklHX1NORF9STUU5Nj1tCkNPTkZJR19TTkRfUk1FOTY1Mj1tCkNP TkZJR19TTkRfU09OSUNWSUJFUz1tCkNPTkZJR19TTkRfVFJJREVOVD1tCkNPTkZJR19TTkRfVklB ODJYWD1tCkNPTkZJR19TTkRfVklBODJYWF9NT0RFTT1tCkNPTkZJR19TTkRfVklSVFVPU089bQpD T05GSUdfU05EX1ZYMjIyPW0KQ09ORklHX1NORF9ZTUZQQ0k9bQpDT05GSUdfU05EX1NQST15CkNP TkZJR19TTkRfVVNCPXkKQ09ORklHX1NORF9VU0JfQVVESU89bQpDT05GSUdfU05EX1VTQl9VQTEw MT1tCkNPTkZJR19TTkRfVVNCX1VTWDJZPW0KQ09ORklHX1NORF9VU0JfQ0FJQVE9bQpDT05GSUdf U05EX1VTQl9DQUlBUV9JTlBVVD15CkNPTkZJR19TTkRfVVNCX1VTMTIyTD1tCkNPTkZJR19TTkRf VVNCXzZGSVJFPW0KQ09ORklHX1NORF9GSVJFV0lSRT15CkNPTkZJR19TTkRfRklSRVdJUkVfTElC PW0KQ09ORklHX1NORF9GSVJFV0lSRV9TUEVBS0VSUz1tCkNPTkZJR19TTkRfSVNJR0hUPW0KQ09O RklHX1NORF9QQ01DSUE9eQpDT05GSUdfU05EX1ZYUE9DS0VUPW0KQ09ORklHX1NORF9QREFVRElP Q0Y9bQojIENPTkZJR19TTkRfU09DIGlzIG5vdCBzZXQKQ09ORklHX1NPVU5EX1BSSU1FPW0KQ09O RklHX1NPVU5EX09TUz1tCkNPTkZJR19TT1VORF9UUkFDRUlOSVQ9eQpDT05GSUdfU09VTkRfRE1B UD15CkNPTkZJR19TT1VORF9WTUlEST1tCkNPTkZJR19TT1VORF9UUklYPW0KQ09ORklHX1NPVU5E X01TUz1tCkNPTkZJR19TT1VORF9NUFU0MDE9bQpDT05GSUdfU09VTkRfUEFTPW0KQ09ORklHX1NP VU5EX1BTUz1tCkNPTkZJR19QU1NfTUlYRVI9eQojIENPTkZJR19QU1NfSEFWRV9CT09UIGlzIG5v dCBzZXQKIyBDT05GSUdfU09VTkRfU0IgaXMgbm90IHNldApDT05GSUdfU09VTkRfWU0zODEyPW0K Q09ORklHX1NPVU5EX1VBUlQ2ODUwPW0KQ09ORklHX1NPVU5EX0FFRFNQMTY9bQpDT05GSUdfU0M2 NjAwPXkKQ09ORklHX1NDNjYwMF9KT1k9eQpDT05GSUdfU0M2NjAwX0NEUk9NPTQKQ09ORklHX1ND NjYwMF9DRFJPTUJBU0U9MApDT05GSUdfQUM5N19CVVM9bQpDT05GSUdfSElEX1NVUFBPUlQ9eQpD T05GSUdfSElEPW0KQ09ORklHX0hJRFJBVz15CgojCiMgVVNCIElucHV0IERldmljZXMKIwpDT05G SUdfVVNCX0hJRD1tCkNPTkZJR19ISURfUElEPXkKQ09ORklHX1VTQl9ISURERVY9eQoKIwojIFNw ZWNpYWwgSElEIGRyaXZlcnMKIwpDT05GSUdfSElEX0E0VEVDSD1tCkNPTkZJR19ISURfQUNSVVg9 bQojIENPTkZJR19ISURfQUNSVVhfRkYgaXMgbm90IHNldApDT05GSUdfSElEX0FQUExFPW0KQ09O RklHX0hJRF9CRUxLSU49bQpDT05GSUdfSElEX0NIRVJSWT1tCkNPTkZJR19ISURfQ0hJQ09OWT1t CkNPTkZJR19ISURfUFJPRElLRVlTPW0KQ09ORklHX0hJRF9DWVBSRVNTPW0KQ09ORklHX0hJRF9E UkFHT05SSVNFPW0KQ09ORklHX0RSQUdPTlJJU0VfRkY9eQpDT05GSUdfSElEX0VNU19GRj1tCkNP TkZJR19ISURfRUxFQ09NPW0KQ09ORklHX0hJRF9FWktFWT1tCkNPTkZJR19ISURfSE9MVEVLPW0K IyBDT05GSUdfSE9MVEVLX0ZGIGlzIG5vdCBzZXQKQ09ORklHX0hJRF9LRVlUT1VDSD1tCkNPTkZJ R19ISURfS1lFPW0KQ09ORklHX0hJRF9VQ0xPR0lDPW0KQ09ORklHX0hJRF9XQUxUT1A9bQpDT05G SUdfSElEX0dZUkFUSU9OPW0KQ09ORklHX0hJRF9UV0lOSEFOPW0KQ09ORklHX0hJRF9LRU5TSU5H VE9OPW0KQ09ORklHX0hJRF9MQ1BPV0VSPW0KQ09ORklHX0hJRF9MT0dJVEVDSD1tCkNPTkZJR19I SURfTE9HSVRFQ0hfREo9bQpDT05GSUdfTE9HSVRFQ0hfRkY9eQpDT05GSUdfTE9HSVJVTUJMRVBB RDJfRkY9eQpDT05GSUdfTE9HSUc5NDBfRkY9eQpDT05GSUdfTE9HSVdIRUVMU19GRj15CkNPTkZJ R19ISURfTUFHSUNNT1VTRT1tCkNPTkZJR19ISURfTUlDUk9TT0ZUPW0KQ09ORklHX0hJRF9NT05U RVJFWT1tCkNPTkZJR19ISURfTVVMVElUT1VDSD1tCkNPTkZJR19ISURfTlRSSUc9bQpDT05GSUdf SElEX09SVEVLPW0KQ09ORklHX0hJRF9QQU5USEVSTE9SRD1tCkNPTkZJR19QQU5USEVSTE9SRF9G Rj15CkNPTkZJR19ISURfUEVUQUxZTlg9bQpDT05GSUdfSElEX1BJQ09MQ0Q9bQpDT05GSUdfSElE X1BJQ09MQ0RfRkI9eQpDT05GSUdfSElEX1BJQ09MQ0RfQkFDS0xJR0hUPXkKQ09ORklHX0hJRF9Q SUNPTENEX0xDRD15CkNPTkZJR19ISURfUElDT0xDRF9MRURTPXkKQ09ORklHX0hJRF9QUklNQVg9 bQpDT05GSUdfSElEX1JPQ0NBVD1tCkNPTkZJR19ISURfU0FJVEVLPW0KQ09ORklHX0hJRF9TQU1T VU5HPW0KQ09ORklHX0hJRF9TT05ZPW0KQ09ORklHX0hJRF9TUEVFRExJTks9bQpDT05GSUdfSElE X1NVTlBMVVM9bQpDT05GSUdfSElEX0dSRUVOQVNJQT1tCkNPTkZJR19HUkVFTkFTSUFfRkY9eQpD T05GSUdfSElEX1NNQVJUSk9ZUExVUz1tCkNPTkZJR19TTUFSVEpPWVBMVVNfRkY9eQpDT05GSUdf SElEX1RJVk89bQpDT05GSUdfSElEX1RPUFNFRUQ9bQpDT05GSUdfSElEX1RIUlVTVE1BU1RFUj1t CkNPTkZJR19USFJVU1RNQVNURVJfRkY9eQpDT05GSUdfSElEX1dBQ09NPW0KQ09ORklHX0hJRF9X QUNPTV9QT1dFUl9TVVBQTFk9eQpDT05GSUdfSElEX1dJSU1PVEU9bQpDT05GSUdfSElEX1dJSU1P VEVfRVhUPXkKQ09ORklHX0hJRF9aRVJPUExVUz1tCkNPTkZJR19aRVJPUExVU19GRj15CkNPTkZJ R19ISURfWllEQUNST049bQpDT05GSUdfVVNCX0FSQ0hfSEFTX09IQ0k9eQpDT05GSUdfVVNCX0FS Q0hfSEFTX0VIQ0k9eQpDT05GSUdfVVNCX0FSQ0hfSEFTX1hIQ0k9eQpDT05GSUdfVVNCX1NVUFBP UlQ9eQpDT05GSUdfVVNCX0NPTU1PTj1tCkNPTkZJR19VU0JfQVJDSF9IQVNfSENEPXkKQ09ORklH X1VTQj1tCiMgQ09ORklHX1VTQl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfQU5OT1VOQ0Vf TkVXX0RFVklDRVM9eQoKIwojIE1pc2NlbGxhbmVvdXMgVVNCIG9wdGlvbnMKIwpDT05GSUdfVVNC X0RFVklDRUZTPXkKIyBDT05GSUdfVVNCX0RFVklDRV9DTEFTUyBpcyBub3Qgc2V0CiMgQ09ORklH X1VTQl9EWU5BTUlDX01JTk9SUyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfU1VTUEVORD15CiMgQ09O RklHX1VTQl9PVEcgaXMgbm90IHNldApDT05GSUdfVVNCX01PTj1tCkNPTkZJR19VU0JfV1VTQj1t CkNPTkZJR19VU0JfV1VTQl9DQkFGPW0KIyBDT05GSUdfVVNCX1dVU0JfQ0JBRl9ERUJVRyBpcyBu b3Qgc2V0CgojCiMgVVNCIEhvc3QgQ29udHJvbGxlciBEcml2ZXJzCiMKQ09ORklHX1VTQl9DNjdY MDBfSENEPW0KQ09ORklHX1VTQl9YSENJX0hDRD1tCiMgQ09ORklHX1VTQl9YSENJX0hDRF9ERUJV R0dJTkcgaXMgbm90IHNldApDT05GSUdfVVNCX0VIQ0lfSENEPW0KQ09ORklHX1VTQl9FSENJX1JP T1RfSFVCX1RUPXkKQ09ORklHX1VTQl9FSENJX1RUX05FV1NDSEVEPXkKQ09ORklHX1VTQl9PWFUy MTBIUF9IQ0Q9bQpDT05GSUdfVVNCX0lTUDExNlhfSENEPW0KQ09ORklHX1VTQl9JU1AxNzYwX0hD RD1tCkNPTkZJR19VU0JfSVNQMTM2Ml9IQ0Q9bQpDT05GSUdfVVNCX09IQ0lfSENEPW0KIyBDT05G SUdfVVNCX09IQ0lfSENEX1NTQiBpcyBub3Qgc2V0CiMgQ09ORklHX1VTQl9PSENJX0hDRF9QTEFU Rk9STSBpcyBub3Qgc2V0CiMgQ09ORklHX1VTQl9FSENJX0hDRF9QTEFURk9STSBpcyBub3Qgc2V0 CiMgQ09ORklHX1VTQl9PSENJX0JJR19FTkRJQU5fREVTQyBpcyBub3Qgc2V0CiMgQ09ORklHX1VT Ql9PSENJX0JJR19FTkRJQU5fTU1JTyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfT0hDSV9MSVRUTEVf RU5ESUFOPXkKQ09ORklHX1VTQl9VSENJX0hDRD1tCkNPTkZJR19VU0JfVTEzMl9IQ0Q9bQpDT05G SUdfVVNCX1NMODExX0hDRD1tCiMgQ09ORklHX1VTQl9TTDgxMV9IQ0RfSVNPIGlzIG5vdCBzZXQK Q09ORklHX1VTQl9TTDgxMV9DUz1tCkNPTkZJR19VU0JfUjhBNjY1OTdfSENEPW0KQ09ORklHX1VT Ql9XSENJX0hDRD1tCkNPTkZJR19VU0JfSFdBX0hDRD1tCgojCiMgVVNCIERldmljZSBDbGFzcyBk cml2ZXJzCiMKQ09ORklHX1VTQl9BQ009bQpDT05GSUdfVVNCX1BSSU5URVI9bQpDT05GSUdfVVNC X1dETT1tCkNPTkZJR19VU0JfVE1DPW0KCiMKIyBOT1RFOiBVU0JfU1RPUkFHRSBkZXBlbmRzIG9u IFNDU0kgYnV0IEJMS19ERVZfU0QgbWF5CiMKCiMKIyBhbHNvIGJlIG5lZWRlZDsgc2VlIFVTQl9T VE9SQUdFIEhlbHAgZm9yIG1vcmUgaW5mbwojCkNPTkZJR19VU0JfU1RPUkFHRT1tCiMgQ09ORklH X1VTQl9TVE9SQUdFX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1VTQl9TVE9SQUdFX1JFQUxURUs9 bQpDT05GSUdfUkVBTFRFS19BVVRPUE09eQpDT05GSUdfVVNCX1NUT1JBR0VfREFUQUZBQj1tCkNP TkZJR19VU0JfU1RPUkFHRV9GUkVFQ09NPW0KQ09ORklHX1VTQl9TVE9SQUdFX0lTRDIwMD1tCkNP TkZJR19VU0JfU1RPUkFHRV9VU0JBVD1tCkNPTkZJR19VU0JfU1RPUkFHRV9TRERSMDk9bQpDT05G SUdfVVNCX1NUT1JBR0VfU0REUjU1PW0KQ09ORklHX1VTQl9TVE9SQUdFX0pVTVBTSE9UPW0KQ09O RklHX1VTQl9TVE9SQUdFX0FMQVVEQT1tCkNPTkZJR19VU0JfU1RPUkFHRV9PTkVUT1VDSD1tCkNP TkZJR19VU0JfU1RPUkFHRV9LQVJNQT1tCkNPTkZJR19VU0JfU1RPUkFHRV9DWVBSRVNTX0FUQUNC PW0KQ09ORklHX1VTQl9TVE9SQUdFX0VORV9VQjYyNTA9bQpDT05GSUdfVVNCX1VBUz1tCiMgQ09O RklHX1VTQl9MSUJVU1VBTCBpcyBub3Qgc2V0CgojCiMgVVNCIEltYWdpbmcgZGV2aWNlcwojCkNP TkZJR19VU0JfTURDODAwPW0KQ09ORklHX1VTQl9NSUNST1RFSz1tCgojCiMgVVNCIHBvcnQgZHJp dmVycwojCkNPTkZJR19VU0JfVVNTNzIwPW0KQ09ORklHX1VTQl9TRVJJQUw9bQpDT05GSUdfVVNC X0VaVVNCPXkKQ09ORklHX1VTQl9TRVJJQUxfR0VORVJJQz15CkNPTkZJR19VU0JfU0VSSUFMX0FJ UkNBQkxFPW0KQ09ORklHX1VTQl9TRVJJQUxfQVJLMzExNj1tCkNPTkZJR19VU0JfU0VSSUFMX0JF TEtJTj1tCkNPTkZJR19VU0JfU0VSSUFMX0NIMzQxPW0KQ09ORklHX1VTQl9TRVJJQUxfV0hJVEVI RUFUPW0KQ09ORklHX1VTQl9TRVJJQUxfRElHSV9BQ0NFTEVQT1JUPW0KQ09ORklHX1VTQl9TRVJJ QUxfQ1AyMTBYPW0KQ09ORklHX1VTQl9TRVJJQUxfQ1lQUkVTU19NOD1tCkNPTkZJR19VU0JfU0VS SUFMX0VNUEVHPW0KQ09ORklHX1VTQl9TRVJJQUxfRlRESV9TSU89bQpDT05GSUdfVVNCX1NFUklB TF9GVU5TT0ZUPW0KQ09ORklHX1VTQl9TRVJJQUxfVklTT1I9bQpDT05GSUdfVVNCX1NFUklBTF9J UEFRPW0KQ09ORklHX1VTQl9TRVJJQUxfSVI9bQpDT05GSUdfVVNCX1NFUklBTF9FREdFUE9SVD1t CkNPTkZJR19VU0JfU0VSSUFMX0VER0VQT1JUX1RJPW0KQ09ORklHX1VTQl9TRVJJQUxfRjgxMjMy PW0KQ09ORklHX1VTQl9TRVJJQUxfR0FSTUlOPW0KQ09ORklHX1VTQl9TRVJJQUxfSVBXPW0KQ09O RklHX1VTQl9TRVJJQUxfSVVVPW0KQ09ORklHX1VTQl9TRVJJQUxfS0VZU1BBTl9QREE9bQpDT05G SUdfVVNCX1NFUklBTF9LRVlTUEFOPW0KQ09ORklHX1VTQl9TRVJJQUxfS0xTST1tCkNPTkZJR19V U0JfU0VSSUFMX0tPQklMX1NDVD1tCkNPTkZJR19VU0JfU0VSSUFMX01DVF9VMjMyPW0KQ09ORklH X1VTQl9TRVJJQUxfTUVUUk89bQpDT05GSUdfVVNCX1NFUklBTF9NT1M3NzIwPW0KQ09ORklHX1VT Ql9TRVJJQUxfTU9TNzcxNV9QQVJQT1JUPXkKQ09ORklHX1VTQl9TRVJJQUxfTU9TNzg0MD1tCkNP TkZJR19VU0JfU0VSSUFMX01PVE9ST0xBPW0KQ09ORklHX1VTQl9TRVJJQUxfTkFWTUFOPW0KQ09O RklHX1VTQl9TRVJJQUxfUEwyMzAzPW0KQ09ORklHX1VTQl9TRVJJQUxfT1RJNjg1OD1tCkNPTkZJ R19VU0JfU0VSSUFMX1FDQVVYPW0KQ09ORklHX1VTQl9TRVJJQUxfUVVBTENPTU09bQpDT05GSUdf VVNCX1NFUklBTF9TUENQOFg1PW0KQ09ORklHX1VTQl9TRVJJQUxfSFA0WD1tCkNPTkZJR19VU0Jf U0VSSUFMX1NBRkU9bQpDT05GSUdfVVNCX1NFUklBTF9TQUZFX1BBRERFRD15CkNPTkZJR19VU0Jf U0VSSUFMX1NJRU1FTlNfTVBJPW0KQ09ORklHX1VTQl9TRVJJQUxfU0lFUlJBV0lSRUxFU1M9bQpD T05GSUdfVVNCX1NFUklBTF9TWU1CT0w9bQpDT05GSUdfVVNCX1NFUklBTF9UST1tCkNPTkZJR19V U0JfU0VSSUFMX0NZQkVSSkFDSz1tCkNPTkZJR19VU0JfU0VSSUFMX1hJUkNPTT1tCkNPTkZJR19V U0JfU0VSSUFMX1dXQU49bQpDT05GSUdfVVNCX1NFUklBTF9PUFRJT049bQpDT05GSUdfVVNCX1NF UklBTF9PTU5JTkVUPW0KQ09ORklHX1VTQl9TRVJJQUxfT1BUSUNPTj1tCkNPTkZJR19VU0JfU0VS SUFMX1ZJVk9QQVlfU0VSSUFMPW0KQ09ORklHX1VTQl9TRVJJQUxfWklPPW0KQ09ORklHX1VTQl9T RVJJQUxfU1NVMTAwPW0KQ09ORklHX1VTQl9TRVJJQUxfREVCVUc9bQoKIwojIFVTQiBNaXNjZWxs YW5lb3VzIGRyaXZlcnMKIwpDT05GSUdfVVNCX0VNSTYyPW0KQ09ORklHX1VTQl9FTUkyNj1tCkNP TkZJR19VU0JfQURVVFVYPW0KQ09ORklHX1VTQl9TRVZTRUc9bQpDT05GSUdfVVNCX1JJTzUwMD1t CkNPTkZJR19VU0JfTEVHT1RPV0VSPW0KQ09ORklHX1VTQl9MQ0Q9bQpDT05GSUdfVVNCX0xFRD1t CkNPTkZJR19VU0JfQ1lQUkVTU19DWTdDNjM9bQpDT05GSUdfVVNCX0NZVEhFUk09bQpDT05GSUdf VVNCX0lETU9VU0U9bQpDT05GSUdfVVNCX0ZURElfRUxBTj1tCkNPTkZJR19VU0JfQVBQTEVESVNQ TEFZPW0KQ09ORklHX1VTQl9TSVNVU0JWR0E9bQpDT05GSUdfVVNCX1NJU1VTQlZHQV9DT049eQpD T05GSUdfVVNCX0xEPW0KQ09ORklHX1VTQl9UUkFOQ0VWSUJSQVRPUj1tCkNPTkZJR19VU0JfSU9X QVJSSU9SPW0KIyBDT05GSUdfVVNCX1RFU1QgaXMgbm90IHNldApDT05GSUdfVVNCX0lTSUdIVEZX PW0KQ09ORklHX1VTQl9ZVVJFWD1tCkNPTkZJR19VU0JfQVRNPW0KQ09ORklHX1VTQl9TUEVFRFRP VUNIPW0KQ09ORklHX1VTQl9DWEFDUlU9bQpDT05GSUdfVVNCX1VFQUdMRUFUTT1tCkNPTkZJR19V U0JfWFVTQkFUTT1tCiMgQ09ORklHX1VTQl9HQURHRVQgaXMgbm90IHNldAoKIwojIE9URyBhbmQg cmVsYXRlZCBpbmZyYXN0cnVjdHVyZQojCiMgQ09ORklHX1VTQl9HUElPX1ZCVVMgaXMgbm90IHNl dAojIENPTkZJR19OT1BfVVNCX1hDRUlWIGlzIG5vdCBzZXQKQ09ORklHX1VXQj1tCkNPTkZJR19V V0JfSFdBPW0KQ09ORklHX1VXQl9XSENJPW0KQ09ORklHX1VXQl9JMTQ4MFU9bQpDT05GSUdfTU1D PW0KIyBDT05GSUdfTU1DX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfTU1DX1VOU0FGRV9SRVNV TUUgaXMgbm90IHNldAojIENPTkZJR19NTUNfQ0xLR0FURSBpcyBub3Qgc2V0CgojCiMgTU1DL1NE L1NESU8gQ2FyZCBEcml2ZXJzCiMKQ09ORklHX01NQ19CTE9DSz1tCkNPTkZJR19NTUNfQkxPQ0tf TUlOT1JTPTgKQ09ORklHX01NQ19CTE9DS19CT1VOQ0U9eQpDT05GSUdfU0RJT19VQVJUPW0KQ09O RklHX01NQ19URVNUPW0KCiMKIyBNTUMvU0QvU0RJTyBIb3N0IENvbnRyb2xsZXIgRHJpdmVycwoj CkNPTkZJR19NTUNfU0RIQ0k9bQpDT05GSUdfTU1DX1NESENJX1BDST1tCkNPTkZJR19NTUNfUklD T0hfTU1DPXkKQ09ORklHX01NQ19TREhDSV9QTFRGTT1tCkNPTkZJR19NTUNfV0JTRD1tCkNPTkZJ R19NTUNfVElGTV9TRD1tCkNPTkZJR19NTUNfU1BJPW0KQ09ORklHX01NQ19TRFJJQ09IX0NTPW0K Q09ORklHX01NQ19DQjcxMD1tCkNPTkZJR19NTUNfVklBX1NETU1DPW0KQ09ORklHX01NQ19WVUIz MDA9bQpDT05GSUdfTU1DX1VTSEM9bQpDT05GSUdfTUVNU1RJQ0s9bQojIENPTkZJR19NRU1TVElD S19ERUJVRyBpcyBub3Qgc2V0CgojCiMgTWVtb3J5U3RpY2sgZHJpdmVycwojCiMgQ09ORklHX01F TVNUSUNLX1VOU0FGRV9SRVNVTUUgaXMgbm90IHNldApDT05GSUdfTVNQUk9fQkxPQ0s9bQoKIwoj IE1lbW9yeVN0aWNrIEhvc3QgQ29udHJvbGxlciBEcml2ZXJzCiMKQ09ORklHX01FTVNUSUNLX1RJ Rk1fTVM9bQpDT05GSUdfTUVNU1RJQ0tfSk1JQ1JPTl8zOFg9bQpDT05GSUdfTUVNU1RJQ0tfUjU5 Mj1tCkNPTkZJR19ORVdfTEVEUz15CkNPTkZJR19MRURTX0NMQVNTPXkKCiMKIyBMRUQgZHJpdmVy cwojCkNPTkZJR19MRURTX0xNMzUzMD1tCkNPTkZJR19MRURTX1BDQTk1MzI9bQojIENPTkZJR19M RURTX1BDQTk1MzJfR1BJTyBpcyBub3Qgc2V0CkNPTkZJR19MRURTX0dQSU89bQpDT05GSUdfTEVE U19MUDM5NDQ9bQpDT05GSUdfTEVEU19MUDU1MjE9bQpDT05GSUdfTEVEU19MUDU1MjM9bQpDT05G SUdfTEVEU19DTEVWT19NQUlMPW0KQ09ORklHX0xFRFNfUENBOTU1WD1tCkNPTkZJR19MRURTX1BD QTk2MzM9bQpDT05GSUdfTEVEU19EQUMxMjRTMDg1PW0KQ09ORklHX0xFRFNfUkVHVUxBVE9SPW0K Q09ORklHX0xFRFNfQkQyODAyPW0KQ09ORklHX0xFRFNfSU5URUxfU1M0MjAwPW0KQ09ORklHX0xF RFNfTFQzNTkzPW0KQ09ORklHX0xFRFNfREVMTF9ORVRCT09LUz1tCkNPTkZJR19MRURTX01DMTM3 ODM9bQpDT05GSUdfTEVEU19UQ0E2NTA3PW0KQ09ORklHX0xFRFNfT1QyMDA9bQpDT05GSUdfTEVE U19UUklHR0VSUz15CgojCiMgTEVEIFRyaWdnZXJzCiMKQ09ORklHX0xFRFNfVFJJR0dFUl9USU1F Uj1tCkNPTkZJR19MRURTX1RSSUdHRVJfSEVBUlRCRUFUPW0KQ09ORklHX0xFRFNfVFJJR0dFUl9C QUNLTElHSFQ9bQpDT05GSUdfTEVEU19UUklHR0VSX0dQSU89bQpDT05GSUdfTEVEU19UUklHR0VS X0RFRkFVTFRfT049bQoKIwojIGlwdGFibGVzIHRyaWdnZXIgaXMgdW5kZXIgTmV0ZmlsdGVyIGNv bmZpZyAoTEVEIHRhcmdldCkKIwojIENPTkZJR19BQ0NFU1NJQklMSVRZIGlzIG5vdCBzZXQKQ09O RklHX0lORklOSUJBTkQ9bQpDT05GSUdfSU5GSU5JQkFORF9VU0VSX01BRD1tCkNPTkZJR19JTkZJ TklCQU5EX1VTRVJfQUNDRVNTPW0KQ09ORklHX0lORklOSUJBTkRfVVNFUl9NRU09eQpDT05GSUdf SU5GSU5JQkFORF9BRERSX1RSQU5TPXkKQ09ORklHX0lORklOSUJBTkRfTVRIQ0E9bQpDT05GSUdf SU5GSU5JQkFORF9NVEhDQV9ERUJVRz15CkNPTkZJR19JTkZJTklCQU5EX0lQQVRIPW0KQ09ORklH X0lORklOSUJBTkRfUUlCPW0KQ09ORklHX0lORklOSUJBTkRfQU1TTzExMDA9bQojIENPTkZJR19J TkZJTklCQU5EX0FNU08xMTAwX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0lORklOSUJBTkRfQ1hH QjM9bQojIENPTkZJR19JTkZJTklCQU5EX0NYR0IzX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0lO RklOSUJBTkRfQ1hHQjQ9bQpDT05GSUdfTUxYNF9JTkZJTklCQU5EPW0KQ09ORklHX0lORklOSUJB TkRfTkVTPW0KIyBDT05GSUdfSU5GSU5JQkFORF9ORVNfREVCVUcgaXMgbm90IHNldApDT05GSUdf SU5GSU5JQkFORF9JUE9JQj1tCkNPTkZJR19JTkZJTklCQU5EX0lQT0lCX0NNPXkKQ09ORklHX0lO RklOSUJBTkRfSVBPSUJfREVCVUc9eQojIENPTkZJR19JTkZJTklCQU5EX0lQT0lCX0RFQlVHX0RB VEEgaXMgbm90IHNldApDT05GSUdfSU5GSU5JQkFORF9TUlA9bQpDT05GSUdfSU5GSU5JQkFORF9J U0VSPW0KQ09ORklHX0VEQUM9eQoKIwojIFJlcG9ydGluZyBzdWJzeXN0ZW1zCiMKIyBDT05GSUdf RURBQ19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19FREFDX0RFQ09ERV9NQ0U9bQojIENPTkZJR19F REFDX01DRV9JTkogaXMgbm90IHNldApDT05GSUdfRURBQ19NTV9FREFDPW0KQ09ORklHX0VEQUNf QU1ENjQ9bQojIENPTkZJR19FREFDX0FNRDY0X0VSUk9SX0lOSkVDVElPTiBpcyBub3Qgc2V0CkNP TkZJR19FREFDX0U3NTJYPW0KQ09ORklHX0VEQUNfSTgyOTc1WD1tCkNPTkZJR19FREFDX0kzMDAw PW0KQ09ORklHX0VEQUNfSTMyMDA9bQpDT05GSUdfRURBQ19YMzg9bQpDT05GSUdfRURBQ19JNTQw MD1tCkNPTkZJR19FREFDX0k3Q09SRT1tCkNPTkZJR19FREFDX0k1MDAwPW0KQ09ORklHX0VEQUNf STUxMDA9bQpDT05GSUdfRURBQ19JNzMwMD1tCkNPTkZJR19FREFDX1NCUklER0U9bQpDT05GSUdf UlRDX0xJQj15CkNPTkZJR19SVENfQ0xBU1M9eQpDT05GSUdfUlRDX0hDVE9TWVM9eQpDT05GSUdf UlRDX0hDVE9TWVNfREVWSUNFPSJydGMwIgojIENPTkZJR19SVENfREVCVUcgaXMgbm90IHNldAoK IwojIFJUQyBpbnRlcmZhY2VzCiMKQ09ORklHX1JUQ19JTlRGX1NZU0ZTPXkKQ09ORklHX1JUQ19J TlRGX1BST0M9eQpDT05GSUdfUlRDX0lOVEZfREVWPXkKQ09ORklHX1JUQ19JTlRGX0RFVl9VSUVf RU1VTD15CkNPTkZJR19SVENfRFJWX1RFU1Q9bQoKIwojIEkyQyBSVEMgZHJpdmVycwojCkNPTkZJ R19SVENfRFJWX0RTMTMwNz1tCkNPTkZJR19SVENfRFJWX0RTMTM3ND1tCkNPTkZJR19SVENfRFJW X0RTMTY3Mj1tCkNPTkZJR19SVENfRFJWX0RTMzIzMj1tCkNPTkZJR19SVENfRFJWX01BWDY5MDA9 bQpDT05GSUdfUlRDX0RSVl9SUzVDMzcyPW0KQ09ORklHX1JUQ19EUlZfSVNMMTIwOD1tCkNPTkZJ R19SVENfRFJWX0lTTDEyMDIyPW0KQ09ORklHX1JUQ19EUlZfWDEyMDU9bQpDT05GSUdfUlRDX0RS Vl9QQ0Y4NTYzPW0KQ09ORklHX1JUQ19EUlZfUENGODU4Mz1tCkNPTkZJR19SVENfRFJWX000MVQ4 MD1tCkNPTkZJR19SVENfRFJWX000MVQ4MF9XRFQ9eQpDT05GSUdfUlRDX0RSVl9CUTMySz1tCkNP TkZJR19SVENfRFJWX1MzNTM5MEE9bQpDT05GSUdfUlRDX0RSVl9GTTMxMzA9bQpDT05GSUdfUlRD X0RSVl9SWDg1ODE9bQpDT05GSUdfUlRDX0RSVl9SWDgwMjU9bQpDT05GSUdfUlRDX0RSVl9FTTMw Mjc9bQpDT05GSUdfUlRDX0RSVl9SVjMwMjlDMj1tCgojCiMgU1BJIFJUQyBkcml2ZXJzCiMKQ09O RklHX1JUQ19EUlZfTTQxVDkzPW0KQ09ORklHX1JUQ19EUlZfTTQxVDk0PW0KQ09ORklHX1JUQ19E UlZfRFMxMzA1PW0KQ09ORklHX1JUQ19EUlZfRFMxMzkwPW0KQ09ORklHX1JUQ19EUlZfTUFYNjkw Mj1tCkNPTkZJR19SVENfRFJWX1I5NzAxPW0KQ09ORklHX1JUQ19EUlZfUlM1QzM0OD1tCkNPTkZJ R19SVENfRFJWX0RTMzIzND1tCkNPTkZJR19SVENfRFJWX1BDRjIxMjM9bQoKIwojIFBsYXRmb3Jt IFJUQyBkcml2ZXJzCiMKQ09ORklHX1JUQ19EUlZfQ01PUz15CkNPTkZJR19SVENfRFJWX0RTMTI4 Nj1tCkNPTkZJR19SVENfRFJWX0RTMTUxMT1tCkNPTkZJR19SVENfRFJWX0RTMTU1Mz1tCkNPTkZJ R19SVENfRFJWX0RTMTc0Mj1tCkNPTkZJR19SVENfRFJWX0RBOTA1Mj1tCkNPTkZJR19SVENfRFJW X1NUSzE3VEE4PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDg2PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDM1 PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDU5PW0KQ09ORklHX1JUQ19EUlZfTVNNNjI0Mj1tCkNPTkZJ R19SVENfRFJWX0JRNDgwMj1tCkNPTkZJR19SVENfRFJWX1JQNUMwMT1tCkNPTkZJR19SVENfRFJW X1YzMDIwPW0KCiMKIyBvbi1DUFUgUlRDIGRyaXZlcnMKIwpDT05GSUdfUlRDX0RSVl9QQ0FQPW0K Q09ORklHX1JUQ19EUlZfTUMxM1hYWD1tCkNPTkZJR19ETUFERVZJQ0VTPXkKIyBDT05GSUdfRE1B REVWSUNFU19ERUJVRyBpcyBub3Qgc2V0CgojCiMgRE1BIERldmljZXMKIwpDT05GSUdfSU5URUxf TUlEX0RNQUM9bQpDT05GSUdfSU5URUxfSU9BVERNQT1tCkNPTkZJR19USU1CX0RNQT1tCkNPTkZJ R19QQ0hfRE1BPW0KQ09ORklHX0RNQV9FTkdJTkU9eQoKIwojIERNQSBDbGllbnRzCiMKQ09ORklH X05FVF9ETUE9eQpDT05GSUdfQVNZTkNfVFhfRE1BPXkKQ09ORklHX0RNQVRFU1Q9bQpDT05GSUdf RENBPW0KQ09ORklHX0FVWERJU1BMQVk9eQpDT05GSUdfS1MwMTA4PW0KQ09ORklHX0tTMDEwOF9Q T1JUPTB4Mzc4CkNPTkZJR19LUzAxMDhfREVMQVk9MgpDT05GSUdfQ0ZBRzEyODY0Qj1tCkNPTkZJ R19DRkFHMTI4NjRCX1JBVEU9MjAKQ09ORklHX1VJTz1tCkNPTkZJR19VSU9fQ0lGPW0KQ09ORklH X1VJT19QRFJWPW0KQ09ORklHX1VJT19QRFJWX0dFTklSUT1tCkNPTkZJR19VSU9fQUVDPW0KQ09O RklHX1VJT19TRVJDT1MzPW0KQ09ORklHX1VJT19QQ0lfR0VORVJJQz1tCkNPTkZJR19VSU9fTkVU WD1tCkNPTkZJR19WSVJUSU89bQpDT05GSUdfVklSVElPX1JJTkc9bQoKIwojIFZpcnRpbyBkcml2 ZXJzCiMKIyBDT05GSUdfVklSVElPX1BDSSBpcyBub3Qgc2V0CiMgQ09ORklHX1ZJUlRJT19CQUxM T09OIGlzIG5vdCBzZXQKQ09ORklHX1ZJUlRJT19NTUlPPW0KCiMKIyBNaWNyb3NvZnQgSHlwZXIt ViBndWVzdCBzdXBwb3J0CiMKIyBDT05GSUdfSFlQRVJWIGlzIG5vdCBzZXQKCiMKIyBYZW4gZHJp dmVyIHN1cHBvcnQKIwpDT05GSUdfWEVOX0JBTExPT049eQpDT05GSUdfWEVOX1NFTEZCQUxMT09O SU5HPXkKQ09ORklHX1hFTl9CQUxMT09OX01FTU9SWV9IT1RQTFVHPXkKQ09ORklHX1hFTl9TQ1JV Ql9QQUdFUz15CkNPTkZJR19YRU5fREVWX0VWVENITj1tCkNPTkZJR19YRU5fQkFDS0VORD15CkNP TkZJR19YRU5GUz15CkNPTkZJR19YRU5fQ09NUEFUX1hFTkZTPXkKQ09ORklHX1hFTl9TWVNfSFlQ RVJWSVNPUj15CkNPTkZJR19YRU5fWEVOQlVTX0ZST05URU5EPXkKQ09ORklHX1hFTl9HTlRERVY9 bQpDT05GSUdfWEVOX0dSQU5UX0RFVl9BTExPQz1tCkNPTkZJR19TV0lPVExCX1hFTj15CkNPTkZJ R19YRU5fVE1FTT15CkNPTkZJR19YRU5fUENJREVWX0JBQ0tFTkQ9bQpDT05GSUdfWEVOX1BSSVZD TUQ9eQpDT05GSUdfWEVOX0FDUElfUFJPQ0VTU09SPXkKQ09ORklHX1NUQUdJTkc9eQpDT05GSUdf RVQxMzFYPW0KQ09ORklHX1NMSUNPU1M9bQpDT05GSUdfVVNCSVBfQ09SRT1tCkNPTkZJR19VU0JJ UF9WSENJX0hDRD1tCkNPTkZJR19VU0JJUF9IT1NUPW0KIyBDT05GSUdfVVNCSVBfREVCVUcgaXMg bm90IHNldApDT05GSUdfVzM1VU5EPW0KQ09ORklHX1BSSVNNMl9VU0I9bQpDT05GSUdfRUNITz1t CiMgQ09ORklHX0NPTUVESSBpcyBub3Qgc2V0CkNPTkZJR19BU1VTX09MRUQ9bQpDT05GSUdfUEFO RUw9bQpDT05GSUdfUEFORUxfUEFSUE9SVD0wCkNPTkZJR19QQU5FTF9QUk9GSUxFPTUKIyBDT05G SUdfUEFORUxfQ0hBTkdFX01FU1NBR0UgaXMgbm90IHNldApDT05GSUdfUjgxODdTRT1tCkNPTkZJ R19SVEw4MTkyVT1tCkNPTkZJR19SVExMSUI9bQpDT05GSUdfUlRMTElCX0NSWVBUT19DQ01QPW0K Q09ORklHX1JUTExJQl9DUllQVE9fVEtJUD1tCkNPTkZJR19SVExMSUJfQ1JZUFRPX1dFUD1tCkNP TkZJR19SVEw4MTkyRT1tCkNPTkZJR19SODcxMlU9bQpDT05GSUdfUlRTX1BTVE9SPW0KIyBDT05G SUdfUlRTX1BTVE9SX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1JUUzUxMzk9bQojIENPTkZJR19S VFM1MTM5X0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1RSQU5aUE9SVD1tCkNPTkZJR19JREVfUEhJ U09OPW0KQ09ORklHX0xJTkU2X1VTQj1tCiMgQ09ORklHX0xJTkU2X1VTQl9ERUJVRyBpcyBub3Qg c2V0CiMgQ09ORklHX0xJTkU2X1VTQl9EVU1QX0NUUkwgaXMgbm90IHNldAojIENPTkZJR19MSU5F Nl9VU0JfRFVNUF9NSURJIGlzIG5vdCBzZXQKIyBDT05GSUdfTElORTZfVVNCX0RVTVBfUENNIGlz IG5vdCBzZXQKIyBDT05GSUdfTElORTZfVVNCX1JBVyBpcyBub3Qgc2V0CiMgQ09ORklHX0xJTkU2 X1VTQl9JTVBVTFNFX1JFU1BPTlNFIGlzIG5vdCBzZXQKQ09ORklHX1VTQl9TRVJJQUxfUVVBVEVD SDI9bQpDT05GSUdfVVNCX1NFUklBTF9RVUFURUNIX1VTQjI9bQpDT05GSUdfVlQ2NjU1PW0KQ09O RklHX1ZUNjY1Nj1tCkNPTkZJR19WTUVfQlVTPW0KCiMKIyBWTUUgQnJpZGdlIERyaXZlcnMKIwpD T05GSUdfVk1FX0NBOTFDWDQyPW0KQ09ORklHX1ZNRV9UU0kxNDg9bQoKIwojIFZNRSBEZXZpY2Ug RHJpdmVycwojCkNPTkZJR19WTUVfVVNFUj1tCkNPTkZJR19WTUVfUElPMj1tCgojCiMgVk1FIEJv YXJkIERyaXZlcnMKIwpDT05GSUdfVk1JVk1FXzc4MDU9bQpDT05GSUdfRFhfU0VQPW0KQ09ORklH X0lJTz1tCkNPTkZJR19JSU9fU1RfSFdNT049bQpDT05GSUdfSUlPX0JVRkZFUj15CkNPTkZJR19J SU9fU1dfUklORz1tCkNPTkZJR19JSU9fS0ZJRk9fQlVGPW0KQ09ORklHX0lJT19UUklHR0VSPXkK Q09ORklHX0lJT19DT05TVU1FUlNfUEVSX1RSSUdHRVI9MgoKIwojIEFjY2VsZXJvbWV0ZXJzCiMK Q09ORklHX0FESVMxNjIwMT1tCkNPTkZJR19BRElTMTYyMDM9bQpDT05GSUdfQURJUzE2MjA0PW0K Q09ORklHX0FESVMxNjIwOT1tCkNPTkZJR19BRElTMTYyMjA9bQpDT05GSUdfQURJUzE2MjQwPW0K Q09ORklHX0tYU0Q5PW0KQ09ORklHX0xJUzNMMDJEUT1tCkNPTkZJR19MSVMzTDAyRFFfQlVGX0tG SUZPPXkKIyBDT05GSUdfTElTM0wwMkRRX0JVRl9SSU5HX1NXIGlzIG5vdCBzZXQKQ09ORklHX1ND QTMwMDA9bQoKIwojIEFuYWxvZyB0byBkaWdpdGFsIGNvbnZlcnRlcnMKIwpDT05GSUdfQUQ3Mjkx PW0KQ09ORklHX0FENzI5OD1tCkNPTkZJR19BRDc2MDY9bQpDT05GSUdfQUQ3NjA2X0lGQUNFX1BB UkFMTEVMPW0KQ09ORklHX0FENzYwNl9JRkFDRV9TUEk9bQpDT05GSUdfQUQ3OTlYPW0KQ09ORklH X0FENzk5WF9SSU5HX0JVRkZFUj15CkNPTkZJR19BRDc0NzY9bQpDT05GSUdfQUQ3ODg3PW0KQ09O RklHX0FENzc4MD1tCkNPTkZJR19BRDc3OTM9bQpDT05GSUdfQUQ3ODE2PW0KQ09ORklHX0FENzE5 Mj1tCkNPTkZJR19BRFQ3MzEwPW0KQ09ORklHX0FEVDc0MTA9bQpDT05GSUdfQUQ3MjgwPW0KQ09O RklHX01BWDEzNjM9bQpDT05GSUdfTUFYMTM2M19SSU5HX0JVRkZFUj15CgojCiMgQW5hbG9nIGRp Z2l0YWwgYmktZGlyZWN0aW9uIGNvbnZlcnRlcnMKIwpDT05GSUdfQURUNzMxNj1tCkNPTkZJR19B RFQ3MzE2X1NQST1tCkNPTkZJR19BRFQ3MzE2X0kyQz1tCgojCiMgQ2FwYWNpdGFuY2UgdG8gZGln aXRhbCBjb252ZXJ0ZXJzCiMKQ09ORklHX0FENzE1MD1tCkNPTkZJR19BRDcxNTI9bQpDT05GSUdf QUQ3NzQ2PW0KCiMKIyBEaWdpdGFsIHRvIGFuYWxvZyBjb252ZXJ0ZXJzCiMKQ09ORklHX0FENTA2 ND1tCkNPTkZJR19BRDUzNjA9bQpDT05GSUdfQUQ1MzgwPW0KQ09ORklHX0FENTQyMT1tCkNPTkZJ R19BRDU2MjRSX1NQST1tCkNPTkZJR19BRDU0NDY9bQpDT05GSUdfQUQ1NTA0PW0KQ09ORklHX0FE NTc2ND1tCkNPTkZJR19BRDU3OTE9bQpDT05GSUdfQUQ1Njg2PW0KQ09ORklHX01BWDUxNz1tCgoj CiMgRGlyZWN0IERpZ2l0YWwgU3ludGhlc2lzCiMKQ09ORklHX0FENTkzMD1tCkNPTkZJR19BRDk4 MzI9bQpDT05GSUdfQUQ5ODM0PW0KQ09ORklHX0FEOTg1MD1tCkNPTkZJR19BRDk4NTI9bQpDT05G SUdfQUQ5OTEwPW0KQ09ORklHX0FEOTk1MT1tCgojCiMgRGlnaXRhbCBneXJvc2NvcGUgc2Vuc29y cwojCkNPTkZJR19BRElTMTYwNjA9bQpDT05GSUdfQURJUzE2MDgwPW0KQ09ORklHX0FESVMxNjEz MD1tCkNPTkZJR19BRElTMTYyNjA9bQpDT05GSUdfQURYUlM0NTA9bQoKIwojIE5ldHdvcmsgQW5h bHl6ZXIsIEltcGVkYW5jZSBDb252ZXJ0ZXJzCiMKQ09ORklHX0FENTkzMz1tCgojCiMgSW5lcnRp YWwgbWVhc3VyZW1lbnQgdW5pdHMKIwpDT05GSUdfQURJUzE2NDAwPW0KCiMKIyBMaWdodCBzZW5z b3JzCiMKQ09ORklHX1NFTlNPUlNfSVNMMjkwMTg9bQpDT05GSUdfU0VOU09SU19UU0wyNTYzPW0K Q09ORklHX1RTTDI1ODM9bQoKIwojIE1hZ25ldG9tZXRlciBzZW5zb3JzCiMKQ09ORklHX1NFTlNP UlNfQUs4OTc1PW0KQ09ORklHX1NFTlNPUlNfSE1DNTg0Mz1tCgojCiMgQWN0aXZlIGVuZXJneSBt ZXRlcmluZyBJQwojCkNPTkZJR19BREU3NzUzPW0KQ09ORklHX0FERTc3NTQ9bQpDT05GSUdfQURF Nzc1OD1tCkNPTkZJR19BREU3NzU5PW0KQ09ORklHX0FERTc4NTQ9bQpDT05GSUdfQURFNzg1NF9J MkM9bQpDT05GSUdfQURFNzg1NF9TUEk9bQoKIwojIFJlc29sdmVyIHRvIGRpZ2l0YWwgY29udmVy dGVycwojCkNPTkZJR19BRDJTOTA9bQpDT05GSUdfQUQyUzEyMDA9bQpDT05GSUdfQUQyUzEyMTA9 bQoKIwojIFRyaWdnZXJzIC0gc3RhbmRhbG9uZQojCkNPTkZJR19JSU9fUEVSSU9ESUNfUlRDX1RS SUdHRVI9bQpDT05GSUdfSUlPX0dQSU9fVFJJR0dFUj1tCkNPTkZJR19JSU9fU1lTRlNfVFJJR0dF Uj1tCkNPTkZJR19JSU9fU0lNUExFX0RVTU1ZPW0KIyBDT05GSUdfSUlPX1NJTVBMRV9EVU1NWV9F VkVOVFMgaXMgbm90IHNldAojIENPTkZJR19JSU9fU0lNUExFX0RVTU1ZX0JVRkZFUiBpcyBub3Qg c2V0CkNPTkZJR19aUkFNPW0KIyBDT05GSUdfWlJBTV9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklH X1pDQUNIRSBpcyBub3Qgc2V0CkNPTkZJR19aU01BTExPQz1tCkNPTkZJR19XTEFHUzQ5X0gyPW0K Q09ORklHX1dMQUdTNDlfSDI1PW0KQ09ORklHX0ZCX1NNN1hYPW0KQ09ORklHX0NSWVNUQUxIRD1t CkNPTkZJR19DWFQxRTE9bQojIENPTkZJR19TQkVfUE1DQzRfTkNPTU0gaXMgbm90IHNldApDT05G SUdfRkJfWEdJPW0KQ09ORklHX0FDUElfUVVJQ0tTVEFSVD1tCkNPTkZJR19TQkVfMlQzRTM9bQpD T05GSUdfVVNCX0VORVNUT1JBR0U9bQpDT05GSUdfQkNNX1dJTUFYPW0KQ09ORklHX0ZUMTAwMD1t CkNPTkZJR19GVDEwMDBfVVNCPW0KQ09ORklHX0ZUMTAwMF9QQ01DSUE9bQoKIwojIFNwZWFrdXAg Y29uc29sZSBzcGVlY2gKIwojIENPTkZJR19TUEVBS1VQIGlzIG5vdCBzZXQKQ09ORklHX1RPVUNI U0NSRUVOX0NMRUFSUEFEX1RNMTIxNz1tCkNPTkZJR19UT1VDSFNDUkVFTl9TWU5BUFRJQ1NfSTJD X1JNSTQ9bQpDT05GSUdfSU5URUxfTUVJPW0KQ09ORklHX1NUQUdJTkdfTUVESUE9eQpDT05GSUdf RFZCX0FTMTAyPW0KQ09ORklHX0RWQl9DWEQyMDk5PW0KQ09ORklHX1ZJREVPX0RUMzE1NT1tCkNP TkZJR19EVDMxNTVfQ0NJUj15CkNPTkZJR19EVDMxNTVfU1RSRUFNSU5HPXkKQ09ORklHX0VBU1lD QVA9bQojIENPTkZJR19FQVNZQ0FQX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfVklERU9fR083 MDA3IGlzIG5vdCBzZXQKQ09ORklHX1NPTE82WDEwPW0KQ09ORklHX0xJUkNfU1RBR0lORz15CkNP TkZJR19MSVJDX0JUODI5PW0KQ09ORklHX0xJUkNfSUdPUlBMVUdVU0I9bQpDT05GSUdfTElSQ19J TU9OPW0KQ09ORklHX0xJUkNfUEFSQUxMRUw9bQpDT05GSUdfTElSQ19TQVNFTT1tCkNPTkZJR19M SVJDX1NFUklBTD1tCkNPTkZJR19MSVJDX1NFUklBTF9UUkFOU01JVFRFUj15CkNPTkZJR19MSVJD X1NJUj1tCkNPTkZJR19MSVJDX1RUVVNCSVI9bQpDT05GSUdfTElSQ19aSUxPRz1tCgojCiMgQW5k cm9pZAojCiMgQ09ORklHX0FORFJPSUQgaXMgbm90IHNldApDT05GSUdfUEhPTkU9bQpDT05GSUdf UEhPTkVfSVhKPW0KQ09ORklHX1BIT05FX0lYSl9QQ01DSUE9bQpDT05GSUdfVVNCX1dQQU5fSENE PW0KQ09ORklHX1g4Nl9QTEFURk9STV9ERVZJQ0VTPXkKQ09ORklHX0FDRVJfV01JPW0KQ09ORklH X0FDRVJIREY9bQpDT05GSUdfQVNVU19MQVBUT1A9bQpDT05GSUdfREVMTF9MQVBUT1A9bQpDT05G SUdfREVMTF9XTUk9bQpDT05GSUdfREVMTF9XTUlfQUlPPW0KQ09ORklHX0ZVSklUU1VfTEFQVE9Q PW0KIyBDT05GSUdfRlVKSVRTVV9MQVBUT1BfREVCVUcgaXMgbm90IHNldApDT05GSUdfRlVKSVRT VV9UQUJMRVQ9bQpDT05GSUdfQU1JTE9fUkZLSUxMPW0KQ09ORklHX0hQX0FDQ0VMPW0KQ09ORklH X0hQX1dNST1tCkNPTkZJR19NU0lfTEFQVE9QPW0KQ09ORklHX1BBTkFTT05JQ19MQVBUT1A9bQpD T05GSUdfQ09NUEFMX0xBUFRPUD1tCkNPTkZJR19TT05ZX0xBUFRPUD1tCkNPTkZJR19TT05ZUElf Q09NUEFUPXkKQ09ORklHX0lERUFQQURfTEFQVE9QPW0KQ09ORklHX1RISU5LUEFEX0FDUEk9bQpD T05GSUdfVEhJTktQQURfQUNQSV9BTFNBX1NVUFBPUlQ9eQojIENPTkZJR19USElOS1BBRF9BQ1BJ X0RFQlVHRkFDSUxJVElFUyBpcyBub3Qgc2V0CiMgQ09ORklHX1RISU5LUEFEX0FDUElfREVCVUcg aXMgbm90IHNldAojIENPTkZJR19USElOS1BBRF9BQ1BJX1VOU0FGRV9MRURTIGlzIG5vdCBzZXQK Q09ORklHX1RISU5LUEFEX0FDUElfVklERU89eQpDT05GSUdfVEhJTktQQURfQUNQSV9IT1RLRVlf UE9MTD15CkNPTkZJR19TRU5TT1JTX0hEQVBTPW0KQ09ORklHX0lOVEVMX01FTkxPVz1tCkNPTkZJ R19FRUVQQ19MQVBUT1A9bQpDT05GSUdfQVNVU19XTUk9bQpDT05GSUdfQVNVU19OQl9XTUk9bQpD T05GSUdfRUVFUENfV01JPW0KQ09ORklHX0FDUElfV01JPW0KQ09ORklHX01TSV9XTUk9bQpDT05G SUdfVE9QU1RBUl9MQVBUT1A9bQpDT05GSUdfQUNQSV9UT1NISUJBPW0KQ09ORklHX1RPU0hJQkFf QlRfUkZLSUxMPW0KQ09ORklHX0FDUElfQ01QQz1tCkNPTkZJR19JTlRFTF9JUFM9bQpDT05GSUdf SUJNX1JUTD1tCkNPTkZJR19YTzE1X0VCT09LPW0KQ09ORklHX1NBTVNVTkdfTEFQVE9QPW0KQ09O RklHX01YTV9XTUk9bQpDT05GSUdfSU5URUxfT0FLVFJBSUw9bQpDT05GSUdfU0FNU1VOR19RMTA9 bQpDT05GSUdfQVBQTEVfR01VWD1tCgojCiMgSGFyZHdhcmUgU3BpbmxvY2sgZHJpdmVycwojCkNP TkZJR19DTEtFVlRfSTgyNTM9eQpDT05GSUdfSTgyNTNfTE9DSz15CkNPTkZJR19DTEtCTERfSTgy NTM9eQpDT05GSUdfSU9NTVVfQVBJPXkKQ09ORklHX0lPTU1VX1NVUFBPUlQ9eQpDT05GSUdfQU1E X0lPTU1VPXkKIyBDT05GSUdfQU1EX0lPTU1VX1NUQVRTIGlzIG5vdCBzZXQKQ09ORklHX0FNRF9J T01NVV9WMj1tCkNPTkZJR19ETUFSX1RBQkxFPXkKQ09ORklHX0lOVEVMX0lPTU1VPXkKQ09ORklH X0lOVEVMX0lPTU1VX0RFRkFVTFRfT049eQpDT05GSUdfSU5URUxfSU9NTVVfRkxPUFBZX1dBPXkK Q09ORklHX0lSUV9SRU1BUD15CgojCiMgUmVtb3RlcHJvYyBkcml2ZXJzIChFWFBFUklNRU5UQUwp CiMKCiMKIyBScG1zZyBkcml2ZXJzIChFWFBFUklNRU5UQUwpCiMKQ09ORklHX1ZJUlRfRFJJVkVS Uz15CkNPTkZJR19QTV9ERVZGUkVRPXkKCiMKIyBERVZGUkVRIEdvdmVybm9ycwojCkNPTkZJR19E RVZGUkVRX0dPVl9TSU1QTEVfT05ERU1BTkQ9eQpDT05GSUdfREVWRlJFUV9HT1ZfUEVSRk9STUFO Q0U9eQpDT05GSUdfREVWRlJFUV9HT1ZfUE9XRVJTQVZFPXkKQ09ORklHX0RFVkZSRVFfR09WX1VT RVJTUEFDRT15CgojCiMgREVWRlJFUSBEcml2ZXJzCiMKCiMKIyBGaXJtd2FyZSBEcml2ZXJzCiMK Q09ORklHX0VERD1tCiMgQ09ORklHX0VERF9PRkYgaXMgbm90IHNldApDT05GSUdfRklSTVdBUkVf TUVNTUFQPXkKQ09ORklHX0RFTExfUkJVPW0KQ09ORklHX0RDREJBUz1tCkNPTkZJR19ETUlJRD15 CkNPTkZJR19ETUlfU1lTRlM9bQpDT05GSUdfSVNDU0lfSUJGVF9GSU5EPXkKQ09ORklHX0lTQ1NJ X0lCRlQ9bQojIENPTkZJR19HT09HTEVfRklSTVdBUkUgaXMgbm90IHNldAoKIwojIEZpbGUgc3lz dGVtcwojCkNPTkZJR19EQ0FDSEVfV09SRF9BQ0NFU1M9eQpDT05GSUdfRVhUMl9GUz15CkNPTkZJ R19FWFQyX0ZTX1hBVFRSPXkKQ09ORklHX0VYVDJfRlNfUE9TSVhfQUNMPXkKQ09ORklHX0VYVDJf RlNfU0VDVVJJVFk9eQojIENPTkZJR19FWFQyX0ZTX1hJUCBpcyBub3Qgc2V0CkNPTkZJR19FWFQz X0ZTPXkKQ09ORklHX0VYVDNfREVGQVVMVFNfVE9fT1JERVJFRD15CkNPTkZJR19FWFQzX0ZTX1hB VFRSPXkKQ09ORklHX0VYVDNfRlNfUE9TSVhfQUNMPXkKQ09ORklHX0VYVDNfRlNfU0VDVVJJVFk9 eQpDT05GSUdfRVhUNF9GUz1tCkNPTkZJR19FWFQ0X0ZTX1hBVFRSPXkKQ09ORklHX0VYVDRfRlNf UE9TSVhfQUNMPXkKQ09ORklHX0VYVDRfRlNfU0VDVVJJVFk9eQojIENPTkZJR19FWFQ0X0RFQlVH IGlzIG5vdCBzZXQKQ09ORklHX0pCRD15CiMgQ09ORklHX0pCRF9ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19KQkQyPW0KIyBDT05GSUdfSkJEMl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19GU19NQkNB Q0hFPXkKQ09ORklHX1JFSVNFUkZTX0ZTPW0KIyBDT05GSUdfUkVJU0VSRlNfQ0hFQ0sgaXMgbm90 IHNldAojIENPTkZJR19SRUlTRVJGU19QUk9DX0lORk8gaXMgbm90IHNldApDT05GSUdfUkVJU0VS RlNfRlNfWEFUVFI9eQpDT05GSUdfUkVJU0VSRlNfRlNfUE9TSVhfQUNMPXkKQ09ORklHX1JFSVNF UkZTX0ZTX1NFQ1VSSVRZPXkKQ09ORklHX0pGU19GUz1tCkNPTkZJR19KRlNfUE9TSVhfQUNMPXkK Q09ORklHX0pGU19TRUNVUklUWT15CiMgQ09ORklHX0pGU19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19KRlNfU1RBVElTVElDUz15CkNPTkZJR19YRlNfRlM9bQpDT05GSUdfWEZTX1FVT1RBPXkKQ09O RklHX1hGU19QT1NJWF9BQ0w9eQpDT05GSUdfWEZTX1JUPXkKIyBDT05GSUdfWEZTX0RFQlVHIGlz IG5vdCBzZXQKQ09ORklHX0dGUzJfRlM9bQojIENPTkZJR19HRlMyX0ZTX0xPQ0tJTkdfRExNIGlz IG5vdCBzZXQKQ09ORklHX09DRlMyX0ZTPW0KQ09ORklHX09DRlMyX0ZTX08yQ0I9bQpDT05GSUdf T0NGUzJfRlNfVVNFUlNQQUNFX0NMVVNURVI9bQpDT05GSUdfT0NGUzJfRlNfU1RBVFM9eQojIENP TkZJR19PQ0ZTMl9ERUJVR19NQVNLTE9HIGlzIG5vdCBzZXQKIyBDT05GSUdfT0NGUzJfREVCVUdf RlMgaXMgbm90IHNldApDT05GSUdfQlRSRlNfRlM9bQpDT05GSUdfQlRSRlNfRlNfUE9TSVhfQUNM PXkKIyBDT05GSUdfQlRSRlNfRlNfQ0hFQ0tfSU5URUdSSVRZIGlzIG5vdCBzZXQKQ09ORklHX05J TEZTMl9GUz1tCkNPTkZJR19GU19QT1NJWF9BQ0w9eQpDT05GSUdfRVhQT1JURlM9bQpDT05GSUdf RklMRV9MT0NLSU5HPXkKQ09ORklHX0ZTTk9USUZZPXkKQ09ORklHX0ROT1RJRlk9eQpDT05GSUdf SU5PVElGWV9VU0VSPXkKQ09ORklHX0ZBTk9USUZZPXkKQ09ORklHX1FVT1RBPXkKQ09ORklHX1FV T1RBX05FVExJTktfSU5URVJGQUNFPXkKQ09ORklHX1BSSU5UX1FVT1RBX1dBUk5JTkc9eQojIENP TkZJR19RVU9UQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19RVU9UQV9UUkVFPW0KQ09ORklHX1FG TVRfVjE9bQpDT05GSUdfUUZNVF9WMj1tCkNPTkZJR19RVU9UQUNUTD15CkNPTkZJR19RVU9UQUNU TF9DT01QQVQ9eQpDT05GSUdfQVVUT0ZTNF9GUz1tCkNPTkZJR19GVVNFX0ZTPW0KQ09ORklHX0NV U0U9bQpDT05GSUdfR0VORVJJQ19BQ0w9eQoKIwojIENhY2hlcwojCkNPTkZJR19GU0NBQ0hFPW0K Q09ORklHX0ZTQ0FDSEVfU1RBVFM9eQojIENPTkZJR19GU0NBQ0hFX0hJU1RPR1JBTSBpcyBub3Qg c2V0CiMgQ09ORklHX0ZTQ0FDSEVfREVCVUcgaXMgbm90IHNldApDT05GSUdfRlNDQUNIRV9PQkpF Q1RfTElTVD15CkNPTkZJR19DQUNIRUZJTEVTPW0KIyBDT05GSUdfQ0FDSEVGSUxFU19ERUJVRyBp cyBub3Qgc2V0CiMgQ09ORklHX0NBQ0hFRklMRVNfSElTVE9HUkFNIGlzIG5vdCBzZXQKCiMKIyBD RC1ST00vRFZEIEZpbGVzeXN0ZW1zCiMKQ09ORklHX0lTTzk2NjBfRlM9eQpDT05GSUdfSk9MSUVU PXkKQ09ORklHX1pJU09GUz15CkNPTkZJR19VREZfRlM9bQpDT05GSUdfVURGX05MUz15CgojCiMg RE9TL0ZBVC9OVCBGaWxlc3lzdGVtcwojCkNPTkZJR19GQVRfRlM9bQpDT05GSUdfTVNET1NfRlM9 bQpDT05GSUdfVkZBVF9GUz1tCkNPTkZJR19GQVRfREVGQVVMVF9DT0RFUEFHRT00MzcKQ09ORklH X0ZBVF9ERUZBVUxUX0lPQ0hBUlNFVD0iaXNvODg1OS0xIgojIENPTkZJR19OVEZTX0ZTIGlzIG5v dCBzZXQKCiMKIyBQc2V1ZG8gZmlsZXN5c3RlbXMKIwpDT05GSUdfUFJPQ19GUz15CkNPTkZJR19Q Uk9DX0tDT1JFPXkKQ09ORklHX1BST0NfU1lTQ1RMPXkKQ09ORklHX1BST0NfUEFHRV9NT05JVE9S PXkKQ09ORklHX1NZU0ZTPXkKQ09ORklHX1RNUEZTPXkKQ09ORklHX1RNUEZTX1BPU0lYX0FDTD15 CkNPTkZJR19UTVBGU19YQVRUUj15CiMgQ09ORklHX0hVR0VUTEJGUyBpcyBub3Qgc2V0CiMgQ09O RklHX0hVR0VUTEJfUEFHRSBpcyBub3Qgc2V0CkNPTkZJR19DT05GSUdGU19GUz1tCkNPTkZJR19N SVNDX0ZJTEVTWVNURU1TPXkKQ09ORklHX0FERlNfRlM9bQpDT05GSUdfQURGU19GU19SVz15CkNP TkZJR19BRkZTX0ZTPW0KQ09ORklHX0VDUllQVF9GUz1tCkNPTkZJR19IRlNfRlM9bQpDT05GSUdf SEZTUExVU19GUz1tCkNPTkZJR19CRUZTX0ZTPW0KIyBDT05GSUdfQkVGU19ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19CRlNfRlM9bQpDT05GSUdfRUZTX0ZTPW0KQ09ORklHX0pGRlMyX0ZTPW0KQ09O RklHX0pGRlMyX0ZTX0RFQlVHPTAKQ09ORklHX0pGRlMyX0ZTX1dSSVRFQlVGRkVSPXkKIyBDT05G SUdfSkZGUzJfRlNfV0JVRl9WRVJJRlkgaXMgbm90IHNldApDT05GSUdfSkZGUzJfU1VNTUFSWT15 CkNPTkZJR19KRkZTMl9GU19YQVRUUj15CkNPTkZJR19KRkZTMl9GU19QT1NJWF9BQ0w9eQpDT05G SUdfSkZGUzJfRlNfU0VDVVJJVFk9eQpDT05GSUdfSkZGUzJfQ09NUFJFU1NJT05fT1BUSU9OUz15 CkNPTkZJR19KRkZTMl9aTElCPXkKIyBDT05GSUdfSkZGUzJfTFpPIGlzIG5vdCBzZXQKQ09ORklH X0pGRlMyX1JUSU1FPXkKIyBDT05GSUdfSkZGUzJfUlVCSU4gaXMgbm90IHNldAojIENPTkZJR19K RkZTMl9DTU9ERV9OT05FIGlzIG5vdCBzZXQKQ09ORklHX0pGRlMyX0NNT0RFX1BSSU9SSVRZPXkK IyBDT05GSUdfSkZGUzJfQ01PREVfU0laRSBpcyBub3Qgc2V0CiMgQ09ORklHX0pGRlMyX0NNT0RF X0ZBVk9VUkxaTyBpcyBub3Qgc2V0CkNPTkZJR19VQklGU19GUz1tCkNPTkZJR19VQklGU19GU19Y QVRUUj15CkNPTkZJR19VQklGU19GU19BRFZBTkNFRF9DT01QUj15CkNPTkZJR19VQklGU19GU19M Wk89eQpDT05GSUdfVUJJRlNfRlNfWkxJQj15CiMgQ09ORklHX1VCSUZTX0ZTX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX0xPR0ZTPW0KQ09ORklHX0NSQU1GUz1tCkNPTkZJR19TUVVBU0hGUz1tCkNP TkZJR19TUVVBU0hGU19YQVRUUj15CkNPTkZJR19TUVVBU0hGU19aTElCPXkKQ09ORklHX1NRVUFT SEZTX0xaTz15CkNPTkZJR19TUVVBU0hGU19YWj15CkNPTkZJR19TUVVBU0hGU180S19ERVZCTEtf U0laRT15CiMgQ09ORklHX1NRVUFTSEZTX0VNQkVEREVEIGlzIG5vdCBzZXQKQ09ORklHX1NRVUFT SEZTX0ZSQUdNRU5UX0NBQ0hFX1NJWkU9MwpDT05GSUdfVlhGU19GUz1tCkNPTkZJR19NSU5JWF9G Uz1tCkNPTkZJR19PTUZTX0ZTPW0KQ09ORklHX0hQRlNfRlM9bQpDT05GSUdfUU5YNEZTX0ZTPW0K Q09ORklHX1FOWDZGU19GUz1tCiMgQ09ORklHX1FOWDZGU19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19ST01GU19GUz1tCiMgQ09ORklHX1JPTUZTX0JBQ0tFRF9CWV9CTE9DSyBpcyBub3Qgc2V0CiMg Q09ORklHX1JPTUZTX0JBQ0tFRF9CWV9NVEQgaXMgbm90IHNldApDT05GSUdfUk9NRlNfQkFDS0VE X0JZX0JPVEg9eQpDT05GSUdfUk9NRlNfT05fQkxPQ0s9eQpDT05GSUdfUk9NRlNfT05fTVREPXkK IyBDT05GSUdfUFNUT1JFIGlzIG5vdCBzZXQKQ09ORklHX1NZU1ZfRlM9bQpDT05GSUdfVUZTX0ZT PW0KQ09ORklHX1VGU19GU19XUklURT15CiMgQ09ORklHX1VGU19ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19FWE9GU19GUz1tCiMgQ09ORklHX0VYT0ZTX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX09S RT1tCkNPTkZJR19ORVRXT1JLX0ZJTEVTWVNURU1TPXkKQ09ORklHX05GU19GUz1tCkNPTkZJR19O RlNfVjM9eQpDT05GSUdfTkZTX1YzX0FDTD15CkNPTkZJR19ORlNfVjQ9eQojIENPTkZJR19ORlNf VjRfMSBpcyBub3Qgc2V0CkNPTkZJR19ORlNfRlNDQUNIRT15CiMgQ09ORklHX05GU19VU0VfTEVH QUNZX0ROUyBpcyBub3Qgc2V0CkNPTkZJR19ORlNfVVNFX0tFUk5FTF9ETlM9eQpDT05GSUdfTkZT RD1tCkNPTkZJR19ORlNEX1YyX0FDTD15CkNPTkZJR19ORlNEX1YzPXkKQ09ORklHX05GU0RfVjNf QUNMPXkKQ09ORklHX05GU0RfVjQ9eQojIENPTkZJR19ORlNEX0ZBVUxUX0lOSkVDVElPTiBpcyBu b3Qgc2V0CkNPTkZJR19MT0NLRD1tCkNPTkZJR19MT0NLRF9WND15CkNPTkZJR19ORlNfQUNMX1NV UFBPUlQ9bQpDT05GSUdfTkZTX0NPTU1PTj15CkNPTkZJR19TVU5SUEM9bQpDT05GSUdfU1VOUlBD X0dTUz1tCkNPTkZJR19TVU5SUENfWFBSVF9SRE1BPW0KQ09ORklHX1JQQ1NFQ19HU1NfS1JCNT1t CiMgQ09ORklHX1NVTlJQQ19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19DRVBIX0ZTPW0KQ09ORklH X0NJRlM9bQpDT05GSUdfQ0lGU19TVEFUUz15CkNPTkZJR19DSUZTX1NUQVRTMj15CkNPTkZJR19D SUZTX1dFQUtfUFdfSEFTSD15CkNPTkZJR19DSUZTX1VQQ0FMTD15CkNPTkZJR19DSUZTX1hBVFRS PXkKQ09ORklHX0NJRlNfUE9TSVg9eQojIENPTkZJR19DSUZTX0RFQlVHMiBpcyBub3Qgc2V0CkNP TkZJR19DSUZTX0RGU19VUENBTEw9eQojIENPTkZJR19DSUZTX0ZTQ0FDSEUgaXMgbm90IHNldApD T05GSUdfQ0lGU19BQ0w9eQpDT05GSUdfTkNQX0ZTPW0KQ09ORklHX05DUEZTX1BBQ0tFVF9TSUdO SU5HPXkKQ09ORklHX05DUEZTX0lPQ1RMX0xPQ0tJTkc9eQpDT05GSUdfTkNQRlNfU1RST05HPXkK Q09ORklHX05DUEZTX05GU19OUz15CkNPTkZJR19OQ1BGU19PUzJfTlM9eQpDT05GSUdfTkNQRlNf U01BTExET1M9eQpDT05GSUdfTkNQRlNfTkxTPXkKQ09ORklHX05DUEZTX0VYVFJBUz15CkNPTkZJ R19DT0RBX0ZTPW0KQ09ORklHX0FGU19GUz1tCiMgQ09ORklHX0FGU19ERUJVRyBpcyBub3Qgc2V0 CkNPTkZJR19BRlNfRlNDQUNIRT15CkNPTkZJR185UF9GUz1tCiMgQ09ORklHXzlQX0ZTQ0FDSEUg aXMgbm90IHNldApDT05GSUdfOVBfRlNfUE9TSVhfQUNMPXkKQ09ORklHX05MUz15CkNPTkZJR19O TFNfREVGQVVMVD0idXRmOCIKQ09ORklHX05MU19DT0RFUEFHRV80Mzc9bQpDT05GSUdfTkxTX0NP REVQQUdFXzczNz1tCkNPTkZJR19OTFNfQ09ERVBBR0VfNzc1PW0KQ09ORklHX05MU19DT0RFUEFH RV84NTA9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg1Mj1tCkNPTkZJR19OTFNfQ09ERVBBR0VfODU1 PW0KQ09ORklHX05MU19DT0RFUEFHRV84NTc9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg2MD1tCkNP TkZJR19OTFNfQ09ERVBBR0VfODYxPW0KQ09ORklHX05MU19DT0RFUEFHRV84NjI9bQpDT05GSUdf TkxTX0NPREVQQUdFXzg2Mz1tCkNPTkZJR19OTFNfQ09ERVBBR0VfODY0PW0KQ09ORklHX05MU19D T0RFUEFHRV84NjU9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg2Nj1tCkNPTkZJR19OTFNfQ09ERVBB R0VfODY5PW0KQ09ORklHX05MU19DT0RFUEFHRV85MzY9bQpDT05GSUdfTkxTX0NPREVQQUdFXzk1 MD1tCkNPTkZJR19OTFNfQ09ERVBBR0VfOTMyPW0KQ09ORklHX05MU19DT0RFUEFHRV85NDk9bQpD T05GSUdfTkxTX0NPREVQQUdFXzg3ND1tCkNPTkZJR19OTFNfSVNPODg1OV84PW0KQ09ORklHX05M U19DT0RFUEFHRV8xMjUwPW0KQ09ORklHX05MU19DT0RFUEFHRV8xMjUxPW0KQ09ORklHX05MU19B U0NJST1tCkNPTkZJR19OTFNfSVNPODg1OV8xPW0KQ09ORklHX05MU19JU084ODU5XzI9bQpDT05G SUdfTkxTX0lTTzg4NTlfMz1tCkNPTkZJR19OTFNfSVNPODg1OV80PW0KQ09ORklHX05MU19JU084 ODU5XzU9bQpDT05GSUdfTkxTX0lTTzg4NTlfNj1tCkNPTkZJR19OTFNfSVNPODg1OV83PW0KQ09O RklHX05MU19JU084ODU5Xzk9bQpDT05GSUdfTkxTX0lTTzg4NTlfMTM9bQpDT05GSUdfTkxTX0lT Tzg4NTlfMTQ9bQpDT05GSUdfTkxTX0lTTzg4NTlfMTU9bQpDT05GSUdfTkxTX0tPSThfUj1tCkNP TkZJR19OTFNfS09JOF9VPW0KQ09ORklHX05MU19VVEY4PW0KQ09ORklHX0RMTT1tCkNPTkZJR19E TE1fREVCVUc9eQoKIwojIEtlcm5lbCBoYWNraW5nCiMKQ09ORklHX1RSQUNFX0lSUUZMQUdTX1NV UFBPUlQ9eQpDT05GSUdfUFJJTlRLX1RJTUU9eQpDT05GSUdfREVGQVVMVF9NRVNTQUdFX0xPR0xF VkVMPTQKQ09ORklHX0VOQUJMRV9XQVJOX0RFUFJFQ0FURUQ9eQpDT05GSUdfRU5BQkxFX01VU1Rf Q0hFQ0s9eQpDT05GSUdfRlJBTUVfV0FSTj0yMDQ4CkNPTkZJR19NQUdJQ19TWVNSUT15CkNPTkZJ R19TVFJJUF9BU01fU1lNUz15CkNPTkZJR19VTlVTRURfU1lNQk9MUz15CkNPTkZJR19ERUJVR19G Uz15CkNPTkZJR19IRUFERVJTX0NIRUNLPXkKIyBDT05GSUdfREVCVUdfU0VDVElPTl9NSVNNQVRD SCBpcyBub3Qgc2V0CkNPTkZJR19ERUJVR19LRVJORUw9eQojIENPTkZJR19ERUJVR19TSElSUSBp cyBub3Qgc2V0CkNPTkZJR19MT0NLVVBfREVURUNUT1I9eQpDT05GSUdfSEFSRExPQ0tVUF9ERVRF Q1RPUj15CiMgQ09ORklHX0JPT1RQQVJBTV9IQVJETE9DS1VQX1BBTklDIGlzIG5vdCBzZXQKQ09O RklHX0JPT1RQQVJBTV9IQVJETE9DS1VQX1BBTklDX1ZBTFVFPTAKIyBDT05GSUdfQk9PVFBBUkFN X1NPRlRMT0NLVVBfUEFOSUMgaXMgbm90IHNldApDT05GSUdfQk9PVFBBUkFNX1NPRlRMT0NLVVBf UEFOSUNfVkFMVUU9MApDT05GSUdfREVURUNUX0hVTkdfVEFTSz15CkNPTkZJR19ERUZBVUxUX0hV TkdfVEFTS19USU1FT1VUPTAKIyBDT05GSUdfQk9PVFBBUkFNX0hVTkdfVEFTS19QQU5JQyBpcyBu b3Qgc2V0CkNPTkZJR19CT09UUEFSQU1fSFVOR19UQVNLX1BBTklDX1ZBTFVFPTAKQ09ORklHX1ND SEVEX0RFQlVHPXkKQ09ORklHX1NDSEVEU1RBVFM9eQpDT05GSUdfVElNRVJfU1RBVFM9eQojIENP TkZJR19ERUJVR19PQkpFQ1RTIGlzIG5vdCBzZXQKQ09ORklHX0RFQlVHX1NMQUI9eQpDT05GSUdf REVCVUdfU0xBQl9MRUFLPXkKQ09ORklHX0RFQlVHX0tNRU1MRUFLPXkKQ09ORklHX0RFQlVHX0tN RU1MRUFLX0VBUkxZX0xPR19TSVpFPTQwMAojIENPTkZJR19ERUJVR19LTUVNTEVBS19URVNUIGlz IG5vdCBzZXQKIyBDT05GSUdfREVCVUdfS01FTUxFQUtfREVGQVVMVF9PRkYgaXMgbm90IHNldAoj IENPTkZJR19ERUJVR19SVF9NVVRFWEVTIGlzIG5vdCBzZXQKIyBDT05GSUdfUlRfTVVURVhfVEVT VEVSIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfU1BJTkxPQ0sgaXMgbm90IHNldAojIENPTkZJ R19ERUJVR19NVVRFWEVTIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfTE9DS19BTExPQyBpcyBu b3Qgc2V0CiMgQ09ORklHX1BST1ZFX0xPQ0tJTkcgaXMgbm90IHNldAojIENPTkZJR19TUEFSU0Vf UkNVX1BPSU5URVIgaXMgbm90IHNldAojIENPTkZJR19MT0NLX1NUQVQgaXMgbm90IHNldAojIENP TkZJR19ERUJVR19BVE9NSUNfU0xFRVAgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19MT0NLSU5H X0FQSV9TRUxGVEVTVFMgaXMgbm90IHNldApDT05GSUdfU1RBQ0tUUkFDRT15CiMgQ09ORklHX0RF QlVHX1NUQUNLX1VTQUdFIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfS09CSkVDVCBpcyBub3Qg c2V0CkNPTkZJR19ERUJVR19CVUdWRVJCT1NFPXkKIyBDT05GSUdfREVCVUdfSU5GTyBpcyBub3Qg c2V0CiMgQ09ORklHX0RFQlVHX1ZNIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfVklSVFVBTCBp cyBub3Qgc2V0CiMgQ09ORklHX0RFQlVHX1dSSVRFQ09VTlQgaXMgbm90IHNldApDT05GSUdfREVC VUdfTUVNT1JZX0lOSVQ9eQpDT05GSUdfREVCVUdfTElTVD15CiMgQ09ORklHX1RFU1RfTElTVF9T T1JUIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfU0cgaXMgbm90IHNldAojIENPTkZJR19ERUJV R19OT1RJRklFUlMgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19DUkVERU5USUFMUyBpcyBub3Qg c2V0CkNPTkZJR19BUkNIX1dBTlRfRlJBTUVfUE9JTlRFUlM9eQpDT05GSUdfRlJBTUVfUE9JTlRF Uj15CiMgQ09ORklHX0JPT1RfUFJJTlRLX0RFTEFZIGlzIG5vdCBzZXQKIyBDT05GSUdfUkNVX1RP UlRVUkVfVEVTVCBpcyBub3Qgc2V0CkNPTkZJR19SQ1VfQ1BVX1NUQUxMX1RJTUVPVVQ9NjAKIyBD T05GSUdfUkNVX0NQVV9TVEFMTF9JTkZPIGlzIG5vdCBzZXQKIyBDT05GSUdfUkNVX1RSQUNFIGlz IG5vdCBzZXQKIyBDT05GSUdfS1BST0JFU19TQU5JVFlfVEVTVCBpcyBub3Qgc2V0CiMgQ09ORklH X0JBQ0tUUkFDRV9TRUxGX1RFU1QgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19CTE9DS19FWFRf REVWVCBpcyBub3Qgc2V0CkNPTkZJR19ERUJVR19GT1JDRV9XRUFLX1BFUl9DUFU9eQojIENPTkZJ R19ERUJVR19QRVJfQ1BVX01BUFMgaXMgbm90IHNldApDT05GSUdfTEtEVE09bQojIENPTkZJR19D UFVfTk9USUZJRVJfRVJST1JfSU5KRUNUIGlzIG5vdCBzZXQKIyBDT05GSUdfRkFVTFRfSU5KRUNU SU9OIGlzIG5vdCBzZXQKQ09ORklHX0xBVEVOQ1lUT1A9eQpDT05GSUdfREVCVUdfUEFHRUFMTE9D PXkKQ09ORklHX1dBTlRfUEFHRV9ERUJVR19GTEFHUz15CkNPTkZJR19QQUdFX0dVQVJEPXkKQ09O RklHX1VTRVJfU1RBQ0tUUkFDRV9TVVBQT1JUPXkKQ09ORklHX05PUF9UUkFDRVI9eQpDT05GSUdf SEFWRV9GVU5DVElPTl9UUkFDRVI9eQpDT05GSUdfSEFWRV9GVU5DVElPTl9HUkFQSF9UUkFDRVI9 eQpDT05GSUdfSEFWRV9GVU5DVElPTl9HUkFQSF9GUF9URVNUPXkKQ09ORklHX0hBVkVfRlVOQ1RJ T05fVFJBQ0VfTUNPVU5UX1RFU1Q9eQpDT05GSUdfSEFWRV9EWU5BTUlDX0ZUUkFDRT15CkNPTkZJ R19IQVZFX0ZUUkFDRV9NQ09VTlRfUkVDT1JEPXkKQ09ORklHX0hBVkVfU1lTQ0FMTF9UUkFDRVBP SU5UUz15CkNPTkZJR19IQVZFX0NfUkVDT1JETUNPVU5UPXkKQ09ORklHX1JJTkdfQlVGRkVSPXkK Q09ORklHX0VWRU5UX1RSQUNJTkc9eQpDT05GSUdfRVZFTlRfUE9XRVJfVFJBQ0lOR19ERVBSRUNB VEVEPXkKQ09ORklHX0NPTlRFWFRfU1dJVENIX1RSQUNFUj15CkNPTkZJR19SSU5HX0JVRkZFUl9B TExPV19TV0FQPXkKQ09ORklHX1RSQUNJTkc9eQpDT05GSUdfR0VORVJJQ19UUkFDRVI9eQpDT05G SUdfVFJBQ0lOR19TVVBQT1JUPXkKQ09ORklHX0ZUUkFDRT15CiMgQ09ORklHX0ZVTkNUSU9OX1RS QUNFUiBpcyBub3Qgc2V0CiMgQ09ORklHX0lSUVNPRkZfVFJBQ0VSIGlzIG5vdCBzZXQKIyBDT05G SUdfU0NIRURfVFJBQ0VSIGlzIG5vdCBzZXQKIyBDT05GSUdfRlRSQUNFX1NZU0NBTExTIGlzIG5v dCBzZXQKQ09ORklHX0JSQU5DSF9QUk9GSUxFX05PTkU9eQojIENPTkZJR19QUk9GSUxFX0FOTk9U QVRFRF9CUkFOQ0hFUyBpcyBub3Qgc2V0CiMgQ09ORklHX1BST0ZJTEVfQUxMX0JSQU5DSEVTIGlz IG5vdCBzZXQKIyBDT05GSUdfU1RBQ0tfVFJBQ0VSIGlzIG5vdCBzZXQKQ09ORklHX0JMS19ERVZf SU9fVFJBQ0U9eQpDT05GSUdfS1BST0JFX0VWRU5UPXkKIyBDT05GSUdfRlRSQUNFX1NUQVJUVVBf VEVTVCBpcyBub3Qgc2V0CiMgQ09ORklHX01NSU9UUkFDRSBpcyBub3Qgc2V0CkNPTkZJR19SSU5H X0JVRkZFUl9CRU5DSE1BUks9bQpDT05GSUdfUFJPVklERV9PSENJMTM5NF9ETUFfSU5JVD15CkNP TkZJR19GSVJFV0lSRV9PSENJX1JFTU9URV9ETUE9eQpDT05GSUdfQlVJTERfRE9DU1JDPXkKQ09O RklHX0RZTkFNSUNfREVCVUc9eQojIENPTkZJR19ETUFfQVBJX0RFQlVHIGlzIG5vdCBzZXQKIyBD T05GSUdfQVRPTUlDNjRfU0VMRlRFU1QgaXMgbm90IHNldApDT05GSUdfQVNZTkNfUkFJRDZfVEVT VD1tCiMgQ09ORklHX1NBTVBMRVMgaXMgbm90IHNldApDT05GSUdfSEFWRV9BUkNIX0tHREI9eQoj IENPTkZJR19LR0RCIGlzIG5vdCBzZXQKQ09ORklHX0hBVkVfQVJDSF9LTUVNQ0hFQ0s9eQojIENP TkZJR19LTUVNQ0hFQ0sgaXMgbm90IHNldAojIENPTkZJR19URVNUX0tTVFJUT1ggaXMgbm90IHNl dAojIENPTkZJR19TVFJJQ1RfREVWTUVNIGlzIG5vdCBzZXQKQ09ORklHX1g4Nl9WRVJCT1NFX0JP T1RVUD15CkNPTkZJR19FQVJMWV9QUklOVEs9eQpDT05GSUdfRUFSTFlfUFJJTlRLX0RCR1A9eQpD T05GSUdfREVCVUdfU1RBQ0tPVkVSRkxPVz15CiMgQ09ORklHX1g4Nl9QVERVTVAgaXMgbm90IHNl dApDT05GSUdfREVCVUdfUk9EQVRBPXkKIyBDT05GSUdfREVCVUdfUk9EQVRBX1RFU1QgaXMgbm90 IHNldAojIENPTkZJR19ERUJVR19TRVRfTU9EVUxFX1JPTlggaXMgbm90IHNldAojIENPTkZJR19E RUJVR19OWF9URVNUIGlzIG5vdCBzZXQKIyBDT05GSUdfSU9NTVVfREVCVUcgaXMgbm90IHNldAoj IENPTkZJR19JT01NVV9TVFJFU1MgaXMgbm90IHNldApDT05GSUdfSEFWRV9NTUlPVFJBQ0VfU1VQ UE9SVD15CiMgQ09ORklHX1g4Nl9ERUNPREVSX1NFTEZURVNUIGlzIG5vdCBzZXQKQ09ORklHX0lP X0RFTEFZX1RZUEVfMFg4MD0wCkNPTkZJR19JT19ERUxBWV9UWVBFXzBYRUQ9MQpDT05GSUdfSU9f REVMQVlfVFlQRV9VREVMQVk9MgpDT05GSUdfSU9fREVMQVlfVFlQRV9OT05FPTMKQ09ORklHX0lP X0RFTEFZXzBYODA9eQojIENPTkZJR19JT19ERUxBWV8wWEVEIGlzIG5vdCBzZXQKIyBDT05GSUdf SU9fREVMQVlfVURFTEFZIGlzIG5vdCBzZXQKIyBDT05GSUdfSU9fREVMQVlfTk9ORSBpcyBub3Qg c2V0CkNPTkZJR19ERUZBVUxUX0lPX0RFTEFZX1RZUEU9MAojIENPTkZJR19ERUJVR19CT09UX1BB UkFNUyBpcyBub3Qgc2V0CiMgQ09ORklHX0NQQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19PUFRJ TUlaRV9JTkxJTklORz15CiMgQ09ORklHX0RFQlVHX1NUUklDVF9VU0VSX0NPUFlfQ0hFQ0tTIGlz IG5vdCBzZXQKIyBDT05GSUdfREVCVUdfTk1JX1NFTEZURVNUIGlzIG5vdCBzZXQKCiMKIyBTZWN1 cml0eSBvcHRpb25zCiMKQ09ORklHX0tFWVM9eQpDT05GSUdfVFJVU1RFRF9LRVlTPW0KQ09ORklH X0VOQ1JZUFRFRF9LRVlTPW0KIyBDT05GSUdfS0VZU19ERUJVR19QUk9DX0tFWVMgaXMgbm90IHNl dAojIENPTkZJR19TRUNVUklUWV9ETUVTR19SRVNUUklDVCBpcyBub3Qgc2V0CiMgQ09ORklHX1NF Q1VSSVRZIGlzIG5vdCBzZXQKQ09ORklHX1NFQ1VSSVRZRlM9eQpDT05GSUdfSU5URUxfVFhUPXkK Q09ORklHX0RFRkFVTFRfU0VDVVJJVFlfREFDPXkKQ09ORklHX0RFRkFVTFRfU0VDVVJJVFk9IiIK Q09ORklHX1hPUl9CTE9DS1M9bQpDT05GSUdfQVNZTkNfQ09SRT1tCkNPTkZJR19BU1lOQ19NRU1D UFk9bQpDT05GSUdfQVNZTkNfWE9SPW0KQ09ORklHX0FTWU5DX1BRPW0KQ09ORklHX0FTWU5DX1JB SUQ2X1JFQ09WPW0KQ09ORklHX0FTWU5DX1RYX0RJU0FCTEVfUFFfVkFMX0RNQT15CkNPTkZJR19B U1lOQ19UWF9ESVNBQkxFX1hPUl9WQUxfRE1BPXkKQ09ORklHX0NSWVBUTz15CgojCiMgQ3J5cHRv IGNvcmUgb3IgaGVscGVyCiMKQ09ORklHX0NSWVBUT19BTEdBUEk9eQpDT05GSUdfQ1JZUFRPX0FM R0FQSTI9eQpDT05GSUdfQ1JZUFRPX0FFQUQ9bQpDT05GSUdfQ1JZUFRPX0FFQUQyPXkKQ09ORklH X0NSWVBUT19CTEtDSVBIRVI9bQpDT05GSUdfQ1JZUFRPX0JMS0NJUEhFUjI9eQpDT05GSUdfQ1JZ UFRPX0hBU0g9eQpDT05GSUdfQ1JZUFRPX0hBU0gyPXkKQ09ORklHX0NSWVBUT19STkc9bQpDT05G SUdfQ1JZUFRPX1JORzI9eQpDT05GSUdfQ1JZUFRPX1BDT01QPW0KQ09ORklHX0NSWVBUT19QQ09N UDI9eQpDT05GSUdfQ1JZUFRPX01BTkFHRVI9eQpDT05GSUdfQ1JZUFRPX01BTkFHRVIyPXkKQ09O RklHX0NSWVBUT19VU0VSPW0KQ09ORklHX0NSWVBUT19NQU5BR0VSX0RJU0FCTEVfVEVTVFM9eQpD T05GSUdfQ1JZUFRPX0dGMTI4TVVMPW0KQ09ORklHX0NSWVBUT19OVUxMPW0KQ09ORklHX0NSWVBU T19QQ1JZUFQ9bQpDT05GSUdfQ1JZUFRPX1dPUktRVUVVRT15CkNPTkZJR19DUllQVE9fQ1JZUFRE PW0KQ09ORklHX0NSWVBUT19BVVRIRU5DPW0KQ09ORklHX0NSWVBUT19URVNUPW0KCiMKIyBBdXRo ZW50aWNhdGVkIEVuY3J5cHRpb24gd2l0aCBBc3NvY2lhdGVkIERhdGEKIwpDT05GSUdfQ1JZUFRP X0NDTT1tCkNPTkZJR19DUllQVE9fR0NNPW0KQ09ORklHX0NSWVBUT19TRVFJVj1tCgojCiMgQmxv Y2sgbW9kZXMKIwpDT05GSUdfQ1JZUFRPX0NCQz1tCkNPTkZJR19DUllQVE9fQ1RSPW0KQ09ORklH X0NSWVBUT19DVFM9bQpDT05GSUdfQ1JZUFRPX0VDQj1tCkNPTkZJR19DUllQVE9fTFJXPW0KQ09O RklHX0NSWVBUT19QQ0JDPW0KQ09ORklHX0NSWVBUT19YVFM9bQoKIwojIEhhc2ggbW9kZXMKIwpD T05GSUdfQ1JZUFRPX0hNQUM9eQpDT05GSUdfQ1JZUFRPX1hDQkM9bQpDT05GSUdfQ1JZUFRPX1ZN QUM9bQoKIwojIERpZ2VzdAojCkNPTkZJR19DUllQVE9fQ1JDMzJDPW0KQ09ORklHX0NSWVBUT19D UkMzMkNfSU5URUw9bQpDT05GSUdfQ1JZUFRPX0dIQVNIPW0KQ09ORklHX0NSWVBUT19NRDQ9bQpD T05GSUdfQ1JZUFRPX01ENT1tCkNPTkZJR19DUllQVE9fTUlDSEFFTF9NSUM9bQpDT05GSUdfQ1JZ UFRPX1JNRDEyOD1tCkNPTkZJR19DUllQVE9fUk1EMTYwPW0KQ09ORklHX0NSWVBUT19STUQyNTY9 bQpDT05GSUdfQ1JZUFRPX1JNRDMyMD1tCkNPTkZJR19DUllQVE9fU0hBMT1tCkNPTkZJR19DUllQ VE9fU0hBMV9TU1NFMz1tCkNPTkZJR19DUllQVE9fU0hBMjU2PW0KQ09ORklHX0NSWVBUT19TSEE1 MTI9bQpDT05GSUdfQ1JZUFRPX1RHUjE5Mj1tCkNPTkZJR19DUllQVE9fV1A1MTI9bQpDT05GSUdf Q1JZUFRPX0dIQVNIX0NMTVVMX05JX0lOVEVMPW0KCiMKIyBDaXBoZXJzCiMKQ09ORklHX0NSWVBU T19BRVM9bQpDT05GSUdfQ1JZUFRPX0FFU19YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0FFU19OSV9J TlRFTD1tCkNPTkZJR19DUllQVE9fQU5VQklTPW0KQ09ORklHX0NSWVBUT19BUkM0PW0KQ09ORklH X0NSWVBUT19CTE9XRklTSD1tCkNPTkZJR19DUllQVE9fQkxPV0ZJU0hfQ09NTU9OPW0KQ09ORklH X0NSWVBUT19CTE9XRklTSF9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0NBTUVMTElBPW0KQ09ORklH X0NSWVBUT19DQU1FTExJQV9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0NBU1Q1PW0KQ09ORklHX0NS WVBUT19DQVNUNj1tCkNPTkZJR19DUllQVE9fREVTPW0KQ09ORklHX0NSWVBUT19GQ1JZUFQ9bQpD T05GSUdfQ1JZUFRPX0tIQVpBRD1tCkNPTkZJR19DUllQVE9fU0FMU0EyMD1tCkNPTkZJR19DUllQ VE9fU0FMU0EyMF9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX1NFRUQ9bQpDT05GSUdfQ1JZUFRPX1NF UlBFTlQ9bQpDT05GSUdfQ1JZUFRPX1NFUlBFTlRfU1NFMl9YODZfNjQ9bQpDT05GSUdfQ1JZUFRP X1RFQT1tCiMgQ09ORklHX0NSWVBUT19UV09GSVNIIGlzIG5vdCBzZXQKQ09ORklHX0NSWVBUT19U V09GSVNIX0NPTU1PTj1tCkNPTkZJR19DUllQVE9fVFdPRklTSF9YODZfNjQ9bQpDT05GSUdfQ1JZ UFRPX1RXT0ZJU0hfWDg2XzY0XzNXQVk9bQoKIwojIENvbXByZXNzaW9uCiMKQ09ORklHX0NSWVBU T19ERUZMQVRFPW0KQ09ORklHX0NSWVBUT19aTElCPW0KQ09ORklHX0NSWVBUT19MWk89bQoKIwoj IFJhbmRvbSBOdW1iZXIgR2VuZXJhdGlvbgojCkNPTkZJR19DUllQVE9fQU5TSV9DUFJORz1tCiMg Q09ORklHX0NSWVBUT19VU0VSX0FQSV9IQVNIIGlzIG5vdCBzZXQKIyBDT05GSUdfQ1JZUFRPX1VT RVJfQVBJX1NLQ0lQSEVSIGlzIG5vdCBzZXQKQ09ORklHX0NSWVBUT19IVz15CkNPTkZJR19DUllQ VE9fREVWX1BBRExPQ0s9bQpDT05GSUdfQ1JZUFRPX0RFVl9QQURMT0NLX0FFUz1tCkNPTkZJR19D UllQVE9fREVWX1BBRExPQ0tfU0hBPW0KQ09ORklHX0hBVkVfS1ZNPXkKQ09ORklHX1ZJUlRVQUxJ WkFUSU9OPXkKIyBDT05GSUdfS1ZNIGlzIG5vdCBzZXQKIyBDT05GSUdfVkhPU1RfTkVUIGlzIG5v dCBzZXQKQ09ORklHX0JJTkFSWV9QUklOVEY9eQoKIwojIExpYnJhcnkgcm91dGluZXMKIwpDT05G SUdfUkFJRDZfUFE9bQpDT05GSUdfQklUUkVWRVJTRT15CkNPTkZJR19HRU5FUklDX0ZJTkRfRklS U1RfQklUPXkKQ09ORklHX0dFTkVSSUNfUENJX0lPTUFQPXkKQ09ORklHX0dFTkVSSUNfSU9NQVA9 eQpDT05GSUdfR0VORVJJQ19JTz15CkNPTkZJR19DUkNfQ0NJVFQ9bQpDT05GSUdfQ1JDMTY9bQpD T05GSUdfQ1JDX1QxMERJRj15CkNPTkZJR19DUkNfSVRVX1Q9bQpDT05GSUdfQ1JDMzI9eQojIENP TkZJR19DUkMzMl9TRUxGVEVTVCBpcyBub3Qgc2V0CkNPTkZJR19DUkMzMl9TTElDRUJZOD15CiMg Q09ORklHX0NSQzMyX1NMSUNFQlk0IGlzIG5vdCBzZXQKIyBDT05GSUdfQ1JDMzJfU0FSV0FURSBp cyBub3Qgc2V0CiMgQ09ORklHX0NSQzMyX0JJVCBpcyBub3Qgc2V0CkNPTkZJR19DUkM3PW0KQ09O RklHX0xJQkNSQzMyQz1tCkNPTkZJR19DUkM4PW0KQ09ORklHX1pMSUJfSU5GTEFURT15CkNPTkZJ R19aTElCX0RFRkxBVEU9bQpDT05GSUdfTFpPX0NPTVBSRVNTPXkKQ09ORklHX0xaT19ERUNPTVBS RVNTPXkKQ09ORklHX1haX0RFQz15CkNPTkZJR19YWl9ERUNfWDg2PXkKQ09ORklHX1haX0RFQ19Q T1dFUlBDPXkKQ09ORklHX1haX0RFQ19JQTY0PXkKQ09ORklHX1haX0RFQ19BUk09eQpDT05GSUdf WFpfREVDX0FSTVRIVU1CPXkKQ09ORklHX1haX0RFQ19TUEFSQz15CkNPTkZJR19YWl9ERUNfQkNK PXkKIyBDT05GSUdfWFpfREVDX1RFU1QgaXMgbm90IHNldApDT05GSUdfREVDT01QUkVTU19HWklQ PXkKQ09ORklHX0RFQ09NUFJFU1NfQlpJUDI9eQpDT05GSUdfREVDT01QUkVTU19MWk1BPXkKQ09O RklHX0RFQ09NUFJFU1NfWFo9eQpDT05GSUdfREVDT01QUkVTU19MWk89eQpDT05GSUdfR0VORVJJ Q19BTExPQ0FUT1I9eQpDT05GSUdfUkVFRF9TT0xPTU9OPW0KQ09ORklHX1JFRURfU09MT01PTl9E RUMxNj15CkNPTkZJR19CQ0g9bQpDT05GSUdfQkNIX0NPTlNUX1BBUkFNUz15CkNPTkZJR19URVhU U0VBUkNIPXkKQ09ORklHX1RFWFRTRUFSQ0hfS01QPW0KQ09ORklHX1RFWFRTRUFSQ0hfQk09bQpD T05GSUdfVEVYVFNFQVJDSF9GU009bQpDT05GSUdfQlRSRUU9eQpDT05GSUdfSEFTX0lPTUVNPXkK Q09ORklHX0hBU19JT1BPUlQ9eQpDT05GSUdfSEFTX0RNQT15CkNPTkZJR19DSEVDS19TSUdOQVRV UkU9eQpDT05GSUdfQ1BVX1JNQVA9eQpDT05GSUdfRFFMPXkKQ09ORklHX05MQVRUUj15CkNPTkZJ R19MUlVfQ0FDSEU9bQpDT05GSUdfQVZFUkFHRT15CkNPTkZJR19DT1JESUM9bQo= --bcaec517a674432cc304ce37f3ed Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --bcaec517a674432cc304ce37f3ed-- From xen-devel-bounces@lists.xen.org Sun Nov 11 13:14:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 13:14:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXXLx-00081X-LS; Sun, 11 Nov 2012 13:13:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXXLu-00081S-P7 for xen-devel@lists.xen.org; Sun, 11 Nov 2012 13:13:31 +0000 Received: from [85.158.143.35:24101] by server-2.bemta-4.messagelabs.com id 83/02-28922-A74AF905; Sun, 11 Nov 2012 13:13:30 +0000 X-Env-Sender: abb@gremwell.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352639607!14434111!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4998 invoked from network); 11 Nov 2012 13:13:28 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 13:13:28 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so6470853vcb.32 for ; Sun, 11 Nov 2012 05:13:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=9ASChrrsuQA65GbCQNfdRXZZLHT415mwWX9EJmWP2OM=; b=cDNamct+nAMC+CftP7GXsD0iN/33GYUa7zOhNExCw4ZSnLpvLYZdoscZqxKLPn9w4q jU6bILxsR9sFoY5gLVLbB11l7v4HhGXt3RYYVsdRcqdo8c7SeK/Z6SdbSN1ek4FGQNpy 8Ty1qU+e7ze3QEM645IYB+saCansOwThNlOrH3cQTPBMzvYpuJgi4uUKqWa9+zOYRMO5 z5UBFEM7uFs68r9kemD9fITJwRE3lhF3iZPCytqdd6dI73pWPb2v+AUeQ/4ilPC/dGR5 WutV0b7QSOYqzKxOpqP3XNC45Ow66TTYdPSTJPfcXR+h8oVearHUTR4SybBA+dHT9eyr l26A== MIME-Version: 1.0 Received: by 10.220.208.141 with SMTP id gc13mr19788270vcb.55.1352639606631; Sun, 11 Nov 2012 05:13:26 -0800 (PST) Received: by 10.58.155.226 with HTTP; Sun, 11 Nov 2012 05:13:26 -0800 (PST) Date: Sun, 11 Nov 2012 14:13:26 +0100 Message-ID: From: Alexandre Bezroutchko To: xen-devel@lists.xen.org Content-Type: multipart/mixed; boundary=bcaec517a674432cc304ce37f3ed X-Gm-Message-State: ALoCoQkEytLqGO4nHjMmkbL2ydf8F2g4GKFJXDD1/zvwScvIRU01dEjWsTN2+TPOTFejcKRDrAui Cc: Marek Marczykowski Subject: [Xen-devel] [xen-devel] kernel 3.4.12 crashes if built debugging X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --bcaec517a674432cc304ce37f3ed Content-Type: multipart/alternative; boundary=bcaec517a674432cbf04ce37f3eb --bcaec517a674432cbf04ce37f3eb Content-Type: text/plain; charset=ISO-8859-1 Hi, Kernel 3.4.12 built with debugging options crashes during bootstrap. The issue is easily reproducible and also seems to affect 3.4.18. The "offending" debug option is 'page allocation', if I switch it off but leave other debugging options the kernel does not crash. +CONFIG_DEBUG_PAGEALLOC=y +CONFIG_WANT_PAGE_DEBUG_FLAGS=y +CONFIG_PAGE_GUARD=y The kernel is actually built from devel-3.4 branch of marmarek repo of Qubes, but all the patches are disabled, so it supposed to be equivalent to vanilla kernel. Partial error messages are below. The kernel config file and full log are attached. ---------------------------------------------------------------------------- [ 0.575221] debug: unmapping init memory ffffffff81879000..ffffffff81913000 [ 0.575474] Write protecting the kernel read-only data: 8192k [ 0.579226] debug: unmapping init memory ffff880001469000..ffff880001600000 [ 0.579825] debug: unmapping init memory ffff8800017fc000..ffff880001800000 [ 0.601666] BUG: unable to handle kernel paging request at ffff88000f66d000 [ 0.601678] IP: [] __tlb_remove_page+0x84/0xb0 [ 0.601689] PGD 180c067 PUD 1810067 PMD 861067 PTE 801000000f66d064 [ 0.601698] Oops: 0002 [#1] SMP DEBUG_PAGEALLOC [ 0.601705] CPU 5 [ 0.601708] Modules linked in: [ 0.601713] [ 0.601717] Pid: 60, comm: init Not tainted 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64 #1 [ 0.601726] RIP: e030:[] [] __tlb_remove_page+0x84/0xb0 [ 0.601736] RSP: e02b:ffff88000f645a78 EFLAGS: 00010286 [ 0.601741] RAX: ffff88000f66d000 RBX: ffff88000f645c30 RCX: 0000000000000000 [ 0.601747] RDX: ffff88000f66d000 RSI: 0000000000000010 RDI: 0000000000000200 [ 0.601754] RBP: ffff88000f645a88 R08: 0000000000000000 R09: ffff880000000000 [ 0.601760] R10: 0000000000000001 R11: 00000000581c6204 R12: ffff88000f62ec68 [ 0.601766] R13: 0000000193e49125 R14: ffff88000f5e3150 R15: 000000000042a000 [ 0.601777] FS: 00007fda48c7b740(0000) GS:ffff880018d40000(0000) knlGS:0000000000000000 [ 0.601784] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 0.605188] CR2: ffff88000f66d000 CR3: 000000000f665000 CR4: 0000000000002660 [ 0.605188] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 0.605188] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 0.605188] Process init (pid: 60, threadinfo ffff88000f644000, task ffff88000f6427c0) [ 0.605188] Stack: [ 0.605188] ffffea00003d78c0 ffffea000048a680 ffff88000f645b78 ffffffff8110b1d8 [ 0.605188] 000000009658ccc5 0000000000000100 0000000000000000 00000000000001ff [ 0.605188] 00000000004d9fff 00000000004da000 00000000004d9fff ffff88000f62f000 [ 0.605188] Call Trace: [ 0.605188] [] unmap_page_range+0x4a8/0x730 [ 0.605188] [] unmap_single_vma+0x63/0xb0 [ 0.605188] [] ? put_pages_list+0x30/0x30 [ 0.605188] [] unmap_vmas+0x5e/0xb0 [ 0.605188] [] exit_mmap+0x97/0x140 [ 0.605188] [] mmput+0x73/0xf0 [ 0.605188] [] flush_old_exec+0x3ed/0x720 [ 0.605188] [] load_elf_binary+0x31e/0x1840 [ 0.605188] [] ? load_elf_library+0x200/0x200 [ 0.605188] [] search_binary_handler+0xe7/0x2f0 [ 0.605188] [] do_execve_common.isra.32+0x3e3/0x4b0 [ 0.605188] [] do_execve+0x16/0x20 [ 0.605188] [] sys_execve+0x42/0x70 [ 0.605188] [] stub_execve+0x6c/0xc0 [ 0.605188] Code: 8b 47 10 48 8b 10 48 85 d2 74 0c 48 89 53 10 8b 42 0c 8b 52 08 eb bd 31 f6 bf 00 02 00 00 e8 d4 87 fe ff 48 85 c0 48 89 c2 74 1e <48> c7 00 00 00 00 00 c7 40 08 00 00 00 00 c7 40 0c fe 01 00 00 [ 0.605188] RIP [] __tlb_remove_page+0x84/0xb0 [ 0.605188] RSP [ 0.605188] CR2: ffff88000f66d000 [ 0.605188] ---[ end trace 555e8456cfdd3999 ]--- [ 0.634427] ------------[ cut here ]------------ [ 0.634435] kernel BUG at /rw/home/user/qubes/qubes-builder/qubes-src/kernel/kernel-3.4.12/linux-3.4.12/arch/x86/kernel/paravirt.c:244! [ 0.634445] invalid opcode: 0000 [#2] SMP DEBUG_PAGEALLOC [ 0.634451] CPU 5 [ 0.634453] Modules linked in: [ 0.634458] [ 0.634462] Pid: 60, comm: init Tainted: G D 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64 #1 [ 0.634472] RIP: e030:[] [] enter_lazy.part.4+0x4/0x6 [ 0.634483] RSP: e02b:ffff88000f645488 EFLAGS: 00010202 [ 0.634489] RAX: 0000000000000001 RBX: ffff88000f664c68 RCX: 00003ffffffff000 [ 0.634496] RDX: 0000000000000006 RSI: ffffea00003d9a80 RDI: ffffea00003d9ab0 [ 0.634502] RBP: ffff88000f645488 R08: 0000000000000000 R09: 0000000000000000 [ 0.634508] R10: ffffffff81871d00 R11: 0000000000000001 R12: ffff88000f669ff8 [ 0.634514] R13: ffff88000f664c68 R14: ffff88000f66afe8 R15: 00007fffffffd000 [ 0.634524] FS: 00007fda48c7b740(0000) GS:ffff880018d40000(0000) knlGS:0000000000000000 [ 0.634532] CS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b [ 0.634537] CR2: ffff88000f66d000 CR3: 000000000180b000 CR4: 0000000000002660 [ 0.634544] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 0.634550] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 0.634557] Process init (pid: 60, threadinfo ffff88000f644000, task ffff88000f6427c0) [ 0.634564] Stack: [ 0.634567] ffff88000f645498 ffffffff81039bf2 ffff88000f645588 ffffffff8110b002 [ 0.634577] 0000000000000011 0000000000000100 0000000000000000 00000000000001ff [ 0.634586] 00007fffffffefff 00007ffffffff000 00007fffffffefff ffff88000f6657f8 [ 0.634596] Call Trace: [ 0.634602] [] paravirt_enter_lazy_mmu+0x22/0x30 [ 0.634609] [] unmap_page_range+0x2d2/0x730 [ 0.634617] [] ? release_pages+0x148/0x1c0 [ 0.634624] [] unmap_single_vma+0x63/0xb0 [ 0.634631] [] ? put_pages_list+0x30/0x30 [ 0.634637] [] unmap_vmas+0x5e/0xb0 [ 0.634644] [] exit_mmap+0x97/0x140 [ 0.634650] [] mmput+0x73/0xf0 [ 0.634657] [] exit_mm+0xfd/0x120 [ 0.634664] [] ? xen_irq_enable_direct_reloc+0x4/0x4 [ 0.634672] [] do_exit+0x164/0x8a0 [ 0.634680] [] ? _raw_spin_unlock_irqrestore+0x12/0x20 [ 0.634687] [] ? kmsg_dump+0x5a/0x100 [ 0.634694] [] oops_end+0x99/0xe0 [ 0.634700] [] no_context+0x24e/0x279 [ 0.634707] [] ? xen_pmd_val+0x9/0x10 [ 0.634713] [] __bad_area_nosemaphore+0x1ba/0x1d9 [ 0.634721] [] ? restore_args+0x30/0x30 [ 0.634727] [] bad_area_nosemaphore+0xe/0x10 [ 0.634734] [] do_page_fault+0x32b/0x4f0 [ 0.634741] [] ? pte_mfn_to_pfn+0x6a/0x100 [ 0.634748] [] ? __alloc_pages_nodemask+0x193/0x850 [ 0.634756] [] ? __d_lookup+0x7a/0x160 [ 0.634763] [] page_fault+0x25/0x30 [ 0.634769] [] ? __tlb_remove_page+0x84/0xb0 [ 0.634776] [] ? __tlb_remove_page+0x7c/0xb0 [ 0.634782] [] unmap_page_range+0x4a8/0x730 [ 0.634790] [] unmap_single_vma+0x63/0xb0 [ 0.634797] [] ? put_pages_list+0x30/0x30 [ 0.634803] [] unmap_vmas+0x5e/0xb0 [ 0.634809] [] exit_mmap+0x97/0x140 [ 0.634816] [] mmput+0x73/0xf0 [ 0.634822] [] flush_old_exec+0x3ed/0x720 [ 0.634830] [] load_elf_binary+0x31e/0x1840 [ 0.634838] [] ? load_elf_library+0x200/0x200 [ 0.634845] [] search_binary_handler+0xe7/0x2f0 [ 0.634852] [] do_execve_common.isra.32+0x3e3/0x4b0 [ 0.634858] [] do_execve+0x16/0x20 [ 0.634864] [] sys_execve+0x42/0x70 [ 0.634871] [] stub_execve+0x6c/0xc0 [ 0.634876] Code: fa 44 89 e6 48 c7 c7 a8 e3 75 81 31 c0 e8 0b 0f 00 00 48 83 c4 18 5b 41 5c 41 5d 41 5e 41 5f 5d c3 55 48 89 e5 0f 0b 55 48 89 e5 <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 41 55 41 54 53 31 db 48 85 [ 0.634932] RIP [] enter_lazy.part.4+0x4/0x6 [ 0.634938] RSP [ 0.634941] ---[ end trace 555e8456cfdd399a ]--- [ 0.634944] Fixing recursive fault but reboot is needed! ---------------------------------------------------------------------------- Regards, Alex --bcaec517a674432cbf04ce37f3eb Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi,

Kernel 3.4.12 built with debugging options crashes during bootst= rap. The issue is easily reproducible and also seems to affect 3.4.18. The = "offending" debug option is 'page allocation', if I switc= h it off but leave other debugging options the kernel does not crash.

+CONFIG_DEBUG_PAGEALLOC=3Dy
+CONFIG_WANT_PAGE_DEBUG_FLAGS=3Dy
+CO= NFIG_PAGE_GUARD=3Dy

The kernel is actually built from devel-3.4 bran= ch of marmarek repo of Qubes, but all the patches are disabled, so it suppo= sed to be equivalent to vanilla kernel.

Partial error messages are below. The kernel config file and full log a= re attached.

-------------------------------------------------------= ---------------------
[=A0=A0=A0 0.575221] debug: unmapping init memory = ffffffff81879000..ffffffff81913000
[=A0=A0=A0 0.575474] Write protecting the kernel read-only data: 8192k
[= =A0=A0=A0 0.579226] debug: unmapping init memory ffff880001469000..ffff8800= 01600000
[=A0=A0=A0 0.579825] debug: unmapping init memory ffff8800017fc= 000..ffff880001800000
[=A0=A0=A0 0.601666] BUG: unable to handle kernel paging request at ffff880= 00f66d000
[=A0=A0=A0 0.601678] IP: [<ffffffff81109c64>] __tlb_remo= ve_page+0x84/0xb0
[=A0=A0=A0 0.601689] PGD 180c067 PUD 1810067 PMD 86106= 7 PTE 801000000f66d064
[=A0=A0=A0 0.601698] Oops: 0002 [#1] SMP DEBUG_PAGEALLOC
[=A0=A0=A0 0.60= 1705] CPU 5
[=A0=A0=A0 0.601708] Modules linked in:
[=A0=A0=A0 0.601= 713]
[=A0=A0=A0 0.601717] Pid: 60, comm: init Not tainted 3.4.12-1allde= bugnopvusb.pvops.qubes.x86_64 #1=A0
[=A0=A0=A0 0.601726] RIP: e030:[<ffffffff81109c64>]=A0 [<ffffffff8= 1109c64>] __tlb_remove_page+0x84/0xb0
[=A0=A0=A0 0.601736] RSP: e02b:= ffff88000f645a78=A0 EFLAGS: 00010286
[=A0=A0=A0 0.601741] RAX: ffff88000= f66d000 RBX: ffff88000f645c30 RCX: 0000000000000000
[=A0=A0=A0 0.601747] RDX: ffff88000f66d000 RSI: 0000000000000010 RDI: 00000= 00000000200
[=A0=A0=A0 0.601754] RBP: ffff88000f645a88 R08: 000000000000= 0000 R09: ffff880000000000
[=A0=A0=A0 0.601760] R10: 0000000000000001 R1= 1: 00000000581c6204 R12: ffff88000f62ec68
[=A0=A0=A0 0.601766] R13: 0000000193e49125 R14: ffff88000f5e3150 R15: 00000= 0000042a000
[=A0=A0=A0 0.601777] FS:=A0 00007fda48c7b740(0000) GS:ffff88= 0018d40000(0000) knlGS:0000000000000000
[=A0=A0=A0 0.601784] CS:=A0 e033= DS: 0000 ES: 0000 CR0: 000000008005003b
[=A0=A0=A0 0.605188] CR2: ffff88000f66d000 CR3: 000000000f665000 CR4: 00000= 00000002660
[=A0=A0=A0 0.605188] DR0: 0000000000000000 DR1: 000000000000= 0000 DR2: 0000000000000000
[=A0=A0=A0 0.605188] DR3: 0000000000000000 DR= 6: 00000000ffff0ff0 DR7: 0000000000000400
[=A0=A0=A0 0.605188] Process init (pid: 60, threadinfo ffff88000f644000, ta= sk ffff88000f6427c0)
[=A0=A0=A0 0.605188] Stack:
[=A0=A0=A0 0.605188]= =A0 ffffea00003d78c0 ffffea000048a680 ffff88000f645b78 ffffffff8110b1d8
= [=A0=A0=A0 0.605188]=A0 000000009658ccc5 0000000000000100 0000000000000000 = 00000000000001ff
[=A0=A0=A0 0.605188]=A0 00000000004d9fff 00000000004da000 00000000004d9fff = ffff88000f62f000
[=A0=A0=A0 0.605188] Call Trace:
[=A0=A0=A0 0.605188= ]=A0 [<ffffffff8110b1d8>] unmap_page_range+0x4a8/0x730
[=A0=A0=A0 = 0.605188]=A0 [<ffffffff8110b4c3>] unmap_single_vma+0x63/0xb0
[=A0=A0=A0 0.605188]=A0 [<ffffffff810f52b0>] ? put_pages_list+0x30/0x= 30
[=A0=A0=A0 0.605188]=A0 [<ffffffff8110bcde>] unmap_vmas+0x5e/0x= b0
[=A0=A0=A0 0.605188]=A0 [<ffffffff811131c7>] exit_mmap+0x97/0x1= 40
[=A0=A0=A0 0.605188]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0 [=A0=A0=A0 0.605188]=A0 [<ffffffff811396ad>] flush_old_exec+0x3ed/0x7= 20
[=A0=A0=A0 0.605188]=A0 [<ffffffff8117f8be>] load_elf_binary+0x= 31e/0x1840
[=A0=A0=A0 0.605188]=A0 [<ffffffff8117f5a0>] ? load_elf= _library+0x200/0x200
[=A0=A0=A0 0.605188]=A0 [<ffffffff81138dc7>] search_binary_handler+0x= e7/0x2f0
[=A0=A0=A0 0.605188]=A0 [<ffffffff8113a293>] do_execve_co= mmon.isra.32+0x3e3/0x4b0
[=A0=A0=A0 0.605188]=A0 [<ffffffff8113a376&g= t;] do_execve+0x16/0x20
[=A0=A0=A0 0.605188]=A0 [<ffffffff8101ad52>] sys_execve+0x42/0x70
= [=A0=A0=A0 0.605188]=A0 [<ffffffff81460c3c>] stub_execve+0x6c/0xc0[=A0=A0=A0 0.605188] Code: 8b 47 10 48 8b 10 48 85 d2 74 0c 48 89 53 10 8b= 42 0c 8b 52 08 eb bd 31 f6 bf 00 02 00 00 e8 d4 87 fe ff 48 85 c0 48 89 c2= 74 1e <48> c7 00 00 00 00 00 c7 40 08 00 00 00 00 c7 40 0c fe 01 00 = 00
[=A0=A0=A0 0.605188] RIP=A0 [<ffffffff81109c64>] __tlb_remove_page+0x= 84/0xb0
[=A0=A0=A0 0.605188]=A0 RSP <ffff88000f645a78>
[=A0=A0= =A0 0.605188] CR2: ffff88000f66d000
[=A0=A0=A0 0.605188] ---[ end trace = 555e8456cfdd3999 ]---
[=A0=A0=A0 0.634427] ------------[ cut here ]------------
[=A0=A0=A0 0.6= 34435] kernel BUG at /rw/home/user/qubes/qubes-builder/qubes-src/kernel/ker= nel-3.4.12/linux-3.4.12/arch/x86/kernel/paravirt.c:244!
[=A0=A0=A0 0.634= 445] invalid opcode: 0000 [#2] SMP DEBUG_PAGEALLOC
[=A0=A0=A0 0.634451] CPU 5
[=A0=A0=A0 0.634453] Modules linked in:
[= =A0=A0=A0 0.634458]
[=A0=A0=A0 0.634462] Pid: 60, comm: init Tainted: G= =A0=A0=A0=A0=A0 D=A0=A0=A0=A0=A0 3.4.12-1alldebugnopvusb.pvops.qubes.x86_64= #1=A0
[=A0=A0=A0 0.634472] RIP: e030:[<ffffffff8144f3b7>]=A0 [&l= t;ffffffff8144f3b7>] enter_lazy.part.4+0x4/0x6
[=A0=A0=A0 0.634483] RSP: e02b:ffff88000f645488=A0 EFLAGS: 00010202
[=A0= =A0=A0 0.634489] RAX: 0000000000000001 RBX: ffff88000f664c68 RCX: 00003ffff= ffff000
[=A0=A0=A0 0.634496] RDX: 0000000000000006 RSI: ffffea00003d9a80= RDI: ffffea00003d9ab0
[=A0=A0=A0 0.634502] RBP: ffff88000f645488 R08: 0000000000000000 R09: 00000= 00000000000
[=A0=A0=A0 0.634508] R10: ffffffff81871d00 R11: 000000000000= 0001 R12: ffff88000f669ff8
[=A0=A0=A0 0.634514] R13: ffff88000f664c68 R1= 4: ffff88000f66afe8 R15: 00007fffffffd000
[=A0=A0=A0 0.634524] FS:=A0 00007fda48c7b740(0000) GS:ffff880018d40000(0000= ) knlGS:0000000000000000
[=A0=A0=A0 0.634532] CS:=A0 e033 DS: 0000 ES: 0= 000 CR0: 000000008005003b
[=A0=A0=A0 0.634537] CR2: ffff88000f66d000 CR3= : 000000000180b000 CR4: 0000000000002660
[=A0=A0=A0 0.634544] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 00000= 00000000000
[=A0=A0=A0 0.634550] DR3: 0000000000000000 DR6: 00000000ffff= 0ff0 DR7: 0000000000000400
[=A0=A0=A0 0.634557] Process init (pid: 60, t= hreadinfo ffff88000f644000, task ffff88000f6427c0)
[=A0=A0=A0 0.634564] Stack:
[=A0=A0=A0 0.634567]=A0 ffff88000f645498 fff= fffff81039bf2 ffff88000f645588 ffffffff8110b002
[=A0=A0=A0 0.634577]=A0 = 0000000000000011 0000000000000100 0000000000000000 00000000000001ff
[=A0= =A0=A0 0.634586]=A0 00007fffffffefff 00007ffffffff000 00007fffffffefff ffff= 88000f6657f8
[=A0=A0=A0 0.634596] Call Trace:
[=A0=A0=A0 0.634602]=A0 [<ffffffff81= 039bf2>] paravirt_enter_lazy_mmu+0x22/0x30
[=A0=A0=A0 0.634609]=A0 [&= lt;ffffffff8110b002>] unmap_page_range+0x2d2/0x730
[=A0=A0=A0 0.63461= 7]=A0 [<ffffffff810f5098>] ? release_pages+0x148/0x1c0
[=A0=A0=A0 0.634624]=A0 [<ffffffff8110b4c3>] unmap_single_vma+0x63/0x= b0
[=A0=A0=A0 0.634631]=A0 [<ffffffff810f52b0>] ? put_pages_list+0= x30/0x30
[=A0=A0=A0 0.634637]=A0 [<ffffffff8110bcde>] unmap_vmas+0= x5e/0xb0
[=A0=A0=A0 0.634644]=A0 [<ffffffff811131c7>] exit_mmap+0x= 97/0x140
[=A0=A0=A0 0.634650]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0
[=A0= =A0=A0 0.634657]=A0 [<ffffffff81049afd>] exit_mm+0xfd/0x120
[=A0= =A0=A0 0.634664]=A0 [<ffffffff81009dc9>] ? xen_irq_enable_direct_relo= c+0x4/0x4
[=A0=A0=A0 0.634672]=A0 [<ffffffff8104b244>] do_exit+0x1= 64/0x8a0
[=A0=A0=A0 0.634680]=A0 [<ffffffff81458c42>] ? _raw_spin_unlock_irqre= store+0x12/0x20
[=A0=A0=A0 0.634687]=A0 [<ffffffff810490fa>] ? kms= g_dump+0x5a/0x100
[=A0=A0=A0 0.634694]=A0 [<ffffffff81459eb9>] oop= s_end+0x99/0xe0
[=A0=A0=A0 0.634700]=A0 [<ffffffff8144fc9f>] no_co= ntext+0x24e/0x279
[=A0=A0=A0 0.634707]=A0 [<ffffffff81007339>] ? xen_pmd_val+0x9/0x10[=A0=A0=A0 0.634713]=A0 [<ffffffff8144fe84>] __bad_area_nosemaphore= +0x1ba/0x1d9
[=A0=A0=A0 0.634721]=A0 [<ffffffff81459169>] ? restor= e_args+0x30/0x30
[=A0=A0=A0 0.634727]=A0 [<ffffffff8144feb1>] bad_area_nosemaphore+0xe= /0x10
[=A0=A0=A0 0.634734]=A0 [<ffffffff8145c69b>] do_page_fault+0= x32b/0x4f0
[=A0=A0=A0 0.634741]=A0 [<ffffffff8100728a>] ? pte_mfn_= to_pfn+0x6a/0x100
[=A0=A0=A0 0.634748]=A0 [<ffffffff810f1cf3>] ? __alloc_pages_nodemask= +0x193/0x850
[=A0=A0=A0 0.634756]=A0 [<ffffffff8114997a>] ? __d_lo= okup+0x7a/0x160
[=A0=A0=A0 0.634763]=A0 [<ffffffff814593a5>] page_= fault+0x25/0x30
[=A0=A0=A0 0.634769]=A0 [<ffffffff81109c64>] ? __t= lb_remove_page+0x84/0xb0
[=A0=A0=A0 0.634776]=A0 [<ffffffff81109c5c>] ? __tlb_remove_page+0x7c= /0xb0
[=A0=A0=A0 0.634782]=A0 [<ffffffff8110b1d8>] unmap_page_rang= e+0x4a8/0x730
[=A0=A0=A0 0.634790]=A0 [<ffffffff8110b4c3>] unmap_s= ingle_vma+0x63/0xb0
[=A0=A0=A0 0.634797]=A0 [<ffffffff810f52b0>] ? put_pages_list+0x30/0x= 30
[=A0=A0=A0 0.634803]=A0 [<ffffffff8110bcde>] unmap_vmas+0x5e/0x= b0
[=A0=A0=A0 0.634809]=A0 [<ffffffff811131c7>] exit_mmap+0x97/0x1= 40
[=A0=A0=A0 0.634816]=A0 [<ffffffff810445c3>] mmput+0x73/0xf0 [=A0=A0=A0 0.634822]=A0 [<ffffffff811396ad>] flush_old_exec+0x3ed/0x7= 20
[=A0=A0=A0 0.634830]=A0 [<ffffffff8117f8be>] load_elf_binary+0x= 31e/0x1840
[=A0=A0=A0 0.634838]=A0 [<ffffffff8117f5a0>] ? load_elf= _library+0x200/0x200
[=A0=A0=A0 0.634845]=A0 [<ffffffff81138dc7>] search_binary_handler+0x= e7/0x2f0
[=A0=A0=A0 0.634852]=A0 [<ffffffff8113a293>] do_execve_co= mmon.isra.32+0x3e3/0x4b0
[=A0=A0=A0 0.634858]=A0 [<ffffffff8113a376&g= t;] do_execve+0x16/0x20
[=A0=A0=A0 0.634864]=A0 [<ffffffff8101ad52>] sys_execve+0x42/0x70
= [=A0=A0=A0 0.634871]=A0 [<ffffffff81460c3c>] stub_execve+0x6c/0xc0[=A0=A0=A0 0.634876] Code: fa 44 89 e6 48 c7 c7 a8 e3 75 81 31 c0 e8 0b 0f= 00 00 48 83 c4 18 5b 41 5c 41 5d 41 5e 41 5f 5d c3 55 48 89 e5 0f 0b 55 48= 89 e5 <0f> 0b 55 48 89 e5 0f 0b 55 48 89 e5 41 55 41 54 53 31 db 48 = 85
[=A0=A0=A0 0.634932] RIP=A0 [<ffffffff8144f3b7>] enter_lazy.part.4+0x= 4/0x6
[=A0=A0=A0 0.634938]=A0 RSP <ffff88000f645488>
[=A0=A0=A0= 0.634941] ---[ end trace 555e8456cfdd399a ]---
[=A0=A0=A0 0.634944] Fix= ing recursive fault but reboot is needed!
---------------------------------------------------------------------------= -

Regards,
Alex

--bcaec517a674432cbf04ce37f3eb-- --bcaec517a674432cc304ce37f3ed Content-Type: application/octet-stream; name="guest-work.log" Content-Disposition: attachment; filename="guest-work.log" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h9e6j5ne0 WyAgICAwLjAwMDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgY3B1c2V0DQpbICAgIDAu MDAwMDAwXSBJbml0aWFsaXppbmcgY2dyb3VwIHN1YnN5cyBjcHUNClsgICAgMC4wMDAwMDBdIExp bnV4IHZlcnNpb24gMy40LjEyLTFhbGxkZWJ1Z25vcHZ1c2IucHZvcHMucXViZXMueDg2XzY0ICh1 c2VyQHFkdnApIChnY2MgdmVyc2lvbiA0LjcuMiAyMDEyMDkyMSAoUmVkIEhhdCA0LjcuMi0yKSAo R0NDKSApICMxIFNNUCBTdW4gTm92IDExIDExOjU0OjEwIENFVCAyMDEyDQpbICAgIDAuMDAwMDAw XSBDb21tYW5kIGxpbmU6IHJvb3Q9L2Rldi9tYXBwZXIvZG1yb290IHJvIG5vbW9kZXNldCBjb25z b2xlPWh2YzAgcmRfTk9fUExZTU9VVEggMyANClsgICAgMC4wMDAwMDBdIEFDUEkgaW4gdW5wcml2 aWxlZ2VkIGRvbWFpbiBkaXNhYmxlZA0KWyAgICAwLjAwMDAwMF0gUmVsZWFzZWQgMCBwYWdlcyBv ZiB1bnVzZWQgbWVtb3J5DQpbICAgIDAuMDAwMDAwXSBTZXQgMCBwYWdlKHMpIHRvIDEtMSBtYXBw aW5nDQpbICAgIDAuMDAwMDAwXSBCSU9TLXByb3ZpZGVkIHBoeXNpY2FsIFJBTSBtYXA6DQpbICAg IDAuMDAwMDAwXSAgWGVuOiAwMDAwMDAwMDAwMDAwMDAwIC0gMDAwMDAwMDAwMDBhMDAwMCAodXNh YmxlKQ0KWyAgICAwLjAwMDAwMF0gIFhlbjogMDAwMDAwMDAwMDBhMDAwMCAtIDAwMDAwMDAwMDAx MDAwMDAgKHJlc2VydmVkKQ0KWyAgICAwLjAwMDAwMF0gIFhlbjogMDAwMDAwMDAwMDEwMDAwMCAt IDAwMDAwMDAwZmU2MDAwMDAgKHVzYWJsZSkNClsgICAgMC4wMDAwMDBdIE5YIChFeGVjdXRlIERp c2FibGUpIHByb3RlY3Rpb246IGFjdGl2ZQ0KWyAgICAwLjAwMDAwMF0gRE1JIG5vdCBwcmVzZW50 IG9yIGludmFsaWQuDQpbICAgIDAuMDAwMDAwXSBObyBBR1AgYnJpZGdlIGZvdW5kDQpbICAgIDAu MDAwMDAwXSBsYXN0X3BmbiA9IDB4ZmU2MDAgbWF4X2FyY2hfcGZuID0gMHg0MDAwMDAwMDANClsg ICAgMC4wMDAwMDBdIGluaXRfbWVtb3J5X21hcHBpbmc6IDAwMDAwMDAwMDAwMDAwMDAtMDAwMDAw MDBmZTYwMDAwMA0KWyAgICAwLjAwMDAwMF0gUkFNRElTSzogMDFlMjMwMDAgLSAwMzk1MDAwMA0K WyAgICAwLjAwMDAwMF0gWm9uZSBQRk4gcmFuZ2VzOg0KWyAgICAwLjAwMDAwMF0gICBETUEgICAg ICAweDAwMDAwMDEwIC0+IDB4MDAwMDEwMDANClsgICAgMC4wMDAwMDBdICAgRE1BMzIgICAgMHgw MDAwMTAwMCAtPiAweDAwMTAwMDAwDQpbICAgIDAuMDAwMDAwXSAgIE5vcm1hbCAgIGVtcHR5DQpb ICAgIDAuMDAwMDAwXSBNb3ZhYmxlIHpvbmUgc3RhcnQgUEZOIGZvciBlYWNoIG5vZGUNClsgICAg MC4wMDAwMDBdIEVhcmx5IG1lbW9yeSBQRk4gcmFuZ2VzDQpbICAgIDAuMDAwMDAwXSAgICAgMDog MHgwMDAwMDAxMCAtPiAweDAwMDAwMGEwDQpbICAgIDAuMDAwMDAwXSAgICAgMDogMHgwMDAwMDEw MCAtPiAweDAwMGZlNjAwDQpbICAgIDAuMDAwMDAwXSBTRkk6IFNpbXBsZSBGaXJtd2FyZSBJbnRl cmZhY2UgdjAuODEgaHR0cDovL3NpbXBsZWZpcm13YXJlLm9yZw0KWyAgICAwLjAwMDAwMF0gU01Q OiBBbGxvd2luZyA4IENQVXMsIDAgaG90cGx1ZyBDUFVzDQpbICAgIDAuMDAwMDAwXSBObyBsb2Nh bCBBUElDIHByZXNlbnQNClsgICAgMC4wMDAwMDBdIEFQSUM6IGRpc2FibGUgYXBpYyBmYWNpbGl0 eQ0KWyAgICAwLjAwMDAwMF0gQVBJQzogc3dpdGNoZWQgdG8gYXBpYyBOT09QDQpbICAgIDAuMDAw MDAwXSBBbGxvY2F0aW5nIFBDSSByZXNvdXJjZXMgc3RhcnRpbmcgYXQgZmU2MDAwMDAgKGdhcDog ZmU2MDAwMDA6MWEwMDAwMCkNClsgICAgMC4wMDAwMDBdIEJvb3RpbmcgcGFyYXZpcnR1YWxpemVk IGtlcm5lbCBvbiBYZW4NClsgICAgMC4wMDAwMDBdIFhlbiB2ZXJzaW9uOiA0LjEuMiAocHJlc2Vy dmUtQUQpDQpbICAgIDAuMDAwMDAwXSBzZXR1cF9wZXJjcHU6IE5SX0NQVVM6NTEyIG5yX2NwdW1h c2tfYml0czo1MTIgbnJfY3B1X2lkczo4IG5yX25vZGVfaWRzOjENClsgICAgMC4wMDAwMDBdIFBF UkNQVTogRW1iZWRkZWQgMjggcGFnZXMvY3B1IEBmZmZmODgwMDE4YzAwMDAwIHM4MjMwNCByODE5 MiBkMjQxOTIgdTI2MjE0NA0KWyAgICAwLjAwMDAwMF0gQnVpbHQgMSB6b25lbGlzdHMgaW4gWm9u ZSBvcmRlciwgbW9iaWxpdHkgZ3JvdXBpbmcgb24uICBUb3RhbCBwYWdlczogMTAyMzUxOQ0KWyAg ICAwLjAwMDAwMF0gS2VybmVsIGNvbW1hbmQgbGluZTogcm9vdD0vZGV2L21hcHBlci9kbXJvb3Qg cm8gbm9tb2Rlc2V0IGNvbnNvbGU9aHZjMCByZF9OT19QTFlNT1VUSCAzIA0KWyAgICAwLjAwMDAw MF0gUElEIGhhc2ggdGFibGUgZW50cmllczogNDA5NiAob3JkZXI6IDMsIDMyNzY4IGJ5dGVzKQ0K WyAgICAwLjAwMDAwMF0gRGVudHJ5IGNhY2hlIGhhc2ggdGFibGUgZW50cmllczogNTI0Mjg4IChv cmRlcjogMTAsIDQxOTQzMDQgYnl0ZXMpDQpbICAgIDAuMDAwMDAwXSBJbm9kZS1jYWNoZSBoYXNo IHRhYmxlIGVudHJpZXM6IDI2MjE0NCAob3JkZXI6IDksIDIwOTcxNTIgYnl0ZXMpDQpbICAgIDAu MDAwMDAwXSBDaGVja2luZyBhcGVydHVyZS4uLg0KWyAgICAwLjAwMDAwMF0gTm8gQUdQIGJyaWRn ZSBmb3VuZA0KWyAgICAwLjAwMDAwMF0gTWVtb3J5OiAyODkwNDhrLzQxNjc2ODBrIGF2YWlsYWJs ZSAoNDQ5N2sga2VybmVsIGNvZGUsIDQ0OGsgYWJzZW50LCAzODc4MTg0ayByZXNlcnZlZCwgNDE3 MmsgZGF0YSwgNjE2ayBpbml0KQ0KWyAgICAwLjAwMDAwMF0gSGllcmFyY2hpY2FsIFJDVSBpbXBs ZW1lbnRhdGlvbi4NClsgICAgMC4wMDAwMDBdIAlSQ1UgZHludGljay1pZGxlIGdyYWNlLXBlcmlv ZCBhY2NlbGVyYXRpb24gaXMgZW5hYmxlZC4NClsgICAgMC4wMDAwMDBdIE5SX0lSUVM6MzMwMjQg bnJfaXJxczozMzYgMTYNClsgICAgMC4wMDAwMDBdIGttZW1sZWFrOiBLZXJuZWwgbWVtb3J5IGxl YWsgZGV0ZWN0b3IgZGlzYWJsZWQNClsgICAgMC4wMDAwMDBdIENvbnNvbGU6IGNvbG91ciBkdW1t eSBkZXZpY2UgODB4MjUNClsgICAgMC4wMDAwMDBdIGNvbnNvbGUgW3R0eTBdIGVuYWJsZWQNClsg ICAgMC4wMDAwMDBdIGNvbnNvbGUgW2h2YzBdIGVuYWJsZWQNClsgICAgMC4wMDAwMDBdIGttZW1s ZWFrOiBFYXJseSBsb2cgYnVmZmVyIGV4Y2VlZGVkICg2NTYpLCBwbGVhc2UgaW5jcmVhc2UgREVC VUdfS01FTUxFQUtfRUFSTFlfTE9HX1NJWkUNClsgICAgMC4wMDAwMDBdIGluc3RhbGxpbmcgWGVu IHRpbWVyIGZvciBDUFUgMA0KWyAgICAwLjAwMDAwMF0gRGV0ZWN0ZWQgMTcyOS4wNTQgTUh6IHBy b2Nlc3Nvci4NClsgICAgMC4wMDQwMDBdIENhbGlicmF0aW5nIGRlbGF5IGxvb3AgKHNraXBwZWQp LCB2YWx1ZSBjYWxjdWxhdGVkIHVzaW5nIHRpbWVyIGZyZXF1ZW5jeS4uIDM0NTguMTAgQm9nb01J UFMgKGxwaj02OTE2MjE2KQ0KWyAgICAwLjAwNDAwMF0gcGlkX21heDogZGVmYXVsdDogMzI3Njgg bWluaW11bTogMzAxDQpbICAgIDAuMDA0MDAwXSBNb3VudC1jYWNoZSBoYXNoIHRhYmxlIGVudHJp ZXM6IDI1Ng0KWyAgICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgY3B1YWNj dA0KWyAgICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgZGV2aWNlcw0KWyAg ICAwLjAwNDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgZnJlZXplcg0KWyAgICAwLjAw NDAwMF0gSW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgbmV0X2Nscw0KWyAgICAwLjAwNDAwMF0g SW5pdGlhbGl6aW5nIGNncm91cCBzdWJzeXMgYmxraW8NClsgICAgMC4wMDQwMDBdIENQVTogUGh5 c2ljYWwgUHJvY2Vzc29yIElEOiAwDQpbICAgIDAuMDA0MDAwXSBDUFU6IFByb2Nlc3NvciBDb3Jl IElEOiAwDQpbICAgIDAuMDA0MDAwXSBTTVAgYWx0ZXJuYXRpdmVzOiBzd2l0Y2hpbmcgdG8gVVAg Y29kZQ0KWyAgICAwLjA1MjgxN10gUGVyZm9ybWFuY2UgRXZlbnRzOiB1bnN1cHBvcnRlZCBwNiBD UFUgbW9kZWwgMzAgbm8gUE1VIGRyaXZlciwgc29mdHdhcmUgZXZlbnRzIG9ubHkuDQpbICAgIDAu MDU0NTAwXSBOTUkgd2F0Y2hkb2c6IGRpc2FibGVkIChjcHUwKTogaGFyZHdhcmUgZXZlbnRzIG5v dCBlbmFibGVkDQpbICAgIDAuMDU2OTI2XSBpbnN0YWxsaW5nIFhlbiB0aW1lciBmb3IgQ1BVIDEN ClsgICAgMC4wNTcwNDldIFNNUCBhbHRlcm5hdGl2ZXM6IHN3aXRjaGluZyB0byBTTVAgY29kZQ0K WyAgICAwLjEyMDg0MF0gTk1JIHdhdGNoZG9nOiBkaXNhYmxlZCAoY3B1MSk6IGhhcmR3YXJlIGV2 ZW50cyBub3QgZW5hYmxlZA0KWyAgICAwLjEyNDIyN10gaW5zdGFsbGluZyBYZW4gdGltZXIgZm9y IENQVSAyDQpbICAgIDAuMTI0NzI5XSBOTUkgd2F0Y2hkb2c6IGRpc2FibGVkIChjcHUyKTogaGFy ZHdhcmUgZXZlbnRzIG5vdCBlbmFibGVkDQpbICAgIDAuMTI3OTEwXSBpbnN0YWxsaW5nIFhlbiB0 aW1lciBmb3IgQ1BVIDMNClsgICAgMC4xMjg0NzddIE5NSSB3YXRjaGRvZzogZGlzYWJsZWQgKGNw dTMpOiBoYXJkd2FyZSBldmVudHMgbm90IGVuYWJsZWQNClsgICAgMC4xMzA5NTldIGluc3RhbGxp bmcgWGVuIHRpbWVyIGZvciBDUFUgNA0KWyAgICAwLjEzMTMwOV0gTk1JIHdhdGNoZG9nOiBkaXNh YmxlZCAoY3B1NCk6IGhhcmR3YXJlIGV2ZW50cyBub3QgZW5hYmxlZA0KWyAgICAwLjEzNDUwMl0g aW5zdGFsbGluZyBYZW4gdGltZXIgZm9yIENQVSA1DQpbICAgIDAuMTM1MTE1XSBOTUkgd2F0Y2hk b2c6IGRpc2FibGVkIChjcHU1KTogaGFyZHdhcmUgZXZlbnRzIG5vdCBlbmFibGVkDQpbICAgIDAu MTM4MDQ3XSBpbnN0YWxsaW5nIFhlbiB0aW1lciBmb3IgQ1BVIDYNClsgICAgMC4xMzg1OTJdIE5N SSB3YXRjaGRvZzogZGlzYWJsZWQgKGNwdTYpOiBoYXJkd2FyZSBldmVudHMgbm90IGVuYWJsZWQN ClsgICAgMC4xNDExMjddIGluc3RhbGxpbmcgWGVuIHRpbWVyIGZvciBDUFUgNw0KWyAgICAwLjE0 MTczNl0gTk1JIHdhdGNoZG9nOiBkaXNhYmxlZCAoY3B1Nyk6IGhhcmR3YXJlIGV2ZW50cyBub3Qg ZW5hYmxlZA0KWyAgICAwLjE0MTk0MF0gQnJvdWdodCB1cCA4IENQVXMNClsgICAgMC4xNDQ1NDVd IGRldnRtcGZzOiBpbml0aWFsaXplZA0KWyAgICAwLjE1NDExMl0gR3JhbnQgdGFibGVzIHVzaW5n IHZlcnNpb24gMiBsYXlvdXQuDQpbICAgIDAuMTU0MTEyXSBHcmFudCB0YWJsZSBpbml0aWFsaXpl ZA0KWyAgICAwLjE1NDExMl0gZHVtbXk6IA0KWyAgICAwLjE3NDgzOV0gUlRDIHRpbWU6IDE2NTox NjU6MTY1LCBkYXRlOiAxNjUvMTY1LzY1DQpbICAgIDAuMTc1NjYzXSBORVQ6IFJlZ2lzdGVyZWQg cHJvdG9jb2wgZmFtaWx5IDE2DQpbICAgIDAuMTc2NTgwXSBQQ0k6IHNldHRpbmcgdXAgWGVuIFBD SSBmcm9udGVuZCBzdHViDQpbICAgIDAuMTgxMzQ5XSBiaW86IGNyZWF0ZSBzbGFiIDxiaW8tMD4g YXQgMA0KWyAgICAwLjE4NDA2N10gQUNQSTogSW50ZXJwcmV0ZXIgZGlzYWJsZWQuDQpbICAgIDAu MTg0MDkzXSB4ZW4vYmFsbG9vbjogSW5pdGlhbGlzaW5nIGJhbGxvb24gZHJpdmVyLg0KWyAgICAw LjIwMTEwN10geGVuLWJhbGxvb246IEluaXRpYWxpc2luZyBiYWxsb29uIGRyaXZlci4NClsgICAg MC4yMDQwNjddIHZnYWFyYjogbG9hZGVkDQpbICAgIDAuMjA0NTE3XSBQQ0k6IFN5c3RlbSBkb2Vz IG5vdCBzdXBwb3J0IFBDSQ0KWyAgICAwLjIwNDUxN10gUENJOiBTeXN0ZW0gZG9lcyBub3Qgc3Vw cG9ydCBQQ0kNClsgICAgMC4yMDQ2MTFdIFN3aXRjaGluZyB0byBjbG9ja3NvdXJjZSB4ZW4NClsg ICAgMC4yNTIxMzVdIHBucDogUG5QIEFDUEk6IGRpc2FibGVkDQpbICAgIDAuMjczMTY2XSBORVQ6 IFJlZ2lzdGVyZWQgcHJvdG9jb2wgZmFtaWx5IDINClsgICAgMC4yNzQwNzhdIElQIHJvdXRlIGNh Y2hlIGhhc2ggdGFibGUgZW50cmllczogMzI3NjggKG9yZGVyOiA2LCAyNjIxNDQgYnl0ZXMpDQpb ICAgIDAuMjc4MDMzXSBUQ1AgZXN0YWJsaXNoZWQgaGFzaCB0YWJsZSBlbnRyaWVzOiAxMzEwNzIg KG9yZGVyOiA5LCAyMDk3MTUyIGJ5dGVzKQ0KWyAgICAwLjI4MDQ5M10gVENQIGJpbmQgaGFzaCB0 YWJsZSBlbnRyaWVzOiA2NTUzNiAob3JkZXI6IDgsIDEwNDg1NzYgYnl0ZXMpDQpbICAgIDAuMjgx MzEyXSBUQ1A6IEhhc2ggdGFibGVzIGNvbmZpZ3VyZWQgKGVzdGFibGlzaGVkIDEzMTA3MiBiaW5k IDY1NTM2KQ0KWyAgICAwLjI4MTMyOF0gVENQOiByZW5vIHJlZ2lzdGVyZWQNClsgICAgMC4yODEz ODddIFVEUCBoYXNoIHRhYmxlIGVudHJpZXM6IDIwNDggKG9yZGVyOiA0LCA2NTUzNiBieXRlcykN ClsgICAgMC4yODE1MTVdIFVEUC1MaXRlIGhhc2ggdGFibGUgZW50cmllczogMjA0OCAob3JkZXI6 IDQsIDY1NTM2IGJ5dGVzKQ0KWyAgICAwLjI4Mzk0MF0gTkVUOiBSZWdpc3RlcmVkIHByb3RvY29s IGZhbWlseSAxDQpbICAgIDAuMjg0NzIzXSBVbnBhY2tpbmcgaW5pdHJhbWZzLi4uDQpbICAgIDAu NDMzOTgwXSBkZWJ1ZzogdW5tYXBwaW5nIGluaXQgbWVtb3J5IGZmZmY4ODAwMDFlMjMwMDAuLmZm ZmY4ODAwMDM5NTAwMDANClsgICAgMC40NDAxMTVdIHBsYXRmb3JtIHJ0Y19jbW9zOiByZWdpc3Rl cmVkIHBsYXRmb3JtIFJUQyBkZXZpY2UgKG5vIFBOUCBkZXZpY2UgZm91bmQpDQpbICAgIDAuNDQ4 NTYzXSBhdWRpdDogaW5pdGlhbGl6aW5nIG5ldGxpbmsgc29ja2V0IChkaXNhYmxlZCkNClsgICAg MC40NDg2ODhdIHR5cGU9MjAwMCBhdWRpdCgxMzUyNjM3NDI0LjM5NToxKTogaW5pdGlhbGl6ZWQN ClsgICAgMC40OTAxOTNdIFZGUzogRGlzayBxdW90YXMgZHF1b3RfNi41LjINClsgICAgMC40OTA0 NzldIERxdW90LWNhY2hlIGhhc2ggdGFibGUgZW50cmllczogNTEyIChvcmRlciAwLCA0MDk2IGJ5 dGVzKQ0KWyAgICAwLjQ5MjA4N10gbXNnbW5pIGhhcyBiZWVuIHNldCB0byA1NjQNClsgICAgMC40 OTMwMDldIEJsb2NrIGxheWVyIFNDU0kgZ2VuZXJpYyAoYnNnKSBkcml2ZXIgdmVyc2lvbiAwLjQg bG9hZGVkIChtYWpvciAyNTMpDQpbICAgIDAuNDkzMDIxXSBpbyBzY2hlZHVsZXIgbm9vcCByZWdp c3RlcmVkDQpbICAgIDAuNDkzMDI1XSBpbyBzY2hlZHVsZXIgZGVhZGxpbmUgcmVnaXN0ZXJlZA0K WyAgICAwLjQ5MzI2Ml0gaW8gc2NoZWR1bGVyIGNmcSByZWdpc3RlcmVkIChkZWZhdWx0KQ0KWyAg ICAwLjUwMDQ0OF0gcGNpZnJvbnQgcGNpLTA6IEluc3RhbGxpbmcgUENJIGZyb250ZW5kDQpbICAg IDAuNTAwODIxXSBwY2lmcm9udCBwY2ktMDogQ3JlYXRpbmcgUENJIEZyb250ZW5kIEJ1cyAwMDAw OjAwDQpbICAgIDAuNTAxMTA2XSBwY2lmcm9udCBwY2ktMDogUENJIGhvc3QgYnJpZGdlIHRvIGJ1 cyAwMDAwOjAwDQpbICAgIDAuNTAxMTI2XSBwY2lfYnVzIDAwMDA6MDA6IHJvb3QgYnVzIHJlc291 cmNlIFtpbyAgMHgwMDAwLTB4ZmZmZl0NClsgICAgMC41MDExMzldIHBjaV9idXMgMDAwMDowMDog cm9vdCBidXMgcmVzb3VyY2UgW21lbSAweDAwMDAwMDAwLTB4ZmZmZmZmZmZmXQ0KWyAgICAwLjUw MTk3MV0gTm9uLXZvbGF0aWxlIG1lbW9yeSBkcml2ZXIgdjEuMw0KWyAgICAwLjUwMjA5NF0gcmFt b29wczogcGxhdGZvcm0gZGV2aWNlIG5vdCBmb3VuZCwgdXNpbmcgbW9kdWxlIHBhcmFtZXRlcnMN ClsgICAgMC41MDIzMTddIHJhbW9vcHM6IFRoZSBtZW1vcnkgc2l6ZSBhbmQgdGhlIHJlY29yZCBz aXplIG11c3QgYmUgbm9uLXplcm8NClsgICAgMC41MDIzNDVdIHJhbW9vcHM6IHByb2JlIG9mIHJh bW9vcHMgZmFpbGVkIHdpdGggZXJyb3IgLTIyDQpbICAgIDAuNTA2ODQwXSBsb29wOiBtb2R1bGUg bG9hZGVkDQpbICAgIDAuNTA2OTcxXSBGaXhlZCBNRElPIEJ1czogcHJvYmVkDQpbICAgIDAuNTA3 MDg1XSBpODA0MjogUE5QOiBObyBQUy8yIGNvbnRyb2xsZXIgZm91bmQuIFByb2JpbmcgcG9ydHMg ZGlyZWN0bHkuDQpbICAgIDAuNTA3OTEwXSBpODA0MjogTm8gY29udHJvbGxlciBmb3VuZA0KWyAg ICAwLjUwODE4NV0gbW91c2VkZXY6IFBTLzIgbW91c2UgZGV2aWNlIGNvbW1vbiBmb3IgYWxsIG1p Y2UNClsgICAgMC41Njg0NTZdIHJ0Y19jbW9zIHJ0Y19jbW9zOiBydGMgY29yZTogcmVnaXN0ZXJl ZCBydGNfY21vcyBhcyBydGMwDQpbICAgIDAuNTY4NjIzXSBydGNfY21vczogcHJvYmUgb2YgcnRj X2Ntb3MgZmFpbGVkIHdpdGggZXJyb3IgLTM4DQpbICAgIDAuNTY5NzQxXSBkZXZpY2UtbWFwcGVy OiB1ZXZlbnQ6IHZlcnNpb24gMS4wLjMNClsgICAgMC41NzAzNzRdIGRldmljZS1tYXBwZXI6IGlv Y3RsOiA0LjIyLjAtaW9jdGwgKDIwMTEtMTAtMTkpIGluaXRpYWxpc2VkOiBkbS1kZXZlbEByZWRo YXQuY29tDQpbICAgIDAuNTcwNzg3XSBUQ1A6IGN1YmljIHJlZ2lzdGVyZWQNClsgICAgMC41NzE3 OTldIE5FVDogUmVnaXN0ZXJlZCBwcm90b2NvbCBmYW1pbHkgMTANClsgICAgMC41NzMzNjBdIFJl Z2lzdGVyaW5nIHRoZSBkbnNfcmVzb2x2ZXIga2V5IHR5cGUNClsgICAgMC41NzQxODVdIHJlZ2lz dGVyZWQgdGFza3N0YXRzIHZlcnNpb24gMQ0KWyAgICAwLjU3NDIyN10gWEVOQlVTOiBEZXZpY2Ug d2l0aCBubyBkcml2ZXI6IGRldmljZS92YmQvNTE3MTINClsgICAgMC41NzQyMzNdIFhFTkJVUzog RGV2aWNlIHdpdGggbm8gZHJpdmVyOiBkZXZpY2UvdmJkLzUxNzI4DQpbICAgIDAuNTc0MjM4XSBY RU5CVVM6IERldmljZSB3aXRoIG5vIGRyaXZlcjogZGV2aWNlL3ZiZC81MTc0NA0KWyAgICAwLjU3 NDI0M10gWEVOQlVTOiBEZXZpY2Ugd2l0aCBubyBkcml2ZXI6IGRldmljZS92YmQvNTE3NjANClsg ICAgMC41NzQyNDddIFhFTkJVUzogRGV2aWNlIHdpdGggbm8gZHJpdmVyOiBkZXZpY2UvdmlmLzAN ClsgICAgMC41NzQ1NDFdICAgTWFnaWMgbnVtYmVyOiAxOjI1MjozMTQxDQpbICAgIDAuNTc0NjA0 XSAvcncvaG9tZS91c2VyL3F1YmVzL3F1YmVzLWJ1aWxkZXIvcXViZXMtc3JjL2tlcm5lbC9rZXJu ZWwtMy40LjEyL2xpbnV4LTMuNC4xMi9kcml2ZXJzL3J0Yy9oY3Rvc3lzLmM6IHVuYWJsZSB0byBv cGVuIHJ0YyBkZXZpY2UgKHJ0YzApDQpbICAgIDAuNTc1MjIxXSBkZWJ1ZzogdW5tYXBwaW5nIGlu aXQgbWVtb3J5IGZmZmZmZmZmODE4NzkwMDAuLmZmZmZmZmZmODE5MTMwMDANClsgICAgMC41NzU0 NzRdIFdyaXRlIHByb3RlY3RpbmcgdGhlIGtlcm5lbCByZWFkLW9ubHkgZGF0YTogODE5MmsNClsg ICAgMC41NzkyMjZdIGRlYnVnOiB1bm1hcHBpbmcgaW5pdCBtZW1vcnkgZmZmZjg4MDAwMTQ2OTAw MC4uZmZmZjg4MDAwMTYwMDAwMA0KWyAgICAwLjU3OTgyNV0gZGVidWc6IHVubWFwcGluZyBpbml0 IG1lbW9yeSBmZmZmODgwMDAxN2ZjMDAwLi5mZmZmODgwMDAxODAwMDAwDQpbICAgIDAuNjAxNjY2 XSBCVUc6IHVuYWJsZSB0byBoYW5kbGUga2VybmVsIHBhZ2luZyByZXF1ZXN0IGF0IGZmZmY4ODAw MGY2NmQwMDANClsgICAgMC42MDE2NzhdIElQOiBbPGZmZmZmZmZmODExMDljNjQ+XSBfX3RsYl9y ZW1vdmVfcGFnZSsweDg0LzB4YjANClsgICAgMC42MDE2ODldIFBHRCAxODBjMDY3IFBVRCAxODEw MDY3IFBNRCA4NjEwNjcgUFRFIDgwMTAwMDAwMGY2NmQwNjQNClsgICAgMC42MDE2OThdIE9vcHM6 IDAwMDIgWyMxXSBTTVAgREVCVUdfUEFHRUFMTE9DDQpbICAgIDAuNjAxNzA1XSBDUFUgNSANClsg ICAgMC42MDE3MDhdIE1vZHVsZXMgbGlua2VkIGluOg0KWyAgICAwLjYwMTcxM10gDQpbICAgIDAu NjAxNzE3XSBQaWQ6IDYwLCBjb21tOiBpbml0IE5vdCB0YWludGVkIDMuNC4xMi0xYWxsZGVidWdu b3B2dXNiLnB2b3BzLnF1YmVzLng4Nl82NCAjMSAgDQpbICAgIDAuNjAxNzI2XSBSSVA6IGUwMzA6 WzxmZmZmZmZmZjgxMTA5YzY0Pl0gIFs8ZmZmZmZmZmY4MTEwOWM2ND5dIF9fdGxiX3JlbW92ZV9w YWdlKzB4ODQvMHhiMA0KWyAgICAwLjYwMTczNl0gUlNQOiBlMDJiOmZmZmY4ODAwMGY2NDVhNzgg IEVGTEFHUzogMDAwMTAyODYNClsgICAgMC42MDE3NDFdIFJBWDogZmZmZjg4MDAwZjY2ZDAwMCBS Qlg6IGZmZmY4ODAwMGY2NDVjMzAgUkNYOiAwMDAwMDAwMDAwMDAwMDAwDQpbICAgIDAuNjAxNzQ3 XSBSRFg6IGZmZmY4ODAwMGY2NmQwMDAgUlNJOiAwMDAwMDAwMDAwMDAwMDEwIFJESTogMDAwMDAw MDAwMDAwMDIwMA0KWyAgICAwLjYwMTc1NF0gUkJQOiBmZmZmODgwMDBmNjQ1YTg4IFIwODogMDAw MDAwMDAwMDAwMDAwMCBSMDk6IGZmZmY4ODAwMDAwMDAwMDANClsgICAgMC42MDE3NjBdIFIxMDog MDAwMDAwMDAwMDAwMDAwMSBSMTE6IDAwMDAwMDAwNTgxYzYyMDQgUjEyOiBmZmZmODgwMDBmNjJl YzY4DQpbICAgIDAuNjAxNzY2XSBSMTM6IDAwMDAwMDAxOTNlNDkxMjUgUjE0OiBmZmZmODgwMDBm NWUzMTUwIFIxNTogMDAwMDAwMDAwMDQyYTAwMA0KWyAgICAwLjYwMTc3N10gRlM6ICAwMDAwN2Zk YTQ4YzdiNzQwKDAwMDApIEdTOmZmZmY4ODAwMThkNDAwMDAoMDAwMCkga25sR1M6MDAwMDAwMDAw MDAwMDAwMA0KWyAgICAwLjYwMTc4NF0gQ1M6ICBlMDMzIERTOiAwMDAwIEVTOiAwMDAwIENSMDog MDAwMDAwMDA4MDA1MDAzYg0KWyAgICAwLjYwNTE4OF0gQ1IyOiBmZmZmODgwMDBmNjZkMDAwIENS MzogMDAwMDAwMDAwZjY2NTAwMCBDUjQ6IDAwMDAwMDAwMDAwMDI2NjANClsgICAgMC42MDUxODhd IERSMDogMDAwMDAwMDAwMDAwMDAwMCBEUjE6IDAwMDAwMDAwMDAwMDAwMDAgRFIyOiAwMDAwMDAw MDAwMDAwMDAwDQpbICAgIDAuNjA1MTg4XSBEUjM6IDAwMDAwMDAwMDAwMDAwMDAgRFI2OiAwMDAw MDAwMGZmZmYwZmYwIERSNzogMDAwMDAwMDAwMDAwMDQwMA0KWyAgICAwLjYwNTE4OF0gUHJvY2Vz cyBpbml0IChwaWQ6IDYwLCB0aHJlYWRpbmZvIGZmZmY4ODAwMGY2NDQwMDAsIHRhc2sgZmZmZjg4 MDAwZjY0MjdjMCkNClsgICAgMC42MDUxODhdIFN0YWNrOg0KWyAgICAwLjYwNTE4OF0gIGZmZmZl YTAwMDAzZDc4YzAgZmZmZmVhMDAwMDQ4YTY4MCBmZmZmODgwMDBmNjQ1Yjc4IGZmZmZmZmZmODEx MGIxZDgNClsgICAgMC42MDUxODhdICAwMDAwMDAwMDk2NThjY2M1IDAwMDAwMDAwMDAwMDAxMDAg MDAwMDAwMDAwMDAwMDAwMCAwMDAwMDAwMDAwMDAwMWZmDQpbICAgIDAuNjA1MTg4XSAgMDAwMDAw MDAwMDRkOWZmZiAwMDAwMDAwMDAwNGRhMDAwIDAwMDAwMDAwMDA0ZDlmZmYgZmZmZjg4MDAwZjYy ZjAwMA0KWyAgICAwLjYwNTE4OF0gQ2FsbCBUcmFjZToNClsgICAgMC42MDUxODhdICBbPGZmZmZm ZmZmODExMGIxZDg+XSB1bm1hcF9wYWdlX3JhbmdlKzB4NGE4LzB4NzMwDQpbICAgIDAuNjA1MTg4 XSAgWzxmZmZmZmZmZjgxMTBiNGMzPl0gdW5tYXBfc2luZ2xlX3ZtYSsweDYzLzB4YjANClsgICAg MC42MDUxODhdICBbPGZmZmZmZmZmODEwZjUyYjA+XSA/IHB1dF9wYWdlc19saXN0KzB4MzAvMHgz MA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTEwYmNkZT5dIHVubWFwX3ZtYXMrMHg1ZS8w eGIwDQpbICAgIDAuNjA1MTg4XSAgWzxmZmZmZmZmZjgxMTEzMWM3Pl0gZXhpdF9tbWFwKzB4OTcv MHgxNDANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODEwNDQ1YzM+XSBtbXB1dCsweDczLzB4 ZjANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODExMzk2YWQ+XSBmbHVzaF9vbGRfZXhlYysw eDNlZC8weDcyMA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTE3ZjhiZT5dIGxvYWRfZWxm X2JpbmFyeSsweDMxZS8weDE4NDANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODExN2Y1YTA+ XSA/IGxvYWRfZWxmX2xpYnJhcnkrMHgyMDAvMHgyMDANClsgICAgMC42MDUxODhdICBbPGZmZmZm ZmZmODExMzhkYzc+XSBzZWFyY2hfYmluYXJ5X2hhbmRsZXIrMHhlNy8weDJmMA0KWyAgICAwLjYw NTE4OF0gIFs8ZmZmZmZmZmY4MTEzYTI5Mz5dIGRvX2V4ZWN2ZV9jb21tb24uaXNyYS4zMisweDNl My8weDRiMA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTEzYTM3Nj5dIGRvX2V4ZWN2ZSsw eDE2LzB4MjANClsgICAgMC42MDUxODhdICBbPGZmZmZmZmZmODEwMWFkNTI+XSBzeXNfZXhlY3Zl KzB4NDIvMHg3MA0KWyAgICAwLjYwNTE4OF0gIFs8ZmZmZmZmZmY4MTQ2MGMzYz5dIHN0dWJfZXhl Y3ZlKzB4NmMvMHhjMA0KWyAgICAwLjYwNTE4OF0gQ29kZTogOGIgNDcgMTAgNDggOGIgMTAgNDgg ODUgZDIgNzQgMGMgNDggODkgNTMgMTAgOGIgNDIgMGMgOGIgNTIgMDggZWIgYmQgMzEgZjYgYmYg MDAgMDIgMDAgMDAgZTggZDQgODcgZmUgZmYgNDggODUgYzAgNDggODkgYzIgNzQgMWUgPDQ4PiBj NyAwMCAwMCAwMCAwMCAwMCBjNyA0MCAwOCAwMCAwMCAwMCAwMCBjNyA0MCAwYyBmZSAwMSAwMCAw MCANClsgICAgMC42MDUxODhdIFJJUCAgWzxmZmZmZmZmZjgxMTA5YzY0Pl0gX190bGJfcmVtb3Zl X3BhZ2UrMHg4NC8weGIwDQpbICAgIDAuNjA1MTg4XSAgUlNQIDxmZmZmODgwMDBmNjQ1YTc4Pg0K WyAgICAwLjYwNTE4OF0gQ1IyOiBmZmZmODgwMDBmNjZkMDAwDQpbICAgIDAuNjA1MTg4XSAtLS1b IGVuZCB0cmFjZSA1NTVlODQ1NmNmZGQzOTk5IF0tLS0NClsgICAgMC42MzQ0MjddIC0tLS0tLS0t LS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQ0KWyAgICAwLjYzNDQzNV0ga2VybmVsIEJVRyBh dCAvcncvaG9tZS91c2VyL3F1YmVzL3F1YmVzLWJ1aWxkZXIvcXViZXMtc3JjL2tlcm5lbC9rZXJu ZWwtMy40LjEyL2xpbnV4LTMuNC4xMi9hcmNoL3g4Ni9rZXJuZWwvcGFyYXZpcnQuYzoyNDQhDQpb ICAgIDAuNjM0NDQ1XSBpbnZhbGlkIG9wY29kZTogMDAwMCBbIzJdIFNNUCBERUJVR19QQUdFQUxM T0MNClsgICAgMC42MzQ0NTFdIENQVSA1IA0KWyAgICAwLjYzNDQ1M10gTW9kdWxlcyBsaW5rZWQg aW46DQpbICAgIDAuNjM0NDU4XSANClsgICAgMC42MzQ0NjJdIFBpZDogNjAsIGNvbW06IGluaXQg VGFpbnRlZDogRyAgICAgIEQgICAgICAzLjQuMTItMWFsbGRlYnVnbm9wdnVzYi5wdm9wcy5xdWJl cy54ODZfNjQgIzEgIA0KWyAgICAwLjYzNDQ3Ml0gUklQOiBlMDMwOls8ZmZmZmZmZmY4MTQ0ZjNi Nz5dICBbPGZmZmZmZmZmODE0NGYzYjc+XSBlbnRlcl9sYXp5LnBhcnQuNCsweDQvMHg2DQpbICAg IDAuNjM0NDgzXSBSU1A6IGUwMmI6ZmZmZjg4MDAwZjY0NTQ4OCAgRUZMQUdTOiAwMDAxMDIwMg0K WyAgICAwLjYzNDQ4OV0gUkFYOiAwMDAwMDAwMDAwMDAwMDAxIFJCWDogZmZmZjg4MDAwZjY2NGM2 OCBSQ1g6IDAwMDAzZmZmZmZmZmYwMDANClsgICAgMC42MzQ0OTZdIFJEWDogMDAwMDAwMDAwMDAw MDAwNiBSU0k6IGZmZmZlYTAwMDAzZDlhODAgUkRJOiBmZmZmZWEwMDAwM2Q5YWIwDQpbICAgIDAu NjM0NTAyXSBSQlA6IGZmZmY4ODAwMGY2NDU0ODggUjA4OiAwMDAwMDAwMDAwMDAwMDAwIFIwOTog MDAwMDAwMDAwMDAwMDAwMA0KWyAgICAwLjYzNDUwOF0gUjEwOiBmZmZmZmZmZjgxODcxZDAwIFIx MTogMDAwMDAwMDAwMDAwMDAwMSBSMTI6IGZmZmY4ODAwMGY2NjlmZjgNClsgICAgMC42MzQ1MTRd IFIxMzogZmZmZjg4MDAwZjY2NGM2OCBSMTQ6IGZmZmY4ODAwMGY2NmFmZTggUjE1OiAwMDAwN2Zm ZmZmZmZkMDAwDQpbICAgIDAuNjM0NTI0XSBGUzogIDAwMDA3ZmRhNDhjN2I3NDAoMDAwMCkgR1M6 ZmZmZjg4MDAxOGQ0MDAwMCgwMDAwKSBrbmxHUzowMDAwMDAwMDAwMDAwMDAwDQpbICAgIDAuNjM0 NTMyXSBDUzogIGUwMzMgRFM6IDAwMDAgRVM6IDAwMDAgQ1IwOiAwMDAwMDAwMDgwMDUwMDNiDQpb ICAgIDAuNjM0NTM3XSBDUjI6IGZmZmY4ODAwMGY2NmQwMDAgQ1IzOiAwMDAwMDAwMDAxODBiMDAw IENSNDogMDAwMDAwMDAwMDAwMjY2MA0KWyAgICAwLjYzNDU0NF0gRFIwOiAwMDAwMDAwMDAwMDAw MDAwIERSMTogMDAwMDAwMDAwMDAwMDAwMCBEUjI6IDAwMDAwMDAwMDAwMDAwMDANClsgICAgMC42 MzQ1NTBdIERSMzogMDAwMDAwMDAwMDAwMDAwMCBEUjY6IDAwMDAwMDAwZmZmZjBmZjAgRFI3OiAw MDAwMDAwMDAwMDAwNDAwDQpbICAgIDAuNjM0NTU3XSBQcm9jZXNzIGluaXQgKHBpZDogNjAsIHRo cmVhZGluZm8gZmZmZjg4MDAwZjY0NDAwMCwgdGFzayBmZmZmODgwMDBmNjQyN2MwKQ0KWyAgICAw LjYzNDU2NF0gU3RhY2s6DQpbICAgIDAuNjM0NTY3XSAgZmZmZjg4MDAwZjY0NTQ5OCBmZmZmZmZm ZjgxMDM5YmYyIGZmZmY4ODAwMGY2NDU1ODggZmZmZmZmZmY4MTEwYjAwMg0KWyAgICAwLjYzNDU3 N10gIDAwMDAwMDAwMDAwMDAwMTEgMDAwMDAwMDAwMDAwMDEwMCAwMDAwMDAwMDAwMDAwMDAwIDAw MDAwMDAwMDAwMDAxZmYNClsgICAgMC42MzQ1ODZdICAwMDAwN2ZmZmZmZmZlZmZmIDAwMDA3ZmZm ZmZmZmYwMDAgMDAwMDdmZmZmZmZmZWZmZiBmZmZmODgwMDBmNjY1N2Y4DQpbICAgIDAuNjM0NTk2 XSBDYWxsIFRyYWNlOg0KWyAgICAwLjYzNDYwMl0gIFs8ZmZmZmZmZmY4MTAzOWJmMj5dIHBhcmF2 aXJ0X2VudGVyX2xhenlfbW11KzB4MjIvMHgzMA0KWyAgICAwLjYzNDYwOV0gIFs8ZmZmZmZmZmY4 MTEwYjAwMj5dIHVubWFwX3BhZ2VfcmFuZ2UrMHgyZDIvMHg3MzANClsgICAgMC42MzQ2MTddICBb PGZmZmZmZmZmODEwZjUwOTg+XSA/IHJlbGVhc2VfcGFnZXMrMHgxNDgvMHgxYzANClsgICAgMC42 MzQ2MjRdICBbPGZmZmZmZmZmODExMGI0YzM+XSB1bm1hcF9zaW5nbGVfdm1hKzB4NjMvMHhiMA0K WyAgICAwLjYzNDYzMV0gIFs8ZmZmZmZmZmY4MTBmNTJiMD5dID8gcHV0X3BhZ2VzX2xpc3QrMHgz MC8weDMwDQpbICAgIDAuNjM0NjM3XSAgWzxmZmZmZmZmZjgxMTBiY2RlPl0gdW5tYXBfdm1hcysw eDVlLzB4YjANClsgICAgMC42MzQ2NDRdICBbPGZmZmZmZmZmODExMTMxYzc+XSBleGl0X21tYXAr MHg5Ny8weDE0MA0KWyAgICAwLjYzNDY1MF0gIFs8ZmZmZmZmZmY4MTA0NDVjMz5dIG1tcHV0KzB4 NzMvMHhmMA0KWyAgICAwLjYzNDY1N10gIFs8ZmZmZmZmZmY4MTA0OWFmZD5dIGV4aXRfbW0rMHhm ZC8weDEyMA0KWyAgICAwLjYzNDY2NF0gIFs8ZmZmZmZmZmY4MTAwOWRjOT5dID8geGVuX2lycV9l bmFibGVfZGlyZWN0X3JlbG9jKzB4NC8weDQNClsgICAgMC42MzQ2NzJdICBbPGZmZmZmZmZmODEw NGIyNDQ+XSBkb19leGl0KzB4MTY0LzB4OGEwDQpbICAgIDAuNjM0NjgwXSAgWzxmZmZmZmZmZjgx NDU4YzQyPl0gPyBfcmF3X3NwaW5fdW5sb2NrX2lycXJlc3RvcmUrMHgxMi8weDIwDQpbICAgIDAu NjM0Njg3XSAgWzxmZmZmZmZmZjgxMDQ5MGZhPl0gPyBrbXNnX2R1bXArMHg1YS8weDEwMA0KWyAg ICAwLjYzNDY5NF0gIFs8ZmZmZmZmZmY4MTQ1OWViOT5dIG9vcHNfZW5kKzB4OTkvMHhlMA0KWyAg ICAwLjYzNDcwMF0gIFs8ZmZmZmZmZmY4MTQ0ZmM5Zj5dIG5vX2NvbnRleHQrMHgyNGUvMHgyNzkN ClsgICAgMC42MzQ3MDddICBbPGZmZmZmZmZmODEwMDczMzk+XSA/IHhlbl9wbWRfdmFsKzB4OS8w eDEwDQpbICAgIDAuNjM0NzEzXSAgWzxmZmZmZmZmZjgxNDRmZTg0Pl0gX19iYWRfYXJlYV9ub3Nl bWFwaG9yZSsweDFiYS8weDFkOQ0KWyAgICAwLjYzNDcyMV0gIFs8ZmZmZmZmZmY4MTQ1OTE2OT5d ID8gcmVzdG9yZV9hcmdzKzB4MzAvMHgzMA0KWyAgICAwLjYzNDcyN10gIFs8ZmZmZmZmZmY4MTQ0 ZmViMT5dIGJhZF9hcmVhX25vc2VtYXBob3JlKzB4ZS8weDEwDQpbICAgIDAuNjM0NzM0XSAgWzxm ZmZmZmZmZjgxNDVjNjliPl0gZG9fcGFnZV9mYXVsdCsweDMyYi8weDRmMA0KWyAgICAwLjYzNDc0 MV0gIFs8ZmZmZmZmZmY4MTAwNzI4YT5dID8gcHRlX21mbl90b19wZm4rMHg2YS8weDEwMA0KWyAg ICAwLjYzNDc0OF0gIFs8ZmZmZmZmZmY4MTBmMWNmMz5dID8gX19hbGxvY19wYWdlc19ub2RlbWFz aysweDE5My8weDg1MA0KWyAgICAwLjYzNDc1Nl0gIFs8ZmZmZmZmZmY4MTE0OTk3YT5dID8gX19k X2xvb2t1cCsweDdhLzB4MTYwDQpbICAgIDAuNjM0NzYzXSAgWzxmZmZmZmZmZjgxNDU5M2E1Pl0g cGFnZV9mYXVsdCsweDI1LzB4MzANClsgICAgMC42MzQ3NjldICBbPGZmZmZmZmZmODExMDljNjQ+ XSA/IF9fdGxiX3JlbW92ZV9wYWdlKzB4ODQvMHhiMA0KWyAgICAwLjYzNDc3Nl0gIFs8ZmZmZmZm ZmY4MTEwOWM1Yz5dID8gX190bGJfcmVtb3ZlX3BhZ2UrMHg3Yy8weGIwDQpbICAgIDAuNjM0Nzgy XSAgWzxmZmZmZmZmZjgxMTBiMWQ4Pl0gdW5tYXBfcGFnZV9yYW5nZSsweDRhOC8weDczMA0KWyAg ICAwLjYzNDc5MF0gIFs8ZmZmZmZmZmY4MTEwYjRjMz5dIHVubWFwX3NpbmdsZV92bWErMHg2My8w eGIwDQpbICAgIDAuNjM0Nzk3XSAgWzxmZmZmZmZmZjgxMGY1MmIwPl0gPyBwdXRfcGFnZXNfbGlz dCsweDMwLzB4MzANClsgICAgMC42MzQ4MDNdICBbPGZmZmZmZmZmODExMGJjZGU+XSB1bm1hcF92 bWFzKzB4NWUvMHhiMA0KWyAgICAwLjYzNDgwOV0gIFs8ZmZmZmZmZmY4MTExMzFjNz5dIGV4aXRf bW1hcCsweDk3LzB4MTQwDQpbICAgIDAuNjM0ODE2XSAgWzxmZmZmZmZmZjgxMDQ0NWMzPl0gbW1w dXQrMHg3My8weGYwDQpbICAgIDAuNjM0ODIyXSAgWzxmZmZmZmZmZjgxMTM5NmFkPl0gZmx1c2hf b2xkX2V4ZWMrMHgzZWQvMHg3MjANClsgICAgMC42MzQ4MzBdICBbPGZmZmZmZmZmODExN2Y4YmU+ XSBsb2FkX2VsZl9iaW5hcnkrMHgzMWUvMHgxODQwDQpbICAgIDAuNjM0ODM4XSAgWzxmZmZmZmZm ZjgxMTdmNWEwPl0gPyBsb2FkX2VsZl9saWJyYXJ5KzB4MjAwLzB4MjAwDQpbICAgIDAuNjM0ODQ1 XSAgWzxmZmZmZmZmZjgxMTM4ZGM3Pl0gc2VhcmNoX2JpbmFyeV9oYW5kbGVyKzB4ZTcvMHgyZjAN ClsgICAgMC42MzQ4NTJdICBbPGZmZmZmZmZmODExM2EyOTM+XSBkb19leGVjdmVfY29tbW9uLmlz cmEuMzIrMHgzZTMvMHg0YjANClsgICAgMC42MzQ4NThdICBbPGZmZmZmZmZmODExM2EzNzY+XSBk b19leGVjdmUrMHgxNi8weDIwDQpbICAgIDAuNjM0ODY0XSAgWzxmZmZmZmZmZjgxMDFhZDUyPl0g c3lzX2V4ZWN2ZSsweDQyLzB4NzANClsgICAgMC42MzQ4NzFdICBbPGZmZmZmZmZmODE0NjBjM2M+ XSBzdHViX2V4ZWN2ZSsweDZjLzB4YzANClsgICAgMC42MzQ4NzZdIENvZGU6IGZhIDQ0IDg5IGU2 IDQ4IGM3IGM3IGE4IGUzIDc1IDgxIDMxIGMwIGU4IDBiIDBmIDAwIDAwIDQ4IDgzIGM0IDE4IDVi IDQxIDVjIDQxIDVkIDQxIDVlIDQxIDVmIDVkIGMzIDU1IDQ4IDg5IGU1IDBmIDBiIDU1IDQ4IDg5 IGU1IDwwZj4gMGIgNTUgNDggODkgZTUgMGYgMGIgNTUgNDggODkgZTUgNDEgNTUgNDEgNTQgNTMg MzEgZGIgNDggODUgDQpbICAgIDAuNjM0OTMyXSBSSVAgIFs8ZmZmZmZmZmY4MTQ0ZjNiNz5dIGVu dGVyX2xhenkucGFydC40KzB4NC8weDYNClsgICAgMC42MzQ5MzhdICBSU1AgPGZmZmY4ODAwMGY2 NDU0ODg+DQpbICAgIDAuNjM0OTQxXSAtLS1bIGVuZCB0cmFjZSA1NTVlODQ1NmNmZGQzOTlhIF0t LS0NClsgICAgMC42MzQ5NDRdIEZpeGluZyByZWN1cnNpdmUgZmF1bHQgYnV0IHJlYm9vdCBpcyBu ZWVkZWQhDQo= --bcaec517a674432cc304ce37f3ed Content-Type: application/octet-stream; name=config-pvops Content-Disposition: attachment; filename=config-pvops Content-Transfer-Encoding: base64 X-Attachment-Id: f_h9e6jk3w1 IwojIEF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZpbGU7IERPIE5PVCBFRElULgojIExpbnV4L3g4 Nl82NCAzLjQuMTggS2VybmVsIENvbmZpZ3VyYXRpb24KIwpDT05GSUdfNjRCSVQ9eQojIENPTkZJ R19YODZfMzIgaXMgbm90IHNldApDT05GSUdfWDg2XzY0PXkKQ09ORklHX1g4Nj15CkNPTkZJR19J TlNUUlVDVElPTl9ERUNPREVSPXkKQ09ORklHX09VVFBVVF9GT1JNQVQ9ImVsZjY0LXg4Ni02NCIK Q09ORklHX0FSQ0hfREVGQ09ORklHPSJhcmNoL3g4Ni9jb25maWdzL3g4Nl82NF9kZWZjb25maWci CkNPTkZJR19HRU5FUklDX0NNT1NfVVBEQVRFPXkKQ09ORklHX0NMT0NLU09VUkNFX1dBVENIRE9H PXkKQ09ORklHX0dFTkVSSUNfQ0xPQ0tFVkVOVFM9eQpDT05GSUdfQVJDSF9DTE9DS1NPVVJDRV9E QVRBPXkKQ09ORklHX0dFTkVSSUNfQ0xPQ0tFVkVOVFNfQlJPQURDQVNUPXkKQ09ORklHX0xPQ0tE RVBfU1VQUE9SVD15CkNPTkZJR19TVEFDS1RSQUNFX1NVUFBPUlQ9eQpDT05GSUdfSEFWRV9MQVRF TkNZVE9QX1NVUFBPUlQ9eQpDT05GSUdfTU1VPXkKQ09ORklHX05FRURfRE1BX01BUF9TVEFURT15 CkNPTkZJR19ORUVEX1NHX0RNQV9MRU5HVEg9eQpDT05GSUdfR0VORVJJQ19JU0FfRE1BPXkKQ09O RklHX0dFTkVSSUNfQlVHPXkKQ09ORklHX0dFTkVSSUNfQlVHX1JFTEFUSVZFX1BPSU5URVJTPXkK Q09ORklHX0dFTkVSSUNfSFdFSUdIVD15CkNPTkZJR19HRU5FUklDX0dQSU89eQpDT05GSUdfQVJD SF9NQVlfSEFWRV9QQ19GREM9eQojIENPTkZJR19SV1NFTV9HRU5FUklDX1NQSU5MT0NLIGlzIG5v dCBzZXQKQ09ORklHX1JXU0VNX1hDSEdBRERfQUxHT1JJVEhNPXkKQ09ORklHX0FSQ0hfSEFTX0NQ VV9JRExFX1dBSVQ9eQpDT05GSUdfR0VORVJJQ19DQUxJQlJBVEVfREVMQVk9eQpDT05GSUdfR0VO RVJJQ19USU1FX1ZTWVNDQUxMPXkKQ09ORklHX0FSQ0hfSEFTX0NQVV9SRUxBWD15CkNPTkZJR19B UkNIX0hBU19ERUZBVUxUX0lETEU9eQpDT05GSUdfQVJDSF9IQVNfQ0FDSEVfTElORV9TSVpFPXkK Q09ORklHX0FSQ0hfSEFTX0NQVV9BVVRPUFJPQkU9eQpDT05GSUdfSEFWRV9TRVRVUF9QRVJfQ1BV X0FSRUE9eQpDT05GSUdfTkVFRF9QRVJfQ1BVX0VNQkVEX0ZJUlNUX0NIVU5LPXkKQ09ORklHX05F RURfUEVSX0NQVV9QQUdFX0ZJUlNUX0NIVU5LPXkKQ09ORklHX0FSQ0hfSElCRVJOQVRJT05fUE9T U0lCTEU9eQpDT05GSUdfQVJDSF9TVVNQRU5EX1BPU1NJQkxFPXkKQ09ORklHX1pPTkVfRE1BMzI9 eQpDT05GSUdfQVVESVRfQVJDSD15CkNPTkZJR19BUkNIX1NVUFBPUlRTX09QVElNSVpFRF9JTkxJ TklORz15CkNPTkZJR19BUkNIX1NVUFBPUlRTX0RFQlVHX1BBR0VBTExPQz15CkNPTkZJR19IQVZF X0lOVEVMX1RYVD15CkNPTkZJR19YODZfNjRfU01QPXkKQ09ORklHX1g4Nl9IVD15CkNPTkZJR19B UkNIX0hXRUlHSFRfQ0ZMQUdTPSItZmNhbGwtc2F2ZWQtcmRpIC1mY2FsbC1zYXZlZC1yc2kgLWZj YWxsLXNhdmVkLXJkeCAtZmNhbGwtc2F2ZWQtcmN4IC1mY2FsbC1zYXZlZC1yOCAtZmNhbGwtc2F2 ZWQtcjkgLWZjYWxsLXNhdmVkLXIxMCAtZmNhbGwtc2F2ZWQtcjExIgojIENPTkZJR19LVElNRV9T Q0FMQVIgaXMgbm90IHNldApDT05GSUdfQVJDSF9DUFVfUFJPQkVfUkVMRUFTRT15CkNPTkZJR19E RUZDT05GSUdfTElTVD0iL2xpYi9tb2R1bGVzLyRVTkFNRV9SRUxFQVNFLy5jb25maWciCkNPTkZJ R19IQVZFX0lSUV9XT1JLPXkKQ09ORklHX0lSUV9XT1JLPXkKCiMKIyBHZW5lcmFsIHNldHVwCiMK Q09ORklHX0VYUEVSSU1FTlRBTD15CkNPTkZJR19JTklUX0VOVl9BUkdfTElNSVQ9MzIKQ09ORklH X0NST1NTX0NPTVBJTEU9IiIKQ09ORklHX0xPQ0FMVkVSU0lPTj0iLTEucHZvcHMucXViZXMueDg2 XzY0IgojIENPTkZJR19MT0NBTFZFUlNJT05fQVVUTyBpcyBub3Qgc2V0CkNPTkZJR19IQVZFX0tF Uk5FTF9HWklQPXkKQ09ORklHX0hBVkVfS0VSTkVMX0JaSVAyPXkKQ09ORklHX0hBVkVfS0VSTkVM X0xaTUE9eQpDT05GSUdfSEFWRV9LRVJORUxfWFo9eQpDT05GSUdfSEFWRV9LRVJORUxfTFpPPXkK Q09ORklHX0tFUk5FTF9HWklQPXkKIyBDT05GSUdfS0VSTkVMX0JaSVAyIGlzIG5vdCBzZXQKIyBD T05GSUdfS0VSTkVMX0xaTUEgaXMgbm90IHNldAojIENPTkZJR19LRVJORUxfWFogaXMgbm90IHNl dAojIENPTkZJR19LRVJORUxfTFpPIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfSE9TVE5BTUU9 Iihub25lKSIKQ09ORklHX1NXQVA9eQpDT05GSUdfU1lTVklQQz15CkNPTkZJR19TWVNWSVBDX1NZ U0NUTD15CkNPTkZJR19QT1NJWF9NUVVFVUU9eQpDT05GSUdfUE9TSVhfTVFVRVVFX1NZU0NUTD15 CkNPTkZJR19CU0RfUFJPQ0VTU19BQ0NUPXkKQ09ORklHX0JTRF9QUk9DRVNTX0FDQ1RfVjM9eQoj IENPTkZJR19GSEFORExFIGlzIG5vdCBzZXQKQ09ORklHX1RBU0tTVEFUUz15CkNPTkZJR19UQVNL X0RFTEFZX0FDQ1Q9eQpDT05GSUdfVEFTS19YQUNDVD15CkNPTkZJR19UQVNLX0lPX0FDQ09VTlRJ Tkc9eQpDT05GSUdfQVVESVQ9eQpDT05GSUdfQVVESVRTWVNDQUxMPXkKQ09ORklHX0FVRElUX1dB VENIPXkKQ09ORklHX0FVRElUX1RSRUU9eQpDT05GSUdfQVVESVRfTE9HSU5VSURfSU1NVVRBQkxF PXkKQ09ORklHX0hBVkVfR0VORVJJQ19IQVJESVJRUz15CgojCiMgSVJRIHN1YnN5c3RlbQojCkNP TkZJR19HRU5FUklDX0hBUkRJUlFTPXkKQ09ORklHX0dFTkVSSUNfSVJRX1BST0JFPXkKQ09ORklH X0dFTkVSSUNfSVJRX1NIT1c9eQpDT05GSUdfR0VORVJJQ19QRU5ESU5HX0lSUT15CkNPTkZJR19H RU5FUklDX0lSUV9DSElQPXkKQ09ORklHX0lSUV9GT1JDRURfVEhSRUFESU5HPXkKQ09ORklHX1NQ QVJTRV9JUlE9eQoKIwojIFJDVSBTdWJzeXN0ZW0KIwpDT05GSUdfVFJFRV9SQ1U9eQojIENPTkZJ R19QUkVFTVBUX1JDVSBpcyBub3Qgc2V0CkNPTkZJR19SQ1VfRkFOT1VUPTY0CiMgQ09ORklHX1JD VV9GQU5PVVRfRVhBQ1QgaXMgbm90IHNldApDT05GSUdfUkNVX0ZBU1RfTk9fSFo9eQojIENPTkZJ R19UUkVFX1JDVV9UUkFDRSBpcyBub3Qgc2V0CkNPTkZJR19JS0NPTkZJRz15CkNPTkZJR19JS0NP TkZJR19QUk9DPXkKQ09ORklHX0xPR19CVUZfU0hJRlQ9MTgKQ09ORklHX0hBVkVfVU5TVEFCTEVf U0NIRURfQ0xPQ0s9eQpDT05GSUdfQ0dST1VQUz15CiMgQ09ORklHX0NHUk9VUF9ERUJVRyBpcyBu b3Qgc2V0CkNPTkZJR19DR1JPVVBfRlJFRVpFUj15CkNPTkZJR19DR1JPVVBfREVWSUNFPXkKQ09O RklHX0NQVVNFVFM9eQpDT05GSUdfUFJPQ19QSURfQ1BVU0VUPXkKQ09ORklHX0NHUk9VUF9DUFVB Q0NUPXkKQ09ORklHX1JFU09VUkNFX0NPVU5URVJTPXkKIyBDT05GSUdfQ0dST1VQX01FTV9SRVNf Q1RMUiBpcyBub3Qgc2V0CiMgQ09ORklHX0NHUk9VUF9QRVJGIGlzIG5vdCBzZXQKQ09ORklHX0NH Uk9VUF9TQ0hFRD15CkNPTkZJR19GQUlSX0dST1VQX1NDSEVEPXkKQ09ORklHX0NGU19CQU5EV0lE VEg9eQpDT05GSUdfUlRfR1JPVVBfU0NIRUQ9eQpDT05GSUdfQkxLX0NHUk9VUD15CiMgQ09ORklH X0RFQlVHX0JMS19DR1JPVVAgaXMgbm90IHNldAojIENPTkZJR19DSEVDS1BPSU5UX1JFU1RPUkUg aXMgbm90IHNldApDT05GSUdfTkFNRVNQQUNFUz15CkNPTkZJR19VVFNfTlM9eQpDT05GSUdfSVBD X05TPXkKQ09ORklHX1VTRVJfTlM9eQpDT05GSUdfUElEX05TPXkKQ09ORklHX05FVF9OUz15CiMg Q09ORklHX1NDSEVEX0FVVE9HUk9VUCBpcyBub3Qgc2V0CiMgQ09ORklHX1NZU0ZTX0RFUFJFQ0FU RUQgaXMgbm90IHNldApDT05GSUdfUkVMQVk9eQpDT05GSUdfQkxLX0RFVl9JTklUUkQ9eQpDT05G SUdfSU5JVFJBTUZTX1NPVVJDRT0iIgpDT05GSUdfUkRfR1pJUD15CkNPTkZJR19SRF9CWklQMj15 CkNPTkZJR19SRF9MWk1BPXkKQ09ORklHX1JEX1haPXkKQ09ORklHX1JEX0xaTz15CiMgQ09ORklH X0NDX09QVElNSVpFX0ZPUl9TSVpFIGlzIG5vdCBzZXQKQ09ORklHX1NZU0NUTD15CkNPTkZJR19B Tk9OX0lOT0RFUz15CiMgQ09ORklHX0VYUEVSVCBpcyBub3Qgc2V0CkNPTkZJR19VSUQxNj15CiMg Q09ORklHX1NZU0NUTF9TWVNDQUxMIGlzIG5vdCBzZXQKQ09ORklHX0tBTExTWU1TPXkKQ09ORklH X0tBTExTWU1TX0FMTD15CkNPTkZJR19IT1RQTFVHPXkKQ09ORklHX1BSSU5USz15CkNPTkZJR19C VUc9eQpDT05GSUdfRUxGX0NPUkU9eQpDT05GSUdfUENTUEtSX1BMQVRGT1JNPXkKQ09ORklHX0hB VkVfUENTUEtSX1BMQVRGT1JNPXkKQ09ORklHX0JBU0VfRlVMTD15CkNPTkZJR19GVVRFWD15CkNP TkZJR19FUE9MTD15CkNPTkZJR19TSUdOQUxGRD15CkNPTkZJR19USU1FUkZEPXkKQ09ORklHX0VW RU5URkQ9eQpDT05GSUdfU0hNRU09eQpDT05GSUdfQUlPPXkKIyBDT05GSUdfRU1CRURERUQgaXMg bm90IHNldApDT05GSUdfSEFWRV9QRVJGX0VWRU5UUz15CgojCiMgS2VybmVsIFBlcmZvcm1hbmNl IEV2ZW50cyBBbmQgQ291bnRlcnMKIwpDT05GSUdfUEVSRl9FVkVOVFM9eQojIENPTkZJR19QRVJG X0NPVU5URVJTIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfUEVSRl9VU0VfVk1BTExPQyBpcyBu b3Qgc2V0CkNPTkZJR19WTV9FVkVOVF9DT1VOVEVSUz15CkNPTkZJR19QQ0lfUVVJUktTPXkKIyBD T05GSUdfQ09NUEFUX0JSSyBpcyBub3Qgc2V0CkNPTkZJR19TTEFCPXkKIyBDT05GSUdfU0xVQiBp cyBub3Qgc2V0CkNPTkZJR19QUk9GSUxJTkc9eQpDT05GSUdfVFJBQ0VQT0lOVFM9eQpDT05GSUdf T1BST0ZJTEU9bQojIENPTkZJR19PUFJPRklMRV9FVkVOVF9NVUxUSVBMRVggaXMgbm90IHNldApD T05GSUdfSEFWRV9PUFJPRklMRT15CkNPTkZJR19PUFJPRklMRV9OTUlfVElNRVI9eQpDT05GSUdf S1BST0JFUz15CiMgQ09ORklHX0pVTVBfTEFCRUwgaXMgbm90IHNldApDT05GSUdfT1BUUFJPQkVT PXkKQ09ORklHX0hBVkVfRUZGSUNJRU5UX1VOQUxJR05FRF9BQ0NFU1M9eQpDT05GSUdfS1JFVFBS T0JFUz15CkNPTkZJR19IQVZFX0lPUkVNQVBfUFJPVD15CkNPTkZJR19IQVZFX0tQUk9CRVM9eQpD T05GSUdfSEFWRV9LUkVUUFJPQkVTPXkKQ09ORklHX0hBVkVfT1BUUFJPQkVTPXkKQ09ORklHX0hB VkVfQVJDSF9UUkFDRUhPT0s9eQpDT05GSUdfSEFWRV9ETUFfQVRUUlM9eQpDT05GSUdfVVNFX0dF TkVSSUNfU01QX0hFTFBFUlM9eQpDT05GSUdfSEFWRV9SRUdTX0FORF9TVEFDS19BQ0NFU1NfQVBJ PXkKQ09ORklHX0hBVkVfRE1BX0FQSV9ERUJVRz15CkNPTkZJR19IQVZFX0hXX0JSRUFLUE9JTlQ9 eQpDT05GSUdfSEFWRV9NSVhFRF9CUkVBS1BPSU5UU19SRUdTPXkKQ09ORklHX0hBVkVfVVNFUl9S RVRVUk5fTk9USUZJRVI9eQpDT05GSUdfSEFWRV9QRVJGX0VWRU5UU19OTUk9eQpDT05GSUdfSEFW RV9BUkNIX0pVTVBfTEFCRUw9eQpDT05GSUdfQVJDSF9IQVZFX05NSV9TQUZFX0NNUFhDSEc9eQpD T05GSUdfSEFWRV9DTVBYQ0hHX0xPQ0FMPXkKQ09ORklHX0hBVkVfQ01QWENIR19ET1VCTEU9eQpD T05GSUdfQVJDSF9XQU5UX09MRF9DT01QQVRfSVBDPXkKCiMKIyBHQ09WLWJhc2VkIGtlcm5lbCBw cm9maWxpbmcKIwojIENPTkZJR19HQ09WX0tFUk5FTCBpcyBub3Qgc2V0CiMgQ09ORklHX0hBVkVf R0VORVJJQ19ETUFfQ09IRVJFTlQgaXMgbm90IHNldApDT05GSUdfU0xBQklORk89eQpDT05GSUdf UlRfTVVURVhFUz15CkNPTkZJR19CQVNFX1NNQUxMPTAKQ09ORklHX01PRFVMRVM9eQpDT05GSUdf TU9EVUxFX0ZPUkNFX0xPQUQ9eQpDT05GSUdfTU9EVUxFX1VOTE9BRD15CkNPTkZJR19NT0RVTEVf Rk9SQ0VfVU5MT0FEPXkKQ09ORklHX01PRFZFUlNJT05TPXkKQ09ORklHX01PRFVMRV9TUkNWRVJT SU9OX0FMTD15CkNPTkZJR19TVE9QX01BQ0hJTkU9eQpDT05GSUdfQkxPQ0s9eQpDT05GSUdfQkxL X0RFVl9CU0c9eQpDT05GSUdfQkxLX0RFVl9CU0dMSUI9eQpDT05GSUdfQkxLX0RFVl9JTlRFR1JJ VFk9eQojIENPTkZJR19CTEtfREVWX1RIUk9UVExJTkcgaXMgbm90IHNldAoKIwojIFBhcnRpdGlv biBUeXBlcwojCkNPTkZJR19QQVJUSVRJT05fQURWQU5DRUQ9eQojIENPTkZJR19BQ09STl9QQVJU SVRJT04gaXMgbm90IHNldApDT05GSUdfT1NGX1BBUlRJVElPTj15CiMgQ09ORklHX0FNSUdBX1BB UlRJVElPTiBpcyBub3Qgc2V0CkNPTkZJR19BVEFSSV9QQVJUSVRJT049eQpDT05GSUdfTUFDX1BB UlRJVElPTj15CkNPTkZJR19NU0RPU19QQVJUSVRJT049eQpDT05GSUdfQlNEX0RJU0tMQUJFTD15 CiMgQ09ORklHX01JTklYX1NVQlBBUlRJVElPTiBpcyBub3Qgc2V0CkNPTkZJR19TT0xBUklTX1g4 Nl9QQVJUSVRJT049eQpDT05GSUdfVU5JWFdBUkVfRElTS0xBQkVMPXkKQ09ORklHX0xETV9QQVJU SVRJT049eQojIENPTkZJR19MRE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfU0dJX1BBUlRJVElP Tj15CkNPTkZJR19VTFRSSVhfUEFSVElUSU9OPXkKQ09ORklHX1NVTl9QQVJUSVRJT049eQpDT05G SUdfS0FSTUFfUEFSVElUSU9OPXkKQ09ORklHX0VGSV9QQVJUSVRJT049eQpDT05GSUdfU1lTVjY4 X1BBUlRJVElPTj15CkNPTkZJR19CTE9DS19DT01QQVQ9eQoKIwojIElPIFNjaGVkdWxlcnMKIwpD T05GSUdfSU9TQ0hFRF9OT09QPXkKQ09ORklHX0lPU0NIRURfREVBRExJTkU9eQpDT05GSUdfSU9T Q0hFRF9DRlE9eQpDT05GSUdfQ0ZRX0dST1VQX0lPU0NIRUQ9eQojIENPTkZJR19ERUZBVUxUX0RF QURMSU5FIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfQ0ZRPXkKIyBDT05GSUdfREVGQVVMVF9O T09QIGlzIG5vdCBzZXQKQ09ORklHX0RFRkFVTFRfSU9TQ0hFRD0iY2ZxIgpDT05GSUdfUEFEQVRB PXkKIyBDT05GSUdfSU5MSU5FX1NQSU5fVFJZTE9DSyBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElO RV9TUElOX1RSWUxPQ0tfQkggaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfU1BJTl9MT0NLIGlz IG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fTE9DS19CSCBpcyBub3Qgc2V0CiMgQ09ORklH X0lOTElORV9TUElOX0xPQ0tfSVJRIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fTE9D S19JUlFTQVZFIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1NQSU5fVU5MT0NLX0JIIGlzIG5v dCBzZXQKQ09ORklHX0lOTElORV9TUElOX1VOTE9DS19JUlE9eQojIENPTkZJR19JTkxJTkVfU1BJ Tl9VTkxPQ0tfSVJRUkVTVE9SRSBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9SRUFEX1RSWUxP Q0sgaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfUkVBRF9MT0NLIGlzIG5vdCBzZXQKIyBDT05G SUdfSU5MSU5FX1JFQURfTE9DS19CSCBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9SRUFEX0xP Q0tfSVJRIGlzIG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1JFQURfTE9DS19JUlFTQVZFIGlzIG5v dCBzZXQKQ09ORklHX0lOTElORV9SRUFEX1VOTE9DSz15CiMgQ09ORklHX0lOTElORV9SRUFEX1VO TE9DS19CSCBpcyBub3Qgc2V0CkNPTkZJR19JTkxJTkVfUkVBRF9VTkxPQ0tfSVJRPXkKIyBDT05G SUdfSU5MSU5FX1JFQURfVU5MT0NLX0lSUVJFU1RPUkUgaXMgbm90IHNldAojIENPTkZJR19JTkxJ TkVfV1JJVEVfVFJZTE9DSyBpcyBub3Qgc2V0CiMgQ09ORklHX0lOTElORV9XUklURV9MT0NLIGlz IG5vdCBzZXQKIyBDT05GSUdfSU5MSU5FX1dSSVRFX0xPQ0tfQkggaXMgbm90IHNldAojIENPTkZJ R19JTkxJTkVfV1JJVEVfTE9DS19JUlEgaXMgbm90IHNldAojIENPTkZJR19JTkxJTkVfV1JJVEVf TE9DS19JUlFTQVZFIGlzIG5vdCBzZXQKQ09ORklHX0lOTElORV9XUklURV9VTkxPQ0s9eQojIENP TkZJR19JTkxJTkVfV1JJVEVfVU5MT0NLX0JIIGlzIG5vdCBzZXQKQ09ORklHX0lOTElORV9XUklU RV9VTkxPQ0tfSVJRPXkKIyBDT05GSUdfSU5MSU5FX1dSSVRFX1VOTE9DS19JUlFSRVNUT1JFIGlz IG5vdCBzZXQKQ09ORklHX01VVEVYX1NQSU5fT05fT1dORVI9eQpDT05GSUdfRlJFRVpFUj15Cgoj CiMgUHJvY2Vzc29yIHR5cGUgYW5kIGZlYXR1cmVzCiMKQ09ORklHX1pPTkVfRE1BPXkKQ09ORklH X1RJQ0tfT05FU0hPVD15CkNPTkZJR19OT19IWj15CkNPTkZJR19ISUdIX1JFU19USU1FUlM9eQpD T05GSUdfR0VORVJJQ19DTE9DS0VWRU5UU19CVUlMRD15CkNPTkZJR19HRU5FUklDX0NMT0NLRVZF TlRTX01JTl9BREpVU1Q9eQpDT05GSUdfU01QPXkKQ09ORklHX1g4Nl9YMkFQSUM9eQpDT05GSUdf WDg2X01QUEFSU0U9eQpDT05GSUdfWDg2X0VYVEVOREVEX1BMQVRGT1JNPXkKIyBDT05GSUdfWDg2 X1ZTTVAgaXMgbm90IHNldApDT05GSUdfWDg2X1NVUFBPUlRTX01FTU9SWV9GQUlMVVJFPXkKQ09O RklHX1NDSEVEX09NSVRfRlJBTUVfUE9JTlRFUj15CkNPTkZJR19QQVJBVklSVF9HVUVTVD15CiMg Q09ORklHX1BBUkFWSVJUX1RJTUVfQUNDT1VOVElORyBpcyBub3Qgc2V0CkNPTkZJR19YRU49eQpD T05GSUdfWEVOX0RPTTA9eQpDT05GSUdfWEVOX1BSSVZJTEVHRURfR1VFU1Q9eQpDT05GSUdfWEVO X1BWSFZNPXkKQ09ORklHX1hFTl9NQVhfRE9NQUlOX01FTU9SWT01MDAKQ09ORklHX1hFTl9TQVZF X1JFU1RPUkU9eQojIENPTkZJR19YRU5fREVCVUdfRlMgaXMgbm90IHNldAojIENPTkZJR19LVk1f Q0xPQ0sgaXMgbm90IHNldAojIENPTkZJR19LVk1fR1VFU1QgaXMgbm90IHNldApDT05GSUdfUEFS QVZJUlQ9eQojIENPTkZJR19QQVJBVklSVF9TUElOTE9DS1MgaXMgbm90IHNldApDT05GSUdfUEFS QVZJUlRfQ0xPQ0s9eQojIENPTkZJR19QQVJBVklSVF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19O T19CT09UTUVNPXkKIyBDT05GSUdfTUVNVEVTVCBpcyBub3Qgc2V0CiMgQ09ORklHX01LOCBpcyBu b3Qgc2V0CiMgQ09ORklHX01QU0MgaXMgbm90IHNldAojIENPTkZJR19NQ09SRTIgaXMgbm90IHNl dAojIENPTkZJR19NQVRPTSBpcyBub3Qgc2V0CkNPTkZJR19HRU5FUklDX0NQVT15CkNPTkZJR19Y ODZfSU5URVJOT0RFX0NBQ0hFX1NISUZUPTYKQ09ORklHX1g4Nl9DTVBYQ0hHPXkKQ09ORklHX1g4 Nl9MMV9DQUNIRV9TSElGVD02CkNPTkZJR19YODZfWEFERD15CkNPTkZJR19YODZfV1BfV09SS1Nf T0s9eQpDT05GSUdfWDg2X1RTQz15CkNPTkZJR19YODZfQ01QWENIRzY0PXkKQ09ORklHX1g4Nl9D TU9WPXkKQ09ORklHX1g4Nl9NSU5JTVVNX0NQVV9GQU1JTFk9NjQKQ09ORklHX1g4Nl9ERUJVR0NU TE1TUj15CkNPTkZJR19DUFVfU1VQX0lOVEVMPXkKQ09ORklHX0NQVV9TVVBfQU1EPXkKQ09ORklH X0NQVV9TVVBfQ0VOVEFVUj15CkNPTkZJR19IUEVUX1RJTUVSPXkKQ09ORklHX0hQRVRfRU1VTEFU RV9SVEM9eQpDT05GSUdfRE1JPXkKQ09ORklHX0dBUlRfSU9NTVU9eQojIENPTkZJR19DQUxHQVJZ X0lPTU1VIGlzIG5vdCBzZXQKQ09ORklHX1NXSU9UTEI9eQpDT05GSUdfSU9NTVVfSEVMUEVSPXkK IyBDT05GSUdfTUFYU01QIGlzIG5vdCBzZXQKQ09ORklHX05SX0NQVVM9NTEyCiMgQ09ORklHX1ND SEVEX1NNVCBpcyBub3Qgc2V0CkNPTkZJR19TQ0hFRF9NQz15CiMgQ09ORklHX0lSUV9USU1FX0FD Q09VTlRJTkcgaXMgbm90IHNldAojIENPTkZJR19QUkVFTVBUX05PTkUgaXMgbm90IHNldApDT05G SUdfUFJFRU1QVF9WT0xVTlRBUlk9eQojIENPTkZJR19QUkVFTVBUIGlzIG5vdCBzZXQKQ09ORklH X1g4Nl9MT0NBTF9BUElDPXkKQ09ORklHX1g4Nl9JT19BUElDPXkKIyBDT05GSUdfWDg2X1JFUk9V VEVfRk9SX0JST0tFTl9CT09UX0lSUVMgaXMgbm90IHNldApDT05GSUdfWDg2X01DRT15CkNPTkZJ R19YODZfTUNFX0lOVEVMPXkKQ09ORklHX1g4Nl9NQ0VfQU1EPXkKQ09ORklHX1g4Nl9NQ0VfVEhS RVNIT0xEPXkKQ09ORklHX1g4Nl9NQ0VfSU5KRUNUPW0KQ09ORklHX1g4Nl9USEVSTUFMX1ZFQ1RP Uj15CkNPTkZJR19JOEs9bQpDT05GSUdfTUlDUk9DT0RFPW0KQ09ORklHX01JQ1JPQ09ERV9JTlRF TD15CkNPTkZJR19NSUNST0NPREVfQU1EPXkKQ09ORklHX01JQ1JPQ09ERV9PTERfSU5URVJGQUNF PXkKQ09ORklHX1g4Nl9NU1I9eQpDT05GSUdfWDg2X0NQVUlEPW0KQ09ORklHX0FSQ0hfUEhZU19B RERSX1RfNjRCSVQ9eQpDT05GSUdfQVJDSF9ETUFfQUREUl9UXzY0QklUPXkKQ09ORklHX0RJUkVD VF9HQlBBR0VTPXkKIyBDT05GSUdfTlVNQSBpcyBub3Qgc2V0CkNPTkZJR19BUkNIX1NQQVJTRU1F TV9FTkFCTEU9eQpDT05GSUdfQVJDSF9TUEFSU0VNRU1fREVGQVVMVD15CkNPTkZJR19BUkNIX1NF TEVDVF9NRU1PUllfTU9ERUw9eQpDT05GSUdfQVJDSF9NRU1PUllfUFJPQkU9eQpDT05GSUdfQVJD SF9QUk9DX0tDT1JFX1RFWFQ9eQpDT05GSUdfSUxMRUdBTF9QT0lOVEVSX1ZBTFVFPTB4ZGVhZDAw MDAwMDAwMDAwMApDT05GSUdfU0VMRUNUX01FTU9SWV9NT0RFTD15CkNPTkZJR19TUEFSU0VNRU1f TUFOVUFMPXkKQ09ORklHX1NQQVJTRU1FTT15CkNPTkZJR19IQVZFX01FTU9SWV9QUkVTRU5UPXkK Q09ORklHX1NQQVJTRU1FTV9FWFRSRU1FPXkKQ09ORklHX1NQQVJTRU1FTV9WTUVNTUFQX0VOQUJM RT15CkNPTkZJR19TUEFSU0VNRU1fQUxMT0NfTUVNX01BUF9UT0dFVEhFUj15CkNPTkZJR19TUEFS U0VNRU1fVk1FTU1BUD15CkNPTkZJR19IQVZFX01FTUJMT0NLPXkKQ09ORklHX0hBVkVfTUVNQkxP Q0tfTk9ERV9NQVA9eQpDT05GSUdfQVJDSF9ESVNDQVJEX01FTUJMT0NLPXkKQ09ORklHX01FTU9S WV9IT1RQTFVHPXkKQ09ORklHX01FTU9SWV9IT1RQTFVHX1NQQVJTRT15CkNPTkZJR19NRU1PUllf SE9UUkVNT1ZFPXkKQ09ORklHX1BBR0VGTEFHU19FWFRFTkRFRD15CkNPTkZJR19TUExJVF9QVExP Q0tfQ1BVUz00CkNPTkZJR19DT01QQUNUSU9OPXkKQ09ORklHX01JR1JBVElPTj15CkNPTkZJR19Q SFlTX0FERFJfVF82NEJJVD15CkNPTkZJR19aT05FX0RNQV9GTEFHPTEKQ09ORklHX0JPVU5DRT15 CkNPTkZJR19WSVJUX1RPX0JVUz15CkNPTkZJR19NTVVfTk9USUZJRVI9eQpDT05GSUdfS1NNPXkK Q09ORklHX0RFRkFVTFRfTU1BUF9NSU5fQUREUj02NTUzNgpDT05GSUdfQVJDSF9TVVBQT1JUU19N RU1PUllfRkFJTFVSRT15CkNPTkZJR19NRU1PUllfRkFJTFVSRT15CkNPTkZJR19IV1BPSVNPTl9J TkpFQ1Q9bQpDT05GSUdfVFJBTlNQQVJFTlRfSFVHRVBBR0U9eQpDT05GSUdfVFJBTlNQQVJFTlRf SFVHRVBBR0VfQUxXQVlTPXkKIyBDT05GSUdfVFJBTlNQQVJFTlRfSFVHRVBBR0VfTUFEVklTRSBp cyBub3Qgc2V0CkNPTkZJR19DTEVBTkNBQ0hFPXkKIyBDT05GSUdfWDg2X0NIRUNLX0JJT1NfQ09S UlVQVElPTiBpcyBub3Qgc2V0CkNPTkZJR19YODZfUkVTRVJWRV9MT1c9NjQKQ09ORklHX01UUlI9 eQpDT05GSUdfTVRSUl9TQU5JVElaRVI9eQpDT05GSUdfTVRSUl9TQU5JVElaRVJfRU5BQkxFX0RF RkFVTFQ9MApDT05GSUdfTVRSUl9TQU5JVElaRVJfU1BBUkVfUkVHX05SX0RFRkFVTFQ9MQpDT05G SUdfWDg2X1BBVD15CkNPTkZJR19BUkNIX1VTRVNfUEdfVU5DQUNIRUQ9eQpDT05GSUdfQVJDSF9S QU5ET009eQojIENPTkZJR19FRkkgaXMgbm90IHNldApDT05GSUdfU0VDQ09NUD15CiMgQ09ORklH X0NDX1NUQUNLUFJPVEVDVE9SIGlzIG5vdCBzZXQKIyBDT05GSUdfSFpfMTAwIGlzIG5vdCBzZXQK Q09ORklHX0haXzI1MD15CiMgQ09ORklHX0haXzMwMCBpcyBub3Qgc2V0CiMgQ09ORklHX0haXzEw MDAgaXMgbm90IHNldApDT05GSUdfSFo9MjUwCkNPTkZJR19TQ0hFRF9IUlRJQ0s9eQpDT05GSUdf S0VYRUM9eQojIENPTkZJR19DUkFTSF9EVU1QIGlzIG5vdCBzZXQKQ09ORklHX1BIWVNJQ0FMX1NU QVJUPTB4MTAwMDAwMApDT05GSUdfUkVMT0NBVEFCTEU9eQpDT05GSUdfUEhZU0lDQUxfQUxJR049 MHgxMDAwMDAwCkNPTkZJR19IT1RQTFVHX0NQVT15CkNPTkZJR19DT01QQVRfVkRTTz15CiMgQ09O RklHX0NNRExJTkVfQk9PTCBpcyBub3Qgc2V0CkNPTkZJR19BUkNIX0VOQUJMRV9NRU1PUllfSE9U UExVRz15CkNPTkZJR19BUkNIX0VOQUJMRV9NRU1PUllfSE9UUkVNT1ZFPXkKCiMKIyBQb3dlciBt YW5hZ2VtZW50IGFuZCBBQ1BJIG9wdGlvbnMKIwpDT05GSUdfU1VTUEVORD15CkNPTkZJR19TVVNQ RU5EX0ZSRUVaRVI9eQpDT05GSUdfSElCRVJOQVRFX0NBTExCQUNLUz15CiMgQ09ORklHX0hJQkVS TkFUSU9OIGlzIG5vdCBzZXQKQ09ORklHX1BNX1NMRUVQPXkKQ09ORklHX1BNX1NMRUVQX1NNUD15 CkNPTkZJR19QTV9SVU5USU1FPXkKQ09ORklHX1BNPXkKQ09ORklHX1BNX0RFQlVHPXkKQ09ORklH X1BNX0FEVkFOQ0VEX0RFQlVHPXkKIyBDT05GSUdfUE1fVEVTVF9TVVNQRU5EIGlzIG5vdCBzZXQK Q09ORklHX0NBTl9QTV9UUkFDRT15CkNPTkZJR19QTV9UUkFDRT15CkNPTkZJR19QTV9UUkFDRV9S VEM9eQpDT05GSUdfQUNQST15CkNPTkZJR19BQ1BJX1NMRUVQPXkKQ09ORklHX0FDUElfUFJPQ0ZT PXkKQ09ORklHX0FDUElfUFJPQ0ZTX1BPV0VSPXkKIyBDT05GSUdfQUNQSV9FQ19ERUJVR0ZTIGlz IG5vdCBzZXQKQ09ORklHX0FDUElfUFJPQ19FVkVOVD15CkNPTkZJR19BQ1BJX0FDPW0KQ09ORklH X0FDUElfQkFUVEVSWT1tCkNPTkZJR19BQ1BJX0JVVFRPTj1tCkNPTkZJR19BQ1BJX1ZJREVPPW0K Q09ORklHX0FDUElfRkFOPW0KQ09ORklHX0FDUElfRE9DSz15CkNPTkZJR19BQ1BJX1BST0NFU1NP Uj15CkNPTkZJR19BQ1BJX0lQTUk9bQpDT05GSUdfQUNQSV9IT1RQTFVHX0NQVT15CkNPTkZJR19B Q1BJX1BST0NFU1NPUl9BR0dSRUdBVE9SPW0KQ09ORklHX0FDUElfVEhFUk1BTD1tCkNPTkZJR19B Q1BJX0NVU1RPTV9EU0RUX0ZJTEU9IiIKIyBDT05GSUdfQUNQSV9DVVNUT01fRFNEVCBpcyBub3Qg c2V0CkNPTkZJR19BQ1BJX0JMQUNLTElTVF9ZRUFSPTAKQ09ORklHX0FDUElfREVCVUc9eQojIENP TkZJR19BQ1BJX0RFQlVHX0ZVTkNfVFJBQ0UgaXMgbm90IHNldApDT05GSUdfQUNQSV9QQ0lfU0xP VD1tCkNPTkZJR19YODZfUE1fVElNRVI9eQpDT05GSUdfQUNQSV9DT05UQUlORVI9eQpDT05GSUdf QUNQSV9IT1RQTFVHX01FTU9SWT1tCkNPTkZJR19BQ1BJX1NCUz1tCiMgQ09ORklHX0FDUElfSEVE IGlzIG5vdCBzZXQKIyBDT05GSUdfQUNQSV9DVVNUT01fTUVUSE9EIGlzIG5vdCBzZXQKQ09ORklH X0FDUElfQkdSVD1tCiMgQ09ORklHX0FDUElfQVBFSSBpcyBub3Qgc2V0CkNPTkZJR19TRkk9eQoK IwojIENQVSBGcmVxdWVuY3kgc2NhbGluZwojCkNPTkZJR19DUFVfRlJFUT15CkNPTkZJR19DUFVf RlJFUV9UQUJMRT15CkNPTkZJR19DUFVfRlJFUV9TVEFUPXkKIyBDT05GSUdfQ1BVX0ZSRVFfU1RB VF9ERVRBSUxTIGlzIG5vdCBzZXQKQ09ORklHX0NQVV9GUkVRX0RFRkFVTFRfR09WX1BFUkZPUk1B TkNFPXkKIyBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfVVNFUlNQQUNFIGlzIG5vdCBzZXQK IyBDT05GSUdfQ1BVX0ZSRVFfREVGQVVMVF9HT1ZfT05ERU1BTkQgaXMgbm90IHNldAojIENPTkZJ R19DUFVfRlJFUV9ERUZBVUxUX0dPVl9DT05TRVJWQVRJVkUgaXMgbm90IHNldApDT05GSUdfQ1BV X0ZSRVFfR09WX1BFUkZPUk1BTkNFPXkKQ09ORklHX0NQVV9GUkVRX0dPVl9QT1dFUlNBVkU9bQpD T05GSUdfQ1BVX0ZSRVFfR09WX1VTRVJTUEFDRT1tCkNPTkZJR19DUFVfRlJFUV9HT1ZfT05ERU1B TkQ9bQpDT05GSUdfQ1BVX0ZSRVFfR09WX0NPTlNFUlZBVElWRT1tCgojCiMgeDg2IENQVSBmcmVx dWVuY3kgc2NhbGluZyBkcml2ZXJzCiMKQ09ORklHX1g4Nl9QQ0NfQ1BVRlJFUT1tCkNPTkZJR19Y ODZfQUNQSV9DUFVGUkVRPW0KQ09ORklHX1g4Nl9QT1dFUk5PV19LOD1tCkNPTkZJR19YODZfU1BF RURTVEVQX0NFTlRSSU5PPW0KQ09ORklHX1g4Nl9QNF9DTE9DS01PRD1tCgojCiMgc2hhcmVkIG9w dGlvbnMKIwpDT05GSUdfWDg2X1NQRUVEU1RFUF9MSUI9bQpDT05GSUdfQ1BVX0lETEU9eQpDT05G SUdfQ1BVX0lETEVfR09WX0xBRERFUj15CkNPTkZJR19DUFVfSURMRV9HT1ZfTUVOVT15CkNPTkZJ R19JTlRFTF9JRExFPXkKCiMKIyBNZW1vcnkgcG93ZXIgc2F2aW5ncwojCkNPTkZJR19JNzMwMF9J RExFX0lPQVRfQ0hBTk5FTD15CkNPTkZJR19JNzMwMF9JRExFPW0KCiMKIyBCdXMgb3B0aW9ucyAo UENJIGV0Yy4pCiMKQ09ORklHX1BDST15CkNPTkZJR19QQ0lfRElSRUNUPXkKQ09ORklHX1BDSV9N TUNPTkZJRz15CkNPTkZJR19QQ0lfWEVOPXkKQ09ORklHX1BDSV9ET01BSU5TPXkKIyBDT05GSUdf UENJX0NOQjIwTEVfUVVJUksgaXMgbm90IHNldApDT05GSUdfUENJRVBPUlRCVVM9eQpDT05GSUdf SE9UUExVR19QQ0lfUENJRT1tCkNPTkZJR19QQ0lFQUVSPXkKIyBDT05GSUdfUENJRV9FQ1JDIGlz IG5vdCBzZXQKQ09ORklHX1BDSUVBRVJfSU5KRUNUPW0KQ09ORklHX1BDSUVBU1BNPXkKIyBDT05G SUdfUENJRUFTUE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfUENJRUFTUE1fREVGQVVMVD15CiMg Q09ORklHX1BDSUVBU1BNX1BPV0VSU0FWRSBpcyBub3Qgc2V0CiMgQ09ORklHX1BDSUVBU1BNX1BF UkZPUk1BTkNFIGlzIG5vdCBzZXQKQ09ORklHX1BDSUVfUE1FPXkKQ09ORklHX0FSQ0hfU1VQUE9S VFNfTVNJPXkKQ09ORklHX1BDSV9NU0k9eQojIENPTkZJR19QQ0lfREVCVUcgaXMgbm90IHNldAoj IENPTkZJR19QQ0lfUkVBTExPQ19FTkFCTEVfQVVUTyBpcyBub3Qgc2V0CkNPTkZJR19QQ0lfU1RV Qj15CkNPTkZJR19YRU5fUENJREVWX0ZST05URU5EPXkKQ09ORklHX0hUX0lSUT15CkNPTkZJR19Q Q0lfQVRTPXkKQ09ORklHX1BDSV9JT1Y9eQpDT05GSUdfUENJX1BSST15CkNPTkZJR19QQ0lfUEFT SUQ9eQpDT05GSUdfUENJX0lPQVBJQz15CkNPTkZJR19QQ0lfTEFCRUw9eQpDT05GSUdfSVNBX0RN QV9BUEk9eQpDT05GSUdfQU1EX05CPXkKQ09ORklHX1BDQ0FSRD1tCkNPTkZJR19QQ01DSUE9bQpD T05GSUdfUENNQ0lBX0xPQURfQ0lTPXkKQ09ORklHX0NBUkRCVVM9eQoKIwojIFBDLWNhcmQgYnJp ZGdlcwojCkNPTkZJR19ZRU5UQT1tCkNPTkZJR19ZRU5UQV9PMj15CkNPTkZJR19ZRU5UQV9SSUNP SD15CkNPTkZJR19ZRU5UQV9UST15CkNPTkZJR19ZRU5UQV9FTkVfVFVORT15CkNPTkZJR19ZRU5U QV9UT1NISUJBPXkKQ09ORklHX1BENjcyOT1tCkNPTkZJR19JODIwOTI9bQpDT05GSUdfUENDQVJE X05PTlNUQVRJQz15CkNPTkZJR19IT1RQTFVHX1BDST1tCkNPTkZJR19IT1RQTFVHX1BDSV9GQUtF PW0KQ09ORklHX0hPVFBMVUdfUENJX0FDUEk9bQpDT05GSUdfSE9UUExVR19QQ0lfQUNQSV9JQk09 bQpDT05GSUdfSE9UUExVR19QQ0lfQ1BDST15CkNPTkZJR19IT1RQTFVHX1BDSV9DUENJX1pUNTU1 MD1tCkNPTkZJR19IT1RQTFVHX1BDSV9DUENJX0dFTkVSSUM9bQpDT05GSUdfSE9UUExVR19QQ0lf U0hQQz1tCiMgQ09ORklHX1JBUElESU8gaXMgbm90IHNldAoKIwojIEV4ZWN1dGFibGUgZmlsZSBm b3JtYXRzIC8gRW11bGF0aW9ucwojCkNPTkZJR19CSU5GTVRfRUxGPXkKQ09ORklHX0NPTVBBVF9C SU5GTVRfRUxGPXkKQ09ORklHX0FSQ0hfQklORk1UX0VMRl9SQU5ET01JWkVfUElFPXkKQ09ORklH X0NPUkVfRFVNUF9ERUZBVUxUX0VMRl9IRUFERVJTPXkKIyBDT05GSUdfSEFWRV9BT1VUIGlzIG5v dCBzZXQKQ09ORklHX0JJTkZNVF9NSVNDPW0KQ09ORklHX0lBMzJfRU1VTEFUSU9OPXkKQ09ORklH X0lBMzJfQU9VVD1tCiMgQ09ORklHX1g4Nl9YMzIgaXMgbm90IHNldApDT05GSUdfQ09NUEFUPXkK Q09ORklHX0NPTVBBVF9GT1JfVTY0X0FMSUdOTUVOVD15CkNPTkZJR19TWVNWSVBDX0NPTVBBVD15 CkNPTkZJR19LRVlTX0NPTVBBVD15CkNPTkZJR19IQVZFX1RFWFRfUE9LRV9TTVA9eQpDT05GSUdf TkVUPXkKQ09ORklHX0NPTVBBVF9ORVRMSU5LX01FU1NBR0VTPXkKCiMKIyBOZXR3b3JraW5nIG9w dGlvbnMKIwpDT05GSUdfUEFDS0VUPW0KQ09ORklHX1VOSVg9eQpDT05GSUdfVU5JWF9ESUFHPW0K Q09ORklHX1hGUk09eQpDT05GSUdfWEZSTV9VU0VSPW0KQ09ORklHX1hGUk1fU1VCX1BPTElDWT15 CkNPTkZJR19YRlJNX01JR1JBVEU9eQojIENPTkZJR19YRlJNX1NUQVRJU1RJQ1MgaXMgbm90IHNl dApDT05GSUdfWEZSTV9JUENPTVA9bQpDT05GSUdfTkVUX0tFWT1tCkNPTkZJR19ORVRfS0VZX01J R1JBVEU9eQpDT05GSUdfSU5FVD15CkNPTkZJR19JUF9NVUxUSUNBU1Q9eQpDT05GSUdfSVBfQURW QU5DRURfUk9VVEVSPXkKIyBDT05GSUdfSVBfRklCX1RSSUVfU1RBVFMgaXMgbm90IHNldApDT05G SUdfSVBfTVVMVElQTEVfVEFCTEVTPXkKQ09ORklHX0lQX1JPVVRFX01VTFRJUEFUSD15CkNPTkZJ R19JUF9ST1VURV9WRVJCT1NFPXkKQ09ORklHX0lQX1JPVVRFX0NMQVNTSUQ9eQpDT05GSUdfSVBf UE5QPXkKQ09ORklHX0lQX1BOUF9ESENQPXkKQ09ORklHX0lQX1BOUF9CT09UUD15CkNPTkZJR19J UF9QTlBfUkFSUD15CkNPTkZJR19ORVRfSVBJUD1tCiMgQ09ORklHX05FVF9JUEdSRV9ERU1VWCBp cyBub3Qgc2V0CkNPTkZJR19JUF9NUk9VVEU9eQojIENPTkZJR19JUF9NUk9VVEVfTVVMVElQTEVf VEFCTEVTIGlzIG5vdCBzZXQKQ09ORklHX0lQX1BJTVNNX1YxPXkKQ09ORklHX0lQX1BJTVNNX1Yy PXkKIyBDT05GSUdfQVJQRCBpcyBub3Qgc2V0CkNPTkZJR19TWU5fQ09PS0lFUz15CkNPTkZJR19J TkVUX0FIPW0KQ09ORklHX0lORVRfRVNQPW0KQ09ORklHX0lORVRfSVBDT01QPW0KQ09ORklHX0lO RVRfWEZSTV9UVU5ORUw9bQpDT05GSUdfSU5FVF9UVU5ORUw9bQpDT05GSUdfSU5FVF9YRlJNX01P REVfVFJBTlNQT1JUPW0KQ09ORklHX0lORVRfWEZSTV9NT0RFX1RVTk5FTD1tCkNPTkZJR19JTkVU X1hGUk1fTU9ERV9CRUVUPW0KQ09ORklHX0lORVRfTFJPPXkKQ09ORklHX0lORVRfRElBRz1tCkNP TkZJR19JTkVUX1RDUF9ESUFHPW0KQ09ORklHX0lORVRfVURQX0RJQUc9bQpDT05GSUdfVENQX0NP TkdfQURWQU5DRUQ9eQpDT05GSUdfVENQX0NPTkdfQklDPW0KQ09ORklHX1RDUF9DT05HX0NVQklD PXkKQ09ORklHX1RDUF9DT05HX1dFU1RXT09EPW0KQ09ORklHX1RDUF9DT05HX0hUQ1A9bQpDT05G SUdfVENQX0NPTkdfSFNUQ1A9bQpDT05GSUdfVENQX0NPTkdfSFlCTEE9bQpDT05GSUdfVENQX0NP TkdfVkVHQVM9bQpDT05GSUdfVENQX0NPTkdfU0NBTEFCTEU9bQpDT05GSUdfVENQX0NPTkdfTFA9 bQpDT05GSUdfVENQX0NPTkdfVkVOTz1tCkNPTkZJR19UQ1BfQ09OR19ZRUFIPW0KQ09ORklHX1RD UF9DT05HX0lMTElOT0lTPW0KQ09ORklHX0RFRkFVTFRfQ1VCSUM9eQojIENPTkZJR19ERUZBVUxU X1JFTk8gaXMgbm90IHNldApDT05GSUdfREVGQVVMVF9UQ1BfQ09ORz0iY3ViaWMiCiMgQ09ORklH X1RDUF9NRDVTSUcgaXMgbm90IHNldApDT05GSUdfSVBWNj15CkNPTkZJR19JUFY2X1BSSVZBQ1k9 eQpDT05GSUdfSVBWNl9ST1VURVJfUFJFRj15CkNPTkZJR19JUFY2X1JPVVRFX0lORk89eQojIENP TkZJR19JUFY2X09QVElNSVNUSUNfREFEIGlzIG5vdCBzZXQKQ09ORklHX0lORVQ2X0FIPW0KQ09O RklHX0lORVQ2X0VTUD1tCkNPTkZJR19JTkVUNl9JUENPTVA9bQpDT05GSUdfSVBWNl9NSVA2PW0K Q09ORklHX0lORVQ2X1hGUk1fVFVOTkVMPW0KQ09ORklHX0lORVQ2X1RVTk5FTD1tCkNPTkZJR19J TkVUNl9YRlJNX01PREVfVFJBTlNQT1JUPW0KQ09ORklHX0lORVQ2X1hGUk1fTU9ERV9UVU5ORUw9 bQpDT05GSUdfSU5FVDZfWEZSTV9NT0RFX0JFRVQ9bQpDT05GSUdfSU5FVDZfWEZSTV9NT0RFX1JP VVRFT1BUSU1JWkFUSU9OPW0KQ09ORklHX0lQVjZfU0lUPW0KIyBDT05GSUdfSVBWNl9TSVRfNlJE IGlzIG5vdCBzZXQKQ09ORklHX0lQVjZfTkRJU0NfTk9ERVRZUEU9eQpDT05GSUdfSVBWNl9UVU5O RUw9bQpDT05GSUdfSVBWNl9NVUxUSVBMRV9UQUJMRVM9eQpDT05GSUdfSVBWNl9TVUJUUkVFUz15 CiMgQ09ORklHX0lQVjZfTVJPVVRFIGlzIG5vdCBzZXQKQ09ORklHX05FVFdPUktfU0VDTUFSSz15 CiMgQ09ORklHX05FVFdPUktfUEhZX1RJTUVTVEFNUElORyBpcyBub3Qgc2V0CkNPTkZJR19ORVRG SUxURVI9eQojIENPTkZJR19ORVRGSUxURVJfREVCVUcgaXMgbm90IHNldApDT05GSUdfTkVURklM VEVSX0FEVkFOQ0VEPXkKQ09ORklHX0JSSURHRV9ORVRGSUxURVI9eQoKIwojIENvcmUgTmV0Zmls dGVyIENvbmZpZ3VyYXRpb24KIwpDT05GSUdfTkVURklMVEVSX05FVExJTks9bQpDT05GSUdfTkVU RklMVEVSX05FVExJTktfQUNDVD1tCkNPTkZJR19ORVRGSUxURVJfTkVUTElOS19RVUVVRT1tCkNP TkZJR19ORVRGSUxURVJfTkVUTElOS19MT0c9bQpDT05GSUdfTkZfQ09OTlRSQUNLPW0KQ09ORklH X05GX0NPTk5UUkFDS19NQVJLPXkKQ09ORklHX05GX0NPTk5UUkFDS19TRUNNQVJLPXkKQ09ORklH X05GX0NPTk5UUkFDS19aT05FUz15CkNPTkZJR19ORl9DT05OVFJBQ0tfUFJPQ0ZTPXkKQ09ORklH X05GX0NPTk5UUkFDS19FVkVOVFM9eQpDT05GSUdfTkZfQ09OTlRSQUNLX1RJTUVPVVQ9eQojIENP TkZJR19ORl9DT05OVFJBQ0tfVElNRVNUQU1QIGlzIG5vdCBzZXQKQ09ORklHX05GX0NUX1BST1RP X0RDQ1A9bQpDT05GSUdfTkZfQ1RfUFJPVE9fR1JFPW0KQ09ORklHX05GX0NUX1BST1RPX1NDVFA9 bQpDT05GSUdfTkZfQ1RfUFJPVE9fVURQTElURT1tCkNPTkZJR19ORl9DT05OVFJBQ0tfQU1BTkRB PW0KQ09ORklHX05GX0NPTk5UUkFDS19GVFA9bQpDT05GSUdfTkZfQ09OTlRSQUNLX0gzMjM9bQpD T05GSUdfTkZfQ09OTlRSQUNLX0lSQz1tCkNPTkZJR19ORl9DT05OVFJBQ0tfQlJPQURDQVNUPW0K Q09ORklHX05GX0NPTk5UUkFDS19ORVRCSU9TX05TPW0KQ09ORklHX05GX0NPTk5UUkFDS19TTk1Q PW0KQ09ORklHX05GX0NPTk5UUkFDS19QUFRQPW0KQ09ORklHX05GX0NPTk5UUkFDS19TQU5FPW0K Q09ORklHX05GX0NPTk5UUkFDS19TSVA9bQpDT05GSUdfTkZfQ09OTlRSQUNLX1RGVFA9bQpDT05G SUdfTkZfQ1RfTkVUTElOSz1tCkNPTkZJR19ORl9DVF9ORVRMSU5LX1RJTUVPVVQ9bQpDT05GSUdf TkVURklMVEVSX1RQUk9YWT1tCkNPTkZJR19ORVRGSUxURVJfWFRBQkxFUz1tCgojCiMgWHRhYmxl cyBjb21iaW5lZCBtb2R1bGVzCiMKQ09ORklHX05FVEZJTFRFUl9YVF9NQVJLPW0KQ09ORklHX05F VEZJTFRFUl9YVF9DT05OTUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfU0VUPW0KCiMKIyBYdGFi bGVzIHRhcmdldHMKIwojIENPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0FVRElUIGlzIG5vdCBz ZXQKIyBDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9DSEVDS1NVTSBpcyBub3Qgc2V0CkNPTkZJ R19ORVRGSUxURVJfWFRfVEFSR0VUX0NMQVNTSUZZPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJH RVRfQ09OTk1BUks9bQpDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9DT05OU0VDTUFSSz1tCkNP TkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0NUPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJHRVRf RFNDUD1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX0hMPW0KIyBDT05GSUdfTkVURklMVEVS X1hUX1RBUkdFVF9JRExFVElNRVIgaXMgbm90IHNldApDT05GSUdfTkVURklMVEVSX1hUX1RBUkdF VF9MRUQ9bQpDT05GSUdfTkVURklMVEVSX1hUX1RBUkdFVF9MT0c9bQpDT05GSUdfTkVURklMVEVS X1hUX1RBUkdFVF9NQVJLPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJHRVRfTkZMT0c9bQpDT05G SUdfTkVURklMVEVSX1hUX1RBUkdFVF9ORlFVRVVFPW0KQ09ORklHX05FVEZJTFRFUl9YVF9UQVJH RVRfTk9UUkFDSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1JBVEVFU1Q9bQojIENPTkZJ R19ORVRGSUxURVJfWFRfVEFSR0VUX1RFRSBpcyBub3Qgc2V0CkNPTkZJR19ORVRGSUxURVJfWFRf VEFSR0VUX1RQUk9YWT1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1RSQUNFPW0KQ09ORklH X05FVEZJTFRFUl9YVF9UQVJHRVRfU0VDTUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VU X1RDUE1TUz1tCkNPTkZJR19ORVRGSUxURVJfWFRfVEFSR0VUX1RDUE9QVFNUUklQPW0KCiMKIyBY dGFibGVzIG1hdGNoZXMKIwpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0FERFJUWVBFPW0KQ09O RklHX05FVEZJTFRFUl9YVF9NQVRDSF9DTFVTVEVSPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRD SF9DT01NRU5UPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9DT05OQllURVM9bQpDT05GSUdf TkVURklMVEVSX1hUX01BVENIX0NPTk5MSU1JVD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf Q09OTk1BUks9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0NPTk5UUkFDSz1tCiMgQ09ORklH X05FVEZJTFRFUl9YVF9NQVRDSF9DUFUgaXMgbm90IHNldApDT05GSUdfTkVURklMVEVSX1hUX01B VENIX0RDQ1A9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0RFVkdST1VQPW0KQ09ORklHX05F VEZJTFRFUl9YVF9NQVRDSF9EU0NQPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9FQ049bQpD T05GSUdfTkVURklMVEVSX1hUX01BVENIX0VTUD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf SEFTSExJTUlUPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9IRUxQRVI9bQpDT05GSUdfTkVU RklMVEVSX1hUX01BVENIX0hMPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9JUFJBTkdFPW0K IyBDT05GSUdfTkVURklMVEVSX1hUX01BVENIX0lQVlMgaXMgbm90IHNldApDT05GSUdfTkVURklM VEVSX1hUX01BVENIX0xFTkdUSD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfTElNSVQ9bQpD T05GSUdfTkVURklMVEVSX1hUX01BVENIX01BQz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hf TUFSSz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfTVVMVElQT1JUPW0KQ09ORklHX05FVEZJ TFRFUl9YVF9NQVRDSF9ORkFDQ1Q9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX09TRj1tCkNP TkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfT1dORVI9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENI X1BPTElDWT1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfUEhZU0RFVj1tCkNPTkZJR19ORVRG SUxURVJfWFRfTUFUQ0hfUEtUVFlQRT1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfUVVPVEE9 bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1JBVEVFU1Q9bQpDT05GSUdfTkVURklMVEVSX1hU X01BVENIX1JFQUxNPW0KQ09ORklHX05FVEZJTFRFUl9YVF9NQVRDSF9SRUNFTlQ9bQpDT05GSUdf TkVURklMVEVSX1hUX01BVENIX1NDVFA9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1NPQ0tF VD1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfU1RBVEU9bQpDT05GSUdfTkVURklMVEVSX1hU X01BVENIX1NUQVRJU1RJQz1tCkNPTkZJR19ORVRGSUxURVJfWFRfTUFUQ0hfU1RSSU5HPW0KQ09O RklHX05FVEZJTFRFUl9YVF9NQVRDSF9UQ1BNU1M9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENI X1RJTUU9bQpDT05GSUdfTkVURklMVEVSX1hUX01BVENIX1UzMj1tCkNPTkZJR19JUF9TRVQ9bQpD T05GSUdfSVBfU0VUX01BWD0yNTYKQ09ORklHX0lQX1NFVF9CSVRNQVBfSVA9bQpDT05GSUdfSVBf U0VUX0JJVE1BUF9JUE1BQz1tCkNPTkZJR19JUF9TRVRfQklUTUFQX1BPUlQ9bQpDT05GSUdfSVBf U0VUX0hBU0hfSVA9bQpDT05GSUdfSVBfU0VUX0hBU0hfSVBQT1JUPW0KQ09ORklHX0lQX1NFVF9I QVNIX0lQUE9SVElQPW0KQ09ORklHX0lQX1NFVF9IQVNIX0lQUE9SVE5FVD1tCkNPTkZJR19JUF9T RVRfSEFTSF9ORVQ9bQpDT05GSUdfSVBfU0VUX0hBU0hfTkVUUE9SVD1tCkNPTkZJR19JUF9TRVRf SEFTSF9ORVRJRkFDRT1tCkNPTkZJR19JUF9TRVRfTElTVF9TRVQ9bQpDT05GSUdfSVBfVlM9bQpD T05GSUdfSVBfVlNfSVBWNj15CiMgQ09ORklHX0lQX1ZTX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklH X0lQX1ZTX1RBQl9CSVRTPTEyCgojCiMgSVBWUyB0cmFuc3BvcnQgcHJvdG9jb2wgbG9hZCBiYWxh bmNpbmcgc3VwcG9ydAojCkNPTkZJR19JUF9WU19QUk9UT19UQ1A9eQpDT05GSUdfSVBfVlNfUFJP VE9fVURQPXkKQ09ORklHX0lQX1ZTX1BST1RPX0FIX0VTUD15CkNPTkZJR19JUF9WU19QUk9UT19F U1A9eQpDT05GSUdfSVBfVlNfUFJPVE9fQUg9eQpDT05GSUdfSVBfVlNfUFJPVE9fU0NUUD15Cgoj CiMgSVBWUyBzY2hlZHVsZXIKIwpDT05GSUdfSVBfVlNfUlI9bQpDT05GSUdfSVBfVlNfV1JSPW0K Q09ORklHX0lQX1ZTX0xDPW0KQ09ORklHX0lQX1ZTX1dMQz1tCkNPTkZJR19JUF9WU19MQkxDPW0K Q09ORklHX0lQX1ZTX0xCTENSPW0KQ09ORklHX0lQX1ZTX0RIPW0KQ09ORklHX0lQX1ZTX1NIPW0K Q09ORklHX0lQX1ZTX1NFRD1tCkNPTkZJR19JUF9WU19OUT1tCgojCiMgSVBWUyBTSCBzY2hlZHVs ZXIKIwpDT05GSUdfSVBfVlNfU0hfVEFCX0JJVFM9OAoKIwojIElQVlMgYXBwbGljYXRpb24gaGVs cGVyCiMKQ09ORklHX0lQX1ZTX0ZUUD1tCkNPTkZJR19JUF9WU19ORkNUPXkKIyBDT05GSUdfSVBf VlNfUEVfU0lQIGlzIG5vdCBzZXQKCiMKIyBJUDogTmV0ZmlsdGVyIENvbmZpZ3VyYXRpb24KIwpD T05GSUdfTkZfREVGUkFHX0lQVjQ9bQpDT05GSUdfTkZfQ09OTlRSQUNLX0lQVjQ9bQojIENPTkZJ R19ORl9DT05OVFJBQ0tfUFJPQ19DT01QQVQgaXMgbm90IHNldApDT05GSUdfSVBfTkZfUVVFVUU9 bQpDT05GSUdfSVBfTkZfSVBUQUJMRVM9bQpDT05GSUdfSVBfTkZfTUFUQ0hfQUg9bQpDT05GSUdf SVBfTkZfTUFUQ0hfRUNOPW0KQ09ORklHX0lQX05GX01BVENIX1JQRklMVEVSPW0KQ09ORklHX0lQ X05GX01BVENIX1RUTD1tCkNPTkZJR19JUF9ORl9GSUxURVI9bQpDT05GSUdfSVBfTkZfVEFSR0VU X1JFSkVDVD1tCkNPTkZJR19JUF9ORl9UQVJHRVRfVUxPRz1tCkNPTkZJR19ORl9OQVQ9bQpDT05G SUdfTkZfTkFUX05FRURFRD15CkNPTkZJR19JUF9ORl9UQVJHRVRfTUFTUVVFUkFERT1tCkNPTkZJ R19JUF9ORl9UQVJHRVRfTkVUTUFQPW0KQ09ORklHX0lQX05GX1RBUkdFVF9SRURJUkVDVD1tCkNP TkZJR19ORl9OQVRfU05NUF9CQVNJQz1tCkNPTkZJR19ORl9OQVRfUFJPVE9fRENDUD1tCkNPTkZJ R19ORl9OQVRfUFJPVE9fR1JFPW0KQ09ORklHX05GX05BVF9QUk9UT19VRFBMSVRFPW0KQ09ORklH X05GX05BVF9QUk9UT19TQ1RQPW0KQ09ORklHX05GX05BVF9GVFA9bQpDT05GSUdfTkZfTkFUX0lS Qz1tCkNPTkZJR19ORl9OQVRfVEZUUD1tCkNPTkZJR19ORl9OQVRfQU1BTkRBPW0KQ09ORklHX05G X05BVF9QUFRQPW0KQ09ORklHX05GX05BVF9IMzIzPW0KQ09ORklHX05GX05BVF9TSVA9bQpDT05G SUdfSVBfTkZfTUFOR0xFPW0KQ09ORklHX0lQX05GX1RBUkdFVF9DTFVTVEVSSVA9bQpDT05GSUdf SVBfTkZfVEFSR0VUX0VDTj1tCkNPTkZJR19JUF9ORl9UQVJHRVRfVFRMPW0KQ09ORklHX0lQX05G X1JBVz1tCkNPTkZJR19JUF9ORl9BUlBUQUJMRVM9bQpDT05GSUdfSVBfTkZfQVJQRklMVEVSPW0K Q09ORklHX0lQX05GX0FSUF9NQU5HTEU9bQoKIwojIElQdjY6IE5ldGZpbHRlciBDb25maWd1cmF0 aW9uCiMKQ09ORklHX05GX0RFRlJBR19JUFY2PW0KQ09ORklHX05GX0NPTk5UUkFDS19JUFY2PW0K Q09ORklHX0lQNl9ORl9RVUVVRT1tCkNPTkZJR19JUDZfTkZfSVBUQUJMRVM9bQpDT05GSUdfSVA2 X05GX01BVENIX0FIPW0KQ09ORklHX0lQNl9ORl9NQVRDSF9FVUk2ND1tCkNPTkZJR19JUDZfTkZf TUFUQ0hfRlJBRz1tCkNPTkZJR19JUDZfTkZfTUFUQ0hfT1BUUz1tCkNPTkZJR19JUDZfTkZfTUFU Q0hfSEw9bQpDT05GSUdfSVA2X05GX01BVENIX0lQVjZIRUFERVI9bQpDT05GSUdfSVA2X05GX01B VENIX01IPW0KQ09ORklHX0lQNl9ORl9NQVRDSF9SUEZJTFRFUj1tCkNPTkZJR19JUDZfTkZfTUFU Q0hfUlQ9bQpDT05GSUdfSVA2X05GX1RBUkdFVF9ITD1tCkNPTkZJR19JUDZfTkZfRklMVEVSPW0K Q09ORklHX0lQNl9ORl9UQVJHRVRfUkVKRUNUPW0KQ09ORklHX0lQNl9ORl9NQU5HTEU9bQpDT05G SUdfSVA2X05GX1JBVz1tCgojCiMgREVDbmV0OiBOZXRmaWx0ZXIgQ29uZmlndXJhdGlvbgojCiMg Q09ORklHX0RFQ05FVF9ORl9HUkFCVUxBVE9SIGlzIG5vdCBzZXQKQ09ORklHX0JSSURHRV9ORl9F QlRBQkxFUz1tCkNPTkZJR19CUklER0VfRUJUX0JST1VURT1tCkNPTkZJR19CUklER0VfRUJUX1Rf RklMVEVSPW0KQ09ORklHX0JSSURHRV9FQlRfVF9OQVQ9bQpDT05GSUdfQlJJREdFX0VCVF84MDJf Mz1tCkNPTkZJR19CUklER0VfRUJUX0FNT05HPW0KQ09ORklHX0JSSURHRV9FQlRfQVJQPW0KQ09O RklHX0JSSURHRV9FQlRfSVA9bQpDT05GSUdfQlJJREdFX0VCVF9JUDY9bQpDT05GSUdfQlJJREdF X0VCVF9MSU1JVD1tCkNPTkZJR19CUklER0VfRUJUX01BUks9bQpDT05GSUdfQlJJREdFX0VCVF9Q S1RUWVBFPW0KQ09ORklHX0JSSURHRV9FQlRfU1RQPW0KQ09ORklHX0JSSURHRV9FQlRfVkxBTj1t CkNPTkZJR19CUklER0VfRUJUX0FSUFJFUExZPW0KQ09ORklHX0JSSURHRV9FQlRfRE5BVD1tCkNP TkZJR19CUklER0VfRUJUX01BUktfVD1tCkNPTkZJR19CUklER0VfRUJUX1JFRElSRUNUPW0KQ09O RklHX0JSSURHRV9FQlRfU05BVD1tCkNPTkZJR19CUklER0VfRUJUX0xPRz1tCkNPTkZJR19CUklE R0VfRUJUX1VMT0c9bQpDT05GSUdfQlJJREdFX0VCVF9ORkxPRz1tCkNPTkZJR19JUF9EQ0NQPW0K Q09ORklHX0lORVRfRENDUF9ESUFHPW0KCiMKIyBEQ0NQIENDSURzIENvbmZpZ3VyYXRpb24gKEVY UEVSSU1FTlRBTCkKIwojIENPTkZJR19JUF9EQ0NQX0NDSUQyX0RFQlVHIGlzIG5vdCBzZXQKQ09O RklHX0lQX0RDQ1BfQ0NJRDM9eQojIENPTkZJR19JUF9EQ0NQX0NDSUQzX0RFQlVHIGlzIG5vdCBz ZXQKQ09ORklHX0lQX0RDQ1BfVEZSQ19MSUI9eQoKIwojIERDQ1AgS2VybmVsIEhhY2tpbmcKIwoj IENPTkZJR19JUF9EQ0NQX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfTkVUX0RDQ1BQUk9CRSBp cyBub3Qgc2V0CkNPTkZJR19JUF9TQ1RQPW0KIyBDT05GSUdfTkVUX1NDVFBQUk9CRSBpcyBub3Qg c2V0CiMgQ09ORklHX1NDVFBfREJHX01TRyBpcyBub3Qgc2V0CiMgQ09ORklHX1NDVFBfREJHX09C SkNOVCBpcyBub3Qgc2V0CiMgQ09ORklHX1NDVFBfSE1BQ19OT05FIGlzIG5vdCBzZXQKIyBDT05G SUdfU0NUUF9ITUFDX1NIQTEgaXMgbm90IHNldApDT05GSUdfU0NUUF9ITUFDX01ENT15CkNPTkZJ R19SRFM9bQpDT05GSUdfUkRTX1JETUE9bQpDT05GSUdfUkRTX1RDUD1tCiMgQ09ORklHX1JEU19E RUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX1RJUEMgaXMgbm90IHNldApDT05GSUdfQVRNPW0KQ09O RklHX0FUTV9DTElQPW0KIyBDT05GSUdfQVRNX0NMSVBfTk9fSUNNUCBpcyBub3Qgc2V0CkNPTkZJ R19BVE1fTEFORT1tCkNPTkZJR19BVE1fTVBPQT1tCkNPTkZJR19BVE1fQlIyNjg0PW0KIyBDT05G SUdfQVRNX0JSMjY4NF9JUEZJTFRFUiBpcyBub3Qgc2V0CiMgQ09ORklHX0wyVFAgaXMgbm90IHNl dApDT05GSUdfU1RQPW0KQ09ORklHX0dBUlA9bQpDT05GSUdfQlJJREdFPW0KQ09ORklHX0JSSURH RV9JR01QX1NOT09QSU5HPXkKQ09ORklHX05FVF9EU0E9eQpDT05GSUdfTkVUX0RTQV9UQUdfRFNB PXkKQ09ORklHX05FVF9EU0FfVEFHX0VEU0E9eQpDT05GSUdfTkVUX0RTQV9UQUdfVFJBSUxFUj15 CkNPTkZJR19WTEFOXzgwMjFRPW0KQ09ORklHX1ZMQU5fODAyMVFfR1ZSUD15CkNPTkZJR19ERUNO RVQ9bQojIENPTkZJR19ERUNORVRfUk9VVEVSIGlzIG5vdCBzZXQKQ09ORklHX0xMQz1tCkNPTkZJ R19MTEMyPW0KQ09ORklHX0lQWD1tCkNPTkZJR19JUFhfSU5URVJOPXkKQ09ORklHX0FUQUxLPW0K Q09ORklHX0RFVl9BUFBMRVRBTEs9bQpDT05GSUdfSVBERFA9bQpDT05GSUdfSVBERFBfRU5DQVA9 eQpDT05GSUdfSVBERFBfREVDQVA9eQpDT05GSUdfWDI1PW0KQ09ORklHX0xBUEI9bQojIENPTkZJ R19FQ09ORVQgaXMgbm90IHNldApDT05GSUdfV0FOX1JPVVRFUj1tCkNPTkZJR19QSE9ORVQ9bQpD T05GSUdfSUVFRTgwMjE1ND1tCkNPTkZJR19JRUVFODAyMTU0XzZMT1dQQU49bQpDT05GSUdfTkVU X1NDSEVEPXkKCiMKIyBRdWV1ZWluZy9TY2hlZHVsaW5nCiMKQ09ORklHX05FVF9TQ0hfQ0JRPW0K Q09ORklHX05FVF9TQ0hfSFRCPW0KQ09ORklHX05FVF9TQ0hfSEZTQz1tCkNPTkZJR19ORVRfU0NI X0FUTT1tCkNPTkZJR19ORVRfU0NIX1BSSU89bQpDT05GSUdfTkVUX1NDSF9NVUxUSVE9bQpDT05G SUdfTkVUX1NDSF9SRUQ9bQpDT05GSUdfTkVUX1NDSF9TRkI9bQpDT05GSUdfTkVUX1NDSF9TRlE9 bQpDT05GSUdfTkVUX1NDSF9URVFMPW0KQ09ORklHX05FVF9TQ0hfVEJGPW0KQ09ORklHX05FVF9T Q0hfR1JFRD1tCkNPTkZJR19ORVRfU0NIX0RTTUFSSz1tCkNPTkZJR19ORVRfU0NIX05FVEVNPW0K Q09ORklHX05FVF9TQ0hfRFJSPW0KQ09ORklHX05FVF9TQ0hfTVFQUklPPW0KQ09ORklHX05FVF9T Q0hfQ0hPS0U9bQpDT05GSUdfTkVUX1NDSF9RRlE9bQpDT05GSUdfTkVUX1NDSF9JTkdSRVNTPW0K Q09ORklHX05FVF9TQ0hfUExVRz1tCgojCiMgQ2xhc3NpZmljYXRpb24KIwpDT05GSUdfTkVUX0NM Uz15CkNPTkZJR19ORVRfQ0xTX0JBU0lDPW0KQ09ORklHX05FVF9DTFNfVENJTkRFWD1tCkNPTkZJ R19ORVRfQ0xTX1JPVVRFND1tCkNPTkZJR19ORVRfQ0xTX0ZXPW0KQ09ORklHX05FVF9DTFNfVTMy PW0KQ09ORklHX0NMU19VMzJfUEVSRj15CkNPTkZJR19DTFNfVTMyX01BUks9eQpDT05GSUdfTkVU X0NMU19SU1ZQPW0KQ09ORklHX05FVF9DTFNfUlNWUDY9bQpDT05GSUdfTkVUX0NMU19GTE9XPW0K Q09ORklHX05FVF9DTFNfQ0dST1VQPXkKQ09ORklHX05FVF9FTUFUQ0g9eQpDT05GSUdfTkVUX0VN QVRDSF9TVEFDSz0zMgpDT05GSUdfTkVUX0VNQVRDSF9DTVA9bQpDT05GSUdfTkVUX0VNQVRDSF9O QllURT1tCkNPTkZJR19ORVRfRU1BVENIX1UzMj1tCkNPTkZJR19ORVRfRU1BVENIX01FVEE9bQpD T05GSUdfTkVUX0VNQVRDSF9URVhUPW0KQ09ORklHX05FVF9DTFNfQUNUPXkKQ09ORklHX05FVF9B Q1RfUE9MSUNFPW0KQ09ORklHX05FVF9BQ1RfR0FDVD1tCkNPTkZJR19HQUNUX1BST0I9eQpDT05G SUdfTkVUX0FDVF9NSVJSRUQ9bQpDT05GSUdfTkVUX0FDVF9JUFQ9bQpDT05GSUdfTkVUX0FDVF9O QVQ9bQpDT05GSUdfTkVUX0FDVF9QRURJVD1tCkNPTkZJR19ORVRfQUNUX1NJTVA9bQpDT05GSUdf TkVUX0FDVF9TS0JFRElUPW0KIyBDT05GSUdfTkVUX0FDVF9DU1VNIGlzIG5vdCBzZXQKQ09ORklH X05FVF9DTFNfSU5EPXkKQ09ORklHX05FVF9TQ0hfRklGTz15CkNPTkZJR19EQ0I9eQpDT05GSUdf RE5TX1JFU09MVkVSPXkKQ09ORklHX0JBVE1BTl9BRFY9bQpDT05GSUdfQkFUTUFOX0FEVl9ERUJV Rz15CkNPTkZJR19PUEVOVlNXSVRDSD1tCkNPTkZJR19SUFM9eQpDT05GSUdfUkZTX0FDQ0VMPXkK Q09ORklHX1hQUz15CkNPTkZJR19ORVRQUklPX0NHUk9VUD1tCkNPTkZJR19CUUw9eQpDT05GSUdf SEFWRV9CUEZfSklUPXkKQ09ORklHX0JQRl9KSVQ9eQoKIwojIE5ldHdvcmsgdGVzdGluZwojCkNP TkZJR19ORVRfUEtUR0VOPW0KQ09ORklHX05FVF9UQ1BQUk9CRT1tCiMgQ09ORklHX05FVF9EUk9Q X01PTklUT1IgaXMgbm90IHNldApDT05GSUdfSEFNUkFESU89eQoKIwojIFBhY2tldCBSYWRpbyBw cm90b2NvbHMKIwpDT05GSUdfQVgyNT1tCkNPTkZJR19BWDI1X0RBTUFfU0xBVkU9eQpDT05GSUdf TkVUUk9NPW0KQ09ORklHX1JPU0U9bQoKIwojIEFYLjI1IG5ldHdvcmsgZGV2aWNlIGRyaXZlcnMK IwpDT05GSUdfTUtJU1M9bQpDT05GSUdfNlBBQ0s9bQpDT05GSUdfQlBRRVRIRVI9bQpDT05GSUdf QkFZQ09NX1NFUl9GRFg9bQpDT05GSUdfQkFZQ09NX1NFUl9IRFg9bQpDT05GSUdfQkFZQ09NX1BB Uj1tCkNPTkZJR19ZQU09bQpDT05GSUdfQ0FOPW0KQ09ORklHX0NBTl9SQVc9bQpDT05GSUdfQ0FO X0JDTT1tCkNPTkZJR19DQU5fR1c9bQoKIwojIENBTiBEZXZpY2UgRHJpdmVycwojCkNPTkZJR19D QU5fVkNBTj1tCiMgQ09ORklHX0NBTl9TTENBTiBpcyBub3Qgc2V0CkNPTkZJR19DQU5fREVWPW0K Q09ORklHX0NBTl9DQUxDX0JJVFRJTUlORz15CkNPTkZJR19DQU5fTUNQMjUxWD1tCkNPTkZJR19D QU5fSkFOWl9JQ0FOMz1tCiMgQ09ORklHX1BDSF9DQU4gaXMgbm90IHNldApDT05GSUdfQ0FOX1NK QTEwMDA9bQpDT05GSUdfQ0FOX1NKQTEwMDBfSVNBPW0KQ09ORklHX0NBTl9TSkExMDAwX1BMQVRG T1JNPW0KQ09ORklHX0NBTl9FTVNfUENNQ0lBPW0KQ09ORklHX0NBTl9FTVNfUENJPW0KQ09ORklH X0NBTl9QRUFLX1BDTUNJQT1tCkNPTkZJR19DQU5fUEVBS19QQ0k9bQpDT05GSUdfQ0FOX1BFQUtf UENJRUM9eQpDT05GSUdfQ0FOX0tWQVNFUl9QQ0k9bQpDT05GSUdfQ0FOX1BMWF9QQ0k9bQojIENP TkZJR19DQU5fQ19DQU4gaXMgbm90IHNldApDT05GSUdfQ0FOX0NDNzcwPW0KQ09ORklHX0NBTl9D Qzc3MF9JU0E9bQpDT05GSUdfQ0FOX0NDNzcwX1BMQVRGT1JNPW0KCiMKIyBDQU4gVVNCIGludGVy ZmFjZXMKIwpDT05GSUdfQ0FOX0VNU19VU0I9bQojIENPTkZJR19DQU5fRVNEX1VTQjIgaXMgbm90 IHNldApDT05GSUdfQ0FOX1BFQUtfVVNCPW0KIyBDT05GSUdfQ0FOX1NPRlRJTkcgaXMgbm90IHNl dAojIENPTkZJR19DQU5fREVCVUdfREVWSUNFUyBpcyBub3Qgc2V0CkNPTkZJR19JUkRBPW0KCiMK IyBJckRBIHByb3RvY29scwojCkNPTkZJR19JUkxBTj1tCkNPTkZJR19JUk5FVD1tCkNPTkZJR19J UkNPTU09bQpDT05GSUdfSVJEQV9VTFRSQT15CgojCiMgSXJEQSBvcHRpb25zCiMKQ09ORklHX0lS REFfQ0FDSEVfTEFTVF9MU0FQPXkKIyBDT05GSUdfSVJEQV9GQVNUX1JSIGlzIG5vdCBzZXQKIyBD T05GSUdfSVJEQV9ERUJVRyBpcyBub3Qgc2V0CgojCiMgSW5mcmFyZWQtcG9ydCBkZXZpY2UgZHJp dmVycwojCgojCiMgU0lSIGRldmljZSBkcml2ZXJzCiMKQ09ORklHX0lSVFRZX1NJUj1tCgojCiMg RG9uZ2xlIHN1cHBvcnQKIwpDT05GSUdfRE9OR0xFPXkKQ09ORklHX0VTSV9ET05HTEU9bQpDT05G SUdfQUNUSVNZU19ET05HTEU9bQpDT05GSUdfVEVLUkFNX0RPTkdMRT1tCkNPTkZJR19UT0lNMzIz Ml9ET05HTEU9bQpDT05GSUdfTElURUxJTktfRE9OR0xFPW0KQ09ORklHX01BNjAwX0RPTkdMRT1t CkNPTkZJR19HSVJCSUxfRE9OR0xFPW0KQ09ORklHX01DUDIxMjBfRE9OR0xFPW0KQ09ORklHX09M RF9CRUxLSU5fRE9OR0xFPW0KQ09ORklHX0FDVDIwMExfRE9OR0xFPW0KQ09ORklHX0tJTkdTVU5f RE9OR0xFPW0KQ09ORklHX0tTREFaWkxFX0RPTkdMRT1tCkNPTkZJR19LUzk1OV9ET05HTEU9bQoK IwojIEZJUiBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19VU0JfSVJEQT1tCkNPTkZJR19TSUdNQVRF TF9GSVI9bQpDT05GSUdfTlNDX0ZJUj1tCkNPTkZJR19XSU5CT05EX0ZJUj1tCkNPTkZJR19TTUNf SVJDQ19GSVI9bQpDT05GSUdfQUxJX0ZJUj1tCkNPTkZJR19WTFNJX0ZJUj1tCkNPTkZJR19WSUFf RklSPW0KQ09ORklHX01DU19GSVI9bQpDT05GSUdfQlQ9bQpDT05GSUdfQlRfUkZDT01NPW0KQ09O RklHX0JUX1JGQ09NTV9UVFk9eQpDT05GSUdfQlRfQk5FUD1tCkNPTkZJR19CVF9CTkVQX01DX0ZJ TFRFUj15CkNPTkZJR19CVF9CTkVQX1BST1RPX0ZJTFRFUj15CkNPTkZJR19CVF9DTVRQPW0KQ09O RklHX0JUX0hJRFA9bQoKIwojIEJsdWV0b290aCBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19CVF9I Q0lCVFVTQj1tCkNPTkZJR19CVF9IQ0lCVFNESU89bQpDT05GSUdfQlRfSENJVUFSVD1tCkNPTkZJ R19CVF9IQ0lVQVJUX0g0PXkKQ09ORklHX0JUX0hDSVVBUlRfQkNTUD15CiMgQ09ORklHX0JUX0hD SVVBUlRfQVRIM0sgaXMgbm90IHNldApDT05GSUdfQlRfSENJVUFSVF9MTD15CkNPTkZJR19CVF9I Q0lCQ00yMDNYPW0KQ09ORklHX0JUX0hDSUJQQTEwWD1tCkNPTkZJR19CVF9IQ0lCRlVTQj1tCkNP TkZJR19CVF9IQ0lEVEwxPW0KQ09ORklHX0JUX0hDSUJUM0M9bQpDT05GSUdfQlRfSENJQkxVRUNB UkQ9bQpDT05GSUdfQlRfSENJQlRVQVJUPW0KQ09ORklHX0JUX0hDSVZIQ0k9bQpDT05GSUdfQlRf TVJWTD1tCkNPTkZJR19CVF9NUlZMX1NESU89bQpDT05GSUdfQlRfQVRIM0s9bQpDT05GSUdfQlRf V0lMSU5LPW0KQ09ORklHX0FGX1JYUlBDPW0KIyBDT05GSUdfQUZfUlhSUENfREVCVUcgaXMgbm90 IHNldApDT05GSUdfUlhLQUQ9bQpDT05GSUdfRklCX1JVTEVTPXkKQ09ORklHX1dJUkVMRVNTPXkK Q09ORklHX1dJUkVMRVNTX0VYVD15CkNPTkZJR19XRVhUX0NPUkU9eQpDT05GSUdfV0VYVF9QUk9D PXkKQ09ORklHX1dFWFRfU1BZPXkKQ09ORklHX1dFWFRfUFJJVj15CkNPTkZJR19DRkc4MDIxMT1t CkNPTkZJR19OTDgwMjExX1RFU1RNT0RFPXkKIyBDT05GSUdfQ0ZHODAyMTFfREVWRUxPUEVSX1dB Uk5JTkdTIGlzIG5vdCBzZXQKIyBDT05GSUdfQ0ZHODAyMTFfUkVHX0RFQlVHIGlzIG5vdCBzZXQK Q09ORklHX0NGRzgwMjExX0RFRkFVTFRfUFM9eQojIENPTkZJR19DRkc4MDIxMV9ERUJVR0ZTIGlz IG5vdCBzZXQKIyBDT05GSUdfQ0ZHODAyMTFfSU5URVJOQUxfUkVHREIgaXMgbm90IHNldApDT05G SUdfQ0ZHODAyMTFfV0VYVD15CkNPTkZJR19XSVJFTEVTU19FWFRfU1lTRlM9eQpDT05GSUdfTElC ODAyMTE9bQpDT05GSUdfTElCODAyMTFfQ1JZUFRfV0VQPW0KQ09ORklHX0xJQjgwMjExX0NSWVBU X0NDTVA9bQpDT05GSUdfTElCODAyMTFfQ1JZUFRfVEtJUD1tCiMgQ09ORklHX0xJQjgwMjExX0RF QlVHIGlzIG5vdCBzZXQKQ09ORklHX01BQzgwMjExPW0KQ09ORklHX01BQzgwMjExX0hBU19SQz15 CkNPTkZJR19NQUM4MDIxMV9SQ19NSU5TVFJFTD15CkNPTkZJR19NQUM4MDIxMV9SQ19NSU5TVFJF TF9IVD15CkNPTkZJR19NQUM4MDIxMV9SQ19ERUZBVUxUX01JTlNUUkVMPXkKQ09ORklHX01BQzgw MjExX1JDX0RFRkFVTFQ9Im1pbnN0cmVsX2h0IgpDT05GSUdfTUFDODAyMTFfTUVTSD15CkNPTkZJ R19NQUM4MDIxMV9MRURTPXkKQ09ORklHX01BQzgwMjExX0RFQlVHRlM9eQojIENPTkZJR19NQUM4 MDIxMV9ERUJVR19NRU5VIGlzIG5vdCBzZXQKQ09ORklHX1dJTUFYPW0KQ09ORklHX1dJTUFYX0RF QlVHX0xFVkVMPTgKQ09ORklHX1JGS0lMTD1tCkNPTkZJR19SRktJTExfTEVEUz15CkNPTkZJR19S RktJTExfSU5QVVQ9eQpDT05GSUdfUkZLSUxMX1JFR1VMQVRPUj1tCkNPTkZJR19ORVRfOVA9bQpD T05GSUdfTkVUXzlQX1ZJUlRJTz1tCkNPTkZJR19ORVRfOVBfUkRNQT1tCiMgQ09ORklHX05FVF85 UF9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0NBSUYgaXMgbm90IHNldApDT05GSUdfQ0VQSF9M SUI9bQojIENPTkZJR19DRVBIX0xJQl9QUkVUVFlERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0NF UEhfTElCX1VTRV9ETlNfUkVTT0xWRVIgaXMgbm90IHNldApDT05GSUdfTkZDPW0KQ09ORklHX05G Q19OQ0k9bQojIENPTkZJR19ORkNfTExDUCBpcyBub3Qgc2V0CgojCiMgTmVhciBGaWVsZCBDb21t dW5pY2F0aW9uIChORkMpIGRldmljZXMKIwpDT05GSUdfUE41NDRfTkZDPW0KQ09ORklHX05GQ19Q TjUzMz1tCkNPTkZJR19ORkNfV0lMSU5LPW0KCiMKIyBEZXZpY2UgRHJpdmVycwojCgojCiMgR2Vu ZXJpYyBEcml2ZXIgT3B0aW9ucwojCkNPTkZJR19VRVZFTlRfSEVMUEVSX1BBVEg9IiIKQ09ORklH X0RFVlRNUEZTPXkKQ09ORklHX0RFVlRNUEZTX01PVU5UPXkKIyBDT05GSUdfU1RBTkRBTE9ORSBp cyBub3Qgc2V0CkNPTkZJR19QUkVWRU5UX0ZJUk1XQVJFX0JVSUxEPXkKQ09ORklHX0ZXX0xPQURF Uj15CiMgQ09ORklHX0ZJUk1XQVJFX0lOX0tFUk5FTCBpcyBub3Qgc2V0CkNPTkZJR19FWFRSQV9G SVJNV0FSRT0iIgojIENPTkZJR19ERUJVR19EUklWRVIgaXMgbm90IHNldAojIENPTkZJR19ERUJV R19ERVZSRVMgaXMgbm90IHNldApDT05GSUdfU1lTX0hZUEVSVklTT1I9eQojIENPTkZJR19HRU5F UklDX0NQVV9ERVZJQ0VTIGlzIG5vdCBzZXQKQ09ORklHX1JFR01BUD15CkNPTkZJR19SRUdNQVBf STJDPW0KQ09ORklHX1JFR01BUF9TUEk9eQpDT05GSUdfUkVHTUFQX0lSUT15CkNPTkZJR19ETUFf U0hBUkVEX0JVRkZFUj15CkNPTkZJR19DT05ORUNUT1I9eQpDT05GSUdfUFJPQ19FVkVOVFM9eQpD T05GSUdfTVREPW0KQ09ORklHX01URF9URVNUUz1tCkNPTkZJR19NVERfUkVEQk9PVF9QQVJUUz1t CkNPTkZJR19NVERfUkVEQk9PVF9ESVJFQ1RPUllfQkxPQ0s9LTEKIyBDT05GSUdfTVREX1JFREJP T1RfUEFSVFNfVU5BTExPQ0FURUQgaXMgbm90IHNldAojIENPTkZJR19NVERfUkVEQk9PVF9QQVJU U19SRUFET05MWSBpcyBub3Qgc2V0CkNPTkZJR19NVERfQVI3X1BBUlRTPW0KCiMKIyBVc2VyIE1v ZHVsZXMgQW5kIFRyYW5zbGF0aW9uIExheWVycwojCkNPTkZJR19NVERfQ0hBUj1tCkNPTkZJR19I QVZFX01URF9PVFA9eQpDT05GSUdfTVREX0JMS0RFVlM9bQpDT05GSUdfTVREX0JMT0NLPW0KQ09O RklHX01URF9CTE9DS19STz1tCkNPTkZJR19GVEw9bQpDT05GSUdfTkZUTD1tCkNPTkZJR19ORlRM X1JXPXkKQ09ORklHX0lORlRMPW0KQ09ORklHX1JGRF9GVEw9bQpDT05GSUdfU1NGREM9bQojIENP TkZJR19TTV9GVEwgaXMgbm90IHNldApDT05GSUdfTVREX09PUFM9bQpDT05GSUdfTVREX1NXQVA9 bQoKIwojIFJBTS9ST00vRmxhc2ggY2hpcCBkcml2ZXJzCiMKQ09ORklHX01URF9DRkk9bQpDT05G SUdfTVREX0pFREVDUFJPQkU9bQpDT05GSUdfTVREX0dFTl9QUk9CRT1tCkNPTkZJR19NVERfQ0ZJ X0FEVl9PUFRJT05TPXkKQ09ORklHX01URF9DRklfTk9TV0FQPXkKIyBDT05GSUdfTVREX0NGSV9C RV9CWVRFX1NXQVAgaXMgbm90IHNldAojIENPTkZJR19NVERfQ0ZJX0xFX0JZVEVfU1dBUCBpcyBu b3Qgc2V0CkNPTkZJR19NVERfQ0ZJX0dFT01FVFJZPXkKQ09ORklHX01URF9NQVBfQkFOS19XSURU SF8xPXkKQ09ORklHX01URF9NQVBfQkFOS19XSURUSF8yPXkKQ09ORklHX01URF9NQVBfQkFOS19X SURUSF80PXkKQ09ORklHX01URF9NQVBfQkFOS19XSURUSF84PXkKQ09ORklHX01URF9NQVBfQkFO S19XSURUSF8xNj15CkNPTkZJR19NVERfTUFQX0JBTktfV0lEVEhfMzI9eQpDT05GSUdfTVREX0NG SV9JMT15CkNPTkZJR19NVERfQ0ZJX0kyPXkKQ09ORklHX01URF9DRklfSTQ9eQpDT05GSUdfTVRE X0NGSV9JOD15CkNPTkZJR19NVERfT1RQPXkKQ09ORklHX01URF9DRklfSU5URUxFWFQ9bQpDT05G SUdfTVREX0NGSV9BTURTVEQ9bQpDT05GSUdfTVREX0NGSV9TVEFBPW0KQ09ORklHX01URF9DRklf VVRJTD1tCkNPTkZJR19NVERfUkFNPW0KQ09ORklHX01URF9ST009bQpDT05GSUdfTVREX0FCU0VO VD1tCgojCiMgTWFwcGluZyBkcml2ZXJzIGZvciBjaGlwIGFjY2VzcwojCkNPTkZJR19NVERfQ09N UExFWF9NQVBQSU5HUz15CkNPTkZJR19NVERfUEhZU01BUD1tCkNPTkZJR19NVERfUEhZU01BUF9D T01QQVQ9eQpDT05GSUdfTVREX1BIWVNNQVBfU1RBUlQ9MHg4MDAwMDAwCkNPTkZJR19NVERfUEhZ U01BUF9MRU49MApDT05GSUdfTVREX1BIWVNNQVBfQkFOS1dJRFRIPTIKQ09ORklHX01URF9TQzUy MENEUD1tCkNPTkZJR19NVERfTkVUU0M1MjA9bQpDT05GSUdfTVREX1RTNTUwMD1tCkNPTkZJR19N VERfU0JDX0dYWD1tCkNPTkZJR19NVERfQU1ENzZYUk9NPW0KQ09ORklHX01URF9JQ0hYUk9NPW0K Q09ORklHX01URF9FU0IyUk9NPW0KQ09ORklHX01URF9DSzgwNFhST009bQpDT05GSUdfTVREX1ND QjJfRkxBU0g9bQpDT05GSUdfTVREX05FVHRlbD1tCkNPTkZJR19NVERfTDQ0MEdYPW0KQ09ORklH X01URF9QQ0k9bQojIENPTkZJR19NVERfUENNQ0lBIGlzIG5vdCBzZXQKQ09ORklHX01URF9HUElP X0FERFI9bQpDT05GSUdfTVREX0lOVEVMX1ZSX05PUj1tCkNPTkZJR19NVERfUExBVFJBTT1tCkNP TkZJR19NVERfTEFUQ0hfQUREUj1tCgojCiMgU2VsZi1jb250YWluZWQgTVREIGRldmljZSBkcml2 ZXJzCiMKQ09ORklHX01URF9QTUM1NTE9bQpDT05GSUdfTVREX1BNQzU1MV9CVUdGSVg9eQojIENP TkZJR19NVERfUE1DNTUxX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX01URF9EQVRBRkxBU0g9bQpD T05GSUdfTVREX0RBVEFGTEFTSF9XUklURV9WRVJJRlk9eQpDT05GSUdfTVREX0RBVEFGTEFTSF9P VFA9eQpDT05GSUdfTVREX00yNVA4MD1tCkNPTkZJR19NMjVQWFhfVVNFX0ZBU1RfUkVBRD15CkNP TkZJR19NVERfU1NUMjVMPW0KQ09ORklHX01URF9TTFJBTT1tCkNPTkZJR19NVERfUEhSQU09bQpD T05GSUdfTVREX01URFJBTT1tCkNPTkZJR19NVERSQU1fVE9UQUxfU0laRT00MDk2CkNPTkZJR19N VERSQU1fRVJBU0VfU0laRT0xMjgKQ09ORklHX01URF9CTE9DSzJNVEQ9bQoKIwojIERpc2stT24t Q2hpcCBEZXZpY2UgRHJpdmVycwojCkNPTkZJR19NVERfRE9DMjAwMD1tCkNPTkZJR19NVERfRE9D MjAwMT1tCkNPTkZJR19NVERfRE9DMjAwMVBMVVM9bQpDT05GSUdfTVREX0RPQ0czPW0KQ09ORklH X0JDSF9DT05TVF9NPTE0CkNPTkZJR19CQ0hfQ09OU1RfVD00CkNPTkZJR19NVERfRE9DUFJPQkU9 bQpDT05GSUdfTVREX0RPQ0VDQz1tCkNPTkZJR19NVERfRE9DUFJPQkVfQURWQU5DRUQ9eQpDT05G SUdfTVREX0RPQ1BST0JFX0FERFJFU1M9MHgwMDAwCkNPTkZJR19NVERfRE9DUFJPQkVfSElHSD15 CkNPTkZJR19NVERfRE9DUFJPQkVfNTVBQT15CkNPTkZJR19NVERfTkFORF9FQ0M9bQpDT05GSUdf TVREX05BTkRfRUNDX1NNQz15CkNPTkZJR19NVERfTkFORD1tCkNPTkZJR19NVERfTkFORF9WRVJJ RllfV1JJVEU9eQojIENPTkZJR19NVERfTkFORF9FQ0NfQkNIIGlzIG5vdCBzZXQKIyBDT05GSUdf TVREX1NNX0NPTU1PTiBpcyBub3Qgc2V0CkNPTkZJR19NVERfTkFORF9NVVNFVU1fSURTPXkKIyBD T05GSUdfTVREX05BTkRfREVOQUxJIGlzIG5vdCBzZXQKQ09ORklHX01URF9OQU5EX0lEUz1tCiMg Q09ORklHX01URF9OQU5EX1JJQ09IIGlzIG5vdCBzZXQKQ09ORklHX01URF9OQU5EX0RJU0tPTkNI SVA9bQpDT05GSUdfTVREX05BTkRfRElTS09OQ0hJUF9QUk9CRV9BRFZBTkNFRD15CkNPTkZJR19N VERfTkFORF9ESVNLT05DSElQX1BST0JFX0FERFJFU1M9MApDT05GSUdfTVREX05BTkRfRElTS09O Q0hJUF9QUk9CRV9ISUdIPXkKQ09ORklHX01URF9OQU5EX0RJU0tPTkNISVBfQkJUV1JJVEU9eQpD T05GSUdfTVREX05BTkRfRE9DRzQ9bQpDT05GSUdfTVREX05BTkRfQ0FGRT1tCkNPTkZJR19NVERf TkFORF9OQU5EU0lNPW0KQ09ORklHX01URF9OQU5EX1BMQVRGT1JNPW0KQ09ORklHX01URF9BTEFV REE9bQpDT05GSUdfTVREX09ORU5BTkQ9bQpDT05GSUdfTVREX09ORU5BTkRfVkVSSUZZX1dSSVRF PXkKQ09ORklHX01URF9PTkVOQU5EX0dFTkVSSUM9bQpDT05GSUdfTVREX09ORU5BTkRfT1RQPXkK Q09ORklHX01URF9PTkVOQU5EXzJYX1BST0dSQU09eQpDT05GSUdfTVREX09ORU5BTkRfU0lNPW0K CiMKIyBMUEREUiBmbGFzaCBtZW1vcnkgZHJpdmVycwojCkNPTkZJR19NVERfTFBERFI9bQpDT05G SUdfTVREX1FJTkZPX1BST0JFPW0KQ09ORklHX01URF9VQkk9bQpDT05GSUdfTVREX1VCSV9XTF9U SFJFU0hPTEQ9NDA5NgpDT05GSUdfTVREX1VCSV9CRUJfUkVTRVJWRT0xCkNPTkZJR19NVERfVUJJ X0dMVUVCST1tCiMgQ09ORklHX01URF9VQklfREVCVUcgaXMgbm90IHNldApDT05GSUdfUEFSUE9S VD1tCkNPTkZJR19QQVJQT1JUX1BDPW0KQ09ORklHX1BBUlBPUlRfU0VSSUFMPW0KQ09ORklHX1BB UlBPUlRfUENfRklGTz15CkNPTkZJR19QQVJQT1JUX1BDX1NVUEVSSU89eQpDT05GSUdfUEFSUE9S VF9QQ19QQ01DSUE9bQojIENPTkZJR19QQVJQT1JUX0dTQyBpcyBub3Qgc2V0CkNPTkZJR19QQVJQ T1JUX0FYODg3OTY9bQpDT05GSUdfUEFSUE9SVF8xMjg0PXkKQ09ORklHX1BBUlBPUlRfTk9UX1BD PXkKQ09ORklHX1BOUD15CiMgQ09ORklHX1BOUF9ERUJVR19NRVNTQUdFUyBpcyBub3Qgc2V0Cgoj CiMgUHJvdG9jb2xzCiMKQ09ORklHX1BOUEFDUEk9eQpDT05GSUdfQkxLX0RFVj15CkNPTkZJR19C TEtfREVWX0ZEPW0KQ09ORklHX1BBUklERT1tCgojCiMgUGFyYWxsZWwgSURFIGhpZ2gtbGV2ZWwg ZHJpdmVycwojCkNPTkZJR19QQVJJREVfUEQ9bQpDT05GSUdfUEFSSURFX1BDRD1tCkNPTkZJR19Q QVJJREVfUEY9bQpDT05GSUdfUEFSSURFX1BUPW0KQ09ORklHX1BBUklERV9QRz1tCgojCiMgUGFy YWxsZWwgSURFIHByb3RvY29sIG1vZHVsZXMKIwpDT05GSUdfUEFSSURFX0FURU49bQpDT05GSUdf UEFSSURFX0JQQ0s9bQpDT05GSUdfUEFSSURFX0NPTU09bQpDT05GSUdfUEFSSURFX0RTVFI9bQpD T05GSUdfUEFSSURFX0ZJVDI9bQpDT05GSUdfUEFSSURFX0ZJVDM9bQpDT05GSUdfUEFSSURFX0VQ QVQ9bQpDT05GSUdfUEFSSURFX0VQQVRDOD15CkNPTkZJR19QQVJJREVfRVBJQT1tCkNPTkZJR19Q QVJJREVfRlJJUT1tCkNPTkZJR19QQVJJREVfRlJQVz1tCkNPTkZJR19QQVJJREVfS0JJQz1tCkNP TkZJR19QQVJJREVfS1RUST1tCkNPTkZJR19QQVJJREVfT04yMD1tCkNPTkZJR19QQVJJREVfT04y Nj1tCkNPTkZJR19CTEtfREVWX1BDSUVTU0RfTVRJUDMyWFg9bQpDT05GSUdfQkxLX0NQUV9EQT1t CkNPTkZJR19CTEtfQ1BRX0NJU1NfREE9bQpDT05GSUdfQ0lTU19TQ1NJX1RBUEU9eQpDT05GSUdf QkxLX0RFVl9EQUM5NjA9bQpDT05GSUdfQkxLX0RFVl9VTUVNPW0KIyBDT05GSUdfQkxLX0RFVl9D T1dfQ09NTU9OIGlzIG5vdCBzZXQKQ09ORklHX0JMS19ERVZfTE9PUD15CkNPTkZJR19CTEtfREVW X0xPT1BfTUlOX0NPVU5UPTgKQ09ORklHX0JMS19ERVZfQ1JZUFRPTE9PUD1tCkNPTkZJR19CTEtf REVWX0RSQkQ9bQojIENPTkZJR19EUkJEX0ZBVUxUX0lOSkVDVElPTiBpcyBub3Qgc2V0CkNPTkZJ R19CTEtfREVWX05CRD1tCkNPTkZJR19CTEtfREVWX05WTUU9bQpDT05GSUdfQkxLX0RFVl9PU0Q9 bQpDT05GSUdfQkxLX0RFVl9TWDg9bQojIENPTkZJR19CTEtfREVWX1VCIGlzIG5vdCBzZXQKQ09O RklHX0JMS19ERVZfUkFNPW0KQ09ORklHX0JMS19ERVZfUkFNX0NPVU5UPTE2CkNPTkZJR19CTEtf REVWX1JBTV9TSVpFPTEzMTA3MgpDT05GSUdfQkxLX0RFVl9YSVA9eQpDT05GSUdfQ0RST01fUEtU Q0RWRD1tCkNPTkZJR19DRFJPTV9QS1RDRFZEX0JVRkZFUlM9OApDT05GSUdfQ0RST01fUEtUQ0RW RF9XQ0FDSEU9eQpDT05GSUdfQVRBX09WRVJfRVRIPW0KQ09ORklHX1hFTl9CTEtERVZfRlJPTlRF TkQ9bQpDT05GSUdfWEVOX0JMS0RFVl9CQUNLRU5EPW0KQ09ORklHX1ZJUlRJT19CTEs9bQojIENP TkZJR19CTEtfREVWX0hEIGlzIG5vdCBzZXQKIyBDT05GSUdfQkxLX0RFVl9SQkQgaXMgbm90IHNl dAoKIwojIE1pc2MgZGV2aWNlcwojCkNPTkZJR19TRU5TT1JTX0xJUzNMVjAyRD1tCkNPTkZJR19B RDUyNVhfRFBPVD1tCiMgQ09ORklHX0FENTI1WF9EUE9UX0kyQyBpcyBub3Qgc2V0CiMgQ09ORklH X0FENTI1WF9EUE9UX1NQSSBpcyBub3Qgc2V0CkNPTkZJR19JQk1fQVNNPW0KQ09ORklHX1BIQU5U T009bQojIENPTkZJR19JTlRFTF9NSURfUFRJIGlzIG5vdCBzZXQKQ09ORklHX1NHSV9JT0M0PW0K Q09ORklHX1RJRk1fQ09SRT1tCkNPTkZJR19USUZNXzdYWDE9bQpDT05GSUdfSUNTOTMyUzQwMT1t CkNPTkZJR19FTkNMT1NVUkVfU0VSVklDRVM9bQpDT05GSUdfQ1M1NTM1X01GR1BUPW0KQ09ORklH X0NTNTUzNV9NRkdQVF9ERUZBVUxUX0lSUT03CkNPTkZJR19DUzU1MzVfQ0xPQ0tfRVZFTlRfU1JD PW0KQ09ORklHX0hQX0lMTz1tCkNPTkZJR19BUERTOTgwMkFMUz1tCiMgQ09ORklHX0lTTDI5MDAz IGlzIG5vdCBzZXQKQ09ORklHX0lTTDI5MDIwPW0KQ09ORklHX1NFTlNPUlNfVFNMMjU1MD1tCkNP TkZJR19TRU5TT1JTX0JIMTc4MD1tCkNPTkZJR19TRU5TT1JTX0JIMTc3MD1tCkNPTkZJR19TRU5T T1JTX0FQRFM5OTBYPW0KQ09ORklHX0hNQzYzNTI9bQpDT05GSUdfRFMxNjgyPW0KQ09ORklHX1RJ X0RBQzc1MTI9bQojIENPTkZJR19WTVdBUkVfQkFMTE9PTiBpcyBub3Qgc2V0CkNPTkZJR19CTVAw ODU9bQpDT05GSUdfUENIX1BIVUI9bQpDT05GSUdfVVNCX1NXSVRDSF9GU0E5NDgwPW0KQ09ORklH X0MyUE9SVD1tCkNPTkZJR19DMlBPUlRfRFVSQU1BUl8yMTUwPW0KCiMKIyBFRVBST00gc3VwcG9y dAojCkNPTkZJR19FRVBST01fQVQyND1tCkNPTkZJR19FRVBST01fQVQyNT1tCkNPTkZJR19FRVBS T01fTEVHQUNZPW0KQ09ORklHX0VFUFJPTV9NQVg2ODc1PW0KQ09ORklHX0VFUFJPTV85M0NYNj1t CkNPTkZJR19FRVBST01fOTNYWDQ2PW0KQ09ORklHX0NCNzEwX0NPUkU9bQojIENPTkZJR19DQjcx MF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19DQjcxMF9ERUJVR19BU1NVTVBUSU9OUz15CkNPTkZJ R19JV01DMzIwMFRPUD1tCiMgQ09ORklHX0lXTUMzMjAwVE9QX0RFQlVHIGlzIG5vdCBzZXQKIyBD T05GSUdfSVdNQzMyMDBUT1BfREVCVUdGUyBpcyBub3Qgc2V0CgojCiMgVGV4YXMgSW5zdHJ1bWVu dHMgc2hhcmVkIHRyYW5zcG9ydCBsaW5lIGRpc2NpcGxpbmUKIwpDT05GSUdfVElfU1Q9bQpDT05G SUdfU0VOU09SU19MSVMzX0kyQz1tCgojCiMgQWx0ZXJhIEZQR0EgZmlybXdhcmUgZG93bmxvYWQg bW9kdWxlCiMKQ09ORklHX0FMVEVSQV9TVEFQTD1tCkNPTkZJR19IQVZFX0lERT15CiMgQ09ORklH X0lERSBpcyBub3Qgc2V0CgojCiMgU0NTSSBkZXZpY2Ugc3VwcG9ydAojCkNPTkZJR19TQ1NJX01P RD1tCkNPTkZJR19SQUlEX0FUVFJTPW0KQ09ORklHX1NDU0k9bQpDT05GSUdfU0NTSV9ETUE9eQpD T05GSUdfU0NTSV9UR1Q9bQpDT05GSUdfU0NTSV9ORVRMSU5LPXkKQ09ORklHX1NDU0lfUFJPQ19G Uz15CgojCiMgU0NTSSBzdXBwb3J0IHR5cGUgKGRpc2ssIHRhcGUsIENELVJPTSkKIwpDT05GSUdf QkxLX0RFVl9TRD1tCkNPTkZJR19DSFJfREVWX1NUPW0KQ09ORklHX0NIUl9ERVZfT1NTVD1tCkNP TkZJR19CTEtfREVWX1NSPW0KIyBDT05GSUdfQkxLX0RFVl9TUl9WRU5ET1IgaXMgbm90IHNldApD T05GSUdfQ0hSX0RFVl9TRz1tCkNPTkZJR19DSFJfREVWX1NDSD1tCkNPTkZJR19TQ1NJX0VOQ0xP U1VSRT1tCkNPTkZJR19TQ1NJX01VTFRJX0xVTj15CkNPTkZJR19TQ1NJX0NPTlNUQU5UUz15CkNP TkZJR19TQ1NJX0xPR0dJTkc9eQojIENPTkZJR19TQ1NJX1NDQU5fQVNZTkMgaXMgbm90IHNldApD T05GSUdfU0NTSV9XQUlUX1NDQU49bQoKIwojIFNDU0kgVHJhbnNwb3J0cwojCkNPTkZJR19TQ1NJ X1NQSV9BVFRSUz1tCkNPTkZJR19TQ1NJX0ZDX0FUVFJTPW0KQ09ORklHX1NDU0lfRkNfVEdUX0FU VFJTPXkKQ09ORklHX1NDU0lfSVNDU0lfQVRUUlM9bQpDT05GSUdfU0NTSV9TQVNfQVRUUlM9bQpD T05GSUdfU0NTSV9TQVNfTElCU0FTPW0KQ09ORklHX1NDU0lfU0FTX0FUQT15CkNPTkZJR19TQ1NJ X1NBU19IT1NUX1NNUD15CkNPTkZJR19TQ1NJX1NSUF9BVFRSUz1tCkNPTkZJR19TQ1NJX1NSUF9U R1RfQVRUUlM9eQpDT05GSUdfU0NTSV9MT1dMRVZFTD15CkNPTkZJR19JU0NTSV9UQ1A9bQpDT05G SUdfSVNDU0lfQk9PVF9TWVNGUz1tCkNPTkZJR19TQ1NJX0NYR0IzX0lTQ1NJPW0KQ09ORklHX1ND U0lfQ1hHQjRfSVNDU0k9bQpDT05GSUdfU0NTSV9CTlgyX0lTQ1NJPW0KQ09ORklHX1NDU0lfQk5Y MlhfRkNPRT1tCkNPTkZJR19CRTJJU0NTST1tCkNPTkZJR19CTEtfREVWXzNXX1hYWFhfUkFJRD1t CkNPTkZJR19TQ1NJX0hQU0E9bQpDT05GSUdfU0NTSV8zV185WFhYPW0KQ09ORklHX1NDU0lfM1df U0FTPW0KQ09ORklHX1NDU0lfQUNBUkQ9bQpDT05GSUdfU0NTSV9BQUNSQUlEPW0KQ09ORklHX1ND U0lfQUlDN1hYWD1tCkNPTkZJR19BSUM3WFhYX0NNRFNfUEVSX0RFVklDRT0zMgpDT05GSUdfQUlD N1hYWF9SRVNFVF9ERUxBWV9NUz0xNTAwMAojIENPTkZJR19BSUM3WFhYX0RFQlVHX0VOQUJMRSBp cyBub3Qgc2V0CkNPTkZJR19BSUM3WFhYX0RFQlVHX01BU0s9MApDT05GSUdfQUlDN1hYWF9SRUdf UFJFVFRZX1BSSU5UPXkKQ09ORklHX1NDU0lfQUlDN1hYWF9PTEQ9bQpDT05GSUdfU0NTSV9BSUM3 OVhYPW0KQ09ORklHX0FJQzc5WFhfQ01EU19QRVJfREVWSUNFPTMyCkNPTkZJR19BSUM3OVhYX1JF U0VUX0RFTEFZX01TPTUwMDAKIyBDT05GSUdfQUlDNzlYWF9ERUJVR19FTkFCTEUgaXMgbm90IHNl dApDT05GSUdfQUlDNzlYWF9ERUJVR19NQVNLPTAKQ09ORklHX0FJQzc5WFhfUkVHX1BSRVRUWV9Q UklOVD15CkNPTkZJR19TQ1NJX0FJQzk0WFg9bQojIENPTkZJR19BSUM5NFhYX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX1NDU0lfTVZTQVM9bQojIENPTkZJR19TQ1NJX01WU0FTX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX1NDU0lfTVZTQVNfVEFTS0xFVD15CkNPTkZJR19TQ1NJX01WVU1JPW0KQ09O RklHX1NDU0lfRFBUX0kyTz1tCkNPTkZJR19TQ1NJX0FEVkFOU1lTPW0KQ09ORklHX1NDU0lfQVJD TVNSPW0KQ09ORklHX01FR0FSQUlEX05FV0dFTj15CkNPTkZJR19NRUdBUkFJRF9NTT1tCkNPTkZJ R19NRUdBUkFJRF9NQUlMQk9YPW0KQ09ORklHX01FR0FSQUlEX0xFR0FDWT1tCkNPTkZJR19NRUdB UkFJRF9TQVM9bQpDT05GSUdfU0NTSV9NUFQyU0FTPW0KQ09ORklHX1NDU0lfTVBUMlNBU19NQVhf U0dFPTEyOAojIENPTkZJR19TQ1NJX01QVDJTQVNfTE9HR0lORyBpcyBub3Qgc2V0CkNPTkZJR19T Q1NJX1VGU0hDRD1tCkNPTkZJR19TQ1NJX0hQVElPUD1tCkNPTkZJR19TQ1NJX0JVU0xPR0lDPW0K IyBDT05GSUdfVk1XQVJFX1BWU0NTSSBpcyBub3Qgc2V0CkNPTkZJR19MSUJGQz1tCkNPTkZJR19M SUJGQ09FPW0KQ09ORklHX0ZDT0U9bQpDT05GSUdfRkNPRV9GTklDPW0KQ09ORklHX1NDU0lfRE1Y MzE5MUQ9bQpDT05GSUdfU0NTSV9FQVRBPW0KQ09ORklHX1NDU0lfRUFUQV9UQUdHRURfUVVFVUU9 eQpDT05GSUdfU0NTSV9FQVRBX0xJTktFRF9DT01NQU5EUz15CkNPTkZJR19TQ1NJX0VBVEFfTUFY X1RBR1M9MTYKQ09ORklHX1NDU0lfRlVUVVJFX0RPTUFJTj1tCkNPTkZJR19TQ1NJX0dEVEg9bQpD T05GSUdfU0NTSV9JU0NJPW0KQ09ORklHX1NDU0lfSVBTPW0KQ09ORklHX1NDU0lfSU5JVElPPW0K Q09ORklHX1NDU0lfSU5JQTEwMD1tCkNPTkZJR19TQ1NJX1BQQT1tCkNPTkZJR19TQ1NJX0lNTT1t CiMgQ09ORklHX1NDU0lfSVpJUF9FUFAxNiBpcyBub3Qgc2V0CiMgQ09ORklHX1NDU0lfSVpJUF9T TE9XX0NUUiBpcyBub3Qgc2V0CkNPTkZJR19TQ1NJX1NURVg9bQpDT05GSUdfU0NTSV9TWU01M0M4 WFhfMj1tCkNPTkZJR19TQ1NJX1NZTTUzQzhYWF9ETUFfQUREUkVTU0lOR19NT0RFPTEKQ09ORklH X1NDU0lfU1lNNTNDOFhYX0RFRkFVTFRfVEFHUz0xNgpDT05GSUdfU0NTSV9TWU01M0M4WFhfTUFY X1RBR1M9NjQKQ09ORklHX1NDU0lfU1lNNTNDOFhYX01NSU89eQpDT05GSUdfU0NTSV9JUFI9bQpD T05GSUdfU0NTSV9JUFJfVFJBQ0U9eQpDT05GSUdfU0NTSV9JUFJfRFVNUD15CkNPTkZJR19TQ1NJ X1FMT0dJQ18xMjgwPW0KQ09ORklHX1NDU0lfUUxBX0ZDPW0KQ09ORklHX1NDU0lfUUxBX0lTQ1NJ PW0KQ09ORklHX1NDU0lfTFBGQz1tCiMgQ09ORklHX1NDU0lfTFBGQ19ERUJVR19GUyBpcyBub3Qg c2V0CkNPTkZJR19TQ1NJX0RDMzk1eD1tCkNPTkZJR19TQ1NJX0RDMzkwVD1tCkNPTkZJR19TQ1NJ X0RFQlVHPW0KQ09ORklHX1NDU0lfUE1DUkFJRD1tCkNPTkZJR19TQ1NJX1BNODAwMT1tCkNPTkZJ R19TQ1NJX1NSUD1tCkNPTkZJR19TQ1NJX0JGQV9GQz1tCkNPTkZJR19TQ1NJX1ZJUlRJTz1tCkNP TkZJR19TQ1NJX0xPV0xFVkVMX1BDTUNJQT15CkNPTkZJR19QQ01DSUFfQUhBMTUyWD1tCkNPTkZJ R19QQ01DSUFfRkRPTUFJTj1tCkNPTkZJR19QQ01DSUFfUUxPR0lDPW0KQ09ORklHX1BDTUNJQV9T WU01M0M1MDA9bQpDT05GSUdfU0NTSV9ESD1tCkNPTkZJR19TQ1NJX0RIX1JEQUM9bQpDT05GSUdf U0NTSV9ESF9IUF9TVz1tCkNPTkZJR19TQ1NJX0RIX0VNQz1tCkNPTkZJR19TQ1NJX0RIX0FMVUE9 bQpDT05GSUdfU0NTSV9PU0RfSU5JVElBVE9SPW0KQ09ORklHX1NDU0lfT1NEX1VMRD1tCkNPTkZJ R19TQ1NJX09TRF9EUFJJTlRfU0VOU0U9MQojIENPTkZJR19TQ1NJX09TRF9ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19BVEE9bQojIENPTkZJR19BVEFfTk9OU1RBTkRBUkQgaXMgbm90IHNldApDT05G SUdfQVRBX1ZFUkJPU0VfRVJST1I9eQpDT05GSUdfQVRBX0FDUEk9eQpDT05GSUdfU0FUQV9QTVA9 eQoKIwojIENvbnRyb2xsZXJzIHdpdGggbm9uLVNGRiBuYXRpdmUgaW50ZXJmYWNlCiMKQ09ORklH X1NBVEFfQUhDST1tCkNPTkZJR19TQVRBX0FIQ0lfUExBVEZPUk09bQpDT05GSUdfU0FUQV9JTklD MTYyWD1tCkNPTkZJR19TQVRBX0FDQVJEX0FIQ0k9bQpDT05GSUdfU0FUQV9TSUwyND1tCkNPTkZJ R19BVEFfU0ZGPXkKCiMKIyBTRkYgY29udHJvbGxlcnMgd2l0aCBjdXN0b20gRE1BIGludGVyZmFj ZQojCkNPTkZJR19QRENfQURNQT1tCkNPTkZJR19TQVRBX1FTVE9SPW0KQ09ORklHX1NBVEFfU1g0 PW0KQ09ORklHX0FUQV9CTURNQT15CgojCiMgU0FUQSBTRkYgY29udHJvbGxlcnMgd2l0aCBCTURN QQojCkNPTkZJR19BVEFfUElJWD1tCkNPTkZJR19TQVRBX01WPW0KQ09ORklHX1NBVEFfTlY9bQpD T05GSUdfU0FUQV9QUk9NSVNFPW0KQ09ORklHX1NBVEFfU0lMPW0KQ09ORklHX1NBVEFfU0lTPW0K Q09ORklHX1NBVEFfU1ZXPW0KQ09ORklHX1NBVEFfVUxJPW0KQ09ORklHX1NBVEFfVklBPW0KQ09O RklHX1NBVEFfVklURVNTRT1tCgojCiMgUEFUQSBTRkYgY29udHJvbGxlcnMgd2l0aCBCTURNQQoj CkNPTkZJR19QQVRBX0FMST1tCkNPTkZJR19QQVRBX0FNRD1tCkNPTkZJR19QQVRBX0FSQVNBTl9D Rj1tCkNPTkZJR19QQVRBX0FSVE9QPW0KQ09ORklHX1BBVEFfQVRJSVhQPW0KQ09ORklHX1BBVEFf QVRQODY3WD1tCkNPTkZJR19QQVRBX0NNRDY0WD1tCkNPTkZJR19QQVRBX0NTNTUyMD1tCkNPTkZJ R19QQVRBX0NTNTUzMD1tCkNPTkZJR19QQVRBX0NTNTUzNj1tCkNPTkZJR19QQVRBX0NZUFJFU1M9 bQpDT05GSUdfUEFUQV9FRkFSPW0KQ09ORklHX1BBVEFfSFBUMzY2PW0KQ09ORklHX1BBVEFfSFBU MzdYPW0KQ09ORklHX1BBVEFfSFBUM1gyTj1tCkNPTkZJR19QQVRBX0hQVDNYMz1tCiMgQ09ORklH X1BBVEFfSFBUM1gzX0RNQSBpcyBub3Qgc2V0CkNPTkZJR19QQVRBX0lUODIxMz1tCkNPTkZJR19Q QVRBX0lUODIxWD1tCkNPTkZJR19QQVRBX0pNSUNST049bQpDT05GSUdfUEFUQV9NQVJWRUxMPW0K Q09ORklHX1BBVEFfTkVUQ0VMTD1tCkNPTkZJR19QQVRBX05JTkpBMzI9bQpDT05GSUdfUEFUQV9O Uzg3NDE1PW0KQ09ORklHX1BBVEFfT0xEUElJWD1tCkNPTkZJR19QQVRBX09QVElETUE9bQpDT05G SUdfUEFUQV9QREMyMDI3WD1tCkNPTkZJR19QQVRBX1BEQ19PTEQ9bQpDT05GSUdfUEFUQV9SQURJ U1lTPW0KQ09ORklHX1BBVEFfUkRDPW0KQ09ORklHX1BBVEFfU0MxMjAwPW0KQ09ORklHX1BBVEFf U0NIPW0KQ09ORklHX1BBVEFfU0VSVkVSV09SS1M9bQpDT05GSUdfUEFUQV9TSUw2ODA9bQpDT05G SUdfUEFUQV9TSVM9bQpDT05GSUdfUEFUQV9UT1NISUJBPW0KQ09ORklHX1BBVEFfVFJJRkxFWD1t CkNPTkZJR19QQVRBX1ZJQT1tCkNPTkZJR19QQVRBX1dJTkJPTkQ9bQoKIwojIFBJTy1vbmx5IFNG RiBjb250cm9sbGVycwojCkNPTkZJR19QQVRBX0NNRDY0MF9QQ0k9bQpDT05GSUdfUEFUQV9NUElJ WD1tCkNPTkZJR19QQVRBX05TODc0MTA9bQpDT05GSUdfUEFUQV9PUFRJPW0KQ09ORklHX1BBVEFf UENNQ0lBPW0KQ09ORklHX1BBVEFfUloxMDAwPW0KCiMKIyBHZW5lcmljIGZhbGxiYWNrIC8gbGVn YWN5IGRyaXZlcnMKIwpDT05GSUdfUEFUQV9BQ1BJPW0KQ09ORklHX0FUQV9HRU5FUklDPW0KIyBD T05GSUdfUEFUQV9MRUdBQ1kgaXMgbm90IHNldApDT05GSUdfTUQ9eQpDT05GSUdfQkxLX0RFVl9N RD15CkNPTkZJR19NRF9BVVRPREVURUNUPXkKQ09ORklHX01EX0xJTkVBUj1tCkNPTkZJR19NRF9S QUlEMD1tCkNPTkZJR19NRF9SQUlEMT1tCkNPTkZJR19NRF9SQUlEMTA9bQpDT05GSUdfTURfUkFJ RDQ1Nj1tCiMgQ09ORklHX01VTFRJQ09SRV9SQUlENDU2IGlzIG5vdCBzZXQKQ09ORklHX01EX01V TFRJUEFUSD1tCkNPTkZJR19NRF9GQVVMVFk9bQpDT05GSUdfQkxLX0RFVl9ETT15CiMgQ09ORklH X0RNX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0RNX0JVRklPPW0KQ09ORklHX0RNX1BFUlNJU1RF TlRfREFUQT1tCkNPTkZJR19ETV9DUllQVD1tCkNPTkZJR19ETV9TTkFQU0hPVD1tCkNPTkZJR19E TV9USElOX1BST1ZJU0lPTklORz1tCiMgQ09ORklHX0RNX0RFQlVHX0JMT0NLX1NUQUNLX1RSQUNJ TkcgaXMgbm90IHNldAojIENPTkZJR19ETV9ERUJVR19TUEFDRV9NQVBTIGlzIG5vdCBzZXQKQ09O RklHX0RNX01JUlJPUj1tCkNPTkZJR19ETV9SQUlEPW0KQ09ORklHX0RNX0xPR19VU0VSU1BBQ0U9 bQpDT05GSUdfRE1fWkVSTz1tCkNPTkZJR19ETV9NVUxUSVBBVEg9bQpDT05GSUdfRE1fTVVMVElQ QVRIX1FMPW0KQ09ORklHX0RNX01VTFRJUEFUSF9TVD1tCkNPTkZJR19ETV9ERUxBWT1tCkNPTkZJ R19ETV9VRVZFTlQ9eQpDT05GSUdfRE1fRkxBS0VZPW0KQ09ORklHX0RNX1ZFUklUWT1tCiMgQ09O RklHX1RBUkdFVF9DT1JFIGlzIG5vdCBzZXQKQ09ORklHX0ZVU0lPTj15CkNPTkZJR19GVVNJT05f U1BJPW0KQ09ORklHX0ZVU0lPTl9GQz1tCkNPTkZJR19GVVNJT05fU0FTPW0KQ09ORklHX0ZVU0lP Tl9NQVhfU0dFPTEyOApDT05GSUdfRlVTSU9OX0NUTD1tCkNPTkZJR19GVVNJT05fTEFOPW0KIyBD T05GSUdfRlVTSU9OX0xPR0dJTkcgaXMgbm90IHNldAoKIwojIElFRUUgMTM5NCAoRmlyZVdpcmUp IHN1cHBvcnQKIwpDT05GSUdfRklSRVdJUkU9bQpDT05GSUdfRklSRVdJUkVfT0hDST1tCkNPTkZJ R19GSVJFV0lSRV9TQlAyPW0KQ09ORklHX0ZJUkVXSVJFX05FVD1tCiMgQ09ORklHX0ZJUkVXSVJF X05PU1kgaXMgbm90IHNldApDT05GSUdfSTJPPW0KQ09ORklHX0kyT19MQ1RfTk9USUZZX09OX0NI QU5HRVM9eQpDT05GSUdfSTJPX0VYVF9BREFQVEVDPXkKQ09ORklHX0kyT19FWFRfQURBUFRFQ19E TUE2ND15CkNPTkZJR19JMk9fQ09ORklHPW0KQ09ORklHX0kyT19DT05GSUdfT0xEX0lPQ1RMPXkK Q09ORklHX0kyT19CVVM9bQpDT05GSUdfSTJPX0JMT0NLPW0KQ09ORklHX0kyT19TQ1NJPW0KQ09O RklHX0kyT19QUk9DPW0KQ09ORklHX01BQ0lOVE9TSF9EUklWRVJTPXkKQ09ORklHX01BQ19FTVVN T1VTRUJUTj1tCkNPTkZJR19ORVRERVZJQ0VTPXkKQ09ORklHX05FVF9DT1JFPXkKQ09ORklHX0JP TkRJTkc9bQpDT05GSUdfRFVNTVk9bQpDT05GSUdfRVFVQUxJWkVSPW0KQ09ORklHX05FVF9GQz15 CkNPTkZJR19NSUk9eQpDT05GSUdfSUVFRTgwMjE1NF9EUklWRVJTPW0KQ09ORklHX0lFRUU4MDIx NTRfRkFLRUhBUkQ9bQpDT05GSUdfSUZCPW0KQ09ORklHX05FVF9URUFNPW0KQ09ORklHX05FVF9U RUFNX01PREVfUk9VTkRST0JJTj1tCkNPTkZJR19ORVRfVEVBTV9NT0RFX0FDVElWRUJBQ0tVUD1t CkNPTkZJR19NQUNWTEFOPW0KQ09ORklHX01BQ1ZUQVA9bQpDT05GSUdfTkVUQ09OU09MRT1tCkNP TkZJR19ORVRDT05TT0xFX0RZTkFNSUM9eQpDT05GSUdfTkVUUE9MTD15CkNPTkZJR19ORVRQT0xM X1RSQVA9eQpDT05GSUdfTkVUX1BPTExfQ09OVFJPTExFUj15CkNPTkZJR19UVU49bQpDT05GSUdf VkVUSD1tCkNPTkZJR19WSVJUSU9fTkVUPW0KQ09ORklHX1NVTkdFTV9QSFk9bQpDT05GSUdfQVJD TkVUPW0KQ09ORklHX0FSQ05FVF8xMjAxPW0KQ09ORklHX0FSQ05FVF8xMDUxPW0KQ09ORklHX0FS Q05FVF9SQVc9bQpDT05GSUdfQVJDTkVUX0NBUD1tCkNPTkZJR19BUkNORVRfQ09NOTB4eD1tCkNP TkZJR19BUkNORVRfQ09NOTB4eElPPW0KQ09ORklHX0FSQ05FVF9SSU1fST1tCiMgQ09ORklHX0FS Q05FVF9DT00yMDAyMCBpcyBub3Qgc2V0CkNPTkZJR19BVE1fRFJJVkVSUz15CkNPTkZJR19BVE1f RFVNTVk9bQpDT05GSUdfQVRNX1RDUD1tCkNPTkZJR19BVE1fTEFOQUk9bQpDT05GSUdfQVRNX0VO ST1tCiMgQ09ORklHX0FUTV9FTklfREVCVUcgaXMgbm90IHNldApDT05GSUdfQVRNX0VOSV9UVU5F X0JVUlNUPXkKQ09ORklHX0FUTV9FTklfQlVSU1RfVFhfMTZXPXkKQ09ORklHX0FUTV9FTklfQlVS U1RfVFhfOFc9eQpDT05GSUdfQVRNX0VOSV9CVVJTVF9UWF80Vz15CkNPTkZJR19BVE1fRU5JX0JV UlNUX1RYXzJXPXkKQ09ORklHX0FUTV9FTklfQlVSU1RfUlhfMTZXPXkKQ09ORklHX0FUTV9FTklf QlVSU1RfUlhfOFc9eQpDT05GSUdfQVRNX0VOSV9CVVJTVF9SWF80Vz15CkNPTkZJR19BVE1fRU5J X0JVUlNUX1JYXzJXPXkKQ09ORklHX0FUTV9GSVJFU1RSRUFNPW0KQ09ORklHX0FUTV9aQVRNPW0K IyBDT05GSUdfQVRNX1pBVE1fREVCVUcgaXMgbm90IHNldApDT05GSUdfQVRNX05JQ1NUQVI9bQoj IENPTkZJR19BVE1fTklDU1RBUl9VU0VfU1VOSSBpcyBub3Qgc2V0CiMgQ09ORklHX0FUTV9OSUNT VEFSX1VTRV9JRFQ3NzEwNSBpcyBub3Qgc2V0CkNPTkZJR19BVE1fSURUNzcyNTI9bQojIENPTkZJ R19BVE1fSURUNzcyNTJfREVCVUcgaXMgbm90IHNldAojIENPTkZJR19BVE1fSURUNzcyNTJfUkNW X0FMTCBpcyBub3Qgc2V0CkNPTkZJR19BVE1fSURUNzcyNTJfVVNFX1NVTkk9eQpDT05GSUdfQVRN X0FNQkFTU0FET1I9bQojIENPTkZJR19BVE1fQU1CQVNTQURPUl9ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19BVE1fSE9SSVpPTj1tCiMgQ09ORklHX0FUTV9IT1JJWk9OX0RFQlVHIGlzIG5vdCBzZXQK Q09ORklHX0FUTV9JQT1tCiMgQ09ORklHX0FUTV9JQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19B VE1fRk9SRTIwMEU9bQpDT05GSUdfQVRNX0ZPUkUyMDBFX1VTRV9UQVNLTEVUPXkKQ09ORklHX0FU TV9GT1JFMjAwRV9UWF9SRVRSWT0xNgpDT05GSUdfQVRNX0ZPUkUyMDBFX0RFQlVHPTAKQ09ORklH X0FUTV9IRT1tCkNPTkZJR19BVE1fSEVfVVNFX1NVTkk9eQpDT05GSUdfQVRNX1NPTE9TPW0KCiMK IyBDQUlGIHRyYW5zcG9ydCBkcml2ZXJzCiMKCiMKIyBEaXN0cmlidXRlZCBTd2l0Y2ggQXJjaGl0 ZWN0dXJlIGRyaXZlcnMKIwpDT05GSUdfTkVUX0RTQV9NVjg4RTZYWFg9eQpDT05GSUdfTkVUX0RT QV9NVjg4RTYwNjA9eQpDT05GSUdfTkVUX0RTQV9NVjg4RTZYWFhfTkVFRF9QUFU9eQpDT05GSUdf TkVUX0RTQV9NVjg4RTYxMzE9eQpDT05GSUdfTkVUX0RTQV9NVjg4RTYxMjNfNjFfNjU9eQpDT05G SUdfRVRIRVJORVQ9eQpDT05GSUdfTURJTz1tCkNPTkZJR19ORVRfVkVORE9SXzNDT009eQpDT05G SUdfUENNQ0lBXzNDNTc0PW0KQ09ORklHX1BDTUNJQV8zQzU4OT1tCkNPTkZJR19WT1JURVg9bQpD T05GSUdfVFlQSE9PTj1tCkNPTkZJR19ORVRfVkVORE9SX0FEQVBURUM9eQpDT05GSUdfQURBUFRF Q19TVEFSRklSRT1tCkNPTkZJR19ORVRfVkVORE9SX0FMVEVPTj15CkNPTkZJR19BQ0VOSUM9bQoj IENPTkZJR19BQ0VOSUNfT01JVF9USUdPTl9JIGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5ET1Jf QU1EPXkKQ09ORklHX0FNRDgxMTFfRVRIPW0KQ09ORklHX1BDTkVUMzI9bQpDT05GSUdfUENNQ0lB X05NQ0xBTj1tCkNPTkZJR19ORVRfVkVORE9SX0FUSEVST1M9eQpDT05GSUdfQVRMMj1tCkNPTkZJ R19BVEwxPW0KQ09ORklHX0FUTDFFPW0KQ09ORklHX0FUTDFDPW0KQ09ORklHX05FVF9WRU5ET1Jf QlJPQURDT009eQpDT05GSUdfQjQ0PW0KQ09ORklHX0I0NF9QQ0lfQVVUT1NFTEVDVD15CkNPTkZJ R19CNDRfUENJQ09SRV9BVVRPU0VMRUNUPXkKQ09ORklHX0I0NF9QQ0k9eQpDT05GSUdfQk5YMj1t CkNPTkZJR19DTklDPW0KQ09ORklHX1RJR09OMz1tCkNPTkZJR19CTlgyWD1tCkNPTkZJR19ORVRf VkVORE9SX0JST0NBREU9eQpDT05GSUdfQk5BPW0KQ09ORklHX05FVF9DQUxYRURBX1hHTUFDPW0K Q09ORklHX05FVF9WRU5ET1JfQ0hFTFNJTz15CkNPTkZJR19DSEVMU0lPX1QxPW0KQ09ORklHX0NI RUxTSU9fVDFfMUc9eQpDT05GSUdfQ0hFTFNJT19UMz1tCkNPTkZJR19DSEVMU0lPX1Q0PW0KQ09O RklHX0NIRUxTSU9fVDRWRj1tCkNPTkZJR19ORVRfVkVORE9SX0NJU0NPPXkKQ09ORklHX0VOSUM9 bQpDT05GSUdfRE5FVD1tCkNPTkZJR19ORVRfVkVORE9SX0RFQz15CkNPTkZJR19ORVRfVFVMSVA9 eQpDT05GSUdfREUyMTA0WD1tCkNPTkZJR19ERTIxMDRYX0RTTD0wCkNPTkZJR19UVUxJUD1tCiMg Q09ORklHX1RVTElQX01XSSBpcyBub3Qgc2V0CiMgQ09ORklHX1RVTElQX01NSU8gaXMgbm90IHNl dApDT05GSUdfVFVMSVBfTkFQST15CkNPTkZJR19UVUxJUF9OQVBJX0hXX01JVElHQVRJT049eQpD T05GSUdfREU0WDU9bQpDT05GSUdfV0lOQk9ORF84NDA9bQpDT05GSUdfRE05MTAyPW0KQ09ORklH X1VMSTUyNlg9bQpDT05GSUdfUENNQ0lBX1hJUkNPTT1tCkNPTkZJR19ORVRfVkVORE9SX0RMSU5L PXkKQ09ORklHX0RFNjAwPW0KQ09ORklHX0RFNjIwPW0KQ09ORklHX0RMMks9bQpDT05GSUdfU1VO REFOQ0U9bQojIENPTkZJR19TVU5EQU5DRV9NTUlPIGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5E T1JfRU1VTEVYPXkKQ09ORklHX0JFMk5FVD1tCkNPTkZJR19ORVRfVkVORE9SX0VYQVI9eQpDT05G SUdfUzJJTz1tCkNPTkZJR19WWEdFPW0KIyBDT05GSUdfVlhHRV9ERUJVR19UUkFDRV9BTEwgaXMg bm90IHNldApDT05GSUdfTkVUX1ZFTkRPUl9GVUpJVFNVPXkKQ09ORklHX1BDTUNJQV9GTVZKMThY PW0KQ09ORklHX05FVF9WRU5ET1JfSFA9eQpDT05GSUdfSFAxMDA9bQpDT05GSUdfTkVUX1ZFTkRP Ul9JTlRFTD15CkNPTkZJR19FMTAwPW0KQ09ORklHX0UxMDAwPW0KQ09ORklHX0UxMDAwRT1tCkNP TkZJR19JR0I9bQpDT05GSUdfSUdCX0RDQT15CkNPTkZJR19JR0JWRj1tCkNPTkZJR19JWEdCPW0K Q09ORklHX0lYR0JFPW0KQ09ORklHX0lYR0JFX0RDQT15CkNPTkZJR19JWEdCRV9EQ0I9eQpDT05G SUdfSVhHQkVWRj1tCkNPTkZJR19ORVRfVkVORE9SX0k4MjVYWD15CkNPTkZJR19aTkVUPW0KQ09O RklHX0lQMTAwMD1tCkNPTkZJR19KTUU9bQpDT05GSUdfTkVUX1ZFTkRPUl9NQVJWRUxMPXkKQ09O RklHX1NLR0U9bQojIENPTkZJR19TS0dFX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1NLR0VfR0VO RVNJUz15CkNPTkZJR19TS1kyPW0KIyBDT05GSUdfU0tZMl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19ORVRfVkVORE9SX01FTExBTk9YPXkKQ09ORklHX01MWDRfRU49bQpDT05GSUdfTUxYNF9DT1JF PW0KQ09ORklHX01MWDRfREVCVUc9eQpDT05GSUdfTkVUX1ZFTkRPUl9NSUNSRUw9eQpDT05GSUdf S1M4ODQyPW0KQ09ORklHX0tTODg1MT1tCkNPTkZJR19LUzg4NTFfTUxMPW0KQ09ORklHX0tTWjg4 NFhfUENJPW0KQ09ORklHX05FVF9WRU5ET1JfTUlDUk9DSElQPXkKQ09ORklHX0VOQzI4SjYwPW0K IyBDT05GSUdfRU5DMjhKNjBfV1JJVEVWRVJJRlkgaXMgbm90IHNldApDT05GSUdfTkVUX1ZFTkRP Ul9NWVJJPXkKQ09ORklHX01ZUkkxMEdFPW0KQ09ORklHX01ZUkkxMEdFX0RDQT15CkNPTkZJR19G RUFMTlg9bQpDT05GSUdfTkVUX1ZFTkRPUl9OQVRTRU1JPXkKQ09ORklHX05BVFNFTUk9bQpDT05G SUdfTlM4MzgyMD1tCkNPTkZJR19ORVRfVkVORE9SXzgzOTA9eQpDT05GSUdfUENNQ0lBX0FYTkVU PW0KQ09ORklHX05FMktfUENJPW0KQ09ORklHX1BDTUNJQV9QQ05FVD1tCkNPTkZJR19ORVRfVkVO RE9SX05WSURJQT15CkNPTkZJR19GT1JDRURFVEg9bQpDT05GSUdfTkVUX1ZFTkRPUl9PS0k9eQpD T05GSUdfUENIX0dCRT1tCkNPTkZJR19FVEhPQz1tCiMgQ09ORklHX05FVF9QQUNLRVRfRU5HSU5F IGlzIG5vdCBzZXQKQ09ORklHX05FVF9WRU5ET1JfUUxPR0lDPXkKQ09ORklHX1FMQTNYWFg9bQpD T05GSUdfUUxDTklDPW0KQ09ORklHX1FMR0U9bQpDT05GSUdfTkVUWEVOX05JQz1tCkNPTkZJR19O RVRfVkVORE9SX1JFQUxURUs9eQpDT05GSUdfQVRQPW0KQ09ORklHXzgxMzlDUD1tCkNPTkZJR184 MTM5VE9PPW0KIyBDT05GSUdfODEzOVRPT19QSU8gaXMgbm90IHNldAojIENPTkZJR184MTM5VE9P X1RVTkVfVFdJU1RFUiBpcyBub3Qgc2V0CkNPTkZJR184MTM5VE9PXzgxMjk9eQojIENPTkZJR184 MTM5X09MRF9SWF9SRVNFVCBpcyBub3Qgc2V0CkNPTkZJR19SODE2OT1tCkNPTkZJR19ORVRfVkVO RE9SX1JEQz15CkNPTkZJR19SNjA0MD1tCkNPTkZJR19ORVRfVkVORE9SX1NFRVE9eQpDT05GSUdf U0VFUTgwMDU9bQpDT05GSUdfTkVUX1ZFTkRPUl9TSUxBTj15CkNPTkZJR19TQzkyMDMxPW0KQ09O RklHX05FVF9WRU5ET1JfU0lTPXkKQ09ORklHX1NJUzkwMD1tCkNPTkZJR19TSVMxOTA9bQpDT05G SUdfU0ZDPW0KQ09ORklHX1NGQ19NVEQ9eQpDT05GSUdfU0ZDX01DRElfTU9OPXkKQ09ORklHX1NG Q19TUklPVj15CkNPTkZJR19ORVRfVkVORE9SX1NNU0M9eQpDT05GSUdfUENNQ0lBX1NNQzkxQzky PW0KQ09ORklHX0VQSUMxMDA9bQpDT05GSUdfU01TQzk0MjA9bQpDT05GSUdfTkVUX1ZFTkRPUl9T VE1JQ1JPPXkKQ09ORklHX1NUTU1BQ19FVEg9bQpDT05GSUdfU1RNTUFDX1BMQVRGT1JNPW0KQ09O RklHX1NUTU1BQ19QQ0k9bQojIENPTkZJR19TVE1NQUNfREVCVUdfRlMgaXMgbm90IHNldAojIENP TkZJR19TVE1NQUNfREEgaXMgbm90IHNldApDT05GSUdfU1RNTUFDX1JJTkc9eQojIENPTkZJR19T VE1NQUNfQ0hBSU5FRCBpcyBub3Qgc2V0CkNPTkZJR19ORVRfVkVORE9SX1NVTj15CkNPTkZJR19I QVBQWU1FQUw9bQpDT05GSUdfU1VOR0VNPW0KQ09ORklHX0NBU1NJTkk9bQpDT05GSUdfTklVPW0K Q09ORklHX05FVF9WRU5ET1JfVEVIVVRJPXkKQ09ORklHX1RFSFVUST1tCkNPTkZJR19ORVRfVkVO RE9SX1RJPXkKQ09ORklHX1RMQU49bQpDT05GSUdfTkVUX1ZFTkRPUl9WSUE9eQpDT05GSUdfVklB X1JISU5FPW0KQ09ORklHX1ZJQV9SSElORV9NTUlPPXkKQ09ORklHX1ZJQV9WRUxPQ0lUWT1tCkNP TkZJR19ORVRfVkVORE9SX1hJUkNPTT15CkNPTkZJR19QQ01DSUFfWElSQzJQUz1tCkNPTkZJR19G RERJPW0KQ09ORklHX0RFRlhYPW0KQ09ORklHX0RFRlhYX01NSU89eQpDT05GSUdfU0tGUD1tCkNP TkZJR19ISVBQST15CkNPTkZJR19ST0FEUlVOTkVSPW0KQ09ORklHX1JPQURSVU5ORVJfTEFSR0Vf UklOR1M9eQojIENPTkZJR19ORVRfU0IxMDAwIGlzIG5vdCBzZXQKQ09ORklHX1BIWUxJQj15Cgoj CiMgTUlJIFBIWSBkZXZpY2UgZHJpdmVycwojCkNPTkZJR19BTURfUEhZPW0KQ09ORklHX01BUlZF TExfUEhZPW0KQ09ORklHX0RBVklDT01fUEhZPW0KQ09ORklHX1FTRU1JX1BIWT1tCkNPTkZJR19M WFRfUEhZPW0KQ09ORklHX0NJQ0FEQV9QSFk9bQpDT05GSUdfVklURVNTRV9QSFk9bQpDT05GSUdf U01TQ19QSFk9bQpDT05GSUdfQlJPQURDT01fUEhZPW0KQ09ORklHX0lDUExVU19QSFk9bQpDT05G SUdfUkVBTFRFS19QSFk9bQpDT05GSUdfTkFUSU9OQUxfUEhZPW0KQ09ORklHX1NURTEwWFA9bQpD T05GSUdfTFNJX0VUMTAxMUNfUEhZPW0KQ09ORklHX01JQ1JFTF9QSFk9bQpDT05GSUdfRklYRURf UEhZPXkKQ09ORklHX01ESU9fQklUQkFORz1tCkNPTkZJR19NRElPX0dQSU89bQpDT05GSUdfTUlD UkVMX0tTODk5NU1BPW0KQ09ORklHX1BMSVA9bQpDT05GSUdfUFBQPW0KQ09ORklHX1BQUF9CU0RD T01QPW0KQ09ORklHX1BQUF9ERUZMQVRFPW0KQ09ORklHX1BQUF9GSUxURVI9eQpDT05GSUdfUFBQ X01QUEU9bQpDT05GSUdfUFBQX01VTFRJTElOSz15CkNPTkZJR19QUFBPQVRNPW0KQ09ORklHX1BQ UE9FPW0KQ09ORklHX1BQUF9BU1lOQz1tCkNPTkZJR19QUFBfU1lOQ19UVFk9bQpDT05GSUdfU0xJ UD1tCkNPTkZJR19TTEhDPW0KQ09ORklHX1NMSVBfQ09NUFJFU1NFRD15CkNPTkZJR19TTElQX1NN QVJUPXkKQ09ORklHX1NMSVBfTU9ERV9TTElQNj15CiMgQ09ORklHX1RSIGlzIG5vdCBzZXQKCiMK IyBVU0IgTmV0d29yayBBZGFwdGVycwojCkNPTkZJR19VU0JfQ0FUQz1tCkNPTkZJR19VU0JfS0FX RVRIPW0KQ09ORklHX1VTQl9QRUdBU1VTPW0KQ09ORklHX1VTQl9SVEw4MTUwPW0KQ09ORklHX1VT Ql9VU0JORVQ9bQpDT05GSUdfVVNCX05FVF9BWDg4MTdYPW0KQ09ORklHX1VTQl9ORVRfQ0RDRVRI RVI9bQpDT05GSUdfVVNCX05FVF9DRENfRUVNPW0KQ09ORklHX1VTQl9ORVRfQ0RDX05DTT1tCkNP TkZJR19VU0JfTkVUX0RNOTYwMT1tCkNPTkZJR19VU0JfTkVUX1NNU0M3NVhYPW0KQ09ORklHX1VT Ql9ORVRfU01TQzk1WFg9bQpDT05GSUdfVVNCX05FVF9HTDYyMEE9bQpDT05GSUdfVVNCX05FVF9O RVQxMDgwPW0KQ09ORklHX1VTQl9ORVRfUExVU0I9bQpDT05GSUdfVVNCX05FVF9NQ1M3ODMwPW0K Q09ORklHX1VTQl9ORVRfUk5ESVNfSE9TVD1tCkNPTkZJR19VU0JfTkVUX0NEQ19TVUJTRVQ9bQpD T05GSUdfVVNCX0FMSV9NNTYzMj15CkNPTkZJR19VU0JfQU4yNzIwPXkKQ09ORklHX1VTQl9CRUxL SU49eQpDT05GSUdfVVNCX0FSTUxJTlVYPXkKQ09ORklHX1VTQl9FUFNPTjI4ODg9eQpDT05GSUdf VVNCX0tDMjE5MD15CkNPTkZJR19VU0JfTkVUX1pBVVJVUz1tCkNPTkZJR19VU0JfTkVUX0NYODIz MTBfRVRIPW0KQ09ORklHX1VTQl9ORVRfS0FMTUlBPW0KQ09ORklHX1VTQl9ORVRfUU1JX1dXQU49 bQpDT05GSUdfVVNCX0hTTz1tCkNPTkZJR19VU0JfTkVUX0lOVDUxWDE9bQpDT05GSUdfVVNCX0NE Q19QSE9ORVQ9bQpDT05GSUdfVVNCX0lQSEVUSD1tCkNPTkZJR19VU0JfU0lFUlJBX05FVD1tCkNP TkZJR19VU0JfVkw2MDA9bQpDT05GSUdfV0xBTj15CkNPTkZJR19QQ01DSUFfUkFZQ1M9bQpDT05G SUdfTElCRVJUQVNfVEhJTkZJUk09bQojIENPTkZJR19MSUJFUlRBU19USElORklSTV9ERUJVRyBp cyBub3Qgc2V0CkNPTkZJR19MSUJFUlRBU19USElORklSTV9VU0I9bQpDT05GSUdfQUlSTz1tCkNP TkZJR19BVE1FTD1tCkNPTkZJR19QQ0lfQVRNRUw9bQpDT05GSUdfUENNQ0lBX0FUTUVMPW0KQ09O RklHX0FUNzZDNTBYX1VTQj1tCkNPTkZJR19BSVJPX0NTPW0KQ09ORklHX1BDTUNJQV9XTDM1MDE9 bQpDT05GSUdfUFJJU001ND1tCkNPTkZJR19VU0JfWkQxMjAxPW0KQ09ORklHX1VTQl9ORVRfUk5E SVNfV0xBTj1tCkNPTkZJR19SVEw4MTgwPW0KQ09ORklHX1JUTDgxODc9bQpDT05GSUdfUlRMODE4 N19MRURTPXkKQ09ORklHX0FETTgyMTE9bQpDT05GSUdfTUFDODAyMTFfSFdTSU09bQpDT05GSUdf TVdMOEs9bQpDT05GSUdfQVRIX0NPTU1PTj1tCiMgQ09ORklHX0FUSF9ERUJVRyBpcyBub3Qgc2V0 CkNPTkZJR19BVEg1Sz1tCiMgQ09ORklHX0FUSDVLX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdf QVRINUtfVFJBQ0VSIGlzIG5vdCBzZXQKQ09ORklHX0FUSDVLX1BDST15CkNPTkZJR19BVEg5S19I Vz1tCkNPTkZJR19BVEg5S19DT01NT049bQpDT05GSUdfQVRIOUtfQlRDT0VYX1NVUFBPUlQ9eQpD T05GSUdfQVRIOUs9bQpDT05GSUdfQVRIOUtfUENJPXkKQ09ORklHX0FUSDlLX0FIQj15CiMgQ09O RklHX0FUSDlLX0RFQlVHRlMgaXMgbm90IHNldApDT05GSUdfQVRIOUtfUkFURV9DT05UUk9MPXkK Q09ORklHX0FUSDlLX0hUQz1tCiMgQ09ORklHX0FUSDlLX0hUQ19ERUJVR0ZTIGlzIG5vdCBzZXQK Q09ORklHX0NBUkw5MTcwPW0KQ09ORklHX0NBUkw5MTcwX0xFRFM9eQojIENPTkZJR19DQVJMOTE3 MF9ERUJVR0ZTIGlzIG5vdCBzZXQKQ09ORklHX0NBUkw5MTcwX1dQQz15CkNPTkZJR19DQVJMOTE3 MF9IV1JORz15CkNPTkZJR19BVEg2S0w9bQpDT05GSUdfQVRINktMX1NESU89bQpDT05GSUdfQVRI NktMX1VTQj1tCiMgQ09ORklHX0FUSDZLTF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19CNDM9bQpD T05GSUdfQjQzX1NTQj15CkNPTkZJR19CNDNfUENJX0FVVE9TRUxFQ1Q9eQpDT05GSUdfQjQzX1BD SUNPUkVfQVVUT1NFTEVDVD15CkNPTkZJR19CNDNfUENNQ0lBPXkKQ09ORklHX0I0M19TRElPPXkK Q09ORklHX0I0M19QSU89eQpDT05GSUdfQjQzX1BIWV9OPXkKQ09ORklHX0I0M19QSFlfTFA9eQpD T05GSUdfQjQzX1BIWV9IVD15CkNPTkZJR19CNDNfTEVEUz15CkNPTkZJR19CNDNfSFdSTkc9eQoj IENPTkZJR19CNDNfREVCVUcgaXMgbm90IHNldApDT05GSUdfQjQzTEVHQUNZPW0KQ09ORklHX0I0 M0xFR0FDWV9QQ0lfQVVUT1NFTEVDVD15CkNPTkZJR19CNDNMRUdBQ1lfUENJQ09SRV9BVVRPU0VM RUNUPXkKQ09ORklHX0I0M0xFR0FDWV9MRURTPXkKQ09ORklHX0I0M0xFR0FDWV9IV1JORz15CiMg Q09ORklHX0I0M0xFR0FDWV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19CNDNMRUdBQ1lfRE1BPXkK Q09ORklHX0I0M0xFR0FDWV9QSU89eQpDT05GSUdfQjQzTEVHQUNZX0RNQV9BTkRfUElPX01PREU9 eQojIENPTkZJR19CNDNMRUdBQ1lfRE1BX01PREUgaXMgbm90IHNldAojIENPTkZJR19CNDNMRUdB Q1lfUElPX01PREUgaXMgbm90IHNldAojIENPTkZJR19CUkNNRk1BQyBpcyBub3Qgc2V0CkNPTkZJ R19IT1NUQVA9bQpDT05GSUdfSE9TVEFQX0ZJUk1XQVJFPXkKQ09ORklHX0hPU1RBUF9GSVJNV0FS RV9OVlJBTT15CkNPTkZJR19IT1NUQVBfUExYPW0KQ09ORklHX0hPU1RBUF9QQ0k9bQpDT05GSUdf SE9TVEFQX0NTPW0KQ09ORklHX0lQVzIxMDA9bQpDT05GSUdfSVBXMjEwMF9NT05JVE9SPXkKIyBD T05GSUdfSVBXMjEwMF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19JUFcyMjAwPW0KQ09ORklHX0lQ VzIyMDBfTU9OSVRPUj15CkNPTkZJR19JUFcyMjAwX1JBRElPVEFQPXkKQ09ORklHX0lQVzIyMDBf UFJPTUlTQ1VPVVM9eQpDT05GSUdfSVBXMjIwMF9RT1M9eQojIENPTkZJR19JUFcyMjAwX0RFQlVH IGlzIG5vdCBzZXQKQ09ORklHX0xJQklQVz1tCiMgQ09ORklHX0xJQklQV19ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19JV0xXSUZJPW0KCiMKIyBEZWJ1Z2dpbmcgT3B0aW9ucwojCiMgQ09ORklHX0lX TFdJRklfREVCVUcgaXMgbm90IHNldApDT05GSUdfSVdMV0lGSV9ERUJVR0ZTPXkKIyBDT05GSUdf SVdMV0lGSV9ERVZJQ0VfVFJBQ0lORyBpcyBub3Qgc2V0CkNPTkZJR19JV0xXSUZJX0RFVklDRV9U RVNUTU9ERT15CiMgQ09ORklHX0lXTFdJRklfUDJQIGlzIG5vdCBzZXQKIyBDT05GSUdfSVdMV0lG SV9FWFBFUklNRU5UQUxfTUZQIGlzIG5vdCBzZXQKQ09ORklHX0lXTEVHQUNZPW0KQ09ORklHX0lX TDQ5NjU9bQpDT05GSUdfSVdMMzk0NT1tCgojCiMgaXdsMzk0NSAvIGl3bDQ5NjUgRGVidWdnaW5n IE9wdGlvbnMKIwojIENPTkZJR19JV0xFR0FDWV9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX0lX TEVHQUNZX0RFQlVHRlMgaXMgbm90IHNldApDT05GSUdfSVdNPW0KIyBDT05GSUdfSVdNX0RFQlVH IGlzIG5vdCBzZXQKIyBDT05GSUdfSVdNX1RSQUNJTkcgaXMgbm90IHNldApDT05GSUdfTElCRVJU QVM9bQpDT05GSUdfTElCRVJUQVNfVVNCPW0KQ09ORklHX0xJQkVSVEFTX0NTPW0KQ09ORklHX0xJ QkVSVEFTX1NESU89bQpDT05GSUdfTElCRVJUQVNfU1BJPW0KIyBDT05GSUdfTElCRVJUQVNfREVC VUcgaXMgbm90IHNldApDT05GSUdfTElCRVJUQVNfTUVTSD15CkNPTkZJR19IRVJNRVM9bQojIENP TkZJR19IRVJNRVNfUFJJU00gaXMgbm90IHNldApDT05GSUdfSEVSTUVTX0NBQ0hFX0ZXX09OX0lO SVQ9eQpDT05GSUdfUExYX0hFUk1FUz1tCkNPTkZJR19UTURfSEVSTUVTPW0KQ09ORklHX05PUlRF TF9IRVJNRVM9bQpDT05GSUdfUENNQ0lBX0hFUk1FUz1tCkNPTkZJR19QQ01DSUFfU1BFQ1RSVU09 bQpDT05GSUdfT1JJTk9DT19VU0I9bQpDT05GSUdfUDU0X0NPTU1PTj1tCkNPTkZJR19QNTRfVVNC PW0KQ09ORklHX1A1NF9QQ0k9bQpDT05GSUdfUDU0X1NQST1tCiMgQ09ORklHX1A1NF9TUElfREVG QVVMVF9FRVBST00gaXMgbm90IHNldApDT05GSUdfUDU0X0xFRFM9eQpDT05GSUdfUlQyWDAwPW0K Q09ORklHX1JUMjQwMFBDST1tCkNPTkZJR19SVDI1MDBQQ0k9bQpDT05GSUdfUlQ2MVBDST1tCiMg Q09ORklHX1JUMjgwMFBDSSBpcyBub3Qgc2V0CkNPTkZJR19SVDI1MDBVU0I9bQpDT05GSUdfUlQ3 M1VTQj1tCkNPTkZJR19SVDI4MDBVU0I9bQpDT05GSUdfUlQyODAwVVNCX1JUMzNYWD15CiMgQ09O RklHX1JUMjgwMFVTQl9SVDM1WFggaXMgbm90IHNldApDT05GSUdfUlQyODAwVVNCX1JUNTNYWD15 CiMgQ09ORklHX1JUMjgwMFVTQl9VTktOT1dOIGlzIG5vdCBzZXQKQ09ORklHX1JUMjgwMF9MSUI9 bQpDT05GSUdfUlQyWDAwX0xJQl9QQ0k9bQpDT05GSUdfUlQyWDAwX0xJQl9VU0I9bQpDT05GSUdf UlQyWDAwX0xJQj1tCkNPTkZJR19SVDJYMDBfTElCX0ZJUk1XQVJFPXkKQ09ORklHX1JUMlgwMF9M SUJfQ1JZUFRPPXkKQ09ORklHX1JUMlgwMF9MSUJfTEVEUz15CiMgQ09ORklHX1JUMlgwMF9MSUJf REVCVUdGUyBpcyBub3Qgc2V0CiMgQ09ORklHX1JUMlgwMF9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19SVEw4MTkyQ0U9bQpDT05GSUdfUlRMODE5MlNFPW0KQ09ORklHX1JUTDgxOTJERT1tCkNPTkZJ R19SVEw4MTkyQ1U9bQpDT05GSUdfUlRMV0lGST1tCiMgQ09ORklHX1JUTFdJRklfREVCVUcgaXMg bm90IHNldApDT05GSUdfUlRMODE5MkNfQ09NTU9OPW0KQ09ORklHX1dMMTI1MT1tCkNPTkZJR19X TDEyNTFfU1BJPW0KQ09ORklHX1dMMTI1MV9TRElPPW0KQ09ORklHX1dMMTJYWF9NRU5VPW0KQ09O RklHX1dMMTJYWD1tCiMgQ09ORklHX1dMMTJYWF9TUEkgaXMgbm90IHNldAojIENPTkZJR19XTDEy WFhfU0RJTyBpcyBub3Qgc2V0CkNPTkZJR19XTDEyWFhfUExBVEZPUk1fREFUQT15CkNPTkZJR19a RDEyMTFSVz1tCiMgQ09ORklHX1pEMTIxMVJXX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX01XSUZJ RVg9bQpDT05GSUdfTVdJRklFWF9TRElPPW0KQ09ORklHX01XSUZJRVhfUENJRT1tCgojCiMgV2lN QVggV2lyZWxlc3MgQnJvYWRiYW5kIGRldmljZXMKIwpDT05GSUdfV0lNQVhfSTI0MDBNPW0KQ09O RklHX1dJTUFYX0kyNDAwTV9VU0I9bQpDT05GSUdfV0lNQVhfSTI0MDBNX1NESU89bQpDT05GSUdf V0lNQVhfSVdNQzMyMDBfU0RJTz15CkNPTkZJR19XSU1BWF9JMjQwME1fREVCVUdfTEVWRUw9OApD T05GSUdfV0FOPXkKQ09ORklHX0xBTk1FRElBPW0KQ09ORklHX0hETEM9bQpDT05GSUdfSERMQ19S QVc9bQpDT05GSUdfSERMQ19SQVdfRVRIPW0KQ09ORklHX0hETENfQ0lTQ089bQpDT05GSUdfSERM Q19GUj1tCkNPTkZJR19IRExDX1BQUD1tCkNPTkZJR19IRExDX1gyNT1tCkNPTkZJR19QQ0kyMDBT WU49bQpDT05GSUdfV0FOWEw9bQpDT05GSUdfUEMzMDBUT089bQpDT05GSUdfRkFSU1lOQz1tCkNP TkZJR19EU0NDND1tCkNPTkZJR19EU0NDNF9QQ0lTWU5DPXkKQ09ORklHX0RTQ0M0X1BDSV9SU1Q9 eQpDT05GSUdfRExDST1tCkNPTkZJR19ETENJX01BWD04CiMgQ09ORklHX1dBTl9ST1VURVJfRFJJ VkVSUyBpcyBub3Qgc2V0CkNPTkZJR19MQVBCRVRIRVI9bQpDT05GSUdfWDI1X0FTWT1tCkNPTkZJ R19TQk5JPW0KQ09ORklHX1NCTklfTVVMVElMSU5FPXkKQ09ORklHX1hFTl9ORVRERVZfRlJPTlRF TkQ9bQpDT05GSUdfWEVOX05FVERFVl9CQUNLRU5EPW0KIyBDT05GSUdfVk1YTkVUMyBpcyBub3Qg c2V0CkNPTkZJR19JU0ROPXkKQ09ORklHX0lTRE5fSTRMPW0KQ09ORklHX0lTRE5fUFBQPXkKQ09O RklHX0lTRE5fUFBQX1ZKPXkKQ09ORklHX0lTRE5fTVBQPXkKQ09ORklHX0lQUFBfRklMVEVSPXkK Q09ORklHX0lTRE5fUFBQX0JTRENPTVA9bQpDT05GSUdfSVNETl9BVURJTz15CkNPTkZJR19JU0RO X1RUWV9GQVg9eQpDT05GSUdfSVNETl9YMjU9eQoKIwojIElTRE4gZmVhdHVyZSBzdWJtb2R1bGVz CiMKQ09ORklHX0lTRE5fRElWRVJTSU9OPW0KCiMKIyBJU0RONExpbnV4IGhhcmR3YXJlIGRyaXZl cnMKIwoKIwojIFBhc3NpdmUgY2FyZHMKIwpDT05GSUdfSVNETl9EUlZfSElTQVg9bQoKIwojIEQt Y2hhbm5lbCBwcm90b2NvbCBmZWF0dXJlcwojCkNPTkZJR19ISVNBWF9FVVJPPXkKQ09ORklHX0RF X0FPQz15CiMgQ09ORklHX0hJU0FYX05PX1NFTkRDT01QTEVURSBpcyBub3Qgc2V0CiMgQ09ORklH X0hJU0FYX05PX0xMQyBpcyBub3Qgc2V0CiMgQ09ORklHX0hJU0FYX05PX0tFWVBBRCBpcyBub3Qg c2V0CkNPTkZJR19ISVNBWF8xVFI2PXkKQ09ORklHX0hJU0FYX05JMT15CkNPTkZJR19ISVNBWF9N QVhfQ0FSRFM9OAoKIwojIEhpU2F4IHN1cHBvcnRlZCBjYXJkcwojCkNPTkZJR19ISVNBWF8xNl8z PXkKQ09ORklHX0hJU0FYX1RFTEVTUENJPXkKQ09ORklHX0hJU0FYX1MwQk9YPXkKQ09ORklHX0hJ U0FYX0ZSSVRaUENJPXkKQ09ORklHX0hJU0FYX0FWTV9BMV9QQ01DSUE9eQpDT05GSUdfSElTQVhf RUxTQT15CkNPTkZJR19ISVNBWF9ESUVITERJVkE9eQpDT05GSUdfSElTQVhfU0VETEJBVUVSPXkK Q09ORklHX0hJU0FYX05FVEpFVD15CkNPTkZJR19ISVNBWF9ORVRKRVRfVT15CkNPTkZJR19ISVNB WF9OSUNDWT15CkNPTkZJR19ISVNBWF9CS01fQTRUPXkKQ09ORklHX0hJU0FYX1NDVF9RVUFEUk89 eQpDT05GSUdfSElTQVhfR0FaRUw9eQpDT05GSUdfSElTQVhfSEZDX1BDST15CkNPTkZJR19ISVNB WF9XNjY5Mj15CkNPTkZJR19ISVNBWF9IRkNfU1g9eQpDT05GSUdfSElTQVhfRU5URVJOT1dfUENJ PXkKIyBDT05GSUdfSElTQVhfREVCVUcgaXMgbm90IHNldAoKIwojIEhpU2F4IFBDTUNJQSBjYXJk IHNlcnZpY2UgbW9kdWxlcwojCkNPTkZJR19ISVNBWF9TRURMQkFVRVJfQ1M9bQpDT05GSUdfSElT QVhfRUxTQV9DUz1tCkNPTkZJR19ISVNBWF9BVk1fQTFfQ1M9bQpDT05GSUdfSElTQVhfVEVMRVNf Q1M9bQoKIwojIEhpU2F4IHN1YiBkcml2ZXIgbW9kdWxlcwojCkNPTkZJR19ISVNBWF9TVDU0ODE9 bQpDT05GSUdfSElTQVhfSEZDVVNCPW0KQ09ORklHX0hJU0FYX0hGQzRTOFM9bQpDT05GSUdfSElT QVhfRlJJVFpfUENJUE5QPW0KCiMKIyBBY3RpdmUgY2FyZHMKIwpDT05GSUdfSVNETl9DQVBJPW0K Q09ORklHX0lTRE5fRFJWX0FWTUIxX1ZFUkJPU0VfUkVBU09OPXkKQ09ORklHX0NBUElfVFJBQ0U9 eQpDT05GSUdfSVNETl9DQVBJX01JRERMRVdBUkU9eQpDT05GSUdfSVNETl9DQVBJX0NBUEkyMD1t CkNPTkZJR19JU0ROX0NBUElfQ0FQSURSVj1tCgojCiMgQ0FQSSBoYXJkd2FyZSBkcml2ZXJzCiMK Q09ORklHX0NBUElfQVZNPXkKQ09ORklHX0lTRE5fRFJWX0FWTUIxX0IxUENJPW0KQ09ORklHX0lT RE5fRFJWX0FWTUIxX0IxUENJVjQ9eQpDT05GSUdfSVNETl9EUlZfQVZNQjFfQjFQQ01DSUE9bQpD T05GSUdfSVNETl9EUlZfQVZNQjFfQVZNX0NTPW0KQ09ORklHX0lTRE5fRFJWX0FWTUIxX1QxUENJ PW0KQ09ORklHX0lTRE5fRFJWX0FWTUIxX0M0PW0KQ09ORklHX0NBUElfRUlDT049eQpDT05GSUdf SVNETl9ESVZBUz1tCkNPTkZJR19JU0ROX0RJVkFTX0JSSVBDST15CkNPTkZJR19JU0ROX0RJVkFT X1BSSVBDST15CkNPTkZJR19JU0ROX0RJVkFTX0RJVkFDQVBJPW0KQ09ORklHX0lTRE5fRElWQVNf VVNFUklEST1tCkNPTkZJR19JU0ROX0RJVkFTX01BSU5UPW0KQ09ORklHX0lTRE5fRFJWX0dJR0FT RVQ9bQojIENPTkZJR19HSUdBU0VUX0NBUEkgaXMgbm90IHNldApDT05GSUdfR0lHQVNFVF9JNEw9 eQojIENPTkZJR19HSUdBU0VUX0RVTU1ZTEwgaXMgbm90IHNldApDT05GSUdfR0lHQVNFVF9CQVNF PW0KQ09ORklHX0dJR0FTRVRfTTEwNT1tCkNPTkZJR19HSUdBU0VUX00xMDE9bQojIENPTkZJR19H SUdBU0VUX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0hZU0ROPW0KQ09ORklHX0hZU0ROX0NBUEk9 eQpDT05GSUdfTUlTRE49bQpDT05GSUdfTUlTRE5fRFNQPW0KQ09ORklHX01JU0ROX0wxT0lQPW0K CiMKIyBtSVNETiBoYXJkd2FyZSBkcml2ZXJzCiMKQ09ORklHX01JU0ROX0hGQ1BDST1tCkNPTkZJ R19NSVNETl9IRkNNVUxUST1tCkNPTkZJR19NSVNETl9IRkNVU0I9bQpDT05GSUdfTUlTRE5fQVZN RlJJVFo9bQpDT05GSUdfTUlTRE5fU1BFRURGQVg9bQpDT05GSUdfTUlTRE5fSU5GSU5FT049bQpD T05GSUdfTUlTRE5fVzY2OTI9bQpDT05GSUdfTUlTRE5fTkVUSkVUPW0KQ09ORklHX01JU0ROX0lQ QUM9bQpDT05GSUdfTUlTRE5fSVNBUj1tCkNPTkZJR19JU0ROX0hETEM9bQoKIwojIElucHV0IGRl dmljZSBzdXBwb3J0CiMKQ09ORklHX0lOUFVUPXkKQ09ORklHX0lOUFVUX0ZGX01FTUxFU1M9bQpD T05GSUdfSU5QVVRfUE9MTERFVj1tCkNPTkZJR19JTlBVVF9TUEFSU0VLTUFQPW0KCiMKIyBVc2Vy bGFuZCBpbnRlcmZhY2VzCiMKQ09ORklHX0lOUFVUX01PVVNFREVWPXkKQ09ORklHX0lOUFVUX01P VVNFREVWX1BTQVVYPXkKQ09ORklHX0lOUFVUX01PVVNFREVWX1NDUkVFTl9YPTEwMjQKQ09ORklH X0lOUFVUX01PVVNFREVWX1NDUkVFTl9ZPTc2OApDT05GSUdfSU5QVVRfSk9ZREVWPW0KQ09ORklH X0lOUFVUX0VWREVWPXkKIyBDT05GSUdfSU5QVVRfRVZCVUcgaXMgbm90IHNldAoKIwojIElucHV0 IERldmljZSBEcml2ZXJzCiMKQ09ORklHX0lOUFVUX0tFWUJPQVJEPXkKQ09ORklHX0tFWUJPQVJE X0FEUDU1ODg9bQpDT05GSUdfS0VZQk9BUkRfQURQNTU4OT1tCkNPTkZJR19LRVlCT0FSRF9BVEtC RD15CkNPTkZJR19LRVlCT0FSRF9RVDEwNzA9bQpDT05GSUdfS0VZQk9BUkRfUVQyMTYwPW0KIyBD T05GSUdfS0VZQk9BUkRfTEtLQkQgaXMgbm90IHNldApDT05GSUdfS0VZQk9BUkRfR1BJTz1tCkNP TkZJR19LRVlCT0FSRF9HUElPX1BPTExFRD1tCkNPTkZJR19LRVlCT0FSRF9UQ0E2NDE2PW0KQ09O RklHX0tFWUJPQVJEX1RDQTg0MTg9bQpDT05GSUdfS0VZQk9BUkRfTUFUUklYPW0KQ09ORklHX0tF WUJPQVJEX0xNODMyMz1tCkNPTkZJR19LRVlCT0FSRF9NQVg3MzU5PW0KQ09ORklHX0tFWUJPQVJE X01DUz1tCkNPTkZJR19LRVlCT0FSRF9NUFIxMjE9bQpDT05GSUdfS0VZQk9BUkRfTkVXVE9OPW0K Q09ORklHX0tFWUJPQVJEX09QRU5DT1JFUz1tCiMgQ09ORklHX0tFWUJPQVJEX1NUT1dBV0FZIGlz IG5vdCBzZXQKQ09ORklHX0tFWUJPQVJEX1NVTktCRD1tCkNPTkZJR19LRVlCT0FSRF9TVE1QRT1t CkNPTkZJR19LRVlCT0FSRF9PTUFQND1tCkNPTkZJR19LRVlCT0FSRF9YVEtCRD1tCkNPTkZJR19J TlBVVF9NT1VTRT15CkNPTkZJR19NT1VTRV9QUzI9eQpDT05GSUdfTU9VU0VfUFMyX0FMUFM9eQpD T05GSUdfTU9VU0VfUFMyX0xPR0lQUzJQUD15CkNPTkZJR19NT1VTRV9QUzJfU1lOQVBUSUNTPXkK Q09ORklHX01PVVNFX1BTMl9MSUZFQk9PSz15CkNPTkZJR19NT1VTRV9QUzJfVFJBQ0tQT0lOVD15 CkNPTkZJR19NT1VTRV9QUzJfRUxBTlRFQ0g9eQpDT05GSUdfTU9VU0VfUFMyX1NFTlRFTElDPXkK Q09ORklHX01PVVNFX1BTMl9UT1VDSEtJVD15CkNPTkZJR19NT1VTRV9TRVJJQUw9bQpDT05GSUdf TU9VU0VfQVBQTEVUT1VDSD1tCkNPTkZJR19NT1VTRV9CQ001OTc0PW0KQ09ORklHX01PVVNFX1ZT WFhYQUE9bQpDT05GSUdfTU9VU0VfR1BJTz1tCkNPTkZJR19NT1VTRV9TWU5BUFRJQ1NfSTJDPW0K Q09ORklHX01PVVNFX1NZTkFQVElDU19VU0I9bQpDT05GSUdfSU5QVVRfSk9ZU1RJQ0s9eQpDT05G SUdfSk9ZU1RJQ0tfQU5BTE9HPW0KQ09ORklHX0pPWVNUSUNLX0EzRD1tCkNPTkZJR19KT1lTVElD S19BREk9bQpDT05GSUdfSk9ZU1RJQ0tfQ09CUkE9bQpDT05GSUdfSk9ZU1RJQ0tfR0YySz1tCkNP TkZJR19KT1lTVElDS19HUklQPW0KQ09ORklHX0pPWVNUSUNLX0dSSVBfTVA9bQpDT05GSUdfSk9Z U1RJQ0tfR1VJTExFTU9UPW0KQ09ORklHX0pPWVNUSUNLX0lOVEVSQUNUPW0KQ09ORklHX0pPWVNU SUNLX1NJREVXSU5ERVI9bQpDT05GSUdfSk9ZU1RJQ0tfVE1EQz1tCkNPTkZJR19KT1lTVElDS19J Rk9SQ0U9bQpDT05GSUdfSk9ZU1RJQ0tfSUZPUkNFX1VTQj15CkNPTkZJR19KT1lTVElDS19JRk9S Q0VfMjMyPXkKQ09ORklHX0pPWVNUSUNLX1dBUlJJT1I9bQpDT05GSUdfSk9ZU1RJQ0tfTUFHRUxM QU49bQpDT05GSUdfSk9ZU1RJQ0tfU1BBQ0VPUkI9bQpDT05GSUdfSk9ZU1RJQ0tfU1BBQ0VCQUxM PW0KQ09ORklHX0pPWVNUSUNLX1NUSU5HRVI9bQpDT05GSUdfSk9ZU1RJQ0tfVFdJREpPWT1tCkNP TkZJR19KT1lTVElDS19aSEVOSFVBPW0KQ09ORklHX0pPWVNUSUNLX0RCOT1tCkNPTkZJR19KT1lT VElDS19HQU1FQ09OPW0KQ09ORklHX0pPWVNUSUNLX1RVUkJPR1JBRlg9bQpDT05GSUdfSk9ZU1RJ Q0tfQVM1MDExPW0KQ09ORklHX0pPWVNUSUNLX0pPWURVTVA9bQpDT05GSUdfSk9ZU1RJQ0tfWFBB RD1tCkNPTkZJR19KT1lTVElDS19YUEFEX0ZGPXkKQ09ORklHX0pPWVNUSUNLX1hQQURfTEVEUz15 CkNPTkZJR19KT1lTVElDS19XQUxLRVJBMDcwMT1tCkNPTkZJR19JTlBVVF9UQUJMRVQ9eQpDT05G SUdfVEFCTEVUX1VTQl9BQ0VDQUQ9bQpDT05GSUdfVEFCTEVUX1VTQl9BSVBURUs9bQpDT05GSUdf VEFCTEVUX1VTQl9HVENPPW0KQ09ORklHX1RBQkxFVF9VU0JfSEFOV0FORz1tCkNPTkZJR19UQUJM RVRfVVNCX0tCVEFCPW0KQ09ORklHX1RBQkxFVF9VU0JfV0FDT009bQpDT05GSUdfSU5QVVRfVE9V Q0hTQ1JFRU49eQpDT05GSUdfVE9VQ0hTQ1JFRU5fQURTNzg0Nj1tCkNPTkZJR19UT1VDSFNDUkVF Tl9BRDc4Nzc9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQUQ3ODc5PW0KQ09ORklHX1RPVUNIU0NSRUVO X0FENzg3OV9JMkM9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQUQ3ODc5X1NQST1tCkNPTkZJR19UT1VD SFNDUkVFTl9BVE1FTF9NWFQ9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQVVPX1BJWENJUj1tCkNPTkZJ R19UT1VDSFNDUkVFTl9CVTIxMDEzPW0KQ09ORklHX1RPVUNIU0NSRUVOX0NZOENUTUcxMTA9bQpD T05GSUdfVE9VQ0hTQ1JFRU5fQ1lUVFNQX0NPUkU9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fQ1lUVFNQ X0kyQz1tCkNPTkZJR19UT1VDSFNDUkVFTl9DWVRUU1BfU1BJPW0KQ09ORklHX1RPVUNIU0NSRUVO X0RZTkFQUk89bQpDT05GSUdfVE9VQ0hTQ1JFRU5fSEFNUFNISVJFPW0KQ09ORklHX1RPVUNIU0NS RUVOX0VFVEk9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fRUdBTEFYPW0KQ09ORklHX1RPVUNIU0NSRUVO X0ZVSklUU1U9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fSUxJMjEwWD1tCkNPTkZJR19UT1VDSFNDUkVF Tl9HVU5aRT1tCkNPTkZJR19UT1VDSFNDUkVFTl9FTE89bQpDT05GSUdfVE9VQ0hTQ1JFRU5fV0FD T01fVzgwMDE9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fTUFYMTE4MDE9bQpDT05GSUdfVE9VQ0hTQ1JF RU5fTUNTNTAwMD1tCkNPTkZJR19UT1VDSFNDUkVFTl9NVE9VQ0g9bQpDT05GSUdfVE9VQ0hTQ1JF RU5fSU5FWElPPW0KQ09ORklHX1RPVUNIU0NSRUVOX01LNzEyPW0KQ09ORklHX1RPVUNIU0NSRUVO X1BFTk1PVU5UPW0KQ09ORklHX1RPVUNIU0NSRUVOX1RPVUNIUklHSFQ9bQpDT05GSUdfVE9VQ0hT Q1JFRU5fVE9VQ0hXSU49bQpDT05GSUdfVE9VQ0hTQ1JFRU5fVUNCMTQwMD1tCkNPTkZJR19UT1VD SFNDUkVFTl9QSVhDSVI9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fV005N1hYPW0KQ09ORklHX1RPVUNI U0NSRUVOX1dNOTcwNT15CkNPTkZJR19UT1VDSFNDUkVFTl9XTTk3MTI9eQpDT05GSUdfVE9VQ0hT Q1JFRU5fV005NzEzPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VTQl9DT01QT1NJVEU9bQpDT05GSUdf VE9VQ0hTQ1JFRU5fTUMxMzc4Mz1tCkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfRUdBTEFYPXkKQ09O RklHX1RPVUNIU0NSRUVOX1VTQl9QQU5KSVQ9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCXzNNPXkK Q09ORklHX1RPVUNIU0NSRUVOX1VTQl9JVE09eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0VUVVJC Tz15CkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfR1VOWkU9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNC X0RNQ19UU0MxMD15CkNPTkZJR19UT1VDSFNDUkVFTl9VU0JfSVJUT1VDSD15CkNPTkZJR19UT1VD SFNDUkVFTl9VU0JfSURFQUxURUs9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0dFTkVSQUxfVE9V Q0g9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0dPVE9QPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VT Ql9KQVNURUM9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX0VMTz15CkNPTkZJR19UT1VDSFNDUkVF Tl9VU0JfRTJJPXkKQ09ORklHX1RPVUNIU0NSRUVOX1VTQl9aWVRST05JQz15CkNPTkZJR19UT1VD SFNDUkVFTl9VU0JfRVRUX1RDNDVVU0I9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVVNCX05FWElPPXkK Q09ORklHX1RPVUNIU0NSRUVOX1VTQl9FQVNZVE9VQ0g9eQpDT05GSUdfVE9VQ0hTQ1JFRU5fVE9V Q0hJVDIxMz1tCkNPTkZJR19UT1VDSFNDUkVFTl9UU0NfU0VSSU89bQpDT05GSUdfVE9VQ0hTQ1JF RU5fVFNDMjAwNT1tCkNPTkZJR19UT1VDSFNDUkVFTl9UU0MyMDA3PW0KQ09ORklHX1RPVUNIU0NS RUVOX1BDQVA9bQpDT05GSUdfVE9VQ0hTQ1JFRU5fU1QxMjMyPW0KQ09ORklHX1RPVUNIU0NSRUVO X1NUTVBFPW0KQ09ORklHX1RPVUNIU0NSRUVOX1RQUzY1MDdYPW0KQ09ORklHX0lOUFVUX01JU0M9 eQpDT05GSUdfSU5QVVRfQUQ3MTRYPW0KQ09ORklHX0lOUFVUX0FENzE0WF9JMkM9bQpDT05GSUdf SU5QVVRfQUQ3MTRYX1NQST1tCkNPTkZJR19JTlBVVF9CTUExNTA9bQpDT05GSUdfSU5QVVRfUENT UEtSPW0KQ09ORklHX0lOUFVUX01DMTM3ODNfUFdSQlVUVE9OPW0KQ09ORklHX0lOUFVUX01NQTg0 NTA9bQpDT05GSUdfSU5QVVRfTVBVMzA1MD1tCkNPTkZJR19JTlBVVF9BUEFORUw9bQpDT05GSUdf SU5QVVRfR1AyQT1tCkNPTkZJR19JTlBVVF9HUElPX1RJTFRfUE9MTEVEPW0KQ09ORklHX0lOUFVU X0FUTEFTX0JUTlM9bQpDT05GSUdfSU5QVVRfQVRJX1JFTU9URTI9bQpDT05GSUdfSU5QVVRfS0VZ U1BBTl9SRU1PVEU9bQpDT05GSUdfSU5QVVRfS1hUSjk9bQojIENPTkZJR19JTlBVVF9LWFRKOV9Q T0xMRURfTU9ERSBpcyBub3Qgc2V0CkNPTkZJR19JTlBVVF9QT1dFUk1BVEU9bQpDT05GSUdfSU5Q VVRfWUVBTElOSz1tCkNPTkZJR19JTlBVVF9DTTEwOT1tCkNPTkZJR19JTlBVVF9VSU5QVVQ9bQpD T05GSUdfSU5QVVRfUENGODU3ND1tCkNPTkZJR19JTlBVVF9HUElPX1JPVEFSWV9FTkNPREVSPW0K Q09ORklHX0lOUFVUX0RBOTA1Ml9PTktFWT1tCkNPTkZJR19JTlBVVF9QQ0FQPW0KQ09ORklHX0lO UFVUX0FEWEwzNFg9bQpDT05GSUdfSU5QVVRfQURYTDM0WF9JMkM9bQpDT05GSUdfSU5QVVRfQURY TDM0WF9TUEk9bQpDT05GSUdfSU5QVVRfQ01BMzAwMD1tCkNPTkZJR19JTlBVVF9DTUEzMDAwX0ky Qz1tCkNPTkZJR19JTlBVVF9YRU5fS0JEREVWX0ZST05URU5EPXkKCiMKIyBIYXJkd2FyZSBJL08g cG9ydHMKIwpDT05GSUdfU0VSSU89eQpDT05GSUdfU0VSSU9fSTgwNDI9eQpDT05GSUdfU0VSSU9f U0VSUE9SVD1tCkNPTkZJR19TRVJJT19DVDgyQzcxMD1tCkNPTkZJR19TRVJJT19QQVJLQkQ9bQpD T05GSUdfU0VSSU9fUENJUFMyPW0KQ09ORklHX1NFUklPX0xJQlBTMj15CkNPTkZJR19TRVJJT19S QVc9bQpDT05GSUdfU0VSSU9fQUxURVJBX1BTMj1tCkNPTkZJR19TRVJJT19QUzJNVUxUPW0KQ09O RklHX0dBTUVQT1JUPW0KQ09ORklHX0dBTUVQT1JUX05TNTU4PW0KQ09ORklHX0dBTUVQT1JUX0w0 PW0KQ09ORklHX0dBTUVQT1JUX0VNVTEwSzE9bQpDT05GSUdfR0FNRVBPUlRfRk04MDE9bQoKIwoj IENoYXJhY3RlciBkZXZpY2VzCiMKQ09ORklHX1ZUPXkKQ09ORklHX0NPTlNPTEVfVFJBTlNMQVRJ T05TPXkKQ09ORklHX1ZUX0NPTlNPTEU9eQpDT05GSUdfVlRfQ09OU09MRV9TTEVFUD15CkNPTkZJ R19IV19DT05TT0xFPXkKQ09ORklHX1ZUX0hXX0NPTlNPTEVfQklORElORz15CkNPTkZJR19VTklY OThfUFRZUz15CkNPTkZJR19ERVZQVFNfTVVMVElQTEVfSU5TVEFOQ0VTPXkKQ09ORklHX0xFR0FD WV9QVFlTPXkKQ09ORklHX0xFR0FDWV9QVFlfQ09VTlQ9MApDT05GSUdfU0VSSUFMX05PTlNUQU5E QVJEPXkKQ09ORklHX1JPQ0tFVFBPUlQ9bQpDT05GSUdfQ1lDTEFERVM9bQojIENPTkZJR19DWVpf SU5UUiBpcyBub3Qgc2V0CkNPTkZJR19NT1hBX0lOVEVMTElPPW0KQ09ORklHX01PWEFfU01BUlRJ Tz1tCkNPTkZJR19TWU5DTElOSz1tCkNPTkZJR19TWU5DTElOS01QPW0KQ09ORklHX1NZTkNMSU5L X0dUPW0KQ09ORklHX05PWk9NST1tCkNPTkZJR19JU0k9bQpDT05GSUdfTl9IRExDPW0KQ09ORklH X05fR1NNPW0KIyBDT05GSUdfVFJBQ0VfU0lOSyBpcyBub3Qgc2V0CkNPTkZJR19ERVZLTUVNPXkK Q09ORklHX1NUQUxEUlY9eQoKIwojIFNlcmlhbCBkcml2ZXJzCiMKQ09ORklHX1NFUklBTF84MjUw PW0KQ09ORklHX0ZJWF9FQVJMWUNPTl9NRU09eQpDT05GSUdfU0VSSUFMXzgyNTBfUENJPW0KQ09O RklHX1NFUklBTF84MjUwX1BOUD1tCkNPTkZJR19TRVJJQUxfODI1MF9DUz1tCkNPTkZJR19TRVJJ QUxfODI1MF9OUl9VQVJUUz0xNgpDT05GSUdfU0VSSUFMXzgyNTBfUlVOVElNRV9VQVJUUz04CiMg Q09ORklHX1NFUklBTF84MjUwX0VYVEVOREVEIGlzIG5vdCBzZXQKCiMKIyBOb24tODI1MCBzZXJp YWwgcG9ydCBzdXBwb3J0CiMKIyBDT05GSUdfU0VSSUFMX01BWDMxMDAgaXMgbm90IHNldAojIENP TkZJR19TRVJJQUxfTUFYMzEwNyBpcyBub3Qgc2V0CiMgQ09ORklHX1NFUklBTF9NUlNUX01BWDMx MTAgaXMgbm90IHNldAojIENPTkZJR19TRVJJQUxfTUZEX0hTVSBpcyBub3Qgc2V0CkNPTkZJR19T RVJJQUxfVUFSVExJVEU9bQpDT05GSUdfU0VSSUFMX0NPUkU9bQpDT05GSUdfU0VSSUFMX0pTTT1t CkNPTkZJR19TRVJJQUxfVElNQkVSREFMRT1tCkNPTkZJR19TRVJJQUxfQUxURVJBX0pUQUdVQVJU PW0KQ09ORklHX1NFUklBTF9BTFRFUkFfVUFSVD1tCkNPTkZJR19TRVJJQUxfQUxURVJBX1VBUlRf TUFYUE9SVFM9NApDT05GSUdfU0VSSUFMX0FMVEVSQV9VQVJUX0JBVURSQVRFPTExNTIwMApDT05G SUdfU0VSSUFMX0lGWDZYNjA9bQpDT05GSUdfU0VSSUFMX1BDSF9VQVJUPW0KQ09ORklHX1NFUklB TF9YSUxJTlhfUFNfVUFSVD1tCkNPTkZJR19QUklOVEVSPW0KIyBDT05GSUdfTFBfQ09OU09MRSBp cyBub3Qgc2V0CkNPTkZJR19QUERFVj1tCkNPTkZJR19IVkNfRFJJVkVSPXkKQ09ORklHX0hWQ19J UlE9eQpDT05GSUdfSFZDX1hFTj15CkNPTkZJR19IVkNfWEVOX0ZST05URU5EPXkKQ09ORklHX1ZJ UlRJT19DT05TT0xFPW0KQ09ORklHX0lQTUlfSEFORExFUj1tCkNPTkZJR19JUE1JX1BBTklDX0VW RU5UPXkKIyBDT05GSUdfSVBNSV9QQU5JQ19TVFJJTkcgaXMgbm90IHNldApDT05GSUdfSVBNSV9E RVZJQ0VfSU5URVJGQUNFPW0KQ09ORklHX0lQTUlfU0k9bQpDT05GSUdfSVBNSV9XQVRDSERPRz1t CkNPTkZJR19JUE1JX1BPV0VST0ZGPW0KQ09ORklHX0hXX1JBTkRPTT15CkNPTkZJR19IV19SQU5E T01fVElNRVJJT01FTT1tCkNPTkZJR19IV19SQU5ET01fSU5URUw9bQpDT05GSUdfSFdfUkFORE9N X0FNRD1tCkNPTkZJR19IV19SQU5ET01fVklBPW0KQ09ORklHX0hXX1JBTkRPTV9WSVJUSU89bQpD T05GSUdfTlZSQU09eQpDT05GSUdfUjM5NjQ9bQpDT05GSUdfQVBQTElDT009bQoKIwojIFBDTUNJ QSBjaGFyYWN0ZXIgZGV2aWNlcwojCkNPTkZJR19TWU5DTElOS19DUz1tCkNPTkZJR19DQVJETUFO XzQwMDA9bQpDT05GSUdfQ0FSRE1BTl80MDQwPW0KQ09ORklHX0lQV0lSRUxFU1M9bQpDT05GSUdf TVdBVkU9bQpDT05GSUdfUkFXX0RSSVZFUj1tCkNPTkZJR19NQVhfUkFXX0RFVlM9NDA5NgojIENP TkZJR19IUEVUIGlzIG5vdCBzZXQKQ09ORklHX0hBTkdDSEVDS19USU1FUj1tCkNPTkZJR19UQ0df VFBNPW0KQ09ORklHX1RDR19USVM9bQpDT05GSUdfVENHX05TQz1tCkNPTkZJR19UQ0dfQVRNRUw9 bQpDT05GSUdfVENHX0lORklORU9OPW0KQ09ORklHX1RFTENMT0NLPW0KQ09ORklHX0RFVlBPUlQ9 eQpDT05GSUdfUkFNT09QUz15CkNPTkZJR19JMkM9bQpDT05GSUdfSTJDX0JPQVJESU5GTz15CkNP TkZJR19JMkNfQ09NUEFUPXkKQ09ORklHX0kyQ19DSEFSREVWPW0KQ09ORklHX0kyQ19NVVg9bQoK IwojIE11bHRpcGxleGVyIEkyQyBDaGlwIHN1cHBvcnQKIwpDT05GSUdfSTJDX01VWF9HUElPPW0K Q09ORklHX0kyQ19NVVhfUENBOTU0MT1tCkNPTkZJR19JMkNfTVVYX1BDQTk1NHg9bQpDT05GSUdf STJDX0hFTFBFUl9BVVRPPXkKQ09ORklHX0kyQ19TTUJVUz1tCkNPTkZJR19JMkNfQUxHT0JJVD1t CkNPTkZJR19JMkNfQUxHT1BDQT1tCgojCiMgSTJDIEhhcmR3YXJlIEJ1cyBzdXBwb3J0CiMKCiMK IyBQQyBTTUJ1cyBob3N0IGNvbnRyb2xsZXIgZHJpdmVycwojCkNPTkZJR19JMkNfQUxJMTUzNT1t CkNPTkZJR19JMkNfQUxJMTU2Mz1tCkNPTkZJR19JMkNfQUxJMTVYMz1tCkNPTkZJR19JMkNfQU1E NzU2PW0KQ09ORklHX0kyQ19BTUQ3NTZfUzQ4ODI9bQpDT05GSUdfSTJDX0FNRDgxMTE9bQpDT05G SUdfSTJDX0k4MDE9bQpDT05GSUdfSTJDX0lTQ0g9bQpDT05GSUdfSTJDX1BJSVg0PW0KQ09ORklH X0kyQ19ORk9SQ0UyPW0KQ09ORklHX0kyQ19ORk9SQ0UyX1M0OTg1PW0KQ09ORklHX0kyQ19TSVM1 NTk1PW0KQ09ORklHX0kyQ19TSVM2MzA9bQpDT05GSUdfSTJDX1NJUzk2WD1tCkNPTkZJR19JMkNf VklBPW0KQ09ORklHX0kyQ19WSUFQUk89bQoKIwojIEFDUEkgZHJpdmVycwojCkNPTkZJR19JMkNf U0NNST1tCgojCiMgSTJDIHN5c3RlbSBidXMgZHJpdmVycyAobW9zdGx5IGVtYmVkZGVkIC8gc3lz dGVtLW9uLWNoaXApCiMKQ09ORklHX0kyQ19ERVNJR05XQVJFX0NPUkU9bQpDT05GSUdfSTJDX0RF U0lHTldBUkVfUENJPW0KQ09ORklHX0kyQ19FRzIwVD1tCkNPTkZJR19JMkNfR1BJTz1tCkNPTkZJ R19JMkNfSU5URUxfTUlEPW0KQ09ORklHX0kyQ19PQ09SRVM9bQpDT05GSUdfSTJDX1BDQV9QTEFU Rk9STT1tCiMgQ09ORklHX0kyQ19QWEFfUENJIGlzIG5vdCBzZXQKIyBDT05GSUdfSTJDX1NJTVRF QyBpcyBub3Qgc2V0CiMgQ09ORklHX0kyQ19YSUxJTlggaXMgbm90IHNldAoKIwojIEV4dGVybmFs IEkyQy9TTUJ1cyBhZGFwdGVyIGRyaXZlcnMKIwpDT05GSUdfSTJDX0RJT0xBTl9VMkM9bQpDT05G SUdfSTJDX1BBUlBPUlQ9bQpDT05GSUdfSTJDX1BBUlBPUlRfTElHSFQ9bQpDT05GSUdfSTJDX1RB T1NfRVZNPW0KQ09ORklHX0kyQ19USU5ZX1VTQj1tCgojCiMgT3RoZXIgSTJDL1NNQnVzIGJ1cyBk cml2ZXJzCiMKQ09ORklHX0kyQ19TVFVCPW0KIyBDT05GSUdfSTJDX0RFQlVHX0NPUkUgaXMgbm90 IHNldAojIENPTkZJR19JMkNfREVCVUdfQUxHTyBpcyBub3Qgc2V0CiMgQ09ORklHX0kyQ19ERUJV R19CVVMgaXMgbm90IHNldApDT05GSUdfU1BJPXkKIyBDT05GSUdfU1BJX0RFQlVHIGlzIG5vdCBz ZXQKQ09ORklHX1NQSV9NQVNURVI9eQoKIwojIFNQSSBNYXN0ZXIgQ29udHJvbGxlciBEcml2ZXJz CiMKQ09ORklHX1NQSV9BTFRFUkE9bQpDT05GSUdfU1BJX0JJVEJBTkc9bQpDT05GSUdfU1BJX0JV VFRFUkZMWT1tCkNPTkZJR19TUElfR1BJTz1tCkNPTkZJR19TUElfTE03MF9MTFA9bQpDT05GSUdf U1BJX09DX1RJTlk9bQojIENPTkZJR19TUElfUFhBMlhYX1BDSSBpcyBub3Qgc2V0CkNPTkZJR19T UElfVE9QQ0xJRkZfUENIPW0KQ09ORklHX1NQSV9YSUxJTlg9bQpDT05GSUdfU1BJX0RFU0lHTldB UkU9eQpDT05GSUdfU1BJX0RXX1BDST1tCiMgQ09ORklHX1NQSV9EV19NSURfRE1BIGlzIG5vdCBz ZXQKCiMKIyBTUEkgUHJvdG9jb2wgTWFzdGVycwojCkNPTkZJR19TUElfU1BJREVWPW0KQ09ORklH X1NQSV9UTEU2MlgwPW0KQ09ORklHX0hTST1tCkNPTkZJR19IU0lfQk9BUkRJTkZPPXkKCiMKIyBI U0kgY2xpZW50cwojCkNPTkZJR19IU0lfQ0hBUj1tCgojCiMgUFBTIHN1cHBvcnQKIwpDT05GSUdf UFBTPW0KIyBDT05GSUdfUFBTX0RFQlVHIGlzIG5vdCBzZXQKCiMKIyBQUFMgY2xpZW50cyBzdXBw b3J0CiMKIyBDT05GSUdfUFBTX0NMSUVOVF9LVElNRVIgaXMgbm90IHNldApDT05GSUdfUFBTX0NM SUVOVF9MRElTQz1tCkNPTkZJR19QUFNfQ0xJRU5UX1BBUlBPUlQ9bQpDT05GSUdfUFBTX0NMSUVO VF9HUElPPW0KCiMKIyBQUFMgZ2VuZXJhdG9ycyBzdXBwb3J0CiMKCiMKIyBQVFAgY2xvY2sgc3Vw cG9ydAojCiMgQ09ORklHX1BUUF8xNTg4X0NMT0NLIGlzIG5vdCBzZXQKQ09ORklHX0FSQ0hfV0FO VF9PUFRJT05BTF9HUElPTElCPXkKQ09ORklHX0dQSU9MSUI9eQojIENPTkZJR19ERUJVR19HUElP IGlzIG5vdCBzZXQKQ09ORklHX0dQSU9fU1lTRlM9eQpDT05GSUdfR1BJT19HRU5FUklDPW0KQ09O RklHX0dQSU9fTUFYNzMwWD1tCgojCiMgTWVtb3J5IG1hcHBlZCBHUElPIGRyaXZlcnM6CiMKQ09O RklHX0dQSU9fR0VORVJJQ19QTEFURk9STT1tCkNPTkZJR19HUElPX0lUODc2MUU9bQpDT05GSUdf R1BJT19TQ0g9bQpDT05GSUdfR1BJT19WWDg1NT1tCgojCiMgSTJDIEdQSU8gZXhwYW5kZXJzOgoj CkNPTkZJR19HUElPX01BWDczMDA9bQpDT05GSUdfR1BJT19NQVg3MzJYPW0KQ09ORklHX0dQSU9f UENBOTUzWD1tCkNPTkZJR19HUElPX1BDRjg1N1g9bQpDT05GSUdfR1BJT19TVE1QRT15CkNPTkZJ R19HUElPX1RQUzY1OTEyPW0KQ09ORklHX0dQSU9fQURQNTU4OD1tCgojCiMgUENJIEdQSU8gZXhw YW5kZXJzOgojCkNPTkZJR19HUElPX0NTNTUzNT1tCkNPTkZJR19HUElPX0xBTkdXRUxMPXkKQ09O RklHX0dQSU9fUENIPW0KQ09ORklHX0dQSU9fTUxfSU9IPW0KIyBDT05GSUdfR1BJT19USU1CRVJE QUxFIGlzIG5vdCBzZXQKQ09ORklHX0dQSU9fUkRDMzIxWD1tCgojCiMgU1BJIEdQSU8gZXhwYW5k ZXJzOgojCkNPTkZJR19HUElPX01BWDczMDE9bQpDT05GSUdfR1BJT19NQ1AyM1MwOD1tCkNPTkZJ R19HUElPX01DMzM4ODA9bQpDT05GSUdfR1BJT183NFgxNjQ9bQoKIwojIEFDOTcgR1BJTyBleHBh bmRlcnM6CiMKQ09ORklHX0dQSU9fVUNCMTQwMD15CgojCiMgTU9EVUxidXMgR1BJTyBleHBhbmRl cnM6CiMKQ09ORklHX0dQSU9fSkFOWl9UVEw9bQpDT05GSUdfVzE9bQpDT05GSUdfVzFfQ09OPXkK CiMKIyAxLXdpcmUgQnVzIE1hc3RlcnMKIwpDT05GSUdfVzFfTUFTVEVSX01BVFJPWD1tCkNPTkZJ R19XMV9NQVNURVJfRFMyNDkwPW0KQ09ORklHX1cxX01BU1RFUl9EUzI0ODI9bQojIENPTkZJR19X MV9NQVNURVJfRFMxV00gaXMgbm90IHNldApDT05GSUdfVzFfTUFTVEVSX0dQSU89bQoKIwojIDEt d2lyZSBTbGF2ZXMKIwpDT05GSUdfVzFfU0xBVkVfVEhFUk09bQpDT05GSUdfVzFfU0xBVkVfU01F TT1tCiMgQ09ORklHX1cxX1NMQVZFX0RTMjQwOCBpcyBub3Qgc2V0CkNPTkZJR19XMV9TTEFWRV9E UzI0MjM9bQpDT05GSUdfVzFfU0xBVkVfRFMyNDMxPW0KQ09ORklHX1cxX1NMQVZFX0RTMjQzMz1t CkNPTkZJR19XMV9TTEFWRV9EUzI0MzNfQ1JDPXkKQ09ORklHX1cxX1NMQVZFX0RTMjc2MD1tCiMg Q09ORklHX1cxX1NMQVZFX0RTMjc4MCBpcyBub3Qgc2V0CkNPTkZJR19XMV9TTEFWRV9EUzI3ODE9 bQpDT05GSUdfVzFfU0xBVkVfQlEyNzAwMD1tCkNPTkZJR19QT1dFUl9TVVBQTFk9eQojIENPTkZJ R19QT1dFUl9TVVBQTFlfREVCVUcgaXMgbm90IHNldApDT05GSUdfUERBX1BPV0VSPW0KIyBDT05G SUdfVEVTVF9QT1dFUiBpcyBub3Qgc2V0CkNPTkZJR19CQVRURVJZX0RTMjc2MD1tCiMgQ09ORklH X0JBVFRFUllfRFMyNzgwIGlzIG5vdCBzZXQKQ09ORklHX0JBVFRFUllfRFMyNzgxPW0KQ09ORklH X0JBVFRFUllfRFMyNzgyPW0KQ09ORklHX0JBVFRFUllfU0JTPW0KQ09ORklHX0JBVFRFUllfQlEy N3gwMD1tCkNPTkZJR19CQVRURVJZX0JRMjdYMDBfSTJDPXkKQ09ORklHX0JBVFRFUllfQlEyN1gw MF9QTEFURk9STT15CkNPTkZJR19CQVRURVJZX01BWDE3MDQwPW0KQ09ORklHX0JBVFRFUllfTUFY MTcwNDI9bQpDT05GSUdfQ0hBUkdFUl9NQVg4OTAzPW0KQ09ORklHX0NIQVJHRVJfTFA4NzI3PW0K Q09ORklHX0NIQVJHRVJfR1BJTz1tCkNPTkZJR19DSEFSR0VSX01BTkFHRVI9eQpDT05GSUdfQ0hB UkdFUl9TTUIzNDc9bQpDT05GSUdfSFdNT049bQpDT05GSUdfSFdNT05fVklEPW0KIyBDT05GSUdf SFdNT05fREVCVUdfQ0hJUCBpcyBub3Qgc2V0CgojCiMgTmF0aXZlIGRyaXZlcnMKIwpDT05GSUdf U0VOU09SU19BQklUVUdVUlU9bQpDT05GSUdfU0VOU09SU19BQklUVUdVUlUzPW0KQ09ORklHX1NF TlNPUlNfQUQ3MzE0PW0KQ09ORklHX1NFTlNPUlNfQUQ3NDE0PW0KQ09ORklHX1NFTlNPUlNfQUQ3 NDE4PW0KQ09ORklHX1NFTlNPUlNfQURDWFg9bQpDT05GSUdfU0VOU09SU19BRE0xMDIxPW0KQ09O RklHX1NFTlNPUlNfQURNMTAyNT1tCkNPTkZJR19TRU5TT1JTX0FETTEwMjY9bQpDT05GSUdfU0VO U09SU19BRE0xMDI5PW0KQ09ORklHX1NFTlNPUlNfQURNMTAzMT1tCkNPTkZJR19TRU5TT1JTX0FE TTkyNDA9bQpDT05GSUdfU0VOU09SU19BRFQ3NDExPW0KQ09ORklHX1NFTlNPUlNfQURUNzQ2Mj1t CkNPTkZJR19TRU5TT1JTX0FEVDc0NzA9bQpDT05GSUdfU0VOU09SU19BRFQ3NDc1PW0KQ09ORklH X1NFTlNPUlNfQVNDNzYyMT1tCkNPTkZJR19TRU5TT1JTX0s4VEVNUD1tCkNPTkZJR19TRU5TT1JT X0sxMFRFTVA9bQpDT05GSUdfU0VOU09SU19GQU0xNUhfUE9XRVI9bQpDT05GSUdfU0VOU09SU19B U0IxMDA9bQpDT05GSUdfU0VOU09SU19BVFhQMT1tCkNPTkZJR19TRU5TT1JTX0RTNjIwPW0KQ09O RklHX1NFTlNPUlNfRFMxNjIxPW0KQ09ORklHX1NFTlNPUlNfSTVLX0FNQj1tCkNPTkZJR19TRU5T T1JTX0Y3MTgwNUY9bQpDT05GSUdfU0VOU09SU19GNzE4ODJGRz1tCkNPTkZJR19TRU5TT1JTX0Y3 NTM3NVM9bQpDT05GSUdfU0VOU09SU19GU0NITUQ9bQpDT05GSUdfU0VOU09SU19HNzYwQT1tCkNP TkZJR19TRU5TT1JTX0dMNTE4U009bQpDT05GSUdfU0VOU09SU19HTDUyMFNNPW0KQ09ORklHX1NF TlNPUlNfR1BJT19GQU49bQpDT05GSUdfU0VOU09SU19DT1JFVEVNUD1tCkNPTkZJR19TRU5TT1JT X0lCTUFFTT1tCkNPTkZJR19TRU5TT1JTX0lCTVBFWD1tCkNPTkZJR19TRU5TT1JTX0lUODc9bQpD T05GSUdfU0VOU09SU19KQzQyPW0KQ09ORklHX1NFTlNPUlNfTElORUFHRT1tCkNPTkZJR19TRU5T T1JTX0xNNjM9bQpDT05GSUdfU0VOU09SU19MTTcwPW0KQ09ORklHX1NFTlNPUlNfTE03Mz1tCkNP TkZJR19TRU5TT1JTX0xNNzU9bQpDT05GSUdfU0VOU09SU19MTTc3PW0KQ09ORklHX1NFTlNPUlNf TE03OD1tCkNPTkZJR19TRU5TT1JTX0xNODA9bQpDT05GSUdfU0VOU09SU19MTTgzPW0KQ09ORklH X1NFTlNPUlNfTE04NT1tCkNPTkZJR19TRU5TT1JTX0xNODc9bQpDT05GSUdfU0VOU09SU19MTTkw PW0KQ09ORklHX1NFTlNPUlNfTE05Mj1tCkNPTkZJR19TRU5TT1JTX0xNOTM9bQpDT05GSUdfU0VO U09SU19MVEM0MTUxPW0KQ09ORklHX1NFTlNPUlNfTFRDNDIxNT1tCkNPTkZJR19TRU5TT1JTX0xU QzQyNDU9bQpDT05GSUdfU0VOU09SU19MVEM0MjYxPW0KQ09ORklHX1NFTlNPUlNfTE05NTI0MT1t CkNPTkZJR19TRU5TT1JTX0xNOTUyNDU9bQpDT05GSUdfU0VOU09SU19NQVgxMTExPW0KQ09ORklH X1NFTlNPUlNfTUFYMTYwNjU9bQpDT05GSUdfU0VOU09SU19NQVgxNjE5PW0KQ09ORklHX1NFTlNP UlNfTUFYMTY2OD1tCkNPTkZJR19TRU5TT1JTX01BWDY2Mzk9bQpDT05GSUdfU0VOU09SU19NQVg2 NjQyPW0KQ09ORklHX1NFTlNPUlNfTUFYNjY1MD1tCkNPTkZJR19TRU5TT1JTX01DUDMwMjE9bQpD T05GSUdfU0VOU09SU19OVENfVEhFUk1JU1RPUj1tCkNPTkZJR19TRU5TT1JTX1BDODczNjA9bQpD T05GSUdfU0VOU09SU19QQzg3NDI3PW0KQ09ORklHX1NFTlNPUlNfUENGODU5MT1tCkNPTkZJR19Q TUJVUz1tCkNPTkZJR19TRU5TT1JTX1BNQlVTPW0KQ09ORklHX1NFTlNPUlNfQURNMTI3NT1tCkNP TkZJR19TRU5TT1JTX0xNMjUwNjY9bQpDT05GSUdfU0VOU09SU19MVEMyOTc4PW0KQ09ORklHX1NF TlNPUlNfTUFYMTYwNjQ9bQpDT05GSUdfU0VOU09SU19NQVgzNDQ0MD1tCkNPTkZJR19TRU5TT1JT X01BWDg2ODg9bQpDT05GSUdfU0VOU09SU19VQ0Q5MDAwPW0KQ09ORklHX1NFTlNPUlNfVUNEOTIw MD1tCkNPTkZJR19TRU5TT1JTX1pMNjEwMD1tCkNPTkZJR19TRU5TT1JTX1NIVDE1PW0KQ09ORklH X1NFTlNPUlNfU0hUMjE9bQpDT05GSUdfU0VOU09SU19TSVM1NTk1PW0KQ09ORklHX1NFTlNPUlNf U01NNjY1PW0KQ09ORklHX1NFTlNPUlNfRE1FMTczNz1tCkNPTkZJR19TRU5TT1JTX0VNQzE0MDM9 bQpDT05GSUdfU0VOU09SU19FTUMyMTAzPW0KQ09ORklHX1NFTlNPUlNfRU1DNlcyMDE9bQpDT05G SUdfU0VOU09SU19TTVNDNDdNMT1tCkNPTkZJR19TRU5TT1JTX1NNU0M0N00xOTI9bQpDT05GSUdf U0VOU09SU19TTVNDNDdCMzk3PW0KQ09ORklHX1NFTlNPUlNfU0NINTZYWF9DT01NT049bQpDT05G SUdfU0VOU09SU19TQ0g1NjI3PW0KQ09ORklHX1NFTlNPUlNfU0NINTYzNj1tCkNPTkZJR19TRU5T T1JTX0FEUzEwMTU9bQpDT05GSUdfU0VOU09SU19BRFM3ODI4PW0KQ09ORklHX1NFTlNPUlNfQURT Nzg3MT1tCkNPTkZJR19TRU5TT1JTX0FNQzY4MjE9bQpDT05GSUdfU0VOU09SU19USE1DNTA9bQpD T05GSUdfU0VOU09SU19UTVAxMDI9bQpDT05GSUdfU0VOU09SU19UTVA0MDE9bQpDT05GSUdfU0VO U09SU19UTVA0MjE9bQpDT05GSUdfU0VOU09SU19WSUFfQ1BVVEVNUD1tCkNPTkZJR19TRU5TT1JT X1ZJQTY4NkE9bQpDT05GSUdfU0VOU09SU19WVDEyMTE9bQpDT05GSUdfU0VOU09SU19WVDgyMzE9 bQpDT05GSUdfU0VOU09SU19XODM3ODFEPW0KQ09ORklHX1NFTlNPUlNfVzgzNzkxRD1tCkNPTkZJ R19TRU5TT1JTX1c4Mzc5MkQ9bQpDT05GSUdfU0VOU09SU19XODM3OTM9bQpDT05GSUdfU0VOU09S U19XODM3OTU9bQpDT05GSUdfU0VOU09SU19XODM3OTVfRkFOQ1RSTD15CkNPTkZJR19TRU5TT1JT X1c4M0w3ODVUUz1tCkNPTkZJR19TRU5TT1JTX1c4M0w3ODZORz1tCkNPTkZJR19TRU5TT1JTX1c4 MzYyN0hGPW0KQ09ORklHX1NFTlNPUlNfVzgzNjI3RUhGPW0KQ09ORklHX1NFTlNPUlNfQVBQTEVT TUM9bQpDT05GSUdfU0VOU09SU19NQzEzNzgzX0FEQz1tCgojCiMgQUNQSSBkcml2ZXJzCiMKQ09O RklHX1NFTlNPUlNfQUNQSV9QT1dFUj1tCkNPTkZJR19TRU5TT1JTX0FUSzAxMTA9bQpDT05GSUdf VEhFUk1BTD15CkNPTkZJR19XQVRDSERPRz15CkNPTkZJR19XQVRDSERPR19DT1JFPXkKIyBDT05G SUdfV0FUQ0hET0dfTk9XQVlPVVQgaXMgbm90IHNldAoKIwojIFdhdGNoZG9nIERldmljZSBEcml2 ZXJzCiMKQ09ORklHX1NPRlRfV0FUQ0hET0c9bQpDT05GSUdfQUNRVUlSRV9XRFQ9bQpDT05GSUdf QURWQU5URUNIX1dEVD1tCkNPTkZJR19BTElNMTUzNV9XRFQ9bQpDT05GSUdfQUxJTTcxMDFfV0RU PW0KQ09ORklHX0Y3MTgwOEVfV0RUPW0KQ09ORklHX1NQNTEwMF9UQ089bQpDT05GSUdfR0VPREVf V0RUPW0KQ09ORklHX1NDNTIwX1dEVD1tCkNPTkZJR19TQkNfRklUUEMyX1dBVENIRE9HPW0KQ09O RklHX0VVUk9URUNIX1dEVD1tCkNPTkZJR19JQjcwMF9XRFQ9bQpDT05GSUdfSUJNQVNSPW0KQ09O RklHX1dBRkVSX1dEVD1tCkNPTkZJR19JNjMwMEVTQl9XRFQ9bQpDT05GSUdfSVRDT19XRFQ9bQpD T05GSUdfSVRDT19WRU5ET1JfU1VQUE9SVD15CkNPTkZJR19JVDg3MTJGX1dEVD1tCkNPTkZJR19J VDg3X1dEVD1tCkNPTkZJR19IUF9XQVRDSERPRz1tCiMgQ09ORklHX0hQV0RUX05NSV9ERUNPRElO RyBpcyBub3Qgc2V0CkNPTkZJR19TQzEyMDBfV0RUPW0KQ09ORklHX1BDODc0MTNfV0RUPW0KQ09O RklHX05WX1RDTz1tCkNPTkZJR182MFhYX1dEVD1tCkNPTkZJR19TQkM4MzYwX1dEVD1tCkNPTkZJ R19DUFU1X1dEVD1tCkNPTkZJR19TTVNDX1NDSDMxMVhfV0RUPW0KQ09ORklHX1NNU0MzN0I3ODdf V0RUPW0KQ09ORklHX1ZJQV9XRFQ9bQpDT05GSUdfVzgzNjI3SEZfV0RUPW0KQ09ORklHX1c4MzY5 N0hGX1dEVD1tCkNPTkZJR19XODM2OTdVR19XRFQ9bQpDT05GSUdfVzgzODc3Rl9XRFQ9bQpDT05G SUdfVzgzOTc3Rl9XRFQ9bQpDT05GSUdfTUFDSFpfV0RUPW0KQ09ORklHX1NCQ19FUFhfQzNfV0FU Q0hET0c9bQpDT05GSUdfWEVOX1dEVD1tCgojCiMgUENJLWJhc2VkIFdhdGNoZG9nIENhcmRzCiMK Q09ORklHX1BDSVBDV0FUQ0hET0c9bQpDT05GSUdfV0RUUENJPW0KCiMKIyBVU0ItYmFzZWQgV2F0 Y2hkb2cgQ2FyZHMKIwpDT05GSUdfVVNCUENXQVRDSERPRz1tCkNPTkZJR19TU0JfUE9TU0lCTEU9 eQoKIwojIFNvbmljcyBTaWxpY29uIEJhY2twbGFuZQojCkNPTkZJR19TU0I9bQpDT05GSUdfU1NC X1NQUk9NPXkKQ09ORklHX1NTQl9CTE9DS0lPPXkKQ09ORklHX1NTQl9QQ0lIT1NUX1BPU1NJQkxF PXkKQ09ORklHX1NTQl9QQ0lIT1NUPXkKQ09ORklHX1NTQl9CNDNfUENJX0JSSURHRT15CkNPTkZJ R19TU0JfUENNQ0lBSE9TVF9QT1NTSUJMRT15CkNPTkZJR19TU0JfUENNQ0lBSE9TVD15CkNPTkZJ R19TU0JfU0RJT0hPU1RfUE9TU0lCTEU9eQpDT05GSUdfU1NCX1NESU9IT1NUPXkKIyBDT05GSUdf U1NCX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1NTQl9EUklWRVJfUENJQ09SRV9QT1NTSUJMRT15 CkNPTkZJR19TU0JfRFJJVkVSX1BDSUNPUkU9eQpDT05GSUdfQkNNQV9QT1NTSUJMRT15CgojCiMg QnJvYWRjb20gc3BlY2lmaWMgQU1CQQojCiMgQ09ORklHX0JDTUEgaXMgbm90IHNldAoKIwojIE11 bHRpZnVuY3Rpb24gZGV2aWNlIGRyaXZlcnMKIwpDT05GSUdfTUZEX0NPUkU9eQpDT05GSUdfTUZE X1NNNTAxPW0KQ09ORklHX01GRF9TTTUwMV9HUElPPXkKQ09ORklHX0hUQ19QQVNJQzM9bQpDT05G SUdfVUNCMTQwMF9DT1JFPW0KQ09ORklHX1RQUzYxMDVYPW0KQ09ORklHX1RQUzY1MDEwPW0KQ09O RklHX1RQUzY1MDdYPW0KQ09ORklHX01GRF9UUFM2NTIxNz1tCkNPTkZJR19NRkRfVFBTNjU5MTI9 eQpDT05GSUdfTUZEX1RQUzY1OTEyX1NQST15CkNPTkZJR19NRkRfU1RNUEU9eQoKIwojIFNUTVBF IEludGVyZmFjZSBEcml2ZXJzCiMKQ09ORklHX1NUTVBFX1NQST15CiMgQ09ORklHX01GRF9UTUlP IGlzIG5vdCBzZXQKQ09ORklHX1BNSUNfREE5MDUyPXkKQ09ORklHX01GRF9EQTkwNTJfU1BJPXkK Q09ORklHX01GRF9XTTg0MDA9bQojIENPTkZJR19NRkRfV004MzFYX1NQSSBpcyBub3Qgc2V0CiMg Q09ORklHX01GRF9QQ0Y1MDYzMyBpcyBub3Qgc2V0CkNPTkZJR19NRkRfTUMxMzc4Mz1tCkNPTkZJ R19NRkRfTUMxM1hYWD1tCiMgQ09ORklHX0FCWDUwMF9DT1JFIGlzIG5vdCBzZXQKQ09ORklHX0Va WF9QQ0FQPXkKQ09ORklHX01GRF9DUzU1MzU9bQpDT05GSUdfTUZEX1RJTUJFUkRBTEU9bQpDT05G SUdfTFBDX1NDSD1tCkNPTkZJR19NRkRfUkRDMzIxWD1tCkNPTkZJR19NRkRfSkFOWl9DTU9ESU89 bQpDT05GSUdfTUZEX1ZYODU1PW0KQ09ORklHX01GRF9XTDEyNzNfQ09SRT1tCkNPTkZJR19SRUdV TEFUT1I9eQojIENPTkZJR19SRUdVTEFUT1JfREVCVUcgaXMgbm90IHNldApDT05GSUdfUkVHVUxB VE9SX0RVTU1ZPXkKQ09ORklHX1JFR1VMQVRPUl9GSVhFRF9WT0xUQUdFPW0KQ09ORklHX1JFR1VM QVRPUl9WSVJUVUFMX0NPTlNVTUVSPW0KQ09ORklHX1JFR1VMQVRPUl9VU0VSU1BBQ0VfQ09OU1VN RVI9bQpDT05GSUdfUkVHVUxBVE9SX0dQSU89bQpDT05GSUdfUkVHVUxBVE9SX0FENTM5OD1tCkNP TkZJR19SRUdVTEFUT1JfREE5MDUyPW0KQ09ORklHX1JFR1VMQVRPUl9NQzEzWFhYX0NPUkU9bQpD T05GSUdfUkVHVUxBVE9SX01DMTM3ODM9bQpDT05GSUdfUkVHVUxBVE9SX01DMTM4OTI9bQpDT05G SUdfUkVHVUxBVE9SX0lTTDYyNzFBPW0KQ09ORklHX1JFR1VMQVRPUl9NQVgxNTg2PW0KQ09ORklH X1JFR1VMQVRPUl9NQVg4NjQ5PW0KQ09ORklHX1JFR1VMQVRPUl9NQVg4NjYwPW0KQ09ORklHX1JF R1VMQVRPUl9NQVg4OTUyPW0KQ09ORklHX1JFR1VMQVRPUl9QQ0FQPW0KQ09ORklHX1JFR1VMQVRP Ul9MUDM5NzE9bQpDT05GSUdfUkVHVUxBVE9SX0xQMzk3Mj1tCkNPTkZJR19SRUdVTEFUT1JfVFBT NjEwNVg9bQpDT05GSUdfUkVHVUxBVE9SX1RQUzYyMzYwPW0KQ09ORklHX1JFR1VMQVRPUl9UUFM2 NTAyMz1tCkNPTkZJR19SRUdVTEFUT1JfVFBTNjUwN1g9bQpDT05GSUdfUkVHVUxBVE9SX1RQUzY1 MjE3PW0KQ09ORklHX1JFR1VMQVRPUl9UUFM2NTI0WD1tCkNPTkZJR19SRUdVTEFUT1JfVFBTNjU5 MTI9bQpDT05GSUdfUkVHVUxBVE9SX1dNODQwMD1tCkNPTkZJR19NRURJQV9TVVBQT1JUPW0KCiMK IyBNdWx0aW1lZGlhIGNvcmUgc3VwcG9ydAojCiMgQ09ORklHX01FRElBX0NPTlRST0xMRVIgaXMg bm90IHNldApDT05GSUdfVklERU9fREVWPW0KQ09ORklHX1ZJREVPX1Y0TDJfQ09NTU9OPW0KQ09O RklHX0RWQl9DT1JFPW0KQ09ORklHX0RWQl9ORVQ9eQpDT05GSUdfVklERU9fTUVESUE9bQoKIwoj IE11bHRpbWVkaWEgZHJpdmVycwojCkNPTkZJR19WSURFT19TQUE3MTQ2PW0KQ09ORklHX1ZJREVP X1NBQTcxNDZfVlY9bQpDT05GSUdfUkNfQ09SRT1tCkNPTkZJR19MSVJDPW0KQ09ORklHX1JDX01B UD1tCkNPTkZJR19JUl9ORUNfREVDT0RFUj1tCkNPTkZJR19JUl9SQzVfREVDT0RFUj1tCkNPTkZJ R19JUl9SQzZfREVDT0RFUj1tCkNPTkZJR19JUl9KVkNfREVDT0RFUj1tCkNPTkZJR19JUl9TT05Z X0RFQ09ERVI9bQpDT05GSUdfSVJfUkM1X1NaX0RFQ09ERVI9bQpDT05GSUdfSVJfU0FOWU9fREVD T0RFUj1tCkNPTkZJR19JUl9NQ0VfS0JEX0RFQ09ERVI9bQpDT05GSUdfSVJfTElSQ19DT0RFQz1t CkNPTkZJR19SQ19BVElfUkVNT1RFPW0KIyBDT05GSUdfSVJfRU5FIGlzIG5vdCBzZXQKQ09ORklH X0lSX0lNT049bQpDT05GSUdfSVJfTUNFVVNCPW0KQ09ORklHX0lSX0lURV9DSVI9bQpDT05GSUdf SVJfRklOVEVLPW0KQ09ORklHX0lSX05VVk9UT049bQpDT05GSUdfSVJfUkVEUkFUMz1tCkNPTkZJ R19JUl9TVFJFQU1aQVA9bQpDT05GSUdfSVJfV0lOQk9ORF9DSVI9bQpDT05GSUdfUkNfTE9PUEJB Q0s9bQpDT05GSUdfSVJfR1BJT19DSVI9bQpDT05GSUdfTUVESUFfQVRUQUNIPXkKQ09ORklHX01F RElBX1RVTkVSPW0KIyBDT05GSUdfTUVESUFfVFVORVJfQ1VTVE9NSVNFIGlzIG5vdCBzZXQKQ09O RklHX01FRElBX1RVTkVSX1NJTVBMRT1tCkNPTkZJR19NRURJQV9UVU5FUl9UREE4MjkwPW0KQ09O RklHX01FRElBX1RVTkVSX1REQTgyN1g9bQpDT05GSUdfTUVESUFfVFVORVJfVERBMTgyNzE9bQpD T05GSUdfTUVESUFfVFVORVJfVERBOTg4Nz1tCkNPTkZJR19NRURJQV9UVU5FUl9URUE1NzYxPW0K Q09ORklHX01FRElBX1RVTkVSX1RFQTU3Njc9bQpDT05GSUdfTUVESUFfVFVORVJfTVQyMFhYPW0K Q09ORklHX01FRElBX1RVTkVSX01UMjA2MD1tCkNPTkZJR19NRURJQV9UVU5FUl9NVDIwNjM9bQpD T05GSUdfTUVESUFfVFVORVJfTVQyMjY2PW0KQ09ORklHX01FRElBX1RVTkVSX01UMjEzMT1tCkNP TkZJR19NRURJQV9UVU5FUl9RVDEwMTA9bQpDT05GSUdfTUVESUFfVFVORVJfWEMyMDI4PW0KQ09O RklHX01FRElBX1RVTkVSX1hDNTAwMD1tCkNPTkZJR19NRURJQV9UVU5FUl9YQzQwMDA9bQpDT05G SUdfTUVESUFfVFVORVJfTVhMNTAwNVM9bQpDT05GSUdfTUVESUFfVFVORVJfTVhMNTAwN1Q9bQpD T05GSUdfTUVESUFfVFVORVJfTUM0NFM4MDM9bQpDT05GSUdfTUVESUFfVFVORVJfTUFYMjE2NT1t CkNPTkZJR19NRURJQV9UVU5FUl9UREExODIxOD1tCkNPTkZJR19NRURJQV9UVU5FUl9UREExODIx Mj1tCkNPTkZJR19WSURFT19WNEwyPW0KQ09ORklHX1ZJREVPQlVGX0dFTj1tCkNPTkZJR19WSURF T0JVRl9ETUFfU0c9bQpDT05GSUdfVklERU9CVUZfVk1BTExPQz1tCkNPTkZJR19WSURFT0JVRl9E VkI9bQpDT05GSUdfVklERU9fQlRDWD1tCkNPTkZJR19WSURFT19UVkVFUFJPTT1tCkNPTkZJR19W SURFT19UVU5FUj1tCkNPTkZJR19WSURFT0JVRjJfQ09SRT1tCkNPTkZJR19WSURFT0JVRjJfTUVN T1BTPW0KQ09ORklHX1ZJREVPQlVGMl9ETUFfQ09OVElHPW0KQ09ORklHX1ZJREVPQlVGMl9WTUFM TE9DPW0KQ09ORklHX1ZJREVPX0NBUFRVUkVfRFJJVkVSUz15CiMgQ09ORklHX1ZJREVPX0FEVl9E RUJVRyBpcyBub3Qgc2V0CiMgQ09ORklHX1ZJREVPX0ZJWEVEX01JTk9SX1JBTkdFUyBpcyBub3Qg c2V0CkNPTkZJR19WSURFT19IRUxQRVJfQ0hJUFNfQVVUTz15CkNPTkZJR19WSURFT19JUl9JMkM9 bQoKIwojIEF1ZGlvIGRlY29kZXJzLCBwcm9jZXNzb3JzIGFuZCBtaXhlcnMKIwpDT05GSUdfVklE RU9fVFZBVURJTz1tCkNPTkZJR19WSURFT19UREE3NDMyPW0KQ09ORklHX1ZJREVPX1REQTk4NDA9 bQpDT05GSUdfVklERU9fVEVBNjQxNUM9bQpDT05GSUdfVklERU9fVEVBNjQyMD1tCkNPTkZJR19W SURFT19NU1AzNDAwPW0KQ09ORklHX1ZJREVPX0NTNTM0NT1tCkNPTkZJR19WSURFT19DUzUzTDMy QT1tCkNPTkZJR19WSURFT19XTTg3NzU9bQpDT05GSUdfVklERU9fV004NzM5PW0KQ09ORklHX1ZJ REVPX1ZQMjdTTVBYPW0KCiMKIyBSRFMgZGVjb2RlcnMKIwpDT05GSUdfVklERU9fU0FBNjU4OD1t CgojCiMgVmlkZW8gZGVjb2RlcnMKIwpDT05GSUdfVklERU9fQlQ4MTk9bQpDT05GSUdfVklERU9f QlQ4NTY9bQpDT05GSUdfVklERU9fQlQ4NjY9bQpDT05GSUdfVklERU9fS1MwMTI3PW0KQ09ORklH X1ZJREVPX1NBQTcxMTA9bQpDT05GSUdfVklERU9fU0FBNzExWD1tCkNPTkZJR19WSURFT19UVlA1 MTUwPW0KQ09ORklHX1ZJREVPX1ZQWDMyMjA9bQoKIwojIFZpZGVvIGFuZCBhdWRpbyBkZWNvZGVy cwojCkNPTkZJR19WSURFT19TQUE3MTdYPW0KQ09ORklHX1ZJREVPX0NYMjU4NDA9bQoKIwojIE1Q RUcgdmlkZW8gZW5jb2RlcnMKIwpDT05GSUdfVklERU9fQ1gyMzQxWD1tCgojCiMgVmlkZW8gZW5j b2RlcnMKIwpDT05GSUdfVklERU9fU0FBNzEyNz1tCkNPTkZJR19WSURFT19TQUE3MTg1PW0KQ09O RklHX1ZJREVPX0FEVjcxNzA9bQpDT05GSUdfVklERU9fQURWNzE3NT1tCgojCiMgQ2FtZXJhIHNl bnNvciBkZXZpY2VzCiMKQ09ORklHX1ZJREVPX01UOVYwMTE9bQoKIwojIEZsYXNoIGRldmljZXMK IwoKIwojIFZpZGVvIGltcHJvdmVtZW50IGNoaXBzCiMKQ09ORklHX1ZJREVPX1VQRDY0MDMxQT1t CkNPTkZJR19WSURFT19VUEQ2NDA4Mz1tCgojCiMgTWlzY2VsYW5lb3VzIGhlbHBlciBjaGlwcwoj CkNPTkZJR19WSURFT19NNTI3OTA9bQpDT05GSUdfVklERU9fVklWST1tCkNPTkZJR19WNExfVVNC X0RSSVZFUlM9eQpDT05GSUdfVVNCX1ZJREVPX0NMQVNTPW0KQ09ORklHX1VTQl9WSURFT19DTEFT U19JTlBVVF9FVkRFVj15CkNPTkZJR19VU0JfR1NQQ0E9bQpDT05GSUdfVVNCX001NjAyPW0KQ09O RklHX1VTQl9TVFYwNlhYPW0KQ09ORklHX1VTQl9HTDg2MD1tCkNPTkZJR19VU0JfR1NQQ0FfQkVO UT1tCkNPTkZJR19VU0JfR1NQQ0FfQ09ORVg9bQpDT05GSUdfVVNCX0dTUENBX0NQSUExPW0KQ09O RklHX1VTQl9HU1BDQV9FVE9NUz1tCkNPTkZJR19VU0JfR1NQQ0FfRklORVBJWD1tCkNPTkZJR19V U0JfR1NQQ0FfSkVJTElOSj1tCkNPTkZJR19VU0JfR1NQQ0FfSkwyMDA1QkNEPW0KQ09ORklHX1VT Ql9HU1BDQV9LSU5FQ1Q9bQpDT05GSUdfVVNCX0dTUENBX0tPTklDQT1tCkNPTkZJR19VU0JfR1NQ Q0FfTUFSUz1tCkNPTkZJR19VU0JfR1NQQ0FfTVI5NzMxMEE9bQpDT05GSUdfVVNCX0dTUENBX05X ODBYPW0KQ09ORklHX1VTQl9HU1BDQV9PVjUxOT1tCkNPTkZJR19VU0JfR1NQQ0FfT1Y1MzQ9bQpD T05GSUdfVVNCX0dTUENBX09WNTM0Xzk9bQpDT05GSUdfVVNCX0dTUENBX1BBQzIwNz1tCkNPTkZJ R19VU0JfR1NQQ0FfUEFDNzMwMj1tCkNPTkZJR19VU0JfR1NQQ0FfUEFDNzMxMT1tCkNPTkZJR19V U0JfR1NQQ0FfU0U0MDE9bQpDT05GSUdfVVNCX0dTUENBX1NOOUMyMDI4PW0KQ09ORklHX1VTQl9H U1BDQV9TTjlDMjBYPW0KQ09ORklHX1VTQl9HU1BDQV9TT05JWEI9bQpDT05GSUdfVVNCX0dTUENB X1NPTklYSj1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwMD1tCkNPTkZJR19VU0JfR1NQQ0FfU1BD QTUwMT1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwNT1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUw Nj1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTUwOD1tCkNPTkZJR19VU0JfR1NQQ0FfU1BDQTU2MT1t CkNPTkZJR19VU0JfR1NQQ0FfU1BDQTE1Mjg9bQpDT05GSUdfVVNCX0dTUENBX1NROTA1PW0KQ09O RklHX1VTQl9HU1BDQV9TUTkwNUM9bQpDT05GSUdfVVNCX0dTUENBX1NROTMwWD1tCkNPTkZJR19V U0JfR1NQQ0FfU1RLMDE0PW0KQ09ORklHX1VTQl9HU1BDQV9TVFYwNjgwPW0KQ09ORklHX1VTQl9H U1BDQV9TVU5QTFVTPW0KQ09ORklHX1VTQl9HU1BDQV9UNjEzPW0KQ09ORklHX1VTQl9HU1BDQV9U T1BSTz1tCkNPTkZJR19VU0JfR1NQQ0FfVFY4NTMyPW0KQ09ORklHX1VTQl9HU1BDQV9WQzAzMlg9 bQpDT05GSUdfVVNCX0dTUENBX1ZJQ0FNPW0KQ09ORklHX1VTQl9HU1BDQV9YSVJMSU5LX0NJVD1t CkNPTkZJR19VU0JfR1NQQ0FfWkMzWFg9bQpDT05GSUdfVklERU9fUFZSVVNCMj1tCkNPTkZJR19W SURFT19QVlJVU0IyX1NZU0ZTPXkKQ09ORklHX1ZJREVPX1BWUlVTQjJfRFZCPXkKIyBDT05GSUdf VklERU9fUFZSVVNCMl9ERUJVR0lGQyBpcyBub3Qgc2V0CkNPTkZJR19WSURFT19IRFBWUj1tCkNP TkZJR19WSURFT19FTTI4WFg9bQpDT05GSUdfVklERU9fRU0yOFhYX0FMU0E9bQpDT05GSUdfVklE RU9fRU0yOFhYX0RWQj1tCkNPTkZJR19WSURFT19FTTI4WFhfUkM9eQpDT05GSUdfVklERU9fVExH MjMwMD1tCkNPTkZJR19WSURFT19DWDIzMVhYPW0KQ09ORklHX1ZJREVPX0NYMjMxWFhfUkM9eQpD T05GSUdfVklERU9fQ1gyMzFYWF9BTFNBPW0KQ09ORklHX1ZJREVPX0NYMjMxWFhfRFZCPW0KQ09O RklHX1ZJREVPX1RNNjAwMD1tCkNPTkZJR19WSURFT19UTTYwMDBfQUxTQT1tCkNPTkZJR19WSURF T19UTTYwMDBfRFZCPW0KQ09ORklHX1ZJREVPX1VTQlZJU0lPTj1tCkNPTkZJR19VU0JfRVQ2MVgy NTE9bQpDT05GSUdfVVNCX1NOOUMxMDI9bQpDT05GSUdfVVNCX1BXQz1tCiMgQ09ORklHX1VTQl9Q V0NfREVCVUcgaXMgbm90IHNldApDT05GSUdfVVNCX1BXQ19JTlBVVF9FVkRFVj15CkNPTkZJR19W SURFT19DUElBMj1tCkNPTkZJR19VU0JfWlIzNjRYWD1tCkNPTkZJR19VU0JfU1RLV0VCQ0FNPW0K Q09ORklHX1VTQl9TMjI1NT1tCkNPTkZJR19WNExfUENJX0RSSVZFUlM9eQpDT05GSUdfVklERU9f QVUwODI4PW0KQ09ORklHX1ZJREVPX0JUODQ4PW0KQ09ORklHX1ZJREVPX0JUODQ4X0RWQj15CkNP TkZJR19WSURFT19DWDE4PW0KQ09ORklHX1ZJREVPX0NYMThfQUxTQT1tCkNPTkZJR19WSURFT19D WDIzODg1PW0KQ09ORklHX01FRElBX0FMVEVSQV9DST1tCkNPTkZJR19WSURFT19DWDI1ODIxPW0K Q09ORklHX1ZJREVPX0NYMjU4MjFfQUxTQT1tCkNPTkZJR19WSURFT19DWDg4PW0KQ09ORklHX1ZJ REVPX0NYODhfQUxTQT1tCkNPTkZJR19WSURFT19DWDg4X0JMQUNLQklSRD1tCkNPTkZJR19WSURF T19DWDg4X0RWQj1tCkNPTkZJR19WSURFT19DWDg4X1ZQMzA1ND1tCkNPTkZJR19WSURFT19DWDg4 X01QRUc9bQpDT05GSUdfVklERU9fSEVYSVVNX0dFTUlOST1tCkNPTkZJR19WSURFT19IRVhJVU1f T1JJT049bQpDT05GSUdfVklERU9fSVZUVj1tCkNPTkZJR19WSURFT19GQl9JVlRWPW0KQ09ORklH X1ZJREVPX01FWUU9bQpDT05GSUdfVklERU9fTVhCPW0KQ09ORklHX1ZJREVPX1NBQTcxMzQ9bQpD T05GSUdfVklERU9fU0FBNzEzNF9BTFNBPW0KQ09ORklHX1ZJREVPX1NBQTcxMzRfUkM9eQpDT05G SUdfVklERU9fU0FBNzEzNF9EVkI9bQpDT05GSUdfVklERU9fU0FBNzE2ND1tCkNPTkZJR19WSURF T19aT1JBTj1tCkNPTkZJR19WSURFT19aT1JBTl9EQzMwPW0KQ09ORklHX1ZJREVPX1pPUkFOX1pS MzYwNjA9bQpDT05GSUdfVklERU9fWk9SQU5fQlVaPW0KQ09ORklHX1ZJREVPX1pPUkFOX0RDMTA9 bQpDT05GSUdfVklERU9fWk9SQU5fTE1MMzM9bQpDT05GSUdfVklERU9fWk9SQU5fTE1MMzNSMTA9 bQpDT05GSUdfVklERU9fWk9SQU5fQVZTNkVZRVM9bQojIENPTkZJR19WNExfSVNBX1BBUlBPUlRf RFJJVkVSUyBpcyBub3Qgc2V0CiMgQ09ORklHX1Y0TF9QTEFURk9STV9EUklWRVJTIGlzIG5vdCBz ZXQKIyBDT05GSUdfVjRMX01FTTJNRU1fRFJJVkVSUyBpcyBub3Qgc2V0CkNPTkZJR19SQURJT19B REFQVEVSUz15CkNPTkZJR19SQURJT19TSTQ3MFg9eQpDT05GSUdfVVNCX1NJNDcwWD1tCkNPTkZJ R19JMkNfU0k0NzBYPW0KQ09ORklHX1VTQl9NUjgwMD1tCkNPTkZJR19VU0JfRFNCUj1tCkNPTkZJ R19SQURJT19NQVhJUkFESU89bQpDT05GSUdfSTJDX1NJNDcxMz1tCkNPTkZJR19SQURJT19TSTQ3 MTM9bQpDT05GSUdfVVNCX0tFRU5FPW0KQ09ORklHX1JBRElPX1RFQTU3NjQ9bQpDT05GSUdfUkFE SU9fU0FBNzcwNkg9bQpDT05GSUdfUkFESU9fVEVGNjg2Mj1tCkNPTkZJR19SQURJT19USU1CRVJE QUxFPW0KQ09ORklHX1JBRElPX1dMMTI3Mz1tCgojCiMgVGV4YXMgSW5zdHJ1bWVudHMgV0wxMjh4 IEZNIGRyaXZlciAoU1QgYmFzZWQpCiMKQ09ORklHX1JBRElPX1dMMTI4WD1tCkNPTkZJR19EVkJf TUFYX0FEQVBURVJTPTgKQ09ORklHX0RWQl9EWU5BTUlDX01JTk9SUz15CkNPTkZJR19EVkJfQ0FQ VFVSRV9EUklWRVJTPXkKCiMKIyBTdXBwb3J0ZWQgU0FBNzE0NiBiYXNlZCBQQ0kgQWRhcHRlcnMK IwpDT05GSUdfVFRQQ0lfRUVQUk9NPW0KQ09ORklHX0RWQl9BVjcxMTA9bQpDT05GSUdfRFZCX0FW NzExMF9PU0Q9eQpDT05GSUdfRFZCX0JVREdFVF9DT1JFPW0KQ09ORklHX0RWQl9CVURHRVQ9bQpD T05GSUdfRFZCX0JVREdFVF9DST1tCkNPTkZJR19EVkJfQlVER0VUX0FWPW0KQ09ORklHX0RWQl9C VURHRVRfUEFUQ0g9bQoKIwojIFN1cHBvcnRlZCBVU0IgQWRhcHRlcnMKIwpDT05GSUdfRFZCX1VT Qj1tCiMgQ09ORklHX0RWQl9VU0JfREVCVUcgaXMgbm90IHNldApDT05GSUdfRFZCX1VTQl9BODAw PW0KQ09ORklHX0RWQl9VU0JfRElCVVNCX01CPW0KIyBDT05GSUdfRFZCX1VTQl9ESUJVU0JfTUJf RkFVTFRZIGlzIG5vdCBzZXQKQ09ORklHX0RWQl9VU0JfRElCVVNCX01DPW0KQ09ORklHX0RWQl9V U0JfRElCMDcwMD1tCkNPTkZJR19EVkJfVVNCX1VNVF8wMTA9bQpDT05GSUdfRFZCX1VTQl9DWFVT Qj1tCkNPTkZJR19EVkJfVVNCX005MjBYPW0KQ09ORklHX0RWQl9VU0JfR0w4NjE9bQpDT05GSUdf RFZCX1VTQl9BVTY2MTA9bQpDT05GSUdfRFZCX1VTQl9ESUdJVFY9bQpDT05GSUdfRFZCX1VTQl9W UDcwNDU9bQpDT05GSUdfRFZCX1VTQl9WUDcwMlg9bQpDT05GSUdfRFZCX1VTQl9HUDhQU0s9bQpD T05GSUdfRFZCX1VTQl9OT1ZBX1RfVVNCMj1tCkNPTkZJR19EVkJfVVNCX1RUVVNCMj1tCkNPTkZJ R19EVkJfVVNCX0RUVDIwMFU9bQpDT05GSUdfRFZCX1VTQl9PUEVSQTE9bQpDT05GSUdfRFZCX1VT Ql9BRjkwMDU9bQpDT05GSUdfRFZCX1VTQl9BRjkwMDVfUkVNT1RFPW0KQ09ORklHX0RWQl9VU0Jf UENUVjQ1MkU9bQpDT05GSUdfRFZCX1VTQl9EVzIxMDI9bQpDT05GSUdfRFZCX1VTQl9DSU5FUkdZ X1QyPW0KQ09ORklHX0RWQl9VU0JfQU5ZU0VFPW0KQ09ORklHX0RWQl9VU0JfRFRWNTEwMD1tCkNP TkZJR19EVkJfVVNCX0FGOTAxNT1tCkNPTkZJR19EVkJfVVNCX0NFNjIzMD1tCkNPTkZJR19EVkJf VVNCX0ZSSUlPPW0KQ09ORklHX0RWQl9VU0JfRUMxNjg9bQpDT05GSUdfRFZCX1VTQl9BWjYwMDc9 bQpDT05GSUdfRFZCX1VTQl9BWjYwMjc9bQpDT05GSUdfRFZCX1VTQl9MTUUyNTEwPW0KQ09ORklH X0RWQl9VU0JfVEVDSE5JU0FUX1VTQjI9bQpDT05GSUdfRFZCX1VTQl9JVDkxM1g9bQpDT05GSUdf RFZCX1VTQl9NWEwxMTFTRj1tCkNPTkZJR19EVkJfVVNCX1JUTDI4WFhVPW0KQ09ORklHX0RWQl9U VFVTQl9CVURHRVQ9bQpDT05GSUdfRFZCX1RUVVNCX0RFQz1tCkNPTkZJR19TTVNfU0lBTk9fTURU Vj1tCgojCiMgU2lhbm8gbW9kdWxlIGNvbXBvbmVudHMKIwpDT05GSUdfU01TX1VTQl9EUlY9bQpD T05GSUdfU01TX1NESU9fRFJWPW0KCiMKIyBTdXBwb3J0ZWQgRmxleENvcElJIChCMkMyKSBBZGFw dGVycwojCkNPTkZJR19EVkJfQjJDMl9GTEVYQ09QPW0KQ09ORklHX0RWQl9CMkMyX0ZMRVhDT1Bf UENJPW0KQ09ORklHX0RWQl9CMkMyX0ZMRVhDT1BfVVNCPW0KIyBDT05GSUdfRFZCX0IyQzJfRkxF WENPUF9ERUJVRyBpcyBub3Qgc2V0CgojCiMgU3VwcG9ydGVkIEJUODc4IEFkYXB0ZXJzCiMKQ09O RklHX0RWQl9CVDhYWD1tCgojCiMgU3VwcG9ydGVkIFBsdXRvMiBBZGFwdGVycwojCkNPTkZJR19E VkJfUExVVE8yPW0KCiMKIyBTdXBwb3J0ZWQgU0RNQyBETTExMDUgQWRhcHRlcnMKIwpDT05GSUdf RFZCX0RNMTEwNT1tCgojCiMgU3VwcG9ydGVkIEZpcmVXaXJlIChJRUVFIDEzOTQpIEFkYXB0ZXJz CiMKQ09ORklHX0RWQl9GSVJFRFRWPW0KQ09ORklHX0RWQl9GSVJFRFRWX0lOUFVUPXkKCiMKIyBT dXBwb3J0ZWQgRWFydGhzb2Z0IFBUMSBBZGFwdGVycwojCkNPTkZJR19EVkJfUFQxPW0KCiMKIyBT dXBwb3J0ZWQgTWFudGlzIEFkYXB0ZXJzCiMKQ09ORklHX01BTlRJU19DT1JFPW0KQ09ORklHX0RW Ql9NQU5USVM9bQpDT05GSUdfRFZCX0hPUFBFUj1tCgojCiMgU3VwcG9ydGVkIG5HZW5lIEFkYXB0 ZXJzCiMKQ09ORklHX0RWQl9OR0VORT1tCgojCiMgU3VwcG9ydGVkIGRkYnJpZGdlICgnT2N0b3B1 cycpIEFkYXB0ZXJzCiMKQ09ORklHX0RWQl9EREJSSURHRT1tCgojCiMgU3VwcG9ydGVkIERWQiBG cm9udGVuZHMKIwojIENPTkZJR19EVkJfRkVfQ1VTVE9NSVNFIGlzIG5vdCBzZXQKCiMKIyBNdWx0 aXN0YW5kYXJkIChzYXRlbGxpdGUpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfU1RCMDg5OT1tCkNP TkZJR19EVkJfU1RCNjEwMD1tCkNPTkZJR19EVkJfU1RWMDkweD1tCkNPTkZJR19EVkJfU1RWNjEx MHg9bQoKIwojIE11bHRpc3RhbmRhcmQgKGNhYmxlICsgdGVycmVzdHJpYWwpIGZyb250ZW5kcwoj CkNPTkZJR19EVkJfRFJYSz1tCkNPTkZJR19EVkJfVERBMTgyNzFDMkREPW0KCiMKIyBEVkItUyAo c2F0ZWxsaXRlKSBmcm9udGVuZHMKIwpDT05GSUdfRFZCX0NYMjQxMTA9bQpDT05GSUdfRFZCX0NY MjQxMjM9bQpDT05GSUdfRFZCX01UMzEyPW0KQ09ORklHX0RWQl9aTDEwMDM2PW0KQ09ORklHX0RW Ql9aTDEwMDM5PW0KQ09ORklHX0RWQl9TNUgxNDIwPW0KQ09ORklHX0RWQl9TVFYwMjg4PW0KQ09O RklHX0RWQl9TVEI2MDAwPW0KQ09ORklHX0RWQl9TVFYwMjk5PW0KQ09ORklHX0RWQl9TVFY2MTEw PW0KQ09ORklHX0RWQl9TVFYwOTAwPW0KQ09ORklHX0RWQl9UREE4MDgzPW0KQ09ORklHX0RWQl9U REExMDA4Nj1tCkNPTkZJR19EVkJfVERBODI2MT1tCkNPTkZJR19EVkJfVkVTMVg5Mz1tCkNPTkZJ R19EVkJfVFVORVJfSVREMTAwMD1tCkNPTkZJR19EVkJfVFVORVJfQ1gyNDExMz1tCkNPTkZJR19E VkJfVERBODI2WD1tCkNPTkZJR19EVkJfVFVBNjEwMD1tCkNPTkZJR19EVkJfQ1gyNDExNj1tCkNP TkZJR19EVkJfU0kyMVhYPW0KQ09ORklHX0RWQl9EUzMwMDA9bQpDT05GSUdfRFZCX01CODZBMTY9 bQpDT05GSUdfRFZCX1REQTEwMDcxPW0KCiMKIyBEVkItVCAodGVycmVzdHJpYWwpIGZyb250ZW5k cwojCkNPTkZJR19EVkJfU1A4ODcwPW0KQ09ORklHX0RWQl9TUDg4N1g9bQpDT05GSUdfRFZCX0NY MjI3MDA9bQpDT05GSUdfRFZCX0NYMjI3MDI9bQpDT05GSUdfRFZCX0RSWEQ9bQpDT05GSUdfRFZC X0w2NDc4MT1tCkNPTkZJR19EVkJfVERBMTAwNFg9bQpDT05GSUdfRFZCX05YVDYwMDA9bQpDT05G SUdfRFZCX01UMzUyPW0KQ09ORklHX0RWQl9aTDEwMzUzPW0KQ09ORklHX0RWQl9ESUIzMDAwTUI9 bQpDT05GSUdfRFZCX0RJQjMwMDBNQz1tCkNPTkZJR19EVkJfRElCNzAwME09bQpDT05GSUdfRFZC X0RJQjcwMDBQPW0KQ09ORklHX0RWQl9UREExMDA0OD1tCkNPTkZJR19EVkJfQUY5MDEzPW0KQ09O RklHX0RWQl9FQzEwMD1tCkNPTkZJR19EVkJfU1RWMDM2Nz1tCkNPTkZJR19EVkJfQ1hEMjgyMFI9 bQpDT05GSUdfRFZCX1JUTDI4MzA9bQoKIwojIERWQi1DIChjYWJsZSkgZnJvbnRlbmRzCiMKQ09O RklHX0RWQl9WRVMxODIwPW0KQ09ORklHX0RWQl9UREExMDAyMT1tCkNPTkZJR19EVkJfVERBMTAw MjM9bQpDT05GSUdfRFZCX1NUVjAyOTc9bQoKIwojIEFUU0MgKE5vcnRoIEFtZXJpY2FuL0tvcmVh biBUZXJyZXN0cmlhbC9DYWJsZSBEVFYpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfTlhUMjAwWD1t CkNPTkZJR19EVkJfT1I1MTIxMT1tCkNPTkZJR19EVkJfT1I1MTEzMj1tCkNPTkZJR19EVkJfQkNN MzUxMD1tCkNPTkZJR19EVkJfTEdEVDMzMFg9bQpDT05GSUdfRFZCX0xHRFQzMzA1PW0KQ09ORklH X0RWQl9TNUgxNDA5PW0KQ09ORklHX0RWQl9BVTg1MjI9bQpDT05GSUdfRFZCX1M1SDE0MTE9bQoK IwojIElTREItVCAodGVycmVzdHJpYWwpIGZyb250ZW5kcwojCkNPTkZJR19EVkJfUzkyMT1tCkNP TkZJR19EVkJfRElCODAwMD1tCkNPTkZJR19EVkJfTUI4NkEyMFM9bQoKIwojIERpZ2l0YWwgdGVy cmVzdHJpYWwgb25seSB0dW5lcnMvUExMCiMKQ09ORklHX0RWQl9QTEw9bQpDT05GSUdfRFZCX1RV TkVSX0RJQjAwNzA9bQpDT05GSUdfRFZCX1RVTkVSX0RJQjAwOTA9bQoKIwojIFNFQyBjb250cm9s IGRldmljZXMgZm9yIERWQi1TCiMKQ09ORklHX0RWQl9MTkJQMjE9bQpDT05GSUdfRFZCX0xOQlAy Mj1tCkNPTkZJR19EVkJfSVNMNjQwNT1tCkNPTkZJR19EVkJfSVNMNjQyMT1tCkNPTkZJR19EVkJf SVNMNjQyMz1tCkNPTkZJR19EVkJfQTgyOTM9bQpDT05GSUdfRFZCX0xHUzhHWFg9bQpDT05GSUdf RFZCX0FUQk04ODMwPW0KQ09ORklHX0RWQl9UREE2NjV4PW0KQ09ORklHX0RWQl9JWDI1MDVWPW0K Q09ORklHX0RWQl9JVDkxM1hfRkU9bQpDT05GSUdfRFZCX004OFJTMjAwMD1tCgojCiMgVG9vbHMg dG8gZGV2ZWxvcCBuZXcgZnJvbnRlbmRzCiMKIyBDT05GSUdfRFZCX0RVTU1ZX0ZFIGlzIG5vdCBz ZXQKCiMKIyBHcmFwaGljcyBzdXBwb3J0CiMKQ09ORklHX0FHUD1tCkNPTkZJR19BR1BfQU1ENjQ9 bQpDT05GSUdfQUdQX0lOVEVMPW0KQ09ORklHX0FHUF9TSVM9bQpDT05GSUdfQUdQX1ZJQT1tCkNP TkZJR19WR0FfQVJCPXkKQ09ORklHX1ZHQV9BUkJfTUFYX0dQVVM9MTYKQ09ORklHX1ZHQV9TV0lU Q0hFUk9PPXkKQ09ORklHX0RSTT1tCkNPTkZJR19EUk1fVVNCPW0KQ09ORklHX0RSTV9LTVNfSEVM UEVSPW0KIyBDT05GSUdfRFJNX0xPQURfRURJRF9GSVJNV0FSRSBpcyBub3Qgc2V0CkNPTkZJR19E Uk1fVFRNPW0KQ09ORklHX0RSTV9UREZYPW0KQ09ORklHX0RSTV9SMTI4PW0KQ09ORklHX0RSTV9S QURFT049bQpDT05GSUdfRFJNX1JBREVPTl9LTVM9eQpDT05GSUdfRFJNX05PVVZFQVU9bQpDT05G SUdfRFJNX05PVVZFQVVfQkFDS0xJR0hUPXkKIyBDT05GSUdfRFJNX05PVVZFQVVfREVCVUcgaXMg bm90IHNldAoKIwojIEkyQyBlbmNvZGVyIG9yIGhlbHBlciBjaGlwcwojCkNPTkZJR19EUk1fSTJD X0NINzAwNj1tCkNPTkZJR19EUk1fSTJDX1NJTDE2ND1tCkNPTkZJR19EUk1fSTgxMD1tCkNPTkZJ R19EUk1fSTkxNT1tCkNPTkZJR19EUk1fSTkxNV9LTVM9eQpDT05GSUdfRFJNX01HQT1tCkNPTkZJ R19EUk1fU0lTPW0KQ09ORklHX0RSTV9WSUE9bQpDT05GSUdfRFJNX1NBVkFHRT1tCiMgQ09ORklH X0RSTV9WTVdHRlggaXMgbm90IHNldApDT05GSUdfRFJNX0dNQTUwMD1tCkNPTkZJR19EUk1fR01B NjAwPXkKQ09ORklHX0RSTV9HTUEzNjAwPXkKQ09ORklHX0RSTV9VREw9bQpDT05GSUdfU1RVQl9Q T1VMU0JPPW0KQ09ORklHX1ZHQVNUQVRFPW0KQ09ORklHX1ZJREVPX09VVFBVVF9DT05UUk9MPW0K Q09ORklHX0ZCPXkKQ09ORklHX0ZJUk1XQVJFX0VESUQ9eQpDT05GSUdfRkJfRERDPW0KQ09ORklH X0ZCX0JPT1RfVkVTQV9TVVBQT1JUPXkKQ09ORklHX0ZCX0NGQl9GSUxMUkVDVD15CkNPTkZJR19G Ql9DRkJfQ09QWUFSRUE9eQpDT05GSUdfRkJfQ0ZCX0lNQUdFQkxJVD15CiMgQ09ORklHX0ZCX0NG Ql9SRVZfUElYRUxTX0lOX0JZVEUgaXMgbm90IHNldApDT05GSUdfRkJfU1lTX0ZJTExSRUNUPXkK Q09ORklHX0ZCX1NZU19DT1BZQVJFQT15CkNPTkZJR19GQl9TWVNfSU1BR0VCTElUPXkKIyBDT05G SUdfRkJfRk9SRUlHTl9FTkRJQU4gaXMgbm90IHNldApDT05GSUdfRkJfU1lTX0ZPUFM9eQojIENP TkZJR19GQl9XTVRfR0VfUk9QUyBpcyBub3Qgc2V0CkNPTkZJR19GQl9ERUZFUlJFRF9JTz15CkNP TkZJR19GQl9IRUNVQkE9bQpDT05GSUdfRkJfU1ZHQUxJQj1tCiMgQ09ORklHX0ZCX01BQ01PREVT IGlzIG5vdCBzZXQKQ09ORklHX0ZCX0JBQ0tMSUdIVD15CkNPTkZJR19GQl9NT0RFX0hFTFBFUlM9 eQpDT05GSUdfRkJfVElMRUJMSVRUSU5HPXkKCiMKIyBGcmFtZSBidWZmZXIgaGFyZHdhcmUgZHJp dmVycwojCkNPTkZJR19GQl9DSVJSVVM9bQpDT05GSUdfRkJfUE0yPW0KQ09ORklHX0ZCX1BNMl9G SUZPX0RJU0NPTk5FQ1Q9eQpDT05GSUdfRkJfQ1lCRVIyMDAwPW0KQ09ORklHX0ZCX0NZQkVSMjAw MF9EREM9eQpDT05GSUdfRkJfQVJDPW0KIyBDT05GSUdfRkJfQVNJTElBTlQgaXMgbm90IHNldAoj IENPTkZJR19GQl9JTVNUVCBpcyBub3Qgc2V0CkNPTkZJR19GQl9WR0ExNj1tCkNPTkZJR19GQl9V VkVTQT1tCkNPTkZJR19GQl9WRVNBPXkKQ09ORklHX0ZCX040MTE9bQpDT05GSUdfRkJfSEdBPW0K Q09ORklHX0ZCX1MxRDEzWFhYPW0KQ09ORklHX0ZCX05WSURJQT1tCkNPTkZJR19GQl9OVklESUFf STJDPXkKIyBDT05GSUdfRkJfTlZJRElBX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0ZCX05WSURJ QV9CQUNLTElHSFQ9eQpDT05GSUdfRkJfUklWQT1tCkNPTkZJR19GQl9SSVZBX0kyQz15CiMgQ09O RklHX0ZCX1JJVkFfREVCVUcgaXMgbm90IHNldApDT05GSUdfRkJfUklWQV9CQUNLTElHSFQ9eQpD T05GSUdfRkJfSTc0MD1tCkNPTkZJR19GQl9MRTgwNTc4PW0KQ09ORklHX0ZCX0NBUklMTE9fUkFO Q0g9bQpDT05GSUdfRkJfTUFUUk9YPW0KQ09ORklHX0ZCX01BVFJPWF9NSUxMRU5JVU09eQpDT05G SUdfRkJfTUFUUk9YX01ZU1RJUVVFPXkKQ09ORklHX0ZCX01BVFJPWF9HPXkKQ09ORklHX0ZCX01B VFJPWF9JMkM9bQpDT05GSUdfRkJfTUFUUk9YX01BVkVOPW0KQ09ORklHX0ZCX1JBREVPTj1tCkNP TkZJR19GQl9SQURFT05fSTJDPXkKQ09ORklHX0ZCX1JBREVPTl9CQUNLTElHSFQ9eQojIENPTkZJ R19GQl9SQURFT05fREVCVUcgaXMgbm90IHNldApDT05GSUdfRkJfQVRZMTI4PW0KQ09ORklHX0ZC X0FUWTEyOF9CQUNLTElHSFQ9eQpDT05GSUdfRkJfQVRZPW0KQ09ORklHX0ZCX0FUWV9DVD15CkNP TkZJR19GQl9BVFlfR0VORVJJQ19MQ0Q9eQpDT05GSUdfRkJfQVRZX0dYPXkKQ09ORklHX0ZCX0FU WV9CQUNLTElHSFQ9eQpDT05GSUdfRkJfUzM9bQpDT05GSUdfRkJfUzNfRERDPXkKQ09ORklHX0ZC X1NBVkFHRT1tCkNPTkZJR19GQl9TQVZBR0VfSTJDPXkKQ09ORklHX0ZCX1NBVkFHRV9BQ0NFTD15 CkNPTkZJR19GQl9TSVM9bQpDT05GSUdfRkJfU0lTXzMwMD15CkNPTkZJR19GQl9TSVNfMzE1PXkK Q09ORklHX0ZCX1ZJQT1tCiMgQ09ORklHX0ZCX1ZJQV9ESVJFQ1RfUFJPQ0ZTIGlzIG5vdCBzZXQK IyBDT05GSUdfRkJfVklBX1hfQ09NUEFUSUJJTElUWSBpcyBub3Qgc2V0CkNPTkZJR19GQl9ORU9N QUdJQz1tCkNPTkZJR19GQl9LWVJPPW0KQ09ORklHX0ZCXzNERlg9bQpDT05GSUdfRkJfM0RGWF9B Q0NFTD15CkNPTkZJR19GQl8zREZYX0kyQz15CkNPTkZJR19GQl9WT09ET08xPW0KQ09ORklHX0ZC X1ZUODYyMz1tCkNPTkZJR19GQl9UUklERU5UPW0KQ09ORklHX0ZCX0FSSz1tCkNPTkZJR19GQl9Q TTM9bQpDT05GSUdfRkJfQ0FSTUlORT1tCkNPTkZJR19GQl9DQVJNSU5FX0RSQU1fRVZBTD15CiMg Q09ORklHX0NBUk1JTkVfRFJBTV9DVVNUT00gaXMgbm90IHNldApDT05GSUdfRkJfR0VPREU9eQpD T05GSUdfRkJfR0VPREVfTFg9bQpDT05GSUdfRkJfR0VPREVfR1g9bQpDT05GSUdfRkJfR0VPREVf R1gxPW0KQ09ORklHX0ZCX1RNSU89bQpDT05GSUdfRkJfVE1JT19BQ0NFTEw9eQpDT05GSUdfRkJf U001MDE9bQpDT05GSUdfRkJfU01TQ1VGWD1tCkNPTkZJR19GQl9VREw9bQpDT05GSUdfRkJfVklS VFVBTD1tCkNPTkZJR19YRU5fRkJERVZfRlJPTlRFTkQ9eQpDT05GSUdfRkJfTUVUUk9OT01FPW0K Q09ORklHX0ZCX01CODYyWFg9bQpDT05GSUdfRkJfTUI4NjJYWF9QQ0lfR0RDPXkKQ09ORklHX0ZC X01CODYyWFhfSTJDPXkKQ09ORklHX0ZCX0JST0FEU0hFRVQ9bQojIENPTkZJR19FWFlOT1NfVklE RU8gaXMgbm90IHNldApDT05GSUdfQkFDS0xJR0hUX0xDRF9TVVBQT1JUPXkKQ09ORklHX0xDRF9D TEFTU19ERVZJQ0U9bQpDT05GSUdfTENEX0w0RjAwMjQyVDAzPW0KQ09ORklHX0xDRF9MTVMyODNH RjA1PW0KQ09ORklHX0xDRF9MVFYzNTBRVj1tCkNPTkZJR19MQ0RfSUxJOTMyMD1tCkNPTkZJR19M Q0RfVERPMjRNPW0KQ09ORklHX0xDRF9WR0cyNDMyQTQ9bQpDT05GSUdfTENEX1BMQVRGT1JNPW0K Q09ORklHX0xDRF9TNkU2M00wPW0KQ09ORklHX0xDRF9MRDkwNDA9bQpDT05GSUdfTENEX0FNUzM2 OUZHMDY9bQpDT05GSUdfQkFDS0xJR0hUX0NMQVNTX0RFVklDRT15CkNPTkZJR19CQUNLTElHSFRf R0VORVJJQz1tCkNPTkZJR19CQUNLTElHSFRfUFJPR0VBUj1tCkNPTkZJR19CQUNLTElHSFRfQ0FS SUxMT19SQU5DSD1tCkNPTkZJR19CQUNLTElHSFRfREE5MDUyPW0KQ09ORklHX0JBQ0tMSUdIVF9B UFBMRT1tCkNPTkZJR19CQUNLTElHSFRfU0FIQVJBPW0KQ09ORklHX0JBQ0tMSUdIVF9BRFA4ODYw PW0KQ09ORklHX0JBQ0tMSUdIVF9BRFA4ODcwPW0KQ09ORklHX0JBQ0tMSUdIVF9MUDg1NVg9bQpD T05GSUdfQkFDS0xJR0hUX09UMjAwPW0KCiMKIyBDb25zb2xlIGRpc3BsYXkgZHJpdmVyIHN1cHBv cnQKIwpDT05GSUdfVkdBX0NPTlNPTEU9eQpDT05GSUdfVkdBQ09OX1NPRlRfU0NST0xMQkFDSz15 CkNPTkZJR19WR0FDT05fU09GVF9TQ1JPTExCQUNLX1NJWkU9NjQKQ09ORklHX0RVTU1ZX0NPTlNP TEU9eQpDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRT15CkNPTkZJR19GUkFNRUJVRkZFUl9DT05T T0xFX0RFVEVDVF9QUklNQVJZPXkKIyBDT05GSUdfRlJBTUVCVUZGRVJfQ09OU09MRV9ST1RBVElP TiBpcyBub3Qgc2V0CiMgQ09ORklHX0ZPTlRTIGlzIG5vdCBzZXQKQ09ORklHX0ZPTlRfOHg4PXkK Q09ORklHX0ZPTlRfOHgxNj15CiMgQ09ORklHX0xPR08gaXMgbm90IHNldApDT05GSUdfU09VTkQ9 bQpDT05GSUdfU09VTkRfT1NTX0NPUkU9eQojIENPTkZJR19TT1VORF9PU1NfQ09SRV9QUkVDTEFJ TSBpcyBub3Qgc2V0CkNPTkZJR19TTkQ9bQpDT05GSUdfU05EX1RJTUVSPW0KQ09ORklHX1NORF9Q Q009bQpDT05GSUdfU05EX0hXREVQPW0KQ09ORklHX1NORF9SQVdNSURJPW0KQ09ORklHX1NORF9K QUNLPXkKQ09ORklHX1NORF9TRVFVRU5DRVI9bQpDT05GSUdfU05EX1NFUV9EVU1NWT1tCkNPTkZJ R19TTkRfT1NTRU1VTD15CkNPTkZJR19TTkRfTUlYRVJfT1NTPW0KQ09ORklHX1NORF9QQ01fT1NT PW0KQ09ORklHX1NORF9QQ01fT1NTX1BMVUdJTlM9eQpDT05GSUdfU05EX1NFUVVFTkNFUl9PU1M9 eQpDT05GSUdfU05EX0hSVElNRVI9bQpDT05GSUdfU05EX1NFUV9IUlRJTUVSX0RFRkFVTFQ9eQpD T05GSUdfU05EX0RZTkFNSUNfTUlOT1JTPXkKQ09ORklHX1NORF9TVVBQT1JUX09MRF9BUEk9eQpD T05GSUdfU05EX1ZFUkJPU0VfUFJPQ0ZTPXkKQ09ORklHX1NORF9WRVJCT1NFX1BSSU5USz15CkNP TkZJR19TTkRfREVCVUc9eQojIENPTkZJR19TTkRfREVCVUdfVkVSQk9TRSBpcyBub3Qgc2V0CkNP TkZJR19TTkRfUENNX1hSVU5fREVCVUc9eQpDT05GSUdfU05EX1ZNQVNURVI9eQpDT05GSUdfU05E X0tDVExfSkFDSz15CkNPTkZJR19TTkRfRE1BX1NHQlVGPXkKQ09ORklHX1NORF9SQVdNSURJX1NF UT1tCkNPTkZJR19TTkRfT1BMM19MSUJfU0VRPW0KIyBDT05GSUdfU05EX09QTDRfTElCX1NFUSBp cyBub3Qgc2V0CiMgQ09ORklHX1NORF9TQkFXRV9TRVEgaXMgbm90IHNldApDT05GSUdfU05EX0VN VTEwSzFfU0VRPW0KQ09ORklHX1NORF9NUFU0MDFfVUFSVD1tCkNPTkZJR19TTkRfT1BMM19MSUI9 bQpDT05GSUdfU05EX1ZYX0xJQj1tCkNPTkZJR19TTkRfQUM5N19DT0RFQz1tCkNPTkZJR19TTkRf RFJJVkVSUz15CiMgQ09ORklHX1NORF9QQ1NQIGlzIG5vdCBzZXQKQ09ORklHX1NORF9EVU1NWT1t CkNPTkZJR19TTkRfQUxPT1A9bQpDT05GSUdfU05EX1ZJUk1JREk9bQpDT05GSUdfU05EX01UUEFW PW0KQ09ORklHX1NORF9NVFM2ND1tCkNPTkZJR19TTkRfU0VSSUFMX1UxNjU1MD1tCkNPTkZJR19T TkRfTVBVNDAxPW0KQ09ORklHX1NORF9QT1JUTUFOMlg0PW0KQ09ORklHX1NORF9BQzk3X1BPV0VS X1NBVkU9eQpDT05GSUdfU05EX0FDOTdfUE9XRVJfU0FWRV9ERUZBVUxUPTAKQ09ORklHX1NORF9T Ql9DT01NT049bQpDT05GSUdfU05EX1NCMTZfRFNQPW0KQ09ORklHX1NORF9URUE1NzVYPW0KQ09O RklHX1NORF9QQ0k9eQpDT05GSUdfU05EX0FEMTg4OT1tCkNPTkZJR19TTkRfQUxTMzAwPW0KQ09O RklHX1NORF9BTFM0MDAwPW0KQ09ORklHX1NORF9BTEk1NDUxPW0KQ09ORklHX1NORF9BU0lIUEk9 bQpDT05GSUdfU05EX0FUSUlYUD1tCkNPTkZJR19TTkRfQVRJSVhQX01PREVNPW0KQ09ORklHX1NO RF9BVTg4MTA9bQpDT05GSUdfU05EX0FVODgyMD1tCkNPTkZJR19TTkRfQVU4ODMwPW0KQ09ORklH X1NORF9BVzI9bQpDT05GSUdfU05EX0FaVDMzMjg9bQpDT05GSUdfU05EX0JUODdYPW0KIyBDT05G SUdfU05EX0JUODdYX09WRVJDTE9DSyBpcyBub3Qgc2V0CkNPTkZJR19TTkRfQ0EwMTA2PW0KQ09O RklHX1NORF9DTUlQQ0k9bQpDT05GSUdfU05EX09YWUdFTl9MSUI9bQpDT05GSUdfU05EX09YWUdF Tj1tCkNPTkZJR19TTkRfQ1M0MjgxPW0KQ09ORklHX1NORF9DUzQ2WFg9bQpDT05GSUdfU05EX0NT NDZYWF9ORVdfRFNQPXkKQ09ORklHX1NORF9DUzU1MzA9bQpDT05GSUdfU05EX0NTNTUzNUFVRElP PW0KQ09ORklHX1NORF9DVFhGST1tCkNPTkZJR19TTkRfREFSTEEyMD1tCkNPTkZJR19TTkRfR0lO QTIwPW0KQ09ORklHX1NORF9MQVlMQTIwPW0KQ09ORklHX1NORF9EQVJMQTI0PW0KQ09ORklHX1NO RF9HSU5BMjQ9bQpDT05GSUdfU05EX0xBWUxBMjQ9bQpDT05GSUdfU05EX01PTkE9bQpDT05GSUdf U05EX01JQT1tCkNPTkZJR19TTkRfRUNITzNHPW0KQ09ORklHX1NORF9JTkRJR089bQpDT05GSUdf U05EX0lORElHT0lPPW0KQ09ORklHX1NORF9JTkRJR09ESj1tCkNPTkZJR19TTkRfSU5ESUdPSU9Y PW0KQ09ORklHX1NORF9JTkRJR09ESlg9bQpDT05GSUdfU05EX0VNVTEwSzE9bQpDT05GSUdfU05E X0VNVTEwSzFYPW0KQ09ORklHX1NORF9FTlMxMzcwPW0KQ09ORklHX1NORF9FTlMxMzcxPW0KQ09O RklHX1NORF9FUzE5Mzg9bQpDT05GSUdfU05EX0VTMTk2OD1tCkNPTkZJR19TTkRfRVMxOTY4X0lO UFVUPXkKQ09ORklHX1NORF9FUzE5NjhfUkFESU89eQpDT05GSUdfU05EX0ZNODAxPW0KQ09ORklH X1NORF9GTTgwMV9URUE1NzVYX0JPT0w9eQpDT05GSUdfU05EX0hEQV9JTlRFTD1tCkNPTkZJR19T TkRfSERBX1BSRUFMTE9DX1NJWkU9NjQKQ09ORklHX1NORF9IREFfSFdERVA9eQpDT05GSUdfU05E X0hEQV9SRUNPTkZJRz15CkNPTkZJR19TTkRfSERBX0lOUFVUX0JFRVA9eQpDT05GSUdfU05EX0hE QV9JTlBVVF9CRUVQX01PREU9MgpDT05GSUdfU05EX0hEQV9JTlBVVF9KQUNLPXkKQ09ORklHX1NO RF9IREFfUEFUQ0hfTE9BREVSPXkKQ09ORklHX1NORF9IREFfQ09ERUNfUkVBTFRFSz15CkNPTkZJ R19TTkRfSERBX0VOQUJMRV9SRUFMVEVLX1FVSVJLUz15CkNPTkZJR19TTkRfSERBX0NPREVDX0FO QUxPRz15CkNPTkZJR19TTkRfSERBX0NPREVDX1NJR01BVEVMPXkKQ09ORklHX1NORF9IREFfQ09E RUNfVklBPXkKQ09ORklHX1NORF9IREFfQ09ERUNfSERNST15CkNPTkZJR19TTkRfSERBX0NPREVD X0NJUlJVUz15CkNPTkZJR19TTkRfSERBX0NPREVDX0NPTkVYQU5UPXkKQ09ORklHX1NORF9IREFf Q09ERUNfQ0EwMTEwPXkKQ09ORklHX1NORF9IREFfQ09ERUNfQ0EwMTMyPXkKQ09ORklHX1NORF9I REFfQ09ERUNfQ01FRElBPXkKQ09ORklHX1NORF9IREFfQ09ERUNfU0kzMDU0PXkKQ09ORklHX1NO RF9IREFfR0VORVJJQz15CkNPTkZJR19TTkRfSERBX1BPV0VSX1NBVkU9eQpDT05GSUdfU05EX0hE QV9QT1dFUl9TQVZFX0RFRkFVTFQ9MApDT05GSUdfU05EX0hEU1A9bQpDT05GSUdfU05EX0hEU1BN PW0KQ09ORklHX1NORF9JQ0UxNzEyPW0KQ09ORklHX1NORF9JQ0UxNzI0PW0KQ09ORklHX1NORF9J TlRFTDhYMD1tCkNPTkZJR19TTkRfSU5URUw4WDBNPW0KQ09ORklHX1NORF9LT1JHMTIxMj1tCkNP TkZJR19TTkRfTE9MQT1tCkNPTkZJR19TTkRfTFg2NDY0RVM9bQpDT05GSUdfU05EX01BRVNUUk8z PW0KQ09ORklHX1NORF9NQUVTVFJPM19JTlBVVD15CkNPTkZJR19TTkRfTUlYQVJUPW0KQ09ORklH X1NORF9OTTI1Nj1tCkNPTkZJR19TTkRfUENYSFI9bQpDT05GSUdfU05EX1JJUFRJREU9bQpDT05G SUdfU05EX1JNRTMyPW0KQ09ORklHX1NORF9STUU5Nj1tCkNPTkZJR19TTkRfUk1FOTY1Mj1tCkNP TkZJR19TTkRfU09OSUNWSUJFUz1tCkNPTkZJR19TTkRfVFJJREVOVD1tCkNPTkZJR19TTkRfVklB ODJYWD1tCkNPTkZJR19TTkRfVklBODJYWF9NT0RFTT1tCkNPTkZJR19TTkRfVklSVFVPU089bQpD T05GSUdfU05EX1ZYMjIyPW0KQ09ORklHX1NORF9ZTUZQQ0k9bQpDT05GSUdfU05EX1NQST15CkNP TkZJR19TTkRfVVNCPXkKQ09ORklHX1NORF9VU0JfQVVESU89bQpDT05GSUdfU05EX1VTQl9VQTEw MT1tCkNPTkZJR19TTkRfVVNCX1VTWDJZPW0KQ09ORklHX1NORF9VU0JfQ0FJQVE9bQpDT05GSUdf U05EX1VTQl9DQUlBUV9JTlBVVD15CkNPTkZJR19TTkRfVVNCX1VTMTIyTD1tCkNPTkZJR19TTkRf VVNCXzZGSVJFPW0KQ09ORklHX1NORF9GSVJFV0lSRT15CkNPTkZJR19TTkRfRklSRVdJUkVfTElC PW0KQ09ORklHX1NORF9GSVJFV0lSRV9TUEVBS0VSUz1tCkNPTkZJR19TTkRfSVNJR0hUPW0KQ09O RklHX1NORF9QQ01DSUE9eQpDT05GSUdfU05EX1ZYUE9DS0VUPW0KQ09ORklHX1NORF9QREFVRElP Q0Y9bQojIENPTkZJR19TTkRfU09DIGlzIG5vdCBzZXQKQ09ORklHX1NPVU5EX1BSSU1FPW0KQ09O RklHX1NPVU5EX09TUz1tCkNPTkZJR19TT1VORF9UUkFDRUlOSVQ9eQpDT05GSUdfU09VTkRfRE1B UD15CkNPTkZJR19TT1VORF9WTUlEST1tCkNPTkZJR19TT1VORF9UUklYPW0KQ09ORklHX1NPVU5E X01TUz1tCkNPTkZJR19TT1VORF9NUFU0MDE9bQpDT05GSUdfU09VTkRfUEFTPW0KQ09ORklHX1NP VU5EX1BTUz1tCkNPTkZJR19QU1NfTUlYRVI9eQojIENPTkZJR19QU1NfSEFWRV9CT09UIGlzIG5v dCBzZXQKIyBDT05GSUdfU09VTkRfU0IgaXMgbm90IHNldApDT05GSUdfU09VTkRfWU0zODEyPW0K Q09ORklHX1NPVU5EX1VBUlQ2ODUwPW0KQ09ORklHX1NPVU5EX0FFRFNQMTY9bQpDT05GSUdfU0M2 NjAwPXkKQ09ORklHX1NDNjYwMF9KT1k9eQpDT05GSUdfU0M2NjAwX0NEUk9NPTQKQ09ORklHX1ND NjYwMF9DRFJPTUJBU0U9MApDT05GSUdfQUM5N19CVVM9bQpDT05GSUdfSElEX1NVUFBPUlQ9eQpD T05GSUdfSElEPW0KQ09ORklHX0hJRFJBVz15CgojCiMgVVNCIElucHV0IERldmljZXMKIwpDT05G SUdfVVNCX0hJRD1tCkNPTkZJR19ISURfUElEPXkKQ09ORklHX1VTQl9ISURERVY9eQoKIwojIFNw ZWNpYWwgSElEIGRyaXZlcnMKIwpDT05GSUdfSElEX0E0VEVDSD1tCkNPTkZJR19ISURfQUNSVVg9 bQojIENPTkZJR19ISURfQUNSVVhfRkYgaXMgbm90IHNldApDT05GSUdfSElEX0FQUExFPW0KQ09O RklHX0hJRF9CRUxLSU49bQpDT05GSUdfSElEX0NIRVJSWT1tCkNPTkZJR19ISURfQ0hJQ09OWT1t CkNPTkZJR19ISURfUFJPRElLRVlTPW0KQ09ORklHX0hJRF9DWVBSRVNTPW0KQ09ORklHX0hJRF9E UkFHT05SSVNFPW0KQ09ORklHX0RSQUdPTlJJU0VfRkY9eQpDT05GSUdfSElEX0VNU19GRj1tCkNP TkZJR19ISURfRUxFQ09NPW0KQ09ORklHX0hJRF9FWktFWT1tCkNPTkZJR19ISURfSE9MVEVLPW0K IyBDT05GSUdfSE9MVEVLX0ZGIGlzIG5vdCBzZXQKQ09ORklHX0hJRF9LRVlUT1VDSD1tCkNPTkZJ R19ISURfS1lFPW0KQ09ORklHX0hJRF9VQ0xPR0lDPW0KQ09ORklHX0hJRF9XQUxUT1A9bQpDT05G SUdfSElEX0dZUkFUSU9OPW0KQ09ORklHX0hJRF9UV0lOSEFOPW0KQ09ORklHX0hJRF9LRU5TSU5H VE9OPW0KQ09ORklHX0hJRF9MQ1BPV0VSPW0KQ09ORklHX0hJRF9MT0dJVEVDSD1tCkNPTkZJR19I SURfTE9HSVRFQ0hfREo9bQpDT05GSUdfTE9HSVRFQ0hfRkY9eQpDT05GSUdfTE9HSVJVTUJMRVBB RDJfRkY9eQpDT05GSUdfTE9HSUc5NDBfRkY9eQpDT05GSUdfTE9HSVdIRUVMU19GRj15CkNPTkZJ R19ISURfTUFHSUNNT1VTRT1tCkNPTkZJR19ISURfTUlDUk9TT0ZUPW0KQ09ORklHX0hJRF9NT05U RVJFWT1tCkNPTkZJR19ISURfTVVMVElUT1VDSD1tCkNPTkZJR19ISURfTlRSSUc9bQpDT05GSUdf SElEX09SVEVLPW0KQ09ORklHX0hJRF9QQU5USEVSTE9SRD1tCkNPTkZJR19QQU5USEVSTE9SRF9G Rj15CkNPTkZJR19ISURfUEVUQUxZTlg9bQpDT05GSUdfSElEX1BJQ09MQ0Q9bQpDT05GSUdfSElE X1BJQ09MQ0RfRkI9eQpDT05GSUdfSElEX1BJQ09MQ0RfQkFDS0xJR0hUPXkKQ09ORklHX0hJRF9Q SUNPTENEX0xDRD15CkNPTkZJR19ISURfUElDT0xDRF9MRURTPXkKQ09ORklHX0hJRF9QUklNQVg9 bQpDT05GSUdfSElEX1JPQ0NBVD1tCkNPTkZJR19ISURfU0FJVEVLPW0KQ09ORklHX0hJRF9TQU1T VU5HPW0KQ09ORklHX0hJRF9TT05ZPW0KQ09ORklHX0hJRF9TUEVFRExJTks9bQpDT05GSUdfSElE X1NVTlBMVVM9bQpDT05GSUdfSElEX0dSRUVOQVNJQT1tCkNPTkZJR19HUkVFTkFTSUFfRkY9eQpD T05GSUdfSElEX1NNQVJUSk9ZUExVUz1tCkNPTkZJR19TTUFSVEpPWVBMVVNfRkY9eQpDT05GSUdf SElEX1RJVk89bQpDT05GSUdfSElEX1RPUFNFRUQ9bQpDT05GSUdfSElEX1RIUlVTVE1BU1RFUj1t CkNPTkZJR19USFJVU1RNQVNURVJfRkY9eQpDT05GSUdfSElEX1dBQ09NPW0KQ09ORklHX0hJRF9X QUNPTV9QT1dFUl9TVVBQTFk9eQpDT05GSUdfSElEX1dJSU1PVEU9bQpDT05GSUdfSElEX1dJSU1P VEVfRVhUPXkKQ09ORklHX0hJRF9aRVJPUExVUz1tCkNPTkZJR19aRVJPUExVU19GRj15CkNPTkZJ R19ISURfWllEQUNST049bQpDT05GSUdfVVNCX0FSQ0hfSEFTX09IQ0k9eQpDT05GSUdfVVNCX0FS Q0hfSEFTX0VIQ0k9eQpDT05GSUdfVVNCX0FSQ0hfSEFTX1hIQ0k9eQpDT05GSUdfVVNCX1NVUFBP UlQ9eQpDT05GSUdfVVNCX0NPTU1PTj1tCkNPTkZJR19VU0JfQVJDSF9IQVNfSENEPXkKQ09ORklH X1VTQj1tCiMgQ09ORklHX1VTQl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfQU5OT1VOQ0Vf TkVXX0RFVklDRVM9eQoKIwojIE1pc2NlbGxhbmVvdXMgVVNCIG9wdGlvbnMKIwpDT05GSUdfVVNC X0RFVklDRUZTPXkKIyBDT05GSUdfVVNCX0RFVklDRV9DTEFTUyBpcyBub3Qgc2V0CiMgQ09ORklH X1VTQl9EWU5BTUlDX01JTk9SUyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfU1VTUEVORD15CiMgQ09O RklHX1VTQl9PVEcgaXMgbm90IHNldApDT05GSUdfVVNCX01PTj1tCkNPTkZJR19VU0JfV1VTQj1t CkNPTkZJR19VU0JfV1VTQl9DQkFGPW0KIyBDT05GSUdfVVNCX1dVU0JfQ0JBRl9ERUJVRyBpcyBu b3Qgc2V0CgojCiMgVVNCIEhvc3QgQ29udHJvbGxlciBEcml2ZXJzCiMKQ09ORklHX1VTQl9DNjdY MDBfSENEPW0KQ09ORklHX1VTQl9YSENJX0hDRD1tCiMgQ09ORklHX1VTQl9YSENJX0hDRF9ERUJV R0dJTkcgaXMgbm90IHNldApDT05GSUdfVVNCX0VIQ0lfSENEPW0KQ09ORklHX1VTQl9FSENJX1JP T1RfSFVCX1RUPXkKQ09ORklHX1VTQl9FSENJX1RUX05FV1NDSEVEPXkKQ09ORklHX1VTQl9PWFUy MTBIUF9IQ0Q9bQpDT05GSUdfVVNCX0lTUDExNlhfSENEPW0KQ09ORklHX1VTQl9JU1AxNzYwX0hD RD1tCkNPTkZJR19VU0JfSVNQMTM2Ml9IQ0Q9bQpDT05GSUdfVVNCX09IQ0lfSENEPW0KIyBDT05G SUdfVVNCX09IQ0lfSENEX1NTQiBpcyBub3Qgc2V0CiMgQ09ORklHX1VTQl9PSENJX0hDRF9QTEFU Rk9STSBpcyBub3Qgc2V0CiMgQ09ORklHX1VTQl9FSENJX0hDRF9QTEFURk9STSBpcyBub3Qgc2V0 CiMgQ09ORklHX1VTQl9PSENJX0JJR19FTkRJQU5fREVTQyBpcyBub3Qgc2V0CiMgQ09ORklHX1VT Ql9PSENJX0JJR19FTkRJQU5fTU1JTyBpcyBub3Qgc2V0CkNPTkZJR19VU0JfT0hDSV9MSVRUTEVf RU5ESUFOPXkKQ09ORklHX1VTQl9VSENJX0hDRD1tCkNPTkZJR19VU0JfVTEzMl9IQ0Q9bQpDT05G SUdfVVNCX1NMODExX0hDRD1tCiMgQ09ORklHX1VTQl9TTDgxMV9IQ0RfSVNPIGlzIG5vdCBzZXQK Q09ORklHX1VTQl9TTDgxMV9DUz1tCkNPTkZJR19VU0JfUjhBNjY1OTdfSENEPW0KQ09ORklHX1VT Ql9XSENJX0hDRD1tCkNPTkZJR19VU0JfSFdBX0hDRD1tCgojCiMgVVNCIERldmljZSBDbGFzcyBk cml2ZXJzCiMKQ09ORklHX1VTQl9BQ009bQpDT05GSUdfVVNCX1BSSU5URVI9bQpDT05GSUdfVVNC X1dETT1tCkNPTkZJR19VU0JfVE1DPW0KCiMKIyBOT1RFOiBVU0JfU1RPUkFHRSBkZXBlbmRzIG9u IFNDU0kgYnV0IEJMS19ERVZfU0QgbWF5CiMKCiMKIyBhbHNvIGJlIG5lZWRlZDsgc2VlIFVTQl9T VE9SQUdFIEhlbHAgZm9yIG1vcmUgaW5mbwojCkNPTkZJR19VU0JfU1RPUkFHRT1tCiMgQ09ORklH X1VTQl9TVE9SQUdFX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1VTQl9TVE9SQUdFX1JFQUxURUs9 bQpDT05GSUdfUkVBTFRFS19BVVRPUE09eQpDT05GSUdfVVNCX1NUT1JBR0VfREFUQUZBQj1tCkNP TkZJR19VU0JfU1RPUkFHRV9GUkVFQ09NPW0KQ09ORklHX1VTQl9TVE9SQUdFX0lTRDIwMD1tCkNP TkZJR19VU0JfU1RPUkFHRV9VU0JBVD1tCkNPTkZJR19VU0JfU1RPUkFHRV9TRERSMDk9bQpDT05G SUdfVVNCX1NUT1JBR0VfU0REUjU1PW0KQ09ORklHX1VTQl9TVE9SQUdFX0pVTVBTSE9UPW0KQ09O RklHX1VTQl9TVE9SQUdFX0FMQVVEQT1tCkNPTkZJR19VU0JfU1RPUkFHRV9PTkVUT1VDSD1tCkNP TkZJR19VU0JfU1RPUkFHRV9LQVJNQT1tCkNPTkZJR19VU0JfU1RPUkFHRV9DWVBSRVNTX0FUQUNC PW0KQ09ORklHX1VTQl9TVE9SQUdFX0VORV9VQjYyNTA9bQpDT05GSUdfVVNCX1VBUz1tCiMgQ09O RklHX1VTQl9MSUJVU1VBTCBpcyBub3Qgc2V0CgojCiMgVVNCIEltYWdpbmcgZGV2aWNlcwojCkNP TkZJR19VU0JfTURDODAwPW0KQ09ORklHX1VTQl9NSUNST1RFSz1tCgojCiMgVVNCIHBvcnQgZHJp dmVycwojCkNPTkZJR19VU0JfVVNTNzIwPW0KQ09ORklHX1VTQl9TRVJJQUw9bQpDT05GSUdfVVNC X0VaVVNCPXkKQ09ORklHX1VTQl9TRVJJQUxfR0VORVJJQz15CkNPTkZJR19VU0JfU0VSSUFMX0FJ UkNBQkxFPW0KQ09ORklHX1VTQl9TRVJJQUxfQVJLMzExNj1tCkNPTkZJR19VU0JfU0VSSUFMX0JF TEtJTj1tCkNPTkZJR19VU0JfU0VSSUFMX0NIMzQxPW0KQ09ORklHX1VTQl9TRVJJQUxfV0hJVEVI RUFUPW0KQ09ORklHX1VTQl9TRVJJQUxfRElHSV9BQ0NFTEVQT1JUPW0KQ09ORklHX1VTQl9TRVJJ QUxfQ1AyMTBYPW0KQ09ORklHX1VTQl9TRVJJQUxfQ1lQUkVTU19NOD1tCkNPTkZJR19VU0JfU0VS SUFMX0VNUEVHPW0KQ09ORklHX1VTQl9TRVJJQUxfRlRESV9TSU89bQpDT05GSUdfVVNCX1NFUklB TF9GVU5TT0ZUPW0KQ09ORklHX1VTQl9TRVJJQUxfVklTT1I9bQpDT05GSUdfVVNCX1NFUklBTF9J UEFRPW0KQ09ORklHX1VTQl9TRVJJQUxfSVI9bQpDT05GSUdfVVNCX1NFUklBTF9FREdFUE9SVD1t CkNPTkZJR19VU0JfU0VSSUFMX0VER0VQT1JUX1RJPW0KQ09ORklHX1VTQl9TRVJJQUxfRjgxMjMy PW0KQ09ORklHX1VTQl9TRVJJQUxfR0FSTUlOPW0KQ09ORklHX1VTQl9TRVJJQUxfSVBXPW0KQ09O RklHX1VTQl9TRVJJQUxfSVVVPW0KQ09ORklHX1VTQl9TRVJJQUxfS0VZU1BBTl9QREE9bQpDT05G SUdfVVNCX1NFUklBTF9LRVlTUEFOPW0KQ09ORklHX1VTQl9TRVJJQUxfS0xTST1tCkNPTkZJR19V U0JfU0VSSUFMX0tPQklMX1NDVD1tCkNPTkZJR19VU0JfU0VSSUFMX01DVF9VMjMyPW0KQ09ORklH X1VTQl9TRVJJQUxfTUVUUk89bQpDT05GSUdfVVNCX1NFUklBTF9NT1M3NzIwPW0KQ09ORklHX1VT Ql9TRVJJQUxfTU9TNzcxNV9QQVJQT1JUPXkKQ09ORklHX1VTQl9TRVJJQUxfTU9TNzg0MD1tCkNP TkZJR19VU0JfU0VSSUFMX01PVE9ST0xBPW0KQ09ORklHX1VTQl9TRVJJQUxfTkFWTUFOPW0KQ09O RklHX1VTQl9TRVJJQUxfUEwyMzAzPW0KQ09ORklHX1VTQl9TRVJJQUxfT1RJNjg1OD1tCkNPTkZJ R19VU0JfU0VSSUFMX1FDQVVYPW0KQ09ORklHX1VTQl9TRVJJQUxfUVVBTENPTU09bQpDT05GSUdf VVNCX1NFUklBTF9TUENQOFg1PW0KQ09ORklHX1VTQl9TRVJJQUxfSFA0WD1tCkNPTkZJR19VU0Jf U0VSSUFMX1NBRkU9bQpDT05GSUdfVVNCX1NFUklBTF9TQUZFX1BBRERFRD15CkNPTkZJR19VU0Jf U0VSSUFMX1NJRU1FTlNfTVBJPW0KQ09ORklHX1VTQl9TRVJJQUxfU0lFUlJBV0lSRUxFU1M9bQpD T05GSUdfVVNCX1NFUklBTF9TWU1CT0w9bQpDT05GSUdfVVNCX1NFUklBTF9UST1tCkNPTkZJR19V U0JfU0VSSUFMX0NZQkVSSkFDSz1tCkNPTkZJR19VU0JfU0VSSUFMX1hJUkNPTT1tCkNPTkZJR19V U0JfU0VSSUFMX1dXQU49bQpDT05GSUdfVVNCX1NFUklBTF9PUFRJT049bQpDT05GSUdfVVNCX1NF UklBTF9PTU5JTkVUPW0KQ09ORklHX1VTQl9TRVJJQUxfT1BUSUNPTj1tCkNPTkZJR19VU0JfU0VS SUFMX1ZJVk9QQVlfU0VSSUFMPW0KQ09ORklHX1VTQl9TRVJJQUxfWklPPW0KQ09ORklHX1VTQl9T RVJJQUxfU1NVMTAwPW0KQ09ORklHX1VTQl9TRVJJQUxfREVCVUc9bQoKIwojIFVTQiBNaXNjZWxs YW5lb3VzIGRyaXZlcnMKIwpDT05GSUdfVVNCX0VNSTYyPW0KQ09ORklHX1VTQl9FTUkyNj1tCkNP TkZJR19VU0JfQURVVFVYPW0KQ09ORklHX1VTQl9TRVZTRUc9bQpDT05GSUdfVVNCX1JJTzUwMD1t CkNPTkZJR19VU0JfTEVHT1RPV0VSPW0KQ09ORklHX1VTQl9MQ0Q9bQpDT05GSUdfVVNCX0xFRD1t CkNPTkZJR19VU0JfQ1lQUkVTU19DWTdDNjM9bQpDT05GSUdfVVNCX0NZVEhFUk09bQpDT05GSUdf VVNCX0lETU9VU0U9bQpDT05GSUdfVVNCX0ZURElfRUxBTj1tCkNPTkZJR19VU0JfQVBQTEVESVNQ TEFZPW0KQ09ORklHX1VTQl9TSVNVU0JWR0E9bQpDT05GSUdfVVNCX1NJU1VTQlZHQV9DT049eQpD T05GSUdfVVNCX0xEPW0KQ09ORklHX1VTQl9UUkFOQ0VWSUJSQVRPUj1tCkNPTkZJR19VU0JfSU9X QVJSSU9SPW0KIyBDT05GSUdfVVNCX1RFU1QgaXMgbm90IHNldApDT05GSUdfVVNCX0lTSUdIVEZX PW0KQ09ORklHX1VTQl9ZVVJFWD1tCkNPTkZJR19VU0JfQVRNPW0KQ09ORklHX1VTQl9TUEVFRFRP VUNIPW0KQ09ORklHX1VTQl9DWEFDUlU9bQpDT05GSUdfVVNCX1VFQUdMRUFUTT1tCkNPTkZJR19V U0JfWFVTQkFUTT1tCiMgQ09ORklHX1VTQl9HQURHRVQgaXMgbm90IHNldAoKIwojIE9URyBhbmQg cmVsYXRlZCBpbmZyYXN0cnVjdHVyZQojCiMgQ09ORklHX1VTQl9HUElPX1ZCVVMgaXMgbm90IHNl dAojIENPTkZJR19OT1BfVVNCX1hDRUlWIGlzIG5vdCBzZXQKQ09ORklHX1VXQj1tCkNPTkZJR19V V0JfSFdBPW0KQ09ORklHX1VXQl9XSENJPW0KQ09ORklHX1VXQl9JMTQ4MFU9bQpDT05GSUdfTU1D PW0KIyBDT05GSUdfTU1DX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfTU1DX1VOU0FGRV9SRVNV TUUgaXMgbm90IHNldAojIENPTkZJR19NTUNfQ0xLR0FURSBpcyBub3Qgc2V0CgojCiMgTU1DL1NE L1NESU8gQ2FyZCBEcml2ZXJzCiMKQ09ORklHX01NQ19CTE9DSz1tCkNPTkZJR19NTUNfQkxPQ0tf TUlOT1JTPTgKQ09ORklHX01NQ19CTE9DS19CT1VOQ0U9eQpDT05GSUdfU0RJT19VQVJUPW0KQ09O RklHX01NQ19URVNUPW0KCiMKIyBNTUMvU0QvU0RJTyBIb3N0IENvbnRyb2xsZXIgRHJpdmVycwoj CkNPTkZJR19NTUNfU0RIQ0k9bQpDT05GSUdfTU1DX1NESENJX1BDST1tCkNPTkZJR19NTUNfUklD T0hfTU1DPXkKQ09ORklHX01NQ19TREhDSV9QTFRGTT1tCkNPTkZJR19NTUNfV0JTRD1tCkNPTkZJ R19NTUNfVElGTV9TRD1tCkNPTkZJR19NTUNfU1BJPW0KQ09ORklHX01NQ19TRFJJQ09IX0NTPW0K Q09ORklHX01NQ19DQjcxMD1tCkNPTkZJR19NTUNfVklBX1NETU1DPW0KQ09ORklHX01NQ19WVUIz MDA9bQpDT05GSUdfTU1DX1VTSEM9bQpDT05GSUdfTUVNU1RJQ0s9bQojIENPTkZJR19NRU1TVElD S19ERUJVRyBpcyBub3Qgc2V0CgojCiMgTWVtb3J5U3RpY2sgZHJpdmVycwojCiMgQ09ORklHX01F TVNUSUNLX1VOU0FGRV9SRVNVTUUgaXMgbm90IHNldApDT05GSUdfTVNQUk9fQkxPQ0s9bQoKIwoj IE1lbW9yeVN0aWNrIEhvc3QgQ29udHJvbGxlciBEcml2ZXJzCiMKQ09ORklHX01FTVNUSUNLX1RJ Rk1fTVM9bQpDT05GSUdfTUVNU1RJQ0tfSk1JQ1JPTl8zOFg9bQpDT05GSUdfTUVNU1RJQ0tfUjU5 Mj1tCkNPTkZJR19ORVdfTEVEUz15CkNPTkZJR19MRURTX0NMQVNTPXkKCiMKIyBMRUQgZHJpdmVy cwojCkNPTkZJR19MRURTX0xNMzUzMD1tCkNPTkZJR19MRURTX1BDQTk1MzI9bQojIENPTkZJR19M RURTX1BDQTk1MzJfR1BJTyBpcyBub3Qgc2V0CkNPTkZJR19MRURTX0dQSU89bQpDT05GSUdfTEVE U19MUDM5NDQ9bQpDT05GSUdfTEVEU19MUDU1MjE9bQpDT05GSUdfTEVEU19MUDU1MjM9bQpDT05G SUdfTEVEU19DTEVWT19NQUlMPW0KQ09ORklHX0xFRFNfUENBOTU1WD1tCkNPTkZJR19MRURTX1BD QTk2MzM9bQpDT05GSUdfTEVEU19EQUMxMjRTMDg1PW0KQ09ORklHX0xFRFNfUkVHVUxBVE9SPW0K Q09ORklHX0xFRFNfQkQyODAyPW0KQ09ORklHX0xFRFNfSU5URUxfU1M0MjAwPW0KQ09ORklHX0xF RFNfTFQzNTkzPW0KQ09ORklHX0xFRFNfREVMTF9ORVRCT09LUz1tCkNPTkZJR19MRURTX01DMTM3 ODM9bQpDT05GSUdfTEVEU19UQ0E2NTA3PW0KQ09ORklHX0xFRFNfT1QyMDA9bQpDT05GSUdfTEVE U19UUklHR0VSUz15CgojCiMgTEVEIFRyaWdnZXJzCiMKQ09ORklHX0xFRFNfVFJJR0dFUl9USU1F Uj1tCkNPTkZJR19MRURTX1RSSUdHRVJfSEVBUlRCRUFUPW0KQ09ORklHX0xFRFNfVFJJR0dFUl9C QUNLTElHSFQ9bQpDT05GSUdfTEVEU19UUklHR0VSX0dQSU89bQpDT05GSUdfTEVEU19UUklHR0VS X0RFRkFVTFRfT049bQoKIwojIGlwdGFibGVzIHRyaWdnZXIgaXMgdW5kZXIgTmV0ZmlsdGVyIGNv bmZpZyAoTEVEIHRhcmdldCkKIwojIENPTkZJR19BQ0NFU1NJQklMSVRZIGlzIG5vdCBzZXQKQ09O RklHX0lORklOSUJBTkQ9bQpDT05GSUdfSU5GSU5JQkFORF9VU0VSX01BRD1tCkNPTkZJR19JTkZJ TklCQU5EX1VTRVJfQUNDRVNTPW0KQ09ORklHX0lORklOSUJBTkRfVVNFUl9NRU09eQpDT05GSUdf SU5GSU5JQkFORF9BRERSX1RSQU5TPXkKQ09ORklHX0lORklOSUJBTkRfTVRIQ0E9bQpDT05GSUdf SU5GSU5JQkFORF9NVEhDQV9ERUJVRz15CkNPTkZJR19JTkZJTklCQU5EX0lQQVRIPW0KQ09ORklH X0lORklOSUJBTkRfUUlCPW0KQ09ORklHX0lORklOSUJBTkRfQU1TTzExMDA9bQojIENPTkZJR19J TkZJTklCQU5EX0FNU08xMTAwX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0lORklOSUJBTkRfQ1hH QjM9bQojIENPTkZJR19JTkZJTklCQU5EX0NYR0IzX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX0lO RklOSUJBTkRfQ1hHQjQ9bQpDT05GSUdfTUxYNF9JTkZJTklCQU5EPW0KQ09ORklHX0lORklOSUJB TkRfTkVTPW0KIyBDT05GSUdfSU5GSU5JQkFORF9ORVNfREVCVUcgaXMgbm90IHNldApDT05GSUdf SU5GSU5JQkFORF9JUE9JQj1tCkNPTkZJR19JTkZJTklCQU5EX0lQT0lCX0NNPXkKQ09ORklHX0lO RklOSUJBTkRfSVBPSUJfREVCVUc9eQojIENPTkZJR19JTkZJTklCQU5EX0lQT0lCX0RFQlVHX0RB VEEgaXMgbm90IHNldApDT05GSUdfSU5GSU5JQkFORF9TUlA9bQpDT05GSUdfSU5GSU5JQkFORF9J U0VSPW0KQ09ORklHX0VEQUM9eQoKIwojIFJlcG9ydGluZyBzdWJzeXN0ZW1zCiMKIyBDT05GSUdf RURBQ19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19FREFDX0RFQ09ERV9NQ0U9bQojIENPTkZJR19F REFDX01DRV9JTkogaXMgbm90IHNldApDT05GSUdfRURBQ19NTV9FREFDPW0KQ09ORklHX0VEQUNf QU1ENjQ9bQojIENPTkZJR19FREFDX0FNRDY0X0VSUk9SX0lOSkVDVElPTiBpcyBub3Qgc2V0CkNP TkZJR19FREFDX0U3NTJYPW0KQ09ORklHX0VEQUNfSTgyOTc1WD1tCkNPTkZJR19FREFDX0kzMDAw PW0KQ09ORklHX0VEQUNfSTMyMDA9bQpDT05GSUdfRURBQ19YMzg9bQpDT05GSUdfRURBQ19JNTQw MD1tCkNPTkZJR19FREFDX0k3Q09SRT1tCkNPTkZJR19FREFDX0k1MDAwPW0KQ09ORklHX0VEQUNf STUxMDA9bQpDT05GSUdfRURBQ19JNzMwMD1tCkNPTkZJR19FREFDX1NCUklER0U9bQpDT05GSUdf UlRDX0xJQj15CkNPTkZJR19SVENfQ0xBU1M9eQpDT05GSUdfUlRDX0hDVE9TWVM9eQpDT05GSUdf UlRDX0hDVE9TWVNfREVWSUNFPSJydGMwIgojIENPTkZJR19SVENfREVCVUcgaXMgbm90IHNldAoK IwojIFJUQyBpbnRlcmZhY2VzCiMKQ09ORklHX1JUQ19JTlRGX1NZU0ZTPXkKQ09ORklHX1JUQ19J TlRGX1BST0M9eQpDT05GSUdfUlRDX0lOVEZfREVWPXkKQ09ORklHX1JUQ19JTlRGX0RFVl9VSUVf RU1VTD15CkNPTkZJR19SVENfRFJWX1RFU1Q9bQoKIwojIEkyQyBSVEMgZHJpdmVycwojCkNPTkZJ R19SVENfRFJWX0RTMTMwNz1tCkNPTkZJR19SVENfRFJWX0RTMTM3ND1tCkNPTkZJR19SVENfRFJW X0RTMTY3Mj1tCkNPTkZJR19SVENfRFJWX0RTMzIzMj1tCkNPTkZJR19SVENfRFJWX01BWDY5MDA9 bQpDT05GSUdfUlRDX0RSVl9SUzVDMzcyPW0KQ09ORklHX1JUQ19EUlZfSVNMMTIwOD1tCkNPTkZJ R19SVENfRFJWX0lTTDEyMDIyPW0KQ09ORklHX1JUQ19EUlZfWDEyMDU9bQpDT05GSUdfUlRDX0RS Vl9QQ0Y4NTYzPW0KQ09ORklHX1JUQ19EUlZfUENGODU4Mz1tCkNPTkZJR19SVENfRFJWX000MVQ4 MD1tCkNPTkZJR19SVENfRFJWX000MVQ4MF9XRFQ9eQpDT05GSUdfUlRDX0RSVl9CUTMySz1tCkNP TkZJR19SVENfRFJWX1MzNTM5MEE9bQpDT05GSUdfUlRDX0RSVl9GTTMxMzA9bQpDT05GSUdfUlRD X0RSVl9SWDg1ODE9bQpDT05GSUdfUlRDX0RSVl9SWDgwMjU9bQpDT05GSUdfUlRDX0RSVl9FTTMw Mjc9bQpDT05GSUdfUlRDX0RSVl9SVjMwMjlDMj1tCgojCiMgU1BJIFJUQyBkcml2ZXJzCiMKQ09O RklHX1JUQ19EUlZfTTQxVDkzPW0KQ09ORklHX1JUQ19EUlZfTTQxVDk0PW0KQ09ORklHX1JUQ19E UlZfRFMxMzA1PW0KQ09ORklHX1JUQ19EUlZfRFMxMzkwPW0KQ09ORklHX1JUQ19EUlZfTUFYNjkw Mj1tCkNPTkZJR19SVENfRFJWX1I5NzAxPW0KQ09ORklHX1JUQ19EUlZfUlM1QzM0OD1tCkNPTkZJ R19SVENfRFJWX0RTMzIzND1tCkNPTkZJR19SVENfRFJWX1BDRjIxMjM9bQoKIwojIFBsYXRmb3Jt IFJUQyBkcml2ZXJzCiMKQ09ORklHX1JUQ19EUlZfQ01PUz15CkNPTkZJR19SVENfRFJWX0RTMTI4 Nj1tCkNPTkZJR19SVENfRFJWX0RTMTUxMT1tCkNPTkZJR19SVENfRFJWX0RTMTU1Mz1tCkNPTkZJ R19SVENfRFJWX0RTMTc0Mj1tCkNPTkZJR19SVENfRFJWX0RBOTA1Mj1tCkNPTkZJR19SVENfRFJW X1NUSzE3VEE4PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDg2PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDM1 PW0KQ09ORklHX1JUQ19EUlZfTTQ4VDU5PW0KQ09ORklHX1JUQ19EUlZfTVNNNjI0Mj1tCkNPTkZJ R19SVENfRFJWX0JRNDgwMj1tCkNPTkZJR19SVENfRFJWX1JQNUMwMT1tCkNPTkZJR19SVENfRFJW X1YzMDIwPW0KCiMKIyBvbi1DUFUgUlRDIGRyaXZlcnMKIwpDT05GSUdfUlRDX0RSVl9QQ0FQPW0K Q09ORklHX1JUQ19EUlZfTUMxM1hYWD1tCkNPTkZJR19ETUFERVZJQ0VTPXkKIyBDT05GSUdfRE1B REVWSUNFU19ERUJVRyBpcyBub3Qgc2V0CgojCiMgRE1BIERldmljZXMKIwpDT05GSUdfSU5URUxf TUlEX0RNQUM9bQpDT05GSUdfSU5URUxfSU9BVERNQT1tCkNPTkZJR19USU1CX0RNQT1tCkNPTkZJ R19QQ0hfRE1BPW0KQ09ORklHX0RNQV9FTkdJTkU9eQoKIwojIERNQSBDbGllbnRzCiMKQ09ORklH X05FVF9ETUE9eQpDT05GSUdfQVNZTkNfVFhfRE1BPXkKQ09ORklHX0RNQVRFU1Q9bQpDT05GSUdf RENBPW0KQ09ORklHX0FVWERJU1BMQVk9eQpDT05GSUdfS1MwMTA4PW0KQ09ORklHX0tTMDEwOF9Q T1JUPTB4Mzc4CkNPTkZJR19LUzAxMDhfREVMQVk9MgpDT05GSUdfQ0ZBRzEyODY0Qj1tCkNPTkZJ R19DRkFHMTI4NjRCX1JBVEU9MjAKQ09ORklHX1VJTz1tCkNPTkZJR19VSU9fQ0lGPW0KQ09ORklH X1VJT19QRFJWPW0KQ09ORklHX1VJT19QRFJWX0dFTklSUT1tCkNPTkZJR19VSU9fQUVDPW0KQ09O RklHX1VJT19TRVJDT1MzPW0KQ09ORklHX1VJT19QQ0lfR0VORVJJQz1tCkNPTkZJR19VSU9fTkVU WD1tCkNPTkZJR19WSVJUSU89bQpDT05GSUdfVklSVElPX1JJTkc9bQoKIwojIFZpcnRpbyBkcml2 ZXJzCiMKIyBDT05GSUdfVklSVElPX1BDSSBpcyBub3Qgc2V0CiMgQ09ORklHX1ZJUlRJT19CQUxM T09OIGlzIG5vdCBzZXQKQ09ORklHX1ZJUlRJT19NTUlPPW0KCiMKIyBNaWNyb3NvZnQgSHlwZXIt ViBndWVzdCBzdXBwb3J0CiMKIyBDT05GSUdfSFlQRVJWIGlzIG5vdCBzZXQKCiMKIyBYZW4gZHJp dmVyIHN1cHBvcnQKIwpDT05GSUdfWEVOX0JBTExPT049eQpDT05GSUdfWEVOX1NFTEZCQUxMT09O SU5HPXkKQ09ORklHX1hFTl9CQUxMT09OX01FTU9SWV9IT1RQTFVHPXkKQ09ORklHX1hFTl9TQ1JV Ql9QQUdFUz15CkNPTkZJR19YRU5fREVWX0VWVENITj1tCkNPTkZJR19YRU5fQkFDS0VORD15CkNP TkZJR19YRU5GUz15CkNPTkZJR19YRU5fQ09NUEFUX1hFTkZTPXkKQ09ORklHX1hFTl9TWVNfSFlQ RVJWSVNPUj15CkNPTkZJR19YRU5fWEVOQlVTX0ZST05URU5EPXkKQ09ORklHX1hFTl9HTlRERVY9 bQpDT05GSUdfWEVOX0dSQU5UX0RFVl9BTExPQz1tCkNPTkZJR19TV0lPVExCX1hFTj15CkNPTkZJ R19YRU5fVE1FTT15CkNPTkZJR19YRU5fUENJREVWX0JBQ0tFTkQ9bQpDT05GSUdfWEVOX1BSSVZD TUQ9eQpDT05GSUdfWEVOX0FDUElfUFJPQ0VTU09SPXkKQ09ORklHX1NUQUdJTkc9eQpDT05GSUdf RVQxMzFYPW0KQ09ORklHX1NMSUNPU1M9bQpDT05GSUdfVVNCSVBfQ09SRT1tCkNPTkZJR19VU0JJ UF9WSENJX0hDRD1tCkNPTkZJR19VU0JJUF9IT1NUPW0KIyBDT05GSUdfVVNCSVBfREVCVUcgaXMg bm90IHNldApDT05GSUdfVzM1VU5EPW0KQ09ORklHX1BSSVNNMl9VU0I9bQpDT05GSUdfRUNITz1t CiMgQ09ORklHX0NPTUVESSBpcyBub3Qgc2V0CkNPTkZJR19BU1VTX09MRUQ9bQpDT05GSUdfUEFO RUw9bQpDT05GSUdfUEFORUxfUEFSUE9SVD0wCkNPTkZJR19QQU5FTF9QUk9GSUxFPTUKIyBDT05G SUdfUEFORUxfQ0hBTkdFX01FU1NBR0UgaXMgbm90IHNldApDT05GSUdfUjgxODdTRT1tCkNPTkZJ R19SVEw4MTkyVT1tCkNPTkZJR19SVExMSUI9bQpDT05GSUdfUlRMTElCX0NSWVBUT19DQ01QPW0K Q09ORklHX1JUTExJQl9DUllQVE9fVEtJUD1tCkNPTkZJR19SVExMSUJfQ1JZUFRPX1dFUD1tCkNP TkZJR19SVEw4MTkyRT1tCkNPTkZJR19SODcxMlU9bQpDT05GSUdfUlRTX1BTVE9SPW0KIyBDT05G SUdfUlRTX1BTVE9SX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1JUUzUxMzk9bQojIENPTkZJR19S VFM1MTM5X0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX1RSQU5aUE9SVD1tCkNPTkZJR19JREVfUEhJ U09OPW0KQ09ORklHX0xJTkU2X1VTQj1tCiMgQ09ORklHX0xJTkU2X1VTQl9ERUJVRyBpcyBub3Qg c2V0CiMgQ09ORklHX0xJTkU2X1VTQl9EVU1QX0NUUkwgaXMgbm90IHNldAojIENPTkZJR19MSU5F Nl9VU0JfRFVNUF9NSURJIGlzIG5vdCBzZXQKIyBDT05GSUdfTElORTZfVVNCX0RVTVBfUENNIGlz IG5vdCBzZXQKIyBDT05GSUdfTElORTZfVVNCX1JBVyBpcyBub3Qgc2V0CiMgQ09ORklHX0xJTkU2 X1VTQl9JTVBVTFNFX1JFU1BPTlNFIGlzIG5vdCBzZXQKQ09ORklHX1VTQl9TRVJJQUxfUVVBVEVD SDI9bQpDT05GSUdfVVNCX1NFUklBTF9RVUFURUNIX1VTQjI9bQpDT05GSUdfVlQ2NjU1PW0KQ09O RklHX1ZUNjY1Nj1tCkNPTkZJR19WTUVfQlVTPW0KCiMKIyBWTUUgQnJpZGdlIERyaXZlcnMKIwpD T05GSUdfVk1FX0NBOTFDWDQyPW0KQ09ORklHX1ZNRV9UU0kxNDg9bQoKIwojIFZNRSBEZXZpY2Ug RHJpdmVycwojCkNPTkZJR19WTUVfVVNFUj1tCkNPTkZJR19WTUVfUElPMj1tCgojCiMgVk1FIEJv YXJkIERyaXZlcnMKIwpDT05GSUdfVk1JVk1FXzc4MDU9bQpDT05GSUdfRFhfU0VQPW0KQ09ORklH X0lJTz1tCkNPTkZJR19JSU9fU1RfSFdNT049bQpDT05GSUdfSUlPX0JVRkZFUj15CkNPTkZJR19J SU9fU1dfUklORz1tCkNPTkZJR19JSU9fS0ZJRk9fQlVGPW0KQ09ORklHX0lJT19UUklHR0VSPXkK Q09ORklHX0lJT19DT05TVU1FUlNfUEVSX1RSSUdHRVI9MgoKIwojIEFjY2VsZXJvbWV0ZXJzCiMK Q09ORklHX0FESVMxNjIwMT1tCkNPTkZJR19BRElTMTYyMDM9bQpDT05GSUdfQURJUzE2MjA0PW0K Q09ORklHX0FESVMxNjIwOT1tCkNPTkZJR19BRElTMTYyMjA9bQpDT05GSUdfQURJUzE2MjQwPW0K Q09ORklHX0tYU0Q5PW0KQ09ORklHX0xJUzNMMDJEUT1tCkNPTkZJR19MSVMzTDAyRFFfQlVGX0tG SUZPPXkKIyBDT05GSUdfTElTM0wwMkRRX0JVRl9SSU5HX1NXIGlzIG5vdCBzZXQKQ09ORklHX1ND QTMwMDA9bQoKIwojIEFuYWxvZyB0byBkaWdpdGFsIGNvbnZlcnRlcnMKIwpDT05GSUdfQUQ3Mjkx PW0KQ09ORklHX0FENzI5OD1tCkNPTkZJR19BRDc2MDY9bQpDT05GSUdfQUQ3NjA2X0lGQUNFX1BB UkFMTEVMPW0KQ09ORklHX0FENzYwNl9JRkFDRV9TUEk9bQpDT05GSUdfQUQ3OTlYPW0KQ09ORklH X0FENzk5WF9SSU5HX0JVRkZFUj15CkNPTkZJR19BRDc0NzY9bQpDT05GSUdfQUQ3ODg3PW0KQ09O RklHX0FENzc4MD1tCkNPTkZJR19BRDc3OTM9bQpDT05GSUdfQUQ3ODE2PW0KQ09ORklHX0FENzE5 Mj1tCkNPTkZJR19BRFQ3MzEwPW0KQ09ORklHX0FEVDc0MTA9bQpDT05GSUdfQUQ3MjgwPW0KQ09O RklHX01BWDEzNjM9bQpDT05GSUdfTUFYMTM2M19SSU5HX0JVRkZFUj15CgojCiMgQW5hbG9nIGRp Z2l0YWwgYmktZGlyZWN0aW9uIGNvbnZlcnRlcnMKIwpDT05GSUdfQURUNzMxNj1tCkNPTkZJR19B RFQ3MzE2X1NQST1tCkNPTkZJR19BRFQ3MzE2X0kyQz1tCgojCiMgQ2FwYWNpdGFuY2UgdG8gZGln aXRhbCBjb252ZXJ0ZXJzCiMKQ09ORklHX0FENzE1MD1tCkNPTkZJR19BRDcxNTI9bQpDT05GSUdf QUQ3NzQ2PW0KCiMKIyBEaWdpdGFsIHRvIGFuYWxvZyBjb252ZXJ0ZXJzCiMKQ09ORklHX0FENTA2 ND1tCkNPTkZJR19BRDUzNjA9bQpDT05GSUdfQUQ1MzgwPW0KQ09ORklHX0FENTQyMT1tCkNPTkZJ R19BRDU2MjRSX1NQST1tCkNPTkZJR19BRDU0NDY9bQpDT05GSUdfQUQ1NTA0PW0KQ09ORklHX0FE NTc2ND1tCkNPTkZJR19BRDU3OTE9bQpDT05GSUdfQUQ1Njg2PW0KQ09ORklHX01BWDUxNz1tCgoj CiMgRGlyZWN0IERpZ2l0YWwgU3ludGhlc2lzCiMKQ09ORklHX0FENTkzMD1tCkNPTkZJR19BRDk4 MzI9bQpDT05GSUdfQUQ5ODM0PW0KQ09ORklHX0FEOTg1MD1tCkNPTkZJR19BRDk4NTI9bQpDT05G SUdfQUQ5OTEwPW0KQ09ORklHX0FEOTk1MT1tCgojCiMgRGlnaXRhbCBneXJvc2NvcGUgc2Vuc29y cwojCkNPTkZJR19BRElTMTYwNjA9bQpDT05GSUdfQURJUzE2MDgwPW0KQ09ORklHX0FESVMxNjEz MD1tCkNPTkZJR19BRElTMTYyNjA9bQpDT05GSUdfQURYUlM0NTA9bQoKIwojIE5ldHdvcmsgQW5h bHl6ZXIsIEltcGVkYW5jZSBDb252ZXJ0ZXJzCiMKQ09ORklHX0FENTkzMz1tCgojCiMgSW5lcnRp YWwgbWVhc3VyZW1lbnQgdW5pdHMKIwpDT05GSUdfQURJUzE2NDAwPW0KCiMKIyBMaWdodCBzZW5z b3JzCiMKQ09ORklHX1NFTlNPUlNfSVNMMjkwMTg9bQpDT05GSUdfU0VOU09SU19UU0wyNTYzPW0K Q09ORklHX1RTTDI1ODM9bQoKIwojIE1hZ25ldG9tZXRlciBzZW5zb3JzCiMKQ09ORklHX1NFTlNP UlNfQUs4OTc1PW0KQ09ORklHX1NFTlNPUlNfSE1DNTg0Mz1tCgojCiMgQWN0aXZlIGVuZXJneSBt ZXRlcmluZyBJQwojCkNPTkZJR19BREU3NzUzPW0KQ09ORklHX0FERTc3NTQ9bQpDT05GSUdfQURF Nzc1OD1tCkNPTkZJR19BREU3NzU5PW0KQ09ORklHX0FERTc4NTQ9bQpDT05GSUdfQURFNzg1NF9J MkM9bQpDT05GSUdfQURFNzg1NF9TUEk9bQoKIwojIFJlc29sdmVyIHRvIGRpZ2l0YWwgY29udmVy dGVycwojCkNPTkZJR19BRDJTOTA9bQpDT05GSUdfQUQyUzEyMDA9bQpDT05GSUdfQUQyUzEyMTA9 bQoKIwojIFRyaWdnZXJzIC0gc3RhbmRhbG9uZQojCkNPTkZJR19JSU9fUEVSSU9ESUNfUlRDX1RS SUdHRVI9bQpDT05GSUdfSUlPX0dQSU9fVFJJR0dFUj1tCkNPTkZJR19JSU9fU1lTRlNfVFJJR0dF Uj1tCkNPTkZJR19JSU9fU0lNUExFX0RVTU1ZPW0KIyBDT05GSUdfSUlPX1NJTVBMRV9EVU1NWV9F VkVOVFMgaXMgbm90IHNldAojIENPTkZJR19JSU9fU0lNUExFX0RVTU1ZX0JVRkZFUiBpcyBub3Qg c2V0CkNPTkZJR19aUkFNPW0KIyBDT05GSUdfWlJBTV9ERUJVRyBpcyBub3Qgc2V0CiMgQ09ORklH X1pDQUNIRSBpcyBub3Qgc2V0CkNPTkZJR19aU01BTExPQz1tCkNPTkZJR19XTEFHUzQ5X0gyPW0K Q09ORklHX1dMQUdTNDlfSDI1PW0KQ09ORklHX0ZCX1NNN1hYPW0KQ09ORklHX0NSWVNUQUxIRD1t CkNPTkZJR19DWFQxRTE9bQojIENPTkZJR19TQkVfUE1DQzRfTkNPTU0gaXMgbm90IHNldApDT05G SUdfRkJfWEdJPW0KQ09ORklHX0FDUElfUVVJQ0tTVEFSVD1tCkNPTkZJR19TQkVfMlQzRTM9bQpD T05GSUdfVVNCX0VORVNUT1JBR0U9bQpDT05GSUdfQkNNX1dJTUFYPW0KQ09ORklHX0ZUMTAwMD1t CkNPTkZJR19GVDEwMDBfVVNCPW0KQ09ORklHX0ZUMTAwMF9QQ01DSUE9bQoKIwojIFNwZWFrdXAg Y29uc29sZSBzcGVlY2gKIwojIENPTkZJR19TUEVBS1VQIGlzIG5vdCBzZXQKQ09ORklHX1RPVUNI U0NSRUVOX0NMRUFSUEFEX1RNMTIxNz1tCkNPTkZJR19UT1VDSFNDUkVFTl9TWU5BUFRJQ1NfSTJD X1JNSTQ9bQpDT05GSUdfSU5URUxfTUVJPW0KQ09ORklHX1NUQUdJTkdfTUVESUE9eQpDT05GSUdf RFZCX0FTMTAyPW0KQ09ORklHX0RWQl9DWEQyMDk5PW0KQ09ORklHX1ZJREVPX0RUMzE1NT1tCkNP TkZJR19EVDMxNTVfQ0NJUj15CkNPTkZJR19EVDMxNTVfU1RSRUFNSU5HPXkKQ09ORklHX0VBU1lD QVA9bQojIENPTkZJR19FQVNZQ0FQX0RFQlVHIGlzIG5vdCBzZXQKIyBDT05GSUdfVklERU9fR083 MDA3IGlzIG5vdCBzZXQKQ09ORklHX1NPTE82WDEwPW0KQ09ORklHX0xJUkNfU1RBR0lORz15CkNP TkZJR19MSVJDX0JUODI5PW0KQ09ORklHX0xJUkNfSUdPUlBMVUdVU0I9bQpDT05GSUdfTElSQ19J TU9OPW0KQ09ORklHX0xJUkNfUEFSQUxMRUw9bQpDT05GSUdfTElSQ19TQVNFTT1tCkNPTkZJR19M SVJDX1NFUklBTD1tCkNPTkZJR19MSVJDX1NFUklBTF9UUkFOU01JVFRFUj15CkNPTkZJR19MSVJD X1NJUj1tCkNPTkZJR19MSVJDX1RUVVNCSVI9bQpDT05GSUdfTElSQ19aSUxPRz1tCgojCiMgQW5k cm9pZAojCiMgQ09ORklHX0FORFJPSUQgaXMgbm90IHNldApDT05GSUdfUEhPTkU9bQpDT05GSUdf UEhPTkVfSVhKPW0KQ09ORklHX1BIT05FX0lYSl9QQ01DSUE9bQpDT05GSUdfVVNCX1dQQU5fSENE PW0KQ09ORklHX1g4Nl9QTEFURk9STV9ERVZJQ0VTPXkKQ09ORklHX0FDRVJfV01JPW0KQ09ORklH X0FDRVJIREY9bQpDT05GSUdfQVNVU19MQVBUT1A9bQpDT05GSUdfREVMTF9MQVBUT1A9bQpDT05G SUdfREVMTF9XTUk9bQpDT05GSUdfREVMTF9XTUlfQUlPPW0KQ09ORklHX0ZVSklUU1VfTEFQVE9Q PW0KIyBDT05GSUdfRlVKSVRTVV9MQVBUT1BfREVCVUcgaXMgbm90IHNldApDT05GSUdfRlVKSVRT VV9UQUJMRVQ9bQpDT05GSUdfQU1JTE9fUkZLSUxMPW0KQ09ORklHX0hQX0FDQ0VMPW0KQ09ORklH X0hQX1dNST1tCkNPTkZJR19NU0lfTEFQVE9QPW0KQ09ORklHX1BBTkFTT05JQ19MQVBUT1A9bQpD T05GSUdfQ09NUEFMX0xBUFRPUD1tCkNPTkZJR19TT05ZX0xBUFRPUD1tCkNPTkZJR19TT05ZUElf Q09NUEFUPXkKQ09ORklHX0lERUFQQURfTEFQVE9QPW0KQ09ORklHX1RISU5LUEFEX0FDUEk9bQpD T05GSUdfVEhJTktQQURfQUNQSV9BTFNBX1NVUFBPUlQ9eQojIENPTkZJR19USElOS1BBRF9BQ1BJ X0RFQlVHRkFDSUxJVElFUyBpcyBub3Qgc2V0CiMgQ09ORklHX1RISU5LUEFEX0FDUElfREVCVUcg aXMgbm90IHNldAojIENPTkZJR19USElOS1BBRF9BQ1BJX1VOU0FGRV9MRURTIGlzIG5vdCBzZXQK Q09ORklHX1RISU5LUEFEX0FDUElfVklERU89eQpDT05GSUdfVEhJTktQQURfQUNQSV9IT1RLRVlf UE9MTD15CkNPTkZJR19TRU5TT1JTX0hEQVBTPW0KQ09ORklHX0lOVEVMX01FTkxPVz1tCkNPTkZJ R19FRUVQQ19MQVBUT1A9bQpDT05GSUdfQVNVU19XTUk9bQpDT05GSUdfQVNVU19OQl9XTUk9bQpD T05GSUdfRUVFUENfV01JPW0KQ09ORklHX0FDUElfV01JPW0KQ09ORklHX01TSV9XTUk9bQpDT05G SUdfVE9QU1RBUl9MQVBUT1A9bQpDT05GSUdfQUNQSV9UT1NISUJBPW0KQ09ORklHX1RPU0hJQkFf QlRfUkZLSUxMPW0KQ09ORklHX0FDUElfQ01QQz1tCkNPTkZJR19JTlRFTF9JUFM9bQpDT05GSUdf SUJNX1JUTD1tCkNPTkZJR19YTzE1X0VCT09LPW0KQ09ORklHX1NBTVNVTkdfTEFQVE9QPW0KQ09O RklHX01YTV9XTUk9bQpDT05GSUdfSU5URUxfT0FLVFJBSUw9bQpDT05GSUdfU0FNU1VOR19RMTA9 bQpDT05GSUdfQVBQTEVfR01VWD1tCgojCiMgSGFyZHdhcmUgU3BpbmxvY2sgZHJpdmVycwojCkNP TkZJR19DTEtFVlRfSTgyNTM9eQpDT05GSUdfSTgyNTNfTE9DSz15CkNPTkZJR19DTEtCTERfSTgy NTM9eQpDT05GSUdfSU9NTVVfQVBJPXkKQ09ORklHX0lPTU1VX1NVUFBPUlQ9eQpDT05GSUdfQU1E X0lPTU1VPXkKIyBDT05GSUdfQU1EX0lPTU1VX1NUQVRTIGlzIG5vdCBzZXQKQ09ORklHX0FNRF9J T01NVV9WMj1tCkNPTkZJR19ETUFSX1RBQkxFPXkKQ09ORklHX0lOVEVMX0lPTU1VPXkKQ09ORklH X0lOVEVMX0lPTU1VX0RFRkFVTFRfT049eQpDT05GSUdfSU5URUxfSU9NTVVfRkxPUFBZX1dBPXkK Q09ORklHX0lSUV9SRU1BUD15CgojCiMgUmVtb3RlcHJvYyBkcml2ZXJzIChFWFBFUklNRU5UQUwp CiMKCiMKIyBScG1zZyBkcml2ZXJzIChFWFBFUklNRU5UQUwpCiMKQ09ORklHX1ZJUlRfRFJJVkVS Uz15CkNPTkZJR19QTV9ERVZGUkVRPXkKCiMKIyBERVZGUkVRIEdvdmVybm9ycwojCkNPTkZJR19E RVZGUkVRX0dPVl9TSU1QTEVfT05ERU1BTkQ9eQpDT05GSUdfREVWRlJFUV9HT1ZfUEVSRk9STUFO Q0U9eQpDT05GSUdfREVWRlJFUV9HT1ZfUE9XRVJTQVZFPXkKQ09ORklHX0RFVkZSRVFfR09WX1VT RVJTUEFDRT15CgojCiMgREVWRlJFUSBEcml2ZXJzCiMKCiMKIyBGaXJtd2FyZSBEcml2ZXJzCiMK Q09ORklHX0VERD1tCiMgQ09ORklHX0VERF9PRkYgaXMgbm90IHNldApDT05GSUdfRklSTVdBUkVf TUVNTUFQPXkKQ09ORklHX0RFTExfUkJVPW0KQ09ORklHX0RDREJBUz1tCkNPTkZJR19ETUlJRD15 CkNPTkZJR19ETUlfU1lTRlM9bQpDT05GSUdfSVNDU0lfSUJGVF9GSU5EPXkKQ09ORklHX0lTQ1NJ X0lCRlQ9bQojIENPTkZJR19HT09HTEVfRklSTVdBUkUgaXMgbm90IHNldAoKIwojIEZpbGUgc3lz dGVtcwojCkNPTkZJR19EQ0FDSEVfV09SRF9BQ0NFU1M9eQpDT05GSUdfRVhUMl9GUz15CkNPTkZJ R19FWFQyX0ZTX1hBVFRSPXkKQ09ORklHX0VYVDJfRlNfUE9TSVhfQUNMPXkKQ09ORklHX0VYVDJf RlNfU0VDVVJJVFk9eQojIENPTkZJR19FWFQyX0ZTX1hJUCBpcyBub3Qgc2V0CkNPTkZJR19FWFQz X0ZTPXkKQ09ORklHX0VYVDNfREVGQVVMVFNfVE9fT1JERVJFRD15CkNPTkZJR19FWFQzX0ZTX1hB VFRSPXkKQ09ORklHX0VYVDNfRlNfUE9TSVhfQUNMPXkKQ09ORklHX0VYVDNfRlNfU0VDVVJJVFk9 eQpDT05GSUdfRVhUNF9GUz1tCkNPTkZJR19FWFQ0X0ZTX1hBVFRSPXkKQ09ORklHX0VYVDRfRlNf UE9TSVhfQUNMPXkKQ09ORklHX0VYVDRfRlNfU0VDVVJJVFk9eQojIENPTkZJR19FWFQ0X0RFQlVH IGlzIG5vdCBzZXQKQ09ORklHX0pCRD15CiMgQ09ORklHX0pCRF9ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19KQkQyPW0KIyBDT05GSUdfSkJEMl9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19GU19NQkNB Q0hFPXkKQ09ORklHX1JFSVNFUkZTX0ZTPW0KIyBDT05GSUdfUkVJU0VSRlNfQ0hFQ0sgaXMgbm90 IHNldAojIENPTkZJR19SRUlTRVJGU19QUk9DX0lORk8gaXMgbm90IHNldApDT05GSUdfUkVJU0VS RlNfRlNfWEFUVFI9eQpDT05GSUdfUkVJU0VSRlNfRlNfUE9TSVhfQUNMPXkKQ09ORklHX1JFSVNF UkZTX0ZTX1NFQ1VSSVRZPXkKQ09ORklHX0pGU19GUz1tCkNPTkZJR19KRlNfUE9TSVhfQUNMPXkK Q09ORklHX0pGU19TRUNVUklUWT15CiMgQ09ORklHX0pGU19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19KRlNfU1RBVElTVElDUz15CkNPTkZJR19YRlNfRlM9bQpDT05GSUdfWEZTX1FVT1RBPXkKQ09O RklHX1hGU19QT1NJWF9BQ0w9eQpDT05GSUdfWEZTX1JUPXkKIyBDT05GSUdfWEZTX0RFQlVHIGlz IG5vdCBzZXQKQ09ORklHX0dGUzJfRlM9bQojIENPTkZJR19HRlMyX0ZTX0xPQ0tJTkdfRExNIGlz IG5vdCBzZXQKQ09ORklHX09DRlMyX0ZTPW0KQ09ORklHX09DRlMyX0ZTX08yQ0I9bQpDT05GSUdf T0NGUzJfRlNfVVNFUlNQQUNFX0NMVVNURVI9bQpDT05GSUdfT0NGUzJfRlNfU1RBVFM9eQojIENP TkZJR19PQ0ZTMl9ERUJVR19NQVNLTE9HIGlzIG5vdCBzZXQKIyBDT05GSUdfT0NGUzJfREVCVUdf RlMgaXMgbm90IHNldApDT05GSUdfQlRSRlNfRlM9bQpDT05GSUdfQlRSRlNfRlNfUE9TSVhfQUNM PXkKIyBDT05GSUdfQlRSRlNfRlNfQ0hFQ0tfSU5URUdSSVRZIGlzIG5vdCBzZXQKQ09ORklHX05J TEZTMl9GUz1tCkNPTkZJR19GU19QT1NJWF9BQ0w9eQpDT05GSUdfRVhQT1JURlM9bQpDT05GSUdf RklMRV9MT0NLSU5HPXkKQ09ORklHX0ZTTk9USUZZPXkKQ09ORklHX0ROT1RJRlk9eQpDT05GSUdf SU5PVElGWV9VU0VSPXkKQ09ORklHX0ZBTk9USUZZPXkKQ09ORklHX1FVT1RBPXkKQ09ORklHX1FV T1RBX05FVExJTktfSU5URVJGQUNFPXkKQ09ORklHX1BSSU5UX1FVT1RBX1dBUk5JTkc9eQojIENP TkZJR19RVU9UQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19RVU9UQV9UUkVFPW0KQ09ORklHX1FG TVRfVjE9bQpDT05GSUdfUUZNVF9WMj1tCkNPTkZJR19RVU9UQUNUTD15CkNPTkZJR19RVU9UQUNU TF9DT01QQVQ9eQpDT05GSUdfQVVUT0ZTNF9GUz1tCkNPTkZJR19GVVNFX0ZTPW0KQ09ORklHX0NV U0U9bQpDT05GSUdfR0VORVJJQ19BQ0w9eQoKIwojIENhY2hlcwojCkNPTkZJR19GU0NBQ0hFPW0K Q09ORklHX0ZTQ0FDSEVfU1RBVFM9eQojIENPTkZJR19GU0NBQ0hFX0hJU1RPR1JBTSBpcyBub3Qg c2V0CiMgQ09ORklHX0ZTQ0FDSEVfREVCVUcgaXMgbm90IHNldApDT05GSUdfRlNDQUNIRV9PQkpF Q1RfTElTVD15CkNPTkZJR19DQUNIRUZJTEVTPW0KIyBDT05GSUdfQ0FDSEVGSUxFU19ERUJVRyBp cyBub3Qgc2V0CiMgQ09ORklHX0NBQ0hFRklMRVNfSElTVE9HUkFNIGlzIG5vdCBzZXQKCiMKIyBD RC1ST00vRFZEIEZpbGVzeXN0ZW1zCiMKQ09ORklHX0lTTzk2NjBfRlM9eQpDT05GSUdfSk9MSUVU PXkKQ09ORklHX1pJU09GUz15CkNPTkZJR19VREZfRlM9bQpDT05GSUdfVURGX05MUz15CgojCiMg RE9TL0ZBVC9OVCBGaWxlc3lzdGVtcwojCkNPTkZJR19GQVRfRlM9bQpDT05GSUdfTVNET1NfRlM9 bQpDT05GSUdfVkZBVF9GUz1tCkNPTkZJR19GQVRfREVGQVVMVF9DT0RFUEFHRT00MzcKQ09ORklH X0ZBVF9ERUZBVUxUX0lPQ0hBUlNFVD0iaXNvODg1OS0xIgojIENPTkZJR19OVEZTX0ZTIGlzIG5v dCBzZXQKCiMKIyBQc2V1ZG8gZmlsZXN5c3RlbXMKIwpDT05GSUdfUFJPQ19GUz15CkNPTkZJR19Q Uk9DX0tDT1JFPXkKQ09ORklHX1BST0NfU1lTQ1RMPXkKQ09ORklHX1BST0NfUEFHRV9NT05JVE9S PXkKQ09ORklHX1NZU0ZTPXkKQ09ORklHX1RNUEZTPXkKQ09ORklHX1RNUEZTX1BPU0lYX0FDTD15 CkNPTkZJR19UTVBGU19YQVRUUj15CiMgQ09ORklHX0hVR0VUTEJGUyBpcyBub3Qgc2V0CiMgQ09O RklHX0hVR0VUTEJfUEFHRSBpcyBub3Qgc2V0CkNPTkZJR19DT05GSUdGU19GUz1tCkNPTkZJR19N SVNDX0ZJTEVTWVNURU1TPXkKQ09ORklHX0FERlNfRlM9bQpDT05GSUdfQURGU19GU19SVz15CkNP TkZJR19BRkZTX0ZTPW0KQ09ORklHX0VDUllQVF9GUz1tCkNPTkZJR19IRlNfRlM9bQpDT05GSUdf SEZTUExVU19GUz1tCkNPTkZJR19CRUZTX0ZTPW0KIyBDT05GSUdfQkVGU19ERUJVRyBpcyBub3Qg c2V0CkNPTkZJR19CRlNfRlM9bQpDT05GSUdfRUZTX0ZTPW0KQ09ORklHX0pGRlMyX0ZTPW0KQ09O RklHX0pGRlMyX0ZTX0RFQlVHPTAKQ09ORklHX0pGRlMyX0ZTX1dSSVRFQlVGRkVSPXkKIyBDT05G SUdfSkZGUzJfRlNfV0JVRl9WRVJJRlkgaXMgbm90IHNldApDT05GSUdfSkZGUzJfU1VNTUFSWT15 CkNPTkZJR19KRkZTMl9GU19YQVRUUj15CkNPTkZJR19KRkZTMl9GU19QT1NJWF9BQ0w9eQpDT05G SUdfSkZGUzJfRlNfU0VDVVJJVFk9eQpDT05GSUdfSkZGUzJfQ09NUFJFU1NJT05fT1BUSU9OUz15 CkNPTkZJR19KRkZTMl9aTElCPXkKIyBDT05GSUdfSkZGUzJfTFpPIGlzIG5vdCBzZXQKQ09ORklH X0pGRlMyX1JUSU1FPXkKIyBDT05GSUdfSkZGUzJfUlVCSU4gaXMgbm90IHNldAojIENPTkZJR19K RkZTMl9DTU9ERV9OT05FIGlzIG5vdCBzZXQKQ09ORklHX0pGRlMyX0NNT0RFX1BSSU9SSVRZPXkK IyBDT05GSUdfSkZGUzJfQ01PREVfU0laRSBpcyBub3Qgc2V0CiMgQ09ORklHX0pGRlMyX0NNT0RF X0ZBVk9VUkxaTyBpcyBub3Qgc2V0CkNPTkZJR19VQklGU19GUz1tCkNPTkZJR19VQklGU19GU19Y QVRUUj15CkNPTkZJR19VQklGU19GU19BRFZBTkNFRF9DT01QUj15CkNPTkZJR19VQklGU19GU19M Wk89eQpDT05GSUdfVUJJRlNfRlNfWkxJQj15CiMgQ09ORklHX1VCSUZTX0ZTX0RFQlVHIGlzIG5v dCBzZXQKQ09ORklHX0xPR0ZTPW0KQ09ORklHX0NSQU1GUz1tCkNPTkZJR19TUVVBU0hGUz1tCkNP TkZJR19TUVVBU0hGU19YQVRUUj15CkNPTkZJR19TUVVBU0hGU19aTElCPXkKQ09ORklHX1NRVUFT SEZTX0xaTz15CkNPTkZJR19TUVVBU0hGU19YWj15CkNPTkZJR19TUVVBU0hGU180S19ERVZCTEtf U0laRT15CiMgQ09ORklHX1NRVUFTSEZTX0VNQkVEREVEIGlzIG5vdCBzZXQKQ09ORklHX1NRVUFT SEZTX0ZSQUdNRU5UX0NBQ0hFX1NJWkU9MwpDT05GSUdfVlhGU19GUz1tCkNPTkZJR19NSU5JWF9G Uz1tCkNPTkZJR19PTUZTX0ZTPW0KQ09ORklHX0hQRlNfRlM9bQpDT05GSUdfUU5YNEZTX0ZTPW0K Q09ORklHX1FOWDZGU19GUz1tCiMgQ09ORklHX1FOWDZGU19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJ R19ST01GU19GUz1tCiMgQ09ORklHX1JPTUZTX0JBQ0tFRF9CWV9CTE9DSyBpcyBub3Qgc2V0CiMg Q09ORklHX1JPTUZTX0JBQ0tFRF9CWV9NVEQgaXMgbm90IHNldApDT05GSUdfUk9NRlNfQkFDS0VE X0JZX0JPVEg9eQpDT05GSUdfUk9NRlNfT05fQkxPQ0s9eQpDT05GSUdfUk9NRlNfT05fTVREPXkK IyBDT05GSUdfUFNUT1JFIGlzIG5vdCBzZXQKQ09ORklHX1NZU1ZfRlM9bQpDT05GSUdfVUZTX0ZT PW0KQ09ORklHX1VGU19GU19XUklURT15CiMgQ09ORklHX1VGU19ERUJVRyBpcyBub3Qgc2V0CkNP TkZJR19FWE9GU19GUz1tCiMgQ09ORklHX0VYT0ZTX0RFQlVHIGlzIG5vdCBzZXQKQ09ORklHX09S RT1tCkNPTkZJR19ORVRXT1JLX0ZJTEVTWVNURU1TPXkKQ09ORklHX05GU19GUz1tCkNPTkZJR19O RlNfVjM9eQpDT05GSUdfTkZTX1YzX0FDTD15CkNPTkZJR19ORlNfVjQ9eQojIENPTkZJR19ORlNf VjRfMSBpcyBub3Qgc2V0CkNPTkZJR19ORlNfRlNDQUNIRT15CiMgQ09ORklHX05GU19VU0VfTEVH QUNZX0ROUyBpcyBub3Qgc2V0CkNPTkZJR19ORlNfVVNFX0tFUk5FTF9ETlM9eQpDT05GSUdfTkZT RD1tCkNPTkZJR19ORlNEX1YyX0FDTD15CkNPTkZJR19ORlNEX1YzPXkKQ09ORklHX05GU0RfVjNf QUNMPXkKQ09ORklHX05GU0RfVjQ9eQojIENPTkZJR19ORlNEX0ZBVUxUX0lOSkVDVElPTiBpcyBu b3Qgc2V0CkNPTkZJR19MT0NLRD1tCkNPTkZJR19MT0NLRF9WND15CkNPTkZJR19ORlNfQUNMX1NV UFBPUlQ9bQpDT05GSUdfTkZTX0NPTU1PTj15CkNPTkZJR19TVU5SUEM9bQpDT05GSUdfU1VOUlBD X0dTUz1tCkNPTkZJR19TVU5SUENfWFBSVF9SRE1BPW0KQ09ORklHX1JQQ1NFQ19HU1NfS1JCNT1t CiMgQ09ORklHX1NVTlJQQ19ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19DRVBIX0ZTPW0KQ09ORklH X0NJRlM9bQpDT05GSUdfQ0lGU19TVEFUUz15CkNPTkZJR19DSUZTX1NUQVRTMj15CkNPTkZJR19D SUZTX1dFQUtfUFdfSEFTSD15CkNPTkZJR19DSUZTX1VQQ0FMTD15CkNPTkZJR19DSUZTX1hBVFRS PXkKQ09ORklHX0NJRlNfUE9TSVg9eQojIENPTkZJR19DSUZTX0RFQlVHMiBpcyBub3Qgc2V0CkNP TkZJR19DSUZTX0RGU19VUENBTEw9eQojIENPTkZJR19DSUZTX0ZTQ0FDSEUgaXMgbm90IHNldApD T05GSUdfQ0lGU19BQ0w9eQpDT05GSUdfTkNQX0ZTPW0KQ09ORklHX05DUEZTX1BBQ0tFVF9TSUdO SU5HPXkKQ09ORklHX05DUEZTX0lPQ1RMX0xPQ0tJTkc9eQpDT05GSUdfTkNQRlNfU1RST05HPXkK Q09ORklHX05DUEZTX05GU19OUz15CkNPTkZJR19OQ1BGU19PUzJfTlM9eQpDT05GSUdfTkNQRlNf U01BTExET1M9eQpDT05GSUdfTkNQRlNfTkxTPXkKQ09ORklHX05DUEZTX0VYVFJBUz15CkNPTkZJ R19DT0RBX0ZTPW0KQ09ORklHX0FGU19GUz1tCiMgQ09ORklHX0FGU19ERUJVRyBpcyBub3Qgc2V0 CkNPTkZJR19BRlNfRlNDQUNIRT15CkNPTkZJR185UF9GUz1tCiMgQ09ORklHXzlQX0ZTQ0FDSEUg aXMgbm90IHNldApDT05GSUdfOVBfRlNfUE9TSVhfQUNMPXkKQ09ORklHX05MUz15CkNPTkZJR19O TFNfREVGQVVMVD0idXRmOCIKQ09ORklHX05MU19DT0RFUEFHRV80Mzc9bQpDT05GSUdfTkxTX0NP REVQQUdFXzczNz1tCkNPTkZJR19OTFNfQ09ERVBBR0VfNzc1PW0KQ09ORklHX05MU19DT0RFUEFH RV84NTA9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg1Mj1tCkNPTkZJR19OTFNfQ09ERVBBR0VfODU1 PW0KQ09ORklHX05MU19DT0RFUEFHRV84NTc9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg2MD1tCkNP TkZJR19OTFNfQ09ERVBBR0VfODYxPW0KQ09ORklHX05MU19DT0RFUEFHRV84NjI9bQpDT05GSUdf TkxTX0NPREVQQUdFXzg2Mz1tCkNPTkZJR19OTFNfQ09ERVBBR0VfODY0PW0KQ09ORklHX05MU19D T0RFUEFHRV84NjU9bQpDT05GSUdfTkxTX0NPREVQQUdFXzg2Nj1tCkNPTkZJR19OTFNfQ09ERVBB R0VfODY5PW0KQ09ORklHX05MU19DT0RFUEFHRV85MzY9bQpDT05GSUdfTkxTX0NPREVQQUdFXzk1 MD1tCkNPTkZJR19OTFNfQ09ERVBBR0VfOTMyPW0KQ09ORklHX05MU19DT0RFUEFHRV85NDk9bQpD T05GSUdfTkxTX0NPREVQQUdFXzg3ND1tCkNPTkZJR19OTFNfSVNPODg1OV84PW0KQ09ORklHX05M U19DT0RFUEFHRV8xMjUwPW0KQ09ORklHX05MU19DT0RFUEFHRV8xMjUxPW0KQ09ORklHX05MU19B U0NJST1tCkNPTkZJR19OTFNfSVNPODg1OV8xPW0KQ09ORklHX05MU19JU084ODU5XzI9bQpDT05G SUdfTkxTX0lTTzg4NTlfMz1tCkNPTkZJR19OTFNfSVNPODg1OV80PW0KQ09ORklHX05MU19JU084 ODU5XzU9bQpDT05GSUdfTkxTX0lTTzg4NTlfNj1tCkNPTkZJR19OTFNfSVNPODg1OV83PW0KQ09O RklHX05MU19JU084ODU5Xzk9bQpDT05GSUdfTkxTX0lTTzg4NTlfMTM9bQpDT05GSUdfTkxTX0lT Tzg4NTlfMTQ9bQpDT05GSUdfTkxTX0lTTzg4NTlfMTU9bQpDT05GSUdfTkxTX0tPSThfUj1tCkNP TkZJR19OTFNfS09JOF9VPW0KQ09ORklHX05MU19VVEY4PW0KQ09ORklHX0RMTT1tCkNPTkZJR19E TE1fREVCVUc9eQoKIwojIEtlcm5lbCBoYWNraW5nCiMKQ09ORklHX1RSQUNFX0lSUUZMQUdTX1NV UFBPUlQ9eQpDT05GSUdfUFJJTlRLX1RJTUU9eQpDT05GSUdfREVGQVVMVF9NRVNTQUdFX0xPR0xF VkVMPTQKQ09ORklHX0VOQUJMRV9XQVJOX0RFUFJFQ0FURUQ9eQpDT05GSUdfRU5BQkxFX01VU1Rf Q0hFQ0s9eQpDT05GSUdfRlJBTUVfV0FSTj0yMDQ4CkNPTkZJR19NQUdJQ19TWVNSUT15CkNPTkZJ R19TVFJJUF9BU01fU1lNUz15CkNPTkZJR19VTlVTRURfU1lNQk9MUz15CkNPTkZJR19ERUJVR19G Uz15CkNPTkZJR19IRUFERVJTX0NIRUNLPXkKIyBDT05GSUdfREVCVUdfU0VDVElPTl9NSVNNQVRD SCBpcyBub3Qgc2V0CkNPTkZJR19ERUJVR19LRVJORUw9eQojIENPTkZJR19ERUJVR19TSElSUSBp cyBub3Qgc2V0CkNPTkZJR19MT0NLVVBfREVURUNUT1I9eQpDT05GSUdfSEFSRExPQ0tVUF9ERVRF Q1RPUj15CiMgQ09ORklHX0JPT1RQQVJBTV9IQVJETE9DS1VQX1BBTklDIGlzIG5vdCBzZXQKQ09O RklHX0JPT1RQQVJBTV9IQVJETE9DS1VQX1BBTklDX1ZBTFVFPTAKIyBDT05GSUdfQk9PVFBBUkFN X1NPRlRMT0NLVVBfUEFOSUMgaXMgbm90IHNldApDT05GSUdfQk9PVFBBUkFNX1NPRlRMT0NLVVBf UEFOSUNfVkFMVUU9MApDT05GSUdfREVURUNUX0hVTkdfVEFTSz15CkNPTkZJR19ERUZBVUxUX0hV TkdfVEFTS19USU1FT1VUPTAKIyBDT05GSUdfQk9PVFBBUkFNX0hVTkdfVEFTS19QQU5JQyBpcyBu b3Qgc2V0CkNPTkZJR19CT09UUEFSQU1fSFVOR19UQVNLX1BBTklDX1ZBTFVFPTAKQ09ORklHX1ND SEVEX0RFQlVHPXkKQ09ORklHX1NDSEVEU1RBVFM9eQpDT05GSUdfVElNRVJfU1RBVFM9eQojIENP TkZJR19ERUJVR19PQkpFQ1RTIGlzIG5vdCBzZXQKQ09ORklHX0RFQlVHX1NMQUI9eQpDT05GSUdf REVCVUdfU0xBQl9MRUFLPXkKQ09ORklHX0RFQlVHX0tNRU1MRUFLPXkKQ09ORklHX0RFQlVHX0tN RU1MRUFLX0VBUkxZX0xPR19TSVpFPTQwMAojIENPTkZJR19ERUJVR19LTUVNTEVBS19URVNUIGlz IG5vdCBzZXQKIyBDT05GSUdfREVCVUdfS01FTUxFQUtfREVGQVVMVF9PRkYgaXMgbm90IHNldAoj IENPTkZJR19ERUJVR19SVF9NVVRFWEVTIGlzIG5vdCBzZXQKIyBDT05GSUdfUlRfTVVURVhfVEVT VEVSIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfU1BJTkxPQ0sgaXMgbm90IHNldAojIENPTkZJ R19ERUJVR19NVVRFWEVTIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfTE9DS19BTExPQyBpcyBu b3Qgc2V0CiMgQ09ORklHX1BST1ZFX0xPQ0tJTkcgaXMgbm90IHNldAojIENPTkZJR19TUEFSU0Vf UkNVX1BPSU5URVIgaXMgbm90IHNldAojIENPTkZJR19MT0NLX1NUQVQgaXMgbm90IHNldAojIENP TkZJR19ERUJVR19BVE9NSUNfU0xFRVAgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19MT0NLSU5H X0FQSV9TRUxGVEVTVFMgaXMgbm90IHNldApDT05GSUdfU1RBQ0tUUkFDRT15CiMgQ09ORklHX0RF QlVHX1NUQUNLX1VTQUdFIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfS09CSkVDVCBpcyBub3Qg c2V0CkNPTkZJR19ERUJVR19CVUdWRVJCT1NFPXkKIyBDT05GSUdfREVCVUdfSU5GTyBpcyBub3Qg c2V0CiMgQ09ORklHX0RFQlVHX1ZNIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfVklSVFVBTCBp cyBub3Qgc2V0CiMgQ09ORklHX0RFQlVHX1dSSVRFQ09VTlQgaXMgbm90IHNldApDT05GSUdfREVC VUdfTUVNT1JZX0lOSVQ9eQpDT05GSUdfREVCVUdfTElTVD15CiMgQ09ORklHX1RFU1RfTElTVF9T T1JUIGlzIG5vdCBzZXQKIyBDT05GSUdfREVCVUdfU0cgaXMgbm90IHNldAojIENPTkZJR19ERUJV R19OT1RJRklFUlMgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19DUkVERU5USUFMUyBpcyBub3Qg c2V0CkNPTkZJR19BUkNIX1dBTlRfRlJBTUVfUE9JTlRFUlM9eQpDT05GSUdfRlJBTUVfUE9JTlRF Uj15CiMgQ09ORklHX0JPT1RfUFJJTlRLX0RFTEFZIGlzIG5vdCBzZXQKIyBDT05GSUdfUkNVX1RP UlRVUkVfVEVTVCBpcyBub3Qgc2V0CkNPTkZJR19SQ1VfQ1BVX1NUQUxMX1RJTUVPVVQ9NjAKIyBD T05GSUdfUkNVX0NQVV9TVEFMTF9JTkZPIGlzIG5vdCBzZXQKIyBDT05GSUdfUkNVX1RSQUNFIGlz IG5vdCBzZXQKIyBDT05GSUdfS1BST0JFU19TQU5JVFlfVEVTVCBpcyBub3Qgc2V0CiMgQ09ORklH X0JBQ0tUUkFDRV9TRUxGX1RFU1QgaXMgbm90IHNldAojIENPTkZJR19ERUJVR19CTE9DS19FWFRf REVWVCBpcyBub3Qgc2V0CkNPTkZJR19ERUJVR19GT1JDRV9XRUFLX1BFUl9DUFU9eQojIENPTkZJ R19ERUJVR19QRVJfQ1BVX01BUFMgaXMgbm90IHNldApDT05GSUdfTEtEVE09bQojIENPTkZJR19D UFVfTk9USUZJRVJfRVJST1JfSU5KRUNUIGlzIG5vdCBzZXQKIyBDT05GSUdfRkFVTFRfSU5KRUNU SU9OIGlzIG5vdCBzZXQKQ09ORklHX0xBVEVOQ1lUT1A9eQpDT05GSUdfREVCVUdfUEFHRUFMTE9D PXkKQ09ORklHX1dBTlRfUEFHRV9ERUJVR19GTEFHUz15CkNPTkZJR19QQUdFX0dVQVJEPXkKQ09O RklHX1VTRVJfU1RBQ0tUUkFDRV9TVVBQT1JUPXkKQ09ORklHX05PUF9UUkFDRVI9eQpDT05GSUdf SEFWRV9GVU5DVElPTl9UUkFDRVI9eQpDT05GSUdfSEFWRV9GVU5DVElPTl9HUkFQSF9UUkFDRVI9 eQpDT05GSUdfSEFWRV9GVU5DVElPTl9HUkFQSF9GUF9URVNUPXkKQ09ORklHX0hBVkVfRlVOQ1RJ T05fVFJBQ0VfTUNPVU5UX1RFU1Q9eQpDT05GSUdfSEFWRV9EWU5BTUlDX0ZUUkFDRT15CkNPTkZJ R19IQVZFX0ZUUkFDRV9NQ09VTlRfUkVDT1JEPXkKQ09ORklHX0hBVkVfU1lTQ0FMTF9UUkFDRVBP SU5UUz15CkNPTkZJR19IQVZFX0NfUkVDT1JETUNPVU5UPXkKQ09ORklHX1JJTkdfQlVGRkVSPXkK Q09ORklHX0VWRU5UX1RSQUNJTkc9eQpDT05GSUdfRVZFTlRfUE9XRVJfVFJBQ0lOR19ERVBSRUNB VEVEPXkKQ09ORklHX0NPTlRFWFRfU1dJVENIX1RSQUNFUj15CkNPTkZJR19SSU5HX0JVRkZFUl9B TExPV19TV0FQPXkKQ09ORklHX1RSQUNJTkc9eQpDT05GSUdfR0VORVJJQ19UUkFDRVI9eQpDT05G SUdfVFJBQ0lOR19TVVBQT1JUPXkKQ09ORklHX0ZUUkFDRT15CiMgQ09ORklHX0ZVTkNUSU9OX1RS QUNFUiBpcyBub3Qgc2V0CiMgQ09ORklHX0lSUVNPRkZfVFJBQ0VSIGlzIG5vdCBzZXQKIyBDT05G SUdfU0NIRURfVFJBQ0VSIGlzIG5vdCBzZXQKIyBDT05GSUdfRlRSQUNFX1NZU0NBTExTIGlzIG5v dCBzZXQKQ09ORklHX0JSQU5DSF9QUk9GSUxFX05PTkU9eQojIENPTkZJR19QUk9GSUxFX0FOTk9U QVRFRF9CUkFOQ0hFUyBpcyBub3Qgc2V0CiMgQ09ORklHX1BST0ZJTEVfQUxMX0JSQU5DSEVTIGlz IG5vdCBzZXQKIyBDT05GSUdfU1RBQ0tfVFJBQ0VSIGlzIG5vdCBzZXQKQ09ORklHX0JMS19ERVZf SU9fVFJBQ0U9eQpDT05GSUdfS1BST0JFX0VWRU5UPXkKIyBDT05GSUdfRlRSQUNFX1NUQVJUVVBf VEVTVCBpcyBub3Qgc2V0CiMgQ09ORklHX01NSU9UUkFDRSBpcyBub3Qgc2V0CkNPTkZJR19SSU5H X0JVRkZFUl9CRU5DSE1BUks9bQpDT05GSUdfUFJPVklERV9PSENJMTM5NF9ETUFfSU5JVD15CkNP TkZJR19GSVJFV0lSRV9PSENJX1JFTU9URV9ETUE9eQpDT05GSUdfQlVJTERfRE9DU1JDPXkKQ09O RklHX0RZTkFNSUNfREVCVUc9eQojIENPTkZJR19ETUFfQVBJX0RFQlVHIGlzIG5vdCBzZXQKIyBD T05GSUdfQVRPTUlDNjRfU0VMRlRFU1QgaXMgbm90IHNldApDT05GSUdfQVNZTkNfUkFJRDZfVEVT VD1tCiMgQ09ORklHX1NBTVBMRVMgaXMgbm90IHNldApDT05GSUdfSEFWRV9BUkNIX0tHREI9eQoj IENPTkZJR19LR0RCIGlzIG5vdCBzZXQKQ09ORklHX0hBVkVfQVJDSF9LTUVNQ0hFQ0s9eQojIENP TkZJR19LTUVNQ0hFQ0sgaXMgbm90IHNldAojIENPTkZJR19URVNUX0tTVFJUT1ggaXMgbm90IHNl dAojIENPTkZJR19TVFJJQ1RfREVWTUVNIGlzIG5vdCBzZXQKQ09ORklHX1g4Nl9WRVJCT1NFX0JP T1RVUD15CkNPTkZJR19FQVJMWV9QUklOVEs9eQpDT05GSUdfRUFSTFlfUFJJTlRLX0RCR1A9eQpD T05GSUdfREVCVUdfU1RBQ0tPVkVSRkxPVz15CiMgQ09ORklHX1g4Nl9QVERVTVAgaXMgbm90IHNl dApDT05GSUdfREVCVUdfUk9EQVRBPXkKIyBDT05GSUdfREVCVUdfUk9EQVRBX1RFU1QgaXMgbm90 IHNldAojIENPTkZJR19ERUJVR19TRVRfTU9EVUxFX1JPTlggaXMgbm90IHNldAojIENPTkZJR19E RUJVR19OWF9URVNUIGlzIG5vdCBzZXQKIyBDT05GSUdfSU9NTVVfREVCVUcgaXMgbm90IHNldAoj IENPTkZJR19JT01NVV9TVFJFU1MgaXMgbm90IHNldApDT05GSUdfSEFWRV9NTUlPVFJBQ0VfU1VQ UE9SVD15CiMgQ09ORklHX1g4Nl9ERUNPREVSX1NFTEZURVNUIGlzIG5vdCBzZXQKQ09ORklHX0lP X0RFTEFZX1RZUEVfMFg4MD0wCkNPTkZJR19JT19ERUxBWV9UWVBFXzBYRUQ9MQpDT05GSUdfSU9f REVMQVlfVFlQRV9VREVMQVk9MgpDT05GSUdfSU9fREVMQVlfVFlQRV9OT05FPTMKQ09ORklHX0lP X0RFTEFZXzBYODA9eQojIENPTkZJR19JT19ERUxBWV8wWEVEIGlzIG5vdCBzZXQKIyBDT05GSUdf SU9fREVMQVlfVURFTEFZIGlzIG5vdCBzZXQKIyBDT05GSUdfSU9fREVMQVlfTk9ORSBpcyBub3Qg c2V0CkNPTkZJR19ERUZBVUxUX0lPX0RFTEFZX1RZUEU9MAojIENPTkZJR19ERUJVR19CT09UX1BB UkFNUyBpcyBub3Qgc2V0CiMgQ09ORklHX0NQQV9ERUJVRyBpcyBub3Qgc2V0CkNPTkZJR19PUFRJ TUlaRV9JTkxJTklORz15CiMgQ09ORklHX0RFQlVHX1NUUklDVF9VU0VSX0NPUFlfQ0hFQ0tTIGlz IG5vdCBzZXQKIyBDT05GSUdfREVCVUdfTk1JX1NFTEZURVNUIGlzIG5vdCBzZXQKCiMKIyBTZWN1 cml0eSBvcHRpb25zCiMKQ09ORklHX0tFWVM9eQpDT05GSUdfVFJVU1RFRF9LRVlTPW0KQ09ORklH X0VOQ1JZUFRFRF9LRVlTPW0KIyBDT05GSUdfS0VZU19ERUJVR19QUk9DX0tFWVMgaXMgbm90IHNl dAojIENPTkZJR19TRUNVUklUWV9ETUVTR19SRVNUUklDVCBpcyBub3Qgc2V0CiMgQ09ORklHX1NF Q1VSSVRZIGlzIG5vdCBzZXQKQ09ORklHX1NFQ1VSSVRZRlM9eQpDT05GSUdfSU5URUxfVFhUPXkK Q09ORklHX0RFRkFVTFRfU0VDVVJJVFlfREFDPXkKQ09ORklHX0RFRkFVTFRfU0VDVVJJVFk9IiIK Q09ORklHX1hPUl9CTE9DS1M9bQpDT05GSUdfQVNZTkNfQ09SRT1tCkNPTkZJR19BU1lOQ19NRU1D UFk9bQpDT05GSUdfQVNZTkNfWE9SPW0KQ09ORklHX0FTWU5DX1BRPW0KQ09ORklHX0FTWU5DX1JB SUQ2X1JFQ09WPW0KQ09ORklHX0FTWU5DX1RYX0RJU0FCTEVfUFFfVkFMX0RNQT15CkNPTkZJR19B U1lOQ19UWF9ESVNBQkxFX1hPUl9WQUxfRE1BPXkKQ09ORklHX0NSWVBUTz15CgojCiMgQ3J5cHRv IGNvcmUgb3IgaGVscGVyCiMKQ09ORklHX0NSWVBUT19BTEdBUEk9eQpDT05GSUdfQ1JZUFRPX0FM R0FQSTI9eQpDT05GSUdfQ1JZUFRPX0FFQUQ9bQpDT05GSUdfQ1JZUFRPX0FFQUQyPXkKQ09ORklH X0NSWVBUT19CTEtDSVBIRVI9bQpDT05GSUdfQ1JZUFRPX0JMS0NJUEhFUjI9eQpDT05GSUdfQ1JZ UFRPX0hBU0g9eQpDT05GSUdfQ1JZUFRPX0hBU0gyPXkKQ09ORklHX0NSWVBUT19STkc9bQpDT05G SUdfQ1JZUFRPX1JORzI9eQpDT05GSUdfQ1JZUFRPX1BDT01QPW0KQ09ORklHX0NSWVBUT19QQ09N UDI9eQpDT05GSUdfQ1JZUFRPX01BTkFHRVI9eQpDT05GSUdfQ1JZUFRPX01BTkFHRVIyPXkKQ09O RklHX0NSWVBUT19VU0VSPW0KQ09ORklHX0NSWVBUT19NQU5BR0VSX0RJU0FCTEVfVEVTVFM9eQpD T05GSUdfQ1JZUFRPX0dGMTI4TVVMPW0KQ09ORklHX0NSWVBUT19OVUxMPW0KQ09ORklHX0NSWVBU T19QQ1JZUFQ9bQpDT05GSUdfQ1JZUFRPX1dPUktRVUVVRT15CkNPTkZJR19DUllQVE9fQ1JZUFRE PW0KQ09ORklHX0NSWVBUT19BVVRIRU5DPW0KQ09ORklHX0NSWVBUT19URVNUPW0KCiMKIyBBdXRo ZW50aWNhdGVkIEVuY3J5cHRpb24gd2l0aCBBc3NvY2lhdGVkIERhdGEKIwpDT05GSUdfQ1JZUFRP X0NDTT1tCkNPTkZJR19DUllQVE9fR0NNPW0KQ09ORklHX0NSWVBUT19TRVFJVj1tCgojCiMgQmxv Y2sgbW9kZXMKIwpDT05GSUdfQ1JZUFRPX0NCQz1tCkNPTkZJR19DUllQVE9fQ1RSPW0KQ09ORklH X0NSWVBUT19DVFM9bQpDT05GSUdfQ1JZUFRPX0VDQj1tCkNPTkZJR19DUllQVE9fTFJXPW0KQ09O RklHX0NSWVBUT19QQ0JDPW0KQ09ORklHX0NSWVBUT19YVFM9bQoKIwojIEhhc2ggbW9kZXMKIwpD T05GSUdfQ1JZUFRPX0hNQUM9eQpDT05GSUdfQ1JZUFRPX1hDQkM9bQpDT05GSUdfQ1JZUFRPX1ZN QUM9bQoKIwojIERpZ2VzdAojCkNPTkZJR19DUllQVE9fQ1JDMzJDPW0KQ09ORklHX0NSWVBUT19D UkMzMkNfSU5URUw9bQpDT05GSUdfQ1JZUFRPX0dIQVNIPW0KQ09ORklHX0NSWVBUT19NRDQ9bQpD T05GSUdfQ1JZUFRPX01ENT1tCkNPTkZJR19DUllQVE9fTUlDSEFFTF9NSUM9bQpDT05GSUdfQ1JZ UFRPX1JNRDEyOD1tCkNPTkZJR19DUllQVE9fUk1EMTYwPW0KQ09ORklHX0NSWVBUT19STUQyNTY9 bQpDT05GSUdfQ1JZUFRPX1JNRDMyMD1tCkNPTkZJR19DUllQVE9fU0hBMT1tCkNPTkZJR19DUllQ VE9fU0hBMV9TU1NFMz1tCkNPTkZJR19DUllQVE9fU0hBMjU2PW0KQ09ORklHX0NSWVBUT19TSEE1 MTI9bQpDT05GSUdfQ1JZUFRPX1RHUjE5Mj1tCkNPTkZJR19DUllQVE9fV1A1MTI9bQpDT05GSUdf Q1JZUFRPX0dIQVNIX0NMTVVMX05JX0lOVEVMPW0KCiMKIyBDaXBoZXJzCiMKQ09ORklHX0NSWVBU T19BRVM9bQpDT05GSUdfQ1JZUFRPX0FFU19YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0FFU19OSV9J TlRFTD1tCkNPTkZJR19DUllQVE9fQU5VQklTPW0KQ09ORklHX0NSWVBUT19BUkM0PW0KQ09ORklH X0NSWVBUT19CTE9XRklTSD1tCkNPTkZJR19DUllQVE9fQkxPV0ZJU0hfQ09NTU9OPW0KQ09ORklH X0NSWVBUT19CTE9XRklTSF9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0NBTUVMTElBPW0KQ09ORklH X0NSWVBUT19DQU1FTExJQV9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX0NBU1Q1PW0KQ09ORklHX0NS WVBUT19DQVNUNj1tCkNPTkZJR19DUllQVE9fREVTPW0KQ09ORklHX0NSWVBUT19GQ1JZUFQ9bQpD T05GSUdfQ1JZUFRPX0tIQVpBRD1tCkNPTkZJR19DUllQVE9fU0FMU0EyMD1tCkNPTkZJR19DUllQ VE9fU0FMU0EyMF9YODZfNjQ9bQpDT05GSUdfQ1JZUFRPX1NFRUQ9bQpDT05GSUdfQ1JZUFRPX1NF UlBFTlQ9bQpDT05GSUdfQ1JZUFRPX1NFUlBFTlRfU1NFMl9YODZfNjQ9bQpDT05GSUdfQ1JZUFRP X1RFQT1tCiMgQ09ORklHX0NSWVBUT19UV09GSVNIIGlzIG5vdCBzZXQKQ09ORklHX0NSWVBUT19U V09GSVNIX0NPTU1PTj1tCkNPTkZJR19DUllQVE9fVFdPRklTSF9YODZfNjQ9bQpDT05GSUdfQ1JZ UFRPX1RXT0ZJU0hfWDg2XzY0XzNXQVk9bQoKIwojIENvbXByZXNzaW9uCiMKQ09ORklHX0NSWVBU T19ERUZMQVRFPW0KQ09ORklHX0NSWVBUT19aTElCPW0KQ09ORklHX0NSWVBUT19MWk89bQoKIwoj IFJhbmRvbSBOdW1iZXIgR2VuZXJhdGlvbgojCkNPTkZJR19DUllQVE9fQU5TSV9DUFJORz1tCiMg Q09ORklHX0NSWVBUT19VU0VSX0FQSV9IQVNIIGlzIG5vdCBzZXQKIyBDT05GSUdfQ1JZUFRPX1VT RVJfQVBJX1NLQ0lQSEVSIGlzIG5vdCBzZXQKQ09ORklHX0NSWVBUT19IVz15CkNPTkZJR19DUllQ VE9fREVWX1BBRExPQ0s9bQpDT05GSUdfQ1JZUFRPX0RFVl9QQURMT0NLX0FFUz1tCkNPTkZJR19D UllQVE9fREVWX1BBRExPQ0tfU0hBPW0KQ09ORklHX0hBVkVfS1ZNPXkKQ09ORklHX1ZJUlRVQUxJ WkFUSU9OPXkKIyBDT05GSUdfS1ZNIGlzIG5vdCBzZXQKIyBDT05GSUdfVkhPU1RfTkVUIGlzIG5v dCBzZXQKQ09ORklHX0JJTkFSWV9QUklOVEY9eQoKIwojIExpYnJhcnkgcm91dGluZXMKIwpDT05G SUdfUkFJRDZfUFE9bQpDT05GSUdfQklUUkVWRVJTRT15CkNPTkZJR19HRU5FUklDX0ZJTkRfRklS U1RfQklUPXkKQ09ORklHX0dFTkVSSUNfUENJX0lPTUFQPXkKQ09ORklHX0dFTkVSSUNfSU9NQVA9 eQpDT05GSUdfR0VORVJJQ19JTz15CkNPTkZJR19DUkNfQ0NJVFQ9bQpDT05GSUdfQ1JDMTY9bQpD T05GSUdfQ1JDX1QxMERJRj15CkNPTkZJR19DUkNfSVRVX1Q9bQpDT05GSUdfQ1JDMzI9eQojIENP TkZJR19DUkMzMl9TRUxGVEVTVCBpcyBub3Qgc2V0CkNPTkZJR19DUkMzMl9TTElDRUJZOD15CiMg Q09ORklHX0NSQzMyX1NMSUNFQlk0IGlzIG5vdCBzZXQKIyBDT05GSUdfQ1JDMzJfU0FSV0FURSBp cyBub3Qgc2V0CiMgQ09ORklHX0NSQzMyX0JJVCBpcyBub3Qgc2V0CkNPTkZJR19DUkM3PW0KQ09O RklHX0xJQkNSQzMyQz1tCkNPTkZJR19DUkM4PW0KQ09ORklHX1pMSUJfSU5GTEFURT15CkNPTkZJ R19aTElCX0RFRkxBVEU9bQpDT05GSUdfTFpPX0NPTVBSRVNTPXkKQ09ORklHX0xaT19ERUNPTVBS RVNTPXkKQ09ORklHX1haX0RFQz15CkNPTkZJR19YWl9ERUNfWDg2PXkKQ09ORklHX1haX0RFQ19Q T1dFUlBDPXkKQ09ORklHX1haX0RFQ19JQTY0PXkKQ09ORklHX1haX0RFQ19BUk09eQpDT05GSUdf WFpfREVDX0FSTVRIVU1CPXkKQ09ORklHX1haX0RFQ19TUEFSQz15CkNPTkZJR19YWl9ERUNfQkNK PXkKIyBDT05GSUdfWFpfREVDX1RFU1QgaXMgbm90IHNldApDT05GSUdfREVDT01QUkVTU19HWklQ PXkKQ09ORklHX0RFQ09NUFJFU1NfQlpJUDI9eQpDT05GSUdfREVDT01QUkVTU19MWk1BPXkKQ09O RklHX0RFQ09NUFJFU1NfWFo9eQpDT05GSUdfREVDT01QUkVTU19MWk89eQpDT05GSUdfR0VORVJJ Q19BTExPQ0FUT1I9eQpDT05GSUdfUkVFRF9TT0xPTU9OPW0KQ09ORklHX1JFRURfU09MT01PTl9E RUMxNj15CkNPTkZJR19CQ0g9bQpDT05GSUdfQkNIX0NPTlNUX1BBUkFNUz15CkNPTkZJR19URVhU U0VBUkNIPXkKQ09ORklHX1RFWFRTRUFSQ0hfS01QPW0KQ09ORklHX1RFWFRTRUFSQ0hfQk09bQpD T05GSUdfVEVYVFNFQVJDSF9GU009bQpDT05GSUdfQlRSRUU9eQpDT05GSUdfSEFTX0lPTUVNPXkK Q09ORklHX0hBU19JT1BPUlQ9eQpDT05GSUdfSEFTX0RNQT15CkNPTkZJR19DSEVDS19TSUdOQVRV UkU9eQpDT05GSUdfQ1BVX1JNQVA9eQpDT05GSUdfRFFMPXkKQ09ORklHX05MQVRUUj15CkNPTkZJ R19MUlVfQ0FDSEU9bQpDT05GSUdfQVZFUkFHRT15CkNPTkZJR19DT1JESUM9bQo= --bcaec517a674432cc304ce37f3ed Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --bcaec517a674432cc304ce37f3ed-- From xen-devel-bounces@lists.xen.org Sun Nov 11 15:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 15:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXZaG-0000bv-M8; Sun, 11 Nov 2012 15:36:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXZaF-0000bq-Mc for xen-devel@lists.xen.org; Sun, 11 Nov 2012 15:36:27 +0000 Received: from [193.109.254.147:5924] by server-11.bemta-14.messagelabs.com id 67/59-29027-AF5CF905; Sun, 11 Nov 2012 15:36:26 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-4.tower-27.messagelabs.com!1352648185!8665272!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4256 invoked from network); 11 Nov 2012 15:36:26 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-4.tower-27.messagelabs.com with SMTP; 11 Nov 2012 15:36:26 -0000 Received: from [10.8.202.201] (dhcp-vlan3039-14-233.wireless.uic.edu [128.248.17.233]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id A70AF1F010F; Sun, 11 Nov 2012 09:36:22 -0600 (CST) Message-ID: <509FC5F6.4050506@cs.uic.edu> Date: Sun, 11 Nov 2012 09:36:22 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> <20121110135218.GA5436@type> In-Reply-To: <20121110135218.GA5436@type> Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Samuel, Thanks for the reply. On 11/10/2012 07:52 AM, Samuel Thibault wrote: > You can simply run it, giving it a blk dev (or also a fb dev), it will > run app_main(), which keeps reading stuff, and draws squares on the fb. > > Ideally you should manage to trigger fixups, by stuffing a wait loop in > the critical section. I'll try this in the following week. Thank you for pointing it out. >> A follow-up question is that given this fix, do you still need >> hypercall iret? > Actually it's worse than that, see below. > >> + movq %rbx,5*8(%rsp) > ... >> + >> + # check against re-entrance >> + movq RIP(%rsp),%rbx >> + cmpq $scrit,%rbx >> + jb 10f >> + cmpq $ecrit,%rbx >> + jb critical_region_fixup >> + >> +10: movq RBX(%rsp),%rbx # restore rbx > Do we really need to restore %rbx? I don't think do_hypervisor_callback > uses it. No I don't think so. I was just being pre-cautious. :-) >> + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + (__HYPERVISOR_iret * 32) > Here we would also need a fixup table for the code at hypercall_page! Nice catch! > A nicer fix would be to inline the hypercall code here. That said, I > have to say I don't know any detail about the NMI flag, I don't see it > defined in the Intel manual, and I don't see it being set in the Xen > hypervisor. Unless somebody knows more about it, I would assume that it > currently never happens, and simply stuff a > > ud2 /* TODO: fix re-entrance fixup for hypercall in NMI case (when does that happen actually?) */ > > before the jmp, to catch it if it ever does happen. I don't know that either. I tried to rise guest domain an NMI with "xl trigger", but it seems that only works for HVM hosts. > > Also, it would be good to check against critical section size change, in > case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. > For instance, stuff right after the table: > > .if (ecrit-scrit) != (critical_fixup_table_end - critical_fixup_table) > .error "The critical has changed, the fixup table needs updating" > .endif Totally agree. And it somewhat saves the obligation of checking if the table size matches the one of critical section by looking at disassemble output. :-) > > More generally, some cleanup could go along the patch, but I'd say > keep it as you have done, focused on only the fixup code, to have it > as such in the repository history, and then we could clean some things > afterwards. > > Samuel > I really appreciate your feedback. Thanks again, Samuel! Xu _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 15:37:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 15:37:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXZaG-0000bv-M8; Sun, 11 Nov 2012 15:36:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXZaF-0000bq-Mc for xen-devel@lists.xen.org; Sun, 11 Nov 2012 15:36:27 +0000 Received: from [193.109.254.147:5924] by server-11.bemta-14.messagelabs.com id 67/59-29027-AF5CF905; Sun, 11 Nov 2012 15:36:26 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-4.tower-27.messagelabs.com!1352648185!8665272!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4256 invoked from network); 11 Nov 2012 15:36:26 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-4.tower-27.messagelabs.com with SMTP; 11 Nov 2012 15:36:26 -0000 Received: from [10.8.202.201] (dhcp-vlan3039-14-233.wireless.uic.edu [128.248.17.233]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id A70AF1F010F; Sun, 11 Nov 2012 09:36:22 -0600 (CST) Message-ID: <509FC5F6.4050506@cs.uic.edu> Date: Sun, 11 Nov 2012 09:36:22 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> <20121110135218.GA5436@type> In-Reply-To: <20121110135218.GA5436@type> Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Samuel, Thanks for the reply. On 11/10/2012 07:52 AM, Samuel Thibault wrote: > You can simply run it, giving it a blk dev (or also a fb dev), it will > run app_main(), which keeps reading stuff, and draws squares on the fb. > > Ideally you should manage to trigger fixups, by stuffing a wait loop in > the critical section. I'll try this in the following week. Thank you for pointing it out. >> A follow-up question is that given this fix, do you still need >> hypercall iret? > Actually it's worse than that, see below. > >> + movq %rbx,5*8(%rsp) > ... >> + >> + # check against re-entrance >> + movq RIP(%rsp),%rbx >> + cmpq $scrit,%rbx >> + jb 10f >> + cmpq $ecrit,%rbx >> + jb critical_region_fixup >> + >> +10: movq RBX(%rsp),%rbx # restore rbx > Do we really need to restore %rbx? I don't think do_hypervisor_callback > uses it. No I don't think so. I was just being pre-cautious. :-) >> + .byte 0x78,0x78,0x78,0x78,0x78 # jmp hypercall_page + (__HYPERVISOR_iret * 32) > Here we would also need a fixup table for the code at hypercall_page! Nice catch! > A nicer fix would be to inline the hypercall code here. That said, I > have to say I don't know any detail about the NMI flag, I don't see it > defined in the Intel manual, and I don't see it being set in the Xen > hypervisor. Unless somebody knows more about it, I would assume that it > currently never happens, and simply stuff a > > ud2 /* TODO: fix re-entrance fixup for hypercall in NMI case (when does that happen actually?) */ > > before the jmp, to catch it if it ever does happen. I don't know that either. I tried to rise guest domain an NMI with "xl trigger", but it seems that only works for HVM hosts. > > Also, it would be good to check against critical section size change, in > case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. > For instance, stuff right after the table: > > .if (ecrit-scrit) != (critical_fixup_table_end - critical_fixup_table) > .error "The critical has changed, the fixup table needs updating" > .endif Totally agree. And it somewhat saves the obligation of checking if the table size matches the one of critical section by looking at disassemble output. :-) > > More generally, some cleanup could go along the patch, but I'd say > keep it as you have done, focused on only the fixup code, to have it > as such in the repository history, and then we could clean some things > afterwards. > > Samuel > I really appreciate your feedback. Thanks again, Samuel! Xu _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Sun Nov 11 23:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 23:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXh3y-0002rX-Bu; Sun, 11 Nov 2012 23:35:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXh3w-0002rS-FZ for xen-devel@lists.xen.org; Sun, 11 Nov 2012 23:35:36 +0000 Received: from [85.158.137.99:60456] by server-16.bemta-3.messagelabs.com id A6/9A-07461-74630A05; Sun, 11 Nov 2012 23:35:35 +0000 X-Env-Sender: sunds@peapod.net X-Msg-Ref: server-11.tower-217.messagelabs.com!1352676934!17784270!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG, HTML_50_60,HTML_MESSAGE,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17218 invoked from network); 11 Nov 2012 23:35:34 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 23:35:34 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1285520bkc.32 for ; Sun, 11 Nov 2012 15:35:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=WNKDpiZSor66YOWeX6lFmFnU7/iIM+mcAR0K67pBH4s=; b=SM586JyNW4uEQyRyVlpBf1Cwmo2M+E5S1TRZ48+0kpDz/3xWcdBLSkHuoqJbWbWFPE rVeifpY2jc/QaczgPp+XwzMRt6I2f88mMAMHpG92zmA1DrG5jWvd6nOdk8Uy7ygwzwcG tIrZx9GcIykoZuasxnR0349CnN4J4edCj6R2bRNni/qMnHCFLwzGf3oD/k0Gc9Wyjybn 2podhHvF8vX/6XUPiebszEyMzxFvOk2J9uvYJssdkMfVzeL38qpsAWHGdumpCqpmSyRF t0mK/wlZVQ9wg89s6choBjR3lPMz4d9jTfm3tD3EODTwzIReXaeFnD+Z6wc9o8OSQ4BJ L5fA== MIME-Version: 1.0 Received: by 10.204.147.25 with SMTP id j25mr1111679bkv.36.1352676933897; Sun, 11 Nov 2012 15:35:33 -0800 (PST) Received: by 10.205.81.74 with HTTP; Sun, 11 Nov 2012 15:35:33 -0800 (PST) Date: Sun, 11 Nov 2012 17:35:33 -0600 Message-ID: From: D Sundstrom To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQkAJrv3g8xYJgmaDsQCLkPgpLID67K0XMddFJR0Fn/elgrM5LXv1dlD5ikRxm+88BMAJgcE Subject: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7258340889973871494==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7258340889973871494== Content-Type: multipart/alternative; boundary=0015174c3b2c240f1e04ce40a497 --0015174c3b2c240f1e04ce40a497 Content-Type: text/plain; charset=ISO-8859-1 Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under Xen 4.1 HVM. The linux PV drivers load and all appears to be fine. I want to use the gntalloc device to allocate a page of memory from Domain A and then map that into Domain B using gntdev. Both are unprivileged domains. Using Daniel DeGraaf's test program here: http://lists.xen.org/archives/html/xen-devel/2011-01/txtzDU6iZhTkB.txt I can run the command to create a grant, but upon running the command to map the grant (from either the same domain or another DomU), the kernel immediately crashes with no diagnostic output. Should I expect to be able to map grants in a DomU allocated in another DomU? Example of running the test: $ xenstore-read domid 8 $ thetestprogram src-add return gntref, address map return index, address src-del no rv gu no rv unmap
no rv show print and change mapped items This process bumps by 4000 src-add 8 src-add mapped 1372 at 0=0 show 00(-1217044480,0): current 4000 new 0 map 8 1372 (immediately crashes the VM) Thanks, David --0015174c3b2c240f1e04ce40a497 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under= Xen 4.1 HVM.

The linux PV drivers load and all ap= pears to be fine.

I want to use the gntalloc devic= e to allocate a page of memory from Domain A and then map that into Domain = B using gntdev. =A0Both are unprivileged domains. =A0


I can run the command to create a grant, but upon runni= ng the command to map the grant (from either the same domain or another Dom= U), the kernel immediately crashes with no diagnostic output.

Should I expect to be able to map grants in a DomU allocated= in another DomU?

Example of running the test:

$ =A0xenstore-read domid
8

$ =A0thetestprogram
src-add <domid>       return gntref, addres=
s
map <domid> <ref>     return index, address
src-del <gntref>      no rv
gu <index>            no rv
unmap <address>       no rv
show                  print and change mapped items
This process bumps by 4000
src-add 8
src-add mapped 1372 at 0=3D0
show
00(-1217=
044480,0): current     4000    new    0
map 8 1372   
(immediately crashes the VM)

Thanks,
David



=A0
--0015174c3b2c240f1e04ce40a497-- --===============7258340889973871494== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7258340889973871494==-- From xen-devel-bounces@lists.xen.org Sun Nov 11 23:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 11 Nov 2012 23:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXh3y-0002rX-Bu; Sun, 11 Nov 2012 23:35:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXh3w-0002rS-FZ for xen-devel@lists.xen.org; Sun, 11 Nov 2012 23:35:36 +0000 Received: from [85.158.137.99:60456] by server-16.bemta-3.messagelabs.com id A6/9A-07461-74630A05; Sun, 11 Nov 2012 23:35:35 +0000 X-Env-Sender: sunds@peapod.net X-Msg-Ref: server-11.tower-217.messagelabs.com!1352676934!17784270!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG, HTML_50_60,HTML_MESSAGE,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17218 invoked from network); 11 Nov 2012 23:35:34 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 11 Nov 2012 23:35:34 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1285520bkc.32 for ; Sun, 11 Nov 2012 15:35:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=WNKDpiZSor66YOWeX6lFmFnU7/iIM+mcAR0K67pBH4s=; b=SM586JyNW4uEQyRyVlpBf1Cwmo2M+E5S1TRZ48+0kpDz/3xWcdBLSkHuoqJbWbWFPE rVeifpY2jc/QaczgPp+XwzMRt6I2f88mMAMHpG92zmA1DrG5jWvd6nOdk8Uy7ygwzwcG tIrZx9GcIykoZuasxnR0349CnN4J4edCj6R2bRNni/qMnHCFLwzGf3oD/k0Gc9Wyjybn 2podhHvF8vX/6XUPiebszEyMzxFvOk2J9uvYJssdkMfVzeL38qpsAWHGdumpCqpmSyRF t0mK/wlZVQ9wg89s6choBjR3lPMz4d9jTfm3tD3EODTwzIReXaeFnD+Z6wc9o8OSQ4BJ L5fA== MIME-Version: 1.0 Received: by 10.204.147.25 with SMTP id j25mr1111679bkv.36.1352676933897; Sun, 11 Nov 2012 15:35:33 -0800 (PST) Received: by 10.205.81.74 with HTTP; Sun, 11 Nov 2012 15:35:33 -0800 (PST) Date: Sun, 11 Nov 2012 17:35:33 -0600 Message-ID: From: D Sundstrom To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQkAJrv3g8xYJgmaDsQCLkPgpLID67K0XMddFJR0Fn/elgrM5LXv1dlD5ikRxm+88BMAJgcE Subject: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7258340889973871494==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7258340889973871494== Content-Type: multipart/alternative; boundary=0015174c3b2c240f1e04ce40a497 --0015174c3b2c240f1e04ce40a497 Content-Type: text/plain; charset=ISO-8859-1 Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under Xen 4.1 HVM. The linux PV drivers load and all appears to be fine. I want to use the gntalloc device to allocate a page of memory from Domain A and then map that into Domain B using gntdev. Both are unprivileged domains. Using Daniel DeGraaf's test program here: http://lists.xen.org/archives/html/xen-devel/2011-01/txtzDU6iZhTkB.txt I can run the command to create a grant, but upon running the command to map the grant (from either the same domain or another DomU), the kernel immediately crashes with no diagnostic output. Should I expect to be able to map grants in a DomU allocated in another DomU? Example of running the test: $ xenstore-read domid 8 $ thetestprogram src-add return gntref, address map return index, address src-del no rv gu no rv unmap
no rv show print and change mapped items This process bumps by 4000 src-add 8 src-add mapped 1372 at 0=0 show 00(-1217044480,0): current 4000 new 0 map 8 1372 (immediately crashes the VM) Thanks, David --0015174c3b2c240f1e04ce40a497 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under= Xen 4.1 HVM.

The linux PV drivers load and all ap= pears to be fine.

I want to use the gntalloc devic= e to allocate a page of memory from Domain A and then map that into Domain = B using gntdev. =A0Both are unprivileged domains. =A0


I can run the command to create a grant, but upon runni= ng the command to map the grant (from either the same domain or another Dom= U), the kernel immediately crashes with no diagnostic output.

Should I expect to be able to map grants in a DomU allocated= in another DomU?

Example of running the test:

$ =A0xenstore-read domid
8

$ =A0thetestprogram
src-add <domid>       return gntref, addres=
s
map <domid> <ref>     return index, address
src-del <gntref>      no rv
gu <index>            no rv
unmap <address>       no rv
show                  print and change mapped items
This process bumps by 4000
src-add 8
src-add mapped 1372 at 0=3D0
show
00(-1217=
044480,0): current     4000    new    0
map 8 1372   
(immediately crashes the VM)

Thanks,
David



=A0
--0015174c3b2c240f1e04ce40a497-- --===============7258340889973871494== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7258340889973871494==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 02:17:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 02:17:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXja1-0008Fz-2B; Mon, 12 Nov 2012 02:16:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXjZy-0008Fs-OZ for xen-devel@lists.xen.org; Mon, 12 Nov 2012 02:16:50 +0000 Received: from [85.158.143.99:7656] by server-2.bemta-4.messagelabs.com id 8A/B3-28922-11C50A05; Mon, 12 Nov 2012 02:16:49 +0000 X-Env-Sender: gabrielx.wu@intel.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1352686608!29494540!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM0MzYxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22150 invoked from network); 12 Nov 2012 02:16:49 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-15.tower-216.messagelabs.com with SMTP; 12 Nov 2012 02:16:49 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 11 Nov 2012 18:16:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,759,1344236400"; d="scan'208";a="247384423" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by fmsmga002.fm.intel.com with ESMTP; 11 Nov 2012 18:16:47 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sun, 11 Nov 2012 18:16:47 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sun, 11 Nov 2012 18:16:47 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.123]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Mon, 12 Nov 2012 10:16:45 +0800 From: "Wu, GabrielX" To: "xen-devel@lists.xen.org" Thread-Topic: VMX status report. Xen:26127 & Dom0:3.6.5 Thread-Index: AQHNwHvCL6IjRYRsCUaX4S4w8C4zoA== Date: Mon, 12 Nov 2012 02:16:44 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "Ren, Yongjie" , "Liu, RongrongX" , "Liu, SongtaoX" , "Zhou, Chao" Subject: [Xen-devel] VMX status report. Xen:26127 & Dom0:3.6.5 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, This is the test report of xen-unstable tree, no new issue found and no issue fixed. Version Info: ================================================================= xen-changeset: 26127:bd78e5630a5b Dom0: linux.git 3.6.5 ================================================================= New issue(0) ============== Fixed issue(0) ============== Old issues(9) ============== 1. [ACPI] Dom0 can't resume from S3 sleep http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1707 2. [XL]"xl vcpu-set" causes dom0 crash or panic http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1730 3. [VT-D]fail to detach NIC from guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1736 4. Sometimes Xen panic on ia32pae Sandybridge when restore guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1747 5. after detaching a VF from a guest, shutdown the guest is very slow http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1812 6. Poor performance when do guest save/restore and migration with linux 3.x dom0 http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1784 7. 'xl vcpu-set' can't decrease the vCPU number of a HVM guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1822 8. Dom0 cannot be shutdown before PCI device detachment from guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1826 9. xl pci-list shows one PCI device (PF or VF) could be assigned to two different guests http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1834 Best Regards, Ronghui Wu(Gabriel) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 02:17:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 02:17:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXja1-0008Fz-2B; Mon, 12 Nov 2012 02:16:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXjZy-0008Fs-OZ for xen-devel@lists.xen.org; Mon, 12 Nov 2012 02:16:50 +0000 Received: from [85.158.143.99:7656] by server-2.bemta-4.messagelabs.com id 8A/B3-28922-11C50A05; Mon, 12 Nov 2012 02:16:49 +0000 X-Env-Sender: gabrielx.wu@intel.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1352686608!29494540!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM0MzYxMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22150 invoked from network); 12 Nov 2012 02:16:49 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-15.tower-216.messagelabs.com with SMTP; 12 Nov 2012 02:16:49 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 11 Nov 2012 18:16:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,759,1344236400"; d="scan'208";a="247384423" Received: from fmsmsx103.amr.corp.intel.com ([10.19.9.34]) by fmsmga002.fm.intel.com with ESMTP; 11 Nov 2012 18:16:47 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX103.amr.corp.intel.com (10.19.9.34) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sun, 11 Nov 2012 18:16:47 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Sun, 11 Nov 2012 18:16:47 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.123]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Mon, 12 Nov 2012 10:16:45 +0800 From: "Wu, GabrielX" To: "xen-devel@lists.xen.org" Thread-Topic: VMX status report. Xen:26127 & Dom0:3.6.5 Thread-Index: AQHNwHvCL6IjRYRsCUaX4S4w8C4zoA== Date: Mon, 12 Nov 2012 02:16:44 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "Ren, Yongjie" , "Liu, RongrongX" , "Liu, SongtaoX" , "Zhou, Chao" Subject: [Xen-devel] VMX status report. Xen:26127 & Dom0:3.6.5 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, This is the test report of xen-unstable tree, no new issue found and no issue fixed. Version Info: ================================================================= xen-changeset: 26127:bd78e5630a5b Dom0: linux.git 3.6.5 ================================================================= New issue(0) ============== Fixed issue(0) ============== Old issues(9) ============== 1. [ACPI] Dom0 can't resume from S3 sleep http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1707 2. [XL]"xl vcpu-set" causes dom0 crash or panic http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1730 3. [VT-D]fail to detach NIC from guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1736 4. Sometimes Xen panic on ia32pae Sandybridge when restore guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1747 5. after detaching a VF from a guest, shutdown the guest is very slow http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1812 6. Poor performance when do guest save/restore and migration with linux 3.x dom0 http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1784 7. 'xl vcpu-set' can't decrease the vCPU number of a HVM guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1822 8. Dom0 cannot be shutdown before PCI device detachment from guest http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1826 9. xl pci-list shows one PCI device (PF or VF) could be assigned to two different guests http://bugzilla.xen.org/bugzilla/show_bug.cgi?id=1834 Best Regards, Ronghui Wu(Gabriel) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 03:18:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 03:18:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXkX6-0000bQ-Tu; Mon, 12 Nov 2012 03:17:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXkX5-0000bL-Ig for xen-devel@lists.xen.org; Mon, 12 Nov 2012 03:17:55 +0000 Received: from [85.158.139.83:50559] by server-6.bemta-5.messagelabs.com id 9A/EA-19321-26A60A05; Mon, 12 Nov 2012 03:17:54 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352690272!22568231!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12367 invoked from network); 12 Nov 2012 03:17:53 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 03:17:53 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so1387540pbc.32 for ; Sun, 11 Nov 2012 19:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4+ALUEsJLIY5eaoi2KMnIB6/wDBBMiTPimqBcrHu1zU=; b=HPMNQ0wgp7FBQDltvmSL2BopaosYG+iViaYKbA2gpJBEuZ4RWh876nWjTi4vtfYxr9 EW9zVR5Gy+osyx+A2zy7rUS0nkD4PZmV+v6LbJ88JHj+2kytMB6vTZsfVyc5uj9PPlVS aU9l9qxSi7VrcM/JNKkjfUSTQhtMfnHUn4pPF/a0m88YwkF3qajnc4BjrcBiaQTVO4mf v1wXtxia81gjlkIdo5tEhOobILVOc8CZ0CLe30KoZeY6qhlDXbFRpC+XcufPwApXx7bu iFDH8c8SimoQuGdEzXTDE7/o2cZAcrmJ615Xzs95zKynscGCaukMamwYNQVjvi05LlHE oHCw== Received: by 10.66.78.104 with SMTP id a8mr51430177pax.38.1352690271963; Sun, 11 Nov 2012 19:17:51 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id a10sm3506757paz.35.2012.11.11.19.17.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Nov 2012 19:17:51 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 16:17:22 +1300 Message-Id: <1352690242-28761-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Dan Magenheimer , Matthew Daley Subject: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org If the client / pool IDs given to tmemc_save_get_next_page are invalid, the calculation of pagesize will dereference NULL. Fix this by moving the calculation below the appropriate NULL check. Signed-off-by: Matthew Daley diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 1280537..ec59009 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2436,10 +2436,13 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, OID oid; int ret = 0; struct tmem_handle h; - unsigned int pagesize = 1 << (pool->pageshift+12); + unsigned int pagesize; if ( pool == NULL || is_ephemeral(pool) ) return -1; + + pagesize = 1 << (pool->pageshift + 12); + if ( bufsize < pagesize + sizeof(struct tmem_handle) ) return -ENOMEM; -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 03:18:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 03:18:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXkX6-0000bQ-Tu; Mon, 12 Nov 2012 03:17:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXkX5-0000bL-Ig for xen-devel@lists.xen.org; Mon, 12 Nov 2012 03:17:55 +0000 Received: from [85.158.139.83:50559] by server-6.bemta-5.messagelabs.com id 9A/EA-19321-26A60A05; Mon, 12 Nov 2012 03:17:54 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352690272!22568231!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12367 invoked from network); 12 Nov 2012 03:17:53 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 03:17:53 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so1387540pbc.32 for ; Sun, 11 Nov 2012 19:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4+ALUEsJLIY5eaoi2KMnIB6/wDBBMiTPimqBcrHu1zU=; b=HPMNQ0wgp7FBQDltvmSL2BopaosYG+iViaYKbA2gpJBEuZ4RWh876nWjTi4vtfYxr9 EW9zVR5Gy+osyx+A2zy7rUS0nkD4PZmV+v6LbJ88JHj+2kytMB6vTZsfVyc5uj9PPlVS aU9l9qxSi7VrcM/JNKkjfUSTQhtMfnHUn4pPF/a0m88YwkF3qajnc4BjrcBiaQTVO4mf v1wXtxia81gjlkIdo5tEhOobILVOc8CZ0CLe30KoZeY6qhlDXbFRpC+XcufPwApXx7bu iFDH8c8SimoQuGdEzXTDE7/o2cZAcrmJ615Xzs95zKynscGCaukMamwYNQVjvi05LlHE oHCw== Received: by 10.66.78.104 with SMTP id a8mr51430177pax.38.1352690271963; Sun, 11 Nov 2012 19:17:51 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id a10sm3506757paz.35.2012.11.11.19.17.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Nov 2012 19:17:51 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 16:17:22 +1300 Message-Id: <1352690242-28761-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Dan Magenheimer , Matthew Daley Subject: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org If the client / pool IDs given to tmemc_save_get_next_page are invalid, the calculation of pagesize will dereference NULL. Fix this by moving the calculation below the appropriate NULL check. Signed-off-by: Matthew Daley diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 1280537..ec59009 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2436,10 +2436,13 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, OID oid; int ret = 0; struct tmem_handle h; - unsigned int pagesize = 1 << (pool->pageshift+12); + unsigned int pagesize; if ( pool == NULL || is_ephemeral(pool) ) return -1; + + pagesize = 1 << (pool->pageshift + 12); + if ( bufsize < pagesize + sizeof(struct tmem_handle) ) return -ENOMEM; -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 06:01:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 06:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXn4s-0001Vw-T9; Mon, 12 Nov 2012 06:00:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXn4r-0001Vr-Pw for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 06:00:58 +0000 Received: from [85.158.138.51:17156] by server-13.bemta-3.messagelabs.com id 75/D9-24887-49090A05; Mon, 12 Nov 2012 06:00:52 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352700051!29534611!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3203 invoked from network); 12 Nov 2012 06:00:51 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 06:00:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,759,1344211200"; d="scan'208";a="15738255" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 06:00:42 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 06:00:41 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXn4b-0002Ll-Pq; Mon, 12 Nov 2012 06:00:41 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXn4b-0002s2-L7; Mon, 12 Nov 2012 06:00:41 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Mon, 12 Nov 2012 06:00:41 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14379: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14379 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14379/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail pass in 14378 test-amd64-amd64-win 7 windows-install fail pass in 14378 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14378 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14378 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14378 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail in 14378 like 14377 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail in 14378 never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 06:01:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 06:01:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXn4s-0001Vw-T9; Mon, 12 Nov 2012 06:00:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXn4r-0001Vr-Pw for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 06:00:58 +0000 Received: from [85.158.138.51:17156] by server-13.bemta-3.messagelabs.com id 75/D9-24887-49090A05; Mon, 12 Nov 2012 06:00:52 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352700051!29534611!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwNzk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3203 invoked from network); 12 Nov 2012 06:00:51 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 06:00:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,759,1344211200"; d="scan'208";a="15738255" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 06:00:42 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 06:00:41 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXn4b-0002Ll-Pq; Mon, 12 Nov 2012 06:00:41 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXn4b-0002s2-L7; Mon, 12 Nov 2012 06:00:41 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Mon, 12 Nov 2012 06:00:41 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14379: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14379 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14379/ Failures :-/ but no regressions. Tests which are failing intermittently (not blocking): test-amd64-amd64-xl-qemuu-win7-amd64 7 windows-install fail pass in 14378 test-amd64-amd64-win 7 windows-install fail pass in 14378 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14378 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14378 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14378 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail in 14378 like 14377 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail in 14378 never pass version targeted for testing: xen 62885b3c34c8 baseline version: xen 62885b3c34c8 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 06:33:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 06:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXnZj-0001k2-JC; Mon, 12 Nov 2012 06:32:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXnZi-0001jx-4K for xen-devel@lists.xen.org; Mon, 12 Nov 2012 06:32:50 +0000 Received: from [85.158.143.35:27184] by server-2.bemta-4.messagelabs.com id 32/B9-28922-11890A05; Mon, 12 Nov 2012 06:32:49 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352701966!13191883!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24637 invoked from network); 12 Nov 2012 06:32:48 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 06:32:48 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so1486009pbc.32 for ; Sun, 11 Nov 2012 22:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=0FyOSjeunepFRLBcDieHJ+9jukuk55iJXKcGH0eYji8=; b=gsrqAWuM+FOYX9VzpGeU/9g4R5ruDTM01n5VuxzfM9bgXfc+NNEqquS9kMcAyLcEyV WwdGOxgpYvC8GScFDQYryo/xldA3Cwits2/sPa2MVjBz9BhAhWf4oJRDw1qdTXr9dqtm nDh8Zx6SDRbQkhdBKcY0RClsTn3pB7iyIO7XzLZ9aYjeSen2yJFDrtev0uKZXwdMlhC8 B/oCNnZfIbzJ/Ex4dURa1OpoXmR0xq5BFYYHsCcPJSVcn6EKKHgj5uxE9lQOREe1Cm9+ IPhjL0KXmGCtTDRnEnLdSIEDK9fI2XmReltQJNCWAxNGtIigT1i63IaWfcJSIiWlx/53 PIHg== Received: by 10.66.84.131 with SMTP id z3mr52360099pay.34.1352701966435; Sun, 11 Nov 2012 22:32:46 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id us7sm3688803pbc.40.2012.11.11.22.32.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Nov 2012 22:32:45 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 19:33:05 +1300 Message-Id: <1352701985-3696-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] pygrub: Fix command line argument error handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org pygrub's individual config file parsers do not correctly check the amount of command line arguments given to them. In addition, the LILO config parser would report an incorrect message. Use len() to correctly check the amount of arguments, and fix the LILO error message. Signed-off-by: Matthew Daley diff --git a/tools/pygrub/src/ExtLinuxConf.py b/tools/pygrub/src/ExtLinuxConf.py index 19776a3..510099b 100644 --- a/tools/pygrub/src/ExtLinuxConf.py +++ b/tools/pygrub/src/ExtLinuxConf.py @@ -207,7 +207,7 @@ class ExtLinuxConfigFile(object): } if __name__ == "__main__": - if sys.argv < 2: + if len(sys.argv) < 2: raise RuntimeError, "Need a configuration file to read" g = ExtLinuxConfigFile(sys.argv[1]) for i in g.images: diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index c4f543d..629951f 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -454,7 +454,7 @@ class Grub2ConfigFile(_GrubConfigFile): } if __name__ == "__main__": - if sys.argv < 3: + if len(sys.argv) < 3: raise RuntimeError, "Need a grub version (\"grub\" or \"grub2\") and a grub.conf or grub.cfg to read" if sys.argv[1] == "grub": g = GrubConfigFile(sys.argv[2]) diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py index 9858ae2..2cb649f 100644 --- a/tools/pygrub/src/LiloConf.py +++ b/tools/pygrub/src/LiloConf.py @@ -169,8 +169,8 @@ class LiloConfigFile(object): } if __name__ == "__main__": - if sys.argv < 2: - raise RuntimeError, "Need a grub.conf to read" + if len(sys.argv) < 2: + raise RuntimeError, "Need a lilo.conf to read" g = LiloConfigFile(sys.argv[1]) for i in g.images: print i #, i.title, i.root, i.kernel, i.args, i.initrd -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 06:33:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 06:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXnZj-0001k2-JC; Mon, 12 Nov 2012 06:32:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXnZi-0001jx-4K for xen-devel@lists.xen.org; Mon, 12 Nov 2012 06:32:50 +0000 Received: from [85.158.143.35:27184] by server-2.bemta-4.messagelabs.com id 32/B9-28922-11890A05; Mon, 12 Nov 2012 06:32:49 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352701966!13191883!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24637 invoked from network); 12 Nov 2012 06:32:48 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 06:32:48 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so1486009pbc.32 for ; Sun, 11 Nov 2012 22:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=0FyOSjeunepFRLBcDieHJ+9jukuk55iJXKcGH0eYji8=; b=gsrqAWuM+FOYX9VzpGeU/9g4R5ruDTM01n5VuxzfM9bgXfc+NNEqquS9kMcAyLcEyV WwdGOxgpYvC8GScFDQYryo/xldA3Cwits2/sPa2MVjBz9BhAhWf4oJRDw1qdTXr9dqtm nDh8Zx6SDRbQkhdBKcY0RClsTn3pB7iyIO7XzLZ9aYjeSen2yJFDrtev0uKZXwdMlhC8 B/oCNnZfIbzJ/Ex4dURa1OpoXmR0xq5BFYYHsCcPJSVcn6EKKHgj5uxE9lQOREe1Cm9+ IPhjL0KXmGCtTDRnEnLdSIEDK9fI2XmReltQJNCWAxNGtIigT1i63IaWfcJSIiWlx/53 PIHg== Received: by 10.66.84.131 with SMTP id z3mr52360099pay.34.1352701966435; Sun, 11 Nov 2012 22:32:46 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id us7sm3688803pbc.40.2012.11.11.22.32.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Nov 2012 22:32:45 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 19:33:05 +1300 Message-Id: <1352701985-3696-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] pygrub: Fix command line argument error handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org pygrub's individual config file parsers do not correctly check the amount of command line arguments given to them. In addition, the LILO config parser would report an incorrect message. Use len() to correctly check the amount of arguments, and fix the LILO error message. Signed-off-by: Matthew Daley diff --git a/tools/pygrub/src/ExtLinuxConf.py b/tools/pygrub/src/ExtLinuxConf.py index 19776a3..510099b 100644 --- a/tools/pygrub/src/ExtLinuxConf.py +++ b/tools/pygrub/src/ExtLinuxConf.py @@ -207,7 +207,7 @@ class ExtLinuxConfigFile(object): } if __name__ == "__main__": - if sys.argv < 2: + if len(sys.argv) < 2: raise RuntimeError, "Need a configuration file to read" g = ExtLinuxConfigFile(sys.argv[1]) for i in g.images: diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index c4f543d..629951f 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -454,7 +454,7 @@ class Grub2ConfigFile(_GrubConfigFile): } if __name__ == "__main__": - if sys.argv < 3: + if len(sys.argv) < 3: raise RuntimeError, "Need a grub version (\"grub\" or \"grub2\") and a grub.conf or grub.cfg to read" if sys.argv[1] == "grub": g = GrubConfigFile(sys.argv[2]) diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py index 9858ae2..2cb649f 100644 --- a/tools/pygrub/src/LiloConf.py +++ b/tools/pygrub/src/LiloConf.py @@ -169,8 +169,8 @@ class LiloConfigFile(object): } if __name__ == "__main__": - if sys.argv < 2: - raise RuntimeError, "Need a grub.conf to read" + if len(sys.argv) < 2: + raise RuntimeError, "Need a lilo.conf to read" g = LiloConfigFile(sys.argv[1]) for i in g.images: print i #, i.title, i.root, i.kernel, i.args, i.initrd -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 08:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 08:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXpUm-0003Eg-K4; Mon, 12 Nov 2012 08:35:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXpUk-0003Eb-RQ for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 08:35:51 +0000 Received: from [85.158.143.35:18414] by server-2.bemta-4.messagelabs.com id 23/A6-28922-6E4B0A05; Mon, 12 Nov 2012 08:35:50 +0000 X-Env-Sender: kgrace.liu@gmail.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352709347!14508349!1 X-Originating-IP: [209.85.219.43] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20337 invoked from network); 12 Nov 2012 08:35:48 -0000 Received: from mail-oa0-f43.google.com (HELO mail-oa0-f43.google.com) (209.85.219.43) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 08:35:48 -0000 Received: by mail-oa0-f43.google.com with SMTP id k1so7678203oag.30 for ; Mon, 12 Nov 2012 00:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=/QSgRehMviWLXaHq7AgEWYaE42eCsKlSljMEVUhJouI=; b=cp7c3mF2ijTQgkUjEdPyWf+LxHl1USBNgQJooANdJXt5mA3bb/AzP4MCTP+WK+XNNL prJMMztOocg2iwvXUncqbwpk+Qgi+Wb47srmbh1/wdfhr4Re5mgnXcMCryr3qjIgzuUA uYiBBj2/hvySuz5XiZoNIj54o6n0aJ55TND7d53Hn/iGxcoGXftORuhZyqxv77PDSIZa i5E0NfEXi1hUYtRrWRTxLxp1MxCcn6kZXnopLbTLTjFKkYQevbztpnIvnCYTYh9rRrZ3 SFB4VSADy7nDFvpx9yYIpbXiUgPjG8OuRXSfef5EyefUcqnH4syuvnEZb1vSJ1P26Pfl KAsA== MIME-Version: 1.0 Received: by 10.182.116.6 with SMTP id js6mr14452643obb.82.1352709346965; Mon, 12 Nov 2012 00:35:46 -0800 (PST) Received: by 10.60.21.163 with HTTP; Mon, 12 Nov 2012 00:35:46 -0800 (PST) Date: Mon, 12 Nov 2012 16:35:46 +0800 X-Google-Sender-Auth: YyOrmLlXQ0PPugSO5wnhcI1YvJc Message-ID: From: Chunyan Liu To: xen-devel@lists.xensource.com, xen-user@lists.xensource.com Subject: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4214041216682342209==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4214041216682342209== Content-Type: multipart/alternative; boundary=14dae9399d2b1c36f304ce483077 --14dae9399d2b1c36f304ce483077 Content-Type: text/plain; charset=UTF-8 Dear List, I'm trying to issue: "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18" it failed at error report "Too many permissions specified. Maximum per invocation is 16." I changed MAX_PERMS to 18 for testing, it turns to be OK to run above command. I don't know why there is "MAX_PERMS=16" limitation and couldn't find useful info about that. Does anyone know that? Thanks! Chunyan --14dae9399d2b1c36f304ce483077 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Dear List,

I'm trying to issue:
"xenstore-chmod PATH r0 = r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18"
it = failed at error report "Too many permissions specified.=C2=A0 Maximum = per invocation is 16."

I changed MAX_PERMS to 18 for testing, it turns to be OK to run above c= ommand.
I don't know why there is "MAX_PERMS=3D16" limitat= ion and couldn't find useful info about that. Does anyone know that?
Thanks!
Chunyan
--14dae9399d2b1c36f304ce483077-- --===============4214041216682342209== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4214041216682342209==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 08:36:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 08:36:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXpUm-0003Eg-K4; Mon, 12 Nov 2012 08:35:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXpUk-0003Eb-RQ for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 08:35:51 +0000 Received: from [85.158.143.35:18414] by server-2.bemta-4.messagelabs.com id 23/A6-28922-6E4B0A05; Mon, 12 Nov 2012 08:35:50 +0000 X-Env-Sender: kgrace.liu@gmail.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352709347!14508349!1 X-Originating-IP: [209.85.219.43] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20337 invoked from network); 12 Nov 2012 08:35:48 -0000 Received: from mail-oa0-f43.google.com (HELO mail-oa0-f43.google.com) (209.85.219.43) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 08:35:48 -0000 Received: by mail-oa0-f43.google.com with SMTP id k1so7678203oag.30 for ; Mon, 12 Nov 2012 00:35:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=/QSgRehMviWLXaHq7AgEWYaE42eCsKlSljMEVUhJouI=; b=cp7c3mF2ijTQgkUjEdPyWf+LxHl1USBNgQJooANdJXt5mA3bb/AzP4MCTP+WK+XNNL prJMMztOocg2iwvXUncqbwpk+Qgi+Wb47srmbh1/wdfhr4Re5mgnXcMCryr3qjIgzuUA uYiBBj2/hvySuz5XiZoNIj54o6n0aJ55TND7d53Hn/iGxcoGXftORuhZyqxv77PDSIZa i5E0NfEXi1hUYtRrWRTxLxp1MxCcn6kZXnopLbTLTjFKkYQevbztpnIvnCYTYh9rRrZ3 SFB4VSADy7nDFvpx9yYIpbXiUgPjG8OuRXSfef5EyefUcqnH4syuvnEZb1vSJ1P26Pfl KAsA== MIME-Version: 1.0 Received: by 10.182.116.6 with SMTP id js6mr14452643obb.82.1352709346965; Mon, 12 Nov 2012 00:35:46 -0800 (PST) Received: by 10.60.21.163 with HTTP; Mon, 12 Nov 2012 00:35:46 -0800 (PST) Date: Mon, 12 Nov 2012 16:35:46 +0800 X-Google-Sender-Auth: YyOrmLlXQ0PPugSO5wnhcI1YvJc Message-ID: From: Chunyan Liu To: xen-devel@lists.xensource.com, xen-user@lists.xensource.com Subject: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4214041216682342209==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4214041216682342209== Content-Type: multipart/alternative; boundary=14dae9399d2b1c36f304ce483077 --14dae9399d2b1c36f304ce483077 Content-Type: text/plain; charset=UTF-8 Dear List, I'm trying to issue: "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18" it failed at error report "Too many permissions specified. Maximum per invocation is 16." I changed MAX_PERMS to 18 for testing, it turns to be OK to run above command. I don't know why there is "MAX_PERMS=16" limitation and couldn't find useful info about that. Does anyone know that? Thanks! Chunyan --14dae9399d2b1c36f304ce483077 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Dear List,

I'm trying to issue:
"xenstore-chmod PATH r0 = r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18"
it = failed at error report "Too many permissions specified.=C2=A0 Maximum = per invocation is 16."

I changed MAX_PERMS to 18 for testing, it turns to be OK to run above c= ommand.
I don't know why there is "MAX_PERMS=3D16" limitat= ion and couldn't find useful info about that. Does anyone know that?
Thanks!
Chunyan
--14dae9399d2b1c36f304ce483077-- --===============4214041216682342209== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4214041216682342209==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 09:32:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:32:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqMP-00046b-8t; Mon, 12 Nov 2012 09:31:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqMO-00046W-0N for xen-devel@lists.xen.org; Mon, 12 Nov 2012 09:31:16 +0000 Received: from [193.109.254.147:13335] by server-4.bemta-14.messagelabs.com id 82/0D-18856-3E1C0A05; Mon, 12 Nov 2012 09:31:15 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352712657!3744223!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29608 invoked from network); 12 Nov 2012 09:30:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:30:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15742376" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:30:57 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:30:56 +0000 Message-ID: <50A0C1D0.1060407@citrix.com> Date: Mon, 12 Nov 2012 10:30:56 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Manuel Bouyer References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> In-Reply-To: <20121110104536.GA1027@antioche.eu.org> Cc: "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 10/11/12 11:45, Manuel Bouyer wrote: > On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: >> This patch implements persistent grants for xbd_xenbus (blkfront in >> Linux terminology). The effect of this change is to reduce the number >> of unmap operations performed, since they cause a (costly) TLB >> shootdown. This allows the I/O performance to scale better when a >> large number of VMs are performing I/O. >> >> On startup xbd_xenbus notifies the backend driver that it is using >> persistent grants. If the backend driver is not capable of persistent >> mapping, xbd_xenbus will still use the same grants, since it is >> compatible with the previous protocol, and simplifies the code >> complexity in xbd_xenbus. >> >> Each time a request is send to the backend driver, xbd_xenbus will >> check if there are free grants already mapped and will try to use one >> of those. If there are not enough grants already mapped, xbd_xenbus >> will request new grants, and they will be added to the list of free >> grants when the transaction is finished, so they can be reused. Data >> has to be copied from the request (struct buf) to the mapped grant, or >> from the mapped grant to the request, depending on the operation being >> performed. >> >> To test the performance impact of this patch I've benchmarked the >> number of IOPS performed simultaneously by 15 NetBSD DomU guests on a >> Linux Dom0 that supports persistent grants. The backend used to >> perform this tests was a ramdisk of size 1GB. >> >> Sum of IOPS >> Non-persistent 336718 >> Persistent 686010 >> >> As seen, there's a x2 increase in the total number of IOPS being >> performed. As a reference, using exactly the same setup Linux DomUs >> are able to achieve 1102019 IOPS, so there's still plenty of room for >> improvement. > > I'd like to see a similar test run against a NetBSD dom0. Also, how big > are your IOPs ? I will try to perform a similar test with a NetBSD Dom0, but with the patch it will probably be a little bit slower than without it (because we have to perform the memcpy in the frontend, but anyway NetBSD block frontend was also performing a memcpy if the memory region was not aligned to PAGE_SIZE). I have to check, but I belive NetBSD Dom0 will not benefit from persistent grants in the backend driver, because it is limited to only one vcpu, and my guess is that with only one vcpu the TLB flush will be faster than the memcpy (anyway I need to actually check this). The test was performed with fio, using the following configuration: [read] rw=read size=900m bs=4k filename=/foo/bar Where /foo/bar is the mountpoint of a disk backed with a ramdisk on the Dom0, the filesystem is FFSv2 without WAPL and default blocksize. Block size used on the test is 4k, the test was performed 3 times and averaged. Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 09:32:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:32:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqMP-00046b-8t; Mon, 12 Nov 2012 09:31:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqMO-00046W-0N for xen-devel@lists.xen.org; Mon, 12 Nov 2012 09:31:16 +0000 Received: from [193.109.254.147:13335] by server-4.bemta-14.messagelabs.com id 82/0D-18856-3E1C0A05; Mon, 12 Nov 2012 09:31:15 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352712657!3744223!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29608 invoked from network); 12 Nov 2012 09:30:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:30:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15742376" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:30:57 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:30:56 +0000 Message-ID: <50A0C1D0.1060407@citrix.com> Date: Mon, 12 Nov 2012 10:30:56 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Manuel Bouyer References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> In-Reply-To: <20121110104536.GA1027@antioche.eu.org> Cc: "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 10/11/12 11:45, Manuel Bouyer wrote: > On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: >> This patch implements persistent grants for xbd_xenbus (blkfront in >> Linux terminology). The effect of this change is to reduce the number >> of unmap operations performed, since they cause a (costly) TLB >> shootdown. This allows the I/O performance to scale better when a >> large number of VMs are performing I/O. >> >> On startup xbd_xenbus notifies the backend driver that it is using >> persistent grants. If the backend driver is not capable of persistent >> mapping, xbd_xenbus will still use the same grants, since it is >> compatible with the previous protocol, and simplifies the code >> complexity in xbd_xenbus. >> >> Each time a request is send to the backend driver, xbd_xenbus will >> check if there are free grants already mapped and will try to use one >> of those. If there are not enough grants already mapped, xbd_xenbus >> will request new grants, and they will be added to the list of free >> grants when the transaction is finished, so they can be reused. Data >> has to be copied from the request (struct buf) to the mapped grant, or >> from the mapped grant to the request, depending on the operation being >> performed. >> >> To test the performance impact of this patch I've benchmarked the >> number of IOPS performed simultaneously by 15 NetBSD DomU guests on a >> Linux Dom0 that supports persistent grants. The backend used to >> perform this tests was a ramdisk of size 1GB. >> >> Sum of IOPS >> Non-persistent 336718 >> Persistent 686010 >> >> As seen, there's a x2 increase in the total number of IOPS being >> performed. As a reference, using exactly the same setup Linux DomUs >> are able to achieve 1102019 IOPS, so there's still plenty of room for >> improvement. > > I'd like to see a similar test run against a NetBSD dom0. Also, how big > are your IOPs ? I will try to perform a similar test with a NetBSD Dom0, but with the patch it will probably be a little bit slower than without it (because we have to perform the memcpy in the frontend, but anyway NetBSD block frontend was also performing a memcpy if the memory region was not aligned to PAGE_SIZE). I have to check, but I belive NetBSD Dom0 will not benefit from persistent grants in the backend driver, because it is limited to only one vcpu, and my guess is that with only one vcpu the TLB flush will be faster than the memcpy (anyway I need to actually check this). The test was performed with fio, using the following configuration: [read] rw=read size=900m bs=4k filename=/foo/bar Where /foo/bar is the mountpoint of a disk backed with a ramdisk on the Dom0, the filesystem is FFSv2 without WAPL and default blocksize. Block size used on the test is 4k, the test was performed 3 times and averaged. Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 09:53:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:53:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqhO-0004be-2X; Mon, 12 Nov 2012 09:52:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqhM-0004bV-QV for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 09:52:57 +0000 Received: from [193.109.254.147:65346] by server-16.bemta-14.messagelabs.com id 54/87-09215-7F6C0A05; Mon, 12 Nov 2012 09:52:55 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352713811!8759599!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24993 invoked from network); 12 Nov 2012 09:50:12 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:50:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15742927" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:49:20 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:49:19 +0000 Message-ID: <1352713758.27833.134.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matt Wilson Date: Mon, 12 Nov 2012 09:49:18 +0000 In-Reply-To: <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> References: <509C19DE.6010108@nuclearfallout.net> <1352467744.27833.21.camel@zakaz.uk.xensource.com> <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , John Weekes , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 19:55 +0000, Matt Wilson wrote: > On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > > the build is still creating a "dist/install/usr/lib" directory, and > > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > > until it's corrected). Files that are being put in that tree: > > > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > > dist/install/usr/lib > > > > This is an interesting one. I'm not sure how we can avoid this > > behaviour, perhaps there is a tar option to cause it to follow rather > > than clobber synlinks? > > > > The only other choice I can think of is to change install.sh to use a > > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > > avoid including system directories, or to otherwise make install.sh more > > fragile and prone to bitrot :-( > > Oh dear. If we find that there's not a good reason for it anymore, I'd > think it would be better to remove install.sh instead. That's one option. If the list could be autogenerated (e.g configure doing install.sh.in -> install.sh) then that might make it less prone to problems. > > I must confess I didn't realise anyone used install.sh -- is there some > > advantage to it over make foo-install? > > > > OOI which distro has this lib->lib64 link and what issues does removing > > it create? > > > > > dist/install/usr/lib/xen > > > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > > remember? > > There's no need for these files to be multilib compatible, as they are > not runtime DSOs. They're internal to Xen and I think that they should > be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately > there's not much agreement on the usefulness of /usr/libexec, so we'll > need to make sure that packagers can adjust the paths for their > systems' standards. Our configure seem to provide --libexecdir and I think packagers on platforms which don't use /usr/libexec (e.g. Debian & derivatives) are probably pretty used to passing that option. > For 4.2 we didn't want to change where these files were being placed, > and I believe they've bin in $PREFIX/lib/ for quite some time. I remember now, yes deferring from 4.2 was the right thing to do but now that 4.3 is in swing this seems like as good a time as any to be making a change like this. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 09:53:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:53:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqhO-0004be-2X; Mon, 12 Nov 2012 09:52:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqhM-0004bV-QV for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 09:52:57 +0000 Received: from [193.109.254.147:65346] by server-16.bemta-14.messagelabs.com id 54/87-09215-7F6C0A05; Mon, 12 Nov 2012 09:52:55 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352713811!8759599!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24993 invoked from network); 12 Nov 2012 09:50:12 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:50:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15742927" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:49:20 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:49:19 +0000 Message-ID: <1352713758.27833.134.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matt Wilson Date: Mon, 12 Nov 2012 09:49:18 +0000 In-Reply-To: <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> References: <509C19DE.6010108@nuclearfallout.net> <1352467744.27833.21.camel@zakaz.uk.xensource.com> <20121109195553.GA11023@u109add4315675089e695.ant.amazon.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , John Weekes , Roger Pau Monne Subject: Re: [Xen-devel] Bugs in xl that affect stubdom+tapdisk2, and others X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 19:55 +0000, Matt Wilson wrote: > On Fri, Nov 09, 2012 at 01:29:04PM +0000, Ian Campbell wrote: > > On Thu, 2012-11-08 at 20:45 +0000, John Weekes wrote: > > > As an additional note about 4.2 -- this isn't an "xl" issue, but rather > > > a build problem -- even though I use "./configure --libdir=/usr/lib64", > > > the build is still creating a "dist/install/usr/lib" directory, and > > > because of this, running ./install.sh nukes my system's "/usr/lib" -> > > > "/usr/lib64" softlink (which in turn causes all sorts of other problems > > > until it's corrected). Files that are being put in that tree: > > > > > > xen-4.2-testing.hg # find dist/install/usr/lib > > > dist/install/usr/lib > > > > This is an interesting one. I'm not sure how we can avoid this > > behaviour, perhaps there is a tar option to cause it to follow rather > > than clobber synlinks? > > > > The only other choice I can think of is to change install.sh to use a > > (long) explicit list of $(FOO_DIR)/* entries instead of the single * to > > avoid including system directories, or to otherwise make install.sh more > > fragile and prone to bitrot :-( > > Oh dear. If we find that there's not a good reason for it anymore, I'd > think it would be better to remove install.sh instead. That's one option. If the list could be autogenerated (e.g configure doing install.sh.in -> install.sh) then that might make it less prone to problems. > > I must confess I didn't realise anyone used install.sh -- is there some > > advantage to it over make foo-install? > > > > OOI which distro has this lib->lib64 link and what issues does removing > > it create? > > > > > dist/install/usr/lib/xen > > > > This is $(XENFIRMWAREDIR). I have a feeling there is a reason this is > > not using $(LIBDIR), but I don't recall what it was -- Roget/Matt do you > > remember? > > There's no need for these files to be multilib compatible, as they are > not runtime DSOs. They're internal to Xen and I think that they should > be moved to $LIBEXECDIR instead, like /usr/libexec/xen/. Unfortunately > there's not much agreement on the usefulness of /usr/libexec, so we'll > need to make sure that packagers can adjust the paths for their > systems' standards. Our configure seem to provide --libexecdir and I think packagers on platforms which don't use /usr/libexec (e.g. Debian & derivatives) are probably pretty used to passing that option. > For 4.2 we didn't want to change where these files were being placed, > and I believe they've bin in $PREFIX/lib/ for quite some time. I remember now, yes deferring from 4.2 was the right thing to do but now that 4.3 is in swing this seems like as good a time as any to be making a change like this. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 09:55:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqjN-0004k4-80; Mon, 12 Nov 2012 09:55:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqjL-0004js-3a for xen-devel@lists.xen.org; Mon, 12 Nov 2012 09:54:59 +0000 Received: from [85.158.143.99:27318] by server-3.bemta-4.messagelabs.com id 6D/73-06841-277C0A05; Mon, 12 Nov 2012 09:54:58 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352714097!29235231!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10018 invoked from network); 12 Nov 2012 09:54:58 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:54:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15743112" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:54:46 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:54:45 +0000 Message-ID: <1352714084.27833.137.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 12 Nov 2012 09:54:44 +0000 In-Reply-To: <20121110135931.GD23686@localhost.localdomain> References: <20121110135931.GD23686@localhost.localdomain> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > Hey Ian, Xen-devel mailingl list, > > I think the issue of 70% traffic lost was actually introduced in v3.6 or > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > the releases introduced this. The issue we are seeing is that a domU > to domU communication breaks - this is with netperf/netserver talking to > each other. > > Anyhow, I think the 3.7 compound page exacerbated the problem and also > (at least on some of my test hardware) exposed existing issues with > drivers. The issue I have is that the 'skge' driver has a bug that has > been there for ages (I tested way back to 3.0 and still saw it) were it > can not work with SWIOTLB. It is probably missing an pci_dma_sync > somewhere. > > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > OK. Even with synthetic driver (the fake one I posted somewhere) it > dealt with compound pages properly (with debug or non-debug Xen > hypervisor). The debug build is probably most interesting since it deliberately allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of issues. > So was wondering if you had looked at this in more details? Any > ideas? Or would it be more prudent to ask that once we know for sure > which Linux release introduced the communication failures between > guests? I've not looked at it any further I'm afraid. If these changes (be they in 3.5 or later, or earlier) are exposing driver bugs then I suspect the netdev chaps would want to know about it. FWIW I see the issue with tg3. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 09:55:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 09:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqjN-0004k4-80; Mon, 12 Nov 2012 09:55:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqjL-0004js-3a for xen-devel@lists.xen.org; Mon, 12 Nov 2012 09:54:59 +0000 Received: from [85.158.143.99:27318] by server-3.bemta-4.messagelabs.com id 6D/73-06841-277C0A05; Mon, 12 Nov 2012 09:54:58 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352714097!29235231!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10018 invoked from network); 12 Nov 2012 09:54:58 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 09:54:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15743112" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 09:54:46 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 09:54:45 +0000 Message-ID: <1352714084.27833.137.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 12 Nov 2012 09:54:44 +0000 In-Reply-To: <20121110135931.GD23686@localhost.localdomain> References: <20121110135931.GD23686@localhost.localdomain> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > Hey Ian, Xen-devel mailingl list, > > I think the issue of 70% traffic lost was actually introduced in v3.6 or > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > the releases introduced this. The issue we are seeing is that a domU > to domU communication breaks - this is with netperf/netserver talking to > each other. > > Anyhow, I think the 3.7 compound page exacerbated the problem and also > (at least on some of my test hardware) exposed existing issues with > drivers. The issue I have is that the 'skge' driver has a bug that has > been there for ages (I tested way back to 3.0 and still saw it) were it > can not work with SWIOTLB. It is probably missing an pci_dma_sync > somewhere. > > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > OK. Even with synthetic driver (the fake one I posted somewhere) it > dealt with compound pages properly (with debug or non-debug Xen > hypervisor). The debug build is probably most interesting since it deliberately allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of issues. > So was wondering if you had looked at this in more details? Any > ideas? Or would it be more prudent to ask that once we know for sure > which Linux release introduced the communication failures between > guests? I've not looked at it any further I'm afraid. If these changes (be they in 3.5 or later, or earlier) are exposing driver bugs then I suspect the netdev chaps would want to know about it. FWIW I see the issue with tg3. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:00:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqoE-0005C2-Vh; Mon, 12 Nov 2012 10:00:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqoD-000580-SH for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:00:02 +0000 Received: from [85.158.137.99:7104] by server-1.bemta-3.messagelabs.com id 1A/49-12169-1A8C0A05; Mon, 12 Nov 2012 10:00:01 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352714398!13912168!1 X-Originating-IP: [209.85.210.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2333 invoked from network); 12 Nov 2012 10:00:00 -0000 Received: from mail-da0-f45.google.com (HELO mail-da0-f45.google.com) (209.85.210.45) by server-7.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 10:00:00 -0000 Received: by mail-da0-f45.google.com with SMTP id n15so2697870dad.32 for ; Mon, 12 Nov 2012 01:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=TMMa1nACG1BqMU9JyQoijszbnYgVq/XeN85PmLzdQo0=; b=cGr/fBFt1I14SVdDziNja1Rd02fHTWrsNpyng6Vd2FvhAXqj0G0Lh0KfqF6PfXWj0O q7ETez7f0oMDI0u1UZpuMAF7syO5818xs/LKLnEydAZPbAupBYPenFjBM2oQpje8ew0P TjyGWiEeMSrgWMi+oHiNI2EwG2x1FaxEGZPaCcB+OgL+6KPB3ZcUbokL3+yK9oRImqhT ZEJeNpPBEYtSe5eEC1FAm3Gc8NkvCCefu6Kur6tEsgC61IsAHp/n+IeuhIpBx6Wvf2hO EqCtH/pbWIF59ohZGMIT6b9mUqAMprdkCK0BsJu4p5BUL2pjVxIbycrivy4V40/0/6Ce 776g== Received: by 10.68.194.101 with SMTP id hv5mr14882811pbc.121.1352714398176; Mon, 12 Nov 2012 01:59:58 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id jw14sm3964804pbb.36.2012.11.12.01.59.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 01:59:57 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 23:00:18 +1300 Message-Id: <1352714418-5776-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] x86 shadow: Fix typo in sh_invlpg sl3 page presence check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Matthew Daley diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..39cb7de 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3505,7 +3505,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) perfc_incr(shadow_invlpg_fault); return 0; } - if ( (!shadow_l3e_get_flags(sl3e) & _PAGE_PRESENT) ) + if ( !(shadow_l3e_get_flags(sl3e) & _PAGE_PRESENT) ) return 0; } #else /* SHADOW_PAGING_LEVELS == 3 */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:00:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqoE-0005C2-Vh; Mon, 12 Nov 2012 10:00:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqoD-000580-SH for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:00:02 +0000 Received: from [85.158.137.99:7104] by server-1.bemta-3.messagelabs.com id 1A/49-12169-1A8C0A05; Mon, 12 Nov 2012 10:00:01 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352714398!13912168!1 X-Originating-IP: [209.85.210.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2333 invoked from network); 12 Nov 2012 10:00:00 -0000 Received: from mail-da0-f45.google.com (HELO mail-da0-f45.google.com) (209.85.210.45) by server-7.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 10:00:00 -0000 Received: by mail-da0-f45.google.com with SMTP id n15so2697870dad.32 for ; Mon, 12 Nov 2012 01:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=TMMa1nACG1BqMU9JyQoijszbnYgVq/XeN85PmLzdQo0=; b=cGr/fBFt1I14SVdDziNja1Rd02fHTWrsNpyng6Vd2FvhAXqj0G0Lh0KfqF6PfXWj0O q7ETez7f0oMDI0u1UZpuMAF7syO5818xs/LKLnEydAZPbAupBYPenFjBM2oQpje8ew0P TjyGWiEeMSrgWMi+oHiNI2EwG2x1FaxEGZPaCcB+OgL+6KPB3ZcUbokL3+yK9oRImqhT ZEJeNpPBEYtSe5eEC1FAm3Gc8NkvCCefu6Kur6tEsgC61IsAHp/n+IeuhIpBx6Wvf2hO EqCtH/pbWIF59ohZGMIT6b9mUqAMprdkCK0BsJu4p5BUL2pjVxIbycrivy4V40/0/6Ce 776g== Received: by 10.68.194.101 with SMTP id hv5mr14882811pbc.121.1352714398176; Mon, 12 Nov 2012 01:59:58 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id jw14sm3964804pbb.36.2012.11.12.01.59.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 01:59:57 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 23:00:18 +1300 Message-Id: <1352714418-5776-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] x86 shadow: Fix typo in sh_invlpg sl3 page presence check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Matthew Daley diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..39cb7de 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3505,7 +3505,7 @@ sh_invlpg(struct vcpu *v, unsigned long va) perfc_incr(shadow_invlpg_fault); return 0; } - if ( (!shadow_l3e_get_flags(sl3e) & _PAGE_PRESENT) ) + if ( !(shadow_l3e_get_flags(sl3e) & _PAGE_PRESENT) ) return 0; } #else /* SHADOW_PAGING_LEVELS == 3 */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:05:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:05:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqt1-0005Qn-OO; Mon, 12 Nov 2012 10:04:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqsz-0005Qa-SI for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:04:57 +0000 Received: from [85.158.137.99:16259] by server-14.bemta-3.messagelabs.com id 69/94-12788-4C9C0A05; Mon, 12 Nov 2012 10:04:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352714691!13590234!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10142 invoked from network); 12 Nov 2012 10:04:51 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 10:04:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15743432" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 10:04:27 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 10:04:27 +0000 Message-ID: <1352714666.27833.144.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "xen-devel@lists.xen.org" Date: Mon, 12 Nov 2012 10:04:26 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Keir Fraser , Ian Jackson Subject: Re: [Xen-devel] [PATCH 0 of 5] docs: x86 PV MMU related functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org ping? On Fri, 2012-11-02 at 11:18 +0000, Ian Campbell wrote: > The following series adds some documentation for the PV MU related > hypercalls. For the most part this is just a case of adding a suitable > prototype and marking things up so they show up in the generated docs. > > I also have a draft of a wiki article on the subject which references > the information in the public headers which I hope to post soon. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:05:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:05:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqt1-0005Qn-OO; Mon, 12 Nov 2012 10:04:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXqsz-0005Qa-SI for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:04:57 +0000 Received: from [85.158.137.99:16259] by server-14.bemta-3.messagelabs.com id 69/94-12788-4C9C0A05; Mon, 12 Nov 2012 10:04:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352714691!13590234!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10142 invoked from network); 12 Nov 2012 10:04:51 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 10:04:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15743432" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 10:04:27 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 10:04:27 +0000 Message-ID: <1352714666.27833.144.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "xen-devel@lists.xen.org" Date: Mon, 12 Nov 2012 10:04:26 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Keir Fraser , Ian Jackson Subject: Re: [Xen-devel] [PATCH 0 of 5] docs: x86 PV MMU related functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org ping? On Fri, 2012-11-02 at 11:18 +0000, Ian Campbell wrote: > The following series adds some documentation for the PV MU related > hypercalls. For the most part this is just a case of adding a suitable > prototype and marking things up so they show up in the generated docs. > > I also have a draft of a wiki article on the subject which references > the information in the public headers which I hope to post soon. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:20:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:20:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXr6x-0005kL-52; Mon, 12 Nov 2012 10:19:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXr6v-0005kG-0W for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:19:21 +0000 Received: from [85.158.143.99:9375] by server-2.bemta-4.messagelabs.com id 8F/F6-28922-82DC0A05; Mon, 12 Nov 2012 10:19:20 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1352715559!29239146!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5406 invoked from network); 12 Nov 2012 10:19:19 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 10:19:19 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TXr5v-0008HF-MJ; Mon, 12 Nov 2012 10:18:19 +0000 Date: Mon, 12 Nov 2012 10:18:19 +0000 From: Tim Deegan To: Matthew Daley Message-ID: <20121112101819.GA30896@ocelot.phlegethon.org> References: <1352714418-5776-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352714418-5776-1-git-send-email-mattjd@gmail.com> User-Agent: Mutt/1.4.2.1i Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] x86 shadow: Fix typo in sh_invlpg sl3 page presence check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 23:00 +1300 on 12 Nov (1352761218), Matthew Daley wrote: > Signed-off-by: Matthew Daley Applied, thanks. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:20:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:20:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXr6x-0005kL-52; Mon, 12 Nov 2012 10:19:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXr6v-0005kG-0W for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:19:21 +0000 Received: from [85.158.143.99:9375] by server-2.bemta-4.messagelabs.com id 8F/F6-28922-82DC0A05; Mon, 12 Nov 2012 10:19:20 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-5.tower-216.messagelabs.com!1352715559!29239146!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5406 invoked from network); 12 Nov 2012 10:19:19 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 10:19:19 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TXr5v-0008HF-MJ; Mon, 12 Nov 2012 10:18:19 +0000 Date: Mon, 12 Nov 2012 10:18:19 +0000 From: Tim Deegan To: Matthew Daley Message-ID: <20121112101819.GA30896@ocelot.phlegethon.org> References: <1352714418-5776-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352714418-5776-1-git-send-email-mattjd@gmail.com> User-Agent: Mutt/1.4.2.1i Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] x86 shadow: Fix typo in sh_invlpg sl3 page presence check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 23:00 +1300 on 12 Nov (1352761218), Matthew Daley wrote: > Signed-off-by: Matthew Daley Applied, thanks. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 10:30:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:30:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXrGm-000607-Eo; Mon, 12 Nov 2012 10:29:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXrGl-000600-D3 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:29:31 +0000 Received: from [85.158.143.35:19085] by server-1.bemta-4.messagelabs.com id EE/70-27934-A8FC0A05; Mon, 12 Nov 2012 10:29:30 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-10.tower-21.messagelabs.com!1352716157!10116224!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28200 invoked from network); 12 Nov 2012 10:29:18 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 10:29:18 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id F33F0400285 for ; Mon, 12 Nov 2012 11:29:16 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LrUsGRkaqz7V for ; Mon, 12 Nov 2012 11:29:15 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id 058D440021F for ; Mon, 12 Nov 2012 11:29:14 +0100 (CET) Message-ID: <50A0CF73.5040807@tiscali.it> Date: Mon, 12 Nov 2012 11:29:07 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel Subject: [Xen-devel] Qemu upstream status X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0581220439455297604==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============0581220439455297604== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms080902050007010800080506" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms080902050007010800080506 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable I see that qemu upstream repository on xen is not updated, why wasn't it = updated with 1.3 unstable?=20 http://xenbits.xen.org/gitweb/?p=3Dstaging/qemu-upstream-unstable.git;a=3D= summary Recently I tested it:=20 http://lists.xen.org/archives/html/xen-devel/2012-10/msg01820.html Save/restore is now working, the only problem found is network not=20 working on restore with windows domU. cd-eject is working, cd-insert is not. spice is working, but with qxl it causes crash of qemu, the same with=20 latest spice patches:=20 http://cgit.freedesktop.org/spice/qemu/log/?h=3Dspice.v63 On log there is this error: (/usr/sbin/xl:3463): Spice-CRITICAL **: red_memslots.c:123:get_virt:=20 slot_id 194 too big, addr=3Dc2c2c2c2c2c2c2c2 A fix or change in xen is probably needed --------------ms080902050007010800080506 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTExMjEwMjkwN1owIwYJKoZIhvcNAQkEMRYEFKq5iBAOTwTUbV2aBTQokgSa QkLCMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEApNziTQLlmi8ZGKT9Rzd9CfCs mM+Zv4axkGqQmxGV1eXWPE3VSAOFI1FhlvVYx83UjiMQYkMo4HpdjOjR72mqPMYuJsVMsTFh K1trTrtvxBdeV8S+8I92f9hK8QWJLF2llKaBf9B2S1eJ/IpjR2LS84qhmzuWRbA+DZz2QUXK EhBAy4E2qTvKmbJwAqA0AEuPGtecz1FwSvwki2yPicbozt3w4sUJSrU3Hz0elPRsNlERZlR0 sYaO6VMN8mf4oVDE01DOwJfEanmFI4PViPaQEZx5WGFCpbkDJLfL5PuoMtUODpgUtyHRc1Mm UsFhtnihO1sZcnKqfi91wHDP+aDGhwAAAAAAAA== --------------ms080902050007010800080506-- --===============0581220439455297604== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0581220439455297604==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 10:30:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 10:30:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXrGm-000607-Eo; Mon, 12 Nov 2012 10:29:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXrGl-000600-D3 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 10:29:31 +0000 Received: from [85.158.143.35:19085] by server-1.bemta-4.messagelabs.com id EE/70-27934-A8FC0A05; Mon, 12 Nov 2012 10:29:30 +0000 X-Env-Sender: fantonifabio@tiscali.it X-Msg-Ref: server-10.tower-21.messagelabs.com!1352716157!10116224!1 X-Originating-IP: [94.23.245.208] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28200 invoked from network); 12 Nov 2012 10:29:18 -0000 Received: from lnx3.fantu.it (HELO lnx3.fantu.it) (94.23.245.208) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 10:29:18 -0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by lnx3.fantu.it (Postfix) with ESMTP id F33F0400285 for ; Mon, 12 Nov 2012 11:29:16 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lnx3.fantu.it Received: from lnx3.fantu.it ([127.0.0.1]) by localhost (lnx3.fantu.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LrUsGRkaqz7V for ; Mon, 12 Nov 2012 11:29:15 +0100 (CET) Received: from [192.168.178.50] (host51-78-dynamic.2-87-r.retail.telecomitalia.it [87.2.78.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: prova@fantu.it) by lnx3.fantu.it (Postfix) with ESMTPSA id 058D440021F for ; Mon, 12 Nov 2012 11:29:14 +0100 (CET) Message-ID: <50A0CF73.5040807@tiscali.it> Date: Mon, 12 Nov 2012 11:29:07 +0100 From: Fabio Fantoni User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel Subject: [Xen-devel] Qemu upstream status X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: fantonifabio@tiscali.it List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0581220439455297604==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Questo è un messaggio firmato digitalmente in formato MIME. --===============0581220439455297604== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms080902050007010800080506" Questo è un messaggio firmato digitalmente in formato MIME. --------------ms080902050007010800080506 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable I see that qemu upstream repository on xen is not updated, why wasn't it = updated with 1.3 unstable?=20 http://xenbits.xen.org/gitweb/?p=3Dstaging/qemu-upstream-unstable.git;a=3D= summary Recently I tested it:=20 http://lists.xen.org/archives/html/xen-devel/2012-10/msg01820.html Save/restore is now working, the only problem found is network not=20 working on restore with windows domU. cd-eject is working, cd-insert is not. spice is working, but with qxl it causes crash of qemu, the same with=20 latest spice patches:=20 http://cgit.freedesktop.org/spice/qemu/log/?h=3Dspice.v63 On log there is this error: (/usr/sbin/xl:3463): Spice-CRITICAL **: red_memslots.c:123:get_virt:=20 slot_id 194 too big, addr=3Dc2c2c2c2c2c2c2c2 A fix or change in xen is probably needed --------------ms080902050007010800080506 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: Firma crittografica S/MIME MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIINhjCC BjQwggQcoAMCAQICASAwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoT DVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNp Z25pbmcxKTAnBgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3 MTAyNDIxMDI1NVoXDTE3MTAyNDIxMDI1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1T dGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWdu aW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENs aWVudCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsohUWcASz7GfKrpTOM KqANy9BV7V0igWdGxA8IU77L3aTxErQ+fcxtDYZ36Z6GH0YFn7fq5RADteP0AYzrCA+EQTfi 8q1+kA3m0nwtwXG94M5sIqsvs7lRP1aycBke/s5g9hJHryZ2acScnzczjBCAo7X1v5G3yw8M DP2m2RCye0KfgZ4nODerZJVzhAlOD9YejvAXZqHksw56HzElVIoYSZ3q4+RJuPXXfIoyby+Y 2m1E+YzX5iCZXBx05gk6MKAW1vaw4/v2OOLy6FZH3XHHtOkzUreG//CsFnB9+uaYSlR65cdG zTsmoIK8WH1ygoXhRBm98SD7Hf/r3FELNvUCAwEAAaOCAa0wggGpMA8GA1UdEwEB/wQFMAMB Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSuVYNv7DHKufcd+q9rMfPIHeOsuzAfBgNV HSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRaMFgwJwYIKwYBBQUH MAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYhaHR0cDovL3d3 dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6Ly93d3cu c3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5jb20v c2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0 dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93 d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBADqp Jw3I07QWke9plNBpxUxcffc7nUrIQpJHDci91DFG7fVhHRkMZ1J+BKg5UNUxIFJ2Z9B90Mic c/NXcs7kPBRdn6XGO/vPc87Y6R+cWS9Nc9+fp3Enmsm94OxOwI9wn8qnr/6o3mD4noP9Jphw UPTXwHovjavRnhUQHLfo/i2NG0XXgTHXS2Xm0kVUozXqpYpAdumMiB/vezj1QHQJDmUdPYMc p+reg9901zkyT3fDW/ivJVv6pWtkh6Pw2ytZT7mvg7YhX3V50Nv860cV11mocUVcqBLv0gcT +HBDYtbuvexNftwNQKD5193A7zN4vG7CTYkXxytSjKuXrpEatEiFPxWgb84nVj25SU5q/r1X hwby6mLhkbaXslkVtwEWT3Van49rKjlK4XrUKYYWtnfzq6aSak5u0Vpxd1rY79tWhD3EdCvO hNz/QplNa+VkIsrcp7+8ZhP1l1b2U6MaxIVteuVMD3X0vziIwr7jxYae9FZjbxlpUemqXjcC 0QaFfN7qI0JsQMALL7iGRBg7K0CoOBzECdD3fuZil5kU/LP9cr1BK31U0Uy651bFnAMMMkqh AChIbn0ei72VnbpSsrrSdF0BAGYQ8vyHae5aCg+H75dVCV33K6FuxZrf09yTz+Vx/PkdRUYk XmZz/OTfyJXsUOUXrym6KvI2rYpccSk5MIIHSjCCBjKgAwIBAgICHmMwDQYJKoZIhvcNAQEF BQAwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAyIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTAeFw0xMjAzMTgyMjE0MzBa Fw0xNDAzMjAwODU3MDlaMIGMMRkwFwYDVQQNExBlQjZPRTM3UlJOUHlsNW0yMQswCQYDVQQG EwJJVDEQMA4GA1UECBMHQmVyZ2FtbzEQMA4GA1UEBxMHUm92ZXR0YTEWMBQGA1UEAxMNRmFi aW8gRmFudG9uaTEmMCQGCSqGSIb3DQEJARYXZmFudG9uaWZhYmlvQHRpc2NhbGkuaXQwggEi MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XhckXsX23vgJq76s2f0KT8U8Msov5QgV 10eQBb2wL/TzcmqtZotI7ztKVhio3ehHg+mfu+3EqOkX9Umgut8rP0bPi7AGjkPXbOTT/cSU Xz2Kw31VGOmiOVoUFGvpQitp3weCkhUJLBipI8EpNyBXpjtQ9yCpnIAqfuc77ybfSnCy7tTR MBq1BUkfjH1+GL45riosuS4+F+MSUvlYzLiT4rAduAX1Y2IuORDsf9Bce8GBxa6syP9rCyzl Vk7DIX5k8j2vlnyRATIypn5CQLQxGT6e0f6ac4gvWOHwO2QEBsmZKKs1ZidE4q/9OoNXYX6A jnHtp1H1vcrek/vVcs19AgMBAAGjggOyMIIDrjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFan8cbEWWBmSTWFtLk2 YNdAcGUbMB8GA1UdIwQYMBaAFK5Vg2/sMcq59x36r2sx88gd46y7MCIGA1UdEQQbMBmBF2Zh bnRvbmlmYWJpb0B0aXNjYWxpLml0MIICIQYDVR0gBIICGDCCAhQwggIQBgsrBgEEAYG1NwEC AjCCAf8wLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYw NAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYw gfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMC AQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFz cyAyIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ks IHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ug b2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMIGcBggrBgEFBQcCAjCBjzAnFiBT dGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgECGmRMaWFiaWxpdHkgYW5kIHdh cnJhbnRpZXMgYXJlIGxpbWl0ZWQhIFNlZSBzZWN0aW9uICJMZWdhbCBhbmQgTGltaXRhdGlv bnMiIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3kuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6 Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYI KwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL2NsaWVudC9j YTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz Mi5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN BgkqhkiG9w0BAQUFAAOCAQEAjzHNqifpDVMkH1TSPFZVIiQ4fh49/V5JMpstgqEZPDaDe5r8 h+fMBZtUa6LLMco03Z9BNEXlqlXKiFk8feVYB8obEjz7YYq1XhO9q7JUmkSs0WGIH4xU0XB1 kPC8T8H+5E//84poYSFHE4pA+Ff68UANP2/EuFJWMjegiefnOr8aM42OAcUkjEWSlautIIX8 oD2GizwQYjWdDDjEonbuMKFP6rY2xGI3PSLI3IVU2opb0/itNhQui3WRxafloJqTlriY8m8+ qSLr2HGftbBlbyzVWB8o//aW0H0LMabjkIvrm7Zmh2vcCxiSxGBwYASuSYXGuQiKAgGptUs1 XJLZuzGCA9owggPWAgEBMIGTMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g THRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG A1UEAxMvU3RhcnRDb20gQ2xhc3MgMiBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EC Ah5jMAkGBSsOAwIaBQCgggIbMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcN AQkFMQ8XDTEyMTExMjEwMjkwN1owIwYJKoZIhvcNAQkEMRYEFKq5iBAOTwTUbV2aBTQokgSa QkLCMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAKBggqhkiG 9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcN AwICASgwgaQGCSsGAQQBgjcQBDGBljCBkzCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25p bmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xp ZW50IENBAgIeYzCBpgYLKoZIhvcNAQkQAgsxgZaggZMwgYwxCzAJBgNVBAYTAklMMRYwFAYD VQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0 ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAyIFByaW1hcnkgSW50ZXJtZWRp YXRlIENsaWVudCBDQQICHmMwDQYJKoZIhvcNAQEBBQAEggEApNziTQLlmi8ZGKT9Rzd9CfCs mM+Zv4axkGqQmxGV1eXWPE3VSAOFI1FhlvVYx83UjiMQYkMo4HpdjOjR72mqPMYuJsVMsTFh K1trTrtvxBdeV8S+8I92f9hK8QWJLF2llKaBf9B2S1eJ/IpjR2LS84qhmzuWRbA+DZz2QUXK EhBAy4E2qTvKmbJwAqA0AEuPGtecz1FwSvwki2yPicbozt3w4sUJSrU3Hz0elPRsNlERZlR0 sYaO6VMN8mf4oVDE01DOwJfEanmFI4PViPaQEZx5WGFCpbkDJLfL5PuoMtUODpgUtyHRc1Mm UsFhtnihO1sZcnKqfi91wHDP+aDGhwAAAAAAAA== --------------ms080902050007010800080506-- --===============0581220439455297604== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0581220439455297604==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 11:04:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 11:04:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXro7-00079M-7b; Mon, 12 Nov 2012 11:03:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXro5-00079E-29 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 11:03:57 +0000 Received: from [85.158.137.99:5700] by server-4.bemta-3.messagelabs.com id 7E/F2-30023-C97D0A05; Mon, 12 Nov 2012 11:03:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352718235!18736139!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31187 invoked from network); 12 Nov 2012 11:03:55 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 11:03:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15745547" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 11:03:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 11:03:55 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXro3-0003zE-5E; Mon, 12 Nov 2012 11:03:55 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TXro3-0003EC-1F; Mon, 12 Nov 2012 11:03:55 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20640.55194.944103.42939@mariner.uk.xensource.com> Date: Mon, 12 Nov 2012 11:03:54 +0000 To: Dan Magenheimer In-Reply-To: <88261052-b3f5-46f5-bd0e-b650d827062e@default> References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <20635.34133.118531.778138@mariner.uk.xensource.com> <88261052-b3f5-46f5-bd0e-b650d827062e@default> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: "Tim \(Xen.org\)" , Olaf Hering , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , "xen-devel@lists.xen.org" , Keir Fraser , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Dan Magenheimer writes ("RE: Proposed new "memory capacity claim" hypercall/feature"): > But to ensure that any summary/restatement touches on your > concerns, could you be more specific as to about what you are > unconvinced? > > I.e. I still think the toolstack can manage all memory > allocation; I'm still unconvinced that this is false. I think it's probably true. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 11:04:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 11:04:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXro7-00079M-7b; Mon, 12 Nov 2012 11:03:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXro5-00079E-29 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 11:03:57 +0000 Received: from [85.158.137.99:5700] by server-4.bemta-3.messagelabs.com id 7E/F2-30023-C97D0A05; Mon, 12 Nov 2012 11:03:56 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352718235!18736139!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31187 invoked from network); 12 Nov 2012 11:03:55 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 11:03:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,761,1344211200"; d="scan'208";a="15745547" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 11:03:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 11:03:55 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXro3-0003zE-5E; Mon, 12 Nov 2012 11:03:55 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TXro3-0003EC-1F; Mon, 12 Nov 2012 11:03:55 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20640.55194.944103.42939@mariner.uk.xensource.com> Date: Mon, 12 Nov 2012 11:03:54 +0000 To: Dan Magenheimer In-Reply-To: <88261052-b3f5-46f5-bd0e-b650d827062e@default> References: <7563be37-62f1-472e-9aec-1d0c55fa7c29@default> <20635.34133.118531.778138@mariner.uk.xensource.com> <88261052-b3f5-46f5-bd0e-b650d827062e@default> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: "Tim \(Xen.org\)" , Olaf Hering , Ian Campbell , Konrad Wilk , George Dunlap , Kurt Hackel , George Shuklin , "xen-devel@lists.xen.org" , Keir Fraser , DarioFaggioli , Jan Beulich , Zhigang Wang Subject: Re: [Xen-devel] Proposed new "memory capacity claim" hypercall/feature X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Dan Magenheimer writes ("RE: Proposed new "memory capacity claim" hypercall/feature"): > But to ensure that any summary/restatement touches on your > concerns, could you be more specific as to about what you are > unconvinced? > > I.e. I still think the toolstack can manage all memory > allocation; I'm still unconvinced that this is false. I think it's probably true. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 11:37:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 11:37:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsJi-0007pW-26; Mon, 12 Nov 2012 11:36:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsJg-0007pR-GR for xen-devel@lists.xen.org; Mon, 12 Nov 2012 11:36:36 +0000 Received: from [85.158.143.99:24724] by server-3.bemta-4.messagelabs.com id 9D/D0-06841-34FD0A05; Mon, 12 Nov 2012 11:36:35 +0000 X-Env-Sender: pablo.llopis@gmail.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352720181!18373887!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10390 invoked from network); 12 Nov 2012 11:36:26 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 11:36:26 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so10430644iea.32 for ; Mon, 12 Nov 2012 03:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=K/QnofI32rKt6oVZXP617Z/MAVxolp3uO+iQNiG+3W8=; b=MqKFFkSuDi2pqBKIz78AaftIo7H+HdcxYJt7US61eGv2ITKlqho5emknUsx3ySf+Zu 7AiH1lrkUvkmcvG+38Rm7M/XsjQGiqUGWvm05LPbp3BBBFUVvUc9z8uiY2Rupx8GdXed 2pwNCJpea872TlHoIv8AH2gHheViBNi7dGA4FxTGa4wCNYH4A/qae+OGSURO8FE5BL91 +KrlD6jHS8FzB0+rgBMTww2IAWB9njtEayC9TthrPnL2UgfZmQU6Uu/liumehw0l5dTg 4Caw0q2UrQmdSSPI0br0Qv38aF1pvMUKqPcp1bnHMsjJy8Eh0KC4HOclOojmEogg/gxD yWXg== MIME-Version: 1.0 Received: by 10.50.17.129 with SMTP id o1mr7493744igd.21.1352720180742; Mon, 12 Nov 2012 03:36:20 -0800 (PST) Received: by 10.64.128.105 with HTTP; Mon, 12 Nov 2012 03:36:20 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 12:36:20 +0100 X-Google-Sender-Auth: JOR74zQeJg4tl92pBj7HbeKU9y0 Message-ID: From: Pablo Llopis To: D Sundstrom Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello David, I am not a Xen developer, but I think I can help with your issue :) On Mon, Nov 12, 2012 at 12:35 AM, D Sundstrom wrote: > > Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under Xen 4.1 > HVM. > > The linux PV drivers load and all appears to be fine. > > I want to use the gntalloc device to allocate a page of memory from Domain A > and then map that into Domain B using gntdev. Both are unprivileged > domains. > > Using Daniel DeGraaf's test program here: > http://lists.xen.org/archives/html/xen-devel/2011-01/txtzDU6iZhTkB.txt > I am running a slightly different version of the tool, http://lists.xen.org/archives/html/xen-devel/2011-02/msg00231.html (I think this one is more up to date, I did not check if there was a more recent one) > I can run the command to create a grant, but upon running the command to map > the grant (from either the same domain or another DomU), the kernel > immediately crashes with no diagnostic output. > > Should I expect to be able to map grants in a DomU allocated in another > DomU? Yes, I think that is the main goal of grant references. > > Example of running the test: > > $ xenstore-read domid > 8 > > $ thetestprogram > > src-add return gntref, address > map return index, address > src-del no rv > gu no rv > unmap
no rv > show print and change mapped items > This process bumps by 4000 > > src-add 8 > > src-add mapped 1372 at 0=0 > > show > > 00(-1217044480,0): current 4000 new 0 > > map 8 1372 It is not clear from your output from which domain you are running each command. It looks like you are trying to issue a grant and map it from within the same domain. That's probably the reason it crashes. You are supposed to run this tool from both domains, running the calls which interface with gntalloc from one domain, and the calls which interface with gntdev from the other domain. In any case, the domid you have to specify in the map must be the domid of the domain which issued the grant. In other words, when creating a grant, the domid which is granted access is specified. When mapping a grant, the domid which issued the grant is specified. (i.e. If you did "src-add 8" from dom0 you should run map 0 1372 from domU 8) > > (immediately crashes the VM) I have also experienced this crash. The crash should probably not happen, especially if it can be triggered from user-space, but I have not looked into that. > > > Thanks, > > David > > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 11:37:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 11:37:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsJi-0007pW-26; Mon, 12 Nov 2012 11:36:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsJg-0007pR-GR for xen-devel@lists.xen.org; Mon, 12 Nov 2012 11:36:36 +0000 Received: from [85.158.143.99:24724] by server-3.bemta-4.messagelabs.com id 9D/D0-06841-34FD0A05; Mon, 12 Nov 2012 11:36:35 +0000 X-Env-Sender: pablo.llopis@gmail.com X-Msg-Ref: server-16.tower-216.messagelabs.com!1352720181!18373887!1 X-Originating-IP: [209.85.223.173] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10390 invoked from network); 12 Nov 2012 11:36:26 -0000 Received: from mail-ie0-f173.google.com (HELO mail-ie0-f173.google.com) (209.85.223.173) by server-16.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 11:36:26 -0000 Received: by mail-ie0-f173.google.com with SMTP id 17so10430644iea.32 for ; Mon, 12 Nov 2012 03:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=K/QnofI32rKt6oVZXP617Z/MAVxolp3uO+iQNiG+3W8=; b=MqKFFkSuDi2pqBKIz78AaftIo7H+HdcxYJt7US61eGv2ITKlqho5emknUsx3ySf+Zu 7AiH1lrkUvkmcvG+38Rm7M/XsjQGiqUGWvm05LPbp3BBBFUVvUc9z8uiY2Rupx8GdXed 2pwNCJpea872TlHoIv8AH2gHheViBNi7dGA4FxTGa4wCNYH4A/qae+OGSURO8FE5BL91 +KrlD6jHS8FzB0+rgBMTww2IAWB9njtEayC9TthrPnL2UgfZmQU6Uu/liumehw0l5dTg 4Caw0q2UrQmdSSPI0br0Qv38aF1pvMUKqPcp1bnHMsjJy8Eh0KC4HOclOojmEogg/gxD yWXg== MIME-Version: 1.0 Received: by 10.50.17.129 with SMTP id o1mr7493744igd.21.1352720180742; Mon, 12 Nov 2012 03:36:20 -0800 (PST) Received: by 10.64.128.105 with HTTP; Mon, 12 Nov 2012 03:36:20 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 12:36:20 +0100 X-Google-Sender-Auth: JOR74zQeJg4tl92pBj7HbeKU9y0 Message-ID: From: Pablo Llopis To: D Sundstrom Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello David, I am not a Xen developer, but I think I can help with your issue :) On Mon, Nov 12, 2012 at 12:35 AM, D Sundstrom wrote: > > Running under debian wheezy kernel 3.2.0-3-686-pae (32 bit), under Xen 4.1 > HVM. > > The linux PV drivers load and all appears to be fine. > > I want to use the gntalloc device to allocate a page of memory from Domain A > and then map that into Domain B using gntdev. Both are unprivileged > domains. > > Using Daniel DeGraaf's test program here: > http://lists.xen.org/archives/html/xen-devel/2011-01/txtzDU6iZhTkB.txt > I am running a slightly different version of the tool, http://lists.xen.org/archives/html/xen-devel/2011-02/msg00231.html (I think this one is more up to date, I did not check if there was a more recent one) > I can run the command to create a grant, but upon running the command to map > the grant (from either the same domain or another DomU), the kernel > immediately crashes with no diagnostic output. > > Should I expect to be able to map grants in a DomU allocated in another > DomU? Yes, I think that is the main goal of grant references. > > Example of running the test: > > $ xenstore-read domid > 8 > > $ thetestprogram > > src-add return gntref, address > map return index, address > src-del no rv > gu no rv > unmap
no rv > show print and change mapped items > This process bumps by 4000 > > src-add 8 > > src-add mapped 1372 at 0=0 > > show > > 00(-1217044480,0): current 4000 new 0 > > map 8 1372 It is not clear from your output from which domain you are running each command. It looks like you are trying to issue a grant and map it from within the same domain. That's probably the reason it crashes. You are supposed to run this tool from both domains, running the calls which interface with gntalloc from one domain, and the calls which interface with gntdev from the other domain. In any case, the domid you have to specify in the map must be the domid of the domain which issued the grant. In other words, when creating a grant, the domid which is granted access is specified. When mapping a grant, the domid which issued the grant is specified. (i.e. If you did "src-add 8" from dom0 you should run map 0 1372 from domU 8) > > (immediately crashes the VM) I have also experienced this crash. The crash should probably not happen, especially if it can be triggered from user-space, but I have not looked into that. > > > Thanks, > > David > > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 12:03:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 12:03:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsil-0008Ln-CP; Mon, 12 Nov 2012 12:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsik-0008Lg-5E for xen-devel@lists.xen.org; Mon, 12 Nov 2012 12:02:30 +0000 Received: from [193.109.254.147:38294] by server-16.bemta-14.messagelabs.com id F0/32-09215-555E0A05; Mon, 12 Nov 2012 12:02:29 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352721748!2682288!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.7 required=7.0 tests=HTML_30_40,HTML_MESSAGE, MAILTO_TO_SPAM_ADDR,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25132 invoked from network); 12 Nov 2012 12:02:28 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 12:02:28 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3303010wey.32 for ; Mon, 12 Nov 2012 04:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=B7wuDSKJhgUtlNcyL7IceAVIZkGuoTUV09i2BboNBMc=; b=O3ukV8umcAc2i/UMx5Ic+t46K++8l0h+oMSojlgVwlXKkor5OJPjUngZa6uH9TYf15 LR5Kf8AXQSR2RemLmW0m/5oxBaQWJYvuppQ/y0pmQhGLC6pPTMJJW8rOuEkCswWoLKZt N0Xa3+2FyiSTTScUzkO/84JcbXcJir3IXQ9xjIMQldjtzHPcAeqHBm4N7OADiHIoZH6n +rOpE0EDon0XzaSAyojjQ/2dDoA34aIsW5F9lmoEoUKx+EB4VHi42k7DkCNy6CkL+4Dv SrKUkSJtyDH0J6/mGdp1xOyjVZ6sqg1es2nZEjoIQo8Q3KG7/LkorHYablEWwnlvCXOu AdVw== MIME-Version: 1.0 Received: by 10.216.210.223 with SMTP id u73mr8116310weo.132.1352721748386; Mon, 12 Nov 2012 04:02:28 -0800 (PST) Received: by 10.227.200.1 with HTTP; Mon, 12 Nov 2012 04:02:28 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 12:02:28 +0000 X-Google-Sender-Auth: 2ifzrDjnlJdnTI5o4Ne3OW8_QmQ Message-ID: From: George Dunlap To: David Xu Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4260752545493925165==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4260752545493925165== Content-Type: multipart/alternative; boundary=001636c5b1944ae5a404ce4b137f --001636c5b1944ae5a404ce4b137f Content-Type: text/plain; charset=ISO-8859-1 On Sun, Nov 11, 2012 at 3:57 AM, David Xu wrote: > Hi all, > > I wonder if the state of process in guestOS will change when the > corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its > credits and its state become over, how about the process context or softirq > context in guest OS on this vCPU? Does it still maintain the same running > state? Thanks. > I'm not sure what you mean "the same running state". The state of the vcpu -- the registers, the guest memory relating to it, and the fact that it's not blocked -- is the same. From the guest's perspective, it has temporarily frozen in time until it gets to run again. Does that answer your question? -George --001636c5b1944ae5a404ce4b137f Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Nov 11, 2012 at 3:57 AM, David Xu <davidxu06@gmail.com> wrote:
Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

I'm not sure what you mean "the same running= state".=A0 The state of the vcpu -- the registers, the guest memory r= elating to it, and the fact that it's not blocked -- is the same.=A0 Fr= om the guest's perspective, it has temporarily frozen in time until it = gets to run again.=A0 Does that answer your question?

=A0-George

--001636c5b1944ae5a404ce4b137f-- --===============4260752545493925165== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4260752545493925165==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 12:03:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 12:03:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsil-0008Ln-CP; Mon, 12 Nov 2012 12:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXsik-0008Lg-5E for xen-devel@lists.xen.org; Mon, 12 Nov 2012 12:02:30 +0000 Received: from [193.109.254.147:38294] by server-16.bemta-14.messagelabs.com id F0/32-09215-555E0A05; Mon, 12 Nov 2012 12:02:29 +0000 X-Env-Sender: dunlapg@gmail.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352721748!2682288!1 X-Originating-IP: [74.125.82.173] X-SpamReason: No, hits=0.7 required=7.0 tests=HTML_30_40,HTML_MESSAGE, MAILTO_TO_SPAM_ADDR,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25132 invoked from network); 12 Nov 2012 12:02:28 -0000 Received: from mail-we0-f173.google.com (HELO mail-we0-f173.google.com) (74.125.82.173) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 12:02:28 -0000 Received: by mail-we0-f173.google.com with SMTP id t11so3303010wey.32 for ; Mon, 12 Nov 2012 04:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=B7wuDSKJhgUtlNcyL7IceAVIZkGuoTUV09i2BboNBMc=; b=O3ukV8umcAc2i/UMx5Ic+t46K++8l0h+oMSojlgVwlXKkor5OJPjUngZa6uH9TYf15 LR5Kf8AXQSR2RemLmW0m/5oxBaQWJYvuppQ/y0pmQhGLC6pPTMJJW8rOuEkCswWoLKZt N0Xa3+2FyiSTTScUzkO/84JcbXcJir3IXQ9xjIMQldjtzHPcAeqHBm4N7OADiHIoZH6n +rOpE0EDon0XzaSAyojjQ/2dDoA34aIsW5F9lmoEoUKx+EB4VHi42k7DkCNy6CkL+4Dv SrKUkSJtyDH0J6/mGdp1xOyjVZ6sqg1es2nZEjoIQo8Q3KG7/LkorHYablEWwnlvCXOu AdVw== MIME-Version: 1.0 Received: by 10.216.210.223 with SMTP id u73mr8116310weo.132.1352721748386; Mon, 12 Nov 2012 04:02:28 -0800 (PST) Received: by 10.227.200.1 with HTTP; Mon, 12 Nov 2012 04:02:28 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 12:02:28 +0000 X-Google-Sender-Auth: 2ifzrDjnlJdnTI5o4Ne3OW8_QmQ Message-ID: From: George Dunlap To: David Xu Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============4260752545493925165==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============4260752545493925165== Content-Type: multipart/alternative; boundary=001636c5b1944ae5a404ce4b137f --001636c5b1944ae5a404ce4b137f Content-Type: text/plain; charset=ISO-8859-1 On Sun, Nov 11, 2012 at 3:57 AM, David Xu wrote: > Hi all, > > I wonder if the state of process in guestOS will change when the > corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its > credits and its state become over, how about the process context or softirq > context in guest OS on this vCPU? Does it still maintain the same running > state? Thanks. > I'm not sure what you mean "the same running state". The state of the vcpu -- the registers, the guest memory relating to it, and the fact that it's not blocked -- is the same. From the guest's perspective, it has temporarily frozen in time until it gets to run again. Does that answer your question? -George --001636c5b1944ae5a404ce4b137f Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Nov 11, 2012 at 3:57 AM, David Xu <davidxu06@gmail.com> wrote:
Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

I'm not sure what you mean "the same running= state".=A0 The state of the vcpu -- the registers, the guest memory r= elating to it, and the fact that it's not blocked -- is the same.=A0 Fr= om the guest's perspective, it has temporarily frozen in time until it = gets to run again.=A0 Does that answer your question?

=A0-George

--001636c5b1944ae5a404ce4b137f-- --===============4260752545493925165== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4260752545493925165==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 13:15:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 13:15:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXtr5-0000l1-HK; Mon, 12 Nov 2012 13:15:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXtr3-0000ko-8v for xen-devel@lists.xen.org; Mon, 12 Nov 2012 13:15:09 +0000 Received: from [85.158.138.51:10479] by server-9.bemta-3.messagelabs.com id A0/16-02388-956F0A05; Mon, 12 Nov 2012 13:15:05 +0000 X-Env-Sender: sunds@peapod.net X-Msg-Ref: server-5.tower-174.messagelabs.com!1352726103!29753142!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18077 invoked from network); 12 Nov 2012 13:15:04 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-5.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 13:15:04 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1527000bkc.32 for ; Mon, 12 Nov 2012 05:15:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=f3DxStGgJek993D1cehKq/xWh+Hln1hSLPSjIkwzmek=; b=G6A+7vGTidGyHIQEmlOxnmkCZZuJY4CMYp9zJKoo0Xf5KiHXuUHDPV5daYR8b/PCv/ AZOOT9bdkPWOqr6Idn0yTxq1TXTWscxqSk0I14KvmhIb6Jj0OX9LOzA4Ak9MHVie/FM2 qWa6OPkJwGCodzJvuV/hkMTngLFFDthcuoV2UlJZiusAR3ZuqmsiUsPeDNV/mCLwnIfC ppkH9lUPVXxTM0c+dPDwppxXW0L+zYBJfHq8PSAyIInScgYAySWQslm1/nyprEKc9A7h xF+SPUxEV+UI4e9S8gBeZui+1qesygh0cmDs7o7CIm7/5LJIhCrTLVaRLkeePlUiIzNl DFtQ== MIME-Version: 1.0 Received: by 10.204.128.155 with SMTP id k27mr6950264bks.26.1352726103542; Mon, 12 Nov 2012 05:15:03 -0800 (PST) Received: by 10.205.81.74 with HTTP; Mon, 12 Nov 2012 05:15:03 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 07:15:03 -0600 Message-ID: From: D Sundstrom To: Pablo Llopis X-Gm-Message-State: ALoCoQl2mXxZKdRe15qpvftkZs0ZozV8iyFtPqKzBh84+2aiZ9+jsrLrM+qFIICat1YSKdfGbDXm Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thank you Pablo. It makes no difference if I run both the src-add and map from the same domain or from different DomU domains. Whichever DomU I run the map function in crashes immediately. You mention Dom0. I just want to be clear that I'd like to share between two DomU domains. Have you gotten this to work? I also tried the userspace APIs provided by Xen such as xc_gnttab_map_grant_ref() and these also crash. Of course, these use the same driver IOCTLs, so this isn't a surprise. I'll need to see if I can get some debug info from the DomU kernel to make progress. If I can get this to work, are there any restrictions on sharing large amounts of memory? Say 160Mb? Or are grant tables intended for a small number of pages? Thanks, David On Mon, Nov 12, 2012 at 5:36 AM, Pablo Llopis wrote: > > It is not clear from your output from which domain you are running > each command. It looks like you are trying to issue a grant and map it > from within the same domain. That's probably the reason it crashes. > You are supposed to run this tool from both domains, running the calls > which interface with gntalloc from one domain, and the calls which > interface with gntdev from the other domain. > In any case, the domid you have to specify in the map must be the > domid of the domain which issued the grant. In other words, when > creating a grant, the domid which is granted access is specified. When > mapping a grant, the domid which issued the grant is specified. (i.e. > If you did "src-add 8" from dom0 you should run map 0 1372 from domU > 8) > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 13:15:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 13:15:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXtr5-0000l1-HK; Mon, 12 Nov 2012 13:15:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXtr3-0000ko-8v for xen-devel@lists.xen.org; Mon, 12 Nov 2012 13:15:09 +0000 Received: from [85.158.138.51:10479] by server-9.bemta-3.messagelabs.com id A0/16-02388-956F0A05; Mon, 12 Nov 2012 13:15:05 +0000 X-Env-Sender: sunds@peapod.net X-Msg-Ref: server-5.tower-174.messagelabs.com!1352726103!29753142!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18077 invoked from network); 12 Nov 2012 13:15:04 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-5.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 13:15:04 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1527000bkc.32 for ; Mon, 12 Nov 2012 05:15:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:x-gm-message-state; bh=f3DxStGgJek993D1cehKq/xWh+Hln1hSLPSjIkwzmek=; b=G6A+7vGTidGyHIQEmlOxnmkCZZuJY4CMYp9zJKoo0Xf5KiHXuUHDPV5daYR8b/PCv/ AZOOT9bdkPWOqr6Idn0yTxq1TXTWscxqSk0I14KvmhIb6Jj0OX9LOzA4Ak9MHVie/FM2 qWa6OPkJwGCodzJvuV/hkMTngLFFDthcuoV2UlJZiusAR3ZuqmsiUsPeDNV/mCLwnIfC ppkH9lUPVXxTM0c+dPDwppxXW0L+zYBJfHq8PSAyIInScgYAySWQslm1/nyprEKc9A7h xF+SPUxEV+UI4e9S8gBeZui+1qesygh0cmDs7o7CIm7/5LJIhCrTLVaRLkeePlUiIzNl DFtQ== MIME-Version: 1.0 Received: by 10.204.128.155 with SMTP id k27mr6950264bks.26.1352726103542; Mon, 12 Nov 2012 05:15:03 -0800 (PST) Received: by 10.205.81.74 with HTTP; Mon, 12 Nov 2012 05:15:03 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 07:15:03 -0600 Message-ID: From: D Sundstrom To: Pablo Llopis X-Gm-Message-State: ALoCoQl2mXxZKdRe15qpvftkZs0ZozV8iyFtPqKzBh84+2aiZ9+jsrLrM+qFIICat1YSKdfGbDXm Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Thank you Pablo. It makes no difference if I run both the src-add and map from the same domain or from different DomU domains. Whichever DomU I run the map function in crashes immediately. You mention Dom0. I just want to be clear that I'd like to share between two DomU domains. Have you gotten this to work? I also tried the userspace APIs provided by Xen such as xc_gnttab_map_grant_ref() and these also crash. Of course, these use the same driver IOCTLs, so this isn't a surprise. I'll need to see if I can get some debug info from the DomU kernel to make progress. If I can get this to work, are there any restrictions on sharing large amounts of memory? Say 160Mb? Or are grant tables intended for a small number of pages? Thanks, David On Mon, Nov 12, 2012 at 5:36 AM, Pablo Llopis wrote: > > It is not clear from your output from which domain you are running > each command. It looks like you are trying to issue a grant and map it > from within the same domain. That's probably the reason it crashes. > You are supposed to run this tool from both domains, running the calls > which interface with gntalloc from one domain, and the calls which > interface with gntdev from the other domain. > In any case, the domid you have to specify in the map must be the > domid of the domain which issued the grant. In other words, when > creating a grant, the domid which is granted access is specified. When > mapping a grant, the domid which issued the grant is specified. (i.e. > If you did "src-add 8" from dom0 you should run map 0 1372 from domU > 8) > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:29:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:29:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv0J-0001Oq-Bw; Mon, 12 Nov 2012 14:28:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv0I-0001Ol-3V for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:28:46 +0000 Received: from [85.158.139.211:14504] by server-11.bemta-5.messagelabs.com id 54/3C-03409-D9701A05; Mon, 12 Nov 2012 14:28:45 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352730522!19800526!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28022 invoked from network); 12 Nov 2012 14:28:44 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 14:28:44 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACESdNf023105 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 14:28:40 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACESdex011096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 14:28:39 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACEScQs009746; Mon, 12 Nov 2012 08:28:39 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 06:28:38 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id DDEB240380; Mon, 12 Nov 2012 09:28:35 -0500 (EST) Date: Mon, 12 Nov 2012 09:28:35 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352714084.27833.137.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > > Hey Ian, Xen-devel mailingl list, > > > > I think the issue of 70% traffic lost was actually introduced in v3.6 or > > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > > the releases introduced this. The issue we are seeing is that a domU > > to domU communication breaks - this is with netperf/netserver talking to > > each other. > > > > Anyhow, I think the 3.7 compound page exacerbated the problem and also > > (at least on some of my test hardware) exposed existing issues with > > drivers. The issue I have is that the 'skge' driver has a bug that has > > been there for ages (I tested way back to 3.0 and still saw it) were it > > can not work with SWIOTLB. It is probably missing an pci_dma_sync > > somewhere. > > > > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > > OK. Even with synthetic driver (the fake one I posted somewhere) it > > dealt with compound pages properly (with debug or non-debug Xen > > hypervisor). > > The debug build is probably most interesting since it deliberately > allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > issues. Right. My test env runs with that. And so far it only has issues with the skge one. > > > So was wondering if you had looked at this in more details? Any > > ideas? Or would it be more prudent to ask that once we know for sure > > which Linux release introduced the communication failures between > > guests? > > I've not looked at it any further I'm afraid. > > If these changes (be they in 3.5 or later, or earlier) are exposing > driver bugs then I suspect the netdev chaps would want to know about it. Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. And is off checking v3.6. v3.7 is definitly a no go. > > FWIW I see the issue with tg3. I should double-check that but I didn't get any issues with the tg3 I had. I was running the netperf/netserver from/to to see if I could reproduce the issues (70% loss) you described but did not have much luck. > > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:29:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:29:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv0J-0001Oq-Bw; Mon, 12 Nov 2012 14:28:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv0I-0001Ol-3V for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:28:46 +0000 Received: from [85.158.139.211:14504] by server-11.bemta-5.messagelabs.com id 54/3C-03409-D9701A05; Mon, 12 Nov 2012 14:28:45 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352730522!19800526!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28022 invoked from network); 12 Nov 2012 14:28:44 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 14:28:44 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACESdNf023105 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 14:28:40 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACESdex011096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 14:28:39 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACEScQs009746; Mon, 12 Nov 2012 08:28:39 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 06:28:38 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id DDEB240380; Mon, 12 Nov 2012 09:28:35 -0500 (EST) Date: Mon, 12 Nov 2012 09:28:35 -0500 From: Konrad Rzeszutek Wilk To: Ian Campbell Message-ID: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352714084.27833.137.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > > Hey Ian, Xen-devel mailingl list, > > > > I think the issue of 70% traffic lost was actually introduced in v3.6 or > > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > > the releases introduced this. The issue we are seeing is that a domU > > to domU communication breaks - this is with netperf/netserver talking to > > each other. > > > > Anyhow, I think the 3.7 compound page exacerbated the problem and also > > (at least on some of my test hardware) exposed existing issues with > > drivers. The issue I have is that the 'skge' driver has a bug that has > > been there for ages (I tested way back to 3.0 and still saw it) were it > > can not work with SWIOTLB. It is probably missing an pci_dma_sync > > somewhere. > > > > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > > OK. Even with synthetic driver (the fake one I posted somewhere) it > > dealt with compound pages properly (with debug or non-debug Xen > > hypervisor). > > The debug build is probably most interesting since it deliberately > allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > issues. Right. My test env runs with that. And so far it only has issues with the skge one. > > > So was wondering if you had looked at this in more details? Any > > ideas? Or would it be more prudent to ask that once we know for sure > > which Linux release introduced the communication failures between > > guests? > > I've not looked at it any further I'm afraid. > > If these changes (be they in 3.5 or later, or earlier) are exposing > driver bugs then I suspect the netdev chaps would want to know about it. Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. And is off checking v3.6. v3.7 is definitly a no go. > > FWIW I see the issue with tg3. I should double-check that but I didn't get any issues with the tg3 I had. I was running the netperf/netserver from/to to see if I could reproduce the issues (70% loss) you described but did not have much luck. > > Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:31:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:31:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv2B-0001T9-Sf; Mon, 12 Nov 2012 14:30:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv2A-0001T0-6c for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 14:30:42 +0000 Received: from [85.158.143.99:7402] by server-2.bemta-4.messagelabs.com id 96/FE-28922-11801A05; Mon, 12 Nov 2012 14:30:41 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-6.tower-216.messagelabs.com!1352730637!22571810!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10076 invoked from network); 12 Nov 2012 14:30:38 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 14:30:38 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148921743; Mon, 12 Nov 2012 09:30:10 -0500 From: Matthew Fioravante To: key@linux.vnet.ibm.com, mail@srajiv.net, tpmdd@selhorst.net, tpmdd@sirrix.com, konrad.wilk@oracle.com, jeremy@goop.org, tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Mon, 12 Nov 2012 09:29:58 -0500 Message-Id: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch ports the xen vtpm frontend driver for linux from the linux-2.6.18-xen.hg tree to linux-stable. This driver is designed be used with the mini-os tpmback driver in Xen as part of the new mini-os virtual tpm subsystem. See docs/misc/vtpm.txt in Xen and the xen-devel mailing list for details. Signed-off-by: Matthew Fioravante --- drivers/char/tpm/Kconfig | 11 + drivers/char/tpm/Makefile | 2 + drivers/char/tpm/tpm.h | 10 + drivers/char/tpm/xen-tpmfront_if.c | 688 ++++++++++++++++++++++++++++++++++ drivers/char/tpm/xen-tpmfront_vtpm.c | 543 +++++++++++++++++++++++++++ drivers/char/tpm/xen-tpmfront_vtpm.h | 55 +++ include/xen/interface/io/tpmif.h | 65 ++++ 7 files changed, 1374 insertions(+) create mode 100644 drivers/char/tpm/xen-tpmfront_if.c create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.c create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.h create mode 100644 include/xen/interface/io/tpmif.h diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 915875e..23d272f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -81,4 +81,15 @@ config TCG_IBMVTPM will be accessible from within Linux. To compile this driver as a module, choose M here; the module will be called tpm_ibmvtpm. +config TCG_XEN + tristate "XEN TPM Interface" + depends on TCG_TPM && XEN + ---help--- + If you want to make TPM support available to a Xen user domain, + say Yes and it will be accessible from within Linux. See + the manpages for xl, xl.conf, and docs/misc/vtpm.txt in + the Xen source repository for more details. + To compile this driver as a module, choose M here; the module + will be called xen-tpmfront. + endif # TCG_TPM diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 5b3fc8b..0161f05 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o +obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o +xen-tpmfront-y = xen-tpmfront_if.o xen-tpmfront_vtpm.o diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 8ef7649..b575892 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -328,6 +328,16 @@ extern int tpm_pm_resume(struct device *); extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, wait_queue_head_t *); +static inline void *chip_get_private(const struct tpm_chip *chip) +{ + return chip->vendor.data; +} + +static inline void chip_set_private(struct tpm_chip *chip, void *priv) +{ + chip->vendor.data = priv; +} + #ifdef CONFIG_ACPI extern int tpm_add_ppi(struct kobject *); extern void tpm_remove_ppi(struct kobject *); diff --git a/drivers/char/tpm/xen-tpmfront_if.c b/drivers/char/tpm/xen-tpmfront_if.c new file mode 100644 index 0000000..ba7fad8 --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_if.c @@ -0,0 +1,688 @@ +/* + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from drivers/xen/netfront/netfront.c + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "xen-tpmfront_vtpm.h" + +#define GRANT_INVALID_REF 0 + +/* local structures */ +struct tpm_private { + struct tpm_chip *chip; + + struct tpmif_tx_interface *tx; + atomic_t refcnt; + unsigned int evtchn; + u8 is_connected; + u8 is_suspended; + + spinlock_t tx_lock; + + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; + + atomic_t tx_busy; + void *tx_remember; + + domid_t backend_id; + wait_queue_head_t wait_q; + + struct xenbus_device *dev; + int ring_ref; +}; + +struct tx_buffer { + unsigned int size; /* available space in data */ + unsigned int len; /* used space in data */ + unsigned char *data; /* pointer to a page */ +}; + + +/* locally visible variables */ +static grant_ref_t gref_head; +static struct tpm_private *my_priv; + +/* local function prototypes */ +static irqreturn_t tpmif_int(int irq, + void *tpm_priv); +static void tpmif_rx_action(unsigned long unused); +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid); +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); +static void tpmif_free_tx_buffers(struct tpm_private *tp); +static void tpmif_set_connected_state(struct tpm_private *tp, + u8 newstate); +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int userbuffer, + void *remember); +static void destroy_tpmring(struct tpm_private *tp); + +static inline int +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, + int isuserbuffer) +{ + int copied = len; + + if (len > txb->size) + copied = txb->size; + if (isuserbuffer) { + if (copy_from_user(txb->data, src, copied)) + return -EFAULT; + } else { + memcpy(txb->data, src, copied); + } + txb->len = len; + return copied; +} + +static inline struct tx_buffer *tx_buffer_alloc(void) +{ + struct tx_buffer *txb; + + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); + if (!txb) + return NULL; + + txb->len = 0; + txb->size = PAGE_SIZE; + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); + if (txb->data == NULL) { + kfree(txb); + txb = NULL; + } + + return txb; +} + + +static inline void tx_buffer_free(struct tx_buffer *txb) +{ + if (txb) { + free_page((long)txb->data); + kfree(txb); + } +} + +/************************************************************** + Utility function for the tpm_private structure + **************************************************************/ +static void tpm_private_init(struct tpm_private *tp) +{ + spin_lock_init(&tp->tx_lock); + init_waitqueue_head(&tp->wait_q); + atomic_set(&tp->refcnt, 1); +} + +static void tpm_private_put(void) +{ + if (!atomic_dec_and_test(&my_priv->refcnt)) + return; + + tpmif_free_tx_buffers(my_priv); + kfree(my_priv); + my_priv = NULL; +} + +static struct tpm_private *tpm_private_get(void) +{ + int err; + + if (my_priv) { + atomic_inc(&my_priv->refcnt); + return my_priv; + } + + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); + if (!my_priv) + return NULL; + + tpm_private_init(my_priv); + err = tpmif_allocate_tx_buffers(my_priv); + if (err < 0) + tpm_private_put(); + + return my_priv; +} + +/************************************************************** + + The interface to let the tpm plugin register its callback + function and send data to another partition using this module + + **************************************************************/ + +static DEFINE_MUTEX(suspend_lock); +/* + * Send data via this module by calling this function + */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr) +{ + int sent; + + mutex_lock(&suspend_lock); + sent = tpm_xmit(tp, buf, count, 0, ptr); + mutex_unlock(&suspend_lock); + + return sent; +} + +/************************************************************** + XENBUS support code + **************************************************************/ + +static int setup_tpmring(struct xenbus_device *dev, + struct tpm_private *tp) +{ + struct tpmif_tx_interface *sring; + int err; + + tp->ring_ref = GRANT_INVALID_REF; + + sring = (void *)__get_free_page(GFP_KERNEL); + if (!sring) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); + return -ENOMEM; + } + tp->tx = sring; + + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); + if (err < 0) { + free_page((unsigned long)sring); + tp->tx = NULL; + xenbus_dev_fatal(dev, err, "allocating grant reference"); + goto fail; + } + tp->ring_ref = err; + + err = tpmif_connect(dev, tp, dev->otherend_id); + if (err) + goto fail; + + return 0; +fail: + destroy_tpmring(tp); + return err; +} + + +static void destroy_tpmring(struct tpm_private *tp) +{ + tpmif_set_connected_state(tp, 0); + + if (tp->ring_ref != GRANT_INVALID_REF) { + gnttab_end_foreign_access(tp->ring_ref, + 0, (unsigned long)tp->tx); + tp->ring_ref = GRANT_INVALID_REF; + tp->tx = NULL; + } + + if (tp->evtchn) + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); + + tp->evtchn = GRANT_INVALID_REF; +} + + +static int talk_to_backend(struct xenbus_device *dev, + struct tpm_private *tp) +{ + const char *message = NULL; + int err; + struct xenbus_transaction xbt; + + err = setup_tpmring(dev, tp); + if (err) { + xenbus_dev_fatal(dev, err, "setting up ring"); + goto out; + } + +again: + err = xenbus_transaction_start(&xbt); + if (err) { + xenbus_dev_fatal(dev, err, "starting transaction"); + goto destroy_tpmring; + } + + err = xenbus_printf(xbt, dev->nodename, + "ring-ref", "%u", tp->ring_ref); + if (err) { + message = "writing ring-ref"; + goto abort_transaction; + } + + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + tp->evtchn); + if (err) { + message = "writing event-channel"; + goto abort_transaction; + } + + err = xenbus_transaction_end(xbt, 0); + if (err == -EAGAIN) + goto again; + if (err) { + xenbus_dev_fatal(dev, err, "completing transaction"); + goto destroy_tpmring; + } + + xenbus_switch_state(dev, XenbusStateConnected); + + return 0; + +abort_transaction: + xenbus_transaction_end(xbt, 1); + if (message) + xenbus_dev_error(dev, err, "%s", message); +destroy_tpmring: + destroy_tpmring(tp); +out: + return err; +} + +/** + * Callback received when the backend's state changes. + */ +static void backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateReconfiguring: + case XenbusStateReconfigured: + case XenbusStateUnknown: + break; + + case XenbusStateConnected: + tpmif_set_connected_state(tp, 1); + break; + + case XenbusStateClosing: + tpmif_set_connected_state(tp, 0); + xenbus_frontend_closed(dev); + break; + + case XenbusStateClosed: + tpmif_set_connected_state(tp, 0); + if (tp->is_suspended == 0) + device_unregister(&dev->dev); + xenbus_frontend_closed(dev); + break; + } +} + +static int tpmfront_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int err; + int handle; + struct tpm_private *tp = tpm_private_get(); + + if (!tp) + return -ENOMEM; + + tp->chip = init_vtpm(&dev->dev, tp); + if (IS_ERR(tp->chip)) + return PTR_ERR(tp->chip); + + err = xenbus_scanf(XBT_NIL, dev->nodename, + "handle", "%i", &handle); + if (XENBUS_EXIST_ERR(err)) + return err; + + if (err < 0) { + xenbus_dev_fatal(dev, err, "reading virtual-device"); + return err; + } + + tp->dev = dev; + + err = talk_to_backend(dev, tp); + if (err) { + tpm_private_put(); + return err; + } + + return 0; +} + + +static int __devexit tpmfront_remove(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + cleanup_vtpm(&dev->dev); + return 0; +} + +static int tpmfront_suspend(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + u32 ctr; + + /* Take the lock, preventing any application from sending. */ + mutex_lock(&suspend_lock); + tp->is_suspended = 1; + + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { + /* Wait for a request to be responded to. */ + interruptible_sleep_on_timeout(&tp->wait_q, 100); + } + + return 0; +} + +static int tpmfront_suspend_finish(struct tpm_private *tp) +{ + tp->is_suspended = 0; + /* Allow applications to send again. */ + mutex_unlock(&suspend_lock); + return 0; +} + +static int tpmfront_resume(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + return talk_to_backend(dev, tp); +} + +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid) +{ + int err; + + tp->backend_id = domid; + tp->evtchn = GRANT_INVALID_REF; + + err = xenbus_alloc_evtchn(dev, &tp->evtchn); + if (err) + return err; + + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, + 0, "tpmif", tp); + if (err <= 0) + return err; + + return 0; +} + +static const struct xenbus_device_id tpmfront_ids[] = { + { "vtpm" }, + { "" } +}; +MODULE_ALIAS("xen:vtpm"); + +static DEFINE_XENBUS_DRIVER(tpmfront, , + .probe = tpmfront_probe, + .remove = __devexit_p(tpmfront_remove), + .resume = tpmfront_resume, + .otherend_changed = backend_changed, + .suspend = tpmfront_suspend, + ); + +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { + tp->tx_buffers[i] = tx_buffer_alloc(); + if (!tp->tx_buffers[i]) { + tpmif_free_tx_buffers(tp); + return -ENOMEM; + } + } + return 0; +} + +static void tpmif_free_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) + tx_buffer_free(tp->tx_buffers[i]); +} + +static void tpmif_rx_action(unsigned long priv) +{ + struct tpm_private *tp = (struct tpm_private *)priv; + int i = 0; + unsigned int received; + unsigned int offset = 0; + u8 *buffer; + struct tpmif_tx_request *tx = &tp->tx->ring[i].req; + + atomic_set(&tp->tx_busy, 0); + wake_up_interruptible(&tp->wait_q); + + received = tx->size; + + buffer = kmalloc(received, GFP_ATOMIC); + if (!buffer) + return; + + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + struct tpmif_tx_request *tx; + unsigned int tocopy; + + tx = &tp->tx->ring[i].req; + tocopy = tx->size; + if (tocopy > PAGE_SIZE) + tocopy = PAGE_SIZE; + + memcpy(&buffer[offset], txb->data, tocopy); + + gnttab_release_grant_reference(&gref_head, tx->ref); + + offset += tocopy; + } + + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); + kfree(buffer); +} + + +static irqreturn_t tpmif_int(int irq, void *tpm_priv) +{ + struct tpm_private *tp = tpm_priv; + unsigned long flags; + + spin_lock_irqsave(&tp->tx_lock, flags); + tpmif_rx_tasklet.data = (unsigned long)tp; + tasklet_schedule(&tpmif_rx_tasklet); + spin_unlock_irqrestore(&tp->tx_lock, flags); + + return IRQ_HANDLED; +} + + +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int isuserbuffer, + void *remember) +{ + struct tpmif_tx_request *tx; + int i; + unsigned int offset = 0; + + spin_lock_irq(&tp->tx_lock); + + if (unlikely(atomic_read(&tp->tx_busy))) { + spin_unlock_irq(&tp->tx_lock); + return -EBUSY; + } + + if (tp->is_connected != 1) { + spin_unlock_irq(&tp->tx_lock); + return -EIO; + } + + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + int copied; + + if (!txb) { + spin_unlock_irq(&tp->tx_lock); + return -EFAULT; + } + + copied = tx_buffer_copy(txb, &buf[offset], count, + isuserbuffer); + if (copied < 0) { + /* An error occurred */ + spin_unlock_irq(&tp->tx_lock); + return copied; + } + count -= copied; + offset += copied; + + tx = &tp->tx->ring[i].req; + tx->addr = virt_to_machine(txb->data).maddr; + tx->size = txb->len; + tx->unused = 0; + + /* Get the granttable reference for this page. */ + tx->ref = gnttab_claim_grant_reference(&gref_head); + if (tx->ref == -ENOSPC) { + spin_unlock_irq(&tp->tx_lock); + return -ENOSPC; + } + gnttab_grant_foreign_access_ref(tx->ref, + tp->backend_id, + virt_to_mfn(txb->data), + 0 /*RW*/); + wmb(); + } + + atomic_set(&tp->tx_busy, 1); + tp->tx_remember = remember; + + mb(); + + notify_remote_via_evtchn(tp->evtchn); + + spin_unlock_irq(&tp->tx_lock); + return offset; +} + + +static void tpmif_notify_upperlayer(struct tpm_private *tp) +{ + /* Notify upper layer about the state of the connection to the BE. */ + vtpm_vd_status(tp->chip, (tp->is_connected + ? TPM_VD_STATUS_CONNECTED + : TPM_VD_STATUS_DISCONNECTED)); +} + + +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) +{ + /* + * Don't notify upper layer if we are in suspend mode and + * should disconnect - assumption is that we will resume + * The mutex keeps apps from sending. + */ + if (is_connected == 0 && tp->is_suspended == 1) + return; + + /* + * Unlock the mutex if we are connected again + * after being suspended - now resuming. + * This also removes the suspend state. + */ + if (is_connected == 1 && tp->is_suspended == 1) + tpmfront_suspend_finish(tp); + + if (is_connected != tp->is_connected) { + tp->is_connected = is_connected; + tpmif_notify_upperlayer(tp); + } +} + + + +/* ================================================================= + * Initialization function. + * ================================================================= + */ + + +static int __init tpmif_init(void) +{ + struct tpm_private *tp; + + if (!xen_domain()) + return -ENODEV; + + tp = tpm_private_get(); + if (!tp) + return -ENOMEM; + + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, + &gref_head) < 0) { + tpm_private_put(); + return -EFAULT; + } + + return xenbus_register_frontend(&tpmfront_driver); +} +module_init(tpmif_init); + +static void __exit tpmif_exit(void) +{ + xenbus_unregister_driver(&tpmfront_driver); + gnttab_free_grant_references(gref_head); + tpm_private_put(); +} +module_exit(tpmif_exit); + +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.c b/drivers/char/tpm/xen-tpmfront_vtpm.c new file mode 100644 index 0000000..d70f1df --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_vtpm.c @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2006 IBM Corporation + * + * Authors: + * Stefan Berger + * + * Generic device driver part for device drivers in a virtualized + * environment. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + * + */ + +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "xen-tpmfront_vtpm.h" + +/* read status bits */ +enum { + STATUS_BUSY = 0x01, + STATUS_DATA_AVAIL = 0x02, + STATUS_READY = 0x04 +}; + +struct transmission { + struct list_head next; + + unsigned char *request; + size_t request_len; + size_t request_buflen; + + unsigned char *response; + size_t response_len; + size_t response_buflen; + + unsigned int flags; +}; + +enum { + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 +}; + + +enum { + DATAEX_FLAG_QUEUED_ONLY = 0x1 +}; + + +/* local variables */ + +/* local function prototypes */ +static int _vtpm_send_queued(struct tpm_chip *chip); + + +/* ============================================================= + * Some utility functions + * ============================================================= + */ +static void vtpm_state_init(struct vtpm_state *vtpms) +{ + vtpms->current_request = NULL; + spin_lock_init(&vtpms->req_list_lock); + init_waitqueue_head(&vtpms->req_wait_queue); + INIT_LIST_HEAD(&vtpms->queued_requests); + + vtpms->current_response = NULL; + spin_lock_init(&vtpms->resp_list_lock); + init_waitqueue_head(&vtpms->resp_wait_queue); + + vtpms->disconnect_time = jiffies; +} + + +static inline struct transmission *transmission_alloc(void) +{ + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); +} + +static unsigned char * +transmission_set_req_buffer(struct transmission *t, + unsigned char *buffer, size_t len) +{ + if (t->request_buflen < len) { + kfree(t->request); + t->request = kmalloc(len, GFP_KERNEL); + if (!t->request) { + t->request_buflen = 0; + return NULL; + } + t->request_buflen = len; + } + + memcpy(t->request, buffer, len); + t->request_len = len; + + return t->request; +} + +static unsigned char * +transmission_set_res_buffer(struct transmission *t, + const unsigned char *buffer, size_t len) +{ + if (t->response_buflen < len) { + kfree(t->response); + t->response = kmalloc(len, GFP_ATOMIC); + if (!t->response) { + t->response_buflen = 0; + return NULL; + } + t->response_buflen = len; + } + + memcpy(t->response, buffer, len); + t->response_len = len; + + return t->response; +} + +static inline void transmission_free(struct transmission *t) +{ + kfree(t->request); + kfree(t->response); + kfree(t); +} + +/* ============================================================= + * Interface with the lower layer driver + * ============================================================= + */ +/* + * Lower layer uses this function to make a response available. + */ +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, + void *ptr) +{ + unsigned long flags; + int ret_size = 0; + struct transmission *t; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * The list with requests must contain one request + * only and the element there must be the one that + * was passed to me from the front-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if (vtpms->current_request != ptr) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return 0; + } + t = vtpms->current_request; + if (t) { + transmission_free(t); + vtpms->current_request = NULL; + } + + t = transmission_alloc(); + if (t) { + if (!transmission_set_res_buffer(t, buffer, count)) { + transmission_free(t); + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return -ENOMEM; + } + ret_size = count; + vtpms->current_response = t; + wake_up_interruptible(&vtpms->resp_wait_queue); + } + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + + return ret_size; +} + + +/* + * Lower layer indicates its status (connected/disconnected) + */ +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) +{ + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + vtpms->vd_status = vd_status; + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) + vtpms->disconnect_time = jiffies; +} + +/* ============================================================= + * Interface with the generic TPM driver + * ============================================================= + */ +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * Check if the previous operation only queued the command + * In this case there won't be a response, so I just + * return from here and reset that flag. In any other + * case I should receive a response from the back-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + /* + * The first few commands (measurements) must be + * queued since it might not be possible to talk to the + * TPM, yet. + * Return a response of up to 30 '0's. + */ + + count = min_t(size_t, count, 30); + memset(buf, 0x0, count); + return count; + } + /* + * Check whether something is in the responselist and if + * there's nothing in the list wait for something to appear. + */ + + if (!vtpms->current_response) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, + 1000); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + rc = min(count, t->response_len); + memcpy(buf, t->response, rc); + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct transmission *t = transmission_alloc(); + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + if (!t) + return -ENOMEM; + /* + * If there's a current request, it must be the + * previous request that has timed out. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + if (vtpms->current_request != NULL) { + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" + " Previous request must have timed out.\n"); + transmission_free(vtpms->current_request); + vtpms->current_request = NULL; + } + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + /* + * Queue the packet if the driver below is not + * ready, yet, or there is any packet already + * in the queue. + * If the driver below is ready, unqueue all + * packets first before sending our current + * packet. + * For each unqueued packet, except for the + * last (=current) packet, call the function + * tpm_xen_recv to wait for the response to come + * back. + */ + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { + if (time_after(jiffies, + vtpms->disconnect_time + HZ * 10)) { + rc = -ENOENT; + } else { + goto queue_it; + } + } else { + /* + * Send all queued packets. + */ + if (_vtpm_send_queued(chip) == 0) { + + vtpms->current_request = t; + + rc = vtpm_vd_send(vtpms->tpm_private, + buf, + count, + t); + /* + * The generic TPM driver will call + * the function to receive the response. + */ + if (rc < 0) { + vtpms->current_request = NULL; + goto queue_it; + } + } else { +queue_it: + if (!transmission_set_req_buffer(t, buf, count)) { + transmission_free(t); + rc = -ENOMEM; + goto exit; + } + /* + * An error occurred. Don't event try + * to send the current request. Just + * queue it. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; + list_add_tail(&t->next, &vtpms->queued_requests); + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + } + } + +exit: + return rc; +} + + +/* + * Send all queued requests. + */ +static int _vtpm_send_queued(struct tpm_chip *chip) +{ + int rc; + int error = 0; + unsigned long flags; + unsigned char buffer[1]; + struct vtpm_state *vtpms; + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->req_list_lock, flags); + + while (!list_empty(&vtpms->queued_requests)) { + /* + * Need to dequeue them. + * Read the result into a dummy buffer. + */ + struct transmission *qt = (struct transmission *) + vtpms->queued_requests.next; + list_del(&qt->next); + vtpms->current_request = qt; + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + rc = vtpm_vd_send(vtpms->tpm_private, + qt->request, + qt->request_len, + qt); + + if (rc < 0) { + spin_lock_irqsave(&vtpms->req_list_lock, flags); + qt = vtpms->current_request; + if (qt != NULL) { + /* + * requeue it at the beginning + * of the list + */ + list_add(&qt->next, + &vtpms->queued_requests); + } + vtpms->current_request = NULL; + error = 1; + break; + } + /* + * After this point qt is not valid anymore! + * It is freed when the front-end is delivering + * the data by calling tpm_recv + */ + /* + * Receive response into provided dummy buffer + */ + rc = vtpm_recv(chip, buffer, sizeof(buffer)); + spin_lock_irqsave(&vtpms->req_list_lock, flags); + } + + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + return error; +} + +static void vtpm_cancel(struct tpm_chip *chip) +{ + unsigned long flags; + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + + if (!vtpms->current_response && vtpms->current_request) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on(&vtpms->resp_wait_queue); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); +} + +static u8 vtpm_status(struct tpm_chip *chip) +{ + u8 rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + /* + * Data are available if: + * - there's a current response + * - the last packet was queued only (this is fake, but necessary to + * get the generic TPM layer to call the receive function.) + */ + if (vtpms->current_response || + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { + rc = STATUS_DATA_AVAIL; + } else if (!vtpms->current_response && !vtpms->current_request) { + rc = STATUS_READY; + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static const struct file_operations vtpm_ops = { + .owner = THIS_MODULE, + .llseek = no_llseek, + .open = tpm_open, + .read = tpm_read, + .write = tpm_write, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, + NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute *vtpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + NULL, +}; + +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; + +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) + +static struct tpm_vendor_specific tpm_vtpm = { + .recv = vtpm_recv, + .send = vtpm_send, + .cancel = vtpm_cancel, + .status = vtpm_status, + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, + .req_complete_val = STATUS_DATA_AVAIL, + .req_canceled = STATUS_READY, + .attr_group = &vtpm_attr_grp, + .miscdev = { + .fops = &vtpm_ops, + }, + .duration = { + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + }, +}; + +struct tpm_chip *init_vtpm(struct device *dev, + struct tpm_private *tp) +{ + long rc; + struct tpm_chip *chip; + struct vtpm_state *vtpms; + + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); + if (!vtpms) + return ERR_PTR(-ENOMEM); + + vtpm_state_init(vtpms); + vtpms->tpm_private = tp; + + chip = tpm_register_hardware(dev, &tpm_vtpm); + if (!chip) { + rc = -ENODEV; + goto err_free_mem; + } + + chip_set_private(chip, vtpms); + + return chip; + +err_free_mem: + kfree(vtpms); + + return ERR_PTR(rc); +} + +void cleanup_vtpm(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + tpm_remove_hardware(dev); + kfree(vtpms); +} diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.h b/drivers/char/tpm/xen-tpmfront_vtpm.h new file mode 100644 index 0000000..16cf323 --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_vtpm.h @@ -0,0 +1,55 @@ +#ifndef XEN_TPMFRONT_VTPM_H +#define XEN_TPMFRONT_VTPM_H + +struct tpm_chip; +struct tpm_private; + +struct vtpm_state { + struct transmission *current_request; + spinlock_t req_list_lock; + wait_queue_head_t req_wait_queue; + + struct list_head queued_requests; + + struct transmission *current_response; + spinlock_t resp_list_lock; + wait_queue_head_t resp_wait_queue; + + u8 vd_status; + u8 flags; + + unsigned long disconnect_time; + + /* + * The following is a private structure of the underlying + * driver. It is passed as parameter in the send function. + */ + struct tpm_private *tpm_private; +}; + + +enum vdev_status { + TPM_VD_STATUS_DISCONNECTED = 0x0, + TPM_VD_STATUS_CONNECTED = 0x1 +}; + +/* this function is called from tpm_vtpm.c */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr); + +/* these functions are offered by tpm_vtpm.c */ +struct tpm_chip *init_vtpm(struct device *, + struct tpm_private *); +void cleanup_vtpm(struct device *); +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, void *ptr); +void vtpm_vd_status(const struct tpm_chip *, u8 status); + +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip->vendor.data; + return vtpms->tpm_private; +} + +#endif diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h new file mode 100644 index 0000000..c9e7294 --- /dev/null +++ b/include/xen/interface/io/tpmif.h @@ -0,0 +1,65 @@ +/****************************************************************************** + * tpmif.h + * + * TPM I/O interface for Xen guest OSes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from tools/libxc/xen/io/netif.h + * + * Copyright (c) 2003-2004, Keir Fraser + */ + +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ +#define __XEN_PUBLIC_IO_TPMIF_H__ + +#include "../grant_table.h" + +struct tpmif_tx_request { + unsigned long addr; /* Machine address of packet. */ + grant_ref_t ref; /* grant table access reference */ + uint16_t unused; + uint16_t size; /* Packet size in bytes. */ +}; +struct tpmif_tx_request; + +/* + * The TPMIF_TX_RING_SIZE defines the number of pages the + * front-end and backend can exchange (= size of array). + */ +#define TPMIF_TX_RING_SIZE 1 + +/* This structure must fit in a memory page. */ + +struct tpmif_ring { + struct tpmif_tx_request req; +}; +struct tpmif_ring; + +struct tpmif_tx_interface { + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; +}; +struct tpmif_tx_interface; + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:31:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:31:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv2B-0001T9-Sf; Mon, 12 Nov 2012 14:30:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXv2A-0001T0-6c for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 14:30:42 +0000 Received: from [85.158.143.99:7402] by server-2.bemta-4.messagelabs.com id 96/FE-28922-11801A05; Mon, 12 Nov 2012 14:30:41 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-6.tower-216.messagelabs.com!1352730637!22571810!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10076 invoked from network); 12 Nov 2012 14:30:38 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 14:30:38 -0000 Received: from ([128.244.206.185]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.148921743; Mon, 12 Nov 2012 09:30:10 -0500 From: Matthew Fioravante To: key@linux.vnet.ibm.com, mail@srajiv.net, tpmdd@selhorst.net, tpmdd@sirrix.com, konrad.wilk@oracle.com, jeremy@goop.org, tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com Date: Mon, 12 Nov 2012 09:29:58 -0500 Message-Id: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Fioravante Subject: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch ports the xen vtpm frontend driver for linux from the linux-2.6.18-xen.hg tree to linux-stable. This driver is designed be used with the mini-os tpmback driver in Xen as part of the new mini-os virtual tpm subsystem. See docs/misc/vtpm.txt in Xen and the xen-devel mailing list for details. Signed-off-by: Matthew Fioravante --- drivers/char/tpm/Kconfig | 11 + drivers/char/tpm/Makefile | 2 + drivers/char/tpm/tpm.h | 10 + drivers/char/tpm/xen-tpmfront_if.c | 688 ++++++++++++++++++++++++++++++++++ drivers/char/tpm/xen-tpmfront_vtpm.c | 543 +++++++++++++++++++++++++++ drivers/char/tpm/xen-tpmfront_vtpm.h | 55 +++ include/xen/interface/io/tpmif.h | 65 ++++ 7 files changed, 1374 insertions(+) create mode 100644 drivers/char/tpm/xen-tpmfront_if.c create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.c create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.h create mode 100644 include/xen/interface/io/tpmif.h diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 915875e..23d272f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -81,4 +81,15 @@ config TCG_IBMVTPM will be accessible from within Linux. To compile this driver as a module, choose M here; the module will be called tpm_ibmvtpm. +config TCG_XEN + tristate "XEN TPM Interface" + depends on TCG_TPM && XEN + ---help--- + If you want to make TPM support available to a Xen user domain, + say Yes and it will be accessible from within Linux. See + the manpages for xl, xl.conf, and docs/misc/vtpm.txt in + the Xen source repository for more details. + To compile this driver as a module, choose M here; the module + will be called xen-tpmfront. + endif # TCG_TPM diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index 5b3fc8b..0161f05 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o +obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o +xen-tpmfront-y = xen-tpmfront_if.o xen-tpmfront_vtpm.o diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 8ef7649..b575892 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -328,6 +328,16 @@ extern int tpm_pm_resume(struct device *); extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, wait_queue_head_t *); +static inline void *chip_get_private(const struct tpm_chip *chip) +{ + return chip->vendor.data; +} + +static inline void chip_set_private(struct tpm_chip *chip, void *priv) +{ + chip->vendor.data = priv; +} + #ifdef CONFIG_ACPI extern int tpm_add_ppi(struct kobject *); extern void tpm_remove_ppi(struct kobject *); diff --git a/drivers/char/tpm/xen-tpmfront_if.c b/drivers/char/tpm/xen-tpmfront_if.c new file mode 100644 index 0000000..ba7fad8 --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_if.c @@ -0,0 +1,688 @@ +/* + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from drivers/xen/netfront/netfront.c + * + * Copyright (c) 2002-2004, K A Fraser + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "xen-tpmfront_vtpm.h" + +#define GRANT_INVALID_REF 0 + +/* local structures */ +struct tpm_private { + struct tpm_chip *chip; + + struct tpmif_tx_interface *tx; + atomic_t refcnt; + unsigned int evtchn; + u8 is_connected; + u8 is_suspended; + + spinlock_t tx_lock; + + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; + + atomic_t tx_busy; + void *tx_remember; + + domid_t backend_id; + wait_queue_head_t wait_q; + + struct xenbus_device *dev; + int ring_ref; +}; + +struct tx_buffer { + unsigned int size; /* available space in data */ + unsigned int len; /* used space in data */ + unsigned char *data; /* pointer to a page */ +}; + + +/* locally visible variables */ +static grant_ref_t gref_head; +static struct tpm_private *my_priv; + +/* local function prototypes */ +static irqreturn_t tpmif_int(int irq, + void *tpm_priv); +static void tpmif_rx_action(unsigned long unused); +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid); +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); +static void tpmif_free_tx_buffers(struct tpm_private *tp); +static void tpmif_set_connected_state(struct tpm_private *tp, + u8 newstate); +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int userbuffer, + void *remember); +static void destroy_tpmring(struct tpm_private *tp); + +static inline int +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, + int isuserbuffer) +{ + int copied = len; + + if (len > txb->size) + copied = txb->size; + if (isuserbuffer) { + if (copy_from_user(txb->data, src, copied)) + return -EFAULT; + } else { + memcpy(txb->data, src, copied); + } + txb->len = len; + return copied; +} + +static inline struct tx_buffer *tx_buffer_alloc(void) +{ + struct tx_buffer *txb; + + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); + if (!txb) + return NULL; + + txb->len = 0; + txb->size = PAGE_SIZE; + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); + if (txb->data == NULL) { + kfree(txb); + txb = NULL; + } + + return txb; +} + + +static inline void tx_buffer_free(struct tx_buffer *txb) +{ + if (txb) { + free_page((long)txb->data); + kfree(txb); + } +} + +/************************************************************** + Utility function for the tpm_private structure + **************************************************************/ +static void tpm_private_init(struct tpm_private *tp) +{ + spin_lock_init(&tp->tx_lock); + init_waitqueue_head(&tp->wait_q); + atomic_set(&tp->refcnt, 1); +} + +static void tpm_private_put(void) +{ + if (!atomic_dec_and_test(&my_priv->refcnt)) + return; + + tpmif_free_tx_buffers(my_priv); + kfree(my_priv); + my_priv = NULL; +} + +static struct tpm_private *tpm_private_get(void) +{ + int err; + + if (my_priv) { + atomic_inc(&my_priv->refcnt); + return my_priv; + } + + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); + if (!my_priv) + return NULL; + + tpm_private_init(my_priv); + err = tpmif_allocate_tx_buffers(my_priv); + if (err < 0) + tpm_private_put(); + + return my_priv; +} + +/************************************************************** + + The interface to let the tpm plugin register its callback + function and send data to another partition using this module + + **************************************************************/ + +static DEFINE_MUTEX(suspend_lock); +/* + * Send data via this module by calling this function + */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr) +{ + int sent; + + mutex_lock(&suspend_lock); + sent = tpm_xmit(tp, buf, count, 0, ptr); + mutex_unlock(&suspend_lock); + + return sent; +} + +/************************************************************** + XENBUS support code + **************************************************************/ + +static int setup_tpmring(struct xenbus_device *dev, + struct tpm_private *tp) +{ + struct tpmif_tx_interface *sring; + int err; + + tp->ring_ref = GRANT_INVALID_REF; + + sring = (void *)__get_free_page(GFP_KERNEL); + if (!sring) { + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); + return -ENOMEM; + } + tp->tx = sring; + + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); + if (err < 0) { + free_page((unsigned long)sring); + tp->tx = NULL; + xenbus_dev_fatal(dev, err, "allocating grant reference"); + goto fail; + } + tp->ring_ref = err; + + err = tpmif_connect(dev, tp, dev->otherend_id); + if (err) + goto fail; + + return 0; +fail: + destroy_tpmring(tp); + return err; +} + + +static void destroy_tpmring(struct tpm_private *tp) +{ + tpmif_set_connected_state(tp, 0); + + if (tp->ring_ref != GRANT_INVALID_REF) { + gnttab_end_foreign_access(tp->ring_ref, + 0, (unsigned long)tp->tx); + tp->ring_ref = GRANT_INVALID_REF; + tp->tx = NULL; + } + + if (tp->evtchn) + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); + + tp->evtchn = GRANT_INVALID_REF; +} + + +static int talk_to_backend(struct xenbus_device *dev, + struct tpm_private *tp) +{ + const char *message = NULL; + int err; + struct xenbus_transaction xbt; + + err = setup_tpmring(dev, tp); + if (err) { + xenbus_dev_fatal(dev, err, "setting up ring"); + goto out; + } + +again: + err = xenbus_transaction_start(&xbt); + if (err) { + xenbus_dev_fatal(dev, err, "starting transaction"); + goto destroy_tpmring; + } + + err = xenbus_printf(xbt, dev->nodename, + "ring-ref", "%u", tp->ring_ref); + if (err) { + message = "writing ring-ref"; + goto abort_transaction; + } + + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", + tp->evtchn); + if (err) { + message = "writing event-channel"; + goto abort_transaction; + } + + err = xenbus_transaction_end(xbt, 0); + if (err == -EAGAIN) + goto again; + if (err) { + xenbus_dev_fatal(dev, err, "completing transaction"); + goto destroy_tpmring; + } + + xenbus_switch_state(dev, XenbusStateConnected); + + return 0; + +abort_transaction: + xenbus_transaction_end(xbt, 1); + if (message) + xenbus_dev_error(dev, err, "%s", message); +destroy_tpmring: + destroy_tpmring(tp); +out: + return err; +} + +/** + * Callback received when the backend's state changes. + */ +static void backend_changed(struct xenbus_device *dev, + enum xenbus_state backend_state) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + + switch (backend_state) { + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateReconfiguring: + case XenbusStateReconfigured: + case XenbusStateUnknown: + break; + + case XenbusStateConnected: + tpmif_set_connected_state(tp, 1); + break; + + case XenbusStateClosing: + tpmif_set_connected_state(tp, 0); + xenbus_frontend_closed(dev); + break; + + case XenbusStateClosed: + tpmif_set_connected_state(tp, 0); + if (tp->is_suspended == 0) + device_unregister(&dev->dev); + xenbus_frontend_closed(dev); + break; + } +} + +static int tpmfront_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) +{ + int err; + int handle; + struct tpm_private *tp = tpm_private_get(); + + if (!tp) + return -ENOMEM; + + tp->chip = init_vtpm(&dev->dev, tp); + if (IS_ERR(tp->chip)) + return PTR_ERR(tp->chip); + + err = xenbus_scanf(XBT_NIL, dev->nodename, + "handle", "%i", &handle); + if (XENBUS_EXIST_ERR(err)) + return err; + + if (err < 0) { + xenbus_dev_fatal(dev, err, "reading virtual-device"); + return err; + } + + tp->dev = dev; + + err = talk_to_backend(dev, tp); + if (err) { + tpm_private_put(); + return err; + } + + return 0; +} + + +static int __devexit tpmfront_remove(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + cleanup_vtpm(&dev->dev); + return 0; +} + +static int tpmfront_suspend(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + u32 ctr; + + /* Take the lock, preventing any application from sending. */ + mutex_lock(&suspend_lock); + tp->is_suspended = 1; + + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { + /* Wait for a request to be responded to. */ + interruptible_sleep_on_timeout(&tp->wait_q, 100); + } + + return 0; +} + +static int tpmfront_suspend_finish(struct tpm_private *tp) +{ + tp->is_suspended = 0; + /* Allow applications to send again. */ + mutex_unlock(&suspend_lock); + return 0; +} + +static int tpmfront_resume(struct xenbus_device *dev) +{ + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); + destroy_tpmring(tp); + return talk_to_backend(dev, tp); +} + +static int tpmif_connect(struct xenbus_device *dev, + struct tpm_private *tp, + domid_t domid) +{ + int err; + + tp->backend_id = domid; + tp->evtchn = GRANT_INVALID_REF; + + err = xenbus_alloc_evtchn(dev, &tp->evtchn); + if (err) + return err; + + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, + 0, "tpmif", tp); + if (err <= 0) + return err; + + return 0; +} + +static const struct xenbus_device_id tpmfront_ids[] = { + { "vtpm" }, + { "" } +}; +MODULE_ALIAS("xen:vtpm"); + +static DEFINE_XENBUS_DRIVER(tpmfront, , + .probe = tpmfront_probe, + .remove = __devexit_p(tpmfront_remove), + .resume = tpmfront_resume, + .otherend_changed = backend_changed, + .suspend = tpmfront_suspend, + ); + +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { + tp->tx_buffers[i] = tx_buffer_alloc(); + if (!tp->tx_buffers[i]) { + tpmif_free_tx_buffers(tp); + return -ENOMEM; + } + } + return 0; +} + +static void tpmif_free_tx_buffers(struct tpm_private *tp) +{ + unsigned int i; + + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) + tx_buffer_free(tp->tx_buffers[i]); +} + +static void tpmif_rx_action(unsigned long priv) +{ + struct tpm_private *tp = (struct tpm_private *)priv; + int i = 0; + unsigned int received; + unsigned int offset = 0; + u8 *buffer; + struct tpmif_tx_request *tx = &tp->tx->ring[i].req; + + atomic_set(&tp->tx_busy, 0); + wake_up_interruptible(&tp->wait_q); + + received = tx->size; + + buffer = kmalloc(received, GFP_ATOMIC); + if (!buffer) + return; + + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + struct tpmif_tx_request *tx; + unsigned int tocopy; + + tx = &tp->tx->ring[i].req; + tocopy = tx->size; + if (tocopy > PAGE_SIZE) + tocopy = PAGE_SIZE; + + memcpy(&buffer[offset], txb->data, tocopy); + + gnttab_release_grant_reference(&gref_head, tx->ref); + + offset += tocopy; + } + + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); + kfree(buffer); +} + + +static irqreturn_t tpmif_int(int irq, void *tpm_priv) +{ + struct tpm_private *tp = tpm_priv; + unsigned long flags; + + spin_lock_irqsave(&tp->tx_lock, flags); + tpmif_rx_tasklet.data = (unsigned long)tp; + tasklet_schedule(&tpmif_rx_tasklet); + spin_unlock_irqrestore(&tp->tx_lock, flags); + + return IRQ_HANDLED; +} + + +static int tpm_xmit(struct tpm_private *tp, + const u8 *buf, size_t count, int isuserbuffer, + void *remember) +{ + struct tpmif_tx_request *tx; + int i; + unsigned int offset = 0; + + spin_lock_irq(&tp->tx_lock); + + if (unlikely(atomic_read(&tp->tx_busy))) { + spin_unlock_irq(&tp->tx_lock); + return -EBUSY; + } + + if (tp->is_connected != 1) { + spin_unlock_irq(&tp->tx_lock); + return -EIO; + } + + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { + struct tx_buffer *txb = tp->tx_buffers[i]; + int copied; + + if (!txb) { + spin_unlock_irq(&tp->tx_lock); + return -EFAULT; + } + + copied = tx_buffer_copy(txb, &buf[offset], count, + isuserbuffer); + if (copied < 0) { + /* An error occurred */ + spin_unlock_irq(&tp->tx_lock); + return copied; + } + count -= copied; + offset += copied; + + tx = &tp->tx->ring[i].req; + tx->addr = virt_to_machine(txb->data).maddr; + tx->size = txb->len; + tx->unused = 0; + + /* Get the granttable reference for this page. */ + tx->ref = gnttab_claim_grant_reference(&gref_head); + if (tx->ref == -ENOSPC) { + spin_unlock_irq(&tp->tx_lock); + return -ENOSPC; + } + gnttab_grant_foreign_access_ref(tx->ref, + tp->backend_id, + virt_to_mfn(txb->data), + 0 /*RW*/); + wmb(); + } + + atomic_set(&tp->tx_busy, 1); + tp->tx_remember = remember; + + mb(); + + notify_remote_via_evtchn(tp->evtchn); + + spin_unlock_irq(&tp->tx_lock); + return offset; +} + + +static void tpmif_notify_upperlayer(struct tpm_private *tp) +{ + /* Notify upper layer about the state of the connection to the BE. */ + vtpm_vd_status(tp->chip, (tp->is_connected + ? TPM_VD_STATUS_CONNECTED + : TPM_VD_STATUS_DISCONNECTED)); +} + + +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) +{ + /* + * Don't notify upper layer if we are in suspend mode and + * should disconnect - assumption is that we will resume + * The mutex keeps apps from sending. + */ + if (is_connected == 0 && tp->is_suspended == 1) + return; + + /* + * Unlock the mutex if we are connected again + * after being suspended - now resuming. + * This also removes the suspend state. + */ + if (is_connected == 1 && tp->is_suspended == 1) + tpmfront_suspend_finish(tp); + + if (is_connected != tp->is_connected) { + tp->is_connected = is_connected; + tpmif_notify_upperlayer(tp); + } +} + + + +/* ================================================================= + * Initialization function. + * ================================================================= + */ + + +static int __init tpmif_init(void) +{ + struct tpm_private *tp; + + if (!xen_domain()) + return -ENODEV; + + tp = tpm_private_get(); + if (!tp) + return -ENOMEM; + + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, + &gref_head) < 0) { + tpm_private_put(); + return -EFAULT; + } + + return xenbus_register_frontend(&tpmfront_driver); +} +module_init(tpmif_init); + +static void __exit tpmif_exit(void) +{ + xenbus_unregister_driver(&tpmfront_driver); + gnttab_free_grant_references(gref_head); + tpm_private_put(); +} +module_exit(tpmif_exit); + +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.c b/drivers/char/tpm/xen-tpmfront_vtpm.c new file mode 100644 index 0000000..d70f1df --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_vtpm.c @@ -0,0 +1,543 @@ +/* + * Copyright (C) 2006 IBM Corporation + * + * Authors: + * Stefan Berger + * + * Generic device driver part for device drivers in a virtualized + * environment. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + * + */ + +#include +#include +#include +#include +#include +#include +#include "tpm.h" +#include "xen-tpmfront_vtpm.h" + +/* read status bits */ +enum { + STATUS_BUSY = 0x01, + STATUS_DATA_AVAIL = 0x02, + STATUS_READY = 0x04 +}; + +struct transmission { + struct list_head next; + + unsigned char *request; + size_t request_len; + size_t request_buflen; + + unsigned char *response; + size_t response_len; + size_t response_buflen; + + unsigned int flags; +}; + +enum { + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 +}; + + +enum { + DATAEX_FLAG_QUEUED_ONLY = 0x1 +}; + + +/* local variables */ + +/* local function prototypes */ +static int _vtpm_send_queued(struct tpm_chip *chip); + + +/* ============================================================= + * Some utility functions + * ============================================================= + */ +static void vtpm_state_init(struct vtpm_state *vtpms) +{ + vtpms->current_request = NULL; + spin_lock_init(&vtpms->req_list_lock); + init_waitqueue_head(&vtpms->req_wait_queue); + INIT_LIST_HEAD(&vtpms->queued_requests); + + vtpms->current_response = NULL; + spin_lock_init(&vtpms->resp_list_lock); + init_waitqueue_head(&vtpms->resp_wait_queue); + + vtpms->disconnect_time = jiffies; +} + + +static inline struct transmission *transmission_alloc(void) +{ + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); +} + +static unsigned char * +transmission_set_req_buffer(struct transmission *t, + unsigned char *buffer, size_t len) +{ + if (t->request_buflen < len) { + kfree(t->request); + t->request = kmalloc(len, GFP_KERNEL); + if (!t->request) { + t->request_buflen = 0; + return NULL; + } + t->request_buflen = len; + } + + memcpy(t->request, buffer, len); + t->request_len = len; + + return t->request; +} + +static unsigned char * +transmission_set_res_buffer(struct transmission *t, + const unsigned char *buffer, size_t len) +{ + if (t->response_buflen < len) { + kfree(t->response); + t->response = kmalloc(len, GFP_ATOMIC); + if (!t->response) { + t->response_buflen = 0; + return NULL; + } + t->response_buflen = len; + } + + memcpy(t->response, buffer, len); + t->response_len = len; + + return t->response; +} + +static inline void transmission_free(struct transmission *t) +{ + kfree(t->request); + kfree(t->response); + kfree(t); +} + +/* ============================================================= + * Interface with the lower layer driver + * ============================================================= + */ +/* + * Lower layer uses this function to make a response available. + */ +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, + void *ptr) +{ + unsigned long flags; + int ret_size = 0; + struct transmission *t; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * The list with requests must contain one request + * only and the element there must be the one that + * was passed to me from the front-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if (vtpms->current_request != ptr) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return 0; + } + t = vtpms->current_request; + if (t) { + transmission_free(t); + vtpms->current_request = NULL; + } + + t = transmission_alloc(); + if (t) { + if (!transmission_set_res_buffer(t, buffer, count)) { + transmission_free(t); + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return -ENOMEM; + } + ret_size = count; + vtpms->current_response = t; + wake_up_interruptible(&vtpms->resp_wait_queue); + } + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + + return ret_size; +} + + +/* + * Lower layer indicates its status (connected/disconnected) + */ +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) +{ + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + vtpms->vd_status = vd_status; + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) + vtpms->disconnect_time = jiffies; +} + +/* ============================================================= + * Interface with the generic TPM driver + * ============================================================= + */ +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + /* + * Check if the previous operation only queued the command + * In this case there won't be a response, so I just + * return from here and reset that flag. In any other + * case I should receive a response from the back-end. + */ + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + /* + * The first few commands (measurements) must be + * queued since it might not be possible to talk to the + * TPM, yet. + * Return a response of up to 30 '0's. + */ + + count = min_t(size_t, count, 30); + memset(buf, 0x0, count); + return count; + } + /* + * Check whether something is in the responselist and if + * there's nothing in the list wait for something to appear. + */ + + if (!vtpms->current_response) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, + 1000); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + rc = min(count, t->response_len); + memcpy(buf, t->response, rc); + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) +{ + int rc = 0; + unsigned long flags; + struct transmission *t = transmission_alloc(); + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + if (!t) + return -ENOMEM; + /* + * If there's a current request, it must be the + * previous request that has timed out. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + if (vtpms->current_request != NULL) { + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" + " Previous request must have timed out.\n"); + transmission_free(vtpms->current_request); + vtpms->current_request = NULL; + } + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + /* + * Queue the packet if the driver below is not + * ready, yet, or there is any packet already + * in the queue. + * If the driver below is ready, unqueue all + * packets first before sending our current + * packet. + * For each unqueued packet, except for the + * last (=current) packet, call the function + * tpm_xen_recv to wait for the response to come + * back. + */ + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { + if (time_after(jiffies, + vtpms->disconnect_time + HZ * 10)) { + rc = -ENOENT; + } else { + goto queue_it; + } + } else { + /* + * Send all queued packets. + */ + if (_vtpm_send_queued(chip) == 0) { + + vtpms->current_request = t; + + rc = vtpm_vd_send(vtpms->tpm_private, + buf, + count, + t); + /* + * The generic TPM driver will call + * the function to receive the response. + */ + if (rc < 0) { + vtpms->current_request = NULL; + goto queue_it; + } + } else { +queue_it: + if (!transmission_set_req_buffer(t, buf, count)) { + transmission_free(t); + rc = -ENOMEM; + goto exit; + } + /* + * An error occurred. Don't event try + * to send the current request. Just + * queue it. + */ + spin_lock_irqsave(&vtpms->req_list_lock, flags); + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; + list_add_tail(&t->next, &vtpms->queued_requests); + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + } + } + +exit: + return rc; +} + + +/* + * Send all queued requests. + */ +static int _vtpm_send_queued(struct tpm_chip *chip) +{ + int rc; + int error = 0; + unsigned long flags; + unsigned char buffer[1]; + struct vtpm_state *vtpms; + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->req_list_lock, flags); + + while (!list_empty(&vtpms->queued_requests)) { + /* + * Need to dequeue them. + * Read the result into a dummy buffer. + */ + struct transmission *qt = (struct transmission *) + vtpms->queued_requests.next; + list_del(&qt->next); + vtpms->current_request = qt; + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + rc = vtpm_vd_send(vtpms->tpm_private, + qt->request, + qt->request_len, + qt); + + if (rc < 0) { + spin_lock_irqsave(&vtpms->req_list_lock, flags); + qt = vtpms->current_request; + if (qt != NULL) { + /* + * requeue it at the beginning + * of the list + */ + list_add(&qt->next, + &vtpms->queued_requests); + } + vtpms->current_request = NULL; + error = 1; + break; + } + /* + * After this point qt is not valid anymore! + * It is freed when the front-end is delivering + * the data by calling tpm_recv + */ + /* + * Receive response into provided dummy buffer + */ + rc = vtpm_recv(chip, buffer, sizeof(buffer)); + spin_lock_irqsave(&vtpms->req_list_lock, flags); + } + + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); + + return error; +} + +static void vtpm_cancel(struct tpm_chip *chip) +{ + unsigned long flags; + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + + if (!vtpms->current_response && vtpms->current_request) { + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + interruptible_sleep_on(&vtpms->resp_wait_queue); + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + } + + if (vtpms->current_response) { + struct transmission *t = vtpms->current_response; + vtpms->current_response = NULL; + transmission_free(t); + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); +} + +static u8 vtpm_status(struct tpm_chip *chip) +{ + u8 rc = 0; + unsigned long flags; + struct vtpm_state *vtpms; + + vtpms = (struct vtpm_state *)chip_get_private(chip); + + spin_lock_irqsave(&vtpms->resp_list_lock, flags); + /* + * Data are available if: + * - there's a current response + * - the last packet was queued only (this is fake, but necessary to + * get the generic TPM layer to call the receive function.) + */ + if (vtpms->current_response || + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { + rc = STATUS_DATA_AVAIL; + } else if (!vtpms->current_response && !vtpms->current_request) { + rc = STATUS_READY; + } + + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); + return rc; +} + +static const struct file_operations vtpm_ops = { + .owner = THIS_MODULE, + .llseek = no_llseek, + .open = tpm_open, + .read = tpm_read, + .write = tpm_write, + .release = tpm_release, +}; + +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, + NULL); +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); + +static struct attribute *vtpm_attrs[] = { + &dev_attr_pubek.attr, + &dev_attr_pcrs.attr, + &dev_attr_enabled.attr, + &dev_attr_active.attr, + &dev_attr_owned.attr, + &dev_attr_temp_deactivated.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, + NULL, +}; + +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; + +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) + +static struct tpm_vendor_specific tpm_vtpm = { + .recv = vtpm_recv, + .send = vtpm_send, + .cancel = vtpm_cancel, + .status = vtpm_status, + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, + .req_complete_val = STATUS_DATA_AVAIL, + .req_canceled = STATUS_READY, + .attr_group = &vtpm_attr_grp, + .miscdev = { + .fops = &vtpm_ops, + }, + .duration = { + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + TPM_LONG_TIMEOUT, + }, +}; + +struct tpm_chip *init_vtpm(struct device *dev, + struct tpm_private *tp) +{ + long rc; + struct tpm_chip *chip; + struct vtpm_state *vtpms; + + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); + if (!vtpms) + return ERR_PTR(-ENOMEM); + + vtpm_state_init(vtpms); + vtpms->tpm_private = tp; + + chip = tpm_register_hardware(dev, &tpm_vtpm); + if (!chip) { + rc = -ENODEV; + goto err_free_mem; + } + + chip_set_private(chip, vtpms); + + return chip; + +err_free_mem: + kfree(vtpms); + + return ERR_PTR(rc); +} + +void cleanup_vtpm(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); + tpm_remove_hardware(dev); + kfree(vtpms); +} diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.h b/drivers/char/tpm/xen-tpmfront_vtpm.h new file mode 100644 index 0000000..16cf323 --- /dev/null +++ b/drivers/char/tpm/xen-tpmfront_vtpm.h @@ -0,0 +1,55 @@ +#ifndef XEN_TPMFRONT_VTPM_H +#define XEN_TPMFRONT_VTPM_H + +struct tpm_chip; +struct tpm_private; + +struct vtpm_state { + struct transmission *current_request; + spinlock_t req_list_lock; + wait_queue_head_t req_wait_queue; + + struct list_head queued_requests; + + struct transmission *current_response; + spinlock_t resp_list_lock; + wait_queue_head_t resp_wait_queue; + + u8 vd_status; + u8 flags; + + unsigned long disconnect_time; + + /* + * The following is a private structure of the underlying + * driver. It is passed as parameter in the send function. + */ + struct tpm_private *tpm_private; +}; + + +enum vdev_status { + TPM_VD_STATUS_DISCONNECTED = 0x0, + TPM_VD_STATUS_CONNECTED = 0x1 +}; + +/* this function is called from tpm_vtpm.c */ +int vtpm_vd_send(struct tpm_private *tp, + const u8 *buf, size_t count, void *ptr); + +/* these functions are offered by tpm_vtpm.c */ +struct tpm_chip *init_vtpm(struct device *, + struct tpm_private *); +void cleanup_vtpm(struct device *); +int vtpm_vd_recv(const struct tpm_chip *chip, + const unsigned char *buffer, size_t count, void *ptr); +void vtpm_vd_status(const struct tpm_chip *, u8 status); + +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) +{ + struct tpm_chip *chip = dev_get_drvdata(dev); + struct vtpm_state *vtpms = (struct vtpm_state *)chip->vendor.data; + return vtpms->tpm_private; +} + +#endif diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h new file mode 100644 index 0000000..c9e7294 --- /dev/null +++ b/include/xen/interface/io/tpmif.h @@ -0,0 +1,65 @@ +/****************************************************************************** + * tpmif.h + * + * TPM I/O interface for Xen guest OSes. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2005, IBM Corporation + * + * Author: Stefan Berger, stefanb@us.ibm.com + * Grant table support: Mahadevan Gomathisankaran + * + * This code has been derived from tools/libxc/xen/io/netif.h + * + * Copyright (c) 2003-2004, Keir Fraser + */ + +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ +#define __XEN_PUBLIC_IO_TPMIF_H__ + +#include "../grant_table.h" + +struct tpmif_tx_request { + unsigned long addr; /* Machine address of packet. */ + grant_ref_t ref; /* grant table access reference */ + uint16_t unused; + uint16_t size; /* Packet size in bytes. */ +}; +struct tpmif_tx_request; + +/* + * The TPMIF_TX_RING_SIZE defines the number of pages the + * front-end and backend can exchange (= size of array). + */ +#define TPMIF_TX_RING_SIZE 1 + +/* This structure must fit in a memory page. */ + +struct tpmif_ring { + struct tpmif_tx_request req; +}; +struct tpmif_ring; + +struct tpmif_tx_interface { + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; +}; +struct tpmif_tx_interface; + +#endif -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:43:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvDN-0001oI-9v; Mon, 12 Nov 2012 14:42:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvDM-0001oD-21 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:42:16 +0000 Received: from [85.158.143.35:53299] by server-3.bemta-4.messagelabs.com id A2/15-06841-7CA01A05; Mon, 12 Nov 2012 14:42:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1352731317!15551671!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20951 invoked from network); 12 Nov 2012 14:41:58 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 14:41:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15751997" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 14:41:50 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 14:41:49 +0000 Message-ID: <1352731308.27833.253.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 12 Nov 2012 14:41:48 +0000 In-Reply-To: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > FWIW I see the issue with tg3. > > I should double-check that but I didn't get any issues with the tg3 I had. > > I was running the netperf/netserver from/to to see if I could reproduce the > issues (70% loss) you described but did not have much luck. I was running from offbox to a domU, if that helps. It only happened in one direction but I can't recall which. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:43:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:43:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvDN-0001oI-9v; Mon, 12 Nov 2012 14:42:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvDM-0001oD-21 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:42:16 +0000 Received: from [85.158.143.35:53299] by server-3.bemta-4.messagelabs.com id A2/15-06841-7CA01A05; Mon, 12 Nov 2012 14:42:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1352731317!15551671!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20951 invoked from network); 12 Nov 2012 14:41:58 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 14:41:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15751997" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 14:41:50 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 14:41:49 +0000 Message-ID: <1352731308.27833.253.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Konrad Rzeszutek Wilk Date: Mon, 12 Nov 2012 14:41:48 +0000 In-Reply-To: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "annie.li@oracle.com" , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > > FWIW I see the issue with tg3. > > I should double-check that but I didn't get any issues with the tg3 I had. > > I was running the netperf/netserver from/to to see if I could reproduce the > issues (70% loss) you described but did not have much luck. I was running from offbox to a domU, if that helps. It only happened in one direction but I can't recall which. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:51:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:51:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvLL-0001xf-8p; Mon, 12 Nov 2012 14:50:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvLJ-0001xW-Lk for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:50:29 +0000 Received: from [85.158.139.83:3943] by server-1.bemta-5.messagelabs.com id BD/DC-05877-4BC01A05; Mon, 12 Nov 2012 14:50:28 +0000 X-Env-Sender: linux@eikelenboom.it X-Msg-Ref: server-7.tower-182.messagelabs.com!1352731827!25945678!1 X-Originating-IP: [188.40.164.121] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18247 invoked from network); 12 Nov 2012 14:50:27 -0000 Received: from static.121.164.40.188.clients.your-server.de (HELO smtp.eikelenboom.it) (188.40.164.121) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2012 14:50:27 -0000 Received: from 102-64-ftth.on.nl ([88.159.64.102]:53686 helo=[172.16.1.20]) by smtp.eikelenboom.it with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TXvO1-0005ce-0v; Mon, 12 Nov 2012 15:53:17 +0100 Date: Mon, 12 Nov 2012 15:50:24 +0100 From: Sander Eikelenboom Organization: Eikelenboom IT services X-Priority: 3 (Normal) Message-ID: <711956045.20121112155024@eikelenboom.it> To: Konrad Rzeszutek Wilk In-Reply-To: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> MIME-Version: 1.0 Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Monday, November 12, 2012, 3:28:35 PM, you wrote: > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: >> > Hey Ian, Xen-devel mailingl list, >> > >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of >> > the releases introduced this. The issue we are seeing is that a domU >> > to domU communication breaks - this is with netperf/netserver talking to >> > each other. >> > >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also >> > (at least on some of my test hardware) exposed existing issues with >> > drivers. The issue I have is that the 'skge' driver has a bug that has >> > been there for ages (I tested way back to 3.0 and still saw it) were it >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync >> > somewhere. >> > >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks >> > OK. Even with synthetic driver (the fake one I posted somewhere) it >> > dealt with compound pages properly (with debug or non-debug Xen >> > hypervisor). >> >> The debug build is probably most interesting since it deliberately >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of >> issues. > Right. My test env runs with that. And so far it only has issues > with the skge one. >> >> > So was wondering if you had looked at this in more details? Any >> > ideas? Or would it be more prudent to ask that once we know for sure >> > which Linux release introduced the communication failures between >> > guests? >> >> I've not looked at it any further I'm afraid. >> >> If these changes (be they in 3.5 or later, or earlier) are exposing >> driver bugs then I suspect the netdev chaps would want to know about it. > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > And is off checking v3.6. v3.7 is definitly a no go. >> >> FWIW I see the issue with tg3. After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. -- Sander > I should double-check that but I didn't get any issues with the tg3 I had. > I was running the netperf/netserver from/to to see if I could reproduce the > issues (70% loss) you described but did not have much luck. >> >> Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 14:51:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 14:51:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvLL-0001xf-8p; Mon, 12 Nov 2012 14:50:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvLJ-0001xW-Lk for xen-devel@lists.xen.org; Mon, 12 Nov 2012 14:50:29 +0000 Received: from [85.158.139.83:3943] by server-1.bemta-5.messagelabs.com id BD/DC-05877-4BC01A05; Mon, 12 Nov 2012 14:50:28 +0000 X-Env-Sender: linux@eikelenboom.it X-Msg-Ref: server-7.tower-182.messagelabs.com!1352731827!25945678!1 X-Originating-IP: [188.40.164.121] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18247 invoked from network); 12 Nov 2012 14:50:27 -0000 Received: from static.121.164.40.188.clients.your-server.de (HELO smtp.eikelenboom.it) (188.40.164.121) by server-7.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2012 14:50:27 -0000 Received: from 102-64-ftth.on.nl ([88.159.64.102]:53686 helo=[172.16.1.20]) by smtp.eikelenboom.it with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TXvO1-0005ce-0v; Mon, 12 Nov 2012 15:53:17 +0100 Date: Mon, 12 Nov 2012 15:50:24 +0100 From: Sander Eikelenboom Organization: Eikelenboom IT services X-Priority: 3 (Normal) Message-ID: <711956045.20121112155024@eikelenboom.it> To: Konrad Rzeszutek Wilk In-Reply-To: <20121112142835.GG19860@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> MIME-Version: 1.0 Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Monday, November 12, 2012, 3:28:35 PM, you wrote: > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: >> > Hey Ian, Xen-devel mailingl list, >> > >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of >> > the releases introduced this. The issue we are seeing is that a domU >> > to domU communication breaks - this is with netperf/netserver talking to >> > each other. >> > >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also >> > (at least on some of my test hardware) exposed existing issues with >> > drivers. The issue I have is that the 'skge' driver has a bug that has >> > been there for ages (I tested way back to 3.0 and still saw it) were it >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync >> > somewhere. >> > >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks >> > OK. Even with synthetic driver (the fake one I posted somewhere) it >> > dealt with compound pages properly (with debug or non-debug Xen >> > hypervisor). >> >> The debug build is probably most interesting since it deliberately >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of >> issues. > Right. My test env runs with that. And so far it only has issues > with the skge one. >> >> > So was wondering if you had looked at this in more details? Any >> > ideas? Or would it be more prudent to ask that once we know for sure >> > which Linux release introduced the communication failures between >> > guests? >> >> I've not looked at it any further I'm afraid. >> >> If these changes (be they in 3.5 or later, or earlier) are exposing >> driver bugs then I suspect the netdev chaps would want to know about it. > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > And is off checking v3.6. v3.7 is definitly a no go. >> >> FWIW I see the issue with tg3. After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. -- Sander > I should double-check that but I didn't get any issues with the tg3 I had. > I was running the netperf/netserver from/to to see if I could reproduce the > issues (70% loss) you described but did not have much luck. >> >> Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:02:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:02:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvW2-0002Cy-FN; Mon, 12 Nov 2012 15:01:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvW0-0002Ct-O8 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:01:33 +0000 Received: from [193.109.254.147:37403] by server-16.bemta-14.messagelabs.com id 5C/FF-09215-B4F01A05; Mon, 12 Nov 2012 15:01:31 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352732486!8530758!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2520 invoked from network); 12 Nov 2012 15:01:27 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 15:01:27 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACF1Mvf004305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 15:01:23 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACF1L65012918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 15:01:22 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACF1Lu2030706; Mon, 12 Nov 2012 09:01:21 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 07:01:20 -0800 Message-ID: <50A10F3E.2030808@oracle.com> Date: Mon, 12 Nov 2012 10:01:18 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "Keir Fraser" , Jan Beulich Content-Type: multipart/mixed; boundary="------------010608060702090002000106" X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Dan Magenheimer , Konrad Wilk , xen-devel Subject: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------010608060702090002000106 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi Keir/Jan, Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 Attached is the result. Test environment old: # xm info host : ovs-3f-9e-04 release : 2.6.39-300.17.1.el5uek version : #1 SMP Fri Oct 19 11:30:08 PDT 2012 machine : x86_64 nr_cpus : 160 nr_nodes : 8 cores_per_socket : 10 threads_per_core : 2 cpu_mhz : 2394 hw_caps : bfebfbff:2c100800:00000000:00003f40:02bee3ff:00000000:00000001:00000000 virt_caps : hvm hvm_directio total_memory : 2097142 free_memory : 2040108 free_cpus : 0 xen_major : 4 xen_minor : 1 xen_extra : .3OVM xen_caps : xen-3.0-x86_64 xen-3.0-x86_32p hvm-3.0-x86_32 hvm-3.0-x86_32p hvm-3.0-x86_64 xen_scheduler : credit xen_pagesize : 4096 platform_params : virt_start=0xffff800000000000 xen_changeset : unavailable xen_commandline : dom0_mem=31390M no-bootscrub cc_compiler : gcc version 4.1.2 20080704 (Red Hat 4.1.2-48) cc_compile_by : mockbuild cc_compile_domain : us.oracle.com cc_compile_date : Fri Oct 19 21:34:08 PDT 2012 xend_config_format : 4 # uname -a Linux ovs-3f-9e-04 2.6.39-300.17.1.el5uek #1 SMP Fri Oct 19 11:30:08 PDT 2012 x86_64 x86_64 x86_64 GNU/Linux # cat /boot/grub/grub.conf ... kernel /xen.gz dom0_mem=31390M no-bootscrub dom0_vcpus_pin dom0_max_vcpus=32 Test environment new: old env + cs 26056 Test script: test-vm-memory-allocation.sh (attached) My conclusion from the test: - HVM create time is greatly reduced. - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. - HVM/PVM destroy time is not affected. - If most of our customers are using PVM, I think this patch is bad: because most VM memory should under 128G. - If they are using HVM, then this patch is great. Questions for discussion: - Did you get the same result? - It seems this result is not ideal. We may need to improve it. Please note: Imay not have access to the same machine for awhile. Thanks, Zhigang --------------010608060702090002000106 Content-Type: application/pdf; name="result.pdf" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="result.pdf" JVBERi0xLjQKJeLjz9MKMyAwIG9iago8PC9MZW5ndGggNjcvRmlsdGVyL0ZsYXRlRGVjb2Rl Pj5zdHJlYW0KeJwzUDBU0DVUMFAwMzQCksm5XIVcTiFcxmYKpuZmCiEpXK4hXIFchQogJQZA EigBRMm5CvoRaYYKLvkKgVwAv0kNugplbmRzdHJlYW0KZW5kb2JqCjUgMCBvYmoKPDwvUGFy ZW50IDQgMCBSL0NvbnRlbnRzIDMgMCBSL1R5cGUvUGFnZS9SZXNvdXJjZXM8PC9YT2JqZWN0 PDwvWGYxIDEgMCBSPj4vUHJvY1NldCBbL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMgL0lt YWdlSV0+Pi9NZWRpYUJveFswIDAgNjEyIDc5Ml0vUm90YXRlIDkwPj4KZW5kb2JqCjYgMCBv YmoKPDwvTGVuZ3RoMSA1MjIwMC9MZW5ndGggMjE4NzgvRmlsdGVyL0ZsYXRlRGVjb2RlPj5z dHJlYW0KeJzsvQl4FUXWP3yq17vfvvuSm+QmNxvcQIAkQDCaK7vsyCJBMgTZN1lVVBRwAURU 1HHDDRxUQB0CBAjoDOigjgvCjMuMzqiM4jIqyuuLzAgk9zunujskUceZ9/9+z/d/vie5/LqW ruqqrjpbnapWYABgheUggjb5ysXxjbE/fYk5DwEoo6fNnz739aur12P8BOLy6XOunvZWw7YX AJy1AAOWz5g6acpR/0tfAYw+inW6z8AMb2kwF2BMGNN5M+YuXjKx/OxYTFcClE+ZM2/yJHHz qd0AazZgesbcSUvme+udywEOWLB8fP7CqfPz3xm6H9NFAPbfyvsggojKT0JEKgB8ZvozxOcU Ns1Mf073KRS+wNoNBgA2wzNsJjwD++EFdgJrbYO9UA+/hxD0xfdaCr+EVaDAeMy5BS7Gn4z5 v2SRdD2UwEYch41wCMteAtfDPgiycPrvsAxuFt/EWjeDE3LhQhgB8+A2NiR9BUyAD6UboQcM gcthPlueHpe+PX1XehM8DnvF36cbwQ5RmIy/Q+mv5T+n/wqdsMY98AB8yO6y7oIUtrIcSz4M C2G9WCOx9PT0aexBDlyFfZBgKBxiB4QkPn0qfMbCbKnYB5/yq3Rd+iCWikENzID1sI+VswFC jjwhPTR9CILYxhJ86gOwA3bjrwF+A+8xh3wivSl9AiJQDBfh+9TDG+yA2NS4oqkKR0zGUeoA FXhnHvwWXoYjLMGeF+bJDrmbnJKvSb8FfugKY7C3T2LNT9k/hOvxt0x8Seqf7g0uHJc7abTh Rfgbi7ISNpyNFToI84RHxIVgwRa74m8KzMTxvh+f/gFLst2CQzgs/kp6SjqjZDYdTbtwRgrg QXgYnmdOfNM4W8RuYO+wj4U+wkThQeEj8ZfSFumP6iR861/AXLgNnoJ/MC/ryUayS9kMtpSt YneyB9ghdoR9LlwojBZmC9+IM8QF4m+k3vgbJS2SbpRXyrcqnzeNazrY9Iemf6S7pVfCSKSH Fdj7e+ARfLO9cBjexd+H8BGTmZ258BdnOWwMuxZ/17Pb2GNsM9vC6rGVI+wj9nf2LfuOnREA f4qQIeQIufhLCAuFq4RfCg8Jh/F3RPhK+F4MibliUiwXK8VqcR72apW4Dn+7xL9JUemwlMZx 7ibfKz8qb5afkl+QTygO9QYLWF4/+6vGjo0fNEHT6qZ7m3Y01af/BgGcwyiOQjZUYu8n4W8W zve9SHHb4E3mwLGLso7sAjYER2Yim8UWsCU4kjex9exx3vdfs+dwlP7EvsE+O4UY73NnoVzo LQzH3y+EqcICYZ1wl1AvvCOcFlXRLrrFgNhRHCDWiFPFxeLV4r1infi6+L74kXhKPIu/tGST sqVcqUBKSgOkidIV0iPSZ9Jn8gT5NfkTxabMVVYqDcp/qd3VC9QR6ki1Rr1D3a2+ZalF6vwd 7II90OKPHRVXiP3EXXC7UCpFhDeEN5CeJ8IUcaiAlCpsZquF61i9kCcvUc4TzmPD4IRUgGP9 kvCocEo4TxzKBrNRMEvoqj9N8UtbMaiUfgfHpefw3d7AJy9RHOx64RvFATsYCBXY5otiFykp vgbviR8yVdoIf5FsLMSOC0+KI5AKfiNdII+DHPEh+LW4gF0Hu4R+ALYzlrVIx8PYVpQLo1k3 9k8xDaIwDKmoh/gx3AizhT/DceTj1XAfmyJNh9uhlC2Fz+AJ5IoO8uVKRyXAXhFmSmsEH6sH QdqCb1fB8pgo++EmViOuV74R3oUr4LBkgw/Ep7H3h4Vfi0OlE/LFbAZywHWwEhakV8DV8jjp j2w6iGws5EtHUbotFbtJORguQ6kyAWXabuTufSgHLhSHYk4YKWcI0sUYlBDr8Xc/ygkJKWgm 8vglKMXegHpltNAA02UXQ6kDIL3WdDGMTz8BD6Snw+Xpu6ATyoNV6aX4xM3wCdwBm9nNTdfC fMhCzvmADZH7C4fl/ulOwhrhXWGUcG/r+cXRzmdh+AJ/v8bEBfKzsEb6E4yCqvTa9NtI3UUo YR+Ay2AQHMO3/BpbGCgegNKmYcL2dH9xPr7vhzAy/WQ6m9lgRnoODIfn4HFVhklqEue4jv0R 3/damCpcnF4sTm2aieNwB45CCkfrCpQ/t6T6jBl9YarqgvMrz+tV0bNHeVlpt65dSjp3Kk52 7FBUWJCfl8jNiWdnZcYyopFwKBjw+7weze1yOuw2q0VVZEkUGBT3S/SvjdcV1NZJBYmBAztR OjEJMya1yKiti2NW/9Zl6uK1vFi8dckUlpzWpmRKL5lqLsm0eCVUdiqO90vE6w71TcQb2PiR 4zB+W99EdbzuOI8P5fF1PO7EeE4OVoj3C8/oG69jtfF+df2vnLGmX21ffNx2u61Pos9UW6di 2G6zY9SOsbpQYv52FrqA8YgQ6tdruwAWJ3aqLpro268ukuhLPagT8/tNmlI3YuS4fn0zcnKq OxXXsT6TE5fVQaJ3nTvJi0Af3kyd0qdO5c3EZ9LbwK3x7cUH1qxt0OCy2qRjSmLKpAnj6sRJ 1dSGJ4nt9q0LXXMsfC6JD/f2Gbeq5d0McU2/8Mw4JdesWRWv2zByXMu7OXStrsZnYF0hv3/t mv7Y9FocxMGj4tiacHP1uDp2MzYZpzeht9Lfb2qiH+XUzorXWRO9EzPWzKrFqYmuqYOLr87Z EY2m9qaPQrRffM3ocYmcuqqMRPWkvrHtflhz8dU7I6l4pPWdTsXbNY8+sNtdbiPicLaMTG2+ x2O8OMUGX9w8sox6lLgICaIuPjmOPRmXwHfqSZepPWHN5J5YDP+qGdaqm4IzMrPO2qd2jdaL 8ql+nZyvJeJrvgOkgMTxr1rnTDJylHztO6Ao0UkzqeF9M16XTNZ17EgkovbBOcU+XsDT5Z2K r2wQEon5WhwDHD4YgWM7qbpXCQ5/Tg5N8K0NKbgME3XLR47T03G4LGMHpEqS1XVCLd05YN4J jKE7y807zdVrE0jJ9UDmaqDOUtD8z60Fff1m9KpjwX9xe6p+f/CoxOCR48fF+62pNcZ28OhW Kf1+z+Z7RqzO12ecmCEYMSFD5HeRKCc0F6bEOEedlI//FE7UUxpUC1Ilz2Hx/nVa7UD9Wm3L yfk3KzWkT1AtHpyrZnSzrleydfq8VulW3XOsEbHDqCoHjx6/Zo2t1T0kNb3Bi4wAKR5Gj8uJ 96mDMciZ+fivIX2gJ6E6oy6FQ9aHCiD96VlGslXBDCNejX9EnZ2K+6OgW7OmfyLef03tmkkN 6eWXJeJaYs1e4QXhhTXz+9WahNOQ3ndrRl3/tdU4VjNYL2QKAXpvT7DVI7en2OpR48ft1XCt sHr0uB0CE/rU9q7enof3xu2NA6R4rkC5lEmJOCVgMMOX3CFYePmMvSmA5fyuxDN4enIDA55n MfMYTG4Q9DzNzBMwT9LzUjyP/kjG9Bk9riX1cJas7oTUKDBuYMuAFrsKkOPJ8eTjhaHSPRsX D5xNyXAG4tIBVIyopYGtQstfhPxUWKgEm1A5EU3yZWjaSRvw/gZp4/3hpHaqpuY4VB3v2qW0 vDSw79ChQ9gKjEl/JnnkA6BBpuBOOd0Oh6P3GLfDbu89RmlIf57yUFoOU1rV6JpBuXaK6aUw fTIVdDp7j4kpdHU76KpqdN0u0AumbNEsSfZnOZ0hK1aud7uFMRRJRZxOjHnAQTkQdDjw6qA8 KEkmk4fwcgj7Sz3O2K788Ekn8UkKPenTeqeTR75ORex2hR6pUQ5oDgddKa/5keeeWa/EI1oM mQSn2/5bFNBBhBfhTh9NDZOUVcJq+2r3Ky7ZqtrDQj/fkMCgSJ+M0b4JgQmRizNmq7Ptk31z ArMjtRlXC1cpV9qvca9S7lfv1V4Jvye8o7xj/4s72txd6i2NJEa+radhw8g/U34apNAiayon UdbFysCqWQX+YlSCD1GMSljXZXv4vHhcdMNjoUzPIkBGScWxahyIwngJsFAJ4CVgXdbLt9K8 40vXJI/jlaI1C3jUGARWswCXgz3pjyGqq5PmHySTPs3bvbRbMOgNaIKSyC0s8GnB0m7dPVpB IldVxsx+c8OVOxb3nvXmxreuvnPvlqVLt2y5fumgGuFNJrHzn564syn9XlNT0++euX8Pe7jp vm9O4Hpr1tczVxLFfoikdwapzgbvpfra9J7zq42/IfCrTX8LfhVTTk/ZbGmZcIfwgEV6WmJW UGRBtMrMIbBXbXwobDSKwOL4/Ib00XpNQ0JqSH+R8nDyinHycnHywjlPRYh4TArh1BJ1yMgA ZTI9y0XPklkc17GCHLHvY5XsZggnh2nHcPz0IaU/TFQObayEqqpQBfNU0HhCTZLpN3MSHkVR y7t371EqnKm/8M3R931Usli69oKl2b8e8OpE7GUlWskqjkKWEN4LKnIGjYAFCYPPv0q8QhGe w5kKSWMn5yudG6wezRn2+ZQxTqIZj4dHvk5ZNQ1jWX45iygoRAWysuhuVsyFd7Ic9LZZDcKz KYdgC4Xi2ZpHEOLZHm9FyVuH6HoISohEklV0PdiN2E9obtDh9Qq8wZTV7RHMdo6m7F6fMCbL T3n07B34aP0FBKL1r1J85H+sNeJIao9a442lup8nn6c8K+9XnlVftrwSUy9yVDtGu2Y7priu 8V7ju8X7nPeT6CcZJ6KO/fY9PiFDi2mZWpam/DZ9AkfxKFgwtOIMR7NsmkVRXo1F/bFY1BKL ikywRGOiM0trEDbtHO5hngYW3kVvANTlnUxw2ExGtZmMaiNG5dLMtij0JhIvMSt7VlgBcdBY z5TDs6tKmCjME5ahWtgn5EE2u2M7Z7uak8eRUCq1kzq/VTZWVh1vrDnm8RKt4GWVq3PSdZ12 EBNIOWDyYE+oYTULDU7MD+QU9EAK6t69vAy5TlELuxNLBvxIWfhPUs/2EEL5v1r/zeYHrr3h IbbX988/vHlq4JMvPDYh65lnLqycfOD6g59Mm333Q2t8h9/94plxW5/btHpSV+LAselPpSDS XpLV7xbDXMg3GBRIkZ0txLc9Ek7R5IVjwIg3kg5MsA4JG2oLd5bN1iGQFZOyOsTkDs6E0xGO MPDGNeK2uFrAn4nFC0pI+B4qoR94K6qqtOPacZz84y9pL3krtIPJbgSa/CLZGXT2c650Sv08 l3iuzBAvDs7RZvmnBK9wXu1f6VzjvyXjcadNjouc6OwOp0tSGbbLaE5J+z7LyCvlZOX4MgEp vE/YBBFhRsqKvZSxm06vOcVec4q9zbLYu2hifF5ciIeJReLLVbOoahZVm4uqiwq42C5gUKAV CPimJ/dQrYJ1ncINrOeOyJtsH+sJgANmb5bR64ob2F0GdSSPc/ow5PHJZE2zWG48RnxxXOPE otMKShakDhQubEE1iRdfjyCJYk4Uao/mqEkfRCAqXSGRWzC2Pvue2cu2PXZd6RC/176oYeWs mWv99Tlf/HrJq7OnTblhXdPn7zyfZjeGH1hVd8PSjf5HhCXXTb7hppviu16evmPKxIc6Z/3m 9gNN331K1kIUJZYm70O57WR79oIjfTr1NI2PU+GEw0W4wq9WXZzzq8zFucKvVl2086tq4QKP X1WuuCwWPZ8G2MKvMr8q/GrlV10teMc5ZjjWO7Y4XnHIQ8Qhzl9KohfZGxyKqMo2u6iiPnE6 XxUlvyhKohMEh1NSxWeFZ8GCttWGlA0kCYvAqzapQZi2R5ZtqczsMpupOGy6VcEjX3PzwtbA eqScaio3UaYuzylX17kFYga7018GaOjFBVGgylQHI8d2Ux1hl6uBreXz/RXpYNIbJ4mtK7VP Na42tJOVpyo9FTTJFRWrOicllAdutxunG038veBMf7DDW4HS9q2UvbRCzO1UIUqZmZX0iGok BiyT8jtS9grH8hEVjlRBhSM3hmGnCi47qlnyh3+QRCuynJV6SgMJj+hhwr2NNwkP3/3SS/VN 5Wzi4+Lus4Meb9qIouyextkkJ8g+zJGfgCx2NuXz8en08qudCw1upNgpdk6IpEIU83Hr0Muv Ytg0aDgT6YUo5uPGopdf7WE+31SIT3ZrKbQXGI62k4aXxVy2rEAg5iUVZndLUlbM6WKghlHZ c+OSR7jEIuVCEoe4Clmq8SBKGRIyHbxcCbr5dXD06sw1mff6nvT9zvGO4y8ZFqsv7OoYFa1d 5C72fahQRJQ0ms8W8Pp8r7rcfpfP73I7UdykfNSRlGuDS3C53KkAMzq1xy2xN0kUoXpJeah7 nonaPG2ZdocmaT8jVMJcqIQZhLWwEDaFSnhd3PscKwc3uwc5r+cO164fEy7ZrYVLK/FSg9RG 2oePQ40HgRL42CpL56SMJAdcBXHtwxbUIOm0JZuW8gaFjC8nkCOioIGAX0XLsGDMbwIPzLmh /pm1l6wt2nK78G7jnuE33XmAWRbfdvL3jWy5tubWg4+t3zG8Kij819NNV05oOvWHl+/ccZQk ylCkrwDqoUzoKIh70fw+wcfG02BE4uZoWcxIoUlGiWYyytHXJ/zq4sTES3PJQZaKTV+SOM7p tGw3y2YTmcgyirJSTuZ0ohWTIedm+Z22LAb5GtXiyxMtK6QRTYW4Rgvx5UnIWEsceuuQ9qJJ WzXHtYM1RFudZkdYXzUV6BvpGx/vHR2fLU5Rp1hmeafEF1uuiN1sWRl7x/JW0KPGaWILdZmh 0MugOqNYDr+h0o3CeCKeQzc81MsRTgH7mcHeJNuxgVSa2WdGCgd25ZtDlG9SVn4zZeUv0jhl aQw0FHD4gif2kO2rrStGydYz5cviXJ3FBXMWF7FZDawilVsVmhiaF1oWkkJ8+RfioxgKUt1Q kHoaahDydiabVxq6HmtJesd1pcaVGQ6TQWdUlBRaSymFaw6mFhTy5YWikibzkqWTyAWP1oP0 GvO3IEPxzM5w8UWzx1445jLhwuem1zdedeSmvzUde/iWz595v7HH8NuHLdz02LXXbJVGuWZ1 Gdrlgq//Orm26R9/XHP8ejaYLWVbnt/8wtn3a7ZWNzxy/7ZtOKKTULcF5SfBCfNTroNOJuE/ wSJZUXmQoOkiMMnqcC4SRYEGcji3+UQh6rYssn4Jw5GYJgpiFQbz2DJcAEVcBjMO007WLKgc evL4MO0UrRY0HA6yBSs8FbrhhwznK88JKCAqaqK719tjkrhrbdPxwd3de8Ub/vsW6fQza+9p 8jadafjLM+wL9vJD5BEYhVwTQa4JQQK6iP33Qsxcqke5GFbDBu8Yubk8XcKvnUw7r0Oz7C44 V5yv7HM5J8Wa01Ge7mAyXif+XIqV8BsF/KpXJ8LJ5ZI81pyO8nQHU7Lz6tyiLuE3CsLnxHy9 AzKyOpNixXWLMKZzZ29OliIXZXmdWWRRcMfByd3cb5B0k4wg3nSbCw2K8JvusEg3SZOLZimx mafFvICDigf4EwOcpwPn/AOtnQ+0QjleUdHsg9jDO6KYHVH0jhzjvgi3qfiN9ikPI2dTuZRJ zVLNANc6Af6m597PbAzbYiVGB0yQWOlRHmQdghcFLyr41PH3LrK1C7sOrmNLpcWWBfaFjiuc 14RuhTVsrbTSssJ+k2Ol87bQ656XfN5cFB87YvEoBfF4CQWd4gUkUyId4g7ICoMDu7GhM2sx 0qYYyTLFSBaJES5EsxbttzLrPmE6JI1CSbNQslnWJBe5U3GUNW4Gbs0tuBvYnalItzAXMGEu YMJcwIQX1YlMbBCmpwJ5/GYev5nHb+YtCpgL8XggFRAC67q+bOo2rtC4Q+Nks35rtp69FTV8 EMmiMmQN12s1CxfAguofNYr0P1ZQUF5mrK5M4xkwx+dvIXNaCiA2a/6cT/cf+GL23FW3NZ16 992mU3detnL2jJtvmTZ9da+L1o1asfmZG5Y9KWZ0uH/Whvc+3DDtvg7FB1c/lwbGDtzxPBs9 46YbJ05eddPZ9NB1w59YfsPWzaY/jjg7C/Xhhr3gRlZJ0HAEwvqVa0B+Teiczgcup5mVgxq3 wSmdSbEA581Cfk3oapKbZDnNzB3UTGdf/bkb1FhQMxTo5y2cDnvs2Wic5HvQNDnF6Tusa1oe OZEqIgIPeziFe7hzxRP2FCftRVluV7ZruEt0ufwwgjG+kHRqHmUMI/sol9bgNHkHkzXduJbo xucPiZ+4USNN+/6LzY6IFp04Z/GlOnKTz8OZ+idabd1Wm6ZKWjaUKusVHRJMJS4NXpKYJs4J zo1OT1wTvS5rbfTWrPXBLdHnol8EP42fivvODz4SfCYo9uowRREKyVpMIG+Fc+JKvChruGsi mYYxapK9OUJX2/XUiWyTx7JN9sk2vTzZ+1gF2I3bdhpmum03b9tJW3tam4nriskCSIXQBODk kM/5KN+iK35PMx95Uh7Bsy7Zio9QUxs8ZHBQs5FoamqoWcBqqn9gEjZbhRcI5WWFpKUxBGQf r4e7CwsYZ5IA5575zwSXThp13YjurPuzc3efZepLdxy/9pr/euzp94TXHl+8ZMeWpddtZKO0 ay4fsuzP8x3hsbOZ5c8fMm1908dN3zZ91rTz1/vFsgd3H3xoLapqXAn8rWmmtKbpS9SE0ZSD VYEQlSEi9bmQe+i0T6FkKHZeRK2aLW1pmnnDDcRZg9KfSzHpAiiCHsLmVLHVae0YcUY7dnB2 7Fjh7B7okdGr40Uda5w1HWc5Z3as7bLGubLD+uCD0S3OQJHOG9xa+1x3MT8R2Vq0O/Js0cHI 4aI/Bt4vsvQNMpKbpG6VMV4vXWUu7ctJ1g6nWHYoO5ws7lhWIVUUXyQNLB5rqU5Os8xMXulY havY753fJz09ylxM0kryykLdcvzhiR3mdRA6xEpcVa47XI+60i75Udc21zdIzg248Lbr1i6R v4v4gJSdi7qQQ/4/F2dBl0Is6iogQnBxeYHUKKLFtjXlDBdzSXyPPxZTobnr0K/Q1i0m2jtM 0iaBSXxAxMedtKTMXNwtq3BPan5OXkP6K942RUhwYEwiFswjrUhqNk/3aCsU+WvKTr3L4/3C 9Nl6ajSvQbg05SpMkSclXtClYFuBXIFEW+9yCWNQV71jRkjhor3QtYJLjyzkgIoDFcKGClZB DvbUbHp0iLsTQvnh3BJO/yWcI0o4R5Tk7VcOK0K2UqUIip+LPb/uXuBC00VjqXBzQAnTKyjc TKCrgndpQBUu05SuPZtdwNwLrHMSyg9kJe5uP37SvFnZSNdPPiGRcyyJ7JU8pns9m+suwDRJ IMPRAzVcGdEyDBbkE1+RWureg/+Q0/QV2AUCuXlCwQDyVyhRgLajS9BZDQuJlVP2ztr23IBF A8tnvzedlfZbvezqzLrw5UduWb11hGYN5T4XC112cN6EbnNnznisIPPGMf2funnYimF+lzOa l2+7vNP51QvCC24dnJo0qPOSE2duPr8ne78ophUNLRlYe+nw868iblqJ3JQt76N9I/ZK6lom O9x5crncT5arsuuyhezs3FhprHdsfva6bKWXrzJYidJ0SLTGUuMc564J/iI6yzLHOcN9efDy 6IHsdx3vhd6LfOT7KvRV5OPMo9np7EhcLnGX+LvIVe6UPMQ9Qp4mv5f5nXRac2gBl6QIkBFT VGYLxFz2sCkYw6ZIxci3qXxO3HlH7Eyzp+y19uV2KZt7Me2cY8jZIOjSlSbaTtYazbLd3Fay 0/qL5ppyUqNo7u2LmUfgWy+cXDyl4OXMIXF+4DRPceShUpETnahvXeQLwgHG1rENrI6dYFI2 q2LDceXZkG7ifMOIpzKJwhknPcZXmsxLpMc46TF6RaJtXjRI3WNh6hvzU3MskjWgB19otCTJ hbjUaDTcTceQMhtbUyuRI/7zVOjO5xqGNWBBTsJT6kETKEsIaGj9FIr+UAtzp9OT9Qu3X7Zt Qarp2988N1soG3PnlU8/fsWVT8v7Gr+7Y/gdry5q+qbpnYfZvfvH3HrotSMvHSL/0Yj05+Jx lLpR9t97IYQWQi73C/IRtPKrm181fUz51Vijl7mWuZnbzlIwAuajqJe8Mbsajkl25gqoFhow lQ+YyjU+7U7ilTPWobde4hoeV+TdCKTPB1gdLDvWx9cnNMo3KlTrqw09KDworndu0jZFHRZn xDZLmCnOkq9wzHcudz7h2GXdbdvlcAQdKx0fC6Ird6J7nnuZW3Qzkp0FXYA6VYvdWgcb4Cic ACu43XY418cYdt0kSDcRJKcVd57LwuVybgbfpTppStWvUys4LeXZk9mMoYXIUq5k7zEsRRTE UlSKdacSLMUpIsXJYSAngigngotiAU5uAU56AS7vAnmHVZatVqmC6qJqqo2qqVw7qfo+LS+t ds0oO2iu3w0COSfgahYaW9TcB9ezGu8uPEnWwkJzzeKpKNFqjuE/oiQ0FhaYVjYL6av3Mr6R GFILzlkEYuX2zG9+/V7TPxb+/ZZn/pq9LbJs/Oqtm26adTu7ObTnMMtktqeZsGLbxozZc373 5jsv3IAypz/S0ococzwoc/anltoEyZnvLHP2dcrl/vLYJcJo28X+UbHpwhR5qnWyvzZ2IPst +W3f+5FPfJ/4vwl9GfmEy5ZgdnYySgJpcJSkk9pZyHN2DvYSyp2DhX7O/v6LYpfYxjqnOz9R PgueZiddGguILrvmRpljVz2AQkdsJXT+uYcLnVKaz2/38FnM97jNAq2JoJATQb6mHfEwDa2x Ws9yD8ololxdOnm8JBI8XB2TnPIoROceLq089AQ7zaPHRfPoIdc0N7H1xvRIqpYz0mKv7ibX PbacGrx5Kl8c6Hvz+9XD6odqWpWIPoaroprF+YfrPTVL5ytOM9yQUKOcZiJZZSNaSBraCx1K xNIsXHhmpcYJqDFZeUwXNJWEc6JmQQ1KmnJSbKjZdMpAscNaLrN6Tj247O0rZr11Y+29JTsb 409fceXjm69dsnHlI2vP/OpRJq4ZeaHgOt1f8L7+6vMvvff6QdJIg1EjZaGkCSB1PJIKZUMs gEv9GrnGOsY+VZwtz7NOtVsCZJQYQ3UsdTHFMmPcEed9Vz7tPxWVunp7RbrGLvQOjV4YG+md ELk4Nsk7NzoptkRZEjglnAprEGRuZyg0IlgbnB8UgzH3Om2DJmialBGzqbBP2EpcYkp2NLxp qjRk6Ht8KBZCpl+z1UEAbtaEUk60j7jf2mluOjjJsKORd9KjrIUdy+qczBnFtcKBnfkFZRTu ITMom2UHSTdM4Ou2Ul2YanzWNU4HWp6ayutYZs61zvW6BIi3mPcYn3ddVsT4jHMXH817aw1T kxzayBXLMA1p4NQCyhvavIDAG/oSorJxQSVfXXnNvXGybBaaYkHD5QJ4/GoOX1SzHO76U8Rf 7Cv+eu/fm75h/r++zVzs7Oe2HTdPXtv4njDS0XPsLUu3sLGhX9WzbNShDlbU9EHT91p8274Z 7J6VfWY8QZTQu2mk+AVSAq6h2YupWrtd9hfb8/1D7P38ijUzkllsL/AXJyrs3f2D7P39Y9Vx 9hn207bvAq7OieLCCxIXFA4pXFe8oVjtntO9Q1Vxf3v/nH4dRueM7jBTnZwzuUNt8fLi9wo/ z/k68U2hJxRUAg3C9vqimE/lqkGLQxeuGJbDATgCaFkL16U0ORZz2/rlxhy2YKA0v7Tl5vK3 5nbzP1OFfHsrPxw+EmJaKBWqDS0PScW4rhfGFHPpEOLSIdQsHUJcOpAblud+oUsHKkVuWUM6 hMjK1h216dMm7Z1OzeA0t9jN8iE3m1NKNqeUbE4b2Xn73YfdH7rTbinbXeUejppPPxnEZYeb 04w7SjTjzuUOtxi1rO+nuLmscEeSxYtzSFwkh50jmwVDjUVnS4nBRQYnp1O0S3HMWIMeq6o0 DqgsCIWCId22LdTXmSQ1QuWlHu4dLmjpoZm2zd6tz+LrVodd7Mq6v5y4/A+3PXfNE1P/suG3 XzzwxHVLNz9zzZLN46Ij87tNGd+j7lZW+f79jK29f/nZWf88vOQpseMfDux//Xcv/Y4sl1UA In0r4mf37IUgMlwgVMY3nflCIF8qF/uJ+5wSzwqEImUhi8fh8YsyA3dMVv12m8PUAQ5zuh00 cx1pHB351lRp97K0lR2wsiBXAMEUTa61iF/9NLFWWlF5uLOTW5fWKJXD3FP6RFv9NNFWIh2+ c2C1GQeiTu3mHsphQZIaHcq6l9UFTwSF+cENwbpgOigFBT+faj+fUj+ffH8+44doNOzVCToP GUfqPQoSENEYR2lOp0LULcPUtVBnQOKHq+get0tB4ItIgZvBwwIDRoRbGhIL9NVQJS2TTrYm AMP7UKnbpBWMBEafq1MuxaXmuxRHBnNa3BkM6GzNCkjSGZtS3VQNBgOehIdPvRLwrKq//sCV vx5cf8XsEbdVol367V01mx5qnChsXHXtqNuva3wWpcNqnFy8Refq2JOpiGDjO5T8qvCryq9k a5uL37PmtqUekbjFTjFB3/rkV4VfVX7Fyo2maddoHqrQI1i5UXfNCXzhIPKrwq8qvzKdYY2W jU1RPcJb7sW3R7vT8A+3rrNusNZZD1g/tJ6wqmDNts63Lrc+amQdtaattmwr2pOqJIhWRaQZ 7sRbvZ6BIiuSTVHzZZAelTZIddIB6aikHJBOSAJIcekIpiRJX3oI1LIx/RKffslG7Ut+mn5J dz/wSBMXNbyfNiIFaZilLREsrORb3zjVSa4bDEdtzcIFyZ/685WXBkSc79X19fXSl4cPnwlI BWfeIy69ES89aDbZ0JSz5Vy2mj99t6LlbLWaIX2TpOV8tJoD3R0q8xGn02E7e/Tkp8R2lpXr YZeuepibr58ey0dR4Zaz5UflD2VpOF5OyGK2PF9eLqdlCXnLJog6u9GTONsFSsvLHgV2AFcS Qkve++c53stswXt88IEPPlho5MEceYykudiH5imAYVLrKaA5IMcEzQKXsAt/OOLEXTfWy/tO 9zdkoVKAGjUhfLQXfIY001qcn9EjHjOSaQ5fzIxkmJGoGcnUvT9GGYpkmJGoGXHQa/EDJmbE ZUbcZsRn6lDNjHjNiMeM+ExRrJkRrxnxmBGn6ci2mBGUpH9ODbU7y/KlY9Ix699Cn8Tlt+VT cSFkiSes4Yy4VRQTWTElQMpPZUoiGtFsR/LZuvwN+UJ+KBR15a/zMI/ETfowN+e5j4yb9H7u pja2sDEmcMPewQ177h3z6Oq6lXnPalJZYUuLfRROrOH8dRksgzeQ0dxABm8gg5aWHmogg0vq DL4CxNwmXWVkOKipDNMRl0EtFIFQmuCPT3A1keBqIpHPjgCj5a6QDVUwHOUnPUWnSo07AzX9 BC+nzaChF87WG+R5MuXnCkInSa5DIZKX38CW7MwZ0NpK0L0X3CBo4dOo0Y9JnUs3Dus3te+n C3AVWllZifJkKJ0p8/DDdRWm+nD4fQV+hyeDeZ0BU32YduhPCRs6G8NPUYX4ZhDXLnzd2lLP bOz2xKwr78u+/tVHtu5MTLhg/i/rx00ZsqKXVHDPsImXjdu3bXdjofDwnIm97tnUeJ+wY8mS EevvbHzXsCo+RU4Ksu0pnywqPmGz1qB9LH7mOyGe8ikSbaLkIsldrbH7tSPho+F0WIpb/C5/ 0ItWBVOCTpvT5XCZROsyOY57frM5h+SFuSUR5laFndsTdm5P2JvtCTsXI/ZcXoJqcnvCzu0J TH+vE4fdZnjCTqW4y8DOTRY7w3/2YWESW8VkW4RPhIX54Q3huvCBsBQWhdJAkNNNkNNQkFNP kMu7U/Uejy7NftyksLUxKTwtTArJkG4HUt62JsqwEN/DaP7TjYyT3MxodSOpb3JUapVkaVQd P2dnBBWP1WaxqTZR0Qpw0Z3B3DavQTAdV5ARikTJCcNwu7agilWPXfF+7cYRmq2+4+yBi56U Cu7b1m/+0G7XNS4SVl4+98K7Xm98jlYlfXF9Wogz74QI2787wI8Y+vQ9cb5z/HlqKsUi/IZX tUUcA5SBlrFKtWW6MtNiKdN6eXsFy8P9tMHewcF+4QnyBOvFWo23JnhxeK481zpFm+udG5wS vooFrIrsvFQcLY+2XeqYI06Vp9rmOGyhmKR6UFD5TYrxm54JPxmQPm4Q5mXwdUYGJx21+fC0 yv0PhofNdJXyiHFURd/qVvXFLY/gwjcvv6yLykDV1DguOc+dw+n6IUorKjGXlq4Yd3FycTn0 /QlOzXngcNGpbS8XLNzBBzFOHXxxasgPLi2Bn0WBFDZHgkkAvqw1jsPzvU7oGqXlq3EQviUl 4OK15lSypqY1fZhn48lPQUfsrKPkUdbL5MusEqupBm6P8OMoYBxOabn86Lvplhf/woLXfnnr h03H9+5YtXLHzptX7RB8rPD2K5v+1njoyxtYFnO+/trrf3jxtVexs6uaZko5SBVeyGL3phY7 tE7a+dpgTaqK18WF7HgHRyKzW6BbZu/M+fF1cUuvUK+MQaFBGdWWSx0TQhMyZllmO2Zqc0Oz Mw7E3/S/H34/+mbWMf+xrKPxdDyYkJJaMlAu9dL6S4O08don9i8zmzS7xyUGY+Q+V4Ixlx1c EZMgIiZBRIggsmkUI3lHbEyzpWy1tuU2Kc7JIp4yzkV+mrITcdjCRvo0d6XzA5M0RzbTlW4j 2i6nSbItZr5SodRwTelOKd1BlQ/w4z5y0zWutXCNa61c46fausb5thsKfO4azx7QI8xa+cab XePJk8d+6BXnbnFPRUunuM/UB8GAn29sFnrEFjO+alOvu2asPjLrig+vHX9HZ88TVy556snF i7Y3zZR/s2bkyLXp+3/VdObWIb0az4ibDh187e3XXv0TWVQ3o0h4CefdAx+khpb4mCaxhFQm 9ZFGSdOkxZJi9VisFqvT57E6QbQwO58wsFmL1lmYJTfuYz4ht9XnIPoHIj+9imu2JP+Z8rQQ uQpnqlZ6Wl/IKZyrLPpCzjvg4I8t5I5pNScXHsNBoyGrMI+xgvbKKtd1B2kAF7IaU5uGVL5x hfLy5scumFl16S8u6N37vF/4s6SCjQsG9nqycEBV7cLGt7DPVenPxe04Ml1E1JAh3czh1wi/ FrU4B6hHCloce9MjeWYkYUZyzUiOGaGDhallfEWW68/tZR1k7Zs3Nndq7lLr7dab8p7wPVX8 gui0hqLhUJfBxe+E5AxhjCBo3ZgtPMEywTrBNsE+wTHBOcsyyzrLNss+yzHLWV9QX+guLMgr zOvQPW+8rdo+pWBK0eLE4rzleXfbHnLcVXRf8T1dNtm2OH5VuKloZ8GLBcEi09LMNSMJM5Jn Roz3VcxXUMyXUszXVMiU/iDlzaoYbynMd9ikaLwgINk7Z0bJIZUbKebu5UhVZHhkYmRb5HBE cUeyI/MiH0ak7MgdESHyG6SAANIj91ym/FRcYykmaOwIE4BpTCBP5k5/sIx7NDWXp4yxzhMy 52QKmbGAKun7u3yN+Km5Dvw05SMykmKd7dlRFs2LpHzhsm5UvZyERiSsX4mrI/zLr0icakbi VCvCd1kj3PdId3Hu9wmXgpr+djdfoOd1xAftilUc6cg6UptUv6P5aVlH/XybQpEv+BB2pJ1j ekrHKO9BTmHHstpuB7oJVd2WdxO6kXM2D8K6CcvpPa4PvqCfPqV+cWrJpr7FORXG89xcCrl5 391x7gMjk6WAH0hzcQ+Y7g3jR+PduR8CI6tZgEhXw5das2DoyRZaB4V18vjCYeYWcjK5gDyq LQze47TfkqQPZRbwDWRat6EE44G+hWzsIKM9kyrslJWQ/cUFHs2r+TRRyXXGM8BapGYwuRNe svyYzHElMiA34XRYOtgyWFGh1aYkpQzI1jLJ8klqaCfpF24qd0yuWLECWohRWrHXnMto9VlC YUFhZ6G8jD5c4QaTufNDfrxQlqArzoKqHe5brl26pDz/7pceGH5hz453jrruN+M9dY5FM5fO CgZLMm7af9/YmS9dd/hddn5s9sKpfc9PhPO7XbRi2ICri7KTA6+dHr54wsU9ErFMny2v9MKl E8Y/esnTJFvz0t8KHeUHIMSy6RuFJvMkTZN5kLjJPH+tRxQzYiMyTxSUWYlKRmFkeYQBczht TISgZk26bagzRbtby4Vc5mylxmy6GnOwtGrpZ+1Xq85Xl6vrVAnQ+Nmg1qkH1COqopJuJDGs 6rpR0M+A861M3aI3ItwZr5vJullFqhZjimFd6Uajuk+YBWHWffu0Nqt7VGzHDU/bsZOVfAem sZKUmqe0VHuFlvxG0fyQvgvjSZSXenrwbwL4ATdBiw6pvGxO8U037dy1y5csytr4qHbB1MeE yWuZOqfptrWNdw8tjuJIR8lHKhWATei+Fyz69lTvMYLL8Lt8UW+cxf5Cd6EIQcOl0nyk+0SK D5ygtdj3DckWsFkUpthAtlpkJsh5NFRySfL9Q9r7h/AdSOOQhs7YUy4zyPVU2EgAOj0VVlwl lVnoImCjOzFkRmijtbw1K6cMivDCTRJrbn4ZBPGCqfdS1xd1LoM4XtyODlBkLbBVQLltIAyw jWVjhWrLOOs0Nk2YaZlpXQJXsauEqy1LrFfZVrFVwkrxFnW1ZY31YbjfeqftaXjM9hvYo263 vQIv2t6Dt21fwce2M3DSVoyvYwtD0FYEBbYetuGQslnllDdYJuPglJmf9OH70KsDWU8pN//w BLgcobGgPG7X0KjwXEGWHXY6T/J+EscGcSh5KAklVVV8ry0j1cOmWiz5VpvfarWBKAhoH/gZ w47Y0JawWASBKarNKgKTSxzMkWtJpVLW5fQRKsvYlZKXy4KMsZQ1LqRYrv2LPxKdHY9GGmsa a6Lh48dq9K2dClxNkZygPb5VcufkqusOruocpqAajQDjLMu5v5ZnvnNYqQ/X2T18pYz9umnO b4/lZ4eTX+1tulwqaLxp+rzRVwqrdT+fAiDvQUrzyhP3ApiUpq8WuFs9k86l41KRnDzcKyLr jlV+YkNs4c77gpbAWIjLZUUxvmI5bXqXTuvnKHWx7TVvWJpvqIrhmPpW//ZAJ3ZN4f5jyfjO 5ey5NXmLT6W95qe9luYb+mFMm/m1gsRvcHsu17jxuelyNo5ce+L6bUNefWA6lT/YeY6F6DuK k/pKX9XPaSmGjf4W/xpP0o+L0p5y3KHfOFDv0r28B1IlFPOkeNrmERk40GxjihtJxulQSDQ5 PEyQbJLHZviwdMnloaPKh7R3Dmlv0dlp+jNONJ1TEBloXfpZR6mDTRjkudRzu0f0xPWvq4zv ICQzQl+ApKzZOWVaLLOQJPKJ1J7svDJJcVh9SoY14pUlkBS71e6yeDXwiX41ZsmwZ+LKMV/t aEm6yqBc7WU5z9VXHKCk1KGWwfY+7gGeQd5L3Rd7Z6tTLNO9VyvXqIste5V97t3e75Qz1iK7 pwiKnIWuIneht8TfE3p4r7KstNwv3ud4km0WNtufcOyC3co+1++ld5R3rZ9Ln7s/855UTltj doV67OBXTdEP3um6n6/lDd7OsLnckhc8FtWSr7rzXbTocamikznynQ3pd1I9aEHjRBbtyFc2 Tub3KTa7p8CW9IyWLrZN8MzxLPWs8dg8NgkZlqZDn5hzQ11jnGQ9if8orR2jn24b4L+MlF+U ZUFRVdlqs1mQnG2ah44qDN4pgxdNnItS02xuV/x3HtUSVz1eb1JW/bKsunCe850uv9Ppsnjc 7qTN4sfqIDeLExCY6pUsbo/D5eTd8zodDotFVUm+eN1ulwts/lOak9U66XSN6GxgT6Zs8eE2 Ns+2zCbYGoQxKetwD5vnWeYRPJSyazKr5R5zESXQk7vYKd+padxqigw9WVMTRqsH/5Ekqgl/ 2ix+NOOnf2HLRZOHX1cNbSmVWgdIlatc2kHVpVUSKE4YXJc9aly9M+6IC8+lj6JlfBRc6SP1 0MUdRz4+2nyuvHpwXdmocaT9jmxX6cAsZuSMGlxXyg/MWNJHt6txPdeLuVk8Fx+0G21GfDZK giM71C70xB3QU9int9T88OZ6IV7Pkz660xaX4sA/1Tc/EnSl39rtrYBiBDL4dh99/VdtLnWT /Kua5IIa03XRzIo/9UcimUtkX4jEckIsFNngpmf3bamSSrfsfbT8/N3bmuqf3dLhTyiiHzzm eVW4vPH+1w4J0868JyzddfYwyuqcppHi1yiro8JstJnD+lajfjaJ+wX51S0ZbviTqRLd/cOd 8Pzq0EvoDiF+dfKrw2G691N8j8fBZa9hNmTa/G7RLsYibq9iV3wprztuTznibr7ScEdKktH3 o+FD0YhGAV+zcuGUsdMdo6NaH6TmxiqK/GPd22xiyplyC+54UZcyjS6qw+oNOsPeQnuho9DZ 3dHdWe56wGMv8hb5BgarvdW+6sBM70zfzMDVypXOqz3X+K8J3Oxc41nrXeu7xX+/bbP9Oe1Z zz7/F7bP/N85G7Xv/elYlikUgj57LENy93Xf5Bbdkebu62tqr8HRqMfdboeGHIlKPOL3+fK9 Nj8m3A5kuXy7DZdsNh8dOrYr9ACIaTGhJLY/JsQahKpdbhyLlL9BGJ2yV3lTXmGid79X8Daw 3rvdLBf6ZdjoFh+tVNzRxTHcIY5wpB2CA0vsLKFjbEJVfUZ8KbIfDl7jAly3oO7H6PGwdvJY hP6LCMejYe04j0GYjE3iQTIELNchL8nIZi7jG0NkrMpKC/KWC2k6jDT9LNrnn4M9/TlrSdH+ 9Ae7e1TYcntUoAr9fFegwpMb4N+0VpM3F9CcQGpuTbWQ9BXqJwTwd86ooK/kE7nL/OcVVw4M eQpke9PcF95P5mYnP65vmnNhXpelY8uapm/RivIyZrszpaLGB65YsfRKYfaZ32/rXT2K7I4i tHDfQlp2sed3s7BhChhfVXkbhFcsgpd184bKMPeNlBUj7AK0LzH1QmoQRjoIRdYSrYJV2C5i /YX+lousw7UJbLQw2jLeOkKbwyYLky2zrNeyxZZrrbeymy23WL9nJ4WMiKWAdbAkrRWWxy1/ YqpG53y0QJmAPG6lj4ETuNYTelltgsVmy2cCymCBoXBWhElyEt/YNskJ+n+igauUpMsmNDB3 PUpkWXkWF9KAS+mTKb5Fo+Y6N7gYuFKuWtdy1wmXzI2WPLrlWgy26xnbBmw4zIM0iBDmvteI W1ucs/SgvmVD37ZpdJwDI8eS2kma+0Zap1Zqn+Cq4xN+6sswCjUXfX3LuDjisggne1cHVmAh /4I+ehYaS0y9sIdGkYaSF6Sv3ms4aVjSH+xw0yAYwed7MiqslmDG+WQh7AhV8NMQtmCF4EdE gxUmfZDwKy1nSiKnPCfA1O6lOYEiYdOicU3DxSmNz8+7ehb78i7Rotx1VeMvrrU+CPy/CCVH 1o/ZXvjwRHfld5YMC/+v0D32cWFHCl8bcd7u09sap2tgcfD/EirjNXg99YKmYdBHg9PbTl+j gZHf/OesVows+m8IGqgT/gS/kBZBAHGRmglXyWNhHFsF44WtsJQgZkJKehoWYtmtmL4Qw31U F8uPQXyIqESMRUSNvKGISYhRlMaye6kuPmM+PYeHi2C8JRvmyWPTjdjevfLLMA3xCMYfkz6G zUoFzMX0Jqy3XwLoQWWwzr3KVrgf8x/C+5Mx7xEMx2F6I8YnYL0uRtyq3gYRChEK5nfA59xq vG+h+Dx0lxal/4bvUo3PHIRYiW2MwLA/YjCW8WHYG7GKvQyr2cvpx/A+hnAjtr+K8hF9jXAg PudmvF+F9fIwfSPGo9gPBUM3IgdRJDwNSBbwHIYl+P6X6O+NeBlm0Ds3vxP23+jTD6H3cXBL YJu/QSSEivQnGFpb9K0tbmyDi8RSWI7hbEQGYqRwCOZKQ4DheD0gfwIiASmPxukDxPnSFBiG aYb9HCXXw3pKI4ZyLEo3Sg/BBvEk9MR71yj34ntMwfHuijgFJcJX0EnJh2VIX33x+SsQj+Az P+f0MAVGY/udMSyVPuE0tBKxFtv6xhwnGhtMr8B5vRjbOkscgfVHIQbgvCxHzKH+YPslNOY0 72xsUwWWPYZlJhAwP8SB7040SXWoPj4r36DDx86F8BiWuQ3H9SiGEiJAfTDB6cwA3nsJnxNB KIhMRGfEJ4jHELMRvRCDEUXYNmC7IqdXpBmiTU4fSBvyyziG2DdOs/o7PMLnU+eZjcazqJ0c 5WmYbSCHnkn8QjSLfdluPpt4imjGDDl9z+Z0/zW9J9FUc4i8J30JA6gPnAeRtsyQ+A77TPxw Ly7nVmO4Hun4RqJZ6p8Z0rgQrfExQZ4wwsoW79qF8wiGIkDCoPUbzdAci+ZwBmzCZ9Yql6FM 2QADpcUwULwTLpNOQF+xA3SWu2Aevg+WrRO+hIstB6AU53I4ph9oE95PUN9ms+QD+J5P4Xi+ DQ/jmC6Q3hZypbeZLD+V/rsM7BX5KeF6Hv9B2BbsgH6PQkLLe/9p/v8EwjvyUygzn0p/Ib+d TuP73EU8oX7JuiDiZoj5OxDLEbgwZfdbZrMGdQxoCsBJxDwpBb3kFPSQDuD8BFDOIy9g/hj5 b7BfvA1ukd5Ov8uWw3LhbVipBmCScC/KNGxLeAduJNDzMZzfgo5a0VxbWjJDk17bhiTzDZrK xlBB/nvDwDEDpxDfIR0NRpqMkG4g+cz1A8poxEqdXtOnm+nzFXgcw1tN+mxDp7Pb0KejLV22 DbluQflu8in24xbz/Uk+kowjGUlyjuSMWb5t2KL+GmEr0jHJ4UMw3uDrXAODsI8fGbyPchjn +5J0WumfflKpT28WvenNSjeM/xkhp5/E917SrFPHpZsMfdrB1KV6PthNPSqXwlxDnm3i8uZb +CXXo2N5/6zKNlgmn8F5RxnI+7vB4EEcT+z3bKkWx3w9rMX3iIirkB8xHzGBxoTPBUCY9ALp RPEeHGfSRbfBjeJf0F6guqXg4fqiCi7Bvr/C81CnUkh58iXwmPIldJPGoKw9AFNorug9qD80 95YrwGkJoJx4G7pKW7BMAGxYbgMfgxQ8yemC6s5GkwrHQp0MKtLsMCxDz9vI66TAa4zHJj4W vD7aIkTDNBb4TCUAF3N74kt4VB4DlyAPbVSXw0Y0SQH5YjM+43GsN4b6gvWiXF/fA5cif61G 2bQaZQ5w+h+fPiM+he+zBOU6QlyOY/QUhOXlOIaz+bv3lXQZu4r4R9wKBUQjyj0oh8meuAfW SEnop8yG2zDvNhnlJLZ7K+bdhPzbBXn3FqyfbchtwLZvwXyqW0W2DNkIxC9qCnzKcm4HAO8D 2SnYvvh32CgOgtVIxxda7sFxuBk6IUmT0ZiF6KqDp683sFYHz9P0kOWIGlxH+UIp/BFbsAOk SYfulVbATGksdBO7Iu96oJP0B+TV7+FB0Q0TpVfhQakB1lJa8kGRWIfvX4+2JeUfhhGUL/wR 0/fDeKkS66+Gy6WJsEjcjrT3FtikaTjXWE++HekkD+t/i881wD6G8eJY5K2VGP8+/TSV423U py8hSAOhE6/XAryvJtr0WRiMbzUI5xT7S/FW/cW+NvfT7OOP9I+/Jz0X61EZ6UH6r/Kl/4rI 18OmkcJt8BRig/Ae9BGHwtVsc3ofjmv/NhjYMi2Vs6WIzlI57EGswHgxhr9FbNPTaLuVw18Q N+Ozn8dwp8Ld3AyE3tCdQsx7BHE/4jXzXktQOz+W3xJyRnpfq/Qu1DUIdjK9j9C2PI5zd2yv u3R+eh8BaXEQQVkGfvVK8IuFmJ+F9dqk5Qzkp12QJ0L6Hz/Xp38F/OvSYhxTLd/RnA8Mg/8G /toijFNo6Ib/cd/+p8D5XYao4eP7NQR0GgIXeyf9VwzHsndAE69AGkRguhOmfeZ4mvOE+Xfz /Dbzh7QCNOZt89um287rz6WFnTCxJUw6aKaHu+ACglSF5RFt05ZX4AKC8iLee/GHaenJn8F4 6Ciupz4hDRb+MK0Mh0KCkId9jVId5DlEc/owyggEleX1nTCAQLxLEOpxvYZovl8O/QgtxrU7 jau4Xr9vzo85L23nB/uXkt6AizAswLACw1EYDjLDljzblm/b5pmy5MfKtOGNLj/1zP8/AXnn VcTLiJf+326LAdIqQkMof0U7pArtyLfRPrmUvjRoRFlytgTxBMqh0Rj+CfNQezd1QDgx7sG8 6Rg+DHDmO4wvxPy3daQFKQM2GHZlBPN2G3UtxvNG6fXP/B7g9EnENr3+ma2IWRj/LwTq8zPv Y/g8hvdj+S+w3k0YvqDfb5yI6SsRz2H6S0zPQYzD+DoMAxgWI3wIL9a/l0D2yA/Wof/r4Y+v P/7dEG2WydjPbPJ5Ybi07Rri3w7N+fyZsO1aw5z/nwtb+AzahPo44JrpI7T76lquff7VGscM cT6bWkIak25Em9JBdjTZsmQ/c/vRCPn6jdux2C6A3wzJdib7lWxnsl8x3Mh9BjLvzxha5/N+ GXqjpWxlJ+ERhIbIMMLZWOZ7oTD9BsoeN9L3d7g22kTAtAsxVkf6MOouN+q6/Sh3v8PwEKYz MfzO1GmmbP2BjP0Znfa/nf5PdeT/QKd2MzCxDX4q30RPAxcR2uri/xQ/p7v/x7r8J3R0Sz39 f5o29bwJ6wXQjaCm0vsIbe3SH9gBP5P+OTv3P023tTv+43Qbu8RMt8UP7relPdOeiUK0GW34 7j8FrS2kXedsf7MPbfm4md+MNI5Rv5ZAOVBk6NDHUF6g/Z/ORKCOSt+FeddbzkI3yzPQDdO7 EKg3m45jOIXuYfgou4382+lGTN+AaU06xMuOMzDl5+i5Ld2Sfc7tQxwzLgfXUf+hBHEewovY jphrzjWtIbHtdwXUurTOlcanv5PeQLSxAX82LIcFiGcw7ca0G2WxX/Gg3E7Bk+SPx9CGoQ3l +8hzPr50o3INLzOI+5YXw0CU85dLb5PvK32Q+/SawK06+D7KjahDs00/HaYD5BtS4+QvSTcY /rla5VvUg5egPrSS7sB2x/I9odkS+XG/hV+Kduhr+JD9pi+Z/FOkr5TOoHE/Rks/8sfQVZoA fRFVkr5PNYb8L+InfK9mFfndxWHwnLG/VWfbCo9YX4ZHLFOgv2UZ32+6V3wIbsS8h9Tb4SEl yfdXxph6lXTij/j+yJcZbfZpGu/c1ibg/ZsAQ8gf07Jds56lP+rSb7kfSvdj/oxtgzp+DWKK vl+RPvXj/s7064bfc4ah469s1vlt/fQTYKR4Pa77TJ/sExi+A7+QViKMMW7bF7MtHJfGn7KF TNsE45dwX5++30M+KF+Lfbj+fJz/zufrIpoz2Yk87Kb5T++V9P253tISLC9ARPoGofse+f4c +YYRlwjvYvlHkEcvR15BGpTu5nt4NxnAsukneL05+r6ZMgpRhf2ahvW20t6RCbj5HNLHpDGw hoP71dKPCf70XgwXCq/xPUa3sRcYkdbCaO7TPLcnGJaKuN+6SBqNwPlHXI3pPP7uRsjHKoX1 3Liuo3ck31xnALxnEc8zfKRGWXUP9FdTSK926C/vhDxxHtovB1DWxXDuBuG8uuFG8SPIknrC ZNEDUwisf/oN9iWGaKkThC8w/10M7+T/P5fxtCds7qvp/mk4w/Eq2goIYy+XMJUgbGU5xj5h tRHP1OOYVwG7OcxnbIUnWgDLpT9CnBF+iW33hilCA7axAfuC7Yga8l8bYJ3LDBQZ7QyQLkEe a40+bYF1KSxpC8ynML8tjPxoW2A+hb3bAvN7/0g/fqrcT/Xjp/IL2gLzC/4X+vFTz020BeYn /kX/BrcF5g/+D/rxU+Oc1xaYn/cv+jGsLTB/WNt+oHzCdWzTS7g2fRrDPxv6/u8YDsEQqa/p IMZxfZGeZqT/bJS7D4Hr3/QDCFwrp3sbQJmXpjXwKgy/QuC6Oj3yHJpewTCmn8Mw20nfjeiI GKu3RXWbntXb5jDabNqp1298BsPft0kHEZ/q7fG2SfbuwzCBWG+832qj3Tq97013nyvfFNPf kderO4e0iLgY62djOOocmnbpSP8Ow18jyC/6stEvimcZ40HvvIeedU4uwGlpPcqMWgDU1X51 qx5K18IQLnMPt9JV87k8/Bg2c3mXRtlXCd0UJ9ohD0NvshtIhstTeflb5SmomwDtk7F8P2+2 dBRk6UWIyJ/AROly6CvuRrt4AMpbbIPvy+CzSW6TzSHeAkMRfK+S7wnR3skSWGWr5/aLhmX8 0mfY3wdgP67ZVsvjgGF9Re2M6XWo1zfCEvlauMYyF/YrJ7Cvb8M01FfZykSokG+AgebaVpkL VtmBdoERWu6HyWox5m+FuPQpxKyr0K47AiNwzHqYbTfv3avgx/wndP8Kpz/E2SRiCO8z9hft MAnX1n7z3IBcg2MyhfdnGN9z2gISrtFB/gZ190VQpFrR9iqB1dYwbFBO4XsoaKcm+b78NGPs u9D+kzodusqroMBcuyvHcJxHg80MaT/O9Aeg7bZRmsHtRS/f1zL8Ac2h+Qzab1sOa+msRFu7 xrSjmm0Kw0fQ7HMw3wdD0p/N72+ELewN3adwAO3TACRpH4/7RNqGRp/4Pt4BpCXDnlX3wyBV xPAJmKashFHyUBwXH4xSfwdedQCEyT5TVW7XzSUdLX+PtugoKMC56WPw+1UI4qUBBo8vxvw/ IZ7W+ZH4i/I5b2Je43ojfxZiKWKmfp/upZfp8cZv9Ofze0v18o3Ih2nagxNa+Go+1MHXIfGW dqpxlmrlD8Jze/dEP/1/Nvw3fWjEw3Sm6kf2+NuGd2M4w0yjnfch8uhdWDeOUEw7um0o6edT rtdDbhtS+LgR/opojWy9tmHb8ys/dZ7lX9ixOp+ZYetzL2b4CyMsaD6X8zNhy3My58J02ki7 /l3fneFzi5rhj5w/0H1y50LlB+unliGfExANO5bs90F8n5/O5vwLNJ/hugFpoDXGEug8wY9B QU1CUOe0hmHn/ySUO7AewpLdFun/JmCfV+hIP2jgSwOPEUSGa2mEdGdbpP+b48fP1/VVHsZ2 EZZOOtRXdHD7/18AxwBU5GCLl4cK6cJ/CbQyCOo3Bm41kU4TzHE3x9EcF3y3T/G9ZzT32Wzf eO7/6Tz+n87L/9Z7/6u+t4RxRs8M6eye8qP9xvnh+G8d/CzNVvAZUHBcn0U8hXjVwN0E5JUo nVUSpyI9TeXnFZvr/IAObsO1KcFIG+dvFAUtOzWs8wGd/dEB1T82PupUnf7UQn2c+Lkd3fb6 BN/DaZyxnWbIvjzrCNhonJPNJtmCepf4vIv0PExrbfOlR+nr6fRjqCdlLO+RF0N/4bX0r+Rr UCacSP9eXoa2AALbusnAKwY26LZfeptxDlLh54G3wpaWwLVtFoHKYHuLEI8b9jbZsQt1NH2m 55/rlyl7xX/ie5yBCD9fmuLr6xHSTFzTz4SI+CXeR3uB9pvESXAh6QyxO9pWdOZmiXFelnwP H2Cow4njMkLc3IK/6XwNnatB8DM5NE8voQ6g8i/x+ub6voj7l2ajHP8LZPOzP3iPn+nBZ9BZ J7KLRFxRyMORLkZi2ZHpP4j3YzjQwD8Rl2N/x8JM4SboJE7D9fARtHcCmL8AMQ/jYQzdiGrE Q4groSvPP4N0chrLI0QJ069jKOPaXsa87w2s1UH3+Xp7N0xBm3gKPk8v9zavo0OBKewF3tYU sTc+D8sJuFIS0aIQA0Zcwfs3Y739+vqd/ApUnt8zy1jPlZGPQ3/bNOiv+BC3pPfJF6b3sb9D pTQePDinTkQ5zvUbxvqB7KjDCByt9COYflVoey7A3Cc3QvkZmCmfD53kRrQP/op0cBQq5VPw oFwFRcoI1GNPA9HSeQha202j88T8LPHb6TdM37cJZRwErC/CAJxDoPMbZig8Rf9ZHXzfMVwf 8bP0jKy3p3SLjJ+f1nmN27lqX7gR+bg/YqBx7nuavj+GNijynqSfUy2SHodM3Y6jNVQTjlaa +GEUyoZm3yuFdKaNaMuwBbFq+mnhj7SuTfegvQphBJ3X4nUv1delafJX/xJBPsuHWuw/3Uv4 /3p/S2izD/VT+0U/dzbj585q/CD9H+6ptD278XNnOX423WbP5ef2y5BWyUbuj3plv7I1/Tam 9yDuRPm6iSBBOs39o7q9dotoR95ejGvQiyDP8ImSnzQL5VeWtJb79FfqzwMfyqbeum8+fdb4 zoH7U8k3R3apGObfQUSN7xro+YMM/y3/bqLZT1sGY0jWkkzlOoPOduM6DeXNFJItwitQKpzV ZRB7mwNIFnG/ZG/sY28e8rjQ0ZApvcEqlOK73K1DdKdf4TLJpcssEfB5DSTPUP/q8ipTjOry S3hLl0HCB1jGxEnEF7RXQ+tpvqam8xBbuG46rctJLgvJD4lx/j2Kvn5yEw/SdzA/Zy8ZtuVT bcJnzfDn7EKjzlNGnR+WN/ZuUJf4uE5+GTrQ2d7mdRdAKT8b/SlfrwzE+2SDnLPzTX87nyec I31vn7VdF9B+Ds2tuabX/WZNb7UIJ+rgeprG8TO0y2yod4fwNlDG8f2eRemTRj9pfRJBOr21 ee1nruXMtQbAedIjsEmcjrZQFzqTxPX9cy3Wt5sI/AzJK/A4P8uMIeYdwnIDdb3BdciLiCOI PyC+Rryj+6ka36Vvh2hcmtdDj9L5gaa98l9xvF4Cq2UIRJR9ur0iLoeF5Bcn0HcFBP7tlImt yFckxxeR/4b/dfxfwDQdAvZX/Aitul+g9kEZblsJ4EDL0D0fQIvhEJ8CCMX+L8UIHVHU3TGk l2xc5eR0AUj00pG/HKBwHJqeBefQcS1AJ5ynEpy3rviepR/oKPsnQAXW6bVJx/kugN77dPTD MRmwvB3taEc72tGOdrSjHe1oRzva0Y52tKMd7WhHO9rRjna0ox3taEc72tGOdrSjHe1oRzva 0Y52tKMd7WhHO9rRjna0ox3taMf/JWD0f7SCb6ESHgYVBNCghP6rr9LT9t+CDMJeGC0W7SwI Zx95TuwARxGC2GFHMjN7r1goZu44LzvVICZ2egPd3Bd2EuP4tBJ+jeN1HmIb4v/p63xj2jjv OP48z7n4gBIbLzWkHL4zxpcFpyF16JxAis+OPdJaEySwzGYskBCkNK2USIYgTVpykRZpUddQ dVK2pVKJ+mKqVlU5zhM7oJKZ2LqVdUu1ZZmU/qPdXqwvOpq+WJdX3vd5ztBGy+bj8/v9nt/v e8/z3HOPbd7AlYGHjEoh5P2w54EJroMyeBvUEALLqxo4DWbBGq9IrZJia6o/tV3ahnO3YY4+ qYmsgwqQiArbCfrBKJgBs6BG6HjmNDgPyuBTUTGkJvuFPZh7k/2scKVTz8RF85jbHPmOaJa+ VXD9Nw65PvOEK+t2ZY92ueldaddv3+n6QDRucl/XEF9OBaUgLjKIiZ+BpezXxEcpUck16SFi ASbVVDOGFCi16/HZsuQhVGISJSeIWlmWqN3QGE/VsQpbJwGisn+yT9wK+6S0pTE+m3qSfUSu gzKQ2Ec4PmQfkvNsja85bBLMgjK4AdZBDVvD8QGO99n7xMfeI50gCUbBLCiDdeBl78H62bt8 twjL4yRg7F1YP3sHl/UOrI/dRnSb3cbU/mwn9sUXRBDrrAZqtBo0tVSDQDDusD/Zd3dgR+m4 09hRS1Ib6SV7pDY7+qjqSM32/qdUh/2tpMXUa6nd7CaxAMNMbmLkm0QDA2AMnAE1iG4hukVM 8Dy4BiyAXQbrBxpbBW+BW2Q3MMAAkNnbNoZx2A1bT6upIPsj+y1pwor/gf1O+LfYG8L/nv1G +DfhQ/Cr7A07pJJUPeoE5/jh/fCdqD/AflVqD6iVVCMrY+1U2E6QBP1gFMyAGlZmbfYJNYBO lsiqTKC0ycfC/4y8LBPjlGroB7ABNW707scRwcxqszoz9Cs/RZMb/fILiLjRv/9DRNzo372A iBv9mbOIuNFPnELEjT48iogbvX8IEYzDXvpl+3Y10f801VI+No1VmsYqTWOVpomHTfOD3PXw ub1od3Rgxa4asR0dqrlIzdepeZiaL1NzgprnqHmBmvupeZSaMWoq1AxR06DmEt2LpTCp8Yt7 mvuMZmquUvM1ahapqVMzSs12amo0YTgsbD+xR7iscKUUf9PBP96LTx8fC2NFw9jzYXwmlGFv gIpoGRBpba54W4j7tlJH0m3v6o6fTh1kKzhxBbdhhXwAPLhBK9hGK+hkBR34YJNgFCyDdVAB NVC3YeIzwvpgO0ESjILzYB3UiOmsA0ZOV6d4XUysszrpft5iKzjacIRZ2Gj1K/6Y/6A0o1Bf iPaHKiGWIMEgISTQKDc6tGH+84Z/f95AalO17DKbIa24Ec9X/Yx9t1V16E9sfUlNPUR/TEIe 7Dq6j+g0Cr+XFEX7MaLI3HcRhb0KH7eVIzjNZ+s71UW6hZ81r95V/q5+rDgM4T+UJfWvmuOh tvoXZF6dV28ql9Q3Ox0Zmdd1h8ItakK6oOxVX1sV0gsoXLXVc9zNq99T+tSnFVGYcAtHi2gZ PvWwPqweRH8Z5bhqFNHnvJpUjqr7XdVj/Jx5dTemEHPDDkx2hyIGjYREh99MOPSksdN7xZv3 9nu/5o17d3rDXtXb6m3xbpUDsl/eIj8o18myXCN7ZCYTeatTWTNi/AmPW2vEgx75n3RT4hGx n3Er/j8Ffz6yzMiTxPqKlGO5wTTNWcvjJHdcs/41GHFo3aFh64FImlqBHMkNpa29sZzjrRy2 ErGc5R34dn6O0ssFZC32A4eSobxDKzx1scUKHMgvEEobLz7Xwv1XLz5XKJDm4NlkczLQ27jv 65n7mLGq/dLDU5vviVutK7nBvPXz1oIV50GltZCzfjSojeQX6Gf002xmgd7hrpBfkHrpZ9nD PC/1ZgqFnEOPCB3R6B3osGPuCJ2ML2auI5occnVXXV0U50PXzh10tbUkKnTR2lqh81Cumyu2 ZzNz7e1C06SRotAUm7Qva1aj0ESjQhM0yarQrAZNrrF6hURRIAkpQkIfJoqQKPRhITnyhaSz Krm0KbkkRpLoFxrF1TSsbWga1qD5P89Vvvc1kY7FaKmnMD6SnYhkxyLZCTBmPXv2ZLNlHte0 ufECL2iWpI8dHz/J/bEJqxCZyFjjkYw21zNyn/IIL/dEMnNkJDuUnxsxJjJ2j9GTjRzLFEp9 A12Je8a6tDlW18B9OhvgnXXxsfoS9ykneLmPj5XgYyX4WH1GnxiLiD0+kJ+TSbpwYMT1JVZf h/061hIupIP+M71i8/aEm8+1LOK3lVdIfaxgPRhJWw2Alx5JPZLiJbyneGkL0r5qqflcT7hl kb5SLfmRboykSWxyqjhFmrNPZdyfIl5ITU7xBXdtrPi/XqhlLeNYpjhJSM7qGMxZyUPD+Tmv F9kxfklW90auvj7rVJbd5C4ku3lSkjaFPLef52prq8L/vv9TVS8eamuypRI1QnSSFAuSFcoN MXwUDA3jWkeG84v4XYp/PRQLuMAijdHiRh/VabtP+OaOX/MGk1PVqLoWk1XvnolTihtLsvni ixXbXLFJdEj+A+3H6IEKZW5kc3RyZWFtCmVuZG9iago3IDAgb2JqCjw8L0ZvbnRCQm94Wy02 NjQgLTMyNCAyMDAwIDEwMDVdL0NhcEhlaWdodCA3MTYvVHlwZS9Gb250RGVzY3JpcHRvci9G b250RmlsZTIgNiAwIFIvU3RlbVYgODAvRGVzY2VudCAtMjEwL0ZsYWdzIDMyL0ZvbnROYW1l L1BTTlpaQStBcmlhbE1UL0FzY2VudCA3MjgvSXRhbGljQW5nbGUgMD4+CmVuZG9iago4IDAg b2JqCjw8L0Jhc2VGb250L1BTTlpaQStBcmlhbE1UL0NJRFN5c3RlbUluZm88PC9PcmRlcmlu ZyhJZGVudGl0eSkvUmVnaXN0cnkoQWRvYmUpL1N1cHBsZW1lbnQgMD4+L1cgWzE3WzI3N10x OVs1NTYgNTU2IDU1NiA1NTYgNTU2IDU1NiA1NTYgNTU2IDU1NiA1NTZdNjZbNTU2XTY4WzU1 NiA1NTYgNTAwIDU1NiA1NTZdNzRbNTU2IDU1NiAyMjJdNzlbMjIyIDgzMyA1NTYgNTU2IDU1 Nl04NVszMzMgNTAwIDI3N104OVs1MDAgNzIyXTkyWzUwMCA1MDBdXS9UeXBlL0ZvbnQvU3Vi dHlwZS9DSURGb250VHlwZTIvRm9udERlc2NyaXB0b3IgNyAwIFIvRFcgMTAwMC9DSURUb0dJ RE1hcC9JZGVudGl0eT4+CmVuZG9iago5IDAgb2JqCjw8L0xlbmd0aCAzOTcvRmlsdGVyL0Zs YXRlRGVjb2RlPj5zdHJlYW0KeJxdk8tq40AQRff6il5mmIUe/UrA1GbCgBczCbETspVbLSOI W6ItL/z3adfN1EAEPqArtziXKtW/to/bNK2qfs5z2MVVjVMacjzPlxyiOsTjlKq2U8MU1q87 Zjj1S1WXw7vreY2nbRrnarNR9Ut5eF7zVd3t9+8/mx9V/ZSHmKd0LInpXt9Ksrssy0c8xbSq piJSQxzLq/70y9/+FFXNB/+H++sSVcf3LQzCPMTz0oeY+3SM1aYpF21+l4uqmIZvj3WHU4dR /t62JOwicaRJqBtEhoS6RWRJqDtEjoRaI/Ik1AbRPQm1RfRAQu0Q9STUHtGBhPoeUSChfuDI dCS0IyL2Bh3sDXuDDvaGvUEHe8PeoIO9YW/Qwd6wJOigalgSdFA1LAm6L9WRhC5wZBsSugER zwZ0mJBFO6ZDR8vjAj2GZrkd6NHRcjvQo6PldqBHR8uDAD3GYbkd6NHRchXQo5AdSOh73sB/ q3Zbxtt3IrsdLjmXteePiZf7ttZTivK9LfNyO6XKr/oEB57nmQplbmRzdHJlYW0KZW5kb2Jq CjIgMCBvYmoKPDwvRGVzY2VuZGFudEZvbnRzWzggMCBSXS9CYXNlRm9udC9QU05aWkErQXJp YWxNVC9UeXBlL0ZvbnQvRW5jb2RpbmcvSWRlbnRpdHktSC9TdWJ0eXBlL1R5cGUwL1RvVW5p Y29kZSA5IDAgUj4+CmVuZG9iagoxIDAgb2JqCjw8L1R5cGUvWE9iamVjdC9SZXNvdXJjZXM8 PC9Qcm9jU2V0IFsvUERGIC9UZXh0IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJXS9Gb250PDwv RjEgMiAwIFI+Pj4+L1N1YnR5cGUvRm9ybS9CQm94WzAgMCA3MjAuNzUgNTQwLjc1XS9NYXRy aXggWzEgMCAwIDEgMCAwXS9MZW5ndGggNTE2OS9Gb3JtVHlwZSAxL0ZpbHRlci9GbGF0ZURl Y29kZT4+c3RyZWFtCnictZ1Lj+tIcoW1rl2j3o9FLdsbjZ6l0rYx/cB4DLsnb/fAds/Khj0Y tAz0bPz3TbIYrMyPOpHKRBoXM/cGOySdExGk9CUp6rer1et+t1oe9q+n7p+r11+vDpshjP45 Jvx69derP1/9z9X69X+vNq9/6NL/drVevf7T1b//ZfX6n1e/df+h//P3/75aLbeHzfZ9eGD3 1+nq/X25ebPwVws3h+Vh04VT+myDPeCvV//Vbdwf9++b7sU7Ne+77fqVf//p++wrh3TDiVIC xXgZ9hwz/eHqx64c/w9V6Mvfd2nVV/mbL1e/+66r+Or1S1+d43G72g7/zf69Wb6tX/fb1XK9 f/3Sy1ytVsfD65f/uPp68S+LH7r//Wnx0+KXXxbfLH5e/HHxl27TN4s/LL79hy9/616lS/v2 y2Bk6itqt37bLTebT30WmwEYhP2Le5p51YAtp5mOkCpxEuRU9GVo7L6sl8fVcndEM9fdEw/N /MfFv3bN/KZr5z8vvu/+/q5r6w+L3y/+vPhB9pJF23T/OG4/BVps+mmP9i9uZ+6FA7acZlIC xHgZeiaGajQvQllX129vy91brq0/ds38twvbytpt12/L46fAMTT99Ef/Fzc187Ih3XCijgAl ToIeir4Ore0XHnB32+X6oNoZKvZSlu24Wa6jebPYDMAf3F/czcyrBmw5zXSEVImTIAeiL0Nj 92XN3K6Py/U218ySfZNV2x12y9X+U6HFkwH6g//L+5l54YAtp5mUADFehh6KoafNi1DY1uNu uZ0dct/Ov5F+3/X0566nP3VbfvlFNpbV2+/fl8fIk8XmgR5Zg4sbm3vhgC2nmZQAMV6GHo6+ Gu2LUNbY3eFtuXnPNNZ21wsby+q97TbD8JhGi80DPbIGFzc298IBW04zKQFivAw9HH012heh rLH7t/VyrRrLN9ULG8vq9aS7jzxZbB7okTW4uLG5Fw7YcppJCRDjZejh6KvRvghljX3b7Zbq SMz31wv7mqP3MVzvl6u3GLFnG+wB5SsPct0AEAopgWK8DHuOmX6sPLSrQs3Kw/rQM2vX2K8X N33HxHKConKLTRVUw1PpcoJeCyBcUkdIlTgJstXRckIr91XLCVOH+l1vO+56N4uvuv89LF6y awcKvy02sfRCr8VrB5r7yZGUEiDGy9ADEK8dtCtC3dqB7OH14mVxl10oEMA9hiaWZmi2eKFA cj7BMdURoMRJ0BMQLxS0sl+3UHC2d3dd7277P7lVAQXXFptamIHV0lUBB+mBiNQRUiVOgux+ tCrQyn3dqsDZzt0Pe93d4j67BKAo2uJJLc3AbPESgMZ3ciClBIjxMvQExEsA7YpQtwTgHDlv nR7mgNlik0s7tFtM+5rUiXyUEiDGy9BzENN+uyLU0b7zCeZ58ZAFe8XGFptc2qHdYrDXUE66 o5QAMV6GnoMY7NsVoQ7skx7utsl+mCV4BcEWm1iaodligtf0nW45zaQEiPEy9BTEBN+uCFUE 7zRQH0ZzuDuGq07hMWbS2QZ7QDmqS9AG4EFKoBgvw55jph+o3q4KNai+2i3ftx+ofuuguiJe i00VVMNTKaprzibLUUdIlTgJstURqrdyX4XqU4f4RnfX/f9jFtUV7VpsYumFXotRXWM2SY5S AsR4GXoAYlRvV4Q6VD/bw+uuh8/9nyyqC+QdQxNLMzRbjOqStElzqY4AJU6CnoAY1VvZr0P1 s73rge++66DuXYZ4LTa1MAOrpajucDZQjjpCqsRJkN2PUL2V+zpUP9u5h6Fz984CWY52LZ7U 0gzMFqO6xmxCHKUEiPEy9ATEqN6uCHWo7rz73S6esqiuaNdik0s7tFuM6hqzCXGUEiDGy9Bz EKN6uyLUobrs4cvi8eMEkYvqinYtNrm0Q7vFqK4xmxhHKQFivAw9BzGqtytCHao7PXxyThjl eNdik0s7tFsM6xq00y2nmZQAMV6GnoMY1tsVoQrWkxbGsP7iNDAHvB/h7v24PGwjKp1tmB5Q DusStYF4kBIoxsmYnmOmH7DergoVsL7r31MPH7B+78C6Yt4xnlRBNTyVwrombdIcdYRUiU7Q rY5gvZX7Glj/7ND848qzs6aZ490xnsTSC70Ww7oGbbIcpQSIcTKcAYhhvV0RqmD9fA+vx48r uocZ6P0IJ7E0Q7PFsC5ZmzyX6ghQohOcCYhhvZX9Klg/37se1h8vOa+umHeMJ7UwA6ulsO6Q NmCOOkKqRCfo7kew3sp9Fayf79zzcOR8dEAvx7tj/KmWZmC2GNY1aBPjKCVAjJPhTEAM6+2K UAXr53t4N+x9d86CS453x3iSSzu0WwzrGrSJcZQSIMbJcOYghvV2RaiC9fM9vB2Wqh+c5c4c 747xJJd2aLcY1jVoE+MoJUCMk+HMQQzr7YpQBeteD70rA3O8O8aTXNqh3WJY16CdbjnNpASI cTKcOYhhvV0RamBdt/Cl+yiq18xyyDuGh8NydYhBdbbBHlCM6xq2AXmQEijGy7DnmOlPcb1h FWpw/XBc7tcfuP6scV1Sr8WmCqrhqRDXHdYmz1FHSJU4CbLVn7jezH0Vrk8d4pLYvXP9So53 LTapdEKnpbDugDZZjlICxHgZuv0RrDcsQh2sJx1ML+V8cLAhA71jaGJphmZLYV2zNnku1RGg xEnQExDBejP7dbB+tnf340KLXpLOMK/FphZmYLUQ1j3SBsxRR0iVOAmy+5+w3sx9HaynnVsf bbe7H77B8OSttGSQ1+JJMP3AbymvO6xNkqOUADFehh6CiNcbFqGO1+UO2H+XQV9DnUNei00u 7dBuKa87rE2So5QAMV6GnoOI1xsWoY7Xz/bwYVg3u85fBy+R12KTSzu0W8rrDmuT5CglQIyX oecg4vWGRajjdaeHd86HmBzyWmxyaYd2S3ndYe10y2kmJUCMl6HnIOL1hkWo4vWzLXwclj4f nWWzHPOOYfdhebeOwXS2wR5QzuuStkF5kBIoxsuw55jpB6+3q0INr3dI8T7dj2DbHZzHTzX6 IusMCFtsOuEDLksJXuM3IY86QqrESZDNjwi+lfsqgk97FvHfQ3fozH6RXWKwxSaWXui1mOE1 fxPxKCVAjJehByBm+HZFqGN42cPb7tip12EyLDyGJpZmaLaY4SWCE/NSHQFKnAQ9ATHDt7Jf x/Bne/cwvO9de6dtfRS22NTCDKyWMrwD4AA86gipEidBdj9i+Fbu6xg+7Zwx/O3QvCf3XF8O gy2eBNMP/BYzvOZv0h2lBIjxMvQQxAzfrgh1DH++jTfj6T7vgqUcCVtsiumIjosxXiM4AY9S AsR4GXoUYoxvV4Q6jPfbeJs/8y5h2GJTTEd0XEzymsLJeJQSIMbL0KMQk3y7ItSRfG5v1Asy OR622BTTER0Xw7wG8XTLaSYlQIyXoUchhvl2RaiCeb+Lzw4Q5ph4DPfrj/vqT+mzDfaAcp6X NA7mg5RAMV6GPcdMP3i+XRVqeH6/W66PM56/c94SM1hssemED7gs5XkN4wQ+6gipEidBNj/i +Vbuq3g+7VnEgv1H0vw5eYXEFptYeqHXYp7XLE7co5QAMV6GHoCY59sVoY7nZQ8f3XfADBeP oYmlGZot5nmJ40S+VEeAEidBT0DM863s1/H82d49DacEH533vQwWW2xqYQZWS3negXHAHnWE VImTILsf8Xwr93U8n3bOPrTcD9fQP3UfXZwLKjJIbPEkmH7gt5jnNYsT8yglQIyXoYcg5vl2 Rajj+fNtvJ1O6eZ5XiGxxaaYjui4mOc1ixPzKCVAjJehRyHm+XZFqOP58228WbwMlzfdX3Bm XiGxxaaYjui4mOc1ixPzKCVAjJehRyHm+XZFqON5v41PzrJMDoktNsV0RMfFPK9ZPN1ymkkJ EONl6FGIeb5dEap43u/is3OeIsfEY7g9LlfxTdnmG+wB5TwvaRzMBymBYrwMe46ZfvB8uyrU 8PxuvdxvZzzvnSLMYLHFphM+4LKU5zWME/ioI6RKnATZ/IjnW7mv4vm0Z9H3WG7cO5/lkNhi E0sv9FrM85rFiXuUEiDGy9ADEPN8uyLU8bzs4b1765AMF4+hiaUZmi3meYnjRL5UR4ASJ0FP QMzzrezX8fzZ3r2M62m5L8RLLLbY1MIMrJbyvAPjgD3qCKkSJ0F2P+L5Vu7reD7tnH1oeRkX Y9y7GWSQ2OJJMP3AbzHPaxYn5lFKgBgvQw9BzPPtilDH8+Lg+bEqow+eOR622OTSDu0Ww7wG cTIepQSI8TL0HMQw364IdTB/tod3w2HU+55EDoYtNrm0Q7vFJK8pnIBHKQFivAw9BzHJtytC HcmfP5w+DDf2ue6XSbMkr2DYYlNMR3RcTPKawtMtp5mUADFehh6FmOTbFaGK5L0u3vRMkSd5 QcNjuOk+8ia3cJttsAeUk7zkcNAepASK8TLsOWb6QfLtqlBD8pv35fubtXGziS6w0A3MILHF phRO4LOU5TWIE/aoI6RKnATZ/ojlW7mvYvmka9Ey2vW4pp2/3F4RscWml3ZotxjnNYqT9igl QIyXoWcgxvl2RajD+aSNdtODj2995mFeQPEYmlRaodVimJcsTt5LdQQocRJ0/2OYb2W/DubV DvgwfFfC/fkxH4stNsHwA7elPO/AOGCPOkKqxEmQAxDxfCv3dTyfvucd19a854Ejbt1bYeeg 2OJJMh3BcTHRaxon61FKgBgvQ49BTPTtilBH9Of3wodhYcb/CJPjYotNMR3RcTHUayAn7lFK gBgvQ49CDPXtilAH9WkbpyudnoedUR9Jc1xsscmlHdothnoN5GQ9SgkQ42XoOYihvl0R6qDe 6aF3B6ccFFtscmmHdouJXtN4uuU0kxIgxsvQcxATfbsiVBH9+aOp9dC7WDtHxWO43i4PyU3d ZhvsAeVEL3kczAcpgWK8DHuOmX4Qfbsq1BB99xlpMwP6/qq17JfnFRdbbEJhBDZLgV7TOHGP OkKqxEmQ3Y+AvpX7KqBPmmafSO+Hz6QfF2vrC2NyUGyxCaYf+i0mek3jRD5KCRDjZeghiIm+ XRHqiD7uI9Zl+rtx5S+5F3Q8hiaXdmi3mOollJP6Uh0BSpwEPQMx1beyX0f1Z7t335+e//iZ qxzUKza22PTCDsyWQr1D5OA96gipEidB9j+C+lbu66D+7BH0bri4IvfzVjkstnhSTEMwXMz0 mseJepQSIMbL0FMQM327ItQx/dk+3ox3NOzvfK77mONii00yLdFyMdRrICfuUUqAGC9Dz0IM 9e2KUAf1oo8Pw624+svV9MfRHBtbbJJpiZaLwV5DOZGPUgLEeBl6FmKwb1eEOrAXfXyx62Yu OF2v+Nhik0xLtFwM9xrM0y2nmZQAMV6GnoUY7tsVoQru3d2xv4DmgjvZC0Iew1U3L8kt4GYb 7AHldC/ZHAAIKYFivAx7jpl+0H27KtTQ/Wq73O9meP/QL3fn8F5RssWmFE7gsxTvNZuT/agj pEqcBNn+CO9bua/C+7Rrn3x/N5Dh/UVn7BUiW2yKaYiGi/lesznhj1ICxHgZegpivm9XhDq+ TxqJ220/d+3UR9EMKI+h6aUf+i0GfMnnJMBUR4ASJ0EPQQz4rezXAb7aD1/Gm90/eZToo7LF JhmO4LeU8R1AB/9RR0iVOAlyBCLGb+W+jvHPt+9pXKC5dS8BznGyxZNkOoLjYsjXgE70o5QA MV6GHoMY8tsVoQ7yzzeya994z8O7C07dK1C22DTTEz0XU74mdLIfpQSI8TL0MMSU364IdZSv G3k3fqNXf7DJkbLFppme6LkY8zWiE/4oJUCMl6GHIcb8dkWow3zdyPvhFs7e7S5yqGyxaaYn ei7mfM3o6ZbTTEqAGC9DD0PM+e2KUMX5qo/P4zkM75cocrD8EW67v3a7iGhnG6YHlIO+xHSg IKQEinEypueY6Qfot6tCBehvO3J8f58audp+nkr0ronKEPMYT1rhBU5LUV9zOjGQOkKqRCfo AYhQv5X7GtRH32wH7O84+nFVonfDmRwtj/GkmIZouBj1NaYTAyklQIyT4UxBjPrtilCF+mkj 06+LXvJ7doKXP8JJLM3QbDHnS0wnBaY6ApToBGcCYs5vZb+K87ETHtafB8/r4fPMk3vLiwww j/EkGp7guJT0HUwHBFJHSJXoBD0EEem3cl9F+vIoejP+EP3zBaSvYHmMPyXTERwXk76mdOIf pQSIcTKcMYhJv10RqkhfNPJx+JbFV8Pf2V+jl7A8xpNmeqLnYtLXlE78o5QAMU6GMwwx6bcr QhXpi0Y+dYfTp+GA6v2+QQ6Wx3jSTE/0XEz6mtKJf5QSIMbJcIYhJv12RagifdnIh/HGwN5N 1XOwPMaTZnqi52LS15SebjnNpASIcTKcYYhJv10Rakjf6ePt8A3SG2fpLUfLY3jYdx2IGXe2 wR5QTPqa00GCkBIoxsuw55jpT0m/YRVqSP/w3vPKnPT7RbfrDOlLYLbYtMILnBaSvoPppEDq CKkSJ0EOwCfpN3NfRfpp3z4h46n/ocJx0VSfTszhssWmmZZouZT1HU4nClJKgBgvQ89BxPoN i1DH+kkrp9P6d+O3L7w2ZrB5DE0v/dBvKe5rWicKpjoClDgJeggi3G9mvw73z7fvZrjsu29h 7hfsJTFbbILhB24LUd/jdFAgdYRUiZMgB+AT9Zu5r0N9dRh96G9pOXyS8W7unONliyfR9ATP pbDvgDoJkFICxHgZehAi2G9YhDrYV/vh9XBtlLcf5mjZYlNMR3RcivoOppP/KCVAjJehRyFC /YZFqEN9tUdeDz890l/odsHv2UtetthU0xVdl8K+A+okQEoJEONl6HGIYL9hEepg32vlx82i vN+GzRGzxaaarui6FPcdVE+3nGZSAsR4GXocItxvWIQq3M/tlP2JjdkK3I/dn/8DeCfTvwpl bmRzdHJlYW0KZW5kb2JqCjQgMCBvYmoKPDwvSVRYVCgyLjEuNikvVHlwZS9QYWdlcy9Db3Vu dCAxL0tpZHNbNSAwIFJdPj4KZW5kb2JqCjEwIDAgb2JqCjw8L1R5cGUvQ2F0YWxvZy9QYWdl cyA0IDAgUj4+CmVuZG9iagoxMSAwIG9iago8PC9Qcm9kdWNlcihpVGV4dCAyLjEuNiBieSAx VDNYVCkvTW9kRGF0ZShEOjIwMTIxMTEwMDkwNzMwLTA4JzAwJykvQ3JlYXRpb25EYXRlKEQ6 MjAxMjExMTAwOTA3MzAtMDgnMDAnKT4+CmVuZG9iagp4cmVmCjAgMTIKMDAwMDAwMDAwMCA2 NTUzNSBmIAowMDAwMDIzNDAyIDAwMDAwIG4gCjAwMDAwMjMyNzUgMDAwMDAgbiAKMDAwMDAw MDAxNSAwMDAwMCBuIAowMDAwMDI4Nzk4IDAwMDAwIG4gCjAwMDAwMDAxNDggMDAwMDAgbiAK MDAwMDAwMDMxOSAwMDAwMCBuIAowMDAwMDIyMjgwIDAwMDAwIG4gCjAwMDAwMjI0NjAgMDAw MDAgbiAKMDAwMDAyMjgxMSAwMDAwMCBuIAowMDAwMDI4ODYxIDAwMDAwIG4gCjAwMDAwMjg5 MDcgMDAwMDAgbiAKdHJhaWxlcgo8PC9Sb290IDEwIDAgUi9JRCBbPDFlYjUxODQyYzc3ZTA1 YzA3YmI1ZjU1MWFjODcyOTlhPjw3NGNjMDNlZDlmMjY0YmMyOGU5OWQ5OGRiYThhZmYwNz5d L0luZm8gMTEgMCBSL1NpemUgMTI+PgpzdGFydHhyZWYKMjkwMzAKJSVFT0YK --------------010608060702090002000106 Content-Type: text/csv; name="result.csv" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="result.csv" memory_size_gb,hvm_old_create,hvm_new_create,pvm_old_create,pvm_new_create,hvm_old_destroy,hvm_new_destroy,pvm_old_destroy,pvm_new_destroy 1,1.159,1.093,3.222,4.034,1.024,1.185,1.020,1.040 2,1.316,0.888,4.408,5.443,1.327,1.961,1.979,1.990 4,1.382,0.962,4.622,8.367,3.633,2.858,2.893,2.901 8,1.440,1.057,4.969,14.272,4.035,5.305,5.337,6.668 16,1.539,1.264,5.607,25.758,12.862,12.828,12.865,12.886 32,1.754,1.665,7.066,48.729,25.302,19.945,19.978,19.987 64,2.188,2.499,9.752,97.022,28.790,39.350,50.048,50.118 128,10.949,4.090,15.234,189.261,57.128,78.240,78.440,78.432 256,418.667,10.275,452.320,375.961,114.851,156.496,198.798,156.391 512,430.449,14.831,494.971,752.235,355.738,353.989,354.502,382.305 1024,867.145,28.570,1004.788,818.385,626.623,747.762,751.686,752.019 1500,1716.501,38.601,1968.900,1599.078,1083.900,1006.805,1000.907,1006.042 --------------010608060702090002000106 Content-Type: application/x-shellscript; name="test-vm-memory-allocation.sh" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="test-vm-memory-allocation.sh" IyEvYmluL2Jhc2gKCnNldCAtZQoKZXhwb3J0IFRJTUVGT1JNQVQ9IiVSIgoKY2ZnPS90bXAv cHZtLmNmZwoKZm9yIG1lbV9nYiBpbiAxIDIgNCA4IDE2IDMyIDY0IDEyOCAyNTYgNTEyIDEw MjQgMTUwMDsgZG8KICAgIG1lbV9tYj0kKCgkbWVtX2diKjEwMjQpKQogICAgdm09JChncmVw ICJebmFtZSIgJGNmZyB8IHNlZCAtZSAncy8gLy9nJyB8IHNlZCAtZSAncy8iLy9nJyB8IHNl ZCAtZSAicy8nLy9nIiB8IGN1dCAtZD0gLWYyKQogICAgc2VkIC1pIC1lICJzL21lbW9yeSA9 IC4qL21lbW9yeSA9ICR7bWVtX21ifS9nIiAkY2ZnCiAgICBlY2hvICRtZW1fZ2IKICAgIHRp bWUgeG0gY3JlYXRlIC1wICRjZmcgPi9kZXYvbnVsbAogICAgdGltZSB4bSBkZXN0cm95ICR2 bSA+L2Rldi9udWxsCiAgICBlY2hvCmRvbmUK --------------010608060702090002000106 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------010608060702090002000106-- From xen-devel-bounces@lists.xen.org Mon Nov 12 15:02:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:02:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvW2-0002Cy-FN; Mon, 12 Nov 2012 15:01:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvW0-0002Ct-O8 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:01:33 +0000 Received: from [193.109.254.147:37403] by server-16.bemta-14.messagelabs.com id 5C/FF-09215-B4F01A05; Mon, 12 Nov 2012 15:01:31 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1352732486!8530758!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2520 invoked from network); 12 Nov 2012 15:01:27 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 15:01:27 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACF1Mvf004305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 15:01:23 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACF1L65012918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 15:01:22 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACF1Lu2030706; Mon, 12 Nov 2012 09:01:21 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 07:01:20 -0800 Message-ID: <50A10F3E.2030808@oracle.com> Date: Mon, 12 Nov 2012 10:01:18 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: "Keir Fraser" , Jan Beulich Content-Type: multipart/mixed; boundary="------------010608060702090002000106" X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: Dan Magenheimer , Konrad Wilk , xen-devel Subject: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------010608060702090002000106 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi Keir/Jan, Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 Attached is the result. Test environment old: # xm info host : ovs-3f-9e-04 release : 2.6.39-300.17.1.el5uek version : #1 SMP Fri Oct 19 11:30:08 PDT 2012 machine : x86_64 nr_cpus : 160 nr_nodes : 8 cores_per_socket : 10 threads_per_core : 2 cpu_mhz : 2394 hw_caps : bfebfbff:2c100800:00000000:00003f40:02bee3ff:00000000:00000001:00000000 virt_caps : hvm hvm_directio total_memory : 2097142 free_memory : 2040108 free_cpus : 0 xen_major : 4 xen_minor : 1 xen_extra : .3OVM xen_caps : xen-3.0-x86_64 xen-3.0-x86_32p hvm-3.0-x86_32 hvm-3.0-x86_32p hvm-3.0-x86_64 xen_scheduler : credit xen_pagesize : 4096 platform_params : virt_start=0xffff800000000000 xen_changeset : unavailable xen_commandline : dom0_mem=31390M no-bootscrub cc_compiler : gcc version 4.1.2 20080704 (Red Hat 4.1.2-48) cc_compile_by : mockbuild cc_compile_domain : us.oracle.com cc_compile_date : Fri Oct 19 21:34:08 PDT 2012 xend_config_format : 4 # uname -a Linux ovs-3f-9e-04 2.6.39-300.17.1.el5uek #1 SMP Fri Oct 19 11:30:08 PDT 2012 x86_64 x86_64 x86_64 GNU/Linux # cat /boot/grub/grub.conf ... kernel /xen.gz dom0_mem=31390M no-bootscrub dom0_vcpus_pin dom0_max_vcpus=32 Test environment new: old env + cs 26056 Test script: test-vm-memory-allocation.sh (attached) My conclusion from the test: - HVM create time is greatly reduced. - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. - HVM/PVM destroy time is not affected. - If most of our customers are using PVM, I think this patch is bad: because most VM memory should under 128G. - If they are using HVM, then this patch is great. Questions for discussion: - Did you get the same result? - It seems this result is not ideal. We may need to improve it. Please note: Imay not have access to the same machine for awhile. Thanks, Zhigang --------------010608060702090002000106 Content-Type: application/pdf; name="result.pdf" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="result.pdf" JVBERi0xLjQKJeLjz9MKMyAwIG9iago8PC9MZW5ndGggNjcvRmlsdGVyL0ZsYXRlRGVjb2Rl Pj5zdHJlYW0KeJwzUDBU0DVUMFAwMzQCksm5XIVcTiFcxmYKpuZmCiEpXK4hXIFchQogJQZA EigBRMm5CvoRaYYKLvkKgVwAv0kNugplbmRzdHJlYW0KZW5kb2JqCjUgMCBvYmoKPDwvUGFy ZW50IDQgMCBSL0NvbnRlbnRzIDMgMCBSL1R5cGUvUGFnZS9SZXNvdXJjZXM8PC9YT2JqZWN0 PDwvWGYxIDEgMCBSPj4vUHJvY1NldCBbL1BERiAvVGV4dCAvSW1hZ2VCIC9JbWFnZUMgL0lt YWdlSV0+Pi9NZWRpYUJveFswIDAgNjEyIDc5Ml0vUm90YXRlIDkwPj4KZW5kb2JqCjYgMCBv YmoKPDwvTGVuZ3RoMSA1MjIwMC9MZW5ndGggMjE4NzgvRmlsdGVyL0ZsYXRlRGVjb2RlPj5z dHJlYW0KeJzsvQl4FUXWP3yq17vfvvuSm+QmNxvcQIAkQDCaK7vsyCJBMgTZN1lVVBRwAURU 1HHDDRxUQB0CBAjoDOigjgvCjMuMzqiM4jIqyuuLzAgk9zunujskUceZ9/9+z/d/vie5/LqW ruqqrjpbnapWYABgheUggjb5ysXxjbE/fYk5DwEoo6fNnz739aur12P8BOLy6XOunvZWw7YX AJy1AAOWz5g6acpR/0tfAYw+inW6z8AMb2kwF2BMGNN5M+YuXjKx/OxYTFcClE+ZM2/yJHHz qd0AazZgesbcSUvme+udywEOWLB8fP7CqfPz3xm6H9NFAPbfyvsggojKT0JEKgB8ZvozxOcU Ns1Mf073KRS+wNoNBgA2wzNsJjwD++EFdgJrbYO9UA+/hxD0xfdaCr+EVaDAeMy5BS7Gn4z5 v2SRdD2UwEYch41wCMteAtfDPgiycPrvsAxuFt/EWjeDE3LhQhgB8+A2NiR9BUyAD6UboQcM gcthPlueHpe+PX1XehM8DnvF36cbwQ5RmIy/Q+mv5T+n/wqdsMY98AB8yO6y7oIUtrIcSz4M C2G9WCOx9PT0aexBDlyFfZBgKBxiB4QkPn0qfMbCbKnYB5/yq3Rd+iCWikENzID1sI+VswFC jjwhPTR9CILYxhJ86gOwA3bjrwF+A+8xh3wivSl9AiJQDBfh+9TDG+yA2NS4oqkKR0zGUeoA FXhnHvwWXoYjLMGeF+bJDrmbnJKvSb8FfugKY7C3T2LNT9k/hOvxt0x8Seqf7g0uHJc7abTh Rfgbi7ISNpyNFToI84RHxIVgwRa74m8KzMTxvh+f/gFLst2CQzgs/kp6SjqjZDYdTbtwRgrg QXgYnmdOfNM4W8RuYO+wj4U+wkThQeEj8ZfSFumP6iR861/AXLgNnoJ/MC/ryUayS9kMtpSt YneyB9ghdoR9LlwojBZmC9+IM8QF4m+k3vgbJS2SbpRXyrcqnzeNazrY9Iemf6S7pVfCSKSH Fdj7e+ARfLO9cBjexd+H8BGTmZ258BdnOWwMuxZ/17Pb2GNsM9vC6rGVI+wj9nf2LfuOnREA f4qQIeQIufhLCAuFq4RfCg8Jh/F3RPhK+F4MibliUiwXK8VqcR72apW4Dn+7xL9JUemwlMZx 7ibfKz8qb5afkl+QTygO9QYLWF4/+6vGjo0fNEHT6qZ7m3Y01af/BgGcwyiOQjZUYu8n4W8W zve9SHHb4E3mwLGLso7sAjYER2Yim8UWsCU4kjex9exx3vdfs+dwlP7EvsE+O4UY73NnoVzo LQzH3y+EqcICYZ1wl1AvvCOcFlXRLrrFgNhRHCDWiFPFxeLV4r1infi6+L74kXhKPIu/tGST sqVcqUBKSgOkidIV0iPSZ9Jn8gT5NfkTxabMVVYqDcp/qd3VC9QR6ki1Rr1D3a2+ZalF6vwd 7II90OKPHRVXiP3EXXC7UCpFhDeEN5CeJ8IUcaiAlCpsZquF61i9kCcvUc4TzmPD4IRUgGP9 kvCocEo4TxzKBrNRMEvoqj9N8UtbMaiUfgfHpefw3d7AJy9RHOx64RvFATsYCBXY5otiFykp vgbviR8yVdoIf5FsLMSOC0+KI5AKfiNdII+DHPEh+LW4gF0Hu4R+ALYzlrVIx8PYVpQLo1k3 9k8xDaIwDKmoh/gx3AizhT/DceTj1XAfmyJNh9uhlC2Fz+AJ5IoO8uVKRyXAXhFmSmsEH6sH QdqCb1fB8pgo++EmViOuV74R3oUr4LBkgw/Ep7H3h4Vfi0OlE/LFbAZywHWwEhakV8DV8jjp j2w6iGws5EtHUbotFbtJORguQ6kyAWXabuTufSgHLhSHYk4YKWcI0sUYlBDr8Xc/ygkJKWgm 8vglKMXegHpltNAA02UXQ6kDIL3WdDGMTz8BD6Snw+Xpu6ATyoNV6aX4xM3wCdwBm9nNTdfC fMhCzvmADZH7C4fl/ulOwhrhXWGUcG/r+cXRzmdh+AJ/v8bEBfKzsEb6E4yCqvTa9NtI3UUo YR+Ay2AQHMO3/BpbGCgegNKmYcL2dH9xPr7vhzAy/WQ6m9lgRnoODIfn4HFVhklqEue4jv0R 3/damCpcnF4sTm2aieNwB45CCkfrCpQ/t6T6jBl9YarqgvMrz+tV0bNHeVlpt65dSjp3Kk52 7FBUWJCfl8jNiWdnZcYyopFwKBjw+7weze1yOuw2q0VVZEkUGBT3S/SvjdcV1NZJBYmBAztR OjEJMya1yKiti2NW/9Zl6uK1vFi8dckUlpzWpmRKL5lqLsm0eCVUdiqO90vE6w71TcQb2PiR 4zB+W99EdbzuOI8P5fF1PO7EeE4OVoj3C8/oG69jtfF+df2vnLGmX21ffNx2u61Pos9UW6di 2G6zY9SOsbpQYv52FrqA8YgQ6tdruwAWJ3aqLpro268ukuhLPagT8/tNmlI3YuS4fn0zcnKq OxXXsT6TE5fVQaJ3nTvJi0Af3kyd0qdO5c3EZ9LbwK3x7cUH1qxt0OCy2qRjSmLKpAnj6sRJ 1dSGJ4nt9q0LXXMsfC6JD/f2Gbeq5d0McU2/8Mw4JdesWRWv2zByXMu7OXStrsZnYF0hv3/t mv7Y9FocxMGj4tiacHP1uDp2MzYZpzeht9Lfb2qiH+XUzorXWRO9EzPWzKrFqYmuqYOLr87Z EY2m9qaPQrRffM3ocYmcuqqMRPWkvrHtflhz8dU7I6l4pPWdTsXbNY8+sNtdbiPicLaMTG2+ x2O8OMUGX9w8sox6lLgICaIuPjmOPRmXwHfqSZepPWHN5J5YDP+qGdaqm4IzMrPO2qd2jdaL 8ql+nZyvJeJrvgOkgMTxr1rnTDJylHztO6Ao0UkzqeF9M16XTNZ17EgkovbBOcU+XsDT5Z2K r2wQEon5WhwDHD4YgWM7qbpXCQ5/Tg5N8K0NKbgME3XLR47T03G4LGMHpEqS1XVCLd05YN4J jKE7y807zdVrE0jJ9UDmaqDOUtD8z60Fff1m9KpjwX9xe6p+f/CoxOCR48fF+62pNcZ28OhW Kf1+z+Z7RqzO12ecmCEYMSFD5HeRKCc0F6bEOEedlI//FE7UUxpUC1Ilz2Hx/nVa7UD9Wm3L yfk3KzWkT1AtHpyrZnSzrleydfq8VulW3XOsEbHDqCoHjx6/Zo2t1T0kNb3Bi4wAKR5Gj8uJ 96mDMciZ+fivIX2gJ6E6oy6FQ9aHCiD96VlGslXBDCNejX9EnZ2K+6OgW7OmfyLef03tmkkN 6eWXJeJaYs1e4QXhhTXz+9WahNOQ3ndrRl3/tdU4VjNYL2QKAXpvT7DVI7en2OpR48ft1XCt sHr0uB0CE/rU9q7enof3xu2NA6R4rkC5lEmJOCVgMMOX3CFYePmMvSmA5fyuxDN4enIDA55n MfMYTG4Q9DzNzBMwT9LzUjyP/kjG9Bk9riX1cJas7oTUKDBuYMuAFrsKkOPJ8eTjhaHSPRsX D5xNyXAG4tIBVIyopYGtQstfhPxUWKgEm1A5EU3yZWjaSRvw/gZp4/3hpHaqpuY4VB3v2qW0 vDSw79ChQ9gKjEl/JnnkA6BBpuBOOd0Oh6P3GLfDbu89RmlIf57yUFoOU1rV6JpBuXaK6aUw fTIVdDp7j4kpdHU76KpqdN0u0AumbNEsSfZnOZ0hK1aud7uFMRRJRZxOjHnAQTkQdDjw6qA8 KEkmk4fwcgj7Sz3O2K788Ekn8UkKPenTeqeTR75ORex2hR6pUQ5oDgddKa/5keeeWa/EI1oM mQSn2/5bFNBBhBfhTh9NDZOUVcJq+2r3Ky7ZqtrDQj/fkMCgSJ+M0b4JgQmRizNmq7Ptk31z ArMjtRlXC1cpV9qvca9S7lfv1V4Jvye8o7xj/4s72txd6i2NJEa+radhw8g/U34apNAiayon UdbFysCqWQX+YlSCD1GMSljXZXv4vHhcdMNjoUzPIkBGScWxahyIwngJsFAJ4CVgXdbLt9K8 40vXJI/jlaI1C3jUGARWswCXgz3pjyGqq5PmHySTPs3bvbRbMOgNaIKSyC0s8GnB0m7dPVpB IldVxsx+c8OVOxb3nvXmxreuvnPvlqVLt2y5fumgGuFNJrHzn564syn9XlNT0++euX8Pe7jp vm9O4Hpr1tczVxLFfoikdwapzgbvpfra9J7zq42/IfCrTX8LfhVTTk/ZbGmZcIfwgEV6WmJW UGRBtMrMIbBXbXwobDSKwOL4/Ib00XpNQ0JqSH+R8nDyinHycnHywjlPRYh4TArh1BJ1yMgA ZTI9y0XPklkc17GCHLHvY5XsZggnh2nHcPz0IaU/TFQObayEqqpQBfNU0HhCTZLpN3MSHkVR y7t371EqnKm/8M3R931Usli69oKl2b8e8OpE7GUlWskqjkKWEN4LKnIGjYAFCYPPv0q8QhGe w5kKSWMn5yudG6wezRn2+ZQxTqIZj4dHvk5ZNQ1jWX45iygoRAWysuhuVsyFd7Ic9LZZDcKz KYdgC4Xi2ZpHEOLZHm9FyVuH6HoISohEklV0PdiN2E9obtDh9Qq8wZTV7RHMdo6m7F6fMCbL T3n07B34aP0FBKL1r1J85H+sNeJIao9a442lup8nn6c8K+9XnlVftrwSUy9yVDtGu2Y7priu 8V7ju8X7nPeT6CcZJ6KO/fY9PiFDi2mZWpam/DZ9AkfxKFgwtOIMR7NsmkVRXo1F/bFY1BKL ikywRGOiM0trEDbtHO5hngYW3kVvANTlnUxw2ExGtZmMaiNG5dLMtij0JhIvMSt7VlgBcdBY z5TDs6tKmCjME5ahWtgn5EE2u2M7Z7uak8eRUCq1kzq/VTZWVh1vrDnm8RKt4GWVq3PSdZ12 EBNIOWDyYE+oYTULDU7MD+QU9EAK6t69vAy5TlELuxNLBvxIWfhPUs/2EEL5v1r/zeYHrr3h IbbX988/vHlq4JMvPDYh65lnLqycfOD6g59Mm333Q2t8h9/94plxW5/btHpSV+LAselPpSDS XpLV7xbDXMg3GBRIkZ0txLc9Ek7R5IVjwIg3kg5MsA4JG2oLd5bN1iGQFZOyOsTkDs6E0xGO MPDGNeK2uFrAn4nFC0pI+B4qoR94K6qqtOPacZz84y9pL3krtIPJbgSa/CLZGXT2c650Sv08 l3iuzBAvDs7RZvmnBK9wXu1f6VzjvyXjcadNjouc6OwOp0tSGbbLaE5J+z7LyCvlZOX4MgEp vE/YBBFhRsqKvZSxm06vOcVec4q9zbLYu2hifF5ciIeJReLLVbOoahZVm4uqiwq42C5gUKAV CPimJ/dQrYJ1ncINrOeOyJtsH+sJgANmb5bR64ob2F0GdSSPc/ow5PHJZE2zWG48RnxxXOPE otMKShakDhQubEE1iRdfjyCJYk4Uao/mqEkfRCAqXSGRWzC2Pvue2cu2PXZd6RC/176oYeWs mWv99Tlf/HrJq7OnTblhXdPn7zyfZjeGH1hVd8PSjf5HhCXXTb7hppviu16evmPKxIc6Z/3m 9gNN331K1kIUJZYm70O57WR79oIjfTr1NI2PU+GEw0W4wq9WXZzzq8zFucKvVl2086tq4QKP X1WuuCwWPZ8G2MKvMr8q/GrlV10teMc5ZjjWO7Y4XnHIQ8Qhzl9KohfZGxyKqMo2u6iiPnE6 XxUlvyhKohMEh1NSxWeFZ8GCttWGlA0kCYvAqzapQZi2R5ZtqczsMpupOGy6VcEjX3PzwtbA eqScaio3UaYuzylX17kFYga7018GaOjFBVGgylQHI8d2Ux1hl6uBreXz/RXpYNIbJ4mtK7VP Na42tJOVpyo9FTTJFRWrOicllAdutxunG038veBMf7DDW4HS9q2UvbRCzO1UIUqZmZX0iGok BiyT8jtS9grH8hEVjlRBhSM3hmGnCi47qlnyh3+QRCuynJV6SgMJj+hhwr2NNwkP3/3SS/VN 5Wzi4+Lus4Meb9qIouyextkkJ8g+zJGfgCx2NuXz8en08qudCw1upNgpdk6IpEIU83Hr0Muv Ytg0aDgT6YUo5uPGopdf7WE+31SIT3ZrKbQXGI62k4aXxVy2rEAg5iUVZndLUlbM6WKghlHZ c+OSR7jEIuVCEoe4Clmq8SBKGRIyHbxcCbr5dXD06sw1mff6nvT9zvGO4y8ZFqsv7OoYFa1d 5C72fahQRJQ0ms8W8Pp8r7rcfpfP73I7UdykfNSRlGuDS3C53KkAMzq1xy2xN0kUoXpJeah7 nonaPG2ZdocmaT8jVMJcqIQZhLWwEDaFSnhd3PscKwc3uwc5r+cO164fEy7ZrYVLK/FSg9RG 2oePQ40HgRL42CpL56SMJAdcBXHtwxbUIOm0JZuW8gaFjC8nkCOioIGAX0XLsGDMbwIPzLmh /pm1l6wt2nK78G7jnuE33XmAWRbfdvL3jWy5tubWg4+t3zG8Kij819NNV05oOvWHl+/ccZQk ylCkrwDqoUzoKIh70fw+wcfG02BE4uZoWcxIoUlGiWYyytHXJ/zq4sTES3PJQZaKTV+SOM7p tGw3y2YTmcgyirJSTuZ0ohWTIedm+Z22LAb5GtXiyxMtK6QRTYW4Rgvx5UnIWEsceuuQ9qJJ WzXHtYM1RFudZkdYXzUV6BvpGx/vHR2fLU5Rp1hmeafEF1uuiN1sWRl7x/JW0KPGaWILdZmh 0MugOqNYDr+h0o3CeCKeQzc81MsRTgH7mcHeJNuxgVSa2WdGCgd25ZtDlG9SVn4zZeUv0jhl aQw0FHD4gif2kO2rrStGydYz5cviXJ3FBXMWF7FZDawilVsVmhiaF1oWkkJ8+RfioxgKUt1Q kHoaahDydiabVxq6HmtJesd1pcaVGQ6TQWdUlBRaSymFaw6mFhTy5YWikibzkqWTyAWP1oP0 GvO3IEPxzM5w8UWzx1445jLhwuem1zdedeSmvzUde/iWz595v7HH8NuHLdz02LXXbJVGuWZ1 Gdrlgq//Orm26R9/XHP8ejaYLWVbnt/8wtn3a7ZWNzxy/7ZtOKKTULcF5SfBCfNTroNOJuE/ wSJZUXmQoOkiMMnqcC4SRYEGcji3+UQh6rYssn4Jw5GYJgpiFQbz2DJcAEVcBjMO007WLKgc evL4MO0UrRY0HA6yBSs8FbrhhwznK88JKCAqaqK719tjkrhrbdPxwd3de8Ub/vsW6fQza+9p 8jadafjLM+wL9vJD5BEYhVwTQa4JQQK6iP33Qsxcqke5GFbDBu8Yubk8XcKvnUw7r0Oz7C44 V5yv7HM5J8Wa01Ge7mAyXif+XIqV8BsF/KpXJ8LJ5ZI81pyO8nQHU7Lz6tyiLuE3CsLnxHy9 AzKyOpNixXWLMKZzZ29OliIXZXmdWWRRcMfByd3cb5B0k4wg3nSbCw2K8JvusEg3SZOLZimx mafFvICDigf4EwOcpwPn/AOtnQ+0QjleUdHsg9jDO6KYHVH0jhzjvgi3qfiN9ikPI2dTuZRJ zVLNANc6Af6m597PbAzbYiVGB0yQWOlRHmQdghcFLyr41PH3LrK1C7sOrmNLpcWWBfaFjiuc 14RuhTVsrbTSssJ+k2Ol87bQ656XfN5cFB87YvEoBfF4CQWd4gUkUyId4g7ICoMDu7GhM2sx 0qYYyTLFSBaJES5EsxbttzLrPmE6JI1CSbNQslnWJBe5U3GUNW4Gbs0tuBvYnalItzAXMGEu YMJcwIQX1YlMbBCmpwJ5/GYev5nHb+YtCpgL8XggFRAC67q+bOo2rtC4Q+Nks35rtp69FTV8 EMmiMmQN12s1CxfAguofNYr0P1ZQUF5mrK5M4xkwx+dvIXNaCiA2a/6cT/cf+GL23FW3NZ16 992mU3detnL2jJtvmTZ9da+L1o1asfmZG5Y9KWZ0uH/Whvc+3DDtvg7FB1c/lwbGDtzxPBs9 46YbJ05eddPZ9NB1w59YfsPWzaY/jjg7C/Xhhr3gRlZJ0HAEwvqVa0B+Teiczgcup5mVgxq3 wSmdSbEA581Cfk3oapKbZDnNzB3UTGdf/bkb1FhQMxTo5y2cDnvs2Wic5HvQNDnF6Tusa1oe OZEqIgIPeziFe7hzxRP2FCftRVluV7ZruEt0ufwwgjG+kHRqHmUMI/sol9bgNHkHkzXduJbo xucPiZ+4USNN+/6LzY6IFp04Z/GlOnKTz8OZ+idabd1Wm6ZKWjaUKusVHRJMJS4NXpKYJs4J zo1OT1wTvS5rbfTWrPXBLdHnol8EP42fivvODz4SfCYo9uowRREKyVpMIG+Fc+JKvChruGsi mYYxapK9OUJX2/XUiWyTx7JN9sk2vTzZ+1gF2I3bdhpmum03b9tJW3tam4nriskCSIXQBODk kM/5KN+iK35PMx95Uh7Bsy7Zio9QUxs8ZHBQs5FoamqoWcBqqn9gEjZbhRcI5WWFpKUxBGQf r4e7CwsYZ5IA5575zwSXThp13YjurPuzc3efZepLdxy/9pr/euzp94TXHl+8ZMeWpddtZKO0 ay4fsuzP8x3hsbOZ5c8fMm1908dN3zZ91rTz1/vFsgd3H3xoLapqXAn8rWmmtKbpS9SE0ZSD VYEQlSEi9bmQe+i0T6FkKHZeRK2aLW1pmnnDDcRZg9KfSzHpAiiCHsLmVLHVae0YcUY7dnB2 7Fjh7B7okdGr40Uda5w1HWc5Z3as7bLGubLD+uCD0S3OQJHOG9xa+1x3MT8R2Vq0O/Js0cHI 4aI/Bt4vsvQNMpKbpG6VMV4vXWUu7ctJ1g6nWHYoO5ws7lhWIVUUXyQNLB5rqU5Os8xMXulY havY753fJz09ylxM0kryykLdcvzhiR3mdRA6xEpcVa47XI+60i75Udc21zdIzg248Lbr1i6R v4v4gJSdi7qQQ/4/F2dBl0Is6iogQnBxeYHUKKLFtjXlDBdzSXyPPxZTobnr0K/Q1i0m2jtM 0iaBSXxAxMedtKTMXNwtq3BPan5OXkP6K942RUhwYEwiFswjrUhqNk/3aCsU+WvKTr3L4/3C 9Nl6ajSvQbg05SpMkSclXtClYFuBXIFEW+9yCWNQV71jRkjhor3QtYJLjyzkgIoDFcKGClZB DvbUbHp0iLsTQvnh3BJO/yWcI0o4R5Tk7VcOK0K2UqUIip+LPb/uXuBC00VjqXBzQAnTKyjc TKCrgndpQBUu05SuPZtdwNwLrHMSyg9kJe5uP37SvFnZSNdPPiGRcyyJ7JU8pns9m+suwDRJ IMPRAzVcGdEyDBbkE1+RWureg/+Q0/QV2AUCuXlCwQDyVyhRgLajS9BZDQuJlVP2ztr23IBF A8tnvzedlfZbvezqzLrw5UduWb11hGYN5T4XC112cN6EbnNnznisIPPGMf2funnYimF+lzOa l2+7vNP51QvCC24dnJo0qPOSE2duPr8ne78ophUNLRlYe+nw868iblqJ3JQt76N9I/ZK6lom O9x5crncT5arsuuyhezs3FhprHdsfva6bKWXrzJYidJ0SLTGUuMc564J/iI6yzLHOcN9efDy 6IHsdx3vhd6LfOT7KvRV5OPMo9np7EhcLnGX+LvIVe6UPMQ9Qp4mv5f5nXRac2gBl6QIkBFT VGYLxFz2sCkYw6ZIxci3qXxO3HlH7Eyzp+y19uV2KZt7Me2cY8jZIOjSlSbaTtYazbLd3Fay 0/qL5ppyUqNo7u2LmUfgWy+cXDyl4OXMIXF+4DRPceShUpETnahvXeQLwgHG1rENrI6dYFI2 q2LDceXZkG7ifMOIpzKJwhknPcZXmsxLpMc46TF6RaJtXjRI3WNh6hvzU3MskjWgB19otCTJ hbjUaDTcTceQMhtbUyuRI/7zVOjO5xqGNWBBTsJT6kETKEsIaGj9FIr+UAtzp9OT9Qu3X7Zt Qarp2988N1soG3PnlU8/fsWVT8v7Gr+7Y/gdry5q+qbpnYfZvfvH3HrotSMvHSL/0Yj05+Jx lLpR9t97IYQWQi73C/IRtPKrm181fUz51Vijl7mWuZnbzlIwAuajqJe8Mbsajkl25gqoFhow lQ+YyjU+7U7ilTPWobde4hoeV+TdCKTPB1gdLDvWx9cnNMo3KlTrqw09KDworndu0jZFHRZn xDZLmCnOkq9wzHcudz7h2GXdbdvlcAQdKx0fC6Ird6J7nnuZW3Qzkp0FXYA6VYvdWgcb4Cic ACu43XY418cYdt0kSDcRJKcVd57LwuVybgbfpTppStWvUys4LeXZk9mMoYXIUq5k7zEsRRTE UlSKdacSLMUpIsXJYSAngigngotiAU5uAU56AS7vAnmHVZatVqmC6qJqqo2qqVw7qfo+LS+t ds0oO2iu3w0COSfgahYaW9TcB9ezGu8uPEnWwkJzzeKpKNFqjuE/oiQ0FhaYVjYL6av3Mr6R GFILzlkEYuX2zG9+/V7TPxb+/ZZn/pq9LbJs/Oqtm26adTu7ObTnMMtktqeZsGLbxozZc373 5jsv3IAypz/S0ococzwoc/anltoEyZnvLHP2dcrl/vLYJcJo28X+UbHpwhR5qnWyvzZ2IPst +W3f+5FPfJ/4vwl9GfmEy5ZgdnYySgJpcJSkk9pZyHN2DvYSyp2DhX7O/v6LYpfYxjqnOz9R PgueZiddGguILrvmRpljVz2AQkdsJXT+uYcLnVKaz2/38FnM97jNAq2JoJATQb6mHfEwDa2x Ws9yD8ololxdOnm8JBI8XB2TnPIoROceLq089AQ7zaPHRfPoIdc0N7H1xvRIqpYz0mKv7ibX PbacGrx5Kl8c6Hvz+9XD6odqWpWIPoaroprF+YfrPTVL5ytOM9yQUKOcZiJZZSNaSBraCx1K xNIsXHhmpcYJqDFZeUwXNJWEc6JmQQ1KmnJSbKjZdMpAscNaLrN6Tj247O0rZr11Y+29JTsb 409fceXjm69dsnHlI2vP/OpRJq4ZeaHgOt1f8L7+6vMvvff6QdJIg1EjZaGkCSB1PJIKZUMs gEv9GrnGOsY+VZwtz7NOtVsCZJQYQ3UsdTHFMmPcEed9Vz7tPxWVunp7RbrGLvQOjV4YG+md ELk4Nsk7NzoptkRZEjglnAprEGRuZyg0IlgbnB8UgzH3Om2DJmialBGzqbBP2EpcYkp2NLxp qjRk6Ht8KBZCpl+z1UEAbtaEUk60j7jf2mluOjjJsKORd9KjrIUdy+qczBnFtcKBnfkFZRTu ITMom2UHSTdM4Ou2Ul2YanzWNU4HWp6ayutYZs61zvW6BIi3mPcYn3ddVsT4jHMXH817aw1T kxzayBXLMA1p4NQCyhvavIDAG/oSorJxQSVfXXnNvXGybBaaYkHD5QJ4/GoOX1SzHO76U8Rf 7Cv+eu/fm75h/r++zVzs7Oe2HTdPXtv4njDS0XPsLUu3sLGhX9WzbNShDlbU9EHT91p8274Z 7J6VfWY8QZTQu2mk+AVSAq6h2YupWrtd9hfb8/1D7P38ijUzkllsL/AXJyrs3f2D7P39Y9Vx 9hn207bvAq7OieLCCxIXFA4pXFe8oVjtntO9Q1Vxf3v/nH4dRueM7jBTnZwzuUNt8fLi9wo/ z/k68U2hJxRUAg3C9vqimE/lqkGLQxeuGJbDATgCaFkL16U0ORZz2/rlxhy2YKA0v7Tl5vK3 5nbzP1OFfHsrPxw+EmJaKBWqDS0PScW4rhfGFHPpEOLSIdQsHUJcOpAblud+oUsHKkVuWUM6 hMjK1h216dMm7Z1OzeA0t9jN8iE3m1NKNqeUbE4b2Xn73YfdH7rTbinbXeUejppPPxnEZYeb 04w7SjTjzuUOtxi1rO+nuLmscEeSxYtzSFwkh50jmwVDjUVnS4nBRQYnp1O0S3HMWIMeq6o0 DqgsCIWCId22LdTXmSQ1QuWlHu4dLmjpoZm2zd6tz+LrVodd7Mq6v5y4/A+3PXfNE1P/suG3 XzzwxHVLNz9zzZLN46Ij87tNGd+j7lZW+f79jK29f/nZWf88vOQpseMfDux//Xcv/Y4sl1UA In0r4mf37IUgMlwgVMY3nflCIF8qF/uJ+5wSzwqEImUhi8fh8YsyA3dMVv12m8PUAQ5zuh00 cx1pHB351lRp97K0lR2wsiBXAMEUTa61iF/9NLFWWlF5uLOTW5fWKJXD3FP6RFv9NNFWIh2+ c2C1GQeiTu3mHsphQZIaHcq6l9UFTwSF+cENwbpgOigFBT+faj+fUj+ffH8+44doNOzVCToP GUfqPQoSENEYR2lOp0LULcPUtVBnQOKHq+get0tB4ItIgZvBwwIDRoRbGhIL9NVQJS2TTrYm AMP7UKnbpBWMBEafq1MuxaXmuxRHBnNa3BkM6GzNCkjSGZtS3VQNBgOehIdPvRLwrKq//sCV vx5cf8XsEbdVol367V01mx5qnChsXHXtqNuva3wWpcNqnFy8Refq2JOpiGDjO5T8qvCryq9k a5uL37PmtqUekbjFTjFB3/rkV4VfVX7Fyo2maddoHqrQI1i5UXfNCXzhIPKrwq8qvzKdYY2W jU1RPcJb7sW3R7vT8A+3rrNusNZZD1g/tJ6wqmDNts63Lrc+amQdtaattmwr2pOqJIhWRaQZ 7sRbvZ6BIiuSTVHzZZAelTZIddIB6aikHJBOSAJIcekIpiRJX3oI1LIx/RKffslG7Ut+mn5J dz/wSBMXNbyfNiIFaZilLREsrORb3zjVSa4bDEdtzcIFyZ/685WXBkSc79X19fXSl4cPnwlI BWfeIy69ES89aDbZ0JSz5Vy2mj99t6LlbLWaIX2TpOV8tJoD3R0q8xGn02E7e/Tkp8R2lpXr YZeuepibr58ey0dR4Zaz5UflD2VpOF5OyGK2PF9eLqdlCXnLJog6u9GTONsFSsvLHgV2AFcS Qkve++c53stswXt88IEPPlho5MEceYykudiH5imAYVLrKaA5IMcEzQKXsAt/OOLEXTfWy/tO 9zdkoVKAGjUhfLQXfIY001qcn9EjHjOSaQ5fzIxkmJGoGcnUvT9GGYpkmJGoGXHQa/EDJmbE ZUbcZsRn6lDNjHjNiMeM+ExRrJkRrxnxmBGn6ci2mBGUpH9ODbU7y/KlY9Ix699Cn8Tlt+VT cSFkiSes4Yy4VRQTWTElQMpPZUoiGtFsR/LZuvwN+UJ+KBR15a/zMI/ETfowN+e5j4yb9H7u pja2sDEmcMPewQ177h3z6Oq6lXnPalJZYUuLfRROrOH8dRksgzeQ0dxABm8gg5aWHmogg0vq DL4CxNwmXWVkOKipDNMRl0EtFIFQmuCPT3A1keBqIpHPjgCj5a6QDVUwHOUnPUWnSo07AzX9 BC+nzaChF87WG+R5MuXnCkInSa5DIZKX38CW7MwZ0NpK0L0X3CBo4dOo0Y9JnUs3Dus3te+n C3AVWllZifJkKJ0p8/DDdRWm+nD4fQV+hyeDeZ0BU32YduhPCRs6G8NPUYX4ZhDXLnzd2lLP bOz2xKwr78u+/tVHtu5MTLhg/i/rx00ZsqKXVHDPsImXjdu3bXdjofDwnIm97tnUeJ+wY8mS EevvbHzXsCo+RU4Ksu0pnywqPmGz1qB9LH7mOyGe8ikSbaLkIsldrbH7tSPho+F0WIpb/C5/ 0ItWBVOCTpvT5XCZROsyOY57frM5h+SFuSUR5laFndsTdm5P2JvtCTsXI/ZcXoJqcnvCzu0J TH+vE4fdZnjCTqW4y8DOTRY7w3/2YWESW8VkW4RPhIX54Q3huvCBsBQWhdJAkNNNkNNQkFNP kMu7U/Uejy7NftyksLUxKTwtTArJkG4HUt62JsqwEN/DaP7TjYyT3MxodSOpb3JUapVkaVQd P2dnBBWP1WaxqTZR0Qpw0Z3B3DavQTAdV5ARikTJCcNwu7agilWPXfF+7cYRmq2+4+yBi56U Cu7b1m/+0G7XNS4SVl4+98K7Xm98jlYlfXF9Wogz74QI2787wI8Y+vQ9cb5z/HlqKsUi/IZX tUUcA5SBlrFKtWW6MtNiKdN6eXsFy8P9tMHewcF+4QnyBOvFWo23JnhxeK481zpFm+udG5wS vooFrIrsvFQcLY+2XeqYI06Vp9rmOGyhmKR6UFD5TYrxm54JPxmQPm4Q5mXwdUYGJx21+fC0 yv0PhofNdJXyiHFURd/qVvXFLY/gwjcvv6yLykDV1DguOc+dw+n6IUorKjGXlq4Yd3FycTn0 /QlOzXngcNGpbS8XLNzBBzFOHXxxasgPLi2Bn0WBFDZHgkkAvqw1jsPzvU7oGqXlq3EQviUl 4OK15lSypqY1fZhn48lPQUfsrKPkUdbL5MusEqupBm6P8OMoYBxOabn86Lvplhf/woLXfnnr h03H9+5YtXLHzptX7RB8rPD2K5v+1njoyxtYFnO+/trrf3jxtVexs6uaZko5SBVeyGL3phY7 tE7a+dpgTaqK18WF7HgHRyKzW6BbZu/M+fF1cUuvUK+MQaFBGdWWSx0TQhMyZllmO2Zqc0Oz Mw7E3/S/H34/+mbWMf+xrKPxdDyYkJJaMlAu9dL6S4O08don9i8zmzS7xyUGY+Q+V4Ixlx1c EZMgIiZBRIggsmkUI3lHbEyzpWy1tuU2Kc7JIp4yzkV+mrITcdjCRvo0d6XzA5M0RzbTlW4j 2i6nSbItZr5SodRwTelOKd1BlQ/w4z5y0zWutXCNa61c46fausb5thsKfO4azx7QI8xa+cab XePJk8d+6BXnbnFPRUunuM/UB8GAn29sFnrEFjO+alOvu2asPjLrig+vHX9HZ88TVy556snF i7Y3zZR/s2bkyLXp+3/VdObWIb0az4ibDh187e3XXv0TWVQ3o0h4CefdAx+khpb4mCaxhFQm 9ZFGSdOkxZJi9VisFqvT57E6QbQwO58wsFmL1lmYJTfuYz4ht9XnIPoHIj+9imu2JP+Z8rQQ uQpnqlZ6Wl/IKZyrLPpCzjvg4I8t5I5pNScXHsNBoyGrMI+xgvbKKtd1B2kAF7IaU5uGVL5x hfLy5scumFl16S8u6N37vF/4s6SCjQsG9nqycEBV7cLGt7DPVenPxe04Ml1E1JAh3czh1wi/ FrU4B6hHCloce9MjeWYkYUZyzUiOGaGDhallfEWW68/tZR1k7Zs3Nndq7lLr7dab8p7wPVX8 gui0hqLhUJfBxe+E5AxhjCBo3ZgtPMEywTrBNsE+wTHBOcsyyzrLNss+yzHLWV9QX+guLMgr zOvQPW+8rdo+pWBK0eLE4rzleXfbHnLcVXRf8T1dNtm2OH5VuKloZ8GLBcEi09LMNSMJM5Jn Roz3VcxXUMyXUszXVMiU/iDlzaoYbynMd9ikaLwgINk7Z0bJIZUbKebu5UhVZHhkYmRb5HBE cUeyI/MiH0ak7MgdESHyG6SAANIj91ym/FRcYykmaOwIE4BpTCBP5k5/sIx7NDWXp4yxzhMy 52QKmbGAKun7u3yN+Km5Dvw05SMykmKd7dlRFs2LpHzhsm5UvZyERiSsX4mrI/zLr0icakbi VCvCd1kj3PdId3Hu9wmXgpr+djdfoOd1xAftilUc6cg6UptUv6P5aVlH/XybQpEv+BB2pJ1j ekrHKO9BTmHHstpuB7oJVd2WdxO6kXM2D8K6CcvpPa4PvqCfPqV+cWrJpr7FORXG89xcCrl5 391x7gMjk6WAH0hzcQ+Y7g3jR+PduR8CI6tZgEhXw5das2DoyRZaB4V18vjCYeYWcjK5gDyq LQze47TfkqQPZRbwDWRat6EE44G+hWzsIKM9kyrslJWQ/cUFHs2r+TRRyXXGM8BapGYwuRNe svyYzHElMiA34XRYOtgyWFGh1aYkpQzI1jLJ8klqaCfpF24qd0yuWLECWohRWrHXnMto9VlC YUFhZ6G8jD5c4QaTufNDfrxQlqArzoKqHe5brl26pDz/7pceGH5hz453jrruN+M9dY5FM5fO CgZLMm7af9/YmS9dd/hddn5s9sKpfc9PhPO7XbRi2ICri7KTA6+dHr54wsU9ErFMny2v9MKl E8Y/esnTJFvz0t8KHeUHIMSy6RuFJvMkTZN5kLjJPH+tRxQzYiMyTxSUWYlKRmFkeYQBczht TISgZk26bagzRbtby4Vc5mylxmy6GnOwtGrpZ+1Xq85Xl6vrVAnQ+Nmg1qkH1COqopJuJDGs 6rpR0M+A861M3aI3ItwZr5vJullFqhZjimFd6Uajuk+YBWHWffu0Nqt7VGzHDU/bsZOVfAem sZKUmqe0VHuFlvxG0fyQvgvjSZSXenrwbwL4ATdBiw6pvGxO8U037dy1y5csytr4qHbB1MeE yWuZOqfptrWNdw8tjuJIR8lHKhWATei+Fyz69lTvMYLL8Lt8UW+cxf5Cd6EIQcOl0nyk+0SK D5ygtdj3DckWsFkUpthAtlpkJsh5NFRySfL9Q9r7h/AdSOOQhs7YUy4zyPVU2EgAOj0VVlwl lVnoImCjOzFkRmijtbw1K6cMivDCTRJrbn4ZBPGCqfdS1xd1LoM4XtyODlBkLbBVQLltIAyw jWVjhWrLOOs0Nk2YaZlpXQJXsauEqy1LrFfZVrFVwkrxFnW1ZY31YbjfeqftaXjM9hvYo263 vQIv2t6Dt21fwce2M3DSVoyvYwtD0FYEBbYetuGQslnllDdYJuPglJmf9OH70KsDWU8pN//w BLgcobGgPG7X0KjwXEGWHXY6T/J+EscGcSh5KAklVVV8ry0j1cOmWiz5VpvfarWBKAhoH/gZ w47Y0JawWASBKarNKgKTSxzMkWtJpVLW5fQRKsvYlZKXy4KMsZQ1LqRYrv2LPxKdHY9GGmsa a6Lh48dq9K2dClxNkZygPb5VcufkqusOruocpqAajQDjLMu5v5ZnvnNYqQ/X2T18pYz9umnO b4/lZ4eTX+1tulwqaLxp+rzRVwqrdT+fAiDvQUrzyhP3ApiUpq8WuFs9k86l41KRnDzcKyLr jlV+YkNs4c77gpbAWIjLZUUxvmI5bXqXTuvnKHWx7TVvWJpvqIrhmPpW//ZAJ3ZN4f5jyfjO 5ey5NXmLT6W95qe9luYb+mFMm/m1gsRvcHsu17jxuelyNo5ce+L6bUNefWA6lT/YeY6F6DuK k/pKX9XPaSmGjf4W/xpP0o+L0p5y3KHfOFDv0r28B1IlFPOkeNrmERk40GxjihtJxulQSDQ5 PEyQbJLHZviwdMnloaPKh7R3Dmlv0dlp+jNONJ1TEBloXfpZR6mDTRjkudRzu0f0xPWvq4zv ICQzQl+ApKzZOWVaLLOQJPKJ1J7svDJJcVh9SoY14pUlkBS71e6yeDXwiX41ZsmwZ+LKMV/t aEm6yqBc7WU5z9VXHKCk1KGWwfY+7gGeQd5L3Rd7Z6tTLNO9VyvXqIste5V97t3e75Qz1iK7 pwiKnIWuIneht8TfE3p4r7KstNwv3ud4km0WNtufcOyC3co+1++ld5R3rZ9Ln7s/855UTltj doV67OBXTdEP3um6n6/lDd7OsLnckhc8FtWSr7rzXbTocamikznynQ3pd1I9aEHjRBbtyFc2 Tub3KTa7p8CW9IyWLrZN8MzxLPWs8dg8NgkZlqZDn5hzQ11jnGQ9if8orR2jn24b4L+MlF+U ZUFRVdlqs1mQnG2ah44qDN4pgxdNnItS02xuV/x3HtUSVz1eb1JW/bKsunCe850uv9Ppsnjc 7qTN4sfqIDeLExCY6pUsbo/D5eTd8zodDotFVUm+eN1ulwts/lOak9U66XSN6GxgT6Zs8eE2 Ns+2zCbYGoQxKetwD5vnWeYRPJSyazKr5R5zESXQk7vYKd+padxqigw9WVMTRqsH/5Ekqgl/ 2ix+NOOnf2HLRZOHX1cNbSmVWgdIlatc2kHVpVUSKE4YXJc9aly9M+6IC8+lj6JlfBRc6SP1 0MUdRz4+2nyuvHpwXdmocaT9jmxX6cAsZuSMGlxXyg/MWNJHt6txPdeLuVk8Fx+0G21GfDZK giM71C70xB3QU9int9T88OZ6IV7Pkz660xaX4sA/1Tc/EnSl39rtrYBiBDL4dh99/VdtLnWT /Kua5IIa03XRzIo/9UcimUtkX4jEckIsFNngpmf3bamSSrfsfbT8/N3bmuqf3dLhTyiiHzzm eVW4vPH+1w4J0868JyzddfYwyuqcppHi1yiro8JstJnD+lajfjaJ+wX51S0ZbviTqRLd/cOd 8Pzq0EvoDiF+dfKrw2G691N8j8fBZa9hNmTa/G7RLsYibq9iV3wprztuTznibr7ScEdKktH3 o+FD0YhGAV+zcuGUsdMdo6NaH6TmxiqK/GPd22xiyplyC+54UZcyjS6qw+oNOsPeQnuho9DZ 3dHdWe56wGMv8hb5BgarvdW+6sBM70zfzMDVypXOqz3X+K8J3Oxc41nrXeu7xX+/bbP9Oe1Z zz7/F7bP/N85G7Xv/elYlikUgj57LENy93Xf5Bbdkebu62tqr8HRqMfdboeGHIlKPOL3+fK9 Nj8m3A5kuXy7DZdsNh8dOrYr9ACIaTGhJLY/JsQahKpdbhyLlL9BGJ2yV3lTXmGid79X8Daw 3rvdLBf6ZdjoFh+tVNzRxTHcIY5wpB2CA0vsLKFjbEJVfUZ8KbIfDl7jAly3oO7H6PGwdvJY hP6LCMejYe04j0GYjE3iQTIELNchL8nIZi7jG0NkrMpKC/KWC2k6jDT9LNrnn4M9/TlrSdH+ 9Ae7e1TYcntUoAr9fFegwpMb4N+0VpM3F9CcQGpuTbWQ9BXqJwTwd86ooK/kE7nL/OcVVw4M eQpke9PcF95P5mYnP65vmnNhXpelY8uapm/RivIyZrszpaLGB65YsfRKYfaZ32/rXT2K7I4i tHDfQlp2sed3s7BhChhfVXkbhFcsgpd184bKMPeNlBUj7AK0LzH1QmoQRjoIRdYSrYJV2C5i /YX+lousw7UJbLQw2jLeOkKbwyYLky2zrNeyxZZrrbeymy23WL9nJ4WMiKWAdbAkrRWWxy1/ YqpG53y0QJmAPG6lj4ETuNYTelltgsVmy2cCymCBoXBWhElyEt/YNskJ+n+igauUpMsmNDB3 PUpkWXkWF9KAS+mTKb5Fo+Y6N7gYuFKuWtdy1wmXzI2WPLrlWgy26xnbBmw4zIM0iBDmvteI W1ucs/SgvmVD37ZpdJwDI8eS2kma+0Zap1Zqn+Cq4xN+6sswCjUXfX3LuDjisggne1cHVmAh /4I+ehYaS0y9sIdGkYaSF6Sv3ms4aVjSH+xw0yAYwed7MiqslmDG+WQh7AhV8NMQtmCF4EdE gxUmfZDwKy1nSiKnPCfA1O6lOYEiYdOicU3DxSmNz8+7ehb78i7Rotx1VeMvrrU+CPy/CCVH 1o/ZXvjwRHfld5YMC/+v0D32cWFHCl8bcd7u09sap2tgcfD/EirjNXg99YKmYdBHg9PbTl+j gZHf/OesVows+m8IGqgT/gS/kBZBAHGRmglXyWNhHFsF44WtsJQgZkJKehoWYtmtmL4Qw31U F8uPQXyIqESMRUSNvKGISYhRlMaye6kuPmM+PYeHi2C8JRvmyWPTjdjevfLLMA3xCMYfkz6G zUoFzMX0Jqy3XwLoQWWwzr3KVrgf8x/C+5Mx7xEMx2F6I8YnYL0uRtyq3gYRChEK5nfA59xq vG+h+Dx0lxal/4bvUo3PHIRYiW2MwLA/YjCW8WHYG7GKvQyr2cvpx/A+hnAjtr+K8hF9jXAg PudmvF+F9fIwfSPGo9gPBUM3IgdRJDwNSBbwHIYl+P6X6O+NeBlm0Ds3vxP23+jTD6H3cXBL YJu/QSSEivQnGFpb9K0tbmyDi8RSWI7hbEQGYqRwCOZKQ4DheD0gfwIiASmPxukDxPnSFBiG aYb9HCXXw3pKI4ZyLEo3Sg/BBvEk9MR71yj34ntMwfHuijgFJcJX0EnJh2VIX33x+SsQj+Az P+f0MAVGY/udMSyVPuE0tBKxFtv6xhwnGhtMr8B5vRjbOkscgfVHIQbgvCxHzKH+YPslNOY0 72xsUwWWPYZlJhAwP8SB7040SXWoPj4r36DDx86F8BiWuQ3H9SiGEiJAfTDB6cwA3nsJnxNB KIhMRGfEJ4jHELMRvRCDEUXYNmC7IqdXpBmiTU4fSBvyyziG2DdOs/o7PMLnU+eZjcazqJ0c 5WmYbSCHnkn8QjSLfdluPpt4imjGDDl9z+Z0/zW9J9FUc4i8J30JA6gPnAeRtsyQ+A77TPxw Ly7nVmO4Hun4RqJZ6p8Z0rgQrfExQZ4wwsoW79qF8wiGIkDCoPUbzdAci+ZwBmzCZ9Yql6FM 2QADpcUwULwTLpNOQF+xA3SWu2Aevg+WrRO+hIstB6AU53I4ph9oE95PUN9ms+QD+J5P4Xi+ DQ/jmC6Q3hZypbeZLD+V/rsM7BX5KeF6Hv9B2BbsgH6PQkLLe/9p/v8EwjvyUygzn0p/Ib+d TuP73EU8oX7JuiDiZoj5OxDLEbgwZfdbZrMGdQxoCsBJxDwpBb3kFPSQDuD8BFDOIy9g/hj5 b7BfvA1ukd5Ov8uWw3LhbVipBmCScC/KNGxLeAduJNDzMZzfgo5a0VxbWjJDk17bhiTzDZrK xlBB/nvDwDEDpxDfIR0NRpqMkG4g+cz1A8poxEqdXtOnm+nzFXgcw1tN+mxDp7Pb0KejLV22 DbluQflu8in24xbz/Uk+kowjGUlyjuSMWb5t2KL+GmEr0jHJ4UMw3uDrXAODsI8fGbyPchjn +5J0WumfflKpT28WvenNSjeM/xkhp5/E917SrFPHpZsMfdrB1KV6PthNPSqXwlxDnm3i8uZb +CXXo2N5/6zKNlgmn8F5RxnI+7vB4EEcT+z3bKkWx3w9rMX3iIirkB8xHzGBxoTPBUCY9ALp RPEeHGfSRbfBjeJf0F6guqXg4fqiCi7Bvr/C81CnUkh58iXwmPIldJPGoKw9AFNorug9qD80 95YrwGkJoJx4G7pKW7BMAGxYbgMfgxQ8yemC6s5GkwrHQp0MKtLsMCxDz9vI66TAa4zHJj4W vD7aIkTDNBb4TCUAF3N74kt4VB4DlyAPbVSXw0Y0SQH5YjM+43GsN4b6gvWiXF/fA5cif61G 2bQaZQ5w+h+fPiM+he+zBOU6QlyOY/QUhOXlOIaz+bv3lXQZu4r4R9wKBUQjyj0oh8meuAfW SEnop8yG2zDvNhnlJLZ7K+bdhPzbBXn3FqyfbchtwLZvwXyqW0W2DNkIxC9qCnzKcm4HAO8D 2SnYvvh32CgOgtVIxxda7sFxuBk6IUmT0ZiF6KqDp683sFYHz9P0kOWIGlxH+UIp/BFbsAOk SYfulVbATGksdBO7Iu96oJP0B+TV7+FB0Q0TpVfhQakB1lJa8kGRWIfvX4+2JeUfhhGUL/wR 0/fDeKkS66+Gy6WJsEjcjrT3FtikaTjXWE++HekkD+t/i881wD6G8eJY5K2VGP8+/TSV423U py8hSAOhE6/XAryvJtr0WRiMbzUI5xT7S/FW/cW+NvfT7OOP9I+/Jz0X61EZ6UH6r/Kl/4rI 18OmkcJt8BRig/Ae9BGHwtVsc3ofjmv/NhjYMi2Vs6WIzlI57EGswHgxhr9FbNPTaLuVw18Q N+Ozn8dwp8Ld3AyE3tCdQsx7BHE/4jXzXktQOz+W3xJyRnpfq/Qu1DUIdjK9j9C2PI5zd2yv u3R+eh8BaXEQQVkGfvVK8IuFmJ+F9dqk5Qzkp12QJ0L6Hz/Xp38F/OvSYhxTLd/RnA8Mg/8G /toijFNo6Ib/cd/+p8D5XYao4eP7NQR0GgIXeyf9VwzHsndAE69AGkRguhOmfeZ4mvOE+Xfz /Dbzh7QCNOZt89um287rz6WFnTCxJUw6aKaHu+ACglSF5RFt05ZX4AKC8iLee/GHaenJn8F4 6Ciupz4hDRb+MK0Mh0KCkId9jVId5DlEc/owyggEleX1nTCAQLxLEOpxvYZovl8O/QgtxrU7 jau4Xr9vzo85L23nB/uXkt6AizAswLACw1EYDjLDljzblm/b5pmy5MfKtOGNLj/1zP8/AXnn VcTLiJf+326LAdIqQkMof0U7pArtyLfRPrmUvjRoRFlytgTxBMqh0Rj+CfNQezd1QDgx7sG8 6Rg+DHDmO4wvxPy3daQFKQM2GHZlBPN2G3UtxvNG6fXP/B7g9EnENr3+ma2IWRj/LwTq8zPv Y/g8hvdj+S+w3k0YvqDfb5yI6SsRz2H6S0zPQYzD+DoMAxgWI3wIL9a/l0D2yA/Wof/r4Y+v P/7dEG2WydjPbPJ5Ybi07Rri3w7N+fyZsO1aw5z/nwtb+AzahPo44JrpI7T76lquff7VGscM cT6bWkIak25Em9JBdjTZsmQ/c/vRCPn6jdux2C6A3wzJdib7lWxnsl8x3Mh9BjLvzxha5/N+ GXqjpWxlJ+ERhIbIMMLZWOZ7oTD9BsoeN9L3d7g22kTAtAsxVkf6MOouN+q6/Sh3v8PwEKYz MfzO1GmmbP2BjP0Znfa/nf5PdeT/QKd2MzCxDX4q30RPAxcR2uri/xQ/p7v/x7r8J3R0Sz39 f5o29bwJ6wXQjaCm0vsIbe3SH9gBP5P+OTv3P023tTv+43Qbu8RMt8UP7relPdOeiUK0GW34 7j8FrS2kXedsf7MPbfm4md+MNI5Rv5ZAOVBk6NDHUF6g/Z/ORKCOSt+FeddbzkI3yzPQDdO7 EKg3m45jOIXuYfgou4382+lGTN+AaU06xMuOMzDl5+i5Ld2Sfc7tQxwzLgfXUf+hBHEewovY jphrzjWtIbHtdwXUurTOlcanv5PeQLSxAX82LIcFiGcw7ca0G2WxX/Gg3E7Bk+SPx9CGoQ3l +8hzPr50o3INLzOI+5YXw0CU85dLb5PvK32Q+/SawK06+D7KjahDs00/HaYD5BtS4+QvSTcY /rla5VvUg5egPrSS7sB2x/I9odkS+XG/hV+Kduhr+JD9pi+Z/FOkr5TOoHE/Rks/8sfQVZoA fRFVkr5PNYb8L+InfK9mFfndxWHwnLG/VWfbCo9YX4ZHLFOgv2UZ32+6V3wIbsS8h9Tb4SEl yfdXxph6lXTij/j+yJcZbfZpGu/c1ibg/ZsAQ8gf07Jds56lP+rSb7kfSvdj/oxtgzp+DWKK vl+RPvXj/s7064bfc4ah469s1vlt/fQTYKR4Pa77TJ/sExi+A7+QViKMMW7bF7MtHJfGn7KF TNsE45dwX5++30M+KF+Lfbj+fJz/zufrIpoz2Yk87Kb5T++V9P253tISLC9ARPoGofse+f4c +YYRlwjvYvlHkEcvR15BGpTu5nt4NxnAsukneL05+r6ZMgpRhf2ahvW20t6RCbj5HNLHpDGw hoP71dKPCf70XgwXCq/xPUa3sRcYkdbCaO7TPLcnGJaKuN+6SBqNwPlHXI3pPP7uRsjHKoX1 3Liuo3ck31xnALxnEc8zfKRGWXUP9FdTSK926C/vhDxxHtovB1DWxXDuBuG8uuFG8SPIknrC ZNEDUwisf/oN9iWGaKkThC8w/10M7+T/P5fxtCds7qvp/mk4w/Eq2goIYy+XMJUgbGU5xj5h tRHP1OOYVwG7OcxnbIUnWgDLpT9CnBF+iW33hilCA7axAfuC7Yga8l8bYJ3LDBQZ7QyQLkEe a40+bYF1KSxpC8ynML8tjPxoW2A+hb3bAvN7/0g/fqrcT/Xjp/IL2gLzC/4X+vFTz020BeYn /kX/BrcF5g/+D/rxU+Oc1xaYn/cv+jGsLTB/WNt+oHzCdWzTS7g2fRrDPxv6/u8YDsEQqa/p IMZxfZGeZqT/bJS7D4Hr3/QDCFwrp3sbQJmXpjXwKgy/QuC6Oj3yHJpewTCmn8Mw20nfjeiI GKu3RXWbntXb5jDabNqp1298BsPft0kHEZ/q7fG2SfbuwzCBWG+832qj3Tq97013nyvfFNPf kderO4e0iLgY62djOOocmnbpSP8Ow18jyC/6stEvimcZ40HvvIeedU4uwGlpPcqMWgDU1X51 qx5K18IQLnMPt9JV87k8/Bg2c3mXRtlXCd0UJ9ohD0NvshtIhstTeflb5SmomwDtk7F8P2+2 dBRk6UWIyJ/AROly6CvuRrt4AMpbbIPvy+CzSW6TzSHeAkMRfK+S7wnR3skSWGWr5/aLhmX8 0mfY3wdgP67ZVsvjgGF9Re2M6XWo1zfCEvlauMYyF/YrJ7Cvb8M01FfZykSokG+AgebaVpkL VtmBdoERWu6HyWox5m+FuPQpxKyr0K47AiNwzHqYbTfv3avgx/wndP8Kpz/E2SRiCO8z9hft MAnX1n7z3IBcg2MyhfdnGN9z2gISrtFB/gZ190VQpFrR9iqB1dYwbFBO4XsoaKcm+b78NGPs u9D+kzodusqroMBcuyvHcJxHg80MaT/O9Aeg7bZRmsHtRS/f1zL8Ac2h+Qzab1sOa+msRFu7 xrSjmm0Kw0fQ7HMw3wdD0p/N72+ELewN3adwAO3TACRpH4/7RNqGRp/4Pt4BpCXDnlX3wyBV xPAJmKashFHyUBwXH4xSfwdedQCEyT5TVW7XzSUdLX+PtugoKMC56WPw+1UI4qUBBo8vxvw/ IZ7W+ZH4i/I5b2Je43ojfxZiKWKmfp/upZfp8cZv9Ofze0v18o3Ih2nagxNa+Go+1MHXIfGW dqpxlmrlD8Jze/dEP/1/Nvw3fWjEw3Sm6kf2+NuGd2M4w0yjnfch8uhdWDeOUEw7um0o6edT rtdDbhtS+LgR/opojWy9tmHb8ys/dZ7lX9ixOp+ZYetzL2b4CyMsaD6X8zNhy3My58J02ki7 /l3fneFzi5rhj5w/0H1y50LlB+unliGfExANO5bs90F8n5/O5vwLNJ/hugFpoDXGEug8wY9B QU1CUOe0hmHn/ySUO7AewpLdFun/JmCfV+hIP2jgSwOPEUSGa2mEdGdbpP+b48fP1/VVHsZ2 EZZOOtRXdHD7/18AxwBU5GCLl4cK6cJ/CbQyCOo3Bm41kU4TzHE3x9EcF3y3T/G9ZzT32Wzf eO7/6Tz+n87L/9Z7/6u+t4RxRs8M6eye8qP9xvnh+G8d/CzNVvAZUHBcn0U8hXjVwN0E5JUo nVUSpyI9TeXnFZvr/IAObsO1KcFIG+dvFAUtOzWs8wGd/dEB1T82PupUnf7UQn2c+Lkd3fb6 BN/DaZyxnWbIvjzrCNhonJPNJtmCepf4vIv0PExrbfOlR+nr6fRjqCdlLO+RF0N/4bX0r+Rr UCacSP9eXoa2AALbusnAKwY26LZfeptxDlLh54G3wpaWwLVtFoHKYHuLEI8b9jbZsQt1NH2m 55/rlyl7xX/ie5yBCD9fmuLr6xHSTFzTz4SI+CXeR3uB9pvESXAh6QyxO9pWdOZmiXFelnwP H2Cow4njMkLc3IK/6XwNnatB8DM5NE8voQ6g8i/x+ub6voj7l2ajHP8LZPOzP3iPn+nBZ9BZ J7KLRFxRyMORLkZi2ZHpP4j3YzjQwD8Rl2N/x8JM4SboJE7D9fARtHcCmL8AMQ/jYQzdiGrE Q4groSvPP4N0chrLI0QJ069jKOPaXsa87w2s1UH3+Xp7N0xBm3gKPk8v9zavo0OBKewF3tYU sTc+D8sJuFIS0aIQA0Zcwfs3Y739+vqd/ApUnt8zy1jPlZGPQ3/bNOiv+BC3pPfJF6b3sb9D pTQePDinTkQ5zvUbxvqB7KjDCByt9COYflVoey7A3Cc3QvkZmCmfD53kRrQP/op0cBQq5VPw oFwFRcoI1GNPA9HSeQha202j88T8LPHb6TdM37cJZRwErC/CAJxDoPMbZig8Rf9ZHXzfMVwf 8bP0jKy3p3SLjJ+f1nmN27lqX7gR+bg/YqBx7nuavj+GNijynqSfUy2SHodM3Y6jNVQTjlaa +GEUyoZm3yuFdKaNaMuwBbFq+mnhj7SuTfegvQphBJ3X4nUv1delafJX/xJBPsuHWuw/3Uv4 /3p/S2izD/VT+0U/dzbj585q/CD9H+6ptD278XNnOX423WbP5ef2y5BWyUbuj3plv7I1/Tam 9yDuRPm6iSBBOs39o7q9dotoR95ejGvQiyDP8ImSnzQL5VeWtJb79FfqzwMfyqbeum8+fdb4 zoH7U8k3R3apGObfQUSN7xro+YMM/y3/bqLZT1sGY0jWkkzlOoPOduM6DeXNFJItwitQKpzV ZRB7mwNIFnG/ZG/sY28e8rjQ0ZApvcEqlOK73K1DdKdf4TLJpcssEfB5DSTPUP/q8ipTjOry S3hLl0HCB1jGxEnEF7RXQ+tpvqam8xBbuG46rctJLgvJD4lx/j2Kvn5yEw/SdzA/Zy8ZtuVT bcJnzfDn7EKjzlNGnR+WN/ZuUJf4uE5+GTrQ2d7mdRdAKT8b/SlfrwzE+2SDnLPzTX87nyec I31vn7VdF9B+Ds2tuabX/WZNb7UIJ+rgeprG8TO0y2yod4fwNlDG8f2eRemTRj9pfRJBOr21 ee1nruXMtQbAedIjsEmcjrZQFzqTxPX9cy3Wt5sI/AzJK/A4P8uMIeYdwnIDdb3BdciLiCOI PyC+Rryj+6ka36Vvh2hcmtdDj9L5gaa98l9xvF4Cq2UIRJR9ur0iLoeF5Bcn0HcFBP7tlImt yFckxxeR/4b/dfxfwDQdAvZX/Aitul+g9kEZblsJ4EDL0D0fQIvhEJ8CCMX+L8UIHVHU3TGk l2xc5eR0AUj00pG/HKBwHJqeBefQcS1AJ5ynEpy3rviepR/oKPsnQAXW6bVJx/kugN77dPTD MRmwvB3taEc72tGOdrSjHe1oRzva0Y52tKMd7WhHO9rRjna0ox3taEc72tGOdrSjHe1oRzva 0Y52tKMd7WhHO9rRjna0ox3taMf/JWD0f7SCb6ESHgYVBNCghP6rr9LT9t+CDMJeGC0W7SwI Zx95TuwARxGC2GFHMjN7r1goZu44LzvVICZ2egPd3Bd2EuP4tBJ+jeN1HmIb4v/p63xj2jjv OP48z7n4gBIbLzWkHL4zxpcFpyF16JxAis+OPdJaEySwzGYskBCkNK2USIYgTVpykRZpUddQ dVK2pVKJ+mKqVlU5zhM7oJKZ2LqVdUu1ZZmU/qPdXqwvOpq+WJdX3vd5ztBGy+bj8/v9nt/v e8/z3HOPbd7AlYGHjEoh5P2w54EJroMyeBvUEALLqxo4DWbBGq9IrZJia6o/tV3ahnO3YY4+ qYmsgwqQiArbCfrBKJgBs6BG6HjmNDgPyuBTUTGkJvuFPZh7k/2scKVTz8RF85jbHPmOaJa+ VXD9Nw65PvOEK+t2ZY92ueldaddv3+n6QDRucl/XEF9OBaUgLjKIiZ+BpezXxEcpUck16SFi ASbVVDOGFCi16/HZsuQhVGISJSeIWlmWqN3QGE/VsQpbJwGisn+yT9wK+6S0pTE+m3qSfUSu gzKQ2Ec4PmQfkvNsja85bBLMgjK4AdZBDVvD8QGO99n7xMfeI50gCUbBLCiDdeBl78H62bt8 twjL4yRg7F1YP3sHl/UOrI/dRnSb3cbU/mwn9sUXRBDrrAZqtBo0tVSDQDDusD/Zd3dgR+m4 09hRS1Ib6SV7pDY7+qjqSM32/qdUh/2tpMXUa6nd7CaxAMNMbmLkm0QDA2AMnAE1iG4hukVM 8Dy4BiyAXQbrBxpbBW+BW2Q3MMAAkNnbNoZx2A1bT6upIPsj+y1pwor/gf1O+LfYG8L/nv1G +DfhQ/Cr7A07pJJUPeoE5/jh/fCdqD/AflVqD6iVVCMrY+1U2E6QBP1gFMyAGlZmbfYJNYBO lsiqTKC0ycfC/4y8LBPjlGroB7ABNW707scRwcxqszoz9Cs/RZMb/fILiLjRv/9DRNzo372A iBv9mbOIuNFPnELEjT48iogbvX8IEYzDXvpl+3Y10f801VI+No1VmsYqTWOVpomHTfOD3PXw ub1od3Rgxa4asR0dqrlIzdepeZiaL1NzgprnqHmBmvupeZSaMWoq1AxR06DmEt2LpTCp8Yt7 mvuMZmquUvM1ahapqVMzSs12amo0YTgsbD+xR7iscKUUf9PBP96LTx8fC2NFw9jzYXwmlGFv gIpoGRBpba54W4j7tlJH0m3v6o6fTh1kKzhxBbdhhXwAPLhBK9hGK+hkBR34YJNgFCyDdVAB NVC3YeIzwvpgO0ESjILzYB3UiOmsA0ZOV6d4XUysszrpft5iKzjacIRZ2Gj1K/6Y/6A0o1Bf iPaHKiGWIMEgISTQKDc6tGH+84Z/f95AalO17DKbIa24Ec9X/Yx9t1V16E9sfUlNPUR/TEIe 7Dq6j+g0Cr+XFEX7MaLI3HcRhb0KH7eVIzjNZ+s71UW6hZ81r95V/q5+rDgM4T+UJfWvmuOh tvoXZF6dV28ql9Q3Ox0Zmdd1h8ItakK6oOxVX1sV0gsoXLXVc9zNq99T+tSnFVGYcAtHi2gZ PvWwPqweRH8Z5bhqFNHnvJpUjqr7XdVj/Jx5dTemEHPDDkx2hyIGjYREh99MOPSksdN7xZv3 9nu/5o17d3rDXtXb6m3xbpUDsl/eIj8o18myXCN7ZCYTeatTWTNi/AmPW2vEgx75n3RT4hGx n3Er/j8Ffz6yzMiTxPqKlGO5wTTNWcvjJHdcs/41GHFo3aFh64FImlqBHMkNpa29sZzjrRy2 ErGc5R34dn6O0ssFZC32A4eSobxDKzx1scUKHMgvEEobLz7Xwv1XLz5XKJDm4NlkczLQ27jv 65n7mLGq/dLDU5vviVutK7nBvPXz1oIV50GltZCzfjSojeQX6Gf002xmgd7hrpBfkHrpZ9nD PC/1ZgqFnEOPCB3R6B3osGPuCJ2ML2auI5occnVXXV0U50PXzh10tbUkKnTR2lqh81Cumyu2 ZzNz7e1C06SRotAUm7Qva1aj0ESjQhM0yarQrAZNrrF6hURRIAkpQkIfJoqQKPRhITnyhaSz Krm0KbkkRpLoFxrF1TSsbWga1qD5P89Vvvc1kY7FaKmnMD6SnYhkxyLZCTBmPXv2ZLNlHte0 ufECL2iWpI8dHz/J/bEJqxCZyFjjkYw21zNyn/IIL/dEMnNkJDuUnxsxJjJ2j9GTjRzLFEp9 A12Je8a6tDlW18B9OhvgnXXxsfoS9ykneLmPj5XgYyX4WH1GnxiLiD0+kJ+TSbpwYMT1JVZf h/061hIupIP+M71i8/aEm8+1LOK3lVdIfaxgPRhJWw2Alx5JPZLiJbyneGkL0r5qqflcT7hl kb5SLfmRboykSWxyqjhFmrNPZdyfIl5ITU7xBXdtrPi/XqhlLeNYpjhJSM7qGMxZyUPD+Tmv F9kxfklW90auvj7rVJbd5C4ku3lSkjaFPLef52prq8L/vv9TVS8eamuypRI1QnSSFAuSFcoN MXwUDA3jWkeG84v4XYp/PRQLuMAijdHiRh/VabtP+OaOX/MGk1PVqLoWk1XvnolTihtLsvni ixXbXLFJdEj+A+3H6IEKZW5kc3RyZWFtCmVuZG9iago3IDAgb2JqCjw8L0ZvbnRCQm94Wy02 NjQgLTMyNCAyMDAwIDEwMDVdL0NhcEhlaWdodCA3MTYvVHlwZS9Gb250RGVzY3JpcHRvci9G b250RmlsZTIgNiAwIFIvU3RlbVYgODAvRGVzY2VudCAtMjEwL0ZsYWdzIDMyL0ZvbnROYW1l L1BTTlpaQStBcmlhbE1UL0FzY2VudCA3MjgvSXRhbGljQW5nbGUgMD4+CmVuZG9iago4IDAg b2JqCjw8L0Jhc2VGb250L1BTTlpaQStBcmlhbE1UL0NJRFN5c3RlbUluZm88PC9PcmRlcmlu ZyhJZGVudGl0eSkvUmVnaXN0cnkoQWRvYmUpL1N1cHBsZW1lbnQgMD4+L1cgWzE3WzI3N10x OVs1NTYgNTU2IDU1NiA1NTYgNTU2IDU1NiA1NTYgNTU2IDU1NiA1NTZdNjZbNTU2XTY4WzU1 NiA1NTYgNTAwIDU1NiA1NTZdNzRbNTU2IDU1NiAyMjJdNzlbMjIyIDgzMyA1NTYgNTU2IDU1 Nl04NVszMzMgNTAwIDI3N104OVs1MDAgNzIyXTkyWzUwMCA1MDBdXS9UeXBlL0ZvbnQvU3Vi dHlwZS9DSURGb250VHlwZTIvRm9udERlc2NyaXB0b3IgNyAwIFIvRFcgMTAwMC9DSURUb0dJ RE1hcC9JZGVudGl0eT4+CmVuZG9iago5IDAgb2JqCjw8L0xlbmd0aCAzOTcvRmlsdGVyL0Zs YXRlRGVjb2RlPj5zdHJlYW0KeJxdk8tq40AQRff6il5mmIUe/UrA1GbCgBczCbETspVbLSOI W6ItL/z3adfN1EAEPqArtziXKtW/to/bNK2qfs5z2MVVjVMacjzPlxyiOsTjlKq2U8MU1q87 Zjj1S1WXw7vreY2nbRrnarNR9Ut5eF7zVd3t9+8/mx9V/ZSHmKd0LInpXt9Ksrssy0c8xbSq piJSQxzLq/70y9/+FFXNB/+H++sSVcf3LQzCPMTz0oeY+3SM1aYpF21+l4uqmIZvj3WHU4dR /t62JOwicaRJqBtEhoS6RWRJqDtEjoRaI/Ik1AbRPQm1RfRAQu0Q9STUHtGBhPoeUSChfuDI dCS0IyL2Bh3sDXuDDvaGvUEHe8PeoIO9YW/Qwd6wJOigalgSdFA1LAm6L9WRhC5wZBsSugER zwZ0mJBFO6ZDR8vjAj2GZrkd6NHRcjvQo6PldqBHR8uDAD3GYbkd6NHRchXQo5AdSOh73sB/ q3Zbxtt3IrsdLjmXteePiZf7ttZTivK9LfNyO6XKr/oEB57nmQplbmRzdHJlYW0KZW5kb2Jq CjIgMCBvYmoKPDwvRGVzY2VuZGFudEZvbnRzWzggMCBSXS9CYXNlRm9udC9QU05aWkErQXJp YWxNVC9UeXBlL0ZvbnQvRW5jb2RpbmcvSWRlbnRpdHktSC9TdWJ0eXBlL1R5cGUwL1RvVW5p Y29kZSA5IDAgUj4+CmVuZG9iagoxIDAgb2JqCjw8L1R5cGUvWE9iamVjdC9SZXNvdXJjZXM8 PC9Qcm9jU2V0IFsvUERGIC9UZXh0IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJXS9Gb250PDwv RjEgMiAwIFI+Pj4+L1N1YnR5cGUvRm9ybS9CQm94WzAgMCA3MjAuNzUgNTQwLjc1XS9NYXRy aXggWzEgMCAwIDEgMCAwXS9MZW5ndGggNTE2OS9Gb3JtVHlwZSAxL0ZpbHRlci9GbGF0ZURl Y29kZT4+c3RyZWFtCnictZ1Lj+tIcoW1rl2j3o9FLdsbjZ6l0rYx/cB4DLsnb/fAds/Khj0Y tAz0bPz3TbIYrMyPOpHKRBoXM/cGOySdExGk9CUp6rer1et+t1oe9q+n7p+r11+vDpshjP45 Jvx69derP1/9z9X69X+vNq9/6NL/drVevf7T1b//ZfX6n1e/df+h//P3/75aLbeHzfZ9eGD3 1+nq/X25ebPwVws3h+Vh04VT+myDPeCvV//Vbdwf9++b7sU7Ne+77fqVf//p++wrh3TDiVIC xXgZ9hwz/eHqx64c/w9V6Mvfd2nVV/mbL1e/+66r+Or1S1+d43G72g7/zf69Wb6tX/fb1XK9 f/3Sy1ytVsfD65f/uPp68S+LH7r//Wnx0+KXXxbfLH5e/HHxl27TN4s/LL79hy9/616lS/v2 y2Bk6itqt37bLTebT30WmwEYhP2Le5p51YAtp5mOkCpxEuRU9GVo7L6sl8fVcndEM9fdEw/N /MfFv3bN/KZr5z8vvu/+/q5r6w+L3y/+vPhB9pJF23T/OG4/BVps+mmP9i9uZ+6FA7acZlIC xHgZeiaGajQvQllX129vy91brq0/ds38twvbytpt12/L46fAMTT99Ef/Fzc187Ih3XCijgAl ToIeir4Ore0XHnB32+X6oNoZKvZSlu24Wa6jebPYDMAf3F/czcyrBmw5zXSEVImTIAeiL0Nj 92XN3K6Py/U218ySfZNV2x12y9X+U6HFkwH6g//L+5l54YAtp5mUADFehh6KoafNi1DY1uNu uZ0dct/Ov5F+3/X0566nP3VbfvlFNpbV2+/fl8fIk8XmgR5Zg4sbm3vhgC2nmZQAMV6GHo6+ Gu2LUNbY3eFtuXnPNNZ21wsby+q97TbD8JhGi80DPbIGFzc298IBW04zKQFivAw9HH012heh rLH7t/VyrRrLN9ULG8vq9aS7jzxZbB7okTW4uLG5Fw7YcppJCRDjZejh6KvRvghljX3b7Zbq SMz31wv7mqP3MVzvl6u3GLFnG+wB5SsPct0AEAopgWK8DHuOmX6sPLSrQs3Kw/rQM2vX2K8X N33HxHKConKLTRVUw1PpcoJeCyBcUkdIlTgJstXRckIr91XLCVOH+l1vO+56N4uvuv89LF6y awcKvy02sfRCr8VrB5r7yZGUEiDGy9ADEK8dtCtC3dqB7OH14mVxl10oEMA9hiaWZmi2eKFA cj7BMdURoMRJ0BMQLxS0sl+3UHC2d3dd7277P7lVAQXXFptamIHV0lUBB+mBiNQRUiVOgux+ tCrQyn3dqsDZzt0Pe93d4j67BKAo2uJJLc3AbPESgMZ3ciClBIjxMvQExEsA7YpQtwTgHDlv nR7mgNlik0s7tFtM+5rUiXyUEiDGy9BzENN+uyLU0b7zCeZ58ZAFe8XGFptc2qHdYrDXUE66 o5QAMV6GnoMY7NsVoQ7skx7utsl+mCV4BcEWm1iaodligtf0nW45zaQEiPEy9BTEBN+uCFUE 7zRQH0ZzuDuGq07hMWbS2QZ7QDmqS9AG4EFKoBgvw55jph+o3q4KNai+2i3ftx+ofuuguiJe i00VVMNTKaprzibLUUdIlTgJstURqrdyX4XqU4f4RnfX/f9jFtUV7VpsYumFXotRXWM2SY5S AsR4GXoAYlRvV4Q6VD/bw+uuh8/9nyyqC+QdQxNLMzRbjOqStElzqY4AJU6CnoAY1VvZr0P1 s73rge++66DuXYZ4LTa1MAOrpajucDZQjjpCqsRJkN2PUL2V+zpUP9u5h6Fz984CWY52LZ7U 0gzMFqO6xmxCHKUEiPEy9ATEqN6uCHWo7rz73S6esqiuaNdik0s7tFuM6hqzCXGUEiDGy9Bz EKN6uyLUobrs4cvi8eMEkYvqinYtNrm0Q7vFqK4xmxhHKQFivAw9BzGqtytCHao7PXxyThjl eNdik0s7tFsM6xq00y2nmZQAMV6GnoMY1tsVoQrWkxbGsP7iNDAHvB/h7v24PGwjKp1tmB5Q DusStYF4kBIoxsmYnmOmH7DergoVsL7r31MPH7B+78C6Yt4xnlRBNTyVwrombdIcdYRUiU7Q rY5gvZX7Glj/7ND848qzs6aZ490xnsTSC70Ww7oGbbIcpQSIcTKcAYhhvV0RqmD9fA+vx48r uocZ6P0IJ7E0Q7PFsC5ZmzyX6ghQohOcCYhhvZX9Klg/37se1h8vOa+umHeMJ7UwA6ulsO6Q NmCOOkKqRCfo7kew3sp9Fayf79zzcOR8dEAvx7tj/KmWZmC2GNY1aBPjKCVAjJPhTEAM6+2K UAXr53t4N+x9d86CS453x3iSSzu0WwzrGrSJcZQSIMbJcOYghvV2RaiC9fM9vB2Wqh+c5c4c 747xJJd2aLcY1jVoE+MoJUCMk+HMQQzr7YpQBeteD70rA3O8O8aTXNqh3WJY16CdbjnNpASI cTKcOYhhvV0RamBdt/Cl+yiq18xyyDuGh8NydYhBdbbBHlCM6xq2AXmQEijGy7DnmOlPcb1h FWpw/XBc7tcfuP6scV1Sr8WmCqrhqRDXHdYmz1FHSJU4CbLVn7jezH0Vrk8d4pLYvXP9So53 LTapdEKnpbDugDZZjlICxHgZuv0RrDcsQh2sJx1ML+V8cLAhA71jaGJphmZLYV2zNnku1RGg xEnQExDBejP7dbB+tnf340KLXpLOMK/FphZmYLUQ1j3SBsxRR0iVOAmy+5+w3sx9HaynnVsf bbe7H77B8OSttGSQ1+JJMP3AbymvO6xNkqOUADFehh6CiNcbFqGO1+UO2H+XQV9DnUNei00u 7dBuKa87rE2So5QAMV6GnoOI1xsWoY7Xz/bwYVg3u85fBy+R12KTSzu0W8rrDmuT5CglQIyX oecg4vWGRajjdaeHd86HmBzyWmxyaYd2S3ndYe10y2kmJUCMl6HnIOL1hkWo4vWzLXwclj4f nWWzHPOOYfdhebeOwXS2wR5QzuuStkF5kBIoxsuw55jpB6+3q0INr3dI8T7dj2DbHZzHTzX6 IusMCFtsOuEDLksJXuM3IY86QqrESZDNjwi+lfsqgk97FvHfQ3fozH6RXWKwxSaWXui1mOE1 fxPxKCVAjJehByBm+HZFqGN42cPb7tip12EyLDyGJpZmaLaY4SWCE/NSHQFKnAQ9ATHDt7Jf x/Bne/cwvO9de6dtfRS22NTCDKyWMrwD4AA86gipEidBdj9i+Fbu6xg+7Zwx/O3QvCf3XF8O gy2eBNMP/BYzvOZv0h2lBIjxMvQQxAzfrgh1DH++jTfj6T7vgqUcCVtsiumIjosxXiM4AY9S AsR4GXoUYoxvV4Q6jPfbeJs/8y5h2GJTTEd0XEzymsLJeJQSIMbL0KMQk3y7ItSRfG5v1Asy OR622BTTER0Xw7wG8XTLaSYlQIyXoUchhvl2RaiCeb+Lzw4Q5ph4DPfrj/vqT+mzDfaAcp6X NA7mg5RAMV6GPcdMP3i+XRVqeH6/W66PM56/c94SM1hssemED7gs5XkN4wQ+6gipEidBNj/i +Vbuq3g+7VnEgv1H0vw5eYXEFptYeqHXYp7XLE7co5QAMV6GHoCY59sVoY7nZQ8f3XfADBeP oYmlGZot5nmJ40S+VEeAEidBT0DM863s1/H82d49DacEH533vQwWW2xqYQZWS3negXHAHnWE VImTILsf8Xwr93U8n3bOPrTcD9fQP3UfXZwLKjJIbPEkmH7gt5jnNYsT8yglQIyXoYcg5vl2 Rajj+fNtvJ1O6eZ5XiGxxaaYjui4mOc1ixPzKCVAjJehRyHm+XZFqOP58228WbwMlzfdX3Bm XiGxxaaYjui4mOc1ixPzKCVAjJehRyHm+XZFqON5v41PzrJMDoktNsV0RMfFPK9ZPN1ymkkJ EONl6FGIeb5dEap43u/is3OeIsfEY7g9LlfxTdnmG+wB5TwvaRzMBymBYrwMe46ZfvB8uyrU 8PxuvdxvZzzvnSLMYLHFphM+4LKU5zWME/ioI6RKnATZ/IjnW7mv4vm0Z9H3WG7cO5/lkNhi E0sv9FrM85rFiXuUEiDGy9ADEPN8uyLU8bzs4b1765AMF4+hiaUZmi3meYnjRL5UR4ASJ0FP QMzzrezX8fzZ3r2M62m5L8RLLLbY1MIMrJbyvAPjgD3qCKkSJ0F2P+L5Vu7reD7tnH1oeRkX Y9y7GWSQ2OJJMP3AbzHPaxYn5lFKgBgvQw9BzPPtilDH8+Lg+bEqow+eOR622OTSDu0Ww7wG cTIepQSI8TL0HMQw364IdTB/tod3w2HU+55EDoYtNrm0Q7vFJK8pnIBHKQFivAw9BzHJtytC HcmfP5w+DDf2ue6XSbMkr2DYYlNMR3RcTPKawtMtp5mUADFehh6FmOTbFaGK5L0u3vRMkSd5 QcNjuOk+8ia3cJttsAeUk7zkcNAepASK8TLsOWb6QfLtqlBD8pv35fubtXGziS6w0A3MILHF phRO4LOU5TWIE/aoI6RKnATZ/ojlW7mvYvmka9Ey2vW4pp2/3F4RscWml3ZotxjnNYqT9igl QIyXoWcgxvl2RajD+aSNdtODj2995mFeQPEYmlRaodVimJcsTt5LdQQocRJ0/2OYb2W/DubV DvgwfFfC/fkxH4stNsHwA7elPO/AOGCPOkKqxEmQAxDxfCv3dTyfvucd19a854Ejbt1bYeeg 2OJJMh3BcTHRaxon61FKgBgvQ49BTPTtilBH9Of3wodhYcb/CJPjYotNMR3RcTHUayAn7lFK gBgvQ49CDPXtilAH9WkbpyudnoedUR9Jc1xsscmlHdothnoN5GQ9SgkQ42XoOYihvl0R6qDe 6aF3B6ccFFtscmmHdouJXtN4uuU0kxIgxsvQcxATfbsiVBH9+aOp9dC7WDtHxWO43i4PyU3d ZhvsAeVEL3kczAcpgWK8DHuOmX4Qfbsq1BB99xlpMwP6/qq17JfnFRdbbEJhBDZLgV7TOHGP OkKqxEmQ3Y+AvpX7KqBPmmafSO+Hz6QfF2vrC2NyUGyxCaYf+i0mek3jRD5KCRDjZeghiIm+ XRHqiD7uI9Zl+rtx5S+5F3Q8hiaXdmi3mOollJP6Uh0BSpwEPQMx1beyX0f1Z7t335+e//iZ qxzUKza22PTCDsyWQr1D5OA96gipEidB9j+C+lbu66D+7BH0bri4IvfzVjkstnhSTEMwXMz0 mseJepQSIMbL0FMQM327ItQx/dk+3ox3NOzvfK77mONii00yLdFyMdRrICfuUUqAGC9Dz0IM 9e2KUAf1oo8Pw624+svV9MfRHBtbbJJpiZaLwV5DOZGPUgLEeBl6FmKwb1eEOrAXfXyx62Yu OF2v+Nhik0xLtFwM9xrM0y2nmZQAMV6GnoUY7tsVoQru3d2xv4DmgjvZC0Iew1U3L8kt4GYb 7AHldC/ZHAAIKYFivAx7jpl+0H27KtTQ/Wq73O9meP/QL3fn8F5RssWmFE7gsxTvNZuT/agj pEqcBNn+CO9bua/C+7Rrn3x/N5Dh/UVn7BUiW2yKaYiGi/lesznhj1ICxHgZegpivm9XhDq+ TxqJ220/d+3UR9EMKI+h6aUf+i0GfMnnJMBUR4ASJ0EPQQz4rezXAb7aD1/Gm90/eZToo7LF JhmO4LeU8R1AB/9RR0iVOAlyBCLGb+W+jvHPt+9pXKC5dS8BznGyxZNkOoLjYsjXgE70o5QA MV6GHoMY8tsVoQ7yzzeya994z8O7C07dK1C22DTTEz0XU74mdLIfpQSI8TL0MMSU364IdZSv G3k3fqNXf7DJkbLFppme6LkY8zWiE/4oJUCMl6GHIcb8dkWow3zdyPvhFs7e7S5yqGyxaaYn ei7mfM3o6ZbTTEqAGC9DD0PM+e2KUMX5qo/P4zkM75cocrD8EW67v3a7iGhnG6YHlIO+xHSg IKQEinEypueY6Qfot6tCBehvO3J8f58audp+nkr0ronKEPMYT1rhBU5LUV9zOjGQOkKqRCfo AYhQv5X7GtRH32wH7O84+nFVonfDmRwtj/GkmIZouBj1NaYTAyklQIyT4UxBjPrtilCF+mkj 06+LXvJ7doKXP8JJLM3QbDHnS0wnBaY6ApToBGcCYs5vZb+K87ETHtafB8/r4fPMk3vLiwww j/EkGp7guJT0HUwHBFJHSJXoBD0EEem3cl9F+vIoejP+EP3zBaSvYHmMPyXTERwXk76mdOIf pQSIcTKcMYhJv10RqkhfNPJx+JbFV8Pf2V+jl7A8xpNmeqLnYtLXlE78o5QAMU6GMwwx6bcr QhXpi0Y+dYfTp+GA6v2+QQ6Wx3jSTE/0XEz6mtKJf5QSIMbJcIYhJv12RagifdnIh/HGwN5N 1XOwPMaTZnqi52LS15SebjnNpASIcTKcYYhJv10Rakjf6ePt8A3SG2fpLUfLY3jYdx2IGXe2 wR5QTPqa00GCkBIoxsuw55jpT0m/YRVqSP/w3vPKnPT7RbfrDOlLYLbYtMILnBaSvoPppEDq CKkSJ0EOwCfpN3NfRfpp3z4h46n/ocJx0VSfTszhssWmmZZouZT1HU4nClJKgBgvQ89BxPoN i1DH+kkrp9P6d+O3L7w2ZrB5DE0v/dBvKe5rWicKpjoClDgJeggi3G9mvw73z7fvZrjsu29h 7hfsJTFbbILhB24LUd/jdFAgdYRUiZMgB+AT9Zu5r0N9dRh96G9pOXyS8W7unONliyfR9ATP pbDvgDoJkFICxHgZehAi2G9YhDrYV/vh9XBtlLcf5mjZYlNMR3RcivoOppP/KCVAjJehRyFC /YZFqEN9tUdeDz890l/odsHv2UtetthU0xVdl8K+A+okQEoJEONl6HGIYL9hEepg32vlx82i vN+GzRGzxaaarui6FPcdVE+3nGZSAsR4GXocItxvWIQq3M/tlP2JjdkK3I/dn/8DeCfTvwpl bmRzdHJlYW0KZW5kb2JqCjQgMCBvYmoKPDwvSVRYVCgyLjEuNikvVHlwZS9QYWdlcy9Db3Vu dCAxL0tpZHNbNSAwIFJdPj4KZW5kb2JqCjEwIDAgb2JqCjw8L1R5cGUvQ2F0YWxvZy9QYWdl cyA0IDAgUj4+CmVuZG9iagoxMSAwIG9iago8PC9Qcm9kdWNlcihpVGV4dCAyLjEuNiBieSAx VDNYVCkvTW9kRGF0ZShEOjIwMTIxMTEwMDkwNzMwLTA4JzAwJykvQ3JlYXRpb25EYXRlKEQ6 MjAxMjExMTAwOTA3MzAtMDgnMDAnKT4+CmVuZG9iagp4cmVmCjAgMTIKMDAwMDAwMDAwMCA2 NTUzNSBmIAowMDAwMDIzNDAyIDAwMDAwIG4gCjAwMDAwMjMyNzUgMDAwMDAgbiAKMDAwMDAw MDAxNSAwMDAwMCBuIAowMDAwMDI4Nzk4IDAwMDAwIG4gCjAwMDAwMDAxNDggMDAwMDAgbiAK MDAwMDAwMDMxOSAwMDAwMCBuIAowMDAwMDIyMjgwIDAwMDAwIG4gCjAwMDAwMjI0NjAgMDAw MDAgbiAKMDAwMDAyMjgxMSAwMDAwMCBuIAowMDAwMDI4ODYxIDAwMDAwIG4gCjAwMDAwMjg5 MDcgMDAwMDAgbiAKdHJhaWxlcgo8PC9Sb290IDEwIDAgUi9JRCBbPDFlYjUxODQyYzc3ZTA1 YzA3YmI1ZjU1MWFjODcyOTlhPjw3NGNjMDNlZDlmMjY0YmMyOGU5OWQ5OGRiYThhZmYwNz5d L0luZm8gMTEgMCBSL1NpemUgMTI+PgpzdGFydHhyZWYKMjkwMzAKJSVFT0YK --------------010608060702090002000106 Content-Type: text/csv; name="result.csv" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="result.csv" memory_size_gb,hvm_old_create,hvm_new_create,pvm_old_create,pvm_new_create,hvm_old_destroy,hvm_new_destroy,pvm_old_destroy,pvm_new_destroy 1,1.159,1.093,3.222,4.034,1.024,1.185,1.020,1.040 2,1.316,0.888,4.408,5.443,1.327,1.961,1.979,1.990 4,1.382,0.962,4.622,8.367,3.633,2.858,2.893,2.901 8,1.440,1.057,4.969,14.272,4.035,5.305,5.337,6.668 16,1.539,1.264,5.607,25.758,12.862,12.828,12.865,12.886 32,1.754,1.665,7.066,48.729,25.302,19.945,19.978,19.987 64,2.188,2.499,9.752,97.022,28.790,39.350,50.048,50.118 128,10.949,4.090,15.234,189.261,57.128,78.240,78.440,78.432 256,418.667,10.275,452.320,375.961,114.851,156.496,198.798,156.391 512,430.449,14.831,494.971,752.235,355.738,353.989,354.502,382.305 1024,867.145,28.570,1004.788,818.385,626.623,747.762,751.686,752.019 1500,1716.501,38.601,1968.900,1599.078,1083.900,1006.805,1000.907,1006.042 --------------010608060702090002000106 Content-Type: application/x-shellscript; name="test-vm-memory-allocation.sh" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="test-vm-memory-allocation.sh" IyEvYmluL2Jhc2gKCnNldCAtZQoKZXhwb3J0IFRJTUVGT1JNQVQ9IiVSIgoKY2ZnPS90bXAv cHZtLmNmZwoKZm9yIG1lbV9nYiBpbiAxIDIgNCA4IDE2IDMyIDY0IDEyOCAyNTYgNTEyIDEw MjQgMTUwMDsgZG8KICAgIG1lbV9tYj0kKCgkbWVtX2diKjEwMjQpKQogICAgdm09JChncmVw ICJebmFtZSIgJGNmZyB8IHNlZCAtZSAncy8gLy9nJyB8IHNlZCAtZSAncy8iLy9nJyB8IHNl ZCAtZSAicy8nLy9nIiB8IGN1dCAtZD0gLWYyKQogICAgc2VkIC1pIC1lICJzL21lbW9yeSA9 IC4qL21lbW9yeSA9ICR7bWVtX21ifS9nIiAkY2ZnCiAgICBlY2hvICRtZW1fZ2IKICAgIHRp bWUgeG0gY3JlYXRlIC1wICRjZmcgPi9kZXYvbnVsbAogICAgdGltZSB4bSBkZXN0cm95ICR2 bSA+L2Rldi9udWxsCiAgICBlY2hvCmRvbmUK --------------010608060702090002000106 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------010608060702090002000106-- From xen-devel-bounces@lists.xen.org Mon Nov 12 15:17:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:17:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlI-0002c0-48; Mon, 12 Nov 2012 15:17:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlH-0002bi-FV for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:17:19 +0000 Received: from [85.158.143.99:11811] by server-2.bemta-4.messagelabs.com id 17/9A-28922-EF211A05; Mon, 12 Nov 2012 15:17:18 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352733438!24352077!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11303 invoked from network); 12 Nov 2012 15:17:18 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:17:18 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15753310" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:16:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:16:53 +0000 Message-ID: <1352733413.27833.272.camel@zakaz.uk.xensource.com> From: Ian Campbell To: feral Date: Mon, 12 Nov 2012 15:16:53 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Please trim your quotes, especially when replying to the digest. You should adjust the subject line to reference the actual mail you are replying to and avoid top posting too. This is all covered in http://wiki.xen.org/wiki/Asking_Xen_Devel_Questions. On Sat, 2012-11-10 at 20:11 +0000, feral wrote: > Can't run Xen-4.3 unstable kernel with old xm tools: > WARING: Can't find version unstable of xen utils, fallback to default > version! > Error: Unable to connect to xend: No such file or directory. Is xend > running? > > > Guessing the same will be true of running the older 4.1 kernel with > the new xl toolstack, so not sure how to proceed in testing. You always need to have a matched pair of hypervisor and tools, regardless of whether you are using xl or xm. You just need to install the tools at the same time as you install the hypervisor. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:17:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:17:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlI-0002c0-48; Mon, 12 Nov 2012 15:17:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlH-0002bi-FV for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:17:19 +0000 Received: from [85.158.143.99:11811] by server-2.bemta-4.messagelabs.com id 17/9A-28922-EF211A05; Mon, 12 Nov 2012 15:17:18 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352733438!24352077!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11303 invoked from network); 12 Nov 2012 15:17:18 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:17:18 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15753310" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:16:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:16:53 +0000 Message-ID: <1352733413.27833.272.camel@zakaz.uk.xensource.com> From: Ian Campbell To: feral Date: Mon, 12 Nov 2012 15:16:53 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Xen-devel Digest, Vol 93, Issue 79 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Please trim your quotes, especially when replying to the digest. You should adjust the subject line to reference the actual mail you are replying to and avoid top posting too. This is all covered in http://wiki.xen.org/wiki/Asking_Xen_Devel_Questions. On Sat, 2012-11-10 at 20:11 +0000, feral wrote: > Can't run Xen-4.3 unstable kernel with old xm tools: > WARING: Can't find version unstable of xen utils, fallback to default > version! > Error: Unable to connect to xend: No such file or directory. Is xend > running? > > > Guessing the same will be true of running the older 4.1 kernel with > the new xl toolstack, so not sure how to proceed in testing. You always need to have a matched pair of hypervisor and tools, regardless of whether you are using xl or xm. You just need to install the tools at the same time as you install the hypervisor. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:17:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:17:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlH-0002bq-Og; Mon, 12 Nov 2012 15:17:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlF-0002bX-NE for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:17:17 +0000 Received: from [85.158.137.99:43177] by server-14.bemta-3.messagelabs.com id FC/32-12788-CF211A05; Mon, 12 Nov 2012 15:17:16 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352733436!14031412!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10482 invoked from network); 12 Nov 2012 15:17:16 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-217.messagelabs.com with SMTP; 12 Nov 2012 15:17:16 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 12 Nov 2012 15:17:16 +0000 Message-Id: <50A1210902000078000A7C86@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 12 Nov 2012 15:17:13 +0000 From: "Jan Beulich" To: "Zhigang Wang" References: <50A10F3E.2030808@oracle.com> In-Reply-To: <50A10F3E.2030808@oracle.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Dan Magenheimer , Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 12.11.12 at 16:01, Zhigang Wang wrote: > My conclusion from the test: > > - HVM create time is greatly reduced. > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > - HVM/PVM destroy time is not affected. > - If most of our customers are using PVM, I think this patch is bad: because > most VM memory should under 128G. > - If they are using HVM, then this patch is great. > > Questions for discussion: > > - Did you get the same result? > - It seems this result is not ideal. We may need to improve it. We'd first of all need to understand how this rather odd behavior can be explained. In order to have a better comparison basis, did you also do this for traditional PV? Or maybe I misunderstand what PVM stands for, and am mixing it up with PVH? You certainly agree that the two curves for what you call PVM have quite unusual a relationship. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:17:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:17:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlH-0002bq-Og; Mon, 12 Nov 2012 15:17:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvlF-0002bX-NE for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:17:17 +0000 Received: from [85.158.137.99:43177] by server-14.bemta-3.messagelabs.com id FC/32-12788-CF211A05; Mon, 12 Nov 2012 15:17:16 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-217.messagelabs.com!1352733436!14031412!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM5MDI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10482 invoked from network); 12 Nov 2012 15:17:16 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-217.messagelabs.com with SMTP; 12 Nov 2012 15:17:16 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Mon, 12 Nov 2012 15:17:16 +0000 Message-Id: <50A1210902000078000A7C86@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Mon, 12 Nov 2012 15:17:13 +0000 From: "Jan Beulich" To: "Zhigang Wang" References: <50A10F3E.2030808@oracle.com> In-Reply-To: <50A10F3E.2030808@oracle.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Dan Magenheimer , Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 12.11.12 at 16:01, Zhigang Wang wrote: > My conclusion from the test: > > - HVM create time is greatly reduced. > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > - HVM/PVM destroy time is not affected. > - If most of our customers are using PVM, I think this patch is bad: because > most VM memory should under 128G. > - If they are using HVM, then this patch is great. > > Questions for discussion: > > - Did you get the same result? > - It seems this result is not ideal. We may need to improve it. We'd first of all need to understand how this rather odd behavior can be explained. In order to have a better comparison basis, did you also do this for traditional PV? Or maybe I misunderstand what PVM stands for, and am mixing it up with PVH? You certainly agree that the two curves for what you call PVM have quite unusual a relationship. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:29:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:29:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvwc-00036w-C2; Mon, 12 Nov 2012 15:29:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvwb-00036q-0D for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 15:29:01 +0000 Received: from [193.109.254.147:8934] by server-1.bemta-14.messagelabs.com id 36/C9-25314-CB511A05; Mon, 12 Nov 2012 15:29:00 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352734139!2914334!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8165 invoked from network); 12 Nov 2012 15:28:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:28:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15753842" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:28:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:28:54 +0000 Message-ID: <1352734133.27833.277.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Chunyan Liu Date: Mon, 12 Nov 2012 15:28:53 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Dropping users list, please don't cross post. On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote: > Dear List, > > I'm trying to issue: > "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 > r15 r16 r17 r18" > it failed at error report "Too many permissions specified. Maximum > per invocation is 16." > > I changed MAX_PERMS to 18 for testing, it turns to be OK to run above > command. > I don't know why there is "MAX_PERMS=16" limitation and couldn't find > useful info about that. Does anyone know that? It seems like an obvious case of an arbitrary constant to me. Do you actually have a practical requirement to be able to set > 16 perms via the command line tool? I can't see anything obvious in the underlying library which would prevent it handling essentially arbitrary length lists of perms. If you want to change the client to increase the number supported I think you should make it likewise handle arbitrary numbers rather than just increasing MAX_PERMS. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:29:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:29:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvwc-00036w-C2; Mon, 12 Nov 2012 15:29:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXvwb-00036q-0D for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 15:29:01 +0000 Received: from [193.109.254.147:8934] by server-1.bemta-14.messagelabs.com id 36/C9-25314-CB511A05; Mon, 12 Nov 2012 15:29:00 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1352734139!2914334!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8165 invoked from network); 12 Nov 2012 15:28:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:28:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15753842" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:28:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:28:54 +0000 Message-ID: <1352734133.27833.277.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Chunyan Liu Date: Mon, 12 Nov 2012 15:28:53 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Dropping users list, please don't cross post. On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote: > Dear List, > > I'm trying to issue: > "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 > r15 r16 r17 r18" > it failed at error report "Too many permissions specified. Maximum > per invocation is 16." > > I changed MAX_PERMS to 18 for testing, it turns to be OK to run above > command. > I don't know why there is "MAX_PERMS=16" limitation and couldn't find > useful info about that. Does anyone know that? It seems like an obvious case of an arbitrary constant to me. Do you actually have a practical requirement to be able to set > 16 perms via the command line tool? I can't see anything obvious in the underlying library which would prevent it handling essentially arbitrary length lists of perms. If you want to change the client to increase the number supported I think you should make it likewise handle arbitrary numbers rather than just increasing MAX_PERMS. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:34:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1Q-0003Jg-43; Mon, 12 Nov 2012 15:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1O-0003Ja-VC for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:33:59 +0000 Received: from [85.158.139.83:41869] by server-1.bemta-5.messagelabs.com id 74/15-05877-5E611A05; Mon, 12 Nov 2012 15:33:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352734436!22683063!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24430 invoked from network); 12 Nov 2012 15:33:57 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:33:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15754011" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:33:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:33:53 +0000 Message-ID: <1352734432.27833.280.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Mon, 12 Nov 2012 15:33:52 +0000 In-Reply-To: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "port-xen@netbsd.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sun, 2012-11-04 at 22:23 +0000, Roger Pau Monne wrote: > @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) > else > sc->sc_cache_flush = 0; > > + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, > + "feature-persistent", &feature_persistent, 10); > + if (err) > + feature_persistent = 0; > + if (feature_persistent > 0) > + sc->sc_persistent_grants = 1; > + else > + sc->sc_persistent_grants = 0; I can't find anywhere which reads sc->sc_persistent_grants? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:34:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1Q-0003Jg-43; Mon, 12 Nov 2012 15:34:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1O-0003Ja-VC for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:33:59 +0000 Received: from [85.158.139.83:41869] by server-1.bemta-5.messagelabs.com id 74/15-05877-5E611A05; Mon, 12 Nov 2012 15:33:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352734436!22683063!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24430 invoked from network); 12 Nov 2012 15:33:57 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:33:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15754011" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:33:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:33:53 +0000 Message-ID: <1352734432.27833.280.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau Monne Date: Mon, 12 Nov 2012 15:33:52 +0000 In-Reply-To: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "port-xen@netbsd.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sun, 2012-11-04 at 22:23 +0000, Roger Pau Monne wrote: > @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) > else > sc->sc_cache_flush = 0; > > + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, > + "feature-persistent", &feature_persistent, 10); > + if (err) > + feature_persistent = 0; > + if (feature_persistent > 0) > + sc->sc_persistent_grants = 1; > + else > + sc->sc_persistent_grants = 0; I can't find anywhere which reads sc->sc_persistent_grants? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 15:34:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:34:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1V-0003K5-Gh; Mon, 12 Nov 2012 15:34:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1T-0003Ju-D2 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:34:03 +0000 Received: from [85.158.139.83:42359] by server-9.bemta-5.messagelabs.com id 30/ED-29295-AE611A05; Mon, 12 Nov 2012 15:34:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352734436!22683063!2 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24870 invoked from network); 12 Nov 2012 15:34:02 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:34:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15754015" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:34:01 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:34:01 +0000 Message-ID: <1352734440.27833.281.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau =?ISO-8859-1?Q?Monn=E9?= Date: Mon, 12 Nov 2012 15:34:00 +0000 In-Reply-To: <50A0C1D0.1060407@citrix.com> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> <50A0C1D0.1060407@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Manuel Bouyer , "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gTW9uLCAyMDEyLTExLTEyIGF0IDA5OjMwICswMDAwLCBSb2dlciBQYXUgTW9ubsOpIHdyb3Rl Ogo+IAo+IEkgd2lsbCB0cnkgdG8gcGVyZm9ybSBhIHNpbWlsYXIgdGVzdCB3aXRoIGEgTmV0QlNE IERvbTAsIGJ1dCB3aXRoIHRoZQo+IHBhdGNoIGl0IHdpbGwgcHJvYmFibHkgYmUgYSBsaXR0bGUg Yml0IHNsb3dlciB0aGFuIHdpdGhvdXQgaXQgKGJlY2F1c2UKPiB3ZSBoYXZlIHRvIHBlcmZvcm0g dGhlIG1lbWNweSBpbiB0aGUgZnJvbnRlbmQsIAoKRG9lc24ndCB0aGUgZnJvbnRlbmQgZmFsbGJh Y2sgdG8gdGhlIHNhbWUgb2xkIGNvZGUgYXMgYWx3YXlzIGlmIHRoZSBiL2UKZG9lc24ndCBhZHZl cnRpc2UgdGhlIG5ldyBmZWF0dXJlPwoKSWFuLgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Mon Nov 12 15:34:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:34:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1V-0003K5-Gh; Mon, 12 Nov 2012 15:34:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXw1T-0003Ju-D2 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:34:03 +0000 Received: from [85.158.139.83:42359] by server-9.bemta-5.messagelabs.com id 30/ED-29295-AE611A05; Mon, 12 Nov 2012 15:34:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352734436!22683063!2 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24870 invoked from network); 12 Nov 2012 15:34:02 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 15:34:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15754015" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 15:34:01 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 15:34:01 +0000 Message-ID: <1352734440.27833.281.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Roger Pau =?ISO-8859-1?Q?Monn=E9?= Date: Mon, 12 Nov 2012 15:34:00 +0000 In-Reply-To: <50A0C1D0.1060407@citrix.com> References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> <50A0C1D0.1060407@citrix.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Manuel Bouyer , "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gTW9uLCAyMDEyLTExLTEyIGF0IDA5OjMwICswMDAwLCBSb2dlciBQYXUgTW9ubsOpIHdyb3Rl Ogo+IAo+IEkgd2lsbCB0cnkgdG8gcGVyZm9ybSBhIHNpbWlsYXIgdGVzdCB3aXRoIGEgTmV0QlNE IERvbTAsIGJ1dCB3aXRoIHRoZQo+IHBhdGNoIGl0IHdpbGwgcHJvYmFibHkgYmUgYSBsaXR0bGUg Yml0IHNsb3dlciB0aGFuIHdpdGhvdXQgaXQgKGJlY2F1c2UKPiB3ZSBoYXZlIHRvIHBlcmZvcm0g dGhlIG1lbWNweSBpbiB0aGUgZnJvbnRlbmQsIAoKRG9lc24ndCB0aGUgZnJvbnRlbmQgZmFsbGJh Y2sgdG8gdGhlIHNhbWUgb2xkIGNvZGUgYXMgYWx3YXlzIGlmIHRoZSBiL2UKZG9lc24ndCBhZHZl cnRpc2UgdGhlIG5ldyBmZWF0dXJlPwoKSWFuLgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Mon Nov 12 15:58:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:58:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwOS-0003lM-Sa; Mon, 12 Nov 2012 15:57:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwOR-0003lE-Hw for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:57:47 +0000 Received: from [85.158.143.99:30144] by server-2.bemta-4.messagelabs.com id 3F/26-28922-A7C11A05; Mon, 12 Nov 2012 15:57:46 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352735864!28705463!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26337 invoked from network); 12 Nov 2012 15:57:46 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 15:57:46 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACFvfC9009846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 15:57:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACFvehG011683 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 15:57:40 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACFvdKf016030; Mon, 12 Nov 2012 09:57:39 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 07:57:39 -0800 Message-ID: <50A11C71.4020507@oracle.com> Date: Mon, 12 Nov 2012 10:57:37 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Jan Beulich References: <50A10F3E.2030808@oracle.com> <50A1210902000078000A7C86@nat28.tlf.novell.com> In-Reply-To: <50A1210902000078000A7C86@nat28.tlf.novell.com> Content-Type: multipart/mixed; boundary="------------090605040006060609040303" X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Dan Magenheimer , Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------090605040006060609040303 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/12/2012 10:17 AM, Jan Beulich wrote: >>>> On 12.11.12 at 16:01, Zhigang Wang wrote: >> My conclusion from the test: >> >> - HVM create time is greatly reduced. >> - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. >> - HVM/PVM destroy time is not affected. >> - If most of our customers are using PVM, I think this patch is bad: because >> most VM memory should under 128G. >> - If they are using HVM, then this patch is great. >> >> Questions for discussion: >> >> - Did you get the same result? >> - It seems this result is not ideal. We may need to improve it. > We'd first of all need to understand how this rather odd behavior > can be explained. In order to have a better comparison basis, did > you also do this for traditional PV? Or maybe I misunderstand > what PVM stands for, and am mixing it up with PVH? You certainly > agree that the two curves for what you call PVM have quite > unusual a relationship. > Let me attach the HVM and PV guest configure files. Actually I use xm create -p to create the VM, and destroy it immediately. So the guest kernel doesn't matter. Please see the test script for detail. Thanks, Zhigang --------------090605040006060609040303 Content-Type: text/plain; charset=UTF-8; name="pvm.cfg" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pvm.cfg" vif = [] disk = ['file:/OVS/Repositories/0004fb0000030000013b01f1d983f4db/VirtualDisks/0004fb00001200004b87f14bde146192.img,xvda,r'] uuid = '0004fb00-0006-0000-7a63-1bf13fa33c30' on_reboot = 'restart' memory = 1536000 bootloader = '/usr/bin/pygrub' name = '0004fb00000600007a631bf13fa33c30' vfb = ['type=vnc,vncunused=1,vnclisten=0.0.0.0,keymap=en-us'] vcpus = 1 --------------090605040006060609040303 Content-Type: text/plain; charset=UTF-8; name="hvm.cfg" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hvm.cfg" serial = 'pty' disk = ['file:/share/vm/microcore_3.5.1.iso,hdc:cdrom,r'] boot = 'd' memory = 4096 pae = 1 acpi = 1 apic = 1 vnc = 1 vncunused = 1 vnclisten = '0.0.0.0' name = 'microcorelinux_x86_hvm' builder = 'hvm' vcpus = 1 --------------090605040006060609040303 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------090605040006060609040303-- From xen-devel-bounces@lists.xen.org Mon Nov 12 15:58:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 15:58:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwOS-0003lM-Sa; Mon, 12 Nov 2012 15:57:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwOR-0003lE-Hw for xen-devel@lists.xen.org; Mon, 12 Nov 2012 15:57:47 +0000 Received: from [85.158.143.99:30144] by server-2.bemta-4.messagelabs.com id 3F/26-28922-A7C11A05; Mon, 12 Nov 2012 15:57:46 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352735864!28705463!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26337 invoked from network); 12 Nov 2012 15:57:46 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-13.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 15:57:46 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACFvfC9009846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 15:57:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACFvehG011683 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 15:57:40 GMT Received: from abhmt117.oracle.com (abhmt117.oracle.com [141.146.116.69]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACFvdKf016030; Mon, 12 Nov 2012 09:57:39 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 07:57:39 -0800 Message-ID: <50A11C71.4020507@oracle.com> Date: Mon, 12 Nov 2012 10:57:37 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Jan Beulich References: <50A10F3E.2030808@oracle.com> <50A1210902000078000A7C86@nat28.tlf.novell.com> In-Reply-To: <50A1210902000078000A7C86@nat28.tlf.novell.com> Content-Type: multipart/mixed; boundary="------------090605040006060609040303" X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Dan Magenheimer , Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------090605040006060609040303 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/12/2012 10:17 AM, Jan Beulich wrote: >>>> On 12.11.12 at 16:01, Zhigang Wang wrote: >> My conclusion from the test: >> >> - HVM create time is greatly reduced. >> - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. >> - HVM/PVM destroy time is not affected. >> - If most of our customers are using PVM, I think this patch is bad: because >> most VM memory should under 128G. >> - If they are using HVM, then this patch is great. >> >> Questions for discussion: >> >> - Did you get the same result? >> - It seems this result is not ideal. We may need to improve it. > We'd first of all need to understand how this rather odd behavior > can be explained. In order to have a better comparison basis, did > you also do this for traditional PV? Or maybe I misunderstand > what PVM stands for, and am mixing it up with PVH? You certainly > agree that the two curves for what you call PVM have quite > unusual a relationship. > Let me attach the HVM and PV guest configure files. Actually I use xm create -p to create the VM, and destroy it immediately. So the guest kernel doesn't matter. Please see the test script for detail. Thanks, Zhigang --------------090605040006060609040303 Content-Type: text/plain; charset=UTF-8; name="pvm.cfg" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pvm.cfg" vif = [] disk = ['file:/OVS/Repositories/0004fb0000030000013b01f1d983f4db/VirtualDisks/0004fb00001200004b87f14bde146192.img,xvda,r'] uuid = '0004fb00-0006-0000-7a63-1bf13fa33c30' on_reboot = 'restart' memory = 1536000 bootloader = '/usr/bin/pygrub' name = '0004fb00000600007a631bf13fa33c30' vfb = ['type=vnc,vncunused=1,vnclisten=0.0.0.0,keymap=en-us'] vcpus = 1 --------------090605040006060609040303 Content-Type: text/plain; charset=UTF-8; name="hvm.cfg" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hvm.cfg" serial = 'pty' disk = ['file:/share/vm/microcore_3.5.1.iso,hdc:cdrom,r'] boot = 'd' memory = 4096 pae = 1 acpi = 1 apic = 1 vnc = 1 vncunused = 1 vnclisten = '0.0.0.0' name = 'microcorelinux_x86_hvm' builder = 'hvm' vcpus = 1 --------------090605040006060609040303 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------090605040006060609040303-- From xen-devel-bounces@lists.xen.org Mon Nov 12 16:12:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwbw-0004Ps-8k; Mon, 12 Nov 2012 16:11:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwbv-0004Pn-E4 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:11:43 +0000 Received: from [85.158.139.83:54531] by server-15.bemta-5.messagelabs.com id D8/FC-26920-EBF11A05; Mon, 12 Nov 2012 16:11:42 +0000 X-Env-Sender: davidxu06@gmail.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352736700!25960746!1 X-Originating-IP: [209.85.216.52] X-SpamReason: No, hits=0.7 required=7.0 tests=HTML_30_40,HTML_MESSAGE, MAILTO_TO_SPAM_ADDR,ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12188 invoked from network); 12 Nov 2012 16:11:41 -0000 Received: from mail-qa0-f52.google.com (HELO mail-qa0-f52.google.com) (209.85.216.52) by server-7.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:11:41 -0000 Received: by mail-qa0-f52.google.com with SMTP id g14so1729297qab.11 for ; Mon, 12 Nov 2012 08:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=X1v0sVwk5mPKf+mjgJcY5SeLx19kkULn72+Vbt1ZDgI=; b=YNH2mCOzwB2E5lMu2EcHP9JXg6eQeoc0TGjwxUhIW2z927ueL68rWzQo9G+eOu5iBk 765paI0zQpWyOtL3/aN1yIDCkQEilGJ8FP9AzOBEtdwFA4lLPxpF+8UbRD4HE9lquAPP ReWqftxxVtzmktsJDhk8w7/i8m7roIcxlY5MOuyh+lhoO6s7lH4Cl/1yzaq31FENssbB SsuJUnfKYOq7sEMEndw6NbJ1qFBio3us/9vjZcbuzBo7QojeXmrj8t/MRA9DDGmMZNT7 JSjzdutEpxv7tvnfsa9n2m/Z2NJOPUJmLQ7SD2EJJgnLPT7hBQOoD7Lfo+dnRuLgGpfn HEDg== MIME-Version: 1.0 Received: by 10.224.27.3 with SMTP id g3mr21434218qac.44.1352736700401; Mon, 12 Nov 2012 08:11:40 -0800 (PST) Received: by 10.49.1.116 with HTTP; Mon, 12 Nov 2012 08:11:40 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 11:11:40 -0500 Message-ID: From: David Xu To: George Dunlap Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7250718826999406418==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7250718826999406418== Content-Type: multipart/alternative; boundary=bcaec5196c6b80891504ce4e8e31 --bcaec5196c6b80891504ce4e8e31 Content-Type: text/plain; charset=ISO-8859-1 Hi George, Thanks for your quick reply. In my question, the running state is mainly for the process. For example, when a vCPU becomes OVER, what's the state of the running process(this process in running when this vCPU is UNDER) on it? Besides, do you mean that from the guest's perspective its time is frozen when the corresponding vCPU is de-scheduled? In this case, how about vSMP? If a VM has 2 vCPUs, one is de-scheduled and the other is running, the time on the running vCPU will continue going ahead, right? Thanks. Regards, Cong 2012/11/12 George Dunlap > On Sun, Nov 11, 2012 at 3:57 AM, David Xu wrote: > >> Hi all, >> >> I wonder if the state of process in guestOS will change when the >> corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its >> credits and its state become over, how about the process context or softirq >> context in guest OS on this vCPU? Does it still maintain the same running >> state? Thanks. >> > > I'm not sure what you mean "the same running state". The state of the > vcpu -- the registers, the guest memory relating to it, and the fact that > it's not blocked -- is the same. From the guest's perspective, it has > temporarily frozen in time until it gets to run again. Does that answer > your question? > > -George > > --bcaec5196c6b80891504ce4e8e31 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi George,

Thanks for your quick reply. In my question, = the running state is mainly for the process. For example, when a vCPU becom= es OVER, what's the state of the running process(this process in runnin= g when this vCPU is UNDER) on it? Besides, do you mean that from the guest&= #39;s perspective its time is frozen when the corresponding vCPU is de-sche= duled? In this case, how about vSMP? If a VM has 2 vCPUs, one is de-schedul= ed and the other is running, the time on the running vCPU will continue goi= ng ahead, right? Thanks.

Regards,
Cong

2012/11/12 George Dunlap <George.Dunlap@eu.citrix.com>=
On Sun, Nov 11, 2012 at 3:= 57 AM, David Xu <davidxu06@gmail.com> wrote:
Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

I'm not sure what you mean "the same r= unning state".=A0 The state of the vcpu -- the registers, the guest me= mory relating to it, and the fact that it's not blocked -- is the same.= =A0 From the guest's perspective, it has temporarily frozen in time unt= il it gets to run again.=A0 Does that answer your question?

=A0-George


--bcaec5196c6b80891504ce4e8e31-- --===============7250718826999406418== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7250718826999406418==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 16:12:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwbw-0004Ps-8k; Mon, 12 Nov 2012 16:11:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwbv-0004Pn-E4 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:11:43 +0000 Received: from [85.158.139.83:54531] by server-15.bemta-5.messagelabs.com id D8/FC-26920-EBF11A05; Mon, 12 Nov 2012 16:11:42 +0000 X-Env-Sender: davidxu06@gmail.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352736700!25960746!1 X-Originating-IP: [209.85.216.52] X-SpamReason: No, hits=0.7 required=7.0 tests=HTML_30_40,HTML_MESSAGE, MAILTO_TO_SPAM_ADDR,ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12188 invoked from network); 12 Nov 2012 16:11:41 -0000 Received: from mail-qa0-f52.google.com (HELO mail-qa0-f52.google.com) (209.85.216.52) by server-7.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:11:41 -0000 Received: by mail-qa0-f52.google.com with SMTP id g14so1729297qab.11 for ; Mon, 12 Nov 2012 08:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=X1v0sVwk5mPKf+mjgJcY5SeLx19kkULn72+Vbt1ZDgI=; b=YNH2mCOzwB2E5lMu2EcHP9JXg6eQeoc0TGjwxUhIW2z927ueL68rWzQo9G+eOu5iBk 765paI0zQpWyOtL3/aN1yIDCkQEilGJ8FP9AzOBEtdwFA4lLPxpF+8UbRD4HE9lquAPP ReWqftxxVtzmktsJDhk8w7/i8m7roIcxlY5MOuyh+lhoO6s7lH4Cl/1yzaq31FENssbB SsuJUnfKYOq7sEMEndw6NbJ1qFBio3us/9vjZcbuzBo7QojeXmrj8t/MRA9DDGmMZNT7 JSjzdutEpxv7tvnfsa9n2m/Z2NJOPUJmLQ7SD2EJJgnLPT7hBQOoD7Lfo+dnRuLgGpfn HEDg== MIME-Version: 1.0 Received: by 10.224.27.3 with SMTP id g3mr21434218qac.44.1352736700401; Mon, 12 Nov 2012 08:11:40 -0800 (PST) Received: by 10.49.1.116 with HTTP; Mon, 12 Nov 2012 08:11:40 -0800 (PST) In-Reply-To: References: Date: Mon, 12 Nov 2012 11:11:40 -0500 Message-ID: From: David Xu To: George Dunlap Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] state of process on de-scheduled vCPU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7250718826999406418==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7250718826999406418== Content-Type: multipart/alternative; boundary=bcaec5196c6b80891504ce4e8e31 --bcaec5196c6b80891504ce4e8e31 Content-Type: text/plain; charset=ISO-8859-1 Hi George, Thanks for your quick reply. In my question, the running state is mainly for the process. For example, when a vCPU becomes OVER, what's the state of the running process(this process in running when this vCPU is UNDER) on it? Besides, do you mean that from the guest's perspective its time is frozen when the corresponding vCPU is de-scheduled? In this case, how about vSMP? If a VM has 2 vCPUs, one is de-scheduled and the other is running, the time on the running vCPU will continue going ahead, right? Thanks. Regards, Cong 2012/11/12 George Dunlap > On Sun, Nov 11, 2012 at 3:57 AM, David Xu wrote: > >> Hi all, >> >> I wonder if the state of process in guestOS will change when the >> corresponding vCPU is de-scheduled. In other words, when a vCPU uses up its >> credits and its state become over, how about the process context or softirq >> context in guest OS on this vCPU? Does it still maintain the same running >> state? Thanks. >> > > I'm not sure what you mean "the same running state". The state of the > vcpu -- the registers, the guest memory relating to it, and the fact that > it's not blocked -- is the same. From the guest's perspective, it has > temporarily frozen in time until it gets to run again. Does that answer > your question? > > -George > > --bcaec5196c6b80891504ce4e8e31 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi George,

Thanks for your quick reply. In my question, = the running state is mainly for the process. For example, when a vCPU becom= es OVER, what's the state of the running process(this process in runnin= g when this vCPU is UNDER) on it? Besides, do you mean that from the guest&= #39;s perspective its time is frozen when the corresponding vCPU is de-sche= duled? In this case, how about vSMP? If a VM has 2 vCPUs, one is de-schedul= ed and the other is running, the time on the running vCPU will continue goi= ng ahead, right? Thanks.

Regards,
Cong

2012/11/12 George Dunlap <George.Dunlap@eu.citrix.com>=
On Sun, Nov 11, 2012 at 3:= 57 AM, David Xu <davidxu06@gmail.com> wrote:
Hi all,

I wonder if the state of process in guestOS will= change when the corresponding vCPU is de-scheduled. In other words, when a= vCPU uses up its credits and its state become over, how about the process = context or softirq context in guest OS on this vCPU? Does it still maintain= the same running state? Thanks.

I'm not sure what you mean "the same r= unning state".=A0 The state of the vcpu -- the registers, the guest me= mory relating to it, and the fact that it's not blocked -- is the same.= =A0 From the guest's perspective, it has temporarily frozen in time unt= il it gets to run again.=A0 Does that answer your question?

=A0-George


--bcaec5196c6b80891504ce4e8e31-- --===============7250718826999406418== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7250718826999406418==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 16:16:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:16:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwg1-0004Yx-Uq; Mon, 12 Nov 2012 16:15:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwfz-0004Yp-TZ for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:15:56 +0000 Received: from [193.109.254.147:61055] by server-16.bemta-14.messagelabs.com id 29/52-09215-BB021A05; Mon, 12 Nov 2012 16:15:55 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352736943!9400935!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15711 invoked from network); 12 Nov 2012 16:15:44 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:15:44 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755302" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:15:43 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:15:43 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXwfn-0007Go-Bg; Mon, 12 Nov 2012 16:15:43 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXwfn-0005Sc-0P; Mon, 12 Nov 2012 16:15:43 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Mon, 12 Nov 2012 16:15:43 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14380: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14380 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14380/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-qemuu-rhel6hvm-amd 11 leak-check/check fail REGR. vs. 14379 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14379 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14379 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14379 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14378 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 279bbf2a0b48 baseline version: xen 62885b3c34c8 ------------------------------------------------------------ People who touched revisions under test: Dario Faggioli Jan Beulich Keir Fraser Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd fail test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ changeset: 26134:279bbf2a0b48 tag: tip user: Matthew Daley date: Mon Nov 12 10:17:00 2012 +0000 x86/mm x86 shadow: Fix typo in sh_invlpg sl3 page presence check Signed-off-by: Matthew Daley Acked-by: Tim Deegan Committed-by: Tim Deegan changeset: 26133:fdb69dd527cd user: Jan Beulich date: Mon Nov 12 09:36:07 2012 +0100 IOMMU: don't immediately disable bus mastering on faults Instead, give the owning domain at least a small opportunity of fixing things up, and allow for rare faults to not bring down the device at all. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Dario Faggioli changeset: 26132:286ef4ced216 user: Matthew Daley date: Mon Nov 12 09:34:57 2012 +0100 tmem: Prevent NULL dereference on error case If the client / pool IDs given to tmemc_save_get_next_page are invalid, the calculation of pagesize will dereference NULL. Fix this by moving the calculation below the appropriate NULL check. Signed-off-by: Matthew Daley Committed-by: Jan Beulich changeset: 26131:62885b3c34c8 user: Jan Beulich date: Thu Nov 08 17:58:19 2012 +0100 x86/x2apic: properly implement cluster mode So far, cluster mode was just an alternative implementation of physical mode: Allowing only single CPU interrupt targets, and sending IPIs to each target CPU separately. Take advantage of what cluster mode really can do in that regard. Signed-off-by: Jan Beulich Acked-by: Keir Fraser (qemu changes not included) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:16:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:16:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwg1-0004Yx-Uq; Mon, 12 Nov 2012 16:15:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwfz-0004Yp-TZ for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:15:56 +0000 Received: from [193.109.254.147:61055] by server-16.bemta-14.messagelabs.com id 29/52-09215-BB021A05; Mon, 12 Nov 2012 16:15:55 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352736943!9400935!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15711 invoked from network); 12 Nov 2012 16:15:44 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:15:44 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755302" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:15:43 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:15:43 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TXwfn-0007Go-Bg; Mon, 12 Nov 2012 16:15:43 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TXwfn-0005Sc-0P; Mon, 12 Nov 2012 16:15:43 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Mon, 12 Nov 2012 16:15:43 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14380: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14380 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14380/ Regressions :-( Tests which did not succeed and are blocking, including tests which could not be run: test-amd64-i386-qemuu-rhel6hvm-amd 11 leak-check/check fail REGR. vs. 14379 Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14379 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14379 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14379 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14378 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 279bbf2a0b48 baseline version: xen 62885b3c34c8 ------------------------------------------------------------ People who touched revisions under test: Dario Faggioli Jan Beulich Keir Fraser Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd fail test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Not pushing. ------------------------------------------------------------ changeset: 26134:279bbf2a0b48 tag: tip user: Matthew Daley date: Mon Nov 12 10:17:00 2012 +0000 x86/mm x86 shadow: Fix typo in sh_invlpg sl3 page presence check Signed-off-by: Matthew Daley Acked-by: Tim Deegan Committed-by: Tim Deegan changeset: 26133:fdb69dd527cd user: Jan Beulich date: Mon Nov 12 09:36:07 2012 +0100 IOMMU: don't immediately disable bus mastering on faults Instead, give the owning domain at least a small opportunity of fixing things up, and allow for rare faults to not bring down the device at all. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Acked-by: Dario Faggioli changeset: 26132:286ef4ced216 user: Matthew Daley date: Mon Nov 12 09:34:57 2012 +0100 tmem: Prevent NULL dereference on error case If the client / pool IDs given to tmemc_save_get_next_page are invalid, the calculation of pagesize will dereference NULL. Fix this by moving the calculation below the appropriate NULL check. Signed-off-by: Matthew Daley Committed-by: Jan Beulich changeset: 26131:62885b3c34c8 user: Jan Beulich date: Thu Nov 08 17:58:19 2012 +0100 x86/x2apic: properly implement cluster mode So far, cluster mode was just an alternative implementation of physical mode: Allowing only single CPU interrupt targets, and sending IPIs to each target CPU separately. Take advantage of what cluster mode really can do in that regard. Signed-off-by: Jan Beulich Acked-by: Keir Fraser (qemu changes not included) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:20:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:20:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwjO-0004jI-Oj; Mon, 12 Nov 2012 16:19:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwjO-0004jB-3H for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:19:26 +0000 Received: from [85.158.139.211:52799] by server-10.bemta-5.messagelabs.com id FF/21-09257-D8121A05; Mon, 12 Nov 2012 16:19:25 +0000 X-Env-Sender: axboe@kernel.dk X-Msg-Ref: server-7.tower-206.messagelabs.com!1352737164!19432075!1 X-Originating-IP: [205.233.59.134] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA1LjIzMy41OS4xMzQgPT4gMTAwMDUx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25646 invoked from network); 12 Nov 2012 16:19:25 -0000 Received: from merlin.infradead.org (HELO merlin.infradead.org) (205.233.59.134) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:19:25 -0000 Received: from 87-104-106-3-dynamic-customer.profibernet.dk ([87.104.106.3] helo=kernel.dk) by merlin.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1TXwjK-0005S4-Ms; Mon, 12 Nov 2012 16:19:22 +0000 Received: from [10.50.103.56] (unknown [216.51.42.66]) by kernel.dk (Postfix) with ESMTPA id 6DC0856295; Mon, 12 Nov 2012 17:19:20 +0100 (CET) Message-ID: <50A12182.90305@kernel.dk> Date: Mon, 12 Nov 2012 09:19:14 -0700 From: Jens Axboe MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <20121109145529.GB23023@phenom.dumpdata.com> In-Reply-To: <20121109145529.GB23023@phenom.dumpdata.com> X-Enigmail-Version: 1.4.5 Cc: xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: Re: [Xen-devel] [GIT PULL] (xen) stable/for-jens-3.8 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 2012-11-09 07:55, Konrad Rzeszutek Wilk wrote: > Hey Jens, > > Please git pull the following branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.8 > > which has a new feature of the blk[back|front] driver - it is called 'feature-persistent'. > Roger and Oliver patch says: > " This patch implements persistent grants for the xen-blk{front,back} > mechanism. The effect of this change is to reduce the number of unmap > operations performed, since they cause a (costly) TLB shootdown. This > allows the I/O performance to scale better when a large number of VMs > are performing I/O. > > Previously, the blkfront driver was supplied a bvec[] from the request > queue. This was granted to dom0; dom0 performed the I/O and wrote > directly into the grant-mapped memory and unmapped it; blkfront then > removed foreign access for that grant. The cost of unmapping scales > badly with the number of CPUs in Dom0. An experiment showed that when > Dom0 has 24 VCPUs, and guests are performing parallel I/O to a > ramdisk, the IPIs from performing unmap's is a bottleneck at 5 guests > (at which point 650,000 IOPS are being performed in total). If more > than 5 guests are used, the performance declines. By 10 guests, only > 400,000 IOPS are being performed. > > This patch improves performance by only unmapping when the connection > between blkfront and back is broken. > " > > Note: You might get a conflict in the common.h file. It should > be fairly easy to fix it - it should end up looking as this: > > 160 /* Cached size parameter. */ > 161 sector_t size; > 162 unsigned int flush_support:1; > 163 unsigned int discard_secure:1; > 164 unsigned int feature_gnt_persistent:1; > 165 unsigned int overflow_max_grants:1; > 166 }; > > Thanks! Thanks, pulled. No conflict observed, it merged cleanly. -- Jens Axboe _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:20:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:20:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwjO-0004jI-Oj; Mon, 12 Nov 2012 16:19:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwjO-0004jB-3H for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:19:26 +0000 Received: from [85.158.139.211:52799] by server-10.bemta-5.messagelabs.com id FF/21-09257-D8121A05; Mon, 12 Nov 2012 16:19:25 +0000 X-Env-Sender: axboe@kernel.dk X-Msg-Ref: server-7.tower-206.messagelabs.com!1352737164!19432075!1 X-Originating-IP: [205.233.59.134] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA1LjIzMy41OS4xMzQgPT4gMTAwMDUx\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25646 invoked from network); 12 Nov 2012 16:19:25 -0000 Received: from merlin.infradead.org (HELO merlin.infradead.org) (205.233.59.134) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:19:25 -0000 Received: from 87-104-106-3-dynamic-customer.profibernet.dk ([87.104.106.3] helo=kernel.dk) by merlin.infradead.org with esmtpsa (Exim 4.76 #1 (Red Hat Linux)) id 1TXwjK-0005S4-Ms; Mon, 12 Nov 2012 16:19:22 +0000 Received: from [10.50.103.56] (unknown [216.51.42.66]) by kernel.dk (Postfix) with ESMTPA id 6DC0856295; Mon, 12 Nov 2012 17:19:20 +0100 (CET) Message-ID: <50A12182.90305@kernel.dk> Date: Mon, 12 Nov 2012 09:19:14 -0700 From: Jens Axboe MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <20121109145529.GB23023@phenom.dumpdata.com> In-Reply-To: <20121109145529.GB23023@phenom.dumpdata.com> X-Enigmail-Version: 1.4.5 Cc: xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: Re: [Xen-devel] [GIT PULL] (xen) stable/for-jens-3.8 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 2012-11-09 07:55, Konrad Rzeszutek Wilk wrote: > Hey Jens, > > Please git pull the following branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-3.8 > > which has a new feature of the blk[back|front] driver - it is called 'feature-persistent'. > Roger and Oliver patch says: > " This patch implements persistent grants for the xen-blk{front,back} > mechanism. The effect of this change is to reduce the number of unmap > operations performed, since they cause a (costly) TLB shootdown. This > allows the I/O performance to scale better when a large number of VMs > are performing I/O. > > Previously, the blkfront driver was supplied a bvec[] from the request > queue. This was granted to dom0; dom0 performed the I/O and wrote > directly into the grant-mapped memory and unmapped it; blkfront then > removed foreign access for that grant. The cost of unmapping scales > badly with the number of CPUs in Dom0. An experiment showed that when > Dom0 has 24 VCPUs, and guests are performing parallel I/O to a > ramdisk, the IPIs from performing unmap's is a bottleneck at 5 guests > (at which point 650,000 IOPS are being performed in total). If more > than 5 guests are used, the performance declines. By 10 guests, only > 400,000 IOPS are being performed. > > This patch improves performance by only unmapping when the connection > between blkfront and back is broken. > " > > Note: You might get a conflict in the common.h file. It should > be fairly easy to fix it - it should end up looking as this: > > 160 /* Cached size parameter. */ > 161 sector_t size; > 162 unsigned int flush_support:1; > 163 unsigned int discard_secure:1; > 164 unsigned int feature_gnt_persistent:1; > 165 unsigned int overflow_max_grants:1; > 166 }; > > Thanks! Thanks, pulled. No conflict observed, it merged cleanly. -- Jens Axboe _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:26:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:26:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpa-000562-6b; Mon, 12 Nov 2012 16:25:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpY-00055r-TC for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:25:49 +0000 Received: from [85.158.143.35:45687] by server-3.bemta-4.messagelabs.com id D7/75-06841-C0321A05; Mon, 12 Nov 2012 16:25:48 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352737545!10174117!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22126 invoked from network); 12 Nov 2012 16:25:47 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:25:47 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGPh6P012779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:25:44 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGPg09009499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:25:43 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGPgSX027514; Mon, 12 Nov 2012 10:25:42 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 12 Nov 2012 08:25:40 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Zhigang Wang References: <50A10F3E.2030808@oracle.com> <50A1210902000078000A7C86@nat28.tlf.novell.com> In-Reply-To: <50A1210902000078000A7C86@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: Re: VM memory allocation speed with cs 26056 > > >>> On 12.11.12 at 16:01, Zhigang Wang wrote: > > My conclusion from the test: > > > > - HVM create time is greatly reduced. > > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > > - HVM/PVM destroy time is not affected. > > - If most of our customers are using PVM, I think this patch is bad: because > > most VM memory should under 128G. > > - If they are using HVM, then this patch is great. > > > > Questions for discussion: > > > > - Did you get the same result? > > - It seems this result is not ideal. We may need to improve it. > > We'd first of all need to understand how this rather odd behavior > can be explained. In order to have a better comparison basis, did > you also do this for traditional PV? Or maybe I misunderstand > what PVM stands for, and am mixing it up with PVH? You certainly > agree that the two curves for what you call PVM have quite > unusual a relationship. ("PVM" is unfortunately often used within Oracle and means the same as "PV". "PVM" == paravirtualized virtual machine.) One significant difference is that a PV domain always allocates memory one 4K page at a time and the patch improves allocation performance only for larger-order allocations. A reasonable hypothesis is that the patch reduces performance on long sequences of 4K pages, though this doesn't explain the curve of the PV_create measurements at 256G and above. With a one-line* hypervisor patch in alloc_heap_pages, one can change HVM allocation so that all larger allocations are rejected. It would be very interesting to see if that would result in an HVM create curve similar to the PV create curve. * change "unlikely(order > MAX_ORDER)" to "order > 0" _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:26:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:26:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpa-000562-6b; Mon, 12 Nov 2012 16:25:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpY-00055r-TC for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:25:49 +0000 Received: from [85.158.143.35:45687] by server-3.bemta-4.messagelabs.com id D7/75-06841-C0321A05; Mon, 12 Nov 2012 16:25:48 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352737545!10174117!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22126 invoked from network); 12 Nov 2012 16:25:47 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:25:47 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGPh6P012779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:25:44 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGPg09009499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:25:43 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGPgSX027514; Mon, 12 Nov 2012 10:25:42 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 12 Nov 2012 08:25:40 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Zhigang Wang References: <50A10F3E.2030808@oracle.com> <50A1210902000078000A7C86@nat28.tlf.novell.com> In-Reply-To: <50A1210902000078000A7C86@nat28.tlf.novell.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Konrad Wilk , Keir Fraser , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Jan Beulich [mailto:JBeulich@suse.com] > Subject: Re: VM memory allocation speed with cs 26056 > > >>> On 12.11.12 at 16:01, Zhigang Wang wrote: > > My conclusion from the test: > > > > - HVM create time is greatly reduced. > > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > > - HVM/PVM destroy time is not affected. > > - If most of our customers are using PVM, I think this patch is bad: because > > most VM memory should under 128G. > > - If they are using HVM, then this patch is great. > > > > Questions for discussion: > > > > - Did you get the same result? > > - It seems this result is not ideal. We may need to improve it. > > We'd first of all need to understand how this rather odd behavior > can be explained. In order to have a better comparison basis, did > you also do this for traditional PV? Or maybe I misunderstand > what PVM stands for, and am mixing it up with PVH? You certainly > agree that the two curves for what you call PVM have quite > unusual a relationship. ("PVM" is unfortunately often used within Oracle and means the same as "PV". "PVM" == paravirtualized virtual machine.) One significant difference is that a PV domain always allocates memory one 4K page at a time and the patch improves allocation performance only for larger-order allocations. A reasonable hypothesis is that the patch reduces performance on long sequences of 4K pages, though this doesn't explain the curve of the PV_create measurements at 256G and above. With a one-line* hypervisor patch in alloc_heap_pages, one can change HVM allocation so that all larger allocations are rejected. It would be very interesting to see if that would result in an HVM create curve similar to the PV create curve. * change "unlikely(order > MAX_ORDER)" to "order > 0" _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:26:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:26:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpb-00056H-J0; Mon, 12 Nov 2012 16:25:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpa-000561-Gk for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:25:50 +0000 Received: from [193.109.254.147:64766] by server-6.bemta-14.messagelabs.com id B0/49-02788-D0321A05; Mon, 12 Nov 2012 16:25:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352737548!3673994!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16030 invoked from network); 12 Nov 2012 16:25:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:25:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755588" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:25:44 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:25:43 +0000 Message-ID: <1352737542.27833.296.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Jan Beulich Date: Mon, 12 Nov 2012 16:25:42 +0000 In-Reply-To: <5081887502000078000A2A51@nat28.tlf.novell.com> References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Jinsong , Haicheng Li , Christoph Egger , "Keir \(Xen.org\)" , XudongHao , YunhongJiang , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: > >>> On 19.10.12 at 17:01, Ian Jackson wrote: > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD"): > >> >>> On 19.10.12 at 15:10, Christoph Egger wrote: > >> > Ping? > >> > >> I'm afraid it's not really clear who should commit this - it's tools > >> side code, so IanJ or IanC would normally be the ones, but otoh > >> it's code requiring low level hardware knowledge to review the > >> patch, so both of them might want to rather not do the review. > >> In the past it was usually Keir who eventually committed such > >> patches, but I don't know whether he put this on his to-look-at- > >> and-eventually-commit list. > > > > My view is that I would like an ack from someone who understands > > what's going on ... > > Which would ideally be those who introduced the code, i.e. > Intel folks if I'm not mistaken... Lets CC some of them then. Intel folks -- any opinion on the patch below from Christoph? 8<---------------- # User Christoph Egger # Date 1349437062 -7200 xen mceinj: support AMD. Signed-off-by: Christoph Egger diff -r 21704bc429b4 -r 1a3eea784e09 tools/tests/mce-test/tools/xen-mceinj.c --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -1,6 +1,7 @@ /* * xen-mceinj.c: utilities to inject fake MCE for x86. * Copyright (c) 2010, Intel Corporation. + * Copyright (c) 2012, AMD Cooperation Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -18,6 +19,7 @@ * Authors: Yunhong Jiang * Haicheng Li * Xudong Hao + * Christoph Egger */ @@ -44,11 +46,14 @@ #define MCi_type_STATUS 0x1 #define MCi_type_ADDR 0x2 #define MCi_type_MISC 0x3 -#define MCi_type_CTL2 0x4 +#define MC4_type_MISC1 0x4 +#define MC4_type_MISC2 0x5 +#define MC4_type_MISC3 0x6 +#define MCi_type_CTL2 0x7 #define INVALID_MSR ~0UL -/* Intel MSRs */ +/* X86 machine check MSRs */ #define MSR_IA32_MCG_CAP 0x00000179 #define MSR_IA32_MCG_STATUS 0x0000017a #define MSR_IA32_MCG_CTL 0x0000017b @@ -56,35 +61,66 @@ #define MSR_IA32_MC0_STATUS 0x00000401 #define MSR_IA32_MC0_ADDR 0x00000402 #define MSR_IA32_MC0_MISC 0x00000403 + +/* Intel MSRs */ #define MSR_IA32_MC0_CTL2 0x00000280 -/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ +/* Intel: LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ #define MCG_STATUS_SRAO_LLC_VAL 0x5 #define MCE_SRAO_LLC_BANK 0x7 #define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL #define MCi_MISC_SRAO_LLC_VAL 0x86UL -/* Memory Patrol Scrub SRAO MCE */ +/* Intel: Memory Patrol Scrub SRAO MCE */ #define MCG_STATUS_SRAO_MEM_VAL 0x5 #define MCE_SRAO_MEM_BANK 0x8 #define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL #define MCi_MISC_SRAO_MEM_VAL 0x86UL -/* LLC EWB UCNA Error */ +/* Intel: LLC EWB UCNA Error */ #define MCG_STATUS_UCNA_LLC_VAL 0x0 #define CMCI_UCNA_LLC_BANK 0x9 #define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL #define MCi_MISC_UCNA_LLC_VAL 0x86UL -/* Error Types */ -#define MCE_SRAO_MEM 0x0 -#define MCE_SRAO_LLC 0x1 -#define CMCI_UCNA_LLC 0x2 +/* Intel: Error Types */ +#define INTEL_MCE_SRAO_MEM 0x0 +#define INTEL_MCE_SRAO_LLC 0x1 +#define INTEL_CMCI_UCNA_LLC 0x2 + +/* AMD: Memory Error */ +#define MCG_STATUS_MEM_VAL 0x5 +#define MCE_MEM_BANK 0x4 +#define MCi_STATUS_MEM_VAL 0xb4000000001c0100UL +//#define MCi_STATUS_MEM_VAL 0xb600000000000100UL +#define MCi_MISC_MEM_VAL 0x0 + +/* AMD: L3 Cache Error */ +#define MCG_STATUS_L3_VAL 0x5 +#define MCE_L3_BANK 0x4 +#define MCi_STATUS_L3_VAL 0xbc000400001c010bULL +#define MC4_MISC0_VAL 0x0 +#define MC4_MISC1_VAL 0x0 +#define MC4_MISC2_L3_VAL 0xc008000000000003ULL + +/* AMD: CPU corruption error */ +#define MCG_STATUS_CPU_VAL 0x5 +#define MCE_CPU_BANK 0x2 +#define MCi_STATUS_CPU_VAL 0x9200000000000000ULL +//#define MCi_STATUS_CPU_VAL 0xb200000000000000ULL + +/* AMD: Error Types */ +#define AMD_MCE_MEM 0x20 /* memory error */ +#define AMD_MCE_L3 0x21 /* l3 cache */ #define LOGFILE stdout int dump; +int opt_exception; struct xen_mc_msrinject msr_inj; +int cpu_is_amd; +int cpu_is_intel; + static void Lprintf(const char *fmt, ...) { @@ -145,7 +181,7 @@ static int mca_cpuinfo(xc_interface *xc_ return 0; } -static int inject_cmci(xc_interface *xc_handle, int cpu_nr) +static int intel_inject_cmci(xc_interface *xc_handle) { struct xen_mc mc; int nr_cpus; @@ -191,6 +227,15 @@ static uint64_t bank_addr(int bank, int case MCi_type_MISC: addr = MSR_IA32_MC0_CTL + (bank * 4) + type; break; + case MC4_type_MISC1: + addr = 0xc0000408; + break; + case MC4_type_MISC2: + addr = 0xc0000409; + break; + case MC4_type_MISC3: + addr = 0xc000040a; + break; case MCi_type_CTL2: addr = MSR_IA32_MC0_CTL2 + bank; break; @@ -356,12 +401,11 @@ static int inject_mci_status(xc_interfac } static int inject_mci_misc(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, uint32_t misctype, + uint64_t bank, uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC + misctype, bank, val); } static int inject_mci_addr(xc_interface *xc_handle, @@ -373,10 +417,8 @@ static int inject_mci_addr(xc_interface MCi_type_ADDR, bank, val); } -static int inject_llc_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_llc_srao(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -390,7 +432,7 @@ static int inject_llc_srao(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -407,17 +449,17 @@ static int inject_llc_srao(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } return 0; } -static int inject_mem_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_mem_srao(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -431,7 +473,7 @@ static int inject_mem_srao(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -448,17 +490,17 @@ static int inject_mem_srao(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } return 0; } -static int inject_llc_ucna(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_llc_ucna(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -472,7 +514,7 @@ static int inject_llc_ucna(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -489,13 +531,108 @@ static int inject_llc_ucna(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_cmci(xc_handle, cpu_nr); + ret = intel_inject_cmci(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MCE error\n"); return 0; } +static int amd_inject_mem(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) +{ + uint64_t gpfn, mfn, haddr; + int ret = 0; + + ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + + ret = inject_mci_status(xc_handle, cpu_nr, + MCE_MEM_BANK, MCi_STATUS_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 0, + MCE_MEM_BANK, MCi_MISC_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + + gpfn = gaddr >> PAGE_SHIFT; + mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); + if (!mfn_valid(mfn)) + err(xc_handle, "The MFN is not valid\n"); + haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); + ret = inject_mci_addr(xc_handle, cpu_nr, MCE_MEM_BANK, haddr); + if ( ret ) + err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + + ret = flush_msr_inj(xc_handle); + if ( ret ) + err(xc_handle, "Failed to inject MSR\n"); + + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } + + return 0; +} + +static int amd_inject_l3(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) +{ + uint64_t gpfn, mfn, haddr; + int ret = 0; + + ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + + ret = inject_mci_status(xc_handle, cpu_nr, + MCE_L3_BANK, MCi_STATUS_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 0, + MCE_L3_BANK, MC4_MISC0_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC0 MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 1, + MCE_L3_BANK, MC4_MISC1_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC1 MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 2, + MCE_L3_BANK, MC4_MISC2_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC2 MSR\n"); + + gpfn = gaddr >> PAGE_SHIFT; + mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); + if (!mfn_valid(mfn)) + err(xc_handle, "The MFN is not valid\n"); + haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); + ret = inject_mci_addr(xc_handle, cpu_nr, MCE_L3_BANK, haddr); + if ( ret ) + err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + + ret = flush_msr_inj(xc_handle); + if ( ret ) + err(xc_handle, "Failed to inject MSR\n"); + + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } + + return 0; +} + + static long xs_get_dom_mem(int domid) { char path[128]; @@ -508,7 +645,7 @@ static long xs_get_dom_mem(int domid) if (!xs) return -1; - sprintf(path, "/local/domain/%d/memory/target", domid); + snprintf(path, sizeof(path), "/local/domain/%d/memory/target", domid); memstr = xs_read(xs, XBT_NULL, path, &plen); xs_daemon_close(xs); @@ -540,30 +677,80 @@ static void help(void) " -D, --dump dump addr info without error injection\n" " -c, --cpu=CPU_ID target CPU\n" " -d, --domain=DomID target domain, the default is Xen itself\n" + " -e raise MCE exception\n" " -h, --help print this page\n" " -p, --phyaddr physical address\n" " -t, --type=error error type\n" - " 0 : MCE_SRAO_MEM\n" - " 1 : MCE_SRAO_LLC\n" - " 2 : CMCI_UCNA_LLC\n" + " 0x0 : MCE_SRAO_MEM (Intel only)\n" + " 0x1 : MCE_SRAO_LLC (Intel only)\n" + " 0x2 : CMCI_UCNA_LLC (Intel only)\n" + " 0x20: DRAM error (AMD only)\n" + " 0x21: L3 cache error (AMD only)\n" "\n" ); } +static void cpuid(const unsigned int *input, unsigned int *regs) +{ + unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1]; + asm ( +#ifdef __i386__ + "push %%ebx; push %%edx\n\t" +#else + "push %%rbx; push %%rdx\n\t" +#endif + "cpuid\n\t" + "mov %%ebx,4(%4)\n\t" + "mov %%edx,12(%4)\n\t" +#ifdef __i386__ + "pop %%edx; pop %%ebx\n\t" +#else + "pop %%rdx; pop %%rbx\n\t" +#endif + : "=a" (regs[0]), "=c" (regs[2]) + : "0" (input[0]), "1" (count), "S" (regs) + : "memory" ); +} + +/* Get the manufacturer brand name of the host processor. */ +static void cpuid_brand_get(char *str) +{ + unsigned int input[2] = { 0, 0 }; + unsigned int regs[4]; + + cpuid(input, regs); + + *(uint32_t *)(str + 0) = regs[1]; + *(uint32_t *)(str + 4) = regs[3]; + *(uint32_t *)(str + 8) = regs[2]; + str[12] = '\0'; +} + int main(int argc, char *argv[]) { - int type = MCE_SRAO_MEM; + int type; int c, opt_index; uint32_t domid; xc_interface *xc_handle; - int cpu_nr; - int64_t gaddr, gpfn, mfn, haddr, max_gpa; + unsigned int cpu_nr; + uint64_t gaddr, gpfn, mfn, haddr, max_gpa; + char cpu_brand[13]; /* Default Value */ domid = DOMID_XEN; gaddr = 0x180020; cpu_nr = 0; + cpu_is_amd = cpu_is_intel = 0; + cpuid_brand_get(cpu_brand); + if (strstr(cpu_brand, "AMD")) + cpu_is_amd = 1; + else + cpu_is_intel = 1; + + if (cpu_is_intel) + type = INTEL_MCE_SRAO_MEM; + init_msr_inj(); xc_handle = xc_interface_open(0, 0, 0); if ( !xc_handle ) { @@ -571,8 +758,8 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - while ( 1 ) { - c = getopt_long(argc, argv, "c:Dd:t:hp:r", opts, &opt_index); + for (;;) { + c = getopt_long(argc, argv, "c:Dd:t:hp:r:e", opts, &opt_index); if ( c == -1 ) break; switch ( c ) { @@ -580,23 +767,26 @@ int main(int argc, char *argv[]) dump=1; break; case 'c': - cpu_nr = strtol(optarg, &optarg, 10); + cpu_nr = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input a digit parameter for CPU\n"); break; case 'd': - domid = strtol(optarg, &optarg, 10); + domid = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input a digit parameter for domain\n"); break; case 'p': - gaddr = strtol(optarg, &optarg, 0); + gaddr = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input correct page address\n"); break; case 't': type = strtol(optarg, NULL, 0); break; + case 'e': + opt_exception = 1; + break; case 'h': default: help(); @@ -627,16 +817,26 @@ int main(int argc, char *argv[]) goto out; } - switch ( type ) - { - case MCE_SRAO_MEM: - inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); + switch ( type ) { + case INTEL_MCE_SRAO_MEM: + if ( cpu_is_intel ) + intel_inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); break; - case MCE_SRAO_LLC: - inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); + case INTEL_MCE_SRAO_LLC: + if ( cpu_is_intel ) + intel_inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); break; - case CMCI_UCNA_LLC: - inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); + case INTEL_CMCI_UCNA_LLC: + if ( cpu_is_intel ) + intel_inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); + break; + case AMD_MCE_MEM: + if ( cpu_is_amd ) + amd_inject_mem(xc_handle, cpu_nr, domid, gaddr); + break; + case AMD_MCE_L3: + if ( cpu_is_amd ) + amd_inject_l3(xc_handle, cpu_nr, domid, gaddr); break; default: err(xc_handle, "Unsupported error type\n"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:26:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:26:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpb-00056H-J0; Mon, 12 Nov 2012 16:25:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwpa-000561-Gk for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:25:50 +0000 Received: from [193.109.254.147:64766] by server-6.bemta-14.messagelabs.com id B0/49-02788-D0321A05; Mon, 12 Nov 2012 16:25:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352737548!3673994!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16030 invoked from network); 12 Nov 2012 16:25:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:25:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755588" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:25:44 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:25:43 +0000 Message-ID: <1352737542.27833.296.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Jan Beulich Date: Mon, 12 Nov 2012 16:25:42 +0000 In-Reply-To: <5081887502000078000A2A51@nat28.tlf.novell.com> References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Jinsong , Haicheng Li , Christoph Egger , "Keir \(Xen.org\)" , XudongHao , YunhongJiang , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: > >>> On 19.10.12 at 17:01, Ian Jackson wrote: > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD"): > >> >>> On 19.10.12 at 15:10, Christoph Egger wrote: > >> > Ping? > >> > >> I'm afraid it's not really clear who should commit this - it's tools > >> side code, so IanJ or IanC would normally be the ones, but otoh > >> it's code requiring low level hardware knowledge to review the > >> patch, so both of them might want to rather not do the review. > >> In the past it was usually Keir who eventually committed such > >> patches, but I don't know whether he put this on his to-look-at- > >> and-eventually-commit list. > > > > My view is that I would like an ack from someone who understands > > what's going on ... > > Which would ideally be those who introduced the code, i.e. > Intel folks if I'm not mistaken... Lets CC some of them then. Intel folks -- any opinion on the patch below from Christoph? 8<---------------- # User Christoph Egger # Date 1349437062 -7200 xen mceinj: support AMD. Signed-off-by: Christoph Egger diff -r 21704bc429b4 -r 1a3eea784e09 tools/tests/mce-test/tools/xen-mceinj.c --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -1,6 +1,7 @@ /* * xen-mceinj.c: utilities to inject fake MCE for x86. * Copyright (c) 2010, Intel Corporation. + * Copyright (c) 2012, AMD Cooperation Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -18,6 +19,7 @@ * Authors: Yunhong Jiang * Haicheng Li * Xudong Hao + * Christoph Egger */ @@ -44,11 +46,14 @@ #define MCi_type_STATUS 0x1 #define MCi_type_ADDR 0x2 #define MCi_type_MISC 0x3 -#define MCi_type_CTL2 0x4 +#define MC4_type_MISC1 0x4 +#define MC4_type_MISC2 0x5 +#define MC4_type_MISC3 0x6 +#define MCi_type_CTL2 0x7 #define INVALID_MSR ~0UL -/* Intel MSRs */ +/* X86 machine check MSRs */ #define MSR_IA32_MCG_CAP 0x00000179 #define MSR_IA32_MCG_STATUS 0x0000017a #define MSR_IA32_MCG_CTL 0x0000017b @@ -56,35 +61,66 @@ #define MSR_IA32_MC0_STATUS 0x00000401 #define MSR_IA32_MC0_ADDR 0x00000402 #define MSR_IA32_MC0_MISC 0x00000403 + +/* Intel MSRs */ #define MSR_IA32_MC0_CTL2 0x00000280 -/* LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ +/* Intel: LLC (Last Level Cache) EWB (Explicit Write Back) SRAO MCE */ #define MCG_STATUS_SRAO_LLC_VAL 0x5 #define MCE_SRAO_LLC_BANK 0x7 #define MCi_STATUS_SRAO_LLC_VAL 0xBD2000008000017AUL #define MCi_MISC_SRAO_LLC_VAL 0x86UL -/* Memory Patrol Scrub SRAO MCE */ +/* Intel: Memory Patrol Scrub SRAO MCE */ #define MCG_STATUS_SRAO_MEM_VAL 0x5 #define MCE_SRAO_MEM_BANK 0x8 #define MCi_STATUS_SRAO_MEM_VAL 0xBD000000004000CFUL #define MCi_MISC_SRAO_MEM_VAL 0x86UL -/* LLC EWB UCNA Error */ +/* Intel: LLC EWB UCNA Error */ #define MCG_STATUS_UCNA_LLC_VAL 0x0 #define CMCI_UCNA_LLC_BANK 0x9 #define MCi_STATUS_UCNA_LLC_VAL 0xBC20000080000136UL #define MCi_MISC_UCNA_LLC_VAL 0x86UL -/* Error Types */ -#define MCE_SRAO_MEM 0x0 -#define MCE_SRAO_LLC 0x1 -#define CMCI_UCNA_LLC 0x2 +/* Intel: Error Types */ +#define INTEL_MCE_SRAO_MEM 0x0 +#define INTEL_MCE_SRAO_LLC 0x1 +#define INTEL_CMCI_UCNA_LLC 0x2 + +/* AMD: Memory Error */ +#define MCG_STATUS_MEM_VAL 0x5 +#define MCE_MEM_BANK 0x4 +#define MCi_STATUS_MEM_VAL 0xb4000000001c0100UL +//#define MCi_STATUS_MEM_VAL 0xb600000000000100UL +#define MCi_MISC_MEM_VAL 0x0 + +/* AMD: L3 Cache Error */ +#define MCG_STATUS_L3_VAL 0x5 +#define MCE_L3_BANK 0x4 +#define MCi_STATUS_L3_VAL 0xbc000400001c010bULL +#define MC4_MISC0_VAL 0x0 +#define MC4_MISC1_VAL 0x0 +#define MC4_MISC2_L3_VAL 0xc008000000000003ULL + +/* AMD: CPU corruption error */ +#define MCG_STATUS_CPU_VAL 0x5 +#define MCE_CPU_BANK 0x2 +#define MCi_STATUS_CPU_VAL 0x9200000000000000ULL +//#define MCi_STATUS_CPU_VAL 0xb200000000000000ULL + +/* AMD: Error Types */ +#define AMD_MCE_MEM 0x20 /* memory error */ +#define AMD_MCE_L3 0x21 /* l3 cache */ #define LOGFILE stdout int dump; +int opt_exception; struct xen_mc_msrinject msr_inj; +int cpu_is_amd; +int cpu_is_intel; + static void Lprintf(const char *fmt, ...) { @@ -145,7 +181,7 @@ static int mca_cpuinfo(xc_interface *xc_ return 0; } -static int inject_cmci(xc_interface *xc_handle, int cpu_nr) +static int intel_inject_cmci(xc_interface *xc_handle) { struct xen_mc mc; int nr_cpus; @@ -191,6 +227,15 @@ static uint64_t bank_addr(int bank, int case MCi_type_MISC: addr = MSR_IA32_MC0_CTL + (bank * 4) + type; break; + case MC4_type_MISC1: + addr = 0xc0000408; + break; + case MC4_type_MISC2: + addr = 0xc0000409; + break; + case MC4_type_MISC3: + addr = 0xc000040a; + break; case MCi_type_CTL2: addr = MSR_IA32_MC0_CTL2 + bank; break; @@ -356,12 +401,11 @@ static int inject_mci_status(xc_interfac } static int inject_mci_misc(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, uint32_t misctype, + uint64_t bank, uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC + misctype, bank, val); } static int inject_mci_addr(xc_interface *xc_handle, @@ -373,10 +417,8 @@ static int inject_mci_addr(xc_interface MCi_type_ADDR, bank, val); } -static int inject_llc_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_llc_srao(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -390,7 +432,7 @@ static int inject_llc_srao(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, MCE_SRAO_LLC_BANK, MCi_MISC_SRAO_LLC_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -407,17 +449,17 @@ static int inject_llc_srao(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } return 0; } -static int inject_mem_srao(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_mem_srao(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -431,7 +473,7 @@ static int inject_mem_srao(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, MCE_SRAO_MEM_BANK, MCi_MISC_SRAO_MEM_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -448,17 +490,17 @@ static int inject_mem_srao(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_mce(xc_handle, cpu_nr); - if ( ret ) - err(xc_handle, "Failed to inject MCE error\n"); + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } return 0; } -static int inject_llc_ucna(xc_interface *xc_handle, - uint32_t cpu_nr, - uint32_t domain, - uint64_t gaddr) +static int intel_inject_llc_ucna(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { uint64_t gpfn, mfn, haddr; int ret = 0; @@ -472,7 +514,7 @@ static int inject_llc_ucna(xc_interface if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); - ret = inject_mci_misc(xc_handle, cpu_nr, + ret = inject_mci_misc(xc_handle, cpu_nr, 0, CMCI_UCNA_LLC_BANK, MCi_MISC_UCNA_LLC_VAL); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR\n"); @@ -489,13 +531,108 @@ static int inject_llc_ucna(xc_interface ret = flush_msr_inj(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MSR\n"); - ret = inject_cmci(xc_handle, cpu_nr); + ret = intel_inject_cmci(xc_handle); if ( ret ) err(xc_handle, "Failed to inject MCE error\n"); return 0; } +static int amd_inject_mem(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) +{ + uint64_t gpfn, mfn, haddr; + int ret = 0; + + ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + + ret = inject_mci_status(xc_handle, cpu_nr, + MCE_MEM_BANK, MCi_STATUS_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 0, + MCE_MEM_BANK, MCi_MISC_MEM_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_MISC MSR\n"); + + gpfn = gaddr >> PAGE_SHIFT; + mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); + if (!mfn_valid(mfn)) + err(xc_handle, "The MFN is not valid\n"); + haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); + ret = inject_mci_addr(xc_handle, cpu_nr, MCE_MEM_BANK, haddr); + if ( ret ) + err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + + ret = flush_msr_inj(xc_handle); + if ( ret ) + err(xc_handle, "Failed to inject MSR\n"); + + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } + + return 0; +} + +static int amd_inject_l3(xc_interface *xc_handle, + uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) +{ + uint64_t gpfn, mfn, haddr; + int ret = 0; + + ret = inject_mcg_status(xc_handle, cpu_nr, MCG_STATUS_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCG_STATUS MSR\n"); + + ret = inject_mci_status(xc_handle, cpu_nr, + MCE_L3_BANK, MCi_STATUS_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MCi_STATUS MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 0, + MCE_L3_BANK, MC4_MISC0_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC0 MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 1, + MCE_L3_BANK, MC4_MISC1_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC1 MSR\n"); + + ret = inject_mci_misc(xc_handle, cpu_nr, 2, + MCE_L3_BANK, MC4_MISC2_L3_VAL); + if ( ret ) + err(xc_handle, "Failed to inject MC4_MISC2 MSR\n"); + + gpfn = gaddr >> PAGE_SHIFT; + mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); + if (!mfn_valid(mfn)) + err(xc_handle, "The MFN is not valid\n"); + haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); + ret = inject_mci_addr(xc_handle, cpu_nr, MCE_L3_BANK, haddr); + if ( ret ) + err(xc_handle, "Failed to inject MCi_ADDR MSR\n"); + + ret = flush_msr_inj(xc_handle); + if ( ret ) + err(xc_handle, "Failed to inject MSR\n"); + + if (opt_exception) { + ret = inject_mce(xc_handle, cpu_nr); + if ( ret ) + err(xc_handle, "Failed to inject MCE error\n"); + } + + return 0; +} + + static long xs_get_dom_mem(int domid) { char path[128]; @@ -508,7 +645,7 @@ static long xs_get_dom_mem(int domid) if (!xs) return -1; - sprintf(path, "/local/domain/%d/memory/target", domid); + snprintf(path, sizeof(path), "/local/domain/%d/memory/target", domid); memstr = xs_read(xs, XBT_NULL, path, &plen); xs_daemon_close(xs); @@ -540,30 +677,80 @@ static void help(void) " -D, --dump dump addr info without error injection\n" " -c, --cpu=CPU_ID target CPU\n" " -d, --domain=DomID target domain, the default is Xen itself\n" + " -e raise MCE exception\n" " -h, --help print this page\n" " -p, --phyaddr physical address\n" " -t, --type=error error type\n" - " 0 : MCE_SRAO_MEM\n" - " 1 : MCE_SRAO_LLC\n" - " 2 : CMCI_UCNA_LLC\n" + " 0x0 : MCE_SRAO_MEM (Intel only)\n" + " 0x1 : MCE_SRAO_LLC (Intel only)\n" + " 0x2 : CMCI_UCNA_LLC (Intel only)\n" + " 0x20: DRAM error (AMD only)\n" + " 0x21: L3 cache error (AMD only)\n" "\n" ); } +static void cpuid(const unsigned int *input, unsigned int *regs) +{ + unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1]; + asm ( +#ifdef __i386__ + "push %%ebx; push %%edx\n\t" +#else + "push %%rbx; push %%rdx\n\t" +#endif + "cpuid\n\t" + "mov %%ebx,4(%4)\n\t" + "mov %%edx,12(%4)\n\t" +#ifdef __i386__ + "pop %%edx; pop %%ebx\n\t" +#else + "pop %%rdx; pop %%rbx\n\t" +#endif + : "=a" (regs[0]), "=c" (regs[2]) + : "0" (input[0]), "1" (count), "S" (regs) + : "memory" ); +} + +/* Get the manufacturer brand name of the host processor. */ +static void cpuid_brand_get(char *str) +{ + unsigned int input[2] = { 0, 0 }; + unsigned int regs[4]; + + cpuid(input, regs); + + *(uint32_t *)(str + 0) = regs[1]; + *(uint32_t *)(str + 4) = regs[3]; + *(uint32_t *)(str + 8) = regs[2]; + str[12] = '\0'; +} + int main(int argc, char *argv[]) { - int type = MCE_SRAO_MEM; + int type; int c, opt_index; uint32_t domid; xc_interface *xc_handle; - int cpu_nr; - int64_t gaddr, gpfn, mfn, haddr, max_gpa; + unsigned int cpu_nr; + uint64_t gaddr, gpfn, mfn, haddr, max_gpa; + char cpu_brand[13]; /* Default Value */ domid = DOMID_XEN; gaddr = 0x180020; cpu_nr = 0; + cpu_is_amd = cpu_is_intel = 0; + cpuid_brand_get(cpu_brand); + if (strstr(cpu_brand, "AMD")) + cpu_is_amd = 1; + else + cpu_is_intel = 1; + + if (cpu_is_intel) + type = INTEL_MCE_SRAO_MEM; + init_msr_inj(); xc_handle = xc_interface_open(0, 0, 0); if ( !xc_handle ) { @@ -571,8 +758,8 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - while ( 1 ) { - c = getopt_long(argc, argv, "c:Dd:t:hp:r", opts, &opt_index); + for (;;) { + c = getopt_long(argc, argv, "c:Dd:t:hp:r:e", opts, &opt_index); if ( c == -1 ) break; switch ( c ) { @@ -580,23 +767,26 @@ int main(int argc, char *argv[]) dump=1; break; case 'c': - cpu_nr = strtol(optarg, &optarg, 10); + cpu_nr = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input a digit parameter for CPU\n"); break; case 'd': - domid = strtol(optarg, &optarg, 10); + domid = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input a digit parameter for domain\n"); break; case 'p': - gaddr = strtol(optarg, &optarg, 0); + gaddr = strtoul(optarg, &optarg, 0); if ( strlen(optarg) != 0 ) err(xc_handle, "Please input correct page address\n"); break; case 't': type = strtol(optarg, NULL, 0); break; + case 'e': + opt_exception = 1; + break; case 'h': default: help(); @@ -627,16 +817,26 @@ int main(int argc, char *argv[]) goto out; } - switch ( type ) - { - case MCE_SRAO_MEM: - inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); + switch ( type ) { + case INTEL_MCE_SRAO_MEM: + if ( cpu_is_intel ) + intel_inject_mem_srao(xc_handle, cpu_nr, domid, gaddr); break; - case MCE_SRAO_LLC: - inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); + case INTEL_MCE_SRAO_LLC: + if ( cpu_is_intel ) + intel_inject_llc_srao(xc_handle, cpu_nr, domid, gaddr); break; - case CMCI_UCNA_LLC: - inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); + case INTEL_CMCI_UCNA_LLC: + if ( cpu_is_intel ) + intel_inject_llc_ucna(xc_handle, cpu_nr, domid, gaddr); + break; + case AMD_MCE_MEM: + if ( cpu_is_amd ) + amd_inject_mem(xc_handle, cpu_nr, domid, gaddr); + break; + case AMD_MCE_L3: + if ( cpu_is_amd ) + amd_inject_l3(xc_handle, cpu_nr, domid, gaddr); break; default: err(xc_handle, "Unsupported error type\n"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:27:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:27:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwqm-0005Hb-9U; Mon, 12 Nov 2012 16:27:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwqk-0005HQ-Qb for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:27:02 +0000 Received: from [85.158.143.99:48611] by server-3.bemta-4.messagelabs.com id 7A/67-06841-65321A05; Mon, 12 Nov 2012 16:27:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352737621!18683743!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27450 invoked from network); 12 Nov 2012 16:27:01 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:27:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755630" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:27:00 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:27:00 +0000 Message-ID: <1352737619.27833.297.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Dario Faggioli Date: Mon, 12 Nov 2012 16:26:59 +0000 In-Reply-To: <4e5e196ea494ba7c4aaf.1350657295@Solace> References: <4e5e196ea494ba7c4aaf.1350657295@Solace> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Andre Przywara , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2 of 3 v2] libxl, xl: user can ask for min and max nodes to use during placement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 15:34 +0100, Dario Faggioli wrote: > @@ -219,6 +219,11 @@ int libxl__domain_build_info_setdefault( > > libxl_defbool_setdefault(&b_info->numa_placement, true); > > + if (!b_info->min_nodes) > + b_info->min_nodes = 0; > + if (!b_info->max_nodes) > + b_info->max_nodes = 0; Aren't both of these if statements tautologous? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:27:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:27:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwqm-0005Hb-9U; Mon, 12 Nov 2012 16:27:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwqk-0005HQ-Qb for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:27:02 +0000 Received: from [85.158.143.99:48611] by server-3.bemta-4.messagelabs.com id 7A/67-06841-65321A05; Mon, 12 Nov 2012 16:27:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352737621!18683743!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27450 invoked from network); 12 Nov 2012 16:27:01 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:27:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15755630" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:27:00 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:27:00 +0000 Message-ID: <1352737619.27833.297.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Dario Faggioli Date: Mon, 12 Nov 2012 16:26:59 +0000 In-Reply-To: <4e5e196ea494ba7c4aaf.1350657295@Solace> References: <4e5e196ea494ba7c4aaf.1350657295@Solace> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Andre Przywara , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2 of 3 v2] libxl, xl: user can ask for min and max nodes to use during placement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 15:34 +0100, Dario Faggioli wrote: > @@ -219,6 +219,11 @@ int libxl__domain_build_info_setdefault( > > libxl_defbool_setdefault(&b_info->numa_placement, true); > > + if (!b_info->min_nodes) > + b_info->min_nodes = 0; > + if (!b_info->max_nodes) > + b_info->max_nodes = 0; Aren't both of these if statements tautologous? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:31:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:31:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwuL-0005ax-U9; Mon, 12 Nov 2012 16:30:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwuJ-0005al-MJ for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:30:43 +0000 Received: from [85.158.139.83:16291] by server-10.bemta-5.messagelabs.com id 4D/A9-09257-23421A05; Mon, 12 Nov 2012 16:30:42 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352737840!25964182!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31660 invoked from network); 12 Nov 2012 16:30:41 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:30:41 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGUbVI030667 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:30:38 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGUbJk001392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:30:37 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGUbco006450; Mon, 12 Nov 2012 10:30:37 -0600 MIME-Version: 1.0 Message-ID: <3f722899-a618-4388-8a09-e68fc50c1a70@default> Date: Mon, 12 Nov 2012 08:30:35 -0800 (PST) From: Dan Magenheimer To: Matthew Daley , xen-devel@lists.xen.org References: <<1352690242-28761-1-git-send-email-mattjd@gmail.com>> In-Reply-To: <<1352690242-28761-1-git-send-email-mattjd@gmail.com>> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Dan Magenheimer Subject: Re: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Matthew Daley [mailto:mattjd@gmail.com] > Subject: [PATCH] tmem: Prevent NULL dereference on error case > > If the client / pool IDs given to tmemc_save_get_next_page are invalid, > the calculation of pagesize will dereference NULL. > > Fix this by moving the calculation below the appropriate NULL check. > > Signed-off-by: Matthew Daley Good catch! Did you see this on an actual save/restore or just by inspection? This should only happen as a result of a buggy toolstack so I'm wondering if fixing this hides a toolstack bug. In either case, this should be fixed in the hypervisor. Acked-by: Dan Magenheimer > diff --git a/xen/common/tmem.c b/xen/common/tmem.c > index 1280537..ec59009 100644 > --- a/xen/common/tmem.c > +++ b/xen/common/tmem.c > @@ -2436,10 +2436,13 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, > OID oid; > int ret = 0; > struct tmem_handle h; > - unsigned int pagesize = 1 << (pool->pageshift+12); > + unsigned int pagesize; > > if ( pool == NULL || is_ephemeral(pool) ) > return -1; > + > + pagesize = 1 << (pool->pageshift + 12); > + > if ( bufsize < pagesize + sizeof(struct tmem_handle) ) > return -ENOMEM; > > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:31:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:31:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwuL-0005ax-U9; Mon, 12 Nov 2012 16:30:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwuJ-0005al-MJ for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:30:43 +0000 Received: from [85.158.139.83:16291] by server-10.bemta-5.messagelabs.com id 4D/A9-09257-23421A05; Mon, 12 Nov 2012 16:30:42 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-182.messagelabs.com!1352737840!25964182!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31660 invoked from network); 12 Nov 2012 16:30:41 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:30:41 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGUbVI030667 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:30:38 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGUbJk001392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:30:37 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGUbco006450; Mon, 12 Nov 2012 10:30:37 -0600 MIME-Version: 1.0 Message-ID: <3f722899-a618-4388-8a09-e68fc50c1a70@default> Date: Mon, 12 Nov 2012 08:30:35 -0800 (PST) From: Dan Magenheimer To: Matthew Daley , xen-devel@lists.xen.org References: <<1352690242-28761-1-git-send-email-mattjd@gmail.com>> In-Reply-To: <<1352690242-28761-1-git-send-email-mattjd@gmail.com>> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Dan Magenheimer Subject: Re: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Matthew Daley [mailto:mattjd@gmail.com] > Subject: [PATCH] tmem: Prevent NULL dereference on error case > > If the client / pool IDs given to tmemc_save_get_next_page are invalid, > the calculation of pagesize will dereference NULL. > > Fix this by moving the calculation below the appropriate NULL check. > > Signed-off-by: Matthew Daley Good catch! Did you see this on an actual save/restore or just by inspection? This should only happen as a result of a buggy toolstack so I'm wondering if fixing this hides a toolstack bug. In either case, this should be fixed in the hypervisor. Acked-by: Dan Magenheimer > diff --git a/xen/common/tmem.c b/xen/common/tmem.c > index 1280537..ec59009 100644 > --- a/xen/common/tmem.c > +++ b/xen/common/tmem.c > @@ -2436,10 +2436,13 @@ static NOINLINE int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, > OID oid; > int ret = 0; > struct tmem_handle h; > - unsigned int pagesize = 1 << (pool->pageshift+12); > + unsigned int pagesize; > > if ( pool == NULL || is_ephemeral(pool) ) > return -1; > + > + pagesize = 1 << (pool->pageshift + 12); > + > if ( bufsize < pagesize + sizeof(struct tmem_handle) ) > return -ENOMEM; > > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:32:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:32:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwv4-0005iM-ES; Mon, 12 Nov 2012 16:31:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwv2-0005hY-1c for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:31:29 +0000 Received: from [85.158.137.99:26325] by server-16.bemta-3.messagelabs.com id 3B/08-07461-B5421A05; Mon, 12 Nov 2012 16:31:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352737880!15645031!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27379 invoked from network); 12 Nov 2012 16:31:22 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:31:22 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGV1DK031267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:31:03 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGUxRu011184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:30:59 GMT Received: from abhmt115.oracle.com (abhmt115.oracle.com [141.146.116.67]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGUu6b011838; Mon, 12 Nov 2012 10:30:56 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 08:30:55 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 839FC4037A; Mon, 12 Nov 2012 11:30:52 -0500 (EST) Date: Mon, 12 Nov 2012 11:30:52 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121112163052.GA9575@phenom.dumpdata.com> References: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, tpmdd@selhorst.net, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net, key@linux.vnet.ibm.com, tpmdd@sirrix.com Subject: Re: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 09:29:58AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. This > driver is designed be used with the mini-os tpmback driver > in Xen as part of the new mini-os virtual tpm subsystem. > See docs/misc/vtpm.txt in Xen and the xen-devel mailing list > for details. I didn't look in details but off the bat - you are missing the Documentation/../sysfs file. I still think you should include the full vtpm.txt in this patch description and refer at the end to the docs/misc/vtpm.txt in Xen as the source for the up-to-date version. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 11 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 10 + > drivers/char/tpm/xen-tpmfront_if.c | 688 ++++++++++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront_vtpm.c | 543 +++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront_vtpm.h | 55 +++ > include/xen/interface/io/tpmif.h | 65 ++++ > 7 files changed, 1374 insertions(+) > create mode 100644 drivers/char/tpm/xen-tpmfront_if.c > create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.c > create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.h > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..23d272f 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,15 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. See > + the manpages for xl, xl.conf, and docs/misc/vtpm.txt in > + the Xen source repository for more details. > + To compile this driver as a module, choose M here; the module > + will be called xen-tpmfront. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..0161f05 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o > +xen-tpmfront-y = xen-tpmfront_if.o xen-tpmfront_vtpm.o > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..b575892 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -328,6 +328,16 @@ extern int tpm_pm_resume(struct device *); > extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, > wait_queue_head_t *); > > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->vendor.data; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->vendor.data = priv; > +} > + > #ifdef CONFIG_ACPI > extern int tpm_add_ppi(struct kobject *); > extern void tpm_remove_ppi(struct kobject *); > diff --git a/drivers/char/tpm/xen-tpmfront_if.c b/drivers/char/tpm/xen-tpmfront_if.c > new file mode 100644 > index 0000000..ba7fad8 > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_if.c > @@ -0,0 +1,688 @@ > +/* > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from drivers/xen/netfront/netfront.c > + * > + * Copyright (c) 2002-2004, K A Fraser > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License version 2 > + * as published by the Free Software Foundation; or, when distributed > + * separately from the Linux kernel or incorporated into other > + * software packages, subject to the following license: > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this source file (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, copy, modify, > + * merge, publish, distribute, sublicense, and/or sell copies of the Software, > + * and to permit persons to whom the Software is furnished to do so, subject to > + * the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "xen-tpmfront_vtpm.h" > + > +#define GRANT_INVALID_REF 0 > + > +/* local structures */ > +struct tpm_private { > + struct tpm_chip *chip; > + > + struct tpmif_tx_interface *tx; > + atomic_t refcnt; > + unsigned int evtchn; > + u8 is_connected; > + u8 is_suspended; > + > + spinlock_t tx_lock; > + > + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; > + > + atomic_t tx_busy; > + void *tx_remember; > + > + domid_t backend_id; > + wait_queue_head_t wait_q; > + > + struct xenbus_device *dev; > + int ring_ref; > +}; > + > +struct tx_buffer { > + unsigned int size; /* available space in data */ > + unsigned int len; /* used space in data */ > + unsigned char *data; /* pointer to a page */ > +}; > + > + > +/* locally visible variables */ > +static grant_ref_t gref_head; > +static struct tpm_private *my_priv; > + > +/* local function prototypes */ > +static irqreturn_t tpmif_int(int irq, > + void *tpm_priv); > +static void tpmif_rx_action(unsigned long unused); > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid); > +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); > +static void tpmif_free_tx_buffers(struct tpm_private *tp); > +static void tpmif_set_connected_state(struct tpm_private *tp, > + u8 newstate); > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int userbuffer, > + void *remember); > +static void destroy_tpmring(struct tpm_private *tp); > + > +static inline int > +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, > + int isuserbuffer) > +{ > + int copied = len; > + > + if (len > txb->size) > + copied = txb->size; > + if (isuserbuffer) { > + if (copy_from_user(txb->data, src, copied)) > + return -EFAULT; > + } else { > + memcpy(txb->data, src, copied); > + } > + txb->len = len; > + return copied; > +} > + > +static inline struct tx_buffer *tx_buffer_alloc(void) > +{ > + struct tx_buffer *txb; > + > + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); > + if (!txb) > + return NULL; > + > + txb->len = 0; > + txb->size = PAGE_SIZE; > + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); > + if (txb->data == NULL) { > + kfree(txb); > + txb = NULL; > + } > + > + return txb; > +} > + > + > +static inline void tx_buffer_free(struct tx_buffer *txb) > +{ > + if (txb) { > + free_page((long)txb->data); > + kfree(txb); > + } > +} > + > +/************************************************************** > + Utility function for the tpm_private structure > + **************************************************************/ > +static void tpm_private_init(struct tpm_private *tp) > +{ > + spin_lock_init(&tp->tx_lock); > + init_waitqueue_head(&tp->wait_q); > + atomic_set(&tp->refcnt, 1); > +} > + > +static void tpm_private_put(void) > +{ > + if (!atomic_dec_and_test(&my_priv->refcnt)) > + return; > + > + tpmif_free_tx_buffers(my_priv); > + kfree(my_priv); > + my_priv = NULL; > +} > + > +static struct tpm_private *tpm_private_get(void) > +{ > + int err; > + > + if (my_priv) { > + atomic_inc(&my_priv->refcnt); > + return my_priv; > + } > + > + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); > + if (!my_priv) > + return NULL; > + > + tpm_private_init(my_priv); > + err = tpmif_allocate_tx_buffers(my_priv); > + if (err < 0) > + tpm_private_put(); > + > + return my_priv; > +} > + > +/************************************************************** > + > + The interface to let the tpm plugin register its callback > + function and send data to another partition using this module > + > + **************************************************************/ > + > +static DEFINE_MUTEX(suspend_lock); > +/* > + * Send data via this module by calling this function > + */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr) > +{ > + int sent; > + > + mutex_lock(&suspend_lock); > + sent = tpm_xmit(tp, buf, count, 0, ptr); > + mutex_unlock(&suspend_lock); > + > + return sent; > +} > + > +/************************************************************** > + XENBUS support code > + **************************************************************/ > + > +static int setup_tpmring(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + struct tpmif_tx_interface *sring; > + int err; > + > + tp->ring_ref = GRANT_INVALID_REF; > + > + sring = (void *)__get_free_page(GFP_KERNEL); > + if (!sring) { > + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); > + return -ENOMEM; > + } > + tp->tx = sring; > + > + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); > + if (err < 0) { > + free_page((unsigned long)sring); > + tp->tx = NULL; > + xenbus_dev_fatal(dev, err, "allocating grant reference"); > + goto fail; > + } > + tp->ring_ref = err; > + > + err = tpmif_connect(dev, tp, dev->otherend_id); > + if (err) > + goto fail; > + > + return 0; > +fail: > + destroy_tpmring(tp); > + return err; > +} > + > + > +static void destroy_tpmring(struct tpm_private *tp) > +{ > + tpmif_set_connected_state(tp, 0); > + > + if (tp->ring_ref != GRANT_INVALID_REF) { > + gnttab_end_foreign_access(tp->ring_ref, > + 0, (unsigned long)tp->tx); > + tp->ring_ref = GRANT_INVALID_REF; > + tp->tx = NULL; > + } > + > + if (tp->evtchn) > + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); > + > + tp->evtchn = GRANT_INVALID_REF; > +} > + > + > +static int talk_to_backend(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + const char *message = NULL; > + int err; > + struct xenbus_transaction xbt; > + > + err = setup_tpmring(dev, tp); > + if (err) { > + xenbus_dev_fatal(dev, err, "setting up ring"); > + goto out; > + } > + > +again: > + err = xenbus_transaction_start(&xbt); > + if (err) { > + xenbus_dev_fatal(dev, err, "starting transaction"); > + goto destroy_tpmring; > + } > + > + err = xenbus_printf(xbt, dev->nodename, > + "ring-ref", "%u", tp->ring_ref); > + if (err) { > + message = "writing ring-ref"; > + goto abort_transaction; > + } > + > + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", > + tp->evtchn); > + if (err) { > + message = "writing event-channel"; > + goto abort_transaction; > + } > + > + err = xenbus_transaction_end(xbt, 0); > + if (err == -EAGAIN) > + goto again; > + if (err) { > + xenbus_dev_fatal(dev, err, "completing transaction"); > + goto destroy_tpmring; > + } > + > + xenbus_switch_state(dev, XenbusStateConnected); > + > + return 0; > + > +abort_transaction: > + xenbus_transaction_end(xbt, 1); > + if (message) > + xenbus_dev_error(dev, err, "%s", message); > +destroy_tpmring: > + destroy_tpmring(tp); > +out: > + return err; > +} > + > +/** > + * Callback received when the backend's state changes. > + */ > +static void backend_changed(struct xenbus_device *dev, > + enum xenbus_state backend_state) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + > + switch (backend_state) { > + case XenbusStateInitialising: > + case XenbusStateInitWait: > + case XenbusStateInitialised: > + case XenbusStateReconfiguring: > + case XenbusStateReconfigured: > + case XenbusStateUnknown: > + break; > + > + case XenbusStateConnected: > + tpmif_set_connected_state(tp, 1); > + break; > + > + case XenbusStateClosing: > + tpmif_set_connected_state(tp, 0); > + xenbus_frontend_closed(dev); > + break; > + > + case XenbusStateClosed: > + tpmif_set_connected_state(tp, 0); > + if (tp->is_suspended == 0) > + device_unregister(&dev->dev); > + xenbus_frontend_closed(dev); > + break; > + } > +} > + > +static int tpmfront_probe(struct xenbus_device *dev, > + const struct xenbus_device_id *id) > +{ > + int err; > + int handle; > + struct tpm_private *tp = tpm_private_get(); > + > + if (!tp) > + return -ENOMEM; > + > + tp->chip = init_vtpm(&dev->dev, tp); > + if (IS_ERR(tp->chip)) > + return PTR_ERR(tp->chip); > + > + err = xenbus_scanf(XBT_NIL, dev->nodename, > + "handle", "%i", &handle); > + if (XENBUS_EXIST_ERR(err)) > + return err; > + > + if (err < 0) { > + xenbus_dev_fatal(dev, err, "reading virtual-device"); > + return err; > + } > + > + tp->dev = dev; > + > + err = talk_to_backend(dev, tp); > + if (err) { > + tpm_private_put(); > + return err; > + } > + > + return 0; > +} > + > + > +static int __devexit tpmfront_remove(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + cleanup_vtpm(&dev->dev); > + return 0; > +} > + > +static int tpmfront_suspend(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + u32 ctr; > + > + /* Take the lock, preventing any application from sending. */ > + mutex_lock(&suspend_lock); > + tp->is_suspended = 1; > + > + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { > + /* Wait for a request to be responded to. */ > + interruptible_sleep_on_timeout(&tp->wait_q, 100); > + } > + > + return 0; > +} > + > +static int tpmfront_suspend_finish(struct tpm_private *tp) > +{ > + tp->is_suspended = 0; > + /* Allow applications to send again. */ > + mutex_unlock(&suspend_lock); > + return 0; > +} > + > +static int tpmfront_resume(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + return talk_to_backend(dev, tp); > +} > + > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid) > +{ > + int err; > + > + tp->backend_id = domid; > + tp->evtchn = GRANT_INVALID_REF; > + > + err = xenbus_alloc_evtchn(dev, &tp->evtchn); > + if (err) > + return err; > + > + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, > + 0, "tpmif", tp); > + if (err <= 0) > + return err; > + > + return 0; > +} > + > +static const struct xenbus_device_id tpmfront_ids[] = { > + { "vtpm" }, > + { "" } > +}; > +MODULE_ALIAS("xen:vtpm"); > + > +static DEFINE_XENBUS_DRIVER(tpmfront, , > + .probe = tpmfront_probe, > + .remove = __devexit_p(tpmfront_remove), > + .resume = tpmfront_resume, > + .otherend_changed = backend_changed, > + .suspend = tpmfront_suspend, > + ); > + > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { > + tp->tx_buffers[i] = tx_buffer_alloc(); > + if (!tp->tx_buffers[i]) { > + tpmif_free_tx_buffers(tp); > + return -ENOMEM; > + } > + } > + return 0; > +} > + > +static void tpmif_free_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) > + tx_buffer_free(tp->tx_buffers[i]); > +} > + > +static void tpmif_rx_action(unsigned long priv) > +{ > + struct tpm_private *tp = (struct tpm_private *)priv; > + int i = 0; > + unsigned int received; > + unsigned int offset = 0; > + u8 *buffer; > + struct tpmif_tx_request *tx = &tp->tx->ring[i].req; > + > + atomic_set(&tp->tx_busy, 0); > + wake_up_interruptible(&tp->wait_q); > + > + received = tx->size; > + > + buffer = kmalloc(received, GFP_ATOMIC); > + if (!buffer) > + return; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + struct tpmif_tx_request *tx; > + unsigned int tocopy; > + > + tx = &tp->tx->ring[i].req; > + tocopy = tx->size; > + if (tocopy > PAGE_SIZE) > + tocopy = PAGE_SIZE; > + > + memcpy(&buffer[offset], txb->data, tocopy); > + > + gnttab_release_grant_reference(&gref_head, tx->ref); > + > + offset += tocopy; > + } > + > + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); > + kfree(buffer); > +} > + > + > +static irqreturn_t tpmif_int(int irq, void *tpm_priv) > +{ > + struct tpm_private *tp = tpm_priv; > + unsigned long flags; > + > + spin_lock_irqsave(&tp->tx_lock, flags); > + tpmif_rx_tasklet.data = (unsigned long)tp; > + tasklet_schedule(&tpmif_rx_tasklet); > + spin_unlock_irqrestore(&tp->tx_lock, flags); > + > + return IRQ_HANDLED; > +} > + > + > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int isuserbuffer, > + void *remember) > +{ > + struct tpmif_tx_request *tx; > + int i; > + unsigned int offset = 0; > + > + spin_lock_irq(&tp->tx_lock); > + > + if (unlikely(atomic_read(&tp->tx_busy))) { > + spin_unlock_irq(&tp->tx_lock); > + return -EBUSY; > + } > + > + if (tp->is_connected != 1) { > + spin_unlock_irq(&tp->tx_lock); > + return -EIO; > + } > + > + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + int copied; > + > + if (!txb) { > + spin_unlock_irq(&tp->tx_lock); > + return -EFAULT; > + } > + > + copied = tx_buffer_copy(txb, &buf[offset], count, > + isuserbuffer); > + if (copied < 0) { > + /* An error occurred */ > + spin_unlock_irq(&tp->tx_lock); > + return copied; > + } > + count -= copied; > + offset += copied; > + > + tx = &tp->tx->ring[i].req; > + tx->addr = virt_to_machine(txb->data).maddr; > + tx->size = txb->len; > + tx->unused = 0; > + > + /* Get the granttable reference for this page. */ > + tx->ref = gnttab_claim_grant_reference(&gref_head); > + if (tx->ref == -ENOSPC) { > + spin_unlock_irq(&tp->tx_lock); > + return -ENOSPC; > + } > + gnttab_grant_foreign_access_ref(tx->ref, > + tp->backend_id, > + virt_to_mfn(txb->data), > + 0 /*RW*/); > + wmb(); > + } > + > + atomic_set(&tp->tx_busy, 1); > + tp->tx_remember = remember; > + > + mb(); > + > + notify_remote_via_evtchn(tp->evtchn); > + > + spin_unlock_irq(&tp->tx_lock); > + return offset; > +} > + > + > +static void tpmif_notify_upperlayer(struct tpm_private *tp) > +{ > + /* Notify upper layer about the state of the connection to the BE. */ > + vtpm_vd_status(tp->chip, (tp->is_connected > + ? TPM_VD_STATUS_CONNECTED > + : TPM_VD_STATUS_DISCONNECTED)); > +} > + > + > +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) > +{ > + /* > + * Don't notify upper layer if we are in suspend mode and > + * should disconnect - assumption is that we will resume > + * The mutex keeps apps from sending. > + */ > + if (is_connected == 0 && tp->is_suspended == 1) > + return; > + > + /* > + * Unlock the mutex if we are connected again > + * after being suspended - now resuming. > + * This also removes the suspend state. > + */ > + if (is_connected == 1 && tp->is_suspended == 1) > + tpmfront_suspend_finish(tp); > + > + if (is_connected != tp->is_connected) { > + tp->is_connected = is_connected; > + tpmif_notify_upperlayer(tp); > + } > +} > + > + > + > +/* ================================================================= > + * Initialization function. > + * ================================================================= > + */ > + > + > +static int __init tpmif_init(void) > +{ > + struct tpm_private *tp; > + > + if (!xen_domain()) > + return -ENODEV; > + > + tp = tpm_private_get(); > + if (!tp) > + return -ENOMEM; > + > + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, > + &gref_head) < 0) { > + tpm_private_put(); > + return -EFAULT; > + } > + > + return xenbus_register_frontend(&tpmfront_driver); > +} > +module_init(tpmif_init); > + > +static void __exit tpmif_exit(void) > +{ > + xenbus_unregister_driver(&tpmfront_driver); > + gnttab_free_grant_references(gref_head); > + tpm_private_put(); > +} > +module_exit(tpmif_exit); > + > +MODULE_LICENSE("Dual BSD/GPL"); > diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.c b/drivers/char/tpm/xen-tpmfront_vtpm.c > new file mode 100644 > index 0000000..d70f1df > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_vtpm.c > @@ -0,0 +1,543 @@ > +/* > + * Copyright (C) 2006 IBM Corporation > + * > + * Authors: > + * Stefan Berger > + * > + * Generic device driver part for device drivers in a virtualized > + * environment. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation, version 2 of the > + * License. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "xen-tpmfront_vtpm.h" > + > +/* read status bits */ > +enum { > + STATUS_BUSY = 0x01, > + STATUS_DATA_AVAIL = 0x02, > + STATUS_READY = 0x04 > +}; > + > +struct transmission { > + struct list_head next; > + > + unsigned char *request; > + size_t request_len; > + size_t request_buflen; > + > + unsigned char *response; > + size_t response_len; > + size_t response_buflen; > + > + unsigned int flags; > +}; > + > +enum { > + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 > +}; > + > + > +enum { > + DATAEX_FLAG_QUEUED_ONLY = 0x1 > +}; > + > + > +/* local variables */ > + > +/* local function prototypes */ > +static int _vtpm_send_queued(struct tpm_chip *chip); > + > + > +/* ============================================================= > + * Some utility functions > + * ============================================================= > + */ > +static void vtpm_state_init(struct vtpm_state *vtpms) > +{ > + vtpms->current_request = NULL; > + spin_lock_init(&vtpms->req_list_lock); > + init_waitqueue_head(&vtpms->req_wait_queue); > + INIT_LIST_HEAD(&vtpms->queued_requests); > + > + vtpms->current_response = NULL; > + spin_lock_init(&vtpms->resp_list_lock); > + init_waitqueue_head(&vtpms->resp_wait_queue); > + > + vtpms->disconnect_time = jiffies; > +} > + > + > +static inline struct transmission *transmission_alloc(void) > +{ > + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > +} > + > +static unsigned char * > +transmission_set_req_buffer(struct transmission *t, > + unsigned char *buffer, size_t len) > +{ > + if (t->request_buflen < len) { > + kfree(t->request); > + t->request = kmalloc(len, GFP_KERNEL); > + if (!t->request) { > + t->request_buflen = 0; > + return NULL; > + } > + t->request_buflen = len; > + } > + > + memcpy(t->request, buffer, len); > + t->request_len = len; > + > + return t->request; > +} > + > +static unsigned char * > +transmission_set_res_buffer(struct transmission *t, > + const unsigned char *buffer, size_t len) > +{ > + if (t->response_buflen < len) { > + kfree(t->response); > + t->response = kmalloc(len, GFP_ATOMIC); > + if (!t->response) { > + t->response_buflen = 0; > + return NULL; > + } > + t->response_buflen = len; > + } > + > + memcpy(t->response, buffer, len); > + t->response_len = len; > + > + return t->response; > +} > + > +static inline void transmission_free(struct transmission *t) > +{ > + kfree(t->request); > + kfree(t->response); > + kfree(t); > +} > + > +/* ============================================================= > + * Interface with the lower layer driver > + * ============================================================= > + */ > +/* > + * Lower layer uses this function to make a response available. > + */ > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, > + void *ptr) > +{ > + unsigned long flags; > + int ret_size = 0; > + struct transmission *t; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * The list with requests must contain one request > + * only and the element there must be the one that > + * was passed to me from the front-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if (vtpms->current_request != ptr) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return 0; > + } > + t = vtpms->current_request; > + if (t) { > + transmission_free(t); > + vtpms->current_request = NULL; > + } > + > + t = transmission_alloc(); > + if (t) { > + if (!transmission_set_res_buffer(t, buffer, count)) { > + transmission_free(t); > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return -ENOMEM; > + } > + ret_size = count; > + vtpms->current_response = t; > + wake_up_interruptible(&vtpms->resp_wait_queue); > + } > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + > + return ret_size; > +} > + > + > +/* > + * Lower layer indicates its status (connected/disconnected) > + */ > +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) > +{ > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + vtpms->vd_status = vd_status; > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) > + vtpms->disconnect_time = jiffies; > +} > + > +/* ============================================================= > + * Interface with the generic TPM driver > + * ============================================================= > + */ > +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * Check if the previous operation only queued the command > + * In this case there won't be a response, so I just > + * return from here and reset that flag. In any other > + * case I should receive a response from the back-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { > + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + /* > + * The first few commands (measurements) must be > + * queued since it might not be possible to talk to the > + * TPM, yet. > + * Return a response of up to 30 '0's. > + */ > + > + count = min_t(size_t, count, 30); > + memset(buf, 0x0, count); > + return count; > + } > + /* > + * Check whether something is in the responselist and if > + * there's nothing in the list wait for something to appear. > + */ > + > + if (!vtpms->current_response) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, > + 1000); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + rc = min(count, t->response_len); > + memcpy(buf, t->response, rc); > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct transmission *t = transmission_alloc(); > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + if (!t) > + return -ENOMEM; > + /* > + * If there's a current request, it must be the > + * previous request that has timed out. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + if (vtpms->current_request != NULL) { > + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" > + " Previous request must have timed out.\n"); > + transmission_free(vtpms->current_request); > + vtpms->current_request = NULL; > + } > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + /* > + * Queue the packet if the driver below is not > + * ready, yet, or there is any packet already > + * in the queue. > + * If the driver below is ready, unqueue all > + * packets first before sending our current > + * packet. > + * For each unqueued packet, except for the > + * last (=current) packet, call the function > + * tpm_xen_recv to wait for the response to come > + * back. > + */ > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { > + if (time_after(jiffies, > + vtpms->disconnect_time + HZ * 10)) { > + rc = -ENOENT; > + } else { > + goto queue_it; > + } > + } else { > + /* > + * Send all queued packets. > + */ > + if (_vtpm_send_queued(chip) == 0) { > + > + vtpms->current_request = t; > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + buf, > + count, > + t); > + /* > + * The generic TPM driver will call > + * the function to receive the response. > + */ > + if (rc < 0) { > + vtpms->current_request = NULL; > + goto queue_it; > + } > + } else { > +queue_it: > + if (!transmission_set_req_buffer(t, buf, count)) { > + transmission_free(t); > + rc = -ENOMEM; > + goto exit; > + } > + /* > + * An error occurred. Don't event try > + * to send the current request. Just > + * queue it. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; > + list_add_tail(&t->next, &vtpms->queued_requests); > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + } > + } > + > +exit: > + return rc; > +} > + > + > +/* > + * Send all queued requests. > + */ > +static int _vtpm_send_queued(struct tpm_chip *chip) > +{ > + int rc; > + int error = 0; > + unsigned long flags; > + unsigned char buffer[1]; > + struct vtpm_state *vtpms; > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + > + while (!list_empty(&vtpms->queued_requests)) { > + /* > + * Need to dequeue them. > + * Read the result into a dummy buffer. > + */ > + struct transmission *qt = (struct transmission *) > + vtpms->queued_requests.next; > + list_del(&qt->next); > + vtpms->current_request = qt; > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + qt->request, > + qt->request_len, > + qt); > + > + if (rc < 0) { > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + qt = vtpms->current_request; > + if (qt != NULL) { > + /* > + * requeue it at the beginning > + * of the list > + */ > + list_add(&qt->next, > + &vtpms->queued_requests); > + } > + vtpms->current_request = NULL; > + error = 1; > + break; > + } > + /* > + * After this point qt is not valid anymore! > + * It is freed when the front-end is delivering > + * the data by calling tpm_recv > + */ > + /* > + * Receive response into provided dummy buffer > + */ > + rc = vtpm_recv(chip, buffer, sizeof(buffer)); > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + } > + > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + return error; > +} > + > +static void vtpm_cancel(struct tpm_chip *chip) > +{ > + unsigned long flags; > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + > + if (!vtpms->current_response && vtpms->current_request) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on(&vtpms->resp_wait_queue); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > +} > + > +static u8 vtpm_status(struct tpm_chip *chip) > +{ > + u8 rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + /* > + * Data are available if: > + * - there's a current response > + * - the last packet was queued only (this is fake, but necessary to > + * get the generic TPM layer to call the receive function.) > + */ > + if (vtpms->current_response || > + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { > + rc = STATUS_DATA_AVAIL; > + } else if (!vtpms->current_response && !vtpms->current_request) { > + rc = STATUS_READY; > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static const struct file_operations vtpm_ops = { > + .owner = THIS_MODULE, > + .llseek = no_llseek, > + .open = tpm_open, > + .read = tpm_read, > + .write = tpm_write, > + .release = tpm_release, > +}; > + > +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > + NULL); > +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > + > +static struct attribute *vtpm_attrs[] = { > + &dev_attr_pubek.attr, > + &dev_attr_pcrs.attr, > + &dev_attr_enabled.attr, > + &dev_attr_active.attr, > + &dev_attr_owned.attr, > + &dev_attr_temp_deactivated.attr, > + &dev_attr_caps.attr, > + &dev_attr_cancel.attr, > + NULL, > +}; > + > +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; > + > +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) > + > +static struct tpm_vendor_specific tpm_vtpm = { > + .recv = vtpm_recv, > + .send = vtpm_send, > + .cancel = vtpm_cancel, > + .status = vtpm_status, > + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, > + .req_complete_val = STATUS_DATA_AVAIL, > + .req_canceled = STATUS_READY, > + .attr_group = &vtpm_attr_grp, > + .miscdev = { > + .fops = &vtpm_ops, > + }, > + .duration = { > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + }, > +}; > + > +struct tpm_chip *init_vtpm(struct device *dev, > + struct tpm_private *tp) > +{ > + long rc; > + struct tpm_chip *chip; > + struct vtpm_state *vtpms; > + > + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); > + if (!vtpms) > + return ERR_PTR(-ENOMEM); > + > + vtpm_state_init(vtpms); > + vtpms->tpm_private = tp; > + > + chip = tpm_register_hardware(dev, &tpm_vtpm); > + if (!chip) { > + rc = -ENODEV; > + goto err_free_mem; > + } > + > + chip_set_private(chip, vtpms); > + > + return chip; > + > +err_free_mem: > + kfree(vtpms); > + > + return ERR_PTR(rc); > +} > + > +void cleanup_vtpm(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + tpm_remove_hardware(dev); > + kfree(vtpms); > +} > diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.h b/drivers/char/tpm/xen-tpmfront_vtpm.h > new file mode 100644 > index 0000000..16cf323 > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_vtpm.h > @@ -0,0 +1,55 @@ > +#ifndef XEN_TPMFRONT_VTPM_H > +#define XEN_TPMFRONT_VTPM_H > + > +struct tpm_chip; > +struct tpm_private; > + > +struct vtpm_state { > + struct transmission *current_request; > + spinlock_t req_list_lock; > + wait_queue_head_t req_wait_queue; > + > + struct list_head queued_requests; > + > + struct transmission *current_response; > + spinlock_t resp_list_lock; > + wait_queue_head_t resp_wait_queue; > + > + u8 vd_status; > + u8 flags; > + > + unsigned long disconnect_time; > + > + /* > + * The following is a private structure of the underlying > + * driver. It is passed as parameter in the send function. > + */ > + struct tpm_private *tpm_private; > +}; > + > + > +enum vdev_status { > + TPM_VD_STATUS_DISCONNECTED = 0x0, > + TPM_VD_STATUS_CONNECTED = 0x1 > +}; > + > +/* this function is called from tpm_vtpm.c */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr); > + > +/* these functions are offered by tpm_vtpm.c */ > +struct tpm_chip *init_vtpm(struct device *, > + struct tpm_private *); > +void cleanup_vtpm(struct device *); > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, void *ptr); > +void vtpm_vd_status(const struct tpm_chip *, u8 status); > + > +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip->vendor.data; > + return vtpms->tpm_private; > +} > + > +#endif > diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h > new file mode 100644 > index 0000000..c9e7294 > --- /dev/null > +++ b/include/xen/interface/io/tpmif.h > @@ -0,0 +1,65 @@ > +/****************************************************************************** > + * tpmif.h > + * > + * TPM I/O interface for Xen guest OSes. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from tools/libxc/xen/io/netif.h > + * > + * Copyright (c) 2003-2004, Keir Fraser > + */ > + > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +struct tpmif_tx_request; > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +struct tpmif_ring; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +struct tpmif_tx_interface; > + > +#endif > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:32:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:32:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwv4-0005iM-ES; Mon, 12 Nov 2012 16:31:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwv2-0005hY-1c for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:31:29 +0000 Received: from [85.158.137.99:26325] by server-16.bemta-3.messagelabs.com id 3B/08-07461-B5421A05; Mon, 12 Nov 2012 16:31:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352737880!15645031!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27379 invoked from network); 12 Nov 2012 16:31:22 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:31:22 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGV1DK031267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:31:03 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGUxRu011184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:30:59 GMT Received: from abhmt115.oracle.com (abhmt115.oracle.com [141.146.116.67]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGUu6b011838; Mon, 12 Nov 2012 10:30:56 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 08:30:55 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 839FC4037A; Mon, 12 Nov 2012 11:30:52 -0500 (EST) Date: Mon, 12 Nov 2012 11:30:52 -0500 From: Konrad Rzeszutek Wilk To: Matthew Fioravante Message-ID: <20121112163052.GA9575@phenom.dumpdata.com> References: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: jeremy@goop.org, xen-devel@lists.xensource.com, tpmdd@selhorst.net, linux-kernel@vger.kernel.org, mail@srajiv.net, tpmdd-devel@lists.sourceforge.net, key@linux.vnet.ibm.com, tpmdd@sirrix.com Subject: Re: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 09:29:58AM -0500, Matthew Fioravante wrote: > This patch ports the xen vtpm frontend driver for linux > from the linux-2.6.18-xen.hg tree to linux-stable. This > driver is designed be used with the mini-os tpmback driver > in Xen as part of the new mini-os virtual tpm subsystem. > See docs/misc/vtpm.txt in Xen and the xen-devel mailing list > for details. I didn't look in details but off the bat - you are missing the Documentation/../sysfs file. I still think you should include the full vtpm.txt in this patch description and refer at the end to the docs/misc/vtpm.txt in Xen as the source for the up-to-date version. > > Signed-off-by: Matthew Fioravante > --- > drivers/char/tpm/Kconfig | 11 + > drivers/char/tpm/Makefile | 2 + > drivers/char/tpm/tpm.h | 10 + > drivers/char/tpm/xen-tpmfront_if.c | 688 ++++++++++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront_vtpm.c | 543 +++++++++++++++++++++++++++ > drivers/char/tpm/xen-tpmfront_vtpm.h | 55 +++ > include/xen/interface/io/tpmif.h | 65 ++++ > 7 files changed, 1374 insertions(+) > create mode 100644 drivers/char/tpm/xen-tpmfront_if.c > create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.c > create mode 100644 drivers/char/tpm/xen-tpmfront_vtpm.h > create mode 100644 include/xen/interface/io/tpmif.h > > diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig > index 915875e..23d272f 100644 > --- a/drivers/char/tpm/Kconfig > +++ b/drivers/char/tpm/Kconfig > @@ -81,4 +81,15 @@ config TCG_IBMVTPM > will be accessible from within Linux. To compile this driver > as a module, choose M here; the module will be called tpm_ibmvtpm. > > +config TCG_XEN > + tristate "XEN TPM Interface" > + depends on TCG_TPM && XEN > + ---help--- > + If you want to make TPM support available to a Xen user domain, > + say Yes and it will be accessible from within Linux. See > + the manpages for xl, xl.conf, and docs/misc/vtpm.txt in > + the Xen source repository for more details. > + To compile this driver as a module, choose M here; the module > + will be called xen-tpmfront. > + > endif # TCG_TPM > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5b3fc8b..0161f05 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -17,3 +17,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o > obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o > obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o > obj-$(CONFIG_TCG_IBMVTPM) += tpm_ibmvtpm.o > +obj-$(CONFIG_TCG_XEN) += xen-tpmfront.o > +xen-tpmfront-y = xen-tpmfront_if.o xen-tpmfront_vtpm.o > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 8ef7649..b575892 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -328,6 +328,16 @@ extern int tpm_pm_resume(struct device *); > extern int wait_for_tpm_stat(struct tpm_chip *, u8, unsigned long, > wait_queue_head_t *); > > +static inline void *chip_get_private(const struct tpm_chip *chip) > +{ > + return chip->vendor.data; > +} > + > +static inline void chip_set_private(struct tpm_chip *chip, void *priv) > +{ > + chip->vendor.data = priv; > +} > + > #ifdef CONFIG_ACPI > extern int tpm_add_ppi(struct kobject *); > extern void tpm_remove_ppi(struct kobject *); > diff --git a/drivers/char/tpm/xen-tpmfront_if.c b/drivers/char/tpm/xen-tpmfront_if.c > new file mode 100644 > index 0000000..ba7fad8 > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_if.c > @@ -0,0 +1,688 @@ > +/* > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from drivers/xen/netfront/netfront.c > + * > + * Copyright (c) 2002-2004, K A Fraser > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License version 2 > + * as published by the Free Software Foundation; or, when distributed > + * separately from the Linux kernel or incorporated into other > + * software packages, subject to the following license: > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this source file (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, copy, modify, > + * merge, publish, distribute, sublicense, and/or sell copies of the Software, > + * and to permit persons to whom the Software is furnished to do so, subject to > + * the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "xen-tpmfront_vtpm.h" > + > +#define GRANT_INVALID_REF 0 > + > +/* local structures */ > +struct tpm_private { > + struct tpm_chip *chip; > + > + struct tpmif_tx_interface *tx; > + atomic_t refcnt; > + unsigned int evtchn; > + u8 is_connected; > + u8 is_suspended; > + > + spinlock_t tx_lock; > + > + struct tx_buffer *tx_buffers[TPMIF_TX_RING_SIZE]; > + > + atomic_t tx_busy; > + void *tx_remember; > + > + domid_t backend_id; > + wait_queue_head_t wait_q; > + > + struct xenbus_device *dev; > + int ring_ref; > +}; > + > +struct tx_buffer { > + unsigned int size; /* available space in data */ > + unsigned int len; /* used space in data */ > + unsigned char *data; /* pointer to a page */ > +}; > + > + > +/* locally visible variables */ > +static grant_ref_t gref_head; > +static struct tpm_private *my_priv; > + > +/* local function prototypes */ > +static irqreturn_t tpmif_int(int irq, > + void *tpm_priv); > +static void tpmif_rx_action(unsigned long unused); > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid); > +static DECLARE_TASKLET(tpmif_rx_tasklet, tpmif_rx_action, 0); > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp); > +static void tpmif_free_tx_buffers(struct tpm_private *tp); > +static void tpmif_set_connected_state(struct tpm_private *tp, > + u8 newstate); > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int userbuffer, > + void *remember); > +static void destroy_tpmring(struct tpm_private *tp); > + > +static inline int > +tx_buffer_copy(struct tx_buffer *txb, const u8 *src, int len, > + int isuserbuffer) > +{ > + int copied = len; > + > + if (len > txb->size) > + copied = txb->size; > + if (isuserbuffer) { > + if (copy_from_user(txb->data, src, copied)) > + return -EFAULT; > + } else { > + memcpy(txb->data, src, copied); > + } > + txb->len = len; > + return copied; > +} > + > +static inline struct tx_buffer *tx_buffer_alloc(void) > +{ > + struct tx_buffer *txb; > + > + txb = kzalloc(sizeof(struct tx_buffer), GFP_KERNEL); > + if (!txb) > + return NULL; > + > + txb->len = 0; > + txb->size = PAGE_SIZE; > + txb->data = (unsigned char *)__get_free_page(GFP_KERNEL); > + if (txb->data == NULL) { > + kfree(txb); > + txb = NULL; > + } > + > + return txb; > +} > + > + > +static inline void tx_buffer_free(struct tx_buffer *txb) > +{ > + if (txb) { > + free_page((long)txb->data); > + kfree(txb); > + } > +} > + > +/************************************************************** > + Utility function for the tpm_private structure > + **************************************************************/ > +static void tpm_private_init(struct tpm_private *tp) > +{ > + spin_lock_init(&tp->tx_lock); > + init_waitqueue_head(&tp->wait_q); > + atomic_set(&tp->refcnt, 1); > +} > + > +static void tpm_private_put(void) > +{ > + if (!atomic_dec_and_test(&my_priv->refcnt)) > + return; > + > + tpmif_free_tx_buffers(my_priv); > + kfree(my_priv); > + my_priv = NULL; > +} > + > +static struct tpm_private *tpm_private_get(void) > +{ > + int err; > + > + if (my_priv) { > + atomic_inc(&my_priv->refcnt); > + return my_priv; > + } > + > + my_priv = kzalloc(sizeof(struct tpm_private), GFP_KERNEL); > + if (!my_priv) > + return NULL; > + > + tpm_private_init(my_priv); > + err = tpmif_allocate_tx_buffers(my_priv); > + if (err < 0) > + tpm_private_put(); > + > + return my_priv; > +} > + > +/************************************************************** > + > + The interface to let the tpm plugin register its callback > + function and send data to another partition using this module > + > + **************************************************************/ > + > +static DEFINE_MUTEX(suspend_lock); > +/* > + * Send data via this module by calling this function > + */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr) > +{ > + int sent; > + > + mutex_lock(&suspend_lock); > + sent = tpm_xmit(tp, buf, count, 0, ptr); > + mutex_unlock(&suspend_lock); > + > + return sent; > +} > + > +/************************************************************** > + XENBUS support code > + **************************************************************/ > + > +static int setup_tpmring(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + struct tpmif_tx_interface *sring; > + int err; > + > + tp->ring_ref = GRANT_INVALID_REF; > + > + sring = (void *)__get_free_page(GFP_KERNEL); > + if (!sring) { > + xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring"); > + return -ENOMEM; > + } > + tp->tx = sring; > + > + err = xenbus_grant_ring(dev, virt_to_mfn(tp->tx)); > + if (err < 0) { > + free_page((unsigned long)sring); > + tp->tx = NULL; > + xenbus_dev_fatal(dev, err, "allocating grant reference"); > + goto fail; > + } > + tp->ring_ref = err; > + > + err = tpmif_connect(dev, tp, dev->otherend_id); > + if (err) > + goto fail; > + > + return 0; > +fail: > + destroy_tpmring(tp); > + return err; > +} > + > + > +static void destroy_tpmring(struct tpm_private *tp) > +{ > + tpmif_set_connected_state(tp, 0); > + > + if (tp->ring_ref != GRANT_INVALID_REF) { > + gnttab_end_foreign_access(tp->ring_ref, > + 0, (unsigned long)tp->tx); > + tp->ring_ref = GRANT_INVALID_REF; > + tp->tx = NULL; > + } > + > + if (tp->evtchn) > + unbind_from_irqhandler(irq_from_evtchn(tp->evtchn), tp); > + > + tp->evtchn = GRANT_INVALID_REF; > +} > + > + > +static int talk_to_backend(struct xenbus_device *dev, > + struct tpm_private *tp) > +{ > + const char *message = NULL; > + int err; > + struct xenbus_transaction xbt; > + > + err = setup_tpmring(dev, tp); > + if (err) { > + xenbus_dev_fatal(dev, err, "setting up ring"); > + goto out; > + } > + > +again: > + err = xenbus_transaction_start(&xbt); > + if (err) { > + xenbus_dev_fatal(dev, err, "starting transaction"); > + goto destroy_tpmring; > + } > + > + err = xenbus_printf(xbt, dev->nodename, > + "ring-ref", "%u", tp->ring_ref); > + if (err) { > + message = "writing ring-ref"; > + goto abort_transaction; > + } > + > + err = xenbus_printf(xbt, dev->nodename, "event-channel", "%u", > + tp->evtchn); > + if (err) { > + message = "writing event-channel"; > + goto abort_transaction; > + } > + > + err = xenbus_transaction_end(xbt, 0); > + if (err == -EAGAIN) > + goto again; > + if (err) { > + xenbus_dev_fatal(dev, err, "completing transaction"); > + goto destroy_tpmring; > + } > + > + xenbus_switch_state(dev, XenbusStateConnected); > + > + return 0; > + > +abort_transaction: > + xenbus_transaction_end(xbt, 1); > + if (message) > + xenbus_dev_error(dev, err, "%s", message); > +destroy_tpmring: > + destroy_tpmring(tp); > +out: > + return err; > +} > + > +/** > + * Callback received when the backend's state changes. > + */ > +static void backend_changed(struct xenbus_device *dev, > + enum xenbus_state backend_state) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + > + switch (backend_state) { > + case XenbusStateInitialising: > + case XenbusStateInitWait: > + case XenbusStateInitialised: > + case XenbusStateReconfiguring: > + case XenbusStateReconfigured: > + case XenbusStateUnknown: > + break; > + > + case XenbusStateConnected: > + tpmif_set_connected_state(tp, 1); > + break; > + > + case XenbusStateClosing: > + tpmif_set_connected_state(tp, 0); > + xenbus_frontend_closed(dev); > + break; > + > + case XenbusStateClosed: > + tpmif_set_connected_state(tp, 0); > + if (tp->is_suspended == 0) > + device_unregister(&dev->dev); > + xenbus_frontend_closed(dev); > + break; > + } > +} > + > +static int tpmfront_probe(struct xenbus_device *dev, > + const struct xenbus_device_id *id) > +{ > + int err; > + int handle; > + struct tpm_private *tp = tpm_private_get(); > + > + if (!tp) > + return -ENOMEM; > + > + tp->chip = init_vtpm(&dev->dev, tp); > + if (IS_ERR(tp->chip)) > + return PTR_ERR(tp->chip); > + > + err = xenbus_scanf(XBT_NIL, dev->nodename, > + "handle", "%i", &handle); > + if (XENBUS_EXIST_ERR(err)) > + return err; > + > + if (err < 0) { > + xenbus_dev_fatal(dev, err, "reading virtual-device"); > + return err; > + } > + > + tp->dev = dev; > + > + err = talk_to_backend(dev, tp); > + if (err) { > + tpm_private_put(); > + return err; > + } > + > + return 0; > +} > + > + > +static int __devexit tpmfront_remove(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + cleanup_vtpm(&dev->dev); > + return 0; > +} > + > +static int tpmfront_suspend(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + u32 ctr; > + > + /* Take the lock, preventing any application from sending. */ > + mutex_lock(&suspend_lock); > + tp->is_suspended = 1; > + > + for (ctr = 0; atomic_read(&tp->tx_busy); ctr++) { > + /* Wait for a request to be responded to. */ > + interruptible_sleep_on_timeout(&tp->wait_q, 100); > + } > + > + return 0; > +} > + > +static int tpmfront_suspend_finish(struct tpm_private *tp) > +{ > + tp->is_suspended = 0; > + /* Allow applications to send again. */ > + mutex_unlock(&suspend_lock); > + return 0; > +} > + > +static int tpmfront_resume(struct xenbus_device *dev) > +{ > + struct tpm_private *tp = tpm_private_from_dev(&dev->dev); > + destroy_tpmring(tp); > + return talk_to_backend(dev, tp); > +} > + > +static int tpmif_connect(struct xenbus_device *dev, > + struct tpm_private *tp, > + domid_t domid) > +{ > + int err; > + > + tp->backend_id = domid; > + tp->evtchn = GRANT_INVALID_REF; > + > + err = xenbus_alloc_evtchn(dev, &tp->evtchn); > + if (err) > + return err; > + > + err = bind_evtchn_to_irqhandler(tp->evtchn, tpmif_int, > + 0, "tpmif", tp); > + if (err <= 0) > + return err; > + > + return 0; > +} > + > +static const struct xenbus_device_id tpmfront_ids[] = { > + { "vtpm" }, > + { "" } > +}; > +MODULE_ALIAS("xen:vtpm"); > + > +static DEFINE_XENBUS_DRIVER(tpmfront, , > + .probe = tpmfront_probe, > + .remove = __devexit_p(tpmfront_remove), > + .resume = tpmfront_resume, > + .otherend_changed = backend_changed, > + .suspend = tpmfront_suspend, > + ); > + > +static int tpmif_allocate_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) { > + tp->tx_buffers[i] = tx_buffer_alloc(); > + if (!tp->tx_buffers[i]) { > + tpmif_free_tx_buffers(tp); > + return -ENOMEM; > + } > + } > + return 0; > +} > + > +static void tpmif_free_tx_buffers(struct tpm_private *tp) > +{ > + unsigned int i; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE; i++) > + tx_buffer_free(tp->tx_buffers[i]); > +} > + > +static void tpmif_rx_action(unsigned long priv) > +{ > + struct tpm_private *tp = (struct tpm_private *)priv; > + int i = 0; > + unsigned int received; > + unsigned int offset = 0; > + u8 *buffer; > + struct tpmif_tx_request *tx = &tp->tx->ring[i].req; > + > + atomic_set(&tp->tx_busy, 0); > + wake_up_interruptible(&tp->wait_q); > + > + received = tx->size; > + > + buffer = kmalloc(received, GFP_ATOMIC); > + if (!buffer) > + return; > + > + for (i = 0; i < TPMIF_TX_RING_SIZE && offset < received; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + struct tpmif_tx_request *tx; > + unsigned int tocopy; > + > + tx = &tp->tx->ring[i].req; > + tocopy = tx->size; > + if (tocopy > PAGE_SIZE) > + tocopy = PAGE_SIZE; > + > + memcpy(&buffer[offset], txb->data, tocopy); > + > + gnttab_release_grant_reference(&gref_head, tx->ref); > + > + offset += tocopy; > + } > + > + vtpm_vd_recv(tp->chip, buffer, received, tp->tx_remember); > + kfree(buffer); > +} > + > + > +static irqreturn_t tpmif_int(int irq, void *tpm_priv) > +{ > + struct tpm_private *tp = tpm_priv; > + unsigned long flags; > + > + spin_lock_irqsave(&tp->tx_lock, flags); > + tpmif_rx_tasklet.data = (unsigned long)tp; > + tasklet_schedule(&tpmif_rx_tasklet); > + spin_unlock_irqrestore(&tp->tx_lock, flags); > + > + return IRQ_HANDLED; > +} > + > + > +static int tpm_xmit(struct tpm_private *tp, > + const u8 *buf, size_t count, int isuserbuffer, > + void *remember) > +{ > + struct tpmif_tx_request *tx; > + int i; > + unsigned int offset = 0; > + > + spin_lock_irq(&tp->tx_lock); > + > + if (unlikely(atomic_read(&tp->tx_busy))) { > + spin_unlock_irq(&tp->tx_lock); > + return -EBUSY; > + } > + > + if (tp->is_connected != 1) { > + spin_unlock_irq(&tp->tx_lock); > + return -EIO; > + } > + > + for (i = 0; count > 0 && i < TPMIF_TX_RING_SIZE; i++) { > + struct tx_buffer *txb = tp->tx_buffers[i]; > + int copied; > + > + if (!txb) { > + spin_unlock_irq(&tp->tx_lock); > + return -EFAULT; > + } > + > + copied = tx_buffer_copy(txb, &buf[offset], count, > + isuserbuffer); > + if (copied < 0) { > + /* An error occurred */ > + spin_unlock_irq(&tp->tx_lock); > + return copied; > + } > + count -= copied; > + offset += copied; > + > + tx = &tp->tx->ring[i].req; > + tx->addr = virt_to_machine(txb->data).maddr; > + tx->size = txb->len; > + tx->unused = 0; > + > + /* Get the granttable reference for this page. */ > + tx->ref = gnttab_claim_grant_reference(&gref_head); > + if (tx->ref == -ENOSPC) { > + spin_unlock_irq(&tp->tx_lock); > + return -ENOSPC; > + } > + gnttab_grant_foreign_access_ref(tx->ref, > + tp->backend_id, > + virt_to_mfn(txb->data), > + 0 /*RW*/); > + wmb(); > + } > + > + atomic_set(&tp->tx_busy, 1); > + tp->tx_remember = remember; > + > + mb(); > + > + notify_remote_via_evtchn(tp->evtchn); > + > + spin_unlock_irq(&tp->tx_lock); > + return offset; > +} > + > + > +static void tpmif_notify_upperlayer(struct tpm_private *tp) > +{ > + /* Notify upper layer about the state of the connection to the BE. */ > + vtpm_vd_status(tp->chip, (tp->is_connected > + ? TPM_VD_STATUS_CONNECTED > + : TPM_VD_STATUS_DISCONNECTED)); > +} > + > + > +static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) > +{ > + /* > + * Don't notify upper layer if we are in suspend mode and > + * should disconnect - assumption is that we will resume > + * The mutex keeps apps from sending. > + */ > + if (is_connected == 0 && tp->is_suspended == 1) > + return; > + > + /* > + * Unlock the mutex if we are connected again > + * after being suspended - now resuming. > + * This also removes the suspend state. > + */ > + if (is_connected == 1 && tp->is_suspended == 1) > + tpmfront_suspend_finish(tp); > + > + if (is_connected != tp->is_connected) { > + tp->is_connected = is_connected; > + tpmif_notify_upperlayer(tp); > + } > +} > + > + > + > +/* ================================================================= > + * Initialization function. > + * ================================================================= > + */ > + > + > +static int __init tpmif_init(void) > +{ > + struct tpm_private *tp; > + > + if (!xen_domain()) > + return -ENODEV; > + > + tp = tpm_private_get(); > + if (!tp) > + return -ENOMEM; > + > + if (gnttab_alloc_grant_references(TPMIF_TX_RING_SIZE, > + &gref_head) < 0) { > + tpm_private_put(); > + return -EFAULT; > + } > + > + return xenbus_register_frontend(&tpmfront_driver); > +} > +module_init(tpmif_init); > + > +static void __exit tpmif_exit(void) > +{ > + xenbus_unregister_driver(&tpmfront_driver); > + gnttab_free_grant_references(gref_head); > + tpm_private_put(); > +} > +module_exit(tpmif_exit); > + > +MODULE_LICENSE("Dual BSD/GPL"); > diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.c b/drivers/char/tpm/xen-tpmfront_vtpm.c > new file mode 100644 > index 0000000..d70f1df > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_vtpm.c > @@ -0,0 +1,543 @@ > +/* > + * Copyright (C) 2006 IBM Corporation > + * > + * Authors: > + * Stefan Berger > + * > + * Generic device driver part for device drivers in a virtualized > + * environment. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation, version 2 of the > + * License. > + * > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include "tpm.h" > +#include "xen-tpmfront_vtpm.h" > + > +/* read status bits */ > +enum { > + STATUS_BUSY = 0x01, > + STATUS_DATA_AVAIL = 0x02, > + STATUS_READY = 0x04 > +}; > + > +struct transmission { > + struct list_head next; > + > + unsigned char *request; > + size_t request_len; > + size_t request_buflen; > + > + unsigned char *response; > + size_t response_len; > + size_t response_buflen; > + > + unsigned int flags; > +}; > + > +enum { > + TRANSMISSION_FLAG_WAS_QUEUED = 0x1 > +}; > + > + > +enum { > + DATAEX_FLAG_QUEUED_ONLY = 0x1 > +}; > + > + > +/* local variables */ > + > +/* local function prototypes */ > +static int _vtpm_send_queued(struct tpm_chip *chip); > + > + > +/* ============================================================= > + * Some utility functions > + * ============================================================= > + */ > +static void vtpm_state_init(struct vtpm_state *vtpms) > +{ > + vtpms->current_request = NULL; > + spin_lock_init(&vtpms->req_list_lock); > + init_waitqueue_head(&vtpms->req_wait_queue); > + INIT_LIST_HEAD(&vtpms->queued_requests); > + > + vtpms->current_response = NULL; > + spin_lock_init(&vtpms->resp_list_lock); > + init_waitqueue_head(&vtpms->resp_wait_queue); > + > + vtpms->disconnect_time = jiffies; > +} > + > + > +static inline struct transmission *transmission_alloc(void) > +{ > + return kzalloc(sizeof(struct transmission), GFP_ATOMIC); > +} > + > +static unsigned char * > +transmission_set_req_buffer(struct transmission *t, > + unsigned char *buffer, size_t len) > +{ > + if (t->request_buflen < len) { > + kfree(t->request); > + t->request = kmalloc(len, GFP_KERNEL); > + if (!t->request) { > + t->request_buflen = 0; > + return NULL; > + } > + t->request_buflen = len; > + } > + > + memcpy(t->request, buffer, len); > + t->request_len = len; > + > + return t->request; > +} > + > +static unsigned char * > +transmission_set_res_buffer(struct transmission *t, > + const unsigned char *buffer, size_t len) > +{ > + if (t->response_buflen < len) { > + kfree(t->response); > + t->response = kmalloc(len, GFP_ATOMIC); > + if (!t->response) { > + t->response_buflen = 0; > + return NULL; > + } > + t->response_buflen = len; > + } > + > + memcpy(t->response, buffer, len); > + t->response_len = len; > + > + return t->response; > +} > + > +static inline void transmission_free(struct transmission *t) > +{ > + kfree(t->request); > + kfree(t->response); > + kfree(t); > +} > + > +/* ============================================================= > + * Interface with the lower layer driver > + * ============================================================= > + */ > +/* > + * Lower layer uses this function to make a response available. > + */ > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, > + void *ptr) > +{ > + unsigned long flags; > + int ret_size = 0; > + struct transmission *t; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * The list with requests must contain one request > + * only and the element there must be the one that > + * was passed to me from the front-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if (vtpms->current_request != ptr) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return 0; > + } > + t = vtpms->current_request; > + if (t) { > + transmission_free(t); > + vtpms->current_request = NULL; > + } > + > + t = transmission_alloc(); > + if (t) { > + if (!transmission_set_res_buffer(t, buffer, count)) { > + transmission_free(t); > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return -ENOMEM; > + } > + ret_size = count; > + vtpms->current_response = t; > + wake_up_interruptible(&vtpms->resp_wait_queue); > + } > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + > + return ret_size; > +} > + > + > +/* > + * Lower layer indicates its status (connected/disconnected) > + */ > +void vtpm_vd_status(const struct tpm_chip *chip, u8 vd_status) > +{ > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + vtpms->vd_status = vd_status; > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) > + vtpms->disconnect_time = jiffies; > +} > + > +/* ============================================================= > + * Interface with the generic TPM driver > + * ============================================================= > + */ > +static int vtpm_recv(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + /* > + * Check if the previous operation only queued the command > + * In this case there won't be a response, so I just > + * return from here and reset that flag. In any other > + * case I should receive a response from the back-end. > + */ > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + if ((vtpms->flags & DATAEX_FLAG_QUEUED_ONLY) != 0) { > + vtpms->flags &= ~DATAEX_FLAG_QUEUED_ONLY; > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + /* > + * The first few commands (measurements) must be > + * queued since it might not be possible to talk to the > + * TPM, yet. > + * Return a response of up to 30 '0's. > + */ > + > + count = min_t(size_t, count, 30); > + memset(buf, 0x0, count); > + return count; > + } > + /* > + * Check whether something is in the responselist and if > + * there's nothing in the list wait for something to appear. > + */ > + > + if (!vtpms->current_response) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on_timeout(&vtpms->resp_wait_queue, > + 1000); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + rc = min(count, t->response_len); > + memcpy(buf, t->response, rc); > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static int vtpm_send(struct tpm_chip *chip, u8 *buf, size_t count) > +{ > + int rc = 0; > + unsigned long flags; > + struct transmission *t = transmission_alloc(); > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + if (!t) > + return -ENOMEM; > + /* > + * If there's a current request, it must be the > + * previous request that has timed out. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + if (vtpms->current_request != NULL) { > + dev_warn(chip->dev, "Sending although there is a request outstanding.\n" > + " Previous request must have timed out.\n"); > + transmission_free(vtpms->current_request); > + vtpms->current_request = NULL; > + } > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + /* > + * Queue the packet if the driver below is not > + * ready, yet, or there is any packet already > + * in the queue. > + * If the driver below is ready, unqueue all > + * packets first before sending our current > + * packet. > + * For each unqueued packet, except for the > + * last (=current) packet, call the function > + * tpm_xen_recv to wait for the response to come > + * back. > + */ > + if ((vtpms->vd_status & TPM_VD_STATUS_CONNECTED) == 0) { > + if (time_after(jiffies, > + vtpms->disconnect_time + HZ * 10)) { > + rc = -ENOENT; > + } else { > + goto queue_it; > + } > + } else { > + /* > + * Send all queued packets. > + */ > + if (_vtpm_send_queued(chip) == 0) { > + > + vtpms->current_request = t; > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + buf, > + count, > + t); > + /* > + * The generic TPM driver will call > + * the function to receive the response. > + */ > + if (rc < 0) { > + vtpms->current_request = NULL; > + goto queue_it; > + } > + } else { > +queue_it: > + if (!transmission_set_req_buffer(t, buf, count)) { > + transmission_free(t); > + rc = -ENOMEM; > + goto exit; > + } > + /* > + * An error occurred. Don't event try > + * to send the current request. Just > + * queue it. > + */ > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + vtpms->flags |= DATAEX_FLAG_QUEUED_ONLY; > + list_add_tail(&t->next, &vtpms->queued_requests); > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + } > + } > + > +exit: > + return rc; > +} > + > + > +/* > + * Send all queued requests. > + */ > +static int _vtpm_send_queued(struct tpm_chip *chip) > +{ > + int rc; > + int error = 0; > + unsigned long flags; > + unsigned char buffer[1]; > + struct vtpm_state *vtpms; > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + > + while (!list_empty(&vtpms->queued_requests)) { > + /* > + * Need to dequeue them. > + * Read the result into a dummy buffer. > + */ > + struct transmission *qt = (struct transmission *) > + vtpms->queued_requests.next; > + list_del(&qt->next); > + vtpms->current_request = qt; > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + rc = vtpm_vd_send(vtpms->tpm_private, > + qt->request, > + qt->request_len, > + qt); > + > + if (rc < 0) { > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + qt = vtpms->current_request; > + if (qt != NULL) { > + /* > + * requeue it at the beginning > + * of the list > + */ > + list_add(&qt->next, > + &vtpms->queued_requests); > + } > + vtpms->current_request = NULL; > + error = 1; > + break; > + } > + /* > + * After this point qt is not valid anymore! > + * It is freed when the front-end is delivering > + * the data by calling tpm_recv > + */ > + /* > + * Receive response into provided dummy buffer > + */ > + rc = vtpm_recv(chip, buffer, sizeof(buffer)); > + spin_lock_irqsave(&vtpms->req_list_lock, flags); > + } > + > + spin_unlock_irqrestore(&vtpms->req_list_lock, flags); > + > + return error; > +} > + > +static void vtpm_cancel(struct tpm_chip *chip) > +{ > + unsigned long flags; > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + > + if (!vtpms->current_response && vtpms->current_request) { > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + interruptible_sleep_on(&vtpms->resp_wait_queue); > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + } > + > + if (vtpms->current_response) { > + struct transmission *t = vtpms->current_response; > + vtpms->current_response = NULL; > + transmission_free(t); > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > +} > + > +static u8 vtpm_status(struct tpm_chip *chip) > +{ > + u8 rc = 0; > + unsigned long flags; > + struct vtpm_state *vtpms; > + > + vtpms = (struct vtpm_state *)chip_get_private(chip); > + > + spin_lock_irqsave(&vtpms->resp_list_lock, flags); > + /* > + * Data are available if: > + * - there's a current response > + * - the last packet was queued only (this is fake, but necessary to > + * get the generic TPM layer to call the receive function.) > + */ > + if (vtpms->current_response || > + 0 != (vtpms->flags & DATAEX_FLAG_QUEUED_ONLY)) { > + rc = STATUS_DATA_AVAIL; > + } else if (!vtpms->current_response && !vtpms->current_request) { > + rc = STATUS_READY; > + } > + > + spin_unlock_irqrestore(&vtpms->resp_list_lock, flags); > + return rc; > +} > + > +static const struct file_operations vtpm_ops = { > + .owner = THIS_MODULE, > + .llseek = no_llseek, > + .open = tpm_open, > + .read = tpm_read, > + .write = tpm_write, > + .release = tpm_release, > +}; > + > +static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL); > +static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL); > +static DEVICE_ATTR(enabled, S_IRUGO, tpm_show_enabled, NULL); > +static DEVICE_ATTR(active, S_IRUGO, tpm_show_active, NULL); > +static DEVICE_ATTR(owned, S_IRUGO, tpm_show_owned, NULL); > +static DEVICE_ATTR(temp_deactivated, S_IRUGO, tpm_show_temp_deactivated, > + NULL); > +static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL); > +static DEVICE_ATTR(cancel, S_IWUSR | S_IWGRP, NULL, tpm_store_cancel); > + > +static struct attribute *vtpm_attrs[] = { > + &dev_attr_pubek.attr, > + &dev_attr_pcrs.attr, > + &dev_attr_enabled.attr, > + &dev_attr_active.attr, > + &dev_attr_owned.attr, > + &dev_attr_temp_deactivated.attr, > + &dev_attr_caps.attr, > + &dev_attr_cancel.attr, > + NULL, > +}; > + > +static struct attribute_group vtpm_attr_grp = { .attrs = vtpm_attrs }; > + > +#define TPM_LONG_TIMEOUT (10 * 60 * HZ) > + > +static struct tpm_vendor_specific tpm_vtpm = { > + .recv = vtpm_recv, > + .send = vtpm_send, > + .cancel = vtpm_cancel, > + .status = vtpm_status, > + .req_complete_mask = STATUS_BUSY | STATUS_DATA_AVAIL, > + .req_complete_val = STATUS_DATA_AVAIL, > + .req_canceled = STATUS_READY, > + .attr_group = &vtpm_attr_grp, > + .miscdev = { > + .fops = &vtpm_ops, > + }, > + .duration = { > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + TPM_LONG_TIMEOUT, > + }, > +}; > + > +struct tpm_chip *init_vtpm(struct device *dev, > + struct tpm_private *tp) > +{ > + long rc; > + struct tpm_chip *chip; > + struct vtpm_state *vtpms; > + > + vtpms = kzalloc(sizeof(struct vtpm_state), GFP_KERNEL); > + if (!vtpms) > + return ERR_PTR(-ENOMEM); > + > + vtpm_state_init(vtpms); > + vtpms->tpm_private = tp; > + > + chip = tpm_register_hardware(dev, &tpm_vtpm); > + if (!chip) { > + rc = -ENODEV; > + goto err_free_mem; > + } > + > + chip_set_private(chip, vtpms); > + > + return chip; > + > +err_free_mem: > + kfree(vtpms); > + > + return ERR_PTR(rc); > +} > + > +void cleanup_vtpm(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip_get_private(chip); > + tpm_remove_hardware(dev); > + kfree(vtpms); > +} > diff --git a/drivers/char/tpm/xen-tpmfront_vtpm.h b/drivers/char/tpm/xen-tpmfront_vtpm.h > new file mode 100644 > index 0000000..16cf323 > --- /dev/null > +++ b/drivers/char/tpm/xen-tpmfront_vtpm.h > @@ -0,0 +1,55 @@ > +#ifndef XEN_TPMFRONT_VTPM_H > +#define XEN_TPMFRONT_VTPM_H > + > +struct tpm_chip; > +struct tpm_private; > + > +struct vtpm_state { > + struct transmission *current_request; > + spinlock_t req_list_lock; > + wait_queue_head_t req_wait_queue; > + > + struct list_head queued_requests; > + > + struct transmission *current_response; > + spinlock_t resp_list_lock; > + wait_queue_head_t resp_wait_queue; > + > + u8 vd_status; > + u8 flags; > + > + unsigned long disconnect_time; > + > + /* > + * The following is a private structure of the underlying > + * driver. It is passed as parameter in the send function. > + */ > + struct tpm_private *tpm_private; > +}; > + > + > +enum vdev_status { > + TPM_VD_STATUS_DISCONNECTED = 0x0, > + TPM_VD_STATUS_CONNECTED = 0x1 > +}; > + > +/* this function is called from tpm_vtpm.c */ > +int vtpm_vd_send(struct tpm_private *tp, > + const u8 *buf, size_t count, void *ptr); > + > +/* these functions are offered by tpm_vtpm.c */ > +struct tpm_chip *init_vtpm(struct device *, > + struct tpm_private *); > +void cleanup_vtpm(struct device *); > +int vtpm_vd_recv(const struct tpm_chip *chip, > + const unsigned char *buffer, size_t count, void *ptr); > +void vtpm_vd_status(const struct tpm_chip *, u8 status); > + > +static inline struct tpm_private *tpm_private_from_dev(struct device *dev) > +{ > + struct tpm_chip *chip = dev_get_drvdata(dev); > + struct vtpm_state *vtpms = (struct vtpm_state *)chip->vendor.data; > + return vtpms->tpm_private; > +} > + > +#endif > diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h > new file mode 100644 > index 0000000..c9e7294 > --- /dev/null > +++ b/include/xen/interface/io/tpmif.h > @@ -0,0 +1,65 @@ > +/****************************************************************************** > + * tpmif.h > + * > + * TPM I/O interface for Xen guest OSes. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2005, IBM Corporation > + * > + * Author: Stefan Berger, stefanb@us.ibm.com > + * Grant table support: Mahadevan Gomathisankaran > + * > + * This code has been derived from tools/libxc/xen/io/netif.h > + * > + * Copyright (c) 2003-2004, Keir Fraser > + */ > + > +#ifndef __XEN_PUBLIC_IO_TPMIF_H__ > +#define __XEN_PUBLIC_IO_TPMIF_H__ > + > +#include "../grant_table.h" > + > +struct tpmif_tx_request { > + unsigned long addr; /* Machine address of packet. */ > + grant_ref_t ref; /* grant table access reference */ > + uint16_t unused; > + uint16_t size; /* Packet size in bytes. */ > +}; > +struct tpmif_tx_request; > + > +/* > + * The TPMIF_TX_RING_SIZE defines the number of pages the > + * front-end and backend can exchange (= size of array). > + */ > +#define TPMIF_TX_RING_SIZE 1 > + > +/* This structure must fit in a memory page. */ > + > +struct tpmif_ring { > + struct tpmif_tx_request req; > +}; > +struct tpmif_ring; > + > +struct tpmif_tx_interface { > + struct tpmif_ring ring[TPMIF_TX_RING_SIZE]; > +}; > +struct tpmif_tx_interface; > + > +#endif > -- > 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:32:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:32:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwvu-0005pO-3e; Mon, 12 Nov 2012 16:32:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwvs-0005oP-ML for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:32:20 +0000 Received: from [85.158.143.99:13275] by server-2.bemta-4.messagelabs.com id 0D/F7-28922-49421A05; Mon, 12 Nov 2012 16:32:20 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352737937!26962564!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29130 invoked from network); 12 Nov 2012 16:32:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:32:19 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGW8CN032578 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:32:09 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGW7Rc004836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:32:07 GMT Received: from abhmt106.oracle.com (abhmt106.oracle.com [141.146.116.58]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGW7QN012977; Mon, 12 Nov 2012 10:32:07 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 08:32:07 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 3DF904046C; Mon, 12 Nov 2012 11:32:04 -0500 (EST) Date: Mon, 12 Nov 2012 11:32:04 -0500 From: Konrad Rzeszutek Wilk To: Sander Eikelenboom Message-ID: <20121112163204.GB9575@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <711956045.20121112155024@eikelenboom.it> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: > > Monday, November 12, 2012, 3:28:35 PM, you wrote: > > > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > >> > Hey Ian, Xen-devel mailingl list, > >> > > >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or > >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > >> > the releases introduced this. The issue we are seeing is that a domU > >> > to domU communication breaks - this is with netperf/netserver talking to > >> > each other. > >> > > >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also > >> > (at least on some of my test hardware) exposed existing issues with > >> > drivers. The issue I have is that the 'skge' driver has a bug that has > >> > been there for ages (I tested way back to 3.0 and still saw it) were it > >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync > >> > somewhere. > >> > > >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > >> > OK. Even with synthetic driver (the fake one I posted somewhere) it > >> > dealt with compound pages properly (with debug or non-debug Xen > >> > hypervisor). > >> > >> The debug build is probably most interesting since it deliberately > >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > >> issues. > > > Right. My test env runs with that. And so far it only has issues > > with the skge one. > >> > >> > So was wondering if you had looked at this in more details? Any > >> > ideas? Or would it be more prudent to ask that once we know for sure > >> > which Linux release introduced the communication failures between > >> > guests? > >> > >> I've not looked at it any further I'm afraid. > >> > >> If these changes (be they in 3.5 or later, or earlier) are exposing > >> driver bugs then I suspect the netdev chaps would want to know about it. > > > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > > And is off checking v3.6. v3.7 is definitly a no go. > >> > >> FWIW I see the issue with tg3. > > After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. Were you ever able to trigger the BUG_ON in the patch that Ian posted? > I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. > > -- > Sander > > > I should double-check that but I didn't get any issues with the tg3 I had. > > > I was running the netperf/netserver from/to to see if I could reproduce the > > issues (70% loss) you described but did not have much luck. > > >> > >> Ian. > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:32:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:32:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwvu-0005pO-3e; Mon, 12 Nov 2012 16:32:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwvs-0005oP-ML for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:32:20 +0000 Received: from [85.158.143.99:13275] by server-2.bemta-4.messagelabs.com id 0D/F7-28922-49421A05; Mon, 12 Nov 2012 16:32:20 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-5.tower-216.messagelabs.com!1352737937!26962564!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1NjgwMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29130 invoked from network); 12 Nov 2012 16:32:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 16:32:19 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACGW8CN032578 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:32:09 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACGW7Rc004836 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 16:32:07 GMT Received: from abhmt106.oracle.com (abhmt106.oracle.com [141.146.116.58]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACGW7QN012977; Mon, 12 Nov 2012 10:32:07 -0600 Received: from phenom.dumpdata.com (/50.195.21.189) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 08:32:07 -0800 Received: by phenom.dumpdata.com (Postfix, from userid 1000) id 3DF904046C; Mon, 12 Nov 2012 11:32:04 -0500 (EST) Date: Mon, 12 Nov 2012 11:32:04 -0500 From: Konrad Rzeszutek Wilk To: Sander Eikelenboom Message-ID: <20121112163204.GB9575@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <711956045.20121112155024@eikelenboom.it> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: > > Monday, November 12, 2012, 3:28:35 PM, you wrote: > > > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > >> > Hey Ian, Xen-devel mailingl list, > >> > > >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or > >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > >> > the releases introduced this. The issue we are seeing is that a domU > >> > to domU communication breaks - this is with netperf/netserver talking to > >> > each other. > >> > > >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also > >> > (at least on some of my test hardware) exposed existing issues with > >> > drivers. The issue I have is that the 'skge' driver has a bug that has > >> > been there for ages (I tested way back to 3.0 and still saw it) were it > >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync > >> > somewhere. > >> > > >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > >> > OK. Even with synthetic driver (the fake one I posted somewhere) it > >> > dealt with compound pages properly (with debug or non-debug Xen > >> > hypervisor). > >> > >> The debug build is probably most interesting since it deliberately > >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > >> issues. > > > Right. My test env runs with that. And so far it only has issues > > with the skge one. > >> > >> > So was wondering if you had looked at this in more details? Any > >> > ideas? Or would it be more prudent to ask that once we know for sure > >> > which Linux release introduced the communication failures between > >> > guests? > >> > >> I've not looked at it any further I'm afraid. > >> > >> If these changes (be they in 3.5 or later, or earlier) are exposing > >> driver bugs then I suspect the netdev chaps would want to know about it. > > > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > > And is off checking v3.6. v3.7 is definitly a no go. > >> > >> FWIW I see the issue with tg3. > > After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. Were you ever able to trigger the BUG_ON in the patch that Ian posted? > I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. > > -- > Sander > > > I should double-check that but I didn't get any issues with the tg3 I had. > > > I was running the netperf/netserver from/to to see if I could reproduce the > > issues (70% loss) you described but did not have much luck. > > >> > >> Ian. > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:35:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:35:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwyN-00066A-LM; Mon, 12 Nov 2012 16:34:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwyM-00065x-GG for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:34:55 +0000 Received: from [85.158.138.51:59998] by server-11.bemta-3.messagelabs.com id 97/36-19361-D2521A05; Mon, 12 Nov 2012 16:34:53 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352738092!21632071!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22271 invoked from network); 12 Nov 2012 16:34:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:34:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="asc'?scan'208";a="15756004" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:34:52 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:34:51 +0000 Message-ID: <1352738082.32203.7.camel@Solace> From: Dario Faggioli To: Ian Campbell Date: Mon, 12 Nov 2012 17:34:42 +0100 In-Reply-To: <1352737619.27833.297.camel@zakaz.uk.xensource.com> References: <4e5e196ea494ba7c4aaf.1350657295@Solace> <1352737619.27833.297.camel@zakaz.uk.xensource.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Andre Przywara , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2 of 3 v2] libxl, xl: user can ask for min and max nodes to use during placement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8351398986138395391==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8351398986138395391== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-qZuhBs324O6DucYIS65i" --=-qZuhBs324O6DucYIS65i Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2012-11-12 at 16:26 +0000, Ian Campbell wrote: > On Fri, 2012-10-19 at 15:34 +0100, Dario Faggioli wrote: > > @@ -219,6 +219,11 @@ int libxl__domain_build_info_setdefault( > > =20 > > libxl_defbool_setdefault(&b_info->numa_placement, true); > > =20 > > + if (!b_info->min_nodes) > > + b_info->min_nodes =3D 0; > > + if (!b_info->max_nodes) > > + b_info->max_nodes =3D 0;=20 >=20 > Aren't both of these if statements tautologous? >=20 Looks like they are. I'll double check this before reposting. I think what I wanted to do was making sure to zero those new fields, if not otherwise initialized by someone else... and, of course, I got that wrong! :-P Thanks, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-qZuhBs324O6DucYIS65i Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlChJSIACgkQk4XaBE3IOsR7LwCeIdLCWcOJtBiiMcMBnHxnjlQO FasAnRLhIGzhJaVtGXDrD+AUikdyRxaU =jyVz -----END PGP SIGNATURE----- --=-qZuhBs324O6DucYIS65i-- --===============8351398986138395391== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8351398986138395391==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 16:35:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:35:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwyN-00066A-LM; Mon, 12 Nov 2012 16:34:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXwyM-00065x-GG for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:34:55 +0000 Received: from [85.158.138.51:59998] by server-11.bemta-3.messagelabs.com id 97/36-19361-D2521A05; Mon, 12 Nov 2012 16:34:53 +0000 X-Env-Sender: dario.faggioli@citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352738092!21632071!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22271 invoked from network); 12 Nov 2012 16:34:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:34:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="asc'?scan'208";a="15756004" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:34:52 +0000 Received: from [127.0.0.1] (10.80.16.67) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:34:51 +0000 Message-ID: <1352738082.32203.7.camel@Solace> From: Dario Faggioli To: Ian Campbell Date: Mon, 12 Nov 2012 17:34:42 +0100 In-Reply-To: <1352737619.27833.297.camel@zakaz.uk.xensource.com> References: <4e5e196ea494ba7c4aaf.1350657295@Solace> <1352737619.27833.297.camel@zakaz.uk.xensource.com> X-Mailer: Evolution 3.4.4-1 MIME-Version: 1.0 Cc: Andre Przywara , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 2 of 3 v2] libxl, xl: user can ask for min and max nodes to use during placement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8351398986138395391==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8351398986138395391== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-qZuhBs324O6DucYIS65i" --=-qZuhBs324O6DucYIS65i Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2012-11-12 at 16:26 +0000, Ian Campbell wrote: > On Fri, 2012-10-19 at 15:34 +0100, Dario Faggioli wrote: > > @@ -219,6 +219,11 @@ int libxl__domain_build_info_setdefault( > > =20 > > libxl_defbool_setdefault(&b_info->numa_placement, true); > > =20 > > + if (!b_info->min_nodes) > > + b_info->min_nodes =3D 0; > > + if (!b_info->max_nodes) > > + b_info->max_nodes =3D 0;=20 >=20 > Aren't both of these if statements tautologous? >=20 Looks like they are. I'll double check this before reposting. I think what I wanted to do was making sure to zero those new fields, if not otherwise initialized by someone else... and, of course, I got that wrong! :-P Thanks, Dario --=20 <> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-qZuhBs324O6DucYIS65i Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlChJSIACgkQk4XaBE3IOsR7LwCeIdLCWcOJtBiiMcMBnHxnjlQO FasAnRLhIGzhJaVtGXDrD+AUikdyRxaU =jyVz -----END PGP SIGNATURE----- --=-qZuhBs324O6DucYIS65i-- --===============8351398986138395391== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8351398986138395391==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 16:44:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:44:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx6e-0006S3-L6; Mon, 12 Nov 2012 16:43:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx6d-0006Ry-2h for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:43:27 +0000 Received: from [193.109.254.147:61408] by server-12.bemta-14.messagelabs.com id D1/6B-00510-E2721A05; Mon, 12 Nov 2012 16:43:26 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352738560!2721831!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2682 invoked from network); 12 Nov 2012 16:42:40 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:42:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15756194" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:42:39 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:42:39 +0000 Message-ID: <1352738557.27833.302.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Jacek Konieczny Date: Mon, 12 Nov 2012 16:42:37 +0000 In-Reply-To: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > The claim_lock() function would fail in the perl code with: > > Invalid argument at -e line 2. > > because the Perl snippet opens for reading the file descriptor, which > was earlier opened for write (append). Looks plausible to me. How does this interact with the eval "exec $_lockfd<&-" which Olaf added in 26079:b3b03536789a ? I suppose close is close and <&- and >&- or even <>&- are equivalent? > > Signed-off-by: Jacek Konieczny > --- > tools/hotplug/Linux/locking.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh > index e34f155..122bcfb 100644 > --- a/tools/hotplug/Linux/locking.sh > +++ b/tools/hotplug/Linux/locking.sh > @@ -44,7 +44,7 @@ claim_lock() > # See below for a correctness proof. > local rightfile > while true; do > - eval "exec $_lockfd>>$_lockfile" > + eval "exec $_lockfd<>$_lockfile" > flock -x $_lockfd || return $? > # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or > # use bash's test -ef because those all go through what is _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:44:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:44:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx6e-0006S3-L6; Mon, 12 Nov 2012 16:43:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx6d-0006Ry-2h for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 16:43:27 +0000 Received: from [193.109.254.147:61408] by server-12.bemta-14.messagelabs.com id D1/6B-00510-E2721A05; Mon, 12 Nov 2012 16:43:26 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352738560!2721831!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2682 invoked from network); 12 Nov 2012 16:42:40 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:42:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,762,1344211200"; d="scan'208";a="15756194" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:42:39 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:42:39 +0000 Message-ID: <1352738557.27833.302.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Jacek Konieczny Date: Mon, 12 Nov 2012 16:42:37 +0000 In-Reply-To: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > The claim_lock() function would fail in the perl code with: > > Invalid argument at -e line 2. > > because the Perl snippet opens for reading the file descriptor, which > was earlier opened for write (append). Looks plausible to me. How does this interact with the eval "exec $_lockfd<&-" which Olaf added in 26079:b3b03536789a ? I suppose close is close and <&- and >&- or even <>&- are equivalent? > > Signed-off-by: Jacek Konieczny > --- > tools/hotplug/Linux/locking.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh > index e34f155..122bcfb 100644 > --- a/tools/hotplug/Linux/locking.sh > +++ b/tools/hotplug/Linux/locking.sh > @@ -44,7 +44,7 @@ claim_lock() > # See below for a correctness proof. > local rightfile > while true; do > - eval "exec $_lockfd>>$_lockfile" > + eval "exec $_lockfd<>$_lockfile" > flock -x $_lockfd || return $? > # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or > # use bash's test -ef because those all go through what is _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 16:59:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:59:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxM0-0006g5-8w; Mon, 12 Nov 2012 16:59:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxLy-0006g0-Q0 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:59:19 +0000 Received: from [85.158.143.35:11981] by server-3.bemta-4.messagelabs.com id 06/63-06841-6EA21A05; Mon, 12 Nov 2012 16:59:18 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1352739554!5199356!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32666 invoked from network); 12 Nov 2012 16:59:14 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:59:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756716" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:59:14 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:59:13 +0000 Message-ID: <50A12AE1.7010104@citrix.com> Date: Mon, 12 Nov 2012 17:59:13 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> <50A0C1D0.1060407@citrix.com> <1352734440.27833.281.camel@zakaz.uk.xensource.com> In-Reply-To: <1352734440.27833.281.camel@zakaz.uk.xensource.com> Cc: Manuel Bouyer , "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gMTIvMTEvMTIgMTY6MzQsIElhbiBDYW1wYmVsbCB3cm90ZToKPiBPbiBNb24sIDIwMTItMTEt MTIgYXQgMDk6MzAgKzAwMDAsIFJvZ2VyIFBhdSBNb25uw6kgd3JvdGU6Cj4+Cj4+IEkgd2lsbCB0 cnkgdG8gcGVyZm9ybSBhIHNpbWlsYXIgdGVzdCB3aXRoIGEgTmV0QlNEIERvbTAsIGJ1dCB3aXRo IHRoZQo+PiBwYXRjaCBpdCB3aWxsIHByb2JhYmx5IGJlIGEgbGl0dGxlIGJpdCBzbG93ZXIgdGhh biB3aXRob3V0IGl0IChiZWNhdXNlCj4+IHdlIGhhdmUgdG8gcGVyZm9ybSB0aGUgbWVtY3B5IGlu IHRoZSBmcm9udGVuZCwgCj4gCj4gRG9lc24ndCB0aGUgZnJvbnRlbmQgZmFsbGJhY2sgdG8gdGhl IHNhbWUgb2xkIGNvZGUgYXMgYWx3YXlzIGlmIHRoZSBiL2UKPiBkb2Vzbid0IGFkdmVydGlzZSB0 aGUgbmV3IGZlYXR1cmU/CgpObywgdGhlIGZyb250ZW5kIGFsd2F5cyB1c2VzIHBlcnNpc3RlbnQg Z3JhbnRzLCBzaW5jZSBpdCdzIGNvbXBhdGlibGUKd2l0aCBhIGJhY2tlbmQgbm90IHVzaW5nIHBl cnNpc3RlbnQgZ3JhbnRzLCB0aGUgZnJvbnRlbmQgd2lsbCByZXVzZSB0aGUKc2FtZSBncmFudHMs IGFuZCB0aGUgYmFja2VuZCB3aWxsIHVzZSB0aGUgb2xkIG1lY2hhbmlzbSBvZiBtYXBwaW5nIGFu ZAp1bm1hcHBpbmcgdGhlbS4KCkFjdHVhbGx5IGl0IHNlZW1zIEkgd2FzIHdyb25nIG9uIHRoYXQs IHVzaW5nIGEgcGVyc2lzdGVudCBmcm9udGVuZCB3aXRoCmEgbm9uLXBlcnNpc3RlbnQgYmFja2Vu ZCBsZXRzIHRvIGEgbW9yZSBjb25zaXN0ZW50IHBlcmZvcm1hbmNlLCBzZWUgdGhlCmZvbGxvd2lu ZyBncmFwaDoKCmh0dHA6Ly94ZW5iaXRzLnhlbi5vcmcvcGVvcGxlL3JveWdlci9wZXJzaXN0ZW50 X2dyYW50cy9ub25wZXJzX3JlYWQucG5nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK From xen-devel-bounces@lists.xen.org Mon Nov 12 16:59:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 16:59:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxM0-0006g5-8w; Mon, 12 Nov 2012 16:59:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxLy-0006g0-Q0 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:59:19 +0000 Received: from [85.158.143.35:11981] by server-3.bemta-4.messagelabs.com id 06/63-06841-6EA21A05; Mon, 12 Nov 2012 16:59:18 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1352739554!5199356!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32666 invoked from network); 12 Nov 2012 16:59:14 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:59:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756716" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 16:59:14 +0000 Received: from [192.168.1.30] (10.31.3.234) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 16:59:13 +0000 Message-ID: <50A12AE1.7010104@citrix.com> Date: Mon, 12 Nov 2012 17:59:13 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> <50A0C1D0.1060407@citrix.com> <1352734440.27833.281.camel@zakaz.uk.xensource.com> In-Reply-To: <1352734440.27833.281.camel@zakaz.uk.xensource.com> Cc: Manuel Bouyer , "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gMTIvMTEvMTIgMTY6MzQsIElhbiBDYW1wYmVsbCB3cm90ZToKPiBPbiBNb24sIDIwMTItMTEt MTIgYXQgMDk6MzAgKzAwMDAsIFJvZ2VyIFBhdSBNb25uw6kgd3JvdGU6Cj4+Cj4+IEkgd2lsbCB0 cnkgdG8gcGVyZm9ybSBhIHNpbWlsYXIgdGVzdCB3aXRoIGEgTmV0QlNEIERvbTAsIGJ1dCB3aXRo IHRoZQo+PiBwYXRjaCBpdCB3aWxsIHByb2JhYmx5IGJlIGEgbGl0dGxlIGJpdCBzbG93ZXIgdGhh biB3aXRob3V0IGl0IChiZWNhdXNlCj4+IHdlIGhhdmUgdG8gcGVyZm9ybSB0aGUgbWVtY3B5IGlu IHRoZSBmcm9udGVuZCwgCj4gCj4gRG9lc24ndCB0aGUgZnJvbnRlbmQgZmFsbGJhY2sgdG8gdGhl IHNhbWUgb2xkIGNvZGUgYXMgYWx3YXlzIGlmIHRoZSBiL2UKPiBkb2Vzbid0IGFkdmVydGlzZSB0 aGUgbmV3IGZlYXR1cmU/CgpObywgdGhlIGZyb250ZW5kIGFsd2F5cyB1c2VzIHBlcnNpc3RlbnQg Z3JhbnRzLCBzaW5jZSBpdCdzIGNvbXBhdGlibGUKd2l0aCBhIGJhY2tlbmQgbm90IHVzaW5nIHBl cnNpc3RlbnQgZ3JhbnRzLCB0aGUgZnJvbnRlbmQgd2lsbCByZXVzZSB0aGUKc2FtZSBncmFudHMs IGFuZCB0aGUgYmFja2VuZCB3aWxsIHVzZSB0aGUgb2xkIG1lY2hhbmlzbSBvZiBtYXBwaW5nIGFu ZAp1bm1hcHBpbmcgdGhlbS4KCkFjdHVhbGx5IGl0IHNlZW1zIEkgd2FzIHdyb25nIG9uIHRoYXQs IHVzaW5nIGEgcGVyc2lzdGVudCBmcm9udGVuZCB3aXRoCmEgbm9uLXBlcnNpc3RlbnQgYmFja2Vu ZCBsZXRzIHRvIGEgbW9yZSBjb25zaXN0ZW50IHBlcmZvcm1hbmNlLCBzZWUgdGhlCmZvbGxvd2lu ZyBncmFwaDoKCmh0dHA6Ly94ZW5iaXRzLnhlbi5vcmcvcGVvcGxlL3JveWdlci9wZXJzaXN0ZW50 X2dyYW50cy9ub25wZXJzX3JlYWQucG5nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK From xen-devel-bounces@lists.xen.org Mon Nov 12 17:04:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:04:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQN-0006tc-VO; Mon, 12 Nov 2012 17:03:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQM-0006tS-71 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:03:50 +0000 Received: from [85.158.143.99:56460] by server-2.bemta-4.messagelabs.com id 31/60-28922-5FB21A05; Mon, 12 Nov 2012 17:03:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352739829!24357908!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27429 invoked from network); 12 Nov 2012 17:03:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:03:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756848" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:03:48 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:03:48 +0000 Message-ID: <1352739827.27833.307.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Daley Date: Mon, 12 Nov 2012 17:03:47 +0000 In-Reply-To: <1352701985-3696-1-git-send-email-mattjd@gmail.com> References: <1352701985-3696-1-git-send-email-mattjd@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] pygrub: Fix command line argument error handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 06:33 +0000, Matthew Daley wrote: > pygrub's individual config file parsers do not correctly check the > amount of command line arguments given to them. In addition, the LILO > config parser would report an incorrect message. > > Use len() to correctly check the amount of arguments, and fix the LILO > error message. > > Signed-off-by: Matthew Daley Acked-by: Ian Campbell and applied, thanks. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:04:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:04:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQN-0006tc-VO; Mon, 12 Nov 2012 17:03:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQM-0006tS-71 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:03:50 +0000 Received: from [85.158.143.99:56460] by server-2.bemta-4.messagelabs.com id 31/60-28922-5FB21A05; Mon, 12 Nov 2012 17:03:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352739829!24357908!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27429 invoked from network); 12 Nov 2012 17:03:49 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:03:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756848" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:03:48 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:03:48 +0000 Message-ID: <1352739827.27833.307.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Daley Date: Mon, 12 Nov 2012 17:03:47 +0000 In-Reply-To: <1352701985-3696-1-git-send-email-mattjd@gmail.com> References: <1352701985-3696-1-git-send-email-mattjd@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] pygrub: Fix command line argument error handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 06:33 +0000, Matthew Daley wrote: > pygrub's individual config file parsers do not correctly check the > amount of command line arguments given to them. In addition, the LILO > config parser would report an incorrect message. > > Use len() to correctly check the amount of arguments, and fix the LILO > error message. > > Signed-off-by: Matthew Daley Acked-by: Ian Campbell and applied, thanks. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:04:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQj-0006vP-Bh; Mon, 12 Nov 2012 17:04:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQi-0006v7-4l for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:04:12 +0000 Received: from [85.158.139.211:8330] by server-8.bemta-5.messagelabs.com id 0A/B0-06050-B0C21A05; Mon, 12 Nov 2012 17:04:11 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352739850!19847225!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8854 invoked from network); 12 Nov 2012 17:04:10 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756859" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:10 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:09 +0000 Message-ID: <1352739849.27833.308.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Kouya Shimura Date: Mon, 12 Nov 2012 17:04:09 +0000 In-Reply-To: <509CB5FB.7020404@jp.fujitsu.com> References: <509CB5FB.7020404@jp.fujitsu.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 07:51 +0000, Kouya Shimura wrote: > The same problem was once fixed by c/s 23878:59c7213b5949 > but c/s 25344:0f3b1e13d6af broke it. > > Signed-off-by: Kouya Shimura Acked-by: Ian Campbell and applied. Ian (J): Not sure if the test harness does much after the migration phase but adding a few lifecycle ops as a sanity check might be useful? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:04:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQj-0006vP-Bh; Mon, 12 Nov 2012 17:04:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxQi-0006v7-4l for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:04:12 +0000 Received: from [85.158.139.211:8330] by server-8.bemta-5.messagelabs.com id 0A/B0-06050-B0C21A05; Mon, 12 Nov 2012 17:04:11 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1352739850!19847225!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8854 invoked from network); 12 Nov 2012 17:04:10 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:10 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756859" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:10 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:09 +0000 Message-ID: <1352739849.27833.308.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Kouya Shimura Date: Mon, 12 Nov 2012 17:04:09 +0000 In-Reply-To: <509CB5FB.7020404@jp.fujitsu.com> References: <509CB5FB.7020404@jp.fujitsu.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-11-09 at 07:51 +0000, Kouya Shimura wrote: > The same problem was once fixed by c/s 23878:59c7213b5949 > but c/s 25344:0f3b1e13d6af broke it. > > Signed-off-by: Kouya Shimura Acked-by: Ian Campbell and applied. Ian (J): Not sure if the test harness does much after the migration phase but adding a few lifecycle ops as a sanity check might be useful? Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:05:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:05:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxR9-0006z1-PW; Mon, 12 Nov 2012 17:04:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxR8-0006yg-Iu for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:04:38 +0000 Received: from [85.158.143.99:31328] by server-1.bemta-4.messagelabs.com id C9/D5-27934-52C21A05; Mon, 12 Nov 2012 17:04:37 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352739876!28714281!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4921 invoked from network); 12 Nov 2012 17:04:36 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:36 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756873" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:36 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:35 +0000 Message-ID: <1352739874.27833.309.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Andres Lagar-Cavilla Date: Mon, 12 Nov 2012 17:04:34 +0000 In-Reply-To: References: <5171750d133ef2c27ac8.1350055853@xdev.gridcentric.ca> <1350547689.28188.31.camel@dagon.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Christoph Egger , Ian Jackson , "xen-devel@lists.xen.org" , Andres Lagar-Cavilla , Attilio Rao , Roger Pau Monne Subject: Re: [Xen-devel] [PATCH] Synchronize privcmd header constants X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 03:20 +0100, Andres Lagar-Cavilla wrote: > I've had a look. The xen.org tree knows about three other OSes: minios, solaris and netbsd. None knows about paged out frames. None uses the XEN_DOMCTL_PFINFO_PAGEDTAB constant in domctl.h > > 1. The domctl.h constant can still go away without hurting other OSes. > 2. It is trivial to add the PRIVCMD_MMAPBATCH_* constants to the privcmd.h of other OSes. It can't hurt. I can do it here. Each OS Xen maintainer would have to take care of syncing that up in the respective upstream. However ... > 3. Not that trivial to teach all these OSes about paged out frames. Does anyone care? > > Please advise. I'm convinced, I'd forgotten that only Linux dom0 did paging. Acked-by: Ian Campbell and applied, thanks & sorry for the delay. > Thanks > Andres > > On Oct 18, 2012, at 4:08 AM, Ian Campbell wrote: > > > On Fri, 2012-10-12 at 16:30 +0100, Andres Lagar-Cavilla wrote: > >> tools/include/xen-sys/Linux/privcmd.h | 3 +++ > >> tools/libxc/xc_linux_osdep.c | 10 +++++----- > >> xen/include/public/domctl.h | 1 - > >> 3 files changed, 8 insertions(+), 6 deletions(-) > >> > >> > >> Since Linux's git commit ceb90fa0a8008059ecbbf9114cb89dc71a730bb6, the > >> privcmd.h interface between Linux and libxc specifies two new constants, > >> PRIVCMD_MMAPBATCH_MFN_ERROR and PRIVCMD_MMAPBATCH_PAGED_ERROR. These constants > >> represent the error codes encoded in the top nibble of an mfn slot passed to > >> the legacy MMAPBATCH ioctl. > >> > >> In particular, libxenctrl checks for the equivalent of the latter constant when > >> dealing with paged out frames that might be the target of a foreign map. > >> > >> Previously, the relevant constant was defined in the domctl hypervisor > >> interface header (XEN_DOMCTL_PFINFO_PAGEDTAB). Because this top-nibble encoding > >> is a contract between the dom0 kernel and libxc, a domctl.h definition is > >> misplaced. > >> > >> - Sync the privcmd.h header to that now available in upstream Linux > > > > Although the ioctl is Linux specific is the top-nibble behaviour (and > > therefore the #define) common to other dom0s like *BSD? Can a BSD person > > confirm that this change won't breaking things for them please. > > > >> - Update libxc appropriately > >> - Remove the unnecessary constant in domctl.h > >> > >> Signed-off-by: Andres Lagar-Cavilla > >> > >> diff -r 4eed5e64544f -r 5171750d133e tools/include/xen-sys/Linux/privcmd.h > >> --- a/tools/include/xen-sys/Linux/privcmd.h > >> +++ b/tools/include/xen-sys/Linux/privcmd.h > >> @@ -64,6 +64,9 @@ typedef struct privcmd_mmapbatch { > >> xen_pfn_t __user *arr; /* array of mfns - top nibble set on err */ > >> } privcmd_mmapbatch_t; > >> > >> +#define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U > >> +#define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U > >> + > >> typedef struct privcmd_mmapbatch_v2 { > >> unsigned int num; /* number of pages to populate */ > >> domid_t dom; /* target domain */ > >> diff -r 4eed5e64544f -r 5171750d133e tools/libxc/xc_linux_osdep.c > >> --- a/tools/libxc/xc_linux_osdep.c > >> +++ b/tools/libxc/xc_linux_osdep.c > >> @@ -129,7 +129,7 @@ static int xc_map_foreign_batch_single(i > >> > >> do > >> { > >> - *mfn ^= XEN_DOMCTL_PFINFO_PAGEDTAB; > >> + *mfn ^= PRIVCMD_MMAPBATCH_PAGED_ERROR; > >> usleep(100); > >> rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx); > >> } > >> @@ -166,8 +166,8 @@ static void *linux_privcmd_map_foreign_b > >> > >> for ( i = 0; i < num; i++ ) > >> { > >> - if ( (arr[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == > >> - XEN_DOMCTL_PFINFO_PAGEDTAB ) > >> + if ( (arr[i] & PRIVCMD_MMAPBATCH_MFN_ERROR) == > >> + PRIVCMD_MMAPBATCH_PAGED_ERROR ) > >> { > >> unsigned long paged_addr = (unsigned long)addr + (i << XC_PAGE_SHIFT); > >> rc = xc_map_foreign_batch_single(fd, dom, &arr[i], > >> @@ -323,12 +323,12 @@ static void *linux_privcmd_map_foreign_b > >> default: > >> err[i] = -EINVAL; > >> continue; > >> - case XEN_DOMCTL_PFINFO_PAGEDTAB: > >> + case PRIVCMD_MMAPBATCH_PAGED_ERROR: > >> if ( rc != -ENOENT ) > >> { > >> err[i] = rc ?: -EINVAL; > >> continue; > >> - } > >> + } > >> rc = xc_map_foreign_batch_single(fd, dom, pfn + i, > >> (unsigned long)addr + ((unsigned long)i< >> if ( rc < 0 ) > >> diff -r 4eed5e64544f -r 5171750d133e xen/include/public/domctl.h > >> --- a/xen/include/public/domctl.h > >> +++ b/xen/include/public/domctl.h > >> @@ -135,7 +135,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getme > >> #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > >> #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > >> #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > >> -#define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > >> > >> struct xen_domctl_getpageframeinfo { > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:05:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:05:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxR9-0006z1-PW; Mon, 12 Nov 2012 17:04:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxR8-0006yg-Iu for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:04:38 +0000 Received: from [85.158.143.99:31328] by server-1.bemta-4.messagelabs.com id C9/D5-27934-52C21A05; Mon, 12 Nov 2012 17:04:37 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352739876!28714281!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4921 invoked from network); 12 Nov 2012 17:04:36 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:36 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756873" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:36 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:35 +0000 Message-ID: <1352739874.27833.309.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Andres Lagar-Cavilla Date: Mon, 12 Nov 2012 17:04:34 +0000 In-Reply-To: References: <5171750d133ef2c27ac8.1350055853@xdev.gridcentric.ca> <1350547689.28188.31.camel@dagon.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Christoph Egger , Ian Jackson , "xen-devel@lists.xen.org" , Andres Lagar-Cavilla , Attilio Rao , Roger Pau Monne Subject: Re: [Xen-devel] [PATCH] Synchronize privcmd header constants X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 2012-10-19 at 03:20 +0100, Andres Lagar-Cavilla wrote: > I've had a look. The xen.org tree knows about three other OSes: minios, solaris and netbsd. None knows about paged out frames. None uses the XEN_DOMCTL_PFINFO_PAGEDTAB constant in domctl.h > > 1. The domctl.h constant can still go away without hurting other OSes. > 2. It is trivial to add the PRIVCMD_MMAPBATCH_* constants to the privcmd.h of other OSes. It can't hurt. I can do it here. Each OS Xen maintainer would have to take care of syncing that up in the respective upstream. However ... > 3. Not that trivial to teach all these OSes about paged out frames. Does anyone care? > > Please advise. I'm convinced, I'd forgotten that only Linux dom0 did paging. Acked-by: Ian Campbell and applied, thanks & sorry for the delay. > Thanks > Andres > > On Oct 18, 2012, at 4:08 AM, Ian Campbell wrote: > > > On Fri, 2012-10-12 at 16:30 +0100, Andres Lagar-Cavilla wrote: > >> tools/include/xen-sys/Linux/privcmd.h | 3 +++ > >> tools/libxc/xc_linux_osdep.c | 10 +++++----- > >> xen/include/public/domctl.h | 1 - > >> 3 files changed, 8 insertions(+), 6 deletions(-) > >> > >> > >> Since Linux's git commit ceb90fa0a8008059ecbbf9114cb89dc71a730bb6, the > >> privcmd.h interface between Linux and libxc specifies two new constants, > >> PRIVCMD_MMAPBATCH_MFN_ERROR and PRIVCMD_MMAPBATCH_PAGED_ERROR. These constants > >> represent the error codes encoded in the top nibble of an mfn slot passed to > >> the legacy MMAPBATCH ioctl. > >> > >> In particular, libxenctrl checks for the equivalent of the latter constant when > >> dealing with paged out frames that might be the target of a foreign map. > >> > >> Previously, the relevant constant was defined in the domctl hypervisor > >> interface header (XEN_DOMCTL_PFINFO_PAGEDTAB). Because this top-nibble encoding > >> is a contract between the dom0 kernel and libxc, a domctl.h definition is > >> misplaced. > >> > >> - Sync the privcmd.h header to that now available in upstream Linux > > > > Although the ioctl is Linux specific is the top-nibble behaviour (and > > therefore the #define) common to other dom0s like *BSD? Can a BSD person > > confirm that this change won't breaking things for them please. > > > >> - Update libxc appropriately > >> - Remove the unnecessary constant in domctl.h > >> > >> Signed-off-by: Andres Lagar-Cavilla > >> > >> diff -r 4eed5e64544f -r 5171750d133e tools/include/xen-sys/Linux/privcmd.h > >> --- a/tools/include/xen-sys/Linux/privcmd.h > >> +++ b/tools/include/xen-sys/Linux/privcmd.h > >> @@ -64,6 +64,9 @@ typedef struct privcmd_mmapbatch { > >> xen_pfn_t __user *arr; /* array of mfns - top nibble set on err */ > >> } privcmd_mmapbatch_t; > >> > >> +#define PRIVCMD_MMAPBATCH_MFN_ERROR 0xf0000000U > >> +#define PRIVCMD_MMAPBATCH_PAGED_ERROR 0x80000000U > >> + > >> typedef struct privcmd_mmapbatch_v2 { > >> unsigned int num; /* number of pages to populate */ > >> domid_t dom; /* target domain */ > >> diff -r 4eed5e64544f -r 5171750d133e tools/libxc/xc_linux_osdep.c > >> --- a/tools/libxc/xc_linux_osdep.c > >> +++ b/tools/libxc/xc_linux_osdep.c > >> @@ -129,7 +129,7 @@ static int xc_map_foreign_batch_single(i > >> > >> do > >> { > >> - *mfn ^= XEN_DOMCTL_PFINFO_PAGEDTAB; > >> + *mfn ^= PRIVCMD_MMAPBATCH_PAGED_ERROR; > >> usleep(100); > >> rc = ioctl(fd, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx); > >> } > >> @@ -166,8 +166,8 @@ static void *linux_privcmd_map_foreign_b > >> > >> for ( i = 0; i < num; i++ ) > >> { > >> - if ( (arr[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == > >> - XEN_DOMCTL_PFINFO_PAGEDTAB ) > >> + if ( (arr[i] & PRIVCMD_MMAPBATCH_MFN_ERROR) == > >> + PRIVCMD_MMAPBATCH_PAGED_ERROR ) > >> { > >> unsigned long paged_addr = (unsigned long)addr + (i << XC_PAGE_SHIFT); > >> rc = xc_map_foreign_batch_single(fd, dom, &arr[i], > >> @@ -323,12 +323,12 @@ static void *linux_privcmd_map_foreign_b > >> default: > >> err[i] = -EINVAL; > >> continue; > >> - case XEN_DOMCTL_PFINFO_PAGEDTAB: > >> + case PRIVCMD_MMAPBATCH_PAGED_ERROR: > >> if ( rc != -ENOENT ) > >> { > >> err[i] = rc ?: -EINVAL; > >> continue; > >> - } > >> + } > >> rc = xc_map_foreign_batch_single(fd, dom, pfn + i, > >> (unsigned long)addr + ((unsigned long)i< >> if ( rc < 0 ) > >> diff -r 4eed5e64544f -r 5171750d133e xen/include/public/domctl.h > >> --- a/xen/include/public/domctl.h > >> +++ b/xen/include/public/domctl.h > >> @@ -135,7 +135,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getme > >> #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > >> #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > >> #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > >> -#define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > >> #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > >> > >> struct xen_domctl_getpageframeinfo { > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:05:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:05:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxRR-00073H-DP; Mon, 12 Nov 2012 17:04:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxRP-00072i-If for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:04:55 +0000 Received: from [85.158.137.99:61292] by server-12.bemta-3.messagelabs.com id EB/36-22757-63C21A05; Mon, 12 Nov 2012 17:04:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352739893!15649801!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17415 invoked from network); 12 Nov 2012 17:04:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756882" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:52 +0000 Message-ID: <1352739892.27833.310.camel@zakaz.uk.xensource.com> From: Ian Campbell To: George Dunlap Date: Mon, 12 Nov 2012 17:04:52 +0000 In-Reply-To: References: <20121012173222.31965.33368.sendpatchset@magnum.int.mccr.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Dave McCracken , "Keir \(Xen.org\)" , Xen Developers List Subject: Re: [Xen-devel] [PATCH] Make restore work properly with PV superpage flag X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-10-18 at 15:41 +0100, George Dunlap wrote: > On Fri, Oct 12, 2012 at 6:32 PM, Dave McCracken wrote: > > For PV guests, the superpage flag means to unconditionally allocate all > > pages as superpages, which is required for Linux hugepages to work. Support > > for this on restore was not supported. This patch adds proper support for > > the superpage flag on restore. > > > > For HVM guests, the superpage flag has been used to mean attempt to allocate > > superpages if possible on restore. This functionality has been preserved. > > > > Signed-off-by: Dave McCracken [...] > > Acked-by: George Dunlap Applied, sorry for the delay. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:05:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:05:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxRR-00073H-DP; Mon, 12 Nov 2012 17:04:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxRP-00072i-If for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:04:55 +0000 Received: from [85.158.137.99:61292] by server-12.bemta-3.messagelabs.com id EB/36-22757-63C21A05; Mon, 12 Nov 2012 17:04:54 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352739893!15649801!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17415 invoked from network); 12 Nov 2012 17:04:53 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:04:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15756882" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:04:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:04:52 +0000 Message-ID: <1352739892.27833.310.camel@zakaz.uk.xensource.com> From: Ian Campbell To: George Dunlap Date: Mon, 12 Nov 2012 17:04:52 +0000 In-Reply-To: References: <20121012173222.31965.33368.sendpatchset@magnum.int.mccr.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Dave McCracken , "Keir \(Xen.org\)" , Xen Developers List Subject: Re: [Xen-devel] [PATCH] Make restore work properly with PV superpage flag X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-10-18 at 15:41 +0100, George Dunlap wrote: > On Fri, Oct 12, 2012 at 6:32 PM, Dave McCracken wrote: > > For PV guests, the superpage flag means to unconditionally allocate all > > pages as superpages, which is required for Linux hugepages to work. Support > > for this on restore was not supported. This patch adds proper support for > > the superpage flag on restore. > > > > For HVM guests, the superpage flag has been used to mean attempt to allocate > > superpages if possible on restore. This functionality has been preserved. > > > > Signed-off-by: Dave McCracken [...] > > Acked-by: George Dunlap Applied, sorry for the delay. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:10:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:10:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxWY-0007VK-6M; Mon, 12 Nov 2012 17:10:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxWX-0007VF-Ai for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:10:13 +0000 Received: from [85.158.139.211:13012] by server-9.bemta-5.messagelabs.com id 23/9C-29295-47D21A05; Mon, 12 Nov 2012 17:10:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1352740211!19813092!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12383 invoked from network); 12 Nov 2012 17:10:11 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:10:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15757012" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:10:11 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:10:10 +0000 Message-ID: <1352740209.27833.314.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Liu, Jinsong" Date: Mon, 12 Nov 2012 17:10:09 +0000 In-Reply-To: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> <1352273413.12977.27.camel@hastur.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 14:25 +0000, Liu, Jinsong wrote: > Ian Campbell wrote: > >> At the target > >> it would set p2m as p2m_ram_broken for broken page, so that if > >> guest access the broken page again, it would kill itself as > >> expected. > > > > Can you add a few words here about why this is preferable to just > > ignoring the issue and populating a regular page non-broken page on > > the target? I think I know why but it would be useful to be explicit > > in the changelog. > > > > I also spotted a typo: > >> + * vMCE occur during migration + > >> * + * At sender, it marks broken page to dirty > >> bitmap, + * so that at copypages stage of > >> migration, brokan > > > > > > broken > > > > Ian. > > OK, add some comments and correct typo. > > Thanks, > Jinsong > > ============== > Handle broken page with regard to migration > > Generally, there are 2 cases: > 1. broken page occurs before migration > 2. broken page occurs during migration > > At the sender > For case 1, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > For case 2, mce handler marks the broken page to dirty bitmap, so that > at copypages stage of migration, its pfn_type and pfn number would be > transferred to target and then take appropriate action. > > At the target > When migration target would populate pages for guest. As for the case > of broken page wrt migration, we prefer keep the corresponding page, > for the sake of seamless migration. > > At target it would set p2m as p2m_ram_broken for broken page. Guest MCE > may have good chance to handle its broken page, while if guest access > the broken page again it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong I believe George Acked this patch in . Were there other acks, e.g. from Jan for the hypervisor side? Please do collect acks into the commit log and keep them while the patch hasn't change substantially to invalidate them (especially when a series has had many iterations and variations like this one), otherwise I have to go hunting for them which makes it more likely that I'll either get distracted or go and apply some easier to deal with patch instead. Anyway, I afraid that when I went to apply this there were loads of rejects, I suspect a conflict with the superpage migration patch, sorry. Please can you rebase and resend (with patchbomb). Thanks, Ian. > > diff -r d675797494bd tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain.c Thu Nov 08 05:07:20 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r d675797494bd tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Thu Nov 08 05:07:20 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r d675797494bd tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Thu Nov 08 05:07:20 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r d675797494bd tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xenctrl.h Thu Nov 08 05:07:20 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r d675797494bd xen/arch/x86/cpu/mcheck/mcaction.c > --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Thu Nov 08 05:07:20 2012 +0800 > @@ -1,5 +1,6 @@ > #include > #include > +#include > #include "mcaction.h" > #include "vmce.h" > #include "mce.h" > @@ -91,6 +92,24 @@ > goto vmce_failed; > } > > + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && > + paging_mode_log_dirty(d) ) > + { > + /* > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, broken > + * page's pfn_type and pfn number would be transferred > + * to target and then take appropriate action. > + * > + * At target, it would set p2m as p2m_ram_broken for > + * broken page, so that if guest access the broken page > + * again, it would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + > if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) > { > printk("Unmap broken memory %lx for DOM%d failed\n", > diff -r d675797494bd xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/domctl.c Thu Nov 08 05:07:20 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r d675797494bd xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/include/public/domctl.h Thu Nov 08 05:07:20 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:10:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:10:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxWY-0007VK-6M; Mon, 12 Nov 2012 17:10:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxWX-0007VF-Ai for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:10:13 +0000 Received: from [85.158.139.211:13012] by server-9.bemta-5.messagelabs.com id 23/9C-29295-47D21A05; Mon, 12 Nov 2012 17:10:12 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1352740211!19813092!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12383 invoked from network); 12 Nov 2012 17:10:11 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 17:10:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15757012" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 17:10:11 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 17:10:10 +0000 Message-ID: <1352740209.27833.314.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Liu, Jinsong" Date: Mon, 12 Nov 2012 17:10:09 +0000 In-Reply-To: References: <730dd3f22a12fd97814b.1351826729@ljsromley.bj.intel.com> <1352273413.12977.27.camel@hastur.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: George Dunlap , "xen-devel@lists.xensource.com" , Ian Jackson , "jbeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] Handle broken page with regard to migration X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-07 at 14:25 +0000, Liu, Jinsong wrote: > Ian Campbell wrote: > >> At the target > >> it would set p2m as p2m_ram_broken for broken page, so that if > >> guest access the broken page again, it would kill itself as > >> expected. > > > > Can you add a few words here about why this is preferable to just > > ignoring the issue and populating a regular page non-broken page on > > the target? I think I know why but it would be useful to be explicit > > in the changelog. > > > > I also spotted a typo: > >> + * vMCE occur during migration + > >> * + * At sender, it marks broken page to dirty > >> bitmap, + * so that at copypages stage of > >> migration, brokan > > > > > > broken > > > > Ian. > > OK, add some comments and correct typo. > > Thanks, > Jinsong > > ============== > Handle broken page with regard to migration > > Generally, there are 2 cases: > 1. broken page occurs before migration > 2. broken page occurs during migration > > At the sender > For case 1, the broken page would be mapped but not copied to target > (otherwise it may trigger more serious error, say, SRAR error). > While its pfn_type and pfn number would be transferred to target > so that target take appropriate action. > > For case 2, mce handler marks the broken page to dirty bitmap, so that > at copypages stage of migration, its pfn_type and pfn number would be > transferred to target and then take appropriate action. > > At the target > When migration target would populate pages for guest. As for the case > of broken page wrt migration, we prefer keep the corresponding page, > for the sake of seamless migration. > > At target it would set p2m as p2m_ram_broken for broken page. Guest MCE > may have good chance to handle its broken page, while if guest access > the broken page again it would kill itself as expected. > > Suggested-by: George Dunlap > Signed-off-by: Liu, Jinsong I believe George Acked this patch in . Were there other acks, e.g. from Jan for the hypervisor side? Please do collect acks into the commit log and keep them while the patch hasn't change substantially to invalidate them (especially when a series has had many iterations and variations like this one), otherwise I have to go hunting for them which makes it more likely that I'll either get distracted or go and apply some easier to deal with patch instead. Anyway, I afraid that when I went to apply this there were loads of rejects, I suspect a conflict with the superpage migration patch, sorry. Please can you rebase and resend (with patchbomb). Thanks, Ian. > > diff -r d675797494bd tools/libxc/xc_domain.c > --- a/tools/libxc/xc_domain.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain.c Thu Nov 08 05:07:20 2012 +0800 > @@ -283,6 +283,22 @@ > return ret; > } > > +/* set broken page p2m */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn) > +{ > + int ret; > + DECLARE_DOMCTL; > + > + domctl.cmd = XEN_DOMCTL_set_broken_page_p2m; > + domctl.domain = (domid_t)domid; > + domctl.u.set_broken_page_p2m.pfn = pfn; > + ret = do_domctl(xch, &domctl); > + > + return ret ? -1 : 0; > +} > + > /* get info from hvm guest for save */ > int xc_domain_hvm_getcontext(xc_interface *xch, > uint32_t domid, > diff -r d675797494bd tools/libxc/xc_domain_restore.c > --- a/tools/libxc/xc_domain_restore.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_restore.c Thu Nov 08 05:07:20 2012 +0800 > @@ -962,9 +962,15 @@ > > countpages = count; > for (i = oldcount; i < buf->nr_pages; ++i) > - if ((buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB > - ||(buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XALLOC) > + { > + unsigned long pagetype; > + > + pagetype = buf->pfn_types[i] & XEN_DOMCTL_PFINFO_LTAB_MASK; > + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || > + pagetype == XEN_DOMCTL_PFINFO_BROKEN || > + pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > --countpages; > + } > > if (!countpages) > return count; > @@ -1200,6 +1206,17 @@ > /* a bogus/unmapped/allocate-only page: skip it */ > continue; > > + if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + if ( xc_set_broken_page_p2m(xch, dom, pfn) ) > + { > + ERROR("Set p2m for broken page failed, " > + "dom=%d, pfn=%lx\n", dom, pfn); > + goto err_mapped; > + } > + continue; > + } > + > if (pfn_err[i]) > { > ERROR("unexpected PFN mapping failure pfn %lx map_mfn %lx p2m_mfn %lx", > diff -r d675797494bd tools/libxc/xc_domain_save.c > --- a/tools/libxc/xc_domain_save.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xc_domain_save.c Thu Nov 08 05:07:20 2012 +0800 > @@ -1277,6 +1277,13 @@ > if ( !hvm ) > gmfn = pfn_to_mfn(gmfn); > > + if ( pfn_type[j] == XEN_DOMCTL_PFINFO_BROKEN ) > + { > + pfn_type[j] |= pfn_batch[j]; > + ++run; > + continue; > + } > + > if ( pfn_err[j] ) > { > if ( pfn_type[j] == XEN_DOMCTL_PFINFO_XTAB ) > @@ -1371,8 +1378,12 @@ > } > } > > - /* skip pages that aren't present or are alloc-only */ > + /* > + * skip pages that aren't present, > + * or are broken, or are alloc-only > + */ > if ( pagetype == XEN_DOMCTL_PFINFO_XTAB > + || pagetype == XEN_DOMCTL_PFINFO_BROKEN > || pagetype == XEN_DOMCTL_PFINFO_XALLOC ) > continue; > > diff -r d675797494bd tools/libxc/xenctrl.h > --- a/tools/libxc/xenctrl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/tools/libxc/xenctrl.h Thu Nov 08 05:07:20 2012 +0800 > @@ -575,6 +575,17 @@ > xc_domaininfo_t *info); > > /** > + * This function set p2m for broken page > + * &parm xch a handle to an open hypervisor interface > + * @parm domid the domain id which broken page belong to > + * @parm pfn the pfn number of the broken page > + * @return 0 on success, -1 on failure > + */ > +int xc_set_broken_page_p2m(xc_interface *xch, > + uint32_t domid, > + unsigned long pfn); > + > +/** > * This function returns information about the context of a hvm domain > * @parm xch a handle to an open hypervisor interface > * @parm domid the domain to get information from > diff -r d675797494bd xen/arch/x86/cpu/mcheck/mcaction.c > --- a/xen/arch/x86/cpu/mcheck/mcaction.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/cpu/mcheck/mcaction.c Thu Nov 08 05:07:20 2012 +0800 > @@ -1,5 +1,6 @@ > #include > #include > +#include > #include "mcaction.h" > #include "vmce.h" > #include "mce.h" > @@ -91,6 +92,24 @@ > goto vmce_failed; > } > > + if ( is_hvm_domain(d) && !d->arch.hvm_domain.dirty_vram && > + paging_mode_log_dirty(d) ) > + { > + /* > + * vMCE occur during migration > + * > + * At sender, it marks broken page to dirty bitmap, > + * so that at copypages stage of migration, broken > + * page's pfn_type and pfn number would be transferred > + * to target and then take appropriate action. > + * > + * At target, it would set p2m as p2m_ram_broken for > + * broken page, so that if guest access the broken page > + * again, it would kill itself as expected. > + */ > + paging_mark_dirty(d, mfn); > + } > + > if ( unmmap_broken_page(d, _mfn(mfn), gfn) ) > { > printk("Unmap broken memory %lx for DOM%d failed\n", > diff -r d675797494bd xen/arch/x86/domctl.c > --- a/xen/arch/x86/domctl.c Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/arch/x86/domctl.c Thu Nov 08 05:07:20 2012 +0800 > @@ -209,12 +209,18 @@ > for ( j = 0; j < k; j++ ) > { > unsigned long type = 0; > + p2m_type_t t; > > - page = get_page_from_gfn(d, arr[j], NULL, P2M_ALLOC); > + page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); > > if ( unlikely(!page) || > unlikely(is_xen_heap_page(page)) ) > - type = XEN_DOMCTL_PFINFO_XTAB; > + { > + if ( p2m_is_broken(t) ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > + else > + type = XEN_DOMCTL_PFINFO_XTAB; > + } > else > { > switch( page->u.inuse.type_info & PGT_type_mask ) > @@ -235,6 +241,9 @@ > > if ( page->u.inuse.type_info & PGT_pinned ) > type |= XEN_DOMCTL_PFINFO_LPINTAB; > + > + if ( page->count_info & PGC_broken ) > + type = XEN_DOMCTL_PFINFO_BROKEN; > } > > if ( page ) > @@ -1568,6 +1577,29 @@ > } > break; > > + case XEN_DOMCTL_set_broken_page_p2m: > + { > + struct domain *d; > + > + d = rcu_lock_domain_by_id(domctl->domain); > + if ( d != NULL ) > + { > + p2m_type_t pt; > + unsigned long pfn = domctl->u.set_broken_page_p2m.pfn; > + mfn_t mfn = get_gfn_query(d, pfn, &pt); > + > + if ( unlikely(!mfn_valid(mfn_x(mfn)) || !p2m_is_ram(pt) || > + (p2m_change_type(d, pfn, pt, p2m_ram_broken) != pt)) ) > + ret = -EINVAL; > + > + put_gfn(d, pfn); > + rcu_unlock_domain(d); > + } > + else > + ret = -ESRCH; > + } > + break; > + > default: > ret = iommu_do_domctl(domctl, u_domctl); > break; > diff -r d675797494bd xen/include/public/domctl.h > --- a/xen/include/public/domctl.h Fri Nov 02 11:08:37 2012 +0800 > +++ b/xen/include/public/domctl.h Thu Nov 08 05:07:20 2012 +0800 > @@ -136,6 +136,7 @@ > #define XEN_DOMCTL_PFINFO_LPINTAB (0x1U<<31) > #define XEN_DOMCTL_PFINFO_XTAB (0xfU<<28) /* invalid page */ > #define XEN_DOMCTL_PFINFO_XALLOC (0xeU<<28) /* allocate-only page */ > +#define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ > #define XEN_DOMCTL_PFINFO_PAGEDTAB (0x8U<<28) > #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) > > @@ -835,6 +836,12 @@ > typedef struct xen_domctl_set_access_required xen_domctl_set_access_required_t; > DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_access_required_t); > > +struct xen_domctl_set_broken_page_p2m { > + uint64_aligned_t pfn; > +}; > +typedef struct xen_domctl_set_broken_page_p2m xen_domctl_set_broken_page_p2m_t; > +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_broken_page_p2m_t); > + > struct xen_domctl { > uint32_t cmd; > #define XEN_DOMCTL_createdomain 1 > @@ -900,6 +907,7 @@ > #define XEN_DOMCTL_set_access_required 64 > #define XEN_DOMCTL_audit_p2m 65 > #define XEN_DOMCTL_set_virq_handler 66 > +#define XEN_DOMCTL_set_broken_page_p2m 67 > #define XEN_DOMCTL_gdbsx_guestmemio 1000 > #define XEN_DOMCTL_gdbsx_pausevcpu 1001 > #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 > @@ -955,6 +963,7 @@ > struct xen_domctl_audit_p2m audit_p2m; > struct xen_domctl_set_virq_handler set_virq_handler; > struct xen_domctl_gdbsx_memio gdbsx_guest_memio; > + struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; > struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; > struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; > uint8_t pad[128]; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:13:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxZB-0007fs-W2; Mon, 12 Nov 2012 17:12:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxZA-0007fm-K4 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:12:56 +0000 Received: from [193.109.254.147:2853] by server-11.bemta-14.messagelabs.com id 57/88-29027-71E21A05; Mon, 12 Nov 2012 17:12:55 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352740373!2725416!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8102 invoked from network); 12 Nov 2012 17:12:55 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 17:12:55 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACHCZSS007344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 17:12:36 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACHCZrV015543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 17:12:35 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACHCYOG013712; Mon, 12 Nov 2012 11:12:34 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 12 Nov 2012 09:12:33 -0800 (PST) From: Dan Magenheimer To: George Dunlap References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> <73e55d7f-737f-4690-8b69-0252e0b749dd@default> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Andrew Cooper , xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: George Dunlap [mailto:George.Dunlap@eu.citrix.com] > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer wrote: > > > > From an idealistic point of view, it might be quite nice to have several > > > live migrate mechanisms, so the user can choose whether they value > > minimum downtime, minimum network utilisation, or maximum safety. > > Agreed. IIRC, when post-copy was suggested for Xen years ago, > Ian Pratt was against it, though I don't recall why, so Michael > Hines work was never pursued (outside of academia). Probably > worth asking IanP before investing too much time into it. > > Was he against a hybrid approach, where you "push" things first, and then "pull" things later? Or > just against a pure "pull" approach? I'm pretty sure a pure "pull" approach would result in lower > performance during the migration. Sorry, I don't recall. > Just tossing another idea out there: What about throttling the VM if it's dirtying too many pages? > You can use the "cap" feature of the credit1 scheduler to reduce the amount of cpu time a given VM > gets, even if there is free cpu time available. You could play around with doing N iterations, and > then cranking down the cap on each iteration after that; then the application wouldn't have a several- > second pause, it would just be "running slowly" for some period of time. > > Overall doing a hybrid "send dirty pages for a while, then move and pull the rest in" seems like the > best approach in the long-run, but it's fairly complicated. A throttling approach is probably less > optimal but simpler to get working as a temporary measure. I agree there are lots of interesting hybrid possibilities worth exploring. There are side-effects to be considered though... for example, the current push approach is the only one that should be used when the goal of the migration is to evacuate a physical machine so that it can be powered off ASAP for maintenance or power management. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:13:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:13:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxZB-0007fs-W2; Mon, 12 Nov 2012 17:12:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxZA-0007fm-K4 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:12:56 +0000 Received: from [193.109.254.147:2853] by server-11.bemta-14.messagelabs.com id 57/88-29027-71E21A05; Mon, 12 Nov 2012 17:12:55 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1352740373!2725416!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDU3NDg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8102 invoked from network); 12 Nov 2012 17:12:55 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 17:12:55 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qACHCZSS007344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 17:12:36 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qACHCZrV015543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Nov 2012 17:12:35 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qACHCYOG013712; Mon, 12 Nov 2012 11:12:34 -0600 MIME-Version: 1.0 Message-ID: Date: Mon, 12 Nov 2012 09:12:33 -0800 (PST) From: Dan Magenheimer To: George Dunlap References: <20121106202816.GA29655@aepfle.de> <20121106221806.GA1813@aepfle.de> <50999ACF.4040106@citrix.com> <721bf725-662f-41cb-a1a3-7c908e05c188@default> <509A65D6.6050505@citrix.com> <73e55d7f-737f-4690-8b69-0252e0b749dd@default> In-Reply-To: X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: Andrew Cooper , xen-devel@lists.xen.org Subject: Re: [Xen-devel] reliable live migration of large and busy guests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: George Dunlap [mailto:George.Dunlap@eu.citrix.com] > Subject: Re: [Xen-devel] reliable live migration of large and busy guests > > On Wed, Nov 7, 2012 at 3:10 PM, Dan Magenheimer wrote: > > > > From an idealistic point of view, it might be quite nice to have several > > > live migrate mechanisms, so the user can choose whether they value > > minimum downtime, minimum network utilisation, or maximum safety. > > Agreed. IIRC, when post-copy was suggested for Xen years ago, > Ian Pratt was against it, though I don't recall why, so Michael > Hines work was never pursued (outside of academia). Probably > worth asking IanP before investing too much time into it. > > Was he against a hybrid approach, where you "push" things first, and then "pull" things later? Or > just against a pure "pull" approach? I'm pretty sure a pure "pull" approach would result in lower > performance during the migration. Sorry, I don't recall. > Just tossing another idea out there: What about throttling the VM if it's dirtying too many pages? > You can use the "cap" feature of the credit1 scheduler to reduce the amount of cpu time a given VM > gets, even if there is free cpu time available. You could play around with doing N iterations, and > then cranking down the cap on each iteration after that; then the application wouldn't have a several- > second pause, it would just be "running slowly" for some period of time. > > Overall doing a hybrid "send dirty pages for a while, then move and pull the rest in" seems like the > best approach in the long-run, but it's fairly complicated. A throttling approach is probably less > optimal but simpler to get working as a temporary measure. I agree there are lots of interesting hybrid possibilities worth exploring. There are side-effects to be considered though... for example, the current push approach is the only one that should be used when the goal of the migration is to evacuate a physical machine so that it can be powered off ASAP for maintenance or power management. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxgz-0007sf-W3; Mon, 12 Nov 2012 17:21:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxgx-0007sa-W0 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:21:00 +0000 Received: from [85.158.139.83:39344] by server-13.bemta-5.messagelabs.com id A5/6E-27809-BFF21A05; Mon, 12 Nov 2012 17:20:59 +0000 X-Env-Sender: linux@eikelenboom.it X-Msg-Ref: server-8.tower-182.messagelabs.com!1352740858!18652565!1 X-Originating-IP: [188.40.164.121] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6166 invoked from network); 12 Nov 2012 17:20:58 -0000 Received: from static.121.164.40.188.clients.your-server.de (HELO smtp.eikelenboom.it) (188.40.164.121) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2012 17:20:58 -0000 Received: from 102-64-ftth.on.nl ([88.159.64.102]:54549 helo=[172.16.1.20]) by smtp.eikelenboom.it with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TXxjh-0006KV-13; Mon, 12 Nov 2012 18:23:49 +0100 Date: Mon, 12 Nov 2012 18:20:55 +0100 From: Sander Eikelenboom Organization: Eikelenboom IT services X-Priority: 3 (Normal) Message-ID: <1945521669.20121112182055@eikelenboom.it> To: Konrad Rzeszutek Wilk In-Reply-To: <20121112163204.GB9575@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> <20121112163204.GB9575@phenom.dumpdata.com> MIME-Version: 1.0 Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Monday, November 12, 2012, 5:32:04 PM, you wrote: > On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: >> >> Monday, November 12, 2012, 3:28:35 PM, you wrote: >> >> > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: >> >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: >> >> > Hey Ian, Xen-devel mailingl list, >> >> > >> >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or >> >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of >> >> > the releases introduced this. The issue we are seeing is that a domU >> >> > to domU communication breaks - this is with netperf/netserver talking to >> >> > each other. >> >> > >> >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also >> >> > (at least on some of my test hardware) exposed existing issues with >> >> > drivers. The issue I have is that the 'skge' driver has a bug that has >> >> > been there for ages (I tested way back to 3.0 and still saw it) were it >> >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync >> >> > somewhere. >> >> > >> >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks >> >> > OK. Even with synthetic driver (the fake one I posted somewhere) it >> >> > dealt with compound pages properly (with debug or non-debug Xen >> >> > hypervisor). >> >> >> >> The debug build is probably most interesting since it deliberately >> >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of >> >> issues. >> >> > Right. My test env runs with that. And so far it only has issues >> > with the skge one. >> >> >> >> > So was wondering if you had looked at this in more details? Any >> >> > ideas? Or would it be more prudent to ask that once we know for sure >> >> > which Linux release introduced the communication failures between >> >> > guests? >> >> >> >> I've not looked at it any further I'm afraid. >> >> >> >> If these changes (be they in 3.5 or later, or earlier) are exposing >> >> driver bugs then I suspect the netdev chaps would want to know about it. >> >> > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. >> > And is off checking v3.6. v3.7 is definitly a no go. >> >> >> >> FWIW I see the issue with tg3. >> >> After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. > Were you ever able to trigger the BUG_ON in the patch that Ian posted? What exact patch (or any other patch that can help you ) ? (so i can try again to be sure) >> I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. >> >> -- >> Sander >> >> > I should double-check that but I didn't get any issues with the tg3 I had. >> >> > I was running the netperf/netserver from/to to see if I could reproduce the >> > issues (70% loss) you described but did not have much luck. >> >> >> >> >> Ian. >> >> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxgz-0007sf-W3; Mon, 12 Nov 2012 17:21:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxgx-0007sa-W0 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 17:21:00 +0000 Received: from [85.158.139.83:39344] by server-13.bemta-5.messagelabs.com id A5/6E-27809-BFF21A05; Mon, 12 Nov 2012 17:20:59 +0000 X-Env-Sender: linux@eikelenboom.it X-Msg-Ref: server-8.tower-182.messagelabs.com!1352740858!18652565!1 X-Originating-IP: [188.40.164.121] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6166 invoked from network); 12 Nov 2012 17:20:58 -0000 Received: from static.121.164.40.188.clients.your-server.de (HELO smtp.eikelenboom.it) (188.40.164.121) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 12 Nov 2012 17:20:58 -0000 Received: from 102-64-ftth.on.nl ([88.159.64.102]:54549 helo=[172.16.1.20]) by smtp.eikelenboom.it with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1TXxjh-0006KV-13; Mon, 12 Nov 2012 18:23:49 +0100 Date: Mon, 12 Nov 2012 18:20:55 +0100 From: Sander Eikelenboom Organization: Eikelenboom IT services X-Priority: 3 (Normal) Message-ID: <1945521669.20121112182055@eikelenboom.it> To: Konrad Rzeszutek Wilk In-Reply-To: <20121112163204.GB9575@phenom.dumpdata.com> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> <20121112163204.GB9575@phenom.dumpdata.com> MIME-Version: 1.0 Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Monday, November 12, 2012, 5:32:04 PM, you wrote: > On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: >> >> Monday, November 12, 2012, 3:28:35 PM, you wrote: >> >> > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: >> >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: >> >> > Hey Ian, Xen-devel mailingl list, >> >> > >> >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or >> >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of >> >> > the releases introduced this. The issue we are seeing is that a domU >> >> > to domU communication breaks - this is with netperf/netserver talking to >> >> > each other. >> >> > >> >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also >> >> > (at least on some of my test hardware) exposed existing issues with >> >> > drivers. The issue I have is that the 'skge' driver has a bug that has >> >> > been there for ages (I tested way back to 3.0 and still saw it) were it >> >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync >> >> > somewhere. >> >> > >> >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks >> >> > OK. Even with synthetic driver (the fake one I posted somewhere) it >> >> > dealt with compound pages properly (with debug or non-debug Xen >> >> > hypervisor). >> >> >> >> The debug build is probably most interesting since it deliberately >> >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of >> >> issues. >> >> > Right. My test env runs with that. And so far it only has issues >> > with the skge one. >> >> >> >> > So was wondering if you had looked at this in more details? Any >> >> > ideas? Or would it be more prudent to ask that once we know for sure >> >> > which Linux release introduced the communication failures between >> >> > guests? >> >> >> >> I've not looked at it any further I'm afraid. >> >> >> >> If these changes (be they in 3.5 or later, or earlier) are exposing >> >> driver bugs then I suspect the netdev chaps would want to know about it. >> >> > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. >> > And is off checking v3.6. v3.7 is definitly a no go. >> >> >> >> FWIW I see the issue with tg3. >> >> After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. > Were you ever able to trigger the BUG_ON in the patch that Ian posted? What exact patch (or any other patch that can help you ) ? (so i can try again to be sure) >> I haven't seen issues with netfront and netback before this commit. FWIW: the hardware nics in this machine are two r8169 's. >> >> -- >> Sander >> >> > I should double-check that but I didn't get any issues with the tg3 I had. >> >> > I was running the netperf/netserver from/to to see if I could reproduce the >> > issues (70% loss) you described but did not have much luck. >> >> >> >> >> Ian. >> >> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 17:23:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxj8-00081J-Iq; Mon, 12 Nov 2012 17:23:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxj5-00081B-Ll for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:23:12 +0000 Received: from [85.158.137.99:27625] by server-7.bemta-3.messagelabs.com id 5B/D9-01713-E7031A05; Mon, 12 Nov 2012 17:23:10 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-3.tower-217.messagelabs.com!1352740988!13729767!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6264 invoked from network); 12 Nov 2012 17:23:09 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 17:23:09 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157154400; Mon, 12 Nov 2012 12:22:02 -0500 Message-ID: <50A13039.2070909@jhuapl.edu> Date: Mon, 12 Nov 2012 12:22:01 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121112163052.GA9575@phenom.dumpdata.com> In-Reply-To: <20121112163052.GA9575@phenom.dumpdata.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "tpmdd@selhorst.net" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" , "tpmdd@sirrix.com" Subject: Re: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8071776088080929173==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============8071776088080929173== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090603020802090608070101" This is a cryptographically signed message in MIME format. --------------ms090603020802090608070101 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/12/2012 11:30 AM, Konrad Rzeszutek Wilk wrote: > On Mon, Nov 12, 2012 at 09:29:58AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. This >> driver is designed be used with the mini-os tpmback driver >> in Xen as part of the new mini-os virtual tpm subsystem. >> See docs/misc/vtpm.txt in Xen and the xen-devel mailing list >> for details. > I didn't look in details but off the bat - you are missing > the Documentation/../sysfs file. It looks like Kent submitted a patch that documents sysfs generically for all of the TPM drivers. > > I still think you should include the full vtpm.txt in this > patch description and refer at the end to the docs/misc/vtpm.txt > in Xen as the source for the up-to-date version. The current docs/misc/vtpm.txt in Xen is still the old version. I've=20 just written a new one and am reviewing it. It will come in the next=20 resubmission of my vtpm patches to xen. I'll include the text here for=20 the next resubmission of this patch as well. --------------ms090603020802090608070101 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTExMjE3MjIwMVowIwYJKoZIhvcNAQkEMRYEFJPFWr9ZfnF3BcET 68Yq5ttbLCTXMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYAiOHtiOdqTXHNXAiT2HsZrKtOVBHbLCTYw BOTGpj5qE1z8YKYBDWVVIRe3arLR98f+lqSJLzcOBeZs9CTRqnv1lXr+3Bz2rNK7BfUgd22r P2zISikZD0++9X0goPilRbGw6UHL0N2wxF107d0PcowQ+SEvskqslkDFiPtwwv39pwAAAAAA AA== --------------ms090603020802090608070101-- --===============8071776088080929173== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8071776088080929173==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 17:23:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 17:23:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxj8-00081J-Iq; Mon, 12 Nov 2012 17:23:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXxj5-00081B-Ll for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 17:23:12 +0000 Received: from [85.158.137.99:27625] by server-7.bemta-3.messagelabs.com id 5B/D9-01713-E7031A05; Mon, 12 Nov 2012 17:23:10 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-3.tower-217.messagelabs.com!1352740988!13729767!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6264 invoked from network); 12 Nov 2012 17:23:09 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-3.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 17:23:09 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157154400; Mon, 12 Nov 2012 12:22:02 -0500 Message-ID: <50A13039.2070909@jhuapl.edu> Date: Mon, 12 Nov 2012 12:22:01 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk References: <1352730598-13904-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121112163052.GA9575@phenom.dumpdata.com> In-Reply-To: <20121112163052.GA9575@phenom.dumpdata.com> Cc: "jeremy@goop.org" , "xen-devel@lists.xensource.com" , "tpmdd@selhorst.net" , "linux-kernel@vger.kernel.org" , "mail@srajiv.net" , "tpmdd-devel@lists.sourceforge.net" , "key@linux.vnet.ibm.com" , "tpmdd@sirrix.com" Subject: Re: [Xen-devel] [PATCH v2] add xen-tpmfront.ko: Xen Virtual TPM frontend driver X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8071776088080929173==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============8071776088080929173== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090603020802090608070101" This is a cryptographically signed message in MIME format. --------------ms090603020802090608070101 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable On 11/12/2012 11:30 AM, Konrad Rzeszutek Wilk wrote: > On Mon, Nov 12, 2012 at 09:29:58AM -0500, Matthew Fioravante wrote: >> This patch ports the xen vtpm frontend driver for linux >> from the linux-2.6.18-xen.hg tree to linux-stable. This >> driver is designed be used with the mini-os tpmback driver >> in Xen as part of the new mini-os virtual tpm subsystem. >> See docs/misc/vtpm.txt in Xen and the xen-devel mailing list >> for details. > I didn't look in details but off the bat - you are missing > the Documentation/../sysfs file. It looks like Kent submitted a patch that documents sysfs generically for all of the TPM drivers. > > I still think you should include the full vtpm.txt in this > patch description and refer at the end to the docs/misc/vtpm.txt > in Xen as the source for the up-to-date version. The current docs/misc/vtpm.txt in Xen is still the old version. I've=20 just written a new one and am reviewing it. It will come in the next=20 resubmission of my vtpm patches to xen. I'll include the text here for=20 the next resubmission of this patch as well. --------------ms090603020802090608070101 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTExMjE3MjIwMVowIwYJKoZIhvcNAQkEMRYEFJPFWr9ZfnF3BcET 68Yq5ttbLCTXMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYAiOHtiOdqTXHNXAiT2HsZrKtOVBHbLCTYw BOTGpj5qE1z8YKYBDWVVIRe3arLR98f+lqSJLzcOBeZs9CTRqnv1lXr+3Bz2rNK7BfUgd22r P2zISikZD0++9X0goPilRbGw6UHL0N2wxF107d0PcowQ+SEvskqslkDFiPtwwv39pwAAAAAA AA== --------------ms090603020802090608070101-- --===============8071776088080929173== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8071776088080929173==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 18:06:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:06:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyO2-0000Ah-Aq; Mon, 12 Nov 2012 18:05:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyO1-0000Ac-BW for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:05:29 +0000 Received: from [85.158.138.51:36480] by server-2.bemta-3.messagelabs.com id 89/19-04744-36A31A05; Mon, 12 Nov 2012 18:05:23 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-12.tower-174.messagelabs.com!1352743521!21795400!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3844 invoked from network); 12 Nov 2012 18:05:22 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-12.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:05:22 -0000 Received: from localhost (lolek.nigdzie [10.253.0.124]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id 6583C5002; Mon, 12 Nov 2012 19:05:20 +0100 (CET) Date: Mon, 12 Nov 2012 19:05:20 +0100 From: Jacek Konieczny To: Ian Campbell Message-ID: <20121112180519.GA2114@lolek.nigdzie> Mail-Followup-To: Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson , Olaf Hering References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352738557.27833.302.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 04:42:37PM +0000, Ian Campbell wrote: > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > The claim_lock() function would fail in the perl code with: > > > > Invalid argument at -e line 2. > > > > because the Perl snippet opens for reading the file descriptor, which > > was earlier opened for write (append). > > Looks plausible to me. > > How does this interact with the > eval "exec $_lockfd<&-" > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > <&- and >&- or even <>&- are equivalent? It seems <&- and >&- are indeed the same and there is no such thing as '<>&-'. I have added the Olaf's change to my test setup and it works properly. So no conflict here. > > > > Signed-off-by: Jacek Konieczny > > --- > > tools/hotplug/Linux/locking.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh > > index e34f155..122bcfb 100644 > > --- a/tools/hotplug/Linux/locking.sh > > +++ b/tools/hotplug/Linux/locking.sh > > @@ -44,7 +44,7 @@ claim_lock() > > # See below for a correctness proof. > > local rightfile > > while true; do > > - eval "exec $_lockfd>>$_lockfile" > > + eval "exec $_lockfd<>$_lockfile" > > flock -x $_lockfd || return $? > > # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or > > # use bash's test -ef because those all go through what is _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:06:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:06:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyO2-0000Ah-Aq; Mon, 12 Nov 2012 18:05:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyO1-0000Ac-BW for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:05:29 +0000 Received: from [85.158.138.51:36480] by server-2.bemta-3.messagelabs.com id 89/19-04744-36A31A05; Mon, 12 Nov 2012 18:05:23 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-12.tower-174.messagelabs.com!1352743521!21795400!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3844 invoked from network); 12 Nov 2012 18:05:22 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-12.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:05:22 -0000 Received: from localhost (lolek.nigdzie [10.253.0.124]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id 6583C5002; Mon, 12 Nov 2012 19:05:20 +0100 (CET) Date: Mon, 12 Nov 2012 19:05:20 +0100 From: Jacek Konieczny To: Ian Campbell Message-ID: <20121112180519.GA2114@lolek.nigdzie> Mail-Followup-To: Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson , Olaf Hering References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352738557.27833.302.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 04:42:37PM +0000, Ian Campbell wrote: > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > The claim_lock() function would fail in the perl code with: > > > > Invalid argument at -e line 2. > > > > because the Perl snippet opens for reading the file descriptor, which > > was earlier opened for write (append). > > Looks plausible to me. > > How does this interact with the > eval "exec $_lockfd<&-" > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > <&- and >&- or even <>&- are equivalent? It seems <&- and >&- are indeed the same and there is no such thing as '<>&-'. I have added the Olaf's change to my test setup and it works properly. So no conflict here. > > > > Signed-off-by: Jacek Konieczny > > --- > > tools/hotplug/Linux/locking.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/hotplug/Linux/locking.sh b/tools/hotplug/Linux/locking.sh > > index e34f155..122bcfb 100644 > > --- a/tools/hotplug/Linux/locking.sh > > +++ b/tools/hotplug/Linux/locking.sh > > @@ -44,7 +44,7 @@ claim_lock() > > # See below for a correctness proof. > > local rightfile > > while true; do > > - eval "exec $_lockfd>>$_lockfile" > > + eval "exec $_lockfd<>$_lockfile" > > flock -x $_lockfd || return $? > > # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or > > # use bash's test -ef because those all go through what is _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:08:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:08:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyQC-0000G6-Ts; Mon, 12 Nov 2012 18:07:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyQB-0000G0-27 for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:07:43 +0000 Received: from [85.158.143.99:39385] by server-1.bemta-4.messagelabs.com id CA/B1-27934-EEA31A05; Mon, 12 Nov 2012 18:07:42 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-6.tower-216.messagelabs.com!1352743661!22601613!1 X-Originating-IP: [81.169.146.178] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTczMA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTczMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5137 invoked from network); 12 Nov 2012 18:07:42 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.178) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:07:42 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV6KE= Received: from probook.site (ip-80-226-24-2.vodafone-net.de [80.226.24.2]) by smtp.strato.de (jored mo15) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id U018ceoACI44Wb ; Mon, 12 Nov 2012 19:07:40 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id A8B7C189BA; Mon, 12 Nov 2012 19:07:38 +0100 (CET) Date: Mon, 12 Nov 2012 19:07:38 +0100 From: Olaf Hering To: Ian Campbell Message-ID: <20121112180738.GA26672@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352738557.27833.302.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jacek Konieczny Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, Ian Campbell wrote: > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > The claim_lock() function would fail in the perl code with: > > > > Invalid argument at -e line 2. > > > > because the Perl snippet opens for reading the file descriptor, which > > was earlier opened for write (append). > > Looks plausible to me. > > How does this interact with the > eval "exec $_lockfd<&-" > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > <&- and >&- or even <>&- are equivalent? I did not see the perl error, in what environment did you notice this error? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:08:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:08:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyQC-0000G6-Ts; Mon, 12 Nov 2012 18:07:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyQB-0000G0-27 for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:07:43 +0000 Received: from [85.158.143.99:39385] by server-1.bemta-4.messagelabs.com id CA/B1-27934-EEA31A05; Mon, 12 Nov 2012 18:07:42 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-6.tower-216.messagelabs.com!1352743661!22601613!1 X-Originating-IP: [81.169.146.178] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTczMA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3OCA9PiAyNTczMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5137 invoked from network); 12 Nov 2012 18:07:42 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.178) by server-6.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:07:42 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV6KE= Received: from probook.site (ip-80-226-24-2.vodafone-net.de [80.226.24.2]) by smtp.strato.de (jored mo15) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id U018ceoACI44Wb ; Mon, 12 Nov 2012 19:07:40 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id A8B7C189BA; Mon, 12 Nov 2012 19:07:38 +0100 (CET) Date: Mon, 12 Nov 2012 19:07:38 +0100 From: Olaf Hering To: Ian Campbell Message-ID: <20121112180738.GA26672@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352738557.27833.302.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Jacek Konieczny Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, Ian Campbell wrote: > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > The claim_lock() function would fail in the perl code with: > > > > Invalid argument at -e line 2. > > > > because the Perl snippet opens for reading the file descriptor, which > > was earlier opened for write (append). > > Looks plausible to me. > > How does this interact with the > eval "exec $_lockfd<&-" > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > <&- and >&- or even <>&- are equivalent? I did not see the perl error, in what environment did you notice this error? Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:17:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:17:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyYi-0000Xg-1M; Mon, 12 Nov 2012 18:16:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyYg-0000XH-HW; Mon, 12 Nov 2012 18:16:30 +0000 Received: from [85.158.137.99:60915] by server-5.bemta-3.messagelabs.com id 9C/A6-26311-8FC31A05; Mon, 12 Nov 2012 18:16:24 +0000 X-Env-Sender: lars.kurth.xen@gmail.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352744183!13735230!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10176 invoked from network); 12 Nov 2012 18:16:24 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 18:16:24 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1704222bkc.32 for ; Mon, 12 Nov 2012 10:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:reply-to:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; bh=oH0qiROsoRnBKT/ng0B9hQtYiosiymv6E2B3UJzsaSw=; b=ypuPhq3BVCJGdkfMHvnGprdU2BVH0c6tg32Q8Y41b7Dy+1ZTYTCOdIrlPZUmqVcmXx xoEBsLLcQMJ/8hHPl5o1ZZOpPXSCoVsny6FFWw2llele34L1Nh+WMj8XKl1912r1Kk1C zQRZxIFzVwCPhO5Tw/UjlqHfqdkfd7ZPJ4vzDKtzI0nTTmM+EzYaPXOWjuKJSIMJbzA9 TqWi/DPVysVCgZxVvTu9SqHdSrufThwL72mFpFxLuz+k9lYfJ7cs1DqHJi5mgKUNcZ0z uQpADHYqDP2IRfBxhBQN95Ko/HZHmJwk2F/qLOBqV4v8neFY3waW+BjyEyioL+kQe8QW AUcg== Received: by 10.204.147.139 with SMTP id l11mr7557777bkv.100.1352744183712; Mon, 12 Nov 2012 10:16:23 -0800 (PST) Received: from [172.16.26.11] (b0fb37e5.bb.sky.com. [176.251.55.229]) by mx.google.com with ESMTPS id hm4sm1878045bkc.7.2012.11.12.10.16.22 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 10:16:23 -0800 (PST) Message-ID: <50A13CF8.3040301@xen.org> Date: Mon, 12 Nov 2012 18:16:24 +0000 From: Lars Kurth User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xci-devel@lists.xen.org, "xen-devel@lists.xen.org" Subject: [Xen-devel] Results of XCI archivation review X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: lars.kurth@xen.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi everybody, two weeks ago I proposed that XCI should be archived. We had 3 votes by committers in favour of archivation and no objections. Unless somebody strongly objects, I will archive XCI later this week. This is the last chance to shout. Best Regards Lars _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:17:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:17:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyYi-0000Xg-1M; Mon, 12 Nov 2012 18:16:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyYg-0000XH-HW; Mon, 12 Nov 2012 18:16:30 +0000 Received: from [85.158.137.99:60915] by server-5.bemta-3.messagelabs.com id 9C/A6-26311-8FC31A05; Mon, 12 Nov 2012 18:16:24 +0000 X-Env-Sender: lars.kurth.xen@gmail.com X-Msg-Ref: server-3.tower-217.messagelabs.com!1352744183!13735230!1 X-Originating-IP: [209.85.214.45] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10176 invoked from network); 12 Nov 2012 18:16:24 -0000 Received: from mail-bk0-f45.google.com (HELO mail-bk0-f45.google.com) (209.85.214.45) by server-3.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 18:16:24 -0000 Received: by mail-bk0-f45.google.com with SMTP id je9so1704222bkc.32 for ; Mon, 12 Nov 2012 10:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:reply-to:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; bh=oH0qiROsoRnBKT/ng0B9hQtYiosiymv6E2B3UJzsaSw=; b=ypuPhq3BVCJGdkfMHvnGprdU2BVH0c6tg32Q8Y41b7Dy+1ZTYTCOdIrlPZUmqVcmXx xoEBsLLcQMJ/8hHPl5o1ZZOpPXSCoVsny6FFWw2llele34L1Nh+WMj8XKl1912r1Kk1C zQRZxIFzVwCPhO5Tw/UjlqHfqdkfd7ZPJ4vzDKtzI0nTTmM+EzYaPXOWjuKJSIMJbzA9 TqWi/DPVysVCgZxVvTu9SqHdSrufThwL72mFpFxLuz+k9lYfJ7cs1DqHJi5mgKUNcZ0z uQpADHYqDP2IRfBxhBQN95Ko/HZHmJwk2F/qLOBqV4v8neFY3waW+BjyEyioL+kQe8QW AUcg== Received: by 10.204.147.139 with SMTP id l11mr7557777bkv.100.1352744183712; Mon, 12 Nov 2012 10:16:23 -0800 (PST) Received: from [172.16.26.11] (b0fb37e5.bb.sky.com. [176.251.55.229]) by mx.google.com with ESMTPS id hm4sm1878045bkc.7.2012.11.12.10.16.22 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 10:16:23 -0800 (PST) Message-ID: <50A13CF8.3040301@xen.org> Date: Mon, 12 Nov 2012 18:16:24 +0000 From: Lars Kurth User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: xci-devel@lists.xen.org, "xen-devel@lists.xen.org" Subject: [Xen-devel] Results of XCI archivation review X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: lars.kurth@xen.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi everybody, two weeks ago I proposed that XCI should be archived. We had 3 votes by committers in favour of archivation and no objections. Unless somebody strongly objects, I will archive XCI later this week. This is the last chance to shout. Best Regards Lars _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:18:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXya9-0000dJ-HB; Mon, 12 Nov 2012 18:18:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx80-0006WV-HT for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:44:52 +0000 Received: from [193.109.254.147:51565] by server-16.bemta-14.messagelabs.com id 34/45-09215-38721A05; Mon, 12 Nov 2012 16:44:51 +0000 X-Env-Sender: rlampe@tqhosting.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352738689!7992580!1 X-Originating-IP: [209.85.216.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12466 invoked from network); 12 Nov 2012 16:44:50 -0000 Received: from mail-qc0-f173.google.com (HELO mail-qc0-f173.google.com) (209.85.216.173) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:44:50 -0000 Received: by mail-qc0-f173.google.com with SMTP id b12so4679459qca.32 for ; Mon, 12 Nov 2012 08:44:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=i3rW8pG8SbOSjP51uefkzEUoYMkpI2JiWfJz30Ohnvg=; b=T4kQT+yHxD20UiMSnWsGgVo5sb2JySA6cxL518kiCdAgXHeT78XwcKAoz3yta79MKA YnTGcW8Hdun0kqJEdH6grj/wCNDTjKzDRyWv+JD3cdUQcn3PBDZgtDIGyIgKIVNbU15I TRms8QO9yMybRoxRdhBZgmmOs3cKVK1ocC8sn5PVOrifQOTjW6WysWfpuT20e2X8PriS WwbYBJk21haJRinCbaQ+O+OIUMgqxmMNUsXNJCdDny06LMN5AtlJYx54NcL9y/3Hs/ed 6Rv3Du+8IOuD+lQXh9fy540zkL+3eWEQrmvS9YtjWJi9byoYDAlyeB70w1lT2F0e4ekW UL2Q== MIME-Version: 1.0 Received: by 10.229.106.131 with SMTP id x3mr5252018qco.91.1352738689385; Mon, 12 Nov 2012 08:44:49 -0800 (PST) Received: by 10.49.72.202 with HTTP; Mon, 12 Nov 2012 08:44:49 -0800 (PST) Date: Mon, 12 Nov 2012 11:44:49 -0500 Message-ID: From: Rob Lampe To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQktk3QiUepnvH0wzhtTdQIypKx+vYNFdaJ7oEGX/1FCa4LGMJd3a+i7ubn8gouI4wrfo1rA X-Mailman-Approved-At: Mon, 12 Nov 2012 18:18:00 +0000 Subject: [Xen-devel] Reboot failure in Xen 4.2.0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I am having an issue where a small percentage of the time, rebooting a VM from the VM does not actually work. Xen Version: 4.2.0 OS: Debian 6.0 Kernel: 3.2.30 Note, we are still using xend instead of xl. Could that be the problem? xend.log output ---------------------- [2012-11-12 14:47:20 2381] INFO (XendDomainInfo:2079) Domain has shutdown: name=ie3d.x.rootbsd.net id=77 reason=reboot. [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:3077) XendDomainInfo.destroy: domid=77 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2402) Destroying device model [2012-11-12 14:47:20 2381] INFO (image:615) ie3d.x.rootbsd.net device model terminated [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2409) Releasing devices [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vif/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vif, device = vif/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vif/1 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vif, device = vif/1 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing console/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = console, device = console/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vbd/768 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vbd, device = vbd/768 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vfb/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vfb, device = vfb/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:125) XendDomainInfo.create_from_dict({'vcpus_params': {'cap': 0, 'weight': 256}, 'PV_args': '', 'features': '', 'cpus': [[], []], 'paused': 0, 'use_tmp_kernel': False, 'actions_after_reboot': 'restart', 'memory_sharing': 0, 'superpages': 0, 'VCPUs_live': 2, 'PV_bootloader': '', 'actions_after_crash': 'restart', 'vbd_refs': ['7413f24b-3ea4-468c-be55-613b842efdc7'], 'PV_ramdisk': '', 'is_control_domain': False, 'name_label': 'ie3d.x.rootbsd.net', 'VCPUs_at_startup': 1, 'HVM_boot_params': {'order': 'nc'}, 'platform': {'videoram': '4', 'hpet': '0', 'stdvga': '0', 'vnclisten': '0.0.0.0', 'loader': '/usr/lib/xen/boot/hvmloader', 'serial': 'pty', 'vncunused': '0', 'xen_platform_pci': '1', 'usb': '1', 'nestedhvm': '0', 'boot': 'nc', 'rtc_timeoffset': 1, 'vncpasswd': 'XXXXXXXX', 'pci': [], 'pae': '1', 'vpt_align': '1', 'hap': '1', 'viridian': '0', 'acpi': '1', 'localtime': '0', 'timer_mode': '1', 'vnc': '1', 'nographic': '0', 'vncdisplay': '749', 'pci_msitranslate': '1', 'oos': '1', 'apic': '1', 'sdl': '0', 'nomigrate': '0', 'guest_os_type': 'default', 'tsc_mode': '0', 'usbdevice': 'tablet', 'device_model': '/usr/lib/xen/bin/qemu-dm', 'pci_power_mgmt': '0', 'xauthority': '/root/.Xauthority', 'isa': '0'}, 'PV_kernel': '', 'console_refs': ['011f85bb-c354-33d5-b1f6-bbc3699f1ad1', 'c853847e-a218-46c1-70ba-346551ea43e9'], 'online_vcpus': 2, 'blocked': 0, 'on_xend_stop': 'ignore', 'pool_name': 'Pool-0', 'shutdown': 0, 'HVM_boot_policy': 'BIOS order', 'description': '', 'shutdown_reason': 1, 'VCPUs_max': 2, 'start_time': 1352731059.4260111, 'memory_static_max': 536870912, 'actions_after_shutdown': 'destroy', 'use_tmp_ramdisk': False, 'on_xend_start': 'ignore', 'crashed': 0, 'memory_dynamic_max': 536870912, 'actions_after_suspend': '', 'is_a_template': False, 'PV_bootloader_args': '', 'memory_dynamic_min': 536870912, 'uuid': '8ef5dc51-f0df-20e1-41b2-ad1fea07399f', 'cpu_time': 36.203068825000003, 'shadow_memory': 6, 'memory_static_min': 0, 'dying': 0, 'vcpu_avail': 3, 'notes': {'SUSPEND_CANCEL': 1}, 'other_config': {}, 'auto_power_on': False, 'running': 0, 'domid': 77, 'Description': '', 'vif_refs': ['b27dbf8a-47c6-eabb-f40e-c81a961440eb', '20bb6946-f8b2-a7ba-80f7-3bc6145f35c6'], 'target': 0, 'vtpm_refs': [], 's3_integrity': 1, 'devices': {'20bb6946-f8b2-a7ba-80f7-3bc6145f35c6': ('vif', {'bridge': 'pri700', 'uuid': '20bb6946-f8b2-a7ba-80f7-3bc6145f35c6', 'devid': 1, 'mac': '00:16:3e:3f:0b:ea', 'model': 'e1000', 'type': 'ioemu'}), 'b27dbf8a-47c6-eabb-f40e-c81a961440eb': ('vif', {'bridge': 'pub700', 'uuid': 'b27dbf8a-47c6-eabb-f40e-c81a961440eb', 'devid': 0, 'mac': '00:16:3e:6c:95:10', 'model': 'e1000', 'type': 'ioemu'}), 'c853847e-a218-46c1-70ba-346551ea43e9': ('console', {'location': '5', 'devid': 0, 'protocol': 'vt100', 'uuid': 'c853847e-a218-46c1-70ba-346551ea43e9', 'other_config': {}}), '011f85bb-c354-33d5-b1f6-bbc3699f1ad1': ('vfb', {'vncunused': 0, 'other_config': {'vncunused': 0, 'vncpasswd': 'XXXXXXXX', 'vnclisten': '0.0.0.0', 'vnc': '1', 'vncdisplay': 749}, 'vnc': '1', 'uuid': '011f85bb-c354-33d5-b1f6-bbc3699f1ad1', 'vnclisten': '0.0.0.0', 'vncdisplay': 749, 'vncpasswd': 'XXXXXXXX', 'location': '0.0.0.0:6649', 'devid': 0}), '7413f24b-3ea4-468c-be55-613b842efdc7': ('vbd', {'uuid': '7413f24b-3ea4-468c-be55-613b842efdc7', 'bootable': 1, 'devid': 768, 'driver': 'paravirtualised', 'dev': 'hda', 'uname': 'phy:/var/run/ganeti/instance-disks/ie3d.x.rootbsd.net:0', 'mode': 'w'})}}) [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2499) XendDomainInfo.constructDomain [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:488) VM start failed Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:3077) XendDomainInfo.destroy: domid=78 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2407) No device model [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2409) Releasing devices [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:130) Domain construction failed Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 128, in create_from_dict vm.start() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:2235) Failed to restart domain 77. Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2218, in _restart new_dom_info) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomain.py", line 1017, in domain_create_from_dict dominfo = XendDomainInfo.create_from_dict(config_dict) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 128, in create_from_dict vm.start() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') vm configuration file --------------------------------- kernel = '/usr/lib/xen/boot/hvmloader' builder = 'hvm' memory = 512 vcpus = 2 name = 'ie3d.x.rootbsd.net' pae = 1 acpi = 1 apic = 1 device_model = '/usr/lib/xen/bin/qemu-dm' boot = 'nc' sdl = 0 usb = 1 usbdevice = 'tablet' vnc = 1 vnclisten = '0.0.0.0' vncdisplay = 749 vncunused = 0 vncpasswd = 'JJw1ZHwQ' serial = 'pty' vif = ['mac=00:16:3e:6c:95:10, model=e1000, type=ioemu, bridge=pub700','mac=00:16:3e:3f:0b:ea, model=e1000, type=ioemu, bridge=pri700'] disk = ['phy:/var/run/ganeti/instance-disks/ie3d.x.rootbsd.net:0,hda,w'] on_poweroff = 'destroy' on_reboot = 'restart' on_crash = 'restart' _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:18:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:18:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXya9-0000dJ-HB; Mon, 12 Nov 2012 18:18:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXx80-0006WV-HT for xen-devel@lists.xen.org; Mon, 12 Nov 2012 16:44:52 +0000 Received: from [193.109.254.147:51565] by server-16.bemta-14.messagelabs.com id 34/45-09215-38721A05; Mon, 12 Nov 2012 16:44:51 +0000 X-Env-Sender: rlampe@tqhosting.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352738689!7992580!1 X-Originating-IP: [209.85.216.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12466 invoked from network); 12 Nov 2012 16:44:50 -0000 Received: from mail-qc0-f173.google.com (HELO mail-qc0-f173.google.com) (209.85.216.173) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 16:44:50 -0000 Received: by mail-qc0-f173.google.com with SMTP id b12so4679459qca.32 for ; Mon, 12 Nov 2012 08:44:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=i3rW8pG8SbOSjP51uefkzEUoYMkpI2JiWfJz30Ohnvg=; b=T4kQT+yHxD20UiMSnWsGgVo5sb2JySA6cxL518kiCdAgXHeT78XwcKAoz3yta79MKA YnTGcW8Hdun0kqJEdH6grj/wCNDTjKzDRyWv+JD3cdUQcn3PBDZgtDIGyIgKIVNbU15I TRms8QO9yMybRoxRdhBZgmmOs3cKVK1ocC8sn5PVOrifQOTjW6WysWfpuT20e2X8PriS WwbYBJk21haJRinCbaQ+O+OIUMgqxmMNUsXNJCdDny06LMN5AtlJYx54NcL9y/3Hs/ed 6Rv3Du+8IOuD+lQXh9fy540zkL+3eWEQrmvS9YtjWJi9byoYDAlyeB70w1lT2F0e4ekW UL2Q== MIME-Version: 1.0 Received: by 10.229.106.131 with SMTP id x3mr5252018qco.91.1352738689385; Mon, 12 Nov 2012 08:44:49 -0800 (PST) Received: by 10.49.72.202 with HTTP; Mon, 12 Nov 2012 08:44:49 -0800 (PST) Date: Mon, 12 Nov 2012 11:44:49 -0500 Message-ID: From: Rob Lampe To: xen-devel@lists.xen.org X-Gm-Message-State: ALoCoQktk3QiUepnvH0wzhtTdQIypKx+vYNFdaJ7oEGX/1FCa4LGMJd3a+i7ubn8gouI4wrfo1rA X-Mailman-Approved-At: Mon, 12 Nov 2012 18:18:00 +0000 Subject: [Xen-devel] Reboot failure in Xen 4.2.0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I am having an issue where a small percentage of the time, rebooting a VM from the VM does not actually work. Xen Version: 4.2.0 OS: Debian 6.0 Kernel: 3.2.30 Note, we are still using xend instead of xl. Could that be the problem? xend.log output ---------------------- [2012-11-12 14:47:20 2381] INFO (XendDomainInfo:2079) Domain has shutdown: name=ie3d.x.rootbsd.net id=77 reason=reboot. [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:3077) XendDomainInfo.destroy: domid=77 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2402) Destroying device model [2012-11-12 14:47:20 2381] INFO (image:615) ie3d.x.rootbsd.net device model terminated [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2409) Releasing devices [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vif/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vif, device = vif/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vif/1 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vif, device = vif/1 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing console/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = console, device = console/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vbd/768 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vbd, device = vbd/768 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2415) Removing vfb/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:1276) XendDomainInfo.destroyDevice: deviceClass = vfb, device = vfb/0 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:125) XendDomainInfo.create_from_dict({'vcpus_params': {'cap': 0, 'weight': 256}, 'PV_args': '', 'features': '', 'cpus': [[], []], 'paused': 0, 'use_tmp_kernel': False, 'actions_after_reboot': 'restart', 'memory_sharing': 0, 'superpages': 0, 'VCPUs_live': 2, 'PV_bootloader': '', 'actions_after_crash': 'restart', 'vbd_refs': ['7413f24b-3ea4-468c-be55-613b842efdc7'], 'PV_ramdisk': '', 'is_control_domain': False, 'name_label': 'ie3d.x.rootbsd.net', 'VCPUs_at_startup': 1, 'HVM_boot_params': {'order': 'nc'}, 'platform': {'videoram': '4', 'hpet': '0', 'stdvga': '0', 'vnclisten': '0.0.0.0', 'loader': '/usr/lib/xen/boot/hvmloader', 'serial': 'pty', 'vncunused': '0', 'xen_platform_pci': '1', 'usb': '1', 'nestedhvm': '0', 'boot': 'nc', 'rtc_timeoffset': 1, 'vncpasswd': 'XXXXXXXX', 'pci': [], 'pae': '1', 'vpt_align': '1', 'hap': '1', 'viridian': '0', 'acpi': '1', 'localtime': '0', 'timer_mode': '1', 'vnc': '1', 'nographic': '0', 'vncdisplay': '749', 'pci_msitranslate': '1', 'oos': '1', 'apic': '1', 'sdl': '0', 'nomigrate': '0', 'guest_os_type': 'default', 'tsc_mode': '0', 'usbdevice': 'tablet', 'device_model': '/usr/lib/xen/bin/qemu-dm', 'pci_power_mgmt': '0', 'xauthority': '/root/.Xauthority', 'isa': '0'}, 'PV_kernel': '', 'console_refs': ['011f85bb-c354-33d5-b1f6-bbc3699f1ad1', 'c853847e-a218-46c1-70ba-346551ea43e9'], 'online_vcpus': 2, 'blocked': 0, 'on_xend_stop': 'ignore', 'pool_name': 'Pool-0', 'shutdown': 0, 'HVM_boot_policy': 'BIOS order', 'description': '', 'shutdown_reason': 1, 'VCPUs_max': 2, 'start_time': 1352731059.4260111, 'memory_static_max': 536870912, 'actions_after_shutdown': 'destroy', 'use_tmp_ramdisk': False, 'on_xend_start': 'ignore', 'crashed': 0, 'memory_dynamic_max': 536870912, 'actions_after_suspend': '', 'is_a_template': False, 'PV_bootloader_args': '', 'memory_dynamic_min': 536870912, 'uuid': '8ef5dc51-f0df-20e1-41b2-ad1fea07399f', 'cpu_time': 36.203068825000003, 'shadow_memory': 6, 'memory_static_min': 0, 'dying': 0, 'vcpu_avail': 3, 'notes': {'SUSPEND_CANCEL': 1}, 'other_config': {}, 'auto_power_on': False, 'running': 0, 'domid': 77, 'Description': '', 'vif_refs': ['b27dbf8a-47c6-eabb-f40e-c81a961440eb', '20bb6946-f8b2-a7ba-80f7-3bc6145f35c6'], 'target': 0, 'vtpm_refs': [], 's3_integrity': 1, 'devices': {'20bb6946-f8b2-a7ba-80f7-3bc6145f35c6': ('vif', {'bridge': 'pri700', 'uuid': '20bb6946-f8b2-a7ba-80f7-3bc6145f35c6', 'devid': 1, 'mac': '00:16:3e:3f:0b:ea', 'model': 'e1000', 'type': 'ioemu'}), 'b27dbf8a-47c6-eabb-f40e-c81a961440eb': ('vif', {'bridge': 'pub700', 'uuid': 'b27dbf8a-47c6-eabb-f40e-c81a961440eb', 'devid': 0, 'mac': '00:16:3e:6c:95:10', 'model': 'e1000', 'type': 'ioemu'}), 'c853847e-a218-46c1-70ba-346551ea43e9': ('console', {'location': '5', 'devid': 0, 'protocol': 'vt100', 'uuid': 'c853847e-a218-46c1-70ba-346551ea43e9', 'other_config': {}}), '011f85bb-c354-33d5-b1f6-bbc3699f1ad1': ('vfb', {'vncunused': 0, 'other_config': {'vncunused': 0, 'vncpasswd': 'XXXXXXXX', 'vnclisten': '0.0.0.0', 'vnc': '1', 'vncdisplay': 749}, 'vnc': '1', 'uuid': '011f85bb-c354-33d5-b1f6-bbc3699f1ad1', 'vnclisten': '0.0.0.0', 'vncdisplay': 749, 'vncpasswd': 'XXXXXXXX', 'location': '0.0.0.0:6649', 'devid': 0}), '7413f24b-3ea4-468c-be55-613b842efdc7': ('vbd', {'uuid': '7413f24b-3ea4-468c-be55-613b842efdc7', 'bootable': 1, 'devid': 768, 'driver': 'paravirtualised', 'dev': 'hda', 'uname': 'phy:/var/run/ganeti/instance-disks/ie3d.x.rootbsd.net:0', 'mode': 'w'})}}) [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2499) XendDomainInfo.constructDomain [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:488) VM start failed Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:3077) XendDomainInfo.destroy: domid=78 [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2407) No device model [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2409) Releasing devices [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:130) Domain construction failed Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 128, in create_from_dict vm.start() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:2235) Failed to restart domain 77. Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2218, in _restart new_dom_info) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomain.py", line 1017, in domain_create_from_dict dominfo = XendDomainInfo.create_from_dict(config_dict) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 128, in create_from_dict vm.start() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start XendTask.log_progress(0, 30, self._constructDomain) File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress retval = func(*args, **kwds) File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain self._recreateDom() File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom complete(self.dompath, lambda t: self._recreateDomFunc(t)) File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete if t.commit(): File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit rc = xshandle().transaction_end(self.transaction, False) Error: (2, 'No such file or directory') vm configuration file --------------------------------- kernel = '/usr/lib/xen/boot/hvmloader' builder = 'hvm' memory = 512 vcpus = 2 name = 'ie3d.x.rootbsd.net' pae = 1 acpi = 1 apic = 1 device_model = '/usr/lib/xen/bin/qemu-dm' boot = 'nc' sdl = 0 usb = 1 usbdevice = 'tablet' vnc = 1 vnclisten = '0.0.0.0' vncdisplay = 749 vncunused = 0 vncpasswd = 'JJw1ZHwQ' serial = 'pty' vif = ['mac=00:16:3e:6c:95:10, model=e1000, type=ioemu, bridge=pub700','mac=00:16:3e:3f:0b:ea, model=e1000, type=ioemu, bridge=pri700'] disk = ['phy:/var/run/ganeti/instance-disks/ie3d.x.rootbsd.net:0,hda,w'] on_poweroff = 'destroy' on_reboot = 'restart' on_crash = 'restart' _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:26:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:26:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyi8-0000sc-0o; Mon, 12 Nov 2012 18:26:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyi5-0000sU-M2 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 18:26:14 +0000 Received: from [85.158.137.99:54450] by server-1.bemta-3.messagelabs.com id E7/7C-12169-73F31A05; Mon, 12 Nov 2012 18:25:59 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352744758!18690503!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6940 invoked from network); 12 Nov 2012 18:25:58 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-2.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 18:25:58 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3057142wgb.32 for ; Mon, 12 Nov 2012 10:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CWtF0xPYomT83Arc13JugSdENSZE06Un8E82ziV7Nk0=; b=Vyy/WsIhYntX+7nGknzq9NhX29U0zLF0S+6blWX/kmGyU2skOv/SlFfpY6adzl4GNe e106JVhscWDgfEM/grCA01fzZW5cFogHPTz8oGrTjXQlOZlMsYzfE9TU/73+oGZ5N83X ReUvp+6ZyoHef/Kkoj++ErUl2MrWPyLivQzx+n8qfkH/pwGJsfA+0Fzxf0M6KIsU232i ETNVvzD+jdDqC9812ZxBTejnB7dzS1R2poOFezY00eYhf0Uh49za1aiAX2SRwul3ZtqM 2qkU8QGAWQpBtFwoj7/hetfqSj549kBpd+xLahW0LVjtbRqbOg3cjpAhv+256PluHr4V 5RyA== Received: by 10.180.8.134 with SMTP id r6mr11997346wia.19.1352744758250; Mon, 12 Nov 2012 10:25:58 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id s12sm15585433wik.11.2012.11.12.10.25.52 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 10:25:57 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 12 Nov 2012 18:25:49 +0000 From: Keir Fraser To: Zhigang Wang , Jan Beulich Message-ID: Thread-Topic: VM memory allocation speed with cs 26056 Thread-Index: Ac3BAyOa+QFipbl9cE+clf42eTHdVQ== In-Reply-To: <50A10F3E.2030808@oracle.com> Mime-version: 1.0 Cc: Dan Magenheimer , Konrad Rzeszutek Wilk , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 12/11/2012 15:01, "Zhigang Wang" wrote: > Hi Keir/Jan, > > Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested > your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 > > Attached is the result. The PVM result is weird, there is a small-ish slowdown for small domains, becoming a very large %age slowdown as domain memory increases, and then turning into a *speedup* as the memory size gets very large indeed. What are the error bars like on these measurements I wonder? One thing we could do to allow PV guests doing 4k-at-a-time allocations through alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the filtering-and-flush out into populate_physmap() and increase_reservation(). This is listed as a todo in the original patch (26056). To be honest I don't know why the original patch would make PV domain creation slower, and certainly not by a varying %age depending on domain memory size! -- Keir > Test environment old: > > # xm info > host : ovs-3f-9e-04 > release : 2.6.39-300.17.1.el5uek > version : #1 SMP Fri Oct 19 11:30:08 PDT 2012 > machine : x86_64 > nr_cpus : 160 > nr_nodes : 8 > cores_per_socket : 10 > threads_per_core : 2 > cpu_mhz : 2394 > hw_caps : > bfebfbff:2c100800:00000000:00003f40:02bee3ff:00000000:00000001:00000000 > virt_caps : hvm hvm_directio > total_memory : 2097142 > free_memory : 2040108 > free_cpus : 0 > xen_major : 4 > xen_minor : 1 > xen_extra : .3OVM > xen_caps : xen-3.0-x86_64 xen-3.0-x86_32p hvm-3.0-x86_32 > hvm-3.0-x86_32p hvm-3.0-x86_64 > xen_scheduler : credit > xen_pagesize : 4096 > platform_params : virt_start=0xffff800000000000 > xen_changeset : unavailable > xen_commandline : dom0_mem=31390M no-bootscrub > cc_compiler : gcc version 4.1.2 20080704 (Red Hat 4.1.2-48) > cc_compile_by : mockbuild > cc_compile_domain : us.oracle.com > cc_compile_date : Fri Oct 19 21:34:08 PDT 2012 > xend_config_format : 4 > > # uname -a > Linux ovs-3f-9e-04 2.6.39-300.17.1.el5uek #1 SMP Fri Oct 19 11:30:08 PDT > 2012 x86_64 x86_64 x86_64 GNU/Linux > > # cat /boot/grub/grub.conf > ... > kernel /xen.gz dom0_mem=31390M no-bootscrub dom0_vcpus_pin > dom0_max_vcpus=32 > > Test environment new: old env + cs 26056 > > Test script: test-vm-memory-allocation.sh (attached) > > My conclusion from the test: > > - HVM create time is greatly reduced. > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > - HVM/PVM destroy time is not affected. > - If most of our customers are using PVM, I think this patch is bad: because > most VM memory should under 128G. > - If they are using HVM, then this patch is great. > > Questions for discussion: > > - Did you get the same result? > - It seems this result is not ideal. We may need to improve it. > > Please note: Imay not have access to the same machine for awhile. > > Thanks, > > Zhigang > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:26:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:26:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyi8-0000sc-0o; Mon, 12 Nov 2012 18:26:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyi5-0000sU-M2 for xen-devel@lists.xen.org; Mon, 12 Nov 2012 18:26:14 +0000 Received: from [85.158.137.99:54450] by server-1.bemta-3.messagelabs.com id E7/7C-12169-73F31A05; Mon, 12 Nov 2012 18:25:59 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-2.tower-217.messagelabs.com!1352744758!18690503!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6940 invoked from network); 12 Nov 2012 18:25:58 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-2.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 18:25:58 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3057142wgb.32 for ; Mon, 12 Nov 2012 10:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=CWtF0xPYomT83Arc13JugSdENSZE06Un8E82ziV7Nk0=; b=Vyy/WsIhYntX+7nGknzq9NhX29U0zLF0S+6blWX/kmGyU2skOv/SlFfpY6adzl4GNe e106JVhscWDgfEM/grCA01fzZW5cFogHPTz8oGrTjXQlOZlMsYzfE9TU/73+oGZ5N83X ReUvp+6ZyoHef/Kkoj++ErUl2MrWPyLivQzx+n8qfkH/pwGJsfA+0Fzxf0M6KIsU232i ETNVvzD+jdDqC9812ZxBTejnB7dzS1R2poOFezY00eYhf0Uh49za1aiAX2SRwul3ZtqM 2qkU8QGAWQpBtFwoj7/hetfqSj549kBpd+xLahW0LVjtbRqbOg3cjpAhv+256PluHr4V 5RyA== Received: by 10.180.8.134 with SMTP id r6mr11997346wia.19.1352744758250; Mon, 12 Nov 2012 10:25:58 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id s12sm15585433wik.11.2012.11.12.10.25.52 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 10:25:57 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Mon, 12 Nov 2012 18:25:49 +0000 From: Keir Fraser To: Zhigang Wang , Jan Beulich Message-ID: Thread-Topic: VM memory allocation speed with cs 26056 Thread-Index: Ac3BAyOa+QFipbl9cE+clf42eTHdVQ== In-Reply-To: <50A10F3E.2030808@oracle.com> Mime-version: 1.0 Cc: Dan Magenheimer , Konrad Rzeszutek Wilk , xen-devel Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 12/11/2012 15:01, "Zhigang Wang" wrote: > Hi Keir/Jan, > > Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested > your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 > > Attached is the result. The PVM result is weird, there is a small-ish slowdown for small domains, becoming a very large %age slowdown as domain memory increases, and then turning into a *speedup* as the memory size gets very large indeed. What are the error bars like on these measurements I wonder? One thing we could do to allow PV guests doing 4k-at-a-time allocations through alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the filtering-and-flush out into populate_physmap() and increase_reservation(). This is listed as a todo in the original patch (26056). To be honest I don't know why the original patch would make PV domain creation slower, and certainly not by a varying %age depending on domain memory size! -- Keir > Test environment old: > > # xm info > host : ovs-3f-9e-04 > release : 2.6.39-300.17.1.el5uek > version : #1 SMP Fri Oct 19 11:30:08 PDT 2012 > machine : x86_64 > nr_cpus : 160 > nr_nodes : 8 > cores_per_socket : 10 > threads_per_core : 2 > cpu_mhz : 2394 > hw_caps : > bfebfbff:2c100800:00000000:00003f40:02bee3ff:00000000:00000001:00000000 > virt_caps : hvm hvm_directio > total_memory : 2097142 > free_memory : 2040108 > free_cpus : 0 > xen_major : 4 > xen_minor : 1 > xen_extra : .3OVM > xen_caps : xen-3.0-x86_64 xen-3.0-x86_32p hvm-3.0-x86_32 > hvm-3.0-x86_32p hvm-3.0-x86_64 > xen_scheduler : credit > xen_pagesize : 4096 > platform_params : virt_start=0xffff800000000000 > xen_changeset : unavailable > xen_commandline : dom0_mem=31390M no-bootscrub > cc_compiler : gcc version 4.1.2 20080704 (Red Hat 4.1.2-48) > cc_compile_by : mockbuild > cc_compile_domain : us.oracle.com > cc_compile_date : Fri Oct 19 21:34:08 PDT 2012 > xend_config_format : 4 > > # uname -a > Linux ovs-3f-9e-04 2.6.39-300.17.1.el5uek #1 SMP Fri Oct 19 11:30:08 PDT > 2012 x86_64 x86_64 x86_64 GNU/Linux > > # cat /boot/grub/grub.conf > ... > kernel /xen.gz dom0_mem=31390M no-bootscrub dom0_vcpus_pin > dom0_max_vcpus=32 > > Test environment new: old env + cs 26056 > > Test script: test-vm-memory-allocation.sh (attached) > > My conclusion from the test: > > - HVM create time is greatly reduced. > - PVM create time is increased dramatically for 4G, 8G, 16G, 32G, 64G, 128G. > - HVM/PVM destroy time is not affected. > - If most of our customers are using PVM, I think this patch is bad: because > most VM memory should under 128G. > - If they are using HVM, then this patch is great. > > Questions for discussion: > > - Did you get the same result? > - It seems this result is not ideal. We may need to improve it. > > Please note: Imay not have access to the same machine for awhile. > > Thanks, > > Zhigang > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:35:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:35:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyqd-00017l-3e; Mon, 12 Nov 2012 18:35:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyqb-00017g-CY for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:35:01 +0000 Received: from [193.109.254.147:60816] by server-10.bemta-14.messagelabs.com id AD/88-31741-45141A05; Mon, 12 Nov 2012 18:35:00 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-14.tower-27.messagelabs.com!1352745298!3720418!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15058 invoked from network); 12 Nov 2012 18:34:58 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:34:58 -0000 Received: from localhost (lolek.nigdzie [10.253.0.124]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id D31B25002; Mon, 12 Nov 2012 19:34:57 +0100 (CET) Date: Mon, 12 Nov 2012 19:34:57 +0100 From: Jacek Konieczny To: Olaf Hering Message-ID: <20121112183457.GB2114@lolek.nigdzie> Mail-Followup-To: Olaf Hering , Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121112180738.GA26672@aepfle.de> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Ian Campbell Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 07:07:38PM +0100, Olaf Hering wrote: > On Mon, Nov 12, Ian Campbell wrote: > > > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > > The claim_lock() function would fail in the perl code with: > > > > > > Invalid argument at -e line 2. > > > > > > because the Perl snippet opens for reading the file descriptor, which > > > was earlier opened for write (append). > > > > Looks plausible to me. > > > > How does this interact with the > > eval "exec $_lockfd<&-" > > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > > <&- and >&- or even <>&- are equivalent? > > I did not see the perl error, in what environment did you notice this > error? Xen 4.2.0 # uname -rm 3.6.6-aos4 x86_64 # perl --version This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi I find it a bit strange that it seems to work for everybody else that me, but the source of my error seems obvious (opening write-only file descriptor for reading). I guess my perl, for some reason, does something more when using open() on an existing file descriptor. Greets, Jacek _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:35:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:35:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyqd-00017l-3e; Mon, 12 Nov 2012 18:35:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXyqb-00017g-CY for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:35:01 +0000 Received: from [193.109.254.147:60816] by server-10.bemta-14.messagelabs.com id AD/88-31741-45141A05; Mon, 12 Nov 2012 18:35:00 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-14.tower-27.messagelabs.com!1352745298!3720418!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15058 invoked from network); 12 Nov 2012 18:34:58 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:34:58 -0000 Received: from localhost (lolek.nigdzie [10.253.0.124]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id D31B25002; Mon, 12 Nov 2012 19:34:57 +0100 (CET) Date: Mon, 12 Nov 2012 19:34:57 +0100 From: Jacek Konieczny To: Olaf Hering Message-ID: <20121112183457.GB2114@lolek.nigdzie> Mail-Followup-To: Olaf Hering , Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121112180738.GA26672@aepfle.de> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "xen-devel@lists.xensource.com" , Ian Jackson , Ian Campbell Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 07:07:38PM +0100, Olaf Hering wrote: > On Mon, Nov 12, Ian Campbell wrote: > > > On Fri, 2012-11-09 at 13:56 +0000, Jacek Konieczny wrote: > > > The claim_lock() function would fail in the perl code with: > > > > > > Invalid argument at -e line 2. > > > > > > because the Perl snippet opens for reading the file descriptor, which > > > was earlier opened for write (append). > > > > Looks plausible to me. > > > > How does this interact with the > > eval "exec $_lockfd<&-" > > which Olaf added in 26079:b3b03536789a ? I suppose close is close and > > <&- and >&- or even <>&- are equivalent? > > I did not see the perl error, in what environment did you notice this > error? Xen 4.2.0 # uname -rm 3.6.6-aos4 x86_64 # perl --version This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi I find it a bit strange that it seems to work for everybody else that me, but the source of my error seems obvious (opening write-only file descriptor for reading). I guess my perl, for some reason, does something more when using open() on an existing file descriptor. Greets, Jacek _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:41:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:41:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXywI-0001JW-2T; Mon, 12 Nov 2012 18:40:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXywG-0001JR-4o for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:40:52 +0000 Received: from [193.109.254.147:49030] by server-5.bemta-14.messagelabs.com id DE/4A-10257-3B241A05; Mon, 12 Nov 2012 18:40:51 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-6.tower-27.messagelabs.com!1352745650!3688089!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTg3MA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTg3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 12 Nov 2012 18:40:50 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:40:50 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV6KE= Received: from probook.site (ip-80-226-24-2.vodafone-net.de [80.226.24.2]) by smtp.strato.de (joses mo34) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id j02e0aoACI5Gro ; Mon, 12 Nov 2012 19:40:50 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 01C1D189BA; Mon, 12 Nov 2012 19:40:47 +0100 (CET) Date: Mon, 12 Nov 2012 19:40:47 +0100 From: Olaf Hering To: Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson Message-ID: <20121112184047.GA28988@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121112183457.GB2114@lolek.nigdzie> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, Jacek Konieczny wrote: > # perl --version > This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi sles11sp2 has perl 5.10.0, maybe there is different behaviour in different perl versions. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 18:41:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 18:41:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXywI-0001JW-2T; Mon, 12 Nov 2012 18:40:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXywG-0001JR-4o for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 18:40:52 +0000 Received: from [193.109.254.147:49030] by server-5.bemta-14.messagelabs.com id DE/4A-10257-3B241A05; Mon, 12 Nov 2012 18:40:51 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-6.tower-27.messagelabs.com!1352745650!3688089!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTg3MA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNTg3MA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 12 Nov 2012 18:40:50 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 12 Nov 2012 18:40:50 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV6KE= Received: from probook.site (ip-80-226-24-2.vodafone-net.de [80.226.24.2]) by smtp.strato.de (joses mo34) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id j02e0aoACI5Gro ; Mon, 12 Nov 2012 19:40:50 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 01C1D189BA; Mon, 12 Nov 2012 19:40:47 +0100 (CET) Date: Mon, 12 Nov 2012 19:40:47 +0100 From: Olaf Hering To: Ian Campbell , "xen-devel@lists.xensource.com" , Ian Jackson Message-ID: <20121112184047.GA28988@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121112183457.GB2114@lolek.nigdzie> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, Jacek Konieczny wrote: > # perl --version > This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi sles11sp2 has perl 5.10.0, maybe there is different behaviour in different perl versions. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 19:08:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 19:08:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzMj-00020J-3b; Mon, 12 Nov 2012 19:08:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzMh-00020E-AY for xen-devel@lists.xen.org; Mon, 12 Nov 2012 19:08:12 +0000 Received: from [85.158.137.99:30075] by server-7.bemta-3.messagelabs.com id CC/49-01713-71941A05; Mon, 12 Nov 2012 19:08:07 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-2.tower-217.messagelabs.com!1352747286!18693822!1 X-Originating-IP: [80.160.77.114] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3LjExNCA9PiAzNzY0MTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29300 invoked from network); 12 Nov 2012 19:08:06 -0000 Received: from pasmtpa.tele.dk (HELO pasmtpA.tele.dk) (80.160.77.114) by server-2.tower-217.messagelabs.com with SMTP; 12 Nov 2012 19:08:06 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpA.tele.dk (Postfix) with ESMTP id 79D2580004C for ; Mon, 12 Nov 2012 20:08:05 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Mon, 12 Nov 2012 20:08:06 +0100 From: Kristian Hagsted Rasmussen To: "xen-devel@lists.xen.org" Thread-Topic: xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQ== Date: Mon, 12 Nov 2012 19:08:05 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> Accept-Language: da-DK, en-US Content-Language: da-DK X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [192.168.1.103] Content-Type: multipart/mixed; boundary="_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_" MIME-Version: 1.0 Subject: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: multipart/alternative; boundary="_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_" --_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi all I can't seem to find any information on vga-passthrough when booting throug= h xen.efi, so I assume it should work. But I encounter a problem on a windo= ws 7 HVM that boots fine when dom0 is booted through MBR but fails when dom= 0 is booted through UEFI. My system is: DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel HD graphics 4000 In the qemu log it seem like xen cannot reach the vga-bios. Is this a known= problem when booting through xen.efi or is it a bug? dm-command: hot insert pass-through pci dev register_real_device: Assigning real physical device 00:02.0 ... register_real_device: Disable MSI translation via per device option register_real_device: Disable power management pt_iomul_init: Error: pt_iomul_init can't open file /dev/xen/pci_iomul: No = such file or directory: 0x0:0x2.0x0 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) pt_register_regions: IO region registered (size=3D0x10000000 base_addr=3D0x= e000000c) pt_register_regions: IO region registered (size=3D0x00000040 base_addr=3D0x= 0000f001) setup_vga_pt: vga bios size (0x0) is invalid! register_real_device: Setup VGA BIOS of passthroughed gfx failed! Log file is attached. Kind regards Kristian Hagsted Rasmussen --_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi all

 

I can't seem to find any inf= ormation on vga-passthrough when booting through xen.efi, so I assume it sh= ould work. But I encounter a problem on a windows 7 HVM that boots fine whe= n dom0 is booted through MBR but fails when dom0 is booted through UEFI.

 

My system is:

DQ77KB motherboard with bios= version 44

Core i7-3779T with VT-d=

Intel HD graphics 4000<= /o:p>

 

In the qemu log it seem like= xen cannot reach the vga-bios. Is this a known problem when booting throug= h xen.efi or is it a bug?

 

dm-command: hot insert pass-= through pci dev

register_real_device: Assign= ing real physical device 00:02.0 ...

register_real_device: Disabl= e MSI translation via per device option

register_real_device: Disabl= e power management

pt_iomul_init: Error: pt_iom= ul_init can't open file /dev/xen/pci_iomul: No such file or directory: 0x0:= 0x2.0x0

pt_register_regions: IO regi= on registered (size=3D0x00400000 base_addr=3D0xf7000004)<= /p>

pt_register_regions: IO regi= on registered (size=3D0x10000000 base_addr=3D0xe000000c)<= /p>

pt_register_regions: IO regi= on registered (size=3D0x00000040 base_addr=3D0x0000f001)<= /p>

setup_vga_pt: vga bios size = (0x0) is invalid!

register_real_device: Setup = VGA BIOS of passthroughed gfx failed!

 

Log file is attached.

 

Kind regards Kristian Hagste= d Rasmussen

 

--_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_-- --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: application/octet-stream; name="windows-domU.log" Content-Description: windows-domU.log Content-Disposition: attachment; filename="windows-domU.log"; size=6272; creation-date="Mon, 12 Nov 2012 18:43:00 GMT"; modification-date="Mon, 12 Nov 2012 18:43:00 GMT" Content-Transfer-Encoding: base64 ZG9taWQ6IDYNClVzaW5nIHh2ZGEgZm9yIGd1ZXN0J3MgaGRhDQpVc2luZyBmaWxlIC9kZXYvc2Rh NiBpbiByZWFkLXdyaXRlIG1vZGUNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9k ZWwvNi9sb2dkaXJ0eS9jbWQNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwv Ni9jb21tYW5kDQpXYXRjaGluZyAvbG9jYWwvZG9tYWluLzYvY3B1DQpjaGFyIGRldmljZSByZWRp cmVjdGVkIHRvIC9kZXYvcHRzLzQNCnFlbXVfbWFwX2NhY2hlX2luaXQgbnJfYnVja2V0cyA9IDEw MDAwIHNpemUgNDE5NDMwNA0Kc2hhcmVkIHBhZ2UgYXQgcGZuIGZlZmZkDQpidWZmZXJlZCBpbyBw YWdlIGF0IHBmbiBmZWZmYg0KR3Vlc3QgdXVpZCA9IDdhYjk5OTQ1LWNhNDItNDIzMC05NjI4LTBl ODJjOGJhZTI1Nw0KUmVnaXN0ZXIgeGVuIHBsYXRmb3JtLg0KRG9uZSByZWdpc3RlciBwbGF0Zm9y bS4NCnBsYXRmb3JtX2ZpeGVkX2lvcG9ydDogY2hhbmdlZCByby9ydyBzdGF0ZSBvZiBST00gbWVt b3J5IGFyZWEuIG5vdyBpcyBydyBzdGF0ZS4NCnhzX3JlYWQoL2xvY2FsL2RvbWFpbi8wL2Rldmlj ZS1tb2RlbC82L3hlbl9leHRlbmRlZF9wb3dlcl9tZ210KTogcmVhZCBlcnJvcg0KeHNfcmVhZCgp OiB2bmNwYXNzd2QgZ2V0IGVycm9yLiAvdm0vN2FiOTk5NDUtY2E0Mi00MjMwLTk2MjgtMGU4MmM4 YmFlMjU3L3ZuY3Bhc3N3ZC4NCkxvZy1kaXJ0eTogbm8gY29tbWFuZCB5ZXQuDQpJL08gcmVxdWVz dCBub3QgcmVhZHk6IDAsIHB0cjogMCwgcG9ydDogMCwgZGF0YTogMCwgY291bnQ6IDAsIHNpemU6 IDANCkkvTyByZXF1ZXN0IG5vdCByZWFkeTogMCwgcHRyOiAwLCBwb3J0OiAwLCBkYXRhOiAwLCBj b3VudDogMCwgc2l6ZTogMA0KdmNwdS1zZXQ6IHdhdGNoIG5vZGUgZXJyb3IuDQp4c19yZWFkKC9s b2NhbC9kb21haW4vNi9sb2ctdGhyb3R0bGluZyk6IHJlYWQgZXJyb3INCnFlbXU6IGlnbm9yaW5n IG5vdC11bmRlcnN0b29kIGRyaXZlIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnDQpt ZWRpdW0gY2hhbmdlIHdhdGNoIG9uIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnIC0g dW5rbm93biBkZXZpY2UsIGlnbm9yZWQNCmRtLWNvbW1hbmQ6IGhvdCBpbnNlcnQgcGFzcy10aHJv dWdoIHBjaSBkZXYNCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBBc3NpZ25pbmcgcmVhbCBwaHlzaWNh bCBkZXZpY2UgMDA6MDIuMCAuLi4NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBEaXNhYmxlIE1TSSB0 cmFuc2xhdGlvbiB2aWEgcGVyIGRldmljZSBvcHRpb24NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBE aXNhYmxlIHBvd2VyIG1hbmFnZW1lbnQNCnB0X2lvbXVsX2luaXQ6IEVycm9yOiBwdF9pb211bF9p bml0IGNhbid0IG9wZW4gZmlsZSAvZGV2L3hlbi9wY2lfaW9tdWw6IE5vIHN1Y2ggZmlsZSBvciBk aXJlY3Rvcnk6IDB4MDoweDIuMHgwDQpwdF9yZWdpc3Rlcl9yZWdpb25zOiBJTyByZWdpb24gcmVn aXN0ZXJlZCAoc2l6ZT0weDAwNDAwMDAwIGJhc2VfYWRkcj0weGY3MDAwMDA0KQ0KcHRfcmVnaXN0 ZXJfcmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgxMDAwMDAwMCBiYXNlX2Fk ZHI9MHhlMDAwMDAwYykNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVk IChzaXplPTB4MDAwMDAwNDAgYmFzZV9hZGRyPTB4MDAwMGYwMDEpDQpzZXR1cF92Z2FfcHQ6IHZn YSBiaW9zIHNpemUgKDB4MCkgaXMgaW52YWxpZCENCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBTZXR1 cCBWR0EgQklPUyBvZiBwYXNzdGhyb3VnaGVkIGdmeCBmYWlsZWQhDQpkbS1jb21tYW5kOiBob3Qg aW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWdu aW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFhLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2Rldmlj ZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rl cl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBF cnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBO byBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYS4weDANCnB0X3JlZ2lzdGVyX3JlZ2lv bnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4Zjdk MzgwMDApDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlz aWNhbCBkZXZpY2UgMDA6MWEuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJ TlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rl cl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFiLjAgLi4u DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBk ZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2Vt ZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUg L2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYi4w eDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAw MDQwMDAgYmFzZV9hZGRyPTB4ZjdkMzAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9y ZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6MWIuMCByZWdpc3RlcmVkIHN1Y2Nl c3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhy b3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2lj YWwgZGV2aWNlIDAwOjFkLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kg dHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTog RGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxf aW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3Ig ZGlyZWN0b3J5OiAweDA6MHgxZC4weDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiBy ZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4ZjdkMzcwMDApDQpwY2lfaW50 eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6 MWQuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5k OiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTog QXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAxOjAwLjAgLi4uDQpyZWdpc3Rlcl9yZWFs X2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9p bml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lv bXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDE6MHgwLjB4MA0KcHRfcmVnaXN0ZXJf cmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgwMDQwMDAwMCBiYXNlX2FkZHI9 MHhmNzgwMDAwNCkNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChz aXplPTB4MDA0MDAwMDAgYmFzZV9hZGRyPTB4Zjc0MDAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDE6MDAuMCByZWdpc3Rl cmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MTQwMDAwMCBtYWRkcj1mNzgwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MCBmaXJzdF9t YXA9MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE4MDAwMDAgbWFkZHI9Zjc0MDAwMDAgdHlwZT0w IGxlbj00MTk0MzA0IGluZGV4PTIgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYx YzIwMDAwIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9 MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxl bj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAw IG1hZGRyPWY3ZDM3MDAwIHR5cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0xDQpwbGF0 Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncgc3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVh LiBub3cgaXMgcncgc3RhdGUuDQpwbGF0Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncg c3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVhLiBub3cgaXMgcm8gc3RhdGUuDQpwdF9pb21lbV9tYXA6 IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBm aXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAg dHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlz PWZmZmZmZmZmIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9t YXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjAwMDAgbWFkZHI9ZjdkMzAwMDAgdHlwZT0w IGxlbj0xNjM4NCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mN2QzNzAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0K cHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjUwMDAgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00 MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1h ZGRyPWY3ODAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9p b21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQz MDQgaW5kZXg9MiBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFk ZHI9Zjc4MDAwMDAgdHlwZT0wIGxlbj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lv bWVtX21hcDogZV9waHlzPWYxODAwMDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMw NCBpbmRleD0yIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRk cj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1f bWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4 PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ZDMw MDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBl X3BoeXM9ZmZmZmZmZmYgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmly c3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAwIG1hZGRyPWY3ZDM3MDAwIHR5 cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MWMyMDAwMCBtYWRkcj1mN2QzMDAwMCB0eXBlPTAgbGVuPTE2Mzg0IGluZGV4PTAgZmlyc3RfbWFw PTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ODAwMDAwIHR5cGU9MCBs ZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MiBmaXJzdF9tYXA9 MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFkZHI9Zjc4MDAwMDAgdHlwZT0wIGxl bj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxODAw MDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0yIGZpcnN0X21hcD0w DQo= --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_-- From xen-devel-bounces@lists.xen.org Mon Nov 12 19:08:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 19:08:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzMj-00020J-3b; Mon, 12 Nov 2012 19:08:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzMh-00020E-AY for xen-devel@lists.xen.org; Mon, 12 Nov 2012 19:08:12 +0000 Received: from [85.158.137.99:30075] by server-7.bemta-3.messagelabs.com id CC/49-01713-71941A05; Mon, 12 Nov 2012 19:08:07 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-2.tower-217.messagelabs.com!1352747286!18693822!1 X-Originating-IP: [80.160.77.114] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3LjExNCA9PiAzNzY0MTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29300 invoked from network); 12 Nov 2012 19:08:06 -0000 Received: from pasmtpa.tele.dk (HELO pasmtpA.tele.dk) (80.160.77.114) by server-2.tower-217.messagelabs.com with SMTP; 12 Nov 2012 19:08:06 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpA.tele.dk (Postfix) with ESMTP id 79D2580004C for ; Mon, 12 Nov 2012 20:08:05 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Mon, 12 Nov 2012 20:08:06 +0100 From: Kristian Hagsted Rasmussen To: "xen-devel@lists.xen.org" Thread-Topic: xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQ== Date: Mon, 12 Nov 2012 19:08:05 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> Accept-Language: da-DK, en-US Content-Language: da-DK X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [192.168.1.103] Content-Type: multipart/mixed; boundary="_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_" MIME-Version: 1.0 Subject: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: multipart/alternative; boundary="_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_" --_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi all I can't seem to find any information on vga-passthrough when booting throug= h xen.efi, so I assume it should work. But I encounter a problem on a windo= ws 7 HVM that boots fine when dom0 is booted through MBR but fails when dom= 0 is booted through UEFI. My system is: DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel HD graphics 4000 In the qemu log it seem like xen cannot reach the vga-bios. Is this a known= problem when booting through xen.efi or is it a bug? dm-command: hot insert pass-through pci dev register_real_device: Assigning real physical device 00:02.0 ... register_real_device: Disable MSI translation via per device option register_real_device: Disable power management pt_iomul_init: Error: pt_iomul_init can't open file /dev/xen/pci_iomul: No = such file or directory: 0x0:0x2.0x0 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) pt_register_regions: IO region registered (size=3D0x10000000 base_addr=3D0x= e000000c) pt_register_regions: IO region registered (size=3D0x00000040 base_addr=3D0x= 0000f001) setup_vga_pt: vga bios size (0x0) is invalid! register_real_device: Setup VGA BIOS of passthroughed gfx failed! Log file is attached. Kind regards Kristian Hagsted Rasmussen --_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi all

 

I can't seem to find any inf= ormation on vga-passthrough when booting through xen.efi, so I assume it sh= ould work. But I encounter a problem on a windows 7 HVM that boots fine whe= n dom0 is booted through MBR but fails when dom0 is booted through UEFI.

 

My system is:

DQ77KB motherboard with bios= version 44

Core i7-3779T with VT-d=

Intel HD graphics 4000<= /o:p>

 

In the qemu log it seem like= xen cannot reach the vga-bios. Is this a known problem when booting throug= h xen.efi or is it a bug?

 

dm-command: hot insert pass-= through pci dev

register_real_device: Assign= ing real physical device 00:02.0 ...

register_real_device: Disabl= e MSI translation via per device option

register_real_device: Disabl= e power management

pt_iomul_init: Error: pt_iom= ul_init can't open file /dev/xen/pci_iomul: No such file or directory: 0x0:= 0x2.0x0

pt_register_regions: IO regi= on registered (size=3D0x00400000 base_addr=3D0xf7000004)<= /p>

pt_register_regions: IO regi= on registered (size=3D0x10000000 base_addr=3D0xe000000c)<= /p>

pt_register_regions: IO regi= on registered (size=3D0x00000040 base_addr=3D0x0000f001)<= /p>

setup_vga_pt: vga bios size = (0x0) is invalid!

register_real_device: Setup = VGA BIOS of passthroughed gfx failed!

 

Log file is attached.

 

Kind regards Kristian Hagste= d Rasmussen

 

--_000_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_-- --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: application/octet-stream; name="windows-domU.log" Content-Description: windows-domU.log Content-Disposition: attachment; filename="windows-domU.log"; size=6272; creation-date="Mon, 12 Nov 2012 18:43:00 GMT"; modification-date="Mon, 12 Nov 2012 18:43:00 GMT" Content-Transfer-Encoding: base64 ZG9taWQ6IDYNClVzaW5nIHh2ZGEgZm9yIGd1ZXN0J3MgaGRhDQpVc2luZyBmaWxlIC9kZXYvc2Rh NiBpbiByZWFkLXdyaXRlIG1vZGUNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9k ZWwvNi9sb2dkaXJ0eS9jbWQNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwv Ni9jb21tYW5kDQpXYXRjaGluZyAvbG9jYWwvZG9tYWluLzYvY3B1DQpjaGFyIGRldmljZSByZWRp cmVjdGVkIHRvIC9kZXYvcHRzLzQNCnFlbXVfbWFwX2NhY2hlX2luaXQgbnJfYnVja2V0cyA9IDEw MDAwIHNpemUgNDE5NDMwNA0Kc2hhcmVkIHBhZ2UgYXQgcGZuIGZlZmZkDQpidWZmZXJlZCBpbyBw YWdlIGF0IHBmbiBmZWZmYg0KR3Vlc3QgdXVpZCA9IDdhYjk5OTQ1LWNhNDItNDIzMC05NjI4LTBl ODJjOGJhZTI1Nw0KUmVnaXN0ZXIgeGVuIHBsYXRmb3JtLg0KRG9uZSByZWdpc3RlciBwbGF0Zm9y bS4NCnBsYXRmb3JtX2ZpeGVkX2lvcG9ydDogY2hhbmdlZCByby9ydyBzdGF0ZSBvZiBST00gbWVt b3J5IGFyZWEuIG5vdyBpcyBydyBzdGF0ZS4NCnhzX3JlYWQoL2xvY2FsL2RvbWFpbi8wL2Rldmlj ZS1tb2RlbC82L3hlbl9leHRlbmRlZF9wb3dlcl9tZ210KTogcmVhZCBlcnJvcg0KeHNfcmVhZCgp OiB2bmNwYXNzd2QgZ2V0IGVycm9yLiAvdm0vN2FiOTk5NDUtY2E0Mi00MjMwLTk2MjgtMGU4MmM4 YmFlMjU3L3ZuY3Bhc3N3ZC4NCkxvZy1kaXJ0eTogbm8gY29tbWFuZCB5ZXQuDQpJL08gcmVxdWVz dCBub3QgcmVhZHk6IDAsIHB0cjogMCwgcG9ydDogMCwgZGF0YTogMCwgY291bnQ6IDAsIHNpemU6 IDANCkkvTyByZXF1ZXN0IG5vdCByZWFkeTogMCwgcHRyOiAwLCBwb3J0OiAwLCBkYXRhOiAwLCBj b3VudDogMCwgc2l6ZTogMA0KdmNwdS1zZXQ6IHdhdGNoIG5vZGUgZXJyb3IuDQp4c19yZWFkKC9s b2NhbC9kb21haW4vNi9sb2ctdGhyb3R0bGluZyk6IHJlYWQgZXJyb3INCnFlbXU6IGlnbm9yaW5n IG5vdC11bmRlcnN0b29kIGRyaXZlIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnDQpt ZWRpdW0gY2hhbmdlIHdhdGNoIG9uIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnIC0g dW5rbm93biBkZXZpY2UsIGlnbm9yZWQNCmRtLWNvbW1hbmQ6IGhvdCBpbnNlcnQgcGFzcy10aHJv dWdoIHBjaSBkZXYNCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBBc3NpZ25pbmcgcmVhbCBwaHlzaWNh bCBkZXZpY2UgMDA6MDIuMCAuLi4NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBEaXNhYmxlIE1TSSB0 cmFuc2xhdGlvbiB2aWEgcGVyIGRldmljZSBvcHRpb24NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBE aXNhYmxlIHBvd2VyIG1hbmFnZW1lbnQNCnB0X2lvbXVsX2luaXQ6IEVycm9yOiBwdF9pb211bF9p bml0IGNhbid0IG9wZW4gZmlsZSAvZGV2L3hlbi9wY2lfaW9tdWw6IE5vIHN1Y2ggZmlsZSBvciBk aXJlY3Rvcnk6IDB4MDoweDIuMHgwDQpwdF9yZWdpc3Rlcl9yZWdpb25zOiBJTyByZWdpb24gcmVn aXN0ZXJlZCAoc2l6ZT0weDAwNDAwMDAwIGJhc2VfYWRkcj0weGY3MDAwMDA0KQ0KcHRfcmVnaXN0 ZXJfcmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgxMDAwMDAwMCBiYXNlX2Fk ZHI9MHhlMDAwMDAwYykNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVk IChzaXplPTB4MDAwMDAwNDAgYmFzZV9hZGRyPTB4MDAwMGYwMDEpDQpzZXR1cF92Z2FfcHQ6IHZn YSBiaW9zIHNpemUgKDB4MCkgaXMgaW52YWxpZCENCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBTZXR1 cCBWR0EgQklPUyBvZiBwYXNzdGhyb3VnaGVkIGdmeCBmYWlsZWQhDQpkbS1jb21tYW5kOiBob3Qg aW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWdu aW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFhLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2Rldmlj ZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rl cl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBF cnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBO byBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYS4weDANCnB0X3JlZ2lzdGVyX3JlZ2lv bnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4Zjdk MzgwMDApDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlz aWNhbCBkZXZpY2UgMDA6MWEuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJ TlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rl cl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFiLjAgLi4u DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBk ZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2Vt ZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUg L2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYi4w eDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAw MDQwMDAgYmFzZV9hZGRyPTB4ZjdkMzAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9y ZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6MWIuMCByZWdpc3RlcmVkIHN1Y2Nl c3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhy b3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2lj YWwgZGV2aWNlIDAwOjFkLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kg dHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTog RGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxf aW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3Ig ZGlyZWN0b3J5OiAweDA6MHgxZC4weDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiBy ZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4ZjdkMzcwMDApDQpwY2lfaW50 eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6 MWQuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5k OiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTog QXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAxOjAwLjAgLi4uDQpyZWdpc3Rlcl9yZWFs X2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9p bml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lv bXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDE6MHgwLjB4MA0KcHRfcmVnaXN0ZXJf cmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgwMDQwMDAwMCBiYXNlX2FkZHI9 MHhmNzgwMDAwNCkNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChz aXplPTB4MDA0MDAwMDAgYmFzZV9hZGRyPTB4Zjc0MDAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDE6MDAuMCByZWdpc3Rl cmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MTQwMDAwMCBtYWRkcj1mNzgwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MCBmaXJzdF9t YXA9MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE4MDAwMDAgbWFkZHI9Zjc0MDAwMDAgdHlwZT0w IGxlbj00MTk0MzA0IGluZGV4PTIgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYx YzIwMDAwIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9 MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxl bj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAw IG1hZGRyPWY3ZDM3MDAwIHR5cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0xDQpwbGF0 Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncgc3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVh LiBub3cgaXMgcncgc3RhdGUuDQpwbGF0Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncg c3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVhLiBub3cgaXMgcm8gc3RhdGUuDQpwdF9pb21lbV9tYXA6 IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBm aXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAg dHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlz PWZmZmZmZmZmIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9t YXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjAwMDAgbWFkZHI9ZjdkMzAwMDAgdHlwZT0w IGxlbj0xNjM4NCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mN2QzNzAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0K cHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjUwMDAgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00 MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1h ZGRyPWY3ODAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9p b21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQz MDQgaW5kZXg9MiBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFk ZHI9Zjc4MDAwMDAgdHlwZT0wIGxlbj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lv bWVtX21hcDogZV9waHlzPWYxODAwMDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMw NCBpbmRleD0yIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRk cj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1f bWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4 PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ZDMw MDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBl X3BoeXM9ZmZmZmZmZmYgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmly c3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAwIG1hZGRyPWY3ZDM3MDAwIHR5 cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MWMyMDAwMCBtYWRkcj1mN2QzMDAwMCB0eXBlPTAgbGVuPTE2Mzg0IGluZGV4PTAgZmlyc3RfbWFw PTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ODAwMDAwIHR5cGU9MCBs ZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MiBmaXJzdF9tYXA9 MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFkZHI9Zjc4MDAwMDAgdHlwZT0wIGxl bj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxODAw MDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0yIGZpcnN0X21hcD0w DQo= --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_004_19EF9FEB5AF86243A3F18E5CE75971640A00B0F5hagstedbserverh_-- From xen-devel-bounces@lists.xen.org Mon Nov 12 19:19:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 19:19:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzWs-0002Db-8W; Mon, 12 Nov 2012 19:18:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzWq-0002DW-Ja for xen-devel@lists.xen.org; Mon, 12 Nov 2012 19:18:40 +0000 Received: from [193.109.254.147:30148] by server-2.bemta-14.messagelabs.com id 11/98-20829-F8B41A05; Mon, 12 Nov 2012 19:18:39 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-2.tower-27.messagelabs.com!1352747917!9091625!1 X-Originating-IP: [80.160.77.114] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3LjExNCA9PiAzNzY0MTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28679 invoked from network); 12 Nov 2012 19:18:37 -0000 Received: from pasmtpa.tele.dk (HELO pasmtpA.tele.dk) (80.160.77.114) by server-2.tower-27.messagelabs.com with SMTP; 12 Nov 2012 19:18:37 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpA.tele.dk (Postfix) with ESMTP id 5724080004C for ; Mon, 12 Nov 2012 20:18:36 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Mon, 12 Nov 2012 20:18:36 +0100 From: Kristian Hagsted Rasmussen To: Kristian Hagsted Rasmussen , "xen-devel@lists.xen.org" Thread-Topic: xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQAAQFdA Date: Mon, 12 Nov 2012 19:18:36 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B204@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> In-Reply-To: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> Accept-Language: da-DK, en-US Content-Language: da-DK X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [192.168.1.103] Content-Type: multipart/mixed; boundary="_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_" MIME-Version: 1.0 Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi all I can't seem to find any information on vga-passthrough when booting throug= h xen.efi, so I assume it should work. But I encounter a problem on a windo= ws 7 HVM that boots fine when dom0 is booted through MBR but fails when dom= 0 is booted through UEFI. My system is: DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel HD graphics 4000 In the qemu log it seem like xen cannot reach the vga-bios. Is this a known= problem when booting through xen.efi or is it a bug? dm-command: hot insert pass-through pci dev register_real_device: Assigning real physical device 00:02.0 ... register_real_device: Disable MSI translation via per device option register_real_device: Disable power management pt_iomul_init: Error: pt_iomul_init can't open file /dev/xen/pci_iomul: No = such file or directory: 0x0:0x2.0x0 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) pt_register_regions: IO region registered (size=3D0x10000000 base_addr=3D0x= e000000c) pt_register_regions: IO region registered (size=3D0x00000040 base_addr=3D0x= 0000f001) setup_vga_pt: vga bios size (0x0) is invalid! register_real_device: Setup VGA BIOS of passthroughed gfx failed! Log file is attached. Just compared a log file from efi boot to one from MBR boot and found this = discrepancy between the two: pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= dfc00004) - MBR boot see last addr 0xdfc00004 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) - EFI boot compare to MBR 0xf7000004 Kind regards Kristian Hagsted Rasmussen --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: application/octet-stream; name="windows-domU.log" Content-Description: windows-domU.log Content-Disposition: attachment; filename="windows-domU.log"; size=6272; creation-date="Mon, 12 Nov 2012 18:43:00 GMT"; modification-date="Mon, 12 Nov 2012 18:43:00 GMT" Content-Transfer-Encoding: base64 ZG9taWQ6IDYNClVzaW5nIHh2ZGEgZm9yIGd1ZXN0J3MgaGRhDQpVc2luZyBmaWxlIC9kZXYvc2Rh NiBpbiByZWFkLXdyaXRlIG1vZGUNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9k ZWwvNi9sb2dkaXJ0eS9jbWQNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwv Ni9jb21tYW5kDQpXYXRjaGluZyAvbG9jYWwvZG9tYWluLzYvY3B1DQpjaGFyIGRldmljZSByZWRp cmVjdGVkIHRvIC9kZXYvcHRzLzQNCnFlbXVfbWFwX2NhY2hlX2luaXQgbnJfYnVja2V0cyA9IDEw MDAwIHNpemUgNDE5NDMwNA0Kc2hhcmVkIHBhZ2UgYXQgcGZuIGZlZmZkDQpidWZmZXJlZCBpbyBw YWdlIGF0IHBmbiBmZWZmYg0KR3Vlc3QgdXVpZCA9IDdhYjk5OTQ1LWNhNDItNDIzMC05NjI4LTBl ODJjOGJhZTI1Nw0KUmVnaXN0ZXIgeGVuIHBsYXRmb3JtLg0KRG9uZSByZWdpc3RlciBwbGF0Zm9y bS4NCnBsYXRmb3JtX2ZpeGVkX2lvcG9ydDogY2hhbmdlZCByby9ydyBzdGF0ZSBvZiBST00gbWVt b3J5IGFyZWEuIG5vdyBpcyBydyBzdGF0ZS4NCnhzX3JlYWQoL2xvY2FsL2RvbWFpbi8wL2Rldmlj ZS1tb2RlbC82L3hlbl9leHRlbmRlZF9wb3dlcl9tZ210KTogcmVhZCBlcnJvcg0KeHNfcmVhZCgp OiB2bmNwYXNzd2QgZ2V0IGVycm9yLiAvdm0vN2FiOTk5NDUtY2E0Mi00MjMwLTk2MjgtMGU4MmM4 YmFlMjU3L3ZuY3Bhc3N3ZC4NCkxvZy1kaXJ0eTogbm8gY29tbWFuZCB5ZXQuDQpJL08gcmVxdWVz dCBub3QgcmVhZHk6IDAsIHB0cjogMCwgcG9ydDogMCwgZGF0YTogMCwgY291bnQ6IDAsIHNpemU6 IDANCkkvTyByZXF1ZXN0IG5vdCByZWFkeTogMCwgcHRyOiAwLCBwb3J0OiAwLCBkYXRhOiAwLCBj b3VudDogMCwgc2l6ZTogMA0KdmNwdS1zZXQ6IHdhdGNoIG5vZGUgZXJyb3IuDQp4c19yZWFkKC9s b2NhbC9kb21haW4vNi9sb2ctdGhyb3R0bGluZyk6IHJlYWQgZXJyb3INCnFlbXU6IGlnbm9yaW5n IG5vdC11bmRlcnN0b29kIGRyaXZlIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnDQpt ZWRpdW0gY2hhbmdlIHdhdGNoIG9uIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnIC0g dW5rbm93biBkZXZpY2UsIGlnbm9yZWQNCmRtLWNvbW1hbmQ6IGhvdCBpbnNlcnQgcGFzcy10aHJv dWdoIHBjaSBkZXYNCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBBc3NpZ25pbmcgcmVhbCBwaHlzaWNh bCBkZXZpY2UgMDA6MDIuMCAuLi4NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBEaXNhYmxlIE1TSSB0 cmFuc2xhdGlvbiB2aWEgcGVyIGRldmljZSBvcHRpb24NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBE aXNhYmxlIHBvd2VyIG1hbmFnZW1lbnQNCnB0X2lvbXVsX2luaXQ6IEVycm9yOiBwdF9pb211bF9p bml0IGNhbid0IG9wZW4gZmlsZSAvZGV2L3hlbi9wY2lfaW9tdWw6IE5vIHN1Y2ggZmlsZSBvciBk aXJlY3Rvcnk6IDB4MDoweDIuMHgwDQpwdF9yZWdpc3Rlcl9yZWdpb25zOiBJTyByZWdpb24gcmVn aXN0ZXJlZCAoc2l6ZT0weDAwNDAwMDAwIGJhc2VfYWRkcj0weGY3MDAwMDA0KQ0KcHRfcmVnaXN0 ZXJfcmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgxMDAwMDAwMCBiYXNlX2Fk ZHI9MHhlMDAwMDAwYykNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVk IChzaXplPTB4MDAwMDAwNDAgYmFzZV9hZGRyPTB4MDAwMGYwMDEpDQpzZXR1cF92Z2FfcHQ6IHZn YSBiaW9zIHNpemUgKDB4MCkgaXMgaW52YWxpZCENCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBTZXR1 cCBWR0EgQklPUyBvZiBwYXNzdGhyb3VnaGVkIGdmeCBmYWlsZWQhDQpkbS1jb21tYW5kOiBob3Qg aW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWdu aW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFhLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2Rldmlj ZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rl cl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBF cnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBO byBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYS4weDANCnB0X3JlZ2lzdGVyX3JlZ2lv bnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4Zjdk MzgwMDApDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlz aWNhbCBkZXZpY2UgMDA6MWEuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJ TlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rl cl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFiLjAgLi4u DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBk ZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2Vt ZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUg L2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYi4w eDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAw MDQwMDAgYmFzZV9hZGRyPTB4ZjdkMzAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9y ZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6MWIuMCByZWdpc3RlcmVkIHN1Y2Nl c3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhy b3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2lj YWwgZGV2aWNlIDAwOjFkLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kg dHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTog RGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxf aW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3Ig ZGlyZWN0b3J5OiAweDA6MHgxZC4weDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiBy ZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4ZjdkMzcwMDApDQpwY2lfaW50 eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6 MWQuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5k OiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTog QXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAxOjAwLjAgLi4uDQpyZWdpc3Rlcl9yZWFs X2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9p bml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lv bXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDE6MHgwLjB4MA0KcHRfcmVnaXN0ZXJf cmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgwMDQwMDAwMCBiYXNlX2FkZHI9 MHhmNzgwMDAwNCkNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChz aXplPTB4MDA0MDAwMDAgYmFzZV9hZGRyPTB4Zjc0MDAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDE6MDAuMCByZWdpc3Rl cmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MTQwMDAwMCBtYWRkcj1mNzgwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MCBmaXJzdF9t YXA9MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE4MDAwMDAgbWFkZHI9Zjc0MDAwMDAgdHlwZT0w IGxlbj00MTk0MzA0IGluZGV4PTIgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYx YzIwMDAwIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9 MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxl bj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAw IG1hZGRyPWY3ZDM3MDAwIHR5cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0xDQpwbGF0 Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncgc3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVh LiBub3cgaXMgcncgc3RhdGUuDQpwbGF0Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncg c3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVhLiBub3cgaXMgcm8gc3RhdGUuDQpwdF9pb21lbV9tYXA6 IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBm aXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAg dHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlz PWZmZmZmZmZmIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9t YXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjAwMDAgbWFkZHI9ZjdkMzAwMDAgdHlwZT0w IGxlbj0xNjM4NCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mN2QzNzAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0K cHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjUwMDAgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00 MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1h ZGRyPWY3ODAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9p b21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQz MDQgaW5kZXg9MiBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFk ZHI9Zjc4MDAwMDAgdHlwZT0wIGxlbj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lv bWVtX21hcDogZV9waHlzPWYxODAwMDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMw NCBpbmRleD0yIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRk cj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1f bWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4 PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ZDMw MDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBl X3BoeXM9ZmZmZmZmZmYgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmly c3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAwIG1hZGRyPWY3ZDM3MDAwIHR5 cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MWMyMDAwMCBtYWRkcj1mN2QzMDAwMCB0eXBlPTAgbGVuPTE2Mzg0IGluZGV4PTAgZmlyc3RfbWFw PTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ODAwMDAwIHR5cGU9MCBs ZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MiBmaXJzdF9tYXA9 MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFkZHI9Zjc4MDAwMDAgdHlwZT0wIGxl bj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxODAw MDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0yIGZpcnN0X21hcD0w DQo= --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_-- From xen-devel-bounces@lists.xen.org Mon Nov 12 19:19:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 19:19:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzWs-0002Db-8W; Mon, 12 Nov 2012 19:18:42 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TXzWq-0002DW-Ja for xen-devel@lists.xen.org; Mon, 12 Nov 2012 19:18:40 +0000 Received: from [193.109.254.147:30148] by server-2.bemta-14.messagelabs.com id 11/98-20829-F8B41A05; Mon, 12 Nov 2012 19:18:39 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-2.tower-27.messagelabs.com!1352747917!9091625!1 X-Originating-IP: [80.160.77.114] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3LjExNCA9PiAzNzY0MTQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28679 invoked from network); 12 Nov 2012 19:18:37 -0000 Received: from pasmtpa.tele.dk (HELO pasmtpA.tele.dk) (80.160.77.114) by server-2.tower-27.messagelabs.com with SMTP; 12 Nov 2012 19:18:37 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpA.tele.dk (Postfix) with ESMTP id 5724080004C for ; Mon, 12 Nov 2012 20:18:36 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Mon, 12 Nov 2012 20:18:36 +0100 From: Kristian Hagsted Rasmussen To: Kristian Hagsted Rasmussen , "xen-devel@lists.xen.org" Thread-Topic: xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQAAQFdA Date: Mon, 12 Nov 2012 19:18:36 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B204@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> In-Reply-To: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> Accept-Language: da-DK, en-US Content-Language: da-DK X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [192.168.1.103] Content-Type: multipart/mixed; boundary="_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_" MIME-Version: 1.0 Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi all I can't seem to find any information on vga-passthrough when booting throug= h xen.efi, so I assume it should work. But I encounter a problem on a windo= ws 7 HVM that boots fine when dom0 is booted through MBR but fails when dom= 0 is booted through UEFI. My system is: DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel HD graphics 4000 In the qemu log it seem like xen cannot reach the vga-bios. Is this a known= problem when booting through xen.efi or is it a bug? dm-command: hot insert pass-through pci dev register_real_device: Assigning real physical device 00:02.0 ... register_real_device: Disable MSI translation via per device option register_real_device: Disable power management pt_iomul_init: Error: pt_iomul_init can't open file /dev/xen/pci_iomul: No = such file or directory: 0x0:0x2.0x0 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) pt_register_regions: IO region registered (size=3D0x10000000 base_addr=3D0x= e000000c) pt_register_regions: IO region registered (size=3D0x00000040 base_addr=3D0x= 0000f001) setup_vga_pt: vga bios size (0x0) is invalid! register_real_device: Setup VGA BIOS of passthroughed gfx failed! Log file is attached. Just compared a log file from efi boot to one from MBR boot and found this = discrepancy between the two: pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= dfc00004) - MBR boot see last addr 0xdfc00004 pt_register_regions: IO region registered (size=3D0x00400000 base_addr=3D0x= f7000004) - EFI boot compare to MBR 0xf7000004 Kind regards Kristian Hagsted Rasmussen --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: application/octet-stream; name="windows-domU.log" Content-Description: windows-domU.log Content-Disposition: attachment; filename="windows-domU.log"; size=6272; creation-date="Mon, 12 Nov 2012 18:43:00 GMT"; modification-date="Mon, 12 Nov 2012 18:43:00 GMT" Content-Transfer-Encoding: base64 ZG9taWQ6IDYNClVzaW5nIHh2ZGEgZm9yIGd1ZXN0J3MgaGRhDQpVc2luZyBmaWxlIC9kZXYvc2Rh NiBpbiByZWFkLXdyaXRlIG1vZGUNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9k ZWwvNi9sb2dkaXJ0eS9jbWQNCldhdGNoaW5nIC9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwv Ni9jb21tYW5kDQpXYXRjaGluZyAvbG9jYWwvZG9tYWluLzYvY3B1DQpjaGFyIGRldmljZSByZWRp cmVjdGVkIHRvIC9kZXYvcHRzLzQNCnFlbXVfbWFwX2NhY2hlX2luaXQgbnJfYnVja2V0cyA9IDEw MDAwIHNpemUgNDE5NDMwNA0Kc2hhcmVkIHBhZ2UgYXQgcGZuIGZlZmZkDQpidWZmZXJlZCBpbyBw YWdlIGF0IHBmbiBmZWZmYg0KR3Vlc3QgdXVpZCA9IDdhYjk5OTQ1LWNhNDItNDIzMC05NjI4LTBl ODJjOGJhZTI1Nw0KUmVnaXN0ZXIgeGVuIHBsYXRmb3JtLg0KRG9uZSByZWdpc3RlciBwbGF0Zm9y bS4NCnBsYXRmb3JtX2ZpeGVkX2lvcG9ydDogY2hhbmdlZCByby9ydyBzdGF0ZSBvZiBST00gbWVt b3J5IGFyZWEuIG5vdyBpcyBydyBzdGF0ZS4NCnhzX3JlYWQoL2xvY2FsL2RvbWFpbi8wL2Rldmlj ZS1tb2RlbC82L3hlbl9leHRlbmRlZF9wb3dlcl9tZ210KTogcmVhZCBlcnJvcg0KeHNfcmVhZCgp OiB2bmNwYXNzd2QgZ2V0IGVycm9yLiAvdm0vN2FiOTk5NDUtY2E0Mi00MjMwLTk2MjgtMGU4MmM4 YmFlMjU3L3ZuY3Bhc3N3ZC4NCkxvZy1kaXJ0eTogbm8gY29tbWFuZCB5ZXQuDQpJL08gcmVxdWVz dCBub3QgcmVhZHk6IDAsIHB0cjogMCwgcG9ydDogMCwgZGF0YTogMCwgY291bnQ6IDAsIHNpemU6 IDANCkkvTyByZXF1ZXN0IG5vdCByZWFkeTogMCwgcHRyOiAwLCBwb3J0OiAwLCBkYXRhOiAwLCBj b3VudDogMCwgc2l6ZTogMA0KdmNwdS1zZXQ6IHdhdGNoIG5vZGUgZXJyb3IuDQp4c19yZWFkKC9s b2NhbC9kb21haW4vNi9sb2ctdGhyb3R0bGluZyk6IHJlYWQgZXJyb3INCnFlbXU6IGlnbm9yaW5n IG5vdC11bmRlcnN0b29kIGRyaXZlIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnDQpt ZWRpdW0gY2hhbmdlIHdhdGNoIG9uIGAvbG9jYWwvZG9tYWluLzYvbG9nLXRocm90dGxpbmcnIC0g dW5rbm93biBkZXZpY2UsIGlnbm9yZWQNCmRtLWNvbW1hbmQ6IGhvdCBpbnNlcnQgcGFzcy10aHJv dWdoIHBjaSBkZXYNCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBBc3NpZ25pbmcgcmVhbCBwaHlzaWNh bCBkZXZpY2UgMDA6MDIuMCAuLi4NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBEaXNhYmxlIE1TSSB0 cmFuc2xhdGlvbiB2aWEgcGVyIGRldmljZSBvcHRpb24NCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBE aXNhYmxlIHBvd2VyIG1hbmFnZW1lbnQNCnB0X2lvbXVsX2luaXQ6IEVycm9yOiBwdF9pb211bF9p bml0IGNhbid0IG9wZW4gZmlsZSAvZGV2L3hlbi9wY2lfaW9tdWw6IE5vIHN1Y2ggZmlsZSBvciBk aXJlY3Rvcnk6IDB4MDoweDIuMHgwDQpwdF9yZWdpc3Rlcl9yZWdpb25zOiBJTyByZWdpb24gcmVn aXN0ZXJlZCAoc2l6ZT0weDAwNDAwMDAwIGJhc2VfYWRkcj0weGY3MDAwMDA0KQ0KcHRfcmVnaXN0 ZXJfcmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgxMDAwMDAwMCBiYXNlX2Fk ZHI9MHhlMDAwMDAwYykNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVk IChzaXplPTB4MDAwMDAwNDAgYmFzZV9hZGRyPTB4MDAwMGYwMDEpDQpzZXR1cF92Z2FfcHQ6IHZn YSBiaW9zIHNpemUgKDB4MCkgaXMgaW52YWxpZCENCnJlZ2lzdGVyX3JlYWxfZGV2aWNlOiBTZXR1 cCBWR0EgQklPUyBvZiBwYXNzdGhyb3VnaGVkIGdmeCBmYWlsZWQhDQpkbS1jb21tYW5kOiBob3Qg aW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWdu aW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFhLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2Rldmlj ZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rl cl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBF cnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBO byBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYS4weDANCnB0X3JlZ2lzdGVyX3JlZ2lv bnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4Zjdk MzgwMDApDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlz aWNhbCBkZXZpY2UgMDA6MWEuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJ TlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rl cl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAwOjFiLjAgLi4u DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBk ZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2Vt ZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUg L2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDA6MHgxYi4w eDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChzaXplPTB4MDAw MDQwMDAgYmFzZV9hZGRyPTB4ZjdkMzAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpyZWdpc3Rlcl9y ZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6MWIuMCByZWdpc3RlcmVkIHN1Y2Nl c3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5kOiBob3QgaW5zZXJ0IHBhc3MtdGhy b3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTogQXNzaWduaW5nIHJlYWwgcGh5c2lj YWwgZGV2aWNlIDAwOjFkLjAgLi4uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBNU0kg dHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpyZWdpc3Rlcl9yZWFsX2RldmljZTog RGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9pbml0OiBFcnJvcjogcHRfaW9tdWxf aW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lvbXVsOiBObyBzdWNoIGZpbGUgb3Ig ZGlyZWN0b3J5OiAweDA6MHgxZC4weDANCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiBy ZWdpc3RlcmVkIChzaXplPTB4MDAwMDA0MDAgYmFzZV9hZGRyPTB4ZjdkMzcwMDApDQpwY2lfaW50 eDogaW50eD0xDQpyZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDA6 MWQuMCByZWdpc3RlcmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpkbS1jb21tYW5k OiBob3QgaW5zZXJ0IHBhc3MtdGhyb3VnaCBwY2kgZGV2DQpyZWdpc3Rlcl9yZWFsX2RldmljZTog QXNzaWduaW5nIHJlYWwgcGh5c2ljYWwgZGV2aWNlIDAxOjAwLjAgLi4uDQpyZWdpc3Rlcl9yZWFs X2RldmljZTogRGlzYWJsZSBNU0kgdHJhbnNsYXRpb24gdmlhIHBlciBkZXZpY2Ugb3B0aW9uDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogRGlzYWJsZSBwb3dlciBtYW5hZ2VtZW50DQpwdF9pb211bF9p bml0OiBFcnJvcjogcHRfaW9tdWxfaW5pdCBjYW4ndCBvcGVuIGZpbGUgL2Rldi94ZW4vcGNpX2lv bXVsOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5OiAweDE6MHgwLjB4MA0KcHRfcmVnaXN0ZXJf cmVnaW9uczogSU8gcmVnaW9uIHJlZ2lzdGVyZWQgKHNpemU9MHgwMDQwMDAwMCBiYXNlX2FkZHI9 MHhmNzgwMDAwNCkNCnB0X3JlZ2lzdGVyX3JlZ2lvbnM6IElPIHJlZ2lvbiByZWdpc3RlcmVkIChz aXplPTB4MDA0MDAwMDAgYmFzZV9hZGRyPTB4Zjc0MDAwMDQpDQpwY2lfaW50eDogaW50eD0xDQpy ZWdpc3Rlcl9yZWFsX2RldmljZTogUmVhbCBwaHlzaWNhbCBkZXZpY2UgMDE6MDAuMCByZWdpc3Rl cmVkIHN1Y2Nlc3NmdWx5IQ0KSVJRIHR5cGUgPSBJTlR4DQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MTQwMDAwMCBtYWRkcj1mNzgwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MCBmaXJzdF9t YXA9MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE4MDAwMDAgbWFkZHI9Zjc0MDAwMDAgdHlwZT0w IGxlbj00MTk0MzA0IGluZGV4PTIgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYx YzIwMDAwIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9 MQ0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxl bj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTENCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAw IG1hZGRyPWY3ZDM3MDAwIHR5cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0xDQpwbGF0 Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncgc3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVh LiBub3cgaXMgcncgc3RhdGUuDQpwbGF0Zm9ybV9maXhlZF9pb3BvcnQ6IGNoYW5nZWQgcm8vcncg c3RhdGUgb2YgUk9NIG1lbW9yeSBhcmVhLiBub3cgaXMgcm8gc3RhdGUuDQpwdF9pb21lbV9tYXA6 IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBm aXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAg dHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlz PWZmZmZmZmZmIG1hZGRyPWY3ZDMwMDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9t YXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjAwMDAgbWFkZHI9ZjdkMzAwMDAgdHlwZT0w IGxlbj0xNjM4NCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mN2QzNzAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0K cHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjFjMjUwMDAgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00 MDk2IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1h ZGRyPWY3ODAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9p b21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQz MDQgaW5kZXg9MiBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFk ZHI9Zjc4MDAwMDAgdHlwZT0wIGxlbj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lv bWVtX21hcDogZV9waHlzPWYxODAwMDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMw NCBpbmRleD0yIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZmZmZmZiBtYWRk cj1mN2QzODAwMCB0eXBlPTAgbGVuPTQwOTYgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1f bWFwOiBlX3BoeXM9ZjFjMjQwMDAgbWFkZHI9ZjdkMzgwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4 PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ZDMw MDAwIHR5cGU9MCBsZW49MTYzODQgaW5kZXg9MCBmaXJzdF9tYXA9MA0KcHRfaW9tZW1fbWFwOiBl X3BoeXM9ZmZmZmZmZmYgbWFkZHI9ZjdkMzcwMDAgdHlwZT0wIGxlbj00MDk2IGluZGV4PTAgZmly c3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxYzI1MDAwIG1hZGRyPWY3ZDM3MDAwIHR5 cGU9MCBsZW49NDA5NiBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1m MWMyMDAwMCBtYWRkcj1mN2QzMDAwMCB0eXBlPTAgbGVuPTE2Mzg0IGluZGV4PTAgZmlyc3RfbWFw PTANCnB0X2lvbWVtX21hcDogZV9waHlzPWZmZmZmZmZmIG1hZGRyPWY3ODAwMDAwIHR5cGU9MCBs ZW49NDE5NDMwNCBpbmRleD0wIGZpcnN0X21hcD0wDQpwdF9pb21lbV9tYXA6IGVfcGh5cz1mZmZm ZmZmZiBtYWRkcj1mNzQwMDAwMCB0eXBlPTAgbGVuPTQxOTQzMDQgaW5kZXg9MiBmaXJzdF9tYXA9 MA0KcHRfaW9tZW1fbWFwOiBlX3BoeXM9ZjE0MDAwMDAgbWFkZHI9Zjc4MDAwMDAgdHlwZT0wIGxl bj00MTk0MzA0IGluZGV4PTAgZmlyc3RfbWFwPTANCnB0X2lvbWVtX21hcDogZV9waHlzPWYxODAw MDAwIG1hZGRyPWY3NDAwMDAwIHR5cGU9MCBsZW49NDE5NDMwNCBpbmRleD0yIGZpcnN0X21hcD0w DQo= --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --_002_19EF9FEB5AF86243A3F18E5CE75971640A00B204hagstedbserverh_-- From xen-devel-bounces@lists.xen.org Mon Nov 12 21:02:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:02:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY18X-0003UR-US; Mon, 12 Nov 2012 21:01:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY18X-0003U9-0Z for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 21:01:41 +0000 Received: from [85.158.139.211:33098] by server-12.bemta-5.messagelabs.com id 11/2D-02886-4B361A05; Mon, 12 Nov 2012 21:01:40 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352754099!18396805!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12523 invoked from network); 12 Nov 2012 21:01:39 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:01:39 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15761349" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 21:01:34 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 21:01:34 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY18Q-0000ok-8B; Mon, 12 Nov 2012 21:01:34 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY18Q-0004aE-75; Mon, 12 Nov 2012 21:01:34 +0000 To: Message-ID: From: xen.org Date: Mon, 12 Nov 2012 21:01:34 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14381: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14381 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14381/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14379 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14379 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14379 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14378 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 279bbf2a0b48 baseline version: xen 62885b3c34c8 ------------------------------------------------------------ People who touched revisions under test: Dario Faggioli Jan Beulich Keir Fraser Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=279bbf2a0b48 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 279bbf2a0b48 + branch=xen-unstable + revision=279bbf2a0b48 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 279bbf2a0b48 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 7 changes to 7 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:02:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:02:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY18X-0003UR-US; Mon, 12 Nov 2012 21:01:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY18X-0003U9-0Z for xen-devel@lists.xensource.com; Mon, 12 Nov 2012 21:01:41 +0000 Received: from [85.158.139.211:33098] by server-12.bemta-5.messagelabs.com id 11/2D-02886-4B361A05; Mon, 12 Nov 2012 21:01:40 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352754099!18396805!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgwODM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12523 invoked from network); 12 Nov 2012 21:01:39 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:01:39 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15761349" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 21:01:34 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Mon, 12 Nov 2012 21:01:34 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY18Q-0000ok-8B; Mon, 12 Nov 2012 21:01:34 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY18Q-0004aE-75; Mon, 12 Nov 2012 21:01:34 +0000 To: Message-ID: From: xen.org Date: Mon, 12 Nov 2012 21:01:34 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14381: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14381 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14381/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14379 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14379 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14379 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14378 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 279bbf2a0b48 baseline version: xen 62885b3c34c8 ------------------------------------------------------------ People who touched revisions under test: Dario Faggioli Jan Beulich Keir Fraser Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=279bbf2a0b48 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 279bbf2a0b48 + branch=xen-unstable + revision=279bbf2a0b48 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 279bbf2a0b48 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 7 changes to 7 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:12:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:12:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1J0-0003hR-41; Mon, 12 Nov 2012 21:12:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1Iz-0003hM-5B for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:12:29 +0000 Received: from [85.158.139.83:65467] by server-5.bemta-5.messagelabs.com id 5C/5B-11353-C3661A05; Mon, 12 Nov 2012 21:12:28 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1352754747!21346178!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19070 invoked from network); 12 Nov 2012 21:12:27 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-16.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:12:27 -0000 Received: by mail-ee0-f45.google.com with SMTP id d49so1525066eek.32 for ; Mon, 12 Nov 2012 13:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=aoGzK4CnKq8fEKXZ72DOi2SoPYWIkKEOxV0U21wQ5eM=; b=EIOWW5xPHlfXT1xOdsDox/kRWLwdwtsn+yCTamiwuRNGGnreJBp39JJH1y5xr672fS KS0JM0OBo+mlA0A/hUnvZD1FIXo3AUCwv8gKyMWJzWD9TXzvvEO9T/YcDj6eJ6HIW4fz w4wSs48aLRQAhO6LozRaZbHSXRRA9cWYA6ZU+4kmbaKh6V3uH2C8a4YGlgnHOY9vwbmx 8OamHQzk3p9wYdxIbPoaCDimSIaYFV1hluWVULDhxJFpVeoYeq6Pu8O0bCI7KrZscANy d5mzLO8VBqnPpzr/Nt1PS2mJqh0Tks8lOlq4mMrXt4QlsuQJ42AFMi22BRQhe7CMLATV v4/Q== Received: by 10.14.194.72 with SMTP id l48mr67369011een.9.1352754747434; Mon, 12 Nov 2012 13:12:27 -0800 (PST) Received: from [192.168.228.100] ([188.25.211.16]) by mx.google.com with ESMTPS id y44sm3759371eel.14.2012.11.12.13.12.26 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 13:12:26 -0800 (PST) Message-ID: <50A16639.2090209@gmail.com> Date: Mon, 12 Nov 2012 23:12:25 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121106 Thunderbird/10.0.10 MIME-Version: 1.0 To: xen-devel@lists.xen.org Subject: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, I'm interested in establishing a communication channel between the Xen hypervisor and a dom0 userspace application. Ideally this would be a 2-way channel, with the hypervisor asynchronously notifying this application, and then (for certain types of messages) wait for a reply from the userspace consumer. To this end, I've been reading xen-devel posts [1], read the xentrace-related Xen source code [2], and studied tools such as Ether [3]. I've also read as much as time permitted of "The Definitive Guide to the Xen Hypervisor" [4] book. However, I have very limited experience as a kernel developer, and none working on the Xen hypervisor, so I'm still digesting the information. A particularly good choice is riding on xentrace, since that's already been tested, has it's own tools, and it's the fastest way to get data moving in one direction. However (putting aside the fact that it's not bidirectional communication) the problem is that the messages I'd like to pass to my application are longer than 28 bytes, so to be able to get what I need I'd have to either increase the default trace buffer, or send a message in several chunks. None of these solutions look elegant to me. So I'm thinking about writing a custom channel from scratch, and I'd like to know what the best way to proceed is. I'll likely need to add a new VIRQ like the TRACE VIRQ and use that for notifications. However, allocating and sharing a new page is trickier. I've read about grant tables and HYPERVISOR_grant_table_op, but trace.c simply calls share_xen_page_with_privileged_guests(). I've read about ring buffers and DEFINE_RING_TYPES, but trace.{h,c} has nothing to do with that macro. Is the "The Definitive Guide to the Xen Hypervisor" book still relevant? What would you recommend for my case? Where (if anywhere) might I be able to find a clear, concise, example of allocating and sharing memory pages containing a ring buffer used for hypervisor <-> dom0 userspace communication (hopefully even simpler that trace.c)? What resources that would accelerate learning and facilitate Xen enlightenment would you recommend to a developer new to the Xen hypervisor? Thank you, Razvan [1] http://old-list-archives.xen.org/archives/html/xen-devel/2008-07/msg00589.html [2] http://code.metager.de/source/xref/xen/xen/common/trace.c [3] http://ether.gtisc.gatech.edu/source.html [4] http://www.amazon.com/The-Definitive-Guide-Xen-Hypervisor/dp/013234971X _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:12:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:12:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1J0-0003hR-41; Mon, 12 Nov 2012 21:12:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1Iz-0003hM-5B for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:12:29 +0000 Received: from [85.158.139.83:65467] by server-5.bemta-5.messagelabs.com id 5C/5B-11353-C3661A05; Mon, 12 Nov 2012 21:12:28 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1352754747!21346178!1 X-Originating-IP: [74.125.83.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19070 invoked from network); 12 Nov 2012 21:12:27 -0000 Received: from mail-ee0-f45.google.com (HELO mail-ee0-f45.google.com) (74.125.83.45) by server-16.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:12:27 -0000 Received: by mail-ee0-f45.google.com with SMTP id d49so1525066eek.32 for ; Mon, 12 Nov 2012 13:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=aoGzK4CnKq8fEKXZ72DOi2SoPYWIkKEOxV0U21wQ5eM=; b=EIOWW5xPHlfXT1xOdsDox/kRWLwdwtsn+yCTamiwuRNGGnreJBp39JJH1y5xr672fS KS0JM0OBo+mlA0A/hUnvZD1FIXo3AUCwv8gKyMWJzWD9TXzvvEO9T/YcDj6eJ6HIW4fz w4wSs48aLRQAhO6LozRaZbHSXRRA9cWYA6ZU+4kmbaKh6V3uH2C8a4YGlgnHOY9vwbmx 8OamHQzk3p9wYdxIbPoaCDimSIaYFV1hluWVULDhxJFpVeoYeq6Pu8O0bCI7KrZscANy d5mzLO8VBqnPpzr/Nt1PS2mJqh0Tks8lOlq4mMrXt4QlsuQJ42AFMi22BRQhe7CMLATV v4/Q== Received: by 10.14.194.72 with SMTP id l48mr67369011een.9.1352754747434; Mon, 12 Nov 2012 13:12:27 -0800 (PST) Received: from [192.168.228.100] ([188.25.211.16]) by mx.google.com with ESMTPS id y44sm3759371eel.14.2012.11.12.13.12.26 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 13:12:26 -0800 (PST) Message-ID: <50A16639.2090209@gmail.com> Date: Mon, 12 Nov 2012 23:12:25 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121106 Thunderbird/10.0.10 MIME-Version: 1.0 To: xen-devel@lists.xen.org Subject: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, I'm interested in establishing a communication channel between the Xen hypervisor and a dom0 userspace application. Ideally this would be a 2-way channel, with the hypervisor asynchronously notifying this application, and then (for certain types of messages) wait for a reply from the userspace consumer. To this end, I've been reading xen-devel posts [1], read the xentrace-related Xen source code [2], and studied tools such as Ether [3]. I've also read as much as time permitted of "The Definitive Guide to the Xen Hypervisor" [4] book. However, I have very limited experience as a kernel developer, and none working on the Xen hypervisor, so I'm still digesting the information. A particularly good choice is riding on xentrace, since that's already been tested, has it's own tools, and it's the fastest way to get data moving in one direction. However (putting aside the fact that it's not bidirectional communication) the problem is that the messages I'd like to pass to my application are longer than 28 bytes, so to be able to get what I need I'd have to either increase the default trace buffer, or send a message in several chunks. None of these solutions look elegant to me. So I'm thinking about writing a custom channel from scratch, and I'd like to know what the best way to proceed is. I'll likely need to add a new VIRQ like the TRACE VIRQ and use that for notifications. However, allocating and sharing a new page is trickier. I've read about grant tables and HYPERVISOR_grant_table_op, but trace.c simply calls share_xen_page_with_privileged_guests(). I've read about ring buffers and DEFINE_RING_TYPES, but trace.{h,c} has nothing to do with that macro. Is the "The Definitive Guide to the Xen Hypervisor" book still relevant? What would you recommend for my case? Where (if anywhere) might I be able to find a clear, concise, example of allocating and sharing memory pages containing a ring buffer used for hypervisor <-> dom0 userspace communication (hopefully even simpler that trace.c)? What resources that would accelerate learning and facilitate Xen enlightenment would you recommend to a developer new to the Xen hypervisor? Thank you, Razvan [1] http://old-list-archives.xen.org/archives/html/xen-devel/2008-07/msg00589.html [2] http://code.metager.de/source/xref/xen/xen/common/trace.c [3] http://ether.gtisc.gatech.edu/source.html [4] http://www.amazon.com/The-Definitive-Guide-Xen-Hypervisor/dp/013234971X _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:23:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1TE-0003yB-9B; Mon, 12 Nov 2012 21:23:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1TC-0003y6-QK for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:23:03 +0000 Received: from [85.158.138.51:30907] by server-1.bemta-3.messagelabs.com id 5C/14-12169-6B861A05; Mon, 12 Nov 2012 21:23:02 +0000 X-Env-Sender: lersek@redhat.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1352755380!23398629!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTc3NDM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4302 invoked from network); 12 Nov 2012 21:23:01 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-14.tower-174.messagelabs.com with SMTP; 12 Nov 2012 21:23:01 -0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qACLMh1D026651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:22:44 -0500 Received: from lacos-laptop.usersys.redhat.com (vpn1-4-201.ams2.redhat.com [10.36.4.201]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qACLMfEM006964; Mon, 12 Nov 2012 16:22:43 -0500 Message-ID: <50A16906.9000301@redhat.com> Date: Mon, 12 Nov 2012 22:24:22 +0100 From: Laszlo Ersek User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121026 Thunderbird/10.0.10 MIME-Version: 1.0 To: Kristian Hagsted Rasmussen References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> In-Reply-To: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/12/12 20:08, Kristian Hagsted Rasmussen wrote: > Hi all > > I can't seem to find any information on vga-passthrough when booting > through xen.efi, so I assume it should work. But I encounter a problem > on a windows 7 HVM that boots fine when dom0 is booted through MBR but > fails when dom0 is booted through UEFI. > > My system is: > DQ77KB motherboard with bios version 44 > Core i7-3779T with VT-d > Intel HD graphics 4000 > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a > known problem when booting through xen.efi or is it a bug? The legacy VGA BIOS is not present on UEFI platforms unless an (optional) compatibility support module provides it. (Tangentially, Secure Boot disables CSMs.) Windows 7 / Windows 2008 R2 have a bug: even when booted on an UEFI platform, they depend on the optional VGA BIOS unconditionally. This seems to have been fixed in Windows 8 / Windows Server 2012. See and/or the long "OVMF + Windows 2008 r2 sp1" thread on edk2-devel. (Apologies if I misunderstood your question. Admittedly, I haven't done any homework wrt. xen.efi or vga passthrough. But your email had too many keywords to push my buttons.) Laszlo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:23:27 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1TE-0003yB-9B; Mon, 12 Nov 2012 21:23:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1TC-0003y6-QK for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:23:03 +0000 Received: from [85.158.138.51:30907] by server-1.bemta-3.messagelabs.com id 5C/14-12169-6B861A05; Mon, 12 Nov 2012 21:23:02 +0000 X-Env-Sender: lersek@redhat.com X-Msg-Ref: server-14.tower-174.messagelabs.com!1352755380!23398629!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTc3NDM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4302 invoked from network); 12 Nov 2012 21:23:01 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-14.tower-174.messagelabs.com with SMTP; 12 Nov 2012 21:23:01 -0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qACLMh1D026651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:22:44 -0500 Received: from lacos-laptop.usersys.redhat.com (vpn1-4-201.ams2.redhat.com [10.36.4.201]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qACLMfEM006964; Mon, 12 Nov 2012 16:22:43 -0500 Message-ID: <50A16906.9000301@redhat.com> Date: Mon, 12 Nov 2012 22:24:22 +0100 From: Laszlo Ersek User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.10) Gecko/20121026 Thunderbird/10.0.10 MIME-Version: 1.0 To: Kristian Hagsted Rasmussen References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> In-Reply-To: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/12/12 20:08, Kristian Hagsted Rasmussen wrote: > Hi all > > I can't seem to find any information on vga-passthrough when booting > through xen.efi, so I assume it should work. But I encounter a problem > on a windows 7 HVM that boots fine when dom0 is booted through MBR but > fails when dom0 is booted through UEFI. > > My system is: > DQ77KB motherboard with bios version 44 > Core i7-3779T with VT-d > Intel HD graphics 4000 > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a > known problem when booting through xen.efi or is it a bug? The legacy VGA BIOS is not present on UEFI platforms unless an (optional) compatibility support module provides it. (Tangentially, Secure Boot disables CSMs.) Windows 7 / Windows 2008 R2 have a bug: even when booted on an UEFI platform, they depend on the optional VGA BIOS unconditionally. This seems to have been fixed in Windows 8 / Windows Server 2012. See and/or the long "OVMF + Windows 2008 r2 sp1" thread on edk2-devel. (Apologies if I misunderstood your question. Admittedly, I haven't done any homework wrt. xen.efi or vga passthrough. But your email had too many keywords to push my buttons.) Laszlo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1c9-00048Q-AC; Mon, 12 Nov 2012 21:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1c7-00048L-4D for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:32:15 +0000 Received: from [85.158.143.35:20331] by server-2.bemta-4.messagelabs.com id FA/2F-28922-EDA61A05; Mon, 12 Nov 2012 21:32:14 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352755932!14616307!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11981 invoked from network); 12 Nov 2012 21:32:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:32:13 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="44332992" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 21:32:01 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX02.citrite.net ([10.13.107.66]) with mapi; Mon, 12 Nov 2012 16:32:02 -0500 From: Robert Phillips To: "Tim (Xen.org)" Date: Mon, 12 Nov 2012 16:31:58 -0500 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac29tISgskj15PbzRniL91JPgz0BOQDZuVjA Message-ID: <048EAD622912254A9DEA24C1734613C18C87A62327@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> <20121108132522.GG76638@ocelot.phlegethon.org> In-Reply-To: <20121108132522.GG76638@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I'm sending version 3 of the patch shortly. I think it addresses all your concerns. > -----Original Message----- > From: Tim Deegan [mailto:tim@xen.org] > Sent: Thursday, November 08, 2012 8:25 AM > To: Robert Phillips > Cc: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers > in Xen. > > Hi, > > Thanks for the update patch. > > At 15:36 -0500 on 07 Nov (1352302577), Robert Phillips wrote: > > > More substantive comments: > > > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > > > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > > > an indicator that this is really MM code. > > > > I have moved dirty_vram.c under mm/ > > I have moved dirty_vram.h under include/asm-x86 . In that location it > > is available to modules like hvm.c > > Sure, that seems sgood. > > > > I'd be > > > inclined to just put all paddr_links in the linked list (and have an > > > array of pointers rather than an array of paddr_link_ts). Is it worth > > > having the extra complexity here, and at the callers, to avoid a single > > > memory read? > > > > Almost all frame buffer pages have a single mapping so the algorithm's > > common case is met by constructing pl_tab as an array of paddr_links. > > That is, the table's paddr_links will rarely point to a chain of > > extension paddr_links. The code encapsulates the complexity in a > > single function. Sorry it required so much staring. Even if all > > paddr_links were stored in a linked list, the caller would have to > > walk that linked list, so would be just as complex. > > OK. > > > > > + if (set) > > > > + { > > > > + /* Did we find sl1ma in either the main table or the linked list? */ > > > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > > > + { > > > > + ASSERT(ppl != NULL); > > > > + /* alloc link and append it to list */ > > > > + (*ppl) = pl = alloc_paddr_link(d); > > > > + if (pl == NULL) > > > > + goto out; > > > > > > This needs to signal some sort of error. Otherwise, if we can't add > > > this sl1e to the list we'll just silently fail to track it. > > > > I don't know what sort of error we can signal. > > > > The immediate symptom would be that areas of the monitor would not be > > refreshed. But, since we're running out of memory, that might be the > > least of the quests's woes. The updated patch actually makes the > > symptom more likely (though still very unlikely) by putting an > > arbitrary bound on the length of paddr_link chains. It handles a > > rogue process, one that has an arbitrarily large number of mappings > > for frame buffer pages, by simply not recording the excessive > > mappings. If that results in unrefreshed blocks on the monitor, so be > > it. > > I think the correct behaviour would be to report these pages as dirty. > That way anything that relies on seeing all changes will behave > correctly, though less efficiently. Ok, I've associated a boolean called "stuck_dirty" with each frame buffer page. If for any reason we're unable to generated a complete set of mappings, the bit gets set and that frame buffer page is considered dirty forever more, or until the range gets torn down. I was unable to make a failure happen (not surprisingly) so I added some fault injection code for testing. It's currently disabled/compiled-out. > > > > > +#endif > > > > + free_paddr_link(d, ppl, pl); > > > > + if ( --range->nr_mappings == 0 ) > > > > + { > > > > + dirty_vram_range_free(d, range); > > > > > > What's this for? If the guest unmaps the framebuffer and remaps it (or > > > if the shadow PTs of the mappings are temporarily discarded) this will > > > stop us from tracking the new mappings until the toolstack asks for the > > > bitmap (and then it will be expensive to go and find the mappings). > > > > > > > I don't see this happening. If the guest unmaps the framebuffer, the > > shadow code lazily recovers the shadow pages, so tracking will > > continue until it decides a page is no longer a shadow page. That is > > when this code is invoked. > > If the guest unmaps the buffer by clearing the PTEs then when the PTE > changes are propagated into the shadows this will cause nr_mappings to > fall to zero here. If we _don't_ free the range, then when the FB is > mapped again we'll spot the new PTEs as they're shadowed and DTRT. If we > _do_ free the range we end up walking all shadows looking for the > mappings. > Ok, I've removed the teardown code. Ranges are no longer torn down just because they have no mappings. But they can still be torn down if another mapping is created, one that overlaps, or if dirty vram bookkeeping is stopped altogether, which happens as a side-effect of requesting a range with zero pages. > > It tears down the mappings to that page and if some range ends up > > with no mappings then the range is useless. Vram ranges are generated > > willy-nilly as needed. This is the only mechanism for cleaning them up. > > Shouldn't there be some way for the tools to indicate that they're done > with a range? I guess they can tear down the whole lot and then start > again with whatever ranges are still in use. Right. Like little children, they do not clean up after themselves. > > > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > > > currently being tracked we should conservatively assume it's all dirty, > > > right? > > > > The callers will should ensure that the range exists. This is just a > > conservative test. > > OK. > > > Anyway, it begs the question of whether a new range should be > > considered all dirty or all clean. Intuitively "all dirty" seems the > > right answer but in practice it works fine as written since the guest > > is busy updating the whole frame buffer. > > What if the guest's not writing to the framebuffer at the moment, or > only to a part of it? Shouldn't the tools see the existing content? Ok, in HAP a new range is considered to be "all dirty". > > > > And, since you know you're in HAP mode, not in log-dirty mode, and > > > already have the paging lock, you can just set > > > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > > > the paging_log_dirty_enable() path and messing with locks. > > > > No, paging_log_dirty_enable() goes through several layers of functions and > > ends up calling hap_enable_vram_tracking(), which does quite a bit of > stuff. > > OK. > > > > > +/* paging_mark_dirty_hap() > > > > + * Make a hap page writeable and mark it as dirty. > > > > + * This done atomically under the p2m and paging locks to avoid > leaving > > > > + * a window where the page might be modified without being marked > as > > > dirty. > > > > + */ > > > > > > I'm perplexed by this -- AFAICT it's either not necessary (because all > > > log-dirty read/clean ops are done with the domain paused) or not > sufficient > > > (because although the bitmap and the PTE are updated under the p2m > lock, > > > the actual dirtying of the page happens at some other time). Can you > > > spell out for me exactly what this is protecting against? > > > > The comment over-stated the problem so I've toned it down > > from "without being marked" to "without being counted". > > > > paging_mark_dirty_hap() is in the page fault path and has two steps: > > > > (1) It calls p2m_change_type() to re-mark some pfn as writeable > > (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. > > This must be done under the p2m_lock. > > > > (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then > > it bumps two dirty counts. And it marks the page as dirty. This must > > be done under the paging lock. > > > > As an invariant, the dirty counts should be precisely the number of pages > > made writeable. > > That invariant is already doomed -- any other agent (including the guest > itself) can change the p2m mappings for one of the pfns, or mark the pfn > dirty, without going through the NPF fault handler. AFAICS the counts > could just as well be implemented as flags, to say 'something in this > range was dirtied'; the only interesting case is when they're 0. > > > It may be that this invariant is not particularly useful, that things > > will just work out. But I do wonder if, without it, we'll have > > situations where the dirty counts will indicate dirty pages when there > > are none, or no dirty pages when there are some. > > The second of those cases would be the bad one; I think that can be > avoided by just switching the order of paging_mark_dirty() and > p2m_change_type() in hvm_hap_nested_page_fault(), and maybe putting a > wmb() between them. Ok, I've done as you suggested. I don't think the wmb() is needed but I could be convinced. > > Cheers, > > Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:32:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:32:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1c9-00048Q-AC; Mon, 12 Nov 2012 21:32:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1c7-00048L-4D for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:32:15 +0000 Received: from [85.158.143.35:20331] by server-2.bemta-4.messagelabs.com id FA/2F-28922-EDA61A05; Mon, 12 Nov 2012 21:32:14 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352755932!14616307!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11981 invoked from network); 12 Nov 2012 21:32:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:32:13 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="44332992" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 12 Nov 2012 21:32:01 +0000 Received: from FTLPMAILBOX02.citrite.net ([10.13.98.209]) by FTLPMAILMX02.citrite.net ([10.13.107.66]) with mapi; Mon, 12 Nov 2012 16:32:02 -0500 From: Robert Phillips To: "Tim (Xen.org)" Date: Mon, 12 Nov 2012 16:31:58 -0500 Thread-Topic: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. Thread-Index: Ac29tISgskj15PbzRniL91JPgz0BOQDZuVjA Message-ID: <048EAD622912254A9DEA24C1734613C18C87A62327@FTLPMAILBOX02.citrite.net> References: <1350411302-5470-1-git-send-email-robert.phillips@citrix.com> <20121101142434.GC61948@ocelot.phlegethon.org> <048EAD622912254A9DEA24C1734613C18C876560B1@FTLPMAILBOX02.citrite.net> <20121108132522.GG76638@ocelot.phlegethon.org> In-Reply-To: <20121108132522.GG76638@ocelot.phlegethon.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I'm sending version 3 of the patch shortly. I think it addresses all your concerns. > -----Original Message----- > From: Tim Deegan [mailto:tim@xen.org] > Sent: Thursday, November 08, 2012 8:25 AM > To: Robert Phillips > Cc: xen-devel@lists.xen.org > Subject: Re: [Xen-devel] [PATCH] Provide support for multiple frame buffers > in Xen. > > Hi, > > Thanks for the update patch. > > At 15:36 -0500 on 07 Nov (1352302577), Robert Phillips wrote: > > > More substantive comments: > > > - I think the dirty_vram.c and dirty_vram.h files belong under mm/ > > > rather than under hvm/. The ``#include "../mm/mm-locks.h"'' is > > > an indicator that this is really MM code. > > > > I have moved dirty_vram.c under mm/ > > I have moved dirty_vram.h under include/asm-x86 . In that location it > > is available to modules like hvm.c > > Sure, that seems sgood. > > > > I'd be > > > inclined to just put all paddr_links in the linked list (and have an > > > array of pointers rather than an array of paddr_link_ts). Is it worth > > > having the extra complexity here, and at the callers, to avoid a single > > > memory read? > > > > Almost all frame buffer pages have a single mapping so the algorithm's > > common case is met by constructing pl_tab as an array of paddr_links. > > That is, the table's paddr_links will rarely point to a chain of > > extension paddr_links. The code encapsulates the complexity in a > > single function. Sorry it required so much staring. Even if all > > paddr_links were stored in a linked list, the caller would have to > > walk that linked list, so would be just as complex. > > OK. > > > > > + if (set) > > > > + { > > > > + /* Did we find sl1ma in either the main table or the linked list? */ > > > > + if (pl == NULL) /* no, so we'll need to alloc a link */ > > > > + { > > > > + ASSERT(ppl != NULL); > > > > + /* alloc link and append it to list */ > > > > + (*ppl) = pl = alloc_paddr_link(d); > > > > + if (pl == NULL) > > > > + goto out; > > > > > > This needs to signal some sort of error. Otherwise, if we can't add > > > this sl1e to the list we'll just silently fail to track it. > > > > I don't know what sort of error we can signal. > > > > The immediate symptom would be that areas of the monitor would not be > > refreshed. But, since we're running out of memory, that might be the > > least of the quests's woes. The updated patch actually makes the > > symptom more likely (though still very unlikely) by putting an > > arbitrary bound on the length of paddr_link chains. It handles a > > rogue process, one that has an arbitrarily large number of mappings > > for frame buffer pages, by simply not recording the excessive > > mappings. If that results in unrefreshed blocks on the monitor, so be > > it. > > I think the correct behaviour would be to report these pages as dirty. > That way anything that relies on seeing all changes will behave > correctly, though less efficiently. Ok, I've associated a boolean called "stuck_dirty" with each frame buffer page. If for any reason we're unable to generated a complete set of mappings, the bit gets set and that frame buffer page is considered dirty forever more, or until the range gets torn down. I was unable to make a failure happen (not surprisingly) so I added some fault injection code for testing. It's currently disabled/compiled-out. > > > > > +#endif > > > > + free_paddr_link(d, ppl, pl); > > > > + if ( --range->nr_mappings == 0 ) > > > > + { > > > > + dirty_vram_range_free(d, range); > > > > > > What's this for? If the guest unmaps the framebuffer and remaps it (or > > > if the shadow PTs of the mappings are temporarily discarded) this will > > > stop us from tracking the new mappings until the toolstack asks for the > > > bitmap (and then it will be expensive to go and find the mappings). > > > > > > > I don't see this happening. If the guest unmaps the framebuffer, the > > shadow code lazily recovers the shadow pages, so tracking will > > continue until it decides a page is no longer a shadow page. That is > > when this code is invoked. > > If the guest unmaps the buffer by clearing the PTEs then when the PTE > changes are propagated into the shadows this will cause nr_mappings to > fall to zero here. If we _don't_ free the range, then when the FB is > mapped again we'll spot the new PTEs as they're shadowed and DTRT. If we > _do_ free the range we end up walking all shadows looking for the > mappings. > Ok, I've removed the teardown code. Ranges are no longer torn down just because they have no mappings. But they can still be torn down if another mapping is created, one that overlaps, or if dirty vram bookkeeping is stopped altogether, which happens as a side-effect of requesting a range with zero pages. > > It tears down the mappings to that page and if some range ends up > > with no mappings then the range is useless. Vram ranges are generated > > willy-nilly as needed. This is the only mechanism for cleaning them up. > > Shouldn't there be some way for the tools to indicate that they're done > with a range? I guess they can tear down the whole lot and then start > again with whatever ranges are still in use. Right. Like little children, they do not clean up after themselves. > > > > Oughtn't we to return all 1s in the bitmap here? If the range isn't > > > currently being tracked we should conservatively assume it's all dirty, > > > right? > > > > The callers will should ensure that the range exists. This is just a > > conservative test. > > OK. > > > Anyway, it begs the question of whether a new range should be > > considered all dirty or all clean. Intuitively "all dirty" seems the > > right answer but in practice it works fine as written since the guest > > is busy updating the whole frame buffer. > > What if the guest's not writing to the framebuffer at the moment, or > only to a part of it? Shouldn't the tools see the existing content? Ok, in HAP a new range is considered to be "all dirty". > > > > And, since you know you're in HAP mode, not in log-dirty mode, and > > > already have the paging lock, you can just set > > > d->arch.paging.mode |= PG_log_dirty there rather than jumping through > > > the paging_log_dirty_enable() path and messing with locks. > > > > No, paging_log_dirty_enable() goes through several layers of functions and > > ends up calling hap_enable_vram_tracking(), which does quite a bit of > stuff. > > OK. > > > > > +/* paging_mark_dirty_hap() > > > > + * Make a hap page writeable and mark it as dirty. > > > > + * This done atomically under the p2m and paging locks to avoid > leaving > > > > + * a window where the page might be modified without being marked > as > > > dirty. > > > > + */ > > > > > > I'm perplexed by this -- AFAICT it's either not necessary (because all > > > log-dirty read/clean ops are done with the domain paused) or not > sufficient > > > (because although the bitmap and the PTE are updated under the p2m > lock, > > > the actual dirtying of the page happens at some other time). Can you > > > spell out for me exactly what this is protecting against? > > > > The comment over-stated the problem so I've toned it down > > from "without being marked" to "without being counted". > > > > paging_mark_dirty_hap() is in the page fault path and has two steps: > > > > (1) It calls p2m_change_type() to re-mark some pfn as writeable > > (i.e. p2m_ram_rw), which is a no-op if the pfn is already writeable. > > This must be done under the p2m_lock. > > > > (2) If the pfn was previously read-only (i.e. p2m_ram_logdirty) then > > it bumps two dirty counts. And it marks the page as dirty. This must > > be done under the paging lock. > > > > As an invariant, the dirty counts should be precisely the number of pages > > made writeable. > > That invariant is already doomed -- any other agent (including the guest > itself) can change the p2m mappings for one of the pfns, or mark the pfn > dirty, without going through the NPF fault handler. AFAICS the counts > could just as well be implemented as flags, to say 'something in this > range was dirtied'; the only interesting case is when they're 0. > > > It may be that this invariant is not particularly useful, that things > > will just work out. But I do wonder if, without it, we'll have > > situations where the dirty counts will indicate dirty pages when there > > are none, or no dirty pages when there are some. > > The second of those cases would be the bad one; I think that can be > avoided by just switching the order of paging_mark_dirty() and > p2m_change_type() in hvm_hap_nested_page_fault(), and maybe putting a > wmb() between them. Ok, I've done as you suggested. I don't think the wmb() is needed but I could be convinced. > > Cheers, > > Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1cC-000490-SA; Mon, 12 Nov 2012 21:32:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1cB-00048L-Bm for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:32:19 +0000 Received: from [85.158.143.35:25106] by server-2.bemta-4.messagelabs.com id 59/3F-28922-3EA61A05; Mon, 12 Nov 2012 21:32:19 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352755932!14616307!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12006 invoked from network); 12 Nov 2012 21:32:15 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:32:15 -0000 X-SBRS: -2.2 X-MesageID: 44332997 X-Ironport-Server: ftlpip01.citrite.net X-Remote-IP: 75.150.106.249 X-Policy: $Relay X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="44332997" Received: from 75-150-106-249-newengland.hfc.comcastbusiness.net (HELO paine.oldroadcomputing.net) ([75.150.106.249]) by SMTP.CITRIX.COM with ESMTP; 12 Nov 2012 21:32:03 +0000 From: Robert Phillips To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 16:31:53 -0500 Message-Id: <1352755913-4229-1-git-send-email-robert.phillips@citrix.com> X-Mailer: git-send-email 1.7.9.5 Cc: Robert Phillips Subject: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Support is provided for both shadow and hardware assisted paging (HAP) modes. This code bookkeeps the set of video frame buffers (vram), detects when the guest has modified any of those buffers and, upon request, returns a bitmap of the modified pages. This lets other software components re-paint the portions of the monitor (or monitors) that have changed. Each monitor has a frame buffer of some size at some position in guest physical memory. The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. (Version 3 of this patch.) Signed-Off-By: Robert Phillips --- tools/libxc/xenctrl.h | 17 +- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/hvm.c | 16 +- xen/arch/x86/mm/Makefile | 1 + xen/arch/x86/mm/dirty_vram.c | 992 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/hap/hap.c | 140 +----- xen/arch/x86/mm/paging.c | 196 ++------ xen/arch/x86/mm/shadow/common.c | 335 +++++++------ xen/arch/x86/mm/shadow/multi.c | 174 +++---- xen/arch/x86/mm/shadow/multi.h | 7 +- xen/arch/x86/mm/shadow/types.h | 1 + xen/include/asm-x86/dirty_vram.h | 201 ++++++++ xen/include/asm-x86/hap.h | 4 - xen/include/asm-x86/hvm/domain.h | 2 +- xen/include/asm-x86/paging.h | 17 +- xen/include/asm-x86/shadow.h | 6 - 16 files changed, 1549 insertions(+), 562 deletions(-) create mode 100644 xen/arch/x86/mm/dirty_vram.c create mode 100644 xen/include/asm-x86/dirty_vram.h diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7eb5743..693d7fe 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1552,15 +1552,20 @@ int xc_hvm_inject_msi( xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data); /* - * Track dirty bit changes in the VRAM area + * Track dirty bit changes in a VRAM region defined by + * [ first_pfn : first_pfn + nr - 1 ] * * All of this is done atomically: - * - get the dirty bitmap since the last call - * - set up dirty tracking area for period up to the next call - * - clear the dirty tracking area. + * - gets the dirty bitmap since the last call, all zeroes for + * the first call with some new region + * - sets up a dirty tracking region for period up to the next call + * - clears the specified dirty tracking region. * - * Returns -ENODATA and does not fill bitmap if the area has changed since the - * last call. + * Creating a new region causes any existing regions that it overlaps + * to be discarded. + * + * Specifying nr == 0 causes all regions to be discarded and + * disables dirty bit tracking. */ int xc_hvm_track_dirty_vram( xc_interface *xch, domid_t dom, diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index eea5555..e374aac 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -22,4 +22,4 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o \ No newline at end of file +obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 34da2f5..3a3e5e4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +67,7 @@ #include #include #include +#include "../mm/mm-locks.h" bool_t __read_mostly hvm_enabled; @@ -1433,8 +1435,20 @@ int hvm_hap_nested_page_fault(paddr_t gpa, */ if ( access_w ) { + p2m_type_t pt; + pt = p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + + paging_lock(v->domain); + if ( pt == p2m_ram_logdirty ) + { + dv_range_t *range; + v->domain->arch.paging.log_dirty.dirty_count++; + range = dirty_vram_range_find_gfn(v->domain, gfn); + if ( range ) + range->dirty_count++; + } paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_unlock(v->domain); } rc = 1; goto out_put_gfn; diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 73dcdf4..becd0c9 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -5,6 +5,7 @@ obj-y += paging.o obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o obj-y += guest_walk_2.o obj-y += guest_walk_3.o +obj-y += dirty_vram.o obj-$(x86_64) += guest_walk_4.o obj-$(x86_64) += mem_event.o obj-$(x86_64) += mem_paging.o diff --git a/xen/arch/x86/mm/dirty_vram.c b/xen/arch/x86/mm/dirty_vram.c new file mode 100644 index 0000000..e3c7c1f --- /dev/null +++ b/xen/arch/x86/mm/dirty_vram.c @@ -0,0 +1,992 @@ +/* + * arch/x86/mm/dirty_vram.c: Bookkeep/query dirty VRAM pages + * with support for multiple frame buffers. + * + * Copyright (c) 2012, Citrix Systems, Inc. (Robert Phillips) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ + + +#include +#include +#include +#include +#include +#include "mm-locks.h" + +#define DEBUG_stop_tracking_all_vram 0 +#define DEBUG_allocating_dirty_vram_range 0 +#define DEBUG_high_water_mark_for_vram_ranges 0 +#define DEBUG_freeing_dirty_vram_range 0 +#define DEBUG_allocate_paddr_links_page 0 +#define DEBUG_update_vram_mapping 0 +#define DEBUG_alloc_paddr_inject_fault 0 + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram; + ASSERT( paging_locked_by_me(d) ); + dirty_vram = d->arch.hvm_domain.dirty_vram = xzalloc(dv_dirty_vram_t); + if ( dirty_vram ) + { + INIT_LIST_HEAD(&dirty_vram->range_head); + INIT_LIST_HEAD(&dirty_vram->ext_head); + } + return dirty_vram; +} + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( !dirty_vram ) + dirty_vram = dirty_vram_alloc(d); + return dirty_vram; +} + + +/* Free domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr, *next; + /* Free all the ranges */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); +#if DEBUG_stop_tracking_all_vram + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] stop tracking all vram\n", + range->begin_pfn, range->end_pfn); +#endif + xfree(range->pl_tab); + xfree(range); + } + /* Free all the extension pages */ + list_for_each_safe(curr, next, &dirty_vram->ext_head) + { + struct dv_paddr_link_ext *ext = + container_of( + curr, struct dv_paddr_link_ext, ext_link); + struct page_info *pg = __virt_to_page(ext); + d->arch.paging.free_page(d, pg); + } + + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } +} + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn) +{ + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( gfn >= range->begin_pfn && + gfn < range->end_pfn ) + return range; + } + } + return NULL; +} + +/* + * Returns pointer to dirty vram range matching [begin_pfn .. end_pfn ), + * NULL if none. + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( begin_pfn == range->begin_pfn && + end_pfn == range->end_pfn ) + return range; + } + } + return NULL; +} + +/* Allocate specified dirty_vram range */ +static dv_range_t * +_dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range = NULL; + unsigned long end_pfn = begin_pfn + nr; + dv_pl_entry_t *pl_tab = NULL; + int i; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + +#if DEBUG_allocating_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Allocating dirty vram range hap:%d\n", + begin_pfn, end_pfn, + d->arch.hvm_domain.hap_enabled); +#endif + + range = xzalloc(dv_range_t); + if ( range == NULL ) + goto err_out; + + INIT_LIST_HEAD(&range->range_link); + + range->begin_pfn = begin_pfn; + range->end_pfn = end_pfn; + + if ( !hap_enabled(d) ) + { + if ( (pl_tab = xzalloc_array(dv_pl_entry_t, nr)) == NULL ) + goto err_out; + + for ( i = 0; i != nr; i++ ) + { + pl_tab[i].mapping.sl1ma = INVALID_PADDR; + } + } + + range->pl_tab = pl_tab; + range->mappings_hwm = 1; + + list_add(&range->range_link, &dirty_vram->range_head); + if ( ++dirty_vram->nr_ranges > dirty_vram->ranges_hwm ) + { + dirty_vram->ranges_hwm = dirty_vram->nr_ranges; +#if DEBUG_high_water_mark_for_vram_ranges + gdprintk(XENLOG_DEBUG, + "High water mark for number of vram ranges is now:%d\n", + dirty_vram->ranges_hwm); +#endif + } + return range; + + err_out: + xfree(pl_tab); + xfree(range); + return NULL; +} + + +/* Frees specified dirty_vram range */ +void dirty_vram_range_free(struct domain *d, + dv_range_t *range) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + int i, nr = range->end_pfn - range->begin_pfn; + +#if DEBUG_freeing_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Freeing dirty vram range\n", + range->begin_pfn, range->end_pfn); +#endif + + if ( range->pl_tab ) + { + for ( i = 0; i != nr; i++ ) + { + dv_paddr_link_t *plx; + plx = range->pl_tab[i].mapping.pl_next; + /* Does current FB page have multiple mappings? */ + if ( plx ) /* yes */ + { + /* Find the last element in singly-linked list */ + while ( plx->pl_next != NULL ) + plx = plx->pl_next; + + /* Prepend whole list to the free list */ + plx->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = range->pl_tab[i].mapping.pl_next; + } + } + xfree(range->pl_tab); + range->pl_tab = NULL; + } + + /* Remove range from the linked list, free it, and adjust count*/ + list_del(&range->range_link); + xfree(range); + dirty_vram->nr_ranges--; + } +} + +/* + * dirty_vram_range_alloc() + * This function ensures that the new range does not overlap any existing + * ranges -- deleting them if necessary -- and then calls + * _dirty_vram_range_alloc to actually allocate the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + struct list_head *curr, *next; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + + /* + * Ranges cannot overlap so + * free any range that overlaps [ begin_pfn .. end_pfn ) + */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *rng = list_entry(curr, dv_range_t, range_link); + if ( ( ( rng->begin_pfn <= begin_pfn ) && + ( begin_pfn < rng->end_pfn ) + ) || + ( ( begin_pfn <= rng->begin_pfn ) && + ( rng->begin_pfn < end_pfn ) + ) ) + { + /* Different tracking, tear the previous down. */ + dirty_vram_range_free(d, rng); + } + } + + range = _dirty_vram_range_alloc(d, begin_pfn, nr); + if ( !range ) + goto out; + + out: + return range; +} + +/* + * dirty_vram_range_find_or_alloc() + * Find the range for [begin_pfn:begin_pfn+nr). + * If it doesn't exists, create it. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_range_t *range; + ASSERT( paging_locked_by_me(d) ); + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + range = dirty_vram_range_alloc(d, begin_pfn, nr); + + return range; +} + + + +/* Allocate a dv_paddr_link struct */ +static dv_paddr_link_t * +alloc_paddr_link(struct domain *d) +{ + dv_paddr_link_t * pl = NULL; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + + ASSERT( paging_locked_by_me(d) ); + BUILD_BUG_ON(sizeof(dv_paddr_link_ext_t) > PAGE_SIZE); + /* Is the list of free pl's empty? */ + if ( dirty_vram->pl_free == NULL ) /* yes */ + { + /* + * Allocate another page of pl's. + * Link them all together and point the free list head at them + */ + int i; + struct page_info *pg = d->arch.paging.alloc_page(d); + dv_paddr_link_ext_t *ext = __page_to_virt(pg); + if ( ext == NULL ) + goto out; + +#if DEBUG_allocate_paddr_links_page + gdprintk(XENLOG_DEBUG, "Allocated another page of paddr_links\n"); +#endif + list_add(&ext->ext_link, &dirty_vram->ext_head); + + /* initialize and link together the new pl entries */ + for ( i = 0; i != ARRAY_SIZE(ext->entries); i++ ) + { + ext->entries[i].sl1ma = INVALID_PADDR; + ext->entries[i].pl_next = &ext->entries[i+1]; + } + ext->entries[ARRAY_SIZE(ext->entries) - 1].pl_next = NULL; + dirty_vram->pl_free = &ext->entries[0]; + } + pl = dirty_vram->pl_free; + dirty_vram->pl_free = pl->pl_next; + + pl->sl1ma = INVALID_PADDR; + pl->pl_next = NULL; + out: + return pl; +} + + +/* + * Free a paddr_link struct. + * + * The caller has walked the singly-linked list of elements + * that have, as their head, an element in a pl_tab cell. + * The list walks has reached the element to be freed. + * (Each element is a dv_paddr_link_t struct.) + * + * @pl points to the element to be freed. + * @ppl points to its predecessor element's next member. + * + * After linking the precessor to the element's successor, + * we can free @pl by prepending it to the list of free + * elements. + * + * As a boundary case (which happens to be the common case), + * @pl points to a cell in the pl_tab rather than to some + * extension element danging from that cell. + * We recognize this case because @ppl is NULL. + * In that case we promote the first extension element by + * copying it into the pl_tab cell and free it. + */ + +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_paddr_link_t *npl; /* next pl */ + + ASSERT( paging_locked_by_me(d) ); + /* extension mapping? */ + if ( ppl ) /* yes. free it */ + { + ASSERT(pl == (*ppl)); + (*ppl) = npl = pl->pl_next; + } + else /* main table */ + { + /* + * move 2nd mapping to main table. + * and free 2nd mapping + */ + dv_paddr_link_t * spl; + spl = pl->pl_next; + if ( spl == NULL ) + { + pl->sl1ma = INVALID_PADDR; + return pl; + } + pl->sl1ma = spl->sl1ma; + pl->pl_next = spl->pl_next; + npl = pl; /* reprocess main table entry again */ + pl = spl; + } + pl->sl1ma = INVALID_PADDR; + pl->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = pl; + return npl; +} + + +/* + * dirty_vram_range_update() + * + * This is called whenever a level 1 page table entry is modified. + * If the L1PTE is being cleared, the function removes any paddr_links + * that refer to it. + * If the L1PTE is being set to a frame buffer page, a paddr_link is + * created for that page's entry in pl_tab. + * Returns 1 iff entry found and set or cleared. + */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set) +{ + int effective = 0; + dv_range_t *range; + unsigned long i; + dv_paddr_link_t *pl; + dv_paddr_link_t **ppl; + int len = 0; + + ASSERT(paging_locked_by_me(d)); + range = dirty_vram_range_find_gfn(d, gfn); + if ( !range ) + return effective; + + + i = gfn - range->begin_pfn; + pl = &range->pl_tab[ i ].mapping; + ppl = NULL; + + /* + * find matching entry (pl), if any, and its predecessor + * in linked list (ppl) + */ + while ( pl != NULL ) + { + if ( pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) + break; + + ppl = &pl->pl_next; + pl = *ppl; + len++; + } + + if ( set ) + { + /* Did we find sl1ma in either the main table or the linked list? */ + if ( pl == NULL ) /* no, so we'll need to alloc a link */ + { + ASSERT(ppl != NULL); + +#if DEBUG_alloc_paddr_inject_fault + { + static int counter; + + /* Test stuck_dirty logic for some cases */ + if ( (++counter) % 4 == 0 ) + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + gdprintk(XENLOG_DEBUG, + "[%lx] inject stuck dirty fault\n", + gfn ); + goto out; + } + } +#endif + /* + * Have we reached the limit of mappings we're willing + * to bookkeep? + */ + if (len > DV_ADDR_LINK_LIST_LIMIT) /* yes */ + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + + gdprintk(XENLOG_DEBUG, + "[%lx] link limit exceeded\n", + gfn ); + + goto out; + } + + /* alloc link and append it to list */ + (*ppl) = pl = alloc_paddr_link(d); + /* Were we able to allocate a link? */ + if ( pl == NULL ) /* no */ + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + + gdprintk(XENLOG_DEBUG, + "[%lx] alloc failure\n", + gfn ); + + goto out; + } + } + if ( pl->sl1ma != sl1ma ) + { + ASSERT(pl->sl1ma == INVALID_PADDR); + pl->sl1ma = sl1ma; + range->nr_mappings++; + } + effective = 1; + if ( len > range->mappings_hwm ) + { + range->mappings_hwm = len; +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", + gfn, sl1ma, + range->mappings_hwm, + range->nr_mappings, + d->arch.paging.shadow.free_pages); +#endif + } + } + else /* clear */ + { + if ( pl && pl->sl1ma == sl1ma ) + { +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] clear sl1ma:%lx mappings:%d\n", + gfn, sl1ma, + range->nr_mappings - 1); +#endif + free_paddr_link(d, ppl, pl); + --range->nr_mappings; + effective = 1; + } + } + out: + return effective; +} + + +/* + * shadow_scan_dirty_flags() + * This produces a dirty bitmap for the range by examining every + * L1PTE referenced by some dv_paddr_link in the range's pl_tab table. + * It tests and clears each such L1PTE's dirty flag. + */ +static int shadow_scan_dirty_flags(struct domain *d, + dv_range_t *range, + uint8_t *dirty_bitmap) +{ + int flush_tlb = 0; + unsigned long i; + unsigned long nr = range->end_pfn - range->begin_pfn; + + ASSERT( paging_locked_by_me(d) ); + /* Iterate over VRAM to track dirty bits. */ + for ( i = 0; i < nr; i++ ) + { + int dirty = 0, len = 1; + dv_paddr_link_t *pl; + /* Does the frame buffer have an incomplete set of mappings? */ + if ( unlikely(range->pl_tab[i].stuck_dirty) ) /* yes */ + dirty = 1; + else /* The frame buffer's set of mappings is complete. Scan it. */ + for ( pl = &range->pl_tab[i].mapping; pl; pl = pl->pl_next, len++ ) + { + l1_pgentry_t *sl1e; + paddr_t sl1ma = pl->sl1ma; + if (sl1ma == INVALID_PADDR) /* FB page is unmapped */ + continue; + sl1e = maddr_to_virt(sl1ma); + if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) + { + dirty = 1; + /* Clear dirty so we can detect if page gets re-dirtied. + * Note: this is atomic, so we may clear a + * _PAGE_ACCESSED set by another processor. + */ + l1e_remove_flags(*sl1e, _PAGE_DIRTY); + flush_tlb = 1; + } + } /* for */ + + if ( dirty ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + + } + + return flush_tlb; +} + + +/* + * shadow_track_dirty_vram() + * This is the API called by the guest to determine which pages in the range + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. + * It creates the domain's dv_dirty_vram on demand. + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). + * It copies the dirty bitmask into guest storage. + */ +int shadow_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + int rc = 0; + unsigned long end_pfn = begin_pfn + nr; + int flush_tlb = 0; + dv_range_t *range; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + /* + * This range test is tricky. + * + * The range [begin_pfn..end_pfn) is an open interval, so end_pfn is a pfn + * beyond the end of the range. + * + * p2m->max_mapped_pfn is a valid PFN so p2m->max_mapped_pfn + 1 is an + * invalid PFN. + * + * If end_pfn is beyond *that* then the range is invalid. + */ + if ( end_pfn < begin_pfn + || begin_pfn > p2m->max_mapped_pfn + || end_pfn > p2m->max_mapped_pfn + 1 ) + return -EINVAL; + + paging_lock(d); + + if (!nr) + { + dirty_vram_free(d); + goto out; + } + + if ( guest_handle_is_null(guest_dirty_bitmap) ) + goto out; + + if ( !dirty_vram_find_or_alloc(d) ) + { + rc = -ENOMEM; + goto out; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + range = dirty_vram_range_alloc(d, begin_pfn, nr); + if ( range ) + sh_find_all_vram_mappings(d->vcpu[0], range); + } + if ( range ) + { + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; + unsigned long dirty_bitmap[size]; + + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); + + flush_tlb |= shadow_scan_dirty_flags(d, range, (uint8_t*)dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + (uint8_t*)dirty_bitmap, + size * BYTES_PER_LONG) == 0 ) + rc = 0; + } + + if ( flush_tlb ) + flush_tlb_mask(d->domain_dirty_cpumask); + +out: + paging_unlock(d); + return rc; +} + + +/************************************************/ +/* HAP VRAM TRACKING SUPPORT */ +/************************************************/ + +/* + * hap_enable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-only. + */ +static int hap_enable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + /* turn on PG_log_dirty bit in paging mode */ + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + + /* + * dirty_vram != NULL iff we're tracking dirty vram. + * If we start tracking dirty pages for all memory then + * the dirty_vram structure is freed. + */ + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table to be read-only. */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] enable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_rw, p2m_ram_logdirty); + } + + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_disable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-write. + */ +static int hap_disable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table with normal mode */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] disable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_logdirty, p2m_ram_rw); + } + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_clean_vram_tracking_range() + * For all the pages in the range specified by [begin_pfn,nr), + * note in the dirty bitmap any page that has been marked as read-write, + * which signifies that the page has been dirtied, and reset the page + * to ram_logdirty. + */ +void hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) +{ + int i; + unsigned long pfn; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); + ASSERT(paging_locked_by_me(d)); + + if ( !dirty_vram ) + { + gdprintk(XENLOG_DEBUG, + "Should only be called while tracking dirty vram.\n"); + return; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + return; + + /* set l1e entries of P2M table to be read-only. */ + /* + * On first write, it page faults, its entry is changed to read-write, + * its bit in the dirty bitmap is set, and on retry the write succeeds. + */ + for ( i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++ ) + { + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + } + flush_tlb_mask(d->domain_dirty_cpumask); +} + +static void hap_vram_tracking_init(struct domain *d) +{ + paging_log_dirty_init(d, hap_enable_vram_tracking, + hap_disable_vram_tracking, + NULL); +} + +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(). + */ +int hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + long rc = 0; + dv_dirty_vram_t *dirty_vram; + + paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( nr ) + { + dv_range_t *range = NULL; + int size = ( nr + BITS_PER_LONG - 1 ) & ~( BITS_PER_LONG - 1 ); + uint8_t dirty_bitmap[size]; + bool_t new_range = 0; + + /* Already tracking dirty vram? */ + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ + { + /* Handle the addition of another range */ + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + rc = -ENOMEM; + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) + goto param_fail; + new_range = 1; + } + } + /* Just starting to track dirty vram? */ + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ + { + rc = -ENOMEM; + if ( !(dirty_vram = dirty_vram_alloc(d)) ) + goto param_fail; + + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) + goto param_fail; + + new_range = 1; + + /* Initialize callbacks for vram tracking */ + hap_vram_tracking_init(d); + + /* Enable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_enable(d); + paging_lock(d); + + if ( rc != 0 ) + goto param_fail; + } + else + { + /* Test for invalid combination */ + if ( !paging_mode_log_dirty(d) && dirty_vram ) + rc = -EINVAL; + else /* logging dirty of all memory, not tracking dirty vram */ + rc = -ENODATA; + goto param_fail; + } + + paging_unlock(d); + /* Is this query the very first for this range? */ + if ( new_range ) /* yes */ + memset(dirty_bitmap, 0xff, size); /* consider all pages dirty */ + else + { + memset(dirty_bitmap, 0x00, size); + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + } + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + dirty_bitmap, + size) == 0 ) + { + rc = 0; + } + } + else + { + /* + * If zero pages specified while already tracking dirty vram + * then stop tracking + */ + if ( paging_mode_log_dirty(d) && dirty_vram ) + { + /* Disable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_disable(d); + paging_lock(d); + + dirty_vram_free(d); + } + else /* benign no-op */ + { + rc = 0; + } + paging_unlock(d); + } + + return rc; + +param_fail: + dirty_vram_free(d); + paging_unlock(d); + return rc; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index fd99cde..09cdba2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "private.h" @@ -53,139 +54,6 @@ #define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) /************************************************/ -/* HAP VRAM TRACKING SUPPORT */ -/************************************************/ - -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} - -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( nr ) - { - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) - { - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; - - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - else - { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; - } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); - } - else - { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } - - return rc; - -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } - return rc; -} - -/************************************************/ /* HAP LOG DIRTY SUPPORT */ /************************************************/ @@ -223,14 +91,12 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; if ( paging_mode_log_dirty(d) && dirty_vram ) { paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + dirty_vram_free(d); } - /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, hap_disable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ea44e39..55bedde 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -333,8 +334,11 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) mfn_t *l4, *l3, *l2; unsigned long *l1; int i4, i3, i2; + struct p2m_domain *p2m = p2m_get_hostp2m(d); domain_pause(d); + /* Locking hierarchy requires p2m lock to be taken first */ + p2m_lock(p2m); paging_lock(d); clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); @@ -345,6 +349,14 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) d->arch.paging.log_dirty.fault_count, d->arch.paging.log_dirty.dirty_count); + if ( hap_enabled(d) && d->arch.hvm_domain.dirty_vram ) + { + /* If we're cleaning/peeking all guest memory, we should not be tracking + * dirty vram. */ + rv = -EINVAL; + goto out; + } + sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; @@ -424,170 +436,64 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) if ( clean ) { - /* We need to further call clean_dirty_bitmap() functions of specific - * paging modes (shadow or hap). Safe because the domain is paused. */ - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + /* Is null if tracking dirty vram */ + if ( d->arch.paging.log_dirty.clean_dirty_bitmap ) + { + /* + * We need to call clean_dirty_bitmap() functions of specific + * paging modes (shadow or hap). + * Safe because the domain is paused. + */ + d->arch.paging.log_dirty.clean_dirty_bitmap(d); + } } domain_unpause(d); return rv; out: paging_unlock(d); + p2m_unlock(p2m); domain_unpause(d); return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + dv_range_t *range; + unsigned int range_dirty_count = 0; + + p2m_lock(p2m); paging_lock(d); - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); - - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); - - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + /* Only called when tracking dirty vram in HAP mode */ + ASSERT(hap_enabled(d) && d->arch.hvm_domain.dirty_vram); + + range = dirty_vram_range_find_gfn(d, begin_pfn); + if ( range ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + range_dirty_count = range->dirty_count; + range->dirty_count = 0; } - if ( l4 ) - unmap_domain_page(l4); - - paging_unlock(d); + + if ( !range_dirty_count) + goto out; - return rv; + PAGING_DEBUG(LOGDIRTY, + "log-dirty-range: dom %u [%05lx:%05lx] range_dirty=%u\n", + d->domain_id, + begin_pfn, + range->end_pfn, + range_dirty_count); + hap_clean_vram_tracking_range(d, begin_pfn, nr, dirty_bitmap); out: paging_unlock(d); - return rv; + p2m_unlock(p2m); + return; } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index ce79131..56afd16 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "private.h" @@ -3121,12 +3122,7 @@ void shadow_teardown(struct domain *d) * calls now that we've torn down the bitmap */ d->arch.paging.mode &= ~PG_log_dirty; - if (d->arch.hvm_domain.dirty_vram) { - xfree(d->arch.hvm_domain.dirty_vram->sl1ma); - xfree(d->arch.hvm_domain.dirty_vram->dirty_bitmap); - xfree(d->arch.hvm_domain.dirty_vram); - d->arch.hvm_domain.dirty_vram = NULL; - } + dirty_vram_free(d); paging_unlock(d); @@ -3463,179 +3459,212 @@ void shadow_clean_dirty_bitmap(struct domain *d) /**************************************************************************/ -/* VRAM dirty tracking support */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - int rc; - unsigned long end_pfn = begin_pfn + nr; - unsigned long dirty_size = (nr + 7) / 8; - int flush_tlb = 0; - unsigned long i; - p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - if (end_pfn < begin_pfn - || begin_pfn > p2m->max_mapped_pfn - || end_pfn >= p2m->max_mapped_pfn) - return -EINVAL; - - /* We perform p2m lookups, so lock the p2m upfront to avoid deadlock */ - p2m_lock(p2m_get_hostp2m(d)); - paging_lock(d); +/* Support functions for shadow-based dirty VRAM code */ - if ( dirty_vram && (!nr || - ( begin_pfn != dirty_vram->begin_pfn - || end_pfn != dirty_vram->end_pfn )) ) - { - /* Different tracking, tear the previous down. */ - gdprintk(XENLOG_INFO, "stopping tracking VRAM %lx - %lx\n", dirty_vram->begin_pfn, dirty_vram->end_pfn); - xfree(dirty_vram->sl1ma); - xfree(dirty_vram->dirty_bitmap); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } +#define DEBUG_unshadow_sl1ma 0 +#define DEBUG_unshadow_sl1ma_detail 0 +#define DEBUG_count_initial_mappings 1 - if ( !nr ) +/* smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn) +{ + static unsigned int l1_shadow_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + struct domain *d = v->domain; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr, *next; + + ASSERT(paging_locked_by_me(d)); + /* Ignore all but level 1 shadows */ + + if ( (l1_shadow_mask & (1 << shadow_type)) == 0 ) { - rc = 0; goto out; } - /* This should happen seldomly (Video mode change), - * no need to be careful. */ + dirty_vram = d->arch.hvm_domain.dirty_vram; if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them - * up to nr times getting rid of mappings of each pfn */ - shadow_blow_tables(d); - - gdprintk(XENLOG_INFO, "tracking VRAM %lx - %lx\n", begin_pfn, end_pfn); - - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto out; - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = end_pfn; - d->arch.hvm_domain.dirty_vram = dirty_vram; - - if ( (dirty_vram->sl1ma = xmalloc_array(paddr_t, nr)) == NULL ) - goto out_dirty_vram; - memset(dirty_vram->sl1ma, ~0, sizeof(paddr_t) * nr); - - if ( (dirty_vram->dirty_bitmap = xzalloc_array(uint8_t, dirty_size)) == NULL ) - goto out_sl1ma; - - dirty_vram->last_dirty = NOW(); - - /* Tell the caller that this time we could not track dirty bits. */ - rc = -ENODATA; - } - else if (dirty_vram->last_dirty == -1) - { - /* still completely clean, just copy our empty bitmap */ - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) - rc = 0; + goto out; } - else + + list_for_each_safe(curr, next, &dirty_vram->range_head) { - /* Iterate over VRAM to track dirty bits. */ - for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); - struct page_info *page; - int dirty = 0; - paddr_t sl1ma = dirty_vram->sl1ma[i]; - - if (mfn_x(mfn) == INVALID_MFN) - { - dirty = 1; - } - else + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + unsigned long i; + int max_mappings = 1, mappings = 0; + int unshadowed = 0; + for ( i = 0; i != range->end_pfn - range->begin_pfn; i++ ) + { + dv_paddr_link_t *pl = &range->pl_tab[ i ].mapping; + dv_paddr_link_t **ppl = NULL; + mappings = 0; + + while ( pl != NULL ) { - page = mfn_to_page(mfn); - switch (page->u.inuse.type_info & PGT_count_mask) - { - case 0: - /* No guest reference, nothing to track. */ - break; - case 1: - /* One guest reference. */ - if ( sl1ma == INVALID_PADDR ) - { - /* We don't know which sl1e points to this, too bad. */ - dirty = 1; - /* TODO: Heuristics for finding the single mapping of - * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); - } - else - { - /* Hopefully the most common case: only one mapping, - * whose dirty bit we can use. */ - l1_pgentry_t *sl1e = maddr_to_virt(sl1ma); - - if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) - { - dirty = 1; - /* Note: this is atomic, so we may clear a - * _PAGE_ACCESSED set by another processor. */ - l1e_remove_flags(*sl1e, _PAGE_DIRTY); - flush_tlb = 1; - } - } - break; - default: - /* More than one guest reference, - * we don't afford tracking that. */ - dirty = 1; + paddr_t sl1ma = pl->sl1ma; + unsigned long sl1mn; + + if ( sl1ma == INVALID_PADDR ) break; + + sl1mn = sl1ma >> PAGE_SHIFT; + if ( sl1mn == mfn_x(smfn) ) { +#if DEBUG_unshadow_sl1ma_detail + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%lx] unshadow sl1ma:%lx\n", + mfn_x(smfn), + range->begin_pfn + i, + sl1ma); +#endif + unshadowed++; + pl = free_paddr_link(d, ppl, pl); + --range->nr_mappings; + } + else + { + ppl = &pl->pl_next; + pl = *ppl; + mappings++; } } - - if ( dirty ) + } + if ( mappings > max_mappings ) + max_mappings = mappings; + + if ( unshadowed ) { +#if DEBUG_unshadow_sl1ma + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%05lx:%05lx] unshadowed:%d mappings:0x%x max_mappings:%d\n", + mfn_x(smfn), + range->begin_pfn, range->end_pfn, + unshadowed, range->nr_mappings, max_mappings); +#endif + if ( range->nr_mappings == 0 ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + dirty_vram_range_free(d, range); } } + } + out: + return; +} + + +typedef int (*hash_pfn_callback_t)(struct vcpu *v, + mfn_t smfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); + +static int hash_pfn_foreach(struct vcpu *v, + unsigned int callback_mask, + hash_pfn_callback_t callbacks[], + unsigned long begin_pfn, + unsigned long end_pfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0, removed = 0; + struct domain *d = v->domain; + struct page_info *x; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(paging_locked_by_me(d)); + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i = begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); - } - dirty_vram->last_dirty = -1; + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](v, page_to_mfn(x), + begin_pfn, end_pfn, + &removed); + if ( done ) break; } - rc = 0; } + if ( done ) break; } - if ( flush_tlb ) - flush_tlb_mask(d->domain_dirty_cpumask); - goto out; + d->arch.paging.shadow.hash_walking = 0; + return removed; +} -out_sl1ma: - xfree(dirty_vram->sl1ma); -out_dirty_vram: - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range) +{ + /* Dispatch table for getting per-type functions */ + static hash_pfn_callback_t callbacks[SH_type_unused] = { + NULL, /* none */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* l1_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* fl1_32 */ + NULL, /* l2_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* l1_pae */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* fl1_pae */ + NULL, /* l2_pae */ + NULL, /* l2h_pae */ +#if CONFIG_PAGING_LEVELS >= 4 + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* l1_64 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* fl1_64 */ +#else + NULL, /* l1_64 */ + NULL, /* fl1_64 */ +#endif + NULL, /* l2_64 */ + NULL, /* l2h_64 */ + NULL, /* l3_64 */ + NULL, /* l4_64 */ + NULL, /* p2m */ + NULL /* unused */ + }; -out: - paging_unlock(d); - p2m_unlock(p2m_get_hostp2m(d)); - return rc; + static unsigned int callback_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + + perfc_incr(shadow_mappings); + + hash_pfn_foreach(v, callback_mask, callbacks, + range->begin_pfn, + range->end_pfn); + +#if DEBUG_count_initial_mappings + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] count of initial mappings:%d\n", + range->begin_pfn, range->end_pfn, + range->nr_mappings); +#endif } + /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..9c00574 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +150,10 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } @@ -160,6 +165,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) @@ -516,7 +525,6 @@ _sh_propagate(struct vcpu *v, guest_l1e_t guest_entry = { guest_intpte }; shadow_l1e_t *sp = shadow_entry_ptr; struct domain *d = v->domain; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; gfn_t target_gfn = guest_l1e_get_gfn(guest_entry); u32 pass_thru_flags; u32 gflags, sflags; @@ -663,17 +671,6 @@ _sh_propagate(struct vcpu *v, } } - if ( unlikely((level == 1) && dirty_vram - && dirty_vram->last_dirty == -1 - && gfn_x(target_gfn) >= dirty_vram->begin_pfn - && gfn_x(target_gfn) < dirty_vram->end_pfn) ) - { - if ( ft & FETCH_TYPE_WRITE ) - dirty_vram->last_dirty = NOW(); - else - sflags &= ~_PAGE_RW; - } - /* Read-only memory */ if ( p2m_is_readonly(p2mt) || (p2mt == p2m_mmio_direct && @@ -1072,101 +1069,60 @@ static int shadow_set_l2e(struct vcpu *v, return flags; } -static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, +/* shadow_vram_fix_l1e() + * + * Tests L1PTEs as they are modified, looking for when they start to + * (or cease to) point to frame buffer pages. If the old and new gfns differ, + * calls dirty_vram_range_update() to updates the dirty_vram structures. + */ +static inline void shadow_vram_fix_l1e(shadow_l1e_t old_sl1e, + shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) { - mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); - int flags = shadow_l1e_get_flags(new_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + mfn_t new_mfn, old_mfn; + unsigned long new_gfn = INVALID_M2P_ENTRY, old_gfn = INVALID_M2P_ENTRY; + paddr_t sl1ma; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ + if ( !dirty_vram ) return; - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); + sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) | ((unsigned long)sl1e & ~PAGE_MASK); - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + old_mfn = shadow_l1e_get_mfn(old_sl1e); + + if ( !sh_l1e_is_magic(old_sl1e) && + (l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && + mfn_valid(old_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - /* Initial guest reference, record it */ - dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + old_gfn = mfn_to_gfn(d, old_mfn); } -} - -static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, - shadow_l1e_t *sl1e, - mfn_t sl1mfn, - struct domain *d) -{ - mfn_t mfn = shadow_l1e_get_mfn(old_sl1e); - int flags = shadow_l1e_get_flags(old_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ - return; - - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); - - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + + new_mfn = shadow_l1e_get_mfn(new_sl1e); + if ( !sh_l1e_is_magic(new_sl1e) && + (l1e_get_flags(new_sl1e) & _PAGE_PRESENT) && + mfn_valid(new_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - int dirty = 0; - paddr_t sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + new_gfn = mfn_to_gfn(d, new_mfn); + } - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - { - /* Last reference */ - if ( dirty_vram->sl1ma[i] == INVALID_PADDR ) { - /* We didn't know it was that one, let's say it is dirty */ - dirty = 1; - } - else - { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); - dirty_vram->sl1ma[i] = INVALID_PADDR; - if ( flags & _PAGE_DIRTY ) - dirty = 1; - } - } - else + if ( old_gfn == new_gfn ) return; + + if ( VALID_M2P(old_gfn) ) + if ( dirty_vram_range_update(d, old_gfn, sl1ma, 0/*clear*/) ) { - /* We had more than one reference, just consider the page dirty. */ - dirty = 1; - /* Check that it's not the one we recorded. */ - if ( dirty_vram->sl1ma[i] == sl1ma ) - { - /* Too bad, we remembered the wrong one... */ - dirty_vram->sl1ma[i] = INVALID_PADDR; - } - else - { - /* Ok, our recorded sl1e is still pointing to this page, let's - * just hope it will remain. */ - } + SHADOW_PRINTK("gfn %lx (mfn %lx) cleared vram pte\n", + old_gfn, mfn_x(old_mfn)); } - if ( dirty ) + + if ( VALID_M2P(new_gfn) ) + if ( dirty_vram_range_update(d, new_gfn, sl1ma, 1/*set*/) ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + SHADOW_PRINTK("gfn %lx (mfn %lx) set vram pte\n", + new_gfn, mfn_x(new_mfn)); } - } } static int shadow_set_l1e(struct vcpu *v, @@ -1211,12 +1167,13 @@ static int shadow_set_l1e(struct vcpu *v, shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); /* fall through */ case 0: - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); break; } } } + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); + /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; @@ -1231,7 +1188,6 @@ static int shadow_set_l1e(struct vcpu *v, * trigger a flush later. */ if ( shadow_mode_refcounts(d) ) { - shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); } @@ -2018,7 +1974,6 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { - shadow_vram_put_l1e(*sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(*sl1e, d); } }); @@ -4336,6 +4291,37 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) return done; } + +int sh_find_vram_mappings_in_l1(struct vcpu *v, + mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed) +/* Find all VRAM mappings in this shadow l1 table */ +{ + struct domain *d = v->domain; + shadow_l1e_t *sl1e; + int done = 0; + + /* only returns _PAGE_PRESENT entries */ + SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, done, + { + unsigned long gfn; + mfn_t gmfn = shadow_l1e_get_mfn(*sl1e); + if ( !mfn_valid(gmfn) ) + continue; + gfn = mfn_to_gfn(d, gmfn); + if ( VALID_M2P(gfn) && (begin_pfn <= gfn) && (gfn < end_pfn) ) + { + paddr_t sl1ma = + pfn_to_paddr(mfn_x(sl1mfn)) | + ( (unsigned long)sl1e & ~PAGE_MASK ); + dirty_vram_range_update(v->domain, gfn, sl1ma, 1/*set*/); + } + }); + return 0; +} + /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 835121e..436a4ac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -66,7 +66,12 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); - +extern int +SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, GUEST_LEVELS) + (struct vcpu *v, mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) (struct vcpu *v, void *ep, mfn_t smfn); diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 43ce1db..5b0f9f7 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -229,6 +229,7 @@ static inline shadow_l4e_t shadow_l4e_from_mfn(mfn_t mfn, u32 flags) #define sh_update_cr3 INTERNAL_NAME(sh_update_cr3) #define sh_rm_write_access_from_l1 INTERNAL_NAME(sh_rm_write_access_from_l1) #define sh_rm_mappings_from_l1 INTERNAL_NAME(sh_rm_mappings_from_l1) +#define sh_find_vram_mappings_in_l1 INTERNAL_NAME(sh_find_vram_mappings_in_l1) #define sh_remove_l1_shadow INTERNAL_NAME(sh_remove_l1_shadow) #define sh_remove_l2_shadow INTERNAL_NAME(sh_remove_l2_shadow) #define sh_remove_l3_shadow INTERNAL_NAME(sh_remove_l3_shadow) diff --git a/xen/include/asm-x86/dirty_vram.h b/xen/include/asm-x86/dirty_vram.h new file mode 100644 index 0000000..95637de --- /dev/null +++ b/xen/include/asm-x86/dirty_vram.h @@ -0,0 +1,201 @@ +/****************************************************************************** + * include/asm-x86/dirty_vram.h + * + * Interface for tracking dirty VRAM pages + * + * Copyright (c) 2012 Citrix Systems, Inc. (Robert Phillips) + * Parts of this code are Copyright (c) 2006 by XenSource Inc. + * Parts of this code are Copyright (c) 2006 by Michael A Fetterman + * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DIRTY_VRAM_H +#define _DIRTY_VRAM_H + +/* + * In shadow mode we need to bookkeep all the L1 page table entries that + * map a frame buffer page. Struct dv_paddr_link does this + * by recording the address of a L1 page table entry for some frame buffer page. + * Also has a link to additional pl entries if the frame buffer page + * has multiple mappings. + * In practice very few pages have multiple mappings. + * But to rule out some pathological situation, we limit the number of + * mappings we're willing to bookkeep. + */ + +#define DV_ADDR_LINK_LIST_LIMIT 20 + +typedef struct dv_paddr_link { + paddr_t sl1ma; + struct dv_paddr_link *pl_next; +} dv_paddr_link_t; + +typedef struct dv_pl_entry { + dv_paddr_link_t mapping; + bool_t stuck_dirty; +} dv_pl_entry_t; + +/* + * This defines an extension page of pl entries for FB pages with multiple + * mappings. All such pages (of a domain) are linked together. + */ +typedef struct dv_paddr_link_ext { + struct list_head ext_link; + dv_paddr_link_t entries[ ( PAGE_SIZE - sizeof( struct list_head ) ) / + sizeof( dv_paddr_link_t ) ]; +} dv_paddr_link_ext_t; + +/* + * This defines a single frame buffer range. It bookkeeps all the level 1 PTEs + * that map guest pages within that range. + * All such ranges (of a domain) are linked together. + */ +typedef struct dv_range { + struct list_head range_link; /* the several ranges form a linked list */ + unsigned long begin_pfn; + unsigned long end_pfn; + dv_pl_entry_t *pl_tab; /* table has 1 pl entry per pfn in range */ + int nr_mappings; /* total number of mappings in this range */ + int mappings_hwm; /* high water mark of max mapping count */ + unsigned int dirty_count; +} dv_range_t; + +/* + * This contains all the data structures required by a domain to + * bookkeep the dirty pages within its frame buffers. + */ +typedef struct dv_dirty_vram { + struct list_head range_head; /* head of the linked list of ranges */ + struct list_head ext_head; /* head of list of extension pages */ + dv_paddr_link_t *pl_free; /* free list of pl's within extension pages */ + int nr_ranges; /* bookkeeps number of ranges */ + int ranges_hwm; /* high water mark of max number of ranges */ +} dv_dirty_vram_t; + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d); + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d); + +/* Frees domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d); + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * NULL if none + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Allocate dirty vram range containing [ begin_pfn .. begin_pfn+nr ), + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * creating a range if none already exists and + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +void dirty_vram_range_free(struct domain *d, + dv_range_t *range); + +/* Bookkeep PTE address of a frame buffer page */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set); + +/* + * smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. + */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn); + + +/* + * Scan all the L1 tables looking for VRAM mappings. + * Record them in the domain's dv_dirty_vram structure + */ +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range); + +/* + * Free a paddr_link struct, given address of its + * predecessor in singly-linked list + */ +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl); + + +/* Enable VRAM dirty tracking. */ +int +shadow_track_dirty_vram(struct domain *d, + unsigned long first_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +int +hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +void +hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); + +#endif /* _DIRTY_VRAM_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 916a35b..3e3a1f5 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -57,10 +57,6 @@ void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); void hap_logdirty_init(struct domain *d); -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..6146542 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -74,7 +74,7 @@ struct hvm_domain { struct list_head pinned_cacheattr_ranges; /* VRAM dirty support. */ - struct sh_dirty_vram *dirty_vram; + struct dv_dirty_vram * dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or * mtrr/pat between vcpus is not the same, set is_in_uc_mode diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9a40f2c..f96ca3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -137,10 +137,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); @@ -183,15 +183,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); #define L4_LOGDIRTY_IDX(pfn) 0 #endif -/* VRAM dirty tracking support */ -struct sh_dirty_vram { - unsigned long begin_pfn; - unsigned long end_pfn; - paddr_t *sl1ma; - uint8_t *dirty_bitmap; - s_time_t last_dirty; -}; - /***************************************************************************** * Entry points into the paging-assistance code */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 2eb6efc..940d7fd 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -62,12 +62,6 @@ void shadow_vcpu_init(struct vcpu *v); /* Enable an arbitrary shadow mode. Call once at domain creation. */ int shadow_enable(struct domain *d, u32 mode); -/* Enable VRAM dirty bit tracking. */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long first_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); - /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 21:32:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 21:32:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1cC-000490-SA; Mon, 12 Nov 2012 21:32:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY1cB-00048L-Bm for xen-devel@lists.xen.org; Mon, 12 Nov 2012 21:32:19 +0000 Received: from [85.158.143.35:25106] by server-2.bemta-4.messagelabs.com id 59/3F-28922-3EA61A05; Mon, 12 Nov 2012 21:32:19 +0000 X-Env-Sender: robert.phillips@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352755932!14616307!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12006 invoked from network); 12 Nov 2012 21:32:15 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 21:32:15 -0000 X-SBRS: -2.2 X-MesageID: 44332997 X-Ironport-Server: ftlpip01.citrite.net X-Remote-IP: 75.150.106.249 X-Policy: $Relay X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="44332997" Received: from 75-150-106-249-newengland.hfc.comcastbusiness.net (HELO paine.oldroadcomputing.net) ([75.150.106.249]) by SMTP.CITRIX.COM with ESMTP; 12 Nov 2012 21:32:03 +0000 From: Robert Phillips To: xen-devel@lists.xen.org Date: Mon, 12 Nov 2012 16:31:53 -0500 Message-Id: <1352755913-4229-1-git-send-email-robert.phillips@citrix.com> X-Mailer: git-send-email 1.7.9.5 Cc: Robert Phillips Subject: [Xen-devel] [PATCH] Provide support for multiple frame buffers in Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Support is provided for both shadow and hardware assisted paging (HAP) modes. This code bookkeeps the set of video frame buffers (vram), detects when the guest has modified any of those buffers and, upon request, returns a bitmap of the modified pages. This lets other software components re-paint the portions of the monitor (or monitors) that have changed. Each monitor has a frame buffer of some size at some position in guest physical memory. The set of frame buffers being tracked can change over time as monitors are plugged and unplugged. (Version 3 of this patch.) Signed-Off-By: Robert Phillips --- tools/libxc/xenctrl.h | 17 +- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/hvm.c | 16 +- xen/arch/x86/mm/Makefile | 1 + xen/arch/x86/mm/dirty_vram.c | 992 ++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm/hap/hap.c | 140 +----- xen/arch/x86/mm/paging.c | 196 ++------ xen/arch/x86/mm/shadow/common.c | 335 +++++++------ xen/arch/x86/mm/shadow/multi.c | 174 +++---- xen/arch/x86/mm/shadow/multi.h | 7 +- xen/arch/x86/mm/shadow/types.h | 1 + xen/include/asm-x86/dirty_vram.h | 201 ++++++++ xen/include/asm-x86/hap.h | 4 - xen/include/asm-x86/hvm/domain.h | 2 +- xen/include/asm-x86/paging.h | 17 +- xen/include/asm-x86/shadow.h | 6 - 16 files changed, 1549 insertions(+), 562 deletions(-) create mode 100644 xen/arch/x86/mm/dirty_vram.c create mode 100644 xen/include/asm-x86/dirty_vram.h diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 7eb5743..693d7fe 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1552,15 +1552,20 @@ int xc_hvm_inject_msi( xc_interface *xch, domid_t dom, uint64_t addr, uint32_t data); /* - * Track dirty bit changes in the VRAM area + * Track dirty bit changes in a VRAM region defined by + * [ first_pfn : first_pfn + nr - 1 ] * * All of this is done atomically: - * - get the dirty bitmap since the last call - * - set up dirty tracking area for period up to the next call - * - clear the dirty tracking area. + * - gets the dirty bitmap since the last call, all zeroes for + * the first call with some new region + * - sets up a dirty tracking region for period up to the next call + * - clears the specified dirty tracking region. * - * Returns -ENODATA and does not fill bitmap if the area has changed since the - * last call. + * Creating a new region causes any existing regions that it overlaps + * to be discarded. + * + * Specifying nr == 0 causes all regions to be discarded and + * disables dirty bit tracking. */ int xc_hvm_track_dirty_vram( xc_interface *xch, domid_t dom, diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index eea5555..e374aac 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -22,4 +22,4 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o \ No newline at end of file +obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 34da2f5..3a3e5e4 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +67,7 @@ #include #include #include +#include "../mm/mm-locks.h" bool_t __read_mostly hvm_enabled; @@ -1433,8 +1435,20 @@ int hvm_hap_nested_page_fault(paddr_t gpa, */ if ( access_w ) { + p2m_type_t pt; + pt = p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + + paging_lock(v->domain); + if ( pt == p2m_ram_logdirty ) + { + dv_range_t *range; + v->domain->arch.paging.log_dirty.dirty_count++; + range = dirty_vram_range_find_gfn(v->domain, gfn); + if ( range ) + range->dirty_count++; + } paging_mark_dirty(v->domain, mfn_x(mfn)); - p2m_change_type(v->domain, gfn, p2m_ram_logdirty, p2m_ram_rw); + paging_unlock(v->domain); } rc = 1; goto out_put_gfn; diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile index 73dcdf4..becd0c9 100644 --- a/xen/arch/x86/mm/Makefile +++ b/xen/arch/x86/mm/Makefile @@ -5,6 +5,7 @@ obj-y += paging.o obj-y += p2m.o p2m-pt.o p2m-ept.o p2m-pod.o obj-y += guest_walk_2.o obj-y += guest_walk_3.o +obj-y += dirty_vram.o obj-$(x86_64) += guest_walk_4.o obj-$(x86_64) += mem_event.o obj-$(x86_64) += mem_paging.o diff --git a/xen/arch/x86/mm/dirty_vram.c b/xen/arch/x86/mm/dirty_vram.c new file mode 100644 index 0000000..e3c7c1f --- /dev/null +++ b/xen/arch/x86/mm/dirty_vram.c @@ -0,0 +1,992 @@ +/* + * arch/x86/mm/dirty_vram.c: Bookkeep/query dirty VRAM pages + * with support for multiple frame buffers. + * + * Copyright (c) 2012, Citrix Systems, Inc. (Robert Phillips) + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + */ + + +#include +#include +#include +#include +#include +#include "mm-locks.h" + +#define DEBUG_stop_tracking_all_vram 0 +#define DEBUG_allocating_dirty_vram_range 0 +#define DEBUG_high_water_mark_for_vram_ranges 0 +#define DEBUG_freeing_dirty_vram_range 0 +#define DEBUG_allocate_paddr_links_page 0 +#define DEBUG_update_vram_mapping 0 +#define DEBUG_alloc_paddr_inject_fault 0 + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram; + ASSERT( paging_locked_by_me(d) ); + dirty_vram = d->arch.hvm_domain.dirty_vram = xzalloc(dv_dirty_vram_t); + if ( dirty_vram ) + { + INIT_LIST_HEAD(&dirty_vram->range_head); + INIT_LIST_HEAD(&dirty_vram->ext_head); + } + return dirty_vram; +} + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( !dirty_vram ) + dirty_vram = dirty_vram_alloc(d); + return dirty_vram; +} + + +/* Free domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr, *next; + /* Free all the ranges */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); +#if DEBUG_stop_tracking_all_vram + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] stop tracking all vram\n", + range->begin_pfn, range->end_pfn); +#endif + xfree(range->pl_tab); + xfree(range); + } + /* Free all the extension pages */ + list_for_each_safe(curr, next, &dirty_vram->ext_head) + { + struct dv_paddr_link_ext *ext = + container_of( + curr, struct dv_paddr_link_ext, ext_link); + struct page_info *pg = __virt_to_page(ext); + d->arch.paging.free_page(d, pg); + } + + xfree(dirty_vram); + d->arch.hvm_domain.dirty_vram = NULL; + } +} + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn) +{ + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( gfn >= range->begin_pfn && + gfn < range->end_pfn ) + return range; + } + } + return NULL; +} + +/* + * Returns pointer to dirty vram range matching [begin_pfn .. end_pfn ), + * NULL if none. + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + struct list_head *curr; + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + if ( begin_pfn == range->begin_pfn && + end_pfn == range->end_pfn ) + return range; + } + } + return NULL; +} + +/* Allocate specified dirty_vram range */ +static dv_range_t * +_dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range = NULL; + unsigned long end_pfn = begin_pfn + nr; + dv_pl_entry_t *pl_tab = NULL; + int i; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + +#if DEBUG_allocating_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Allocating dirty vram range hap:%d\n", + begin_pfn, end_pfn, + d->arch.hvm_domain.hap_enabled); +#endif + + range = xzalloc(dv_range_t); + if ( range == NULL ) + goto err_out; + + INIT_LIST_HEAD(&range->range_link); + + range->begin_pfn = begin_pfn; + range->end_pfn = end_pfn; + + if ( !hap_enabled(d) ) + { + if ( (pl_tab = xzalloc_array(dv_pl_entry_t, nr)) == NULL ) + goto err_out; + + for ( i = 0; i != nr; i++ ) + { + pl_tab[i].mapping.sl1ma = INVALID_PADDR; + } + } + + range->pl_tab = pl_tab; + range->mappings_hwm = 1; + + list_add(&range->range_link, &dirty_vram->range_head); + if ( ++dirty_vram->nr_ranges > dirty_vram->ranges_hwm ) + { + dirty_vram->ranges_hwm = dirty_vram->nr_ranges; +#if DEBUG_high_water_mark_for_vram_ranges + gdprintk(XENLOG_DEBUG, + "High water mark for number of vram ranges is now:%d\n", + dirty_vram->ranges_hwm); +#endif + } + return range; + + err_out: + xfree(pl_tab); + xfree(range); + return NULL; +} + + +/* Frees specified dirty_vram range */ +void dirty_vram_range_free(struct domain *d, + dv_range_t *range) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + ASSERT( paging_locked_by_me(d) ); + if ( dirty_vram ) + { + int i, nr = range->end_pfn - range->begin_pfn; + +#if DEBUG_freeing_dirty_vram_range + gdprintk(XENLOG_DEBUG, + "[%05lx:%05lx] Freeing dirty vram range\n", + range->begin_pfn, range->end_pfn); +#endif + + if ( range->pl_tab ) + { + for ( i = 0; i != nr; i++ ) + { + dv_paddr_link_t *plx; + plx = range->pl_tab[i].mapping.pl_next; + /* Does current FB page have multiple mappings? */ + if ( plx ) /* yes */ + { + /* Find the last element in singly-linked list */ + while ( plx->pl_next != NULL ) + plx = plx->pl_next; + + /* Prepend whole list to the free list */ + plx->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = range->pl_tab[i].mapping.pl_next; + } + } + xfree(range->pl_tab); + range->pl_tab = NULL; + } + + /* Remove range from the linked list, free it, and adjust count*/ + list_del(&range->range_link); + xfree(range); + dirty_vram->nr_ranges--; + } +} + +/* + * dirty_vram_range_alloc() + * This function ensures that the new range does not overlap any existing + * ranges -- deleting them if necessary -- and then calls + * _dirty_vram_range_alloc to actually allocate the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + unsigned long end_pfn = begin_pfn + nr; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + struct list_head *curr, *next; + + ASSERT( paging_locked_by_me(d) ); + ASSERT( dirty_vram != NULL ); + + /* + * Ranges cannot overlap so + * free any range that overlaps [ begin_pfn .. end_pfn ) + */ + list_for_each_safe(curr, next, &dirty_vram->range_head) + { + dv_range_t *rng = list_entry(curr, dv_range_t, range_link); + if ( ( ( rng->begin_pfn <= begin_pfn ) && + ( begin_pfn < rng->end_pfn ) + ) || + ( ( begin_pfn <= rng->begin_pfn ) && + ( rng->begin_pfn < end_pfn ) + ) ) + { + /* Different tracking, tear the previous down. */ + dirty_vram_range_free(d, rng); + } + } + + range = _dirty_vram_range_alloc(d, begin_pfn, nr); + if ( !range ) + goto out; + + out: + return range; +} + +/* + * dirty_vram_range_find_or_alloc() + * Find the range for [begin_pfn:begin_pfn+nr). + * If it doesn't exists, create it. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr) +{ + dv_range_t *range; + ASSERT( paging_locked_by_me(d) ); + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + range = dirty_vram_range_alloc(d, begin_pfn, nr); + + return range; +} + + + +/* Allocate a dv_paddr_link struct */ +static dv_paddr_link_t * +alloc_paddr_link(struct domain *d) +{ + dv_paddr_link_t * pl = NULL; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + + ASSERT( paging_locked_by_me(d) ); + BUILD_BUG_ON(sizeof(dv_paddr_link_ext_t) > PAGE_SIZE); + /* Is the list of free pl's empty? */ + if ( dirty_vram->pl_free == NULL ) /* yes */ + { + /* + * Allocate another page of pl's. + * Link them all together and point the free list head at them + */ + int i; + struct page_info *pg = d->arch.paging.alloc_page(d); + dv_paddr_link_ext_t *ext = __page_to_virt(pg); + if ( ext == NULL ) + goto out; + +#if DEBUG_allocate_paddr_links_page + gdprintk(XENLOG_DEBUG, "Allocated another page of paddr_links\n"); +#endif + list_add(&ext->ext_link, &dirty_vram->ext_head); + + /* initialize and link together the new pl entries */ + for ( i = 0; i != ARRAY_SIZE(ext->entries); i++ ) + { + ext->entries[i].sl1ma = INVALID_PADDR; + ext->entries[i].pl_next = &ext->entries[i+1]; + } + ext->entries[ARRAY_SIZE(ext->entries) - 1].pl_next = NULL; + dirty_vram->pl_free = &ext->entries[0]; + } + pl = dirty_vram->pl_free; + dirty_vram->pl_free = pl->pl_next; + + pl->sl1ma = INVALID_PADDR; + pl->pl_next = NULL; + out: + return pl; +} + + +/* + * Free a paddr_link struct. + * + * The caller has walked the singly-linked list of elements + * that have, as their head, an element in a pl_tab cell. + * The list walks has reached the element to be freed. + * (Each element is a dv_paddr_link_t struct.) + * + * @pl points to the element to be freed. + * @ppl points to its predecessor element's next member. + * + * After linking the precessor to the element's successor, + * we can free @pl by prepending it to the list of free + * elements. + * + * As a boundary case (which happens to be the common case), + * @pl points to a cell in the pl_tab rather than to some + * extension element danging from that cell. + * We recognize this case because @ppl is NULL. + * In that case we promote the first extension element by + * copying it into the pl_tab cell and free it. + */ + +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl) +{ + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_paddr_link_t *npl; /* next pl */ + + ASSERT( paging_locked_by_me(d) ); + /* extension mapping? */ + if ( ppl ) /* yes. free it */ + { + ASSERT(pl == (*ppl)); + (*ppl) = npl = pl->pl_next; + } + else /* main table */ + { + /* + * move 2nd mapping to main table. + * and free 2nd mapping + */ + dv_paddr_link_t * spl; + spl = pl->pl_next; + if ( spl == NULL ) + { + pl->sl1ma = INVALID_PADDR; + return pl; + } + pl->sl1ma = spl->sl1ma; + pl->pl_next = spl->pl_next; + npl = pl; /* reprocess main table entry again */ + pl = spl; + } + pl->sl1ma = INVALID_PADDR; + pl->pl_next = dirty_vram->pl_free; + dirty_vram->pl_free = pl; + return npl; +} + + +/* + * dirty_vram_range_update() + * + * This is called whenever a level 1 page table entry is modified. + * If the L1PTE is being cleared, the function removes any paddr_links + * that refer to it. + * If the L1PTE is being set to a frame buffer page, a paddr_link is + * created for that page's entry in pl_tab. + * Returns 1 iff entry found and set or cleared. + */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set) +{ + int effective = 0; + dv_range_t *range; + unsigned long i; + dv_paddr_link_t *pl; + dv_paddr_link_t **ppl; + int len = 0; + + ASSERT(paging_locked_by_me(d)); + range = dirty_vram_range_find_gfn(d, gfn); + if ( !range ) + return effective; + + + i = gfn - range->begin_pfn; + pl = &range->pl_tab[ i ].mapping; + ppl = NULL; + + /* + * find matching entry (pl), if any, and its predecessor + * in linked list (ppl) + */ + while ( pl != NULL ) + { + if ( pl->sl1ma == sl1ma || pl->sl1ma == INVALID_PADDR ) + break; + + ppl = &pl->pl_next; + pl = *ppl; + len++; + } + + if ( set ) + { + /* Did we find sl1ma in either the main table or the linked list? */ + if ( pl == NULL ) /* no, so we'll need to alloc a link */ + { + ASSERT(ppl != NULL); + +#if DEBUG_alloc_paddr_inject_fault + { + static int counter; + + /* Test stuck_dirty logic for some cases */ + if ( (++counter) % 4 == 0 ) + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + gdprintk(XENLOG_DEBUG, + "[%lx] inject stuck dirty fault\n", + gfn ); + goto out; + } + } +#endif + /* + * Have we reached the limit of mappings we're willing + * to bookkeep? + */ + if (len > DV_ADDR_LINK_LIST_LIMIT) /* yes */ + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + + gdprintk(XENLOG_DEBUG, + "[%lx] link limit exceeded\n", + gfn ); + + goto out; + } + + /* alloc link and append it to list */ + (*ppl) = pl = alloc_paddr_link(d); + /* Were we able to allocate a link? */ + if ( pl == NULL ) /* no */ + { + /* Simply mark the frame buffer page as always dirty */ + range->pl_tab[ i ].stuck_dirty = 1; + + gdprintk(XENLOG_DEBUG, + "[%lx] alloc failure\n", + gfn ); + + goto out; + } + } + if ( pl->sl1ma != sl1ma ) + { + ASSERT(pl->sl1ma == INVALID_PADDR); + pl->sl1ma = sl1ma; + range->nr_mappings++; + } + effective = 1; + if ( len > range->mappings_hwm ) + { + range->mappings_hwm = len; +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] set sl1ma:%lx hwm:%d mappings:%d freepages:%d\n", + gfn, sl1ma, + range->mappings_hwm, + range->nr_mappings, + d->arch.paging.shadow.free_pages); +#endif + } + } + else /* clear */ + { + if ( pl && pl->sl1ma == sl1ma ) + { +#if DEBUG_update_vram_mapping + gdprintk(XENLOG_DEBUG, + "[%lx] clear sl1ma:%lx mappings:%d\n", + gfn, sl1ma, + range->nr_mappings - 1); +#endif + free_paddr_link(d, ppl, pl); + --range->nr_mappings; + effective = 1; + } + } + out: + return effective; +} + + +/* + * shadow_scan_dirty_flags() + * This produces a dirty bitmap for the range by examining every + * L1PTE referenced by some dv_paddr_link in the range's pl_tab table. + * It tests and clears each such L1PTE's dirty flag. + */ +static int shadow_scan_dirty_flags(struct domain *d, + dv_range_t *range, + uint8_t *dirty_bitmap) +{ + int flush_tlb = 0; + unsigned long i; + unsigned long nr = range->end_pfn - range->begin_pfn; + + ASSERT( paging_locked_by_me(d) ); + /* Iterate over VRAM to track dirty bits. */ + for ( i = 0; i < nr; i++ ) + { + int dirty = 0, len = 1; + dv_paddr_link_t *pl; + /* Does the frame buffer have an incomplete set of mappings? */ + if ( unlikely(range->pl_tab[i].stuck_dirty) ) /* yes */ + dirty = 1; + else /* The frame buffer's set of mappings is complete. Scan it. */ + for ( pl = &range->pl_tab[i].mapping; pl; pl = pl->pl_next, len++ ) + { + l1_pgentry_t *sl1e; + paddr_t sl1ma = pl->sl1ma; + if (sl1ma == INVALID_PADDR) /* FB page is unmapped */ + continue; + sl1e = maddr_to_virt(sl1ma); + if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) + { + dirty = 1; + /* Clear dirty so we can detect if page gets re-dirtied. + * Note: this is atomic, so we may clear a + * _PAGE_ACCESSED set by another processor. + */ + l1e_remove_flags(*sl1e, _PAGE_DIRTY); + flush_tlb = 1; + } + } /* for */ + + if ( dirty ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + + } + + return flush_tlb; +} + + +/* + * shadow_track_dirty_vram() + * This is the API called by the guest to determine which pages in the range + * from [begin_pfn:begin_pfn+nr) have been dirtied since the last call. + * It creates the domain's dv_dirty_vram on demand. + * It creates ranges on demand when some [begin_pfn:nr) is first encountered. + * To collect the dirty bitmask it calls shadow_scan_dirty_flags(). + * It copies the dirty bitmask into guest storage. + */ +int shadow_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + int rc = 0; + unsigned long end_pfn = begin_pfn + nr; + int flush_tlb = 0; + dv_range_t *range; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + + /* + * This range test is tricky. + * + * The range [begin_pfn..end_pfn) is an open interval, so end_pfn is a pfn + * beyond the end of the range. + * + * p2m->max_mapped_pfn is a valid PFN so p2m->max_mapped_pfn + 1 is an + * invalid PFN. + * + * If end_pfn is beyond *that* then the range is invalid. + */ + if ( end_pfn < begin_pfn + || begin_pfn > p2m->max_mapped_pfn + || end_pfn > p2m->max_mapped_pfn + 1 ) + return -EINVAL; + + paging_lock(d); + + if (!nr) + { + dirty_vram_free(d); + goto out; + } + + if ( guest_handle_is_null(guest_dirty_bitmap) ) + goto out; + + if ( !dirty_vram_find_or_alloc(d) ) + { + rc = -ENOMEM; + goto out; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + range = dirty_vram_range_alloc(d, begin_pfn, nr); + if ( range ) + sh_find_all_vram_mappings(d->vcpu[0], range); + } + if ( range ) + { + int size = (nr + BITS_PER_LONG - 1) / BITS_PER_LONG; + unsigned long dirty_bitmap[size]; + + memset(dirty_bitmap, 0x00, size * BYTES_PER_LONG); + + flush_tlb |= shadow_scan_dirty_flags(d, range, (uint8_t*)dirty_bitmap); + + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + (uint8_t*)dirty_bitmap, + size * BYTES_PER_LONG) == 0 ) + rc = 0; + } + + if ( flush_tlb ) + flush_tlb_mask(d->domain_dirty_cpumask); + +out: + paging_unlock(d); + return rc; +} + + +/************************************************/ +/* HAP VRAM TRACKING SUPPORT */ +/************************************************/ + +/* + * hap_enable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-only. + */ +static int hap_enable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + /* turn on PG_log_dirty bit in paging mode */ + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + + /* + * dirty_vram != NULL iff we're tracking dirty vram. + * If we start tracking dirty pages for all memory then + * the dirty_vram structure is freed. + */ + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table to be read-only. */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] enable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_rw, p2m_ram_logdirty); + } + + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_disable_vram_tracking() + * For all ranges, mark all vram pages in range as logdirty read-write. + */ +static int hap_disable_vram_tracking(struct domain *d) +{ + int rc = 0; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr; + + paging_lock(d); + d->arch.paging.mode &= ~PG_log_dirty; + paging_unlock(d); + + p2m_lock(p2m_get_hostp2m(d)); + paging_lock(d); + + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( !dirty_vram ) + { + rc = -EINVAL; + goto out; + } + + /* set l1e entries of P2M table with normal mode */ + list_for_each(curr, &dirty_vram->range_head) + { + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] disable vram tracking\n", + range->begin_pfn, range->end_pfn); + p2m_change_type_range(d, range->begin_pfn, range->end_pfn, + p2m_ram_logdirty, p2m_ram_rw); + } + flush_tlb_mask(d->domain_dirty_cpumask); + out: + paging_unlock(d); + p2m_unlock(p2m_get_hostp2m(d)); + if ( rc ) + { + paging_lock(d); + d->arch.paging.mode |= PG_log_dirty; + paging_unlock(d); + } + return rc; +} + +/* + * hap_clean_vram_tracking_range() + * For all the pages in the range specified by [begin_pfn,nr), + * note in the dirty bitmap any page that has been marked as read-write, + * which signifies that the page has been dirtied, and reset the page + * to ram_logdirty. + */ +void hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) +{ + int i; + unsigned long pfn; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; + dv_range_t *range; + + ASSERT(p2m_locked_by_me(p2m_get_hostp2m(d))); + ASSERT(paging_locked_by_me(d)); + + if ( !dirty_vram ) + { + gdprintk(XENLOG_DEBUG, + "Should only be called while tracking dirty vram.\n"); + return; + } + + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + return; + + /* set l1e entries of P2M table to be read-only. */ + /* + * On first write, it page faults, its entry is changed to read-write, + * its bit in the dirty bitmap is set, and on retry the write succeeds. + */ + for ( i = 0, pfn = range->begin_pfn; pfn < range->end_pfn; i++, pfn++ ) + { + p2m_type_t pt; + pt = p2m_change_type(d, pfn, p2m_ram_rw, p2m_ram_logdirty); + if ( pt == p2m_ram_rw ) + dirty_bitmap[i >> 3] |= (1 << (i & 7)); + } + flush_tlb_mask(d->domain_dirty_cpumask); +} + +static void hap_vram_tracking_init(struct domain *d) +{ + paging_log_dirty_init(d, hap_enable_vram_tracking, + hap_disable_vram_tracking, + NULL); +} + +/* + * hap_track_dirty_vram() + * Create the domain's dv_dirty_vram struct on demand. + * Create a dirty vram range on demand when some [begin_pfn:begin_pfn+nr] is + * first encountered. + * Collect the guest_dirty bitmask, a bit mask of the dirty vram pages, by + * calling paging_log_dirty_range(). + */ +int hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) +{ + long rc = 0; + dv_dirty_vram_t *dirty_vram; + + paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( nr ) + { + dv_range_t *range = NULL; + int size = ( nr + BITS_PER_LONG - 1 ) & ~( BITS_PER_LONG - 1 ); + uint8_t dirty_bitmap[size]; + bool_t new_range = 0; + + /* Already tracking dirty vram? */ + if ( paging_mode_log_dirty(d) && dirty_vram ) /* yes */ + { + /* Handle the addition of another range */ + range = dirty_vram_range_find(d, begin_pfn, nr); + if ( !range ) + { + rc = -ENOMEM; + if ( !(range = dirty_vram_range_alloc(d, begin_pfn, nr)) ) + goto param_fail; + new_range = 1; + } + } + /* Just starting to track dirty vram? */ + else if ( !paging_mode_log_dirty(d) && !dirty_vram ) /* yes */ + { + rc = -ENOMEM; + if ( !(dirty_vram = dirty_vram_alloc(d)) ) + goto param_fail; + + if ( !(range = dirty_vram_range_find_or_alloc(d, begin_pfn, nr)) ) + goto param_fail; + + new_range = 1; + + /* Initialize callbacks for vram tracking */ + hap_vram_tracking_init(d); + + /* Enable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_enable(d); + paging_lock(d); + + if ( rc != 0 ) + goto param_fail; + } + else + { + /* Test for invalid combination */ + if ( !paging_mode_log_dirty(d) && dirty_vram ) + rc = -EINVAL; + else /* logging dirty of all memory, not tracking dirty vram */ + rc = -ENODATA; + goto param_fail; + } + + paging_unlock(d); + /* Is this query the very first for this range? */ + if ( new_range ) /* yes */ + memset(dirty_bitmap, 0xff, size); /* consider all pages dirty */ + else + { + memset(dirty_bitmap, 0x00, size); + paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); + } + rc = -EFAULT; + if ( copy_to_guest(guest_dirty_bitmap, + dirty_bitmap, + size) == 0 ) + { + rc = 0; + } + } + else + { + /* + * If zero pages specified while already tracking dirty vram + * then stop tracking + */ + if ( paging_mode_log_dirty(d) && dirty_vram ) + { + /* Disable HAP vram tracking */ + paging_unlock(d); + rc = paging_log_dirty_disable(d); + paging_lock(d); + + dirty_vram_free(d); + } + else /* benign no-op */ + { + rc = 0; + } + paging_unlock(d); + } + + return rc; + +param_fail: + dirty_vram_free(d); + paging_unlock(d); + return rc; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index fd99cde..09cdba2 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "private.h" @@ -53,139 +54,6 @@ #define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) /************************************************/ -/* HAP VRAM TRACKING SUPPORT */ -/************************************************/ - -static int hap_enable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - /* turn on PG_log_dirty bit in paging mode */ - paging_lock(d); - d->arch.paging.mode |= PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static int hap_disable_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return -EINVAL; - - paging_lock(d); - d->arch.paging.mode &= ~PG_log_dirty; - paging_unlock(d); - - /* set l1e entries of P2M table with normal mode */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_logdirty, p2m_ram_rw); - - flush_tlb_mask(d->domain_dirty_cpumask); - return 0; -} - -static void hap_clean_vram_tracking(struct domain *d) -{ - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram ) - return; - - /* set l1e entries of P2M table to be read-only. */ - p2m_change_type_range(d, dirty_vram->begin_pfn, dirty_vram->end_pfn, - p2m_ram_rw, p2m_ram_logdirty); - - flush_tlb_mask(d->domain_dirty_cpumask); -} - -static void hap_vram_tracking_init(struct domain *d) -{ - paging_log_dirty_init(d, hap_enable_vram_tracking, - hap_disable_vram_tracking, - hap_clean_vram_tracking); -} - -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - long rc = 0; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( nr ) - { - if ( paging_mode_log_dirty(d) && dirty_vram ) - { - if ( begin_pfn != dirty_vram->begin_pfn || - begin_pfn + nr != dirty_vram->end_pfn ) - { - paging_log_dirty_disable(d); - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - } - else if ( !paging_mode_log_dirty(d) && !dirty_vram ) - { - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto param_fail; - - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = begin_pfn + nr; - d->arch.hvm_domain.dirty_vram = dirty_vram; - hap_vram_tracking_init(d); - rc = paging_log_dirty_enable(d); - if (rc != 0) - goto param_fail; - } - else - { - if ( !paging_mode_log_dirty(d) && dirty_vram ) - rc = -EINVAL; - else - rc = -ENODATA; - goto param_fail; - } - /* get the bitmap */ - rc = paging_log_dirty_range(d, begin_pfn, nr, dirty_bitmap); - } - else - { - if ( paging_mode_log_dirty(d) && dirty_vram ) { - rc = paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } else - rc = 0; - } - - return rc; - -param_fail: - if ( dirty_vram ) - { - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } - return rc; -} - -/************************************************/ /* HAP LOG DIRTY SUPPORT */ /************************************************/ @@ -223,14 +91,12 @@ static void hap_clean_dirty_bitmap(struct domain *d) void hap_logdirty_init(struct domain *d) { - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct dv_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; if ( paging_mode_log_dirty(d) && dirty_vram ) { paging_log_dirty_disable(d); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; + dirty_vram_free(d); } - /* Reinitialize logdirty mechanism */ paging_log_dirty_init(d, hap_enable_log_dirty, hap_disable_log_dirty, diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index ea44e39..55bedde 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -333,8 +334,11 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) mfn_t *l4, *l3, *l2; unsigned long *l1; int i4, i3, i2; + struct p2m_domain *p2m = p2m_get_hostp2m(d); domain_pause(d); + /* Locking hierarchy requires p2m lock to be taken first */ + p2m_lock(p2m); paging_lock(d); clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); @@ -345,6 +349,14 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) d->arch.paging.log_dirty.fault_count, d->arch.paging.log_dirty.dirty_count); + if ( hap_enabled(d) && d->arch.hvm_domain.dirty_vram ) + { + /* If we're cleaning/peeking all guest memory, we should not be tracking + * dirty vram. */ + rv = -EINVAL; + goto out; + } + sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; @@ -424,170 +436,64 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) if ( clean ) { - /* We need to further call clean_dirty_bitmap() functions of specific - * paging modes (shadow or hap). Safe because the domain is paused. */ - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + /* Is null if tracking dirty vram */ + if ( d->arch.paging.log_dirty.clean_dirty_bitmap ) + { + /* + * We need to call clean_dirty_bitmap() functions of specific + * paging modes (shadow or hap). + * Safe because the domain is paused. + */ + d->arch.paging.log_dirty.clean_dirty_bitmap(d); + } } domain_unpause(d); return rv; out: paging_unlock(d); + p2m_unlock(p2m); domain_unpause(d); return rv; } -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap) { - int rv = 0; - unsigned long pages = 0; - mfn_t *l4, *l3, *l2; - unsigned long *l1; - int b1, b2, b3, b4; - int i2, i3, i4; - - d->arch.paging.log_dirty.clean_dirty_bitmap(d); + struct p2m_domain *p2m = p2m_get_hostp2m(d); + dv_range_t *range; + unsigned int range_dirty_count = 0; + + p2m_lock(p2m); paging_lock(d); - PAGING_DEBUG(LOGDIRTY, "log-dirty-range: dom %u faults=%u dirty=%u\n", - d->domain_id, - d->arch.paging.log_dirty.fault_count, - d->arch.paging.log_dirty.dirty_count); - - if ( unlikely(d->arch.paging.log_dirty.failed_allocs) ) { - printk("%s: %d failed page allocs while logging dirty pages\n", - __FUNCTION__, d->arch.paging.log_dirty.failed_allocs); - rv = -ENOMEM; - goto out; - } - - if ( !d->arch.paging.log_dirty.fault_count && - !d->arch.paging.log_dirty.dirty_count ) { - unsigned int size = BITS_TO_LONGS(nr); - - if ( clear_guest(dirty_bitmap, size * BYTES_PER_LONG) != 0 ) - rv = -EFAULT; - goto out; - } - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - - b1 = L1_LOGDIRTY_IDX(begin_pfn); - b2 = L2_LOGDIRTY_IDX(begin_pfn); - b3 = L3_LOGDIRTY_IDX(begin_pfn); - b4 = L4_LOGDIRTY_IDX(begin_pfn); - l4 = paging_map_log_dirty_bitmap(d); - - for ( i4 = b4; - (pages < nr) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + /* Only called when tracking dirty vram in HAP mode */ + ASSERT(hap_enabled(d) && d->arch.hvm_domain.dirty_vram); + + range = dirty_vram_range_find_gfn(d, begin_pfn); + if ( range ) { - l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = b3; - (pages < nr) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) - { - l2 = ((l3 && mfn_valid(l3[i3])) ? - map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 = b2; - (pages < nr) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) - { - unsigned int bytes = PAGE_SIZE; - uint8_t *s; - l1 = ((l2 && mfn_valid(l2[i2])) ? - map_domain_page(mfn_x(l2[i2])) : NULL); - - s = ((uint8_t*)l1) + (b1 >> 3); - bytes -= b1 >> 3; - - if ( likely(((nr - pages + 7) >> 3) < bytes) ) - bytes = (unsigned int)((nr - pages + 7) >> 3); - - if ( !l1 ) - { - if ( clear_guest_offset(dirty_bitmap, pages >> 3, - bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - /* begin_pfn is not 32K aligned, hence we have to bit - * shift the bitmap */ - else if ( b1 & 0x7 ) - { - int i, j; - uint32_t *l = (uint32_t*) s; - int bits = b1 & 0x7; - int bitmask = (1 << bits) - 1; - int size = (bytes + BYTES_PER_LONG - 1) / BYTES_PER_LONG; - unsigned long bitmap[size]; - static unsigned long printed = 0; - - if ( printed != begin_pfn ) - { - dprintk(XENLOG_DEBUG, "%s: begin_pfn %lx is not 32K aligned!\n", - __FUNCTION__, begin_pfn); - printed = begin_pfn; - } - - for ( i = 0; i < size - 1; i++, l++ ) { - bitmap[i] = ((*l) >> bits) | - (((*((uint8_t*)(l + 1))) & bitmask) << (sizeof(*l) * 8 - bits)); - } - s = (uint8_t*) l; - size = BYTES_PER_LONG - ((b1 >> 3) & 0x3); - bitmap[i] = 0; - for ( j = 0; j < size; j++, s++ ) - bitmap[i] |= (*s) << (j * 8); - bitmap[i] = (bitmap[i] >> bits) | (bitmask << (size * 8 - bits)); - if ( copy_to_guest_offset(dirty_bitmap, (pages >> 3), - (uint8_t*) bitmap, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - else - { - if ( copy_to_guest_offset(dirty_bitmap, pages >> 3, - s, bytes) != 0 ) - { - rv = -EFAULT; - goto out; - } - } - - pages += bytes << 3; - if ( l1 ) - { - clear_page(l1); - unmap_domain_page(l1); - } - b1 = b1 & 0x7; - } - b2 = 0; - if ( l2 ) - unmap_domain_page(l2); - } - b3 = 0; - if ( l3 ) - unmap_domain_page(l3); + range_dirty_count = range->dirty_count; + range->dirty_count = 0; } - if ( l4 ) - unmap_domain_page(l4); - - paging_unlock(d); + + if ( !range_dirty_count) + goto out; - return rv; + PAGING_DEBUG(LOGDIRTY, + "log-dirty-range: dom %u [%05lx:%05lx] range_dirty=%u\n", + d->domain_id, + begin_pfn, + range->end_pfn, + range_dirty_count); + hap_clean_vram_tracking_range(d, begin_pfn, nr, dirty_bitmap); out: paging_unlock(d); - return rv; + p2m_unlock(p2m); + return; } /* Note that this function takes three function pointers. Callers must supply diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index ce79131..56afd16 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "private.h" @@ -3121,12 +3122,7 @@ void shadow_teardown(struct domain *d) * calls now that we've torn down the bitmap */ d->arch.paging.mode &= ~PG_log_dirty; - if (d->arch.hvm_domain.dirty_vram) { - xfree(d->arch.hvm_domain.dirty_vram->sl1ma); - xfree(d->arch.hvm_domain.dirty_vram->dirty_bitmap); - xfree(d->arch.hvm_domain.dirty_vram); - d->arch.hvm_domain.dirty_vram = NULL; - } + dirty_vram_free(d); paging_unlock(d); @@ -3463,179 +3459,212 @@ void shadow_clean_dirty_bitmap(struct domain *d) /**************************************************************************/ -/* VRAM dirty tracking support */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) -{ - int rc; - unsigned long end_pfn = begin_pfn + nr; - unsigned long dirty_size = (nr + 7) / 8; - int flush_tlb = 0; - unsigned long i; - p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - if (end_pfn < begin_pfn - || begin_pfn > p2m->max_mapped_pfn - || end_pfn >= p2m->max_mapped_pfn) - return -EINVAL; - - /* We perform p2m lookups, so lock the p2m upfront to avoid deadlock */ - p2m_lock(p2m_get_hostp2m(d)); - paging_lock(d); +/* Support functions for shadow-based dirty VRAM code */ - if ( dirty_vram && (!nr || - ( begin_pfn != dirty_vram->begin_pfn - || end_pfn != dirty_vram->end_pfn )) ) - { - /* Different tracking, tear the previous down. */ - gdprintk(XENLOG_INFO, "stopping tracking VRAM %lx - %lx\n", dirty_vram->begin_pfn, dirty_vram->end_pfn); - xfree(dirty_vram->sl1ma); - xfree(dirty_vram->dirty_bitmap); - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; - } +#define DEBUG_unshadow_sl1ma 0 +#define DEBUG_unshadow_sl1ma_detail 0 +#define DEBUG_count_initial_mappings 1 - if ( !nr ) +/* smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn) +{ + static unsigned int l1_shadow_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + struct domain *d = v->domain; + dv_dirty_vram_t *dirty_vram; + struct list_head *curr, *next; + + ASSERT(paging_locked_by_me(d)); + /* Ignore all but level 1 shadows */ + + if ( (l1_shadow_mask & (1 << shadow_type)) == 0 ) { - rc = 0; goto out; } - /* This should happen seldomly (Video mode change), - * no need to be careful. */ + dirty_vram = d->arch.hvm_domain.dirty_vram; if ( !dirty_vram ) { - /* Throw away all the shadows rather than walking through them - * up to nr times getting rid of mappings of each pfn */ - shadow_blow_tables(d); - - gdprintk(XENLOG_INFO, "tracking VRAM %lx - %lx\n", begin_pfn, end_pfn); - - rc = -ENOMEM; - if ( (dirty_vram = xmalloc(struct sh_dirty_vram)) == NULL ) - goto out; - dirty_vram->begin_pfn = begin_pfn; - dirty_vram->end_pfn = end_pfn; - d->arch.hvm_domain.dirty_vram = dirty_vram; - - if ( (dirty_vram->sl1ma = xmalloc_array(paddr_t, nr)) == NULL ) - goto out_dirty_vram; - memset(dirty_vram->sl1ma, ~0, sizeof(paddr_t) * nr); - - if ( (dirty_vram->dirty_bitmap = xzalloc_array(uint8_t, dirty_size)) == NULL ) - goto out_sl1ma; - - dirty_vram->last_dirty = NOW(); - - /* Tell the caller that this time we could not track dirty bits. */ - rc = -ENODATA; - } - else if (dirty_vram->last_dirty == -1) - { - /* still completely clean, just copy our empty bitmap */ - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) - rc = 0; + goto out; } - else + + list_for_each_safe(curr, next, &dirty_vram->range_head) { - /* Iterate over VRAM to track dirty bits. */ - for ( i = 0; i < nr; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, begin_pfn + i, &t); - struct page_info *page; - int dirty = 0; - paddr_t sl1ma = dirty_vram->sl1ma[i]; - - if (mfn_x(mfn) == INVALID_MFN) - { - dirty = 1; - } - else + dv_range_t *range = list_entry(curr, dv_range_t, range_link); + unsigned long i; + int max_mappings = 1, mappings = 0; + int unshadowed = 0; + for ( i = 0; i != range->end_pfn - range->begin_pfn; i++ ) + { + dv_paddr_link_t *pl = &range->pl_tab[ i ].mapping; + dv_paddr_link_t **ppl = NULL; + mappings = 0; + + while ( pl != NULL ) { - page = mfn_to_page(mfn); - switch (page->u.inuse.type_info & PGT_count_mask) - { - case 0: - /* No guest reference, nothing to track. */ - break; - case 1: - /* One guest reference. */ - if ( sl1ma == INVALID_PADDR ) - { - /* We don't know which sl1e points to this, too bad. */ - dirty = 1; - /* TODO: Heuristics for finding the single mapping of - * this gmfn */ - flush_tlb |= sh_remove_all_mappings(d->vcpu[0], mfn); - } - else - { - /* Hopefully the most common case: only one mapping, - * whose dirty bit we can use. */ - l1_pgentry_t *sl1e = maddr_to_virt(sl1ma); - - if ( l1e_get_flags(*sl1e) & _PAGE_DIRTY ) - { - dirty = 1; - /* Note: this is atomic, so we may clear a - * _PAGE_ACCESSED set by another processor. */ - l1e_remove_flags(*sl1e, _PAGE_DIRTY); - flush_tlb = 1; - } - } - break; - default: - /* More than one guest reference, - * we don't afford tracking that. */ - dirty = 1; + paddr_t sl1ma = pl->sl1ma; + unsigned long sl1mn; + + if ( sl1ma == INVALID_PADDR ) break; + + sl1mn = sl1ma >> PAGE_SHIFT; + if ( sl1mn == mfn_x(smfn) ) { +#if DEBUG_unshadow_sl1ma_detail + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%lx] unshadow sl1ma:%lx\n", + mfn_x(smfn), + range->begin_pfn + i, + sl1ma); +#endif + unshadowed++; + pl = free_paddr_link(d, ppl, pl); + --range->nr_mappings; + } + else + { + ppl = &pl->pl_next; + pl = *ppl; + mappings++; } } - - if ( dirty ) + } + if ( mappings > max_mappings ) + max_mappings = mappings; + + if ( unshadowed ) { +#if DEBUG_unshadow_sl1ma + gdprintk(XENLOG_DEBUG, + "[%lx] gfn[%05lx:%05lx] unshadowed:%d mappings:0x%x max_mappings:%d\n", + mfn_x(smfn), + range->begin_pfn, range->end_pfn, + unshadowed, range->nr_mappings, max_mappings); +#endif + if ( range->nr_mappings == 0 ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + dirty_vram_range_free(d, range); } } + } + out: + return; +} + + +typedef int (*hash_pfn_callback_t)(struct vcpu *v, + mfn_t smfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); + +static int hash_pfn_foreach(struct vcpu *v, + unsigned int callback_mask, + hash_pfn_callback_t callbacks[], + unsigned long begin_pfn, + unsigned long end_pfn) +/* Walk the hash table looking at the types of the entries and + * calling the appropriate callback function for each entry. + * The mask determines which shadow types we call back for, and the array + * of callbacks tells us which function to call. + * Any callback may return non-zero to let us skip the rest of the scan. + * + * WARNING: Callbacks MUST NOT add or remove hash entries unless they + * then return non-zero to terminate the scan. */ +{ + int i, done = 0, removed = 0; + struct domain *d = v->domain; + struct page_info *x; + + /* Say we're here, to stop hash-lookups reordering the chains */ + ASSERT(paging_locked_by_me(d)); + ASSERT(d->arch.paging.shadow.hash_walking == 0); + d->arch.paging.shadow.hash_walking = 1; - rc = -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) == 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + for ( i = 0; i < SHADOW_HASH_BUCKETS; i++ ) + { + /* WARNING: This is not safe against changes to the hash table. + * The callback *must* return non-zero if it has inserted or + * deleted anything from the hash (lookups are OK, though). */ + for ( x = d->arch.paging.shadow.hash_table[i]; x; x = next_shadow(x) ) + { + if ( callback_mask & (1 << x->u.sh.type) ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i = begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn = get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) != INVALID_MFN) - flush_tlb |= sh_remove_write_access(d->vcpu[0], mfn, 1, 0); - } - dirty_vram->last_dirty = -1; + ASSERT(x->u.sh.type <= 15); + ASSERT(callbacks[x->u.sh.type] != NULL); + done = callbacks[x->u.sh.type](v, page_to_mfn(x), + begin_pfn, end_pfn, + &removed); + if ( done ) break; } - rc = 0; } + if ( done ) break; } - if ( flush_tlb ) - flush_tlb_mask(d->domain_dirty_cpumask); - goto out; + d->arch.paging.shadow.hash_walking = 0; + return removed; +} -out_sl1ma: - xfree(dirty_vram->sl1ma); -out_dirty_vram: - xfree(dirty_vram); - dirty_vram = d->arch.hvm_domain.dirty_vram = NULL; +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range) +{ + /* Dispatch table for getting per-type functions */ + static hash_pfn_callback_t callbacks[SH_type_unused] = { + NULL, /* none */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* l1_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 2), /* fl1_32 */ + NULL, /* l2_32 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* l1_pae */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 3), /* fl1_pae */ + NULL, /* l2_pae */ + NULL, /* l2h_pae */ +#if CONFIG_PAGING_LEVELS >= 4 + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* l1_64 */ + SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, 4), /* fl1_64 */ +#else + NULL, /* l1_64 */ + NULL, /* fl1_64 */ +#endif + NULL, /* l2_64 */ + NULL, /* l2h_64 */ + NULL, /* l3_64 */ + NULL, /* l4_64 */ + NULL, /* p2m */ + NULL /* unused */ + }; -out: - paging_unlock(d); - p2m_unlock(p2m_get_hostp2m(d)); - return rc; + static unsigned int callback_mask = + 1 << SH_type_l1_32_shadow + | 1 << SH_type_fl1_32_shadow + | 1 << SH_type_l1_pae_shadow + | 1 << SH_type_fl1_pae_shadow + | 1 << SH_type_l1_64_shadow + | 1 << SH_type_fl1_64_shadow + ; + + perfc_incr(shadow_mappings); + + hash_pfn_foreach(v, callback_mask, callbacks, + range->begin_pfn, + range->end_pfn); + +#if DEBUG_count_initial_mappings + gdprintk(XENLOG_DEBUG, "[%05lx:%05lx] count of initial mappings:%d\n", + range->begin_pfn, range->end_pfn, + range->nr_mappings); +#endif } + /**************************************************************************/ /* Shadow-control XEN_DOMCTL dispatcher */ diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b0e6d72..9c00574 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +150,10 @@ delete_fl1_shadow_status(struct vcpu *v, gfn_t gfn, mfn_t smfn) SHADOW_PRINTK("gfn=%"SH_PRI_gfn", type=%08x, smfn=%05lx\n", gfn_x(gfn), SH_type_fl1_shadow, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); + shadow_hash_delete(v, gfn_x(gfn), SH_type_fl1_shadow, smfn); } @@ -160,6 +165,10 @@ delete_shadow_status(struct vcpu *v, mfn_t gmfn, u32 shadow_type, mfn_t smfn) v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), shadow_type, mfn_x(smfn)); ASSERT(mfn_to_page(smfn)->u.sh.head); + + /* Removing any dv_paddr_links to the erstwhile shadow page */ + dirty_vram_delete_shadow(v, mfn_x(gmfn), shadow_type, smfn); + shadow_hash_delete(v, mfn_x(gmfn), shadow_type, smfn); /* 32-on-64 PV guests don't own their l4 pages; see set_shadow_status */ if ( !is_pv_32on64_vcpu(v) || shadow_type != SH_type_l4_64_shadow ) @@ -516,7 +525,6 @@ _sh_propagate(struct vcpu *v, guest_l1e_t guest_entry = { guest_intpte }; shadow_l1e_t *sp = shadow_entry_ptr; struct domain *d = v->domain; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; gfn_t target_gfn = guest_l1e_get_gfn(guest_entry); u32 pass_thru_flags; u32 gflags, sflags; @@ -663,17 +671,6 @@ _sh_propagate(struct vcpu *v, } } - if ( unlikely((level == 1) && dirty_vram - && dirty_vram->last_dirty == -1 - && gfn_x(target_gfn) >= dirty_vram->begin_pfn - && gfn_x(target_gfn) < dirty_vram->end_pfn) ) - { - if ( ft & FETCH_TYPE_WRITE ) - dirty_vram->last_dirty = NOW(); - else - sflags &= ~_PAGE_RW; - } - /* Read-only memory */ if ( p2m_is_readonly(p2mt) || (p2mt == p2m_mmio_direct && @@ -1072,101 +1069,60 @@ static int shadow_set_l2e(struct vcpu *v, return flags; } -static inline void shadow_vram_get_l1e(shadow_l1e_t new_sl1e, +/* shadow_vram_fix_l1e() + * + * Tests L1PTEs as they are modified, looking for when they start to + * (or cease to) point to frame buffer pages. If the old and new gfns differ, + * calls dirty_vram_range_update() to updates the dirty_vram structures. + */ +static inline void shadow_vram_fix_l1e(shadow_l1e_t old_sl1e, + shadow_l1e_t new_sl1e, shadow_l1e_t *sl1e, mfn_t sl1mfn, struct domain *d) { - mfn_t mfn = shadow_l1e_get_mfn(new_sl1e); - int flags = shadow_l1e_get_flags(new_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + mfn_t new_mfn, old_mfn; + unsigned long new_gfn = INVALID_M2P_ENTRY, old_gfn = INVALID_M2P_ENTRY; + paddr_t sl1ma; + dv_dirty_vram_t *dirty_vram = d->arch.hvm_domain.dirty_vram; - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ + if ( !dirty_vram ) return; - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); + sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) | ((unsigned long)sl1e & ~PAGE_MASK); - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + old_mfn = shadow_l1e_get_mfn(old_sl1e); + + if ( !sh_l1e_is_magic(old_sl1e) && + (l1e_get_flags(old_sl1e) & _PAGE_PRESENT) && + mfn_valid(old_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - /* Initial guest reference, record it */ - dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + old_gfn = mfn_to_gfn(d, old_mfn); } -} - -static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, - shadow_l1e_t *sl1e, - mfn_t sl1mfn, - struct domain *d) -{ - mfn_t mfn = shadow_l1e_get_mfn(old_sl1e); - int flags = shadow_l1e_get_flags(old_sl1e); - unsigned long gfn; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; - - if ( !dirty_vram /* tracking disabled? */ - || !(flags & _PAGE_RW) /* read-only mapping? */ - || !mfn_valid(mfn) ) /* mfn can be invalid in mmio_direct */ - return; - - gfn = mfn_to_gfn(d, mfn); - /* Page sharing not supported on shadow PTs */ - BUG_ON(SHARED_M2P(gfn)); - - if ( (gfn >= dirty_vram->begin_pfn) && (gfn < dirty_vram->end_pfn) ) + + new_mfn = shadow_l1e_get_mfn(new_sl1e); + if ( !sh_l1e_is_magic(new_sl1e) && + (l1e_get_flags(new_sl1e) & _PAGE_PRESENT) && + mfn_valid(new_mfn)) { - unsigned long i = gfn - dirty_vram->begin_pfn; - struct page_info *page = mfn_to_page(mfn); - int dirty = 0; - paddr_t sl1ma = pfn_to_paddr(mfn_x(sl1mfn)) - | ((unsigned long)sl1e & ~PAGE_MASK); + new_gfn = mfn_to_gfn(d, new_mfn); + } - if ( (page->u.inuse.type_info & PGT_count_mask) == 1 ) - { - /* Last reference */ - if ( dirty_vram->sl1ma[i] == INVALID_PADDR ) { - /* We didn't know it was that one, let's say it is dirty */ - dirty = 1; - } - else - { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); - dirty_vram->sl1ma[i] = INVALID_PADDR; - if ( flags & _PAGE_DIRTY ) - dirty = 1; - } - } - else + if ( old_gfn == new_gfn ) return; + + if ( VALID_M2P(old_gfn) ) + if ( dirty_vram_range_update(d, old_gfn, sl1ma, 0/*clear*/) ) { - /* We had more than one reference, just consider the page dirty. */ - dirty = 1; - /* Check that it's not the one we recorded. */ - if ( dirty_vram->sl1ma[i] == sl1ma ) - { - /* Too bad, we remembered the wrong one... */ - dirty_vram->sl1ma[i] = INVALID_PADDR; - } - else - { - /* Ok, our recorded sl1e is still pointing to this page, let's - * just hope it will remain. */ - } + SHADOW_PRINTK("gfn %lx (mfn %lx) cleared vram pte\n", + old_gfn, mfn_x(old_mfn)); } - if ( dirty ) + + if ( VALID_M2P(new_gfn) ) + if ( dirty_vram_range_update(d, new_gfn, sl1ma, 1/*set*/) ) { - dirty_vram->dirty_bitmap[i / 8] |= 1 << (i % 8); - dirty_vram->last_dirty = NOW(); + SHADOW_PRINTK("gfn %lx (mfn %lx) set vram pte\n", + new_gfn, mfn_x(new_mfn)); } - } } static int shadow_set_l1e(struct vcpu *v, @@ -1211,12 +1167,13 @@ static int shadow_set_l1e(struct vcpu *v, shadow_l1e_remove_flags(new_sl1e, _PAGE_RW); /* fall through */ case 0: - shadow_vram_get_l1e(new_sl1e, sl1e, sl1mfn, d); break; } } } + shadow_vram_fix_l1e(old_sl1e, new_sl1e, sl1e, sl1mfn, d); + /* Write the new entry */ shadow_write_entries(sl1e, &new_sl1e, 1, sl1mfn); flags |= SHADOW_SET_CHANGED; @@ -1231,7 +1188,6 @@ static int shadow_set_l1e(struct vcpu *v, * trigger a flush later. */ if ( shadow_mode_refcounts(d) ) { - shadow_vram_put_l1e(old_sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(old_sl1e, d); TRACE_SHADOW_PATH_FLAG(TRCE_SFLAG_SHADOW_L1_PUT_REF); } @@ -2018,7 +1974,6 @@ void sh_destroy_l1_shadow(struct vcpu *v, mfn_t smfn) SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, 0, { if ( (shadow_l1e_get_flags(*sl1e) & _PAGE_PRESENT) && !sh_l1e_is_magic(*sl1e) ) { - shadow_vram_put_l1e(*sl1e, sl1e, sl1mfn, d); shadow_put_page_from_l1e(*sl1e, d); } }); @@ -4336,6 +4291,37 @@ int sh_rm_mappings_from_l1(struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn) return done; } + +int sh_find_vram_mappings_in_l1(struct vcpu *v, + mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed) +/* Find all VRAM mappings in this shadow l1 table */ +{ + struct domain *d = v->domain; + shadow_l1e_t *sl1e; + int done = 0; + + /* only returns _PAGE_PRESENT entries */ + SHADOW_FOREACH_L1E(sl1mfn, sl1e, 0, done, + { + unsigned long gfn; + mfn_t gmfn = shadow_l1e_get_mfn(*sl1e); + if ( !mfn_valid(gmfn) ) + continue; + gfn = mfn_to_gfn(d, gmfn); + if ( VALID_M2P(gfn) && (begin_pfn <= gfn) && (gfn < end_pfn) ) + { + paddr_t sl1ma = + pfn_to_paddr(mfn_x(sl1mfn)) | + ( (unsigned long)sl1e & ~PAGE_MASK ); + dirty_vram_range_update(v->domain, gfn, sl1ma, 1/*set*/); + } + }); + return 0; +} + /**************************************************************************/ /* Functions to excise all pointers to shadows from higher-level shadows. */ diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h index 835121e..436a4ac 100644 --- a/xen/arch/x86/mm/shadow/multi.h +++ b/xen/arch/x86/mm/shadow/multi.h @@ -66,7 +66,12 @@ SHADOW_INTERNAL_NAME(sh_rm_write_access_from_l1, GUEST_LEVELS) extern int SHADOW_INTERNAL_NAME(sh_rm_mappings_from_l1, GUEST_LEVELS) (struct vcpu *v, mfn_t sl1mfn, mfn_t target_mfn); - +extern int +SHADOW_INTERNAL_NAME(sh_find_vram_mappings_in_l1, GUEST_LEVELS) + (struct vcpu *v, mfn_t sl1mfn, + unsigned long begin_pfn, + unsigned long end_pfn, + int *removed); extern void SHADOW_INTERNAL_NAME(sh_clear_shadow_entry, GUEST_LEVELS) (struct vcpu *v, void *ep, mfn_t smfn); diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 43ce1db..5b0f9f7 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -229,6 +229,7 @@ static inline shadow_l4e_t shadow_l4e_from_mfn(mfn_t mfn, u32 flags) #define sh_update_cr3 INTERNAL_NAME(sh_update_cr3) #define sh_rm_write_access_from_l1 INTERNAL_NAME(sh_rm_write_access_from_l1) #define sh_rm_mappings_from_l1 INTERNAL_NAME(sh_rm_mappings_from_l1) +#define sh_find_vram_mappings_in_l1 INTERNAL_NAME(sh_find_vram_mappings_in_l1) #define sh_remove_l1_shadow INTERNAL_NAME(sh_remove_l1_shadow) #define sh_remove_l2_shadow INTERNAL_NAME(sh_remove_l2_shadow) #define sh_remove_l3_shadow INTERNAL_NAME(sh_remove_l3_shadow) diff --git a/xen/include/asm-x86/dirty_vram.h b/xen/include/asm-x86/dirty_vram.h new file mode 100644 index 0000000..95637de --- /dev/null +++ b/xen/include/asm-x86/dirty_vram.h @@ -0,0 +1,201 @@ +/****************************************************************************** + * include/asm-x86/dirty_vram.h + * + * Interface for tracking dirty VRAM pages + * + * Copyright (c) 2012 Citrix Systems, Inc. (Robert Phillips) + * Parts of this code are Copyright (c) 2006 by XenSource Inc. + * Parts of this code are Copyright (c) 2006 by Michael A Fetterman + * Parts based on earlier work by Michael A Fetterman, Ian Pratt et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _DIRTY_VRAM_H +#define _DIRTY_VRAM_H + +/* + * In shadow mode we need to bookkeep all the L1 page table entries that + * map a frame buffer page. Struct dv_paddr_link does this + * by recording the address of a L1 page table entry for some frame buffer page. + * Also has a link to additional pl entries if the frame buffer page + * has multiple mappings. + * In practice very few pages have multiple mappings. + * But to rule out some pathological situation, we limit the number of + * mappings we're willing to bookkeep. + */ + +#define DV_ADDR_LINK_LIST_LIMIT 20 + +typedef struct dv_paddr_link { + paddr_t sl1ma; + struct dv_paddr_link *pl_next; +} dv_paddr_link_t; + +typedef struct dv_pl_entry { + dv_paddr_link_t mapping; + bool_t stuck_dirty; +} dv_pl_entry_t; + +/* + * This defines an extension page of pl entries for FB pages with multiple + * mappings. All such pages (of a domain) are linked together. + */ +typedef struct dv_paddr_link_ext { + struct list_head ext_link; + dv_paddr_link_t entries[ ( PAGE_SIZE - sizeof( struct list_head ) ) / + sizeof( dv_paddr_link_t ) ]; +} dv_paddr_link_ext_t; + +/* + * This defines a single frame buffer range. It bookkeeps all the level 1 PTEs + * that map guest pages within that range. + * All such ranges (of a domain) are linked together. + */ +typedef struct dv_range { + struct list_head range_link; /* the several ranges form a linked list */ + unsigned long begin_pfn; + unsigned long end_pfn; + dv_pl_entry_t *pl_tab; /* table has 1 pl entry per pfn in range */ + int nr_mappings; /* total number of mappings in this range */ + int mappings_hwm; /* high water mark of max mapping count */ + unsigned int dirty_count; +} dv_range_t; + +/* + * This contains all the data structures required by a domain to + * bookkeep the dirty pages within its frame buffers. + */ +typedef struct dv_dirty_vram { + struct list_head range_head; /* head of the linked list of ranges */ + struct list_head ext_head; /* head of list of extension pages */ + dv_paddr_link_t *pl_free; /* free list of pl's within extension pages */ + int nr_ranges; /* bookkeeps number of ranges */ + int ranges_hwm; /* high water mark of max number of ranges */ +} dv_dirty_vram_t; + +/* Allocates domain's dirty_vram structure */ +dv_dirty_vram_t * +dirty_vram_alloc(struct domain *d); + +/* + * Returns domain's dirty_vram structure, + * allocating it if necessary + */ +dv_dirty_vram_t * +dirty_vram_find_or_alloc(struct domain *d); + +/* Frees domain's dirty_vram structure */ +void dirty_vram_free(struct domain *d); + +/* Returns dirty vram range containing gfn, NULL if none */ +struct dv_range * +dirty_vram_range_find_gfn(struct domain *d, + unsigned long gfn); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * NULL if none + */ +dv_range_t * +dirty_vram_range_find(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Allocate dirty vram range containing [ begin_pfn .. begin_pfn+nr ), + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +/* + * Returns dirty vram range matching [ begin_pfn .. begin_pfn+nr ), + * creating a range if none already exists and + * freeing any existing range that overlaps the new range. + */ +dv_range_t * +dirty_vram_range_find_or_alloc(struct domain *d, + unsigned long begin_pfn, + unsigned long nr); + +void dirty_vram_range_free(struct domain *d, + dv_range_t *range); + +/* Bookkeep PTE address of a frame buffer page */ +int dirty_vram_range_update(struct domain *d, + unsigned long gfn, + paddr_t sl1ma, + int set); + +/* + * smfn is no longer a shadow page. Remove it from any + * dirty vram range mapping. + */ +void +dirty_vram_delete_shadow(struct vcpu *v, + unsigned long gfn, + unsigned int shadow_type, + mfn_t smfn); + + +/* + * Scan all the L1 tables looking for VRAM mappings. + * Record them in the domain's dv_dirty_vram structure + */ +void sh_find_all_vram_mappings(struct vcpu *v, + dv_range_t *range); + +/* + * Free a paddr_link struct, given address of its + * predecessor in singly-linked list + */ +dv_paddr_link_t * +free_paddr_link(struct domain *d, + dv_paddr_link_t **ppl, + dv_paddr_link_t *pl); + + +/* Enable VRAM dirty tracking. */ +int +shadow_track_dirty_vram(struct domain *d, + unsigned long first_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +int +hap_track_dirty_vram(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); + +void +hap_clean_vram_tracking_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); + +#endif /* _DIRTY_VRAM_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 916a35b..3e3a1f5 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -57,10 +57,6 @@ void hap_final_teardown(struct domain *d); void hap_teardown(struct domain *d); void hap_vcpu_init(struct vcpu *v); void hap_logdirty_init(struct domain *d); -int hap_track_dirty_vram(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..6146542 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -74,7 +74,7 @@ struct hvm_domain { struct list_head pinned_cacheattr_ranges; /* VRAM dirty support. */ - struct sh_dirty_vram *dirty_vram; + struct dv_dirty_vram * dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or * mtrr/pat between vcpus is not the same, set is_in_uc_mode diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 9a40f2c..f96ca3b 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -137,10 +137,10 @@ struct paging_mode { void paging_free_log_dirty_bitmap(struct domain *d); /* get the dirty bitmap for a specific range of pfns */ -int paging_log_dirty_range(struct domain *d, - unsigned long begin_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); +void paging_log_dirty_range(struct domain *d, + unsigned long begin_pfn, + unsigned long nr, + uint8_t *dirty_bitmap); /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); @@ -183,15 +183,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn); #define L4_LOGDIRTY_IDX(pfn) 0 #endif -/* VRAM dirty tracking support */ -struct sh_dirty_vram { - unsigned long begin_pfn; - unsigned long end_pfn; - paddr_t *sl1ma; - uint8_t *dirty_bitmap; - s_time_t last_dirty; -}; - /***************************************************************************** * Entry points into the paging-assistance code */ diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 2eb6efc..940d7fd 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -62,12 +62,6 @@ void shadow_vcpu_init(struct vcpu *v); /* Enable an arbitrary shadow mode. Call once at domain creation. */ int shadow_enable(struct domain *d, u32 mode); -/* Enable VRAM dirty bit tracking. */ -int shadow_track_dirty_vram(struct domain *d, - unsigned long first_pfn, - unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap); - /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 23:03:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 23:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY31a-00057T-3o; Mon, 12 Nov 2012 23:02:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY31Z-00057O-8Z for xen-devel@lists.xen.org; Mon, 12 Nov 2012 23:02:37 +0000 Received: from [85.158.143.35:37577] by server-3.bemta-4.messagelabs.com id 74/51-06841-C0081A05; Mon, 12 Nov 2012 23:02:36 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352761354!11965630!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27811 invoked from network); 12 Nov 2012 23:02:36 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 23:02:36 -0000 Received: by mail-ob0-f173.google.com with SMTP id x4so1016473obh.32 for ; Mon, 12 Nov 2012 15:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=l6rWfotPuckpNd79FvIHUW/5Sv02mtkXn2bzLYrB1oc=; b=dtRT2sNSy+madv6YdknYX1/6gytPMh3sON9uFY+2u3u10sPXuO5AWARHb2tb54cUKz QK+qWTDAhD0Z98Nh/cdUobWsO3LJw0gyKGCl4w+/n5nAAHDv68BI0mTxdymXO9TR8i3u e6erlR74iiff58sC0Khjll2VkOo4G0TIOyeEVb2JwfX0lZ9+w0MgUoP1GPbBEaNkksws Nn7io4CNSkAGs8qr0V209Uj7OxCROvz/H7MSOZ2qaCcDJOzY6JMiAwXsv+o0DOsy82CK fhxva6vXqXhCuXzu1SBcR/DZT2ppujJfOajHBhRGsU+PJfwMJTdvswYKHPCdyh1x9pL+ b6ow== MIME-Version: 1.0 Received: by 10.182.146.46 with SMTP id sz14mr16330987obb.76.1352761354548; Mon, 12 Nov 2012 15:02:34 -0800 (PST) Received: by 10.76.171.130 with HTTP; Mon, 12 Nov 2012 15:02:34 -0800 (PST) In-Reply-To: <3f722899-a618-4388-8a09-e68fc50c1a70@default> References: <3f722899-a618-4388-8a09-e68fc50c1a70@default> Date: Tue, 13 Nov 2012 12:02:34 +1300 Message-ID: From: Matthew Daley To: Dan Magenheimer Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 13, 2012 at 5:30 AM, Dan Magenheimer wrote: > Did you see this on an actual save/restore or just by inspection? > This should only happen as a result of a buggy toolstack so I'm > wondering if fixing this hides a toolstack bug. Just by inspection of the hypervisor side, so there's no need to worry about the toolstack. - Matthew _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 23:03:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 23:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY31a-00057T-3o; Mon, 12 Nov 2012 23:02:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY31Z-00057O-8Z for xen-devel@lists.xen.org; Mon, 12 Nov 2012 23:02:37 +0000 Received: from [85.158.143.35:37577] by server-3.bemta-4.messagelabs.com id 74/51-06841-C0081A05; Mon, 12 Nov 2012 23:02:36 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352761354!11965630!1 X-Originating-IP: [209.85.214.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27811 invoked from network); 12 Nov 2012 23:02:36 -0000 Received: from mail-ob0-f173.google.com (HELO mail-ob0-f173.google.com) (209.85.214.173) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 23:02:36 -0000 Received: by mail-ob0-f173.google.com with SMTP id x4so1016473obh.32 for ; Mon, 12 Nov 2012 15:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=l6rWfotPuckpNd79FvIHUW/5Sv02mtkXn2bzLYrB1oc=; b=dtRT2sNSy+madv6YdknYX1/6gytPMh3sON9uFY+2u3u10sPXuO5AWARHb2tb54cUKz QK+qWTDAhD0Z98Nh/cdUobWsO3LJw0gyKGCl4w+/n5nAAHDv68BI0mTxdymXO9TR8i3u e6erlR74iiff58sC0Khjll2VkOo4G0TIOyeEVb2JwfX0lZ9+w0MgUoP1GPbBEaNkksws Nn7io4CNSkAGs8qr0V209Uj7OxCROvz/H7MSOZ2qaCcDJOzY6JMiAwXsv+o0DOsy82CK fhxva6vXqXhCuXzu1SBcR/DZT2ppujJfOajHBhRGsU+PJfwMJTdvswYKHPCdyh1x9pL+ b6ow== MIME-Version: 1.0 Received: by 10.182.146.46 with SMTP id sz14mr16330987obb.76.1352761354548; Mon, 12 Nov 2012 15:02:34 -0800 (PST) Received: by 10.76.171.130 with HTTP; Mon, 12 Nov 2012 15:02:34 -0800 (PST) In-Reply-To: <3f722899-a618-4388-8a09-e68fc50c1a70@default> References: <3f722899-a618-4388-8a09-e68fc50c1a70@default> Date: Tue, 13 Nov 2012 12:02:34 +1300 Message-ID: From: Matthew Daley To: Dan Magenheimer Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] tmem: Prevent NULL dereference on error case X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 13, 2012 at 5:30 AM, Dan Magenheimer wrote: > Did you see this on an actual save/restore or just by inspection? > This should only happen as a result of a buggy toolstack so I'm > wondering if fixing this hides a toolstack bug. Just by inspection of the hypervisor side, so there's no need to worry about the toolstack. - Matthew _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Mon Nov 12 23:07:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 23:07:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY36A-0005FU-Qo; Mon, 12 Nov 2012 23:07:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY369-0005FK-Nt; Mon, 12 Nov 2012 23:07:21 +0000 Received: from [85.158.137.99:38458] by server-7.bemta-3.messagelabs.com id BB/B3-01713-82181A05; Mon, 12 Nov 2012 23:07:20 +0000 X-Env-Sender: robertrhinehart@gmail.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352761640!17939202!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2641 invoked from network); 12 Nov 2012 23:07:20 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 23:07:20 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so2489663wib.14 for ; Mon, 12 Nov 2012 15:07:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:x-google-sender-auth:message-id :subject:to:content-type; bh=IiwwHIGvA8Nwc7ZNkbwEJp0hvI784fLQjQ6B4OSGX0M=; b=peznoKYaQl151E2qABWGaiu1qrB7zkRAVbEHJjiMYVEOlZ3PxuU+RLm2ZeoFZalEqu QFsD6AF6QVoWLGfvmK+RP4zujQeUEy0dpdYSTk7j4JoA4i+0DTv4zcv0rix+xunR24xz bHQ0MX8LR+FwSxFJWn2SdvdJBxRpIQjBkLz0PYHBHBV/2LQQD8dRSvT49TQ0YYZjVlnH pZ8omWIzzFR/4WjbuCy50gYTaSjo4yvbqY2MXZNQh6rhKUAjC/5CvIJ62SKF/qGTdmtN /ROcVNh4kv+0Xbgu+wdQLUqitM+1p8DQrEm3ULDOfjk5LCrIjU+ys0QcGTCpa40tyg1C IGLg== Received: by 10.216.197.155 with SMTP id t27mr8126071wen.216.1352761640026; Mon, 12 Nov 2012 15:07:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.218.193 with HTTP; Mon, 12 Nov 2012 15:06:39 -0800 (PST) From: Rob Rhinehart Date: Mon, 12 Nov 2012 15:06:39 -0800 X-Google-Sender-Auth: VjnS2nBvcCI7fASVu0XqPsQig4E Message-ID: To: xen-users@lists.xen.org, xen-devel@lists.xen.org Subject: [Xen-devel] NVIDIA VGX Hypervisor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============9185951647196231441==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============9185951647196231441== Content-Type: multipart/alternative; boundary=001636c5b4f405032e04ce545d6a --001636c5b4f405032e04ce545d6a Content-Type: text/plain; charset=ISO-8859-1 I've been reading that Xenserver supports GPU virtualization with NVIDIA VGX. I assume this is different than PCI passthrough. Is there any support for this in open source xen, or efforts to do so? Thank you --001636c5b4f405032e04ce545d6a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I've been reading that Xenserver supports GPU virtualization with NVIDI= A VGX. I assume this is different than PCI passthrough.=A0Is there any supp= ort for this in open source xen, or efforts to do so?

Th= ank you
--001636c5b4f405032e04ce545d6a-- --===============9185951647196231441== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============9185951647196231441==-- From xen-devel-bounces@lists.xen.org Mon Nov 12 23:07:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 12 Nov 2012 23:07:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY36A-0005FU-Qo; Mon, 12 Nov 2012 23:07:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY369-0005FK-Nt; Mon, 12 Nov 2012 23:07:21 +0000 Received: from [85.158.137.99:38458] by server-7.bemta-3.messagelabs.com id BB/B3-01713-82181A05; Mon, 12 Nov 2012 23:07:20 +0000 X-Env-Sender: robertrhinehart@gmail.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352761640!17939202!1 X-Originating-IP: [209.85.212.179] X-SpamReason: No, hits=1.2 required=7.0 tests=HTML_10_20,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2641 invoked from network); 12 Nov 2012 23:07:20 -0000 Received: from mail-wi0-f179.google.com (HELO mail-wi0-f179.google.com) (209.85.212.179) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 12 Nov 2012 23:07:20 -0000 Received: by mail-wi0-f179.google.com with SMTP id hm6so2489663wib.14 for ; Mon, 12 Nov 2012 15:07:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:x-google-sender-auth:message-id :subject:to:content-type; bh=IiwwHIGvA8Nwc7ZNkbwEJp0hvI784fLQjQ6B4OSGX0M=; b=peznoKYaQl151E2qABWGaiu1qrB7zkRAVbEHJjiMYVEOlZ3PxuU+RLm2ZeoFZalEqu QFsD6AF6QVoWLGfvmK+RP4zujQeUEy0dpdYSTk7j4JoA4i+0DTv4zcv0rix+xunR24xz bHQ0MX8LR+FwSxFJWn2SdvdJBxRpIQjBkLz0PYHBHBV/2LQQD8dRSvT49TQ0YYZjVlnH pZ8omWIzzFR/4WjbuCy50gYTaSjo4yvbqY2MXZNQh6rhKUAjC/5CvIJ62SKF/qGTdmtN /ROcVNh4kv+0Xbgu+wdQLUqitM+1p8DQrEm3ULDOfjk5LCrIjU+ys0QcGTCpa40tyg1C IGLg== Received: by 10.216.197.155 with SMTP id t27mr8126071wen.216.1352761640026; Mon, 12 Nov 2012 15:07:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.218.193 with HTTP; Mon, 12 Nov 2012 15:06:39 -0800 (PST) From: Rob Rhinehart Date: Mon, 12 Nov 2012 15:06:39 -0800 X-Google-Sender-Auth: VjnS2nBvcCI7fASVu0XqPsQig4E Message-ID: To: xen-users@lists.xen.org, xen-devel@lists.xen.org Subject: [Xen-devel] NVIDIA VGX Hypervisor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============9185951647196231441==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============9185951647196231441== Content-Type: multipart/alternative; boundary=001636c5b4f405032e04ce545d6a --001636c5b4f405032e04ce545d6a Content-Type: text/plain; charset=ISO-8859-1 I've been reading that Xenserver supports GPU virtualization with NVIDIA VGX. I assume this is different than PCI passthrough. Is there any support for this in open source xen, or efforts to do so? Thank you --001636c5b4f405032e04ce545d6a Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I've been reading that Xenserver supports GPU virtualization with NVIDI= A VGX. I assume this is different than PCI passthrough.=A0Is there any supp= ort for this in open source xen, or efforts to do so?

Th= ank you
--001636c5b4f405032e04ce545d6a-- --===============9185951647196231441== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============9185951647196231441==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 00:12:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 00:12:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY46i-0006Yx-K4; Tue, 13 Nov 2012 00:12:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY46h-0006Ys-6L for xen-devel@lists.xen.org; Tue, 13 Nov 2012 00:11:59 +0000 Received: from [85.158.139.211:9230] by server-7.bemta-5.messagelabs.com id 0B/2D-23096-E4091A05; Tue, 13 Nov 2012 00:11:58 +0000 X-Env-Sender: yang.z.zhang@intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1352765514!19920503!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16438 invoked from network); 13 Nov 2012 00:11:56 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-11.tower-206.messagelabs.com with SMTP; 13 Nov 2012 00:11:56 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 12 Nov 2012 16:11:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="216781406" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by azsmga001.ch.intel.com with ESMTP; 12 Nov 2012 16:11:52 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.19.9.28) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 16:11:40 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.19.9.28) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 16:11:40 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 08:11:38 +0800 From: "Zhang, Yang Z" To: Jan Beulich , "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNu2JnOrR2IJOBmEueKZ07SNjEopfm7FWQ Date: Tue, 13 Nov 2012 00:11:37 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> In-Reply-To: <5097DB9102000078000A65C7@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jan Beulich wrote on 2012-11-05: > All, > > so far it was my understanding that this option is intended to get > the DMA behavior that Dom0 observes as close as possible to how > it would be without IOMMU. Correct. There is a bit in context entry which controlling the DMA request(from this device) to walk or not walk the iommu page table. As we known, walking page table introduced extra cost, so we use this parameter to make sure the device which owned by dom0 not to walking iommu page table when DMA request is arrived. > However, we're now dealing with a customer report where a > single function device is observed to initiate DMA operations > appearing to originate from function 1, which makes obvious that > the option above is not making things as transparent as I would > have expected them to be: Without IOMMU, such requests get > processed fine, while with IOMMU (due to there not being a > context entry for the bogus device) the device fails to initialize > (causing DMA faults, the presence of which I had to convince > myself of separately, as for whatever reason at least the VT-d > code doesn't issue any log message in that case). Sorry, I cannot understand your problem. Is there any bug in current VT-d code? > So I'm now seeking for alternative workaround suggestions that > we could pass to that customer (less intrusive than "iommu=off"). Best regards, Yang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 00:12:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 00:12:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY46i-0006Yx-K4; Tue, 13 Nov 2012 00:12:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY46h-0006Ys-6L for xen-devel@lists.xen.org; Tue, 13 Nov 2012 00:11:59 +0000 Received: from [85.158.139.211:9230] by server-7.bemta-5.messagelabs.com id 0B/2D-23096-E4091A05; Tue, 13 Nov 2012 00:11:58 +0000 X-Env-Sender: yang.z.zhang@intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1352765514!19920503!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16438 invoked from network); 13 Nov 2012 00:11:56 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-11.tower-206.messagelabs.com with SMTP; 13 Nov 2012 00:11:56 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 12 Nov 2012 16:11:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="216781406" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by azsmga001.ch.intel.com with ESMTP; 12 Nov 2012 16:11:52 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.19.9.28) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 16:11:40 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.19.9.28) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 16:11:40 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 08:11:38 +0800 From: "Zhang, Yang Z" To: Jan Beulich , "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNu2JnOrR2IJOBmEueKZ07SNjEopfm7FWQ Date: Tue, 13 Nov 2012 00:11:37 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> In-Reply-To: <5097DB9102000078000A65C7@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jan Beulich wrote on 2012-11-05: > All, > > so far it was my understanding that this option is intended to get > the DMA behavior that Dom0 observes as close as possible to how > it would be without IOMMU. Correct. There is a bit in context entry which controlling the DMA request(from this device) to walk or not walk the iommu page table. As we known, walking page table introduced extra cost, so we use this parameter to make sure the device which owned by dom0 not to walking iommu page table when DMA request is arrived. > However, we're now dealing with a customer report where a > single function device is observed to initiate DMA operations > appearing to originate from function 1, which makes obvious that > the option above is not making things as transparent as I would > have expected them to be: Without IOMMU, such requests get > processed fine, while with IOMMU (due to there not being a > context entry for the bogus device) the device fails to initialize > (causing DMA faults, the presence of which I had to convince > myself of separately, as for whatever reason at least the VT-d > code doesn't issue any log message in that case). Sorry, I cannot understand your problem. Is there any bug in current VT-d code? > So I'm now seeking for alternative workaround suggestions that > we could pass to that customer (less intrusive than "iommu=off"). Best regards, Yang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 00:55:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 00:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY4mK-0006vv-5j; Tue, 13 Nov 2012 00:55:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY4mI-0006vq-TI for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 00:54:59 +0000 Received: from [85.158.143.35:17220] by server-2.bemta-4.messagelabs.com id 94/BB-28922-16A91A05; Tue, 13 Nov 2012 00:54:57 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352768097!11891631!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3974 invoked from network); 13 Nov 2012 00:54:57 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 00:54:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15764652" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 00:54:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 00:54:52 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY4mC-00021T-Aq; Tue, 13 Nov 2012 00:54:52 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY4mB-0004mf-W5; Tue, 13 Nov 2012 00:54:52 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 13 Nov 2012 00:54:52 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14384: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14384 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14384/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14381 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14381 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14381 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14381 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen a3cde70320ad baseline version: xen 279bbf2a0b48 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Dave McCracken George Dunlap Ian Campbell Kouya Shimura Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=a3cde70320ad + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable a3cde70320ad + branch=xen-unstable + revision=a3cde70320ad + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r a3cde70320ad ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 4 changesets with 8 changes to 8 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 00:55:29 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 00:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY4mK-0006vv-5j; Tue, 13 Nov 2012 00:55:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY4mI-0006vq-TI for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 00:54:59 +0000 Received: from [85.158.143.35:17220] by server-2.bemta-4.messagelabs.com id 94/BB-28922-16A91A05; Tue, 13 Nov 2012 00:54:57 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352768097!11891631!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3974 invoked from network); 13 Nov 2012 00:54:57 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 00:54:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15764652" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 00:54:52 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 00:54:52 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY4mC-00021T-Aq; Tue, 13 Nov 2012 00:54:52 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY4mB-0004mf-W5; Tue, 13 Nov 2012 00:54:52 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 13 Nov 2012 00:54:52 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14384: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14384 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14384/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14381 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14381 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14381 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14381 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen a3cde70320ad baseline version: xen 279bbf2a0b48 ------------------------------------------------------------ People who touched revisions under test: Andres Lagar-Cavilla Dave McCracken George Dunlap Ian Campbell Kouya Shimura Matthew Daley Tim Deegan ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=a3cde70320ad + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable a3cde70320ad + branch=xen-unstable + revision=a3cde70320ad + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r a3cde70320ad ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 4 changesets with 8 changes to 8 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 01:41:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 01:41:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5UP-0002nL-MB; Tue, 13 Nov 2012 01:40:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5UO-0002nG-Jp for xen-devel@lists.xen.org; Tue, 13 Nov 2012 01:40:32 +0000 Received: from [85.158.137.99:35329] by server-3.bemta-3.messagelabs.com id B2/50-31566-F05A1A05; Tue, 13 Nov 2012 01:40:31 +0000 X-Env-Sender: xudong.hao@intel.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352770828!11987435!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1207 invoked from network); 13 Nov 2012 01:40:29 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-8.tower-217.messagelabs.com with SMTP; 13 Nov 2012 01:40:29 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 12 Nov 2012 17:40:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="216811589" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by azsmga001.ch.intel.com with ESMTP; 12 Nov 2012 17:40:26 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.19.17.7) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 17:40:26 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX153.amr.corp.intel.com (10.19.17.7) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 17:40:26 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.123]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.134]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 09:40:24 +0800 From: "Hao, Xudong" To: Ian Campbell , Christoph Egger Thread-Topic: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD Thread-Index: AQHNwPJ/vRtiVnNpX0G1LON37louEpfm92Bw Date: Tue, 13 Nov 2012 01:40:23 +0000 Message-ID: <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> <1352737542.27833.296.camel@zakaz.uk.xensource.com> In-Reply-To: <1352737542.27833.296.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "Liu, Jinsong" , "Li, Haicheng" , "Keir \(Xen.org\)" , "Jiang, Yunhong" , Ian Jackson , "xen-devel@lists.xen.org" , Jan Beulich Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ian Campbell [mailto:Ian.Campbell@citrix.com] > Sent: Tuesday, November 13, 2012 12:26 AM > To: Jan Beulich > Cc: Ian Jackson; Christoph Egger; xen-devel@lists.xen.org; Keir (Xen.org); Liu, > Jinsong; Liu, Jinsong; Jiang, Yunhong; Li, Haicheng; Hao, Xudong > Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD > > On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: > > >>> On 19.10.12 at 17:01, Ian Jackson wrote: > > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support > AMD"): > > >> >>> On 19.10.12 at 15:10, Christoph Egger > wrote: > > >> > Ping? > > >> > > >> I'm afraid it's not really clear who should commit this - it's tools > > >> side code, so IanJ or IanC would normally be the ones, but otoh > > >> it's code requiring low level hardware knowledge to review the > > >> patch, so both of them might want to rather not do the review. > > >> In the past it was usually Keir who eventually committed such > > >> patches, but I don't know whether he put this on his to-look-at- > > >> and-eventually-commit list. > > > > > > My view is that I would like an ack from someone who understands > > > what's going on ... > > > > Which would ideally be those who introduced the code, i.e. > > Intel folks if I'm not mistaken... > > Lets CC some of them then. > > Intel folks -- any opinion on the patch below from Christoph? > It's ok for me except for one comments. See below. Of course I did not review the AMD only code. > + if (strstr(cpu_brand, "AMD")) > + cpu_is_amd = 1; > + else > + cpu_is_intel = 1; > + > + if (cpu_is_intel) > + type = INTEL_MCE_SRAO_MEM; > + Isn't necessary to set a default AMD type? The "-t" parameter is required for amd but not always for Intel for users, it's better to give a unified usage for all users. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 01:41:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 01:41:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5UP-0002nL-MB; Tue, 13 Nov 2012 01:40:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5UO-0002nG-Jp for xen-devel@lists.xen.org; Tue, 13 Nov 2012 01:40:32 +0000 Received: from [85.158.137.99:35329] by server-3.bemta-3.messagelabs.com id B2/50-31566-F05A1A05; Tue, 13 Nov 2012 01:40:31 +0000 X-Env-Sender: xudong.hao@intel.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352770828!11987435!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1207 invoked from network); 13 Nov 2012 01:40:29 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-8.tower-217.messagelabs.com with SMTP; 13 Nov 2012 01:40:29 -0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 12 Nov 2012 17:40:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="216811589" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by azsmga001.ch.intel.com with ESMTP; 12 Nov 2012 17:40:26 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.19.17.7) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 17:40:26 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX153.amr.corp.intel.com (10.19.17.7) with Microsoft SMTP Server (TLS) id 14.1.355.2; Mon, 12 Nov 2012 17:40:26 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.123]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.134]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 09:40:24 +0800 From: "Hao, Xudong" To: Ian Campbell , Christoph Egger Thread-Topic: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD Thread-Index: AQHNwPJ/vRtiVnNpX0G1LON37louEpfm92Bw Date: Tue, 13 Nov 2012 01:40:23 +0000 Message-ID: <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> <1352737542.27833.296.camel@zakaz.uk.xensource.com> In-Reply-To: <1352737542.27833.296.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "Liu, Jinsong" , "Li, Haicheng" , "Keir \(Xen.org\)" , "Jiang, Yunhong" , Ian Jackson , "xen-devel@lists.xen.org" , Jan Beulich Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ian Campbell [mailto:Ian.Campbell@citrix.com] > Sent: Tuesday, November 13, 2012 12:26 AM > To: Jan Beulich > Cc: Ian Jackson; Christoph Egger; xen-devel@lists.xen.org; Keir (Xen.org); Liu, > Jinsong; Liu, Jinsong; Jiang, Yunhong; Li, Haicheng; Hao, Xudong > Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD > > On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: > > >>> On 19.10.12 at 17:01, Ian Jackson wrote: > > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support > AMD"): > > >> >>> On 19.10.12 at 15:10, Christoph Egger > wrote: > > >> > Ping? > > >> > > >> I'm afraid it's not really clear who should commit this - it's tools > > >> side code, so IanJ or IanC would normally be the ones, but otoh > > >> it's code requiring low level hardware knowledge to review the > > >> patch, so both of them might want to rather not do the review. > > >> In the past it was usually Keir who eventually committed such > > >> patches, but I don't know whether he put this on his to-look-at- > > >> and-eventually-commit list. > > > > > > My view is that I would like an ack from someone who understands > > > what's going on ... > > > > Which would ideally be those who introduced the code, i.e. > > Intel folks if I'm not mistaken... > > Lets CC some of them then. > > Intel folks -- any opinion on the patch below from Christoph? > It's ok for me except for one comments. See below. Of course I did not review the AMD only code. > + if (strstr(cpu_brand, "AMD")) > + cpu_is_amd = 1; > + else > + cpu_is_intel = 1; > + > + if (cpu_is_intel) > + type = INTEL_MCE_SRAO_MEM; > + Isn't necessary to set a default AMD type? The "-t" parameter is required for amd but not always for Intel for users, it's better to give a unified usage for all users. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 01:59:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 01:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5mX-00032t-EB; Tue, 13 Nov 2012 01:59:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5mV-00032o-IA for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 01:59:15 +0000 Received: from [85.158.138.51:32144] by server-9.bemta-3.messagelabs.com id 39/32-02388-279A1A05; Tue, 13 Nov 2012 01:59:14 +0000 X-Env-Sender: kgrace.liu@gmail.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352771952!21830343!1 X-Originating-IP: [209.85.214.171] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG, HTML_30_40,HTML_MESSAGE,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28823 invoked from network); 13 Nov 2012 01:59:13 -0000 Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 01:59:13 -0000 Received: by mail-ob0-f171.google.com with SMTP id dn14so1840235obc.30 for ; Mon, 12 Nov 2012 17:59:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=nd4vUfyoDB2cEnGnv9tkIyjhg7cHL4dLNJc+KSHSXuI=; b=L0htRYP4pDciJvtrQdSBA4Iyt+X/EpTGyKqNN0uBW7v7/HMctmhwJ3hHPhqiQWyhau B280x/F9UrHK7aWhwzu6eDhOs1Lz9s6DBWScB10VpfycMfoc6fvreojunTmg8iFPzd7/ oWd0SbxtqXwajf6JEWsp9Eh8qqDiP+TPRhh5qNdBxXXy99mZuy6XuZps42ZW5uvRzQJn Jnn41OFNbawTe2bsdzhqQa/vtka9+g+aT2sxO0ljxknJp1tMOR/qeB97qzV7x9XbBI4T OtkouaDyo/fg4Fx5FXt0/ZMm6kn1wHIALUlPrf37lY6/UfYoT0ZAYwBMENQXHkeFUbxe BvNA== MIME-Version: 1.0 Received: by 10.60.27.166 with SMTP id u6mr15860738oeg.86.1352771952153; Mon, 12 Nov 2012 17:59:12 -0800 (PST) Received: by 10.60.21.163 with HTTP; Mon, 12 Nov 2012 17:59:11 -0800 (PST) In-Reply-To: <1352734133.27833.277.camel@zakaz.uk.xensource.com> References: <1352734133.27833.277.camel@zakaz.uk.xensource.com> Date: Tue, 13 Nov 2012 09:59:11 +0800 X-Google-Sender-Auth: MvsrP7P07a28yj8Bx7aHMvzRSOk Message-ID: From: Chunyan Liu To: Ian Campbell Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7583719734613829421==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7583719734613829421== Content-Type: multipart/alternative; boundary=e89a8fb2058eab955304ce56c32f --e89a8fb2058eab955304ce56c32f Content-Type: text/plain; charset=UTF-8 2012/11/12 Ian Campbell > Dropping users list, please don't cross post. > Sorry. Thanks for reminding. > On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote: > > Dear List, > > > > I'm trying to issue: > > "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 > > r15 r16 r17 r18" > > it failed at error report "Too many permissions specified. Maximum > > per invocation is 16." > > > > I changed MAX_PERMS to 18 for testing, it turns to be OK to run above > > command. > > I don't know why there is "MAX_PERMS=16" limitation and couldn't find > > useful info about that. Does anyone know that? > > It seems like an obvious case of an arbitrary constant to me. > > Do you actually have a practical requirement to be able to set > 16 > perms via the command line tool? > > Yes. Our customer plans to have some hypervisor running above 32 domUs and needs to share common information between xen domU. He uses xenstore capabilities: i.e. xenstore-write /local/domain/0/foo "8 CPU" Then he gives read access to domU with: xenstore-chmod /local/domain/0/foo r0 r2 r3 r4 r5 r6 r7 r9 r10 r11 r12 r13 r17 r18 r19 r20 r21 r22 With current MAX_PERM limitation, xenstore-chmod will report "Too many permissions specified. Maximum per invocation is 16". And serial commands: xenstore-chmod /local/domain/0/foo r0 xenstore-chmod /local/domain/0/foo r1 ... couldn't achieve that either. (result will be only the last command). > I can't see anything obvious in the underlying library which would > prevent it handling essentially arbitrary length lists of perms. If you > want to change the client to increase the number supported I think you > should make it likewise handle arbitrary numbers rather than just > increasing MAX_PERMS. > > Sure, if there is nothing that prevents handling an arbitrary number of perms, it's better to handle it like arbitrary numbers rather than increasing MAX_PERMS. I was just not sure if there was some consideration to set a limitation. I'll modify code and test. Ian. > > > > --e89a8fb2058eab955304ce56c32f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

2012/11/12 Ian Campbell <Ian.Camp= bell@citrix.com>
Dropping users list, please don't cross post.
Sorr= y. Thanks for reminding.
=C2=A0
On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote= :
> Dear List,
>
> I'm trying to issue:
> "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r1= 3 r14
> r15 r16 r17 r18"
> it failed at error report "Too many permissions specified. =C2=A0= Maximum
> per invocation is 16."
>
> I changed MAX_PERMS to 18 for testing, it turns to be OK to run above<= br> > command.
> I don't know why there is "MAX_PERMS=3D16" limitation an= d couldn't find
> useful info about that. Does anyone know that?

It seems like an obvious case of an arbitrary constant to me.
Do you actually have a practical requirement to be able to set > 16
perms via the command line tool?

Yes. Our customer plans to have some hypervisor runni= ng above 32 domUs=20 and needs to share common information between xen domU. He uses xenstore capabilities:
i.e. xenstore-write /local/domain/0/foo "8 CPU"= ;
Then he gives read access to domU with:
xenstore-chmod /local/domai= n/0/foo r0 r2 r3 r4 r5 r6 r7 r9 r10 r11 r12 r13 r17 r18 r19 r20 r21 r22
With current MAX_PERM limitation, xenstore-chmod will report "Too many= permissions specified. Maximum per invocation is 16".
And serial = commands:
xenstore-chmod /local/domain/0/foo r0
xenstore-chmod /local= /domain/0/foo r1
...
couldn't achieve that either. (result will be only the last comm= and).
=C2=A0
I can't see anything obvious in the underlying library which would
prevent it handling essentially arbitrary length lists of perms. If you
want to change the client to increase the number supported I think you
should make it likewise handle arbitrary numbers rather than just
increasing MAX_PERMS.

Sure, if there is nothing that prevents handling an arbitrary numbe= r of perms, it's better to handle it like arbitrary numbers rather than= increasing MAX_PERMS. I was just not sure if there was some consideration = to set a limitation.
I'll modify code and test.

Ian.




--e89a8fb2058eab955304ce56c32f-- --===============7583719734613829421== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7583719734613829421==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 01:59:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 01:59:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5mX-00032t-EB; Tue, 13 Nov 2012 01:59:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY5mV-00032o-IA for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 01:59:15 +0000 Received: from [85.158.138.51:32144] by server-9.bemta-3.messagelabs.com id 39/32-02388-279A1A05; Tue, 13 Nov 2012 01:59:14 +0000 X-Env-Sender: kgrace.liu@gmail.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352771952!21830343!1 X-Originating-IP: [209.85.214.171] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG, HTML_30_40,HTML_MESSAGE,RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28823 invoked from network); 13 Nov 2012 01:59:13 -0000 Received: from mail-ob0-f171.google.com (HELO mail-ob0-f171.google.com) (209.85.214.171) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 01:59:13 -0000 Received: by mail-ob0-f171.google.com with SMTP id dn14so1840235obc.30 for ; Mon, 12 Nov 2012 17:59:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=nd4vUfyoDB2cEnGnv9tkIyjhg7cHL4dLNJc+KSHSXuI=; b=L0htRYP4pDciJvtrQdSBA4Iyt+X/EpTGyKqNN0uBW7v7/HMctmhwJ3hHPhqiQWyhau B280x/F9UrHK7aWhwzu6eDhOs1Lz9s6DBWScB10VpfycMfoc6fvreojunTmg8iFPzd7/ oWd0SbxtqXwajf6JEWsp9Eh8qqDiP+TPRhh5qNdBxXXy99mZuy6XuZps42ZW5uvRzQJn Jnn41OFNbawTe2bsdzhqQa/vtka9+g+aT2sxO0ljxknJp1tMOR/qeB97qzV7x9XbBI4T OtkouaDyo/fg4Fx5FXt0/ZMm6kn1wHIALUlPrf37lY6/UfYoT0ZAYwBMENQXHkeFUbxe BvNA== MIME-Version: 1.0 Received: by 10.60.27.166 with SMTP id u6mr15860738oeg.86.1352771952153; Mon, 12 Nov 2012 17:59:12 -0800 (PST) Received: by 10.60.21.163 with HTTP; Mon, 12 Nov 2012 17:59:11 -0800 (PST) In-Reply-To: <1352734133.27833.277.camel@zakaz.uk.xensource.com> References: <1352734133.27833.277.camel@zakaz.uk.xensource.com> Date: Tue, 13 Nov 2012 09:59:11 +0800 X-Google-Sender-Auth: MvsrP7P07a28yj8Bx7aHMvzRSOk Message-ID: From: Chunyan Liu To: Ian Campbell Cc: "xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] question about xenstore-chmod MAX_PERMS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============7583719734613829421==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============7583719734613829421== Content-Type: multipart/alternative; boundary=e89a8fb2058eab955304ce56c32f --e89a8fb2058eab955304ce56c32f Content-Type: text/plain; charset=UTF-8 2012/11/12 Ian Campbell > Dropping users list, please don't cross post. > Sorry. Thanks for reminding. > On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote: > > Dear List, > > > > I'm trying to issue: > > "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 > > r15 r16 r17 r18" > > it failed at error report "Too many permissions specified. Maximum > > per invocation is 16." > > > > I changed MAX_PERMS to 18 for testing, it turns to be OK to run above > > command. > > I don't know why there is "MAX_PERMS=16" limitation and couldn't find > > useful info about that. Does anyone know that? > > It seems like an obvious case of an arbitrary constant to me. > > Do you actually have a practical requirement to be able to set > 16 > perms via the command line tool? > > Yes. Our customer plans to have some hypervisor running above 32 domUs and needs to share common information between xen domU. He uses xenstore capabilities: i.e. xenstore-write /local/domain/0/foo "8 CPU" Then he gives read access to domU with: xenstore-chmod /local/domain/0/foo r0 r2 r3 r4 r5 r6 r7 r9 r10 r11 r12 r13 r17 r18 r19 r20 r21 r22 With current MAX_PERM limitation, xenstore-chmod will report "Too many permissions specified. Maximum per invocation is 16". And serial commands: xenstore-chmod /local/domain/0/foo r0 xenstore-chmod /local/domain/0/foo r1 ... couldn't achieve that either. (result will be only the last command). > I can't see anything obvious in the underlying library which would > prevent it handling essentially arbitrary length lists of perms. If you > want to change the client to increase the number supported I think you > should make it likewise handle arbitrary numbers rather than just > increasing MAX_PERMS. > > Sure, if there is nothing that prevents handling an arbitrary number of perms, it's better to handle it like arbitrary numbers rather than increasing MAX_PERMS. I was just not sure if there was some consideration to set a limitation. I'll modify code and test. Ian. > > > > --e89a8fb2058eab955304ce56c32f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

2012/11/12 Ian Campbell <Ian.Camp= bell@citrix.com>
Dropping users list, please don't cross post.
Sorr= y. Thanks for reminding.
=C2=A0
On Mon, 2012-11-12 at 08:35 +0000, Chunyan Liu wrote= :
> Dear List,
>
> I'm trying to issue:
> "xenstore-chmod PATH r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r1= 3 r14
> r15 r16 r17 r18"
> it failed at error report "Too many permissions specified. =C2=A0= Maximum
> per invocation is 16."
>
> I changed MAX_PERMS to 18 for testing, it turns to be OK to run above<= br> > command.
> I don't know why there is "MAX_PERMS=3D16" limitation an= d couldn't find
> useful info about that. Does anyone know that?

It seems like an obvious case of an arbitrary constant to me.
Do you actually have a practical requirement to be able to set > 16
perms via the command line tool?

Yes. Our customer plans to have some hypervisor runni= ng above 32 domUs=20 and needs to share common information between xen domU. He uses xenstore capabilities:
i.e. xenstore-write /local/domain/0/foo "8 CPU"= ;
Then he gives read access to domU with:
xenstore-chmod /local/domai= n/0/foo r0 r2 r3 r4 r5 r6 r7 r9 r10 r11 r12 r13 r17 r18 r19 r20 r21 r22
With current MAX_PERM limitation, xenstore-chmod will report "Too many= permissions specified. Maximum per invocation is 16".
And serial = commands:
xenstore-chmod /local/domain/0/foo r0
xenstore-chmod /local= /domain/0/foo r1
...
couldn't achieve that either. (result will be only the last comm= and).
=C2=A0
I can't see anything obvious in the underlying library which would
prevent it handling essentially arbitrary length lists of perms. If you
want to change the client to increase the number supported I think you
should make it likewise handle arbitrary numbers rather than just
increasing MAX_PERMS.

Sure, if there is nothing that prevents handling an arbitrary numbe= r of perms, it's better to handle it like arbitrary numbers rather than= increasing MAX_PERMS. I was just not sure if there was some consideration = to set a limitation.
I'll modify code and test.

Ian.




--e89a8fb2058eab955304ce56c32f-- --===============7583719734613829421== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============7583719734613829421==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 03:10:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 03:10:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY6so-0004Hx-SA; Tue, 13 Nov 2012 03:09:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY6sn-0004Hs-0e for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 03:09:49 +0000 Received: from [193.109.254.147:37782] by server-2.bemta-14.messagelabs.com id 32/A0-20829-CF9B1A05; Tue, 13 Nov 2012 03:09:48 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352776185!8865793!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1ODMyMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22857 invoked from network); 13 Nov 2012 03:09:46 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 03:09:46 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAD39hCW017325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Nov 2012 03:09:44 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAD39gBn019485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 13 Nov 2012 03:09:43 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAD39gek028933 for ; Mon, 12 Nov 2012 21:09:42 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 19:09:42 -0800 Date: Mon, 12 Nov 2012 19:09:34 -0800 From: Mukesh Rathor To: "Xen-devel@lists.xensource.com" Message-ID: <20121112190934.5e702799@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I am wondering if there's libxl expert who can help me make some PVH related changes to libxl, pref in the US time zone. I could consult on irc or the phone. I find the libxl code hard to read, and don't want to spend lot of time figuring it out if someone can just help quickly. thanks, Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 03:10:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 03:10:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY6so-0004Hx-SA; Tue, 13 Nov 2012 03:09:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY6sn-0004Hs-0e for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 03:09:49 +0000 Received: from [193.109.254.147:37782] by server-2.bemta-14.messagelabs.com id 32/A0-20829-CF9B1A05; Tue, 13 Nov 2012 03:09:48 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352776185!8865793!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1ODMyMA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22857 invoked from network); 13 Nov 2012 03:09:46 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 03:09:46 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAD39hCW017325 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Nov 2012 03:09:44 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAD39gBn019485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 13 Nov 2012 03:09:43 GMT Received: from abhmt104.oracle.com (abhmt104.oracle.com [141.146.116.56]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAD39gek028933 for ; Mon, 12 Nov 2012 21:09:42 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Nov 2012 19:09:42 -0800 Date: Mon, 12 Nov 2012 19:09:34 -0800 From: Mukesh Rathor To: "Xen-devel@lists.xensource.com" Message-ID: <20121112190934.5e702799@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, I am wondering if there's libxl expert who can help me make some PVH related changes to libxl, pref in the US time zone. I could consult on irc or the phone. I find the libxl code hard to read, and don't want to spend lot of time figuring it out if someone can just help quickly. thanks, Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 05:50:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 05:50:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9Ng-00060f-5e; Tue, 13 Nov 2012 05:49:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9Ne-00060a-Uq for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 05:49:51 +0000 Received: from [193.109.254.147:17714] by server-7.bemta-14.messagelabs.com id 69/81-02272-E7FD1A05; Tue, 13 Nov 2012 05:49:50 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352785789!3732367!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 763 invoked from network); 13 Nov 2012 05:49:49 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 05:49:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15767113" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 05:49:45 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 05:49:44 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY9NY-0003YF-G7; Tue, 13 Nov 2012 05:49:44 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY9NY-0005zt-19; Tue, 13 Nov 2012 05:49:44 +0000 To: Message-ID: From: xen.org Date: Tue, 13 Nov 2012 05:49:44 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14385: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14385 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14385/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14384 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14384 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14384 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14384 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen a3cde70320ad baseline version: xen a3cde70320ad jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 05:50:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 05:50:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9Ng-00060f-5e; Tue, 13 Nov 2012 05:49:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9Ne-00060a-Uq for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 05:49:51 +0000 Received: from [193.109.254.147:17714] by server-7.bemta-14.messagelabs.com id 69/81-02272-E7FD1A05; Tue, 13 Nov 2012 05:49:50 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352785789!3732367!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 763 invoked from network); 13 Nov 2012 05:49:49 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 05:49:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208";a="15767113" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 05:49:45 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 05:49:44 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TY9NY-0003YF-G7; Tue, 13 Nov 2012 05:49:44 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TY9NY-0005zt-19; Tue, 13 Nov 2012 05:49:44 +0000 To: Message-ID: From: xen.org Date: Tue, 13 Nov 2012 05:49:44 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14385: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14385 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14385/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14384 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14384 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14384 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14384 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen a3cde70320ad baseline version: xen a3cde70320ad jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:04:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:04:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9bp-0006JO-Jp; Tue, 13 Nov 2012 06:04:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9bo-0006JJ-73 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:04:28 +0000 Received: from [193.109.254.147:25534] by server-16.bemta-14.messagelabs.com id 57/82-09215-BE2E1A05; Tue, 13 Nov 2012 06:04:27 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352786665!8050465!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13196 invoked from network); 13 Nov 2012 06:04:27 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 06:04:27 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so2285966pbc.32 for ; Mon, 12 Nov 2012 22:04:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=U+A+UbXvFHBhNM9sGjSPedetgLZbqhBZge3i3Ad5hiU=; b=CizF4IX1XNuZ1d82UCfl1LhPsoLfPwlVXUp46KPcDoprD//chohPGHwVllzfdseTyQ U2DpnvtDqNszZ4jgnQZPxYlTnXpaqwKmGhHub14xNadvTJhl89MSS+cAK4sBK/XU1iHb 33nR4AeNcz7eYNTsr6ZENUXht55f3dL9JdTZmM+CE8eJAtb7mR4oUY8BneW6WCwxmY/X ZwLx0cwozWsol7dEYVk6ZnpMxDb+2CbNjegon4m77gYTFa4MsifUlLFLqrfS92ZGZr5q kjAMatTOW8OBsnTKPORu3juH3VX5h6nVoWXyhR3H8e8iMX7hgwHzmt7q08RWrF4lKjQq BrDg== Received: by 10.69.0.40 with SMTP id av8mr64642084pbd.117.1352786664945; Mon, 12 Nov 2012 22:04:24 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id c1sm5568250pav.23.2012.11.12.22.04.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 22:04:24 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 19:04:47 +1300 Message-Id: <1352786687-4498-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether bits should be masked off from the input cpumap bitmap or not. Fix by using the correct cpumask buffer size in place of sizeof. Signed-off-by: Matthew Daley diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e153cb4..204e951 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( { if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) err = -EFAULT; - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + 7) / 8) ) bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:04:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:04:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9bp-0006JO-Jp; Tue, 13 Nov 2012 06:04:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9bo-0006JJ-73 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:04:28 +0000 Received: from [193.109.254.147:25534] by server-16.bemta-14.messagelabs.com id 57/82-09215-BE2E1A05; Tue, 13 Nov 2012 06:04:27 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352786665!8050465!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13196 invoked from network); 13 Nov 2012 06:04:27 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 06:04:27 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so2285966pbc.32 for ; Mon, 12 Nov 2012 22:04:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=U+A+UbXvFHBhNM9sGjSPedetgLZbqhBZge3i3Ad5hiU=; b=CizF4IX1XNuZ1d82UCfl1LhPsoLfPwlVXUp46KPcDoprD//chohPGHwVllzfdseTyQ U2DpnvtDqNszZ4jgnQZPxYlTnXpaqwKmGhHub14xNadvTJhl89MSS+cAK4sBK/XU1iHb 33nR4AeNcz7eYNTsr6ZENUXht55f3dL9JdTZmM+CE8eJAtb7mR4oUY8BneW6WCwxmY/X ZwLx0cwozWsol7dEYVk6ZnpMxDb+2CbNjegon4m77gYTFa4MsifUlLFLqrfS92ZGZr5q kjAMatTOW8OBsnTKPORu3juH3VX5h6nVoWXyhR3H8e8iMX7hgwHzmt7q08RWrF4lKjQq BrDg== Received: by 10.69.0.40 with SMTP id av8mr64642084pbd.117.1352786664945; Mon, 12 Nov 2012 22:04:24 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id c1sm5568250pav.23.2012.11.12.22.04.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 22:04:24 -0800 (PST) From: Matthew Daley To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 19:04:47 +1300 Message-Id: <1352786687-4498-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Matthew Daley Subject: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether bits should be masked off from the input cpumap bitmap or not. Fix by using the correct cpumask buffer size in place of sizeof. Signed-off-by: Matthew Daley diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e153cb4..204e951 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( { if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) err = -EFAULT; - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + 7) / 8) ) bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9z7-0006aE-Vt; Tue, 13 Nov 2012 06:28:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9z6-0006a9-5A for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:28:32 +0000 Received: from [85.158.139.83:51656] by server-6.bemta-5.messagelabs.com id 8A/61-19321-F88E1A05; Tue, 13 Nov 2012 06:28:31 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-14.tower-182.messagelabs.com!1352788110!25702413!1 X-Originating-IP: [80.160.77.98] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3Ljk4ID0+IDM0MzYzMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21427 invoked from network); 13 Nov 2012 06:28:30 -0000 Received: from pasmtpb.tele.dk (HELO pasmtpB.tele.dk) (80.160.77.98) by server-14.tower-182.messagelabs.com with SMTP; 13 Nov 2012 06:28:30 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpB.tele.dk (Postfix) with ESMTP id 27A99D80A6; Tue, 13 Nov 2012 07:28:30 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Tue, 13 Nov 2012 07:28:24 +0100 From: Kristian Hagsted Rasmussen To: Ricardo Jesus , "xen-devel@lists.xen.org" Thread-Topic: [Xen-devel] xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQAAQFdAAAbVtwAAEIqFAA== Date: Tue, 13 Nov 2012 06:28:22 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B4AA@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> <19EF9FEB5AF86243A3F18E5CE75971640A00B204@hagsted-bserver.hagsted.dk> In-Reply-To: Accept-Language: da-DK, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.38.90.11] MIME-Version: 1.0 Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ricardo Jesus [mailto:ricardo.meb.jesus@gmail.com] > Update DQ77MK's BIOS. BIOS 00050 fixed a bug with UEFI and Linux. I am convinced that for the DQ77kb, a bios for DQ77MK does not work, but the same bug has been fixed in the 0044 bios version for that board. > The current BIOS release is 00053 and you can find the release notes at > http://downloadmirror.intel.com/22094/eng/MK_0053_ReleaseNotes.pdf > > On Mon, Nov 12, 2012 at 7:18 PM, Kristian Hagsted Rasmussen > wrote: > > Hi all > > > > I can't seem to find any information on vga-passthrough when booting > through xen.efi, so I assume it should work. But I encounter a problem on a > windows 7 HVM that boots fine when dom0 is booted through MBR but fails > when dom0 is booted through UEFI. > > > > My system is: > > DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel > > HD graphics 4000 > > > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a known > problem when booting through xen.efi or is it a bug? > > > > dm-command: hot insert pass-through pci dev > > register_real_device: Assigning real physical device 00:02.0 ... > > register_real_device: Disable MSI translation via per device option > > register_real_device: Disable power management > > pt_iomul_init: Error: pt_iomul_init can't open file > > /dev/xen/pci_iomul: No such file or directory: 0x0:0x2.0x0 > > pt_register_regions: IO region registered (size=0x00400000 > > base_addr=0xf7000004) > > pt_register_regions: IO region registered (size=0x10000000 > > base_addr=0xe000000c) > > pt_register_regions: IO region registered (size=0x00000040 > > base_addr=0x0000f001) > > setup_vga_pt: vga bios size (0x0) is invalid! > > register_real_device: Setup VGA BIOS of passthroughed gfx failed! > > > > Log file is attached. > > > > Just compared a log file from efi boot to one from MBR boot and found this > discrepancy between the two: > > pt_register_regions: IO region registered (size=0x00400000 > base_addr=0xdfc00004) - MBR boot see last addr 0xdfc00004 > > pt_register_regions: IO region registered (size=0x00400000 > base_addr=0xf7000004) - EFI boot compare to MBR 0xf7000004 > > > > Kind regards Kristian Hagsted Rasmussen > > > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:29:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:29:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9z7-0006aE-Vt; Tue, 13 Nov 2012 06:28:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TY9z6-0006a9-5A for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:28:32 +0000 Received: from [85.158.139.83:51656] by server-6.bemta-5.messagelabs.com id 8A/61-19321-F88E1A05; Tue, 13 Nov 2012 06:28:31 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-14.tower-182.messagelabs.com!1352788110!25702413!1 X-Originating-IP: [80.160.77.98] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3Ljk4ID0+IDM0MzYzMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21427 invoked from network); 13 Nov 2012 06:28:30 -0000 Received: from pasmtpb.tele.dk (HELO pasmtpB.tele.dk) (80.160.77.98) by server-14.tower-182.messagelabs.com with SMTP; 13 Nov 2012 06:28:30 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpB.tele.dk (Postfix) with ESMTP id 27A99D80A6; Tue, 13 Nov 2012 07:28:30 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Tue, 13 Nov 2012 07:28:24 +0100 From: Kristian Hagsted Rasmussen To: Ricardo Jesus , "xen-devel@lists.xen.org" Thread-Topic: [Xen-devel] xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQAAQFdAAAbVtwAAEIqFAA== Date: Tue, 13 Nov 2012 06:28:22 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B4AA@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> <19EF9FEB5AF86243A3F18E5CE75971640A00B204@hagsted-bserver.hagsted.dk> In-Reply-To: Accept-Language: da-DK, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.38.90.11] MIME-Version: 1.0 Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Ricardo Jesus [mailto:ricardo.meb.jesus@gmail.com] > Update DQ77MK's BIOS. BIOS 00050 fixed a bug with UEFI and Linux. I am convinced that for the DQ77kb, a bios for DQ77MK does not work, but the same bug has been fixed in the 0044 bios version for that board. > The current BIOS release is 00053 and you can find the release notes at > http://downloadmirror.intel.com/22094/eng/MK_0053_ReleaseNotes.pdf > > On Mon, Nov 12, 2012 at 7:18 PM, Kristian Hagsted Rasmussen > wrote: > > Hi all > > > > I can't seem to find any information on vga-passthrough when booting > through xen.efi, so I assume it should work. But I encounter a problem on a > windows 7 HVM that boots fine when dom0 is booted through MBR but fails > when dom0 is booted through UEFI. > > > > My system is: > > DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel > > HD graphics 4000 > > > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a known > problem when booting through xen.efi or is it a bug? > > > > dm-command: hot insert pass-through pci dev > > register_real_device: Assigning real physical device 00:02.0 ... > > register_real_device: Disable MSI translation via per device option > > register_real_device: Disable power management > > pt_iomul_init: Error: pt_iomul_init can't open file > > /dev/xen/pci_iomul: No such file or directory: 0x0:0x2.0x0 > > pt_register_regions: IO region registered (size=0x00400000 > > base_addr=0xf7000004) > > pt_register_regions: IO region registered (size=0x10000000 > > base_addr=0xe000000c) > > pt_register_regions: IO region registered (size=0x00000040 > > base_addr=0x0000f001) > > setup_vga_pt: vga bios size (0x0) is invalid! > > register_real_device: Setup VGA BIOS of passthroughed gfx failed! > > > > Log file is attached. > > > > Just compared a log file from efi boot to one from MBR boot and found this > discrepancy between the two: > > pt_register_regions: IO region registered (size=0x00400000 > base_addr=0xdfc00004) - MBR boot see last addr 0xdfc00004 > > pt_register_regions: IO region registered (size=0x00400000 > base_addr=0xf7000004) - EFI boot compare to MBR 0xf7000004 > > > > Kind regards Kristian Hagsted Rasmussen > > > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:36:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:36:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA6U-0006mZ-7x; Tue, 13 Nov 2012 06:36:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA6S-0006mU-O5 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:36:08 +0000 Received: from [193.109.254.147:59281] by server-5.bemta-14.messagelabs.com id 21/1C-10257-75AE1A05; Tue, 13 Nov 2012 06:36:07 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-6.tower-27.messagelabs.com!1352788566!3735919!1 X-Originating-IP: [80.160.77.98] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3Ljk4ID0+IDM0MzYzMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1109 invoked from network); 13 Nov 2012 06:36:06 -0000 Received: from pasmtpb.tele.dk (HELO pasmtpB.tele.dk) (80.160.77.98) by server-6.tower-27.messagelabs.com with SMTP; 13 Nov 2012 06:36:06 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpB.tele.dk (Postfix) with ESMTP id 0F640D80F5; Tue, 13 Nov 2012 07:36:06 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Tue, 13 Nov 2012 07:36:06 +0100 From: Kristian Hagsted Rasmussen To: Laszlo Ersek Thread-Topic: [Xen-devel] xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQACmcUAABUYj5A= Date: Tue, 13 Nov 2012 06:36:05 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B4CE@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> <50A16906.9000301@redhat.com> In-Reply-To: <50A16906.9000301@redhat.com> Accept-Language: da-DK, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.38.90.11] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > On 11/12/12 20:08, Kristian Hagsted Rasmussen wrote: > > Hi all > > > > I can't seem to find any information on vga-passthrough when booting > > through xen.efi, so I assume it should work. But I encounter a problem > > on a windows 7 HVM that boots fine when dom0 is booted through MBR > but > > fails when dom0 is booted through UEFI. > > > > My system is: > > DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel > > HD graphics 4000 > > > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a > > known problem when booting through xen.efi or is it a bug? > > The legacy VGA BIOS is not present on UEFI platforms unless an > (optional) compatibility support module provides it. (Tangentially, Secure > Boot disables CSMs.) > > Windows 7 / Windows 2008 R2 have a bug: even when booted on an UEFI > platform, they depend on the optional VGA BIOS unconditionally. This seems > to have been fixed in Windows 8 / Windows Server 2012. I will have to try to install windows 8 when I have time then. Just compared a log file from efi boot to one from MBR boot and found this discrepancy between the two: pt_register_regions: IO region registered (size=0x00400000 base_addr=0xdfc00004) - MBR boot see last addr 0xdfc00004 pt_register_regions: IO region registered (size=0x00400000 base_addr=0xf7000004) - EFI boot compare to MBR 0xf7000004 Can UEFI explain this discrepancy in base_addr? It is admittedly the first portion of memory on the graphic card and is 4M in size, so I suspect it is the vga-bios. And if it should not be present when boot through UEFI I will happily live with the error, if windows 8 can boot. > See kvm.org/page/OVMF#Windows_Server_2008_R2_SP1> > and/or the long "OVMF + Windows 2008 r2 sp1" thread on edk2-devel. > > (Apologies if I misunderstood your question. Admittedly, I haven't done any > homework wrt. xen.efi or vga passthrough. But your email had too many > keywords to push my buttons.) > > Laszlo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 06:36:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 06:36:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA6U-0006mZ-7x; Tue, 13 Nov 2012 06:36:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA6S-0006mU-O5 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:36:08 +0000 Received: from [193.109.254.147:59281] by server-5.bemta-14.messagelabs.com id 21/1C-10257-75AE1A05; Tue, 13 Nov 2012 06:36:07 +0000 X-Env-Sender: kristian@hagsted.dk X-Msg-Ref: server-6.tower-27.messagelabs.com!1352788566!3735919!1 X-Originating-IP: [80.160.77.98] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuMTYwLjc3Ljk4ID0+IDM0MzYzMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1109 invoked from network); 13 Nov 2012 06:36:06 -0000 Received: from pasmtpb.tele.dk (HELO pasmtpB.tele.dk) (80.160.77.98) by server-6.tower-27.messagelabs.com with SMTP; 13 Nov 2012 06:36:06 -0000 Received: from hagsted.dk (unknown [2.108.99.186]) by pasmtpB.tele.dk (Postfix) with ESMTP id 0F640D80F5; Tue, 13 Nov 2012 07:36:06 +0100 (CET) Received: from HAGSTED-BSERVER.hagsted.dk ([fe80::91b7:737e:e057:7c8b]) by hagsted-bserver.hagsted.dk ([fe80::91b7:737e:e057:7c8b%10]) with mapi id 14.02.0318.004; Tue, 13 Nov 2012 07:36:06 +0100 From: Kristian Hagsted Rasmussen To: Laszlo Ersek Thread-Topic: [Xen-devel] xen EFI boot and vga-passthrough Thread-Index: Ac3BCUwxBONJB3zmT1y62jykNdtmkQACmcUAABUYj5A= Date: Tue, 13 Nov 2012 06:36:05 +0000 Message-ID: <19EF9FEB5AF86243A3F18E5CE75971640A00B4CE@hagsted-bserver.hagsted.dk> References: <19EF9FEB5AF86243A3F18E5CE75971640A00B0F5@hagsted-bserver.hagsted.dk> <50A16906.9000301@redhat.com> In-Reply-To: <50A16906.9000301@redhat.com> Accept-Language: da-DK, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.38.90.11] MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] xen EFI boot and vga-passthrough X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > On 11/12/12 20:08, Kristian Hagsted Rasmussen wrote: > > Hi all > > > > I can't seem to find any information on vga-passthrough when booting > > through xen.efi, so I assume it should work. But I encounter a problem > > on a windows 7 HVM that boots fine when dom0 is booted through MBR > but > > fails when dom0 is booted through UEFI. > > > > My system is: > > DQ77KB motherboard with bios version 44 Core i7-3779T with VT-d Intel > > HD graphics 4000 > > > > In the qemu log it seem like xen cannot reach the vga-bios. Is this a > > known problem when booting through xen.efi or is it a bug? > > The legacy VGA BIOS is not present on UEFI platforms unless an > (optional) compatibility support module provides it. (Tangentially, Secure > Boot disables CSMs.) > > Windows 7 / Windows 2008 R2 have a bug: even when booted on an UEFI > platform, they depend on the optional VGA BIOS unconditionally. This seems > to have been fixed in Windows 8 / Windows Server 2012. I will have to try to install windows 8 when I have time then. Just compared a log file from efi boot to one from MBR boot and found this discrepancy between the two: pt_register_regions: IO region registered (size=0x00400000 base_addr=0xdfc00004) - MBR boot see last addr 0xdfc00004 pt_register_regions: IO region registered (size=0x00400000 base_addr=0xf7000004) - EFI boot compare to MBR 0xf7000004 Can UEFI explain this discrepancy in base_addr? It is admittedly the first portion of memory on the graphic card and is 4M in size, so I suspect it is the vga-bios. And if it should not be present when boot through UEFI I will happily live with the error, if windows 8 can boot. > See kvm.org/page/OVMF#Windows_Server_2008_R2_SP1> > and/or the long "OVMF + Windows 2008 r2 sp1" thread on edk2-devel. > > (Apologies if I misunderstood your question. Admittedly, I haven't done any > homework wrt. xen.efi or vga passthrough. But your email had too many > keywords to push my buttons.) > > Laszlo _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:08:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:08:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBXG-00084Y-M1; Tue, 13 Nov 2012 08:07:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBXF-00084T-B2 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:07:53 +0000 Received: from [85.158.143.35:5538] by server-3.bemta-4.messagelabs.com id FE/32-06841-8DFF1A05; Tue, 13 Nov 2012 08:07:52 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1352794072!5268732!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7604 invoked from network); 13 Nov 2012 08:07:52 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-21.messagelabs.com with SMTP; 13 Nov 2012 08:07:52 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:07:50 +0000 Message-Id: <50A20DE302000078000A7F6B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:07:47 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 01:11, "Zhang, Yang Z" wrote: > Jan Beulich wrote on 2012-11-05: >> so far it was my understanding that this option is intended to get >> the DMA behavior that Dom0 observes as close as possible to how >> it would be without IOMMU. > > Correct. There is a bit in context entry which controlling the DMA > request(from this device) to walk or not walk the iommu page table. > As we known, walking page table introduced extra cost, so we use this > parameter to make sure the device which owned by dom0 not to walking iommu > page table when DMA request is arrived. Okay, so that would be slightly different from the meaning I give to the option (as described above). >> However, we're now dealing with a customer report where a >> single function device is observed to initiate DMA operations >> appearing to originate from function 1, which makes obvious that >> the option above is not making things as transparent as I would >> have expected them to be: Without IOMMU, such requests get >> processed fine, while with IOMMU (due to there not being a >> context entry for the bogus device) the device fails to initialize >> (causing DMA faults, the presence of which I had to convince >> myself of separately, as for whatever reason at least the VT-d >> code doesn't issue any log message in that case). > > Sorry, I cannot understand your problem. Is there any bug in current VT-d > code? We need to settle on the concept here first: What specifically is said option intended to do? Only then we can talk about bugs, and if there is one I suspect it's not only in VT-d code, but equally much in AMD IOMMU's. The thing here is that a device functioning properly without IOMMU (with "properly" not necessarily meaning it being implemented correctly as per specification, albeit I also didn't check whether the spec would allow for the observed behavior) doesn't once DMA translation is enabled (even if suppressed for Dom0 via above option). The problem being that while device enumeration only finds a single device at function zero of the respective (seg,bus,dev) tuple, DMA requests - as seen by the IOMMU - originate from non-zero functions under the same tuple. Since a non-discovered device doesn't get a context entry inserted, this result in an IOMMU fault, rendering the device non-functional. The data from the system I have so far doesn't tell me whether the device incorrectly claims itself as single function (with the functions other than func 0 simply not being discovered during device enumeration, as single function devices don't get their non-zero functions scanned) or whether the config space for functions 1-7 indeed is unpopulated, with the device issuing requests with non- zero function number for other, unexplained reasons. Bottom line - I'm seeking advice as to whether working around this problem in the IOMMU code is desirable/necessary, or whether this is a design flaw on the device's side that just cannot be tolerated with an IOMMU in the picture (which would need good reasoning, so that a customer expecting such a device to work regardless of IOMMU usage can understand that this cannot reasonably be made work). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:08:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:08:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBXG-00084Y-M1; Tue, 13 Nov 2012 08:07:54 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBXF-00084T-B2 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:07:53 +0000 Received: from [85.158.143.35:5538] by server-3.bemta-4.messagelabs.com id FE/32-06841-8DFF1A05; Tue, 13 Nov 2012 08:07:52 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1352794072!5268732!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7604 invoked from network); 13 Nov 2012 08:07:52 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-4.tower-21.messagelabs.com with SMTP; 13 Nov 2012 08:07:52 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:07:50 +0000 Message-Id: <50A20DE302000078000A7F6B@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:07:47 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 01:11, "Zhang, Yang Z" wrote: > Jan Beulich wrote on 2012-11-05: >> so far it was my understanding that this option is intended to get >> the DMA behavior that Dom0 observes as close as possible to how >> it would be without IOMMU. > > Correct. There is a bit in context entry which controlling the DMA > request(from this device) to walk or not walk the iommu page table. > As we known, walking page table introduced extra cost, so we use this > parameter to make sure the device which owned by dom0 not to walking iommu > page table when DMA request is arrived. Okay, so that would be slightly different from the meaning I give to the option (as described above). >> However, we're now dealing with a customer report where a >> single function device is observed to initiate DMA operations >> appearing to originate from function 1, which makes obvious that >> the option above is not making things as transparent as I would >> have expected them to be: Without IOMMU, such requests get >> processed fine, while with IOMMU (due to there not being a >> context entry for the bogus device) the device fails to initialize >> (causing DMA faults, the presence of which I had to convince >> myself of separately, as for whatever reason at least the VT-d >> code doesn't issue any log message in that case). > > Sorry, I cannot understand your problem. Is there any bug in current VT-d > code? We need to settle on the concept here first: What specifically is said option intended to do? Only then we can talk about bugs, and if there is one I suspect it's not only in VT-d code, but equally much in AMD IOMMU's. The thing here is that a device functioning properly without IOMMU (with "properly" not necessarily meaning it being implemented correctly as per specification, albeit I also didn't check whether the spec would allow for the observed behavior) doesn't once DMA translation is enabled (even if suppressed for Dom0 via above option). The problem being that while device enumeration only finds a single device at function zero of the respective (seg,bus,dev) tuple, DMA requests - as seen by the IOMMU - originate from non-zero functions under the same tuple. Since a non-discovered device doesn't get a context entry inserted, this result in an IOMMU fault, rendering the device non-functional. The data from the system I have so far doesn't tell me whether the device incorrectly claims itself as single function (with the functions other than func 0 simply not being discovered during device enumeration, as single function devices don't get their non-zero functions scanned) or whether the config space for functions 1-7 indeed is unpopulated, with the device issuing requests with non- zero function number for other, unexplained reasons. Bottom line - I'm seeking advice as to whether working around this problem in the IOMMU code is desirable/necessary, or whether this is a design flaw on the device's side that just cannot be tolerated with an IOMMU in the picture (which would need good reasoning, so that a customer expecting such a device to work regardless of IOMMU usage can understand that this cannot reasonably be made work). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:37:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:37:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBzR-0008Of-Qu; Tue, 13 Nov 2012 08:37:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBzQ-0008Oa-BG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:37:00 +0000 Received: from [85.158.143.99:8417] by server-2.bemta-4.messagelabs.com id 43/A7-28922-BA602A05; Tue, 13 Nov 2012 08:36:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352795819!29730245!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16236 invoked from network); 13 Nov 2012 08:36:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:36:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:36:58 +0000 Message-Id: <50A214B902000078000A7F88@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:36:57 +0000 From: "Jan Beulich" To: "Matthew Daley" References: <1352786687-4498-1-git-send-email-mattjd@gmail.com> In-Reply-To: <1352786687-4498-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 07:04, Matthew Daley wrote: > xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether > bits should be masked off from the input cpumap bitmap or not. > > Fix by using the correct cpumask buffer size in place of sizeof. > > Signed-off-by: Matthew Daley Acked-by: Jan Beulich However, I would have preferred the adjustment to be ... > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index e153cb4..204e951 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( > { > if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) > err = -EFAULT; > - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) > + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + 7) / 8) ) if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= copy_bytes) ) or even (considering that guest_bytes >= copy_bytes due to the way copy_bytes gets initialized) if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) to make explicit when exactly the masking is necessary. Further, the fact this is not security relevant (i.e. the bug could not cause memory corruption) isn't obvious either: It is implied from _xmalloc() never returning chunks of data smaller than the size of a pointer, i.e. even if sizeof(void*) > guest_bytes > copy_bytes, the piece of memory erroneously written to would still be inside the allocation done at the top of the function. I'd suppose that would have been worth mentioning in the change description. And, for the record (and in order to determine backporting needs), I caused this with c/s 23991:a7ccbc79fc17. Jan > bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); > } > > -- > 1.7.10.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:37:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:37:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBzR-0008Of-Qu; Tue, 13 Nov 2012 08:37:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYBzQ-0008Oa-BG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:37:00 +0000 Received: from [85.158.143.99:8417] by server-2.bemta-4.messagelabs.com id 43/A7-28922-BA602A05; Tue, 13 Nov 2012 08:36:59 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352795819!29730245!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16236 invoked from network); 13 Nov 2012 08:36:59 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:36:59 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:36:58 +0000 Message-Id: <50A214B902000078000A7F88@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:36:57 +0000 From: "Jan Beulich" To: "Matthew Daley" References: <1352786687-4498-1-git-send-email-mattjd@gmail.com> In-Reply-To: <1352786687-4498-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 07:04, Matthew Daley wrote: > xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether > bits should be masked off from the input cpumap bitmap or not. > > Fix by using the correct cpumask buffer size in place of sizeof. > > Signed-off-by: Matthew Daley Acked-by: Jan Beulich However, I would have preferred the adjustment to be ... > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index e153cb4..204e951 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( > { > if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) > err = -EFAULT; > - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) > + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + 7) / 8) ) if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= copy_bytes) ) or even (considering that guest_bytes >= copy_bytes due to the way copy_bytes gets initialized) if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) to make explicit when exactly the masking is necessary. Further, the fact this is not security relevant (i.e. the bug could not cause memory corruption) isn't obvious either: It is implied from _xmalloc() never returning chunks of data smaller than the size of a pointer, i.e. even if sizeof(void*) > guest_bytes > copy_bytes, the piece of memory erroneously written to would still be inside the allocation done at the top of the function. I'd suppose that would have been worth mentioning in the change description. And, for the record (and in order to determine backporting needs), I caused this with c/s 23991:a7ccbc79fc17. Jan > bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); > } > > -- > 1.7.10.4 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:41:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:41:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYC2w-000056-LR; Tue, 13 Nov 2012 08:40:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYC2w-00004z-3c for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:40:38 +0000 Received: from [85.158.143.99:38987] by server-1.bemta-4.messagelabs.com id 5E/70-27934-58702A05; Tue, 13 Nov 2012 08:40:37 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352796036!26331097!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29382 invoked from network); 13 Nov 2012 08:40:36 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:40:36 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:40:36 +0000 Message-Id: <50A2159002000078000A7F96@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:40:32 +0000 From: "Jan Beulich" To: "Christoph Egger" , "Xudong Hao" References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> <1352737542.27833.296.camel@zakaz.uk.xensource.com> <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> In-Reply-To: <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Haicheng Li , Jinsong Liu , "Keir \(Xen.org\)" , Ian Campbell , Yunhong Jiang , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 02:40, "Hao, Xudong" wrote: >> -----Original Message----- >> From: Ian Campbell [mailto:Ian.Campbell@citrix.com] >> Sent: Tuesday, November 13, 2012 12:26 AM >> To: Jan Beulich >> Cc: Ian Jackson; Christoph Egger; xen-devel@lists.xen.org; Keir (Xen.org); > Liu, >> Jinsong; Liu, Jinsong; Jiang, Yunhong; Li, Haicheng; Hao, Xudong >> Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD >> >> On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: >> > >>> On 19.10.12 at 17:01, Ian Jackson wrote: >> > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support >> AMD"): >> > >> >>> On 19.10.12 at 15:10, Christoph Egger >> wrote: >> > >> > Ping? >> > >> >> > >> I'm afraid it's not really clear who should commit this - it's tools >> > >> side code, so IanJ or IanC would normally be the ones, but otoh >> > >> it's code requiring low level hardware knowledge to review the >> > >> patch, so both of them might want to rather not do the review. >> > >> In the past it was usually Keir who eventually committed such >> > >> patches, but I don't know whether he put this on his to-look-at- >> > >> and-eventually-commit list. >> > > >> > > My view is that I would like an ack from someone who understands >> > > what's going on ... >> > >> > Which would ideally be those who introduced the code, i.e. >> > Intel folks if I'm not mistaken... >> >> Lets CC some of them then. >> >> Intel folks -- any opinion on the patch below from Christoph? >> > > It's ok for me except for one comments. See below. > Of course I did not review the AMD only code. > >> + if (strstr(cpu_brand, "AMD")) >> + cpu_is_amd = 1; >> + else >> + cpu_is_intel = 1; >> + >> + if (cpu_is_intel) >> + type = INTEL_MCE_SRAO_MEM; >> + > > Isn't necessary to set a default AMD type? The "-t" parameter is required > for amd but not always for Intel for users, it's better to give a unified > usage for all users. Yes, I had pointed this out in an earlier reply already, as much as I had asked (in the context of a matching hypervisor side patch) about the reason for only dealing with bank 4 registers here. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:41:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:41:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYC2w-000056-LR; Tue, 13 Nov 2012 08:40:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYC2w-00004z-3c for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:40:38 +0000 Received: from [85.158.143.99:38987] by server-1.bemta-4.messagelabs.com id 5E/70-27934-58702A05; Tue, 13 Nov 2012 08:40:37 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-7.tower-216.messagelabs.com!1352796036!26331097!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTMwLjU3LjQ5LjI4ID0+IDM3NjM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29382 invoked from network); 13 Nov 2012 08:40:36 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-7.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:40:36 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 08:40:36 +0000 Message-Id: <50A2159002000078000A7F96@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 08:40:32 +0000 From: "Jan Beulich" To: "Christoph Egger" , "Xudong Hao" References: <506EE9A7.6090009@amd.com> <50815162.4090601@amd.com> <5081869B02000078000A2A1F@nat28.tlf.novell.com> <20609.27440.478178.971262@mariner.uk.xensource.com> <5081887502000078000A2A51@nat28.tlf.novell.com> <1352737542.27833.296.camel@zakaz.uk.xensource.com> <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> In-Reply-To: <403610A45A2B5242BD291EDAE8B37D300FF02D43@SHSMSX102.ccr.corp.intel.com> Mime-Version: 1.0 Content-Disposition: inline Cc: Haicheng Li , Jinsong Liu , "Keir \(Xen.org\)" , Ian Campbell , Yunhong Jiang , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 02:40, "Hao, Xudong" wrote: >> -----Original Message----- >> From: Ian Campbell [mailto:Ian.Campbell@citrix.com] >> Sent: Tuesday, November 13, 2012 12:26 AM >> To: Jan Beulich >> Cc: Ian Jackson; Christoph Egger; xen-devel@lists.xen.org; Keir (Xen.org); > Liu, >> Jinsong; Liu, Jinsong; Jiang, Yunhong; Li, Haicheng; Hao, Xudong >> Subject: Re: [Xen-devel] [PATCH] tools/xen-mceinj: support AMD >> >> On Fri, 2012-10-19 at 16:05 +0100, Jan Beulich wrote: >> > >>> On 19.10.12 at 17:01, Ian Jackson wrote: >> > > Jan Beulich writes ("Re: [Xen-devel] [PATCH] tools/xen-mceinj: support >> AMD"): >> > >> >>> On 19.10.12 at 15:10, Christoph Egger >> wrote: >> > >> > Ping? >> > >> >> > >> I'm afraid it's not really clear who should commit this - it's tools >> > >> side code, so IanJ or IanC would normally be the ones, but otoh >> > >> it's code requiring low level hardware knowledge to review the >> > >> patch, so both of them might want to rather not do the review. >> > >> In the past it was usually Keir who eventually committed such >> > >> patches, but I don't know whether he put this on his to-look-at- >> > >> and-eventually-commit list. >> > > >> > > My view is that I would like an ack from someone who understands >> > > what's going on ... >> > >> > Which would ideally be those who introduced the code, i.e. >> > Intel folks if I'm not mistaken... >> >> Lets CC some of them then. >> >> Intel folks -- any opinion on the patch below from Christoph? >> > > It's ok for me except for one comments. See below. > Of course I did not review the AMD only code. > >> + if (strstr(cpu_brand, "AMD")) >> + cpu_is_amd = 1; >> + else >> + cpu_is_intel = 1; >> + >> + if (cpu_is_intel) >> + type = INTEL_MCE_SRAO_MEM; >> + > > Isn't necessary to set a default AMD type? The "-t" parameter is required > for amd but not always for Intel for users, it's better to give a unified > usage for all users. Yes, I had pointed this out in an earlier reply already, as much as I had asked (in the context of a matching hypervisor side patch) about the reason for only dealing with bank 4 registers here. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:48:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:48:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCAP-0000KQ-Q0; Tue, 13 Nov 2012 08:48:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCAO-0000KI-SU; Tue, 13 Nov 2012 08:48:21 +0000 Received: from [193.109.254.147:32903] by server-7.bemta-14.messagelabs.com id BB/09-02272-35902A05; Tue, 13 Nov 2012 08:48:19 +0000 X-Env-Sender: Paul.Durrant@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352796371!8978064!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12581 invoked from network); 13 Nov 2012 08:46:11 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 08:46:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208,217";a="15769746" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 08:46:11 +0000 Received: from LONPMAILBOX01.citrite.net ([10.30.224.161]) by LONPMAILMX01.citrite.net ([10.30.203.162]) with mapi; Tue, 13 Nov 2012 08:46:11 +0000 From: Paul Durrant To: Rob Rhinehart , "xen-users@lists.xen.org" , "xen-devel@lists.xen.org" Date: Tue, 13 Nov 2012 08:46:44 +0000 Thread-Topic: [Xen-devel] NVIDIA VGX Hypervisor Thread-Index: Ac3BKp4j0OCeFQ4ZT1qqLsNBIrHJDAAUE/vQ Message-ID: <291EDFCB1E9E224A99088639C4762022011052985567@LONPMAILBOX01.citrite.net> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Subject: Re: [Xen-devel] NVIDIA VGX Hypervisor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0438394981905534461==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0438394981905534461== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_" --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, XenServer does not yet support GPU virtualization. It is something that i= s planned or a future release. Indeed it is not the same as passthrough. It= may work on open source Xen at some future date, but it's not something we= 're actively pursuing. Paul From: xen-devel-bounces@lists.xen.org [mailto:xen-devel-bounces@lists.xen.o= rg] On Behalf Of Rob Rhinehart Sent: 12 November 2012 23:07 To: xen-users@lists.xen.org; xen-devel@lists.xen.org Subject: [Xen-devel] NVIDIA VGX Hypervisor I've been reading that Xenserver supports GPU virtualization with NVIDIA VG= X. I assume this is different than PCI passthrough. Is there any support fo= r this in open source xen, or efforts to do so? Thank you --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi,<= /o:p>

 

  XenServer does not yet support GPU virtuali= zation. It is something that is planned or a future release. Indeed it is n= ot the same as passthrough. It may work on open source Xen at some future d= ate, but it’s not something we’re actively pursuing.=

 

  Paul

<= span style=3D'font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F= 497D'> 

From: xen-devel-bounces@lists.xen.org [mailto:xen-= devel-bounces@lists.xen.org] On Behalf Of Rob Rhinehart
Sent:<= /b> 12 November 2012 23:07
To: xen-users@lists.xen.org; xen-devel= @lists.xen.org
Subject: [Xen-devel] NVIDIA VGX Hypervisor

 

I've been reading that Xenserver supports GPU virtualization = with NVIDIA VGX. I assume this is different than PCI passthrough. Is t= here any support for this in open source xen, or efforts to do so?

 

Thank you

= --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_-- --===============0438394981905534461== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0438394981905534461==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 08:48:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:48:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCAP-0000KQ-Q0; Tue, 13 Nov 2012 08:48:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCAO-0000KI-SU; Tue, 13 Nov 2012 08:48:21 +0000 Received: from [193.109.254.147:32903] by server-7.bemta-14.messagelabs.com id BB/09-02272-35902A05; Tue, 13 Nov 2012 08:48:19 +0000 X-Env-Sender: Paul.Durrant@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1352796371!8978064!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgxNjQ=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12581 invoked from network); 13 Nov 2012 08:46:11 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 08:46:11 -0000 X-IronPort-AV: E=Sophos;i="4.80,764,1344211200"; d="scan'208,217";a="15769746" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 08:46:11 +0000 Received: from LONPMAILBOX01.citrite.net ([10.30.224.161]) by LONPMAILMX01.citrite.net ([10.30.203.162]) with mapi; Tue, 13 Nov 2012 08:46:11 +0000 From: Paul Durrant To: Rob Rhinehart , "xen-users@lists.xen.org" , "xen-devel@lists.xen.org" Date: Tue, 13 Nov 2012 08:46:44 +0000 Thread-Topic: [Xen-devel] NVIDIA VGX Hypervisor Thread-Index: Ac3BKp4j0OCeFQ4ZT1qqLsNBIrHJDAAUE/vQ Message-ID: <291EDFCB1E9E224A99088639C4762022011052985567@LONPMAILBOX01.citrite.net> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Subject: Re: [Xen-devel] NVIDIA VGX Hypervisor X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============0438394981905534461==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============0438394981905534461== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_" --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, XenServer does not yet support GPU virtualization. It is something that i= s planned or a future release. Indeed it is not the same as passthrough. It= may work on open source Xen at some future date, but it's not something we= 're actively pursuing. Paul From: xen-devel-bounces@lists.xen.org [mailto:xen-devel-bounces@lists.xen.o= rg] On Behalf Of Rob Rhinehart Sent: 12 November 2012 23:07 To: xen-users@lists.xen.org; xen-devel@lists.xen.org Subject: [Xen-devel] NVIDIA VGX Hypervisor I've been reading that Xenserver supports GPU virtualization with NVIDIA VG= X. I assume this is different than PCI passthrough. Is there any support fo= r this in open source xen, or efforts to do so? Thank you --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi,<= /o:p>

 

  XenServer does not yet support GPU virtuali= zation. It is something that is planned or a future release. Indeed it is n= ot the same as passthrough. It may work on open source Xen at some future d= ate, but it’s not something we’re actively pursuing.=

 

  Paul

<= span style=3D'font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F= 497D'> 

From: xen-devel-bounces@lists.xen.org [mailto:xen-= devel-bounces@lists.xen.org] On Behalf Of Rob Rhinehart
Sent:<= /b> 12 November 2012 23:07
To: xen-users@lists.xen.org; xen-devel= @lists.xen.org
Subject: [Xen-devel] NVIDIA VGX Hypervisor

 

I've been reading that Xenserver supports GPU virtualization = with NVIDIA VGX. I assume this is different than PCI passthrough. Is t= here any support for this in open source xen, or efforts to do so?

 

Thank you

= --_000_291EDFCB1E9E224A99088639C4762022011052985567LONPMAILBOX_-- --===============0438394981905534461== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============0438394981905534461==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 08:50:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:50:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCCN-0000WD-3k; Tue, 13 Nov 2012 08:50:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCCM-0000W4-1s for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:50:22 +0000 Received: from [85.158.143.99:35278] by server-1.bemta-4.messagelabs.com id 96/CD-27934-DC902A05; Tue, 13 Nov 2012 08:50:21 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352796618!24440872!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11730 invoked from network); 13 Nov 2012 08:50:19 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-12.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:50:19 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 13 Nov 2012 00:50:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="167661391" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by AZSMGA002.ch.intel.com with ESMTP; 13 Nov 2012 00:50:16 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.19.9.29) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 00:50:15 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx110.amr.corp.intel.com (10.19.9.29) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 00:50:15 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 16:50:13 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFg Date: Tue, 13 Nov 2012 08:50:13 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> In-Reply-To: <50A20DE302000078000A7F6B@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 4:08 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 01:11, "Zhang, Yang Z" wrote: > > Jan Beulich wrote on 2012-11-05: > >> so far it was my understanding that this option is intended to get > >> the DMA behavior that Dom0 observes as close as possible to how it > >> would be without IOMMU. > > > > Correct. There is a bit in context entry which controlling the DMA > > request(from this device) to walk or not walk the iommu page table. > > As we known, walking page table introduced extra cost, so we use this > > parameter to make sure the device which owned by dom0 not to walking > > iommu page table when DMA request is arrived. > > Okay, so that would be slightly different from the meaning I give to the > option (as described above). > > >> However, we're now dealing with a customer report where a single > >> function device is observed to initiate DMA operations appearing to > >> originate from function 1, which makes obvious that the option above > >> is not making things as transparent as I would have expected them to > >> be: Without IOMMU, such requests get processed fine, while with > IOMMU > >> (due to there not being a context entry for the bogus device) the > >> device fails to initialize (causing DMA faults, the presence of which > >> I had to convince myself of separately, as for whatever reason at > >> least the VT-d code doesn't issue any log message in that case). > > > > Sorry, I cannot understand your problem. Is there any bug in current > > VT-d code? > > We need to settle on the concept here first: What specifically is said option > intended to do? Basically, this options just allows the transactions from dom0's devices not subject to VT-d engine. Actually, It is not targeted to fix something, but just allows users isolating VT-d issues from dom0. As I know, in early days, VT-d is not that stable, if dom0's devices are controlled by VT-d, some strange issues may trigger in system's boot stage, so use this options to disable VT-d for Dom0. > Only then we can talk about bugs, and if there is one I suspect it's not only in > VT-d code, but equally much in AMD IOMMU's. > > The thing here is that a device functioning properly without IOMMU (with > "properly" not necessarily meaning it being implemented correctly as per > specification, albeit I also didn't check whether the spec would allow for the > observed behavior) doesn't once DMA translation is enabled (even if > suppressed for Dom0 via above option). > > The problem being that while device enumeration only finds a single device > at function zero of the respective (seg,bus,dev) tuple, DMA requests - as > seen by the IOMMU - originate from non-zero functions under the same > tuple. Since a non-discovered device doesn't get a context entry inserted, > this result in an IOMMU fault, rendering the device non-functional. > > The data from the system I have so far doesn't tell me whether the device > incorrectly claims itself as single function (with the functions other than func > 0 simply not being discovered during device enumeration, as single function > devices don't get their non-zero functions scanned) or whether the config > space for functions 1-7 indeed is unpopulated, with the device issuing > requests with non- zero function number for other, unexplained reasons. > Bottom line - I'm seeking advice as to whether working around this problem > in the IOMMU code is desirable/necessary, or whether this is a design flaw > on the device's side that just cannot be tolerated with an IOMMU in the > picture (which would need good reasoning, so that a customer expecting > such a device to work regardless of IOMMU usage can understand that this > cannot reasonably be made work). The issue is why the non-zero functions don't claim themselves during PCI bus scan. From security point of view, VT-d shouldn't allow transactions from the unknown devices. Xiantao _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 08:50:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 08:50:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCCN-0000WD-3k; Tue, 13 Nov 2012 08:50:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCCM-0000W4-1s for xen-devel@lists.xen.org; Tue, 13 Nov 2012 08:50:22 +0000 Received: from [85.158.143.99:35278] by server-1.bemta-4.messagelabs.com id 96/CD-27934-DC902A05; Tue, 13 Nov 2012 08:50:21 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-12.tower-216.messagelabs.com!1352796618!24440872!1 X-Originating-IP: [143.182.124.37] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMzcgPT4gMjI5NTg1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11730 invoked from network); 13 Nov 2012 08:50:19 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by server-12.tower-216.messagelabs.com with SMTP; 13 Nov 2012 08:50:19 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 13 Nov 2012 00:50:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="167661391" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by AZSMGA002.ch.intel.com with ESMTP; 13 Nov 2012 00:50:16 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.19.9.29) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 00:50:15 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx110.amr.corp.intel.com (10.19.9.29) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 00:50:15 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 16:50:13 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFg Date: Tue, 13 Nov 2012 08:50:13 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> In-Reply-To: <50A20DE302000078000A7F6B@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 4:08 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 01:11, "Zhang, Yang Z" wrote: > > Jan Beulich wrote on 2012-11-05: > >> so far it was my understanding that this option is intended to get > >> the DMA behavior that Dom0 observes as close as possible to how it > >> would be without IOMMU. > > > > Correct. There is a bit in context entry which controlling the DMA > > request(from this device) to walk or not walk the iommu page table. > > As we known, walking page table introduced extra cost, so we use this > > parameter to make sure the device which owned by dom0 not to walking > > iommu page table when DMA request is arrived. > > Okay, so that would be slightly different from the meaning I give to the > option (as described above). > > >> However, we're now dealing with a customer report where a single > >> function device is observed to initiate DMA operations appearing to > >> originate from function 1, which makes obvious that the option above > >> is not making things as transparent as I would have expected them to > >> be: Without IOMMU, such requests get processed fine, while with > IOMMU > >> (due to there not being a context entry for the bogus device) the > >> device fails to initialize (causing DMA faults, the presence of which > >> I had to convince myself of separately, as for whatever reason at > >> least the VT-d code doesn't issue any log message in that case). > > > > Sorry, I cannot understand your problem. Is there any bug in current > > VT-d code? > > We need to settle on the concept here first: What specifically is said option > intended to do? Basically, this options just allows the transactions from dom0's devices not subject to VT-d engine. Actually, It is not targeted to fix something, but just allows users isolating VT-d issues from dom0. As I know, in early days, VT-d is not that stable, if dom0's devices are controlled by VT-d, some strange issues may trigger in system's boot stage, so use this options to disable VT-d for Dom0. > Only then we can talk about bugs, and if there is one I suspect it's not only in > VT-d code, but equally much in AMD IOMMU's. > > The thing here is that a device functioning properly without IOMMU (with > "properly" not necessarily meaning it being implemented correctly as per > specification, albeit I also didn't check whether the spec would allow for the > observed behavior) doesn't once DMA translation is enabled (even if > suppressed for Dom0 via above option). > > The problem being that while device enumeration only finds a single device > at function zero of the respective (seg,bus,dev) tuple, DMA requests - as > seen by the IOMMU - originate from non-zero functions under the same > tuple. Since a non-discovered device doesn't get a context entry inserted, > this result in an IOMMU fault, rendering the device non-functional. > > The data from the system I have so far doesn't tell me whether the device > incorrectly claims itself as single function (with the functions other than func > 0 simply not being discovered during device enumeration, as single function > devices don't get their non-zero functions scanned) or whether the config > space for functions 1-7 indeed is unpopulated, with the device issuing > requests with non- zero function number for other, unexplained reasons. > Bottom line - I'm seeking advice as to whether working around this problem > in the IOMMU code is desirable/necessary, or whether this is a design flaw > on the device's side that just cannot be tolerated with an IOMMU in the > picture (which would need good reasoning, so that a customer expecting > such a device to work regardless of IOMMU usage can understand that this > cannot reasonably be made work). The issue is why the non-zero functions don't claim themselves during PCI bus scan. From security point of view, VT-d shouldn't allow transactions from the unknown devices. Xiantao _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 09:15:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:15:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCab-0001Ef-RG; Tue, 13 Nov 2012 09:15:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA0o-0006eT-Ly for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:30:18 +0000 Received: from [193.109.254.147:33095] by server-11.bemta-14.messagelabs.com id 65/2F-29027-9F8E1A05; Tue, 13 Nov 2012 06:30:17 +0000 X-Env-Sender: qianhu2011@gmail.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352788215!9463448!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17340 invoked from network); 13 Nov 2012 06:30:16 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 06:30:16 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so8509528vcb.32 for ; Mon, 12 Nov 2012 22:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=2+bE1UV1mcftgrtmHoRSFkVRrVs1/Frg3F2pQPbE8pQ=; b=ZnZgreHlL8B+F4F0XkG/Cyz9Y1N2WBIql7N5ZiWPtWSHrb2qIM2aGnWqWSryIdl08B nV5v74Ezx4z2d6F7ZvgM/WdWydlzq+GHrlik9nzSp4HjN3s5W660En8fCoyb0B3zoHKX ebUxPzUJXNXqgsHHQmti9/ejpKNvgtYDtnj7A0NsiyyEYy6Urm05GUPGVnIE3I4sZUc/ pXQBj1VGL6MWplgPmyPmBcTn0YDuJw7OjXXk4Ey/8lG8I/FnYAicAT/0Q2K8Uioudc1C ItcbND7Ezn5GKDy2aHAhxPg9JzKUZUf70lYOvIUe1Kcu+NubeJr01gufBtwq8yINp/cX Ajow== MIME-Version: 1.0 Received: by 10.58.94.109 with SMTP id db13mr24949208veb.39.1352788215088; Mon, 12 Nov 2012 22:30:15 -0800 (PST) Received: by 10.58.219.42 with HTTP; Mon, 12 Nov 2012 22:30:14 -0800 (PST) Date: Tue, 13 Nov 2012 14:30:14 +0800 Message-ID: From: Qian Hu To: xen-devel@lists.xen.org X-Mailman-Approved-At: Tue, 13 Nov 2012 09:15:24 +0000 Subject: [Xen-devel] Does xen-4.2.0 support VGA passthrough with the virtual machine created by xl command? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8820481319959022908==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8820481319959022908== Content-Type: multipart/alternative; boundary=047d7b6dcba804452d04ce5a8d84 --047d7b6dcba804452d04ce5a8d84 Content-Type: text/plain; charset=ISO-8859-1 Hi, everyone! I am working on xen-4.2.0 with spice remote connect. My host is Fedora 14 and guest is win7. I have installed spice package and now I can connect to guest by spice client. For better graphics experience, I want to try the VGA passthrough. With spice tool, I have to create a VM by xl command, and now I am wondering if it supports VGA passghrouth? If so, how should I test it ? The device model in my config file is "qemu-xen". Thank you! huqian --047d7b6dcba804452d04ce5a8d84 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, everyone!

I am work= ing on xen-4.2.0 with spice remote connect. =A0My host is Fedora 14 and gue= st is win7.

I have installed spice package and now I can connect to gues= t by spice client.

For better graphics experience, I want to try the =A0VG= A passthrough.

With spice tool, I have to create a VM by xl command, and no= w I am wondering if it=A0supports = VGA passghrouth?

If so, ho= w should I =A0test it ?

The device model in my config file is "qemu-xen".<= /span>

Thank you!

huqian

--047d7b6dcba804452d04ce5a8d84-- --===============8820481319959022908== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8820481319959022908==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 09:15:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:15:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYCab-0001Ef-RG; Tue, 13 Nov 2012 09:15:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYA0o-0006eT-Ly for xen-devel@lists.xen.org; Tue, 13 Nov 2012 06:30:18 +0000 Received: from [193.109.254.147:33095] by server-11.bemta-14.messagelabs.com id 65/2F-29027-9F8E1A05; Tue, 13 Nov 2012 06:30:17 +0000 X-Env-Sender: qianhu2011@gmail.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1352788215!9463448!1 X-Originating-IP: [209.85.220.173] X-SpamReason: No, hits=0.3 required=7.0 tests=HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17340 invoked from network); 13 Nov 2012 06:30:16 -0000 Received: from mail-vc0-f173.google.com (HELO mail-vc0-f173.google.com) (209.85.220.173) by server-16.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 06:30:16 -0000 Received: by mail-vc0-f173.google.com with SMTP id fl15so8509528vcb.32 for ; Mon, 12 Nov 2012 22:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=2+bE1UV1mcftgrtmHoRSFkVRrVs1/Frg3F2pQPbE8pQ=; b=ZnZgreHlL8B+F4F0XkG/Cyz9Y1N2WBIql7N5ZiWPtWSHrb2qIM2aGnWqWSryIdl08B nV5v74Ezx4z2d6F7ZvgM/WdWydlzq+GHrlik9nzSp4HjN3s5W660En8fCoyb0B3zoHKX ebUxPzUJXNXqgsHHQmti9/ejpKNvgtYDtnj7A0NsiyyEYy6Urm05GUPGVnIE3I4sZUc/ pXQBj1VGL6MWplgPmyPmBcTn0YDuJw7OjXXk4Ey/8lG8I/FnYAicAT/0Q2K8Uioudc1C ItcbND7Ezn5GKDy2aHAhxPg9JzKUZUf70lYOvIUe1Kcu+NubeJr01gufBtwq8yINp/cX Ajow== MIME-Version: 1.0 Received: by 10.58.94.109 with SMTP id db13mr24949208veb.39.1352788215088; Mon, 12 Nov 2012 22:30:15 -0800 (PST) Received: by 10.58.219.42 with HTTP; Mon, 12 Nov 2012 22:30:14 -0800 (PST) Date: Tue, 13 Nov 2012 14:30:14 +0800 Message-ID: From: Qian Hu To: xen-devel@lists.xen.org X-Mailman-Approved-At: Tue, 13 Nov 2012 09:15:24 +0000 Subject: [Xen-devel] Does xen-4.2.0 support VGA passthrough with the virtual machine created by xl command? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============8820481319959022908==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============8820481319959022908== Content-Type: multipart/alternative; boundary=047d7b6dcba804452d04ce5a8d84 --047d7b6dcba804452d04ce5a8d84 Content-Type: text/plain; charset=ISO-8859-1 Hi, everyone! I am working on xen-4.2.0 with spice remote connect. My host is Fedora 14 and guest is win7. I have installed spice package and now I can connect to guest by spice client. For better graphics experience, I want to try the VGA passthrough. With spice tool, I have to create a VM by xl command, and now I am wondering if it supports VGA passghrouth? If so, how should I test it ? The device model in my config file is "qemu-xen". Thank you! huqian --047d7b6dcba804452d04ce5a8d84 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, everyone!

I am work= ing on xen-4.2.0 with spice remote connect. =A0My host is Fedora 14 and gue= st is win7.

I have installed spice package and now I can connect to gues= t by spice client.

For better graphics experience, I want to try the =A0VG= A passthrough.

With spice tool, I have to create a VM by xl command, and no= w I am wondering if it=A0supports = VGA passghrouth?

If so, ho= w should I =A0test it ?

The device model in my config file is "qemu-xen".<= /span>

Thank you!

huqian

--047d7b6dcba804452d04ce5a8d84-- --===============8820481319959022908== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============8820481319959022908==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 09:42:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:42:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD01-0001Yu-T9; Tue, 13 Nov 2012 09:41:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD00-0001Yj-Nb for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:41:40 +0000 Received: from [85.158.143.99:14369] by server-2.bemta-4.messagelabs.com id 4F/43-28922-3D512A05; Tue, 13 Nov 2012 09:41:39 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352799697!29147963!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7920 invoked from network); 13 Nov 2012 09:41:37 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 13 Nov 2012 09:41:37 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 09:41:37 +0000 Message-Id: <50A223DE02000078000A7FE6@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 09:41:34 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> We need to settle on the concept here first: What specifically is said >> option intended to do? > > Basically, this options just allows the transactions from dom0's devices > not subject to VT-d engine. Actually, It is not targeted to fix something, > but just allows users isolating VT-d issues from dom0. > As I know, in early days, VT-d is not that stable, if dom0's devices are > controlled by VT-d, some strange issues may trigger in system's boot stage, > so use this options to disable VT-d for Dom0. Which it doesn't, as the specific case here shows. >> Bottom line - I'm seeking advice as to whether working around this problem >> in the IOMMU code is desirable/necessary, or whether this is a design flaw >> on the device's side that just cannot be tolerated with an IOMMU in the >> picture (which would need good reasoning, so that a customer expecting >> such a device to work regardless of IOMMU usage can understand that this >> cannot reasonably be made work). > > The issue is why the non-zero functions don't claim themselves during PCI bus > scan. As said - I can't tell whether there is a secondary function in the first place (and I didn't try to find out because it doesn't really matter for the purpose of finding a solution/workaround). > From security point of view, VT-d shouldn't allow transactions from > the unknown devices. That's inconsistent with what you say above: Either there is a way to suppress IOMMU involvement in Dom0 operation (which is inherently insecure), or there is not. If there is, there's no point in claiming security for one aspect but not another. I think it is obvious that I'm not suggesting to allow pass through of such a device at this point (albeit even that would seem possible and, from a customer's pov, desirable), and as long as users are aware of the security implications when using the option under discussion here, I don't see why that option shouldn't be made fully work. It should be left to the admins of individual systems to decide between security and functionality, we should provide them with ways to implement their choice. Otoh I'm unaware of a similar option for native Linux, yet it is suffering the same problem on that system when DMA translation gets turned on. But the direction you give to the discussion doesn't lead us towards a solution for the customer (or a profound explanation why none is possible), so if we could please focus on that aspect again. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 09:42:06 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:42:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD01-0001Yu-T9; Tue, 13 Nov 2012 09:41:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD00-0001Yj-Nb for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:41:40 +0000 Received: from [85.158.143.99:14369] by server-2.bemta-4.messagelabs.com id 4F/43-28922-3D512A05; Tue, 13 Nov 2012 09:41:39 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352799697!29147963!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7920 invoked from network); 13 Nov 2012 09:41:37 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 13 Nov 2012 09:41:37 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 09:41:37 +0000 Message-Id: <50A223DE02000078000A7FE6@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 09:41:34 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> We need to settle on the concept here first: What specifically is said >> option intended to do? > > Basically, this options just allows the transactions from dom0's devices > not subject to VT-d engine. Actually, It is not targeted to fix something, > but just allows users isolating VT-d issues from dom0. > As I know, in early days, VT-d is not that stable, if dom0's devices are > controlled by VT-d, some strange issues may trigger in system's boot stage, > so use this options to disable VT-d for Dom0. Which it doesn't, as the specific case here shows. >> Bottom line - I'm seeking advice as to whether working around this problem >> in the IOMMU code is desirable/necessary, or whether this is a design flaw >> on the device's side that just cannot be tolerated with an IOMMU in the >> picture (which would need good reasoning, so that a customer expecting >> such a device to work regardless of IOMMU usage can understand that this >> cannot reasonably be made work). > > The issue is why the non-zero functions don't claim themselves during PCI bus > scan. As said - I can't tell whether there is a secondary function in the first place (and I didn't try to find out because it doesn't really matter for the purpose of finding a solution/workaround). > From security point of view, VT-d shouldn't allow transactions from > the unknown devices. That's inconsistent with what you say above: Either there is a way to suppress IOMMU involvement in Dom0 operation (which is inherently insecure), or there is not. If there is, there's no point in claiming security for one aspect but not another. I think it is obvious that I'm not suggesting to allow pass through of such a device at this point (albeit even that would seem possible and, from a customer's pov, desirable), and as long as users are aware of the security implications when using the option under discussion here, I don't see why that option shouldn't be made fully work. It should be left to the admins of individual systems to decide between security and functionality, we should provide them with ways to implement their choice. Otoh I'm unaware of a similar option for native Linux, yet it is suffering the same problem on that system when DMA translation gets turned on. But the direction you give to the discussion doesn't lead us towards a solution for the customer (or a profound explanation why none is possible), so if we could please focus on that aspect again. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 09:46:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:46:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD41-0001nM-Na; Tue, 13 Nov 2012 09:45:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD40-0001nE-21 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:45:48 +0000 Received: from [85.158.139.83:16736] by server-7.bemta-5.messagelabs.com id F9/06-23096-BC612A05; Tue, 13 Nov 2012 09:45:47 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352799946!30006939!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15599 invoked from network); 13 Nov 2012 09:45:46 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:45:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771498" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:45:42 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:45:41 +0000 Message-ID: <1352799940.7491.11.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Juan Lorenzana Date: Tue, 13 Nov 2012 09:45:40 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] .vhd will not boot in VM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org VGhpcyBsaXN0IGlzIGZvciBkZXZlbG9wbWVudCBvZiB0aGUgWGVuIGh5cGVydmlzb3IsIG5vdCBm b3IgdXNlciBzdXBwb3J0Cm9mIGVpdGhlciB0aGUgWGVuIHN1cHBsaWVkIHRvb2xzIG9yIFhDUC4K ClRoZSBYQ1AgZXhwZXJ0aXNlIHRlbmRzIHRvIGhhbmcgb3V0IG9uIHhlbi1hcGlALgoKSWFuLgoK T24gRnJpLCAyMDEyLTExLTA5IGF0IDExOjAxICswMDAwLCBKdWFuIExvcmVuemFuYSB3cm90ZToK PiBXZSBoYWQgYSBYQ1AgMS41IHBvb2wgd2l0aCAyIG1hY2hpbmVzIGFzIGhvc3RzLiAgVGhlIHN0 b3JhZ2UgcG9vbAo+IHdoaWNoIGFzIE5GUyBtb3VudGVkIGxvc3QgaXRzIGFiaWxpdHkgdG8gZXhw b3J0IHRoZSBmaWxlc3lzdGVtIHdpdGgKPiB0aGUgVk0gaW1hZ2VzIG9uIGl0Lgo+IAo+ICAKPiAK PiBXZSBjb250YWN0ZWQgdGhlIHZlbmRvciBhbmQgd2Ugd2VyZSBhYmxlIHRvIHJlc3RvcmUgaXQu ICBIb3dldmVyLCB0aGV5Cj4gaGFkIHJlY29tbWVuZGVkIHRoYXQgd2UgZGVsZXRlIHRoZSBYQ1Ag UG9vbCwgcmVjcmVhdGUgaXQsIGFkZCB0aGUKPiBob3N0cyBiYWNrIGluLCBhbmQgdGhlbiBtb3Vu dCB0aGUgc3RvcmFnZS4KPiAKPiAgCj4gCj4gVGhhdCBpcyB3aGVyZSB3ZSBhcmUgYXQgbm93LiAg V2UgY2FuIHNlZSB0aGUgc3RvcmFnZSBhbmQgdGhlIFZNCj4gaW1hZ2VzLiAgSG93ZXZlciBpbiBY Q1AgWGVuIENlbnRlciB3aGVuIGxvb2tpbmcgYXQgdGhlIGltYWdlcyBpcyBjbGVhcgo+IHRoYXQg dGhlIG1ldGFkYXRhIGlzIGxvc3QuICBTbyB3ZSBjYW4gbm90IHNlZSB3aGljaCBpbWFnZSBvciBz bmFwIHNob3QKPiBiZWxvbmdzIHRvIHdoaWNoIFZNLiAgVGhlIG5hbWVzIGFsbCBhcmUgYmxhbmsg d2hlbiB3ZSBsb29rIGF0IHRoZQo+IHN0b3JhZ2UuCj4gCj4gIAo+IAo+IEFsc28sIGlmIEkgcmFu ZG9tbHkgbW91bnQgYW4gaW1hZ2UgdG8gYSBWTSwgaXQgZG9lcyBub3QgYm9vdC4gIEl0Cj4gcHJv ZHVjZXMgYW4gZXJyb3IgdGhhdCBzYXlzOgo+IAo+ICAKPiAKPiBUcmFjZWJhY2sgKG1vc3QgcmVj ZW50IGNhbGwgbGFzdCk6IC0gRmlsZSDigJwvdXNyL2JpbnB5Z3J1YuKAnSwgbGluZSA4MDgsCj4g aW4gPyDigJMgZnMgPSBmc2ltYWdlLm9wZW4oZmlsZSxwYXJ0X29mZnNbMFssIGJvb3Rmc29wdGlv bnMpIOKAkyBJT0Vycm9yOgo+IFtFcnJubyA5NV0gT3BlcmF0aW9uIG5vdCBzdXBwb3J0ZWQuCj4g Cj4gIAo+IAo+IFRoZSBzeXN0ZW0ga2VwdCB0aGUgVk0gaW5mb3JtYXRpb24gYXMgd2UgZGVzdHJv eWVkIHRoZSBwb29sIGFuZCB0aGVuCj4gY3JlYXRlZCBhIG5ldyBvbmUgYnV0IGl0IGxvb2tzIGxp a2Ugd2Ugb25seSBzZWUgc25hcHNob3RzIHRocm91Z2gKPiBYZW5DZW50ZXIuICBJdHMgbGlrZSB0 aGUgcmVhbCAudmhkIHRoYXQgd2VyZSBydW5uaW5nIGFyZSBub3Qgc2hvd2luZwo+IHVwLgo+IAo+ ICAKPiAKPiBJIGtub3cgaXQgaXMgcHJldHR5IGJhZC4gIFdlIHNob3VsZCBub3QgaGF2ZSBsaXN0 ZW5lZCB0byB0aGUgc3RvcmFnZQo+IGd1eXMuICAKPiAKPiAgCj4gCj4gRG9lcyBhbnlvbmUga25v dyBzb21lb25lIHRoYXQgY2FuIGhlbHA/IAo+IAo+ICAKPiAKPiBKdWFuCj4gCj4gCgoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 09:46:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:46:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD41-0001nM-Na; Tue, 13 Nov 2012 09:45:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYD40-0001nE-21 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:45:48 +0000 Received: from [85.158.139.83:16736] by server-7.bemta-5.messagelabs.com id F9/06-23096-BC612A05; Tue, 13 Nov 2012 09:45:47 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-182.messagelabs.com!1352799946!30006939!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15599 invoked from network); 13 Nov 2012 09:45:46 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:45:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771498" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:45:42 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:45:41 +0000 Message-ID: <1352799940.7491.11.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Juan Lorenzana Date: Tue, 13 Nov 2012 09:45:40 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] .vhd will not boot in VM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org VGhpcyBsaXN0IGlzIGZvciBkZXZlbG9wbWVudCBvZiB0aGUgWGVuIGh5cGVydmlzb3IsIG5vdCBm b3IgdXNlciBzdXBwb3J0Cm9mIGVpdGhlciB0aGUgWGVuIHN1cHBsaWVkIHRvb2xzIG9yIFhDUC4K ClRoZSBYQ1AgZXhwZXJ0aXNlIHRlbmRzIHRvIGhhbmcgb3V0IG9uIHhlbi1hcGlALgoKSWFuLgoK T24gRnJpLCAyMDEyLTExLTA5IGF0IDExOjAxICswMDAwLCBKdWFuIExvcmVuemFuYSB3cm90ZToK PiBXZSBoYWQgYSBYQ1AgMS41IHBvb2wgd2l0aCAyIG1hY2hpbmVzIGFzIGhvc3RzLiAgVGhlIHN0 b3JhZ2UgcG9vbAo+IHdoaWNoIGFzIE5GUyBtb3VudGVkIGxvc3QgaXRzIGFiaWxpdHkgdG8gZXhw b3J0IHRoZSBmaWxlc3lzdGVtIHdpdGgKPiB0aGUgVk0gaW1hZ2VzIG9uIGl0Lgo+IAo+ICAKPiAK PiBXZSBjb250YWN0ZWQgdGhlIHZlbmRvciBhbmQgd2Ugd2VyZSBhYmxlIHRvIHJlc3RvcmUgaXQu ICBIb3dldmVyLCB0aGV5Cj4gaGFkIHJlY29tbWVuZGVkIHRoYXQgd2UgZGVsZXRlIHRoZSBYQ1Ag UG9vbCwgcmVjcmVhdGUgaXQsIGFkZCB0aGUKPiBob3N0cyBiYWNrIGluLCBhbmQgdGhlbiBtb3Vu dCB0aGUgc3RvcmFnZS4KPiAKPiAgCj4gCj4gVGhhdCBpcyB3aGVyZSB3ZSBhcmUgYXQgbm93LiAg V2UgY2FuIHNlZSB0aGUgc3RvcmFnZSBhbmQgdGhlIFZNCj4gaW1hZ2VzLiAgSG93ZXZlciBpbiBY Q1AgWGVuIENlbnRlciB3aGVuIGxvb2tpbmcgYXQgdGhlIGltYWdlcyBpcyBjbGVhcgo+IHRoYXQg dGhlIG1ldGFkYXRhIGlzIGxvc3QuICBTbyB3ZSBjYW4gbm90IHNlZSB3aGljaCBpbWFnZSBvciBz bmFwIHNob3QKPiBiZWxvbmdzIHRvIHdoaWNoIFZNLiAgVGhlIG5hbWVzIGFsbCBhcmUgYmxhbmsg d2hlbiB3ZSBsb29rIGF0IHRoZQo+IHN0b3JhZ2UuCj4gCj4gIAo+IAo+IEFsc28sIGlmIEkgcmFu ZG9tbHkgbW91bnQgYW4gaW1hZ2UgdG8gYSBWTSwgaXQgZG9lcyBub3QgYm9vdC4gIEl0Cj4gcHJv ZHVjZXMgYW4gZXJyb3IgdGhhdCBzYXlzOgo+IAo+ICAKPiAKPiBUcmFjZWJhY2sgKG1vc3QgcmVj ZW50IGNhbGwgbGFzdCk6IC0gRmlsZSDigJwvdXNyL2JpbnB5Z3J1YuKAnSwgbGluZSA4MDgsCj4g aW4gPyDigJMgZnMgPSBmc2ltYWdlLm9wZW4oZmlsZSxwYXJ0X29mZnNbMFssIGJvb3Rmc29wdGlv bnMpIOKAkyBJT0Vycm9yOgo+IFtFcnJubyA5NV0gT3BlcmF0aW9uIG5vdCBzdXBwb3J0ZWQuCj4g Cj4gIAo+IAo+IFRoZSBzeXN0ZW0ga2VwdCB0aGUgVk0gaW5mb3JtYXRpb24gYXMgd2UgZGVzdHJv eWVkIHRoZSBwb29sIGFuZCB0aGVuCj4gY3JlYXRlZCBhIG5ldyBvbmUgYnV0IGl0IGxvb2tzIGxp a2Ugd2Ugb25seSBzZWUgc25hcHNob3RzIHRocm91Z2gKPiBYZW5DZW50ZXIuICBJdHMgbGlrZSB0 aGUgcmVhbCAudmhkIHRoYXQgd2VyZSBydW5uaW5nIGFyZSBub3Qgc2hvd2luZwo+IHVwLgo+IAo+ ICAKPiAKPiBJIGtub3cgaXQgaXMgcHJldHR5IGJhZC4gIFdlIHNob3VsZCBub3QgaGF2ZSBsaXN0 ZW5lZCB0byB0aGUgc3RvcmFnZQo+IGd1eXMuICAKPiAKPiAgCj4gCj4gRG9lcyBhbnlvbmUga25v dyBzb21lb25lIHRoYXQgY2FuIGhlbHA/IAo+IAo+ICAKPiAKPiBKdWFuCj4gCj4gCgoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 09:52:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:52:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDAV-00021c-My; Tue, 13 Nov 2012 09:52:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDAU-00020X-8O for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:52:30 +0000 Received: from [85.158.143.35:6532] by server-1.bemta-4.messagelabs.com id 8D/CA-27934-D5812A05; Tue, 13 Nov 2012 09:52:29 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352800348!12020588!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26670 invoked from network); 13 Nov 2012 09:52:28 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:52:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771698" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:52:28 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:52:27 +0000 Message-ID: <1352800347.7491.15.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Rob Lampe Date: Tue, 13 Nov 2012 09:52:27 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Reboot failure in Xen 4.2.0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 16:44 +0000, Rob Lampe wrote: > Hi, > > I am having an issue where a small percentage of the time, rebooting a > VM from the VM does not actually work. > > Xen Version: 4.2.0 > OS: Debian 6.0 > Kernel: 3.2.30 > > Note, we are still using xend instead of xl. Could that be the problem? >From the trace this certainly appears to be a xend problem. I'm afraid that rather limits the time people here are going to be able to spend investigating. > [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2499) XendDomainInfo.constructDomain > [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:488) VM start failed Traceback (most recent call last): > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start > XendTask.log_progress(0, 30, self._constructDomain) > File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress > retval = func(*args, **kwds) > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain > self._recreateDom() > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom > complete(self.dompath, lambda t: self._recreateDomFunc(t)) > File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete > if t.commit(): > File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit > rc = xshandle().transaction_end(self.transaction, False) > Error: (2, 'No such file or directory') I guess this is the issue. If you want to try and track it down I'd suggest adding additional logging at the various locations pointed to by this callchain to try and identify what it is doing and what is not present ("No such file or directory"). Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 09:52:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 09:52:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDAV-00021c-My; Tue, 13 Nov 2012 09:52:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDAU-00020X-8O for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:52:30 +0000 Received: from [85.158.143.35:6532] by server-1.bemta-4.messagelabs.com id 8D/CA-27934-D5812A05; Tue, 13 Nov 2012 09:52:29 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352800348!12020588!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26670 invoked from network); 13 Nov 2012 09:52:28 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:52:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771698" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:52:28 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:52:27 +0000 Message-ID: <1352800347.7491.15.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Rob Lampe Date: Tue, 13 Nov 2012 09:52:27 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Reboot failure in Xen 4.2.0 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 16:44 +0000, Rob Lampe wrote: > Hi, > > I am having an issue where a small percentage of the time, rebooting a > VM from the VM does not actually work. > > Xen Version: 4.2.0 > OS: Debian 6.0 > Kernel: 3.2.30 > > Note, we are still using xend instead of xl. Could that be the problem? >From the trace this certainly appears to be a xend problem. I'm afraid that rather limits the time people here are going to be able to spend investigating. > [2012-11-12 14:47:20 2381] DEBUG (XendDomainInfo:2499) XendDomainInfo.constructDomain > [2012-11-12 14:47:20 2381] ERROR (XendDomainInfo:488) VM start failed Traceback (most recent call last): > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 473, in start > XendTask.log_progress(0, 30, self._constructDomain) > File "/usr/lib/python2.6/dist-packages/xen/xend/XendTask.py", line 209, in log_progress > retval = func(*args, **kwds) > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 2576, in _constructDomain > self._recreateDom() > File "/usr/lib/python2.6/dist-packages/xen/xend/XendDomainInfo.py", line 1730, in _recreateDom > complete(self.dompath, lambda t: self._recreateDomFunc(t)) > File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 364, in complete > if t.commit(): > File "/usr/lib/python2.6/dist-packages/xen/xend/xenstore/xstransact.py", line 41, in commit > rc = xshandle().transaction_end(self.transaction, False) > Error: (2, 'No such file or directory') I guess this is the issue. If you want to try and track it down I'd suggest adding additional logging at the various locations pointed to by this callchain to try and identify what it is doing and what is not present ("No such file or directory"). Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:00:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDHf-0002As-JZ; Tue, 13 Nov 2012 09:59:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDHe-0002An-IZ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:59:54 +0000 Received: from [85.158.138.51:7164] by server-2.bemta-3.messagelabs.com id C3/BF-04744-91A12A05; Tue, 13 Nov 2012 09:59:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352800792!29807516!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6846 invoked from network); 13 Nov 2012 09:59:53 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:59:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771919" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:59:52 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:59:52 +0000 Message-ID: <1352800791.7491.21.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 09:59:51 +0000 In-Reply-To: <50A16639.2090209@gmail.com> References: <50A16639.2090209@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 21:12 +0000, Razvan Cojocaru wrote: > Hello, > > I'm interested in establishing a communication channel between the Xen > hypervisor and a dom0 userspace application. Ideally this would be a > 2-way channel, with the hypervisor asynchronously notifying this > application, and then (for certain types of messages) wait for a reply > from the userspace consumer. Sounds a lot like the model used by the IOREQs, this is the mechanism for dispatching MMIO emulation to the qemu process for HVM domains. > What would you recommend for my case? Where (if anywhere) might I be > able to find a clear, concise, example of allocating and sharing memory > pages containing a ring buffer used for hypervisor <-> dom0 userspace > communication (hopefully even simpler that trace.c)? I think I'd look at the ioreq stuff in preference to the trace stuff. You probably want to use a normal evtchn rather than VIRQ. The code which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN should give a reasonable starting point (I think, I'm not actually the familiar with this bit of Xen). It might also be useful if you describe your actual end-goal -- i.e. what you are ultimately trying to achieve. It may be that there are better approaches or even existing solutions or things which are already close to your needs. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:00:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDHf-0002As-JZ; Tue, 13 Nov 2012 09:59:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDHe-0002An-IZ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 09:59:54 +0000 Received: from [85.158.138.51:7164] by server-2.bemta-3.messagelabs.com id C3/BF-04744-91A12A05; Tue, 13 Nov 2012 09:59:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352800792!29807516!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6846 invoked from network); 13 Nov 2012 09:59:53 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 09:59:53 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771919" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 09:59:52 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 09:59:52 +0000 Message-ID: <1352800791.7491.21.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 09:59:51 +0000 In-Reply-To: <50A16639.2090209@gmail.com> References: <50A16639.2090209@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, 2012-11-12 at 21:12 +0000, Razvan Cojocaru wrote: > Hello, > > I'm interested in establishing a communication channel between the Xen > hypervisor and a dom0 userspace application. Ideally this would be a > 2-way channel, with the hypervisor asynchronously notifying this > application, and then (for certain types of messages) wait for a reply > from the userspace consumer. Sounds a lot like the model used by the IOREQs, this is the mechanism for dispatching MMIO emulation to the qemu process for HVM domains. > What would you recommend for my case? Where (if anywhere) might I be > able to find a clear, concise, example of allocating and sharing memory > pages containing a ring buffer used for hypervisor <-> dom0 userspace > communication (hopefully even simpler that trace.c)? I think I'd look at the ioreq stuff in preference to the trace stuff. You probably want to use a normal evtchn rather than VIRQ. The code which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN should give a reasonable starting point (I think, I'm not actually the familiar with this bit of Xen). It might also be useful if you describe your actual end-goal -- i.e. what you are ultimately trying to achieve. It may be that there are better approaches or even existing solutions or things which are already close to your needs. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:01:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:01:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDIl-0002JM-2V; Tue, 13 Nov 2012 10:01:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDIj-0002J5-QZ for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 10:01:02 +0000 Received: from [85.158.143.35:54643] by server-1.bemta-4.messagelabs.com id 3C/8A-27934-D5A12A05; Tue, 13 Nov 2012 10:01:01 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352800859!17468198!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21844 invoked from network); 13 Nov 2012 10:00:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:00:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771954" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:00:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:00:54 +0000 Message-ID: <1352800853.7491.22.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Mukesh Rathor Date: Tue, 13 Nov 2012 10:00:53 +0000 In-Reply-To: <20121112190934.5e702799@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > Hi, > > I am wondering if there's libxl expert who can help me make some PVH > related changes to libxl, pref in the US time zone. I could consult on > irc or the phone. I think most of the libxl experts are in European time zones. Probably the best bet is to just ask your questions either here or on IRC. > I find the libxl code hard to read, and don't > want to spend lot of time figuring it out if someone can just help > quickly. Can you elaborate on this? We'd like to improve things if we can. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:01:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:01:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDIl-0002JM-2V; Tue, 13 Nov 2012 10:01:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDIj-0002J5-QZ for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 10:01:02 +0000 Received: from [85.158.143.35:54643] by server-1.bemta-4.messagelabs.com id 3C/8A-27934-D5A12A05; Tue, 13 Nov 2012 10:01:01 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352800859!17468198!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21844 invoked from network); 13 Nov 2012 10:00:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:00:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15771954" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:00:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:00:54 +0000 Message-ID: <1352800853.7491.22.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Mukesh Rathor Date: Tue, 13 Nov 2012 10:00:53 +0000 In-Reply-To: <20121112190934.5e702799@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > Hi, > > I am wondering if there's libxl expert who can help me make some PVH > related changes to libxl, pref in the US time zone. I could consult on > irc or the phone. I think most of the libxl experts are in European time zones. Probably the best bet is to just ask your questions either here or on IRC. > I find the libxl code hard to read, and don't > want to spend lot of time figuring it out if someone can just help > quickly. Can you elaborate on this? We'd like to improve things if we can. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:02:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:02:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDK4-0002SE-Hz; Tue, 13 Nov 2012 10:02:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDK2-0002S1-QH for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:02:22 +0000 Received: from [85.158.139.211:17941] by server-15.bemta-5.messagelabs.com id B2/8E-26920-DAA12A05; Tue, 13 Nov 2012 10:02:21 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352800940!20002740!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15391 invoked from network); 13 Nov 2012 10:02:20 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:02:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15772001" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:02:05 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:02:04 +0000 Message-ID: <1352800923.7491.23.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Qian Hu Date: Tue, 13 Nov 2012 10:02:03 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Does xen-4.2.0 support VGA passthrough with the virtual machine created by xl command? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 06:30 +0000, Qian Hu wrote: > With spice tool, I have to create a VM by xl command, and now I am > wondering if it supports VGA passghrouth? This list is for the development of Xen. You';d probably have more luck with these sorts of support requests on the xen-users list. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:02:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:02:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDK4-0002SE-Hz; Tue, 13 Nov 2012 10:02:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDK2-0002S1-QH for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:02:22 +0000 Received: from [85.158.139.211:17941] by server-15.bemta-5.messagelabs.com id B2/8E-26920-DAA12A05; Tue, 13 Nov 2012 10:02:21 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352800940!20002740!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15391 invoked from network); 13 Nov 2012 10:02:20 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:02:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15772001" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:02:05 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:02:04 +0000 Message-ID: <1352800923.7491.23.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Qian Hu Date: Tue, 13 Nov 2012 10:02:03 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Does xen-4.2.0 support VGA passthrough with the virtual machine created by xl command? X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 06:30 +0000, Qian Hu wrote: > With spice tool, I have to create a VM by xl command, and now I am > wondering if it supports VGA passghrouth? This list is for the development of Xen. You';d probably have more luck with these sorts of support requests on the xen-users list. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:10:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:10:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDS5-0002nP-At; Tue, 13 Nov 2012 10:10:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDS3-0002nK-6r for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:10:39 +0000 Received: from [85.158.139.83:4583] by server-11.bemta-5.messagelabs.com id 9B/C0-03409-E9C12A05; Tue, 13 Nov 2012 10:10:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352801436!25736805!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31687 invoked from network); 13 Nov 2012 10:10:36 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:10:36 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3355491wgb.32 for ; Tue, 13 Nov 2012 02:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=EvQWz52jXFo/fMnNfr7F4Nsq4OLsIjbDTY0fV9c0O2U=; b=EG74WBAUjT+66N1CDuKz4o6otIvsqThuOp7wUVMwihA8YjzByM01hWEWZmulyrIf8T ivy0EQ8sLdn3Ps6n3jxfnPwt1/VWqVe8kXZOBARZJYPQwr8V8VtIkbginDZT6kJhSgB6 4fDyIZ7cPwOJDtGmhqwwqyRCNgm5+lcl41Rtn0sf5WMczVOlTCtZsyEmDGuWz5+50yLc +9hJEIUa8klX52H9AIt4y99B1PzJZTimtarq+AHDZTp/ogU3lPqk4AQXv9awFlDUg99m myW+LkrOHStyzEhaKd9774ZqfpHGAS24hIXgLBdtpoZZcStQ2nZMLMMOxgDZ3p952GcN Qc9g== Received: by 10.216.218.9 with SMTP id j9mr28002wep.115.1352801436364; Tue, 13 Nov 2012 02:10:36 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b1sm2277941wix.11.2012.11.13.02.10.34 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:10:35 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 10:10:31 +0000 From: Keir Fraser To: Jan Beulich , Matthew Daley Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check Thread-Index: Ac3Bhxy1iQeGYjnp+EG6ChoSWN+GzA== In-Reply-To: <50A214B902000078000A7F88@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 08:36, "Jan Beulich" wrote: >> Fix by using the correct cpumask buffer size in place of sizeof. >> >> Signed-off-by: Matthew Daley > > Acked-by: Jan Beulich > > However, I would have preferred the adjustment to be ... > >> diff --git a/xen/common/domctl.c b/xen/common/domctl.c >> index e153cb4..204e951 100644 >> --- a/xen/common/domctl.c >> +++ b/xen/common/domctl.c >> @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( >> { >> if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) >> err = -EFAULT; >> - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= >> sizeof(bytemap)) ) >> + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + >> 7) / 8) ) > > if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= copy_bytes) ) > > or even (considering that guest_bytes >= copy_bytes due to the > way copy_bytes gets initialized) > > if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) > > to make explicit when exactly the masking is necessary. Any of the three alternatives is fine by me. Acked-by: Keir Fraser _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:10:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:10:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDS5-0002nP-At; Tue, 13 Nov 2012 10:10:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDS3-0002nK-6r for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:10:39 +0000 Received: from [85.158.139.83:4583] by server-11.bemta-5.messagelabs.com id 9B/C0-03409-E9C12A05; Tue, 13 Nov 2012 10:10:38 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-14.tower-182.messagelabs.com!1352801436!25736805!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31687 invoked from network); 13 Nov 2012 10:10:36 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-14.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:10:36 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3355491wgb.32 for ; Tue, 13 Nov 2012 02:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=EvQWz52jXFo/fMnNfr7F4Nsq4OLsIjbDTY0fV9c0O2U=; b=EG74WBAUjT+66N1CDuKz4o6otIvsqThuOp7wUVMwihA8YjzByM01hWEWZmulyrIf8T ivy0EQ8sLdn3Ps6n3jxfnPwt1/VWqVe8kXZOBARZJYPQwr8V8VtIkbginDZT6kJhSgB6 4fDyIZ7cPwOJDtGmhqwwqyRCNgm5+lcl41Rtn0sf5WMczVOlTCtZsyEmDGuWz5+50yLc +9hJEIUa8klX52H9AIt4y99B1PzJZTimtarq+AHDZTp/ogU3lPqk4AQXv9awFlDUg99m myW+LkrOHStyzEhaKd9774ZqfpHGAS24hIXgLBdtpoZZcStQ2nZMLMMOxgDZ3p952GcN Qc9g== Received: by 10.216.218.9 with SMTP id j9mr28002wep.115.1352801436364; Tue, 13 Nov 2012 02:10:36 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b1sm2277941wix.11.2012.11.13.02.10.34 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:10:35 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 10:10:31 +0000 From: Keir Fraser To: Jan Beulich , Matthew Daley Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check Thread-Index: Ac3Bhxy1iQeGYjnp+EG6ChoSWN+GzA== In-Reply-To: <50A214B902000078000A7F88@nat28.tlf.novell.com> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 08:36, "Jan Beulich" wrote: >> Fix by using the correct cpumask buffer size in place of sizeof. >> >> Signed-off-by: Matthew Daley > > Acked-by: Jan Beulich > > However, I would have preferred the adjustment to be ... > >> diff --git a/xen/common/domctl.c b/xen/common/domctl.c >> index e153cb4..204e951 100644 >> --- a/xen/common/domctl.c >> +++ b/xen/common/domctl.c >> @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( >> { >> if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) >> err = -EFAULT; >> - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= >> sizeof(bytemap)) ) >> + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= (nr_cpu_ids + >> 7) / 8) ) > > if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= copy_bytes) ) > > or even (considering that guest_bytes >= copy_bytes due to the > way copy_bytes gets initialized) > > if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) > > to make explicit when exactly the masking is necessary. Any of the three alternatives is fine by me. Acked-by: Keir Fraser _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:14:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:14:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDVg-0002yY-VU; Tue, 13 Nov 2012 10:14:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDVf-0002yQ-Q2 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:14:23 +0000 Received: from [85.158.143.99:20641] by server-2.bemta-4.messagelabs.com id 3A/03-28922-F7D12A05; Tue, 13 Nov 2012 10:14:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352801662!29154009!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10975 invoked from network); 13 Nov 2012 10:14:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 13 Nov 2012 10:14:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 10:14:22 +0000 Message-Id: <50A22B8C02000078000A800F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 10:14:20 +0000 From: "Jan Beulich" To: , References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartEBDA146C.3__=" Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartEBDA146C.3__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline >>> On 09.11.12 at 10:05, wrote: Since it looks like this got stalled again, attached is a slightly extended version of Keir's debugging patch, allowing to rule out any inconsistencies of the globals between the first and second instances of the two invocations of __read_platform_stime(). Should the numbers printed turn out identical between the two invocations and identical to the boot time determined values, then I'm afraid I'm out of explanations as well as debugging suggestions. Please remember to add "loglvl=3Dall" to the hypervisor command line. The patch is against a 4.0.3 based tree I had still lying around, so I hope it'll apply cleanly to your 4.0.1 based one. Jan --=__PartEBDA146C.3__= Content-Type: application/octet-stream; name="00-tsc-debug" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="00-tsc-debug" LS0tIGEveGVuL2FyY2gveDg2L3RpbWUuYworKysgYi94ZW4vYXJjaC94ODYvdGltZS5jCkBAIC01 NzgsMTQgKzU3OCwyMyBAQCBzdGF0aWMgc190aW1lX3QgX19yZWFkX3BsYXRmb3JtX3N0aW1lKHU2 CiAgICAgcmV0dXJuIChzdGltZV9wbGF0Zm9ybV9zdGFtcCArIHNjYWxlX2RlbHRhKGRpZmYsICZw bHRfc2NhbGUpKTsKIH0KIAorI2RlZmluZSBwcmludF90aW1lX3NjYWxlKHByZWZpeCwgc2NhbGUs IHN1ZmZpeCkgXAorICAgIHByaW50ayhwcmVmaXggIiVkOiUwOHgiIHN1ZmZpeCwgKHNjYWxlKS0+ c2hpZnQsIChzY2FsZSktPm11bF9mcmFjKTsKKwogc3RhdGljIHZvaWQgcGx0X292ZXJmbG93KHZv aWQgKnVudXNlZCkKIHsKICAgICBpbnQgaTsKLSAgICB1NjQgY291bnQ7Ci0gICAgc190aW1lX3Qg bm93LCBwbHRfbm93LCBwbHRfd3JhcDsKKyAgICB1NjQgY291bnQsIG9sZF9zdGFtcCwgdHNjLCBw dHM7CisgICAgc190aW1lX3Qgbm93LCBwbHRfbm93LCBwbHRfd3JhcCwgc3BzOworICAgIHN0cnVj dCB0aW1lX3NjYWxlIHBzOwogCiAgICAgc3Bpbl9sb2NrX2lycSgmcGxhdGZvcm1fdGltZXJfbG9j ayk7CiAKKyAgICBwdHMgPSBwbGF0Zm9ybV90aW1lcl9zdGFtcDsKKyAgICBzcHMgPSBzdGltZV9w bGF0Zm9ybV9zdGFtcDsKKyAgICBwcyA9IHBsdF9zY2FsZTsKKworICAgIG9sZF9zdGFtcCA9IHBs dF9zdGFtcDsKICAgICBjb3VudCA9IHBsdF9zcmMucmVhZF9jb3VudGVyKCk7CiAgICAgcGx0X3N0 YW1wNjQgKz0gKGNvdW50IC0gcGx0X3N0YW1wKSAmIHBsdF9tYXNrOwogICAgIHBsdF9zdGFtcCA9 IGNvdW50OwpAQCAtNTk4LDYgKzYwNywxOSBAQCBzdGF0aWMgdm9pZCBwbHRfb3ZlcmZsb3codm9p ZCAqdW51c2VkKQogICAgICAgICBwbHRfd3JhcCA9IF9fcmVhZF9wbGF0Zm9ybV9zdGltZShwbHRf c3RhbXA2NCArIHBsdF9tYXNrICsgMSk7CiAgICAgICAgIGlmICggQUJTKHBsdF93cmFwIC0gbm93 KSA+IEFCUyhwbHRfbm93IC0gbm93KSApCiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgcmR0 c2NsbCh0c2MpOworICAgICAgICBwcmludGsoIlhYWCBwbHRfb3ZlcmZsb3c6IHBsdF9ub3c9JSJQ Ukl4NjQiIHBsdF93cmFwPSUiUFJJeDY0CisgICAgICAgICAgICAgICAiIG5vdz0lIlBSSXg2NCIg b2xkX3N0YW1wPSUiUFJJeDY0IiBuZXdfc3RhbXA9JSJQUkl4NjQKKyAgICAgICAgICAgICAgICIg cGx0X3N0YW1wNjQ9JSJQUkl4NjQiIHBsdF9tYXNrPSUiUFJJeDY0CisgICAgICAgICAgICAgICAi IHRzYz0lIlBSSXg2NCIgdHNjX3N0YW1wPSUiUFJJeDY0IlxuIiwKKyAgICAgICAgICAgICAgIHBs dF9ub3csIHBsdF93cmFwLCBub3csIG9sZF9zdGFtcCwgcGx0X3N0YW1wLCBwbHRfc3RhbXA2NCwK KyAgICAgICAgICAgICAgIHBsdF9tYXNrLCB0c2MsIHRoaXNfY3B1KGNwdV90aW1lKS5sb2NhbF90 c2Nfc3RhbXApOworICAgICAgICBwcmludGsoIlhYWCBwdHM9JSJQUkl4NjQiLyUiUFJJeDY0IiBz cHM9JSJQUkl4NjQiLyUiUFJJeDY0IlxuIiwKKyAgICAgICAgICAgICAgIHB0cywgcGxhdGZvcm1f dGltZXJfc3RhbXAsIHNwcywgc3RpbWVfcGxhdGZvcm1fc3RhbXApOworICAgICAgICBwcmludF90 aW1lX3NjYWxlKCJYWFggcHM9IiwgJnBzLCAiLyIpOworICAgICAgICBwcmludF90aW1lX3NjYWxl KCIiLCAmcGx0X3NjYWxlLCAiXG4iKTsKKworICAgICAgICBicmVhazsKICAgICAgICAgcGx0X3N0 YW1wNjQgKz0gcGx0X21hc2sgKyAxOwogICAgIH0KICAgICBpZiAoIGkgIT0gMCApCkBAIC02OTQs NiArNzE2LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IGluaXRfcGxhdGZvcm1fdGltZXIodgogICAg IHBsdF9tYXNrID0gKHU2NCl+MHVsbCA+PiAoNjQgLSBwdHMtPmNvdW50ZXJfYml0cyk7CiAKICAg ICBzZXRfdGltZV9zY2FsZSgmcGx0X3NjYWxlLCBwdHMtPmZyZXF1ZW5jeSk7CisgICAgcHJpbnRf dGltZV9zY2FsZSgicGx0X3NjYWxlPSIsICZwbHRfc2NhbGUsICJcbiIpOwogCiAgICAgcGx0X292 ZXJmbG93X3BlcmlvZCA9IHNjYWxlX2RlbHRhKAogICAgICAgICAxdWxsIDw8IChwdHMtPmNvdW50 ZXJfYml0cy0xKSwgJnBsdF9zY2FsZSk7Cg== --=__PartEBDA146C.3__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartEBDA146C.3__=-- From xen-devel-bounces@lists.xen.org Tue Nov 13 10:14:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:14:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDVg-0002yY-VU; Tue, 13 Nov 2012 10:14:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDVf-0002yQ-Q2 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:14:23 +0000 Received: from [85.158.143.99:20641] by server-2.bemta-4.messagelabs.com id 3A/03-28922-F7D12A05; Tue, 13 Nov 2012 10:14:23 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352801662!29154009!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10975 invoked from network); 13 Nov 2012 10:14:22 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-3.tower-216.messagelabs.com with SMTP; 13 Nov 2012 10:14:22 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 10:14:22 +0000 Message-Id: <50A22B8C02000078000A800F@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 10:14:20 +0000 From: "Jan Beulich" To: , References: <1352294551.12977.61.camel@hastur.hellion.org.uk> <509B8BF802000078000A72A3@nat28.tlf.novell.com> <1352384968.12977.104.camel@hastur.hellion.org.uk> In-Reply-To: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartEBDA146C.3__=" Cc: keir@xen.org, 599161@bugs.debian.org, xen-devel@lists.xen.org, ijc@hellion.org.uk Subject: Re: [Xen-devel] #599161: Xen debug patch for the "clock shifts by 50 minutes" bug. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartEBDA146C.3__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline >>> On 09.11.12 at 10:05, wrote: Since it looks like this got stalled again, attached is a slightly extended version of Keir's debugging patch, allowing to rule out any inconsistencies of the globals between the first and second instances of the two invocations of __read_platform_stime(). Should the numbers printed turn out identical between the two invocations and identical to the boot time determined values, then I'm afraid I'm out of explanations as well as debugging suggestions. Please remember to add "loglvl=3Dall" to the hypervisor command line. The patch is against a 4.0.3 based tree I had still lying around, so I hope it'll apply cleanly to your 4.0.1 based one. Jan --=__PartEBDA146C.3__= Content-Type: application/octet-stream; name="00-tsc-debug" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="00-tsc-debug" LS0tIGEveGVuL2FyY2gveDg2L3RpbWUuYworKysgYi94ZW4vYXJjaC94ODYvdGltZS5jCkBAIC01 NzgsMTQgKzU3OCwyMyBAQCBzdGF0aWMgc190aW1lX3QgX19yZWFkX3BsYXRmb3JtX3N0aW1lKHU2 CiAgICAgcmV0dXJuIChzdGltZV9wbGF0Zm9ybV9zdGFtcCArIHNjYWxlX2RlbHRhKGRpZmYsICZw bHRfc2NhbGUpKTsKIH0KIAorI2RlZmluZSBwcmludF90aW1lX3NjYWxlKHByZWZpeCwgc2NhbGUs IHN1ZmZpeCkgXAorICAgIHByaW50ayhwcmVmaXggIiVkOiUwOHgiIHN1ZmZpeCwgKHNjYWxlKS0+ c2hpZnQsIChzY2FsZSktPm11bF9mcmFjKTsKKwogc3RhdGljIHZvaWQgcGx0X292ZXJmbG93KHZv aWQgKnVudXNlZCkKIHsKICAgICBpbnQgaTsKLSAgICB1NjQgY291bnQ7Ci0gICAgc190aW1lX3Qg bm93LCBwbHRfbm93LCBwbHRfd3JhcDsKKyAgICB1NjQgY291bnQsIG9sZF9zdGFtcCwgdHNjLCBw dHM7CisgICAgc190aW1lX3Qgbm93LCBwbHRfbm93LCBwbHRfd3JhcCwgc3BzOworICAgIHN0cnVj dCB0aW1lX3NjYWxlIHBzOwogCiAgICAgc3Bpbl9sb2NrX2lycSgmcGxhdGZvcm1fdGltZXJfbG9j ayk7CiAKKyAgICBwdHMgPSBwbGF0Zm9ybV90aW1lcl9zdGFtcDsKKyAgICBzcHMgPSBzdGltZV9w bGF0Zm9ybV9zdGFtcDsKKyAgICBwcyA9IHBsdF9zY2FsZTsKKworICAgIG9sZF9zdGFtcCA9IHBs dF9zdGFtcDsKICAgICBjb3VudCA9IHBsdF9zcmMucmVhZF9jb3VudGVyKCk7CiAgICAgcGx0X3N0 YW1wNjQgKz0gKGNvdW50IC0gcGx0X3N0YW1wKSAmIHBsdF9tYXNrOwogICAgIHBsdF9zdGFtcCA9 IGNvdW50OwpAQCAtNTk4LDYgKzYwNywxOSBAQCBzdGF0aWMgdm9pZCBwbHRfb3ZlcmZsb3codm9p ZCAqdW51c2VkKQogICAgICAgICBwbHRfd3JhcCA9IF9fcmVhZF9wbGF0Zm9ybV9zdGltZShwbHRf c3RhbXA2NCArIHBsdF9tYXNrICsgMSk7CiAgICAgICAgIGlmICggQUJTKHBsdF93cmFwIC0gbm93 KSA+IEFCUyhwbHRfbm93IC0gbm93KSApCiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgcmR0 c2NsbCh0c2MpOworICAgICAgICBwcmludGsoIlhYWCBwbHRfb3ZlcmZsb3c6IHBsdF9ub3c9JSJQ Ukl4NjQiIHBsdF93cmFwPSUiUFJJeDY0CisgICAgICAgICAgICAgICAiIG5vdz0lIlBSSXg2NCIg b2xkX3N0YW1wPSUiUFJJeDY0IiBuZXdfc3RhbXA9JSJQUkl4NjQKKyAgICAgICAgICAgICAgICIg cGx0X3N0YW1wNjQ9JSJQUkl4NjQiIHBsdF9tYXNrPSUiUFJJeDY0CisgICAgICAgICAgICAgICAi IHRzYz0lIlBSSXg2NCIgdHNjX3N0YW1wPSUiUFJJeDY0IlxuIiwKKyAgICAgICAgICAgICAgIHBs dF9ub3csIHBsdF93cmFwLCBub3csIG9sZF9zdGFtcCwgcGx0X3N0YW1wLCBwbHRfc3RhbXA2NCwK KyAgICAgICAgICAgICAgIHBsdF9tYXNrLCB0c2MsIHRoaXNfY3B1KGNwdV90aW1lKS5sb2NhbF90 c2Nfc3RhbXApOworICAgICAgICBwcmludGsoIlhYWCBwdHM9JSJQUkl4NjQiLyUiUFJJeDY0IiBz cHM9JSJQUkl4NjQiLyUiUFJJeDY0IlxuIiwKKyAgICAgICAgICAgICAgIHB0cywgcGxhdGZvcm1f dGltZXJfc3RhbXAsIHNwcywgc3RpbWVfcGxhdGZvcm1fc3RhbXApOworICAgICAgICBwcmludF90 aW1lX3NjYWxlKCJYWFggcHM9IiwgJnBzLCAiLyIpOworICAgICAgICBwcmludF90aW1lX3NjYWxl KCIiLCAmcGx0X3NjYWxlLCAiXG4iKTsKKworICAgICAgICBicmVhazsKICAgICAgICAgcGx0X3N0 YW1wNjQgKz0gcGx0X21hc2sgKyAxOwogICAgIH0KICAgICBpZiAoIGkgIT0gMCApCkBAIC02OTQs NiArNzE2LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IGluaXRfcGxhdGZvcm1fdGltZXIodgogICAg IHBsdF9tYXNrID0gKHU2NCl+MHVsbCA+PiAoNjQgLSBwdHMtPmNvdW50ZXJfYml0cyk7CiAKICAg ICBzZXRfdGltZV9zY2FsZSgmcGx0X3NjYWxlLCBwdHMtPmZyZXF1ZW5jeSk7CisgICAgcHJpbnRf dGltZV9zY2FsZSgicGx0X3NjYWxlPSIsICZwbHRfc2NhbGUsICJcbiIpOwogCiAgICAgcGx0X292 ZXJmbG93X3BlcmlvZCA9IHNjYWxlX2RlbHRhKAogICAgICAgICAxdWxsIDw8IChwdHMtPmNvdW50 ZXJfYml0cy0xKSwgJnBsdF9zY2FsZSk7Cg== --=__PartEBDA146C.3__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartEBDA146C.3__=-- From xen-devel-bounces@lists.xen.org Tue Nov 13 10:18:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:18:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDZ5-0003Dw-AA; Tue, 13 Nov 2012 10:17:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDZ3-0003Do-8e for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:17:53 +0000 Received: from [85.158.143.35:42846] by server-2.bemta-4.messagelabs.com id 58/49-28922-05E12A05; Tue, 13 Nov 2012 10:17:52 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1352801851!15027073!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1599 invoked from network); 13 Nov 2012 10:17:33 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:17:33 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so2412587pbc.32 for ; Tue, 13 Nov 2012 02:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0LlNbFIjtKW00BHdHSjTYQ9OC4ugOXHd1Dhv5mUnYxs=; b=XqIjlQ80lS5/kMsFm0FRkDlN8ZHB9lHIhCmKEMb+EKnI+HEDrmMOvOqBFne0TsZ+h5 NvoD0ba2HJVfyRbHzjvYDGhFwgXBnzI4SHmfLzqdtzk8XRL46Vt6eRI4Ub9lDZ7Zu3Hw ocq0nk5wu+YN+mXUtvM2QLADOQ+Uh96a0a/odtQyj6E9u6AhLb0MOOi9dlFRoFPMKsWc uGDXzs532zjomvZAH0uXvc+m9rKVmF32BD5MXWf+N1s8mbhIB39Ju3y545s7z+aOu9bb IR6OQ3oXW0CDzbeFeq2LW9h5VgfO2/5xzeEE5AZb+q0BedJt2wlfyYsEzwqLZjB0XLBt qUKg== Received: by 10.69.1.8 with SMTP id bc8mr67202047pbd.9.1352801851328; Tue, 13 Nov 2012 02:17:31 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id kb3sm5765042pbc.27.2012.11.13.02.17.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:17:30 -0800 (PST) From: Matthew Daley To: JBeulich@suse.com Date: Tue, 13 Nov 2012 23:17:46 +1300 Message-Id: <1352801866-9512-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <50A214B902000078000A7F88@nat28.tlf.novell.com> References: <50A214B902000078000A7F88@nat28.tlf.novell.com> Cc: Matthew Daley , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether bits should be masked off from the input cpumap bitmap or not. Fix and make clearer by simply comparing the amount of bytes given in the input cpumap to the amount actually copied; if equal, bits may need to be masked off. This does not have security impact: _xmalloc never returns allocations smaller than the size of a pointer, hence the uncorrected buffer size check would still not allow writes to unallocated memory. Signed-off-by: Matthew Daley --- Jan: Agreed with both of your points. Here's a v2. diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e153cb4..a7a6b9f 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( { if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) err = -EFAULT; - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:18:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:18:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDZ5-0003Dw-AA; Tue, 13 Nov 2012 10:17:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDZ3-0003Do-8e for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:17:53 +0000 Received: from [85.158.143.35:42846] by server-2.bemta-4.messagelabs.com id 58/49-28922-05E12A05; Tue, 13 Nov 2012 10:17:52 +0000 X-Env-Sender: mattjd@gmail.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1352801851!15027073!1 X-Originating-IP: [209.85.160.45] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1599 invoked from network); 13 Nov 2012 10:17:33 -0000 Received: from mail-pb0-f45.google.com (HELO mail-pb0-f45.google.com) (209.85.160.45) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:17:33 -0000 Received: by mail-pb0-f45.google.com with SMTP id mc8so2412587pbc.32 for ; Tue, 13 Nov 2012 02:17:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0LlNbFIjtKW00BHdHSjTYQ9OC4ugOXHd1Dhv5mUnYxs=; b=XqIjlQ80lS5/kMsFm0FRkDlN8ZHB9lHIhCmKEMb+EKnI+HEDrmMOvOqBFne0TsZ+h5 NvoD0ba2HJVfyRbHzjvYDGhFwgXBnzI4SHmfLzqdtzk8XRL46Vt6eRI4Ub9lDZ7Zu3Hw ocq0nk5wu+YN+mXUtvM2QLADOQ+Uh96a0a/odtQyj6E9u6AhLb0MOOi9dlFRoFPMKsWc uGDXzs532zjomvZAH0uXvc+m9rKVmF32BD5MXWf+N1s8mbhIB39Ju3y545s7z+aOu9bb IR6OQ3oXW0CDzbeFeq2LW9h5VgfO2/5xzeEE5AZb+q0BedJt2wlfyYsEzwqLZjB0XLBt qUKg== Received: by 10.69.1.8 with SMTP id bc8mr67202047pbd.9.1352801851328; Tue, 13 Nov 2012 02:17:31 -0800 (PST) Received: from morphism.xen.prgmr.com (morphism.xen.prgmr.com. [71.19.145.114]) by mx.google.com with ESMTPS id kb3sm5765042pbc.27.2012.11.13.02.17.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:17:30 -0800 (PST) From: Matthew Daley To: JBeulich@suse.com Date: Tue, 13 Nov 2012 23:17:46 +1300 Message-Id: <1352801866-9512-1-git-send-email-mattjd@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <50A214B902000078000A7F88@nat28.tlf.novell.com> References: <50A214B902000078000A7F88@nat28.tlf.novell.com> Cc: Matthew Daley , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether bits should be masked off from the input cpumap bitmap or not. Fix and make clearer by simply comparing the amount of bytes given in the input cpumap to the amount actually copied; if equal, bits may need to be masked off. This does not have security impact: _xmalloc never returns allocations smaller than the size of a pointer, hence the uncorrected buffer size check would still not allow writes to unallocated memory. Signed-off-by: Matthew Daley --- Jan: Agreed with both of your points. Here's a v2. diff --git a/xen/common/domctl.c b/xen/common/domctl.c index e153cb4..a7a6b9f 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( { if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) err = -EFAULT; - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) ) + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & 7)); } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:26:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:26:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDh4-0003cn-D5; Tue, 13 Nov 2012 10:26:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDh3-0003cg-0o for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:26:09 +0000 Received: from [85.158.137.99:47866] by server-9.bemta-3.messagelabs.com id 72/24-02388-04022A05; Tue, 13 Nov 2012 10:26:08 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352802367!18888555!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19169 invoked from network); 13 Nov 2012 10:26:07 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-4.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 10:26:07 -0000 Received: (qmail 26740 invoked from network); 13 Nov 2012 12:26:06 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:26:06 +0200 Message-ID: <50A22044.6060608@gmail.com> Date: Tue, 13 Nov 2012 12:26:12 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> In-Reply-To: <1352800791.7491.21.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226271, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_NO_LINK_NMD; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: e8437b1472d26965707b26009c3d5b7d.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43988 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > I think I'd look at the ioreq stuff in preference to the trace stuff. > You probably want to use a normal evtchn rather than VIRQ. The code > which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN > should give a reasonable starting point (I think, I'm not actually the > familiar with this bit of Xen). Thanks, I'll look that up. > It might also be useful if you describe your actual end-goal -- i.e. > what you are ultimately trying to achieve. It may be that there are > better approaches or even existing solutions or things which are already > close to your needs. OK, my immediate end-goal is real-time logging of hypervisor events via a dom0 userspace application. These events are always about a currently running virtual machine, and said virtual machine is paused at the time. The userspace tool should be immediately notified, so no polling. Ideally, in the future, based on information received from the hypervisor, the dom0 application would control other virtual machines (restart them, shut them down, and so on). This, I'm thinking, could either be done by replying to the hypervisor itself via the communication channel and do some work there, or, since the application is in dom0, do this via libxl or some other available userspace tool. However, the paused virtual machine should not be allowed to resume unless the userspace application replies that it is OK to resume. Hope that made sense, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:26:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:26:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDh4-0003cn-D5; Tue, 13 Nov 2012 10:26:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDh3-0003cg-0o for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:26:09 +0000 Received: from [85.158.137.99:47866] by server-9.bemta-3.messagelabs.com id 72/24-02388-04022A05; Tue, 13 Nov 2012 10:26:08 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-4.tower-217.messagelabs.com!1352802367!18888555!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19169 invoked from network); 13 Nov 2012 10:26:07 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-4.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 10:26:07 -0000 Received: (qmail 26740 invoked from network); 13 Nov 2012 12:26:06 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:26:06 +0200 Message-ID: <50A22044.6060608@gmail.com> Date: Tue, 13 Nov 2012 12:26:12 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> In-Reply-To: <1352800791.7491.21.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226271, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_NO_LINK_NMD; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: e8437b1472d26965707b26009c3d5b7d.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43988 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > I think I'd look at the ioreq stuff in preference to the trace stuff. > You probably want to use a normal evtchn rather than VIRQ. The code > which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN > should give a reasonable starting point (I think, I'm not actually the > familiar with this bit of Xen). Thanks, I'll look that up. > It might also be useful if you describe your actual end-goal -- i.e. > what you are ultimately trying to achieve. It may be that there are > better approaches or even existing solutions or things which are already > close to your needs. OK, my immediate end-goal is real-time logging of hypervisor events via a dom0 userspace application. These events are always about a currently running virtual machine, and said virtual machine is paused at the time. The userspace tool should be immediately notified, so no polling. Ideally, in the future, based on information received from the hypervisor, the dom0 application would control other virtual machines (restart them, shut them down, and so on). This, I'm thinking, could either be done by replying to the hypervisor itself via the communication channel and do some work there, or, since the application is in dom0, do this via libxl or some other available userspace tool. However, the paused virtual machine should not be allowed to resume unless the userspace application replies that it is OK to resume. Hope that made sense, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:36:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:36:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDr8-0003uZ-Mk; Tue, 13 Nov 2012 10:36:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDr6-0003uU-Ph for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:36:32 +0000 Received: from [85.158.143.35:30918] by server-1.bemta-4.messagelabs.com id A8/A2-27934-0B222A05; Tue, 13 Nov 2012 10:36:32 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352802974!12029620!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20196 invoked from network); 13 Nov 2012 10:36:16 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:36:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773108" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:36:14 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:36:14 +0000 Message-ID: <1352802973.7491.40.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 10:36:13 +0000 In-Reply-To: <50A22044.6060608@gmail.com> References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 10:26 +0000, Razvan Cojocaru wrote: > > I think I'd look at the ioreq stuff in preference to the trace stuff. > > You probably want to use a normal evtchn rather than VIRQ. The code > > which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN > > should give a reasonable starting point (I think, I'm not actually the > > familiar with this bit of Xen). > > Thanks, I'll look that up. > > > It might also be useful if you describe your actual end-goal -- i.e. > > what you are ultimately trying to achieve. It may be that there are > > better approaches or even existing solutions or things which are already > > close to your needs. > > OK, my immediate end-goal is real-time logging of hypervisor events via > a dom0 userspace application. These events are always about a currently > running virtual machine, and said virtual machine is paused at the time. > The userspace tool should be immediately notified, so no polling. This is very like the ioreq model, where the domain (or maybe just the vcpu, I'm not sure) is paused while qemu does its thing. What sort of events are we talking about here? > Ideally, in the future, based on information received from the > hypervisor, the dom0 application would control other virtual machines > (restart them, shut them down, and so on). This, I'm thinking, could > either be done by replying to the hypervisor itself via the > communication channel and do some work there, or, since the application > is in dom0, do this via libxl or some other available userspace tool. The right thing to do here is for the userspace tool to communicate with the toolstack (by whatever means) rather the hypervisor in order to control the domains. > However, the paused virtual machine should not be allowed to resume > unless the userspace application replies that it is OK to resume. You might also find some inspiration for this sort of model in the xenpaging and memshare code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:36:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:36:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDr8-0003uZ-Mk; Tue, 13 Nov 2012 10:36:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYDr6-0003uU-Ph for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:36:32 +0000 Received: from [85.158.143.35:30918] by server-1.bemta-4.messagelabs.com id A8/A2-27934-0B222A05; Tue, 13 Nov 2012 10:36:32 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1352802974!12029620!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20196 invoked from network); 13 Nov 2012 10:36:16 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:36:16 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773108" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:36:14 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:36:14 +0000 Message-ID: <1352802973.7491.40.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 10:36:13 +0000 In-Reply-To: <50A22044.6060608@gmail.com> References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 10:26 +0000, Razvan Cojocaru wrote: > > I think I'd look at the ioreq stuff in preference to the trace stuff. > > You probably want to use a normal evtchn rather than VIRQ. The code > > which handles HVM_PARAM_BUFIOREQ_PFN and HVM_PARAM_BUFIOREQ_EVTCHN > > should give a reasonable starting point (I think, I'm not actually the > > familiar with this bit of Xen). > > Thanks, I'll look that up. > > > It might also be useful if you describe your actual end-goal -- i.e. > > what you are ultimately trying to achieve. It may be that there are > > better approaches or even existing solutions or things which are already > > close to your needs. > > OK, my immediate end-goal is real-time logging of hypervisor events via > a dom0 userspace application. These events are always about a currently > running virtual machine, and said virtual machine is paused at the time. > The userspace tool should be immediately notified, so no polling. This is very like the ioreq model, where the domain (or maybe just the vcpu, I'm not sure) is paused while qemu does its thing. What sort of events are we talking about here? > Ideally, in the future, based on information received from the > hypervisor, the dom0 application would control other virtual machines > (restart them, shut them down, and so on). This, I'm thinking, could > either be done by replying to the hypervisor itself via the > communication channel and do some work there, or, since the application > is in dom0, do this via libxl or some other available userspace tool. The right thing to do here is for the userspace tool to communicate with the toolstack (by whatever means) rather the hypervisor in order to control the domains. > However, the paused virtual machine should not be allowed to resume > unless the userspace application replies that it is OK to resume. You might also find some inspiration for this sort of model in the xenpaging and memshare code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:47:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:47:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE1e-0004C3-0W; Tue, 13 Nov 2012 10:47:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE1c-0004By-2q for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:47:24 +0000 Received: from [85.158.139.83:14586] by server-1.bemta-5.messagelabs.com id 95/66-05877-B3522A05; Tue, 13 Nov 2012 10:47:23 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352803642!27672788!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13792 invoked from network); 13 Nov 2012 10:47:22 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:47:22 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773532" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:47:18 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:47:17 +0000 Message-ID: <1352803636.7491.43.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Samuel Thibault Date: Tue, 13 Nov 2012 10:47:16 +0000 In-Reply-To: <20121106151315.GK5802@type.bordeaux.inria.fr> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106151315.GK5802@type.bordeaux.inria.fr> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVHVlLCAyMDEyLTExLTA2IGF0IDE1OjEzICswMDAwLCBTYW11ZWwgVGhpYmF1bHQgd3JvdGU6 Cj4gTWF0dGhldyBGaW9yYXZhbnRlLCBsZSBUaHUgMDEgTm92IDIwMTIgMTY6MzM6MjQgLTA0MDAs IGEgw6ljcml0IDoKPiA+IERpc2FibGluZyB0aGUgYWJvdmUgZmxhZ3MgaW4gZGVmYXVsdCBtaW5p LW9zIGJ1aWxkLiBUaGV5IGdlbmVyYXRlIGEKPiA+IGxvdCBvZiBzcGFtLgo+ID4gCj4gPiBTaWdu ZWQtb2ZmLWJ5OiBNYXR0aGV3IEZpb3JhdmFudGUgPG1hdHRoZXcuZmlvcmF2YW50ZUBqaHVhcGwu ZWR1Pgo+IAo+IEFja2VkLWJ5OiBTYW11ZWwgVGhpYmF1bHQgPHNhbXVlbC50aGliYXVsdEBlbnMt bHlvbi5vcmc+CgpBcHBsaWVkLCB0aGFua3MuCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 10:47:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:47:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE1e-0004C3-0W; Tue, 13 Nov 2012 10:47:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE1c-0004By-2q for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:47:24 +0000 Received: from [85.158.139.83:14586] by server-1.bemta-5.messagelabs.com id 95/66-05877-B3522A05; Tue, 13 Nov 2012 10:47:23 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-182.messagelabs.com!1352803642!27672788!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13792 invoked from network); 13 Nov 2012 10:47:22 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:47:22 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773532" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:47:18 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:47:17 +0000 Message-ID: <1352803636.7491.43.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Samuel Thibault Date: Tue, 13 Nov 2012 10:47:16 +0000 In-Reply-To: <20121106151315.GK5802@type.bordeaux.inria.fr> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <20121106151315.GK5802@type.bordeaux.inria.fr> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 1/9] Disable -DGNT_DEBUG and -DGNTMAP_DEBUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVHVlLCAyMDEyLTExLTA2IGF0IDE1OjEzICswMDAwLCBTYW11ZWwgVGhpYmF1bHQgd3JvdGU6 Cj4gTWF0dGhldyBGaW9yYXZhbnRlLCBsZSBUaHUgMDEgTm92IDIwMTIgMTY6MzM6MjQgLTA0MDAs IGEgw6ljcml0IDoKPiA+IERpc2FibGluZyB0aGUgYWJvdmUgZmxhZ3MgaW4gZGVmYXVsdCBtaW5p LW9zIGJ1aWxkLiBUaGV5IGdlbmVyYXRlIGEKPiA+IGxvdCBvZiBzcGFtLgo+ID4gCj4gPiBTaWdu ZWQtb2ZmLWJ5OiBNYXR0aGV3IEZpb3JhdmFudGUgPG1hdHRoZXcuZmlvcmF2YW50ZUBqaHVhcGwu ZWR1Pgo+IAo+IEFja2VkLWJ5OiBTYW11ZWwgVGhpYmF1bHQgPHNhbXVlbC50aGliYXVsdEBlbnMt bHlvbi5vcmc+CgpBcHBsaWVkLCB0aGFua3MuCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 10:48:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:48:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2m-0004Fz-FR; Tue, 13 Nov 2012 10:48:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2l-0004Fo-5j for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:48:35 +0000 Received: from [85.158.143.99:35588] by server-1.bemta-4.messagelabs.com id 19/1A-27934-28522A05; Tue, 13 Nov 2012 10:48:34 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352803713!28808747!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9100 invoked from network); 13 Nov 2012 10:48:34 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:48:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773575" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:48:33 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:48:32 +0000 Message-ID: <1352803712.7491.45.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:48:32 +0000 In-Reply-To: <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "samuel.thibault@ens-lyon.org" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 3/9] add tpmfront, tpm_tis, and tpmback drivers to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:33 +0000, Matthew Fioravante wrote: > This patch adds 3 new drivers to mini-os. > > tpmfront - paravirtualized tpm frontend driver > tpmback - paravirtualized tpm backend driver > tpm_tis - hardware tpm driver > > Unfortunately these drivers were derived from GPL > licensed linux kernel drivers so they must carry > the GPL license. However, since mini-os now > supports conditional compilation, hopefully these > drivers can be included into the xen tree and > conditionally removed from non-gpl projects. > By default they are disabled in the makefile. I think this is OK but please could you send a followup patch to extras/mini-os/COPYING which clarifies the situation. Something like "... Certain files in this directory are licensed under the GPLv2. By default these are not built and linked into MiniOS however enabling them will cause the whole work to become covered by the GPL.". Or something like that (Ian Jackson -- perhaps you have an opinion on the wording?) Anyway, for this patch: Acked-by: Ian Campbell And applied. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:48:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:48:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2m-0004Fz-FR; Tue, 13 Nov 2012 10:48:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2l-0004Fo-5j for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:48:35 +0000 Received: from [85.158.143.99:35588] by server-1.bemta-4.messagelabs.com id 19/1A-27934-28522A05; Tue, 13 Nov 2012 10:48:34 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352803713!28808747!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9100 invoked from network); 13 Nov 2012 10:48:34 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-13.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:48:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773575" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:48:33 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:48:32 +0000 Message-ID: <1352803712.7491.45.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:48:32 +0000 In-Reply-To: <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-3-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "samuel.thibault@ens-lyon.org" , Ian Jackson , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 3/9] add tpmfront, tpm_tis, and tpmback drivers to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:33 +0000, Matthew Fioravante wrote: > This patch adds 3 new drivers to mini-os. > > tpmfront - paravirtualized tpm frontend driver > tpmback - paravirtualized tpm backend driver > tpm_tis - hardware tpm driver > > Unfortunately these drivers were derived from GPL > licensed linux kernel drivers so they must carry > the GPL license. However, since mini-os now > supports conditional compilation, hopefully these > drivers can be included into the xen tree and > conditionally removed from non-gpl projects. > By default they are disabled in the makefile. I think this is OK but please could you send a followup patch to extras/mini-os/COPYING which clarifies the situation. Something like "... Certain files in this directory are licensed under the GPLv2. By default these are not built and linked into MiniOS however enabling them will cause the whole work to become covered by the GPL.". Or something like that (Ian Jackson -- perhaps you have an opinion on the wording?) Anyway, for this patch: Acked-by: Ian Campbell And applied. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2w-0004H3-Rr; Tue, 13 Nov 2012 10:48:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2v-0004Gk-A5 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:48:45 +0000 Received: from [193.109.254.147:40743] by server-11.bemta-14.messagelabs.com id 5E/1A-29027-C8522A05; Tue, 13 Nov 2012 10:48:44 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352803658!10753026!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1310 invoked from network); 13 Nov 2012 10:47:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:47:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773543" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:47:37 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:47:37 +0000 Message-ID: <1352803656.7491.44.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Samuel Thibault Date: Tue, 13 Nov 2012 10:47:36 +0000 In-Reply-To: <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVGh1LCAyMDEyLTExLTAxIGF0IDIxOjMyICswMDAwLCBTYW11ZWwgVGhpYmF1bHQgd3JvdGU6 Cj4gTWF0dGhldyBGaW9yYXZhbnRlLCBsZSBUaHUgMDEgTm92IDIwMTIgMTY6MzM6MjUgLTA0MDAs IGEgw6ljcml0IDoKPiA+IFNpbWlsYXIgdG8geGVuYnVzX3JlYWRfaW50ZWdlciwgdGhpcyBmdW5j dGlvbiByZWFkcyBhIHhlbnN0b3JlIHBhdGgKPiA+IGFuZCBwYXJzZXMgaXQgYXMgYSB1dWlkLiBT ZWUgaW5jbHVkZS94ZW5idXMuaCBmb3IgZGV0YWlscy4KPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTog TWF0dGhldyBGaW9yYXZhbnRlIDxtYXR0aGV3LmZpb3JhdmFudGVAamh1YXBsLmVkdT4KPiAKPiBB Y2tlZC1ieTogU2FtdWVsIFRoaWJhdWx0IDxzYW11ZWwudGhpYmF1bHRAZW5zLWx5b24ub3JnPgoK QXBwbGllZC4gVGhhbmtzLgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2w-0004H3-Rr; Tue, 13 Nov 2012 10:48:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE2v-0004Gk-A5 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:48:45 +0000 Received: from [193.109.254.147:40743] by server-11.bemta-14.messagelabs.com id 5E/1A-29027-C8522A05; Tue, 13 Nov 2012 10:48:44 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352803658!10753026!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1310 invoked from network); 13 Nov 2012 10:47:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:47:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773543" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:47:37 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:47:37 +0000 Message-ID: <1352803656.7491.44.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Samuel Thibault Date: Tue, 13 Nov 2012 10:47:36 +0000 In-Reply-To: <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> References: <1351802007-19178-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802007-19178-2-git-send-email-matthew.fioravante@jhuapl.edu> <20121101213222.GR5569@type.youpi.perso.aquilenet.fr> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Matthew Fioravante , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 2/9] add xenbus_read_uuid to mini-os X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVGh1LCAyMDEyLTExLTAxIGF0IDIxOjMyICswMDAwLCBTYW11ZWwgVGhpYmF1bHQgd3JvdGU6 Cj4gTWF0dGhldyBGaW9yYXZhbnRlLCBsZSBUaHUgMDEgTm92IDIwMTIgMTY6MzM6MjUgLTA0MDAs IGEgw6ljcml0IDoKPiA+IFNpbWlsYXIgdG8geGVuYnVzX3JlYWRfaW50ZWdlciwgdGhpcyBmdW5j dGlvbiByZWFkcyBhIHhlbnN0b3JlIHBhdGgKPiA+IGFuZCBwYXJzZXMgaXQgYXMgYSB1dWlkLiBT ZWUgaW5jbHVkZS94ZW5idXMuaCBmb3IgZGV0YWlscy4KPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTog TWF0dGhldyBGaW9yYXZhbnRlIDxtYXR0aGV3LmZpb3JhdmFudGVAamh1YXBsLmVkdT4KPiAKPiBB Y2tlZC1ieTogU2FtdWVsIFRoaWJhdWx0IDxzYW11ZWwudGhpYmF1bHRAZW5zLWx5b24ub3JnPgoK QXBwbGllZC4gVGhhbmtzLgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo= From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3E-0004KA-9P; Tue, 13 Nov 2012 10:49:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3C-0004JS-2l for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:02 +0000 Received: from [193.109.254.147:29284] by server-13.bemta-14.messagelabs.com id 12/A9-11239-D9522A05; Tue, 13 Nov 2012 10:49:01 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1352803738!8895644!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9641 invoked from network); 13 Nov 2012 10:49:00 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:49:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773583" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:48:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:48:53 +0000 Message-ID: <1352803732.7491.46.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:48:52 +0000 In-Reply-To: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 5/9] add vtpm support to libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:34 +0000, Matthew Fioravante wrote: > This patch adds vtpm support to libxl. It adds vtpm parsing to config > files and 3 new xl commands: > vtpm-attach > vtpm-detach > vtpm-list > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell and applied. thanks. > > diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 > index 428da21..fe4fac9 100644 > --- a/docs/man/xl.cfg.pod.5 > +++ b/docs/man/xl.cfg.pod.5 > @@ -298,6 +298,35 @@ Specifies the networking provision (both emulated network adapters, > and Xen virtual interfaces) to provided to the guest. See > F. > > +=item B > + > +Specifies the virtual trusted platform module to be > +provided to the guest. Please see F > +for more details. > + > +Each B is a comma-separated list of C > +settings, from the following list: > + > +=over 4 > + > +=item C > + > +Specify the backend domain name of id. This value is required! > +If this domain is a guest, the backend should be set to the > +vtpm domain name. If this domain is a vtpm, the > +backend should be set to the vtpm manager domain name. > + > +=item C > + > +Specify the uuid of this vtpm device. The uuid is used to uniquely > +identify the vtpm device. You can create one using the uuidgen > +program on unix systems. If left unspecified, a new uuid > +will be randomly generated every time the domain boots. > +If this is a vtpm domain, you should specify a value. The > +value is optional if this is a guest domain. > + > +=back > + > =item B > > Specifies the paravirtual framebuffer devices which should be supplied > diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 > index 7b1f2cf..097fe43 100644 > --- a/docs/man/xl.pod.1 > +++ b/docs/man/xl.pod.1 > @@ -1106,6 +1106,31 @@ List virtual network interfaces for a domain. > > =back > > +=head2 VTPM DEVICES > + > +=over 4 > + > +=item B I I > + > +Creates a new vtpm device in the domain specified by I. > +I describes the device to attach, using the same format as the > +B string in the domain config file. See L for > +more information. > + > +=item B I I > + > +Removes the vtpm device from the domain specified by I. > +I is the numeric device id given to the virtual trusted > +platform module device. You will need to run B to determine that number. > +Alternatively the I of the vtpm can be used to > +select the virtual device to detach. > + > +=item B I > + > +List virtual trusted platform modules for a domain. > + > +=back > + > =head1 PCI PASS-THROUGH > > =over 4 > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 665385b..be457f4 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -1710,6 +1710,243 @@ out: > } > > /******************************************************************************/ > +int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm) > +{ > + if(libxl_uuid_is_nil(&vtpm->uuid)) { > + libxl_uuid_generate(&vtpm->uuid); > + } > + return 0; > +} > + > +static int libxl__device_from_vtpm(libxl__gc *gc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__device *device) > +{ > + device->backend_devid = vtpm->devid; > + device->backend_domid = vtpm->backend_domid; > + device->backend_kind = LIBXL__DEVICE_KIND_VTPM; > + device->devid = vtpm->devid; > + device->domid = domid; > + device->kind = LIBXL__DEVICE_KIND_VTPM; > + > + return 0; > +} > + > +void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__ao_device *aodev) > +{ > + STATE_AO_GC(aodev->ao); > + flexarray_t *front; > + flexarray_t *back; > + libxl__device *device; > + char *dompath, **l; > + unsigned int nb, rc; > + > + rc = libxl__device_vtpm_setdefault(gc, vtpm); > + if (rc) goto out; > + > + front = flexarray_make(gc, 16, 1); > + back = flexarray_make(gc, 16, 1); > + > + if(vtpm->devid == -1) { > + if (!(dompath = libxl__xs_get_dompath(gc, domid))) { > + rc = ERROR_FAIL; > + goto out; > + } > + l = libxl__xs_directory(gc, XBT_NULL, > + GCSPRINTF("%s/device/vtpm", dompath), &nb); > + if(l == NULL || nb == 0) { > + vtpm->devid = 0; > + } else { > + vtpm->devid = strtoul(l[nb - 1], NULL, 10) + 1; > + } > + } > + > + GCNEW(device); > + rc = libxl__device_from_vtpm(gc, domid, vtpm, device); > + if ( rc != 0 ) goto out; > + > + flexarray_append(back, "frontend-id"); > + flexarray_append(back, GCSPRINTF("%d", domid)); > + flexarray_append(back, "online"); > + flexarray_append(back, "1"); > + flexarray_append(back, "state"); > + flexarray_append(back, GCSPRINTF("%d", 1)); > + flexarray_append(back, "handle"); > + flexarray_append(back, GCSPRINTF("%d", vtpm->devid)); > + > + flexarray_append(back, "uuid"); > + flexarray_append(back, GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(vtpm->uuid))); > + flexarray_append(back, "resume"); > + flexarray_append(back, "False"); > + > + flexarray_append(front, "backend-id"); > + flexarray_append(front, GCSPRINTF("%d", vtpm->backend_domid)); > + flexarray_append(front, "state"); > + flexarray_append(front, GCSPRINTF("%d", 1)); > + flexarray_append(front, "handle"); > + flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); > + > + libxl__device_generic_add(gc, XBT_NULL, device, > + libxl__xs_kvs_of_flexarray(gc, back, back->count), > + libxl__xs_kvs_of_flexarray(gc, front, front->count)); > + > + aodev->dev = device; > + aodev->action = DEVICE_CONNECT; > + libxl__wait_device_connection(egc, aodev); > + > + rc = 0; > +out: > + aodev->rc = rc; > + if(rc) aodev->callback(egc, aodev); > + return; > +} > + > +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num) > +{ > + GC_INIT(ctx); > + > + libxl_device_vtpm* vtpms = NULL; > + char* fe_path = NULL; > + char** dir = NULL; > + unsigned int ndirs = 0; > + > + *num = 0; > + > + fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); > + dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); > + if(dir) { > + vtpms = malloc(sizeof(*vtpms) * ndirs); > + libxl_device_vtpm* vtpm; > + libxl_device_vtpm* end = vtpms + ndirs; > + for(vtpm = vtpms; vtpm < end; ++vtpm, ++dir) { > + char* tmp; > + const char* be_path = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/%s/backend", > + fe_path, *dir)); > + > + vtpm->devid = atoi(*dir); > + > + tmp = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/%s/backend_id", > + fe_path, *dir)); > + vtpm->backend_domid = atoi(tmp); > + > + tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); > + if(tmp) { > + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { > + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); > + exit(1); > + } > + } > + } > + } > + *num = ndirs; > + > + GC_FREE; > + return vtpms; > +} > + > +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, > + uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl_vtpminfo *vtpminfo) > +{ > + GC_INIT(ctx); > + char *dompath, *vtpmpath; > + char *val; > + int rc = 0; > + > + libxl_vtpminfo_init(vtpminfo); > + dompath = libxl__xs_get_dompath(gc, domid); > + vtpminfo->devid = vtpm->devid; > + > + vtpmpath = GCSPRINTF("%s/device/vtpm/%d", dompath, vtpminfo->devid); > + vtpminfo->backend = xs_read(ctx->xsh, XBT_NULL, > + GCSPRINTF("%s/backend", vtpmpath), NULL); > + if (!vtpminfo->backend) { > + goto err; > + } > + if(!libxl__xs_read(gc, XBT_NULL, vtpminfo->backend)) { > + goto err; > + } > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/backend-id", vtpmpath)); > + vtpminfo->backend_id = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/state", vtpmpath)); > + vtpminfo->state = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/event-channel", vtpmpath)); > + vtpminfo->evtch = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/ring-ref", vtpmpath)); > + vtpminfo->rref = val ? strtoul(val, NULL, 10) : -1; > + > + vtpminfo->frontend = xs_read(ctx->xsh, XBT_NULL, > + GCSPRINTF("%s/frontend", vtpminfo->backend), NULL); > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/frontend-id", vtpminfo->backend)); > + vtpminfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/uuid", vtpminfo->backend)); > + if(val == NULL) { > + LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); > + goto err; > + } > + if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { > + LOG(ERROR, > + "%s/uuid is a malformed uuid?? (%s) Probably a bug!\n", > + vtpminfo->backend, val); > + goto err; > + } > + > + goto exit; > +err: > + rc = ERROR_FAIL; > +exit: > + GC_FREE; > + return rc; > +} > + > +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, > + uint32_t domid, > + int devid, > + libxl_device_vtpm *vtpm) > +{ > + libxl_device_vtpm *vtpms; > + int nb, i; > + int rc; > + > + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); > + if (!vtpms) > + return ERROR_FAIL; > + > + memset(vtpm, 0, sizeof (libxl_device_vtpm)); > + rc = 1; > + for (i = 0; i < nb; ++i) { > + if(devid == vtpms[i].devid) { > + vtpm->backend_domid = vtpms[i].backend_domid; > + vtpm->devid = vtpms[i].devid; > + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); > + rc = 0; > + break; > + } > + } > + > + libxl_device_vtpm_list_free(vtpms, nb); > + return rc; > +} > + > + > +/******************************************************************************/ > > int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) > { > @@ -3046,6 +3283,8 @@ out: > * libxl_device_disk_destroy > * libxl_device_nic_remove > * libxl_device_nic_destroy > + * libxl_device_vtpm_remove > + * libxl_device_vtpm_destroy > * libxl_device_vkb_remove > * libxl_device_vkb_destroy > * libxl_device_vfb_remove > @@ -3097,6 +3336,10 @@ DEFINE_DEVICE_REMOVE(vkb, destroy, 1) > DEFINE_DEVICE_REMOVE(vfb, remove, 0) > DEFINE_DEVICE_REMOVE(vfb, destroy, 1) > > +/* vtpm */ > +DEFINE_DEVICE_REMOVE(vtpm, remove, 0) > +DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) > + > #undef DEFINE_DEVICE_REMOVE > > /******************************************************************************/ > @@ -3105,6 +3348,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) > /* The following functions are defined: > * libxl_device_disk_add > * libxl_device_nic_add > + * libxl_device_vtpm_add > */ > > #define DEFINE_DEVICE_ADD(type) \ > @@ -3131,6 +3375,9 @@ DEFINE_DEVICE_ADD(disk) > /* nic */ > DEFINE_DEVICE_ADD(nic) > > +/* vtpm */ > +DEFINE_DEVICE_ADD(vtpm) > + > #undef DEFINE_DEVICE_ADD > > /******************************************************************************/ > diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h > index 7a7c419..e2ba549 100644 > --- a/tools/libxl/libxl.h > +++ b/tools/libxl/libxl.h > @@ -478,13 +478,14 @@ typedef struct { > libxl_domain_create_info c_info; > libxl_domain_build_info b_info; > > - int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; > + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs, num_vtpms; > > libxl_device_disk *disks; > libxl_device_nic *nics; > libxl_device_pci *pcidevs; > libxl_device_vfb *vfbs; > libxl_device_vkb *vkbs; > + libxl_device_vtpm *vtpms; > > libxl_action_on_shutdown on_poweroff; > libxl_action_on_shutdown on_reboot; > @@ -645,6 +646,9 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, > int *nb_vcpu, int *nr_vcpus_out); > void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); > > +void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms); > +void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); > + > /* > * Devices > * ======= > @@ -745,6 +749,23 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num > int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, > libxl_device_nic *nic, libxl_nicinfo *nicinfo); > > +/* Virtual TPMs */ > +int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > +int libxl_device_vtpm_remove(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > +int libxl_device_vtpm_destroy(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > + > +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num); > +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); > + > /* Keyboard */ > int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, > const libxl_asyncop_how *ao_how) > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c > index e81747b..9d20086 100644 > --- a/tools/libxl/libxl_create.c > +++ b/tools/libxl/libxl_create.c > @@ -55,6 +55,8 @@ void libxl_domain_config_dispose(libxl_domain_config *d_config) > libxl_device_vkb_dispose(&d_config->vkbs[i]); > free(d_config->vkbs); > > + libxl_device_vtpm_list_free(d_config->vtpms, d_config->num_vtpms); > + > libxl_domain_create_info_dispose(&d_config->c_info); > libxl_domain_build_info_dispose(&d_config->b_info); > } > @@ -601,6 +603,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, > static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, > int ret); > > +static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, > + int ret); > static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, > int ret); > > @@ -1085,13 +1089,13 @@ static void domcreate_devmodel_started(libxl__egc *egc, > if (d_config->num_nics > 0) { > /* Attach nics */ > libxl__multidev_begin(ao, &dcs->multidev); > - dcs->multidev.callback = domcreate_attach_pci; > + dcs->multidev.callback = domcreate_attach_vtpms; > libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); > libxl__multidev_prepared(egc, &dcs->multidev, 0); > return; > } > > - domcreate_attach_pci(egc, &dcs->multidev, 0); > + domcreate_attach_vtpms(egc, &dcs->multidev, 0); > return; > > error_out: > @@ -1099,6 +1103,39 @@ error_out: > domcreate_complete(egc, dcs, ret); > } > > +static void domcreate_attach_vtpms(libxl__egc *egc, > + libxl__multidev *multidev, > + int ret) > +{ > + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); > + STATE_AO_GC(dcs->ao); > + int domid = dcs->guest_domid; > + > + libxl_domain_config* const d_config = dcs->guest_config; > + > + if(ret) { > + LOG(ERROR, "unable to add nic devices"); > + goto error_out; > + } > + > + /* Plug vtpm devices */ > + if (d_config->num_vtpms > 0) { > + /* Attach vtpms */ > + libxl__multidev_begin(ao, &dcs->multidev); > + dcs->multidev.callback = domcreate_attach_pci; > + libxl__add_vtpms(egc, ao, domid, d_config, &dcs->multidev); > + libxl__multidev_prepared(egc, &dcs->multidev, 0); > + return; > + } > + > + domcreate_attach_pci(egc, multidev, 0); > + return; > + > +error_out: > + assert(ret); > + domcreate_complete(egc, dcs, ret); > +} > + > static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, > int ret) > { > @@ -1112,7 +1149,7 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, > libxl_domain_config *const d_config = dcs->guest_config; > > if (ret) { > - LOG(ERROR, "unable to add nic devices"); > + LOG(ERROR, "unable to add vtpm devices"); > goto error_out; > } > > diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c > index c3283f1..51dd06e 100644 > --- a/tools/libxl/libxl_device.c > +++ b/tools/libxl/libxl_device.c > @@ -497,6 +497,7 @@ void libxl__multidev_prepared(libxl__egc *egc, > * The following functions are defined: > * libxl__add_disks > * libxl__add_nics > + * libxl__add_vtpms > */ > > #define DEFINE_DEVICES_ADD(type) \ > @@ -515,6 +516,7 @@ void libxl__multidev_prepared(libxl__egc *egc, > > DEFINE_DEVICES_ADD(disk) > DEFINE_DEVICES_ADD(nic) > +DEFINE_DEVICES_ADD(vtpm) > > #undef DEFINE_DEVICES_ADD > > diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h > index 8f220cb..cba3616 100644 > --- a/tools/libxl/libxl_internal.h > +++ b/tools/libxl/libxl_internal.h > @@ -958,6 +958,7 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, > libxl_device_disk *disk); > _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, > uint32_t domid); > +_hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); > _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); > _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); > _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); > @@ -2007,6 +2008,10 @@ _hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, > libxl_device_nic *nic, > libxl__ao_device *aodev); > > +_hidden void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__ao_device *aodev); > + > /* Internal function to connect a vkb device */ > _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, > libxl_device_vkb *vkb); > @@ -2439,6 +2444,10 @@ _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, > libxl_domain_config *d_config, > libxl__multidev *multidev); > > +_hidden void libxl__add_vtpms(libxl__egc *egc, libxl__ao *ao, uint32_t domid, > + libxl_domain_config *d_config, > + libxl__multidev *multidev); > + > /*----- device model creation -----*/ > > /* First layer; wraps libxl__spawn_spawn. */ > diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl > index de111a6..7eac4a8 100644 > --- a/tools/libxl/libxl_types.idl > +++ b/tools/libxl/libxl_types.idl > @@ -395,6 +395,12 @@ libxl_device_pci = Struct("device_pci", [ > ("permissive", bool), > ]) > > +libxl_device_vtpm = Struct("device_vtpm", [ > + ("backend_domid", libxl_domid), > + ("devid", libxl_devid), > + ("uuid", libxl_uuid), > +]) > + > libxl_diskinfo = Struct("diskinfo", [ > ("backend", string), > ("backend_id", uint32), > @@ -418,6 +424,18 @@ libxl_nicinfo = Struct("nicinfo", [ > ("rref_rx", integer), > ], dir=DIR_OUT) > > +libxl_vtpminfo = Struct("vtpminfo", [ > + ("backend", string), > + ("backend_id", uint32), > + ("frontend", string), > + ("frontend_id", uint32), > + ("devid", libxl_devid), > + ("state", integer), > + ("evtch", integer), > + ("rref", integer), > + ("uuid", libxl_uuid), > + ], dir=DIR_OUT) > + > libxl_vcpuinfo = Struct("vcpuinfo", [ > ("vcpuid", uint32), > ("cpu", uint32), > diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl > index 5ac8c9c..c40120e 100644 > --- a/tools/libxl/libxl_types_internal.idl > +++ b/tools/libxl/libxl_types_internal.idl > @@ -19,6 +19,7 @@ libxl__device_kind = Enumeration("device_kind", [ > (5, "VFB"), > (6, "VKBD"), > (7, "CONSOLE"), > + (8, "VTPM"), > ]) > > libxl__console_backend = Enumeration("console_backend", [ > diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c > index 55cd299..8f78790 100644 > --- a/tools/libxl/libxl_utils.c > +++ b/tools/libxl/libxl_utils.c > @@ -463,6 +463,33 @@ int libxl_pipe(libxl_ctx *ctx, int pipes[2]) > return 0; > } > > +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + libxl_uuid* uuid, libxl_device_vtpm *vtpm) > +{ > + libxl_device_vtpm *vtpms; > + int nb, i; > + int rc; > + > + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); > + if (!vtpms) > + return ERROR_FAIL; > + > + memset(vtpm, 0, sizeof (libxl_device_vtpm)); > + rc = 1; > + for (i = 0; i < nb; ++i) { > + if(!libxl_uuid_compare(uuid, &vtpms[i].uuid)) { > + vtpm->backend_domid = vtpms[i].backend_domid; > + vtpm->devid = vtpms[i].devid; > + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); > + rc = 0; > + break; > + } > + } > + > + libxl_device_vtpm_list_free(vtpms, nb); > + return rc; > +} > + > int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, > const char *mac, libxl_device_nic *nic) > { > @@ -819,6 +846,22 @@ void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) > free(list); > } > > +void libxl_vtpminfo_list_free(libxl_vtpminfo* list, int nr) > +{ > + int i; > + for (i = 0; i < nr; i++) > + libxl_vtpminfo_dispose(&list[i]); > + free(list); > +} > + > +void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int nr) > +{ > + int i; > + for (i = 0; i < nr; i++) > + libxl_device_vtpm_dispose(&list[i]); > + free(list); > +} > + > int libxl_domid_valid_guest(uint32_t domid) > { > /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise > diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h > index 83aaac7..40f3f30 100644 > --- a/tools/libxl/libxl_utils.h > +++ b/tools/libxl/libxl_utils.h > @@ -64,6 +64,11 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, > int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, > libxl_device_disk *disk); > > +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + libxl_uuid *uuid, libxl_device_vtpm *vtpm); > +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + int devid, libxl_device_vtpm *vtpm); > + > int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); > /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be > * called by the application when done. */ > diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h > index 0b2f848..be6f38b 100644 > --- a/tools/libxl/xl.h > +++ b/tools/libxl/xl.h > @@ -79,6 +79,9 @@ int main_networkdetach(int argc, char **argv); > int main_blockattach(int argc, char **argv); > int main_blocklist(int argc, char **argv); > int main_blockdetach(int argc, char **argv); > +int main_vtpmattach(int argc, char **argv); > +int main_vtpmlist(int argc, char **argv); > +int main_vtpmdetach(int argc, char **argv); > int main_uptime(int argc, char **argv); > int main_tmem_list(int argc, char **argv); > int main_tmem_freeze(int argc, char **argv); > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index a43b371..65f83bd 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -573,7 +573,7 @@ static void parse_config_data(const char *config_source, > const char *buf; > long l; > XLU_Config *config; > - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; > + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; > XLU_ConfigList *ioports, *irqs, *iomem; > int num_ioports, num_irqs, num_iomem; > int pci_power_mgmt = 0; > @@ -1048,6 +1048,58 @@ static void parse_config_data(const char *config_source, > } > } > > + if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { > + d_config->num_vtpms = 0; > + d_config->vtpms = NULL; > + while ((buf = xlu_cfg_get_listitem (vtpms, d_config->num_vtpms)) != NULL) { > + libxl_device_vtpm *vtpm; > + char * buf2 = strdup(buf); > + char *p, *p2; > + bool got_backend = false; > + > + d_config->vtpms = (libxl_device_vtpm *) realloc(d_config->vtpms, > + sizeof(libxl_device_vtpm) * (d_config->num_vtpms+1)); > + vtpm = d_config->vtpms + d_config->num_vtpms; > + libxl_device_vtpm_init(vtpm); > + vtpm->devid = d_config->num_vtpms; > + > + p = strtok(buf2, ","); > + if(p) { > + do { > + while(*p == ' ') > + ++p; > + if ((p2 = strchr(p, '=')) == NULL) > + break; > + *p2 = '\0'; > + if (!strcmp(p, "backend")) { > + if(domain_qualifier_to_domid(p2 + 1, &(vtpm->backend_domid), 0)) > + { > + fprintf(stderr, > + "Specified vtpm backend domain `%s' does not exist!\n", p2 + 1); > + exit(1); > + } > + got_backend = true; > + } else if(!strcmp(p, "uuid")) { > + if( libxl_uuid_from_string(&vtpm->uuid, p2 + 1) ) { > + fprintf(stderr, > + "Failed to parse vtpm UUID: %s\n", p2 + 1); > + exit(1); > + } > + } else { > + fprintf(stderr, "Unknown string `%s' in vtpm spec\n", p); > + exit(1); > + } > + } while ((p = strtok(NULL, ",")) != NULL); > + } > + if(!got_backend) { > + fprintf(stderr, "vtpm spec missing required backend field!\n"); > + exit(1); > + } > + free(buf2); > + d_config->num_vtpms++; > + } > + } > + > if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { > d_config->num_nics = 0; > d_config->nics = NULL; > @@ -1073,7 +1125,7 @@ static void parse_config_data(const char *config_source, > > p = strtok(buf2, ","); > if (!p) > - goto skip; > + goto skip_nic; > do { > while (*p == ' ') > p++; > @@ -1137,7 +1189,7 @@ static void parse_config_data(const char *config_source, > fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); > } > } while ((p = strtok(NULL, ",")) != NULL); > -skip: > +skip_nic: > free(buf2); > d_config->num_nics++; > } > @@ -5634,6 +5686,132 @@ int main_blockdetach(int argc, char **argv) > return rc; > } > > +int main_vtpmattach(int argc, char **argv) > +{ > + int opt; > + libxl_device_vtpm vtpm; > + char *oparg; > + unsigned int val; > + uint32_t domid; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-attach", 1)) != -1) > + return opt; > + > + if (domain_qualifier_to_domid(argv[optind], &domid, 0) < 0) { > + fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); > + return 1; > + } > + ++optind; > + > + libxl_device_vtpm_init(&vtpm); > + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { > + if (MATCH_OPTION("uuid", *argv, oparg)) { > + if(libxl_uuid_from_string(&(vtpm.uuid), oparg)) { > + fprintf(stderr, "Invalid uuid specified (%s)\n", oparg); > + return 1; > + } > + } else if (MATCH_OPTION("backend", *argv, oparg)) { > + if(domain_qualifier_to_domid(oparg, &val, 0)) { > + fprintf(stderr, > + "Specified backend domain does not exist, defaulting to Dom0\n"); > + val = 0; > + } > + vtpm.backend_domid = val; > + } else { > + fprintf(stderr, "unrecognized argument `%s'\n", *argv); > + return 1; > + } > + } > + > + if(dryrun_only) { > + char* json = libxl_device_vtpm_to_json(ctx, &vtpm); > + printf("vtpm: %s\n", json); > + free(json); > + libxl_device_vtpm_dispose(&vtpm); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > + if (libxl_device_vtpm_add(ctx, domid, &vtpm, 0)) { > + fprintf(stderr, "libxl_device_vtpm_add failed.\n"); > + return 1; > + } > + libxl_device_vtpm_dispose(&vtpm); > + return 0; > +} > + > +int main_vtpmlist(int argc, char **argv) > +{ > + int opt; > + libxl_device_vtpm *vtpms; > + libxl_vtpminfo vtpminfo; > + int nb, i; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-list", 1)) != -1) > + return opt; > + > + /* Idx BE UUID Hdl Sta evch rref BE-path */ > + printf("%-3s %-2s %-36s %-6s %-5s %-6s %-5s %-10s\n", > + "Idx", "BE", "Uuid", "handle", "state", "evt-ch", "ring-ref", "BE-path"); > + for (argv += optind, argc -= optind; argc > 0; --argc, ++argv) { > + uint32_t domid; > + if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) { > + fprintf(stderr, "%s is an invalid domain identifier\n", *argv); > + continue; > + } > + if (!(vtpms = libxl_device_vtpm_list(ctx, domid, &nb))) { > + continue; > + } > + for (i = 0; i < nb; ++i) { > + if(!libxl_device_vtpm_getinfo(ctx, domid, &vtpms[i], &vtpminfo)) { > + /* Idx BE UUID Hdl Sta evch rref BE-path*/ > + printf("%-3d %-2d " LIBXL_UUID_FMT " %6d %5d %6d %8d %-30s\n", > + vtpminfo.devid, vtpminfo.backend_id, > + LIBXL_UUID_BYTES(vtpminfo.uuid), > + vtpminfo.devid, vtpminfo.state, vtpminfo.evtch, > + vtpminfo.rref, vtpminfo.backend); > + > + libxl_vtpminfo_dispose(&vtpminfo); > + } > + libxl_device_vtpm_dispose(&vtpms[i]); > + } > + free(vtpms); > + } > + return 0; > +} > + > +int main_vtpmdetach(int argc, char **argv) > +{ > + uint32_t domid; > + int opt, rc=0; > + libxl_device_vtpm vtpm; > + libxl_uuid uuid; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-detach", 2)) != -1) > + return opt; > + > + domid = find_domain(argv[optind]); > + > + if ( libxl_uuid_from_string(&uuid, argv[optind+1])) { > + if (libxl_devid_to_device_vtpm(ctx, domid, atoi(argv[optind+1]), &vtpm)) { > + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); > + return 1; > + } > + } else { > + if (libxl_uuid_to_device_vtpm(ctx, domid, &uuid, &vtpm)) { > + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); > + return 1; > + } > + } > + rc = libxl_device_vtpm_remove(ctx, domid, &vtpm, 0); > + if (rc) { > + fprintf(stderr, "libxl_device_vtpm_remove failed.\n"); > + } > + libxl_device_vtpm_dispose(&vtpm); > + return rc; > +} > + > + > static char *uptime_to_string(unsigned long uptime, int short_mode) > { > int sec, min, hour, day; > diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c > index d3a215d..ac58642 100644 > --- a/tools/libxl/xl_cmdtable.c > +++ b/tools/libxl/xl_cmdtable.c > @@ -341,6 +341,21 @@ struct cmd_spec cmd_table[] = { > "Destroy a domain's virtual block device", > " ", > }, > + { "vtpm-attach", > + &main_vtpmattach, 1, 1, > + "Create a new virtual TPM device", > + " [uuid=] [backend=]", > + }, > + { "vtpm-list", > + &main_vtpmlist, 0, 0, > + "List virtual TPM devices for a domain", > + "", > + }, > + { "vtpm-detach", > + &main_vtpmdetach, 0, 1, > + "Destroy a domain's virtual TPM device", > + " ", > + }, > { "uptime", > &main_uptime, 0, 0, > "Print uptime for all/some domains", > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3E-0004KA-9P; Tue, 13 Nov 2012 10:49:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3C-0004JS-2l for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:02 +0000 Received: from [193.109.254.147:29284] by server-13.bemta-14.messagelabs.com id 12/A9-11239-D9522A05; Tue, 13 Nov 2012 10:49:01 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1352803738!8895644!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9641 invoked from network); 13 Nov 2012 10:49:00 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:49:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773583" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:48:53 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:48:53 +0000 Message-ID: <1352803732.7491.46.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:48:52 +0000 In-Reply-To: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802096-19224-1-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 5/9] add vtpm support to libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:34 +0000, Matthew Fioravante wrote: > This patch adds vtpm support to libxl. It adds vtpm parsing to config > files and 3 new xl commands: > vtpm-attach > vtpm-detach > vtpm-list > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell and applied. thanks. > > diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 > index 428da21..fe4fac9 100644 > --- a/docs/man/xl.cfg.pod.5 > +++ b/docs/man/xl.cfg.pod.5 > @@ -298,6 +298,35 @@ Specifies the networking provision (both emulated network adapters, > and Xen virtual interfaces) to provided to the guest. See > F. > > +=item B > + > +Specifies the virtual trusted platform module to be > +provided to the guest. Please see F > +for more details. > + > +Each B is a comma-separated list of C > +settings, from the following list: > + > +=over 4 > + > +=item C > + > +Specify the backend domain name of id. This value is required! > +If this domain is a guest, the backend should be set to the > +vtpm domain name. If this domain is a vtpm, the > +backend should be set to the vtpm manager domain name. > + > +=item C > + > +Specify the uuid of this vtpm device. The uuid is used to uniquely > +identify the vtpm device. You can create one using the uuidgen > +program on unix systems. If left unspecified, a new uuid > +will be randomly generated every time the domain boots. > +If this is a vtpm domain, you should specify a value. The > +value is optional if this is a guest domain. > + > +=back > + > =item B > > Specifies the paravirtual framebuffer devices which should be supplied > diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 > index 7b1f2cf..097fe43 100644 > --- a/docs/man/xl.pod.1 > +++ b/docs/man/xl.pod.1 > @@ -1106,6 +1106,31 @@ List virtual network interfaces for a domain. > > =back > > +=head2 VTPM DEVICES > + > +=over 4 > + > +=item B I I > + > +Creates a new vtpm device in the domain specified by I. > +I describes the device to attach, using the same format as the > +B string in the domain config file. See L for > +more information. > + > +=item B I I > + > +Removes the vtpm device from the domain specified by I. > +I is the numeric device id given to the virtual trusted > +platform module device. You will need to run B to determine that number. > +Alternatively the I of the vtpm can be used to > +select the virtual device to detach. > + > +=item B I > + > +List virtual trusted platform modules for a domain. > + > +=back > + > =head1 PCI PASS-THROUGH > > =over 4 > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 665385b..be457f4 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -1710,6 +1710,243 @@ out: > } > > /******************************************************************************/ > +int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm) > +{ > + if(libxl_uuid_is_nil(&vtpm->uuid)) { > + libxl_uuid_generate(&vtpm->uuid); > + } > + return 0; > +} > + > +static int libxl__device_from_vtpm(libxl__gc *gc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__device *device) > +{ > + device->backend_devid = vtpm->devid; > + device->backend_domid = vtpm->backend_domid; > + device->backend_kind = LIBXL__DEVICE_KIND_VTPM; > + device->devid = vtpm->devid; > + device->domid = domid; > + device->kind = LIBXL__DEVICE_KIND_VTPM; > + > + return 0; > +} > + > +void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__ao_device *aodev) > +{ > + STATE_AO_GC(aodev->ao); > + flexarray_t *front; > + flexarray_t *back; > + libxl__device *device; > + char *dompath, **l; > + unsigned int nb, rc; > + > + rc = libxl__device_vtpm_setdefault(gc, vtpm); > + if (rc) goto out; > + > + front = flexarray_make(gc, 16, 1); > + back = flexarray_make(gc, 16, 1); > + > + if(vtpm->devid == -1) { > + if (!(dompath = libxl__xs_get_dompath(gc, domid))) { > + rc = ERROR_FAIL; > + goto out; > + } > + l = libxl__xs_directory(gc, XBT_NULL, > + GCSPRINTF("%s/device/vtpm", dompath), &nb); > + if(l == NULL || nb == 0) { > + vtpm->devid = 0; > + } else { > + vtpm->devid = strtoul(l[nb - 1], NULL, 10) + 1; > + } > + } > + > + GCNEW(device); > + rc = libxl__device_from_vtpm(gc, domid, vtpm, device); > + if ( rc != 0 ) goto out; > + > + flexarray_append(back, "frontend-id"); > + flexarray_append(back, GCSPRINTF("%d", domid)); > + flexarray_append(back, "online"); > + flexarray_append(back, "1"); > + flexarray_append(back, "state"); > + flexarray_append(back, GCSPRINTF("%d", 1)); > + flexarray_append(back, "handle"); > + flexarray_append(back, GCSPRINTF("%d", vtpm->devid)); > + > + flexarray_append(back, "uuid"); > + flexarray_append(back, GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(vtpm->uuid))); > + flexarray_append(back, "resume"); > + flexarray_append(back, "False"); > + > + flexarray_append(front, "backend-id"); > + flexarray_append(front, GCSPRINTF("%d", vtpm->backend_domid)); > + flexarray_append(front, "state"); > + flexarray_append(front, GCSPRINTF("%d", 1)); > + flexarray_append(front, "handle"); > + flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); > + > + libxl__device_generic_add(gc, XBT_NULL, device, > + libxl__xs_kvs_of_flexarray(gc, back, back->count), > + libxl__xs_kvs_of_flexarray(gc, front, front->count)); > + > + aodev->dev = device; > + aodev->action = DEVICE_CONNECT; > + libxl__wait_device_connection(egc, aodev); > + > + rc = 0; > +out: > + aodev->rc = rc; > + if(rc) aodev->callback(egc, aodev); > + return; > +} > + > +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num) > +{ > + GC_INIT(ctx); > + > + libxl_device_vtpm* vtpms = NULL; > + char* fe_path = NULL; > + char** dir = NULL; > + unsigned int ndirs = 0; > + > + *num = 0; > + > + fe_path = libxl__sprintf(gc, "%s/device/vtpm", libxl__xs_get_dompath(gc, domid)); > + dir = libxl__xs_directory(gc, XBT_NULL, fe_path, &ndirs); > + if(dir) { > + vtpms = malloc(sizeof(*vtpms) * ndirs); > + libxl_device_vtpm* vtpm; > + libxl_device_vtpm* end = vtpms + ndirs; > + for(vtpm = vtpms; vtpm < end; ++vtpm, ++dir) { > + char* tmp; > + const char* be_path = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/%s/backend", > + fe_path, *dir)); > + > + vtpm->devid = atoi(*dir); > + > + tmp = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/%s/backend_id", > + fe_path, *dir)); > + vtpm->backend_domid = atoi(tmp); > + > + tmp = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", be_path)); > + if(tmp) { > + if(libxl_uuid_from_string(&(vtpm->uuid), tmp)) { > + LOG(ERROR, "%s/uuid is a malformed uuid?? (%s) Probably a bug!!\n", be_path, tmp); > + exit(1); > + } > + } > + } > + } > + *num = ndirs; > + > + GC_FREE; > + return vtpms; > +} > + > +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, > + uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl_vtpminfo *vtpminfo) > +{ > + GC_INIT(ctx); > + char *dompath, *vtpmpath; > + char *val; > + int rc = 0; > + > + libxl_vtpminfo_init(vtpminfo); > + dompath = libxl__xs_get_dompath(gc, domid); > + vtpminfo->devid = vtpm->devid; > + > + vtpmpath = GCSPRINTF("%s/device/vtpm/%d", dompath, vtpminfo->devid); > + vtpminfo->backend = xs_read(ctx->xsh, XBT_NULL, > + GCSPRINTF("%s/backend", vtpmpath), NULL); > + if (!vtpminfo->backend) { > + goto err; > + } > + if(!libxl__xs_read(gc, XBT_NULL, vtpminfo->backend)) { > + goto err; > + } > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/backend-id", vtpmpath)); > + vtpminfo->backend_id = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/state", vtpmpath)); > + vtpminfo->state = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/event-channel", vtpmpath)); > + vtpminfo->evtch = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/ring-ref", vtpmpath)); > + vtpminfo->rref = val ? strtoul(val, NULL, 10) : -1; > + > + vtpminfo->frontend = xs_read(ctx->xsh, XBT_NULL, > + GCSPRINTF("%s/frontend", vtpminfo->backend), NULL); > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/frontend-id", vtpminfo->backend)); > + vtpminfo->frontend_id = val ? strtoul(val, NULL, 10) : -1; > + > + val = libxl__xs_read(gc, XBT_NULL, > + GCSPRINTF("%s/uuid", vtpminfo->backend)); > + if(val == NULL) { > + LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); > + goto err; > + } > + if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { > + LOG(ERROR, > + "%s/uuid is a malformed uuid?? (%s) Probably a bug!\n", > + vtpminfo->backend, val); > + goto err; > + } > + > + goto exit; > +err: > + rc = ERROR_FAIL; > +exit: > + GC_FREE; > + return rc; > +} > + > +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, > + uint32_t domid, > + int devid, > + libxl_device_vtpm *vtpm) > +{ > + libxl_device_vtpm *vtpms; > + int nb, i; > + int rc; > + > + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); > + if (!vtpms) > + return ERROR_FAIL; > + > + memset(vtpm, 0, sizeof (libxl_device_vtpm)); > + rc = 1; > + for (i = 0; i < nb; ++i) { > + if(devid == vtpms[i].devid) { > + vtpm->backend_domid = vtpms[i].backend_domid; > + vtpm->devid = vtpms[i].devid; > + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); > + rc = 0; > + break; > + } > + } > + > + libxl_device_vtpm_list_free(vtpms, nb); > + return rc; > +} > + > + > +/******************************************************************************/ > > int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk) > { > @@ -3046,6 +3283,8 @@ out: > * libxl_device_disk_destroy > * libxl_device_nic_remove > * libxl_device_nic_destroy > + * libxl_device_vtpm_remove > + * libxl_device_vtpm_destroy > * libxl_device_vkb_remove > * libxl_device_vkb_destroy > * libxl_device_vfb_remove > @@ -3097,6 +3336,10 @@ DEFINE_DEVICE_REMOVE(vkb, destroy, 1) > DEFINE_DEVICE_REMOVE(vfb, remove, 0) > DEFINE_DEVICE_REMOVE(vfb, destroy, 1) > > +/* vtpm */ > +DEFINE_DEVICE_REMOVE(vtpm, remove, 0) > +DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) > + > #undef DEFINE_DEVICE_REMOVE > > /******************************************************************************/ > @@ -3105,6 +3348,7 @@ DEFINE_DEVICE_REMOVE(vfb, destroy, 1) > /* The following functions are defined: > * libxl_device_disk_add > * libxl_device_nic_add > + * libxl_device_vtpm_add > */ > > #define DEFINE_DEVICE_ADD(type) \ > @@ -3131,6 +3375,9 @@ DEFINE_DEVICE_ADD(disk) > /* nic */ > DEFINE_DEVICE_ADD(nic) > > +/* vtpm */ > +DEFINE_DEVICE_ADD(vtpm) > + > #undef DEFINE_DEVICE_ADD > > /******************************************************************************/ > diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h > index 7a7c419..e2ba549 100644 > --- a/tools/libxl/libxl.h > +++ b/tools/libxl/libxl.h > @@ -478,13 +478,14 @@ typedef struct { > libxl_domain_create_info c_info; > libxl_domain_build_info b_info; > > - int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs; > + int num_disks, num_nics, num_pcidevs, num_vfbs, num_vkbs, num_vtpms; > > libxl_device_disk *disks; > libxl_device_nic *nics; > libxl_device_pci *pcidevs; > libxl_device_vfb *vfbs; > libxl_device_vkb *vkbs; > + libxl_device_vtpm *vtpms; > > libxl_action_on_shutdown on_poweroff; > libxl_action_on_shutdown on_reboot; > @@ -645,6 +646,9 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, > int *nb_vcpu, int *nr_vcpus_out); > void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); > > +void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms); > +void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); > + > /* > * Devices > * ======= > @@ -745,6 +749,23 @@ libxl_device_nic *libxl_device_nic_list(libxl_ctx *ctx, uint32_t domid, int *num > int libxl_device_nic_getinfo(libxl_ctx *ctx, uint32_t domid, > libxl_device_nic *nic, libxl_nicinfo *nicinfo); > > +/* Virtual TPMs */ > +int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > +int libxl_device_vtpm_remove(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > +int libxl_device_vtpm_destroy(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, > + const libxl_asyncop_how *ao_how) > + LIBXL_EXTERNAL_CALLERS_ONLY; > + > +libxl_device_vtpm *libxl_device_vtpm_list(libxl_ctx *ctx, uint32_t domid, int *num); > +int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, > + libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); > + > /* Keyboard */ > int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, > const libxl_asyncop_how *ao_how) > diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c > index e81747b..9d20086 100644 > --- a/tools/libxl/libxl_create.c > +++ b/tools/libxl/libxl_create.c > @@ -55,6 +55,8 @@ void libxl_domain_config_dispose(libxl_domain_config *d_config) > libxl_device_vkb_dispose(&d_config->vkbs[i]); > free(d_config->vkbs); > > + libxl_device_vtpm_list_free(d_config->vtpms, d_config->num_vtpms); > + > libxl_domain_create_info_dispose(&d_config->c_info); > libxl_domain_build_info_dispose(&d_config->b_info); > } > @@ -601,6 +603,8 @@ static void domcreate_bootloader_done(libxl__egc *egc, > static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *aodevs, > int ret); > > +static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, > + int ret); > static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, > int ret); > > @@ -1085,13 +1089,13 @@ static void domcreate_devmodel_started(libxl__egc *egc, > if (d_config->num_nics > 0) { > /* Attach nics */ > libxl__multidev_begin(ao, &dcs->multidev); > - dcs->multidev.callback = domcreate_attach_pci; > + dcs->multidev.callback = domcreate_attach_vtpms; > libxl__add_nics(egc, ao, domid, d_config, &dcs->multidev); > libxl__multidev_prepared(egc, &dcs->multidev, 0); > return; > } > > - domcreate_attach_pci(egc, &dcs->multidev, 0); > + domcreate_attach_vtpms(egc, &dcs->multidev, 0); > return; > > error_out: > @@ -1099,6 +1103,39 @@ error_out: > domcreate_complete(egc, dcs, ret); > } > > +static void domcreate_attach_vtpms(libxl__egc *egc, > + libxl__multidev *multidev, > + int ret) > +{ > + libxl__domain_create_state *dcs = CONTAINER_OF(multidev, *dcs, multidev); > + STATE_AO_GC(dcs->ao); > + int domid = dcs->guest_domid; > + > + libxl_domain_config* const d_config = dcs->guest_config; > + > + if(ret) { > + LOG(ERROR, "unable to add nic devices"); > + goto error_out; > + } > + > + /* Plug vtpm devices */ > + if (d_config->num_vtpms > 0) { > + /* Attach vtpms */ > + libxl__multidev_begin(ao, &dcs->multidev); > + dcs->multidev.callback = domcreate_attach_pci; > + libxl__add_vtpms(egc, ao, domid, d_config, &dcs->multidev); > + libxl__multidev_prepared(egc, &dcs->multidev, 0); > + return; > + } > + > + domcreate_attach_pci(egc, multidev, 0); > + return; > + > +error_out: > + assert(ret); > + domcreate_complete(egc, dcs, ret); > +} > + > static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, > int ret) > { > @@ -1112,7 +1149,7 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, > libxl_domain_config *const d_config = dcs->guest_config; > > if (ret) { > - LOG(ERROR, "unable to add nic devices"); > + LOG(ERROR, "unable to add vtpm devices"); > goto error_out; > } > > diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c > index c3283f1..51dd06e 100644 > --- a/tools/libxl/libxl_device.c > +++ b/tools/libxl/libxl_device.c > @@ -497,6 +497,7 @@ void libxl__multidev_prepared(libxl__egc *egc, > * The following functions are defined: > * libxl__add_disks > * libxl__add_nics > + * libxl__add_vtpms > */ > > #define DEFINE_DEVICES_ADD(type) \ > @@ -515,6 +516,7 @@ void libxl__multidev_prepared(libxl__egc *egc, > > DEFINE_DEVICES_ADD(disk) > DEFINE_DEVICES_ADD(nic) > +DEFINE_DEVICES_ADD(vtpm) > > #undef DEFINE_DEVICES_ADD > > diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h > index 8f220cb..cba3616 100644 > --- a/tools/libxl/libxl_internal.h > +++ b/tools/libxl/libxl_internal.h > @@ -958,6 +958,7 @@ _hidden int libxl__device_disk_setdefault(libxl__gc *gc, > libxl_device_disk *disk); > _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, > uint32_t domid); > +_hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); > _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); > _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); > _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); > @@ -2007,6 +2008,10 @@ _hidden void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, > libxl_device_nic *nic, > libxl__ao_device *aodev); > > +_hidden void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, > + libxl_device_vtpm *vtpm, > + libxl__ao_device *aodev); > + > /* Internal function to connect a vkb device */ > _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, > libxl_device_vkb *vkb); > @@ -2439,6 +2444,10 @@ _hidden void libxl__add_nics(libxl__egc *egc, libxl__ao *ao, uint32_t domid, > libxl_domain_config *d_config, > libxl__multidev *multidev); > > +_hidden void libxl__add_vtpms(libxl__egc *egc, libxl__ao *ao, uint32_t domid, > + libxl_domain_config *d_config, > + libxl__multidev *multidev); > + > /*----- device model creation -----*/ > > /* First layer; wraps libxl__spawn_spawn. */ > diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl > index de111a6..7eac4a8 100644 > --- a/tools/libxl/libxl_types.idl > +++ b/tools/libxl/libxl_types.idl > @@ -395,6 +395,12 @@ libxl_device_pci = Struct("device_pci", [ > ("permissive", bool), > ]) > > +libxl_device_vtpm = Struct("device_vtpm", [ > + ("backend_domid", libxl_domid), > + ("devid", libxl_devid), > + ("uuid", libxl_uuid), > +]) > + > libxl_diskinfo = Struct("diskinfo", [ > ("backend", string), > ("backend_id", uint32), > @@ -418,6 +424,18 @@ libxl_nicinfo = Struct("nicinfo", [ > ("rref_rx", integer), > ], dir=DIR_OUT) > > +libxl_vtpminfo = Struct("vtpminfo", [ > + ("backend", string), > + ("backend_id", uint32), > + ("frontend", string), > + ("frontend_id", uint32), > + ("devid", libxl_devid), > + ("state", integer), > + ("evtch", integer), > + ("rref", integer), > + ("uuid", libxl_uuid), > + ], dir=DIR_OUT) > + > libxl_vcpuinfo = Struct("vcpuinfo", [ > ("vcpuid", uint32), > ("cpu", uint32), > diff --git a/tools/libxl/libxl_types_internal.idl b/tools/libxl/libxl_types_internal.idl > index 5ac8c9c..c40120e 100644 > --- a/tools/libxl/libxl_types_internal.idl > +++ b/tools/libxl/libxl_types_internal.idl > @@ -19,6 +19,7 @@ libxl__device_kind = Enumeration("device_kind", [ > (5, "VFB"), > (6, "VKBD"), > (7, "CONSOLE"), > + (8, "VTPM"), > ]) > > libxl__console_backend = Enumeration("console_backend", [ > diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c > index 55cd299..8f78790 100644 > --- a/tools/libxl/libxl_utils.c > +++ b/tools/libxl/libxl_utils.c > @@ -463,6 +463,33 @@ int libxl_pipe(libxl_ctx *ctx, int pipes[2]) > return 0; > } > > +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + libxl_uuid* uuid, libxl_device_vtpm *vtpm) > +{ > + libxl_device_vtpm *vtpms; > + int nb, i; > + int rc; > + > + vtpms = libxl_device_vtpm_list(ctx, domid, &nb); > + if (!vtpms) > + return ERROR_FAIL; > + > + memset(vtpm, 0, sizeof (libxl_device_vtpm)); > + rc = 1; > + for (i = 0; i < nb; ++i) { > + if(!libxl_uuid_compare(uuid, &vtpms[i].uuid)) { > + vtpm->backend_domid = vtpms[i].backend_domid; > + vtpm->devid = vtpms[i].devid; > + libxl_uuid_copy(&vtpm->uuid, &vtpms[i].uuid); > + rc = 0; > + break; > + } > + } > + > + libxl_device_vtpm_list_free(vtpms, nb); > + return rc; > +} > + > int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, > const char *mac, libxl_device_nic *nic) > { > @@ -819,6 +846,22 @@ void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) > free(list); > } > > +void libxl_vtpminfo_list_free(libxl_vtpminfo* list, int nr) > +{ > + int i; > + for (i = 0; i < nr; i++) > + libxl_vtpminfo_dispose(&list[i]); > + free(list); > +} > + > +void libxl_device_vtpm_list_free(libxl_device_vtpm* list, int nr) > +{ > + int i; > + for (i = 0; i < nr; i++) > + libxl_device_vtpm_dispose(&list[i]); > + free(list); > +} > + > int libxl_domid_valid_guest(uint32_t domid) > { > /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise > diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h > index 83aaac7..40f3f30 100644 > --- a/tools/libxl/libxl_utils.h > +++ b/tools/libxl/libxl_utils.h > @@ -64,6 +64,11 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, > int libxl_vdev_to_device_disk(libxl_ctx *ctx, uint32_t domid, const char *vdev, > libxl_device_disk *disk); > > +int libxl_uuid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + libxl_uuid *uuid, libxl_device_vtpm *vtpm); > +int libxl_devid_to_device_vtpm(libxl_ctx *ctx, uint32_t domid, > + int devid, libxl_device_vtpm *vtpm); > + > int libxl_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *bitmap, int n_bits); > /* Allocated bimap is from malloc, libxl_bitmap_dispose() to be > * called by the application when done. */ > diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h > index 0b2f848..be6f38b 100644 > --- a/tools/libxl/xl.h > +++ b/tools/libxl/xl.h > @@ -79,6 +79,9 @@ int main_networkdetach(int argc, char **argv); > int main_blockattach(int argc, char **argv); > int main_blocklist(int argc, char **argv); > int main_blockdetach(int argc, char **argv); > +int main_vtpmattach(int argc, char **argv); > +int main_vtpmlist(int argc, char **argv); > +int main_vtpmdetach(int argc, char **argv); > int main_uptime(int argc, char **argv); > int main_tmem_list(int argc, char **argv); > int main_tmem_freeze(int argc, char **argv); > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index a43b371..65f83bd 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -573,7 +573,7 @@ static void parse_config_data(const char *config_source, > const char *buf; > long l; > XLU_Config *config; > - XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids; > + XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; > XLU_ConfigList *ioports, *irqs, *iomem; > int num_ioports, num_irqs, num_iomem; > int pci_power_mgmt = 0; > @@ -1048,6 +1048,58 @@ static void parse_config_data(const char *config_source, > } > } > > + if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { > + d_config->num_vtpms = 0; > + d_config->vtpms = NULL; > + while ((buf = xlu_cfg_get_listitem (vtpms, d_config->num_vtpms)) != NULL) { > + libxl_device_vtpm *vtpm; > + char * buf2 = strdup(buf); > + char *p, *p2; > + bool got_backend = false; > + > + d_config->vtpms = (libxl_device_vtpm *) realloc(d_config->vtpms, > + sizeof(libxl_device_vtpm) * (d_config->num_vtpms+1)); > + vtpm = d_config->vtpms + d_config->num_vtpms; > + libxl_device_vtpm_init(vtpm); > + vtpm->devid = d_config->num_vtpms; > + > + p = strtok(buf2, ","); > + if(p) { > + do { > + while(*p == ' ') > + ++p; > + if ((p2 = strchr(p, '=')) == NULL) > + break; > + *p2 = '\0'; > + if (!strcmp(p, "backend")) { > + if(domain_qualifier_to_domid(p2 + 1, &(vtpm->backend_domid), 0)) > + { > + fprintf(stderr, > + "Specified vtpm backend domain `%s' does not exist!\n", p2 + 1); > + exit(1); > + } > + got_backend = true; > + } else if(!strcmp(p, "uuid")) { > + if( libxl_uuid_from_string(&vtpm->uuid, p2 + 1) ) { > + fprintf(stderr, > + "Failed to parse vtpm UUID: %s\n", p2 + 1); > + exit(1); > + } > + } else { > + fprintf(stderr, "Unknown string `%s' in vtpm spec\n", p); > + exit(1); > + } > + } while ((p = strtok(NULL, ",")) != NULL); > + } > + if(!got_backend) { > + fprintf(stderr, "vtpm spec missing required backend field!\n"); > + exit(1); > + } > + free(buf2); > + d_config->num_vtpms++; > + } > + } > + > if (!xlu_cfg_get_list (config, "vif", &nics, 0, 0)) { > d_config->num_nics = 0; > d_config->nics = NULL; > @@ -1073,7 +1125,7 @@ static void parse_config_data(const char *config_source, > > p = strtok(buf2, ","); > if (!p) > - goto skip; > + goto skip_nic; > do { > while (*p == ' ') > p++; > @@ -1137,7 +1189,7 @@ static void parse_config_data(const char *config_source, > fprintf(stderr, "the accel parameter for vifs is currently not supported\n"); > } > } while ((p = strtok(NULL, ",")) != NULL); > -skip: > +skip_nic: > free(buf2); > d_config->num_nics++; > } > @@ -5634,6 +5686,132 @@ int main_blockdetach(int argc, char **argv) > return rc; > } > > +int main_vtpmattach(int argc, char **argv) > +{ > + int opt; > + libxl_device_vtpm vtpm; > + char *oparg; > + unsigned int val; > + uint32_t domid; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-attach", 1)) != -1) > + return opt; > + > + if (domain_qualifier_to_domid(argv[optind], &domid, 0) < 0) { > + fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); > + return 1; > + } > + ++optind; > + > + libxl_device_vtpm_init(&vtpm); > + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { > + if (MATCH_OPTION("uuid", *argv, oparg)) { > + if(libxl_uuid_from_string(&(vtpm.uuid), oparg)) { > + fprintf(stderr, "Invalid uuid specified (%s)\n", oparg); > + return 1; > + } > + } else if (MATCH_OPTION("backend", *argv, oparg)) { > + if(domain_qualifier_to_domid(oparg, &val, 0)) { > + fprintf(stderr, > + "Specified backend domain does not exist, defaulting to Dom0\n"); > + val = 0; > + } > + vtpm.backend_domid = val; > + } else { > + fprintf(stderr, "unrecognized argument `%s'\n", *argv); > + return 1; > + } > + } > + > + if(dryrun_only) { > + char* json = libxl_device_vtpm_to_json(ctx, &vtpm); > + printf("vtpm: %s\n", json); > + free(json); > + libxl_device_vtpm_dispose(&vtpm); > + if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } > + return 0; > + } > + > + if (libxl_device_vtpm_add(ctx, domid, &vtpm, 0)) { > + fprintf(stderr, "libxl_device_vtpm_add failed.\n"); > + return 1; > + } > + libxl_device_vtpm_dispose(&vtpm); > + return 0; > +} > + > +int main_vtpmlist(int argc, char **argv) > +{ > + int opt; > + libxl_device_vtpm *vtpms; > + libxl_vtpminfo vtpminfo; > + int nb, i; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-list", 1)) != -1) > + return opt; > + > + /* Idx BE UUID Hdl Sta evch rref BE-path */ > + printf("%-3s %-2s %-36s %-6s %-5s %-6s %-5s %-10s\n", > + "Idx", "BE", "Uuid", "handle", "state", "evt-ch", "ring-ref", "BE-path"); > + for (argv += optind, argc -= optind; argc > 0; --argc, ++argv) { > + uint32_t domid; > + if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) { > + fprintf(stderr, "%s is an invalid domain identifier\n", *argv); > + continue; > + } > + if (!(vtpms = libxl_device_vtpm_list(ctx, domid, &nb))) { > + continue; > + } > + for (i = 0; i < nb; ++i) { > + if(!libxl_device_vtpm_getinfo(ctx, domid, &vtpms[i], &vtpminfo)) { > + /* Idx BE UUID Hdl Sta evch rref BE-path*/ > + printf("%-3d %-2d " LIBXL_UUID_FMT " %6d %5d %6d %8d %-30s\n", > + vtpminfo.devid, vtpminfo.backend_id, > + LIBXL_UUID_BYTES(vtpminfo.uuid), > + vtpminfo.devid, vtpminfo.state, vtpminfo.evtch, > + vtpminfo.rref, vtpminfo.backend); > + > + libxl_vtpminfo_dispose(&vtpminfo); > + } > + libxl_device_vtpm_dispose(&vtpms[i]); > + } > + free(vtpms); > + } > + return 0; > +} > + > +int main_vtpmdetach(int argc, char **argv) > +{ > + uint32_t domid; > + int opt, rc=0; > + libxl_device_vtpm vtpm; > + libxl_uuid uuid; > + > + if ((opt = def_getopt(argc, argv, "", "vtpm-detach", 2)) != -1) > + return opt; > + > + domid = find_domain(argv[optind]); > + > + if ( libxl_uuid_from_string(&uuid, argv[optind+1])) { > + if (libxl_devid_to_device_vtpm(ctx, domid, atoi(argv[optind+1]), &vtpm)) { > + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); > + return 1; > + } > + } else { > + if (libxl_uuid_to_device_vtpm(ctx, domid, &uuid, &vtpm)) { > + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); > + return 1; > + } > + } > + rc = libxl_device_vtpm_remove(ctx, domid, &vtpm, 0); > + if (rc) { > + fprintf(stderr, "libxl_device_vtpm_remove failed.\n"); > + } > + libxl_device_vtpm_dispose(&vtpm); > + return rc; > +} > + > + > static char *uptime_to_string(unsigned long uptime, int short_mode) > { > int sec, min, hour, day; > diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c > index d3a215d..ac58642 100644 > --- a/tools/libxl/xl_cmdtable.c > +++ b/tools/libxl/xl_cmdtable.c > @@ -341,6 +341,21 @@ struct cmd_spec cmd_table[] = { > "Destroy a domain's virtual block device", > " ", > }, > + { "vtpm-attach", > + &main_vtpmattach, 1, 1, > + "Create a new virtual TPM device", > + " [uuid=] [backend=]", > + }, > + { "vtpm-list", > + &main_vtpmlist, 0, 0, > + "List virtual TPM devices for a domain", > + "", > + }, > + { "vtpm-detach", > + &main_vtpmdetach, 0, 1, > + "Destroy a domain's virtual TPM device", > + " ", > + }, > { "uptime", > &main_uptime, 0, 0, > "Print uptime for all/some domains", > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3r-0004T7-DU; Tue, 13 Nov 2012 10:49:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3p-0004Sl-Rc for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:42 +0000 Received: from [85.158.138.51:33055] by server-12.bemta-3.messagelabs.com id 19/AA-22757-5C522A05; Tue, 13 Nov 2012 10:49:41 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352803780!21730856!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5307 invoked from network); 13 Nov 2012 10:49:40 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-3.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 10:49:40 -0000 Received: (qmail 27313 invoked from network); 13 Nov 2012 12:49:38 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:49:38 +0200 Message-ID: <50A225CA.2080705@gmail.com> Date: Tue, 13 Nov 2012 12:49:46 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> In-Reply-To: <1352802973.7491.40.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226275, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_NO_LINK_NMD; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: ac99bdfe8c2928be4e953c5e206af251.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43988 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >> OK, my immediate end-goal is real-time logging of hypervisor events via >> a dom0 userspace application. These events are always about a currently >> running virtual machine, and said virtual machine is paused at the time. >> The userspace tool should be immediately notified, so no polling. > > This is very like the ioreq model, where the domain (or maybe just the > vcpu, I'm not sure) is paused while qemu does its thing. > > What sort of events are we talking about here? A list of interesting registers that changed, that a page fault occured, things like that, occasionally containing some small string messages with extra information. Should be around 64 bytes or so. > The right thing to do here is for the userspace tool to communicate with > the toolstack (by whatever means) rather the hypervisor in order to > control the domains. That's what I was thinking too. > You might also find some inspiration for this sort of model in the > xenpaging and memshare code. Will look those things up, I appreciate the replies. Thanks, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:49:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:49:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3r-0004T7-DU; Tue, 13 Nov 2012 10:49:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3p-0004Sl-Rc for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:42 +0000 Received: from [85.158.138.51:33055] by server-12.bemta-3.messagelabs.com id 19/AA-22757-5C522A05; Tue, 13 Nov 2012 10:49:41 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352803780!21730856!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5307 invoked from network); 13 Nov 2012 10:49:40 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-3.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 10:49:40 -0000 Received: (qmail 27313 invoked from network); 13 Nov 2012 12:49:38 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:49:38 +0200 Message-ID: <50A225CA.2080705@gmail.com> Date: Tue, 13 Nov 2012 12:49:46 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> In-Reply-To: <1352802973.7491.40.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226275, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_NO_LINK_NMD; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: ac99bdfe8c2928be4e953c5e206af251.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43988 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >> OK, my immediate end-goal is real-time logging of hypervisor events via >> a dom0 userspace application. These events are always about a currently >> running virtual machine, and said virtual machine is paused at the time. >> The userspace tool should be immediately notified, so no polling. > > This is very like the ioreq model, where the domain (or maybe just the > vcpu, I'm not sure) is paused while qemu does its thing. > > What sort of events are we talking about here? A list of interesting registers that changed, that a page fault occured, things like that, occasionally containing some small string messages with extra information. Should be around 64 bytes or so. > The right thing to do here is for the userspace tool to communicate with > the toolstack (by whatever means) rather the hypervisor in order to > control the domains. That's what I was thinking too. > You might also find some inspiration for this sort of model in the > xenpaging and memshare code. Will look those things up, I appreciate the replies. Thanks, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:51:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:51:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE55-0004gE-T2; Tue, 13 Nov 2012 10:50:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE54-0004g1-MY for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:50:59 +0000 Received: from [85.158.139.211:40963] by server-10.bemta-5.messagelabs.com id 68/AE-09257-11622A05; Tue, 13 Nov 2012 10:50:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352803856!19963327!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25370 invoked from network); 13 Nov 2012 10:50:56 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:50:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773658" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:50:56 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:50:55 +0000 Message-ID: <1352803854.7491.48.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:50:54 +0000 In-Reply-To: <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Add 3 new libraries to stubdom: > libgmp > polarssl > Berlios TPM Emulator 0.7.4 > > Also adds makefile structure for vtpm-stubdom and vtpmmgrdom > > Signed-off-by: Matthew Fioravante Patch 7, 8 & 9 all: Acked-by: Ian Campbell (I must confess I did not review in detail, but it is all self contained and has an active maintainer...) However rather than apply straight away I have downloaded these three files: ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 http://polarssl.org/code/releases/polarssl-1.1.4-gpl.tgz http://download.berlios.de/tpm-emulator/tpm_emulator-0.7.4.tar.gz with checksums: $ sha256sum gmp-4.3.2.tar.bz2 polarssl-1.1.4-gpl.tgz tpm_emulator-0.7.4.tar.gz 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 gmp-4.3.2.tar.bz2 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 polarssl-1.1.4-gpl.tgz 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 tpm_emulator-0.7.4.tar.gz $ and placed them at the $(XEN_EXTFILES_URL). Please could you confirm that these are correct and respin to use XEN_EXTFILES_URL? > > diff --git a/stubdom/Makefile b/stubdom/Makefile > index 50ba360..96801b2 100644 > --- a/stubdom/Makefile > +++ b/stubdom/Makefile > @@ -31,6 +31,18 @@ GRUB_VERSION=0.97 > OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 > OCAML_VERSION=3.11.0 > > +GMP_VERSION=4.3.2 > +#GMP_URL?=$(XEN_EXTFILES_URL) > +GMP_URL?=ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) This is a 2010 release -- any plans to upgrade to the more recent 5.x stream? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:51:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:51:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE55-0004gE-T2; Tue, 13 Nov 2012 10:50:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE54-0004g1-MY for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:50:59 +0000 Received: from [85.158.139.211:40963] by server-10.bemta-5.messagelabs.com id 68/AE-09257-11622A05; Tue, 13 Nov 2012 10:50:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352803856!19963327!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25370 invoked from network); 13 Nov 2012 10:50:56 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:50:56 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773658" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:50:56 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:50:55 +0000 Message-ID: <1352803854.7491.48.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:50:54 +0000 In-Reply-To: <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Add 3 new libraries to stubdom: > libgmp > polarssl > Berlios TPM Emulator 0.7.4 > > Also adds makefile structure for vtpm-stubdom and vtpmmgrdom > > Signed-off-by: Matthew Fioravante Patch 7, 8 & 9 all: Acked-by: Ian Campbell (I must confess I did not review in detail, but it is all self contained and has an active maintainer...) However rather than apply straight away I have downloaded these three files: ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 http://polarssl.org/code/releases/polarssl-1.1.4-gpl.tgz http://download.berlios.de/tpm-emulator/tpm_emulator-0.7.4.tar.gz with checksums: $ sha256sum gmp-4.3.2.tar.bz2 polarssl-1.1.4-gpl.tgz tpm_emulator-0.7.4.tar.gz 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 gmp-4.3.2.tar.bz2 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 polarssl-1.1.4-gpl.tgz 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 tpm_emulator-0.7.4.tar.gz $ and placed them at the $(XEN_EXTFILES_URL). Please could you confirm that these are correct and respin to use XEN_EXTFILES_URL? > > diff --git a/stubdom/Makefile b/stubdom/Makefile > index 50ba360..96801b2 100644 > --- a/stubdom/Makefile > +++ b/stubdom/Makefile > @@ -31,6 +31,18 @@ GRUB_VERSION=0.97 > OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 > OCAML_VERSION=3.11.0 > > +GMP_VERSION=4.3.2 > +#GMP_URL?=$(XEN_EXTFILES_URL) > +GMP_URL?=ftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) This is a 2010 release -- any plans to upgrade to the more recent 5.x stream? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:57:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:57:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEAz-00057O-1T; Tue, 13 Nov 2012 10:57:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEAx-00057J-Np for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 10:57:03 +0000 Received: from [85.158.138.51:64451] by server-14.bemta-3.messagelabs.com id 21/5A-12788-A7722A05; Tue, 13 Nov 2012 10:56:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352804216!20930200!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 13 Nov 2012 10:56:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:56:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214302706" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:56:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 05:56:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEAp-0003uK-VI; Tue, 13 Nov 2012 10:56:55 +0000 Date: Tue, 13 Nov 2012 10:56:23 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Paolo Bonzini In-Reply-To: <50A2250A.4070108@redhat.com> Message-ID: References: <50A0E79F0200009100082E4C@novprvoes0310.provo.novell.com> <50A2250A.4070108@redhat.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: Charles Arnold , Kevin Wolf , thanos.makatos@citrix.com, xen-devel@lists.xensource.com, Stefano Stabellini , "qemu-devel@nongnu.org" , "stefanha@redhat.com" Subject: Re: [Xen-devel] [PATCH] block: vpc support for ~2 TB disks X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012, Paolo Bonzini wrote: > Il 12/11/2012 20:12, Charles Arnold ha scritto: > > Ping? > > > > Any thoughts on whether this is acceptable? > > I would like to know what is done by other platforms. Stefano, any idea > about XenServer? > I am not sure, but maybe Thanos, that is working on blktap3, knows, or at least knows who to CC. > > - Charles > > > >>>> On 10/30/2012 at 08:59 PM, in message <50A0E561.5B74.0091.0@suse.com>, Charles > > Arnold wrote: > >> The VHD specification allows for up to a 2 TB disk size. The current > >> implementation in qemu emulates EIDE and ATA-2 hardware which only allows > >> for up to 127 GB. This disk size limitation can be overridden by allowing > >> up to 255 heads instead of the normal 4 bit limitation of 16. Doing so > >> allows disk images to be created of up to nearly 2 TB. This change does > >> not violate the VHD format specification nor does it change how smaller > >> disks (ie, <=127GB) are defined. > >> > >> Signed-off-by: Charles Arnold > >> > >> diff --git a/block/vpc.c b/block/vpc.c > >> index b6bf52f..0c2eaf8 100644 > >> --- a/block/vpc.c > >> +++ b/block/vpc.c > >> @@ -198,7 +198,8 @@ static int vpc_open(BlockDriverState *bs, int flags) > >> bs->total_sectors = (int64_t) > >> be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl; > >> > >> - if (bs->total_sectors >= 65535 * 16 * 255) { > >> + /* Allow a maximum disk size of approximately 2 TB */ > >> + if (bs->total_sectors >= 65535LL * 255 * 255) {qemu-devel@nongnu.org > >> err = -EFBIG; > >> goto fail; > >> } > >> @@ -524,19 +525,27 @@ static coroutine_fn int vpc_co_write(BlockDriverState > >> *bs, int64_t sector_num, > >> * Note that the geometry doesn't always exactly match total_sectors but > >> * may round it down. > >> * > >> - * Returns 0 on success, -EFBIG if the size is larger than 127 GB > >> + * Returns 0 on success, -EFBIG if the size is larger than ~2 TB. Override > >> + * the hardware EIDE and ATA-2 limit of 16 heads (max disk size of 127 GB) > >> + * and instead allow up to 255 heads. > >> */ > >> static int calculate_geometry(int64_t total_sectors, uint16_t* cyls, > >> uint8_t* heads, uint8_t* secs_per_cyl) > >> { > >> uint32_t cyls_times_heads; > >> > >> - if (total_sectors > 65535 * 16 * 255) > >> + /* Allow a maximum disk size of approximately 2 TB */ > >> + if (total_sectors > 65535LL * 255 * 255) { > >> return -EFBIG; > >> + } > >> > >> if (total_sectors > 65535 * 16 * 63) { > >> *secs_per_cyl = 255; > >> - *heads = 16; > >> + if (total_sectors > 65535 * 16 * 255) { > >> + *heads = 255; > >> + } else { > >> + *heads = 16; > >> + } > >> cyls_times_heads = total_sectors / *secs_per_cyl; > >> } else { > >> *secs_per_cyl = 17; > > > > > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:57:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:57:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEAz-00057O-1T; Tue, 13 Nov 2012 10:57:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEAx-00057J-Np for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 10:57:03 +0000 Received: from [85.158.138.51:64451] by server-14.bemta-3.messagelabs.com id 21/5A-12788-A7722A05; Tue, 13 Nov 2012 10:56:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-7.tower-174.messagelabs.com!1352804216!20930200!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16349 invoked from network); 13 Nov 2012 10:56:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:56:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214302706" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:56:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 05:56:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEAp-0003uK-VI; Tue, 13 Nov 2012 10:56:55 +0000 Date: Tue, 13 Nov 2012 10:56:23 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Paolo Bonzini In-Reply-To: <50A2250A.4070108@redhat.com> Message-ID: References: <50A0E79F0200009100082E4C@novprvoes0310.provo.novell.com> <50A2250A.4070108@redhat.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: Charles Arnold , Kevin Wolf , thanos.makatos@citrix.com, xen-devel@lists.xensource.com, Stefano Stabellini , "qemu-devel@nongnu.org" , "stefanha@redhat.com" Subject: Re: [Xen-devel] [PATCH] block: vpc support for ~2 TB disks X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012, Paolo Bonzini wrote: > Il 12/11/2012 20:12, Charles Arnold ha scritto: > > Ping? > > > > Any thoughts on whether this is acceptable? > > I would like to know what is done by other platforms. Stefano, any idea > about XenServer? > I am not sure, but maybe Thanos, that is working on blktap3, knows, or at least knows who to CC. > > - Charles > > > >>>> On 10/30/2012 at 08:59 PM, in message <50A0E561.5B74.0091.0@suse.com>, Charles > > Arnold wrote: > >> The VHD specification allows for up to a 2 TB disk size. The current > >> implementation in qemu emulates EIDE and ATA-2 hardware which only allows > >> for up to 127 GB. This disk size limitation can be overridden by allowing > >> up to 255 heads instead of the normal 4 bit limitation of 16. Doing so > >> allows disk images to be created of up to nearly 2 TB. This change does > >> not violate the VHD format specification nor does it change how smaller > >> disks (ie, <=127GB) are defined. > >> > >> Signed-off-by: Charles Arnold > >> > >> diff --git a/block/vpc.c b/block/vpc.c > >> index b6bf52f..0c2eaf8 100644 > >> --- a/block/vpc.c > >> +++ b/block/vpc.c > >> @@ -198,7 +198,8 @@ static int vpc_open(BlockDriverState *bs, int flags) > >> bs->total_sectors = (int64_t) > >> be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl; > >> > >> - if (bs->total_sectors >= 65535 * 16 * 255) { > >> + /* Allow a maximum disk size of approximately 2 TB */ > >> + if (bs->total_sectors >= 65535LL * 255 * 255) {qemu-devel@nongnu.org > >> err = -EFBIG; > >> goto fail; > >> } > >> @@ -524,19 +525,27 @@ static coroutine_fn int vpc_co_write(BlockDriverState > >> *bs, int64_t sector_num, > >> * Note that the geometry doesn't always exactly match total_sectors but > >> * may round it down. > >> * > >> - * Returns 0 on success, -EFBIG if the size is larger than 127 GB > >> + * Returns 0 on success, -EFBIG if the size is larger than ~2 TB. Override > >> + * the hardware EIDE and ATA-2 limit of 16 heads (max disk size of 127 GB) > >> + * and instead allow up to 255 heads. > >> */ > >> static int calculate_geometry(int64_t total_sectors, uint16_t* cyls, > >> uint8_t* heads, uint8_t* secs_per_cyl) > >> { > >> uint32_t cyls_times_heads; > >> > >> - if (total_sectors > 65535 * 16 * 255) > >> + /* Allow a maximum disk size of approximately 2 TB */ > >> + if (total_sectors > 65535LL * 255 * 255) { > >> return -EFBIG; > >> + } > >> > >> if (total_sectors > 65535 * 16 * 63) { > >> *secs_per_cyl = 255; > >> - *heads = 16; > >> + if (total_sectors > 65535 * 16 * 255) { > >> + *heads = 255; > >> + } else { > >> + *heads = 16; > >> + } > >> cyls_times_heads = total_sectors / *secs_per_cyl; > >> } else { > >> *secs_per_cyl = 17; > > > > > > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:58:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:58:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYECC-0005CU-Gj; Tue, 13 Nov 2012 10:58:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYECB-0005CL-78 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:58:19 +0000 Received: from [193.109.254.147:33010] by server-3.bemta-14.messagelabs.com id 97/05-01317-AC722A05; Tue, 13 Nov 2012 10:58:18 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352804297!8911043!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1000 invoked from network); 13 Nov 2012 10:58:18 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:58:18 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3372726wgb.32 for ; Tue, 13 Nov 2012 02:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=NTgnlOOApjcOu6ynVWRZ/dIDScM18FVziu96F7G8e2w=; b=jLlaypHDvKNpkwNcloYKYMoOA/ADMN8jCdR3TkzI4fR+6+01vw678DEao4OievN5Hd YFi2HtznZY+D6nX5QHaRBqVv8K0/TqZWXKAWYSH/UsCo/iaTjwJRV0TwefLlnkmUYMKX 7zoEiT+pOkhU3QfZMJes307RDBhLythMVSz8qWYkP61X1THNApNeOYe9g7rA4CBvQZeI 77opWR2oRpq0kEUZeLpm96DBiVY3Jx+A7drKnu3faT71kOcjTQtdflByNXhUJRGKABlH pc9JEM9dF9cZ+06l/tQ7O2FO3D7lH/lB5Pm8PDz99nv3MBLYODgm36dEiXH9hNcQWvjd JkvQ== Received: by 10.216.30.76 with SMTP id j54mr72365wea.11.1352804297098; Tue, 13 Nov 2012 02:58:17 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm18324626wib.4.2012.11.13.02.58.14 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:58:16 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 10:58:12 +0000 From: Keir Fraser To: Matthew Daley , Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check Thread-Index: Ac3BjcX/rN9pMum9Ikqv6SvyR9c2YQ== In-Reply-To: <1352801866-9512-1-git-send-email-mattjd@gmail.com> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 10:17, "Matthew Daley" wrote: > xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether > bits should be masked off from the input cpumap bitmap or not. > > Fix and make clearer by simply comparing the amount of bytes given in > the input cpumap to the amount actually copied; if equal, bits may need > to be masked off. > > This does not have security impact: _xmalloc never returns allocations > smaller than the size of a pointer, hence the uncorrected buffer size > check would still not allow writes to unallocated memory. > > Signed-off-by: Matthew Daley Acked-by: Keir Fraser > --- > Jan: Agreed with both of your points. Here's a v2. > > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index e153cb4..a7a6b9f 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( > { > if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) > err = -EFAULT; > - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) > ) > + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) > bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & > 7)); > } > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 10:58:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 10:58:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYECC-0005CU-Gj; Tue, 13 Nov 2012 10:58:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYECB-0005CL-78 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:58:19 +0000 Received: from [193.109.254.147:33010] by server-3.bemta-14.messagelabs.com id 97/05-01317-AC722A05; Tue, 13 Nov 2012 10:58:18 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1352804297!8911043!1 X-Originating-IP: [74.125.82.51] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1000 invoked from network); 13 Nov 2012 10:58:18 -0000 Received: from mail-wg0-f51.google.com (HELO mail-wg0-f51.google.com) (74.125.82.51) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:58:18 -0000 Received: by mail-wg0-f51.google.com with SMTP id ed3so3372726wgb.32 for ; Tue, 13 Nov 2012 02:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=NTgnlOOApjcOu6ynVWRZ/dIDScM18FVziu96F7G8e2w=; b=jLlaypHDvKNpkwNcloYKYMoOA/ADMN8jCdR3TkzI4fR+6+01vw678DEao4OievN5Hd YFi2HtznZY+D6nX5QHaRBqVv8K0/TqZWXKAWYSH/UsCo/iaTjwJRV0TwefLlnkmUYMKX 7zoEiT+pOkhU3QfZMJes307RDBhLythMVSz8qWYkP61X1THNApNeOYe9g7rA4CBvQZeI 77opWR2oRpq0kEUZeLpm96DBiVY3Jx+A7drKnu3faT71kOcjTQtdflByNXhUJRGKABlH pc9JEM9dF9cZ+06l/tQ7O2FO3D7lH/lB5Pm8PDz99nv3MBLYODgm36dEiXH9hNcQWvjd JkvQ== Received: by 10.216.30.76 with SMTP id j54mr72365wea.11.1352804297098; Tue, 13 Nov 2012 02:58:17 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm18324626wib.4.2012.11.13.02.58.14 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 02:58:16 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 10:58:12 +0000 From: Keir Fraser To: Matthew Daley , Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check Thread-Index: Ac3BjcX/rN9pMum9Ikqv6SvyR9c2YQ== In-Reply-To: <1352801866-9512-1-git-send-email-mattjd@gmail.com> Mime-version: 1.0 Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen: Fix xenctl_cpumap_to_cpumask buffer size check X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 10:17, "Matthew Daley" wrote: > xenctl_cpumap_to_cpumask incorrectly uses sizeof when checking whether > bits should be masked off from the input cpumap bitmap or not. > > Fix and make clearer by simply comparing the amount of bytes given in > the input cpumap to the amount actually copied; if equal, bits may need > to be masked off. > > This does not have security impact: _xmalloc never returns allocations > smaller than the size of a pointer, hence the uncorrected buffer size > check would still not allow writes to unallocated memory. > > Signed-off-by: Matthew Daley Acked-by: Keir Fraser > --- > Jan: Agreed with both of your points. Here's a v2. > > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index e153cb4..a7a6b9f 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -78,7 +78,7 @@ int xenctl_cpumap_to_cpumask( > { > if ( copy_from_guest(bytemap, xenctl_cpumap->bitmap, copy_bytes) ) > err = -EFAULT; > - if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes <= sizeof(bytemap)) > ) > + if ( (xenctl_cpumap->nr_cpus & 7) && (guest_bytes == copy_bytes) ) > bytemap[guest_bytes-1] &= ~(0xff << (xenctl_cpumap->nr_cpus & > 7)); > } > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:08:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:08:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEM7-0005Wf-Af; Tue, 13 Nov 2012 11:08:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEM5-0005Wa-HP for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:08:33 +0000 Received: from [193.109.254.147:39498] by server-5.bemta-14.messagelabs.com id 65/2D-10257-03A22A05; Tue, 13 Nov 2012 11:08:32 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1352804910!3923293!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19401 invoked from network); 13 Nov 2012 11:08:31 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:08:31 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="sh'?scan'208";a="15774284" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:08:30 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:08:29 +0000 Message-ID: <1352804909.7491.55.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Olaf Hering Date: Tue, 13 Nov 2012 11:08:29 +0000 In-Reply-To: <20121112184047.GA28988@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> Organization: Citrix Systems, Inc. Content-Type: multipart/mixed; boundary="=-xgLP/J8hfobzRv1seyy9" X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=-xgLP/J8hfobzRv1seyy9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Mon, 2012-11-12 at 18:40 +0000, Olaf Hering wrote: > On Mon, Nov 12, Jacek Konieczny wrote: > > > # perl --version > > This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi > > sles11sp2 has perl 5.10.0, maybe there is different behaviour in > different perl versions. More likely to be the kernel, since Perl would have to jump through hoops to figure out if a random fd which it got passed was r/o or r/w, I think. Perhaps its a security thing (e.g. selinux or something like that) enforcing something extra? Might be interesting to run things under strace ? Per the attached t.sh. Which for me produces the below without complaint: Ian. + _lockfd=42 + _lockfile=/tmp/lockfile + eval 'exec 42>>/tmp/lockfile' ++ exec + flock -x 42 ++ strace perl -e ' open STDIN, "<&42" or die $!; my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; my $file_inum = (stat $ARGV[0])[1]; print "y\n" if $fd_inum eq $file_inum; ' /tmp/lockfile execve("/usr/bin/perl", ["perl", "-e", "\n open STDIN, \"<&42\" "..., "/tmp/lockfile"], [/* 35 vars */]) = 0 brk(0) = 0xea0000 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728d7000 access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) open("/etc/ld.so.cache", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=68197, ...}) = 0 mmap(NULL, 68197, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f08728c6000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/usr/lib/libperl.so.5.10", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\220\222\3\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=1495208, ...}) = 0 mmap(NULL, 3590856, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087234f000 mprotect(0x7f08724b4000, 2093056, PROT_NONE) = 0 mmap(0x7f08726b3000, 36864, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x164000) = 0x7f08726b3000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libdl.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\r\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=14696, ...}) = 0 mmap(NULL, 2109696, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087214b000 mprotect(0x7f087214d000, 2097152, PROT_NONE) = 0 mmap(0x7f087234d000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x7f087234d000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libm.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360>\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=530736, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c5000 mmap(NULL, 2625768, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871ec9000 mprotect(0x7f0871f49000, 2097152, PROT_NONE) = 0 mmap(0x7f0872149000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x80000) = 0x7f0872149000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libpthread.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360Y\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=131258, ...}) = 0 mmap(NULL, 2208640, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871cad000 mprotect(0x7f0871cc4000, 2093056, PROT_NONE) = 0 mmap(0x7f0871ec3000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x16000) = 0x7f0871ec3000 mmap(0x7f0871ec5000, 13184, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f0871ec5000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libc.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240\355\1\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1437064, ...}) = 0 mmap(NULL, 3545160, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087194b000 mprotect(0x7f0871aa4000, 2093056, PROT_NONE) = 0 mmap(0x7f0871ca3000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x158000) = 0x7f0871ca3000 mmap(0x7f0871ca8000, 18504, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f0871ca8000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libcrypt.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0P\n\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=35104, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c4000 mmap(NULL, 2318784, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871714000 mprotect(0x7f087171c000, 2093056, PROT_NONE) = 0 mmap(0x7f087191b000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x7f087191b000 mmap(0x7f087191d000, 184768, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f087191d000 close(3) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c3000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c2000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c1000 arch_prctl(ARCH_SET_FS, 0x7f08728c2700) = 0 mprotect(0x7f087191b000, 4096, PROT_READ) = 0 mprotect(0x7f0871ca3000, 16384, PROT_READ) = 0 mprotect(0x7f0871ec3000, 4096, PROT_READ) = 0 mprotect(0x7f0872149000, 4096, PROT_READ) = 0 mprotect(0x7f087234d000, 4096, PROT_READ) = 0 mprotect(0x7f08728d9000, 4096, PROT_READ) = 0 munmap(0x7f08728c6000, 68197) = 0 set_tid_address(0x7f08728c29d0) = 17761 set_robust_list(0x7f08728c29e0, 0x18) = 0 futex(0x7fffbb03b91c, FUTEX_WAKE_PRIVATE, 1) = 0 futex(0x7fffbb03b91c, FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME, 1, NULL, 7f08728c2700) = -1 EAGAIN (Resource temporarily unavailable) rt_sigaction(SIGRTMIN, {0x7f0871cb2870, [], SA_RESTORER|SA_SIGINFO, 0x7f0871cbbff0}, NULL, 8) = 0 rt_sigaction(SIGRT_1, {0x7f0871cb2900, [], SA_RESTORER|SA_RESTART|SA_SIGINFO, 0x7f0871cbbff0}, NULL, 8) = 0 rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0 getrlimit(RLIMIT_STACK, {rlim_cur=8192*1024, rlim_max=RLIM_INFINITY}) = 0 rt_sigaction(SIGFPE, {SIG_IGN, [FPE], SA_RESTORER|SA_RESTART, 0x7f087197d230}, {SIG_DFL, [], 0}, 8) = 0 brk(0) = 0xea0000 brk(0xec1000) = 0xec1000 getuid() = 1161 geteuid() = 1161 getgid() = 10020 getegid() = 10020 open("/usr/lib/locale/locale-archive", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=2018512, ...}) = 0 mmap(NULL, 2018512, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f0871527000 close(3) = 0 open("/dev/urandom", O_RDONLY) = 3 read(3, "\346\340\354H", 4) = 4 close(3) = 0 readlink("/proc/self/exe", "/usr/bin/perl", 4095) = 13 stat("/usr/local/lib/site_perl/5.10.1/x86_64-linux-gnu-thread-multi", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/site_perl/5.10.1", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/site_perl/x86_64-linux-gnu-thread-multi", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/perl/5.10.0", 0x7fffbb03b4d0) = -1 ENOENT (No such file or directory) stat("/usr/local/share/perl/5.10.0", 0x7fffbb03b4d0) = -1 ENOENT (No such file or directory) ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 lseek(0, 0, SEEK_CUR) = -1 ESPIPE (Illegal seek) ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b260) = -1 EINVAL (Invalid argument) lseek(1, 0, SEEK_CUR) = -1 ESPIPE (Illegal seek) ioctl(2, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b270) = -1 ENOTTY (Inappropriate ioctl for device) lseek(2, 0, SEEK_CUR) = 7954 open("/dev/null", O_RDONLY) = 3 ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b390) = -1 ENOTTY (Inappropriate ioctl for device) lseek(3, 0, SEEK_CUR) = 0 fcntl(3, F_SETFD, FD_CLOEXEC) = 0 fstat(3, {st_mode=S_IFCHR|0666, st_rdev=makedev(1, 3), ...}) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 brk(0xee2000) = 0xee2000 close(3) = 0 dup(42) = 3 ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b320) = -1 ENOTTY (Inappropriate ioctl for device) lseek(3, 0, SEEK_CUR) = 0 fstat(3, {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 dup2(3, 0) = 0 close(3) = 0 fcntl(0, F_SETFD, 0) = 0 fstat(0, {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 stat("/tmp/lockfile", {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 rt_sigaction(SIG_0, NULL, {0x7fffbb03b810, ~[HUP INT QUIT TRAP BUS FPE USR1 SEGV USR2 TERM CONT TTIN TTOU URG XFSZ PROF WINCH RTMIN RT_1 RT_2 RT_3 RT_5 RT_6 RT_7 RT_8 RT_16 RT_17 RT_18 RT_19 RT_20 RT_21 RT_22 RT_23 RT_24 RT_25 RT_26 RT_27 RT_28 RT_29 RT_30 RT_31], 0}, 8) = -1 EINVAL (Invalid argument) rt_sigaction(SIGHUP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGINT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGQUIT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGILL, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTRAP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGABRT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGBUS, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGFPE, NULL, {SIG_IGN, [FPE], SA_RESTORER|SA_RESTART, 0x7f087197d230}, 8) = 0 rt_sigaction(SIGKILL, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGUSR1, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSEGV, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGUSR2, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPIPE, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGALRM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTERM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSTKFLT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCONT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSTOP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTSTP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTTIN, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTTOU, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGURG, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGXCPU, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGXFSZ, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGVTALRM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPROF, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGWINCH, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGIO, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPWR, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSYS, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_2, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_3, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_4, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_5, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_6, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_7, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_8, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_9, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_10, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_11, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_12, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_13, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_14, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_15, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_16, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_17, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_18, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_19, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_20, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_21, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_22, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_23, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_24, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_25, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_26, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_27, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_28, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_29, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_30, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_31, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_32, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGABRT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGIO, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSYS, NULL, {SIG_DFL, [], 0}, 8) = 0 write(1, "y\n", 2) = 2 exit_group(0) = ? + rightfile=y + echo y --=-xgLP/J8hfobzRv1seyy9 Content-Type: application/x-shellscript; name="t.sh" Content-Disposition: attachment; filename="t.sh" Content-Transfer-Encoding: 7bit #!/bin/bash set -ex _lockfd=42 _lockfile=/tmp/lockfile eval "exec $_lockfd>>$_lockfile" flock -x $_lockfd || return $? # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or # use bash's test -ef because those all go through what is # actually a synthetic symlink in /proc and we aren't # guaranteed that our stat(2) won't lose the race with an # rm(1) between reading the synthetic link and traversing the # file system to find the inum. Perl is very fast so use that. rightfile=$( strace perl -e ' open STDIN, "<&'$_lockfd'" or die $!; my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; my $file_inum = (stat $ARGV[0])[1]; print "y\n" if $fd_inum eq $file_inum; ' "$_lockfile" ) echo $rightfile --=-xgLP/J8hfobzRv1seyy9 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=-xgLP/J8hfobzRv1seyy9-- From xen-devel-bounces@lists.xen.org Tue Nov 13 11:08:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:08:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEM7-0005Wf-Af; Tue, 13 Nov 2012 11:08:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEM5-0005Wa-HP for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:08:33 +0000 Received: from [193.109.254.147:39498] by server-5.bemta-14.messagelabs.com id 65/2D-10257-03A22A05; Tue, 13 Nov 2012 11:08:32 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1352804910!3923293!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19401 invoked from network); 13 Nov 2012 11:08:31 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:08:31 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="sh'?scan'208";a="15774284" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:08:30 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:08:29 +0000 Message-ID: <1352804909.7491.55.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Olaf Hering Date: Tue, 13 Nov 2012 11:08:29 +0000 In-Reply-To: <20121112184047.GA28988@aepfle.de> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> Organization: Citrix Systems, Inc. Content-Type: multipart/mixed; boundary="=-xgLP/J8hfobzRv1seyy9" X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=-xgLP/J8hfobzRv1seyy9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Mon, 2012-11-12 at 18:40 +0000, Olaf Hering wrote: > On Mon, Nov 12, Jacek Konieczny wrote: > > > # perl --version > > This is perl, v5.8.8 built for x86_64-pld-linux-thread-multi > > sles11sp2 has perl 5.10.0, maybe there is different behaviour in > different perl versions. More likely to be the kernel, since Perl would have to jump through hoops to figure out if a random fd which it got passed was r/o or r/w, I think. Perhaps its a security thing (e.g. selinux or something like that) enforcing something extra? Might be interesting to run things under strace ? Per the attached t.sh. Which for me produces the below without complaint: Ian. + _lockfd=42 + _lockfile=/tmp/lockfile + eval 'exec 42>>/tmp/lockfile' ++ exec + flock -x 42 ++ strace perl -e ' open STDIN, "<&42" or die $!; my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; my $file_inum = (stat $ARGV[0])[1]; print "y\n" if $fd_inum eq $file_inum; ' /tmp/lockfile execve("/usr/bin/perl", ["perl", "-e", "\n open STDIN, \"<&42\" "..., "/tmp/lockfile"], [/* 35 vars */]) = 0 brk(0) = 0xea0000 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728d7000 access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) open("/etc/ld.so.cache", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=68197, ...}) = 0 mmap(NULL, 68197, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f08728c6000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/usr/lib/libperl.so.5.10", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\220\222\3\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=1495208, ...}) = 0 mmap(NULL, 3590856, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087234f000 mprotect(0x7f08724b4000, 2093056, PROT_NONE) = 0 mmap(0x7f08726b3000, 36864, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x164000) = 0x7f08726b3000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libdl.so.2", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\340\r\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=14696, ...}) = 0 mmap(NULL, 2109696, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087214b000 mprotect(0x7f087214d000, 2097152, PROT_NONE) = 0 mmap(0x7f087234d000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x2000) = 0x7f087234d000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libm.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360>\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=530736, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c5000 mmap(NULL, 2625768, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871ec9000 mprotect(0x7f0871f49000, 2097152, PROT_NONE) = 0 mmap(0x7f0872149000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x80000) = 0x7f0872149000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libpthread.so.0", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\360Y\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=131258, ...}) = 0 mmap(NULL, 2208640, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871cad000 mprotect(0x7f0871cc4000, 2093056, PROT_NONE) = 0 mmap(0x7f0871ec3000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x16000) = 0x7f0871ec3000 mmap(0x7f0871ec5000, 13184, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f0871ec5000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libc.so.6", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\240\355\1\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1437064, ...}) = 0 mmap(NULL, 3545160, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f087194b000 mprotect(0x7f0871aa4000, 2093056, PROT_NONE) = 0 mmap(0x7f0871ca3000, 20480, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x158000) = 0x7f0871ca3000 mmap(0x7f0871ca8000, 18504, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f0871ca8000 close(3) = 0 access("/etc/ld.so.nohwcap", F_OK) = -1 ENOENT (No such file or directory) open("/lib/libcrypt.so.1", O_RDONLY) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0P\n\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0644, st_size=35104, ...}) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c4000 mmap(NULL, 2318784, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f0871714000 mprotect(0x7f087171c000, 2093056, PROT_NONE) = 0 mmap(0x7f087191b000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x7000) = 0x7f087191b000 mmap(0x7f087191d000, 184768, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f087191d000 close(3) = 0 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c3000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c2000 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f08728c1000 arch_prctl(ARCH_SET_FS, 0x7f08728c2700) = 0 mprotect(0x7f087191b000, 4096, PROT_READ) = 0 mprotect(0x7f0871ca3000, 16384, PROT_READ) = 0 mprotect(0x7f0871ec3000, 4096, PROT_READ) = 0 mprotect(0x7f0872149000, 4096, PROT_READ) = 0 mprotect(0x7f087234d000, 4096, PROT_READ) = 0 mprotect(0x7f08728d9000, 4096, PROT_READ) = 0 munmap(0x7f08728c6000, 68197) = 0 set_tid_address(0x7f08728c29d0) = 17761 set_robust_list(0x7f08728c29e0, 0x18) = 0 futex(0x7fffbb03b91c, FUTEX_WAKE_PRIVATE, 1) = 0 futex(0x7fffbb03b91c, FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME, 1, NULL, 7f08728c2700) = -1 EAGAIN (Resource temporarily unavailable) rt_sigaction(SIGRTMIN, {0x7f0871cb2870, [], SA_RESTORER|SA_SIGINFO, 0x7f0871cbbff0}, NULL, 8) = 0 rt_sigaction(SIGRT_1, {0x7f0871cb2900, [], SA_RESTORER|SA_RESTART|SA_SIGINFO, 0x7f0871cbbff0}, NULL, 8) = 0 rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0 getrlimit(RLIMIT_STACK, {rlim_cur=8192*1024, rlim_max=RLIM_INFINITY}) = 0 rt_sigaction(SIGFPE, {SIG_IGN, [FPE], SA_RESTORER|SA_RESTART, 0x7f087197d230}, {SIG_DFL, [], 0}, 8) = 0 brk(0) = 0xea0000 brk(0xec1000) = 0xec1000 getuid() = 1161 geteuid() = 1161 getgid() = 10020 getegid() = 10020 open("/usr/lib/locale/locale-archive", O_RDONLY) = 3 fstat(3, {st_mode=S_IFREG|0644, st_size=2018512, ...}) = 0 mmap(NULL, 2018512, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f0871527000 close(3) = 0 open("/dev/urandom", O_RDONLY) = 3 read(3, "\346\340\354H", 4) = 4 close(3) = 0 readlink("/proc/self/exe", "/usr/bin/perl", 4095) = 13 stat("/usr/local/lib/site_perl/5.10.1/x86_64-linux-gnu-thread-multi", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/site_perl/5.10.1", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/site_perl/x86_64-linux-gnu-thread-multi", 0x7fffbb03b390) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/perl/5.10.0", 0x7fffbb03b4d0) = -1 ENOENT (No such file or directory) stat("/usr/local/share/perl/5.10.0", 0x7fffbb03b4d0) = -1 ENOENT (No such file or directory) ioctl(0, SNDCTL_TMR_TIMEBASE or TCGETS, {B38400 opost isig icanon echo ...}) = 0 lseek(0, 0, SEEK_CUR) = -1 ESPIPE (Illegal seek) ioctl(1, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b260) = -1 EINVAL (Invalid argument) lseek(1, 0, SEEK_CUR) = -1 ESPIPE (Illegal seek) ioctl(2, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b270) = -1 ENOTTY (Inappropriate ioctl for device) lseek(2, 0, SEEK_CUR) = 7954 open("/dev/null", O_RDONLY) = 3 ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b390) = -1 ENOTTY (Inappropriate ioctl for device) lseek(3, 0, SEEK_CUR) = 0 fcntl(3, F_SETFD, FD_CLOEXEC) = 0 fstat(3, {st_mode=S_IFCHR|0666, st_rdev=makedev(1, 3), ...}) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 brk(0xee2000) = 0xee2000 close(3) = 0 dup(42) = 3 ioctl(3, SNDCTL_TMR_TIMEBASE or TCGETS, 0x7fffbb03b320) = -1 ENOTTY (Inappropriate ioctl for device) lseek(3, 0, SEEK_CUR) = 0 fstat(3, {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 dup2(3, 0) = 0 close(3) = 0 fcntl(0, F_SETFD, 0) = 0 fstat(0, {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 stat("/tmp/lockfile", {st_mode=S_IFREG|0644, st_size=0, ...}) = 0 rt_sigaction(SIG_0, NULL, {0x7fffbb03b810, ~[HUP INT QUIT TRAP BUS FPE USR1 SEGV USR2 TERM CONT TTIN TTOU URG XFSZ PROF WINCH RTMIN RT_1 RT_2 RT_3 RT_5 RT_6 RT_7 RT_8 RT_16 RT_17 RT_18 RT_19 RT_20 RT_21 RT_22 RT_23 RT_24 RT_25 RT_26 RT_27 RT_28 RT_29 RT_30 RT_31], 0}, 8) = -1 EINVAL (Invalid argument) rt_sigaction(SIGHUP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGINT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGQUIT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGILL, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTRAP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGABRT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGBUS, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGFPE, NULL, {SIG_IGN, [FPE], SA_RESTORER|SA_RESTART, 0x7f087197d230}, 8) = 0 rt_sigaction(SIGKILL, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGUSR1, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSEGV, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGUSR2, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPIPE, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGALRM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTERM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSTKFLT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCONT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSTOP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTSTP, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTTIN, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGTTOU, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGURG, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGXCPU, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGXFSZ, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGVTALRM, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPROF, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGWINCH, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGIO, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGPWR, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSYS, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_2, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_3, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_4, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_5, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_6, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_7, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_8, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_9, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_10, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_11, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_12, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_13, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_14, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_15, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_16, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_17, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_18, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_19, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_20, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_21, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_22, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_23, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_24, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_25, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_26, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_27, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_28, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_29, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_30, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_31, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGRT_32, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGABRT, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGCHLD, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGIO, NULL, {SIG_DFL, [], 0}, 8) = 0 rt_sigaction(SIGSYS, NULL, {SIG_DFL, [], 0}, 8) = 0 write(1, "y\n", 2) = 2 exit_group(0) = ? + rightfile=y + echo y --=-xgLP/J8hfobzRv1seyy9 Content-Type: application/x-shellscript; name="t.sh" Content-Disposition: attachment; filename="t.sh" Content-Transfer-Encoding: 7bit #!/bin/bash set -ex _lockfd=42 _lockfile=/tmp/lockfile eval "exec $_lockfd>>$_lockfile" flock -x $_lockfd || return $? # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or # use bash's test -ef because those all go through what is # actually a synthetic symlink in /proc and we aren't # guaranteed that our stat(2) won't lose the race with an # rm(1) between reading the synthetic link and traversing the # file system to find the inum. Perl is very fast so use that. rightfile=$( strace perl -e ' open STDIN, "<&'$_lockfd'" or die $!; my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum; my $file_inum = (stat $ARGV[0])[1]; print "y\n" if $fd_inum eq $file_inum; ' "$_lockfile" ) echo $rightfile --=-xgLP/J8hfobzRv1seyy9 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=-xgLP/J8hfobzRv1seyy9-- From xen-devel-bounces@lists.xen.org Tue Nov 13 11:13:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:13:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEQO-0005k0-6t; Tue, 13 Nov 2012 11:13:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEQM-0005jt-Rb for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:12:59 +0000 Received: from [85.158.138.51:17937] by server-15.bemta-3.messagelabs.com id FA/24-09445-83B22A05; Tue, 13 Nov 2012 11:12:56 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352805175!29820191!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14737 invoked from network); 13 Nov 2012 11:12:55 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:12:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774455" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:12:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:12:54 +0000 Message-ID: <1352805173.7491.57.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 11:12:53 +0000 In-Reply-To: <50A225CA.2080705@gmail.com> References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> <50A225CA.2080705@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 10:49 +0000, Razvan Cojocaru wrote: > >> OK, my immediate end-goal is real-time logging of hypervisor events via > >> a dom0 userspace application. These events are always about a currently > >> running virtual machine, and said virtual machine is paused at the time. > >> The userspace tool should be immediately notified, so no polling. > > > > This is very like the ioreq model, where the domain (or maybe just the > > vcpu, I'm not sure) is paused while qemu does its thing. > > > > What sort of events are we talking about here? > > A list of interesting registers that changed, that a page fault occured, > things like that, occasionally containing some small string messages > with extra information. Should be around 64 bytes or so. Perhaps it would be useful to build on the vmitools (previously xenaccess)? http://code.google.com/p/vmitools/ I don't know what level of support it has for trapping on certain events but it seems like a model where the guest is stopped due to an event, the tools are signalled and use vmi to figure out what changed etc might be an interesting one. In general we prefer not to put stuff in the hypervisor unless absolutely required. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:13:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:13:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEQO-0005k0-6t; Tue, 13 Nov 2012 11:13:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEQM-0005jt-Rb for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:12:59 +0000 Received: from [85.158.138.51:17937] by server-15.bemta-3.messagelabs.com id FA/24-09445-83B22A05; Tue, 13 Nov 2012 11:12:56 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-174.messagelabs.com!1352805175!29820191!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14737 invoked from network); 13 Nov 2012 11:12:55 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:12:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774455" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:12:54 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:12:54 +0000 Message-ID: <1352805173.7491.57.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Razvan Cojocaru Date: Tue, 13 Nov 2012 11:12:53 +0000 In-Reply-To: <50A225CA.2080705@gmail.com> References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> <50A225CA.2080705@gmail.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 10:49 +0000, Razvan Cojocaru wrote: > >> OK, my immediate end-goal is real-time logging of hypervisor events via > >> a dom0 userspace application. These events are always about a currently > >> running virtual machine, and said virtual machine is paused at the time. > >> The userspace tool should be immediately notified, so no polling. > > > > This is very like the ioreq model, where the domain (or maybe just the > > vcpu, I'm not sure) is paused while qemu does its thing. > > > > What sort of events are we talking about here? > > A list of interesting registers that changed, that a page fault occured, > things like that, occasionally containing some small string messages > with extra information. Should be around 64 bytes or so. Perhaps it would be useful to build on the vmitools (previously xenaccess)? http://code.google.com/p/vmitools/ I don't know what level of support it has for trapping on certain events but it seems like a model where the guest is stopped due to an event, the tools are signalled and use vmi to figure out what changed etc might be an interesting one. In general we prefer not to put stuff in the hypervisor unless absolutely required. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:14:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:14:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYERC-0005qK-Mf; Tue, 13 Nov 2012 11:13:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYERB-0005q8-DQ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:13:49 +0000 Received: from [85.158.137.99:44548] by server-16.bemta-3.messagelabs.com id B4/3C-07461-86B22A05; Tue, 13 Nov 2012 11:13:44 +0000 X-Env-Sender: yang.z.zhang@intel.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352805222!15753803!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjMwNjQ1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12955 invoked from network); 13 Nov 2012 11:13:43 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-12.tower-217.messagelabs.com with SMTP; 13 Nov 2012 11:13:43 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 13 Nov 2012 03:13:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,765,1344236400"; d="scan'208";a="167697569" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by AZSMGA002.ch.intel.com with ESMTP; 13 Nov 2012 03:13:17 -0800 Received: from fmsmsx152.amr.corp.intel.com (10.19.17.221) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 03:13:17 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx152.amr.corp.intel.com (10.19.17.221) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 03:13:17 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 19:13:15 +0800 From: "Zhang, Yang Z" To: Jan Beulich , "Zhang, Xiantao" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNu2JnOrR2IJOBmEueKZ07SNjEopfm7FWQgACjJM2AABgNcA== Date: Tue, 13 Nov 2012 11:13:14 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> In-Reply-To: <50A223DE02000078000A7FE6@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jan Beulich wrote on 2012-11-13: >>>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >>> From: Jan Beulich [mailto:JBeulich@suse.com] >>> We need to settle on the concept here first: What specifically is said >>> option intended to do? >> >> Basically, this options just allows the transactions from dom0's devices >> not subject to VT-d engine. Actually, It is not targeted to fix something, >> but just allows users isolating VT-d issues from dom0. >> As I know, in early days, VT-d is not that stable, if dom0's devices are >> controlled by VT-d, some strange issues may trigger in system's boot stage, >> so use this options to disable VT-d for Dom0. > > Which it doesn't, as the specific case here shows. > >>> Bottom line - I'm seeking advice as to whether working around this problem >>> in the IOMMU code is desirable/necessary, or whether this is a design flaw >>> on the device's side that just cannot be tolerated with an IOMMU in the >>> picture (which would need good reasoning, so that a customer expecting >>> such a device to work regardless of IOMMU usage can understand that this >>> cannot reasonably be made work). Why not just disable the IOMMU in this case ? >> The issue is why the non-zero functions don't claim themselves during PCI bus >> scan. > > As said - I can't tell whether there is a secondary function in the > first place (and I didn't try to find out because it doesn't really > matter for the purpose of finding a solution/workaround). If software cannot see it, then how to use it? If there still have an approach to detect it, then xen can do it too and setup the context entry as passthrough. >> From security point of view, VT-d shouldn't allow transactions from >> the unknown devices. > > That's inconsistent with what you say above: Either there is a way > to suppress IOMMU involvement in Dom0 operation (which is > inherently insecure), or there is not. If there is, there's no point in > claiming security for one aspect but not another. > > I think it is obvious that I'm not suggesting to allow pass through of > such a device at this point (albeit even that would seem possible and, > from a customer's pov, desirable), and as long as users are aware of > the security implications when using the option under discussion here, > I don't see why that option shouldn't be made fully work. It should be > left to the admins of individual systems to decide between security > and functionality, we should provide them with ways to implement > their choice. > > Otoh I'm unaware of a similar option for native Linux, yet it is > suffering the same problem on that system when DMA translation > gets turned on. > > But the direction you give to the discussion doesn't lead us towards > a solution for the customer (or a profound explanation why none > is possible), so if we could please focus on that aspect again. > > Jan Best regards, Yang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:14:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:14:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYERC-0005qK-Mf; Tue, 13 Nov 2012 11:13:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYERB-0005q8-DQ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:13:49 +0000 Received: from [85.158.137.99:44548] by server-16.bemta-3.messagelabs.com id B4/3C-07461-86B22A05; Tue, 13 Nov 2012 11:13:44 +0000 X-Env-Sender: yang.z.zhang@intel.com X-Msg-Ref: server-12.tower-217.messagelabs.com!1352805222!15753803!1 X-Originating-IP: [143.182.124.21] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQzLjE4Mi4xMjQuMjEgPT4gMjMwNjQ1\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12955 invoked from network); 13 Nov 2012 11:13:43 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (143.182.124.21) by server-12.tower-217.messagelabs.com with SMTP; 13 Nov 2012 11:13:43 -0000 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 13 Nov 2012 03:13:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,765,1344236400"; d="scan'208";a="167697569" Received: from fmsmsx106.amr.corp.intel.com ([10.19.9.37]) by AZSMGA002.ch.intel.com with ESMTP; 13 Nov 2012 03:13:17 -0800 Received: from fmsmsx152.amr.corp.intel.com (10.19.17.221) by FMSMSX106.amr.corp.intel.com (10.19.9.37) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 03:13:17 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx152.amr.corp.intel.com (10.19.17.221) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 03:13:17 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 19:13:15 +0800 From: "Zhang, Yang Z" To: Jan Beulich , "Zhang, Xiantao" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNu2JnOrR2IJOBmEueKZ07SNjEopfm7FWQgACjJM2AABgNcA== Date: Tue, 13 Nov 2012 11:13:14 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> In-Reply-To: <50A223DE02000078000A7FE6@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jan Beulich wrote on 2012-11-13: >>>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >>> From: Jan Beulich [mailto:JBeulich@suse.com] >>> We need to settle on the concept here first: What specifically is said >>> option intended to do? >> >> Basically, this options just allows the transactions from dom0's devices >> not subject to VT-d engine. Actually, It is not targeted to fix something, >> but just allows users isolating VT-d issues from dom0. >> As I know, in early days, VT-d is not that stable, if dom0's devices are >> controlled by VT-d, some strange issues may trigger in system's boot stage, >> so use this options to disable VT-d for Dom0. > > Which it doesn't, as the specific case here shows. > >>> Bottom line - I'm seeking advice as to whether working around this problem >>> in the IOMMU code is desirable/necessary, or whether this is a design flaw >>> on the device's side that just cannot be tolerated with an IOMMU in the >>> picture (which would need good reasoning, so that a customer expecting >>> such a device to work regardless of IOMMU usage can understand that this >>> cannot reasonably be made work). Why not just disable the IOMMU in this case ? >> The issue is why the non-zero functions don't claim themselves during PCI bus >> scan. > > As said - I can't tell whether there is a secondary function in the > first place (and I didn't try to find out because it doesn't really > matter for the purpose of finding a solution/workaround). If software cannot see it, then how to use it? If there still have an approach to detect it, then xen can do it too and setup the context entry as passthrough. >> From security point of view, VT-d shouldn't allow transactions from >> the unknown devices. > > That's inconsistent with what you say above: Either there is a way > to suppress IOMMU involvement in Dom0 operation (which is > inherently insecure), or there is not. If there is, there's no point in > claiming security for one aspect but not another. > > I think it is obvious that I'm not suggesting to allow pass through of > such a device at this point (albeit even that would seem possible and, > from a customer's pov, desirable), and as long as users are aware of > the security implications when using the option under discussion here, > I don't see why that option shouldn't be made fully work. It should be > left to the admins of individual systems to decide between security > and functionality, we should provide them with ways to implement > their choice. > > Otoh I'm unaware of a similar option for native Linux, yet it is > suffering the same problem on that system when DMA translation > gets turned on. > > But the direction you give to the discussion doesn't lead us towards > a solution for the customer (or a profound explanation why none > is possible), so if we could please focus on that aspect again. > > Jan Best regards, Yang _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:20:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:20:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEXE-000659-PQ; Tue, 13 Nov 2012 11:20:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEXC-000654-SD for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:20:02 +0000 Received: from [85.158.138.51:62134] by server-3.bemta-3.messagelabs.com id 16/54-31566-2EC22A05; Tue, 13 Nov 2012 11:20:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352805600!21892621!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19965 invoked from network); 13 Nov 2012 11:20:01 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:20:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774676" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:19:23 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:19:22 +0000 Message-ID: <1352805562.7491.59.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Ronny Hegewald Date: Tue, 13 Nov 2012 11:19:22 +0000 In-Reply-To: <201211030255.37630.ronny.hegewald@online.de> References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> <201211022101.08926.ronny.hegewald@online.de> <201211030255.37630.ronny.hegewald@online.de> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-03 at 02:55 +0000, Ronny Hegewald wrote: > > > > Signed-off-by: Ronny Hegewald@online.de > > > > Somehow the sign off gone wrong. it was supposed to be > > Signed-off-by: Ronny Hegewald Acked-by: Ian Campbell and applied, thanks. For future reference can you generate patches so they apply with "patch -p1", the tooling copes much better with those sorts of patches. e.g.: --- tools/libxl/libxl.c.org +++ tools/libxl/libxl.c should look like: --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c or: --- xen.orig/tools/libxl/libxl.c +++ xen/tools/libxl/libxl.c or: --- xen/tools/libxl/libxl.c.orig +++ xen/tools/libxl/libxl.c etc. Tools like git format-patch + send-email or hg export / hg email (the last described in http://wiki.xen.org/wiki/Submitting_Xen_Patches) do this automatically I think. Thanks, Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:20:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:20:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEXE-000659-PQ; Tue, 13 Nov 2012 11:20:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEXC-000654-SD for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:20:02 +0000 Received: from [85.158.138.51:62134] by server-3.bemta-3.messagelabs.com id 16/54-31566-2EC22A05; Tue, 13 Nov 2012 11:20:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-174.messagelabs.com!1352805600!21892621!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19965 invoked from network); 13 Nov 2012 11:20:01 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-12.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:20:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774676" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:19:23 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:19:22 +0000 Message-ID: <1352805562.7491.59.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Ronny Hegewald Date: Tue, 13 Nov 2012 11:19:22 +0000 In-Reply-To: <201211030255.37630.ronny.hegewald@online.de> References: <201211010218.14872.ronny.hegewald@online.de> <1351756924.25014.29.camel@hastur.hellion.org.uk> <201211022101.08926.ronny.hegewald@online.de> <201211030255.37630.ronny.hegewald@online.de> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH V2] fix vfb related assertion problem when starting pv-domU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 2012-11-03 at 02:55 +0000, Ronny Hegewald wrote: > > > > Signed-off-by: Ronny Hegewald@online.de > > > > Somehow the sign off gone wrong. it was supposed to be > > Signed-off-by: Ronny Hegewald Acked-by: Ian Campbell and applied, thanks. For future reference can you generate patches so they apply with "patch -p1", the tooling copes much better with those sorts of patches. e.g.: --- tools/libxl/libxl.c.org +++ tools/libxl/libxl.c should look like: --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c or: --- xen.orig/tools/libxl/libxl.c +++ xen/tools/libxl/libxl.c or: --- xen/tools/libxl/libxl.c.orig +++ xen/tools/libxl/libxl.c etc. Tools like git format-patch + send-email or hg export / hg email (the last described in http://wiki.xen.org/wiki/Submitting_Xen_Patches) do this automatically I think. Thanks, Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:23:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEai-0006GJ-Ed; Tue, 13 Nov 2012 11:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEag-0006GE-83 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:23:38 +0000 Received: from [193.109.254.147:24802] by server-16.bemta-14.messagelabs.com id 35/29-09215-9BD22A05; Tue, 13 Nov 2012 11:23:37 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1352805816!9179547!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26177 invoked from network); 13 Nov 2012 11:23:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:23:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774810" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:23:36 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:36 +0000 MIME-Version: 1.0 X-Mercurial-Node: ea756059a8da1217e64414dde68f1a6ea60427b3 Message-ID: User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 11:23:25 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: eddie.dong@intel.com, jun.nakajima@intel.com Subject: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + asm("int $2"); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:23:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEai-0006GJ-Ed; Tue, 13 Nov 2012 11:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEag-0006GE-83 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:23:38 +0000 Received: from [193.109.254.147:24802] by server-16.bemta-14.messagelabs.com id 35/29-09215-9BD22A05; Tue, 13 Nov 2012 11:23:37 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1352805816!9179547!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26177 invoked from network); 13 Nov 2012 11:23:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:23:37 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15774810" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:23:36 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:36 +0000 MIME-Version: 1.0 X-Mercurial-Node: ea756059a8da1217e64414dde68f1a6ea60427b3 Message-ID: User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 11:23:25 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: eddie.dong@intel.com, jun.nakajima@intel.com Subject: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + asm("int $2"); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:24:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:24:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbA-0006Ir-Rn; Tue, 13 Nov 2012 11:24:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbA-0006Id-0L for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:24:08 +0000 Received: from [85.158.139.83:35348] by server-15.bemta-5.messagelabs.com id B7/DE-26920-7DD22A05; Tue, 13 Nov 2012 11:24:07 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352805846!29489850!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30567 invoked from network); 13 Nov 2012 11:24:06 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-13.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 11:24:06 -0000 Received: (qmail 27786 invoked from network); 13 Nov 2012 13:24:00 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 13:24:00 +0200 Message-ID: <50A22DD7.7020901@gmail.com> Date: Tue, 13 Nov 2012 13:24:07 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> <50A225CA.2080705@gmail.com> <1352805173.7491.57.camel@zakaz.uk.xensource.com> In-Reply-To: <1352805173.7491.57.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226282, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: 4f4c5f1d0905d9dbef385dd509407798.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43989 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > Perhaps it would be useful to build on the vmitools (previously > xenaccess)? http://code.google.com/p/vmitools/ Indeed, but LibVMI does not offer event-based access, and polling is not really a solution. > In general we prefer not to put stuff in the hypervisor unless > absolutely required. Me too :) Thanks, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:24:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:24:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbA-0006Ir-Rn; Tue, 13 Nov 2012 11:24:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbA-0006Id-0L for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:24:08 +0000 Received: from [85.158.139.83:35348] by server-15.bemta-5.messagelabs.com id B7/DE-26920-7DD22A05; Tue, 13 Nov 2012 11:24:07 +0000 X-Env-Sender: rzvncj@gmail.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352805846!29489850!1 X-Originating-IP: [91.199.104.2] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30567 invoked from network); 13 Nov 2012 11:24:06 -0000 Received: from mail.bitdefender.com (HELO mail.bitdefender.com) (91.199.104.2) by server-13.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 11:24:06 -0000 Received: (qmail 27786 invoked from network); 13 Nov 2012 13:24:00 +0200 Received: from rcojocaru.dsd.ro (HELO ?10.10.14.59?) (rcojocaru@bitdefender.com@10.10.14.59) by mail.bitdefender.com with AES256-SHA encrypted SMTP; 13 Nov 2012 13:24:00 +0200 Message-ID: <50A22DD7.7020901@gmail.com> Date: Tue, 13 Nov 2012 13:24:07 +0200 From: Razvan Cojocaru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" References: <50A16639.2090209@gmail.com> <1352800791.7491.21.camel@zakaz.uk.xensource.com> <50A22044.6060608@gmail.com> <1352802973.7491.40.camel@zakaz.uk.xensource.com> <50A225CA.2080705@gmail.com> <1352805173.7491.57.camel@zakaz.uk.xensource.com> In-Reply-To: <1352805173.7491.57.camel@zakaz.uk.xensource.com> X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.13.3.14894, Dats: 226282, Stamp: 3], Multi: [Enabled], BW: [Enabled], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, Flags: NN_GMAIL_WITH_XMAILER_ADN; NN_LEGIT_VALID_REPLY; NN_EXEC_H_YAHOO_AND_GMAIL_NO_DOMAIN_KEY; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled], URL: [Enabled], URI DNSBL: [Disabled], SQMD: [Enabled, Hits: none, MD5: 4f4c5f1d0905d9dbef385dd509407798.fuzzy.fzrbl.org], RTDA: [Disabled, Hit: No], total: 0(775) X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.0 on elfie.dsd.hq, sigver: 7.43989 Subject: Re: [Xen-devel] Hypervisor to dom0 communication X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > Perhaps it would be useful to build on the vmitools (previously > xenaccess)? http://code.google.com/p/vmitools/ Indeed, but LibVMI does not offer event-based access, and polling is not really a solution. > In general we prefer not to put stuff in the hypervisor unless > absolutely required. Me too :) Thanks, Razvan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:25:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbq-0006OS-9Y; Tue, 13 Nov 2012 11:24:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbo-0006O3-Bz for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:24:48 +0000 Received: from [85.158.139.211:18749] by server-13.bemta-5.messagelabs.com id 60/C4-27809-FFD22A05; Tue, 13 Nov 2012 11:24:47 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352805886!19924624!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11239 invoked from network); 13 Nov 2012 11:24:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-206.messagelabs.com with SMTP; 13 Nov 2012 11:24:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 11:24:46 +0000 Message-Id: <50A23C0C02000078000A8085@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 11:24:44 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 12:13, "Zhang, Yang Z" wrote: > Jan Beulich wrote on 2012-11-13: >>>>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >>>> From: Jan Beulich [mailto:JBeulich@suse.com] >>>> Bottom line - I'm seeking advice as to whether working around this problem >>>> in the IOMMU code is desirable/necessary, or whether this is a design flaw >>>> on the device's side that just cannot be tolerated with an IOMMU in the >>>> picture (which would need good reasoning, so that a customer expecting >>>> such a device to work regardless of IOMMU usage can understand that this >>>> cannot reasonably be made work). > > Why not just disable the IOMMU in this case ? Because that disables (secure) pass through of other devices. >>> The issue is why the non-zero functions don't claim themselves during PCI bus >>> scan. >> >> As said - I can't tell whether there is a secondary function in the >> first place (and I didn't try to find out because it doesn't really >> matter for the purpose of finding a solution/workaround). > > If software cannot see it, then how to use it? If there still have an > approach to detect it, then xen can do it too and setup the context entry as > passthrough. We see it the latest at the point the fault occurs. So there are multiple options: a) if the device is "real" as in having a valid config space despite func 0 not advertising itself as multi-function, we have ways to discover the device (at boot time) b) we could insert the context entry in the fault handler, assuming the device is able to recover c) we could provide a command line option to allow fake devices to be created d) we could create context entries for all BDFs, whether or not a device exists there Does any of these have obvious downsides? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:25:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbq-0006OS-9Y; Tue, 13 Nov 2012 11:24:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEbo-0006O3-Bz for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:24:48 +0000 Received: from [85.158.139.211:18749] by server-13.bemta-5.messagelabs.com id 60/C4-27809-FFD22A05; Tue, 13 Nov 2012 11:24:47 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352805886!19924624!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11239 invoked from network); 13 Nov 2012 11:24:47 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-5.tower-206.messagelabs.com with SMTP; 13 Nov 2012 11:24:47 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 11:24:46 +0000 Message-Id: <50A23C0C02000078000A8085@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 11:24:44 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 12:13, "Zhang, Yang Z" wrote: > Jan Beulich wrote on 2012-11-13: >>>>> On 13.11.12 at 09:50, "Zhang, Xiantao" wrote: >>>> From: Jan Beulich [mailto:JBeulich@suse.com] >>>> Bottom line - I'm seeking advice as to whether working around this problem >>>> in the IOMMU code is desirable/necessary, or whether this is a design flaw >>>> on the device's side that just cannot be tolerated with an IOMMU in the >>>> picture (which would need good reasoning, so that a customer expecting >>>> such a device to work regardless of IOMMU usage can understand that this >>>> cannot reasonably be made work). > > Why not just disable the IOMMU in this case ? Because that disables (secure) pass through of other devices. >>> The issue is why the non-zero functions don't claim themselves during PCI bus >>> scan. >> >> As said - I can't tell whether there is a secondary function in the >> first place (and I didn't try to find out because it doesn't really >> matter for the purpose of finding a solution/workaround). > > If software cannot see it, then how to use it? If there still have an > approach to detect it, then xen can do it too and setup the context entry as > passthrough. We see it the latest at the point the fault occurs. So there are multiple options: a) if the device is "real" as in having a valid config space despite func 0 not advertising itself as multi-function, we have ways to discover the device (at boot time) b) we could insert the context entry in the fault handler, assuming the device is able to recover c) we could provide a command line option to allow fake devices to be created d) we could create context entries for all BDFs, whether or not a device exists there Does any of these have obvious downsides? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:29:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:29:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEgf-0006iB-Ms; Tue, 13 Nov 2012 11:29:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEge-0006i4-Qj for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:29:49 +0000 Received: from [85.158.143.99:26192] by server-3.bemta-4.messagelabs.com id 98/4B-06841-C2F22A05; Tue, 13 Nov 2012 11:29:48 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1352806186!22208558!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8967 invoked from network); 13 Nov 2012 11:29:47 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:29:47 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214306000" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:29:45 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:29:45 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEga-0004OJ-Ne; Tue, 13 Nov 2012 11:29:44 +0000 Date: Tue, 13 Nov 2012 11:29:12 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> Message-ID: References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: Hans Mueller , Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 9 Nov 2012, Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes the > > qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU config. > > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. > > In any case I don't think that changeset was intended to cause anything > like this -- Stefano? No, it wasn't. Can you please try reverting that specific commit on the qemu tree and let me know if everything works afterwards (git revert 3e66da7266c84638c0e22a09c9d2b07529802576)? Are you testing with a Linux or a Windows guest? In any case, it is always safer to run with msi_translate=0, we have found problems in the past using msi_translate with Nvidia graphic cards. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:29:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:29:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEgf-0006iB-Ms; Tue, 13 Nov 2012 11:29:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEge-0006i4-Qj for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:29:49 +0000 Received: from [85.158.143.99:26192] by server-3.bemta-4.messagelabs.com id 98/4B-06841-C2F22A05; Tue, 13 Nov 2012 11:29:48 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-11.tower-216.messagelabs.com!1352806186!22208558!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8967 invoked from network); 13 Nov 2012 11:29:47 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:29:47 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214306000" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:29:45 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:29:45 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEga-0004OJ-Ne; Tue, 13 Nov 2012 11:29:44 +0000 Date: Tue, 13 Nov 2012 11:29:12 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352478827.27833.127.camel@zakaz.uk.xensource.com> Message-ID: References: <1382625.svAp90pkVF@sheik-lin> <1352478827.27833.127.camel@zakaz.uk.xensource.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: Hans Mueller , Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] PCI/VGA passthrough on >Xen-4.2 - (XEN) AMD-Vi: IO_PAGE_FAULT: X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Fri, 9 Nov 2012, Ian Campbell wrote: > On Fri, 2012-11-09 at 16:25 +0000, Hans Mueller wrote: > > On Thursday, 8. November 2012 20:02:51 feral wrote: > > > Upgraded from Xen-4.1 to 4.2/4.3/4.3-unstable. Tested against all three. > > > > > > VGA passthrough previously working with 4.1 is no longer working with >4.2. > > > > > > Setup - Working: > > > Mint13, kernel-3.2.0-32, Xen-4.1 (from Ubuntu-Precise repos), libvirt-bin, > > > xend > > > Asus Radeon HD 7870 DirectCU. > > > Works perfect. Benches on par with bare metal. > > > > > > Setup - Broken: > > > Mint13, kernel-3.2.0-32, Xen-4.2,Xen-4.3,Xen-4.3-unstable (from GIT), xl > > > toolstack. > > > Asus Radeon HD 7870 DirectCU. > > > Some times the guest boots correctly but display is never enabled. > > > Sometimes BSOD, doesn't seem to be any rhyme or reason? > > > > > > No errors in logs. Found the following in 'xl dmesg': > > > (XEN) AMD-Vi: IO_PAGE_FAULT: domain = 2, device id = 0x600, fault address = > > > 0x1ac800000, flags = 0 > > > > I had a similar problem since hg revision 25818:50adc933faaf which changes the > > qemu tag. > > It looks like the qemu commit > > 3e66da7266c84638c0e22a09c9d2b07529802576 > > (qemu-xen-trad: fix msi_translate with PV event delivery) > > causes this behavior. > > > > I solved the problem for me by using 'pci_msitranslate=0' in the domU config. > > I don't follow this stuff closely but I could have sworn we had disabled > msitranslate by default. > > In any case I don't think that changeset was intended to cause anything > like this -- Stefano? No, it wasn't. Can you please try reverting that specific commit on the qemu tree and let me know if everything works afterwards (git revert 3e66da7266c84638c0e22a09c9d2b07529802576)? Are you testing with a Linux or a Windows guest? In any case, it is always safer to run with msi_translate=0, we have found problems in the past using msi_translate with Nvidia graphic cards. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:38:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:38:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEoo-00071g-M9; Tue, 13 Nov 2012 11:38:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEom-00071b-NK for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:38:12 +0000 Received: from [85.158.139.83:35528] by server-11.bemta-5.messagelabs.com id 40/CA-03409-32132A05; Tue, 13 Nov 2012 11:38:11 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352806691!29337807!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17695 invoked from network); 13 Nov 2012 11:38:11 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 13 Nov 2012 11:38:11 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 11:38:10 +0000 Message-Id: <50A23F3102000078000A80BE@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 11:38:09 +0000 From: "Jan Beulich" To: "Malcolm Crossley" References: In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 12:23, Malcolm Crossley wrote: > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > to the local processor. Unfortunately there is a delay in the delivery of > the > APIC message and we may already have re-entered the HVM guest by the time the > NMI is taken. This results in the VMEXIT code calling the self_nmi() > function > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop > before > the HVM guest resumes normal operation. But it does, eventually? I ask because ... > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > completes. ... this blocking of NMIs should last until you enter the guest again, so I would actually expect this to be an infinite loop ... > So we believe it is safe to directly invoke the INT call as NMI's should > already be blocked. ... and this not only be safe, but actually required. > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > --- a/xen/arch/x86/hvm/vmx/vmx.c > +++ b/xen/arch/x86/hvm/vmx/vmx.c > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > (X86_EVENTTYPE_NMI << 8) ) > goto exit_and_crash; > HVMTRACE_0D(NMI); > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ In any case - why can't you call do_nmi() directly from here? Jan > break; > case TRAP_machine_check: > HVMTRACE_0D(MCE); > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:38:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:38:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEoo-00071g-M9; Tue, 13 Nov 2012 11:38:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEom-00071b-NK for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:38:12 +0000 Received: from [85.158.139.83:35528] by server-11.bemta-5.messagelabs.com id 40/CA-03409-32132A05; Tue, 13 Nov 2012 11:38:11 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352806691!29337807!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17695 invoked from network); 13 Nov 2012 11:38:11 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-182.messagelabs.com with SMTP; 13 Nov 2012 11:38:11 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 11:38:10 +0000 Message-Id: <50A23F3102000078000A80BE@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 11:38:09 +0000 From: "Jan Beulich" To: "Malcolm Crossley" References: In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 12:23, Malcolm Crossley wrote: > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > to the local processor. Unfortunately there is a delay in the delivery of > the > APIC message and we may already have re-entered the HVM guest by the time the > NMI is taken. This results in the VMEXIT code calling the self_nmi() > function > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop > before > the HVM guest resumes normal operation. But it does, eventually? I ask because ... > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > completes. ... this blocking of NMIs should last until you enter the guest again, so I would actually expect this to be an infinite loop ... > So we believe it is safe to directly invoke the INT call as NMI's should > already be blocked. ... and this not only be safe, but actually required. > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > --- a/xen/arch/x86/hvm/vmx/vmx.c > +++ b/xen/arch/x86/hvm/vmx/vmx.c > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > (X86_EVENTTYPE_NMI << 8) ) > goto exit_and_crash; > HVMTRACE_0D(NMI); > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ In any case - why can't you call do_nmi() directly from here? Jan > break; > case TRAP_machine_check: > HVMTRACE_0D(MCE); > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:47:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:47:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYExi-0007H0-UU; Tue, 13 Nov 2012 11:47:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYExh-0007Gv-TJ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:47:25 +0000 Received: from [193.109.254.147:25370] by server-14.bemta-14.messagelabs.com id 34/16-14517-D4332A05; Tue, 13 Nov 2012 11:47:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1352807243!3917145!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12169 invoked from network); 13 Nov 2012 11:47:24 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 11:47:24 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYExW-000C2c-BZ; Tue, 13 Nov 2012 11:47:14 +0000 Date: Tue, 13 Nov 2012 11:47:14 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113114714.GB44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A23F3102000078000A80BE@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Would need to go and read manuals to comment on much of this, but... At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > (X86_EVENTTYPE_NMI << 8) ) > > goto exit_and_crash; > > HVMTRACE_0D(NMI); > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > In any case - why can't you call do_nmi() directly from here? ... this is my doing. There used to be a call to do_nmi() here, but do_nmi() doesn't block NMIs, so you can't just call it here in case you get _another_ NMI while you're in the NMI handler. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:47:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:47:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYExi-0007H0-UU; Tue, 13 Nov 2012 11:47:26 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYExh-0007Gv-TJ for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:47:25 +0000 Received: from [193.109.254.147:25370] by server-14.bemta-14.messagelabs.com id 34/16-14517-D4332A05; Tue, 13 Nov 2012 11:47:25 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-11.tower-27.messagelabs.com!1352807243!3917145!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12169 invoked from network); 13 Nov 2012 11:47:24 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-11.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 11:47:24 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYExW-000C2c-BZ; Tue, 13 Nov 2012 11:47:14 +0000 Date: Tue, 13 Nov 2012 11:47:14 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113114714.GB44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A23F3102000078000A80BE@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Would need to go and read manuals to comment on much of this, but... At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > (X86_EVENTTYPE_NMI << 8) ) > > goto exit_and_crash; > > HVMTRACE_0D(NMI); > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > In any case - why can't you call do_nmi() directly from here? ... this is my doing. There used to be a call to do_nmi() here, but do_nmi() doesn't block NMIs, so you can't just call it here in case you get _another_ NMI while you're in the NMI handler. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:48:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:48:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEyr-0007LH-Dm; Tue, 13 Nov 2012 11:48:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEyq-0007L7-1N for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:48:36 +0000 Received: from [85.158.139.83:7036] by server-1.bemta-5.messagelabs.com id D3/1F-05877-39332A05; Tue, 13 Nov 2012 11:48:35 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352807313!22820211!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30210 invoked from network); 13 Nov 2012 11:48:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:48:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214307146" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:48:04 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:48:04 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEyJ-0004e6-Lf for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:48:03 +0000 Message-ID: <50A23373.3020805@citrix.com> Date: Tue, 13 Nov 2012 11:48:03 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> In-Reply-To: <50A23F3102000078000A80BE@nat28.tlf.novell.com> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 11:38, Jan Beulich wrote: >>>> On 13.11.12 at 12:23, Malcolm Crossley wrote: >> The self_nmi() code cause's an NMI to be triggered by sending an APIC message >> to the local processor. Unfortunately there is a delay in the delivery of >> the >> APIC message and we may already have re-entered the HVM guest by the time the >> NMI is taken. This results in the VMEXIT code calling the self_nmi() >> function >> again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop >> before >> the HVM guest resumes normal operation. > But it does, eventually? I ask because ... > >> Volume 3 Chapter 27 Section 1 of the Intel SDM states: >> >> An NMI causes subsequent NMIs to be blocked, but only after the VM exit >> completes. > ... this blocking of NMIs should last until you enter the guest > again, so I would actually expect this to be an infinite loop ... The observed behaviour was some other event like a timer interrupt breaking it out of the loop and taking a different path through the vmexit handler. > >> So we believe it is safe to directly invoke the INT call as NMI's should >> already be blocked. > ... and this not only be safe, but actually required. > >> diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >> --- a/xen/arch/x86/hvm/vmx/vmx.c >> +++ b/xen/arch/x86/hvm/vmx/vmx.c >> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> (X86_EVENTTYPE_NMI << 8) ) >> goto exit_and_crash; >> HVMTRACE_0D(NMI); >> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > In any case - why can't you call do_nmi() directly from here? > > Jan Actually, thinking about it that is a better idea than my suggestion, because if for some reason another, different NMI occurs (the Intel SDM is not exactly clear on exactly when NMIs are blocked till), the other NMI will enter on the real NMI stack and not trample over itself. ~Andrew > >> break; >> case TRAP_machine_check: >> HVMTRACE_0D(MCE); >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:48:50 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:48:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEyr-0007LH-Dm; Tue, 13 Nov 2012 11:48:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYEyq-0007L7-1N for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:48:36 +0000 Received: from [85.158.139.83:7036] by server-1.bemta-5.messagelabs.com id D3/1F-05877-39332A05; Tue, 13 Nov 2012 11:48:35 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352807313!22820211!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30210 invoked from network); 13 Nov 2012 11:48:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:48:34 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214307146" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:48:04 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:48:04 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYEyJ-0004e6-Lf for xen-devel@lists.xen.org; Tue, 13 Nov 2012 11:48:03 +0000 Message-ID: <50A23373.3020805@citrix.com> Date: Tue, 13 Nov 2012 11:48:03 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> In-Reply-To: <50A23F3102000078000A80BE@nat28.tlf.novell.com> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 11:38, Jan Beulich wrote: >>>> On 13.11.12 at 12:23, Malcolm Crossley wrote: >> The self_nmi() code cause's an NMI to be triggered by sending an APIC message >> to the local processor. Unfortunately there is a delay in the delivery of >> the >> APIC message and we may already have re-entered the HVM guest by the time the >> NMI is taken. This results in the VMEXIT code calling the self_nmi() >> function >> again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop >> before >> the HVM guest resumes normal operation. > But it does, eventually? I ask because ... > >> Volume 3 Chapter 27 Section 1 of the Intel SDM states: >> >> An NMI causes subsequent NMIs to be blocked, but only after the VM exit >> completes. > ... this blocking of NMIs should last until you enter the guest > again, so I would actually expect this to be an infinite loop ... The observed behaviour was some other event like a timer interrupt breaking it out of the loop and taking a different path through the vmexit handler. > >> So we believe it is safe to directly invoke the INT call as NMI's should >> already be blocked. > ... and this not only be safe, but actually required. > >> diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >> --- a/xen/arch/x86/hvm/vmx/vmx.c >> +++ b/xen/arch/x86/hvm/vmx/vmx.c >> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> (X86_EVENTTYPE_NMI << 8) ) >> goto exit_and_crash; >> HVMTRACE_0D(NMI); >> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > In any case - why can't you call do_nmi() directly from here? > > Jan Actually, thinking about it that is a better idea than my suggestion, because if for some reason another, different NMI occurs (the Intel SDM is not exactly clear on exactly when NMIs are blocked till), the other NMI will enter on the real NMI stack and not trample over itself. ~Andrew > >> break; >> case TRAP_machine_check: >> HVMTRACE_0D(MCE); >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:58:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:58:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYF8R-0007d6-Gw; Tue, 13 Nov 2012 11:58:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYF8P-0007d1-W0 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:58:30 +0000 Received: from [193.109.254.147:43923] by server-4.bemta-14.messagelabs.com id 03/54-18856-5E532A05; Tue, 13 Nov 2012 11:58:29 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352807907!10776948!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31895 invoked from network); 13 Nov 2012 11:58:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:58:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214307677" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:57:58 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:57:58 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYF7t-0004n3-IJ; Tue, 13 Nov 2012 11:57:57 +0000 Date: Tue, 13 Nov 2012 11:57:25 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Tim Deegan In-Reply-To: <20121027100929.GA89901@ocelot.phlegethon.org> Message-ID: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 27 Oct 2012, Tim Deegan wrote: > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > I think that the problem is the usage of vgic_irq_rank with registers > > > that have 1 bit per interrupt. > > > > That's very plausible indeed. > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > index 3c3983f..92731b6 100644 > > > --- a/xen/arch/arm/vgic.c > > > +++ b/xen/arch/arm/vgic.c > > > @@ -42,13 +42,7 @@ > > > */ > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > { > > > - switch ( b ) > > > - { > > > - case 8: return n >> 3; > > > - case 4: return n >> 2; > > > - case 2: return n >> 1; > > > - default: BUG(); > > > - } > > > + return n / b; > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > why I used the switch. Can you just add the appropriate case 1 instead? > > Probably the bug should be a call to an undefined function to make this > > a compile time rather than runtime failure too. > > BUILD_BUG_ON((b & -b) != b); ? I can't do that: error: expression in static assertion is not constant _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 11:58:47 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 11:58:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYF8R-0007d6-Gw; Tue, 13 Nov 2012 11:58:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYF8P-0007d1-W0 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 11:58:30 +0000 Received: from [193.109.254.147:43923] by server-4.bemta-14.messagelabs.com id 03/54-18856-5E532A05; Tue, 13 Nov 2012 11:58:29 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1352807907!10776948!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31895 invoked from network); 13 Nov 2012 11:58:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 11:58:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214307677" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 11:57:58 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 06:57:58 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYF7t-0004n3-IJ; Tue, 13 Nov 2012 11:57:57 +0000 Date: Tue, 13 Nov 2012 11:57:25 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Tim Deegan In-Reply-To: <20121027100929.GA89901@ocelot.phlegethon.org> Message-ID: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 27 Oct 2012, Tim Deegan wrote: > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > I think that the problem is the usage of vgic_irq_rank with registers > > > that have 1 bit per interrupt. > > > > That's very plausible indeed. > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > index 3c3983f..92731b6 100644 > > > --- a/xen/arch/arm/vgic.c > > > +++ b/xen/arch/arm/vgic.c > > > @@ -42,13 +42,7 @@ > > > */ > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > { > > > - switch ( b ) > > > - { > > > - case 8: return n >> 3; > > > - case 4: return n >> 2; > > > - case 2: return n >> 1; > > > - default: BUG(); > > > - } > > > + return n / b; > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > why I used the switch. Can you just add the appropriate case 1 instead? > > Probably the bug should be a call to an undefined function to make this > > a compile time rather than runtime failure too. > > BUILD_BUG_ON((b & -b) != b); ? I can't do that: error: expression in static assertion is not constant _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:01:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFAz-0007pb-Ob; Tue, 13 Nov 2012 12:01:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFAx-0007pE-HL for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:01:07 +0000 Received: from [85.158.139.83:52461] by server-1.bemta-5.messagelabs.com id 7B/37-05877-28632A05; Tue, 13 Nov 2012 12:01:06 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352808065!29761760!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14338 invoked from network); 13 Nov 2012 12:01:05 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:01:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15775726" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:00:55 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 12:00:55 +0000 Message-ID: <1352808054.7491.66.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Stefano Stabellini Date: Tue, 13 Nov 2012 12:00:54 +0000 In-Reply-To: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "Tim \(Xen.org\)" Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 11:57 +0000, Stefano Stabellini wrote: > On Sat, 27 Oct 2012, Tim Deegan wrote: > > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > > I think that the problem is the usage of vgic_irq_rank with registers > > > > that have 1 bit per interrupt. > > > > > > That's very plausible indeed. > > > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > > index 3c3983f..92731b6 100644 > > > > --- a/xen/arch/arm/vgic.c > > > > +++ b/xen/arch/arm/vgic.c > > > > @@ -42,13 +42,7 @@ > > > > */ > > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > > { > > > > - switch ( b ) > > > > - { > > > > - case 8: return n >> 3; > > > > - case 4: return n >> 2; > > > > - case 2: return n >> 1; > > > > - default: BUG(); > > > > - } > > > > + return n / b; > > > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > > why I used the switch. Can you just add the appropriate case 1 instead? > > > Probably the bug should be a call to an undefined function to make this > > > a compile time rather than runtime failure too. > > > > BUILD_BUG_ON((b & -b) != b); ? > > I can't do that: > > error: expression in static assertion is not constant I suppose you could make REG_RANK_NR a macro (as it's name implies it ought to be, oops!). If not then given that b must be in {1,2,4,8} maybe the switch is ok/tolerable? If we end up supporting b=16 or 32 then more thought is probably required around the place anyway. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:01:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:01:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFAz-0007pb-Ob; Tue, 13 Nov 2012 12:01:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFAx-0007pE-HL for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:01:07 +0000 Received: from [85.158.139.83:52461] by server-1.bemta-5.messagelabs.com id 7B/37-05877-28632A05; Tue, 13 Nov 2012 12:01:06 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1352808065!29761760!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14338 invoked from network); 13 Nov 2012 12:01:05 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:01:05 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15775726" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:00:55 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 12:00:55 +0000 Message-ID: <1352808054.7491.66.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Stefano Stabellini Date: Tue, 13 Nov 2012 12:00:54 +0000 In-Reply-To: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "Tim \(Xen.org\)" Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 11:57 +0000, Stefano Stabellini wrote: > On Sat, 27 Oct 2012, Tim Deegan wrote: > > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > > I think that the problem is the usage of vgic_irq_rank with registers > > > > that have 1 bit per interrupt. > > > > > > That's very plausible indeed. > > > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > > index 3c3983f..92731b6 100644 > > > > --- a/xen/arch/arm/vgic.c > > > > +++ b/xen/arch/arm/vgic.c > > > > @@ -42,13 +42,7 @@ > > > > */ > > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > > { > > > > - switch ( b ) > > > > - { > > > > - case 8: return n >> 3; > > > > - case 4: return n >> 2; > > > > - case 2: return n >> 1; > > > > - default: BUG(); > > > > - } > > > > + return n / b; > > > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > > why I used the switch. Can you just add the appropriate case 1 instead? > > > Probably the bug should be a call to an undefined function to make this > > > a compile time rather than runtime failure too. > > > > BUILD_BUG_ON((b & -b) != b); ? > > I can't do that: > > error: expression in static assertion is not constant I suppose you could make REG_RANK_NR a macro (as it's name implies it ought to be, oops!). If not then given that b must be in {1,2,4,8} maybe the switch is ok/tolerable? If we end up supporting b=16 or 32 then more thought is probably required around the place anyway. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:02:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:02:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFBz-0007ym-8j; Tue, 13 Nov 2012 12:02:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFBy-0007yb-4B for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:02:10 +0000 Received: from [85.158.143.99:24855] by server-2.bemta-4.messagelabs.com id 41/3A-28922-1C632A05; Tue, 13 Nov 2012 12:02:09 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352808127!29171154!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4966 invoked from network); 13 Nov 2012 12:02:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:02:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="44387694" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:02:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:02:07 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFBu-0004rb-Jn; Tue, 13 Nov 2012 12:02:06 +0000 Date: Tue, 13 Nov 2012 12:01:34 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Tim Deegan In-Reply-To: <20121027104428.GB89901@ocelot.phlegethon.org> Message-ID: References: <1351091027-20740-6-git-send-email-stefano.stabellini@eu.citrix.com> <20121024155945.GD39126@ocelot.phlegethon.org> <20121026090141.GB76080@ocelot.phlegethon.org> <20121026165549.GF76080@ocelot.phlegethon.org> <20121027104428.GB89901@ocelot.phlegethon.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 27 Oct 2012, Tim Deegan wrote: > At 19:40 +0100 on 26 Oct (1351280413), Stefano Stabellini wrote: > > > No! It's always safe to flush the entire line -- regardless of what > > > other writes might be happening to it. After all, the cache controller > > > might evict that line on its own at any time, so nothing can be relying > > > on its _not_ being flushed. > > > > > > The only problem with not knowing how big a cacheline is is this: if the > > > object is _bigger_ than a cache line we might use one DCCMVAC where more > > > than one is needed. We can avoid that by a compile-time check on some > > > sort of architectural minimum cacheline size. > > > > If we want to do that then we need to pass a size argument to > > flush_xen_dcache_va and have a loop in the function, each iteration > > flushing a cacheline: > > > > static inline void flush_xen_dcache_va(void *p, unsigned long size) > > { > > unsigned long cacheline_size = READ_CP32(CCSIDR); > > unsigned long i; > > for (i = 0; i < size; i += cacheline_size, p += cacheline_size) { > > asm volatile ( > > "dsb;" > > STORE_CP32(0, DCCMVAC) > > "dsb;" > > : : "r" (p)); > > } > > } > > I think we should have two functions. One should look almost like that > and be for flushing large ranges, and one much simpler for flushing > small items. Like this (totally untested, uncompiled even): > > #define MIN_CACHELINE_BYTES 32 // or whatever > > /* In setup.c somewhere. */ > if ( READ_CP32(CCSIDR) < MIN_CACHELINE_BYTES ) > panic("CPU has preposterously small cache lines"); > > /* Function for flushing medium-sized areas. > * if 'range' is large enough we might want to use model-specific > * full-cache flushes. */ > static inline void flush_xen_dcache_va_range(void *p, unsigned long size) > { > void *end; > unsigned long cacheline_bytes = READ_CP32(CCSIDR); > barrier(); /* So the compiler issues all writes to the range */ > dsb(); /* So the CPU issues all writes to the range */ > for ( end = p + size; p < end; p += cacheline_bytes ) > WRITE_CP32(DCCMVAC, p); > dsb(); /* So we know the flushes happen before continuing */ > } > > /* Macro for flushing a single small item. The predicate is always > * compile-time constant so this will compile down to 3 instructions in > * the common case. Make sure to call it with the correct type of > * pointer! */ > #define flush_xen_dcache_va(p) do { \ > typeof(p) _p = (p); \ > if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ > flush_xen_dcache_va_range(_p, sizeof *_p); \ > else \ > asm volatile ( \ > "dsb;" /* Finish all earlier writes */ \ > STORE_CP32(0, DCCMVAC) \ > "dsb;" /* Finish flush before continuing */ \ > : : "r" (_p), "m" (*_p)); \ > } while (0) > > What do you think? I think that is OK, but I would like to avoid reading CCSIDR every single time we need to do a dcache flush, I don't know how slow that coprocessor read is but I wouldn't want to have to find out :) I am thinking of introducing a global variable to hold the cacheline size and initialize it in start_xen. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:02:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:02:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFBz-0007ym-8j; Tue, 13 Nov 2012 12:02:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFBy-0007yb-4B for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:02:10 +0000 Received: from [85.158.143.99:24855] by server-2.bemta-4.messagelabs.com id 41/3A-28922-1C632A05; Tue, 13 Nov 2012 12:02:09 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-3.tower-216.messagelabs.com!1352808127!29171154!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4966 invoked from network); 13 Nov 2012 12:02:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:02:08 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="44387694" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:02:07 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:02:07 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFBu-0004rb-Jn; Tue, 13 Nov 2012 12:02:06 +0000 Date: Tue, 13 Nov 2012 12:01:34 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Tim Deegan In-Reply-To: <20121027104428.GB89901@ocelot.phlegethon.org> Message-ID: References: <1351091027-20740-6-git-send-email-stefano.stabellini@eu.citrix.com> <20121024155945.GD39126@ocelot.phlegethon.org> <20121026090141.GB76080@ocelot.phlegethon.org> <20121026165549.GF76080@ocelot.phlegethon.org> <20121027104428.GB89901@ocelot.phlegethon.org> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , Ian Campbell , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Sat, 27 Oct 2012, Tim Deegan wrote: > At 19:40 +0100 on 26 Oct (1351280413), Stefano Stabellini wrote: > > > No! It's always safe to flush the entire line -- regardless of what > > > other writes might be happening to it. After all, the cache controller > > > might evict that line on its own at any time, so nothing can be relying > > > on its _not_ being flushed. > > > > > > The only problem with not knowing how big a cacheline is is this: if the > > > object is _bigger_ than a cache line we might use one DCCMVAC where more > > > than one is needed. We can avoid that by a compile-time check on some > > > sort of architectural minimum cacheline size. > > > > If we want to do that then we need to pass a size argument to > > flush_xen_dcache_va and have a loop in the function, each iteration > > flushing a cacheline: > > > > static inline void flush_xen_dcache_va(void *p, unsigned long size) > > { > > unsigned long cacheline_size = READ_CP32(CCSIDR); > > unsigned long i; > > for (i = 0; i < size; i += cacheline_size, p += cacheline_size) { > > asm volatile ( > > "dsb;" > > STORE_CP32(0, DCCMVAC) > > "dsb;" > > : : "r" (p)); > > } > > } > > I think we should have two functions. One should look almost like that > and be for flushing large ranges, and one much simpler for flushing > small items. Like this (totally untested, uncompiled even): > > #define MIN_CACHELINE_BYTES 32 // or whatever > > /* In setup.c somewhere. */ > if ( READ_CP32(CCSIDR) < MIN_CACHELINE_BYTES ) > panic("CPU has preposterously small cache lines"); > > /* Function for flushing medium-sized areas. > * if 'range' is large enough we might want to use model-specific > * full-cache flushes. */ > static inline void flush_xen_dcache_va_range(void *p, unsigned long size) > { > void *end; > unsigned long cacheline_bytes = READ_CP32(CCSIDR); > barrier(); /* So the compiler issues all writes to the range */ > dsb(); /* So the CPU issues all writes to the range */ > for ( end = p + size; p < end; p += cacheline_bytes ) > WRITE_CP32(DCCMVAC, p); > dsb(); /* So we know the flushes happen before continuing */ > } > > /* Macro for flushing a single small item. The predicate is always > * compile-time constant so this will compile down to 3 instructions in > * the common case. Make sure to call it with the correct type of > * pointer! */ > #define flush_xen_dcache_va(p) do { \ > typeof(p) _p = (p); \ > if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ > flush_xen_dcache_va_range(_p, sizeof *_p); \ > else \ > asm volatile ( \ > "dsb;" /* Finish all earlier writes */ \ > STORE_CP32(0, DCCMVAC) \ > "dsb;" /* Finish flush before continuing */ \ > : : "r" (_p), "m" (*_p)); \ > } while (0) > > What do you think? I think that is OK, but I would like to avoid reading CCSIDR every single time we need to do a dcache flush, I don't know how slow that coprocessor read is but I wouldn't want to have to find out :) I am thinking of introducing a global variable to hold the cacheline size and initialize it in start_xen. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:06:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:06:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFFk-0008Fj-V4; Tue, 13 Nov 2012 12:06:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFFj-0008FZ-AI for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:06:03 +0000 Received: from [85.158.139.211:7944] by server-11.bemta-5.messagelabs.com id C3/05-03409-AA732A05; Tue, 13 Nov 2012 12:06:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1352808361!19545744!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 13 Nov 2012 12:06:01 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:06:01 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFFb-000C6W-Ps; Tue, 13 Nov 2012 12:05:55 +0000 Date: Tue, 13 Nov 2012 12:05:55 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113120555.GC44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121113114714.GB44675@ocelot.phlegethon.org> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > (X86_EVENTTYPE_NMI << 8) ) > > > goto exit_and_crash; > > > HVMTRACE_0D(NMI); > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > In any case - why can't you call do_nmi() directly from here? > > ... this is my doing. There used to be a call to do_nmi() here, but > do_nmi() doesn't block NMIs, so you can't just call it here in case you > get _another_ NMI while you're in the NMI handler. Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong because NMIs are indeed blocked, and have been since the VMEXIT. In that case, I agree that we should just run the NMI handler, but first I would really like to know what _unblocks_ NMIs in this case. Any of the things I can think of (the next vmenter, the next iret, ??) will need some handling to make sure they actually happen before, say, we take this CPU into the idle loop... Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:06:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:06:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFFk-0008Fj-V4; Tue, 13 Nov 2012 12:06:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFFj-0008FZ-AI for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:06:03 +0000 Received: from [85.158.139.211:7944] by server-11.bemta-5.messagelabs.com id C3/05-03409-AA732A05; Tue, 13 Nov 2012 12:06:02 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1352808361!19545744!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9099 invoked from network); 13 Nov 2012 12:06:01 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:06:01 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFFb-000C6W-Ps; Tue, 13 Nov 2012 12:05:55 +0000 Date: Tue, 13 Nov 2012 12:05:55 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113120555.GC44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121113114714.GB44675@ocelot.phlegethon.org> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > (X86_EVENTTYPE_NMI << 8) ) > > > goto exit_and_crash; > > > HVMTRACE_0D(NMI); > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > In any case - why can't you call do_nmi() directly from here? > > ... this is my doing. There used to be a call to do_nmi() here, but > do_nmi() doesn't block NMIs, so you can't just call it here in case you > get _another_ NMI while you're in the NMI handler. Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong because NMIs are indeed blocked, and have been since the VMEXIT. In that case, I agree that we should just run the NMI handler, but first I would really like to know what _unblocks_ NMIs in this case. Any of the things I can think of (the next vmenter, the next iret, ??) will need some handling to make sure they actually happen before, say, we take this CPU into the idle loop... Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:06:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:06:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFG3-0008I1-Fo; Tue, 13 Nov 2012 12:06:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3b-0004PX-Fw for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:28 +0000 Received: from [85.158.138.51:7043] by server-15.bemta-3.messagelabs.com id 64/AD-09445-6B522A05; Tue, 13 Nov 2012 10:49:26 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352803762!27912505!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22352 invoked from network); 13 Nov 2012 10:49:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:49:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773595" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:49:17 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:49:16 +0000 Message-ID: <1352803755.7491.47.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:49:15 +0000 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 12:06:22 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Remove the old vtpm process model. It doesn't work very > well and is no longer supported. > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell > > diff --git a/tools/Makefile b/tools/Makefile > index d8c8cc0..2ca43b9 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > SUBDIRS-$(CONFIG_X86) += firmware > SUBDIRS-y += console > SUBDIRS-y += xenmon > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > -SUBDIRS-$(VTPM_TOOLS) += vtpm > SUBDIRS-y += xenstat > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_Linux) += memshr > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > index 631306b..90a6b85 100644 > --- a/tools/blktap2/drivers/hashtable.c > +++ b/tools/blktap2/drivers/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > index 89aa3dc..56ca053 100644 > --- a/tools/blktap2/drivers/hashtable.h > +++ b/tools/blktap2/drivers/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > index 402e06b..731917c 100644 > --- a/tools/blktap2/drivers/hashtable_itr.c > +++ b/tools/blktap2/drivers/hashtable_itr.c > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.c > - */ > - > #include "hashtable.h" > #include "hashtable_private.h" > #include "hashtable_itr.h" > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > index 3d80638..81da838 100644 > --- a/tools/blktap2/drivers/hashtable_itr.h > +++ b/tools/blktap2/drivers/hashtable_itr.h > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.h > - */ > - > #ifndef __HASHTABLE_ITR_CWC22__ > #define __HASHTABLE_ITR_CWC22__ > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > index 5a13a65..954ecc3 100644 > --- a/tools/blktap2/drivers/hashtable_private.h > +++ b/tools/blktap2/drivers/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/configure.ac b/tools/configure.ac > index e708f01..586313d 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > # Enable/disable options > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > diff --git a/tools/examples/README b/tools/examples/README > index 5b0314e..2225d5c 100644 > --- a/tools/examples/README > +++ b/tools/examples/README > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > vif-common.sh - sourced by vif-bridge > vif-nat - xen virtual network start/stop script in NAT mode > vif-route - xen virtual network start/stop script in routed mode > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > -vtpm-common.sh - common code for vTPM handling > -vtpm-delete - remove an entry from the vTPM table given the > - domain's name > -vtpm-hotplug-common.sh - sourced by vtpm > -vtpm-migration.sh - sourced by external-device-migrate > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > devices > xen-backend.rules - hotplug script rules > xend-config.sxp - default xend configuration file > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > index 85f847c..e04e6c1 100644 > --- a/tools/examples/xmexample.pv-grub > +++ b/tools/examples/xmexample.pv-grub > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Configure the behaviour when a domain exits. There are three 'reasons' > # for a domain to stop: poweroff, reboot, and crash. For each of these you > # may specify: > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > index 330aaf0..c951200 100644 > --- a/tools/examples/xmexample1 > +++ b/tools/examples/xmexample1 > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > index 4e5eb3d..8c5137e 100644 > --- a/tools/examples/xmexample2 > +++ b/tools/examples/xmexample2 > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > index dc22ce1..ae799f9 100644 > --- a/tools/examples/xmexample3 > +++ b/tools/examples/xmexample3 > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > index 0166790..0605559 100644 > --- a/tools/hotplug/Linux/Makefile > +++ b/tools/hotplug/Linux/Makefile > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > XEN_SCRIPTS += block > XEN_SCRIPTS += block-enbd block-nbd > XEN_SCRIPTS += blktap > -XEN_SCRIPTS += vtpm vtpm-delete > XEN_SCRIPTS += xen-hotplug-cleanup > XEN_SCRIPTS += external-device-migrate > XEN_SCRIPTS += vscsi > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > +XEN_SCRIPT_DATA += block-common.sh > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > UDEV_RULES = xen-backend.rules xend.rules > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > deleted file mode 100644 > index 38a4532..0000000 > --- a/tools/hotplug/Linux/vtpm > +++ /dev/null > @@ -1,22 +0,0 @@ > -#!/bin/bash > - > -dir=$(dirname "$0") > -. "$dir/vtpm-hotplug-common.sh" > - > -vtpm_fatal_error=0 > - > -case "$command" in > - add) > - vtpm_create_instance > - ;; > - remove) > - vtpm_remove_instance > - ;; > -esac > - > -if [ $vtpm_fatal_error -eq 0 ]; then > - log debug "Successful vTPM operation '$command'." > - success > -else > - fatal "Error while executing vTPM operation '$command'." > -fi > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > deleted file mode 100644 > index d0d7935..0000000 > --- a/tools/hotplug/Linux/vtpm-common.sh > +++ /dev/null > @@ -1,448 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/logging.sh" > -. "$dir/locking.sh" > - > -VTPMDB="/var/vtpm/vtpm.db" > - > -#In the vtpm-impl file some commands should be defined: > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > -if [ -r "$dir/vtpm-impl.alt" ]; then > - . "$dir/vtpm-impl.alt" > -elif [ -r "$dir/vtpm-impl" ]; then > - . "$dir/vtpm-impl" > -else > - function vtpm_create () { > - true > - } > - function vtpm_setup() { > - true > - } > - function vtpm_start() { > - true > - } > - function vtpm_suspend() { > - true > - } > - function vtpm_resume() { > - true > - } > - function vtpm_delete() { > - true > - } > - function vtpm_migrate() { > - echo "Error: vTPM migration accross machines not implemented." > - } > - function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > - } > - function vtpm_migrate_recover() { > - true > - } > -fi > - > - > -#Find the instance number for the vtpm given the name of the domain > -# Parameters > -# - vmname : the name of the vm > -# Return value > -# Returns '0' if instance number could not be found, otherwise > -# it returns the instance number in the variable 'instance' > -function vtpmdb_find_instance () { > - local vmname ret instance > - vmname=$1 > - ret=0 > - > - instance=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( 1 != index($1,"#")) { \ > - if ( $1 == vmname ) { \ > - print $2; \ > - exit; \ > - } \ > - } \ > - }') > - if [ "$instance" != "" ]; then > - ret=$instance > - fi > - echo "$ret" > -} > - > - > -# Check whether a particular instance number is still available > -# returns "0" if it is not available, "1" otherwise. > -function vtpmdb_is_free_instancenum () { > - local instance instances avail i > - instance=$1 > - avail=1 > - #Allowed instance number range: 1-255 > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > - avail=0 > - else > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - for i in $instances; do > - if [ $i -eq $instance ]; then > - avail=0 > - break > - fi > - done > - fi > - echo "$avail" > -} > - > - > -# Get an available instance number given the database > -# Returns an unused instance number > -function vtpmdb_get_free_instancenum () { > - local ctr instances don found > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - ctr=1 > - don=0 > - while [ $don -eq 0 ]; do > - found=0 > - for i in $instances; do > - if [ $i -eq $ctr ]; then > - found=1; > - break; > - fi > - done > - > - if [ $found -eq 0 ]; then > - don=1 > - break > - fi > - let ctr=ctr+1 > - done > - echo "$ctr" > -} > - > - > -# Add a domain name and instance number to the DB file > -function vtpmdb_add_instance () { > - local res vmname inst > - vmname=$1 > - inst=$2 > - > - if [ ! -f $VTPMDB ]; then > - echo "#Database for VM to vTPM association" > $VTPMDB > - echo "#1st column: domain name" >> $VTPMDB > - echo "#2nd column: TPM instance number" >> $VTPMDB > - fi > - res=$(vtpmdb_validate_entry $vmname $inst) > - if [ $res -eq 0 ]; then > - echo "$vmname $inst" >> $VTPMDB > - fi > -} > - > - > -#Validate whether an entry is the same as passed to this > -#function > -function vtpmdb_validate_entry () { > - local res rc vmname inst > - rc=0 > - vmname=$1 > - inst=$2 > - > - res=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - -vinst=$inst \ > - '{ \ > - if ( 1 == index($1,"#")) {\ > - } else \ > - if ( $1 == vmname && \ > - $2 == inst) { \ > - printf("1"); \ > - exit; \ > - } else \ > - if ( $1 == vmname || \ > - $2 == inst) { \ > - printf("2"); \ > - exit; \ > - } \ > - }') > - > - if [ "$res" == "1" ]; then > - rc=1 > - elif [ "$res" == "2" ]; then > - rc=2 > - fi > - echo "$rc" > -} > - > - > -#Remove an entry from the vTPM database given its domain name > -#and instance number > -function vtpmdb_remove_entry () { > - local vmname instance VTPMDB_TMP > - vmname=$1 > - instance=$2 > - VTPMDB_TMP="$VTPMDB".tmp > - > - $(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( $1 != vmname ) { \ > - print $0; \ > - } \ > - '} > $VTPMDB_TMP) > - if [ -e $VTPMDB_TMP ]; then > - mv -f $VTPMDB_TMP $VTPMDB > - vtpm_delete $instance > - else > - log err "Error creating temporary file '$VTPMDB_TMP'." > - fi > -} > - > - > -# Find the reason for the creation of this device: > -# Returns 'resume' or 'create' > -function vtpm_get_create_reason () { > - local resume > - resume=$(xenstore_read $XENBUS_PATH/resume) > - if [ "$resume" == "True" ]; then > - echo "resume" > - else > - echo "create" > - fi > -} > - > - > -#Create a vTPM instance > -# If no entry in the TPM database is found, the instance is > -# created and an entry added to the database. > -function vtpm_create_instance () { > - local res instance domname reason uuid > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - reason=$(vtpm_get_create_reason) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > - release_lock vtpmdb > - return > - fi > - > - if [ "$instance" == "0" ]; then > - #Try to give the preferred instance to the domain > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > - if [ "$instance" != "" ]; then > - res=$(vtpmdb_is_free_instancenum $instance) > - if [ $res -eq 0 ]; then > - instance=$(vtpmdb_get_free_instancenum) > - fi > - else > - instance=$(vtpmdb_get_free_instancenum) > - fi > - > - vtpm_create $instance > - > - if [ $vtpm_fatal_error -eq 0 ]; then > - if [ "$uuid" != "" ]; then > - vtpmdb_add_instance $uuid $instance > - else > - vtpmdb_add_instance $domname $instance > - fi > - fi > - else > - if [ "$reason" == "resume" ]; then > - vtpm_resume $instance > - else > - vtpm_start $instance > - fi > - fi > - > - release_lock vtpmdb > - > - xenstore_write $XENBUS_PATH/instance $instance > -} > - > - > -#Remove an instance when a VM is terminating or suspending. > -#Since it is assumed that the VM will appear again, the > -#entry is kept in the VTPMDB file. > -function vtpm_remove_instance () { > - local instance reason domname uuid > - #Stop script execution quietly if path does not exist (anymore) > - xenstore-exists "$XENBUS_PATH"/domain > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" != "0" ]; then > - vtpm_suspend $instance > - fi > - > - release_lock vtpmdb > -} > - > - > -#Remove an entry in the VTPMDB file given the domain's name > -#1st parameter: The name of the domain > -function vtpm_delete_instance () { > - local instance > - > - claim_lock vtpmdb > - > - instance=$(vtpmdb_find_instance $1) > - if [ "$instance" != "0" ]; then > - vtpmdb_remove_entry $1 $instance > - fi > - > - release_lock vtpmdb > -} > - > -# Determine whether the given address is local to this machine > -# Return values: > -# "-1" : the given machine name is invalid > -# "0" : this is not an address of this machine > -# "1" : this is an address local to this machine > -function vtpm_isLocalAddress() { > - local addr res > - addr=$(ping $1 -c 1 | \ > - awk '{ print substr($3,2,length($3)-2); exit }') > - if [ "$addr" == "" ]; then > - echo "-1" > - return > - fi > - res=$(ifconfig | grep "inet addr" | \ > - awk -vaddr=$addr \ > - '{ \ > - if ( addr == substr($2, 6)) {\ > - print "1"; \ > - } \ > - }' \ > - ) > - if [ "$res" == "" ]; then > - echo "0" > - return > - fi > - echo "1" > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migration_step() { > - local res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate $1 $2 $3 > - else > - vtpm_migrate_local > - fi > -} > - > -# Recover from migration due to an error. This function differentiates > -# between migration to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host the migration was going to > -# 2nd: name of the domain that was to be migrated > -# 3rd: the last successful migration step that was done > -function vtpm_recover() { > - local res > - res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate_recover $1 $2 $3 > - fi > -} > - > - > -#Determine the domain id given a domain's name. > -#1st parameter: name of the domain > -#return value: domain id or -1 if domain id could not be determined > -function vtpm_domid_from_name () { > - local id name ids > - ids=$(xenstore-list /local/domain) > - for id in $ids; do > - name=$(xenstore-read /local/domain/$id/name) > - if [ "$name" == "$1" ]; then > - echo "$id" > - return > - fi > - done > - echo "-1" > -} > - > -#Determine the virtual TPM's instance number using the domain ID. > -#1st parm: domain ID > -function vtpm_uuid_by_domid() { > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > -} > - > - > -# Determine the vTPM's UUID by the name of the VM > -function vtpm_uuid_from_vmname() { > - local domid=$(vtpm_domid_from_name $1) > - if [ "$domid" != "-1" ]; then > - echo $(vtpm_uuid_by_domid $domid) > - return > - fi > - echo "" > -} > - > -#Add a virtual TPM instance number and its associated domain name > -#to the VTPMDB file and activate usage of this virtual TPM instance > -#by writing the instance number into the xenstore > -#1st parm: name of virtual machine > -#2nd parm: instance of associated virtual TPM > -function vtpm_add_and_activate() { > - local domid=$(vtpm_domid_from_name $1) > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > - vtpmdb_add_instance $vtpm_uuid $2 > - xenstore-write backend/vtpm/$domid/0/instance $2 > - fi > -} > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > deleted file mode 100644 > index b75b95b..0000000 > --- a/tools/hotplug/Linux/vtpm-delete > +++ /dev/null > @@ -1,18 +0,0 @@ > -#!/bin/bash > - > -# This scripts must be called the following way: > -# vtpm-delete > -# or > -# vtpm-delete --vmname > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > - > -if [ "$1" == "--vmname" ]; then > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > - if [ "$vtpm_uuid" != "" ];then > - vtpm_delete_instance $vtpm_uuid > - fi > -else > - vtpm_delete_instance $1 > -fi > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > deleted file mode 100644 > index 9fd35e7..0000000 > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > +++ /dev/null > @@ -1,35 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/xen-hotplug-common.sh" > - > -findCommand "$@" > -if [ "$command" != "online" ] && > - [ "$command" != "offline" ] && > - [ "$command" != "add" ] && > - [ "$command" != "remove" ] > -then > - log err "Invalid command: $command" > - exit 1 > -fi > - > - > -XENBUS_PATH="${XENBUS_PATH:?}" > - > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > deleted file mode 100644 > index 4f9a1fd..0000000 > --- a/tools/hotplug/Linux/vtpm-impl > +++ /dev/null > @@ -1,208 +0,0 @@ > -#!/bin/bash > -# =================================================================== > -# > -# Copyright (c) 2005, Intel Corp. > -# All rights reserved. > -# > -# Redistribution and use in source and binary forms, with or without > -# modification, are permitted provided that the following conditions > -# are met: > -# > -# * Redistributions of source code must retain the above copyright > -# notice, this list of conditions and the following disclaimer. > -# * Redistributions in binary form must reproduce the above > -# copyright notice, this list of conditions and the following > -# disclaimer in the documentation and/or other materials provided > -# with the distribution. > -# * Neither the name of Intel Corporation nor the names of its > -# contributors may be used to endorse or promote products derived > -# from this software without specific prior written permission. > -# > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -# OF THE POSSIBILITY OF SUCH DAMAGE. > -# =================================================================== > - > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > - > -TPM_TYPE_PVM=\\x01 > -TPM_TYPE_HVM=\\x02 > - > -TPM_SUCCESS=00000000 > - > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > - > -VTPM_MIG=/usr/bin/vtpm_migrator > - > -# -------------------- Helpers for binary streams ----------- > - > -function str_to_hex32() { > - printf "%0.8x" $1 > -} > - > -function hex32_to_bin() { > - local inst=$(str_to_hex32 $1); > - > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > - > - echo "$n1$n2$n3$n4" > -} > - > -function vtpm_manager_cmd() { > - local cmd=$1; > - local inst=$2; > - local inst_bin=$(hex32_to_bin $inst); > - > - claim_lock vtpm_mgr > - > - #send cmd to vtpm_manager > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > - > - #recv response > - set +e > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > - set -e > - > - release_lock vtpm_mgr > - > - #return whether the command was successful > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > - vtpm_fatal_error=1 > - false > - else > - true > - fi > -} > - > -# Helper to get vm type to pass to vtpm_manager open/resume > -function vtpm_get_type() { > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > - local vm=$(xenstore_read /local/domain/$inst/vm) > - if [ "$vm" != "" ]; then > - local ostype=$(xenstore-read $vm/image/ostype) > - if [ "$ostype" == "hvm" ]; then > - echo $TPM_TYPE_HVM; > - else > - echo $TPM_TYPE_PVM; > - fi > - fi > -} > - > -# ------------------ Command handlers ----------------- > - > -# Create new vtpm instance & set it up for use > -function vtpm_create () { > - # Creation is handled implicitly by the manager on first setup > - # so just set it up for use > - $(vtpm_start $1) > -} > - > -# Setup vtpm instance for use. > -function vtpm_start() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > -} > - > -function vtpm_resume() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > -} > - > -# Reset the vtpm AKA clear PCRs > -function vtpm_reset() { > - #not used by current implemenation > - true > -} > - > -# Shutdown the vtpm while the vm is down > -# This could be a suspend of shutdown > -# we cannot distinquish, so save the state > -# and decide on startup if we should keep is > -function vtpm_suspend() { > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > -} > - > - > -function vtpm_delete() { > - local inst=$1 > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > - rm -f /var/vtpm/vtpm_dm_$1.data > - true > - else > - vtpm_fatal_error=1 > - false > - fi > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migrate() { > - local instance res > - > - instance=$(vtpmdb_find_instance $2) > - if [ "$instance" == "" ]; then > - log err "VTPM Migratoin failed. Unable to translation of domain name" > - echo "Error: VTPM Migration failed while looking up instance number" > - fi > - > - case "$3" in > - 0) > - #Incicate migration supported > - echo "0" > - ;; > - > - 1) > - # Get Public Key from Destination > - # Call vtpm_manager's migration part 1 > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 2) > - # Call manager's migration step 2 and send result to destination > - # If successful remove from db > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 3) > - if `ps x | grep "$VTPM_MIG $1"`; then > - log err "VTPM Migration failed to complete." > - echo "Error: VTPM Migration failed to complete." > - fi > - ;; > - esac > - > -} > - > - > -function vtpm_migrate_recover() { > - echo "Error: Recovery not supported yet" > -} > - > -function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > -} > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > deleted file mode 100644 > index 7e38ae2..0000000 > --- a/tools/hotplug/Linux/vtpm-migration.sh > +++ /dev/null > @@ -1,19 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > index c591a3f..a0d409e 100644 > --- a/tools/hotplug/Linux/xen-backend.rules > +++ b/tools/hotplug/Linux/xen-backend.rules > @@ -1,6 +1,5 @@ > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > deleted file mode 100644 > index 7b3efa5..0000000 > --- a/tools/vtpm/Makefile > +++ /dev/null > @@ -1,74 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -# Dir name for emulator (as dom0 tpm driver) > -TPM_EMULATOR_DIR = tpm_emulator > -# Dir name for vtpm instance > -VTPM_DIR = vtpm > -ORIG_DIR = orig > - > -# Emulator tarball name > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > - > -GMP_HEADER = /usr/include/gmp.h > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: build_sub > - > -.PHONY: install > -install: build > - $(MAKE) -C $(VTPM_DIR) install-recursive > - > -.PHONY: clean > -clean: > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > - fi > - @if [ -d $(VTPM_DIR) ]; \ > - then $(MAKE) -C $(VTPM_DIR) clean; \ > - fi > - > -.PHONY: mrproper > -mrproper: > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > - > -# Download Swiss emulator > -$(TPM_EMULATOR_TARFILE): > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > - > -# Create vtpm dirs > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > - rm -rf $(VTPM_DIR) > - tar -xzf $(TPM_EMULATOR_TARFILE) > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > - > - set -e; cd $(VTPM_DIR); \ > - patch -p1 < ../vtpm-0.5.1.patch; \ > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > - > -orig: $(TPM_EMULATOR_TARFILE) > - mkdir $(ORIG_DIR); > - set -e; cd $(ORIG_DIR); \ > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > - > -updatepatches: clean orig > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > - mv vtpm.patch vtpm.patch.old; > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > - > -.PHONY: build_sub > -build_sub: $(VTPM_DIR)/tpmd/tpmd > - set -e; if [ -e $(GMP_HEADER) ]; then \ > - $(MAKE) -C $(VTPM_DIR) version; \ > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > - else \ > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > - fi > - > diff --git a/tools/vtpm/README b/tools/vtpm/README > deleted file mode 100644 > index 2008cbd..0000000 > --- a/tools/vtpm/README > +++ /dev/null > @@ -1,45 +0,0 @@ > - > -Directory Structure > -=================== > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > - be patched and used for our vtpms > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > - listens on a pair of fifos for TPM commands, > - persistent state is sent via named fifo to vtpm > - manager, which encrypts it and protects it. > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > - platforms, this patches the emulator to allow > - it to be inserted into the dom0 kernel > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > - > -Compile Flags > -=================== > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -Requirements > -============ > -- xen-unstable > -- IBM frontend/backend vtpm driver patch > -- vtpm_managerd > -- GNU MP Big number library (GMP) > - > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -tpm_emulator flow > -================== > -Read documentation in tpm_emulator-0.2 directory > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > deleted file mode 100644 > index 548cff0..0000000 > --- a/tools/vtpm/Rules.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(DEPS) > - > -BUILD_EMULATOR = y > - > -# Make sure these are just rules > -.PHONY : all build install clean > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > deleted file mode 100644 > index c34c665..0000000 > --- a/tools/vtpm/tpm_emulator.patch > +++ /dev/null > @@ -1,1919 +0,0 @@ > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,2 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > -+INTEL Corp <> [Dropped to Ring3] > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,3 +1,6 @@ > -+????-??-?? Intel Corp > -+ * Moved module out of kernel to run as a ring 3 app > -+ > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > - persistent data adapted > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -24,15 +25,10 @@ int __gmp_junk; > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > - int linenum, const char *expr) > - { > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > -+ error("%s:%d: GNU MP assertion failed: %s\n", > - filename, linenum, expr); > - } > - > --void __attribute__ ((regparm(0))) abort(void) > --{ > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > --} > -- > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > - > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > - > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > - { > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > -- "GMP: cannot allocate memory (size=%u)\n", size); > -+ void *ret = (void*)malloc(size); > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > - return ret; > - } > - > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > - size_t old_size, size_t new_size) > - { > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > -+ void *ret = (void*)malloc(new_size); > -+ if (!ret) error("GMP: Cannot reallocate memory " > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > - memcpy(ret, oldptr, old_size); > -- kfree(oldptr); > -+ free(oldptr); > - return ret; > - } > - > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > - /* overwrite used memory */ > - if (blk_ptr != NULL) { > - memset(blk_ptr, 0, blk_size); > -- kfree(blk_ptr); > -+ free(blk_ptr); > - } > - } > - > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > - msg[0] = 0x00; > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1]); > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > - SHA1_DIGEST_LENGTH) != 0) return -1; > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > -@@ -1,195 +0,0 @@ > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -- * Copyright (C) 2004 Mario Strasser , > -- * > -- * This module is free software; you can redistribute it and/or modify > -- * it under the terms of the GNU General Public License as published > -- * by the Free Software Foundation; either version 2 of the License, > -- * or (at your option) any later version. > -- * > -- * This module is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -- * GNU General Public License for more details. > -- * > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > -- */ > -- > --#include > --#include > --#include > --#include > --#include > --#include "linux_module.h" > --#include "tpm/tpm_emulator.h" > -- > --MODULE_LICENSE("GPL"); > --MODULE_AUTHOR("Mario Strasser "); > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > -- > --/* module startup parameters */ > --char *startup = "save"; > --module_param(startup, charp, 0444); > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > --module_param(storage_file, charp, 0644); > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > -- "file of the TPM."); > -- > --/* TPM lock */ > --static struct semaphore tpm_mutex; > -- > --/* TPM command response */ > --static struct { > -- uint8_t *data; > -- uint32_t size; > --} tpm_response; > -- > --/* module state */ > --#define STATE_IS_OPEN 0 > --static uint32_t module_state; > --static struct timespec old_time; > -- > --static int tpm_open(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > -- return 0; > --} > -- > --static int tpm_release(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return 0; > --} > -- > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > -- *ppos += count; > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- } else { > -- count = 0; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- *ppos = 0; > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command(buf, count, &tpm_response.data, > -- &tpm_response.size) != 0) { > -- count = -EILSEQ; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --#define TPMIOC_CANCEL _IO('T', 0x00) > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > -- > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > --{ > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > -- if (cmd == TPMIOC_TRANSMIT) { > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > -- &tpm_response.size) == 0) { > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > -- tpm_response.size); > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } else { > -- tpm_response.size = 0; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return tpm_response.size; > -- } > -- return -1; > --} > -- > --struct file_operations fops = { > -- .owner = THIS_MODULE, > -- .open = tpm_open, > -- .release = tpm_release, > -- .read = tpm_read, > -- .write = tpm_write, > -- .ioctl = tpm_ioctl, > --}; > -- > --static struct miscdevice tpm_dev = { > -- .minor = TPM_DEVICE_MINOR, > -- .name = TPM_DEVICE_NAME, > -- .fops = &fops, > --}; > -- > --int __init init_tpm_module(void) > --{ > -- int res = misc_register(&tpm_dev); > -- if (res != 0) { > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > -- return res; > -- } > -- /* initialize variables */ > -- sema_init(&tpm_mutex, 1); > -- module_state = 0; > -- tpm_response.data = NULL; > -- old_time = current_kernel_time(); > -- /* initialize TPM emulator */ > -- if (!strcmp(startup, "clear")) { > -- tpm_emulator_init(1); > -- } else if (!strcmp(startup, "save")) { > -- tpm_emulator_init(2); > -- } else if (!strcmp(startup, "deactivated")) { > -- tpm_emulator_init(3); > -- } else { > -- error("invalid startup mode '%s'; must be 'clear', " > -- "'save' (default) or 'deactivated", startup); > -- misc_deregister(&tpm_dev); > -- return -EINVAL; > -- } > -- return 0; > --} > -- > --void __exit cleanup_tpm_module(void) > --{ > -- tpm_emulator_shutdown(); > -- misc_deregister(&tpm_dev); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > --} > -- > --module_init(init_tpm_module); > --module_exit(cleanup_tpm_module); > -- > --uint64_t tpm_get_ticks(void) > --{ > -- struct timespec new_time = current_kernel_time(); > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > -- old_time = new_time; > -- return (ticks > 0) ? ticks : 1; > --} > -- > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -17,54 +18,62 @@ > - #ifndef _LINUX_MODULE_H_ > - #define _LINUX_MODULE_H_ > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - #include > --#include > --#include > --#include > --#include > - > --/* module settings */ > -+#include > -+#define __BYTEORDER_HAS_U64__ > -+#ifdef LITTLE_ENDIAN > -+ #include > -+#else > -+ #include > -+#endif > - > -+/* module settings */ > -+#define min(A,B) ((A)<(B)?(A):(B)) > -+#ifndef STR > - #define STR(s) __STR__(s) > - #define __STR__(s) #s > -+#endif > - #include "tpm_version.h" > - > - #define TPM_DEVICE_MINOR 224 > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > --/* debug and log output functions */ > -- > - #ifdef DEBUG > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - #else > - #define debug(fmt, ...) > - #endif > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > - static inline void *tpm_malloc(size_t size) > - { > -- return kmalloc(size, GFP_KERNEL); > -+ return malloc(size); > - } > - > - static inline void tpm_free(const void *ptr) > - { > -- if (ptr != NULL) kfree(ptr); > -+ if (ptr != NULL) free( (void *) ptr); > - } > - > - /* random numbers */ > - > -+//FIXME; > -+void get_random_bytes(void *buf, int nbytes); > -+ > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > - { > - get_random_bytes(buf, nbytes); > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > - > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > - > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,24 +1,40 @@ > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > - # Copyright (C) 2004 Mario Strasser > -+# Copyright (C) 2006 INTEL Corp. > - # > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > - > --# kernel settings > --KERNEL_RELEASE := $(shell uname -r) > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > --MOD_SUBDIR := misc > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --MODULE_NAME := tpm_emulator > -+BIN := tpm_emulator > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > - > --# enable/disable DEBUG messages > --EXTRA_CFLAGS += -Wall -DDEBUG -g > -+# Installation program and options > -+INSTALL = install > -+INSTALL_PROG = $(INSTALL) -m0755 > -+INSTALL_DIR = $(INSTALL) -d -m0755 > -+ > -+# Xen tools installation directory > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > -+ > -+CC := gcc > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > -+CFLAGS += -I. -Itpm > -+ > -+# Is the simulator running in it's own vm? > -+#CFLAGS += -DVTPM_MULTI_VM > -+ > -+ifeq ($(COMPILE_ARCH),x86_64) > -+LIBDIR = lib64 > -+else > -+LIBDIR = lib > -+endif > - > - # GNU MP configuration > --GMP_LIB := /usr/lib/libgmp.a > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > - # sources and objects > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > - > --obj-m := $(MODULE_NAME).o > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > -+obj-m := $(BIN) > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > - > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > - > - # do not print "Entering directory ..." > - MAKEFLAGS += --no-print-directory > - > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > -+all: $(BIN) > - > --install: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > -- test -d /var/tpm || mkdir /var/tpm > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > -- chmod 666 /dev/tpm > -- depmod -a > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > -+ > -+%.o: %.c > -+ $(CC) $(CFLAGS) -c $< -o $@ > -+ > -+install: $(BIN) > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > - > --dist: $(DISTSRC) > -- rm -rf $(DISTDIR) > -- mkdir $(DISTDIR) > -- cp --parents $(DISTSRC) $(DISTDIR)/ > -- rm -f $(DISTDIR)/crypto/gmp.h > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > -- rm -rf $(DISTDIR) > -+mrproper: clean > -+ rm -f $(BIN) tpm_version.h > - > - $(src)/crypto/libgmp.a: > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > -@@ -88,4 +98,3 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -- > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > - Copyright > - -------------------------------------------------------------------------- > - Copyright (C) 2004 Mario Strasser and Swiss Federal > --Institute of Technology (ETH) Zurich. > -+ Institute of Technology (ETH) Zurich. > -+Copyright (C) 2005 INTEL Corp > - > - This program is free software; you can redistribute it and/or modify > - it under the terms of the GNU General Public License as published by > -@@ -43,6 +44,12 @@ Example: > - GMP_LIB := /usr/lib/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > -+GNU MP Library on 64 bit Systems > -+-------------------------------------------------------------------------- > -+Some 64-bit kernels have problems with importing the user-space gmp > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > -+ > - Installation > - -------------------------------------------------------------------------- > - The compilation and installation process uses the build environment for > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > - TPM_RESULT res; > - > - info("TPM_GetCapabilityOwner()"); > -- > -+ > -+ if (!tpmData.permanent.flags.owned) { > -+ return TPM_NOSRK; > -+ } > - /* Verify owner authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > - if (res != TPM_SUCCESS) return res; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > - > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > - { > -- UINT32 key_length; > -+ size_t key_length; > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > - /* setup TPM_PUBKEY structure */ > -- key_length = tpmData.permanent.data.endorsementKey.size; > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > -- pubEndorsementKey->pubKey.key, > -- &pubEndorsementKey->pubKey.keyLength); > -+ pubEndorsementKey->pubKey.key, > -+ &key_length); > -+ pubEndorsementKey->pubKey.keyLength = key_length; > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - { > - TPM_RESULT res; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -+ size_t key_length; > - info("TPM_OwnerReadInternalPub()"); > - /* verify authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > -- &publicPortion->pubKey.keyLength); > -+ &key_length); > -+ publicPortion->pubKey.keyLength = key_length; > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > - publicPortion->algorithmParms.encScheme = srk->encScheme; > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ UINT32 length32; > -+ size_t length; > - info("TPM_CertifyKey()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32=(UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - sha1_init(&sha1_ctx); > -- sha1_update(&sha1_ctx, buf, length); > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > - sha1_final(&sha1_ctx, buf); > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > - tpm_free(buf); > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ size_t length; > -+ UINT32 length32; > - info("TPM_CertifyKey2()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32 = (UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_update(&sha1, inputData1, inputSize1); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > - } > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > - rsa_export_modulus(&aikData->key, scratch, &size); > - sha1_update(&sha1, scratch, size); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > - void tpm_init_data(void) > - { > - /* endorsement key */ > -+#ifndef TPM_GENERATE_EK > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > -+#endif > -+ > - int i; > - /* reset all data to NULL, FALSE or 0 */ > - memset(&tpmData, 0, sizeof(tpmData)); > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > - > - #ifdef TPM_STORE_TO_FILE > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (IS_ERR(fp)) return -1; > -- set_fs(get_ds()); > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ int fp; > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -+ res = write(fp, data, data_length); > -+ close(fp); > - return (res == data_length) ? 0 : -1; > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- if (IS_ERR(fp)) return -1; > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > -+ int fp, file_status; > -+ struct stat file_info; > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -+ file_status = fstat(fp, &file_info); > -+ if (file_status < 0) { > -+ close(fp); > -+ return -1; > -+ } > -+ > -+ *data_length = file_info.st_size; > - *data = tpm_malloc(*data_length); > - if (*data == NULL) { > -- filp_close(fp, NULL); > -+ close(fp); > - return -1; > - } > -- set_fs(get_ds()); > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ res = read(fp, *data, *data_length); > -+ close(fp); > - if (res != *data_length) { > - tpm_free(*data); > - return -1; > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > - int tpm_store_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ UINT32 buf_length, len; > - > - /* marshal data */ > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > - buf = ptr = tpm_malloc(buf_length); > - if (buf == NULL > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - if (write_to_file(buf, buf_length - len)) { > - tpm_free(buf); > - return -1; > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > - int tpm_restore_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ size_t buf_length; > -+ UINT32 len; > - TPM_VERSION ver; > - > - /* read data */ > - if (read_from_file(&buf, &buf_length)) return -1; > - ptr = buf; > -- len = buf_length; > -+ len = (uint32_t) buf_length; > - /* unmarshal data */ > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - tpm_free(buf); > - return 0; > - } > - > - int tpm_erase_permanent_data(void) > - { > -- int res = write_to_file("", 0); > -+ int res = write_to_file((uint8_t *) "", 0); > - return res; > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveKeyContext()"); > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > - keyContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *keyContextSize; > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveAuthContext()"); > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > - authContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *authContextSize; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -22,7 +23,8 @@ > - /* TPM configuration */ > - #define TPM_STORE_TO_FILE 1 > - #undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+//#undef TPM_GENERATE_EK > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > - > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > - { > -- UINT32 m_len, e_len, q_len; > -+ size_t m_len, e_len, q_len; > - if (*length < sizeof_RSA((*v))) return -1; > - if (v->size > 0) { > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > - return 0; > - } > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > - { > - if (tpm_marshal_BYTE(ptr, length, v->type) > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - TPM_RESULT res; > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -- UINT32 buf_size = ek->size >> 3; > -+ size_t buf_size = ek->size >> 3, key_length; > - BYTE buf[buf_size]; > - > - info("TPM_TakeOwnership()"); > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - return TPM_FAIL; > - } > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > -- &srkPub->pubKey.keyLength); > -+ &key_length); > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > - /* setup tpmProof and set state to owned */ > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > - { > - int i; > -+ int restore_fail; > - info("TPM_Startup(%d)", startupType); > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > -- /* reset STANY_FLAGS */ > -- SET_TO_ZERO(&tpmData.stany.flags); > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -- /* reset STANY_DATA (invalidates ALL sessions) */ > -- SET_TO_ZERO(&tpmData.stany.data); > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -- /* init session-context nonce */ > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > -+ > -+ /* try and restore state to get EK, SRK, etc */ > -+ restore_fail = tpm_restore_permanent_data(); > -+ > - /* set data and flags according to the given startup type */ > - if (startupType == TPM_ST_CLEAR) { > -- /* if available, restore permanent data */ > -- tpm_restore_permanent_data(); > -+ /* reset STANY_FLAGS */ > -+ SET_TO_ZERO(&tpmData.stany.flags); > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > -+ SET_TO_ZERO(&tpmData.stany.data); > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -+ /* init session-context nonce */ > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > - /* reset PCR values */ > - for (i = 0; i < TPM_NUM_PCR; i++) { > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > - else > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > - } > - /* reset STCLEAR_FLAGS */ > - SET_TO_ZERO(&tpmData.stclear.flags); > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > - /* init key-context nonce */ > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > - } else if (startupType == TPM_ST_STATE) { > -- if (tpm_restore_permanent_data()) { > -+ /* restore must have been successful for TPM_ST_STATE */ > -+ if (restore_fail) { > - error("restoring permanent data failed"); > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - BYTE *enc, UINT32 *enc_size) > - { > - UINT32 len; > -+ size_t enc_size32 = *enc_size; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > -- enc, enc_size)) { > -+ enc, &enc_size32)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_SEALED_DATA *seal, BYTE **buf) > - { > -- UINT32 len; > -+ size_t len; > -+ UINT32 len32; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = len; > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > - > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > - BYTE *inData, TPM_AUTH *auth1, > -- UINT32 *outDataSize, BYTE **outData) > -+ UINT32 *outDataSize32, BYTE **outData) > - { > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - int scheme; > -+ size_t outDataSize; > - > - info("TPM_UnBind()"); > - /* get key */ > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - /* the size of the input data muss be greater than zero */ > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > - /* decrypt data */ > -- *outDataSize = inDataSize; > -- *outData = tpm_malloc(*outDataSize); > -+ outDataSize = inDataSize; > -+ *outData = tpm_malloc(outDataSize); > - if (*outData == NULL) return TPM_NOSPACE; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > - } > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > -- *outData, outDataSize)) { > -+ *outData, &outDataSize)) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > - /* verify data if it is of type TPM_BOUND_DATA */ > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > - || key->keyUsage != TPM_KEY_LEGACY) { > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > -- *outDataSize -= 5; > -- memmove(*outData, &(*outData)[5], *outDataSize); > -+ outDataSize -= 5; > -+ memmove(*outData, &(*outData)[5], outDataSize); > - } > -+ *outDataSize32 = (UINT32) outDataSize; > - return TPM_SUCCESS; > - } > - > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > - } > - > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > -- BYTE *enc, UINT32 *enc_size) > -+ BYTE *enc, UINT32 *enc_size32) > - { > - UINT32 len; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -+ size_t enc_size; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > -- enc, enc_size)) { > -+ enc, &enc_size)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > - } > -+ *enc_size32 = (UINT32) enc_size; > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return 0; > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_STORE_ASYMKEY *store, BYTE **buf) > - { > -- UINT32 len; > -+ UINT32 len32; > -+ size_t len; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = (UINT32) len; > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - TPM_SESSION_DATA *session; > - TPM_STORE_ASYMKEY store; > - rsa_private_key_t rsa; > -- UINT32 key_length; > -+ size_t key_length; > - > - info("TPM_CreateWrapKey()"); > - /* get parent key */ > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - } > - } > - /* generate key and store it */ > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > -- wrappedKey->pubKey.keyLength = key_length >> 3; > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > -+ return TPM_FAIL; > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > -- store.privKey.keyLength = key_length >> 4; > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > - wrappedKey->encDataSize = parent->key.size >> 3; > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - tpm_free(wrappedKey->encData); > - return TPM_NOSPACE; > - } > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -- &wrappedKey->pubKey.keyLength); > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -+ &key_length); > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > -+ store.privKey.keyLength = (UINT32) key_length; > - rsa_release_private_key(&rsa); > - /* compute the digest of the wrapped key (without encData) */ > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > - > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > - { > -+ size_t key_length; > - parms->algorithmID = TPM_ALG_RSA; > - parms->encScheme = key->encScheme; > - parms->sigScheme = key->sigScheme; > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > - if (parms->parms.rsa.exponent == NULL) return -1; > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > -- &parms->parms.rsa.exponentSize); > -+ &key_length); > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > - return 0; > - } > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - TPM_DIGEST digest; > -+ size_t key_length; > - info("TPM_GetPubKey()"); > - /* get key */ > - if (keyHandle == TPM_KH_SRK > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - pubKey->pubKey.keyLength = key->key.size >> 3; > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > -- &pubKey->pubKey.keyLength); > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > - tpm_free(pubKey->pubKey.key); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > - TPM_DIGEST DAA_digest_gamma; > - BYTE DAA_generic_q[26]; > - } TPM_DAA_ISSUER; > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > - > - /* > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > - TPM_DIGEST DAA_rekey; > - UINT32 DAA_count; > - } TPM_DAA_TPM; > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > - > - /* > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > - BYTE DAA_scratch[256]; > - BYTE DAA_stage; > - } TPM_DAA_CONTEXT; > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > - > - /* > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > - BYTE DAA_join_u1[138]; > - TPM_DIGEST DAA_digest_n0; > - } TPM_DAA_JOINDATA; > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > - > - /* > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > - //UINT32 ownerReference; > - //BOOL disableResetLock; > - } TPM_STCLEAR_DATA; > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > - > - /* > - * TPM_SESSION_DATA > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > - TPM_DAA_JOINDATA DAA_joinSession; > - TPM_HANDLE handle; > - } TPM_DAA_SESSION_DATA; > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > - > - /* > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > - TPM_DAAHANDLE currentDAA; > - TPM_TRANSHANDLE transExclusive; > - } TPM_STANY_DATA; > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > - > - /* > - * TPM_DATA > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > - struct { > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > - } test_cases[] = {{ > -- "abc", 1, > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > -+ (uint8_t*)"abc", 1, > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > - }, { > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > - }, { > -- "a", 1000000, > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > -+ (uint8_t*)"a", 1000000, > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > - }, { > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > - }}; > - > - debug("tpm_test_sha1()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > - sha1_init(&ctx); > - for (j = 0; j < test_cases[i].repetitions; j++) > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - sha1_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > - } > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > - struct { > - uint8_t *key, key_len, *data, data_len, *digest; > - } test_cases[] = {{ > -- "\x0b", 20, "Hi There", 8, > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > - }, { > -- "Jefe", 4, "what do ya want for nothing?", 28, > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > - }, { > -- "\xaa", 20, "\xdd", 50, > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > - }, { > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > - }, { > -- "\x0c", 20, "Test With Truncation", 20, > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > - }, { > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > - }, { > -- "\xaa", 80, > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > -+ (uint8_t*)"\xaa", 80, > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > - }}; > - > - debug("tpm_test_hmac()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > - uint8_t key[test_cases[i].key_len]; > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > - hmac_init(&ctx, key, test_cases[i].key_len); > - } else { > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > - } > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - } > - hmac_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > - static int tpm_test_rsa_EK(void) > - { > - int res = 0; > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > - uint8_t buf[256]; > -- size_t buf_len, data_len = strlen(data); > -+ size_t buf_len, data_len = strlen((char*)data); > - rsa_private_key_t priv_key; > - rsa_public_key_t pub_key; > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > - { > - info("TPM_GetTicks()"); > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > -- sizeof(TPM_CURRENT_TICKS)); > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > - TPM_CURRENT_TICKS *currentTicks, > - UINT32 *sigSize, BYTE **sig) > - { > -- TPM_RESULT res; > -- TPM_KEY_DATA *key; > -- BYTE *info, *p; > -- UINT32 info_length, length; > - info("TPM_TickStampBlob()"); > -- /* get key */ > -- key = tpm_get_key(keyHandle); > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > -- /* verify authorization */ > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > -- if (res != TPM_SUCCESS) return res; > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > -- /* get current ticks */ > -- TPM_GetTicks(currentTicks); > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > -- *sigSize = key->key.size >> 3; > -- *sig = tpm_malloc(*sigSize); > -- if (*sig == NULL) return TPM_FAIL; > -- /* setup TPM_SIGN_INFO structure */ > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > -- info = tpm_malloc(info_length); > -- if (info == NULL) { > -- tpm_free(*sig); > -- return TPM_FAIL; > -- } > -- memcpy(&info[0], "\x05\x00TSTP", 6); > -- memcpy(&info[6], antiReplay->nonce, 20); > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > -- p = &info[30 + sizeof(TPM_DIGEST)]; > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > -- tpm_free(*sig); > -- tpm_free(info); > -- return TPM_FAIL; > -- } > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - void tpm_update_ticks(void) > - { > -- if (tpmData.stany.data.currentTicks.tag == 0) { > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > --*/ > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > -- sizeof(TPM_NONCE)); > -- tpmData.stany.data.currentTicks.tickRate = 1; > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > --*/ > -- } else { > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > -- } > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "in", 2); > -+ sha1_update(&sha1, (BYTE*)"in", 2); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "out", 3); > -+ sha1_update(&sha1, (BYTE*)"out", 3); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -0,0 +1,156 @@ > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -+ * Copyright (C) 2005 INTEL Corp > -+ * > -+ * This module is free software; you can redistribute it and/or modify > -+ * it under the terms of the GNU General Public License as published > -+ * by the Free Software Foundation; either version 2 of the License, > -+ * or (at your option) any later version. > -+ * > -+ * This module is distributed in the hope that it will be useful, > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -+ * GNU General Public License for more details. > -+ * > -+ */ > -+ > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+ > -+#include "tpm_emulator.h" > -+ > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+ > -+#define BUFFER_SIZE 2048 > -+ > -+static int devurandom=0; > -+ > -+void get_random_bytes(void *buf, int nbytes) { > -+ > -+ if (devurandom == 0) { > -+ devurandom = open("/dev/urandom", O_RDONLY); > -+ } > -+ > -+ if (read(devurandom, buf, nbytes) != nbytes) { > -+ printf("Can't get random number.\n"); > -+ exit(-1); > -+ } > -+} > -+ > -+uint64_t tpm_get_ticks(void) > -+{ > -+ //struct timeval tv; > -+ //int gettimeofday(&tv, struct timezone *tz); > -+ return 0; > -+} > -+ > -+int main(int argc, char **argv) > -+{ > -+ uint8_t in[BUFFER_SIZE], *out; > -+ uint32_t out_size; > -+ int in_size, written; > -+ int i; > -+ struct stat file_info; > -+ > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+ if (argc < 2) { > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > -+ return -1; > -+ } > -+ > -+ /* initialize TPM emulator */ > -+ if (!strcmp(argv[1], "clear")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(1); > -+ } else if (!strcmp(argv[1], "save")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(2); > -+ } else if (!strcmp(argv[1], "deactivated")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(3); > -+ } else { > -+ printf("invalid startup mode '%s'; must be 'clear', " > -+ "'save' (default) or 'deactivated", argv[1]); > -+ return -1; > -+ } > -+ > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ while (1) { > -+abort_command: > -+ if (tpm_rx_fh < 0) { > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ } > -+ > -+ if (tpm_rx_fh < 0) { > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > -+ return -1; > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ if (in_size < 6) { // Magic size of minium TPM command > -+ printf("Recv[%d] to small: 0x", in_size); > -+ if (in_size <= 0) { > -+ close(tpm_rx_fh); > -+ tpm_rx_fh = -1; > -+ goto abort_command; > -+ } > -+ } else { > -+ printf("Recv[%d]: 0x", in_size); > -+ for (i=0; i< in_size; i++) > -+ printf("%x ", in[i]); > -+ printf("\n"); > -+ } > -+ > -+ > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -+ printf("ERROR: Handler Failed.\n"); > -+ } > -+ > -+ written = write(tpm_tx_fh, out, out_size); > -+ > -+ if (written != out_size ) { > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ } else { > -+ printf("Sent[%Zu]: ", out_size); > -+ } > -+ for (i=0; i< out_size; i++) > -+ printf("%x ", out[i]); > -+ printf("\n"); > -+ tpm_free(out); > -+ > -+ } // loop > -+ > -+ tpm_emulator_shutdown(); > -+ > -+ close(tpm_tx_fh); > -+ close(tpm_rx_fh); > -+ > -+} > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > -@@ -2,5 +2,5 @@ > - #define _TPM_VERSION_H_ > - #define VERSION_MAJOR 0 > - #define VERSION_MINOR 4 > --#define VERSION_BUILD 1151058734 > -+#define VERSION_BUILD 1153776940 > - #endif /* _TPM_VERSION_H_ */ > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > deleted file mode 100644 > index 95586c1..0000000 > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile > -+++ tpm_emulator-0.5.1/tpmd/Makefile > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > - CFLAGS += -I../../../../tools/vtpm_manager/manager > --LDFLAGS += -lgmp > -+LDLIBS += -lgmp > - > - BINDIR := /usr/bin/ > - > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > deleted file mode 100644 > index 2aeb745..0000000 > --- a/tools/vtpm/vtpm-0.5.1.patch > +++ /dev/null > @@ -1,766 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > - VERSION_BUILD := $(shell date +"%s") > - VERSION_SUFFIX := .1 > - > --SUBDIRS := tpmd tpmd_dev tddl > -+SUBDIRS := tpmd > - > - all: version all-recursive > - > -@@ -48,12 +48,12 @@ user_install: user > - modules_install: modules > - @$(MAKE) -C tpmd_dev install || exit -1 > - > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpm crypto tpmd > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpmd > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > - > - dist: $(DISTSRC) > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > -+ > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > -+ > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - -Wwrite-strings -Wsign-compare -Wno-multichar > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > - LDFLAGS += -lgmp > - > --BINDIR := /usr/sbin/ > -+BINDIR := /usr/bin/ > - > - TPMD := tpmd > - DIRS := ../tpm ../crypto > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > - > -+VTPM_BIN := vtpmd > -+ > - vpath %.c $(strip $(DIRS)) > - > - all: $(TPMD) > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > - INSTALL ?= install > - > - install: $(TPMD) > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > - > - .PHONY: all clean install > - > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > -@@ -32,6 +32,9 @@ > - #include > - #include "tpm_emulator_config.h" > - #include "tpm/tpm_emulator.h" > -+#include "tpm/tpm_structures.h" > -+#include "tpm/tpm_marshalling.h" > -+#include "vtpm_manager.h" > - > - #define TPM_DAEMON_NAME "tpmd" > - #define TPM_CMD_BUF_SIZE 4096 > -@@ -39,6 +42,24 @@ > - #define TPM_RANDOM_DEVICE "/dev/urandom" > - #undef TPM_MKDIRS > - > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+ > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ static char *vtpm_rx_name=NULL; > -+#endif > -+ > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#define BUFFER_SIZE 2048 > -+ > - static volatile int stopflag = 0; > - static int is_daemon = 0; > - static int opt_debug = 0; > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > - static uid_t opt_uid = 0; > - static gid_t opt_gid = 0; > - static int tpm_startup = 2; > -+static int vtpm_type = VTPM_TYPE_PVM; > -+int dmi_id = 0; > - static int rand_fh; > - > - void tpm_log(int priority, const char *fmt, ...) > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > - > - int tpm_write_to_file(uint8_t *data, size_t data_length) > - { > -- int fh; > -- ssize_t res; > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (fh < 0) return -1; > -- while (data_length > 0) { > -- res = write(fh, data, data_length); > -- if (res < 0) { > -- close(fh); > -- return -1; > -- } > -- data_length -= res; > -- data += res; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > - { > -- int fh; > -- ssize_t res; > -- size_t total_length; > -- fh = open(opt_storage_file, O_RDONLY); > -- if (fh < 0) return -1; > -- total_length = lseek(fh, 0, SEEK_END); > -- lseek(fh, 0, SEEK_SET); > -- *data = tpm_malloc(total_length); > -- if (*data == NULL) { > -- close(fh); > -- return -1; > -- } > -- *data_length = 0; > -- while (total_length > 0) { > -- res = read(fh, &(*data)[*data_length], total_length); > -- if (res < 0) { > -- close(fh); > -- tpm_free(*data); > -- return -1; > -- } > -- *data_length += res; > -- total_length -= res; > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ printf("Error in read_from_file:301\n"); > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > -+ printf("Error in read_from_file:325\n"); > -+ > -+ return -1; > -+ } > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) > -+ { > -+ printf("Error in read_from_file:335\n"); > -+ return -1; > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ printf("Error in read_from_file:352\n"); > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ printf("Error in read_from_file:375\n"); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ printf("Error in read_from_file:381\n"); > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > -+ if (res != (int)*data_length) { > -+ free(*data); > -+ printf("Error in read_from_file:398\n"); > -+ return -1; > -+ } else { > -+ return 0; > -+ } > -+ > -+ > -+ > - } > - > - static void print_usage(char *name) > - { > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > -+ "[-o user name] [-g group name] [-h]" > -+#ifdef VTPM_MULTI_VM > -+ "clear|save|deactivated\n", name); > -+#else > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > -+#endif > - printf(" d : enable debug mode\n"); > - printf(" f : forces the application to run in the foreground\n"); > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > - exit(EXIT_SUCCESS); > - } > - } > -- if (optind < argc) { > -+ /*Make sure we have all required options*/ > -+#ifdef VTPM_MULTI_VM > -+#define EXTRA_OPTS 0 > -+#else > -+#define EXTRA_OPTS 2 > -+#endif > -+ if (optind < argc - EXTRA_OPTS ) { > - debug("startup mode = '%s'", argv[optind]); > - if (!strcmp(argv[optind], "clear")) { > - tpm_startup = 1; > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > - print_usage(argv[0]); > - exit(EXIT_SUCCESS); > - } > -+#ifndef VTPM_MULTI_VM > -+ ++optind; > -+ if(!strcmp(argv[optind], "pvm")) { > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[optind], "hvm")) { > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("Invalid vm mode '%s'; must be 'pvm', " > -+ "or 'hvm' ", argv[optind]); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > -+ } > -+ ++optind; > -+ dmi_id = atoi(argv[optind]); > -+#endif > -+ } else { > -+ error("Invalid number of arguments"); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > - } > - } > - > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > - > - static void main_loop(void) > - { > -- int sock, fh, res; > -- int32_t in_len; > -+ int32_t in_len, written; > - uint32_t out_len; > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > -+ int guest_id=-1; > -+ int i; > -+ char *vtpm_rx_file=NULL; > -+ int res; > -+ > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > - struct sockaddr_un addr; > -- socklen_t addr_len; > -- fd_set rfds; > -- struct timeval tv; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifndef VTPM_MULTI_VM > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > - > - info("staring main loop"); > -- /* open UNIX socket */ > -- sock = init_socket(opt_socket_name); > -- if (sock < 0) exit(EXIT_FAILURE); > - /* init tpm emulator */ > -- debug("initializing TPM emulator: %d", tpm_startup); > -+#ifdef VTPM_MULTI_VM > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > -+#else > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > -+#endif > - tpm_emulator_init(tpm_startup); > - /* start command processing */ > - while (!stopflag) { > - /* wait for incomming connections */ > - debug("waiting for connections..."); > -- FD_ZERO(&rfds); > -- FD_SET(sock, &rfds); > -- tv.tv_sec = 10; > -- tv.tv_usec = 0; > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(sock) failed: %s", strerror(errno)); > -- break; > -- } else if (res == 0) { > -- continue; > -- } > -- addr_len = sizeof(addr); > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > -- if (fh < 0) { > -- error("accept() failed: %s", strerror(errno)); > -- continue; > -- } > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) > -+ { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > -+ } > -+ > -+ /*Error Checking*/ > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > -+ exit(-1); > -+ } > -+ > - /* receive and handle commands */ > - in_len = 0; > - do { > - debug("waiting for commands..."); > -- FD_ZERO(&rfds); > -- FD_SET(fh, &rfds); > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > -- tv.tv_usec = 0; > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(fh) failed: %s", strerror(errno)); > -- close(fh); > -- break; > -- } else if (res == 0) { > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > -- info("connection closed due to inactivity"); > -- close(fh); > -- break; > --#else > -- continue; > --#endif > -- } > -- in_len = read(fh, in, sizeof(in)); > -- if (in_len > 0) { > -+ > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > -+ /*Magic size of minimum TPM command is 6*/ > -+ //FIXME Magic size check may not be required anymore > -+ if (in_len < 6) { > -+ info("Recv incomplete command of %d bytes.", in_len); > -+ if (in_len <= 0) { > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > -+ continue; > -+ } > -+ } else { > -+ /*Debug Printouts*/ > - debug("received %d bytes", in_len); > -+ debug_nostop("Recv[%d]: 0x", in_len); > -+ for (i=0; i< in_len; i++) > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > -+ /*Multiple Guest check*/ > -+ if (guest_id == -1) { > -+ guest_id = *((int32_t *) in); > -+ } else { > -+ if (guest_id != *((int32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ /*Open tx handle now*/ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ exit(-1); > -+ } > -+ > -+ /*Handle the TPM command now*/ > - out = NULL; > -- res = tpm_handle_command(in, in_len, &out, &out_len); > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > - if (res < 0) { > - error("tpm_handle_command() failed"); > - } else { > - debug("sending %d bytes", out_len); > -+ //FIXME this prepending may or may not be needed > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > -+ out_len += sizeof(uint32_t); > -+ /*End Prepend*/ > -+ > -+ /*Perform write operation now*/ > - while (out_len > 0) { > -- res = write(fh, out, out_len); > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > -+ > - if (res < 0) { > - error("write(%d) failed: %s", out_len, strerror(errno)); > - break; > -- } > -+ } else { > -+ debug_nostop("Sent[%Zu]: ", out_len); > -+ for (i=0; (unsigned int)i< out_len; i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > -+ } > - out_len -= res; > - } > - tpm_free(out); > -+ tpm_free(addressed_out); > - } > - } > - } while (in_len > 0); > -- close(fh); > -+ //close(fh); > - } > -+ > - /* shutdown tpm emulator */ > - tpm_emulator_shutdown(); > -- /* close socket */ > -- close(sock); > -- unlink(opt_socket_name); > -+ /* Close handles */ > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MULTI_VM > -+ close(vtpm_rx_fh); > -+ free(vtpm_rx_file); > -+#endif > - info("main loop stopped"); > - } > - > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > - /* open random device */ > - init_random(); > - /* init signal handlers */ > -- init_signal_handler(); > -+ //init_signal_handler(); > - /* unless requested otherwiese, fork and daemonize process */ > -- if (!opt_foreground) daemonize(); > -+ //if (!opt_foreground) daemonize(); > - /* start main processing loop */ > - main_loop(); > - info("stopping TPM Emulator daemon"); > - closelog(); > - return 0; > - } > -+ > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > -@@ -29,23 +29,28 @@ > - > - /* TPM emulator configuration */ > - > --#undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+#define TPM_STRONG_PERSISTENCE > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > - > -+extern int dmi_id; > -+ > - /* log macros */ > - > - void tpm_log(int priority, const char *fmt, ...); > - > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > - > - /* min/max macros that also do strict type-checking */ > - > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > deleted file mode 100644 > index e896b25..0000000 > --- a/tools/vtpm/vtpm.patch > +++ /dev/null > @@ -1,716 +0,0 @@ > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,3 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > --INTEL Corp <> [Dropped to Ring3] > -+INTEL Corp <> [VTPM Extensions] > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,5 +1,6 @@ > - ????-??-?? Intel Corp > - * Moved module out of kernel to run as a ring 3 app > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > - > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > -@@ -44,18 +44,26 @@ > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > -+/* debug and log output functions */ > -+extern int dmi_id; > -+ > - #ifdef DEBUG > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > - #else > - #define debug(fmt, ...) > -+#define debug_nostop(fmt, ...) > -+#define debug_more(fmt, ...) > - #endif > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > -@@ -7,7 +7,7 @@ > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --BIN := tpm_emulator > -+BIN := vtpmd > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > - > - CC := gcc > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > --CFLAGS += -I. -Itpm > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > - > - # Is the simulator running in it's own vm? > - #CFLAGS += -DVTPM_MULTI_VM > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > - > - install: $(BIN) > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > -@@ -98,3 +97,4 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -+ > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > - return TPM_FAIL; > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > - sha1_ctx_t sha1; > - UINT32 res = CPU_TO_BE32(rsp->result); > - UINT32 ord = CPU_TO_BE32(ordinal); > -+ UINT32 offset = 0; > - > - /* compute SHA1 hash */ > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*)&res, 4); > - sha1_update(&sha1, (BYTE*)&ord, 4); > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > -+ if (ordinal == TPM_ORD_LoadKey2) { > -+ offset = 4; > -+ } > -+ if (rsp->paramSize - offset > 0) { > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > -+ } > - sha1_final(&sha1, rsp->auth1->digest); > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -15,10 +16,15 @@ > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > - */ > - > -+#include > -+#include > -+#include > -+#include > -+ > - #include "tpm_emulator.h" > - #include "tpm_structures.h" > - #include "tpm_marshalling.h" > --#include "linux_module.h" > -+#include "vtpm_manager.h" > - > - TPM_DATA tpmData; > - > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > - #include > - #include > - #include > --#include > - > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifdef VTPM_MUTLI_VM > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ extern int dmi_id; > -+ static char *vtpm_rx_name=NULL; > -+#endif > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > -- int res; > -- int fp; > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- res = write(fp, data, data_length); > -- close(fp); > -- return (res == data_length) ? 0 : -1; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > -- int res; > -- int fp, file_status; > -- struct stat file_info; > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- file_status = fstat(fp, &file_info); > -- if (file_status < 0) { > -- close(fp); > -- return -1; > -- } > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > - > -- *data_length = file_info.st_size; > -- *data = tpm_malloc(*data_length); > -- if (*data == NULL) { > -- close(fp); > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > - return -1; > - } > -- res = read(fp, *data, *data_length); > -- close(fp); > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > - if (res != *data_length) { > -- tpm_free(*data); > -- return -1; > -+ free(*data); > -+ return -1; > -+ } else { > -+ return 0; > - } > -- return 0; > -+ > - } > - > - #else > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > -@@ -21,12 +21,24 @@ > - #include > - #include > - #include > -+#include > -+#include > -+#include > - > - #include "tpm_emulator.h" > -+#include "vtpm_manager.h" > - > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > - > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+#endif > -+ > -+ int dmi_id; > -+ > - #define BUFFER_SIZE 2048 > - > - static int devurandom=0; > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > - } > - > - if (read(devurandom, buf, nbytes) != nbytes) { > -- printf("Can't get random number.\n"); > -+ error("Can't get random number.\n"); > - exit(-1); > - } > - } > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > - > - int main(int argc, char **argv) > - { > -- uint8_t in[BUFFER_SIZE], *out; > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > -+ char *vtpm_rx_file=NULL; > - uint32_t out_size; > - int in_size, written; > -- int i; > -- struct stat file_info; > -+ int i, guest_id=-1; > - > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > -+ struct sockaddr_un addr; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+ > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+#ifdef VTPM_MULTI_VM > - if (argc < 2) { > -- printf("Usage: tpmd clear|save|deactivated\n" ); > -+ error("Usage: tpmd clear|save|deactivated\n" ); > -+#else > -+ if (argc < 4) { > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > -+#endif > - return -1; > - } > - > -+#ifndef VTPM_MULTI_VM > -+ /* setup type of vm */ > -+ if (!strcmp(argv[2], "pvm")) { > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[2], "hvm")) { > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("invalid vTPM type '%s'.\n", argv[2]); > -+ } > -+ > -+ dmi_id = atoi(argv[3]); > -+ > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > -+ > -+#ifdef VTPM_MULTI_VM > -+ info("Initializing tpm state: %s\n", argv[1]); > -+#else > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > -+#endif > -+ > - /* initialize TPM emulator */ > - if (!strcmp(argv[1], "clear")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(1); > -- } else if (!strcmp(argv[1], "save")) { > -- printf("Initializing tpm: %s\n", argv[1]); > -+ } else if (!strcmp(argv[1], "save")) { > - tpm_emulator_init(2); > - } else if (!strcmp(argv[1], "deactivated")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(3); > - } else { > -- printf("invalid startup mode '%s'; must be 'clear', " > -+ error("invalid startup mode '%s'; must be 'clear', " > - "'save' (default) or 'deactivated", argv[1]); > - return -1; > - } > -- > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -- return -1; > -- } > -- } > -- > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -- return -1; > -- } > -- } > -- > -+ > - while (1) { > - abort_command: > -- if (tpm_rx_fh < 0) { > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > - } > - > -- if (tpm_rx_fh < 0) { > -- printf("ERROR: failed to open devices to listen to guest.\n"); > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > - return -1; > - } > - > -- if (tpm_tx_fh < 0) { > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -- } > -- > -- if (tpm_tx_fh < 0) { > -- printf("ERROR: failed to open devices to respond to guest.\n"); > -- return -1; > -- } > -- > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > - if (in_size < 6) { // Magic size of minium TPM command > -- printf("Recv[%d] to small: 0x", in_size); > -+ info("Recv incomplete command of %d bytes.", in_size); > - if (in_size <= 0) { > -- close(tpm_rx_fh); > -- tpm_rx_fh = -1; > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > - goto abort_command; > - } > - } else { > -- printf("Recv[%d]: 0x", in_size); > -+ debug_nostop("Recv[%d]: 0x", in_size); > - for (i=0; i< in_size; i++) > -- printf("%x ", in[i]); > -- printf("\n"); > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > - } > - > -- > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -- printf("ERROR: Handler Failed.\n"); > -+ if (guest_id == -1) { > -+ guest_id = *((uint32_t *) in); > -+ } else { > -+ if (guest_id != *((uint32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ // Handle the command, but skip the domain id header > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > -+ error("Handler Failed.\n"); > - } > - > -- written = write(tpm_tx_fh, out, out_size); > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > -+ > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > - > -- if (written != out_size ) { > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ if (written != out_size + sizeof(uint32_t)) { > -+ error("Part of response not written %d/%d.\n", written, out_size); > - } else { > -- printf("Sent[%Zu]: ", out_size); > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > - } > -- for (i=0; i< out_size; i++) > -- printf("%x ", out[i]); > -- printf("\n"); > - tpm_free(out); > -+ tpm_free(addressed_out); > - > - } // loop > - > - tpm_emulator_shutdown(); > - > -- close(tpm_tx_fh); > -- close(tpm_rx_fh); > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh); > -+ free (vtpm_rx_file); > -+#endif > - > - } > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > deleted file mode 100644 > index c4b86b7..0000000 > --- a/tools/vtpm_manager/COPYING > +++ /dev/null > @@ -1,32 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > deleted file mode 100644 > index 632f41b..0000000 > --- a/tools/vtpm_manager/Makefile > +++ /dev/null > @@ -1,18 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -SUBDIRS = crypto tcs util manager migration > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > - > -.PHONY: all clean install > -all clean install: %: subdirs-% > - > -.PHONY: mrproper > -mrproper: > - @set -e; for subdir in $(SUBDIRS); do \ > - $(MAKE) -C $$subdir $@; \ > - done > - > - > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > deleted file mode 100644 > index f0d1e98..0000000 > --- a/tools/vtpm_manager/README > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -Directory Structure > -=================== > -tools/vtpm_manager/crypto -> crypto files > -tools/vtpm_manager/TCS -> TCS implementation > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > -tools/vtpm_manager/manager -> VTPM Manager > - > -Compile Flags > -=================== > -LOGGING_MODULES -> How extensive logging happens > - see util/log.h for more info > - > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -# Debugging flags that may disappear without notice in the future > - > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > - /tmp/out.fifo rather than backend > - > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > - > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > - use a well known value. This is useful for debugging and for > - poor bios which do not support clearing TPM if OwnerAuth is > - lost. However this has no protection from malicious app > - issuing a TPM_OwnerClear to wipe the TPM > - > -Requirements > -============ > -- xen-unstable > -- vtpm frontend/backend driver patch > -- OpenSSL Library > - > -Single-VM Flow > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -NOTES: > -* SaveService SHOULD seal it's table before saving it to disk. However, > - the current Xen infrastructure does not provide a mechanism for this to be > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > - to the service, or it's not even worth encrypting > - > - In the future the vtpm manager will be protected by an early boot mechanism > - that will allow for better protection of it's data. > - > -TODO: > -- Timeout on crashed vtpms > -- create lock for shared fifo for talking to vtpms. > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > deleted file mode 100644 > index 651772b..0000000 > --- a/tools/vtpm_manager/Rules.mk > +++ /dev/null > @@ -1,59 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(FILES) > - > -# Make sure these are just rules > -.PHONY : all build install clean > - > -# > -# Project-specific definitions > -# > - > -# Need UNIX98 spec for pthread rwlocks > -CFLAGS += -D_GNU_SOURCE > - > -# Logging Level. See utils/tools.h for usage > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > - > -# Silent Mode > -#CFLAGS += -DLOGGING_MODULES=0x0 > -#CFLAGS += -DLOGGING_MODULES=0xff > - > -# Use frontend/backend pairs between manager & DMs? > -#CFLAGS += -DVTPM_MULTI_VM > - > -# vtpm_manager listens on fifo's rather than backend > -#CFLAGS += -DDUMMY_BACKEND > - > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > -#CFLAGS += -DDUMMY_TPM > - > -# Do not have manager launch DMs. > -#CFLAGS += -DMANUAL_DM_LAUNCH > - > -# Fixed OwnerAuth > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > - > -# Include > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > deleted file mode 100644 > index 13b61c9..0000000 > --- a/tools/vtpm_manager/crypto/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libtcpaCrypto.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > deleted file mode 100644 > index 7dae655..0000000 > --- a/tools/vtpm_manager/crypto/crypto.c > +++ /dev/null > @@ -1,88 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.c > -// > -// This file will handle all the TPM Crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include "crypto.h" > -#include "log.h" > - > -/** > - * Initialize cryptography library > - * @rand: random seed > - * @size: size of @rand > - */ > -void Crypto_Init(const BYTE* rand, int size) { > - ERR_load_crypto_strings(); > - CRYPTO_malloc_init(); > - OpenSSL_add_all_algorithms(); > - SYM_CIPHER = EVP_aes_128_cbc(); > - RAND_poll(); > - if (rand == NULL) > - return; > - > - RAND_add(rand, size, size); > -} > - > -/** > - * Shutdown cryptography library > - */ > -void Crypto_Exit() { > - ERR_free_strings(); > - ERR_remove_state(0); > - EVP_cleanup(); > -} > - > - > -/** > - * Get random data > - * @data: (OUT) Random data > - * @size: Size of @data > - */ > -void Crypto_GetRandom(void* data, int size) { > - int result; > - > - result = RAND_pseudo_bytes((BYTE*) data, size); > - > - if (result <= 0) > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > - ERR_error_string (ERR_get_error(), NULL)); > -} > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > deleted file mode 100644 > index 488d4d6..0000000 > --- a/tools/vtpm_manager/crypto/crypto.h > +++ /dev/null > @@ -1,175 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.h > -// > -// This file defines the TPM Crypto API > -// > -// ================================================================== > - > -#ifndef __CRYPTO_H__ > -#define __CRYPTO_H__ > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > - > -#define OAEP_P "TCPA" > -#define OAEP_P_SIZE 4 > - > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > -#define CRYPTO_ALGORITH_RSA 0x01 > - > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > -#define CRYPTO_ES_NONE 0x0001 > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// Supported Signature schemes CRYPTO_INFO.sigScheme > -#define CRYPTO_SS_NONE 0x0001 > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > - > -typedef struct CRYPTO_INFO { > - void *keyInfo; > - UINT32 algorithmID; > - UINT32 encScheme; > - UINT32 sigScheme; > -} CRYPTO_INFO; > - > - > -void Crypto_Init(const BYTE* rand, int size); > - > -void Crypto_Exit(); > - > -void Crypto_GetRandom(void* data, int size); > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest); > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest); /* presumably of 20 bytes */ > - > -void Crypto_SHA1Full( const BYTE* text, > - UINT32 size, > - BYTE* hash); //Complete 3part SHA1 > - > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_hash); > - > -void Crypto_SHA1Start(UINT32* maxNumBytes); > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > -void Crypto_SHA1Complete( int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue); > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys); > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo); > - > -// > -// symmetric pack and unpack operations > -// > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen); > - > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread); > - > - > -// return 0 on success, -1 on error > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSADec( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSASign( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig); > - > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig); > - > -//private: > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > - > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > - > -#endif // __CRYPTO_H__ > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > deleted file mode 100644 > index c73114a..0000000 > --- a/tools/vtpm_manager/crypto/hash.c > +++ /dev/null > @@ -1,153 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// hash.c > -// > -// This file will handle all the TPM Hash functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" // for TPM_SUCCESS > -#include "crypto.h" > - > -static SHA_CTX g_shaContext; > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest) { > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > - return; > - > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > -} > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest) { /* presumably of 20 bytes */ > - > - Crypto_HMAC (text->bytes, text->size, > - key->bytes, key->size, > - o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * SHA1 > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > - */ > -void Crypto_SHA1Full( const BYTE* text, > - uint32_t size, > - BYTE* hash) { > - > - if (text == NULL || size == 0) > - return; > - > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > - uint32_t maxBytes; // Not used for anything > - Crypto_SHA1Start(&maxBytes); > - > - while (size > 64){ > - Crypto_SHA1Update(64, text); > - size -= 64; > - text += 64; > - } > - > - Crypto_SHA1Complete(size, text, hash); > -} > - > -// same thing using buffer_t > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_digest) { > - > - if (buf->bytes == NULL || buf->size == 0) > - return TPM_BAD_PARAMETER; > - > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * Initialize SHA1 > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > - * Must be a multiple of 64 bytes. > - */ > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > - int max = SHA_CBLOCK; > - // Initialize the crypto library > - SHA1_Init(&g_shaContext); > - *maxNumBytes = max; > -} > - > -/* > - * Process SHA1 > - * @numBytes: (IN) The number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Bytes to be hashed. > - */ > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > - > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > - return; > - > - SHA1_Update(&g_shaContext, hashData, numBytes); > -} > - > -/* > - * Complete the SHA1 process > - * @hashDataSize: (IN) Number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Final bytes to be hashed. > - * @hashValue: (OUT) The output of the SHA-1 hash. > - */ > -void Crypto_SHA1Complete(int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue) { > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > - SHA1_Final(hashValue, &g_shaContext); > -} > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > deleted file mode 100644 > index 7737dc6..0000000 > --- a/tools/vtpm_manager/crypto/rsa.c > +++ /dev/null > @@ -1,434 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// rsa.c > -// > -// This file will handle all the TPM RSA crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "log.h" > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys) { > - unsigned long e_value; > - > - if (pubExpSize == 0) // Default e = 2^16+1 > - e_value = (0x01 << 16) + 1; > - else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - e_value = (0x01 << 16) + 1; > - } > - > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > - > - if (keys) { > - keys->keyInfo = rsa; > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > - } > - > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - > -} > - > -int Crypto_RSAEnc( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - return -1; > - > - *outDataSize = 0; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > - rc = -1; > - goto abort_egress; > - } > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > - rc = -1; > - goto abort_egress; > - } > - break; > - default: > - rc = -1; > - goto abort_egress; > - } > - > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > - if (rc == -1) > - goto abort_egress; > - > - *outDataSize = rc; > - > - if (rc > 0) rc = 0; > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (paddedData) > - free (paddedData); > - return rc; > - > -} > - > -int Crypto_RSADec( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - goto abort_egress; > - > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - > - paddedDataSize = rc; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa)); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa), > - (BYTE *) OAEP_P, OAEP_P_SIZE); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - default: > - *outDataSize = 0; > - } > - > - free(paddedData); paddedData = NULL; > - goto egress; > - > - abort_egress: > - > - if (paddedData) > - free (paddedData); > - return -1; > - > - egress: > - return 0; > -} > - > -// Signs either a SHA1 digest of a message or a DER encoding of a message > -// Textual messages MUST be encoded or Hashed before sending into this function > -// It will NOT SHA the message. > -int Crypto_RSASign( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig) { > - int status; > - unsigned int intSigSize; > - > - switch(key->sigScheme) { > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status == 0) { > - *sigSize = 0; > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > - return -1; > - } > - > - *sigSize = (UINT32) intSigSize; > - return 0; > -} > - > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig) { > - int status; > - > - switch(key->sigScheme){ > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status) > - return(1); > - else { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - return(0); > - } > - > -} > - > -// helper which packs everything into a BIO! > - > -// packs the parameters first, then the private key, then the public key > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > -// *io_buflen > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen) { > - TPM_RESULT status = TPM_SUCCESS; > - BYTE * buf; > - long len, outlen = *io_buflen; > - > - const long PARAMSLEN = 3*sizeof(UINT32); > - > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - BIO *mem = BIO_new(BIO_s_mem()); > - > - > - // write the openssl keys to the BIO > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - > - // get the buffer out > - len = BIO_get_mem_data (mem, &buf); > - > - // see if we need to allocate a return buffer > - if (*io_buf == NULL) { > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > - if (*io_buf == NULL) > - ERRORDIE (TPM_SIZE); > - } else { // *io_buf is already allocated > - if (outlen < len + PARAMSLEN) > - ERRORDIE (TPM_SIZE); // but not large enough! > - } > - > - // copy over the parameters (three UINT32's starting at algorithmID) > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > - > - // copy over the DER keys > - memcpy (*io_buf + PARAMSLEN, buf, len); > - > - *io_buflen = len + PARAMSLEN; > - > - goto egress; > - > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > - > - > - > -// sets up ci, and returns the number of bytes read in o_lenread > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread) { > - > - TPM_RESULT status = TPM_SUCCESS; > - long l; > - BIO *mem; > - RSA *rsa; > - > - // first load up the params > - l = 3 * sizeof(UINT32); > - memcpy (&ci->algorithmID, in, l); > - len -= l; > - in += l; > - > - // and now the openssl keys, private first > - mem = BIO_new_mem_buf (in, len); > - > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - // now use the same RSA object and fill in the private key > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - > - ci->keyInfo = rsa; // needs to be freed somehow later > - > - // FIXME: havent figured out yet how to tell how many bytes were read in the > - // above oprations! so o_lenread is not set > - > - goto egress; > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > deleted file mode 100644 > index 3d86e19..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.c > +++ /dev/null > @@ -1,237 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.c > -// > -// Symmetric crypto portion of crypto > -// > -// ================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -typedef enum crypt_op_type_t { > - CRYPT_ENCRYPT, > - CRYPT_DECRYPT > -} crypt_op_type_t; > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype); > - > - > -// this is initialized in Crypto_Init() > -const EVP_CIPHER * SYM_CIPHER = NULL; > - > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > - > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > - TPM_RESULT status = TPM_SUCCESS; > - > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > - int res; > - TPM_RESULT status = TPM_SUCCESS; > - > - // hmm, EVP_CIPHER_CTX_init does not return a value > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > - > - // and generate the key material > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > - if (res < 0) > - ERRORDIE (TPM_SHORTRANDOM); > - > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - buffer_free (&key->key); > - > - egress: > - return status; > -} > - > - > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > - > - buffer_init (o_cipher, > - clear->size + > - EVP_CIPHER_iv_length(key->cipher) + > - EVP_CIPHER_block_size (key->cipher), > - 0); > - > - // copy the IV into the front > - buffer_copy (o_cipher, &iv); > - > - // make an alias into which we'll put the ciphertext > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > - > - // set the output size correctly > - o_cipher->size += cipher_alias.size; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > - > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - // alias for the IV > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > - > - // make an alias to where the ciphertext is, after the IV > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - // prepare the output buffer > - TPMTRYRETURN( buffer_init (o_clear, > - cipher->size > - - EVP_CIPHER_iv_length(key->cipher) > - + EVP_CIPHER_block_size(key->cipher), > - 0) ); > - > - // and decrypt > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > - > - goto egress; > - > - abort_egress: > - buffer_free (o_clear); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > - buffer_memset (&key->key, 0); > - buffer_free (&key->key); > - > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - return TPM_SUCCESS; > -} > - > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype) { > - TPM_RESULT status = TPM_SUCCESS; > - > - int inlen, outlen; > - tpm_size_t running; > - > - if ( ! EVP_CipherInit_ex (&key->context, > - key->cipher, NULL, key->key.bytes, iv->bytes, > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > - ERRORDIE (TPM_FAIL); > - > - > - > - inlen = in->size; > - > - outlen = 0; > - running = 0; > - > - > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - out->size = running; > - > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > deleted file mode 100644 > index 7fb59a8..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.h > +++ /dev/null > @@ -1,72 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.h > -// > -// Symmetric Crypto > -// > -// ================================================================== > - > -#ifndef _SYM_CRYPTO_H > -#define _SYM_CRYPTO_H > - > -#include > -#include "buffer.h" > - > -typedef struct symkey_t { > - buffer_t key; > - > - EVP_CIPHER_CTX context; > - const EVP_CIPHER * cipher; > -} symkey_t; > - > -extern const EVP_CIPHER * SYM_CIPHER; > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > - > - > -// these functions will allocate their output buffers > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher); > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear); > - > -// only free the internal parts, not the 'key' ptr > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > - > -#endif /* _SYM_CRYPTO_H */ > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > deleted file mode 100644 > index a33c18a..0000000 > --- a/tools/vtpm_manager/manager/Makefile > +++ /dev/null > @@ -1,38 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = vtpm_managerd > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > - fi > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > - fi > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BIN) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > -CFLAGS += $(PTHREAD_CFLAGS) > -LDFLAGS += $(PTHREAD_LDFLAGS) > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > deleted file mode 100644 > index 5c3cf7e..0000000 > --- a/tools/vtpm_manager/manager/dmictl.c > +++ /dev/null > @@ -1,266 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -// if dmi_res is non-null, then return a pointer to new object. > -// Also, this does not fill in the measurements. They should be filled by > -// design dependent code or saveNVM > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > - > - TPM_RESULT status=TPM_SUCCESS; > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - UINT32 *dmi_id_key=NULL; > - > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > - new_dmi->dmi_id = dmi_id; > - new_dmi->dmi_type = dmi_type; > - new_dmi->connected = FALSE; > - new_dmi->TCSContext = 0; > - > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > - > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - *dmi_id_key = new_dmi->dmi_id; > - > - // install into map > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - if (dmi_res) > - *dmi_res = new_dmi; > - > - goto egress; > - > - abort_egress: > - if (new_dmi) { > - free(new_dmi->NVMLocation); > - free(new_dmi); > - } > - free(dmi_id_key); > - > - egress: > - return status; > -} > - > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > - if (dmi_res == NULL) > - return TPM_SUCCESS; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) > - return(TPM_BAD_PARAMETER); > - > - TCS_CloseContext(dmi_res->TCSContext); > - dmi_res->connected = FALSE; > - > - vtpm_globals->connected_dmis--; > - > - return (VTPM_Close_DMI_Extra(dmi_res) ); > -} > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > - > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - TPM_RESULT status=TPM_FAIL; > - BYTE dmi_type, vm_type, startup_mode; > - UINT32 dmi_id; > - > - if (param_buf == NULL) { // Assume creation of Dom 0 control > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > - dmi_id = VTPM_CTL_DM; > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } else { > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > - BSG_UnpackList( param_buf->bytes, 4, > - BSG_TYPE_BYTE, &dmi_type, > - BSG_TYPE_BYTE, &startup_mode, > - BSG_TYPE_BYTE, &vm_type, > - BSG_TYPE_UINT32, &dmi_id); > - } > - > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (new_dmi == NULL) { > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > - // Brand New DMI. Initialize the persistent pieces > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > - } else > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > - > - if (new_dmi->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Initialize the Non-persistent pieces > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > - > - new_dmi->connected = TRUE; > - > - // Design specific new DMI code. > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > - close_dmi(new_dmi ); > - > - egress: > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (!dmi_res->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Close Dmi > - TPMTRYRETURN(close_dmi( dmi_res )); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - //vtpm scripts delete file dmi_res->NVMLocation for us > - > - // Close DMI first > - TPMTRYRETURN(close_dmi( dmi_res )); > - free ( dmi_res ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > deleted file mode 100644 > index 54da708..0000000 > --- a/tools/vtpm_manager/manager/migration.c > +++ /dev/null > @@ -1,307 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > - UINT32 dmi_id; > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t enc_dmi_state_pack; > - > - BSG_UnpackList(param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** UnBind Blob **/ > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > - enc_dmi_state_pack.size, > - enc_dmi_state_pack.data) ); > - > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > - vtpm_globals->manager_tcs_handle, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - &clear_dmi_blob) ); > - > - // Create new dmi > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > - > - /** Open Blob **/ > - struct pack_buf_t dmi_state_pack; > - > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > - dmi_state_pack.size, > - dmi_state_pack.data) ); > - > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > - > - egress: > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state_abuf); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi; > - UINT32 dmi_id; > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t name_pack; > - > - BSG_UnpackList( param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &name_pack); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Find migration key for dest **/ > - last_mig = NULL; > - mig_key = vtpm_globals->mig_keys; > - while (mig_key != NULL) { > - if (mig_key->name_size == name_pack.size) > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > - break; > - } > - > - last_mig = mig_key; > - mig_key = mig_key->next; > - } > - > - if (!mig_key) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Mark vtpm as migrated **/ > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > - > - /** Build Blob **/ > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > - > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > - > - struct pack_constbuf_t dmi_state_pack; > - > - dmi_state_pack.size = buffer_len(&dmi_state); > - dmi_state_pack.data = dmi_state.bytes; > - > - BSG_PackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - /** Bind Blob **/ > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > - &mig_key->key, > - result_buf) ); > - > - if (last_mig) > - last_mig->next = mig_key->next; > - else > - vtpm_globals->mig_keys = mig_key->next; > - > - free(mig_key->name); > - free(mig_key); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > - > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > - > - egress: > - > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > - > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > - TPM_KEY mig_key; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - mig_key.algorithmParms.parms, > - &rsaKeyParms); > - > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > - pubkey_exp_pack.data = rsaKeyParms.exponent; > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > - pubkey_mod_pack.data = mig_key.pubKey.key; > - > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > - pubkey_exp_pack.size + > - pubkey_mod_pack.size, NULL ) ); > - > - BSG_PackList( result_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_MIGKEY_LIST *mig_key; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > - > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > - > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > - > - //FIXME: scan list and verify name is not already in the list > - > - BSG_UnpackList( param_buf->bytes, 3, > - BSG_TPM_SIZE32_DATA, &name_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - //TODO: Maintain a persistent list for pub_keys. > - //TODO: Verify pub_key is trusted > - > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > - mig_key->name_size = name_pack.size; > - mig_key->name = name_pack.data; > - > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > - pubkey_exp_pack.data, > - pubkey_mod_pack.size, > - pubkey_mod_pack.data, > - &mig_key->key); > - > - > - mig_key->next = vtpm_globals->mig_keys; > - vtpm_globals->mig_keys = mig_key; > - > - // free(name_pack.data); Do not free. data is now part of mig_key. > - free(pubkey_exp_pack.data); > - free(pubkey_mod_pack.data); > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > deleted file mode 100644 > index d5e6ffd..0000000 > --- a/tools/vtpm_manager/manager/securestorage.c > +++ /dev/null > @@ -1,512 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// securestorage.c > -// > -// Functions regarding securely storing DMI secrets. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "crypto.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "buffer.h" > -#include "log.h" > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data) { > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_cipher = NULL_BUF; > - > - UINT32 i; > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > - for (i=0; i< buffer_len(inbuf); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - // Generate a sym key and encrypt state with it > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > - > - // Encrypt symmetric key > - TPMTRYRETURN( VTSP_Bind( asymkey, > - &symkey.key, > - &symkey_cipher) ); > - > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > - > - symkey_cipher32.size = buffer_len(&symkey_cipher); > - symkey_cipher32.data = symkey_cipher.bytes; > - > - data_cipher32.size = buffer_len(&data_cipher); > - data_cipher32.data = data_cipher.bytes; > - > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > - > - BSG_PackList(sealed_data->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > - for (i=0; i< buffer_len(sealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > - > - egress: > - > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data) { > - > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_clear = NULL_BUF, > - symkey_cipher = NULL_BUF; > - struct pack_buf_t symkey_cipher32, data_cipher32; > - int i; > - > - memset(&symkey, 0, sizeof(symkey_t)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > - for (i=0; i< buffer_len(cipher); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - BSG_UnpackList(cipher->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > - symkey_cipher32.size, > - symkey_cipher32.data) ); > - > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > - data_cipher32.size, > - data_cipher32.data) ); > - > - // Decrypt Symmetric Key > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > - keyHandle, > - &symkey_cipher, > - key_usage_auth, > - &symkey_clear, > - &(vtpm_globals->keyAuth) ) ); > - > - // create symmetric key using saved bits > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > - > - // Decrypt State > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > - for (i=0; i< buffer_len(unsealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > - > - egress: > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_clear); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - long bytes_written; > - buffer_t sealed_NVM = NULL_BUF; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > - > - TPMTRYRETURN( envelope_encrypt(inbuf, > - &vtpm_globals->storageKey, > - &sealed_NVM) ); > - > - // Write sealed blob off disk from NVMLocation > - // TODO: How to properly return from these. Do we care if we return failure > - // after writing the file? We can't get the old one back. > - // TODO: Backup old file and try and recover that way. > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > - > - egress: > - buffer_free(&sealed_NVM); > - return status; > -} > - > - > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t sealed_NVM = NULL_BUF; > - long fh_size; > - int fh, stat_ret, i; > - struct stat file_stat; > - TPM_DIGEST sealedNVMHash; > - > - if (myDMI->NVMLocation == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - //Read sealed blob off disk from NVMLocation > - fh = open(myDMI->NVMLocation, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > - > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > - > - // Verify measurement of sealed blob. > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > - myDMI->TCSContext, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - outbuf) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > - > - egress: > - buffer_free( &sealed_NVM ); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_SaveManagerData(void) { > - TPM_RESULT status=TPM_SUCCESS; > - int fh, dmis=-1; > - > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > - > - struct hashtable_itr *dmi_itr; > - VTPM_DMI_RESOURCE *dmi_res; > - > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > - > - // Initially fill these with buffer sizes for each data type. Later fill > - // in actual size, once flattened. > - boot_key_size = sizeof(UINT32) + // bootkeysize > - bootKeySize; // boot key > - > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > - 3*sizeof(TPM_DIGEST) + // Auths > - sizeof(UINT32) +// storagekeysize > - storageKeySize, NULL) ); // storage key > - > - > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > - > - boot_key_size = BSG_PackList(flat_boot_key, 1, > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > - > - BSG_PackList(clear_flat_global.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > - &vtpm_globals->bootKey, > - &enc_flat_global) ); > - > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > - > - // Per DMI values to be saved (if any exit) > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > - > - flat_dmis = (BYTE *) malloc( > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > - > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - dmis++; > - > - // No need to save dmi0. > - if (dmi_res->dmi_id == 0) > - continue; > - > - > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - > - } while (hashtable_iterator_advance(dmi_itr)); > - } > - > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > - if (fh == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - goto egress; > - > - abort_egress: > - egress: > - > - free(flat_boot_key); > - free(flat_enc); > - buffer_free(&enc_flat_global); > - free(flat_dmis); > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > - return status; > -} > - > -TPM_RESULT VTPM_LoadManagerData(void) { > - > - TPM_RESULT status=TPM_SUCCESS; > - int fh, stat_ret, dmis=0; > - long fh_size = 0, step_size; > - BYTE *flat_table=NULL; > - buffer_t unsealed_data, enc_table_abuf; > - struct pack_buf_t storage_key_pack, boot_key_pack; > - UINT32 *dmi_id_key, enc_size; > - BYTE vtpm_manager_gen; > - > - VTPM_DMI_RESOURCE *dmi_res; > - UINT32 dmi_id; > - BYTE dmi_type; > - struct stat file_stat; > - > - TPM_HANDLE boot_key_handle; > - TPM_AUTHDATA boot_usage_auth; > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > - > - fh = open(STATE_FILE, O_RDONLY ); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - flat_table = (BYTE *) malloc(fh_size); > - > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Read Boot Key > - step_size = BSG_UnpackList( flat_table, 2, > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > - BSG_TYPE_UINT32, &enc_size); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > - > - //Load Boot Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - &SRK_AUTH, > - &boot_key_handle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->bootKey, > - FALSE) ); > - > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > - vtpm_globals->manager_tcs_handle, > - boot_key_handle, > - (const TPM_AUTHDATA*) &boot_usage_auth, > - &unsealed_data) ); > - step_size += enc_size; > - > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > - // Once there is more than one gen, this will include some compatability stuff > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > - } > - > - // Global Values needing to be saved > - BSG_UnpackList( unsealed_data.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > - > - // Per DMI values to be saved > - while ( step_size < fh_size ){ > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > - step_size = fh_size; > - } else { > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TYPE_BYTE, &dmi_type); > - > - //TODO: Try and gracefully recover from problems. > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > - dmis++; > - > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - } > - > - } > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > - egress: > - > - free(flat_table); > - close(fh); > - > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > deleted file mode 100644 > index 9b1e5f8..0000000 > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > +++ /dev/null > @@ -1,110 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmpassthrough.c > -// > -// Functions regarding passing DMI requests to HWTPM > -// > -// ================================================================== > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "log.h" > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE *ord; > - > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > - > - switch (*ord) { > - > - // Forbidden for DMI use > - case TPM_ORD_TakeOwnership: > - case TPM_ORD_ChangeAuthOwner: > - case TPM_ORD_DirWriteAuth: > - case TPM_ORD_DirRead: > - case TPM_ORD_AuthorizeMigrationKey: > - case TPM_ORD_CreateMaintenanceArchive: > - case TPM_ORD_LoadMaintenanceArchive: > - case TPM_ORD_KillMaintenanceFeature: > - case TPM_ORD_LoadManuMaintPub: > - case TPM_ORD_ReadManuMaintPub: > - case TPM_ORD_SelfTestFull: > - case TPM_ORD_SelfTestStartup: > - case TPM_ORD_CertifySelfTest: > - case TPM_ORD_ContinueSelfTest: > - case TPM_ORD_GetTestResult: > - case TPM_ORD_Reset: > - case TPM_ORD_OwnerClear: > - case TPM_ORD_DisableOwnerClear: > - case TPM_ORD_ForceClear: > - case TPM_ORD_DisableForceClear: > - case TPM_ORD_GetCapabilityOwner: > - case TPM_ORD_OwnerSetDisable: > - case TPM_ORD_PhysicalEnable: > - case TPM_ORD_PhysicalDisable: > - case TPM_ORD_SetOwnerInstall: > - case TPM_ORD_PhysicalSetDeactivated: > - case TPM_ORD_SetTempDeactivated: > - case TPM_ORD_CreateEndorsementKeyPair: > - case TPM_ORD_GetAuditEvent: > - case TPM_ORD_GetAuditEventSigned: > - case TPM_ORD_GetOrdinalAuditStatus: > - case TPM_ORD_SetOrdinalAuditStatus: > - case TPM_ORD_SetRedirection: > - case TPM_ORD_FieldUpgrade: > - case TSC_ORD_PhysicalPresence: > - status = TPM_DISABLED_CMD; > - goto abort_egress; > - break; > - > - } // End ORD Switch > - > - // Call TCS with command > - > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > - > - goto egress; > - > - abort_egress: > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > deleted file mode 100644 > index 319dc83..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > +++ /dev/null > @@ -1,141 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.c Implements ipc routines using file io. This file can > -// be replaced with other ipc types. > -// > -// =================================================================== > - > -#include > -#include "vtpm_ipc.h" > -#include "vtpmpriv.h" > -#include "log.h" > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > - ipc_h->name = name; > - ipc_h->flags = flags; > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - if (create) > - return(vtpm_ipc_create(ipc_h)); > - else > - return 0; > -} > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > - int fh; > - struct stat file_info; > - > - if ((!ipc_h) || (!ipc_h->name)) > - return -1; > - > - if ( stat(ipc_h->name, &file_info) == -1) { > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > - return -1; > - } > - } > - > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - return 0; > -} > - > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > - return -1; > - } > - > - result = read(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > - return -1; > - } > - > - result = write(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > - > - if (ipc_h) { > - close(ipc_h->fh); > - ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > deleted file mode 100644 > index 529c4a2..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > +++ /dev/null > @@ -1,71 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > -// and Guests or VTPMs > -// > -// =================================================================== > - > -#ifndef __VTPM_IO_H__ > -#define __VTPM_IO_H__ > - > -#include "tcg.h" > - > -#define VTPM_IPC_CLOSED -1 > - > -// Represents an (somewhat) abstracted io handle. > -typedef struct vtpm_ipc_handle_t { > - int fh; // IO handle. > - int flags; // Flags for opening. This may need to become > - // a void *, but for now files use an int. > - char *name; // Names for debugging as well as filenames > - // for file-based io. > -} vtpm_ipc_handle_t; > - > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > deleted file mode 100644 > index e737d60..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.c > +++ /dev/null > @@ -1,63 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#include > -#include "vtpm_lock.h" > - > -static pthread_rwlock_t vtpm_lock; > - > -void vtpm_lock_init() { > - > - pthread_rwlock_init( &vtpm_lock, NULL); > -} > - > -void vtpm_lock_destroy(){ > - pthread_rwlock_destroy(&vtpm_lock); > -} > - > -void vtpm_lock_rdlock(){ > - pthread_rwlock_rdlock(&vtpm_lock); > -} > - > -void vtpm_lock_wrlock(){ > - pthread_rwlock_wrlock(&vtpm_lock); > -} > - > -void vtpm_lock_unlock(){ > - pthread_rwlock_unlock(&vtpm_lock); > -} > - > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > deleted file mode 100644 > index 53a339d..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.h > +++ /dev/null > @@ -1,48 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#ifndef __VTPM_LOCK_H__ > -#define __VTPM_LOCK_H__ > - > -void vtpm_lock_init(); > -void vtpm_lock_destroy(); > - > -void vtpm_lock_rdlock(); > -void vtpm_lock_wrlock(); > -void vtpm_lock_unlock(); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > deleted file mode 100644 > index e089f78..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.c > +++ /dev/null > @@ -1,285 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -#include "log.h" > -#include "buffer.h" > - > -VTPM_GLOBALS *vtpm_globals=NULL; > - > -// --------------------------- Well Known Auths -------------------------- > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > - > -#ifdef WELL_KNOWN_OWNER_AUTH > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > -#endif > - > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -// --------------------------- Functions ------------------------------ > - > -TPM_RESULT VTPM_Create_Manager(){ > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Auth for Owner > -#ifdef WELL_KNOWN_OWNER_AUTH > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > -#else > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > -#endif > - > - // Take Owership of TPM > - CRYPTO_INFO ek_cryptoInfo; > - > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > - > - // If we can read PubEK then there is no owner and we should take it. > - // We use the abilty to read the pubEK to flag that the TPM is owned. > - // FIXME: Change to just trying to take ownership and react to the status > - if (status == TPM_SUCCESS) { > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &SRK_AUTH, > - &ek_cryptoInfo, > - &vtpm_globals->keyAuth)); > - > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &vtpm_globals->keyAuth)); > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > - } > - > - // Generate storage key's auth > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > - sizeof(TPM_AUTHDATA) ); > - > - TCS_AUTH osap; > - TPM_AUTHDATA sharedsecret; > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->storageKeyWrap, > - &osap) ); > - > - // Generate boot key's auth > - TPM_AUTHDATA bootKeyWrapAuth; > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - // FIXME: This key protects the global secrets on disk. It should use TPM > - // PCR bindings to limit its use to legit configurations. > - // Current binds are open, implying a Trusted VM contains this code. > - // If this VM is not Trusted, use measurement and PCR bindings. > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->bootKeyWrap, > - &osap) ); > - > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - NULL, > - NULL, > - NULL, > - &vtpm_globals->bootKey, > - TRUE ) ); > - > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > - goto egress; > - > - abort_egress: > - exit(1); > - > - egress: > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > - return status; > - > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -TPM_RESULT VTPM_Init_Manager() { > - TPM_RESULT status = TPM_FAIL, serviceStatus; > - BYTE *randomsead; > - UINT32 randomsize=256; > - > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > - > - vtpm_globals->connected_dmis = 0; > - > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - // Create new TCS Object > - vtpm_globals->manager_tcs_handle = 0; > - > - TPMTRYRETURN(TCS_create()); > - > - // Create TCS Context for service > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > - > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > - &randomsize, > - &randomsead)); > - > - Crypto_Init(randomsead, randomsize); > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > - > - // Create OIAP session for service's authorized commands > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > - &vtpm_globals->keyAuth) ); > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > - > - vtpm_globals->mig_keys = NULL; > - > - // If fails, create new Manager. > - serviceStatus = VTPM_LoadManagerData(); > - if (serviceStatus == TPM_IOERROR) { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > - TPMTRYRETURN( VTPM_Create_Manager() ); > - TPMTRYRETURN( VTPM_SaveManagerData() ); > - } else if (serviceStatus != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > - exit(1); > - } > - > - //Load Storage Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->storageKeyWrap, > - &SRK_AUTH, > - &vtpm_globals->storageKeyHandle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->storageKey, > - FALSE ) ); > - > - // Create entry for Dom0 for control messages > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - return(status); > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -void VTPM_Stop_Manager() { > - VTPM_DMI_RESOURCE *dmi_res; > - struct hashtable_itr *dmi_itr; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - if (dmi_res->connected) > - close_dmi( dmi_res ); // Not really interested in return code > - > - } while (hashtable_iterator_advance(dmi_itr)); > - free (dmi_itr); > - } > - > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > - > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > - TCS_destroy(); > - > - hashtable_destroy(vtpm_globals->dmi_map, 1); > - free(vtpm_globals); > - > - Crypto_Exit(); > - > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > -} > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > deleted file mode 100644 > index a324a8f..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.h > +++ /dev/null > @@ -1,150 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.h > -// > -// Public Interface header for VTPM Manager > -// > -// ================================================================== > - > -#ifndef __VTPM_MANAGER_H__ > -#define __VTPM_MANAGER_H__ > - > -#define VTPM_TAG_REQ 0x01c1 > -#define VTPM_TAG_RSP 0x01c4 > -#define COMMAND_BUFFER_SIZE 4096 > - > -// Header sizes. Note Header MAY include the DMI > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > - > -//************************ Command Codes **************************** > -#define VTPM_ORD_BASE 0x0000 > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > - > -// Non-priviledged VTPM Commands (From DMI's) > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > - > -// Priviledged VTPM Commands (From management console) > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > - > -//************************ Return Codes **************************** > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > -#define VTPM_TYPE_HVM 2 // HVM Domain > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > -#define VTPM_UNSUPPORTED 2 > -#define VTPM_FORBIDDEN 3 > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > -#define VTPM_INVALID_REQUEST 5 > - > -//*********************** Parameter Values ************************* > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > -#define VTPM_TYPE_MIGRATABLE 0x01 > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > - // VTPM can be recovered or deleted only > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - dmi: 4 bytes // Source of message. > - // WARNING: This is prepended by the channel. > - // Thus it is received by VTPM Manager, > - // but not sent by DMI > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Open: > - Input Parameters: > - mig_type: 1 byte > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > - domain type: 1 byte > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Close > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Delete > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_SaveNVM > - Input Parameters: > - data: n bytes (Header indicates size of data) > - Output Parameters: > - None > - > -VTPM_LoadNVM > - Input Parameters: > - None > - Output Parameters: > - data: n bytes (Header indicates size of data) > - > -VTPM_TPMCommand > - Input Parameters: > - TPM Command Byte Stream: n bytes > - Output Parameters: > - TPM Reponse Byte Stream: n bytes > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > deleted file mode 100644 > index 2001074..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > +++ /dev/null > @@ -1,488 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_handler.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "log.h" > -#include "buffer.h" > - > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > - > -// ---------------------- Prototypes ------------------- > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name); > - > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name); > - > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Forward TPM cmds? > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *thread_name) { > - TPM_RESULT status = TPM_FAIL; // Should never return > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > - buffer_t *command_buf=NULL, *result_buf=NULL; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - VTPM_DMI_RESOURCE *dmi_res; > - int size_read, size_write, i; > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > - > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - > - // ------------------------ Main Loop -------------------------------- > - while(1) { > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > - > - // --------------------- Read Cmd from Sender ---------------- > - > - // Read command header > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > - goto abort_command; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > - goto abort_command; > - } > - > - // Unpack header > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - // Using the header info, read the parameters of the command > - // Note that in_param_size is in the client's context > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (cmd_size > 0) { > - in_param = (BYTE *) malloc(cmd_size); > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - if (size_read < (int) cmd_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > - goto abort_command; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } > - > - // Init the buffers used to handle the command and the response > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - goto abort_command; > - } > - > - // -------------- Dispatch Commands to Handlers ----------- > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > - vtpm_lock_wrlock(); > - } else { > - vtpm_lock_rdlock(); > - } > - > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > - (!dmi_res->connected) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > - status = TPM_BAD_PARAMETER; > - // We have no one to reply to, they don't exist. > - goto abort_command; > - } > - > - if (tag == VTPM_TAG_REQ) { > - > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > - > - } else { // This is not a VTPM Command at all. > - if (fw_tpm) { > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > - > - // This means calling the DMI failed, not that the cmd failed in the DMI > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > - if (status != TPM_SUCCESS) { > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > - // should be forwarded to the caller VM > - add_header = FALSE; > - } else { > - // We are not supposed to forward TPM commands at all. > - int i; > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - } // end else for is VTPM Command > - > - // ------------------- Respond to Sender ------------------ > - > - // Errors while handling responses jump here to reply with error messages > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > - // is added to the code, this ifdef should be removed. > - // Also note this is NOT referring to errors in commands, but rather > - // this is about I/O errors and such. > -#ifndef VTPM_MULTI_VM > - abort_with_error: > -#endif > - > - if (add_header) { > - // Prepend VTPM header with destination DM stamped > - out_param_size = buffer_len(result_buf); > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > - out_message = (BYTE *) malloc (reply_size); > - reply = out_message; > - > - BSG_PackList(out_message, 4, > - BSG_TYPE_UINT32, (BYTE *) &dmi, > - BSG_TPM_TAG, (BYTE *) &tag, > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > - BSG_TPM_RESULT, (BYTE *) &status); > - > - if (buffer_len(result_buf) > 0) > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > - //Note: Send message + dmi_id > - } else { > - reply = result_buf->bytes; > - reply_size = buffer_len(result_buf); > - } > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i < reply_size; i++) > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - free(out_message); out_message=NULL; > - > - if (size_write < (int)reply_size) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > - goto abort_command; > - } > - > - // On certain failures an error message cannot be sent. > - // This marks the beginning of cleanup in preperation for the next command. > - abort_command: > - //free buffers > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - //free(in_param); // This was converted to command_buf. No need to free > - buffer_free(result_buf); > - buffer_free(command_buf); > - > - // If we have a write lock, save the manager table > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > - } > - > - vtpm_lock_unlock(); > - add_header = TRUE; // Reset to the default > - } // End while(1) > - > -} > - > -///////////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - > - switch (ord) { > - case VTPM_ORD_SAVENVM: > - status= VTPM_Handle_Save_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOADNVM: > - status= VTPM_Handle_Load_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_TPMCOMMAND: > - status= VTPM_Handle_TPM_Command(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_GET_MIG_KEY: > - status = VTPM_Handle_Get_Migration_key(command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOAD_MIG_KEY: > - status = VTPM_Handle_Load_Migration_key(command_buf, > - result_buf); > - break; > - > - default: > - // Privileged handlers can do maintanance > - if (is_priv) { > - switch (ord) { > - case VTPM_ORD_OPEN: > - status = VTPM_Handle_New_DMI(command_buf); > - break; > - > - case VTPM_ORD_CLOSE: > - status = VTPM_Handle_Close_DMI(command_buf); > - break; > - > - case VTPM_ORD_DELETE: > - status = VTPM_Handle_Delete_DMI(command_buf); > - break; > - > - case VTPM_ORD_MIGRATE_IN: > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > - break; > - > - case VTPM_ORD_MIGRATE_OUT: > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > - break; > - > - default: > - status = TPM_BAD_ORDINAL; > - } // switch > - } else { // is priv command > - > - status = TPM_BAD_ORDINAL; > - } // inner switch > - } // outer switch > - > - return(status); > -} > - > -///////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - UINT32 dmi_dst; > - TPM_COMMAND_CODE ord; > - TPM_TAG tag_out; > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > - BYTE *dmi_cmd, *in_param; > - int size_read, size_write, i; > - > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > - > - //Forward TPM CMD stamped with dmi_id to DMI for handling > - if (buffer_len(param_buf)) { > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > - > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - free(dmi_cmd); > - } else { > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } > - > - if (size_write != (int) dmi_cmd_size) > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > - > - buffer_free(param_buf); > - > - // Read header for response to TPM command from DMI > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi_dst, > - BSG_TPM_TAG, &tag_out, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &status ); > - > - // If response has parameters, read them. > - // Note that in_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (adj_param_size > 0) { > - in_param = (BYTE *) malloc(adj_param_size); > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > - goto abort_with_error; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > - > - status = TPM_SUCCESS; > - > - abort_with_error: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > deleted file mode 100644 > index cf58ba3..0000000 > --- a/tools/vtpm_manager/manager/vtpmd.c > +++ /dev/null > @@ -1,371 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmd.c > -// > -// Application > -// > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "tcg.h" > -#include "log.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -#define VTPM_BE_FNAME "/dev/vtpm" > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > - > -#define VTPM_TYPE_PVM_STRING "pvm" > -#define VTPM_TYPE_HVM_STRING "hvm" > - > -struct vtpm_thread_params_s { > - vtpm_ipc_handle_t *tx_ipc_h; > - vtpm_ipc_handle_t *rx_ipc_h; > - BOOL fw_tpm; > - vtpm_ipc_handle_t *fw_tx_ipc_h; > - vtpm_ipc_handle_t *fw_rx_ipc_h; > - BOOL is_priv; > - char *thread_name; > -}; > - > -// This is needed to all extra_close_dmi to close this to prevent a > -// broken pipe when no DMIs are left. > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > - > -void *vtpm_manager_thread(void *arg_void) { > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > - > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > - arg->is_priv, arg->thread_name); > - > - return (status); > -} > - > - > -void signal_handler(int reason) { > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > - } else { > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > - pthread_exit(NULL); > - } > - > - VTPM_Stop_Manager(); > - exit(-1); > -} > - > -struct sigaction ctl_c_handler; > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > - struct stat file_info; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - dmi_res->tx_tpm_ipc_h = NULL; > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->tx_vtpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - } else { > - // Create a pair of fifo pipes > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > - status =TPM_RESOURCES; > - goto abort_egress; > - } > - > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > - > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Measure DMI > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > - // Also, this mechanism is specific to 1 VM architecture. > - /* > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - dmi_size = file_stat.st_size; > - else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - dmi_buffer > - */ > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > - > - if (vm_type == VTPM_TYPE_PVM) > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > - else > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > - > - // Launch DMI > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > -#ifdef MANUAL_DM_LAUNCH > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > - dmi_res->dmi_pid = 0; > -#else > - pid_t pid = fork(); > - > - if (pid == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } else if (pid == 0) { > - switch (startup_mode) { > - case TPM_ST_CLEAR: > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_STATE: > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_DEACTIVATED: > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > - break; > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Returning from these at all is an error. > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > - } else { > - dmi_res->dmi_pid = pid; > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > - } > -#endif // MANUAL_DM_LAUNCH > - > - } // If DMI = VTPM_CTL_DM > - status = TPM_SUCCESS; > - > -abort_egress: > - return (status); > -} > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (vtpm_globals->connected_dmis == 0) { > - // No more DMI's connected. Close fifo to prevent a broken pipe. > - // This is hackish. Need to think of another way. > - vtpm_ipc_close(g_rx_tpm_ipc_h); > - } > - > - > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > - > - free(dmi_res->tx_tpm_ipc_h->name); > - free(dmi_res->tx_vtpm_ipc_h->name); > - > -#ifndef MANUAL_DM_LAUNCH > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - if (dmi_res->dmi_pid != 0) { > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > - status = TPM_FAIL; > - } > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > - status = TPM_FAIL; > - } > - } > -#endif > - > - } //endif ! dom0 > - return status; > -} > - > - > -int main(int argc, char **argv) { > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > - pthread_t be_thread, dmi_thread, hp_thread; > - > -#ifdef DUMMY_BACKEND > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > -#else > - vtpm_ipc_handle_t real_be_ipc_h; > -#endif > - > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > - > - // -------------------- Initialize Manager ----------------- > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > - return -1; > - } > - > - // -------------------- Setup Ctrl+C Handlers -------------- > - ctl_c_handler.sa_handler = signal_handler; > - sigemptyset(&ctl_c_handler.sa_mask); > - ctl_c_handler.sa_flags = 0; > - > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > - > - // For easier debuggin with gdb > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > - > - sigset_t sig_mask; > - sigemptyset(&sig_mask); > - sigaddset(&sig_mask, SIGPIPE); > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > - > - // ------------------- Set up file ipc structures ---------- > -#ifdef DUMMY_BACKEND > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > - > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > - exit(-1); > - } > - > - tx_be_ipc_h = &tx_dummy_ipc_h; > - rx_be_ipc_h = &rx_dummy_ipc_h; > -#else > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > - > - tx_be_ipc_h = &real_be_ipc_h; > - rx_be_ipc_h = &real_be_ipc_h; > -#endif > - > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > - exit(-1); > - } > - > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > - > - // -------------------- Set up thread params ------------- > - > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > - be_thread_params.fw_tpm = TRUE; > - be_thread_params.fw_tx_ipc_h = NULL; > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > - be_thread_params.is_priv = FALSE; > - be_thread_params.thread_name = "Backend Listener"; > - > - dmi_thread_params.tx_ipc_h = NULL; > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > - dmi_thread_params.fw_tpm = FALSE; > - dmi_thread_params.fw_tx_ipc_h = NULL; > - dmi_thread_params.fw_rx_ipc_h = NULL; > - dmi_thread_params.is_priv = FALSE; > - dmi_thread_params.thread_name = "VTPM Listener"; > - > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > - hp_thread_params.fw_tpm = FALSE; > - hp_thread_params.fw_tx_ipc_h = NULL; > - hp_thread_params.fw_rx_ipc_h = NULL; > - hp_thread_params.is_priv = TRUE; > - hp_thread_params.thread_name = "Hotplug Listener"; > - > - // --------------------- Launch Threads ----------------- > - > - vtpm_lock_init(); > - > - vtpm_globals->master_pid = pthread_self(); > - > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > - exit(-1); > - } > - > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > - exit(-1); > - } > - > - > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > - exit(-1); > - } > - > - //Join the other threads until exit time. > - pthread_join(be_thread, NULL); > - pthread_join(dmi_thread, NULL); > - pthread_join(hp_thread, NULL); > - > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > - > - VTPM_Stop_Manager(); > - vtpm_lock_destroy(); > - return 0; > -} > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > deleted file mode 100644 > index 41e8d2d..0000000 > --- a/tools/vtpm_manager/manager/vtpmpriv.h > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmpriv.h > -// > -// Structures and functions private to the manager > -// > -// ================================================================== > - > -#ifndef __VTPMPRIV_H__ > -#define __VTPMPRIV_H__ > - > -#include "vtpm_manager.h" > -#include "tcg.h" > -#include "tcs.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "vtpm_ipc.h" > - > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > - // is changed. It's used for backwards compatability > - > -#define STATE_FILE "/var/vtpm/VTPM" > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > -#define VTPM_CTL_DM 0 > - > -// ------------------------ Private Structures ----------------------- > -typedef struct VTPM_DMI_RESOURCE_T { > - // I/O info for Manager to talk to DMI's and controllers > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > - > -#ifndef VTPM_MULTI_VM > - pid_t dmi_pid; > -#endif > - > - // Non-persistent Information > - bool connected; > - UINT32 dmi_domain_id; > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > - char *NVMLocation; // NULL term string indicating location > - // of NVM. > - // Persistent Information about DMI > - UINT32 dmi_id; > - BYTE dmi_type; > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > -} VTPM_DMI_RESOURCE; > - > -typedef struct tdVTPM_MIGKEY_LIST { > - UINT32 name_size; > - BYTE *name; // Name of destination (IP addr, domain name, etc) > - CRYPTO_INFO key; > - struct tdVTPM_MIGKEY_LIST *next; > -} VTPM_MIGKEY_LIST; > - > - > -typedef struct tdVTPM_GLOBALS { > - // Non-persistent data > -#ifndef VTPM_MULTI_VM > - pid_t master_pid; > -#endif > - > - int connected_dmis; // To close guest_rx when no dmis are connected > - > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > - // Currently keys are loaded at migration time, > - // TODO: Make VTPM man store a keys persistently > - // and update script to check if key is needed > - // before fetching it. > - > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > - CRYPTO_INFO storageKey; // For software encryption > - CRYPTO_INFO bootKey; // For saving table > - TCS_AUTH keyAuth; // OIAP session for storageKey > - > - // Persistent Data > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > - TPM_AUTHDATA srk_usage_auth; > - TPM_AUTHDATA storage_key_usage_auth; > - > - buffer_t bootKeyWrap; // Wrapped copy of boot key > - > -}VTPM_GLOBALS; > - > -// --------------------------- Global Values -------------------------- > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > - > -// ********************** VTPM Functions ************************* > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > -void VTPM_Stop_Manager(); // Stop VTPM Service > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Should forward TPM cmds > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *client_name); > - > -// ********************** Command Handler Prototypes *********************** > - > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_SaveManagerData(void); > -TPM_RESULT VTPM_LoadManagerData(void); > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > - > -// Helper functions > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data); > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data); > - > -#endif // __VTPMPRIV_H__ > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > deleted file mode 100644 > index fc8a66f..0000000 > --- a/tools/vtpm_manager/manager/vtsp.c > +++ /dev/null > @@ -1,1042 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.c > -// > -// Higher level interface to TCS for use in service. > -// > -// ================================================================== > - > -#include > -#include "tcg.h" > -#include "tcs.h" > -#include "bsg.h" > -#include "log.h" > -#include "crypto.h" > -#include "vtsp.h" > -#include "buffer.h" > - > -#define RSA_KEY_SIZE 0x0800 > - > -/*********************************************************************************** > - * GenerateAuth: Generate authorization info to be sent back to application > - * > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > - * outParamDigestTextSize Size of inParamDigestText > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use shared secret > - * pAuth Authorization information from the application > - * > - * Return: TPM_SUCCESS Authorization data created > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > - *************************************************************************************/ > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > - /*[IN]*/ UINT32 inParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth) { > - > - if (inParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - else { > - > - //Generate new OddNonce > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > - > - // Create SHA1 inParamDigest > - TPM_DIGEST inParamDigest; > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &inParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > - > - return(TPM_SUCCESS); > - > - } > -} > - > -/*********************************************************************************** > - * VerifyAuth: Verify the authdata for a command requiring authorization > - * > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > - * inParamDigestTextSize Size of inParamDigestText > - * authDataUsage AuthDataUsage for the Entity being used > - * Key->authDataUsage or TPM_AUTH_OWNER > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use NULL (It will be aquired from the Auth Session) > - * If unknown (default), assume OIAP > - * sessionAuth A TCS_AUTH info for the session > - * pAuth Authorization information from the application > - * hContext If specified, on failed Auth, VerifyAuth will > - * generate a new OIAP session in place of themselves > - * destroyed session. > - * > - * Return: TPM_SUCCESS Authorization Verified > - * TPM_AUTHFAIL Authorization Failed > - * TPM_FAIL Failure during SHA1 routines > - *************************************************************************************/ > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > - /*[IN]*/ UINT32 outParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth, > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > - if (outParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - > - > - // Create SHA1 inParamDigest > - TPM_DIGEST outParamDigest; > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - TPM_DIGEST hm; > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &outParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > - > - // Compare correct HMAC with provided one. > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > - if (!auth->fContinueAuthSession) > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > - > - return (TPM_SUCCESS); > - } else { > - // If specified, reconnect the OIAP session. > - // NOTE: This only works for TCS's that never have a 0 context. > - if (hContext) { > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > - VTSP_OIAP( hContext, auth); > - } > - return (TPM_AUTHFAIL); > - } > -} > - > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_OIAP(hContext, > - &auth->AuthHandle, > - &auth->NonceEven) ); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedSecret, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > - > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > - > - TPMTRYRETURN( TCSP_OSAP( hContext, > - entityType, > - entityValue, > - nonceOddOSAP, > - &auth->AuthHandle, > - &auth->NonceEven, > - &nonceEvenOSAP) ); > - > - // Calculating Session Secret > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > - > - BSG_PackList( sharedSecretText, 2, > - BSG_TPM_NONCE, &nonceEvenOSAP, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *crypto_info) { > - > - TPM_RESULT status; > - TPM_NONCE antiReplay; > - TPM_DIGEST checksum; > - BYTE *pubEKtext; > - UINT32 pubEKtextsize; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > - > - // GenerateAuth new nonceOdd > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > - > - > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > - antiReplay, > - &pubEKtextsize, > - &pubEKtext, > - &checksum) ); > - > - > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > - > - // Build CryptoInfo for the bindingKey > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - pubEK.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - pubEK.pubKey.keyLength, > - pubEK.pubKey.key, > - crypto_info); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > - BYTE *new_srk; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // vars for srkpubkey parameter > - TPM_KEY srkPub; > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > - > - struct pack_buf_t srkText; > - > - //These values are accurate for an enc(AuthData). > - struct pack_buf_t encOwnerAuth, encSrkAuth; > - > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > - > - > - // Build srk public key struct > - srkPub.ver = TPM_STRUCT_VER_1_1; > - srkPub.keyUsage = TPM_KEY_STORAGE; > - srkPub.keyFlags = 0x00; > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > - srkPub.PCRInfoSize = 0; > - srkPub.PCRInfo = 0; > - srkPub.pubKey.keyLength= 0; > - srkPub.encDataSize = 0; > - > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 5, > - BSG_TPM_COMMAND_CODE,&command, > - BSG_TPM_PROTOCOL_ID, &proto_id, > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > - BSG_TPM_KEY, &srkPub); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > - > - new_srk = srkText.data; > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > - proto_id, > - encOwnerAuth.size, > - encOwnerAuth.data, > - encSrkAuth.size, > - encSrkAuth.data, > - &srkText.size, > - &new_srk, > - auth ) ); > - > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > - paramTextSize += srkText.size; > - > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(srkText.data); > - free(encSrkAuth.data); > - free(encOwnerAuth.data); > - free(paramText); > - > - TCS_FreeMemory(hContext, new_srk); > - > - return status; > -} > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - ownerAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - goto egress; > - > - abort_egress: > - egress: > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth) { > - > - int i; > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > - > - // vars for Calculate encUsageAuth > - BYTE *paramText; > - UINT32 paramTextSize; > - > - // vars for Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - TPM_DIGEST XORKey1; > - UINT32 XORbufferSize; > - TPM_SECRET encUsageAuth, encMigrationAuth; > - > - // vars for Flatten newKey prototype > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > - struct pack_buf_t newKeyText; > - > - // Fill in newKey > - TPM_KEY newKey; > - > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > - newKey.algorithmParms.parmSize = 12; > - > - switch (usage) { > - case TPM_KEY_SIGNING: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > - newKey.keyUsage = TPM_KEY_SIGNING; > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > - break; > - case TPM_KEY_STORAGE: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > - newKey.keyUsage = TPM_KEY_STORAGE; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - case TPM_KEY_BIND: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > - newKey.keyUsage = TPM_KEY_BIND; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - default: > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - > - newKey.ver = TPM_STRUCT_VER_1_1; > - > - newKey.keyFlags = 0; > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > - newKey.pubKey.keyLength= 0; > - newKey.encDataSize = 0; > - newKey.encData = NULL; > - > - // FIXME: Support PCR bindings > - newKey.PCRInfoSize = 0; > - newKey.PCRInfo = NULL; > - > - // Calculate encUsageAuth > - XORbufferSize = BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven); > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > - > - // FIXME: No support for migratable keys. > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > - > - // Flatten newKey prototype > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > - newKeyText.data = flatKey; > - newKeyText.size = flatKeySize; > - > - // Generate HMAC > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_AUTHDATA, &encUsageAuth, > - BSG_TPM_AUTHDATA, &encMigrationAuth); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > - parentHandle, > - encUsageAuth, > - encMigrationAuth, > - &newKeyText.size, > - &newKeyText.data, > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, 0) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(flatKey); > - free(paramText); > - TCS_FreeMemory(hContext, newKeyText.data); > - > - return status; > -} > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *auth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad) { > - > - > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > - > - BYTE *paramText=NULL; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > - if (! skipTPMLoad) { > - > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > - (newKeyHandle==NULL) || (auth==NULL)) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Generate Extra TCS Parameters > - TPM_HANDLE phKeyHMAC; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - parentAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > - hUnwrappingKey, > - buffer_len(rgbWrappedKeyBlob), > - rgbWrappedKeyBlob->bytes, > - auth, > - newKeyHandle, > - &phKeyHMAC) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_HANDLE, newKeyHandle); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - parentAuth, auth, > - hContext) ); > - } > - > - // Build cryptoinfo structure for software crypto function. > - if (cryptoinfo != NULL) { > - TPM_KEY newKey; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - newKey.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - newKey.pubKey.keyLength, > - newKey.pubKey.key, > - cryptoinfo); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - } > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - struct pack_buf_t clear_data32; > - BYTE *clear_data_text; > - UINT32 clear_data_size; > - > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &bound_data32); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - usage_auth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_UnBind( hContext, > - key_handle, > - buffer_len(bound_data), > - bound_data->bytes, > - auth, > - &clear_data_size, > - &clear_data_text) ); > - > - > - // Verify Auth > - clear_data32.size = clear_data_size; > - clear_data32.data = clear_data_text; > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clear_data32); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - usage_auth, auth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - TCS_FreeMemory(hContext, clear_data_text); > - > - return status; > -} > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData) > -{ > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_BOUND_DATA boundData; > - UINT32 i; > - > - // Fill boundData's accessory information > - boundData.ver = TPM_STRUCT_VER_1_1; > - boundData.payload = TPM_PT_BIND; > - boundData.payloadData = inData->bytes; > - > - // Pack boundData before encryption > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > - (sizeof(TPM_VERSION) + > - sizeof(TPM_PAYLOAD_TYPE) + > - buffer_len(inData))); > - if (flatBoundData == NULL) { > - return TPM_NOSPACE; > - } > - UINT32 flatBoundDataSize = 0; > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > - BSG_TPM_VERSION, &boundData.ver, > - BSG_TYPE_BYTE, &boundData.payload); > - > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > - flatBoundDataSize += buffer_len(inData); > - > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > - UINT32 out_tmp_size; > - > - // Encrypt flatBoundData > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > - flatBoundDataSize, > - flatBoundData, > - &out_tmp_size, > - out_tmp) ); > - > - if (out_tmp_size > RSA_KEY_SIZE/8) { > - // The result of RSAEnc should be a fixed size based on key size. > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > - } > - > - buffer_init(outData, 0, NULL); > - buffer_append_raw(outData, out_tmp_size, out_tmp); > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > - for(i = 0 ; i < out_tmp_size ; i++) { > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > - } > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - goto egress; > - abort_egress: > - egress: > - > - // Free flatBoundData > - free(flatBoundData); > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate PCR_Info Struct from Comp > - TPM_PCR_INFO pcrInfo; > - UINT32 pcrInfoSize, flatpcrSize; > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > - sizeof(UINT16) + // 2 byte UINT16 > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > - > - if (pcrComp != NULL) { > - //printf("\n\tBinding to PCRs: "); > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > - > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > - > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > - } else { > - //printf("\n\tBinding to no PCRS."); > - pcrInfoSize = 0; > - } > - > - // Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - UINT32 XORbufferSize = sizeof(XORbuffer); > - TPM_DIGEST XORKey; > - TPM_ENCAUTH encAuth; > - > - BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven ); > - > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > - > - int i; > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > - > - // Generate Extra TCS Parameters > - UINT32 inDataSize = buffer_len(inData); > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > - > - UINT32 sealedDataSize; > - BYTE *flatSealedData=NULL; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 4, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_ENCAUTH, &encAuth, > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > - BSG_TPM_SIZE32_DATA, &inData_pack); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_Seal( hContext, > - keyHandle, > - encAuth, > - pcrInfoSize, > - flatpcr, > - inDataSize, > - inData->bytes, > - auth, > - &sealedDataSize, > - &flatSealedData) ); > - > - // Unpack/return key structure > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, > - 0) ); > - > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, flatSealedData); > - > - free(paramText); > - return status; > -} > - > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - UINT32 sealDataSize, clearDataSize; > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > - 2 * sizeof(UINT32) + > - sealedData->sealInfoSize + > - sealedData->encDataSize), > - *clearData=NULL; > - > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - key_usage_auth, auth) ); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth) ); > - // Call TCS > - TPMTRYRETURN( TCSP_Unseal( hContext, > - keyHandle, > - sealDataSize, > - flatSealedData, > - auth, > - dataAuth, > - &clearDataSize, > - &clearData) ); > - > - // Verify Auth > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clearData_pack); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - key_usage_auth, auth, > - hContext) ); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, clearData); > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Call TCS > - return ( TCSP_SaveState ( hContext ) ); > - > -} > - > - > -// Function Reaches into unsupported TCS command, beware. > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Extra TCS Parameters > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > - > - // Call TCS > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > - &resultTextSize, resultText) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > - goto egress; > - > - abort_egress: > - > - egress: > - TCS_FreeMemory(hContext, resultText); > - free(resultText); > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > deleted file mode 100644 > index 2fb0440..0000000 > --- a/tools/vtpm_manager/manager/vtsp.h > +++ /dev/null > @@ -1,126 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.h > -// > -// Higher level interface to TCS. > -// > -// ================================================================== > - > -#ifndef __VTSP_H__ > -#define __VTSP_H__ > - > -#include "tcg.h" > -#include "tcs.h" > - > -#define KEY_BUFFER_SIZE 2048 > - > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ); > - > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedsecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth); > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *cypto_info); > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *pAuth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad); > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData); > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth); > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > - > -#endif //_VTSP_H_ > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > deleted file mode 100644 > index e33ae95..0000000 > --- a/tools/vtpm_manager/migration/Makefile > +++ /dev/null > @@ -1,42 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -VPATH = ../manager > - > -BIND = vtpm_migratord > -BINC = vtpm_migrator > - > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > - > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIND) $(BINC) > - > -.PHONY: install > -install: build > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BINC) $(BIND) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIND): $(OBJSD) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -$(BINC): $(OBJSC) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../util/libTCGUtils.a > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > deleted file mode 100644 > index 08986f4..0000000 > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_if.c > -// > -// Provides functions to call local vtpm manager interface (Hotplug) > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "vtpm_ipc.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > - > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > - > -TPM_RESULT vtpm_manager_open(){ > - > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > - return TPM_IOERROR; > - } > - > - return TPM_SUCCESS; > -} > - > -void vtpm_manager_close() { > - > - vtpm_ipc_close(&tx_ipc_h); > - vtpm_ipc_close(&rx_ipc_h); > -} > - > - > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_TAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > - adj_command = (BYTE *) malloc( adj_command_size ); > - if (!adj_command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - BSG_PackList(adj_command, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > - for (i=0; i< adj_command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) adj_command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > - > - // Read header for response to manager command > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > deleted file mode 100644 > index 8d52e66..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > +++ /dev/null > @@ -1,104 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator.h > -// > -// Public Interface header for VTPM Migrator > -// > -// ================================================================== > - > -#ifndef __VTPM_MIGRATOR_H__ > -#define __VTPM_MIGRATOR_H__ > - > -#define VTPM_MTAG_REQ 0x02c1 > -#define VTPM_MTAG_RSP 0x02c4 > - > -// Header sizes. > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > - > -//*********************** Connection Info ************************** > -#define VTPM_MIG_PORT 48879 > - > -//************************ Command Codes *************************** > -#define VTPM_MORD_MIG_STEP1 0x00 > -#define VTPM_MORD_MIG_STEP2 0x01 > -#define VTPM_MORD_MIG_STEP3 0x02 > -#define VTPM_MORD_MIG_STEP4 0x03 > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Mig_Phase1: > - Unsupported: (Handled by scripts) > - > -VTPM_Mig_Phase2 > - Input Parameters: > - domain_name_size: 4 bytes > - domain_name : domain_name_size bytes > - Output Parameters: > - pub_exp_size: 4 bytes > - pub_exp: pub_exp_size bytes > - pub_mod_size: 4 bytes > - pub_mod: pub_mod_size bytes > - > -VTPM_Mig_Phase3 > - Input Parameters: > - vtpm_state_size: 4 bytes > - vtpm_state: vtpm_state_size bytes > - Output Parameters: > - none > - > -VTPM_Mig_Phase4 > - Unsupported: (Handled by scripts) > - > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > deleted file mode 100644 > index de48b2d..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > +++ /dev/null > @@ -1,219 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator_if.c > -// > -// Provides functions to call open network connection & call > -// a function on the vtpm_migratord on the destination > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > - > -static int sock_desc; > - > - > -TPM_RESULT vtpm_migratord_open(char *server_address){ > - > - TPM_RESULT status = TPM_FAIL; > - > - /* network variables */ > - struct in_addr ip_addr; > - struct sockaddr_in server_addr; > - int addr_len; > - struct hostent *dns_info=NULL; > - > - /* set up connection to server*/ > - dns_info = gethostbyname(server_address); > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > - > - if(ip_addr.s_addr < 0) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /* set up server variable */ > - memset((char *)&server_addr, 0, sizeof(server_addr)); > - server_addr.sin_family = AF_INET; > - server_addr.sin_port = htons(VTPM_MIG_PORT); > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > - > - /* open socket, make connection */ > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > - > - if (sock_desc < 0 ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (connect(sock_desc, > - (struct sockaddr *)&server_addr, > - sizeof(server_addr)) < 0 ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - status = TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -void vtpm_migratord_close() { > - close(sock_desc); > -} > - > - > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_MTAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - command = (BYTE *) malloc( command_size ); > - if (!command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - BSG_PackList(command, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &command_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = write(sock_desc, command, command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > - for (i=0; i< command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > - > - // Read header for response > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > deleted file mode 100644 > index 18b3bdb..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > +++ /dev/null > @@ -1,211 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - UINT32 offset; > - struct pack_buf_t addr_data32; > - > - //===== Get Destination's Public Migration Key ====== > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > - &out_param_buf, > - &cmd_status, > - &mig_key_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - //===== Load migration key into vtpm_manager ======== > - > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > - NULL ) ) ; > - > - offset = BSG_PackList(out_param_buf.bytes, 1, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free(&mig_key_buf); > - buffer_free(&out_param_buf); > - > - return status; > -} > - > - > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > - struct pack_buf_t addr_data32, name_data32, state_data32; > - > - //===== Get vtpm state from vtpm_manager ======== > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - (2 * sizeof(UINT32)) + addr_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > - &out_param_buf, > - &cmd_status, > - &state_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > - > - //===== Send vtpm state to destination ====== > - name_data32.data = (BYTE *)name; > - name_data32.size = strlen(name) + 1; // Include the null > - state_data32.data = state_buf.bytes; > - state_data32.size = buffer_len(&state_buf); > - > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free( &out_param_buf); > - buffer_free( &state_buf); > - buffer_free( &empty_buf); > - > - return status; > -} > - > - > -// Usage vtpm_migrator addr domain_name instance step > - > -int main(int argc, char **argv) { > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - char *server_addr, *name; > - UINT32 instance, step; > - > - if (argc != 5) { > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > - status= TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - server_addr = argv[1]; > - name = argv[2]; > - instance = atoi( argv[3] ); > - step = atoi( argv[4] ); > - > - switch (step) { > - case VTPM_MORD_MIG_STEP2: > - status = handle_vtpm_mig_step2(server_addr, name, instance); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - status = handle_vtpm_mig_step3(server_addr, name, instance); > - break; > - > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - break; > - } > - > - goto egress; > - abort_egress: > - egress: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > deleted file mode 100644 > index ea18c8c..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > +++ /dev/null > @@ -1,202 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > - > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > - TPM_TAG tag = VTPM_MTAG_RSP; > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > - > - buffer_init(buf, out_param_size, NULL); > - > - BSG_PackList(buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status ); > -} > - > -int main() { > - > - /* network variables */ > - int sock_descr, client_sock=-1, len; > - struct sockaddr_in addr; > - struct sockaddr_in client_addr; > - unsigned int client_length; > - int bytes; > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - UINT32 in_param_size, adj_param_size; > - int i, size_read, size_write; > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > - > - > - /* setup socket */ > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > - > - memset(&addr, 0, sizeof(addr)); > - addr.sin_family = AF_INET; > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > - addr.sin_port = htons(VTPM_MIG_PORT); > - > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > - return 1; > - } > - > - listen(sock_descr, 10); > - > - for(;;) { > - // ============ clear client info and wait for connection ========== > - memset(&client_addr, 0, sizeof(client_addr)); > - client_length = sizeof(client_addr); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > - client_sock=accept(sock_descr, &client_addr, &client_length); > - if (client_sock == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > - goto abort_command; > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > - } > - > - // =================== Read incoming command ====================== > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - // Unpack response from client > - BSG_UnpackList(cmd_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - buffer_init( &in_param_buf, adj_param_size, NULL); > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - /* Handle Command */ > - switch (ord) { > - case VTPM_MORD_MIG_STEP2: > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > - break; > - > - default: > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - abort_command_with_error: > - /* Write Response */ > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i< buffer_len(&result_buf); i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > - goto abort_command; > - } > - > - if (size_write != (int) buffer_len(&result_buf) ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > - > - abort_command: > - close(client_sock); > - buffer_free(&in_param_buf); > - buffer_free(&result_buf); > - > - } // For (;;) > - > - return 0; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > deleted file mode 100644 > index 0a8a2d5..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > +++ /dev/null > @@ -1,177 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "log.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > -#define VTPM_SH_CMD_FTR "\"" > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > -#define VTPM_SH_ADD "vtpm_add_and_activate" > -#define VTPM_SH_RESUME "vtpm_resume" > - > -// This must be updated to the longest command name. Currently GETINST > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > - > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Call manager and get mig key =============== > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > - &out_param_buf, // Empty > - &cmd_status, > - &mig_key_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ==================== return the mig key ===================== > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > - > - TPMTRYRETURN( buffer_init(result_buf, > - out_param_size, > - NULL) ); > - > - BSG_PackList( result_buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status); > - > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > - > - goto egress; > - > - abort_egress: > - buffer_free(result_buf); > - build_error_msg(result_buf, status); > - > - egress: > - return; > -} > - > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size, instance; > - char *shell_cmd_str=NULL; > - size_t shell_cmd_strlen; > - FILE *shell_f=NULL; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Read Parameters =============== > - struct pack_buf_t name_data32, state_data32; > - > - BSG_UnpackList(in_param_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - // Before using this string, protect us from a non-null term array. > - if (name_data32.data[name_data32.size -1] != 0x00) { > - name_data32.data[name_data32.size -1] = 0x00; > - } > - > - // ====== Call hotplug-script and get an instance ====== > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > - > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > - > - shell_f = popen(shell_cmd_str, "r"); > - fscanf(shell_f, "%d", &instance); > - pclose(shell_f); > - > - // ====== Call hotplug-script and add instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > - name_data32.data, instance); > - system(shell_cmd_str); > - > - // ========= Call vtpm_manager and load VTPM ======= > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2*sizeof(UINT32) + state_data32.size, > - NULL) ); > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ====== Call hotplug-script and resume instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > - system(shell_cmd_str); > - > - goto egress; > - abort_egress: > - egress: > - free(shell_cmd_str); > - > - // In this case no params come back, so reuse build_error_msg even for succes. > - build_error_msg(result_buf, status); > - return; > -} > - > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > deleted file mode 100644 > index 11af91e..0000000 > --- a/tools/vtpm_manager/tcs/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCS.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > deleted file mode 100644 > index cf3803c..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.c > +++ /dev/null > @@ -1,224 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include "tcs.h" > -#include "contextmgr.h" > -#include "log.h" > -#include "hashtable.h" > - > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize) { // in > - > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pBlock = NULL; > - > - // check incoming params > - if (pContextHandle == NULL || BlockSize == 0) > - return NULL; > - > - // Create New Block > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > - if (pBlock == NULL) > - return (0); > - > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > - if (pBlock->aMemory == NULL) > - return (0); > - > - memset(pBlock->aMemory, 0, BlockSize); > - pBlock->nBlockSize = BlockSize; > - pBlock->pNextBlock = NULL; > - > - // search for the last block created where to add the > - // newly created block > - if(pContextHandle->pTopBlock != NULL) { > - pCurrentBlock = pContextHandle->pTopBlock; > - while(pCurrentBlock->pNextBlock != NULL) > - pCurrentBlock = pCurrentBlock->pNextBlock; > - > - > - pCurrentBlock->pNextBlock= pBlock; > - } else > - pContextHandle->pTopBlock = pBlock; > - > - > - pContextHandle->nBlockCount++; > - > - return pBlock->aMemory; > -} > - > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs) { // in > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pParentBlock = NULL; > - BOOL bFound = FALSE; > - > - if (pContextHandle == NULL) > - return FALSE; > - > - > - // Search for the Block in the context by aMemory pointer > - pParentBlock = NULL; > - pCurrentBlock = pContextHandle->pTopBlock; > - > - while(pCurrentBlock != NULL) { > - // If aMemory block is found, delete it > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > - // if it is the top Block, remove it from the top, > - // otherwise remove it from the ParentBlock and stitch > - // the NextBlock to the ParentBlock > - if(pParentBlock == NULL) > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > - else > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > - > - // delete memory Block associated with pointer pTCPA_BYTEs > - free(pCurrentBlock->aMemory); > - pCurrentBlock->aMemory = NULL; > - > - free(pCurrentBlock); > - pCurrentBlock = pParentBlock; > - > - pContextHandle->nBlockCount--; > - bFound = TRUE; > - } > - > - if(pCurrentBlock != NULL) { > - pParentBlock = pCurrentBlock; > - pCurrentBlock = pCurrentBlock->pNextBlock; > - } > - } > - > - return bFound; > -} > - > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle) { // in > - HANDLE_LIST* pNewHandle = NULL; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle == NULL) > - return 0; > - > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > - > - if (pNewHandle == NULL) > - return (0); > - > - pNewHandle->handle = handle; > - pNewHandle->type = type; > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > - > - pContextHandle->pHandleList = pNewHandle; > - > - return 1; > -} > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle) { // in > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > - *pLastHandle = pCurrentHandle; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > - > - if (pContextHandle == NULL) > - return 0; > - > - while (1) { > - > - if (pCurrentHandle->handle == handle) { // Found element > - if (pCurrentHandle == pLastHandle) { // First element in list > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } else { // Ordinary element > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } > - > - return 1; > - > - } else { // Not found yet; > - pLastHandle = pCurrentHandle; > - pCurrentHandle = pCurrentHandle->pNextHandle; > - if (pCurrentHandle == NULL) // Found end of list > - return 0; > - } > - > - } > -} > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > - HANDLE_LIST* pCurrentHandle; > - BOOL returncode = TRUE; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > - > - if (pContextHandle == NULL) > - return 1; > - > - pCurrentHandle = pContextHandle->pHandleList; > - while (pCurrentHandle != NULL) { > - > - switch (pCurrentHandle->type) { > - case TPM_RT_KEY: > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > - break; > - case TPM_RT_AUTH: > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > - break; > - default: > - returncode = FALSE; > - } > - > - pCurrentHandle = pCurrentHandle->pNextHandle; > - > - } > - > - return 1; > -} > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > deleted file mode 100644 > index e3fdf0f..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.h > +++ /dev/null > @@ -1,82 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#ifndef __CONTEXTMGR_H__ > -#define __CONTEXTMGR_H__ > - > -#include "tcg.h" > - > -#define BLOCK_SIZE 300 > - > -typedef struct block { > - int nBlockSize; > - BYTE* aMemory; > - struct block* pNextBlock; > -} BLOCK; > - > -typedef struct handle_List { > - TPM_HANDLE handle; > - TPM_RESOURCE_TYPE type; > - struct handle_List* pNextHandle; > -} HANDLE_LIST; > - > -typedef struct context_handle { > - TCS_CONTEXT_HANDLE handle; > - int nBlockCount; > - BLOCK* pTopBlock; > - HANDLE_LIST* pHandleList; > -} CONTEXT_HANDLE; > - > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize); // in > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs); // in > - > - > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle); // in > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle); // in > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > - > -#endif //_CONTEXTMGR_H_ > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > deleted file mode 100644 > index 7c1378c..0000000 > --- a/tools/vtpm_manager/tcs/tcs.c > +++ /dev/null > @@ -1,1192 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.c > -// > -// This file contains the functions that implement a TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "tcs.h" > -#include "contextmgr.h" > -#include "tpmddl.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -// Static Global Vars for the TCS > -static int TCS_m_nCount = 0; > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > - > -struct hashtable *context_ht; > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > -} > - > -// --------------------------------------------------------------------------------- > -// Initialization/Uninitialization SubComponent API > -// --------------------------------------------------------------------------------- > -TPM_RESULT TCS_create() { > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TPM_RESULT result = TPM_FAIL; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > - hRes = TDDL_Open(); > - > - context_ht = create_hashtable(10, hashfunc32, equals32); > - > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > - result = TPM_SUCCESS; > - TCS_m_nCount++; > - } else { > - result = TPM_IOERROR; > - hashtable_destroy(context_ht, 1); > - } > - } else > - TCS_m_nCount++; > - > - return(result); > -} > - > - > -void TCS_destroy() > -{ > - TCS_m_nCount--; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > - TDDL_Close(); > - > - struct hashtable_itr *context_itr; > - TCS_CONTEXT_HANDLE *hContext; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(context_ht) > 0) { > - context_itr = hashtable_iterator(context_ht); > - do { > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > - > - } while (hashtable_iterator_advance(context_itr)); > - free(context_itr); > - } > - hashtable_destroy(context_ht, 1); > - } > - > -} > - > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr) {// out > - > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle != NULL && ppMemPtr != NULL) { > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > - returnCode = TPM_SUCCESS; > - } > - > - return returnCode; > -} > - > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory) { // in > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if ( (pContextHandle != NULL && pMemory != NULL) && > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > - returnCode = TPM_SUCCESS; > - > - > - return returnCode; > -} > - > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > - TPM_RESULT returnCode = TPM_FAIL; > - TCS_CONTEXT_HANDLE *newContext; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > - > - if (hContext) { > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > - if (pContextHandle == NULL) > - return TPM_SIZE; > - > - // initialize to 0 > - pContextHandle->nBlockCount = 0; > - pContextHandle->pTopBlock = NULL; > - pContextHandle->pHandleList = NULL; > - > - // Create New Block > - AddMemBlock(pContextHandle, BLOCK_SIZE); > - > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > - > - if (hashtable_search(context_ht, &newContext) !=NULL) > - *newContext += 1; > - > - pContextHandle->handle = *newContext; > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > - free(newContext); > - free(pContextHandle); > - returnCode = TPM_FAIL; > - } else { > - *hContext = *newContext; > - returnCode = TPM_SUCCESS; > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > - //FIXME: TCS SHOULD Track failed auths and make sure > - //we don't try and re-free them here. > - TPM_RESULT returnCode = TPM_FAIL; > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if(pContextHandle != NULL) { > - // Print test info > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > - > - // free memory for all the blocks > - DeleteMemBlock(pContextHandle, NULL ); > - pContextHandle->pTopBlock = NULL; > - > - FreeHandleList(pContextHandle); > - if (pContextHandle->pHandleList != NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - // Release the TPM's resources > - if (hashtable_remove(context_ht, &hContext) == NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - free(pContextHandle); > - returnCode = TPM_SUCCESS; > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > - return(returnCode); > -} > - > -// ------------------------------------------------------------------ > -// Internal Functions > -// ------------------------------------------------------------------ > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > - // CHECK: according to the command specs, the outgoing auth params are: > - // nonceEven > - // nonceOdd > - // continueAuthSession > - // auth digest for return params > - // > - // this is a bit different than this code... > - > - return BSG_PackList(dst, 4, > - BSG_TYPE_UINT32, &(auth->AuthHandle), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > - return BSG_UnpackList(src, 3, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -// ------------------------------------------------------------------ > -// Authorization Commands > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > - UINT32 paramSize = 0; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonce0 == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 2, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonce0); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &entityType, > - BSG_TYPE_UINT32, &entityValue, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 3, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonceEven, > - BSG_TPM_NONCE, nonceEvenOSAP); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &protocolID, > - BSG_TYPE_UINT32, &encOwnerAuthSize); > - > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > - InLength += encOwnerAuthSize; > - InLength += BSG_Pack( BSG_TYPE_UINT32, > - &encSrkAuthSize, > - InBuf+InLength); > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > - InLength += encSrkAuthSize; > - memcpy(InBuf+InLength, *Srk, *SrkSize); > - InLength += *SrkSize; > - InLength += packAuth(InBuf+InLength, ownerAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, > - &InLength, > - InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY srkPub; > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > - unpackAuth(ownerAuth, OutBuf+i); > - > - // fill output params > - BYTE tempBuf[1024]; > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > - return(TPM_SIZE); > - } > - memcpy(*Srk, tempBuf, *SrkSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth) { // in, out > - > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - InLength += packAuth(InBuf+InLength, ownerAuth); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - unpackAuth(ownerAuth, OutBuf+i); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &handle); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, handle)) > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Print debug info > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &pcrNum, > - BSG_TPM_DIGEST, &inDigest); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TPM_ENCAUTH, encAuth, > - BSG_TYPE_UINT32, &pcrInfoSize); > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > - InLength += pcrInfoSize; > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, pubAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_STORED_DATA sealedData; > - > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > - unpackAuth(pubAuth, OutBuf+i); > - > - // fill SealedData > - BYTE tempBuf[1024]; > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*SealedData, tempBuf, *SealedDataSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > - DataSize == NULL || Data == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &parentHandle); > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > - InLength += SealedDataSize; > - InLength += packAuth(InBuf+InLength, parentAuth); > - InLength += packAuth(InBuf+InLength, dataAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*Data, OutBuf+i, *DataSize); > - i += *DataSize; > - i += unpackAuth(parentAuth, OutBuf+i); > - unpackAuth(dataAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TYPE_UINT32, &inDataSize); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, privAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*outData, OutBuf+i, *outDataSize); > - i += *outDataSize; > - unpackAuth(privAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hWrappingKey, > - BSG_TPM_ENCAUTH, KeyUsageAuth, > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > - InLength += *pcKeySize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_RESULT, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY wrappedKey; > - > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > - unpackAuth(pAuth, OutBuf+i); > - > - // Fill prgbKey > - BYTE tempBuf[1024]; > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*prgbKey, tempBuf, *pcKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > - return TPM_BAD_PARAMETER; > - > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hUnwrappingKey); > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > - InLength += cWrappedKeyBlobSize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, > - OutBuf+i, > - phKeyTCSI); > - unpackAuth(pAuth, OutBuf+i); > - > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hKey); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, hKey)) { > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - } > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (bytesRequested == NULL || *randomBytes == NULL){ > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, bytesRequested); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TPM_NONCE, &antiReplay); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - i += BSG_UnpackList(OutBuf+i, 2, > - BSG_TPM_PUBKEY, &pubEK, > - BSG_TPM_DIGEST, checksum); > - > - // fill EndorsementKey > - BYTE tempBuf[1024]; > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData) { // out > - > - TDDL_RESULT hRes; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > - //FIXME: Add Context Management > - hRes = TDDL_TransmitData( inData, > - inDataSize, > - outData, > - outDataSize); > - > - if (hRes == TDDL_SUCCESS) { > - return TPM_SUCCESS; > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > - return TPM_IOERROR; > - } > - > -} > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > deleted file mode 100644 > index 83b9cd0..0000000 > --- a/tools/vtpm_manager/tcs/tcs.h > +++ /dev/null > @@ -1,245 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.h > -// > -// This file declares the TCS API > -// > -// ================================================================== > - > -#ifndef __TCS_H__ > -#define __TCS_H__ > - > -#include "tcg.h" > -#include "contextmgr.h" > -#include "buffer.h" > - > -#define HANDLE_NULL 0 > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCS_create(); > -void TCS_destroy(); > - > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > - > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > - > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr ); //out > - > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory); // in > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -// TPM v1.1B Command Set > - > -// Authorzation > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0 // out > - ); > - > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP // out > - ); > - > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle // in > - ); > - > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle, // in > - TPM_RESOURCE_TYPE resourceType //in > - ); > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_NONCE antiReplay, // in > - UINT32* PcrDataSize, // in, out > - BYTE** PcrData, // in, out > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData // out > - ); > - > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data // out > - ); > - > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE newContents, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE* dirValue // out > - ); > - > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData // out > - ); > - > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth // in, out > - ); > - > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC // out > - ); > - > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey, // in > - TCS_AUTH* pAuth, // in, out > - UINT32* pcPubKeySize, // out > - BYTE** prgbPubKey // out > - ); > - > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey // in > - ); > - > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 areaToSignSize, // in > - BYTE* areaToSign, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes // out > - ); > - > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 inDataSize, // in > - BYTE* inData // in > - ); > - > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum // out > - ); > - > - > -// Non-Standard TCSP calls > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > - > -//Give direct access to TransmitData. > -// Key and Auth Management is done before transfering command to TDDL. > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData); // out > - > -///////////// Private Functions //////////////////// > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > - > -#endif //TCS_H > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > deleted file mode 100644 > index e7e54f1..0000000 > --- a/tools/vtpm_manager/tcs/tpmddl.h > +++ /dev/null > @@ -1,69 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmddl.c > -// > -// This file defines the TDDLI API > -// > -// ================================================================== > - > -#ifndef __TPMDDL_H__ > -#define __TPMDDL_H__ > - > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > - > -#define TDDL_E_FAIL 1 > -#define TDDL_E_SUCCESS 0 > -#define TDDL_SUCCESS 0 > - > -typedef unsigned int TDDL_UINT32; > -typedef TDDL_UINT32 TDDL_RESULT; > -typedef unsigned char TDDL_BYTE; > - > -TDDL_RESULT TDDL_Open(); > -void TDDL_Close(); > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize); > -TDDL_RESULT TDDL_GetStatus(); > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > - > -#endif // __TPMDDL_H__ > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > deleted file mode 100644 > index 74bbdca..0000000 > --- a/tools/vtpm_manager/tcs/transmit.c > +++ /dev/null > @@ -1,147 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "tpmddl.h" > - > -// flag to track whether TDDL has been opened > -static int g_TDDL_open = 0; > -static int g_tx_fd = -1; // the fd to the TPM > - > -#ifndef DUMMY_TPM > - #define TPM_TX_FNAME "/dev/tpm0" > - static int *g_rx_fdp = &g_tx_fd; > -#else > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > - static int g_rx_fd = -1; > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > -#endif > - > -TPM_RESULT > -TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize) { > - TPM_RESULT status = TPM_SUCCESS; > - TDDL_UINT32 i; > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > - for(i = 0 ; i < insize ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - ssize_t size = 0; > - > - // send the request > - size = write (g_tx_fd, in, insize); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - else if ((TDDL_UINT32) size < insize) { > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > - // ... ? > - } > - > - // read the response > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > - for(i = 0 ; i < size ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - *outsize = size; > - // close connection > - goto egress; > - > - abort_egress: > - egress: > - return status; > -} > - > -TPM_RESULT TDDL_Open() { > - > - TDDL_RESULT status = TDDL_SUCCESS; > - > - if (g_TDDL_open) > - return TPM_FAIL; > - > -#ifdef DUMMY_TPM > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > -#endif > - > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > - if (g_tx_fd < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > - return TPM_IOERROR; > - } > - > - g_TDDL_open = 1; > - > - return status; > -} > - > -void TDDL_Close() { > - if (! g_TDDL_open) > - return; > - > - if (g_tx_fd>= 0) { > - if (close(g_tx_fd) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - g_tx_fd = -1; > - } > - > - if (*g_rx_fdp>= 0) { > - if (close(*g_rx_fdp) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - *g_rx_fdp = -1; > - } > - > - g_TDDL_open = 0; > - > -} > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > deleted file mode 100644 > index 36bc38f..0000000 > --- a/tools/vtpm_manager/util/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCGUtils.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > deleted file mode 100644 > index fa36ce7..0000000 > --- a/tools/vtpm_manager/util/bsg.c > +++ /dev/null > @@ -1,829 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.cpp > -// > -// This file will handle all the TPM Byte Stream functions > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include "tcg.h" > -#include "crypto.h" > -#include "bsg.h" > -#include "log.h" > - > -static int g_log_recursion_level = 0; > - > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > -// will complain! > -#define BSG_MAX_BUF_SIZE (1<<18) > - > -#define bsglog(fmt, ...) do { \ > - int __i; \ > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > - } \ > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > - } while (0) > - > - > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > -//BOOL dummy1 = BSG_static_selfcheck(); > - > - > -// Interpretting Types > -// ------------------- > -// > -// Incoming Types are composed of two parts {format, info} squished into a > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > -// data it is. If the first 4 bits are zero the info corresponds to a value in > -// BSG_s_fmt[]. This is a structure whose composition is described in > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > -// data (in bytes) being passed in. For example a UINT32 being passed in would > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > -// this is interpretted as the end of the structure, and the result is returned. > - > -// these flags are mutually exclusive, so I'll just make them > -// format values which indicate the semantics of the 'info' part and the source > -// data. The above description has been accordingly adjusted. > - > -// format values for determining what type of data the incoming type is > -// it's a 4 bit value, occupying the high 4 bits > -#define __FMT_CONST (1UL << 28) // Constant sized value > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > -#define __FMT_HSIZE (4UL << 28) // A number of handles > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > - // of {size32, data} but we're to pack only the > - // data as that is already packed, and so > - // can/must be unpacked without > - // explicitly reading it size > - > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > - > -// constant (8/16/32-bits) > -#define FMT_U8 (__FMT_CONST | 1UL) > -#define FMT_U16 (__FMT_CONST | 2UL) > -#define FMT_U32 (__FMT_CONST | 4UL) > - > -// const with a compiler-computed size > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > - > -// other data (size bytes) > -// Used primarily for DIGESTS -> FMT_DATA(20) > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > - > -// 16/32-bit size followed by N bytes of data > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > - > -// 16-bit size followed by N key handles > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > - > -#define DIGEST_SIZE 20 > -typedef BSG_UINT32 BSG_HANDLE; > - > -// TCPA_AUTH has 11 fields! > -#define MAX_FIELDS 11 > -typedef struct BSG_Format > -{ > - BSG_Type type; > - const char* name; > - BSG_UINT32 fields[MAX_FIELDS + 1]; > -} BSG_Format; > - > -/* > - * TCPA structure data formats > - */ > -// this has to be manually kept in sync with the > -// Type enum!! the static_selfcheck() function should be used regularly! > -static BSG_Format s_fmt[] = > -{ > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > - > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > - > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > - > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > - {FMT_SIZE16_HANDLES, 0}}, > - > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, // the PCR_INFO > - BSG_TPM_STORE_PUBKEY, > - FMT_SIZE32_DATA, // the encrypted part > - 0}}, > - > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > - BSG_TPM_PUBKEY, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_DIGEST, 0}}, > - > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_RESULT, 0 }}, > - > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > - BSG_TPM_DIGEST, > - BSG_TPM_DIGEST, > - FMT_DATA(2), > - FMT_SIZE32_DATA, 0}}, > - > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > - FMT_SIZE32_DATA, > - 0} }, > - > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_COMPOSITE_HASH, > - 0} }, > - > - > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > - BSG_TPM_VERSION, > - FMT_SIZE32_DATA, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - FMT_SIZE16_DATA, > - 0}}, > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - FMT_U32, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > - BSG_TPM_VERSION, > - FMT_DATA(4), > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_NONCE, > - 0}}, > - > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > - BSG_TPM_VERSION, > - FMT_U32, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_PUBKEY, > - 0}}, > - > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > - > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > - FMT_U8, > - FMT_U8, > - 0}}, > - > - {BSG_TCS_AUTH, "TCS_AUTH", { > - BSG_TYPE_UINT32, > - BSG_TPM_NONCE, > - BSG_TPM_NONCE, > - BSG_TYPE_BOOL, > - BSG_TPM_AUTHDATA, > - 0}}, > - > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, > - BSG_TPM_STORE_PUBKEY, > - 0}}, > - > - {BSG_PACKED, "BSG_PACKED", { > - __FMT_PACKED, > - 0 }}, > - > - {BSG_TYPE_MAX, "", {0}}, > -}; > - > - > -static const BSG_Format* find_format (BSG_Type t) { > - BSG_Format * f = s_fmt; > - > - if (t >= BSG_TYPE_MAX) { > - return NULL; > - } > - > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > - // sure to run the static_selfcheck() to make sure > - f = s_fmt + (t - BSG_TYPE_FIRST); > - > - return f; > -} > - > -// > -// a consistency-checking routine which can be run at compile time > -// (ie. immediately after compilation) > -// > -// tasks: > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > -// > -// conditions: > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > -// Type has value 0, not 1 > -// > -// FIXME: should have a function be passed in here which is called if the test > -// fails. Then the caller can decide what to do: abort, notify, whatever > -// > -BOOL BSG_static_selfcheck () > -{ > - int i; > - > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > - bsglog ("failure at %i, allegedly %s\n", > - i, s_fmt[i - BSG_TYPE_FIRST].name); > - abort(); > - return FALSE; > - } > - } > - > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > - return TRUE; > -} > - > - > -/** > - * Flatten a TCPA structure into a buffer in big-endian format > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * @dst: (OUT) flattened data > - * Returns: Flattened size or -1 for unknown types > - */ > -// make it so that it can just run through the whole process and return > -// the packed size, without packing anything. this will be done if dst is NULL. > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > -{ > - // check incoming parameters > - if (*src == NULL) > - return 0; > - > - const BSG_BYTE* s = *src; > - BSG_BYTE* d = dst; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > - { > - BSG_UINT32 val = 0; > - switch (size) { > - case 1: val = * (BYTE*) s; break; > - case 2: val = * (unsigned short*) s; break; > - case 4: val = * (BSG_UINT32*) s; break; > - } > - if (dst) > - BSG_PackConst(val, size, d); > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > - // this is used. > - > - if (dst) { > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > - memcpy(d, s, size); > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = 0; > - switch (size) { > - case 1: psize = * (BYTE*) s; break; > - case 2: psize = * (unsigned short*) s; break; > - case 4: psize = * (BSG_UINT32*) s; break; > - } > - > - if (dst) > - BSG_PackConst(psize, size, d); > - > - s += size; > - d += size; > - > - // now 's' points to an address, so cast it to BSG_BYTE** > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > - s += sizeof(BSG_BYTE*); > - > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > - > - } > - d += psize * sizeof(BSG_HANDLE); > - } else {// If it's not psize handles, it's psize data. > - if (psize > 0) { > - if (dst) { > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > - psize, pdata, d); > - memcpy(d, pdata, psize); > - } > - } > - d += psize; > - } > - } else if (format == __FMT_PACKED) { > - // the source buffer is a pack_constbuf_t, which has a size and a > - // pointer. just copy the buffer value, the size is not included in the > - // output stream. > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > - > - if (dst) { > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > - buf->size, buf->data, d); > - memcpy(d, buf->data, buf->size); > - } > - > - s += buf->size; > - d += buf->size; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > - return -1; > - } > - > - if (dst) > - bsglog ("BSG_Pack type %s\n", x->name); > - > - > - // iterate through the fields > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize; > - > - g_log_recursion_level++; > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > - g_log_recursion_level--; > - > - if (fsize <= 0) > - return fsize; > - > - d += fsize; > - } > - } else { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > - return -1; > - } > - > - *src = s; > - return (d - dst); > -} > - > -/** > - * Unflatten a TCPA structure from a buffer in big-endian format > - * @type: TCPA structure type > - * @src: flattened data > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > - * Returns: Flattened size > - * Note: Returns flattened size NOT the unpacked structure size > - */ > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > - // check incoming parameters > - if (src == NULL) > - return 0; > - > - > - const BSG_BYTE* s = src; > - BSG_BYTE* d = dst ? *dst:NULL; > - if (dst && !d) > - dst = NULL; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > - > - BSG_UINT32 val = BSG_UnpackConst(s, size); > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > - case 2: *(unsigned short*) d = (unsigned short) val; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > - } > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > - if (dst) > - memcpy(d, s, size); > - > - d += size; > - s += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > - > - if (psize > BSG_MAX_BUF_SIZE) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > - BSG_MAX_BUF_SIZE); > - return -1; > - } > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > - } > - } > - > - s += size; > - d += size; > - > - BSG_BYTE* pdata = NULL; > - > - if (psize) { > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > - if (!pdata) > - return -1; > - > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) { > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > - } > - } > - s += psize * sizeof(BSG_HANDLE); > - } else { // If it's not psize handles, it's psize data. > - if (dst) { > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > - if (!pdata) > - return -1; > - memcpy(pdata, s, psize); > - } > - s += psize; > - } > - } > - if (dst) > - *(void**) d = pdata; > - > - d += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking! > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return -1; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > - return -1; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > - if (fsize <= 0) > - return fsize; > - s += fsize; > - } > - } > - > - if (dst) > - *dst = d; > - return (s - src); > -} > - > -/** > - * Free memory associated with unpacked TCPA structure > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * Note: Destroy should be called on all structures created with Unpack > - * to ensure that any allocated memory is freed > - */ > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > - BSG_BYTE* s = *src; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if ((src == NULL) || (*src == NULL)) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > - return; > - } > - > - if (format == __FMT_CONST || format == __FMT_DATA) > - s += size; > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > - s += size; > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > - free(ptr); > - s += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking, hence also for Destroy() > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return; > - } else if (format == 0) { > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > - return; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) > - BSG_Destroy_private((BSG_Type) *f, &s); > - } > - > - *src = s; > -} > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > -{ > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > - return BSG_Pack_private(type, &src2, dst); > -} > - > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > -{ > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > -} > - > -void BSG_Destroy(BSG_Type type, void* src) > -{ > - BSG_BYTE* src2 = (BSG_BYTE*) src; > - BSG_Destroy_private(type, &src2); > -} > - > -/** > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > - * @val: constant value > - * @size: constant size in bytes (1, 2, or 4) > - * @dst: (OUT) buffer > - */ > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > - > - switch (size) { > - case 4: > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[3] = (BSG_BYTE)(val & 0xff); > - break; > - case 2: > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[1] = (BSG_BYTE)(val & 0xff); > - break; > - case 1: > - dst[0] = (BSG_BYTE)(val & 0xff); > - break; > - } > -} > - > -/** > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > - * @src: buffer > - * @size: constant size in bytes (1, 2, or 4) > - */ > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > - BSG_UINT32 val = 0; > - > - if (src == NULL) > - return 0; > - > - switch (size) { > - case 4: > - val = (((BSG_UINT32) src[0]) << 24 > - | ((BSG_UINT32) src[1]) << 16 > - | ((BSG_UINT32) src[2]) << 8 > - | (BSG_UINT32) src[3]); > - break; > - case 2: > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > - break; > - case 1: > - val = (BSG_UINT32) src[0]; > - break; > - } > - return val; > -} > - > -// Pack a list of parameters. Beware not to send values, but rather you must > -// send a pointer to your values Instead. This includes UINT32's. > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > - int ParamNumber; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size=0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > - } > - > - va_end (paramList); > - > - return size; > -} > - > -// Unpack a list of parameters. > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size = 0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - > - size += BSG_Unpack(format, src + size, val); > - } > - > - va_end( paramList ); > - > - return size; > -} > - > -// Destroy any memory allocated by calls to unpack > -void BSG_DestroyList(int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type argType; > - BSG_BYTE* paramValue = NULL; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - argType = (BSG_Type) va_arg( paramList, int ); > - paramValue = va_arg( paramList, BSG_BYTE* ); > - > - BSG_Destroy(argType, paramValue); > - } > - > - va_end( paramList ); > - > - return; > -} > - > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > - int i; > - > - for (i = 0; i < numParams; i++) > - BSG_Destroy (params[i].type, params[i].addr); > - > - return TPM_SUCCESS; > -} > - > - > -// > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later > -// > - > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > - int size = BSG_Pack (type, src, NULL); > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - size = BSG_Pack(type, src, dest); > - *o_dst = dest; > - return size; > -} > - > - > - > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > - va_list args; > - int size; > - > - va_start (args, ParamCount); > - size = BSG_PackList (NULL, ParamCount, args); > - va_end (args); > - > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - va_start (args, ParamCount); > - size = BSG_PackList (dest, ParamCount, args); > - va_end (args); > - > - *outBuffer = dest; > - return size; > -} > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > deleted file mode 100644 > index 0896812..0000000 > --- a/tools/vtpm_manager/util/bsg.h > +++ /dev/null > @@ -1,166 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.h > -// > -// This file contains API's for the TPM Byte Stream functions > -// > -// ================================================================== > - > -#ifndef __BSG_H__ > -#define __BSG_H__ > - > -#include > -#include "buffer.h" > - > -typedef unsigned int BSG_UINT32; > -typedef unsigned char BSG_BYTE; > - > -// forward decl > -struct pack_const_tuple_t; > - > -struct pack_tuple_t; > - > - > -/** > - * Byte stream generator > - */ > -// this has to be manually kept in sync with the > -// s_fmt array!! > -// but now we have a self-check function which can make sure things are well > -// (if used!) > -typedef enum BSG_Type > -{ > - BSG_TYPE_FIRST = 1, > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > - // unused/special value > - BSG_TYPE_UINT16, > - BSG_TYPE_BYTE, > - BSG_TYPE_BOOL, > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > - // a pointer to that much data. can pass a > - // struct pack_buf_t as the param > - BSG_TPM_TAG, > - BSG_TPM_HANDLE, > - BSG_TPM_RESULT, > - BSG_TPM_RESOURCE_TYPE, > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_PROTOCOL_ID, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTHDATA, > - BSG_TPM_SECRET, > - BSG_TPM_ENCAUTH, > - BSG_TPM_PAYLOAD_TYPE, > - > - BSG_TPM_VERSION, > - BSG_TPM_DIGEST, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_NONCE, > - BSG_TPM_KEY_HANDLE, > - BSG_TPM_KEY_HANDLE_LIST, > - BSG_TPM_KEY_PARMS, > - BSG_TPM_RSA_KEY_PARMS, > - BSG_TPM_STORE_PUBKEY, > - BSG_TPM_PUBKEY, > - BSG_TPM_KEY, > - > - BSG_TPM_MIGRATIONKEYAUTH, > - BSG_TCPA_AUDIT_EVENT, > - BSG_TCPA_EVENT_CERT, > - BSG_TPM_PCR_SELECTION, > - BSG_TPM_PCR_COMPOSITE, > - BSG_TPM_PCR_INFO, > - BSG_TPM_STORED_DATA, > - BSG_TPM_SYMMETRIC_KEY, > - BSG_TPM_STORE_PRIVKEY, > - BSG_TPM_STORE_ASYMKEY, > - BSG_TPM_MIGRATE_ASYMKEY, > - BSG_TPM_QUOTE_INFO, > - BSG_TPM_IDENTITY_CONTENTS, > - BSG_TPM_PCRVALUE, > - BSG_TCPA_PCR_FLAGS, > - BSG_TCS_AUTH, > - > - // this is the BSG_TPM_KEY struct without the encData field > - BSG_TPM_KEY_NONSENSITIVE, > - > - BSG_PACKED, > - > - BSG_TYPE_MAX > -} BSG_Type; > - > -struct pack_const_tuple_t { > - BSG_Type type; > - const void * addr; > -}; > - > - > -typedef struct pack_tuple_t { > - BSG_Type type; > - void * addr; > -} pack_tuple_t; > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > -void BSG_Destroy(BSG_Type type, void* src); > - > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later. returns size of allocated buffer, or -1 in case > -// allocation failed > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > - > -// a va_list version of PackList > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > -void BSG_DestroyList(int ParamCount, ... ); > - > -// wrapper of PackList which uses a buffer_t > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > - > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > - > -BOOL BSG_static_selfcheck (); > - > -#endif > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > deleted file mode 100644 > index df48bc2..0000000 > --- a/tools/vtpm_manager/util/buffer.c > +++ /dev/null > @@ -1,226 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "buffer.h" > - > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > - > -// > -// buffer functions! > -// > - > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > - if (initsize == 0) { > - memset(buf, 0, sizeof(*buf)); > - return TPM_SUCCESS; > - } > - > - > - buf->bytes = (BYTE*) malloc (initsize); > - if (buf->bytes == NULL) > - return TPM_RESOURCES; > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - > - if (initval) > - memcpy (buf->bytes, initval, initsize); > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - buf->bytes = initval; > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > - buf->is_owner = TRUE; > - > - return status; > -} > - > - > - > -// make an alias to a constant array > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > - // TODO: try to enforce the const things somehow! > - buf->bytes = (BYTE*) val; > - buf->size = size; > - buf->alloc_size = 0; // this field is now unneeded > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t len) { > - if (offset + len > b->size) { > - return TPM_NOSPACE; > - } > - > - buf->bytes = b->bytes + offset; > - buf->size = len > 0 ? len : b->size - offset; > - > - //VS/ buf->alloc_size = 0; > - if (len ==0) > - buf->alloc_size = b->alloc_size - offset; > - else > - buf->alloc_size = MIN(b->alloc_size - offset, len); > - > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias buffer_t into bytestream, with given length > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > - > - buf->size = size; > - buf->alloc_size = size; > - buf->bytes = val; > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > - > - > -// copy into the start of dest > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > -{ > - TPM_RESULT status = TPM_SUCCESS; > - > - if (dest->alloc_size < src->size) { > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > - } > - > - memcpy (dest->bytes, src->bytes, src->size); > - dest->size = src->size; > - > - //VS/ dest->is_owner = TRUE; > - > - abort_egress: > - > - return status; > -} > - > - > - > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > -} > - > - > -void buffer_memset (buffer_t * buf, BYTE b) { > - memset (buf->bytes, b, buf->size); > -} > - > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (buf->alloc_size < buf->size + len) { > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > - } > - > - memcpy (buf->bytes + buf->size, bytes, len); > - > - buf->size += len; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -tpm_size_t buffer_len (const buffer_t* buf) { > - return buf->size; > -} > - > -TPM_RESULT buffer_free (buffer_t * buf) { > - if (buf && buf->is_owner && buf->bytes != NULL) { > - free (buf->bytes); > - buf->bytes = NULL; > - buf->size = buf->alloc_size = 0; > - > - } > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > - > - // we want to realloc to twice the size, or the new size, whichever > - // bigger > - > - BYTE * tmpbuf = NULL; > - > - newsize = MAX (buf->alloc_size * 2, newsize); > - > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > - if (tmpbuf == NULL) > - return TPM_SIZE; > - > - > - buf->bytes = tmpbuf; > - buf->alloc_size = newsize; > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > deleted file mode 100644 > index d8a9abc..0000000 > --- a/tools/vtpm_manager/util/buffer.h > +++ /dev/null > @@ -1,95 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_BUFFER_H__ > -#define __VTPM_BUFFER_H__ > - > -#include // for pointer NULL > -#include "tcg.h" > - > -typedef UINT32 tpm_size_t; > - > -// first version, probably will be expanded... > - > -#define NULL_BUF {0,0,0,0} > - > -typedef struct { > - // private!! > - tpm_size_t size, alloc_size; > - BYTE * bytes; > - > - BOOL is_owner; // do we own this buffer, and need to free it? > -} buffer_t; > - > -// allocate the buffer if initsize > 0, copying over initval if provided > -TPM_RESULT buffer_init (buffer_t * buf, > - tpm_size_t initsize, > - const BYTE* initval); > - > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > -TPM_RESULT buffer_init_convert (buffer_t * buf, > - tpm_size_t initsize, > - BYTE* initval); > - > -// make an alias to a constant array, no copying > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t); > - > -// make an alias buffer into a bytestream > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > - tpm_size_t size, BYTE* val); > - > -// "copy constructor" > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > - > - > -// copy into the start of a > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > - > -// are they equal? > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > - > -// set the buffer to a constant byte > -void buffer_memset (buffer_t * buf, BYTE b); > - > -tpm_size_t buffer_len (const buffer_t* buf); > - > -TPM_RESULT buffer_free (buffer_t * buf); > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > - > -#endif // _TOOLS_H_ > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > deleted file mode 100644 > index aff0e2b..0000000 > --- a/tools/vtpm_manager/util/hashtable.c > +++ /dev/null > @@ -1,316 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.c > - * - tools/blktap2/drivers/hashtable.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include > -#include > -#include > -#include > - > -/* > -Credit for primes table: Aaron Krowne > - http://br.endernet.org/~akrowne/ > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > -*/ > -static const unsigned int primes[] = { > -53, 97, 193, 389, > -769, 1543, 3079, 6151, > -12289, 24593, 49157, 98317, > -196613, 393241, 786433, 1572869, > -3145739, 6291469, 12582917, 25165843, > -50331653, 100663319, 201326611, 402653189, > -805306457, 1610612741 > -}; > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > -const float max_load_factor = 0.65; > - > -/*****************************************************************************/ > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashf) (void*), > - int (*eqf) (void*,void*)) > -{ > - struct hashtable *h; > - unsigned int pindex, size = primes[0]; > - /* Check requested hashtable isn't too large */ > - if (minsize > (1u << 30)) return NULL; > - /* Enforce size as prime */ > - for (pindex=0; pindex < prime_table_length; pindex++) { > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > - } > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > - if (NULL == h) return NULL; /*oom*/ > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > - memset(h->table, 0, size * sizeof(struct entry *)); > - h->tablelength = size; > - h->primeindex = pindex; > - h->entrycount = 0; > - h->hashfn = hashf; > - h->eqfn = eqf; > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_init(&h->mutex, NULL); > -#endif > - return h; > -} > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k) > -{ > - unsigned int i = h->hashfn(k); > - i += ~(i << 9); > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > - i += (i << 4); > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > - return i; > -} > - > -/*****************************************************************************/ > -static int > -hashtable_expand(struct hashtable *h) > -{ > - /* Double the size of the table to accomodate more entries */ > - struct entry **newtable; > - struct entry *e; > - struct entry **pE; > - unsigned int newsize, i, index; > - /* Check we're not hitting max capacity */ > - if (h->primeindex == (prime_table_length - 1)) return 0; > - newsize = primes[++(h->primeindex)]; > - > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > - if (NULL != newtable) > - { > - memset(newtable, 0, newsize * sizeof(struct entry *)); > - /* This algorithm is not 'stable'. ie. it reverses the list > - * when it transfers entries between the tables */ > - for (i = 0; i < h->tablelength; i++) { > - while (NULL != (e = h->table[i])) { > - h->table[i] = e->next; > - index = indexFor(newsize,e->h); > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - free(h->table); > - h->table = newtable; > - } > - /* Plan B: realloc instead */ > - else > - { > - newtable = (struct entry **) > - realloc(h->table, newsize * sizeof(struct entry *)); > - if (NULL == newtable) { (h->primeindex)--; return 0; } > - h->table = newtable; > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > - for (i = 0; i < h->tablelength; i++) { > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > - index = indexFor(newsize,e->h); > - if (index == i) > - { > - pE = &(e->next); > - } > - else > - { > - *pE = e->next; > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - } > - } > - h->tablelength = newsize; > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > - return -1; > -} > - > -/*****************************************************************************/ > -unsigned int > -hashtable_count(struct hashtable *h) > -{ > - unsigned int count; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - count = h->entrycount; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return count; > -} > - > -/*****************************************************************************/ > -int > -hashtable_insert(struct hashtable *h, void *k, void *v) > -{ > - /* This method allows duplicate keys - but they shouldn't be used */ > - unsigned int index; > - struct entry *e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - if (++(h->entrycount) > h->loadlimit) > - { > - /* Ignore the return value. If expand fails, we should > - * still try cramming just this value into the existing table > - * -- we may not have memory for a larger table, but one more > - * element may be ok. Next time we insert, we'll try expanding again.*/ > - hashtable_expand(h); > - } > - e = (struct entry *)malloc(sizeof(struct entry)); > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > - e->h = hash(h,k); > - index = indexFor(h->tablelength,e->h); > - e->k = k; > - e->v = v; > - e->next = h->table[index]; > - h->table[index] = e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return -1; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_search(struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - unsigned int hashvalue, index; > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - e = h->table[index]; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return e->v; > - } > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_remove(struct hashtable *h, void *k) > -{ > - /* TODO: consider compacting the table when the load factor drops enough, > - * or provide a 'compact' method. */ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - struct entry **pE; > - void *v; > - unsigned int hashvalue, index; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hash(h,k)); > - pE = &(h->table[index]); > - e = *pE; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - *pE = e->next; > - h->entrycount--; > - v = e->v; > - freekey(e->k); > - free(e); > - return v; > - } > - pE = &(e->next); > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -/* destroy */ > -void > -hashtable_destroy(struct hashtable *h, int free_values) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - unsigned int i; > - struct entry *e, *f; > - struct entry **table = h->table; > - if (free_values) > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > - } > - } > - else > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f); } > - } > - } > - free(h->table); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_destroy(&h->mutex); > -#endif > - free(h); > -} > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > deleted file mode 100644 > index dedc60a..0000000 > --- a/tools/vtpm_manager/util/hashtable.h > +++ /dev/null > @@ -1,204 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.h > - * - tools/blktap2/drivers/hashtable.h > - */ > - > -#ifndef __HASHTABLE_CWC22_H__ > -#define __HASHTABLE_CWC22_H__ > - > -struct hashtable; > - > -/* Example of use: > - * > - * struct hashtable *h; > - * struct some_key *k; > - * struct some_value *v; > - * > - * static unsigned int hash_from_key_fn( void *k ); > - * static int keys_equal_fn ( void *key1, void *key2 ); > - * > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > - * > - * (initialise k and v to suitable values) > - * > - * if (! hashtable_insert(h,k,v) ) > - * { exit(-1); } > - * > - * if (NULL == (found = hashtable_search(h,k) )) > - * { printf("not found!"); } > - * > - * if (NULL == (found = hashtable_remove(h,k) )) > - * { printf("Not found\n"); } > - * > - */ > - > -/* Macros may be used to define type-safe(r) hashtable access functions, with > - * methods specialized to take known key and value types as parameters. > - * > - * Example: > - * > - * Insert this at the start of your file: > - * > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > - * > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > - * These operate just like hashtable_insert etc., with the same parameters, > - * but their function signatures have 'struct some_key *' rather than > - * 'void *', and hence can generate compile time errors if your program is > - * supplying incorrect data as a key (and similarly for value). > - * > - * Note that the hash and key equality functions passed to create_hashtable > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > - * a difficult issue as they're only defined and passed once, and the other > - * functions will ensure that only valid keys are supplied to them. > - * > - * The cost for this checking is increased code size and runtime overhead > - * - if performance is important, it may be worth switching back to the > - * unsafe methods once your program has been debugged with the safe methods. > - * This just requires switching to some simple alternative defines - eg: > - * #define insert_some hashtable_insert > - * > - */ > - > -/***************************************************************************** > - * create_hashtable > - > - * @name create_hashtable > - * @param minsize minimum initial size of hashtable > - * @param hashfunction function for hashing keys > - * @param key_eq_fn function for determining key equality > - * @return newly created hashtable or NULL on failure > - */ > - > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashfunction) (void*), > - int (*key_eq_fn) (void*,void*)); > - > -/***************************************************************************** > - * hashtable_insert > - > - * @name hashtable_insert > - * @param h the hashtable to insert into > - * @param k the key - hashtable claims ownership and will free on removal > - * @param v the value - does not claim ownership > - * @return non-zero for successful insertion > - * > - * This function will cause the table to expand if the insertion would take > - * the ratio of entries to table size over the maximum load factor. > - * > - * This function does not check for repeated insertions with a duplicate key. > - * The value returned when using a duplicate key is undefined -- when > - * the hashtable changes size, the order of retrieval of duplicate key > - * entries is reversed. > - * If in doubt, remove before insert. > - */ > - > -int > -hashtable_insert(struct hashtable *h, void *k, void *v); > - > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > -{ \ > - return hashtable_insert(h,k,v); \ > -} > - > -/***************************************************************************** > - * hashtable_search > - > - * @name hashtable_search > - * @param h the hashtable to search > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * > -hashtable_search(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_search(h,k)); \ > -} > - > -/***************************************************************************** > - * hashtable_remove > - > - * @name hashtable_remove > - * @param h the hashtable to remove the item from > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * /* returns value */ > -hashtable_remove(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_remove(h,k)); \ > -} > - > - > -/***************************************************************************** > - * hashtable_count > - > - * @name hashtable_count > - * @param h the hashtable > - * @return the number of items stored in the hashtable > - */ > -unsigned int > -hashtable_count(struct hashtable *h); > - > - > -/***************************************************************************** > - * hashtable_destroy > - > - * @name hashtable_destroy > - * @param h the hashtable > - * @param free_values whether to call 'free' on the remaining values > - */ > - > -void > -hashtable_destroy(struct hashtable *h, int free_values); > - > -#endif /* __HASHTABLE_CWC22_H__ */ > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > deleted file mode 100644 > index dcf42c8..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.c > +++ /dev/null > @@ -1,236 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include "hashtable_itr.h" > -#include /* defines NULL */ > - > -/*****************************************************************************/ > -/* hashtable_iterator - iterator constructor */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h) > -{ > - unsigned int i, tablelength; > - struct hashtable_itr *itr = (struct hashtable_itr *) > - malloc(sizeof(struct hashtable_itr)); > - if (NULL == itr) return NULL; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - itr->h = h; > - itr->e = NULL; > - itr->parent = NULL; > - tablelength = h->tablelength; > - itr->index = tablelength; > - if (0 == h->entrycount) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > - } > - > - for (i = 0; i < tablelength; i++) > - { > - if (NULL != h->table[i]) > - { > - itr->e = h->table[i]; > - itr->index = i; > - break; > - } > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > -} > - > -/*****************************************************************************/ > -/* key - return the key of the (key,value) pair at the current position */ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void * > -hashtable_iterator_key(struct hashtable_itr *i) > -{ return i->e->k; } > - > -void * > -hashtable_iterator_value(struct hashtable_itr *i) > -{ return i->e->v; } > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - unsigned int j,tablelength; > - struct entry **table; > - struct entry *next; > - int ret; > - if (NULL == itr->e) { /* stupidity check */ > - ret = 0; > - goto egress; > - } > - > - next = itr->e->next; > - if (NULL != next) > - { > - itr->parent = itr->e; > - itr->e = next; > - ret = -1; > - goto egress; > - } > - > - tablelength = itr->h->tablelength; > - itr->parent = NULL; > - if (tablelength <= (j = ++(itr->index))) > - { > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - table = itr->h->table; > - while (NULL == (next = table[j])) > - { > - if (++j >= tablelength) > - { > - itr->index = tablelength; > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - } > - itr->index = j; > - itr->e = next; > - ret = -1; > - > - egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -/* remove - remove the entry at the current iterator position > - * and advance the iterator, if there is a successive > - * element. > - * If you want the value, read it before you remove: > - * beware memory leaks if you don't. > - * Returns zero if end of iteration. */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - struct entry *remember_e, *remember_parent; > - int ret; > - > - /* Do the removal */ > - if (NULL == (itr->parent)) > - { > - /* element is head of a chain */ > - itr->h->table[itr->index] = itr->e->next; > - } else { > - /* element is mid-chain */ > - itr->parent->next = itr->e->next; > - } > - /* itr->e is now outside the hashtable */ > - remember_e = itr->e; > - itr->h->entrycount--; > - freekey(remember_e->k); > - > - /* Advance the iterator, correcting the parent */ > - remember_parent = itr->parent; > - ret = hashtable_iterator_advance(itr); > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > - free(remember_e); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -int /* returns zero if not found */ > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e, *parent; > - unsigned int hashvalue, index; > - int ret; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - > - e = h->table[index]; > - parent = NULL; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - itr->index = index; > - itr->e = e; > - itr->parent = parent; > - itr->h = h; > - ret= -1; > - goto egress; > - } > - parent = e; > - e = e->next; > - } > - ret = 0; > - > -egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return ret; > -} > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > deleted file mode 100644 > index 35654e0..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.h > +++ /dev/null > @@ -1,109 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.h > - */ > - > - > -#ifndef __HASHTABLE_ITR_CWC22__ > -#define __HASHTABLE_ITR_CWC22__ > -#include "hashtable.h" > -#include "hashtable_private.h" /* needed to enable inlining */ > - > -/*****************************************************************************/ > -/* This struct is only concrete here to allow the inlining of two of the > - * accessor functions. */ > -struct hashtable_itr > -{ > - struct hashtable *h; > - struct entry *e; > - struct entry *parent; > - unsigned int index; > -}; > - > - > -/*****************************************************************************/ > -/* hashtable_iterator > - */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h); > - > -/*****************************************************************************/ > -/* hashtable_iterator_key > - * - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_key(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_value(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* remove - remove current element and advance the iterator to the next element > - * NB: if you need the value to free it, read it before > - * removing. ie: beware memory leaks! > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* search - overwrite the supplied iterator, to point to the entry > - * matching the supplied key. > - h points to the hashtable to be searched. > - * returns zero if not found. */ > -int > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > -{ \ > - return (hashtable_iterator_search(i,h,k)); \ > -} > - > - > - > -#endif /* __HASHTABLE_ITR_CWC22__*/ > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > deleted file mode 100644 > index d87a7f9..0000000 > --- a/tools/vtpm_manager/util/hashtable_private.h > +++ /dev/null > @@ -1,96 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable_private.h > - * - tools/blktap2/drivers/hashtable_private.h > - */ > - > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > -#define __HASHTABLE_PRIVATE_CWC22_H__ > - > -#include "hashtable.h" > -#ifdef HASHTABLE_THREADED > -#include > -#endif > - > -/*****************************************************************************/ > -struct entry > -{ > - void *k, *v; > - unsigned int h; > - struct entry *next; > -}; > - > -struct hashtable { > - unsigned int tablelength; > - struct entry **table; > - unsigned int entrycount; > - unsigned int loadlimit; > - unsigned int primeindex; > - unsigned int (*hashfn) (void *k); > - int (*eqfn) (void *k1, void *k2); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_t mutex; > -#endif > -}; > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k); > - > -/*****************************************************************************/ > -/* indexFor */ > -static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > - return (hashvalue % tablelength); > -}; > - > -/* Only works if tablelength == 2^N */ > -/*static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) > -{ > - return (hashvalue & (tablelength - 1u)); > -} > -*/ > - > -/*****************************************************************************/ > -#define freekey(X) free(X) > -/*define freekey(X) ; */ > - > - > -/*****************************************************************************/ > - > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > deleted file mode 100644 > index 75fe91a..0000000 > --- a/tools/vtpm_manager/util/log.c > +++ /dev/null > @@ -1,142 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > - > -#include "buffer.h" > -#include "tcg.h" > - > -// Helper code for the consts, eg. to produce messages for error codes. > - > -typedef struct error_code_entry_t { > - TPM_RESULT code; > - char * code_name; > - char * msg; > -} error_code_entry_t; > - > -static const error_code_entry_t error_msgs [] = { > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > - > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > -}; > - > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code) { > - // just do a linear scan for now > - unsigned i; > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > - if (code == error_msgs[i].code) > - return error_msgs[i].code_name; > - > - return("Unknown Error Code"); > -} > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > deleted file mode 100644 > index 1f15f5b..0000000 > --- a/tools/vtpm_manager/util/log.h > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_LOG_H__ > -#define __VTPM_LOG_H__ > - > -#include // for uint32_t > -#include // for pointer NULL > - > -// =========================== LOGGING ============================== > - > -// the logging module numbers > -#define VTPM_LOG_CRYPTO 1 > -#define VTPM_LOG_BSG 2 > -#define VTPM_LOG_TXDATA 3 > -#define VTPM_LOG_TCS 4 > -#define VTPM_LOG_TCS_DEEP 5 > -#define VTPM_LOG_VTSP 6 > -#define VTPM_LOG_VTPM 7 > -#define VTPM_LOG_VTPM_DEEP 8 > -#define VTPM_LOG_VTSP_DEEP 9 > - > -static char *module_names[] = { "", > - "CRYPTO", > - "BSG", > - "TXDATA", > - "TCS", > - "TCS", > - "VTSP", > - "VTPM", > - "VTPM", > - "VTSP" > - }; > - > -// Default to standard logging > -#ifndef LOGGING_MODULES > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > -#endif > - > -// bit-access macros > -#define BITMASK(idx) ( 1U << (idx) ) > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > - > -#define vtpmloginfo(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > - } > - > -#define vtpmloginfomore(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, fmt,##args); \ > - } > - > -#define vtpmlogerror(module, fmt, args...) \ > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > - > -//typedef UINT32 tpm_size_t; > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code); > - > -#endif // _VTPM_LOG_H_ > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > deleted file mode 100644 > index 5c42913..0000000 > --- a/tools/vtpm_manager/util/tcg.h > +++ /dev/null > @@ -1,503 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcg.h > -// > -// This file contains all the structure and type definitions > -// > -// ================================================================== > - > -#ifndef __TCG_H__ > -#define __TCG_H__ > - > -// This pragma is used to disallow structure padding > -#pragma pack(push, 1) > - > -// *************************** TYPEDEFS ********************************* > -typedef unsigned char BYTE; > -typedef unsigned char BOOL; > -typedef unsigned short UINT16; > -typedef unsigned int UINT32; > -typedef unsigned long long UINT64; > - > -typedef UINT32 TPM_RESULT; > -typedef UINT32 TPM_PCRINDEX; > -typedef UINT32 TPM_DIRINDEX; > -typedef UINT32 TPM_HANDLE; > -typedef TPM_HANDLE TPM_AUTHHANDLE; > -typedef TPM_HANDLE TCPA_HASHHANDLE; > -typedef TPM_HANDLE TCPA_HMACHANDLE; > -typedef TPM_HANDLE TCPA_ENCHANDLE; > -typedef TPM_HANDLE TPM_KEY_HANDLE; > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > -typedef UINT32 TPM_RESOURCE_TYPE; > -typedef UINT32 TPM_COMMAND_CODE; > -typedef UINT16 TPM_PROTOCOL_ID; > -typedef BYTE TPM_AUTH_DATA_USAGE; > -typedef UINT16 TPM_ENTITY_TYPE; > -typedef UINT32 TPM_ALGORITHM_ID; > -typedef UINT16 TPM_KEY_USAGE; > -typedef UINT16 TPM_STARTUP_TYPE; > -typedef UINT32 TPM_CAPABILITY_AREA; > -typedef UINT16 TPM_ENC_SCHEME; > -typedef UINT16 TPM_SIG_SCHEME; > -typedef UINT16 TPM_MIGRATE_SCHEME; > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > -typedef UINT32 TPM_KEY_FLAGS; > - > -#define TPM_DIGEST_SIZE 20 // Don't change this > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > -typedef TPM_AUTHDATA TPM_SECRET; > -typedef TPM_AUTHDATA TPM_ENCAUTH; > -typedef BYTE TPM_PAYLOAD_TYPE; > -typedef UINT16 TPM_TAG; > - > -// Data Types of the TCS > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > - > -// ************************* STRUCTURES ********************************** > - > -typedef struct TPM_VERSION { > - BYTE major; > - BYTE minor; > - BYTE revMajor; > - BYTE revMinor; > -} TPM_VERSION; > - > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > - > -typedef struct TPM_DIGEST { > - BYTE digest[TPM_DIGEST_SIZE]; > -} TPM_DIGEST; > - > -typedef TPM_DIGEST TPM_PCRVALUE; > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > -typedef TPM_DIGEST TPM_DIRVALUE; > -typedef TPM_DIGEST TPM_HMAC; > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > - > -typedef struct TPM_NONCE { > - BYTE nonce[TPM_DIGEST_SIZE]; > -} TPM_NONCE; > - > -typedef struct TPM_KEY_PARMS { > - TPM_ALGORITHM_ID algorithmID; > - TPM_ENC_SCHEME encScheme; > - TPM_SIG_SCHEME sigScheme; > - UINT32 parmSize; > - BYTE* parms; > -} TPM_KEY_PARMS; > - > -typedef struct TPM_RSA_KEY_PARMS { > - UINT32 keyLength; > - UINT32 numPrimes; > - UINT32 exponentSize; > - BYTE* exponent; > -} TPM_RSA_KEY_PARMS; > - > -typedef struct TPM_STORE_PUBKEY { > - UINT32 keyLength; > - BYTE* key; > -} TPM_STORE_PUBKEY; > - > -typedef struct TPM_PUBKEY { > - TPM_KEY_PARMS algorithmParms; > - TPM_STORE_PUBKEY pubKey; > -} TPM_PUBKEY; > - > -typedef struct TPM_KEY { > - TPM_VERSION ver; > - TPM_KEY_USAGE keyUsage; > - TPM_KEY_FLAGS keyFlags; > - TPM_AUTH_DATA_USAGE authDataUsage; > - TPM_KEY_PARMS algorithmParms; > - UINT32 PCRInfoSize; > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > - TPM_STORE_PUBKEY pubKey; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_KEY; > - > -typedef struct TPM_PCR_SELECTION { > - UINT16 sizeOfSelect; /// in bytes > - BYTE* pcrSelect; > -} TPM_PCR_SELECTION; > - > -typedef struct TPM_PCR_COMPOSITE { > - TPM_PCR_SELECTION select; > - UINT32 valueSize; > - TPM_PCRVALUE* pcrValue; > -} TPM_PCR_COMPOSITE; > - > - > -typedef struct TPM_PCR_INFO { > - TPM_PCR_SELECTION pcrSelection; > - TPM_COMPOSITE_HASH digestAtRelease; > - TPM_COMPOSITE_HASH digestAtCreation; > -} TPM_PCR_INFO; > - > - > -typedef struct TPM_BOUND_DATA { > - TPM_VERSION ver; > - TPM_PAYLOAD_TYPE payload; > - BYTE* payloadData; > -} TPM_BOUND_DATA; > - > -typedef struct TPM_STORED_DATA { > - TPM_VERSION ver; > - UINT32 sealInfoSize; > - BYTE* sealInfo; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_STORED_DATA; > - > -typedef struct TCS_AUTH { > - TCS_AUTHHANDLE AuthHandle; > - TPM_NONCE NonceOdd; // system > - TPM_NONCE NonceEven; // TPM > - BOOL fContinueAuthSession; > - TPM_AUTHDATA HMAC; > -} TCS_AUTH; > - > -// structures for dealing with sizes followed by buffers in all the > -// TCG structure. > -typedef struct pack_buf_t { > - UINT32 size; > - BYTE * data; > -} pack_buf_t; > - > -typedef struct pack_constbuf_t { > - UINT32 size; > - const BYTE* data; > -} pack_constbuf_t; > - > - > - > -// **************************** CONSTANTS ********************************* > - > -// BOOL values > -#define TRUE 0x01 > -#define FALSE 0x00 > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -// > -// TPM_COMMAND_CODE values > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > -#define TPM_VENDOR_ORDINAL 0x20000000UL > - > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > - > - > - > -// > -// TPM_RESULT values > -// > -// just put in the whole table from spec 1.2 > - > -#define TPM_BASE 0x0 // The start of TPM return codes > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > - > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > - > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > - > -// TPM_STARTUP_TYPE values > -#define TPM_ST_CLEAR 0x0001 > -#define TPM_ST_STATE 0x0002 > -#define TPM_ST_DEACTIVATED 0x003 > - > -// TPM_TAG values > -#define TPM_TAG_RQU_COMMAND 0x00c1 > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > -#define TPM_TAG_RSP_COMMAND 0x00c4 > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > - > -// TPM_PAYLOAD_TYPE values > -#define TPM_PT_ASYM 0x01 > -#define TPM_PT_BIND 0x02 > -#define TPM_PT_MIGRATE 0x03 > -#define TPM_PT_MAINT 0x04 > -#define TPM_PT_SEAL 0x05 > - > -// TPM_ENTITY_TYPE values > -#define TPM_ET_KEYHANDLE 0x0001 > -#define TPM_ET_OWNER 0x0002 > -#define TPM_ET_DATA 0x0003 > -#define TPM_ET_SRK 0x0004 > -#define TPM_ET_KEY 0x0005 > - > -/// TPM_ResourceTypes > -#define TPM_RT_KEY 0x00000001 > -#define TPM_RT_AUTH 0x00000002 > -#define TPM_RT_TRANS 0x00000004 > -#define TPM_RT_CONTEXT 0x00000005 > - > -// TPM_PROTOCOL_ID values > -#define TPM_PID_OIAP 0x0001 > -#define TPM_PID_OSAP 0x0002 > -#define TPM_PID_ADIP 0x0003 > -#define TPM_PID_ADCP 0x0004 > -#define TPM_PID_OWNER 0x0005 > - > -// TPM_ALGORITHM_ID values > -#define TPM_ALG_RSA 0x00000001 > -#define TPM_ALG_DES 0x00000002 > -#define TPM_ALG_3DES 0X00000003 > -#define TPM_ALG_SHA 0x00000004 > -#define TPM_ALG_HMAC 0x00000005 > -#define TCPA_ALG_AES 0x00000006 > - > -// TPM_ENC_SCHEME values > -#define TPM_ES_NONE 0x0001 > -#define TPM_ES_RSAESPKCSv15 0x0002 > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// TPM_SIG_SCHEME values > -#define TPM_SS_NONE 0x0001 > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > - > -// TPM_KEY_USAGE values > -#define TPM_KEY_EK 0x0000 > -#define TPM_KEY_SIGNING 0x0010 > -#define TPM_KEY_STORAGE 0x0011 > -#define TPM_KEY_IDENTITY 0x0012 > -#define TPM_KEY_AUTHCHANGE 0X0013 > -#define TPM_KEY_BIND 0x0014 > -#define TPM_KEY_LEGACY 0x0015 > - > -// TPM_AUTH_DATA_USAGE values > -#define TPM_AUTH_NEVER 0x00 > -#define TPM_AUTH_ALWAYS 0x01 > - > -// Key Handle of owner and srk > -#define TPM_OWNER_KEYHANDLE 0x40000001 > -#define TPM_SRK_KEYHANDLE 0x40000000 > - > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > - > -#include > - > -// FIXME: Review use of these and delete unneeded ones. > - > -// these are really badly dependent on local structure: > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -#define ERRORDIE(s) do { status = s; \ > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > - goto abort_egress; } \ > - while (0) > - > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -// Try command c. If it fails, set status to s and goto abort. > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > - status = s; \ > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } else {\ > - status = c; \ > - } > - > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > -#define TPMTRYRETURN(c) do { status = c; \ > - if (status != TPM_SUCCESS) { \ > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } \ > - } while(0) > - > - > -#pragma pack(pop) > - > -#endif //__TCPA_H__ > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > index 3b89223..0ba1d55 100644 > --- a/tools/xenstore/hashtable.c > +++ b/tools/xenstore/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > index 8e6bb5b..4d68223 100644 > --- a/tools/xenstore/hashtable.h > +++ b/tools/xenstore/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > index cabaffe..a08559d 100644 > --- a/tools/xenstore/hashtable_private.h > +++ b/tools/xenstore/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > index ad1eb78..c142140 100644 > --- a/tools/xm-test/configure.ac > +++ b/tools/xm-test/configure.ac > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > tests/unpause/Makefile > tests/vcpu-pin/Makefile > tests/vcpu-disable/Makefile > - tests/vtpm/Makefile > tests/xapi/Makefile > tests/enforce_dom0_cpus/Makefile > tests/cpupool/Makefile > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > index f0516b2..e04591b 100644 > --- a/tools/xm-test/grouptest/default > +++ b/tools/xm-test/grouptest/default > @@ -27,5 +27,4 @@ sysrq > unpause > vcpu-disable > vcpu-pin > -vtpm > xapi > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > index bafc988..5c3e1b1 100644 > --- a/tools/xm-test/grouptest/medium > +++ b/tools/xm-test/grouptest/medium > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > unpause > vcpu-disable > vcpu-pin > -vtpm > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > index 3b04921..7a08b77 100644 > --- a/tools/xm-test/grouptest/xapi > +++ b/tools/xm-test/grouptest/xapi > @@ -1,2 +1 @@ > xapi > -vtpm 09_vtpm-xapi.test > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > index ae8c550..3ba7433 100644 > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > @@ -59,7 +59,6 @@ class XenConfig: > # These options need to be lists > self.defaultOpts["disk"] = [] > self.defaultOpts["vif"] = [] > - self.defaultOpts["vtpm"] = [] > > self.opts = self.defaultOpts > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > index 8d673ed..455f50c 100644 > --- a/tools/xm-test/tests/Makefile.am > +++ b/tools/xm-test/tests/Makefile.am > @@ -25,7 +25,6 @@ SUBDIRS = \ > unpause \ > vcpu-disable \ > vcpu-pin \ > - vtpm \ > enforce_dom0_cpus \ > save restore migrate \ > cpupool > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > deleted file mode 100644 > index dfd1227..0000000 > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > +++ /dev/null > @@ -1,40 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# verify list > - > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > - > -try: > - domain.start(noConsole=True) > -except DomainError, e: > - if verbose: > - print e.extra > - vtpm_cleanup(domain.getName()) > - FAIL("Unable to create domain") > - > - > -domName = domain.getName() > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > -eyecatcher = "/local/domain/0/backend/vtpm" > -where = output.find(eyecatcher) > -if status != 0: > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > -elif where < 0: > - FAIL("Fail to list virtual TPM device") > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > deleted file mode 100644 > index a18cbab..0000000 > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > +++ /dev/null > @@ -1,49 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -domain.closeConsole() > - > -domain.stop() > - > -if not re.search("PCR-00:",run["output"]): > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > deleted file mode 100644 > index b863f27..0000000 > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > +++ /dev/null > @@ -1,99 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > deleted file mode 100644 > index ccc8b73..0000000 > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > deleted file mode 100644 > index 57b87df..0000000 > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > deleted file mode 100644 > index c70691d..0000000 > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > +++ /dev/null > @@ -1,125 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again and validate extended pcr > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > deleted file mode 100644 > index 4ff3360..0000000 > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > deleted file mode 100644 > index 27125fc..0000000 > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > deleted file mode 100644 > index a1aa8b3..0000000 > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > +++ /dev/null > @@ -1,158 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Test to test the vtpm class through the Xen-API > -# > -# Tested methods: > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > -# create, destroy, get_VM > -# VM: get_VTPMS > - > -from XmTestLib import xapi > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > - > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > - > -try: > - # XmTestAPIDomain tries to establish a connection to XenD > - domain = XmTestAPIDomain() > -except Exception, e: > - SKIP("Skipping test. Error: %s" % str(e)) > -vm_uuid = domain.get_uuid() > - > -vtpmcfg = {} > -vtpmcfg['backend'] = DOM0_UUID > -vtpmcfg['VM'] = vm_uuid > - > -session = xapi.connect() > - > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > - > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > -if vtpm_be != vtpmcfg['backend']: > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > - (vtpm_be, vtpmcfg['backend'])) > - > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > - > -miss_keys = [] > -for k in VTPM_RECORD_KEYS: > - if k not in vtpm_rec.keys(): > - miss_keys.append(k) > -if len(miss_keys) > 0: > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > - > -if vtpm_rec['uuid'] != vtpm_uuid: > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > - (vtpm_rec['uuid'], vtpm_uuid)) > -if vtpm_rec['VM'] != vm_uuid: > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > - (vtpm_rec['VM'], vm_uuid)) > -if vtpm_rec['backend'] != vtpmcfg['backend']: > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > - (vtpm_rev['backend'], vtpmcfg['backend'])) > - > -badkeys = [] > -keys = vtpm_rec.keys() > -for k in keys: > - if k not in VTPM_RECORD_KEYS: > - badkeys.append(k) > -if len(badkeys) > 0: > - FAIL("Unexpected attributes in result: %s" % badkeys) > - > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > - (vm_ref, vm_uuid)) > - > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > -if uuid != vtpm_uuid: > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > - (uuid, vtpm_uuid)) > - > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > -if vtpm_ref != vtpm_uuid: > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > - (vtpm_ref, vtpm_uuid)) > - > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > -if len(vm_vtpms) != 1: > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > - (len(vm_vtpms), 1)) > -if vtpm_uuid not in vm_vtpms: > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > - (vm_vtpms[0], vtpm_uuid)) > - > -try: > - console = domain.start() > -except DomainError, e: > - FAIL("Unable to create domain.") > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("1. No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #Should never get here > - FAIL("Could destroy vTPM while VM is running") > -except: > - pass > - > -rc = session.xenapi.VM.suspend(vm_uuid) > -if rc: > - FAIL("Could not suspend VM") > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #May not throw an exception in 'suspend' state > -except: > - pass > - > -rc = session.xenapi.VM.resume(vm_uuid, False) > -if rc: > - FAIL("Could not resume VM") > - > -try: > - console = domain.getConsole() > -except ConsoleError, e: > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -domain.stop() > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > -except: > - FAIL("Could NOT destroy vTPM while domain is halted.") > - > -domain.destroy() > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > deleted file mode 100644 > index dd67e45..0000000 > --- a/tools/xm-test/tests/vtpm/Makefile.am > +++ /dev/null > @@ -1,27 +0,0 @@ > -SUBDIRS = > - > -TESTS = 01_vtpm-list_pos.test \ > - 02_vtpm-cat_pcrs.test \ > - 03_vtpm-susp_res.test \ > - 04_vtpm-loc_migr.test \ > - 05_vtpm-loc_migr.test \ > - 06_vtpm-susp_res_pcrs.test \ > - 07_vtpm-mig_pcrs.test \ > - 08_vtpm-mig_pcrs.test \ > - 09_vtpm-xapi.test > - > -XFAIL_TESTS = > - > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > -TESTS_ENVIRONMENT=@TENV@ > - > -%.test: %.py > - cp $< $@ > - chmod +x $@ > - > -clean-local: am_config_clean-local > - > -am_config_clean-local: > - rm -f *test > - rm -f *log > - rm -f *~ > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > deleted file mode 100644 > index 4e5b281..0000000 > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > +++ /dev/null > @@ -1,30 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -from XmTestLib import * > - > -if ENABLE_HVM_SUPPORT: > - SKIP("vtpm tests not supported for HVM domains") > - > -status, output = traceCommand("COLUMNS=200 ; " > - "ps aux | grep vtpm_manager | grep -v grep") > -if output == "": > - SKIP("virtual TPM manager must be started to run this test; might " > - "need /dev/tpm0") > - > -def vtpm_cleanup(domName): > - traceCommand("/etc/xen/scripts/vtpm-delete " > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > - str(domid(domName))) > - > -def vtpm_cleanup(uuid): > - from xen.xm import main > - if main.serverType != main.SERVER_XEN_API: > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > - > -def vtpm_get_uuid(domainid): > - s, o = traceCommand("xenstore-read " > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > - return o > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:06:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:06:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFG3-0008I1-Fo; Tue, 13 Nov 2012 12:06:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYE3b-0004PX-Fw for xen-devel@lists.xen.org; Tue, 13 Nov 2012 10:49:28 +0000 Received: from [85.158.138.51:7043] by server-15.bemta-3.messagelabs.com id 64/AD-09445-6B522A05; Tue, 13 Nov 2012 10:49:26 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352803762!27912505!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22352 invoked from network); 13 Nov 2012 10:49:23 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 10:49:23 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15773595" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 10:49:17 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:49:16 +0000 Message-ID: <1352803755.7491.47.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Matthew Fioravante Date: Tue, 13 Nov 2012 10:49:15 +0000 In-Reply-To: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 12:06:22 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Remove the old vtpm process model. It doesn't work very > well and is no longer supported. > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell > > diff --git a/tools/Makefile b/tools/Makefile > index d8c8cc0..2ca43b9 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > SUBDIRS-$(CONFIG_X86) += firmware > SUBDIRS-y += console > SUBDIRS-y += xenmon > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > -SUBDIRS-$(VTPM_TOOLS) += vtpm > SUBDIRS-y += xenstat > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_Linux) += memshr > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > index 631306b..90a6b85 100644 > --- a/tools/blktap2/drivers/hashtable.c > +++ b/tools/blktap2/drivers/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > index 89aa3dc..56ca053 100644 > --- a/tools/blktap2/drivers/hashtable.h > +++ b/tools/blktap2/drivers/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > index 402e06b..731917c 100644 > --- a/tools/blktap2/drivers/hashtable_itr.c > +++ b/tools/blktap2/drivers/hashtable_itr.c > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.c > - */ > - > #include "hashtable.h" > #include "hashtable_private.h" > #include "hashtable_itr.h" > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > index 3d80638..81da838 100644 > --- a/tools/blktap2/drivers/hashtable_itr.h > +++ b/tools/blktap2/drivers/hashtable_itr.h > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.h > - */ > - > #ifndef __HASHTABLE_ITR_CWC22__ > #define __HASHTABLE_ITR_CWC22__ > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > index 5a13a65..954ecc3 100644 > --- a/tools/blktap2/drivers/hashtable_private.h > +++ b/tools/blktap2/drivers/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/configure.ac b/tools/configure.ac > index e708f01..586313d 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > # Enable/disable options > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > diff --git a/tools/examples/README b/tools/examples/README > index 5b0314e..2225d5c 100644 > --- a/tools/examples/README > +++ b/tools/examples/README > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > vif-common.sh - sourced by vif-bridge > vif-nat - xen virtual network start/stop script in NAT mode > vif-route - xen virtual network start/stop script in routed mode > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > -vtpm-common.sh - common code for vTPM handling > -vtpm-delete - remove an entry from the vTPM table given the > - domain's name > -vtpm-hotplug-common.sh - sourced by vtpm > -vtpm-migration.sh - sourced by external-device-migrate > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > devices > xen-backend.rules - hotplug script rules > xend-config.sxp - default xend configuration file > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > index 85f847c..e04e6c1 100644 > --- a/tools/examples/xmexample.pv-grub > +++ b/tools/examples/xmexample.pv-grub > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Configure the behaviour when a domain exits. There are three 'reasons' > # for a domain to stop: poweroff, reboot, and crash. For each of these you > # may specify: > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > index 330aaf0..c951200 100644 > --- a/tools/examples/xmexample1 > +++ b/tools/examples/xmexample1 > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > index 4e5eb3d..8c5137e 100644 > --- a/tools/examples/xmexample2 > +++ b/tools/examples/xmexample2 > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > index dc22ce1..ae799f9 100644 > --- a/tools/examples/xmexample3 > +++ b/tools/examples/xmexample3 > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > index 0166790..0605559 100644 > --- a/tools/hotplug/Linux/Makefile > +++ b/tools/hotplug/Linux/Makefile > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > XEN_SCRIPTS += block > XEN_SCRIPTS += block-enbd block-nbd > XEN_SCRIPTS += blktap > -XEN_SCRIPTS += vtpm vtpm-delete > XEN_SCRIPTS += xen-hotplug-cleanup > XEN_SCRIPTS += external-device-migrate > XEN_SCRIPTS += vscsi > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > +XEN_SCRIPT_DATA += block-common.sh > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > UDEV_RULES = xen-backend.rules xend.rules > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > deleted file mode 100644 > index 38a4532..0000000 > --- a/tools/hotplug/Linux/vtpm > +++ /dev/null > @@ -1,22 +0,0 @@ > -#!/bin/bash > - > -dir=$(dirname "$0") > -. "$dir/vtpm-hotplug-common.sh" > - > -vtpm_fatal_error=0 > - > -case "$command" in > - add) > - vtpm_create_instance > - ;; > - remove) > - vtpm_remove_instance > - ;; > -esac > - > -if [ $vtpm_fatal_error -eq 0 ]; then > - log debug "Successful vTPM operation '$command'." > - success > -else > - fatal "Error while executing vTPM operation '$command'." > -fi > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > deleted file mode 100644 > index d0d7935..0000000 > --- a/tools/hotplug/Linux/vtpm-common.sh > +++ /dev/null > @@ -1,448 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/logging.sh" > -. "$dir/locking.sh" > - > -VTPMDB="/var/vtpm/vtpm.db" > - > -#In the vtpm-impl file some commands should be defined: > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > -if [ -r "$dir/vtpm-impl.alt" ]; then > - . "$dir/vtpm-impl.alt" > -elif [ -r "$dir/vtpm-impl" ]; then > - . "$dir/vtpm-impl" > -else > - function vtpm_create () { > - true > - } > - function vtpm_setup() { > - true > - } > - function vtpm_start() { > - true > - } > - function vtpm_suspend() { > - true > - } > - function vtpm_resume() { > - true > - } > - function vtpm_delete() { > - true > - } > - function vtpm_migrate() { > - echo "Error: vTPM migration accross machines not implemented." > - } > - function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > - } > - function vtpm_migrate_recover() { > - true > - } > -fi > - > - > -#Find the instance number for the vtpm given the name of the domain > -# Parameters > -# - vmname : the name of the vm > -# Return value > -# Returns '0' if instance number could not be found, otherwise > -# it returns the instance number in the variable 'instance' > -function vtpmdb_find_instance () { > - local vmname ret instance > - vmname=$1 > - ret=0 > - > - instance=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( 1 != index($1,"#")) { \ > - if ( $1 == vmname ) { \ > - print $2; \ > - exit; \ > - } \ > - } \ > - }') > - if [ "$instance" != "" ]; then > - ret=$instance > - fi > - echo "$ret" > -} > - > - > -# Check whether a particular instance number is still available > -# returns "0" if it is not available, "1" otherwise. > -function vtpmdb_is_free_instancenum () { > - local instance instances avail i > - instance=$1 > - avail=1 > - #Allowed instance number range: 1-255 > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > - avail=0 > - else > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - for i in $instances; do > - if [ $i -eq $instance ]; then > - avail=0 > - break > - fi > - done > - fi > - echo "$avail" > -} > - > - > -# Get an available instance number given the database > -# Returns an unused instance number > -function vtpmdb_get_free_instancenum () { > - local ctr instances don found > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - ctr=1 > - don=0 > - while [ $don -eq 0 ]; do > - found=0 > - for i in $instances; do > - if [ $i -eq $ctr ]; then > - found=1; > - break; > - fi > - done > - > - if [ $found -eq 0 ]; then > - don=1 > - break > - fi > - let ctr=ctr+1 > - done > - echo "$ctr" > -} > - > - > -# Add a domain name and instance number to the DB file > -function vtpmdb_add_instance () { > - local res vmname inst > - vmname=$1 > - inst=$2 > - > - if [ ! -f $VTPMDB ]; then > - echo "#Database for VM to vTPM association" > $VTPMDB > - echo "#1st column: domain name" >> $VTPMDB > - echo "#2nd column: TPM instance number" >> $VTPMDB > - fi > - res=$(vtpmdb_validate_entry $vmname $inst) > - if [ $res -eq 0 ]; then > - echo "$vmname $inst" >> $VTPMDB > - fi > -} > - > - > -#Validate whether an entry is the same as passed to this > -#function > -function vtpmdb_validate_entry () { > - local res rc vmname inst > - rc=0 > - vmname=$1 > - inst=$2 > - > - res=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - -vinst=$inst \ > - '{ \ > - if ( 1 == index($1,"#")) {\ > - } else \ > - if ( $1 == vmname && \ > - $2 == inst) { \ > - printf("1"); \ > - exit; \ > - } else \ > - if ( $1 == vmname || \ > - $2 == inst) { \ > - printf("2"); \ > - exit; \ > - } \ > - }') > - > - if [ "$res" == "1" ]; then > - rc=1 > - elif [ "$res" == "2" ]; then > - rc=2 > - fi > - echo "$rc" > -} > - > - > -#Remove an entry from the vTPM database given its domain name > -#and instance number > -function vtpmdb_remove_entry () { > - local vmname instance VTPMDB_TMP > - vmname=$1 > - instance=$2 > - VTPMDB_TMP="$VTPMDB".tmp > - > - $(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( $1 != vmname ) { \ > - print $0; \ > - } \ > - '} > $VTPMDB_TMP) > - if [ -e $VTPMDB_TMP ]; then > - mv -f $VTPMDB_TMP $VTPMDB > - vtpm_delete $instance > - else > - log err "Error creating temporary file '$VTPMDB_TMP'." > - fi > -} > - > - > -# Find the reason for the creation of this device: > -# Returns 'resume' or 'create' > -function vtpm_get_create_reason () { > - local resume > - resume=$(xenstore_read $XENBUS_PATH/resume) > - if [ "$resume" == "True" ]; then > - echo "resume" > - else > - echo "create" > - fi > -} > - > - > -#Create a vTPM instance > -# If no entry in the TPM database is found, the instance is > -# created and an entry added to the database. > -function vtpm_create_instance () { > - local res instance domname reason uuid > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - reason=$(vtpm_get_create_reason) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > - release_lock vtpmdb > - return > - fi > - > - if [ "$instance" == "0" ]; then > - #Try to give the preferred instance to the domain > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > - if [ "$instance" != "" ]; then > - res=$(vtpmdb_is_free_instancenum $instance) > - if [ $res -eq 0 ]; then > - instance=$(vtpmdb_get_free_instancenum) > - fi > - else > - instance=$(vtpmdb_get_free_instancenum) > - fi > - > - vtpm_create $instance > - > - if [ $vtpm_fatal_error -eq 0 ]; then > - if [ "$uuid" != "" ]; then > - vtpmdb_add_instance $uuid $instance > - else > - vtpmdb_add_instance $domname $instance > - fi > - fi > - else > - if [ "$reason" == "resume" ]; then > - vtpm_resume $instance > - else > - vtpm_start $instance > - fi > - fi > - > - release_lock vtpmdb > - > - xenstore_write $XENBUS_PATH/instance $instance > -} > - > - > -#Remove an instance when a VM is terminating or suspending. > -#Since it is assumed that the VM will appear again, the > -#entry is kept in the VTPMDB file. > -function vtpm_remove_instance () { > - local instance reason domname uuid > - #Stop script execution quietly if path does not exist (anymore) > - xenstore-exists "$XENBUS_PATH"/domain > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" != "0" ]; then > - vtpm_suspend $instance > - fi > - > - release_lock vtpmdb > -} > - > - > -#Remove an entry in the VTPMDB file given the domain's name > -#1st parameter: The name of the domain > -function vtpm_delete_instance () { > - local instance > - > - claim_lock vtpmdb > - > - instance=$(vtpmdb_find_instance $1) > - if [ "$instance" != "0" ]; then > - vtpmdb_remove_entry $1 $instance > - fi > - > - release_lock vtpmdb > -} > - > -# Determine whether the given address is local to this machine > -# Return values: > -# "-1" : the given machine name is invalid > -# "0" : this is not an address of this machine > -# "1" : this is an address local to this machine > -function vtpm_isLocalAddress() { > - local addr res > - addr=$(ping $1 -c 1 | \ > - awk '{ print substr($3,2,length($3)-2); exit }') > - if [ "$addr" == "" ]; then > - echo "-1" > - return > - fi > - res=$(ifconfig | grep "inet addr" | \ > - awk -vaddr=$addr \ > - '{ \ > - if ( addr == substr($2, 6)) {\ > - print "1"; \ > - } \ > - }' \ > - ) > - if [ "$res" == "" ]; then > - echo "0" > - return > - fi > - echo "1" > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migration_step() { > - local res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate $1 $2 $3 > - else > - vtpm_migrate_local > - fi > -} > - > -# Recover from migration due to an error. This function differentiates > -# between migration to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host the migration was going to > -# 2nd: name of the domain that was to be migrated > -# 3rd: the last successful migration step that was done > -function vtpm_recover() { > - local res > - res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate_recover $1 $2 $3 > - fi > -} > - > - > -#Determine the domain id given a domain's name. > -#1st parameter: name of the domain > -#return value: domain id or -1 if domain id could not be determined > -function vtpm_domid_from_name () { > - local id name ids > - ids=$(xenstore-list /local/domain) > - for id in $ids; do > - name=$(xenstore-read /local/domain/$id/name) > - if [ "$name" == "$1" ]; then > - echo "$id" > - return > - fi > - done > - echo "-1" > -} > - > -#Determine the virtual TPM's instance number using the domain ID. > -#1st parm: domain ID > -function vtpm_uuid_by_domid() { > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > -} > - > - > -# Determine the vTPM's UUID by the name of the VM > -function vtpm_uuid_from_vmname() { > - local domid=$(vtpm_domid_from_name $1) > - if [ "$domid" != "-1" ]; then > - echo $(vtpm_uuid_by_domid $domid) > - return > - fi > - echo "" > -} > - > -#Add a virtual TPM instance number and its associated domain name > -#to the VTPMDB file and activate usage of this virtual TPM instance > -#by writing the instance number into the xenstore > -#1st parm: name of virtual machine > -#2nd parm: instance of associated virtual TPM > -function vtpm_add_and_activate() { > - local domid=$(vtpm_domid_from_name $1) > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > - vtpmdb_add_instance $vtpm_uuid $2 > - xenstore-write backend/vtpm/$domid/0/instance $2 > - fi > -} > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > deleted file mode 100644 > index b75b95b..0000000 > --- a/tools/hotplug/Linux/vtpm-delete > +++ /dev/null > @@ -1,18 +0,0 @@ > -#!/bin/bash > - > -# This scripts must be called the following way: > -# vtpm-delete > -# or > -# vtpm-delete --vmname > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > - > -if [ "$1" == "--vmname" ]; then > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > - if [ "$vtpm_uuid" != "" ];then > - vtpm_delete_instance $vtpm_uuid > - fi > -else > - vtpm_delete_instance $1 > -fi > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > deleted file mode 100644 > index 9fd35e7..0000000 > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > +++ /dev/null > @@ -1,35 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/xen-hotplug-common.sh" > - > -findCommand "$@" > -if [ "$command" != "online" ] && > - [ "$command" != "offline" ] && > - [ "$command" != "add" ] && > - [ "$command" != "remove" ] > -then > - log err "Invalid command: $command" > - exit 1 > -fi > - > - > -XENBUS_PATH="${XENBUS_PATH:?}" > - > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > deleted file mode 100644 > index 4f9a1fd..0000000 > --- a/tools/hotplug/Linux/vtpm-impl > +++ /dev/null > @@ -1,208 +0,0 @@ > -#!/bin/bash > -# =================================================================== > -# > -# Copyright (c) 2005, Intel Corp. > -# All rights reserved. > -# > -# Redistribution and use in source and binary forms, with or without > -# modification, are permitted provided that the following conditions > -# are met: > -# > -# * Redistributions of source code must retain the above copyright > -# notice, this list of conditions and the following disclaimer. > -# * Redistributions in binary form must reproduce the above > -# copyright notice, this list of conditions and the following > -# disclaimer in the documentation and/or other materials provided > -# with the distribution. > -# * Neither the name of Intel Corporation nor the names of its > -# contributors may be used to endorse or promote products derived > -# from this software without specific prior written permission. > -# > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -# OF THE POSSIBILITY OF SUCH DAMAGE. > -# =================================================================== > - > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > - > -TPM_TYPE_PVM=\\x01 > -TPM_TYPE_HVM=\\x02 > - > -TPM_SUCCESS=00000000 > - > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > - > -VTPM_MIG=/usr/bin/vtpm_migrator > - > -# -------------------- Helpers for binary streams ----------- > - > -function str_to_hex32() { > - printf "%0.8x" $1 > -} > - > -function hex32_to_bin() { > - local inst=$(str_to_hex32 $1); > - > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > - > - echo "$n1$n2$n3$n4" > -} > - > -function vtpm_manager_cmd() { > - local cmd=$1; > - local inst=$2; > - local inst_bin=$(hex32_to_bin $inst); > - > - claim_lock vtpm_mgr > - > - #send cmd to vtpm_manager > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > - > - #recv response > - set +e > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > - set -e > - > - release_lock vtpm_mgr > - > - #return whether the command was successful > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > - vtpm_fatal_error=1 > - false > - else > - true > - fi > -} > - > -# Helper to get vm type to pass to vtpm_manager open/resume > -function vtpm_get_type() { > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > - local vm=$(xenstore_read /local/domain/$inst/vm) > - if [ "$vm" != "" ]; then > - local ostype=$(xenstore-read $vm/image/ostype) > - if [ "$ostype" == "hvm" ]; then > - echo $TPM_TYPE_HVM; > - else > - echo $TPM_TYPE_PVM; > - fi > - fi > -} > - > -# ------------------ Command handlers ----------------- > - > -# Create new vtpm instance & set it up for use > -function vtpm_create () { > - # Creation is handled implicitly by the manager on first setup > - # so just set it up for use > - $(vtpm_start $1) > -} > - > -# Setup vtpm instance for use. > -function vtpm_start() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > -} > - > -function vtpm_resume() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > -} > - > -# Reset the vtpm AKA clear PCRs > -function vtpm_reset() { > - #not used by current implemenation > - true > -} > - > -# Shutdown the vtpm while the vm is down > -# This could be a suspend of shutdown > -# we cannot distinquish, so save the state > -# and decide on startup if we should keep is > -function vtpm_suspend() { > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > -} > - > - > -function vtpm_delete() { > - local inst=$1 > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > - rm -f /var/vtpm/vtpm_dm_$1.data > - true > - else > - vtpm_fatal_error=1 > - false > - fi > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migrate() { > - local instance res > - > - instance=$(vtpmdb_find_instance $2) > - if [ "$instance" == "" ]; then > - log err "VTPM Migratoin failed. Unable to translation of domain name" > - echo "Error: VTPM Migration failed while looking up instance number" > - fi > - > - case "$3" in > - 0) > - #Incicate migration supported > - echo "0" > - ;; > - > - 1) > - # Get Public Key from Destination > - # Call vtpm_manager's migration part 1 > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 2) > - # Call manager's migration step 2 and send result to destination > - # If successful remove from db > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 3) > - if `ps x | grep "$VTPM_MIG $1"`; then > - log err "VTPM Migration failed to complete." > - echo "Error: VTPM Migration failed to complete." > - fi > - ;; > - esac > - > -} > - > - > -function vtpm_migrate_recover() { > - echo "Error: Recovery not supported yet" > -} > - > -function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > -} > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > deleted file mode 100644 > index 7e38ae2..0000000 > --- a/tools/hotplug/Linux/vtpm-migration.sh > +++ /dev/null > @@ -1,19 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > index c591a3f..a0d409e 100644 > --- a/tools/hotplug/Linux/xen-backend.rules > +++ b/tools/hotplug/Linux/xen-backend.rules > @@ -1,6 +1,5 @@ > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > deleted file mode 100644 > index 7b3efa5..0000000 > --- a/tools/vtpm/Makefile > +++ /dev/null > @@ -1,74 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -# Dir name for emulator (as dom0 tpm driver) > -TPM_EMULATOR_DIR = tpm_emulator > -# Dir name for vtpm instance > -VTPM_DIR = vtpm > -ORIG_DIR = orig > - > -# Emulator tarball name > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > - > -GMP_HEADER = /usr/include/gmp.h > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: build_sub > - > -.PHONY: install > -install: build > - $(MAKE) -C $(VTPM_DIR) install-recursive > - > -.PHONY: clean > -clean: > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > - fi > - @if [ -d $(VTPM_DIR) ]; \ > - then $(MAKE) -C $(VTPM_DIR) clean; \ > - fi > - > -.PHONY: mrproper > -mrproper: > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > - > -# Download Swiss emulator > -$(TPM_EMULATOR_TARFILE): > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > - > -# Create vtpm dirs > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > - rm -rf $(VTPM_DIR) > - tar -xzf $(TPM_EMULATOR_TARFILE) > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > - > - set -e; cd $(VTPM_DIR); \ > - patch -p1 < ../vtpm-0.5.1.patch; \ > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > - > -orig: $(TPM_EMULATOR_TARFILE) > - mkdir $(ORIG_DIR); > - set -e; cd $(ORIG_DIR); \ > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > - > -updatepatches: clean orig > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > - mv vtpm.patch vtpm.patch.old; > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > - > -.PHONY: build_sub > -build_sub: $(VTPM_DIR)/tpmd/tpmd > - set -e; if [ -e $(GMP_HEADER) ]; then \ > - $(MAKE) -C $(VTPM_DIR) version; \ > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > - else \ > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > - fi > - > diff --git a/tools/vtpm/README b/tools/vtpm/README > deleted file mode 100644 > index 2008cbd..0000000 > --- a/tools/vtpm/README > +++ /dev/null > @@ -1,45 +0,0 @@ > - > -Directory Structure > -=================== > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > - be patched and used for our vtpms > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > - listens on a pair of fifos for TPM commands, > - persistent state is sent via named fifo to vtpm > - manager, which encrypts it and protects it. > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > - platforms, this patches the emulator to allow > - it to be inserted into the dom0 kernel > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > - > -Compile Flags > -=================== > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -Requirements > -============ > -- xen-unstable > -- IBM frontend/backend vtpm driver patch > -- vtpm_managerd > -- GNU MP Big number library (GMP) > - > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -tpm_emulator flow > -================== > -Read documentation in tpm_emulator-0.2 directory > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > deleted file mode 100644 > index 548cff0..0000000 > --- a/tools/vtpm/Rules.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(DEPS) > - > -BUILD_EMULATOR = y > - > -# Make sure these are just rules > -.PHONY : all build install clean > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > deleted file mode 100644 > index c34c665..0000000 > --- a/tools/vtpm/tpm_emulator.patch > +++ /dev/null > @@ -1,1919 +0,0 @@ > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,2 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > -+INTEL Corp <> [Dropped to Ring3] > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,3 +1,6 @@ > -+????-??-?? Intel Corp > -+ * Moved module out of kernel to run as a ring 3 app > -+ > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > - persistent data adapted > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -24,15 +25,10 @@ int __gmp_junk; > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > - int linenum, const char *expr) > - { > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > -+ error("%s:%d: GNU MP assertion failed: %s\n", > - filename, linenum, expr); > - } > - > --void __attribute__ ((regparm(0))) abort(void) > --{ > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > --} > -- > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > - > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > - > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > - { > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > -- "GMP: cannot allocate memory (size=%u)\n", size); > -+ void *ret = (void*)malloc(size); > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > - return ret; > - } > - > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > - size_t old_size, size_t new_size) > - { > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > -+ void *ret = (void*)malloc(new_size); > -+ if (!ret) error("GMP: Cannot reallocate memory " > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > - memcpy(ret, oldptr, old_size); > -- kfree(oldptr); > -+ free(oldptr); > - return ret; > - } > - > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > - /* overwrite used memory */ > - if (blk_ptr != NULL) { > - memset(blk_ptr, 0, blk_size); > -- kfree(blk_ptr); > -+ free(blk_ptr); > - } > - } > - > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > - msg[0] = 0x00; > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1]); > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > - SHA1_DIGEST_LENGTH) != 0) return -1; > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > -@@ -1,195 +0,0 @@ > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -- * Copyright (C) 2004 Mario Strasser , > -- * > -- * This module is free software; you can redistribute it and/or modify > -- * it under the terms of the GNU General Public License as published > -- * by the Free Software Foundation; either version 2 of the License, > -- * or (at your option) any later version. > -- * > -- * This module is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -- * GNU General Public License for more details. > -- * > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > -- */ > -- > --#include > --#include > --#include > --#include > --#include > --#include "linux_module.h" > --#include "tpm/tpm_emulator.h" > -- > --MODULE_LICENSE("GPL"); > --MODULE_AUTHOR("Mario Strasser "); > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > -- > --/* module startup parameters */ > --char *startup = "save"; > --module_param(startup, charp, 0444); > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > --module_param(storage_file, charp, 0644); > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > -- "file of the TPM."); > -- > --/* TPM lock */ > --static struct semaphore tpm_mutex; > -- > --/* TPM command response */ > --static struct { > -- uint8_t *data; > -- uint32_t size; > --} tpm_response; > -- > --/* module state */ > --#define STATE_IS_OPEN 0 > --static uint32_t module_state; > --static struct timespec old_time; > -- > --static int tpm_open(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > -- return 0; > --} > -- > --static int tpm_release(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return 0; > --} > -- > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > -- *ppos += count; > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- } else { > -- count = 0; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- *ppos = 0; > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command(buf, count, &tpm_response.data, > -- &tpm_response.size) != 0) { > -- count = -EILSEQ; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --#define TPMIOC_CANCEL _IO('T', 0x00) > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > -- > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > --{ > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > -- if (cmd == TPMIOC_TRANSMIT) { > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > -- &tpm_response.size) == 0) { > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > -- tpm_response.size); > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } else { > -- tpm_response.size = 0; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return tpm_response.size; > -- } > -- return -1; > --} > -- > --struct file_operations fops = { > -- .owner = THIS_MODULE, > -- .open = tpm_open, > -- .release = tpm_release, > -- .read = tpm_read, > -- .write = tpm_write, > -- .ioctl = tpm_ioctl, > --}; > -- > --static struct miscdevice tpm_dev = { > -- .minor = TPM_DEVICE_MINOR, > -- .name = TPM_DEVICE_NAME, > -- .fops = &fops, > --}; > -- > --int __init init_tpm_module(void) > --{ > -- int res = misc_register(&tpm_dev); > -- if (res != 0) { > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > -- return res; > -- } > -- /* initialize variables */ > -- sema_init(&tpm_mutex, 1); > -- module_state = 0; > -- tpm_response.data = NULL; > -- old_time = current_kernel_time(); > -- /* initialize TPM emulator */ > -- if (!strcmp(startup, "clear")) { > -- tpm_emulator_init(1); > -- } else if (!strcmp(startup, "save")) { > -- tpm_emulator_init(2); > -- } else if (!strcmp(startup, "deactivated")) { > -- tpm_emulator_init(3); > -- } else { > -- error("invalid startup mode '%s'; must be 'clear', " > -- "'save' (default) or 'deactivated", startup); > -- misc_deregister(&tpm_dev); > -- return -EINVAL; > -- } > -- return 0; > --} > -- > --void __exit cleanup_tpm_module(void) > --{ > -- tpm_emulator_shutdown(); > -- misc_deregister(&tpm_dev); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > --} > -- > --module_init(init_tpm_module); > --module_exit(cleanup_tpm_module); > -- > --uint64_t tpm_get_ticks(void) > --{ > -- struct timespec new_time = current_kernel_time(); > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > -- old_time = new_time; > -- return (ticks > 0) ? ticks : 1; > --} > -- > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -17,54 +18,62 @@ > - #ifndef _LINUX_MODULE_H_ > - #define _LINUX_MODULE_H_ > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - #include > --#include > --#include > --#include > --#include > - > --/* module settings */ > -+#include > -+#define __BYTEORDER_HAS_U64__ > -+#ifdef LITTLE_ENDIAN > -+ #include > -+#else > -+ #include > -+#endif > - > -+/* module settings */ > -+#define min(A,B) ((A)<(B)?(A):(B)) > -+#ifndef STR > - #define STR(s) __STR__(s) > - #define __STR__(s) #s > -+#endif > - #include "tpm_version.h" > - > - #define TPM_DEVICE_MINOR 224 > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > --/* debug and log output functions */ > -- > - #ifdef DEBUG > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - #else > - #define debug(fmt, ...) > - #endif > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > - static inline void *tpm_malloc(size_t size) > - { > -- return kmalloc(size, GFP_KERNEL); > -+ return malloc(size); > - } > - > - static inline void tpm_free(const void *ptr) > - { > -- if (ptr != NULL) kfree(ptr); > -+ if (ptr != NULL) free( (void *) ptr); > - } > - > - /* random numbers */ > - > -+//FIXME; > -+void get_random_bytes(void *buf, int nbytes); > -+ > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > - { > - get_random_bytes(buf, nbytes); > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > - > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > - > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,24 +1,40 @@ > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > - # Copyright (C) 2004 Mario Strasser > -+# Copyright (C) 2006 INTEL Corp. > - # > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > - > --# kernel settings > --KERNEL_RELEASE := $(shell uname -r) > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > --MOD_SUBDIR := misc > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --MODULE_NAME := tpm_emulator > -+BIN := tpm_emulator > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > - > --# enable/disable DEBUG messages > --EXTRA_CFLAGS += -Wall -DDEBUG -g > -+# Installation program and options > -+INSTALL = install > -+INSTALL_PROG = $(INSTALL) -m0755 > -+INSTALL_DIR = $(INSTALL) -d -m0755 > -+ > -+# Xen tools installation directory > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > -+ > -+CC := gcc > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > -+CFLAGS += -I. -Itpm > -+ > -+# Is the simulator running in it's own vm? > -+#CFLAGS += -DVTPM_MULTI_VM > -+ > -+ifeq ($(COMPILE_ARCH),x86_64) > -+LIBDIR = lib64 > -+else > -+LIBDIR = lib > -+endif > - > - # GNU MP configuration > --GMP_LIB := /usr/lib/libgmp.a > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > - # sources and objects > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > - > --obj-m := $(MODULE_NAME).o > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > -+obj-m := $(BIN) > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > - > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > - > - # do not print "Entering directory ..." > - MAKEFLAGS += --no-print-directory > - > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > -+all: $(BIN) > - > --install: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > -- test -d /var/tpm || mkdir /var/tpm > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > -- chmod 666 /dev/tpm > -- depmod -a > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > -+ > -+%.o: %.c > -+ $(CC) $(CFLAGS) -c $< -o $@ > -+ > -+install: $(BIN) > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > - > --dist: $(DISTSRC) > -- rm -rf $(DISTDIR) > -- mkdir $(DISTDIR) > -- cp --parents $(DISTSRC) $(DISTDIR)/ > -- rm -f $(DISTDIR)/crypto/gmp.h > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > -- rm -rf $(DISTDIR) > -+mrproper: clean > -+ rm -f $(BIN) tpm_version.h > - > - $(src)/crypto/libgmp.a: > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > -@@ -88,4 +98,3 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -- > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > - Copyright > - -------------------------------------------------------------------------- > - Copyright (C) 2004 Mario Strasser and Swiss Federal > --Institute of Technology (ETH) Zurich. > -+ Institute of Technology (ETH) Zurich. > -+Copyright (C) 2005 INTEL Corp > - > - This program is free software; you can redistribute it and/or modify > - it under the terms of the GNU General Public License as published by > -@@ -43,6 +44,12 @@ Example: > - GMP_LIB := /usr/lib/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > -+GNU MP Library on 64 bit Systems > -+-------------------------------------------------------------------------- > -+Some 64-bit kernels have problems with importing the user-space gmp > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > -+ > - Installation > - -------------------------------------------------------------------------- > - The compilation and installation process uses the build environment for > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > - TPM_RESULT res; > - > - info("TPM_GetCapabilityOwner()"); > -- > -+ > -+ if (!tpmData.permanent.flags.owned) { > -+ return TPM_NOSRK; > -+ } > - /* Verify owner authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > - if (res != TPM_SUCCESS) return res; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > - > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > - { > -- UINT32 key_length; > -+ size_t key_length; > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > - /* setup TPM_PUBKEY structure */ > -- key_length = tpmData.permanent.data.endorsementKey.size; > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > -- pubEndorsementKey->pubKey.key, > -- &pubEndorsementKey->pubKey.keyLength); > -+ pubEndorsementKey->pubKey.key, > -+ &key_length); > -+ pubEndorsementKey->pubKey.keyLength = key_length; > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - { > - TPM_RESULT res; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -+ size_t key_length; > - info("TPM_OwnerReadInternalPub()"); > - /* verify authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > -- &publicPortion->pubKey.keyLength); > -+ &key_length); > -+ publicPortion->pubKey.keyLength = key_length; > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > - publicPortion->algorithmParms.encScheme = srk->encScheme; > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ UINT32 length32; > -+ size_t length; > - info("TPM_CertifyKey()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32=(UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - sha1_init(&sha1_ctx); > -- sha1_update(&sha1_ctx, buf, length); > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > - sha1_final(&sha1_ctx, buf); > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > - tpm_free(buf); > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ size_t length; > -+ UINT32 length32; > - info("TPM_CertifyKey2()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32 = (UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_update(&sha1, inputData1, inputSize1); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > - } > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > - rsa_export_modulus(&aikData->key, scratch, &size); > - sha1_update(&sha1, scratch, size); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > - void tpm_init_data(void) > - { > - /* endorsement key */ > -+#ifndef TPM_GENERATE_EK > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > -+#endif > -+ > - int i; > - /* reset all data to NULL, FALSE or 0 */ > - memset(&tpmData, 0, sizeof(tpmData)); > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > - > - #ifdef TPM_STORE_TO_FILE > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (IS_ERR(fp)) return -1; > -- set_fs(get_ds()); > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ int fp; > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -+ res = write(fp, data, data_length); > -+ close(fp); > - return (res == data_length) ? 0 : -1; > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- if (IS_ERR(fp)) return -1; > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > -+ int fp, file_status; > -+ struct stat file_info; > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -+ file_status = fstat(fp, &file_info); > -+ if (file_status < 0) { > -+ close(fp); > -+ return -1; > -+ } > -+ > -+ *data_length = file_info.st_size; > - *data = tpm_malloc(*data_length); > - if (*data == NULL) { > -- filp_close(fp, NULL); > -+ close(fp); > - return -1; > - } > -- set_fs(get_ds()); > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ res = read(fp, *data, *data_length); > -+ close(fp); > - if (res != *data_length) { > - tpm_free(*data); > - return -1; > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > - int tpm_store_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ UINT32 buf_length, len; > - > - /* marshal data */ > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > - buf = ptr = tpm_malloc(buf_length); > - if (buf == NULL > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - if (write_to_file(buf, buf_length - len)) { > - tpm_free(buf); > - return -1; > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > - int tpm_restore_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ size_t buf_length; > -+ UINT32 len; > - TPM_VERSION ver; > - > - /* read data */ > - if (read_from_file(&buf, &buf_length)) return -1; > - ptr = buf; > -- len = buf_length; > -+ len = (uint32_t) buf_length; > - /* unmarshal data */ > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - tpm_free(buf); > - return 0; > - } > - > - int tpm_erase_permanent_data(void) > - { > -- int res = write_to_file("", 0); > -+ int res = write_to_file((uint8_t *) "", 0); > - return res; > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveKeyContext()"); > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > - keyContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *keyContextSize; > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveAuthContext()"); > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > - authContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *authContextSize; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -22,7 +23,8 @@ > - /* TPM configuration */ > - #define TPM_STORE_TO_FILE 1 > - #undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+//#undef TPM_GENERATE_EK > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > - > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > - { > -- UINT32 m_len, e_len, q_len; > -+ size_t m_len, e_len, q_len; > - if (*length < sizeof_RSA((*v))) return -1; > - if (v->size > 0) { > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > - return 0; > - } > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > - { > - if (tpm_marshal_BYTE(ptr, length, v->type) > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - TPM_RESULT res; > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -- UINT32 buf_size = ek->size >> 3; > -+ size_t buf_size = ek->size >> 3, key_length; > - BYTE buf[buf_size]; > - > - info("TPM_TakeOwnership()"); > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - return TPM_FAIL; > - } > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > -- &srkPub->pubKey.keyLength); > -+ &key_length); > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > - /* setup tpmProof and set state to owned */ > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > - { > - int i; > -+ int restore_fail; > - info("TPM_Startup(%d)", startupType); > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > -- /* reset STANY_FLAGS */ > -- SET_TO_ZERO(&tpmData.stany.flags); > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -- /* reset STANY_DATA (invalidates ALL sessions) */ > -- SET_TO_ZERO(&tpmData.stany.data); > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -- /* init session-context nonce */ > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > -+ > -+ /* try and restore state to get EK, SRK, etc */ > -+ restore_fail = tpm_restore_permanent_data(); > -+ > - /* set data and flags according to the given startup type */ > - if (startupType == TPM_ST_CLEAR) { > -- /* if available, restore permanent data */ > -- tpm_restore_permanent_data(); > -+ /* reset STANY_FLAGS */ > -+ SET_TO_ZERO(&tpmData.stany.flags); > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > -+ SET_TO_ZERO(&tpmData.stany.data); > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -+ /* init session-context nonce */ > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > - /* reset PCR values */ > - for (i = 0; i < TPM_NUM_PCR; i++) { > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > - else > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > - } > - /* reset STCLEAR_FLAGS */ > - SET_TO_ZERO(&tpmData.stclear.flags); > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > - /* init key-context nonce */ > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > - } else if (startupType == TPM_ST_STATE) { > -- if (tpm_restore_permanent_data()) { > -+ /* restore must have been successful for TPM_ST_STATE */ > -+ if (restore_fail) { > - error("restoring permanent data failed"); > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - BYTE *enc, UINT32 *enc_size) > - { > - UINT32 len; > -+ size_t enc_size32 = *enc_size; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > -- enc, enc_size)) { > -+ enc, &enc_size32)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_SEALED_DATA *seal, BYTE **buf) > - { > -- UINT32 len; > -+ size_t len; > -+ UINT32 len32; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = len; > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > - > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > - BYTE *inData, TPM_AUTH *auth1, > -- UINT32 *outDataSize, BYTE **outData) > -+ UINT32 *outDataSize32, BYTE **outData) > - { > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - int scheme; > -+ size_t outDataSize; > - > - info("TPM_UnBind()"); > - /* get key */ > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - /* the size of the input data muss be greater than zero */ > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > - /* decrypt data */ > -- *outDataSize = inDataSize; > -- *outData = tpm_malloc(*outDataSize); > -+ outDataSize = inDataSize; > -+ *outData = tpm_malloc(outDataSize); > - if (*outData == NULL) return TPM_NOSPACE; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > - } > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > -- *outData, outDataSize)) { > -+ *outData, &outDataSize)) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > - /* verify data if it is of type TPM_BOUND_DATA */ > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > - || key->keyUsage != TPM_KEY_LEGACY) { > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > -- *outDataSize -= 5; > -- memmove(*outData, &(*outData)[5], *outDataSize); > -+ outDataSize -= 5; > -+ memmove(*outData, &(*outData)[5], outDataSize); > - } > -+ *outDataSize32 = (UINT32) outDataSize; > - return TPM_SUCCESS; > - } > - > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > - } > - > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > -- BYTE *enc, UINT32 *enc_size) > -+ BYTE *enc, UINT32 *enc_size32) > - { > - UINT32 len; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -+ size_t enc_size; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > -- enc, enc_size)) { > -+ enc, &enc_size)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > - } > -+ *enc_size32 = (UINT32) enc_size; > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return 0; > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_STORE_ASYMKEY *store, BYTE **buf) > - { > -- UINT32 len; > -+ UINT32 len32; > -+ size_t len; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = (UINT32) len; > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - TPM_SESSION_DATA *session; > - TPM_STORE_ASYMKEY store; > - rsa_private_key_t rsa; > -- UINT32 key_length; > -+ size_t key_length; > - > - info("TPM_CreateWrapKey()"); > - /* get parent key */ > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - } > - } > - /* generate key and store it */ > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > -- wrappedKey->pubKey.keyLength = key_length >> 3; > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > -+ return TPM_FAIL; > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > -- store.privKey.keyLength = key_length >> 4; > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > - wrappedKey->encDataSize = parent->key.size >> 3; > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - tpm_free(wrappedKey->encData); > - return TPM_NOSPACE; > - } > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -- &wrappedKey->pubKey.keyLength); > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -+ &key_length); > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > -+ store.privKey.keyLength = (UINT32) key_length; > - rsa_release_private_key(&rsa); > - /* compute the digest of the wrapped key (without encData) */ > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > - > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > - { > -+ size_t key_length; > - parms->algorithmID = TPM_ALG_RSA; > - parms->encScheme = key->encScheme; > - parms->sigScheme = key->sigScheme; > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > - if (parms->parms.rsa.exponent == NULL) return -1; > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > -- &parms->parms.rsa.exponentSize); > -+ &key_length); > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > - return 0; > - } > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - TPM_DIGEST digest; > -+ size_t key_length; > - info("TPM_GetPubKey()"); > - /* get key */ > - if (keyHandle == TPM_KH_SRK > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - pubKey->pubKey.keyLength = key->key.size >> 3; > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > -- &pubKey->pubKey.keyLength); > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > - tpm_free(pubKey->pubKey.key); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > - TPM_DIGEST DAA_digest_gamma; > - BYTE DAA_generic_q[26]; > - } TPM_DAA_ISSUER; > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > - > - /* > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > - TPM_DIGEST DAA_rekey; > - UINT32 DAA_count; > - } TPM_DAA_TPM; > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > - > - /* > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > - BYTE DAA_scratch[256]; > - BYTE DAA_stage; > - } TPM_DAA_CONTEXT; > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > - > - /* > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > - BYTE DAA_join_u1[138]; > - TPM_DIGEST DAA_digest_n0; > - } TPM_DAA_JOINDATA; > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > - > - /* > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > - //UINT32 ownerReference; > - //BOOL disableResetLock; > - } TPM_STCLEAR_DATA; > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > - > - /* > - * TPM_SESSION_DATA > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > - TPM_DAA_JOINDATA DAA_joinSession; > - TPM_HANDLE handle; > - } TPM_DAA_SESSION_DATA; > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > - > - /* > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > - TPM_DAAHANDLE currentDAA; > - TPM_TRANSHANDLE transExclusive; > - } TPM_STANY_DATA; > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > - > - /* > - * TPM_DATA > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > - struct { > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > - } test_cases[] = {{ > -- "abc", 1, > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > -+ (uint8_t*)"abc", 1, > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > - }, { > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > - }, { > -- "a", 1000000, > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > -+ (uint8_t*)"a", 1000000, > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > - }, { > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > - }}; > - > - debug("tpm_test_sha1()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > - sha1_init(&ctx); > - for (j = 0; j < test_cases[i].repetitions; j++) > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - sha1_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > - } > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > - struct { > - uint8_t *key, key_len, *data, data_len, *digest; > - } test_cases[] = {{ > -- "\x0b", 20, "Hi There", 8, > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > - }, { > -- "Jefe", 4, "what do ya want for nothing?", 28, > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > - }, { > -- "\xaa", 20, "\xdd", 50, > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > - }, { > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > - }, { > -- "\x0c", 20, "Test With Truncation", 20, > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > - }, { > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > - }, { > -- "\xaa", 80, > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > -+ (uint8_t*)"\xaa", 80, > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > - }}; > - > - debug("tpm_test_hmac()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > - uint8_t key[test_cases[i].key_len]; > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > - hmac_init(&ctx, key, test_cases[i].key_len); > - } else { > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > - } > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - } > - hmac_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > - static int tpm_test_rsa_EK(void) > - { > - int res = 0; > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > - uint8_t buf[256]; > -- size_t buf_len, data_len = strlen(data); > -+ size_t buf_len, data_len = strlen((char*)data); > - rsa_private_key_t priv_key; > - rsa_public_key_t pub_key; > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > - { > - info("TPM_GetTicks()"); > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > -- sizeof(TPM_CURRENT_TICKS)); > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > - TPM_CURRENT_TICKS *currentTicks, > - UINT32 *sigSize, BYTE **sig) > - { > -- TPM_RESULT res; > -- TPM_KEY_DATA *key; > -- BYTE *info, *p; > -- UINT32 info_length, length; > - info("TPM_TickStampBlob()"); > -- /* get key */ > -- key = tpm_get_key(keyHandle); > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > -- /* verify authorization */ > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > -- if (res != TPM_SUCCESS) return res; > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > -- /* get current ticks */ > -- TPM_GetTicks(currentTicks); > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > -- *sigSize = key->key.size >> 3; > -- *sig = tpm_malloc(*sigSize); > -- if (*sig == NULL) return TPM_FAIL; > -- /* setup TPM_SIGN_INFO structure */ > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > -- info = tpm_malloc(info_length); > -- if (info == NULL) { > -- tpm_free(*sig); > -- return TPM_FAIL; > -- } > -- memcpy(&info[0], "\x05\x00TSTP", 6); > -- memcpy(&info[6], antiReplay->nonce, 20); > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > -- p = &info[30 + sizeof(TPM_DIGEST)]; > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > -- tpm_free(*sig); > -- tpm_free(info); > -- return TPM_FAIL; > -- } > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - void tpm_update_ticks(void) > - { > -- if (tpmData.stany.data.currentTicks.tag == 0) { > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > --*/ > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > -- sizeof(TPM_NONCE)); > -- tpmData.stany.data.currentTicks.tickRate = 1; > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > --*/ > -- } else { > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > -- } > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "in", 2); > -+ sha1_update(&sha1, (BYTE*)"in", 2); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "out", 3); > -+ sha1_update(&sha1, (BYTE*)"out", 3); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -0,0 +1,156 @@ > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -+ * Copyright (C) 2005 INTEL Corp > -+ * > -+ * This module is free software; you can redistribute it and/or modify > -+ * it under the terms of the GNU General Public License as published > -+ * by the Free Software Foundation; either version 2 of the License, > -+ * or (at your option) any later version. > -+ * > -+ * This module is distributed in the hope that it will be useful, > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -+ * GNU General Public License for more details. > -+ * > -+ */ > -+ > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+ > -+#include "tpm_emulator.h" > -+ > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+ > -+#define BUFFER_SIZE 2048 > -+ > -+static int devurandom=0; > -+ > -+void get_random_bytes(void *buf, int nbytes) { > -+ > -+ if (devurandom == 0) { > -+ devurandom = open("/dev/urandom", O_RDONLY); > -+ } > -+ > -+ if (read(devurandom, buf, nbytes) != nbytes) { > -+ printf("Can't get random number.\n"); > -+ exit(-1); > -+ } > -+} > -+ > -+uint64_t tpm_get_ticks(void) > -+{ > -+ //struct timeval tv; > -+ //int gettimeofday(&tv, struct timezone *tz); > -+ return 0; > -+} > -+ > -+int main(int argc, char **argv) > -+{ > -+ uint8_t in[BUFFER_SIZE], *out; > -+ uint32_t out_size; > -+ int in_size, written; > -+ int i; > -+ struct stat file_info; > -+ > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+ if (argc < 2) { > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > -+ return -1; > -+ } > -+ > -+ /* initialize TPM emulator */ > -+ if (!strcmp(argv[1], "clear")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(1); > -+ } else if (!strcmp(argv[1], "save")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(2); > -+ } else if (!strcmp(argv[1], "deactivated")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(3); > -+ } else { > -+ printf("invalid startup mode '%s'; must be 'clear', " > -+ "'save' (default) or 'deactivated", argv[1]); > -+ return -1; > -+ } > -+ > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ while (1) { > -+abort_command: > -+ if (tpm_rx_fh < 0) { > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ } > -+ > -+ if (tpm_rx_fh < 0) { > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > -+ return -1; > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ if (in_size < 6) { // Magic size of minium TPM command > -+ printf("Recv[%d] to small: 0x", in_size); > -+ if (in_size <= 0) { > -+ close(tpm_rx_fh); > -+ tpm_rx_fh = -1; > -+ goto abort_command; > -+ } > -+ } else { > -+ printf("Recv[%d]: 0x", in_size); > -+ for (i=0; i< in_size; i++) > -+ printf("%x ", in[i]); > -+ printf("\n"); > -+ } > -+ > -+ > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -+ printf("ERROR: Handler Failed.\n"); > -+ } > -+ > -+ written = write(tpm_tx_fh, out, out_size); > -+ > -+ if (written != out_size ) { > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ } else { > -+ printf("Sent[%Zu]: ", out_size); > -+ } > -+ for (i=0; i< out_size; i++) > -+ printf("%x ", out[i]); > -+ printf("\n"); > -+ tpm_free(out); > -+ > -+ } // loop > -+ > -+ tpm_emulator_shutdown(); > -+ > -+ close(tpm_tx_fh); > -+ close(tpm_rx_fh); > -+ > -+} > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > -@@ -2,5 +2,5 @@ > - #define _TPM_VERSION_H_ > - #define VERSION_MAJOR 0 > - #define VERSION_MINOR 4 > --#define VERSION_BUILD 1151058734 > -+#define VERSION_BUILD 1153776940 > - #endif /* _TPM_VERSION_H_ */ > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > deleted file mode 100644 > index 95586c1..0000000 > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile > -+++ tpm_emulator-0.5.1/tpmd/Makefile > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > - CFLAGS += -I../../../../tools/vtpm_manager/manager > --LDFLAGS += -lgmp > -+LDLIBS += -lgmp > - > - BINDIR := /usr/bin/ > - > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > deleted file mode 100644 > index 2aeb745..0000000 > --- a/tools/vtpm/vtpm-0.5.1.patch > +++ /dev/null > @@ -1,766 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > - VERSION_BUILD := $(shell date +"%s") > - VERSION_SUFFIX := .1 > - > --SUBDIRS := tpmd tpmd_dev tddl > -+SUBDIRS := tpmd > - > - all: version all-recursive > - > -@@ -48,12 +48,12 @@ user_install: user > - modules_install: modules > - @$(MAKE) -C tpmd_dev install || exit -1 > - > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpm crypto tpmd > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpmd > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > - > - dist: $(DISTSRC) > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > -+ > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > -+ > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - -Wwrite-strings -Wsign-compare -Wno-multichar > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > - LDFLAGS += -lgmp > - > --BINDIR := /usr/sbin/ > -+BINDIR := /usr/bin/ > - > - TPMD := tpmd > - DIRS := ../tpm ../crypto > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > - > -+VTPM_BIN := vtpmd > -+ > - vpath %.c $(strip $(DIRS)) > - > - all: $(TPMD) > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > - INSTALL ?= install > - > - install: $(TPMD) > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > - > - .PHONY: all clean install > - > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > -@@ -32,6 +32,9 @@ > - #include > - #include "tpm_emulator_config.h" > - #include "tpm/tpm_emulator.h" > -+#include "tpm/tpm_structures.h" > -+#include "tpm/tpm_marshalling.h" > -+#include "vtpm_manager.h" > - > - #define TPM_DAEMON_NAME "tpmd" > - #define TPM_CMD_BUF_SIZE 4096 > -@@ -39,6 +42,24 @@ > - #define TPM_RANDOM_DEVICE "/dev/urandom" > - #undef TPM_MKDIRS > - > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+ > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ static char *vtpm_rx_name=NULL; > -+#endif > -+ > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#define BUFFER_SIZE 2048 > -+ > - static volatile int stopflag = 0; > - static int is_daemon = 0; > - static int opt_debug = 0; > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > - static uid_t opt_uid = 0; > - static gid_t opt_gid = 0; > - static int tpm_startup = 2; > -+static int vtpm_type = VTPM_TYPE_PVM; > -+int dmi_id = 0; > - static int rand_fh; > - > - void tpm_log(int priority, const char *fmt, ...) > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > - > - int tpm_write_to_file(uint8_t *data, size_t data_length) > - { > -- int fh; > -- ssize_t res; > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (fh < 0) return -1; > -- while (data_length > 0) { > -- res = write(fh, data, data_length); > -- if (res < 0) { > -- close(fh); > -- return -1; > -- } > -- data_length -= res; > -- data += res; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > - { > -- int fh; > -- ssize_t res; > -- size_t total_length; > -- fh = open(opt_storage_file, O_RDONLY); > -- if (fh < 0) return -1; > -- total_length = lseek(fh, 0, SEEK_END); > -- lseek(fh, 0, SEEK_SET); > -- *data = tpm_malloc(total_length); > -- if (*data == NULL) { > -- close(fh); > -- return -1; > -- } > -- *data_length = 0; > -- while (total_length > 0) { > -- res = read(fh, &(*data)[*data_length], total_length); > -- if (res < 0) { > -- close(fh); > -- tpm_free(*data); > -- return -1; > -- } > -- *data_length += res; > -- total_length -= res; > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ printf("Error in read_from_file:301\n"); > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > -+ printf("Error in read_from_file:325\n"); > -+ > -+ return -1; > -+ } > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) > -+ { > -+ printf("Error in read_from_file:335\n"); > -+ return -1; > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ printf("Error in read_from_file:352\n"); > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ printf("Error in read_from_file:375\n"); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ printf("Error in read_from_file:381\n"); > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > -+ if (res != (int)*data_length) { > -+ free(*data); > -+ printf("Error in read_from_file:398\n"); > -+ return -1; > -+ } else { > -+ return 0; > -+ } > -+ > -+ > -+ > - } > - > - static void print_usage(char *name) > - { > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > -+ "[-o user name] [-g group name] [-h]" > -+#ifdef VTPM_MULTI_VM > -+ "clear|save|deactivated\n", name); > -+#else > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > -+#endif > - printf(" d : enable debug mode\n"); > - printf(" f : forces the application to run in the foreground\n"); > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > - exit(EXIT_SUCCESS); > - } > - } > -- if (optind < argc) { > -+ /*Make sure we have all required options*/ > -+#ifdef VTPM_MULTI_VM > -+#define EXTRA_OPTS 0 > -+#else > -+#define EXTRA_OPTS 2 > -+#endif > -+ if (optind < argc - EXTRA_OPTS ) { > - debug("startup mode = '%s'", argv[optind]); > - if (!strcmp(argv[optind], "clear")) { > - tpm_startup = 1; > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > - print_usage(argv[0]); > - exit(EXIT_SUCCESS); > - } > -+#ifndef VTPM_MULTI_VM > -+ ++optind; > -+ if(!strcmp(argv[optind], "pvm")) { > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[optind], "hvm")) { > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("Invalid vm mode '%s'; must be 'pvm', " > -+ "or 'hvm' ", argv[optind]); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > -+ } > -+ ++optind; > -+ dmi_id = atoi(argv[optind]); > -+#endif > -+ } else { > -+ error("Invalid number of arguments"); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > - } > - } > - > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > - > - static void main_loop(void) > - { > -- int sock, fh, res; > -- int32_t in_len; > -+ int32_t in_len, written; > - uint32_t out_len; > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > -+ int guest_id=-1; > -+ int i; > -+ char *vtpm_rx_file=NULL; > -+ int res; > -+ > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > - struct sockaddr_un addr; > -- socklen_t addr_len; > -- fd_set rfds; > -- struct timeval tv; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifndef VTPM_MULTI_VM > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > - > - info("staring main loop"); > -- /* open UNIX socket */ > -- sock = init_socket(opt_socket_name); > -- if (sock < 0) exit(EXIT_FAILURE); > - /* init tpm emulator */ > -- debug("initializing TPM emulator: %d", tpm_startup); > -+#ifdef VTPM_MULTI_VM > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > -+#else > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > -+#endif > - tpm_emulator_init(tpm_startup); > - /* start command processing */ > - while (!stopflag) { > - /* wait for incomming connections */ > - debug("waiting for connections..."); > -- FD_ZERO(&rfds); > -- FD_SET(sock, &rfds); > -- tv.tv_sec = 10; > -- tv.tv_usec = 0; > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(sock) failed: %s", strerror(errno)); > -- break; > -- } else if (res == 0) { > -- continue; > -- } > -- addr_len = sizeof(addr); > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > -- if (fh < 0) { > -- error("accept() failed: %s", strerror(errno)); > -- continue; > -- } > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) > -+ { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > -+ } > -+ > -+ /*Error Checking*/ > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > -+ exit(-1); > -+ } > -+ > - /* receive and handle commands */ > - in_len = 0; > - do { > - debug("waiting for commands..."); > -- FD_ZERO(&rfds); > -- FD_SET(fh, &rfds); > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > -- tv.tv_usec = 0; > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(fh) failed: %s", strerror(errno)); > -- close(fh); > -- break; > -- } else if (res == 0) { > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > -- info("connection closed due to inactivity"); > -- close(fh); > -- break; > --#else > -- continue; > --#endif > -- } > -- in_len = read(fh, in, sizeof(in)); > -- if (in_len > 0) { > -+ > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > -+ /*Magic size of minimum TPM command is 6*/ > -+ //FIXME Magic size check may not be required anymore > -+ if (in_len < 6) { > -+ info("Recv incomplete command of %d bytes.", in_len); > -+ if (in_len <= 0) { > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > -+ continue; > -+ } > -+ } else { > -+ /*Debug Printouts*/ > - debug("received %d bytes", in_len); > -+ debug_nostop("Recv[%d]: 0x", in_len); > -+ for (i=0; i< in_len; i++) > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > -+ /*Multiple Guest check*/ > -+ if (guest_id == -1) { > -+ guest_id = *((int32_t *) in); > -+ } else { > -+ if (guest_id != *((int32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ /*Open tx handle now*/ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ exit(-1); > -+ } > -+ > -+ /*Handle the TPM command now*/ > - out = NULL; > -- res = tpm_handle_command(in, in_len, &out, &out_len); > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > - if (res < 0) { > - error("tpm_handle_command() failed"); > - } else { > - debug("sending %d bytes", out_len); > -+ //FIXME this prepending may or may not be needed > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > -+ out_len += sizeof(uint32_t); > -+ /*End Prepend*/ > -+ > -+ /*Perform write operation now*/ > - while (out_len > 0) { > -- res = write(fh, out, out_len); > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > -+ > - if (res < 0) { > - error("write(%d) failed: %s", out_len, strerror(errno)); > - break; > -- } > -+ } else { > -+ debug_nostop("Sent[%Zu]: ", out_len); > -+ for (i=0; (unsigned int)i< out_len; i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > -+ } > - out_len -= res; > - } > - tpm_free(out); > -+ tpm_free(addressed_out); > - } > - } > - } while (in_len > 0); > -- close(fh); > -+ //close(fh); > - } > -+ > - /* shutdown tpm emulator */ > - tpm_emulator_shutdown(); > -- /* close socket */ > -- close(sock); > -- unlink(opt_socket_name); > -+ /* Close handles */ > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MULTI_VM > -+ close(vtpm_rx_fh); > -+ free(vtpm_rx_file); > -+#endif > - info("main loop stopped"); > - } > - > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > - /* open random device */ > - init_random(); > - /* init signal handlers */ > -- init_signal_handler(); > -+ //init_signal_handler(); > - /* unless requested otherwiese, fork and daemonize process */ > -- if (!opt_foreground) daemonize(); > -+ //if (!opt_foreground) daemonize(); > - /* start main processing loop */ > - main_loop(); > - info("stopping TPM Emulator daemon"); > - closelog(); > - return 0; > - } > -+ > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > -@@ -29,23 +29,28 @@ > - > - /* TPM emulator configuration */ > - > --#undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+#define TPM_STRONG_PERSISTENCE > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > - > -+extern int dmi_id; > -+ > - /* log macros */ > - > - void tpm_log(int priority, const char *fmt, ...); > - > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > - > - /* min/max macros that also do strict type-checking */ > - > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > deleted file mode 100644 > index e896b25..0000000 > --- a/tools/vtpm/vtpm.patch > +++ /dev/null > @@ -1,716 +0,0 @@ > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,3 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > --INTEL Corp <> [Dropped to Ring3] > -+INTEL Corp <> [VTPM Extensions] > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,5 +1,6 @@ > - ????-??-?? Intel Corp > - * Moved module out of kernel to run as a ring 3 app > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > - > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > -@@ -44,18 +44,26 @@ > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > -+/* debug and log output functions */ > -+extern int dmi_id; > -+ > - #ifdef DEBUG > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > - #else > - #define debug(fmt, ...) > -+#define debug_nostop(fmt, ...) > -+#define debug_more(fmt, ...) > - #endif > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > -@@ -7,7 +7,7 @@ > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --BIN := tpm_emulator > -+BIN := vtpmd > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > - > - CC := gcc > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > --CFLAGS += -I. -Itpm > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > - > - # Is the simulator running in it's own vm? > - #CFLAGS += -DVTPM_MULTI_VM > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > - > - install: $(BIN) > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > -@@ -98,3 +97,4 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -+ > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > - return TPM_FAIL; > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > - sha1_ctx_t sha1; > - UINT32 res = CPU_TO_BE32(rsp->result); > - UINT32 ord = CPU_TO_BE32(ordinal); > -+ UINT32 offset = 0; > - > - /* compute SHA1 hash */ > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*)&res, 4); > - sha1_update(&sha1, (BYTE*)&ord, 4); > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > -+ if (ordinal == TPM_ORD_LoadKey2) { > -+ offset = 4; > -+ } > -+ if (rsp->paramSize - offset > 0) { > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > -+ } > - sha1_final(&sha1, rsp->auth1->digest); > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -15,10 +16,15 @@ > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > - */ > - > -+#include > -+#include > -+#include > -+#include > -+ > - #include "tpm_emulator.h" > - #include "tpm_structures.h" > - #include "tpm_marshalling.h" > --#include "linux_module.h" > -+#include "vtpm_manager.h" > - > - TPM_DATA tpmData; > - > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > - #include > - #include > - #include > --#include > - > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifdef VTPM_MUTLI_VM > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ extern int dmi_id; > -+ static char *vtpm_rx_name=NULL; > -+#endif > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > -- int res; > -- int fp; > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- res = write(fp, data, data_length); > -- close(fp); > -- return (res == data_length) ? 0 : -1; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > -- int res; > -- int fp, file_status; > -- struct stat file_info; > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- file_status = fstat(fp, &file_info); > -- if (file_status < 0) { > -- close(fp); > -- return -1; > -- } > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > - > -- *data_length = file_info.st_size; > -- *data = tpm_malloc(*data_length); > -- if (*data == NULL) { > -- close(fp); > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > - return -1; > - } > -- res = read(fp, *data, *data_length); > -- close(fp); > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > - if (res != *data_length) { > -- tpm_free(*data); > -- return -1; > -+ free(*data); > -+ return -1; > -+ } else { > -+ return 0; > - } > -- return 0; > -+ > - } > - > - #else > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > -@@ -21,12 +21,24 @@ > - #include > - #include > - #include > -+#include > -+#include > -+#include > - > - #include "tpm_emulator.h" > -+#include "vtpm_manager.h" > - > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > - > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+#endif > -+ > -+ int dmi_id; > -+ > - #define BUFFER_SIZE 2048 > - > - static int devurandom=0; > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > - } > - > - if (read(devurandom, buf, nbytes) != nbytes) { > -- printf("Can't get random number.\n"); > -+ error("Can't get random number.\n"); > - exit(-1); > - } > - } > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > - > - int main(int argc, char **argv) > - { > -- uint8_t in[BUFFER_SIZE], *out; > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > -+ char *vtpm_rx_file=NULL; > - uint32_t out_size; > - int in_size, written; > -- int i; > -- struct stat file_info; > -+ int i, guest_id=-1; > - > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > -+ struct sockaddr_un addr; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+ > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+#ifdef VTPM_MULTI_VM > - if (argc < 2) { > -- printf("Usage: tpmd clear|save|deactivated\n" ); > -+ error("Usage: tpmd clear|save|deactivated\n" ); > -+#else > -+ if (argc < 4) { > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > -+#endif > - return -1; > - } > - > -+#ifndef VTPM_MULTI_VM > -+ /* setup type of vm */ > -+ if (!strcmp(argv[2], "pvm")) { > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[2], "hvm")) { > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("invalid vTPM type '%s'.\n", argv[2]); > -+ } > -+ > -+ dmi_id = atoi(argv[3]); > -+ > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > -+ > -+#ifdef VTPM_MULTI_VM > -+ info("Initializing tpm state: %s\n", argv[1]); > -+#else > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > -+#endif > -+ > - /* initialize TPM emulator */ > - if (!strcmp(argv[1], "clear")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(1); > -- } else if (!strcmp(argv[1], "save")) { > -- printf("Initializing tpm: %s\n", argv[1]); > -+ } else if (!strcmp(argv[1], "save")) { > - tpm_emulator_init(2); > - } else if (!strcmp(argv[1], "deactivated")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(3); > - } else { > -- printf("invalid startup mode '%s'; must be 'clear', " > -+ error("invalid startup mode '%s'; must be 'clear', " > - "'save' (default) or 'deactivated", argv[1]); > - return -1; > - } > -- > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -- return -1; > -- } > -- } > -- > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -- return -1; > -- } > -- } > -- > -+ > - while (1) { > - abort_command: > -- if (tpm_rx_fh < 0) { > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > - } > - > -- if (tpm_rx_fh < 0) { > -- printf("ERROR: failed to open devices to listen to guest.\n"); > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > - return -1; > - } > - > -- if (tpm_tx_fh < 0) { > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -- } > -- > -- if (tpm_tx_fh < 0) { > -- printf("ERROR: failed to open devices to respond to guest.\n"); > -- return -1; > -- } > -- > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > - if (in_size < 6) { // Magic size of minium TPM command > -- printf("Recv[%d] to small: 0x", in_size); > -+ info("Recv incomplete command of %d bytes.", in_size); > - if (in_size <= 0) { > -- close(tpm_rx_fh); > -- tpm_rx_fh = -1; > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > - goto abort_command; > - } > - } else { > -- printf("Recv[%d]: 0x", in_size); > -+ debug_nostop("Recv[%d]: 0x", in_size); > - for (i=0; i< in_size; i++) > -- printf("%x ", in[i]); > -- printf("\n"); > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > - } > - > -- > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -- printf("ERROR: Handler Failed.\n"); > -+ if (guest_id == -1) { > -+ guest_id = *((uint32_t *) in); > -+ } else { > -+ if (guest_id != *((uint32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ // Handle the command, but skip the domain id header > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > -+ error("Handler Failed.\n"); > - } > - > -- written = write(tpm_tx_fh, out, out_size); > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > -+ > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > - > -- if (written != out_size ) { > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ if (written != out_size + sizeof(uint32_t)) { > -+ error("Part of response not written %d/%d.\n", written, out_size); > - } else { > -- printf("Sent[%Zu]: ", out_size); > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > - } > -- for (i=0; i< out_size; i++) > -- printf("%x ", out[i]); > -- printf("\n"); > - tpm_free(out); > -+ tpm_free(addressed_out); > - > - } // loop > - > - tpm_emulator_shutdown(); > - > -- close(tpm_tx_fh); > -- close(tpm_rx_fh); > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh); > -+ free (vtpm_rx_file); > -+#endif > - > - } > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > deleted file mode 100644 > index c4b86b7..0000000 > --- a/tools/vtpm_manager/COPYING > +++ /dev/null > @@ -1,32 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > deleted file mode 100644 > index 632f41b..0000000 > --- a/tools/vtpm_manager/Makefile > +++ /dev/null > @@ -1,18 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -SUBDIRS = crypto tcs util manager migration > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > - > -.PHONY: all clean install > -all clean install: %: subdirs-% > - > -.PHONY: mrproper > -mrproper: > - @set -e; for subdir in $(SUBDIRS); do \ > - $(MAKE) -C $$subdir $@; \ > - done > - > - > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > deleted file mode 100644 > index f0d1e98..0000000 > --- a/tools/vtpm_manager/README > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -Directory Structure > -=================== > -tools/vtpm_manager/crypto -> crypto files > -tools/vtpm_manager/TCS -> TCS implementation > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > -tools/vtpm_manager/manager -> VTPM Manager > - > -Compile Flags > -=================== > -LOGGING_MODULES -> How extensive logging happens > - see util/log.h for more info > - > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -# Debugging flags that may disappear without notice in the future > - > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > - /tmp/out.fifo rather than backend > - > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > - > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > - use a well known value. This is useful for debugging and for > - poor bios which do not support clearing TPM if OwnerAuth is > - lost. However this has no protection from malicious app > - issuing a TPM_OwnerClear to wipe the TPM > - > -Requirements > -============ > -- xen-unstable > -- vtpm frontend/backend driver patch > -- OpenSSL Library > - > -Single-VM Flow > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -NOTES: > -* SaveService SHOULD seal it's table before saving it to disk. However, > - the current Xen infrastructure does not provide a mechanism for this to be > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > - to the service, or it's not even worth encrypting > - > - In the future the vtpm manager will be protected by an early boot mechanism > - that will allow for better protection of it's data. > - > -TODO: > -- Timeout on crashed vtpms > -- create lock for shared fifo for talking to vtpms. > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > deleted file mode 100644 > index 651772b..0000000 > --- a/tools/vtpm_manager/Rules.mk > +++ /dev/null > @@ -1,59 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(FILES) > - > -# Make sure these are just rules > -.PHONY : all build install clean > - > -# > -# Project-specific definitions > -# > - > -# Need UNIX98 spec for pthread rwlocks > -CFLAGS += -D_GNU_SOURCE > - > -# Logging Level. See utils/tools.h for usage > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > - > -# Silent Mode > -#CFLAGS += -DLOGGING_MODULES=0x0 > -#CFLAGS += -DLOGGING_MODULES=0xff > - > -# Use frontend/backend pairs between manager & DMs? > -#CFLAGS += -DVTPM_MULTI_VM > - > -# vtpm_manager listens on fifo's rather than backend > -#CFLAGS += -DDUMMY_BACKEND > - > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > -#CFLAGS += -DDUMMY_TPM > - > -# Do not have manager launch DMs. > -#CFLAGS += -DMANUAL_DM_LAUNCH > - > -# Fixed OwnerAuth > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > - > -# Include > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > deleted file mode 100644 > index 13b61c9..0000000 > --- a/tools/vtpm_manager/crypto/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libtcpaCrypto.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > deleted file mode 100644 > index 7dae655..0000000 > --- a/tools/vtpm_manager/crypto/crypto.c > +++ /dev/null > @@ -1,88 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.c > -// > -// This file will handle all the TPM Crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include "crypto.h" > -#include "log.h" > - > -/** > - * Initialize cryptography library > - * @rand: random seed > - * @size: size of @rand > - */ > -void Crypto_Init(const BYTE* rand, int size) { > - ERR_load_crypto_strings(); > - CRYPTO_malloc_init(); > - OpenSSL_add_all_algorithms(); > - SYM_CIPHER = EVP_aes_128_cbc(); > - RAND_poll(); > - if (rand == NULL) > - return; > - > - RAND_add(rand, size, size); > -} > - > -/** > - * Shutdown cryptography library > - */ > -void Crypto_Exit() { > - ERR_free_strings(); > - ERR_remove_state(0); > - EVP_cleanup(); > -} > - > - > -/** > - * Get random data > - * @data: (OUT) Random data > - * @size: Size of @data > - */ > -void Crypto_GetRandom(void* data, int size) { > - int result; > - > - result = RAND_pseudo_bytes((BYTE*) data, size); > - > - if (result <= 0) > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > - ERR_error_string (ERR_get_error(), NULL)); > -} > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > deleted file mode 100644 > index 488d4d6..0000000 > --- a/tools/vtpm_manager/crypto/crypto.h > +++ /dev/null > @@ -1,175 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.h > -// > -// This file defines the TPM Crypto API > -// > -// ================================================================== > - > -#ifndef __CRYPTO_H__ > -#define __CRYPTO_H__ > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > - > -#define OAEP_P "TCPA" > -#define OAEP_P_SIZE 4 > - > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > -#define CRYPTO_ALGORITH_RSA 0x01 > - > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > -#define CRYPTO_ES_NONE 0x0001 > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// Supported Signature schemes CRYPTO_INFO.sigScheme > -#define CRYPTO_SS_NONE 0x0001 > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > - > -typedef struct CRYPTO_INFO { > - void *keyInfo; > - UINT32 algorithmID; > - UINT32 encScheme; > - UINT32 sigScheme; > -} CRYPTO_INFO; > - > - > -void Crypto_Init(const BYTE* rand, int size); > - > -void Crypto_Exit(); > - > -void Crypto_GetRandom(void* data, int size); > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest); > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest); /* presumably of 20 bytes */ > - > -void Crypto_SHA1Full( const BYTE* text, > - UINT32 size, > - BYTE* hash); //Complete 3part SHA1 > - > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_hash); > - > -void Crypto_SHA1Start(UINT32* maxNumBytes); > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > -void Crypto_SHA1Complete( int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue); > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys); > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo); > - > -// > -// symmetric pack and unpack operations > -// > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen); > - > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread); > - > - > -// return 0 on success, -1 on error > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSADec( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSASign( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig); > - > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig); > - > -//private: > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > - > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > - > -#endif // __CRYPTO_H__ > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > deleted file mode 100644 > index c73114a..0000000 > --- a/tools/vtpm_manager/crypto/hash.c > +++ /dev/null > @@ -1,153 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// hash.c > -// > -// This file will handle all the TPM Hash functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" // for TPM_SUCCESS > -#include "crypto.h" > - > -static SHA_CTX g_shaContext; > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest) { > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > - return; > - > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > -} > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest) { /* presumably of 20 bytes */ > - > - Crypto_HMAC (text->bytes, text->size, > - key->bytes, key->size, > - o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * SHA1 > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > - */ > -void Crypto_SHA1Full( const BYTE* text, > - uint32_t size, > - BYTE* hash) { > - > - if (text == NULL || size == 0) > - return; > - > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > - uint32_t maxBytes; // Not used for anything > - Crypto_SHA1Start(&maxBytes); > - > - while (size > 64){ > - Crypto_SHA1Update(64, text); > - size -= 64; > - text += 64; > - } > - > - Crypto_SHA1Complete(size, text, hash); > -} > - > -// same thing using buffer_t > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_digest) { > - > - if (buf->bytes == NULL || buf->size == 0) > - return TPM_BAD_PARAMETER; > - > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * Initialize SHA1 > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > - * Must be a multiple of 64 bytes. > - */ > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > - int max = SHA_CBLOCK; > - // Initialize the crypto library > - SHA1_Init(&g_shaContext); > - *maxNumBytes = max; > -} > - > -/* > - * Process SHA1 > - * @numBytes: (IN) The number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Bytes to be hashed. > - */ > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > - > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > - return; > - > - SHA1_Update(&g_shaContext, hashData, numBytes); > -} > - > -/* > - * Complete the SHA1 process > - * @hashDataSize: (IN) Number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Final bytes to be hashed. > - * @hashValue: (OUT) The output of the SHA-1 hash. > - */ > -void Crypto_SHA1Complete(int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue) { > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > - SHA1_Final(hashValue, &g_shaContext); > -} > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > deleted file mode 100644 > index 7737dc6..0000000 > --- a/tools/vtpm_manager/crypto/rsa.c > +++ /dev/null > @@ -1,434 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// rsa.c > -// > -// This file will handle all the TPM RSA crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "log.h" > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys) { > - unsigned long e_value; > - > - if (pubExpSize == 0) // Default e = 2^16+1 > - e_value = (0x01 << 16) + 1; > - else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - e_value = (0x01 << 16) + 1; > - } > - > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > - > - if (keys) { > - keys->keyInfo = rsa; > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > - } > - > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - > -} > - > -int Crypto_RSAEnc( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - return -1; > - > - *outDataSize = 0; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > - rc = -1; > - goto abort_egress; > - } > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > - rc = -1; > - goto abort_egress; > - } > - break; > - default: > - rc = -1; > - goto abort_egress; > - } > - > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > - if (rc == -1) > - goto abort_egress; > - > - *outDataSize = rc; > - > - if (rc > 0) rc = 0; > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (paddedData) > - free (paddedData); > - return rc; > - > -} > - > -int Crypto_RSADec( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - goto abort_egress; > - > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - > - paddedDataSize = rc; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa)); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa), > - (BYTE *) OAEP_P, OAEP_P_SIZE); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - default: > - *outDataSize = 0; > - } > - > - free(paddedData); paddedData = NULL; > - goto egress; > - > - abort_egress: > - > - if (paddedData) > - free (paddedData); > - return -1; > - > - egress: > - return 0; > -} > - > -// Signs either a SHA1 digest of a message or a DER encoding of a message > -// Textual messages MUST be encoded or Hashed before sending into this function > -// It will NOT SHA the message. > -int Crypto_RSASign( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig) { > - int status; > - unsigned int intSigSize; > - > - switch(key->sigScheme) { > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status == 0) { > - *sigSize = 0; > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > - return -1; > - } > - > - *sigSize = (UINT32) intSigSize; > - return 0; > -} > - > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig) { > - int status; > - > - switch(key->sigScheme){ > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status) > - return(1); > - else { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - return(0); > - } > - > -} > - > -// helper which packs everything into a BIO! > - > -// packs the parameters first, then the private key, then the public key > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > -// *io_buflen > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen) { > - TPM_RESULT status = TPM_SUCCESS; > - BYTE * buf; > - long len, outlen = *io_buflen; > - > - const long PARAMSLEN = 3*sizeof(UINT32); > - > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - BIO *mem = BIO_new(BIO_s_mem()); > - > - > - // write the openssl keys to the BIO > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - > - // get the buffer out > - len = BIO_get_mem_data (mem, &buf); > - > - // see if we need to allocate a return buffer > - if (*io_buf == NULL) { > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > - if (*io_buf == NULL) > - ERRORDIE (TPM_SIZE); > - } else { // *io_buf is already allocated > - if (outlen < len + PARAMSLEN) > - ERRORDIE (TPM_SIZE); // but not large enough! > - } > - > - // copy over the parameters (three UINT32's starting at algorithmID) > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > - > - // copy over the DER keys > - memcpy (*io_buf + PARAMSLEN, buf, len); > - > - *io_buflen = len + PARAMSLEN; > - > - goto egress; > - > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > - > - > - > -// sets up ci, and returns the number of bytes read in o_lenread > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread) { > - > - TPM_RESULT status = TPM_SUCCESS; > - long l; > - BIO *mem; > - RSA *rsa; > - > - // first load up the params > - l = 3 * sizeof(UINT32); > - memcpy (&ci->algorithmID, in, l); > - len -= l; > - in += l; > - > - // and now the openssl keys, private first > - mem = BIO_new_mem_buf (in, len); > - > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - // now use the same RSA object and fill in the private key > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - > - ci->keyInfo = rsa; // needs to be freed somehow later > - > - // FIXME: havent figured out yet how to tell how many bytes were read in the > - // above oprations! so o_lenread is not set > - > - goto egress; > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > deleted file mode 100644 > index 3d86e19..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.c > +++ /dev/null > @@ -1,237 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.c > -// > -// Symmetric crypto portion of crypto > -// > -// ================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -typedef enum crypt_op_type_t { > - CRYPT_ENCRYPT, > - CRYPT_DECRYPT > -} crypt_op_type_t; > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype); > - > - > -// this is initialized in Crypto_Init() > -const EVP_CIPHER * SYM_CIPHER = NULL; > - > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > - > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > - TPM_RESULT status = TPM_SUCCESS; > - > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > - int res; > - TPM_RESULT status = TPM_SUCCESS; > - > - // hmm, EVP_CIPHER_CTX_init does not return a value > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > - > - // and generate the key material > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > - if (res < 0) > - ERRORDIE (TPM_SHORTRANDOM); > - > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - buffer_free (&key->key); > - > - egress: > - return status; > -} > - > - > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > - > - buffer_init (o_cipher, > - clear->size + > - EVP_CIPHER_iv_length(key->cipher) + > - EVP_CIPHER_block_size (key->cipher), > - 0); > - > - // copy the IV into the front > - buffer_copy (o_cipher, &iv); > - > - // make an alias into which we'll put the ciphertext > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > - > - // set the output size correctly > - o_cipher->size += cipher_alias.size; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > - > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - // alias for the IV > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > - > - // make an alias to where the ciphertext is, after the IV > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - // prepare the output buffer > - TPMTRYRETURN( buffer_init (o_clear, > - cipher->size > - - EVP_CIPHER_iv_length(key->cipher) > - + EVP_CIPHER_block_size(key->cipher), > - 0) ); > - > - // and decrypt > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > - > - goto egress; > - > - abort_egress: > - buffer_free (o_clear); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > - buffer_memset (&key->key, 0); > - buffer_free (&key->key); > - > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - return TPM_SUCCESS; > -} > - > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype) { > - TPM_RESULT status = TPM_SUCCESS; > - > - int inlen, outlen; > - tpm_size_t running; > - > - if ( ! EVP_CipherInit_ex (&key->context, > - key->cipher, NULL, key->key.bytes, iv->bytes, > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > - ERRORDIE (TPM_FAIL); > - > - > - > - inlen = in->size; > - > - outlen = 0; > - running = 0; > - > - > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - out->size = running; > - > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > deleted file mode 100644 > index 7fb59a8..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.h > +++ /dev/null > @@ -1,72 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.h > -// > -// Symmetric Crypto > -// > -// ================================================================== > - > -#ifndef _SYM_CRYPTO_H > -#define _SYM_CRYPTO_H > - > -#include > -#include "buffer.h" > - > -typedef struct symkey_t { > - buffer_t key; > - > - EVP_CIPHER_CTX context; > - const EVP_CIPHER * cipher; > -} symkey_t; > - > -extern const EVP_CIPHER * SYM_CIPHER; > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > - > - > -// these functions will allocate their output buffers > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher); > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear); > - > -// only free the internal parts, not the 'key' ptr > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > - > -#endif /* _SYM_CRYPTO_H */ > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > deleted file mode 100644 > index a33c18a..0000000 > --- a/tools/vtpm_manager/manager/Makefile > +++ /dev/null > @@ -1,38 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = vtpm_managerd > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > - fi > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > - fi > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BIN) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > -CFLAGS += $(PTHREAD_CFLAGS) > -LDFLAGS += $(PTHREAD_LDFLAGS) > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > deleted file mode 100644 > index 5c3cf7e..0000000 > --- a/tools/vtpm_manager/manager/dmictl.c > +++ /dev/null > @@ -1,266 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -// if dmi_res is non-null, then return a pointer to new object. > -// Also, this does not fill in the measurements. They should be filled by > -// design dependent code or saveNVM > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > - > - TPM_RESULT status=TPM_SUCCESS; > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - UINT32 *dmi_id_key=NULL; > - > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > - new_dmi->dmi_id = dmi_id; > - new_dmi->dmi_type = dmi_type; > - new_dmi->connected = FALSE; > - new_dmi->TCSContext = 0; > - > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > - > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - *dmi_id_key = new_dmi->dmi_id; > - > - // install into map > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - if (dmi_res) > - *dmi_res = new_dmi; > - > - goto egress; > - > - abort_egress: > - if (new_dmi) { > - free(new_dmi->NVMLocation); > - free(new_dmi); > - } > - free(dmi_id_key); > - > - egress: > - return status; > -} > - > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > - if (dmi_res == NULL) > - return TPM_SUCCESS; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) > - return(TPM_BAD_PARAMETER); > - > - TCS_CloseContext(dmi_res->TCSContext); > - dmi_res->connected = FALSE; > - > - vtpm_globals->connected_dmis--; > - > - return (VTPM_Close_DMI_Extra(dmi_res) ); > -} > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > - > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - TPM_RESULT status=TPM_FAIL; > - BYTE dmi_type, vm_type, startup_mode; > - UINT32 dmi_id; > - > - if (param_buf == NULL) { // Assume creation of Dom 0 control > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > - dmi_id = VTPM_CTL_DM; > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } else { > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > - BSG_UnpackList( param_buf->bytes, 4, > - BSG_TYPE_BYTE, &dmi_type, > - BSG_TYPE_BYTE, &startup_mode, > - BSG_TYPE_BYTE, &vm_type, > - BSG_TYPE_UINT32, &dmi_id); > - } > - > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (new_dmi == NULL) { > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > - // Brand New DMI. Initialize the persistent pieces > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > - } else > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > - > - if (new_dmi->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Initialize the Non-persistent pieces > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > - > - new_dmi->connected = TRUE; > - > - // Design specific new DMI code. > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > - close_dmi(new_dmi ); > - > - egress: > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (!dmi_res->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Close Dmi > - TPMTRYRETURN(close_dmi( dmi_res )); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - //vtpm scripts delete file dmi_res->NVMLocation for us > - > - // Close DMI first > - TPMTRYRETURN(close_dmi( dmi_res )); > - free ( dmi_res ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > deleted file mode 100644 > index 54da708..0000000 > --- a/tools/vtpm_manager/manager/migration.c > +++ /dev/null > @@ -1,307 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > - UINT32 dmi_id; > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t enc_dmi_state_pack; > - > - BSG_UnpackList(param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** UnBind Blob **/ > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > - enc_dmi_state_pack.size, > - enc_dmi_state_pack.data) ); > - > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > - vtpm_globals->manager_tcs_handle, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - &clear_dmi_blob) ); > - > - // Create new dmi > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > - > - /** Open Blob **/ > - struct pack_buf_t dmi_state_pack; > - > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > - dmi_state_pack.size, > - dmi_state_pack.data) ); > - > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > - > - egress: > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state_abuf); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi; > - UINT32 dmi_id; > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t name_pack; > - > - BSG_UnpackList( param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &name_pack); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Find migration key for dest **/ > - last_mig = NULL; > - mig_key = vtpm_globals->mig_keys; > - while (mig_key != NULL) { > - if (mig_key->name_size == name_pack.size) > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > - break; > - } > - > - last_mig = mig_key; > - mig_key = mig_key->next; > - } > - > - if (!mig_key) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Mark vtpm as migrated **/ > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > - > - /** Build Blob **/ > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > - > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > - > - struct pack_constbuf_t dmi_state_pack; > - > - dmi_state_pack.size = buffer_len(&dmi_state); > - dmi_state_pack.data = dmi_state.bytes; > - > - BSG_PackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - /** Bind Blob **/ > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > - &mig_key->key, > - result_buf) ); > - > - if (last_mig) > - last_mig->next = mig_key->next; > - else > - vtpm_globals->mig_keys = mig_key->next; > - > - free(mig_key->name); > - free(mig_key); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > - > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > - > - egress: > - > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > - > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > - TPM_KEY mig_key; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - mig_key.algorithmParms.parms, > - &rsaKeyParms); > - > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > - pubkey_exp_pack.data = rsaKeyParms.exponent; > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > - pubkey_mod_pack.data = mig_key.pubKey.key; > - > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > - pubkey_exp_pack.size + > - pubkey_mod_pack.size, NULL ) ); > - > - BSG_PackList( result_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_MIGKEY_LIST *mig_key; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > - > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > - > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > - > - //FIXME: scan list and verify name is not already in the list > - > - BSG_UnpackList( param_buf->bytes, 3, > - BSG_TPM_SIZE32_DATA, &name_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - //TODO: Maintain a persistent list for pub_keys. > - //TODO: Verify pub_key is trusted > - > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > - mig_key->name_size = name_pack.size; > - mig_key->name = name_pack.data; > - > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > - pubkey_exp_pack.data, > - pubkey_mod_pack.size, > - pubkey_mod_pack.data, > - &mig_key->key); > - > - > - mig_key->next = vtpm_globals->mig_keys; > - vtpm_globals->mig_keys = mig_key; > - > - // free(name_pack.data); Do not free. data is now part of mig_key. > - free(pubkey_exp_pack.data); > - free(pubkey_mod_pack.data); > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > deleted file mode 100644 > index d5e6ffd..0000000 > --- a/tools/vtpm_manager/manager/securestorage.c > +++ /dev/null > @@ -1,512 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// securestorage.c > -// > -// Functions regarding securely storing DMI secrets. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "crypto.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "buffer.h" > -#include "log.h" > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data) { > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_cipher = NULL_BUF; > - > - UINT32 i; > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > - for (i=0; i< buffer_len(inbuf); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - // Generate a sym key and encrypt state with it > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > - > - // Encrypt symmetric key > - TPMTRYRETURN( VTSP_Bind( asymkey, > - &symkey.key, > - &symkey_cipher) ); > - > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > - > - symkey_cipher32.size = buffer_len(&symkey_cipher); > - symkey_cipher32.data = symkey_cipher.bytes; > - > - data_cipher32.size = buffer_len(&data_cipher); > - data_cipher32.data = data_cipher.bytes; > - > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > - > - BSG_PackList(sealed_data->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > - for (i=0; i< buffer_len(sealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > - > - egress: > - > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data) { > - > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_clear = NULL_BUF, > - symkey_cipher = NULL_BUF; > - struct pack_buf_t symkey_cipher32, data_cipher32; > - int i; > - > - memset(&symkey, 0, sizeof(symkey_t)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > - for (i=0; i< buffer_len(cipher); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - BSG_UnpackList(cipher->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > - symkey_cipher32.size, > - symkey_cipher32.data) ); > - > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > - data_cipher32.size, > - data_cipher32.data) ); > - > - // Decrypt Symmetric Key > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > - keyHandle, > - &symkey_cipher, > - key_usage_auth, > - &symkey_clear, > - &(vtpm_globals->keyAuth) ) ); > - > - // create symmetric key using saved bits > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > - > - // Decrypt State > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > - for (i=0; i< buffer_len(unsealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > - > - egress: > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_clear); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - long bytes_written; > - buffer_t sealed_NVM = NULL_BUF; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > - > - TPMTRYRETURN( envelope_encrypt(inbuf, > - &vtpm_globals->storageKey, > - &sealed_NVM) ); > - > - // Write sealed blob off disk from NVMLocation > - // TODO: How to properly return from these. Do we care if we return failure > - // after writing the file? We can't get the old one back. > - // TODO: Backup old file and try and recover that way. > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > - > - egress: > - buffer_free(&sealed_NVM); > - return status; > -} > - > - > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t sealed_NVM = NULL_BUF; > - long fh_size; > - int fh, stat_ret, i; > - struct stat file_stat; > - TPM_DIGEST sealedNVMHash; > - > - if (myDMI->NVMLocation == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - //Read sealed blob off disk from NVMLocation > - fh = open(myDMI->NVMLocation, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > - > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > - > - // Verify measurement of sealed blob. > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > - myDMI->TCSContext, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - outbuf) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > - > - egress: > - buffer_free( &sealed_NVM ); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_SaveManagerData(void) { > - TPM_RESULT status=TPM_SUCCESS; > - int fh, dmis=-1; > - > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > - > - struct hashtable_itr *dmi_itr; > - VTPM_DMI_RESOURCE *dmi_res; > - > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > - > - // Initially fill these with buffer sizes for each data type. Later fill > - // in actual size, once flattened. > - boot_key_size = sizeof(UINT32) + // bootkeysize > - bootKeySize; // boot key > - > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > - 3*sizeof(TPM_DIGEST) + // Auths > - sizeof(UINT32) +// storagekeysize > - storageKeySize, NULL) ); // storage key > - > - > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > - > - boot_key_size = BSG_PackList(flat_boot_key, 1, > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > - > - BSG_PackList(clear_flat_global.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > - &vtpm_globals->bootKey, > - &enc_flat_global) ); > - > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > - > - // Per DMI values to be saved (if any exit) > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > - > - flat_dmis = (BYTE *) malloc( > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > - > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - dmis++; > - > - // No need to save dmi0. > - if (dmi_res->dmi_id == 0) > - continue; > - > - > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - > - } while (hashtable_iterator_advance(dmi_itr)); > - } > - > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > - if (fh == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - goto egress; > - > - abort_egress: > - egress: > - > - free(flat_boot_key); > - free(flat_enc); > - buffer_free(&enc_flat_global); > - free(flat_dmis); > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > - return status; > -} > - > -TPM_RESULT VTPM_LoadManagerData(void) { > - > - TPM_RESULT status=TPM_SUCCESS; > - int fh, stat_ret, dmis=0; > - long fh_size = 0, step_size; > - BYTE *flat_table=NULL; > - buffer_t unsealed_data, enc_table_abuf; > - struct pack_buf_t storage_key_pack, boot_key_pack; > - UINT32 *dmi_id_key, enc_size; > - BYTE vtpm_manager_gen; > - > - VTPM_DMI_RESOURCE *dmi_res; > - UINT32 dmi_id; > - BYTE dmi_type; > - struct stat file_stat; > - > - TPM_HANDLE boot_key_handle; > - TPM_AUTHDATA boot_usage_auth; > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > - > - fh = open(STATE_FILE, O_RDONLY ); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - flat_table = (BYTE *) malloc(fh_size); > - > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Read Boot Key > - step_size = BSG_UnpackList( flat_table, 2, > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > - BSG_TYPE_UINT32, &enc_size); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > - > - //Load Boot Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - &SRK_AUTH, > - &boot_key_handle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->bootKey, > - FALSE) ); > - > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > - vtpm_globals->manager_tcs_handle, > - boot_key_handle, > - (const TPM_AUTHDATA*) &boot_usage_auth, > - &unsealed_data) ); > - step_size += enc_size; > - > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > - // Once there is more than one gen, this will include some compatability stuff > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > - } > - > - // Global Values needing to be saved > - BSG_UnpackList( unsealed_data.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > - > - // Per DMI values to be saved > - while ( step_size < fh_size ){ > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > - step_size = fh_size; > - } else { > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TYPE_BYTE, &dmi_type); > - > - //TODO: Try and gracefully recover from problems. > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > - dmis++; > - > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - } > - > - } > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > - egress: > - > - free(flat_table); > - close(fh); > - > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > deleted file mode 100644 > index 9b1e5f8..0000000 > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > +++ /dev/null > @@ -1,110 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmpassthrough.c > -// > -// Functions regarding passing DMI requests to HWTPM > -// > -// ================================================================== > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "log.h" > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE *ord; > - > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > - > - switch (*ord) { > - > - // Forbidden for DMI use > - case TPM_ORD_TakeOwnership: > - case TPM_ORD_ChangeAuthOwner: > - case TPM_ORD_DirWriteAuth: > - case TPM_ORD_DirRead: > - case TPM_ORD_AuthorizeMigrationKey: > - case TPM_ORD_CreateMaintenanceArchive: > - case TPM_ORD_LoadMaintenanceArchive: > - case TPM_ORD_KillMaintenanceFeature: > - case TPM_ORD_LoadManuMaintPub: > - case TPM_ORD_ReadManuMaintPub: > - case TPM_ORD_SelfTestFull: > - case TPM_ORD_SelfTestStartup: > - case TPM_ORD_CertifySelfTest: > - case TPM_ORD_ContinueSelfTest: > - case TPM_ORD_GetTestResult: > - case TPM_ORD_Reset: > - case TPM_ORD_OwnerClear: > - case TPM_ORD_DisableOwnerClear: > - case TPM_ORD_ForceClear: > - case TPM_ORD_DisableForceClear: > - case TPM_ORD_GetCapabilityOwner: > - case TPM_ORD_OwnerSetDisable: > - case TPM_ORD_PhysicalEnable: > - case TPM_ORD_PhysicalDisable: > - case TPM_ORD_SetOwnerInstall: > - case TPM_ORD_PhysicalSetDeactivated: > - case TPM_ORD_SetTempDeactivated: > - case TPM_ORD_CreateEndorsementKeyPair: > - case TPM_ORD_GetAuditEvent: > - case TPM_ORD_GetAuditEventSigned: > - case TPM_ORD_GetOrdinalAuditStatus: > - case TPM_ORD_SetOrdinalAuditStatus: > - case TPM_ORD_SetRedirection: > - case TPM_ORD_FieldUpgrade: > - case TSC_ORD_PhysicalPresence: > - status = TPM_DISABLED_CMD; > - goto abort_egress; > - break; > - > - } // End ORD Switch > - > - // Call TCS with command > - > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > - > - goto egress; > - > - abort_egress: > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > deleted file mode 100644 > index 319dc83..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > +++ /dev/null > @@ -1,141 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.c Implements ipc routines using file io. This file can > -// be replaced with other ipc types. > -// > -// =================================================================== > - > -#include > -#include "vtpm_ipc.h" > -#include "vtpmpriv.h" > -#include "log.h" > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > - ipc_h->name = name; > - ipc_h->flags = flags; > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - if (create) > - return(vtpm_ipc_create(ipc_h)); > - else > - return 0; > -} > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > - int fh; > - struct stat file_info; > - > - if ((!ipc_h) || (!ipc_h->name)) > - return -1; > - > - if ( stat(ipc_h->name, &file_info) == -1) { > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > - return -1; > - } > - } > - > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - return 0; > -} > - > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > - return -1; > - } > - > - result = read(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > - return -1; > - } > - > - result = write(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > - > - if (ipc_h) { > - close(ipc_h->fh); > - ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > deleted file mode 100644 > index 529c4a2..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > +++ /dev/null > @@ -1,71 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > -// and Guests or VTPMs > -// > -// =================================================================== > - > -#ifndef __VTPM_IO_H__ > -#define __VTPM_IO_H__ > - > -#include "tcg.h" > - > -#define VTPM_IPC_CLOSED -1 > - > -// Represents an (somewhat) abstracted io handle. > -typedef struct vtpm_ipc_handle_t { > - int fh; // IO handle. > - int flags; // Flags for opening. This may need to become > - // a void *, but for now files use an int. > - char *name; // Names for debugging as well as filenames > - // for file-based io. > -} vtpm_ipc_handle_t; > - > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > deleted file mode 100644 > index e737d60..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.c > +++ /dev/null > @@ -1,63 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#include > -#include "vtpm_lock.h" > - > -static pthread_rwlock_t vtpm_lock; > - > -void vtpm_lock_init() { > - > - pthread_rwlock_init( &vtpm_lock, NULL); > -} > - > -void vtpm_lock_destroy(){ > - pthread_rwlock_destroy(&vtpm_lock); > -} > - > -void vtpm_lock_rdlock(){ > - pthread_rwlock_rdlock(&vtpm_lock); > -} > - > -void vtpm_lock_wrlock(){ > - pthread_rwlock_wrlock(&vtpm_lock); > -} > - > -void vtpm_lock_unlock(){ > - pthread_rwlock_unlock(&vtpm_lock); > -} > - > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > deleted file mode 100644 > index 53a339d..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.h > +++ /dev/null > @@ -1,48 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#ifndef __VTPM_LOCK_H__ > -#define __VTPM_LOCK_H__ > - > -void vtpm_lock_init(); > -void vtpm_lock_destroy(); > - > -void vtpm_lock_rdlock(); > -void vtpm_lock_wrlock(); > -void vtpm_lock_unlock(); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > deleted file mode 100644 > index e089f78..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.c > +++ /dev/null > @@ -1,285 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -#include "log.h" > -#include "buffer.h" > - > -VTPM_GLOBALS *vtpm_globals=NULL; > - > -// --------------------------- Well Known Auths -------------------------- > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > - > -#ifdef WELL_KNOWN_OWNER_AUTH > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > -#endif > - > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -// --------------------------- Functions ------------------------------ > - > -TPM_RESULT VTPM_Create_Manager(){ > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Auth for Owner > -#ifdef WELL_KNOWN_OWNER_AUTH > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > -#else > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > -#endif > - > - // Take Owership of TPM > - CRYPTO_INFO ek_cryptoInfo; > - > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > - > - // If we can read PubEK then there is no owner and we should take it. > - // We use the abilty to read the pubEK to flag that the TPM is owned. > - // FIXME: Change to just trying to take ownership and react to the status > - if (status == TPM_SUCCESS) { > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &SRK_AUTH, > - &ek_cryptoInfo, > - &vtpm_globals->keyAuth)); > - > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &vtpm_globals->keyAuth)); > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > - } > - > - // Generate storage key's auth > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > - sizeof(TPM_AUTHDATA) ); > - > - TCS_AUTH osap; > - TPM_AUTHDATA sharedsecret; > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->storageKeyWrap, > - &osap) ); > - > - // Generate boot key's auth > - TPM_AUTHDATA bootKeyWrapAuth; > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - // FIXME: This key protects the global secrets on disk. It should use TPM > - // PCR bindings to limit its use to legit configurations. > - // Current binds are open, implying a Trusted VM contains this code. > - // If this VM is not Trusted, use measurement and PCR bindings. > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->bootKeyWrap, > - &osap) ); > - > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - NULL, > - NULL, > - NULL, > - &vtpm_globals->bootKey, > - TRUE ) ); > - > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > - goto egress; > - > - abort_egress: > - exit(1); > - > - egress: > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > - return status; > - > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -TPM_RESULT VTPM_Init_Manager() { > - TPM_RESULT status = TPM_FAIL, serviceStatus; > - BYTE *randomsead; > - UINT32 randomsize=256; > - > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > - > - vtpm_globals->connected_dmis = 0; > - > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - // Create new TCS Object > - vtpm_globals->manager_tcs_handle = 0; > - > - TPMTRYRETURN(TCS_create()); > - > - // Create TCS Context for service > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > - > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > - &randomsize, > - &randomsead)); > - > - Crypto_Init(randomsead, randomsize); > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > - > - // Create OIAP session for service's authorized commands > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > - &vtpm_globals->keyAuth) ); > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > - > - vtpm_globals->mig_keys = NULL; > - > - // If fails, create new Manager. > - serviceStatus = VTPM_LoadManagerData(); > - if (serviceStatus == TPM_IOERROR) { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > - TPMTRYRETURN( VTPM_Create_Manager() ); > - TPMTRYRETURN( VTPM_SaveManagerData() ); > - } else if (serviceStatus != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > - exit(1); > - } > - > - //Load Storage Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->storageKeyWrap, > - &SRK_AUTH, > - &vtpm_globals->storageKeyHandle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->storageKey, > - FALSE ) ); > - > - // Create entry for Dom0 for control messages > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - return(status); > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -void VTPM_Stop_Manager() { > - VTPM_DMI_RESOURCE *dmi_res; > - struct hashtable_itr *dmi_itr; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - if (dmi_res->connected) > - close_dmi( dmi_res ); // Not really interested in return code > - > - } while (hashtable_iterator_advance(dmi_itr)); > - free (dmi_itr); > - } > - > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > - > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > - TCS_destroy(); > - > - hashtable_destroy(vtpm_globals->dmi_map, 1); > - free(vtpm_globals); > - > - Crypto_Exit(); > - > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > -} > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > deleted file mode 100644 > index a324a8f..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.h > +++ /dev/null > @@ -1,150 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.h > -// > -// Public Interface header for VTPM Manager > -// > -// ================================================================== > - > -#ifndef __VTPM_MANAGER_H__ > -#define __VTPM_MANAGER_H__ > - > -#define VTPM_TAG_REQ 0x01c1 > -#define VTPM_TAG_RSP 0x01c4 > -#define COMMAND_BUFFER_SIZE 4096 > - > -// Header sizes. Note Header MAY include the DMI > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > - > -//************************ Command Codes **************************** > -#define VTPM_ORD_BASE 0x0000 > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > - > -// Non-priviledged VTPM Commands (From DMI's) > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > - > -// Priviledged VTPM Commands (From management console) > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > - > -//************************ Return Codes **************************** > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > -#define VTPM_TYPE_HVM 2 // HVM Domain > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > -#define VTPM_UNSUPPORTED 2 > -#define VTPM_FORBIDDEN 3 > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > -#define VTPM_INVALID_REQUEST 5 > - > -//*********************** Parameter Values ************************* > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > -#define VTPM_TYPE_MIGRATABLE 0x01 > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > - // VTPM can be recovered or deleted only > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - dmi: 4 bytes // Source of message. > - // WARNING: This is prepended by the channel. > - // Thus it is received by VTPM Manager, > - // but not sent by DMI > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Open: > - Input Parameters: > - mig_type: 1 byte > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > - domain type: 1 byte > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Close > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Delete > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_SaveNVM > - Input Parameters: > - data: n bytes (Header indicates size of data) > - Output Parameters: > - None > - > -VTPM_LoadNVM > - Input Parameters: > - None > - Output Parameters: > - data: n bytes (Header indicates size of data) > - > -VTPM_TPMCommand > - Input Parameters: > - TPM Command Byte Stream: n bytes > - Output Parameters: > - TPM Reponse Byte Stream: n bytes > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > deleted file mode 100644 > index 2001074..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > +++ /dev/null > @@ -1,488 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_handler.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "log.h" > -#include "buffer.h" > - > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > - > -// ---------------------- Prototypes ------------------- > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name); > - > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name); > - > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Forward TPM cmds? > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *thread_name) { > - TPM_RESULT status = TPM_FAIL; // Should never return > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > - buffer_t *command_buf=NULL, *result_buf=NULL; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - VTPM_DMI_RESOURCE *dmi_res; > - int size_read, size_write, i; > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > - > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - > - // ------------------------ Main Loop -------------------------------- > - while(1) { > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > - > - // --------------------- Read Cmd from Sender ---------------- > - > - // Read command header > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > - goto abort_command; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > - goto abort_command; > - } > - > - // Unpack header > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - // Using the header info, read the parameters of the command > - // Note that in_param_size is in the client's context > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (cmd_size > 0) { > - in_param = (BYTE *) malloc(cmd_size); > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - if (size_read < (int) cmd_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > - goto abort_command; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } > - > - // Init the buffers used to handle the command and the response > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - goto abort_command; > - } > - > - // -------------- Dispatch Commands to Handlers ----------- > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > - vtpm_lock_wrlock(); > - } else { > - vtpm_lock_rdlock(); > - } > - > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > - (!dmi_res->connected) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > - status = TPM_BAD_PARAMETER; > - // We have no one to reply to, they don't exist. > - goto abort_command; > - } > - > - if (tag == VTPM_TAG_REQ) { > - > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > - > - } else { // This is not a VTPM Command at all. > - if (fw_tpm) { > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > - > - // This means calling the DMI failed, not that the cmd failed in the DMI > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > - if (status != TPM_SUCCESS) { > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > - // should be forwarded to the caller VM > - add_header = FALSE; > - } else { > - // We are not supposed to forward TPM commands at all. > - int i; > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - } // end else for is VTPM Command > - > - // ------------------- Respond to Sender ------------------ > - > - // Errors while handling responses jump here to reply with error messages > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > - // is added to the code, this ifdef should be removed. > - // Also note this is NOT referring to errors in commands, but rather > - // this is about I/O errors and such. > -#ifndef VTPM_MULTI_VM > - abort_with_error: > -#endif > - > - if (add_header) { > - // Prepend VTPM header with destination DM stamped > - out_param_size = buffer_len(result_buf); > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > - out_message = (BYTE *) malloc (reply_size); > - reply = out_message; > - > - BSG_PackList(out_message, 4, > - BSG_TYPE_UINT32, (BYTE *) &dmi, > - BSG_TPM_TAG, (BYTE *) &tag, > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > - BSG_TPM_RESULT, (BYTE *) &status); > - > - if (buffer_len(result_buf) > 0) > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > - //Note: Send message + dmi_id > - } else { > - reply = result_buf->bytes; > - reply_size = buffer_len(result_buf); > - } > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i < reply_size; i++) > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - free(out_message); out_message=NULL; > - > - if (size_write < (int)reply_size) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > - goto abort_command; > - } > - > - // On certain failures an error message cannot be sent. > - // This marks the beginning of cleanup in preperation for the next command. > - abort_command: > - //free buffers > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - //free(in_param); // This was converted to command_buf. No need to free > - buffer_free(result_buf); > - buffer_free(command_buf); > - > - // If we have a write lock, save the manager table > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > - } > - > - vtpm_lock_unlock(); > - add_header = TRUE; // Reset to the default > - } // End while(1) > - > -} > - > -///////////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - > - switch (ord) { > - case VTPM_ORD_SAVENVM: > - status= VTPM_Handle_Save_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOADNVM: > - status= VTPM_Handle_Load_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_TPMCOMMAND: > - status= VTPM_Handle_TPM_Command(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_GET_MIG_KEY: > - status = VTPM_Handle_Get_Migration_key(command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOAD_MIG_KEY: > - status = VTPM_Handle_Load_Migration_key(command_buf, > - result_buf); > - break; > - > - default: > - // Privileged handlers can do maintanance > - if (is_priv) { > - switch (ord) { > - case VTPM_ORD_OPEN: > - status = VTPM_Handle_New_DMI(command_buf); > - break; > - > - case VTPM_ORD_CLOSE: > - status = VTPM_Handle_Close_DMI(command_buf); > - break; > - > - case VTPM_ORD_DELETE: > - status = VTPM_Handle_Delete_DMI(command_buf); > - break; > - > - case VTPM_ORD_MIGRATE_IN: > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > - break; > - > - case VTPM_ORD_MIGRATE_OUT: > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > - break; > - > - default: > - status = TPM_BAD_ORDINAL; > - } // switch > - } else { // is priv command > - > - status = TPM_BAD_ORDINAL; > - } // inner switch > - } // outer switch > - > - return(status); > -} > - > -///////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - UINT32 dmi_dst; > - TPM_COMMAND_CODE ord; > - TPM_TAG tag_out; > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > - BYTE *dmi_cmd, *in_param; > - int size_read, size_write, i; > - > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > - > - //Forward TPM CMD stamped with dmi_id to DMI for handling > - if (buffer_len(param_buf)) { > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > - > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - free(dmi_cmd); > - } else { > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } > - > - if (size_write != (int) dmi_cmd_size) > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > - > - buffer_free(param_buf); > - > - // Read header for response to TPM command from DMI > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi_dst, > - BSG_TPM_TAG, &tag_out, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &status ); > - > - // If response has parameters, read them. > - // Note that in_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (adj_param_size > 0) { > - in_param = (BYTE *) malloc(adj_param_size); > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > - goto abort_with_error; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > - > - status = TPM_SUCCESS; > - > - abort_with_error: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > deleted file mode 100644 > index cf58ba3..0000000 > --- a/tools/vtpm_manager/manager/vtpmd.c > +++ /dev/null > @@ -1,371 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmd.c > -// > -// Application > -// > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "tcg.h" > -#include "log.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -#define VTPM_BE_FNAME "/dev/vtpm" > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > - > -#define VTPM_TYPE_PVM_STRING "pvm" > -#define VTPM_TYPE_HVM_STRING "hvm" > - > -struct vtpm_thread_params_s { > - vtpm_ipc_handle_t *tx_ipc_h; > - vtpm_ipc_handle_t *rx_ipc_h; > - BOOL fw_tpm; > - vtpm_ipc_handle_t *fw_tx_ipc_h; > - vtpm_ipc_handle_t *fw_rx_ipc_h; > - BOOL is_priv; > - char *thread_name; > -}; > - > -// This is needed to all extra_close_dmi to close this to prevent a > -// broken pipe when no DMIs are left. > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > - > -void *vtpm_manager_thread(void *arg_void) { > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > - > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > - arg->is_priv, arg->thread_name); > - > - return (status); > -} > - > - > -void signal_handler(int reason) { > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > - } else { > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > - pthread_exit(NULL); > - } > - > - VTPM_Stop_Manager(); > - exit(-1); > -} > - > -struct sigaction ctl_c_handler; > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > - struct stat file_info; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - dmi_res->tx_tpm_ipc_h = NULL; > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->tx_vtpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - } else { > - // Create a pair of fifo pipes > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > - status =TPM_RESOURCES; > - goto abort_egress; > - } > - > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > - > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Measure DMI > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > - // Also, this mechanism is specific to 1 VM architecture. > - /* > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - dmi_size = file_stat.st_size; > - else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - dmi_buffer > - */ > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > - > - if (vm_type == VTPM_TYPE_PVM) > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > - else > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > - > - // Launch DMI > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > -#ifdef MANUAL_DM_LAUNCH > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > - dmi_res->dmi_pid = 0; > -#else > - pid_t pid = fork(); > - > - if (pid == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } else if (pid == 0) { > - switch (startup_mode) { > - case TPM_ST_CLEAR: > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_STATE: > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_DEACTIVATED: > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > - break; > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Returning from these at all is an error. > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > - } else { > - dmi_res->dmi_pid = pid; > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > - } > -#endif // MANUAL_DM_LAUNCH > - > - } // If DMI = VTPM_CTL_DM > - status = TPM_SUCCESS; > - > -abort_egress: > - return (status); > -} > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (vtpm_globals->connected_dmis == 0) { > - // No more DMI's connected. Close fifo to prevent a broken pipe. > - // This is hackish. Need to think of another way. > - vtpm_ipc_close(g_rx_tpm_ipc_h); > - } > - > - > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > - > - free(dmi_res->tx_tpm_ipc_h->name); > - free(dmi_res->tx_vtpm_ipc_h->name); > - > -#ifndef MANUAL_DM_LAUNCH > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - if (dmi_res->dmi_pid != 0) { > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > - status = TPM_FAIL; > - } > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > - status = TPM_FAIL; > - } > - } > -#endif > - > - } //endif ! dom0 > - return status; > -} > - > - > -int main(int argc, char **argv) { > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > - pthread_t be_thread, dmi_thread, hp_thread; > - > -#ifdef DUMMY_BACKEND > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > -#else > - vtpm_ipc_handle_t real_be_ipc_h; > -#endif > - > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > - > - // -------------------- Initialize Manager ----------------- > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > - return -1; > - } > - > - // -------------------- Setup Ctrl+C Handlers -------------- > - ctl_c_handler.sa_handler = signal_handler; > - sigemptyset(&ctl_c_handler.sa_mask); > - ctl_c_handler.sa_flags = 0; > - > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > - > - // For easier debuggin with gdb > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > - > - sigset_t sig_mask; > - sigemptyset(&sig_mask); > - sigaddset(&sig_mask, SIGPIPE); > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > - > - // ------------------- Set up file ipc structures ---------- > -#ifdef DUMMY_BACKEND > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > - > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > - exit(-1); > - } > - > - tx_be_ipc_h = &tx_dummy_ipc_h; > - rx_be_ipc_h = &rx_dummy_ipc_h; > -#else > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > - > - tx_be_ipc_h = &real_be_ipc_h; > - rx_be_ipc_h = &real_be_ipc_h; > -#endif > - > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > - exit(-1); > - } > - > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > - > - // -------------------- Set up thread params ------------- > - > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > - be_thread_params.fw_tpm = TRUE; > - be_thread_params.fw_tx_ipc_h = NULL; > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > - be_thread_params.is_priv = FALSE; > - be_thread_params.thread_name = "Backend Listener"; > - > - dmi_thread_params.tx_ipc_h = NULL; > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > - dmi_thread_params.fw_tpm = FALSE; > - dmi_thread_params.fw_tx_ipc_h = NULL; > - dmi_thread_params.fw_rx_ipc_h = NULL; > - dmi_thread_params.is_priv = FALSE; > - dmi_thread_params.thread_name = "VTPM Listener"; > - > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > - hp_thread_params.fw_tpm = FALSE; > - hp_thread_params.fw_tx_ipc_h = NULL; > - hp_thread_params.fw_rx_ipc_h = NULL; > - hp_thread_params.is_priv = TRUE; > - hp_thread_params.thread_name = "Hotplug Listener"; > - > - // --------------------- Launch Threads ----------------- > - > - vtpm_lock_init(); > - > - vtpm_globals->master_pid = pthread_self(); > - > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > - exit(-1); > - } > - > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > - exit(-1); > - } > - > - > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > - exit(-1); > - } > - > - //Join the other threads until exit time. > - pthread_join(be_thread, NULL); > - pthread_join(dmi_thread, NULL); > - pthread_join(hp_thread, NULL); > - > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > - > - VTPM_Stop_Manager(); > - vtpm_lock_destroy(); > - return 0; > -} > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > deleted file mode 100644 > index 41e8d2d..0000000 > --- a/tools/vtpm_manager/manager/vtpmpriv.h > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmpriv.h > -// > -// Structures and functions private to the manager > -// > -// ================================================================== > - > -#ifndef __VTPMPRIV_H__ > -#define __VTPMPRIV_H__ > - > -#include "vtpm_manager.h" > -#include "tcg.h" > -#include "tcs.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "vtpm_ipc.h" > - > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > - // is changed. It's used for backwards compatability > - > -#define STATE_FILE "/var/vtpm/VTPM" > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > -#define VTPM_CTL_DM 0 > - > -// ------------------------ Private Structures ----------------------- > -typedef struct VTPM_DMI_RESOURCE_T { > - // I/O info for Manager to talk to DMI's and controllers > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > - > -#ifndef VTPM_MULTI_VM > - pid_t dmi_pid; > -#endif > - > - // Non-persistent Information > - bool connected; > - UINT32 dmi_domain_id; > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > - char *NVMLocation; // NULL term string indicating location > - // of NVM. > - // Persistent Information about DMI > - UINT32 dmi_id; > - BYTE dmi_type; > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > -} VTPM_DMI_RESOURCE; > - > -typedef struct tdVTPM_MIGKEY_LIST { > - UINT32 name_size; > - BYTE *name; // Name of destination (IP addr, domain name, etc) > - CRYPTO_INFO key; > - struct tdVTPM_MIGKEY_LIST *next; > -} VTPM_MIGKEY_LIST; > - > - > -typedef struct tdVTPM_GLOBALS { > - // Non-persistent data > -#ifndef VTPM_MULTI_VM > - pid_t master_pid; > -#endif > - > - int connected_dmis; // To close guest_rx when no dmis are connected > - > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > - // Currently keys are loaded at migration time, > - // TODO: Make VTPM man store a keys persistently > - // and update script to check if key is needed > - // before fetching it. > - > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > - CRYPTO_INFO storageKey; // For software encryption > - CRYPTO_INFO bootKey; // For saving table > - TCS_AUTH keyAuth; // OIAP session for storageKey > - > - // Persistent Data > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > - TPM_AUTHDATA srk_usage_auth; > - TPM_AUTHDATA storage_key_usage_auth; > - > - buffer_t bootKeyWrap; // Wrapped copy of boot key > - > -}VTPM_GLOBALS; > - > -// --------------------------- Global Values -------------------------- > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > - > -// ********************** VTPM Functions ************************* > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > -void VTPM_Stop_Manager(); // Stop VTPM Service > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Should forward TPM cmds > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *client_name); > - > -// ********************** Command Handler Prototypes *********************** > - > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_SaveManagerData(void); > -TPM_RESULT VTPM_LoadManagerData(void); > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > - > -// Helper functions > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data); > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data); > - > -#endif // __VTPMPRIV_H__ > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > deleted file mode 100644 > index fc8a66f..0000000 > --- a/tools/vtpm_manager/manager/vtsp.c > +++ /dev/null > @@ -1,1042 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.c > -// > -// Higher level interface to TCS for use in service. > -// > -// ================================================================== > - > -#include > -#include "tcg.h" > -#include "tcs.h" > -#include "bsg.h" > -#include "log.h" > -#include "crypto.h" > -#include "vtsp.h" > -#include "buffer.h" > - > -#define RSA_KEY_SIZE 0x0800 > - > -/*********************************************************************************** > - * GenerateAuth: Generate authorization info to be sent back to application > - * > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > - * outParamDigestTextSize Size of inParamDigestText > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use shared secret > - * pAuth Authorization information from the application > - * > - * Return: TPM_SUCCESS Authorization data created > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > - *************************************************************************************/ > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > - /*[IN]*/ UINT32 inParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth) { > - > - if (inParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - else { > - > - //Generate new OddNonce > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > - > - // Create SHA1 inParamDigest > - TPM_DIGEST inParamDigest; > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &inParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > - > - return(TPM_SUCCESS); > - > - } > -} > - > -/*********************************************************************************** > - * VerifyAuth: Verify the authdata for a command requiring authorization > - * > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > - * inParamDigestTextSize Size of inParamDigestText > - * authDataUsage AuthDataUsage for the Entity being used > - * Key->authDataUsage or TPM_AUTH_OWNER > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use NULL (It will be aquired from the Auth Session) > - * If unknown (default), assume OIAP > - * sessionAuth A TCS_AUTH info for the session > - * pAuth Authorization information from the application > - * hContext If specified, on failed Auth, VerifyAuth will > - * generate a new OIAP session in place of themselves > - * destroyed session. > - * > - * Return: TPM_SUCCESS Authorization Verified > - * TPM_AUTHFAIL Authorization Failed > - * TPM_FAIL Failure during SHA1 routines > - *************************************************************************************/ > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > - /*[IN]*/ UINT32 outParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth, > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > - if (outParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - > - > - // Create SHA1 inParamDigest > - TPM_DIGEST outParamDigest; > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - TPM_DIGEST hm; > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &outParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > - > - // Compare correct HMAC with provided one. > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > - if (!auth->fContinueAuthSession) > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > - > - return (TPM_SUCCESS); > - } else { > - // If specified, reconnect the OIAP session. > - // NOTE: This only works for TCS's that never have a 0 context. > - if (hContext) { > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > - VTSP_OIAP( hContext, auth); > - } > - return (TPM_AUTHFAIL); > - } > -} > - > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_OIAP(hContext, > - &auth->AuthHandle, > - &auth->NonceEven) ); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedSecret, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > - > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > - > - TPMTRYRETURN( TCSP_OSAP( hContext, > - entityType, > - entityValue, > - nonceOddOSAP, > - &auth->AuthHandle, > - &auth->NonceEven, > - &nonceEvenOSAP) ); > - > - // Calculating Session Secret > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > - > - BSG_PackList( sharedSecretText, 2, > - BSG_TPM_NONCE, &nonceEvenOSAP, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *crypto_info) { > - > - TPM_RESULT status; > - TPM_NONCE antiReplay; > - TPM_DIGEST checksum; > - BYTE *pubEKtext; > - UINT32 pubEKtextsize; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > - > - // GenerateAuth new nonceOdd > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > - > - > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > - antiReplay, > - &pubEKtextsize, > - &pubEKtext, > - &checksum) ); > - > - > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > - > - // Build CryptoInfo for the bindingKey > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - pubEK.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - pubEK.pubKey.keyLength, > - pubEK.pubKey.key, > - crypto_info); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > - BYTE *new_srk; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // vars for srkpubkey parameter > - TPM_KEY srkPub; > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > - > - struct pack_buf_t srkText; > - > - //These values are accurate for an enc(AuthData). > - struct pack_buf_t encOwnerAuth, encSrkAuth; > - > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > - > - > - // Build srk public key struct > - srkPub.ver = TPM_STRUCT_VER_1_1; > - srkPub.keyUsage = TPM_KEY_STORAGE; > - srkPub.keyFlags = 0x00; > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > - srkPub.PCRInfoSize = 0; > - srkPub.PCRInfo = 0; > - srkPub.pubKey.keyLength= 0; > - srkPub.encDataSize = 0; > - > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 5, > - BSG_TPM_COMMAND_CODE,&command, > - BSG_TPM_PROTOCOL_ID, &proto_id, > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > - BSG_TPM_KEY, &srkPub); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > - > - new_srk = srkText.data; > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > - proto_id, > - encOwnerAuth.size, > - encOwnerAuth.data, > - encSrkAuth.size, > - encSrkAuth.data, > - &srkText.size, > - &new_srk, > - auth ) ); > - > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > - paramTextSize += srkText.size; > - > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(srkText.data); > - free(encSrkAuth.data); > - free(encOwnerAuth.data); > - free(paramText); > - > - TCS_FreeMemory(hContext, new_srk); > - > - return status; > -} > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - ownerAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - goto egress; > - > - abort_egress: > - egress: > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth) { > - > - int i; > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > - > - // vars for Calculate encUsageAuth > - BYTE *paramText; > - UINT32 paramTextSize; > - > - // vars for Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - TPM_DIGEST XORKey1; > - UINT32 XORbufferSize; > - TPM_SECRET encUsageAuth, encMigrationAuth; > - > - // vars for Flatten newKey prototype > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > - struct pack_buf_t newKeyText; > - > - // Fill in newKey > - TPM_KEY newKey; > - > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > - newKey.algorithmParms.parmSize = 12; > - > - switch (usage) { > - case TPM_KEY_SIGNING: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > - newKey.keyUsage = TPM_KEY_SIGNING; > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > - break; > - case TPM_KEY_STORAGE: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > - newKey.keyUsage = TPM_KEY_STORAGE; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - case TPM_KEY_BIND: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > - newKey.keyUsage = TPM_KEY_BIND; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - default: > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - > - newKey.ver = TPM_STRUCT_VER_1_1; > - > - newKey.keyFlags = 0; > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > - newKey.pubKey.keyLength= 0; > - newKey.encDataSize = 0; > - newKey.encData = NULL; > - > - // FIXME: Support PCR bindings > - newKey.PCRInfoSize = 0; > - newKey.PCRInfo = NULL; > - > - // Calculate encUsageAuth > - XORbufferSize = BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven); > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > - > - // FIXME: No support for migratable keys. > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > - > - // Flatten newKey prototype > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > - newKeyText.data = flatKey; > - newKeyText.size = flatKeySize; > - > - // Generate HMAC > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_AUTHDATA, &encUsageAuth, > - BSG_TPM_AUTHDATA, &encMigrationAuth); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > - parentHandle, > - encUsageAuth, > - encMigrationAuth, > - &newKeyText.size, > - &newKeyText.data, > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, 0) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(flatKey); > - free(paramText); > - TCS_FreeMemory(hContext, newKeyText.data); > - > - return status; > -} > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *auth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad) { > - > - > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > - > - BYTE *paramText=NULL; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > - if (! skipTPMLoad) { > - > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > - (newKeyHandle==NULL) || (auth==NULL)) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Generate Extra TCS Parameters > - TPM_HANDLE phKeyHMAC; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - parentAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > - hUnwrappingKey, > - buffer_len(rgbWrappedKeyBlob), > - rgbWrappedKeyBlob->bytes, > - auth, > - newKeyHandle, > - &phKeyHMAC) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_HANDLE, newKeyHandle); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - parentAuth, auth, > - hContext) ); > - } > - > - // Build cryptoinfo structure for software crypto function. > - if (cryptoinfo != NULL) { > - TPM_KEY newKey; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - newKey.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - newKey.pubKey.keyLength, > - newKey.pubKey.key, > - cryptoinfo); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - } > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - struct pack_buf_t clear_data32; > - BYTE *clear_data_text; > - UINT32 clear_data_size; > - > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &bound_data32); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - usage_auth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_UnBind( hContext, > - key_handle, > - buffer_len(bound_data), > - bound_data->bytes, > - auth, > - &clear_data_size, > - &clear_data_text) ); > - > - > - // Verify Auth > - clear_data32.size = clear_data_size; > - clear_data32.data = clear_data_text; > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clear_data32); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - usage_auth, auth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - TCS_FreeMemory(hContext, clear_data_text); > - > - return status; > -} > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData) > -{ > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_BOUND_DATA boundData; > - UINT32 i; > - > - // Fill boundData's accessory information > - boundData.ver = TPM_STRUCT_VER_1_1; > - boundData.payload = TPM_PT_BIND; > - boundData.payloadData = inData->bytes; > - > - // Pack boundData before encryption > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > - (sizeof(TPM_VERSION) + > - sizeof(TPM_PAYLOAD_TYPE) + > - buffer_len(inData))); > - if (flatBoundData == NULL) { > - return TPM_NOSPACE; > - } > - UINT32 flatBoundDataSize = 0; > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > - BSG_TPM_VERSION, &boundData.ver, > - BSG_TYPE_BYTE, &boundData.payload); > - > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > - flatBoundDataSize += buffer_len(inData); > - > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > - UINT32 out_tmp_size; > - > - // Encrypt flatBoundData > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > - flatBoundDataSize, > - flatBoundData, > - &out_tmp_size, > - out_tmp) ); > - > - if (out_tmp_size > RSA_KEY_SIZE/8) { > - // The result of RSAEnc should be a fixed size based on key size. > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > - } > - > - buffer_init(outData, 0, NULL); > - buffer_append_raw(outData, out_tmp_size, out_tmp); > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > - for(i = 0 ; i < out_tmp_size ; i++) { > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > - } > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - goto egress; > - abort_egress: > - egress: > - > - // Free flatBoundData > - free(flatBoundData); > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate PCR_Info Struct from Comp > - TPM_PCR_INFO pcrInfo; > - UINT32 pcrInfoSize, flatpcrSize; > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > - sizeof(UINT16) + // 2 byte UINT16 > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > - > - if (pcrComp != NULL) { > - //printf("\n\tBinding to PCRs: "); > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > - > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > - > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > - } else { > - //printf("\n\tBinding to no PCRS."); > - pcrInfoSize = 0; > - } > - > - // Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - UINT32 XORbufferSize = sizeof(XORbuffer); > - TPM_DIGEST XORKey; > - TPM_ENCAUTH encAuth; > - > - BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven ); > - > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > - > - int i; > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > - > - // Generate Extra TCS Parameters > - UINT32 inDataSize = buffer_len(inData); > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > - > - UINT32 sealedDataSize; > - BYTE *flatSealedData=NULL; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 4, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_ENCAUTH, &encAuth, > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > - BSG_TPM_SIZE32_DATA, &inData_pack); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_Seal( hContext, > - keyHandle, > - encAuth, > - pcrInfoSize, > - flatpcr, > - inDataSize, > - inData->bytes, > - auth, > - &sealedDataSize, > - &flatSealedData) ); > - > - // Unpack/return key structure > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, > - 0) ); > - > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, flatSealedData); > - > - free(paramText); > - return status; > -} > - > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - UINT32 sealDataSize, clearDataSize; > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > - 2 * sizeof(UINT32) + > - sealedData->sealInfoSize + > - sealedData->encDataSize), > - *clearData=NULL; > - > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - key_usage_auth, auth) ); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth) ); > - // Call TCS > - TPMTRYRETURN( TCSP_Unseal( hContext, > - keyHandle, > - sealDataSize, > - flatSealedData, > - auth, > - dataAuth, > - &clearDataSize, > - &clearData) ); > - > - // Verify Auth > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clearData_pack); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - key_usage_auth, auth, > - hContext) ); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, clearData); > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Call TCS > - return ( TCSP_SaveState ( hContext ) ); > - > -} > - > - > -// Function Reaches into unsupported TCS command, beware. > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Extra TCS Parameters > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > - > - // Call TCS > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > - &resultTextSize, resultText) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > - goto egress; > - > - abort_egress: > - > - egress: > - TCS_FreeMemory(hContext, resultText); > - free(resultText); > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > deleted file mode 100644 > index 2fb0440..0000000 > --- a/tools/vtpm_manager/manager/vtsp.h > +++ /dev/null > @@ -1,126 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.h > -// > -// Higher level interface to TCS. > -// > -// ================================================================== > - > -#ifndef __VTSP_H__ > -#define __VTSP_H__ > - > -#include "tcg.h" > -#include "tcs.h" > - > -#define KEY_BUFFER_SIZE 2048 > - > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ); > - > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedsecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth); > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *cypto_info); > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *pAuth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad); > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData); > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth); > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > - > -#endif //_VTSP_H_ > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > deleted file mode 100644 > index e33ae95..0000000 > --- a/tools/vtpm_manager/migration/Makefile > +++ /dev/null > @@ -1,42 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -VPATH = ../manager > - > -BIND = vtpm_migratord > -BINC = vtpm_migrator > - > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > - > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIND) $(BINC) > - > -.PHONY: install > -install: build > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BINC) $(BIND) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIND): $(OBJSD) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -$(BINC): $(OBJSC) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../util/libTCGUtils.a > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > deleted file mode 100644 > index 08986f4..0000000 > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_if.c > -// > -// Provides functions to call local vtpm manager interface (Hotplug) > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "vtpm_ipc.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > - > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > - > -TPM_RESULT vtpm_manager_open(){ > - > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > - return TPM_IOERROR; > - } > - > - return TPM_SUCCESS; > -} > - > -void vtpm_manager_close() { > - > - vtpm_ipc_close(&tx_ipc_h); > - vtpm_ipc_close(&rx_ipc_h); > -} > - > - > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_TAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > - adj_command = (BYTE *) malloc( adj_command_size ); > - if (!adj_command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - BSG_PackList(adj_command, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > - for (i=0; i< adj_command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) adj_command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > - > - // Read header for response to manager command > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > deleted file mode 100644 > index 8d52e66..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > +++ /dev/null > @@ -1,104 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator.h > -// > -// Public Interface header for VTPM Migrator > -// > -// ================================================================== > - > -#ifndef __VTPM_MIGRATOR_H__ > -#define __VTPM_MIGRATOR_H__ > - > -#define VTPM_MTAG_REQ 0x02c1 > -#define VTPM_MTAG_RSP 0x02c4 > - > -// Header sizes. > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > - > -//*********************** Connection Info ************************** > -#define VTPM_MIG_PORT 48879 > - > -//************************ Command Codes *************************** > -#define VTPM_MORD_MIG_STEP1 0x00 > -#define VTPM_MORD_MIG_STEP2 0x01 > -#define VTPM_MORD_MIG_STEP3 0x02 > -#define VTPM_MORD_MIG_STEP4 0x03 > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Mig_Phase1: > - Unsupported: (Handled by scripts) > - > -VTPM_Mig_Phase2 > - Input Parameters: > - domain_name_size: 4 bytes > - domain_name : domain_name_size bytes > - Output Parameters: > - pub_exp_size: 4 bytes > - pub_exp: pub_exp_size bytes > - pub_mod_size: 4 bytes > - pub_mod: pub_mod_size bytes > - > -VTPM_Mig_Phase3 > - Input Parameters: > - vtpm_state_size: 4 bytes > - vtpm_state: vtpm_state_size bytes > - Output Parameters: > - none > - > -VTPM_Mig_Phase4 > - Unsupported: (Handled by scripts) > - > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > deleted file mode 100644 > index de48b2d..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > +++ /dev/null > @@ -1,219 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator_if.c > -// > -// Provides functions to call open network connection & call > -// a function on the vtpm_migratord on the destination > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > - > -static int sock_desc; > - > - > -TPM_RESULT vtpm_migratord_open(char *server_address){ > - > - TPM_RESULT status = TPM_FAIL; > - > - /* network variables */ > - struct in_addr ip_addr; > - struct sockaddr_in server_addr; > - int addr_len; > - struct hostent *dns_info=NULL; > - > - /* set up connection to server*/ > - dns_info = gethostbyname(server_address); > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > - > - if(ip_addr.s_addr < 0) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /* set up server variable */ > - memset((char *)&server_addr, 0, sizeof(server_addr)); > - server_addr.sin_family = AF_INET; > - server_addr.sin_port = htons(VTPM_MIG_PORT); > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > - > - /* open socket, make connection */ > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > - > - if (sock_desc < 0 ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (connect(sock_desc, > - (struct sockaddr *)&server_addr, > - sizeof(server_addr)) < 0 ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - status = TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -void vtpm_migratord_close() { > - close(sock_desc); > -} > - > - > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_MTAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - command = (BYTE *) malloc( command_size ); > - if (!command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - BSG_PackList(command, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &command_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = write(sock_desc, command, command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > - for (i=0; i< command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > - > - // Read header for response > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > deleted file mode 100644 > index 18b3bdb..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > +++ /dev/null > @@ -1,211 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - UINT32 offset; > - struct pack_buf_t addr_data32; > - > - //===== Get Destination's Public Migration Key ====== > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > - &out_param_buf, > - &cmd_status, > - &mig_key_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - //===== Load migration key into vtpm_manager ======== > - > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > - NULL ) ) ; > - > - offset = BSG_PackList(out_param_buf.bytes, 1, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free(&mig_key_buf); > - buffer_free(&out_param_buf); > - > - return status; > -} > - > - > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > - struct pack_buf_t addr_data32, name_data32, state_data32; > - > - //===== Get vtpm state from vtpm_manager ======== > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - (2 * sizeof(UINT32)) + addr_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > - &out_param_buf, > - &cmd_status, > - &state_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > - > - //===== Send vtpm state to destination ====== > - name_data32.data = (BYTE *)name; > - name_data32.size = strlen(name) + 1; // Include the null > - state_data32.data = state_buf.bytes; > - state_data32.size = buffer_len(&state_buf); > - > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free( &out_param_buf); > - buffer_free( &state_buf); > - buffer_free( &empty_buf); > - > - return status; > -} > - > - > -// Usage vtpm_migrator addr domain_name instance step > - > -int main(int argc, char **argv) { > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - char *server_addr, *name; > - UINT32 instance, step; > - > - if (argc != 5) { > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > - status= TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - server_addr = argv[1]; > - name = argv[2]; > - instance = atoi( argv[3] ); > - step = atoi( argv[4] ); > - > - switch (step) { > - case VTPM_MORD_MIG_STEP2: > - status = handle_vtpm_mig_step2(server_addr, name, instance); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - status = handle_vtpm_mig_step3(server_addr, name, instance); > - break; > - > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - break; > - } > - > - goto egress; > - abort_egress: > - egress: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > deleted file mode 100644 > index ea18c8c..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > +++ /dev/null > @@ -1,202 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > - > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > - TPM_TAG tag = VTPM_MTAG_RSP; > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > - > - buffer_init(buf, out_param_size, NULL); > - > - BSG_PackList(buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status ); > -} > - > -int main() { > - > - /* network variables */ > - int sock_descr, client_sock=-1, len; > - struct sockaddr_in addr; > - struct sockaddr_in client_addr; > - unsigned int client_length; > - int bytes; > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - UINT32 in_param_size, adj_param_size; > - int i, size_read, size_write; > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > - > - > - /* setup socket */ > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > - > - memset(&addr, 0, sizeof(addr)); > - addr.sin_family = AF_INET; > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > - addr.sin_port = htons(VTPM_MIG_PORT); > - > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > - return 1; > - } > - > - listen(sock_descr, 10); > - > - for(;;) { > - // ============ clear client info and wait for connection ========== > - memset(&client_addr, 0, sizeof(client_addr)); > - client_length = sizeof(client_addr); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > - client_sock=accept(sock_descr, &client_addr, &client_length); > - if (client_sock == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > - goto abort_command; > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > - } > - > - // =================== Read incoming command ====================== > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - // Unpack response from client > - BSG_UnpackList(cmd_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - buffer_init( &in_param_buf, adj_param_size, NULL); > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - /* Handle Command */ > - switch (ord) { > - case VTPM_MORD_MIG_STEP2: > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > - break; > - > - default: > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - abort_command_with_error: > - /* Write Response */ > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i< buffer_len(&result_buf); i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > - goto abort_command; > - } > - > - if (size_write != (int) buffer_len(&result_buf) ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > - > - abort_command: > - close(client_sock); > - buffer_free(&in_param_buf); > - buffer_free(&result_buf); > - > - } // For (;;) > - > - return 0; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > deleted file mode 100644 > index 0a8a2d5..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > +++ /dev/null > @@ -1,177 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "log.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > -#define VTPM_SH_CMD_FTR "\"" > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > -#define VTPM_SH_ADD "vtpm_add_and_activate" > -#define VTPM_SH_RESUME "vtpm_resume" > - > -// This must be updated to the longest command name. Currently GETINST > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > - > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Call manager and get mig key =============== > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > - &out_param_buf, // Empty > - &cmd_status, > - &mig_key_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ==================== return the mig key ===================== > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > - > - TPMTRYRETURN( buffer_init(result_buf, > - out_param_size, > - NULL) ); > - > - BSG_PackList( result_buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status); > - > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > - > - goto egress; > - > - abort_egress: > - buffer_free(result_buf); > - build_error_msg(result_buf, status); > - > - egress: > - return; > -} > - > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size, instance; > - char *shell_cmd_str=NULL; > - size_t shell_cmd_strlen; > - FILE *shell_f=NULL; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Read Parameters =============== > - struct pack_buf_t name_data32, state_data32; > - > - BSG_UnpackList(in_param_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - // Before using this string, protect us from a non-null term array. > - if (name_data32.data[name_data32.size -1] != 0x00) { > - name_data32.data[name_data32.size -1] = 0x00; > - } > - > - // ====== Call hotplug-script and get an instance ====== > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > - > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > - > - shell_f = popen(shell_cmd_str, "r"); > - fscanf(shell_f, "%d", &instance); > - pclose(shell_f); > - > - // ====== Call hotplug-script and add instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > - name_data32.data, instance); > - system(shell_cmd_str); > - > - // ========= Call vtpm_manager and load VTPM ======= > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2*sizeof(UINT32) + state_data32.size, > - NULL) ); > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ====== Call hotplug-script and resume instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > - system(shell_cmd_str); > - > - goto egress; > - abort_egress: > - egress: > - free(shell_cmd_str); > - > - // In this case no params come back, so reuse build_error_msg even for succes. > - build_error_msg(result_buf, status); > - return; > -} > - > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > deleted file mode 100644 > index 11af91e..0000000 > --- a/tools/vtpm_manager/tcs/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCS.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > deleted file mode 100644 > index cf3803c..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.c > +++ /dev/null > @@ -1,224 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include "tcs.h" > -#include "contextmgr.h" > -#include "log.h" > -#include "hashtable.h" > - > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize) { // in > - > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pBlock = NULL; > - > - // check incoming params > - if (pContextHandle == NULL || BlockSize == 0) > - return NULL; > - > - // Create New Block > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > - if (pBlock == NULL) > - return (0); > - > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > - if (pBlock->aMemory == NULL) > - return (0); > - > - memset(pBlock->aMemory, 0, BlockSize); > - pBlock->nBlockSize = BlockSize; > - pBlock->pNextBlock = NULL; > - > - // search for the last block created where to add the > - // newly created block > - if(pContextHandle->pTopBlock != NULL) { > - pCurrentBlock = pContextHandle->pTopBlock; > - while(pCurrentBlock->pNextBlock != NULL) > - pCurrentBlock = pCurrentBlock->pNextBlock; > - > - > - pCurrentBlock->pNextBlock= pBlock; > - } else > - pContextHandle->pTopBlock = pBlock; > - > - > - pContextHandle->nBlockCount++; > - > - return pBlock->aMemory; > -} > - > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs) { // in > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pParentBlock = NULL; > - BOOL bFound = FALSE; > - > - if (pContextHandle == NULL) > - return FALSE; > - > - > - // Search for the Block in the context by aMemory pointer > - pParentBlock = NULL; > - pCurrentBlock = pContextHandle->pTopBlock; > - > - while(pCurrentBlock != NULL) { > - // If aMemory block is found, delete it > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > - // if it is the top Block, remove it from the top, > - // otherwise remove it from the ParentBlock and stitch > - // the NextBlock to the ParentBlock > - if(pParentBlock == NULL) > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > - else > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > - > - // delete memory Block associated with pointer pTCPA_BYTEs > - free(pCurrentBlock->aMemory); > - pCurrentBlock->aMemory = NULL; > - > - free(pCurrentBlock); > - pCurrentBlock = pParentBlock; > - > - pContextHandle->nBlockCount--; > - bFound = TRUE; > - } > - > - if(pCurrentBlock != NULL) { > - pParentBlock = pCurrentBlock; > - pCurrentBlock = pCurrentBlock->pNextBlock; > - } > - } > - > - return bFound; > -} > - > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle) { // in > - HANDLE_LIST* pNewHandle = NULL; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle == NULL) > - return 0; > - > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > - > - if (pNewHandle == NULL) > - return (0); > - > - pNewHandle->handle = handle; > - pNewHandle->type = type; > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > - > - pContextHandle->pHandleList = pNewHandle; > - > - return 1; > -} > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle) { // in > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > - *pLastHandle = pCurrentHandle; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > - > - if (pContextHandle == NULL) > - return 0; > - > - while (1) { > - > - if (pCurrentHandle->handle == handle) { // Found element > - if (pCurrentHandle == pLastHandle) { // First element in list > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } else { // Ordinary element > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } > - > - return 1; > - > - } else { // Not found yet; > - pLastHandle = pCurrentHandle; > - pCurrentHandle = pCurrentHandle->pNextHandle; > - if (pCurrentHandle == NULL) // Found end of list > - return 0; > - } > - > - } > -} > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > - HANDLE_LIST* pCurrentHandle; > - BOOL returncode = TRUE; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > - > - if (pContextHandle == NULL) > - return 1; > - > - pCurrentHandle = pContextHandle->pHandleList; > - while (pCurrentHandle != NULL) { > - > - switch (pCurrentHandle->type) { > - case TPM_RT_KEY: > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > - break; > - case TPM_RT_AUTH: > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > - break; > - default: > - returncode = FALSE; > - } > - > - pCurrentHandle = pCurrentHandle->pNextHandle; > - > - } > - > - return 1; > -} > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > deleted file mode 100644 > index e3fdf0f..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.h > +++ /dev/null > @@ -1,82 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#ifndef __CONTEXTMGR_H__ > -#define __CONTEXTMGR_H__ > - > -#include "tcg.h" > - > -#define BLOCK_SIZE 300 > - > -typedef struct block { > - int nBlockSize; > - BYTE* aMemory; > - struct block* pNextBlock; > -} BLOCK; > - > -typedef struct handle_List { > - TPM_HANDLE handle; > - TPM_RESOURCE_TYPE type; > - struct handle_List* pNextHandle; > -} HANDLE_LIST; > - > -typedef struct context_handle { > - TCS_CONTEXT_HANDLE handle; > - int nBlockCount; > - BLOCK* pTopBlock; > - HANDLE_LIST* pHandleList; > -} CONTEXT_HANDLE; > - > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize); // in > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs); // in > - > - > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle); // in > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle); // in > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > - > -#endif //_CONTEXTMGR_H_ > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > deleted file mode 100644 > index 7c1378c..0000000 > --- a/tools/vtpm_manager/tcs/tcs.c > +++ /dev/null > @@ -1,1192 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.c > -// > -// This file contains the functions that implement a TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "tcs.h" > -#include "contextmgr.h" > -#include "tpmddl.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -// Static Global Vars for the TCS > -static int TCS_m_nCount = 0; > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > - > -struct hashtable *context_ht; > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > -} > - > -// --------------------------------------------------------------------------------- > -// Initialization/Uninitialization SubComponent API > -// --------------------------------------------------------------------------------- > -TPM_RESULT TCS_create() { > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TPM_RESULT result = TPM_FAIL; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > - hRes = TDDL_Open(); > - > - context_ht = create_hashtable(10, hashfunc32, equals32); > - > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > - result = TPM_SUCCESS; > - TCS_m_nCount++; > - } else { > - result = TPM_IOERROR; > - hashtable_destroy(context_ht, 1); > - } > - } else > - TCS_m_nCount++; > - > - return(result); > -} > - > - > -void TCS_destroy() > -{ > - TCS_m_nCount--; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > - TDDL_Close(); > - > - struct hashtable_itr *context_itr; > - TCS_CONTEXT_HANDLE *hContext; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(context_ht) > 0) { > - context_itr = hashtable_iterator(context_ht); > - do { > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > - > - } while (hashtable_iterator_advance(context_itr)); > - free(context_itr); > - } > - hashtable_destroy(context_ht, 1); > - } > - > -} > - > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr) {// out > - > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle != NULL && ppMemPtr != NULL) { > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > - returnCode = TPM_SUCCESS; > - } > - > - return returnCode; > -} > - > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory) { // in > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if ( (pContextHandle != NULL && pMemory != NULL) && > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > - returnCode = TPM_SUCCESS; > - > - > - return returnCode; > -} > - > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > - TPM_RESULT returnCode = TPM_FAIL; > - TCS_CONTEXT_HANDLE *newContext; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > - > - if (hContext) { > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > - if (pContextHandle == NULL) > - return TPM_SIZE; > - > - // initialize to 0 > - pContextHandle->nBlockCount = 0; > - pContextHandle->pTopBlock = NULL; > - pContextHandle->pHandleList = NULL; > - > - // Create New Block > - AddMemBlock(pContextHandle, BLOCK_SIZE); > - > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > - > - if (hashtable_search(context_ht, &newContext) !=NULL) > - *newContext += 1; > - > - pContextHandle->handle = *newContext; > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > - free(newContext); > - free(pContextHandle); > - returnCode = TPM_FAIL; > - } else { > - *hContext = *newContext; > - returnCode = TPM_SUCCESS; > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > - //FIXME: TCS SHOULD Track failed auths and make sure > - //we don't try and re-free them here. > - TPM_RESULT returnCode = TPM_FAIL; > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if(pContextHandle != NULL) { > - // Print test info > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > - > - // free memory for all the blocks > - DeleteMemBlock(pContextHandle, NULL ); > - pContextHandle->pTopBlock = NULL; > - > - FreeHandleList(pContextHandle); > - if (pContextHandle->pHandleList != NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - // Release the TPM's resources > - if (hashtable_remove(context_ht, &hContext) == NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - free(pContextHandle); > - returnCode = TPM_SUCCESS; > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > - return(returnCode); > -} > - > -// ------------------------------------------------------------------ > -// Internal Functions > -// ------------------------------------------------------------------ > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > - // CHECK: according to the command specs, the outgoing auth params are: > - // nonceEven > - // nonceOdd > - // continueAuthSession > - // auth digest for return params > - // > - // this is a bit different than this code... > - > - return BSG_PackList(dst, 4, > - BSG_TYPE_UINT32, &(auth->AuthHandle), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > - return BSG_UnpackList(src, 3, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -// ------------------------------------------------------------------ > -// Authorization Commands > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > - UINT32 paramSize = 0; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonce0 == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 2, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonce0); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &entityType, > - BSG_TYPE_UINT32, &entityValue, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 3, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonceEven, > - BSG_TPM_NONCE, nonceEvenOSAP); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &protocolID, > - BSG_TYPE_UINT32, &encOwnerAuthSize); > - > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > - InLength += encOwnerAuthSize; > - InLength += BSG_Pack( BSG_TYPE_UINT32, > - &encSrkAuthSize, > - InBuf+InLength); > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > - InLength += encSrkAuthSize; > - memcpy(InBuf+InLength, *Srk, *SrkSize); > - InLength += *SrkSize; > - InLength += packAuth(InBuf+InLength, ownerAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, > - &InLength, > - InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY srkPub; > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > - unpackAuth(ownerAuth, OutBuf+i); > - > - // fill output params > - BYTE tempBuf[1024]; > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > - return(TPM_SIZE); > - } > - memcpy(*Srk, tempBuf, *SrkSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth) { // in, out > - > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - InLength += packAuth(InBuf+InLength, ownerAuth); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - unpackAuth(ownerAuth, OutBuf+i); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &handle); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, handle)) > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Print debug info > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &pcrNum, > - BSG_TPM_DIGEST, &inDigest); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TPM_ENCAUTH, encAuth, > - BSG_TYPE_UINT32, &pcrInfoSize); > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > - InLength += pcrInfoSize; > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, pubAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_STORED_DATA sealedData; > - > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > - unpackAuth(pubAuth, OutBuf+i); > - > - // fill SealedData > - BYTE tempBuf[1024]; > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*SealedData, tempBuf, *SealedDataSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > - DataSize == NULL || Data == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &parentHandle); > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > - InLength += SealedDataSize; > - InLength += packAuth(InBuf+InLength, parentAuth); > - InLength += packAuth(InBuf+InLength, dataAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*Data, OutBuf+i, *DataSize); > - i += *DataSize; > - i += unpackAuth(parentAuth, OutBuf+i); > - unpackAuth(dataAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TYPE_UINT32, &inDataSize); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, privAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*outData, OutBuf+i, *outDataSize); > - i += *outDataSize; > - unpackAuth(privAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hWrappingKey, > - BSG_TPM_ENCAUTH, KeyUsageAuth, > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > - InLength += *pcKeySize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_RESULT, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY wrappedKey; > - > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > - unpackAuth(pAuth, OutBuf+i); > - > - // Fill prgbKey > - BYTE tempBuf[1024]; > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*prgbKey, tempBuf, *pcKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > - return TPM_BAD_PARAMETER; > - > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hUnwrappingKey); > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > - InLength += cWrappedKeyBlobSize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, > - OutBuf+i, > - phKeyTCSI); > - unpackAuth(pAuth, OutBuf+i); > - > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hKey); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, hKey)) { > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - } > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (bytesRequested == NULL || *randomBytes == NULL){ > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, bytesRequested); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TPM_NONCE, &antiReplay); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - i += BSG_UnpackList(OutBuf+i, 2, > - BSG_TPM_PUBKEY, &pubEK, > - BSG_TPM_DIGEST, checksum); > - > - // fill EndorsementKey > - BYTE tempBuf[1024]; > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData) { // out > - > - TDDL_RESULT hRes; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > - //FIXME: Add Context Management > - hRes = TDDL_TransmitData( inData, > - inDataSize, > - outData, > - outDataSize); > - > - if (hRes == TDDL_SUCCESS) { > - return TPM_SUCCESS; > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > - return TPM_IOERROR; > - } > - > -} > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > deleted file mode 100644 > index 83b9cd0..0000000 > --- a/tools/vtpm_manager/tcs/tcs.h > +++ /dev/null > @@ -1,245 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.h > -// > -// This file declares the TCS API > -// > -// ================================================================== > - > -#ifndef __TCS_H__ > -#define __TCS_H__ > - > -#include "tcg.h" > -#include "contextmgr.h" > -#include "buffer.h" > - > -#define HANDLE_NULL 0 > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCS_create(); > -void TCS_destroy(); > - > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > - > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > - > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr ); //out > - > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory); // in > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -// TPM v1.1B Command Set > - > -// Authorzation > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0 // out > - ); > - > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP // out > - ); > - > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle // in > - ); > - > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle, // in > - TPM_RESOURCE_TYPE resourceType //in > - ); > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_NONCE antiReplay, // in > - UINT32* PcrDataSize, // in, out > - BYTE** PcrData, // in, out > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData // out > - ); > - > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data // out > - ); > - > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE newContents, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE* dirValue // out > - ); > - > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData // out > - ); > - > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth // in, out > - ); > - > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC // out > - ); > - > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey, // in > - TCS_AUTH* pAuth, // in, out > - UINT32* pcPubKeySize, // out > - BYTE** prgbPubKey // out > - ); > - > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey // in > - ); > - > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 areaToSignSize, // in > - BYTE* areaToSign, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes // out > - ); > - > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 inDataSize, // in > - BYTE* inData // in > - ); > - > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum // out > - ); > - > - > -// Non-Standard TCSP calls > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > - > -//Give direct access to TransmitData. > -// Key and Auth Management is done before transfering command to TDDL. > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData); // out > - > -///////////// Private Functions //////////////////// > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > - > -#endif //TCS_H > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > deleted file mode 100644 > index e7e54f1..0000000 > --- a/tools/vtpm_manager/tcs/tpmddl.h > +++ /dev/null > @@ -1,69 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmddl.c > -// > -// This file defines the TDDLI API > -// > -// ================================================================== > - > -#ifndef __TPMDDL_H__ > -#define __TPMDDL_H__ > - > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > - > -#define TDDL_E_FAIL 1 > -#define TDDL_E_SUCCESS 0 > -#define TDDL_SUCCESS 0 > - > -typedef unsigned int TDDL_UINT32; > -typedef TDDL_UINT32 TDDL_RESULT; > -typedef unsigned char TDDL_BYTE; > - > -TDDL_RESULT TDDL_Open(); > -void TDDL_Close(); > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize); > -TDDL_RESULT TDDL_GetStatus(); > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > - > -#endif // __TPMDDL_H__ > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > deleted file mode 100644 > index 74bbdca..0000000 > --- a/tools/vtpm_manager/tcs/transmit.c > +++ /dev/null > @@ -1,147 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "tpmddl.h" > - > -// flag to track whether TDDL has been opened > -static int g_TDDL_open = 0; > -static int g_tx_fd = -1; // the fd to the TPM > - > -#ifndef DUMMY_TPM > - #define TPM_TX_FNAME "/dev/tpm0" > - static int *g_rx_fdp = &g_tx_fd; > -#else > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > - static int g_rx_fd = -1; > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > -#endif > - > -TPM_RESULT > -TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize) { > - TPM_RESULT status = TPM_SUCCESS; > - TDDL_UINT32 i; > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > - for(i = 0 ; i < insize ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - ssize_t size = 0; > - > - // send the request > - size = write (g_tx_fd, in, insize); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - else if ((TDDL_UINT32) size < insize) { > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > - // ... ? > - } > - > - // read the response > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > - for(i = 0 ; i < size ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - *outsize = size; > - // close connection > - goto egress; > - > - abort_egress: > - egress: > - return status; > -} > - > -TPM_RESULT TDDL_Open() { > - > - TDDL_RESULT status = TDDL_SUCCESS; > - > - if (g_TDDL_open) > - return TPM_FAIL; > - > -#ifdef DUMMY_TPM > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > -#endif > - > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > - if (g_tx_fd < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > - return TPM_IOERROR; > - } > - > - g_TDDL_open = 1; > - > - return status; > -} > - > -void TDDL_Close() { > - if (! g_TDDL_open) > - return; > - > - if (g_tx_fd>= 0) { > - if (close(g_tx_fd) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - g_tx_fd = -1; > - } > - > - if (*g_rx_fdp>= 0) { > - if (close(*g_rx_fdp) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - *g_rx_fdp = -1; > - } > - > - g_TDDL_open = 0; > - > -} > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > deleted file mode 100644 > index 36bc38f..0000000 > --- a/tools/vtpm_manager/util/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCGUtils.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > deleted file mode 100644 > index fa36ce7..0000000 > --- a/tools/vtpm_manager/util/bsg.c > +++ /dev/null > @@ -1,829 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.cpp > -// > -// This file will handle all the TPM Byte Stream functions > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include "tcg.h" > -#include "crypto.h" > -#include "bsg.h" > -#include "log.h" > - > -static int g_log_recursion_level = 0; > - > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > -// will complain! > -#define BSG_MAX_BUF_SIZE (1<<18) > - > -#define bsglog(fmt, ...) do { \ > - int __i; \ > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > - } \ > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > - } while (0) > - > - > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > -//BOOL dummy1 = BSG_static_selfcheck(); > - > - > -// Interpretting Types > -// ------------------- > -// > -// Incoming Types are composed of two parts {format, info} squished into a > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > -// data it is. If the first 4 bits are zero the info corresponds to a value in > -// BSG_s_fmt[]. This is a structure whose composition is described in > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > -// data (in bytes) being passed in. For example a UINT32 being passed in would > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > -// this is interpretted as the end of the structure, and the result is returned. > - > -// these flags are mutually exclusive, so I'll just make them > -// format values which indicate the semantics of the 'info' part and the source > -// data. The above description has been accordingly adjusted. > - > -// format values for determining what type of data the incoming type is > -// it's a 4 bit value, occupying the high 4 bits > -#define __FMT_CONST (1UL << 28) // Constant sized value > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > -#define __FMT_HSIZE (4UL << 28) // A number of handles > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > - // of {size32, data} but we're to pack only the > - // data as that is already packed, and so > - // can/must be unpacked without > - // explicitly reading it size > - > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > - > -// constant (8/16/32-bits) > -#define FMT_U8 (__FMT_CONST | 1UL) > -#define FMT_U16 (__FMT_CONST | 2UL) > -#define FMT_U32 (__FMT_CONST | 4UL) > - > -// const with a compiler-computed size > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > - > -// other data (size bytes) > -// Used primarily for DIGESTS -> FMT_DATA(20) > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > - > -// 16/32-bit size followed by N bytes of data > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > - > -// 16-bit size followed by N key handles > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > - > -#define DIGEST_SIZE 20 > -typedef BSG_UINT32 BSG_HANDLE; > - > -// TCPA_AUTH has 11 fields! > -#define MAX_FIELDS 11 > -typedef struct BSG_Format > -{ > - BSG_Type type; > - const char* name; > - BSG_UINT32 fields[MAX_FIELDS + 1]; > -} BSG_Format; > - > -/* > - * TCPA structure data formats > - */ > -// this has to be manually kept in sync with the > -// Type enum!! the static_selfcheck() function should be used regularly! > -static BSG_Format s_fmt[] = > -{ > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > - > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > - > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > - > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > - {FMT_SIZE16_HANDLES, 0}}, > - > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, // the PCR_INFO > - BSG_TPM_STORE_PUBKEY, > - FMT_SIZE32_DATA, // the encrypted part > - 0}}, > - > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > - BSG_TPM_PUBKEY, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_DIGEST, 0}}, > - > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_RESULT, 0 }}, > - > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > - BSG_TPM_DIGEST, > - BSG_TPM_DIGEST, > - FMT_DATA(2), > - FMT_SIZE32_DATA, 0}}, > - > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > - FMT_SIZE32_DATA, > - 0} }, > - > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_COMPOSITE_HASH, > - 0} }, > - > - > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > - BSG_TPM_VERSION, > - FMT_SIZE32_DATA, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - FMT_SIZE16_DATA, > - 0}}, > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - FMT_U32, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > - BSG_TPM_VERSION, > - FMT_DATA(4), > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_NONCE, > - 0}}, > - > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > - BSG_TPM_VERSION, > - FMT_U32, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_PUBKEY, > - 0}}, > - > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > - > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > - FMT_U8, > - FMT_U8, > - 0}}, > - > - {BSG_TCS_AUTH, "TCS_AUTH", { > - BSG_TYPE_UINT32, > - BSG_TPM_NONCE, > - BSG_TPM_NONCE, > - BSG_TYPE_BOOL, > - BSG_TPM_AUTHDATA, > - 0}}, > - > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, > - BSG_TPM_STORE_PUBKEY, > - 0}}, > - > - {BSG_PACKED, "BSG_PACKED", { > - __FMT_PACKED, > - 0 }}, > - > - {BSG_TYPE_MAX, "", {0}}, > -}; > - > - > -static const BSG_Format* find_format (BSG_Type t) { > - BSG_Format * f = s_fmt; > - > - if (t >= BSG_TYPE_MAX) { > - return NULL; > - } > - > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > - // sure to run the static_selfcheck() to make sure > - f = s_fmt + (t - BSG_TYPE_FIRST); > - > - return f; > -} > - > -// > -// a consistency-checking routine which can be run at compile time > -// (ie. immediately after compilation) > -// > -// tasks: > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > -// > -// conditions: > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > -// Type has value 0, not 1 > -// > -// FIXME: should have a function be passed in here which is called if the test > -// fails. Then the caller can decide what to do: abort, notify, whatever > -// > -BOOL BSG_static_selfcheck () > -{ > - int i; > - > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > - bsglog ("failure at %i, allegedly %s\n", > - i, s_fmt[i - BSG_TYPE_FIRST].name); > - abort(); > - return FALSE; > - } > - } > - > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > - return TRUE; > -} > - > - > -/** > - * Flatten a TCPA structure into a buffer in big-endian format > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * @dst: (OUT) flattened data > - * Returns: Flattened size or -1 for unknown types > - */ > -// make it so that it can just run through the whole process and return > -// the packed size, without packing anything. this will be done if dst is NULL. > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > -{ > - // check incoming parameters > - if (*src == NULL) > - return 0; > - > - const BSG_BYTE* s = *src; > - BSG_BYTE* d = dst; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > - { > - BSG_UINT32 val = 0; > - switch (size) { > - case 1: val = * (BYTE*) s; break; > - case 2: val = * (unsigned short*) s; break; > - case 4: val = * (BSG_UINT32*) s; break; > - } > - if (dst) > - BSG_PackConst(val, size, d); > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > - // this is used. > - > - if (dst) { > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > - memcpy(d, s, size); > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = 0; > - switch (size) { > - case 1: psize = * (BYTE*) s; break; > - case 2: psize = * (unsigned short*) s; break; > - case 4: psize = * (BSG_UINT32*) s; break; > - } > - > - if (dst) > - BSG_PackConst(psize, size, d); > - > - s += size; > - d += size; > - > - // now 's' points to an address, so cast it to BSG_BYTE** > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > - s += sizeof(BSG_BYTE*); > - > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > - > - } > - d += psize * sizeof(BSG_HANDLE); > - } else {// If it's not psize handles, it's psize data. > - if (psize > 0) { > - if (dst) { > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > - psize, pdata, d); > - memcpy(d, pdata, psize); > - } > - } > - d += psize; > - } > - } else if (format == __FMT_PACKED) { > - // the source buffer is a pack_constbuf_t, which has a size and a > - // pointer. just copy the buffer value, the size is not included in the > - // output stream. > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > - > - if (dst) { > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > - buf->size, buf->data, d); > - memcpy(d, buf->data, buf->size); > - } > - > - s += buf->size; > - d += buf->size; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > - return -1; > - } > - > - if (dst) > - bsglog ("BSG_Pack type %s\n", x->name); > - > - > - // iterate through the fields > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize; > - > - g_log_recursion_level++; > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > - g_log_recursion_level--; > - > - if (fsize <= 0) > - return fsize; > - > - d += fsize; > - } > - } else { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > - return -1; > - } > - > - *src = s; > - return (d - dst); > -} > - > -/** > - * Unflatten a TCPA structure from a buffer in big-endian format > - * @type: TCPA structure type > - * @src: flattened data > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > - * Returns: Flattened size > - * Note: Returns flattened size NOT the unpacked structure size > - */ > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > - // check incoming parameters > - if (src == NULL) > - return 0; > - > - > - const BSG_BYTE* s = src; > - BSG_BYTE* d = dst ? *dst:NULL; > - if (dst && !d) > - dst = NULL; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > - > - BSG_UINT32 val = BSG_UnpackConst(s, size); > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > - case 2: *(unsigned short*) d = (unsigned short) val; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > - } > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > - if (dst) > - memcpy(d, s, size); > - > - d += size; > - s += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > - > - if (psize > BSG_MAX_BUF_SIZE) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > - BSG_MAX_BUF_SIZE); > - return -1; > - } > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > - } > - } > - > - s += size; > - d += size; > - > - BSG_BYTE* pdata = NULL; > - > - if (psize) { > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > - if (!pdata) > - return -1; > - > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) { > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > - } > - } > - s += psize * sizeof(BSG_HANDLE); > - } else { // If it's not psize handles, it's psize data. > - if (dst) { > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > - if (!pdata) > - return -1; > - memcpy(pdata, s, psize); > - } > - s += psize; > - } > - } > - if (dst) > - *(void**) d = pdata; > - > - d += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking! > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return -1; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > - return -1; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > - if (fsize <= 0) > - return fsize; > - s += fsize; > - } > - } > - > - if (dst) > - *dst = d; > - return (s - src); > -} > - > -/** > - * Free memory associated with unpacked TCPA structure > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * Note: Destroy should be called on all structures created with Unpack > - * to ensure that any allocated memory is freed > - */ > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > - BSG_BYTE* s = *src; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if ((src == NULL) || (*src == NULL)) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > - return; > - } > - > - if (format == __FMT_CONST || format == __FMT_DATA) > - s += size; > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > - s += size; > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > - free(ptr); > - s += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking, hence also for Destroy() > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return; > - } else if (format == 0) { > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > - return; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) > - BSG_Destroy_private((BSG_Type) *f, &s); > - } > - > - *src = s; > -} > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > -{ > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > - return BSG_Pack_private(type, &src2, dst); > -} > - > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > -{ > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > -} > - > -void BSG_Destroy(BSG_Type type, void* src) > -{ > - BSG_BYTE* src2 = (BSG_BYTE*) src; > - BSG_Destroy_private(type, &src2); > -} > - > -/** > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > - * @val: constant value > - * @size: constant size in bytes (1, 2, or 4) > - * @dst: (OUT) buffer > - */ > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > - > - switch (size) { > - case 4: > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[3] = (BSG_BYTE)(val & 0xff); > - break; > - case 2: > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[1] = (BSG_BYTE)(val & 0xff); > - break; > - case 1: > - dst[0] = (BSG_BYTE)(val & 0xff); > - break; > - } > -} > - > -/** > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > - * @src: buffer > - * @size: constant size in bytes (1, 2, or 4) > - */ > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > - BSG_UINT32 val = 0; > - > - if (src == NULL) > - return 0; > - > - switch (size) { > - case 4: > - val = (((BSG_UINT32) src[0]) << 24 > - | ((BSG_UINT32) src[1]) << 16 > - | ((BSG_UINT32) src[2]) << 8 > - | (BSG_UINT32) src[3]); > - break; > - case 2: > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > - break; > - case 1: > - val = (BSG_UINT32) src[0]; > - break; > - } > - return val; > -} > - > -// Pack a list of parameters. Beware not to send values, but rather you must > -// send a pointer to your values Instead. This includes UINT32's. > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > - int ParamNumber; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size=0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > - } > - > - va_end (paramList); > - > - return size; > -} > - > -// Unpack a list of parameters. > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size = 0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - > - size += BSG_Unpack(format, src + size, val); > - } > - > - va_end( paramList ); > - > - return size; > -} > - > -// Destroy any memory allocated by calls to unpack > -void BSG_DestroyList(int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type argType; > - BSG_BYTE* paramValue = NULL; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - argType = (BSG_Type) va_arg( paramList, int ); > - paramValue = va_arg( paramList, BSG_BYTE* ); > - > - BSG_Destroy(argType, paramValue); > - } > - > - va_end( paramList ); > - > - return; > -} > - > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > - int i; > - > - for (i = 0; i < numParams; i++) > - BSG_Destroy (params[i].type, params[i].addr); > - > - return TPM_SUCCESS; > -} > - > - > -// > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later > -// > - > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > - int size = BSG_Pack (type, src, NULL); > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - size = BSG_Pack(type, src, dest); > - *o_dst = dest; > - return size; > -} > - > - > - > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > - va_list args; > - int size; > - > - va_start (args, ParamCount); > - size = BSG_PackList (NULL, ParamCount, args); > - va_end (args); > - > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - va_start (args, ParamCount); > - size = BSG_PackList (dest, ParamCount, args); > - va_end (args); > - > - *outBuffer = dest; > - return size; > -} > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > deleted file mode 100644 > index 0896812..0000000 > --- a/tools/vtpm_manager/util/bsg.h > +++ /dev/null > @@ -1,166 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.h > -// > -// This file contains API's for the TPM Byte Stream functions > -// > -// ================================================================== > - > -#ifndef __BSG_H__ > -#define __BSG_H__ > - > -#include > -#include "buffer.h" > - > -typedef unsigned int BSG_UINT32; > -typedef unsigned char BSG_BYTE; > - > -// forward decl > -struct pack_const_tuple_t; > - > -struct pack_tuple_t; > - > - > -/** > - * Byte stream generator > - */ > -// this has to be manually kept in sync with the > -// s_fmt array!! > -// but now we have a self-check function which can make sure things are well > -// (if used!) > -typedef enum BSG_Type > -{ > - BSG_TYPE_FIRST = 1, > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > - // unused/special value > - BSG_TYPE_UINT16, > - BSG_TYPE_BYTE, > - BSG_TYPE_BOOL, > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > - // a pointer to that much data. can pass a > - // struct pack_buf_t as the param > - BSG_TPM_TAG, > - BSG_TPM_HANDLE, > - BSG_TPM_RESULT, > - BSG_TPM_RESOURCE_TYPE, > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_PROTOCOL_ID, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTHDATA, > - BSG_TPM_SECRET, > - BSG_TPM_ENCAUTH, > - BSG_TPM_PAYLOAD_TYPE, > - > - BSG_TPM_VERSION, > - BSG_TPM_DIGEST, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_NONCE, > - BSG_TPM_KEY_HANDLE, > - BSG_TPM_KEY_HANDLE_LIST, > - BSG_TPM_KEY_PARMS, > - BSG_TPM_RSA_KEY_PARMS, > - BSG_TPM_STORE_PUBKEY, > - BSG_TPM_PUBKEY, > - BSG_TPM_KEY, > - > - BSG_TPM_MIGRATIONKEYAUTH, > - BSG_TCPA_AUDIT_EVENT, > - BSG_TCPA_EVENT_CERT, > - BSG_TPM_PCR_SELECTION, > - BSG_TPM_PCR_COMPOSITE, > - BSG_TPM_PCR_INFO, > - BSG_TPM_STORED_DATA, > - BSG_TPM_SYMMETRIC_KEY, > - BSG_TPM_STORE_PRIVKEY, > - BSG_TPM_STORE_ASYMKEY, > - BSG_TPM_MIGRATE_ASYMKEY, > - BSG_TPM_QUOTE_INFO, > - BSG_TPM_IDENTITY_CONTENTS, > - BSG_TPM_PCRVALUE, > - BSG_TCPA_PCR_FLAGS, > - BSG_TCS_AUTH, > - > - // this is the BSG_TPM_KEY struct without the encData field > - BSG_TPM_KEY_NONSENSITIVE, > - > - BSG_PACKED, > - > - BSG_TYPE_MAX > -} BSG_Type; > - > -struct pack_const_tuple_t { > - BSG_Type type; > - const void * addr; > -}; > - > - > -typedef struct pack_tuple_t { > - BSG_Type type; > - void * addr; > -} pack_tuple_t; > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > -void BSG_Destroy(BSG_Type type, void* src); > - > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later. returns size of allocated buffer, or -1 in case > -// allocation failed > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > - > -// a va_list version of PackList > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > -void BSG_DestroyList(int ParamCount, ... ); > - > -// wrapper of PackList which uses a buffer_t > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > - > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > - > -BOOL BSG_static_selfcheck (); > - > -#endif > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > deleted file mode 100644 > index df48bc2..0000000 > --- a/tools/vtpm_manager/util/buffer.c > +++ /dev/null > @@ -1,226 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "buffer.h" > - > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > - > -// > -// buffer functions! > -// > - > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > - if (initsize == 0) { > - memset(buf, 0, sizeof(*buf)); > - return TPM_SUCCESS; > - } > - > - > - buf->bytes = (BYTE*) malloc (initsize); > - if (buf->bytes == NULL) > - return TPM_RESOURCES; > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - > - if (initval) > - memcpy (buf->bytes, initval, initsize); > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - buf->bytes = initval; > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > - buf->is_owner = TRUE; > - > - return status; > -} > - > - > - > -// make an alias to a constant array > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > - // TODO: try to enforce the const things somehow! > - buf->bytes = (BYTE*) val; > - buf->size = size; > - buf->alloc_size = 0; // this field is now unneeded > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t len) { > - if (offset + len > b->size) { > - return TPM_NOSPACE; > - } > - > - buf->bytes = b->bytes + offset; > - buf->size = len > 0 ? len : b->size - offset; > - > - //VS/ buf->alloc_size = 0; > - if (len ==0) > - buf->alloc_size = b->alloc_size - offset; > - else > - buf->alloc_size = MIN(b->alloc_size - offset, len); > - > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias buffer_t into bytestream, with given length > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > - > - buf->size = size; > - buf->alloc_size = size; > - buf->bytes = val; > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > - > - > -// copy into the start of dest > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > -{ > - TPM_RESULT status = TPM_SUCCESS; > - > - if (dest->alloc_size < src->size) { > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > - } > - > - memcpy (dest->bytes, src->bytes, src->size); > - dest->size = src->size; > - > - //VS/ dest->is_owner = TRUE; > - > - abort_egress: > - > - return status; > -} > - > - > - > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > -} > - > - > -void buffer_memset (buffer_t * buf, BYTE b) { > - memset (buf->bytes, b, buf->size); > -} > - > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (buf->alloc_size < buf->size + len) { > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > - } > - > - memcpy (buf->bytes + buf->size, bytes, len); > - > - buf->size += len; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -tpm_size_t buffer_len (const buffer_t* buf) { > - return buf->size; > -} > - > -TPM_RESULT buffer_free (buffer_t * buf) { > - if (buf && buf->is_owner && buf->bytes != NULL) { > - free (buf->bytes); > - buf->bytes = NULL; > - buf->size = buf->alloc_size = 0; > - > - } > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > - > - // we want to realloc to twice the size, or the new size, whichever > - // bigger > - > - BYTE * tmpbuf = NULL; > - > - newsize = MAX (buf->alloc_size * 2, newsize); > - > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > - if (tmpbuf == NULL) > - return TPM_SIZE; > - > - > - buf->bytes = tmpbuf; > - buf->alloc_size = newsize; > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > deleted file mode 100644 > index d8a9abc..0000000 > --- a/tools/vtpm_manager/util/buffer.h > +++ /dev/null > @@ -1,95 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_BUFFER_H__ > -#define __VTPM_BUFFER_H__ > - > -#include // for pointer NULL > -#include "tcg.h" > - > -typedef UINT32 tpm_size_t; > - > -// first version, probably will be expanded... > - > -#define NULL_BUF {0,0,0,0} > - > -typedef struct { > - // private!! > - tpm_size_t size, alloc_size; > - BYTE * bytes; > - > - BOOL is_owner; // do we own this buffer, and need to free it? > -} buffer_t; > - > -// allocate the buffer if initsize > 0, copying over initval if provided > -TPM_RESULT buffer_init (buffer_t * buf, > - tpm_size_t initsize, > - const BYTE* initval); > - > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > -TPM_RESULT buffer_init_convert (buffer_t * buf, > - tpm_size_t initsize, > - BYTE* initval); > - > -// make an alias to a constant array, no copying > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t); > - > -// make an alias buffer into a bytestream > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > - tpm_size_t size, BYTE* val); > - > -// "copy constructor" > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > - > - > -// copy into the start of a > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > - > -// are they equal? > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > - > -// set the buffer to a constant byte > -void buffer_memset (buffer_t * buf, BYTE b); > - > -tpm_size_t buffer_len (const buffer_t* buf); > - > -TPM_RESULT buffer_free (buffer_t * buf); > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > - > -#endif // _TOOLS_H_ > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > deleted file mode 100644 > index aff0e2b..0000000 > --- a/tools/vtpm_manager/util/hashtable.c > +++ /dev/null > @@ -1,316 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.c > - * - tools/blktap2/drivers/hashtable.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include > -#include > -#include > -#include > - > -/* > -Credit for primes table: Aaron Krowne > - http://br.endernet.org/~akrowne/ > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > -*/ > -static const unsigned int primes[] = { > -53, 97, 193, 389, > -769, 1543, 3079, 6151, > -12289, 24593, 49157, 98317, > -196613, 393241, 786433, 1572869, > -3145739, 6291469, 12582917, 25165843, > -50331653, 100663319, 201326611, 402653189, > -805306457, 1610612741 > -}; > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > -const float max_load_factor = 0.65; > - > -/*****************************************************************************/ > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashf) (void*), > - int (*eqf) (void*,void*)) > -{ > - struct hashtable *h; > - unsigned int pindex, size = primes[0]; > - /* Check requested hashtable isn't too large */ > - if (minsize > (1u << 30)) return NULL; > - /* Enforce size as prime */ > - for (pindex=0; pindex < prime_table_length; pindex++) { > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > - } > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > - if (NULL == h) return NULL; /*oom*/ > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > - memset(h->table, 0, size * sizeof(struct entry *)); > - h->tablelength = size; > - h->primeindex = pindex; > - h->entrycount = 0; > - h->hashfn = hashf; > - h->eqfn = eqf; > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_init(&h->mutex, NULL); > -#endif > - return h; > -} > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k) > -{ > - unsigned int i = h->hashfn(k); > - i += ~(i << 9); > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > - i += (i << 4); > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > - return i; > -} > - > -/*****************************************************************************/ > -static int > -hashtable_expand(struct hashtable *h) > -{ > - /* Double the size of the table to accomodate more entries */ > - struct entry **newtable; > - struct entry *e; > - struct entry **pE; > - unsigned int newsize, i, index; > - /* Check we're not hitting max capacity */ > - if (h->primeindex == (prime_table_length - 1)) return 0; > - newsize = primes[++(h->primeindex)]; > - > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > - if (NULL != newtable) > - { > - memset(newtable, 0, newsize * sizeof(struct entry *)); > - /* This algorithm is not 'stable'. ie. it reverses the list > - * when it transfers entries between the tables */ > - for (i = 0; i < h->tablelength; i++) { > - while (NULL != (e = h->table[i])) { > - h->table[i] = e->next; > - index = indexFor(newsize,e->h); > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - free(h->table); > - h->table = newtable; > - } > - /* Plan B: realloc instead */ > - else > - { > - newtable = (struct entry **) > - realloc(h->table, newsize * sizeof(struct entry *)); > - if (NULL == newtable) { (h->primeindex)--; return 0; } > - h->table = newtable; > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > - for (i = 0; i < h->tablelength; i++) { > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > - index = indexFor(newsize,e->h); > - if (index == i) > - { > - pE = &(e->next); > - } > - else > - { > - *pE = e->next; > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - } > - } > - h->tablelength = newsize; > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > - return -1; > -} > - > -/*****************************************************************************/ > -unsigned int > -hashtable_count(struct hashtable *h) > -{ > - unsigned int count; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - count = h->entrycount; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return count; > -} > - > -/*****************************************************************************/ > -int > -hashtable_insert(struct hashtable *h, void *k, void *v) > -{ > - /* This method allows duplicate keys - but they shouldn't be used */ > - unsigned int index; > - struct entry *e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - if (++(h->entrycount) > h->loadlimit) > - { > - /* Ignore the return value. If expand fails, we should > - * still try cramming just this value into the existing table > - * -- we may not have memory for a larger table, but one more > - * element may be ok. Next time we insert, we'll try expanding again.*/ > - hashtable_expand(h); > - } > - e = (struct entry *)malloc(sizeof(struct entry)); > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > - e->h = hash(h,k); > - index = indexFor(h->tablelength,e->h); > - e->k = k; > - e->v = v; > - e->next = h->table[index]; > - h->table[index] = e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return -1; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_search(struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - unsigned int hashvalue, index; > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - e = h->table[index]; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return e->v; > - } > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_remove(struct hashtable *h, void *k) > -{ > - /* TODO: consider compacting the table when the load factor drops enough, > - * or provide a 'compact' method. */ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - struct entry **pE; > - void *v; > - unsigned int hashvalue, index; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hash(h,k)); > - pE = &(h->table[index]); > - e = *pE; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - *pE = e->next; > - h->entrycount--; > - v = e->v; > - freekey(e->k); > - free(e); > - return v; > - } > - pE = &(e->next); > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -/* destroy */ > -void > -hashtable_destroy(struct hashtable *h, int free_values) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - unsigned int i; > - struct entry *e, *f; > - struct entry **table = h->table; > - if (free_values) > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > - } > - } > - else > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f); } > - } > - } > - free(h->table); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_destroy(&h->mutex); > -#endif > - free(h); > -} > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > deleted file mode 100644 > index dedc60a..0000000 > --- a/tools/vtpm_manager/util/hashtable.h > +++ /dev/null > @@ -1,204 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.h > - * - tools/blktap2/drivers/hashtable.h > - */ > - > -#ifndef __HASHTABLE_CWC22_H__ > -#define __HASHTABLE_CWC22_H__ > - > -struct hashtable; > - > -/* Example of use: > - * > - * struct hashtable *h; > - * struct some_key *k; > - * struct some_value *v; > - * > - * static unsigned int hash_from_key_fn( void *k ); > - * static int keys_equal_fn ( void *key1, void *key2 ); > - * > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > - * > - * (initialise k and v to suitable values) > - * > - * if (! hashtable_insert(h,k,v) ) > - * { exit(-1); } > - * > - * if (NULL == (found = hashtable_search(h,k) )) > - * { printf("not found!"); } > - * > - * if (NULL == (found = hashtable_remove(h,k) )) > - * { printf("Not found\n"); } > - * > - */ > - > -/* Macros may be used to define type-safe(r) hashtable access functions, with > - * methods specialized to take known key and value types as parameters. > - * > - * Example: > - * > - * Insert this at the start of your file: > - * > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > - * > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > - * These operate just like hashtable_insert etc., with the same parameters, > - * but their function signatures have 'struct some_key *' rather than > - * 'void *', and hence can generate compile time errors if your program is > - * supplying incorrect data as a key (and similarly for value). > - * > - * Note that the hash and key equality functions passed to create_hashtable > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > - * a difficult issue as they're only defined and passed once, and the other > - * functions will ensure that only valid keys are supplied to them. > - * > - * The cost for this checking is increased code size and runtime overhead > - * - if performance is important, it may be worth switching back to the > - * unsafe methods once your program has been debugged with the safe methods. > - * This just requires switching to some simple alternative defines - eg: > - * #define insert_some hashtable_insert > - * > - */ > - > -/***************************************************************************** > - * create_hashtable > - > - * @name create_hashtable > - * @param minsize minimum initial size of hashtable > - * @param hashfunction function for hashing keys > - * @param key_eq_fn function for determining key equality > - * @return newly created hashtable or NULL on failure > - */ > - > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashfunction) (void*), > - int (*key_eq_fn) (void*,void*)); > - > -/***************************************************************************** > - * hashtable_insert > - > - * @name hashtable_insert > - * @param h the hashtable to insert into > - * @param k the key - hashtable claims ownership and will free on removal > - * @param v the value - does not claim ownership > - * @return non-zero for successful insertion > - * > - * This function will cause the table to expand if the insertion would take > - * the ratio of entries to table size over the maximum load factor. > - * > - * This function does not check for repeated insertions with a duplicate key. > - * The value returned when using a duplicate key is undefined -- when > - * the hashtable changes size, the order of retrieval of duplicate key > - * entries is reversed. > - * If in doubt, remove before insert. > - */ > - > -int > -hashtable_insert(struct hashtable *h, void *k, void *v); > - > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > -{ \ > - return hashtable_insert(h,k,v); \ > -} > - > -/***************************************************************************** > - * hashtable_search > - > - * @name hashtable_search > - * @param h the hashtable to search > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * > -hashtable_search(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_search(h,k)); \ > -} > - > -/***************************************************************************** > - * hashtable_remove > - > - * @name hashtable_remove > - * @param h the hashtable to remove the item from > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * /* returns value */ > -hashtable_remove(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_remove(h,k)); \ > -} > - > - > -/***************************************************************************** > - * hashtable_count > - > - * @name hashtable_count > - * @param h the hashtable > - * @return the number of items stored in the hashtable > - */ > -unsigned int > -hashtable_count(struct hashtable *h); > - > - > -/***************************************************************************** > - * hashtable_destroy > - > - * @name hashtable_destroy > - * @param h the hashtable > - * @param free_values whether to call 'free' on the remaining values > - */ > - > -void > -hashtable_destroy(struct hashtable *h, int free_values); > - > -#endif /* __HASHTABLE_CWC22_H__ */ > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > deleted file mode 100644 > index dcf42c8..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.c > +++ /dev/null > @@ -1,236 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include "hashtable_itr.h" > -#include /* defines NULL */ > - > -/*****************************************************************************/ > -/* hashtable_iterator - iterator constructor */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h) > -{ > - unsigned int i, tablelength; > - struct hashtable_itr *itr = (struct hashtable_itr *) > - malloc(sizeof(struct hashtable_itr)); > - if (NULL == itr) return NULL; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - itr->h = h; > - itr->e = NULL; > - itr->parent = NULL; > - tablelength = h->tablelength; > - itr->index = tablelength; > - if (0 == h->entrycount) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > - } > - > - for (i = 0; i < tablelength; i++) > - { > - if (NULL != h->table[i]) > - { > - itr->e = h->table[i]; > - itr->index = i; > - break; > - } > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > -} > - > -/*****************************************************************************/ > -/* key - return the key of the (key,value) pair at the current position */ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void * > -hashtable_iterator_key(struct hashtable_itr *i) > -{ return i->e->k; } > - > -void * > -hashtable_iterator_value(struct hashtable_itr *i) > -{ return i->e->v; } > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - unsigned int j,tablelength; > - struct entry **table; > - struct entry *next; > - int ret; > - if (NULL == itr->e) { /* stupidity check */ > - ret = 0; > - goto egress; > - } > - > - next = itr->e->next; > - if (NULL != next) > - { > - itr->parent = itr->e; > - itr->e = next; > - ret = -1; > - goto egress; > - } > - > - tablelength = itr->h->tablelength; > - itr->parent = NULL; > - if (tablelength <= (j = ++(itr->index))) > - { > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - table = itr->h->table; > - while (NULL == (next = table[j])) > - { > - if (++j >= tablelength) > - { > - itr->index = tablelength; > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - } > - itr->index = j; > - itr->e = next; > - ret = -1; > - > - egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -/* remove - remove the entry at the current iterator position > - * and advance the iterator, if there is a successive > - * element. > - * If you want the value, read it before you remove: > - * beware memory leaks if you don't. > - * Returns zero if end of iteration. */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - struct entry *remember_e, *remember_parent; > - int ret; > - > - /* Do the removal */ > - if (NULL == (itr->parent)) > - { > - /* element is head of a chain */ > - itr->h->table[itr->index] = itr->e->next; > - } else { > - /* element is mid-chain */ > - itr->parent->next = itr->e->next; > - } > - /* itr->e is now outside the hashtable */ > - remember_e = itr->e; > - itr->h->entrycount--; > - freekey(remember_e->k); > - > - /* Advance the iterator, correcting the parent */ > - remember_parent = itr->parent; > - ret = hashtable_iterator_advance(itr); > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > - free(remember_e); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -int /* returns zero if not found */ > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e, *parent; > - unsigned int hashvalue, index; > - int ret; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - > - e = h->table[index]; > - parent = NULL; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - itr->index = index; > - itr->e = e; > - itr->parent = parent; > - itr->h = h; > - ret= -1; > - goto egress; > - } > - parent = e; > - e = e->next; > - } > - ret = 0; > - > -egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return ret; > -} > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > deleted file mode 100644 > index 35654e0..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.h > +++ /dev/null > @@ -1,109 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.h > - */ > - > - > -#ifndef __HASHTABLE_ITR_CWC22__ > -#define __HASHTABLE_ITR_CWC22__ > -#include "hashtable.h" > -#include "hashtable_private.h" /* needed to enable inlining */ > - > -/*****************************************************************************/ > -/* This struct is only concrete here to allow the inlining of two of the > - * accessor functions. */ > -struct hashtable_itr > -{ > - struct hashtable *h; > - struct entry *e; > - struct entry *parent; > - unsigned int index; > -}; > - > - > -/*****************************************************************************/ > -/* hashtable_iterator > - */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h); > - > -/*****************************************************************************/ > -/* hashtable_iterator_key > - * - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_key(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_value(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* remove - remove current element and advance the iterator to the next element > - * NB: if you need the value to free it, read it before > - * removing. ie: beware memory leaks! > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* search - overwrite the supplied iterator, to point to the entry > - * matching the supplied key. > - h points to the hashtable to be searched. > - * returns zero if not found. */ > -int > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > -{ \ > - return (hashtable_iterator_search(i,h,k)); \ > -} > - > - > - > -#endif /* __HASHTABLE_ITR_CWC22__*/ > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > deleted file mode 100644 > index d87a7f9..0000000 > --- a/tools/vtpm_manager/util/hashtable_private.h > +++ /dev/null > @@ -1,96 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable_private.h > - * - tools/blktap2/drivers/hashtable_private.h > - */ > - > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > -#define __HASHTABLE_PRIVATE_CWC22_H__ > - > -#include "hashtable.h" > -#ifdef HASHTABLE_THREADED > -#include > -#endif > - > -/*****************************************************************************/ > -struct entry > -{ > - void *k, *v; > - unsigned int h; > - struct entry *next; > -}; > - > -struct hashtable { > - unsigned int tablelength; > - struct entry **table; > - unsigned int entrycount; > - unsigned int loadlimit; > - unsigned int primeindex; > - unsigned int (*hashfn) (void *k); > - int (*eqfn) (void *k1, void *k2); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_t mutex; > -#endif > -}; > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k); > - > -/*****************************************************************************/ > -/* indexFor */ > -static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > - return (hashvalue % tablelength); > -}; > - > -/* Only works if tablelength == 2^N */ > -/*static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) > -{ > - return (hashvalue & (tablelength - 1u)); > -} > -*/ > - > -/*****************************************************************************/ > -#define freekey(X) free(X) > -/*define freekey(X) ; */ > - > - > -/*****************************************************************************/ > - > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > deleted file mode 100644 > index 75fe91a..0000000 > --- a/tools/vtpm_manager/util/log.c > +++ /dev/null > @@ -1,142 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > - > -#include "buffer.h" > -#include "tcg.h" > - > -// Helper code for the consts, eg. to produce messages for error codes. > - > -typedef struct error_code_entry_t { > - TPM_RESULT code; > - char * code_name; > - char * msg; > -} error_code_entry_t; > - > -static const error_code_entry_t error_msgs [] = { > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > - > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > -}; > - > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code) { > - // just do a linear scan for now > - unsigned i; > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > - if (code == error_msgs[i].code) > - return error_msgs[i].code_name; > - > - return("Unknown Error Code"); > -} > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > deleted file mode 100644 > index 1f15f5b..0000000 > --- a/tools/vtpm_manager/util/log.h > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_LOG_H__ > -#define __VTPM_LOG_H__ > - > -#include // for uint32_t > -#include // for pointer NULL > - > -// =========================== LOGGING ============================== > - > -// the logging module numbers > -#define VTPM_LOG_CRYPTO 1 > -#define VTPM_LOG_BSG 2 > -#define VTPM_LOG_TXDATA 3 > -#define VTPM_LOG_TCS 4 > -#define VTPM_LOG_TCS_DEEP 5 > -#define VTPM_LOG_VTSP 6 > -#define VTPM_LOG_VTPM 7 > -#define VTPM_LOG_VTPM_DEEP 8 > -#define VTPM_LOG_VTSP_DEEP 9 > - > -static char *module_names[] = { "", > - "CRYPTO", > - "BSG", > - "TXDATA", > - "TCS", > - "TCS", > - "VTSP", > - "VTPM", > - "VTPM", > - "VTSP" > - }; > - > -// Default to standard logging > -#ifndef LOGGING_MODULES > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > -#endif > - > -// bit-access macros > -#define BITMASK(idx) ( 1U << (idx) ) > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > - > -#define vtpmloginfo(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > - } > - > -#define vtpmloginfomore(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, fmt,##args); \ > - } > - > -#define vtpmlogerror(module, fmt, args...) \ > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > - > -//typedef UINT32 tpm_size_t; > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code); > - > -#endif // _VTPM_LOG_H_ > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > deleted file mode 100644 > index 5c42913..0000000 > --- a/tools/vtpm_manager/util/tcg.h > +++ /dev/null > @@ -1,503 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcg.h > -// > -// This file contains all the structure and type definitions > -// > -// ================================================================== > - > -#ifndef __TCG_H__ > -#define __TCG_H__ > - > -// This pragma is used to disallow structure padding > -#pragma pack(push, 1) > - > -// *************************** TYPEDEFS ********************************* > -typedef unsigned char BYTE; > -typedef unsigned char BOOL; > -typedef unsigned short UINT16; > -typedef unsigned int UINT32; > -typedef unsigned long long UINT64; > - > -typedef UINT32 TPM_RESULT; > -typedef UINT32 TPM_PCRINDEX; > -typedef UINT32 TPM_DIRINDEX; > -typedef UINT32 TPM_HANDLE; > -typedef TPM_HANDLE TPM_AUTHHANDLE; > -typedef TPM_HANDLE TCPA_HASHHANDLE; > -typedef TPM_HANDLE TCPA_HMACHANDLE; > -typedef TPM_HANDLE TCPA_ENCHANDLE; > -typedef TPM_HANDLE TPM_KEY_HANDLE; > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > -typedef UINT32 TPM_RESOURCE_TYPE; > -typedef UINT32 TPM_COMMAND_CODE; > -typedef UINT16 TPM_PROTOCOL_ID; > -typedef BYTE TPM_AUTH_DATA_USAGE; > -typedef UINT16 TPM_ENTITY_TYPE; > -typedef UINT32 TPM_ALGORITHM_ID; > -typedef UINT16 TPM_KEY_USAGE; > -typedef UINT16 TPM_STARTUP_TYPE; > -typedef UINT32 TPM_CAPABILITY_AREA; > -typedef UINT16 TPM_ENC_SCHEME; > -typedef UINT16 TPM_SIG_SCHEME; > -typedef UINT16 TPM_MIGRATE_SCHEME; > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > -typedef UINT32 TPM_KEY_FLAGS; > - > -#define TPM_DIGEST_SIZE 20 // Don't change this > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > -typedef TPM_AUTHDATA TPM_SECRET; > -typedef TPM_AUTHDATA TPM_ENCAUTH; > -typedef BYTE TPM_PAYLOAD_TYPE; > -typedef UINT16 TPM_TAG; > - > -// Data Types of the TCS > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > - > -// ************************* STRUCTURES ********************************** > - > -typedef struct TPM_VERSION { > - BYTE major; > - BYTE minor; > - BYTE revMajor; > - BYTE revMinor; > -} TPM_VERSION; > - > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > - > -typedef struct TPM_DIGEST { > - BYTE digest[TPM_DIGEST_SIZE]; > -} TPM_DIGEST; > - > -typedef TPM_DIGEST TPM_PCRVALUE; > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > -typedef TPM_DIGEST TPM_DIRVALUE; > -typedef TPM_DIGEST TPM_HMAC; > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > - > -typedef struct TPM_NONCE { > - BYTE nonce[TPM_DIGEST_SIZE]; > -} TPM_NONCE; > - > -typedef struct TPM_KEY_PARMS { > - TPM_ALGORITHM_ID algorithmID; > - TPM_ENC_SCHEME encScheme; > - TPM_SIG_SCHEME sigScheme; > - UINT32 parmSize; > - BYTE* parms; > -} TPM_KEY_PARMS; > - > -typedef struct TPM_RSA_KEY_PARMS { > - UINT32 keyLength; > - UINT32 numPrimes; > - UINT32 exponentSize; > - BYTE* exponent; > -} TPM_RSA_KEY_PARMS; > - > -typedef struct TPM_STORE_PUBKEY { > - UINT32 keyLength; > - BYTE* key; > -} TPM_STORE_PUBKEY; > - > -typedef struct TPM_PUBKEY { > - TPM_KEY_PARMS algorithmParms; > - TPM_STORE_PUBKEY pubKey; > -} TPM_PUBKEY; > - > -typedef struct TPM_KEY { > - TPM_VERSION ver; > - TPM_KEY_USAGE keyUsage; > - TPM_KEY_FLAGS keyFlags; > - TPM_AUTH_DATA_USAGE authDataUsage; > - TPM_KEY_PARMS algorithmParms; > - UINT32 PCRInfoSize; > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > - TPM_STORE_PUBKEY pubKey; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_KEY; > - > -typedef struct TPM_PCR_SELECTION { > - UINT16 sizeOfSelect; /// in bytes > - BYTE* pcrSelect; > -} TPM_PCR_SELECTION; > - > -typedef struct TPM_PCR_COMPOSITE { > - TPM_PCR_SELECTION select; > - UINT32 valueSize; > - TPM_PCRVALUE* pcrValue; > -} TPM_PCR_COMPOSITE; > - > - > -typedef struct TPM_PCR_INFO { > - TPM_PCR_SELECTION pcrSelection; > - TPM_COMPOSITE_HASH digestAtRelease; > - TPM_COMPOSITE_HASH digestAtCreation; > -} TPM_PCR_INFO; > - > - > -typedef struct TPM_BOUND_DATA { > - TPM_VERSION ver; > - TPM_PAYLOAD_TYPE payload; > - BYTE* payloadData; > -} TPM_BOUND_DATA; > - > -typedef struct TPM_STORED_DATA { > - TPM_VERSION ver; > - UINT32 sealInfoSize; > - BYTE* sealInfo; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_STORED_DATA; > - > -typedef struct TCS_AUTH { > - TCS_AUTHHANDLE AuthHandle; > - TPM_NONCE NonceOdd; // system > - TPM_NONCE NonceEven; // TPM > - BOOL fContinueAuthSession; > - TPM_AUTHDATA HMAC; > -} TCS_AUTH; > - > -// structures for dealing with sizes followed by buffers in all the > -// TCG structure. > -typedef struct pack_buf_t { > - UINT32 size; > - BYTE * data; > -} pack_buf_t; > - > -typedef struct pack_constbuf_t { > - UINT32 size; > - const BYTE* data; > -} pack_constbuf_t; > - > - > - > -// **************************** CONSTANTS ********************************* > - > -// BOOL values > -#define TRUE 0x01 > -#define FALSE 0x00 > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -// > -// TPM_COMMAND_CODE values > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > -#define TPM_VENDOR_ORDINAL 0x20000000UL > - > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > - > - > - > -// > -// TPM_RESULT values > -// > -// just put in the whole table from spec 1.2 > - > -#define TPM_BASE 0x0 // The start of TPM return codes > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > - > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > - > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > - > -// TPM_STARTUP_TYPE values > -#define TPM_ST_CLEAR 0x0001 > -#define TPM_ST_STATE 0x0002 > -#define TPM_ST_DEACTIVATED 0x003 > - > -// TPM_TAG values > -#define TPM_TAG_RQU_COMMAND 0x00c1 > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > -#define TPM_TAG_RSP_COMMAND 0x00c4 > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > - > -// TPM_PAYLOAD_TYPE values > -#define TPM_PT_ASYM 0x01 > -#define TPM_PT_BIND 0x02 > -#define TPM_PT_MIGRATE 0x03 > -#define TPM_PT_MAINT 0x04 > -#define TPM_PT_SEAL 0x05 > - > -// TPM_ENTITY_TYPE values > -#define TPM_ET_KEYHANDLE 0x0001 > -#define TPM_ET_OWNER 0x0002 > -#define TPM_ET_DATA 0x0003 > -#define TPM_ET_SRK 0x0004 > -#define TPM_ET_KEY 0x0005 > - > -/// TPM_ResourceTypes > -#define TPM_RT_KEY 0x00000001 > -#define TPM_RT_AUTH 0x00000002 > -#define TPM_RT_TRANS 0x00000004 > -#define TPM_RT_CONTEXT 0x00000005 > - > -// TPM_PROTOCOL_ID values > -#define TPM_PID_OIAP 0x0001 > -#define TPM_PID_OSAP 0x0002 > -#define TPM_PID_ADIP 0x0003 > -#define TPM_PID_ADCP 0x0004 > -#define TPM_PID_OWNER 0x0005 > - > -// TPM_ALGORITHM_ID values > -#define TPM_ALG_RSA 0x00000001 > -#define TPM_ALG_DES 0x00000002 > -#define TPM_ALG_3DES 0X00000003 > -#define TPM_ALG_SHA 0x00000004 > -#define TPM_ALG_HMAC 0x00000005 > -#define TCPA_ALG_AES 0x00000006 > - > -// TPM_ENC_SCHEME values > -#define TPM_ES_NONE 0x0001 > -#define TPM_ES_RSAESPKCSv15 0x0002 > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// TPM_SIG_SCHEME values > -#define TPM_SS_NONE 0x0001 > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > - > -// TPM_KEY_USAGE values > -#define TPM_KEY_EK 0x0000 > -#define TPM_KEY_SIGNING 0x0010 > -#define TPM_KEY_STORAGE 0x0011 > -#define TPM_KEY_IDENTITY 0x0012 > -#define TPM_KEY_AUTHCHANGE 0X0013 > -#define TPM_KEY_BIND 0x0014 > -#define TPM_KEY_LEGACY 0x0015 > - > -// TPM_AUTH_DATA_USAGE values > -#define TPM_AUTH_NEVER 0x00 > -#define TPM_AUTH_ALWAYS 0x01 > - > -// Key Handle of owner and srk > -#define TPM_OWNER_KEYHANDLE 0x40000001 > -#define TPM_SRK_KEYHANDLE 0x40000000 > - > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > - > -#include > - > -// FIXME: Review use of these and delete unneeded ones. > - > -// these are really badly dependent on local structure: > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -#define ERRORDIE(s) do { status = s; \ > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > - goto abort_egress; } \ > - while (0) > - > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -// Try command c. If it fails, set status to s and goto abort. > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > - status = s; \ > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } else {\ > - status = c; \ > - } > - > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > -#define TPMTRYRETURN(c) do { status = c; \ > - if (status != TPM_SUCCESS) { \ > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } \ > - } while(0) > - > - > -#pragma pack(pop) > - > -#endif //__TCPA_H__ > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > index 3b89223..0ba1d55 100644 > --- a/tools/xenstore/hashtable.c > +++ b/tools/xenstore/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > index 8e6bb5b..4d68223 100644 > --- a/tools/xenstore/hashtable.h > +++ b/tools/xenstore/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > index cabaffe..a08559d 100644 > --- a/tools/xenstore/hashtable_private.h > +++ b/tools/xenstore/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > index ad1eb78..c142140 100644 > --- a/tools/xm-test/configure.ac > +++ b/tools/xm-test/configure.ac > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > tests/unpause/Makefile > tests/vcpu-pin/Makefile > tests/vcpu-disable/Makefile > - tests/vtpm/Makefile > tests/xapi/Makefile > tests/enforce_dom0_cpus/Makefile > tests/cpupool/Makefile > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > index f0516b2..e04591b 100644 > --- a/tools/xm-test/grouptest/default > +++ b/tools/xm-test/grouptest/default > @@ -27,5 +27,4 @@ sysrq > unpause > vcpu-disable > vcpu-pin > -vtpm > xapi > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > index bafc988..5c3e1b1 100644 > --- a/tools/xm-test/grouptest/medium > +++ b/tools/xm-test/grouptest/medium > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > unpause > vcpu-disable > vcpu-pin > -vtpm > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > index 3b04921..7a08b77 100644 > --- a/tools/xm-test/grouptest/xapi > +++ b/tools/xm-test/grouptest/xapi > @@ -1,2 +1 @@ > xapi > -vtpm 09_vtpm-xapi.test > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > index ae8c550..3ba7433 100644 > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > @@ -59,7 +59,6 @@ class XenConfig: > # These options need to be lists > self.defaultOpts["disk"] = [] > self.defaultOpts["vif"] = [] > - self.defaultOpts["vtpm"] = [] > > self.opts = self.defaultOpts > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > index 8d673ed..455f50c 100644 > --- a/tools/xm-test/tests/Makefile.am > +++ b/tools/xm-test/tests/Makefile.am > @@ -25,7 +25,6 @@ SUBDIRS = \ > unpause \ > vcpu-disable \ > vcpu-pin \ > - vtpm \ > enforce_dom0_cpus \ > save restore migrate \ > cpupool > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > deleted file mode 100644 > index dfd1227..0000000 > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > +++ /dev/null > @@ -1,40 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# verify list > - > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > - > -try: > - domain.start(noConsole=True) > -except DomainError, e: > - if verbose: > - print e.extra > - vtpm_cleanup(domain.getName()) > - FAIL("Unable to create domain") > - > - > -domName = domain.getName() > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > -eyecatcher = "/local/domain/0/backend/vtpm" > -where = output.find(eyecatcher) > -if status != 0: > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > -elif where < 0: > - FAIL("Fail to list virtual TPM device") > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > deleted file mode 100644 > index a18cbab..0000000 > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > +++ /dev/null > @@ -1,49 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -domain.closeConsole() > - > -domain.stop() > - > -if not re.search("PCR-00:",run["output"]): > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > deleted file mode 100644 > index b863f27..0000000 > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > +++ /dev/null > @@ -1,99 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > deleted file mode 100644 > index ccc8b73..0000000 > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > deleted file mode 100644 > index 57b87df..0000000 > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > deleted file mode 100644 > index c70691d..0000000 > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > +++ /dev/null > @@ -1,125 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again and validate extended pcr > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > deleted file mode 100644 > index 4ff3360..0000000 > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > deleted file mode 100644 > index 27125fc..0000000 > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > deleted file mode 100644 > index a1aa8b3..0000000 > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > +++ /dev/null > @@ -1,158 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Test to test the vtpm class through the Xen-API > -# > -# Tested methods: > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > -# create, destroy, get_VM > -# VM: get_VTPMS > - > -from XmTestLib import xapi > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > - > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > - > -try: > - # XmTestAPIDomain tries to establish a connection to XenD > - domain = XmTestAPIDomain() > -except Exception, e: > - SKIP("Skipping test. Error: %s" % str(e)) > -vm_uuid = domain.get_uuid() > - > -vtpmcfg = {} > -vtpmcfg['backend'] = DOM0_UUID > -vtpmcfg['VM'] = vm_uuid > - > -session = xapi.connect() > - > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > - > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > -if vtpm_be != vtpmcfg['backend']: > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > - (vtpm_be, vtpmcfg['backend'])) > - > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > - > -miss_keys = [] > -for k in VTPM_RECORD_KEYS: > - if k not in vtpm_rec.keys(): > - miss_keys.append(k) > -if len(miss_keys) > 0: > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > - > -if vtpm_rec['uuid'] != vtpm_uuid: > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > - (vtpm_rec['uuid'], vtpm_uuid)) > -if vtpm_rec['VM'] != vm_uuid: > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > - (vtpm_rec['VM'], vm_uuid)) > -if vtpm_rec['backend'] != vtpmcfg['backend']: > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > - (vtpm_rev['backend'], vtpmcfg['backend'])) > - > -badkeys = [] > -keys = vtpm_rec.keys() > -for k in keys: > - if k not in VTPM_RECORD_KEYS: > - badkeys.append(k) > -if len(badkeys) > 0: > - FAIL("Unexpected attributes in result: %s" % badkeys) > - > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > - (vm_ref, vm_uuid)) > - > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > -if uuid != vtpm_uuid: > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > - (uuid, vtpm_uuid)) > - > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > -if vtpm_ref != vtpm_uuid: > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > - (vtpm_ref, vtpm_uuid)) > - > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > -if len(vm_vtpms) != 1: > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > - (len(vm_vtpms), 1)) > -if vtpm_uuid not in vm_vtpms: > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > - (vm_vtpms[0], vtpm_uuid)) > - > -try: > - console = domain.start() > -except DomainError, e: > - FAIL("Unable to create domain.") > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("1. No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #Should never get here > - FAIL("Could destroy vTPM while VM is running") > -except: > - pass > - > -rc = session.xenapi.VM.suspend(vm_uuid) > -if rc: > - FAIL("Could not suspend VM") > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #May not throw an exception in 'suspend' state > -except: > - pass > - > -rc = session.xenapi.VM.resume(vm_uuid, False) > -if rc: > - FAIL("Could not resume VM") > - > -try: > - console = domain.getConsole() > -except ConsoleError, e: > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -domain.stop() > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > -except: > - FAIL("Could NOT destroy vTPM while domain is halted.") > - > -domain.destroy() > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > deleted file mode 100644 > index dd67e45..0000000 > --- a/tools/xm-test/tests/vtpm/Makefile.am > +++ /dev/null > @@ -1,27 +0,0 @@ > -SUBDIRS = > - > -TESTS = 01_vtpm-list_pos.test \ > - 02_vtpm-cat_pcrs.test \ > - 03_vtpm-susp_res.test \ > - 04_vtpm-loc_migr.test \ > - 05_vtpm-loc_migr.test \ > - 06_vtpm-susp_res_pcrs.test \ > - 07_vtpm-mig_pcrs.test \ > - 08_vtpm-mig_pcrs.test \ > - 09_vtpm-xapi.test > - > -XFAIL_TESTS = > - > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > -TESTS_ENVIRONMENT=@TENV@ > - > -%.test: %.py > - cp $< $@ > - chmod +x $@ > - > -clean-local: am_config_clean-local > - > -am_config_clean-local: > - rm -f *test > - rm -f *log > - rm -f *~ > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > deleted file mode 100644 > index 4e5b281..0000000 > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > +++ /dev/null > @@ -1,30 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -from XmTestLib import * > - > -if ENABLE_HVM_SUPPORT: > - SKIP("vtpm tests not supported for HVM domains") > - > -status, output = traceCommand("COLUMNS=200 ; " > - "ps aux | grep vtpm_manager | grep -v grep") > -if output == "": > - SKIP("virtual TPM manager must be started to run this test; might " > - "need /dev/tpm0") > - > -def vtpm_cleanup(domName): > - traceCommand("/etc/xen/scripts/vtpm-delete " > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > - str(domid(domName))) > - > -def vtpm_cleanup(uuid): > - from xen.xm import main > - if main.serverType != main.SERVER_XEN_API: > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > - > -def vtpm_get_uuid(domainid): > - s, o = traceCommand("xenstore-read " > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > - return o > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:16:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:16:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFPs-0000Dh-Kp; Tue, 13 Nov 2012 12:16:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFPr-0000Db-Bv for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:16:31 +0000 Received: from [85.158.139.83:5439] by server-4.bemta-5.messagelabs.com id 69/29-15011-E1A32A05; Tue, 13 Nov 2012 12:16:30 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352808988!29344601!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17916 invoked from network); 13 Nov 2012 12:16:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:16:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214309935" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:16:27 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:16:27 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFPn-00054e-9x for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:16:27 +0000 Message-ID: <50A23A1B.6030404@citrix.com> Date: Tue, 13 Nov 2012 12:16:27 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 12:05, Tim Deegan wrote: > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: >> At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: >>>> diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >>>> --- a/xen/arch/x86/hvm/vmx/vmx.c >>>> +++ b/xen/arch/x86/hvm/vmx/vmx.c >>>> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >>>> (X86_EVENTTYPE_NMI << 8) ) >>>> goto exit_and_crash; >>>> HVMTRACE_0D(NMI); >>>> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >>>> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >>> In any case - why can't you call do_nmi() directly from here? >> ... this is my doing. There used to be a call to do_nmi() here, but >> do_nmi() doesn't block NMIs, so you can't just call it here in case you >> get _another_ NMI while you're in the NMI handler. > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > because NMIs are indeed blocked, and have been since the VMEXIT. > > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... > > Tim. The first experiment was to have self_nmi() wait until the NMI count for the current processor changed. This prevented the thousands of bounces in and out of non-root mode, but the enter delays fairly consistently in the millions of TSC ticks (a few milliseconds on the test box), which is a noticeable chunk of time. ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:16:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:16:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFPs-0000Dh-Kp; Tue, 13 Nov 2012 12:16:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFPr-0000Db-Bv for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:16:31 +0000 Received: from [85.158.139.83:5439] by server-4.bemta-5.messagelabs.com id 69/29-15011-E1A32A05; Tue, 13 Nov 2012 12:16:30 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352808988!29344601!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17916 invoked from network); 13 Nov 2012 12:16:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:16:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="214309935" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:16:27 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:16:27 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFPn-00054e-9x for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:16:27 +0000 Message-ID: <50A23A1B.6030404@citrix.com> Date: Tue, 13 Nov 2012 12:16:27 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 12:05, Tim Deegan wrote: > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: >> At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: >>>> diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >>>> --- a/xen/arch/x86/hvm/vmx/vmx.c >>>> +++ b/xen/arch/x86/hvm/vmx/vmx.c >>>> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >>>> (X86_EVENTTYPE_NMI << 8) ) >>>> goto exit_and_crash; >>>> HVMTRACE_0D(NMI); >>>> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >>>> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >>> In any case - why can't you call do_nmi() directly from here? >> ... this is my doing. There used to be a call to do_nmi() here, but >> do_nmi() doesn't block NMIs, so you can't just call it here in case you >> get _another_ NMI while you're in the NMI handler. > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > because NMIs are indeed blocked, and have been since the VMEXIT. > > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... > > Tim. The first experiment was to have self_nmi() wait until the NMI count for the current processor changed. This prevented the thousands of bounces in and out of non-root mode, but the enter delays fairly consistently in the millions of TSC ticks (a few milliseconds on the test box), which is a noticeable chunk of time. ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:17:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:17:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFQq-0000Hn-3T; Tue, 13 Nov 2012 12:17:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFQo-0000HY-FY for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:17:30 +0000 Received: from [193.109.254.147:49414] by server-14.bemta-14.messagelabs.com id 76/BF-14517-95A32A05; Tue, 13 Nov 2012 12:17:29 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1352808950!8923504!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26058 invoked from network); 13 Nov 2012 12:15:55 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:15:55 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFPB-000C8b-2T; Tue, 13 Nov 2012 12:15:49 +0000 Date: Tue, 13 Nov 2012 12:15:49 +0000 From: Tim Deegan To: Stefano Stabellini Message-ID: <20121113121549.GD44675@ocelot.phlegethon.org> References: <20121024155945.GD39126@ocelot.phlegethon.org> <20121026090141.GB76080@ocelot.phlegethon.org> <20121026165549.GF76080@ocelot.phlegethon.org> <20121027104428.GB89901@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:01 +0000 on 13 Nov (1352808094), Stefano Stabellini wrote: > > I think we should have two functions. One should look almost like that > > and be for flushing large ranges, and one much simpler for flushing > > small items. Like this (totally untested, uncompiled even): > > > > #define MIN_CACHELINE_BYTES 32 // or whatever > > > > /* In setup.c somewhere. */ > > if ( READ_CP32(CCSIDR) < MIN_CACHELINE_BYTES ) > > panic("CPU has preposterously small cache lines"); > > > > /* Function for flushing medium-sized areas. > > * if 'range' is large enough we might want to use model-specific > > * full-cache flushes. */ > > static inline void flush_xen_dcache_va_range(void *p, unsigned long size) > > { > > void *end; > > unsigned long cacheline_bytes = READ_CP32(CCSIDR); > > barrier(); /* So the compiler issues all writes to the range */ > > dsb(); /* So the CPU issues all writes to the range */ > > for ( end = p + size; p < end; p += cacheline_bytes ) > > WRITE_CP32(DCCMVAC, p); > > dsb(); /* So we know the flushes happen before continuing */ > > } > > > > /* Macro for flushing a single small item. The predicate is always > > * compile-time constant so this will compile down to 3 instructions in > > * the common case. Make sure to call it with the correct type of > > * pointer! */ > > #define flush_xen_dcache_va(p) do { \ > > typeof(p) _p = (p); \ > > if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ > > flush_xen_dcache_va_range(_p, sizeof *_p); \ > > else \ > > asm volatile ( \ > > "dsb;" /* Finish all earlier writes */ \ > > STORE_CP32(0, DCCMVAC) \ > > "dsb;" /* Finish flush before continuing */ \ > > : : "r" (_p), "m" (*_p)); \ > > } while (0) > > > > What do you think? > > I think that is OK, but I would like to avoid reading CCSIDR every > single time we need to do a dcache flush The code above only reads it once for each large dcache flush. When I was writing it I did think of just stashing cacheline_bytes in a read_mostly somewhere, but I had the opposite concern -- wouldn't reading this constant from on-chip be quicker than going to the memory bus for it? :) I'm happy either way. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:17:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:17:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFQq-0000Hn-3T; Tue, 13 Nov 2012 12:17:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFQo-0000HY-FY for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:17:30 +0000 Received: from [193.109.254.147:49414] by server-14.bemta-14.messagelabs.com id 76/BF-14517-95A32A05; Tue, 13 Nov 2012 12:17:29 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1352808950!8923504!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26058 invoked from network); 13 Nov 2012 12:15:55 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:15:55 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFPB-000C8b-2T; Tue, 13 Nov 2012 12:15:49 +0000 Date: Tue, 13 Nov 2012 12:15:49 +0000 From: Tim Deegan To: Stefano Stabellini Message-ID: <20121113121549.GD44675@ocelot.phlegethon.org> References: <20121024155945.GD39126@ocelot.phlegethon.org> <20121026090141.GB76080@ocelot.phlegethon.org> <20121026165549.GF76080@ocelot.phlegethon.org> <20121027104428.GB89901@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Cc: "xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:01 +0000 on 13 Nov (1352808094), Stefano Stabellini wrote: > > I think we should have two functions. One should look almost like that > > and be for flushing large ranges, and one much simpler for flushing > > small items. Like this (totally untested, uncompiled even): > > > > #define MIN_CACHELINE_BYTES 32 // or whatever > > > > /* In setup.c somewhere. */ > > if ( READ_CP32(CCSIDR) < MIN_CACHELINE_BYTES ) > > panic("CPU has preposterously small cache lines"); > > > > /* Function for flushing medium-sized areas. > > * if 'range' is large enough we might want to use model-specific > > * full-cache flushes. */ > > static inline void flush_xen_dcache_va_range(void *p, unsigned long size) > > { > > void *end; > > unsigned long cacheline_bytes = READ_CP32(CCSIDR); > > barrier(); /* So the compiler issues all writes to the range */ > > dsb(); /* So the CPU issues all writes to the range */ > > for ( end = p + size; p < end; p += cacheline_bytes ) > > WRITE_CP32(DCCMVAC, p); > > dsb(); /* So we know the flushes happen before continuing */ > > } > > > > /* Macro for flushing a single small item. The predicate is always > > * compile-time constant so this will compile down to 3 instructions in > > * the common case. Make sure to call it with the correct type of > > * pointer! */ > > #define flush_xen_dcache_va(p) do { \ > > typeof(p) _p = (p); \ > > if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ > > flush_xen_dcache_va_range(_p, sizeof *_p); \ > > else \ > > asm volatile ( \ > > "dsb;" /* Finish all earlier writes */ \ > > STORE_CP32(0, DCCMVAC) \ > > "dsb;" /* Finish flush before continuing */ \ > > : : "r" (_p), "m" (*_p)); \ > > } while (0) > > > > What do you think? > > I think that is OK, but I would like to avoid reading CCSIDR every > single time we need to do a dcache flush The code above only reads it once for each large dcache flush. When I was writing it I did think of just stashing cacheline_bytes in a read_mostly somewhere, but I had the opposite concern -- wouldn't reading this constant from on-chip be quicker than going to the memory bus for it? :) I'm happy either way. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:18:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:18:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFR8-0000KF-Ge; Tue, 13 Nov 2012 12:17:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFR7-0000Jt-7o for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:17:49 +0000 Received: from [85.158.139.211:54347] by server-14.bemta-5.messagelabs.com id 8D/6B-21768-C6A32A05; Tue, 13 Nov 2012 12:17:48 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352809067!19932461!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16696 invoked from network); 13 Nov 2012 12:17:47 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:17:47 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15776236" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:17:31 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 12:17:30 +0000 Message-ID: <1352809049.7491.70.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Tim Deegan Date: Tue, 13 Nov 2012 12:17:29 +0000 In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Malcolm Crossley , "eddie.dong@intel.com" , "jun.nakajima@intel.com" , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > > (X86_EVENTTYPE_NMI << 8) ) > > > > goto exit_and_crash; > > > > HVMTRACE_0D(NMI); > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > > > In any case - why can't you call do_nmi() directly from here? > > > > ... this is my doing. There used to be a call to do_nmi() here, but > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > > get _another_ NMI while you're in the NMI handler. > > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > because NMIs are indeed blocked, and have been since the VMEXIT. > > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... What about a little stub-asm return_from_nmi / reenable_nmis with something like: pushf pushq $__HYPERVISOR_CS pushq 1f iret 1: ... That should re-enable NMIs at whichever point we think is appropriate? Perhaps a little more work is needed to create a suitable frame under this one too, not sure what a vmexit frame looks like. I hope we aren't going to get into the NMI nesting problem described here: http://lwn.net/Articles/484932/ (I don't think so, no page-faults or break points in our NMI handlers) Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:18:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:18:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFR8-0000KF-Ge; Tue, 13 Nov 2012 12:17:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFR7-0000Jt-7o for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:17:49 +0000 Received: from [85.158.139.211:54347] by server-14.bemta-5.messagelabs.com id 8D/6B-21768-C6A32A05; Tue, 13 Nov 2012 12:17:48 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352809067!19932461!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16696 invoked from network); 13 Nov 2012 12:17:47 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:17:47 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="15776236" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:17:31 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 12:17:30 +0000 Message-ID: <1352809049.7491.70.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Tim Deegan Date: Tue, 13 Nov 2012 12:17:29 +0000 In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Malcolm Crossley , "eddie.dong@intel.com" , "jun.nakajima@intel.com" , Jan Beulich , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > > (X86_EVENTTYPE_NMI << 8) ) > > > > goto exit_and_crash; > > > > HVMTRACE_0D(NMI); > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > > > In any case - why can't you call do_nmi() directly from here? > > > > ... this is my doing. There used to be a call to do_nmi() here, but > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > > get _another_ NMI while you're in the NMI handler. > > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > because NMIs are indeed blocked, and have been since the VMEXIT. > > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... What about a little stub-asm return_from_nmi / reenable_nmis with something like: pushf pushq $__HYPERVISOR_CS pushq 1f iret 1: ... That should re-enable NMIs at whichever point we think is appropriate? Perhaps a little more work is needed to create a suitable frame under this one too, not sure what a vmexit frame looks like. I hope we aren't going to get into the NMI nesting problem described here: http://lwn.net/Articles/484932/ (I don't think so, no page-faults or break points in our NMI handlers) Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:24:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:24:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFXC-0000ja-B6; Tue, 13 Nov 2012 12:24:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFXA-0000jV-5v for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:24:04 +0000 Received: from [85.158.139.211:8954] by server-14.bemta-5.messagelabs.com id AB/9B-21768-3EB32A05; Tue, 13 Nov 2012 12:24:03 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352809441!20027359!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10655 invoked from network); 13 Nov 2012 12:24:02 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:24:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="44390847" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:24:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:24:00 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFX6-0005CZ-De; Tue, 13 Nov 2012 12:24:00 +0000 Date: Tue, 13 Nov 2012 12:23:28 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352808054.7491.66.camel@zakaz.uk.xensource.com> Message-ID: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> <1352808054.7491.66.camel@zakaz.uk.xensource.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "Tim \(Xen.org\)" , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012, Ian Campbell wrote: > On Tue, 2012-11-13 at 11:57 +0000, Stefano Stabellini wrote: > > On Sat, 27 Oct 2012, Tim Deegan wrote: > > > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > > > I think that the problem is the usage of vgic_irq_rank with registers > > > > > that have 1 bit per interrupt. > > > > > > > > That's very plausible indeed. > > > > > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > > > index 3c3983f..92731b6 100644 > > > > > --- a/xen/arch/arm/vgic.c > > > > > +++ b/xen/arch/arm/vgic.c > > > > > @@ -42,13 +42,7 @@ > > > > > */ > > > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > > > { > > > > > - switch ( b ) > > > > > - { > > > > > - case 8: return n >> 3; > > > > > - case 4: return n >> 2; > > > > > - case 2: return n >> 1; > > > > > - default: BUG(); > > > > > - } > > > > > + return n / b; > > > > > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > > > why I used the switch. Can you just add the appropriate case 1 instead? > > > > Probably the bug should be a call to an undefined function to make this > > > > a compile time rather than runtime failure too. > > > > > > BUILD_BUG_ON((b & -b) != b); ? > > > > I can't do that: > > > > error: expression in static assertion is not constant > > I suppose you could make REG_RANK_NR a macro (as it's name implies it > ought to be, oops!). > REG_RANK_NR is called by vgic_irq_rank, so that would need to become a macro too > If not then given that b must be in {1,2,4,8} maybe the switch is > ok/tolerable? If we end up supporting b=16 or 32 then more thought is > probably required around the place anyway. yeah I think is OK _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:24:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:24:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFXC-0000ja-B6; Tue, 13 Nov 2012 12:24:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFXA-0000jV-5v for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 12:24:04 +0000 Received: from [85.158.139.211:8954] by server-14.bemta-5.messagelabs.com id AB/9B-21768-3EB32A05; Tue, 13 Nov 2012 12:24:03 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352809441!20027359!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10655 invoked from network); 13 Nov 2012 12:24:02 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 12:24:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,765,1344211200"; d="scan'208";a="44390847" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 12:24:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 07:24:00 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYFX6-0005CZ-De; Tue, 13 Nov 2012 12:24:00 +0000 Date: Tue, 13 Nov 2012 12:23:28 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Ian Campbell In-Reply-To: <1352808054.7491.66.camel@zakaz.uk.xensource.com> Message-ID: References: <1351091027-20740-1-git-send-email-stefano.stabellini@eu.citrix.com> <1351157246.18035.129.camel@zakaz.uk.xensource.com> <1351269622.15162.105.camel@zakaz.uk.xensource.com> <1351284440.12176.9.camel@dagon.hellion.org.uk> <20121027100929.GA89901@ocelot.phlegethon.org> <1352808054.7491.66.camel@zakaz.uk.xensource.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "xen-devel@lists.xensource.com" , "Tim \(Xen.org\)" , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH 1/7] xen/arm: fix rank calculation in vgic_vcpu_inject_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012, Ian Campbell wrote: > On Tue, 2012-11-13 at 11:57 +0000, Stefano Stabellini wrote: > > On Sat, 27 Oct 2012, Tim Deegan wrote: > > > At 21:47 +0100 on 26 Oct (1351288040), Ian Campbell wrote: > > > > On Fri, 2012-10-26 at 19:42 +0100, Stefano Stabellini wrote: > > > > > I think that the problem is the usage of vgic_irq_rank with registers > > > > > that have 1 bit per interrupt. > > > > > > > > That's very plausible indeed. > > > > > > > > > diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c > > > > > index 3c3983f..92731b6 100644 > > > > > --- a/xen/arch/arm/vgic.c > > > > > +++ b/xen/arch/arm/vgic.c > > > > > @@ -42,13 +42,7 @@ > > > > > */ > > > > > static inline int REG_RANK_NR(int b, uint32_t n) > > > > > { > > > > > - switch ( b ) > > > > > - { > > > > > - case 8: return n >> 3; > > > > > - case 4: return n >> 2; > > > > > - case 2: return n >> 1; > > > > > - default: BUG(); > > > > > - } > > > > > + return n / b; > > > > > > > > All the infrastructure will fall apart if b isn't a power of two, that's > > > > why I used the switch. Can you just add the appropriate case 1 instead? > > > > Probably the bug should be a call to an undefined function to make this > > > > a compile time rather than runtime failure too. > > > > > > BUILD_BUG_ON((b & -b) != b); ? > > > > I can't do that: > > > > error: expression in static assertion is not constant > > I suppose you could make REG_RANK_NR a macro (as it's name implies it > ought to be, oops!). > REG_RANK_NR is called by vgic_irq_rank, so that would need to become a macro too > If not then given that b must be in {1,2,4,8} maybe the switch is > ok/tolerable? If we end up supporting b=16 or 32 then more thought is > probably required around the place anyway. yeah I think is OK _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:39:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:39:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFlu-0000yU-O8; Tue, 13 Nov 2012 12:39:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFlt-0000yP-UM for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:39:18 +0000 Received: from [85.158.139.211:13284] by server-16.bemta-5.messagelabs.com id 0C/E6-04786-57F32A05; Tue, 13 Nov 2012 12:39:17 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-4.tower-206.messagelabs.com!1352810355!20004639!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1354 invoked from network); 13 Nov 2012 12:39:16 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:39:16 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFlm-000CCx-VF; Tue, 13 Nov 2012 12:39:10 +0000 Date: Tue, 13 Nov 2012 12:39:10 +0000 From: Tim Deegan To: Ian Campbell Message-ID: <20121113123910.GE44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352809049.7491.70.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Jan Beulich , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: > On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > > > (X86_EVENTTYPE_NMI << 8) ) > > > > > goto exit_and_crash; > > > > > HVMTRACE_0D(NMI); > > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > > > > > In any case - why can't you call do_nmi() directly from here? > > > > > > ... this is my doing. There used to be a call to do_nmi() here, but > > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > > > get _another_ NMI while you're in the NMI handler. > > > > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > > because NMIs are indeed blocked, and have been since the VMEXIT. > > > > In that case, I agree that we should just run the NMI handler, but first > > I would really like to know what _unblocks_ NMIs in this case. Any of > > the things I can think of (the next vmenter, the next iret, ??) will > > need some handling to make sure they actually happen before, say, we > > take this CPU into the idle loop... > > What about a little stub-asm return_from_nmi / reenable_nmis with > something like: > pushf > pushq $__HYPERVISOR_CS > pushq 1f > iret > 1: ... > > That should re-enable NMIs at whichever point we think is appropriate? If an iret is what's needed then replacing self_nmi() with 'int $2' (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of the manual suggests that iret is indeed what we want, so: Acked-by: Tim Deegan Cheers, Tim _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:39:33 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:39:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFlu-0000yU-O8; Tue, 13 Nov 2012 12:39:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYFlt-0000yP-UM for xen-devel@lists.xen.org; Tue, 13 Nov 2012 12:39:18 +0000 Received: from [85.158.139.211:13284] by server-16.bemta-5.messagelabs.com id 0C/E6-04786-57F32A05; Tue, 13 Nov 2012 12:39:17 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-4.tower-206.messagelabs.com!1352810355!20004639!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1354 invoked from network); 13 Nov 2012 12:39:16 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 12:39:16 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYFlm-000CCx-VF; Tue, 13 Nov 2012 12:39:10 +0000 Date: Tue, 13 Nov 2012 12:39:10 +0000 From: Tim Deegan To: Ian Campbell Message-ID: <20121113123910.GE44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352809049.7491.70.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Jan Beulich , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: > On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > > > > (X86_EVENTTYPE_NMI << 8) ) > > > > > goto exit_and_crash; > > > > > HVMTRACE_0D(NMI); > > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > > > > > > > In any case - why can't you call do_nmi() directly from here? > > > > > > ... this is my doing. There used to be a call to do_nmi() here, but > > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > > > get _another_ NMI while you're in the NMI handler. > > > > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > > because NMIs are indeed blocked, and have been since the VMEXIT. > > > > In that case, I agree that we should just run the NMI handler, but first > > I would really like to know what _unblocks_ NMIs in this case. Any of > > the things I can think of (the next vmenter, the next iret, ??) will > > need some handling to make sure they actually happen before, say, we > > take this CPU into the idle loop... > > What about a little stub-asm return_from_nmi / reenable_nmis with > something like: > pushf > pushq $__HYPERVISOR_CS > pushq 1f > iret > 1: ... > > That should re-enable NMIs at whichever point we think is appropriate? If an iret is what's needed then replacing self_nmi() with 'int $2' (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of the manual suggests that iret is indeed what we want, so: Acked-by: Tim Deegan Cheers, Tim _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2P-0001IA-BU; Tue, 13 Nov 2012 12:56:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2O-0001Hx-2h; Tue, 13 Nov 2012 12:56:20 +0000 Received: from [85.158.143.99:57901] by server-3.bemta-4.messagelabs.com id CD/54-06841-17342A05; Tue, 13 Nov 2012 12:56:17 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1352811375!18805688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3583 invoked from network); 13 Nov 2012 12:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2B-0008Tx-Gv; Tue, 13 Nov 2012 12:56:07 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2A-0000z4-Uh; Tue, 13 Nov 2012 12:56:06 +0000 Date: Tue, 13 Nov 2012 12:56:06 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 20 (CVE-2012-4535) - Timer overflow DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4535 / XSA-20 version 2 Timer overflow DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= A guest which sets a VCPU with an inappropriate deadline can cause an infinite loop in Xen, blocking the affected physical CPU indefinitely. IMPACT ====== A malicious guest administrator can trigger the bug. If the Xen watchdog is enabled, the whole system will crash. Otherwise the guest can cause the system to become completely unresponsive. VULNERABLE SYSTEMS ================== All versions of Xen from at least 3.4 onwards are vulnerable, to every kind of guest. Systems with only trusted guest kernels are not vulnerable. MITIGATION ========== There is no mitigation available other than to use a trusted guest kernel. RESOLUTION ========== The attached patch resolves this issue. The same patch is applicable to all affected versions. $ sha256sum xsa20.patch 954f43a3b912d551b6534d3962d0bab3db820222a3bff211b545e526f9161c71 xsa20.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGkAAoJEIP+FMlX6CvZzB0H/2H7Z/zxYOQtC2QLT77voNvI /dCGnO+tUxcn9zsPOTkQjTmd7XrSaCdV9IoKmssZCwTBlHzRiwvFWQBinqrU8SZb 8UCv4O1zxg4Ygv/9nlJVxI8Xq9+uyxc/RaMeKlMCsW2rSKut9zmHI9HU+FT5kqG9 0vEXhZW4/MwOFbH+03LoHgjXqW8LOLNZtBg9u5rF5iCDLnltdAC//3kFXA5UG391 JAzAdBUOOaf2OAnL4tEpEV6ksmeaxjckg63P5T61MUqiFJo/5AL5tu0kEKGHF7jH X4tDkSoV7Rbma4kNN3SbYjAkYGtsrGDeVS7HlhPbyZpKQVUJN+bSMYto3r8lVMM= =nj9Z -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa20.patch" Content-Disposition: attachment; filename="xsa20.patch" Content-Transfer-Encoding: base64 VkNQVS90aW1lcnM6IFByZXZlbnQgb3ZlcmZsb3cgaW4gY2FsY3VsYXRpb25z LCBsZWFkaW5nIHRvIERvUyB2dWxuZXJhYmlsaXR5CgpUaGUgdGltZXIgYWN0 aW9uIGZvciBhIHZjcHUgcGVyaW9kaWMgdGltZXIgaXMgdG8gY2FsY3VsYXRl IHRoZSBuZXh0CmV4cGlyeSB0aW1lLCBhbmQgdG8gcmVpbnNlcnQgaXRzZWxm IGludG8gdGhlIHRpbWVyIHF1ZXVlLiAgSWYgdGhlCmRlYWRsaW5lIGVuZHMg dXAgaW4gdGhlIHBhc3QsIFhlbiBuZXZlciBsZWF2ZXMgX19kb19zb2Z0aXJx KCkuICBUaGUKYWZmZWN0ZWQgUENQVSB3aWxsIHN0YXkgaW4gYW4gaW5maW5p dGUgbG9vcCB1bnRpbCBYZW4gaXMga2lsbGVkIGJ5IHRoZQp3YXRjaGRvZyAo aWYgZW5hYmxlZCkuCgpUaGlzIGlzIGEgc2VjdXJpdHkgcHJvYmxlbSwgWFNB LTIwIC8gQ1ZFLTIwMTItNDUzNS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBD b29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkFja2VkLWJ5OiBJ YW4gQ2FtcGJlbGwgPGlhbi5jYW1wYmVsbEBjaXRyaXguY29tPgoKZGlmZiAt ciA0NzhiYTNmMTQ2ZGYgeGVuL2NvbW1vbi9kb21haW4uYwotLS0gYS94ZW4v Y29tbW9uL2RvbWFpbi5jCisrKyBiL3hlbi9jb21tb24vZG9tYWluLmMKQEAg LTkwMyw2ICs5MDMsOSBAQCBsb25nIGRvX3ZjcHVfb3AoaW50IGNtZCwgaW50 IHZjcHVpZCwgWEVOCiAgICAgICAgIGlmICggc2V0LnBlcmlvZF9ucyA8IE1J TExJU0VDUygxKSApCiAgICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAor ICAgICAgICBpZiAoIHNldC5wZXJpb2RfbnMgPiBTVElNRV9ERUxUQV9NQVgg KQorICAgICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CisKICAgICAgICAgdi0+ cGVyaW9kaWNfcGVyaW9kID0gc2V0LnBlcmlvZF9uczsKICAgICAgICAgdmNw dV9mb3JjZV9yZXNjaGVkdWxlKHYpOwogCmRpZmYgLXIgNDc4YmEzZjE0NmRm IHhlbi9pbmNsdWRlL3hlbi90aW1lLmgKLS0tIGEveGVuL2luY2x1ZGUveGVu L3RpbWUuaAorKysgYi94ZW4vaW5jbHVkZS94ZW4vdGltZS5oCkBAIC01NSw2 ICs1NSw4IEBAIHN0cnVjdCB0bSBnbXRpbWUodW5zaWduZWQgbG9uZyB0KTsK ICNkZWZpbmUgTUlMTElTRUNTKF9tcykgICgoc190aW1lX3QpKChfbXMpICog MTAwMDAwMFVMTCkpCiAjZGVmaW5lIE1JQ1JPU0VDUyhfdXMpICAoKHNfdGlt ZV90KSgoX3VzKSAqIDEwMDBVTEwpKQogI2RlZmluZSBTVElNRV9NQVggKChz X3RpbWVfdCkoKHVpbnQ2NF90KX4wdWxsPj4xKSkKKy8qIENob3NlbiBzbyAo Tk9XKCkgKyBkZWx0YSkgd29udCBvdmVyZmxvdyB3aXRob3V0IGFuIHVwdGlt ZSBvZiAyMDAgeWVhcnMgKi8KKyNkZWZpbmUgU1RJTUVfREVMVEFfTUFYICgo c190aW1lX3QpKCh1aW50NjRfdCl+MHVsbD4+MikpCiAKIGV4dGVybiB2b2lk IHVwZGF0ZV92Y3B1X3N5c3RlbV90aW1lKHN0cnVjdCB2Y3B1ICp2KTsKIGV4 dGVybiB2b2lkIHVwZGF0ZV9kb21haW5fd2FsbGNsb2NrX3RpbWUoc3RydWN0 IGRvbWFpbiAqZCk7Cg== --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2P-0001IA-BU; Tue, 13 Nov 2012 12:56:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2O-0001Hx-2h; Tue, 13 Nov 2012 12:56:20 +0000 Received: from [85.158.143.99:57901] by server-3.bemta-4.messagelabs.com id CD/54-06841-17342A05; Tue, 13 Nov 2012 12:56:17 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1352811375!18805688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3583 invoked from network); 13 Nov 2012 12:56:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2B-0008Tx-Gv; Tue, 13 Nov 2012 12:56:07 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2A-0000z4-Uh; Tue, 13 Nov 2012 12:56:06 +0000 Date: Tue, 13 Nov 2012 12:56:06 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 20 (CVE-2012-4535) - Timer overflow DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4535 / XSA-20 version 2 Timer overflow DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= A guest which sets a VCPU with an inappropriate deadline can cause an infinite loop in Xen, blocking the affected physical CPU indefinitely. IMPACT ====== A malicious guest administrator can trigger the bug. If the Xen watchdog is enabled, the whole system will crash. Otherwise the guest can cause the system to become completely unresponsive. VULNERABLE SYSTEMS ================== All versions of Xen from at least 3.4 onwards are vulnerable, to every kind of guest. Systems with only trusted guest kernels are not vulnerable. MITIGATION ========== There is no mitigation available other than to use a trusted guest kernel. RESOLUTION ========== The attached patch resolves this issue. The same patch is applicable to all affected versions. $ sha256sum xsa20.patch 954f43a3b912d551b6534d3962d0bab3db820222a3bff211b545e526f9161c71 xsa20.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGkAAoJEIP+FMlX6CvZzB0H/2H7Z/zxYOQtC2QLT77voNvI /dCGnO+tUxcn9zsPOTkQjTmd7XrSaCdV9IoKmssZCwTBlHzRiwvFWQBinqrU8SZb 8UCv4O1zxg4Ygv/9nlJVxI8Xq9+uyxc/RaMeKlMCsW2rSKut9zmHI9HU+FT5kqG9 0vEXhZW4/MwOFbH+03LoHgjXqW8LOLNZtBg9u5rF5iCDLnltdAC//3kFXA5UG391 JAzAdBUOOaf2OAnL4tEpEV6ksmeaxjckg63P5T61MUqiFJo/5AL5tu0kEKGHF7jH X4tDkSoV7Rbma4kNN3SbYjAkYGtsrGDeVS7HlhPbyZpKQVUJN+bSMYto3r8lVMM= =nj9Z -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa20.patch" Content-Disposition: attachment; filename="xsa20.patch" Content-Transfer-Encoding: base64 VkNQVS90aW1lcnM6IFByZXZlbnQgb3ZlcmZsb3cgaW4gY2FsY3VsYXRpb25z LCBsZWFkaW5nIHRvIERvUyB2dWxuZXJhYmlsaXR5CgpUaGUgdGltZXIgYWN0 aW9uIGZvciBhIHZjcHUgcGVyaW9kaWMgdGltZXIgaXMgdG8gY2FsY3VsYXRl IHRoZSBuZXh0CmV4cGlyeSB0aW1lLCBhbmQgdG8gcmVpbnNlcnQgaXRzZWxm IGludG8gdGhlIHRpbWVyIHF1ZXVlLiAgSWYgdGhlCmRlYWRsaW5lIGVuZHMg dXAgaW4gdGhlIHBhc3QsIFhlbiBuZXZlciBsZWF2ZXMgX19kb19zb2Z0aXJx KCkuICBUaGUKYWZmZWN0ZWQgUENQVSB3aWxsIHN0YXkgaW4gYW4gaW5maW5p dGUgbG9vcCB1bnRpbCBYZW4gaXMga2lsbGVkIGJ5IHRoZQp3YXRjaGRvZyAo aWYgZW5hYmxlZCkuCgpUaGlzIGlzIGEgc2VjdXJpdHkgcHJvYmxlbSwgWFNB LTIwIC8gQ1ZFLTIwMTItNDUzNS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBD b29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkFja2VkLWJ5OiBJ YW4gQ2FtcGJlbGwgPGlhbi5jYW1wYmVsbEBjaXRyaXguY29tPgoKZGlmZiAt ciA0NzhiYTNmMTQ2ZGYgeGVuL2NvbW1vbi9kb21haW4uYwotLS0gYS94ZW4v Y29tbW9uL2RvbWFpbi5jCisrKyBiL3hlbi9jb21tb24vZG9tYWluLmMKQEAg LTkwMyw2ICs5MDMsOSBAQCBsb25nIGRvX3ZjcHVfb3AoaW50IGNtZCwgaW50 IHZjcHVpZCwgWEVOCiAgICAgICAgIGlmICggc2V0LnBlcmlvZF9ucyA8IE1J TExJU0VDUygxKSApCiAgICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAor ICAgICAgICBpZiAoIHNldC5wZXJpb2RfbnMgPiBTVElNRV9ERUxUQV9NQVgg KQorICAgICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CisKICAgICAgICAgdi0+ cGVyaW9kaWNfcGVyaW9kID0gc2V0LnBlcmlvZF9uczsKICAgICAgICAgdmNw dV9mb3JjZV9yZXNjaGVkdWxlKHYpOwogCmRpZmYgLXIgNDc4YmEzZjE0NmRm IHhlbi9pbmNsdWRlL3hlbi90aW1lLmgKLS0tIGEveGVuL2luY2x1ZGUveGVu L3RpbWUuaAorKysgYi94ZW4vaW5jbHVkZS94ZW4vdGltZS5oCkBAIC01NSw2 ICs1NSw4IEBAIHN0cnVjdCB0bSBnbXRpbWUodW5zaWduZWQgbG9uZyB0KTsK ICNkZWZpbmUgTUlMTElTRUNTKF9tcykgICgoc190aW1lX3QpKChfbXMpICog MTAwMDAwMFVMTCkpCiAjZGVmaW5lIE1JQ1JPU0VDUyhfdXMpICAoKHNfdGlt ZV90KSgoX3VzKSAqIDEwMDBVTEwpKQogI2RlZmluZSBTVElNRV9NQVggKChz X3RpbWVfdCkoKHVpbnQ2NF90KX4wdWxsPj4xKSkKKy8qIENob3NlbiBzbyAo Tk9XKCkgKyBkZWx0YSkgd29udCBvdmVyZmxvdyB3aXRob3V0IGFuIHVwdGlt ZSBvZiAyMDAgeWVhcnMgKi8KKyNkZWZpbmUgU1RJTUVfREVMVEFfTUFYICgo c190aW1lX3QpKCh1aW50NjRfdCl+MHVsbD4+MikpCiAKIGV4dGVybiB2b2lk IHVwZGF0ZV92Y3B1X3N5c3RlbV90aW1lKHN0cnVjdCB2Y3B1ICp2KTsKIGV4 dGVybiB2b2lkIHVwZGF0ZV9kb21haW5fd2FsbGNsb2NrX3RpbWUoc3RydWN0 IGRvbWFpbiAqZCk7Cg== --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2W-0001L2-Rh; Tue, 13 Nov 2012 12:56:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2V-0001KB-3Q; Tue, 13 Nov 2012 12:56:27 +0000 Received: from [85.158.138.51:16995] by server-13.bemta-3.messagelabs.com id A6/38-24887-A7342A05; Tue, 13 Nov 2012 12:56:26 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1352811384!21908767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29012 invoked from network); 13 Nov 2012 12:56:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2K-0008Ud-76; Tue, 13 Nov 2012 12:56:16 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2K-0000zq-49; Tue, 13 Nov 2012 12:56:16 +0000 Date: Tue, 13 Nov 2012 12:56:16 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 23 (CVE-2012-4538) - Unhooking empty PAE entries DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4538 / XSA-23 version 2 Unhooking empty PAE entries DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= The HVMOP_pagetable_dying hypercall does not correctly check the caller's pagetable state, leading to a hypervisor crash. IMPACT ====== An HVM guest running on shadow pagetables (that is, not HAP) can cause the hypervisor to crash. VULNERABLE SYSTEMS ================== All Xen versions from 4.0 onwards are vulnerable, except that: - systems that run only PV guests are not vulnerable - systems that run all HVM guests using HAP (which is the default on hardware that supports it) are not vulnerable. MITIGATION ========== This issue can be avoided by running only PV guests or by running all HVM guests using hardware-assisited paging (HAP, also called NPT, RVI and EPT). Xen will run guests using HAP by default on hardware that supports it, unless it is disbled by putting 'hap=0' either on the xen hypervisor command-line or in the VM's configuration. You can check whether a particular machine supports HAP by looking at xen's boot messages. On Xen 4.1, 4.2 and unstable, Xen will print "HVM: Hardware Assisted Paging (HAP) detected" during boot; on xen 4.0 the message is "HVM: Hardware Assisted Paging detected". RESOLUTION ========== Applying the appropriate attached patch resolves this issue. xsa23-4.0-4.1.patch Xen 4.0.x, 4.1.x xsa23-4.2-unstable.patch Xen 4.2.x, xen-unstable $ sha256sum xsa23*.patch f696d597481595b14ac9577d1dad05fc97da68568f52db74d62f2e3dcb2c7a6e xsa23-4.0-4.1.patch 70ffea07e58e4a747bf3ec103f656ba2cd0d8986722e6a72023c57d802c65964 xsa23-4.2-unstable.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGsAAoJEIP+FMlX6CvZTagH/iyB7+Y5Ug2+3o0minW/xYe5 sVoRIxYhOuKIoRZFVHn3WvXc2PkL/sVCg8PoQnxCs1v4etALl6TTwE9CuJYVgbR7 9OiN6l/NAg2Qbcg3W1j5Har0syOFL5ZkrvIZ3xvER1lsSINKFJ/HBYf9Oe3KUAaD ffzgRupB/AcETIClv9qwhmSVgjDyNWEae4TS5MzvdUM5dDcCObg/OpyvCGx2MbA8 SF/s9bSwmUcEboy1wOm4wkTWfEJUCsE/ftpQRsEZPESOOXG5u2QB+EI1pbZ1SObx yhbDGE1Ex3T9u88t+7bSiFn2CwNS7eWQwg7nKQ6P/8PlSwm8BFg7KBC+HUxHNW4= =stq6 -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa23-4.0-4.1.patch" Content-Disposition: attachment; filename="xsa23-4.0-4.1.patch" Content-Transfer-Encoding: base64 eGVuL21tL3NoYWRvdzogY2hlY2sgdG9wbGV2ZWwgcGFnZXRhYmxlcyBhcmUg cHJlc2VudCBiZWZvcmUgdW5ob29raW5nIHRoZW0uCgpJZiB0aGUgZ3Vlc3Qg aGFzIG5vdCBmdWxseSBwb3B1bGF0ZWQgaXRzIHRvcC1sZXZlbCBQQUUgZW50 cmllcyB3aGVuIGl0IGNhbGxzCkhWTU9QX3BhZ2V0YWJsZV9keWluZywgdGhl IHNoYWRvdyBjb2RlIGNvdWxkIHRyeSB0byB1bmhvb2sgZW50cmllcyBmcm9t Ck1GTiAwLiAgQWRkIGEgY2hlY2sgdG8gYXZvaWQgdGhhdCBjYXNlLgoKVGhp cyBpc3N1ZSB3YXMgaW50cm9kdWNlZCBieSBjL3MgMjEyMzk6YjlkMmRiMTA5 Y2Y1LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMyAvIENW RS0yMDEyLTQ1MzguCgpTaWduZWQtb2ZmLWJ5OiBUaW0gRGVlZ2FuIDx0aW1A eGVuLm9yZz4KVGVzdGVkLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29v cGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4u Y2FtcGJlbGxAY2l0cml4LmNvbT4KCmRpZmYgLXIgYmZkMjJkNDBkYjA2IHhl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYwotLS0gYS94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L211bHRpLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3No YWRvdy9tdWx0aS5jCkBAIC00NzM3LDggKzQ3MzcsMTIgQEAgc3RhdGljIHZv aWQgc2hfcGFnZXRhYmxlX2R5aW5nKHN0cnVjdCB2YwogICAgIH0KICAgICBm b3IgKCBpID0gMDsgaSA8IDQ7IGkrKyApCiAgICAgewotICAgICAgICBpZiAo IGZhc3RfcGF0aCApCi0gICAgICAgICAgICBzbWZuID0gX21mbihwYWdldGFi bGVfZ2V0X3Bmbih2LT5hcmNoLnNoYWRvd190YWJsZVtpXSkpOworICAgICAg ICBpZiAoIGZhc3RfcGF0aCApIHsKKyAgICAgICAgICAgIGlmICggcGFnZXRh YmxlX2lzX251bGwodi0+YXJjaC5zaGFkb3dfdGFibGVbaV0pICkKKyAgICAg ICAgICAgICAgICBzbWZuID0gX21mbihJTlZBTElEX01GTik7CisgICAgICAg ICAgICBlbHNlCisgICAgICAgICAgICAgICAgc21mbiA9IF9tZm4ocGFnZXRh YmxlX2dldF9wZm4odi0+YXJjaC5zaGFkb3dfdGFibGVbaV0pKTsKKyAgICAg ICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKICAgICAgICAgICAgIC8q IHJldHJpZXZpbmcgdGhlIGwycyAqLwo= --=separator Content-Type: application/octet-stream; name="xsa23-4.2-unstable.patch" Content-Disposition: attachment; filename="xsa23-4.2-unstable.patch" Content-Transfer-Encoding: base64 eGVuL21tL3NoYWRvdzogY2hlY2sgdG9wbGV2ZWwgcGFnZXRhYmxlcyBhcmUg cHJlc2VudCBiZWZvcmUgdW5ob29raW5nIHRoZW0uCgpJZiB0aGUgZ3Vlc3Qg aGFzIG5vdCBmdWxseSBwb3B1bGF0ZWQgaXRzIHRvcC1sZXZlbCBQQUUgZW50 cmllcyB3aGVuIGl0IGNhbGxzCkhWTU9QX3BhZ2V0YWJsZV9keWluZywgdGhl IHNoYWRvdyBjb2RlIGNvdWxkIHRyeSB0byB1bmhvb2sgZW50cmllcyBmcm9t Ck1GTiAwLiAgQWRkIGEgY2hlY2sgdG8gYXZvaWQgdGhhdCBjYXNlLgoKVGhp cyBpc3N1ZSB3YXMgaW50cm9kdWNlZCBieSBjL3MgMjEyMzk6YjlkMmRiMTA5 Y2Y1LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMyAvIENW RS0yMDEyLTQ1MzguCgpTaWduZWQtb2ZmLWJ5OiBUaW0gRGVlZ2FuIDx0aW1A eGVuLm9yZz4KVGVzdGVkLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29v cGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4u Y2FtcGJlbGxAY2l0cml4LmNvbT4KCmRpZmYgLXIgY2M1NmMwMzk0ZGI3IHhl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYwotLS0gYS94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L211bHRpLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3No YWRvdy9tdWx0aS5jCkBAIC00NzM0LDggKzQ3MzQsMTIgQEAgc3RhdGljIHZv aWQgc2hfcGFnZXRhYmxlX2R5aW5nKHN0cnVjdCB2YwogICAgICAgICB1bnNp Z25lZCBsb25nIGdmbjsKICAgICAgICAgbWZuX3Qgc21mbiwgZ21mbjsKIAot ICAgICAgICBpZiAoIGZhc3RfcGF0aCApCi0gICAgICAgICAgICBzbWZuID0g X21mbihwYWdldGFibGVfZ2V0X3Bmbih2LT5hcmNoLnNoYWRvd190YWJsZVtp XSkpOworICAgICAgICBpZiAoIGZhc3RfcGF0aCApIHsKKyAgICAgICAgICAg IGlmICggcGFnZXRhYmxlX2lzX251bGwodi0+YXJjaC5zaGFkb3dfdGFibGVb aV0pICkKKyAgICAgICAgICAgICAgICBzbWZuID0gX21mbihJTlZBTElEX01G Tik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgc21mbiA9 IF9tZm4ocGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5zaGFkb3dfdGFibGVb aV0pKTsKKyAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKICAg ICAgICAgICAgIC8qIHJldHJpZXZpbmcgdGhlIGwycyAqLwo= --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2W-0001L2-Rh; Tue, 13 Nov 2012 12:56:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2V-0001KB-3Q; Tue, 13 Nov 2012 12:56:27 +0000 Received: from [85.158.138.51:16995] by server-13.bemta-3.messagelabs.com id A6/38-24887-A7342A05; Tue, 13 Nov 2012 12:56:26 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-12.tower-174.messagelabs.com!1352811384!21908767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29012 invoked from network); 13 Nov 2012 12:56:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2K-0008Ud-76; Tue, 13 Nov 2012 12:56:16 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2K-0000zq-49; Tue, 13 Nov 2012 12:56:16 +0000 Date: Tue, 13 Nov 2012 12:56:16 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 23 (CVE-2012-4538) - Unhooking empty PAE entries DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4538 / XSA-23 version 2 Unhooking empty PAE entries DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= The HVMOP_pagetable_dying hypercall does not correctly check the caller's pagetable state, leading to a hypervisor crash. IMPACT ====== An HVM guest running on shadow pagetables (that is, not HAP) can cause the hypervisor to crash. VULNERABLE SYSTEMS ================== All Xen versions from 4.0 onwards are vulnerable, except that: - systems that run only PV guests are not vulnerable - systems that run all HVM guests using HAP (which is the default on hardware that supports it) are not vulnerable. MITIGATION ========== This issue can be avoided by running only PV guests or by running all HVM guests using hardware-assisited paging (HAP, also called NPT, RVI and EPT). Xen will run guests using HAP by default on hardware that supports it, unless it is disbled by putting 'hap=0' either on the xen hypervisor command-line or in the VM's configuration. You can check whether a particular machine supports HAP by looking at xen's boot messages. On Xen 4.1, 4.2 and unstable, Xen will print "HVM: Hardware Assisted Paging (HAP) detected" during boot; on xen 4.0 the message is "HVM: Hardware Assisted Paging detected". RESOLUTION ========== Applying the appropriate attached patch resolves this issue. xsa23-4.0-4.1.patch Xen 4.0.x, 4.1.x xsa23-4.2-unstable.patch Xen 4.2.x, xen-unstable $ sha256sum xsa23*.patch f696d597481595b14ac9577d1dad05fc97da68568f52db74d62f2e3dcb2c7a6e xsa23-4.0-4.1.patch 70ffea07e58e4a747bf3ec103f656ba2cd0d8986722e6a72023c57d802c65964 xsa23-4.2-unstable.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGsAAoJEIP+FMlX6CvZTagH/iyB7+Y5Ug2+3o0minW/xYe5 sVoRIxYhOuKIoRZFVHn3WvXc2PkL/sVCg8PoQnxCs1v4etALl6TTwE9CuJYVgbR7 9OiN6l/NAg2Qbcg3W1j5Har0syOFL5ZkrvIZ3xvER1lsSINKFJ/HBYf9Oe3KUAaD ffzgRupB/AcETIClv9qwhmSVgjDyNWEae4TS5MzvdUM5dDcCObg/OpyvCGx2MbA8 SF/s9bSwmUcEboy1wOm4wkTWfEJUCsE/ftpQRsEZPESOOXG5u2QB+EI1pbZ1SObx yhbDGE1Ex3T9u88t+7bSiFn2CwNS7eWQwg7nKQ6P/8PlSwm8BFg7KBC+HUxHNW4= =stq6 -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa23-4.0-4.1.patch" Content-Disposition: attachment; filename="xsa23-4.0-4.1.patch" Content-Transfer-Encoding: base64 eGVuL21tL3NoYWRvdzogY2hlY2sgdG9wbGV2ZWwgcGFnZXRhYmxlcyBhcmUg cHJlc2VudCBiZWZvcmUgdW5ob29raW5nIHRoZW0uCgpJZiB0aGUgZ3Vlc3Qg aGFzIG5vdCBmdWxseSBwb3B1bGF0ZWQgaXRzIHRvcC1sZXZlbCBQQUUgZW50 cmllcyB3aGVuIGl0IGNhbGxzCkhWTU9QX3BhZ2V0YWJsZV9keWluZywgdGhl IHNoYWRvdyBjb2RlIGNvdWxkIHRyeSB0byB1bmhvb2sgZW50cmllcyBmcm9t Ck1GTiAwLiAgQWRkIGEgY2hlY2sgdG8gYXZvaWQgdGhhdCBjYXNlLgoKVGhp cyBpc3N1ZSB3YXMgaW50cm9kdWNlZCBieSBjL3MgMjEyMzk6YjlkMmRiMTA5 Y2Y1LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMyAvIENW RS0yMDEyLTQ1MzguCgpTaWduZWQtb2ZmLWJ5OiBUaW0gRGVlZ2FuIDx0aW1A eGVuLm9yZz4KVGVzdGVkLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29v cGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4u Y2FtcGJlbGxAY2l0cml4LmNvbT4KCmRpZmYgLXIgYmZkMjJkNDBkYjA2IHhl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYwotLS0gYS94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L211bHRpLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3No YWRvdy9tdWx0aS5jCkBAIC00NzM3LDggKzQ3MzcsMTIgQEAgc3RhdGljIHZv aWQgc2hfcGFnZXRhYmxlX2R5aW5nKHN0cnVjdCB2YwogICAgIH0KICAgICBm b3IgKCBpID0gMDsgaSA8IDQ7IGkrKyApCiAgICAgewotICAgICAgICBpZiAo IGZhc3RfcGF0aCApCi0gICAgICAgICAgICBzbWZuID0gX21mbihwYWdldGFi bGVfZ2V0X3Bmbih2LT5hcmNoLnNoYWRvd190YWJsZVtpXSkpOworICAgICAg ICBpZiAoIGZhc3RfcGF0aCApIHsKKyAgICAgICAgICAgIGlmICggcGFnZXRh YmxlX2lzX251bGwodi0+YXJjaC5zaGFkb3dfdGFibGVbaV0pICkKKyAgICAg ICAgICAgICAgICBzbWZuID0gX21mbihJTlZBTElEX01GTik7CisgICAgICAg ICAgICBlbHNlCisgICAgICAgICAgICAgICAgc21mbiA9IF9tZm4ocGFnZXRh YmxlX2dldF9wZm4odi0+YXJjaC5zaGFkb3dfdGFibGVbaV0pKTsKKyAgICAg ICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKICAgICAgICAgICAgIC8q IHJldHJpZXZpbmcgdGhlIGwycyAqLwo= --=separator Content-Type: application/octet-stream; name="xsa23-4.2-unstable.patch" Content-Disposition: attachment; filename="xsa23-4.2-unstable.patch" Content-Transfer-Encoding: base64 eGVuL21tL3NoYWRvdzogY2hlY2sgdG9wbGV2ZWwgcGFnZXRhYmxlcyBhcmUg cHJlc2VudCBiZWZvcmUgdW5ob29raW5nIHRoZW0uCgpJZiB0aGUgZ3Vlc3Qg aGFzIG5vdCBmdWxseSBwb3B1bGF0ZWQgaXRzIHRvcC1sZXZlbCBQQUUgZW50 cmllcyB3aGVuIGl0IGNhbGxzCkhWTU9QX3BhZ2V0YWJsZV9keWluZywgdGhl IHNoYWRvdyBjb2RlIGNvdWxkIHRyeSB0byB1bmhvb2sgZW50cmllcyBmcm9t Ck1GTiAwLiAgQWRkIGEgY2hlY2sgdG8gYXZvaWQgdGhhdCBjYXNlLgoKVGhp cyBpc3N1ZSB3YXMgaW50cm9kdWNlZCBieSBjL3MgMjEyMzk6YjlkMmRiMTA5 Y2Y1LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMyAvIENW RS0yMDEyLTQ1MzguCgpTaWduZWQtb2ZmLWJ5OiBUaW0gRGVlZ2FuIDx0aW1A eGVuLm9yZz4KVGVzdGVkLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29v cGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4u Y2FtcGJlbGxAY2l0cml4LmNvbT4KCmRpZmYgLXIgY2M1NmMwMzk0ZGI3IHhl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvbXVsdGkuYwotLS0gYS94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L211bHRpLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3No YWRvdy9tdWx0aS5jCkBAIC00NzM0LDggKzQ3MzQsMTIgQEAgc3RhdGljIHZv aWQgc2hfcGFnZXRhYmxlX2R5aW5nKHN0cnVjdCB2YwogICAgICAgICB1bnNp Z25lZCBsb25nIGdmbjsKICAgICAgICAgbWZuX3Qgc21mbiwgZ21mbjsKIAot ICAgICAgICBpZiAoIGZhc3RfcGF0aCApCi0gICAgICAgICAgICBzbWZuID0g X21mbihwYWdldGFibGVfZ2V0X3Bmbih2LT5hcmNoLnNoYWRvd190YWJsZVtp XSkpOworICAgICAgICBpZiAoIGZhc3RfcGF0aCApIHsKKyAgICAgICAgICAg IGlmICggcGFnZXRhYmxlX2lzX251bGwodi0+YXJjaC5zaGFkb3dfdGFibGVb aV0pICkKKyAgICAgICAgICAgICAgICBzbWZuID0gX21mbihJTlZBTElEX01G Tik7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgc21mbiA9 IF9tZm4ocGFnZXRhYmxlX2dldF9wZm4odi0+YXJjaC5zaGFkb3dfdGFibGVb aV0pKTsKKyAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKICAg ICAgICAgICAgIC8qIHJldHJpZXZpbmcgdGhlIGwycyAqLwo= --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2Q-0001Io-Is; Tue, 13 Nov 2012 12:56:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2P-0001I8-HV; Tue, 13 Nov 2012 12:56:21 +0000 Received: from [85.158.137.99:57042] by server-6.bemta-3.messagelabs.com id A2/CA-28265-47342A05; Tue, 13 Nov 2012 12:56:20 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-11.tower-217.messagelabs.com!1352811378!18030909!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15563 invoked from network); 13 Nov 2012 12:56:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2F-0008U6-4A; Tue, 13 Nov 2012 12:56:11 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2E-0000zH-Ug; Tue, 13 Nov 2012 12:56:10 +0000 Date: Tue, 13 Nov 2012 12:56:10 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 21 (CVE-2012-4536) - pirq range check DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4536 / XSA-21 version 2 pirq range check DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= domain_pirq_to_emuirq() uses the guest provided pirq value before range checking it, and physdev_unmap_pirq uses domain_pirq_to_emuirq without checking the pirq value either. Invalid pirq values can cause Xen to read out of array bounds, usually resulting in a fatal page fault. IMPACT ====== A malicious guest administrator can cause Xen to crash. If the out of array bounds access does not crash, the arbitrary value read will be ignored due to later error checking, so there is no privilege escalation and no exploitable information leak. VULNERABLE SYSTEMS ================== Only Xen version 4.1 is vulnerable. Other released versions, and xen-unstable, are not vulnerable. The vulnerability is only exposed to HVM guests. MITIGATION ========== Running only PV guests, or ensuring that HVM guests only use trusted kernels, will avoid this vulnerability. RESOLUTION ========== The attached patch resolves this issue. $ sha256sum xsa21.patch 34c4bef71d0ad08ee7c337c77af47aa77bb19081a13fc13beaff7d4b37b6b35a xsa21.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGnAAoJEIP+FMlX6CvZ1lQH/jdovmPuphnocdrkWGR8FE3+ OqM3JIpOZTDPFfLO7pen/P5e/0fCBs7cF7FGvM1Uua54/M0HrVS93E1m9baornkh vEIV5c9TRTfUR3IGmVFs1l+ddJcfULOuhfE2IOrbcYaWBL89D9sQYrL/A1j4LTEh umsz6fh4XgINkt/tpneEcE4ckYd0YkkOm3zUK3HaGshNXoOGVyGeaNqKr/YuhEfc XWOkCUoZTxKz50Tg12pdtjX8CX0njJaKeAs0MLkyTL1cj+Sf89YzNuXLwx5ffpMu //VEe2tbyRzPj2JYzUOrV8E5W1fPZmfCSgMvJEtwmMbMXMb7sIUPMBh3yBcXQQU= =yPnD -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa21.patch" Content-Disposition: attachment; filename="xsa21.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNkZXY6IFJhbmdlIGNoZWNrIHBpcnEgcGFyYW1ldGVyIGZyb20g Z3Vlc3RzCgpPdGhlcndpc2UgWGVuIHdpbGwgcmVhZCBiZXlvbmQgZWl0aGVy IGVuZCBvZiB0aGUgc3RydWN0CmRvbWFpbi5hcmNoLnBpcnFfZW11aXJxIGFy cmF5LCB1c3VhbGx5IHJlc3VsdGluZyBpbiBhIGZhdGFsIHBhZ2UgZmF1bHQu CgpUaGlzIHZ1bG5lcmFiaWxpdHkgd2FzIGludHJvZHVjZWQgYnkgYy9zIDIz MjQxOmQyMTEwMGYxZDAwZSwgd2hpY2ggYWRkcwphIGNhbGwgdG8gZG9tYWlu X3BpcnFfdG9fZW11aXJxKCkgd2hpY2ggdXNlcyB0aGUgZ3Vlc3QgcHJvdmlk ZWQgcGlycQp2YWx1ZSBiZWZvcmUgcmFuZ2UgY2hlY2tpbmcgaXQsIGFuZCB3 YXMgZml4ZWQgYnkgYy9zIDIzNTczOjU4NGMyZTVlMDNkOQp3aGljaCBjaGFu Z2VkIHRoZSBiZWhhdmlvdXIgb2YgdGhlIGRvbWFpbl9waXJxX3RvX2VtdWly cSgpIG1hY3JvIHRvIHVzZQpyYWRpeCB0cmVlcyBpbnN0ZWFkIG9mIGEgZmxh dCBhcnJheS4KClRoaXMgaXMgWFNBLTIxIC8gQ1ZFLTIwMTItNDUzNi4KClNp Z25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNp dHJpeC5jb20+CkFja2VkLWJ5OiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3Vz ZS5jb20+CkFja2VkLWJ5OiBJYW4gQ2FtcGJlbGwgPGlhbi5jYW1wYmVsbEBj aXRyaXguY29tPgoKZGlmZiAtciA3YTQwMWE3M2Q4NmQgeGVuL2FyY2gveDg2 L3BoeXNkZXYuYwotLS0gYS94ZW4vYXJjaC94ODYvcGh5c2Rldi5jCisrKyBi L3hlbi9hcmNoL3g4Ni9waHlzZGV2LmMKQEAgLTIzNCw2ICsyMzQsMTAgQEAg c3RhdGljIGludCBwaHlzZGV2X3VubWFwX3BpcnEoc3RydWN0IHBoeQogICAg IGlmICggcmV0ICkKICAgICAgICAgcmV0dXJuIHJldDsKIAorICAgIHJldCA9 IC1FSU5WQUw7CisgICAgaWYgKCB1bm1hcC0+cGlycSA8IDAgfHwgdW5tYXAt PnBpcnEgPj0gZC0+bnJfcGlycXMgKQorICAgICAgICBnb3RvIGZyZWVfZG9t YWluOworCiAgICAgaWYgKCBpc19odm1fZG9tYWluKGQpICkKICAgICB7CiAg ICAgICAgIHNwaW5fbG9jaygmZC0+ZXZlbnRfbG9jayk7Cg== --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2Q-0001Io-Is; Tue, 13 Nov 2012 12:56:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2P-0001I8-HV; Tue, 13 Nov 2012 12:56:21 +0000 Received: from [85.158.137.99:57042] by server-6.bemta-3.messagelabs.com id A2/CA-28265-47342A05; Tue, 13 Nov 2012 12:56:20 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-11.tower-217.messagelabs.com!1352811378!18030909!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15563 invoked from network); 13 Nov 2012 12:56:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2F-0008U6-4A; Tue, 13 Nov 2012 12:56:11 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2E-0000zH-Ug; Tue, 13 Nov 2012 12:56:10 +0000 Date: Tue, 13 Nov 2012 12:56:10 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 21 (CVE-2012-4536) - pirq range check DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4536 / XSA-21 version 2 pirq range check DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= domain_pirq_to_emuirq() uses the guest provided pirq value before range checking it, and physdev_unmap_pirq uses domain_pirq_to_emuirq without checking the pirq value either. Invalid pirq values can cause Xen to read out of array bounds, usually resulting in a fatal page fault. IMPACT ====== A malicious guest administrator can cause Xen to crash. If the out of array bounds access does not crash, the arbitrary value read will be ignored due to later error checking, so there is no privilege escalation and no exploitable information leak. VULNERABLE SYSTEMS ================== Only Xen version 4.1 is vulnerable. Other released versions, and xen-unstable, are not vulnerable. The vulnerability is only exposed to HVM guests. MITIGATION ========== Running only PV guests, or ensuring that HVM guests only use trusted kernels, will avoid this vulnerability. RESOLUTION ========== The attached patch resolves this issue. $ sha256sum xsa21.patch 34c4bef71d0ad08ee7c337c77af47aa77bb19081a13fc13beaff7d4b37b6b35a xsa21.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGnAAoJEIP+FMlX6CvZ1lQH/jdovmPuphnocdrkWGR8FE3+ OqM3JIpOZTDPFfLO7pen/P5e/0fCBs7cF7FGvM1Uua54/M0HrVS93E1m9baornkh vEIV5c9TRTfUR3IGmVFs1l+ddJcfULOuhfE2IOrbcYaWBL89D9sQYrL/A1j4LTEh umsz6fh4XgINkt/tpneEcE4ckYd0YkkOm3zUK3HaGshNXoOGVyGeaNqKr/YuhEfc XWOkCUoZTxKz50Tg12pdtjX8CX0njJaKeAs0MLkyTL1cj+Sf89YzNuXLwx5ffpMu //VEe2tbyRzPj2JYzUOrV8E5W1fPZmfCSgMvJEtwmMbMXMb7sIUPMBh3yBcXQQU= =yPnD -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa21.patch" Content-Disposition: attachment; filename="xsa21.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNkZXY6IFJhbmdlIGNoZWNrIHBpcnEgcGFyYW1ldGVyIGZyb20g Z3Vlc3RzCgpPdGhlcndpc2UgWGVuIHdpbGwgcmVhZCBiZXlvbmQgZWl0aGVy IGVuZCBvZiB0aGUgc3RydWN0CmRvbWFpbi5hcmNoLnBpcnFfZW11aXJxIGFy cmF5LCB1c3VhbGx5IHJlc3VsdGluZyBpbiBhIGZhdGFsIHBhZ2UgZmF1bHQu CgpUaGlzIHZ1bG5lcmFiaWxpdHkgd2FzIGludHJvZHVjZWQgYnkgYy9zIDIz MjQxOmQyMTEwMGYxZDAwZSwgd2hpY2ggYWRkcwphIGNhbGwgdG8gZG9tYWlu X3BpcnFfdG9fZW11aXJxKCkgd2hpY2ggdXNlcyB0aGUgZ3Vlc3QgcHJvdmlk ZWQgcGlycQp2YWx1ZSBiZWZvcmUgcmFuZ2UgY2hlY2tpbmcgaXQsIGFuZCB3 YXMgZml4ZWQgYnkgYy9zIDIzNTczOjU4NGMyZTVlMDNkOQp3aGljaCBjaGFu Z2VkIHRoZSBiZWhhdmlvdXIgb2YgdGhlIGRvbWFpbl9waXJxX3RvX2VtdWly cSgpIG1hY3JvIHRvIHVzZQpyYWRpeCB0cmVlcyBpbnN0ZWFkIG9mIGEgZmxh dCBhcnJheS4KClRoaXMgaXMgWFNBLTIxIC8gQ1ZFLTIwMTItNDUzNi4KClNp Z25lZC1vZmYtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNp dHJpeC5jb20+CkFja2VkLWJ5OiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3Vz ZS5jb20+CkFja2VkLWJ5OiBJYW4gQ2FtcGJlbGwgPGlhbi5jYW1wYmVsbEBj aXRyaXguY29tPgoKZGlmZiAtciA3YTQwMWE3M2Q4NmQgeGVuL2FyY2gveDg2 L3BoeXNkZXYuYwotLS0gYS94ZW4vYXJjaC94ODYvcGh5c2Rldi5jCisrKyBi L3hlbi9hcmNoL3g4Ni9waHlzZGV2LmMKQEAgLTIzNCw2ICsyMzQsMTAgQEAg c3RhdGljIGludCBwaHlzZGV2X3VubWFwX3BpcnEoc3RydWN0IHBoeQogICAg IGlmICggcmV0ICkKICAgICAgICAgcmV0dXJuIHJldDsKIAorICAgIHJldCA9 IC1FSU5WQUw7CisgICAgaWYgKCB1bm1hcC0+cGlycSA8IDAgfHwgdW5tYXAt PnBpcnEgPj0gZC0+bnJfcGlycXMgKQorICAgICAgICBnb3RvIGZyZWVfZG9t YWluOworCiAgICAgaWYgKCBpc19odm1fZG9tYWluKGQpICkKICAgICB7CiAg ICAgICAgIHNwaW5fbG9jaygmZC0+ZXZlbnRfbG9jayk7Cg== --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2c-0001Mz-0i; Tue, 13 Nov 2012 12:56:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2a-0001LY-AX; Tue, 13 Nov 2012 12:56:32 +0000 Received: from [85.158.137.99:35613] by server-10.bemta-3.messagelabs.com id 7C/58-19806-D7342A05; Tue, 13 Nov 2012 12:56:29 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-2.tower-217.messagelabs.com!1352811387!18804571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6375 invoked from network); 13 Nov 2012 12:56:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2O-0008V2-S8; Tue, 13 Nov 2012 12:56:20 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2O-000103-Oo; Tue, 13 Nov 2012 12:56:20 +0000 Date: Tue, 13 Nov 2012 12:56:20 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 24 (CVE-2012-4539) - Grant table hypercall infinite loop DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4539 / XSA-24 version 2 Grant table hypercall infinite loop DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= Due to inappropriate duplicate use of the same loop control variable, passing bad arguments to GNTTABOP_get_status_frames can cause an infinite loop in the compat hypercall handler. IMPACT ====== A malicious guest administrator can trigger the bug. If the Xen watchdog is enabled, the whole system will crash. Otherwise the guest can cause the system to become completely unresponsive. VULNERABLE SYSTEMS ================== Xen versions 4.0 and onwards are vulnerable. Earlier released Xen versions are not vulnerable. Only 32-bit x86 PV guests, running on 64-bit Xen hypervisors, introduce the vulnerability. MITIGATION ========== Running only 64-bit guests, or (in previous Xen versions) running a 32-bit hypervisor (which supports only 32-bit guests), will avoid this vulnerability. Note however that if in a 64-bit Xen system the guest kernel image file is under the control of the guest administrator, the guest administrator will normally be able to control whether the guest is 32-bit or 64-bit by supplying a different kernel image. Running only HVM guests will avoid this vulnerability. RESOLUTION ========== The attached patch resolves this issue. The same patch is applicable to all affected versions. $ sha256sum xsa24.patch 2963dff4dbc08aab4278215d74c2cce365972f213453bb7c513d097a838de196 xsa24.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGvAAoJEIP+FMlX6CvZ0HAH/jy7Id9Ai1ZJSou6xu6USdQP QyaT6BnWzIA8ziatcnRzq5YHW+Occ4g4+9fU92zHpVsFGF5mAN9/aq83xLHoFHkb TPH/+xNCRz50zfQ21VTejr6jFlfiO6S1y/4bxVYfohtoevijo5tpRo+OYdFZXMM8 psagcYXHgOsUy95pFsPBbwg6bh0S/ffDfZnyK3LZCP3J/Xx82kj7Du/HgKcM9lDx gk/q0VjFM6M/utxyn2gQlFGbX8YFfoytb9WzcrQdcPf4Ubu/jGUykm1BS/+IrXHs C9BtBa6w+k2T6dZgRmseeOjy0PgiEYKrqYhwAG1VC8F+RMLpAmtNGJS3gatwFHE= =IoWx -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa24.patch" Content-Disposition: attachment; filename="xsa24.patch" Content-Transfer-Encoding: base64 Y29tcGF0L2dudHRhYjogUHJldmVudCBpbmZpbml0ZSBsb29wIGluIGNvbXBh dCBjb2RlCgpjL3MgMjAyODE6OTVlYTIwNTJiNDFiLCB3aGljaCBpbnRyb2R1 Y2VzIEdyYW50IFRhYmxlIHZlcnNpb24gMgpoeXBlcmNhbGxzIGludHJvZHVj ZXMgYSB2dWxuZXJhYmlsaXR5IHdoZXJlYnkgdGhlIGNvbXBhdCBoeXBlcmNh bGwKaGFuZGxlciBjYW4gZmFsbCBpbnRvIGFuIGluZmluaXRlIGxvb3AuCgpJ ZiB0aGUgd2F0Y2hkb2cgaXMgZW5hYmxlZCwgWGVuIHdpbGwgZGllIGFmdGVy IHRoZSB0aW1lb3V0LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhT QS0yNCAvIENWRS0yMDEyLTQ1MzkuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcg Q29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTog SmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpBY2tlZC1ieTogSWFu IEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+CgpkaWZmIC1y IGJhYzg4M2NmODA1YSB4ZW4vY29tbW9uL2NvbXBhdC9ncmFudF90YWJsZS5j Ci0tLSBhL3hlbi9jb21tb24vY29tcGF0L2dyYW50X3RhYmxlLmMKKysrIGIv eGVuL2NvbW1vbi9jb21wYXQvZ3JhbnRfdGFibGUuYwpAQCAtMzE4LDYgKzMx OCw4IEBAIGludCBjb21wYXRfZ3JhbnRfdGFibGVfb3AodW5zaWduZWQgaW50 IGMKICN1bmRlZiBYTEFUX2dudHRhYl9nZXRfc3RhdHVzX2ZyYW1lc19ITkRM X2ZyYW1lX2xpc3QKICAgICAgICAgICAgICAgICBpZiAoIHVubGlrZWx5KF9f Y29weV90b19ndWVzdChjbXBfdW9wLCAmY21wLmdldF9zdGF0dXMsIDEpKSAp CiAgICAgICAgICAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKKyAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGkgPSAxOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:44 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2c-0001Mz-0i; Tue, 13 Nov 2012 12:56:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2a-0001LY-AX; Tue, 13 Nov 2012 12:56:32 +0000 Received: from [85.158.137.99:35613] by server-10.bemta-3.messagelabs.com id 7C/58-19806-D7342A05; Tue, 13 Nov 2012 12:56:29 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-2.tower-217.messagelabs.com!1352811387!18804571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6375 invoked from network); 13 Nov 2012 12:56:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-217.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2O-0008V2-S8; Tue, 13 Nov 2012 12:56:20 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2O-000103-Oo; Tue, 13 Nov 2012 12:56:20 +0000 Date: Tue, 13 Nov 2012 12:56:20 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 24 (CVE-2012-4539) - Grant table hypercall infinite loop DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4539 / XSA-24 version 2 Grant table hypercall infinite loop DoS vulnerability UPDATES IN VERSION 2 ==================== Public release. ISSUE DESCRIPTION ================= Due to inappropriate duplicate use of the same loop control variable, passing bad arguments to GNTTABOP_get_status_frames can cause an infinite loop in the compat hypercall handler. IMPACT ====== A malicious guest administrator can trigger the bug. If the Xen watchdog is enabled, the whole system will crash. Otherwise the guest can cause the system to become completely unresponsive. VULNERABLE SYSTEMS ================== Xen versions 4.0 and onwards are vulnerable. Earlier released Xen versions are not vulnerable. Only 32-bit x86 PV guests, running on 64-bit Xen hypervisors, introduce the vulnerability. MITIGATION ========== Running only 64-bit guests, or (in previous Xen versions) running a 32-bit hypervisor (which supports only 32-bit guests), will avoid this vulnerability. Note however that if in a 64-bit Xen system the guest kernel image file is under the control of the guest administrator, the guest administrator will normally be able to control whether the guest is 32-bit or 64-bit by supplying a different kernel image. Running only HVM guests will avoid this vulnerability. RESOLUTION ========== The attached patch resolves this issue. The same patch is applicable to all affected versions. $ sha256sum xsa24.patch 2963dff4dbc08aab4278215d74c2cce365972f213453bb7c513d097a838de196 xsa24.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGvAAoJEIP+FMlX6CvZ0HAH/jy7Id9Ai1ZJSou6xu6USdQP QyaT6BnWzIA8ziatcnRzq5YHW+Occ4g4+9fU92zHpVsFGF5mAN9/aq83xLHoFHkb TPH/+xNCRz50zfQ21VTejr6jFlfiO6S1y/4bxVYfohtoevijo5tpRo+OYdFZXMM8 psagcYXHgOsUy95pFsPBbwg6bh0S/ffDfZnyK3LZCP3J/Xx82kj7Du/HgKcM9lDx gk/q0VjFM6M/utxyn2gQlFGbX8YFfoytb9WzcrQdcPf4Ubu/jGUykm1BS/+IrXHs C9BtBa6w+k2T6dZgRmseeOjy0PgiEYKrqYhwAG1VC8F+RMLpAmtNGJS3gatwFHE= =IoWx -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa24.patch" Content-Disposition: attachment; filename="xsa24.patch" Content-Transfer-Encoding: base64 Y29tcGF0L2dudHRhYjogUHJldmVudCBpbmZpbml0ZSBsb29wIGluIGNvbXBh dCBjb2RlCgpjL3MgMjAyODE6OTVlYTIwNTJiNDFiLCB3aGljaCBpbnRyb2R1 Y2VzIEdyYW50IFRhYmxlIHZlcnNpb24gMgpoeXBlcmNhbGxzIGludHJvZHVj ZXMgYSB2dWxuZXJhYmlsaXR5IHdoZXJlYnkgdGhlIGNvbXBhdCBoeXBlcmNh bGwKaGFuZGxlciBjYW4gZmFsbCBpbnRvIGFuIGluZmluaXRlIGxvb3AuCgpJ ZiB0aGUgd2F0Y2hkb2cgaXMgZW5hYmxlZCwgWGVuIHdpbGwgZGllIGFmdGVy IHRoZSB0aW1lb3V0LgoKVGhpcyBpcyBhIHNlY3VyaXR5IHByb2JsZW0sIFhT QS0yNCAvIENWRS0yMDEyLTQ1MzkuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcg Q29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpBY2tlZC1ieTog SmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpBY2tlZC1ieTogSWFu IEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+CgpkaWZmIC1y IGJhYzg4M2NmODA1YSB4ZW4vY29tbW9uL2NvbXBhdC9ncmFudF90YWJsZS5j Ci0tLSBhL3hlbi9jb21tb24vY29tcGF0L2dyYW50X3RhYmxlLmMKKysrIGIv eGVuL2NvbW1vbi9jb21wYXQvZ3JhbnRfdGFibGUuYwpAQCAtMzE4LDYgKzMx OCw4IEBAIGludCBjb21wYXRfZ3JhbnRfdGFibGVfb3AodW5zaWduZWQgaW50 IGMKICN1bmRlZiBYTEFUX2dudHRhYl9nZXRfc3RhdHVzX2ZyYW1lc19ITkRM X2ZyYW1lX2xpc3QKICAgICAgICAgICAgICAgICBpZiAoIHVubGlrZWx5KF9f Y29weV90b19ndWVzdChjbXBfdW9wLCAmY21wLmdldF9zdGF0dXMsIDEpKSAp CiAgICAgICAgICAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKKyAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGkgPSAxOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2f-0001Pl-Ho; Tue, 13 Nov 2012 12:56:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2d-0001NS-S4; Tue, 13 Nov 2012 12:56:36 +0000 Received: from [85.158.138.51:17606] by server-3.bemta-3.messagelabs.com id F8/84-31566-28342A05; Tue, 13 Nov 2012 12:56:34 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1352811391!21808416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30348 invoked from network); 13 Nov 2012 12:56:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2R-0008VH-9g; Tue, 13 Nov 2012 12:56:23 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2R-00010J-89; Tue, 13 Nov 2012 12:56:23 +0000 Date: Tue, 13 Nov 2012 12:56:23 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 25 (CVE-2012-4544, CVE-2012-2625) - Xen domain builder Out-of-memory due to malicious kernel/ramdisk X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4544,CVE-2012-2625 / XSA-25 version 2 Xen domain builder Out-of-memory due to malicious kernel/ramdisk UPDATES IN VERSION 2 ==================== Clarify that XSA-25 is reporting, via the Xen.org security process, both CVE-2012-4544 and CVE-2012-2625. Also we would like to apologise for the fact that xen-announce's copy of version 1 of this advisory was delayed in mailing list moderation. ISSUE DESCRIPTION ================= The Xen PV domain builder contained no validation of the size of the supplied kernel or ramdisk either before or after decompression. This could cause the toolstack to consume all available RAM in the domain running the domain builder. (CVE-2012-4544) Additionally, under similar circumstances pygrub consume excessive amount of memory under similar circumstances to the above. (CVE-2012-2625) IMPACT ====== A malicious guest administrator who can supply a kernel or ramdisk can exhaust memory in domain 0 leading to a denial of service attack. VULNERABLE SYSTEMS ================== All versions of Xen are vulnerable. MITIGATION ========== Running only trusted kernels and ramdisks will avoid these vulnerabilities. Using pvgrub also avoids these vulnerabilities since the builder will run in guest context. (nb: use of pygrub *is* vulnerable). Running only HVM guests will avoid these vulnerabilities. RESOLUTION ========== Applying the appropriate attached patch resolves these issues. The pygrub problem (CVE-2012-2625) was fixed in xen-unstable (and the fix inherited by Xen 4.2.x) in revision 25589:60f09d1ab1fe but not called out as a security problem. This fix is also included, where necessary, in the patches below. xsa25-unstable.patch Xen unstable xsa25-4.2.patch Xen 4.2.x xsa25-4.1.patch Xen 4.1.x $ sha256sum xsa25*.patch 613e4b82cdc9cabf9cbd52076118887b298c47e680c2066a28a77f12e9f90606 xsa25-4.1.patch 135bc089d003f9b97991764c37b1ab8d37e9cbcfa1b9bd7429b4503abe00c8f5 xsa25-4.2.patch 534495b7eef6e599f5814f0a67fc84fbe2e8eee9d223a09ad178ff63bdcda3dd xsa25-unstable.patch Note that these patches impose a new size limit of 1Gby on both the compressed and uncompressed sizes of ramdisks. On some systems it may be desirable to relax these limits and risk virtual address or memory exhaustion in the toolstack. This can be achieved by setting XC_DOM_DECOMPRESS_MAX to the desired limit (in bytes). This can be done by building with "APPEND_CFLAGS=-DXC_DOM_DECOMPRESS_MAX=" or by editing tools/libxc/xc_dom.h directly. NOTE REGARDING LACK OF EMBARGO ============================== These issues have already been discussed in public in various places, including https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-2625 and http://bugs.debian.org/688125. This advisory is therefore not subject to an embargo. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGyAAoJEIP+FMlX6CvZl7wH/RdoQHGDcbgVEh5fuS5VzPpw RZ0sm6bpI7eclqaN6+thX9SA5qeycvyj2zq769yUGSiHR+BUNw6HRJZ+XAAF0IIx nb4VEdS2+Hz1kyTUAeZu3z/5HyfFamKY9Lhhj/47DBTtO5Xl1pjOCA0bC4ZDtIm1 ffFVhOmTcmQEWXW1z27Vj9hSgQeGsqHTcOys6H0nYpLITDIZqBkGv8MZl4X0/Wtl zs2prG8HEWsysKel5Q/dt7De84OV3LgP1/2a+aMkLi+RgKWP+naKAXfYqVAS4mLw K+mv2MrmhgNxzEWp/sZX0q1QNvnJf+xKYHOBcP+hUlQIQwD/NQejdAdmNVPem7s= =Pfj+ -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa25-4.1.patch" Content-Disposition: attachment; filename="xsa25-4.1.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpbIEluY2x1ZGVzIDI1 NTg5OjYwZjA5ZDFhYjFmZSBmb3IgQ1ZFLTIwMTItMjYyNSBdCgpkaWZmIC0t Z2l0IGEvc3R1YmRvbS9ncnViL2tleGVjLmMgYi9zdHViZG9tL2dydWIva2V4 ZWMuYwppbmRleCAwNmJlZjUyLi5iMjFjOTFhIDEwMDY0NAotLS0gYS9zdHVi ZG9tL2dydWIva2V4ZWMuYworKysgYi9zdHViZG9tL2dydWIva2V4ZWMuYwpA QCAtMTM3LDYgKzEzNywxMCBAQCB2b2lkIGtleGVjKHZvaWQgKmtlcm5lbCwg bG9uZyBrZXJuZWxfc2l6ZSwgdm9pZCAqbW9kdWxlLCBsb25nIG1vZHVsZV9z aXplLCBjaGFyCiAgICAgZG9tID0geGNfZG9tX2FsbG9jYXRlKHhjX2hhbmRs ZSwgY21kbGluZSwgZmVhdHVyZXMpOwogICAgIGRvbS0+YWxsb2NhdGUgPSBr ZXhlY19hbGxvY2F0ZTsKIAorICAgIC8qIFdlIGFyZSB1c2luZyBndWVzdCBv d25lZCBtZW1vcnksIHRoZXJlZm9yZSBubyBsaW1pdHMuICovCisgICAgeGNf ZG9tX2tlcm5lbF9tYXhfc2l6ZShkb20sIDApOworICAgIHhjX2RvbV9yYW1k aXNrX21heF9zaXplKGRvbSwgMCk7CisKICAgICBkb20tPmtlcm5lbF9ibG9i ID0ga2VybmVsOwogICAgIGRvbS0+a2VybmVsX3NpemUgPSBrZXJuZWxfc2l6 ZTsKIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tLmggYi90b29s cy9saWJ4Yy94Y19kb20uaAppbmRleCBlNzJmMDY2Li43MDQzZjk2IDEwMDY0 NAotLS0gYS90b29scy9saWJ4Yy94Y19kb20uaAorKysgYi90b29scy9saWJ4 Yy94Y19kb20uaApAQCAtNTIsNiArNTIsOSBAQCBzdHJ1Y3QgeGNfZG9tX2lt YWdlIHsKICAgICB2b2lkICpyYW1kaXNrX2Jsb2I7CiAgICAgc2l6ZV90IHJh bWRpc2tfc2l6ZTsKIAorICAgIHNpemVfdCBtYXhfa2VybmVsX3NpemU7Cisg ICAgc2l6ZV90IG1heF9yYW1kaXNrX3NpemU7CisKICAgICAvKiBhcmd1bWVu dHMgYW5kIHBhcmFtZXRlcnMgKi8KICAgICBjaGFyICpjbWRsaW5lOwogICAg IHVpbnQzMl90IGZfcmVxdWVzdGVkW1hFTkZFQVRfTlJfU1VCTUFQU107CkBA IC0xNzUsNiArMTc4LDIzIEBAIHZvaWQgeGNfZG9tX3JlbGVhc2VfcGh5cyhz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pOwogdm9pZCB4Y19kb21fcmVsZWFz ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pOwogaW50IHhjX2RvbV9tZW1f aW5pdChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHVuc2lnbmVkIGludCBt ZW1fbWIpOwogCisvKiBTZXQgdGhpcyBsYXJnZXIgaWYgeW91IGhhdmUgZW5v cm1vdXMgcmFtZGlza3Mva2VybmVscy4gTm90ZSB0aGF0CisgKiB5b3Ugc2hv dWxkIHRydXN0IGFsbCBrZXJuZWxzIG5vdCB0byBiZSBtYWxpY2lvdXNseSBs YXJnZSAoZS5nLiB0bworICogZXhoYXVzdCBhbGwgZG9tMCBtZW1vcnkpIGlm IHlvdSBkbyB0aGlzIChzZWUgQ1ZFLTIwMTItNDU0NCAvCisgKiBYU0EtMjUp LiBZb3UgY2FuIGFsc28gc2V0IHRoZSBkZWZhdWx0IGluZGVwZW5kZW50bHkg Zm9yCisgKiByYW1kaXNrcy9rZXJuZWxzIGluIHhjX2RvbV9hbGxvY2F0ZSgp IG9yIGNhbGwKKyAqIHhjX2RvbV97a2VybmVsLHJhbWRpc2t9X21heF9zaXpl LgorICovCisjaWZuZGVmIFhDX0RPTV9ERUNPTVBSRVNTX01BWAorI2RlZmlu ZSBYQ19ET01fREVDT01QUkVTU19NQVggKDEwMjQqMTAyNCoxMDI0KSAvKiAx R0IgKi8KKyNlbmRpZgorCitpbnQgeGNfZG9tX2tlcm5lbF9jaGVja19zaXpl KHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KTsKK2ludCB4 Y19kb21fa2VybmVsX21heF9zaXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRv bSwgc2l6ZV90IHN6KTsKKworaW50IHhjX2RvbV9yYW1kaXNrX2NoZWNrX3Np emUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworaW50 IHhjX2RvbV9yYW1kaXNrX21heF9zaXplKHN0cnVjdCB4Y19kb21faW1hZ2Ug KmRvbSwgc2l6ZV90IHN6KTsKKwogc2l6ZV90IHhjX2RvbV9jaGVja19nemlw KHhjX2ludGVyZmFjZSAqeGNoLAogICAgICAgICAgICAgICAgICAgICAgdm9p ZCAqYmxvYiwgc2l6ZV90IHppcGxlbik7CiBpbnQgeGNfZG9tX2RvX2d1bnpp cCh4Y19pbnRlcmZhY2UgKnhjaCwKQEAgLTIyNCw3ICsyNDQsOCBAQCB2b2lk IHhjX2RvbV9sb2dfbWVtb3J5X2Zvb3RwcmludChzdHJ1Y3QgeGNfZG9tX2lt YWdlICpkb20pOwogdm9pZCAqeGNfZG9tX21hbGxvYyhzdHJ1Y3QgeGNfZG9t X2ltYWdlICpkb20sIHNpemVfdCBzaXplKTsKIHZvaWQgKnhjX2RvbV9tYWxs b2NfcGFnZV9hbGlnbmVkKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHNpemUpOwogdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBjaGFyICpmaWxlbmFtZSwgc2l6ZV90ICogc2l6ZSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5h bWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKTsKIGNoYXIgKnhjX2RvbV9zdHJk dXAoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpzdHIp OwogCiAvKiAtLS0gYWxsb2MgbWVtb3J5IHBvb2wgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwpkaWZmIC0tZ2l0IGEv dG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYyBiL3Rvb2xzL2xp YnhjL3hjX2RvbV9iemltYWdlbG9hZGVyLmMKaW5kZXggOTg1MmU2Ny4uNzNj ZmFkMSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vs b2FkZXIuYworKysgYi90b29scy9saWJ4Yy94Y19kb21fYnppbWFnZWxvYWRl ci5jCkBAIC00NywxMyArNDcsMTkgQEAgc3RhdGljIGludCB4Y190cnlfYnpp cDJfZGVjb2RlKAogICAgIGNoYXIgKm91dF9idWY7CiAgICAgY2hhciAqdG1w X2J1ZjsKICAgICBpbnQgcmV0dmFsID0gLTE7Ci0gICAgaW50IG91dHNpemU7 CisgICAgdW5zaWduZWQgaW50IG91dHNpemU7CiAgICAgdWludDY0X3QgdG90 YWw7CiAKICAgICBzdHJlYW0uYnphbGxvYyA9IE5VTEw7CiAgICAgc3RyZWFt LmJ6ZnJlZSA9IE5VTEw7CiAgICAgc3RyZWFtLm9wYXF1ZSA9IE5VTEw7CiAK KyAgICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAgICB7CisgICAg ICAgIERPTVBSSU5URigiQlpJUDI6IElucHV0IGlzIDAgc2l6ZSIpOworICAg ICAgICByZXR1cm4gLTE7CisgICAgfQorCiAgICAgcmV0ID0gQloyX2J6RGVj b21wcmVzc0luaXQoJnN0cmVhbSwgMCwgMCk7CiAgICAgaWYgKCByZXQgIT0g QlpfT0sgKQogICAgIHsKQEAgLTY2LDYgKzcyLDE3IEBAIHN0YXRpYyBpbnQg eGNfdHJ5X2J6aXAyX2RlY29kZSgKICAgICAgKiB0aGUgaW5wdXQgYnVmZmVy IHRvIHN0YXJ0LCBhbmQgd2UnbGwgcmVhbGxvYyBhcyBuZWVkZWQuCiAgICAg ICovCiAgICAgb3V0c2l6ZSA9IGRvbS0+a2VybmVsX3NpemU7CisKKyAgICAv KgorICAgICAqIHN0cmVhbS5hdmFpbF9pbiBhbmQgb3V0c2l6ZSBhcmUgdW5z aWduZWQgaW50LCB3aGlsZSBrZXJuZWxfc2l6ZQorICAgICAqIGlzIGEgc2l6 ZV90LiBDaGVjayB3ZSBhcmVuJ3Qgb3ZlcmZsb3dpbmcuCisgICAgICovCisg ICAgaWYgKCBvdXRzaXplICE9IGRvbS0+a2VybmVsX3NpemUgKQorICAgIHsK KyAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogSW5wdXQgdG9vIGxhcmdlIik7 CisgICAgICAgIGdvdG8gYnppcDJfY2xlYW51cDsKKyAgICB9CisKICAgICBv dXRfYnVmID0gbWFsbG9jKG91dHNpemUpOwogICAgIGlmICggb3V0X2J1ZiA9 PSBOVUxMICkKICAgICB7CkBAIC05OCwxMyArMTE1LDIwIEBAIHN0YXRpYyBp bnQgeGNfdHJ5X2J6aXAyX2RlY29kZSgKICAgICAgICAgaWYgKCBzdHJlYW0u YXZhaWxfb3V0ID09IDAgKQogICAgICAgICB7CiAgICAgICAgICAgICAvKiBQ cm90ZWN0IGFnYWluc3Qgb3V0cHV0IGJ1ZmZlciBvdmVyZmxvdyAqLwotICAg ICAgICAgICAgaWYgKCBvdXRzaXplID4gSU5UX01BWCAvIDIgKQorICAgICAg ICAgICAgaWYgKCBvdXRzaXplID4gVUlOVF9NQVggLyAyICkKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICBET01QUklOVEYoIkJaSVAyOiBvdXRw dXQgYnVmZmVyIG92ZXJmbG93Iik7CiAgICAgICAgICAgICAgICAgZnJlZShv dXRfYnVmKTsKICAgICAgICAgICAgICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7 CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIGlmICggeGNfZG9tX2tl cm5lbF9jaGVja19zaXplKGRvbSwgb3V0c2l6ZSAqIDIpICkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBET01QUklOVEYoIkJaSVAyOiBvdXRw dXQgdG9vIGxhcmdlIik7CisgICAgICAgICAgICAgICAgZnJlZShvdXRfYnVm KTsKKyAgICAgICAgICAgICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91 dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAgIGlmICggdG1wX2J1 ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTE3Miw5ICsxOTYsMTUg QEAgc3RhdGljIGludCB4Y190cnlfbHptYV9kZWNvZGUoCiAgICAgdW5zaWdu ZWQgY2hhciAqb3V0X2J1ZjsKICAgICB1bnNpZ25lZCBjaGFyICp0bXBfYnVm OwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBpbnQgb3V0c2l6ZTsKKyAg ICBzaXplX3Qgb3V0c2l6ZTsKICAgICBjb25zdCBjaGFyICptc2c7CiAKKyAg ICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAgICB7CisgICAgICAg IERPTVBSSU5URigiTFpNQTogSW5wdXQgaXMgMCBzaXplIik7CisgICAgICAg IHJldHVybiAtMTsKKyAgICB9CisKICAgICByZXQgPSBsem1hX2Fsb25lX2Rl Y29kZXIoJnN0cmVhbSwgMTI4KjEwMjQqMTAyNCk7CiAgICAgaWYgKCByZXQg IT0gTFpNQV9PSyApCiAgICAgewpAQCAtMjUxLDEzICsyODEsMjAgQEAgc3Rh dGljIGludCB4Y190cnlfbHptYV9kZWNvZGUoCiAgICAgICAgIGlmICggc3Ry ZWFtLmF2YWlsX291dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAg LyogUHJvdGVjdCBhZ2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8K LSAgICAgICAgICAgIGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAg ICAgICAgICAgIGlmICggb3V0c2l6ZSA+IFNJWkVfTUFYIC8gMiApCiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJMWk1BOiBv dXRwdXQgYnVmZmVyIG92ZXJmbG93Iik7CiAgICAgICAgICAgICAgICAgZnJl ZShvdXRfYnVmKTsKICAgICAgICAgICAgICAgICBnb3RvIGx6bWFfY2xlYW51 cDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYgKCB4Y19kb21f a2VybmVsX2NoZWNrX3NpemUoZG9tLCBvdXRzaXplICogMikgKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIERPTVBSSU5URigiTFpNQTogb3V0 cHV0IHRvbyBsYXJnZSIpOworICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CisgICAgICAgICAgICAgICAgZ290byBsem1hX2NsZWFudXA7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91 dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAgIGlmICggdG1wX2J1 ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTMyNyw2ICszNjQsMTIg QEAgc3RhdGljIGludCB4Y190cnlfbHpvMXhfZGVjb2RlKAogICAgICAgICAw eDg5LCAweDRjLCAweDVhLCAweDRmLCAweDAwLCAweDBkLCAweDBhLCAweDFh LCAweDBhCiAgICAgfTsKIAorICAgIC8qCisgICAgICogbHpvX3VpbnQgc2hv dWxkIG1hdGNoIHNpemVfdC4gQ2hlY2sgdGhhdCB0aGlzIGlzIHRoZSBjYXNl IHRvIGJlCisgICAgICogc3VyZSB3ZSB3b24ndCBvdmVyZmxvdyB2YXJpb3Vz IGx6b191aW50IGZpZWxkcy4KKyAgICAgKi8KKyAgICBYQ19CVUlMRF9CVUdf T04oc2l6ZW9mKGx6b191aW50KSAhPSBzaXplb2Yoc2l6ZV90KSk7CisKICAg ICByZXQgPSBsem9faW5pdCgpOwogICAgIGlmICggcmV0ICE9IExaT19FX09L ICkKICAgICB7CkBAIC00MDYsNiArNDQ5LDE0IEBAIHN0YXRpYyBpbnQgeGNf dHJ5X2x6bzF4X2RlY29kZSgKICAgICAgICAgaWYgKCBzcmNfbGVuIDw9IDAg fHwgc3JjX2xlbiA+IGRzdF9sZW4gfHwgc3JjX2xlbiA+IGxlZnQgKQogICAg ICAgICAgICAgYnJlYWs7CiAKKyAgICAgICAgbXNnID0gIk91dHB1dCBidWZm ZXIgb3ZlcmZsb3ciOworICAgICAgICBpZiAoICpzaXplID4gU0laRV9NQVgg LSBkc3RfbGVuICkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIG1z ZyA9ICJEZWNvbXByZXNzZWQgaW1hZ2UgdG9vIGxhcmdlIjsKKyAgICAgICAg aWYgKCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9tLCAqc2l6ZSArIGRz dF9sZW4pICkKKyAgICAgICAgICAgIGJyZWFrOworCiAgICAgICAgIG1zZyA9 ICJGYWlsZWQgdG8gKHJlKWFsbG9jIG1lbW9yeSI7CiAgICAgICAgIHRtcF9i dWYgPSByZWFsbG9jKG91dF9idWYsICpzaXplICsgZHN0X2xlbik7CiAgICAg ICAgIGlmICggdG1wX2J1ZiA9PSBOVUxMICkKZGlmZiAtLWdpdCBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9jb3JlLmMgYi90b29scy9saWJ4Yy94Y19kb21fY29y ZS5jCmluZGV4IGZlYTlkZTUuLjJhMDFkN2MgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9jb3JlLmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9t X2NvcmUuYwpAQCAtMTU5LDcgKzE1OSw4IEBAIHZvaWQgKnhjX2RvbV9tYWxs b2NfcGFnZV9hbGlnbmVkKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHNpemUpCiB9CiAKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmls ZW5hbWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKQogewogICAgIHN0cnVjdCB4 Y19kb21fbWVtICpibG9jayA9IE5VTEw7CiAgICAgaW50IGZkID0gLTE7CkBA IC0xNzEsNiArMTcyLDEzIEBAIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1h cChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCiAgICAgbHNlZWsoZmQsIDAs IFNFRUtfU0VUKTsKICAgICAqc2l6ZSA9IGxzZWVrKGZkLCAwLCBTRUVLX0VO RCk7CiAKKyAgICBpZiAoIG1heF9zaXplICYmICpzaXplID4gbWF4X3NpemUg KQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNoLCBYQ19P VVRfT0ZfTUVNT1JZLAorICAgICAgICAgICAgICAgICAgICAgInRyaWVkIHRv IG1hcCBmaWxlIHdoaWNoIGlzIHRvbyBsYXJnZSIpOworICAgICAgICBnb3Rv IGVycjsKKyAgICB9CisKICAgICBibG9jayA9IG1hbGxvYyhzaXplb2YoKmJs b2NrKSk7CiAgICAgaWYgKCBibG9jayA9PSBOVUxMICkKICAgICAgICAgZ290 byBlcnI7CkBAIC0yMjIsNiArMjMwLDQwIEBAIGNoYXIgKnhjX2RvbV9zdHJk dXAoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpzdHIp CiB9CiAKIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLworLyog ZGVjb21wcmVzc2lvbiBidWZmZXIgc2l6aW5nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCitpbnQgeGNfZG9tX2tl cm5lbF9jaGVja19zaXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHN6KQoreworICAgIC8qIE5vIGxpbWl0ICovCisgICAgaWYgKCAhZG9t LT5tYXhfa2VybmVsX3NpemUgKQorICAgICAgICByZXR1cm4gMDsKKworICAg IGlmICggc3ogPiBkb20tPm1heF9rZXJuZWxfc2l6ZSApCisgICAgeworICAg ICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfS0VSTkVM LAorICAgICAgICAgICAgICAgICAgICAgImtlcm5lbCBpbWFnZSB0b28gbGFy Z2UiKTsKKyAgICAgICAgcmV0dXJuIDE7CisgICAgfQorCisgICAgcmV0dXJu IDA7Cit9CisKK2ludCB4Y19kb21fcmFtZGlza19jaGVja19zaXplKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQoreworICAgIC8qIE5v IGxpbWl0ICovCisgICAgaWYgKCAhZG9tLT5tYXhfcmFtZGlza19zaXplICkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIHN6ID4gZG9tLT5tYXhf cmFtZGlza19zaXplICkKKyAgICB7CisgICAgICAgIHhjX2RvbV9wYW5pYyhk b20tPnhjaCwgWENfSU5WQUxJRF9LRVJORUwsCisgICAgICAgICAgICAgICAg ICAgICAicmFtZGlzayBpbWFnZSB0b28gbGFyZ2UiKTsKKyAgICAgICAgcmV0 dXJuIDE7CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKKy8qIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwogLyogcmVhZCBmaWxlcywgY29w eSBtZW1vcnkgYmxvY2tzLCB3aXRoIHRyYW5zcGFyZW50IGd1bnppcCAgICAg ICAgICAgICAgICAgICovCiAKIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4 Y19pbnRlcmZhY2UgKnhjaCwgdm9pZCAqYmxvYiwgc2l6ZV90IHppcGxlbikK QEAgLTIzNSw3ICsyNzcsNyBAQCBzaXplX3QgeGNfZG9tX2NoZWNrX2d6aXAo eGNfaW50ZXJmYWNlICp4Y2gsIHZvaWQgKmJsb2IsIHNpemVfdCB6aXBsZW4p CiAKICAgICBnemxlbiA9IGJsb2IgKyB6aXBsZW4gLSA0OwogICAgIHVuemlw bGVuID0gZ3psZW5bM10gPDwgMjQgfCBnemxlblsyXSA8PCAxNiB8IGd6bGVu WzFdIDw8IDggfCBnemxlblswXTsKLSAgICBpZiAoICh1bnppcGxlbiA8IDAp IHx8ICh1bnppcGxlbiA+ICgxMDI0KjEwMjQqMTAyNCkpICkgLyogMUdCIGxp bWl0ICovCisgICAgaWYgKCAodW56aXBsZW4gPCAwKSB8fCAodW56aXBsZW4g PiBYQ19ET01fREVDT01QUkVTU19NQVgpICkKICAgICB7CiAgICAgICAgIHhj X2RvbV9wcmludGYKICAgICAgICAgICAgICh4Y2gsCkBAIC0yODgsNiArMzMw LDkgQEAgaW50IHhjX2RvbV90cnlfZ3VuemlwKHN0cnVjdCB4Y19kb21faW1h Z2UgKmRvbSwgdm9pZCAqKmJsb2IsIHNpemVfdCAqIHNpemUpCiAgICAgaWYg KCB1bnppcGxlbiA9PSAwICkKICAgICAgICAgcmV0dXJuIDA7CiAKKyAgICBp ZiAoIHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sIHVuemlwbGVuKSAp CisgICAgICAgIHJldHVybiAwOworCiAgICAgdW56aXAgPSB4Y19kb21fbWFs bG9jKGRvbSwgdW56aXBsZW4pOwogICAgIGlmICggdW56aXAgPT0gTlVMTCAp CiAgICAgICAgIHJldHVybiAtMTsKQEAgLTU4OCw2ICs2MzMsOSBAQCBzdHJ1 Y3QgeGNfZG9tX2ltYWdlICp4Y19kb21fYWxsb2NhdGUoeGNfaW50ZXJmYWNl ICp4Y2gsCiAgICAgbWVtc2V0KGRvbSwgMCwgc2l6ZW9mKCpkb20pKTsKICAg ICBkb20tPnhjaCA9IHhjaDsKIAorICAgIGRvbS0+bWF4X2tlcm5lbF9zaXpl ID0gWENfRE9NX0RFQ09NUFJFU1NfTUFYOworICAgIGRvbS0+bWF4X3JhbWRp c2tfc2l6ZSA9IFhDX0RPTV9ERUNPTVBSRVNTX01BWDsKKwogICAgIGlmICgg Y21kbGluZSApCiAgICAgICAgIGRvbS0+Y21kbGluZSA9IHhjX2RvbV9zdHJk dXAoZG9tLCBjbWRsaW5lKTsKICAgICBpZiAoIGZlYXR1cmVzICkKQEAgLTYw OCwxMCArNjU2LDI1IEBAIHN0cnVjdCB4Y19kb21faW1hZ2UgKnhjX2RvbV9h bGxvY2F0ZSh4Y19pbnRlcmZhY2UgKnhjaCwKICAgICByZXR1cm4gTlVMTDsK IH0KIAoraW50IHhjX2RvbV9rZXJuZWxfbWF4X3NpemUoc3RydWN0IHhjX2Rv bV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opCit7CisgICAgRE9NUFJJTlRGKCIl czoga2VybmVsX21heF9zaXplPSV6eCIsIF9fRlVOQ1RJT05fXywgc3opOwor ICAgIGRvbS0+bWF4X2tlcm5lbF9zaXplID0gc3o7CisgICAgcmV0dXJuIDA7 Cit9CisKK2ludCB4Y19kb21fcmFtZGlza19tYXhfc2l6ZShzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICBET01QUklOVEYo IiVzOiByYW1kaXNrX21heF9zaXplPSV6eCIsIF9fRlVOQ1RJT05fXywgc3op OworICAgIGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSA9IHN6OworICAgIHJldHVy biAwOworfQorCiBpbnQgeGNfZG9tX2tlcm5lbF9maWxlKHN0cnVjdCB4Y19k b21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqZmlsZW5hbWUpCiB7CiAgICAg RE9NUFJJTlRGKCIlczogZmlsZW5hbWU9XCIlc1wiIiwgX19GVU5DVElPTl9f LCBmaWxlbmFtZSk7Ci0gICAgZG9tLT5rZXJuZWxfYmxvYiA9IHhjX2RvbV9t YWxsb2NfZmlsZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5rZXJuZWxfc2l6 ZSk7CisgICAgZG9tLT5rZXJuZWxfYmxvYiA9IHhjX2RvbV9tYWxsb2NfZmls ZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5rZXJuZWxfc2l6ZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbS0+ bWF4X2tlcm5lbF9zaXplKTsKICAgICBpZiAoIGRvbS0+a2VybmVsX2Jsb2Ig PT0gTlVMTCApCiAgICAgICAgIHJldHVybiAtMTsKICAgICByZXR1cm4geGNf ZG9tX3RyeV9ndW56aXAoZG9tLCAmZG9tLT5rZXJuZWxfYmxvYiwgJmRvbS0+ a2VybmVsX3NpemUpOwpAQCAtNjIxLDcgKzY4NCw5IEBAIGludCB4Y19kb21f cmFtZGlza19maWxlKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3Qg Y2hhciAqZmlsZW5hbWUpCiB7CiAgICAgRE9NUFJJTlRGKCIlczogZmlsZW5h bWU9XCIlc1wiIiwgX19GVU5DVElPTl9fLCBmaWxlbmFtZSk7CiAgICAgZG9t LT5yYW1kaXNrX2Jsb2IgPQotICAgICAgICB4Y19kb21fbWFsbG9jX2ZpbGVt YXAoZG9tLCBmaWxlbmFtZSwgJmRvbS0+cmFtZGlza19zaXplKTsKKyAgICAg ICAgeGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20t PnJhbWRpc2tfc2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSk7CisKICAgICBpZiAoIGRvbS0+cmFt ZGlza19ibG9iID09IE5VTEwgKQogICAgICAgICByZXR1cm4gLTE7CiAvLyAg ICByZXR1cm4geGNfZG9tX3RyeV9ndW56aXAoZG9tLCAmZG9tLT5yYW1kaXNr X2Jsb2IsICZkb20tPnJhbWRpc2tfc2l6ZSk7CkBAIC03ODEsNyArODQ2LDEx IEBAIGludCB4Y19kb21fYnVpbGRfaW1hZ2Uoc3RydWN0IHhjX2RvbV9pbWFn ZSAqZG9tKQogICAgICAgICB2b2lkICpyYW1kaXNrbWFwOwogCiAgICAgICAg IHVuemlwbGVuID0geGNfZG9tX2NoZWNrX2d6aXAoZG9tLT54Y2gsIGRvbS0+ cmFtZGlza19ibG9iLCBkb20tPnJhbWRpc2tfc2l6ZSk7CisgICAgICAgIGlm ICggeGNfZG9tX3JhbWRpc2tfY2hlY2tfc2l6ZShkb20sIHVuemlwbGVuKSAh PSAwICkKKyAgICAgICAgICAgIHVuemlwbGVuID0gMDsKKwogICAgICAgICBy YW1kaXNrbGVuID0gdW56aXBsZW4gPyB1bnppcGxlbiA6IGRvbS0+cmFtZGlz a19zaXplOworCiAgICAgICAgIGlmICggeGNfZG9tX2FsbG9jX3NlZ21lbnQo ZG9tLCAmZG9tLT5yYW1kaXNrX3NlZywgInJhbWRpc2siLCAwLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbWRpc2tsZW4pICE9IDAg KQogICAgICAgICAgICAgZ290byBlcnI7CmRpZmYgLS1naXQgYS90b29scy9w eWdydWIvc3JjL3B5Z3J1YiBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCmlu ZGV4IDE3YzAwODMuLjFhM2MxYzMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5Z3J1 Yi9zcmMvcHlncnViCisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCkBA IC0yOCw2ICsyOCw3IEBAIGltcG9ydCBncnViLkxpbG9Db25mCiBpbXBvcnQg Z3J1Yi5FeHRMaW51eENvbmYKIAogUFlHUlVCX1ZFUiA9IDAuNgorRlNfUkVB RF9NQVggPSAxMDI0ICogMTAyNAogCiBkZWYgZW5hYmxlX2N1cnNvcihpc29u KToKICAgICBpZiBpc29uOgpAQCAtNDIxLDcgKzQyMiw4IEBAIGNsYXNzIEdy dWI6CiAgICAgICAgIGlmIHNlbGYuX19kaWN0X18uZ2V0KCdjZicsIE5vbmUp IGlzIE5vbmU6CiAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJj b3VsZG4ndCBmaW5kIGJvb3Rsb2FkZXIgY29uZmlnIGZpbGUgaW4gdGhlIGlt YWdlIHByb3ZpZGVkLiIKICAgICAgICAgZiA9IGZzLm9wZW5fZmlsZShzZWxm LmNmLmZpbGVuYW1lKQotICAgICAgICBidWYgPSBmLnJlYWQoKQorICAgICAg ICAjIGxpbWl0IHJlYWQgc2l6ZSB0byBhdm9pZCBwYXRob2xvZ2ljYWwgY2Fz ZXMKKyAgICAgICAgYnVmID0gZi5yZWFkKEZTX1JFQURfTUFYKQogICAgICAg ICBkZWwgZgogICAgICAgICBzZWxmLmNmLnBhcnNlKGJ1ZikKIApAQCAtNjcw LDYgKzY3MiwzNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAg IGRlZiB1c2FnZSgpOgogICAgICAgICBwcmludCA+PiBzeXMuc3RkZXJyLCAi VXNhZ2U6ICVzIFstcXwtLXF1aWV0XSBbLWl8LS1pbnRlcmFjdGl2ZV0gWy1u fC0tbm90LXJlYWxseV0gWy0tb3V0cHV0PV0gWy0ta2VybmVsPV0gWy0tcmFt ZGlzaz1dIFstLWFyZ3M9XSBbLS1lbnRyeT1dIFstLW91dHB1dC1kaXJlY3Rv cnk9XSBbLS1vdXRwdXQtZm9ybWF0PXN4cHxzaW1wbGV8c2ltcGxlMF0gPGlt YWdlPiIgJShzeXMuYXJndlswXSwpCiAKKyAgICBkZWYgY29weV9mcm9tX2lt YWdlKGZzLCBmaWxlX3RvX3JlYWQsIGZpbGVfdHlwZSwgb3V0cHV0X2RpcmVj dG9yeSwKKyAgICAgICAgICAgICAgICAgICAgICAgIG5vdF9yZWFsbHkpOgor ICAgICAgICBpZiBub3RfcmVhbGx5OgorICAgICAgICAgICAgaWYgZnMuZmls ZV9leGlzdHMoZmlsZV90b19yZWFkKToKKyAgICAgICAgICAgICAgICByZXR1 cm4gIjwlczolcz4iICUgKGZpbGVfdHlwZSwgZmlsZV90b19yZWFkKQorICAg ICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBzeXMuZXhpdCgiVGhl IHJlcXVlc3RlZCAlcyBmaWxlIGRvZXMgbm90IGV4aXN0IiAlIGZpbGVfdHlw ZSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgZGF0YWZpbGUgPSBmcy5v cGVuX2ZpbGUoZmlsZV90b19yZWFkKQorICAgICAgICBleGNlcHQgRXhjZXB0 aW9uLCBlOgorICAgICAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCBlCisg ICAgICAgICAgICBzeXMuZXhpdCgiRXJyb3Igb3BlbmluZyAlcyBpbiBndWVz dCIgJSBmaWxlX3RvX3JlYWQpCisgICAgICAgICh0ZmQsIHJldCkgPSB0ZW1w ZmlsZS5ta3N0ZW1wKHByZWZpeD0iYm9vdF8iK2ZpbGVfdHlwZSsiLiIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcj1vdXRw dXRfZGlyZWN0b3J5KQorICAgICAgICBkYXRhb2ZmID0gMAorICAgICAgICB3 aGlsZSBUcnVlOgorICAgICAgICAgICAgZGF0YSA9IGRhdGFmaWxlLnJlYWQo RlNfUkVBRF9NQVgsIGRhdGFvZmYpCisgICAgICAgICAgICBpZiBsZW4oZGF0 YSkgPT0gMDoKKyAgICAgICAgICAgICAgICBvcy5jbG9zZSh0ZmQpCisgICAg ICAgICAgICAgICAgZGVsIGRhdGFmaWxlCisgICAgICAgICAgICAgICAgcmV0 dXJuIHJldAorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIG9z LndyaXRlKHRmZCwgZGF0YSkKKyAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRp b24sIGU6CisgICAgICAgICAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCBl CisgICAgICAgICAgICAgICAgb3MuY2xvc2UodGZkKQorICAgICAgICAgICAg ICAgIG9zLnVubGluayhyZXQpCisgICAgICAgICAgICAgICAgZGVsIGRhdGFm aWxlCisgICAgICAgICAgICAgICAgc3lzLmV4aXQoIkVycm9yIHdyaXRpbmcg dGVtcG9yYXJ5IGNvcHkgb2YgIitmaWxlX3R5cGUpCisgICAgICAgICAgICBk YXRhb2ZmICs9IGxlbihkYXRhKQorCiAgICAgdHJ5OgogICAgICAgICBvcHRz LCBhcmdzID0gZ2V0b3B0LmdudV9nZXRvcHQoc3lzLmFyZ3ZbMTpdLCAncWlu aDo6JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWyJx dWlldCIsICJpbnRlcmFjdGl2ZSIsICJub3QtcmVhbGx5IiwgImhlbHAiLCAK QEAgLTc4NiwyNCArODE5LDE4IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5f XyI6CiAgICAgaWYgbm90IGZzOgogICAgICAgICByYWlzZSBSdW50aW1lRXJy b3IsICJVbmFibGUgdG8gZmluZCBwYXJ0aXRpb24gY29udGFpbmluZyBrZXJu ZWwiCiAKLSAgICBpZiBub3RfcmVhbGx5OgotICAgICAgICBib290Y2ZnWyJr ZXJuZWwiXSA9ICI8a2VybmVsOiVzPiIgJSBjaG9zZW5jZmdbImtlcm5lbCJd Ci0gICAgZWxzZToKLSAgICAgICAgZGF0YSA9IGZzLm9wZW5fZmlsZShjaG9z ZW5jZmdbImtlcm5lbCJdKS5yZWFkKCkKLSAgICAgICAgKHRmZCwgYm9vdGNm Z1sia2VybmVsIl0pID0gdGVtcGZpbGUubWtzdGVtcChwcmVmaXg9ImJvb3Rf a2VybmVsLiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGlyPW91dHB1dF9kaXJlY3RvcnkpCi0gICAg ICAgIG9zLndyaXRlKHRmZCwgZGF0YSkKLSAgICAgICAgb3MuY2xvc2UodGZk KQorICAgIGJvb3RjZmdbImtlcm5lbCJdID0gY29weV9mcm9tX2ltYWdlKGZz LCBjaG9zZW5jZmdbImtlcm5lbCJdLCAia2VybmVsIiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRwdXRfZGlyZWN0b3J5 LCBub3RfcmVhbGx5KQogCiAgICAgaWYgY2hvc2VuY2ZnWyJyYW1kaXNrIl06 Ci0gICAgICAgIGlmIG5vdF9yZWFsbHk6Ci0gICAgICAgICAgICBib290Y2Zn WyJyYW1kaXNrIl0gPSAiPHJhbWRpc2s6JXM+IiAlIGNob3NlbmNmZ1sicmFt ZGlzayJdCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBkYXRhID0gZnMu b3Blbl9maWxlKGNob3NlbmNmZ1sicmFtZGlzayJdLCkucmVhZCgpCi0gICAg ICAgICAgICAodGZkLCBib290Y2ZnWyJyYW1kaXNrIl0pID0gdGVtcGZpbGUu bWtzdGVtcCgKLSAgICAgICAgICAgICAgICBwcmVmaXg9ImJvb3RfcmFtZGlz ay4iLCBkaXI9b3V0cHV0X2RpcmVjdG9yeSkKLSAgICAgICAgICAgIG9zLndy aXRlKHRmZCwgZGF0YSkKLSAgICAgICAgICAgIG9zLmNsb3NlKHRmZCkKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgYm9vdGNmZ1sicmFtZGlzayJdID0g Y29weV9mcm9tX2ltYWdlKGZzLCBjaG9zZW5jZmdbInJhbWRpc2siXSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAicmFtZGlzayIsIG91dHB1dF9kaXJlY3RvcnksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm90X3JlYWxs eSkKKyAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAgaWYgbm90IG5vdF9y ZWFsbHk6CisgICAgICAgICAgICAgICAgb3MudW5saW5rKGJvb3RjZmdbImtl cm5lbCJdKQorICAgICAgICAgICAgcmFpc2UKICAgICBlbHNlOgogICAgICAg ICBpbml0cmQgPSBOb25lCiAK --=separator Content-Type: application/octet-stream; name="xsa25-4.2.patch" Content-Disposition: attachment; filename="xsa25-4.2.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtLWdpdCBh L3N0dWJkb20vZ3J1Yi9rZXhlYy5jIGIvc3R1YmRvbS9ncnViL2tleGVjLmMK aW5kZXggMDZiZWY1Mi4uYjIxYzkxYSAxMDA2NDQKLS0tIGEvc3R1YmRvbS9n cnViL2tleGVjLmMKKysrIGIvc3R1YmRvbS9ncnViL2tleGVjLmMKQEAgLTEz Nyw2ICsxMzcsMTAgQEAgdm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcg a2VybmVsX3NpemUsIHZvaWQgKm1vZHVsZSwgbG9uZyBtb2R1bGVfc2l6ZSwg Y2hhcgogICAgIGRvbSA9IHhjX2RvbV9hbGxvY2F0ZSh4Y19oYW5kbGUsIGNt ZGxpbmUsIGZlYXR1cmVzKTsKICAgICBkb20tPmFsbG9jYXRlID0ga2V4ZWNf YWxsb2NhdGU7CiAKKyAgICAvKiBXZSBhcmUgdXNpbmcgZ3Vlc3Qgb3duZWQg bWVtb3J5LCB0aGVyZWZvcmUgbm8gbGltaXRzLiAqLworICAgIHhjX2RvbV9r ZXJuZWxfbWF4X3NpemUoZG9tLCAwKTsKKyAgICB4Y19kb21fcmFtZGlza19t YXhfc2l6ZShkb20sIDApOworCiAgICAgZG9tLT5rZXJuZWxfYmxvYiA9IGtl cm5lbDsKICAgICBkb20tPmtlcm5lbF9zaXplID0ga2VybmVsX3NpemU7CiAK ZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2RvbS5oIGIvdG9vbHMvbGli eGMveGNfZG9tLmgKaW5kZXggMmFlZjY0YS4uNmE3MmFhOSAxMDA2NDQKLS0t IGEvdG9vbHMvbGlieGMveGNfZG9tLmgKKysrIGIvdG9vbHMvbGlieGMveGNf ZG9tLmgKQEAgLTU1LDYgKzU1LDkgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7 CiAgICAgdm9pZCAqcmFtZGlza19ibG9iOwogICAgIHNpemVfdCByYW1kaXNr X3NpemU7CiAKKyAgICBzaXplX3QgbWF4X2tlcm5lbF9zaXplOworICAgIHNp emVfdCBtYXhfcmFtZGlza19zaXplOworCiAgICAgLyogYXJndW1lbnRzIGFu ZCBwYXJhbWV0ZXJzICovCiAgICAgY2hhciAqY21kbGluZTsKICAgICB1aW50 MzJfdCBmX3JlcXVlc3RlZFtYRU5GRUFUX05SX1NVQk1BUFNdOwpAQCAtMTgw LDYgKzE4MywyMyBAQCB2b2lkIHhjX2RvbV9yZWxlYXNlX3BoeXMoc3RydWN0 IHhjX2RvbV9pbWFnZSAqZG9tKTsKIHZvaWQgeGNfZG9tX3JlbGVhc2Uoc3Ry dWN0IHhjX2RvbV9pbWFnZSAqZG9tKTsKIGludCB4Y19kb21fbWVtX2luaXQo c3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCB1bnNpZ25lZCBpbnQgbWVtX21i KTsKIAorLyogU2V0IHRoaXMgbGFyZ2VyIGlmIHlvdSBoYXZlIGVub3Jtb3Vz IHJhbWRpc2tzL2tlcm5lbHMuIE5vdGUgdGhhdAorICogeW91IHNob3VsZCB0 cnVzdCBhbGwga2VybmVscyBub3QgdG8gYmUgbWFsaWNpb3VzbHkgbGFyZ2Ug KGUuZy4gdG8KKyAqIGV4aGF1c3QgYWxsIGRvbTAgbWVtb3J5KSBpZiB5b3Ug ZG8gdGhpcyAoc2VlIENWRS0yMDEyLTQ1NDQgLworICogWFNBLTI1KS4gWW91 IGNhbiBhbHNvIHNldCB0aGUgZGVmYXVsdCBpbmRlcGVuZGVudGx5IGZvcgor ICogcmFtZGlza3Mva2VybmVscyBpbiB4Y19kb21fYWxsb2NhdGUoKSBvciBj YWxsCisgKiB4Y19kb21fe2tlcm5lbCxyYW1kaXNrfV9tYXhfc2l6ZS4KKyAq LworI2lmbmRlZiBYQ19ET01fREVDT01QUkVTU19NQVgKKyNkZWZpbmUgWENf RE9NX0RFQ09NUFJFU1NfTUFYICgxMDI0KjEwMjQqMTAyNCkgLyogMUdCICov CisjZW5kaWYKKworaW50IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShzdHJ1 Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeik7CitpbnQgeGNfZG9t X2tlcm5lbF9tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNp emVfdCBzeik7CisKK2ludCB4Y19kb21fcmFtZGlza19jaGVja19zaXplKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KTsKK2ludCB4Y19k b21fcmFtZGlza19tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20s IHNpemVfdCBzeik7CisKIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4Y19p bnRlcmZhY2UgKnhjaCwKICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKmJs b2IsIHNpemVfdCB6aXBsZW4pOwogaW50IHhjX2RvbV9kb19ndW56aXAoeGNf aW50ZXJmYWNlICp4Y2gsCkBAIC0yNDAsNyArMjYwLDggQEAgdm9pZCB4Y19k b21fbG9nX21lbW9yeV9mb290cHJpbnQoc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tKTsKIHZvaWQgKnhjX2RvbV9tYWxsb2Moc3RydWN0IHhjX2RvbV9pbWFn ZSAqZG9tLCBzaXplX3Qgc2l6ZSk7CiB2b2lkICp4Y19kb21fbWFsbG9jX3Bh Z2VfYWxpZ25lZChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBz aXplKTsKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBz aXplX3QgKiBzaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IHNpemVfdCBtYXhfc2l6ZSk7CiBjaGFyICp4Y19kb21fc3RyZHVwKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqc3RyKTsKIAog LyogLS0tIGFsbG9jIG1lbW9yeSBwb29sIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KZGlmZiAtLWdpdCBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9iemltYWdlbG9hZGVyLmMgYi90b29scy9saWJ4Yy94 Y19kb21fYnppbWFnZWxvYWRlci5jCmluZGV4IDExM2Q0MGYuLmIxYjJlYjAg MTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9iemltYWdlbG9hZGVy LmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYwpA QCAtNDcsMTMgKzQ3LDE5IEBAIHN0YXRpYyBpbnQgeGNfdHJ5X2J6aXAyX2Rl Y29kZSgKICAgICBjaGFyICpvdXRfYnVmOwogICAgIGNoYXIgKnRtcF9idWY7 CiAgICAgaW50IHJldHZhbCA9IC0xOwotICAgIGludCBvdXRzaXplOworICAg IHVuc2lnbmVkIGludCBvdXRzaXplOwogICAgIHVpbnQ2NF90IHRvdGFsOwog CiAgICAgc3RyZWFtLmJ6YWxsb2MgPSBOVUxMOwogICAgIHN0cmVhbS5iemZy ZWUgPSBOVUxMOwogICAgIHN0cmVhbS5vcGFxdWUgPSBOVUxMOwogCisgICAg aWYgKCBkb20tPmtlcm5lbF9zaXplID09IDApCisgICAgeworICAgICAgICBE T01QUklOVEYoIkJaSVAyOiBJbnB1dCBpcyAwIHNpemUiKTsKKyAgICAgICAg cmV0dXJuIC0xOworICAgIH0KKwogICAgIHJldCA9IEJaMl9iekRlY29tcHJl c3NJbml0KCZzdHJlYW0sIDAsIDApOwogICAgIGlmICggcmV0ICE9IEJaX09L ICkKICAgICB7CkBAIC02Niw2ICs3MiwxNyBAQCBzdGF0aWMgaW50IHhjX3Ry eV9iemlwMl9kZWNvZGUoCiAgICAgICogdGhlIGlucHV0IGJ1ZmZlciB0byBz dGFydCwgYW5kIHdlJ2xsIHJlYWxsb2MgYXMgbmVlZGVkLgogICAgICAqLwog ICAgIG91dHNpemUgPSBkb20tPmtlcm5lbF9zaXplOworCisgICAgLyoKKyAg ICAgKiBzdHJlYW0uYXZhaWxfaW4gYW5kIG91dHNpemUgYXJlIHVuc2lnbmVk IGludCwgd2hpbGUga2VybmVsX3NpemUKKyAgICAgKiBpcyBhIHNpemVfdC4g Q2hlY2sgd2UgYXJlbid0IG92ZXJmbG93aW5nLgorICAgICAqLworICAgIGlm ICggb3V0c2l6ZSAhPSBkb20tPmtlcm5lbF9zaXplICkKKyAgICB7CisgICAg ICAgIERPTVBSSU5URigiQlpJUDI6IElucHV0IHRvbyBsYXJnZSIpOworICAg ICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7CisgICAgfQorCiAgICAgb3V0X2J1 ZiA9IG1hbGxvYyhvdXRzaXplKTsKICAgICBpZiAoIG91dF9idWYgPT0gTlVM TCApCiAgICAgewpAQCAtOTgsMTMgKzExNSwyMCBAQCBzdGF0aWMgaW50IHhj X3RyeV9iemlwMl9kZWNvZGUoCiAgICAgICAgIGlmICggc3RyZWFtLmF2YWls X291dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAgLyogUHJvdGVj dCBhZ2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8KLSAgICAgICAg ICAgIGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAgICAgICAgICAg IGlmICggb3V0c2l6ZSA+IFVJTlRfTUFYIC8gMiApCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogb3V0cHV0IGJ1 ZmZlciBvdmVyZmxvdyIpOwogICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CiAgICAgICAgICAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOwogICAg ICAgICAgICAgfQogCisgICAgICAgICAgICBpZiAoIHhjX2RvbV9rZXJuZWxf Y2hlY2tfc2l6ZShkb20sIG91dHNpemUgKiAyKSApCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogb3V0cHV0IHRv byBsYXJnZSIpOworICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1Zik7Cisg ICAgICAgICAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOworICAgICAgICAg ICAgfQorCiAgICAgICAgICAgICB0bXBfYnVmID0gcmVhbGxvYyhvdXRfYnVm LCBvdXRzaXplICogMik7CiAgICAgICAgICAgICBpZiAoIHRtcF9idWYgPT0g TlVMTCApCiAgICAgICAgICAgICB7CkBAIC0xNzIsOSArMTk2LDE1IEBAIHN0 YXRpYyBpbnQgX3hjX3RyeV9sem1hX2RlY29kZSgKICAgICB1bnNpZ25lZCBj aGFyICpvdXRfYnVmOwogICAgIHVuc2lnbmVkIGNoYXIgKnRtcF9idWY7CiAg ICAgaW50IHJldHZhbCA9IC0xOwotICAgIGludCBvdXRzaXplOworICAgIHNp emVfdCBvdXRzaXplOwogICAgIGNvbnN0IGNoYXIgKm1zZzsKIAorICAgIGlm ICggZG9tLT5rZXJuZWxfc2l6ZSA9PSAwKQorICAgIHsKKyAgICAgICAgRE9N UFJJTlRGKCIlczogSW5wdXQgaXMgMCBzaXplIiwgd2hhdCk7CisgICAgICAg IHJldHVybiAtMTsKKyAgICB9CisKICAgICAvKiBzaWdoLiAgV2UgZG9uJ3Qg a25vdyB1cC1mcm9udCBob3cgbXVjaCBtZW1vcnkgd2UgYXJlIGdvaW5nIHRv IG5lZWQKICAgICAgKiBmb3IgdGhlIG91dHB1dCBidWZmZXIuICBBbGxvY2F0 ZSB0aGUgb3V0cHV0IGJ1ZmZlciB0byBiZSBlcXVhbAogICAgICAqIHRoZSBp bnB1dCBidWZmZXIgdG8gc3RhcnQsIGFuZCB3ZSdsbCByZWFsbG9jIGFzIG5l ZWRlZC4KQEAgLTI0NCwxMyArMjc0LDIwIEBAIHN0YXRpYyBpbnQgX3hjX3Ry eV9sem1hX2RlY29kZSgKICAgICAgICAgaWYgKCBzdHJlYW0tPmF2YWlsX291 dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAgLyogUHJvdGVjdCBh Z2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8KLSAgICAgICAgICAg IGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAgICAgICAgICAgIGlm ICggb3V0c2l6ZSA+IFNJWkVfTUFYIC8gMiApCiAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgRE9NUFJJTlRGKCIlczogb3V0cHV0IGJ1ZmZlciBv dmVyZmxvdyIsIHdoYXQpOwogICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CiAgICAgICAgICAgICAgICAgZ290byBsem1hX2NsZWFudXA7CiAgICAg ICAgICAgICB9CiAKKyAgICAgICAgICAgIGlmICggeGNfZG9tX2tlcm5lbF9j aGVja19zaXplKGRvbSwgb3V0c2l6ZSAqIDIpICkKKyAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICBET01QUklOVEYoIiVzOiBvdXRwdXQgdG9vIGxh cmdlIiwgd2hhdCk7CisgICAgICAgICAgICAgICAgZnJlZShvdXRfYnVmKTsK KyAgICAgICAgICAgICAgICBnb3RvIGx6bWFfY2xlYW51cDsKKyAgICAgICAg ICAgIH0KKwogICAgICAgICAgICAgdG1wX2J1ZiA9IHJlYWxsb2Mob3V0X2J1 Ziwgb3V0c2l6ZSAqIDIpOwogICAgICAgICAgICAgaWYgKCB0bXBfYnVmID09 IE5VTEwgKQogICAgICAgICAgICAgewpAQCAtMzU5LDYgKzM5NiwxMiBAQCBz dGF0aWMgaW50IHhjX3RyeV9sem8xeF9kZWNvZGUoCiAgICAgICAgIDB4ODks IDB4NGMsIDB4NWEsIDB4NGYsIDB4MDAsIDB4MGQsIDB4MGEsIDB4MWEsIDB4 MGEKICAgICB9OwogCisgICAgLyoKKyAgICAgKiBsem9fdWludCBzaG91bGQg bWF0Y2ggc2l6ZV90LiBDaGVjayB0aGF0IHRoaXMgaXMgdGhlIGNhc2UgdG8g YmUKKyAgICAgKiBzdXJlIHdlIHdvbid0IG92ZXJmbG93IHZhcmlvdXMgbHpv X3VpbnQgZmllbGRzLgorICAgICAqLworICAgIFhDX0JVSUxEX0JVR19PTihz aXplb2YobHpvX3VpbnQpICE9IHNpemVvZihzaXplX3QpKTsKKwogICAgIHJl dCA9IGx6b19pbml0KCk7CiAgICAgaWYgKCByZXQgIT0gTFpPX0VfT0sgKQog ICAgIHsKQEAgLTQzOCw2ICs0ODEsMTQgQEAgc3RhdGljIGludCB4Y190cnlf bHpvMXhfZGVjb2RlKAogICAgICAgICBpZiAoIHNyY19sZW4gPD0gMCB8fCBz cmNfbGVuID4gZHN0X2xlbiB8fCBzcmNfbGVuID4gbGVmdCApCiAgICAgICAg ICAgICBicmVhazsKIAorICAgICAgICBtc2cgPSAiT3V0cHV0IGJ1ZmZlciBv dmVyZmxvdyI7CisgICAgICAgIGlmICggKnNpemUgPiBTSVpFX01BWCAtIGRz dF9sZW4gKQorICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgbXNnID0g IkRlY29tcHJlc3NlZCBpbWFnZSB0b28gbGFyZ2UiOworICAgICAgICBpZiAo IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sICpzaXplICsgZHN0X2xl bikgKQorICAgICAgICAgICAgYnJlYWs7CisKICAgICAgICAgbXNnID0gIkZh aWxlZCB0byAocmUpYWxsb2MgbWVtb3J5IjsKICAgICAgICAgdG1wX2J1ZiA9 IHJlYWxsb2Mob3V0X2J1ZiwgKnNpemUgKyBkc3RfbGVuKTsKICAgICAgICAg aWYgKCB0bXBfYnVmID09IE5VTEwgKQpkaWZmIC0tZ2l0IGEvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMK aW5kZXggZmVhOWRlNS4uMmEwMWQ3YyAxMDA2NDQKLS0tIGEvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYworKysgYi90b29scy9saWJ4Yy94Y19kb21fY29y ZS5jCkBAIC0xNTksNyArMTU5LDggQEAgdm9pZCAqeGNfZG9tX21hbGxvY19w YWdlX2FsaWduZWQoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c2l6ZSkKIH0KIAogdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBjaGFyICpmaWxlbmFtZSwgc2l6ZV90ICogc2l6ZSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpmaWxlbmFt ZSwgc2l6ZV90ICogc2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBzaXplX3QgbWF4X3NpemUpCiB7CiAgICAgc3RydWN0IHhjX2Rv bV9tZW0gKmJsb2NrID0gTlVMTDsKICAgICBpbnQgZmQgPSAtMTsKQEAgLTE3 MSw2ICsxNzIsMTMgQEAgdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwKICAgICBsc2VlayhmZCwgMCwgU0VF S19TRVQpOwogICAgICpzaXplID0gbHNlZWsoZmQsIDAsIFNFRUtfRU5EKTsK IAorICAgIGlmICggbWF4X3NpemUgJiYgKnNpemUgPiBtYXhfc2l6ZSApCisg ICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX09VVF9P Rl9NRU1PUlksCisgICAgICAgICAgICAgICAgICAgICAidHJpZWQgdG8gbWFw IGZpbGUgd2hpY2ggaXMgdG9vIGxhcmdlIik7CisgICAgICAgIGdvdG8gZXJy OworICAgIH0KKwogICAgIGJsb2NrID0gbWFsbG9jKHNpemVvZigqYmxvY2sp KTsKICAgICBpZiAoIGJsb2NrID09IE5VTEwgKQogICAgICAgICBnb3RvIGVy cjsKQEAgLTIyMiw2ICsyMzAsNDAgQEAgY2hhciAqeGNfZG9tX3N0cmR1cChz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIGNvbnN0IGNoYXIgKnN0cikKIH0K IAogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tICovCisvKiBkZWNv bXByZXNzaW9uIGJ1ZmZlciBzaXppbmcgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKi8KK2ludCB4Y19kb21fa2VybmVs X2NoZWNrX3NpemUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c3opCit7CisgICAgLyogTm8gbGltaXQgKi8KKyAgICBpZiAoICFkb20tPm1h eF9rZXJuZWxfc2l6ZSApCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYg KCBzeiA+IGRvbS0+bWF4X2tlcm5lbF9zaXplICkKKyAgICB7CisgICAgICAg IHhjX2RvbV9wYW5pYyhkb20tPnhjaCwgWENfSU5WQUxJRF9LRVJORUwsCisg ICAgICAgICAgICAgICAgICAgICAia2VybmVsIGltYWdlIHRvbyBsYXJnZSIp OworICAgICAgICByZXR1cm4gMTsKKyAgICB9CisKKyAgICByZXR1cm4gMDsK K30KKworaW50IHhjX2RvbV9yYW1kaXNrX2NoZWNrX3NpemUoc3RydWN0IHhj X2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opCit7CisgICAgLyogTm8gbGlt aXQgKi8KKyAgICBpZiAoICFkb20tPm1heF9yYW1kaXNrX3NpemUgKQorICAg ICAgICByZXR1cm4gMDsKKworICAgIGlmICggc3ogPiBkb20tPm1heF9yYW1k aXNrX3NpemUgKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+ eGNoLCBYQ19JTlZBTElEX0tFUk5FTCwKKyAgICAgICAgICAgICAgICAgICAg ICJyYW1kaXNrIGltYWdlIHRvbyBsYXJnZSIpOworICAgICAgICByZXR1cm4g MTsKKyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKworLyogLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tICovCiAvKiByZWFkIGZpbGVzLCBjb3B5IG1l bW9yeSBibG9ja3MsIHdpdGggdHJhbnNwYXJlbnQgZ3VuemlwICAgICAgICAg ICAgICAgICAgKi8KIAogc2l6ZV90IHhjX2RvbV9jaGVja19nemlwKHhjX2lu dGVyZmFjZSAqeGNoLCB2b2lkICpibG9iLCBzaXplX3QgemlwbGVuKQpAQCAt MjM1LDcgKzI3Nyw3IEBAIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4Y19p bnRlcmZhY2UgKnhjaCwgdm9pZCAqYmxvYiwgc2l6ZV90IHppcGxlbikKIAog ICAgIGd6bGVuID0gYmxvYiArIHppcGxlbiAtIDQ7CiAgICAgdW56aXBsZW4g PSBnemxlblszXSA8PCAyNCB8IGd6bGVuWzJdIDw8IDE2IHwgZ3psZW5bMV0g PDwgOCB8IGd6bGVuWzBdOwotICAgIGlmICggKHVuemlwbGVuIDwgMCkgfHwg KHVuemlwbGVuID4gKDEwMjQqMTAyNCoxMDI0KSkgKSAvKiAxR0IgbGltaXQg Ki8KKyAgICBpZiAoICh1bnppcGxlbiA8IDApIHx8ICh1bnppcGxlbiA+IFhD X0RPTV9ERUNPTVBSRVNTX01BWCkgKQogICAgIHsKICAgICAgICAgeGNfZG9t X3ByaW50ZgogICAgICAgICAgICAgKHhjaCwKQEAgLTI4OCw2ICszMzAsOSBA QCBpbnQgeGNfZG9tX3RyeV9ndW56aXAoc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tLCB2b2lkICoqYmxvYiwgc2l6ZV90ICogc2l6ZSkKICAgICBpZiAoIHVu emlwbGVuID09IDAgKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlmICgg eGNfZG9tX2tlcm5lbF9jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICkKKyAg ICAgICAgcmV0dXJuIDA7CisKICAgICB1bnppcCA9IHhjX2RvbV9tYWxsb2Mo ZG9tLCB1bnppcGxlbik7CiAgICAgaWYgKCB1bnppcCA9PSBOVUxMICkKICAg ICAgICAgcmV0dXJuIC0xOwpAQCAtNTg4LDYgKzYzMyw5IEBAIHN0cnVjdCB4 Y19kb21faW1hZ2UgKnhjX2RvbV9hbGxvY2F0ZSh4Y19pbnRlcmZhY2UgKnhj aCwKICAgICBtZW1zZXQoZG9tLCAwLCBzaXplb2YoKmRvbSkpOwogICAgIGRv bS0+eGNoID0geGNoOwogCisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBY Q19ET01fREVDT01QUkVTU19NQVg7CisgICAgZG9tLT5tYXhfcmFtZGlza19z aXplID0gWENfRE9NX0RFQ09NUFJFU1NfTUFYOworCiAgICAgaWYgKCBjbWRs aW5lICkKICAgICAgICAgZG9tLT5jbWRsaW5lID0geGNfZG9tX3N0cmR1cChk b20sIGNtZGxpbmUpOwogICAgIGlmICggZmVhdHVyZXMgKQpAQCAtNjA4LDEw ICs2NTYsMjUgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9j YXRlKHhjX2ludGVyZmFjZSAqeGNoLAogICAgIHJldHVybiBOVUxMOwogfQog CitpbnQgeGNfZG9tX2tlcm5lbF9tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2lt YWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICBET01QUklOVEYoIiVzOiBr ZXJuZWxfbWF4X3NpemU9JXp4IiwgX19GVU5DVElPTl9fLCBzeik7CisgICAg ZG9tLT5tYXhfa2VybmVsX3NpemUgPSBzejsKKyAgICByZXR1cm4gMDsKK30K KworaW50IHhjX2RvbV9yYW1kaXNrX21heF9zaXplKHN0cnVjdCB4Y19kb21f aW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQoreworICAgIERPTVBSSU5URigiJXM6 IHJhbWRpc2tfbWF4X3NpemU9JXp4IiwgX19GVU5DVElPTl9fLCBzeik7Cisg ICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0gc3o7CisgICAgcmV0dXJuIDA7 Cit9CisKIGludCB4Y19kb21fa2VybmVsX2ZpbGUoc3RydWN0IHhjX2RvbV9p bWFnZSAqZG9tLCBjb25zdCBjaGFyICpmaWxlbmFtZSkKIHsKICAgICBET01Q UklOVEYoIiVzOiBmaWxlbmFtZT1cIiVzXCIiLCBfX0ZVTkNUSU9OX18sIGZp bGVuYW1lKTsKLSAgICBkb20tPmtlcm5lbF9ibG9iID0geGNfZG9tX21hbGxv Y19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5lbF9zaXplKTsK KyAgICBkb20tPmtlcm5lbF9ibG9iID0geGNfZG9tX21hbGxvY19maWxlbWFw KGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5lbF9zaXplLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tLT5tYXhf a2VybmVsX3NpemUpOwogICAgIGlmICggZG9tLT5rZXJuZWxfYmxvYiA9PSBO VUxMICkKICAgICAgICAgcmV0dXJuIC0xOwogICAgIHJldHVybiB4Y19kb21f dHJ5X2d1bnppcChkb20sICZkb20tPmtlcm5lbF9ibG9iLCAmZG9tLT5rZXJu ZWxfc2l6ZSk7CkBAIC02MjEsNyArNjg0LDkgQEAgaW50IHhjX2RvbV9yYW1k aXNrX2ZpbGUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFy ICpmaWxlbmFtZSkKIHsKICAgICBET01QUklOVEYoIiVzOiBmaWxlbmFtZT1c IiVzXCIiLCBfX0ZVTkNUSU9OX18sIGZpbGVuYW1lKTsKICAgICBkb20tPnJh bWRpc2tfYmxvYiA9Ci0gICAgICAgIHhjX2RvbV9tYWxsb2NfZmlsZW1hcChk b20sIGZpbGVuYW1lLCAmZG9tLT5yYW1kaXNrX3NpemUpOworICAgICAgICB4 Y19kb21fbWFsbG9jX2ZpbGVtYXAoZG9tLCBmaWxlbmFtZSwgJmRvbS0+cmFt ZGlza19zaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9t LT5tYXhfcmFtZGlza19zaXplKTsKKwogICAgIGlmICggZG9tLT5yYW1kaXNr X2Jsb2IgPT0gTlVMTCApCiAgICAgICAgIHJldHVybiAtMTsKIC8vICAgIHJl dHVybiB4Y19kb21fdHJ5X2d1bnppcChkb20sICZkb20tPnJhbWRpc2tfYmxv YiwgJmRvbS0+cmFtZGlza19zaXplKTsKQEAgLTc4MSw3ICs4NDYsMTEgQEAg aW50IHhjX2RvbV9idWlsZF9pbWFnZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpk b20pCiAgICAgICAgIHZvaWQgKnJhbWRpc2ttYXA7CiAKICAgICAgICAgdW56 aXBsZW4gPSB4Y19kb21fY2hlY2tfZ3ppcChkb20tPnhjaCwgZG9tLT5yYW1k aXNrX2Jsb2IsIGRvbS0+cmFtZGlza19zaXplKTsKKyAgICAgICAgaWYgKCB4 Y19kb21fcmFtZGlza19jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICE9IDAg KQorICAgICAgICAgICAgdW56aXBsZW4gPSAwOworCiAgICAgICAgIHJhbWRp c2tsZW4gPSB1bnppcGxlbiA/IHVuemlwbGVuIDogZG9tLT5yYW1kaXNrX3Np emU7CisKICAgICAgICAgaWYgKCB4Y19kb21fYWxsb2Nfc2VnbWVudChkb20s ICZkb20tPnJhbWRpc2tfc2VnLCAicmFtZGlzayIsIDAsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmFtZGlza2xlbikgIT0gMCApCiAg ICAgICAgICAgICBnb3RvIGVycjsK --=separator Content-Type: application/octet-stream; name="xsa25-unstable.patch" Content-Disposition: attachment; filename="xsa25-unstable.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBiOWMx ZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHN0dWJkb20vZ3J1Yi9rZXhlYy5j Ci0tLSBhL3N0dWJkb20vZ3J1Yi9rZXhlYy5jCVdlZCBPY3QgMjQgMTU6NDk6 NDEgMjAxMiArMDEwMAorKysgYi9zdHViZG9tL2dydWIva2V4ZWMuYwlGcmkg T2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAxMDAKQEAgLTEzNyw2ICsxMzcsMTAg QEAgdm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcga2VybmVsX3Npegog ICAgIGRvbSA9IHhjX2RvbV9hbGxvY2F0ZSh4Y19oYW5kbGUsIGNtZGxpbmUs IGZlYXR1cmVzKTsKICAgICBkb20tPmFsbG9jYXRlID0ga2V4ZWNfYWxsb2Nh dGU7CiAKKyAgICAvKiBXZSBhcmUgdXNpbmcgZ3Vlc3Qgb3duZWQgbWVtb3J5 LCB0aGVyZWZvcmUgbm8gbGltaXRzLiAqLworICAgIHhjX2RvbV9rZXJuZWxf bWF4X3NpemUoZG9tLCAwKTsKKyAgICB4Y19kb21fcmFtZGlza19tYXhfc2l6 ZShkb20sIDApOworCiAgICAgZG9tLT5rZXJuZWxfYmxvYiA9IGtlcm5lbDsK ICAgICBkb20tPmtlcm5lbF9zaXplID0ga2VybmVsX3NpemU7CiAKZGlmZiAt ciBiOWMxZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hj X2RvbS5oCi0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbS5oCVdlZCBPY3QgMjQg MTU6NDk6NDEgMjAxMiArMDEwMAorKysgYi90b29scy9saWJ4Yy94Y19kb20u aAlGcmkgT2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAxMDAKQEAgLTU1LDYgKzU1 LDkgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7CiAgICAgdm9pZCAqcmFtZGlz a19ibG9iOwogICAgIHNpemVfdCByYW1kaXNrX3NpemU7CiAKKyAgICBzaXpl X3QgbWF4X2tlcm5lbF9zaXplOworICAgIHNpemVfdCBtYXhfcmFtZGlza19z aXplOworCiAgICAgLyogYXJndW1lbnRzIGFuZCBwYXJhbWV0ZXJzICovCiAg ICAgY2hhciAqY21kbGluZTsKICAgICB1aW50MzJfdCBmX3JlcXVlc3RlZFtY RU5GRUFUX05SX1NVQk1BUFNdOwpAQCAtMTk0LDYgKzE5NywyMyBAQCB2b2lk IHhjX2RvbV9yZWxlYXNlX3BoeXMoc3RydWN0IHhjX2RvbV9pCiB2b2lkIHhj X2RvbV9yZWxlYXNlKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSk7CiBpbnQg eGNfZG9tX21lbV9pbml0KHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgdW5z aWduZWQgaW50IG1lbV9tYik7CiAKKy8qIFNldCB0aGlzIGxhcmdlciBpZiB5 b3UgaGF2ZSBlbm9ybW91cyByYW1kaXNrcy9rZXJuZWxzLiBOb3RlIHRoYXQK KyAqIHlvdSBzaG91bGQgdHJ1c3QgYWxsIGtlcm5lbHMgbm90IHRvIGJlIG1h bGljaW91c2x5IGxhcmdlIChlLmcuIHRvCisgKiBleGhhdXN0IGFsbCBkb20w IG1lbW9yeSkgaWYgeW91IGRvIHRoaXMgKHNlZSBDVkUtMjAxMi00NTQ0IC8K KyAqIFhTQS0yNSkuIFlvdSBjYW4gYWxzbyBzZXQgdGhlIGRlZmF1bHQgaW5k ZXBlbmRlbnRseSBmb3IKKyAqIHJhbWRpc2tzL2tlcm5lbHMgaW4geGNfZG9t X2FsbG9jYXRlKCkgb3IgY2FsbAorICogeGNfZG9tX3trZXJuZWwscmFtZGlz a31fbWF4X3NpemUuCisgKi8KKyNpZm5kZWYgWENfRE9NX0RFQ09NUFJFU1Nf TUFYCisjZGVmaW5lIFhDX0RPTV9ERUNPTVBSRVNTX01BWCAoMTAyNCoxMDI0 KjEwMjQpIC8qIDFHQiAqLworI2VuZGlmCisKK2ludCB4Y19kb21fa2VybmVs X2NoZWNrX3NpemUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c3opOworaW50IHhjX2RvbV9rZXJuZWxfbWF4X3NpemUoc3RydWN0IHhjX2Rv bV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworCitpbnQgeGNfZG9tX3JhbWRp c2tfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVf dCBzeik7CitpbnQgeGNfZG9tX3JhbWRpc2tfbWF4X3NpemUoc3RydWN0IHhj X2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworCiBzaXplX3QgeGNfZG9t X2NoZWNrX2d6aXAoeGNfaW50ZXJmYWNlICp4Y2gsCiAgICAgICAgICAgICAg ICAgICAgICB2b2lkICpibG9iLCBzaXplX3QgemlwbGVuKTsKIGludCB4Y19k b21fZG9fZ3VuemlwKHhjX2ludGVyZmFjZSAqeGNoLApAQCAtMjU0LDcgKzI3 NCw4IEBAIHZvaWQgeGNfZG9tX2xvZ19tZW1vcnlfZm9vdHByaW50KHN0cnVj dCAKIHZvaWQgKnhjX2RvbV9tYWxsb2Moc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tLCBzaXplX3Qgc2l6ZSk7CiB2b2lkICp4Y19kb21fbWFsbG9jX3BhZ2Vf YWxpZ25lZChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzaXpl KTsKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChzdHJ1Y3QgeGNfZG9t X2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBzaXpl X3QgKiBzaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IHNpemVfdCBtYXhfc2l6ZSk7CiBjaGFyICp4Y19kb21fc3RyZHVwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqc3RyKTsKIAogLyog LS0tIGFsbG9jIG1lbW9yeSBwb29sIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KZGlmZiAtciBiOWMxZTA4NmQ5Yjcg LXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hjX2RvbV9iemltYWdlbG9h ZGVyLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIu YwlXZWQgT2N0IDI0IDE1OjQ5OjQxIDIwMTIgKzAxMDAKKysrIGIvdG9vbHMv bGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYwlGcmkgT2N0IDI2IDA5OjE5 OjIyIDIwMTIgKzAxMDAKQEAgLTQ3LDEzICs0NywxOSBAQCBzdGF0aWMgaW50 IHhjX3RyeV9iemlwMl9kZWNvZGUoCiAgICAgY2hhciAqb3V0X2J1ZjsKICAg ICBjaGFyICp0bXBfYnVmOwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBp bnQgb3V0c2l6ZTsKKyAgICB1bnNpZ25lZCBpbnQgb3V0c2l6ZTsKICAgICB1 aW50NjRfdCB0b3RhbDsKIAogICAgIHN0cmVhbS5iemFsbG9jID0gTlVMTDsK ICAgICBzdHJlYW0uYnpmcmVlID0gTlVMTDsKICAgICBzdHJlYW0ub3BhcXVl ID0gTlVMTDsKIAorICAgIGlmICggZG9tLT5rZXJuZWxfc2l6ZSA9PSAwKQor ICAgIHsKKyAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogSW5wdXQgaXMgMCBz aXplIik7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKICAgICByZXQg PSBCWjJfYnpEZWNvbXByZXNzSW5pdCgmc3RyZWFtLCAwLCAwKTsKICAgICBp ZiAoIHJldCAhPSBCWl9PSyApCiAgICAgewpAQCAtNjYsNiArNzIsMTcgQEAg c3RhdGljIGludCB4Y190cnlfYnppcDJfZGVjb2RlKAogICAgICAqIHRoZSBp bnB1dCBidWZmZXIgdG8gc3RhcnQsIGFuZCB3ZSdsbCByZWFsbG9jIGFzIG5l ZWRlZC4KICAgICAgKi8KICAgICBvdXRzaXplID0gZG9tLT5rZXJuZWxfc2l6 ZTsKKworICAgIC8qCisgICAgICogc3RyZWFtLmF2YWlsX2luIGFuZCBvdXRz aXplIGFyZSB1bnNpZ25lZCBpbnQsIHdoaWxlIGtlcm5lbF9zaXplCisgICAg ICogaXMgYSBzaXplX3QuIENoZWNrIHdlIGFyZW4ndCBvdmVyZmxvd2luZy4K KyAgICAgKi8KKyAgICBpZiAoIG91dHNpemUgIT0gZG9tLT5rZXJuZWxfc2l6 ZSApCisgICAgeworICAgICAgICBET01QUklOVEYoIkJaSVAyOiBJbnB1dCB0 b28gbGFyZ2UiKTsKKyAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOworICAg IH0KKwogICAgIG91dF9idWYgPSBtYWxsb2Mob3V0c2l6ZSk7CiAgICAgaWYg KCBvdXRfYnVmID09IE5VTEwgKQogICAgIHsKQEAgLTk4LDEzICsxMTUsMjAg QEAgc3RhdGljIGludCB4Y190cnlfYnppcDJfZGVjb2RlKAogICAgICAgICBp ZiAoIHN0cmVhbS5hdmFpbF9vdXQgPT0gMCApCiAgICAgICAgIHsKICAgICAg ICAgICAgIC8qIFByb3RlY3QgYWdhaW5zdCBvdXRwdXQgYnVmZmVyIG92ZXJm bG93ICovCi0gICAgICAgICAgICBpZiAoIG91dHNpemUgPiBJTlRfTUFYIC8g MiApCisgICAgICAgICAgICBpZiAoIG91dHNpemUgPiBVSU5UX01BWCAvIDIg KQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIERPTVBSSU5URigi QlpJUDI6IG91dHB1dCBidWZmZXIgb3ZlcmZsb3ciKTsKICAgICAgICAgICAg ICAgICBmcmVlKG91dF9idWYpOwogICAgICAgICAgICAgICAgIGdvdG8gYnpp cDJfY2xlYW51cDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYg KCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9tLCBvdXRzaXplICogMikg KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIERPTVBSSU5URigi QlpJUDI6IG91dHB1dCB0b28gbGFyZ2UiKTsKKyAgICAgICAgICAgICAgICBm cmVlKG91dF9idWYpOworICAgICAgICAgICAgICAgIGdvdG8gYnppcDJfY2xl YW51cDsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgdG1wX2J1ZiA9 IHJlYWxsb2Mob3V0X2J1Ziwgb3V0c2l6ZSAqIDIpOwogICAgICAgICAgICAg aWYgKCB0bXBfYnVmID09IE5VTEwgKQogICAgICAgICAgICAgewpAQCAtMTcy LDkgKzE5NiwxNSBAQCBzdGF0aWMgaW50IF94Y190cnlfbHptYV9kZWNvZGUo CiAgICAgdW5zaWduZWQgY2hhciAqb3V0X2J1ZjsKICAgICB1bnNpZ25lZCBj aGFyICp0bXBfYnVmOwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBpbnQg b3V0c2l6ZTsKKyAgICBzaXplX3Qgb3V0c2l6ZTsKICAgICBjb25zdCBjaGFy ICptc2c7CiAKKyAgICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAg ICB7CisgICAgICAgIERPTVBSSU5URigiJXM6IElucHV0IGlzIDAgc2l6ZSIs IHdoYXQpOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorCiAgICAgLyog c2lnaC4gIFdlIGRvbid0IGtub3cgdXAtZnJvbnQgaG93IG11Y2ggbWVtb3J5 IHdlIGFyZSBnb2luZyB0byBuZWVkCiAgICAgICogZm9yIHRoZSBvdXRwdXQg YnVmZmVyLiAgQWxsb2NhdGUgdGhlIG91dHB1dCBidWZmZXIgdG8gYmUgZXF1 YWwKICAgICAgKiB0aGUgaW5wdXQgYnVmZmVyIHRvIHN0YXJ0LCBhbmQgd2Un bGwgcmVhbGxvYyBhcyBuZWVkZWQuCkBAIC0yNDQsMTMgKzI3NCwyMCBAQCBz dGF0aWMgaW50IF94Y190cnlfbHptYV9kZWNvZGUoCiAgICAgICAgIGlmICgg c3RyZWFtLT5hdmFpbF9vdXQgPT0gMCApCiAgICAgICAgIHsKICAgICAgICAg ICAgIC8qIFByb3RlY3QgYWdhaW5zdCBvdXRwdXQgYnVmZmVyIG92ZXJmbG93 ICovCi0gICAgICAgICAgICBpZiAoIG91dHNpemUgPiBJTlRfTUFYIC8gMiAp CisgICAgICAgICAgICBpZiAoIG91dHNpemUgPiBTSVpFX01BWCAvIDIgKQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIERPTVBSSU5URigiJXM6 IG91dHB1dCBidWZmZXIgb3ZlcmZsb3ciLCB3aGF0KTsKICAgICAgICAgICAg ICAgICBmcmVlKG91dF9idWYpOwogICAgICAgICAgICAgICAgIGdvdG8gbHpt YV9jbGVhbnVwOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBpZiAo IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sIG91dHNpemUgKiAyKSAp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCIl czogb3V0cHV0IHRvbyBsYXJnZSIsIHdoYXQpOworICAgICAgICAgICAgICAg IGZyZWUob3V0X2J1Zik7CisgICAgICAgICAgICAgICAgZ290byBsem1hX2Ns ZWFudXA7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYg PSByZWFsbG9jKG91dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAg IGlmICggdG1wX2J1ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTM1 OSw2ICszOTYsMTIgQEAgc3RhdGljIGludCB4Y190cnlfbHpvMXhfZGVjb2Rl KAogICAgICAgICAweDg5LCAweDRjLCAweDVhLCAweDRmLCAweDAwLCAweDBk LCAweDBhLCAweDFhLCAweDBhCiAgICAgfTsKIAorICAgIC8qCisgICAgICog bHpvX3VpbnQgc2hvdWxkIG1hdGNoIHNpemVfdC4gQ2hlY2sgdGhhdCB0aGlz IGlzIHRoZSBjYXNlIHRvIGJlCisgICAgICogc3VyZSB3ZSB3b24ndCBvdmVy ZmxvdyB2YXJpb3VzIGx6b191aW50IGZpZWxkcy4KKyAgICAgKi8KKyAgICBY Q19CVUlMRF9CVUdfT04oc2l6ZW9mKGx6b191aW50KSAhPSBzaXplb2Yoc2l6 ZV90KSk7CisKICAgICByZXQgPSBsem9faW5pdCgpOwogICAgIGlmICggcmV0 ICE9IExaT19FX09LICkKICAgICB7CkBAIC00MzgsNiArNDgxLDE0IEBAIHN0 YXRpYyBpbnQgeGNfdHJ5X2x6bzF4X2RlY29kZSgKICAgICAgICAgaWYgKCBz cmNfbGVuIDw9IDAgfHwgc3JjX2xlbiA+IGRzdF9sZW4gfHwgc3JjX2xlbiA+ IGxlZnQgKQogICAgICAgICAgICAgYnJlYWs7CiAKKyAgICAgICAgbXNnID0g Ik91dHB1dCBidWZmZXIgb3ZlcmZsb3ciOworICAgICAgICBpZiAoICpzaXpl ID4gU0laRV9NQVggLSBkc3RfbGVuICkKKyAgICAgICAgICAgIGJyZWFrOwor CisgICAgICAgIG1zZyA9ICJEZWNvbXByZXNzZWQgaW1hZ2UgdG9vIGxhcmdl IjsKKyAgICAgICAgaWYgKCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9t LCAqc2l6ZSArIGRzdF9sZW4pICkKKyAgICAgICAgICAgIGJyZWFrOworCiAg ICAgICAgIG1zZyA9ICJGYWlsZWQgdG8gKHJlKWFsbG9jIG1lbW9yeSI7CiAg ICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91dF9idWYsICpzaXplICsgZHN0 X2xlbik7CiAgICAgICAgIGlmICggdG1wX2J1ZiA9PSBOVUxMICkKZGlmZiAt ciBiOWMxZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hj X2RvbV9jb3JlLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2NvcmUuYwlX ZWQgT2N0IDI0IDE1OjQ5OjQxIDIwMTIgKzAxMDAKKysrIGIvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYwlGcmkgT2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAx MDAKQEAgLTE1OSw3ICsxNTksOCBAQCB2b2lkICp4Y19kb21fbWFsbG9jX3Bh Z2VfYWxpZ25lZChzdHJ1Y3QgCiB9CiAKIHZvaWQgKnhjX2RvbV9tYWxsb2Nf ZmlsZW1hcChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVf dCAqIHNpemUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Y2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKQogewogICAg IHN0cnVjdCB4Y19kb21fbWVtICpibG9jayA9IE5VTEw7CiAgICAgaW50IGZk ID0gLTE7CkBAIC0xNzEsNiArMTcyLDEzIEBAIHZvaWQgKnhjX2RvbV9tYWxs b2NfZmlsZW1hcChzdHJ1Y3QgeGNfZG8KICAgICBsc2VlayhmZCwgMCwgU0VF S19TRVQpOwogICAgICpzaXplID0gbHNlZWsoZmQsIDAsIFNFRUtfRU5EKTsK IAorICAgIGlmICggbWF4X3NpemUgJiYgKnNpemUgPiBtYXhfc2l6ZSApCisg ICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX09VVF9P Rl9NRU1PUlksCisgICAgICAgICAgICAgICAgICAgICAidHJpZWQgdG8gbWFw IGZpbGUgd2hpY2ggaXMgdG9vIGxhcmdlIik7CisgICAgICAgIGdvdG8gZXJy OworICAgIH0KKwogICAgIGJsb2NrID0gbWFsbG9jKHNpemVvZigqYmxvY2sp KTsKICAgICBpZiAoIGJsb2NrID09IE5VTEwgKQogICAgICAgICBnb3RvIGVy cjsKQEAgLTIyMiw2ICsyMzAsNDAgQEAgY2hhciAqeGNfZG9tX3N0cmR1cChz dHJ1Y3QgeGNfZG9tX2ltYWdlIAogfQogCiAvKiAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0gKi8KKy8qIGRlY29tcHJlc3Npb24gYnVmZmVyIHNpemlu ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAqLworaW50IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICAvKiBObyBsaW1p dCAqLworICAgIGlmICggIWRvbS0+bWF4X2tlcm5lbF9zaXplICkKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIHN6ID4gZG9tLT5tYXhfa2VybmVs X3NpemUgKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNo LCBYQ19JTlZBTElEX0tFUk5FTCwKKyAgICAgICAgICAgICAgICAgICAgICJr ZXJuZWwgaW1hZ2UgdG9vIGxhcmdlIik7CisgICAgICAgIHJldHVybiAxOwor ICAgIH0KKworICAgIHJldHVybiAwOworfQorCitpbnQgeGNfZG9tX3JhbWRp c2tfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVf dCBzeikKK3sKKyAgICAvKiBObyBsaW1pdCAqLworICAgIGlmICggIWRvbS0+ bWF4X3JhbWRpc2tfc2l6ZSApCisgICAgICAgIHJldHVybiAwOworCisgICAg aWYgKCBzeiA+IGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSApCisgICAgeworICAg ICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfS0VSTkVM LAorICAgICAgICAgICAgICAgICAgICAgInJhbWRpc2sgaW1hZ2UgdG9vIGxh cmdlIik7CisgICAgICAgIHJldHVybiAxOworICAgIH0KKworICAgIHJldHVy biAwOworfQorCisvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8K IC8qIHJlYWQgZmlsZXMsIGNvcHkgbWVtb3J5IGJsb2Nrcywgd2l0aCB0cmFu c3BhcmVudCBndW56aXAgICAgICAgICAgICAgICAgICAqLwogCiBzaXplX3Qg eGNfZG9tX2NoZWNrX2d6aXAoeGNfaW50ZXJmYWNlICp4Y2gsIHZvaWQgKmJs b2IsIHNpemVfdCB6aXBsZW4pCkBAIC0yMzUsNyArMjc3LDcgQEAgc2l6ZV90 IHhjX2RvbV9jaGVja19nemlwKHhjX2ludGVyZmFjZSAqeAogCiAgICAgZ3ps ZW4gPSBibG9iICsgemlwbGVuIC0gNDsKICAgICB1bnppcGxlbiA9IGd6bGVu WzNdIDw8IDI0IHwgZ3psZW5bMl0gPDwgMTYgfCBnemxlblsxXSA8PCA4IHwg Z3psZW5bMF07Ci0gICAgaWYgKCAodW56aXBsZW4gPCAwKSB8fCAodW56aXBs ZW4gPiAoMTAyNCoxMDI0KjEwMjQpKSApIC8qIDFHQiBsaW1pdCAqLworICAg IGlmICggKHVuemlwbGVuIDwgMCkgfHwgKHVuemlwbGVuID4gWENfRE9NX0RF Q09NUFJFU1NfTUFYKSApCiAgICAgewogICAgICAgICB4Y19kb21fcHJpbnRm CiAgICAgICAgICAgICAoeGNoLApAQCAtMjg4LDYgKzMzMCw5IEBAIGludCB4 Y19kb21fdHJ5X2d1bnppcChzdHJ1Y3QgeGNfZG9tX2ltYWcKICAgICBpZiAo IHVuemlwbGVuID09IDAgKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlm ICggeGNfZG9tX2tlcm5lbF9jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICkK KyAgICAgICAgcmV0dXJuIDA7CisKICAgICB1bnppcCA9IHhjX2RvbV9tYWxs b2MoZG9tLCB1bnppcGxlbik7CiAgICAgaWYgKCB1bnppcCA9PSBOVUxMICkK ICAgICAgICAgcmV0dXJuIC0xOwpAQCAtNTkwLDYgKzYzNSw5IEBAIHN0cnVj dCB4Y19kb21faW1hZ2UgKnhjX2RvbV9hbGxvY2F0ZSh4Y18KICAgICBtZW1z ZXQoZG9tLCAwLCBzaXplb2YoKmRvbSkpOwogICAgIGRvbS0+eGNoID0geGNo OwogCisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBYQ19ET01fREVDT01Q UkVTU19NQVg7CisgICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0gWENfRE9N X0RFQ09NUFJFU1NfTUFYOworCiAgICAgaWYgKCBjbWRsaW5lICkKICAgICAg ICAgZG9tLT5jbWRsaW5lID0geGNfZG9tX3N0cmR1cChkb20sIGNtZGxpbmUp OwogICAgIGlmICggZmVhdHVyZXMgKQpAQCAtNjEwLDEwICs2NTgsMjUgQEAg c3RydWN0IHhjX2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9jYXRlKHhjXwogICAg IHJldHVybiBOVUxMOwogfQogCitpbnQgeGNfZG9tX2tlcm5lbF9tYXhfc2l6 ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAg ICBET01QUklOVEYoIiVzOiBrZXJuZWxfbWF4X3NpemU9JXp4IiwgX19GVU5D VElPTl9fLCBzeik7CisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBzejsK KyAgICByZXR1cm4gMDsKK30KKworaW50IHhjX2RvbV9yYW1kaXNrX21heF9z aXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQorewor ICAgIERPTVBSSU5URigiJXM6IHJhbWRpc2tfbWF4X3NpemU9JXp4IiwgX19G VU5DVElPTl9fLCBzeik7CisgICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0g c3o7CisgICAgcmV0dXJuIDA7Cit9CisKIGludCB4Y19kb21fa2VybmVsX2Zp bGUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpmaWxl bmFtZSkKIHsKICAgICBET01QUklOVEYoIiVzOiBmaWxlbmFtZT1cIiVzXCIi LCBfX0ZVTkNUSU9OX18sIGZpbGVuYW1lKTsKLSAgICBkb20tPmtlcm5lbF9i bG9iID0geGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZk b20tPmtlcm5lbF9zaXplKTsKKyAgICBkb20tPmtlcm5lbF9ibG9iID0geGNf ZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5l bF9zaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZG9tLT5tYXhfa2VybmVsX3NpemUpOwogICAgIGlmICggZG9t LT5rZXJuZWxfYmxvYiA9PSBOVUxMICkKICAgICAgICAgcmV0dXJuIC0xOwog ICAgIHJldHVybiB4Y19kb21fdHJ5X2d1bnppcChkb20sICZkb20tPmtlcm5l bF9ibG9iLCAmZG9tLT5rZXJuZWxfc2l6ZSk7CkBAIC02MjMsNyArNjg2LDkg QEAgaW50IHhjX2RvbV9yYW1kaXNrX2ZpbGUoc3RydWN0IHhjX2RvbV9pbQog ewogICAgIERPTVBSSU5URigiJXM6IGZpbGVuYW1lPVwiJXNcIiIsIF9fRlVO Q1RJT05fXywgZmlsZW5hbWUpOwogICAgIGRvbS0+cmFtZGlza19ibG9iID0K LSAgICAgICAgeGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUs ICZkb20tPnJhbWRpc2tfc2l6ZSk7CisgICAgICAgIHhjX2RvbV9tYWxsb2Nf ZmlsZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5yYW1kaXNrX3NpemUsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb20tPm1heF9yYW1kaXNr X3NpemUpOworCiAgICAgaWYgKCBkb20tPnJhbWRpc2tfYmxvYiA9PSBOVUxM ICkKICAgICAgICAgcmV0dXJuIC0xOwogLy8gICAgcmV0dXJuIHhjX2RvbV90 cnlfZ3VuemlwKGRvbSwgJmRvbS0+cmFtZGlza19ibG9iLCAmZG9tLT5yYW1k aXNrX3NpemUpOwpAQCAtNzgzLDcgKzg0OCwxMSBAQCBpbnQgeGNfZG9tX2J1 aWxkX2ltYWdlKHN0cnVjdCB4Y19kb21faW1hCiAgICAgICAgIHZvaWQgKnJh bWRpc2ttYXA7CiAKICAgICAgICAgdW56aXBsZW4gPSB4Y19kb21fY2hlY2tf Z3ppcChkb20tPnhjaCwgZG9tLT5yYW1kaXNrX2Jsb2IsIGRvbS0+cmFtZGlz a19zaXplKTsKKyAgICAgICAgaWYgKCB4Y19kb21fcmFtZGlza19jaGVja19z aXplKGRvbSwgdW56aXBsZW4pICE9IDAgKQorICAgICAgICAgICAgdW56aXBs ZW4gPSAwOworCiAgICAgICAgIHJhbWRpc2tsZW4gPSB1bnppcGxlbiA/IHVu emlwbGVuIDogZG9tLT5yYW1kaXNrX3NpemU7CisKICAgICAgICAgaWYgKCB4 Y19kb21fYWxsb2Nfc2VnbWVudChkb20sICZkb20tPnJhbWRpc2tfc2VnLCAi cmFtZGlzayIsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmFtZGlza2xlbikgIT0gMCApCiAgICAgICAgICAgICBnb3RvIGVycjsK --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2f-0001Pl-Ho; Tue, 13 Nov 2012 12:56:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2d-0001NS-S4; Tue, 13 Nov 2012 12:56:36 +0000 Received: from [85.158.138.51:17606] by server-3.bemta-3.messagelabs.com id F8/84-31566-28342A05; Tue, 13 Nov 2012 12:56:34 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-6.tower-174.messagelabs.com!1352811391!21808416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30348 invoked from network); 13 Nov 2012 12:56:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2R-0008VH-9g; Tue, 13 Nov 2012 12:56:23 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2R-00010J-89; Tue, 13 Nov 2012 12:56:23 +0000 Date: Tue, 13 Nov 2012 12:56:23 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 25 (CVE-2012-4544, CVE-2012-2625) - Xen domain builder Out-of-memory due to malicious kernel/ramdisk X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4544,CVE-2012-2625 / XSA-25 version 2 Xen domain builder Out-of-memory due to malicious kernel/ramdisk UPDATES IN VERSION 2 ==================== Clarify that XSA-25 is reporting, via the Xen.org security process, both CVE-2012-4544 and CVE-2012-2625. Also we would like to apologise for the fact that xen-announce's copy of version 1 of this advisory was delayed in mailing list moderation. ISSUE DESCRIPTION ================= The Xen PV domain builder contained no validation of the size of the supplied kernel or ramdisk either before or after decompression. This could cause the toolstack to consume all available RAM in the domain running the domain builder. (CVE-2012-4544) Additionally, under similar circumstances pygrub consume excessive amount of memory under similar circumstances to the above. (CVE-2012-2625) IMPACT ====== A malicious guest administrator who can supply a kernel or ramdisk can exhaust memory in domain 0 leading to a denial of service attack. VULNERABLE SYSTEMS ================== All versions of Xen are vulnerable. MITIGATION ========== Running only trusted kernels and ramdisks will avoid these vulnerabilities. Using pvgrub also avoids these vulnerabilities since the builder will run in guest context. (nb: use of pygrub *is* vulnerable). Running only HVM guests will avoid these vulnerabilities. RESOLUTION ========== Applying the appropriate attached patch resolves these issues. The pygrub problem (CVE-2012-2625) was fixed in xen-unstable (and the fix inherited by Xen 4.2.x) in revision 25589:60f09d1ab1fe but not called out as a security problem. This fix is also included, where necessary, in the patches below. xsa25-unstable.patch Xen unstable xsa25-4.2.patch Xen 4.2.x xsa25-4.1.patch Xen 4.1.x $ sha256sum xsa25*.patch 613e4b82cdc9cabf9cbd52076118887b298c47e680c2066a28a77f12e9f90606 xsa25-4.1.patch 135bc089d003f9b97991764c37b1ab8d37e9cbcfa1b9bd7429b4503abe00c8f5 xsa25-4.2.patch 534495b7eef6e599f5814f0a67fc84fbe2e8eee9d223a09ad178ff63bdcda3dd xsa25-unstable.patch Note that these patches impose a new size limit of 1Gby on both the compressed and uncompressed sizes of ramdisks. On some systems it may be desirable to relax these limits and risk virtual address or memory exhaustion in the toolstack. This can be achieved by setting XC_DOM_DECOMPRESS_MAX to the desired limit (in bytes). This can be done by building with "APPEND_CFLAGS=-DXC_DOM_DECOMPRESS_MAX=" or by editing tools/libxc/xc_dom.h directly. NOTE REGARDING LACK OF EMBARGO ============================== These issues have already been discussed in public in various places, including https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-2625 and http://bugs.debian.org/688125. This advisory is therefore not subject to an embargo. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGyAAoJEIP+FMlX6CvZl7wH/RdoQHGDcbgVEh5fuS5VzPpw RZ0sm6bpI7eclqaN6+thX9SA5qeycvyj2zq769yUGSiHR+BUNw6HRJZ+XAAF0IIx nb4VEdS2+Hz1kyTUAeZu3z/5HyfFamKY9Lhhj/47DBTtO5Xl1pjOCA0bC4ZDtIm1 ffFVhOmTcmQEWXW1z27Vj9hSgQeGsqHTcOys6H0nYpLITDIZqBkGv8MZl4X0/Wtl zs2prG8HEWsysKel5Q/dt7De84OV3LgP1/2a+aMkLi+RgKWP+naKAXfYqVAS4mLw K+mv2MrmhgNxzEWp/sZX0q1QNvnJf+xKYHOBcP+hUlQIQwD/NQejdAdmNVPem7s= =Pfj+ -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa25-4.1.patch" Content-Disposition: attachment; filename="xsa25-4.1.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpbIEluY2x1ZGVzIDI1 NTg5OjYwZjA5ZDFhYjFmZSBmb3IgQ1ZFLTIwMTItMjYyNSBdCgpkaWZmIC0t Z2l0IGEvc3R1YmRvbS9ncnViL2tleGVjLmMgYi9zdHViZG9tL2dydWIva2V4 ZWMuYwppbmRleCAwNmJlZjUyLi5iMjFjOTFhIDEwMDY0NAotLS0gYS9zdHVi ZG9tL2dydWIva2V4ZWMuYworKysgYi9zdHViZG9tL2dydWIva2V4ZWMuYwpA QCAtMTM3LDYgKzEzNywxMCBAQCB2b2lkIGtleGVjKHZvaWQgKmtlcm5lbCwg bG9uZyBrZXJuZWxfc2l6ZSwgdm9pZCAqbW9kdWxlLCBsb25nIG1vZHVsZV9z aXplLCBjaGFyCiAgICAgZG9tID0geGNfZG9tX2FsbG9jYXRlKHhjX2hhbmRs ZSwgY21kbGluZSwgZmVhdHVyZXMpOwogICAgIGRvbS0+YWxsb2NhdGUgPSBr ZXhlY19hbGxvY2F0ZTsKIAorICAgIC8qIFdlIGFyZSB1c2luZyBndWVzdCBv d25lZCBtZW1vcnksIHRoZXJlZm9yZSBubyBsaW1pdHMuICovCisgICAgeGNf ZG9tX2tlcm5lbF9tYXhfc2l6ZShkb20sIDApOworICAgIHhjX2RvbV9yYW1k aXNrX21heF9zaXplKGRvbSwgMCk7CisKICAgICBkb20tPmtlcm5lbF9ibG9i ID0ga2VybmVsOwogICAgIGRvbS0+a2VybmVsX3NpemUgPSBrZXJuZWxfc2l6 ZTsKIApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tLmggYi90b29s cy9saWJ4Yy94Y19kb20uaAppbmRleCBlNzJmMDY2Li43MDQzZjk2IDEwMDY0 NAotLS0gYS90b29scy9saWJ4Yy94Y19kb20uaAorKysgYi90b29scy9saWJ4 Yy94Y19kb20uaApAQCAtNTIsNiArNTIsOSBAQCBzdHJ1Y3QgeGNfZG9tX2lt YWdlIHsKICAgICB2b2lkICpyYW1kaXNrX2Jsb2I7CiAgICAgc2l6ZV90IHJh bWRpc2tfc2l6ZTsKIAorICAgIHNpemVfdCBtYXhfa2VybmVsX3NpemU7Cisg ICAgc2l6ZV90IG1heF9yYW1kaXNrX3NpemU7CisKICAgICAvKiBhcmd1bWVu dHMgYW5kIHBhcmFtZXRlcnMgKi8KICAgICBjaGFyICpjbWRsaW5lOwogICAg IHVpbnQzMl90IGZfcmVxdWVzdGVkW1hFTkZFQVRfTlJfU1VCTUFQU107CkBA IC0xNzUsNiArMTc4LDIzIEBAIHZvaWQgeGNfZG9tX3JlbGVhc2VfcGh5cyhz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pOwogdm9pZCB4Y19kb21fcmVsZWFz ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pOwogaW50IHhjX2RvbV9tZW1f aW5pdChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHVuc2lnbmVkIGludCBt ZW1fbWIpOwogCisvKiBTZXQgdGhpcyBsYXJnZXIgaWYgeW91IGhhdmUgZW5v cm1vdXMgcmFtZGlza3Mva2VybmVscy4gTm90ZSB0aGF0CisgKiB5b3Ugc2hv dWxkIHRydXN0IGFsbCBrZXJuZWxzIG5vdCB0byBiZSBtYWxpY2lvdXNseSBs YXJnZSAoZS5nLiB0bworICogZXhoYXVzdCBhbGwgZG9tMCBtZW1vcnkpIGlm IHlvdSBkbyB0aGlzIChzZWUgQ1ZFLTIwMTItNDU0NCAvCisgKiBYU0EtMjUp LiBZb3UgY2FuIGFsc28gc2V0IHRoZSBkZWZhdWx0IGluZGVwZW5kZW50bHkg Zm9yCisgKiByYW1kaXNrcy9rZXJuZWxzIGluIHhjX2RvbV9hbGxvY2F0ZSgp IG9yIGNhbGwKKyAqIHhjX2RvbV97a2VybmVsLHJhbWRpc2t9X21heF9zaXpl LgorICovCisjaWZuZGVmIFhDX0RPTV9ERUNPTVBSRVNTX01BWAorI2RlZmlu ZSBYQ19ET01fREVDT01QUkVTU19NQVggKDEwMjQqMTAyNCoxMDI0KSAvKiAx R0IgKi8KKyNlbmRpZgorCitpbnQgeGNfZG9tX2tlcm5lbF9jaGVja19zaXpl KHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KTsKK2ludCB4 Y19kb21fa2VybmVsX21heF9zaXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRv bSwgc2l6ZV90IHN6KTsKKworaW50IHhjX2RvbV9yYW1kaXNrX2NoZWNrX3Np emUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworaW50 IHhjX2RvbV9yYW1kaXNrX21heF9zaXplKHN0cnVjdCB4Y19kb21faW1hZ2Ug KmRvbSwgc2l6ZV90IHN6KTsKKwogc2l6ZV90IHhjX2RvbV9jaGVja19nemlw KHhjX2ludGVyZmFjZSAqeGNoLAogICAgICAgICAgICAgICAgICAgICAgdm9p ZCAqYmxvYiwgc2l6ZV90IHppcGxlbik7CiBpbnQgeGNfZG9tX2RvX2d1bnpp cCh4Y19pbnRlcmZhY2UgKnhjaCwKQEAgLTIyNCw3ICsyNDQsOCBAQCB2b2lk IHhjX2RvbV9sb2dfbWVtb3J5X2Zvb3RwcmludChzdHJ1Y3QgeGNfZG9tX2lt YWdlICpkb20pOwogdm9pZCAqeGNfZG9tX21hbGxvYyhzdHJ1Y3QgeGNfZG9t X2ltYWdlICpkb20sIHNpemVfdCBzaXplKTsKIHZvaWQgKnhjX2RvbV9tYWxs b2NfcGFnZV9hbGlnbmVkKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHNpemUpOwogdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBjaGFyICpmaWxlbmFtZSwgc2l6ZV90ICogc2l6ZSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5h bWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKTsKIGNoYXIgKnhjX2RvbV9zdHJk dXAoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpzdHIp OwogCiAvKiAtLS0gYWxsb2MgbWVtb3J5IHBvb2wgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwpkaWZmIC0tZ2l0IGEv dG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYyBiL3Rvb2xzL2xp YnhjL3hjX2RvbV9iemltYWdlbG9hZGVyLmMKaW5kZXggOTg1MmU2Ny4uNzNj ZmFkMSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vs b2FkZXIuYworKysgYi90b29scy9saWJ4Yy94Y19kb21fYnppbWFnZWxvYWRl ci5jCkBAIC00NywxMyArNDcsMTkgQEAgc3RhdGljIGludCB4Y190cnlfYnpp cDJfZGVjb2RlKAogICAgIGNoYXIgKm91dF9idWY7CiAgICAgY2hhciAqdG1w X2J1ZjsKICAgICBpbnQgcmV0dmFsID0gLTE7Ci0gICAgaW50IG91dHNpemU7 CisgICAgdW5zaWduZWQgaW50IG91dHNpemU7CiAgICAgdWludDY0X3QgdG90 YWw7CiAKICAgICBzdHJlYW0uYnphbGxvYyA9IE5VTEw7CiAgICAgc3RyZWFt LmJ6ZnJlZSA9IE5VTEw7CiAgICAgc3RyZWFtLm9wYXF1ZSA9IE5VTEw7CiAK KyAgICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAgICB7CisgICAg ICAgIERPTVBSSU5URigiQlpJUDI6IElucHV0IGlzIDAgc2l6ZSIpOworICAg ICAgICByZXR1cm4gLTE7CisgICAgfQorCiAgICAgcmV0ID0gQloyX2J6RGVj b21wcmVzc0luaXQoJnN0cmVhbSwgMCwgMCk7CiAgICAgaWYgKCByZXQgIT0g QlpfT0sgKQogICAgIHsKQEAgLTY2LDYgKzcyLDE3IEBAIHN0YXRpYyBpbnQg eGNfdHJ5X2J6aXAyX2RlY29kZSgKICAgICAgKiB0aGUgaW5wdXQgYnVmZmVy IHRvIHN0YXJ0LCBhbmQgd2UnbGwgcmVhbGxvYyBhcyBuZWVkZWQuCiAgICAg ICovCiAgICAgb3V0c2l6ZSA9IGRvbS0+a2VybmVsX3NpemU7CisKKyAgICAv KgorICAgICAqIHN0cmVhbS5hdmFpbF9pbiBhbmQgb3V0c2l6ZSBhcmUgdW5z aWduZWQgaW50LCB3aGlsZSBrZXJuZWxfc2l6ZQorICAgICAqIGlzIGEgc2l6 ZV90LiBDaGVjayB3ZSBhcmVuJ3Qgb3ZlcmZsb3dpbmcuCisgICAgICovCisg ICAgaWYgKCBvdXRzaXplICE9IGRvbS0+a2VybmVsX3NpemUgKQorICAgIHsK KyAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogSW5wdXQgdG9vIGxhcmdlIik7 CisgICAgICAgIGdvdG8gYnppcDJfY2xlYW51cDsKKyAgICB9CisKICAgICBv dXRfYnVmID0gbWFsbG9jKG91dHNpemUpOwogICAgIGlmICggb3V0X2J1ZiA9 PSBOVUxMICkKICAgICB7CkBAIC05OCwxMyArMTE1LDIwIEBAIHN0YXRpYyBp bnQgeGNfdHJ5X2J6aXAyX2RlY29kZSgKICAgICAgICAgaWYgKCBzdHJlYW0u YXZhaWxfb3V0ID09IDAgKQogICAgICAgICB7CiAgICAgICAgICAgICAvKiBQ cm90ZWN0IGFnYWluc3Qgb3V0cHV0IGJ1ZmZlciBvdmVyZmxvdyAqLwotICAg ICAgICAgICAgaWYgKCBvdXRzaXplID4gSU5UX01BWCAvIDIgKQorICAgICAg ICAgICAgaWYgKCBvdXRzaXplID4gVUlOVF9NQVggLyAyICkKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICBET01QUklOVEYoIkJaSVAyOiBvdXRw dXQgYnVmZmVyIG92ZXJmbG93Iik7CiAgICAgICAgICAgICAgICAgZnJlZShv dXRfYnVmKTsKICAgICAgICAgICAgICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7 CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIGlmICggeGNfZG9tX2tl cm5lbF9jaGVja19zaXplKGRvbSwgb3V0c2l6ZSAqIDIpICkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBET01QUklOVEYoIkJaSVAyOiBvdXRw dXQgdG9vIGxhcmdlIik7CisgICAgICAgICAgICAgICAgZnJlZShvdXRfYnVm KTsKKyAgICAgICAgICAgICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91 dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAgIGlmICggdG1wX2J1 ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTE3Miw5ICsxOTYsMTUg QEAgc3RhdGljIGludCB4Y190cnlfbHptYV9kZWNvZGUoCiAgICAgdW5zaWdu ZWQgY2hhciAqb3V0X2J1ZjsKICAgICB1bnNpZ25lZCBjaGFyICp0bXBfYnVm OwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBpbnQgb3V0c2l6ZTsKKyAg ICBzaXplX3Qgb3V0c2l6ZTsKICAgICBjb25zdCBjaGFyICptc2c7CiAKKyAg ICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAgICB7CisgICAgICAg IERPTVBSSU5URigiTFpNQTogSW5wdXQgaXMgMCBzaXplIik7CisgICAgICAg IHJldHVybiAtMTsKKyAgICB9CisKICAgICByZXQgPSBsem1hX2Fsb25lX2Rl Y29kZXIoJnN0cmVhbSwgMTI4KjEwMjQqMTAyNCk7CiAgICAgaWYgKCByZXQg IT0gTFpNQV9PSyApCiAgICAgewpAQCAtMjUxLDEzICsyODEsMjAgQEAgc3Rh dGljIGludCB4Y190cnlfbHptYV9kZWNvZGUoCiAgICAgICAgIGlmICggc3Ry ZWFtLmF2YWlsX291dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAg LyogUHJvdGVjdCBhZ2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8K LSAgICAgICAgICAgIGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAg ICAgICAgICAgIGlmICggb3V0c2l6ZSA+IFNJWkVfTUFYIC8gMiApCiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJMWk1BOiBv dXRwdXQgYnVmZmVyIG92ZXJmbG93Iik7CiAgICAgICAgICAgICAgICAgZnJl ZShvdXRfYnVmKTsKICAgICAgICAgICAgICAgICBnb3RvIGx6bWFfY2xlYW51 cDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYgKCB4Y19kb21f a2VybmVsX2NoZWNrX3NpemUoZG9tLCBvdXRzaXplICogMikgKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIERPTVBSSU5URigiTFpNQTogb3V0 cHV0IHRvbyBsYXJnZSIpOworICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CisgICAgICAgICAgICAgICAgZ290byBsem1hX2NsZWFudXA7CisgICAg ICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91 dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAgIGlmICggdG1wX2J1 ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTMyNyw2ICszNjQsMTIg QEAgc3RhdGljIGludCB4Y190cnlfbHpvMXhfZGVjb2RlKAogICAgICAgICAw eDg5LCAweDRjLCAweDVhLCAweDRmLCAweDAwLCAweDBkLCAweDBhLCAweDFh LCAweDBhCiAgICAgfTsKIAorICAgIC8qCisgICAgICogbHpvX3VpbnQgc2hv dWxkIG1hdGNoIHNpemVfdC4gQ2hlY2sgdGhhdCB0aGlzIGlzIHRoZSBjYXNl IHRvIGJlCisgICAgICogc3VyZSB3ZSB3b24ndCBvdmVyZmxvdyB2YXJpb3Vz IGx6b191aW50IGZpZWxkcy4KKyAgICAgKi8KKyAgICBYQ19CVUlMRF9CVUdf T04oc2l6ZW9mKGx6b191aW50KSAhPSBzaXplb2Yoc2l6ZV90KSk7CisKICAg ICByZXQgPSBsem9faW5pdCgpOwogICAgIGlmICggcmV0ICE9IExaT19FX09L ICkKICAgICB7CkBAIC00MDYsNiArNDQ5LDE0IEBAIHN0YXRpYyBpbnQgeGNf dHJ5X2x6bzF4X2RlY29kZSgKICAgICAgICAgaWYgKCBzcmNfbGVuIDw9IDAg fHwgc3JjX2xlbiA+IGRzdF9sZW4gfHwgc3JjX2xlbiA+IGxlZnQgKQogICAg ICAgICAgICAgYnJlYWs7CiAKKyAgICAgICAgbXNnID0gIk91dHB1dCBidWZm ZXIgb3ZlcmZsb3ciOworICAgICAgICBpZiAoICpzaXplID4gU0laRV9NQVgg LSBkc3RfbGVuICkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIG1z ZyA9ICJEZWNvbXByZXNzZWQgaW1hZ2UgdG9vIGxhcmdlIjsKKyAgICAgICAg aWYgKCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9tLCAqc2l6ZSArIGRz dF9sZW4pICkKKyAgICAgICAgICAgIGJyZWFrOworCiAgICAgICAgIG1zZyA9 ICJGYWlsZWQgdG8gKHJlKWFsbG9jIG1lbW9yeSI7CiAgICAgICAgIHRtcF9i dWYgPSByZWFsbG9jKG91dF9idWYsICpzaXplICsgZHN0X2xlbik7CiAgICAg ICAgIGlmICggdG1wX2J1ZiA9PSBOVUxMICkKZGlmZiAtLWdpdCBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9jb3JlLmMgYi90b29scy9saWJ4Yy94Y19kb21fY29y ZS5jCmluZGV4IGZlYTlkZTUuLjJhMDFkN2MgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9jb3JlLmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9t X2NvcmUuYwpAQCAtMTU5LDcgKzE1OSw4IEBAIHZvaWQgKnhjX2RvbV9tYWxs b2NfcGFnZV9hbGlnbmVkKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHNpemUpCiB9CiAKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmls ZW5hbWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKQogewogICAgIHN0cnVjdCB4 Y19kb21fbWVtICpibG9jayA9IE5VTEw7CiAgICAgaW50IGZkID0gLTE7CkBA IC0xNzEsNiArMTcyLDEzIEBAIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1h cChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCiAgICAgbHNlZWsoZmQsIDAs IFNFRUtfU0VUKTsKICAgICAqc2l6ZSA9IGxzZWVrKGZkLCAwLCBTRUVLX0VO RCk7CiAKKyAgICBpZiAoIG1heF9zaXplICYmICpzaXplID4gbWF4X3NpemUg KQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNoLCBYQ19P VVRfT0ZfTUVNT1JZLAorICAgICAgICAgICAgICAgICAgICAgInRyaWVkIHRv IG1hcCBmaWxlIHdoaWNoIGlzIHRvbyBsYXJnZSIpOworICAgICAgICBnb3Rv IGVycjsKKyAgICB9CisKICAgICBibG9jayA9IG1hbGxvYyhzaXplb2YoKmJs b2NrKSk7CiAgICAgaWYgKCBibG9jayA9PSBOVUxMICkKICAgICAgICAgZ290 byBlcnI7CkBAIC0yMjIsNiArMjMwLDQwIEBAIGNoYXIgKnhjX2RvbV9zdHJk dXAoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpzdHIp CiB9CiAKIC8qIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLworLyog ZGVjb21wcmVzc2lvbiBidWZmZXIgc2l6aW5nICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICovCitpbnQgeGNfZG9tX2tl cm5lbF9jaGVja19zaXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6 ZV90IHN6KQoreworICAgIC8qIE5vIGxpbWl0ICovCisgICAgaWYgKCAhZG9t LT5tYXhfa2VybmVsX3NpemUgKQorICAgICAgICByZXR1cm4gMDsKKworICAg IGlmICggc3ogPiBkb20tPm1heF9rZXJuZWxfc2l6ZSApCisgICAgeworICAg ICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfS0VSTkVM LAorICAgICAgICAgICAgICAgICAgICAgImtlcm5lbCBpbWFnZSB0b28gbGFy Z2UiKTsKKyAgICAgICAgcmV0dXJuIDE7CisgICAgfQorCisgICAgcmV0dXJu IDA7Cit9CisKK2ludCB4Y19kb21fcmFtZGlza19jaGVja19zaXplKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQoreworICAgIC8qIE5v IGxpbWl0ICovCisgICAgaWYgKCAhZG9tLT5tYXhfcmFtZGlza19zaXplICkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIHN6ID4gZG9tLT5tYXhf cmFtZGlza19zaXplICkKKyAgICB7CisgICAgICAgIHhjX2RvbV9wYW5pYyhk b20tPnhjaCwgWENfSU5WQUxJRF9LRVJORUwsCisgICAgICAgICAgICAgICAg ICAgICAicmFtZGlzayBpbWFnZSB0b28gbGFyZ2UiKTsKKyAgICAgICAgcmV0 dXJuIDE7CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKKy8qIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwogLyogcmVhZCBmaWxlcywgY29w eSBtZW1vcnkgYmxvY2tzLCB3aXRoIHRyYW5zcGFyZW50IGd1bnppcCAgICAg ICAgICAgICAgICAgICovCiAKIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4 Y19pbnRlcmZhY2UgKnhjaCwgdm9pZCAqYmxvYiwgc2l6ZV90IHppcGxlbikK QEAgLTIzNSw3ICsyNzcsNyBAQCBzaXplX3QgeGNfZG9tX2NoZWNrX2d6aXAo eGNfaW50ZXJmYWNlICp4Y2gsIHZvaWQgKmJsb2IsIHNpemVfdCB6aXBsZW4p CiAKICAgICBnemxlbiA9IGJsb2IgKyB6aXBsZW4gLSA0OwogICAgIHVuemlw bGVuID0gZ3psZW5bM10gPDwgMjQgfCBnemxlblsyXSA8PCAxNiB8IGd6bGVu WzFdIDw8IDggfCBnemxlblswXTsKLSAgICBpZiAoICh1bnppcGxlbiA8IDAp IHx8ICh1bnppcGxlbiA+ICgxMDI0KjEwMjQqMTAyNCkpICkgLyogMUdCIGxp bWl0ICovCisgICAgaWYgKCAodW56aXBsZW4gPCAwKSB8fCAodW56aXBsZW4g PiBYQ19ET01fREVDT01QUkVTU19NQVgpICkKICAgICB7CiAgICAgICAgIHhj X2RvbV9wcmludGYKICAgICAgICAgICAgICh4Y2gsCkBAIC0yODgsNiArMzMw LDkgQEAgaW50IHhjX2RvbV90cnlfZ3VuemlwKHN0cnVjdCB4Y19kb21faW1h Z2UgKmRvbSwgdm9pZCAqKmJsb2IsIHNpemVfdCAqIHNpemUpCiAgICAgaWYg KCB1bnppcGxlbiA9PSAwICkKICAgICAgICAgcmV0dXJuIDA7CiAKKyAgICBp ZiAoIHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sIHVuemlwbGVuKSAp CisgICAgICAgIHJldHVybiAwOworCiAgICAgdW56aXAgPSB4Y19kb21fbWFs bG9jKGRvbSwgdW56aXBsZW4pOwogICAgIGlmICggdW56aXAgPT0gTlVMTCAp CiAgICAgICAgIHJldHVybiAtMTsKQEAgLTU4OCw2ICs2MzMsOSBAQCBzdHJ1 Y3QgeGNfZG9tX2ltYWdlICp4Y19kb21fYWxsb2NhdGUoeGNfaW50ZXJmYWNl ICp4Y2gsCiAgICAgbWVtc2V0KGRvbSwgMCwgc2l6ZW9mKCpkb20pKTsKICAg ICBkb20tPnhjaCA9IHhjaDsKIAorICAgIGRvbS0+bWF4X2tlcm5lbF9zaXpl ID0gWENfRE9NX0RFQ09NUFJFU1NfTUFYOworICAgIGRvbS0+bWF4X3JhbWRp c2tfc2l6ZSA9IFhDX0RPTV9ERUNPTVBSRVNTX01BWDsKKwogICAgIGlmICgg Y21kbGluZSApCiAgICAgICAgIGRvbS0+Y21kbGluZSA9IHhjX2RvbV9zdHJk dXAoZG9tLCBjbWRsaW5lKTsKICAgICBpZiAoIGZlYXR1cmVzICkKQEAgLTYw OCwxMCArNjU2LDI1IEBAIHN0cnVjdCB4Y19kb21faW1hZ2UgKnhjX2RvbV9h bGxvY2F0ZSh4Y19pbnRlcmZhY2UgKnhjaCwKICAgICByZXR1cm4gTlVMTDsK IH0KIAoraW50IHhjX2RvbV9rZXJuZWxfbWF4X3NpemUoc3RydWN0IHhjX2Rv bV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opCit7CisgICAgRE9NUFJJTlRGKCIl czoga2VybmVsX21heF9zaXplPSV6eCIsIF9fRlVOQ1RJT05fXywgc3opOwor ICAgIGRvbS0+bWF4X2tlcm5lbF9zaXplID0gc3o7CisgICAgcmV0dXJuIDA7 Cit9CisKK2ludCB4Y19kb21fcmFtZGlza19tYXhfc2l6ZShzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICBET01QUklOVEYo IiVzOiByYW1kaXNrX21heF9zaXplPSV6eCIsIF9fRlVOQ1RJT05fXywgc3op OworICAgIGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSA9IHN6OworICAgIHJldHVy biAwOworfQorCiBpbnQgeGNfZG9tX2tlcm5lbF9maWxlKHN0cnVjdCB4Y19k b21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqZmlsZW5hbWUpCiB7CiAgICAg RE9NUFJJTlRGKCIlczogZmlsZW5hbWU9XCIlc1wiIiwgX19GVU5DVElPTl9f LCBmaWxlbmFtZSk7Ci0gICAgZG9tLT5rZXJuZWxfYmxvYiA9IHhjX2RvbV9t YWxsb2NfZmlsZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5rZXJuZWxfc2l6 ZSk7CisgICAgZG9tLT5rZXJuZWxfYmxvYiA9IHhjX2RvbV9tYWxsb2NfZmls ZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5rZXJuZWxfc2l6ZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbS0+ bWF4X2tlcm5lbF9zaXplKTsKICAgICBpZiAoIGRvbS0+a2VybmVsX2Jsb2Ig PT0gTlVMTCApCiAgICAgICAgIHJldHVybiAtMTsKICAgICByZXR1cm4geGNf ZG9tX3RyeV9ndW56aXAoZG9tLCAmZG9tLT5rZXJuZWxfYmxvYiwgJmRvbS0+ a2VybmVsX3NpemUpOwpAQCAtNjIxLDcgKzY4NCw5IEBAIGludCB4Y19kb21f cmFtZGlza19maWxlKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3Qg Y2hhciAqZmlsZW5hbWUpCiB7CiAgICAgRE9NUFJJTlRGKCIlczogZmlsZW5h bWU9XCIlc1wiIiwgX19GVU5DVElPTl9fLCBmaWxlbmFtZSk7CiAgICAgZG9t LT5yYW1kaXNrX2Jsb2IgPQotICAgICAgICB4Y19kb21fbWFsbG9jX2ZpbGVt YXAoZG9tLCBmaWxlbmFtZSwgJmRvbS0+cmFtZGlza19zaXplKTsKKyAgICAg ICAgeGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20t PnJhbWRpc2tfc2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSk7CisKICAgICBpZiAoIGRvbS0+cmFt ZGlza19ibG9iID09IE5VTEwgKQogICAgICAgICByZXR1cm4gLTE7CiAvLyAg ICByZXR1cm4geGNfZG9tX3RyeV9ndW56aXAoZG9tLCAmZG9tLT5yYW1kaXNr X2Jsb2IsICZkb20tPnJhbWRpc2tfc2l6ZSk7CkBAIC03ODEsNyArODQ2LDEx IEBAIGludCB4Y19kb21fYnVpbGRfaW1hZ2Uoc3RydWN0IHhjX2RvbV9pbWFn ZSAqZG9tKQogICAgICAgICB2b2lkICpyYW1kaXNrbWFwOwogCiAgICAgICAg IHVuemlwbGVuID0geGNfZG9tX2NoZWNrX2d6aXAoZG9tLT54Y2gsIGRvbS0+ cmFtZGlza19ibG9iLCBkb20tPnJhbWRpc2tfc2l6ZSk7CisgICAgICAgIGlm ICggeGNfZG9tX3JhbWRpc2tfY2hlY2tfc2l6ZShkb20sIHVuemlwbGVuKSAh PSAwICkKKyAgICAgICAgICAgIHVuemlwbGVuID0gMDsKKwogICAgICAgICBy YW1kaXNrbGVuID0gdW56aXBsZW4gPyB1bnppcGxlbiA6IGRvbS0+cmFtZGlz a19zaXplOworCiAgICAgICAgIGlmICggeGNfZG9tX2FsbG9jX3NlZ21lbnQo ZG9tLCAmZG9tLT5yYW1kaXNrX3NlZywgInJhbWRpc2siLCAwLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbWRpc2tsZW4pICE9IDAg KQogICAgICAgICAgICAgZ290byBlcnI7CmRpZmYgLS1naXQgYS90b29scy9w eWdydWIvc3JjL3B5Z3J1YiBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCmlu ZGV4IDE3YzAwODMuLjFhM2MxYzMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5Z3J1 Yi9zcmMvcHlncnViCisrKyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvcHlncnViCkBA IC0yOCw2ICsyOCw3IEBAIGltcG9ydCBncnViLkxpbG9Db25mCiBpbXBvcnQg Z3J1Yi5FeHRMaW51eENvbmYKIAogUFlHUlVCX1ZFUiA9IDAuNgorRlNfUkVB RF9NQVggPSAxMDI0ICogMTAyNAogCiBkZWYgZW5hYmxlX2N1cnNvcihpc29u KToKICAgICBpZiBpc29uOgpAQCAtNDIxLDcgKzQyMiw4IEBAIGNsYXNzIEdy dWI6CiAgICAgICAgIGlmIHNlbGYuX19kaWN0X18uZ2V0KCdjZicsIE5vbmUp IGlzIE5vbmU6CiAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IsICJj b3VsZG4ndCBmaW5kIGJvb3Rsb2FkZXIgY29uZmlnIGZpbGUgaW4gdGhlIGlt YWdlIHByb3ZpZGVkLiIKICAgICAgICAgZiA9IGZzLm9wZW5fZmlsZShzZWxm LmNmLmZpbGVuYW1lKQotICAgICAgICBidWYgPSBmLnJlYWQoKQorICAgICAg ICAjIGxpbWl0IHJlYWQgc2l6ZSB0byBhdm9pZCBwYXRob2xvZ2ljYWwgY2Fz ZXMKKyAgICAgICAgYnVmID0gZi5yZWFkKEZTX1JFQURfTUFYKQogICAgICAg ICBkZWwgZgogICAgICAgICBzZWxmLmNmLnBhcnNlKGJ1ZikKIApAQCAtNjcw LDYgKzY3MiwzNyBAQCBpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAg IGRlZiB1c2FnZSgpOgogICAgICAgICBwcmludCA+PiBzeXMuc3RkZXJyLCAi VXNhZ2U6ICVzIFstcXwtLXF1aWV0XSBbLWl8LS1pbnRlcmFjdGl2ZV0gWy1u fC0tbm90LXJlYWxseV0gWy0tb3V0cHV0PV0gWy0ta2VybmVsPV0gWy0tcmFt ZGlzaz1dIFstLWFyZ3M9XSBbLS1lbnRyeT1dIFstLW91dHB1dC1kaXJlY3Rv cnk9XSBbLS1vdXRwdXQtZm9ybWF0PXN4cHxzaW1wbGV8c2ltcGxlMF0gPGlt YWdlPiIgJShzeXMuYXJndlswXSwpCiAKKyAgICBkZWYgY29weV9mcm9tX2lt YWdlKGZzLCBmaWxlX3RvX3JlYWQsIGZpbGVfdHlwZSwgb3V0cHV0X2RpcmVj dG9yeSwKKyAgICAgICAgICAgICAgICAgICAgICAgIG5vdF9yZWFsbHkpOgor ICAgICAgICBpZiBub3RfcmVhbGx5OgorICAgICAgICAgICAgaWYgZnMuZmls ZV9leGlzdHMoZmlsZV90b19yZWFkKToKKyAgICAgICAgICAgICAgICByZXR1 cm4gIjwlczolcz4iICUgKGZpbGVfdHlwZSwgZmlsZV90b19yZWFkKQorICAg ICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBzeXMuZXhpdCgiVGhl IHJlcXVlc3RlZCAlcyBmaWxlIGRvZXMgbm90IGV4aXN0IiAlIGZpbGVfdHlw ZSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgZGF0YWZpbGUgPSBmcy5v cGVuX2ZpbGUoZmlsZV90b19yZWFkKQorICAgICAgICBleGNlcHQgRXhjZXB0 aW9uLCBlOgorICAgICAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCBlCisg ICAgICAgICAgICBzeXMuZXhpdCgiRXJyb3Igb3BlbmluZyAlcyBpbiBndWVz dCIgJSBmaWxlX3RvX3JlYWQpCisgICAgICAgICh0ZmQsIHJldCkgPSB0ZW1w ZmlsZS5ta3N0ZW1wKHByZWZpeD0iYm9vdF8iK2ZpbGVfdHlwZSsiLiIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcj1vdXRw dXRfZGlyZWN0b3J5KQorICAgICAgICBkYXRhb2ZmID0gMAorICAgICAgICB3 aGlsZSBUcnVlOgorICAgICAgICAgICAgZGF0YSA9IGRhdGFmaWxlLnJlYWQo RlNfUkVBRF9NQVgsIGRhdGFvZmYpCisgICAgICAgICAgICBpZiBsZW4oZGF0 YSkgPT0gMDoKKyAgICAgICAgICAgICAgICBvcy5jbG9zZSh0ZmQpCisgICAg ICAgICAgICAgICAgZGVsIGRhdGFmaWxlCisgICAgICAgICAgICAgICAgcmV0 dXJuIHJldAorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIG9z LndyaXRlKHRmZCwgZGF0YSkKKyAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRp b24sIGU6CisgICAgICAgICAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCBl CisgICAgICAgICAgICAgICAgb3MuY2xvc2UodGZkKQorICAgICAgICAgICAg ICAgIG9zLnVubGluayhyZXQpCisgICAgICAgICAgICAgICAgZGVsIGRhdGFm aWxlCisgICAgICAgICAgICAgICAgc3lzLmV4aXQoIkVycm9yIHdyaXRpbmcg dGVtcG9yYXJ5IGNvcHkgb2YgIitmaWxlX3R5cGUpCisgICAgICAgICAgICBk YXRhb2ZmICs9IGxlbihkYXRhKQorCiAgICAgdHJ5OgogICAgICAgICBvcHRz LCBhcmdzID0gZ2V0b3B0LmdudV9nZXRvcHQoc3lzLmFyZ3ZbMTpdLCAncWlu aDo6JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWyJx dWlldCIsICJpbnRlcmFjdGl2ZSIsICJub3QtcmVhbGx5IiwgImhlbHAiLCAK QEAgLTc4NiwyNCArODE5LDE4IEBAIGlmIF9fbmFtZV9fID09ICJfX21haW5f XyI6CiAgICAgaWYgbm90IGZzOgogICAgICAgICByYWlzZSBSdW50aW1lRXJy b3IsICJVbmFibGUgdG8gZmluZCBwYXJ0aXRpb24gY29udGFpbmluZyBrZXJu ZWwiCiAKLSAgICBpZiBub3RfcmVhbGx5OgotICAgICAgICBib290Y2ZnWyJr ZXJuZWwiXSA9ICI8a2VybmVsOiVzPiIgJSBjaG9zZW5jZmdbImtlcm5lbCJd Ci0gICAgZWxzZToKLSAgICAgICAgZGF0YSA9IGZzLm9wZW5fZmlsZShjaG9z ZW5jZmdbImtlcm5lbCJdKS5yZWFkKCkKLSAgICAgICAgKHRmZCwgYm9vdGNm Z1sia2VybmVsIl0pID0gdGVtcGZpbGUubWtzdGVtcChwcmVmaXg9ImJvb3Rf a2VybmVsLiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZGlyPW91dHB1dF9kaXJlY3RvcnkpCi0gICAg ICAgIG9zLndyaXRlKHRmZCwgZGF0YSkKLSAgICAgICAgb3MuY2xvc2UodGZk KQorICAgIGJvb3RjZmdbImtlcm5lbCJdID0gY29weV9mcm9tX2ltYWdlKGZz LCBjaG9zZW5jZmdbImtlcm5lbCJdLCAia2VybmVsIiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXRwdXRfZGlyZWN0b3J5 LCBub3RfcmVhbGx5KQogCiAgICAgaWYgY2hvc2VuY2ZnWyJyYW1kaXNrIl06 Ci0gICAgICAgIGlmIG5vdF9yZWFsbHk6Ci0gICAgICAgICAgICBib290Y2Zn WyJyYW1kaXNrIl0gPSAiPHJhbWRpc2s6JXM+IiAlIGNob3NlbmNmZ1sicmFt ZGlzayJdCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBkYXRhID0gZnMu b3Blbl9maWxlKGNob3NlbmNmZ1sicmFtZGlzayJdLCkucmVhZCgpCi0gICAg ICAgICAgICAodGZkLCBib290Y2ZnWyJyYW1kaXNrIl0pID0gdGVtcGZpbGUu bWtzdGVtcCgKLSAgICAgICAgICAgICAgICBwcmVmaXg9ImJvb3RfcmFtZGlz ay4iLCBkaXI9b3V0cHV0X2RpcmVjdG9yeSkKLSAgICAgICAgICAgIG9zLndy aXRlKHRmZCwgZGF0YSkKLSAgICAgICAgICAgIG9zLmNsb3NlKHRmZCkKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgYm9vdGNmZ1sicmFtZGlzayJdID0g Y29weV9mcm9tX2ltYWdlKGZzLCBjaG9zZW5jZmdbInJhbWRpc2siXSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAicmFtZGlzayIsIG91dHB1dF9kaXJlY3RvcnksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm90X3JlYWxs eSkKKyAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAgaWYgbm90IG5vdF9y ZWFsbHk6CisgICAgICAgICAgICAgICAgb3MudW5saW5rKGJvb3RjZmdbImtl cm5lbCJdKQorICAgICAgICAgICAgcmFpc2UKICAgICBlbHNlOgogICAgICAg ICBpbml0cmQgPSBOb25lCiAK --=separator Content-Type: application/octet-stream; name="xsa25-4.2.patch" Content-Disposition: attachment; filename="xsa25-4.2.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtLWdpdCBh L3N0dWJkb20vZ3J1Yi9rZXhlYy5jIGIvc3R1YmRvbS9ncnViL2tleGVjLmMK aW5kZXggMDZiZWY1Mi4uYjIxYzkxYSAxMDA2NDQKLS0tIGEvc3R1YmRvbS9n cnViL2tleGVjLmMKKysrIGIvc3R1YmRvbS9ncnViL2tleGVjLmMKQEAgLTEz Nyw2ICsxMzcsMTAgQEAgdm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcg a2VybmVsX3NpemUsIHZvaWQgKm1vZHVsZSwgbG9uZyBtb2R1bGVfc2l6ZSwg Y2hhcgogICAgIGRvbSA9IHhjX2RvbV9hbGxvY2F0ZSh4Y19oYW5kbGUsIGNt ZGxpbmUsIGZlYXR1cmVzKTsKICAgICBkb20tPmFsbG9jYXRlID0ga2V4ZWNf YWxsb2NhdGU7CiAKKyAgICAvKiBXZSBhcmUgdXNpbmcgZ3Vlc3Qgb3duZWQg bWVtb3J5LCB0aGVyZWZvcmUgbm8gbGltaXRzLiAqLworICAgIHhjX2RvbV9r ZXJuZWxfbWF4X3NpemUoZG9tLCAwKTsKKyAgICB4Y19kb21fcmFtZGlza19t YXhfc2l6ZShkb20sIDApOworCiAgICAgZG9tLT5rZXJuZWxfYmxvYiA9IGtl cm5lbDsKICAgICBkb20tPmtlcm5lbF9zaXplID0ga2VybmVsX3NpemU7CiAK ZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2RvbS5oIGIvdG9vbHMvbGli eGMveGNfZG9tLmgKaW5kZXggMmFlZjY0YS4uNmE3MmFhOSAxMDA2NDQKLS0t IGEvdG9vbHMvbGlieGMveGNfZG9tLmgKKysrIGIvdG9vbHMvbGlieGMveGNf ZG9tLmgKQEAgLTU1LDYgKzU1LDkgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7 CiAgICAgdm9pZCAqcmFtZGlza19ibG9iOwogICAgIHNpemVfdCByYW1kaXNr X3NpemU7CiAKKyAgICBzaXplX3QgbWF4X2tlcm5lbF9zaXplOworICAgIHNp emVfdCBtYXhfcmFtZGlza19zaXplOworCiAgICAgLyogYXJndW1lbnRzIGFu ZCBwYXJhbWV0ZXJzICovCiAgICAgY2hhciAqY21kbGluZTsKICAgICB1aW50 MzJfdCBmX3JlcXVlc3RlZFtYRU5GRUFUX05SX1NVQk1BUFNdOwpAQCAtMTgw LDYgKzE4MywyMyBAQCB2b2lkIHhjX2RvbV9yZWxlYXNlX3BoeXMoc3RydWN0 IHhjX2RvbV9pbWFnZSAqZG9tKTsKIHZvaWQgeGNfZG9tX3JlbGVhc2Uoc3Ry dWN0IHhjX2RvbV9pbWFnZSAqZG9tKTsKIGludCB4Y19kb21fbWVtX2luaXQo c3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCB1bnNpZ25lZCBpbnQgbWVtX21i KTsKIAorLyogU2V0IHRoaXMgbGFyZ2VyIGlmIHlvdSBoYXZlIGVub3Jtb3Vz IHJhbWRpc2tzL2tlcm5lbHMuIE5vdGUgdGhhdAorICogeW91IHNob3VsZCB0 cnVzdCBhbGwga2VybmVscyBub3QgdG8gYmUgbWFsaWNpb3VzbHkgbGFyZ2Ug KGUuZy4gdG8KKyAqIGV4aGF1c3QgYWxsIGRvbTAgbWVtb3J5KSBpZiB5b3Ug ZG8gdGhpcyAoc2VlIENWRS0yMDEyLTQ1NDQgLworICogWFNBLTI1KS4gWW91 IGNhbiBhbHNvIHNldCB0aGUgZGVmYXVsdCBpbmRlcGVuZGVudGx5IGZvcgor ICogcmFtZGlza3Mva2VybmVscyBpbiB4Y19kb21fYWxsb2NhdGUoKSBvciBj YWxsCisgKiB4Y19kb21fe2tlcm5lbCxyYW1kaXNrfV9tYXhfc2l6ZS4KKyAq LworI2lmbmRlZiBYQ19ET01fREVDT01QUkVTU19NQVgKKyNkZWZpbmUgWENf RE9NX0RFQ09NUFJFU1NfTUFYICgxMDI0KjEwMjQqMTAyNCkgLyogMUdCICov CisjZW5kaWYKKworaW50IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShzdHJ1 Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeik7CitpbnQgeGNfZG9t X2tlcm5lbF9tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNp emVfdCBzeik7CisKK2ludCB4Y19kb21fcmFtZGlza19jaGVja19zaXplKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KTsKK2ludCB4Y19k b21fcmFtZGlza19tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20s IHNpemVfdCBzeik7CisKIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4Y19p bnRlcmZhY2UgKnhjaCwKICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKmJs b2IsIHNpemVfdCB6aXBsZW4pOwogaW50IHhjX2RvbV9kb19ndW56aXAoeGNf aW50ZXJmYWNlICp4Y2gsCkBAIC0yNDAsNyArMjYwLDggQEAgdm9pZCB4Y19k b21fbG9nX21lbW9yeV9mb290cHJpbnQoc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tKTsKIHZvaWQgKnhjX2RvbV9tYWxsb2Moc3RydWN0IHhjX2RvbV9pbWFn ZSAqZG9tLCBzaXplX3Qgc2l6ZSk7CiB2b2lkICp4Y19kb21fbWFsbG9jX3Bh Z2VfYWxpZ25lZChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBz aXplKTsKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBz aXplX3QgKiBzaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IHNpemVfdCBtYXhfc2l6ZSk7CiBjaGFyICp4Y19kb21fc3RyZHVwKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqc3RyKTsKIAog LyogLS0tIGFsbG9jIG1lbW9yeSBwb29sIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KZGlmZiAtLWdpdCBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9iemltYWdlbG9hZGVyLmMgYi90b29scy9saWJ4Yy94 Y19kb21fYnppbWFnZWxvYWRlci5jCmluZGV4IDExM2Q0MGYuLmIxYjJlYjAg MTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9iemltYWdlbG9hZGVy LmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYwpA QCAtNDcsMTMgKzQ3LDE5IEBAIHN0YXRpYyBpbnQgeGNfdHJ5X2J6aXAyX2Rl Y29kZSgKICAgICBjaGFyICpvdXRfYnVmOwogICAgIGNoYXIgKnRtcF9idWY7 CiAgICAgaW50IHJldHZhbCA9IC0xOwotICAgIGludCBvdXRzaXplOworICAg IHVuc2lnbmVkIGludCBvdXRzaXplOwogICAgIHVpbnQ2NF90IHRvdGFsOwog CiAgICAgc3RyZWFtLmJ6YWxsb2MgPSBOVUxMOwogICAgIHN0cmVhbS5iemZy ZWUgPSBOVUxMOwogICAgIHN0cmVhbS5vcGFxdWUgPSBOVUxMOwogCisgICAg aWYgKCBkb20tPmtlcm5lbF9zaXplID09IDApCisgICAgeworICAgICAgICBE T01QUklOVEYoIkJaSVAyOiBJbnB1dCBpcyAwIHNpemUiKTsKKyAgICAgICAg cmV0dXJuIC0xOworICAgIH0KKwogICAgIHJldCA9IEJaMl9iekRlY29tcHJl c3NJbml0KCZzdHJlYW0sIDAsIDApOwogICAgIGlmICggcmV0ICE9IEJaX09L ICkKICAgICB7CkBAIC02Niw2ICs3MiwxNyBAQCBzdGF0aWMgaW50IHhjX3Ry eV9iemlwMl9kZWNvZGUoCiAgICAgICogdGhlIGlucHV0IGJ1ZmZlciB0byBz dGFydCwgYW5kIHdlJ2xsIHJlYWxsb2MgYXMgbmVlZGVkLgogICAgICAqLwog ICAgIG91dHNpemUgPSBkb20tPmtlcm5lbF9zaXplOworCisgICAgLyoKKyAg ICAgKiBzdHJlYW0uYXZhaWxfaW4gYW5kIG91dHNpemUgYXJlIHVuc2lnbmVk IGludCwgd2hpbGUga2VybmVsX3NpemUKKyAgICAgKiBpcyBhIHNpemVfdC4g Q2hlY2sgd2UgYXJlbid0IG92ZXJmbG93aW5nLgorICAgICAqLworICAgIGlm ICggb3V0c2l6ZSAhPSBkb20tPmtlcm5lbF9zaXplICkKKyAgICB7CisgICAg ICAgIERPTVBSSU5URigiQlpJUDI6IElucHV0IHRvbyBsYXJnZSIpOworICAg ICAgICBnb3RvIGJ6aXAyX2NsZWFudXA7CisgICAgfQorCiAgICAgb3V0X2J1 ZiA9IG1hbGxvYyhvdXRzaXplKTsKICAgICBpZiAoIG91dF9idWYgPT0gTlVM TCApCiAgICAgewpAQCAtOTgsMTMgKzExNSwyMCBAQCBzdGF0aWMgaW50IHhj X3RyeV9iemlwMl9kZWNvZGUoCiAgICAgICAgIGlmICggc3RyZWFtLmF2YWls X291dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAgLyogUHJvdGVj dCBhZ2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8KLSAgICAgICAg ICAgIGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAgICAgICAgICAg IGlmICggb3V0c2l6ZSA+IFVJTlRfTUFYIC8gMiApCiAgICAgICAgICAgICB7 CiAgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogb3V0cHV0IGJ1 ZmZlciBvdmVyZmxvdyIpOwogICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CiAgICAgICAgICAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOwogICAg ICAgICAgICAgfQogCisgICAgICAgICAgICBpZiAoIHhjX2RvbV9rZXJuZWxf Y2hlY2tfc2l6ZShkb20sIG91dHNpemUgKiAyKSApCisgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogb3V0cHV0IHRv byBsYXJnZSIpOworICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1Zik7Cisg ICAgICAgICAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOworICAgICAgICAg ICAgfQorCiAgICAgICAgICAgICB0bXBfYnVmID0gcmVhbGxvYyhvdXRfYnVm LCBvdXRzaXplICogMik7CiAgICAgICAgICAgICBpZiAoIHRtcF9idWYgPT0g TlVMTCApCiAgICAgICAgICAgICB7CkBAIC0xNzIsOSArMTk2LDE1IEBAIHN0 YXRpYyBpbnQgX3hjX3RyeV9sem1hX2RlY29kZSgKICAgICB1bnNpZ25lZCBj aGFyICpvdXRfYnVmOwogICAgIHVuc2lnbmVkIGNoYXIgKnRtcF9idWY7CiAg ICAgaW50IHJldHZhbCA9IC0xOwotICAgIGludCBvdXRzaXplOworICAgIHNp emVfdCBvdXRzaXplOwogICAgIGNvbnN0IGNoYXIgKm1zZzsKIAorICAgIGlm ICggZG9tLT5rZXJuZWxfc2l6ZSA9PSAwKQorICAgIHsKKyAgICAgICAgRE9N UFJJTlRGKCIlczogSW5wdXQgaXMgMCBzaXplIiwgd2hhdCk7CisgICAgICAg IHJldHVybiAtMTsKKyAgICB9CisKICAgICAvKiBzaWdoLiAgV2UgZG9uJ3Qg a25vdyB1cC1mcm9udCBob3cgbXVjaCBtZW1vcnkgd2UgYXJlIGdvaW5nIHRv IG5lZWQKICAgICAgKiBmb3IgdGhlIG91dHB1dCBidWZmZXIuICBBbGxvY2F0 ZSB0aGUgb3V0cHV0IGJ1ZmZlciB0byBiZSBlcXVhbAogICAgICAqIHRoZSBp bnB1dCBidWZmZXIgdG8gc3RhcnQsIGFuZCB3ZSdsbCByZWFsbG9jIGFzIG5l ZWRlZC4KQEAgLTI0NCwxMyArMjc0LDIwIEBAIHN0YXRpYyBpbnQgX3hjX3Ry eV9sem1hX2RlY29kZSgKICAgICAgICAgaWYgKCBzdHJlYW0tPmF2YWlsX291 dCA9PSAwICkKICAgICAgICAgewogICAgICAgICAgICAgLyogUHJvdGVjdCBh Z2FpbnN0IG91dHB1dCBidWZmZXIgb3ZlcmZsb3cgKi8KLSAgICAgICAgICAg IGlmICggb3V0c2l6ZSA+IElOVF9NQVggLyAyICkKKyAgICAgICAgICAgIGlm ICggb3V0c2l6ZSA+IFNJWkVfTUFYIC8gMiApCiAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgRE9NUFJJTlRGKCIlczogb3V0cHV0IGJ1ZmZlciBv dmVyZmxvdyIsIHdoYXQpOwogICAgICAgICAgICAgICAgIGZyZWUob3V0X2J1 Zik7CiAgICAgICAgICAgICAgICAgZ290byBsem1hX2NsZWFudXA7CiAgICAg ICAgICAgICB9CiAKKyAgICAgICAgICAgIGlmICggeGNfZG9tX2tlcm5lbF9j aGVja19zaXplKGRvbSwgb3V0c2l6ZSAqIDIpICkKKyAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICBET01QUklOVEYoIiVzOiBvdXRwdXQgdG9vIGxh cmdlIiwgd2hhdCk7CisgICAgICAgICAgICAgICAgZnJlZShvdXRfYnVmKTsK KyAgICAgICAgICAgICAgICBnb3RvIGx6bWFfY2xlYW51cDsKKyAgICAgICAg ICAgIH0KKwogICAgICAgICAgICAgdG1wX2J1ZiA9IHJlYWxsb2Mob3V0X2J1 Ziwgb3V0c2l6ZSAqIDIpOwogICAgICAgICAgICAgaWYgKCB0bXBfYnVmID09 IE5VTEwgKQogICAgICAgICAgICAgewpAQCAtMzU5LDYgKzM5NiwxMiBAQCBz dGF0aWMgaW50IHhjX3RyeV9sem8xeF9kZWNvZGUoCiAgICAgICAgIDB4ODks IDB4NGMsIDB4NWEsIDB4NGYsIDB4MDAsIDB4MGQsIDB4MGEsIDB4MWEsIDB4 MGEKICAgICB9OwogCisgICAgLyoKKyAgICAgKiBsem9fdWludCBzaG91bGQg bWF0Y2ggc2l6ZV90LiBDaGVjayB0aGF0IHRoaXMgaXMgdGhlIGNhc2UgdG8g YmUKKyAgICAgKiBzdXJlIHdlIHdvbid0IG92ZXJmbG93IHZhcmlvdXMgbHpv X3VpbnQgZmllbGRzLgorICAgICAqLworICAgIFhDX0JVSUxEX0JVR19PTihz aXplb2YobHpvX3VpbnQpICE9IHNpemVvZihzaXplX3QpKTsKKwogICAgIHJl dCA9IGx6b19pbml0KCk7CiAgICAgaWYgKCByZXQgIT0gTFpPX0VfT0sgKQog ICAgIHsKQEAgLTQzOCw2ICs0ODEsMTQgQEAgc3RhdGljIGludCB4Y190cnlf bHpvMXhfZGVjb2RlKAogICAgICAgICBpZiAoIHNyY19sZW4gPD0gMCB8fCBz cmNfbGVuID4gZHN0X2xlbiB8fCBzcmNfbGVuID4gbGVmdCApCiAgICAgICAg ICAgICBicmVhazsKIAorICAgICAgICBtc2cgPSAiT3V0cHV0IGJ1ZmZlciBv dmVyZmxvdyI7CisgICAgICAgIGlmICggKnNpemUgPiBTSVpFX01BWCAtIGRz dF9sZW4gKQorICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgbXNnID0g IkRlY29tcHJlc3NlZCBpbWFnZSB0b28gbGFyZ2UiOworICAgICAgICBpZiAo IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sICpzaXplICsgZHN0X2xl bikgKQorICAgICAgICAgICAgYnJlYWs7CisKICAgICAgICAgbXNnID0gIkZh aWxlZCB0byAocmUpYWxsb2MgbWVtb3J5IjsKICAgICAgICAgdG1wX2J1ZiA9 IHJlYWxsb2Mob3V0X2J1ZiwgKnNpemUgKyBkc3RfbGVuKTsKICAgICAgICAg aWYgKCB0bXBfYnVmID09IE5VTEwgKQpkaWZmIC0tZ2l0IGEvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMK aW5kZXggZmVhOWRlNS4uMmEwMWQ3YyAxMDA2NDQKLS0tIGEvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYworKysgYi90b29scy9saWJ4Yy94Y19kb21fY29y ZS5jCkBAIC0xNTksNyArMTU5LDggQEAgdm9pZCAqeGNfZG9tX21hbGxvY19w YWdlX2FsaWduZWQoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c2l6ZSkKIH0KIAogdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBjaGFyICpmaWxlbmFtZSwgc2l6ZV90ICogc2l6ZSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpmaWxlbmFt ZSwgc2l6ZV90ICogc2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBzaXplX3QgbWF4X3NpemUpCiB7CiAgICAgc3RydWN0IHhjX2Rv bV9tZW0gKmJsb2NrID0gTlVMTDsKICAgICBpbnQgZmQgPSAtMTsKQEAgLTE3 MSw2ICsxNzIsMTMgQEAgdm9pZCAqeGNfZG9tX21hbGxvY19maWxlbWFwKHN0 cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwKICAgICBsc2VlayhmZCwgMCwgU0VF S19TRVQpOwogICAgICpzaXplID0gbHNlZWsoZmQsIDAsIFNFRUtfRU5EKTsK IAorICAgIGlmICggbWF4X3NpemUgJiYgKnNpemUgPiBtYXhfc2l6ZSApCisg ICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX09VVF9P Rl9NRU1PUlksCisgICAgICAgICAgICAgICAgICAgICAidHJpZWQgdG8gbWFw IGZpbGUgd2hpY2ggaXMgdG9vIGxhcmdlIik7CisgICAgICAgIGdvdG8gZXJy OworICAgIH0KKwogICAgIGJsb2NrID0gbWFsbG9jKHNpemVvZigqYmxvY2sp KTsKICAgICBpZiAoIGJsb2NrID09IE5VTEwgKQogICAgICAgICBnb3RvIGVy cjsKQEAgLTIyMiw2ICsyMzAsNDAgQEAgY2hhciAqeGNfZG9tX3N0cmR1cChz dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIGNvbnN0IGNoYXIgKnN0cikKIH0K IAogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tICovCisvKiBkZWNv bXByZXNzaW9uIGJ1ZmZlciBzaXppbmcgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKi8KK2ludCB4Y19kb21fa2VybmVs X2NoZWNrX3NpemUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c3opCit7CisgICAgLyogTm8gbGltaXQgKi8KKyAgICBpZiAoICFkb20tPm1h eF9rZXJuZWxfc2l6ZSApCisgICAgICAgIHJldHVybiAwOworCisgICAgaWYg KCBzeiA+IGRvbS0+bWF4X2tlcm5lbF9zaXplICkKKyAgICB7CisgICAgICAg IHhjX2RvbV9wYW5pYyhkb20tPnhjaCwgWENfSU5WQUxJRF9LRVJORUwsCisg ICAgICAgICAgICAgICAgICAgICAia2VybmVsIGltYWdlIHRvbyBsYXJnZSIp OworICAgICAgICByZXR1cm4gMTsKKyAgICB9CisKKyAgICByZXR1cm4gMDsK K30KKworaW50IHhjX2RvbV9yYW1kaXNrX2NoZWNrX3NpemUoc3RydWN0IHhj X2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opCit7CisgICAgLyogTm8gbGlt aXQgKi8KKyAgICBpZiAoICFkb20tPm1heF9yYW1kaXNrX3NpemUgKQorICAg ICAgICByZXR1cm4gMDsKKworICAgIGlmICggc3ogPiBkb20tPm1heF9yYW1k aXNrX3NpemUgKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+ eGNoLCBYQ19JTlZBTElEX0tFUk5FTCwKKyAgICAgICAgICAgICAgICAgICAg ICJyYW1kaXNrIGltYWdlIHRvbyBsYXJnZSIpOworICAgICAgICByZXR1cm4g MTsKKyAgICB9CisKKyAgICByZXR1cm4gMDsKK30KKworLyogLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tICovCiAvKiByZWFkIGZpbGVzLCBjb3B5IG1l bW9yeSBibG9ja3MsIHdpdGggdHJhbnNwYXJlbnQgZ3VuemlwICAgICAgICAg ICAgICAgICAgKi8KIAogc2l6ZV90IHhjX2RvbV9jaGVja19nemlwKHhjX2lu dGVyZmFjZSAqeGNoLCB2b2lkICpibG9iLCBzaXplX3QgemlwbGVuKQpAQCAt MjM1LDcgKzI3Nyw3IEBAIHNpemVfdCB4Y19kb21fY2hlY2tfZ3ppcCh4Y19p bnRlcmZhY2UgKnhjaCwgdm9pZCAqYmxvYiwgc2l6ZV90IHppcGxlbikKIAog ICAgIGd6bGVuID0gYmxvYiArIHppcGxlbiAtIDQ7CiAgICAgdW56aXBsZW4g PSBnemxlblszXSA8PCAyNCB8IGd6bGVuWzJdIDw8IDE2IHwgZ3psZW5bMV0g PDwgOCB8IGd6bGVuWzBdOwotICAgIGlmICggKHVuemlwbGVuIDwgMCkgfHwg KHVuemlwbGVuID4gKDEwMjQqMTAyNCoxMDI0KSkgKSAvKiAxR0IgbGltaXQg Ki8KKyAgICBpZiAoICh1bnppcGxlbiA8IDApIHx8ICh1bnppcGxlbiA+IFhD X0RPTV9ERUNPTVBSRVNTX01BWCkgKQogICAgIHsKICAgICAgICAgeGNfZG9t X3ByaW50ZgogICAgICAgICAgICAgKHhjaCwKQEAgLTI4OCw2ICszMzAsOSBA QCBpbnQgeGNfZG9tX3RyeV9ndW56aXAoc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tLCB2b2lkICoqYmxvYiwgc2l6ZV90ICogc2l6ZSkKICAgICBpZiAoIHVu emlwbGVuID09IDAgKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlmICgg eGNfZG9tX2tlcm5lbF9jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICkKKyAg ICAgICAgcmV0dXJuIDA7CisKICAgICB1bnppcCA9IHhjX2RvbV9tYWxsb2Mo ZG9tLCB1bnppcGxlbik7CiAgICAgaWYgKCB1bnppcCA9PSBOVUxMICkKICAg ICAgICAgcmV0dXJuIC0xOwpAQCAtNTg4LDYgKzYzMyw5IEBAIHN0cnVjdCB4 Y19kb21faW1hZ2UgKnhjX2RvbV9hbGxvY2F0ZSh4Y19pbnRlcmZhY2UgKnhj aCwKICAgICBtZW1zZXQoZG9tLCAwLCBzaXplb2YoKmRvbSkpOwogICAgIGRv bS0+eGNoID0geGNoOwogCisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBY Q19ET01fREVDT01QUkVTU19NQVg7CisgICAgZG9tLT5tYXhfcmFtZGlza19z aXplID0gWENfRE9NX0RFQ09NUFJFU1NfTUFYOworCiAgICAgaWYgKCBjbWRs aW5lICkKICAgICAgICAgZG9tLT5jbWRsaW5lID0geGNfZG9tX3N0cmR1cChk b20sIGNtZGxpbmUpOwogICAgIGlmICggZmVhdHVyZXMgKQpAQCAtNjA4LDEw ICs2NTYsMjUgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9j YXRlKHhjX2ludGVyZmFjZSAqeGNoLAogICAgIHJldHVybiBOVUxMOwogfQog CitpbnQgeGNfZG9tX2tlcm5lbF9tYXhfc2l6ZShzdHJ1Y3QgeGNfZG9tX2lt YWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICBET01QUklOVEYoIiVzOiBr ZXJuZWxfbWF4X3NpemU9JXp4IiwgX19GVU5DVElPTl9fLCBzeik7CisgICAg ZG9tLT5tYXhfa2VybmVsX3NpemUgPSBzejsKKyAgICByZXR1cm4gMDsKK30K KworaW50IHhjX2RvbV9yYW1kaXNrX21heF9zaXplKHN0cnVjdCB4Y19kb21f aW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQoreworICAgIERPTVBSSU5URigiJXM6 IHJhbWRpc2tfbWF4X3NpemU9JXp4IiwgX19GVU5DVElPTl9fLCBzeik7Cisg ICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0gc3o7CisgICAgcmV0dXJuIDA7 Cit9CisKIGludCB4Y19kb21fa2VybmVsX2ZpbGUoc3RydWN0IHhjX2RvbV9p bWFnZSAqZG9tLCBjb25zdCBjaGFyICpmaWxlbmFtZSkKIHsKICAgICBET01Q UklOVEYoIiVzOiBmaWxlbmFtZT1cIiVzXCIiLCBfX0ZVTkNUSU9OX18sIGZp bGVuYW1lKTsKLSAgICBkb20tPmtlcm5lbF9ibG9iID0geGNfZG9tX21hbGxv Y19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5lbF9zaXplKTsK KyAgICBkb20tPmtlcm5lbF9ibG9iID0geGNfZG9tX21hbGxvY19maWxlbWFw KGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5lbF9zaXplLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tLT5tYXhf a2VybmVsX3NpemUpOwogICAgIGlmICggZG9tLT5rZXJuZWxfYmxvYiA9PSBO VUxMICkKICAgICAgICAgcmV0dXJuIC0xOwogICAgIHJldHVybiB4Y19kb21f dHJ5X2d1bnppcChkb20sICZkb20tPmtlcm5lbF9ibG9iLCAmZG9tLT5rZXJu ZWxfc2l6ZSk7CkBAIC02MjEsNyArNjg0LDkgQEAgaW50IHhjX2RvbV9yYW1k aXNrX2ZpbGUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFy ICpmaWxlbmFtZSkKIHsKICAgICBET01QUklOVEYoIiVzOiBmaWxlbmFtZT1c IiVzXCIiLCBfX0ZVTkNUSU9OX18sIGZpbGVuYW1lKTsKICAgICBkb20tPnJh bWRpc2tfYmxvYiA9Ci0gICAgICAgIHhjX2RvbV9tYWxsb2NfZmlsZW1hcChk b20sIGZpbGVuYW1lLCAmZG9tLT5yYW1kaXNrX3NpemUpOworICAgICAgICB4 Y19kb21fbWFsbG9jX2ZpbGVtYXAoZG9tLCBmaWxlbmFtZSwgJmRvbS0+cmFt ZGlza19zaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9t LT5tYXhfcmFtZGlza19zaXplKTsKKwogICAgIGlmICggZG9tLT5yYW1kaXNr X2Jsb2IgPT0gTlVMTCApCiAgICAgICAgIHJldHVybiAtMTsKIC8vICAgIHJl dHVybiB4Y19kb21fdHJ5X2d1bnppcChkb20sICZkb20tPnJhbWRpc2tfYmxv YiwgJmRvbS0+cmFtZGlza19zaXplKTsKQEAgLTc4MSw3ICs4NDYsMTEgQEAg aW50IHhjX2RvbV9idWlsZF9pbWFnZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpk b20pCiAgICAgICAgIHZvaWQgKnJhbWRpc2ttYXA7CiAKICAgICAgICAgdW56 aXBsZW4gPSB4Y19kb21fY2hlY2tfZ3ppcChkb20tPnhjaCwgZG9tLT5yYW1k aXNrX2Jsb2IsIGRvbS0+cmFtZGlza19zaXplKTsKKyAgICAgICAgaWYgKCB4 Y19kb21fcmFtZGlza19jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICE9IDAg KQorICAgICAgICAgICAgdW56aXBsZW4gPSAwOworCiAgICAgICAgIHJhbWRp c2tsZW4gPSB1bnppcGxlbiA/IHVuemlwbGVuIDogZG9tLT5yYW1kaXNrX3Np emU7CisKICAgICAgICAgaWYgKCB4Y19kb21fYWxsb2Nfc2VnbWVudChkb20s ICZkb20tPnJhbWRpc2tfc2VnLCAicmFtZGlzayIsIDAsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmFtZGlza2xlbikgIT0gMCApCiAg ICAgICAgICAgICBnb3RvIGVycjsK --=separator Content-Type: application/octet-stream; name="xsa25-unstable.patch" Content-Disposition: attachment; filename="xsa25-unstable.patch" Content-Transfer-Encoding: base64 bGlieGM6IGJ1aWxkZXI6IGxpbWl0IG1heGltdW0gc2l6ZSBvZiBrZXJuZWwv cmFtZGlzay4KCkFsbG93aW5nIHVzZXIgc3VwcGxpZWQga2VybmVscyBvZiBh cmJpdHJhcnkgc2l6ZXMsIGVzcGVjaWFsbHkgZHVyaW5nCmRlY29tcHJlc3Np b24sIGNhbiBzd2FsbG93IHVwIGRvbTAgbWVtb3J5IGxlYWRpbmcgdG8gZWl0 aGVyIHZpcnR1YWwKYWRkcmVzcyBzcGFjZSBleGhhdXN0aW9uIGluIHRoZSBi dWlsZGVyIHByb2Nlc3Mgb3IgYWxsb2NhdGlvbgpmYWlsdXJlcy9PT00ga2ls bGluZyBvZiBib3RoIHRvb2xzdGFjayBhbmQgdW5yZWxhdGVkIHByb2Nlc3Nl cy4KCldlIGRpc2FibGUgdGhlc2UgY2hlY2tzIHdoZW4gYnVpbGRpbmcgaW4g YSBzdHViIGRvbWFpbiBmb3IgcHZncnViCnNpbmNlIHRoaXMgdXNlcyB0aGUg Z3Vlc3QncyBvd24gbWVtb3J5IGFuZCBpcyBpc29sYXRlZC4KCkRlY29tcHJl c3Npb24gb2YgZ3ppcCBjb21wcmVzc2VkIGtlcm5lbHMgYW5kIHJhbWRpc2tz IGhhcyBiZWVuIHNhZmUKc2luY2UgMTQ5NTQ6NTgyMDUyNTc1MTdkIChYZW4g My4xLjAgb253YXJkcykuCgpUaGlzIGlzIFhTQS0yNSAvIENWRS0yMDEyLTQ1 NDQuCgpBbHNvIG1ha2UgZXhwbGljaXQgY2hlY2tzIGZvciBidWZmZXIgb3Zl cmZsb3dzIGluIHZhcmlvdXMKZGVjb21wcmVzc2lvbiByb3V0aW5lcy4gVGhl c2Ugd2VyZSBhbHJlYWR5IHJ1bGVkIG91dCBkdWUgdG8gb3RoZXIKcHJvcGVy dGllcyBvZiB0aGUgY29kZSBidXQgY2hlY2sgdGhlbSBhcyBhIGJlbHQtYW5k LWJyYWNlcyBtZWFzdXJlLgoKU2lnbmVkLW9mZi1ieTogSWFuIENhbXBiZWxs IDxpYW4uY2FtcGJlbGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBiOWMx ZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHN0dWJkb20vZ3J1Yi9rZXhlYy5j Ci0tLSBhL3N0dWJkb20vZ3J1Yi9rZXhlYy5jCVdlZCBPY3QgMjQgMTU6NDk6 NDEgMjAxMiArMDEwMAorKysgYi9zdHViZG9tL2dydWIva2V4ZWMuYwlGcmkg T2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAxMDAKQEAgLTEzNyw2ICsxMzcsMTAg QEAgdm9pZCBrZXhlYyh2b2lkICprZXJuZWwsIGxvbmcga2VybmVsX3Npegog ICAgIGRvbSA9IHhjX2RvbV9hbGxvY2F0ZSh4Y19oYW5kbGUsIGNtZGxpbmUs IGZlYXR1cmVzKTsKICAgICBkb20tPmFsbG9jYXRlID0ga2V4ZWNfYWxsb2Nh dGU7CiAKKyAgICAvKiBXZSBhcmUgdXNpbmcgZ3Vlc3Qgb3duZWQgbWVtb3J5 LCB0aGVyZWZvcmUgbm8gbGltaXRzLiAqLworICAgIHhjX2RvbV9rZXJuZWxf bWF4X3NpemUoZG9tLCAwKTsKKyAgICB4Y19kb21fcmFtZGlza19tYXhfc2l6 ZShkb20sIDApOworCiAgICAgZG9tLT5rZXJuZWxfYmxvYiA9IGtlcm5lbDsK ICAgICBkb20tPmtlcm5lbF9zaXplID0ga2VybmVsX3NpemU7CiAKZGlmZiAt ciBiOWMxZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hj X2RvbS5oCi0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbS5oCVdlZCBPY3QgMjQg MTU6NDk6NDEgMjAxMiArMDEwMAorKysgYi90b29scy9saWJ4Yy94Y19kb20u aAlGcmkgT2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAxMDAKQEAgLTU1LDYgKzU1 LDkgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7CiAgICAgdm9pZCAqcmFtZGlz a19ibG9iOwogICAgIHNpemVfdCByYW1kaXNrX3NpemU7CiAKKyAgICBzaXpl X3QgbWF4X2tlcm5lbF9zaXplOworICAgIHNpemVfdCBtYXhfcmFtZGlza19z aXplOworCiAgICAgLyogYXJndW1lbnRzIGFuZCBwYXJhbWV0ZXJzICovCiAg ICAgY2hhciAqY21kbGluZTsKICAgICB1aW50MzJfdCBmX3JlcXVlc3RlZFtY RU5GRUFUX05SX1NVQk1BUFNdOwpAQCAtMTk0LDYgKzE5NywyMyBAQCB2b2lk IHhjX2RvbV9yZWxlYXNlX3BoeXMoc3RydWN0IHhjX2RvbV9pCiB2b2lkIHhj X2RvbV9yZWxlYXNlKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSk7CiBpbnQg eGNfZG9tX21lbV9pbml0KHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgdW5z aWduZWQgaW50IG1lbV9tYik7CiAKKy8qIFNldCB0aGlzIGxhcmdlciBpZiB5 b3UgaGF2ZSBlbm9ybW91cyByYW1kaXNrcy9rZXJuZWxzLiBOb3RlIHRoYXQK KyAqIHlvdSBzaG91bGQgdHJ1c3QgYWxsIGtlcm5lbHMgbm90IHRvIGJlIG1h bGljaW91c2x5IGxhcmdlIChlLmcuIHRvCisgKiBleGhhdXN0IGFsbCBkb20w IG1lbW9yeSkgaWYgeW91IGRvIHRoaXMgKHNlZSBDVkUtMjAxMi00NTQ0IC8K KyAqIFhTQS0yNSkuIFlvdSBjYW4gYWxzbyBzZXQgdGhlIGRlZmF1bHQgaW5k ZXBlbmRlbnRseSBmb3IKKyAqIHJhbWRpc2tzL2tlcm5lbHMgaW4geGNfZG9t X2FsbG9jYXRlKCkgb3IgY2FsbAorICogeGNfZG9tX3trZXJuZWwscmFtZGlz a31fbWF4X3NpemUuCisgKi8KKyNpZm5kZWYgWENfRE9NX0RFQ09NUFJFU1Nf TUFYCisjZGVmaW5lIFhDX0RPTV9ERUNPTVBSRVNTX01BWCAoMTAyNCoxMDI0 KjEwMjQpIC8qIDFHQiAqLworI2VuZGlmCisKK2ludCB4Y19kb21fa2VybmVs X2NoZWNrX3NpemUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qg c3opOworaW50IHhjX2RvbV9rZXJuZWxfbWF4X3NpemUoc3RydWN0IHhjX2Rv bV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworCitpbnQgeGNfZG9tX3JhbWRp c2tfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVf dCBzeik7CitpbnQgeGNfZG9tX3JhbWRpc2tfbWF4X3NpemUoc3RydWN0IHhj X2RvbV9pbWFnZSAqZG9tLCBzaXplX3Qgc3opOworCiBzaXplX3QgeGNfZG9t X2NoZWNrX2d6aXAoeGNfaW50ZXJmYWNlICp4Y2gsCiAgICAgICAgICAgICAg ICAgICAgICB2b2lkICpibG9iLCBzaXplX3QgemlwbGVuKTsKIGludCB4Y19k b21fZG9fZ3VuemlwKHhjX2ludGVyZmFjZSAqeGNoLApAQCAtMjU0LDcgKzI3 NCw4IEBAIHZvaWQgeGNfZG9tX2xvZ19tZW1vcnlfZm9vdHByaW50KHN0cnVj dCAKIHZvaWQgKnhjX2RvbV9tYWxsb2Moc3RydWN0IHhjX2RvbV9pbWFnZSAq ZG9tLCBzaXplX3Qgc2l6ZSk7CiB2b2lkICp4Y19kb21fbWFsbG9jX3BhZ2Vf YWxpZ25lZChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzaXpl KTsKIHZvaWQgKnhjX2RvbV9tYWxsb2NfZmlsZW1hcChzdHJ1Y3QgeGNfZG9t X2ltYWdlICpkb20sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgY2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBzaXpl X3QgKiBzaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IHNpemVfdCBtYXhfc2l6ZSk7CiBjaGFyICp4Y19kb21fc3RyZHVwKHN0cnVj dCB4Y19kb21faW1hZ2UgKmRvbSwgY29uc3QgY2hhciAqc3RyKTsKIAogLyog LS0tIGFsbG9jIG1lbW9yeSBwb29sIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KZGlmZiAtciBiOWMxZTA4NmQ5Yjcg LXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hjX2RvbV9iemltYWdlbG9h ZGVyLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIu YwlXZWQgT2N0IDI0IDE1OjQ5OjQxIDIwMTIgKzAxMDAKKysrIGIvdG9vbHMv bGlieGMveGNfZG9tX2J6aW1hZ2Vsb2FkZXIuYwlGcmkgT2N0IDI2IDA5OjE5 OjIyIDIwMTIgKzAxMDAKQEAgLTQ3LDEzICs0NywxOSBAQCBzdGF0aWMgaW50 IHhjX3RyeV9iemlwMl9kZWNvZGUoCiAgICAgY2hhciAqb3V0X2J1ZjsKICAg ICBjaGFyICp0bXBfYnVmOwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBp bnQgb3V0c2l6ZTsKKyAgICB1bnNpZ25lZCBpbnQgb3V0c2l6ZTsKICAgICB1 aW50NjRfdCB0b3RhbDsKIAogICAgIHN0cmVhbS5iemFsbG9jID0gTlVMTDsK ICAgICBzdHJlYW0uYnpmcmVlID0gTlVMTDsKICAgICBzdHJlYW0ub3BhcXVl ID0gTlVMTDsKIAorICAgIGlmICggZG9tLT5rZXJuZWxfc2l6ZSA9PSAwKQor ICAgIHsKKyAgICAgICAgRE9NUFJJTlRGKCJCWklQMjogSW5wdXQgaXMgMCBz aXplIik7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKICAgICByZXQg PSBCWjJfYnpEZWNvbXByZXNzSW5pdCgmc3RyZWFtLCAwLCAwKTsKICAgICBp ZiAoIHJldCAhPSBCWl9PSyApCiAgICAgewpAQCAtNjYsNiArNzIsMTcgQEAg c3RhdGljIGludCB4Y190cnlfYnppcDJfZGVjb2RlKAogICAgICAqIHRoZSBp bnB1dCBidWZmZXIgdG8gc3RhcnQsIGFuZCB3ZSdsbCByZWFsbG9jIGFzIG5l ZWRlZC4KICAgICAgKi8KICAgICBvdXRzaXplID0gZG9tLT5rZXJuZWxfc2l6 ZTsKKworICAgIC8qCisgICAgICogc3RyZWFtLmF2YWlsX2luIGFuZCBvdXRz aXplIGFyZSB1bnNpZ25lZCBpbnQsIHdoaWxlIGtlcm5lbF9zaXplCisgICAg ICogaXMgYSBzaXplX3QuIENoZWNrIHdlIGFyZW4ndCBvdmVyZmxvd2luZy4K KyAgICAgKi8KKyAgICBpZiAoIG91dHNpemUgIT0gZG9tLT5rZXJuZWxfc2l6 ZSApCisgICAgeworICAgICAgICBET01QUklOVEYoIkJaSVAyOiBJbnB1dCB0 b28gbGFyZ2UiKTsKKyAgICAgICAgZ290byBiemlwMl9jbGVhbnVwOworICAg IH0KKwogICAgIG91dF9idWYgPSBtYWxsb2Mob3V0c2l6ZSk7CiAgICAgaWYg KCBvdXRfYnVmID09IE5VTEwgKQogICAgIHsKQEAgLTk4LDEzICsxMTUsMjAg QEAgc3RhdGljIGludCB4Y190cnlfYnppcDJfZGVjb2RlKAogICAgICAgICBp ZiAoIHN0cmVhbS5hdmFpbF9vdXQgPT0gMCApCiAgICAgICAgIHsKICAgICAg ICAgICAgIC8qIFByb3RlY3QgYWdhaW5zdCBvdXRwdXQgYnVmZmVyIG92ZXJm bG93ICovCi0gICAgICAgICAgICBpZiAoIG91dHNpemUgPiBJTlRfTUFYIC8g MiApCisgICAgICAgICAgICBpZiAoIG91dHNpemUgPiBVSU5UX01BWCAvIDIg KQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIERPTVBSSU5URigi QlpJUDI6IG91dHB1dCBidWZmZXIgb3ZlcmZsb3ciKTsKICAgICAgICAgICAg ICAgICBmcmVlKG91dF9idWYpOwogICAgICAgICAgICAgICAgIGdvdG8gYnpp cDJfY2xlYW51cDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYg KCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9tLCBvdXRzaXplICogMikg KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIERPTVBSSU5URigi QlpJUDI6IG91dHB1dCB0b28gbGFyZ2UiKTsKKyAgICAgICAgICAgICAgICBm cmVlKG91dF9idWYpOworICAgICAgICAgICAgICAgIGdvdG8gYnppcDJfY2xl YW51cDsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgdG1wX2J1ZiA9 IHJlYWxsb2Mob3V0X2J1Ziwgb3V0c2l6ZSAqIDIpOwogICAgICAgICAgICAg aWYgKCB0bXBfYnVmID09IE5VTEwgKQogICAgICAgICAgICAgewpAQCAtMTcy LDkgKzE5NiwxNSBAQCBzdGF0aWMgaW50IF94Y190cnlfbHptYV9kZWNvZGUo CiAgICAgdW5zaWduZWQgY2hhciAqb3V0X2J1ZjsKICAgICB1bnNpZ25lZCBj aGFyICp0bXBfYnVmOwogICAgIGludCByZXR2YWwgPSAtMTsKLSAgICBpbnQg b3V0c2l6ZTsKKyAgICBzaXplX3Qgb3V0c2l6ZTsKICAgICBjb25zdCBjaGFy ICptc2c7CiAKKyAgICBpZiAoIGRvbS0+a2VybmVsX3NpemUgPT0gMCkKKyAg ICB7CisgICAgICAgIERPTVBSSU5URigiJXM6IElucHV0IGlzIDAgc2l6ZSIs IHdoYXQpOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorCiAgICAgLyog c2lnaC4gIFdlIGRvbid0IGtub3cgdXAtZnJvbnQgaG93IG11Y2ggbWVtb3J5 IHdlIGFyZSBnb2luZyB0byBuZWVkCiAgICAgICogZm9yIHRoZSBvdXRwdXQg YnVmZmVyLiAgQWxsb2NhdGUgdGhlIG91dHB1dCBidWZmZXIgdG8gYmUgZXF1 YWwKICAgICAgKiB0aGUgaW5wdXQgYnVmZmVyIHRvIHN0YXJ0LCBhbmQgd2Un bGwgcmVhbGxvYyBhcyBuZWVkZWQuCkBAIC0yNDQsMTMgKzI3NCwyMCBAQCBz dGF0aWMgaW50IF94Y190cnlfbHptYV9kZWNvZGUoCiAgICAgICAgIGlmICgg c3RyZWFtLT5hdmFpbF9vdXQgPT0gMCApCiAgICAgICAgIHsKICAgICAgICAg ICAgIC8qIFByb3RlY3QgYWdhaW5zdCBvdXRwdXQgYnVmZmVyIG92ZXJmbG93 ICovCi0gICAgICAgICAgICBpZiAoIG91dHNpemUgPiBJTlRfTUFYIC8gMiAp CisgICAgICAgICAgICBpZiAoIG91dHNpemUgPiBTSVpFX01BWCAvIDIgKQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIERPTVBSSU5URigiJXM6 IG91dHB1dCBidWZmZXIgb3ZlcmZsb3ciLCB3aGF0KTsKICAgICAgICAgICAg ICAgICBmcmVlKG91dF9idWYpOwogICAgICAgICAgICAgICAgIGdvdG8gbHpt YV9jbGVhbnVwOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBpZiAo IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShkb20sIG91dHNpemUgKiAyKSAp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgRE9NUFJJTlRGKCIl czogb3V0cHV0IHRvbyBsYXJnZSIsIHdoYXQpOworICAgICAgICAgICAgICAg IGZyZWUob3V0X2J1Zik7CisgICAgICAgICAgICAgICAgZ290byBsem1hX2Ns ZWFudXA7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIHRtcF9idWYg PSByZWFsbG9jKG91dF9idWYsIG91dHNpemUgKiAyKTsKICAgICAgICAgICAg IGlmICggdG1wX2J1ZiA9PSBOVUxMICkKICAgICAgICAgICAgIHsKQEAgLTM1 OSw2ICszOTYsMTIgQEAgc3RhdGljIGludCB4Y190cnlfbHpvMXhfZGVjb2Rl KAogICAgICAgICAweDg5LCAweDRjLCAweDVhLCAweDRmLCAweDAwLCAweDBk LCAweDBhLCAweDFhLCAweDBhCiAgICAgfTsKIAorICAgIC8qCisgICAgICog bHpvX3VpbnQgc2hvdWxkIG1hdGNoIHNpemVfdC4gQ2hlY2sgdGhhdCB0aGlz IGlzIHRoZSBjYXNlIHRvIGJlCisgICAgICogc3VyZSB3ZSB3b24ndCBvdmVy ZmxvdyB2YXJpb3VzIGx6b191aW50IGZpZWxkcy4KKyAgICAgKi8KKyAgICBY Q19CVUlMRF9CVUdfT04oc2l6ZW9mKGx6b191aW50KSAhPSBzaXplb2Yoc2l6 ZV90KSk7CisKICAgICByZXQgPSBsem9faW5pdCgpOwogICAgIGlmICggcmV0 ICE9IExaT19FX09LICkKICAgICB7CkBAIC00MzgsNiArNDgxLDE0IEBAIHN0 YXRpYyBpbnQgeGNfdHJ5X2x6bzF4X2RlY29kZSgKICAgICAgICAgaWYgKCBz cmNfbGVuIDw9IDAgfHwgc3JjX2xlbiA+IGRzdF9sZW4gfHwgc3JjX2xlbiA+ IGxlZnQgKQogICAgICAgICAgICAgYnJlYWs7CiAKKyAgICAgICAgbXNnID0g Ik91dHB1dCBidWZmZXIgb3ZlcmZsb3ciOworICAgICAgICBpZiAoICpzaXpl ID4gU0laRV9NQVggLSBkc3RfbGVuICkKKyAgICAgICAgICAgIGJyZWFrOwor CisgICAgICAgIG1zZyA9ICJEZWNvbXByZXNzZWQgaW1hZ2UgdG9vIGxhcmdl IjsKKyAgICAgICAgaWYgKCB4Y19kb21fa2VybmVsX2NoZWNrX3NpemUoZG9t LCAqc2l6ZSArIGRzdF9sZW4pICkKKyAgICAgICAgICAgIGJyZWFrOworCiAg ICAgICAgIG1zZyA9ICJGYWlsZWQgdG8gKHJlKWFsbG9jIG1lbW9yeSI7CiAg ICAgICAgIHRtcF9idWYgPSByZWFsbG9jKG91dF9idWYsICpzaXplICsgZHN0 X2xlbik7CiAgICAgICAgIGlmICggdG1wX2J1ZiA9PSBOVUxMICkKZGlmZiAt ciBiOWMxZTA4NmQ5YjcgLXIgODIzNDM1ODlhNzExIHRvb2xzL2xpYnhjL3hj X2RvbV9jb3JlLmMKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2NvcmUuYwlX ZWQgT2N0IDI0IDE1OjQ5OjQxIDIwMTIgKzAxMDAKKysrIGIvdG9vbHMvbGli eGMveGNfZG9tX2NvcmUuYwlGcmkgT2N0IDI2IDA5OjE5OjIyIDIwMTIgKzAx MDAKQEAgLTE1OSw3ICsxNTksOCBAQCB2b2lkICp4Y19kb21fbWFsbG9jX3Bh Z2VfYWxpZ25lZChzdHJ1Y3QgCiB9CiAKIHZvaWQgKnhjX2RvbV9tYWxsb2Nf ZmlsZW1hcChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAqZmlsZW5hbWUsIHNpemVf dCAqIHNpemUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg Y2hhciAqZmlsZW5hbWUsIHNpemVfdCAqIHNpemUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3Qgc2l6ZV90IG1heF9zaXplKQogewogICAg IHN0cnVjdCB4Y19kb21fbWVtICpibG9jayA9IE5VTEw7CiAgICAgaW50IGZk ID0gLTE7CkBAIC0xNzEsNiArMTcyLDEzIEBAIHZvaWQgKnhjX2RvbV9tYWxs b2NfZmlsZW1hcChzdHJ1Y3QgeGNfZG8KICAgICBsc2VlayhmZCwgMCwgU0VF S19TRVQpOwogICAgICpzaXplID0gbHNlZWsoZmQsIDAsIFNFRUtfRU5EKTsK IAorICAgIGlmICggbWF4X3NpemUgJiYgKnNpemUgPiBtYXhfc2l6ZSApCisg ICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX09VVF9P Rl9NRU1PUlksCisgICAgICAgICAgICAgICAgICAgICAidHJpZWQgdG8gbWFw IGZpbGUgd2hpY2ggaXMgdG9vIGxhcmdlIik7CisgICAgICAgIGdvdG8gZXJy OworICAgIH0KKwogICAgIGJsb2NrID0gbWFsbG9jKHNpemVvZigqYmxvY2sp KTsKICAgICBpZiAoIGJsb2NrID09IE5VTEwgKQogICAgICAgICBnb3RvIGVy cjsKQEAgLTIyMiw2ICsyMzAsNDAgQEAgY2hhciAqeGNfZG9tX3N0cmR1cChz dHJ1Y3QgeGNfZG9tX2ltYWdlIAogfQogCiAvKiAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0gKi8KKy8qIGRlY29tcHJlc3Npb24gYnVmZmVyIHNpemlu ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAqLworaW50IHhjX2RvbV9rZXJuZWxfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNf ZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAgICAvKiBObyBsaW1p dCAqLworICAgIGlmICggIWRvbS0+bWF4X2tlcm5lbF9zaXplICkKKyAgICAg ICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIHN6ID4gZG9tLT5tYXhfa2VybmVs X3NpemUgKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNo LCBYQ19JTlZBTElEX0tFUk5FTCwKKyAgICAgICAgICAgICAgICAgICAgICJr ZXJuZWwgaW1hZ2UgdG9vIGxhcmdlIik7CisgICAgICAgIHJldHVybiAxOwor ICAgIH0KKworICAgIHJldHVybiAwOworfQorCitpbnQgeGNfZG9tX3JhbWRp c2tfY2hlY2tfc2l6ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVf dCBzeikKK3sKKyAgICAvKiBObyBsaW1pdCAqLworICAgIGlmICggIWRvbS0+ bWF4X3JhbWRpc2tfc2l6ZSApCisgICAgICAgIHJldHVybiAwOworCisgICAg aWYgKCBzeiA+IGRvbS0+bWF4X3JhbWRpc2tfc2l6ZSApCisgICAgeworICAg ICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfS0VSTkVM LAorICAgICAgICAgICAgICAgICAgICAgInJhbWRpc2sgaW1hZ2UgdG9vIGxh cmdlIik7CisgICAgICAgIHJldHVybiAxOworICAgIH0KKworICAgIHJldHVy biAwOworfQorCisvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8K IC8qIHJlYWQgZmlsZXMsIGNvcHkgbWVtb3J5IGJsb2Nrcywgd2l0aCB0cmFu c3BhcmVudCBndW56aXAgICAgICAgICAgICAgICAgICAqLwogCiBzaXplX3Qg eGNfZG9tX2NoZWNrX2d6aXAoeGNfaW50ZXJmYWNlICp4Y2gsIHZvaWQgKmJs b2IsIHNpemVfdCB6aXBsZW4pCkBAIC0yMzUsNyArMjc3LDcgQEAgc2l6ZV90 IHhjX2RvbV9jaGVja19nemlwKHhjX2ludGVyZmFjZSAqeAogCiAgICAgZ3ps ZW4gPSBibG9iICsgemlwbGVuIC0gNDsKICAgICB1bnppcGxlbiA9IGd6bGVu WzNdIDw8IDI0IHwgZ3psZW5bMl0gPDwgMTYgfCBnemxlblsxXSA8PCA4IHwg Z3psZW5bMF07Ci0gICAgaWYgKCAodW56aXBsZW4gPCAwKSB8fCAodW56aXBs ZW4gPiAoMTAyNCoxMDI0KjEwMjQpKSApIC8qIDFHQiBsaW1pdCAqLworICAg IGlmICggKHVuemlwbGVuIDwgMCkgfHwgKHVuemlwbGVuID4gWENfRE9NX0RF Q09NUFJFU1NfTUFYKSApCiAgICAgewogICAgICAgICB4Y19kb21fcHJpbnRm CiAgICAgICAgICAgICAoeGNoLApAQCAtMjg4LDYgKzMzMCw5IEBAIGludCB4 Y19kb21fdHJ5X2d1bnppcChzdHJ1Y3QgeGNfZG9tX2ltYWcKICAgICBpZiAo IHVuemlwbGVuID09IDAgKQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlm ICggeGNfZG9tX2tlcm5lbF9jaGVja19zaXplKGRvbSwgdW56aXBsZW4pICkK KyAgICAgICAgcmV0dXJuIDA7CisKICAgICB1bnppcCA9IHhjX2RvbV9tYWxs b2MoZG9tLCB1bnppcGxlbik7CiAgICAgaWYgKCB1bnppcCA9PSBOVUxMICkK ICAgICAgICAgcmV0dXJuIC0xOwpAQCAtNTkwLDYgKzYzNSw5IEBAIHN0cnVj dCB4Y19kb21faW1hZ2UgKnhjX2RvbV9hbGxvY2F0ZSh4Y18KICAgICBtZW1z ZXQoZG9tLCAwLCBzaXplb2YoKmRvbSkpOwogICAgIGRvbS0+eGNoID0geGNo OwogCisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBYQ19ET01fREVDT01Q UkVTU19NQVg7CisgICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0gWENfRE9N X0RFQ09NUFJFU1NfTUFYOworCiAgICAgaWYgKCBjbWRsaW5lICkKICAgICAg ICAgZG9tLT5jbWRsaW5lID0geGNfZG9tX3N0cmR1cChkb20sIGNtZGxpbmUp OwogICAgIGlmICggZmVhdHVyZXMgKQpAQCAtNjEwLDEwICs2NTgsMjUgQEAg c3RydWN0IHhjX2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9jYXRlKHhjXwogICAg IHJldHVybiBOVUxMOwogfQogCitpbnQgeGNfZG9tX2tlcm5lbF9tYXhfc2l6 ZShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20sIHNpemVfdCBzeikKK3sKKyAg ICBET01QUklOVEYoIiVzOiBrZXJuZWxfbWF4X3NpemU9JXp4IiwgX19GVU5D VElPTl9fLCBzeik7CisgICAgZG9tLT5tYXhfa2VybmVsX3NpemUgPSBzejsK KyAgICByZXR1cm4gMDsKK30KKworaW50IHhjX2RvbV9yYW1kaXNrX21heF9z aXplKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgc2l6ZV90IHN6KQorewor ICAgIERPTVBSSU5URigiJXM6IHJhbWRpc2tfbWF4X3NpemU9JXp4IiwgX19G VU5DVElPTl9fLCBzeik7CisgICAgZG9tLT5tYXhfcmFtZGlza19zaXplID0g c3o7CisgICAgcmV0dXJuIDA7Cit9CisKIGludCB4Y19kb21fa2VybmVsX2Zp bGUoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCBjb25zdCBjaGFyICpmaWxl bmFtZSkKIHsKICAgICBET01QUklOVEYoIiVzOiBmaWxlbmFtZT1cIiVzXCIi LCBfX0ZVTkNUSU9OX18sIGZpbGVuYW1lKTsKLSAgICBkb20tPmtlcm5lbF9i bG9iID0geGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZk b20tPmtlcm5lbF9zaXplKTsKKyAgICBkb20tPmtlcm5lbF9ibG9iID0geGNf ZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUsICZkb20tPmtlcm5l bF9zaXplLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZG9tLT5tYXhfa2VybmVsX3NpemUpOwogICAgIGlmICggZG9t LT5rZXJuZWxfYmxvYiA9PSBOVUxMICkKICAgICAgICAgcmV0dXJuIC0xOwog ICAgIHJldHVybiB4Y19kb21fdHJ5X2d1bnppcChkb20sICZkb20tPmtlcm5l bF9ibG9iLCAmZG9tLT5rZXJuZWxfc2l6ZSk7CkBAIC02MjMsNyArNjg2LDkg QEAgaW50IHhjX2RvbV9yYW1kaXNrX2ZpbGUoc3RydWN0IHhjX2RvbV9pbQog ewogICAgIERPTVBSSU5URigiJXM6IGZpbGVuYW1lPVwiJXNcIiIsIF9fRlVO Q1RJT05fXywgZmlsZW5hbWUpOwogICAgIGRvbS0+cmFtZGlza19ibG9iID0K LSAgICAgICAgeGNfZG9tX21hbGxvY19maWxlbWFwKGRvbSwgZmlsZW5hbWUs ICZkb20tPnJhbWRpc2tfc2l6ZSk7CisgICAgICAgIHhjX2RvbV9tYWxsb2Nf ZmlsZW1hcChkb20sIGZpbGVuYW1lLCAmZG9tLT5yYW1kaXNrX3NpemUsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb20tPm1heF9yYW1kaXNr X3NpemUpOworCiAgICAgaWYgKCBkb20tPnJhbWRpc2tfYmxvYiA9PSBOVUxM ICkKICAgICAgICAgcmV0dXJuIC0xOwogLy8gICAgcmV0dXJuIHhjX2RvbV90 cnlfZ3VuemlwKGRvbSwgJmRvbS0+cmFtZGlza19ibG9iLCAmZG9tLT5yYW1k aXNrX3NpemUpOwpAQCAtNzgzLDcgKzg0OCwxMSBAQCBpbnQgeGNfZG9tX2J1 aWxkX2ltYWdlKHN0cnVjdCB4Y19kb21faW1hCiAgICAgICAgIHZvaWQgKnJh bWRpc2ttYXA7CiAKICAgICAgICAgdW56aXBsZW4gPSB4Y19kb21fY2hlY2tf Z3ppcChkb20tPnhjaCwgZG9tLT5yYW1kaXNrX2Jsb2IsIGRvbS0+cmFtZGlz a19zaXplKTsKKyAgICAgICAgaWYgKCB4Y19kb21fcmFtZGlza19jaGVja19z aXplKGRvbSwgdW56aXBsZW4pICE9IDAgKQorICAgICAgICAgICAgdW56aXBs ZW4gPSAwOworCiAgICAgICAgIHJhbWRpc2tsZW4gPSB1bnppcGxlbiA/IHVu emlwbGVuIDogZG9tLT5yYW1kaXNrX3NpemU7CisKICAgICAgICAgaWYgKCB4 Y19kb21fYWxsb2Nfc2VnbWVudChkb20sICZkb20tPnJhbWRpc2tfc2VnLCAi cmFtZGlzayIsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmFtZGlza2xlbikgIT0gMCApCiAgICAgICAgICAgICBnb3RvIGVycjsK --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2d-0001Na-71; Tue, 13 Nov 2012 12:56:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2a-0001M3-RT; Tue, 13 Nov 2012 12:56:33 +0000 Received: from [85.158.139.83:49729] by server-14.bemta-5.messagelabs.com id 6B/EC-21768-F7342A05; Tue, 13 Nov 2012 12:56:31 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1352811383!30047820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28709 invoked from network); 13 Nov 2012 12:56:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2H-0008UJ-Od; Tue, 13 Nov 2012 12:56:13 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2H-0000zc-Mt; Tue, 13 Nov 2012 12:56:13 +0000 Date: Tue, 13 Nov 2012 12:56:13 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 22 (CVE-2012-4537) - Memory mapping failure DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4537 / XSA-22 version 4 Memory mapping failure DoS vulnerability UPDATES IN VERSION 4 ==================== Public release. ISSUE DESCRIPTION ================= When set_p2m_entry fails, Xen's internal data structures (the p2m and m2p tables) can get out of sync. This failure can be triggered by unusual guest behaviour exhausting the memory reserved for the p2m table. If it happens, subsequent guest-invoked memory operations can cause Xen to fail an assertion and crash. IMPACT ====== A malicious guest administrator might be able to cause Xen to crash. VULNERABLE SYSTEMS ================== All versions of Xen since at least 3.4 are vulnerable. The vulnerability is only exposed to HVM guests. MITIGATION ========== There is no mitigation available other than to use a trusted guest kernel. RESOLUTION ========== The attached patch resolves this issue. Applying the appropriate attached patch resolves this issue. xsa22-4.2-unstable.patch Xen 4.2.x, xen-unstable xsa22-4.1.patch Xen 4.1.x xsa22-4.0.patch Xen 4.0.x xsa22-3.4.patch Xen 3.4.x $ sha256sum xsa22*.patch fe21558f098340451a275c468a7b2209915676f4f41ec394970c6aa0df3d93d3 xsa22-3.4.patch b7e635ae07f31ac8ecb8732152ba66897ea6d0f5e30468e35d7c37379c7369bb xsa22-4.0.patch e699e7af6b90e60531d98f04197141c4caf5eb4cdb312a43e736830eb17d32e1 xsa22-4.1.patch 8dbf850b903179807257febe12a15cb131968e65d2e90dbd3a5f72b83d2f931a xsa22-4.2-unstable.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGpAAoJEIP+FMlX6CvZUsEIAIL7FtUpAgYTG73BXIpIoJ1h L85yaAhizzuwWAHMwLBD/oMs+OPzIXsCp4rBHI8XPQ0rf3YeHSj8uI+ta17Th1Gb KuFFlDPujh5EiE0yel8u21hgsJ7rUpA04jPeYDbVbHPVC6bywf7pkChCEPos/Ze9 gAlRVptdBXH2nGmSyMFDfoby60lDXa7ZP0KoJUyuUG69zDMzlANLiEvk/+mN4YKB W4uiaYlCeDfrCn4T8Pk9rTMdDWmCsbQpZQRqwwNXdUa/EX0Ccv/QdcppPHoylYeK DQ9GPZOtDsm4s1M/J1oPVXZI7X/vLuBwje4/hhisFFiO4kLffcKCSopSizgLlO0= =82B5 -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa22-3.4.patch" Content-Disposition: attachment; filename="xsa22-3.4.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgpbIEFkZCBiYWNrcG9ydCBvZiAyMDUxNjpj NGU2MjBhMmU2NWMgdG8gY29ycmVjdCBlcnJvciByZXR1cm4gZnJvbSBzZXRf cDJtX2VudHJ5IF0KCmRpZmYgLXIgMTQ3MDlkMTk2ZTQzIHhlbi9hcmNoL3g4 Ni9tbS9wMm0uYwotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMJV2VkIEp1 biAzMCAxODoyNjoxMyAyMDEwICswMTAwCisrKyBiL3hlbi9hcmNoL3g4Ni9t bS9wMm0uYwlGcmkgT2N0IDI2IDExOjI3OjQ0IDIwMTIgKzAxMDAKQEAgLTE1 MDAsMTQgKzE1MDAsMTUgQEAgaW50IHNldF9wMm1fZW50cnkoc3RydWN0IGRv bWFpbiAqZCwgdW5zaQogewogICAgIHVuc2lnbmVkIGxvbmcgdG9kbyA9IDF1 bCA8PCBwYWdlX29yZGVyOwogICAgIHVuc2lnbmVkIGludCBvcmRlcjsKLSAg ICBpbnQgcmMgPSAwOworICAgIGludCByYyA9IDE7CiAKICAgICB3aGlsZSAo IHRvZG8gKQogICAgIHsKICAgICAgICAgb3JkZXIgPSAoKCgoZ2ZuIHwgbWZu X3gobWZuKSB8IHRvZG8pICYgKFNVUEVSUEFHRV9QQUdFUyAtIDEpKSA9PSAw KSAmJgogICAgICAgICAgICAgICAgICBodm1faGFwX2hhc18ybWIoZCkpID8g OSA6IDA7CiAKLSAgICAgICAgcmMgPSBkLT5hcmNoLnAybS0+c2V0X2VudHJ5 KGQsIGdmbiwgbWZuLCBvcmRlciwgcDJtdCk7CisgICAgICAgIGlmICggIWQt PmFyY2gucDJtLT5zZXRfZW50cnkoZCwgZ2ZuLCBtZm4sIG9yZGVyLCBwMm10 KSApCisgICAgICAgICAgICByYyA9IDA7CiAgICAgICAgIGdmbiArPSAxdWwg PDwgb3JkZXI7CiAgICAgICAgIGlmICggbWZuX3gobWZuKSAhPSBJTlZBTElE X01GTiApCiAgICAgICAgICAgICBtZm4gPSBfbWZuKG1mbl94KG1mbikgKyAo MXVsIDw8IG9yZGVyKSk7CkBAIC0yMDU0LDcgKzIwNTUsMTAgQEAgZ3Vlc3Rf cGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAgIGlmICgg bWZuX3ZhbGlkKF9tZm4obWZuKSkgKSAKICAgICB7CiAgICAgICAgIGlmICgg IXNldF9wMm1fZW50cnkoZCwgZ2ZuLCBfbWZuKG1mbiksIHBhZ2Vfb3JkZXIs IHQpICkKKyAgICAgICAgewogICAgICAgICAgICAgcmMgPSAtRUlOVkFMOwor ICAgICAgICAgICAgZ290byBvdXQ7IC8qIEZhaWxlZCB0byB1cGRhdGUgcDJt LCBiYWlsIHdpdGhvdXQgdXBkYXRpbmcgbTJwLiAqLworICAgICAgICB9CiAg ICAgICAgIGZvciAoIGkgPSAwOyBpIDwgKDFVTCA8PCBwYWdlX29yZGVyKTsg aSsrICkKICAgICAgICAgICAgIHNldF9ncGZuX2Zyb21fbWZuKG1mbitpLCBn Zm4raSk7CiAgICAgfQpAQCAtMjA3Miw2ICsyMDc2LDcgQEAgZ3Vlc3RfcGh5 c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAgICAgICB9CiAg ICAgfQogCitvdXQ6CiAgICAgYXVkaXRfcDJtKGQpOwogICAgIHAybV91bmxv Y2soZC0+YXJjaC5wMm0pOwogCg== --=separator Content-Type: application/octet-stream; name="xsa22-4.0.patch" Content-Disposition: attachment; filename="xsa22-4.0.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBiNDRjNzJmMThmOWYgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTIyMDcsNyArMjIw NywxMCBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShzdHJ1Y3QgZG9tYWlu ICpkCiAgICAgaWYgKCBtZm5fdmFsaWQoX21mbihtZm4pKSApIAogICAgIHsK ICAgICAgICAgaWYgKCAhc2V0X3AybV9lbnRyeShkLCBnZm4sIF9tZm4obWZu KSwgcGFnZV9vcmRlciwgdCkgKQorICAgICAgICB7CiAgICAgICAgICAgICBy YyA9IC1FSU5WQUw7CisgICAgICAgICAgICBnb3RvIG91dDsgLyogRmFpbGVk IHRvIHVwZGF0ZSBwMm0sIGJhaWwgd2l0aG91dCB1cGRhdGluZyBtMnAuICov CisgICAgICAgIH0KICAgICAgICAgaWYgKCAhcDJtX2lzX2dyYW50KHQpICkK ICAgICAgICAgewogICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCAoMVVM IDw8IHBhZ2Vfb3JkZXIpOyBpKysgKQpAQCAtMjIyOCw2ICsyMjMxLDcgQEAg Z3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAg ICAgICB9CiAgICAgfQogCitvdXQ6CiAgICAgYXVkaXRfcDJtKGQpOwogICAg IHAybV91bmxvY2soZC0+YXJjaC5wMm0pOwogCg== --=separator Content-Type: application/octet-stream; name="xsa22-4.1.patch" Content-Disposition: attachment; filename="xsa22-4.1.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciAzYTI3ZjRlNDRiNmEgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTI1NTgsNyArMjU1 OCwxMCBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShzdHJ1Y3QgcDJtX2Rv bWFpCiAgICAgaWYgKCBtZm5fdmFsaWQoX21mbihtZm4pKSApIAogICAgIHsK ICAgICAgICAgaWYgKCAhc2V0X3AybV9lbnRyeShwMm0sIGdmbiwgX21mbiht Zm4pLCBwYWdlX29yZGVyLCB0LCBwMm0tPmRlZmF1bHRfYWNjZXNzKSApCisg ICAgICAgIHsKICAgICAgICAgICAgIHJjID0gLUVJTlZBTDsKKyAgICAgICAg ICAgIGdvdG8gb3V0OyAvKiBGYWlsZWQgdG8gdXBkYXRlIHAybSwgYmFpbCB3 aXRob3V0IHVwZGF0aW5nIG0ycC4gKi8KKyAgICAgICAgfQogICAgICAgICBp ZiAoICFwMm1faXNfZ3JhbnQodCkgKQogICAgICAgICB7CiAgICAgICAgICAg ICBmb3IgKCBpID0gMDsgaSA8ICgxVUwgPDwgcGFnZV9vcmRlcik7IGkrKyAp CkBAIC0yNTc5LDYgKzI1ODIsNyBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRy eShzdHJ1Y3QgcDJtX2RvbWFpCiAgICAgICAgIH0KICAgICB9CiAKK291dDoK ICAgICBhdWRpdF9wMm0ocDJtLCAxKTsKICAgICBwMm1fdW5sb2NrKHAybSk7 CiAK --=separator Content-Type: application/octet-stream; name="xsa22-4.2-unstable.patch" Content-Disposition: attachment; filename="xsa22-4.2-unstable.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBmNTNiOWY5MTVjM2QgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTYzMyw3ICs2MzMs MTAgQEAgZ3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAq ZAogICAgIGlmICggbWZuX3ZhbGlkKF9tZm4obWZuKSkgKSAKICAgICB7CiAg ICAgICAgIGlmICggIXNldF9wMm1fZW50cnkocDJtLCBnZm4sIF9tZm4obWZu KSwgcGFnZV9vcmRlciwgdCwgcDJtLT5kZWZhdWx0X2FjY2VzcykgKQorICAg ICAgICB7CiAgICAgICAgICAgICByYyA9IC1FSU5WQUw7CisgICAgICAgICAg ICBnb3RvIG91dDsgLyogRmFpbGVkIHRvIHVwZGF0ZSBwMm0sIGJhaWwgd2l0 aG91dCB1cGRhdGluZyBtMnAuICovCisgICAgICAgIH0KICAgICAgICAgaWYg KCAhcDJtX2lzX2dyYW50KHQpICkKICAgICAgICAgewogICAgICAgICAgICAg Zm9yICggaSA9IDA7IGkgPCAoMVVMIDw8IHBhZ2Vfb3JkZXIpOyBpKysgKQpA QCAtNjU2LDYgKzY1OSw3IEBAIGd1ZXN0X3BoeXNtYXBfYWRkX2VudHJ5KHN0 cnVjdCBkb21haW4gKmQKICAgICAgICAgfQogICAgIH0KIAorb3V0OgogICAg IHAybV91bmxvY2socDJtKTsKIAogICAgIHJldHVybiByYzsK --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 12:56:45 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 12:56:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2d-0001Na-71; Tue, 13 Nov 2012 12:56:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2a-0001M3-RT; Tue, 13 Nov 2012 12:56:33 +0000 Received: from [85.158.139.83:49729] by server-14.bemta-5.messagelabs.com id 6B/EC-21768-F7342A05; Tue, 13 Nov 2012 12:56:31 +0000 X-Env-Sender: iwj@xenbits.xen.org X-Msg-Ref: server-2.tower-182.messagelabs.com!1352811383!30047820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28709 invoked from network); 13 Nov 2012 12:56:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 13 Nov 2012 12:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYG2H-0008UJ-Od; Tue, 13 Nov 2012 12:56:13 +0000 Received: from iwj by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1TYG2H-0000zc-Mt; Tue, 13 Nov 2012 12:56:13 +0000 Date: Tue, 13 Nov 2012 12:56:13 +0000 Message-Id: Content-Type: multipart/mixed; boundary="=separator"; charset="utf-8" Content-Transfer-Encoding: binary MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) To: xen-announce@lists.xen.org, xen-devel@lists.xen.org, xen-users@lists.xen.org, oss-security@lists.openwall.com From: Xen.org security team Cc: "Xen.org security team" Subject: [Xen-devel] Xen Security Advisory 22 (CVE-2012-4537) - Memory mapping failure DoS vulnerability X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --=separator Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Xen Security Advisory CVE-2012-4537 / XSA-22 version 4 Memory mapping failure DoS vulnerability UPDATES IN VERSION 4 ==================== Public release. ISSUE DESCRIPTION ================= When set_p2m_entry fails, Xen's internal data structures (the p2m and m2p tables) can get out of sync. This failure can be triggered by unusual guest behaviour exhausting the memory reserved for the p2m table. If it happens, subsequent guest-invoked memory operations can cause Xen to fail an assertion and crash. IMPACT ====== A malicious guest administrator might be able to cause Xen to crash. VULNERABLE SYSTEMS ================== All versions of Xen since at least 3.4 are vulnerable. The vulnerability is only exposed to HVM guests. MITIGATION ========== There is no mitigation available other than to use a trusted guest kernel. RESOLUTION ========== The attached patch resolves this issue. Applying the appropriate attached patch resolves this issue. xsa22-4.2-unstable.patch Xen 4.2.x, xen-unstable xsa22-4.1.patch Xen 4.1.x xsa22-4.0.patch Xen 4.0.x xsa22-3.4.patch Xen 3.4.x $ sha256sum xsa22*.patch fe21558f098340451a275c468a7b2209915676f4f41ec394970c6aa0df3d93d3 xsa22-3.4.patch b7e635ae07f31ac8ecb8732152ba66897ea6d0f5e30468e35d7c37379c7369bb xsa22-4.0.patch e699e7af6b90e60531d98f04197141c4caf5eb4cdb312a43e736830eb17d32e1 xsa22-4.1.patch 8dbf850b903179807257febe12a15cb131968e65d2e90dbd3a5f72b83d2f931a xsa22-4.2-unstable.patch $ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBAgAGBQJQokGpAAoJEIP+FMlX6CvZUsEIAIL7FtUpAgYTG73BXIpIoJ1h L85yaAhizzuwWAHMwLBD/oMs+OPzIXsCp4rBHI8XPQ0rf3YeHSj8uI+ta17Th1Gb KuFFlDPujh5EiE0yel8u21hgsJ7rUpA04jPeYDbVbHPVC6bywf7pkChCEPos/Ze9 gAlRVptdBXH2nGmSyMFDfoby60lDXa7ZP0KoJUyuUG69zDMzlANLiEvk/+mN4YKB W4uiaYlCeDfrCn4T8Pk9rTMdDWmCsbQpZQRqwwNXdUa/EX0Ccv/QdcppPHoylYeK DQ9GPZOtDsm4s1M/J1oPVXZI7X/vLuBwje4/hhisFFiO4kLffcKCSopSizgLlO0= =82B5 -----END PGP SIGNATURE----- --=separator Content-Type: application/octet-stream; name="xsa22-3.4.patch" Content-Disposition: attachment; filename="xsa22-3.4.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgpbIEFkZCBiYWNrcG9ydCBvZiAyMDUxNjpj NGU2MjBhMmU2NWMgdG8gY29ycmVjdCBlcnJvciByZXR1cm4gZnJvbSBzZXRf cDJtX2VudHJ5IF0KCmRpZmYgLXIgMTQ3MDlkMTk2ZTQzIHhlbi9hcmNoL3g4 Ni9tbS9wMm0uYwotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMJV2VkIEp1 biAzMCAxODoyNjoxMyAyMDEwICswMTAwCisrKyBiL3hlbi9hcmNoL3g4Ni9t bS9wMm0uYwlGcmkgT2N0IDI2IDExOjI3OjQ0IDIwMTIgKzAxMDAKQEAgLTE1 MDAsMTQgKzE1MDAsMTUgQEAgaW50IHNldF9wMm1fZW50cnkoc3RydWN0IGRv bWFpbiAqZCwgdW5zaQogewogICAgIHVuc2lnbmVkIGxvbmcgdG9kbyA9IDF1 bCA8PCBwYWdlX29yZGVyOwogICAgIHVuc2lnbmVkIGludCBvcmRlcjsKLSAg ICBpbnQgcmMgPSAwOworICAgIGludCByYyA9IDE7CiAKICAgICB3aGlsZSAo IHRvZG8gKQogICAgIHsKICAgICAgICAgb3JkZXIgPSAoKCgoZ2ZuIHwgbWZu X3gobWZuKSB8IHRvZG8pICYgKFNVUEVSUEFHRV9QQUdFUyAtIDEpKSA9PSAw KSAmJgogICAgICAgICAgICAgICAgICBodm1faGFwX2hhc18ybWIoZCkpID8g OSA6IDA7CiAKLSAgICAgICAgcmMgPSBkLT5hcmNoLnAybS0+c2V0X2VudHJ5 KGQsIGdmbiwgbWZuLCBvcmRlciwgcDJtdCk7CisgICAgICAgIGlmICggIWQt PmFyY2gucDJtLT5zZXRfZW50cnkoZCwgZ2ZuLCBtZm4sIG9yZGVyLCBwMm10 KSApCisgICAgICAgICAgICByYyA9IDA7CiAgICAgICAgIGdmbiArPSAxdWwg PDwgb3JkZXI7CiAgICAgICAgIGlmICggbWZuX3gobWZuKSAhPSBJTlZBTElE X01GTiApCiAgICAgICAgICAgICBtZm4gPSBfbWZuKG1mbl94KG1mbikgKyAo MXVsIDw8IG9yZGVyKSk7CkBAIC0yMDU0LDcgKzIwNTUsMTAgQEAgZ3Vlc3Rf cGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAgIGlmICgg bWZuX3ZhbGlkKF9tZm4obWZuKSkgKSAKICAgICB7CiAgICAgICAgIGlmICgg IXNldF9wMm1fZW50cnkoZCwgZ2ZuLCBfbWZuKG1mbiksIHBhZ2Vfb3JkZXIs IHQpICkKKyAgICAgICAgewogICAgICAgICAgICAgcmMgPSAtRUlOVkFMOwor ICAgICAgICAgICAgZ290byBvdXQ7IC8qIEZhaWxlZCB0byB1cGRhdGUgcDJt LCBiYWlsIHdpdGhvdXQgdXBkYXRpbmcgbTJwLiAqLworICAgICAgICB9CiAg ICAgICAgIGZvciAoIGkgPSAwOyBpIDwgKDFVTCA8PCBwYWdlX29yZGVyKTsg aSsrICkKICAgICAgICAgICAgIHNldF9ncGZuX2Zyb21fbWZuKG1mbitpLCBn Zm4raSk7CiAgICAgfQpAQCAtMjA3Miw2ICsyMDc2LDcgQEAgZ3Vlc3RfcGh5 c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAgICAgICB9CiAg ICAgfQogCitvdXQ6CiAgICAgYXVkaXRfcDJtKGQpOwogICAgIHAybV91bmxv Y2soZC0+YXJjaC5wMm0pOwogCg== --=separator Content-Type: application/octet-stream; name="xsa22-4.0.patch" Content-Disposition: attachment; filename="xsa22-4.0.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBiNDRjNzJmMThmOWYgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTIyMDcsNyArMjIw NywxMCBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShzdHJ1Y3QgZG9tYWlu ICpkCiAgICAgaWYgKCBtZm5fdmFsaWQoX21mbihtZm4pKSApIAogICAgIHsK ICAgICAgICAgaWYgKCAhc2V0X3AybV9lbnRyeShkLCBnZm4sIF9tZm4obWZu KSwgcGFnZV9vcmRlciwgdCkgKQorICAgICAgICB7CiAgICAgICAgICAgICBy YyA9IC1FSU5WQUw7CisgICAgICAgICAgICBnb3RvIG91dDsgLyogRmFpbGVk IHRvIHVwZGF0ZSBwMm0sIGJhaWwgd2l0aG91dCB1cGRhdGluZyBtMnAuICov CisgICAgICAgIH0KICAgICAgICAgaWYgKCAhcDJtX2lzX2dyYW50KHQpICkK ICAgICAgICAgewogICAgICAgICAgICAgZm9yICggaSA9IDA7IGkgPCAoMVVM IDw8IHBhZ2Vfb3JkZXIpOyBpKysgKQpAQCAtMjIyOCw2ICsyMjMxLDcgQEAg Z3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZAogICAg ICAgICB9CiAgICAgfQogCitvdXQ6CiAgICAgYXVkaXRfcDJtKGQpOwogICAg IHAybV91bmxvY2soZC0+YXJjaC5wMm0pOwogCg== --=separator Content-Type: application/octet-stream; name="xsa22-4.1.patch" Content-Disposition: attachment; filename="xsa22-4.1.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciAzYTI3ZjRlNDRiNmEgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTI1NTgsNyArMjU1 OCwxMCBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShzdHJ1Y3QgcDJtX2Rv bWFpCiAgICAgaWYgKCBtZm5fdmFsaWQoX21mbihtZm4pKSApIAogICAgIHsK ICAgICAgICAgaWYgKCAhc2V0X3AybV9lbnRyeShwMm0sIGdmbiwgX21mbiht Zm4pLCBwYWdlX29yZGVyLCB0LCBwMm0tPmRlZmF1bHRfYWNjZXNzKSApCisg ICAgICAgIHsKICAgICAgICAgICAgIHJjID0gLUVJTlZBTDsKKyAgICAgICAg ICAgIGdvdG8gb3V0OyAvKiBGYWlsZWQgdG8gdXBkYXRlIHAybSwgYmFpbCB3 aXRob3V0IHVwZGF0aW5nIG0ycC4gKi8KKyAgICAgICAgfQogICAgICAgICBp ZiAoICFwMm1faXNfZ3JhbnQodCkgKQogICAgICAgICB7CiAgICAgICAgICAg ICBmb3IgKCBpID0gMDsgaSA8ICgxVUwgPDwgcGFnZV9vcmRlcik7IGkrKyAp CkBAIC0yNTc5LDYgKzI1ODIsNyBAQCBndWVzdF9waHlzbWFwX2FkZF9lbnRy eShzdHJ1Y3QgcDJtX2RvbWFpCiAgICAgICAgIH0KICAgICB9CiAKK291dDoK ICAgICBhdWRpdF9wMm0ocDJtLCAxKTsKICAgICBwMm1fdW5sb2NrKHAybSk7 CiAK --=separator Content-Type: application/octet-stream; name="xsa22-4.2-unstable.patch" Content-Disposition: attachment; filename="xsa22-4.2-unstable.patch" Content-Transfer-Encoding: base64 eDg2L3BoeXNtYXA6IFByZXZlbnQgaW5jb3JyZWN0IHVwZGF0ZXMgb2YgbTJw IG1hcHBpbmdzCgpJbiBjZXJ0YWluIGNvbmRpdGlvbnMsIHN1Y2ggYXMgbG93 IG1lbW9yeSwgc2V0X3AybV9lbnRyeSgpIGNhbiBmYWlsLgpDdXJyZW50bHks IHRoZSBwMm0gYW5kIG0ycCB0YWJsZXMgd2lsbCBnZXQgb3V0IG9mIHN5bmMg YmVjYXVzZSB3ZSBzdGlsbAp1cGRhdGUgdGhlIG0ycCB0YWJsZSBhZnRlciB0 aGUgcDJtIHVwZGF0ZSBoYXMgZmFpbGVkLgoKSWYgdGhhdCBoYXBwZW5zLCBz dWJzZXF1ZW50IGd1ZXN0LWludm9rZWQgbWVtb3J5IG9wZXJhdGlvbnMgY2Fu IGNhdXNlCkJVRygpcyBhbmQgQVNTRVJUKClzIHRvIGtpbGwgWGVuLgoKVGhp cyBpcyBmaXhlZCBieSBvbmx5IHVwZGF0aW5nIHRoZSBtMnAgdGFibGUgaWZm IHRoZSBwMm0gd2FzCnN1Y2Nlc3NmdWxseSB1cGRhdGVkLgoKVGhpcyBpcyBh IHNlY3VyaXR5IHByb2JsZW0sIFhTQS0yMiAvIENWRS0yMDEyLTQ1MzcuCgpT aWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpBY2tlZC1ieTogSWFuIENhbXBiZWxsIDxpYW4uY2FtcGJl bGxAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFj a3NvbkBldS5jaXRyaXguY29tPgoKZGlmZiAtciBmNTNiOWY5MTVjM2QgeGVu L2FyY2gveDg2L21tL3AybS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0u YworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKQEAgLTYzMyw3ICs2MzMs MTAgQEAgZ3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAq ZAogICAgIGlmICggbWZuX3ZhbGlkKF9tZm4obWZuKSkgKSAKICAgICB7CiAg ICAgICAgIGlmICggIXNldF9wMm1fZW50cnkocDJtLCBnZm4sIF9tZm4obWZu KSwgcGFnZV9vcmRlciwgdCwgcDJtLT5kZWZhdWx0X2FjY2VzcykgKQorICAg ICAgICB7CiAgICAgICAgICAgICByYyA9IC1FSU5WQUw7CisgICAgICAgICAg ICBnb3RvIG91dDsgLyogRmFpbGVkIHRvIHVwZGF0ZSBwMm0sIGJhaWwgd2l0 aG91dCB1cGRhdGluZyBtMnAuICovCisgICAgICAgIH0KICAgICAgICAgaWYg KCAhcDJtX2lzX2dyYW50KHQpICkKICAgICAgICAgewogICAgICAgICAgICAg Zm9yICggaSA9IDA7IGkgPCAoMVVMIDw8IHBhZ2Vfb3JkZXIpOyBpKysgKQpA QCAtNjU2LDYgKzY1OSw3IEBAIGd1ZXN0X3BoeXNtYXBfYWRkX2VudHJ5KHN0 cnVjdCBkb21haW4gKmQKICAgICAgICAgfQogICAgIH0KIAorb3V0OgogICAg IHAybV91bmxvY2socDJtKTsKIAogICAgIHJldHVybiByYzsK --=separator Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=separator-- From xen-devel-bounces@lists.xen.org Tue Nov 13 13:13:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:13:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGId-0007XV-6Y; Tue, 13 Nov 2012 13:13:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGIb-0007X7-8Q for xen-devel@lists.xen.org; Tue, 13 Nov 2012 13:13:05 +0000 Received: from [193.109.254.147:2293] by server-2.bemta-14.messagelabs.com id 6B/6F-20829-06742A05; Tue, 13 Nov 2012 13:13:04 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352812382!3930915!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28977 invoked from network); 13 Nov 2012 13:13:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:13:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44396184" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:12:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 08:12:56 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYGIR-0005vq-UQ; Tue, 13 Nov 2012 13:12:55 +0000 Message-ID: <50A24757.30402@citrix.com> Date: Tue, 13 Nov 2012 13:12:55 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: References: In-Reply-To: X-Enigmail-Version: 1.4.5 Content-Type: multipart/mixed; boundary="------------030408070200090609040107" Cc: Keir Fraser , Jan Beulich Subject: Re: [Xen-devel] Xen Security Advisory 20 (CVE-2012-4535) - Timer overflow DoS vulnerability - Further bugfixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------030408070200090609040107 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Now this vulnerability has been publicly disclosed, here are 3 further related bugfixes which are not security problems themselves. -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com --------------030408070200090609040107 Content-Type: text/x-patch; name="validate-timers.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="validate-timers.patch" # HG changeset patch # Parent e0361d2401bbfc454794ad477c4848e6134c5c31 common/timers: Prevent guests timeouts which would overflow timer calculations None of these have security implications, but will cause the timers to expire instantly, rather than a long time into the future. Signed-off-by: Andrew Cooper diff -r e0361d2401bb xen/common/domain.c --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -896,6 +896,9 @@ long do_vcpu_op(int cmd, int vcpuid, XEN if ( copy_from_guest(&set, arg, 1) ) return -EFAULT; + if ( set.timeout_abs_ns > STIME_MAX ) + return -EINVAL; + if ( (set.flags & VCPU_SSHOTTMR_future) && (set.timeout_abs_ns < NOW()) ) return -ETIME; diff -r e0361d2401bb xen/common/schedule.c --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -739,6 +739,9 @@ static long do_poll(struct sched_poll *s if ( sched_poll->nr_ports > 128 ) return -EINVAL; + if ( sched_poll->timeout > STIME_MAX ) + return -EINVAL; + if ( !guest_handle_okay(sched_poll->ports, sched_poll->nr_ports) ) return -EFAULT; @@ -829,6 +832,9 @@ static long domain_watchdog(struct domai if ( id > NR_DOMAIN_WATCHDOG_TIMERS ) return -EINVAL; + if ( SECONDS(timeout) > STIME_DELTA_MAX ) + return -EINVAL; + spin_lock(&d->watchdog_lock); if ( id == 0 ) --------------030408070200090609040107 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------030408070200090609040107-- From xen-devel-bounces@lists.xen.org Tue Nov 13 13:13:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:13:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGId-0007XV-6Y; Tue, 13 Nov 2012 13:13:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGIb-0007X7-8Q for xen-devel@lists.xen.org; Tue, 13 Nov 2012 13:13:05 +0000 Received: from [193.109.254.147:2293] by server-2.bemta-14.messagelabs.com id 6B/6F-20829-06742A05; Tue, 13 Nov 2012 13:13:04 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1352812382!3930915!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28977 invoked from network); 13 Nov 2012 13:13:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:13:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44396184" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:12:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 08:12:56 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYGIR-0005vq-UQ; Tue, 13 Nov 2012 13:12:55 +0000 Message-ID: <50A24757.30402@citrix.com> Date: Tue, 13 Nov 2012 13:12:55 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: References: In-Reply-To: X-Enigmail-Version: 1.4.5 Content-Type: multipart/mixed; boundary="------------030408070200090609040107" Cc: Keir Fraser , Jan Beulich Subject: Re: [Xen-devel] Xen Security Advisory 20 (CVE-2012-4535) - Timer overflow DoS vulnerability - Further bugfixes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --------------030408070200090609040107 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Now this vulnerability has been publicly disclosed, here are 3 further related bugfixes which are not security problems themselves. -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com --------------030408070200090609040107 Content-Type: text/x-patch; name="validate-timers.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="validate-timers.patch" # HG changeset patch # Parent e0361d2401bbfc454794ad477c4848e6134c5c31 common/timers: Prevent guests timeouts which would overflow timer calculations None of these have security implications, but will cause the timers to expire instantly, rather than a long time into the future. Signed-off-by: Andrew Cooper diff -r e0361d2401bb xen/common/domain.c --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -896,6 +896,9 @@ long do_vcpu_op(int cmd, int vcpuid, XEN if ( copy_from_guest(&set, arg, 1) ) return -EFAULT; + if ( set.timeout_abs_ns > STIME_MAX ) + return -EINVAL; + if ( (set.flags & VCPU_SSHOTTMR_future) && (set.timeout_abs_ns < NOW()) ) return -ETIME; diff -r e0361d2401bb xen/common/schedule.c --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -739,6 +739,9 @@ static long do_poll(struct sched_poll *s if ( sched_poll->nr_ports > 128 ) return -EINVAL; + if ( sched_poll->timeout > STIME_MAX ) + return -EINVAL; + if ( !guest_handle_okay(sched_poll->ports, sched_poll->nr_ports) ) return -EFAULT; @@ -829,6 +832,9 @@ static long domain_watchdog(struct domai if ( id > NR_DOMAIN_WATCHDOG_TIMERS ) return -EINVAL; + if ( SECONDS(timeout) > STIME_DELTA_MAX ) + return -EINVAL; + spin_lock(&d->watchdog_lock); if ( id == 0 ) --------------030408070200090609040107 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------030408070200090609040107-- From xen-devel-bounces@lists.xen.org Tue Nov 13 13:17:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:17:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGMX-0007vA-Ut; Tue, 13 Nov 2012 13:17:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGMW-0007uw-9I for xen-devel@lists.xen.org; Tue, 13 Nov 2012 13:17:08 +0000 Received: from [85.158.139.211:41897] by server-1.bemta-5.messagelabs.com id 62/87-05877-35842A05; Tue, 13 Nov 2012 13:17:07 +0000 X-Env-Sender: peter.maloney@brockmann-consult.de X-Msg-Ref: server-7.tower-206.messagelabs.com!1352812626!19557163!1 X-Originating-IP: [212.227.126.187] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNzMzOTc=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNzMzOTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4573 invoked from network); 13 Nov 2012 13:17:06 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.187) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:17:06 -0000 Received: from [10.3.0.26] ([141.4.215.32]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LqYLt-1T3tcs1TTV-00dhSz; Tue, 13 Nov 2012 14:17:03 +0100 Message-ID: <50A2484D.309@brockmann-consult.de> Date: Tue, 13 Nov 2012 14:17:01 +0100 From: Peter Maloney User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120825 Thunderbird/15.0 MIME-Version: 1.0 To: Andres Lagar-Cavilla References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> <20121101170016.GD61948@ocelot.phlegethon.org> In-Reply-To: X-Enigmail-Version: 1.4.4 X-Provags-ID: V02:K0:s1gPjLx/4M3uDgd/+BiB8qYdFhkw0Aye5SW7PZxtTFp AynNS842TSY9ge4+ItliaFqh+FsNp7F4OiBDHslR772ibc/pVX MgraXKluC8l8rDCxwH3gZ5jyv11L7K5MZeN2jtYqmcD7LSWWLu /m2Ogv3b/mL3UgWDTdNjerEqm+a0PZ1lFgyFGrFoiAdo+KY+nd zbYe9RZqWdfyRGm5sfR9O8Tu3Q37wSVICAvsJNJhYsN9DUYue6 anm5u+Mj53DGGJo+FRUZBiv5HFgzETEeQI6vSEal/5rcO5ok5i 1SNQctgvh9P1+oRGbW7fV5+avj7mjFpRTll4j59ctTR9cpnmrh kMrvyfsvr2mgd/n9GRkeIUSzLyMtq/N3Ycmpq55F8 Cc: Tim Deegan , Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 2012-11-01 18:28, Andres Lagar-Cavilla wrote: > On Nov 1, 2012, at 1:00 PM, Tim Deegan wrote: > >> Hi, >> >> At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: >>> At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: >>>> The change was 8 months ago >>>> >>>> changeset: 24770:7f79475d3de7 >>>> user: Andres Lagar-Cavilla >>>> date: Fri Feb 10 16:07:07 2012 +0000 >>>> summary: x86/mm: Make p2m lookups fully synchronized wrt modifications >>> This change was bad for performnace across the board and most of it has >>> since been either reverted or amended, but clearly we missed something >>> here. >>> >>> It's interesting that Win8 isn't slowed down. I wonder whether that's to >>> do with the way it drives the VGA card -- IIRC it uses a generic VESA >>> driver rather than a Cirrus one. >> In fact this is to do with the APIC. On my test system, a busy 2-vcpu >> VM is making about 300k/s accesses to the APIC TPR. These accesses are >> all trapped and emulated by Xen, and that emulation has got more >> expensive as part of this change. >> >> Later Windows OSes have a feature called 'lazy IRQL' which makes those >> accesses go away, but sadly that's not been done for WinXP. On modern >> Intel CPUs, the hardware acceleration for TPR accesses works for XP; on >> AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead >> of MMIO, which XP is clearly not doing. :( >> >> Peter: if you have the option, you might find that installing the PV >> drivers that ship with Citrix XenServer 6.0 makes things work better. >> >> Andres: even though this load of APIC emulations is pretty extreme, it's >> surprising that the VM runs faster on shadow pagetables! Any ideas for >> where this slowdown is coming from? > Not any immediate ideas without profiling. > > However, most callers of hvmemul_do_io pass a stub zero ram_gpa address. We might be madly hitting the p2m locks for no reason there. > > How about the following patch, Peter, Tim? Thanks, I'll give it a try sometime this week I guess. > diff -r 5171750d133e xen/arch/x86/hvm/emulate.c > --- a/xen/arch/x86/hvm/emulate.c > +++ b/xen/arch/x86/hvm/emulate.c > @@ -60,24 +60,28 @@ static int hvmemul_do_io( > ioreq_t *p = get_ioreq(curr); > unsigned long ram_gfn = paddr_to_pfn(ram_gpa); > p2m_type_t p2mt; > - struct page_info *ram_page; > + struct page_info *ram_page = NULL; > int rc; > > /* Check for paged out page */ > - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); > - if ( p2m_is_paging(p2mt) ) > + if ( ram_gpa != INVALID_MFN ) > { > - if ( ram_page ) > - put_page(ram_page); > - p2m_mem_paging_populate(curr->domain, ram_gfn); > - return X86EMUL_RETRY; > - } > - if ( p2m_is_shared(p2mt) ) > - { > - if ( ram_page ) > - put_page(ram_page); > - return X86EMUL_RETRY; > - } > + ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); > + if ( p2m_is_paging(p2mt) ) > + { > + if ( ram_page ) > + put_page(ram_page); > + p2m_mem_paging_populate(curr->domain, ram_gfn); > + return X86EMUL_RETRY; > + } > + if ( p2m_is_shared(p2mt) ) > + { > + if ( ram_page ) > + put_page(ram_page); > + return X86EMUL_RETRY; > + } > + } else > + value = 0; /* for pvalue */ > > /* > * Weird-sized accesses have undefined behaviour: we discard writes > @@ -455,7 +459,7 @@ static int __hvmemul_read( > return X86EMUL_UNHANDLEABLE; > gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); > if ( (off + bytes) <= PAGE_SIZE ) > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_READ, 0, p_data); > } > > @@ -480,7 +484,8 @@ static int __hvmemul_read( > addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); > if ( rc != X86EMUL_OKAY ) > return rc; > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > + IOREQ_READ, 0, p_data); > case HVMCOPY_gfn_paged_out: > return X86EMUL_RETRY; > case HVMCOPY_gfn_shared: > @@ -552,7 +557,7 @@ static int hvmemul_write( > unsigned int off = addr & (PAGE_SIZE - 1); > gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); > if ( (off + bytes) <= PAGE_SIZE ) > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_WRITE, 0, p_data); > } > > @@ -573,7 +578,7 @@ static int hvmemul_write( > addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); > if ( rc != X86EMUL_OKAY ) > return rc; > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_WRITE, 0, p_data); > case HVMCOPY_gfn_paged_out: > return X86EMUL_RETRY; > @@ -804,7 +809,7 @@ static int hvmemul_read_io( > { > unsigned long reps = 1; > *val = 0; > - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); > + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, val); > } > > static int hvmemul_write_io( > @@ -814,7 +819,7 @@ static int hvmemul_write_io( > struct x86_emulate_ctxt *ctxt) > { > unsigned long reps = 1; > - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); > + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, &val); > } > > static int hvmemul_read_cr( > diff -r 5171750d133e xen/arch/x86/hvm/io.c > --- a/xen/arch/x86/hvm/io.c > +++ b/xen/arch/x86/hvm/io.c > @@ -231,7 +231,7 @@ int handle_pio(uint16_t port, int size, > if ( dir == IOREQ_WRITE ) > data = guest_cpu_user_regs()->eax; > > - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); > + rc = hvmemul_do_pio(port, &reps, size, INVALID_MFN, dir, 0, &data); > > switch ( rc ) > { > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:17:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:17:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGMX-0007vA-Ut; Tue, 13 Nov 2012 13:17:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGMW-0007uw-9I for xen-devel@lists.xen.org; Tue, 13 Nov 2012 13:17:08 +0000 Received: from [85.158.139.211:41897] by server-1.bemta-5.messagelabs.com id 62/87-05877-35842A05; Tue, 13 Nov 2012 13:17:07 +0000 X-Env-Sender: peter.maloney@brockmann-consult.de X-Msg-Ref: server-7.tower-206.messagelabs.com!1352812626!19557163!1 X-Originating-IP: [212.227.126.187] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNzMzOTc=\n,sa_preprocessor: QmFkIElQOiAyMTIuMjI3LjEyNi4xODcgPT4gNzMzOTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4573 invoked from network); 13 Nov 2012 13:17:06 -0000 Received: from moutng.kundenserver.de (HELO moutng.kundenserver.de) (212.227.126.187) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:17:06 -0000 Received: from [10.3.0.26] ([141.4.215.32]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LqYLt-1T3tcs1TTV-00dhSz; Tue, 13 Nov 2012 14:17:03 +0100 Message-ID: <50A2484D.309@brockmann-consult.de> Date: Tue, 13 Nov 2012 14:17:01 +0100 From: Peter Maloney User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120825 Thunderbird/15.0 MIME-Version: 1.0 To: Andres Lagar-Cavilla References: <5082DD8C.2030608@brockmann-consult.de> <20121022135920.GE12577@ocelot.phlegethon.org> <20121101170016.GD61948@ocelot.phlegethon.org> In-Reply-To: X-Enigmail-Version: 1.4.4 X-Provags-ID: V02:K0:s1gPjLx/4M3uDgd/+BiB8qYdFhkw0Aye5SW7PZxtTFp AynNS842TSY9ge4+ItliaFqh+FsNp7F4OiBDHslR772ibc/pVX MgraXKluC8l8rDCxwH3gZ5jyv11L7K5MZeN2jtYqmcD7LSWWLu /m2Ogv3b/mL3UgWDTdNjerEqm+a0PZ1lFgyFGrFoiAdo+KY+nd zbYe9RZqWdfyRGm5sfR9O8Tu3Q37wSVICAvsJNJhYsN9DUYue6 anm5u+Mj53DGGJo+FRUZBiv5HFgzETEeQI6vSEal/5rcO5ok5i 1SNQctgvh9P1+oRGbW7fV5+avj7mjFpRTll4j59ctTR9cpnmrh kMrvyfsvr2mgd/n9GRkeIUSzLyMtq/N3Ycmpq55F8 Cc: Tim Deegan , Andres Lagar-Cavilla , xen-devel@lists.xen.org Subject: Re: [Xen-devel] xen-unstable, winxp32 very poor performance on AMD FX-8150, I bisected and changeset is 24770:7f79475d3de7 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 2012-11-01 18:28, Andres Lagar-Cavilla wrote: > On Nov 1, 2012, at 1:00 PM, Tim Deegan wrote: > >> Hi, >> >> At 14:59 +0100 on 22 Oct (1350917960), Tim Deegan wrote: >>> At 19:21 +0200 on 20 Oct (1350760876), Peter Maloney wrote: >>>> The change was 8 months ago >>>> >>>> changeset: 24770:7f79475d3de7 >>>> user: Andres Lagar-Cavilla >>>> date: Fri Feb 10 16:07:07 2012 +0000 >>>> summary: x86/mm: Make p2m lookups fully synchronized wrt modifications >>> This change was bad for performnace across the board and most of it has >>> since been either reverted or amended, but clearly we missed something >>> here. >>> >>> It's interesting that Win8 isn't slowed down. I wonder whether that's to >>> do with the way it drives the VGA card -- IIRC it uses a generic VESA >>> driver rather than a Cirrus one. >> In fact this is to do with the APIC. On my test system, a busy 2-vcpu >> VM is making about 300k/s accesses to the APIC TPR. These accesses are >> all trapped and emulated by Xen, and that emulation has got more >> expensive as part of this change. >> >> Later Windows OSes have a feature called 'lazy IRQL' which makes those >> accesses go away, but sadly that's not been done for WinXP. On modern >> Intel CPUs, the hardware acceleration for TPR accesses works for XP; on >> AMD it requires the OS to use 'MOV reg32, CR8' to access the TPR instead >> of MMIO, which XP is clearly not doing. :( >> >> Peter: if you have the option, you might find that installing the PV >> drivers that ship with Citrix XenServer 6.0 makes things work better. >> >> Andres: even though this load of APIC emulations is pretty extreme, it's >> surprising that the VM runs faster on shadow pagetables! Any ideas for >> where this slowdown is coming from? > Not any immediate ideas without profiling. > > However, most callers of hvmemul_do_io pass a stub zero ram_gpa address. We might be madly hitting the p2m locks for no reason there. > > How about the following patch, Peter, Tim? Thanks, I'll give it a try sometime this week I guess. > diff -r 5171750d133e xen/arch/x86/hvm/emulate.c > --- a/xen/arch/x86/hvm/emulate.c > +++ b/xen/arch/x86/hvm/emulate.c > @@ -60,24 +60,28 @@ static int hvmemul_do_io( > ioreq_t *p = get_ioreq(curr); > unsigned long ram_gfn = paddr_to_pfn(ram_gpa); > p2m_type_t p2mt; > - struct page_info *ram_page; > + struct page_info *ram_page = NULL; > int rc; > > /* Check for paged out page */ > - ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); > - if ( p2m_is_paging(p2mt) ) > + if ( ram_gpa != INVALID_MFN ) > { > - if ( ram_page ) > - put_page(ram_page); > - p2m_mem_paging_populate(curr->domain, ram_gfn); > - return X86EMUL_RETRY; > - } > - if ( p2m_is_shared(p2mt) ) > - { > - if ( ram_page ) > - put_page(ram_page); > - return X86EMUL_RETRY; > - } > + ram_page = get_page_from_gfn(curr->domain, ram_gfn, &p2mt, P2M_UNSHARE); > + if ( p2m_is_paging(p2mt) ) > + { > + if ( ram_page ) > + put_page(ram_page); > + p2m_mem_paging_populate(curr->domain, ram_gfn); > + return X86EMUL_RETRY; > + } > + if ( p2m_is_shared(p2mt) ) > + { > + if ( ram_page ) > + put_page(ram_page); > + return X86EMUL_RETRY; > + } > + } else > + value = 0; /* for pvalue */ > > /* > * Weird-sized accesses have undefined behaviour: we discard writes > @@ -455,7 +459,7 @@ static int __hvmemul_read( > return X86EMUL_UNHANDLEABLE; > gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); > if ( (off + bytes) <= PAGE_SIZE ) > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_READ, 0, p_data); > } > > @@ -480,7 +484,8 @@ static int __hvmemul_read( > addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); > if ( rc != X86EMUL_OKAY ) > return rc; > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, IOREQ_READ, 0, p_data); > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > + IOREQ_READ, 0, p_data); > case HVMCOPY_gfn_paged_out: > return X86EMUL_RETRY; > case HVMCOPY_gfn_shared: > @@ -552,7 +557,7 @@ static int hvmemul_write( > unsigned int off = addr & (PAGE_SIZE - 1); > gpa = (((paddr_t)vio->mmio_gpfn << PAGE_SHIFT) | off); > if ( (off + bytes) <= PAGE_SIZE ) > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_WRITE, 0, p_data); > } > > @@ -573,7 +578,7 @@ static int hvmemul_write( > addr, &gpa, bytes, &reps, pfec, hvmemul_ctxt); > if ( rc != X86EMUL_OKAY ) > return rc; > - return hvmemul_do_mmio(gpa, &reps, bytes, 0, > + return hvmemul_do_mmio(gpa, &reps, bytes, INVALID_MFN, > IOREQ_WRITE, 0, p_data); > case HVMCOPY_gfn_paged_out: > return X86EMUL_RETRY; > @@ -804,7 +809,7 @@ static int hvmemul_read_io( > { > unsigned long reps = 1; > *val = 0; > - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_READ, 0, val); > + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_READ, 0, val); > } > > static int hvmemul_write_io( > @@ -814,7 +819,7 @@ static int hvmemul_write_io( > struct x86_emulate_ctxt *ctxt) > { > unsigned long reps = 1; > - return hvmemul_do_pio(port, &reps, bytes, 0, IOREQ_WRITE, 0, &val); > + return hvmemul_do_pio(port, &reps, bytes, INVALID_MFN, IOREQ_WRITE, 0, &val); > } > > static int hvmemul_read_cr( > diff -r 5171750d133e xen/arch/x86/hvm/io.c > --- a/xen/arch/x86/hvm/io.c > +++ b/xen/arch/x86/hvm/io.c > @@ -231,7 +231,7 @@ int handle_pio(uint16_t port, int size, > if ( dir == IOREQ_WRITE ) > data = guest_cpu_user_regs()->eax; > > - rc = hvmemul_do_pio(port, &reps, size, 0, dir, 0, &data); > + rc = hvmemul_do_pio(port, &reps, size, INVALID_MFN, dir, 0, &data); > > switch ( rc ) > { > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:22:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGRG-0008Mr-TH; Tue, 13 Nov 2012 13:22:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGRF-0008Mh-3Y for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:22:01 +0000 Received: from [85.158.139.211:54563] by server-11.bemta-5.messagelabs.com id 41/B6-03409-87942A05; Tue, 13 Nov 2012 13:22:00 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352812919!19944570!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5822 invoked from network); 13 Nov 2012 13:21:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:21:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15778884" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:21:58 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 13:21:58 +0000 MIME-Version: 1.0 X-Mercurial-Node: e1fbee58b25c4a1886e6bef1c9b1535ff81290d5 Message-ID: User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 13:21:38 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: tim@xen.org, eddie.dong@intel.com, JBeulich@suse.com, jun.nakajima@intel.com, Ian.Campbell@citrix.com Subject: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. The INT 2 call will perform an IRET which will unblock later calls to the NMI handler, according to Intel SDM Volume 3 Chapter 6.7.1. Signed-off-by: Malcolm Crossley Acked-by: Tim Deegan diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + asm("int $2"); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:22:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGRG-0008Mr-TH; Tue, 13 Nov 2012 13:22:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGRF-0008Mh-3Y for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:22:01 +0000 Received: from [85.158.139.211:54563] by server-11.bemta-5.messagelabs.com id 41/B6-03409-87942A05; Tue, 13 Nov 2012 13:22:00 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1352812919!19944570!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5822 invoked from network); 13 Nov 2012 13:21:59 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:21:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15778884" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:21:58 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 13:21:58 +0000 MIME-Version: 1.0 X-Mercurial-Node: e1fbee58b25c4a1886e6bef1c9b1535ff81290d5 Message-ID: User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 13:21:38 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: tim@xen.org, eddie.dong@intel.com, JBeulich@suse.com, jun.nakajima@intel.com, Ian.Campbell@citrix.com Subject: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. The INT 2 call will perform an IRET which will unblock later calls to the NMI handler, according to Intel SDM Volume 3 Chapter 6.7.1. Signed-off-by: Malcolm Crossley Acked-by: Tim Deegan diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ + asm("int $2"); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:27:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:27:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGWm-00006S-MR; Tue, 13 Nov 2012 13:27:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGWk-00006K-Od for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:27:43 +0000 Received: from [193.109.254.147:28467] by server-14.bemta-14.messagelabs.com id B7/6B-14517-ECA42A05; Tue, 13 Nov 2012 13:27:42 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-3.tower-27.messagelabs.com!1352813259!10779763!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13092 invoked from network); 13 Nov 2012 13:27:40 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 13:27:40 -0000 Received: from localhost (jajo.ipv6.eggsoft.pl [IPv6:2001:6a0:117::1]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id E9D245002; Tue, 13 Nov 2012 14:27:37 +0100 (CET) Date: Tue, 13 Nov 2012 14:27:35 +0100 From: Jacek Konieczny To: Ian Campbell Message-ID: <20121113132735.GD7561@jajo.eggsoft> Mail-Followup-To: Ian Campbell , Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352804909.7491.55.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVHVlLCBOb3YgMTMsIDIwMTIgYXQgMTE6MDg6MjlBTSArMDAwMCwgSWFuIENhbXBiZWxsIHdy b3RlOgo+IE9uIE1vbiwgMjAxMi0xMS0xMiBhdCAxODo0MCArMDAwMCwgT2xhZiBIZXJpbmcgd3Jv dGU6Cj4gPiBPbiBNb24sIE5vdiAxMiwgSmFjZWsgS29uaWVjem55IHdyb3RlOgo+ID4gCj4gPiA+ ICMgcGVybCAtLXZlcnNpb24KPiA+ID4gVGhpcyBpcyBwZXJsLCB2NS44LjggYnVpbHQgZm9yIHg4 Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpCj4gPiAKPiA+IHNsZXMxMXNwMiBoYXMgcGVybCA1 LjEwLjAsIG1heWJlIHRoZXJlIGlzIGRpZmZlcmVudCBiZWhhdmlvdXIgaW4KPiA+IGRpZmZlcmVu dCBwZXJsIHZlcnNpb25zLgo+IAo+IE1vcmUgbGlrZWx5IHRvIGJlIHRoZSBrZXJuZWwsIHNpbmNl IFBlcmwgd291bGQgaGF2ZSB0byBqdW1wIHRocm91Z2gKPiBob29wcyB0byBmaWd1cmUgb3V0IGlm IGEgcmFuZG9tIGZkIHdoaWNoIGl0IGdvdCBwYXNzZWQgd2FzIHIvbyBvciByL3csIEkKPiB0aGlu ay4KCkkgc3VzcGVjdGVkIG15IHBlcmwganVzdCBjaGVja3MgdGhlIGZpbGUgZGVzY3JpcHRvciB3 aGljaCBpcyB0byBiZQpvcGVuZWQgZm9yIHJlYWRpbmcsIGFuZCBpdCBzZWVtcyB0byBiZSB0aGUg Y2FzZS4KCuKApmhvd2V2ZXIsIGFmdGVyIGxvb2tpbmcgaW50byBQZXJsIHNvdXJjZSBjb2RlIGl0 IHNlZW1zIGl0IG1pZ2h0IGJlCmdsaWJjIGFuZCBpdHMgZmRvcGVuKCkgaW1wbGVtZW50YXRpb24s IGFzIFBlcmwgY2FsbHMgZmRvcGVuKCkgKHVubGVzcwonc2ZpbycgaXMgdXNlZCBpbnN0ZWFkIG9m ICdzdGRpbycpLgoKQW5kIGZyb20gdGhlIGZkb3BlbigzKSBtYW51YWw6Cgo+IFRoZSAgbW9kZSAg b2YgdGhlIHN0cmVhbSAob25lIG9mIHRoZSB2YWx1ZXMgInIiLCAicisiLCAidyIsICJ3KyIsCj4g ImEiLCAiYSsiKSBtdXN0IGJlIGNvbXBhdGlibGUgd2l0aCAgdGhlICBtb2RlIG9mIHRoZSBmaWxl ICBkZXNjcmlwdG9yLgoKIyBycG0gLXEgZ2xpYmMKZ2xpYmMtMi4xNS0xMC5hb3MxLng4Nl82NAoK PiBQZXJoYXBzIGl0cyBhIHNlY3VyaXR5IHRoaW5nIChlLmcuIHNlbGludXggb3Igc29tZXRoaW5n IGxpa2UgdGhhdCkKPiBlbmZvcmNpbmcgc29tZXRoaW5nIGV4dHJhPwoKTm90aGluZyBsaWtlIHRo YXQgaGVyZS4KCj4gCj4gTWlnaHQgYmUgaW50ZXJlc3RpbmcgdG8gcnVuIHRoaW5ncyB1bmRlciBz dHJhY2UgPyAKCkhlcmUgeW91IGFyZSwgKG5vdGljZSB0aGUgZmNudGwoMywgRl9HRVRGTCkgY2Fs bCBiZWZvcmUgdGhlIGVycm9yKToKCisgX2xvY2tmZD00MgorIF9sb2NrZmlsZT0vdG1wL2xvY2tm aWxlCisgZXZhbCAnZXhlYyA0Mj4+L3RtcC9sb2NrZmlsZScKKysgZXhlYworIGZsb2NrIC14IDQy CisrIHN0cmFjZSBwZXJsIC1lICcKICAgICAgICAgICAgb3BlbiBTVERJTiwgIjwmNDIiIG9yIGRp ZSAkITsKICAgICAgICAgICAgbXkgJGZkX2ludW0gPSAoc3RhdCBTVERJTilbMV07IGRpZSAkISB1 bmxlc3MgZGVmaW5lZCAkZmRfaW51bTsKICAgICAgICAgICAgbXkgJGZpbGVfaW51bSA9IChzdGF0 ICRBUkdWWzBdKVsxXTsKICAgICAgICAgICAgcHJpbnQgInlcbiIgaWYgJGZkX2ludW0gZXEgJGZp bGVfaW51bTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnIC90bXAvbG9ja2ZpbGUKZXhl Y3ZlKCIvdXNyL2Jpbi9wZXJsIiwgWyJwZXJsIiwgIi1lIiwgIlxuICAgICAgICAgICAgb3BlbiBT VERJTiwgXCI8JjQyXCIgIi4uLiwgIi90bXAvbG9ja2ZpbGUiXSwgWy8qIDI4IHZhcnMgKi9dKSA9 IDAKYnJrKDApICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMHgxYzAxMDAwCm1t YXAoTlVMTCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1BUF9BTk9O WU1PVVMsIC0xLCAwKSA9IDB4N2YyMTdhZTZjMDAwCmFjY2VzcygiL2V0Yy9sZC5zby5wcmVsb2Fk IiwgUl9PSykgICAgICA9IC0xIEVOT0VOVCAoTm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeSkKb3Bl bigiL3Vzci9saWI2NC9wZXJsNS81LjguOC94ODZfNjQtcGxkLWxpbnV4LXRocmVhZC1tdWx0aS9D T1JFL3Rscy94ODZfNjQvbGlicGVybC5zby41LjguMCIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAt MSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkpCnN0YXQoIi91c3IvbGliNjQvcGVy bDUvNS44LjgveDg2XzY0LXBsZC1saW51eC10aHJlYWQtbXVsdGkvQ09SRS90bHMveDg2XzY0Iiwg MHg3ZmZmNTI0MmQ4MjApID0gLTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpv cGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRp L0NPUkUvdGxzL2xpYnBlcmwuc28uNS44LjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5P RU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpzdGF0KCIvdXNyL2xpYjY0L3Blcmw1LzUu OC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvdGxzIiwgMHg3ZmZmNTI0MmQ4 MjApID0gLTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvdXNyL2xp YjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUveDg2XzY0 L2xpYnBlcmwuc28uNS44LjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5PRU5UIChObyBz dWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpzdGF0KCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82 NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUveDg2XzY0IiwgMHg3ZmZmNTI0MmQ4MjApID0g LTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvdXNyL2xpYjY0L3Bl cmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGlicGVybC5zby41 LjguMCIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAzCnJlYWQoMywgIlwxNzdFTEZcMlwxXDFcMFww XDBcMFwwXDBcMFwwXDBcM1wwPlwwXDFcMFwwXDBAWVwzXDBcMFwwXDBcMCIuLi4sIDgzMikgPSA4 MzIKZnN0YXQoMywge3N0X21vZGU9U19JRlJFR3wwNzU1LCBzdF9zaXplPTE0MjUwMzIsIC4uLn0p ID0gMAptbWFwKE5VTEwsIDM1Mjg3NjgsIFBST1RfUkVBRHxQUk9UX0VYRUMsIE1BUF9QUklWQVRF fE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIxN2E4ZWUwMDAKbXByb3RlY3QoMHg3ZjIxN2Fh NDAwMDAsIDIwOTMwNTYsIFBST1RfTk9ORSkgPSAwCm1tYXAoMHg3ZjIxN2FjM2YwMDAsIDQ1MDU2 LCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQX1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJ VEUsIDMsIDB4MTUxMDAwKSA9IDB4N2YyMTdhYzNmMDAwCm1tYXAoMHg3ZjIxN2FjNGEwMDAsIDYy MDgsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05Z TU9VUywgLTEsIDApID0gMHg3ZjIxN2FjNGEwMDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgID0gMApvcGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQt bGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGliZGwuc28uMiIsIE9fUkRPTkxZfE9fQ0xPRVhFQykg PSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkpCm9wZW4oIi9ldGMvbGQuc28u Y2FjaGUiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gMwpmc3RhdCgzLCB7c3RfbW9kZT1TX0lGUkVH fDA2NDQsIHN0X3NpemU9MjQxMDQsIC4uLn0pID0gMAptbWFwKE5VTEwsIDI0MTA0LCBQUk9UX1JF QUQsIE1BUF9QUklWQVRFLCAzLCAwKSA9IDB4N2YyMTdhZTY2MDAwCmNsb3NlKDMpICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA9IDAKb3BlbigiL2xpYjY0L2xpYmRsLnNvLjIiLCBPX1JE T05MWXxPX0NMT0VYRUMpID0gMwpyZWFkKDMsICJcMTc3RUxGXDJcMVwxXDBcMFwwXDBcMFwwXDBc MFwwXDNcMD5cMFwxXDBcMFwwXDIwXDE2XDBcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3Rh dCgzLCB7c3RfbW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTQ2NzIsIC4uLn0pID0gMAptbWFw KE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllN T1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2NTAwMAptbWFwKE5VTEwsIDIxMDk2ODgsIFBST1RfUkVB RHxQUk9UX0VYRUMsIE1BUF9QUklWQVRFfE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIxN2E2 ZWEwMDAKbXByb3RlY3QoMHg3ZjIxN2E2ZWMwMDAsIDIwOTcxNTIsIFBST1RfTk9ORSkgPSAwCm1t YXAoMHg3ZjIxN2E4ZWMwMDAsIDgxOTIsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFU RXxNQVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHgyMDAwKSA9IDB4N2YyMTdhOGVjMDAwCmNs b3NlKDMpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDAKb3BlbigiL3Vzci9saWI2 NC9wZXJsNS81LjguOC94ODZfNjQtcGxkLWxpbnV4LXRocmVhZC1tdWx0aS9DT1JFL2xpYm0uc28u NiIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJl Y3RvcnkpCm9wZW4oIi9saWI2NC9saWJtLnNvLjYiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gMwpy ZWFkKDMsICJcMTc3RUxGXDJcMVwxXDBcMFwwXDBcMFwwXDBcMFwwXDNcMD5cMFwxXDBcMFwwXDI2 MFVcMFwwXDBcMFwwXDAiLi4uLCA4MzIpID0gODMyCmZzdGF0KDMsIHtzdF9tb2RlPVNfSUZSRUd8 MDc1NSwgc3Rfc2l6ZT05OTc2NDAsIC4uLn0pID0gMAptbWFwKE5VTEwsIDMwOTI3NzYsIFBST1Rf UkVBRHxQUk9UX0VYRUMsIE1BUF9QUklWQVRFfE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIx N2EzZjYwMDAKbXByb3RlY3QoMHg3ZjIxN2E0ZTkwMDAsIDIwOTMwNTYsIFBST1RfTk9ORSkgPSAw Cm1tYXAoMHg3ZjIxN2E2ZTgwMDAsIDgxOTIsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJ VkFURXxNQVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHhmMjAwMCkgPSAweDdmMjE3YTZlODAw MApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCm9wZW4oIi91c3Iv bGliNjQvcGVybDUvNS44LjgveDg2XzY0LXBsZC1saW51eC10aHJlYWQtbXVsdGkvQ09SRS9saWJw dGhyZWFkLnNvLjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5PRU5UIChObyBzdWNoIGZp bGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvbGliNjQvbGlicHRocmVhZC5zby4wIiwgT19SRE9OTFl8 T19DTE9FWEVDKSA9IDMKcmVhZCgzLCAiXDE3N0VMRlwyXDFcMVwwXDBcMFwwXDBcMFwwXDBcMFwz XDA+XDBcMVwwXDBcMGBtXDBcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3RhdCgzLCB7c3Rf bW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTM1NDMzLCAuLi59KSA9IDAKbW1hcChOVUxMLCAy MjEyNzg0LCBQUk9UX1JFQUR8UFJPVF9FWEVDLCBNQVBfUFJJVkFURXxNQVBfREVOWVdSSVRFLCAz LCAwKSA9IDB4N2YyMTdhMWQ5MDAwCm1wcm90ZWN0KDB4N2YyMTdhMWYxMDAwLCAyMDkzMDU2LCBQ Uk9UX05PTkUpID0gMAptbWFwKDB4N2YyMTdhM2YwMDAwLCA4MTkyLCBQUk9UX1JFQUR8UFJPVF9X UklURSwgTUFQX1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJVEUsIDMsIDB4MTcwMDApID0g MHg3ZjIxN2EzZjAwMDAKbW1hcCgweDdmMjE3YTNmMjAwMCwgMTMyMzIsIFBST1RfUkVBRHxQUk9U X1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3 ZjIxN2EzZjIwMDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApv cGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRp L0NPUkUvbGliYy5zby42IiwgT19SRE9OTFl8T19DTE9FWEVDKSA9IC0xIEVOT0VOVCAoTm8gc3Vj aCBmaWxlIG9yIGRpcmVjdG9yeSkKb3BlbigiL2xpYjY0L2xpYmMuc28uNiIsIE9fUkRPTkxZfE9f Q0xPRVhFQykgPSAzCnJlYWQoMywgIlwxNzdFTEZcMlwxXDFcMFwwXDBcMFwwXDBcMFwwXDBcM1ww PlwwXDFcMFwwXDBcMzIwXDI1XDJcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3RhdCgzLCB7 c3RfbW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTcyODgxNiwgLi4ufSkgPSAwCm1tYXAoTlVM TCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1BUF9BTk9OWU1PVVMs IC0xLCAwKSA9IDB4N2YyMTdhZTY0MDAwCm1tYXAoTlVMTCwgMzg0MTEyMCwgUFJPVF9SRUFEfFBS T1RfRVhFQywgTUFQX1BSSVZBVEV8TUFQX0RFTllXUklURSwgMywgMCkgPSAweDdmMjE3OWUyZjAw MAptcHJvdGVjdCgweDdmMjE3OWZjZjAwMCwgMjA5NzE1MiwgUFJPVF9OT05FKSA9IDAKbW1hcCgw eDdmMjE3YTFjZjAwMCwgMjQ1NzYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxN QVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHgxYTAwMDApID0gMHg3ZjIxN2ExY2YwMDAKbW1h cCgweDdmMjE3YTFkNTAwMCwgMTU0NTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFU RXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxN2ExZDUwMDAKY2xvc2Uo MykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApvcGVuKCIvdXNyL2xpYjY0L3Bl cmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGliY3J5cHQuc28u MSIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJl Y3RvcnkpCm9wZW4oIi9saWI2NC9saWJjcnlwdC5zby4xIiwgT19SRE9OTFl8T19DTE9FWEVDKSA9 IDMKcmVhZCgzLCAiXDE3N0VMRlwyXDFcMVwwXDBcMFwwXDBcMFwwXDBcMFwzXDA+XDBcMVwwXDBc MFwyNjBcblwwXDBcMFwwXDBcMCIuLi4sIDgzMikgPSA4MzIKZnN0YXQoMywge3N0X21vZGU9U19J RlJFR3wwNzU1LCBzdF9zaXplPTQ3MjgwLCAuLi59KSA9IDAKbW1hcChOVUxMLCAyMzMxMDcyLCBQ Uk9UX1JFQUR8UFJPVF9FWEVDLCBNQVBfUFJJVkFURXxNQVBfREVOWVdSSVRFLCAzLCAwKSA9IDB4 N2YyMTc5YmY1MDAwCm1wcm90ZWN0KDB4N2YyMTc5YzAwMDAwLCAyMDkzMDU2LCBQUk9UX05PTkUp ID0gMAptbWFwKDB4N2YyMTc5ZGZmMDAwLCA4MTkyLCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQ X1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJVEUsIDMsIDB4YTAwMCkgPSAweDdmMjE3OWRm ZjAwMAptbWFwKDB4N2YyMTc5ZTAxMDAwLCAxODQ3NjgsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBN QVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxNzllMDEw MDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMAptbWFwKE5VTEws IDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllNT1VTLCAt MSwgMCkgPSAweDdmMjE3YWU2MzAwMAptbWFwKE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dS SVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllNT1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2MjAwMApt bWFwKE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5P TllNT1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2MTAwMAphcmNoX3ByY3RsKEFSQ0hfU0VUX0ZTLCAw eDdmMjE3YWU2MjcwMCkgPSAwCm1wcm90ZWN0KDB4N2YyMTdhMWNmMDAwLCAxNjM4NCwgUFJPVF9S RUFEKSA9IDAKbXByb3RlY3QoMHg3ZjIxNzlkZmYwMDAsIDQwOTYsIFBST1RfUkVBRCkgPSAwCm1w cm90ZWN0KDB4N2YyMTdhM2YwMDAwLCA0MDk2LCBQUk9UX1JFQUQpID0gMAptcHJvdGVjdCgweDdm MjE3YTZlODAwMCwgNDA5NiwgUFJPVF9SRUFEKSA9IDAKbXByb3RlY3QoMHg3ZjIxN2E4ZWMwMDAs IDQwOTYsIFBST1RfUkVBRCkgPSAwCm1wcm90ZWN0KDB4N2YyMTdhYzNmMDAwLCAxMjI4OCwgUFJP VF9SRUFEKSA9IDAKbXByb3RlY3QoMHg2MDMwMDAsIDQwOTYsIFBST1RfUkVBRCkgICAgID0gMApt cHJvdGVjdCgweDdmMjE3YWU2ZDAwMCwgNDA5NiwgUFJPVF9SRUFEKSA9IDAKbXVubWFwKDB4N2Yy MTdhZTY2MDAwLCAyNDEwNCkgICAgICAgICAgID0gMApzZXRfdGlkX2FkZHJlc3MoMHg3ZjIxN2Fl NjI5ZDApICAgICAgICAgPSAzMDkwMwpzZXRfcm9idXN0X2xpc3QoMHg3ZjIxN2FlNjI5ZTAsIDB4 MTgpICAgPSAwCmZ1dGV4KDB4N2ZmZjUyNDJlMDdjLCBGVVRFWF9XQUtFX1BSSVZBVEUsIDEpID0g MApmdXRleCgweDdmZmY1MjQyZTA3YywgRlVURVhfV0FJVF9CSVRTRVRfUFJJVkFURXxGVVRFWF9D TE9DS19SRUFMVElNRSwgMSwgTlVMTCwgN2YyMTdhZTYyNzAwKSA9IC0xIEVBR0FJTiAoUmVzb3Vy Y2UgdGVtcG9yYXJpbHkgdW5hdmFpbGFibGUpCnJ0X3NpZ2FjdGlvbihTSUdSVE1JTiwgezB4N2Yy MTdhMWRmN2MwLCBbXSwgU0FfUkVTVE9SRVJ8U0FfU0lHSU5GTywgMHg3ZjIxN2ExZThkZTB9LCBO VUxMLCA4KSA9IDAKcnRfc2lnYWN0aW9uKFNJR1JUXzEsIHsweDdmMjE3YTFkZjg1MCwgW10sIFNB X1JFU1RPUkVSfFNBX1JFU1RBUlR8U0FfU0lHSU5GTywgMHg3ZjIxN2ExZThkZTB9LCBOVUxMLCA4 KSA9IDAKcnRfc2lncHJvY21hc2soU0lHX1VOQkxPQ0ssIFtSVE1JTiBSVF8xXSwgTlVMTCwgOCkg PSAwCmdldHJsaW1pdChSTElNSVRfU1RBQ0ssIHtybGltX2N1cj04MTkyKjEwMjQsIHJsaW1fbWF4 PVJMSU1fSU5GSU5JVFl9KSA9IDAKcnRfc2lnYWN0aW9uKFNJR0ZQRSwge1NJR19JR04sIFtGUEVd LCBTQV9SRVNUT1JFUnxTQV9SRVNUQVJULCAweDdmMjE3OWU2M2QwMH0sIHtTSUdfREZMLCBbXSwg MH0sIDgpID0gMApicmsoMCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFj MDEwMDAKYnJrKDB4MWMyMzAwMCkgICAgICAgICAgICAgICAgICAgICAgICAgID0gMHgxYzIzMDAw CmdldHVpZCgpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDAKZ2V0ZXVpZCgpICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApnZXRnaWQoKSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPSAwCmdldGVnaWQoKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA9IDAKb3BlbigiL3Vzci9saWI2NC9sb2NhbGUvbG9jYWxlLWFyY2hpdmUiLCBPX1JET05MWXxP X0NMT0VYRUMpID0gMwpmc3RhdCgzLCB7c3RfbW9kZT1TX0lGUkVHfDA2NDQsIHN0X3NpemU9MjIy MzcxMiwgLi4ufSkgPSAwCm1tYXAoTlVMTCwgMjIyMzcxMiwgUFJPVF9SRUFELCBNQVBfUFJJVkFU RSwgMywgMCkgPSAweDdmMjE3OTlkNjAwMApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPSAwCm1tYXAoTlVMTCwgMTM1MTY4LCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQ X1BSSVZBVEV8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxN2FlNDAwMDAKb3BlbigiL2Rl di91cmFuZG9tIiwgT19SRE9OTFkpICAgICAgICAgID0gMwpyZWFkKDMsICJebmJjIiwgNCkgICAg ICAgICAgICAgICAgICAgICAgPSA0CmNsb3NlKDMpICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA9IDAKb3BlbigiL2Rldi9udWxsIiwgT19SRE9OTFkpICAgICAgICAgICAgID0gMwpmY250 bCgzLCBGX1NFVEZELCBGRF9DTE9FWEVDKSAgICAgICAgICAgPSAwCmZzdGF0KDMsIHtzdF9tb2Rl PVNfSUZDSFJ8MDY2Niwgc3RfcmRldj1tYWtlZGV2KDEsIDMpLCAuLi59KSA9IDAKcnRfc2lnYWN0 aW9uKFNJR0NITEQsIE5VTEwsIHtTSUdfREZMLCBbXSwgMH0sIDgpID0gMApyZWFkbGluaygiL3By b2Mvc2VsZi9leGUiLCAiL3Vzci9iaW4vcGVybDUuOC44IiwgNDA5NSkgPSAxOApicmsoMHgxYzQ0 MDAwKSAgICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFjNDQwMDAKZ2V0cHBpZCgpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gMzA5MDIKZnN0YXQoMywge3N0X21vZGU9U19JRkNI UnwwNjY2LCBzdF9yZGV2PW1ha2VkZXYoMSwgMyksIC4uLn0pID0gMAppb2N0bCgzLCBTTkRDVExf VE1SX1RJTUVCQVNFIG9yIFNORFJWX1RJTUVSX0lPQ1RMX05FWFRfREVWSUNFIG9yIFRDR0VUUywg MHg3ZmZmNTI0MmQ2MTgpID0gLTEgRU5PVFRZIChJbmFwcHJvcHJpYXRlIGlvY3RsIGZvciBkZXZp Y2UpCm1tYXAoTlVMTCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1B UF9BTk9OWU1PVVMsIC0xLCAwKSA9IDB4N2YyMTdhZTZiMDAwCmxzZWVrKDMsIDAsIFNFRUtfQ1VS KSAgICAgICAgICAgICAgICAgICA9IDAKbHNlZWsoMywgMCwgU0VFS19TRVQpICAgICAgICAgICAg ICAgICAgID0gMApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCm11 bm1hcCgweDdmMjE3YWU2YjAwMCwgNDA5NikgICAgICAgICAgICA9IDAKZHVwKDQyKSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gMwpmY250bCgzLCBGX0dFVEZMKSAgICAgICAgICAg ICAgICAgICAgICAgPSAweDg0MDEgKGZsYWdzIE9fV1JPTkxZfE9fQVBQRU5EfE9fTEFSR0VGSUxF KQpjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCndyaXRlKDIsICJJ bnZhbGlkIGFyZ3VtZW50IGF0IC1lIGxpbmUgMi5cbiIsIDMxSW52YWxpZCBhcmd1bWVudCBhdCAt ZSBsaW5lIDIuCikgPSAzMQpleGl0X2dyb3VwKDIyKSAgICAgICAgICAgICAgICAgICAgICAgICAg PSA/CisgcmlnaHRmaWxlPQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 13:27:59 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:27:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGWm-00006S-MR; Tue, 13 Nov 2012 13:27:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGWk-00006K-Od for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:27:43 +0000 Received: from [193.109.254.147:28467] by server-14.bemta-14.messagelabs.com id B7/6B-14517-ECA42A05; Tue, 13 Nov 2012 13:27:42 +0000 X-Env-Sender: jajcus@jajcus.net X-Msg-Ref: server-3.tower-27.messagelabs.com!1352813259!10779763!1 X-Originating-IP: [84.205.176.49] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13092 invoked from network); 13 Nov 2012 13:27:40 -0000 Received: from tropek.jajcus.net (HELO tropek.jajcus.net) (84.205.176.49) by server-3.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 13:27:40 -0000 Received: from localhost (jajo.ipv6.eggsoft.pl [IPv6:2001:6a0:117::1]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by tropek.jajcus.net (Postfix) with ESMTPSA id E9D245002; Tue, 13 Nov 2012 14:27:37 +0100 (CET) Date: Tue, 13 Nov 2012 14:27:35 +0100 From: Jacek Konieczny To: Ian Campbell Message-ID: <20121113132735.GD7561@jajo.eggsoft> Mail-Followup-To: Ian Campbell , Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352804909.7491.55.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Jackson Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org T24gVHVlLCBOb3YgMTMsIDIwMTIgYXQgMTE6MDg6MjlBTSArMDAwMCwgSWFuIENhbXBiZWxsIHdy b3RlOgo+IE9uIE1vbiwgMjAxMi0xMS0xMiBhdCAxODo0MCArMDAwMCwgT2xhZiBIZXJpbmcgd3Jv dGU6Cj4gPiBPbiBNb24sIE5vdiAxMiwgSmFjZWsgS29uaWVjem55IHdyb3RlOgo+ID4gCj4gPiA+ ICMgcGVybCAtLXZlcnNpb24KPiA+ID4gVGhpcyBpcyBwZXJsLCB2NS44LjggYnVpbHQgZm9yIHg4 Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpCj4gPiAKPiA+IHNsZXMxMXNwMiBoYXMgcGVybCA1 LjEwLjAsIG1heWJlIHRoZXJlIGlzIGRpZmZlcmVudCBiZWhhdmlvdXIgaW4KPiA+IGRpZmZlcmVu dCBwZXJsIHZlcnNpb25zLgo+IAo+IE1vcmUgbGlrZWx5IHRvIGJlIHRoZSBrZXJuZWwsIHNpbmNl IFBlcmwgd291bGQgaGF2ZSB0byBqdW1wIHRocm91Z2gKPiBob29wcyB0byBmaWd1cmUgb3V0IGlm IGEgcmFuZG9tIGZkIHdoaWNoIGl0IGdvdCBwYXNzZWQgd2FzIHIvbyBvciByL3csIEkKPiB0aGlu ay4KCkkgc3VzcGVjdGVkIG15IHBlcmwganVzdCBjaGVja3MgdGhlIGZpbGUgZGVzY3JpcHRvciB3 aGljaCBpcyB0byBiZQpvcGVuZWQgZm9yIHJlYWRpbmcsIGFuZCBpdCBzZWVtcyB0byBiZSB0aGUg Y2FzZS4KCuKApmhvd2V2ZXIsIGFmdGVyIGxvb2tpbmcgaW50byBQZXJsIHNvdXJjZSBjb2RlIGl0 IHNlZW1zIGl0IG1pZ2h0IGJlCmdsaWJjIGFuZCBpdHMgZmRvcGVuKCkgaW1wbGVtZW50YXRpb24s IGFzIFBlcmwgY2FsbHMgZmRvcGVuKCkgKHVubGVzcwonc2ZpbycgaXMgdXNlZCBpbnN0ZWFkIG9m ICdzdGRpbycpLgoKQW5kIGZyb20gdGhlIGZkb3BlbigzKSBtYW51YWw6Cgo+IFRoZSAgbW9kZSAg b2YgdGhlIHN0cmVhbSAob25lIG9mIHRoZSB2YWx1ZXMgInIiLCAicisiLCAidyIsICJ3KyIsCj4g ImEiLCAiYSsiKSBtdXN0IGJlIGNvbXBhdGlibGUgd2l0aCAgdGhlICBtb2RlIG9mIHRoZSBmaWxl ICBkZXNjcmlwdG9yLgoKIyBycG0gLXEgZ2xpYmMKZ2xpYmMtMi4xNS0xMC5hb3MxLng4Nl82NAoK PiBQZXJoYXBzIGl0cyBhIHNlY3VyaXR5IHRoaW5nIChlLmcuIHNlbGludXggb3Igc29tZXRoaW5n IGxpa2UgdGhhdCkKPiBlbmZvcmNpbmcgc29tZXRoaW5nIGV4dHJhPwoKTm90aGluZyBsaWtlIHRo YXQgaGVyZS4KCj4gCj4gTWlnaHQgYmUgaW50ZXJlc3RpbmcgdG8gcnVuIHRoaW5ncyB1bmRlciBz dHJhY2UgPyAKCkhlcmUgeW91IGFyZSwgKG5vdGljZSB0aGUgZmNudGwoMywgRl9HRVRGTCkgY2Fs bCBiZWZvcmUgdGhlIGVycm9yKToKCisgX2xvY2tmZD00MgorIF9sb2NrZmlsZT0vdG1wL2xvY2tm aWxlCisgZXZhbCAnZXhlYyA0Mj4+L3RtcC9sb2NrZmlsZScKKysgZXhlYworIGZsb2NrIC14IDQy CisrIHN0cmFjZSBwZXJsIC1lICcKICAgICAgICAgICAgb3BlbiBTVERJTiwgIjwmNDIiIG9yIGRp ZSAkITsKICAgICAgICAgICAgbXkgJGZkX2ludW0gPSAoc3RhdCBTVERJTilbMV07IGRpZSAkISB1 bmxlc3MgZGVmaW5lZCAkZmRfaW51bTsKICAgICAgICAgICAgbXkgJGZpbGVfaW51bSA9IChzdGF0 ICRBUkdWWzBdKVsxXTsKICAgICAgICAgICAgcHJpbnQgInlcbiIgaWYgJGZkX2ludW0gZXEgJGZp bGVfaW51bTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnIC90bXAvbG9ja2ZpbGUKZXhl Y3ZlKCIvdXNyL2Jpbi9wZXJsIiwgWyJwZXJsIiwgIi1lIiwgIlxuICAgICAgICAgICAgb3BlbiBT VERJTiwgXCI8JjQyXCIgIi4uLiwgIi90bXAvbG9ja2ZpbGUiXSwgWy8qIDI4IHZhcnMgKi9dKSA9 IDAKYnJrKDApICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMHgxYzAxMDAwCm1t YXAoTlVMTCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1BUF9BTk9O WU1PVVMsIC0xLCAwKSA9IDB4N2YyMTdhZTZjMDAwCmFjY2VzcygiL2V0Yy9sZC5zby5wcmVsb2Fk IiwgUl9PSykgICAgICA9IC0xIEVOT0VOVCAoTm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeSkKb3Bl bigiL3Vzci9saWI2NC9wZXJsNS81LjguOC94ODZfNjQtcGxkLWxpbnV4LXRocmVhZC1tdWx0aS9D T1JFL3Rscy94ODZfNjQvbGlicGVybC5zby41LjguMCIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAt MSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkpCnN0YXQoIi91c3IvbGliNjQvcGVy bDUvNS44LjgveDg2XzY0LXBsZC1saW51eC10aHJlYWQtbXVsdGkvQ09SRS90bHMveDg2XzY0Iiwg MHg3ZmZmNTI0MmQ4MjApID0gLTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpv cGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRp L0NPUkUvdGxzL2xpYnBlcmwuc28uNS44LjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5P RU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpzdGF0KCIvdXNyL2xpYjY0L3Blcmw1LzUu OC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvdGxzIiwgMHg3ZmZmNTI0MmQ4 MjApID0gLTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvdXNyL2xp YjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUveDg2XzY0 L2xpYnBlcmwuc28uNS44LjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5PRU5UIChObyBz dWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpzdGF0KCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82 NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUveDg2XzY0IiwgMHg3ZmZmNTI0MmQ4MjApID0g LTEgRU5PRU5UIChObyBzdWNoIGZpbGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvdXNyL2xpYjY0L3Bl cmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGlicGVybC5zby41 LjguMCIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAzCnJlYWQoMywgIlwxNzdFTEZcMlwxXDFcMFww XDBcMFwwXDBcMFwwXDBcM1wwPlwwXDFcMFwwXDBAWVwzXDBcMFwwXDBcMCIuLi4sIDgzMikgPSA4 MzIKZnN0YXQoMywge3N0X21vZGU9U19JRlJFR3wwNzU1LCBzdF9zaXplPTE0MjUwMzIsIC4uLn0p ID0gMAptbWFwKE5VTEwsIDM1Mjg3NjgsIFBST1RfUkVBRHxQUk9UX0VYRUMsIE1BUF9QUklWQVRF fE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIxN2E4ZWUwMDAKbXByb3RlY3QoMHg3ZjIxN2Fh NDAwMDAsIDIwOTMwNTYsIFBST1RfTk9ORSkgPSAwCm1tYXAoMHg3ZjIxN2FjM2YwMDAsIDQ1MDU2 LCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQX1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJ VEUsIDMsIDB4MTUxMDAwKSA9IDB4N2YyMTdhYzNmMDAwCm1tYXAoMHg3ZjIxN2FjNGEwMDAsIDYy MDgsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05Z TU9VUywgLTEsIDApID0gMHg3ZjIxN2FjNGEwMDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgID0gMApvcGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQt bGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGliZGwuc28uMiIsIE9fUkRPTkxZfE9fQ0xPRVhFQykg PSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnkpCm9wZW4oIi9ldGMvbGQuc28u Y2FjaGUiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gMwpmc3RhdCgzLCB7c3RfbW9kZT1TX0lGUkVH fDA2NDQsIHN0X3NpemU9MjQxMDQsIC4uLn0pID0gMAptbWFwKE5VTEwsIDI0MTA0LCBQUk9UX1JF QUQsIE1BUF9QUklWQVRFLCAzLCAwKSA9IDB4N2YyMTdhZTY2MDAwCmNsb3NlKDMpICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA9IDAKb3BlbigiL2xpYjY0L2xpYmRsLnNvLjIiLCBPX1JE T05MWXxPX0NMT0VYRUMpID0gMwpyZWFkKDMsICJcMTc3RUxGXDJcMVwxXDBcMFwwXDBcMFwwXDBc MFwwXDNcMD5cMFwxXDBcMFwwXDIwXDE2XDBcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3Rh dCgzLCB7c3RfbW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTQ2NzIsIC4uLn0pID0gMAptbWFw KE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllN T1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2NTAwMAptbWFwKE5VTEwsIDIxMDk2ODgsIFBST1RfUkVB RHxQUk9UX0VYRUMsIE1BUF9QUklWQVRFfE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIxN2E2 ZWEwMDAKbXByb3RlY3QoMHg3ZjIxN2E2ZWMwMDAsIDIwOTcxNTIsIFBST1RfTk9ORSkgPSAwCm1t YXAoMHg3ZjIxN2E4ZWMwMDAsIDgxOTIsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFU RXxNQVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHgyMDAwKSA9IDB4N2YyMTdhOGVjMDAwCmNs b3NlKDMpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDAKb3BlbigiL3Vzci9saWI2 NC9wZXJsNS81LjguOC94ODZfNjQtcGxkLWxpbnV4LXRocmVhZC1tdWx0aS9DT1JFL2xpYm0uc28u NiIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJl Y3RvcnkpCm9wZW4oIi9saWI2NC9saWJtLnNvLjYiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gMwpy ZWFkKDMsICJcMTc3RUxGXDJcMVwxXDBcMFwwXDBcMFwwXDBcMFwwXDNcMD5cMFwxXDBcMFwwXDI2 MFVcMFwwXDBcMFwwXDAiLi4uLCA4MzIpID0gODMyCmZzdGF0KDMsIHtzdF9tb2RlPVNfSUZSRUd8 MDc1NSwgc3Rfc2l6ZT05OTc2NDAsIC4uLn0pID0gMAptbWFwKE5VTEwsIDMwOTI3NzYsIFBST1Rf UkVBRHxQUk9UX0VYRUMsIE1BUF9QUklWQVRFfE1BUF9ERU5ZV1JJVEUsIDMsIDApID0gMHg3ZjIx N2EzZjYwMDAKbXByb3RlY3QoMHg3ZjIxN2E0ZTkwMDAsIDIwOTMwNTYsIFBST1RfTk9ORSkgPSAw Cm1tYXAoMHg3ZjIxN2E2ZTgwMDAsIDgxOTIsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJ VkFURXxNQVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHhmMjAwMCkgPSAweDdmMjE3YTZlODAw MApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCm9wZW4oIi91c3Iv bGliNjQvcGVybDUvNS44LjgveDg2XzY0LXBsZC1saW51eC10aHJlYWQtbXVsdGkvQ09SRS9saWJw dGhyZWFkLnNvLjAiLCBPX1JET05MWXxPX0NMT0VYRUMpID0gLTEgRU5PRU5UIChObyBzdWNoIGZp bGUgb3IgZGlyZWN0b3J5KQpvcGVuKCIvbGliNjQvbGlicHRocmVhZC5zby4wIiwgT19SRE9OTFl8 T19DTE9FWEVDKSA9IDMKcmVhZCgzLCAiXDE3N0VMRlwyXDFcMVwwXDBcMFwwXDBcMFwwXDBcMFwz XDA+XDBcMVwwXDBcMGBtXDBcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3RhdCgzLCB7c3Rf bW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTM1NDMzLCAuLi59KSA9IDAKbW1hcChOVUxMLCAy MjEyNzg0LCBQUk9UX1JFQUR8UFJPVF9FWEVDLCBNQVBfUFJJVkFURXxNQVBfREVOWVdSSVRFLCAz LCAwKSA9IDB4N2YyMTdhMWQ5MDAwCm1wcm90ZWN0KDB4N2YyMTdhMWYxMDAwLCAyMDkzMDU2LCBQ Uk9UX05PTkUpID0gMAptbWFwKDB4N2YyMTdhM2YwMDAwLCA4MTkyLCBQUk9UX1JFQUR8UFJPVF9X UklURSwgTUFQX1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJVEUsIDMsIDB4MTcwMDApID0g MHg3ZjIxN2EzZjAwMDAKbW1hcCgweDdmMjE3YTNmMjAwMCwgMTMyMzIsIFBST1RfUkVBRHxQUk9U X1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3 ZjIxN2EzZjIwMDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApv cGVuKCIvdXNyL2xpYjY0L3Blcmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRp L0NPUkUvbGliYy5zby42IiwgT19SRE9OTFl8T19DTE9FWEVDKSA9IC0xIEVOT0VOVCAoTm8gc3Vj aCBmaWxlIG9yIGRpcmVjdG9yeSkKb3BlbigiL2xpYjY0L2xpYmMuc28uNiIsIE9fUkRPTkxZfE9f Q0xPRVhFQykgPSAzCnJlYWQoMywgIlwxNzdFTEZcMlwxXDFcMFwwXDBcMFwwXDBcMFwwXDBcM1ww PlwwXDFcMFwwXDBcMzIwXDI1XDJcMFwwXDBcMFwwIi4uLiwgODMyKSA9IDgzMgpmc3RhdCgzLCB7 c3RfbW9kZT1TX0lGUkVHfDA3NTUsIHN0X3NpemU9MTcyODgxNiwgLi4ufSkgPSAwCm1tYXAoTlVM TCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1BUF9BTk9OWU1PVVMs IC0xLCAwKSA9IDB4N2YyMTdhZTY0MDAwCm1tYXAoTlVMTCwgMzg0MTEyMCwgUFJPVF9SRUFEfFBS T1RfRVhFQywgTUFQX1BSSVZBVEV8TUFQX0RFTllXUklURSwgMywgMCkgPSAweDdmMjE3OWUyZjAw MAptcHJvdGVjdCgweDdmMjE3OWZjZjAwMCwgMjA5NzE1MiwgUFJPVF9OT05FKSA9IDAKbW1hcCgw eDdmMjE3YTFjZjAwMCwgMjQ1NzYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxN QVBfRklYRUR8TUFQX0RFTllXUklURSwgMywgMHgxYTAwMDApID0gMHg3ZjIxN2ExY2YwMDAKbW1h cCgweDdmMjE3YTFkNTAwMCwgMTU0NTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFU RXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxN2ExZDUwMDAKY2xvc2Uo MykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApvcGVuKCIvdXNyL2xpYjY0L3Bl cmw1LzUuOC44L3g4Nl82NC1wbGQtbGludXgtdGhyZWFkLW11bHRpL0NPUkUvbGliY3J5cHQuc28u MSIsIE9fUkRPTkxZfE9fQ0xPRVhFQykgPSAtMSBFTk9FTlQgKE5vIHN1Y2ggZmlsZSBvciBkaXJl Y3RvcnkpCm9wZW4oIi9saWI2NC9saWJjcnlwdC5zby4xIiwgT19SRE9OTFl8T19DTE9FWEVDKSA9 IDMKcmVhZCgzLCAiXDE3N0VMRlwyXDFcMVwwXDBcMFwwXDBcMFwwXDBcMFwzXDA+XDBcMVwwXDBc MFwyNjBcblwwXDBcMFwwXDBcMCIuLi4sIDgzMikgPSA4MzIKZnN0YXQoMywge3N0X21vZGU9U19J RlJFR3wwNzU1LCBzdF9zaXplPTQ3MjgwLCAuLi59KSA9IDAKbW1hcChOVUxMLCAyMzMxMDcyLCBQ Uk9UX1JFQUR8UFJPVF9FWEVDLCBNQVBfUFJJVkFURXxNQVBfREVOWVdSSVRFLCAzLCAwKSA9IDB4 N2YyMTc5YmY1MDAwCm1wcm90ZWN0KDB4N2YyMTc5YzAwMDAwLCAyMDkzMDU2LCBQUk9UX05PTkUp ID0gMAptbWFwKDB4N2YyMTc5ZGZmMDAwLCA4MTkyLCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQ X1BSSVZBVEV8TUFQX0ZJWEVEfE1BUF9ERU5ZV1JJVEUsIDMsIDB4YTAwMCkgPSAweDdmMjE3OWRm ZjAwMAptbWFwKDB4N2YyMTc5ZTAxMDAwLCAxODQ3NjgsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBN QVBfUFJJVkFURXxNQVBfRklYRUR8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxNzllMDEw MDAKY2xvc2UoMykgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMAptbWFwKE5VTEws IDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllNT1VTLCAt MSwgMCkgPSAweDdmMjE3YWU2MzAwMAptbWFwKE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dS SVRFLCBNQVBfUFJJVkFURXxNQVBfQU5PTllNT1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2MjAwMApt bWFwKE5VTEwsIDQwOTYsIFBST1RfUkVBRHxQUk9UX1dSSVRFLCBNQVBfUFJJVkFURXxNQVBfQU5P TllNT1VTLCAtMSwgMCkgPSAweDdmMjE3YWU2MTAwMAphcmNoX3ByY3RsKEFSQ0hfU0VUX0ZTLCAw eDdmMjE3YWU2MjcwMCkgPSAwCm1wcm90ZWN0KDB4N2YyMTdhMWNmMDAwLCAxNjM4NCwgUFJPVF9S RUFEKSA9IDAKbXByb3RlY3QoMHg3ZjIxNzlkZmYwMDAsIDQwOTYsIFBST1RfUkVBRCkgPSAwCm1w cm90ZWN0KDB4N2YyMTdhM2YwMDAwLCA0MDk2LCBQUk9UX1JFQUQpID0gMAptcHJvdGVjdCgweDdm MjE3YTZlODAwMCwgNDA5NiwgUFJPVF9SRUFEKSA9IDAKbXByb3RlY3QoMHg3ZjIxN2E4ZWMwMDAs IDQwOTYsIFBST1RfUkVBRCkgPSAwCm1wcm90ZWN0KDB4N2YyMTdhYzNmMDAwLCAxMjI4OCwgUFJP VF9SRUFEKSA9IDAKbXByb3RlY3QoMHg2MDMwMDAsIDQwOTYsIFBST1RfUkVBRCkgICAgID0gMApt cHJvdGVjdCgweDdmMjE3YWU2ZDAwMCwgNDA5NiwgUFJPVF9SRUFEKSA9IDAKbXVubWFwKDB4N2Yy MTdhZTY2MDAwLCAyNDEwNCkgICAgICAgICAgID0gMApzZXRfdGlkX2FkZHJlc3MoMHg3ZjIxN2Fl NjI5ZDApICAgICAgICAgPSAzMDkwMwpzZXRfcm9idXN0X2xpc3QoMHg3ZjIxN2FlNjI5ZTAsIDB4 MTgpICAgPSAwCmZ1dGV4KDB4N2ZmZjUyNDJlMDdjLCBGVVRFWF9XQUtFX1BSSVZBVEUsIDEpID0g MApmdXRleCgweDdmZmY1MjQyZTA3YywgRlVURVhfV0FJVF9CSVRTRVRfUFJJVkFURXxGVVRFWF9D TE9DS19SRUFMVElNRSwgMSwgTlVMTCwgN2YyMTdhZTYyNzAwKSA9IC0xIEVBR0FJTiAoUmVzb3Vy Y2UgdGVtcG9yYXJpbHkgdW5hdmFpbGFibGUpCnJ0X3NpZ2FjdGlvbihTSUdSVE1JTiwgezB4N2Yy MTdhMWRmN2MwLCBbXSwgU0FfUkVTVE9SRVJ8U0FfU0lHSU5GTywgMHg3ZjIxN2ExZThkZTB9LCBO VUxMLCA4KSA9IDAKcnRfc2lnYWN0aW9uKFNJR1JUXzEsIHsweDdmMjE3YTFkZjg1MCwgW10sIFNB X1JFU1RPUkVSfFNBX1JFU1RBUlR8U0FfU0lHSU5GTywgMHg3ZjIxN2ExZThkZTB9LCBOVUxMLCA4 KSA9IDAKcnRfc2lncHJvY21hc2soU0lHX1VOQkxPQ0ssIFtSVE1JTiBSVF8xXSwgTlVMTCwgOCkg PSAwCmdldHJsaW1pdChSTElNSVRfU1RBQ0ssIHtybGltX2N1cj04MTkyKjEwMjQsIHJsaW1fbWF4 PVJMSU1fSU5GSU5JVFl9KSA9IDAKcnRfc2lnYWN0aW9uKFNJR0ZQRSwge1NJR19JR04sIFtGUEVd LCBTQV9SRVNUT1JFUnxTQV9SRVNUQVJULCAweDdmMjE3OWU2M2QwMH0sIHtTSUdfREZMLCBbXSwg MH0sIDgpID0gMApicmsoMCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFj MDEwMDAKYnJrKDB4MWMyMzAwMCkgICAgICAgICAgICAgICAgICAgICAgICAgID0gMHgxYzIzMDAw CmdldHVpZCgpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IDAKZ2V0ZXVpZCgpICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gMApnZXRnaWQoKSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPSAwCmdldGVnaWQoKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA9IDAKb3BlbigiL3Vzci9saWI2NC9sb2NhbGUvbG9jYWxlLWFyY2hpdmUiLCBPX1JET05MWXxP X0NMT0VYRUMpID0gMwpmc3RhdCgzLCB7c3RfbW9kZT1TX0lGUkVHfDA2NDQsIHN0X3NpemU9MjIy MzcxMiwgLi4ufSkgPSAwCm1tYXAoTlVMTCwgMjIyMzcxMiwgUFJPVF9SRUFELCBNQVBfUFJJVkFU RSwgMywgMCkgPSAweDdmMjE3OTlkNjAwMApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPSAwCm1tYXAoTlVMTCwgMTM1MTY4LCBQUk9UX1JFQUR8UFJPVF9XUklURSwgTUFQ X1BSSVZBVEV8TUFQX0FOT05ZTU9VUywgLTEsIDApID0gMHg3ZjIxN2FlNDAwMDAKb3BlbigiL2Rl di91cmFuZG9tIiwgT19SRE9OTFkpICAgICAgICAgID0gMwpyZWFkKDMsICJebmJjIiwgNCkgICAg ICAgICAgICAgICAgICAgICAgPSA0CmNsb3NlKDMpICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA9IDAKb3BlbigiL2Rldi9udWxsIiwgT19SRE9OTFkpICAgICAgICAgICAgID0gMwpmY250 bCgzLCBGX1NFVEZELCBGRF9DTE9FWEVDKSAgICAgICAgICAgPSAwCmZzdGF0KDMsIHtzdF9tb2Rl PVNfSUZDSFJ8MDY2Niwgc3RfcmRldj1tYWtlZGV2KDEsIDMpLCAuLi59KSA9IDAKcnRfc2lnYWN0 aW9uKFNJR0NITEQsIE5VTEwsIHtTSUdfREZMLCBbXSwgMH0sIDgpID0gMApyZWFkbGluaygiL3By b2Mvc2VsZi9leGUiLCAiL3Vzci9iaW4vcGVybDUuOC44IiwgNDA5NSkgPSAxOApicmsoMHgxYzQ0 MDAwKSAgICAgICAgICAgICAgICAgICAgICAgICAgPSAweDFjNDQwMDAKZ2V0cHBpZCgpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gMzA5MDIKZnN0YXQoMywge3N0X21vZGU9U19JRkNI UnwwNjY2LCBzdF9yZGV2PW1ha2VkZXYoMSwgMyksIC4uLn0pID0gMAppb2N0bCgzLCBTTkRDVExf VE1SX1RJTUVCQVNFIG9yIFNORFJWX1RJTUVSX0lPQ1RMX05FWFRfREVWSUNFIG9yIFRDR0VUUywg MHg3ZmZmNTI0MmQ2MTgpID0gLTEgRU5PVFRZIChJbmFwcHJvcHJpYXRlIGlvY3RsIGZvciBkZXZp Y2UpCm1tYXAoTlVMTCwgNDA5NiwgUFJPVF9SRUFEfFBST1RfV1JJVEUsIE1BUF9QUklWQVRFfE1B UF9BTk9OWU1PVVMsIC0xLCAwKSA9IDB4N2YyMTdhZTZiMDAwCmxzZWVrKDMsIDAsIFNFRUtfQ1VS KSAgICAgICAgICAgICAgICAgICA9IDAKbHNlZWsoMywgMCwgU0VFS19TRVQpICAgICAgICAgICAg ICAgICAgID0gMApjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCm11 bm1hcCgweDdmMjE3YWU2YjAwMCwgNDA5NikgICAgICAgICAgICA9IDAKZHVwKDQyKSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gMwpmY250bCgzLCBGX0dFVEZMKSAgICAgICAgICAg ICAgICAgICAgICAgPSAweDg0MDEgKGZsYWdzIE9fV1JPTkxZfE9fQVBQRU5EfE9fTEFSR0VGSUxF KQpjbG9zZSgzKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSAwCndyaXRlKDIsICJJ bnZhbGlkIGFyZ3VtZW50IGF0IC1lIGxpbmUgMi5cbiIsIDMxSW52YWxpZCBhcmd1bWVudCBhdCAt ZSBsaW5lIDIuCikgPSAzMQpleGl0X2dyb3VwKDIyKSAgICAgICAgICAgICAgICAgICAgICAgICAg PSA/CisgcmlnaHRmaWxlPQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcK aHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From xen-devel-bounces@lists.xen.org Tue Nov 13 13:30:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:30:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGYt-0000FH-Ei; Tue, 13 Nov 2012 13:29:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGYs-0000FB-2Q for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:29:54 +0000 Received: from [85.158.137.99:57386] by server-15.bemta-3.messagelabs.com id 6D/6A-09445-15B42A05; Tue, 13 Nov 2012 13:29:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352813392!15758328!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29189 invoked from network); 13 Nov 2012 13:29:52 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:29:52 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15779040" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:29:12 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 13:29:11 +0000 Message-ID: <1352813350.7491.74.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Malcolm Crossley Date: Tue, 13 Nov 2012 13:29:10 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "JBeulich@suse.com" , "jun.nakajima@intel.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > to the local processor. Unfortunately there is a delay in the delivery of the > APIC message and we may already have re-entered the HVM guest by the time the > NMI is taken. This results in the VMEXIT code calling the self_nmi() function > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before > the HVM guest resumes normal operation. > > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > completes. > > So we believe it is safe to directly invoke the INT call as NMI's should > already be blocked. > > The INT 2 call will perform an IRET which will unblock later calls to the NMI > handler, according to Intel SDM Volume 3 Chapter 6.7.1. > > Signed-off-by: Malcolm Crossley > Acked-by: Tim Deegan > > diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c > --- a/xen/arch/x86/hvm/vmx/vmx.c > +++ b/xen/arch/x86/hvm/vmx/vmx.c > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > (X86_EVENTTYPE_NMI << 8) ) > goto exit_and_crash; > HVMTRACE_0D(NMI); > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ asm volatile("...") I think? Otherwise this could potentially get hoisted up Do we need any clobbers? Specifically I'm thinking of memory since taking an int2 ought to preserve register state. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:30:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:30:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGYt-0000FH-Ei; Tue, 13 Nov 2012 13:29:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGYs-0000FB-2Q for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:29:54 +0000 Received: from [85.158.137.99:57386] by server-15.bemta-3.messagelabs.com id 6D/6A-09445-15B42A05; Tue, 13 Nov 2012 13:29:53 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-217.messagelabs.com!1352813392!15758328!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29189 invoked from network); 13 Nov 2012 13:29:52 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 13:29:52 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15779040" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 13:29:12 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 13:29:11 +0000 Message-ID: <1352813350.7491.74.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Malcolm Crossley Date: Tue, 13 Nov 2012 13:29:10 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "JBeulich@suse.com" , "jun.nakajima@intel.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > to the local processor. Unfortunately there is a delay in the delivery of the > APIC message and we may already have re-entered the HVM guest by the time the > NMI is taken. This results in the VMEXIT code calling the self_nmi() function > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before > the HVM guest resumes normal operation. > > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > completes. > > So we believe it is safe to directly invoke the INT call as NMI's should > already be blocked. > > The INT 2 call will perform an IRET which will unblock later calls to the NMI > handler, according to Intel SDM Volume 3 Chapter 6.7.1. > > Signed-off-by: Malcolm Crossley > Acked-by: Tim Deegan > > diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c > --- a/xen/arch/x86/hvm/vmx/vmx.c > +++ b/xen/arch/x86/hvm/vmx/vmx.c > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > (X86_EVENTTYPE_NMI << 8) ) > goto exit_and_crash; > HVMTRACE_0D(NMI); > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ asm volatile("...") I think? Otherwise this could potentially get hoisted up Do we need any clobbers? Specifically I'm thinking of memory since taking an int2 ought to preserve register state. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:40:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:40:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGic-0000jK-QE; Tue, 13 Nov 2012 13:39:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGib-0000j8-2s for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:39:57 +0000 Received: from [85.158.139.83:26623] by server-14.bemta-5.messagelabs.com id 5E/A7-21768-CAD42A05; Tue, 13 Nov 2012 13:39:56 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1352813995!29782047!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 702 invoked from network); 13 Nov 2012 13:39:55 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-15.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 13:39:55 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYGiX-000CVL-C4; Tue, 13 Nov 2012 13:39:53 +0000 Date: Tue, 13 Nov 2012 13:39:53 +0000 From: Tim Deegan To: Ian Campbell Message-ID: <20121113133953.GF44675@ocelot.phlegethon.org> References: <1352813350.7491.74.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352813350.7491.74.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "jun.nakajima@intel.com" , "JBeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:29 +0000 on 13 Nov (1352813350), Ian Campbell wrote: > On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: > > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > > to the local processor. Unfortunately there is a delay in the delivery of the > > APIC message and we may already have re-entered the HVM guest by the time the > > NMI is taken. This results in the VMEXIT code calling the self_nmi() function > > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before > > the HVM guest resumes normal operation. > > > > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > > completes. > > > > So we believe it is safe to directly invoke the INT call as NMI's should > > already be blocked. > > > > The INT 2 call will perform an IRET which will unblock later calls to the NMI > > handler, according to Intel SDM Volume 3 Chapter 6.7.1. > > > > Signed-off-by: Malcolm Crossley > > Acked-by: Tim Deegan > > > > diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > (X86_EVENTTYPE_NMI << 8) ) > > goto exit_and_crash; > > HVMTRACE_0D(NMI); > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > asm volatile("...") > > I think? Otherwise this could potentially get hoisted up Good catch. Hoisted would be fine, but it could also be entirely discarded. :) > Do we need any clobbers? Specifically I'm thinking of memory since > taking an int2 ought to preserve register state. I don't think so - nothing on this path depends on the actual behaviour of the NMI handler. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 13:40:11 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 13:40:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGic-0000jK-QE; Tue, 13 Nov 2012 13:39:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYGib-0000j8-2s for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 13:39:57 +0000 Received: from [85.158.139.83:26623] by server-14.bemta-5.messagelabs.com id 5E/A7-21768-CAD42A05; Tue, 13 Nov 2012 13:39:56 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-15.tower-182.messagelabs.com!1352813995!29782047!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 702 invoked from network); 13 Nov 2012 13:39:55 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-15.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 13:39:55 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYGiX-000CVL-C4; Tue, 13 Nov 2012 13:39:53 +0000 Date: Tue, 13 Nov 2012 13:39:53 +0000 From: Tim Deegan To: Ian Campbell Message-ID: <20121113133953.GF44675@ocelot.phlegethon.org> References: <1352813350.7491.74.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <1352813350.7491.74.camel@zakaz.uk.xensource.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "jun.nakajima@intel.com" , "JBeulich@suse.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 13:29 +0000 on 13 Nov (1352813350), Ian Campbell wrote: > On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: > > The self_nmi() code cause's an NMI to be triggered by sending an APIC message > > to the local processor. Unfortunately there is a delay in the delivery of the > > APIC message and we may already have re-entered the HVM guest by the time the > > NMI is taken. This results in the VMEXIT code calling the self_nmi() function > > again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before > > the HVM guest resumes normal operation. > > > > Volume 3 Chapter 27 Section 1 of the Intel SDM states: > > > > An NMI causes subsequent NMIs to be blocked, but only after the VM exit > > completes. > > > > So we believe it is safe to directly invoke the INT call as NMI's should > > already be blocked. > > > > The INT 2 call will perform an IRET which will unblock later calls to the NMI > > handler, according to Intel SDM Volume 3 Chapter 6.7.1. > > > > Signed-off-by: Malcolm Crossley > > Acked-by: Tim Deegan > > > > diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c > > --- a/xen/arch/x86/hvm/vmx/vmx.c > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > > (X86_EVENTTYPE_NMI << 8) ) > > goto exit_and_crash; > > HVMTRACE_0D(NMI); > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > > asm volatile("...") > > I think? Otherwise this could potentially get hoisted up Good catch. Hoisted would be fine, but it could also be entirely discarded. :) > Do we need any clobbers? Specifically I'm thinking of memory since > taking an int2 ought to preserve register state. I don't think so - nothing on this path depends on the actual behaviour of the NMI handler. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:16:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:16:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHHq-0002hu-FS; Tue, 13 Nov 2012 14:16:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHHo-0002hp-QV for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 14:16:21 +0000 Received: from [85.158.139.211:14500] by server-8.bemta-5.messagelabs.com id 78/D0-06050-33652A05; Tue, 13 Nov 2012 14:16:19 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1352816179!19953215!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26996 invoked from network); 13 Nov 2012 14:16:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:16:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:16:22 +0000 Message-Id: <50A2644102000078000A82C8@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:16:17 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Tim Deegan" References: <1352813350.7491.74.camel@zakaz.uk.xensource.com> <20121113133953.GF44675@ocelot.phlegethon.org> In-Reply-To: <20121113133953.GF44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "jun.nakajima@intel.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 14:39, Tim Deegan wrote: > At 13:29 +0000 on 13 Nov (1352813350), Ian Campbell wrote: >> On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: >> > --- a/xen/arch/x86/hvm/vmx/vmx.c >> > +++ b/xen/arch/x86/hvm/vmx/vmx.c >> > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> > (X86_EVENTTYPE_NMI << 8) ) >> > goto exit_and_crash; >> > HVMTRACE_0D(NMI); >> > - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> >> asm volatile("...") >> >> I think? Otherwise this could potentially get hoisted up > > Good catch. Hoisted would be fine, but it could also be entirely > discarded. :) > >> Do we need any clobbers? Specifically I'm thinking of memory since >> taking an int2 ought to preserve register state. > > I don't think so - nothing on this path depends on the actual behaviour > of the NMI handler. We should still add it, as the NMI handler does modify global memory. Even if you can't spot any dependency now, it would be a rather hard to debug problem if there was, or if there ever gets something added to that effect. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:16:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:16:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHHq-0002hu-FS; Tue, 13 Nov 2012 14:16:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHHo-0002hp-QV for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 14:16:21 +0000 Received: from [85.158.139.211:14500] by server-8.bemta-5.messagelabs.com id 78/D0-06050-33652A05; Tue, 13 Nov 2012 14:16:19 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1352816179!19953215!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26996 invoked from network); 13 Nov 2012 14:16:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-12.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:16:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:16:22 +0000 Message-Id: <50A2644102000078000A82C8@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:16:17 +0000 From: "Jan Beulich" To: "Ian Campbell" , "Tim Deegan" References: <1352813350.7491.74.camel@zakaz.uk.xensource.com> <20121113133953.GF44675@ocelot.phlegethon.org> In-Reply-To: <20121113133953.GF44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "jun.nakajima@intel.com" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 14:39, Tim Deegan wrote: > At 13:29 +0000 on 13 Nov (1352813350), Ian Campbell wrote: >> On Tue, 2012-11-13 at 13:21 +0000, Malcolm Crossley wrote: >> > --- a/xen/arch/x86/hvm/vmx/vmx.c >> > +++ b/xen/arch/x86/hvm/vmx/vmx.c >> > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> > (X86_EVENTTYPE_NMI << 8) ) >> > goto exit_and_crash; >> > HVMTRACE_0D(NMI); >> > - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> >> asm volatile("...") >> >> I think? Otherwise this could potentially get hoisted up > > Good catch. Hoisted would be fine, but it could also be entirely > discarded. :) > >> Do we need any clobbers? Specifically I'm thinking of memory since >> taking an int2 ought to preserve register state. > > I don't think so - nothing on this path depends on the actual behaviour > of the NMI handler. We should still add it, as the NMI handler does modify global memory. Even if you can't spot any dependency now, it would be a rather hard to debug problem if there was, or if there ever gets something added to that effect. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHMf-00035S-6D; Tue, 13 Nov 2012 14:21:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHMd-00035M-Ql for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:21:20 +0000 Received: from [85.158.139.211:46858] by server-12.bemta-5.messagelabs.com id 03/92-02886-E5752A05; Tue, 13 Nov 2012 14:21:18 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352816478!18505470!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30718 invoked from network); 13 Nov 2012 14:21:18 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:21:18 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:21:23 +0000 Message-Id: <50A2656C02000078000A82D4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:21:16 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> In-Reply-To: <20121113123910.GE44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 13:39, Tim Deegan wrote: > At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: >> On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: >> > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: >> > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: >> > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >> > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c >> > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c >> > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> > > > > (X86_EVENTTYPE_NMI << 8) ) >> > > > > goto exit_and_crash; >> > > > > HVMTRACE_0D(NMI); >> > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> > > > >> > > > In any case - why can't you call do_nmi() directly from here? >> > > >> > > ... this is my doing. There used to be a call to do_nmi() here, but >> > > do_nmi() doesn't block NMIs, so you can't just call it here in case you >> > > get _another_ NMI while you're in the NMI handler. >> > >> > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong >> > because NMIs are indeed blocked, and have been since the VMEXIT. >> > >> > In that case, I agree that we should just run the NMI handler, but first >> > I would really like to know what _unblocks_ NMIs in this case. Any of >> > the things I can think of (the next vmenter, the next iret, ??) will >> > need some handling to make sure they actually happen before, say, we >> > take this CPU into the idle loop... >> >> What about a little stub-asm return_from_nmi / reenable_nmis with >> something like: >> pushf >> pushq $__HYPERVISOR_CS >> pushq 1f >> iret >> 1: ... >> >> That should re-enable NMIs at whichever point we think is appropriate? > > If an iret is what's needed then replacing self_nmi() with 'int $2' > (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of > the manual suggests that iret is indeed what we want, so: An IRET just cannot be the only thing that ends the NMI masked window. At least some forms of #VMENTER should have that effect too, as otherwise NMIs would remain masked for arbitrary periods of time. Further, under the assumption that the self_nmi() worked at least in some cases (since you likely tested it), there would also be room for the NMI not being masked when getting here. Which would get us into the stack trouble that Andrew mentioned in his reply. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:21:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:21:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHMf-00035S-6D; Tue, 13 Nov 2012 14:21:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHMd-00035M-Ql for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:21:20 +0000 Received: from [85.158.139.211:46858] by server-12.bemta-5.messagelabs.com id 03/92-02886-E5752A05; Tue, 13 Nov 2012 14:21:18 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352816478!18505470!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30718 invoked from network); 13 Nov 2012 14:21:18 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:21:18 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:21:23 +0000 Message-Id: <50A2656C02000078000A82D4@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:21:16 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> In-Reply-To: <20121113123910.GE44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 13:39, Tim Deegan wrote: > At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: >> On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: >> > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: >> > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: >> > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c >> > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c >> > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c >> > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >> > > > > (X86_EVENTTYPE_NMI << 8) ) >> > > > > goto exit_and_crash; >> > > > > HVMTRACE_0D(NMI); >> > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ >> > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> > > > >> > > > In any case - why can't you call do_nmi() directly from here? >> > > >> > > ... this is my doing. There used to be a call to do_nmi() here, but >> > > do_nmi() doesn't block NMIs, so you can't just call it here in case you >> > > get _another_ NMI while you're in the NMI handler. >> > >> > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong >> > because NMIs are indeed blocked, and have been since the VMEXIT. >> > >> > In that case, I agree that we should just run the NMI handler, but first >> > I would really like to know what _unblocks_ NMIs in this case. Any of >> > the things I can think of (the next vmenter, the next iret, ??) will >> > need some handling to make sure they actually happen before, say, we >> > take this CPU into the idle loop... >> >> What about a little stub-asm return_from_nmi / reenable_nmis with >> something like: >> pushf >> pushq $__HYPERVISOR_CS >> pushq 1f >> iret >> 1: ... >> >> That should re-enable NMIs at whichever point we think is appropriate? > > If an iret is what's needed then replacing self_nmi() with 'int $2' > (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of > the manual suggests that iret is indeed what we want, so: An IRET just cannot be the only thing that ends the NMI masked window. At least some forms of #VMENTER should have that effect too, as otherwise NMIs would remain masked for arbitrary periods of time. Further, under the assumption that the self_nmi() worked at least in some cases (since you likely tested it), there would also be room for the NMI not being masked when getting here. Which would get us into the stack trouble that Andrew mentioned in his reply. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:23:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:23:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHOb-0003Kr-N4; Tue, 13 Nov 2012 14:23:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHOa-0003Kj-J3 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:23:20 +0000 Received: from [85.158.138.51:33717] by server-15.bemta-3.messagelabs.com id F5/C3-09445-7D752A05; Tue, 13 Nov 2012 14:23:19 +0000 X-Env-Sender: killian.de.volder@scarlet.be X-Msg-Ref: server-13.tower-174.messagelabs.com!1352816597!10131135!1 X-Originating-IP: [217.70.183.196] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjE3LjcwLjE4My4xOTYgPT4gNDQ3NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19140 invoked from network); 13 Nov 2012 14:23:17 -0000 Received: from relay4-d.mail.gandi.net (HELO relay4-d.mail.gandi.net) (217.70.183.196) by server-13.tower-174.messagelabs.com with SMTP; 13 Nov 2012 14:23:17 -0000 X-Originating-IP: 217.70.178.135 Received: from mfilter6-d.gandi.net (mfilter6-d.gandi.net [217.70.178.135]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 67F41172080 for ; Tue, 13 Nov 2012 15:23:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter6-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter6-d.gandi.net (mfilter6-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id hKHGbiJ3nM+v for ; Tue, 13 Nov 2012 15:23:16 +0100 (CET) X-Originating-IP: 78.20.80.220 Received: from [172.17.0.70] (78-20-80-220.access.telenet.be [78.20.80.220]) (Authenticated sender: killian.de.volder@megasoft.be) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id EF1961720B7 for ; Tue, 13 Nov 2012 15:23:15 +0100 (CET) Message-ID: <50A25798.90100@scarlet.be> Date: Tue, 13 Nov 2012 15:22:16 +0100 From: Killian De Volder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.4) Gecko/20120522 Thunderbird/10.0.4 MIME-Version: 1.0 To: xen-devel@lists.xen.org Subject: [Xen-devel] TCP Segment offloading + DF X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, I don't know if TCO is supported for XEN_NETDEV_FRONTED in kernel 3.1.6, however I found an issue. I had to track down an issue today: Packet from a local machine didn't get routed to the internet. After long searching I found the issue: The TCP-Segmentation-offloading assembles fragments with Do Not Fragment set. This introduces issues when the packet is to be rerouted trough a router. Situation: DOM0 |->Bridge 1 - MTU 1500 | |-> PHY - eth0 | |-> VIF - Dom1 | \-> VIF - Dom2 (router) | \->Bridge 2 - MTU 1500 |-> PHY - eth1 \-> VIF - Dom2 (router) Dom 1 <-> VIF <--(bridge 1)--> VIF <-> dom2 <-> VIF <--(bridge 2)--> Practical example: Dom1 generate 2 packet to be routed to bridge 2 from bridge 1. Packet 1: 1300 bytes DF (TCP) Packet 2: 400 bytes DF (TCP) The TCP-offloading throws them together and passes 1 packet: 1700 bytes DF (TCP). Smart thing to do, reduces load etc. HOWEVER Then it arrives at dom2, it looks at the packets, sees a 1700 byte packet, and sees the DF. Dom2 would put it on the bridge 2 network, fragmented, but it's not allowed, so instead it drops the packet. I'm not sure if it's "working as designed" or if this is an unfortunate side effect. Feedback welcome, (even "You are an idiot, of course it's going to fail !" :) ) Killian De Volder _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:23:38 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:23:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHOb-0003Kr-N4; Tue, 13 Nov 2012 14:23:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHOa-0003Kj-J3 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:23:20 +0000 Received: from [85.158.138.51:33717] by server-15.bemta-3.messagelabs.com id F5/C3-09445-7D752A05; Tue, 13 Nov 2012 14:23:19 +0000 X-Env-Sender: killian.de.volder@scarlet.be X-Msg-Ref: server-13.tower-174.messagelabs.com!1352816597!10131135!1 X-Originating-IP: [217.70.183.196] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjE3LjcwLjE4My4xOTYgPT4gNDQ3NzI=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19140 invoked from network); 13 Nov 2012 14:23:17 -0000 Received: from relay4-d.mail.gandi.net (HELO relay4-d.mail.gandi.net) (217.70.183.196) by server-13.tower-174.messagelabs.com with SMTP; 13 Nov 2012 14:23:17 -0000 X-Originating-IP: 217.70.178.135 Received: from mfilter6-d.gandi.net (mfilter6-d.gandi.net [217.70.178.135]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 67F41172080 for ; Tue, 13 Nov 2012 15:23:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter6-d.gandi.net Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by mfilter6-d.gandi.net (mfilter6-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id hKHGbiJ3nM+v for ; Tue, 13 Nov 2012 15:23:16 +0100 (CET) X-Originating-IP: 78.20.80.220 Received: from [172.17.0.70] (78-20-80-220.access.telenet.be [78.20.80.220]) (Authenticated sender: killian.de.volder@megasoft.be) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id EF1961720B7 for ; Tue, 13 Nov 2012 15:23:15 +0100 (CET) Message-ID: <50A25798.90100@scarlet.be> Date: Tue, 13 Nov 2012 15:22:16 +0100 From: Killian De Volder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.4) Gecko/20120522 Thunderbird/10.0.4 MIME-Version: 1.0 To: xen-devel@lists.xen.org Subject: [Xen-devel] TCP Segment offloading + DF X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hello, I don't know if TCO is supported for XEN_NETDEV_FRONTED in kernel 3.1.6, however I found an issue. I had to track down an issue today: Packet from a local machine didn't get routed to the internet. After long searching I found the issue: The TCP-Segmentation-offloading assembles fragments with Do Not Fragment set. This introduces issues when the packet is to be rerouted trough a router. Situation: DOM0 |->Bridge 1 - MTU 1500 | |-> PHY - eth0 | |-> VIF - Dom1 | \-> VIF - Dom2 (router) | \->Bridge 2 - MTU 1500 |-> PHY - eth1 \-> VIF - Dom2 (router) Dom 1 <-> VIF <--(bridge 1)--> VIF <-> dom2 <-> VIF <--(bridge 2)--> Practical example: Dom1 generate 2 packet to be routed to bridge 2 from bridge 1. Packet 1: 1300 bytes DF (TCP) Packet 2: 400 bytes DF (TCP) The TCP-offloading throws them together and passes 1 packet: 1700 bytes DF (TCP). Smart thing to do, reduces load etc. HOWEVER Then it arrives at dom2, it looks at the packets, sees a 1700 byte packet, and sees the DF. Dom2 would put it on the bridge 2 network, fragmented, but it's not allowed, so instead it drops the packet. I'm not sure if it's "working as designed" or if this is an unfortunate side effect. Feedback welcome, (even "You are an idiot, of course it's going to fail !" :) ) Killian De Volder _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:29:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:29:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHUC-0003jT-G1; Tue, 13 Nov 2012 14:29:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHUB-0003jO-1D for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 14:29:07 +0000 Received: from [85.158.137.99:28012] by server-1.bemta-3.messagelabs.com id 9D/73-12169-03952A05; Tue, 13 Nov 2012 14:29:04 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352816944!14122975!1 X-Originating-IP: [74.125.82.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30508 invoked from network); 13 Nov 2012 14:29:04 -0000 Received: from mail-wg0-f43.google.com (HELO mail-wg0-f43.google.com) (74.125.82.43) by server-7.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 14:29:04 -0000 Received: by mail-wg0-f43.google.com with SMTP id dq11so4476254wgb.24 for ; Tue, 13 Nov 2012 06:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=V1mgn0Dpz2G5SFxgonPLs1ThCApSr5+UVgiS5vyTLbM=; b=ip4hLppfsNI6KhFDh3b6hm50slRv4kieYYQh7NizTYEO0+/+gsYBURtYb6tV2Dvoul cpGBNldu/gbpxE0JaKslPLwtYluhXKX2FKrkULN4NU2rIwi3HvtKqa0Gmb6CaGUt+SsU 1X/2sK92GhTmhT/WxYB+7U+XVfjpXgM39rd5L4Hz2lNabqYevUOVGwLjD0DB0PC887EN Rl3daDK2hVph/nMI7SDskmSq3MomFX/ACKBkRzWvsxto1iBVAekf+p1zbYEssjpBqhYB Uaf1112kough/l6CSWRz48VWHQaKfMDsPTse5XKM1zX7v6kVEgFdEc2zzhcuYck6NuFE ABZA== Received: by 10.180.107.136 with SMTP id hc8mr20654547wib.9.1352816943920; Tue, 13 Nov 2012 06:29:03 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm19064711wib.4.2012.11.13.06.29.00 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 06:29:03 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 14:28:48 +0000 From: Keir Fraser To: Tim Deegan , Ian Campbell Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler Thread-Index: Ac3BqzGjou9bS4lI3kS0VSuVI/5+6A== In-Reply-To: <20121113133953.GF44675@ocelot.phlegethon.org> Mime-version: 1.0 Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "JBeulich@suse.com" , "Nakajima, Jun" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 13:39, "Tim Deegan" wrote: >>> diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c >>> --- a/xen/arch/x86/hvm/vmx/vmx.c >>> +++ b/xen/arch/x86/hvm/vmx/vmx.c >>> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >>> (X86_EVENTTYPE_NMI << 8) ) >>> goto exit_and_crash; >>> HVMTRACE_0D(NMI); >>> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >>> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> >> asm volatile("...") >> >> I think? Otherwise this could potentially get hoisted up > > Good catch. Hoisted would be fine, but it could also be entirely > discarded. :) Parameter-less asm blocks are a special case that will never be considered side-effect free I believe. Still 'asm volatile' would be our stylistic choice in this case anyway. And with that: Acked-by: Keir Fraser _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:29:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:29:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHUC-0003jT-G1; Tue, 13 Nov 2012 14:29:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHUB-0003jO-1D for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 14:29:07 +0000 Received: from [85.158.137.99:28012] by server-1.bemta-3.messagelabs.com id 9D/73-12169-03952A05; Tue, 13 Nov 2012 14:29:04 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-7.tower-217.messagelabs.com!1352816944!14122975!1 X-Originating-IP: [74.125.82.43] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30508 invoked from network); 13 Nov 2012 14:29:04 -0000 Received: from mail-wg0-f43.google.com (HELO mail-wg0-f43.google.com) (74.125.82.43) by server-7.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 14:29:04 -0000 Received: by mail-wg0-f43.google.com with SMTP id dq11so4476254wgb.24 for ; Tue, 13 Nov 2012 06:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=V1mgn0Dpz2G5SFxgonPLs1ThCApSr5+UVgiS5vyTLbM=; b=ip4hLppfsNI6KhFDh3b6hm50slRv4kieYYQh7NizTYEO0+/+gsYBURtYb6tV2Dvoul cpGBNldu/gbpxE0JaKslPLwtYluhXKX2FKrkULN4NU2rIwi3HvtKqa0Gmb6CaGUt+SsU 1X/2sK92GhTmhT/WxYB+7U+XVfjpXgM39rd5L4Hz2lNabqYevUOVGwLjD0DB0PC887EN Rl3daDK2hVph/nMI7SDskmSq3MomFX/ACKBkRzWvsxto1iBVAekf+p1zbYEssjpBqhYB Uaf1112kough/l6CSWRz48VWHQaKfMDsPTse5XKM1zX7v6kVEgFdEc2zzhcuYck6NuFE ABZA== Received: by 10.180.107.136 with SMTP id hc8mr20654547wib.9.1352816943920; Tue, 13 Nov 2012 06:29:03 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id gk9sm19064711wib.4.2012.11.13.06.29.00 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 06:29:03 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 14:28:48 +0000 From: Keir Fraser To: Tim Deegan , Ian Campbell Message-ID: Thread-Topic: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler Thread-Index: Ac3BqzGjou9bS4lI3kS0VSuVI/5+6A== In-Reply-To: <20121113133953.GF44675@ocelot.phlegethon.org> Mime-version: 1.0 Cc: Malcolm Crossley , "xen-devel@lists.xensource.com" , "eddie.dong@intel.com" , "JBeulich@suse.com" , "Nakajima, Jun" Subject: Re: [Xen-devel] [PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 13:39, "Tim Deegan" wrote: >>> diff -r 62885b3c34c8 -r e1fbee58b25c xen/arch/x86/hvm/vmx/vmx.c >>> --- a/xen/arch/x86/hvm/vmx/vmx.c >>> +++ b/xen/arch/x86/hvm/vmx/vmx.c >>> @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ >>> (X86_EVENTTYPE_NMI << 8) ) >>> goto exit_and_crash; >>> HVMTRACE_0D(NMI); >>> - self_nmi(); /* Real NMI, vector 2: normal processing. */ >>> + asm("int $2"); /* Real NMI, vector 2: normal processing. */ >> >> asm volatile("...") >> >> I think? Otherwise this could potentially get hoisted up > > Good catch. Hoisted would be fine, but it could also be entirely > discarded. :) Parameter-less asm blocks are a special case that will never be considered side-effect free I believe. Still 'asm volatile' would be our stylistic choice in this case anyway. And with that: Acked-by: Keir Fraser _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:32:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:32:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHXW-00043E-Od; Tue, 13 Nov 2012 14:32:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHXV-000431-OS for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:32:33 +0000 Received: from [85.158.137.99:7231] by server-7.bemta-3.messagelabs.com id 6B/CE-01713-CF952A05; Tue, 13 Nov 2012 14:32:28 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-217.messagelabs.com!1352817145!12085653!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19547 invoked from network); 13 Nov 2012 14:32:26 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:32:26 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157222085; Tue, 13 Nov 2012 09:32:00 -0500 Message-ID: <50A259DE.1030801@jhuapl.edu> Date: Tue, 13 Nov 2012 09:31:58 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> <1352803854.7491.48.camel@zakaz.uk.xensource.com> In-Reply-To: <1352803854.7491.48.camel@zakaz.uk.xensource.com> Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6074478228704430946==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============6074478228704430946== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms000806030208030703070805" This is a cryptographically signed message in MIME format. --------------ms000806030208030703070805 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 11/13/2012 05:50 AM, Ian Campbell wrote: > On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: >> Add 3 new libraries to stubdom: >> libgmp >> polarssl >> Berlios TPM Emulator 0.7.4 >> >> Also adds makefile structure for vtpm-stubdom and vtpmmgrdom >> >> Signed-off-by: Matthew Fioravante > Patch 7, 8 & 9 all: > Acked-by: Ian Campbell > > (I must confess I did not review in detail, but it is all self containe= d > and has an active maintainer...) > > However rather than apply straight away I have downloaded these three > files: > ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 > http://polarssl.org/code/releases/polarssl-1.1.4-gpl.tgz > http://download.berlios.de/tpm-emulator/tpm_emulator-0.7.4.tar.gz > with checksums: > $ sha256sum gmp-4.3.2.tar.bz2 polarssl-1.1.4-gpl.tgz tpm_emulator-0.7.4= =2Etar.gz > 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 gmp-4= =2E3.2.tar.bz2 > 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 polar= ssl-1.1.4-gpl.tgz > 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 tpm_e= mulator-0.7.4.tar.gz > $ > and placed them at the $(XEN_EXTFILES_URL). > > Please could you confirm that these are correct and respin to use > XEN_EXTFILES_URL? Changed it to use extfiles and the files you added work. Will be in next = round of patches. > >> diff --git a/stubdom/Makefile b/stubdom/Makefile >> index 50ba360..96801b2 100644 >> --- a/stubdom/Makefile >> +++ b/stubdom/Makefile >> @@ -31,6 +31,18 @@ GRUB_VERSION=3D0.97 >> OCAML_URL?=3Dhttp://caml.inria.fr/pub/distrib/ocaml-3.11 >> OCAML_VERSION=3D3.11.0 >> =20 >> +GMP_VERSION=3D4.3.2 >> +#GMP_URL?=3D$(XEN_EXTFILES_URL) >> +GMP_URL?=3Dftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) > This is a 2010 release -- any plans to upgrade to the more recent 5.x > stream? I didn't have any plans to as its working as intended with the current=20 version. Actually I'd really like to switch vtpm-stubdom to using=20 polarssl's bignum library and get rid of the large gmp dependency=20 entirely. The vtpm only uses a very small part of gmp, namely bignum=20 integer math for doing rsa. I don't have a whole lot of time to do this=20 switch right now though. > > --------------ms000806030208030703070805 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTExMzE0MzE1OFowIwYJKoZIhvcNAQkEMRYEFJFHHI/iiTgBZNkq aQQggNnV9TyWMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYBPppgXYIINFBHne/u+76S5XXgS896qqbJc +lbzphBYeww3v6VILeteH/tZgoDpeSmTD+2jNDDvsM3dgyGJyYskPP4mHRnHqB6b8HNZQWvH un8UcWeDTbrjQTXHyVCSvgZrVY4k2+2mijMCVdWJjkFTxlg0iHxHR2cWtcrKbq4o8AAAAAAA AA== --------------ms000806030208030703070805-- --===============6074478228704430946== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6074478228704430946==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 14:32:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:32:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHXW-00043E-Od; Tue, 13 Nov 2012 14:32:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHXV-000431-OS for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:32:33 +0000 Received: from [85.158.137.99:7231] by server-7.bemta-3.messagelabs.com id 6B/CE-01713-CF952A05; Tue, 13 Nov 2012 14:32:28 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-8.tower-217.messagelabs.com!1352817145!12085653!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19547 invoked from network); 13 Nov 2012 14:32:26 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-8.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:32:26 -0000 Received: from ([128.244.206.185]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157222085; Tue, 13 Nov 2012 09:32:00 -0500 Message-ID: <50A259DE.1030801@jhuapl.edu> Date: Tue, 13 Nov 2012 09:31:58 -0500 From: Matthew Fioravante User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1351802150-19258-4-git-send-email-matthew.fioravante@jhuapl.edu> <1352803854.7491.48.camel@zakaz.uk.xensource.com> In-Reply-To: <1352803854.7491.48.camel@zakaz.uk.xensource.com> Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 9/9] vtpm/vtpmmgr and required libs to stubdom/Makefile X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============6074478228704430946==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a cryptographically signed message in MIME format. --===============6074478228704430946== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms000806030208030703070805" This is a cryptographically signed message in MIME format. --------------ms000806030208030703070805 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 11/13/2012 05:50 AM, Ian Campbell wrote: > On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: >> Add 3 new libraries to stubdom: >> libgmp >> polarssl >> Berlios TPM Emulator 0.7.4 >> >> Also adds makefile structure for vtpm-stubdom and vtpmmgrdom >> >> Signed-off-by: Matthew Fioravante > Patch 7, 8 & 9 all: > Acked-by: Ian Campbell > > (I must confess I did not review in detail, but it is all self containe= d > and has an active maintainer...) > > However rather than apply straight away I have downloaded these three > files: > ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 > http://polarssl.org/code/releases/polarssl-1.1.4-gpl.tgz > http://download.berlios.de/tpm-emulator/tpm_emulator-0.7.4.tar.gz > with checksums: > $ sha256sum gmp-4.3.2.tar.bz2 polarssl-1.1.4-gpl.tgz tpm_emulator-0.7.4= =2Etar.gz > 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775 gmp-4= =2E3.2.tar.bz2 > 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 polar= ssl-1.1.4-gpl.tgz > 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 tpm_e= mulator-0.7.4.tar.gz > $ > and placed them at the $(XEN_EXTFILES_URL). > > Please could you confirm that these are correct and respin to use > XEN_EXTFILES_URL? Changed it to use extfiles and the files you added work. Will be in next = round of patches. > >> diff --git a/stubdom/Makefile b/stubdom/Makefile >> index 50ba360..96801b2 100644 >> --- a/stubdom/Makefile >> +++ b/stubdom/Makefile >> @@ -31,6 +31,18 @@ GRUB_VERSION=3D0.97 >> OCAML_URL?=3Dhttp://caml.inria.fr/pub/distrib/ocaml-3.11 >> OCAML_VERSION=3D3.11.0 >> =20 >> +GMP_VERSION=3D4.3.2 >> +#GMP_URL?=3D$(XEN_EXTFILES_URL) >> +GMP_URL?=3Dftp://ftp.gmplib.org/pub/gmp-$(GMP_VERSION) > This is a 2010 release -- any plans to upgrade to the more recent 5.x > stream? I didn't have any plans to as its working as intended with the current=20 version. Actually I'd really like to switch vtpm-stubdom to using=20 polarssl's bignum library and get rid of the large gmp dependency=20 entirely. The vtpm only uses a very small part of gmp, namely bignum=20 integer math for doing rsa. I don't have a whole lot of time to do this=20 switch right now though. > > --------------ms000806030208030703070805 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTExMzE0MzE1OFowIwYJKoZIhvcNAQkEMRYEFJFHHI/iiTgBZNkq aQQggNnV9TyWMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYBPppgXYIINFBHne/u+76S5XXgS896qqbJc +lbzphBYeww3v6VILeteH/tZgoDpeSmTD+2jNDDvsM3dgyGJyYskPP4mHRnHqB6b8HNZQWvH un8UcWeDTbrjQTXHyVCSvgZrVY4k2+2mijMCVdWJjkFTxlg0iHxHR2cWtcrKbq4o8AAAAAAA AA== --------------ms000806030208030703070805-- --===============6074478228704430946== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6074478228704430946==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 14:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHig-0004lp-5T; Tue, 13 Nov 2012 14:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHie-0004lj-M6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:44:04 +0000 Received: from [85.158.138.51:31524] by server-1.bemta-3.messagelabs.com id 6E/6D-12169-3BC52A05; Tue, 13 Nov 2012 14:44:03 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1352817842!23512090!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13199 invoked from network); 13 Nov 2012 14:44:03 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:44:03 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYHiW-000CiE-Ti; Tue, 13 Nov 2012 14:43:56 +0000 Date: Tue, 13 Nov 2012 14:43:56 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113144356.GG44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A2656C02000078000A82D4@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 14:21 +0000 on 13 Nov (1352816476), Jan Beulich wrote: > >>> On 13.11.12 at 13:39, Tim Deegan wrote: > > At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: > >> On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > >> > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > >> > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > >> > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > >> > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > >> > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > >> > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > >> > > > > (X86_EVENTTYPE_NMI << 8) ) > >> > > > > goto exit_and_crash; > >> > > > > HVMTRACE_0D(NMI); > >> > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > >> > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > >> > > > > >> > > > In any case - why can't you call do_nmi() directly from here? > >> > > > >> > > ... this is my doing. There used to be a call to do_nmi() here, but > >> > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > >> > > get _another_ NMI while you're in the NMI handler. > >> > > >> > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > >> > because NMIs are indeed blocked, and have been since the VMEXIT. > >> > > >> > In that case, I agree that we should just run the NMI handler, but first > >> > I would really like to know what _unblocks_ NMIs in this case. Any of > >> > the things I can think of (the next vmenter, the next iret, ??) will > >> > need some handling to make sure they actually happen before, say, we > >> > take this CPU into the idle loop... > >> > >> What about a little stub-asm return_from_nmi / reenable_nmis with > >> something like: > >> pushf > >> pushq $__HYPERVISOR_CS > >> pushq 1f > >> iret > >> 1: ... > >> > >> That should re-enable NMIs at whichever point we think is appropriate? > > > > If an iret is what's needed then replacing self_nmi() with 'int $2' > > (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of > > the manual suggests that iret is indeed what we want, so: > > An IRET just cannot be the only thing that ends the NMI masked > window. At least some forms of #VMENTER should have that > effect too, as otherwise NMIs would remain masked for arbitrary > periods of time. > > Further, under the assumption that the self_nmi() worked at least > in some cases (since you likely tested it), there would also be room > for the NMI not being masked when getting here. Which would get > us into the stack trouble that Andrew mentioned in his reply. I got the impression that Andrew and Malcolm were seeing a long loop of exit/self_nmi()/enter/NMI/exit/..., eventually broken by a real interrupt or an IPI causing (by its iret) the NMI to get delivered in root mode. So the NMI does get handled, just not immediately. The fact that there was a loop and not just a delay in the NMI handling suggests that VMENTER does indeed re-enable NMIs (or at least NMI-exiting) but I couldn't find that in the manual. In any case, I think the int $2 version is correcter than the direct call as it also disables normal interrupts. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHig-0004lp-5T; Tue, 13 Nov 2012 14:44:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHie-0004lj-M6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:44:04 +0000 Received: from [85.158.138.51:31524] by server-1.bemta-3.messagelabs.com id 6E/6D-12169-3BC52A05; Tue, 13 Nov 2012 14:44:03 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1352817842!23512090!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13199 invoked from network); 13 Nov 2012 14:44:03 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-14.tower-174.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:44:03 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYHiW-000CiE-Ti; Tue, 13 Nov 2012 14:43:56 +0000 Date: Tue, 13 Nov 2012 14:43:56 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113144356.GG44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A2656C02000078000A82D4@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 14:21 +0000 on 13 Nov (1352816476), Jan Beulich wrote: > >>> On 13.11.12 at 13:39, Tim Deegan wrote: > > At 12:17 +0000 on 13 Nov (1352809049), Ian Campbell wrote: > >> On Tue, 2012-11-13 at 12:05 +0000, Tim Deegan wrote: > >> > At 11:47 +0000 on 13 Nov (1352807234), Tim Deegan wrote: > >> > > At 11:38 +0000 on 13 Nov (1352806689), Jan Beulich wrote: > >> > > > > diff -r 62885b3c34c8 -r ea756059a8da xen/arch/x86/hvm/vmx/vmx.c > >> > > > > --- a/xen/arch/x86/hvm/vmx/vmx.c > >> > > > > +++ b/xen/arch/x86/hvm/vmx/vmx.c > >> > > > > @@ -2442,7 +2442,7 @@ void vmx_vmexit_handler(struct cpu_user_ > >> > > > > (X86_EVENTTYPE_NMI << 8) ) > >> > > > > goto exit_and_crash; > >> > > > > HVMTRACE_0D(NMI); > >> > > > > - self_nmi(); /* Real NMI, vector 2: normal processing. */ > >> > > > > + asm("int $2"); /* Real NMI, vector 2: normal processing. */ > >> > > > > >> > > > In any case - why can't you call do_nmi() directly from here? > >> > > > >> > > ... this is my doing. There used to be a call to do_nmi() here, but > >> > > do_nmi() doesn't block NMIs, so you can't just call it here in case you > >> > > get _another_ NMI while you're in the NMI handler. > >> > > >> > Oh wait, I see -- you're saying that this (20059:76a65bf2aa4d) is wrong > >> > because NMIs are indeed blocked, and have been since the VMEXIT. > >> > > >> > In that case, I agree that we should just run the NMI handler, but first > >> > I would really like to know what _unblocks_ NMIs in this case. Any of > >> > the things I can think of (the next vmenter, the next iret, ??) will > >> > need some handling to make sure they actually happen before, say, we > >> > take this CPU into the idle loop... > >> > >> What about a little stub-asm return_from_nmi / reenable_nmis with > >> something like: > >> pushf > >> pushq $__HYPERVISOR_CS > >> pushq 1f > >> iret > >> 1: ... > >> > >> That should re-enable NMIs at whichever point we think is appropriate? > > > > If an iret is what's needed then replacing self_nmi() with 'int $2' > > (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of > > the manual suggests that iret is indeed what we want, so: > > An IRET just cannot be the only thing that ends the NMI masked > window. At least some forms of #VMENTER should have that > effect too, as otherwise NMIs would remain masked for arbitrary > periods of time. > > Further, under the assumption that the self_nmi() worked at least > in some cases (since you likely tested it), there would also be room > for the NMI not being masked when getting here. Which would get > us into the stack trouble that Andrew mentioned in his reply. I got the impression that Andrew and Malcolm were seeing a long loop of exit/self_nmi()/enter/NMI/exit/..., eventually broken by a real interrupt or an IPI causing (by its iret) the NMI to get delivered in root mode. So the NMI does get handled, just not immediately. The fact that there was a loop and not just a delay in the NMI handling suggests that VMENTER does indeed re-enable NMIs (or at least NMI-exiting) but I couldn't find that in the manual. In any case, I think the int $2 version is correcter than the direct call as it also disables normal interrupts. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:47:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:47:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHlv-0004xJ-Pb; Tue, 13 Nov 2012 14:47:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHlt-0004x3-Mo for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:47:25 +0000 Received: from [85.158.143.35:55738] by server-1.bemta-4.messagelabs.com id 13/BB-27934-C7D52A05; Tue, 13 Nov 2012 14:47:24 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352818037!13838494!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5521 invoked from network); 13 Nov 2012 14:47:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-21.messagelabs.com with SMTP; 13 Nov 2012 14:47:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:47:25 +0000 Message-Id: <50A26B7F02000078000A8309@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:47:11 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 13:05, Tim Deegan wrote: > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... Wouldn't we have that exact same problem on the "normal" NMI path? We do switch away from the NMI stack when it arrived while in guest context, but I don't think we do anything to end the NMI masking window before going into the scheduler (or handling other softirqs). If so, rather than doing this potentially dangerous "int $2" (in terms of IST stack usage), we might be better off dealing with the ending of the mask window in a uniform way. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:47:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:47:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHlv-0004xJ-Pb; Tue, 13 Nov 2012 14:47:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHlt-0004x3-Mo for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:47:25 +0000 Received: from [85.158.143.35:55738] by server-1.bemta-4.messagelabs.com id 13/BB-27934-C7D52A05; Tue, 13 Nov 2012 14:47:24 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1352818037!13838494!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5521 invoked from network); 13 Nov 2012 14:47:19 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-15.tower-21.messagelabs.com with SMTP; 13 Nov 2012 14:47:19 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:47:25 +0000 Message-Id: <50A26B7F02000078000A8309@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:47:11 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> In-Reply-To: <20121113120555.GC44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , eddie.dong@intel.com, jun.nakajima@intel.com, xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 13:05, Tim Deegan wrote: > In that case, I agree that we should just run the NMI handler, but first > I would really like to know what _unblocks_ NMIs in this case. Any of > the things I can think of (the next vmenter, the next iret, ??) will > need some handling to make sure they actually happen before, say, we > take this CPU into the idle loop... Wouldn't we have that exact same problem on the "normal" NMI path? We do switch away from the NMI stack when it arrived while in guest context, but I don't think we do anything to end the NMI masking window before going into the scheduler (or handling other softirqs). If so, rather than doing this potentially dangerous "int $2" (in terms of IST stack usage), we might be better off dealing with the ending of the mask window in a uniform way. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:56:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:56:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHuX-0005Ms-QX; Tue, 13 Nov 2012 14:56:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHuW-0005Mn-LP for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:56:20 +0000 Received: from [85.158.139.211:41586] by server-14.bemta-5.messagelabs.com id 0A/90-21768-39F52A05; Tue, 13 Nov 2012 14:56:19 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352818574!20052651!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12170 invoked from network); 13 Nov 2012 14:56:14 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:56:14 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:56:28 +0000 Message-Id: <50A26D9C02000078000A8322@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:56:12 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> In-Reply-To: <20121113144356.GG44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 15:43, Tim Deegan wrote: > The fact that there was a loop and not just a delay in the NMI handling > suggests that VMENTER does indeed re-enable NMIs (or at least > NMI-exiting) but I couldn't find that in the manual. In any case, I > think the int $2 version is correcter than the direct call as it also > disables normal interrupts. You're not commenting on the stack aspect and previous approach at all: Assuming your self_nmi() approach at least worked somewhere, that somewhere would be the place where the "int $2" approach would break. In other words - are you confident that NMI is _always_ masked when we get there (and hence your earlier approach _never_ worked)? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:56:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:56:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHuX-0005Ms-QX; Tue, 13 Nov 2012 14:56:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHuW-0005Mn-LP for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:56:20 +0000 Received: from [85.158.139.211:41586] by server-14.bemta-5.messagelabs.com id 0A/90-21768-39F52A05; Tue, 13 Nov 2012 14:56:19 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1352818574!20052651!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12170 invoked from network); 13 Nov 2012 14:56:14 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-16.tower-206.messagelabs.com with SMTP; 13 Nov 2012 14:56:14 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 14:56:28 +0000 Message-Id: <50A26D9C02000078000A8322@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 14:56:12 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> In-Reply-To: <20121113144356.GG44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 15:43, Tim Deegan wrote: > The fact that there was a loop and not just a delay in the NMI handling > suggests that VMENTER does indeed re-enable NMIs (or at least > NMI-exiting) but I couldn't find that in the manual. In any case, I > think the int $2 version is correcter than the direct call as it also > disables normal interrupts. You're not commenting on the stack aspect and previous approach at all: Assuming your self_nmi() approach at least worked somewhere, that somewhere would be the place where the "int $2" approach would break. In other words - are you confident that NMI is _always_ masked when we get there (and hence your earlier approach _never_ worked)? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 14:57:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHvM-0005RI-H2; Tue, 13 Nov 2012 14:57:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHvK-0005Qj-LI; Tue, 13 Nov 2012 14:57:10 +0000 Received: from [85.158.138.51:5653] by server-11.bemta-3.messagelabs.com id 3D/D0-19361-5CF52A05; Tue, 13 Nov 2012 14:57:09 +0000 X-Env-Sender: lars.kurth.xen@gmail.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352818625!27954197!1 X-Originating-IP: [209.85.217.173] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10193 invoked from network); 13 Nov 2012 14:57:06 -0000 Received: from mail-lb0-f173.google.com (HELO mail-lb0-f173.google.com) (209.85.217.173) by server-15.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 14:57:06 -0000 Received: by mail-lb0-f173.google.com with SMTP id gj3so6543077lbb.32 for ; Tue, 13 Nov 2012 06:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:reply-to:user-agent:mime-version:to :subject:content-type; bh=BbAEHisWirs2G7e6bAtp6BSTPP5hqPHYnObJoDM2uPM=; b=Xweg0d3i5lWzo0TU8wLsUee3fEp1YNMzzGVhPFTjmr1iOqeUP2j9cfmG6YSRiAYbku uUmjBsurdwDur9/zmX0pnMsB4PbAo926872kWfSDNL/ZhsnS0JNqnY3BBwGDBiN4XAR0 fw7vDUbGDyc76lseXHO9pIloiRI7a+EUdWDqiMlQtkf9VUd+GXywiGp+ocWi5p49z381 cLLz1nvqquslBYgs+yg8VTfQMIzQCHB8zGOXzb+h+0l1lkU1UswPOn5RzsGyk+jd80xU Mq9NC2jXt/nKGOrUoX/YES3u7ua9+k9OQqyZxIThsaykhUOTCBgrWvyO1QQJHByMTK/d i4Uw== Received: by 10.112.38.70 with SMTP id e6mr3005096lbk.64.1352818625096; Tue, 13 Nov 2012 06:57:05 -0800 (PST) Received: from [172.16.26.11] (b0fb37e5.bb.sky.com. [176.251.55.229]) by mx.google.com with ESMTPS id m6sm3895315lbh.10.2012.11.13.06.56.55 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 06:57:04 -0800 (PST) Message-ID: <50A25FA4.10308@xen.org> Date: Tue, 13 Nov 2012 14:56:36 +0000 From: Lars Kurth User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" , "xen-api@lists.xen.org" , xen-users@lists.xen.org, xen-arm@lists.xen.org Subject: [Xen-devel] Changes to the xen.org site X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: lars.kurth@xen.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5621166146042010238==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --===============5621166146042010238== Content-Type: multipart/alternative; boundary="------------030203000801050700050209" This is a multi-part message in MIME format. --------------030203000801050700050209 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi everybody, I spent a bit of time cleaning up some lose ends on the xen.org site. If you notice any broken links, typos, etc. do let me know. I did the following * Archived XCI * Clearly marked HXEN and Satori project pages to show that these projects are also archived * Replaced the "Products > Projects" menu and pages with a "Products > Governance" menu and page (linking to anything related to governance). The reason is that "Products > Products" and "Products > Projects" were nearly identical and that I kept on getting questions on where to find governance related info. * Minor fixes on various pages You may have to clear your browser cache such that the javascript files reload. The site will still work correctly if you don't, but the "Products > Projects" menu won't rename and point to the new location until the js files have been reloaded by your browser. Regards Lars --------------030203000801050700050209 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi everybody,

I spent a bit of time cleaning up some lose ends on the xen.org site. If you notice any broken links, typos, etc. do let me know. I did the following
  • Archived XCI
  • Clearly marked HXEN and Satori project pages to show that these projects are also archived
  • Replaced the "Products > Projects" menu and pages with a "Products > Governance" menu and page (linking to anything related to governance). The reason is that "Products > Products" and "Products > Projects" were nearly identical and that I kept on getting questions on where to find governance related info.
  • Minor fixes on various pages
You may have to clear your browser cache such that the javascript files reload. The site will still work correctly if you don't, but the "Products > Projects" menu won't rename and point to the new location until the js files have been reloaded by your browser.

Regards
Lars
--------------030203000801050700050209-- --===============5621166146042010238== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5621166146042010238==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 14:57:25 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 14:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHvM-0005RI-H2; Tue, 13 Nov 2012 14:57:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHvK-0005Qj-LI; Tue, 13 Nov 2012 14:57:10 +0000 Received: from [85.158.138.51:5653] by server-11.bemta-3.messagelabs.com id 3D/D0-19361-5CF52A05; Tue, 13 Nov 2012 14:57:09 +0000 X-Env-Sender: lars.kurth.xen@gmail.com X-Msg-Ref: server-15.tower-174.messagelabs.com!1352818625!27954197!1 X-Originating-IP: [209.85.217.173] X-SpamReason: No, hits=0.4 required=7.0 tests=HTML_30_40,HTML_MESSAGE, RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10193 invoked from network); 13 Nov 2012 14:57:06 -0000 Received: from mail-lb0-f173.google.com (HELO mail-lb0-f173.google.com) (209.85.217.173) by server-15.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 14:57:06 -0000 Received: by mail-lb0-f173.google.com with SMTP id gj3so6543077lbb.32 for ; Tue, 13 Nov 2012 06:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:reply-to:user-agent:mime-version:to :subject:content-type; bh=BbAEHisWirs2G7e6bAtp6BSTPP5hqPHYnObJoDM2uPM=; b=Xweg0d3i5lWzo0TU8wLsUee3fEp1YNMzzGVhPFTjmr1iOqeUP2j9cfmG6YSRiAYbku uUmjBsurdwDur9/zmX0pnMsB4PbAo926872kWfSDNL/ZhsnS0JNqnY3BBwGDBiN4XAR0 fw7vDUbGDyc76lseXHO9pIloiRI7a+EUdWDqiMlQtkf9VUd+GXywiGp+ocWi5p49z381 cLLz1nvqquslBYgs+yg8VTfQMIzQCHB8zGOXzb+h+0l1lkU1UswPOn5RzsGyk+jd80xU Mq9NC2jXt/nKGOrUoX/YES3u7ua9+k9OQqyZxIThsaykhUOTCBgrWvyO1QQJHByMTK/d i4Uw== Received: by 10.112.38.70 with SMTP id e6mr3005096lbk.64.1352818625096; Tue, 13 Nov 2012 06:57:05 -0800 (PST) Received: from [172.16.26.11] (b0fb37e5.bb.sky.com. [176.251.55.229]) by mx.google.com with ESMTPS id m6sm3895315lbh.10.2012.11.13.06.56.55 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 06:57:04 -0800 (PST) Message-ID: <50A25FA4.10308@xen.org> Date: Tue, 13 Nov 2012 14:56:36 +0000 From: Lars Kurth User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: "xen-devel@lists.xen.org" , "xen-api@lists.xen.org" , xen-users@lists.xen.org, xen-arm@lists.xen.org Subject: [Xen-devel] Changes to the xen.org site X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: lars.kurth@xen.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============5621166146042010238==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --===============5621166146042010238== Content-Type: multipart/alternative; boundary="------------030203000801050700050209" This is a multi-part message in MIME format. --------------030203000801050700050209 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi everybody, I spent a bit of time cleaning up some lose ends on the xen.org site. If you notice any broken links, typos, etc. do let me know. I did the following * Archived XCI * Clearly marked HXEN and Satori project pages to show that these projects are also archived * Replaced the "Products > Projects" menu and pages with a "Products > Governance" menu and page (linking to anything related to governance). The reason is that "Products > Products" and "Products > Projects" were nearly identical and that I kept on getting questions on where to find governance related info. * Minor fixes on various pages You may have to clear your browser cache such that the javascript files reload. The site will still work correctly if you don't, but the "Products > Projects" menu won't rename and point to the new location until the js files have been reloaded by your browser. Regards Lars --------------030203000801050700050209 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi everybody,

I spent a bit of time cleaning up some lose ends on the xen.org site. If you notice any broken links, typos, etc. do let me know. I did the following
  • Archived XCI
  • Clearly marked HXEN and Satori project pages to show that these projects are also archived
  • Replaced the "Products > Projects" menu and pages with a "Products > Governance" menu and page (linking to anything related to governance). The reason is that "Products > Products" and "Products > Projects" were nearly identical and that I kept on getting questions on where to find governance related info.
  • Minor fixes on various pages
You may have to clear your browser cache such that the javascript files reload. The site will still work correctly if you don't, but the "Products > Projects" menu won't rename and point to the new location until the js files have been reloaded by your browser.

Regards
Lars
--------------030203000801050700050209-- --===============5621166146042010238== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============5621166146042010238==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 15:02:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:02:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI0a-00066X-J3; Tue, 13 Nov 2012 15:02:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI0Y-00065n-OI for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:02:34 +0000 Received: from [85.158.143.99:35934] by server-2.bemta-4.messagelabs.com id 82/C0-28922-A0162A05; Tue, 13 Nov 2012 15:02:34 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352818952!28849125!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3ODY1OQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31064 invoked from network); 13 Nov 2012 15:02:33 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-13.tower-216.messagelabs.com with SMTP; 13 Nov 2012 15:02:33 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 13 Nov 2012 07:02:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,767,1344236400"; d="scan'208";a="248412728" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by fmsmga002.fm.intel.com with ESMTP; 13 Nov 2012 07:02:32 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 07:02:31 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 07:02:31 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 23:02:29 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFggAAyLdWAADp0YA== Date: Tue, 13 Nov 2012 15:02:29 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> In-Reply-To: <50A23C0C02000078000A8085@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 7:25 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 12:13, "Zhang, Yang Z" wrote: > > Jan Beulich wrote on 2012-11-13: > >>>>> On 13.11.12 at 09:50, "Zhang, Xiantao" > wrote: > >>>> From: Jan Beulich [mailto:JBeulich@suse.com] Bottom line - I'm > >>>> seeking advice as to whether working around this problem in the > >>>> IOMMU code is desirable/necessary, or whether this is a design flaw > >>>> on the device's side that just cannot be tolerated with an IOMMU in > >>>> the picture (which would need good reasoning, so that a customer > >>>> expecting such a device to work regardless of IOMMU usage can > >>>> understand that this cannot reasonably be made work). > > > > Why not just disable the IOMMU in this case ? > > Because that disables (secure) pass through of other devices. > > >>> The issue is why the non-zero functions don't claim themselves > >>> during PCI bus scan. > >> > >> As said - I can't tell whether there is a secondary function in the > >> first place (and I didn't try to find out because it doesn't really > >> matter for the purpose of finding a solution/workaround). > > > > If software cannot see it, then how to use it? If there still have an > > approach to detect it, then xen can do it too and setup the context > > entry as passthrough. > > We see it the latest at the point the fault occurs. So there are multiple > options: > a) if the device is "real" as in having a valid config space despite > func 0 not advertising itself as multi-function, we have ways to > discover the device (at boot time) I think current Xen logic also covers multi-function devices case. When Xen boots up, it will scan all functions of devices on each bus, through reads their vendor ID. If the vendor ID is valid, Xen deems this BDF has a real device/function existed there > b) we could insert the context entry in the fault handler, assuming > the device is able to recover At least current VT-d doesn't have recovery fault supported, so each triggered faults are fatal. > c) we could provide a command line option to allow fake devices to > be create Agree, this maybe a feasible solution I can figure out, so far. > d) we could create context entries for all BDFs, whether or not a > device exists there As I said, this maybe bring security issue. Even for the iommu-passthrough option, it is also not suggested to be used if security is considered. > Does any of these have obvious downsides? > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:02:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:02:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI0a-00066X-J3; Tue, 13 Nov 2012 15:02:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI0Y-00065n-OI for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:02:34 +0000 Received: from [85.158.143.99:35934] by server-2.bemta-4.messagelabs.com id 82/C0-28922-A0162A05; Tue, 13 Nov 2012 15:02:34 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352818952!28849125!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3ODY1OQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31064 invoked from network); 13 Nov 2012 15:02:33 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-13.tower-216.messagelabs.com with SMTP; 13 Nov 2012 15:02:33 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 13 Nov 2012 07:02:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,767,1344236400"; d="scan'208";a="248412728" Received: from fmsmsx108.amr.corp.intel.com ([10.19.9.228]) by fmsmga002.fm.intel.com with ESMTP; 13 Nov 2012 07:02:32 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.19.9.53) by FMSMSX108.amr.corp.intel.com (10.19.9.228) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 07:02:31 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX102.amr.corp.intel.com (10.19.9.53) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 07:02:31 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.186]) with mapi id 14.01.0355.002; Tue, 13 Nov 2012 23:02:29 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFggAAyLdWAADp0YA== Date: Tue, 13 Nov 2012 15:02:29 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> In-Reply-To: <50A23C0C02000078000A8085@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 7:25 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 12:13, "Zhang, Yang Z" wrote: > > Jan Beulich wrote on 2012-11-13: > >>>>> On 13.11.12 at 09:50, "Zhang, Xiantao" > wrote: > >>>> From: Jan Beulich [mailto:JBeulich@suse.com] Bottom line - I'm > >>>> seeking advice as to whether working around this problem in the > >>>> IOMMU code is desirable/necessary, or whether this is a design flaw > >>>> on the device's side that just cannot be tolerated with an IOMMU in > >>>> the picture (which would need good reasoning, so that a customer > >>>> expecting such a device to work regardless of IOMMU usage can > >>>> understand that this cannot reasonably be made work). > > > > Why not just disable the IOMMU in this case ? > > Because that disables (secure) pass through of other devices. > > >>> The issue is why the non-zero functions don't claim themselves > >>> during PCI bus scan. > >> > >> As said - I can't tell whether there is a secondary function in the > >> first place (and I didn't try to find out because it doesn't really > >> matter for the purpose of finding a solution/workaround). > > > > If software cannot see it, then how to use it? If there still have an > > approach to detect it, then xen can do it too and setup the context > > entry as passthrough. > > We see it the latest at the point the fault occurs. So there are multiple > options: > a) if the device is "real" as in having a valid config space despite > func 0 not advertising itself as multi-function, we have ways to > discover the device (at boot time) I think current Xen logic also covers multi-function devices case. When Xen boots up, it will scan all functions of devices on each bus, through reads their vendor ID. If the vendor ID is valid, Xen deems this BDF has a real device/function existed there > b) we could insert the context entry in the fault handler, assuming > the device is able to recover At least current VT-d doesn't have recovery fault supported, so each triggered faults are fatal. > c) we could provide a command line option to allow fake devices to > be create Agree, this maybe a feasible solution I can figure out, so far. > d) we could create context entries for all BDFs, whether or not a > device exists there As I said, this maybe bring security issue. Even for the iommu-passthrough option, it is also not suggested to be used if security is considered. > Does any of these have obvious downsides? > > Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:05:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:05:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI3O-0006O2-FS; Tue, 13 Nov 2012 15:05:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI1i-0006FD-LG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:03:52 +0000 Received: from [85.158.137.99:17630] by server-10.bemta-3.messagelabs.com id 20/74-19806-15162A05; Tue, 13 Nov 2012 15:03:45 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352819022!12090297!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 13 Nov 2012 15:03:43 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:03:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15781742" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:03:39 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 15:03:38 +0000 Message-ID: <1352819016.7491.84.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Fioravante, Matthew E." Date: Tue, 13 Nov 2012 15:03:36 +0000 In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 15:05:28 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 14:58 +0000, Fioravante, Matthew E. wrote: > Should I have removed vtpm from xm also? I left it alone because xm is depcrecated. Is xend broken by this change when not using the vtpm features? Or just some functionality (which never worked right) went away? I'm happy to leave xend alone so long as it works as well as it ever did for people not using vtpm. > > -----Original Message----- > From: Ian Campbell [mailto:Ian.Campbell@citrix.com] > Sent: Tuesday, November 13, 2012 5:49 AM > To: Fioravante, Matthew E. > Cc: xen-devel@lists.xen.org; Stefano Stabellini > Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model > > On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > > Remove the old vtpm process model. It doesn't work very > > well and is no longer supported. > > > > Signed-off-by: Matthew Fioravante > > Acked-by: Ian Campbell > > > > > diff --git a/tools/Makefile b/tools/Makefile > > index d8c8cc0..2ca43b9 100644 > > --- a/tools/Makefile > > +++ b/tools/Makefile > > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > > SUBDIRS-$(CONFIG_X86) += firmware > > SUBDIRS-y += console > > SUBDIRS-y += xenmon > > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > > -SUBDIRS-$(VTPM_TOOLS) += vtpm > > SUBDIRS-y += xenstat > > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > > SUBDIRS-$(CONFIG_Linux) += memshr > > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > > index 631306b..90a6b85 100644 > > --- a/tools/blktap2/drivers/hashtable.c > > +++ b/tools/blktap2/drivers/hashtable.c > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable.c > > - * - tools/vtpm_manager/util/hashtable.c > > */ > > > > #include "hashtable.h" > > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > > index 89aa3dc..56ca053 100644 > > --- a/tools/blktap2/drivers/hashtable.h > > +++ b/tools/blktap2/drivers/hashtable.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable.h > > - * - tools/vtpm_manager/util/hashtable.h > > */ > > > > #ifndef __HASHTABLE_CWC22_H__ > > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > > index 402e06b..731917c 100644 > > --- a/tools/blktap2/drivers/hashtable_itr.c > > +++ b/tools/blktap2/drivers/hashtable_itr.c > > @@ -1,10 +1,5 @@ > > /* Copyright (C) 2002, 2004 Christopher Clark */ > > > > -/* > > - * There are duplicates of this code in: > > - * - tools/vtpm_manager/util/hashtable_itr.c > > - */ > > - > > #include "hashtable.h" > > #include "hashtable_private.h" > > #include "hashtable_itr.h" > > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > > index 3d80638..81da838 100644 > > --- a/tools/blktap2/drivers/hashtable_itr.h > > +++ b/tools/blktap2/drivers/hashtable_itr.h > > @@ -1,10 +1,5 @@ > > /* Copyright (C) 2002, 2004 Christopher Clark */ > > > > -/* > > - * There are duplicates of this code in: > > - * - tools/vtpm_manager/util/hashtable_itr.h > > - */ > > - > > #ifndef __HASHTABLE_ITR_CWC22__ > > #define __HASHTABLE_ITR_CWC22__ > > #include "hashtable.h" > > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > > index 5a13a65..954ecc3 100644 > > --- a/tools/blktap2/drivers/hashtable_private.h > > +++ b/tools/blktap2/drivers/hashtable_private.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable_private.h > > - * - tools/vtpm_manager/util/hashtable_private.h > > */ > > > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > diff --git a/tools/configure.ac b/tools/configure.ac > > index e708f01..586313d 100644 > > --- a/tools/configure.ac > > +++ b/tools/configure.ac > > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > > # Enable/disable options > > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > > diff --git a/tools/examples/README b/tools/examples/README > > index 5b0314e..2225d5c 100644 > > --- a/tools/examples/README > > +++ b/tools/examples/README > > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > > vif-common.sh - sourced by vif-bridge > > vif-nat - xen virtual network start/stop script in NAT mode > > vif-route - xen virtual network start/stop script in routed mode > > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > > -vtpm-common.sh - common code for vTPM handling > > -vtpm-delete - remove an entry from the vTPM table given the > > - domain's name > > -vtpm-hotplug-common.sh - sourced by vtpm > > -vtpm-migration.sh - sourced by external-device-migrate > > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > > devices > > xen-backend.rules - hotplug script rules > > xend-config.sxp - default xend configuration file > > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > > index 85f847c..e04e6c1 100644 > > --- a/tools/examples/xmexample.pv-grub > > +++ b/tools/examples/xmexample.pv-grub > > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = [ 'instance=1,backend=0' ] > > - > > -#---------------------------------------------------------------------------- > > # Configure the behaviour when a domain exits. There are three 'reasons' > > # for a domain to stop: poweroff, reboot, and crash. For each of these you > > # may specify: > > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > > index 330aaf0..c951200 100644 > > --- a/tools/examples/xmexample1 > > +++ b/tools/examples/xmexample1 > > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = [ 'instance=1,backend=0' ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > > index 4e5eb3d..8c5137e 100644 > > --- a/tools/examples/xmexample2 > > +++ b/tools/examples/xmexample2 > > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > > index dc22ce1..ae799f9 100644 > > --- a/tools/examples/xmexample3 > > +++ b/tools/examples/xmexample3 > > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > > index 0166790..0605559 100644 > > --- a/tools/hotplug/Linux/Makefile > > +++ b/tools/hotplug/Linux/Makefile > > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > > XEN_SCRIPTS += block > > XEN_SCRIPTS += block-enbd block-nbd > > XEN_SCRIPTS += blktap > > -XEN_SCRIPTS += vtpm vtpm-delete > > XEN_SCRIPTS += xen-hotplug-cleanup > > XEN_SCRIPTS += external-device-migrate > > XEN_SCRIPTS += vscsi > > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > > +XEN_SCRIPT_DATA += block-common.sh > > > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > > UDEV_RULES = xen-backend.rules xend.rules > > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > > deleted file mode 100644 > > index 38a4532..0000000 > > --- a/tools/hotplug/Linux/vtpm > > +++ /dev/null > > @@ -1,22 +0,0 @@ > > -#!/bin/bash > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-hotplug-common.sh" > > - > > -vtpm_fatal_error=0 > > - > > -case "$command" in > > - add) > > - vtpm_create_instance > > - ;; > > - remove) > > - vtpm_remove_instance > > - ;; > > -esac > > - > > -if [ $vtpm_fatal_error -eq 0 ]; then > > - log debug "Successful vTPM operation '$command'." > > - success > > -else > > - fatal "Error while executing vTPM operation '$command'." > > -fi > > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > > deleted file mode 100644 > > index d0d7935..0000000 > > --- a/tools/hotplug/Linux/vtpm-common.sh > > +++ /dev/null > > @@ -1,448 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# Copyright (c) 2005 XenSource Ltd. > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/logging.sh" > > -. "$dir/locking.sh" > > - > > -VTPMDB="/var/vtpm/vtpm.db" > > - > > -#In the vtpm-impl file some commands should be defined: > > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > > -if [ -r "$dir/vtpm-impl.alt" ]; then > > - . "$dir/vtpm-impl.alt" > > -elif [ -r "$dir/vtpm-impl" ]; then > > - . "$dir/vtpm-impl" > > -else > > - function vtpm_create () { > > - true > > - } > > - function vtpm_setup() { > > - true > > - } > > - function vtpm_start() { > > - true > > - } > > - function vtpm_suspend() { > > - true > > - } > > - function vtpm_resume() { > > - true > > - } > > - function vtpm_delete() { > > - true > > - } > > - function vtpm_migrate() { > > - echo "Error: vTPM migration accross machines not implemented." > > - } > > - function vtpm_migrate_local() { > > - echo "Error: local vTPM migration not supported" > > - } > > - function vtpm_migrate_recover() { > > - true > > - } > > -fi > > - > > - > > -#Find the instance number for the vtpm given the name of the domain > > -# Parameters > > -# - vmname : the name of the vm > > -# Return value > > -# Returns '0' if instance number could not be found, otherwise > > -# it returns the instance number in the variable 'instance' > > -function vtpmdb_find_instance () { > > - local vmname ret instance > > - vmname=$1 > > - ret=0 > > - > > - instance=$(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - '{ \ > > - if ( 1 != index($1,"#")) { \ > > - if ( $1 == vmname ) { \ > > - print $2; \ > > - exit; \ > > - } \ > > - } \ > > - }') > > - if [ "$instance" != "" ]; then > > - ret=$instance > > - fi > > - echo "$ret" > > -} > > - > > - > > -# Check whether a particular instance number is still available > > -# returns "0" if it is not available, "1" otherwise. > > -function vtpmdb_is_free_instancenum () { > > - local instance instances avail i > > - instance=$1 > > - avail=1 > > - #Allowed instance number range: 1-255 > > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > > - avail=0 > > - else > > - instances=$(cat $VTPMDB | \ > > - awk \ > > - '{ \ > > - if (1 != index($1,"#")) { \ > > - printf("%s ",$2); \ > > - } \ > > - }') > > - for i in $instances; do > > - if [ $i -eq $instance ]; then > > - avail=0 > > - break > > - fi > > - done > > - fi > > - echo "$avail" > > -} > > - > > - > > -# Get an available instance number given the database > > -# Returns an unused instance number > > -function vtpmdb_get_free_instancenum () { > > - local ctr instances don found > > - instances=$(cat $VTPMDB | \ > > - awk \ > > - '{ \ > > - if (1 != index($1,"#")) { \ > > - printf("%s ",$2); \ > > - } \ > > - }') > > - ctr=1 > > - don=0 > > - while [ $don -eq 0 ]; do > > - found=0 > > - for i in $instances; do > > - if [ $i -eq $ctr ]; then > > - found=1; > > - break; > > - fi > > - done > > - > > - if [ $found -eq 0 ]; then > > - don=1 > > - break > > - fi > > - let ctr=ctr+1 > > - done > > - echo "$ctr" > > -} > > - > > - > > -# Add a domain name and instance number to the DB file > > -function vtpmdb_add_instance () { > > - local res vmname inst > > - vmname=$1 > > - inst=$2 > > - > > - if [ ! -f $VTPMDB ]; then > > - echo "#Database for VM to vTPM association" > $VTPMDB > > - echo "#1st column: domain name" >> $VTPMDB > > - echo "#2nd column: TPM instance number" >> $VTPMDB > > - fi > > - res=$(vtpmdb_validate_entry $vmname $inst) > > - if [ $res -eq 0 ]; then > > - echo "$vmname $inst" >> $VTPMDB > > - fi > > -} > > - > > - > > -#Validate whether an entry is the same as passed to this > > -#function > > -function vtpmdb_validate_entry () { > > - local res rc vmname inst > > - rc=0 > > - vmname=$1 > > - inst=$2 > > - > > - res=$(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - -vinst=$inst \ > > - '{ \ > > - if ( 1 == index($1,"#")) {\ > > - } else \ > > - if ( $1 == vmname && \ > > - $2 == inst) { \ > > - printf("1"); \ > > - exit; \ > > - } else \ > > - if ( $1 == vmname || \ > > - $2 == inst) { \ > > - printf("2"); \ > > - exit; \ > > - } \ > > - }') > > - > > - if [ "$res" == "1" ]; then > > - rc=1 > > - elif [ "$res" == "2" ]; then > > - rc=2 > > - fi > > - echo "$rc" > > -} > > - > > - > > -#Remove an entry from the vTPM database given its domain name > > -#and instance number > > -function vtpmdb_remove_entry () { > > - local vmname instance VTPMDB_TMP > > - vmname=$1 > > - instance=$2 > > - VTPMDB_TMP="$VTPMDB".tmp > > - > > - $(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - '{ \ > > - if ( $1 != vmname ) { \ > > - print $0; \ > > - } \ > > - '} > $VTPMDB_TMP) > > - if [ -e $VTPMDB_TMP ]; then > > - mv -f $VTPMDB_TMP $VTPMDB > > - vtpm_delete $instance > > - else > > - log err "Error creating temporary file '$VTPMDB_TMP'." > > - fi > > -} > > - > > - > > -# Find the reason for the creation of this device: > > -# Returns 'resume' or 'create' > > -function vtpm_get_create_reason () { > > - local resume > > - resume=$(xenstore_read $XENBUS_PATH/resume) > > - if [ "$resume" == "True" ]; then > > - echo "resume" > > - else > > - echo "create" > > - fi > > -} > > - > > - > > -#Create a vTPM instance > > -# If no entry in the TPM database is found, the instance is > > -# created and an entry added to the database. > > -function vtpm_create_instance () { > > - local res instance domname reason uuid > > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > > - reason=$(vtpm_get_create_reason) > > - > > - claim_lock vtpmdb > > - > > - instance="0" > > - > > - if [ "$uuid" != "" ]; then > > - instance=$(vtpmdb_find_instance $uuid) > > - fi > > - if [ "$instance" == "0" ]; then > > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > > - instance=$(vtpmdb_find_instance $domname) > > - fi > > - > > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > > - release_lock vtpmdb > > - return > > - fi > > - > > - if [ "$instance" == "0" ]; then > > - #Try to give the preferred instance to the domain > > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > > - if [ "$instance" != "" ]; then > > - res=$(vtpmdb_is_free_instancenum $instance) > > - if [ $res -eq 0 ]; then > > - instance=$(vtpmdb_get_free_instancenum) > > - fi > > - else > > - instance=$(vtpmdb_get_free_instancenum) > > - fi > > - > > - vtpm_create $instance > > - > > - if [ $vtpm_fatal_error -eq 0 ]; then > > - if [ "$uuid" != "" ]; then > > - vtpmdb_add_instance $uuid $instance > > - else > > - vtpmdb_add_instance $domname $instance > > - fi > > - fi > > - else > > - if [ "$reason" == "resume" ]; then > > - vtpm_resume $instance > > - else > > - vtpm_start $instance > > - fi > > - fi > > - > > - release_lock vtpmdb > > - > > - xenstore_write $XENBUS_PATH/instance $instance > > -} > > - > > - > > -#Remove an instance when a VM is terminating or suspending. > > -#Since it is assumed that the VM will appear again, the > > -#entry is kept in the VTPMDB file. > > -function vtpm_remove_instance () { > > - local instance reason domname uuid > > - #Stop script execution quietly if path does not exist (anymore) > > - xenstore-exists "$XENBUS_PATH"/domain > > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > > - > > - claim_lock vtpmdb > > - > > - instance="0" > > - > > - if [ "$uuid" != "" ]; then > > - instance=$(vtpmdb_find_instance $uuid) > > - fi > > - > > - if [ "$instance" == "0" ]; then > > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > > - instance=$(vtpmdb_find_instance $domname) > > - fi > > - > > - if [ "$instance" != "0" ]; then > > - vtpm_suspend $instance > > - fi > > - > > - release_lock vtpmdb > > -} > > - > > - > > -#Remove an entry in the VTPMDB file given the domain's name > > -#1st parameter: The name of the domain > > -function vtpm_delete_instance () { > > - local instance > > - > > - claim_lock vtpmdb > > - > > - instance=$(vtpmdb_find_instance $1) > > - if [ "$instance" != "0" ]; then > > - vtpmdb_remove_entry $1 $instance > > - fi > > - > > - release_lock vtpmdb > > -} > > - > > -# Determine whether the given address is local to this machine > > -# Return values: > > -# "-1" : the given machine name is invalid > > -# "0" : this is not an address of this machine > > -# "1" : this is an address local to this machine > > -function vtpm_isLocalAddress() { > > - local addr res > > - addr=$(ping $1 -c 1 | \ > > - awk '{ print substr($3,2,length($3)-2); exit }') > > - if [ "$addr" == "" ]; then > > - echo "-1" > > - return > > - fi > > - res=$(ifconfig | grep "inet addr" | \ > > - awk -vaddr=$addr \ > > - '{ \ > > - if ( addr == substr($2, 6)) {\ > > - print "1"; \ > > - } \ > > - }' \ > > - ) > > - if [ "$res" == "" ]; then > > - echo "0" > > - return > > - fi > > - echo "1" > > -} > > - > > -# Perform a migration step. This function differentiates between migration > > -# to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host to migrate to > > -# 2nd: name of the domain to migrate > > -# 3rd: the migration step to perform > > -function vtpm_migration_step() { > > - local res=$(vtpm_isLocalAddress $1) > > - if [ "$res" == "0" ]; then > > - vtpm_migrate $1 $2 $3 > > - else > > - vtpm_migrate_local > > - fi > > -} > > - > > -# Recover from migration due to an error. This function differentiates > > -# between migration to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host the migration was going to > > -# 2nd: name of the domain that was to be migrated > > -# 3rd: the last successful migration step that was done > > -function vtpm_recover() { > > - local res > > - res=$(vtpm_isLocalAddress $1) > > - if [ "$res" == "0" ]; then > > - vtpm_migrate_recover $1 $2 $3 > > - fi > > -} > > - > > - > > -#Determine the domain id given a domain's name. > > -#1st parameter: name of the domain > > -#return value: domain id or -1 if domain id could not be determined > > -function vtpm_domid_from_name () { > > - local id name ids > > - ids=$(xenstore-list /local/domain) > > - for id in $ids; do > > - name=$(xenstore-read /local/domain/$id/name) > > - if [ "$name" == "$1" ]; then > > - echo "$id" > > - return > > - fi > > - done > > - echo "-1" > > -} > > - > > -#Determine the virtual TPM's instance number using the domain ID. > > -#1st parm: domain ID > > -function vtpm_uuid_by_domid() { > > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > > -} > > - > > - > > -# Determine the vTPM's UUID by the name of the VM > > -function vtpm_uuid_from_vmname() { > > - local domid=$(vtpm_domid_from_name $1) > > - if [ "$domid" != "-1" ]; then > > - echo $(vtpm_uuid_by_domid $domid) > > - return > > - fi > > - echo "" > > -} > > - > > -#Add a virtual TPM instance number and its associated domain name > > -#to the VTPMDB file and activate usage of this virtual TPM instance > > -#by writing the instance number into the xenstore > > -#1st parm: name of virtual machine > > -#2nd parm: instance of associated virtual TPM > > -function vtpm_add_and_activate() { > > - local domid=$(vtpm_domid_from_name $1) > > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > > - vtpmdb_add_instance $vtpm_uuid $2 > > - xenstore-write backend/vtpm/$domid/0/instance $2 > > - fi > > -} > > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > > deleted file mode 100644 > > index b75b95b..0000000 > > --- a/tools/hotplug/Linux/vtpm-delete > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -#!/bin/bash > > - > > -# This scripts must be called the following way: > > -# vtpm-delete > > -# or > > -# vtpm-delete --vmname > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-common.sh" > > - > > -if [ "$1" == "--vmname" ]; then > > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > > - if [ "$vtpm_uuid" != "" ];then > > - vtpm_delete_instance $vtpm_uuid > > - fi > > -else > > - vtpm_delete_instance $1 > > -fi > > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > > deleted file mode 100644 > > index 9fd35e7..0000000 > > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > > +++ /dev/null > > @@ -1,35 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# Copyright (c) 2005 XenSource Ltd. > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/xen-hotplug-common.sh" > > - > > -findCommand "$@" > > -if [ "$command" != "online" ] && > > - [ "$command" != "offline" ] && > > - [ "$command" != "add" ] && > > - [ "$command" != "remove" ] > > -then > > - log err "Invalid command: $command" > > - exit 1 > > -fi > > - > > - > > -XENBUS_PATH="${XENBUS_PATH:?}" > > - > > -. "$dir/vtpm-common.sh" > > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > > deleted file mode 100644 > > index 4f9a1fd..0000000 > > --- a/tools/hotplug/Linux/vtpm-impl > > +++ /dev/null > > @@ -1,208 +0,0 @@ > > -#!/bin/bash > > -# =================================================================== > > -# > > -# Copyright (c) 2005, Intel Corp. > > -# All rights reserved. > > -# > > -# Redistribution and use in source and binary forms, with or without > > -# modification, are permitted provided that the following conditions > > -# are met: > > -# > > -# * Redistributions of source code must retain the above copyright > > -# notice, this list of conditions and the following disclaimer. > > -# * Redistributions in binary form must reproduce the above > > -# copyright notice, this list of conditions and the following > > -# disclaimer in the documentation and/or other materials provided > > -# with the distribution. > > -# * Neither the name of Intel Corporation nor the names of its > > -# contributors may be used to endorse or promote products derived > > -# from this software without specific prior written permission. > > -# > > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -# OF THE POSSIBILITY OF SUCH DAMAGE. > > -# =================================================================== > > - > > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > > - > > -TPM_TYPE_PVM=\\x01 > > -TPM_TYPE_HVM=\\x02 > > - > > -TPM_SUCCESS=00000000 > > - > > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > > - > > -VTPM_MIG=/usr/bin/vtpm_migrator > > - > > -# -------------------- Helpers for binary streams ----------- > > - > > -function str_to_hex32() { > > - printf "%0.8x" $1 > > -} > > - > > -function hex32_to_bin() { > > - local inst=$(str_to_hex32 $1); > > - > > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > > - > > - echo "$n1$n2$n3$n4" > > -} > > - > > -function vtpm_manager_cmd() { > > - local cmd=$1; > > - local inst=$2; > > - local inst_bin=$(hex32_to_bin $inst); > > - > > - claim_lock vtpm_mgr > > - > > - #send cmd to vtpm_manager > > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > > - > > - #recv response > > - set +e > > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > > - set -e > > - > > - release_lock vtpm_mgr > > - > > - #return whether the command was successful > > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > > - vtpm_fatal_error=1 > > - false > > - else > > - true > > - fi > > -} > > - > > -# Helper to get vm type to pass to vtpm_manager open/resume > > -function vtpm_get_type() { > > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > > - local vm=$(xenstore_read /local/domain/$inst/vm) > > - if [ "$vm" != "" ]; then > > - local ostype=$(xenstore-read $vm/image/ostype) > > - if [ "$ostype" == "hvm" ]; then > > - echo $TPM_TYPE_HVM; > > - else > > - echo $TPM_TYPE_PVM; > > - fi > > - fi > > -} > > - > > -# ------------------ Command handlers ----------------- > > - > > -# Create new vtpm instance & set it up for use > > -function vtpm_create () { > > - # Creation is handled implicitly by the manager on first setup > > - # so just set it up for use > > - $(vtpm_start $1) > > -} > > - > > -# Setup vtpm instance for use. > > -function vtpm_start() { > > - local vmtype=$(vtpm_get_type); > > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > > -} > > - > > -function vtpm_resume() { > > - local vmtype=$(vtpm_get_type); > > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > > -} > > - > > -# Reset the vtpm AKA clear PCRs > > -function vtpm_reset() { > > - #not used by current implemenation > > - true > > -} > > - > > -# Shutdown the vtpm while the vm is down > > -# This could be a suspend of shutdown > > -# we cannot distinquish, so save the state > > -# and decide on startup if we should keep is > > -function vtpm_suspend() { > > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > > -} > > - > > - > > -function vtpm_delete() { > > - local inst=$1 > > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > > - rm -f /var/vtpm/vtpm_dm_$1.data > > - true > > - else > > - vtpm_fatal_error=1 > > - false > > - fi > > -} > > - > > -# Perform a migration step. This function differentiates between migration > > -# to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host to migrate to > > -# 2nd: name of the domain to migrate > > -# 3rd: the migration step to perform > > -function vtpm_migrate() { > > - local instance res > > - > > - instance=$(vtpmdb_find_instance $2) > > - if [ "$instance" == "" ]; then > > - log err "VTPM Migratoin failed. Unable to translation of domain name" > > - echo "Error: VTPM Migration failed while looking up instance number" > > - fi > > - > > - case "$3" in > > - 0) > > - #Incicate migration supported > > - echo "0" > > - ;; > > - > > - 1) > > - # Get Public Key from Destination > > - # Call vtpm_manager's migration part 1 > > - claim_lock vtpm_mgr > > - $VTPM_MIG $1 $2 $instance $3 > > - release_lock vtpm_mgr > > - ;; > > - > > - 2) > > - # Call manager's migration step 2 and send result to destination > > - # If successful remove from db > > - claim_lock vtpm_mgr > > - $VTPM_MIG $1 $2 $instance $3 > > - release_lock vtpm_mgr > > - ;; > > - > > - 3) > > - if `ps x | grep "$VTPM_MIG $1"`; then > > - log err "VTPM Migration failed to complete." > > - echo "Error: VTPM Migration failed to complete." > > - fi > > - ;; > > - esac > > - > > -} > > - > > - > > -function vtpm_migrate_recover() { > > - echo "Error: Recovery not supported yet" > > -} > > - > > -function vtpm_migrate_local() { > > - echo "Error: local vTPM migration not supported" > > -} > > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > > deleted file mode 100644 > > index 7e38ae2..0000000 > > --- a/tools/hotplug/Linux/vtpm-migration.sh > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-common.sh" > > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > > index c591a3f..a0d409e 100644 > > --- a/tools/hotplug/Linux/xen-backend.rules > > +++ b/tools/hotplug/Linux/xen-backend.rules > > @@ -1,6 +1,5 @@ > > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > > deleted file mode 100644 > > index 7b3efa5..0000000 > > --- a/tools/vtpm/Makefile > > +++ /dev/null > > @@ -1,74 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../.. > > - > > -# Base definitions and rules > > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > > - > > -# Dir name for emulator (as dom0 tpm driver) > > -TPM_EMULATOR_DIR = tpm_emulator > > -# Dir name for vtpm instance > > -VTPM_DIR = vtpm > > -ORIG_DIR = orig > > - > > -# Emulator tarball name > > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > > - > > -GMP_HEADER = /usr/include/gmp.h > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: build_sub > > - > > -.PHONY: install > > -install: build > > - $(MAKE) -C $(VTPM_DIR) install-recursive > > - > > -.PHONY: clean > > -clean: > > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > > - fi > > - @if [ -d $(VTPM_DIR) ]; \ > > - then $(MAKE) -C $(VTPM_DIR) clean; \ > > - fi > > - > > -.PHONY: mrproper > > -mrproper: > > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > > - > > -# Download Swiss emulator > > -$(TPM_EMULATOR_TARFILE): > > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > > - > > -# Create vtpm dirs > > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > > - rm -rf $(VTPM_DIR) > > - tar -xzf $(TPM_EMULATOR_TARFILE) > > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > > - > > - set -e; cd $(VTPM_DIR); \ > > - patch -p1 < ../vtpm-0.5.1.patch; \ > > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > > - > > -orig: $(TPM_EMULATOR_TARFILE) > > - mkdir $(ORIG_DIR); > > - set -e; cd $(ORIG_DIR); \ > > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > > - > > -updatepatches: clean orig > > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > > - mv vtpm.patch vtpm.patch.old; > > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > > - > > -.PHONY: build_sub > > -build_sub: $(VTPM_DIR)/tpmd/tpmd > > - set -e; if [ -e $(GMP_HEADER) ]; then \ > > - $(MAKE) -C $(VTPM_DIR) version; \ > > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > > - else \ > > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > > - fi > > - > > diff --git a/tools/vtpm/README b/tools/vtpm/README > > deleted file mode 100644 > > index 2008cbd..0000000 > > --- a/tools/vtpm/README > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > - > > -Directory Structure > > -=================== > > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > > - be patched and used for our vtpms > > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > > - listens on a pair of fifos for TPM commands, > > - persistent state is sent via named fifo to vtpm > > - manager, which encrypts it and protects it. > > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > > - platforms, this patches the emulator to allow > > - it to be inserted into the dom0 kernel > > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > > - > > -Compile Flags > > -=================== > > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > > - Not Defined (default): VTPMs are processes > > - > > -Requirements > > -============ > > -- xen-unstable > > -- IBM frontend/backend vtpm driver patch > > -- vtpm_managerd > > -- GNU MP Big number library (GMP) > > - > > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > > -============================ > > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > > -- VTPM Manager listens to TPM BE. > > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > > -- When the manager receives the open message from the BE, it launches a vtpm > > -- Xend allows the VM to continue booting. > > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > > -- The fifo listener begins listening for the reply from vtpm for the request. > > -- Vtpm processes request and replies to manager over shared named fifo. > > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > > - > > -tpm_emulator flow > > -================== > > -Read documentation in tpm_emulator-0.2 directory > > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > > deleted file mode 100644 > > index 548cff0..0000000 > > --- a/tools/vtpm/Rules.mk > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > > -include $(XEN_ROOT)/tools/Rules.mk > > - > > -# > > -# Tool definitions > > -# > > - > > -# General compiler flags > > -CFLAGS = -Werror -g3 > > - > > -# Generic project files > > -HDRS = $(wildcard *.h) > > -SRCS = $(wildcard *.c) > > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > > - > > -# Generic (non-header) dependencies > > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > > - > > -$(OBJS): $(SRCS) > > - > > --include $(DEPS) > > - > > -BUILD_EMULATOR = y > > - > > -# Make sure these are just rules > > -.PHONY : all build install clean > > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > > deleted file mode 100644 > > index c34c665..0000000 > > --- a/tools/vtpm/tpm_emulator.patch > > +++ /dev/null > > @@ -1,1919 +0,0 @@ > > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,2 +1,3 @@ > > - Mario Strasser > > - Heiko Stamer [DAA] > > -+INTEL Corp <> [Dropped to Ring3] > > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,3 +1,6 @@ > > -+????-??-?? Intel Corp > > -+ * Moved module out of kernel to run as a ring 3 app > > -+ > > - 2006-06-23 Mario Strasser > > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > > - persistent data adapted > > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -24,15 +25,10 @@ int __gmp_junk; > > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > > - int linenum, const char *expr) > > - { > > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > > -+ error("%s:%d: GNU MP assertion failed: %s\n", > > - filename, linenum, expr); > > - } > > - > > --void __attribute__ ((regparm(0))) abort(void) > > --{ > > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > > --} > > -- > > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > > - > > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > > - > > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > > - { > > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > > -- "GMP: cannot allocate memory (size=%u)\n", size); > > -+ void *ret = (void*)malloc(size); > > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > > - return ret; > > - } > > - > > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > > - size_t old_size, size_t new_size) > > - { > > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > > -+ void *ret = (void*)malloc(new_size); > > -+ if (!ret) error("GMP: Cannot reallocate memory " > > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > > - memcpy(ret, oldptr, old_size); > > -- kfree(oldptr); > > -+ free(oldptr); > > - return ret; > > - } > > - > > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > > - /* overwrite used memory */ > > - if (blk_ptr != NULL) { > > - memset(blk_ptr, 0, blk_size); > > -- kfree(blk_ptr); > > -+ free(blk_ptr); > > - } > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > > - msg[0] = 0x00; > > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > > - sha1_init(&ctx); > > -- sha1_update(&ctx, "TCPA", 4); > > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > > - sha1_init(&ctx); > > -- sha1_update(&ctx, "TCPA", 4); > > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > > - sha1_final(&ctx, &msg[1]); > > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > > - SHA1_DIGEST_LENGTH) != 0) return -1; > > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > > -@@ -1,195 +0,0 @@ > > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > -- * Copyright (C) 2004 Mario Strasser , > > -- * > > -- * This module is free software; you can redistribute it and/or modify > > -- * it under the terms of the GNU General Public License as published > > -- * by the Free Software Foundation; either version 2 of the License, > > -- * or (at your option) any later version. > > -- * > > -- * This module is distributed in the hope that it will be useful, > > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > -- * GNU General Public License for more details. > > -- * > > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > > -- */ > > -- > > --#include > > --#include > > --#include > > --#include > > --#include > > --#include "linux_module.h" > > --#include "tpm/tpm_emulator.h" > > -- > > --MODULE_LICENSE("GPL"); > > --MODULE_AUTHOR("Mario Strasser "); > > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > > -- > > --/* module startup parameters */ > > --char *startup = "save"; > > --module_param(startup, charp, 0444); > > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > > --module_param(storage_file, charp, 0644); > > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > > -- "file of the TPM."); > > -- > > --/* TPM lock */ > > --static struct semaphore tpm_mutex; > > -- > > --/* TPM command response */ > > --static struct { > > -- uint8_t *data; > > -- uint32_t size; > > --} tpm_response; > > -- > > --/* module state */ > > --#define STATE_IS_OPEN 0 > > --static uint32_t module_state; > > --static struct timespec old_time; > > -- > > --static int tpm_open(struct inode *inode, struct file *file) > > --{ > > -- debug("%s()", __FUNCTION__); > > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > > -- return 0; > > --} > > -- > > --static int tpm_release(struct inode *inode, struct file *file) > > --{ > > -- debug("%s()", __FUNCTION__); > > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) { > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return 0; > > --} > > -- > > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > > --{ > > -- debug("%s(%d)", __FUNCTION__, count); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) { > > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > > -- *ppos += count; > > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } > > -- } else { > > -- count = 0; > > -- } > > -- up(&tpm_mutex); > > -- return count; > > --} > > -- > > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > > --{ > > -- debug("%s(%d)", __FUNCTION__, count); > > -- down(&tpm_mutex); > > -- *ppos = 0; > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > -- if (tpm_handle_command(buf, count, &tpm_response.data, > > -- &tpm_response.size) != 0) { > > -- count = -EILSEQ; > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return count; > > --} > > -- > > --#define TPMIOC_CANCEL _IO('T', 0x00) > > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > > -- > > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > > --{ > > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > > -- if (cmd == TPMIOC_TRANSMIT) { > > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > > -- &tpm_response.size) == 0) { > > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > > -- tpm_response.size); > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } else { > > -- tpm_response.size = 0; > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return tpm_response.size; > > -- } > > -- return -1; > > --} > > -- > > --struct file_operations fops = { > > -- .owner = THIS_MODULE, > > -- .open = tpm_open, > > -- .release = tpm_release, > > -- .read = tpm_read, > > -- .write = tpm_write, > > -- .ioctl = tpm_ioctl, > > --}; > > -- > > --static struct miscdevice tpm_dev = { > > -- .minor = TPM_DEVICE_MINOR, > > -- .name = TPM_DEVICE_NAME, > > -- .fops = &fops, > > --}; > > -- > > --int __init init_tpm_module(void) > > --{ > > -- int res = misc_register(&tpm_dev); > > -- if (res != 0) { > > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > > -- return res; > > -- } > > -- /* initialize variables */ > > -- sema_init(&tpm_mutex, 1); > > -- module_state = 0; > > -- tpm_response.data = NULL; > > -- old_time = current_kernel_time(); > > -- /* initialize TPM emulator */ > > -- if (!strcmp(startup, "clear")) { > > -- tpm_emulator_init(1); > > -- } else if (!strcmp(startup, "save")) { > > -- tpm_emulator_init(2); > > -- } else if (!strcmp(startup, "deactivated")) { > > -- tpm_emulator_init(3); > > -- } else { > > -- error("invalid startup mode '%s'; must be 'clear', " > > -- "'save' (default) or 'deactivated", startup); > > -- misc_deregister(&tpm_dev); > > -- return -EINVAL; > > -- } > > -- return 0; > > --} > > -- > > --void __exit cleanup_tpm_module(void) > > --{ > > -- tpm_emulator_shutdown(); > > -- misc_deregister(&tpm_dev); > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > --} > > -- > > --module_init(init_tpm_module); > > --module_exit(cleanup_tpm_module); > > -- > > --uint64_t tpm_get_ticks(void) > > --{ > > -- struct timespec new_time = current_kernel_time(); > > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > > -- old_time = new_time; > > -- return (ticks > 0) ? ticks : 1; > > --} > > -- > > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -17,54 +18,62 @@ > > - #ifndef _LINUX_MODULE_H_ > > - #define _LINUX_MODULE_H_ > > - > > --#include > > --#include > > --#include > > -+#include > > -+#include > > -+#include > > -+#include > > - #include > > --#include > > --#include > > --#include > > --#include > > - > > --/* module settings */ > > -+#include > > -+#define __BYTEORDER_HAS_U64__ > > -+#ifdef LITTLE_ENDIAN > > -+ #include > > -+#else > > -+ #include > > -+#endif > > - > > -+/* module settings */ > > -+#define min(A,B) ((A)<(B)?(A):(B)) > > -+#ifndef STR > > - #define STR(s) __STR__(s) > > - #define __STR__(s) #s > > -+#endif > > - #include "tpm_version.h" > > - > > - #define TPM_DEVICE_MINOR 224 > > - #define TPM_DEVICE_NAME "tpm" > > - #define TPM_MODULE_NAME "tpm_emulator" > > - > > --/* debug and log output functions */ > > -- > > - #ifdef DEBUG > > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > - #else > > - #define debug(fmt, ...) > > - #endif > > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > - > > - /* memory allocation */ > > - > > - static inline void *tpm_malloc(size_t size) > > - { > > -- return kmalloc(size, GFP_KERNEL); > > -+ return malloc(size); > > - } > > - > > - static inline void tpm_free(const void *ptr) > > - { > > -- if (ptr != NULL) kfree(ptr); > > -+ if (ptr != NULL) free( (void *) ptr); > > - } > > - > > - /* random numbers */ > > - > > -+//FIXME; > > -+void get_random_bytes(void *buf, int nbytes); > > -+ > > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > > - { > > - get_random_bytes(buf, nbytes); > > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > > - > > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > > - > > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,24 +1,40 @@ > > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - # Copyright (C) 2004 Mario Strasser > > -+# Copyright (C) 2006 INTEL Corp. > > - # > > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > > - > > --# kernel settings > > --KERNEL_RELEASE := $(shell uname -r) > > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > > --MOD_SUBDIR := misc > > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > > - > > - # module settings > > --MODULE_NAME := tpm_emulator > > -+BIN := tpm_emulator > > - VERSION_MAJOR := 0 > > - VERSION_MINOR := 4 > > - VERSION_BUILD := $(shell date +"%s") > > - > > --# enable/disable DEBUG messages > > --EXTRA_CFLAGS += -Wall -DDEBUG -g > > -+# Installation program and options > > -+INSTALL = install > > -+INSTALL_PROG = $(INSTALL) -m0755 > > -+INSTALL_DIR = $(INSTALL) -d -m0755 > > -+ > > -+# Xen tools installation directory > > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > > -+ > > -+CC := gcc > > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > > -+CFLAGS += -I. -Itpm > > -+ > > -+# Is the simulator running in it's own vm? > > -+#CFLAGS += -DVTPM_MULTI_VM > > -+ > > -+ifeq ($(COMPILE_ARCH),x86_64) > > -+LIBDIR = lib64 > > -+else > > -+LIBDIR = lib > > -+endif > > - > > - # GNU MP configuration > > --GMP_LIB := /usr/lib/libgmp.a > > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > > - GMP_HEADER := /usr/include/gmp.h > > - > > - # sources and objects > > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > > - > > --obj-m := $(MODULE_NAME).o > > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > > -+obj-m := $(BIN) > > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > > - > > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > > - > > - # do not print "Entering directory ..." > > - MAKEFLAGS += --no-print-directory > > - > > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > > -+all: $(BIN) > > - > > --install: > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > > -- test -d /var/tpm || mkdir /var/tpm > > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > > -- chmod 666 /dev/tpm > > -- depmod -a > > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > > -+ > > -+%.o: %.c > > -+ $(CC) $(CFLAGS) -c $< -o $@ > > -+ > > -+install: $(BIN) > > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > > - > > - clean: > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > > - > > --dist: $(DISTSRC) > > -- rm -rf $(DISTDIR) > > -- mkdir $(DISTDIR) > > -- cp --parents $(DISTSRC) $(DISTDIR)/ > > -- rm -f $(DISTDIR)/crypto/gmp.h > > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > > -- rm -rf $(DISTDIR) > > -+mrproper: clean > > -+ rm -f $(BIN) tpm_version.h > > - > > - $(src)/crypto/libgmp.a: > > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > > -@@ -88,4 +98,3 @@ version: > > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > > - > > - .PHONY: all install clean dist gmp version > > -- > > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > > - Copyright > > - -------------------------------------------------------------------------- > > - Copyright (C) 2004 Mario Strasser and Swiss Federal > > --Institute of Technology (ETH) Zurich. > > -+ Institute of Technology (ETH) Zurich. > > -+Copyright (C) 2005 INTEL Corp > > - > > - This program is free software; you can redistribute it and/or modify > > - it under the terms of the GNU General Public License as published by > > -@@ -43,6 +44,12 @@ Example: > > - GMP_LIB := /usr/lib/libgmp.a > > - GMP_HEADER := /usr/include/gmp.h > > - > > -+GNU MP Library on 64 bit Systems > > -+-------------------------------------------------------------------------- > > -+Some 64-bit kernels have problems with importing the user-space gmp > > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > > -+ > > - Installation > > - -------------------------------------------------------------------------- > > - The compilation and installation process uses the build environment for > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > > - TPM_RESULT res; > > - > > - info("TPM_GetCapabilityOwner()"); > > -- > > -+ > > -+ if (!tpmData.permanent.flags.owned) { > > -+ return TPM_NOSRK; > > -+ } > > - /* Verify owner authorization */ > > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > > - if (res != TPM_SUCCESS) return res; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > > - || len != 0) return TPM_BAD_PARAMETER; > > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > > - || len != 0) return TPM_BAD_PARAMETER; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > > - > > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > > - { > > -- UINT32 key_length; > > -+ size_t key_length; > > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > > - /* setup TPM_PUBKEY structure */ > > -- key_length = tpmData.permanent.data.endorsementKey.size; > > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > > -- pubEndorsementKey->pubKey.key, > > -- &pubEndorsementKey->pubKey.keyLength); > > -+ pubEndorsementKey->pubKey.key, > > -+ &key_length); > > -+ pubEndorsementKey->pubKey.keyLength = key_length; > > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > > - { > > - TPM_RESULT res; > > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > > -+ size_t key_length; > > - info("TPM_OwnerReadInternalPub()"); > > - /* verify authorization */ > > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > > -- &publicPortion->pubKey.keyLength); > > -+ &key_length); > > -+ publicPortion->pubKey.keyLength = key_length; > > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > > - publicPortion->algorithmParms.encScheme = srk->encScheme; > > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > > - TPM_KEY_DATA *cert, *key; > > - sha1_ctx_t sha1_ctx; > > - BYTE *buf, *p; > > -- UINT32 length; > > -+ UINT32 length32; > > -+ size_t length; > > - info("TPM_CertifyKey()"); > > - /* get keys */ > > - cert = tpm_get_key(certHandle); > > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - p = buf = tpm_malloc(length); > > -+ length32=(UINT32) length; > > - if (buf == NULL > > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > > - return TPM_FAIL; > > - } > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - sha1_init(&sha1_ctx); > > -- sha1_update(&sha1_ctx, buf, length); > > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > > - sha1_final(&sha1_ctx, buf); > > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > > - tpm_free(buf); > > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > > - TPM_KEY_DATA *cert, *key; > > - sha1_ctx_t sha1_ctx; > > - BYTE *buf, *p; > > -- UINT32 length; > > -+ size_t length; > > -+ UINT32 length32; > > - info("TPM_CertifyKey2()"); > > - /* get keys */ > > - cert = tpm_get_key(certHandle); > > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - p = buf = tpm_malloc(length); > > -+ length32 = (UINT32) length; > > - if (buf == NULL > > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > > - return TPM_FAIL; > > - } > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > > - sizeof(session->DAA_session.DAA_digest)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_update(&sha1, inputData1, inputSize1); > > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > > - } > > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > > - sizeof(session->DAA_session.DAA_digest)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > > - rsa_export_modulus(&aikData->key, scratch, &size); > > - sha1_update(&sha1, scratch, size); > > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > > - void tpm_init_data(void) > > - { > > - /* endorsement key */ > > -+#ifndef TPM_GENERATE_EK > > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > > -+#endif > > -+ > > - int i; > > - /* reset all data to NULL, FALSE or 0 */ > > - memset(&tpmData, 0, sizeof(tpmData)); > > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > > - > > - #ifdef TPM_STORE_TO_FILE > > - > > --#include > > --#include > > --#include > > -+#include > > -+#include > > -+#include > > -+#include > > - > > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > > - > > - static int write_to_file(uint8_t *data, size_t data_length) > > - { > > - int res; > > -- struct file *fp; > > -- mm_segment_t old_fs = get_fs(); > > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- if (IS_ERR(fp)) return -1; > > -- set_fs(get_ds()); > > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > > -- set_fs(old_fs); > > -- filp_close(fp, NULL); > > -+ int fp; > > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -+ res = write(fp, data, data_length); > > -+ close(fp); > > - return (res == data_length) ? 0 : -1; > > - } > > - > > - static int read_from_file(uint8_t **data, size_t *data_length) > > - { > > - int res; > > -- struct file *fp; > > -- mm_segment_t old_fs = get_fs(); > > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -- if (IS_ERR(fp)) return -1; > > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > > -+ int fp, file_status; > > -+ struct stat file_info; > > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -+ file_status = fstat(fp, &file_info); > > -+ if (file_status < 0) { > > -+ close(fp); > > -+ return -1; > > -+ } > > -+ > > -+ *data_length = file_info.st_size; > > - *data = tpm_malloc(*data_length); > > - if (*data == NULL) { > > -- filp_close(fp, NULL); > > -+ close(fp); > > - return -1; > > - } > > -- set_fs(get_ds()); > > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > > -- set_fs(old_fs); > > -- filp_close(fp, NULL); > > -+ res = read(fp, *data, *data_length); > > -+ close(fp); > > - if (res != *data_length) { > > - tpm_free(*data); > > - return -1; > > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > > - int tpm_store_permanent_data(void) > > - { > > - uint8_t *buf, *ptr; > > -- size_t buf_length, len; > > -+ UINT32 buf_length, len; > > - > > - /* marshal data */ > > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > > - buf = ptr = tpm_malloc(buf_length); > > - if (buf == NULL > > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > > - tpm_free(buf); > > - return -1; > > - } > > -+ > > - if (write_to_file(buf, buf_length - len)) { > > - tpm_free(buf); > > - return -1; > > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > > - int tpm_restore_permanent_data(void) > > - { > > - uint8_t *buf, *ptr; > > -- size_t buf_length, len; > > -+ size_t buf_length; > > -+ UINT32 len; > > - TPM_VERSION ver; > > - > > - /* read data */ > > - if (read_from_file(&buf, &buf_length)) return -1; > > - ptr = buf; > > -- len = buf_length; > > -+ len = (uint32_t) buf_length; > > - /* unmarshal data */ > > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > > - tpm_free(buf); > > - return -1; > > - } > > -+ > > - tpm_free(buf); > > - return 0; > > - } > > - > > - int tpm_erase_permanent_data(void) > > - { > > -- int res = write_to_file("", 0); > > -+ int res = write_to_file((uint8_t *) "", 0); > > - return res; > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > > - BYTE *ptr; > > - UINT32 len; > > - info("TPM_SaveKeyContext()"); > > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > > - keyContextSize, &contextBlob); > > - if (res != TPM_SUCCESS) return res; > > - len = *keyContextSize; > > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > > - BYTE *ptr; > > - UINT32 len; > > - info("TPM_SaveAuthContext()"); > > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > > - authContextSize, &contextBlob); > > - if (res != TPM_SUCCESS) return res; > > - len = *authContextSize; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -22,7 +23,8 @@ > > - /* TPM configuration */ > > - #define TPM_STORE_TO_FILE 1 > > - #undef TPM_STRONG_PERSISTENCE > > --#undef TPM_GENERATE_EK > > -+//#undef TPM_GENERATE_EK > > -+#define TPM_GENERATE_EK > > - #undef TPM_GENERATE_SEED_DAA > > - > > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > > - > > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > > - { > > -- UINT32 m_len, e_len, q_len; > > -+ size_t m_len, e_len, q_len; > > - if (*length < sizeof_RSA((*v))) return -1; > > - if (v->size > 0) { > > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > > - return 0; > > - } > > - > > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > > -+{ > > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > > -+{ > > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > > -+{ > > -+ UINT32 i; > > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > > -+ } > > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > > -+ } > > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > > -+{ > > -+ UINT32 i; > > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > > -+ } > > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > > -+ } > > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > > - { > > - if (tpm_marshal_BYTE(ptr, length, v->type) > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > > - > > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > > -+ > > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > > -+ > > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > > - TPM_RESULT res; > > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > > -- UINT32 buf_size = ek->size >> 3; > > -+ size_t buf_size = ek->size >> 3, key_length; > > - BYTE buf[buf_size]; > > - > > - info("TPM_TakeOwnership()"); > > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > > - return TPM_FAIL; > > - } > > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > > -- &srkPub->pubKey.keyLength); > > -+ &key_length); > > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > > - /* setup tpmProof and set state to owned */ > > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > > - { > > - int i; > > -+ int restore_fail; > > - info("TPM_Startup(%d)", startupType); > > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > > -- /* reset STANY_FLAGS */ > > -- SET_TO_ZERO(&tpmData.stany.flags); > > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > > -- /* reset STANY_DATA (invalidates ALL sessions) */ > > -- SET_TO_ZERO(&tpmData.stany.data); > > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > > -- /* init session-context nonce */ > > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > > -+ > > -+ /* try and restore state to get EK, SRK, etc */ > > -+ restore_fail = tpm_restore_permanent_data(); > > -+ > > - /* set data and flags according to the given startup type */ > > - if (startupType == TPM_ST_CLEAR) { > > -- /* if available, restore permanent data */ > > -- tpm_restore_permanent_data(); > > -+ /* reset STANY_FLAGS */ > > -+ SET_TO_ZERO(&tpmData.stany.flags); > > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > > -+ SET_TO_ZERO(&tpmData.stany.data); > > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > > -+ /* init session-context nonce */ > > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > > - /* reset PCR values */ > > - for (i = 0; i < TPM_NUM_PCR; i++) { > > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > > - else > > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > > - } > > - /* reset STCLEAR_FLAGS */ > > - SET_TO_ZERO(&tpmData.stclear.flags); > > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > > - /* init key-context nonce */ > > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > > - } else if (startupType == TPM_ST_STATE) { > > -- if (tpm_restore_permanent_data()) { > > -+ /* restore must have been successful for TPM_ST_STATE */ > > -+ if (restore_fail) { > > - error("restoring permanent data failed"); > > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - BYTE *enc, UINT32 *enc_size) > > - { > > - UINT32 len; > > -+ size_t enc_size32 = *enc_size; > > - BYTE *buf, *ptr; > > - rsa_public_key_t pub_key; > > - int scheme; > > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - if (buf == NULL > > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > > -- enc, enc_size)) { > > -+ enc, &enc_size32)) { > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return -1; > > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > > - TPM_SEALED_DATA *seal, BYTE **buf) > > - { > > -- UINT32 len; > > -+ size_t len; > > -+ UINT32 len32; > > - BYTE *ptr; > > - int scheme; > > - switch (key->encScheme) { > > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > > - len = enc_size; > > - *buf = ptr = tpm_malloc(len); > > - if (*buf == NULL > > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > > -+ tpm_free(*buf); > > -+ return -1; > > -+ } > > -+ len32 = len; > > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > > - tpm_free(*buf); > > - return -1; > > - } > > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > > - > > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > > - BYTE *inData, TPM_AUTH *auth1, > > -- UINT32 *outDataSize, BYTE **outData) > > -+ UINT32 *outDataSize32, BYTE **outData) > > - { > > - TPM_RESULT res; > > - TPM_KEY_DATA *key; > > - int scheme; > > -+ size_t outDataSize; > > - > > - info("TPM_UnBind()"); > > - /* get key */ > > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > > - /* the size of the input data muss be greater than zero */ > > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > > - /* decrypt data */ > > -- *outDataSize = inDataSize; > > -- *outData = tpm_malloc(*outDataSize); > > -+ outDataSize = inDataSize; > > -+ *outData = tpm_malloc(outDataSize); > > - if (*outData == NULL) return TPM_NOSPACE; > > - switch (key->encScheme) { > > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > > - } > > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > > -- *outData, outDataSize)) { > > -+ *outData, &outDataSize)) { > > - tpm_free(*outData); > > - return TPM_DECRYPT_ERROR; > > - } > > - /* verify data if it is of type TPM_BOUND_DATA */ > > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > > - || key->keyUsage != TPM_KEY_LEGACY) { > > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > > - tpm_free(*outData); > > - return TPM_DECRYPT_ERROR; > > - } > > -- *outDataSize -= 5; > > -- memmove(*outData, &(*outData)[5], *outDataSize); > > -+ outDataSize -= 5; > > -+ memmove(*outData, &(*outData)[5], outDataSize); > > - } > > -+ *outDataSize32 = (UINT32) outDataSize; > > - return TPM_SUCCESS; > > - } > > - > > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > > - } > > - > > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > > -- BYTE *enc, UINT32 *enc_size) > > -+ BYTE *enc, UINT32 *enc_size32) > > - { > > - UINT32 len; > > - BYTE *buf, *ptr; > > - rsa_public_key_t pub_key; > > - int scheme; > > -+ size_t enc_size; > > - switch (key->encScheme) { > > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > > - if (buf == NULL > > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > > -- enc, enc_size)) { > > -+ enc, &enc_size)) { > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return -1; > > - } > > -+ *enc_size32 = (UINT32) enc_size; > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return 0; > > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > > - TPM_STORE_ASYMKEY *store, BYTE **buf) > > - { > > -- UINT32 len; > > -+ UINT32 len32; > > -+ size_t len; > > - BYTE *ptr; > > - int scheme; > > - switch (key->encScheme) { > > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > > - len = enc_size; > > - *buf = ptr = tpm_malloc(len); > > - if (*buf == NULL > > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > > -+ tpm_free(*buf); > > -+ return -1; > > -+ } > > -+ len32 = (UINT32) len; > > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > > - tpm_free(*buf); > > - return -1; > > - } > > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - TPM_SESSION_DATA *session; > > - TPM_STORE_ASYMKEY store; > > - rsa_private_key_t rsa; > > -- UINT32 key_length; > > -+ size_t key_length; > > - > > - info("TPM_CreateWrapKey()"); > > - /* get parent key */ > > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - } > > - } > > - /* generate key and store it */ > > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > > -- wrappedKey->pubKey.keyLength = key_length >> 3; > > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > > -+ return TPM_FAIL; > > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > > -- store.privKey.keyLength = key_length >> 4; > > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > > - wrappedKey->encDataSize = parent->key.size >> 3; > > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - tpm_free(wrappedKey->encData); > > - return TPM_NOSPACE; > > - } > > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > > -- &wrappedKey->pubKey.keyLength); > > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > > -+ &key_length); > > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > > -+ store.privKey.keyLength = (UINT32) key_length; > > - rsa_release_private_key(&rsa); > > - /* compute the digest of the wrapped key (without encData) */ > > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > > - > > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > > - { > > -+ size_t key_length; > > - parms->algorithmID = TPM_ALG_RSA; > > - parms->encScheme = key->encScheme; > > - parms->sigScheme = key->sigScheme; > > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > > - if (parms->parms.rsa.exponent == NULL) return -1; > > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > > -- &parms->parms.rsa.exponentSize); > > -+ &key_length); > > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > > - return 0; > > - } > > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > > - TPM_RESULT res; > > - TPM_KEY_DATA *key; > > - TPM_DIGEST digest; > > -+ size_t key_length; > > - info("TPM_GetPubKey()"); > > - /* get key */ > > - if (keyHandle == TPM_KH_SRK > > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > > - pubKey->pubKey.keyLength = key->key.size >> 3; > > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > > -- &pubKey->pubKey.keyLength); > > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > > - tpm_free(pubKey->pubKey.key); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > > - TPM_DIGEST DAA_digest_gamma; > > - BYTE DAA_generic_q[26]; > > - } TPM_DAA_ISSUER; > > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > > - > > - /* > > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > > - TPM_DIGEST DAA_rekey; > > - UINT32 DAA_count; > > - } TPM_DAA_TPM; > > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > > - > > - /* > > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > > - BYTE DAA_scratch[256]; > > - BYTE DAA_stage; > > - } TPM_DAA_CONTEXT; > > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > > - > > - /* > > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > > - BYTE DAA_join_u1[138]; > > - TPM_DIGEST DAA_digest_n0; > > - } TPM_DAA_JOINDATA; > > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > > - > > - /* > > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > > - //UINT32 ownerReference; > > - //BOOL disableResetLock; > > - } TPM_STCLEAR_DATA; > > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > > - > > - /* > > - * TPM_SESSION_DATA > > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > > - TPM_DAA_JOINDATA DAA_joinSession; > > - TPM_HANDLE handle; > > - } TPM_DAA_SESSION_DATA; > > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > > - > > - /* > > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > > - TPM_DAAHANDLE currentDAA; > > - TPM_TRANSHANDLE transExclusive; > > - } TPM_STANY_DATA; > > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > > - > > - /* > > - * TPM_DATA > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > > - struct { > > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > > - } test_cases[] = {{ > > -- "abc", 1, > > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > > -+ (uint8_t*)"abc", 1, > > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > > - }, { > > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > > - }, { > > -- "a", 1000000, > > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > > -+ (uint8_t*)"a", 1000000, > > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > > - }, { > > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > > - }}; > > - > > - debug("tpm_test_sha1()"); > > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > > - sha1_init(&ctx); > > - for (j = 0; j < test_cases[i].repetitions; j++) > > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > > - sha1_final(&ctx, digest); > > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > > - } > > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > > - struct { > > - uint8_t *key, key_len, *data, data_len, *digest; > > - } test_cases[] = {{ > > -- "\x0b", 20, "Hi There", 8, > > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > > - }, { > > -- "Jefe", 4, "what do ya want for nothing?", 28, > > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > > - }, { > > -- "\xaa", 20, "\xdd", 50, > > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > > - }, { > > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > > - }, { > > -- "\x0c", 20, "Test With Truncation", 20, > > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > > - }, { > > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > > - }, { > > -- "\xaa", 80, > > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > > -+ (uint8_t*)"\xaa", 80, > > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > > - }}; > > - > > - debug("tpm_test_hmac()"); > > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > > - uint8_t key[test_cases[i].key_len]; > > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > > - hmac_init(&ctx, key, test_cases[i].key_len); > > - } else { > > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > > - } > > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > > - } > > - hmac_final(&ctx, digest); > > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > > - static int tpm_test_rsa_EK(void) > > - { > > - int res = 0; > > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > > - uint8_t buf[256]; > > -- size_t buf_len, data_len = strlen(data); > > -+ size_t buf_len, data_len = strlen((char*)data); > > - rsa_private_key_t priv_key; > > - rsa_public_key_t pub_key; > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > > - { > > - info("TPM_GetTicks()"); > > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > > -- sizeof(TPM_CURRENT_TICKS)); > > -- return TPM_SUCCESS; > > -+ return TPM_DISABLED_CMD; > > - } > > - > > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > > - TPM_CURRENT_TICKS *currentTicks, > > - UINT32 *sigSize, BYTE **sig) > > - { > > -- TPM_RESULT res; > > -- TPM_KEY_DATA *key; > > -- BYTE *info, *p; > > -- UINT32 info_length, length; > > - info("TPM_TickStampBlob()"); > > -- /* get key */ > > -- key = tpm_get_key(keyHandle); > > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > > -- /* verify authorization */ > > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > > -- if (res != TPM_SUCCESS) return res; > > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > > -- /* get current ticks */ > > -- TPM_GetTicks(currentTicks); > > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > > -- *sigSize = key->key.size >> 3; > > -- *sig = tpm_malloc(*sigSize); > > -- if (*sig == NULL) return TPM_FAIL; > > -- /* setup TPM_SIGN_INFO structure */ > > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > > -- info = tpm_malloc(info_length); > > -- if (info == NULL) { > > -- tpm_free(*sig); > > -- return TPM_FAIL; > > -- } > > -- memcpy(&info[0], "\x05\x00TSTP", 6); > > -- memcpy(&info[6], antiReplay->nonce, 20); > > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > > -- p = &info[30 + sizeof(TPM_DIGEST)]; > > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > > -- tpm_free(*sig); > > -- tpm_free(info); > > -- return TPM_FAIL; > > -- } > > -- return TPM_SUCCESS; > > -+ return TPM_DISABLED_CMD; > > - } > > - > > - void tpm_update_ticks(void) > > - { > > -- if (tpmData.stany.data.currentTicks.tag == 0) { > > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > > --/* removed since v1.2 rev 94 > > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > > --*/ > > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > > -- sizeof(TPM_NONCE)); > > -- tpmData.stany.data.currentTicks.tickRate = 1; > > --/* removed since v1.2 rev 94 > > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > > --*/ > > -- } else { > > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > > -- } > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > > - sha1_init(&sha1); > > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > > -- sha1_update(&sha1, "in", 2); > > -+ sha1_update(&sha1, (BYTE*)"in", 2); > > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > > - j = CPU_TO_BE32(i); > > - sha1_update(&sha1, (BYTE*)&j, 4); > > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > > - sha1_init(&sha1); > > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > > -- sha1_update(&sha1, "out", 3); > > -+ sha1_update(&sha1, (BYTE*)"out", 3); > > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > > - j = CPU_TO_BE32(i); > > - sha1_update(&sha1, (BYTE*)&j, 4); > > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -0,0 +1,156 @@ > > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > -+ * Copyright (C) 2005 INTEL Corp > > -+ * > > -+ * This module is free software; you can redistribute it and/or modify > > -+ * it under the terms of the GNU General Public License as published > > -+ * by the Free Software Foundation; either version 2 of the License, > > -+ * or (at your option) any later version. > > -+ * > > -+ * This module is distributed in the hope that it will be useful, > > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > -+ * GNU General Public License for more details. > > -+ * > > -+ */ > > -+ > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+ > > -+#include "tpm_emulator.h" > > -+ > > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > > -+ > > -+#define BUFFER_SIZE 2048 > > -+ > > -+static int devurandom=0; > > -+ > > -+void get_random_bytes(void *buf, int nbytes) { > > -+ > > -+ if (devurandom == 0) { > > -+ devurandom = open("/dev/urandom", O_RDONLY); > > -+ } > > -+ > > -+ if (read(devurandom, buf, nbytes) != nbytes) { > > -+ printf("Can't get random number.\n"); > > -+ exit(-1); > > -+ } > > -+} > > -+ > > -+uint64_t tpm_get_ticks(void) > > -+{ > > -+ //struct timeval tv; > > -+ //int gettimeofday(&tv, struct timezone *tz); > > -+ return 0; > > -+} > > -+ > > -+int main(int argc, char **argv) > > -+{ > > -+ uint8_t in[BUFFER_SIZE], *out; > > -+ uint32_t out_size; > > -+ int in_size, written; > > -+ int i; > > -+ struct stat file_info; > > -+ > > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > > -+ if (argc < 2) { > > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > > -+ return -1; > > -+ } > > -+ > > -+ /* initialize TPM emulator */ > > -+ if (!strcmp(argv[1], "clear")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(1); > > -+ } else if (!strcmp(argv[1], "save")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(2); > > -+ } else if (!strcmp(argv[1], "deactivated")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(3); > > -+ } else { > > -+ printf("invalid startup mode '%s'; must be 'clear', " > > -+ "'save' (default) or 'deactivated", argv[1]); > > -+ return -1; > > -+ } > > -+ > > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > > -+ return -1; > > -+ } > > -+ } > > -+ > > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > > -+ return -1; > > -+ } > > -+ } > > -+ > > -+ while (1) { > > -+abort_command: > > -+ if (tpm_rx_fh < 0) { > > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > > -+ } > > -+ > > -+ if (tpm_rx_fh < 0) { > > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ if (tpm_tx_fh < 0) { > > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > > -+ } > > -+ > > -+ if (tpm_tx_fh < 0) { > > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > > -+ if (in_size < 6) { // Magic size of minium TPM command > > -+ printf("Recv[%d] to small: 0x", in_size); > > -+ if (in_size <= 0) { > > -+ close(tpm_rx_fh); > > -+ tpm_rx_fh = -1; > > -+ goto abort_command; > > -+ } > > -+ } else { > > -+ printf("Recv[%d]: 0x", in_size); > > -+ for (i=0; i< in_size; i++) > > -+ printf("%x ", in[i]); > > -+ printf("\n"); > > -+ } > > -+ > > -+ > > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > > -+ printf("ERROR: Handler Failed.\n"); > > -+ } > > -+ > > -+ written = write(tpm_tx_fh, out, out_size); > > -+ > > -+ if (written != out_size ) { > > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > > -+ } else { > > -+ printf("Sent[%Zu]: ", out_size); > > -+ } > > -+ for (i=0; i< out_size; i++) > > -+ printf("%x ", out[i]); > > -+ printf("\n"); > > -+ tpm_free(out); > > -+ > > -+ } // loop > > -+ > > -+ tpm_emulator_shutdown(); > > -+ > > -+ close(tpm_tx_fh); > > -+ close(tpm_rx_fh); > > -+ > > -+} > > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > > -@@ -2,5 +2,5 @@ > > - #define _TPM_VERSION_H_ > > - #define VERSION_MAJOR 0 > > - #define VERSION_MINOR 4 > > --#define VERSION_BUILD 1151058734 > > -+#define VERSION_BUILD 1153776940 > > - #endif /* _TPM_VERSION_H_ */ > > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > > deleted file mode 100644 > > index 95586c1..0000000 > > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > > ---- tpm_emulator-0.5.1/tpmd/Makefile > > -+++ tpm_emulator-0.5.1/tpmd/Makefile > > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > > - CFLAGS += -I../../../../tools/vtpm_manager/manager > > --LDFLAGS += -lgmp > > -+LDLIBS += -lgmp > > - > > - BINDIR := /usr/bin/ > > - > > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > > deleted file mode 100644 > > index 2aeb745..0000000 > > --- a/tools/vtpm/vtpm-0.5.1.patch > > +++ /dev/null > > @@ -1,766 +0,0 @@ > > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > > - VERSION_BUILD := $(shell date +"%s") > > - VERSION_SUFFIX := .1 > > - > > --SUBDIRS := tpmd tpmd_dev tddl > > -+SUBDIRS := tpmd > > - > > - all: version all-recursive > > - > > -@@ -48,12 +48,12 @@ user_install: user > > - modules_install: modules > > - @$(MAKE) -C tpmd_dev install || exit -1 > > - > > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > > -+DIRS := . tpm crypto tpmd > > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > > -+DIRS := . tpmd > > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > > - > > - dist: $(DISTSRC) > > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_TIS_TIMEOUT: > > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > > -+ UINT32 len = *respSize = 16; > > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > > -+ if (ptr == NULL || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > > -+ tpm_free(*resp); > > -+ return TPM_FAIL; > > -+ } > > -+ return TPM_SUCCESS; > > -+ > > - > > - case TPM_CAP_PROP_STARTUP_EFFECT: > > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_DURATION: > > - debug("[TPM_CAP_PROP_DURATION]"); > > -- /* TODO: TPM_CAP_PROP_DURATION */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > > -+ *respSize = 16; > > -+ *resp = tpm_malloc(*respSize); > > -+ memcpy(*resp,dur,16); > > -+ > > - > > - case TPM_CAP_PROP_ACTIVE_COUNTER: > > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > > - -Wwrite-strings -Wsign-compare -Wno-multichar > > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > > - LDFLAGS += -lgmp > > - > > --BINDIR := /usr/sbin/ > > -+BINDIR := /usr/bin/ > > - > > - TPMD := tpmd > > - DIRS := ../tpm ../crypto > > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > > - > > -+VTPM_BIN := vtpmd > > -+ > > - vpath %.c $(strip $(DIRS)) > > - > > - all: $(TPMD) > > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > > - INSTALL ?= install > > - > > - install: $(TPMD) > > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > > - > > - .PHONY: all clean install > > - > > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > > -@@ -32,6 +32,9 @@ > > - #include > > - #include "tpm_emulator_config.h" > > - #include "tpm/tpm_emulator.h" > > -+#include "tpm/tpm_structures.h" > > -+#include "tpm/tpm_marshalling.h" > > -+#include "vtpm_manager.h" > > - > > - #define TPM_DAEMON_NAME "tpmd" > > - #define TPM_CMD_BUF_SIZE 4096 > > -@@ -39,6 +42,24 @@ > > - #define TPM_RANDOM_DEVICE "/dev/urandom" > > - #undef TPM_MKDIRS > > - > > -+#ifdef VTPM_MULTI_VM > > -+ #define DEV_BE "/dev/vtpm" > > -+ #define DEV_FE "/dev/tpm" > > -+#else > > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > > -+ > > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -+ > > -+ static char *vtpm_rx_name=NULL; > > -+#endif > > -+ > > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#define BUFFER_SIZE 2048 > > -+ > > - static volatile int stopflag = 0; > > - static int is_daemon = 0; > > - static int opt_debug = 0; > > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > > - static uid_t opt_uid = 0; > > - static gid_t opt_gid = 0; > > - static int tpm_startup = 2; > > -+static int vtpm_type = VTPM_TYPE_PVM; > > -+int dmi_id = 0; > > - static int rand_fh; > > - > > - void tpm_log(int priority, const char *fmt, ...) > > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > > - > > - int tpm_write_to_file(uint8_t *data, size_t data_length) > > - { > > -- int fh; > > -- ssize_t res; > > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- if (fh < 0) return -1; > > -- while (data_length > 0) { > > -- res = write(fh, data, data_length); > > -- if (res < 0) { > > -- close(fh); > > -- return -1; > > -- } > > -- data_length -= res; > > -- data += res; > > -+ int res, out_data_size, in_header_size; > > -+ BYTE *ptr, *out_data, *in_header; > > -+ UINT32 result, len, in_rsp_size; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ > > -+ printf("Saving NVM\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > > -+#endif > > -+ > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > > -+ free(out_data); > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending SaveNVM Command.\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > - } > > -- close(fh); > > -- return 0; > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading SaveNVM header.\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > > -+#endif > > -+ > > -+ printf("\tFinishing up SaveNVM\n"); > > -+ return (0); > > - } > > - > > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > > - { > > -- int fh; > > -- ssize_t res; > > -- size_t total_length; > > -- fh = open(opt_storage_file, O_RDONLY); > > -- if (fh < 0) return -1; > > -- total_length = lseek(fh, 0, SEEK_END); > > -- lseek(fh, 0, SEEK_SET); > > -- *data = tpm_malloc(total_length); > > -- if (*data == NULL) { > > -- close(fh); > > -- return -1; > > -- } > > -- *data_length = 0; > > -- while (total_length > 0) { > > -- res = read(fh, &(*data)[*data_length], total_length); > > -- if (res < 0) { > > -- close(fh); > > -- tpm_free(*data); > > -- return -1; > > -- } > > -- *data_length += res; > > -- total_length -= res; > > -+ int res, out_data_size, in_header_size; > > -+ uint8_t *ptr, *out_data, *in_header; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ UINT32 len, in_rsp_size, result; > > -+#ifdef VTPM_MUTLI_VM > > -+ int vtpm_rx_fh, vtpm_tx_fh; > > -+#endif > > -+ > > -+ printf("Loading NVM.\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ printf("Error in read_from_file:301\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > > -+ free(out_data); > > -+ printf("Error in read_from_file:325\n"); > > -+ > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending LoadNVM command\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) > > -+ { > > -+ printf("Error in read_from_file:335\n"); > > -+ return -1; > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > - } > > -- close(fh); > > -- return 0; > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ printf("Error in read_from_file:352\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading LoadNVM header\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ printf("Error in read_from_file:375\n"); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ printf("Error in read_from_file:381\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Read Encrypted data from VTPM Manager > > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > -+ *data = (uint8_t *) malloc(*data_length); > > -+ > > -+ printf("\tReading clear data from LoadNVM.\n"); > > -+ res = read(vtpm_rx_fh, *data, *data_length); > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > > -+#endif > > -+ > > -+ printf("\tReturing from loading NVM\n"); > > -+ if (res != (int)*data_length) { > > -+ free(*data); > > -+ printf("Error in read_from_file:398\n"); > > -+ return -1; > > -+ } else { > > -+ return 0; > > -+ } > > -+ > > -+ > > -+ > > - } > > - > > - static void print_usage(char *name) > > - { > > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > > -+ "[-o user name] [-g group name] [-h]" > > -+#ifdef VTPM_MULTI_VM > > -+ "clear|save|deactivated\n", name); > > -+#else > > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > > -+#endif > > - printf(" d : enable debug mode\n"); > > - printf(" f : forces the application to run in the foreground\n"); > > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > > - exit(EXIT_SUCCESS); > > - } > > - } > > -- if (optind < argc) { > > -+ /*Make sure we have all required options*/ > > -+#ifdef VTPM_MULTI_VM > > -+#define EXTRA_OPTS 0 > > -+#else > > -+#define EXTRA_OPTS 2 > > -+#endif > > -+ if (optind < argc - EXTRA_OPTS ) { > > - debug("startup mode = '%s'", argv[optind]); > > - if (!strcmp(argv[optind], "clear")) { > > - tpm_startup = 1; > > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > > - print_usage(argv[0]); > > - exit(EXIT_SUCCESS); > > - } > > -+#ifndef VTPM_MULTI_VM > > -+ ++optind; > > -+ if(!strcmp(argv[optind], "pvm")) { > > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > > -+ } else if (!strcmp(argv[optind], "hvm")) { > > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > > -+ } else { > > -+ error("Invalid vm mode '%s'; must be 'pvm', " > > -+ "or 'hvm' ", argv[optind]); > > -+ print_usage(argv[0]); > > -+ exit(EXIT_SUCCESS); > > -+ } > > -+ ++optind; > > -+ dmi_id = atoi(argv[optind]); > > -+#endif > > -+ } else { > > -+ error("Invalid number of arguments"); > > -+ print_usage(argv[0]); > > -+ exit(EXIT_SUCCESS); > > - } > > - } > > - > > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > > - > > - static void main_loop(void) > > - { > > -- int sock, fh, res; > > -- int32_t in_len; > > -+ int32_t in_len, written; > > - uint32_t out_len; > > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > > -+ int guest_id=-1; > > -+ int i; > > -+ char *vtpm_rx_file=NULL; > > -+ int res; > > -+ > > -+#ifndef VTPM_MULTI_VM > > -+ int sockfd = -1; > > - struct sockaddr_un addr; > > -- socklen_t addr_len; > > -- fd_set rfds; > > -- struct timeval tv; > > -+ struct sockaddr_un client_addr; > > -+ unsigned int client_length; > > -+#endif > > -+ > > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#ifndef VTPM_MULTI_VM > > -+ if (vtpm_type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } else { > > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ > > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > > -+ error("Unable to create socket. errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&addr, 0, sizeof(addr)); > > -+ addr.sun_family = AF_UNIX; > > -+ strcpy(addr.sun_path,vtpm_rx_file ); > > -+ unlink(addr.sun_path); > > -+ } > > -+#endif > > - > > - info("staring main loop"); > > -- /* open UNIX socket */ > > -- sock = init_socket(opt_socket_name); > > -- if (sock < 0) exit(EXIT_FAILURE); > > - /* init tpm emulator */ > > -- debug("initializing TPM emulator: %d", tpm_startup); > > -+#ifdef VTPM_MULTI_VM > > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > > -+#else > > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > > -+#endif > > - tpm_emulator_init(tpm_startup); > > - /* start command processing */ > > - while (!stopflag) { > > - /* wait for incomming connections */ > > - debug("waiting for connections..."); > > -- FD_ZERO(&rfds); > > -- FD_SET(sock, &rfds); > > -- tv.tv_sec = 10; > > -- tv.tv_usec = 0; > > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > > -- if (res < 0) { > > -- error("select(sock) failed: %s", strerror(errno)); > > -- break; > > -- } else if (res == 0) { > > -- continue; > > -- } > > -- addr_len = sizeof(addr); > > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > > -- if (fh < 0) { > > -- error("accept() failed: %s", strerror(errno)); > > -- continue; > > -- } > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > > -+#else > > -+ if (vtpm_type == VTPM_TYPE_PVM) > > -+ { > > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > > -+ } else { > > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > > -+ error("Unable to bind(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ if (listen(sockfd, 10) <0) { > > -+ error("Unable to listen(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&client_addr, 0, sizeof(client_addr)); > > -+ client_length = sizeof(client_addr); > > -+ > > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > > -+ } > > -+#endif > > -+ } > > -+ > > -+ /*Error Checking*/ > > -+ if (vtpm_rx_fh < 0) { > > -+ error("Failed to open devices to listen to guest.\n"); > > -+ exit(-1); > > -+ } > > -+ > > - /* receive and handle commands */ > > - in_len = 0; > > - do { > > - debug("waiting for commands..."); > > -- FD_ZERO(&rfds); > > -- FD_SET(fh, &rfds); > > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > > -- tv.tv_usec = 0; > > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > > -- if (res < 0) { > > -- error("select(fh) failed: %s", strerror(errno)); > > -- close(fh); > > -- break; > > -- } else if (res == 0) { > > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > > -- info("connection closed due to inactivity"); > > -- close(fh); > > -- break; > > --#else > > -- continue; > > --#endif > > -- } > > -- in_len = read(fh, in, sizeof(in)); > > -- if (in_len > 0) { > > -+ > > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > > -+ /*Magic size of minimum TPM command is 6*/ > > -+ //FIXME Magic size check may not be required anymore > > -+ if (in_len < 6) { > > -+ info("Recv incomplete command of %d bytes.", in_len); > > -+ if (in_len <= 0) { > > -+ close(vtpm_rx_fh); > > -+ vtpm_rx_fh = -1; > > -+ continue; > > -+ } > > -+ } else { > > -+ /*Debug Printouts*/ > > - debug("received %d bytes", in_len); > > -+ debug_nostop("Recv[%d]: 0x", in_len); > > -+ for (i=0; i< in_len; i++) > > -+ debug_more("%x ", in[i]); > > -+ debug_more("\n"); > > -+ /*Multiple Guest check*/ > > -+ if (guest_id == -1) { > > -+ guest_id = *((int32_t *) in); > > -+ } else { > > -+ if (guest_id != *((int32_t *) in) ) { > > -+ error("WARNING: More than one guest attached\n"); > > -+ } > > -+ } > > -+ > > -+ /*Open tx handle now*/ > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_type == VTPM_TYPE_PVM) { > > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > > -+ } // No need to open the other direction for HVM > > -+#endif > > -+ } > > -+ if (vtpm_tx_fh < 0) { > > -+ error("Failed to open devices to respond to guest.\n"); > > -+ exit(-1); > > -+ } > > -+ > > -+ /*Handle the TPM command now*/ > > - out = NULL; > > -- res = tpm_handle_command(in, in_len, &out, &out_len); > > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > > - if (res < 0) { > > - error("tpm_handle_command() failed"); > > - } else { > > - debug("sending %d bytes", out_len); > > -+ //FIXME this prepending may or may not be needed > > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > > -+ out_len += sizeof(uint32_t); > > -+ /*End Prepend*/ > > -+ > > -+ /*Perform write operation now*/ > > - while (out_len > 0) { > > -- res = write(fh, out, out_len); > > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > > -+ > > - if (res < 0) { > > - error("write(%d) failed: %s", out_len, strerror(errno)); > > - break; > > -- } > > -+ } else { > > -+ debug_nostop("Sent[%Zu]: ", out_len); > > -+ for (i=0; (unsigned int)i< out_len; i++) > > -+ debug_more("%x ", addressed_out[i]); > > -+ debug_more("\n"); > > -+ } > > - out_len -= res; > > - } > > - tpm_free(out); > > -+ tpm_free(addressed_out); > > - } > > - } > > - } while (in_len > 0); > > -- close(fh); > > -+ //close(fh); > > - } > > -+ > > - /* shutdown tpm emulator */ > > - tpm_emulator_shutdown(); > > -- /* close socket */ > > -- close(sock); > > -- unlink(opt_socket_name); > > -+ /* Close handles */ > > -+ close(vtpm_tx_fh); > > -+#ifndef VTPM_MULTI_VM > > -+ close(vtpm_rx_fh); > > -+ free(vtpm_rx_file); > > -+#endif > > - info("main loop stopped"); > > - } > > - > > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > > - /* open random device */ > > - init_random(); > > - /* init signal handlers */ > > -- init_signal_handler(); > > -+ //init_signal_handler(); > > - /* unless requested otherwiese, fork and daemonize process */ > > -- if (!opt_foreground) daemonize(); > > -+ //if (!opt_foreground) daemonize(); > > - /* start main processing loop */ > > - main_loop(); > > - info("stopping TPM Emulator daemon"); > > - closelog(); > > - return 0; > > - } > > -+ > > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > > -@@ -29,23 +29,28 @@ > > - > > - /* TPM emulator configuration */ > > - > > --#undef TPM_STRONG_PERSISTENCE > > --#undef TPM_GENERATE_EK > > -+#define TPM_STRONG_PERSISTENCE > > -+#define TPM_GENERATE_EK > > - #undef TPM_GENERATE_SEED_DAA > > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > > - > > -+extern int dmi_id; > > -+ > > - /* log macros */ > > - > > - void tpm_log(int priority, const char *fmt, ...); > > - > > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > > - > > - /* min/max macros that also do strict type-checking */ > > - > > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > > deleted file mode 100644 > > index e896b25..0000000 > > --- a/tools/vtpm/vtpm.patch > > +++ /dev/null > > @@ -1,716 +0,0 @@ > > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > > -@@ -1,3 +1,3 @@ > > - Mario Strasser > > - Heiko Stamer [DAA] > > --INTEL Corp <> [Dropped to Ring3] > > -+INTEL Corp <> [VTPM Extensions] > > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > > -@@ -1,5 +1,6 @@ > > - ????-??-?? Intel Corp > > - * Moved module out of kernel to run as a ring 3 app > > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > > - > > - 2006-06-23 Mario Strasser > > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > > -@@ -44,18 +44,26 @@ > > - #define TPM_DEVICE_NAME "tpm" > > - #define TPM_MODULE_NAME "tpm_emulator" > > - > > -+/* debug and log output functions */ > > -+extern int dmi_id; > > -+ > > - #ifdef DEBUG > > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > > - #else > > - #define debug(fmt, ...) > > -+#define debug_nostop(fmt, ...) > > -+#define debug_more(fmt, ...) > > - #endif > > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > - > > - /* memory allocation */ > > - > > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > > -@@ -7,7 +7,7 @@ > > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > > - > > - # module settings > > --BIN := tpm_emulator > > -+BIN := vtpmd > > - VERSION_MAJOR := 0 > > - VERSION_MINOR := 4 > > - VERSION_BUILD := $(shell date +"%s") > > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > > - > > - CC := gcc > > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > > --CFLAGS += -I. -Itpm > > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > > - > > - # Is the simulator running in it's own vm? > > - #CFLAGS += -DVTPM_MULTI_VM > > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > > - > > - install: $(BIN) > > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > > - > > - clean: > > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > > -@@ -98,3 +97,4 @@ version: > > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > > - > > - .PHONY: all install clean dist gmp version > > -+ > > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_TIS_TIMEOUT: > > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > > -+ UINT32 len = *respSize = 16; > > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > > -+ if (ptr == NULL || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > > -+ tpm_free(*resp); > > -+ return TPM_FAIL; > > -+ } > > -+ return TPM_SUCCESS; > > - > > - case TPM_CAP_PROP_STARTUP_EFFECT: > > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_DURATION: > > - debug("[TPM_CAP_PROP_DURATION]"); > > -- /* TODO: TPM_CAP_PROP_DURATION */ > > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > > -+ *respSize = 16; > > -+ *resp = tpm_malloc(*respSize); > > -+ memcpy(*resp,dur,16); > > - return TPM_FAIL; > > - > > - case TPM_CAP_PROP_ACTIVE_COUNTER: > > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > > - sha1_ctx_t sha1; > > - UINT32 res = CPU_TO_BE32(rsp->result); > > - UINT32 ord = CPU_TO_BE32(ordinal); > > -+ UINT32 offset = 0; > > - > > - /* compute SHA1 hash */ > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*)&res, 4); > > - sha1_update(&sha1, (BYTE*)&ord, 4); > > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > > -+ if (ordinal == TPM_ORD_LoadKey2) { > > -+ offset = 4; > > -+ } > > -+ if (rsp->paramSize - offset > 0) { > > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > > -+ } > > - sha1_final(&sha1, rsp->auth1->digest); > > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -15,10 +16,15 @@ > > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > > - */ > > - > > -+#include > > -+#include > > -+#include > > -+#include > > -+ > > - #include "tpm_emulator.h" > > - #include "tpm_structures.h" > > - #include "tpm_marshalling.h" > > --#include "linux_module.h" > > -+#include "vtpm_manager.h" > > - > > - TPM_DATA tpmData; > > - > > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > > - #include > > - #include > > - #include > > --#include > > - > > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ #define DEV_FE "/dev/tpm" > > -+#else > > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -+ > > -+ extern int dmi_id; > > -+ static char *vtpm_rx_name=NULL; > > -+#endif > > - > > - static int write_to_file(uint8_t *data, size_t data_length) > > - { > > -- int res; > > -- int fp; > > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- res = write(fp, data, data_length); > > -- close(fp); > > -- return (res == data_length) ? 0 : -1; > > -+ int res, out_data_size, in_header_size; > > -+ BYTE *ptr, *out_data, *in_header; > > -+ UINT32 result, len, in_rsp_size; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ > > -+ printf("Saving NVM\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > > -+#endif > > -+ > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > > -+ free(out_data); > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending SaveNVM Command.\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading SaveNVM header.\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > > -+#endif > > -+ > > -+ printf("\tFinishing up SaveNVM\n"); > > -+ return (0); > > - } > > - > > - static int read_from_file(uint8_t **data, size_t *data_length) > > - { > > -- int res; > > -- int fp, file_status; > > -- struct stat file_info; > > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -- file_status = fstat(fp, &file_info); > > -- if (file_status < 0) { > > -- close(fp); > > -- return -1; > > -- } > > -+ int res, out_data_size, in_header_size; > > -+ uint8_t *ptr, *out_data, *in_header; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ UINT32 len, in_rsp_size, result; > > -+#ifdef VTPM_MUTLI_VM > > -+ int vtpm_rx_fh, vtpm_tx_fh; > > -+#endif > > -+ > > -+ printf("Loading NVM.\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > - > > -- *data_length = file_info.st_size; > > -- *data = tpm_malloc(*data_length); > > -- if (*data == NULL) { > > -- close(fp); > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > > -+ free(out_data); > > - return -1; > > - } > > -- res = read(fp, *data, *data_length); > > -- close(fp); > > -+ > > -+ printf("\tSending LoadNVM command\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading LoadNVM header\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Encrypted data from VTPM Manager > > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > -+ *data = (uint8_t *) malloc(*data_length); > > -+ > > -+ printf("\tReading clear data from LoadNVM.\n"); > > -+ res = read(vtpm_rx_fh, *data, *data_length); > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > > -+#endif > > -+ > > -+ printf("\tReturing from loading NVM\n"); > > - if (res != *data_length) { > > -- tpm_free(*data); > > -- return -1; > > -+ free(*data); > > -+ return -1; > > -+ } else { > > -+ return 0; > > - } > > -- return 0; > > -+ > > - } > > - > > - #else > > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > > -@@ -21,12 +21,24 @@ > > - #include > > - #include > > - #include > > -+#include > > -+#include > > -+#include > > - > > - #include "tpm_emulator.h" > > -+#include "vtpm_manager.h" > > - > > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > > -+#ifdef VTPM_MULTI_VM > > -+ #define DEV_BE "/dev/vtpm" > > -+#else > > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > - > > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > > -+#endif > > -+ > > -+ int dmi_id; > > -+ > > - #define BUFFER_SIZE 2048 > > - > > - static int devurandom=0; > > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > > - } > > - > > - if (read(devurandom, buf, nbytes) != nbytes) { > > -- printf("Can't get random number.\n"); > > -+ error("Can't get random number.\n"); > > - exit(-1); > > - } > > - } > > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > > - > > - int main(int argc, char **argv) > > - { > > -- uint8_t in[BUFFER_SIZE], *out; > > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > > -+ char *vtpm_rx_file=NULL; > > - uint32_t out_size; > > - int in_size, written; > > -- int i; > > -- struct stat file_info; > > -+ int i, guest_id=-1; > > - > > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > > -+#ifndef VTPM_MULTI_VM > > -+ int sockfd = -1; > > -+ struct sockaddr_un addr; > > -+ struct sockaddr_un client_addr; > > -+ unsigned int client_length; > > -+ > > -+#endif > > -+ > > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+#ifdef VTPM_MULTI_VM > > - if (argc < 2) { > > -- printf("Usage: tpmd clear|save|deactivated\n" ); > > -+ error("Usage: tpmd clear|save|deactivated\n" ); > > -+#else > > -+ if (argc < 4) { > > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > > -+#endif > > - return -1; > > - } > > - > > -+#ifndef VTPM_MULTI_VM > > -+ /* setup type of vm */ > > -+ if (!strcmp(argv[2], "pvm")) { > > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > > -+ } else if (!strcmp(argv[2], "hvm")) { > > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > > -+ } else { > > -+ error("invalid vTPM type '%s'.\n", argv[2]); > > -+ } > > -+ > > -+ dmi_id = atoi(argv[3]); > > -+ > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } else { > > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ > > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > > -+ error("Unable to create socket. errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&addr, 0, sizeof(addr)); > > -+ addr.sun_family = AF_UNIX; > > -+ strcpy(addr.sun_path,vtpm_rx_file ); > > -+ unlink(addr.sun_path); > > -+ } > > -+#endif > > -+ > > -+#ifdef VTPM_MULTI_VM > > -+ info("Initializing tpm state: %s\n", argv[1]); > > -+#else > > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > > -+#endif > > -+ > > - /* initialize TPM emulator */ > > - if (!strcmp(argv[1], "clear")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > - tpm_emulator_init(1); > > -- } else if (!strcmp(argv[1], "save")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > -+ } else if (!strcmp(argv[1], "save")) { > > - tpm_emulator_init(2); > > - } else if (!strcmp(argv[1], "deactivated")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > - tpm_emulator_init(3); > > - } else { > > -- printf("invalid startup mode '%s'; must be 'clear', " > > -+ error("invalid startup mode '%s'; must be 'clear', " > > - "'save' (default) or 'deactivated", argv[1]); > > - return -1; > > - } > > -- > > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > > -- return -1; > > -- } > > -- } > > -- > > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > > -- return -1; > > -- } > > -- } > > -- > > -+ > > - while (1) { > > - abort_command: > > -- if (tpm_rx_fh < 0) { > > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > > -+#else > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > > -+ } else { > > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > > -+ error("Unable to bind(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ if (listen(sockfd, 10) <0) { > > -+ error("Unable to listen(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&client_addr, 0, sizeof(client_addr)); > > -+ client_length = sizeof(client_addr); > > -+ > > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > > -+ } > > -+#endif > > - } > > - > > -- if (tpm_rx_fh < 0) { > > -- printf("ERROR: failed to open devices to listen to guest.\n"); > > -+ if (vtpm_rx_fh < 0) { > > -+ error("Failed to open devices to listen to guest.\n"); > > - return -1; > > - } > > - > > -- if (tpm_tx_fh < 0) { > > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > > -- } > > -- > > -- if (tpm_tx_fh < 0) { > > -- printf("ERROR: failed to open devices to respond to guest.\n"); > > -- return -1; > > -- } > > -- > > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > > - if (in_size < 6) { // Magic size of minium TPM command > > -- printf("Recv[%d] to small: 0x", in_size); > > -+ info("Recv incomplete command of %d bytes.", in_size); > > - if (in_size <= 0) { > > -- close(tpm_rx_fh); > > -- tpm_rx_fh = -1; > > -+ close(vtpm_rx_fh); > > -+ vtpm_rx_fh = -1; > > - goto abort_command; > > - } > > - } else { > > -- printf("Recv[%d]: 0x", in_size); > > -+ debug_nostop("Recv[%d]: 0x", in_size); > > - for (i=0; i< in_size; i++) > > -- printf("%x ", in[i]); > > -- printf("\n"); > > -+ debug_more("%x ", in[i]); > > -+ debug_more("\n"); > > - } > > - > > -- > > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > > -- printf("ERROR: Handler Failed.\n"); > > -+ if (guest_id == -1) { > > -+ guest_id = *((uint32_t *) in); > > -+ } else { > > -+ if (guest_id != *((uint32_t *) in) ) { > > -+ error("WARNING: More than one guest attached\n"); > > -+ } > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > > -+ } // No need to open the other direction for HVM > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ error("Failed to open devices to respond to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Handle the command, but skip the domain id header > > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > > -+ error("Handler Failed.\n"); > > - } > > - > > -- written = write(tpm_tx_fh, out, out_size); > > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > > -+ > > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > > - > > -- if (written != out_size ) { > > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > > -+ if (written != out_size + sizeof(uint32_t)) { > > -+ error("Part of response not written %d/%d.\n", written, out_size); > > - } else { > > -- printf("Sent[%Zu]: ", out_size); > > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > > -+ debug_more("%x ", addressed_out[i]); > > -+ debug_more("\n"); > > - } > > -- for (i=0; i< out_size; i++) > > -- printf("%x ", out[i]); > > -- printf("\n"); > > - tpm_free(out); > > -+ tpm_free(addressed_out); > > - > > - } // loop > > - > > - tpm_emulator_shutdown(); > > - > > -- close(tpm_tx_fh); > > -- close(tpm_rx_fh); > > -+ close(vtpm_tx_fh); > > -+#ifndef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh); > > -+ free (vtpm_rx_file); > > -+#endif > > - > > - } > > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > > deleted file mode 100644 > > index c4b86b7..0000000 > > --- a/tools/vtpm_manager/COPYING > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > > deleted file mode 100644 > > index 632f41b..0000000 > > --- a/tools/vtpm_manager/Makefile > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../.. > > - > > -# Base definitions and rules > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -SUBDIRS = crypto tcs util manager migration > > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > > - > > -.PHONY: all clean install > > -all clean install: %: subdirs-% > > - > > -.PHONY: mrproper > > -mrproper: > > - @set -e; for subdir in $(SUBDIRS); do \ > > - $(MAKE) -C $$subdir $@; \ > > - done > > - > > - > > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > > deleted file mode 100644 > > index f0d1e98..0000000 > > --- a/tools/vtpm_manager/README > > +++ /dev/null > > @@ -1,94 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -Directory Structure > > -=================== > > -tools/vtpm_manager/crypto -> crypto files > > -tools/vtpm_manager/TCS -> TCS implementation > > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > > -tools/vtpm_manager/manager -> VTPM Manager > > - > > -Compile Flags > > -=================== > > -LOGGING_MODULES -> How extensive logging happens > > - see util/log.h for more info > > - > > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > > - Not Defined (default): VTPMs are processes > > - > > -# Debugging flags that may disappear without notice in the future > > - > > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > > - /tmp/out.fifo rather than backend > > - > > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > > - > > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > > - use a well known value. This is useful for debugging and for > > - poor bios which do not support clearing TPM if OwnerAuth is > > - lost. However this has no protection from malicious app > > - issuing a TPM_OwnerClear to wipe the TPM > > - > > -Requirements > > -============ > > -- xen-unstable > > -- vtpm frontend/backend driver patch > > -- OpenSSL Library > > - > > -Single-VM Flow > > -============================ > > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > > -- VTPM Manager listens to TPM BE. > > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > > -- When the manager receives the open message from the BE, it launches a vtpm > > -- Xend allows the VM to continue booting. > > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > > -- The fifo listener begins listening for the reply from vtpm for the request. > > -- Vtpm processes request and replies to manager over shared named fifo. > > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > > - > > -NOTES: > > -* SaveService SHOULD seal it's table before saving it to disk. However, > > - the current Xen infrastructure does not provide a mechanism for this to be > > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > > - to the service, or it's not even worth encrypting > > - > > - In the future the vtpm manager will be protected by an early boot mechanism > > - that will allow for better protection of it's data. > > - > > -TODO: > > -- Timeout on crashed vtpms > > -- create lock for shared fifo for talking to vtpms. > > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > > deleted file mode 100644 > > index 651772b..0000000 > > --- a/tools/vtpm_manager/Rules.mk > > +++ /dev/null > > @@ -1,59 +0,0 @@ > > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > > -include $(XEN_ROOT)/tools/Rules.mk > > - > > -# > > -# Tool definitions > > -# > > - > > -# General compiler flags > > -CFLAGS = -Werror -g3 > > - > > -# Generic project files > > -HDRS = $(wildcard *.h) > > -SRCS = $(wildcard *.c) > > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > > - > > -# Generic (non-header) dependencies > > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -$(OBJS): $(SRCS) > > - > > --include $(FILES) > > - > > -# Make sure these are just rules > > -.PHONY : all build install clean > > - > > -# > > -# Project-specific definitions > > -# > > - > > -# Need UNIX98 spec for pthread rwlocks > > -CFLAGS += -D_GNU_SOURCE > > - > > -# Logging Level. See utils/tools.h for usage > > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > > - > > -# Silent Mode > > -#CFLAGS += -DLOGGING_MODULES=0x0 > > -#CFLAGS += -DLOGGING_MODULES=0xff > > - > > -# Use frontend/backend pairs between manager & DMs? > > -#CFLAGS += -DVTPM_MULTI_VM > > - > > -# vtpm_manager listens on fifo's rather than backend > > -#CFLAGS += -DDUMMY_BACKEND > > - > > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > > -#CFLAGS += -DDUMMY_TPM > > - > > -# Do not have manager launch DMs. > > -#CFLAGS += -DMANUAL_DM_LAUNCH > > - > > -# Fixed OwnerAuth > > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > > - > > -# Include > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > > deleted file mode 100644 > > index 13b61c9..0000000 > > --- a/tools/vtpm_manager/crypto/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libtcpaCrypto.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > > deleted file mode 100644 > > index 7dae655..0000000 > > --- a/tools/vtpm_manager/crypto/crypto.c > > +++ /dev/null > > @@ -1,88 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// crypto.c > > -// > > -// This file will handle all the TPM Crypto functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include "crypto.h" > > -#include "log.h" > > - > > -/** > > - * Initialize cryptography library > > - * @rand: random seed > > - * @size: size of @rand > > - */ > > -void Crypto_Init(const BYTE* rand, int size) { > > - ERR_load_crypto_strings(); > > - CRYPTO_malloc_init(); > > - OpenSSL_add_all_algorithms(); > > - SYM_CIPHER = EVP_aes_128_cbc(); > > - RAND_poll(); > > - if (rand == NULL) > > - return; > > - > > - RAND_add(rand, size, size); > > -} > > - > > -/** > > - * Shutdown cryptography library > > - */ > > -void Crypto_Exit() { > > - ERR_free_strings(); > > - ERR_remove_state(0); > > - EVP_cleanup(); > > -} > > - > > - > > -/** > > - * Get random data > > - * @data: (OUT) Random data > > - * @size: Size of @data > > - */ > > -void Crypto_GetRandom(void* data, int size) { > > - int result; > > - > > - result = RAND_pseudo_bytes((BYTE*) data, size); > > - > > - if (result <= 0) > > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > > - ERR_error_string (ERR_get_error(), NULL)); > > -} > > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > > deleted file mode 100644 > > index 488d4d6..0000000 > > --- a/tools/vtpm_manager/crypto/crypto.h > > +++ /dev/null > > @@ -1,175 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// crypto.h > > -// > > -// This file defines the TPM Crypto API > > -// > > -// ================================================================== > > - > > -#ifndef __CRYPTO_H__ > > -#define __CRYPTO_H__ > > - > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "sym_crypto.h" > > - > > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > > - > > -#define OAEP_P "TCPA" > > -#define OAEP_P_SIZE 4 > > - > > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > > -#define CRYPTO_ALGORITH_RSA 0x01 > > - > > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > > -#define CRYPTO_ES_NONE 0x0001 > > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > > - > > -// Supported Signature schemes CRYPTO_INFO.sigScheme > > -#define CRYPTO_SS_NONE 0x0001 > > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > > - > > -typedef struct CRYPTO_INFO { > > - void *keyInfo; > > - UINT32 algorithmID; > > - UINT32 encScheme; > > - UINT32 sigScheme; > > -} CRYPTO_INFO; > > - > > - > > -void Crypto_Init(const BYTE* rand, int size); > > - > > -void Crypto_Exit(); > > - > > -void Crypto_GetRandom(void* data, int size); > > - > > -void Crypto_HMAC( const BYTE* text, > > - int text_len, > > - const BYTE* key, > > - int key_len, > > - BYTE* digest); > > - > > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > > - const buffer_t * key, > > - BYTE * o_digest); /* presumably of 20 bytes */ > > - > > -void Crypto_SHA1Full( const BYTE* text, > > - UINT32 size, > > - BYTE* hash); //Complete 3part SHA1 > > - > > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > > - BYTE * o_hash); > > - > > -void Crypto_SHA1Start(UINT32* maxNumBytes); > > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > > -void Crypto_SHA1Complete( int hashDataSize, > > - const BYTE* hashData, > > - BYTE* hashValue); > > - > > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > > - /*in*/ UINT32 pubExpSize, > > - /*in*/ BYTE *pubExp, > > - /*out*/ UINT32 *privExpSize, > > - /*out*/ BYTE *privExp, > > - /*out*/ UINT32 *modulusSize, > > - /*out*/ BYTE *modulus, > > - /*out*/ CRYPTO_INFO *keys); > > - > > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 privExpSize, > > - /*[IN]*/ BYTE *privExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > > - > > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo); > > - > > -// > > -// symmetric pack and unpack operations > > -// > > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > > - BYTE ** io_buf, UINT32 * io_buflen); > > - > > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > > - BYTE * in, UINT32 len, > > - UINT32 * o_lenread); > > - > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData); > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSADec( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData); > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSASign( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *sigSize, > > - /*out*/ BYTE *sig); > > - > > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - UINT32 sigSize, > > - BYTE *sig); > > - > > -//private: > > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > > - > > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > > - > > -#endif // __CRYPTO_H__ > > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > > deleted file mode 100644 > > index c73114a..0000000 > > --- a/tools/vtpm_manager/crypto/hash.c > > +++ /dev/null > > @@ -1,153 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// hash.c > > -// > > -// This file will handle all the TPM Hash functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" // for TPM_SUCCESS > > -#include "crypto.h" > > - > > -static SHA_CTX g_shaContext; > > - > > -void Crypto_HMAC( const BYTE* text, > > - int text_len, > > - const BYTE* key, > > - int key_len, > > - BYTE* digest) { > > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > > - return; > > - > > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > > -} > > - > > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > > - const buffer_t * key, > > - BYTE * o_digest) { /* presumably of 20 bytes */ > > - > > - Crypto_HMAC (text->bytes, text->size, > > - key->bytes, key->size, > > - o_digest); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -/* > > - * SHA1 > > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > > - */ > > -void Crypto_SHA1Full( const BYTE* text, > > - uint32_t size, > > - BYTE* hash) { > > - > > - if (text == NULL || size == 0) > > - return; > > - > > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > > - uint32_t maxBytes; // Not used for anything > > - Crypto_SHA1Start(&maxBytes); > > - > > - while (size > 64){ > > - Crypto_SHA1Update(64, text); > > - size -= 64; > > - text += 64; > > - } > > - > > - Crypto_SHA1Complete(size, text, hash); > > -} > > - > > -// same thing using buffer_t > > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > > - BYTE * o_digest) { > > - > > - if (buf->bytes == NULL || buf->size == 0) > > - return TPM_BAD_PARAMETER; > > - > > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -/* > > - * Initialize SHA1 > > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > > - * Must be a multiple of 64 bytes. > > - */ > > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > > - int max = SHA_CBLOCK; > > - // Initialize the crypto library > > - SHA1_Init(&g_shaContext); > > - *maxNumBytes = max; > > -} > > - > > -/* > > - * Process SHA1 > > - * @numBytes: (IN) The number of bytes in hashData. > > - * Must be a multiple of 64 bytes. > > - * @hashData: (IN) Bytes to be hashed. > > - */ > > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > > - > > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > > - return; > > - > > - SHA1_Update(&g_shaContext, hashData, numBytes); > > -} > > - > > -/* > > - * Complete the SHA1 process > > - * @hashDataSize: (IN) Number of bytes in hashData. > > - * Must be a multiple of 64 bytes. > > - * @hashData: (IN) Final bytes to be hashed. > > - * @hashValue: (OUT) The output of the SHA-1 hash. > > - */ > > -void Crypto_SHA1Complete(int hashDataSize, > > - const BYTE* hashData, > > - BYTE* hashValue) { > > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > > - SHA1_Final(hashValue, &g_shaContext); > > -} > > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > > deleted file mode 100644 > > index 7737dc6..0000000 > > --- a/tools/vtpm_manager/crypto/rsa.c > > +++ /dev/null > > @@ -1,434 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// rsa.c > > -// > > -// This file will handle all the TPM RSA crypto functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "crypto.h" > > -#include "log.h" > > - > > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > > - /*in*/ UINT32 pubExpSize, > > - /*in*/ BYTE *pubExp, > > - /*out*/ UINT32 *privExpSize, > > - /*out*/ BYTE *privExp, > > - /*out*/ UINT32 *modulusSize, > > - /*out*/ BYTE *modulus, > > - /*out*/ CRYPTO_INFO *keys) { > > - unsigned long e_value; > > - > > - if (pubExpSize == 0) // Default e = 2^16+1 > > - e_value = (0x01 << 16) + 1; > > - else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - e_value = (0x01 << 16) + 1; > > - } > > - > > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > > - > > - if (keys) { > > - keys->keyInfo = rsa; > > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > > - } > > - > > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > > -} > > - > > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > > -// If pubExp info is NULL, use TCG default. > > -// If there is a remainder while calculating the privExp, return FALSE. > > - > > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 privExpSize, > > - /*[IN]*/ BYTE *privExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo) { > > - cryptoInfo->keyInfo = RSA_new(); > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - rsa->e = BN_new(); > > - > > - if (pubExpSize == 0) { // Default e = 2^16+1 > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } > > - > > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > > -} > > - > > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > > -// If pubExp info is NULL, use TCG default. > > -// If there is a remainder while calculating the privExp, return FALSE. > > - > > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo) { > > - cryptoInfo->keyInfo = RSA_new(); > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - rsa->e = BN_new(); > > - > > - if (pubExpSize == 0) { // Default e = 2^16+1 > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } > > - > > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > > - > > -} > > - > > -int Crypto_RSAEnc( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData) { > > - RSA *rsa = (RSA *) key->keyInfo; > > - UINT32 paddedDataSize = RSA_size (rsa); > > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > > - int rc; > > - > > - if (paddedData == NULL) > > - return -1; > > - > > - *outDataSize = 0; > > - > > - switch (key->encScheme) { > > - case CRYPTO_ES_RSAESPKCSv15: > > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > > - rc = -1; > > - goto abort_egress; > > - } > > - break; > > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > > - rc = -1; > > - goto abort_egress; > > - } > > - break; > > - default: > > - rc = -1; > > - goto abort_egress; > > - } > > - > > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > > - if (rc == -1) > > - goto abort_egress; > > - > > - *outDataSize = rc; > > - > > - if (rc > 0) rc = 0; > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (paddedData) > > - free (paddedData); > > - return rc; > > - > > -} > > - > > -int Crypto_RSADec( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData) { > > - > > - RSA *rsa = (RSA *) key->keyInfo; > > - UINT32 paddedDataSize = RSA_size (rsa); > > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > > - int rc; > > - > > - if (paddedData == NULL) > > - goto abort_egress; > > - > > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - > > - paddedDataSize = rc; > > - > > - switch (key->encScheme) { > > - case CRYPTO_ES_RSAESPKCSv15: > > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > > - paddedData + 1, paddedDataSize - 1, > > - RSA_size(rsa)); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > > - ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - *outDataSize = rc; > > - break; > > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > > - paddedData + 1, paddedDataSize - 1, > > - RSA_size(rsa), > > - (BYTE *) OAEP_P, OAEP_P_SIZE); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > > - ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - *outDataSize = rc; > > - break; > > - default: > > - *outDataSize = 0; > > - } > > - > > - free(paddedData); paddedData = NULL; > > - goto egress; > > - > > - abort_egress: > > - > > - if (paddedData) > > - free (paddedData); > > - return -1; > > - > > - egress: > > - return 0; > > -} > > - > > -// Signs either a SHA1 digest of a message or a DER encoding of a message > > -// Textual messages MUST be encoded or Hashed before sending into this function > > -// It will NOT SHA the message. > > -int Crypto_RSASign( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *sigSize, > > - /*out*/ BYTE *sig) { > > - int status; > > - unsigned int intSigSize; > > - > > - switch(key->sigScheme) { > > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > > - break; > > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > > - status = 0; > > - break; > > - default: > > - status = 0; > > - } > > - > > - if (status == 0) { > > - *sigSize = 0; > > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > > - return -1; > > - } > > - > > - *sigSize = (UINT32) intSigSize; > > - return 0; > > -} > > - > > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - UINT32 sigSize, > > - BYTE *sig) { > > - int status; > > - > > - switch(key->sigScheme){ > > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > > - break; > > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > > - status = 0; > > - break; > > - default: > > - status = 0; > > - } > > - > > - if (status) > > - return(1); > > - else { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > > - return(0); > > - } > > - > > -} > > - > > -// helper which packs everything into a BIO! > > - > > -// packs the parameters first, then the private key, then the public key > > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > > -// *io_buflen > > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > > - BYTE ** io_buf, UINT32 * io_buflen) { > > - TPM_RESULT status = TPM_SUCCESS; > > - BYTE * buf; > > - long len, outlen = *io_buflen; > > - > > - const long PARAMSLEN = 3*sizeof(UINT32); > > - > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - BIO *mem = BIO_new(BIO_s_mem()); > > - > > - > > - // write the openssl keys to the BIO > > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_SIZE); > > - } > > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_SIZE); > > - } > > - > > - // get the buffer out > > - len = BIO_get_mem_data (mem, &buf); > > - > > - // see if we need to allocate a return buffer > > - if (*io_buf == NULL) { > > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > > - if (*io_buf == NULL) > > - ERRORDIE (TPM_SIZE); > > - } else { // *io_buf is already allocated > > - if (outlen < len + PARAMSLEN) > > - ERRORDIE (TPM_SIZE); // but not large enough! > > - } > > - > > - // copy over the parameters (three UINT32's starting at algorithmID) > > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > > - > > - // copy over the DER keys > > - memcpy (*io_buf + PARAMSLEN, buf, len); > > - > > - *io_buflen = len + PARAMSLEN; > > - > > - goto egress; > > - > > - > > - abort_egress: > > - egress: > > - > > - BIO_free (mem); > > - > > - return status; > > -} > > - > > - > > - > > -// sets up ci, and returns the number of bytes read in o_lenread > > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > > - BYTE * in, UINT32 len, > > - UINT32 * o_lenread) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - long l; > > - BIO *mem; > > - RSA *rsa; > > - > > - // first load up the params > > - l = 3 * sizeof(UINT32); > > - memcpy (&ci->algorithmID, in, l); > > - len -= l; > > - in += l; > > - > > - // and now the openssl keys, private first > > - mem = BIO_new_mem_buf (in, len); > > - > > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_BAD_PARAMETER); > > - } > > - // now use the same RSA object and fill in the private key > > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_BAD_PARAMETER); > > - } > > - > > - ci->keyInfo = rsa; // needs to be freed somehow later > > - > > - // FIXME: havent figured out yet how to tell how many bytes were read in the > > - // above oprations! so o_lenread is not set > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - BIO_free (mem); > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > > deleted file mode 100644 > > index 3d86e19..0000000 > > --- a/tools/vtpm_manager/crypto/sym_crypto.c > > +++ /dev/null > > @@ -1,237 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// sym_crypto.c > > -// > > -// Symmetric crypto portion of crypto > > -// > > -// ================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "sym_crypto.h" > > - > > -typedef enum crypt_op_type_t { > > - CRYPT_ENCRYPT, > > - CRYPT_DECRYPT > > -} crypt_op_type_t; > > - > > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > > - const buffer_t* in, > > - const buffer_t* iv, > > - buffer_t * out, > > - crypt_op_type_t optype); > > - > > - > > -// this is initialized in Crypto_Init() > > -const EVP_CIPHER * SYM_CIPHER = NULL; > > - > > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > > - > > - > > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - EVP_CIPHER_CTX_init (&key->context); > > - > > - key->cipher = SYM_CIPHER; > > - > > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > > - > > - goto egress; > > - > > - abort_egress: > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > > - int res; > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // hmm, EVP_CIPHER_CTX_init does not return a value > > - EVP_CIPHER_CTX_init (&key->context); > > - > > - key->cipher = SYM_CIPHER; > > - > > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > > - > > - // and generate the key material > > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > > - if (res < 0) > > - ERRORDIE (TPM_SHORTRANDOM); > > - > > - > > - goto egress; > > - > > - abort_egress: > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - buffer_free (&key->key); > > - > > - egress: > > - return status; > > -} > > - > > - > > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > > - const buffer_t* clear, > > - buffer_t* o_cipher) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t iv, cipher_alias; > > - > > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > > - > > - buffer_init (o_cipher, > > - clear->size + > > - EVP_CIPHER_iv_length(key->cipher) + > > - EVP_CIPHER_block_size (key->cipher), > > - 0); > > - > > - // copy the IV into the front > > - buffer_copy (o_cipher, &iv); > > - > > - // make an alias into which we'll put the ciphertext > > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > > - > > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > > - > > - // set the output size correctly > > - o_cipher->size += cipher_alias.size; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > - > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > > - const buffer_t* cipher, > > - buffer_t* o_clear) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t iv, cipher_alias; > > - > > - // alias for the IV > > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > > - > > - // make an alias to where the ciphertext is, after the IV > > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > > - > > - // prepare the output buffer > > - TPMTRYRETURN( buffer_init (o_clear, > > - cipher->size > > - - EVP_CIPHER_iv_length(key->cipher) > > - + EVP_CIPHER_block_size(key->cipher), > > - 0) ); > > - > > - // and decrypt > > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > > - > > - goto egress; > > - > > - abort_egress: > > - buffer_free (o_clear); > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > > - buffer_memset (&key->key, 0); > > - buffer_free (&key->key); > > - > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > > - const buffer_t* in, > > - const buffer_t* iv, > > - buffer_t * out, > > - crypt_op_type_t optype) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - int inlen, outlen; > > - tpm_size_t running; > > - > > - if ( ! EVP_CipherInit_ex (&key->context, > > - key->cipher, NULL, key->key.bytes, iv->bytes, > > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > > - ERRORDIE (TPM_FAIL); > > - > > - > > - > > - inlen = in->size; > > - > > - outlen = 0; > > - running = 0; > > - > > - > > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > > - ERRORDIE (TPM_FAIL); > > - > > - running += outlen; > > - > > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > > - ERRORDIE (TPM_FAIL); > > - > > - running += outlen; > > - > > - out->size = running; > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > > deleted file mode 100644 > > index 7fb59a8..0000000 > > --- a/tools/vtpm_manager/crypto/sym_crypto.h > > +++ /dev/null > > @@ -1,72 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// sym_crypto.h > > -// > > -// Symmetric Crypto > > -// > > -// ================================================================== > > - > > -#ifndef _SYM_CRYPTO_H > > -#define _SYM_CRYPTO_H > > - > > -#include > > -#include "buffer.h" > > - > > -typedef struct symkey_t { > > - buffer_t key; > > - > > - EVP_CIPHER_CTX context; > > - const EVP_CIPHER * cipher; > > -} symkey_t; > > - > > -extern const EVP_CIPHER * SYM_CIPHER; > > - > > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > > - > > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > > - > > - > > -// these functions will allocate their output buffers > > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > > - const buffer_t* clear, > > - buffer_t* o_cipher); > > - > > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > > - const buffer_t* cipher, > > - buffer_t* o_clear); > > - > > -// only free the internal parts, not the 'key' ptr > > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > > - > > -#endif /* _SYM_CRYPTO_H */ > > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > > deleted file mode 100644 > > index a33c18a..0000000 > > --- a/tools/vtpm_manager/manager/Makefile > > +++ /dev/null > > @@ -1,38 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = vtpm_managerd > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > > - fi > > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > > - fi > > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > > - > > -.PHONY: clean > > -clean: > > - rm -f $(BIN) > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -# libraries > > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > > -CFLAGS += $(PTHREAD_CFLAGS) > > -LDFLAGS += $(PTHREAD_LDFLAGS) > > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > > deleted file mode 100644 > > index 5c3cf7e..0000000 > > --- a/tools/vtpm_manager/manager/dmictl.c > > +++ /dev/null > > @@ -1,266 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// dmictl.c > > -// > > -// Functions for creating and destroying DMIs > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpmpriv.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "vtpm_ipc.h" > > - > > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > > - > > -// if dmi_res is non-null, then return a pointer to new object. > > -// Also, this does not fill in the measurements. They should be filled by > > -// design dependent code or saveNVM > > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > > - > > - TPM_RESULT status=TPM_SUCCESS; > > - VTPM_DMI_RESOURCE *new_dmi=NULL; > > - UINT32 *dmi_id_key=NULL; > > - > > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > > - new_dmi->dmi_id = dmi_id; > > - new_dmi->dmi_type = dmi_type; > > - new_dmi->connected = FALSE; > > - new_dmi->TCSContext = 0; > > - > > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > > - > > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - *dmi_id_key = new_dmi->dmi_id; > > - > > - // install into map > > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - > > - if (dmi_res) > > - *dmi_res = new_dmi; > > - > > - goto egress; > > - > > - abort_egress: > > - if (new_dmi) { > > - free(new_dmi->NVMLocation); > > - free(new_dmi); > > - } > > - free(dmi_id_key); > > - > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > > - if (dmi_res == NULL) > > - return TPM_SUCCESS; > > - > > - if (dmi_res->dmi_id == VTPM_CTL_DM) > > - return(TPM_BAD_PARAMETER); > > - > > - TCS_CloseContext(dmi_res->TCSContext); > > - dmi_res->connected = FALSE; > > - > > - vtpm_globals->connected_dmis--; > > - > > - return (VTPM_Close_DMI_Extra(dmi_res) ); > > -} > > - > > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > > - > > - VTPM_DMI_RESOURCE *new_dmi=NULL; > > - TPM_RESULT status=TPM_FAIL; > > - BYTE dmi_type, vm_type, startup_mode; > > - UINT32 dmi_id; > > - > > - if (param_buf == NULL) { // Assume creation of Dom 0 control > > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > > - dmi_id = VTPM_CTL_DM; > > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } else { > > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > > - BSG_UnpackList( param_buf->bytes, 4, > > - BSG_TYPE_BYTE, &dmi_type, > > - BSG_TYPE_BYTE, &startup_mode, > > - BSG_TYPE_BYTE, &vm_type, > > - BSG_TYPE_UINT32, &dmi_id); > > - } > > - > > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (new_dmi == NULL) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > > - // Brand New DMI. Initialize the persistent pieces > > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > > - } else > > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > > - > > - if (new_dmi->connected) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Initialize the Non-persistent pieces > > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > > - > > - new_dmi->connected = TRUE; > > - > > - // Design specific new DMI code. > > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > > - close_dmi(new_dmi ); > > - > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *dmi_res=NULL; > > - UINT32 dmi_id; > > - > > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - BSG_UnpackList( param_buf->bytes, 1, > > - BSG_TYPE_UINT32, &dmi_id); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > > - > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (dmi_res == NULL ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (!dmi_res->connected) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Close Dmi > > - TPMTRYRETURN(close_dmi( dmi_res )); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *dmi_res=NULL; > > - UINT32 dmi_id; > > - > > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - BSG_UnpackList( param_buf->bytes, 1, > > - BSG_TYPE_UINT32, &dmi_id); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > > - > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > > - if (dmi_res == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - //vtpm scripts delete file dmi_res->NVMLocation for us > > - > > - // Close DMI first > > - TPMTRYRETURN(close_dmi( dmi_res )); > > - free ( dmi_res ); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > > deleted file mode 100644 > > index 54da708..0000000 > > --- a/tools/vtpm_manager/manager/migration.c > > +++ /dev/null > > @@ -1,307 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// dmictl.c > > -// > > -// Functions for creating and destroying DMIs > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpmpriv.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "hashtable.h" > > - > > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > > - UINT32 dmi_id; > > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > > - > > - if (param_buf == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - struct pack_buf_t enc_dmi_state_pack; > > - > > - BSG_UnpackList(param_buf->bytes, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > > - > > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (mig_dmi) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** UnBind Blob **/ > > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > > - enc_dmi_state_pack.size, > > - enc_dmi_state_pack.data) ); > > - > > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > > - vtpm_globals->manager_tcs_handle, > > - vtpm_globals->storageKeyHandle, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - &clear_dmi_blob) ); > > - > > - // Create new dmi > > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > > - > > - /** Open Blob **/ > > - struct pack_buf_t dmi_state_pack; > > - > > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > > - > > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > > - dmi_state_pack.size, > > - dmi_state_pack.data) ); > > - > > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > > - > > - egress: > > - buffer_free(&clear_dmi_blob); > > - buffer_free(&dmi_state_abuf); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *mig_dmi; > > - UINT32 dmi_id; > > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > > - > > - if (param_buf == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - struct pack_buf_t name_pack; > > - > > - BSG_UnpackList( param_buf->bytes, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_SIZE32_DATA, &name_pack); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > > - > > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (mig_dmi == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** Find migration key for dest **/ > > - last_mig = NULL; > > - mig_key = vtpm_globals->mig_keys; > > - while (mig_key != NULL) { > > - if (mig_key->name_size == name_pack.size) > > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > > - break; > > - } > > - > > - last_mig = mig_key; > > - mig_key = mig_key->next; > > - } > > - > > - if (!mig_key) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** Mark vtpm as migrated **/ > > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > > - > > - /** Build Blob **/ > > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > > - > > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > > - > > - struct pack_constbuf_t dmi_state_pack; > > - > > - dmi_state_pack.size = buffer_len(&dmi_state); > > - dmi_state_pack.data = dmi_state.bytes; > > - > > - BSG_PackList(clear_dmi_blob.bytes, 2, > > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > > - > > - /** Bind Blob **/ > > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > > - &mig_key->key, > > - result_buf) ); > > - > > - if (last_mig) > > - last_mig->next = mig_key->next; > > - else > > - vtpm_globals->mig_keys = mig_key->next; > > - > > - free(mig_key->name); > > - free(mig_key); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > > - > > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > > - > > - egress: > > - > > - buffer_free(&clear_dmi_blob); > > - buffer_free(&dmi_state); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > > - > > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > > - TPM_KEY mig_key; > > - > > - // Unpack/return key structure > > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - mig_key.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > > - pubkey_exp_pack.data = rsaKeyParms.exponent; > > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > > - pubkey_mod_pack.data = mig_key.pubKey.key; > > - > > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > > - pubkey_exp_pack.size + > > - pubkey_mod_pack.size, NULL ) ); > > - > > - BSG_PackList( result_buf->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > > - > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_MIGKEY_LIST *mig_key; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > > - > > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > > - > > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > > - > > - //FIXME: scan list and verify name is not already in the list > > - > > - BSG_UnpackList( param_buf->bytes, 3, > > - BSG_TPM_SIZE32_DATA, &name_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > > - > > - //TODO: Maintain a persistent list for pub_keys. > > - //TODO: Verify pub_key is trusted > > - > > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > > - mig_key->name_size = name_pack.size; > > - mig_key->name = name_pack.data; > > - > > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > > - pubkey_exp_pack.data, > > - pubkey_mod_pack.size, > > - pubkey_mod_pack.data, > > - &mig_key->key); > > - > > - > > - mig_key->next = vtpm_globals->mig_keys; > > - vtpm_globals->mig_keys = mig_key; > > - > > - // free(name_pack.data); Do not free. data is now part of mig_key. > > - free(pubkey_exp_pack.data); > > - free(pubkey_mod_pack.data); > > - > > - return TPM_SUCCESS; > > -} > > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > > deleted file mode 100644 > > index d5e6ffd..0000000 > > --- a/tools/vtpm_manager/manager/securestorage.c > > +++ /dev/null > > @@ -1,512 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// securestorage.c > > -// > > -// Functions regarding securely storing DMI secrets. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "crypto.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "buffer.h" > > -#include "log.h" > > - > > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > > - CRYPTO_INFO *asymkey, > > - buffer_t *sealed_data) { > > - TPM_RESULT status = TPM_SUCCESS; > > - symkey_t symkey; > > - buffer_t data_cipher = NULL_BUF, > > - symkey_cipher = NULL_BUF; > > - > > - UINT32 i; > > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > > - for (i=0; i< buffer_len(inbuf); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - // Generate a sym key and encrypt state with it > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > > - > > - // Encrypt symmetric key > > - TPMTRYRETURN( VTSP_Bind( asymkey, > > - &symkey.key, > > - &symkey_cipher) ); > > - > > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > > - > > - symkey_cipher32.size = buffer_len(&symkey_cipher); > > - symkey_cipher32.data = symkey_cipher.bytes; > > - > > - data_cipher32.size = buffer_len(&data_cipher); > > - data_cipher32.data = data_cipher.bytes; > > - > > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > > - > > - BSG_PackList(sealed_data->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > > - BSG_TPM_SIZE32_DATA, &data_cipher32); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > > - for (i=0; i< buffer_len(sealed_data); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > > - > > - egress: > > - > > - buffer_free ( &data_cipher); > > - buffer_free ( &symkey_cipher); > > - Crypto_symcrypto_freekey (&symkey); > > - > > - return status; > > -} > > - > > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > > - TCS_CONTEXT_HANDLE TCSContext, > > - TPM_HANDLE keyHandle, > > - const TPM_AUTHDATA *key_usage_auth, > > - buffer_t *unsealed_data) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - symkey_t symkey; > > - buffer_t data_cipher = NULL_BUF, > > - symkey_clear = NULL_BUF, > > - symkey_cipher = NULL_BUF; > > - struct pack_buf_t symkey_cipher32, data_cipher32; > > - int i; > > - > > - memset(&symkey, 0, sizeof(symkey_t)); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > > - for (i=0; i< buffer_len(cipher); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - BSG_UnpackList(cipher->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > > - BSG_TPM_SIZE32_DATA, &data_cipher32); > > - > > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > > - symkey_cipher32.size, > > - symkey_cipher32.data) ); > > - > > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > > - data_cipher32.size, > > - data_cipher32.data) ); > > - > > - // Decrypt Symmetric Key > > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > > - keyHandle, > > - &symkey_cipher, > > - key_usage_auth, > > - &symkey_clear, > > - &(vtpm_globals->keyAuth) ) ); > > - > > - // create symmetric key using saved bits > > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > > - > > - // Decrypt State > > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > > - for (i=0; i< buffer_len(unsealed_data); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > > - > > - egress: > > - buffer_free ( &data_cipher); > > - buffer_free ( &symkey_clear); > > - buffer_free ( &symkey_cipher); > > - Crypto_symcrypto_freekey (&symkey); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - int fh; > > - long bytes_written; > > - buffer_t sealed_NVM = NULL_BUF; > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > > - > > - TPMTRYRETURN( envelope_encrypt(inbuf, > > - &vtpm_globals->storageKey, > > - &sealed_NVM) ); > > - > > - // Write sealed blob off disk from NVMLocation > > - // TODO: How to properly return from these. Do we care if we return failure > > - // after writing the file? We can't get the old one back. > > - // TODO: Backup old file and try and recover that way. > > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - close(fh); > > - > > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > > - > > - egress: > > - buffer_free(&sealed_NVM); > > - return status; > > -} > > - > > - > > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t sealed_NVM = NULL_BUF; > > - long fh_size; > > - int fh, stat_ret, i; > > - struct stat file_stat; > > - TPM_DIGEST sealedNVMHash; > > - > > - if (myDMI->NVMLocation == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > > - status = TPM_AUTHFAIL; > > - goto abort_egress; > > - } > > - > > - //Read sealed blob off disk from NVMLocation > > - fh = open(myDMI->NVMLocation, O_RDONLY); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - fh_size = file_stat.st_size; > > - else { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - close(fh); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > > - > > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > > - > > - // Verify measurement of sealed blob. > > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > > - for (i=0; i< sizeof(TPM_DIGEST); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > > - for (i=0; i< sizeof(TPM_DIGEST); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - status = TPM_AUTHFAIL; > > - goto abort_egress; > > - } > > - > > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > > - myDMI->TCSContext, > > - vtpm_globals->storageKeyHandle, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - outbuf) ); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > > - > > - egress: > > - buffer_free( &sealed_NVM ); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTPM_SaveManagerData(void) { > > - TPM_RESULT status=TPM_SUCCESS; > > - int fh, dmis=-1; > > - > > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > > - > > - struct hashtable_itr *dmi_itr; > > - VTPM_DMI_RESOURCE *dmi_res; > > - > > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > > - > > - // Initially fill these with buffer sizes for each data type. Later fill > > - // in actual size, once flattened. > > - boot_key_size = sizeof(UINT32) + // bootkeysize > > - bootKeySize; // boot key > > - > > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > > - 3*sizeof(TPM_DIGEST) + // Auths > > - sizeof(UINT32) +// storagekeysize > > - storageKeySize, NULL) ); // storage key > > - > > - > > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > > - > > - boot_key_size = BSG_PackList(flat_boot_key, 1, > > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > > - > > - BSG_PackList(clear_flat_global.bytes, 4, > > - BSG_TYPE_BYTE, &vtpm_manager_gen, > > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > > - > > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > > - &vtpm_globals->bootKey, > > - &enc_flat_global) ); > > - > > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > > - > > - // Per DMI values to be saved (if any exit) > > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > > - > > - flat_dmis = (BYTE *) malloc( > > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > > - > > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > > - do { > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > > - dmis++; > > - > > - // No need to save dmi0. > > - if (dmi_res->dmi_id == 0) > > - continue; > > - > > - > > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > > - > > - } while (hashtable_iterator_advance(dmi_itr)); > > - } > > - > > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > > - if (fh == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - free(flat_boot_key); > > - free(flat_enc); > > - buffer_free(&enc_flat_global); > > - free(flat_dmis); > > - close(fh); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > > - return status; > > -} > > - > > -TPM_RESULT VTPM_LoadManagerData(void) { > > - > > - TPM_RESULT status=TPM_SUCCESS; > > - int fh, stat_ret, dmis=0; > > - long fh_size = 0, step_size; > > - BYTE *flat_table=NULL; > > - buffer_t unsealed_data, enc_table_abuf; > > - struct pack_buf_t storage_key_pack, boot_key_pack; > > - UINT32 *dmi_id_key, enc_size; > > - BYTE vtpm_manager_gen; > > - > > - VTPM_DMI_RESOURCE *dmi_res; > > - UINT32 dmi_id; > > - BYTE dmi_type; > > - struct stat file_stat; > > - > > - TPM_HANDLE boot_key_handle; > > - TPM_AUTHDATA boot_usage_auth; > > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > > - > > - fh = open(STATE_FILE, O_RDONLY ); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - fh_size = file_stat.st_size; > > - else { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - flat_table = (BYTE *) malloc(fh_size); > > - > > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Read Boot Key > > - step_size = BSG_UnpackList( flat_table, 2, > > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > > - BSG_TYPE_UINT32, &enc_size); > > - > > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > > - > > - //Load Boot Key > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->bootKeyWrap, > > - &SRK_AUTH, > > - &boot_key_handle, > > - &vtpm_globals->keyAuth, > > - &vtpm_globals->bootKey, > > - FALSE) ); > > - > > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > > - vtpm_globals->manager_tcs_handle, > > - boot_key_handle, > > - (const TPM_AUTHDATA*) &boot_usage_auth, > > - &unsealed_data) ); > > - step_size += enc_size; > > - > > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > > - // Once there is more than one gen, this will include some compatability stuff > > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > > - } > > - > > - // Global Values needing to be saved > > - BSG_UnpackList( unsealed_data.bytes, 4, > > - BSG_TYPE_BYTE, &vtpm_manager_gen, > > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > > - > > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > > - > > - // Per DMI values to be saved > > - while ( step_size < fh_size ){ > > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > > - step_size = fh_size; > > - } else { > > - step_size += BSG_UnpackList(flat_table + step_size, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TYPE_BYTE, &dmi_type); > > - > > - //TODO: Try and gracefully recover from problems. > > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > > - dmis++; > > - > > - step_size += BSG_UnpackList(flat_table + step_size, 2, > > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > > - } > > - > > - } > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > > - egress: > > - > > - free(flat_table); > > - close(fh); > > - > > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > > deleted file mode 100644 > > index 9b1e5f8..0000000 > > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > > +++ /dev/null > > @@ -1,110 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tpmpassthrough.c > > -// > > -// Functions regarding passing DMI requests to HWTPM > > -// > > -// ================================================================== > > - > > -#include "tcg.h" > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "log.h" > > - > > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > > - buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE *ord; > > - > > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > > - > > - switch (*ord) { > > - > > - // Forbidden for DMI use > > - case TPM_ORD_TakeOwnership: > > - case TPM_ORD_ChangeAuthOwner: > > - case TPM_ORD_DirWriteAuth: > > - case TPM_ORD_DirRead: > > - case TPM_ORD_AuthorizeMigrationKey: > > - case TPM_ORD_CreateMaintenanceArchive: > > - case TPM_ORD_LoadMaintenanceArchive: > > - case TPM_ORD_KillMaintenanceFeature: > > - case TPM_ORD_LoadManuMaintPub: > > - case TPM_ORD_ReadManuMaintPub: > > - case TPM_ORD_SelfTestFull: > > - case TPM_ORD_SelfTestStartup: > > - case TPM_ORD_CertifySelfTest: > > - case TPM_ORD_ContinueSelfTest: > > - case TPM_ORD_GetTestResult: > > - case TPM_ORD_Reset: > > - case TPM_ORD_OwnerClear: > > - case TPM_ORD_DisableOwnerClear: > > - case TPM_ORD_ForceClear: > > - case TPM_ORD_DisableForceClear: > > - case TPM_ORD_GetCapabilityOwner: > > - case TPM_ORD_OwnerSetDisable: > > - case TPM_ORD_PhysicalEnable: > > - case TPM_ORD_PhysicalDisable: > > - case TPM_ORD_SetOwnerInstall: > > - case TPM_ORD_PhysicalSetDeactivated: > > - case TPM_ORD_SetTempDeactivated: > > - case TPM_ORD_CreateEndorsementKeyPair: > > - case TPM_ORD_GetAuditEvent: > > - case TPM_ORD_GetAuditEventSigned: > > - case TPM_ORD_GetOrdinalAuditStatus: > > - case TPM_ORD_SetOrdinalAuditStatus: > > - case TPM_ORD_SetRedirection: > > - case TPM_ORD_FieldUpgrade: > > - case TSC_ORD_PhysicalPresence: > > - status = TPM_DISABLED_CMD; > > - goto abort_egress; > > - break; > > - > > - } // End ORD Switch > > - > > - // Call TCS with command > > - > > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > > deleted file mode 100644 > > index 319dc83..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > > +++ /dev/null > > @@ -1,141 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_ipc.c Implements ipc routines using file io. This file can > > -// be replaced with other ipc types. > > -// > > -// =================================================================== > > - > > -#include > > -#include "vtpm_ipc.h" > > -#include "vtpmpriv.h" > > -#include "log.h" > > - > > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > > - ipc_h->name = name; > > - ipc_h->flags = flags; > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - > > - if (create) > > - return(vtpm_ipc_create(ipc_h)); > > - else > > - return 0; > > -} > > - > > -// Create the file that needs opening. Used only for FIFOs > > -// FYI: This may cause problems in other file IO schemes. We'll see. > > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > > - int fh; > > - struct stat file_info; > > - > > - if ((!ipc_h) || (!ipc_h->name)) > > - return -1; > > - > > - if ( stat(ipc_h->name, &file_info) == -1) { > > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > > - return -1; > > - } > > - } > > - > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - > > - return 0; > > -} > > - > > - > > -// Read size bytes. If FH isn't open, open it. > > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > > - vtpm_ipc_handle_t *my_ipc_h; > > - int result; > > - > > - if (ipc_h) { > > - my_ipc_h = ipc_h; > > - } else { > > - my_ipc_h = alt_ipc_h; > > - } > > - > > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > > - } > > - > > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > > - return -1; > > - } > > - > > - result = read(my_ipc_h->fh, bytes, size); > > - if (result < 0) { > > - my_ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > - return (result); > > -} > > - > > -// Write size bytes. If FH isn't open, open it. > > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > > - vtpm_ipc_handle_t *my_ipc_h; > > - int result; > > - > > - if (ipc_h) { > > - my_ipc_h = ipc_h; > > - } else { > > - my_ipc_h = alt_ipc_h; > > - } > > - > > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > > - } > > - > > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > > - return -1; > > - } > > - > > - result = write(my_ipc_h->fh, bytes, size); > > - if (result < 0) { > > - my_ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > - return (result); > > -} > > - > > -// Mark file as closed and try and close it. Errors not reported. > > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > > - > > - if (ipc_h) { > > - close(ipc_h->fh); > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > > deleted file mode 100644 > > index 529c4a2..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > > +++ /dev/null > > @@ -1,71 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > > -// and Guests or VTPMs > > -// > > -// =================================================================== > > - > > -#ifndef __VTPM_IO_H__ > > -#define __VTPM_IO_H__ > > - > > -#include "tcg.h" > > - > > -#define VTPM_IPC_CLOSED -1 > > - > > -// Represents an (somewhat) abstracted io handle. > > -typedef struct vtpm_ipc_handle_t { > > - int fh; // IO handle. > > - int flags; // Flags for opening. This may need to become > > - // a void *, but for now files use an int. > > - char *name; // Names for debugging as well as filenames > > - // for file-based io. > > -} vtpm_ipc_handle_t; > > - > > - > > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > > - > > -// Create the file that needs opening. Used only for FIFOs > > -// FYI: This may cause problems in other file IO schemes. We'll see. > > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > > - > > -// Read size bytes. If FH isn't open, open it. > > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > > - > > -// Write size bytes. If FH isn't open, open it. > > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > > - > > -// Mark file as closed and try and close it. Errors not reported. > > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > > - > > -#endif > > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > > deleted file mode 100644 > > index e737d60..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_lock.c > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > > -// > > -// =================================================================== > > - > > -#include > > -#include "vtpm_lock.h" > > - > > -static pthread_rwlock_t vtpm_lock; > > - > > -void vtpm_lock_init() { > > - > > - pthread_rwlock_init( &vtpm_lock, NULL); > > -} > > - > > -void vtpm_lock_destroy(){ > > - pthread_rwlock_destroy(&vtpm_lock); > > -} > > - > > -void vtpm_lock_rdlock(){ > > - pthread_rwlock_rdlock(&vtpm_lock); > > -} > > - > > -void vtpm_lock_wrlock(){ > > - pthread_rwlock_wrlock(&vtpm_lock); > > -} > > - > > -void vtpm_lock_unlock(){ > > - pthread_rwlock_unlock(&vtpm_lock); > > -} > > - > > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > > deleted file mode 100644 > > index 53a339d..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_lock.h > > +++ /dev/null > > @@ -1,48 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > > -// > > -// =================================================================== > > - > > -#ifndef __VTPM_LOCK_H__ > > -#define __VTPM_LOCK_H__ > > - > > -void vtpm_lock_init(); > > -void vtpm_lock_destroy(); > > - > > -void vtpm_lock_rdlock(); > > -void vtpm_lock_wrlock(); > > -void vtpm_lock_unlock(); > > - > > -#endif > > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > > deleted file mode 100644 > > index e089f78..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager.c > > +++ /dev/null > > @@ -1,285 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager.c > > -// > > -// This file will house the main logic of the VTPM Manager > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > - > > -#include "log.h" > > -#include "buffer.h" > > - > > -VTPM_GLOBALS *vtpm_globals=NULL; > > - > > -// --------------------------- Well Known Auths -------------------------- > > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > > - > > -#ifdef WELL_KNOWN_OWNER_AUTH > > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > > -#endif > > - > > - > > -// -------------------------- Hash table functions -------------------- > > - > > -static unsigned int hashfunc32(void *ky) { > > - return (* (UINT32 *) ky); > > -} > > - > > -static int equals32(void *k1, void *k2) { > > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > > -} > > - > > -// --------------------------- Functions ------------------------------ > > - > > -TPM_RESULT VTPM_Create_Manager(){ > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Generate Auth for Owner > > -#ifdef WELL_KNOWN_OWNER_AUTH > > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > > -#else > > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > > -#endif > > - > > - // Take Owership of TPM > > - CRYPTO_INFO ek_cryptoInfo; > > - > > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > > - > > - // If we can read PubEK then there is no owner and we should take it. > > - // We use the abilty to read the pubEK to flag that the TPM is owned. > > - // FIXME: Change to just trying to take ownership and react to the status > > - if (status == TPM_SUCCESS) { > > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > > - &SRK_AUTH, > > - &ek_cryptoInfo, > > - &vtpm_globals->keyAuth)); > > - > > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > > - &vtpm_globals->keyAuth)); > > - } else { > > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > > - } > > - > > - // Generate storage key's auth > > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > > - sizeof(TPM_AUTHDATA) ); > > - > > - TCS_AUTH osap; > > - TPM_AUTHDATA sharedsecret; > > - > > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > > - TPM_ET_KEYHANDLE, > > - TPM_SRK_KEYHANDLE, > > - &SRK_AUTH, > > - &sharedsecret, > > - &osap) ); > > - > > - osap.fContinueAuthSession = FALSE; > > - > > - > > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > > - TPM_KEY_BIND, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - TPM_SRK_KEYHANDLE, > > - (const TPM_AUTHDATA*)&sharedsecret, > > - &vtpm_globals->storageKeyWrap, > > - &osap) ); > > - > > - // Generate boot key's auth > > - TPM_AUTHDATA bootKeyWrapAuth; > > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > > - > > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > > - TPM_ET_KEYHANDLE, > > - TPM_SRK_KEYHANDLE, > > - &SRK_AUTH, > > - &sharedsecret, > > - &osap) ); > > - > > - osap.fContinueAuthSession = FALSE; > > - > > - // FIXME: This key protects the global secrets on disk. It should use TPM > > - // PCR bindings to limit its use to legit configurations. > > - // Current binds are open, implying a Trusted VM contains this code. > > - // If this VM is not Trusted, use measurement and PCR bindings. > > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > > - TPM_KEY_BIND, > > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > > - TPM_SRK_KEYHANDLE, > > - (const TPM_AUTHDATA*)&sharedsecret, > > - &vtpm_globals->bootKeyWrap, > > - &osap) ); > > - > > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->bootKeyWrap, > > - NULL, > > - NULL, > > - NULL, > > - &vtpm_globals->bootKey, > > - TRUE ) ); > > - > > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > > - goto egress; > > - > > - abort_egress: > > - exit(1); > > - > > - egress: > > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > > - return status; > > - > > -} > > - > > -/////////////////////////////////////////////////////////////////////////////// > > -TPM_RESULT VTPM_Init_Manager() { > > - TPM_RESULT status = TPM_FAIL, serviceStatus; > > - BYTE *randomsead; > > - UINT32 randomsize=256; > > - > > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > > - > > - vtpm_globals->connected_dmis = 0; > > - > > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - > > - // Create new TCS Object > > - vtpm_globals->manager_tcs_handle = 0; > > - > > - TPMTRYRETURN(TCS_create()); > > - > > - // Create TCS Context for service > > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > > - > > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > > - &randomsize, > > - &randomsead)); > > - > > - Crypto_Init(randomsead, randomsize); > > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > > - > > - // Create OIAP session for service's authorized commands > > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > > - &vtpm_globals->keyAuth) ); > > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > > - > > - vtpm_globals->mig_keys = NULL; > > - > > - // If fails, create new Manager. > > - serviceStatus = VTPM_LoadManagerData(); > > - if (serviceStatus == TPM_IOERROR) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > > - TPMTRYRETURN( VTPM_Create_Manager() ); > > - TPMTRYRETURN( VTPM_SaveManagerData() ); > > - } else if (serviceStatus != TPM_SUCCESS) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > > - exit(1); > > - } > > - > > - //Load Storage Key > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->storageKeyWrap, > > - &SRK_AUTH, > > - &vtpm_globals->storageKeyHandle, > > - &vtpm_globals->keyAuth, > > - &vtpm_globals->storageKey, > > - FALSE ) ); > > - > > - // Create entry for Dom0 for control messages > > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return(status); > > -} > > - > > -/////////////////////////////////////////////////////////////////////////////// > > -void VTPM_Stop_Manager() { > > - VTPM_DMI_RESOURCE *dmi_res; > > - struct hashtable_itr *dmi_itr; > > - > > - // Close all the TCS contexts. TCS should evict keys based on this > > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > > - do { > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > > - if (dmi_res->connected) > > - close_dmi( dmi_res ); // Not really interested in return code > > - > > - } while (hashtable_iterator_advance(dmi_itr)); > > - free (dmi_itr); > > - } > > - > > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > > - > > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > > - TCS_destroy(); > > - > > - hashtable_destroy(vtpm_globals->dmi_map, 1); > > - free(vtpm_globals); > > - > > - Crypto_Exit(); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > > deleted file mode 100644 > > index a324a8f..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager.h > > +++ /dev/null > > @@ -1,150 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager.h > > -// > > -// Public Interface header for VTPM Manager > > -// > > -// ================================================================== > > - > > -#ifndef __VTPM_MANAGER_H__ > > -#define __VTPM_MANAGER_H__ > > - > > -#define VTPM_TAG_REQ 0x01c1 > > -#define VTPM_TAG_RSP 0x01c4 > > -#define COMMAND_BUFFER_SIZE 4096 > > - > > -// Header sizes. Note Header MAY include the DMI > > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > > - > > -//************************ Command Codes **************************** > > -#define VTPM_ORD_BASE 0x0000 > > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > > - > > -// Non-priviledged VTPM Commands (From DMI's) > > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > > - > > -// Priviledged VTPM Commands (From management console) > > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > > - > > -//************************ Return Codes **************************** > > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > > -#define VTPM_TYPE_HVM 2 // HVM Domain > > - > > -//************************ Return Codes **************************** > > -#define VTPM_SUCCESS 0 > > -#define VTPM_FAIL 1 > > -#define VTPM_UNSUPPORTED 2 > > -#define VTPM_FORBIDDEN 3 > > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > > -#define VTPM_INVALID_REQUEST 5 > > - > > -//*********************** Parameter Values ************************* > > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > > -#define VTPM_TYPE_MIGRATABLE 0x01 > > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > > - // VTPM can be recovered or deleted only > > - > > -/******************* Command Parameter API ************************* > > - > > -VTPM Command Format > > - dmi: 4 bytes // Source of message. > > - // WARNING: This is prepended by the channel. > > - // Thus it is received by VTPM Manager, > > - // but not sent by DMI > > - tpm tag: 2 bytes > > - command size: 4 bytes // Size of command including header but not DMI > > - ord: 4 bytes // Command ordinal above > > - parameters: size - 10 bytes // Command Parameter > > - > > -VTPM Response Format > > - tpm tag: 2 bytes > > - response_size: 4 bytes > > - status: 4 bytes > > - parameters: size - 10 bytes > > - > > - > > -VTPM_Open: > > - Input Parameters: > > - mig_type: 1 byte > > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > > - domain type: 1 byte > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_Close > > - Input Parameters: > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_Delete > > - Input Parameters: > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_SaveNVM > > - Input Parameters: > > - data: n bytes (Header indicates size of data) > > - Output Parameters: > > - None > > - > > -VTPM_LoadNVM > > - Input Parameters: > > - None > > - Output Parameters: > > - data: n bytes (Header indicates size of data) > > - > > -VTPM_TPMCommand > > - Input Parameters: > > - TPM Command Byte Stream: n bytes > > - Output Parameters: > > - TPM Reponse Byte Stream: n bytes > > - > > -*********************************************************************/ > > - > > -#endif //_VTPM_MANAGER_H_ > > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > > deleted file mode 100644 > > index 2001074..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > > +++ /dev/null > > @@ -1,488 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager_handler.c > > -// > > -// This file will house the main logic of the VTPM Manager > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "log.h" > > -#include "buffer.h" > > - > > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > > - > > -// ---------------------- Prototypes ------------------- > > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > > - TPM_COMMAND_CODE ord, > > - buffer_t *command_buf, > > - buffer_t *result_buf, > > - BOOL is_priv, > > - char *thread_name); > > - > > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - VTPM_DMI_RESOURCE *dmi_res, > > - BYTE *cmd_header, > > - buffer_t *param_buf, > > - buffer_t *result_buf, > > - char *thread_name); > > - > > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - BOOL fw_tpm, // Forward TPM cmds? > > - vtpm_ipc_handle_t *fw_tx_ipc_h, > > - vtpm_ipc_handle_t *fw_rx_ipc_h, > > - BOOL is_priv, > > - char *thread_name) { > > - TPM_RESULT status = TPM_FAIL; // Should never return > > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > > - buffer_t *command_buf=NULL, *result_buf=NULL; > > - TPM_TAG tag; > > - TPM_COMMAND_CODE ord; > > - VTPM_DMI_RESOURCE *dmi_res; > > - int size_read, size_write, i; > > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > > - > > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > > - > > - // ------------------------ Main Loop -------------------------------- > > - while(1) { > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > > - > > - // --------------------- Read Cmd from Sender ---------------- > > - > > - // Read command header > > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > > - goto abort_command; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > > - goto abort_command; > > - } > > - > > - // Unpack header > > - BSG_UnpackList(cmd_header, 4, > > - BSG_TYPE_UINT32, &dmi, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - // Using the header info, read the parameters of the command > > - // Note that in_param_size is in the client's context > > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > - if (cmd_size > 0) { > > - in_param = (BYTE *) malloc(cmd_size); > > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > > - if (size_read > 0) { > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > > - goto abort_command; > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - if (size_read < (int) cmd_size) { > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > > - goto abort_command; > > - } > > - } else { > > - in_param = NULL; > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } > > - > > - // Init the buffers used to handle the command and the response > > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > > - goto abort_command; > > - } > > - > > - // -------------- Dispatch Commands to Handlers ----------- > > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > > - vtpm_lock_wrlock(); > > - } else { > > - vtpm_lock_rdlock(); > > - } > > - > > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > > - (!dmi_res->connected) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > > - status = TPM_BAD_PARAMETER; > > - // We have no one to reply to, they don't exist. > > - goto abort_command; > > - } > > - > > - if (tag == VTPM_TAG_REQ) { > > - > > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > > - > > - } else { // This is not a VTPM Command at all. > > - if (fw_tpm) { > > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > > - > > - // This means calling the DMI failed, not that the cmd failed in the DMI > > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > > - if (status != TPM_SUCCESS) { > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > > - // should be forwarded to the caller VM > > - add_header = FALSE; > > - } else { > > - // We are not supposed to forward TPM commands at all. > > - int i; > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - } // end else for is VTPM Command > > - > > - // ------------------- Respond to Sender ------------------ > > - > > - // Errors while handling responses jump here to reply with error messages > > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > > - // is added to the code, this ifdef should be removed. > > - // Also note this is NOT referring to errors in commands, but rather > > - // this is about I/O errors and such. > > -#ifndef VTPM_MULTI_VM > > - abort_with_error: > > -#endif > > - > > - if (add_header) { > > - // Prepend VTPM header with destination DM stamped > > - out_param_size = buffer_len(result_buf); > > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > > - out_message = (BYTE *) malloc (reply_size); > > - reply = out_message; > > - > > - BSG_PackList(out_message, 4, > > - BSG_TYPE_UINT32, (BYTE *) &dmi, > > - BSG_TPM_TAG, (BYTE *) &tag, > > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > > - BSG_TPM_RESULT, (BYTE *) &status); > > - > > - if (buffer_len(result_buf) > 0) > > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > > - //Note: Send message + dmi_id > > - } else { > > - reply = result_buf->bytes; > > - reply_size = buffer_len(result_buf); > > - } > > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > > - for (i=0; i < reply_size; i++) > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > > - goto abort_command; > > - } > > - free(out_message); out_message=NULL; > > - > > - if (size_write < (int)reply_size) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > > - goto abort_command; > > - } > > - > > - // On certain failures an error message cannot be sent. > > - // This marks the beginning of cleanup in preperation for the next command. > > - abort_command: > > - //free buffers > > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - //free(in_param); // This was converted to command_buf. No need to free > > - buffer_free(result_buf); > > - buffer_free(command_buf); > > - > > - // If we have a write lock, save the manager table > > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > > - } > > - > > - vtpm_lock_unlock(); > > - add_header = TRUE; // Reset to the default > > - } // End while(1) > > - > > -} > > - > > -///////////////////////////////////////////////////////////////////////// > > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > > - TPM_COMMAND_CODE ord, > > - buffer_t *command_buf, > > - buffer_t *result_buf, > > - BOOL is_priv, > > - char *thread_name) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - > > - switch (ord) { > > - case VTPM_ORD_SAVENVM: > > - status= VTPM_Handle_Save_NVM(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_LOADNVM: > > - status= VTPM_Handle_Load_NVM(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_TPMCOMMAND: > > - status= VTPM_Handle_TPM_Command(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_GET_MIG_KEY: > > - status = VTPM_Handle_Get_Migration_key(command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_LOAD_MIG_KEY: > > - status = VTPM_Handle_Load_Migration_key(command_buf, > > - result_buf); > > - break; > > - > > - default: > > - // Privileged handlers can do maintanance > > - if (is_priv) { > > - switch (ord) { > > - case VTPM_ORD_OPEN: > > - status = VTPM_Handle_New_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_CLOSE: > > - status = VTPM_Handle_Close_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_DELETE: > > - status = VTPM_Handle_Delete_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_MIGRATE_IN: > > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > > - break; > > - > > - case VTPM_ORD_MIGRATE_OUT: > > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > > - break; > > - > > - default: > > - status = TPM_BAD_ORDINAL; > > - } // switch > > - } else { // is priv command > > - > > - status = TPM_BAD_ORDINAL; > > - } // inner switch > > - } // outer switch > > - > > - return(status); > > -} > > - > > -///////////////////////////////////////////////////////////////////// > > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - VTPM_DMI_RESOURCE *dmi_res, > > - BYTE *cmd_header, > > - buffer_t *param_buf, > > - buffer_t *result_buf, > > - char *thread_name) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - UINT32 dmi_dst; > > - TPM_COMMAND_CODE ord; > > - TPM_TAG tag_out; > > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > > - BYTE *dmi_cmd, *in_param; > > - int size_read, size_write, i; > > - > > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > > - > > - //Forward TPM CMD stamped with dmi_id to DMI for handling > > - if (buffer_len(param_buf)) { > > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > > - > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - free(dmi_cmd); > > - } else { > > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - } > > - > > - if (size_write != (int) dmi_cmd_size) > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > > - > > - buffer_free(param_buf); > > - > > - // Read header for response to TPM command from DMI > > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(cmd_header, 4, > > - BSG_TYPE_UINT32, &dmi_dst, > > - BSG_TPM_TAG, &tag_out, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &status ); > > - > > - // If response has parameters, read them. > > - // Note that in_param_size is in the client's context > > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > - if (adj_param_size > 0) { > > - in_param = (BYTE *) malloc(adj_param_size); > > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > > - goto abort_with_error; > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - } else { > > - in_param = NULL; > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > > - > > - status = TPM_SUCCESS; > > - > > - abort_with_error: > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > > deleted file mode 100644 > > index cf58ba3..0000000 > > --- a/tools/vtpm_manager/manager/vtpmd.c > > +++ /dev/null > > @@ -1,371 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpmd.c > > -// > > -// Application > > -// > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "tcg.h" > > -#include "log.h" > > -#include "vtpm_ipc.h" > > - > > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > > - > > -#define VTPM_BE_FNAME "/dev/vtpm" > > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > > - > > -#define VTPM_TYPE_PVM_STRING "pvm" > > -#define VTPM_TYPE_HVM_STRING "hvm" > > - > > -struct vtpm_thread_params_s { > > - vtpm_ipc_handle_t *tx_ipc_h; > > - vtpm_ipc_handle_t *rx_ipc_h; > > - BOOL fw_tpm; > > - vtpm_ipc_handle_t *fw_tx_ipc_h; > > - vtpm_ipc_handle_t *fw_rx_ipc_h; > > - BOOL is_priv; > > - char *thread_name; > > -}; > > - > > -// This is needed to all extra_close_dmi to close this to prevent a > > -// broken pipe when no DMIs are left. > > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > > - > > -void *vtpm_manager_thread(void *arg_void) { > > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > > - > > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > > - arg->is_priv, arg->thread_name); > > - > > - return (status); > > -} > > - > > - > > -void signal_handler(int reason) { > > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > > - } else { > > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > > - pthread_exit(NULL); > > - } > > - > > - VTPM_Stop_Manager(); > > - exit(-1); > > -} > > - > > -struct sigaction ctl_c_handler; > > - > > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - int fh; > > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > > - struct stat file_info; > > - > > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > > - dmi_res->tx_tpm_ipc_h = NULL; > > - dmi_res->rx_tpm_ipc_h = NULL; > > - dmi_res->tx_vtpm_ipc_h = NULL; > > - dmi_res->rx_vtpm_ipc_h = NULL; > > - } else { > > - // Create a pair of fifo pipes > > - dmi_res->rx_tpm_ipc_h = NULL; > > - dmi_res->rx_vtpm_ipc_h = NULL; > > - > > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > > - status =TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > > - > > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Measure DMI > > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > > - // Also, this mechanism is specific to 1 VM architecture. > > - /* > > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - dmi_size = file_stat.st_size; > > - else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - dmi_buffer > > - */ > > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > > - > > - if (vm_type == VTPM_TYPE_PVM) > > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > > - else > > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > > - > > - // Launch DMI > > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > > -#ifdef MANUAL_DM_LAUNCH > > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > > - dmi_res->dmi_pid = 0; > > -#else > > - pid_t pid = fork(); > > - > > - if (pid == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } else if (pid == 0) { > > - switch (startup_mode) { > > - case TPM_ST_CLEAR: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > > - break; > > - case TPM_ST_STATE: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > > - break; > > - case TPM_ST_DEACTIVATED: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > > - break; > > - default: > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Returning from these at all is an error. > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > > - } else { > > - dmi_res->dmi_pid = pid; > > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > > - } > > -#endif // MANUAL_DM_LAUNCH > > - > > - } // If DMI = VTPM_CTL_DM > > - status = TPM_SUCCESS; > > - > > -abort_egress: > > - return (status); > > -} > > - > > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (vtpm_globals->connected_dmis == 0) { > > - // No more DMI's connected. Close fifo to prevent a broken pipe. > > - // This is hackish. Need to think of another way. > > - vtpm_ipc_close(g_rx_tpm_ipc_h); > > - } > > - > > - > > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > > - > > - free(dmi_res->tx_tpm_ipc_h->name); > > - free(dmi_res->tx_vtpm_ipc_h->name); > > - > > -#ifndef MANUAL_DM_LAUNCH > > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > > - if (dmi_res->dmi_pid != 0) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > > - status = TPM_FAIL; > > - } > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > > - status = TPM_FAIL; > > - } > > - } > > -#endif > > - > > - } //endif ! dom0 > > - return status; > > -} > > - > > - > > -int main(int argc, char **argv) { > > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > > - pthread_t be_thread, dmi_thread, hp_thread; > > - > > -#ifdef DUMMY_BACKEND > > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > > -#else > > - vtpm_ipc_handle_t real_be_ipc_h; > > -#endif > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > > - > > - // -------------------- Initialize Manager ----------------- > > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > > - return -1; > > - } > > - > > - // -------------------- Setup Ctrl+C Handlers -------------- > > - ctl_c_handler.sa_handler = signal_handler; > > - sigemptyset(&ctl_c_handler.sa_mask); > > - ctl_c_handler.sa_flags = 0; > > - > > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > > - > > - // For easier debuggin with gdb > > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > > - > > - sigset_t sig_mask; > > - sigemptyset(&sig_mask); > > - sigaddset(&sig_mask, SIGPIPE); > > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > > - > > - // ------------------- Set up file ipc structures ---------- > > -#ifdef DUMMY_BACKEND > > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > > - > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > > - exit(-1); > > - } > > - > > - tx_be_ipc_h = &tx_dummy_ipc_h; > > - rx_be_ipc_h = &rx_dummy_ipc_h; > > -#else > > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > > - > > - tx_be_ipc_h = &real_be_ipc_h; > > - rx_be_ipc_h = &real_be_ipc_h; > > -#endif > > - > > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > > - exit(-1); > > - } > > - > > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > > - > > - // -------------------- Set up thread params ------------- > > - > > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > > - be_thread_params.fw_tpm = TRUE; > > - be_thread_params.fw_tx_ipc_h = NULL; > > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > > - be_thread_params.is_priv = FALSE; > > - be_thread_params.thread_name = "Backend Listener"; > > - > > - dmi_thread_params.tx_ipc_h = NULL; > > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > > - dmi_thread_params.fw_tpm = FALSE; > > - dmi_thread_params.fw_tx_ipc_h = NULL; > > - dmi_thread_params.fw_rx_ipc_h = NULL; > > - dmi_thread_params.is_priv = FALSE; > > - dmi_thread_params.thread_name = "VTPM Listener"; > > - > > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > > - hp_thread_params.fw_tpm = FALSE; > > - hp_thread_params.fw_tx_ipc_h = NULL; > > - hp_thread_params.fw_rx_ipc_h = NULL; > > - hp_thread_params.is_priv = TRUE; > > - hp_thread_params.thread_name = "Hotplug Listener"; > > - > > - // --------------------- Launch Threads ----------------- > > - > > - vtpm_lock_init(); > > - > > - vtpm_globals->master_pid = pthread_self(); > > - > > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > > - exit(-1); > > - } > > - > > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > > - exit(-1); > > - } > > - > > - > > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > > - exit(-1); > > - } > > - > > - //Join the other threads until exit time. > > - pthread_join(be_thread, NULL); > > - pthread_join(dmi_thread, NULL); > > - pthread_join(hp_thread, NULL); > > - > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > > - > > - VTPM_Stop_Manager(); > > - vtpm_lock_destroy(); > > - return 0; > > -} > > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > > deleted file mode 100644 > > index 41e8d2d..0000000 > > --- a/tools/vtpm_manager/manager/vtpmpriv.h > > +++ /dev/null > > @@ -1,186 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpmpriv.h > > -// > > -// Structures and functions private to the manager > > -// > > -// ================================================================== > > - > > -#ifndef __VTPMPRIV_H__ > > -#define __VTPMPRIV_H__ > > - > > -#include "vtpm_manager.h" > > -#include "tcg.h" > > -#include "tcs.h" > > -#include "buffer.h" > > -#include "crypto.h" > > -#include "vtpm_ipc.h" > > - > > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > > - // is changed. It's used for backwards compatability > > - > > -#define STATE_FILE "/var/vtpm/VTPM" > > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > > -#define VTPM_CTL_DM 0 > > - > > -// ------------------------ Private Structures ----------------------- > > -typedef struct VTPM_DMI_RESOURCE_T { > > - // I/O info for Manager to talk to DMI's and controllers > > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > > - > > -#ifndef VTPM_MULTI_VM > > - pid_t dmi_pid; > > -#endif > > - > > - // Non-persistent Information > > - bool connected; > > - UINT32 dmi_domain_id; > > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > > - char *NVMLocation; // NULL term string indicating location > > - // of NVM. > > - // Persistent Information about DMI > > - UINT32 dmi_id; > > - BYTE dmi_type; > > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > > -} VTPM_DMI_RESOURCE; > > - > > -typedef struct tdVTPM_MIGKEY_LIST { > > - UINT32 name_size; > > - BYTE *name; // Name of destination (IP addr, domain name, etc) > > - CRYPTO_INFO key; > > - struct tdVTPM_MIGKEY_LIST *next; > > -} VTPM_MIGKEY_LIST; > > - > > - > > -typedef struct tdVTPM_GLOBALS { > > - // Non-persistent data > > -#ifndef VTPM_MULTI_VM > > - pid_t master_pid; > > -#endif > > - > > - int connected_dmis; // To close guest_rx when no dmis are connected > > - > > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > > - // Currently keys are loaded at migration time, > > - // TODO: Make VTPM man store a keys persistently > > - // and update script to check if key is needed > > - // before fetching it. > > - > > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > > - CRYPTO_INFO storageKey; // For software encryption > > - CRYPTO_INFO bootKey; // For saving table > > - TCS_AUTH keyAuth; // OIAP session for storageKey > > - > > - // Persistent Data > > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > > - TPM_AUTHDATA srk_usage_auth; > > - TPM_AUTHDATA storage_key_usage_auth; > > - > > - buffer_t bootKeyWrap; // Wrapped copy of boot key > > - > > -}VTPM_GLOBALS; > > - > > -// --------------------------- Global Values -------------------------- > > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > > - > > -// ********************** VTPM Functions ************************* > > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > > -void VTPM_Stop_Manager(); // Stop VTPM Service > > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - BOOL fw_tpm, // Should forward TPM cmds > > - vtpm_ipc_handle_t *fw_tx_ipc_h, > > - vtpm_ipc_handle_t *fw_rx_ipc_h, > > - BOOL is_priv, > > - char *client_name); > > - > > -// ********************** Command Handler Prototypes *********************** > > - > > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > > - buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_SaveManagerData(void); > > -TPM_RESULT VTPM_LoadManagerData(void); > > - > > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > > - > > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > > - > > -// Helper functions > > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > > - > > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > > - CRYPTO_INFO *asymkey, > > - buffer_t *sealed_data); > > - > > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > > - TCS_CONTEXT_HANDLE TCSContext, > > - TPM_HANDLE keyHandle, > > - const TPM_AUTHDATA *key_usage_auth, > > - buffer_t *unsealed_data); > > - > > -#endif // __VTPMPRIV_H__ > > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > > deleted file mode 100644 > > index fc8a66f..0000000 > > --- a/tools/vtpm_manager/manager/vtsp.c > > +++ /dev/null > > @@ -1,1042 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtsp.c > > -// > > -// Higher level interface to TCS for use in service. > > -// > > -// ================================================================== > > - > > -#include > > -#include "tcg.h" > > -#include "tcs.h" > > -#include "bsg.h" > > -#include "log.h" > > -#include "crypto.h" > > -#include "vtsp.h" > > -#include "buffer.h" > > - > > -#define RSA_KEY_SIZE 0x0800 > > - > > -/*********************************************************************************** > > - * GenerateAuth: Generate authorization info to be sent back to application > > - * > > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > > - * outParamDigestTextSize Size of inParamDigestText > > - * HMACkey Key to be used for HMACing > > - * For OIAP use key.authUsage or PersistStore.ownerAuth > > - * For OSAP use shared secret > > - * pAuth Authorization information from the application > > - * > > - * Return: TPM_SUCCESS Authorization data created > > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > > - *************************************************************************************/ > > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > > - /*[IN]*/ UINT32 inParamDigestTextSize, > > - /*[IN]*/ const TPM_SECRET *HMACkey, > > - /*[IN,OUT]*/ TCS_AUTH *auth) { > > - > > - if (inParamDigestText == NULL || auth == NULL) > > - return (TPM_AUTHFAIL); > > - else { > > - > > - //Generate new OddNonce > > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > > - > > - // Create SHA1 inParamDigest > > - TPM_DIGEST inParamDigest; > > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > > - > > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > > - > > - BSG_PackList( hmacText, 4, > > - BSG_TPM_DIGEST, &inParamDigest, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > > - > > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > > - > > - return(TPM_SUCCESS); > > - > > - } > > -} > > - > > -/*********************************************************************************** > > - * VerifyAuth: Verify the authdata for a command requiring authorization > > - * > > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > > - * inParamDigestTextSize Size of inParamDigestText > > - * authDataUsage AuthDataUsage for the Entity being used > > - * Key->authDataUsage or TPM_AUTH_OWNER > > - * HMACkey Key to be used for HMACing > > - * For OIAP use key.authUsage or PersistStore.ownerAuth > > - * For OSAP use NULL (It will be aquired from the Auth Session) > > - * If unknown (default), assume OIAP > > - * sessionAuth A TCS_AUTH info for the session > > - * pAuth Authorization information from the application > > - * hContext If specified, on failed Auth, VerifyAuth will > > - * generate a new OIAP session in place of themselves > > - * destroyed session. > > - * > > - * Return: TPM_SUCCESS Authorization Verified > > - * TPM_AUTHFAIL Authorization Failed > > - * TPM_FAIL Failure during SHA1 routines > > - *************************************************************************************/ > > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > > - /*[IN]*/ UINT32 outParamDigestTextSize, > > - /*[IN]*/ const TPM_SECRET *HMACkey, > > - /*[IN,OUT]*/ TCS_AUTH *auth, > > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > > - if (outParamDigestText == NULL || auth == NULL) > > - return (TPM_AUTHFAIL); > > - > > - > > - // Create SHA1 inParamDigest > > - TPM_DIGEST outParamDigest; > > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > > - > > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > > - TPM_DIGEST hm; > > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > > - > > - BSG_PackList( hmacText, 4, > > - BSG_TPM_DIGEST, &outParamDigest, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > > - > > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > > - > > - // Compare correct HMAC with provided one. > > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > > - if (!auth->fContinueAuthSession) > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > > - > > - return (TPM_SUCCESS); > > - } else { > > - // If specified, reconnect the OIAP session. > > - // NOTE: This only works for TCS's that never have a 0 context. > > - if (hContext) { > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > > - VTSP_OIAP( hContext, auth); > > - } > > - return (TPM_AUTHFAIL); > > - } > > -} > > - > > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPMTRYRETURN( TCSP_OIAP(hContext, > > - &auth->AuthHandle, > > - &auth->NonceEven) ); > > - > > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > > - auth->fContinueAuthSession = FALSE; > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_ENTITY_TYPE entityType, > > - const UINT32 entityValue, > > - const TPM_AUTHDATA *usageAuth, > > - TPM_SECRET *sharedSecret, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > > - > > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > > - > > - TPMTRYRETURN( TCSP_OSAP( hContext, > > - entityType, > > - entityValue, > > - nonceOddOSAP, > > - &auth->AuthHandle, > > - &auth->NonceEven, > > - &nonceEvenOSAP) ); > > - > > - // Calculating Session Secret > > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > > - > > - BSG_PackList( sharedSecretText, 2, > > - BSG_TPM_NONCE, &nonceEvenOSAP, > > - BSG_TPM_NONCE, &nonceOddOSAP); > > - > > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > > - > > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > > - auth->fContinueAuthSession = FALSE; > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > > - CRYPTO_INFO *crypto_info) { > > - > > - TPM_RESULT status; > > - TPM_NONCE antiReplay; > > - TPM_DIGEST checksum; > > - BYTE *pubEKtext; > > - UINT32 pubEKtextsize; > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > > - > > - // GenerateAuth new nonceOdd > > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > > - > > - > > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > > - antiReplay, > > - &pubEKtextsize, > > - &pubEKtext, > > - &checksum) ); > > - > > - > > - // Extract the remaining output parameters > > - TPM_PUBKEY pubEK; > > - > > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > > - > > - // Build CryptoInfo for the bindingKey > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - pubEK.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > > - rsaKeyParms.exponent, > > - pubEK.pubKey.keyLength, > > - pubEK.pubKey.key, > > - crypto_info); > > - > > - // Destroy rsaKeyParms > > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > > - > > - // Set encryption scheme > > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - const TPM_AUTHDATA *srkAuth, > > - CRYPTO_INFO *ek_cryptoInfo, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > > - BYTE *new_srk; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // vars for srkpubkey parameter > > - TPM_KEY srkPub; > > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > > - > > - struct pack_buf_t srkText; > > - > > - //These values are accurate for an enc(AuthData). > > - struct pack_buf_t encOwnerAuth, encSrkAuth; > > - > > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > > - > > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > > - > > - > > - // Build srk public key struct > > - srkPub.ver = TPM_STRUCT_VER_1_1; > > - srkPub.keyUsage = TPM_KEY_STORAGE; > > - srkPub.keyFlags = 0x00; > > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > > - srkPub.PCRInfoSize = 0; > > - srkPub.PCRInfo = 0; > > - srkPub.pubKey.keyLength= 0; > > - srkPub.encDataSize = 0; > > - > > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 5, > > - BSG_TPM_COMMAND_CODE,&command, > > - BSG_TPM_PROTOCOL_ID, &proto_id, > > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > > - BSG_TPM_KEY, &srkPub); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > > - > > - new_srk = srkText.data; > > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > > - proto_id, > > - encOwnerAuth.size, > > - encOwnerAuth.data, > > - encSrkAuth.size, > > - encSrkAuth.data, > > - &srkText.size, > > - &new_srk, > > - auth ) ); > > - > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > > - paramTextSize += srkText.size; > > - > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - ownerAuth, auth, > > - hContext) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(srkText.data); > > - free(encSrkAuth.data); > > - free(encOwnerAuth.data); > > - free(paramText); > > - > > - TCS_FreeMemory(hContext, new_srk); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 1, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - ownerAuth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > > - auth) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - ownerAuth, auth, > > - hContext) ); > > - goto egress; > > - > > - abort_egress: > > - egress: > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_USAGE usage, > > - const TPM_AUTHDATA *newKeyAuth, > > - const TCS_KEY_HANDLE parentHandle, > > - const TPM_AUTHDATA *osapSharedSecret, > > - buffer_t *pubKeyBuf, > > - TCS_AUTH *auth) { > > - > > - int i; > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > > - > > - // vars for Calculate encUsageAuth > > - BYTE *paramText; > > - UINT32 paramTextSize; > > - > > - // vars for Calculate encUsageAuth > > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > > - TPM_DIGEST XORKey1; > > - UINT32 XORbufferSize; > > - TPM_SECRET encUsageAuth, encMigrationAuth; > > - > > - // vars for Flatten newKey prototype > > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > > - struct pack_buf_t newKeyText; > > - > > - // Fill in newKey > > - TPM_KEY newKey; > > - > > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > > - newKey.algorithmParms.parmSize = 12; > > - > > - switch (usage) { > > - case TPM_KEY_SIGNING: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > > - newKey.keyUsage = TPM_KEY_SIGNING; > > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > > - break; > > - case TPM_KEY_STORAGE: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > > - newKey.keyUsage = TPM_KEY_STORAGE; > > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > > - break; > > - case TPM_KEY_BIND: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > > - newKey.keyUsage = TPM_KEY_BIND; > > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > > - break; > > - default: > > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - > > - newKey.ver = TPM_STRUCT_VER_1_1; > > - > > - newKey.keyFlags = 0; > > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > > - newKey.pubKey.keyLength= 0; > > - newKey.encDataSize = 0; > > - newKey.encData = NULL; > > - > > - // FIXME: Support PCR bindings > > - newKey.PCRInfoSize = 0; > > - newKey.PCRInfo = NULL; > > - > > - // Calculate encUsageAuth > > - XORbufferSize = BSG_PackList( XORbuffer, 2, > > - BSG_TPM_SECRET, osapSharedSecret, > > - BSG_TPM_NONCE, &auth->NonceEven); > > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > > - > > - // FIXME: No support for migratable keys. > > - for (i=0; i < TPM_DIGEST_SIZE; i++) > > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > > - > > - // Flatten newKey prototype > > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > > - newKeyText.data = flatKey; > > - newKeyText.size = flatKeySize; > > - > > - // Generate HMAC > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_AUTHDATA, &encUsageAuth, > > - BSG_TPM_AUTHDATA, &encMigrationAuth); > > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > > - paramTextSize += newKeyText.size; > > - > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - osapSharedSecret, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > > - parentHandle, > > - encUsageAuth, > > - encMigrationAuth, > > - &newKeyText.size, > > - &newKeyText.data, > > - auth) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > > - paramTextSize += newKeyText.size; > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - osapSharedSecret, auth, 0) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(flatKey); > > - free(paramText); > > - TCS_FreeMemory(hContext, newKeyText.data); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_KEY_HANDLE hUnwrappingKey, > > - const buffer_t *rgbWrappedKeyBlob, > > - const TPM_AUTHDATA *parentAuth, > > - TPM_HANDLE *newKeyHandle, > > - TCS_AUTH *auth, > > - CRYPTO_INFO *cryptoinfo, > > - const BOOL skipTPMLoad) { > > - > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > > - > > - BYTE *paramText=NULL; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > > - if (! skipTPMLoad) { > > - > > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > > - (newKeyHandle==NULL) || (auth==NULL)) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Generate Extra TCS Parameters > > - TPM_HANDLE phKeyHMAC; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 1, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - parentAuth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > > - hUnwrappingKey, > > - buffer_len(rgbWrappedKeyBlob), > > - rgbWrappedKeyBlob->bytes, > > - auth, > > - newKeyHandle, > > - &phKeyHMAC) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_HANDLE, newKeyHandle); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - parentAuth, auth, > > - hContext) ); > > - } > > - > > - // Build cryptoinfo structure for software crypto function. > > - if (cryptoinfo != NULL) { > > - TPM_KEY newKey; > > - > > - // Unpack/return key structure > > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - newKey.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > > - rsaKeyParms.exponent, > > - newKey.pubKey.keyLength, > > - newKey.pubKey.key, > > - cryptoinfo); > > - > > - // Destroy rsaKeyParms > > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > > - > > - // Set encryption scheme > > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - } > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE key_handle, > > - const buffer_t *bound_data, > > - const TPM_AUTHDATA *usage_auth, > > - buffer_t *clear_data, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate Extra TCS Parameters > > - struct pack_buf_t clear_data32; > > - BYTE *clear_data_text; > > - UINT32 clear_data_size; > > - > > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &bound_data32); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - usage_auth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_UnBind( hContext, > > - key_handle, > > - buffer_len(bound_data), > > - bound_data->bytes, > > - auth, > > - &clear_data_size, > > - &clear_data_text) ); > > - > > - > > - // Verify Auth > > - clear_data32.size = clear_data_size; > > - clear_data32.data = clear_data_text; > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &clear_data32); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - usage_auth, auth, > > - hContext) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(paramText); > > - TCS_FreeMemory(hContext, clear_data_text); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > > - const buffer_t *inData, > > - buffer_t *outData) > > -{ > > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_BOUND_DATA boundData; > > - UINT32 i; > > - > > - // Fill boundData's accessory information > > - boundData.ver = TPM_STRUCT_VER_1_1; > > - boundData.payload = TPM_PT_BIND; > > - boundData.payloadData = inData->bytes; > > - > > - // Pack boundData before encryption > > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > > - (sizeof(TPM_VERSION) + > > - sizeof(TPM_PAYLOAD_TYPE) + > > - buffer_len(inData))); > > - if (flatBoundData == NULL) { > > - return TPM_NOSPACE; > > - } > > - UINT32 flatBoundDataSize = 0; > > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > > - BSG_TPM_VERSION, &boundData.ver, > > - BSG_TYPE_BYTE, &boundData.payload); > > - > > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > > - flatBoundDataSize += buffer_len(inData); > > - > > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > > - UINT32 out_tmp_size; > > - > > - // Encrypt flatBoundData > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > > - flatBoundDataSize, > > - flatBoundData, > > - &out_tmp_size, > > - out_tmp) ); > > - > > - if (out_tmp_size > RSA_KEY_SIZE/8) { > > - // The result of RSAEnc should be a fixed size based on key size. > > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > > - } > > - > > - buffer_init(outData, 0, NULL); > > - buffer_append_raw(outData, out_tmp_size, out_tmp); > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > > - for(i = 0 ; i < out_tmp_size ; i++) { > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - goto egress; > > - abort_egress: > > - egress: > > - > > - // Free flatBoundData > > - free(flatBoundData); > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_AUTHDATA *sealDataAuth, > > - const TPM_PCR_COMPOSITE *pcrComp, > > - const buffer_t *inData, > > - TPM_STORED_DATA *sealedData, > > - const TPM_SECRET *osapSharedSecret, > > - TCS_AUTH *auth) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate PCR_Info Struct from Comp > > - TPM_PCR_INFO pcrInfo; > > - UINT32 pcrInfoSize, flatpcrSize; > > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > > - sizeof(UINT16) + // 2 byte UINT16 > > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > > - > > - if (pcrComp != NULL) { > > - //printf("\n\tBinding to PCRs: "); > > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > > - > > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > > - > > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > > - } else { > > - //printf("\n\tBinding to no PCRS."); > > - pcrInfoSize = 0; > > - } > > - > > - // Calculate encUsageAuth > > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > > - UINT32 XORbufferSize = sizeof(XORbuffer); > > - TPM_DIGEST XORKey; > > - TPM_ENCAUTH encAuth; > > - > > - BSG_PackList( XORbuffer, 2, > > - BSG_TPM_SECRET, osapSharedSecret, > > - BSG_TPM_NONCE, &auth->NonceEven ); > > - > > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > > - > > - int i; > > - for (i=0; i < TPM_DIGEST_SIZE; i++) > > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > > - > > - // Generate Extra TCS Parameters > > - UINT32 inDataSize = buffer_len(inData); > > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > > - > > - UINT32 sealedDataSize; > > - BYTE *flatSealedData=NULL; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 4, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_ENCAUTH, &encAuth, > > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > > - BSG_TPM_SIZE32_DATA, &inData_pack); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - osapSharedSecret, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_Seal( hContext, > > - keyHandle, > > - encAuth, > > - pcrInfoSize, > > - flatpcr, > > - inDataSize, > > - inData->bytes, > > - auth, > > - &sealedDataSize, > > - &flatSealedData) ); > > - > > - // Unpack/return key structure > > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_STORED_DATA, sealedData); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - osapSharedSecret, auth, > > - 0) ); > > - > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (flatSealedData) > > - TCS_FreeMemory( hContext, flatSealedData); > > - > > - free(paramText); > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_STORED_DATA *sealedData, > > - const TPM_AUTHDATA *key_usage_auth, > > - const TPM_AUTHDATA *data_usage_auth, > > - buffer_t *outData, > > - TCS_AUTH *auth, > > - TCS_AUTH *dataAuth) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate Extra TCS Parameters > > - UINT32 sealDataSize, clearDataSize; > > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > > - 2 * sizeof(UINT32) + > > - sealedData->sealInfoSize + > > - sealedData->encDataSize), > > - *clearData=NULL; > > - > > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_STORED_DATA, sealedData); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - key_usage_auth, auth) ); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - data_usage_auth, dataAuth) ); > > - // Call TCS > > - TPMTRYRETURN( TCSP_Unseal( hContext, > > - keyHandle, > > - sealDataSize, > > - flatSealedData, > > - auth, > > - dataAuth, > > - &clearDataSize, > > - &clearData) ); > > - > > - // Verify Auth > > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &clearData_pack); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - key_usage_auth, auth, > > - hContext) ); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - data_usage_auth, dataAuth, > > - hContext) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (flatSealedData) > > - TCS_FreeMemory( hContext, clearData); > > - > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Call TCS > > - return ( TCSP_SaveState ( hContext ) ); > > - > > -} > > - > > - > > -// Function Reaches into unsupported TCS command, beware. > > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > > - const buffer_t *inbuf, > > - buffer_t *outbuf ) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Generate Extra TCS Parameters > > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > > - &resultTextSize, resultText) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - TCS_FreeMemory(hContext, resultText); > > - free(resultText); > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > > deleted file mode 100644 > > index 2fb0440..0000000 > > --- a/tools/vtpm_manager/manager/vtsp.h > > +++ /dev/null > > @@ -1,126 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtsp.h > > -// > > -// Higher level interface to TCS. > > -// > > -// ================================================================== > > - > > -#ifndef __VTSP_H__ > > -#define __VTSP_H__ > > - > > -#include "tcg.h" > > -#include "tcs.h" > > - > > -#define KEY_BUFFER_SIZE 2048 > > - > > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > > - const buffer_t *inbuf, > > - buffer_t *outbuf ); > > - > > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_ENTITY_TYPE entityType, > > - const UINT32 entityValue, > > - const TPM_AUTHDATA *usageAuth, > > - TPM_SECRET *sharedsecret, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > > - CRYPTO_INFO *cypto_info); > > - > > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - const TPM_AUTHDATA *srkAuth, > > - CRYPTO_INFO *ek_cryptoInfo, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_USAGE usage, > > - const TPM_AUTHDATA *newKeyAuth, > > - const TCS_KEY_HANDLE parentHandle, > > - const TPM_AUTHDATA *osapSharedSecret, > > - buffer_t *pubKeyBuf, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_KEY_HANDLE hUnwrappingKey, > > - const buffer_t *rgbWrappedKeyBlob, > > - const TPM_AUTHDATA *parentAuth, > > - TPM_HANDLE *newKeyHandle, > > - TCS_AUTH *pAuth, > > - CRYPTO_INFO *cryptoinfo, > > - const BOOL skipTPMLoad); > > - > > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE key_handle, > > - const buffer_t *bound_data, > > - const TPM_AUTHDATA *usage_auth, > > - buffer_t *clear_data, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > > - const buffer_t *inData, > > - buffer_t *outData); > > - > > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_AUTHDATA *sealDataAuth, > > - const TPM_PCR_COMPOSITE *pcrComp, > > - const buffer_t *inData, > > - TPM_STORED_DATA *sealedData, > > - const TPM_SECRET *osapSharedSecret, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_STORED_DATA *sealedData, > > - const TPM_AUTHDATA *key_usage_auth, > > - const TPM_AUTHDATA *data_usage_auth, > > - buffer_t *outData, > > - TCS_AUTH *auth, > > - TCS_AUTH *dataAuth); > > - > > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > > - > > -#endif //_VTSP_H_ > > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > > deleted file mode 100644 > > index e33ae95..0000000 > > --- a/tools/vtpm_manager/migration/Makefile > > +++ /dev/null > > @@ -1,42 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -VPATH = ../manager > > - > > -BIND = vtpm_migratord > > -BINC = vtpm_migrator > > - > > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > > - > > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIND) $(BINC) > > - > > -.PHONY: install > > -install: build > > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > > - > > -.PHONY: clean > > -clean: > > - rm -f $(BINC) $(BIND) > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIND): $(OBJSD) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -$(BINC): $(OBJSC) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -# libraries > > -LIBS += ../util/libTCGUtils.a > > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > > deleted file mode 100644 > > index 08986f4..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > > +++ /dev/null > > @@ -1,186 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager_if.c > > -// > > -// Provides functions to call local vtpm manager interface (Hotplug) > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "vtpm_ipc.h" > > -#include "bsg.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > > - > > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > > - > > -TPM_RESULT vtpm_manager_open(){ > > - > > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > > - return TPM_IOERROR; > > - } > > - > > - return TPM_SUCCESS; > > -} > > - > > -void vtpm_manager_close() { > > - > > - vtpm_ipc_close(&tx_ipc_h); > > - vtpm_ipc_close(&rx_ipc_h); > > -} > > - > > - > > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > > - buffer_t *command_param_buf, > > - TPM_RESULT *cmd_status, /* out */ > > - buffer_t *result_param_buf) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - int size_read, size_write, i; > > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > > - TPM_TAG tag=VTPM_TAG_REQ; > > - > > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > > - adj_command = (BYTE *) malloc( adj_command_size ); > > - if (!adj_command) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > > - BSG_PackList(adj_command, 4, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > > - > > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > > - for (i=0; i< adj_command_size; i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_write != (int) adj_command_size ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > > - > > - // Read header for response to manager command > > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(response_header, 4, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, cmd_status ); > > - > > - // If response has parameters, read them. > > - // Note that out_param_size is in the client's context > > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > > - goto abort_egress; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > > deleted file mode 100644 > > index 8d52e66..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > > +++ /dev/null > > @@ -1,104 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_migrator.h > > -// > > -// Public Interface header for VTPM Migrator > > -// > > -// ================================================================== > > - > > -#ifndef __VTPM_MIGRATOR_H__ > > -#define __VTPM_MIGRATOR_H__ > > - > > -#define VTPM_MTAG_REQ 0x02c1 > > -#define VTPM_MTAG_RSP 0x02c4 > > - > > -// Header sizes. > > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > > - > > -//*********************** Connection Info ************************** > > -#define VTPM_MIG_PORT 48879 > > - > > -//************************ Command Codes *************************** > > -#define VTPM_MORD_MIG_STEP1 0x00 > > -#define VTPM_MORD_MIG_STEP2 0x01 > > -#define VTPM_MORD_MIG_STEP3 0x02 > > -#define VTPM_MORD_MIG_STEP4 0x03 > > - > > -//************************ Return Codes **************************** > > -#define VTPM_SUCCESS 0 > > -#define VTPM_FAIL 1 > > - > > -/******************* Command Parameter API ************************* > > - > > -VTPM Command Format > > - tpm tag: 2 bytes > > - command size: 4 bytes // Size of command including header but not DMI > > - ord: 4 bytes // Command ordinal above > > - parameters: size - 10 bytes // Command Parameter > > - > > -VTPM Response Format > > - tpm tag: 2 bytes > > - response_size: 4 bytes > > - status: 4 bytes > > - parameters: size - 10 bytes > > - > > - > > -VTPM_Mig_Phase1: > > - Unsupported: (Handled by scripts) > > - > > -VTPM_Mig_Phase2 > > - Input Parameters: > > - domain_name_size: 4 bytes > > - domain_name : domain_name_size bytes > > - Output Parameters: > > - pub_exp_size: 4 bytes > > - pub_exp: pub_exp_size bytes > > - pub_mod_size: 4 bytes > > - pub_mod: pub_mod_size bytes > > - > > -VTPM_Mig_Phase3 > > - Input Parameters: > > - vtpm_state_size: 4 bytes > > - vtpm_state: vtpm_state_size bytes > > - Output Parameters: > > - none > > - > > -VTPM_Mig_Phase4 > > - Unsupported: (Handled by scripts) > > - > > - > > -*********************************************************************/ > > - > > -#endif //_VTPM_MANAGER_H_ > > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > > deleted file mode 100644 > > index de48b2d..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > > +++ /dev/null > > @@ -1,219 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_migrator_if.c > > -// > > -// Provides functions to call open network connection & call > > -// a function on the vtpm_migratord on the destination > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "vtpm_migrator.h" > > - > > -static int sock_desc; > > - > > - > > -TPM_RESULT vtpm_migratord_open(char *server_address){ > > - > > - TPM_RESULT status = TPM_FAIL; > > - > > - /* network variables */ > > - struct in_addr ip_addr; > > - struct sockaddr_in server_addr; > > - int addr_len; > > - struct hostent *dns_info=NULL; > > - > > - /* set up connection to server*/ > > - dns_info = gethostbyname(server_address); > > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > > - > > - if(ip_addr.s_addr < 0) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /* set up server variable */ > > - memset((char *)&server_addr, 0, sizeof(server_addr)); > > - server_addr.sin_family = AF_INET; > > - server_addr.sin_port = htons(VTPM_MIG_PORT); > > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > > - > > - /* open socket, make connection */ > > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > > - > > - if (sock_desc < 0 ) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (connect(sock_desc, > > - (struct sockaddr *)&server_addr, > > - sizeof(server_addr)) < 0 ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - status = TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > -void vtpm_migratord_close() { > > - close(sock_desc); > > -} > > - > > - > > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > > - buffer_t *command_param_buf, > > - TPM_RESULT *cmd_status, /* out */ > > - buffer_t *result_param_buf) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - int size_read, size_write, i; > > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > > - TPM_TAG tag=VTPM_MTAG_REQ; > > - > > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > > - command = (BYTE *) malloc( command_size ); > > - if (!command) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - BSG_PackList(command, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &command_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > > - > > - size_write = write(sock_desc, command, command_size); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > > - for (i=0; i< command_size; i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_write != (int) command_size ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > > - > > - // Read header for response > > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(response_header, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, cmd_status ); > > - > > - // If response has parameters, read them. > > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > > - goto abort_egress; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > > deleted file mode 100644 > > index 18b3bdb..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > > +++ /dev/null > > @@ -1,211 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > > - char *name, > > - UINT32 instance) { > > - TPM_RESULT status, cmd_status; > > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > > - UINT32 offset; > > - struct pack_buf_t addr_data32; > > - > > - //===== Get Destination's Public Migration Key ====== > > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > > - > > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > > - &out_param_buf, > > - &cmd_status, > > - &mig_key_buf) ); > > - vtpm_migratord_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - //===== Load migration key into vtpm_manager ======== > > - > > - addr_data32.data = (BYTE *)server_addr; > > - addr_data32.size = strlen(server_addr) + 1; // Include the null > > - > > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > > - NULL ) ) ; > > - > > - offset = BSG_PackList(out_param_buf.bytes, 1, > > - BSG_TPM_SIZE32_DATA, &addr_data32); > > - > > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > > - > > - TPMTRYRETURN ( vtpm_manager_open() ); > > - > > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - buffer_free(&mig_key_buf); > > - buffer_free(&out_param_buf); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > > - char *name, > > - UINT32 instance) { > > - TPM_RESULT status, cmd_status; > > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > > - struct pack_buf_t addr_data32, name_data32, state_data32; > > - > > - //===== Get vtpm state from vtpm_manager ======== > > - addr_data32.data = (BYTE *)server_addr; > > - addr_data32.size = strlen(server_addr) + 1; // Include the null > > - > > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > > - (2 * sizeof(UINT32)) + addr_data32.size, > > - NULL ) ) ; > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TYPE_UINT32, &instance, > > - BSG_TPM_SIZE32_DATA, &addr_data32); > > - > > - TPMTRYRETURN ( vtpm_manager_open() ); > > - > > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > > - &out_param_buf, > > - &cmd_status, > > - &state_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > > - > > - //===== Send vtpm state to destination ====== > > - name_data32.data = (BYTE *)name; > > - name_data32.size = strlen(name) + 1; // Include the null > > - state_data32.data = state_buf.bytes; > > - state_data32.size = buffer_len(&state_buf); > > - > > - TPMTRYRETURN( buffer_init( &out_param_buf, > > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > > - NULL ) ) ; > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TPM_SIZE32_DATA, &name_data32, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > > - > > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - vtpm_migratord_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - buffer_free( &out_param_buf); > > - buffer_free( &state_buf); > > - buffer_free( &empty_buf); > > - > > - return status; > > -} > > - > > - > > -// Usage vtpm_migrator addr domain_name instance step > > - > > -int main(int argc, char **argv) { > > - > > - /* variables for processing of command */ > > - TPM_RESULT status = TPM_FAIL; > > - char *server_addr, *name; > > - UINT32 instance, step; > > - > > - if (argc != 5) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > > - status= TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - server_addr = argv[1]; > > - name = argv[2]; > > - instance = atoi( argv[3] ); > > - step = atoi( argv[4] ); > > - > > - switch (step) { > > - case VTPM_MORD_MIG_STEP2: > > - status = handle_vtpm_mig_step2(server_addr, name, instance); > > - break; > > - > > - case VTPM_MORD_MIG_STEP3: > > - status = handle_vtpm_mig_step3(server_addr, name, instance); > > - break; > > - > > - default: > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - break; > > - } > > - > > - goto egress; > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > > deleted file mode 100644 > > index ea18c8c..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > > +++ /dev/null > > @@ -1,202 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "vtpm_migrator.h" > > - > > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > > - TPM_TAG tag = VTPM_MTAG_RSP; > > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > > - > > - buffer_init(buf, out_param_size, NULL); > > - > > - BSG_PackList(buf->bytes, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_RESULT, &status ); > > -} > > - > > -int main() { > > - > > - /* network variables */ > > - int sock_descr, client_sock=-1, len; > > - struct sockaddr_in addr; > > - struct sockaddr_in client_addr; > > - unsigned int client_length; > > - int bytes; > > - > > - /* variables for processing of command */ > > - TPM_RESULT status = TPM_FAIL; > > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > > - TPM_TAG tag; > > - TPM_COMMAND_CODE ord; > > - UINT32 in_param_size, adj_param_size; > > - int i, size_read, size_write; > > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > > - > > - > > - /* setup socket */ > > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > > - > > - memset(&addr, 0, sizeof(addr)); > > - addr.sin_family = AF_INET; > > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > > - addr.sin_port = htons(VTPM_MIG_PORT); > > - > > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > > - return 1; > > - } > > - > > - listen(sock_descr, 10); > > - > > - for(;;) { > > - // ============ clear client info and wait for connection ========== > > - memset(&client_addr, 0, sizeof(client_addr)); > > - client_length = sizeof(client_addr); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > > - client_sock=accept(sock_descr, &client_addr, &client_length); > > - if (client_sock == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > > - goto abort_command; > > - } else { > > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > > - } > > - > > - // =================== Read incoming command ====================== > > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > > - build_error_msg(&result_buf, TPM_IOERROR); > > - goto abort_command_with_error; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - > > - // Unpack response from client > > - BSG_UnpackList(cmd_header, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - > > - // If response has parameters, read them. > > - // Note that out_param_size is in the client's context > > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - buffer_init( &in_param_buf, adj_param_size, NULL); > > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > > - build_error_msg(&result_buf, TPM_IOERROR); > > - goto abort_command_with_error; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - /* Handle Command */ > > - switch (ord) { > > - case VTPM_MORD_MIG_STEP2: > > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > > - break; > > - > > - case VTPM_MORD_MIG_STEP3: > > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > > - break; > > - > > - default: > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - > > - abort_command_with_error: > > - /* Write Response */ > > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > > - for (i=0; i< buffer_len(&result_buf); i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > > - goto abort_command; > > - } > > - > > - if (size_write != (int) buffer_len(&result_buf) ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > > - > > - abort_command: > > - close(client_sock); > > - buffer_free(&in_param_buf); > > - buffer_free(&result_buf); > > - > > - } // For (;;) > > - > > - return 0; > > -} > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > > deleted file mode 100644 > > index 0a8a2d5..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > > +++ /dev/null > > @@ -1,177 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "log.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > > -#define VTPM_SH_CMD_FTR "\"" > > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > > -#define VTPM_SH_ADD "vtpm_add_and_activate" > > -#define VTPM_SH_RESUME "vtpm_resume" > > - > > -// This must be updated to the longest command name. Currently GETINST > > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > > - > > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > > -{ > > - TPM_TAG tag = VTPM_TAG_RSP; > > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > > - UINT32 out_param_size; > > - > > - if ( (!in_param_buf) || (!result_buf) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // ================= Call manager and get mig key =============== > > - TPMTRYRETURN( vtpm_manager_open() ); > > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > > - &out_param_buf, // Empty > > - &cmd_status, > > - &mig_key_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - // ==================== return the mig key ===================== > > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > > - > > - TPMTRYRETURN( buffer_init(result_buf, > > - out_param_size, > > - NULL) ); > > - > > - BSG_PackList( result_buf->bytes, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_RESULT, &status); > > - > > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > > - > > - goto egress; > > - > > - abort_egress: > > - buffer_free(result_buf); > > - build_error_msg(result_buf, status); > > - > > - egress: > > - return; > > -} > > - > > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > > -{ > > - TPM_TAG tag = VTPM_TAG_RSP; > > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > > - UINT32 out_param_size, instance; > > - char *shell_cmd_str=NULL; > > - size_t shell_cmd_strlen; > > - FILE *shell_f=NULL; > > - > > - if ( (!in_param_buf) || (!result_buf) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // ================= Read Parameters =============== > > - struct pack_buf_t name_data32, state_data32; > > - > > - BSG_UnpackList(in_param_buf->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &name_data32, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - // Before using this string, protect us from a non-null term array. > > - if (name_data32.data[name_data32.size -1] != 0x00) { > > - name_data32.data[name_data32.size -1] = 0x00; > > - } > > - > > - // ====== Call hotplug-script and get an instance ====== > > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > > - > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > > - > > - shell_f = popen(shell_cmd_str, "r"); > > - fscanf(shell_f, "%d", &instance); > > - pclose(shell_f); > > - > > - // ====== Call hotplug-script and add instance ====== > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > > - name_data32.data, instance); > > - system(shell_cmd_str); > > - > > - // ========= Call vtpm_manager and load VTPM ======= > > - TPMTRYRETURN( buffer_init( &out_param_buf, > > - 2*sizeof(UINT32) + state_data32.size, > > - NULL) ); > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TYPE_UINT32, &instance, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - TPMTRYRETURN( vtpm_manager_open() ); > > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - // ====== Call hotplug-script and resume instance ====== > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > > - system(shell_cmd_str); > > - > > - goto egress; > > - abort_egress: > > - egress: > > - free(shell_cmd_str); > > - > > - // In this case no params come back, so reuse build_error_msg even for succes. > > - build_error_msg(result_buf, status); > > - return; > > -} > > - > > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > > deleted file mode 100644 > > index 11af91e..0000000 > > --- a/tools/vtpm_manager/tcs/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libTCS.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > > deleted file mode 100644 > > index cf3803c..0000000 > > --- a/tools/vtpm_manager/tcs/contextmgr.c > > +++ /dev/null > > @@ -1,224 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// contextmgr.c > > -// > > -// This file contains the context management functions for TCS. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include "tcs.h" > > -#include "contextmgr.h" > > -#include "log.h" > > -#include "hashtable.h" > > - > > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - int BlockSize) { // in > > - > > - BLOCK* pCurrentBlock = NULL; > > - BLOCK* pBlock = NULL; > > - > > - // check incoming params > > - if (pContextHandle == NULL || BlockSize == 0) > > - return NULL; > > - > > - // Create New Block > > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > > - if (pBlock == NULL) > > - return (0); > > - > > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > > - if (pBlock->aMemory == NULL) > > - return (0); > > - > > - memset(pBlock->aMemory, 0, BlockSize); > > - pBlock->nBlockSize = BlockSize; > > - pBlock->pNextBlock = NULL; > > - > > - // search for the last block created where to add the > > - // newly created block > > - if(pContextHandle->pTopBlock != NULL) { > > - pCurrentBlock = pContextHandle->pTopBlock; > > - while(pCurrentBlock->pNextBlock != NULL) > > - pCurrentBlock = pCurrentBlock->pNextBlock; > > - > > - > > - pCurrentBlock->pNextBlock= pBlock; > > - } else > > - pContextHandle->pTopBlock = pBlock; > > - > > - > > - pContextHandle->nBlockCount++; > > - > > - return pBlock->aMemory; > > -} > > - > > - > > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - BYTE* pTCPA_BYTEs) { // in > > - BLOCK* pCurrentBlock = NULL; > > - BLOCK* pParentBlock = NULL; > > - BOOL bFound = FALSE; > > - > > - if (pContextHandle == NULL) > > - return FALSE; > > - > > - > > - // Search for the Block in the context by aMemory pointer > > - pParentBlock = NULL; > > - pCurrentBlock = pContextHandle->pTopBlock; > > - > > - while(pCurrentBlock != NULL) { > > - // If aMemory block is found, delete it > > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > > - // if it is the top Block, remove it from the top, > > - // otherwise remove it from the ParentBlock and stitch > > - // the NextBlock to the ParentBlock > > - if(pParentBlock == NULL) > > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > > - else > > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > > - > > - // delete memory Block associated with pointer pTCPA_BYTEs > > - free(pCurrentBlock->aMemory); > > - pCurrentBlock->aMemory = NULL; > > - > > - free(pCurrentBlock); > > - pCurrentBlock = pParentBlock; > > - > > - pContextHandle->nBlockCount--; > > - bFound = TRUE; > > - } > > - > > - if(pCurrentBlock != NULL) { > > - pParentBlock = pCurrentBlock; > > - pCurrentBlock = pCurrentBlock->pNextBlock; > > - } > > - } > > - > > - return bFound; > > -} > > - > > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_RESOURCE_TYPE type, // in > > - TPM_HANDLE handle) { // in > > - HANDLE_LIST* pNewHandle = NULL; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if (pContextHandle == NULL) > > - return 0; > > - > > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > > - > > - if (pNewHandle == NULL) > > - return (0); > > - > > - pNewHandle->handle = handle; > > - pNewHandle->type = type; > > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > > - > > - pContextHandle->pHandleList = pNewHandle; > > - > > - return 1; > > -} > > - > > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_HANDLE handle) { // in > > - > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > > - *pLastHandle = pCurrentHandle; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > > - > > - if (pContextHandle == NULL) > > - return 0; > > - > > - while (1) { > > - > > - if (pCurrentHandle->handle == handle) { // Found element > > - if (pCurrentHandle == pLastHandle) { // First element in list > > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > > - free(pCurrentHandle); > > - } else { // Ordinary element > > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > > - free(pCurrentHandle); > > - } > > - > > - return 1; > > - > > - } else { // Not found yet; > > - pLastHandle = pCurrentHandle; > > - pCurrentHandle = pCurrentHandle->pNextHandle; > > - if (pCurrentHandle == NULL) // Found end of list > > - return 0; > > - } > > - > > - } > > -} > > - > > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > > - HANDLE_LIST* pCurrentHandle; > > - BOOL returncode = TRUE; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > > - > > - if (pContextHandle == NULL) > > - return 1; > > - > > - pCurrentHandle = pContextHandle->pHandleList; > > - while (pCurrentHandle != NULL) { > > - > > - switch (pCurrentHandle->type) { > > - case TPM_RT_KEY: > > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > > - break; > > - case TPM_RT_AUTH: > > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > > - break; > > - default: > > - returncode = FALSE; > > - } > > - > > - pCurrentHandle = pCurrentHandle->pNextHandle; > > - > > - } > > - > > - return 1; > > -} > > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > > deleted file mode 100644 > > index e3fdf0f..0000000 > > --- a/tools/vtpm_manager/tcs/contextmgr.h > > +++ /dev/null > > @@ -1,82 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// contextmgr.c > > -// > > -// This file contains the context management functions for TCS. > > -// > > -// ================================================================== > > - > > -#ifndef __CONTEXTMGR_H__ > > -#define __CONTEXTMGR_H__ > > - > > -#include "tcg.h" > > - > > -#define BLOCK_SIZE 300 > > - > > -typedef struct block { > > - int nBlockSize; > > - BYTE* aMemory; > > - struct block* pNextBlock; > > -} BLOCK; > > - > > -typedef struct handle_List { > > - TPM_HANDLE handle; > > - TPM_RESOURCE_TYPE type; > > - struct handle_List* pNextHandle; > > -} HANDLE_LIST; > > - > > -typedef struct context_handle { > > - TCS_CONTEXT_HANDLE handle; > > - int nBlockCount; > > - BLOCK* pTopBlock; > > - HANDLE_LIST* pHandleList; > > -} CONTEXT_HANDLE; > > - > > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > > - int BlockSize); // in > > - > > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - BYTE* pTCPA_BYTEs); // in > > - > > - > > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_RESOURCE_TYPE type, // in > > - TPM_HANDLE handle); // in > > - > > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_HANDLE handle); // in > > - > > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > > - > > -#endif //_CONTEXTMGR_H_ > > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > > deleted file mode 100644 > > index 7c1378c..0000000 > > --- a/tools/vtpm_manager/tcs/tcs.c > > +++ /dev/null > > @@ -1,1192 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcs.c > > -// > > -// This file contains the functions that implement a TCS. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "tcs.h" > > -#include "contextmgr.h" > > -#include "tpmddl.h" > > -#include "log.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > - > > -// Static Global Vars for the TCS > > -static int TCS_m_nCount = 0; > > - > > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > > - > > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > > - > > -struct hashtable *context_ht; > > - > > -// -------------------------- Hash table functions -------------------- > > - > > -static unsigned int hashfunc32(void *ky) { > > - return (* (UINT32 *) ky); > > -} > > - > > -static int equals32(void *k1, void *k2) { > > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > > -} > > - > > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > > -} > > - > > -// --------------------------------------------------------------------------------- > > -// Initialization/Uninitialization SubComponent API > > -// --------------------------------------------------------------------------------- > > -TPM_RESULT TCS_create() { > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TPM_RESULT result = TPM_FAIL; > > - > > - if (TCS_m_nCount == 0) { > > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > > - hRes = TDDL_Open(); > > - > > - context_ht = create_hashtable(10, hashfunc32, equals32); > > - > > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > > - result = TPM_SUCCESS; > > - TCS_m_nCount++; > > - } else { > > - result = TPM_IOERROR; > > - hashtable_destroy(context_ht, 1); > > - } > > - } else > > - TCS_m_nCount++; > > - > > - return(result); > > -} > > - > > - > > -void TCS_destroy() > > -{ > > - TCS_m_nCount--; > > - > > - if (TCS_m_nCount == 0) { > > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > > - TDDL_Close(); > > - > > - struct hashtable_itr *context_itr; > > - TCS_CONTEXT_HANDLE *hContext; > > - > > - // Close all the TCS contexts. TCS should evict keys based on this > > - if (hashtable_count(context_ht) > 0) { > > - context_itr = hashtable_iterator(context_ht); > > - do { > > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > > - > > - } while (hashtable_iterator_advance(context_itr)); > > - free(context_itr); > > - } > > - hashtable_destroy(context_ht, 1); > > - } > > - > > -} > > - > > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 MemSize, // in > > - BYTE** ppMemPtr) {// out > > - > > - TPM_RESULT returnCode = TPM_FAIL; > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if (pContextHandle != NULL && ppMemPtr != NULL) { > > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > > - returnCode = TPM_SUCCESS; > > - } > > - > > - return returnCode; > > -} > > - > > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > > - BYTE* pMemory) { // in > > - TPM_RESULT returnCode = TPM_FAIL; > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if ( (pContextHandle != NULL && pMemory != NULL) && > > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > > - returnCode = TPM_SUCCESS; > > - > > - > > - return returnCode; > > -} > > - > > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > > - TPM_RESULT returnCode = TPM_FAIL; > > - TCS_CONTEXT_HANDLE *newContext; > > - > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > > - > > - if (hContext) { > > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > > - if (pContextHandle == NULL) > > - return TPM_SIZE; > > - > > - // initialize to 0 > > - pContextHandle->nBlockCount = 0; > > - pContextHandle->pTopBlock = NULL; > > - pContextHandle->pHandleList = NULL; > > - > > - // Create New Block > > - AddMemBlock(pContextHandle, BLOCK_SIZE); > > - > > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > > - > > - if (hashtable_search(context_ht, &newContext) !=NULL) > > - *newContext += 1; > > - > > - pContextHandle->handle = *newContext; > > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > > - free(newContext); > > - free(pContextHandle); > > - returnCode = TPM_FAIL; > > - } else { > > - *hContext = *newContext; > > - returnCode = TPM_SUCCESS; > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > > - //FIXME: TCS SHOULD Track failed auths and make sure > > - //we don't try and re-free them here. > > - TPM_RESULT returnCode = TPM_FAIL; > > - > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if(pContextHandle != NULL) { > > - // Print test info > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > > - > > - // free memory for all the blocks > > - DeleteMemBlock(pContextHandle, NULL ); > > - pContextHandle->pTopBlock = NULL; > > - > > - FreeHandleList(pContextHandle); > > - if (pContextHandle->pHandleList != NULL) > > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > > - > > - // Release the TPM's resources > > - if (hashtable_remove(context_ht, &hContext) == NULL) > > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > > - > > - free(pContextHandle); > > - returnCode = TPM_SUCCESS; > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > > - return(returnCode); > > -} > > - > > -// ------------------------------------------------------------------ > > -// Internal Functions > > -// ------------------------------------------------------------------ > > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > > - // CHECK: according to the command specs, the outgoing auth params are: > > - // nonceEven > > - // nonceOdd > > - // continueAuthSession > > - // auth digest for return params > > - // > > - // this is a bit different than this code... > > - > > - return BSG_PackList(dst, 4, > > - BSG_TYPE_UINT32, &(auth->AuthHandle), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > > -} > > - > > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > > - return BSG_UnpackList(src, 3, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > > -} > > - > > -// ------------------------------------------------------------------ > > -// Authorization Commands > > -// ------------------------------------------------------------------ > > - > > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonce0) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > > - UINT32 paramSize = 0; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (authHandle == NULL || nonce0 == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_UnpackList(OutBuf+i, 2, > > - BSG_TYPE_UINT32, authHandle, > > - BSG_TPM_NONCE, nonce0); > > - > > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_ENTITY_TYPE entityType, // in > > - UINT32 entityValue, // in > > - TPM_NONCE nonceOddOSAP, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonceEven, // out > > - TPM_NONCE* nonceEvenOSAP) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT16, &entityType, > > - BSG_TYPE_UINT32, &entityValue, > > - BSG_TPM_NONCE, &nonceOddOSAP); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_UnpackList(OutBuf+i, 3, > > - BSG_TYPE_UINT32, authHandle, > > - BSG_TPM_NONCE, nonceEven, > > - BSG_TPM_NONCE, nonceEvenOSAP); > > - > > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > > - UINT16 protocolID, // in > > - UINT32 encOwnerAuthSize, // in > > - BYTE* encOwnerAuth, // in > > - UINT32 encSrkAuthSize, // in > > - BYTE* encSrkAuth, // in > > - UINT32* SrkSize, // in, out > > - BYTE** Srk, // in, out > > - TCS_AUTH* ownerAuth) // in, out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT16, &protocolID, > > - BSG_TYPE_UINT32, &encOwnerAuthSize); > > - > > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > > - InLength += encOwnerAuthSize; > > - InLength += BSG_Pack( BSG_TYPE_UINT32, > > - &encSrkAuthSize, > > - InBuf+InLength); > > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > > - InLength += encSrkAuthSize; > > - memcpy(InBuf+InLength, *Srk, *SrkSize); > > - InLength += *SrkSize; > > - InLength += packAuth(InBuf+InLength, ownerAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, > > - &InLength, > > - InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS){ > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_KEY srkPub; > > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > > - unpackAuth(ownerAuth, OutBuf+i); > > - > > - // fill output params > > - BYTE tempBuf[1024]; > > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > > - return(TPM_SIZE); > > - } > > - memcpy(*Srk, tempBuf, *SrkSize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTH* ownerAuth) { // in, out > > - > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - > > - InLength += packAuth(InBuf+InLength, ownerAuth); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS){ > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - unpackAuth(ownerAuth, OutBuf+i); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &handle); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (!DeleteHandleFromList(hContext, handle)) > > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > > - > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Print debug info > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -// TPM Mandatory > > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_DIGEST inDigest, // in > > - TPM_PCRVALUE* outDigest) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &pcrNum, > > - BSG_TPM_DIGEST, &inDigest); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > > - // Extract the remaining output parameters > > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_ENCAUTH encAuth, // in > > - UINT32 pcrInfoSize, // in > > - BYTE* PcrInfo, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* pubAuth, // in, out > > - UINT32* SealedDataSize, // out > > - BYTE** SealedData) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &keyHandle, > > - BSG_TPM_ENCAUTH, encAuth, > > - BSG_TYPE_UINT32, &pcrInfoSize); > > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > > - InLength += pcrInfoSize; > > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > > - memcpy(InBuf+InLength, inData, inDataSize); > > - InLength += inDataSize; > > - InLength += packAuth(InBuf+InLength, pubAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_STORED_DATA sealedData; > > - > > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > > - unpackAuth(pubAuth, OutBuf+i); > > - > > - // fill SealedData > > - BYTE tempBuf[1024]; > > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*SealedData, tempBuf, *SealedDataSize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE parentHandle, // in > > - UINT32 SealedDataSize, // in > > - BYTE* SealedData, // in > > - TCS_AUTH* parentAuth, // in, out > > - TCS_AUTH* dataAuth, // in, out > > - UINT32* DataSize, // out > > - BYTE** Data) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > > - DataSize == NULL || Data == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &parentHandle); > > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > > - InLength += SealedDataSize; > > - InLength += packAuth(InBuf+InLength, parentAuth); > > - InLength += packAuth(InBuf+InLength, dataAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*Data, OutBuf+i, *DataSize); > > - i += *DataSize; > > - i += unpackAuth(parentAuth, OutBuf+i); > > - unpackAuth(dataAuth, OutBuf+i); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* outDataSize, // out > > - BYTE** outData) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &keyHandle, > > - BSG_TYPE_UINT32, &inDataSize); > > - memcpy(InBuf+InLength, inData, inDataSize); > > - InLength += inDataSize; > > - InLength += packAuth(InBuf+InLength, privAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > > - return TPM_SIZE; > > - > > - memcpy(*outData, OutBuf+i, *outDataSize); > > - i += *outDataSize; > > - unpackAuth(privAuth, OutBuf+i); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hWrappingKey, // in > > - TPM_ENCAUTH KeyUsageAuth, // in > > - TPM_ENCAUTH KeyMigrationAuth, // in > > - UINT32* pcKeySize, // in, out > > - BYTE** prgbKey, // in, out > > - TCS_AUTH* pAuth) // in, out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hWrappingKey, > > - BSG_TPM_ENCAUTH, KeyUsageAuth, > > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > > - InLength += *pcKeySize; > > - InLength += packAuth(InBuf+InLength, pAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_RESULT, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_KEY wrappedKey; > > - > > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > > - unpackAuth(pAuth, OutBuf+i); > > - > > - // Fill prgbKey > > - BYTE tempBuf[1024]; > > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > > - return TPM_SIZE; > > - > > - memcpy(*prgbKey, tempBuf, *pcKeySize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hUnwrappingKey, // in > > - UINT32 cWrappedKeyBlobSize, // in > > - BYTE* rgbWrappedKeyBlob, // in > > - TCS_AUTH* pAuth, // in, out > > - TCS_KEY_HANDLE* phKeyTCSI, // out > > - TCS_KEY_HANDLE* phKeyHMAC) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hUnwrappingKey); > > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > > - InLength += cWrappedKeyBlobSize; > > - InLength += packAuth(InBuf+InLength, pAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, > > - OutBuf+i, > > - phKeyTCSI); > > - unpackAuth(pAuth, OutBuf+i); > > - > > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hKey); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (!DeleteHandleFromList(hContext, hKey)) { > > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > > - } > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > > - UINT32* bytesRequested, // in, out > > - BYTE** randomBytes) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (bytesRequested == NULL || *randomBytes == NULL){ > > - return TPM_BAD_PARAMETER; > > - } > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, bytesRequested); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* pubEndorsementKeySize, // out > > - BYTE** pubEndorsementKey, // out > > - TPM_DIGEST* checksum) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > > - return TPM_BAD_PARAMETER; > > - } > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TPM_NONCE, &antiReplay); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_PUBKEY pubEK; > > - i += BSG_UnpackList(OutBuf+i, 2, > > - BSG_TPM_PUBKEY, &pubEK, > > - BSG_TPM_DIGEST, checksum); > > - > > - // fill EndorsementKey > > - BYTE tempBuf[1024]; > > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > > - BYTE *inData, // in > > - UINT32 *outDataSize,// in/out > > - BYTE *outData) { // out > > - > > - TDDL_RESULT hRes; > > - > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > > - //FIXME: Add Context Management > > - hRes = TDDL_TransmitData( inData, > > - inDataSize, > > - outData, > > - outDataSize); > > - > > - if (hRes == TDDL_SUCCESS) { > > - return TPM_SUCCESS; > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > > - return TPM_IOERROR; > > - } > > - > > -} > > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > > deleted file mode 100644 > > index 83b9cd0..0000000 > > --- a/tools/vtpm_manager/tcs/tcs.h > > +++ /dev/null > > @@ -1,245 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcs.h > > -// > > -// This file declares the TCS API > > -// > > -// ================================================================== > > - > > -#ifndef __TCS_H__ > > -#define __TCS_H__ > > - > > -#include "tcg.h" > > -#include "contextmgr.h" > > -#include "buffer.h" > > - > > -#define HANDLE_NULL 0 > > - > > -// ------------------------------------------------------------------ > > -// Exposed API > > -// ------------------------------------------------------------------ > > - > > -TPM_RESULT TCS_create(); > > -void TCS_destroy(); > > - > > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > > - > > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > > - > > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 MemSize, // in > > - BYTE** ppMemPtr ); //out > > - > > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > > - BYTE* pMemory); // in > > - > > -// ------------------------------------------------------------------ > > -// Exposed API > > -// ------------------------------------------------------------------ > > - > > -// TPM v1.1B Command Set > > - > > -// Authorzation > > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonce0 // out > > - ); > > - > > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_ENTITY_TYPE entityType, // in > > - UINT32 entityValue, // in > > - TPM_NONCE nonceOddOSAP, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonceEven, // out > > - TPM_NONCE* nonceEvenOSAP // out > > - ); > > - > > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT16 protocolID, // in > > - UINT32 encOwnerAuthSize, // in > > - BYTE* encOwnerAuth, // in > > - UINT32 encSrkAuthSize, // in > > - BYTE* encSrkAuth, // in > > - UINT32* SrkSize, // in, out > > - BYTE** Srk, // in, out > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle // in > > - ); > > - > > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle, // in > > - TPM_RESOURCE_TYPE resourceType //in > > - ); > > - > > -// TPM Mandatory > > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_DIGEST inDigest, // in > > - TPM_PCRVALUE* outDigest // out > > - ); > > - > > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_PCRVALUE* outDigest // out > > - ); > > - > > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* PcrDataSize, // in, out > > - BYTE** PcrData, // in, out > > - TCS_AUTH* privAuth, // in, out > > - UINT32* sigSize, // out > > - BYTE** sig // out > > - ); > > - > > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_ENCAUTH encAuth, // in > > - UINT32 pcrInfoSize, // in > > - BYTE* PcrInfo, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* pubAuth, // in, out > > - UINT32* SealedDataSize, // out > > - BYTE** SealedData // out > > - ); > > - > > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE parentHandle, // in > > - UINT32 SealedDataSize, // in > > - BYTE* SealedData, // in > > - TCS_AUTH* parentAuth, // in, out > > - TCS_AUTH* dataAuth, // in, out > > - UINT32* DataSize, // out > > - BYTE** Data // out > > - ); > > - > > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_DIRINDEX dirIndex, // in > > - TPM_DIRVALUE newContents, // in > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_DIRINDEX dirIndex, // in > > - TPM_DIRVALUE* dirValue // out > > - ); > > - > > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* outDataSize, // out > > - BYTE** outData // out > > - ); > > - > > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hWrappingKey, // in > > - TPM_ENCAUTH KeyUsageAuth, // in > > - TPM_ENCAUTH KeyMigrationAuth, // in > > - UINT32* pcKeySize, // in, out > > - BYTE** prgbKey, // in, out > > - TCS_AUTH* pAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hUnwrappingKey, // in > > - UINT32 cWrappedKeyBlobSize, // in > > - BYTE* rgbWrappedKeyBlob, // in > > - TCS_AUTH* pAuth, // in, out > > - TCS_KEY_HANDLE* phKeyTCSI, // out > > - TCS_KEY_HANDLE* phKeyHMAC // out > > - ); > > - > > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey, // in > > - TCS_AUTH* pAuth, // in, out > > - UINT32* pcPubKeySize, // out > > - BYTE** prgbPubKey // out > > - ); > > - > > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey // in > > - ); > > - > > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 areaToSignSize, // in > > - BYTE* areaToSign, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* sigSize, // out > > - BYTE** sig // out > > - ); > > - > > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32* bytesRequested, // in, out > > - BYTE** randomBytes // out > > - ); > > - > > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 inDataSize, // in > > - BYTE* inData // in > > - ); > > - > > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* pubEndorsementKeySize, // out > > - BYTE** pubEndorsementKey, // out > > - TPM_DIGEST* checksum // out > > - ); > > - > > - > > -// Non-Standard TCSP calls > > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > > - > > -//Give direct access to TransmitData. > > -// Key and Auth Management is done before transfering command to TDDL. > > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > > - BYTE *inData, // in > > - UINT32 *outDataSize,// in/out > > - BYTE *outData); // out > > - > > -///////////// Private Functions //////////////////// > > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > > - > > -#endif //TCS_H > > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > > deleted file mode 100644 > > index e7e54f1..0000000 > > --- a/tools/vtpm_manager/tcs/tpmddl.h > > +++ /dev/null > > @@ -1,69 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tpmddl.c > > -// > > -// This file defines the TDDLI API > > -// > > -// ================================================================== > > - > > -#ifndef __TPMDDL_H__ > > -#define __TPMDDL_H__ > > - > > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > > - > > -#define TDDL_E_FAIL 1 > > -#define TDDL_E_SUCCESS 0 > > -#define TDDL_SUCCESS 0 > > - > > -typedef unsigned int TDDL_UINT32; > > -typedef TDDL_UINT32 TDDL_RESULT; > > -typedef unsigned char TDDL_BYTE; > > - > > -TDDL_RESULT TDDL_Open(); > > -void TDDL_Close(); > > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > > - TDDL_UINT32 insize, > > - TDDL_BYTE* out, > > - TDDL_UINT32* outsize); > > -TDDL_RESULT TDDL_GetStatus(); > > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > > - TDDL_UINT32 sub, > > - TDDL_BYTE* buffer, > > - TDDL_UINT32* size); > > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > > - TDDL_UINT32 sub, > > - TDDL_BYTE* buffer, > > - TDDL_UINT32* size); > > - > > -#endif // __TPMDDL_H__ > > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > > deleted file mode 100644 > > index 74bbdca..0000000 > > --- a/tools/vtpm_manager/tcs/transmit.c > > +++ /dev/null > > @@ -1,147 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "tpmddl.h" > > - > > -// flag to track whether TDDL has been opened > > -static int g_TDDL_open = 0; > > -static int g_tx_fd = -1; // the fd to the TPM > > - > > -#ifndef DUMMY_TPM > > - #define TPM_TX_FNAME "/dev/tpm0" > > - static int *g_rx_fdp = &g_tx_fd; > > -#else > > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > > - static int g_rx_fd = -1; > > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > > -#endif > > - > > -TPM_RESULT > > -TDDL_TransmitData( TDDL_BYTE* in, > > - TDDL_UINT32 insize, > > - TDDL_BYTE* out, > > - TDDL_UINT32* outsize) { > > - TPM_RESULT status = TPM_SUCCESS; > > - TDDL_UINT32 i; > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > > - for(i = 0 ; i < insize ; i++) > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > > - > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - ssize_t size = 0; > > - > > - // send the request > > - size = write (g_tx_fd, in, insize); > > - if (size < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > > - ERRORDIE (TPM_IOERROR); > > - } > > - else if ((TDDL_UINT32) size < insize) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > > - // ... ? > > - } > > - > > - // read the response > > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > > - if (size < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > > - ERRORDIE (TPM_IOERROR); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > > - for(i = 0 ; i < size ; i++) > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > > - > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - *outsize = size; > > - // close connection > > - goto egress; > > - > > - abort_egress: > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT TDDL_Open() { > > - > > - TDDL_RESULT status = TDDL_SUCCESS; > > - > > - if (g_TDDL_open) > > - return TPM_FAIL; > > - > > -#ifdef DUMMY_TPM > > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > > -#endif > > - > > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > > - if (g_tx_fd < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > > - return TPM_IOERROR; > > - } > > - > > - g_TDDL_open = 1; > > - > > - return status; > > -} > > - > > -void TDDL_Close() { > > - if (! g_TDDL_open) > > - return; > > - > > - if (g_tx_fd>= 0) { > > - if (close(g_tx_fd) < 0) > > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > > - g_tx_fd = -1; > > - } > > - > > - if (*g_rx_fdp>= 0) { > > - if (close(*g_rx_fdp) < 0) > > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > > - *g_rx_fdp = -1; > > - } > > - > > - g_TDDL_open = 0; > > - > > -} > > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > > deleted file mode 100644 > > index 36bc38f..0000000 > > --- a/tools/vtpm_manager/util/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libTCGUtils.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > > deleted file mode 100644 > > index fa36ce7..0000000 > > --- a/tools/vtpm_manager/util/bsg.c > > +++ /dev/null > > @@ -1,829 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// bsg.cpp > > -// > > -// This file will handle all the TPM Byte Stream functions > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include "tcg.h" > > -#include "crypto.h" > > -#include "bsg.h" > > -#include "log.h" > > - > > -static int g_log_recursion_level = 0; > > - > > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > > -// will complain! > > -#define BSG_MAX_BUF_SIZE (1<<18) > > - > > -#define bsglog(fmt, ...) do { \ > > - int __i; \ > > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > > - } \ > > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > > - } while (0) > > - > > - > > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > > -//BOOL dummy1 = BSG_static_selfcheck(); > > - > > - > > -// Interpretting Types > > -// ------------------- > > -// > > -// Incoming Types are composed of two parts {format, info} squished into a > > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > > -// data it is. If the first 4 bits are zero the info corresponds to a value in > > -// BSG_s_fmt[]. This is a structure whose composition is described in > > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > > -// data (in bytes) being passed in. For example a UINT32 being passed in would > > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > > -// this is interpretted as the end of the structure, and the result is returned. > > - > > -// these flags are mutually exclusive, so I'll just make them > > -// format values which indicate the semantics of the 'info' part and the source > > -// data. The above description has been accordingly adjusted. > > - > > -// format values for determining what type of data the incoming type is > > -// it's a 4 bit value, occupying the high 4 bits > > -#define __FMT_CONST (1UL << 28) // Constant sized value > > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > > -#define __FMT_HSIZE (4UL << 28) // A number of handles > > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > > - // of {size32, data} but we're to pack only the > > - // data as that is already packed, and so > > - // can/must be unpacked without > > - // explicitly reading it size > > - > > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > > - > > -// constant (8/16/32-bits) > > -#define FMT_U8 (__FMT_CONST | 1UL) > > -#define FMT_U16 (__FMT_CONST | 2UL) > > -#define FMT_U32 (__FMT_CONST | 4UL) > > - > > -// const with a compiler-computed size > > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > > - > > -// other data (size bytes) > > -// Used primarily for DIGESTS -> FMT_DATA(20) > > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > > - > > -// 16/32-bit size followed by N bytes of data > > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > > - > > -// 16-bit size followed by N key handles > > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > > - > > -#define DIGEST_SIZE 20 > > -typedef BSG_UINT32 BSG_HANDLE; > > - > > -// TCPA_AUTH has 11 fields! > > -#define MAX_FIELDS 11 > > -typedef struct BSG_Format > > -{ > > - BSG_Type type; > > - const char* name; > > - BSG_UINT32 fields[MAX_FIELDS + 1]; > > -} BSG_Format; > > - > > -/* > > - * TCPA structure data formats > > - */ > > -// this has to be manually kept in sync with the > > -// Type enum!! the static_selfcheck() function should be used regularly! > > -static BSG_Format s_fmt[] = > > -{ > > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > > - > > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > > - > > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > > - > > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > > - {FMT_SIZE16_HANDLES, 0}}, > > - > > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_ENC_SCHEME, > > - BSG_TPM_SIG_SCHEME, > > - FMT_SIZE32_DATA, > > - 0}}, > > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > > - BSG_TPM_VERSION, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_KEY_PARMS, > > - FMT_SIZE32_DATA, // the PCR_INFO > > - BSG_TPM_STORE_PUBKEY, > > - FMT_SIZE32_DATA, // the encrypted part > > - 0}}, > > - > > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > > - BSG_TPM_PUBKEY, > > - BSG_TPM_MIGRATE_SCHEME, > > - BSG_TPM_DIGEST, 0}}, > > - > > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > > - BSG_TPM_COMMAND_CODE, > > - BSG_TPM_RESULT, 0 }}, > > - > > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > > - BSG_TPM_DIGEST, > > - BSG_TPM_DIGEST, > > - FMT_DATA(2), > > - FMT_SIZE32_DATA, 0}}, > > - > > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > > - FMT_SIZE32_DATA, > > - 0} }, > > - > > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_COMPOSITE_HASH, > > - 0} }, > > - > > - > > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > > - BSG_TPM_VERSION, > > - FMT_SIZE32_DATA, > > - FMT_SIZE32_DATA, > > - 0}}, > > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_ENC_SCHEME, > > - FMT_SIZE16_DATA, > > - 0}}, > > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > > - BSG_TPM_PAYLOAD_TYPE, > > - BSG_TPM_SECRET, > > - BSG_TPM_SECRET, > > - BSG_TPM_DIGEST, > > - BSG_TPM_STORE_PRIVKEY, > > - 0}}, > > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > > - BSG_TPM_PAYLOAD_TYPE, > > - BSG_TPM_SECRET, > > - BSG_TPM_DIGEST, > > - FMT_U32, > > - BSG_TPM_STORE_PRIVKEY, > > - 0}}, > > - > > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > > - BSG_TPM_VERSION, > > - FMT_DATA(4), > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_NONCE, > > - 0}}, > > - > > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > > - BSG_TPM_VERSION, > > - FMT_U32, > > - BSG_TPM_CHOSENID_HASH, > > - BSG_TPM_PUBKEY, > > - 0}}, > > - > > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > > - > > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > > - FMT_U8, > > - FMT_U8, > > - 0}}, > > - > > - {BSG_TCS_AUTH, "TCS_AUTH", { > > - BSG_TYPE_UINT32, > > - BSG_TPM_NONCE, > > - BSG_TPM_NONCE, > > - BSG_TYPE_BOOL, > > - BSG_TPM_AUTHDATA, > > - 0}}, > > - > > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > > - BSG_TPM_VERSION, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_KEY_PARMS, > > - FMT_SIZE32_DATA, > > - BSG_TPM_STORE_PUBKEY, > > - 0}}, > > - > > - {BSG_PACKED, "BSG_PACKED", { > > - __FMT_PACKED, > > - 0 }}, > > - > > - {BSG_TYPE_MAX, "", {0}}, > > -}; > > - > > - > > -static const BSG_Format* find_format (BSG_Type t) { > > - BSG_Format * f = s_fmt; > > - > > - if (t >= BSG_TYPE_MAX) { > > - return NULL; > > - } > > - > > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > > - // sure to run the static_selfcheck() to make sure > > - f = s_fmt + (t - BSG_TYPE_FIRST); > > - > > - return f; > > -} > > - > > -// > > -// a consistency-checking routine which can be run at compile time > > -// (ie. immediately after compilation) > > -// > > -// tasks: > > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > > -// > > -// conditions: > > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > > -// Type has value 0, not 1 > > -// > > -// FIXME: should have a function be passed in here which is called if the test > > -// fails. Then the caller can decide what to do: abort, notify, whatever > > -// > > -BOOL BSG_static_selfcheck () > > -{ > > - int i; > > - > > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > > - bsglog ("failure at %i, allegedly %s\n", > > - i, s_fmt[i - BSG_TYPE_FIRST].name); > > - abort(); > > - return FALSE; > > - } > > - } > > - > > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > > - return TRUE; > > -} > > - > > - > > -/** > > - * Flatten a TCPA structure into a buffer in big-endian format > > - * @type: TCPA structure type > > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > > - * @dst: (OUT) flattened data > > - * Returns: Flattened size or -1 for unknown types > > - */ > > -// make it so that it can just run through the whole process and return > > -// the packed size, without packing anything. this will be done if dst is NULL. > > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > > -{ > > - // check incoming parameters > > - if (*src == NULL) > > - return 0; > > - > > - const BSG_BYTE* s = *src; > > - BSG_BYTE* d = dst; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > > - { > > - BSG_UINT32 val = 0; > > - switch (size) { > > - case 1: val = * (BYTE*) s; break; > > - case 2: val = * (unsigned short*) s; break; > > - case 4: val = * (BSG_UINT32*) s; break; > > - } > > - if (dst) > > - BSG_PackConst(val, size, d); > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > > - // this is used. > > - > > - if (dst) { > > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > > - memcpy(d, s, size); > > - } > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > > - > > - BSG_UINT32 psize = 0; > > - switch (size) { > > - case 1: psize = * (BYTE*) s; break; > > - case 2: psize = * (unsigned short*) s; break; > > - case 4: psize = * (BSG_UINT32*) s; break; > > - } > > - > > - if (dst) > > - BSG_PackConst(psize, size, d); > > - > > - s += size; > > - d += size; > > - > > - // now 's' points to an address, so cast it to BSG_BYTE** > > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > > - s += sizeof(BSG_BYTE*); > > - > > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > > - if (dst) { > > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > > - BSG_UINT32 i; > > - for (i = 0; i < psize; i++) > > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > > - > > - } > > - d += psize * sizeof(BSG_HANDLE); > > - } else {// If it's not psize handles, it's psize data. > > - if (psize > 0) { > > - if (dst) { > > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > > - psize, pdata, d); > > - memcpy(d, pdata, psize); > > - } > > - } > > - d += psize; > > - } > > - } else if (format == __FMT_PACKED) { > > - // the source buffer is a pack_constbuf_t, which has a size and a > > - // pointer. just copy the buffer value, the size is not included in the > > - // output stream. > > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > > - > > - if (dst) { > > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > > - buf->size, buf->data, d); > > - memcpy(d, buf->data, buf->size); > > - } > > - > > - s += buf->size; > > - d += buf->size; > > - } else if (format == 0) {// No flags are set. This is a structure & it should > > - // be looked up in the bsg_s_fmt[] > > - > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > > - return -1; > > - } > > - > > - if (dst) > > - bsglog ("BSG_Pack type %s\n", x->name); > > - > > - > > - // iterate through the fields > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) { > > - int fsize; > > - > > - g_log_recursion_level++; > > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > > - g_log_recursion_level--; > > - > > - if (fsize <= 0) > > - return fsize; > > - > > - d += fsize; > > - } > > - } else { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > > - return -1; > > - } > > - > > - *src = s; > > - return (d - dst); > > -} > > - > > -/** > > - * Unflatten a TCPA structure from a buffer in big-endian format > > - * @type: TCPA structure type > > - * @src: flattened data > > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > > - * Returns: Flattened size > > - * Note: Returns flattened size NOT the unpacked structure size > > - */ > > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > > - // check incoming parameters > > - if (src == NULL) > > - return 0; > > - > > - > > - const BSG_BYTE* s = src; > > - BSG_BYTE* d = dst ? *dst:NULL; > > - if (dst && !d) > > - dst = NULL; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > > - > > - BSG_UINT32 val = BSG_UnpackConst(s, size); > > - > > - if (dst) { > > - switch (size) { > > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > > - case 2: *(unsigned short*) d = (unsigned short) val; break; > > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > > - } > > - } > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > > - if (dst) > > - memcpy(d, s, size); > > - > > - d += size; > > - s += size; > > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > > - > > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > > - > > - if (psize > BSG_MAX_BUF_SIZE) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > > - BSG_MAX_BUF_SIZE); > > - return -1; > > - } > > - > > - if (dst) { > > - switch (size) { > > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > > - } > > - } > > - > > - s += size; > > - d += size; > > - > > - BSG_BYTE* pdata = NULL; > > - > > - if (psize) { > > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > > - if (dst) { > > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > > - if (!pdata) > > - return -1; > > - > > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > > - BSG_UINT32 i; > > - for (i = 0; i < psize; i++) { > > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > > - } > > - } > > - s += psize * sizeof(BSG_HANDLE); > > - } else { // If it's not psize handles, it's psize data. > > - if (dst) { > > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > > - if (!pdata) > > - return -1; > > - memcpy(pdata, s, psize); > > - } > > - s += psize; > > - } > > - } > > - if (dst) > > - *(void**) d = pdata; > > - > > - d += sizeof(void*); > > - } else if (format == __FMT_PACKED) { > > - > > - // this doesn't make sense for unpacking! > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > > - "This does not make sense\n"); > > - > > - return -1; > > - } else if (format == 0) {// No flags are set. This is a structure & it should > > - // be looked up in the bsg_s_fmt[] > > - > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > > - return -1; > > - } > > - > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) { > > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > > - if (fsize <= 0) > > - return fsize; > > - s += fsize; > > - } > > - } > > - > > - if (dst) > > - *dst = d; > > - return (s - src); > > -} > > - > > -/** > > - * Free memory associated with unpacked TCPA structure > > - * @type: TCPA structure type > > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > > - * Note: Destroy should be called on all structures created with Unpack > > - * to ensure that any allocated memory is freed > > - */ > > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > > - BSG_BYTE* s = *src; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if ((src == NULL) || (*src == NULL)) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > > - return; > > - } > > - > > - if (format == __FMT_CONST || format == __FMT_DATA) > > - s += size; > > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > > - s += size; > > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > > - free(ptr); > > - s += sizeof(void*); > > - } else if (format == __FMT_PACKED) { > > - > > - // this doesn't make sense for unpacking, hence also for Destroy() > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > > - "This does not make sense\n"); > > - > > - return; > > - } else if (format == 0) { > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > > - return; > > - } > > - > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) > > - BSG_Destroy_private((BSG_Type) *f, &s); > > - } > > - > > - *src = s; > > -} > > - > > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > > -{ > > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > > - return BSG_Pack_private(type, &src2, dst); > > -} > > - > > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > > -{ > > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > > -} > > - > > -void BSG_Destroy(BSG_Type type, void* src) > > -{ > > - BSG_BYTE* src2 = (BSG_BYTE*) src; > > - BSG_Destroy_private(type, &src2); > > -} > > - > > -/** > > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > > - * @val: constant value > > - * @size: constant size in bytes (1, 2, or 4) > > - * @dst: (OUT) buffer > > - */ > > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > > - > > - switch (size) { > > - case 4: > > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > > - dst[3] = (BSG_BYTE)(val & 0xff); > > - break; > > - case 2: > > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > > - dst[1] = (BSG_BYTE)(val & 0xff); > > - break; > > - case 1: > > - dst[0] = (BSG_BYTE)(val & 0xff); > > - break; > > - } > > -} > > - > > -/** > > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > > - * @src: buffer > > - * @size: constant size in bytes (1, 2, or 4) > > - */ > > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > > - BSG_UINT32 val = 0; > > - > > - if (src == NULL) > > - return 0; > > - > > - switch (size) { > > - case 4: > > - val = (((BSG_UINT32) src[0]) << 24 > > - | ((BSG_UINT32) src[1]) << 16 > > - | ((BSG_UINT32) src[2]) << 8 > > - | (BSG_UINT32) src[3]); > > - break; > > - case 2: > > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > > - break; > > - case 1: > > - val = (BSG_UINT32) src[0]; > > - break; > > - } > > - return val; > > -} > > - > > -// Pack a list of parameters. Beware not to send values, but rather you must > > -// send a pointer to your values Instead. This includes UINT32's. > > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > > - int ParamNumber; > > - BSG_Type format; > > - BSG_BYTE* val = NULL; > > - int size=0; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > > - format = (BSG_Type) va_arg( paramList, int ); > > - val = va_arg( paramList, BSG_BYTE* ); > > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > > - } > > - > > - va_end (paramList); > > - > > - return size; > > -} > > - > > -// Unpack a list of parameters. > > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > > - int ParamNumber = 0; > > - BSG_Type format; > > - BSG_BYTE* val = NULL; > > - int size = 0; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - format = (BSG_Type) va_arg( paramList, int ); > > - val = va_arg( paramList, BSG_BYTE* ); > > - > > - size += BSG_Unpack(format, src + size, val); > > - } > > - > > - va_end( paramList ); > > - > > - return size; > > -} > > - > > -// Destroy any memory allocated by calls to unpack > > -void BSG_DestroyList(int ParamCount, ... ) { > > - int ParamNumber = 0; > > - BSG_Type argType; > > - BSG_BYTE* paramValue = NULL; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - argType = (BSG_Type) va_arg( paramList, int ); > > - paramValue = va_arg( paramList, BSG_BYTE* ); > > - > > - BSG_Destroy(argType, paramValue); > > - } > > - > > - va_end( paramList ); > > - > > - return; > > -} > > - > > - > > -// and a tuple version > > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > > - int i; > > - > > - for (i = 0; i < numParams; i++) > > - BSG_Destroy (params[i].type, params[i].addr); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -// > > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > > -// by the caller later > > -// > > - > > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > > - int size = BSG_Pack (type, src, NULL); > > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > > - if (dest == NULL) > > - return -1; > > - > > - size = BSG_Pack(type, src, dest); > > - *o_dst = dest; > > - return size; > > -} > > - > > - > > - > > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > > - va_list args; > > - int size; > > - > > - va_start (args, ParamCount); > > - size = BSG_PackList (NULL, ParamCount, args); > > - va_end (args); > > - > > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > > - if (dest == NULL) > > - return -1; > > - > > - va_start (args, ParamCount); > > - size = BSG_PackList (dest, ParamCount, args); > > - va_end (args); > > - > > - *outBuffer = dest; > > - return size; > > -} > > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > > deleted file mode 100644 > > index 0896812..0000000 > > --- a/tools/vtpm_manager/util/bsg.h > > +++ /dev/null > > @@ -1,166 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// bsg.h > > -// > > -// This file contains API's for the TPM Byte Stream functions > > -// > > -// ================================================================== > > - > > -#ifndef __BSG_H__ > > -#define __BSG_H__ > > - > > -#include > > -#include "buffer.h" > > - > > -typedef unsigned int BSG_UINT32; > > -typedef unsigned char BSG_BYTE; > > - > > -// forward decl > > -struct pack_const_tuple_t; > > - > > -struct pack_tuple_t; > > - > > - > > -/** > > - * Byte stream generator > > - */ > > -// this has to be manually kept in sync with the > > -// s_fmt array!! > > -// but now we have a self-check function which can make sure things are well > > -// (if used!) > > -typedef enum BSG_Type > > -{ > > - BSG_TYPE_FIRST = 1, > > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > > - // unused/special value > > - BSG_TYPE_UINT16, > > - BSG_TYPE_BYTE, > > - BSG_TYPE_BOOL, > > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > > - // a pointer to that much data. can pass a > > - // struct pack_buf_t as the param > > - BSG_TPM_TAG, > > - BSG_TPM_HANDLE, > > - BSG_TPM_RESULT, > > - BSG_TPM_RESOURCE_TYPE, > > - BSG_TPM_COMMAND_CODE, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_PROTOCOL_ID, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_ENC_SCHEME, > > - BSG_TPM_SIG_SCHEME, > > - BSG_TPM_MIGRATE_SCHEME, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTHDATA, > > - BSG_TPM_SECRET, > > - BSG_TPM_ENCAUTH, > > - BSG_TPM_PAYLOAD_TYPE, > > - > > - BSG_TPM_VERSION, > > - BSG_TPM_DIGEST, > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_CHOSENID_HASH, > > - BSG_TPM_NONCE, > > - BSG_TPM_KEY_HANDLE, > > - BSG_TPM_KEY_HANDLE_LIST, > > - BSG_TPM_KEY_PARMS, > > - BSG_TPM_RSA_KEY_PARMS, > > - BSG_TPM_STORE_PUBKEY, > > - BSG_TPM_PUBKEY, > > - BSG_TPM_KEY, > > - > > - BSG_TPM_MIGRATIONKEYAUTH, > > - BSG_TCPA_AUDIT_EVENT, > > - BSG_TCPA_EVENT_CERT, > > - BSG_TPM_PCR_SELECTION, > > - BSG_TPM_PCR_COMPOSITE, > > - BSG_TPM_PCR_INFO, > > - BSG_TPM_STORED_DATA, > > - BSG_TPM_SYMMETRIC_KEY, > > - BSG_TPM_STORE_PRIVKEY, > > - BSG_TPM_STORE_ASYMKEY, > > - BSG_TPM_MIGRATE_ASYMKEY, > > - BSG_TPM_QUOTE_INFO, > > - BSG_TPM_IDENTITY_CONTENTS, > > - BSG_TPM_PCRVALUE, > > - BSG_TCPA_PCR_FLAGS, > > - BSG_TCS_AUTH, > > - > > - // this is the BSG_TPM_KEY struct without the encData field > > - BSG_TPM_KEY_NONSENSITIVE, > > - > > - BSG_PACKED, > > - > > - BSG_TYPE_MAX > > -} BSG_Type; > > - > > -struct pack_const_tuple_t { > > - BSG_Type type; > > - const void * addr; > > -}; > > - > > - > > -typedef struct pack_tuple_t { > > - BSG_Type type; > > - void * addr; > > -} pack_tuple_t; > > - > > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > > -void BSG_Destroy(BSG_Type type, void* src); > > - > > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > > -// by the caller later. returns size of allocated buffer, or -1 in case > > -// allocation failed > > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > > - > > -// a va_list version of PackList > > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > > -void BSG_DestroyList(int ParamCount, ... ); > > - > > -// wrapper of PackList which uses a buffer_t > > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > > - > > -// and a tuple version > > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > > - > > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > > - > > -BOOL BSG_static_selfcheck (); > > - > > -#endif > > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > > deleted file mode 100644 > > index df48bc2..0000000 > > --- a/tools/vtpm_manager/util/buffer.c > > +++ /dev/null > > @@ -1,226 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "buffer.h" > > - > > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > > - > > -// > > -// buffer functions! > > -// > > - > > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > > - if (initsize == 0) { > > - memset(buf, 0, sizeof(*buf)); > > - return TPM_SUCCESS; > > - } > > - > > - > > - buf->bytes = (BYTE*) malloc (initsize); > > - if (buf->bytes == NULL) > > - return TPM_RESOURCES; > > - > > - buf->size = initsize; > > - buf->alloc_size = initsize; > > - > > - if (initval) > > - memcpy (buf->bytes, initval, initsize); > > - > > - buf->is_owner = TRUE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > > - > > - buf->size = initsize; > > - buf->alloc_size = initsize; > > - buf->bytes = initval; > > - > > - buf->is_owner = TRUE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > > - buf->is_owner = TRUE; > > - > > - return status; > > -} > > - > > - > > - > > -// make an alias to a constant array > > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > > - // TODO: try to enforce the const things somehow! > > - buf->bytes = (BYTE*) val; > > - buf->size = size; > > - buf->alloc_size = 0; // this field is now unneeded > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -// make an alias into buf, with given offset and length > > -// if len = 0, make the alias go to the end of buf > > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > > - tpm_size_t offset, tpm_size_t len) { > > - if (offset + len > b->size) { > > - return TPM_NOSPACE; > > - } > > - > > - buf->bytes = b->bytes + offset; > > - buf->size = len > 0 ? len : b->size - offset; > > - > > - //VS/ buf->alloc_size = 0; > > - if (len ==0) > > - buf->alloc_size = b->alloc_size - offset; > > - else > > - buf->alloc_size = MIN(b->alloc_size - offset, len); > > - > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -// make an alias buffer_t into bytestream, with given length > > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > > - > > - buf->size = size; > > - buf->alloc_size = size; > > - buf->bytes = val; > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > - > > -// copy into the start of dest > > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > > -{ > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (dest->alloc_size < src->size) { > > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > > - } > > - > > - memcpy (dest->bytes, src->bytes, src->size); > > - dest->size = src->size; > > - > > - //VS/ dest->is_owner = TRUE; > > - > > - abort_egress: > > - > > - return status; > > -} > > - > > - > > - > > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > > -} > > - > > - > > -void buffer_memset (buffer_t * buf, BYTE b) { > > - memset (buf->bytes, b, buf->size); > > -} > > - > > - > > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (buf->alloc_size < buf->size + len) { > > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > > - } > > - > > - memcpy (buf->bytes + buf->size, bytes, len); > > - > > - buf->size += len; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -tpm_size_t buffer_len (const buffer_t* buf) { > > - return buf->size; > > -} > > - > > -TPM_RESULT buffer_free (buffer_t * buf) { > > - if (buf && buf->is_owner && buf->bytes != NULL) { > > - free (buf->bytes); > > - buf->bytes = NULL; > > - buf->size = buf->alloc_size = 0; > > - > > - } > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > > - > > - // we want to realloc to twice the size, or the new size, whichever > > - // bigger > > - > > - BYTE * tmpbuf = NULL; > > - > > - newsize = MAX (buf->alloc_size * 2, newsize); > > - > > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > > - if (tmpbuf == NULL) > > - return TPM_SIZE; > > - > > - > > - buf->bytes = tmpbuf; > > - buf->alloc_size = newsize; > > - > > - return TPM_SUCCESS; > > -} > > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > > deleted file mode 100644 > > index d8a9abc..0000000 > > --- a/tools/vtpm_manager/util/buffer.h > > +++ /dev/null > > @@ -1,95 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#ifndef __VTPM_BUFFER_H__ > > -#define __VTPM_BUFFER_H__ > > - > > -#include // for pointer NULL > > -#include "tcg.h" > > - > > -typedef UINT32 tpm_size_t; > > - > > -// first version, probably will be expanded... > > - > > -#define NULL_BUF {0,0,0,0} > > - > > -typedef struct { > > - // private!! > > - tpm_size_t size, alloc_size; > > - BYTE * bytes; > > - > > - BOOL is_owner; // do we own this buffer, and need to free it? > > -} buffer_t; > > - > > -// allocate the buffer if initsize > 0, copying over initval if provided > > -TPM_RESULT buffer_init (buffer_t * buf, > > - tpm_size_t initsize, > > - const BYTE* initval); > > - > > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > > -TPM_RESULT buffer_init_convert (buffer_t * buf, > > - tpm_size_t initsize, > > - BYTE* initval); > > - > > -// make an alias to a constant array, no copying > > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > > - > > -// make an alias into buf, with given offset and length > > -// if len = 0, make the alias go to the end of buf > > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > > - tpm_size_t offset, tpm_size_t); > > - > > -// make an alias buffer into a bytestream > > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > > - tpm_size_t size, BYTE* val); > > - > > -// "copy constructor" > > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > > - > > - > > -// copy into the start of a > > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > > - > > -// are they equal? > > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > > - > > -// set the buffer to a constant byte > > -void buffer_memset (buffer_t * buf, BYTE b); > > - > > -tpm_size_t buffer_len (const buffer_t* buf); > > - > > -TPM_RESULT buffer_free (buffer_t * buf); > > - > > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > > - > > -#endif // _TOOLS_H_ > > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > > deleted file mode 100644 > > index aff0e2b..0000000 > > --- a/tools/vtpm_manager/util/hashtable.c > > +++ /dev/null > > @@ -1,316 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable.c > > - * - tools/blktap2/drivers/hashtable.c > > - */ > > - > > -#include "hashtable.h" > > -#include "hashtable_private.h" > > -#include > > -#include > > -#include > > -#include > > - > > -/* > > -Credit for primes table: Aaron Krowne > > - http://br.endernet.org/~akrowne/ > > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > > -*/ > > -static const unsigned int primes[] = { > > -53, 97, 193, 389, > > -769, 1543, 3079, 6151, > > -12289, 24593, 49157, 98317, > > -196613, 393241, 786433, 1572869, > > -3145739, 6291469, 12582917, 25165843, > > -50331653, 100663319, 201326611, 402653189, > > -805306457, 1610612741 > > -}; > > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > > -const float max_load_factor = 0.65; > > - > > -/*****************************************************************************/ > > -struct hashtable * > > -create_hashtable(unsigned int minsize, > > - unsigned int (*hashf) (void*), > > - int (*eqf) (void*,void*)) > > -{ > > - struct hashtable *h; > > - unsigned int pindex, size = primes[0]; > > - /* Check requested hashtable isn't too large */ > > - if (minsize > (1u << 30)) return NULL; > > - /* Enforce size as prime */ > > - for (pindex=0; pindex < prime_table_length; pindex++) { > > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > > - } > > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > > - if (NULL == h) return NULL; /*oom*/ > > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > > - memset(h->table, 0, size * sizeof(struct entry *)); > > - h->tablelength = size; > > - h->primeindex = pindex; > > - h->entrycount = 0; > > - h->hashfn = hashf; > > - h->eqfn = eqf; > > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_init(&h->mutex, NULL); > > -#endif > > - return h; > > -} > > - > > -/*****************************************************************************/ > > -unsigned int > > -hash(struct hashtable *h, void *k) > > -{ > > - unsigned int i = h->hashfn(k); > > - i += ~(i << 9); > > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > > - i += (i << 4); > > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > > - return i; > > -} > > - > > -/*****************************************************************************/ > > -static int > > -hashtable_expand(struct hashtable *h) > > -{ > > - /* Double the size of the table to accomodate more entries */ > > - struct entry **newtable; > > - struct entry *e; > > - struct entry **pE; > > - unsigned int newsize, i, index; > > - /* Check we're not hitting max capacity */ > > - if (h->primeindex == (prime_table_length - 1)) return 0; > > - newsize = primes[++(h->primeindex)]; > > - > > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > > - if (NULL != newtable) > > - { > > - memset(newtable, 0, newsize * sizeof(struct entry *)); > > - /* This algorithm is not 'stable'. ie. it reverses the list > > - * when it transfers entries between the tables */ > > - for (i = 0; i < h->tablelength; i++) { > > - while (NULL != (e = h->table[i])) { > > - h->table[i] = e->next; > > - index = indexFor(newsize,e->h); > > - e->next = newtable[index]; > > - newtable[index] = e; > > - } > > - } > > - free(h->table); > > - h->table = newtable; > > - } > > - /* Plan B: realloc instead */ > > - else > > - { > > - newtable = (struct entry **) > > - realloc(h->table, newsize * sizeof(struct entry *)); > > - if (NULL == newtable) { (h->primeindex)--; return 0; } > > - h->table = newtable; > > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > > - for (i = 0; i < h->tablelength; i++) { > > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > > - index = indexFor(newsize,e->h); > > - if (index == i) > > - { > > - pE = &(e->next); > > - } > > - else > > - { > > - *pE = e->next; > > - e->next = newtable[index]; > > - newtable[index] = e; > > - } > > - } > > - } > > - } > > - h->tablelength = newsize; > > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > > - return -1; > > -} > > - > > -/*****************************************************************************/ > > -unsigned int > > -hashtable_count(struct hashtable *h) > > -{ > > - unsigned int count; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - count = h->entrycount; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return count; > > -} > > - > > -/*****************************************************************************/ > > -int > > -hashtable_insert(struct hashtable *h, void *k, void *v) > > -{ > > - /* This method allows duplicate keys - but they shouldn't be used */ > > - unsigned int index; > > - struct entry *e; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - if (++(h->entrycount) > h->loadlimit) > > - { > > - /* Ignore the return value. If expand fails, we should > > - * still try cramming just this value into the existing table > > - * -- we may not have memory for a larger table, but one more > > - * element may be ok. Next time we insert, we'll try expanding again.*/ > > - hashtable_expand(h); > > - } > > - e = (struct entry *)malloc(sizeof(struct entry)); > > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > > - e->h = hash(h,k); > > - index = indexFor(h->tablelength,e->h); > > - e->k = k; > > - e->v = v; > > - e->next = h->table[index]; > > - h->table[index] = e; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return -1; > > -} > > - > > -/*****************************************************************************/ > > -void * /* returns value associated with key */ > > -hashtable_search(struct hashtable *h, void *k) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e; > > - unsigned int hashvalue, index; > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hashvalue); > > - e = h->table[index]; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return e->v; > > - } > > - e = e->next; > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return NULL; > > -} > > - > > -/*****************************************************************************/ > > -void * /* returns value associated with key */ > > -hashtable_remove(struct hashtable *h, void *k) > > -{ > > - /* TODO: consider compacting the table when the load factor drops enough, > > - * or provide a 'compact' method. */ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e; > > - struct entry **pE; > > - void *v; > > - unsigned int hashvalue, index; > > - > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hash(h,k)); > > - pE = &(h->table[index]); > > - e = *pE; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > > - { > > - *pE = e->next; > > - h->entrycount--; > > - v = e->v; > > - freekey(e->k); > > - free(e); > > - return v; > > - } > > - pE = &(e->next); > > - e = e->next; > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return NULL; > > -} > > - > > -/*****************************************************************************/ > > -/* destroy */ > > -void > > -hashtable_destroy(struct hashtable *h, int free_values) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - unsigned int i; > > - struct entry *e, *f; > > - struct entry **table = h->table; > > - if (free_values) > > - { > > - for (i = 0; i < h->tablelength; i++) > > - { > > - e = table[i]; > > - while (NULL != e) > > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > > - } > > - } > > - else > > - { > > - for (i = 0; i < h->tablelength; i++) > > - { > > - e = table[i]; > > - while (NULL != e) > > - { f = e; e = e->next; freekey(f->k); free(f); } > > - } > > - } > > - free(h->table); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_destroy(&h->mutex); > > -#endif > > - free(h); > > -} > > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > > deleted file mode 100644 > > index dedc60a..0000000 > > --- a/tools/vtpm_manager/util/hashtable.h > > +++ /dev/null > > @@ -1,204 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable.h > > - * - tools/blktap2/drivers/hashtable.h > > - */ > > - > > -#ifndef __HASHTABLE_CWC22_H__ > > -#define __HASHTABLE_CWC22_H__ > > - > > -struct hashtable; > > - > > -/* Example of use: > > - * > > - * struct hashtable *h; > > - * struct some_key *k; > > - * struct some_value *v; > > - * > > - * static unsigned int hash_from_key_fn( void *k ); > > - * static int keys_equal_fn ( void *key1, void *key2 ); > > - * > > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > > - * > > - * (initialise k and v to suitable values) > > - * > > - * if (! hashtable_insert(h,k,v) ) > > - * { exit(-1); } > > - * > > - * if (NULL == (found = hashtable_search(h,k) )) > > - * { printf("not found!"); } > > - * > > - * if (NULL == (found = hashtable_remove(h,k) )) > > - * { printf("Not found\n"); } > > - * > > - */ > > - > > -/* Macros may be used to define type-safe(r) hashtable access functions, with > > - * methods specialized to take known key and value types as parameters. > > - * > > - * Example: > > - * > > - * Insert this at the start of your file: > > - * > > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > > - * > > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > > - * These operate just like hashtable_insert etc., with the same parameters, > > - * but their function signatures have 'struct some_key *' rather than > > - * 'void *', and hence can generate compile time errors if your program is > > - * supplying incorrect data as a key (and similarly for value). > > - * > > - * Note that the hash and key equality functions passed to create_hashtable > > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > > - * a difficult issue as they're only defined and passed once, and the other > > - * functions will ensure that only valid keys are supplied to them. > > - * > > - * The cost for this checking is increased code size and runtime overhead > > - * - if performance is important, it may be worth switching back to the > > - * unsafe methods once your program has been debugged with the safe methods. > > - * This just requires switching to some simple alternative defines - eg: > > - * #define insert_some hashtable_insert > > - * > > - */ > > - > > -/***************************************************************************** > > - * create_hashtable > > - > > - * @name create_hashtable > > - * @param minsize minimum initial size of hashtable > > - * @param hashfunction function for hashing keys > > - * @param key_eq_fn function for determining key equality > > - * @return newly created hashtable or NULL on failure > > - */ > > - > > -struct hashtable * > > -create_hashtable(unsigned int minsize, > > - unsigned int (*hashfunction) (void*), > > - int (*key_eq_fn) (void*,void*)); > > - > > -/***************************************************************************** > > - * hashtable_insert > > - > > - * @name hashtable_insert > > - * @param h the hashtable to insert into > > - * @param k the key - hashtable claims ownership and will free on removal > > - * @param v the value - does not claim ownership > > - * @return non-zero for successful insertion > > - * > > - * This function will cause the table to expand if the insertion would take > > - * the ratio of entries to table size over the maximum load factor. > > - * > > - * This function does not check for repeated insertions with a duplicate key. > > - * The value returned when using a duplicate key is undefined -- when > > - * the hashtable changes size, the order of retrieval of duplicate key > > - * entries is reversed. > > - * If in doubt, remove before insert. > > - */ > > - > > -int > > -hashtable_insert(struct hashtable *h, void *k, void *v); > > - > > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > > -{ \ > > - return hashtable_insert(h,k,v); \ > > -} > > - > > -/***************************************************************************** > > - * hashtable_search > > - > > - * @name hashtable_search > > - * @param h the hashtable to search > > - * @param k the key to search for - does not claim ownership > > - * @return the value associated with the key, or NULL if none found > > - */ > > - > > -void * > > -hashtable_search(struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > > -valuetype * fnname (struct hashtable *h, keytype *k) \ > > -{ \ > > - return (valuetype *) (hashtable_search(h,k)); \ > > -} > > - > > -/***************************************************************************** > > - * hashtable_remove > > - > > - * @name hashtable_remove > > - * @param h the hashtable to remove the item from > > - * @param k the key to search for - does not claim ownership > > - * @return the value associated with the key, or NULL if none found > > - */ > > - > > -void * /* returns value */ > > -hashtable_remove(struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > > -valuetype * fnname (struct hashtable *h, keytype *k) \ > > -{ \ > > - return (valuetype *) (hashtable_remove(h,k)); \ > > -} > > - > > - > > -/***************************************************************************** > > - * hashtable_count > > - > > - * @name hashtable_count > > - * @param h the hashtable > > - * @return the number of items stored in the hashtable > > - */ > > -unsigned int > > -hashtable_count(struct hashtable *h); > > - > > - > > -/***************************************************************************** > > - * hashtable_destroy > > - > > - * @name hashtable_destroy > > - * @param h the hashtable > > - * @param free_values whether to call 'free' on the remaining values > > - */ > > - > > -void > > -hashtable_destroy(struct hashtable *h, int free_values); > > - > > -#endif /* __HASHTABLE_CWC22_H__ */ > > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > > deleted file mode 100644 > > index dcf42c8..0000000 > > --- a/tools/vtpm_manager/util/hashtable_itr.c > > +++ /dev/null > > @@ -1,236 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/blktap2/drivers/hashtable_itr.c > > - */ > > - > > -#include "hashtable.h" > > -#include "hashtable_private.h" > > -#include "hashtable_itr.h" > > -#include /* defines NULL */ > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator - iterator constructor */ > > - > > -struct hashtable_itr * > > -hashtable_iterator(struct hashtable *h) > > -{ > > - unsigned int i, tablelength; > > - struct hashtable_itr *itr = (struct hashtable_itr *) > > - malloc(sizeof(struct hashtable_itr)); > > - if (NULL == itr) return NULL; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - itr->h = h; > > - itr->e = NULL; > > - itr->parent = NULL; > > - tablelength = h->tablelength; > > - itr->index = tablelength; > > - if (0 == h->entrycount) { > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return itr; > > - } > > - > > - for (i = 0; i < tablelength; i++) > > - { > > - if (NULL != h->table[i]) > > - { > > - itr->e = h->table[i]; > > - itr->index = i; > > - break; > > - } > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return itr; > > -} > > - > > -/*****************************************************************************/ > > -/* key - return the key of the (key,value) pair at the current position */ > > -/* value - return the value of the (key,value) pair at the current position */ > > - > > -void * > > -hashtable_iterator_key(struct hashtable_itr *i) > > -{ return i->e->k; } > > - > > -void * > > -hashtable_iterator_value(struct hashtable_itr *i) > > -{ return i->e->v; } > > - > > -/*****************************************************************************/ > > -/* advance - advance the iterator to the next element > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_advance(struct hashtable_itr *itr) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&itr->h->mutex); > > -#endif > > - unsigned int j,tablelength; > > - struct entry **table; > > - struct entry *next; > > - int ret; > > - if (NULL == itr->e) { /* stupidity check */ > > - ret = 0; > > - goto egress; > > - } > > - > > - next = itr->e->next; > > - if (NULL != next) > > - { > > - itr->parent = itr->e; > > - itr->e = next; > > - ret = -1; > > - goto egress; > > - } > > - > > - tablelength = itr->h->tablelength; > > - itr->parent = NULL; > > - if (tablelength <= (j = ++(itr->index))) > > - { > > - itr->e = NULL; > > - ret = 0; > > - goto egress; > > - } > > - table = itr->h->table; > > - while (NULL == (next = table[j])) > > - { > > - if (++j >= tablelength) > > - { > > - itr->index = tablelength; > > - itr->e = NULL; > > - ret = 0; > > - goto egress; > > - } > > - } > > - itr->index = j; > > - itr->e = next; > > - ret = -1; > > - > > - egress: > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&itr->h->mutex); > > -#endif > > - return ret; > > -} > > - > > -/*****************************************************************************/ > > -/* remove - remove the entry at the current iterator position > > - * and advance the iterator, if there is a successive > > - * element. > > - * If you want the value, read it before you remove: > > - * beware memory leaks if you don't. > > - * Returns zero if end of iteration. */ > > - > > -int > > -hashtable_iterator_remove(struct hashtable_itr *itr) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&itr->h->mutex); > > -#endif > > - struct entry *remember_e, *remember_parent; > > - int ret; > > - > > - /* Do the removal */ > > - if (NULL == (itr->parent)) > > - { > > - /* element is head of a chain */ > > - itr->h->table[itr->index] = itr->e->next; > > - } else { > > - /* element is mid-chain */ > > - itr->parent->next = itr->e->next; > > - } > > - /* itr->e is now outside the hashtable */ > > - remember_e = itr->e; > > - itr->h->entrycount--; > > - freekey(remember_e->k); > > - > > - /* Advance the iterator, correcting the parent */ > > - remember_parent = itr->parent; > > - ret = hashtable_iterator_advance(itr); > > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > > - free(remember_e); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&itr->h->mutex); > > -#endif > > - return ret; > > -} > > - > > -/*****************************************************************************/ > > -int /* returns zero if not found */ > > -hashtable_iterator_search(struct hashtable_itr *itr, > > - struct hashtable *h, void *k) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e, *parent; > > - unsigned int hashvalue, index; > > - int ret; > > - > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hashvalue); > > - > > - e = h->table[index]; > > - parent = NULL; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > > - { > > - itr->index = index; > > - itr->e = e; > > - itr->parent = parent; > > - itr->h = h; > > - ret= -1; > > - goto egress; > > - } > > - parent = e; > > - e = e->next; > > - } > > - ret = 0; > > - > > -egress: > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return ret; > > -} > > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > > deleted file mode 100644 > > index 35654e0..0000000 > > --- a/tools/vtpm_manager/util/hashtable_itr.h > > +++ /dev/null > > @@ -1,109 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/blktap2/drivers/hashtable_itr.h > > - */ > > - > > - > > -#ifndef __HASHTABLE_ITR_CWC22__ > > -#define __HASHTABLE_ITR_CWC22__ > > -#include "hashtable.h" > > -#include "hashtable_private.h" /* needed to enable inlining */ > > - > > -/*****************************************************************************/ > > -/* This struct is only concrete here to allow the inlining of two of the > > - * accessor functions. */ > > -struct hashtable_itr > > -{ > > - struct hashtable *h; > > - struct entry *e; > > - struct entry *parent; > > - unsigned int index; > > -}; > > - > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator > > - */ > > - > > -struct hashtable_itr * > > -hashtable_iterator(struct hashtable *h); > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator_key > > - * - return the value of the (key,value) pair at the current position */ > > - > > -void *hashtable_iterator_key(struct hashtable_itr *i); > > - > > -/*****************************************************************************/ > > -/* value - return the value of the (key,value) pair at the current position */ > > - > > -void *hashtable_iterator_value(struct hashtable_itr *i); > > - > > -/*****************************************************************************/ > > -/* advance - advance the iterator to the next element > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_advance(struct hashtable_itr *itr); > > - > > -/*****************************************************************************/ > > -/* remove - remove current element and advance the iterator to the next element > > - * NB: if you need the value to free it, read it before > > - * removing. ie: beware memory leaks! > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_remove(struct hashtable_itr *itr); > > - > > -/*****************************************************************************/ > > -/* search - overwrite the supplied iterator, to point to the entry > > - * matching the supplied key. > > - h points to the hashtable to be searched. > > - * returns zero if not found. */ > > -int > > -hashtable_iterator_search(struct hashtable_itr *itr, > > - struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > > -{ \ > > - return (hashtable_iterator_search(i,h,k)); \ > > -} > > - > > - > > - > > -#endif /* __HASHTABLE_ITR_CWC22__*/ > > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > > deleted file mode 100644 > > index d87a7f9..0000000 > > --- a/tools/vtpm_manager/util/hashtable_private.h > > +++ /dev/null > > @@ -1,96 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable_private.h > > - * - tools/blktap2/drivers/hashtable_private.h > > - */ > > - > > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > -#define __HASHTABLE_PRIVATE_CWC22_H__ > > - > > -#include "hashtable.h" > > -#ifdef HASHTABLE_THREADED > > -#include > > -#endif > > - > > -/*****************************************************************************/ > > -struct entry > > -{ > > - void *k, *v; > > - unsigned int h; > > - struct entry *next; > > -}; > > - > > -struct hashtable { > > - unsigned int tablelength; > > - struct entry **table; > > - unsigned int entrycount; > > - unsigned int loadlimit; > > - unsigned int primeindex; > > - unsigned int (*hashfn) (void *k); > > - int (*eqfn) (void *k1, void *k2); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_t mutex; > > -#endif > > -}; > > - > > -/*****************************************************************************/ > > -unsigned int > > -hash(struct hashtable *h, void *k); > > - > > -/*****************************************************************************/ > > -/* indexFor */ > > -static inline unsigned int > > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > > - return (hashvalue % tablelength); > > -}; > > - > > -/* Only works if tablelength == 2^N */ > > -/*static inline unsigned int > > -indexFor(unsigned int tablelength, unsigned int hashvalue) > > -{ > > - return (hashvalue & (tablelength - 1u)); > > -} > > -*/ > > - > > -/*****************************************************************************/ > > -#define freekey(X) free(X) > > -/*define freekey(X) ; */ > > - > > - > > -/*****************************************************************************/ > > - > > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > > deleted file mode 100644 > > index 75fe91a..0000000 > > --- a/tools/vtpm_manager/util/log.c > > +++ /dev/null > > @@ -1,142 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "buffer.h" > > -#include "tcg.h" > > - > > -// Helper code for the consts, eg. to produce messages for error codes. > > - > > -typedef struct error_code_entry_t { > > - TPM_RESULT code; > > - char * code_name; > > - char * msg; > > -} error_code_entry_t; > > - > > -static const error_code_entry_t error_msgs [] = { > > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > > - > > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > > -}; > > - > > - > > -// helper function for the error codes: > > -const char* tpm_get_error_name (TPM_RESULT code) { > > - // just do a linear scan for now > > - unsigned i; > > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > > - if (code == error_msgs[i].code) > > - return error_msgs[i].code_name; > > - > > - return("Unknown Error Code"); > > -} > > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > > deleted file mode 100644 > > index 1f15f5b..0000000 > > --- a/tools/vtpm_manager/util/log.h > > +++ /dev/null > > @@ -1,94 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#ifndef __VTPM_LOG_H__ > > -#define __VTPM_LOG_H__ > > - > > -#include // for uint32_t > > -#include // for pointer NULL > > - > > -// =========================== LOGGING ============================== > > - > > -// the logging module numbers > > -#define VTPM_LOG_CRYPTO 1 > > -#define VTPM_LOG_BSG 2 > > -#define VTPM_LOG_TXDATA 3 > > -#define VTPM_LOG_TCS 4 > > -#define VTPM_LOG_TCS_DEEP 5 > > -#define VTPM_LOG_VTSP 6 > > -#define VTPM_LOG_VTPM 7 > > -#define VTPM_LOG_VTPM_DEEP 8 > > -#define VTPM_LOG_VTSP_DEEP 9 > > - > > -static char *module_names[] = { "", > > - "CRYPTO", > > - "BSG", > > - "TXDATA", > > - "TCS", > > - "TCS", > > - "VTSP", > > - "VTPM", > > - "VTPM", > > - "VTSP" > > - }; > > - > > -// Default to standard logging > > -#ifndef LOGGING_MODULES > > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > > -#endif > > - > > -// bit-access macros > > -#define BITMASK(idx) ( 1U << (idx) ) > > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > > - > > -#define vtpmloginfo(module, fmt, args...) \ > > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > > - } > > - > > -#define vtpmloginfomore(module, fmt, args...) \ > > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > > - fprintf (stdout, fmt,##args); \ > > - } > > - > > -#define vtpmlogerror(module, fmt, args...) \ > > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > > - > > -//typedef UINT32 tpm_size_t; > > - > > -// helper function for the error codes: > > -const char* tpm_get_error_name (TPM_RESULT code); > > - > > -#endif // _VTPM_LOG_H_ > > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > > deleted file mode 100644 > > index 5c42913..0000000 > > --- a/tools/vtpm_manager/util/tcg.h > > +++ /dev/null > > @@ -1,503 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcg.h > > -// > > -// This file contains all the structure and type definitions > > -// > > -// ================================================================== > > - > > -#ifndef __TCG_H__ > > -#define __TCG_H__ > > - > > -// This pragma is used to disallow structure padding > > -#pragma pack(push, 1) > > - > > -// *************************** TYPEDEFS ********************************* > > -typedef unsigned char BYTE; > > -typedef unsigned char BOOL; > > -typedef unsigned short UINT16; > > -typedef unsigned int UINT32; > > -typedef unsigned long long UINT64; > > - > > -typedef UINT32 TPM_RESULT; > > -typedef UINT32 TPM_PCRINDEX; > > -typedef UINT32 TPM_DIRINDEX; > > -typedef UINT32 TPM_HANDLE; > > -typedef TPM_HANDLE TPM_AUTHHANDLE; > > -typedef TPM_HANDLE TCPA_HASHHANDLE; > > -typedef TPM_HANDLE TCPA_HMACHANDLE; > > -typedef TPM_HANDLE TCPA_ENCHANDLE; > > -typedef TPM_HANDLE TPM_KEY_HANDLE; > > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > > -typedef UINT32 TPM_RESOURCE_TYPE; > > -typedef UINT32 TPM_COMMAND_CODE; > > -typedef UINT16 TPM_PROTOCOL_ID; > > -typedef BYTE TPM_AUTH_DATA_USAGE; > > -typedef UINT16 TPM_ENTITY_TYPE; > > -typedef UINT32 TPM_ALGORITHM_ID; > > -typedef UINT16 TPM_KEY_USAGE; > > -typedef UINT16 TPM_STARTUP_TYPE; > > -typedef UINT32 TPM_CAPABILITY_AREA; > > -typedef UINT16 TPM_ENC_SCHEME; > > -typedef UINT16 TPM_SIG_SCHEME; > > -typedef UINT16 TPM_MIGRATE_SCHEME; > > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > > -typedef UINT32 TPM_KEY_FLAGS; > > - > > -#define TPM_DIGEST_SIZE 20 // Don't change this > > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > > -typedef TPM_AUTHDATA TPM_SECRET; > > -typedef TPM_AUTHDATA TPM_ENCAUTH; > > -typedef BYTE TPM_PAYLOAD_TYPE; > > -typedef UINT16 TPM_TAG; > > - > > -// Data Types of the TCS > > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > > - > > -// ************************* STRUCTURES ********************************** > > - > > -typedef struct TPM_VERSION { > > - BYTE major; > > - BYTE minor; > > - BYTE revMajor; > > - BYTE revMinor; > > -} TPM_VERSION; > > - > > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > > - > > -typedef struct TPM_DIGEST { > > - BYTE digest[TPM_DIGEST_SIZE]; > > -} TPM_DIGEST; > > - > > -typedef TPM_DIGEST TPM_PCRVALUE; > > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > > -typedef TPM_DIGEST TPM_DIRVALUE; > > -typedef TPM_DIGEST TPM_HMAC; > > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > > - > > -typedef struct TPM_NONCE { > > - BYTE nonce[TPM_DIGEST_SIZE]; > > -} TPM_NONCE; > > - > > -typedef struct TPM_KEY_PARMS { > > - TPM_ALGORITHM_ID algorithmID; > > - TPM_ENC_SCHEME encScheme; > > - TPM_SIG_SCHEME sigScheme; > > - UINT32 parmSize; > > - BYTE* parms; > > -} TPM_KEY_PARMS; > > - > > -typedef struct TPM_RSA_KEY_PARMS { > > - UINT32 keyLength; > > - UINT32 numPrimes; > > - UINT32 exponentSize; > > - BYTE* exponent; > > -} TPM_RSA_KEY_PARMS; > > - > > -typedef struct TPM_STORE_PUBKEY { > > - UINT32 keyLength; > > - BYTE* key; > > -} TPM_STORE_PUBKEY; > > - > > -typedef struct TPM_PUBKEY { > > - TPM_KEY_PARMS algorithmParms; > > - TPM_STORE_PUBKEY pubKey; > > -} TPM_PUBKEY; > > - > > -typedef struct TPM_KEY { > > - TPM_VERSION ver; > > - TPM_KEY_USAGE keyUsage; > > - TPM_KEY_FLAGS keyFlags; > > - TPM_AUTH_DATA_USAGE authDataUsage; > > - TPM_KEY_PARMS algorithmParms; > > - UINT32 PCRInfoSize; > > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > > - TPM_STORE_PUBKEY pubKey; > > - UINT32 encDataSize; > > - BYTE* encData; > > -} TPM_KEY; > > - > > -typedef struct TPM_PCR_SELECTION { > > - UINT16 sizeOfSelect; /// in bytes > > - BYTE* pcrSelect; > > -} TPM_PCR_SELECTION; > > - > > -typedef struct TPM_PCR_COMPOSITE { > > - TPM_PCR_SELECTION select; > > - UINT32 valueSize; > > - TPM_PCRVALUE* pcrValue; > > -} TPM_PCR_COMPOSITE; > > - > > - > > -typedef struct TPM_PCR_INFO { > > - TPM_PCR_SELECTION pcrSelection; > > - TPM_COMPOSITE_HASH digestAtRelease; > > - TPM_COMPOSITE_HASH digestAtCreation; > > -} TPM_PCR_INFO; > > - > > - > > -typedef struct TPM_BOUND_DATA { > > - TPM_VERSION ver; > > - TPM_PAYLOAD_TYPE payload; > > - BYTE* payloadData; > > -} TPM_BOUND_DATA; > > - > > -typedef struct TPM_STORED_DATA { > > - TPM_VERSION ver; > > - UINT32 sealInfoSize; > > - BYTE* sealInfo; > > - UINT32 encDataSize; > > - BYTE* encData; > > -} TPM_STORED_DATA; > > - > > -typedef struct TCS_AUTH { > > - TCS_AUTHHANDLE AuthHandle; > > - TPM_NONCE NonceOdd; // system > > - TPM_NONCE NonceEven; // TPM > > - BOOL fContinueAuthSession; > > - TPM_AUTHDATA HMAC; > > -} TCS_AUTH; > > - > > -// structures for dealing with sizes followed by buffers in all the > > -// TCG structure. > > -typedef struct pack_buf_t { > > - UINT32 size; > > - BYTE * data; > > -} pack_buf_t; > > - > > -typedef struct pack_constbuf_t { > > - UINT32 size; > > - const BYTE* data; > > -} pack_constbuf_t; > > - > > - > > - > > -// **************************** CONSTANTS ********************************* > > - > > -// BOOL values > > -#define TRUE 0x01 > > -#define FALSE 0x00 > > - > > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > > - > > -// > > -// TPM_COMMAND_CODE values > > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > > -#define TPM_VENDOR_ORDINAL 0x20000000UL > > - > > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > > - > > - > > - > > -// > > -// TPM_RESULT values > > -// > > -// just put in the whole table from spec 1.2 > > - > > -#define TPM_BASE 0x0 // The start of TPM return codes > > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > > - > > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > > - > > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > > - > > -// TPM_STARTUP_TYPE values > > -#define TPM_ST_CLEAR 0x0001 > > -#define TPM_ST_STATE 0x0002 > > -#define TPM_ST_DEACTIVATED 0x003 > > - > > -// TPM_TAG values > > -#define TPM_TAG_RQU_COMMAND 0x00c1 > > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > > -#define TPM_TAG_RSP_COMMAND 0x00c4 > > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > > - > > -// TPM_PAYLOAD_TYPE values > > -#define TPM_PT_ASYM 0x01 > > -#define TPM_PT_BIND 0x02 > > -#define TPM_PT_MIGRATE 0x03 > > -#define TPM_PT_MAINT 0x04 > > -#define TPM_PT_SEAL 0x05 > > - > > -// TPM_ENTITY_TYPE values > > -#define TPM_ET_KEYHANDLE 0x0001 > > -#define TPM_ET_OWNER 0x0002 > > -#define TPM_ET_DATA 0x0003 > > -#define TPM_ET_SRK 0x0004 > > -#define TPM_ET_KEY 0x0005 > > - > > -/// TPM_ResourceTypes > > -#define TPM_RT_KEY 0x00000001 > > -#define TPM_RT_AUTH 0x00000002 > > -#define TPM_RT_TRANS 0x00000004 > > -#define TPM_RT_CONTEXT 0x00000005 > > - > > -// TPM_PROTOCOL_ID values > > -#define TPM_PID_OIAP 0x0001 > > -#define TPM_PID_OSAP 0x0002 > > -#define TPM_PID_ADIP 0x0003 > > -#define TPM_PID_ADCP 0x0004 > > -#define TPM_PID_OWNER 0x0005 > > - > > -// TPM_ALGORITHM_ID values > > -#define TPM_ALG_RSA 0x00000001 > > -#define TPM_ALG_DES 0x00000002 > > -#define TPM_ALG_3DES 0X00000003 > > -#define TPM_ALG_SHA 0x00000004 > > -#define TPM_ALG_HMAC 0x00000005 > > -#define TCPA_ALG_AES 0x00000006 > > - > > -// TPM_ENC_SCHEME values > > -#define TPM_ES_NONE 0x0001 > > -#define TPM_ES_RSAESPKCSv15 0x0002 > > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > > - > > -// TPM_SIG_SCHEME values > > -#define TPM_SS_NONE 0x0001 > > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > > - > > -// TPM_KEY_USAGE values > > -#define TPM_KEY_EK 0x0000 > > -#define TPM_KEY_SIGNING 0x0010 > > -#define TPM_KEY_STORAGE 0x0011 > > -#define TPM_KEY_IDENTITY 0x0012 > > -#define TPM_KEY_AUTHCHANGE 0X0013 > > -#define TPM_KEY_BIND 0x0014 > > -#define TPM_KEY_LEGACY 0x0015 > > - > > -// TPM_AUTH_DATA_USAGE values > > -#define TPM_AUTH_NEVER 0x00 > > -#define TPM_AUTH_ALWAYS 0x01 > > - > > -// Key Handle of owner and srk > > -#define TPM_OWNER_KEYHANDLE 0x40000001 > > -#define TPM_SRK_KEYHANDLE 0x40000000 > > - > > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > > - > > -#include > > - > > -// FIXME: Review use of these and delete unneeded ones. > > - > > -// these are really badly dependent on local structure: > > -// DEPENDS: local var 'status' of type TPM_RESULT > > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > > -#define ERRORDIE(s) do { status = s; \ > > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > > - goto abort_egress; } \ > > - while (0) > > - > > -// DEPENDS: local var 'status' of type TPM_RESULT > > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > > -// Try command c. If it fails, set status to s and goto abort. > > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > > - status = s; \ > > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > > - goto abort_egress; \ > > - } else {\ > > - status = c; \ > > - } > > - > > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > > -#define TPMTRYRETURN(c) do { status = c; \ > > - if (status != TPM_SUCCESS) { \ > > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > > - goto abort_egress; \ > > - } \ > > - } while(0) > > - > > - > > -#pragma pack(pop) > > - > > -#endif //__TCPA_H__ > > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > > index 3b89223..0ba1d55 100644 > > --- a/tools/xenstore/hashtable.c > > +++ b/tools/xenstore/hashtable.c > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable.c > > - * - tools/vtpm_manager/util/hashtable.c > > */ > > > > #include "hashtable.h" > > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > > index 8e6bb5b..4d68223 100644 > > --- a/tools/xenstore/hashtable.h > > +++ b/tools/xenstore/hashtable.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable.h > > - * - tools/vtpm_manager/util/hashtable.h > > */ > > > > #ifndef __HASHTABLE_CWC22_H__ > > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > > index cabaffe..a08559d 100644 > > --- a/tools/xenstore/hashtable_private.h > > +++ b/tools/xenstore/hashtable_private.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable_private.h > > - * - tools/vtpm_manager/util/hashtable_private.h > > */ > > > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > > index ad1eb78..c142140 100644 > > --- a/tools/xm-test/configure.ac > > +++ b/tools/xm-test/configure.ac > > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > > tests/unpause/Makefile > > tests/vcpu-pin/Makefile > > tests/vcpu-disable/Makefile > > - tests/vtpm/Makefile > > tests/xapi/Makefile > > tests/enforce_dom0_cpus/Makefile > > tests/cpupool/Makefile > > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > > index f0516b2..e04591b 100644 > > --- a/tools/xm-test/grouptest/default > > +++ b/tools/xm-test/grouptest/default > > @@ -27,5 +27,4 @@ sysrq > > unpause > > vcpu-disable > > vcpu-pin > > -vtpm > > xapi > > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > > index bafc988..5c3e1b1 100644 > > --- a/tools/xm-test/grouptest/medium > > +++ b/tools/xm-test/grouptest/medium > > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > > unpause > > vcpu-disable > > vcpu-pin > > -vtpm > > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > > index 3b04921..7a08b77 100644 > > --- a/tools/xm-test/grouptest/xapi > > +++ b/tools/xm-test/grouptest/xapi > > @@ -1,2 +1 @@ > > xapi > > -vtpm 09_vtpm-xapi.test > > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > > index ae8c550..3ba7433 100644 > > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > > @@ -59,7 +59,6 @@ class XenConfig: > > # These options need to be lists > > self.defaultOpts["disk"] = [] > > self.defaultOpts["vif"] = [] > > - self.defaultOpts["vtpm"] = [] > > > > self.opts = self.defaultOpts > > > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > > index 8d673ed..455f50c 100644 > > --- a/tools/xm-test/tests/Makefile.am > > +++ b/tools/xm-test/tests/Makefile.am > > @@ -25,7 +25,6 @@ SUBDIRS = \ > > unpause \ > > vcpu-disable \ > > vcpu-pin \ > > - vtpm \ > > enforce_dom0_cpus \ > > save restore migrate \ > > cpupool > > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > > deleted file mode 100644 > > index dfd1227..0000000 > > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# verify list > > - > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > - > > -try: > > - domain.start(noConsole=True) > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - vtpm_cleanup(domain.getName()) > > - FAIL("Unable to create domain") > > - > > - > > -domName = domain.getName() > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > > -eyecatcher = "/local/domain/0/backend/vtpm" > > -where = output.find(eyecatcher) > > -if status != 0: > > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > > -elif where < 0: > > - FAIL("Fail to list virtual TPM device") > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > > deleted file mode 100644 > > index a18cbab..0000000 > > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > > +++ /dev/null > > @@ -1,49 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > -if not re.search("PCR-00:",run["output"]): > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > > deleted file mode 100644 > > index b863f27..0000000 > > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > > +++ /dev/null > > @@ -1,99 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; suspend and resume the domain and > > -# check list of pcrs again > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm save %s %s.save" % > > - (domName, domName), > > - timeout=30) > > - > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm save did not succeed") > > - > > - try: > > - status, ouptut = traceCommand("xm restore %s.save" % > > - (domName), > > - timeout=30) > > - except TimeoutError, e: > > - os.remove("%s.save" % domName) > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - os.remove("%s.save" % domName) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm restore did not succeed") > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > > deleted file mode 100644 > > index ccc8b73..0000000 > > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > > +++ /dev/null > > @@ -1,93 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again > > -# This test does local live migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > > deleted file mode 100644 > > index 57b87df..0000000 > > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > > +++ /dev/null > > @@ -1,93 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again > > -# This test does local (non-live) migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > > deleted file mode 100644 > > index c70691d..0000000 > > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > > +++ /dev/null > > @@ -1,125 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; suspend and resume the domain and > > -# check list of pcrs again and validate extended pcr > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm save %s %s.save" % > > - (domName, domName), > > - timeout=30) > > - > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm save did not succeed") > > - > > - try: > > - status, ouptut = traceCommand("xm restore %s.save" % > > - (domName), > > - timeout=30) > > - except TimeoutError, e: > > - os.remove("%s.save" % domName) > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - os.remove("%s.save" % domName) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm restore did not succeed") > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > > deleted file mode 100644 > > index 4ff3360..0000000 > > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > > +++ /dev/null > > @@ -1,119 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again and validate extended pcr > > -# This test does local live migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > > deleted file mode 100644 > > index 27125fc..0000000 > > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > > +++ /dev/null > > @@ -1,119 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again and validate extended pcr > > -# This test does local (non-live) migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > > deleted file mode 100644 > > index a1aa8b3..0000000 > > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > > +++ /dev/null > > @@ -1,158 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Test to test the vtpm class through the Xen-API > > -# > > -# Tested methods: > > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > > -# create, destroy, get_VM > > -# VM: get_VTPMS > > - > > -from XmTestLib import xapi > > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > - > > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > > - > > -try: > > - # XmTestAPIDomain tries to establish a connection to XenD > > - domain = XmTestAPIDomain() > > -except Exception, e: > > - SKIP("Skipping test. Error: %s" % str(e)) > > -vm_uuid = domain.get_uuid() > > - > > -vtpmcfg = {} > > -vtpmcfg['backend'] = DOM0_UUID > > -vtpmcfg['VM'] = vm_uuid > > - > > -session = xapi.connect() > > - > > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > > - > > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > > -if vtpm_be != vtpmcfg['backend']: > > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > > - (vtpm_be, vtpmcfg['backend'])) > > - > > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > > - > > -miss_keys = [] > > -for k in VTPM_RECORD_KEYS: > > - if k not in vtpm_rec.keys(): > > - miss_keys.append(k) > > -if len(miss_keys) > 0: > > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > > - > > -if vtpm_rec['uuid'] != vtpm_uuid: > > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > > - (vtpm_rec['uuid'], vtpm_uuid)) > > -if vtpm_rec['VM'] != vm_uuid: > > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > > - (vtpm_rec['VM'], vm_uuid)) > > -if vtpm_rec['backend'] != vtpmcfg['backend']: > > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > > - (vtpm_rev['backend'], vtpmcfg['backend'])) > > - > > -badkeys = [] > > -keys = vtpm_rec.keys() > > -for k in keys: > > - if k not in VTPM_RECORD_KEYS: > > - badkeys.append(k) > > -if len(badkeys) > 0: > > - FAIL("Unexpected attributes in result: %s" % badkeys) > > - > > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > > - (vm_ref, vm_uuid)) > > - > > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > > -if uuid != vtpm_uuid: > > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > > - (uuid, vtpm_uuid)) > > - > > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > > -if vtpm_ref != vtpm_uuid: > > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > > - (vtpm_ref, vtpm_uuid)) > > - > > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > > -if len(vm_vtpms) != 1: > > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > > - (len(vm_vtpms), 1)) > > -if vtpm_uuid not in vm_vtpms: > > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > > - (vm_vtpms[0], vtpm_uuid)) > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - FAIL("Unable to create domain.") > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("1. No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > - #Should never get here > > - FAIL("Could destroy vTPM while VM is running") > > -except: > > - pass > > - > > -rc = session.xenapi.VM.suspend(vm_uuid) > > -if rc: > > - FAIL("Could not suspend VM") > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > - #May not throw an exception in 'suspend' state > > -except: > > - pass > > - > > -rc = session.xenapi.VM.resume(vm_uuid, False) > > -if rc: > > - FAIL("Could not resume VM") > > - > > -try: > > - console = domain.getConsole() > > -except ConsoleError, e: > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -domain.stop() > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > -except: > > - FAIL("Could NOT destroy vTPM while domain is halted.") > > - > > -domain.destroy() > > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > > deleted file mode 100644 > > index dd67e45..0000000 > > --- a/tools/xm-test/tests/vtpm/Makefile.am > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -SUBDIRS = > > - > > -TESTS = 01_vtpm-list_pos.test \ > > - 02_vtpm-cat_pcrs.test \ > > - 03_vtpm-susp_res.test \ > > - 04_vtpm-loc_migr.test \ > > - 05_vtpm-loc_migr.test \ > > - 06_vtpm-susp_res_pcrs.test \ > > - 07_vtpm-mig_pcrs.test \ > > - 08_vtpm-mig_pcrs.test \ > > - 09_vtpm-xapi.test > > - > > -XFAIL_TESTS = > > - > > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > > -TESTS_ENVIRONMENT=@TENV@ > > - > > -%.test: %.py > > - cp $< $@ > > - chmod +x $@ > > - > > -clean-local: am_config_clean-local > > - > > -am_config_clean-local: > > - rm -f *test > > - rm -f *log > > - rm -f *~ > > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > > deleted file mode 100644 > > index 4e5b281..0000000 > > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > > +++ /dev/null > > @@ -1,30 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -from XmTestLib import * > > - > > -if ENABLE_HVM_SUPPORT: > > - SKIP("vtpm tests not supported for HVM domains") > > - > > -status, output = traceCommand("COLUMNS=200 ; " > > - "ps aux | grep vtpm_manager | grep -v grep") > > -if output == "": > > - SKIP("virtual TPM manager must be started to run this test; might " > > - "need /dev/tpm0") > > - > > -def vtpm_cleanup(domName): > > - traceCommand("/etc/xen/scripts/vtpm-delete " > > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > > - str(domid(domName))) > > - > > -def vtpm_cleanup(uuid): > > - from xen.xm import main > > - if main.serverType != main.SERVER_XEN_API: > > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > > - > > -def vtpm_get_uuid(domainid): > > - s, o = traceCommand("xenstore-read " > > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > > - return o > > -- > > 1.7.10.4 > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:05:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:05:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI3O-0006O2-FS; Tue, 13 Nov 2012 15:05:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI1i-0006FD-LG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:03:52 +0000 Received: from [85.158.137.99:17630] by server-10.bemta-3.messagelabs.com id 20/74-19806-15162A05; Tue, 13 Nov 2012 15:03:45 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-8.tower-217.messagelabs.com!1352819022!12090297!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10352 invoked from network); 13 Nov 2012 15:03:43 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:03:43 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15781742" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:03:39 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 15:03:38 +0000 Message-ID: <1352819016.7491.84.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Fioravante, Matthew E." Date: Tue, 13 Nov 2012 15:03:36 +0000 In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 15:05:28 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 14:58 +0000, Fioravante, Matthew E. wrote: > Should I have removed vtpm from xm also? I left it alone because xm is depcrecated. Is xend broken by this change when not using the vtpm features? Or just some functionality (which never worked right) went away? I'm happy to leave xend alone so long as it works as well as it ever did for people not using vtpm. > > -----Original Message----- > From: Ian Campbell [mailto:Ian.Campbell@citrix.com] > Sent: Tuesday, November 13, 2012 5:49 AM > To: Fioravante, Matthew E. > Cc: xen-devel@lists.xen.org; Stefano Stabellini > Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model > > On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > > Remove the old vtpm process model. It doesn't work very > > well and is no longer supported. > > > > Signed-off-by: Matthew Fioravante > > Acked-by: Ian Campbell > > > > > diff --git a/tools/Makefile b/tools/Makefile > > index d8c8cc0..2ca43b9 100644 > > --- a/tools/Makefile > > +++ b/tools/Makefile > > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > > SUBDIRS-$(CONFIG_X86) += firmware > > SUBDIRS-y += console > > SUBDIRS-y += xenmon > > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > > -SUBDIRS-$(VTPM_TOOLS) += vtpm > > SUBDIRS-y += xenstat > > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > > SUBDIRS-$(CONFIG_Linux) += memshr > > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > > index 631306b..90a6b85 100644 > > --- a/tools/blktap2/drivers/hashtable.c > > +++ b/tools/blktap2/drivers/hashtable.c > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable.c > > - * - tools/vtpm_manager/util/hashtable.c > > */ > > > > #include "hashtable.h" > > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > > index 89aa3dc..56ca053 100644 > > --- a/tools/blktap2/drivers/hashtable.h > > +++ b/tools/blktap2/drivers/hashtable.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable.h > > - * - tools/vtpm_manager/util/hashtable.h > > */ > > > > #ifndef __HASHTABLE_CWC22_H__ > > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > > index 402e06b..731917c 100644 > > --- a/tools/blktap2/drivers/hashtable_itr.c > > +++ b/tools/blktap2/drivers/hashtable_itr.c > > @@ -1,10 +1,5 @@ > > /* Copyright (C) 2002, 2004 Christopher Clark */ > > > > -/* > > - * There are duplicates of this code in: > > - * - tools/vtpm_manager/util/hashtable_itr.c > > - */ > > - > > #include "hashtable.h" > > #include "hashtable_private.h" > > #include "hashtable_itr.h" > > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > > index 3d80638..81da838 100644 > > --- a/tools/blktap2/drivers/hashtable_itr.h > > +++ b/tools/blktap2/drivers/hashtable_itr.h > > @@ -1,10 +1,5 @@ > > /* Copyright (C) 2002, 2004 Christopher Clark */ > > > > -/* > > - * There are duplicates of this code in: > > - * - tools/vtpm_manager/util/hashtable_itr.h > > - */ > > - > > #ifndef __HASHTABLE_ITR_CWC22__ > > #define __HASHTABLE_ITR_CWC22__ > > #include "hashtable.h" > > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > > index 5a13a65..954ecc3 100644 > > --- a/tools/blktap2/drivers/hashtable_private.h > > +++ b/tools/blktap2/drivers/hashtable_private.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/xenstore/hashtable_private.h > > - * - tools/vtpm_manager/util/hashtable_private.h > > */ > > > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > diff --git a/tools/configure.ac b/tools/configure.ac > > index e708f01..586313d 100644 > > --- a/tools/configure.ac > > +++ b/tools/configure.ac > > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > > # Enable/disable options > > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > > diff --git a/tools/examples/README b/tools/examples/README > > index 5b0314e..2225d5c 100644 > > --- a/tools/examples/README > > +++ b/tools/examples/README > > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > > vif-common.sh - sourced by vif-bridge > > vif-nat - xen virtual network start/stop script in NAT mode > > vif-route - xen virtual network start/stop script in routed mode > > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > > -vtpm-common.sh - common code for vTPM handling > > -vtpm-delete - remove an entry from the vTPM table given the > > - domain's name > > -vtpm-hotplug-common.sh - sourced by vtpm > > -vtpm-migration.sh - sourced by external-device-migrate > > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > > devices > > xen-backend.rules - hotplug script rules > > xend-config.sxp - default xend configuration file > > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > > index 85f847c..e04e6c1 100644 > > --- a/tools/examples/xmexample.pv-grub > > +++ b/tools/examples/xmexample.pv-grub > > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = [ 'instance=1,backend=0' ] > > - > > -#---------------------------------------------------------------------------- > > # Configure the behaviour when a domain exits. There are three 'reasons' > > # for a domain to stop: poweroff, reboot, and crash. For each of these you > > # may specify: > > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > > index 330aaf0..c951200 100644 > > --- a/tools/examples/xmexample1 > > +++ b/tools/examples/xmexample1 > > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = [ 'instance=1,backend=0' ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > > index 4e5eb3d..8c5137e 100644 > > --- a/tools/examples/xmexample2 > > +++ b/tools/examples/xmexample2 > > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > > index dc22ce1..ae799f9 100644 > > --- a/tools/examples/xmexample3 > > +++ b/tools/examples/xmexample3 > > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > > # configured in xend-config.sxp. > > > > #---------------------------------------------------------------------------- > > -# Define to which TPM instance the user domain should communicate. > > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > > -# where INSTANCE indicates the instance number of the TPM the VM > > -# should be talking to and DOM provides the domain where the backend > > -# is located. > > -# Note that no two virtual machines should try to connect to the same > > -# TPM instance. The handling of all TPM instances does require > > -# some management effort in so far that VM configration files (and thus > > -# a VM) should be associated with a TPM instance throughout the lifetime > > -# of the VM / VM configuration file. The instance number must be > > -# greater or equal to 1. > > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > > - > > -#---------------------------------------------------------------------------- > > # Set the kernel command line for the new domain. > > # You only need to define the IP parameters and hostname if the domain's > > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > > index 0166790..0605559 100644 > > --- a/tools/hotplug/Linux/Makefile > > +++ b/tools/hotplug/Linux/Makefile > > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > > XEN_SCRIPTS += block > > XEN_SCRIPTS += block-enbd block-nbd > > XEN_SCRIPTS += blktap > > -XEN_SCRIPTS += vtpm vtpm-delete > > XEN_SCRIPTS += xen-hotplug-cleanup > > XEN_SCRIPTS += external-device-migrate > > XEN_SCRIPTS += vscsi > > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > > +XEN_SCRIPT_DATA += block-common.sh > > > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > > UDEV_RULES = xen-backend.rules xend.rules > > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > > deleted file mode 100644 > > index 38a4532..0000000 > > --- a/tools/hotplug/Linux/vtpm > > +++ /dev/null > > @@ -1,22 +0,0 @@ > > -#!/bin/bash > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-hotplug-common.sh" > > - > > -vtpm_fatal_error=0 > > - > > -case "$command" in > > - add) > > - vtpm_create_instance > > - ;; > > - remove) > > - vtpm_remove_instance > > - ;; > > -esac > > - > > -if [ $vtpm_fatal_error -eq 0 ]; then > > - log debug "Successful vTPM operation '$command'." > > - success > > -else > > - fatal "Error while executing vTPM operation '$command'." > > -fi > > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > > deleted file mode 100644 > > index d0d7935..0000000 > > --- a/tools/hotplug/Linux/vtpm-common.sh > > +++ /dev/null > > @@ -1,448 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# Copyright (c) 2005 XenSource Ltd. > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/logging.sh" > > -. "$dir/locking.sh" > > - > > -VTPMDB="/var/vtpm/vtpm.db" > > - > > -#In the vtpm-impl file some commands should be defined: > > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > > -if [ -r "$dir/vtpm-impl.alt" ]; then > > - . "$dir/vtpm-impl.alt" > > -elif [ -r "$dir/vtpm-impl" ]; then > > - . "$dir/vtpm-impl" > > -else > > - function vtpm_create () { > > - true > > - } > > - function vtpm_setup() { > > - true > > - } > > - function vtpm_start() { > > - true > > - } > > - function vtpm_suspend() { > > - true > > - } > > - function vtpm_resume() { > > - true > > - } > > - function vtpm_delete() { > > - true > > - } > > - function vtpm_migrate() { > > - echo "Error: vTPM migration accross machines not implemented." > > - } > > - function vtpm_migrate_local() { > > - echo "Error: local vTPM migration not supported" > > - } > > - function vtpm_migrate_recover() { > > - true > > - } > > -fi > > - > > - > > -#Find the instance number for the vtpm given the name of the domain > > -# Parameters > > -# - vmname : the name of the vm > > -# Return value > > -# Returns '0' if instance number could not be found, otherwise > > -# it returns the instance number in the variable 'instance' > > -function vtpmdb_find_instance () { > > - local vmname ret instance > > - vmname=$1 > > - ret=0 > > - > > - instance=$(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - '{ \ > > - if ( 1 != index($1,"#")) { \ > > - if ( $1 == vmname ) { \ > > - print $2; \ > > - exit; \ > > - } \ > > - } \ > > - }') > > - if [ "$instance" != "" ]; then > > - ret=$instance > > - fi > > - echo "$ret" > > -} > > - > > - > > -# Check whether a particular instance number is still available > > -# returns "0" if it is not available, "1" otherwise. > > -function vtpmdb_is_free_instancenum () { > > - local instance instances avail i > > - instance=$1 > > - avail=1 > > - #Allowed instance number range: 1-255 > > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > > - avail=0 > > - else > > - instances=$(cat $VTPMDB | \ > > - awk \ > > - '{ \ > > - if (1 != index($1,"#")) { \ > > - printf("%s ",$2); \ > > - } \ > > - }') > > - for i in $instances; do > > - if [ $i -eq $instance ]; then > > - avail=0 > > - break > > - fi > > - done > > - fi > > - echo "$avail" > > -} > > - > > - > > -# Get an available instance number given the database > > -# Returns an unused instance number > > -function vtpmdb_get_free_instancenum () { > > - local ctr instances don found > > - instances=$(cat $VTPMDB | \ > > - awk \ > > - '{ \ > > - if (1 != index($1,"#")) { \ > > - printf("%s ",$2); \ > > - } \ > > - }') > > - ctr=1 > > - don=0 > > - while [ $don -eq 0 ]; do > > - found=0 > > - for i in $instances; do > > - if [ $i -eq $ctr ]; then > > - found=1; > > - break; > > - fi > > - done > > - > > - if [ $found -eq 0 ]; then > > - don=1 > > - break > > - fi > > - let ctr=ctr+1 > > - done > > - echo "$ctr" > > -} > > - > > - > > -# Add a domain name and instance number to the DB file > > -function vtpmdb_add_instance () { > > - local res vmname inst > > - vmname=$1 > > - inst=$2 > > - > > - if [ ! -f $VTPMDB ]; then > > - echo "#Database for VM to vTPM association" > $VTPMDB > > - echo "#1st column: domain name" >> $VTPMDB > > - echo "#2nd column: TPM instance number" >> $VTPMDB > > - fi > > - res=$(vtpmdb_validate_entry $vmname $inst) > > - if [ $res -eq 0 ]; then > > - echo "$vmname $inst" >> $VTPMDB > > - fi > > -} > > - > > - > > -#Validate whether an entry is the same as passed to this > > -#function > > -function vtpmdb_validate_entry () { > > - local res rc vmname inst > > - rc=0 > > - vmname=$1 > > - inst=$2 > > - > > - res=$(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - -vinst=$inst \ > > - '{ \ > > - if ( 1 == index($1,"#")) {\ > > - } else \ > > - if ( $1 == vmname && \ > > - $2 == inst) { \ > > - printf("1"); \ > > - exit; \ > > - } else \ > > - if ( $1 == vmname || \ > > - $2 == inst) { \ > > - printf("2"); \ > > - exit; \ > > - } \ > > - }') > > - > > - if [ "$res" == "1" ]; then > > - rc=1 > > - elif [ "$res" == "2" ]; then > > - rc=2 > > - fi > > - echo "$rc" > > -} > > - > > - > > -#Remove an entry from the vTPM database given its domain name > > -#and instance number > > -function vtpmdb_remove_entry () { > > - local vmname instance VTPMDB_TMP > > - vmname=$1 > > - instance=$2 > > - VTPMDB_TMP="$VTPMDB".tmp > > - > > - $(cat $VTPMDB | \ > > - awk -vvmname=$vmname \ > > - '{ \ > > - if ( $1 != vmname ) { \ > > - print $0; \ > > - } \ > > - '} > $VTPMDB_TMP) > > - if [ -e $VTPMDB_TMP ]; then > > - mv -f $VTPMDB_TMP $VTPMDB > > - vtpm_delete $instance > > - else > > - log err "Error creating temporary file '$VTPMDB_TMP'." > > - fi > > -} > > - > > - > > -# Find the reason for the creation of this device: > > -# Returns 'resume' or 'create' > > -function vtpm_get_create_reason () { > > - local resume > > - resume=$(xenstore_read $XENBUS_PATH/resume) > > - if [ "$resume" == "True" ]; then > > - echo "resume" > > - else > > - echo "create" > > - fi > > -} > > - > > - > > -#Create a vTPM instance > > -# If no entry in the TPM database is found, the instance is > > -# created and an entry added to the database. > > -function vtpm_create_instance () { > > - local res instance domname reason uuid > > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > > - reason=$(vtpm_get_create_reason) > > - > > - claim_lock vtpmdb > > - > > - instance="0" > > - > > - if [ "$uuid" != "" ]; then > > - instance=$(vtpmdb_find_instance $uuid) > > - fi > > - if [ "$instance" == "0" ]; then > > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > > - instance=$(vtpmdb_find_instance $domname) > > - fi > > - > > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > > - release_lock vtpmdb > > - return > > - fi > > - > > - if [ "$instance" == "0" ]; then > > - #Try to give the preferred instance to the domain > > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > > - if [ "$instance" != "" ]; then > > - res=$(vtpmdb_is_free_instancenum $instance) > > - if [ $res -eq 0 ]; then > > - instance=$(vtpmdb_get_free_instancenum) > > - fi > > - else > > - instance=$(vtpmdb_get_free_instancenum) > > - fi > > - > > - vtpm_create $instance > > - > > - if [ $vtpm_fatal_error -eq 0 ]; then > > - if [ "$uuid" != "" ]; then > > - vtpmdb_add_instance $uuid $instance > > - else > > - vtpmdb_add_instance $domname $instance > > - fi > > - fi > > - else > > - if [ "$reason" == "resume" ]; then > > - vtpm_resume $instance > > - else > > - vtpm_start $instance > > - fi > > - fi > > - > > - release_lock vtpmdb > > - > > - xenstore_write $XENBUS_PATH/instance $instance > > -} > > - > > - > > -#Remove an instance when a VM is terminating or suspending. > > -#Since it is assumed that the VM will appear again, the > > -#entry is kept in the VTPMDB file. > > -function vtpm_remove_instance () { > > - local instance reason domname uuid > > - #Stop script execution quietly if path does not exist (anymore) > > - xenstore-exists "$XENBUS_PATH"/domain > > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > > - > > - claim_lock vtpmdb > > - > > - instance="0" > > - > > - if [ "$uuid" != "" ]; then > > - instance=$(vtpmdb_find_instance $uuid) > > - fi > > - > > - if [ "$instance" == "0" ]; then > > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > > - instance=$(vtpmdb_find_instance $domname) > > - fi > > - > > - if [ "$instance" != "0" ]; then > > - vtpm_suspend $instance > > - fi > > - > > - release_lock vtpmdb > > -} > > - > > - > > -#Remove an entry in the VTPMDB file given the domain's name > > -#1st parameter: The name of the domain > > -function vtpm_delete_instance () { > > - local instance > > - > > - claim_lock vtpmdb > > - > > - instance=$(vtpmdb_find_instance $1) > > - if [ "$instance" != "0" ]; then > > - vtpmdb_remove_entry $1 $instance > > - fi > > - > > - release_lock vtpmdb > > -} > > - > > -# Determine whether the given address is local to this machine > > -# Return values: > > -# "-1" : the given machine name is invalid > > -# "0" : this is not an address of this machine > > -# "1" : this is an address local to this machine > > -function vtpm_isLocalAddress() { > > - local addr res > > - addr=$(ping $1 -c 1 | \ > > - awk '{ print substr($3,2,length($3)-2); exit }') > > - if [ "$addr" == "" ]; then > > - echo "-1" > > - return > > - fi > > - res=$(ifconfig | grep "inet addr" | \ > > - awk -vaddr=$addr \ > > - '{ \ > > - if ( addr == substr($2, 6)) {\ > > - print "1"; \ > > - } \ > > - }' \ > > - ) > > - if [ "$res" == "" ]; then > > - echo "0" > > - return > > - fi > > - echo "1" > > -} > > - > > -# Perform a migration step. This function differentiates between migration > > -# to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host to migrate to > > -# 2nd: name of the domain to migrate > > -# 3rd: the migration step to perform > > -function vtpm_migration_step() { > > - local res=$(vtpm_isLocalAddress $1) > > - if [ "$res" == "0" ]; then > > - vtpm_migrate $1 $2 $3 > > - else > > - vtpm_migrate_local > > - fi > > -} > > - > > -# Recover from migration due to an error. This function differentiates > > -# between migration to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host the migration was going to > > -# 2nd: name of the domain that was to be migrated > > -# 3rd: the last successful migration step that was done > > -function vtpm_recover() { > > - local res > > - res=$(vtpm_isLocalAddress $1) > > - if [ "$res" == "0" ]; then > > - vtpm_migrate_recover $1 $2 $3 > > - fi > > -} > > - > > - > > -#Determine the domain id given a domain's name. > > -#1st parameter: name of the domain > > -#return value: domain id or -1 if domain id could not be determined > > -function vtpm_domid_from_name () { > > - local id name ids > > - ids=$(xenstore-list /local/domain) > > - for id in $ids; do > > - name=$(xenstore-read /local/domain/$id/name) > > - if [ "$name" == "$1" ]; then > > - echo "$id" > > - return > > - fi > > - done > > - echo "-1" > > -} > > - > > -#Determine the virtual TPM's instance number using the domain ID. > > -#1st parm: domain ID > > -function vtpm_uuid_by_domid() { > > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > > -} > > - > > - > > -# Determine the vTPM's UUID by the name of the VM > > -function vtpm_uuid_from_vmname() { > > - local domid=$(vtpm_domid_from_name $1) > > - if [ "$domid" != "-1" ]; then > > - echo $(vtpm_uuid_by_domid $domid) > > - return > > - fi > > - echo "" > > -} > > - > > -#Add a virtual TPM instance number and its associated domain name > > -#to the VTPMDB file and activate usage of this virtual TPM instance > > -#by writing the instance number into the xenstore > > -#1st parm: name of virtual machine > > -#2nd parm: instance of associated virtual TPM > > -function vtpm_add_and_activate() { > > - local domid=$(vtpm_domid_from_name $1) > > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > > - vtpmdb_add_instance $vtpm_uuid $2 > > - xenstore-write backend/vtpm/$domid/0/instance $2 > > - fi > > -} > > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > > deleted file mode 100644 > > index b75b95b..0000000 > > --- a/tools/hotplug/Linux/vtpm-delete > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -#!/bin/bash > > - > > -# This scripts must be called the following way: > > -# vtpm-delete > > -# or > > -# vtpm-delete --vmname > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-common.sh" > > - > > -if [ "$1" == "--vmname" ]; then > > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > > - if [ "$vtpm_uuid" != "" ];then > > - vtpm_delete_instance $vtpm_uuid > > - fi > > -else > > - vtpm_delete_instance $1 > > -fi > > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > > deleted file mode 100644 > > index 9fd35e7..0000000 > > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > > +++ /dev/null > > @@ -1,35 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# Copyright (c) 2005 XenSource Ltd. > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/xen-hotplug-common.sh" > > - > > -findCommand "$@" > > -if [ "$command" != "online" ] && > > - [ "$command" != "offline" ] && > > - [ "$command" != "add" ] && > > - [ "$command" != "remove" ] > > -then > > - log err "Invalid command: $command" > > - exit 1 > > -fi > > - > > - > > -XENBUS_PATH="${XENBUS_PATH:?}" > > - > > -. "$dir/vtpm-common.sh" > > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > > deleted file mode 100644 > > index 4f9a1fd..0000000 > > --- a/tools/hotplug/Linux/vtpm-impl > > +++ /dev/null > > @@ -1,208 +0,0 @@ > > -#!/bin/bash > > -# =================================================================== > > -# > > -# Copyright (c) 2005, Intel Corp. > > -# All rights reserved. > > -# > > -# Redistribution and use in source and binary forms, with or without > > -# modification, are permitted provided that the following conditions > > -# are met: > > -# > > -# * Redistributions of source code must retain the above copyright > > -# notice, this list of conditions and the following disclaimer. > > -# * Redistributions in binary form must reproduce the above > > -# copyright notice, this list of conditions and the following > > -# disclaimer in the documentation and/or other materials provided > > -# with the distribution. > > -# * Neither the name of Intel Corporation nor the names of its > > -# contributors may be used to endorse or promote products derived > > -# from this software without specific prior written permission. > > -# > > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -# OF THE POSSIBILITY OF SUCH DAMAGE. > > -# =================================================================== > > - > > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > > - > > -TPM_TYPE_PVM=\\x01 > > -TPM_TYPE_HVM=\\x02 > > - > > -TPM_SUCCESS=00000000 > > - > > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > > - > > -VTPM_MIG=/usr/bin/vtpm_migrator > > - > > -# -------------------- Helpers for binary streams ----------- > > - > > -function str_to_hex32() { > > - printf "%0.8x" $1 > > -} > > - > > -function hex32_to_bin() { > > - local inst=$(str_to_hex32 $1); > > - > > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > > - > > - echo "$n1$n2$n3$n4" > > -} > > - > > -function vtpm_manager_cmd() { > > - local cmd=$1; > > - local inst=$2; > > - local inst_bin=$(hex32_to_bin $inst); > > - > > - claim_lock vtpm_mgr > > - > > - #send cmd to vtpm_manager > > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > > - > > - #recv response > > - set +e > > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > > - set -e > > - > > - release_lock vtpm_mgr > > - > > - #return whether the command was successful > > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > > - vtpm_fatal_error=1 > > - false > > - else > > - true > > - fi > > -} > > - > > -# Helper to get vm type to pass to vtpm_manager open/resume > > -function vtpm_get_type() { > > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > > - local vm=$(xenstore_read /local/domain/$inst/vm) > > - if [ "$vm" != "" ]; then > > - local ostype=$(xenstore-read $vm/image/ostype) > > - if [ "$ostype" == "hvm" ]; then > > - echo $TPM_TYPE_HVM; > > - else > > - echo $TPM_TYPE_PVM; > > - fi > > - fi > > -} > > - > > -# ------------------ Command handlers ----------------- > > - > > -# Create new vtpm instance & set it up for use > > -function vtpm_create () { > > - # Creation is handled implicitly by the manager on first setup > > - # so just set it up for use > > - $(vtpm_start $1) > > -} > > - > > -# Setup vtpm instance for use. > > -function vtpm_start() { > > - local vmtype=$(vtpm_get_type); > > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > > -} > > - > > -function vtpm_resume() { > > - local vmtype=$(vtpm_get_type); > > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > > -} > > - > > -# Reset the vtpm AKA clear PCRs > > -function vtpm_reset() { > > - #not used by current implemenation > > - true > > -} > > - > > -# Shutdown the vtpm while the vm is down > > -# This could be a suspend of shutdown > > -# we cannot distinquish, so save the state > > -# and decide on startup if we should keep is > > -function vtpm_suspend() { > > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > > -} > > - > > - > > -function vtpm_delete() { > > - local inst=$1 > > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > > - rm -f /var/vtpm/vtpm_dm_$1.data > > - true > > - else > > - vtpm_fatal_error=1 > > - false > > - fi > > -} > > - > > -# Perform a migration step. This function differentiates between migration > > -# to the local host or to a remote machine. > > -# Parameters: > > -# 1st: destination host to migrate to > > -# 2nd: name of the domain to migrate > > -# 3rd: the migration step to perform > > -function vtpm_migrate() { > > - local instance res > > - > > - instance=$(vtpmdb_find_instance $2) > > - if [ "$instance" == "" ]; then > > - log err "VTPM Migratoin failed. Unable to translation of domain name" > > - echo "Error: VTPM Migration failed while looking up instance number" > > - fi > > - > > - case "$3" in > > - 0) > > - #Incicate migration supported > > - echo "0" > > - ;; > > - > > - 1) > > - # Get Public Key from Destination > > - # Call vtpm_manager's migration part 1 > > - claim_lock vtpm_mgr > > - $VTPM_MIG $1 $2 $instance $3 > > - release_lock vtpm_mgr > > - ;; > > - > > - 2) > > - # Call manager's migration step 2 and send result to destination > > - # If successful remove from db > > - claim_lock vtpm_mgr > > - $VTPM_MIG $1 $2 $instance $3 > > - release_lock vtpm_mgr > > - ;; > > - > > - 3) > > - if `ps x | grep "$VTPM_MIG $1"`; then > > - log err "VTPM Migration failed to complete." > > - echo "Error: VTPM Migration failed to complete." > > - fi > > - ;; > > - esac > > - > > -} > > - > > - > > -function vtpm_migrate_recover() { > > - echo "Error: Recovery not supported yet" > > -} > > - > > -function vtpm_migrate_local() { > > - echo "Error: local vTPM migration not supported" > > -} > > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > > deleted file mode 100644 > > index 7e38ae2..0000000 > > --- a/tools/hotplug/Linux/vtpm-migration.sh > > +++ /dev/null > > @@ -1,19 +0,0 @@ > > -# > > -# Copyright (c) 2005 IBM Corporation > > -# > > -# This library is free software; you can redistribute it and/or > > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > > -# License as published by the Free Software Foundation. > > -# > > -# This library is distributed in the hope that it will be useful, > > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > -# Lesser General Public License for more details. > > -# > > -# You should have received a copy of the GNU Lesser General Public > > -# License along with this library; if not, write to the Free Software > > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > > -# > > - > > -dir=$(dirname "$0") > > -. "$dir/vtpm-common.sh" > > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > > index c591a3f..a0d409e 100644 > > --- a/tools/hotplug/Linux/xen-backend.rules > > +++ b/tools/hotplug/Linux/xen-backend.rules > > @@ -1,6 +1,5 @@ > > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > > deleted file mode 100644 > > index 7b3efa5..0000000 > > --- a/tools/vtpm/Makefile > > +++ /dev/null > > @@ -1,74 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../.. > > - > > -# Base definitions and rules > > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > > - > > -# Dir name for emulator (as dom0 tpm driver) > > -TPM_EMULATOR_DIR = tpm_emulator > > -# Dir name for vtpm instance > > -VTPM_DIR = vtpm > > -ORIG_DIR = orig > > - > > -# Emulator tarball name > > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > > - > > -GMP_HEADER = /usr/include/gmp.h > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: build_sub > > - > > -.PHONY: install > > -install: build > > - $(MAKE) -C $(VTPM_DIR) install-recursive > > - > > -.PHONY: clean > > -clean: > > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > > - fi > > - @if [ -d $(VTPM_DIR) ]; \ > > - then $(MAKE) -C $(VTPM_DIR) clean; \ > > - fi > > - > > -.PHONY: mrproper > > -mrproper: > > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > > - > > -# Download Swiss emulator > > -$(TPM_EMULATOR_TARFILE): > > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > > - > > -# Create vtpm dirs > > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > > - rm -rf $(VTPM_DIR) > > - tar -xzf $(TPM_EMULATOR_TARFILE) > > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > > - > > - set -e; cd $(VTPM_DIR); \ > > - patch -p1 < ../vtpm-0.5.1.patch; \ > > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > > - > > -orig: $(TPM_EMULATOR_TARFILE) > > - mkdir $(ORIG_DIR); > > - set -e; cd $(ORIG_DIR); \ > > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > > - > > -updatepatches: clean orig > > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > > - mv vtpm.patch vtpm.patch.old; > > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > > - > > -.PHONY: build_sub > > -build_sub: $(VTPM_DIR)/tpmd/tpmd > > - set -e; if [ -e $(GMP_HEADER) ]; then \ > > - $(MAKE) -C $(VTPM_DIR) version; \ > > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > > - else \ > > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > > - fi > > - > > diff --git a/tools/vtpm/README b/tools/vtpm/README > > deleted file mode 100644 > > index 2008cbd..0000000 > > --- a/tools/vtpm/README > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > - > > -Directory Structure > > -=================== > > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > > - be patched and used for our vtpms > > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > > - listens on a pair of fifos for TPM commands, > > - persistent state is sent via named fifo to vtpm > > - manager, which encrypts it and protects it. > > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > > - platforms, this patches the emulator to allow > > - it to be inserted into the dom0 kernel > > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > > - > > -Compile Flags > > -=================== > > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > > - Not Defined (default): VTPMs are processes > > - > > -Requirements > > -============ > > -- xen-unstable > > -- IBM frontend/backend vtpm driver patch > > -- vtpm_managerd > > -- GNU MP Big number library (GMP) > > - > > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > > -============================ > > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > > -- VTPM Manager listens to TPM BE. > > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > > -- When the manager receives the open message from the BE, it launches a vtpm > > -- Xend allows the VM to continue booting. > > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > > -- The fifo listener begins listening for the reply from vtpm for the request. > > -- Vtpm processes request and replies to manager over shared named fifo. > > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > > - > > -tpm_emulator flow > > -================== > > -Read documentation in tpm_emulator-0.2 directory > > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > > deleted file mode 100644 > > index 548cff0..0000000 > > --- a/tools/vtpm/Rules.mk > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > > -include $(XEN_ROOT)/tools/Rules.mk > > - > > -# > > -# Tool definitions > > -# > > - > > -# General compiler flags > > -CFLAGS = -Werror -g3 > > - > > -# Generic project files > > -HDRS = $(wildcard *.h) > > -SRCS = $(wildcard *.c) > > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > > - > > -# Generic (non-header) dependencies > > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > > - > > -$(OBJS): $(SRCS) > > - > > --include $(DEPS) > > - > > -BUILD_EMULATOR = y > > - > > -# Make sure these are just rules > > -.PHONY : all build install clean > > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > > deleted file mode 100644 > > index c34c665..0000000 > > --- a/tools/vtpm/tpm_emulator.patch > > +++ /dev/null > > @@ -1,1919 +0,0 @@ > > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,2 +1,3 @@ > > - Mario Strasser > > - Heiko Stamer [DAA] > > -+INTEL Corp <> [Dropped to Ring3] > > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,3 +1,6 @@ > > -+????-??-?? Intel Corp > > -+ * Moved module out of kernel to run as a ring 3 app > > -+ > > - 2006-06-23 Mario Strasser > > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > > - persistent data adapted > > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -24,15 +25,10 @@ int __gmp_junk; > > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > > - int linenum, const char *expr) > > - { > > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > > -+ error("%s:%d: GNU MP assertion failed: %s\n", > > - filename, linenum, expr); > > - } > > - > > --void __attribute__ ((regparm(0))) abort(void) > > --{ > > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > > --} > > -- > > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > > - > > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > > - > > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > > - { > > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > > -- "GMP: cannot allocate memory (size=%u)\n", size); > > -+ void *ret = (void*)malloc(size); > > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > > - return ret; > > - } > > - > > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > > - size_t old_size, size_t new_size) > > - { > > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > > -+ void *ret = (void*)malloc(new_size); > > -+ if (!ret) error("GMP: Cannot reallocate memory " > > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > > - memcpy(ret, oldptr, old_size); > > -- kfree(oldptr); > > -+ free(oldptr); > > - return ret; > > - } > > - > > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > > - /* overwrite used memory */ > > - if (blk_ptr != NULL) { > > - memset(blk_ptr, 0, blk_size); > > -- kfree(blk_ptr); > > -+ free(blk_ptr); > > - } > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > > - msg[0] = 0x00; > > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > > - sha1_init(&ctx); > > -- sha1_update(&ctx, "TCPA", 4); > > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > > - sha1_init(&ctx); > > -- sha1_update(&ctx, "TCPA", 4); > > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > > - sha1_final(&ctx, &msg[1]); > > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > > - SHA1_DIGEST_LENGTH) != 0) return -1; > > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > > -@@ -1,195 +0,0 @@ > > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > -- * Copyright (C) 2004 Mario Strasser , > > -- * > > -- * This module is free software; you can redistribute it and/or modify > > -- * it under the terms of the GNU General Public License as published > > -- * by the Free Software Foundation; either version 2 of the License, > > -- * or (at your option) any later version. > > -- * > > -- * This module is distributed in the hope that it will be useful, > > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > -- * GNU General Public License for more details. > > -- * > > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > > -- */ > > -- > > --#include > > --#include > > --#include > > --#include > > --#include > > --#include "linux_module.h" > > --#include "tpm/tpm_emulator.h" > > -- > > --MODULE_LICENSE("GPL"); > > --MODULE_AUTHOR("Mario Strasser "); > > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > > -- > > --/* module startup parameters */ > > --char *startup = "save"; > > --module_param(startup, charp, 0444); > > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > > --module_param(storage_file, charp, 0644); > > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > > -- "file of the TPM."); > > -- > > --/* TPM lock */ > > --static struct semaphore tpm_mutex; > > -- > > --/* TPM command response */ > > --static struct { > > -- uint8_t *data; > > -- uint32_t size; > > --} tpm_response; > > -- > > --/* module state */ > > --#define STATE_IS_OPEN 0 > > --static uint32_t module_state; > > --static struct timespec old_time; > > -- > > --static int tpm_open(struct inode *inode, struct file *file) > > --{ > > -- debug("%s()", __FUNCTION__); > > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > > -- return 0; > > --} > > -- > > --static int tpm_release(struct inode *inode, struct file *file) > > --{ > > -- debug("%s()", __FUNCTION__); > > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) { > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return 0; > > --} > > -- > > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > > --{ > > -- debug("%s(%d)", __FUNCTION__, count); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) { > > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > > -- *ppos += count; > > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } > > -- } else { > > -- count = 0; > > -- } > > -- up(&tpm_mutex); > > -- return count; > > --} > > -- > > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > > --{ > > -- debug("%s(%d)", __FUNCTION__, count); > > -- down(&tpm_mutex); > > -- *ppos = 0; > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > -- if (tpm_handle_command(buf, count, &tpm_response.data, > > -- &tpm_response.size) != 0) { > > -- count = -EILSEQ; > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return count; > > --} > > -- > > --#define TPMIOC_CANCEL _IO('T', 0x00) > > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > > -- > > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > > --{ > > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > > -- if (cmd == TPMIOC_TRANSMIT) { > > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > > -- down(&tpm_mutex); > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > > -- &tpm_response.size) == 0) { > > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > > -- tpm_response.size); > > -- kfree(tpm_response.data); > > -- tpm_response.data = NULL; > > -- } else { > > -- tpm_response.size = 0; > > -- tpm_response.data = NULL; > > -- } > > -- up(&tpm_mutex); > > -- return tpm_response.size; > > -- } > > -- return -1; > > --} > > -- > > --struct file_operations fops = { > > -- .owner = THIS_MODULE, > > -- .open = tpm_open, > > -- .release = tpm_release, > > -- .read = tpm_read, > > -- .write = tpm_write, > > -- .ioctl = tpm_ioctl, > > --}; > > -- > > --static struct miscdevice tpm_dev = { > > -- .minor = TPM_DEVICE_MINOR, > > -- .name = TPM_DEVICE_NAME, > > -- .fops = &fops, > > --}; > > -- > > --int __init init_tpm_module(void) > > --{ > > -- int res = misc_register(&tpm_dev); > > -- if (res != 0) { > > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > > -- return res; > > -- } > > -- /* initialize variables */ > > -- sema_init(&tpm_mutex, 1); > > -- module_state = 0; > > -- tpm_response.data = NULL; > > -- old_time = current_kernel_time(); > > -- /* initialize TPM emulator */ > > -- if (!strcmp(startup, "clear")) { > > -- tpm_emulator_init(1); > > -- } else if (!strcmp(startup, "save")) { > > -- tpm_emulator_init(2); > > -- } else if (!strcmp(startup, "deactivated")) { > > -- tpm_emulator_init(3); > > -- } else { > > -- error("invalid startup mode '%s'; must be 'clear', " > > -- "'save' (default) or 'deactivated", startup); > > -- misc_deregister(&tpm_dev); > > -- return -EINVAL; > > -- } > > -- return 0; > > --} > > -- > > --void __exit cleanup_tpm_module(void) > > --{ > > -- tpm_emulator_shutdown(); > > -- misc_deregister(&tpm_dev); > > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > > --} > > -- > > --module_init(init_tpm_module); > > --module_exit(cleanup_tpm_module); > > -- > > --uint64_t tpm_get_ticks(void) > > --{ > > -- struct timespec new_time = current_kernel_time(); > > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > > -- old_time = new_time; > > -- return (ticks > 0) ? ticks : 1; > > --} > > -- > > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -17,54 +18,62 @@ > > - #ifndef _LINUX_MODULE_H_ > > - #define _LINUX_MODULE_H_ > > - > > --#include > > --#include > > --#include > > -+#include > > -+#include > > -+#include > > -+#include > > - #include > > --#include > > --#include > > --#include > > --#include > > - > > --/* module settings */ > > -+#include > > -+#define __BYTEORDER_HAS_U64__ > > -+#ifdef LITTLE_ENDIAN > > -+ #include > > -+#else > > -+ #include > > -+#endif > > - > > -+/* module settings */ > > -+#define min(A,B) ((A)<(B)?(A):(B)) > > -+#ifndef STR > > - #define STR(s) __STR__(s) > > - #define __STR__(s) #s > > -+#endif > > - #include "tpm_version.h" > > - > > - #define TPM_DEVICE_MINOR 224 > > - #define TPM_DEVICE_NAME "tpm" > > - #define TPM_MODULE_NAME "tpm_emulator" > > - > > --/* debug and log output functions */ > > -- > > - #ifdef DEBUG > > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > - #else > > - #define debug(fmt, ...) > > - #endif > > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > > -+ __FILE__, __LINE__, ## __VA_ARGS__) > > - > > - /* memory allocation */ > > - > > - static inline void *tpm_malloc(size_t size) > > - { > > -- return kmalloc(size, GFP_KERNEL); > > -+ return malloc(size); > > - } > > - > > - static inline void tpm_free(const void *ptr) > > - { > > -- if (ptr != NULL) kfree(ptr); > > -+ if (ptr != NULL) free( (void *) ptr); > > - } > > - > > - /* random numbers */ > > - > > -+//FIXME; > > -+void get_random_bytes(void *buf, int nbytes); > > -+ > > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > > - { > > - get_random_bytes(buf, nbytes); > > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > > - > > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > > - > > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,24 +1,40 @@ > > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - # Copyright (C) 2004 Mario Strasser > > -+# Copyright (C) 2006 INTEL Corp. > > - # > > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > > - > > --# kernel settings > > --KERNEL_RELEASE := $(shell uname -r) > > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > > --MOD_SUBDIR := misc > > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > > - > > - # module settings > > --MODULE_NAME := tpm_emulator > > -+BIN := tpm_emulator > > - VERSION_MAJOR := 0 > > - VERSION_MINOR := 4 > > - VERSION_BUILD := $(shell date +"%s") > > - > > --# enable/disable DEBUG messages > > --EXTRA_CFLAGS += -Wall -DDEBUG -g > > -+# Installation program and options > > -+INSTALL = install > > -+INSTALL_PROG = $(INSTALL) -m0755 > > -+INSTALL_DIR = $(INSTALL) -d -m0755 > > -+ > > -+# Xen tools installation directory > > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > > -+ > > -+CC := gcc > > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > > -+CFLAGS += -I. -Itpm > > -+ > > -+# Is the simulator running in it's own vm? > > -+#CFLAGS += -DVTPM_MULTI_VM > > -+ > > -+ifeq ($(COMPILE_ARCH),x86_64) > > -+LIBDIR = lib64 > > -+else > > -+LIBDIR = lib > > -+endif > > - > > - # GNU MP configuration > > --GMP_LIB := /usr/lib/libgmp.a > > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > > - GMP_HEADER := /usr/include/gmp.h > > - > > - # sources and objects > > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > > - > > --obj-m := $(MODULE_NAME).o > > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > > -+obj-m := $(BIN) > > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > > - > > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > > - > > - # do not print "Entering directory ..." > > - MAKEFLAGS += --no-print-directory > > - > > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > > -+all: $(BIN) > > - > > --install: > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > > -- test -d /var/tpm || mkdir /var/tpm > > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > > -- chmod 666 /dev/tpm > > -- depmod -a > > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > > -+ > > -+%.o: %.c > > -+ $(CC) $(CFLAGS) -c $< -o $@ > > -+ > > -+install: $(BIN) > > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > > - > > - clean: > > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > > - > > --dist: $(DISTSRC) > > -- rm -rf $(DISTDIR) > > -- mkdir $(DISTDIR) > > -- cp --parents $(DISTSRC) $(DISTDIR)/ > > -- rm -f $(DISTDIR)/crypto/gmp.h > > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > > -- rm -rf $(DISTDIR) > > -+mrproper: clean > > -+ rm -f $(BIN) tpm_version.h > > - > > - $(src)/crypto/libgmp.a: > > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > > -@@ -88,4 +98,3 @@ version: > > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > > - > > - .PHONY: all install clean dist gmp version > > -- > > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > > - Copyright > > - -------------------------------------------------------------------------- > > - Copyright (C) 2004 Mario Strasser and Swiss Federal > > --Institute of Technology (ETH) Zurich. > > -+ Institute of Technology (ETH) Zurich. > > -+Copyright (C) 2005 INTEL Corp > > - > > - This program is free software; you can redistribute it and/or modify > > - it under the terms of the GNU General Public License as published by > > -@@ -43,6 +44,12 @@ Example: > > - GMP_LIB := /usr/lib/libgmp.a > > - GMP_HEADER := /usr/include/gmp.h > > - > > -+GNU MP Library on 64 bit Systems > > -+-------------------------------------------------------------------------- > > -+Some 64-bit kernels have problems with importing the user-space gmp > > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > > -+ > > - Installation > > - -------------------------------------------------------------------------- > > - The compilation and installation process uses the build environment for > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > > - TPM_RESULT res; > > - > > - info("TPM_GetCapabilityOwner()"); > > -- > > -+ > > -+ if (!tpmData.permanent.flags.owned) { > > -+ return TPM_NOSRK; > > -+ } > > - /* Verify owner authorization */ > > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > > - if (res != TPM_SUCCESS) return res; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > > - || len != 0) return TPM_BAD_PARAMETER; > > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > > - || len != 0) return TPM_BAD_PARAMETER; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > > - > > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > > - { > > -- UINT32 key_length; > > -+ size_t key_length; > > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > > - /* setup TPM_PUBKEY structure */ > > -- key_length = tpmData.permanent.data.endorsementKey.size; > > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > > -- pubEndorsementKey->pubKey.key, > > -- &pubEndorsementKey->pubKey.keyLength); > > -+ pubEndorsementKey->pubKey.key, > > -+ &key_length); > > -+ pubEndorsementKey->pubKey.keyLength = key_length; > > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > > - { > > - TPM_RESULT res; > > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > > -+ size_t key_length; > > - info("TPM_OwnerReadInternalPub()"); > > - /* verify authorization */ > > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > > -- &publicPortion->pubKey.keyLength); > > -+ &key_length); > > -+ publicPortion->pubKey.keyLength = key_length; > > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > > - publicPortion->algorithmParms.encScheme = srk->encScheme; > > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > > - TPM_KEY_DATA *cert, *key; > > - sha1_ctx_t sha1_ctx; > > - BYTE *buf, *p; > > -- UINT32 length; > > -+ UINT32 length32; > > -+ size_t length; > > - info("TPM_CertifyKey()"); > > - /* get keys */ > > - cert = tpm_get_key(certHandle); > > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - p = buf = tpm_malloc(length); > > -+ length32=(UINT32) length; > > - if (buf == NULL > > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > > - return TPM_FAIL; > > - } > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - sha1_init(&sha1_ctx); > > -- sha1_update(&sha1_ctx, buf, length); > > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > > - sha1_final(&sha1_ctx, buf); > > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > > - tpm_free(buf); > > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > > - TPM_KEY_DATA *cert, *key; > > - sha1_ctx_t sha1_ctx; > > - BYTE *buf, *p; > > -- UINT32 length; > > -+ size_t length; > > -+ UINT32 length32; > > - info("TPM_CertifyKey2()"); > > - /* get keys */ > > - cert = tpm_get_key(certHandle); > > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > > - p = buf = tpm_malloc(length); > > -+ length32 = (UINT32) length; > > - if (buf == NULL > > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > > - return TPM_FAIL; > > - } > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > > - sizeof(session->DAA_session.DAA_digest)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_update(&sha1, inputData1, inputSize1); > > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > > - } > > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > > - sizeof(session->DAA_session.DAA_digest)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > > - rsa_export_modulus(&aikData->key, scratch, &size); > > - sha1_update(&sha1, scratch, size); > > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x00", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > > - sha1_final(&sha1, scratch); > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > > - sizeof(session->DAA_tpmSpecific.DAA_count)); > > -- sha1_update(&sha1, "\x01", 1); > > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > > - mpz_init(f), mpz_init(q); > > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > > - void tpm_init_data(void) > > - { > > - /* endorsement key */ > > -+#ifndef TPM_GENERATE_EK > > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > > -+#endif > > -+ > > - int i; > > - /* reset all data to NULL, FALSE or 0 */ > > - memset(&tpmData, 0, sizeof(tpmData)); > > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > > - > > - #ifdef TPM_STORE_TO_FILE > > - > > --#include > > --#include > > --#include > > -+#include > > -+#include > > -+#include > > -+#include > > - > > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > > - > > - static int write_to_file(uint8_t *data, size_t data_length) > > - { > > - int res; > > -- struct file *fp; > > -- mm_segment_t old_fs = get_fs(); > > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- if (IS_ERR(fp)) return -1; > > -- set_fs(get_ds()); > > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > > -- set_fs(old_fs); > > -- filp_close(fp, NULL); > > -+ int fp; > > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -+ res = write(fp, data, data_length); > > -+ close(fp); > > - return (res == data_length) ? 0 : -1; > > - } > > - > > - static int read_from_file(uint8_t **data, size_t *data_length) > > - { > > - int res; > > -- struct file *fp; > > -- mm_segment_t old_fs = get_fs(); > > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -- if (IS_ERR(fp)) return -1; > > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > > -+ int fp, file_status; > > -+ struct stat file_info; > > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -+ file_status = fstat(fp, &file_info); > > -+ if (file_status < 0) { > > -+ close(fp); > > -+ return -1; > > -+ } > > -+ > > -+ *data_length = file_info.st_size; > > - *data = tpm_malloc(*data_length); > > - if (*data == NULL) { > > -- filp_close(fp, NULL); > > -+ close(fp); > > - return -1; > > - } > > -- set_fs(get_ds()); > > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > > -- set_fs(old_fs); > > -- filp_close(fp, NULL); > > -+ res = read(fp, *data, *data_length); > > -+ close(fp); > > - if (res != *data_length) { > > - tpm_free(*data); > > - return -1; > > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > > - int tpm_store_permanent_data(void) > > - { > > - uint8_t *buf, *ptr; > > -- size_t buf_length, len; > > -+ UINT32 buf_length, len; > > - > > - /* marshal data */ > > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > > - buf = ptr = tpm_malloc(buf_length); > > - if (buf == NULL > > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > > - tpm_free(buf); > > - return -1; > > - } > > -+ > > - if (write_to_file(buf, buf_length - len)) { > > - tpm_free(buf); > > - return -1; > > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > > - int tpm_restore_permanent_data(void) > > - { > > - uint8_t *buf, *ptr; > > -- size_t buf_length, len; > > -+ size_t buf_length; > > -+ UINT32 len; > > - TPM_VERSION ver; > > - > > - /* read data */ > > - if (read_from_file(&buf, &buf_length)) return -1; > > - ptr = buf; > > -- len = buf_length; > > -+ len = (uint32_t) buf_length; > > - /* unmarshal data */ > > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > > - tpm_free(buf); > > - return -1; > > - } > > -+ > > - tpm_free(buf); > > - return 0; > > - } > > - > > - int tpm_erase_permanent_data(void) > > - { > > -- int res = write_to_file("", 0); > > -+ int res = write_to_file((uint8_t *) "", 0); > > - return res; > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > > - BYTE *ptr; > > - UINT32 len; > > - info("TPM_SaveKeyContext()"); > > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > > - keyContextSize, &contextBlob); > > - if (res != TPM_SUCCESS) return res; > > - len = *keyContextSize; > > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > > - BYTE *ptr; > > - UINT32 len; > > - info("TPM_SaveAuthContext()"); > > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > > - authContextSize, &contextBlob); > > - if (res != TPM_SUCCESS) return res; > > - len = *authContextSize; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,5 +1,6 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -22,7 +23,8 @@ > > - /* TPM configuration */ > > - #define TPM_STORE_TO_FILE 1 > > - #undef TPM_STRONG_PERSISTENCE > > --#undef TPM_GENERATE_EK > > -+//#undef TPM_GENERATE_EK > > -+#define TPM_GENERATE_EK > > - #undef TPM_GENERATE_SEED_DAA > > - > > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > > - > > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > > - { > > -- UINT32 m_len, e_len, q_len; > > -+ size_t m_len, e_len, q_len; > > - if (*length < sizeof_RSA((*v))) return -1; > > - if (v->size > 0) { > > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > > - return 0; > > - } > > - > > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > > -+{ > > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > > -+{ > > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > > -+{ > > -+ UINT32 i; > > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > > -+ } > > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > > -+ } > > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > > -+{ > > -+ UINT32 i; > > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > > -+ } > > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > > -+ } > > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > > -+ > > -+ return 0; > > -+} > > -+ > > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > > - { > > - if (tpm_marshal_BYTE(ptr, length, v->type) > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > > - > > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > > -+ > > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > > -+ > > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > > - TPM_RESULT res; > > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > > -- UINT32 buf_size = ek->size >> 3; > > -+ size_t buf_size = ek->size >> 3, key_length; > > - BYTE buf[buf_size]; > > - > > - info("TPM_TakeOwnership()"); > > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > > - return TPM_FAIL; > > - } > > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > > -- &srkPub->pubKey.keyLength); > > -+ &key_length); > > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > > - /* setup tpmProof and set state to owned */ > > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > > - { > > - int i; > > -+ int restore_fail; > > - info("TPM_Startup(%d)", startupType); > > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > > -- /* reset STANY_FLAGS */ > > -- SET_TO_ZERO(&tpmData.stany.flags); > > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > > -- /* reset STANY_DATA (invalidates ALL sessions) */ > > -- SET_TO_ZERO(&tpmData.stany.data); > > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > > -- /* init session-context nonce */ > > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > > -+ > > -+ /* try and restore state to get EK, SRK, etc */ > > -+ restore_fail = tpm_restore_permanent_data(); > > -+ > > - /* set data and flags according to the given startup type */ > > - if (startupType == TPM_ST_CLEAR) { > > -- /* if available, restore permanent data */ > > -- tpm_restore_permanent_data(); > > -+ /* reset STANY_FLAGS */ > > -+ SET_TO_ZERO(&tpmData.stany.flags); > > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > > -+ SET_TO_ZERO(&tpmData.stany.data); > > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > > -+ /* init session-context nonce */ > > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > > - /* reset PCR values */ > > - for (i = 0; i < TPM_NUM_PCR; i++) { > > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > > - else > > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > > - } > > - /* reset STCLEAR_FLAGS */ > > - SET_TO_ZERO(&tpmData.stclear.flags); > > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > > - /* init key-context nonce */ > > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > > - } else if (startupType == TPM_ST_STATE) { > > -- if (tpm_restore_permanent_data()) { > > -+ /* restore must have been successful for TPM_ST_STATE */ > > -+ if (restore_fail) { > > - error("restoring permanent data failed"); > > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - BYTE *enc, UINT32 *enc_size) > > - { > > - UINT32 len; > > -+ size_t enc_size32 = *enc_size; > > - BYTE *buf, *ptr; > > - rsa_public_key_t pub_key; > > - int scheme; > > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - if (buf == NULL > > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > > -- enc, enc_size)) { > > -+ enc, &enc_size32)) { > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return -1; > > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > > - TPM_SEALED_DATA *seal, BYTE **buf) > > - { > > -- UINT32 len; > > -+ size_t len; > > -+ UINT32 len32; > > - BYTE *ptr; > > - int scheme; > > - switch (key->encScheme) { > > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > > - len = enc_size; > > - *buf = ptr = tpm_malloc(len); > > - if (*buf == NULL > > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > > -+ tpm_free(*buf); > > -+ return -1; > > -+ } > > -+ len32 = len; > > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > > - tpm_free(*buf); > > - return -1; > > - } > > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > > - > > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > > - BYTE *inData, TPM_AUTH *auth1, > > -- UINT32 *outDataSize, BYTE **outData) > > -+ UINT32 *outDataSize32, BYTE **outData) > > - { > > - TPM_RESULT res; > > - TPM_KEY_DATA *key; > > - int scheme; > > -+ size_t outDataSize; > > - > > - info("TPM_UnBind()"); > > - /* get key */ > > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > > - /* the size of the input data muss be greater than zero */ > > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > > - /* decrypt data */ > > -- *outDataSize = inDataSize; > > -- *outData = tpm_malloc(*outDataSize); > > -+ outDataSize = inDataSize; > > -+ *outData = tpm_malloc(outDataSize); > > - if (*outData == NULL) return TPM_NOSPACE; > > - switch (key->encScheme) { > > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > > - } > > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > > -- *outData, outDataSize)) { > > -+ *outData, &outDataSize)) { > > - tpm_free(*outData); > > - return TPM_DECRYPT_ERROR; > > - } > > - /* verify data if it is of type TPM_BOUND_DATA */ > > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > > - || key->keyUsage != TPM_KEY_LEGACY) { > > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > > - tpm_free(*outData); > > - return TPM_DECRYPT_ERROR; > > - } > > -- *outDataSize -= 5; > > -- memmove(*outData, &(*outData)[5], *outDataSize); > > -+ outDataSize -= 5; > > -+ memmove(*outData, &(*outData)[5], outDataSize); > > - } > > -+ *outDataSize32 = (UINT32) outDataSize; > > - return TPM_SUCCESS; > > - } > > - > > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > > - } > > - > > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > > -- BYTE *enc, UINT32 *enc_size) > > -+ BYTE *enc, UINT32 *enc_size32) > > - { > > - UINT32 len; > > - BYTE *buf, *ptr; > > - rsa_public_key_t pub_key; > > - int scheme; > > -+ size_t enc_size; > > - switch (key->encScheme) { > > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > > - if (buf == NULL > > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > > -- enc, enc_size)) { > > -+ enc, &enc_size)) { > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return -1; > > - } > > -+ *enc_size32 = (UINT32) enc_size; > > - tpm_free(buf); > > - rsa_release_public_key(&pub_key); > > - return 0; > > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > > - TPM_STORE_ASYMKEY *store, BYTE **buf) > > - { > > -- UINT32 len; > > -+ UINT32 len32; > > -+ size_t len; > > - BYTE *ptr; > > - int scheme; > > - switch (key->encScheme) { > > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > > - len = enc_size; > > - *buf = ptr = tpm_malloc(len); > > - if (*buf == NULL > > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > > -+ tpm_free(*buf); > > -+ return -1; > > -+ } > > -+ len32 = (UINT32) len; > > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > > - tpm_free(*buf); > > - return -1; > > - } > > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - TPM_SESSION_DATA *session; > > - TPM_STORE_ASYMKEY store; > > - rsa_private_key_t rsa; > > -- UINT32 key_length; > > -+ size_t key_length; > > - > > - info("TPM_CreateWrapKey()"); > > - /* get parent key */ > > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - } > > - } > > - /* generate key and store it */ > > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > > -- wrappedKey->pubKey.keyLength = key_length >> 3; > > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > > -+ return TPM_FAIL; > > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > > -- store.privKey.keyLength = key_length >> 4; > > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > > - wrappedKey->encDataSize = parent->key.size >> 3; > > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > > - tpm_free(wrappedKey->encData); > > - return TPM_NOSPACE; > > - } > > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > > -- &wrappedKey->pubKey.keyLength); > > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > > -+ &key_length); > > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > > -+ store.privKey.keyLength = (UINT32) key_length; > > - rsa_release_private_key(&rsa); > > - /* compute the digest of the wrapped key (without encData) */ > > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > > - > > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > > - { > > -+ size_t key_length; > > - parms->algorithmID = TPM_ALG_RSA; > > - parms->encScheme = key->encScheme; > > - parms->sigScheme = key->sigScheme; > > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > > - if (parms->parms.rsa.exponent == NULL) return -1; > > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > > -- &parms->parms.rsa.exponentSize); > > -+ &key_length); > > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > > - return 0; > > - } > > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > > - TPM_RESULT res; > > - TPM_KEY_DATA *key; > > - TPM_DIGEST digest; > > -+ size_t key_length; > > - info("TPM_GetPubKey()"); > > - /* get key */ > > - if (keyHandle == TPM_KH_SRK > > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > > - pubKey->pubKey.keyLength = key->key.size >> 3; > > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > > -- &pubKey->pubKey.keyLength); > > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > > - tpm_free(pubKey->pubKey.key); > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > > - TPM_DIGEST DAA_digest_gamma; > > - BYTE DAA_generic_q[26]; > > - } TPM_DAA_ISSUER; > > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > > - > > - /* > > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > > - TPM_DIGEST DAA_rekey; > > - UINT32 DAA_count; > > - } TPM_DAA_TPM; > > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > > - > > - /* > > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > > - BYTE DAA_scratch[256]; > > - BYTE DAA_stage; > > - } TPM_DAA_CONTEXT; > > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > > - > > - /* > > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > > - BYTE DAA_join_u1[138]; > > - TPM_DIGEST DAA_digest_n0; > > - } TPM_DAA_JOINDATA; > > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > > - > > - /* > > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > > - //UINT32 ownerReference; > > - //BOOL disableResetLock; > > - } TPM_STCLEAR_DATA; > > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > > - > > - /* > > - * TPM_SESSION_DATA > > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > > - TPM_DAA_JOINDATA DAA_joinSession; > > - TPM_HANDLE handle; > > - } TPM_DAA_SESSION_DATA; > > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > > - > > - /* > > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > > - TPM_DAAHANDLE currentDAA; > > - TPM_TRANSHANDLE transExclusive; > > - } TPM_STANY_DATA; > > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > > - > > - /* > > - * TPM_DATA > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > > - struct { > > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > > - } test_cases[] = {{ > > -- "abc", 1, > > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > > -+ (uint8_t*)"abc", 1, > > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > > - }, { > > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > > - }, { > > -- "a", 1000000, > > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > > -+ (uint8_t*)"a", 1000000, > > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > > - }, { > > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > > - }}; > > - > > - debug("tpm_test_sha1()"); > > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > > - sha1_init(&ctx); > > - for (j = 0; j < test_cases[i].repetitions; j++) > > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > > - sha1_final(&ctx, digest); > > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > > - } > > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > > - struct { > > - uint8_t *key, key_len, *data, data_len, *digest; > > - } test_cases[] = {{ > > -- "\x0b", 20, "Hi There", 8, > > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > > - }, { > > -- "Jefe", 4, "what do ya want for nothing?", 28, > > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > > - }, { > > -- "\xaa", 20, "\xdd", 50, > > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > > - }, { > > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > > - }, { > > -- "\x0c", 20, "Test With Truncation", 20, > > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > > - }, { > > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > > - }, { > > -- "\xaa", 80, > > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > > -+ (uint8_t*)"\xaa", 80, > > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > > - }}; > > - > > - debug("tpm_test_hmac()"); > > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > > - uint8_t key[test_cases[i].key_len]; > > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > > - hmac_init(&ctx, key, test_cases[i].key_len); > > - } else { > > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > > - } > > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > > - } > > - hmac_final(&ctx, digest); > > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > > - static int tpm_test_rsa_EK(void) > > - { > > - int res = 0; > > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > > - uint8_t buf[256]; > > -- size_t buf_len, data_len = strlen(data); > > -+ size_t buf_len, data_len = strlen((char*)data); > > - rsa_private_key_t priv_key; > > - rsa_public_key_t pub_key; > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > > - { > > - info("TPM_GetTicks()"); > > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > > -- sizeof(TPM_CURRENT_TICKS)); > > -- return TPM_SUCCESS; > > -+ return TPM_DISABLED_CMD; > > - } > > - > > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > > - TPM_CURRENT_TICKS *currentTicks, > > - UINT32 *sigSize, BYTE **sig) > > - { > > -- TPM_RESULT res; > > -- TPM_KEY_DATA *key; > > -- BYTE *info, *p; > > -- UINT32 info_length, length; > > - info("TPM_TickStampBlob()"); > > -- /* get key */ > > -- key = tpm_get_key(keyHandle); > > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > > -- /* verify authorization */ > > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > > -- if (res != TPM_SUCCESS) return res; > > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > > -- /* get current ticks */ > > -- TPM_GetTicks(currentTicks); > > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > > -- *sigSize = key->key.size >> 3; > > -- *sig = tpm_malloc(*sigSize); > > -- if (*sig == NULL) return TPM_FAIL; > > -- /* setup TPM_SIGN_INFO structure */ > > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > > -- info = tpm_malloc(info_length); > > -- if (info == NULL) { > > -- tpm_free(*sig); > > -- return TPM_FAIL; > > -- } > > -- memcpy(&info[0], "\x05\x00TSTP", 6); > > -- memcpy(&info[6], antiReplay->nonce, 20); > > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > > -- p = &info[30 + sizeof(TPM_DIGEST)]; > > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > > -- tpm_free(*sig); > > -- tpm_free(info); > > -- return TPM_FAIL; > > -- } > > -- return TPM_SUCCESS; > > -+ return TPM_DISABLED_CMD; > > - } > > - > > - void tpm_update_ticks(void) > > - { > > -- if (tpmData.stany.data.currentTicks.tag == 0) { > > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > > --/* removed since v1.2 rev 94 > > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > > --*/ > > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > > -- sizeof(TPM_NONCE)); > > -- tpmData.stany.data.currentTicks.tickRate = 1; > > --/* removed since v1.2 rev 94 > > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > > --*/ > > -- } else { > > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > > -- } > > - } > > - > > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > > - sha1_init(&sha1); > > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > > -- sha1_update(&sha1, "in", 2); > > -+ sha1_update(&sha1, (BYTE*)"in", 2); > > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > > - j = CPU_TO_BE32(i); > > - sha1_update(&sha1, (BYTE*)&j, 4); > > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > > - sha1_init(&sha1); > > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > > -- sha1_update(&sha1, "out", 3); > > -+ sha1_update(&sha1, (BYTE*)"out", 3); > > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > > - j = CPU_TO_BE32(i); > > - sha1_update(&sha1, (BYTE*)&j, 4); > > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > > -@@ -0,0 +1,156 @@ > > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > -+ * Copyright (C) 2005 INTEL Corp > > -+ * > > -+ * This module is free software; you can redistribute it and/or modify > > -+ * it under the terms of the GNU General Public License as published > > -+ * by the Free Software Foundation; either version 2 of the License, > > -+ * or (at your option) any later version. > > -+ * > > -+ * This module is distributed in the hope that it will be useful, > > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > -+ * GNU General Public License for more details. > > -+ * > > -+ */ > > -+ > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+#include > > -+ > > -+#include "tpm_emulator.h" > > -+ > > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > > -+ > > -+#define BUFFER_SIZE 2048 > > -+ > > -+static int devurandom=0; > > -+ > > -+void get_random_bytes(void *buf, int nbytes) { > > -+ > > -+ if (devurandom == 0) { > > -+ devurandom = open("/dev/urandom", O_RDONLY); > > -+ } > > -+ > > -+ if (read(devurandom, buf, nbytes) != nbytes) { > > -+ printf("Can't get random number.\n"); > > -+ exit(-1); > > -+ } > > -+} > > -+ > > -+uint64_t tpm_get_ticks(void) > > -+{ > > -+ //struct timeval tv; > > -+ //int gettimeofday(&tv, struct timezone *tz); > > -+ return 0; > > -+} > > -+ > > -+int main(int argc, char **argv) > > -+{ > > -+ uint8_t in[BUFFER_SIZE], *out; > > -+ uint32_t out_size; > > -+ int in_size, written; > > -+ int i; > > -+ struct stat file_info; > > -+ > > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > > -+ if (argc < 2) { > > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > > -+ return -1; > > -+ } > > -+ > > -+ /* initialize TPM emulator */ > > -+ if (!strcmp(argv[1], "clear")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(1); > > -+ } else if (!strcmp(argv[1], "save")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(2); > > -+ } else if (!strcmp(argv[1], "deactivated")) { > > -+ printf("Initializing tpm: %s\n", argv[1]); > > -+ tpm_emulator_init(3); > > -+ } else { > > -+ printf("invalid startup mode '%s'; must be 'clear', " > > -+ "'save' (default) or 'deactivated", argv[1]); > > -+ return -1; > > -+ } > > -+ > > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > > -+ return -1; > > -+ } > > -+ } > > -+ > > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > > -+ return -1; > > -+ } > > -+ } > > -+ > > -+ while (1) { > > -+abort_command: > > -+ if (tpm_rx_fh < 0) { > > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > > -+ } > > -+ > > -+ if (tpm_rx_fh < 0) { > > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ if (tpm_tx_fh < 0) { > > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > > -+ } > > -+ > > -+ if (tpm_tx_fh < 0) { > > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > > -+ if (in_size < 6) { // Magic size of minium TPM command > > -+ printf("Recv[%d] to small: 0x", in_size); > > -+ if (in_size <= 0) { > > -+ close(tpm_rx_fh); > > -+ tpm_rx_fh = -1; > > -+ goto abort_command; > > -+ } > > -+ } else { > > -+ printf("Recv[%d]: 0x", in_size); > > -+ for (i=0; i< in_size; i++) > > -+ printf("%x ", in[i]); > > -+ printf("\n"); > > -+ } > > -+ > > -+ > > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > > -+ printf("ERROR: Handler Failed.\n"); > > -+ } > > -+ > > -+ written = write(tpm_tx_fh, out, out_size); > > -+ > > -+ if (written != out_size ) { > > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > > -+ } else { > > -+ printf("Sent[%Zu]: ", out_size); > > -+ } > > -+ for (i=0; i< out_size; i++) > > -+ printf("%x ", out[i]); > > -+ printf("\n"); > > -+ tpm_free(out); > > -+ > > -+ } // loop > > -+ > > -+ tpm_emulator_shutdown(); > > -+ > > -+ close(tpm_tx_fh); > > -+ close(tpm_rx_fh); > > -+ > > -+} > > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > > -@@ -2,5 +2,5 @@ > > - #define _TPM_VERSION_H_ > > - #define VERSION_MAJOR 0 > > - #define VERSION_MINOR 4 > > --#define VERSION_BUILD 1151058734 > > -+#define VERSION_BUILD 1153776940 > > - #endif /* _TPM_VERSION_H_ */ > > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > > deleted file mode 100644 > > index 95586c1..0000000 > > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > > +++ /dev/null > > @@ -1,12 +0,0 @@ > > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > > ---- tpm_emulator-0.5.1/tpmd/Makefile > > -+++ tpm_emulator-0.5.1/tpmd/Makefile > > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > > - CFLAGS += -I../../../../tools/vtpm_manager/manager > > --LDFLAGS += -lgmp > > -+LDLIBS += -lgmp > > - > > - BINDIR := /usr/bin/ > > - > > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > > deleted file mode 100644 > > index 2aeb745..0000000 > > --- a/tools/vtpm/vtpm-0.5.1.patch > > +++ /dev/null > > @@ -1,766 +0,0 @@ > > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > > - VERSION_BUILD := $(shell date +"%s") > > - VERSION_SUFFIX := .1 > > - > > --SUBDIRS := tpmd tpmd_dev tddl > > -+SUBDIRS := tpmd > > - > > - all: version all-recursive > > - > > -@@ -48,12 +48,12 @@ user_install: user > > - modules_install: modules > > - @$(MAKE) -C tpmd_dev install || exit -1 > > - > > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > > -+DIRS := . tpm crypto tpmd > > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > > -+DIRS := . tpmd > > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > > - > > - dist: $(DISTSRC) > > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_TIS_TIMEOUT: > > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > > -+ UINT32 len = *respSize = 16; > > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > > -+ if (ptr == NULL || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > > -+ tpm_free(*resp); > > -+ return TPM_FAIL; > > -+ } > > -+ return TPM_SUCCESS; > > -+ > > - > > - case TPM_CAP_PROP_STARTUP_EFFECT: > > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_DURATION: > > - debug("[TPM_CAP_PROP_DURATION]"); > > -- /* TODO: TPM_CAP_PROP_DURATION */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > > -+ *respSize = 16; > > -+ *resp = tpm_malloc(*respSize); > > -+ memcpy(*resp,dur,16); > > -+ > > - > > - case TPM_CAP_PROP_ACTIVE_COUNTER: > > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > > - -Wwrite-strings -Wsign-compare -Wno-multichar > > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > > - LDFLAGS += -lgmp > > - > > --BINDIR := /usr/sbin/ > > -+BINDIR := /usr/bin/ > > - > > - TPMD := tpmd > > - DIRS := ../tpm ../crypto > > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > > - > > -+VTPM_BIN := vtpmd > > -+ > > - vpath %.c $(strip $(DIRS)) > > - > > - all: $(TPMD) > > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > > - INSTALL ?= install > > - > > - install: $(TPMD) > > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > > - > > - .PHONY: all clean install > > - > > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > > -@@ -32,6 +32,9 @@ > > - #include > > - #include "tpm_emulator_config.h" > > - #include "tpm/tpm_emulator.h" > > -+#include "tpm/tpm_structures.h" > > -+#include "tpm/tpm_marshalling.h" > > -+#include "vtpm_manager.h" > > - > > - #define TPM_DAEMON_NAME "tpmd" > > - #define TPM_CMD_BUF_SIZE 4096 > > -@@ -39,6 +42,24 @@ > > - #define TPM_RANDOM_DEVICE "/dev/urandom" > > - #undef TPM_MKDIRS > > - > > -+#ifdef VTPM_MULTI_VM > > -+ #define DEV_BE "/dev/vtpm" > > -+ #define DEV_FE "/dev/tpm" > > -+#else > > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > > -+ > > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -+ > > -+ static char *vtpm_rx_name=NULL; > > -+#endif > > -+ > > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#define BUFFER_SIZE 2048 > > -+ > > - static volatile int stopflag = 0; > > - static int is_daemon = 0; > > - static int opt_debug = 0; > > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > > - static uid_t opt_uid = 0; > > - static gid_t opt_gid = 0; > > - static int tpm_startup = 2; > > -+static int vtpm_type = VTPM_TYPE_PVM; > > -+int dmi_id = 0; > > - static int rand_fh; > > - > > - void tpm_log(int priority, const char *fmt, ...) > > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > > - > > - int tpm_write_to_file(uint8_t *data, size_t data_length) > > - { > > -- int fh; > > -- ssize_t res; > > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- if (fh < 0) return -1; > > -- while (data_length > 0) { > > -- res = write(fh, data, data_length); > > -- if (res < 0) { > > -- close(fh); > > -- return -1; > > -- } > > -- data_length -= res; > > -- data += res; > > -+ int res, out_data_size, in_header_size; > > -+ BYTE *ptr, *out_data, *in_header; > > -+ UINT32 result, len, in_rsp_size; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ > > -+ printf("Saving NVM\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > > -+#endif > > -+ > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > > -+ free(out_data); > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending SaveNVM Command.\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > - } > > -- close(fh); > > -- return 0; > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading SaveNVM header.\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > > -+#endif > > -+ > > -+ printf("\tFinishing up SaveNVM\n"); > > -+ return (0); > > - } > > - > > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > > - { > > -- int fh; > > -- ssize_t res; > > -- size_t total_length; > > -- fh = open(opt_storage_file, O_RDONLY); > > -- if (fh < 0) return -1; > > -- total_length = lseek(fh, 0, SEEK_END); > > -- lseek(fh, 0, SEEK_SET); > > -- *data = tpm_malloc(total_length); > > -- if (*data == NULL) { > > -- close(fh); > > -- return -1; > > -- } > > -- *data_length = 0; > > -- while (total_length > 0) { > > -- res = read(fh, &(*data)[*data_length], total_length); > > -- if (res < 0) { > > -- close(fh); > > -- tpm_free(*data); > > -- return -1; > > -- } > > -- *data_length += res; > > -- total_length -= res; > > -+ int res, out_data_size, in_header_size; > > -+ uint8_t *ptr, *out_data, *in_header; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ UINT32 len, in_rsp_size, result; > > -+#ifdef VTPM_MUTLI_VM > > -+ int vtpm_rx_fh, vtpm_tx_fh; > > -+#endif > > -+ > > -+ printf("Loading NVM.\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ printf("Error in read_from_file:301\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > > -+ free(out_data); > > -+ printf("Error in read_from_file:325\n"); > > -+ > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending LoadNVM command\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) > > -+ { > > -+ printf("Error in read_from_file:335\n"); > > -+ return -1; > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > - } > > -- close(fh); > > -- return 0; > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ printf("Error in read_from_file:352\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading LoadNVM header\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ printf("Error in read_from_file:375\n"); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ printf("Error in read_from_file:381\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Read Encrypted data from VTPM Manager > > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > -+ *data = (uint8_t *) malloc(*data_length); > > -+ > > -+ printf("\tReading clear data from LoadNVM.\n"); > > -+ res = read(vtpm_rx_fh, *data, *data_length); > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > > -+#endif > > -+ > > -+ printf("\tReturing from loading NVM\n"); > > -+ if (res != (int)*data_length) { > > -+ free(*data); > > -+ printf("Error in read_from_file:398\n"); > > -+ return -1; > > -+ } else { > > -+ return 0; > > -+ } > > -+ > > -+ > > -+ > > - } > > - > > - static void print_usage(char *name) > > - { > > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > > -+ "[-o user name] [-g group name] [-h]" > > -+#ifdef VTPM_MULTI_VM > > -+ "clear|save|deactivated\n", name); > > -+#else > > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > > -+#endif > > - printf(" d : enable debug mode\n"); > > - printf(" f : forces the application to run in the foreground\n"); > > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > > - exit(EXIT_SUCCESS); > > - } > > - } > > -- if (optind < argc) { > > -+ /*Make sure we have all required options*/ > > -+#ifdef VTPM_MULTI_VM > > -+#define EXTRA_OPTS 0 > > -+#else > > -+#define EXTRA_OPTS 2 > > -+#endif > > -+ if (optind < argc - EXTRA_OPTS ) { > > - debug("startup mode = '%s'", argv[optind]); > > - if (!strcmp(argv[optind], "clear")) { > > - tpm_startup = 1; > > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > > - print_usage(argv[0]); > > - exit(EXIT_SUCCESS); > > - } > > -+#ifndef VTPM_MULTI_VM > > -+ ++optind; > > -+ if(!strcmp(argv[optind], "pvm")) { > > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > > -+ } else if (!strcmp(argv[optind], "hvm")) { > > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > > -+ } else { > > -+ error("Invalid vm mode '%s'; must be 'pvm', " > > -+ "or 'hvm' ", argv[optind]); > > -+ print_usage(argv[0]); > > -+ exit(EXIT_SUCCESS); > > -+ } > > -+ ++optind; > > -+ dmi_id = atoi(argv[optind]); > > -+#endif > > -+ } else { > > -+ error("Invalid number of arguments"); > > -+ print_usage(argv[0]); > > -+ exit(EXIT_SUCCESS); > > - } > > - } > > - > > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > > - > > - static void main_loop(void) > > - { > > -- int sock, fh, res; > > -- int32_t in_len; > > -+ int32_t in_len, written; > > - uint32_t out_len; > > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > > -+ int guest_id=-1; > > -+ int i; > > -+ char *vtpm_rx_file=NULL; > > -+ int res; > > -+ > > -+#ifndef VTPM_MULTI_VM > > -+ int sockfd = -1; > > - struct sockaddr_un addr; > > -- socklen_t addr_len; > > -- fd_set rfds; > > -- struct timeval tv; > > -+ struct sockaddr_un client_addr; > > -+ unsigned int client_length; > > -+#endif > > -+ > > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#ifndef VTPM_MULTI_VM > > -+ if (vtpm_type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } else { > > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ > > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > > -+ error("Unable to create socket. errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&addr, 0, sizeof(addr)); > > -+ addr.sun_family = AF_UNIX; > > -+ strcpy(addr.sun_path,vtpm_rx_file ); > > -+ unlink(addr.sun_path); > > -+ } > > -+#endif > > - > > - info("staring main loop"); > > -- /* open UNIX socket */ > > -- sock = init_socket(opt_socket_name); > > -- if (sock < 0) exit(EXIT_FAILURE); > > - /* init tpm emulator */ > > -- debug("initializing TPM emulator: %d", tpm_startup); > > -+#ifdef VTPM_MULTI_VM > > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > > -+#else > > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > > -+#endif > > - tpm_emulator_init(tpm_startup); > > - /* start command processing */ > > - while (!stopflag) { > > - /* wait for incomming connections */ > > - debug("waiting for connections..."); > > -- FD_ZERO(&rfds); > > -- FD_SET(sock, &rfds); > > -- tv.tv_sec = 10; > > -- tv.tv_usec = 0; > > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > > -- if (res < 0) { > > -- error("select(sock) failed: %s", strerror(errno)); > > -- break; > > -- } else if (res == 0) { > > -- continue; > > -- } > > -- addr_len = sizeof(addr); > > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > > -- if (fh < 0) { > > -- error("accept() failed: %s", strerror(errno)); > > -- continue; > > -- } > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > > -+#else > > -+ if (vtpm_type == VTPM_TYPE_PVM) > > -+ { > > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > > -+ } else { > > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > > -+ error("Unable to bind(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ if (listen(sockfd, 10) <0) { > > -+ error("Unable to listen(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&client_addr, 0, sizeof(client_addr)); > > -+ client_length = sizeof(client_addr); > > -+ > > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > > -+ } > > -+#endif > > -+ } > > -+ > > -+ /*Error Checking*/ > > -+ if (vtpm_rx_fh < 0) { > > -+ error("Failed to open devices to listen to guest.\n"); > > -+ exit(-1); > > -+ } > > -+ > > - /* receive and handle commands */ > > - in_len = 0; > > - do { > > - debug("waiting for commands..."); > > -- FD_ZERO(&rfds); > > -- FD_SET(fh, &rfds); > > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > > -- tv.tv_usec = 0; > > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > > -- if (res < 0) { > > -- error("select(fh) failed: %s", strerror(errno)); > > -- close(fh); > > -- break; > > -- } else if (res == 0) { > > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > > -- info("connection closed due to inactivity"); > > -- close(fh); > > -- break; > > --#else > > -- continue; > > --#endif > > -- } > > -- in_len = read(fh, in, sizeof(in)); > > -- if (in_len > 0) { > > -+ > > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > > -+ /*Magic size of minimum TPM command is 6*/ > > -+ //FIXME Magic size check may not be required anymore > > -+ if (in_len < 6) { > > -+ info("Recv incomplete command of %d bytes.", in_len); > > -+ if (in_len <= 0) { > > -+ close(vtpm_rx_fh); > > -+ vtpm_rx_fh = -1; > > -+ continue; > > -+ } > > -+ } else { > > -+ /*Debug Printouts*/ > > - debug("received %d bytes", in_len); > > -+ debug_nostop("Recv[%d]: 0x", in_len); > > -+ for (i=0; i< in_len; i++) > > -+ debug_more("%x ", in[i]); > > -+ debug_more("\n"); > > -+ /*Multiple Guest check*/ > > -+ if (guest_id == -1) { > > -+ guest_id = *((int32_t *) in); > > -+ } else { > > -+ if (guest_id != *((int32_t *) in) ) { > > -+ error("WARNING: More than one guest attached\n"); > > -+ } > > -+ } > > -+ > > -+ /*Open tx handle now*/ > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_type == VTPM_TYPE_PVM) { > > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > > -+ } // No need to open the other direction for HVM > > -+#endif > > -+ } > > -+ if (vtpm_tx_fh < 0) { > > -+ error("Failed to open devices to respond to guest.\n"); > > -+ exit(-1); > > -+ } > > -+ > > -+ /*Handle the TPM command now*/ > > - out = NULL; > > -- res = tpm_handle_command(in, in_len, &out, &out_len); > > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > > - if (res < 0) { > > - error("tpm_handle_command() failed"); > > - } else { > > - debug("sending %d bytes", out_len); > > -+ //FIXME this prepending may or may not be needed > > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > > -+ out_len += sizeof(uint32_t); > > -+ /*End Prepend*/ > > -+ > > -+ /*Perform write operation now*/ > > - while (out_len > 0) { > > -- res = write(fh, out, out_len); > > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > > -+ > > - if (res < 0) { > > - error("write(%d) failed: %s", out_len, strerror(errno)); > > - break; > > -- } > > -+ } else { > > -+ debug_nostop("Sent[%Zu]: ", out_len); > > -+ for (i=0; (unsigned int)i< out_len; i++) > > -+ debug_more("%x ", addressed_out[i]); > > -+ debug_more("\n"); > > -+ } > > - out_len -= res; > > - } > > - tpm_free(out); > > -+ tpm_free(addressed_out); > > - } > > - } > > - } while (in_len > 0); > > -- close(fh); > > -+ //close(fh); > > - } > > -+ > > - /* shutdown tpm emulator */ > > - tpm_emulator_shutdown(); > > -- /* close socket */ > > -- close(sock); > > -- unlink(opt_socket_name); > > -+ /* Close handles */ > > -+ close(vtpm_tx_fh); > > -+#ifndef VTPM_MULTI_VM > > -+ close(vtpm_rx_fh); > > -+ free(vtpm_rx_file); > > -+#endif > > - info("main loop stopped"); > > - } > > - > > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > > - /* open random device */ > > - init_random(); > > - /* init signal handlers */ > > -- init_signal_handler(); > > -+ //init_signal_handler(); > > - /* unless requested otherwiese, fork and daemonize process */ > > -- if (!opt_foreground) daemonize(); > > -+ //if (!opt_foreground) daemonize(); > > - /* start main processing loop */ > > - main_loop(); > > - info("stopping TPM Emulator daemon"); > > - closelog(); > > - return 0; > > - } > > -+ > > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > > -@@ -29,23 +29,28 @@ > > - > > - /* TPM emulator configuration */ > > - > > --#undef TPM_STRONG_PERSISTENCE > > --#undef TPM_GENERATE_EK > > -+#define TPM_STRONG_PERSISTENCE > > -+#define TPM_GENERATE_EK > > - #undef TPM_GENERATE_SEED_DAA > > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > > - > > -+extern int dmi_id; > > -+ > > - /* log macros */ > > - > > - void tpm_log(int priority, const char *fmt, ...); > > - > > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > > - > > - /* min/max macros that also do strict type-checking */ > > - > > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > > deleted file mode 100644 > > index e896b25..0000000 > > --- a/tools/vtpm/vtpm.patch > > +++ /dev/null > > @@ -1,716 +0,0 @@ > > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > > -@@ -1,3 +1,3 @@ > > - Mario Strasser > > - Heiko Stamer [DAA] > > --INTEL Corp <> [Dropped to Ring3] > > -+INTEL Corp <> [VTPM Extensions] > > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > > -@@ -1,5 +1,6 @@ > > - ????-??-?? Intel Corp > > - * Moved module out of kernel to run as a ring 3 app > > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > > - > > - 2006-06-23 Mario Strasser > > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > > -@@ -44,18 +44,26 @@ > > - #define TPM_DEVICE_NAME "tpm" > > - #define TPM_MODULE_NAME "tpm_emulator" > > - > > -+/* debug and log output functions */ > > -+extern int dmi_id; > > -+ > > - #ifdef DEBUG > > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > > - #else > > - #define debug(fmt, ...) > > -+#define debug_nostop(fmt, ...) > > -+#define debug_more(fmt, ...) > > - #endif > > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > > -- __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > > - > > - /* memory allocation */ > > - > > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > > -@@ -7,7 +7,7 @@ > > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > > - > > - # module settings > > --BIN := tpm_emulator > > -+BIN := vtpmd > > - VERSION_MAJOR := 0 > > - VERSION_MINOR := 4 > > - VERSION_BUILD := $(shell date +"%s") > > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > > - > > - CC := gcc > > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > > --CFLAGS += -I. -Itpm > > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > > - > > - # Is the simulator running in it's own vm? > > - #CFLAGS += -DVTPM_MULTI_VM > > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > > - > > - install: $(BIN) > > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > > - > > - clean: > > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > > -@@ -98,3 +97,4 @@ version: > > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > > - > > - .PHONY: all install clean dist gmp version > > -+ > > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_TIS_TIMEOUT: > > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > > -- return TPM_FAIL; > > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > > -+ UINT32 len = *respSize = 16; > > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > > -+ if (ptr == NULL || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > > -+ tpm_free(*resp); > > -+ return TPM_FAIL; > > -+ } > > -+ return TPM_SUCCESS; > > - > > - case TPM_CAP_PROP_STARTUP_EFFECT: > > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > > - > > - case TPM_CAP_PROP_DURATION: > > - debug("[TPM_CAP_PROP_DURATION]"); > > -- /* TODO: TPM_CAP_PROP_DURATION */ > > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > > -+ *respSize = 16; > > -+ *resp = tpm_malloc(*respSize); > > -+ memcpy(*resp,dur,16); > > - return TPM_FAIL; > > - > > - case TPM_CAP_PROP_ACTIVE_COUNTER: > > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > > - sha1_ctx_t sha1; > > - UINT32 res = CPU_TO_BE32(rsp->result); > > - UINT32 ord = CPU_TO_BE32(ordinal); > > -+ UINT32 offset = 0; > > - > > - /* compute SHA1 hash */ > > - sha1_init(&sha1); > > - sha1_update(&sha1, (BYTE*)&res, 4); > > - sha1_update(&sha1, (BYTE*)&ord, 4); > > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > > -+ if (ordinal == TPM_ORD_LoadKey2) { > > -+ offset = 4; > > -+ } > > -+ if (rsp->paramSize - offset > 0) { > > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > > -+ } > > - sha1_final(&sha1, rsp->auth1->digest); > > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > > -@@ -1,6 +1,7 @@ > > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > > - * Copyright (C) 2004 Mario Strasser , > > - * Swiss Federal Institute of Technology (ETH) Zurich > > -+ * Copyright (C) 2005 INTEL Corp > > - * > > - * This module is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published > > -@@ -15,10 +16,15 @@ > > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > > - */ > > - > > -+#include > > -+#include > > -+#include > > -+#include > > -+ > > - #include "tpm_emulator.h" > > - #include "tpm_structures.h" > > - #include "tpm_marshalling.h" > > --#include "linux_module.h" > > -+#include "vtpm_manager.h" > > - > > - TPM_DATA tpmData; > > - > > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > > - #include > > - #include > > - #include > > --#include > > - > > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ #define DEV_FE "/dev/tpm" > > -+#else > > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -+ > > -+ extern int dmi_id; > > -+ static char *vtpm_rx_name=NULL; > > -+#endif > > - > > - static int write_to_file(uint8_t *data, size_t data_length) > > - { > > -- int res; > > -- int fp; > > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > > -- res = write(fp, data, data_length); > > -- close(fp); > > -- return (res == data_length) ? 0 : -1; > > -+ int res, out_data_size, in_header_size; > > -+ BYTE *ptr, *out_data, *in_header; > > -+ UINT32 result, len, in_rsp_size; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ > > -+ printf("Saving NVM\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > > -+#endif > > -+ > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > > -+ free(out_data); > > -+ return -1; > > -+ } > > -+ > > -+ printf("\tSending SaveNVM Command.\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading SaveNVM header.\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > > -+#endif > > -+ > > -+ printf("\tFinishing up SaveNVM\n"); > > -+ return (0); > > - } > > - > > - static int read_from_file(uint8_t **data, size_t *data_length) > > - { > > -- int res; > > -- int fp, file_status; > > -- struct stat file_info; > > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > > -- file_status = fstat(fp, &file_info); > > -- if (file_status < 0) { > > -- close(fp); > > -- return -1; > > -- } > > -+ int res, out_data_size, in_header_size; > > -+ uint8_t *ptr, *out_data, *in_header; > > -+ UINT16 tag = VTPM_TAG_REQ; > > -+ UINT32 len, in_rsp_size, result; > > -+#ifdef VTPM_MUTLI_VM > > -+ int vtpm_rx_fh, vtpm_tx_fh; > > -+#endif > > -+ > > -+ printf("Loading NVM.\n"); > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > > -+#else > > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > > -+#endif > > -+ } > > - > > -- *data_length = file_info.st_size; > > -- *data = tpm_malloc(*data_length); > > -- if (*data == NULL) { > > -- close(fp); > > -+ if (vtpm_tx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Send request to VTPM Manager to encrypt data > > -+#ifdef VTPM_MUTLI_VM > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ out_data = ptr = (BYTE *) malloc(len); > > -+ > > -+ if (ptr == NULL > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > > -+#endif > > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > > -+#ifdef VTPM_MUTLI_VM > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > > -+#else > > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > > -+#endif > > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > > -+ free(out_data); > > - return -1; > > - } > > -- res = read(fp, *data, *data_length); > > -- close(fp); > > -+ > > -+ printf("\tSending LoadNVM command\n"); > > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > > -+ free(out_data); > > -+ if (res != out_data_size) return -1; > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (vtpm_rx_name == NULL) { > > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } > > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_rx_fh < 0) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Header of response so we can get the size & status > > -+#ifdef VTPM_MUTLI_VM > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > > -+#else > > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > > -+#endif > > -+ in_header = ptr = malloc(in_header_size); > > -+ > > -+ printf("\tReading LoadNVM header\n"); > > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > > -+ > > -+ if ( (res != in_header_size) > > -+#ifndef VTPM_MUTLI_VM > > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > > -+#endif > > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > > -+ free(in_header); > > -+ return -1; > > -+ } > > -+ free(in_header); > > -+ > > -+ if (result != VTPM_SUCCESS) { > > -+ return -1; > > -+ } > > -+ > > -+ // Read Encrypted data from VTPM Manager > > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > -+ *data = (uint8_t *) malloc(*data_length); > > -+ > > -+ printf("\tReading clear data from LoadNVM.\n"); > > -+ res = read(vtpm_rx_fh, *data, *data_length); > > -+#ifdef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > > -+#endif > > -+ > > -+ printf("\tReturing from loading NVM\n"); > > - if (res != *data_length) { > > -- tpm_free(*data); > > -- return -1; > > -+ free(*data); > > -+ return -1; > > -+ } else { > > -+ return 0; > > - } > > -- return 0; > > -+ > > - } > > - > > - #else > > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > > -@@ -21,12 +21,24 @@ > > - #include > > - #include > > - #include > > -+#include > > -+#include > > -+#include > > - > > - #include "tpm_emulator.h" > > -+#include "vtpm_manager.h" > > - > > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > > -+#ifdef VTPM_MULTI_VM > > -+ #define DEV_BE "/dev/vtpm" > > -+#else > > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > - > > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > > -+#endif > > -+ > > -+ int dmi_id; > > -+ > > - #define BUFFER_SIZE 2048 > > - > > - static int devurandom=0; > > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > > - } > > - > > - if (read(devurandom, buf, nbytes) != nbytes) { > > -- printf("Can't get random number.\n"); > > -+ error("Can't get random number.\n"); > > - exit(-1); > > - } > > - } > > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > > - > > - int main(int argc, char **argv) > > - { > > -- uint8_t in[BUFFER_SIZE], *out; > > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > > -+ char *vtpm_rx_file=NULL; > > - uint32_t out_size; > > - int in_size, written; > > -- int i; > > -- struct stat file_info; > > -+ int i, guest_id=-1; > > - > > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > > -+#ifndef VTPM_MULTI_VM > > -+ int sockfd = -1; > > -+ struct sockaddr_un addr; > > -+ struct sockaddr_un client_addr; > > -+ unsigned int client_length; > > -+ > > -+#endif > > -+ > > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > > -+#ifdef VTPM_MULTI_VM > > - if (argc < 2) { > > -- printf("Usage: tpmd clear|save|deactivated\n" ); > > -+ error("Usage: tpmd clear|save|deactivated\n" ); > > -+#else > > -+ if (argc < 4) { > > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > > -+#endif > > - return -1; > > - } > > - > > -+#ifndef VTPM_MULTI_VM > > -+ /* setup type of vm */ > > -+ if (!strcmp(argv[2], "pvm")) { > > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > > -+ } else if (!strcmp(argv[2], "hvm")) { > > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > > -+ } else { > > -+ error("invalid vTPM type '%s'.\n", argv[2]); > > -+ } > > -+ > > -+ dmi_id = atoi(argv[3]); > > -+ > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ } else { > > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > > -+ > > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > > -+ error("Unable to create socket. errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&addr, 0, sizeof(addr)); > > -+ addr.sun_family = AF_UNIX; > > -+ strcpy(addr.sun_path,vtpm_rx_file ); > > -+ unlink(addr.sun_path); > > -+ } > > -+#endif > > -+ > > -+#ifdef VTPM_MULTI_VM > > -+ info("Initializing tpm state: %s\n", argv[1]); > > -+#else > > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > > -+#endif > > -+ > > - /* initialize TPM emulator */ > > - if (!strcmp(argv[1], "clear")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > - tpm_emulator_init(1); > > -- } else if (!strcmp(argv[1], "save")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > -+ } else if (!strcmp(argv[1], "save")) { > > - tpm_emulator_init(2); > > - } else if (!strcmp(argv[1], "deactivated")) { > > -- printf("Initializing tpm: %s\n", argv[1]); > > - tpm_emulator_init(3); > > - } else { > > -- printf("invalid startup mode '%s'; must be 'clear', " > > -+ error("invalid startup mode '%s'; must be 'clear', " > > - "'save' (default) or 'deactivated", argv[1]); > > - return -1; > > - } > > -- > > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > > -- return -1; > > -- } > > -- } > > -- > > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > > -- return -1; > > -- } > > -- } > > -- > > -+ > > - while (1) { > > - abort_command: > > -- if (tpm_rx_fh < 0) { > > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > > -+ if (vtpm_rx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > > -+#else > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > > -+ } else { > > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > > -+ error("Unable to bind(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ if (listen(sockfd, 10) <0) { > > -+ error("Unable to listen(). errno = %d\n", errno); > > -+ exit (-1); > > -+ } > > -+ > > -+ memset(&client_addr, 0, sizeof(client_addr)); > > -+ client_length = sizeof(client_addr); > > -+ > > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > > -+ } > > -+#endif > > - } > > - > > -- if (tpm_rx_fh < 0) { > > -- printf("ERROR: failed to open devices to listen to guest.\n"); > > -+ if (vtpm_rx_fh < 0) { > > -+ error("Failed to open devices to listen to guest.\n"); > > - return -1; > > - } > > - > > -- if (tpm_tx_fh < 0) { > > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > > -- } > > -- > > -- if (tpm_tx_fh < 0) { > > -- printf("ERROR: failed to open devices to respond to guest.\n"); > > -- return -1; > > -- } > > -- > > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > > - if (in_size < 6) { // Magic size of minium TPM command > > -- printf("Recv[%d] to small: 0x", in_size); > > -+ info("Recv incomplete command of %d bytes.", in_size); > > - if (in_size <= 0) { > > -- close(tpm_rx_fh); > > -- tpm_rx_fh = -1; > > -+ close(vtpm_rx_fh); > > -+ vtpm_rx_fh = -1; > > - goto abort_command; > > - } > > - } else { > > -- printf("Recv[%d]: 0x", in_size); > > -+ debug_nostop("Recv[%d]: 0x", in_size); > > - for (i=0; i< in_size; i++) > > -- printf("%x ", in[i]); > > -- printf("\n"); > > -+ debug_more("%x ", in[i]); > > -+ debug_more("\n"); > > - } > > - > > -- > > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > > -- printf("ERROR: Handler Failed.\n"); > > -+ if (guest_id == -1) { > > -+ guest_id = *((uint32_t *) in); > > -+ } else { > > -+ if (guest_id != *((uint32_t *) in) ) { > > -+ error("WARNING: More than one guest attached\n"); > > -+ } > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+#ifdef VTPM_MUTLI_VM > > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > > -+ vtpm_rx_fh = vtpm_tx_fh; > > -+#else > > -+ if (type == VTPM_TYPE_PVM) { > > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > > -+ } // No need to open the other direction for HVM > > -+#endif > > -+ } > > -+ > > -+ if (vtpm_tx_fh < 0) { > > -+ error("Failed to open devices to respond to guest.\n"); > > -+ return -1; > > -+ } > > -+ > > -+ // Handle the command, but skip the domain id header > > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > > -+ error("Handler Failed.\n"); > > - } > > - > > -- written = write(tpm_tx_fh, out, out_size); > > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > > -+ > > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > > - > > -- if (written != out_size ) { > > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > > -+ if (written != out_size + sizeof(uint32_t)) { > > -+ error("Part of response not written %d/%d.\n", written, out_size); > > - } else { > > -- printf("Sent[%Zu]: ", out_size); > > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > > -+ debug_more("%x ", addressed_out[i]); > > -+ debug_more("\n"); > > - } > > -- for (i=0; i< out_size; i++) > > -- printf("%x ", out[i]); > > -- printf("\n"); > > - tpm_free(out); > > -+ tpm_free(addressed_out); > > - > > - } // loop > > - > > - tpm_emulator_shutdown(); > > - > > -- close(tpm_tx_fh); > > -- close(tpm_rx_fh); > > -+ close(vtpm_tx_fh); > > -+#ifndef VTPM_MUTLI_VM > > -+ close(vtpm_rx_fh); > > -+ free (vtpm_rx_file); > > -+#endif > > - > > - } > > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > > deleted file mode 100644 > > index c4b86b7..0000000 > > --- a/tools/vtpm_manager/COPYING > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > > deleted file mode 100644 > > index 632f41b..0000000 > > --- a/tools/vtpm_manager/Makefile > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../.. > > - > > -# Base definitions and rules > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -SUBDIRS = crypto tcs util manager migration > > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > > - > > -.PHONY: all clean install > > -all clean install: %: subdirs-% > > - > > -.PHONY: mrproper > > -mrproper: > > - @set -e; for subdir in $(SUBDIRS); do \ > > - $(MAKE) -C $$subdir $@; \ > > - done > > - > > - > > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > > deleted file mode 100644 > > index f0d1e98..0000000 > > --- a/tools/vtpm_manager/README > > +++ /dev/null > > @@ -1,94 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -Directory Structure > > -=================== > > -tools/vtpm_manager/crypto -> crypto files > > -tools/vtpm_manager/TCS -> TCS implementation > > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > > -tools/vtpm_manager/manager -> VTPM Manager > > - > > -Compile Flags > > -=================== > > -LOGGING_MODULES -> How extensive logging happens > > - see util/log.h for more info > > - > > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > > - Not Defined (default): VTPMs are processes > > - > > -# Debugging flags that may disappear without notice in the future > > - > > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > > - /tmp/out.fifo rather than backend > > - > > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > > - > > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > > - use a well known value. This is useful for debugging and for > > - poor bios which do not support clearing TPM if OwnerAuth is > > - lost. However this has no protection from malicious app > > - issuing a TPM_OwnerClear to wipe the TPM > > - > > -Requirements > > -============ > > -- xen-unstable > > -- vtpm frontend/backend driver patch > > -- OpenSSL Library > > - > > -Single-VM Flow > > -============================ > > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > > -- VTPM Manager listens to TPM BE. > > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > > -- When the manager receives the open message from the BE, it launches a vtpm > > -- Xend allows the VM to continue booting. > > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > > -- The fifo listener begins listening for the reply from vtpm for the request. > > -- Vtpm processes request and replies to manager over shared named fifo. > > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > > - > > -NOTES: > > -* SaveService SHOULD seal it's table before saving it to disk. However, > > - the current Xen infrastructure does not provide a mechanism for this to be > > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > > - to the service, or it's not even worth encrypting > > - > > - In the future the vtpm manager will be protected by an early boot mechanism > > - that will allow for better protection of it's data. > > - > > -TODO: > > -- Timeout on crashed vtpms > > -- create lock for shared fifo for talking to vtpms. > > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > > deleted file mode 100644 > > index 651772b..0000000 > > --- a/tools/vtpm_manager/Rules.mk > > +++ /dev/null > > @@ -1,59 +0,0 @@ > > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > > -include $(XEN_ROOT)/tools/Rules.mk > > - > > -# > > -# Tool definitions > > -# > > - > > -# General compiler flags > > -CFLAGS = -Werror -g3 > > - > > -# Generic project files > > -HDRS = $(wildcard *.h) > > -SRCS = $(wildcard *.c) > > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > > - > > -# Generic (non-header) dependencies > > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -$(OBJS): $(SRCS) > > - > > --include $(FILES) > > - > > -# Make sure these are just rules > > -.PHONY : all build install clean > > - > > -# > > -# Project-specific definitions > > -# > > - > > -# Need UNIX98 spec for pthread rwlocks > > -CFLAGS += -D_GNU_SOURCE > > - > > -# Logging Level. See utils/tools.h for usage > > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > > - > > -# Silent Mode > > -#CFLAGS += -DLOGGING_MODULES=0x0 > > -#CFLAGS += -DLOGGING_MODULES=0xff > > - > > -# Use frontend/backend pairs between manager & DMs? > > -#CFLAGS += -DVTPM_MULTI_VM > > - > > -# vtpm_manager listens on fifo's rather than backend > > -#CFLAGS += -DDUMMY_BACKEND > > - > > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > > -#CFLAGS += -DDUMMY_TPM > > - > > -# Do not have manager launch DMs. > > -#CFLAGS += -DMANUAL_DM_LAUNCH > > - > > -# Fixed OwnerAuth > > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > > - > > -# Include > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > > deleted file mode 100644 > > index 13b61c9..0000000 > > --- a/tools/vtpm_manager/crypto/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libtcpaCrypto.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > > deleted file mode 100644 > > index 7dae655..0000000 > > --- a/tools/vtpm_manager/crypto/crypto.c > > +++ /dev/null > > @@ -1,88 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// crypto.c > > -// > > -// This file will handle all the TPM Crypto functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include "crypto.h" > > -#include "log.h" > > - > > -/** > > - * Initialize cryptography library > > - * @rand: random seed > > - * @size: size of @rand > > - */ > > -void Crypto_Init(const BYTE* rand, int size) { > > - ERR_load_crypto_strings(); > > - CRYPTO_malloc_init(); > > - OpenSSL_add_all_algorithms(); > > - SYM_CIPHER = EVP_aes_128_cbc(); > > - RAND_poll(); > > - if (rand == NULL) > > - return; > > - > > - RAND_add(rand, size, size); > > -} > > - > > -/** > > - * Shutdown cryptography library > > - */ > > -void Crypto_Exit() { > > - ERR_free_strings(); > > - ERR_remove_state(0); > > - EVP_cleanup(); > > -} > > - > > - > > -/** > > - * Get random data > > - * @data: (OUT) Random data > > - * @size: Size of @data > > - */ > > -void Crypto_GetRandom(void* data, int size) { > > - int result; > > - > > - result = RAND_pseudo_bytes((BYTE*) data, size); > > - > > - if (result <= 0) > > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > > - ERR_error_string (ERR_get_error(), NULL)); > > -} > > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > > deleted file mode 100644 > > index 488d4d6..0000000 > > --- a/tools/vtpm_manager/crypto/crypto.h > > +++ /dev/null > > @@ -1,175 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// crypto.h > > -// > > -// This file defines the TPM Crypto API > > -// > > -// ================================================================== > > - > > -#ifndef __CRYPTO_H__ > > -#define __CRYPTO_H__ > > - > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "sym_crypto.h" > > - > > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > > - > > -#define OAEP_P "TCPA" > > -#define OAEP_P_SIZE 4 > > - > > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > > -#define CRYPTO_ALGORITH_RSA 0x01 > > - > > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > > -#define CRYPTO_ES_NONE 0x0001 > > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > > - > > -// Supported Signature schemes CRYPTO_INFO.sigScheme > > -#define CRYPTO_SS_NONE 0x0001 > > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > > - > > -typedef struct CRYPTO_INFO { > > - void *keyInfo; > > - UINT32 algorithmID; > > - UINT32 encScheme; > > - UINT32 sigScheme; > > -} CRYPTO_INFO; > > - > > - > > -void Crypto_Init(const BYTE* rand, int size); > > - > > -void Crypto_Exit(); > > - > > -void Crypto_GetRandom(void* data, int size); > > - > > -void Crypto_HMAC( const BYTE* text, > > - int text_len, > > - const BYTE* key, > > - int key_len, > > - BYTE* digest); > > - > > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > > - const buffer_t * key, > > - BYTE * o_digest); /* presumably of 20 bytes */ > > - > > -void Crypto_SHA1Full( const BYTE* text, > > - UINT32 size, > > - BYTE* hash); //Complete 3part SHA1 > > - > > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > > - BYTE * o_hash); > > - > > -void Crypto_SHA1Start(UINT32* maxNumBytes); > > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > > -void Crypto_SHA1Complete( int hashDataSize, > > - const BYTE* hashData, > > - BYTE* hashValue); > > - > > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > > - /*in*/ UINT32 pubExpSize, > > - /*in*/ BYTE *pubExp, > > - /*out*/ UINT32 *privExpSize, > > - /*out*/ BYTE *privExp, > > - /*out*/ UINT32 *modulusSize, > > - /*out*/ BYTE *modulus, > > - /*out*/ CRYPTO_INFO *keys); > > - > > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 privExpSize, > > - /*[IN]*/ BYTE *privExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > > - > > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo); > > - > > -// > > -// symmetric pack and unpack operations > > -// > > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > > - BYTE ** io_buf, UINT32 * io_buflen); > > - > > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > > - BYTE * in, UINT32 len, > > - UINT32 * o_lenread); > > - > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData); > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSADec( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData); > > - > > -// return 0 on success, -1 on error > > -int Crypto_RSASign( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *sigSize, > > - /*out*/ BYTE *sig); > > - > > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > > - UINT32 inDataSize, > > - BYTE *inData, > > - UINT32 sigSize, > > - BYTE *sig); > > - > > -//private: > > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > > - > > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > > - > > -#endif // __CRYPTO_H__ > > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > > deleted file mode 100644 > > index c73114a..0000000 > > --- a/tools/vtpm_manager/crypto/hash.c > > +++ /dev/null > > @@ -1,153 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// hash.c > > -// > > -// This file will handle all the TPM Hash functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" // for TPM_SUCCESS > > -#include "crypto.h" > > - > > -static SHA_CTX g_shaContext; > > - > > -void Crypto_HMAC( const BYTE* text, > > - int text_len, > > - const BYTE* key, > > - int key_len, > > - BYTE* digest) { > > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > > - return; > > - > > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > > -} > > - > > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > > - const buffer_t * key, > > - BYTE * o_digest) { /* presumably of 20 bytes */ > > - > > - Crypto_HMAC (text->bytes, text->size, > > - key->bytes, key->size, > > - o_digest); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -/* > > - * SHA1 > > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > > - */ > > -void Crypto_SHA1Full( const BYTE* text, > > - uint32_t size, > > - BYTE* hash) { > > - > > - if (text == NULL || size == 0) > > - return; > > - > > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > > - uint32_t maxBytes; // Not used for anything > > - Crypto_SHA1Start(&maxBytes); > > - > > - while (size > 64){ > > - Crypto_SHA1Update(64, text); > > - size -= 64; > > - text += 64; > > - } > > - > > - Crypto_SHA1Complete(size, text, hash); > > -} > > - > > -// same thing using buffer_t > > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > > - BYTE * o_digest) { > > - > > - if (buf->bytes == NULL || buf->size == 0) > > - return TPM_BAD_PARAMETER; > > - > > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -/* > > - * Initialize SHA1 > > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > > - * Must be a multiple of 64 bytes. > > - */ > > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > > - int max = SHA_CBLOCK; > > - // Initialize the crypto library > > - SHA1_Init(&g_shaContext); > > - *maxNumBytes = max; > > -} > > - > > -/* > > - * Process SHA1 > > - * @numBytes: (IN) The number of bytes in hashData. > > - * Must be a multiple of 64 bytes. > > - * @hashData: (IN) Bytes to be hashed. > > - */ > > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > > - > > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > > - return; > > - > > - SHA1_Update(&g_shaContext, hashData, numBytes); > > -} > > - > > -/* > > - * Complete the SHA1 process > > - * @hashDataSize: (IN) Number of bytes in hashData. > > - * Must be a multiple of 64 bytes. > > - * @hashData: (IN) Final bytes to be hashed. > > - * @hashValue: (OUT) The output of the SHA-1 hash. > > - */ > > -void Crypto_SHA1Complete(int hashDataSize, > > - const BYTE* hashData, > > - BYTE* hashValue) { > > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > > - SHA1_Final(hashValue, &g_shaContext); > > -} > > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > > deleted file mode 100644 > > index 7737dc6..0000000 > > --- a/tools/vtpm_manager/crypto/rsa.c > > +++ /dev/null > > @@ -1,434 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// rsa.c > > -// > > -// This file will handle all the TPM RSA crypto functionality > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "crypto.h" > > -#include "log.h" > > - > > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > > - /*in*/ UINT32 pubExpSize, > > - /*in*/ BYTE *pubExp, > > - /*out*/ UINT32 *privExpSize, > > - /*out*/ BYTE *privExp, > > - /*out*/ UINT32 *modulusSize, > > - /*out*/ BYTE *modulus, > > - /*out*/ CRYPTO_INFO *keys) { > > - unsigned long e_value; > > - > > - if (pubExpSize == 0) // Default e = 2^16+1 > > - e_value = (0x01 << 16) + 1; > > - else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - e_value = (0x01 << 16) + 1; > > - } > > - > > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > > - > > - if (keys) { > > - keys->keyInfo = rsa; > > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > > - } > > - > > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > > -} > > - > > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > > -// If pubExp info is NULL, use TCG default. > > -// If there is a remainder while calculating the privExp, return FALSE. > > - > > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 privExpSize, > > - /*[IN]*/ BYTE *privExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo) { > > - cryptoInfo->keyInfo = RSA_new(); > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - rsa->e = BN_new(); > > - > > - if (pubExpSize == 0) { // Default e = 2^16+1 > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } > > - > > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > > -} > > - > > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > > -// If pubExp info is NULL, use TCG default. > > -// If there is a remainder while calculating the privExp, return FALSE. > > - > > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > > - /*[IN]*/ BYTE *pubExp, > > - /*[IN]*/ UINT32 modulusSize, > > - /*[IN]*/ BYTE *modulus, > > - CRYPTO_INFO* cryptoInfo) { > > - cryptoInfo->keyInfo = RSA_new(); > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - rsa->e = BN_new(); > > - > > - if (pubExpSize == 0) { // Default e = 2^16+1 > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } else { > > - // This is not supported, but the following line MIGHT work > > - // under then assumption that the format is BigNum compatable > > - // Though it's not in the spec, so who knows what it is. > > - // Forcing the default. > > - //BN_bin2bn(pubExp, pubExpSize, NULL); > > - BN_set_bit(rsa->e, 16); > > - BN_set_bit(rsa->e, 0); > > - } > > - > > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > > - > > -} > > - > > -int Crypto_RSAEnc( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData) { > > - RSA *rsa = (RSA *) key->keyInfo; > > - UINT32 paddedDataSize = RSA_size (rsa); > > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > > - int rc; > > - > > - if (paddedData == NULL) > > - return -1; > > - > > - *outDataSize = 0; > > - > > - switch (key->encScheme) { > > - case CRYPTO_ES_RSAESPKCSv15: > > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > > - rc = -1; > > - goto abort_egress; > > - } > > - break; > > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > > - rc = -1; > > - goto abort_egress; > > - } > > - break; > > - default: > > - rc = -1; > > - goto abort_egress; > > - } > > - > > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > > - if (rc == -1) > > - goto abort_egress; > > - > > - *outDataSize = rc; > > - > > - if (rc > 0) rc = 0; > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (paddedData) > > - free (paddedData); > > - return rc; > > - > > -} > > - > > -int Crypto_RSADec( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *outDataSize, > > - /*out*/ BYTE *outData) { > > - > > - RSA *rsa = (RSA *) key->keyInfo; > > - UINT32 paddedDataSize = RSA_size (rsa); > > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > > - int rc; > > - > > - if (paddedData == NULL) > > - goto abort_egress; > > - > > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - > > - paddedDataSize = rc; > > - > > - switch (key->encScheme) { > > - case CRYPTO_ES_RSAESPKCSv15: > > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > > - paddedData + 1, paddedDataSize - 1, > > - RSA_size(rsa)); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > > - ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - *outDataSize = rc; > > - break; > > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > > - paddedData + 1, paddedDataSize - 1, > > - RSA_size(rsa), > > - (BYTE *) OAEP_P, OAEP_P_SIZE); > > - if (rc == -1) { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > > - ERR_error_string(ERR_get_error(), NULL)); > > - goto abort_egress; > > - } > > - *outDataSize = rc; > > - break; > > - default: > > - *outDataSize = 0; > > - } > > - > > - free(paddedData); paddedData = NULL; > > - goto egress; > > - > > - abort_egress: > > - > > - if (paddedData) > > - free (paddedData); > > - return -1; > > - > > - egress: > > - return 0; > > -} > > - > > -// Signs either a SHA1 digest of a message or a DER encoding of a message > > -// Textual messages MUST be encoded or Hashed before sending into this function > > -// It will NOT SHA the message. > > -int Crypto_RSASign( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - /*out*/ UINT32 *sigSize, > > - /*out*/ BYTE *sig) { > > - int status; > > - unsigned int intSigSize; > > - > > - switch(key->sigScheme) { > > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > > - break; > > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > > - status = 0; > > - break; > > - default: > > - status = 0; > > - } > > - > > - if (status == 0) { > > - *sigSize = 0; > > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > > - return -1; > > - } > > - > > - *sigSize = (UINT32) intSigSize; > > - return 0; > > -} > > - > > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > > - UINT32 inDataSize, > > - BYTE *inData, > > - UINT32 sigSize, > > - BYTE *sig) { > > - int status; > > - > > - switch(key->sigScheme){ > > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > > - break; > > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > > - status = 0; > > - break; > > - default: > > - status = 0; > > - } > > - > > - if (status) > > - return(1); > > - else { > > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > > - return(0); > > - } > > - > > -} > > - > > -// helper which packs everything into a BIO! > > - > > -// packs the parameters first, then the private key, then the public key > > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > > -// *io_buflen > > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > > - BYTE ** io_buf, UINT32 * io_buflen) { > > - TPM_RESULT status = TPM_SUCCESS; > > - BYTE * buf; > > - long len, outlen = *io_buflen; > > - > > - const long PARAMSLEN = 3*sizeof(UINT32); > > - > > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > > - > > - BIO *mem = BIO_new(BIO_s_mem()); > > - > > - > > - // write the openssl keys to the BIO > > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_SIZE); > > - } > > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_SIZE); > > - } > > - > > - // get the buffer out > > - len = BIO_get_mem_data (mem, &buf); > > - > > - // see if we need to allocate a return buffer > > - if (*io_buf == NULL) { > > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > > - if (*io_buf == NULL) > > - ERRORDIE (TPM_SIZE); > > - } else { // *io_buf is already allocated > > - if (outlen < len + PARAMSLEN) > > - ERRORDIE (TPM_SIZE); // but not large enough! > > - } > > - > > - // copy over the parameters (three UINT32's starting at algorithmID) > > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > > - > > - // copy over the DER keys > > - memcpy (*io_buf + PARAMSLEN, buf, len); > > - > > - *io_buflen = len + PARAMSLEN; > > - > > - goto egress; > > - > > - > > - abort_egress: > > - egress: > > - > > - BIO_free (mem); > > - > > - return status; > > -} > > - > > - > > - > > -// sets up ci, and returns the number of bytes read in o_lenread > > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > > - BYTE * in, UINT32 len, > > - UINT32 * o_lenread) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - long l; > > - BIO *mem; > > - RSA *rsa; > > - > > - // first load up the params > > - l = 3 * sizeof(UINT32); > > - memcpy (&ci->algorithmID, in, l); > > - len -= l; > > - in += l; > > - > > - // and now the openssl keys, private first > > - mem = BIO_new_mem_buf (in, len); > > - > > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_BAD_PARAMETER); > > - } > > - // now use the same RSA object and fill in the private key > > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > > - ERR_print_errors_fp (stderr); > > - ERRORDIE (TPM_BAD_PARAMETER); > > - } > > - > > - ci->keyInfo = rsa; // needs to be freed somehow later > > - > > - // FIXME: havent figured out yet how to tell how many bytes were read in the > > - // above oprations! so o_lenread is not set > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - BIO_free (mem); > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > > deleted file mode 100644 > > index 3d86e19..0000000 > > --- a/tools/vtpm_manager/crypto/sym_crypto.c > > +++ /dev/null > > @@ -1,237 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// sym_crypto.c > > -// > > -// Symmetric crypto portion of crypto > > -// > > -// ================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "sym_crypto.h" > > - > > -typedef enum crypt_op_type_t { > > - CRYPT_ENCRYPT, > > - CRYPT_DECRYPT > > -} crypt_op_type_t; > > - > > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > > - const buffer_t* in, > > - const buffer_t* iv, > > - buffer_t * out, > > - crypt_op_type_t optype); > > - > > - > > -// this is initialized in Crypto_Init() > > -const EVP_CIPHER * SYM_CIPHER = NULL; > > - > > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > > - > > - > > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - EVP_CIPHER_CTX_init (&key->context); > > - > > - key->cipher = SYM_CIPHER; > > - > > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > > - > > - goto egress; > > - > > - abort_egress: > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > > - int res; > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // hmm, EVP_CIPHER_CTX_init does not return a value > > - EVP_CIPHER_CTX_init (&key->context); > > - > > - key->cipher = SYM_CIPHER; > > - > > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > > - > > - // and generate the key material > > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > > - if (res < 0) > > - ERRORDIE (TPM_SHORTRANDOM); > > - > > - > > - goto egress; > > - > > - abort_egress: > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - buffer_free (&key->key); > > - > > - egress: > > - return status; > > -} > > - > > - > > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > > - const buffer_t* clear, > > - buffer_t* o_cipher) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t iv, cipher_alias; > > - > > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > > - > > - buffer_init (o_cipher, > > - clear->size + > > - EVP_CIPHER_iv_length(key->cipher) + > > - EVP_CIPHER_block_size (key->cipher), > > - 0); > > - > > - // copy the IV into the front > > - buffer_copy (o_cipher, &iv); > > - > > - // make an alias into which we'll put the ciphertext > > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > > - > > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > > - > > - // set the output size correctly > > - o_cipher->size += cipher_alias.size; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > - > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > > - const buffer_t* cipher, > > - buffer_t* o_clear) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t iv, cipher_alias; > > - > > - // alias for the IV > > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > > - > > - // make an alias to where the ciphertext is, after the IV > > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > > - > > - // prepare the output buffer > > - TPMTRYRETURN( buffer_init (o_clear, > > - cipher->size > > - - EVP_CIPHER_iv_length(key->cipher) > > - + EVP_CIPHER_block_size(key->cipher), > > - 0) ); > > - > > - // and decrypt > > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > > - > > - goto egress; > > - > > - abort_egress: > > - buffer_free (o_clear); > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > - > > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > > - buffer_memset (&key->key, 0); > > - buffer_free (&key->key); > > - > > - EVP_CIPHER_CTX_cleanup (&key->context); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > > - const buffer_t* in, > > - const buffer_t* iv, > > - buffer_t * out, > > - crypt_op_type_t optype) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - int inlen, outlen; > > - tpm_size_t running; > > - > > - if ( ! EVP_CipherInit_ex (&key->context, > > - key->cipher, NULL, key->key.bytes, iv->bytes, > > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > > - ERRORDIE (TPM_FAIL); > > - > > - > > - > > - inlen = in->size; > > - > > - outlen = 0; > > - running = 0; > > - > > - > > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > > - ERRORDIE (TPM_FAIL); > > - > > - running += outlen; > > - > > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > > - ERRORDIE (TPM_FAIL); > > - > > - running += outlen; > > - > > - out->size = running; > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > > deleted file mode 100644 > > index 7fb59a8..0000000 > > --- a/tools/vtpm_manager/crypto/sym_crypto.h > > +++ /dev/null > > @@ -1,72 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// sym_crypto.h > > -// > > -// Symmetric Crypto > > -// > > -// ================================================================== > > - > > -#ifndef _SYM_CRYPTO_H > > -#define _SYM_CRYPTO_H > > - > > -#include > > -#include "buffer.h" > > - > > -typedef struct symkey_t { > > - buffer_t key; > > - > > - EVP_CIPHER_CTX context; > > - const EVP_CIPHER * cipher; > > -} symkey_t; > > - > > -extern const EVP_CIPHER * SYM_CIPHER; > > - > > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > > - > > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > > - > > - > > -// these functions will allocate their output buffers > > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > > - const buffer_t* clear, > > - buffer_t* o_cipher); > > - > > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > > - const buffer_t* cipher, > > - buffer_t* o_clear); > > - > > -// only free the internal parts, not the 'key' ptr > > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > > - > > -#endif /* _SYM_CRYPTO_H */ > > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > > deleted file mode 100644 > > index a33c18a..0000000 > > --- a/tools/vtpm_manager/manager/Makefile > > +++ /dev/null > > @@ -1,38 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = vtpm_managerd > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > > - fi > > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > > - fi > > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > > - > > -.PHONY: clean > > -clean: > > - rm -f $(BIN) > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -# libraries > > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > > -CFLAGS += $(PTHREAD_CFLAGS) > > -LDFLAGS += $(PTHREAD_LDFLAGS) > > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > > deleted file mode 100644 > > index 5c3cf7e..0000000 > > --- a/tools/vtpm_manager/manager/dmictl.c > > +++ /dev/null > > @@ -1,266 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// dmictl.c > > -// > > -// Functions for creating and destroying DMIs > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpmpriv.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "vtpm_ipc.h" > > - > > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > > - > > -// if dmi_res is non-null, then return a pointer to new object. > > -// Also, this does not fill in the measurements. They should be filled by > > -// design dependent code or saveNVM > > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > > - > > - TPM_RESULT status=TPM_SUCCESS; > > - VTPM_DMI_RESOURCE *new_dmi=NULL; > > - UINT32 *dmi_id_key=NULL; > > - > > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > > - new_dmi->dmi_id = dmi_id; > > - new_dmi->dmi_type = dmi_type; > > - new_dmi->connected = FALSE; > > - new_dmi->TCSContext = 0; > > - > > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > > - > > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - *dmi_id_key = new_dmi->dmi_id; > > - > > - // install into map > > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - > > - if (dmi_res) > > - *dmi_res = new_dmi; > > - > > - goto egress; > > - > > - abort_egress: > > - if (new_dmi) { > > - free(new_dmi->NVMLocation); > > - free(new_dmi); > > - } > > - free(dmi_id_key); > > - > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > > - if (dmi_res == NULL) > > - return TPM_SUCCESS; > > - > > - if (dmi_res->dmi_id == VTPM_CTL_DM) > > - return(TPM_BAD_PARAMETER); > > - > > - TCS_CloseContext(dmi_res->TCSContext); > > - dmi_res->connected = FALSE; > > - > > - vtpm_globals->connected_dmis--; > > - > > - return (VTPM_Close_DMI_Extra(dmi_res) ); > > -} > > - > > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > > - > > - VTPM_DMI_RESOURCE *new_dmi=NULL; > > - TPM_RESULT status=TPM_FAIL; > > - BYTE dmi_type, vm_type, startup_mode; > > - UINT32 dmi_id; > > - > > - if (param_buf == NULL) { // Assume creation of Dom 0 control > > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > > - dmi_id = VTPM_CTL_DM; > > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } else { > > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > > - BSG_UnpackList( param_buf->bytes, 4, > > - BSG_TYPE_BYTE, &dmi_type, > > - BSG_TYPE_BYTE, &startup_mode, > > - BSG_TYPE_BYTE, &vm_type, > > - BSG_TYPE_UINT32, &dmi_id); > > - } > > - > > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (new_dmi == NULL) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > > - // Brand New DMI. Initialize the persistent pieces > > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > > - } else > > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > > - > > - if (new_dmi->connected) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Initialize the Non-persistent pieces > > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > > - > > - new_dmi->connected = TRUE; > > - > > - // Design specific new DMI code. > > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > > - close_dmi(new_dmi ); > > - > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *dmi_res=NULL; > > - UINT32 dmi_id; > > - > > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - BSG_UnpackList( param_buf->bytes, 1, > > - BSG_TYPE_UINT32, &dmi_id); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > > - > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (dmi_res == NULL ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (!dmi_res->connected) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Close Dmi > > - TPMTRYRETURN(close_dmi( dmi_res )); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *dmi_res=NULL; > > - UINT32 dmi_id; > > - > > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - BSG_UnpackList( param_buf->bytes, 1, > > - BSG_TYPE_UINT32, &dmi_id); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > > - > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > > - if (dmi_res == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - //vtpm scripts delete file dmi_res->NVMLocation for us > > - > > - // Close DMI first > > - TPMTRYRETURN(close_dmi( dmi_res )); > > - free ( dmi_res ); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > > deleted file mode 100644 > > index 54da708..0000000 > > --- a/tools/vtpm_manager/manager/migration.c > > +++ /dev/null > > @@ -1,307 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// dmictl.c > > -// > > -// Functions for creating and destroying DMIs > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpmpriv.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "hashtable.h" > > - > > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > > - UINT32 dmi_id; > > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > > - > > - if (param_buf == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - struct pack_buf_t enc_dmi_state_pack; > > - > > - BSG_UnpackList(param_buf->bytes, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > > - > > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (mig_dmi) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** UnBind Blob **/ > > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > > - enc_dmi_state_pack.size, > > - enc_dmi_state_pack.data) ); > > - > > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > > - vtpm_globals->manager_tcs_handle, > > - vtpm_globals->storageKeyHandle, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - &clear_dmi_blob) ); > > - > > - // Create new dmi > > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > > - > > - /** Open Blob **/ > > - struct pack_buf_t dmi_state_pack; > > - > > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > > - > > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > > - dmi_state_pack.size, > > - dmi_state_pack.data) ); > > - > > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > > - > > - egress: > > - buffer_free(&clear_dmi_blob); > > - buffer_free(&dmi_state_abuf); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_DMI_RESOURCE *mig_dmi; > > - UINT32 dmi_id; > > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > > - > > - if (param_buf == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - struct pack_buf_t name_pack; > > - > > - BSG_UnpackList( param_buf->bytes, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_SIZE32_DATA, &name_pack); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > > - > > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > > - if (mig_dmi == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** Find migration key for dest **/ > > - last_mig = NULL; > > - mig_key = vtpm_globals->mig_keys; > > - while (mig_key != NULL) { > > - if (mig_key->name_size == name_pack.size) > > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > > - break; > > - } > > - > > - last_mig = mig_key; > > - mig_key = mig_key->next; > > - } > > - > > - if (!mig_key) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /** Mark vtpm as migrated **/ > > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > > - > > - /** Build Blob **/ > > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > > - > > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > > - > > - struct pack_constbuf_t dmi_state_pack; > > - > > - dmi_state_pack.size = buffer_len(&dmi_state); > > - dmi_state_pack.data = dmi_state.bytes; > > - > > - BSG_PackList(clear_dmi_blob.bytes, 2, > > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > > - > > - /** Bind Blob **/ > > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > > - &mig_key->key, > > - result_buf) ); > > - > > - if (last_mig) > > - last_mig->next = mig_key->next; > > - else > > - vtpm_globals->mig_keys = mig_key->next; > > - > > - free(mig_key->name); > > - free(mig_key); > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > > - > > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > > - > > - egress: > > - > > - buffer_free(&clear_dmi_blob); > > - buffer_free(&dmi_state); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > > - > > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > > - TPM_KEY mig_key; > > - > > - // Unpack/return key structure > > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - mig_key.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > > - pubkey_exp_pack.data = rsaKeyParms.exponent; > > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > > - pubkey_mod_pack.data = mig_key.pubKey.key; > > - > > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > > - pubkey_exp_pack.size + > > - pubkey_mod_pack.size, NULL ) ); > > - > > - BSG_PackList( result_buf->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > > - > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf) { > > - > > - TPM_RESULT status=TPM_FAIL; > > - VTPM_MIGKEY_LIST *mig_key; > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > > - > > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > > - > > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > > - > > - //FIXME: scan list and verify name is not already in the list > > - > > - BSG_UnpackList( param_buf->bytes, 3, > > - BSG_TPM_SIZE32_DATA, &name_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > > - > > - //TODO: Maintain a persistent list for pub_keys. > > - //TODO: Verify pub_key is trusted > > - > > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > > - mig_key->name_size = name_pack.size; > > - mig_key->name = name_pack.data; > > - > > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > > - pubkey_exp_pack.data, > > - pubkey_mod_pack.size, > > - pubkey_mod_pack.data, > > - &mig_key->key); > > - > > - > > - mig_key->next = vtpm_globals->mig_keys; > > - vtpm_globals->mig_keys = mig_key; > > - > > - // free(name_pack.data); Do not free. data is now part of mig_key. > > - free(pubkey_exp_pack.data); > > - free(pubkey_mod_pack.data); > > - > > - return TPM_SUCCESS; > > -} > > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > > deleted file mode 100644 > > index d5e6ffd..0000000 > > --- a/tools/vtpm_manager/manager/securestorage.c > > +++ /dev/null > > @@ -1,512 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// securestorage.c > > -// > > -// Functions regarding securely storing DMI secrets. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "crypto.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "buffer.h" > > -#include "log.h" > > - > > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > > - CRYPTO_INFO *asymkey, > > - buffer_t *sealed_data) { > > - TPM_RESULT status = TPM_SUCCESS; > > - symkey_t symkey; > > - buffer_t data_cipher = NULL_BUF, > > - symkey_cipher = NULL_BUF; > > - > > - UINT32 i; > > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > > - for (i=0; i< buffer_len(inbuf); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - // Generate a sym key and encrypt state with it > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > > - > > - // Encrypt symmetric key > > - TPMTRYRETURN( VTSP_Bind( asymkey, > > - &symkey.key, > > - &symkey_cipher) ); > > - > > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > > - > > - symkey_cipher32.size = buffer_len(&symkey_cipher); > > - symkey_cipher32.data = symkey_cipher.bytes; > > - > > - data_cipher32.size = buffer_len(&data_cipher); > > - data_cipher32.data = data_cipher.bytes; > > - > > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > > - > > - BSG_PackList(sealed_data->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > > - BSG_TPM_SIZE32_DATA, &data_cipher32); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > > - for (i=0; i< buffer_len(sealed_data); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > > - > > - egress: > > - > > - buffer_free ( &data_cipher); > > - buffer_free ( &symkey_cipher); > > - Crypto_symcrypto_freekey (&symkey); > > - > > - return status; > > -} > > - > > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > > - TCS_CONTEXT_HANDLE TCSContext, > > - TPM_HANDLE keyHandle, > > - const TPM_AUTHDATA *key_usage_auth, > > - buffer_t *unsealed_data) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - symkey_t symkey; > > - buffer_t data_cipher = NULL_BUF, > > - symkey_clear = NULL_BUF, > > - symkey_cipher = NULL_BUF; > > - struct pack_buf_t symkey_cipher32, data_cipher32; > > - int i; > > - > > - memset(&symkey, 0, sizeof(symkey_t)); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > > - for (i=0; i< buffer_len(cipher); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - BSG_UnpackList(cipher->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > > - BSG_TPM_SIZE32_DATA, &data_cipher32); > > - > > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > > - symkey_cipher32.size, > > - symkey_cipher32.data) ); > > - > > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > > - data_cipher32.size, > > - data_cipher32.data) ); > > - > > - // Decrypt Symmetric Key > > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > > - keyHandle, > > - &symkey_cipher, > > - key_usage_auth, > > - &symkey_clear, > > - &(vtpm_globals->keyAuth) ) ); > > - > > - // create symmetric key using saved bits > > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > > - > > - // Decrypt State > > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > > - for (i=0; i< buffer_len(unsealed_data); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > > - > > - egress: > > - buffer_free ( &data_cipher); > > - buffer_free ( &symkey_clear); > > - buffer_free ( &symkey_cipher); > > - Crypto_symcrypto_freekey (&symkey); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - int fh; > > - long bytes_written; > > - buffer_t sealed_NVM = NULL_BUF; > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > > - > > - TPMTRYRETURN( envelope_encrypt(inbuf, > > - &vtpm_globals->storageKey, > > - &sealed_NVM) ); > > - > > - // Write sealed blob off disk from NVMLocation > > - // TODO: How to properly return from these. Do we care if we return failure > > - // after writing the file? We can't get the old one back. > > - // TODO: Backup old file and try and recover that way. > > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - close(fh); > > - > > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > > - > > - egress: > > - buffer_free(&sealed_NVM); > > - return status; > > -} > > - > > - > > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - buffer_t sealed_NVM = NULL_BUF; > > - long fh_size; > > - int fh, stat_ret, i; > > - struct stat file_stat; > > - TPM_DIGEST sealedNVMHash; > > - > > - if (myDMI->NVMLocation == NULL) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > > - status = TPM_AUTHFAIL; > > - goto abort_egress; > > - } > > - > > - //Read sealed blob off disk from NVMLocation > > - fh = open(myDMI->NVMLocation, O_RDONLY); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - fh_size = file_stat.st_size; > > - else { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - close(fh); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > > - > > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > > - > > - // Verify measurement of sealed blob. > > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > > - for (i=0; i< sizeof(TPM_DIGEST); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > > - for (i=0; i< sizeof(TPM_DIGEST); i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - status = TPM_AUTHFAIL; > > - goto abort_egress; > > - } > > - > > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > > - myDMI->TCSContext, > > - vtpm_globals->storageKeyHandle, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - outbuf) ); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > > - > > - egress: > > - buffer_free( &sealed_NVM ); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTPM_SaveManagerData(void) { > > - TPM_RESULT status=TPM_SUCCESS; > > - int fh, dmis=-1; > > - > > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > > - > > - struct hashtable_itr *dmi_itr; > > - VTPM_DMI_RESOURCE *dmi_res; > > - > > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > > - > > - // Initially fill these with buffer sizes for each data type. Later fill > > - // in actual size, once flattened. > > - boot_key_size = sizeof(UINT32) + // bootkeysize > > - bootKeySize; // boot key > > - > > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > > - 3*sizeof(TPM_DIGEST) + // Auths > > - sizeof(UINT32) +// storagekeysize > > - storageKeySize, NULL) ); // storage key > > - > > - > > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > > - > > - boot_key_size = BSG_PackList(flat_boot_key, 1, > > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > > - > > - BSG_PackList(clear_flat_global.bytes, 4, > > - BSG_TYPE_BYTE, &vtpm_manager_gen, > > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > > - > > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > > - &vtpm_globals->bootKey, > > - &enc_flat_global) ); > > - > > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > > - > > - // Per DMI values to be saved (if any exit) > > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > > - > > - flat_dmis = (BYTE *) malloc( > > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > > - > > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > > - do { > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > > - dmis++; > > - > > - // No need to save dmi0. > > - if (dmi_res->dmi_id == 0) > > - continue; > > - > > - > > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > > - > > - } while (hashtable_iterator_advance(dmi_itr)); > > - } > > - > > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > > - if (fh == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - free(flat_boot_key); > > - free(flat_enc); > > - buffer_free(&enc_flat_global); > > - free(flat_dmis); > > - close(fh); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > > - return status; > > -} > > - > > -TPM_RESULT VTPM_LoadManagerData(void) { > > - > > - TPM_RESULT status=TPM_SUCCESS; > > - int fh, stat_ret, dmis=0; > > - long fh_size = 0, step_size; > > - BYTE *flat_table=NULL; > > - buffer_t unsealed_data, enc_table_abuf; > > - struct pack_buf_t storage_key_pack, boot_key_pack; > > - UINT32 *dmi_id_key, enc_size; > > - BYTE vtpm_manager_gen; > > - > > - VTPM_DMI_RESOURCE *dmi_res; > > - UINT32 dmi_id; > > - BYTE dmi_type; > > - struct stat file_stat; > > - > > - TPM_HANDLE boot_key_handle; > > - TPM_AUTHDATA boot_usage_auth; > > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > > - > > - fh = open(STATE_FILE, O_RDONLY ); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - fh_size = file_stat.st_size; > > - else { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - flat_table = (BYTE *) malloc(fh_size); > > - > > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Read Boot Key > > - step_size = BSG_UnpackList( flat_table, 2, > > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > > - BSG_TYPE_UINT32, &enc_size); > > - > > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > > - > > - //Load Boot Key > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->bootKeyWrap, > > - &SRK_AUTH, > > - &boot_key_handle, > > - &vtpm_globals->keyAuth, > > - &vtpm_globals->bootKey, > > - FALSE) ); > > - > > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > > - vtpm_globals->manager_tcs_handle, > > - boot_key_handle, > > - (const TPM_AUTHDATA*) &boot_usage_auth, > > - &unsealed_data) ); > > - step_size += enc_size; > > - > > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > > - // Once there is more than one gen, this will include some compatability stuff > > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > > - } > > - > > - // Global Values needing to be saved > > - BSG_UnpackList( unsealed_data.bytes, 4, > > - BSG_TYPE_BYTE, &vtpm_manager_gen, > > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > > - > > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > > - > > - // Per DMI values to be saved > > - while ( step_size < fh_size ){ > > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > > - step_size = fh_size; > > - } else { > > - step_size += BSG_UnpackList(flat_table + step_size, 2, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TYPE_BYTE, &dmi_type); > > - > > - //TODO: Try and gracefully recover from problems. > > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > > - dmis++; > > - > > - step_size += BSG_UnpackList(flat_table + step_size, 2, > > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > > - } > > - > > - } > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > > - goto egress; > > - > > - abort_egress: > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > > - egress: > > - > > - free(flat_table); > > - close(fh); > > - > > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > > deleted file mode 100644 > > index 9b1e5f8..0000000 > > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > > +++ /dev/null > > @@ -1,110 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tpmpassthrough.c > > -// > > -// Functions regarding passing DMI requests to HWTPM > > -// > > -// ================================================================== > > - > > -#include "tcg.h" > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "log.h" > > - > > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > > - buffer_t *inbuf, > > - buffer_t *outbuf) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE *ord; > > - > > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > > - > > - switch (*ord) { > > - > > - // Forbidden for DMI use > > - case TPM_ORD_TakeOwnership: > > - case TPM_ORD_ChangeAuthOwner: > > - case TPM_ORD_DirWriteAuth: > > - case TPM_ORD_DirRead: > > - case TPM_ORD_AuthorizeMigrationKey: > > - case TPM_ORD_CreateMaintenanceArchive: > > - case TPM_ORD_LoadMaintenanceArchive: > > - case TPM_ORD_KillMaintenanceFeature: > > - case TPM_ORD_LoadManuMaintPub: > > - case TPM_ORD_ReadManuMaintPub: > > - case TPM_ORD_SelfTestFull: > > - case TPM_ORD_SelfTestStartup: > > - case TPM_ORD_CertifySelfTest: > > - case TPM_ORD_ContinueSelfTest: > > - case TPM_ORD_GetTestResult: > > - case TPM_ORD_Reset: > > - case TPM_ORD_OwnerClear: > > - case TPM_ORD_DisableOwnerClear: > > - case TPM_ORD_ForceClear: > > - case TPM_ORD_DisableForceClear: > > - case TPM_ORD_GetCapabilityOwner: > > - case TPM_ORD_OwnerSetDisable: > > - case TPM_ORD_PhysicalEnable: > > - case TPM_ORD_PhysicalDisable: > > - case TPM_ORD_SetOwnerInstall: > > - case TPM_ORD_PhysicalSetDeactivated: > > - case TPM_ORD_SetTempDeactivated: > > - case TPM_ORD_CreateEndorsementKeyPair: > > - case TPM_ORD_GetAuditEvent: > > - case TPM_ORD_GetAuditEventSigned: > > - case TPM_ORD_GetOrdinalAuditStatus: > > - case TPM_ORD_SetOrdinalAuditStatus: > > - case TPM_ORD_SetRedirection: > > - case TPM_ORD_FieldUpgrade: > > - case TSC_ORD_PhysicalPresence: > > - status = TPM_DISABLED_CMD; > > - goto abort_egress; > > - break; > > - > > - } // End ORD Switch > > - > > - // Call TCS with command > > - > > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > > - > > - goto egress; > > - > > - abort_egress: > > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > > - egress: > > - > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > > deleted file mode 100644 > > index 319dc83..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > > +++ /dev/null > > @@ -1,141 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_ipc.c Implements ipc routines using file io. This file can > > -// be replaced with other ipc types. > > -// > > -// =================================================================== > > - > > -#include > > -#include "vtpm_ipc.h" > > -#include "vtpmpriv.h" > > -#include "log.h" > > - > > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > > - ipc_h->name = name; > > - ipc_h->flags = flags; > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - > > - if (create) > > - return(vtpm_ipc_create(ipc_h)); > > - else > > - return 0; > > -} > > - > > -// Create the file that needs opening. Used only for FIFOs > > -// FYI: This may cause problems in other file IO schemes. We'll see. > > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > > - int fh; > > - struct stat file_info; > > - > > - if ((!ipc_h) || (!ipc_h->name)) > > - return -1; > > - > > - if ( stat(ipc_h->name, &file_info) == -1) { > > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > > - return -1; > > - } > > - } > > - > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - > > - return 0; > > -} > > - > > - > > -// Read size bytes. If FH isn't open, open it. > > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > > - vtpm_ipc_handle_t *my_ipc_h; > > - int result; > > - > > - if (ipc_h) { > > - my_ipc_h = ipc_h; > > - } else { > > - my_ipc_h = alt_ipc_h; > > - } > > - > > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > > - } > > - > > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > > - return -1; > > - } > > - > > - result = read(my_ipc_h->fh, bytes, size); > > - if (result < 0) { > > - my_ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > - return (result); > > -} > > - > > -// Write size bytes. If FH isn't open, open it. > > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > > - vtpm_ipc_handle_t *my_ipc_h; > > - int result; > > - > > - if (ipc_h) { > > - my_ipc_h = ipc_h; > > - } else { > > - my_ipc_h = alt_ipc_h; > > - } > > - > > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > > - } > > - > > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > > - return -1; > > - } > > - > > - result = write(my_ipc_h->fh, bytes, size); > > - if (result < 0) { > > - my_ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > - return (result); > > -} > > - > > -// Mark file as closed and try and close it. Errors not reported. > > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > > - > > - if (ipc_h) { > > - close(ipc_h->fh); > > - ipc_h->fh = VTPM_IPC_CLOSED; > > - } > > - > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > > deleted file mode 100644 > > index 529c4a2..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > > +++ /dev/null > > @@ -1,71 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > > -// and Guests or VTPMs > > -// > > -// =================================================================== > > - > > -#ifndef __VTPM_IO_H__ > > -#define __VTPM_IO_H__ > > - > > -#include "tcg.h" > > - > > -#define VTPM_IPC_CLOSED -1 > > - > > -// Represents an (somewhat) abstracted io handle. > > -typedef struct vtpm_ipc_handle_t { > > - int fh; // IO handle. > > - int flags; // Flags for opening. This may need to become > > - // a void *, but for now files use an int. > > - char *name; // Names for debugging as well as filenames > > - // for file-based io. > > -} vtpm_ipc_handle_t; > > - > > - > > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > > - > > -// Create the file that needs opening. Used only for FIFOs > > -// FYI: This may cause problems in other file IO schemes. We'll see. > > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > > - > > -// Read size bytes. If FH isn't open, open it. > > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > > - > > -// Write size bytes. If FH isn't open, open it. > > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > > - > > -// Mark file as closed and try and close it. Errors not reported. > > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > > - > > -#endif > > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > > deleted file mode 100644 > > index e737d60..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_lock.c > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > > -// > > -// =================================================================== > > - > > -#include > > -#include "vtpm_lock.h" > > - > > -static pthread_rwlock_t vtpm_lock; > > - > > -void vtpm_lock_init() { > > - > > - pthread_rwlock_init( &vtpm_lock, NULL); > > -} > > - > > -void vtpm_lock_destroy(){ > > - pthread_rwlock_destroy(&vtpm_lock); > > -} > > - > > -void vtpm_lock_rdlock(){ > > - pthread_rwlock_rdlock(&vtpm_lock); > > -} > > - > > -void vtpm_lock_wrlock(){ > > - pthread_rwlock_wrlock(&vtpm_lock); > > -} > > - > > -void vtpm_lock_unlock(){ > > - pthread_rwlock_unlock(&vtpm_lock); > > -} > > - > > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > > deleted file mode 100644 > > index 53a339d..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_lock.h > > +++ /dev/null > > @@ -1,48 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > > -// > > -// =================================================================== > > - > > -#ifndef __VTPM_LOCK_H__ > > -#define __VTPM_LOCK_H__ > > - > > -void vtpm_lock_init(); > > -void vtpm_lock_destroy(); > > - > > -void vtpm_lock_rdlock(); > > -void vtpm_lock_wrlock(); > > -void vtpm_lock_unlock(); > > - > > -#endif > > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > > deleted file mode 100644 > > index e089f78..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager.c > > +++ /dev/null > > @@ -1,285 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager.c > > -// > > -// This file will house the main logic of the VTPM Manager > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > - > > -#include "log.h" > > -#include "buffer.h" > > - > > -VTPM_GLOBALS *vtpm_globals=NULL; > > - > > -// --------------------------- Well Known Auths -------------------------- > > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > > - > > -#ifdef WELL_KNOWN_OWNER_AUTH > > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > > -#endif > > - > > - > > -// -------------------------- Hash table functions -------------------- > > - > > -static unsigned int hashfunc32(void *ky) { > > - return (* (UINT32 *) ky); > > -} > > - > > -static int equals32(void *k1, void *k2) { > > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > > -} > > - > > -// --------------------------- Functions ------------------------------ > > - > > -TPM_RESULT VTPM_Create_Manager(){ > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Generate Auth for Owner > > -#ifdef WELL_KNOWN_OWNER_AUTH > > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > > -#else > > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > > -#endif > > - > > - // Take Owership of TPM > > - CRYPTO_INFO ek_cryptoInfo; > > - > > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > > - > > - // If we can read PubEK then there is no owner and we should take it. > > - // We use the abilty to read the pubEK to flag that the TPM is owned. > > - // FIXME: Change to just trying to take ownership and react to the status > > - if (status == TPM_SUCCESS) { > > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > > - &SRK_AUTH, > > - &ek_cryptoInfo, > > - &vtpm_globals->keyAuth)); > > - > > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > > - &vtpm_globals->keyAuth)); > > - } else { > > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > > - } > > - > > - // Generate storage key's auth > > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > > - sizeof(TPM_AUTHDATA) ); > > - > > - TCS_AUTH osap; > > - TPM_AUTHDATA sharedsecret; > > - > > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > > - TPM_ET_KEYHANDLE, > > - TPM_SRK_KEYHANDLE, > > - &SRK_AUTH, > > - &sharedsecret, > > - &osap) ); > > - > > - osap.fContinueAuthSession = FALSE; > > - > > - > > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > > - TPM_KEY_BIND, > > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > > - TPM_SRK_KEYHANDLE, > > - (const TPM_AUTHDATA*)&sharedsecret, > > - &vtpm_globals->storageKeyWrap, > > - &osap) ); > > - > > - // Generate boot key's auth > > - TPM_AUTHDATA bootKeyWrapAuth; > > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > > - > > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > > - TPM_ET_KEYHANDLE, > > - TPM_SRK_KEYHANDLE, > > - &SRK_AUTH, > > - &sharedsecret, > > - &osap) ); > > - > > - osap.fContinueAuthSession = FALSE; > > - > > - // FIXME: This key protects the global secrets on disk. It should use TPM > > - // PCR bindings to limit its use to legit configurations. > > - // Current binds are open, implying a Trusted VM contains this code. > > - // If this VM is not Trusted, use measurement and PCR bindings. > > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > > - TPM_KEY_BIND, > > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > > - TPM_SRK_KEYHANDLE, > > - (const TPM_AUTHDATA*)&sharedsecret, > > - &vtpm_globals->bootKeyWrap, > > - &osap) ); > > - > > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->bootKeyWrap, > > - NULL, > > - NULL, > > - NULL, > > - &vtpm_globals->bootKey, > > - TRUE ) ); > > - > > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > > - goto egress; > > - > > - abort_egress: > > - exit(1); > > - > > - egress: > > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > > - return status; > > - > > -} > > - > > -/////////////////////////////////////////////////////////////////////////////// > > -TPM_RESULT VTPM_Init_Manager() { > > - TPM_RESULT status = TPM_FAIL, serviceStatus; > > - BYTE *randomsead; > > - UINT32 randomsize=256; > > - > > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > > - > > - vtpm_globals->connected_dmis = 0; > > - > > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > > - status = TPM_FAIL; > > - goto abort_egress; > > - } > > - > > - // Create new TCS Object > > - vtpm_globals->manager_tcs_handle = 0; > > - > > - TPMTRYRETURN(TCS_create()); > > - > > - // Create TCS Context for service > > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > > - > > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > > - &randomsize, > > - &randomsead)); > > - > > - Crypto_Init(randomsead, randomsize); > > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > > - > > - // Create OIAP session for service's authorized commands > > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > > - &vtpm_globals->keyAuth) ); > > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > > - > > - vtpm_globals->mig_keys = NULL; > > - > > - // If fails, create new Manager. > > - serviceStatus = VTPM_LoadManagerData(); > > - if (serviceStatus == TPM_IOERROR) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > > - TPMTRYRETURN( VTPM_Create_Manager() ); > > - TPMTRYRETURN( VTPM_SaveManagerData() ); > > - } else if (serviceStatus != TPM_SUCCESS) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > > - exit(1); > > - } > > - > > - //Load Storage Key > > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > > - TPM_SRK_KEYHANDLE, > > - &vtpm_globals->storageKeyWrap, > > - &SRK_AUTH, > > - &vtpm_globals->storageKeyHandle, > > - &vtpm_globals->keyAuth, > > - &vtpm_globals->storageKey, > > - FALSE ) ); > > - > > - // Create entry for Dom0 for control messages > > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return(status); > > -} > > - > > -/////////////////////////////////////////////////////////////////////////////// > > -void VTPM_Stop_Manager() { > > - VTPM_DMI_RESOURCE *dmi_res; > > - struct hashtable_itr *dmi_itr; > > - > > - // Close all the TCS contexts. TCS should evict keys based on this > > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > > - do { > > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > > - if (dmi_res->connected) > > - close_dmi( dmi_res ); // Not really interested in return code > > - > > - } while (hashtable_iterator_advance(dmi_itr)); > > - free (dmi_itr); > > - } > > - > > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > > - > > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > > - TCS_destroy(); > > - > > - hashtable_destroy(vtpm_globals->dmi_map, 1); > > - free(vtpm_globals); > > - > > - Crypto_Exit(); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > > -} > > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > > deleted file mode 100644 > > index a324a8f..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager.h > > +++ /dev/null > > @@ -1,150 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager.h > > -// > > -// Public Interface header for VTPM Manager > > -// > > -// ================================================================== > > - > > -#ifndef __VTPM_MANAGER_H__ > > -#define __VTPM_MANAGER_H__ > > - > > -#define VTPM_TAG_REQ 0x01c1 > > -#define VTPM_TAG_RSP 0x01c4 > > -#define COMMAND_BUFFER_SIZE 4096 > > - > > -// Header sizes. Note Header MAY include the DMI > > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > > - > > -//************************ Command Codes **************************** > > -#define VTPM_ORD_BASE 0x0000 > > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > > - > > -// Non-priviledged VTPM Commands (From DMI's) > > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > > - > > -// Priviledged VTPM Commands (From management console) > > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > > - > > -//************************ Return Codes **************************** > > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > > -#define VTPM_TYPE_HVM 2 // HVM Domain > > - > > -//************************ Return Codes **************************** > > -#define VTPM_SUCCESS 0 > > -#define VTPM_FAIL 1 > > -#define VTPM_UNSUPPORTED 2 > > -#define VTPM_FORBIDDEN 3 > > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > > -#define VTPM_INVALID_REQUEST 5 > > - > > -//*********************** Parameter Values ************************* > > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > > -#define VTPM_TYPE_MIGRATABLE 0x01 > > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > > - // VTPM can be recovered or deleted only > > - > > -/******************* Command Parameter API ************************* > > - > > -VTPM Command Format > > - dmi: 4 bytes // Source of message. > > - // WARNING: This is prepended by the channel. > > - // Thus it is received by VTPM Manager, > > - // but not sent by DMI > > - tpm tag: 2 bytes > > - command size: 4 bytes // Size of command including header but not DMI > > - ord: 4 bytes // Command ordinal above > > - parameters: size - 10 bytes // Command Parameter > > - > > -VTPM Response Format > > - tpm tag: 2 bytes > > - response_size: 4 bytes > > - status: 4 bytes > > - parameters: size - 10 bytes > > - > > - > > -VTPM_Open: > > - Input Parameters: > > - mig_type: 1 byte > > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > > - domain type: 1 byte > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_Close > > - Input Parameters: > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_Delete > > - Input Parameters: > > - instance_id: 4 bytes > > - Output Parameters: > > - None > > - > > -VTPM_SaveNVM > > - Input Parameters: > > - data: n bytes (Header indicates size of data) > > - Output Parameters: > > - None > > - > > -VTPM_LoadNVM > > - Input Parameters: > > - None > > - Output Parameters: > > - data: n bytes (Header indicates size of data) > > - > > -VTPM_TPMCommand > > - Input Parameters: > > - TPM Command Byte Stream: n bytes > > - Output Parameters: > > - TPM Reponse Byte Stream: n bytes > > - > > -*********************************************************************/ > > - > > -#endif //_VTPM_MANAGER_H_ > > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > > deleted file mode 100644 > > index 2001074..0000000 > > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > > +++ /dev/null > > @@ -1,488 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager_handler.c > > -// > > -// This file will house the main logic of the VTPM Manager > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "vtsp.h" > > -#include "bsg.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > -#include "log.h" > > -#include "buffer.h" > > - > > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > > - > > -// ---------------------- Prototypes ------------------- > > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > > - TPM_COMMAND_CODE ord, > > - buffer_t *command_buf, > > - buffer_t *result_buf, > > - BOOL is_priv, > > - char *thread_name); > > - > > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - VTPM_DMI_RESOURCE *dmi_res, > > - BYTE *cmd_header, > > - buffer_t *param_buf, > > - buffer_t *result_buf, > > - char *thread_name); > > - > > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - BOOL fw_tpm, // Forward TPM cmds? > > - vtpm_ipc_handle_t *fw_tx_ipc_h, > > - vtpm_ipc_handle_t *fw_rx_ipc_h, > > - BOOL is_priv, > > - char *thread_name) { > > - TPM_RESULT status = TPM_FAIL; // Should never return > > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > > - buffer_t *command_buf=NULL, *result_buf=NULL; > > - TPM_TAG tag; > > - TPM_COMMAND_CODE ord; > > - VTPM_DMI_RESOURCE *dmi_res; > > - int size_read, size_write, i; > > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > > - > > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > > - > > - // ------------------------ Main Loop -------------------------------- > > - while(1) { > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > > - > > - // --------------------- Read Cmd from Sender ---------------- > > - > > - // Read command header > > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > > - goto abort_command; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > > - goto abort_command; > > - } > > - > > - // Unpack header > > - BSG_UnpackList(cmd_header, 4, > > - BSG_TYPE_UINT32, &dmi, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - // Using the header info, read the parameters of the command > > - // Note that in_param_size is in the client's context > > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > - if (cmd_size > 0) { > > - in_param = (BYTE *) malloc(cmd_size); > > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > > - if (size_read > 0) { > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > > - goto abort_command; > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - if (size_read < (int) cmd_size) { > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > > - goto abort_command; > > - } > > - } else { > > - in_param = NULL; > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } > > - > > - // Init the buffers used to handle the command and the response > > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > > - goto abort_command; > > - } > > - > > - // -------------- Dispatch Commands to Handlers ----------- > > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > > - vtpm_lock_wrlock(); > > - } else { > > - vtpm_lock_rdlock(); > > - } > > - > > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > > - (!dmi_res->connected) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > > - status = TPM_BAD_PARAMETER; > > - // We have no one to reply to, they don't exist. > > - goto abort_command; > > - } > > - > > - if (tag == VTPM_TAG_REQ) { > > - > > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > > - > > - } else { // This is not a VTPM Command at all. > > - if (fw_tpm) { > > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > > - > > - // This means calling the DMI failed, not that the cmd failed in the DMI > > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > > - if (status != TPM_SUCCESS) { > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > > - // should be forwarded to the caller VM > > - add_header = FALSE; > > - } else { > > - // We are not supposed to forward TPM commands at all. > > - int i; > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - } // end else for is VTPM Command > > - > > - // ------------------- Respond to Sender ------------------ > > - > > - // Errors while handling responses jump here to reply with error messages > > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > > - // is added to the code, this ifdef should be removed. > > - // Also note this is NOT referring to errors in commands, but rather > > - // this is about I/O errors and such. > > -#ifndef VTPM_MULTI_VM > > - abort_with_error: > > -#endif > > - > > - if (add_header) { > > - // Prepend VTPM header with destination DM stamped > > - out_param_size = buffer_len(result_buf); > > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > > - out_message = (BYTE *) malloc (reply_size); > > - reply = out_message; > > - > > - BSG_PackList(out_message, 4, > > - BSG_TYPE_UINT32, (BYTE *) &dmi, > > - BSG_TPM_TAG, (BYTE *) &tag, > > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > > - BSG_TPM_RESULT, (BYTE *) &status); > > - > > - if (buffer_len(result_buf) > 0) > > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > > - //Note: Send message + dmi_id > > - } else { > > - reply = result_buf->bytes; > > - reply_size = buffer_len(result_buf); > > - } > > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > > - for (i=0; i < reply_size; i++) > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > > - goto abort_command; > > - } > > - free(out_message); out_message=NULL; > > - > > - if (size_write < (int)reply_size) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > > - goto abort_command; > > - } > > - > > - // On certain failures an error message cannot be sent. > > - // This marks the beginning of cleanup in preperation for the next command. > > - abort_command: > > - //free buffers > > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - //free(in_param); // This was converted to command_buf. No need to free > > - buffer_free(result_buf); > > - buffer_free(command_buf); > > - > > - // If we have a write lock, save the manager table > > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > > - } > > - > > - vtpm_lock_unlock(); > > - add_header = TRUE; // Reset to the default > > - } // End while(1) > > - > > -} > > - > > -///////////////////////////////////////////////////////////////////////// > > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > > - TPM_COMMAND_CODE ord, > > - buffer_t *command_buf, > > - buffer_t *result_buf, > > - BOOL is_priv, > > - char *thread_name) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - > > - switch (ord) { > > - case VTPM_ORD_SAVENVM: > > - status= VTPM_Handle_Save_NVM(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_LOADNVM: > > - status= VTPM_Handle_Load_NVM(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_TPMCOMMAND: > > - status= VTPM_Handle_TPM_Command(dmi_res, > > - command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_GET_MIG_KEY: > > - status = VTPM_Handle_Get_Migration_key(command_buf, > > - result_buf); > > - break; > > - > > - case VTPM_ORD_LOAD_MIG_KEY: > > - status = VTPM_Handle_Load_Migration_key(command_buf, > > - result_buf); > > - break; > > - > > - default: > > - // Privileged handlers can do maintanance > > - if (is_priv) { > > - switch (ord) { > > - case VTPM_ORD_OPEN: > > - status = VTPM_Handle_New_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_CLOSE: > > - status = VTPM_Handle_Close_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_DELETE: > > - status = VTPM_Handle_Delete_DMI(command_buf); > > - break; > > - > > - case VTPM_ORD_MIGRATE_IN: > > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > > - break; > > - > > - case VTPM_ORD_MIGRATE_OUT: > > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > > - break; > > - > > - default: > > - status = TPM_BAD_ORDINAL; > > - } // switch > > - } else { // is priv command > > - > > - status = TPM_BAD_ORDINAL; > > - } // inner switch > > - } // outer switch > > - > > - return(status); > > -} > > - > > -///////////////////////////////////////////////////////////////////// > > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - VTPM_DMI_RESOURCE *dmi_res, > > - BYTE *cmd_header, > > - buffer_t *param_buf, > > - buffer_t *result_buf, > > - char *thread_name) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - UINT32 dmi_dst; > > - TPM_COMMAND_CODE ord; > > - TPM_TAG tag_out; > > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > > - BYTE *dmi_cmd, *in_param; > > - int size_read, size_write, i; > > - > > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > > - > > - //Forward TPM CMD stamped with dmi_id to DMI for handling > > - if (buffer_len(param_buf)) { > > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > > - > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - free(dmi_cmd); > > - } else { > > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > > - if (size_write > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - } > > - > > - if (size_write != (int) dmi_cmd_size) > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > > - > > - buffer_free(param_buf); > > - > > - // Read header for response to TPM command from DMI > > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(cmd_header, 4, > > - BSG_TYPE_UINT32, &dmi_dst, > > - BSG_TPM_TAG, &tag_out, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &status ); > > - > > - // If response has parameters, read them. > > - // Note that in_param_size is in the client's context > > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > > - if (adj_param_size > 0) { > > - in_param = (BYTE *) malloc(adj_param_size); > > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > > - > > - } else { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > > - goto abort_with_error; > > - } > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_with_error; > > - } > > - } else { > > - in_param = NULL; > > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > > - status = TPM_FAIL; > > - goto abort_with_error; > > - } > > - > > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > > - > > - status = TPM_SUCCESS; > > - > > - abort_with_error: > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > > deleted file mode 100644 > > index cf58ba3..0000000 > > --- a/tools/vtpm_manager/manager/vtpmd.c > > +++ /dev/null > > @@ -1,371 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpmd.c > > -// > > -// Application > > -// > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include "vtpm_manager.h" > > -#include "vtpmpriv.h" > > -#include "tcg.h" > > -#include "log.h" > > -#include "vtpm_ipc.h" > > - > > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > > - > > -#define VTPM_BE_FNAME "/dev/vtpm" > > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > > - > > -#define VTPM_TYPE_PVM_STRING "pvm" > > -#define VTPM_TYPE_HVM_STRING "hvm" > > - > > -struct vtpm_thread_params_s { > > - vtpm_ipc_handle_t *tx_ipc_h; > > - vtpm_ipc_handle_t *rx_ipc_h; > > - BOOL fw_tpm; > > - vtpm_ipc_handle_t *fw_tx_ipc_h; > > - vtpm_ipc_handle_t *fw_rx_ipc_h; > > - BOOL is_priv; > > - char *thread_name; > > -}; > > - > > -// This is needed to all extra_close_dmi to close this to prevent a > > -// broken pipe when no DMIs are left. > > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > > - > > -void *vtpm_manager_thread(void *arg_void) { > > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > > - > > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > > - arg->is_priv, arg->thread_name); > > - > > - return (status); > > -} > > - > > - > > -void signal_handler(int reason) { > > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > > - } else { > > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > > - pthread_exit(NULL); > > - } > > - > > - VTPM_Stop_Manager(); > > - exit(-1); > > -} > > - > > -struct sigaction ctl_c_handler; > > - > > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - int fh; > > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > > - struct stat file_info; > > - > > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > > - dmi_res->tx_tpm_ipc_h = NULL; > > - dmi_res->rx_tpm_ipc_h = NULL; > > - dmi_res->tx_vtpm_ipc_h = NULL; > > - dmi_res->rx_vtpm_ipc_h = NULL; > > - } else { > > - // Create a pair of fifo pipes > > - dmi_res->rx_tpm_ipc_h = NULL; > > - dmi_res->rx_vtpm_ipc_h = NULL; > > - > > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > > - status =TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > > - > > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Measure DMI > > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > > - // Also, this mechanism is specific to 1 VM architecture. > > - /* > > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > > - stat_ret = fstat(fh, &file_stat); > > - if (stat_ret == 0) > > - dmi_size = file_stat.st_size; > > - else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - dmi_buffer > > - */ > > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > > - > > - if (vm_type == VTPM_TYPE_PVM) > > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > > - else > > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > > - > > - // Launch DMI > > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > > -#ifdef MANUAL_DM_LAUNCH > > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > > - dmi_res->dmi_pid = 0; > > -#else > > - pid_t pid = fork(); > > - > > - if (pid == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } else if (pid == 0) { > > - switch (startup_mode) { > > - case TPM_ST_CLEAR: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > > - break; > > - case TPM_ST_STATE: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > > - break; > > - case TPM_ST_DEACTIVATED: > > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > > - break; > > - default: > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Returning from these at all is an error. > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > > - } else { > > - dmi_res->dmi_pid = pid; > > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > > - } > > -#endif // MANUAL_DM_LAUNCH > > - > > - } // If DMI = VTPM_CTL_DM > > - status = TPM_SUCCESS; > > - > > -abort_egress: > > - return (status); > > -} > > - > > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (vtpm_globals->connected_dmis == 0) { > > - // No more DMI's connected. Close fifo to prevent a broken pipe. > > - // This is hackish. Need to think of another way. > > - vtpm_ipc_close(g_rx_tpm_ipc_h); > > - } > > - > > - > > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > > - > > - free(dmi_res->tx_tpm_ipc_h->name); > > - free(dmi_res->tx_vtpm_ipc_h->name); > > - > > -#ifndef MANUAL_DM_LAUNCH > > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > > - if (dmi_res->dmi_pid != 0) { > > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > > - status = TPM_FAIL; > > - } > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > > - status = TPM_FAIL; > > - } > > - } > > -#endif > > - > > - } //endif ! dom0 > > - return status; > > -} > > - > > - > > -int main(int argc, char **argv) { > > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > > - pthread_t be_thread, dmi_thread, hp_thread; > > - > > -#ifdef DUMMY_BACKEND > > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > > -#else > > - vtpm_ipc_handle_t real_be_ipc_h; > > -#endif > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > > - > > - // -------------------- Initialize Manager ----------------- > > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > > - return -1; > > - } > > - > > - // -------------------- Setup Ctrl+C Handlers -------------- > > - ctl_c_handler.sa_handler = signal_handler; > > - sigemptyset(&ctl_c_handler.sa_mask); > > - ctl_c_handler.sa_flags = 0; > > - > > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > > - > > - // For easier debuggin with gdb > > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > > - > > - sigset_t sig_mask; > > - sigemptyset(&sig_mask); > > - sigaddset(&sig_mask, SIGPIPE); > > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > > - > > - // ------------------- Set up file ipc structures ---------- > > -#ifdef DUMMY_BACKEND > > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > > - > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > > - exit(-1); > > - } > > - > > - tx_be_ipc_h = &tx_dummy_ipc_h; > > - rx_be_ipc_h = &rx_dummy_ipc_h; > > -#else > > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > > - > > - tx_be_ipc_h = &real_be_ipc_h; > > - rx_be_ipc_h = &real_be_ipc_h; > > -#endif > > - > > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > > - exit(-1); > > - } > > - > > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > > - > > - // -------------------- Set up thread params ------------- > > - > > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > > - be_thread_params.fw_tpm = TRUE; > > - be_thread_params.fw_tx_ipc_h = NULL; > > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > > - be_thread_params.is_priv = FALSE; > > - be_thread_params.thread_name = "Backend Listener"; > > - > > - dmi_thread_params.tx_ipc_h = NULL; > > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > > - dmi_thread_params.fw_tpm = FALSE; > > - dmi_thread_params.fw_tx_ipc_h = NULL; > > - dmi_thread_params.fw_rx_ipc_h = NULL; > > - dmi_thread_params.is_priv = FALSE; > > - dmi_thread_params.thread_name = "VTPM Listener"; > > - > > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > > - hp_thread_params.fw_tpm = FALSE; > > - hp_thread_params.fw_tx_ipc_h = NULL; > > - hp_thread_params.fw_rx_ipc_h = NULL; > > - hp_thread_params.is_priv = TRUE; > > - hp_thread_params.thread_name = "Hotplug Listener"; > > - > > - // --------------------- Launch Threads ----------------- > > - > > - vtpm_lock_init(); > > - > > - vtpm_globals->master_pid = pthread_self(); > > - > > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > > - exit(-1); > > - } > > - > > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > > - exit(-1); > > - } > > - > > - > > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > > - exit(-1); > > - } > > - > > - //Join the other threads until exit time. > > - pthread_join(be_thread, NULL); > > - pthread_join(dmi_thread, NULL); > > - pthread_join(hp_thread, NULL); > > - > > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > > - > > - VTPM_Stop_Manager(); > > - vtpm_lock_destroy(); > > - return 0; > > -} > > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > > deleted file mode 100644 > > index 41e8d2d..0000000 > > --- a/tools/vtpm_manager/manager/vtpmpriv.h > > +++ /dev/null > > @@ -1,186 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpmpriv.h > > -// > > -// Structures and functions private to the manager > > -// > > -// ================================================================== > > - > > -#ifndef __VTPMPRIV_H__ > > -#define __VTPMPRIV_H__ > > - > > -#include "vtpm_manager.h" > > -#include "tcg.h" > > -#include "tcs.h" > > -#include "buffer.h" > > -#include "crypto.h" > > -#include "vtpm_ipc.h" > > - > > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > > - // is changed. It's used for backwards compatability > > - > > -#define STATE_FILE "/var/vtpm/VTPM" > > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > > -#define VTPM_CTL_DM 0 > > - > > -// ------------------------ Private Structures ----------------------- > > -typedef struct VTPM_DMI_RESOURCE_T { > > - // I/O info for Manager to talk to DMI's and controllers > > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > > - > > -#ifndef VTPM_MULTI_VM > > - pid_t dmi_pid; > > -#endif > > - > > - // Non-persistent Information > > - bool connected; > > - UINT32 dmi_domain_id; > > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > > - char *NVMLocation; // NULL term string indicating location > > - // of NVM. > > - // Persistent Information about DMI > > - UINT32 dmi_id; > > - BYTE dmi_type; > > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > > -} VTPM_DMI_RESOURCE; > > - > > -typedef struct tdVTPM_MIGKEY_LIST { > > - UINT32 name_size; > > - BYTE *name; // Name of destination (IP addr, domain name, etc) > > - CRYPTO_INFO key; > > - struct tdVTPM_MIGKEY_LIST *next; > > -} VTPM_MIGKEY_LIST; > > - > > - > > -typedef struct tdVTPM_GLOBALS { > > - // Non-persistent data > > -#ifndef VTPM_MULTI_VM > > - pid_t master_pid; > > -#endif > > - > > - int connected_dmis; // To close guest_rx when no dmis are connected > > - > > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > > - // Currently keys are loaded at migration time, > > - // TODO: Make VTPM man store a keys persistently > > - // and update script to check if key is needed > > - // before fetching it. > > - > > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > > - CRYPTO_INFO storageKey; // For software encryption > > - CRYPTO_INFO bootKey; // For saving table > > - TCS_AUTH keyAuth; // OIAP session for storageKey > > - > > - // Persistent Data > > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > > - TPM_AUTHDATA srk_usage_auth; > > - TPM_AUTHDATA storage_key_usage_auth; > > - > > - buffer_t bootKeyWrap; // Wrapped copy of boot key > > - > > -}VTPM_GLOBALS; > > - > > -// --------------------------- Global Values -------------------------- > > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > > - > > -// ********************** VTPM Functions ************************* > > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > > -void VTPM_Stop_Manager(); // Stop VTPM Service > > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > > - vtpm_ipc_handle_t *rx_ipc_h, > > - BOOL fw_tpm, // Should forward TPM cmds > > - vtpm_ipc_handle_t *fw_tx_ipc_h, > > - vtpm_ipc_handle_t *fw_rx_ipc_h, > > - BOOL is_priv, > > - char *client_name); > > - > > -// ********************** Command Handler Prototypes *********************** > > - > > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > > - const buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > > - buffer_t *inbuf, > > - buffer_t *outbuf); > > - > > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > > - > > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > > - buffer_t *result_buf); > > - > > -TPM_RESULT VTPM_SaveManagerData(void); > > -TPM_RESULT VTPM_LoadManagerData(void); > > - > > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > > - > > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > > - > > -// Helper functions > > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > > - > > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > > - CRYPTO_INFO *asymkey, > > - buffer_t *sealed_data); > > - > > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > > - TCS_CONTEXT_HANDLE TCSContext, > > - TPM_HANDLE keyHandle, > > - const TPM_AUTHDATA *key_usage_auth, > > - buffer_t *unsealed_data); > > - > > -#endif // __VTPMPRIV_H__ > > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > > deleted file mode 100644 > > index fc8a66f..0000000 > > --- a/tools/vtpm_manager/manager/vtsp.c > > +++ /dev/null > > @@ -1,1042 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtsp.c > > -// > > -// Higher level interface to TCS for use in service. > > -// > > -// ================================================================== > > - > > -#include > > -#include "tcg.h" > > -#include "tcs.h" > > -#include "bsg.h" > > -#include "log.h" > > -#include "crypto.h" > > -#include "vtsp.h" > > -#include "buffer.h" > > - > > -#define RSA_KEY_SIZE 0x0800 > > - > > -/*********************************************************************************** > > - * GenerateAuth: Generate authorization info to be sent back to application > > - * > > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > > - * outParamDigestTextSize Size of inParamDigestText > > - * HMACkey Key to be used for HMACing > > - * For OIAP use key.authUsage or PersistStore.ownerAuth > > - * For OSAP use shared secret > > - * pAuth Authorization information from the application > > - * > > - * Return: TPM_SUCCESS Authorization data created > > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > > - *************************************************************************************/ > > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > > - /*[IN]*/ UINT32 inParamDigestTextSize, > > - /*[IN]*/ const TPM_SECRET *HMACkey, > > - /*[IN,OUT]*/ TCS_AUTH *auth) { > > - > > - if (inParamDigestText == NULL || auth == NULL) > > - return (TPM_AUTHFAIL); > > - else { > > - > > - //Generate new OddNonce > > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > > - > > - // Create SHA1 inParamDigest > > - TPM_DIGEST inParamDigest; > > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > > - > > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > > - > > - BSG_PackList( hmacText, 4, > > - BSG_TPM_DIGEST, &inParamDigest, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > > - > > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > > - > > - return(TPM_SUCCESS); > > - > > - } > > -} > > - > > -/*********************************************************************************** > > - * VerifyAuth: Verify the authdata for a command requiring authorization > > - * > > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > > - * inParamDigestTextSize Size of inParamDigestText > > - * authDataUsage AuthDataUsage for the Entity being used > > - * Key->authDataUsage or TPM_AUTH_OWNER > > - * HMACkey Key to be used for HMACing > > - * For OIAP use key.authUsage or PersistStore.ownerAuth > > - * For OSAP use NULL (It will be aquired from the Auth Session) > > - * If unknown (default), assume OIAP > > - * sessionAuth A TCS_AUTH info for the session > > - * pAuth Authorization information from the application > > - * hContext If specified, on failed Auth, VerifyAuth will > > - * generate a new OIAP session in place of themselves > > - * destroyed session. > > - * > > - * Return: TPM_SUCCESS Authorization Verified > > - * TPM_AUTHFAIL Authorization Failed > > - * TPM_FAIL Failure during SHA1 routines > > - *************************************************************************************/ > > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > > - /*[IN]*/ UINT32 outParamDigestTextSize, > > - /*[IN]*/ const TPM_SECRET *HMACkey, > > - /*[IN,OUT]*/ TCS_AUTH *auth, > > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > > - if (outParamDigestText == NULL || auth == NULL) > > - return (TPM_AUTHFAIL); > > - > > - > > - // Create SHA1 inParamDigest > > - TPM_DIGEST outParamDigest; > > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > > - > > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > > - TPM_DIGEST hm; > > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > > - > > - BSG_PackList( hmacText, 4, > > - BSG_TPM_DIGEST, &outParamDigest, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > > - > > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > > - > > - // Compare correct HMAC with provided one. > > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > > - if (!auth->fContinueAuthSession) > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > > - > > - return (TPM_SUCCESS); > > - } else { > > - // If specified, reconnect the OIAP session. > > - // NOTE: This only works for TCS's that never have a 0 context. > > - if (hContext) { > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > > - VTSP_OIAP( hContext, auth); > > - } > > - return (TPM_AUTHFAIL); > > - } > > -} > > - > > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPMTRYRETURN( TCSP_OIAP(hContext, > > - &auth->AuthHandle, > > - &auth->NonceEven) ); > > - > > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > > - auth->fContinueAuthSession = FALSE; > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_ENTITY_TYPE entityType, > > - const UINT32 entityValue, > > - const TPM_AUTHDATA *usageAuth, > > - TPM_SECRET *sharedSecret, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > > - > > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > > - > > - TPMTRYRETURN( TCSP_OSAP( hContext, > > - entityType, > > - entityValue, > > - nonceOddOSAP, > > - &auth->AuthHandle, > > - &auth->NonceEven, > > - &nonceEvenOSAP) ); > > - > > - // Calculating Session Secret > > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > > - > > - BSG_PackList( sharedSecretText, 2, > > - BSG_TPM_NONCE, &nonceEvenOSAP, > > - BSG_TPM_NONCE, &nonceOddOSAP); > > - > > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > > - > > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > > - auth->fContinueAuthSession = FALSE; > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > > - > > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > > - CRYPTO_INFO *crypto_info) { > > - > > - TPM_RESULT status; > > - TPM_NONCE antiReplay; > > - TPM_DIGEST checksum; > > - BYTE *pubEKtext; > > - UINT32 pubEKtextsize; > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > > - > > - // GenerateAuth new nonceOdd > > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > > - > > - > > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > > - antiReplay, > > - &pubEKtextsize, > > - &pubEKtext, > > - &checksum) ); > > - > > - > > - // Extract the remaining output parameters > > - TPM_PUBKEY pubEK; > > - > > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > > - > > - // Build CryptoInfo for the bindingKey > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - pubEK.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > > - rsaKeyParms.exponent, > > - pubEK.pubKey.keyLength, > > - pubEK.pubKey.key, > > - crypto_info); > > - > > - // Destroy rsaKeyParms > > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > > - > > - // Set encryption scheme > > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - const TPM_AUTHDATA *srkAuth, > > - CRYPTO_INFO *ek_cryptoInfo, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > > - BYTE *new_srk; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // vars for srkpubkey parameter > > - TPM_KEY srkPub; > > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > > - > > - struct pack_buf_t srkText; > > - > > - //These values are accurate for an enc(AuthData). > > - struct pack_buf_t encOwnerAuth, encSrkAuth; > > - > > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > > - > > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > > - > > - > > - // Build srk public key struct > > - srkPub.ver = TPM_STRUCT_VER_1_1; > > - srkPub.keyUsage = TPM_KEY_STORAGE; > > - srkPub.keyFlags = 0x00; > > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > > - srkPub.PCRInfoSize = 0; > > - srkPub.PCRInfo = 0; > > - srkPub.pubKey.keyLength= 0; > > - srkPub.encDataSize = 0; > > - > > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 5, > > - BSG_TPM_COMMAND_CODE,&command, > > - BSG_TPM_PROTOCOL_ID, &proto_id, > > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > > - BSG_TPM_KEY, &srkPub); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > > - > > - new_srk = srkText.data; > > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > > - proto_id, > > - encOwnerAuth.size, > > - encOwnerAuth.data, > > - encSrkAuth.size, > > - encSrkAuth.data, > > - &srkText.size, > > - &new_srk, > > - auth ) ); > > - > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > > - paramTextSize += srkText.size; > > - > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - ownerAuth, auth, > > - hContext) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(srkText.data); > > - free(encSrkAuth.data); > > - free(encOwnerAuth.data); > > - free(paramText); > > - > > - TCS_FreeMemory(hContext, new_srk); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 1, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - ownerAuth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > > - auth) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - ownerAuth, auth, > > - hContext) ); > > - goto egress; > > - > > - abort_egress: > > - egress: > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_USAGE usage, > > - const TPM_AUTHDATA *newKeyAuth, > > - const TCS_KEY_HANDLE parentHandle, > > - const TPM_AUTHDATA *osapSharedSecret, > > - buffer_t *pubKeyBuf, > > - TCS_AUTH *auth) { > > - > > - int i; > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > > - > > - // vars for Calculate encUsageAuth > > - BYTE *paramText; > > - UINT32 paramTextSize; > > - > > - // vars for Calculate encUsageAuth > > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > > - TPM_DIGEST XORKey1; > > - UINT32 XORbufferSize; > > - TPM_SECRET encUsageAuth, encMigrationAuth; > > - > > - // vars for Flatten newKey prototype > > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > > - struct pack_buf_t newKeyText; > > - > > - // Fill in newKey > > - TPM_KEY newKey; > > - > > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > > - newKey.algorithmParms.parmSize = 12; > > - > > - switch (usage) { > > - case TPM_KEY_SIGNING: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > > - newKey.keyUsage = TPM_KEY_SIGNING; > > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > > - break; > > - case TPM_KEY_STORAGE: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > > - newKey.keyUsage = TPM_KEY_STORAGE; > > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > > - break; > > - case TPM_KEY_BIND: > > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > > - newKey.keyUsage = TPM_KEY_BIND; > > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > > - break; > > - default: > > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - > > - newKey.ver = TPM_STRUCT_VER_1_1; > > - > > - newKey.keyFlags = 0; > > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > > - newKey.pubKey.keyLength= 0; > > - newKey.encDataSize = 0; > > - newKey.encData = NULL; > > - > > - // FIXME: Support PCR bindings > > - newKey.PCRInfoSize = 0; > > - newKey.PCRInfo = NULL; > > - > > - // Calculate encUsageAuth > > - XORbufferSize = BSG_PackList( XORbuffer, 2, > > - BSG_TPM_SECRET, osapSharedSecret, > > - BSG_TPM_NONCE, &auth->NonceEven); > > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > > - > > - // FIXME: No support for migratable keys. > > - for (i=0; i < TPM_DIGEST_SIZE; i++) > > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > > - > > - // Flatten newKey prototype > > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > > - newKeyText.data = flatKey; > > - newKeyText.size = flatKeySize; > > - > > - // Generate HMAC > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_AUTHDATA, &encUsageAuth, > > - BSG_TPM_AUTHDATA, &encMigrationAuth); > > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > > - paramTextSize += newKeyText.size; > > - > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - osapSharedSecret, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > > - parentHandle, > > - encUsageAuth, > > - encMigrationAuth, > > - &newKeyText.size, > > - &newKeyText.data, > > - auth) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command); > > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > > - paramTextSize += newKeyText.size; > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - osapSharedSecret, auth, 0) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(flatKey); > > - free(paramText); > > - TCS_FreeMemory(hContext, newKeyText.data); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_KEY_HANDLE hUnwrappingKey, > > - const buffer_t *rgbWrappedKeyBlob, > > - const TPM_AUTHDATA *parentAuth, > > - TPM_HANDLE *newKeyHandle, > > - TCS_AUTH *auth, > > - CRYPTO_INFO *cryptoinfo, > > - const BOOL skipTPMLoad) { > > - > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > > - > > - BYTE *paramText=NULL; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > > - if (! skipTPMLoad) { > > - > > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > > - (newKeyHandle==NULL) || (auth==NULL)) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // Generate Extra TCS Parameters > > - TPM_HANDLE phKeyHMAC; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 1, > > - BSG_TPM_COMMAND_CODE, &command); > > - > > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - parentAuth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > > - hUnwrappingKey, > > - buffer_len(rgbWrappedKeyBlob), > > - rgbWrappedKeyBlob->bytes, > > - auth, > > - newKeyHandle, > > - &phKeyHMAC) ); > > - > > - // Verify Auth > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_HANDLE, newKeyHandle); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - parentAuth, auth, > > - hContext) ); > > - } > > - > > - // Build cryptoinfo structure for software crypto function. > > - if (cryptoinfo != NULL) { > > - TPM_KEY newKey; > > - > > - // Unpack/return key structure > > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > > - TPM_RSA_KEY_PARMS rsaKeyParms; > > - > > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > > - newKey.algorithmParms.parms, > > - &rsaKeyParms); > > - > > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > > - rsaKeyParms.exponent, > > - newKey.pubKey.keyLength, > > - newKey.pubKey.key, > > - cryptoinfo); > > - > > - // Destroy rsaKeyParms > > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > > - > > - // Set encryption scheme > > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > > - } > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE key_handle, > > - const buffer_t *bound_data, > > - const TPM_AUTHDATA *usage_auth, > > - buffer_t *clear_data, > > - TCS_AUTH *auth) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate Extra TCS Parameters > > - struct pack_buf_t clear_data32; > > - BYTE *clear_data_text; > > - UINT32 clear_data_size; > > - > > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &bound_data32); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - usage_auth, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_UnBind( hContext, > > - key_handle, > > - buffer_len(bound_data), > > - bound_data->bytes, > > - auth, > > - &clear_data_size, > > - &clear_data_text) ); > > - > > - > > - // Verify Auth > > - clear_data32.size = clear_data_size; > > - clear_data32.data = clear_data_text; > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &clear_data32); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - usage_auth, auth, > > - hContext) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - free(paramText); > > - TCS_FreeMemory(hContext, clear_data_text); > > - > > - return status; > > -} > > - > > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > > - const buffer_t *inData, > > - buffer_t *outData) > > -{ > > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_BOUND_DATA boundData; > > - UINT32 i; > > - > > - // Fill boundData's accessory information > > - boundData.ver = TPM_STRUCT_VER_1_1; > > - boundData.payload = TPM_PT_BIND; > > - boundData.payloadData = inData->bytes; > > - > > - // Pack boundData before encryption > > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > > - (sizeof(TPM_VERSION) + > > - sizeof(TPM_PAYLOAD_TYPE) + > > - buffer_len(inData))); > > - if (flatBoundData == NULL) { > > - return TPM_NOSPACE; > > - } > > - UINT32 flatBoundDataSize = 0; > > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > > - BSG_TPM_VERSION, &boundData.ver, > > - BSG_TYPE_BYTE, &boundData.payload); > > - > > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > > - flatBoundDataSize += buffer_len(inData); > > - > > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > > - UINT32 out_tmp_size; > > - > > - // Encrypt flatBoundData > > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > > - flatBoundDataSize, > > - flatBoundData, > > - &out_tmp_size, > > - out_tmp) ); > > - > > - if (out_tmp_size > RSA_KEY_SIZE/8) { > > - // The result of RSAEnc should be a fixed size based on key size. > > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > > - } > > - > > - buffer_init(outData, 0, NULL); > > - buffer_append_raw(outData, out_tmp_size, out_tmp); > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > > - for(i = 0 ; i < out_tmp_size ; i++) { > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - goto egress; > > - abort_egress: > > - egress: > > - > > - // Free flatBoundData > > - free(flatBoundData); > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_AUTHDATA *sealDataAuth, > > - const TPM_PCR_COMPOSITE *pcrComp, > > - const buffer_t *inData, > > - TPM_STORED_DATA *sealedData, > > - const TPM_SECRET *osapSharedSecret, > > - TCS_AUTH *auth) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate PCR_Info Struct from Comp > > - TPM_PCR_INFO pcrInfo; > > - UINT32 pcrInfoSize, flatpcrSize; > > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > > - sizeof(UINT16) + // 2 byte UINT16 > > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > > - > > - if (pcrComp != NULL) { > > - //printf("\n\tBinding to PCRs: "); > > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > > - > > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > > - > > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > > - } else { > > - //printf("\n\tBinding to no PCRS."); > > - pcrInfoSize = 0; > > - } > > - > > - // Calculate encUsageAuth > > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > > - UINT32 XORbufferSize = sizeof(XORbuffer); > > - TPM_DIGEST XORKey; > > - TPM_ENCAUTH encAuth; > > - > > - BSG_PackList( XORbuffer, 2, > > - BSG_TPM_SECRET, osapSharedSecret, > > - BSG_TPM_NONCE, &auth->NonceEven ); > > - > > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > > - > > - int i; > > - for (i=0; i < TPM_DIGEST_SIZE; i++) > > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > > - > > - // Generate Extra TCS Parameters > > - UINT32 inDataSize = buffer_len(inData); > > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > > - > > - UINT32 sealedDataSize; > > - BYTE *flatSealedData=NULL; > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 4, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_ENCAUTH, &encAuth, > > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > > - BSG_TPM_SIZE32_DATA, &inData_pack); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - osapSharedSecret, auth) ); > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_Seal( hContext, > > - keyHandle, > > - encAuth, > > - pcrInfoSize, > > - flatpcr, > > - inDataSize, > > - inData->bytes, > > - auth, > > - &sealedDataSize, > > - &flatSealedData) ); > > - > > - // Unpack/return key structure > > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_STORED_DATA, sealedData); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - osapSharedSecret, auth, > > - 0) ); > > - > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (flatSealedData) > > - TCS_FreeMemory( hContext, flatSealedData); > > - > > - free(paramText); > > - return status; > > -} > > - > > - > > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_STORED_DATA *sealedData, > > - const TPM_AUTHDATA *key_usage_auth, > > - const TPM_AUTHDATA *data_usage_auth, > > - buffer_t *outData, > > - TCS_AUTH *auth, > > - TCS_AUTH *dataAuth) { > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > > - > > - BYTE *paramText; // Digest to make Auth. > > - UINT32 paramTextSize; > > - > > - // Generate Extra TCS Parameters > > - UINT32 sealDataSize, clearDataSize; > > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > > - 2 * sizeof(UINT32) + > > - sealedData->sealInfoSize + > > - sealedData->encDataSize), > > - *clearData=NULL; > > - > > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > > - > > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - > > - paramTextSize = BSG_PackList(paramText, 2, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_STORED_DATA, sealedData); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - key_usage_auth, auth) ); > > - > > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > > - data_usage_auth, dataAuth) ); > > - // Call TCS > > - TPMTRYRETURN( TCSP_Unseal( hContext, > > - keyHandle, > > - sealDataSize, > > - flatSealedData, > > - auth, > > - dataAuth, > > - &clearDataSize, > > - &clearData) ); > > - > > - // Verify Auth > > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > > - > > - paramTextSize = BSG_PackList(paramText, 3, > > - BSG_TPM_RESULT, &status, > > - BSG_TPM_COMMAND_CODE, &command, > > - BSG_TPM_SIZE32_DATA, &clearData_pack); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - key_usage_auth, auth, > > - hContext) ); > > - > > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > > - data_usage_auth, dataAuth, > > - hContext) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - if (flatSealedData) > > - TCS_FreeMemory( hContext, clearData); > > - > > - free(paramText); > > - return status; > > -} > > - > > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > > - > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Call TCS > > - return ( TCSP_SaveState ( hContext ) ); > > - > > -} > > - > > - > > -// Function Reaches into unsupported TCS command, beware. > > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > > - const buffer_t *inbuf, > > - buffer_t *outbuf ) { > > - > > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - // Generate Extra TCS Parameters > > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Call TCS > > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > > - &resultTextSize, resultText) ); > > - > > - // Unpack/return key structure > > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - TCS_FreeMemory(hContext, resultText); > > - free(resultText); > > - return status; > > -} > > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > > deleted file mode 100644 > > index 2fb0440..0000000 > > --- a/tools/vtpm_manager/manager/vtsp.h > > +++ /dev/null > > @@ -1,126 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtsp.h > > -// > > -// Higher level interface to TCS. > > -// > > -// ================================================================== > > - > > -#ifndef __VTSP_H__ > > -#define __VTSP_H__ > > - > > -#include "tcg.h" > > -#include "tcs.h" > > - > > -#define KEY_BUFFER_SIZE 2048 > > - > > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > > - const buffer_t *inbuf, > > - buffer_t *outbuf ); > > - > > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_ENTITY_TYPE entityType, > > - const UINT32 entityValue, > > - const TPM_AUTHDATA *usageAuth, > > - TPM_SECRET *sharedsecret, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > > - CRYPTO_INFO *cypto_info); > > - > > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - const TPM_AUTHDATA *srkAuth, > > - CRYPTO_INFO *ek_cryptoInfo, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_AUTHDATA *ownerAuth, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_USAGE usage, > > - const TPM_AUTHDATA *newKeyAuth, > > - const TCS_KEY_HANDLE parentHandle, > > - const TPM_AUTHDATA *osapSharedSecret, > > - buffer_t *pubKeyBuf, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > > - const TCS_KEY_HANDLE hUnwrappingKey, > > - const buffer_t *rgbWrappedKeyBlob, > > - const TPM_AUTHDATA *parentAuth, > > - TPM_HANDLE *newKeyHandle, > > - TCS_AUTH *pAuth, > > - CRYPTO_INFO *cryptoinfo, > > - const BOOL skipTPMLoad); > > - > > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE key_handle, > > - const buffer_t *bound_data, > > - const TPM_AUTHDATA *usage_auth, > > - buffer_t *clear_data, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > > - const buffer_t *inData, > > - buffer_t *outData); > > - > > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_AUTHDATA *sealDataAuth, > > - const TPM_PCR_COMPOSITE *pcrComp, > > - const buffer_t *inData, > > - TPM_STORED_DATA *sealedData, > > - const TPM_SECRET *osapSharedSecret, > > - TCS_AUTH *auth); > > - > > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > > - const TPM_KEY_HANDLE keyHandle, > > - const TPM_STORED_DATA *sealedData, > > - const TPM_AUTHDATA *key_usage_auth, > > - const TPM_AUTHDATA *data_usage_auth, > > - buffer_t *outData, > > - TCS_AUTH *auth, > > - TCS_AUTH *dataAuth); > > - > > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > > - > > -#endif //_VTSP_H_ > > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > > deleted file mode 100644 > > index e33ae95..0000000 > > --- a/tools/vtpm_manager/migration/Makefile > > +++ /dev/null > > @@ -1,42 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -VPATH = ../manager > > - > > -BIND = vtpm_migratord > > -BINC = vtpm_migrator > > - > > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > > - > > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIND) $(BINC) > > - > > -.PHONY: install > > -install: build > > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > > - > > -.PHONY: clean > > -clean: > > - rm -f $(BINC) $(BIND) > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIND): $(OBJSD) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -$(BINC): $(OBJSC) > > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > > - > > -# libraries > > -LIBS += ../util/libTCGUtils.a > > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > > deleted file mode 100644 > > index 08986f4..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > > +++ /dev/null > > @@ -1,186 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_manager_if.c > > -// > > -// Provides functions to call local vtpm manager interface (Hotplug) > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "vtpm_ipc.h" > > -#include "bsg.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > > - > > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > > - > > -TPM_RESULT vtpm_manager_open(){ > > - > > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > > - return TPM_IOERROR; > > - } > > - > > - return TPM_SUCCESS; > > -} > > - > > -void vtpm_manager_close() { > > - > > - vtpm_ipc_close(&tx_ipc_h); > > - vtpm_ipc_close(&rx_ipc_h); > > -} > > - > > - > > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > > - buffer_t *command_param_buf, > > - TPM_RESULT *cmd_status, /* out */ > > - buffer_t *result_param_buf) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - int size_read, size_write, i; > > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > > - TPM_TAG tag=VTPM_TAG_REQ; > > - > > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > > - adj_command = (BYTE *) malloc( adj_command_size ); > > - if (!adj_command) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > > - BSG_PackList(adj_command, 4, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > > - > > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > > - for (i=0; i< adj_command_size; i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_write != (int) adj_command_size ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > > - > > - // Read header for response to manager command > > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(response_header, 4, > > - BSG_TYPE_UINT32, &dmi_id, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, cmd_status ); > > - > > - // If response has parameters, read them. > > - // Note that out_param_size is in the client's context > > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > > - goto abort_egress; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > > deleted file mode 100644 > > index 8d52e66..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > > +++ /dev/null > > @@ -1,104 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_migrator.h > > -// > > -// Public Interface header for VTPM Migrator > > -// > > -// ================================================================== > > - > > -#ifndef __VTPM_MIGRATOR_H__ > > -#define __VTPM_MIGRATOR_H__ > > - > > -#define VTPM_MTAG_REQ 0x02c1 > > -#define VTPM_MTAG_RSP 0x02c4 > > - > > -// Header sizes. > > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > > - > > -//*********************** Connection Info ************************** > > -#define VTPM_MIG_PORT 48879 > > - > > -//************************ Command Codes *************************** > > -#define VTPM_MORD_MIG_STEP1 0x00 > > -#define VTPM_MORD_MIG_STEP2 0x01 > > -#define VTPM_MORD_MIG_STEP3 0x02 > > -#define VTPM_MORD_MIG_STEP4 0x03 > > - > > -//************************ Return Codes **************************** > > -#define VTPM_SUCCESS 0 > > -#define VTPM_FAIL 1 > > - > > -/******************* Command Parameter API ************************* > > - > > -VTPM Command Format > > - tpm tag: 2 bytes > > - command size: 4 bytes // Size of command including header but not DMI > > - ord: 4 bytes // Command ordinal above > > - parameters: size - 10 bytes // Command Parameter > > - > > -VTPM Response Format > > - tpm tag: 2 bytes > > - response_size: 4 bytes > > - status: 4 bytes > > - parameters: size - 10 bytes > > - > > - > > -VTPM_Mig_Phase1: > > - Unsupported: (Handled by scripts) > > - > > -VTPM_Mig_Phase2 > > - Input Parameters: > > - domain_name_size: 4 bytes > > - domain_name : domain_name_size bytes > > - Output Parameters: > > - pub_exp_size: 4 bytes > > - pub_exp: pub_exp_size bytes > > - pub_mod_size: 4 bytes > > - pub_mod: pub_mod_size bytes > > - > > -VTPM_Mig_Phase3 > > - Input Parameters: > > - vtpm_state_size: 4 bytes > > - vtpm_state: vtpm_state_size bytes > > - Output Parameters: > > - none > > - > > -VTPM_Mig_Phase4 > > - Unsupported: (Handled by scripts) > > - > > - > > -*********************************************************************/ > > - > > -#endif //_VTPM_MANAGER_H_ > > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > > deleted file mode 100644 > > index de48b2d..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > > +++ /dev/null > > @@ -1,219 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// vtpm_migrator_if.c > > -// > > -// Provides functions to call open network connection & call > > -// a function on the vtpm_migratord on the destination > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "vtpm_migrator.h" > > - > > -static int sock_desc; > > - > > - > > -TPM_RESULT vtpm_migratord_open(char *server_address){ > > - > > - TPM_RESULT status = TPM_FAIL; > > - > > - /* network variables */ > > - struct in_addr ip_addr; > > - struct sockaddr_in server_addr; > > - int addr_len; > > - struct hostent *dns_info=NULL; > > - > > - /* set up connection to server*/ > > - dns_info = gethostbyname(server_address); > > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > > - > > - if(ip_addr.s_addr < 0) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - /* set up server variable */ > > - memset((char *)&server_addr, 0, sizeof(server_addr)); > > - server_addr.sin_family = AF_INET; > > - server_addr.sin_port = htons(VTPM_MIG_PORT); > > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > > - > > - /* open socket, make connection */ > > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > > - > > - if (sock_desc < 0 ) { > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (connect(sock_desc, > > - (struct sockaddr *)&server_addr, > > - sizeof(server_addr)) < 0 ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - status = TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > -void vtpm_migratord_close() { > > - close(sock_desc); > > -} > > - > > - > > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > > - buffer_t *command_param_buf, > > - TPM_RESULT *cmd_status, /* out */ > > - buffer_t *result_param_buf) { > > - > > - TPM_RESULT status = TPM_FAIL; > > - int size_read, size_write, i; > > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > > - TPM_TAG tag=VTPM_MTAG_REQ; > > - > > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > > - command = (BYTE *) malloc( command_size ); > > - if (!command) { > > - status = TPM_RESOURCES; > > - goto abort_egress; > > - } > > - > > - BSG_PackList(command, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &command_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > > - > > - size_write = write(sock_desc, command, command_size); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > > - for (i=0; i< command_size; i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_write != (int) command_size ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > > - > > - // Read header for response > > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - > > - // Unpack response from DMI for TPM command > > - BSG_UnpackList(response_header, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_COMMAND_CODE, cmd_status ); > > - > > - // If response has parameters, read them. > > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > > - goto abort_egress; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - status = TPM_IOERROR; > > - goto abort_egress; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - status=TPM_SUCCESS; > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > > deleted file mode 100644 > > index 18b3bdb..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > > +++ /dev/null > > @@ -1,211 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > > - char *name, > > - UINT32 instance) { > > - TPM_RESULT status, cmd_status; > > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > > - UINT32 offset; > > - struct pack_buf_t addr_data32; > > - > > - //===== Get Destination's Public Migration Key ====== > > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > > - > > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > > - &out_param_buf, > > - &cmd_status, > > - &mig_key_buf) ); > > - vtpm_migratord_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - //===== Load migration key into vtpm_manager ======== > > - > > - addr_data32.data = (BYTE *)server_addr; > > - addr_data32.size = strlen(server_addr) + 1; // Include the null > > - > > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > > - NULL ) ) ; > > - > > - offset = BSG_PackList(out_param_buf.bytes, 1, > > - BSG_TPM_SIZE32_DATA, &addr_data32); > > - > > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > > - > > - TPMTRYRETURN ( vtpm_manager_open() ); > > - > > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - buffer_free(&mig_key_buf); > > - buffer_free(&out_param_buf); > > - > > - return status; > > -} > > - > > - > > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > > - char *name, > > - UINT32 instance) { > > - TPM_RESULT status, cmd_status; > > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > > - struct pack_buf_t addr_data32, name_data32, state_data32; > > - > > - //===== Get vtpm state from vtpm_manager ======== > > - addr_data32.data = (BYTE *)server_addr; > > - addr_data32.size = strlen(server_addr) + 1; // Include the null > > - > > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > > - (2 * sizeof(UINT32)) + addr_data32.size, > > - NULL ) ) ; > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TYPE_UINT32, &instance, > > - BSG_TPM_SIZE32_DATA, &addr_data32); > > - > > - TPMTRYRETURN ( vtpm_manager_open() ); > > - > > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > > - &out_param_buf, > > - &cmd_status, > > - &state_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > > - > > - //===== Send vtpm state to destination ====== > > - name_data32.data = (BYTE *)name; > > - name_data32.size = strlen(name) + 1; // Include the null > > - state_data32.data = state_buf.bytes; > > - state_data32.size = buffer_len(&state_buf); > > - > > - TPMTRYRETURN( buffer_init( &out_param_buf, > > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > > - NULL ) ) ; > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TPM_SIZE32_DATA, &name_data32, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > > - > > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - vtpm_migratord_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - goto egress; > > - > > - abort_egress: > > - egress: > > - > > - buffer_free( &out_param_buf); > > - buffer_free( &state_buf); > > - buffer_free( &empty_buf); > > - > > - return status; > > -} > > - > > - > > -// Usage vtpm_migrator addr domain_name instance step > > - > > -int main(int argc, char **argv) { > > - > > - /* variables for processing of command */ > > - TPM_RESULT status = TPM_FAIL; > > - char *server_addr, *name; > > - UINT32 instance, step; > > - > > - if (argc != 5) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > > - status= TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - server_addr = argv[1]; > > - name = argv[2]; > > - instance = atoi( argv[3] ); > > - step = atoi( argv[4] ); > > - > > - switch (step) { > > - case VTPM_MORD_MIG_STEP2: > > - status = handle_vtpm_mig_step2(server_addr, name, instance); > > - break; > > - > > - case VTPM_MORD_MIG_STEP3: > > - status = handle_vtpm_mig_step3(server_addr, name, instance); > > - break; > > - > > - default: > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - break; > > - } > > - > > - goto egress; > > - abort_egress: > > - egress: > > - > > - return status; > > -} > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > > deleted file mode 100644 > > index ea18c8c..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > > +++ /dev/null > > @@ -1,202 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "log.h" > > -#include "bsg.h" > > -#include "buffer.h" > > -#include "vtpm_migrator.h" > > - > > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > > - TPM_TAG tag = VTPM_MTAG_RSP; > > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > > - > > - buffer_init(buf, out_param_size, NULL); > > - > > - BSG_PackList(buf->bytes, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_RESULT, &status ); > > -} > > - > > -int main() { > > - > > - /* network variables */ > > - int sock_descr, client_sock=-1, len; > > - struct sockaddr_in addr; > > - struct sockaddr_in client_addr; > > - unsigned int client_length; > > - int bytes; > > - > > - /* variables for processing of command */ > > - TPM_RESULT status = TPM_FAIL; > > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > > - TPM_TAG tag; > > - TPM_COMMAND_CODE ord; > > - UINT32 in_param_size, adj_param_size; > > - int i, size_read, size_write; > > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > > - > > - > > - /* setup socket */ > > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > > - > > - memset(&addr, 0, sizeof(addr)); > > - addr.sin_family = AF_INET; > > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > > - addr.sin_port = htons(VTPM_MIG_PORT); > > - > > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > > - return 1; > > - } > > - > > - listen(sock_descr, 10); > > - > > - for(;;) { > > - // ============ clear client info and wait for connection ========== > > - memset(&client_addr, 0, sizeof(client_addr)); > > - client_length = sizeof(client_addr); > > - > > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > > - client_sock=accept(sock_descr, &client_addr, &client_length); > > - if (client_sock == -1) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > > - goto abort_command; > > - } else { > > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > > - } > > - > > - // =================== Read incoming command ====================== > > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > > - if (size_read > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > > - for (i=0; i > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > > - build_error_msg(&result_buf, TPM_IOERROR); > > - goto abort_command_with_error; > > - } > > - > > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - > > - // Unpack response from client > > - BSG_UnpackList(cmd_header, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &in_param_size, > > - BSG_TPM_COMMAND_CODE, &ord ); > > - > > - > > - // If response has parameters, read them. > > - // Note that out_param_size is in the client's context > > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > > - if (adj_param_size > 0) { > > - buffer_init( &in_param_buf, adj_param_size, NULL); > > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > > - if (size_read > 0) { > > - for (i=0; i< size_read; i++) > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > > - > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > > - build_error_msg(&result_buf, TPM_IOERROR); > > - goto abort_command_with_error; > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - > > - if (size_read < (int)adj_param_size) { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - } else { > > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > > - } > > - > > - /* Handle Command */ > > - switch (ord) { > > - case VTPM_MORD_MIG_STEP2: > > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > > - break; > > - > > - case VTPM_MORD_MIG_STEP3: > > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > > - break; > > - > > - default: > > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > > - goto abort_command_with_error; > > - } > > - > > - abort_command_with_error: > > - /* Write Response */ > > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > > - > > - if (size_write > 0) { > > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > > - for (i=0; i< buffer_len(&result_buf); i++) { > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > > - } > > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > > - } else { > > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > > - goto abort_command; > > - } > > - > > - if (size_write != (int) buffer_len(&result_buf) ) > > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > > - > > - abort_command: > > - close(client_sock); > > - buffer_free(&in_param_buf); > > - buffer_free(&result_buf); > > - > > - } // For (;;) > > - > > - return 0; > > -} > > - > > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > > deleted file mode 100644 > > index 0a8a2d5..0000000 > > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > > +++ /dev/null > > @@ -1,177 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "log.h" > > -#include "vtpm_migrator.h" > > -#include "vtpm_manager.h" > > - > > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > > -#define VTPM_SH_CMD_FTR "\"" > > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > > -#define VTPM_SH_ADD "vtpm_add_and_activate" > > -#define VTPM_SH_RESUME "vtpm_resume" > > - > > -// This must be updated to the longest command name. Currently GETINST > > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > > - > > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > > -{ > > - TPM_TAG tag = VTPM_TAG_RSP; > > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > > - UINT32 out_param_size; > > - > > - if ( (!in_param_buf) || (!result_buf) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // ================= Call manager and get mig key =============== > > - TPMTRYRETURN( vtpm_manager_open() ); > > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > > - &out_param_buf, // Empty > > - &cmd_status, > > - &mig_key_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - // ==================== return the mig key ===================== > > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > > - > > - TPMTRYRETURN( buffer_init(result_buf, > > - out_param_size, > > - NULL) ); > > - > > - BSG_PackList( result_buf->bytes, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, &out_param_size, > > - BSG_TPM_RESULT, &status); > > - > > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > > - > > - goto egress; > > - > > - abort_egress: > > - buffer_free(result_buf); > > - build_error_msg(result_buf, status); > > - > > - egress: > > - return; > > -} > > - > > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > > -{ > > - TPM_TAG tag = VTPM_TAG_RSP; > > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > > - UINT32 out_param_size, instance; > > - char *shell_cmd_str=NULL; > > - size_t shell_cmd_strlen; > > - FILE *shell_f=NULL; > > - > > - if ( (!in_param_buf) || (!result_buf) ) { > > - status = TPM_BAD_PARAMETER; > > - goto abort_egress; > > - } > > - > > - // ================= Read Parameters =============== > > - struct pack_buf_t name_data32, state_data32; > > - > > - BSG_UnpackList(in_param_buf->bytes, 2, > > - BSG_TPM_SIZE32_DATA, &name_data32, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - // Before using this string, protect us from a non-null term array. > > - if (name_data32.data[name_data32.size -1] != 0x00) { > > - name_data32.data[name_data32.size -1] = 0x00; > > - } > > - > > - // ====== Call hotplug-script and get an instance ====== > > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > > - > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > > - > > - shell_f = popen(shell_cmd_str, "r"); > > - fscanf(shell_f, "%d", &instance); > > - pclose(shell_f); > > - > > - // ====== Call hotplug-script and add instance ====== > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > > - name_data32.data, instance); > > - system(shell_cmd_str); > > - > > - // ========= Call vtpm_manager and load VTPM ======= > > - TPMTRYRETURN( buffer_init( &out_param_buf, > > - 2*sizeof(UINT32) + state_data32.size, > > - NULL) ); > > - > > - BSG_PackList(out_param_buf.bytes, 2, > > - BSG_TYPE_UINT32, &instance, > > - BSG_TPM_SIZE32_DATA, &state_data32); > > - > > - TPMTRYRETURN( vtpm_manager_open() ); > > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > > - &out_param_buf, > > - &cmd_status, > > - &empty_buf) ); > > - > > - vtpm_manager_close(); > > - > > - TPMTRYRETURN(cmd_status); > > - > > - // ====== Call hotplug-script and resume instance ====== > > - snprintf(shell_cmd_str, shell_cmd_strlen, > > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > > - system(shell_cmd_str); > > - > > - goto egress; > > - abort_egress: > > - egress: > > - free(shell_cmd_str); > > - > > - // In this case no params come back, so reuse build_error_msg even for succes. > > - build_error_msg(result_buf, status); > > - return; > > -} > > - > > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > > deleted file mode 100644 > > index 11af91e..0000000 > > --- a/tools/vtpm_manager/tcs/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libTCS.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > > deleted file mode 100644 > > index cf3803c..0000000 > > --- a/tools/vtpm_manager/tcs/contextmgr.c > > +++ /dev/null > > @@ -1,224 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// contextmgr.c > > -// > > -// This file contains the context management functions for TCS. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include "tcs.h" > > -#include "contextmgr.h" > > -#include "log.h" > > -#include "hashtable.h" > > - > > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - int BlockSize) { // in > > - > > - BLOCK* pCurrentBlock = NULL; > > - BLOCK* pBlock = NULL; > > - > > - // check incoming params > > - if (pContextHandle == NULL || BlockSize == 0) > > - return NULL; > > - > > - // Create New Block > > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > > - if (pBlock == NULL) > > - return (0); > > - > > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > > - if (pBlock->aMemory == NULL) > > - return (0); > > - > > - memset(pBlock->aMemory, 0, BlockSize); > > - pBlock->nBlockSize = BlockSize; > > - pBlock->pNextBlock = NULL; > > - > > - // search for the last block created where to add the > > - // newly created block > > - if(pContextHandle->pTopBlock != NULL) { > > - pCurrentBlock = pContextHandle->pTopBlock; > > - while(pCurrentBlock->pNextBlock != NULL) > > - pCurrentBlock = pCurrentBlock->pNextBlock; > > - > > - > > - pCurrentBlock->pNextBlock= pBlock; > > - } else > > - pContextHandle->pTopBlock = pBlock; > > - > > - > > - pContextHandle->nBlockCount++; > > - > > - return pBlock->aMemory; > > -} > > - > > - > > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - BYTE* pTCPA_BYTEs) { // in > > - BLOCK* pCurrentBlock = NULL; > > - BLOCK* pParentBlock = NULL; > > - BOOL bFound = FALSE; > > - > > - if (pContextHandle == NULL) > > - return FALSE; > > - > > - > > - // Search for the Block in the context by aMemory pointer > > - pParentBlock = NULL; > > - pCurrentBlock = pContextHandle->pTopBlock; > > - > > - while(pCurrentBlock != NULL) { > > - // If aMemory block is found, delete it > > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > > - // if it is the top Block, remove it from the top, > > - // otherwise remove it from the ParentBlock and stitch > > - // the NextBlock to the ParentBlock > > - if(pParentBlock == NULL) > > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > > - else > > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > > - > > - // delete memory Block associated with pointer pTCPA_BYTEs > > - free(pCurrentBlock->aMemory); > > - pCurrentBlock->aMemory = NULL; > > - > > - free(pCurrentBlock); > > - pCurrentBlock = pParentBlock; > > - > > - pContextHandle->nBlockCount--; > > - bFound = TRUE; > > - } > > - > > - if(pCurrentBlock != NULL) { > > - pParentBlock = pCurrentBlock; > > - pCurrentBlock = pCurrentBlock->pNextBlock; > > - } > > - } > > - > > - return bFound; > > -} > > - > > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_RESOURCE_TYPE type, // in > > - TPM_HANDLE handle) { // in > > - HANDLE_LIST* pNewHandle = NULL; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if (pContextHandle == NULL) > > - return 0; > > - > > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > > - > > - if (pNewHandle == NULL) > > - return (0); > > - > > - pNewHandle->handle = handle; > > - pNewHandle->type = type; > > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > > - > > - pContextHandle->pHandleList = pNewHandle; > > - > > - return 1; > > -} > > - > > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_HANDLE handle) { // in > > - > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > > - *pLastHandle = pCurrentHandle; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > > - > > - if (pContextHandle == NULL) > > - return 0; > > - > > - while (1) { > > - > > - if (pCurrentHandle->handle == handle) { // Found element > > - if (pCurrentHandle == pLastHandle) { // First element in list > > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > > - free(pCurrentHandle); > > - } else { // Ordinary element > > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > > - free(pCurrentHandle); > > - } > > - > > - return 1; > > - > > - } else { // Not found yet; > > - pLastHandle = pCurrentHandle; > > - pCurrentHandle = pCurrentHandle->pNextHandle; > > - if (pCurrentHandle == NULL) // Found end of list > > - return 0; > > - } > > - > > - } > > -} > > - > > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > > - HANDLE_LIST* pCurrentHandle; > > - BOOL returncode = TRUE; > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > > - > > - if (pContextHandle == NULL) > > - return 1; > > - > > - pCurrentHandle = pContextHandle->pHandleList; > > - while (pCurrentHandle != NULL) { > > - > > - switch (pCurrentHandle->type) { > > - case TPM_RT_KEY: > > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > > - break; > > - case TPM_RT_AUTH: > > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > > - break; > > - default: > > - returncode = FALSE; > > - } > > - > > - pCurrentHandle = pCurrentHandle->pNextHandle; > > - > > - } > > - > > - return 1; > > -} > > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > > deleted file mode 100644 > > index e3fdf0f..0000000 > > --- a/tools/vtpm_manager/tcs/contextmgr.h > > +++ /dev/null > > @@ -1,82 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// contextmgr.c > > -// > > -// This file contains the context management functions for TCS. > > -// > > -// ================================================================== > > - > > -#ifndef __CONTEXTMGR_H__ > > -#define __CONTEXTMGR_H__ > > - > > -#include "tcg.h" > > - > > -#define BLOCK_SIZE 300 > > - > > -typedef struct block { > > - int nBlockSize; > > - BYTE* aMemory; > > - struct block* pNextBlock; > > -} BLOCK; > > - > > -typedef struct handle_List { > > - TPM_HANDLE handle; > > - TPM_RESOURCE_TYPE type; > > - struct handle_List* pNextHandle; > > -} HANDLE_LIST; > > - > > -typedef struct context_handle { > > - TCS_CONTEXT_HANDLE handle; > > - int nBlockCount; > > - BLOCK* pTopBlock; > > - HANDLE_LIST* pHandleList; > > -} CONTEXT_HANDLE; > > - > > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > > - int BlockSize); // in > > - > > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > > - BYTE* pTCPA_BYTEs); // in > > - > > - > > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_RESOURCE_TYPE type, // in > > - TPM_HANDLE handle); // in > > - > > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_HANDLE handle); // in > > - > > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > > - > > -#endif //_CONTEXTMGR_H_ > > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > > deleted file mode 100644 > > index 7c1378c..0000000 > > --- a/tools/vtpm_manager/tcs/tcs.c > > +++ /dev/null > > @@ -1,1192 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcs.c > > -// > > -// This file contains the functions that implement a TCS. > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "tcs.h" > > -#include "contextmgr.h" > > -#include "tpmddl.h" > > -#include "log.h" > > -#include "hashtable.h" > > -#include "hashtable_itr.h" > > - > > -// Static Global Vars for the TCS > > -static int TCS_m_nCount = 0; > > - > > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > > - > > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > > - > > -struct hashtable *context_ht; > > - > > -// -------------------------- Hash table functions -------------------- > > - > > -static unsigned int hashfunc32(void *ky) { > > - return (* (UINT32 *) ky); > > -} > > - > > -static int equals32(void *k1, void *k2) { > > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > > -} > > - > > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > > -} > > - > > -// --------------------------------------------------------------------------------- > > -// Initialization/Uninitialization SubComponent API > > -// --------------------------------------------------------------------------------- > > -TPM_RESULT TCS_create() { > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TPM_RESULT result = TPM_FAIL; > > - > > - if (TCS_m_nCount == 0) { > > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > > - hRes = TDDL_Open(); > > - > > - context_ht = create_hashtable(10, hashfunc32, equals32); > > - > > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > > - result = TPM_SUCCESS; > > - TCS_m_nCount++; > > - } else { > > - result = TPM_IOERROR; > > - hashtable_destroy(context_ht, 1); > > - } > > - } else > > - TCS_m_nCount++; > > - > > - return(result); > > -} > > - > > - > > -void TCS_destroy() > > -{ > > - TCS_m_nCount--; > > - > > - if (TCS_m_nCount == 0) { > > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > > - TDDL_Close(); > > - > > - struct hashtable_itr *context_itr; > > - TCS_CONTEXT_HANDLE *hContext; > > - > > - // Close all the TCS contexts. TCS should evict keys based on this > > - if (hashtable_count(context_ht) > 0) { > > - context_itr = hashtable_iterator(context_ht); > > - do { > > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > > - > > - } while (hashtable_iterator_advance(context_itr)); > > - free(context_itr); > > - } > > - hashtable_destroy(context_ht, 1); > > - } > > - > > -} > > - > > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 MemSize, // in > > - BYTE** ppMemPtr) {// out > > - > > - TPM_RESULT returnCode = TPM_FAIL; > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if (pContextHandle != NULL && ppMemPtr != NULL) { > > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > > - returnCode = TPM_SUCCESS; > > - } > > - > > - return returnCode; > > -} > > - > > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > > - BYTE* pMemory) { // in > > - TPM_RESULT returnCode = TPM_FAIL; > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if ( (pContextHandle != NULL && pMemory != NULL) && > > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > > - returnCode = TPM_SUCCESS; > > - > > - > > - return returnCode; > > -} > > - > > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > > - TPM_RESULT returnCode = TPM_FAIL; > > - TCS_CONTEXT_HANDLE *newContext; > > - > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > > - > > - if (hContext) { > > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > > - if (pContextHandle == NULL) > > - return TPM_SIZE; > > - > > - // initialize to 0 > > - pContextHandle->nBlockCount = 0; > > - pContextHandle->pTopBlock = NULL; > > - pContextHandle->pHandleList = NULL; > > - > > - // Create New Block > > - AddMemBlock(pContextHandle, BLOCK_SIZE); > > - > > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > > - > > - if (hashtable_search(context_ht, &newContext) !=NULL) > > - *newContext += 1; > > - > > - pContextHandle->handle = *newContext; > > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > > - free(newContext); > > - free(pContextHandle); > > - returnCode = TPM_FAIL; > > - } else { > > - *hContext = *newContext; > > - returnCode = TPM_SUCCESS; > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > > - //FIXME: TCS SHOULD Track failed auths and make sure > > - //we don't try and re-free them here. > > - TPM_RESULT returnCode = TPM_FAIL; > > - > > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > > - > > - if(pContextHandle != NULL) { > > - // Print test info > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > > - > > - // free memory for all the blocks > > - DeleteMemBlock(pContextHandle, NULL ); > > - pContextHandle->pTopBlock = NULL; > > - > > - FreeHandleList(pContextHandle); > > - if (pContextHandle->pHandleList != NULL) > > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > > - > > - // Release the TPM's resources > > - if (hashtable_remove(context_ht, &hContext) == NULL) > > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > > - > > - free(pContextHandle); > > - returnCode = TPM_SUCCESS; > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > > - return(returnCode); > > -} > > - > > -// ------------------------------------------------------------------ > > -// Internal Functions > > -// ------------------------------------------------------------------ > > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > > - // CHECK: according to the command specs, the outgoing auth params are: > > - // nonceEven > > - // nonceOdd > > - // continueAuthSession > > - // auth digest for return params > > - // > > - // this is a bit different than this code... > > - > > - return BSG_PackList(dst, 4, > > - BSG_TYPE_UINT32, &(auth->AuthHandle), > > - BSG_TPM_NONCE, &(auth->NonceOdd), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > > -} > > - > > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > > - return BSG_UnpackList(src, 3, > > - BSG_TPM_NONCE, &(auth->NonceEven), > > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > > -} > > - > > -// ------------------------------------------------------------------ > > -// Authorization Commands > > -// ------------------------------------------------------------------ > > - > > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonce0) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > > - UINT32 paramSize = 0; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (authHandle == NULL || nonce0 == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_UnpackList(OutBuf+i, 2, > > - BSG_TYPE_UINT32, authHandle, > > - BSG_TPM_NONCE, nonce0); > > - > > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_ENTITY_TYPE entityType, // in > > - UINT32 entityValue, // in > > - TPM_NONCE nonceOddOSAP, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonceEven, // out > > - TPM_NONCE* nonceEvenOSAP) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT16, &entityType, > > - BSG_TYPE_UINT32, &entityValue, > > - BSG_TPM_NONCE, &nonceOddOSAP); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_UnpackList(OutBuf+i, 3, > > - BSG_TYPE_UINT32, authHandle, > > - BSG_TPM_NONCE, nonceEven, > > - BSG_TPM_NONCE, nonceEvenOSAP); > > - > > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > > - UINT16 protocolID, // in > > - UINT32 encOwnerAuthSize, // in > > - BYTE* encOwnerAuth, // in > > - UINT32 encSrkAuthSize, // in > > - BYTE* encSrkAuth, // in > > - UINT32* SrkSize, // in, out > > - BYTE** Srk, // in, out > > - TCS_AUTH* ownerAuth) // in, out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT16, &protocolID, > > - BSG_TYPE_UINT32, &encOwnerAuthSize); > > - > > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > > - InLength += encOwnerAuthSize; > > - InLength += BSG_Pack( BSG_TYPE_UINT32, > > - &encSrkAuthSize, > > - InBuf+InLength); > > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > > - InLength += encSrkAuthSize; > > - memcpy(InBuf+InLength, *Srk, *SrkSize); > > - InLength += *SrkSize; > > - InLength += packAuth(InBuf+InLength, ownerAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, > > - &InLength, > > - InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS){ > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_KEY srkPub; > > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > > - unpackAuth(ownerAuth, OutBuf+i); > > - > > - // fill output params > > - BYTE tempBuf[1024]; > > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > > - return(TPM_SIZE); > > - } > > - memcpy(*Srk, tempBuf, *SrkSize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTH* ownerAuth) { // in, out > > - > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - > > - InLength += packAuth(InBuf+InLength, ownerAuth); > > - > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS){ > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - unpackAuth(ownerAuth, OutBuf+i); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &handle); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (!DeleteHandleFromList(hContext, handle)) > > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > > - > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Print debug info > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - > > - } > > - > > - return(returnCode); > > -} > > - > > -// TPM Mandatory > > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_DIGEST inDigest, // in > > - TPM_PCRVALUE* outDigest) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &pcrNum, > > - BSG_TPM_DIGEST, &inDigest); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - > > - // unpack to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > > - // Extract the remaining output parameters > > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_ENCAUTH encAuth, // in > > - UINT32 pcrInfoSize, // in > > - BYTE* PcrInfo, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* pubAuth, // in, out > > - UINT32* SealedDataSize, // out > > - BYTE** SealedData) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &keyHandle, > > - BSG_TPM_ENCAUTH, encAuth, > > - BSG_TYPE_UINT32, &pcrInfoSize); > > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > > - InLength += pcrInfoSize; > > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > > - memcpy(InBuf+InLength, inData, inDataSize); > > - InLength += inDataSize; > > - InLength += packAuth(InBuf+InLength, pubAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > > - == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_STORED_DATA sealedData; > > - > > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > > - unpackAuth(pubAuth, OutBuf+i); > > - > > - // fill SealedData > > - BYTE tempBuf[1024]; > > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*SealedData, tempBuf, *SealedDataSize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE parentHandle, // in > > - UINT32 SealedDataSize, // in > > - BYTE* SealedData, // in > > - TCS_AUTH* parentAuth, // in, out > > - TCS_AUTH* dataAuth, // in, out > > - UINT32* DataSize, // out > > - BYTE** Data) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > > - DataSize == NULL || Data == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &parentHandle); > > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > > - InLength += SealedDataSize; > > - InLength += packAuth(InBuf+InLength, parentAuth); > > - InLength += packAuth(InBuf+InLength, dataAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList( OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*Data, OutBuf+i, *DataSize); > > - i += *DataSize; > > - i += unpackAuth(parentAuth, OutBuf+i); > > - unpackAuth(dataAuth, OutBuf+i); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* outDataSize, // out > > - BYTE** outData) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 5, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &keyHandle, > > - BSG_TYPE_UINT32, &inDataSize); > > - memcpy(InBuf+InLength, inData, inDataSize); > > - InLength += inDataSize; > > - InLength += packAuth(InBuf+InLength, privAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > > - return TPM_SIZE; > > - > > - memcpy(*outData, OutBuf+i, *outDataSize); > > - i += *outDataSize; > > - unpackAuth(privAuth, OutBuf+i); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hWrappingKey, // in > > - TPM_ENCAUTH KeyUsageAuth, // in > > - TPM_ENCAUTH KeyMigrationAuth, // in > > - UINT32* pcKeySize, // in, out > > - BYTE** prgbKey, // in, out > > - TCS_AUTH* pAuth) // in, out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 6, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hWrappingKey, > > - BSG_TPM_ENCAUTH, KeyUsageAuth, > > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > > - InLength += *pcKeySize; > > - InLength += packAuth(InBuf+InLength, pAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_RESULT, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_KEY wrappedKey; > > - > > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > > - unpackAuth(pAuth, OutBuf+i); > > - > > - // Fill prgbKey > > - BYTE tempBuf[1024]; > > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > > - return TPM_SIZE; > > - > > - memcpy(*prgbKey, tempBuf, *pcKeySize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hUnwrappingKey, // in > > - UINT32 cWrappedKeyBlobSize, // in > > - BYTE* rgbWrappedKeyBlob, // in > > - TCS_AUTH* pAuth, // in, out > > - TCS_KEY_HANDLE* phKeyTCSI, // out > > - TCS_KEY_HANDLE* phKeyHMAC) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > > - return TPM_BAD_PARAMETER; > > - > > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hUnwrappingKey); > > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > > - InLength += cWrappedKeyBlobSize; > > - InLength += packAuth(InBuf+InLength, pAuth); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > > - // Extract the remaining output parameters > > - i += BSG_Unpack(BSG_TYPE_UINT32, > > - OutBuf+i, > > - phKeyTCSI); > > - unpackAuth(pAuth, OutBuf+i); > > - > > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, &hKey); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (!DeleteHandleFromList(hContext, hKey)) { > > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > > - } > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > > - UINT32* bytesRequested, // in, out > > - BYTE** randomBytes) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (bytesRequested == NULL || *randomBytes == NULL){ > > - return TPM_BAD_PARAMETER; > > - } > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TYPE_UINT32, bytesRequested); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* pubEndorsementKeySize, // out > > - BYTE** pubEndorsementKey, // out > > - TPM_DIGEST* checksum) // out > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // check input params > > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > > - return TPM_BAD_PARAMETER; > > - } > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 4, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal, > > - BSG_TPM_NONCE, &antiReplay); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - int i = BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - // Extract the remaining output parameters > > - TPM_PUBKEY pubEK; > > - i += BSG_UnpackList(OutBuf+i, 2, > > - BSG_TPM_PUBKEY, &pubEK, > > - BSG_TPM_DIGEST, checksum); > > - > > - // fill EndorsementKey > > - BYTE tempBuf[1024]; > > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > > - return TPM_SIZE; > > - } > > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > > -{ > > - // setup input/output parameters block > > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > > - UINT32 paramSize = 0; > > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > > - TPM_RESULT returnCode = TPM_SUCCESS; > > - > > - // setup the TPM driver input and output buffers > > - TDDL_RESULT hRes = TDDL_E_FAIL; > > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > > - > > - // Convert Byte Input parameter in the input byte stream InBuf > > - InLength = BSG_PackList(InBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &ordinal); > > - // fill paramSize again as we now have the correct size > > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > > - > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > > - > > - // call the TPM driver > > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > > - // unpack OutBuf to get the tag, paramSize, & returnCode > > - BSG_UnpackList(OutBuf, 3, > > - BSG_TPM_TAG, &tag, > > - BSG_TYPE_UINT32, ¶mSize, > > - BSG_TPM_COMMAND_CODE, &returnCode); > > - > > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > > - } > > - } > > - > > - return(returnCode); > > -} > > - > > - > > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > > - BYTE *inData, // in > > - UINT32 *outDataSize,// in/out > > - BYTE *outData) { // out > > - > > - TDDL_RESULT hRes; > > - > > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > > - //FIXME: Add Context Management > > - hRes = TDDL_TransmitData( inData, > > - inDataSize, > > - outData, > > - outDataSize); > > - > > - if (hRes == TDDL_SUCCESS) { > > - return TPM_SUCCESS; > > - } else { > > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > > - return TPM_IOERROR; > > - } > > - > > -} > > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > > deleted file mode 100644 > > index 83b9cd0..0000000 > > --- a/tools/vtpm_manager/tcs/tcs.h > > +++ /dev/null > > @@ -1,245 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcs.h > > -// > > -// This file declares the TCS API > > -// > > -// ================================================================== > > - > > -#ifndef __TCS_H__ > > -#define __TCS_H__ > > - > > -#include "tcg.h" > > -#include "contextmgr.h" > > -#include "buffer.h" > > - > > -#define HANDLE_NULL 0 > > - > > -// ------------------------------------------------------------------ > > -// Exposed API > > -// ------------------------------------------------------------------ > > - > > -TPM_RESULT TCS_create(); > > -void TCS_destroy(); > > - > > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > > - > > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > > - > > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 MemSize, // in > > - BYTE** ppMemPtr ); //out > > - > > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > > - BYTE* pMemory); // in > > - > > -// ------------------------------------------------------------------ > > -// Exposed API > > -// ------------------------------------------------------------------ > > - > > -// TPM v1.1B Command Set > > - > > -// Authorzation > > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonce0 // out > > - ); > > - > > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_ENTITY_TYPE entityType, // in > > - UINT32 entityValue, // in > > - TPM_NONCE nonceOddOSAP, // in > > - TCS_AUTHHANDLE* authHandle, // out > > - TPM_NONCE* nonceEven, // out > > - TPM_NONCE* nonceEvenOSAP // out > > - ); > > - > > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT16 protocolID, // in > > - UINT32 encOwnerAuthSize, // in > > - BYTE* encOwnerAuth, // in > > - UINT32 encSrkAuthSize, // in > > - BYTE* encSrkAuth, // in > > - UINT32* SrkSize, // in, out > > - BYTE** Srk, // in, out > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle // in > > - ); > > - > > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_AUTHHANDLE handle, // in > > - TPM_RESOURCE_TYPE resourceType //in > > - ); > > - > > -// TPM Mandatory > > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_DIGEST inDigest, // in > > - TPM_PCRVALUE* outDigest // out > > - ); > > - > > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_PCRINDEX pcrNum, // in > > - TPM_PCRVALUE* outDigest // out > > - ); > > - > > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* PcrDataSize, // in, out > > - BYTE** PcrData, // in, out > > - TCS_AUTH* privAuth, // in, out > > - UINT32* sigSize, // out > > - BYTE** sig // out > > - ); > > - > > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - TPM_ENCAUTH encAuth, // in > > - UINT32 pcrInfoSize, // in > > - BYTE* PcrInfo, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* pubAuth, // in, out > > - UINT32* SealedDataSize, // out > > - BYTE** SealedData // out > > - ); > > - > > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE parentHandle, // in > > - UINT32 SealedDataSize, // in > > - BYTE* SealedData, // in > > - TCS_AUTH* parentAuth, // in, out > > - TCS_AUTH* dataAuth, // in, out > > - UINT32* DataSize, // out > > - BYTE** Data // out > > - ); > > - > > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_DIRINDEX dirIndex, // in > > - TPM_DIRVALUE newContents, // in > > - TCS_AUTH* ownerAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_DIRINDEX dirIndex, // in > > - TPM_DIRVALUE* dirValue // out > > - ); > > - > > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 inDataSize, // in > > - BYTE* inData, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* outDataSize, // out > > - BYTE** outData // out > > - ); > > - > > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hWrappingKey, // in > > - TPM_ENCAUTH KeyUsageAuth, // in > > - TPM_ENCAUTH KeyMigrationAuth, // in > > - UINT32* pcKeySize, // in, out > > - BYTE** prgbKey, // in, out > > - TCS_AUTH* pAuth // in, out > > - ); > > - > > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hUnwrappingKey, // in > > - UINT32 cWrappedKeyBlobSize, // in > > - BYTE* rgbWrappedKeyBlob, // in > > - TCS_AUTH* pAuth, // in, out > > - TCS_KEY_HANDLE* phKeyTCSI, // out > > - TCS_KEY_HANDLE* phKeyHMAC // out > > - ); > > - > > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey, // in > > - TCS_AUTH* pAuth, // in, out > > - UINT32* pcPubKeySize, // out > > - BYTE** prgbPubKey // out > > - ); > > - > > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE hKey // in > > - ); > > - > > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > > - TCS_KEY_HANDLE keyHandle, // in > > - UINT32 areaToSignSize, // in > > - BYTE* areaToSign, // in > > - TCS_AUTH* privAuth, // in, out > > - UINT32* sigSize, // out > > - BYTE** sig // out > > - ); > > - > > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32* bytesRequested, // in, out > > - BYTE** randomBytes // out > > - ); > > - > > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > > - UINT32 inDataSize, // in > > - BYTE* inData // in > > - ); > > - > > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > > - TPM_NONCE antiReplay, // in > > - UINT32* pubEndorsementKeySize, // out > > - BYTE** pubEndorsementKey, // out > > - TPM_DIGEST* checksum // out > > - ); > > - > > - > > -// Non-Standard TCSP calls > > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > > - > > -//Give direct access to TransmitData. > > -// Key and Auth Management is done before transfering command to TDDL. > > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > > - BYTE *inData, // in > > - UINT32 *outDataSize,// in/out > > - BYTE *outData); // out > > - > > -///////////// Private Functions //////////////////// > > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > > - > > -#endif //TCS_H > > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > > deleted file mode 100644 > > index e7e54f1..0000000 > > --- a/tools/vtpm_manager/tcs/tpmddl.h > > +++ /dev/null > > @@ -1,69 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tpmddl.c > > -// > > -// This file defines the TDDLI API > > -// > > -// ================================================================== > > - > > -#ifndef __TPMDDL_H__ > > -#define __TPMDDL_H__ > > - > > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > > - > > -#define TDDL_E_FAIL 1 > > -#define TDDL_E_SUCCESS 0 > > -#define TDDL_SUCCESS 0 > > - > > -typedef unsigned int TDDL_UINT32; > > -typedef TDDL_UINT32 TDDL_RESULT; > > -typedef unsigned char TDDL_BYTE; > > - > > -TDDL_RESULT TDDL_Open(); > > -void TDDL_Close(); > > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > > - TDDL_UINT32 insize, > > - TDDL_BYTE* out, > > - TDDL_UINT32* outsize); > > -TDDL_RESULT TDDL_GetStatus(); > > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > > - TDDL_UINT32 sub, > > - TDDL_BYTE* buffer, > > - TDDL_UINT32* size); > > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > > - TDDL_UINT32 sub, > > - TDDL_BYTE* buffer, > > - TDDL_UINT32* size); > > - > > -#endif // __TPMDDL_H__ > > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > > deleted file mode 100644 > > index 74bbdca..0000000 > > --- a/tools/vtpm_manager/tcs/transmit.c > > +++ /dev/null > > @@ -1,147 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "buffer.h" > > -#include "log.h" > > -#include "tpmddl.h" > > - > > -// flag to track whether TDDL has been opened > > -static int g_TDDL_open = 0; > > -static int g_tx_fd = -1; // the fd to the TPM > > - > > -#ifndef DUMMY_TPM > > - #define TPM_TX_FNAME "/dev/tpm0" > > - static int *g_rx_fdp = &g_tx_fd; > > -#else > > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > > - static int g_rx_fd = -1; > > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > > -#endif > > - > > -TPM_RESULT > > -TDDL_TransmitData( TDDL_BYTE* in, > > - TDDL_UINT32 insize, > > - TDDL_BYTE* out, > > - TDDL_UINT32* outsize) { > > - TPM_RESULT status = TPM_SUCCESS; > > - TDDL_UINT32 i; > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > > - for(i = 0 ; i < insize ; i++) > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > > - > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - ssize_t size = 0; > > - > > - // send the request > > - size = write (g_tx_fd, in, insize); > > - if (size < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > > - ERRORDIE (TPM_IOERROR); > > - } > > - else if ((TDDL_UINT32) size < insize) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > > - // ... ? > > - } > > - > > - // read the response > > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > > - if (size < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > > - ERRORDIE (TPM_IOERROR); > > - } > > - > > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > > - for(i = 0 ; i < size ; i++) > > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > > - > > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > > - > > - *outsize = size; > > - // close connection > > - goto egress; > > - > > - abort_egress: > > - egress: > > - return status; > > -} > > - > > -TPM_RESULT TDDL_Open() { > > - > > - TDDL_RESULT status = TDDL_SUCCESS; > > - > > - if (g_TDDL_open) > > - return TPM_FAIL; > > - > > -#ifdef DUMMY_TPM > > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > > -#endif > > - > > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > > - if (g_tx_fd < 0) { > > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > > - return TPM_IOERROR; > > - } > > - > > - g_TDDL_open = 1; > > - > > - return status; > > -} > > - > > -void TDDL_Close() { > > - if (! g_TDDL_open) > > - return; > > - > > - if (g_tx_fd>= 0) { > > - if (close(g_tx_fd) < 0) > > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > > - g_tx_fd = -1; > > - } > > - > > - if (*g_rx_fdp>= 0) { > > - if (close(*g_rx_fdp) < 0) > > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > > - *g_rx_fdp = -1; > > - } > > - > > - g_TDDL_open = 0; > > - > > -} > > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > > deleted file mode 100644 > > index 36bc38f..0000000 > > --- a/tools/vtpm_manager/util/Makefile > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -XEN_ROOT = $(CURDIR)/../../.. > > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > > - > > -BIN = libTCGUtils.a > > - > > -.PHONY: all > > -all: build > > - > > -.PHONY: build > > -build: $(BIN) > > - > > -.PHONY: install > > -install: build > > - > > -.PHONY: clean > > -clean: > > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > > - > > -.PHONY: mrproper > > -mrproper: clean > > - rm -f *~ > > - > > -$(BIN): $(OBJS) > > - $(AR) rcs $(BIN) $(OBJS) > > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > > deleted file mode 100644 > > index fa36ce7..0000000 > > --- a/tools/vtpm_manager/util/bsg.c > > +++ /dev/null > > @@ -1,829 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// bsg.cpp > > -// > > -// This file will handle all the TPM Byte Stream functions > > -// > > -// ================================================================== > > - > > -#include > > -#include > > -#include > > -#include > > -#include "tcg.h" > > -#include "crypto.h" > > -#include "bsg.h" > > -#include "log.h" > > - > > -static int g_log_recursion_level = 0; > > - > > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > > -// will complain! > > -#define BSG_MAX_BUF_SIZE (1<<18) > > - > > -#define bsglog(fmt, ...) do { \ > > - int __i; \ > > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > > - } \ > > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > > - } while (0) > > - > > - > > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > > -//BOOL dummy1 = BSG_static_selfcheck(); > > - > > - > > -// Interpretting Types > > -// ------------------- > > -// > > -// Incoming Types are composed of two parts {format, info} squished into a > > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > > -// data it is. If the first 4 bits are zero the info corresponds to a value in > > -// BSG_s_fmt[]. This is a structure whose composition is described in > > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > > -// data (in bytes) being passed in. For example a UINT32 being passed in would > > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > > -// this is interpretted as the end of the structure, and the result is returned. > > - > > -// these flags are mutually exclusive, so I'll just make them > > -// format values which indicate the semantics of the 'info' part and the source > > -// data. The above description has been accordingly adjusted. > > - > > -// format values for determining what type of data the incoming type is > > -// it's a 4 bit value, occupying the high 4 bits > > -#define __FMT_CONST (1UL << 28) // Constant sized value > > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > > -#define __FMT_HSIZE (4UL << 28) // A number of handles > > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > > - // of {size32, data} but we're to pack only the > > - // data as that is already packed, and so > > - // can/must be unpacked without > > - // explicitly reading it size > > - > > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > > - > > -// constant (8/16/32-bits) > > -#define FMT_U8 (__FMT_CONST | 1UL) > > -#define FMT_U16 (__FMT_CONST | 2UL) > > -#define FMT_U32 (__FMT_CONST | 4UL) > > - > > -// const with a compiler-computed size > > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > > - > > -// other data (size bytes) > > -// Used primarily for DIGESTS -> FMT_DATA(20) > > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > > - > > -// 16/32-bit size followed by N bytes of data > > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > > - > > -// 16-bit size followed by N key handles > > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > > - > > -#define DIGEST_SIZE 20 > > -typedef BSG_UINT32 BSG_HANDLE; > > - > > -// TCPA_AUTH has 11 fields! > > -#define MAX_FIELDS 11 > > -typedef struct BSG_Format > > -{ > > - BSG_Type type; > > - const char* name; > > - BSG_UINT32 fields[MAX_FIELDS + 1]; > > -} BSG_Format; > > - > > -/* > > - * TCPA structure data formats > > - */ > > -// this has to be manually kept in sync with the > > -// Type enum!! the static_selfcheck() function should be used regularly! > > -static BSG_Format s_fmt[] = > > -{ > > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > > - > > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > > - > > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > > - > > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > > - {FMT_SIZE16_HANDLES, 0}}, > > - > > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_ENC_SCHEME, > > - BSG_TPM_SIG_SCHEME, > > - FMT_SIZE32_DATA, > > - 0}}, > > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > > - BSG_TPM_VERSION, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_KEY_PARMS, > > - FMT_SIZE32_DATA, // the PCR_INFO > > - BSG_TPM_STORE_PUBKEY, > > - FMT_SIZE32_DATA, // the encrypted part > > - 0}}, > > - > > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > > - BSG_TPM_PUBKEY, > > - BSG_TPM_MIGRATE_SCHEME, > > - BSG_TPM_DIGEST, 0}}, > > - > > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > > - BSG_TPM_COMMAND_CODE, > > - BSG_TPM_RESULT, 0 }}, > > - > > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > > - BSG_TPM_DIGEST, > > - BSG_TPM_DIGEST, > > - FMT_DATA(2), > > - FMT_SIZE32_DATA, 0}}, > > - > > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > > - FMT_SIZE32_DATA, > > - 0} }, > > - > > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_COMPOSITE_HASH, > > - 0} }, > > - > > - > > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > > - BSG_TPM_VERSION, > > - FMT_SIZE32_DATA, > > - FMT_SIZE32_DATA, > > - 0}}, > > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_ENC_SCHEME, > > - FMT_SIZE16_DATA, > > - 0}}, > > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > > - BSG_TPM_PAYLOAD_TYPE, > > - BSG_TPM_SECRET, > > - BSG_TPM_SECRET, > > - BSG_TPM_DIGEST, > > - BSG_TPM_STORE_PRIVKEY, > > - 0}}, > > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > > - BSG_TPM_PAYLOAD_TYPE, > > - BSG_TPM_SECRET, > > - BSG_TPM_DIGEST, > > - FMT_U32, > > - BSG_TPM_STORE_PRIVKEY, > > - 0}}, > > - > > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > > - BSG_TPM_VERSION, > > - FMT_DATA(4), > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_NONCE, > > - 0}}, > > - > > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > > - BSG_TPM_VERSION, > > - FMT_U32, > > - BSG_TPM_CHOSENID_HASH, > > - BSG_TPM_PUBKEY, > > - 0}}, > > - > > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > > - > > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > > - FMT_U8, > > - FMT_U8, > > - 0}}, > > - > > - {BSG_TCS_AUTH, "TCS_AUTH", { > > - BSG_TYPE_UINT32, > > - BSG_TPM_NONCE, > > - BSG_TPM_NONCE, > > - BSG_TYPE_BOOL, > > - BSG_TPM_AUTHDATA, > > - 0}}, > > - > > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > > - BSG_TPM_VERSION, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_KEY_PARMS, > > - FMT_SIZE32_DATA, > > - BSG_TPM_STORE_PUBKEY, > > - 0}}, > > - > > - {BSG_PACKED, "BSG_PACKED", { > > - __FMT_PACKED, > > - 0 }}, > > - > > - {BSG_TYPE_MAX, "", {0}}, > > -}; > > - > > - > > -static const BSG_Format* find_format (BSG_Type t) { > > - BSG_Format * f = s_fmt; > > - > > - if (t >= BSG_TYPE_MAX) { > > - return NULL; > > - } > > - > > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > > - // sure to run the static_selfcheck() to make sure > > - f = s_fmt + (t - BSG_TYPE_FIRST); > > - > > - return f; > > -} > > - > > -// > > -// a consistency-checking routine which can be run at compile time > > -// (ie. immediately after compilation) > > -// > > -// tasks: > > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > > -// > > -// conditions: > > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > > -// Type has value 0, not 1 > > -// > > -// FIXME: should have a function be passed in here which is called if the test > > -// fails. Then the caller can decide what to do: abort, notify, whatever > > -// > > -BOOL BSG_static_selfcheck () > > -{ > > - int i; > > - > > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > > - bsglog ("failure at %i, allegedly %s\n", > > - i, s_fmt[i - BSG_TYPE_FIRST].name); > > - abort(); > > - return FALSE; > > - } > > - } > > - > > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > > - return TRUE; > > -} > > - > > - > > -/** > > - * Flatten a TCPA structure into a buffer in big-endian format > > - * @type: TCPA structure type > > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > > - * @dst: (OUT) flattened data > > - * Returns: Flattened size or -1 for unknown types > > - */ > > -// make it so that it can just run through the whole process and return > > -// the packed size, without packing anything. this will be done if dst is NULL. > > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > > -{ > > - // check incoming parameters > > - if (*src == NULL) > > - return 0; > > - > > - const BSG_BYTE* s = *src; > > - BSG_BYTE* d = dst; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > > - { > > - BSG_UINT32 val = 0; > > - switch (size) { > > - case 1: val = * (BYTE*) s; break; > > - case 2: val = * (unsigned short*) s; break; > > - case 4: val = * (BSG_UINT32*) s; break; > > - } > > - if (dst) > > - BSG_PackConst(val, size, d); > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > > - // this is used. > > - > > - if (dst) { > > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > > - memcpy(d, s, size); > > - } > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > > - > > - BSG_UINT32 psize = 0; > > - switch (size) { > > - case 1: psize = * (BYTE*) s; break; > > - case 2: psize = * (unsigned short*) s; break; > > - case 4: psize = * (BSG_UINT32*) s; break; > > - } > > - > > - if (dst) > > - BSG_PackConst(psize, size, d); > > - > > - s += size; > > - d += size; > > - > > - // now 's' points to an address, so cast it to BSG_BYTE** > > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > > - s += sizeof(BSG_BYTE*); > > - > > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > > - if (dst) { > > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > > - BSG_UINT32 i; > > - for (i = 0; i < psize; i++) > > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > > - > > - } > > - d += psize * sizeof(BSG_HANDLE); > > - } else {// If it's not psize handles, it's psize data. > > - if (psize > 0) { > > - if (dst) { > > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > > - psize, pdata, d); > > - memcpy(d, pdata, psize); > > - } > > - } > > - d += psize; > > - } > > - } else if (format == __FMT_PACKED) { > > - // the source buffer is a pack_constbuf_t, which has a size and a > > - // pointer. just copy the buffer value, the size is not included in the > > - // output stream. > > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > > - > > - if (dst) { > > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > > - buf->size, buf->data, d); > > - memcpy(d, buf->data, buf->size); > > - } > > - > > - s += buf->size; > > - d += buf->size; > > - } else if (format == 0) {// No flags are set. This is a structure & it should > > - // be looked up in the bsg_s_fmt[] > > - > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > > - return -1; > > - } > > - > > - if (dst) > > - bsglog ("BSG_Pack type %s\n", x->name); > > - > > - > > - // iterate through the fields > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) { > > - int fsize; > > - > > - g_log_recursion_level++; > > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > > - g_log_recursion_level--; > > - > > - if (fsize <= 0) > > - return fsize; > > - > > - d += fsize; > > - } > > - } else { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > > - return -1; > > - } > > - > > - *src = s; > > - return (d - dst); > > -} > > - > > -/** > > - * Unflatten a TCPA structure from a buffer in big-endian format > > - * @type: TCPA structure type > > - * @src: flattened data > > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > > - * Returns: Flattened size > > - * Note: Returns flattened size NOT the unpacked structure size > > - */ > > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > > - // check incoming parameters > > - if (src == NULL) > > - return 0; > > - > > - > > - const BSG_BYTE* s = src; > > - BSG_BYTE* d = dst ? *dst:NULL; > > - if (dst && !d) > > - dst = NULL; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > > - > > - BSG_UINT32 val = BSG_UnpackConst(s, size); > > - > > - if (dst) { > > - switch (size) { > > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > > - case 2: *(unsigned short*) d = (unsigned short) val; break; > > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > > - } > > - } > > - > > - s += size; > > - d += size; > > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > > - if (dst) > > - memcpy(d, s, size); > > - > > - d += size; > > - s += size; > > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > > - > > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > > - > > - if (psize > BSG_MAX_BUF_SIZE) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > > - BSG_MAX_BUF_SIZE); > > - return -1; > > - } > > - > > - if (dst) { > > - switch (size) { > > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > > - } > > - } > > - > > - s += size; > > - d += size; > > - > > - BSG_BYTE* pdata = NULL; > > - > > - if (psize) { > > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > > - if (dst) { > > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > > - if (!pdata) > > - return -1; > > - > > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > > - BSG_UINT32 i; > > - for (i = 0; i < psize; i++) { > > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > > - } > > - } > > - s += psize * sizeof(BSG_HANDLE); > > - } else { // If it's not psize handles, it's psize data. > > - if (dst) { > > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > > - if (!pdata) > > - return -1; > > - memcpy(pdata, s, psize); > > - } > > - s += psize; > > - } > > - } > > - if (dst) > > - *(void**) d = pdata; > > - > > - d += sizeof(void*); > > - } else if (format == __FMT_PACKED) { > > - > > - // this doesn't make sense for unpacking! > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > > - "This does not make sense\n"); > > - > > - return -1; > > - } else if (format == 0) {// No flags are set. This is a structure & it should > > - // be looked up in the bsg_s_fmt[] > > - > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > > - return -1; > > - } > > - > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) { > > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > > - if (fsize <= 0) > > - return fsize; > > - s += fsize; > > - } > > - } > > - > > - if (dst) > > - *dst = d; > > - return (s - src); > > -} > > - > > -/** > > - * Free memory associated with unpacked TCPA structure > > - * @type: TCPA structure type > > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > > - * Note: Destroy should be called on all structures created with Unpack > > - * to ensure that any allocated memory is freed > > - */ > > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > > - BSG_BYTE* s = *src; > > - > > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > > - > > - if ((src == NULL) || (*src == NULL)) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > > - return; > > - } > > - > > - if (format == __FMT_CONST || format == __FMT_DATA) > > - s += size; > > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > > - s += size; > > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > > - free(ptr); > > - s += sizeof(void*); > > - } else if (format == __FMT_PACKED) { > > - > > - // this doesn't make sense for unpacking, hence also for Destroy() > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > > - "This does not make sense\n"); > > - > > - return; > > - } else if (format == 0) { > > - const BSG_Format* x = find_format (type); > > - if (x == NULL) { > > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > > - return; > > - } > > - > > - const BSG_UINT32* f = x->fields; > > - for (; *f; f++) > > - BSG_Destroy_private((BSG_Type) *f, &s); > > - } > > - > > - *src = s; > > -} > > - > > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > > -{ > > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > > - return BSG_Pack_private(type, &src2, dst); > > -} > > - > > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > > -{ > > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > > -} > > - > > -void BSG_Destroy(BSG_Type type, void* src) > > -{ > > - BSG_BYTE* src2 = (BSG_BYTE*) src; > > - BSG_Destroy_private(type, &src2); > > -} > > - > > -/** > > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > > - * @val: constant value > > - * @size: constant size in bytes (1, 2, or 4) > > - * @dst: (OUT) buffer > > - */ > > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > > - > > - switch (size) { > > - case 4: > > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > > - dst[3] = (BSG_BYTE)(val & 0xff); > > - break; > > - case 2: > > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > > - dst[1] = (BSG_BYTE)(val & 0xff); > > - break; > > - case 1: > > - dst[0] = (BSG_BYTE)(val & 0xff); > > - break; > > - } > > -} > > - > > -/** > > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > > - * @src: buffer > > - * @size: constant size in bytes (1, 2, or 4) > > - */ > > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > > - BSG_UINT32 val = 0; > > - > > - if (src == NULL) > > - return 0; > > - > > - switch (size) { > > - case 4: > > - val = (((BSG_UINT32) src[0]) << 24 > > - | ((BSG_UINT32) src[1]) << 16 > > - | ((BSG_UINT32) src[2]) << 8 > > - | (BSG_UINT32) src[3]); > > - break; > > - case 2: > > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > > - break; > > - case 1: > > - val = (BSG_UINT32) src[0]; > > - break; > > - } > > - return val; > > -} > > - > > -// Pack a list of parameters. Beware not to send values, but rather you must > > -// send a pointer to your values Instead. This includes UINT32's. > > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > > - int ParamNumber; > > - BSG_Type format; > > - BSG_BYTE* val = NULL; > > - int size=0; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > > - format = (BSG_Type) va_arg( paramList, int ); > > - val = va_arg( paramList, BSG_BYTE* ); > > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > > - } > > - > > - va_end (paramList); > > - > > - return size; > > -} > > - > > -// Unpack a list of parameters. > > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > > - int ParamNumber = 0; > > - BSG_Type format; > > - BSG_BYTE* val = NULL; > > - int size = 0; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - format = (BSG_Type) va_arg( paramList, int ); > > - val = va_arg( paramList, BSG_BYTE* ); > > - > > - size += BSG_Unpack(format, src + size, val); > > - } > > - > > - va_end( paramList ); > > - > > - return size; > > -} > > - > > -// Destroy any memory allocated by calls to unpack > > -void BSG_DestroyList(int ParamCount, ... ) { > > - int ParamNumber = 0; > > - BSG_Type argType; > > - BSG_BYTE* paramValue = NULL; > > - > > - va_list paramList; > > - va_start( paramList, ParamCount ); > > - > > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > > - argType = (BSG_Type) va_arg( paramList, int ); > > - paramValue = va_arg( paramList, BSG_BYTE* ); > > - > > - BSG_Destroy(argType, paramValue); > > - } > > - > > - va_end( paramList ); > > - > > - return; > > -} > > - > > - > > -// and a tuple version > > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > > - int i; > > - > > - for (i = 0; i < numParams; i++) > > - BSG_Destroy (params[i].type, params[i].addr); > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > -// > > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > > -// by the caller later > > -// > > - > > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > > - int size = BSG_Pack (type, src, NULL); > > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > > - if (dest == NULL) > > - return -1; > > - > > - size = BSG_Pack(type, src, dest); > > - *o_dst = dest; > > - return size; > > -} > > - > > - > > - > > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > > - va_list args; > > - int size; > > - > > - va_start (args, ParamCount); > > - size = BSG_PackList (NULL, ParamCount, args); > > - va_end (args); > > - > > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > > - if (dest == NULL) > > - return -1; > > - > > - va_start (args, ParamCount); > > - size = BSG_PackList (dest, ParamCount, args); > > - va_end (args); > > - > > - *outBuffer = dest; > > - return size; > > -} > > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > > deleted file mode 100644 > > index 0896812..0000000 > > --- a/tools/vtpm_manager/util/bsg.h > > +++ /dev/null > > @@ -1,166 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// bsg.h > > -// > > -// This file contains API's for the TPM Byte Stream functions > > -// > > -// ================================================================== > > - > > -#ifndef __BSG_H__ > > -#define __BSG_H__ > > - > > -#include > > -#include "buffer.h" > > - > > -typedef unsigned int BSG_UINT32; > > -typedef unsigned char BSG_BYTE; > > - > > -// forward decl > > -struct pack_const_tuple_t; > > - > > -struct pack_tuple_t; > > - > > - > > -/** > > - * Byte stream generator > > - */ > > -// this has to be manually kept in sync with the > > -// s_fmt array!! > > -// but now we have a self-check function which can make sure things are well > > -// (if used!) > > -typedef enum BSG_Type > > -{ > > - BSG_TYPE_FIRST = 1, > > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > > - // unused/special value > > - BSG_TYPE_UINT16, > > - BSG_TYPE_BYTE, > > - BSG_TYPE_BOOL, > > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > > - // a pointer to that much data. can pass a > > - // struct pack_buf_t as the param > > - BSG_TPM_TAG, > > - BSG_TPM_HANDLE, > > - BSG_TPM_RESULT, > > - BSG_TPM_RESOURCE_TYPE, > > - BSG_TPM_COMMAND_CODE, > > - BSG_TPM_AUTH_DATA_USAGE, > > - BSG_TPM_ALGORITHM_ID, > > - BSG_TPM_PROTOCOL_ID, > > - BSG_TPM_KEY_USAGE, > > - BSG_TPM_ENC_SCHEME, > > - BSG_TPM_SIG_SCHEME, > > - BSG_TPM_MIGRATE_SCHEME, > > - BSG_TPM_KEY_FLAGS, > > - BSG_TPM_AUTHDATA, > > - BSG_TPM_SECRET, > > - BSG_TPM_ENCAUTH, > > - BSG_TPM_PAYLOAD_TYPE, > > - > > - BSG_TPM_VERSION, > > - BSG_TPM_DIGEST, > > - BSG_TPM_COMPOSITE_HASH, > > - BSG_TPM_CHOSENID_HASH, > > - BSG_TPM_NONCE, > > - BSG_TPM_KEY_HANDLE, > > - BSG_TPM_KEY_HANDLE_LIST, > > - BSG_TPM_KEY_PARMS, > > - BSG_TPM_RSA_KEY_PARMS, > > - BSG_TPM_STORE_PUBKEY, > > - BSG_TPM_PUBKEY, > > - BSG_TPM_KEY, > > - > > - BSG_TPM_MIGRATIONKEYAUTH, > > - BSG_TCPA_AUDIT_EVENT, > > - BSG_TCPA_EVENT_CERT, > > - BSG_TPM_PCR_SELECTION, > > - BSG_TPM_PCR_COMPOSITE, > > - BSG_TPM_PCR_INFO, > > - BSG_TPM_STORED_DATA, > > - BSG_TPM_SYMMETRIC_KEY, > > - BSG_TPM_STORE_PRIVKEY, > > - BSG_TPM_STORE_ASYMKEY, > > - BSG_TPM_MIGRATE_ASYMKEY, > > - BSG_TPM_QUOTE_INFO, > > - BSG_TPM_IDENTITY_CONTENTS, > > - BSG_TPM_PCRVALUE, > > - BSG_TCPA_PCR_FLAGS, > > - BSG_TCS_AUTH, > > - > > - // this is the BSG_TPM_KEY struct without the encData field > > - BSG_TPM_KEY_NONSENSITIVE, > > - > > - BSG_PACKED, > > - > > - BSG_TYPE_MAX > > -} BSG_Type; > > - > > -struct pack_const_tuple_t { > > - BSG_Type type; > > - const void * addr; > > -}; > > - > > - > > -typedef struct pack_tuple_t { > > - BSG_Type type; > > - void * addr; > > -} pack_tuple_t; > > - > > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > > -void BSG_Destroy(BSG_Type type, void* src); > > - > > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > > -// by the caller later. returns size of allocated buffer, or -1 in case > > -// allocation failed > > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > > - > > -// a va_list version of PackList > > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > > -void BSG_DestroyList(int ParamCount, ... ); > > - > > -// wrapper of PackList which uses a buffer_t > > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > > - > > -// and a tuple version > > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > > - > > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > > - > > -BOOL BSG_static_selfcheck (); > > - > > -#endif > > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > > deleted file mode 100644 > > index df48bc2..0000000 > > --- a/tools/vtpm_manager/util/buffer.c > > +++ /dev/null > > @@ -1,226 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > - > > -#include > > -#include > > -#include > > -#include > > -#include > > - > > -#include "tcg.h" > > -#include "bsg.h" > > -#include "buffer.h" > > - > > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > > - > > -// > > -// buffer functions! > > -// > > - > > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > > - if (initsize == 0) { > > - memset(buf, 0, sizeof(*buf)); > > - return TPM_SUCCESS; > > - } > > - > > - > > - buf->bytes = (BYTE*) malloc (initsize); > > - if (buf->bytes == NULL) > > - return TPM_RESOURCES; > > - > > - buf->size = initsize; > > - buf->alloc_size = initsize; > > - > > - if (initval) > > - memcpy (buf->bytes, initval, initsize); > > - > > - buf->is_owner = TRUE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > > - > > - buf->size = initsize; > > - buf->alloc_size = initsize; > > - buf->bytes = initval; > > - > > - buf->is_owner = TRUE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > > - buf->is_owner = TRUE; > > - > > - return status; > > -} > > - > > - > > - > > -// make an alias to a constant array > > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > > - // TODO: try to enforce the const things somehow! > > - buf->bytes = (BYTE*) val; > > - buf->size = size; > > - buf->alloc_size = 0; // this field is now unneeded > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -// make an alias into buf, with given offset and length > > -// if len = 0, make the alias go to the end of buf > > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > > - tpm_size_t offset, tpm_size_t len) { > > - if (offset + len > b->size) { > > - return TPM_NOSPACE; > > - } > > - > > - buf->bytes = b->bytes + offset; > > - buf->size = len > 0 ? len : b->size - offset; > > - > > - //VS/ buf->alloc_size = 0; > > - if (len ==0) > > - buf->alloc_size = b->alloc_size - offset; > > - else > > - buf->alloc_size = MIN(b->alloc_size - offset, len); > > - > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > -// make an alias buffer_t into bytestream, with given length > > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > > - > > - buf->size = size; > > - buf->alloc_size = size; > > - buf->bytes = val; > > - > > - buf->is_owner = FALSE; > > - > > - return TPM_SUCCESS; > > -} > > - > > - > > - > > -// copy into the start of dest > > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > > -{ > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (dest->alloc_size < src->size) { > > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > > - } > > - > > - memcpy (dest->bytes, src->bytes, src->size); > > - dest->size = src->size; > > - > > - //VS/ dest->is_owner = TRUE; > > - > > - abort_egress: > > - > > - return status; > > -} > > - > > - > > - > > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > > -} > > - > > - > > -void buffer_memset (buffer_t * buf, BYTE b) { > > - memset (buf->bytes, b, buf->size); > > -} > > - > > - > > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > > - TPM_RESULT status = TPM_SUCCESS; > > - > > - if (buf->alloc_size < buf->size + len) { > > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > > - } > > - > > - memcpy (buf->bytes + buf->size, bytes, len); > > - > > - buf->size += len; > > - > > - goto egress; > > - > > - abort_egress: > > - > > - egress: > > - > > - return status; > > -} > > - > > -tpm_size_t buffer_len (const buffer_t* buf) { > > - return buf->size; > > -} > > - > > -TPM_RESULT buffer_free (buffer_t * buf) { > > - if (buf && buf->is_owner && buf->bytes != NULL) { > > - free (buf->bytes); > > - buf->bytes = NULL; > > - buf->size = buf->alloc_size = 0; > > - > > - } > > - > > - return TPM_SUCCESS; > > -} > > - > > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > > - > > - // we want to realloc to twice the size, or the new size, whichever > > - // bigger > > - > > - BYTE * tmpbuf = NULL; > > - > > - newsize = MAX (buf->alloc_size * 2, newsize); > > - > > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > > - if (tmpbuf == NULL) > > - return TPM_SIZE; > > - > > - > > - buf->bytes = tmpbuf; > > - buf->alloc_size = newsize; > > - > > - return TPM_SUCCESS; > > -} > > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > > deleted file mode 100644 > > index d8a9abc..0000000 > > --- a/tools/vtpm_manager/util/buffer.h > > +++ /dev/null > > @@ -1,95 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#ifndef __VTPM_BUFFER_H__ > > -#define __VTPM_BUFFER_H__ > > - > > -#include // for pointer NULL > > -#include "tcg.h" > > - > > -typedef UINT32 tpm_size_t; > > - > > -// first version, probably will be expanded... > > - > > -#define NULL_BUF {0,0,0,0} > > - > > -typedef struct { > > - // private!! > > - tpm_size_t size, alloc_size; > > - BYTE * bytes; > > - > > - BOOL is_owner; // do we own this buffer, and need to free it? > > -} buffer_t; > > - > > -// allocate the buffer if initsize > 0, copying over initval if provided > > -TPM_RESULT buffer_init (buffer_t * buf, > > - tpm_size_t initsize, > > - const BYTE* initval); > > - > > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > > -TPM_RESULT buffer_init_convert (buffer_t * buf, > > - tpm_size_t initsize, > > - BYTE* initval); > > - > > -// make an alias to a constant array, no copying > > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > > - > > -// make an alias into buf, with given offset and length > > -// if len = 0, make the alias go to the end of buf > > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > > - tpm_size_t offset, tpm_size_t); > > - > > -// make an alias buffer into a bytestream > > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > > - tpm_size_t size, BYTE* val); > > - > > -// "copy constructor" > > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > > - > > - > > -// copy into the start of a > > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > > - > > -// are they equal? > > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > > - > > -// set the buffer to a constant byte > > -void buffer_memset (buffer_t * buf, BYTE b); > > - > > -tpm_size_t buffer_len (const buffer_t* buf); > > - > > -TPM_RESULT buffer_free (buffer_t * buf); > > - > > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > > - > > -#endif // _TOOLS_H_ > > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > > deleted file mode 100644 > > index aff0e2b..0000000 > > --- a/tools/vtpm_manager/util/hashtable.c > > +++ /dev/null > > @@ -1,316 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable.c > > - * - tools/blktap2/drivers/hashtable.c > > - */ > > - > > -#include "hashtable.h" > > -#include "hashtable_private.h" > > -#include > > -#include > > -#include > > -#include > > - > > -/* > > -Credit for primes table: Aaron Krowne > > - http://br.endernet.org/~akrowne/ > > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > > -*/ > > -static const unsigned int primes[] = { > > -53, 97, 193, 389, > > -769, 1543, 3079, 6151, > > -12289, 24593, 49157, 98317, > > -196613, 393241, 786433, 1572869, > > -3145739, 6291469, 12582917, 25165843, > > -50331653, 100663319, 201326611, 402653189, > > -805306457, 1610612741 > > -}; > > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > > -const float max_load_factor = 0.65; > > - > > -/*****************************************************************************/ > > -struct hashtable * > > -create_hashtable(unsigned int minsize, > > - unsigned int (*hashf) (void*), > > - int (*eqf) (void*,void*)) > > -{ > > - struct hashtable *h; > > - unsigned int pindex, size = primes[0]; > > - /* Check requested hashtable isn't too large */ > > - if (minsize > (1u << 30)) return NULL; > > - /* Enforce size as prime */ > > - for (pindex=0; pindex < prime_table_length; pindex++) { > > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > > - } > > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > > - if (NULL == h) return NULL; /*oom*/ > > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > > - memset(h->table, 0, size * sizeof(struct entry *)); > > - h->tablelength = size; > > - h->primeindex = pindex; > > - h->entrycount = 0; > > - h->hashfn = hashf; > > - h->eqfn = eqf; > > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_init(&h->mutex, NULL); > > -#endif > > - return h; > > -} > > - > > -/*****************************************************************************/ > > -unsigned int > > -hash(struct hashtable *h, void *k) > > -{ > > - unsigned int i = h->hashfn(k); > > - i += ~(i << 9); > > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > > - i += (i << 4); > > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > > - return i; > > -} > > - > > -/*****************************************************************************/ > > -static int > > -hashtable_expand(struct hashtable *h) > > -{ > > - /* Double the size of the table to accomodate more entries */ > > - struct entry **newtable; > > - struct entry *e; > > - struct entry **pE; > > - unsigned int newsize, i, index; > > - /* Check we're not hitting max capacity */ > > - if (h->primeindex == (prime_table_length - 1)) return 0; > > - newsize = primes[++(h->primeindex)]; > > - > > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > > - if (NULL != newtable) > > - { > > - memset(newtable, 0, newsize * sizeof(struct entry *)); > > - /* This algorithm is not 'stable'. ie. it reverses the list > > - * when it transfers entries between the tables */ > > - for (i = 0; i < h->tablelength; i++) { > > - while (NULL != (e = h->table[i])) { > > - h->table[i] = e->next; > > - index = indexFor(newsize,e->h); > > - e->next = newtable[index]; > > - newtable[index] = e; > > - } > > - } > > - free(h->table); > > - h->table = newtable; > > - } > > - /* Plan B: realloc instead */ > > - else > > - { > > - newtable = (struct entry **) > > - realloc(h->table, newsize * sizeof(struct entry *)); > > - if (NULL == newtable) { (h->primeindex)--; return 0; } > > - h->table = newtable; > > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > > - for (i = 0; i < h->tablelength; i++) { > > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > > - index = indexFor(newsize,e->h); > > - if (index == i) > > - { > > - pE = &(e->next); > > - } > > - else > > - { > > - *pE = e->next; > > - e->next = newtable[index]; > > - newtable[index] = e; > > - } > > - } > > - } > > - } > > - h->tablelength = newsize; > > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > > - return -1; > > -} > > - > > -/*****************************************************************************/ > > -unsigned int > > -hashtable_count(struct hashtable *h) > > -{ > > - unsigned int count; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - count = h->entrycount; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return count; > > -} > > - > > -/*****************************************************************************/ > > -int > > -hashtable_insert(struct hashtable *h, void *k, void *v) > > -{ > > - /* This method allows duplicate keys - but they shouldn't be used */ > > - unsigned int index; > > - struct entry *e; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - if (++(h->entrycount) > h->loadlimit) > > - { > > - /* Ignore the return value. If expand fails, we should > > - * still try cramming just this value into the existing table > > - * -- we may not have memory for a larger table, but one more > > - * element may be ok. Next time we insert, we'll try expanding again.*/ > > - hashtable_expand(h); > > - } > > - e = (struct entry *)malloc(sizeof(struct entry)); > > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > > - e->h = hash(h,k); > > - index = indexFor(h->tablelength,e->h); > > - e->k = k; > > - e->v = v; > > - e->next = h->table[index]; > > - h->table[index] = e; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return -1; > > -} > > - > > -/*****************************************************************************/ > > -void * /* returns value associated with key */ > > -hashtable_search(struct hashtable *h, void *k) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e; > > - unsigned int hashvalue, index; > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hashvalue); > > - e = h->table[index]; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return e->v; > > - } > > - e = e->next; > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return NULL; > > -} > > - > > -/*****************************************************************************/ > > -void * /* returns value associated with key */ > > -hashtable_remove(struct hashtable *h, void *k) > > -{ > > - /* TODO: consider compacting the table when the load factor drops enough, > > - * or provide a 'compact' method. */ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e; > > - struct entry **pE; > > - void *v; > > - unsigned int hashvalue, index; > > - > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hash(h,k)); > > - pE = &(h->table[index]); > > - e = *pE; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > > - { > > - *pE = e->next; > > - h->entrycount--; > > - v = e->v; > > - freekey(e->k); > > - free(e); > > - return v; > > - } > > - pE = &(e->next); > > - e = e->next; > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return NULL; > > -} > > - > > -/*****************************************************************************/ > > -/* destroy */ > > -void > > -hashtable_destroy(struct hashtable *h, int free_values) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - unsigned int i; > > - struct entry *e, *f; > > - struct entry **table = h->table; > > - if (free_values) > > - { > > - for (i = 0; i < h->tablelength; i++) > > - { > > - e = table[i]; > > - while (NULL != e) > > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > > - } > > - } > > - else > > - { > > - for (i = 0; i < h->tablelength; i++) > > - { > > - e = table[i]; > > - while (NULL != e) > > - { f = e; e = e->next; freekey(f->k); free(f); } > > - } > > - } > > - free(h->table); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_destroy(&h->mutex); > > -#endif > > - free(h); > > -} > > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > > deleted file mode 100644 > > index dedc60a..0000000 > > --- a/tools/vtpm_manager/util/hashtable.h > > +++ /dev/null > > @@ -1,204 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable.h > > - * - tools/blktap2/drivers/hashtable.h > > - */ > > - > > -#ifndef __HASHTABLE_CWC22_H__ > > -#define __HASHTABLE_CWC22_H__ > > - > > -struct hashtable; > > - > > -/* Example of use: > > - * > > - * struct hashtable *h; > > - * struct some_key *k; > > - * struct some_value *v; > > - * > > - * static unsigned int hash_from_key_fn( void *k ); > > - * static int keys_equal_fn ( void *key1, void *key2 ); > > - * > > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > > - * > > - * (initialise k and v to suitable values) > > - * > > - * if (! hashtable_insert(h,k,v) ) > > - * { exit(-1); } > > - * > > - * if (NULL == (found = hashtable_search(h,k) )) > > - * { printf("not found!"); } > > - * > > - * if (NULL == (found = hashtable_remove(h,k) )) > > - * { printf("Not found\n"); } > > - * > > - */ > > - > > -/* Macros may be used to define type-safe(r) hashtable access functions, with > > - * methods specialized to take known key and value types as parameters. > > - * > > - * Example: > > - * > > - * Insert this at the start of your file: > > - * > > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > > - * > > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > > - * These operate just like hashtable_insert etc., with the same parameters, > > - * but their function signatures have 'struct some_key *' rather than > > - * 'void *', and hence can generate compile time errors if your program is > > - * supplying incorrect data as a key (and similarly for value). > > - * > > - * Note that the hash and key equality functions passed to create_hashtable > > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > > - * a difficult issue as they're only defined and passed once, and the other > > - * functions will ensure that only valid keys are supplied to them. > > - * > > - * The cost for this checking is increased code size and runtime overhead > > - * - if performance is important, it may be worth switching back to the > > - * unsafe methods once your program has been debugged with the safe methods. > > - * This just requires switching to some simple alternative defines - eg: > > - * #define insert_some hashtable_insert > > - * > > - */ > > - > > -/***************************************************************************** > > - * create_hashtable > > - > > - * @name create_hashtable > > - * @param minsize minimum initial size of hashtable > > - * @param hashfunction function for hashing keys > > - * @param key_eq_fn function for determining key equality > > - * @return newly created hashtable or NULL on failure > > - */ > > - > > -struct hashtable * > > -create_hashtable(unsigned int minsize, > > - unsigned int (*hashfunction) (void*), > > - int (*key_eq_fn) (void*,void*)); > > - > > -/***************************************************************************** > > - * hashtable_insert > > - > > - * @name hashtable_insert > > - * @param h the hashtable to insert into > > - * @param k the key - hashtable claims ownership and will free on removal > > - * @param v the value - does not claim ownership > > - * @return non-zero for successful insertion > > - * > > - * This function will cause the table to expand if the insertion would take > > - * the ratio of entries to table size over the maximum load factor. > > - * > > - * This function does not check for repeated insertions with a duplicate key. > > - * The value returned when using a duplicate key is undefined -- when > > - * the hashtable changes size, the order of retrieval of duplicate key > > - * entries is reversed. > > - * If in doubt, remove before insert. > > - */ > > - > > -int > > -hashtable_insert(struct hashtable *h, void *k, void *v); > > - > > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > > -{ \ > > - return hashtable_insert(h,k,v); \ > > -} > > - > > -/***************************************************************************** > > - * hashtable_search > > - > > - * @name hashtable_search > > - * @param h the hashtable to search > > - * @param k the key to search for - does not claim ownership > > - * @return the value associated with the key, or NULL if none found > > - */ > > - > > -void * > > -hashtable_search(struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > > -valuetype * fnname (struct hashtable *h, keytype *k) \ > > -{ \ > > - return (valuetype *) (hashtable_search(h,k)); \ > > -} > > - > > -/***************************************************************************** > > - * hashtable_remove > > - > > - * @name hashtable_remove > > - * @param h the hashtable to remove the item from > > - * @param k the key to search for - does not claim ownership > > - * @return the value associated with the key, or NULL if none found > > - */ > > - > > -void * /* returns value */ > > -hashtable_remove(struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > > -valuetype * fnname (struct hashtable *h, keytype *k) \ > > -{ \ > > - return (valuetype *) (hashtable_remove(h,k)); \ > > -} > > - > > - > > -/***************************************************************************** > > - * hashtable_count > > - > > - * @name hashtable_count > > - * @param h the hashtable > > - * @return the number of items stored in the hashtable > > - */ > > -unsigned int > > -hashtable_count(struct hashtable *h); > > - > > - > > -/***************************************************************************** > > - * hashtable_destroy > > - > > - * @name hashtable_destroy > > - * @param h the hashtable > > - * @param free_values whether to call 'free' on the remaining values > > - */ > > - > > -void > > -hashtable_destroy(struct hashtable *h, int free_values); > > - > > -#endif /* __HASHTABLE_CWC22_H__ */ > > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > > deleted file mode 100644 > > index dcf42c8..0000000 > > --- a/tools/vtpm_manager/util/hashtable_itr.c > > +++ /dev/null > > @@ -1,236 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/blktap2/drivers/hashtable_itr.c > > - */ > > - > > -#include "hashtable.h" > > -#include "hashtable_private.h" > > -#include "hashtable_itr.h" > > -#include /* defines NULL */ > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator - iterator constructor */ > > - > > -struct hashtable_itr * > > -hashtable_iterator(struct hashtable *h) > > -{ > > - unsigned int i, tablelength; > > - struct hashtable_itr *itr = (struct hashtable_itr *) > > - malloc(sizeof(struct hashtable_itr)); > > - if (NULL == itr) return NULL; > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - itr->h = h; > > - itr->e = NULL; > > - itr->parent = NULL; > > - tablelength = h->tablelength; > > - itr->index = tablelength; > > - if (0 == h->entrycount) { > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return itr; > > - } > > - > > - for (i = 0; i < tablelength; i++) > > - { > > - if (NULL != h->table[i]) > > - { > > - itr->e = h->table[i]; > > - itr->index = i; > > - break; > > - } > > - } > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return itr; > > -} > > - > > -/*****************************************************************************/ > > -/* key - return the key of the (key,value) pair at the current position */ > > -/* value - return the value of the (key,value) pair at the current position */ > > - > > -void * > > -hashtable_iterator_key(struct hashtable_itr *i) > > -{ return i->e->k; } > > - > > -void * > > -hashtable_iterator_value(struct hashtable_itr *i) > > -{ return i->e->v; } > > - > > -/*****************************************************************************/ > > -/* advance - advance the iterator to the next element > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_advance(struct hashtable_itr *itr) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&itr->h->mutex); > > -#endif > > - unsigned int j,tablelength; > > - struct entry **table; > > - struct entry *next; > > - int ret; > > - if (NULL == itr->e) { /* stupidity check */ > > - ret = 0; > > - goto egress; > > - } > > - > > - next = itr->e->next; > > - if (NULL != next) > > - { > > - itr->parent = itr->e; > > - itr->e = next; > > - ret = -1; > > - goto egress; > > - } > > - > > - tablelength = itr->h->tablelength; > > - itr->parent = NULL; > > - if (tablelength <= (j = ++(itr->index))) > > - { > > - itr->e = NULL; > > - ret = 0; > > - goto egress; > > - } > > - table = itr->h->table; > > - while (NULL == (next = table[j])) > > - { > > - if (++j >= tablelength) > > - { > > - itr->index = tablelength; > > - itr->e = NULL; > > - ret = 0; > > - goto egress; > > - } > > - } > > - itr->index = j; > > - itr->e = next; > > - ret = -1; > > - > > - egress: > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&itr->h->mutex); > > -#endif > > - return ret; > > -} > > - > > -/*****************************************************************************/ > > -/* remove - remove the entry at the current iterator position > > - * and advance the iterator, if there is a successive > > - * element. > > - * If you want the value, read it before you remove: > > - * beware memory leaks if you don't. > > - * Returns zero if end of iteration. */ > > - > > -int > > -hashtable_iterator_remove(struct hashtable_itr *itr) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&itr->h->mutex); > > -#endif > > - struct entry *remember_e, *remember_parent; > > - int ret; > > - > > - /* Do the removal */ > > - if (NULL == (itr->parent)) > > - { > > - /* element is head of a chain */ > > - itr->h->table[itr->index] = itr->e->next; > > - } else { > > - /* element is mid-chain */ > > - itr->parent->next = itr->e->next; > > - } > > - /* itr->e is now outside the hashtable */ > > - remember_e = itr->e; > > - itr->h->entrycount--; > > - freekey(remember_e->k); > > - > > - /* Advance the iterator, correcting the parent */ > > - remember_parent = itr->parent; > > - ret = hashtable_iterator_advance(itr); > > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > > - free(remember_e); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&itr->h->mutex); > > -#endif > > - return ret; > > -} > > - > > -/*****************************************************************************/ > > -int /* returns zero if not found */ > > -hashtable_iterator_search(struct hashtable_itr *itr, > > - struct hashtable *h, void *k) > > -{ > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_lock(&h->mutex); > > -#endif > > - struct entry *e, *parent; > > - unsigned int hashvalue, index; > > - int ret; > > - > > - hashvalue = hash(h,k); > > - index = indexFor(h->tablelength,hashvalue); > > - > > - e = h->table[index]; > > - parent = NULL; > > - while (NULL != e) > > - { > > - /* Check hash value to short circuit heavier comparison */ > > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > > - { > > - itr->index = index; > > - itr->e = e; > > - itr->parent = parent; > > - itr->h = h; > > - ret= -1; > > - goto egress; > > - } > > - parent = e; > > - e = e->next; > > - } > > - ret = 0; > > - > > -egress: > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_unlock(&h->mutex); > > -#endif > > - return ret; > > -} > > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > > deleted file mode 100644 > > index 35654e0..0000000 > > --- a/tools/vtpm_manager/util/hashtable_itr.h > > +++ /dev/null > > @@ -1,109 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/blktap2/drivers/hashtable_itr.h > > - */ > > - > > - > > -#ifndef __HASHTABLE_ITR_CWC22__ > > -#define __HASHTABLE_ITR_CWC22__ > > -#include "hashtable.h" > > -#include "hashtable_private.h" /* needed to enable inlining */ > > - > > -/*****************************************************************************/ > > -/* This struct is only concrete here to allow the inlining of two of the > > - * accessor functions. */ > > -struct hashtable_itr > > -{ > > - struct hashtable *h; > > - struct entry *e; > > - struct entry *parent; > > - unsigned int index; > > -}; > > - > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator > > - */ > > - > > -struct hashtable_itr * > > -hashtable_iterator(struct hashtable *h); > > - > > -/*****************************************************************************/ > > -/* hashtable_iterator_key > > - * - return the value of the (key,value) pair at the current position */ > > - > > -void *hashtable_iterator_key(struct hashtable_itr *i); > > - > > -/*****************************************************************************/ > > -/* value - return the value of the (key,value) pair at the current position */ > > - > > -void *hashtable_iterator_value(struct hashtable_itr *i); > > - > > -/*****************************************************************************/ > > -/* advance - advance the iterator to the next element > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_advance(struct hashtable_itr *itr); > > - > > -/*****************************************************************************/ > > -/* remove - remove current element and advance the iterator to the next element > > - * NB: if you need the value to free it, read it before > > - * removing. ie: beware memory leaks! > > - * returns zero if advanced to end of table */ > > - > > -int > > -hashtable_iterator_remove(struct hashtable_itr *itr); > > - > > -/*****************************************************************************/ > > -/* search - overwrite the supplied iterator, to point to the entry > > - * matching the supplied key. > > - h points to the hashtable to be searched. > > - * returns zero if not found. */ > > -int > > -hashtable_iterator_search(struct hashtable_itr *itr, > > - struct hashtable *h, void *k); > > - > > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > > -{ \ > > - return (hashtable_iterator_search(i,h,k)); \ > > -} > > - > > - > > - > > -#endif /* __HASHTABLE_ITR_CWC22__*/ > > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > > deleted file mode 100644 > > index d87a7f9..0000000 > > --- a/tools/vtpm_manager/util/hashtable_private.h > > +++ /dev/null > > @@ -1,96 +0,0 @@ > > -/* > > - * Copyright (c) 2005, Intel Corp > > - * Copyright (c) 2002, Christopher Clark > > - * All rights reserved. > > - * > > - * Redistribution and use in source and binary forms, with or without > > - * modification, are permitted provided that the following conditions > > - * are met: > > - * > > - * * Redistributions of source code must retain the above copyright > > - * notice, this list of conditions and the following disclaimer. > > - * > > - * * Redistributions in binary form must reproduce the above copyright > > - * notice, this list of conditions and the following disclaimer in the > > - * documentation and/or other materials provided with the distribution. > > - * > > - * * Neither the name of the original author; nor the names of any contributors > > - * may be used to endorse or promote products derived from this software > > - * without specific prior written permission. > > - * > > - * > > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > -*/ > > - > > -/* > > - * There are duplicates of this code in: > > - * - tools/xenstore/hashtable_private.h > > - * - tools/blktap2/drivers/hashtable_private.h > > - */ > > - > > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > -#define __HASHTABLE_PRIVATE_CWC22_H__ > > - > > -#include "hashtable.h" > > -#ifdef HASHTABLE_THREADED > > -#include > > -#endif > > - > > -/*****************************************************************************/ > > -struct entry > > -{ > > - void *k, *v; > > - unsigned int h; > > - struct entry *next; > > -}; > > - > > -struct hashtable { > > - unsigned int tablelength; > > - struct entry **table; > > - unsigned int entrycount; > > - unsigned int loadlimit; > > - unsigned int primeindex; > > - unsigned int (*hashfn) (void *k); > > - int (*eqfn) (void *k1, void *k2); > > -#ifdef HASHTABLE_THREADED > > - pthread_mutex_t mutex; > > -#endif > > -}; > > - > > -/*****************************************************************************/ > > -unsigned int > > -hash(struct hashtable *h, void *k); > > - > > -/*****************************************************************************/ > > -/* indexFor */ > > -static inline unsigned int > > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > > - return (hashvalue % tablelength); > > -}; > > - > > -/* Only works if tablelength == 2^N */ > > -/*static inline unsigned int > > -indexFor(unsigned int tablelength, unsigned int hashvalue) > > -{ > > - return (hashvalue & (tablelength - 1u)); > > -} > > -*/ > > - > > -/*****************************************************************************/ > > -#define freekey(X) free(X) > > -/*define freekey(X) ; */ > > - > > - > > -/*****************************************************************************/ > > - > > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > > deleted file mode 100644 > > index 75fe91a..0000000 > > --- a/tools/vtpm_manager/util/log.c > > +++ /dev/null > > @@ -1,142 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#include > > -#include > > -#include > > - > > -#include "buffer.h" > > -#include "tcg.h" > > - > > -// Helper code for the consts, eg. to produce messages for error codes. > > - > > -typedef struct error_code_entry_t { > > - TPM_RESULT code; > > - char * code_name; > > - char * msg; > > -} error_code_entry_t; > > - > > -static const error_code_entry_t error_msgs [] = { > > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > > - > > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > > -}; > > - > > - > > -// helper function for the error codes: > > -const char* tpm_get_error_name (TPM_RESULT code) { > > - // just do a linear scan for now > > - unsigned i; > > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > > - if (code == error_msgs[i].code) > > - return error_msgs[i].code_name; > > - > > - return("Unknown Error Code"); > > -} > > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > > deleted file mode 100644 > > index 1f15f5b..0000000 > > --- a/tools/vtpm_manager/util/log.h > > +++ /dev/null > > @@ -1,94 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > - > > -#ifndef __VTPM_LOG_H__ > > -#define __VTPM_LOG_H__ > > - > > -#include // for uint32_t > > -#include // for pointer NULL > > - > > -// =========================== LOGGING ============================== > > - > > -// the logging module numbers > > -#define VTPM_LOG_CRYPTO 1 > > -#define VTPM_LOG_BSG 2 > > -#define VTPM_LOG_TXDATA 3 > > -#define VTPM_LOG_TCS 4 > > -#define VTPM_LOG_TCS_DEEP 5 > > -#define VTPM_LOG_VTSP 6 > > -#define VTPM_LOG_VTPM 7 > > -#define VTPM_LOG_VTPM_DEEP 8 > > -#define VTPM_LOG_VTSP_DEEP 9 > > - > > -static char *module_names[] = { "", > > - "CRYPTO", > > - "BSG", > > - "TXDATA", > > - "TCS", > > - "TCS", > > - "VTSP", > > - "VTPM", > > - "VTPM", > > - "VTSP" > > - }; > > - > > -// Default to standard logging > > -#ifndef LOGGING_MODULES > > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > > -#endif > > - > > -// bit-access macros > > -#define BITMASK(idx) ( 1U << (idx) ) > > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > > - > > -#define vtpmloginfo(module, fmt, args...) \ > > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > > - } > > - > > -#define vtpmloginfomore(module, fmt, args...) \ > > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > > - fprintf (stdout, fmt,##args); \ > > - } > > - > > -#define vtpmlogerror(module, fmt, args...) \ > > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > > - > > -//typedef UINT32 tpm_size_t; > > - > > -// helper function for the error codes: > > -const char* tpm_get_error_name (TPM_RESULT code); > > - > > -#endif // _VTPM_LOG_H_ > > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > > deleted file mode 100644 > > index 5c42913..0000000 > > --- a/tools/vtpm_manager/util/tcg.h > > +++ /dev/null > > @@ -1,503 +0,0 @@ > > -// =================================================================== > > -// > > -// Copyright (c) 2005, Intel Corp. > > -// All rights reserved. > > -// > > -// Redistribution and use in source and binary forms, with or without > > -// modification, are permitted provided that the following conditions > > -// are met: > > -// > > -// * Redistributions of source code must retain the above copyright > > -// notice, this list of conditions and the following disclaimer. > > -// * Redistributions in binary form must reproduce the above > > -// copyright notice, this list of conditions and the following > > -// disclaimer in the documentation and/or other materials provided > > -// with the distribution. > > -// * Neither the name of Intel Corporation nor the names of its > > -// contributors may be used to endorse or promote products derived > > -// from this software without specific prior written permission. > > -// > > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > > -// OF THE POSSIBILITY OF SUCH DAMAGE. > > -// =================================================================== > > -// > > -// tcg.h > > -// > > -// This file contains all the structure and type definitions > > -// > > -// ================================================================== > > - > > -#ifndef __TCG_H__ > > -#define __TCG_H__ > > - > > -// This pragma is used to disallow structure padding > > -#pragma pack(push, 1) > > - > > -// *************************** TYPEDEFS ********************************* > > -typedef unsigned char BYTE; > > -typedef unsigned char BOOL; > > -typedef unsigned short UINT16; > > -typedef unsigned int UINT32; > > -typedef unsigned long long UINT64; > > - > > -typedef UINT32 TPM_RESULT; > > -typedef UINT32 TPM_PCRINDEX; > > -typedef UINT32 TPM_DIRINDEX; > > -typedef UINT32 TPM_HANDLE; > > -typedef TPM_HANDLE TPM_AUTHHANDLE; > > -typedef TPM_HANDLE TCPA_HASHHANDLE; > > -typedef TPM_HANDLE TCPA_HMACHANDLE; > > -typedef TPM_HANDLE TCPA_ENCHANDLE; > > -typedef TPM_HANDLE TPM_KEY_HANDLE; > > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > > -typedef UINT32 TPM_RESOURCE_TYPE; > > -typedef UINT32 TPM_COMMAND_CODE; > > -typedef UINT16 TPM_PROTOCOL_ID; > > -typedef BYTE TPM_AUTH_DATA_USAGE; > > -typedef UINT16 TPM_ENTITY_TYPE; > > -typedef UINT32 TPM_ALGORITHM_ID; > > -typedef UINT16 TPM_KEY_USAGE; > > -typedef UINT16 TPM_STARTUP_TYPE; > > -typedef UINT32 TPM_CAPABILITY_AREA; > > -typedef UINT16 TPM_ENC_SCHEME; > > -typedef UINT16 TPM_SIG_SCHEME; > > -typedef UINT16 TPM_MIGRATE_SCHEME; > > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > > -typedef UINT32 TPM_KEY_FLAGS; > > - > > -#define TPM_DIGEST_SIZE 20 // Don't change this > > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > > -typedef TPM_AUTHDATA TPM_SECRET; > > -typedef TPM_AUTHDATA TPM_ENCAUTH; > > -typedef BYTE TPM_PAYLOAD_TYPE; > > -typedef UINT16 TPM_TAG; > > - > > -// Data Types of the TCS > > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > > - > > -// ************************* STRUCTURES ********************************** > > - > > -typedef struct TPM_VERSION { > > - BYTE major; > > - BYTE minor; > > - BYTE revMajor; > > - BYTE revMinor; > > -} TPM_VERSION; > > - > > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > > - > > -typedef struct TPM_DIGEST { > > - BYTE digest[TPM_DIGEST_SIZE]; > > -} TPM_DIGEST; > > - > > -typedef TPM_DIGEST TPM_PCRVALUE; > > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > > -typedef TPM_DIGEST TPM_DIRVALUE; > > -typedef TPM_DIGEST TPM_HMAC; > > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > > - > > -typedef struct TPM_NONCE { > > - BYTE nonce[TPM_DIGEST_SIZE]; > > -} TPM_NONCE; > > - > > -typedef struct TPM_KEY_PARMS { > > - TPM_ALGORITHM_ID algorithmID; > > - TPM_ENC_SCHEME encScheme; > > - TPM_SIG_SCHEME sigScheme; > > - UINT32 parmSize; > > - BYTE* parms; > > -} TPM_KEY_PARMS; > > - > > -typedef struct TPM_RSA_KEY_PARMS { > > - UINT32 keyLength; > > - UINT32 numPrimes; > > - UINT32 exponentSize; > > - BYTE* exponent; > > -} TPM_RSA_KEY_PARMS; > > - > > -typedef struct TPM_STORE_PUBKEY { > > - UINT32 keyLength; > > - BYTE* key; > > -} TPM_STORE_PUBKEY; > > - > > -typedef struct TPM_PUBKEY { > > - TPM_KEY_PARMS algorithmParms; > > - TPM_STORE_PUBKEY pubKey; > > -} TPM_PUBKEY; > > - > > -typedef struct TPM_KEY { > > - TPM_VERSION ver; > > - TPM_KEY_USAGE keyUsage; > > - TPM_KEY_FLAGS keyFlags; > > - TPM_AUTH_DATA_USAGE authDataUsage; > > - TPM_KEY_PARMS algorithmParms; > > - UINT32 PCRInfoSize; > > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > > - TPM_STORE_PUBKEY pubKey; > > - UINT32 encDataSize; > > - BYTE* encData; > > -} TPM_KEY; > > - > > -typedef struct TPM_PCR_SELECTION { > > - UINT16 sizeOfSelect; /// in bytes > > - BYTE* pcrSelect; > > -} TPM_PCR_SELECTION; > > - > > -typedef struct TPM_PCR_COMPOSITE { > > - TPM_PCR_SELECTION select; > > - UINT32 valueSize; > > - TPM_PCRVALUE* pcrValue; > > -} TPM_PCR_COMPOSITE; > > - > > - > > -typedef struct TPM_PCR_INFO { > > - TPM_PCR_SELECTION pcrSelection; > > - TPM_COMPOSITE_HASH digestAtRelease; > > - TPM_COMPOSITE_HASH digestAtCreation; > > -} TPM_PCR_INFO; > > - > > - > > -typedef struct TPM_BOUND_DATA { > > - TPM_VERSION ver; > > - TPM_PAYLOAD_TYPE payload; > > - BYTE* payloadData; > > -} TPM_BOUND_DATA; > > - > > -typedef struct TPM_STORED_DATA { > > - TPM_VERSION ver; > > - UINT32 sealInfoSize; > > - BYTE* sealInfo; > > - UINT32 encDataSize; > > - BYTE* encData; > > -} TPM_STORED_DATA; > > - > > -typedef struct TCS_AUTH { > > - TCS_AUTHHANDLE AuthHandle; > > - TPM_NONCE NonceOdd; // system > > - TPM_NONCE NonceEven; // TPM > > - BOOL fContinueAuthSession; > > - TPM_AUTHDATA HMAC; > > -} TCS_AUTH; > > - > > -// structures for dealing with sizes followed by buffers in all the > > -// TCG structure. > > -typedef struct pack_buf_t { > > - UINT32 size; > > - BYTE * data; > > -} pack_buf_t; > > - > > -typedef struct pack_constbuf_t { > > - UINT32 size; > > - const BYTE* data; > > -} pack_constbuf_t; > > - > > - > > - > > -// **************************** CONSTANTS ********************************* > > - > > -// BOOL values > > -#define TRUE 0x01 > > -#define FALSE 0x00 > > - > > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > > - > > -// > > -// TPM_COMMAND_CODE values > > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > > -#define TPM_VENDOR_ORDINAL 0x20000000UL > > - > > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > > - > > - > > - > > -// > > -// TPM_RESULT values > > -// > > -// just put in the whole table from spec 1.2 > > - > > -#define TPM_BASE 0x0 // The start of TPM return codes > > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > > - > > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > > - > > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > > - > > -// TPM_STARTUP_TYPE values > > -#define TPM_ST_CLEAR 0x0001 > > -#define TPM_ST_STATE 0x0002 > > -#define TPM_ST_DEACTIVATED 0x003 > > - > > -// TPM_TAG values > > -#define TPM_TAG_RQU_COMMAND 0x00c1 > > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > > -#define TPM_TAG_RSP_COMMAND 0x00c4 > > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > > - > > -// TPM_PAYLOAD_TYPE values > > -#define TPM_PT_ASYM 0x01 > > -#define TPM_PT_BIND 0x02 > > -#define TPM_PT_MIGRATE 0x03 > > -#define TPM_PT_MAINT 0x04 > > -#define TPM_PT_SEAL 0x05 > > - > > -// TPM_ENTITY_TYPE values > > -#define TPM_ET_KEYHANDLE 0x0001 > > -#define TPM_ET_OWNER 0x0002 > > -#define TPM_ET_DATA 0x0003 > > -#define TPM_ET_SRK 0x0004 > > -#define TPM_ET_KEY 0x0005 > > - > > -/// TPM_ResourceTypes > > -#define TPM_RT_KEY 0x00000001 > > -#define TPM_RT_AUTH 0x00000002 > > -#define TPM_RT_TRANS 0x00000004 > > -#define TPM_RT_CONTEXT 0x00000005 > > - > > -// TPM_PROTOCOL_ID values > > -#define TPM_PID_OIAP 0x0001 > > -#define TPM_PID_OSAP 0x0002 > > -#define TPM_PID_ADIP 0x0003 > > -#define TPM_PID_ADCP 0x0004 > > -#define TPM_PID_OWNER 0x0005 > > - > > -// TPM_ALGORITHM_ID values > > -#define TPM_ALG_RSA 0x00000001 > > -#define TPM_ALG_DES 0x00000002 > > -#define TPM_ALG_3DES 0X00000003 > > -#define TPM_ALG_SHA 0x00000004 > > -#define TPM_ALG_HMAC 0x00000005 > > -#define TCPA_ALG_AES 0x00000006 > > - > > -// TPM_ENC_SCHEME values > > -#define TPM_ES_NONE 0x0001 > > -#define TPM_ES_RSAESPKCSv15 0x0002 > > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > > - > > -// TPM_SIG_SCHEME values > > -#define TPM_SS_NONE 0x0001 > > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > > - > > -// TPM_KEY_USAGE values > > -#define TPM_KEY_EK 0x0000 > > -#define TPM_KEY_SIGNING 0x0010 > > -#define TPM_KEY_STORAGE 0x0011 > > -#define TPM_KEY_IDENTITY 0x0012 > > -#define TPM_KEY_AUTHCHANGE 0X0013 > > -#define TPM_KEY_BIND 0x0014 > > -#define TPM_KEY_LEGACY 0x0015 > > - > > -// TPM_AUTH_DATA_USAGE values > > -#define TPM_AUTH_NEVER 0x00 > > -#define TPM_AUTH_ALWAYS 0x01 > > - > > -// Key Handle of owner and srk > > -#define TPM_OWNER_KEYHANDLE 0x40000001 > > -#define TPM_SRK_KEYHANDLE 0x40000000 > > - > > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > > - > > -#include > > - > > -// FIXME: Review use of these and delete unneeded ones. > > - > > -// these are really badly dependent on local structure: > > -// DEPENDS: local var 'status' of type TPM_RESULT > > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > > -#define ERRORDIE(s) do { status = s; \ > > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > > - goto abort_egress; } \ > > - while (0) > > - > > -// DEPENDS: local var 'status' of type TPM_RESULT > > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > > -// Try command c. If it fails, set status to s and goto abort. > > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > > - status = s; \ > > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > > - goto abort_egress; \ > > - } else {\ > > - status = c; \ > > - } > > - > > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > > -#define TPMTRYRETURN(c) do { status = c; \ > > - if (status != TPM_SUCCESS) { \ > > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > > - goto abort_egress; \ > > - } \ > > - } while(0) > > - > > - > > -#pragma pack(pop) > > - > > -#endif //__TCPA_H__ > > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > > index 3b89223..0ba1d55 100644 > > --- a/tools/xenstore/hashtable.c > > +++ b/tools/xenstore/hashtable.c > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable.c > > - * - tools/vtpm_manager/util/hashtable.c > > */ > > > > #include "hashtable.h" > > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > > index 8e6bb5b..4d68223 100644 > > --- a/tools/xenstore/hashtable.h > > +++ b/tools/xenstore/hashtable.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable.h > > - * - tools/vtpm_manager/util/hashtable.h > > */ > > > > #ifndef __HASHTABLE_CWC22_H__ > > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > > index cabaffe..a08559d 100644 > > --- a/tools/xenstore/hashtable_private.h > > +++ b/tools/xenstore/hashtable_private.h > > @@ -3,7 +3,6 @@ > > /* > > * There are duplicates of this code in: > > * - tools/blktap2/drivers/hashtable_private.h > > - * - tools/vtpm_manager/util/hashtable_private.h > > */ > > > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > > index ad1eb78..c142140 100644 > > --- a/tools/xm-test/configure.ac > > +++ b/tools/xm-test/configure.ac > > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > > tests/unpause/Makefile > > tests/vcpu-pin/Makefile > > tests/vcpu-disable/Makefile > > - tests/vtpm/Makefile > > tests/xapi/Makefile > > tests/enforce_dom0_cpus/Makefile > > tests/cpupool/Makefile > > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > > index f0516b2..e04591b 100644 > > --- a/tools/xm-test/grouptest/default > > +++ b/tools/xm-test/grouptest/default > > @@ -27,5 +27,4 @@ sysrq > > unpause > > vcpu-disable > > vcpu-pin > > -vtpm > > xapi > > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > > index bafc988..5c3e1b1 100644 > > --- a/tools/xm-test/grouptest/medium > > +++ b/tools/xm-test/grouptest/medium > > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > > unpause > > vcpu-disable > > vcpu-pin > > -vtpm > > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > > index 3b04921..7a08b77 100644 > > --- a/tools/xm-test/grouptest/xapi > > +++ b/tools/xm-test/grouptest/xapi > > @@ -1,2 +1 @@ > > xapi > > -vtpm 09_vtpm-xapi.test > > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > > index ae8c550..3ba7433 100644 > > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > > @@ -59,7 +59,6 @@ class XenConfig: > > # These options need to be lists > > self.defaultOpts["disk"] = [] > > self.defaultOpts["vif"] = [] > > - self.defaultOpts["vtpm"] = [] > > > > self.opts = self.defaultOpts > > > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > > index 8d673ed..455f50c 100644 > > --- a/tools/xm-test/tests/Makefile.am > > +++ b/tools/xm-test/tests/Makefile.am > > @@ -25,7 +25,6 @@ SUBDIRS = \ > > unpause \ > > vcpu-disable \ > > vcpu-pin \ > > - vtpm \ > > enforce_dom0_cpus \ > > save restore migrate \ > > cpupool > > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > > deleted file mode 100644 > > index dfd1227..0000000 > > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# verify list > > - > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > - > > -try: > > - domain.start(noConsole=True) > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - vtpm_cleanup(domain.getName()) > > - FAIL("Unable to create domain") > > - > > - > > -domName = domain.getName() > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > > -eyecatcher = "/local/domain/0/backend/vtpm" > > -where = output.find(eyecatcher) > > -if status != 0: > > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > > -elif where < 0: > > - FAIL("Fail to list virtual TPM device") > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > > deleted file mode 100644 > > index a18cbab..0000000 > > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > > +++ /dev/null > > @@ -1,49 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > -if not re.search("PCR-00:",run["output"]): > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > > deleted file mode 100644 > > index b863f27..0000000 > > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > > +++ /dev/null > > @@ -1,99 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; suspend and resume the domain and > > -# check list of pcrs again > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm save %s %s.save" % > > - (domName, domName), > > - timeout=30) > > - > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm save did not succeed") > > - > > - try: > > - status, ouptut = traceCommand("xm restore %s.save" % > > - (domName), > > - timeout=30) > > - except TimeoutError, e: > > - os.remove("%s.save" % domName) > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - os.remove("%s.save" % domName) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm restore did not succeed") > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > > deleted file mode 100644 > > index ccc8b73..0000000 > > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > > +++ /dev/null > > @@ -1,93 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again > > -# This test does local live migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > > deleted file mode 100644 > > index 57b87df..0000000 > > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > > +++ /dev/null > > @@ -1,93 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again > > -# This test does local (non-live) migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > > deleted file mode 100644 > > index c70691d..0000000 > > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > > +++ /dev/null > > @@ -1,125 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; suspend and resume the domain and > > -# check list of pcrs again and validate extended pcr > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm save %s %s.save" % > > - (domName, domName), > > - timeout=30) > > - > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm save did not succeed") > > - > > - try: > > - status, ouptut = traceCommand("xm restore %s.save" % > > - (domName), > > - timeout=30) > > - except TimeoutError, e: > > - os.remove("%s.save" % domName) > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - os.remove("%s.save" % domName) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm restore did not succeed") > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > - > > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > > deleted file mode 100644 > > index 4ff3360..0000000 > > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > > +++ /dev/null > > @@ -1,119 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again and validate extended pcr > > -# This test does local live migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > > deleted file mode 100644 > > index 27125fc..0000000 > > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > > +++ /dev/null > > @@ -1,119 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Positive Test: create domain with virtual TPM attached at build time, > > -# extend a pcr > > -# check list of pcrs; locally migrate the domain and > > -# check list of pcrs again and validate extended pcr > > -# This test does local (non-live) migration. > > - > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > -import os.path > > -import atexit > > - > > -config = {"vtpm":"instance=1,backend=0"} > > -domain = XmTestDomain(extraConfig=config) > > -domName = domain.getName() > > -consoleHistory = "" > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - if verbose: > > - print e.extra > > - FAIL("Unable to create domain (%s)" % domName) > > - > > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while creating /dev/tpm0") > > - > > -try: > > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("Error while extending PCR 0") > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > > - > > -consoleHistory = console.getHistory() > > -domain.closeConsole() > > - > > -old_domid = domid(domName) > > - > > -loop = 0 > > -while loop < 3: > > - try: > > - status, ouptut = traceCommand("xm migrate %s localhost" % > > - domName, > > - timeout=90) > > - except TimeoutError, e: > > - saveLog(consoleHistory) > > - FAIL(str(e)) > > - > > - if status != 0: > > - saveLog(consoleHistory) > > - FAIL("xm migrate did not succeed. External device migration activated?") > > - > > - > > - domName = domain.getName() > > - new_domid = domid(domName) > > - > > - if (old_domid == new_domid): > > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > > - (old_domid,loop)) > > - > > - try: > > - console = domain.getConsole() > > - except ConsoleError, e: > > - FAIL(str(e)) > > - > > - try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > - except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("No result from dumping the PCRs") > > - > > - if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > > - > > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > > - > > - loop += 1 > > - > > -domain.closeConsole() > > - > > -domain.stop() > > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > > deleted file mode 100644 > > index a1aa8b3..0000000 > > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > > +++ /dev/null > > @@ -1,158 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -# Test to test the vtpm class through the Xen-API > > -# > > -# Tested methods: > > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > > -# create, destroy, get_VM > > -# VM: get_VTPMS > > - > > -from XmTestLib import xapi > > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > > -from XmTestLib import * > > -from vtpm_utils import * > > -import commands > > -import os > > - > > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > > - > > -try: > > - # XmTestAPIDomain tries to establish a connection to XenD > > - domain = XmTestAPIDomain() > > -except Exception, e: > > - SKIP("Skipping test. Error: %s" % str(e)) > > -vm_uuid = domain.get_uuid() > > - > > -vtpmcfg = {} > > -vtpmcfg['backend'] = DOM0_UUID > > -vtpmcfg['VM'] = vm_uuid > > - > > -session = xapi.connect() > > - > > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > > - > > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > > -if vtpm_be != vtpmcfg['backend']: > > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > > - (vtpm_be, vtpmcfg['backend'])) > > - > > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > > - > > -miss_keys = [] > > -for k in VTPM_RECORD_KEYS: > > - if k not in vtpm_rec.keys(): > > - miss_keys.append(k) > > -if len(miss_keys) > 0: > > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > > - > > -if vtpm_rec['uuid'] != vtpm_uuid: > > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > > - (vtpm_rec['uuid'], vtpm_uuid)) > > -if vtpm_rec['VM'] != vm_uuid: > > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > > - (vtpm_rec['VM'], vm_uuid)) > > -if vtpm_rec['backend'] != vtpmcfg['backend']: > > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > > - (vtpm_rev['backend'], vtpmcfg['backend'])) > > - > > -badkeys = [] > > -keys = vtpm_rec.keys() > > -for k in keys: > > - if k not in VTPM_RECORD_KEYS: > > - badkeys.append(k) > > -if len(badkeys) > 0: > > - FAIL("Unexpected attributes in result: %s" % badkeys) > > - > > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > > - (vm_ref, vm_uuid)) > > - > > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > > -if uuid != vtpm_uuid: > > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > > - (uuid, vtpm_uuid)) > > - > > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > > -if vtpm_ref != vtpm_uuid: > > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > > - (vtpm_ref, vtpm_uuid)) > > - > > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > > -if len(vm_vtpms) != 1: > > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > > - (len(vm_vtpms), 1)) > > -if vtpm_uuid not in vm_vtpms: > > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > > - (vm_vtpms[0], vtpm_uuid)) > > - > > -try: > > - console = domain.start() > > -except DomainError, e: > > - FAIL("Unable to create domain.") > > - > > -try: > > - console.sendInput("input") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("1. No result from dumping the PCRs") > > - > > -if re.search("No such file",run["output"]): > > - FAIL("TPM frontend support not compiled into (domU?) kernel") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > - #Should never get here > > - FAIL("Could destroy vTPM while VM is running") > > -except: > > - pass > > - > > -rc = session.xenapi.VM.suspend(vm_uuid) > > -if rc: > > - FAIL("Could not suspend VM") > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > - #May not throw an exception in 'suspend' state > > -except: > > - pass > > - > > -rc = session.xenapi.VM.resume(vm_uuid, False) > > -if rc: > > - FAIL("Could not resume VM") > > - > > -try: > > - console = domain.getConsole() > > -except ConsoleError, e: > > - FAIL(str(e)) > > - > > -try: > > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > > -except ConsoleError, e: > > - saveLog(console.getHistory()) > > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > > - > > -if not re.search("PCR-00:",run["output"]): > > - saveLog(console.getHistory()) > > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > > - > > -domain.stop() > > - > > -try: > > - session.xenapi.VTPM.destroy(vtpm_uuid) > > -except: > > - FAIL("Could NOT destroy vTPM while domain is halted.") > > - > > -domain.destroy() > > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > > deleted file mode 100644 > > index dd67e45..0000000 > > --- a/tools/xm-test/tests/vtpm/Makefile.am > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -SUBDIRS = > > - > > -TESTS = 01_vtpm-list_pos.test \ > > - 02_vtpm-cat_pcrs.test \ > > - 03_vtpm-susp_res.test \ > > - 04_vtpm-loc_migr.test \ > > - 05_vtpm-loc_migr.test \ > > - 06_vtpm-susp_res_pcrs.test \ > > - 07_vtpm-mig_pcrs.test \ > > - 08_vtpm-mig_pcrs.test \ > > - 09_vtpm-xapi.test > > - > > -XFAIL_TESTS = > > - > > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > > -TESTS_ENVIRONMENT=@TENV@ > > - > > -%.test: %.py > > - cp $< $@ > > - chmod +x $@ > > - > > -clean-local: am_config_clean-local > > - > > -am_config_clean-local: > > - rm -f *test > > - rm -f *log > > - rm -f *~ > > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > > deleted file mode 100644 > > index 4e5b281..0000000 > > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > > +++ /dev/null > > @@ -1,30 +0,0 @@ > > -#!/usr/bin/python > > - > > -# Copyright (C) International Business Machines Corp., 2006 > > -# Author: Stefan Berger > > - > > -from XmTestLib import * > > - > > -if ENABLE_HVM_SUPPORT: > > - SKIP("vtpm tests not supported for HVM domains") > > - > > -status, output = traceCommand("COLUMNS=200 ; " > > - "ps aux | grep vtpm_manager | grep -v grep") > > -if output == "": > > - SKIP("virtual TPM manager must be started to run this test; might " > > - "need /dev/tpm0") > > - > > -def vtpm_cleanup(domName): > > - traceCommand("/etc/xen/scripts/vtpm-delete " > > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > > - str(domid(domName))) > > - > > -def vtpm_cleanup(uuid): > > - from xen.xm import main > > - if main.serverType != main.SERVER_XEN_API: > > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > > - > > -def vtpm_get_uuid(domainid): > > - s, o = traceCommand("xenstore-read " > > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > > - return o > > -- > > 1.7.10.4 > > > > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:05:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:05:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI3N-0006Nu-Od; Tue, 13 Nov 2012 15:05:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHxC-0005lh-Ty for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:59:08 +0000 Received: from [85.158.143.35:25878] by server-3.bemta-4.messagelabs.com id 91/14-06841-A3062A05; Tue, 13 Nov 2012 14:59:06 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-21.messagelabs.com!1352818741!10180088!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18927 invoked from network); 13 Nov 2012 14:59:02 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:59:02 -0000 Received: from ([128.244.198.91]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157225253; Tue, 13 Nov 2012 09:58:46 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Tue, 13 Nov 2012 09:58:45 -0500 From: "Fioravante, Matthew E." To: Ian Campbell Date: Tue, 13 Nov 2012 09:58:44 -0500 Thread-Topic: [PATCH VTPM 6/9] Remove the vtpm process model Thread-Index: Ac3BjIxWUEqURI64SYK1F0IkeLy95AAIq4wg Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> In-Reply-To: <1352803755.7491.47.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 15:05:28 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Should I have removed vtpm from xm also? I left it alone because xm is depcrecated. -----Original Message----- From: Ian Campbell [mailto:Ian.Campbell@citrix.com] Sent: Tuesday, November 13, 2012 5:49 AM To: Fioravante, Matthew E. Cc: xen-devel@lists.xen.org; Stefano Stabellini Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Remove the old vtpm process model. It doesn't work very > well and is no longer supported. > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell > > diff --git a/tools/Makefile b/tools/Makefile > index d8c8cc0..2ca43b9 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > SUBDIRS-$(CONFIG_X86) += firmware > SUBDIRS-y += console > SUBDIRS-y += xenmon > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > -SUBDIRS-$(VTPM_TOOLS) += vtpm > SUBDIRS-y += xenstat > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_Linux) += memshr > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > index 631306b..90a6b85 100644 > --- a/tools/blktap2/drivers/hashtable.c > +++ b/tools/blktap2/drivers/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > index 89aa3dc..56ca053 100644 > --- a/tools/blktap2/drivers/hashtable.h > +++ b/tools/blktap2/drivers/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > index 402e06b..731917c 100644 > --- a/tools/blktap2/drivers/hashtable_itr.c > +++ b/tools/blktap2/drivers/hashtable_itr.c > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.c > - */ > - > #include "hashtable.h" > #include "hashtable_private.h" > #include "hashtable_itr.h" > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > index 3d80638..81da838 100644 > --- a/tools/blktap2/drivers/hashtable_itr.h > +++ b/tools/blktap2/drivers/hashtable_itr.h > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.h > - */ > - > #ifndef __HASHTABLE_ITR_CWC22__ > #define __HASHTABLE_ITR_CWC22__ > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > index 5a13a65..954ecc3 100644 > --- a/tools/blktap2/drivers/hashtable_private.h > +++ b/tools/blktap2/drivers/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/configure.ac b/tools/configure.ac > index e708f01..586313d 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > # Enable/disable options > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > diff --git a/tools/examples/README b/tools/examples/README > index 5b0314e..2225d5c 100644 > --- a/tools/examples/README > +++ b/tools/examples/README > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > vif-common.sh - sourced by vif-bridge > vif-nat - xen virtual network start/stop script in NAT mode > vif-route - xen virtual network start/stop script in routed mode > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > -vtpm-common.sh - common code for vTPM handling > -vtpm-delete - remove an entry from the vTPM table given the > - domain's name > -vtpm-hotplug-common.sh - sourced by vtpm > -vtpm-migration.sh - sourced by external-device-migrate > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > devices > xen-backend.rules - hotplug script rules > xend-config.sxp - default xend configuration file > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > index 85f847c..e04e6c1 100644 > --- a/tools/examples/xmexample.pv-grub > +++ b/tools/examples/xmexample.pv-grub > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Configure the behaviour when a domain exits. There are three 'reasons' > # for a domain to stop: poweroff, reboot, and crash. For each of these you > # may specify: > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > index 330aaf0..c951200 100644 > --- a/tools/examples/xmexample1 > +++ b/tools/examples/xmexample1 > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > index 4e5eb3d..8c5137e 100644 > --- a/tools/examples/xmexample2 > +++ b/tools/examples/xmexample2 > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > index dc22ce1..ae799f9 100644 > --- a/tools/examples/xmexample3 > +++ b/tools/examples/xmexample3 > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > index 0166790..0605559 100644 > --- a/tools/hotplug/Linux/Makefile > +++ b/tools/hotplug/Linux/Makefile > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > XEN_SCRIPTS += block > XEN_SCRIPTS += block-enbd block-nbd > XEN_SCRIPTS += blktap > -XEN_SCRIPTS += vtpm vtpm-delete > XEN_SCRIPTS += xen-hotplug-cleanup > XEN_SCRIPTS += external-device-migrate > XEN_SCRIPTS += vscsi > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > +XEN_SCRIPT_DATA += block-common.sh > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > UDEV_RULES = xen-backend.rules xend.rules > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > deleted file mode 100644 > index 38a4532..0000000 > --- a/tools/hotplug/Linux/vtpm > +++ /dev/null > @@ -1,22 +0,0 @@ > -#!/bin/bash > - > -dir=$(dirname "$0") > -. "$dir/vtpm-hotplug-common.sh" > - > -vtpm_fatal_error=0 > - > -case "$command" in > - add) > - vtpm_create_instance > - ;; > - remove) > - vtpm_remove_instance > - ;; > -esac > - > -if [ $vtpm_fatal_error -eq 0 ]; then > - log debug "Successful vTPM operation '$command'." > - success > -else > - fatal "Error while executing vTPM operation '$command'." > -fi > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > deleted file mode 100644 > index d0d7935..0000000 > --- a/tools/hotplug/Linux/vtpm-common.sh > +++ /dev/null > @@ -1,448 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/logging.sh" > -. "$dir/locking.sh" > - > -VTPMDB="/var/vtpm/vtpm.db" > - > -#In the vtpm-impl file some commands should be defined: > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > -if [ -r "$dir/vtpm-impl.alt" ]; then > - . "$dir/vtpm-impl.alt" > -elif [ -r "$dir/vtpm-impl" ]; then > - . "$dir/vtpm-impl" > -else > - function vtpm_create () { > - true > - } > - function vtpm_setup() { > - true > - } > - function vtpm_start() { > - true > - } > - function vtpm_suspend() { > - true > - } > - function vtpm_resume() { > - true > - } > - function vtpm_delete() { > - true > - } > - function vtpm_migrate() { > - echo "Error: vTPM migration accross machines not implemented." > - } > - function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > - } > - function vtpm_migrate_recover() { > - true > - } > -fi > - > - > -#Find the instance number for the vtpm given the name of the domain > -# Parameters > -# - vmname : the name of the vm > -# Return value > -# Returns '0' if instance number could not be found, otherwise > -# it returns the instance number in the variable 'instance' > -function vtpmdb_find_instance () { > - local vmname ret instance > - vmname=$1 > - ret=0 > - > - instance=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( 1 != index($1,"#")) { \ > - if ( $1 == vmname ) { \ > - print $2; \ > - exit; \ > - } \ > - } \ > - }') > - if [ "$instance" != "" ]; then > - ret=$instance > - fi > - echo "$ret" > -} > - > - > -# Check whether a particular instance number is still available > -# returns "0" if it is not available, "1" otherwise. > -function vtpmdb_is_free_instancenum () { > - local instance instances avail i > - instance=$1 > - avail=1 > - #Allowed instance number range: 1-255 > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > - avail=0 > - else > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - for i in $instances; do > - if [ $i -eq $instance ]; then > - avail=0 > - break > - fi > - done > - fi > - echo "$avail" > -} > - > - > -# Get an available instance number given the database > -# Returns an unused instance number > -function vtpmdb_get_free_instancenum () { > - local ctr instances don found > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - ctr=1 > - don=0 > - while [ $don -eq 0 ]; do > - found=0 > - for i in $instances; do > - if [ $i -eq $ctr ]; then > - found=1; > - break; > - fi > - done > - > - if [ $found -eq 0 ]; then > - don=1 > - break > - fi > - let ctr=ctr+1 > - done > - echo "$ctr" > -} > - > - > -# Add a domain name and instance number to the DB file > -function vtpmdb_add_instance () { > - local res vmname inst > - vmname=$1 > - inst=$2 > - > - if [ ! -f $VTPMDB ]; then > - echo "#Database for VM to vTPM association" > $VTPMDB > - echo "#1st column: domain name" >> $VTPMDB > - echo "#2nd column: TPM instance number" >> $VTPMDB > - fi > - res=$(vtpmdb_validate_entry $vmname $inst) > - if [ $res -eq 0 ]; then > - echo "$vmname $inst" >> $VTPMDB > - fi > -} > - > - > -#Validate whether an entry is the same as passed to this > -#function > -function vtpmdb_validate_entry () { > - local res rc vmname inst > - rc=0 > - vmname=$1 > - inst=$2 > - > - res=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - -vinst=$inst \ > - '{ \ > - if ( 1 == index($1,"#")) {\ > - } else \ > - if ( $1 == vmname && \ > - $2 == inst) { \ > - printf("1"); \ > - exit; \ > - } else \ > - if ( $1 == vmname || \ > - $2 == inst) { \ > - printf("2"); \ > - exit; \ > - } \ > - }') > - > - if [ "$res" == "1" ]; then > - rc=1 > - elif [ "$res" == "2" ]; then > - rc=2 > - fi > - echo "$rc" > -} > - > - > -#Remove an entry from the vTPM database given its domain name > -#and instance number > -function vtpmdb_remove_entry () { > - local vmname instance VTPMDB_TMP > - vmname=$1 > - instance=$2 > - VTPMDB_TMP="$VTPMDB".tmp > - > - $(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( $1 != vmname ) { \ > - print $0; \ > - } \ > - '} > $VTPMDB_TMP) > - if [ -e $VTPMDB_TMP ]; then > - mv -f $VTPMDB_TMP $VTPMDB > - vtpm_delete $instance > - else > - log err "Error creating temporary file '$VTPMDB_TMP'." > - fi > -} > - > - > -# Find the reason for the creation of this device: > -# Returns 'resume' or 'create' > -function vtpm_get_create_reason () { > - local resume > - resume=$(xenstore_read $XENBUS_PATH/resume) > - if [ "$resume" == "True" ]; then > - echo "resume" > - else > - echo "create" > - fi > -} > - > - > -#Create a vTPM instance > -# If no entry in the TPM database is found, the instance is > -# created and an entry added to the database. > -function vtpm_create_instance () { > - local res instance domname reason uuid > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - reason=$(vtpm_get_create_reason) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > - release_lock vtpmdb > - return > - fi > - > - if [ "$instance" == "0" ]; then > - #Try to give the preferred instance to the domain > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > - if [ "$instance" != "" ]; then > - res=$(vtpmdb_is_free_instancenum $instance) > - if [ $res -eq 0 ]; then > - instance=$(vtpmdb_get_free_instancenum) > - fi > - else > - instance=$(vtpmdb_get_free_instancenum) > - fi > - > - vtpm_create $instance > - > - if [ $vtpm_fatal_error -eq 0 ]; then > - if [ "$uuid" != "" ]; then > - vtpmdb_add_instance $uuid $instance > - else > - vtpmdb_add_instance $domname $instance > - fi > - fi > - else > - if [ "$reason" == "resume" ]; then > - vtpm_resume $instance > - else > - vtpm_start $instance > - fi > - fi > - > - release_lock vtpmdb > - > - xenstore_write $XENBUS_PATH/instance $instance > -} > - > - > -#Remove an instance when a VM is terminating or suspending. > -#Since it is assumed that the VM will appear again, the > -#entry is kept in the VTPMDB file. > -function vtpm_remove_instance () { > - local instance reason domname uuid > - #Stop script execution quietly if path does not exist (anymore) > - xenstore-exists "$XENBUS_PATH"/domain > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" != "0" ]; then > - vtpm_suspend $instance > - fi > - > - release_lock vtpmdb > -} > - > - > -#Remove an entry in the VTPMDB file given the domain's name > -#1st parameter: The name of the domain > -function vtpm_delete_instance () { > - local instance > - > - claim_lock vtpmdb > - > - instance=$(vtpmdb_find_instance $1) > - if [ "$instance" != "0" ]; then > - vtpmdb_remove_entry $1 $instance > - fi > - > - release_lock vtpmdb > -} > - > -# Determine whether the given address is local to this machine > -# Return values: > -# "-1" : the given machine name is invalid > -# "0" : this is not an address of this machine > -# "1" : this is an address local to this machine > -function vtpm_isLocalAddress() { > - local addr res > - addr=$(ping $1 -c 1 | \ > - awk '{ print substr($3,2,length($3)-2); exit }') > - if [ "$addr" == "" ]; then > - echo "-1" > - return > - fi > - res=$(ifconfig | grep "inet addr" | \ > - awk -vaddr=$addr \ > - '{ \ > - if ( addr == substr($2, 6)) {\ > - print "1"; \ > - } \ > - }' \ > - ) > - if [ "$res" == "" ]; then > - echo "0" > - return > - fi > - echo "1" > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migration_step() { > - local res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate $1 $2 $3 > - else > - vtpm_migrate_local > - fi > -} > - > -# Recover from migration due to an error. This function differentiates > -# between migration to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host the migration was going to > -# 2nd: name of the domain that was to be migrated > -# 3rd: the last successful migration step that was done > -function vtpm_recover() { > - local res > - res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate_recover $1 $2 $3 > - fi > -} > - > - > -#Determine the domain id given a domain's name. > -#1st parameter: name of the domain > -#return value: domain id or -1 if domain id could not be determined > -function vtpm_domid_from_name () { > - local id name ids > - ids=$(xenstore-list /local/domain) > - for id in $ids; do > - name=$(xenstore-read /local/domain/$id/name) > - if [ "$name" == "$1" ]; then > - echo "$id" > - return > - fi > - done > - echo "-1" > -} > - > -#Determine the virtual TPM's instance number using the domain ID. > -#1st parm: domain ID > -function vtpm_uuid_by_domid() { > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > -} > - > - > -# Determine the vTPM's UUID by the name of the VM > -function vtpm_uuid_from_vmname() { > - local domid=$(vtpm_domid_from_name $1) > - if [ "$domid" != "-1" ]; then > - echo $(vtpm_uuid_by_domid $domid) > - return > - fi > - echo "" > -} > - > -#Add a virtual TPM instance number and its associated domain name > -#to the VTPMDB file and activate usage of this virtual TPM instance > -#by writing the instance number into the xenstore > -#1st parm: name of virtual machine > -#2nd parm: instance of associated virtual TPM > -function vtpm_add_and_activate() { > - local domid=$(vtpm_domid_from_name $1) > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > - vtpmdb_add_instance $vtpm_uuid $2 > - xenstore-write backend/vtpm/$domid/0/instance $2 > - fi > -} > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > deleted file mode 100644 > index b75b95b..0000000 > --- a/tools/hotplug/Linux/vtpm-delete > +++ /dev/null > @@ -1,18 +0,0 @@ > -#!/bin/bash > - > -# This scripts must be called the following way: > -# vtpm-delete > -# or > -# vtpm-delete --vmname > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > - > -if [ "$1" == "--vmname" ]; then > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > - if [ "$vtpm_uuid" != "" ];then > - vtpm_delete_instance $vtpm_uuid > - fi > -else > - vtpm_delete_instance $1 > -fi > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > deleted file mode 100644 > index 9fd35e7..0000000 > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > +++ /dev/null > @@ -1,35 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/xen-hotplug-common.sh" > - > -findCommand "$@" > -if [ "$command" != "online" ] && > - [ "$command" != "offline" ] && > - [ "$command" != "add" ] && > - [ "$command" != "remove" ] > -then > - log err "Invalid command: $command" > - exit 1 > -fi > - > - > -XENBUS_PATH="${XENBUS_PATH:?}" > - > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > deleted file mode 100644 > index 4f9a1fd..0000000 > --- a/tools/hotplug/Linux/vtpm-impl > +++ /dev/null > @@ -1,208 +0,0 @@ > -#!/bin/bash > -# =================================================================== > -# > -# Copyright (c) 2005, Intel Corp. > -# All rights reserved. > -# > -# Redistribution and use in source and binary forms, with or without > -# modification, are permitted provided that the following conditions > -# are met: > -# > -# * Redistributions of source code must retain the above copyright > -# notice, this list of conditions and the following disclaimer. > -# * Redistributions in binary form must reproduce the above > -# copyright notice, this list of conditions and the following > -# disclaimer in the documentation and/or other materials provided > -# with the distribution. > -# * Neither the name of Intel Corporation nor the names of its > -# contributors may be used to endorse or promote products derived > -# from this software without specific prior written permission. > -# > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -# OF THE POSSIBILITY OF SUCH DAMAGE. > -# =================================================================== > - > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > - > -TPM_TYPE_PVM=\\x01 > -TPM_TYPE_HVM=\\x02 > - > -TPM_SUCCESS=00000000 > - > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > - > -VTPM_MIG=/usr/bin/vtpm_migrator > - > -# -------------------- Helpers for binary streams ----------- > - > -function str_to_hex32() { > - printf "%0.8x" $1 > -} > - > -function hex32_to_bin() { > - local inst=$(str_to_hex32 $1); > - > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > - > - echo "$n1$n2$n3$n4" > -} > - > -function vtpm_manager_cmd() { > - local cmd=$1; > - local inst=$2; > - local inst_bin=$(hex32_to_bin $inst); > - > - claim_lock vtpm_mgr > - > - #send cmd to vtpm_manager > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > - > - #recv response > - set +e > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > - set -e > - > - release_lock vtpm_mgr > - > - #return whether the command was successful > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > - vtpm_fatal_error=1 > - false > - else > - true > - fi > -} > - > -# Helper to get vm type to pass to vtpm_manager open/resume > -function vtpm_get_type() { > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > - local vm=$(xenstore_read /local/domain/$inst/vm) > - if [ "$vm" != "" ]; then > - local ostype=$(xenstore-read $vm/image/ostype) > - if [ "$ostype" == "hvm" ]; then > - echo $TPM_TYPE_HVM; > - else > - echo $TPM_TYPE_PVM; > - fi > - fi > -} > - > -# ------------------ Command handlers ----------------- > - > -# Create new vtpm instance & set it up for use > -function vtpm_create () { > - # Creation is handled implicitly by the manager on first setup > - # so just set it up for use > - $(vtpm_start $1) > -} > - > -# Setup vtpm instance for use. > -function vtpm_start() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > -} > - > -function vtpm_resume() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > -} > - > -# Reset the vtpm AKA clear PCRs > -function vtpm_reset() { > - #not used by current implemenation > - true > -} > - > -# Shutdown the vtpm while the vm is down > -# This could be a suspend of shutdown > -# we cannot distinquish, so save the state > -# and decide on startup if we should keep is > -function vtpm_suspend() { > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > -} > - > - > -function vtpm_delete() { > - local inst=$1 > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > - rm -f /var/vtpm/vtpm_dm_$1.data > - true > - else > - vtpm_fatal_error=1 > - false > - fi > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migrate() { > - local instance res > - > - instance=$(vtpmdb_find_instance $2) > - if [ "$instance" == "" ]; then > - log err "VTPM Migratoin failed. Unable to translation of domain name" > - echo "Error: VTPM Migration failed while looking up instance number" > - fi > - > - case "$3" in > - 0) > - #Incicate migration supported > - echo "0" > - ;; > - > - 1) > - # Get Public Key from Destination > - # Call vtpm_manager's migration part 1 > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 2) > - # Call manager's migration step 2 and send result to destination > - # If successful remove from db > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 3) > - if `ps x | grep "$VTPM_MIG $1"`; then > - log err "VTPM Migration failed to complete." > - echo "Error: VTPM Migration failed to complete." > - fi > - ;; > - esac > - > -} > - > - > -function vtpm_migrate_recover() { > - echo "Error: Recovery not supported yet" > -} > - > -function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > -} > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > deleted file mode 100644 > index 7e38ae2..0000000 > --- a/tools/hotplug/Linux/vtpm-migration.sh > +++ /dev/null > @@ -1,19 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > index c591a3f..a0d409e 100644 > --- a/tools/hotplug/Linux/xen-backend.rules > +++ b/tools/hotplug/Linux/xen-backend.rules > @@ -1,6 +1,5 @@ > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > deleted file mode 100644 > index 7b3efa5..0000000 > --- a/tools/vtpm/Makefile > +++ /dev/null > @@ -1,74 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -# Dir name for emulator (as dom0 tpm driver) > -TPM_EMULATOR_DIR = tpm_emulator > -# Dir name for vtpm instance > -VTPM_DIR = vtpm > -ORIG_DIR = orig > - > -# Emulator tarball name > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > - > -GMP_HEADER = /usr/include/gmp.h > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: build_sub > - > -.PHONY: install > -install: build > - $(MAKE) -C $(VTPM_DIR) install-recursive > - > -.PHONY: clean > -clean: > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > - fi > - @if [ -d $(VTPM_DIR) ]; \ > - then $(MAKE) -C $(VTPM_DIR) clean; \ > - fi > - > -.PHONY: mrproper > -mrproper: > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > - > -# Download Swiss emulator > -$(TPM_EMULATOR_TARFILE): > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > - > -# Create vtpm dirs > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > - rm -rf $(VTPM_DIR) > - tar -xzf $(TPM_EMULATOR_TARFILE) > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > - > - set -e; cd $(VTPM_DIR); \ > - patch -p1 < ../vtpm-0.5.1.patch; \ > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > - > -orig: $(TPM_EMULATOR_TARFILE) > - mkdir $(ORIG_DIR); > - set -e; cd $(ORIG_DIR); \ > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > - > -updatepatches: clean orig > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > - mv vtpm.patch vtpm.patch.old; > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > - > -.PHONY: build_sub > -build_sub: $(VTPM_DIR)/tpmd/tpmd > - set -e; if [ -e $(GMP_HEADER) ]; then \ > - $(MAKE) -C $(VTPM_DIR) version; \ > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > - else \ > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > - fi > - > diff --git a/tools/vtpm/README b/tools/vtpm/README > deleted file mode 100644 > index 2008cbd..0000000 > --- a/tools/vtpm/README > +++ /dev/null > @@ -1,45 +0,0 @@ > - > -Directory Structure > -=================== > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > - be patched and used for our vtpms > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > - listens on a pair of fifos for TPM commands, > - persistent state is sent via named fifo to vtpm > - manager, which encrypts it and protects it. > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > - platforms, this patches the emulator to allow > - it to be inserted into the dom0 kernel > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > - > -Compile Flags > -=================== > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -Requirements > -============ > -- xen-unstable > -- IBM frontend/backend vtpm driver patch > -- vtpm_managerd > -- GNU MP Big number library (GMP) > - > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -tpm_emulator flow > -================== > -Read documentation in tpm_emulator-0.2 directory > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > deleted file mode 100644 > index 548cff0..0000000 > --- a/tools/vtpm/Rules.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(DEPS) > - > -BUILD_EMULATOR = y > - > -# Make sure these are just rules > -.PHONY : all build install clean > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > deleted file mode 100644 > index c34c665..0000000 > --- a/tools/vtpm/tpm_emulator.patch > +++ /dev/null > @@ -1,1919 +0,0 @@ > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,2 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > -+INTEL Corp <> [Dropped to Ring3] > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,3 +1,6 @@ > -+????-??-?? Intel Corp > -+ * Moved module out of kernel to run as a ring 3 app > -+ > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > - persistent data adapted > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -24,15 +25,10 @@ int __gmp_junk; > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > - int linenum, const char *expr) > - { > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > -+ error("%s:%d: GNU MP assertion failed: %s\n", > - filename, linenum, expr); > - } > - > --void __attribute__ ((regparm(0))) abort(void) > --{ > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > --} > -- > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > - > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > - > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > - { > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > -- "GMP: cannot allocate memory (size=%u)\n", size); > -+ void *ret = (void*)malloc(size); > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > - return ret; > - } > - > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > - size_t old_size, size_t new_size) > - { > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > -+ void *ret = (void*)malloc(new_size); > -+ if (!ret) error("GMP: Cannot reallocate memory " > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > - memcpy(ret, oldptr, old_size); > -- kfree(oldptr); > -+ free(oldptr); > - return ret; > - } > - > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > - /* overwrite used memory */ > - if (blk_ptr != NULL) { > - memset(blk_ptr, 0, blk_size); > -- kfree(blk_ptr); > -+ free(blk_ptr); > - } > - } > - > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > - msg[0] = 0x00; > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1]); > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > - SHA1_DIGEST_LENGTH) != 0) return -1; > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > -@@ -1,195 +0,0 @@ > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -- * Copyright (C) 2004 Mario Strasser , > -- * > -- * This module is free software; you can redistribute it and/or modify > -- * it under the terms of the GNU General Public License as published > -- * by the Free Software Foundation; either version 2 of the License, > -- * or (at your option) any later version. > -- * > -- * This module is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -- * GNU General Public License for more details. > -- * > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > -- */ > -- > --#include > --#include > --#include > --#include > --#include > --#include "linux_module.h" > --#include "tpm/tpm_emulator.h" > -- > --MODULE_LICENSE("GPL"); > --MODULE_AUTHOR("Mario Strasser "); > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > -- > --/* module startup parameters */ > --char *startup = "save"; > --module_param(startup, charp, 0444); > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > --module_param(storage_file, charp, 0644); > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > -- "file of the TPM."); > -- > --/* TPM lock */ > --static struct semaphore tpm_mutex; > -- > --/* TPM command response */ > --static struct { > -- uint8_t *data; > -- uint32_t size; > --} tpm_response; > -- > --/* module state */ > --#define STATE_IS_OPEN 0 > --static uint32_t module_state; > --static struct timespec old_time; > -- > --static int tpm_open(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > -- return 0; > --} > -- > --static int tpm_release(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return 0; > --} > -- > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > -- *ppos += count; > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- } else { > -- count = 0; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- *ppos = 0; > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command(buf, count, &tpm_response.data, > -- &tpm_response.size) != 0) { > -- count = -EILSEQ; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --#define TPMIOC_CANCEL _IO('T', 0x00) > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > -- > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > --{ > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > -- if (cmd == TPMIOC_TRANSMIT) { > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > -- &tpm_response.size) == 0) { > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > -- tpm_response.size); > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } else { > -- tpm_response.size = 0; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return tpm_response.size; > -- } > -- return -1; > --} > -- > --struct file_operations fops = { > -- .owner = THIS_MODULE, > -- .open = tpm_open, > -- .release = tpm_release, > -- .read = tpm_read, > -- .write = tpm_write, > -- .ioctl = tpm_ioctl, > --}; > -- > --static struct miscdevice tpm_dev = { > -- .minor = TPM_DEVICE_MINOR, > -- .name = TPM_DEVICE_NAME, > -- .fops = &fops, > --}; > -- > --int __init init_tpm_module(void) > --{ > -- int res = misc_register(&tpm_dev); > -- if (res != 0) { > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > -- return res; > -- } > -- /* initialize variables */ > -- sema_init(&tpm_mutex, 1); > -- module_state = 0; > -- tpm_response.data = NULL; > -- old_time = current_kernel_time(); > -- /* initialize TPM emulator */ > -- if (!strcmp(startup, "clear")) { > -- tpm_emulator_init(1); > -- } else if (!strcmp(startup, "save")) { > -- tpm_emulator_init(2); > -- } else if (!strcmp(startup, "deactivated")) { > -- tpm_emulator_init(3); > -- } else { > -- error("invalid startup mode '%s'; must be 'clear', " > -- "'save' (default) or 'deactivated", startup); > -- misc_deregister(&tpm_dev); > -- return -EINVAL; > -- } > -- return 0; > --} > -- > --void __exit cleanup_tpm_module(void) > --{ > -- tpm_emulator_shutdown(); > -- misc_deregister(&tpm_dev); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > --} > -- > --module_init(init_tpm_module); > --module_exit(cleanup_tpm_module); > -- > --uint64_t tpm_get_ticks(void) > --{ > -- struct timespec new_time = current_kernel_time(); > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > -- old_time = new_time; > -- return (ticks > 0) ? ticks : 1; > --} > -- > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -17,54 +18,62 @@ > - #ifndef _LINUX_MODULE_H_ > - #define _LINUX_MODULE_H_ > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - #include > --#include > --#include > --#include > --#include > - > --/* module settings */ > -+#include > -+#define __BYTEORDER_HAS_U64__ > -+#ifdef LITTLE_ENDIAN > -+ #include > -+#else > -+ #include > -+#endif > - > -+/* module settings */ > -+#define min(A,B) ((A)<(B)?(A):(B)) > -+#ifndef STR > - #define STR(s) __STR__(s) > - #define __STR__(s) #s > -+#endif > - #include "tpm_version.h" > - > - #define TPM_DEVICE_MINOR 224 > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > --/* debug and log output functions */ > -- > - #ifdef DEBUG > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - #else > - #define debug(fmt, ...) > - #endif > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > - static inline void *tpm_malloc(size_t size) > - { > -- return kmalloc(size, GFP_KERNEL); > -+ return malloc(size); > - } > - > - static inline void tpm_free(const void *ptr) > - { > -- if (ptr != NULL) kfree(ptr); > -+ if (ptr != NULL) free( (void *) ptr); > - } > - > - /* random numbers */ > - > -+//FIXME; > -+void get_random_bytes(void *buf, int nbytes); > -+ > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > - { > - get_random_bytes(buf, nbytes); > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > - > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > - > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,24 +1,40 @@ > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > - # Copyright (C) 2004 Mario Strasser > -+# Copyright (C) 2006 INTEL Corp. > - # > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > - > --# kernel settings > --KERNEL_RELEASE := $(shell uname -r) > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > --MOD_SUBDIR := misc > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --MODULE_NAME := tpm_emulator > -+BIN := tpm_emulator > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > - > --# enable/disable DEBUG messages > --EXTRA_CFLAGS += -Wall -DDEBUG -g > -+# Installation program and options > -+INSTALL = install > -+INSTALL_PROG = $(INSTALL) -m0755 > -+INSTALL_DIR = $(INSTALL) -d -m0755 > -+ > -+# Xen tools installation directory > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > -+ > -+CC := gcc > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > -+CFLAGS += -I. -Itpm > -+ > -+# Is the simulator running in it's own vm? > -+#CFLAGS += -DVTPM_MULTI_VM > -+ > -+ifeq ($(COMPILE_ARCH),x86_64) > -+LIBDIR = lib64 > -+else > -+LIBDIR = lib > -+endif > - > - # GNU MP configuration > --GMP_LIB := /usr/lib/libgmp.a > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > - # sources and objects > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > - > --obj-m := $(MODULE_NAME).o > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > -+obj-m := $(BIN) > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > - > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > - > - # do not print "Entering directory ..." > - MAKEFLAGS += --no-print-directory > - > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > -+all: $(BIN) > - > --install: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > -- test -d /var/tpm || mkdir /var/tpm > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > -- chmod 666 /dev/tpm > -- depmod -a > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > -+ > -+%.o: %.c > -+ $(CC) $(CFLAGS) -c $< -o $@ > -+ > -+install: $(BIN) > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > - > --dist: $(DISTSRC) > -- rm -rf $(DISTDIR) > -- mkdir $(DISTDIR) > -- cp --parents $(DISTSRC) $(DISTDIR)/ > -- rm -f $(DISTDIR)/crypto/gmp.h > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > -- rm -rf $(DISTDIR) > -+mrproper: clean > -+ rm -f $(BIN) tpm_version.h > - > - $(src)/crypto/libgmp.a: > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > -@@ -88,4 +98,3 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -- > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > - Copyright > - -------------------------------------------------------------------------- > - Copyright (C) 2004 Mario Strasser and Swiss Federal > --Institute of Technology (ETH) Zurich. > -+ Institute of Technology (ETH) Zurich. > -+Copyright (C) 2005 INTEL Corp > - > - This program is free software; you can redistribute it and/or modify > - it under the terms of the GNU General Public License as published by > -@@ -43,6 +44,12 @@ Example: > - GMP_LIB := /usr/lib/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > -+GNU MP Library on 64 bit Systems > -+-------------------------------------------------------------------------- > -+Some 64-bit kernels have problems with importing the user-space gmp > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > -+ > - Installation > - -------------------------------------------------------------------------- > - The compilation and installation process uses the build environment for > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > - TPM_RESULT res; > - > - info("TPM_GetCapabilityOwner()"); > -- > -+ > -+ if (!tpmData.permanent.flags.owned) { > -+ return TPM_NOSRK; > -+ } > - /* Verify owner authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > - if (res != TPM_SUCCESS) return res; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > - > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > - { > -- UINT32 key_length; > -+ size_t key_length; > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > - /* setup TPM_PUBKEY structure */ > -- key_length = tpmData.permanent.data.endorsementKey.size; > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > -- pubEndorsementKey->pubKey.key, > -- &pubEndorsementKey->pubKey.keyLength); > -+ pubEndorsementKey->pubKey.key, > -+ &key_length); > -+ pubEndorsementKey->pubKey.keyLength = key_length; > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - { > - TPM_RESULT res; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -+ size_t key_length; > - info("TPM_OwnerReadInternalPub()"); > - /* verify authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > -- &publicPortion->pubKey.keyLength); > -+ &key_length); > -+ publicPortion->pubKey.keyLength = key_length; > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > - publicPortion->algorithmParms.encScheme = srk->encScheme; > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ UINT32 length32; > -+ size_t length; > - info("TPM_CertifyKey()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32=(UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - sha1_init(&sha1_ctx); > -- sha1_update(&sha1_ctx, buf, length); > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > - sha1_final(&sha1_ctx, buf); > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > - tpm_free(buf); > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ size_t length; > -+ UINT32 length32; > - info("TPM_CertifyKey2()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32 = (UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_update(&sha1, inputData1, inputSize1); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > - } > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > - rsa_export_modulus(&aikData->key, scratch, &size); > - sha1_update(&sha1, scratch, size); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > - void tpm_init_data(void) > - { > - /* endorsement key */ > -+#ifndef TPM_GENERATE_EK > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > -+#endif > -+ > - int i; > - /* reset all data to NULL, FALSE or 0 */ > - memset(&tpmData, 0, sizeof(tpmData)); > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > - > - #ifdef TPM_STORE_TO_FILE > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (IS_ERR(fp)) return -1; > -- set_fs(get_ds()); > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ int fp; > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -+ res = write(fp, data, data_length); > -+ close(fp); > - return (res == data_length) ? 0 : -1; > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- if (IS_ERR(fp)) return -1; > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > -+ int fp, file_status; > -+ struct stat file_info; > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -+ file_status = fstat(fp, &file_info); > -+ if (file_status < 0) { > -+ close(fp); > -+ return -1; > -+ } > -+ > -+ *data_length = file_info.st_size; > - *data = tpm_malloc(*data_length); > - if (*data == NULL) { > -- filp_close(fp, NULL); > -+ close(fp); > - return -1; > - } > -- set_fs(get_ds()); > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ res = read(fp, *data, *data_length); > -+ close(fp); > - if (res != *data_length) { > - tpm_free(*data); > - return -1; > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > - int tpm_store_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ UINT32 buf_length, len; > - > - /* marshal data */ > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > - buf = ptr = tpm_malloc(buf_length); > - if (buf == NULL > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - if (write_to_file(buf, buf_length - len)) { > - tpm_free(buf); > - return -1; > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > - int tpm_restore_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ size_t buf_length; > -+ UINT32 len; > - TPM_VERSION ver; > - > - /* read data */ > - if (read_from_file(&buf, &buf_length)) return -1; > - ptr = buf; > -- len = buf_length; > -+ len = (uint32_t) buf_length; > - /* unmarshal data */ > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - tpm_free(buf); > - return 0; > - } > - > - int tpm_erase_permanent_data(void) > - { > -- int res = write_to_file("", 0); > -+ int res = write_to_file((uint8_t *) "", 0); > - return res; > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveKeyContext()"); > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > - keyContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *keyContextSize; > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveAuthContext()"); > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > - authContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *authContextSize; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -22,7 +23,8 @@ > - /* TPM configuration */ > - #define TPM_STORE_TO_FILE 1 > - #undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+//#undef TPM_GENERATE_EK > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > - > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > - { > -- UINT32 m_len, e_len, q_len; > -+ size_t m_len, e_len, q_len; > - if (*length < sizeof_RSA((*v))) return -1; > - if (v->size > 0) { > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > - return 0; > - } > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > - { > - if (tpm_marshal_BYTE(ptr, length, v->type) > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - TPM_RESULT res; > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -- UINT32 buf_size = ek->size >> 3; > -+ size_t buf_size = ek->size >> 3, key_length; > - BYTE buf[buf_size]; > - > - info("TPM_TakeOwnership()"); > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - return TPM_FAIL; > - } > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > -- &srkPub->pubKey.keyLength); > -+ &key_length); > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > - /* setup tpmProof and set state to owned */ > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > - { > - int i; > -+ int restore_fail; > - info("TPM_Startup(%d)", startupType); > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > -- /* reset STANY_FLAGS */ > -- SET_TO_ZERO(&tpmData.stany.flags); > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -- /* reset STANY_DATA (invalidates ALL sessions) */ > -- SET_TO_ZERO(&tpmData.stany.data); > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -- /* init session-context nonce */ > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > -+ > -+ /* try and restore state to get EK, SRK, etc */ > -+ restore_fail = tpm_restore_permanent_data(); > -+ > - /* set data and flags according to the given startup type */ > - if (startupType == TPM_ST_CLEAR) { > -- /* if available, restore permanent data */ > -- tpm_restore_permanent_data(); > -+ /* reset STANY_FLAGS */ > -+ SET_TO_ZERO(&tpmData.stany.flags); > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > -+ SET_TO_ZERO(&tpmData.stany.data); > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -+ /* init session-context nonce */ > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > - /* reset PCR values */ > - for (i = 0; i < TPM_NUM_PCR; i++) { > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > - else > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > - } > - /* reset STCLEAR_FLAGS */ > - SET_TO_ZERO(&tpmData.stclear.flags); > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > - /* init key-context nonce */ > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > - } else if (startupType == TPM_ST_STATE) { > -- if (tpm_restore_permanent_data()) { > -+ /* restore must have been successful for TPM_ST_STATE */ > -+ if (restore_fail) { > - error("restoring permanent data failed"); > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - BYTE *enc, UINT32 *enc_size) > - { > - UINT32 len; > -+ size_t enc_size32 = *enc_size; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > -- enc, enc_size)) { > -+ enc, &enc_size32)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_SEALED_DATA *seal, BYTE **buf) > - { > -- UINT32 len; > -+ size_t len; > -+ UINT32 len32; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = len; > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > - > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > - BYTE *inData, TPM_AUTH *auth1, > -- UINT32 *outDataSize, BYTE **outData) > -+ UINT32 *outDataSize32, BYTE **outData) > - { > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - int scheme; > -+ size_t outDataSize; > - > - info("TPM_UnBind()"); > - /* get key */ > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - /* the size of the input data muss be greater than zero */ > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > - /* decrypt data */ > -- *outDataSize = inDataSize; > -- *outData = tpm_malloc(*outDataSize); > -+ outDataSize = inDataSize; > -+ *outData = tpm_malloc(outDataSize); > - if (*outData == NULL) return TPM_NOSPACE; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > - } > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > -- *outData, outDataSize)) { > -+ *outData, &outDataSize)) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > - /* verify data if it is of type TPM_BOUND_DATA */ > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > - || key->keyUsage != TPM_KEY_LEGACY) { > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > -- *outDataSize -= 5; > -- memmove(*outData, &(*outData)[5], *outDataSize); > -+ outDataSize -= 5; > -+ memmove(*outData, &(*outData)[5], outDataSize); > - } > -+ *outDataSize32 = (UINT32) outDataSize; > - return TPM_SUCCESS; > - } > - > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > - } > - > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > -- BYTE *enc, UINT32 *enc_size) > -+ BYTE *enc, UINT32 *enc_size32) > - { > - UINT32 len; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -+ size_t enc_size; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > -- enc, enc_size)) { > -+ enc, &enc_size)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > - } > -+ *enc_size32 = (UINT32) enc_size; > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return 0; > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_STORE_ASYMKEY *store, BYTE **buf) > - { > -- UINT32 len; > -+ UINT32 len32; > -+ size_t len; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = (UINT32) len; > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - TPM_SESSION_DATA *session; > - TPM_STORE_ASYMKEY store; > - rsa_private_key_t rsa; > -- UINT32 key_length; > -+ size_t key_length; > - > - info("TPM_CreateWrapKey()"); > - /* get parent key */ > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - } > - } > - /* generate key and store it */ > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > -- wrappedKey->pubKey.keyLength = key_length >> 3; > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > -+ return TPM_FAIL; > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > -- store.privKey.keyLength = key_length >> 4; > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > - wrappedKey->encDataSize = parent->key.size >> 3; > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - tpm_free(wrappedKey->encData); > - return TPM_NOSPACE; > - } > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -- &wrappedKey->pubKey.keyLength); > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -+ &key_length); > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > -+ store.privKey.keyLength = (UINT32) key_length; > - rsa_release_private_key(&rsa); > - /* compute the digest of the wrapped key (without encData) */ > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > - > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > - { > -+ size_t key_length; > - parms->algorithmID = TPM_ALG_RSA; > - parms->encScheme = key->encScheme; > - parms->sigScheme = key->sigScheme; > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > - if (parms->parms.rsa.exponent == NULL) return -1; > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > -- &parms->parms.rsa.exponentSize); > -+ &key_length); > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > - return 0; > - } > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - TPM_DIGEST digest; > -+ size_t key_length; > - info("TPM_GetPubKey()"); > - /* get key */ > - if (keyHandle == TPM_KH_SRK > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - pubKey->pubKey.keyLength = key->key.size >> 3; > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > -- &pubKey->pubKey.keyLength); > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > - tpm_free(pubKey->pubKey.key); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > - TPM_DIGEST DAA_digest_gamma; > - BYTE DAA_generic_q[26]; > - } TPM_DAA_ISSUER; > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > - > - /* > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > - TPM_DIGEST DAA_rekey; > - UINT32 DAA_count; > - } TPM_DAA_TPM; > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > - > - /* > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > - BYTE DAA_scratch[256]; > - BYTE DAA_stage; > - } TPM_DAA_CONTEXT; > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > - > - /* > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > - BYTE DAA_join_u1[138]; > - TPM_DIGEST DAA_digest_n0; > - } TPM_DAA_JOINDATA; > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > - > - /* > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > - //UINT32 ownerReference; > - //BOOL disableResetLock; > - } TPM_STCLEAR_DATA; > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > - > - /* > - * TPM_SESSION_DATA > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > - TPM_DAA_JOINDATA DAA_joinSession; > - TPM_HANDLE handle; > - } TPM_DAA_SESSION_DATA; > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > - > - /* > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > - TPM_DAAHANDLE currentDAA; > - TPM_TRANSHANDLE transExclusive; > - } TPM_STANY_DATA; > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > - > - /* > - * TPM_DATA > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > - struct { > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > - } test_cases[] = {{ > -- "abc", 1, > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > -+ (uint8_t*)"abc", 1, > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > - }, { > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > - }, { > -- "a", 1000000, > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > -+ (uint8_t*)"a", 1000000, > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > - }, { > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > - }}; > - > - debug("tpm_test_sha1()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > - sha1_init(&ctx); > - for (j = 0; j < test_cases[i].repetitions; j++) > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - sha1_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > - } > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > - struct { > - uint8_t *key, key_len, *data, data_len, *digest; > - } test_cases[] = {{ > -- "\x0b", 20, "Hi There", 8, > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > - }, { > -- "Jefe", 4, "what do ya want for nothing?", 28, > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > - }, { > -- "\xaa", 20, "\xdd", 50, > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > - }, { > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > - }, { > -- "\x0c", 20, "Test With Truncation", 20, > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > - }, { > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > - }, { > -- "\xaa", 80, > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > -+ (uint8_t*)"\xaa", 80, > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > - }}; > - > - debug("tpm_test_hmac()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > - uint8_t key[test_cases[i].key_len]; > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > - hmac_init(&ctx, key, test_cases[i].key_len); > - } else { > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > - } > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - } > - hmac_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > - static int tpm_test_rsa_EK(void) > - { > - int res = 0; > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > - uint8_t buf[256]; > -- size_t buf_len, data_len = strlen(data); > -+ size_t buf_len, data_len = strlen((char*)data); > - rsa_private_key_t priv_key; > - rsa_public_key_t pub_key; > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > - { > - info("TPM_GetTicks()"); > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > -- sizeof(TPM_CURRENT_TICKS)); > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > - TPM_CURRENT_TICKS *currentTicks, > - UINT32 *sigSize, BYTE **sig) > - { > -- TPM_RESULT res; > -- TPM_KEY_DATA *key; > -- BYTE *info, *p; > -- UINT32 info_length, length; > - info("TPM_TickStampBlob()"); > -- /* get key */ > -- key = tpm_get_key(keyHandle); > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > -- /* verify authorization */ > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > -- if (res != TPM_SUCCESS) return res; > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > -- /* get current ticks */ > -- TPM_GetTicks(currentTicks); > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > -- *sigSize = key->key.size >> 3; > -- *sig = tpm_malloc(*sigSize); > -- if (*sig == NULL) return TPM_FAIL; > -- /* setup TPM_SIGN_INFO structure */ > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > -- info = tpm_malloc(info_length); > -- if (info == NULL) { > -- tpm_free(*sig); > -- return TPM_FAIL; > -- } > -- memcpy(&info[0], "\x05\x00TSTP", 6); > -- memcpy(&info[6], antiReplay->nonce, 20); > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > -- p = &info[30 + sizeof(TPM_DIGEST)]; > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > -- tpm_free(*sig); > -- tpm_free(info); > -- return TPM_FAIL; > -- } > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - void tpm_update_ticks(void) > - { > -- if (tpmData.stany.data.currentTicks.tag == 0) { > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > --*/ > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > -- sizeof(TPM_NONCE)); > -- tpmData.stany.data.currentTicks.tickRate = 1; > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > --*/ > -- } else { > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > -- } > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "in", 2); > -+ sha1_update(&sha1, (BYTE*)"in", 2); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "out", 3); > -+ sha1_update(&sha1, (BYTE*)"out", 3); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -0,0 +1,156 @@ > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -+ * Copyright (C) 2005 INTEL Corp > -+ * > -+ * This module is free software; you can redistribute it and/or modify > -+ * it under the terms of the GNU General Public License as published > -+ * by the Free Software Foundation; either version 2 of the License, > -+ * or (at your option) any later version. > -+ * > -+ * This module is distributed in the hope that it will be useful, > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -+ * GNU General Public License for more details. > -+ * > -+ */ > -+ > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+ > -+#include "tpm_emulator.h" > -+ > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+ > -+#define BUFFER_SIZE 2048 > -+ > -+static int devurandom=0; > -+ > -+void get_random_bytes(void *buf, int nbytes) { > -+ > -+ if (devurandom == 0) { > -+ devurandom = open("/dev/urandom", O_RDONLY); > -+ } > -+ > -+ if (read(devurandom, buf, nbytes) != nbytes) { > -+ printf("Can't get random number.\n"); > -+ exit(-1); > -+ } > -+} > -+ > -+uint64_t tpm_get_ticks(void) > -+{ > -+ //struct timeval tv; > -+ //int gettimeofday(&tv, struct timezone *tz); > -+ return 0; > -+} > -+ > -+int main(int argc, char **argv) > -+{ > -+ uint8_t in[BUFFER_SIZE], *out; > -+ uint32_t out_size; > -+ int in_size, written; > -+ int i; > -+ struct stat file_info; > -+ > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+ if (argc < 2) { > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > -+ return -1; > -+ } > -+ > -+ /* initialize TPM emulator */ > -+ if (!strcmp(argv[1], "clear")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(1); > -+ } else if (!strcmp(argv[1], "save")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(2); > -+ } else if (!strcmp(argv[1], "deactivated")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(3); > -+ } else { > -+ printf("invalid startup mode '%s'; must be 'clear', " > -+ "'save' (default) or 'deactivated", argv[1]); > -+ return -1; > -+ } > -+ > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ while (1) { > -+abort_command: > -+ if (tpm_rx_fh < 0) { > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ } > -+ > -+ if (tpm_rx_fh < 0) { > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > -+ return -1; > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ if (in_size < 6) { // Magic size of minium TPM command > -+ printf("Recv[%d] to small: 0x", in_size); > -+ if (in_size <= 0) { > -+ close(tpm_rx_fh); > -+ tpm_rx_fh = -1; > -+ goto abort_command; > -+ } > -+ } else { > -+ printf("Recv[%d]: 0x", in_size); > -+ for (i=0; i< in_size; i++) > -+ printf("%x ", in[i]); > -+ printf("\n"); > -+ } > -+ > -+ > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -+ printf("ERROR: Handler Failed.\n"); > -+ } > -+ > -+ written = write(tpm_tx_fh, out, out_size); > -+ > -+ if (written != out_size ) { > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ } else { > -+ printf("Sent[%Zu]: ", out_size); > -+ } > -+ for (i=0; i< out_size; i++) > -+ printf("%x ", out[i]); > -+ printf("\n"); > -+ tpm_free(out); > -+ > -+ } // loop > -+ > -+ tpm_emulator_shutdown(); > -+ > -+ close(tpm_tx_fh); > -+ close(tpm_rx_fh); > -+ > -+} > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > -@@ -2,5 +2,5 @@ > - #define _TPM_VERSION_H_ > - #define VERSION_MAJOR 0 > - #define VERSION_MINOR 4 > --#define VERSION_BUILD 1151058734 > -+#define VERSION_BUILD 1153776940 > - #endif /* _TPM_VERSION_H_ */ > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > deleted file mode 100644 > index 95586c1..0000000 > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile > -+++ tpm_emulator-0.5.1/tpmd/Makefile > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > - CFLAGS += -I../../../../tools/vtpm_manager/manager > --LDFLAGS += -lgmp > -+LDLIBS += -lgmp > - > - BINDIR := /usr/bin/ > - > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > deleted file mode 100644 > index 2aeb745..0000000 > --- a/tools/vtpm/vtpm-0.5.1.patch > +++ /dev/null > @@ -1,766 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > - VERSION_BUILD := $(shell date +"%s") > - VERSION_SUFFIX := .1 > - > --SUBDIRS := tpmd tpmd_dev tddl > -+SUBDIRS := tpmd > - > - all: version all-recursive > - > -@@ -48,12 +48,12 @@ user_install: user > - modules_install: modules > - @$(MAKE) -C tpmd_dev install || exit -1 > - > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpm crypto tpmd > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpmd > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > - > - dist: $(DISTSRC) > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > -+ > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > -+ > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - -Wwrite-strings -Wsign-compare -Wno-multichar > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > - LDFLAGS += -lgmp > - > --BINDIR := /usr/sbin/ > -+BINDIR := /usr/bin/ > - > - TPMD := tpmd > - DIRS := ../tpm ../crypto > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > - > -+VTPM_BIN := vtpmd > -+ > - vpath %.c $(strip $(DIRS)) > - > - all: $(TPMD) > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > - INSTALL ?= install > - > - install: $(TPMD) > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > - > - .PHONY: all clean install > - > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > -@@ -32,6 +32,9 @@ > - #include > - #include "tpm_emulator_config.h" > - #include "tpm/tpm_emulator.h" > -+#include "tpm/tpm_structures.h" > -+#include "tpm/tpm_marshalling.h" > -+#include "vtpm_manager.h" > - > - #define TPM_DAEMON_NAME "tpmd" > - #define TPM_CMD_BUF_SIZE 4096 > -@@ -39,6 +42,24 @@ > - #define TPM_RANDOM_DEVICE "/dev/urandom" > - #undef TPM_MKDIRS > - > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+ > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ static char *vtpm_rx_name=NULL; > -+#endif > -+ > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#define BUFFER_SIZE 2048 > -+ > - static volatile int stopflag = 0; > - static int is_daemon = 0; > - static int opt_debug = 0; > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > - static uid_t opt_uid = 0; > - static gid_t opt_gid = 0; > - static int tpm_startup = 2; > -+static int vtpm_type = VTPM_TYPE_PVM; > -+int dmi_id = 0; > - static int rand_fh; > - > - void tpm_log(int priority, const char *fmt, ...) > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > - > - int tpm_write_to_file(uint8_t *data, size_t data_length) > - { > -- int fh; > -- ssize_t res; > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (fh < 0) return -1; > -- while (data_length > 0) { > -- res = write(fh, data, data_length); > -- if (res < 0) { > -- close(fh); > -- return -1; > -- } > -- data_length -= res; > -- data += res; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > - { > -- int fh; > -- ssize_t res; > -- size_t total_length; > -- fh = open(opt_storage_file, O_RDONLY); > -- if (fh < 0) return -1; > -- total_length = lseek(fh, 0, SEEK_END); > -- lseek(fh, 0, SEEK_SET); > -- *data = tpm_malloc(total_length); > -- if (*data == NULL) { > -- close(fh); > -- return -1; > -- } > -- *data_length = 0; > -- while (total_length > 0) { > -- res = read(fh, &(*data)[*data_length], total_length); > -- if (res < 0) { > -- close(fh); > -- tpm_free(*data); > -- return -1; > -- } > -- *data_length += res; > -- total_length -= res; > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ printf("Error in read_from_file:301\n"); > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > -+ printf("Error in read_from_file:325\n"); > -+ > -+ return -1; > -+ } > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) > -+ { > -+ printf("Error in read_from_file:335\n"); > -+ return -1; > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ printf("Error in read_from_file:352\n"); > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ printf("Error in read_from_file:375\n"); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ printf("Error in read_from_file:381\n"); > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > -+ if (res != (int)*data_length) { > -+ free(*data); > -+ printf("Error in read_from_file:398\n"); > -+ return -1; > -+ } else { > -+ return 0; > -+ } > -+ > -+ > -+ > - } > - > - static void print_usage(char *name) > - { > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > -+ "[-o user name] [-g group name] [-h]" > -+#ifdef VTPM_MULTI_VM > -+ "clear|save|deactivated\n", name); > -+#else > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > -+#endif > - printf(" d : enable debug mode\n"); > - printf(" f : forces the application to run in the foreground\n"); > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > - exit(EXIT_SUCCESS); > - } > - } > -- if (optind < argc) { > -+ /*Make sure we have all required options*/ > -+#ifdef VTPM_MULTI_VM > -+#define EXTRA_OPTS 0 > -+#else > -+#define EXTRA_OPTS 2 > -+#endif > -+ if (optind < argc - EXTRA_OPTS ) { > - debug("startup mode = '%s'", argv[optind]); > - if (!strcmp(argv[optind], "clear")) { > - tpm_startup = 1; > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > - print_usage(argv[0]); > - exit(EXIT_SUCCESS); > - } > -+#ifndef VTPM_MULTI_VM > -+ ++optind; > -+ if(!strcmp(argv[optind], "pvm")) { > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[optind], "hvm")) { > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("Invalid vm mode '%s'; must be 'pvm', " > -+ "or 'hvm' ", argv[optind]); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > -+ } > -+ ++optind; > -+ dmi_id = atoi(argv[optind]); > -+#endif > -+ } else { > -+ error("Invalid number of arguments"); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > - } > - } > - > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > - > - static void main_loop(void) > - { > -- int sock, fh, res; > -- int32_t in_len; > -+ int32_t in_len, written; > - uint32_t out_len; > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > -+ int guest_id=-1; > -+ int i; > -+ char *vtpm_rx_file=NULL; > -+ int res; > -+ > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > - struct sockaddr_un addr; > -- socklen_t addr_len; > -- fd_set rfds; > -- struct timeval tv; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifndef VTPM_MULTI_VM > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > - > - info("staring main loop"); > -- /* open UNIX socket */ > -- sock = init_socket(opt_socket_name); > -- if (sock < 0) exit(EXIT_FAILURE); > - /* init tpm emulator */ > -- debug("initializing TPM emulator: %d", tpm_startup); > -+#ifdef VTPM_MULTI_VM > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > -+#else > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > -+#endif > - tpm_emulator_init(tpm_startup); > - /* start command processing */ > - while (!stopflag) { > - /* wait for incomming connections */ > - debug("waiting for connections..."); > -- FD_ZERO(&rfds); > -- FD_SET(sock, &rfds); > -- tv.tv_sec = 10; > -- tv.tv_usec = 0; > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(sock) failed: %s", strerror(errno)); > -- break; > -- } else if (res == 0) { > -- continue; > -- } > -- addr_len = sizeof(addr); > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > -- if (fh < 0) { > -- error("accept() failed: %s", strerror(errno)); > -- continue; > -- } > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) > -+ { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > -+ } > -+ > -+ /*Error Checking*/ > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > -+ exit(-1); > -+ } > -+ > - /* receive and handle commands */ > - in_len = 0; > - do { > - debug("waiting for commands..."); > -- FD_ZERO(&rfds); > -- FD_SET(fh, &rfds); > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > -- tv.tv_usec = 0; > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(fh) failed: %s", strerror(errno)); > -- close(fh); > -- break; > -- } else if (res == 0) { > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > -- info("connection closed due to inactivity"); > -- close(fh); > -- break; > --#else > -- continue; > --#endif > -- } > -- in_len = read(fh, in, sizeof(in)); > -- if (in_len > 0) { > -+ > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > -+ /*Magic size of minimum TPM command is 6*/ > -+ //FIXME Magic size check may not be required anymore > -+ if (in_len < 6) { > -+ info("Recv incomplete command of %d bytes.", in_len); > -+ if (in_len <= 0) { > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > -+ continue; > -+ } > -+ } else { > -+ /*Debug Printouts*/ > - debug("received %d bytes", in_len); > -+ debug_nostop("Recv[%d]: 0x", in_len); > -+ for (i=0; i< in_len; i++) > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > -+ /*Multiple Guest check*/ > -+ if (guest_id == -1) { > -+ guest_id = *((int32_t *) in); > -+ } else { > -+ if (guest_id != *((int32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ /*Open tx handle now*/ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ exit(-1); > -+ } > -+ > -+ /*Handle the TPM command now*/ > - out = NULL; > -- res = tpm_handle_command(in, in_len, &out, &out_len); > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > - if (res < 0) { > - error("tpm_handle_command() failed"); > - } else { > - debug("sending %d bytes", out_len); > -+ //FIXME this prepending may or may not be needed > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > -+ out_len += sizeof(uint32_t); > -+ /*End Prepend*/ > -+ > -+ /*Perform write operation now*/ > - while (out_len > 0) { > -- res = write(fh, out, out_len); > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > -+ > - if (res < 0) { > - error("write(%d) failed: %s", out_len, strerror(errno)); > - break; > -- } > -+ } else { > -+ debug_nostop("Sent[%Zu]: ", out_len); > -+ for (i=0; (unsigned int)i< out_len; i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > -+ } > - out_len -= res; > - } > - tpm_free(out); > -+ tpm_free(addressed_out); > - } > - } > - } while (in_len > 0); > -- close(fh); > -+ //close(fh); > - } > -+ > - /* shutdown tpm emulator */ > - tpm_emulator_shutdown(); > -- /* close socket */ > -- close(sock); > -- unlink(opt_socket_name); > -+ /* Close handles */ > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MULTI_VM > -+ close(vtpm_rx_fh); > -+ free(vtpm_rx_file); > -+#endif > - info("main loop stopped"); > - } > - > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > - /* open random device */ > - init_random(); > - /* init signal handlers */ > -- init_signal_handler(); > -+ //init_signal_handler(); > - /* unless requested otherwiese, fork and daemonize process */ > -- if (!opt_foreground) daemonize(); > -+ //if (!opt_foreground) daemonize(); > - /* start main processing loop */ > - main_loop(); > - info("stopping TPM Emulator daemon"); > - closelog(); > - return 0; > - } > -+ > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > -@@ -29,23 +29,28 @@ > - > - /* TPM emulator configuration */ > - > --#undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+#define TPM_STRONG_PERSISTENCE > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > - > -+extern int dmi_id; > -+ > - /* log macros */ > - > - void tpm_log(int priority, const char *fmt, ...); > - > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > - > - /* min/max macros that also do strict type-checking */ > - > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > deleted file mode 100644 > index e896b25..0000000 > --- a/tools/vtpm/vtpm.patch > +++ /dev/null > @@ -1,716 +0,0 @@ > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,3 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > --INTEL Corp <> [Dropped to Ring3] > -+INTEL Corp <> [VTPM Extensions] > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,5 +1,6 @@ > - ????-??-?? Intel Corp > - * Moved module out of kernel to run as a ring 3 app > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > - > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > -@@ -44,18 +44,26 @@ > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > -+/* debug and log output functions */ > -+extern int dmi_id; > -+ > - #ifdef DEBUG > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > - #else > - #define debug(fmt, ...) > -+#define debug_nostop(fmt, ...) > -+#define debug_more(fmt, ...) > - #endif > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > -@@ -7,7 +7,7 @@ > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --BIN := tpm_emulator > -+BIN := vtpmd > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > - > - CC := gcc > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > --CFLAGS += -I. -Itpm > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > - > - # Is the simulator running in it's own vm? > - #CFLAGS += -DVTPM_MULTI_VM > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > - > - install: $(BIN) > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > -@@ -98,3 +97,4 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -+ > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > - return TPM_FAIL; > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > - sha1_ctx_t sha1; > - UINT32 res = CPU_TO_BE32(rsp->result); > - UINT32 ord = CPU_TO_BE32(ordinal); > -+ UINT32 offset = 0; > - > - /* compute SHA1 hash */ > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*)&res, 4); > - sha1_update(&sha1, (BYTE*)&ord, 4); > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > -+ if (ordinal == TPM_ORD_LoadKey2) { > -+ offset = 4; > -+ } > -+ if (rsp->paramSize - offset > 0) { > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > -+ } > - sha1_final(&sha1, rsp->auth1->digest); > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -15,10 +16,15 @@ > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > - */ > - > -+#include > -+#include > -+#include > -+#include > -+ > - #include "tpm_emulator.h" > - #include "tpm_structures.h" > - #include "tpm_marshalling.h" > --#include "linux_module.h" > -+#include "vtpm_manager.h" > - > - TPM_DATA tpmData; > - > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > - #include > - #include > - #include > --#include > - > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifdef VTPM_MUTLI_VM > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ extern int dmi_id; > -+ static char *vtpm_rx_name=NULL; > -+#endif > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > -- int res; > -- int fp; > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- res = write(fp, data, data_length); > -- close(fp); > -- return (res == data_length) ? 0 : -1; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > -- int res; > -- int fp, file_status; > -- struct stat file_info; > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- file_status = fstat(fp, &file_info); > -- if (file_status < 0) { > -- close(fp); > -- return -1; > -- } > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > - > -- *data_length = file_info.st_size; > -- *data = tpm_malloc(*data_length); > -- if (*data == NULL) { > -- close(fp); > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > - return -1; > - } > -- res = read(fp, *data, *data_length); > -- close(fp); > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > - if (res != *data_length) { > -- tpm_free(*data); > -- return -1; > -+ free(*data); > -+ return -1; > -+ } else { > -+ return 0; > - } > -- return 0; > -+ > - } > - > - #else > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > -@@ -21,12 +21,24 @@ > - #include > - #include > - #include > -+#include > -+#include > -+#include > - > - #include "tpm_emulator.h" > -+#include "vtpm_manager.h" > - > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > - > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+#endif > -+ > -+ int dmi_id; > -+ > - #define BUFFER_SIZE 2048 > - > - static int devurandom=0; > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > - } > - > - if (read(devurandom, buf, nbytes) != nbytes) { > -- printf("Can't get random number.\n"); > -+ error("Can't get random number.\n"); > - exit(-1); > - } > - } > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > - > - int main(int argc, char **argv) > - { > -- uint8_t in[BUFFER_SIZE], *out; > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > -+ char *vtpm_rx_file=NULL; > - uint32_t out_size; > - int in_size, written; > -- int i; > -- struct stat file_info; > -+ int i, guest_id=-1; > - > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > -+ struct sockaddr_un addr; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+ > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+#ifdef VTPM_MULTI_VM > - if (argc < 2) { > -- printf("Usage: tpmd clear|save|deactivated\n" ); > -+ error("Usage: tpmd clear|save|deactivated\n" ); > -+#else > -+ if (argc < 4) { > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > -+#endif > - return -1; > - } > - > -+#ifndef VTPM_MULTI_VM > -+ /* setup type of vm */ > -+ if (!strcmp(argv[2], "pvm")) { > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[2], "hvm")) { > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("invalid vTPM type '%s'.\n", argv[2]); > -+ } > -+ > -+ dmi_id = atoi(argv[3]); > -+ > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > -+ > -+#ifdef VTPM_MULTI_VM > -+ info("Initializing tpm state: %s\n", argv[1]); > -+#else > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > -+#endif > -+ > - /* initialize TPM emulator */ > - if (!strcmp(argv[1], "clear")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(1); > -- } else if (!strcmp(argv[1], "save")) { > -- printf("Initializing tpm: %s\n", argv[1]); > -+ } else if (!strcmp(argv[1], "save")) { > - tpm_emulator_init(2); > - } else if (!strcmp(argv[1], "deactivated")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(3); > - } else { > -- printf("invalid startup mode '%s'; must be 'clear', " > -+ error("invalid startup mode '%s'; must be 'clear', " > - "'save' (default) or 'deactivated", argv[1]); > - return -1; > - } > -- > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -- return -1; > -- } > -- } > -- > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -- return -1; > -- } > -- } > -- > -+ > - while (1) { > - abort_command: > -- if (tpm_rx_fh < 0) { > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > - } > - > -- if (tpm_rx_fh < 0) { > -- printf("ERROR: failed to open devices to listen to guest.\n"); > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > - return -1; > - } > - > -- if (tpm_tx_fh < 0) { > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -- } > -- > -- if (tpm_tx_fh < 0) { > -- printf("ERROR: failed to open devices to respond to guest.\n"); > -- return -1; > -- } > -- > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > - if (in_size < 6) { // Magic size of minium TPM command > -- printf("Recv[%d] to small: 0x", in_size); > -+ info("Recv incomplete command of %d bytes.", in_size); > - if (in_size <= 0) { > -- close(tpm_rx_fh); > -- tpm_rx_fh = -1; > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > - goto abort_command; > - } > - } else { > -- printf("Recv[%d]: 0x", in_size); > -+ debug_nostop("Recv[%d]: 0x", in_size); > - for (i=0; i< in_size; i++) > -- printf("%x ", in[i]); > -- printf("\n"); > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > - } > - > -- > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -- printf("ERROR: Handler Failed.\n"); > -+ if (guest_id == -1) { > -+ guest_id = *((uint32_t *) in); > -+ } else { > -+ if (guest_id != *((uint32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ // Handle the command, but skip the domain id header > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > -+ error("Handler Failed.\n"); > - } > - > -- written = write(tpm_tx_fh, out, out_size); > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > -+ > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > - > -- if (written != out_size ) { > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ if (written != out_size + sizeof(uint32_t)) { > -+ error("Part of response not written %d/%d.\n", written, out_size); > - } else { > -- printf("Sent[%Zu]: ", out_size); > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > - } > -- for (i=0; i< out_size; i++) > -- printf("%x ", out[i]); > -- printf("\n"); > - tpm_free(out); > -+ tpm_free(addressed_out); > - > - } // loop > - > - tpm_emulator_shutdown(); > - > -- close(tpm_tx_fh); > -- close(tpm_rx_fh); > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh); > -+ free (vtpm_rx_file); > -+#endif > - > - } > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > deleted file mode 100644 > index c4b86b7..0000000 > --- a/tools/vtpm_manager/COPYING > +++ /dev/null > @@ -1,32 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > deleted file mode 100644 > index 632f41b..0000000 > --- a/tools/vtpm_manager/Makefile > +++ /dev/null > @@ -1,18 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -SUBDIRS = crypto tcs util manager migration > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > - > -.PHONY: all clean install > -all clean install: %: subdirs-% > - > -.PHONY: mrproper > -mrproper: > - @set -e; for subdir in $(SUBDIRS); do \ > - $(MAKE) -C $$subdir $@; \ > - done > - > - > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > deleted file mode 100644 > index f0d1e98..0000000 > --- a/tools/vtpm_manager/README > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -Directory Structure > -=================== > -tools/vtpm_manager/crypto -> crypto files > -tools/vtpm_manager/TCS -> TCS implementation > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > -tools/vtpm_manager/manager -> VTPM Manager > - > -Compile Flags > -=================== > -LOGGING_MODULES -> How extensive logging happens > - see util/log.h for more info > - > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -# Debugging flags that may disappear without notice in the future > - > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > - /tmp/out.fifo rather than backend > - > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > - > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > - use a well known value. This is useful for debugging and for > - poor bios which do not support clearing TPM if OwnerAuth is > - lost. However this has no protection from malicious app > - issuing a TPM_OwnerClear to wipe the TPM > - > -Requirements > -============ > -- xen-unstable > -- vtpm frontend/backend driver patch > -- OpenSSL Library > - > -Single-VM Flow > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -NOTES: > -* SaveService SHOULD seal it's table before saving it to disk. However, > - the current Xen infrastructure does not provide a mechanism for this to be > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > - to the service, or it's not even worth encrypting > - > - In the future the vtpm manager will be protected by an early boot mechanism > - that will allow for better protection of it's data. > - > -TODO: > -- Timeout on crashed vtpms > -- create lock for shared fifo for talking to vtpms. > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > deleted file mode 100644 > index 651772b..0000000 > --- a/tools/vtpm_manager/Rules.mk > +++ /dev/null > @@ -1,59 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(FILES) > - > -# Make sure these are just rules > -.PHONY : all build install clean > - > -# > -# Project-specific definitions > -# > - > -# Need UNIX98 spec for pthread rwlocks > -CFLAGS += -D_GNU_SOURCE > - > -# Logging Level. See utils/tools.h for usage > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > - > -# Silent Mode > -#CFLAGS += -DLOGGING_MODULES=0x0 > -#CFLAGS += -DLOGGING_MODULES=0xff > - > -# Use frontend/backend pairs between manager & DMs? > -#CFLAGS += -DVTPM_MULTI_VM > - > -# vtpm_manager listens on fifo's rather than backend > -#CFLAGS += -DDUMMY_BACKEND > - > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > -#CFLAGS += -DDUMMY_TPM > - > -# Do not have manager launch DMs. > -#CFLAGS += -DMANUAL_DM_LAUNCH > - > -# Fixed OwnerAuth > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > - > -# Include > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > deleted file mode 100644 > index 13b61c9..0000000 > --- a/tools/vtpm_manager/crypto/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libtcpaCrypto.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > deleted file mode 100644 > index 7dae655..0000000 > --- a/tools/vtpm_manager/crypto/crypto.c > +++ /dev/null > @@ -1,88 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.c > -// > -// This file will handle all the TPM Crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include "crypto.h" > -#include "log.h" > - > -/** > - * Initialize cryptography library > - * @rand: random seed > - * @size: size of @rand > - */ > -void Crypto_Init(const BYTE* rand, int size) { > - ERR_load_crypto_strings(); > - CRYPTO_malloc_init(); > - OpenSSL_add_all_algorithms(); > - SYM_CIPHER = EVP_aes_128_cbc(); > - RAND_poll(); > - if (rand == NULL) > - return; > - > - RAND_add(rand, size, size); > -} > - > -/** > - * Shutdown cryptography library > - */ > -void Crypto_Exit() { > - ERR_free_strings(); > - ERR_remove_state(0); > - EVP_cleanup(); > -} > - > - > -/** > - * Get random data > - * @data: (OUT) Random data > - * @size: Size of @data > - */ > -void Crypto_GetRandom(void* data, int size) { > - int result; > - > - result = RAND_pseudo_bytes((BYTE*) data, size); > - > - if (result <= 0) > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > - ERR_error_string (ERR_get_error(), NULL)); > -} > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > deleted file mode 100644 > index 488d4d6..0000000 > --- a/tools/vtpm_manager/crypto/crypto.h > +++ /dev/null > @@ -1,175 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.h > -// > -// This file defines the TPM Crypto API > -// > -// ================================================================== > - > -#ifndef __CRYPTO_H__ > -#define __CRYPTO_H__ > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > - > -#define OAEP_P "TCPA" > -#define OAEP_P_SIZE 4 > - > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > -#define CRYPTO_ALGORITH_RSA 0x01 > - > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > -#define CRYPTO_ES_NONE 0x0001 > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// Supported Signature schemes CRYPTO_INFO.sigScheme > -#define CRYPTO_SS_NONE 0x0001 > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > - > -typedef struct CRYPTO_INFO { > - void *keyInfo; > - UINT32 algorithmID; > - UINT32 encScheme; > - UINT32 sigScheme; > -} CRYPTO_INFO; > - > - > -void Crypto_Init(const BYTE* rand, int size); > - > -void Crypto_Exit(); > - > -void Crypto_GetRandom(void* data, int size); > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest); > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest); /* presumably of 20 bytes */ > - > -void Crypto_SHA1Full( const BYTE* text, > - UINT32 size, > - BYTE* hash); //Complete 3part SHA1 > - > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_hash); > - > -void Crypto_SHA1Start(UINT32* maxNumBytes); > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > -void Crypto_SHA1Complete( int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue); > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys); > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo); > - > -// > -// symmetric pack and unpack operations > -// > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen); > - > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread); > - > - > -// return 0 on success, -1 on error > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSADec( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSASign( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig); > - > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig); > - > -//private: > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > - > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > - > -#endif // __CRYPTO_H__ > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > deleted file mode 100644 > index c73114a..0000000 > --- a/tools/vtpm_manager/crypto/hash.c > +++ /dev/null > @@ -1,153 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// hash.c > -// > -// This file will handle all the TPM Hash functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" // for TPM_SUCCESS > -#include "crypto.h" > - > -static SHA_CTX g_shaContext; > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest) { > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > - return; > - > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > -} > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest) { /* presumably of 20 bytes */ > - > - Crypto_HMAC (text->bytes, text->size, > - key->bytes, key->size, > - o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * SHA1 > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > - */ > -void Crypto_SHA1Full( const BYTE* text, > - uint32_t size, > - BYTE* hash) { > - > - if (text == NULL || size == 0) > - return; > - > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > - uint32_t maxBytes; // Not used for anything > - Crypto_SHA1Start(&maxBytes); > - > - while (size > 64){ > - Crypto_SHA1Update(64, text); > - size -= 64; > - text += 64; > - } > - > - Crypto_SHA1Complete(size, text, hash); > -} > - > -// same thing using buffer_t > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_digest) { > - > - if (buf->bytes == NULL || buf->size == 0) > - return TPM_BAD_PARAMETER; > - > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * Initialize SHA1 > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > - * Must be a multiple of 64 bytes. > - */ > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > - int max = SHA_CBLOCK; > - // Initialize the crypto library > - SHA1_Init(&g_shaContext); > - *maxNumBytes = max; > -} > - > -/* > - * Process SHA1 > - * @numBytes: (IN) The number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Bytes to be hashed. > - */ > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > - > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > - return; > - > - SHA1_Update(&g_shaContext, hashData, numBytes); > -} > - > -/* > - * Complete the SHA1 process > - * @hashDataSize: (IN) Number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Final bytes to be hashed. > - * @hashValue: (OUT) The output of the SHA-1 hash. > - */ > -void Crypto_SHA1Complete(int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue) { > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > - SHA1_Final(hashValue, &g_shaContext); > -} > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > deleted file mode 100644 > index 7737dc6..0000000 > --- a/tools/vtpm_manager/crypto/rsa.c > +++ /dev/null > @@ -1,434 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// rsa.c > -// > -// This file will handle all the TPM RSA crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "log.h" > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys) { > - unsigned long e_value; > - > - if (pubExpSize == 0) // Default e = 2^16+1 > - e_value = (0x01 << 16) + 1; > - else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - e_value = (0x01 << 16) + 1; > - } > - > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > - > - if (keys) { > - keys->keyInfo = rsa; > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > - } > - > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - > -} > - > -int Crypto_RSAEnc( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - return -1; > - > - *outDataSize = 0; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > - rc = -1; > - goto abort_egress; > - } > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > - rc = -1; > - goto abort_egress; > - } > - break; > - default: > - rc = -1; > - goto abort_egress; > - } > - > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > - if (rc == -1) > - goto abort_egress; > - > - *outDataSize = rc; > - > - if (rc > 0) rc = 0; > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (paddedData) > - free (paddedData); > - return rc; > - > -} > - > -int Crypto_RSADec( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - goto abort_egress; > - > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - > - paddedDataSize = rc; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa)); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa), > - (BYTE *) OAEP_P, OAEP_P_SIZE); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - default: > - *outDataSize = 0; > - } > - > - free(paddedData); paddedData = NULL; > - goto egress; > - > - abort_egress: > - > - if (paddedData) > - free (paddedData); > - return -1; > - > - egress: > - return 0; > -} > - > -// Signs either a SHA1 digest of a message or a DER encoding of a message > -// Textual messages MUST be encoded or Hashed before sending into this function > -// It will NOT SHA the message. > -int Crypto_RSASign( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig) { > - int status; > - unsigned int intSigSize; > - > - switch(key->sigScheme) { > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status == 0) { > - *sigSize = 0; > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > - return -1; > - } > - > - *sigSize = (UINT32) intSigSize; > - return 0; > -} > - > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig) { > - int status; > - > - switch(key->sigScheme){ > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status) > - return(1); > - else { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - return(0); > - } > - > -} > - > -// helper which packs everything into a BIO! > - > -// packs the parameters first, then the private key, then the public key > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > -// *io_buflen > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen) { > - TPM_RESULT status = TPM_SUCCESS; > - BYTE * buf; > - long len, outlen = *io_buflen; > - > - const long PARAMSLEN = 3*sizeof(UINT32); > - > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - BIO *mem = BIO_new(BIO_s_mem()); > - > - > - // write the openssl keys to the BIO > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - > - // get the buffer out > - len = BIO_get_mem_data (mem, &buf); > - > - // see if we need to allocate a return buffer > - if (*io_buf == NULL) { > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > - if (*io_buf == NULL) > - ERRORDIE (TPM_SIZE); > - } else { // *io_buf is already allocated > - if (outlen < len + PARAMSLEN) > - ERRORDIE (TPM_SIZE); // but not large enough! > - } > - > - // copy over the parameters (three UINT32's starting at algorithmID) > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > - > - // copy over the DER keys > - memcpy (*io_buf + PARAMSLEN, buf, len); > - > - *io_buflen = len + PARAMSLEN; > - > - goto egress; > - > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > - > - > - > -// sets up ci, and returns the number of bytes read in o_lenread > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread) { > - > - TPM_RESULT status = TPM_SUCCESS; > - long l; > - BIO *mem; > - RSA *rsa; > - > - // first load up the params > - l = 3 * sizeof(UINT32); > - memcpy (&ci->algorithmID, in, l); > - len -= l; > - in += l; > - > - // and now the openssl keys, private first > - mem = BIO_new_mem_buf (in, len); > - > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - // now use the same RSA object and fill in the private key > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - > - ci->keyInfo = rsa; // needs to be freed somehow later > - > - // FIXME: havent figured out yet how to tell how many bytes were read in the > - // above oprations! so o_lenread is not set > - > - goto egress; > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > deleted file mode 100644 > index 3d86e19..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.c > +++ /dev/null > @@ -1,237 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.c > -// > -// Symmetric crypto portion of crypto > -// > -// ================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -typedef enum crypt_op_type_t { > - CRYPT_ENCRYPT, > - CRYPT_DECRYPT > -} crypt_op_type_t; > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype); > - > - > -// this is initialized in Crypto_Init() > -const EVP_CIPHER * SYM_CIPHER = NULL; > - > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > - > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > - TPM_RESULT status = TPM_SUCCESS; > - > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > - int res; > - TPM_RESULT status = TPM_SUCCESS; > - > - // hmm, EVP_CIPHER_CTX_init does not return a value > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > - > - // and generate the key material > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > - if (res < 0) > - ERRORDIE (TPM_SHORTRANDOM); > - > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - buffer_free (&key->key); > - > - egress: > - return status; > -} > - > - > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > - > - buffer_init (o_cipher, > - clear->size + > - EVP_CIPHER_iv_length(key->cipher) + > - EVP_CIPHER_block_size (key->cipher), > - 0); > - > - // copy the IV into the front > - buffer_copy (o_cipher, &iv); > - > - // make an alias into which we'll put the ciphertext > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > - > - // set the output size correctly > - o_cipher->size += cipher_alias.size; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > - > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - // alias for the IV > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > - > - // make an alias to where the ciphertext is, after the IV > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - // prepare the output buffer > - TPMTRYRETURN( buffer_init (o_clear, > - cipher->size > - - EVP_CIPHER_iv_length(key->cipher) > - + EVP_CIPHER_block_size(key->cipher), > - 0) ); > - > - // and decrypt > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > - > - goto egress; > - > - abort_egress: > - buffer_free (o_clear); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > - buffer_memset (&key->key, 0); > - buffer_free (&key->key); > - > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - return TPM_SUCCESS; > -} > - > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype) { > - TPM_RESULT status = TPM_SUCCESS; > - > - int inlen, outlen; > - tpm_size_t running; > - > - if ( ! EVP_CipherInit_ex (&key->context, > - key->cipher, NULL, key->key.bytes, iv->bytes, > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > - ERRORDIE (TPM_FAIL); > - > - > - > - inlen = in->size; > - > - outlen = 0; > - running = 0; > - > - > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - out->size = running; > - > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > deleted file mode 100644 > index 7fb59a8..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.h > +++ /dev/null > @@ -1,72 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.h > -// > -// Symmetric Crypto > -// > -// ================================================================== > - > -#ifndef _SYM_CRYPTO_H > -#define _SYM_CRYPTO_H > - > -#include > -#include "buffer.h" > - > -typedef struct symkey_t { > - buffer_t key; > - > - EVP_CIPHER_CTX context; > - const EVP_CIPHER * cipher; > -} symkey_t; > - > -extern const EVP_CIPHER * SYM_CIPHER; > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > - > - > -// these functions will allocate their output buffers > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher); > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear); > - > -// only free the internal parts, not the 'key' ptr > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > - > -#endif /* _SYM_CRYPTO_H */ > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > deleted file mode 100644 > index a33c18a..0000000 > --- a/tools/vtpm_manager/manager/Makefile > +++ /dev/null > @@ -1,38 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = vtpm_managerd > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > - fi > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > - fi > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BIN) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > -CFLAGS += $(PTHREAD_CFLAGS) > -LDFLAGS += $(PTHREAD_LDFLAGS) > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > deleted file mode 100644 > index 5c3cf7e..0000000 > --- a/tools/vtpm_manager/manager/dmictl.c > +++ /dev/null > @@ -1,266 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -// if dmi_res is non-null, then return a pointer to new object. > -// Also, this does not fill in the measurements. They should be filled by > -// design dependent code or saveNVM > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > - > - TPM_RESULT status=TPM_SUCCESS; > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - UINT32 *dmi_id_key=NULL; > - > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > - new_dmi->dmi_id = dmi_id; > - new_dmi->dmi_type = dmi_type; > - new_dmi->connected = FALSE; > - new_dmi->TCSContext = 0; > - > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > - > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - *dmi_id_key = new_dmi->dmi_id; > - > - // install into map > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - if (dmi_res) > - *dmi_res = new_dmi; > - > - goto egress; > - > - abort_egress: > - if (new_dmi) { > - free(new_dmi->NVMLocation); > - free(new_dmi); > - } > - free(dmi_id_key); > - > - egress: > - return status; > -} > - > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > - if (dmi_res == NULL) > - return TPM_SUCCESS; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) > - return(TPM_BAD_PARAMETER); > - > - TCS_CloseContext(dmi_res->TCSContext); > - dmi_res->connected = FALSE; > - > - vtpm_globals->connected_dmis--; > - > - return (VTPM_Close_DMI_Extra(dmi_res) ); > -} > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > - > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - TPM_RESULT status=TPM_FAIL; > - BYTE dmi_type, vm_type, startup_mode; > - UINT32 dmi_id; > - > - if (param_buf == NULL) { // Assume creation of Dom 0 control > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > - dmi_id = VTPM_CTL_DM; > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } else { > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > - BSG_UnpackList( param_buf->bytes, 4, > - BSG_TYPE_BYTE, &dmi_type, > - BSG_TYPE_BYTE, &startup_mode, > - BSG_TYPE_BYTE, &vm_type, > - BSG_TYPE_UINT32, &dmi_id); > - } > - > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (new_dmi == NULL) { > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > - // Brand New DMI. Initialize the persistent pieces > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > - } else > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > - > - if (new_dmi->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Initialize the Non-persistent pieces > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > - > - new_dmi->connected = TRUE; > - > - // Design specific new DMI code. > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > - close_dmi(new_dmi ); > - > - egress: > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (!dmi_res->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Close Dmi > - TPMTRYRETURN(close_dmi( dmi_res )); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - //vtpm scripts delete file dmi_res->NVMLocation for us > - > - // Close DMI first > - TPMTRYRETURN(close_dmi( dmi_res )); > - free ( dmi_res ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > deleted file mode 100644 > index 54da708..0000000 > --- a/tools/vtpm_manager/manager/migration.c > +++ /dev/null > @@ -1,307 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > - UINT32 dmi_id; > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t enc_dmi_state_pack; > - > - BSG_UnpackList(param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** UnBind Blob **/ > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > - enc_dmi_state_pack.size, > - enc_dmi_state_pack.data) ); > - > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > - vtpm_globals->manager_tcs_handle, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - &clear_dmi_blob) ); > - > - // Create new dmi > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > - > - /** Open Blob **/ > - struct pack_buf_t dmi_state_pack; > - > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > - dmi_state_pack.size, > - dmi_state_pack.data) ); > - > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > - > - egress: > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state_abuf); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi; > - UINT32 dmi_id; > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t name_pack; > - > - BSG_UnpackList( param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &name_pack); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Find migration key for dest **/ > - last_mig = NULL; > - mig_key = vtpm_globals->mig_keys; > - while (mig_key != NULL) { > - if (mig_key->name_size == name_pack.size) > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > - break; > - } > - > - last_mig = mig_key; > - mig_key = mig_key->next; > - } > - > - if (!mig_key) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Mark vtpm as migrated **/ > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > - > - /** Build Blob **/ > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > - > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > - > - struct pack_constbuf_t dmi_state_pack; > - > - dmi_state_pack.size = buffer_len(&dmi_state); > - dmi_state_pack.data = dmi_state.bytes; > - > - BSG_PackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - /** Bind Blob **/ > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > - &mig_key->key, > - result_buf) ); > - > - if (last_mig) > - last_mig->next = mig_key->next; > - else > - vtpm_globals->mig_keys = mig_key->next; > - > - free(mig_key->name); > - free(mig_key); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > - > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > - > - egress: > - > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > - > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > - TPM_KEY mig_key; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - mig_key.algorithmParms.parms, > - &rsaKeyParms); > - > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > - pubkey_exp_pack.data = rsaKeyParms.exponent; > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > - pubkey_mod_pack.data = mig_key.pubKey.key; > - > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > - pubkey_exp_pack.size + > - pubkey_mod_pack.size, NULL ) ); > - > - BSG_PackList( result_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_MIGKEY_LIST *mig_key; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > - > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > - > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > - > - //FIXME: scan list and verify name is not already in the list > - > - BSG_UnpackList( param_buf->bytes, 3, > - BSG_TPM_SIZE32_DATA, &name_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - //TODO: Maintain a persistent list for pub_keys. > - //TODO: Verify pub_key is trusted > - > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > - mig_key->name_size = name_pack.size; > - mig_key->name = name_pack.data; > - > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > - pubkey_exp_pack.data, > - pubkey_mod_pack.size, > - pubkey_mod_pack.data, > - &mig_key->key); > - > - > - mig_key->next = vtpm_globals->mig_keys; > - vtpm_globals->mig_keys = mig_key; > - > - // free(name_pack.data); Do not free. data is now part of mig_key. > - free(pubkey_exp_pack.data); > - free(pubkey_mod_pack.data); > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > deleted file mode 100644 > index d5e6ffd..0000000 > --- a/tools/vtpm_manager/manager/securestorage.c > +++ /dev/null > @@ -1,512 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// securestorage.c > -// > -// Functions regarding securely storing DMI secrets. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "crypto.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "buffer.h" > -#include "log.h" > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data) { > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_cipher = NULL_BUF; > - > - UINT32 i; > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > - for (i=0; i< buffer_len(inbuf); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - // Generate a sym key and encrypt state with it > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > - > - // Encrypt symmetric key > - TPMTRYRETURN( VTSP_Bind( asymkey, > - &symkey.key, > - &symkey_cipher) ); > - > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > - > - symkey_cipher32.size = buffer_len(&symkey_cipher); > - symkey_cipher32.data = symkey_cipher.bytes; > - > - data_cipher32.size = buffer_len(&data_cipher); > - data_cipher32.data = data_cipher.bytes; > - > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > - > - BSG_PackList(sealed_data->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > - for (i=0; i< buffer_len(sealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > - > - egress: > - > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data) { > - > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_clear = NULL_BUF, > - symkey_cipher = NULL_BUF; > - struct pack_buf_t symkey_cipher32, data_cipher32; > - int i; > - > - memset(&symkey, 0, sizeof(symkey_t)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > - for (i=0; i< buffer_len(cipher); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - BSG_UnpackList(cipher->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > - symkey_cipher32.size, > - symkey_cipher32.data) ); > - > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > - data_cipher32.size, > - data_cipher32.data) ); > - > - // Decrypt Symmetric Key > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > - keyHandle, > - &symkey_cipher, > - key_usage_auth, > - &symkey_clear, > - &(vtpm_globals->keyAuth) ) ); > - > - // create symmetric key using saved bits > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > - > - // Decrypt State > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > - for (i=0; i< buffer_len(unsealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > - > - egress: > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_clear); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - long bytes_written; > - buffer_t sealed_NVM = NULL_BUF; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > - > - TPMTRYRETURN( envelope_encrypt(inbuf, > - &vtpm_globals->storageKey, > - &sealed_NVM) ); > - > - // Write sealed blob off disk from NVMLocation > - // TODO: How to properly return from these. Do we care if we return failure > - // after writing the file? We can't get the old one back. > - // TODO: Backup old file and try and recover that way. > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > - > - egress: > - buffer_free(&sealed_NVM); > - return status; > -} > - > - > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t sealed_NVM = NULL_BUF; > - long fh_size; > - int fh, stat_ret, i; > - struct stat file_stat; > - TPM_DIGEST sealedNVMHash; > - > - if (myDMI->NVMLocation == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - //Read sealed blob off disk from NVMLocation > - fh = open(myDMI->NVMLocation, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > - > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > - > - // Verify measurement of sealed blob. > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > - myDMI->TCSContext, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - outbuf) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > - > - egress: > - buffer_free( &sealed_NVM ); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_SaveManagerData(void) { > - TPM_RESULT status=TPM_SUCCESS; > - int fh, dmis=-1; > - > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > - > - struct hashtable_itr *dmi_itr; > - VTPM_DMI_RESOURCE *dmi_res; > - > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > - > - // Initially fill these with buffer sizes for each data type. Later fill > - // in actual size, once flattened. > - boot_key_size = sizeof(UINT32) + // bootkeysize > - bootKeySize; // boot key > - > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > - 3*sizeof(TPM_DIGEST) + // Auths > - sizeof(UINT32) +// storagekeysize > - storageKeySize, NULL) ); // storage key > - > - > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > - > - boot_key_size = BSG_PackList(flat_boot_key, 1, > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > - > - BSG_PackList(clear_flat_global.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > - &vtpm_globals->bootKey, > - &enc_flat_global) ); > - > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > - > - // Per DMI values to be saved (if any exit) > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > - > - flat_dmis = (BYTE *) malloc( > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > - > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - dmis++; > - > - // No need to save dmi0. > - if (dmi_res->dmi_id == 0) > - continue; > - > - > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - > - } while (hashtable_iterator_advance(dmi_itr)); > - } > - > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > - if (fh == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - goto egress; > - > - abort_egress: > - egress: > - > - free(flat_boot_key); > - free(flat_enc); > - buffer_free(&enc_flat_global); > - free(flat_dmis); > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > - return status; > -} > - > -TPM_RESULT VTPM_LoadManagerData(void) { > - > - TPM_RESULT status=TPM_SUCCESS; > - int fh, stat_ret, dmis=0; > - long fh_size = 0, step_size; > - BYTE *flat_table=NULL; > - buffer_t unsealed_data, enc_table_abuf; > - struct pack_buf_t storage_key_pack, boot_key_pack; > - UINT32 *dmi_id_key, enc_size; > - BYTE vtpm_manager_gen; > - > - VTPM_DMI_RESOURCE *dmi_res; > - UINT32 dmi_id; > - BYTE dmi_type; > - struct stat file_stat; > - > - TPM_HANDLE boot_key_handle; > - TPM_AUTHDATA boot_usage_auth; > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > - > - fh = open(STATE_FILE, O_RDONLY ); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - flat_table = (BYTE *) malloc(fh_size); > - > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Read Boot Key > - step_size = BSG_UnpackList( flat_table, 2, > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > - BSG_TYPE_UINT32, &enc_size); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > - > - //Load Boot Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - &SRK_AUTH, > - &boot_key_handle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->bootKey, > - FALSE) ); > - > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > - vtpm_globals->manager_tcs_handle, > - boot_key_handle, > - (const TPM_AUTHDATA*) &boot_usage_auth, > - &unsealed_data) ); > - step_size += enc_size; > - > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > - // Once there is more than one gen, this will include some compatability stuff > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > - } > - > - // Global Values needing to be saved > - BSG_UnpackList( unsealed_data.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > - > - // Per DMI values to be saved > - while ( step_size < fh_size ){ > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > - step_size = fh_size; > - } else { > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TYPE_BYTE, &dmi_type); > - > - //TODO: Try and gracefully recover from problems. > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > - dmis++; > - > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - } > - > - } > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > - egress: > - > - free(flat_table); > - close(fh); > - > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > deleted file mode 100644 > index 9b1e5f8..0000000 > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > +++ /dev/null > @@ -1,110 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmpassthrough.c > -// > -// Functions regarding passing DMI requests to HWTPM > -// > -// ================================================================== > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "log.h" > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE *ord; > - > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > - > - switch (*ord) { > - > - // Forbidden for DMI use > - case TPM_ORD_TakeOwnership: > - case TPM_ORD_ChangeAuthOwner: > - case TPM_ORD_DirWriteAuth: > - case TPM_ORD_DirRead: > - case TPM_ORD_AuthorizeMigrationKey: > - case TPM_ORD_CreateMaintenanceArchive: > - case TPM_ORD_LoadMaintenanceArchive: > - case TPM_ORD_KillMaintenanceFeature: > - case TPM_ORD_LoadManuMaintPub: > - case TPM_ORD_ReadManuMaintPub: > - case TPM_ORD_SelfTestFull: > - case TPM_ORD_SelfTestStartup: > - case TPM_ORD_CertifySelfTest: > - case TPM_ORD_ContinueSelfTest: > - case TPM_ORD_GetTestResult: > - case TPM_ORD_Reset: > - case TPM_ORD_OwnerClear: > - case TPM_ORD_DisableOwnerClear: > - case TPM_ORD_ForceClear: > - case TPM_ORD_DisableForceClear: > - case TPM_ORD_GetCapabilityOwner: > - case TPM_ORD_OwnerSetDisable: > - case TPM_ORD_PhysicalEnable: > - case TPM_ORD_PhysicalDisable: > - case TPM_ORD_SetOwnerInstall: > - case TPM_ORD_PhysicalSetDeactivated: > - case TPM_ORD_SetTempDeactivated: > - case TPM_ORD_CreateEndorsementKeyPair: > - case TPM_ORD_GetAuditEvent: > - case TPM_ORD_GetAuditEventSigned: > - case TPM_ORD_GetOrdinalAuditStatus: > - case TPM_ORD_SetOrdinalAuditStatus: > - case TPM_ORD_SetRedirection: > - case TPM_ORD_FieldUpgrade: > - case TSC_ORD_PhysicalPresence: > - status = TPM_DISABLED_CMD; > - goto abort_egress; > - break; > - > - } // End ORD Switch > - > - // Call TCS with command > - > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > - > - goto egress; > - > - abort_egress: > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > deleted file mode 100644 > index 319dc83..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > +++ /dev/null > @@ -1,141 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.c Implements ipc routines using file io. This file can > -// be replaced with other ipc types. > -// > -// =================================================================== > - > -#include > -#include "vtpm_ipc.h" > -#include "vtpmpriv.h" > -#include "log.h" > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > - ipc_h->name = name; > - ipc_h->flags = flags; > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - if (create) > - return(vtpm_ipc_create(ipc_h)); > - else > - return 0; > -} > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > - int fh; > - struct stat file_info; > - > - if ((!ipc_h) || (!ipc_h->name)) > - return -1; > - > - if ( stat(ipc_h->name, &file_info) == -1) { > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > - return -1; > - } > - } > - > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - return 0; > -} > - > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > - return -1; > - } > - > - result = read(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > - return -1; > - } > - > - result = write(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > - > - if (ipc_h) { > - close(ipc_h->fh); > - ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > deleted file mode 100644 > index 529c4a2..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > +++ /dev/null > @@ -1,71 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > -// and Guests or VTPMs > -// > -// =================================================================== > - > -#ifndef __VTPM_IO_H__ > -#define __VTPM_IO_H__ > - > -#include "tcg.h" > - > -#define VTPM_IPC_CLOSED -1 > - > -// Represents an (somewhat) abstracted io handle. > -typedef struct vtpm_ipc_handle_t { > - int fh; // IO handle. > - int flags; // Flags for opening. This may need to become > - // a void *, but for now files use an int. > - char *name; // Names for debugging as well as filenames > - // for file-based io. > -} vtpm_ipc_handle_t; > - > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > deleted file mode 100644 > index e737d60..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.c > +++ /dev/null > @@ -1,63 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#include > -#include "vtpm_lock.h" > - > -static pthread_rwlock_t vtpm_lock; > - > -void vtpm_lock_init() { > - > - pthread_rwlock_init( &vtpm_lock, NULL); > -} > - > -void vtpm_lock_destroy(){ > - pthread_rwlock_destroy(&vtpm_lock); > -} > - > -void vtpm_lock_rdlock(){ > - pthread_rwlock_rdlock(&vtpm_lock); > -} > - > -void vtpm_lock_wrlock(){ > - pthread_rwlock_wrlock(&vtpm_lock); > -} > - > -void vtpm_lock_unlock(){ > - pthread_rwlock_unlock(&vtpm_lock); > -} > - > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > deleted file mode 100644 > index 53a339d..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.h > +++ /dev/null > @@ -1,48 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#ifndef __VTPM_LOCK_H__ > -#define __VTPM_LOCK_H__ > - > -void vtpm_lock_init(); > -void vtpm_lock_destroy(); > - > -void vtpm_lock_rdlock(); > -void vtpm_lock_wrlock(); > -void vtpm_lock_unlock(); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > deleted file mode 100644 > index e089f78..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.c > +++ /dev/null > @@ -1,285 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -#include "log.h" > -#include "buffer.h" > - > -VTPM_GLOBALS *vtpm_globals=NULL; > - > -// --------------------------- Well Known Auths -------------------------- > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > - > -#ifdef WELL_KNOWN_OWNER_AUTH > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > -#endif > - > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -// --------------------------- Functions ------------------------------ > - > -TPM_RESULT VTPM_Create_Manager(){ > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Auth for Owner > -#ifdef WELL_KNOWN_OWNER_AUTH > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > -#else > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > -#endif > - > - // Take Owership of TPM > - CRYPTO_INFO ek_cryptoInfo; > - > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > - > - // If we can read PubEK then there is no owner and we should take it. > - // We use the abilty to read the pubEK to flag that the TPM is owned. > - // FIXME: Change to just trying to take ownership and react to the status > - if (status == TPM_SUCCESS) { > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &SRK_AUTH, > - &ek_cryptoInfo, > - &vtpm_globals->keyAuth)); > - > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &vtpm_globals->keyAuth)); > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > - } > - > - // Generate storage key's auth > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > - sizeof(TPM_AUTHDATA) ); > - > - TCS_AUTH osap; > - TPM_AUTHDATA sharedsecret; > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->storageKeyWrap, > - &osap) ); > - > - // Generate boot key's auth > - TPM_AUTHDATA bootKeyWrapAuth; > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - // FIXME: This key protects the global secrets on disk. It should use TPM > - // PCR bindings to limit its use to legit configurations. > - // Current binds are open, implying a Trusted VM contains this code. > - // If this VM is not Trusted, use measurement and PCR bindings. > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->bootKeyWrap, > - &osap) ); > - > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - NULL, > - NULL, > - NULL, > - &vtpm_globals->bootKey, > - TRUE ) ); > - > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > - goto egress; > - > - abort_egress: > - exit(1); > - > - egress: > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > - return status; > - > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -TPM_RESULT VTPM_Init_Manager() { > - TPM_RESULT status = TPM_FAIL, serviceStatus; > - BYTE *randomsead; > - UINT32 randomsize=256; > - > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > - > - vtpm_globals->connected_dmis = 0; > - > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - // Create new TCS Object > - vtpm_globals->manager_tcs_handle = 0; > - > - TPMTRYRETURN(TCS_create()); > - > - // Create TCS Context for service > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > - > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > - &randomsize, > - &randomsead)); > - > - Crypto_Init(randomsead, randomsize); > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > - > - // Create OIAP session for service's authorized commands > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > - &vtpm_globals->keyAuth) ); > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > - > - vtpm_globals->mig_keys = NULL; > - > - // If fails, create new Manager. > - serviceStatus = VTPM_LoadManagerData(); > - if (serviceStatus == TPM_IOERROR) { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > - TPMTRYRETURN( VTPM_Create_Manager() ); > - TPMTRYRETURN( VTPM_SaveManagerData() ); > - } else if (serviceStatus != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > - exit(1); > - } > - > - //Load Storage Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->storageKeyWrap, > - &SRK_AUTH, > - &vtpm_globals->storageKeyHandle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->storageKey, > - FALSE ) ); > - > - // Create entry for Dom0 for control messages > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - return(status); > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -void VTPM_Stop_Manager() { > - VTPM_DMI_RESOURCE *dmi_res; > - struct hashtable_itr *dmi_itr; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - if (dmi_res->connected) > - close_dmi( dmi_res ); // Not really interested in return code > - > - } while (hashtable_iterator_advance(dmi_itr)); > - free (dmi_itr); > - } > - > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > - > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > - TCS_destroy(); > - > - hashtable_destroy(vtpm_globals->dmi_map, 1); > - free(vtpm_globals); > - > - Crypto_Exit(); > - > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > -} > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > deleted file mode 100644 > index a324a8f..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.h > +++ /dev/null > @@ -1,150 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.h > -// > -// Public Interface header for VTPM Manager > -// > -// ================================================================== > - > -#ifndef __VTPM_MANAGER_H__ > -#define __VTPM_MANAGER_H__ > - > -#define VTPM_TAG_REQ 0x01c1 > -#define VTPM_TAG_RSP 0x01c4 > -#define COMMAND_BUFFER_SIZE 4096 > - > -// Header sizes. Note Header MAY include the DMI > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > - > -//************************ Command Codes **************************** > -#define VTPM_ORD_BASE 0x0000 > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > - > -// Non-priviledged VTPM Commands (From DMI's) > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > - > -// Priviledged VTPM Commands (From management console) > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > - > -//************************ Return Codes **************************** > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > -#define VTPM_TYPE_HVM 2 // HVM Domain > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > -#define VTPM_UNSUPPORTED 2 > -#define VTPM_FORBIDDEN 3 > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > -#define VTPM_INVALID_REQUEST 5 > - > -//*********************** Parameter Values ************************* > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > -#define VTPM_TYPE_MIGRATABLE 0x01 > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > - // VTPM can be recovered or deleted only > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - dmi: 4 bytes // Source of message. > - // WARNING: This is prepended by the channel. > - // Thus it is received by VTPM Manager, > - // but not sent by DMI > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Open: > - Input Parameters: > - mig_type: 1 byte > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > - domain type: 1 byte > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Close > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Delete > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_SaveNVM > - Input Parameters: > - data: n bytes (Header indicates size of data) > - Output Parameters: > - None > - > -VTPM_LoadNVM > - Input Parameters: > - None > - Output Parameters: > - data: n bytes (Header indicates size of data) > - > -VTPM_TPMCommand > - Input Parameters: > - TPM Command Byte Stream: n bytes > - Output Parameters: > - TPM Reponse Byte Stream: n bytes > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > deleted file mode 100644 > index 2001074..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > +++ /dev/null > @@ -1,488 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_handler.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "log.h" > -#include "buffer.h" > - > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > - > -// ---------------------- Prototypes ------------------- > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name); > - > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name); > - > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Forward TPM cmds? > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *thread_name) { > - TPM_RESULT status = TPM_FAIL; // Should never return > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > - buffer_t *command_buf=NULL, *result_buf=NULL; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - VTPM_DMI_RESOURCE *dmi_res; > - int size_read, size_write, i; > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > - > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - > - // ------------------------ Main Loop -------------------------------- > - while(1) { > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > - > - // --------------------- Read Cmd from Sender ---------------- > - > - // Read command header > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > - goto abort_command; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > - goto abort_command; > - } > - > - // Unpack header > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - // Using the header info, read the parameters of the command > - // Note that in_param_size is in the client's context > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (cmd_size > 0) { > - in_param = (BYTE *) malloc(cmd_size); > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - if (size_read < (int) cmd_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > - goto abort_command; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } > - > - // Init the buffers used to handle the command and the response > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - goto abort_command; > - } > - > - // -------------- Dispatch Commands to Handlers ----------- > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > - vtpm_lock_wrlock(); > - } else { > - vtpm_lock_rdlock(); > - } > - > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > - (!dmi_res->connected) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > - status = TPM_BAD_PARAMETER; > - // We have no one to reply to, they don't exist. > - goto abort_command; > - } > - > - if (tag == VTPM_TAG_REQ) { > - > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > - > - } else { // This is not a VTPM Command at all. > - if (fw_tpm) { > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > - > - // This means calling the DMI failed, not that the cmd failed in the DMI > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > - if (status != TPM_SUCCESS) { > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > - // should be forwarded to the caller VM > - add_header = FALSE; > - } else { > - // We are not supposed to forward TPM commands at all. > - int i; > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - } // end else for is VTPM Command > - > - // ------------------- Respond to Sender ------------------ > - > - // Errors while handling responses jump here to reply with error messages > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > - // is added to the code, this ifdef should be removed. > - // Also note this is NOT referring to errors in commands, but rather > - // this is about I/O errors and such. > -#ifndef VTPM_MULTI_VM > - abort_with_error: > -#endif > - > - if (add_header) { > - // Prepend VTPM header with destination DM stamped > - out_param_size = buffer_len(result_buf); > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > - out_message = (BYTE *) malloc (reply_size); > - reply = out_message; > - > - BSG_PackList(out_message, 4, > - BSG_TYPE_UINT32, (BYTE *) &dmi, > - BSG_TPM_TAG, (BYTE *) &tag, > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > - BSG_TPM_RESULT, (BYTE *) &status); > - > - if (buffer_len(result_buf) > 0) > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > - //Note: Send message + dmi_id > - } else { > - reply = result_buf->bytes; > - reply_size = buffer_len(result_buf); > - } > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i < reply_size; i++) > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - free(out_message); out_message=NULL; > - > - if (size_write < (int)reply_size) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > - goto abort_command; > - } > - > - // On certain failures an error message cannot be sent. > - // This marks the beginning of cleanup in preperation for the next command. > - abort_command: > - //free buffers > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - //free(in_param); // This was converted to command_buf. No need to free > - buffer_free(result_buf); > - buffer_free(command_buf); > - > - // If we have a write lock, save the manager table > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > - } > - > - vtpm_lock_unlock(); > - add_header = TRUE; // Reset to the default > - } // End while(1) > - > -} > - > -///////////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - > - switch (ord) { > - case VTPM_ORD_SAVENVM: > - status= VTPM_Handle_Save_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOADNVM: > - status= VTPM_Handle_Load_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_TPMCOMMAND: > - status= VTPM_Handle_TPM_Command(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_GET_MIG_KEY: > - status = VTPM_Handle_Get_Migration_key(command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOAD_MIG_KEY: > - status = VTPM_Handle_Load_Migration_key(command_buf, > - result_buf); > - break; > - > - default: > - // Privileged handlers can do maintanance > - if (is_priv) { > - switch (ord) { > - case VTPM_ORD_OPEN: > - status = VTPM_Handle_New_DMI(command_buf); > - break; > - > - case VTPM_ORD_CLOSE: > - status = VTPM_Handle_Close_DMI(command_buf); > - break; > - > - case VTPM_ORD_DELETE: > - status = VTPM_Handle_Delete_DMI(command_buf); > - break; > - > - case VTPM_ORD_MIGRATE_IN: > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > - break; > - > - case VTPM_ORD_MIGRATE_OUT: > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > - break; > - > - default: > - status = TPM_BAD_ORDINAL; > - } // switch > - } else { // is priv command > - > - status = TPM_BAD_ORDINAL; > - } // inner switch > - } // outer switch > - > - return(status); > -} > - > -///////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - UINT32 dmi_dst; > - TPM_COMMAND_CODE ord; > - TPM_TAG tag_out; > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > - BYTE *dmi_cmd, *in_param; > - int size_read, size_write, i; > - > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > - > - //Forward TPM CMD stamped with dmi_id to DMI for handling > - if (buffer_len(param_buf)) { > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > - > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - free(dmi_cmd); > - } else { > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } > - > - if (size_write != (int) dmi_cmd_size) > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > - > - buffer_free(param_buf); > - > - // Read header for response to TPM command from DMI > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi_dst, > - BSG_TPM_TAG, &tag_out, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &status ); > - > - // If response has parameters, read them. > - // Note that in_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (adj_param_size > 0) { > - in_param = (BYTE *) malloc(adj_param_size); > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > - goto abort_with_error; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > - > - status = TPM_SUCCESS; > - > - abort_with_error: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > deleted file mode 100644 > index cf58ba3..0000000 > --- a/tools/vtpm_manager/manager/vtpmd.c > +++ /dev/null > @@ -1,371 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmd.c > -// > -// Application > -// > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "tcg.h" > -#include "log.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -#define VTPM_BE_FNAME "/dev/vtpm" > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > - > -#define VTPM_TYPE_PVM_STRING "pvm" > -#define VTPM_TYPE_HVM_STRING "hvm" > - > -struct vtpm_thread_params_s { > - vtpm_ipc_handle_t *tx_ipc_h; > - vtpm_ipc_handle_t *rx_ipc_h; > - BOOL fw_tpm; > - vtpm_ipc_handle_t *fw_tx_ipc_h; > - vtpm_ipc_handle_t *fw_rx_ipc_h; > - BOOL is_priv; > - char *thread_name; > -}; > - > -// This is needed to all extra_close_dmi to close this to prevent a > -// broken pipe when no DMIs are left. > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > - > -void *vtpm_manager_thread(void *arg_void) { > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > - > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > - arg->is_priv, arg->thread_name); > - > - return (status); > -} > - > - > -void signal_handler(int reason) { > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > - } else { > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > - pthread_exit(NULL); > - } > - > - VTPM_Stop_Manager(); > - exit(-1); > -} > - > -struct sigaction ctl_c_handler; > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > - struct stat file_info; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - dmi_res->tx_tpm_ipc_h = NULL; > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->tx_vtpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - } else { > - // Create a pair of fifo pipes > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > - status =TPM_RESOURCES; > - goto abort_egress; > - } > - > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > - > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Measure DMI > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > - // Also, this mechanism is specific to 1 VM architecture. > - /* > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - dmi_size = file_stat.st_size; > - else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - dmi_buffer > - */ > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > - > - if (vm_type == VTPM_TYPE_PVM) > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > - else > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > - > - // Launch DMI > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > -#ifdef MANUAL_DM_LAUNCH > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > - dmi_res->dmi_pid = 0; > -#else > - pid_t pid = fork(); > - > - if (pid == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } else if (pid == 0) { > - switch (startup_mode) { > - case TPM_ST_CLEAR: > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_STATE: > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_DEACTIVATED: > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > - break; > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Returning from these at all is an error. > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > - } else { > - dmi_res->dmi_pid = pid; > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > - } > -#endif // MANUAL_DM_LAUNCH > - > - } // If DMI = VTPM_CTL_DM > - status = TPM_SUCCESS; > - > -abort_egress: > - return (status); > -} > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (vtpm_globals->connected_dmis == 0) { > - // No more DMI's connected. Close fifo to prevent a broken pipe. > - // This is hackish. Need to think of another way. > - vtpm_ipc_close(g_rx_tpm_ipc_h); > - } > - > - > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > - > - free(dmi_res->tx_tpm_ipc_h->name); > - free(dmi_res->tx_vtpm_ipc_h->name); > - > -#ifndef MANUAL_DM_LAUNCH > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - if (dmi_res->dmi_pid != 0) { > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > - status = TPM_FAIL; > - } > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > - status = TPM_FAIL; > - } > - } > -#endif > - > - } //endif ! dom0 > - return status; > -} > - > - > -int main(int argc, char **argv) { > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > - pthread_t be_thread, dmi_thread, hp_thread; > - > -#ifdef DUMMY_BACKEND > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > -#else > - vtpm_ipc_handle_t real_be_ipc_h; > -#endif > - > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > - > - // -------------------- Initialize Manager ----------------- > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > - return -1; > - } > - > - // -------------------- Setup Ctrl+C Handlers -------------- > - ctl_c_handler.sa_handler = signal_handler; > - sigemptyset(&ctl_c_handler.sa_mask); > - ctl_c_handler.sa_flags = 0; > - > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > - > - // For easier debuggin with gdb > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > - > - sigset_t sig_mask; > - sigemptyset(&sig_mask); > - sigaddset(&sig_mask, SIGPIPE); > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > - > - // ------------------- Set up file ipc structures ---------- > -#ifdef DUMMY_BACKEND > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > - > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > - exit(-1); > - } > - > - tx_be_ipc_h = &tx_dummy_ipc_h; > - rx_be_ipc_h = &rx_dummy_ipc_h; > -#else > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > - > - tx_be_ipc_h = &real_be_ipc_h; > - rx_be_ipc_h = &real_be_ipc_h; > -#endif > - > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > - exit(-1); > - } > - > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > - > - // -------------------- Set up thread params ------------- > - > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > - be_thread_params.fw_tpm = TRUE; > - be_thread_params.fw_tx_ipc_h = NULL; > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > - be_thread_params.is_priv = FALSE; > - be_thread_params.thread_name = "Backend Listener"; > - > - dmi_thread_params.tx_ipc_h = NULL; > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > - dmi_thread_params.fw_tpm = FALSE; > - dmi_thread_params.fw_tx_ipc_h = NULL; > - dmi_thread_params.fw_rx_ipc_h = NULL; > - dmi_thread_params.is_priv = FALSE; > - dmi_thread_params.thread_name = "VTPM Listener"; > - > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > - hp_thread_params.fw_tpm = FALSE; > - hp_thread_params.fw_tx_ipc_h = NULL; > - hp_thread_params.fw_rx_ipc_h = NULL; > - hp_thread_params.is_priv = TRUE; > - hp_thread_params.thread_name = "Hotplug Listener"; > - > - // --------------------- Launch Threads ----------------- > - > - vtpm_lock_init(); > - > - vtpm_globals->master_pid = pthread_self(); > - > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > - exit(-1); > - } > - > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > - exit(-1); > - } > - > - > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > - exit(-1); > - } > - > - //Join the other threads until exit time. > - pthread_join(be_thread, NULL); > - pthread_join(dmi_thread, NULL); > - pthread_join(hp_thread, NULL); > - > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > - > - VTPM_Stop_Manager(); > - vtpm_lock_destroy(); > - return 0; > -} > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > deleted file mode 100644 > index 41e8d2d..0000000 > --- a/tools/vtpm_manager/manager/vtpmpriv.h > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmpriv.h > -// > -// Structures and functions private to the manager > -// > -// ================================================================== > - > -#ifndef __VTPMPRIV_H__ > -#define __VTPMPRIV_H__ > - > -#include "vtpm_manager.h" > -#include "tcg.h" > -#include "tcs.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "vtpm_ipc.h" > - > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > - // is changed. It's used for backwards compatability > - > -#define STATE_FILE "/var/vtpm/VTPM" > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > -#define VTPM_CTL_DM 0 > - > -// ------------------------ Private Structures ----------------------- > -typedef struct VTPM_DMI_RESOURCE_T { > - // I/O info for Manager to talk to DMI's and controllers > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > - > -#ifndef VTPM_MULTI_VM > - pid_t dmi_pid; > -#endif > - > - // Non-persistent Information > - bool connected; > - UINT32 dmi_domain_id; > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > - char *NVMLocation; // NULL term string indicating location > - // of NVM. > - // Persistent Information about DMI > - UINT32 dmi_id; > - BYTE dmi_type; > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > -} VTPM_DMI_RESOURCE; > - > -typedef struct tdVTPM_MIGKEY_LIST { > - UINT32 name_size; > - BYTE *name; // Name of destination (IP addr, domain name, etc) > - CRYPTO_INFO key; > - struct tdVTPM_MIGKEY_LIST *next; > -} VTPM_MIGKEY_LIST; > - > - > -typedef struct tdVTPM_GLOBALS { > - // Non-persistent data > -#ifndef VTPM_MULTI_VM > - pid_t master_pid; > -#endif > - > - int connected_dmis; // To close guest_rx when no dmis are connected > - > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > - // Currently keys are loaded at migration time, > - // TODO: Make VTPM man store a keys persistently > - // and update script to check if key is needed > - // before fetching it. > - > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > - CRYPTO_INFO storageKey; // For software encryption > - CRYPTO_INFO bootKey; // For saving table > - TCS_AUTH keyAuth; // OIAP session for storageKey > - > - // Persistent Data > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > - TPM_AUTHDATA srk_usage_auth; > - TPM_AUTHDATA storage_key_usage_auth; > - > - buffer_t bootKeyWrap; // Wrapped copy of boot key > - > -}VTPM_GLOBALS; > - > -// --------------------------- Global Values -------------------------- > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > - > -// ********************** VTPM Functions ************************* > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > -void VTPM_Stop_Manager(); // Stop VTPM Service > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Should forward TPM cmds > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *client_name); > - > -// ********************** Command Handler Prototypes *********************** > - > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_SaveManagerData(void); > -TPM_RESULT VTPM_LoadManagerData(void); > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > - > -// Helper functions > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data); > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data); > - > -#endif // __VTPMPRIV_H__ > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > deleted file mode 100644 > index fc8a66f..0000000 > --- a/tools/vtpm_manager/manager/vtsp.c > +++ /dev/null > @@ -1,1042 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.c > -// > -// Higher level interface to TCS for use in service. > -// > -// ================================================================== > - > -#include > -#include "tcg.h" > -#include "tcs.h" > -#include "bsg.h" > -#include "log.h" > -#include "crypto.h" > -#include "vtsp.h" > -#include "buffer.h" > - > -#define RSA_KEY_SIZE 0x0800 > - > -/*********************************************************************************** > - * GenerateAuth: Generate authorization info to be sent back to application > - * > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > - * outParamDigestTextSize Size of inParamDigestText > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use shared secret > - * pAuth Authorization information from the application > - * > - * Return: TPM_SUCCESS Authorization data created > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > - *************************************************************************************/ > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > - /*[IN]*/ UINT32 inParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth) { > - > - if (inParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - else { > - > - //Generate new OddNonce > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > - > - // Create SHA1 inParamDigest > - TPM_DIGEST inParamDigest; > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &inParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > - > - return(TPM_SUCCESS); > - > - } > -} > - > -/*********************************************************************************** > - * VerifyAuth: Verify the authdata for a command requiring authorization > - * > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > - * inParamDigestTextSize Size of inParamDigestText > - * authDataUsage AuthDataUsage for the Entity being used > - * Key->authDataUsage or TPM_AUTH_OWNER > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use NULL (It will be aquired from the Auth Session) > - * If unknown (default), assume OIAP > - * sessionAuth A TCS_AUTH info for the session > - * pAuth Authorization information from the application > - * hContext If specified, on failed Auth, VerifyAuth will > - * generate a new OIAP session in place of themselves > - * destroyed session. > - * > - * Return: TPM_SUCCESS Authorization Verified > - * TPM_AUTHFAIL Authorization Failed > - * TPM_FAIL Failure during SHA1 routines > - *************************************************************************************/ > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > - /*[IN]*/ UINT32 outParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth, > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > - if (outParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - > - > - // Create SHA1 inParamDigest > - TPM_DIGEST outParamDigest; > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - TPM_DIGEST hm; > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &outParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > - > - // Compare correct HMAC with provided one. > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > - if (!auth->fContinueAuthSession) > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > - > - return (TPM_SUCCESS); > - } else { > - // If specified, reconnect the OIAP session. > - // NOTE: This only works for TCS's that never have a 0 context. > - if (hContext) { > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > - VTSP_OIAP( hContext, auth); > - } > - return (TPM_AUTHFAIL); > - } > -} > - > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_OIAP(hContext, > - &auth->AuthHandle, > - &auth->NonceEven) ); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedSecret, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > - > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > - > - TPMTRYRETURN( TCSP_OSAP( hContext, > - entityType, > - entityValue, > - nonceOddOSAP, > - &auth->AuthHandle, > - &auth->NonceEven, > - &nonceEvenOSAP) ); > - > - // Calculating Session Secret > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > - > - BSG_PackList( sharedSecretText, 2, > - BSG_TPM_NONCE, &nonceEvenOSAP, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *crypto_info) { > - > - TPM_RESULT status; > - TPM_NONCE antiReplay; > - TPM_DIGEST checksum; > - BYTE *pubEKtext; > - UINT32 pubEKtextsize; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > - > - // GenerateAuth new nonceOdd > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > - > - > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > - antiReplay, > - &pubEKtextsize, > - &pubEKtext, > - &checksum) ); > - > - > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > - > - // Build CryptoInfo for the bindingKey > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - pubEK.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - pubEK.pubKey.keyLength, > - pubEK.pubKey.key, > - crypto_info); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > - BYTE *new_srk; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // vars for srkpubkey parameter > - TPM_KEY srkPub; > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > - > - struct pack_buf_t srkText; > - > - //These values are accurate for an enc(AuthData). > - struct pack_buf_t encOwnerAuth, encSrkAuth; > - > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > - > - > - // Build srk public key struct > - srkPub.ver = TPM_STRUCT_VER_1_1; > - srkPub.keyUsage = TPM_KEY_STORAGE; > - srkPub.keyFlags = 0x00; > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > - srkPub.PCRInfoSize = 0; > - srkPub.PCRInfo = 0; > - srkPub.pubKey.keyLength= 0; > - srkPub.encDataSize = 0; > - > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 5, > - BSG_TPM_COMMAND_CODE,&command, > - BSG_TPM_PROTOCOL_ID, &proto_id, > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > - BSG_TPM_KEY, &srkPub); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > - > - new_srk = srkText.data; > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > - proto_id, > - encOwnerAuth.size, > - encOwnerAuth.data, > - encSrkAuth.size, > - encSrkAuth.data, > - &srkText.size, > - &new_srk, > - auth ) ); > - > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > - paramTextSize += srkText.size; > - > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(srkText.data); > - free(encSrkAuth.data); > - free(encOwnerAuth.data); > - free(paramText); > - > - TCS_FreeMemory(hContext, new_srk); > - > - return status; > -} > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - ownerAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - goto egress; > - > - abort_egress: > - egress: > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth) { > - > - int i; > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > - > - // vars for Calculate encUsageAuth > - BYTE *paramText; > - UINT32 paramTextSize; > - > - // vars for Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - TPM_DIGEST XORKey1; > - UINT32 XORbufferSize; > - TPM_SECRET encUsageAuth, encMigrationAuth; > - > - // vars for Flatten newKey prototype > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > - struct pack_buf_t newKeyText; > - > - // Fill in newKey > - TPM_KEY newKey; > - > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > - newKey.algorithmParms.parmSize = 12; > - > - switch (usage) { > - case TPM_KEY_SIGNING: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > - newKey.keyUsage = TPM_KEY_SIGNING; > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > - break; > - case TPM_KEY_STORAGE: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > - newKey.keyUsage = TPM_KEY_STORAGE; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - case TPM_KEY_BIND: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > - newKey.keyUsage = TPM_KEY_BIND; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - default: > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - > - newKey.ver = TPM_STRUCT_VER_1_1; > - > - newKey.keyFlags = 0; > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > - newKey.pubKey.keyLength= 0; > - newKey.encDataSize = 0; > - newKey.encData = NULL; > - > - // FIXME: Support PCR bindings > - newKey.PCRInfoSize = 0; > - newKey.PCRInfo = NULL; > - > - // Calculate encUsageAuth > - XORbufferSize = BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven); > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > - > - // FIXME: No support for migratable keys. > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > - > - // Flatten newKey prototype > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > - newKeyText.data = flatKey; > - newKeyText.size = flatKeySize; > - > - // Generate HMAC > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_AUTHDATA, &encUsageAuth, > - BSG_TPM_AUTHDATA, &encMigrationAuth); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > - parentHandle, > - encUsageAuth, > - encMigrationAuth, > - &newKeyText.size, > - &newKeyText.data, > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, 0) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(flatKey); > - free(paramText); > - TCS_FreeMemory(hContext, newKeyText.data); > - > - return status; > -} > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *auth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad) { > - > - > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > - > - BYTE *paramText=NULL; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > - if (! skipTPMLoad) { > - > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > - (newKeyHandle==NULL) || (auth==NULL)) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Generate Extra TCS Parameters > - TPM_HANDLE phKeyHMAC; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - parentAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > - hUnwrappingKey, > - buffer_len(rgbWrappedKeyBlob), > - rgbWrappedKeyBlob->bytes, > - auth, > - newKeyHandle, > - &phKeyHMAC) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_HANDLE, newKeyHandle); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - parentAuth, auth, > - hContext) ); > - } > - > - // Build cryptoinfo structure for software crypto function. > - if (cryptoinfo != NULL) { > - TPM_KEY newKey; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - newKey.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - newKey.pubKey.keyLength, > - newKey.pubKey.key, > - cryptoinfo); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - } > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - struct pack_buf_t clear_data32; > - BYTE *clear_data_text; > - UINT32 clear_data_size; > - > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &bound_data32); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - usage_auth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_UnBind( hContext, > - key_handle, > - buffer_len(bound_data), > - bound_data->bytes, > - auth, > - &clear_data_size, > - &clear_data_text) ); > - > - > - // Verify Auth > - clear_data32.size = clear_data_size; > - clear_data32.data = clear_data_text; > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clear_data32); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - usage_auth, auth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - TCS_FreeMemory(hContext, clear_data_text); > - > - return status; > -} > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData) > -{ > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_BOUND_DATA boundData; > - UINT32 i; > - > - // Fill boundData's accessory information > - boundData.ver = TPM_STRUCT_VER_1_1; > - boundData.payload = TPM_PT_BIND; > - boundData.payloadData = inData->bytes; > - > - // Pack boundData before encryption > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > - (sizeof(TPM_VERSION) + > - sizeof(TPM_PAYLOAD_TYPE) + > - buffer_len(inData))); > - if (flatBoundData == NULL) { > - return TPM_NOSPACE; > - } > - UINT32 flatBoundDataSize = 0; > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > - BSG_TPM_VERSION, &boundData.ver, > - BSG_TYPE_BYTE, &boundData.payload); > - > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > - flatBoundDataSize += buffer_len(inData); > - > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > - UINT32 out_tmp_size; > - > - // Encrypt flatBoundData > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > - flatBoundDataSize, > - flatBoundData, > - &out_tmp_size, > - out_tmp) ); > - > - if (out_tmp_size > RSA_KEY_SIZE/8) { > - // The result of RSAEnc should be a fixed size based on key size. > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > - } > - > - buffer_init(outData, 0, NULL); > - buffer_append_raw(outData, out_tmp_size, out_tmp); > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > - for(i = 0 ; i < out_tmp_size ; i++) { > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > - } > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - goto egress; > - abort_egress: > - egress: > - > - // Free flatBoundData > - free(flatBoundData); > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate PCR_Info Struct from Comp > - TPM_PCR_INFO pcrInfo; > - UINT32 pcrInfoSize, flatpcrSize; > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > - sizeof(UINT16) + // 2 byte UINT16 > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > - > - if (pcrComp != NULL) { > - //printf("\n\tBinding to PCRs: "); > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > - > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > - > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > - } else { > - //printf("\n\tBinding to no PCRS."); > - pcrInfoSize = 0; > - } > - > - // Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - UINT32 XORbufferSize = sizeof(XORbuffer); > - TPM_DIGEST XORKey; > - TPM_ENCAUTH encAuth; > - > - BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven ); > - > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > - > - int i; > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > - > - // Generate Extra TCS Parameters > - UINT32 inDataSize = buffer_len(inData); > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > - > - UINT32 sealedDataSize; > - BYTE *flatSealedData=NULL; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 4, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_ENCAUTH, &encAuth, > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > - BSG_TPM_SIZE32_DATA, &inData_pack); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_Seal( hContext, > - keyHandle, > - encAuth, > - pcrInfoSize, > - flatpcr, > - inDataSize, > - inData->bytes, > - auth, > - &sealedDataSize, > - &flatSealedData) ); > - > - // Unpack/return key structure > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, > - 0) ); > - > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, flatSealedData); > - > - free(paramText); > - return status; > -} > - > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - UINT32 sealDataSize, clearDataSize; > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > - 2 * sizeof(UINT32) + > - sealedData->sealInfoSize + > - sealedData->encDataSize), > - *clearData=NULL; > - > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - key_usage_auth, auth) ); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth) ); > - // Call TCS > - TPMTRYRETURN( TCSP_Unseal( hContext, > - keyHandle, > - sealDataSize, > - flatSealedData, > - auth, > - dataAuth, > - &clearDataSize, > - &clearData) ); > - > - // Verify Auth > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clearData_pack); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - key_usage_auth, auth, > - hContext) ); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, clearData); > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Call TCS > - return ( TCSP_SaveState ( hContext ) ); > - > -} > - > - > -// Function Reaches into unsupported TCS command, beware. > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Extra TCS Parameters > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > - > - // Call TCS > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > - &resultTextSize, resultText) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > - goto egress; > - > - abort_egress: > - > - egress: > - TCS_FreeMemory(hContext, resultText); > - free(resultText); > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > deleted file mode 100644 > index 2fb0440..0000000 > --- a/tools/vtpm_manager/manager/vtsp.h > +++ /dev/null > @@ -1,126 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.h > -// > -// Higher level interface to TCS. > -// > -// ================================================================== > - > -#ifndef __VTSP_H__ > -#define __VTSP_H__ > - > -#include "tcg.h" > -#include "tcs.h" > - > -#define KEY_BUFFER_SIZE 2048 > - > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ); > - > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedsecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth); > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *cypto_info); > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *pAuth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad); > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData); > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth); > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > - > -#endif //_VTSP_H_ > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > deleted file mode 100644 > index e33ae95..0000000 > --- a/tools/vtpm_manager/migration/Makefile > +++ /dev/null > @@ -1,42 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -VPATH = ../manager > - > -BIND = vtpm_migratord > -BINC = vtpm_migrator > - > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > - > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIND) $(BINC) > - > -.PHONY: install > -install: build > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BINC) $(BIND) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIND): $(OBJSD) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -$(BINC): $(OBJSC) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../util/libTCGUtils.a > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > deleted file mode 100644 > index 08986f4..0000000 > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_if.c > -// > -// Provides functions to call local vtpm manager interface (Hotplug) > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "vtpm_ipc.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > - > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > - > -TPM_RESULT vtpm_manager_open(){ > - > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > - return TPM_IOERROR; > - } > - > - return TPM_SUCCESS; > -} > - > -void vtpm_manager_close() { > - > - vtpm_ipc_close(&tx_ipc_h); > - vtpm_ipc_close(&rx_ipc_h); > -} > - > - > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_TAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > - adj_command = (BYTE *) malloc( adj_command_size ); > - if (!adj_command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - BSG_PackList(adj_command, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > - for (i=0; i< adj_command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) adj_command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > - > - // Read header for response to manager command > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > deleted file mode 100644 > index 8d52e66..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > +++ /dev/null > @@ -1,104 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator.h > -// > -// Public Interface header for VTPM Migrator > -// > -// ================================================================== > - > -#ifndef __VTPM_MIGRATOR_H__ > -#define __VTPM_MIGRATOR_H__ > - > -#define VTPM_MTAG_REQ 0x02c1 > -#define VTPM_MTAG_RSP 0x02c4 > - > -// Header sizes. > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > - > -//*********************** Connection Info ************************** > -#define VTPM_MIG_PORT 48879 > - > -//************************ Command Codes *************************** > -#define VTPM_MORD_MIG_STEP1 0x00 > -#define VTPM_MORD_MIG_STEP2 0x01 > -#define VTPM_MORD_MIG_STEP3 0x02 > -#define VTPM_MORD_MIG_STEP4 0x03 > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Mig_Phase1: > - Unsupported: (Handled by scripts) > - > -VTPM_Mig_Phase2 > - Input Parameters: > - domain_name_size: 4 bytes > - domain_name : domain_name_size bytes > - Output Parameters: > - pub_exp_size: 4 bytes > - pub_exp: pub_exp_size bytes > - pub_mod_size: 4 bytes > - pub_mod: pub_mod_size bytes > - > -VTPM_Mig_Phase3 > - Input Parameters: > - vtpm_state_size: 4 bytes > - vtpm_state: vtpm_state_size bytes > - Output Parameters: > - none > - > -VTPM_Mig_Phase4 > - Unsupported: (Handled by scripts) > - > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > deleted file mode 100644 > index de48b2d..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > +++ /dev/null > @@ -1,219 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator_if.c > -// > -// Provides functions to call open network connection & call > -// a function on the vtpm_migratord on the destination > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > - > -static int sock_desc; > - > - > -TPM_RESULT vtpm_migratord_open(char *server_address){ > - > - TPM_RESULT status = TPM_FAIL; > - > - /* network variables */ > - struct in_addr ip_addr; > - struct sockaddr_in server_addr; > - int addr_len; > - struct hostent *dns_info=NULL; > - > - /* set up connection to server*/ > - dns_info = gethostbyname(server_address); > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > - > - if(ip_addr.s_addr < 0) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /* set up server variable */ > - memset((char *)&server_addr, 0, sizeof(server_addr)); > - server_addr.sin_family = AF_INET; > - server_addr.sin_port = htons(VTPM_MIG_PORT); > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > - > - /* open socket, make connection */ > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > - > - if (sock_desc < 0 ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (connect(sock_desc, > - (struct sockaddr *)&server_addr, > - sizeof(server_addr)) < 0 ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - status = TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -void vtpm_migratord_close() { > - close(sock_desc); > -} > - > - > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_MTAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - command = (BYTE *) malloc( command_size ); > - if (!command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - BSG_PackList(command, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &command_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = write(sock_desc, command, command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > - for (i=0; i< command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > - > - // Read header for response > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > deleted file mode 100644 > index 18b3bdb..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > +++ /dev/null > @@ -1,211 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - UINT32 offset; > - struct pack_buf_t addr_data32; > - > - //===== Get Destination's Public Migration Key ====== > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > - &out_param_buf, > - &cmd_status, > - &mig_key_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - //===== Load migration key into vtpm_manager ======== > - > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > - NULL ) ) ; > - > - offset = BSG_PackList(out_param_buf.bytes, 1, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free(&mig_key_buf); > - buffer_free(&out_param_buf); > - > - return status; > -} > - > - > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > - struct pack_buf_t addr_data32, name_data32, state_data32; > - > - //===== Get vtpm state from vtpm_manager ======== > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - (2 * sizeof(UINT32)) + addr_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > - &out_param_buf, > - &cmd_status, > - &state_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > - > - //===== Send vtpm state to destination ====== > - name_data32.data = (BYTE *)name; > - name_data32.size = strlen(name) + 1; // Include the null > - state_data32.data = state_buf.bytes; > - state_data32.size = buffer_len(&state_buf); > - > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free( &out_param_buf); > - buffer_free( &state_buf); > - buffer_free( &empty_buf); > - > - return status; > -} > - > - > -// Usage vtpm_migrator addr domain_name instance step > - > -int main(int argc, char **argv) { > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - char *server_addr, *name; > - UINT32 instance, step; > - > - if (argc != 5) { > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > - status= TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - server_addr = argv[1]; > - name = argv[2]; > - instance = atoi( argv[3] ); > - step = atoi( argv[4] ); > - > - switch (step) { > - case VTPM_MORD_MIG_STEP2: > - status = handle_vtpm_mig_step2(server_addr, name, instance); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - status = handle_vtpm_mig_step3(server_addr, name, instance); > - break; > - > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - break; > - } > - > - goto egress; > - abort_egress: > - egress: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > deleted file mode 100644 > index ea18c8c..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > +++ /dev/null > @@ -1,202 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > - > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > - TPM_TAG tag = VTPM_MTAG_RSP; > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > - > - buffer_init(buf, out_param_size, NULL); > - > - BSG_PackList(buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status ); > -} > - > -int main() { > - > - /* network variables */ > - int sock_descr, client_sock=-1, len; > - struct sockaddr_in addr; > - struct sockaddr_in client_addr; > - unsigned int client_length; > - int bytes; > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - UINT32 in_param_size, adj_param_size; > - int i, size_read, size_write; > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > - > - > - /* setup socket */ > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > - > - memset(&addr, 0, sizeof(addr)); > - addr.sin_family = AF_INET; > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > - addr.sin_port = htons(VTPM_MIG_PORT); > - > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > - return 1; > - } > - > - listen(sock_descr, 10); > - > - for(;;) { > - // ============ clear client info and wait for connection ========== > - memset(&client_addr, 0, sizeof(client_addr)); > - client_length = sizeof(client_addr); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > - client_sock=accept(sock_descr, &client_addr, &client_length); > - if (client_sock == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > - goto abort_command; > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > - } > - > - // =================== Read incoming command ====================== > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - // Unpack response from client > - BSG_UnpackList(cmd_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - buffer_init( &in_param_buf, adj_param_size, NULL); > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - /* Handle Command */ > - switch (ord) { > - case VTPM_MORD_MIG_STEP2: > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > - break; > - > - default: > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - abort_command_with_error: > - /* Write Response */ > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i< buffer_len(&result_buf); i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > - goto abort_command; > - } > - > - if (size_write != (int) buffer_len(&result_buf) ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > - > - abort_command: > - close(client_sock); > - buffer_free(&in_param_buf); > - buffer_free(&result_buf); > - > - } // For (;;) > - > - return 0; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > deleted file mode 100644 > index 0a8a2d5..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > +++ /dev/null > @@ -1,177 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "log.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > -#define VTPM_SH_CMD_FTR "\"" > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > -#define VTPM_SH_ADD "vtpm_add_and_activate" > -#define VTPM_SH_RESUME "vtpm_resume" > - > -// This must be updated to the longest command name. Currently GETINST > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > - > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Call manager and get mig key =============== > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > - &out_param_buf, // Empty > - &cmd_status, > - &mig_key_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ==================== return the mig key ===================== > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > - > - TPMTRYRETURN( buffer_init(result_buf, > - out_param_size, > - NULL) ); > - > - BSG_PackList( result_buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status); > - > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > - > - goto egress; > - > - abort_egress: > - buffer_free(result_buf); > - build_error_msg(result_buf, status); > - > - egress: > - return; > -} > - > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size, instance; > - char *shell_cmd_str=NULL; > - size_t shell_cmd_strlen; > - FILE *shell_f=NULL; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Read Parameters =============== > - struct pack_buf_t name_data32, state_data32; > - > - BSG_UnpackList(in_param_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - // Before using this string, protect us from a non-null term array. > - if (name_data32.data[name_data32.size -1] != 0x00) { > - name_data32.data[name_data32.size -1] = 0x00; > - } > - > - // ====== Call hotplug-script and get an instance ====== > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > - > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > - > - shell_f = popen(shell_cmd_str, "r"); > - fscanf(shell_f, "%d", &instance); > - pclose(shell_f); > - > - // ====== Call hotplug-script and add instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > - name_data32.data, instance); > - system(shell_cmd_str); > - > - // ========= Call vtpm_manager and load VTPM ======= > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2*sizeof(UINT32) + state_data32.size, > - NULL) ); > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ====== Call hotplug-script and resume instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > - system(shell_cmd_str); > - > - goto egress; > - abort_egress: > - egress: > - free(shell_cmd_str); > - > - // In this case no params come back, so reuse build_error_msg even for succes. > - build_error_msg(result_buf, status); > - return; > -} > - > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > deleted file mode 100644 > index 11af91e..0000000 > --- a/tools/vtpm_manager/tcs/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCS.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > deleted file mode 100644 > index cf3803c..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.c > +++ /dev/null > @@ -1,224 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include "tcs.h" > -#include "contextmgr.h" > -#include "log.h" > -#include "hashtable.h" > - > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize) { // in > - > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pBlock = NULL; > - > - // check incoming params > - if (pContextHandle == NULL || BlockSize == 0) > - return NULL; > - > - // Create New Block > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > - if (pBlock == NULL) > - return (0); > - > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > - if (pBlock->aMemory == NULL) > - return (0); > - > - memset(pBlock->aMemory, 0, BlockSize); > - pBlock->nBlockSize = BlockSize; > - pBlock->pNextBlock = NULL; > - > - // search for the last block created where to add the > - // newly created block > - if(pContextHandle->pTopBlock != NULL) { > - pCurrentBlock = pContextHandle->pTopBlock; > - while(pCurrentBlock->pNextBlock != NULL) > - pCurrentBlock = pCurrentBlock->pNextBlock; > - > - > - pCurrentBlock->pNextBlock= pBlock; > - } else > - pContextHandle->pTopBlock = pBlock; > - > - > - pContextHandle->nBlockCount++; > - > - return pBlock->aMemory; > -} > - > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs) { // in > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pParentBlock = NULL; > - BOOL bFound = FALSE; > - > - if (pContextHandle == NULL) > - return FALSE; > - > - > - // Search for the Block in the context by aMemory pointer > - pParentBlock = NULL; > - pCurrentBlock = pContextHandle->pTopBlock; > - > - while(pCurrentBlock != NULL) { > - // If aMemory block is found, delete it > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > - // if it is the top Block, remove it from the top, > - // otherwise remove it from the ParentBlock and stitch > - // the NextBlock to the ParentBlock > - if(pParentBlock == NULL) > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > - else > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > - > - // delete memory Block associated with pointer pTCPA_BYTEs > - free(pCurrentBlock->aMemory); > - pCurrentBlock->aMemory = NULL; > - > - free(pCurrentBlock); > - pCurrentBlock = pParentBlock; > - > - pContextHandle->nBlockCount--; > - bFound = TRUE; > - } > - > - if(pCurrentBlock != NULL) { > - pParentBlock = pCurrentBlock; > - pCurrentBlock = pCurrentBlock->pNextBlock; > - } > - } > - > - return bFound; > -} > - > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle) { // in > - HANDLE_LIST* pNewHandle = NULL; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle == NULL) > - return 0; > - > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > - > - if (pNewHandle == NULL) > - return (0); > - > - pNewHandle->handle = handle; > - pNewHandle->type = type; > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > - > - pContextHandle->pHandleList = pNewHandle; > - > - return 1; > -} > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle) { // in > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > - *pLastHandle = pCurrentHandle; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > - > - if (pContextHandle == NULL) > - return 0; > - > - while (1) { > - > - if (pCurrentHandle->handle == handle) { // Found element > - if (pCurrentHandle == pLastHandle) { // First element in list > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } else { // Ordinary element > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } > - > - return 1; > - > - } else { // Not found yet; > - pLastHandle = pCurrentHandle; > - pCurrentHandle = pCurrentHandle->pNextHandle; > - if (pCurrentHandle == NULL) // Found end of list > - return 0; > - } > - > - } > -} > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > - HANDLE_LIST* pCurrentHandle; > - BOOL returncode = TRUE; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > - > - if (pContextHandle == NULL) > - return 1; > - > - pCurrentHandle = pContextHandle->pHandleList; > - while (pCurrentHandle != NULL) { > - > - switch (pCurrentHandle->type) { > - case TPM_RT_KEY: > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > - break; > - case TPM_RT_AUTH: > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > - break; > - default: > - returncode = FALSE; > - } > - > - pCurrentHandle = pCurrentHandle->pNextHandle; > - > - } > - > - return 1; > -} > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > deleted file mode 100644 > index e3fdf0f..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.h > +++ /dev/null > @@ -1,82 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#ifndef __CONTEXTMGR_H__ > -#define __CONTEXTMGR_H__ > - > -#include "tcg.h" > - > -#define BLOCK_SIZE 300 > - > -typedef struct block { > - int nBlockSize; > - BYTE* aMemory; > - struct block* pNextBlock; > -} BLOCK; > - > -typedef struct handle_List { > - TPM_HANDLE handle; > - TPM_RESOURCE_TYPE type; > - struct handle_List* pNextHandle; > -} HANDLE_LIST; > - > -typedef struct context_handle { > - TCS_CONTEXT_HANDLE handle; > - int nBlockCount; > - BLOCK* pTopBlock; > - HANDLE_LIST* pHandleList; > -} CONTEXT_HANDLE; > - > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize); // in > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs); // in > - > - > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle); // in > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle); // in > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > - > -#endif //_CONTEXTMGR_H_ > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > deleted file mode 100644 > index 7c1378c..0000000 > --- a/tools/vtpm_manager/tcs/tcs.c > +++ /dev/null > @@ -1,1192 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.c > -// > -// This file contains the functions that implement a TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "tcs.h" > -#include "contextmgr.h" > -#include "tpmddl.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -// Static Global Vars for the TCS > -static int TCS_m_nCount = 0; > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > - > -struct hashtable *context_ht; > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > -} > - > -// --------------------------------------------------------------------------------- > -// Initialization/Uninitialization SubComponent API > -// --------------------------------------------------------------------------------- > -TPM_RESULT TCS_create() { > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TPM_RESULT result = TPM_FAIL; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > - hRes = TDDL_Open(); > - > - context_ht = create_hashtable(10, hashfunc32, equals32); > - > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > - result = TPM_SUCCESS; > - TCS_m_nCount++; > - } else { > - result = TPM_IOERROR; > - hashtable_destroy(context_ht, 1); > - } > - } else > - TCS_m_nCount++; > - > - return(result); > -} > - > - > -void TCS_destroy() > -{ > - TCS_m_nCount--; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > - TDDL_Close(); > - > - struct hashtable_itr *context_itr; > - TCS_CONTEXT_HANDLE *hContext; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(context_ht) > 0) { > - context_itr = hashtable_iterator(context_ht); > - do { > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > - > - } while (hashtable_iterator_advance(context_itr)); > - free(context_itr); > - } > - hashtable_destroy(context_ht, 1); > - } > - > -} > - > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr) {// out > - > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle != NULL && ppMemPtr != NULL) { > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > - returnCode = TPM_SUCCESS; > - } > - > - return returnCode; > -} > - > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory) { // in > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if ( (pContextHandle != NULL && pMemory != NULL) && > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > - returnCode = TPM_SUCCESS; > - > - > - return returnCode; > -} > - > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > - TPM_RESULT returnCode = TPM_FAIL; > - TCS_CONTEXT_HANDLE *newContext; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > - > - if (hContext) { > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > - if (pContextHandle == NULL) > - return TPM_SIZE; > - > - // initialize to 0 > - pContextHandle->nBlockCount = 0; > - pContextHandle->pTopBlock = NULL; > - pContextHandle->pHandleList = NULL; > - > - // Create New Block > - AddMemBlock(pContextHandle, BLOCK_SIZE); > - > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > - > - if (hashtable_search(context_ht, &newContext) !=NULL) > - *newContext += 1; > - > - pContextHandle->handle = *newContext; > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > - free(newContext); > - free(pContextHandle); > - returnCode = TPM_FAIL; > - } else { > - *hContext = *newContext; > - returnCode = TPM_SUCCESS; > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > - //FIXME: TCS SHOULD Track failed auths and make sure > - //we don't try and re-free them here. > - TPM_RESULT returnCode = TPM_FAIL; > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if(pContextHandle != NULL) { > - // Print test info > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > - > - // free memory for all the blocks > - DeleteMemBlock(pContextHandle, NULL ); > - pContextHandle->pTopBlock = NULL; > - > - FreeHandleList(pContextHandle); > - if (pContextHandle->pHandleList != NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - // Release the TPM's resources > - if (hashtable_remove(context_ht, &hContext) == NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - free(pContextHandle); > - returnCode = TPM_SUCCESS; > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > - return(returnCode); > -} > - > -// ------------------------------------------------------------------ > -// Internal Functions > -// ------------------------------------------------------------------ > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > - // CHECK: according to the command specs, the outgoing auth params are: > - // nonceEven > - // nonceOdd > - // continueAuthSession > - // auth digest for return params > - // > - // this is a bit different than this code... > - > - return BSG_PackList(dst, 4, > - BSG_TYPE_UINT32, &(auth->AuthHandle), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > - return BSG_UnpackList(src, 3, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -// ------------------------------------------------------------------ > -// Authorization Commands > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > - UINT32 paramSize = 0; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonce0 == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 2, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonce0); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &entityType, > - BSG_TYPE_UINT32, &entityValue, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 3, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonceEven, > - BSG_TPM_NONCE, nonceEvenOSAP); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &protocolID, > - BSG_TYPE_UINT32, &encOwnerAuthSize); > - > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > - InLength += encOwnerAuthSize; > - InLength += BSG_Pack( BSG_TYPE_UINT32, > - &encSrkAuthSize, > - InBuf+InLength); > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > - InLength += encSrkAuthSize; > - memcpy(InBuf+InLength, *Srk, *SrkSize); > - InLength += *SrkSize; > - InLength += packAuth(InBuf+InLength, ownerAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, > - &InLength, > - InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY srkPub; > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > - unpackAuth(ownerAuth, OutBuf+i); > - > - // fill output params > - BYTE tempBuf[1024]; > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > - return(TPM_SIZE); > - } > - memcpy(*Srk, tempBuf, *SrkSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth) { // in, out > - > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - InLength += packAuth(InBuf+InLength, ownerAuth); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - unpackAuth(ownerAuth, OutBuf+i); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &handle); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, handle)) > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Print debug info > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &pcrNum, > - BSG_TPM_DIGEST, &inDigest); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TPM_ENCAUTH, encAuth, > - BSG_TYPE_UINT32, &pcrInfoSize); > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > - InLength += pcrInfoSize; > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, pubAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_STORED_DATA sealedData; > - > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > - unpackAuth(pubAuth, OutBuf+i); > - > - // fill SealedData > - BYTE tempBuf[1024]; > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*SealedData, tempBuf, *SealedDataSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > - DataSize == NULL || Data == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &parentHandle); > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > - InLength += SealedDataSize; > - InLength += packAuth(InBuf+InLength, parentAuth); > - InLength += packAuth(InBuf+InLength, dataAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*Data, OutBuf+i, *DataSize); > - i += *DataSize; > - i += unpackAuth(parentAuth, OutBuf+i); > - unpackAuth(dataAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TYPE_UINT32, &inDataSize); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, privAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*outData, OutBuf+i, *outDataSize); > - i += *outDataSize; > - unpackAuth(privAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hWrappingKey, > - BSG_TPM_ENCAUTH, KeyUsageAuth, > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > - InLength += *pcKeySize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_RESULT, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY wrappedKey; > - > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > - unpackAuth(pAuth, OutBuf+i); > - > - // Fill prgbKey > - BYTE tempBuf[1024]; > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*prgbKey, tempBuf, *pcKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > - return TPM_BAD_PARAMETER; > - > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hUnwrappingKey); > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > - InLength += cWrappedKeyBlobSize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, > - OutBuf+i, > - phKeyTCSI); > - unpackAuth(pAuth, OutBuf+i); > - > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hKey); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, hKey)) { > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - } > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (bytesRequested == NULL || *randomBytes == NULL){ > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, bytesRequested); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TPM_NONCE, &antiReplay); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - i += BSG_UnpackList(OutBuf+i, 2, > - BSG_TPM_PUBKEY, &pubEK, > - BSG_TPM_DIGEST, checksum); > - > - // fill EndorsementKey > - BYTE tempBuf[1024]; > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData) { // out > - > - TDDL_RESULT hRes; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > - //FIXME: Add Context Management > - hRes = TDDL_TransmitData( inData, > - inDataSize, > - outData, > - outDataSize); > - > - if (hRes == TDDL_SUCCESS) { > - return TPM_SUCCESS; > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > - return TPM_IOERROR; > - } > - > -} > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > deleted file mode 100644 > index 83b9cd0..0000000 > --- a/tools/vtpm_manager/tcs/tcs.h > +++ /dev/null > @@ -1,245 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.h > -// > -// This file declares the TCS API > -// > -// ================================================================== > - > -#ifndef __TCS_H__ > -#define __TCS_H__ > - > -#include "tcg.h" > -#include "contextmgr.h" > -#include "buffer.h" > - > -#define HANDLE_NULL 0 > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCS_create(); > -void TCS_destroy(); > - > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > - > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > - > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr ); //out > - > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory); // in > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -// TPM v1.1B Command Set > - > -// Authorzation > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0 // out > - ); > - > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP // out > - ); > - > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle // in > - ); > - > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle, // in > - TPM_RESOURCE_TYPE resourceType //in > - ); > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_NONCE antiReplay, // in > - UINT32* PcrDataSize, // in, out > - BYTE** PcrData, // in, out > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData // out > - ); > - > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data // out > - ); > - > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE newContents, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE* dirValue // out > - ); > - > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData // out > - ); > - > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth // in, out > - ); > - > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC // out > - ); > - > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey, // in > - TCS_AUTH* pAuth, // in, out > - UINT32* pcPubKeySize, // out > - BYTE** prgbPubKey // out > - ); > - > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey // in > - ); > - > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 areaToSignSize, // in > - BYTE* areaToSign, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes // out > - ); > - > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 inDataSize, // in > - BYTE* inData // in > - ); > - > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum // out > - ); > - > - > -// Non-Standard TCSP calls > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > - > -//Give direct access to TransmitData. > -// Key and Auth Management is done before transfering command to TDDL. > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData); // out > - > -///////////// Private Functions //////////////////// > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > - > -#endif //TCS_H > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > deleted file mode 100644 > index e7e54f1..0000000 > --- a/tools/vtpm_manager/tcs/tpmddl.h > +++ /dev/null > @@ -1,69 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmddl.c > -// > -// This file defines the TDDLI API > -// > -// ================================================================== > - > -#ifndef __TPMDDL_H__ > -#define __TPMDDL_H__ > - > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > - > -#define TDDL_E_FAIL 1 > -#define TDDL_E_SUCCESS 0 > -#define TDDL_SUCCESS 0 > - > -typedef unsigned int TDDL_UINT32; > -typedef TDDL_UINT32 TDDL_RESULT; > -typedef unsigned char TDDL_BYTE; > - > -TDDL_RESULT TDDL_Open(); > -void TDDL_Close(); > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize); > -TDDL_RESULT TDDL_GetStatus(); > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > - > -#endif // __TPMDDL_H__ > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > deleted file mode 100644 > index 74bbdca..0000000 > --- a/tools/vtpm_manager/tcs/transmit.c > +++ /dev/null > @@ -1,147 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "tpmddl.h" > - > -// flag to track whether TDDL has been opened > -static int g_TDDL_open = 0; > -static int g_tx_fd = -1; // the fd to the TPM > - > -#ifndef DUMMY_TPM > - #define TPM_TX_FNAME "/dev/tpm0" > - static int *g_rx_fdp = &g_tx_fd; > -#else > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > - static int g_rx_fd = -1; > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > -#endif > - > -TPM_RESULT > -TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize) { > - TPM_RESULT status = TPM_SUCCESS; > - TDDL_UINT32 i; > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > - for(i = 0 ; i < insize ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - ssize_t size = 0; > - > - // send the request > - size = write (g_tx_fd, in, insize); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - else if ((TDDL_UINT32) size < insize) { > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > - // ... ? > - } > - > - // read the response > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > - for(i = 0 ; i < size ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - *outsize = size; > - // close connection > - goto egress; > - > - abort_egress: > - egress: > - return status; > -} > - > -TPM_RESULT TDDL_Open() { > - > - TDDL_RESULT status = TDDL_SUCCESS; > - > - if (g_TDDL_open) > - return TPM_FAIL; > - > -#ifdef DUMMY_TPM > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > -#endif > - > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > - if (g_tx_fd < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > - return TPM_IOERROR; > - } > - > - g_TDDL_open = 1; > - > - return status; > -} > - > -void TDDL_Close() { > - if (! g_TDDL_open) > - return; > - > - if (g_tx_fd>= 0) { > - if (close(g_tx_fd) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - g_tx_fd = -1; > - } > - > - if (*g_rx_fdp>= 0) { > - if (close(*g_rx_fdp) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - *g_rx_fdp = -1; > - } > - > - g_TDDL_open = 0; > - > -} > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > deleted file mode 100644 > index 36bc38f..0000000 > --- a/tools/vtpm_manager/util/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCGUtils.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > deleted file mode 100644 > index fa36ce7..0000000 > --- a/tools/vtpm_manager/util/bsg.c > +++ /dev/null > @@ -1,829 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.cpp > -// > -// This file will handle all the TPM Byte Stream functions > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include "tcg.h" > -#include "crypto.h" > -#include "bsg.h" > -#include "log.h" > - > -static int g_log_recursion_level = 0; > - > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > -// will complain! > -#define BSG_MAX_BUF_SIZE (1<<18) > - > -#define bsglog(fmt, ...) do { \ > - int __i; \ > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > - } \ > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > - } while (0) > - > - > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > -//BOOL dummy1 = BSG_static_selfcheck(); > - > - > -// Interpretting Types > -// ------------------- > -// > -// Incoming Types are composed of two parts {format, info} squished into a > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > -// data it is. If the first 4 bits are zero the info corresponds to a value in > -// BSG_s_fmt[]. This is a structure whose composition is described in > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > -// data (in bytes) being passed in. For example a UINT32 being passed in would > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > -// this is interpretted as the end of the structure, and the result is returned. > - > -// these flags are mutually exclusive, so I'll just make them > -// format values which indicate the semantics of the 'info' part and the source > -// data. The above description has been accordingly adjusted. > - > -// format values for determining what type of data the incoming type is > -// it's a 4 bit value, occupying the high 4 bits > -#define __FMT_CONST (1UL << 28) // Constant sized value > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > -#define __FMT_HSIZE (4UL << 28) // A number of handles > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > - // of {size32, data} but we're to pack only the > - // data as that is already packed, and so > - // can/must be unpacked without > - // explicitly reading it size > - > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > - > -// constant (8/16/32-bits) > -#define FMT_U8 (__FMT_CONST | 1UL) > -#define FMT_U16 (__FMT_CONST | 2UL) > -#define FMT_U32 (__FMT_CONST | 4UL) > - > -// const with a compiler-computed size > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > - > -// other data (size bytes) > -// Used primarily for DIGESTS -> FMT_DATA(20) > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > - > -// 16/32-bit size followed by N bytes of data > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > - > -// 16-bit size followed by N key handles > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > - > -#define DIGEST_SIZE 20 > -typedef BSG_UINT32 BSG_HANDLE; > - > -// TCPA_AUTH has 11 fields! > -#define MAX_FIELDS 11 > -typedef struct BSG_Format > -{ > - BSG_Type type; > - const char* name; > - BSG_UINT32 fields[MAX_FIELDS + 1]; > -} BSG_Format; > - > -/* > - * TCPA structure data formats > - */ > -// this has to be manually kept in sync with the > -// Type enum!! the static_selfcheck() function should be used regularly! > -static BSG_Format s_fmt[] = > -{ > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > - > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > - > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > - > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > - {FMT_SIZE16_HANDLES, 0}}, > - > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, // the PCR_INFO > - BSG_TPM_STORE_PUBKEY, > - FMT_SIZE32_DATA, // the encrypted part > - 0}}, > - > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > - BSG_TPM_PUBKEY, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_DIGEST, 0}}, > - > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_RESULT, 0 }}, > - > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > - BSG_TPM_DIGEST, > - BSG_TPM_DIGEST, > - FMT_DATA(2), > - FMT_SIZE32_DATA, 0}}, > - > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > - FMT_SIZE32_DATA, > - 0} }, > - > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_COMPOSITE_HASH, > - 0} }, > - > - > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > - BSG_TPM_VERSION, > - FMT_SIZE32_DATA, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - FMT_SIZE16_DATA, > - 0}}, > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - FMT_U32, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > - BSG_TPM_VERSION, > - FMT_DATA(4), > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_NONCE, > - 0}}, > - > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > - BSG_TPM_VERSION, > - FMT_U32, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_PUBKEY, > - 0}}, > - > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > - > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > - FMT_U8, > - FMT_U8, > - 0}}, > - > - {BSG_TCS_AUTH, "TCS_AUTH", { > - BSG_TYPE_UINT32, > - BSG_TPM_NONCE, > - BSG_TPM_NONCE, > - BSG_TYPE_BOOL, > - BSG_TPM_AUTHDATA, > - 0}}, > - > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, > - BSG_TPM_STORE_PUBKEY, > - 0}}, > - > - {BSG_PACKED, "BSG_PACKED", { > - __FMT_PACKED, > - 0 }}, > - > - {BSG_TYPE_MAX, "", {0}}, > -}; > - > - > -static const BSG_Format* find_format (BSG_Type t) { > - BSG_Format * f = s_fmt; > - > - if (t >= BSG_TYPE_MAX) { > - return NULL; > - } > - > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > - // sure to run the static_selfcheck() to make sure > - f = s_fmt + (t - BSG_TYPE_FIRST); > - > - return f; > -} > - > -// > -// a consistency-checking routine which can be run at compile time > -// (ie. immediately after compilation) > -// > -// tasks: > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > -// > -// conditions: > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > -// Type has value 0, not 1 > -// > -// FIXME: should have a function be passed in here which is called if the test > -// fails. Then the caller can decide what to do: abort, notify, whatever > -// > -BOOL BSG_static_selfcheck () > -{ > - int i; > - > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > - bsglog ("failure at %i, allegedly %s\n", > - i, s_fmt[i - BSG_TYPE_FIRST].name); > - abort(); > - return FALSE; > - } > - } > - > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > - return TRUE; > -} > - > - > -/** > - * Flatten a TCPA structure into a buffer in big-endian format > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * @dst: (OUT) flattened data > - * Returns: Flattened size or -1 for unknown types > - */ > -// make it so that it can just run through the whole process and return > -// the packed size, without packing anything. this will be done if dst is NULL. > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > -{ > - // check incoming parameters > - if (*src == NULL) > - return 0; > - > - const BSG_BYTE* s = *src; > - BSG_BYTE* d = dst; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > - { > - BSG_UINT32 val = 0; > - switch (size) { > - case 1: val = * (BYTE*) s; break; > - case 2: val = * (unsigned short*) s; break; > - case 4: val = * (BSG_UINT32*) s; break; > - } > - if (dst) > - BSG_PackConst(val, size, d); > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > - // this is used. > - > - if (dst) { > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > - memcpy(d, s, size); > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = 0; > - switch (size) { > - case 1: psize = * (BYTE*) s; break; > - case 2: psize = * (unsigned short*) s; break; > - case 4: psize = * (BSG_UINT32*) s; break; > - } > - > - if (dst) > - BSG_PackConst(psize, size, d); > - > - s += size; > - d += size; > - > - // now 's' points to an address, so cast it to BSG_BYTE** > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > - s += sizeof(BSG_BYTE*); > - > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > - > - } > - d += psize * sizeof(BSG_HANDLE); > - } else {// If it's not psize handles, it's psize data. > - if (psize > 0) { > - if (dst) { > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > - psize, pdata, d); > - memcpy(d, pdata, psize); > - } > - } > - d += psize; > - } > - } else if (format == __FMT_PACKED) { > - // the source buffer is a pack_constbuf_t, which has a size and a > - // pointer. just copy the buffer value, the size is not included in the > - // output stream. > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > - > - if (dst) { > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > - buf->size, buf->data, d); > - memcpy(d, buf->data, buf->size); > - } > - > - s += buf->size; > - d += buf->size; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > - return -1; > - } > - > - if (dst) > - bsglog ("BSG_Pack type %s\n", x->name); > - > - > - // iterate through the fields > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize; > - > - g_log_recursion_level++; > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > - g_log_recursion_level--; > - > - if (fsize <= 0) > - return fsize; > - > - d += fsize; > - } > - } else { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > - return -1; > - } > - > - *src = s; > - return (d - dst); > -} > - > -/** > - * Unflatten a TCPA structure from a buffer in big-endian format > - * @type: TCPA structure type > - * @src: flattened data > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > - * Returns: Flattened size > - * Note: Returns flattened size NOT the unpacked structure size > - */ > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > - // check incoming parameters > - if (src == NULL) > - return 0; > - > - > - const BSG_BYTE* s = src; > - BSG_BYTE* d = dst ? *dst:NULL; > - if (dst && !d) > - dst = NULL; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > - > - BSG_UINT32 val = BSG_UnpackConst(s, size); > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > - case 2: *(unsigned short*) d = (unsigned short) val; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > - } > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > - if (dst) > - memcpy(d, s, size); > - > - d += size; > - s += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > - > - if (psize > BSG_MAX_BUF_SIZE) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > - BSG_MAX_BUF_SIZE); > - return -1; > - } > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > - } > - } > - > - s += size; > - d += size; > - > - BSG_BYTE* pdata = NULL; > - > - if (psize) { > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > - if (!pdata) > - return -1; > - > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) { > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > - } > - } > - s += psize * sizeof(BSG_HANDLE); > - } else { // If it's not psize handles, it's psize data. > - if (dst) { > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > - if (!pdata) > - return -1; > - memcpy(pdata, s, psize); > - } > - s += psize; > - } > - } > - if (dst) > - *(void**) d = pdata; > - > - d += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking! > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return -1; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > - return -1; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > - if (fsize <= 0) > - return fsize; > - s += fsize; > - } > - } > - > - if (dst) > - *dst = d; > - return (s - src); > -} > - > -/** > - * Free memory associated with unpacked TCPA structure > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * Note: Destroy should be called on all structures created with Unpack > - * to ensure that any allocated memory is freed > - */ > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > - BSG_BYTE* s = *src; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if ((src == NULL) || (*src == NULL)) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > - return; > - } > - > - if (format == __FMT_CONST || format == __FMT_DATA) > - s += size; > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > - s += size; > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > - free(ptr); > - s += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking, hence also for Destroy() > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return; > - } else if (format == 0) { > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > - return; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) > - BSG_Destroy_private((BSG_Type) *f, &s); > - } > - > - *src = s; > -} > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > -{ > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > - return BSG_Pack_private(type, &src2, dst); > -} > - > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > -{ > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > -} > - > -void BSG_Destroy(BSG_Type type, void* src) > -{ > - BSG_BYTE* src2 = (BSG_BYTE*) src; > - BSG_Destroy_private(type, &src2); > -} > - > -/** > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > - * @val: constant value > - * @size: constant size in bytes (1, 2, or 4) > - * @dst: (OUT) buffer > - */ > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > - > - switch (size) { > - case 4: > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[3] = (BSG_BYTE)(val & 0xff); > - break; > - case 2: > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[1] = (BSG_BYTE)(val & 0xff); > - break; > - case 1: > - dst[0] = (BSG_BYTE)(val & 0xff); > - break; > - } > -} > - > -/** > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > - * @src: buffer > - * @size: constant size in bytes (1, 2, or 4) > - */ > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > - BSG_UINT32 val = 0; > - > - if (src == NULL) > - return 0; > - > - switch (size) { > - case 4: > - val = (((BSG_UINT32) src[0]) << 24 > - | ((BSG_UINT32) src[1]) << 16 > - | ((BSG_UINT32) src[2]) << 8 > - | (BSG_UINT32) src[3]); > - break; > - case 2: > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > - break; > - case 1: > - val = (BSG_UINT32) src[0]; > - break; > - } > - return val; > -} > - > -// Pack a list of parameters. Beware not to send values, but rather you must > -// send a pointer to your values Instead. This includes UINT32's. > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > - int ParamNumber; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size=0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > - } > - > - va_end (paramList); > - > - return size; > -} > - > -// Unpack a list of parameters. > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size = 0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - > - size += BSG_Unpack(format, src + size, val); > - } > - > - va_end( paramList ); > - > - return size; > -} > - > -// Destroy any memory allocated by calls to unpack > -void BSG_DestroyList(int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type argType; > - BSG_BYTE* paramValue = NULL; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - argType = (BSG_Type) va_arg( paramList, int ); > - paramValue = va_arg( paramList, BSG_BYTE* ); > - > - BSG_Destroy(argType, paramValue); > - } > - > - va_end( paramList ); > - > - return; > -} > - > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > - int i; > - > - for (i = 0; i < numParams; i++) > - BSG_Destroy (params[i].type, params[i].addr); > - > - return TPM_SUCCESS; > -} > - > - > -// > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later > -// > - > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > - int size = BSG_Pack (type, src, NULL); > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - size = BSG_Pack(type, src, dest); > - *o_dst = dest; > - return size; > -} > - > - > - > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > - va_list args; > - int size; > - > - va_start (args, ParamCount); > - size = BSG_PackList (NULL, ParamCount, args); > - va_end (args); > - > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - va_start (args, ParamCount); > - size = BSG_PackList (dest, ParamCount, args); > - va_end (args); > - > - *outBuffer = dest; > - return size; > -} > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > deleted file mode 100644 > index 0896812..0000000 > --- a/tools/vtpm_manager/util/bsg.h > +++ /dev/null > @@ -1,166 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.h > -// > -// This file contains API's for the TPM Byte Stream functions > -// > -// ================================================================== > - > -#ifndef __BSG_H__ > -#define __BSG_H__ > - > -#include > -#include "buffer.h" > - > -typedef unsigned int BSG_UINT32; > -typedef unsigned char BSG_BYTE; > - > -// forward decl > -struct pack_const_tuple_t; > - > -struct pack_tuple_t; > - > - > -/** > - * Byte stream generator > - */ > -// this has to be manually kept in sync with the > -// s_fmt array!! > -// but now we have a self-check function which can make sure things are well > -// (if used!) > -typedef enum BSG_Type > -{ > - BSG_TYPE_FIRST = 1, > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > - // unused/special value > - BSG_TYPE_UINT16, > - BSG_TYPE_BYTE, > - BSG_TYPE_BOOL, > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > - // a pointer to that much data. can pass a > - // struct pack_buf_t as the param > - BSG_TPM_TAG, > - BSG_TPM_HANDLE, > - BSG_TPM_RESULT, > - BSG_TPM_RESOURCE_TYPE, > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_PROTOCOL_ID, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTHDATA, > - BSG_TPM_SECRET, > - BSG_TPM_ENCAUTH, > - BSG_TPM_PAYLOAD_TYPE, > - > - BSG_TPM_VERSION, > - BSG_TPM_DIGEST, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_NONCE, > - BSG_TPM_KEY_HANDLE, > - BSG_TPM_KEY_HANDLE_LIST, > - BSG_TPM_KEY_PARMS, > - BSG_TPM_RSA_KEY_PARMS, > - BSG_TPM_STORE_PUBKEY, > - BSG_TPM_PUBKEY, > - BSG_TPM_KEY, > - > - BSG_TPM_MIGRATIONKEYAUTH, > - BSG_TCPA_AUDIT_EVENT, > - BSG_TCPA_EVENT_CERT, > - BSG_TPM_PCR_SELECTION, > - BSG_TPM_PCR_COMPOSITE, > - BSG_TPM_PCR_INFO, > - BSG_TPM_STORED_DATA, > - BSG_TPM_SYMMETRIC_KEY, > - BSG_TPM_STORE_PRIVKEY, > - BSG_TPM_STORE_ASYMKEY, > - BSG_TPM_MIGRATE_ASYMKEY, > - BSG_TPM_QUOTE_INFO, > - BSG_TPM_IDENTITY_CONTENTS, > - BSG_TPM_PCRVALUE, > - BSG_TCPA_PCR_FLAGS, > - BSG_TCS_AUTH, > - > - // this is the BSG_TPM_KEY struct without the encData field > - BSG_TPM_KEY_NONSENSITIVE, > - > - BSG_PACKED, > - > - BSG_TYPE_MAX > -} BSG_Type; > - > -struct pack_const_tuple_t { > - BSG_Type type; > - const void * addr; > -}; > - > - > -typedef struct pack_tuple_t { > - BSG_Type type; > - void * addr; > -} pack_tuple_t; > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > -void BSG_Destroy(BSG_Type type, void* src); > - > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later. returns size of allocated buffer, or -1 in case > -// allocation failed > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > - > -// a va_list version of PackList > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > -void BSG_DestroyList(int ParamCount, ... ); > - > -// wrapper of PackList which uses a buffer_t > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > - > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > - > -BOOL BSG_static_selfcheck (); > - > -#endif > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > deleted file mode 100644 > index df48bc2..0000000 > --- a/tools/vtpm_manager/util/buffer.c > +++ /dev/null > @@ -1,226 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "buffer.h" > - > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > - > -// > -// buffer functions! > -// > - > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > - if (initsize == 0) { > - memset(buf, 0, sizeof(*buf)); > - return TPM_SUCCESS; > - } > - > - > - buf->bytes = (BYTE*) malloc (initsize); > - if (buf->bytes == NULL) > - return TPM_RESOURCES; > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - > - if (initval) > - memcpy (buf->bytes, initval, initsize); > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - buf->bytes = initval; > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > - buf->is_owner = TRUE; > - > - return status; > -} > - > - > - > -// make an alias to a constant array > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > - // TODO: try to enforce the const things somehow! > - buf->bytes = (BYTE*) val; > - buf->size = size; > - buf->alloc_size = 0; // this field is now unneeded > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t len) { > - if (offset + len > b->size) { > - return TPM_NOSPACE; > - } > - > - buf->bytes = b->bytes + offset; > - buf->size = len > 0 ? len : b->size - offset; > - > - //VS/ buf->alloc_size = 0; > - if (len ==0) > - buf->alloc_size = b->alloc_size - offset; > - else > - buf->alloc_size = MIN(b->alloc_size - offset, len); > - > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias buffer_t into bytestream, with given length > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > - > - buf->size = size; > - buf->alloc_size = size; > - buf->bytes = val; > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > - > - > -// copy into the start of dest > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > -{ > - TPM_RESULT status = TPM_SUCCESS; > - > - if (dest->alloc_size < src->size) { > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > - } > - > - memcpy (dest->bytes, src->bytes, src->size); > - dest->size = src->size; > - > - //VS/ dest->is_owner = TRUE; > - > - abort_egress: > - > - return status; > -} > - > - > - > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > -} > - > - > -void buffer_memset (buffer_t * buf, BYTE b) { > - memset (buf->bytes, b, buf->size); > -} > - > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (buf->alloc_size < buf->size + len) { > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > - } > - > - memcpy (buf->bytes + buf->size, bytes, len); > - > - buf->size += len; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -tpm_size_t buffer_len (const buffer_t* buf) { > - return buf->size; > -} > - > -TPM_RESULT buffer_free (buffer_t * buf) { > - if (buf && buf->is_owner && buf->bytes != NULL) { > - free (buf->bytes); > - buf->bytes = NULL; > - buf->size = buf->alloc_size = 0; > - > - } > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > - > - // we want to realloc to twice the size, or the new size, whichever > - // bigger > - > - BYTE * tmpbuf = NULL; > - > - newsize = MAX (buf->alloc_size * 2, newsize); > - > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > - if (tmpbuf == NULL) > - return TPM_SIZE; > - > - > - buf->bytes = tmpbuf; > - buf->alloc_size = newsize; > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > deleted file mode 100644 > index d8a9abc..0000000 > --- a/tools/vtpm_manager/util/buffer.h > +++ /dev/null > @@ -1,95 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_BUFFER_H__ > -#define __VTPM_BUFFER_H__ > - > -#include // for pointer NULL > -#include "tcg.h" > - > -typedef UINT32 tpm_size_t; > - > -// first version, probably will be expanded... > - > -#define NULL_BUF {0,0,0,0} > - > -typedef struct { > - // private!! > - tpm_size_t size, alloc_size; > - BYTE * bytes; > - > - BOOL is_owner; // do we own this buffer, and need to free it? > -} buffer_t; > - > -// allocate the buffer if initsize > 0, copying over initval if provided > -TPM_RESULT buffer_init (buffer_t * buf, > - tpm_size_t initsize, > - const BYTE* initval); > - > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > -TPM_RESULT buffer_init_convert (buffer_t * buf, > - tpm_size_t initsize, > - BYTE* initval); > - > -// make an alias to a constant array, no copying > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t); > - > -// make an alias buffer into a bytestream > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > - tpm_size_t size, BYTE* val); > - > -// "copy constructor" > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > - > - > -// copy into the start of a > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > - > -// are they equal? > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > - > -// set the buffer to a constant byte > -void buffer_memset (buffer_t * buf, BYTE b); > - > -tpm_size_t buffer_len (const buffer_t* buf); > - > -TPM_RESULT buffer_free (buffer_t * buf); > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > - > -#endif // _TOOLS_H_ > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > deleted file mode 100644 > index aff0e2b..0000000 > --- a/tools/vtpm_manager/util/hashtable.c > +++ /dev/null > @@ -1,316 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.c > - * - tools/blktap2/drivers/hashtable.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include > -#include > -#include > -#include > - > -/* > -Credit for primes table: Aaron Krowne > - http://br.endernet.org/~akrowne/ > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > -*/ > -static const unsigned int primes[] = { > -53, 97, 193, 389, > -769, 1543, 3079, 6151, > -12289, 24593, 49157, 98317, > -196613, 393241, 786433, 1572869, > -3145739, 6291469, 12582917, 25165843, > -50331653, 100663319, 201326611, 402653189, > -805306457, 1610612741 > -}; > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > -const float max_load_factor = 0.65; > - > -/*****************************************************************************/ > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashf) (void*), > - int (*eqf) (void*,void*)) > -{ > - struct hashtable *h; > - unsigned int pindex, size = primes[0]; > - /* Check requested hashtable isn't too large */ > - if (minsize > (1u << 30)) return NULL; > - /* Enforce size as prime */ > - for (pindex=0; pindex < prime_table_length; pindex++) { > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > - } > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > - if (NULL == h) return NULL; /*oom*/ > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > - memset(h->table, 0, size * sizeof(struct entry *)); > - h->tablelength = size; > - h->primeindex = pindex; > - h->entrycount = 0; > - h->hashfn = hashf; > - h->eqfn = eqf; > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_init(&h->mutex, NULL); > -#endif > - return h; > -} > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k) > -{ > - unsigned int i = h->hashfn(k); > - i += ~(i << 9); > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > - i += (i << 4); > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > - return i; > -} > - > -/*****************************************************************************/ > -static int > -hashtable_expand(struct hashtable *h) > -{ > - /* Double the size of the table to accomodate more entries */ > - struct entry **newtable; > - struct entry *e; > - struct entry **pE; > - unsigned int newsize, i, index; > - /* Check we're not hitting max capacity */ > - if (h->primeindex == (prime_table_length - 1)) return 0; > - newsize = primes[++(h->primeindex)]; > - > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > - if (NULL != newtable) > - { > - memset(newtable, 0, newsize * sizeof(struct entry *)); > - /* This algorithm is not 'stable'. ie. it reverses the list > - * when it transfers entries between the tables */ > - for (i = 0; i < h->tablelength; i++) { > - while (NULL != (e = h->table[i])) { > - h->table[i] = e->next; > - index = indexFor(newsize,e->h); > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - free(h->table); > - h->table = newtable; > - } > - /* Plan B: realloc instead */ > - else > - { > - newtable = (struct entry **) > - realloc(h->table, newsize * sizeof(struct entry *)); > - if (NULL == newtable) { (h->primeindex)--; return 0; } > - h->table = newtable; > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > - for (i = 0; i < h->tablelength; i++) { > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > - index = indexFor(newsize,e->h); > - if (index == i) > - { > - pE = &(e->next); > - } > - else > - { > - *pE = e->next; > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - } > - } > - h->tablelength = newsize; > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > - return -1; > -} > - > -/*****************************************************************************/ > -unsigned int > -hashtable_count(struct hashtable *h) > -{ > - unsigned int count; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - count = h->entrycount; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return count; > -} > - > -/*****************************************************************************/ > -int > -hashtable_insert(struct hashtable *h, void *k, void *v) > -{ > - /* This method allows duplicate keys - but they shouldn't be used */ > - unsigned int index; > - struct entry *e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - if (++(h->entrycount) > h->loadlimit) > - { > - /* Ignore the return value. If expand fails, we should > - * still try cramming just this value into the existing table > - * -- we may not have memory for a larger table, but one more > - * element may be ok. Next time we insert, we'll try expanding again.*/ > - hashtable_expand(h); > - } > - e = (struct entry *)malloc(sizeof(struct entry)); > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > - e->h = hash(h,k); > - index = indexFor(h->tablelength,e->h); > - e->k = k; > - e->v = v; > - e->next = h->table[index]; > - h->table[index] = e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return -1; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_search(struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - unsigned int hashvalue, index; > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - e = h->table[index]; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return e->v; > - } > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_remove(struct hashtable *h, void *k) > -{ > - /* TODO: consider compacting the table when the load factor drops enough, > - * or provide a 'compact' method. */ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - struct entry **pE; > - void *v; > - unsigned int hashvalue, index; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hash(h,k)); > - pE = &(h->table[index]); > - e = *pE; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - *pE = e->next; > - h->entrycount--; > - v = e->v; > - freekey(e->k); > - free(e); > - return v; > - } > - pE = &(e->next); > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -/* destroy */ > -void > -hashtable_destroy(struct hashtable *h, int free_values) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - unsigned int i; > - struct entry *e, *f; > - struct entry **table = h->table; > - if (free_values) > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > - } > - } > - else > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f); } > - } > - } > - free(h->table); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_destroy(&h->mutex); > -#endif > - free(h); > -} > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > deleted file mode 100644 > index dedc60a..0000000 > --- a/tools/vtpm_manager/util/hashtable.h > +++ /dev/null > @@ -1,204 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.h > - * - tools/blktap2/drivers/hashtable.h > - */ > - > -#ifndef __HASHTABLE_CWC22_H__ > -#define __HASHTABLE_CWC22_H__ > - > -struct hashtable; > - > -/* Example of use: > - * > - * struct hashtable *h; > - * struct some_key *k; > - * struct some_value *v; > - * > - * static unsigned int hash_from_key_fn( void *k ); > - * static int keys_equal_fn ( void *key1, void *key2 ); > - * > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > - * > - * (initialise k and v to suitable values) > - * > - * if (! hashtable_insert(h,k,v) ) > - * { exit(-1); } > - * > - * if (NULL == (found = hashtable_search(h,k) )) > - * { printf("not found!"); } > - * > - * if (NULL == (found = hashtable_remove(h,k) )) > - * { printf("Not found\n"); } > - * > - */ > - > -/* Macros may be used to define type-safe(r) hashtable access functions, with > - * methods specialized to take known key and value types as parameters. > - * > - * Example: > - * > - * Insert this at the start of your file: > - * > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > - * > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > - * These operate just like hashtable_insert etc., with the same parameters, > - * but their function signatures have 'struct some_key *' rather than > - * 'void *', and hence can generate compile time errors if your program is > - * supplying incorrect data as a key (and similarly for value). > - * > - * Note that the hash and key equality functions passed to create_hashtable > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > - * a difficult issue as they're only defined and passed once, and the other > - * functions will ensure that only valid keys are supplied to them. > - * > - * The cost for this checking is increased code size and runtime overhead > - * - if performance is important, it may be worth switching back to the > - * unsafe methods once your program has been debugged with the safe methods. > - * This just requires switching to some simple alternative defines - eg: > - * #define insert_some hashtable_insert > - * > - */ > - > -/***************************************************************************** > - * create_hashtable > - > - * @name create_hashtable > - * @param minsize minimum initial size of hashtable > - * @param hashfunction function for hashing keys > - * @param key_eq_fn function for determining key equality > - * @return newly created hashtable or NULL on failure > - */ > - > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashfunction) (void*), > - int (*key_eq_fn) (void*,void*)); > - > -/***************************************************************************** > - * hashtable_insert > - > - * @name hashtable_insert > - * @param h the hashtable to insert into > - * @param k the key - hashtable claims ownership and will free on removal > - * @param v the value - does not claim ownership > - * @return non-zero for successful insertion > - * > - * This function will cause the table to expand if the insertion would take > - * the ratio of entries to table size over the maximum load factor. > - * > - * This function does not check for repeated insertions with a duplicate key. > - * The value returned when using a duplicate key is undefined -- when > - * the hashtable changes size, the order of retrieval of duplicate key > - * entries is reversed. > - * If in doubt, remove before insert. > - */ > - > -int > -hashtable_insert(struct hashtable *h, void *k, void *v); > - > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > -{ \ > - return hashtable_insert(h,k,v); \ > -} > - > -/***************************************************************************** > - * hashtable_search > - > - * @name hashtable_search > - * @param h the hashtable to search > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * > -hashtable_search(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_search(h,k)); \ > -} > - > -/***************************************************************************** > - * hashtable_remove > - > - * @name hashtable_remove > - * @param h the hashtable to remove the item from > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * /* returns value */ > -hashtable_remove(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_remove(h,k)); \ > -} > - > - > -/***************************************************************************** > - * hashtable_count > - > - * @name hashtable_count > - * @param h the hashtable > - * @return the number of items stored in the hashtable > - */ > -unsigned int > -hashtable_count(struct hashtable *h); > - > - > -/***************************************************************************** > - * hashtable_destroy > - > - * @name hashtable_destroy > - * @param h the hashtable > - * @param free_values whether to call 'free' on the remaining values > - */ > - > -void > -hashtable_destroy(struct hashtable *h, int free_values); > - > -#endif /* __HASHTABLE_CWC22_H__ */ > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > deleted file mode 100644 > index dcf42c8..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.c > +++ /dev/null > @@ -1,236 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include "hashtable_itr.h" > -#include /* defines NULL */ > - > -/*****************************************************************************/ > -/* hashtable_iterator - iterator constructor */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h) > -{ > - unsigned int i, tablelength; > - struct hashtable_itr *itr = (struct hashtable_itr *) > - malloc(sizeof(struct hashtable_itr)); > - if (NULL == itr) return NULL; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - itr->h = h; > - itr->e = NULL; > - itr->parent = NULL; > - tablelength = h->tablelength; > - itr->index = tablelength; > - if (0 == h->entrycount) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > - } > - > - for (i = 0; i < tablelength; i++) > - { > - if (NULL != h->table[i]) > - { > - itr->e = h->table[i]; > - itr->index = i; > - break; > - } > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > -} > - > -/*****************************************************************************/ > -/* key - return the key of the (key,value) pair at the current position */ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void * > -hashtable_iterator_key(struct hashtable_itr *i) > -{ return i->e->k; } > - > -void * > -hashtable_iterator_value(struct hashtable_itr *i) > -{ return i->e->v; } > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - unsigned int j,tablelength; > - struct entry **table; > - struct entry *next; > - int ret; > - if (NULL == itr->e) { /* stupidity check */ > - ret = 0; > - goto egress; > - } > - > - next = itr->e->next; > - if (NULL != next) > - { > - itr->parent = itr->e; > - itr->e = next; > - ret = -1; > - goto egress; > - } > - > - tablelength = itr->h->tablelength; > - itr->parent = NULL; > - if (tablelength <= (j = ++(itr->index))) > - { > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - table = itr->h->table; > - while (NULL == (next = table[j])) > - { > - if (++j >= tablelength) > - { > - itr->index = tablelength; > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - } > - itr->index = j; > - itr->e = next; > - ret = -1; > - > - egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -/* remove - remove the entry at the current iterator position > - * and advance the iterator, if there is a successive > - * element. > - * If you want the value, read it before you remove: > - * beware memory leaks if you don't. > - * Returns zero if end of iteration. */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - struct entry *remember_e, *remember_parent; > - int ret; > - > - /* Do the removal */ > - if (NULL == (itr->parent)) > - { > - /* element is head of a chain */ > - itr->h->table[itr->index] = itr->e->next; > - } else { > - /* element is mid-chain */ > - itr->parent->next = itr->e->next; > - } > - /* itr->e is now outside the hashtable */ > - remember_e = itr->e; > - itr->h->entrycount--; > - freekey(remember_e->k); > - > - /* Advance the iterator, correcting the parent */ > - remember_parent = itr->parent; > - ret = hashtable_iterator_advance(itr); > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > - free(remember_e); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -int /* returns zero if not found */ > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e, *parent; > - unsigned int hashvalue, index; > - int ret; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - > - e = h->table[index]; > - parent = NULL; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - itr->index = index; > - itr->e = e; > - itr->parent = parent; > - itr->h = h; > - ret= -1; > - goto egress; > - } > - parent = e; > - e = e->next; > - } > - ret = 0; > - > -egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return ret; > -} > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > deleted file mode 100644 > index 35654e0..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.h > +++ /dev/null > @@ -1,109 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.h > - */ > - > - > -#ifndef __HASHTABLE_ITR_CWC22__ > -#define __HASHTABLE_ITR_CWC22__ > -#include "hashtable.h" > -#include "hashtable_private.h" /* needed to enable inlining */ > - > -/*****************************************************************************/ > -/* This struct is only concrete here to allow the inlining of two of the > - * accessor functions. */ > -struct hashtable_itr > -{ > - struct hashtable *h; > - struct entry *e; > - struct entry *parent; > - unsigned int index; > -}; > - > - > -/*****************************************************************************/ > -/* hashtable_iterator > - */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h); > - > -/*****************************************************************************/ > -/* hashtable_iterator_key > - * - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_key(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_value(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* remove - remove current element and advance the iterator to the next element > - * NB: if you need the value to free it, read it before > - * removing. ie: beware memory leaks! > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* search - overwrite the supplied iterator, to point to the entry > - * matching the supplied key. > - h points to the hashtable to be searched. > - * returns zero if not found. */ > -int > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > -{ \ > - return (hashtable_iterator_search(i,h,k)); \ > -} > - > - > - > -#endif /* __HASHTABLE_ITR_CWC22__*/ > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > deleted file mode 100644 > index d87a7f9..0000000 > --- a/tools/vtpm_manager/util/hashtable_private.h > +++ /dev/null > @@ -1,96 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable_private.h > - * - tools/blktap2/drivers/hashtable_private.h > - */ > - > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > -#define __HASHTABLE_PRIVATE_CWC22_H__ > - > -#include "hashtable.h" > -#ifdef HASHTABLE_THREADED > -#include > -#endif > - > -/*****************************************************************************/ > -struct entry > -{ > - void *k, *v; > - unsigned int h; > - struct entry *next; > -}; > - > -struct hashtable { > - unsigned int tablelength; > - struct entry **table; > - unsigned int entrycount; > - unsigned int loadlimit; > - unsigned int primeindex; > - unsigned int (*hashfn) (void *k); > - int (*eqfn) (void *k1, void *k2); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_t mutex; > -#endif > -}; > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k); > - > -/*****************************************************************************/ > -/* indexFor */ > -static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > - return (hashvalue % tablelength); > -}; > - > -/* Only works if tablelength == 2^N */ > -/*static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) > -{ > - return (hashvalue & (tablelength - 1u)); > -} > -*/ > - > -/*****************************************************************************/ > -#define freekey(X) free(X) > -/*define freekey(X) ; */ > - > - > -/*****************************************************************************/ > - > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > deleted file mode 100644 > index 75fe91a..0000000 > --- a/tools/vtpm_manager/util/log.c > +++ /dev/null > @@ -1,142 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > - > -#include "buffer.h" > -#include "tcg.h" > - > -// Helper code for the consts, eg. to produce messages for error codes. > - > -typedef struct error_code_entry_t { > - TPM_RESULT code; > - char * code_name; > - char * msg; > -} error_code_entry_t; > - > -static const error_code_entry_t error_msgs [] = { > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > - > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > -}; > - > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code) { > - // just do a linear scan for now > - unsigned i; > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > - if (code == error_msgs[i].code) > - return error_msgs[i].code_name; > - > - return("Unknown Error Code"); > -} > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > deleted file mode 100644 > index 1f15f5b..0000000 > --- a/tools/vtpm_manager/util/log.h > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_LOG_H__ > -#define __VTPM_LOG_H__ > - > -#include // for uint32_t > -#include // for pointer NULL > - > -// =========================== LOGGING ============================== > - > -// the logging module numbers > -#define VTPM_LOG_CRYPTO 1 > -#define VTPM_LOG_BSG 2 > -#define VTPM_LOG_TXDATA 3 > -#define VTPM_LOG_TCS 4 > -#define VTPM_LOG_TCS_DEEP 5 > -#define VTPM_LOG_VTSP 6 > -#define VTPM_LOG_VTPM 7 > -#define VTPM_LOG_VTPM_DEEP 8 > -#define VTPM_LOG_VTSP_DEEP 9 > - > -static char *module_names[] = { "", > - "CRYPTO", > - "BSG", > - "TXDATA", > - "TCS", > - "TCS", > - "VTSP", > - "VTPM", > - "VTPM", > - "VTSP" > - }; > - > -// Default to standard logging > -#ifndef LOGGING_MODULES > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > -#endif > - > -// bit-access macros > -#define BITMASK(idx) ( 1U << (idx) ) > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > - > -#define vtpmloginfo(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > - } > - > -#define vtpmloginfomore(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, fmt,##args); \ > - } > - > -#define vtpmlogerror(module, fmt, args...) \ > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > - > -//typedef UINT32 tpm_size_t; > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code); > - > -#endif // _VTPM_LOG_H_ > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > deleted file mode 100644 > index 5c42913..0000000 > --- a/tools/vtpm_manager/util/tcg.h > +++ /dev/null > @@ -1,503 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcg.h > -// > -// This file contains all the structure and type definitions > -// > -// ================================================================== > - > -#ifndef __TCG_H__ > -#define __TCG_H__ > - > -// This pragma is used to disallow structure padding > -#pragma pack(push, 1) > - > -// *************************** TYPEDEFS ********************************* > -typedef unsigned char BYTE; > -typedef unsigned char BOOL; > -typedef unsigned short UINT16; > -typedef unsigned int UINT32; > -typedef unsigned long long UINT64; > - > -typedef UINT32 TPM_RESULT; > -typedef UINT32 TPM_PCRINDEX; > -typedef UINT32 TPM_DIRINDEX; > -typedef UINT32 TPM_HANDLE; > -typedef TPM_HANDLE TPM_AUTHHANDLE; > -typedef TPM_HANDLE TCPA_HASHHANDLE; > -typedef TPM_HANDLE TCPA_HMACHANDLE; > -typedef TPM_HANDLE TCPA_ENCHANDLE; > -typedef TPM_HANDLE TPM_KEY_HANDLE; > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > -typedef UINT32 TPM_RESOURCE_TYPE; > -typedef UINT32 TPM_COMMAND_CODE; > -typedef UINT16 TPM_PROTOCOL_ID; > -typedef BYTE TPM_AUTH_DATA_USAGE; > -typedef UINT16 TPM_ENTITY_TYPE; > -typedef UINT32 TPM_ALGORITHM_ID; > -typedef UINT16 TPM_KEY_USAGE; > -typedef UINT16 TPM_STARTUP_TYPE; > -typedef UINT32 TPM_CAPABILITY_AREA; > -typedef UINT16 TPM_ENC_SCHEME; > -typedef UINT16 TPM_SIG_SCHEME; > -typedef UINT16 TPM_MIGRATE_SCHEME; > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > -typedef UINT32 TPM_KEY_FLAGS; > - > -#define TPM_DIGEST_SIZE 20 // Don't change this > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > -typedef TPM_AUTHDATA TPM_SECRET; > -typedef TPM_AUTHDATA TPM_ENCAUTH; > -typedef BYTE TPM_PAYLOAD_TYPE; > -typedef UINT16 TPM_TAG; > - > -// Data Types of the TCS > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > - > -// ************************* STRUCTURES ********************************** > - > -typedef struct TPM_VERSION { > - BYTE major; > - BYTE minor; > - BYTE revMajor; > - BYTE revMinor; > -} TPM_VERSION; > - > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > - > -typedef struct TPM_DIGEST { > - BYTE digest[TPM_DIGEST_SIZE]; > -} TPM_DIGEST; > - > -typedef TPM_DIGEST TPM_PCRVALUE; > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > -typedef TPM_DIGEST TPM_DIRVALUE; > -typedef TPM_DIGEST TPM_HMAC; > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > - > -typedef struct TPM_NONCE { > - BYTE nonce[TPM_DIGEST_SIZE]; > -} TPM_NONCE; > - > -typedef struct TPM_KEY_PARMS { > - TPM_ALGORITHM_ID algorithmID; > - TPM_ENC_SCHEME encScheme; > - TPM_SIG_SCHEME sigScheme; > - UINT32 parmSize; > - BYTE* parms; > -} TPM_KEY_PARMS; > - > -typedef struct TPM_RSA_KEY_PARMS { > - UINT32 keyLength; > - UINT32 numPrimes; > - UINT32 exponentSize; > - BYTE* exponent; > -} TPM_RSA_KEY_PARMS; > - > -typedef struct TPM_STORE_PUBKEY { > - UINT32 keyLength; > - BYTE* key; > -} TPM_STORE_PUBKEY; > - > -typedef struct TPM_PUBKEY { > - TPM_KEY_PARMS algorithmParms; > - TPM_STORE_PUBKEY pubKey; > -} TPM_PUBKEY; > - > -typedef struct TPM_KEY { > - TPM_VERSION ver; > - TPM_KEY_USAGE keyUsage; > - TPM_KEY_FLAGS keyFlags; > - TPM_AUTH_DATA_USAGE authDataUsage; > - TPM_KEY_PARMS algorithmParms; > - UINT32 PCRInfoSize; > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > - TPM_STORE_PUBKEY pubKey; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_KEY; > - > -typedef struct TPM_PCR_SELECTION { > - UINT16 sizeOfSelect; /// in bytes > - BYTE* pcrSelect; > -} TPM_PCR_SELECTION; > - > -typedef struct TPM_PCR_COMPOSITE { > - TPM_PCR_SELECTION select; > - UINT32 valueSize; > - TPM_PCRVALUE* pcrValue; > -} TPM_PCR_COMPOSITE; > - > - > -typedef struct TPM_PCR_INFO { > - TPM_PCR_SELECTION pcrSelection; > - TPM_COMPOSITE_HASH digestAtRelease; > - TPM_COMPOSITE_HASH digestAtCreation; > -} TPM_PCR_INFO; > - > - > -typedef struct TPM_BOUND_DATA { > - TPM_VERSION ver; > - TPM_PAYLOAD_TYPE payload; > - BYTE* payloadData; > -} TPM_BOUND_DATA; > - > -typedef struct TPM_STORED_DATA { > - TPM_VERSION ver; > - UINT32 sealInfoSize; > - BYTE* sealInfo; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_STORED_DATA; > - > -typedef struct TCS_AUTH { > - TCS_AUTHHANDLE AuthHandle; > - TPM_NONCE NonceOdd; // system > - TPM_NONCE NonceEven; // TPM > - BOOL fContinueAuthSession; > - TPM_AUTHDATA HMAC; > -} TCS_AUTH; > - > -// structures for dealing with sizes followed by buffers in all the > -// TCG structure. > -typedef struct pack_buf_t { > - UINT32 size; > - BYTE * data; > -} pack_buf_t; > - > -typedef struct pack_constbuf_t { > - UINT32 size; > - const BYTE* data; > -} pack_constbuf_t; > - > - > - > -// **************************** CONSTANTS ********************************* > - > -// BOOL values > -#define TRUE 0x01 > -#define FALSE 0x00 > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -// > -// TPM_COMMAND_CODE values > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > -#define TPM_VENDOR_ORDINAL 0x20000000UL > - > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > - > - > - > -// > -// TPM_RESULT values > -// > -// just put in the whole table from spec 1.2 > - > -#define TPM_BASE 0x0 // The start of TPM return codes > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > - > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > - > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > - > -// TPM_STARTUP_TYPE values > -#define TPM_ST_CLEAR 0x0001 > -#define TPM_ST_STATE 0x0002 > -#define TPM_ST_DEACTIVATED 0x003 > - > -// TPM_TAG values > -#define TPM_TAG_RQU_COMMAND 0x00c1 > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > -#define TPM_TAG_RSP_COMMAND 0x00c4 > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > - > -// TPM_PAYLOAD_TYPE values > -#define TPM_PT_ASYM 0x01 > -#define TPM_PT_BIND 0x02 > -#define TPM_PT_MIGRATE 0x03 > -#define TPM_PT_MAINT 0x04 > -#define TPM_PT_SEAL 0x05 > - > -// TPM_ENTITY_TYPE values > -#define TPM_ET_KEYHANDLE 0x0001 > -#define TPM_ET_OWNER 0x0002 > -#define TPM_ET_DATA 0x0003 > -#define TPM_ET_SRK 0x0004 > -#define TPM_ET_KEY 0x0005 > - > -/// TPM_ResourceTypes > -#define TPM_RT_KEY 0x00000001 > -#define TPM_RT_AUTH 0x00000002 > -#define TPM_RT_TRANS 0x00000004 > -#define TPM_RT_CONTEXT 0x00000005 > - > -// TPM_PROTOCOL_ID values > -#define TPM_PID_OIAP 0x0001 > -#define TPM_PID_OSAP 0x0002 > -#define TPM_PID_ADIP 0x0003 > -#define TPM_PID_ADCP 0x0004 > -#define TPM_PID_OWNER 0x0005 > - > -// TPM_ALGORITHM_ID values > -#define TPM_ALG_RSA 0x00000001 > -#define TPM_ALG_DES 0x00000002 > -#define TPM_ALG_3DES 0X00000003 > -#define TPM_ALG_SHA 0x00000004 > -#define TPM_ALG_HMAC 0x00000005 > -#define TCPA_ALG_AES 0x00000006 > - > -// TPM_ENC_SCHEME values > -#define TPM_ES_NONE 0x0001 > -#define TPM_ES_RSAESPKCSv15 0x0002 > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// TPM_SIG_SCHEME values > -#define TPM_SS_NONE 0x0001 > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > - > -// TPM_KEY_USAGE values > -#define TPM_KEY_EK 0x0000 > -#define TPM_KEY_SIGNING 0x0010 > -#define TPM_KEY_STORAGE 0x0011 > -#define TPM_KEY_IDENTITY 0x0012 > -#define TPM_KEY_AUTHCHANGE 0X0013 > -#define TPM_KEY_BIND 0x0014 > -#define TPM_KEY_LEGACY 0x0015 > - > -// TPM_AUTH_DATA_USAGE values > -#define TPM_AUTH_NEVER 0x00 > -#define TPM_AUTH_ALWAYS 0x01 > - > -// Key Handle of owner and srk > -#define TPM_OWNER_KEYHANDLE 0x40000001 > -#define TPM_SRK_KEYHANDLE 0x40000000 > - > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > - > -#include > - > -// FIXME: Review use of these and delete unneeded ones. > - > -// these are really badly dependent on local structure: > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -#define ERRORDIE(s) do { status = s; \ > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > - goto abort_egress; } \ > - while (0) > - > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -// Try command c. If it fails, set status to s and goto abort. > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > - status = s; \ > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } else {\ > - status = c; \ > - } > - > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > -#define TPMTRYRETURN(c) do { status = c; \ > - if (status != TPM_SUCCESS) { \ > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } \ > - } while(0) > - > - > -#pragma pack(pop) > - > -#endif //__TCPA_H__ > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > index 3b89223..0ba1d55 100644 > --- a/tools/xenstore/hashtable.c > +++ b/tools/xenstore/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > index 8e6bb5b..4d68223 100644 > --- a/tools/xenstore/hashtable.h > +++ b/tools/xenstore/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > index cabaffe..a08559d 100644 > --- a/tools/xenstore/hashtable_private.h > +++ b/tools/xenstore/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > index ad1eb78..c142140 100644 > --- a/tools/xm-test/configure.ac > +++ b/tools/xm-test/configure.ac > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > tests/unpause/Makefile > tests/vcpu-pin/Makefile > tests/vcpu-disable/Makefile > - tests/vtpm/Makefile > tests/xapi/Makefile > tests/enforce_dom0_cpus/Makefile > tests/cpupool/Makefile > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > index f0516b2..e04591b 100644 > --- a/tools/xm-test/grouptest/default > +++ b/tools/xm-test/grouptest/default > @@ -27,5 +27,4 @@ sysrq > unpause > vcpu-disable > vcpu-pin > -vtpm > xapi > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > index bafc988..5c3e1b1 100644 > --- a/tools/xm-test/grouptest/medium > +++ b/tools/xm-test/grouptest/medium > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > unpause > vcpu-disable > vcpu-pin > -vtpm > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > index 3b04921..7a08b77 100644 > --- a/tools/xm-test/grouptest/xapi > +++ b/tools/xm-test/grouptest/xapi > @@ -1,2 +1 @@ > xapi > -vtpm 09_vtpm-xapi.test > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > index ae8c550..3ba7433 100644 > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > @@ -59,7 +59,6 @@ class XenConfig: > # These options need to be lists > self.defaultOpts["disk"] = [] > self.defaultOpts["vif"] = [] > - self.defaultOpts["vtpm"] = [] > > self.opts = self.defaultOpts > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > index 8d673ed..455f50c 100644 > --- a/tools/xm-test/tests/Makefile.am > +++ b/tools/xm-test/tests/Makefile.am > @@ -25,7 +25,6 @@ SUBDIRS = \ > unpause \ > vcpu-disable \ > vcpu-pin \ > - vtpm \ > enforce_dom0_cpus \ > save restore migrate \ > cpupool > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > deleted file mode 100644 > index dfd1227..0000000 > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > +++ /dev/null > @@ -1,40 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# verify list > - > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > - > -try: > - domain.start(noConsole=True) > -except DomainError, e: > - if verbose: > - print e.extra > - vtpm_cleanup(domain.getName()) > - FAIL("Unable to create domain") > - > - > -domName = domain.getName() > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > -eyecatcher = "/local/domain/0/backend/vtpm" > -where = output.find(eyecatcher) > -if status != 0: > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > -elif where < 0: > - FAIL("Fail to list virtual TPM device") > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > deleted file mode 100644 > index a18cbab..0000000 > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > +++ /dev/null > @@ -1,49 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -domain.closeConsole() > - > -domain.stop() > - > -if not re.search("PCR-00:",run["output"]): > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > deleted file mode 100644 > index b863f27..0000000 > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > +++ /dev/null > @@ -1,99 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > deleted file mode 100644 > index ccc8b73..0000000 > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > deleted file mode 100644 > index 57b87df..0000000 > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > deleted file mode 100644 > index c70691d..0000000 > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > +++ /dev/null > @@ -1,125 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again and validate extended pcr > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > deleted file mode 100644 > index 4ff3360..0000000 > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > deleted file mode 100644 > index 27125fc..0000000 > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > deleted file mode 100644 > index a1aa8b3..0000000 > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > +++ /dev/null > @@ -1,158 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Test to test the vtpm class through the Xen-API > -# > -# Tested methods: > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > -# create, destroy, get_VM > -# VM: get_VTPMS > - > -from XmTestLib import xapi > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > - > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > - > -try: > - # XmTestAPIDomain tries to establish a connection to XenD > - domain = XmTestAPIDomain() > -except Exception, e: > - SKIP("Skipping test. Error: %s" % str(e)) > -vm_uuid = domain.get_uuid() > - > -vtpmcfg = {} > -vtpmcfg['backend'] = DOM0_UUID > -vtpmcfg['VM'] = vm_uuid > - > -session = xapi.connect() > - > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > - > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > -if vtpm_be != vtpmcfg['backend']: > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > - (vtpm_be, vtpmcfg['backend'])) > - > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > - > -miss_keys = [] > -for k in VTPM_RECORD_KEYS: > - if k not in vtpm_rec.keys(): > - miss_keys.append(k) > -if len(miss_keys) > 0: > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > - > -if vtpm_rec['uuid'] != vtpm_uuid: > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > - (vtpm_rec['uuid'], vtpm_uuid)) > -if vtpm_rec['VM'] != vm_uuid: > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > - (vtpm_rec['VM'], vm_uuid)) > -if vtpm_rec['backend'] != vtpmcfg['backend']: > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > - (vtpm_rev['backend'], vtpmcfg['backend'])) > - > -badkeys = [] > -keys = vtpm_rec.keys() > -for k in keys: > - if k not in VTPM_RECORD_KEYS: > - badkeys.append(k) > -if len(badkeys) > 0: > - FAIL("Unexpected attributes in result: %s" % badkeys) > - > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > - (vm_ref, vm_uuid)) > - > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > -if uuid != vtpm_uuid: > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > - (uuid, vtpm_uuid)) > - > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > -if vtpm_ref != vtpm_uuid: > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > - (vtpm_ref, vtpm_uuid)) > - > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > -if len(vm_vtpms) != 1: > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > - (len(vm_vtpms), 1)) > -if vtpm_uuid not in vm_vtpms: > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > - (vm_vtpms[0], vtpm_uuid)) > - > -try: > - console = domain.start() > -except DomainError, e: > - FAIL("Unable to create domain.") > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("1. No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #Should never get here > - FAIL("Could destroy vTPM while VM is running") > -except: > - pass > - > -rc = session.xenapi.VM.suspend(vm_uuid) > -if rc: > - FAIL("Could not suspend VM") > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #May not throw an exception in 'suspend' state > -except: > - pass > - > -rc = session.xenapi.VM.resume(vm_uuid, False) > -if rc: > - FAIL("Could not resume VM") > - > -try: > - console = domain.getConsole() > -except ConsoleError, e: > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -domain.stop() > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > -except: > - FAIL("Could NOT destroy vTPM while domain is halted.") > - > -domain.destroy() > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > deleted file mode 100644 > index dd67e45..0000000 > --- a/tools/xm-test/tests/vtpm/Makefile.am > +++ /dev/null > @@ -1,27 +0,0 @@ > -SUBDIRS = > - > -TESTS = 01_vtpm-list_pos.test \ > - 02_vtpm-cat_pcrs.test \ > - 03_vtpm-susp_res.test \ > - 04_vtpm-loc_migr.test \ > - 05_vtpm-loc_migr.test \ > - 06_vtpm-susp_res_pcrs.test \ > - 07_vtpm-mig_pcrs.test \ > - 08_vtpm-mig_pcrs.test \ > - 09_vtpm-xapi.test > - > -XFAIL_TESTS = > - > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > -TESTS_ENVIRONMENT=@TENV@ > - > -%.test: %.py > - cp $< $@ > - chmod +x $@ > - > -clean-local: am_config_clean-local > - > -am_config_clean-local: > - rm -f *test > - rm -f *log > - rm -f *~ > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > deleted file mode 100644 > index 4e5b281..0000000 > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > +++ /dev/null > @@ -1,30 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -from XmTestLib import * > - > -if ENABLE_HVM_SUPPORT: > - SKIP("vtpm tests not supported for HVM domains") > - > -status, output = traceCommand("COLUMNS=200 ; " > - "ps aux | grep vtpm_manager | grep -v grep") > -if output == "": > - SKIP("virtual TPM manager must be started to run this test; might " > - "need /dev/tpm0") > - > -def vtpm_cleanup(domName): > - traceCommand("/etc/xen/scripts/vtpm-delete " > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > - str(domid(domName))) > - > -def vtpm_cleanup(uuid): > - from xen.xm import main > - if main.serverType != main.SERVER_XEN_API: > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > - > -def vtpm_get_uuid(domainid): > - s, o = traceCommand("xenstore-read " > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > - return o > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:05:54 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:05:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI3N-0006Nu-Od; Tue, 13 Nov 2012 15:05:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYHxC-0005lh-Ty for xen-devel@lists.xen.org; Tue, 13 Nov 2012 14:59:08 +0000 Received: from [85.158.143.35:25878] by server-3.bemta-4.messagelabs.com id 91/14-06841-A3062A05; Tue, 13 Nov 2012 14:59:06 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-10.tower-21.messagelabs.com!1352818741!10180088!1 X-Originating-IP: [128.244.251.36] X-SpamReason: No, hits=0.0 required=7.0 tests=Mail larger than max spam size X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18927 invoked from network); 13 Nov 2012 14:59:02 -0000 Received: from pilot.jhuapl.edu (HELO jhuapl.edu) (128.244.251.36) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 14:59:02 -0000 Received: from ([128.244.198.91]) by pilot.jhuapl.edu with ESMTP with TLS id 63GHCH1.157225253; Tue, 13 Nov 2012 09:58:46 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Tue, 13 Nov 2012 09:58:45 -0500 From: "Fioravante, Matthew E." To: Ian Campbell Date: Tue, 13 Nov 2012 09:58:44 -0500 Thread-Topic: [PATCH VTPM 6/9] Remove the vtpm process model Thread-Index: Ac3BjIxWUEqURI64SYK1F0IkeLy95AAIq4wg Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> In-Reply-To: <1352803755.7491.47.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 13 Nov 2012 15:05:28 +0000 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Should I have removed vtpm from xm also? I left it alone because xm is depcrecated. -----Original Message----- From: Ian Campbell [mailto:Ian.Campbell@citrix.com] Sent: Tuesday, November 13, 2012 5:49 AM To: Fioravante, Matthew E. Cc: xen-devel@lists.xen.org; Stefano Stabellini Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model On Thu, 2012-11-01 at 20:35 +0000, Matthew Fioravante wrote: > Remove the old vtpm process model. It doesn't work very > well and is no longer supported. > > Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell > > diff --git a/tools/Makefile b/tools/Makefile > index d8c8cc0..2ca43b9 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -18,8 +18,6 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils > SUBDIRS-$(CONFIG_X86) += firmware > SUBDIRS-y += console > SUBDIRS-y += xenmon > -SUBDIRS-$(VTPM_TOOLS) += vtpm_manager > -SUBDIRS-$(VTPM_TOOLS) += vtpm > SUBDIRS-y += xenstat > SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) > SUBDIRS-$(CONFIG_Linux) += memshr > diff --git a/tools/blktap2/drivers/hashtable.c b/tools/blktap2/drivers/hashtable.c > index 631306b..90a6b85 100644 > --- a/tools/blktap2/drivers/hashtable.c > +++ b/tools/blktap2/drivers/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable.h b/tools/blktap2/drivers/hashtable.h > index 89aa3dc..56ca053 100644 > --- a/tools/blktap2/drivers/hashtable.h > +++ b/tools/blktap2/drivers/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/blktap2/drivers/hashtable_itr.c b/tools/blktap2/drivers/hashtable_itr.c > index 402e06b..731917c 100644 > --- a/tools/blktap2/drivers/hashtable_itr.c > +++ b/tools/blktap2/drivers/hashtable_itr.c > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.c > - */ > - > #include "hashtable.h" > #include "hashtable_private.h" > #include "hashtable_itr.h" > diff --git a/tools/blktap2/drivers/hashtable_itr.h b/tools/blktap2/drivers/hashtable_itr.h > index 3d80638..81da838 100644 > --- a/tools/blktap2/drivers/hashtable_itr.h > +++ b/tools/blktap2/drivers/hashtable_itr.h > @@ -1,10 +1,5 @@ > /* Copyright (C) 2002, 2004 Christopher Clark */ > > -/* > - * There are duplicates of this code in: > - * - tools/vtpm_manager/util/hashtable_itr.h > - */ > - > #ifndef __HASHTABLE_ITR_CWC22__ > #define __HASHTABLE_ITR_CWC22__ > #include "hashtable.h" > diff --git a/tools/blktap2/drivers/hashtable_private.h b/tools/blktap2/drivers/hashtable_private.h > index 5a13a65..954ecc3 100644 > --- a/tools/blktap2/drivers/hashtable_private.h > +++ b/tools/blktap2/drivers/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/xenstore/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/configure.ac b/tools/configure.ac > index e708f01..586313d 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -40,7 +40,6 @@ m4_include([m4/fetcher.m4]) > # Enable/disable options > AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) > AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) > -AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) > AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) > AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) > AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) > diff --git a/tools/examples/README b/tools/examples/README > index 5b0314e..2225d5c 100644 > --- a/tools/examples/README > +++ b/tools/examples/README > @@ -25,13 +25,7 @@ vif-bridge - virtual network start/stop script in bridged mode > vif-common.sh - sourced by vif-bridge > vif-nat - xen virtual network start/stop script in NAT mode > vif-route - xen virtual network start/stop script in routed mode > -vtpm - called by xen-backend.agent to bind/unbind vTPM devices > -vtpm-common.sh - common code for vTPM handling > -vtpm-delete - remove an entry from the vTPM table given the > - domain's name > -vtpm-hotplug-common.sh - sourced by vtpm > -vtpm-migration.sh - sourced by external-device-migrate > -xen-backend.agent - calls block, vif-*, vtpm scripts to add, remove, hotplug > +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug > devices > xen-backend.rules - hotplug script rules > xend-config.sxp - default xend configuration file > diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub > index 85f847c..e04e6c1 100644 > --- a/tools/examples/xmexample.pv-grub > +++ b/tools/examples/xmexample.pv-grub > @@ -105,20 +105,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Configure the behaviour when a domain exits. There are three 'reasons' > # for a domain to stop: poweroff, reboot, and crash. For each of these you > # may specify: > diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 > index 330aaf0..c951200 100644 > --- a/tools/examples/xmexample1 > +++ b/tools/examples/xmexample1 > @@ -101,20 +101,6 @@ disk = [ 'phy:hda1,hda1,w' ] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = [ 'instance=1,backend=0' ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 > index 4e5eb3d..8c5137e 100644 > --- a/tools/examples/xmexample2 > +++ b/tools/examples/xmexample2 > @@ -137,20 +137,6 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 > index dc22ce1..ae799f9 100644 > --- a/tools/examples/xmexample3 > +++ b/tools/examples/xmexample3 > @@ -122,20 +122,6 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] > # configured in xend-config.sxp. > > #---------------------------------------------------------------------------- > -# Define to which TPM instance the user domain should communicate. > -# The vtpm entry is of the form 'instance=INSTANCE,backend=DOM' > -# where INSTANCE indicates the instance number of the TPM the VM > -# should be talking to and DOM provides the domain where the backend > -# is located. > -# Note that no two virtual machines should try to connect to the same > -# TPM instance. The handling of all TPM instances does require > -# some management effort in so far that VM configration files (and thus > -# a VM) should be associated with a TPM instance throughout the lifetime > -# of the VM / VM configuration file. The instance number must be > -# greater or equal to 1. > -#vtpm = ['instance=%d,backend=0' % (vmid) ] > - > -#---------------------------------------------------------------------------- > # Set the kernel command line for the new domain. > # You only need to define the IP parameters and hostname if the domain's > # IP config doesn't, e.g. in ifcfg-eth0 or via DHCP. > diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile > index 0166790..0605559 100644 > --- a/tools/hotplug/Linux/Makefile > +++ b/tools/hotplug/Linux/Makefile > @@ -18,14 +18,12 @@ XEN_SCRIPTS += vif-setup > XEN_SCRIPTS += block > XEN_SCRIPTS += block-enbd block-nbd > XEN_SCRIPTS += blktap > -XEN_SCRIPTS += vtpm vtpm-delete > XEN_SCRIPTS += xen-hotplug-cleanup > XEN_SCRIPTS += external-device-migrate > XEN_SCRIPTS += vscsi > XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh > XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh > -XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh > -XEN_SCRIPT_DATA += vtpm-migration.sh vtpm-impl > +XEN_SCRIPT_DATA += block-common.sh > > UDEV_RULES_DIR = $(CONFIG_DIR)/udev > UDEV_RULES = xen-backend.rules xend.rules > diff --git a/tools/hotplug/Linux/vtpm b/tools/hotplug/Linux/vtpm > deleted file mode 100644 > index 38a4532..0000000 > --- a/tools/hotplug/Linux/vtpm > +++ /dev/null > @@ -1,22 +0,0 @@ > -#!/bin/bash > - > -dir=$(dirname "$0") > -. "$dir/vtpm-hotplug-common.sh" > - > -vtpm_fatal_error=0 > - > -case "$command" in > - add) > - vtpm_create_instance > - ;; > - remove) > - vtpm_remove_instance > - ;; > -esac > - > -if [ $vtpm_fatal_error -eq 0 ]; then > - log debug "Successful vTPM operation '$command'." > - success > -else > - fatal "Error while executing vTPM operation '$command'." > -fi > diff --git a/tools/hotplug/Linux/vtpm-common.sh b/tools/hotplug/Linux/vtpm-common.sh > deleted file mode 100644 > index d0d7935..0000000 > --- a/tools/hotplug/Linux/vtpm-common.sh > +++ /dev/null > @@ -1,448 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/logging.sh" > -. "$dir/locking.sh" > - > -VTPMDB="/var/vtpm/vtpm.db" > - > -#In the vtpm-impl file some commands should be defined: > -# vtpm_create, vtpm_setup, vtpm_start, etc. (see below) > -if [ -r "$dir/vtpm-impl.alt" ]; then > - . "$dir/vtpm-impl.alt" > -elif [ -r "$dir/vtpm-impl" ]; then > - . "$dir/vtpm-impl" > -else > - function vtpm_create () { > - true > - } > - function vtpm_setup() { > - true > - } > - function vtpm_start() { > - true > - } > - function vtpm_suspend() { > - true > - } > - function vtpm_resume() { > - true > - } > - function vtpm_delete() { > - true > - } > - function vtpm_migrate() { > - echo "Error: vTPM migration accross machines not implemented." > - } > - function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > - } > - function vtpm_migrate_recover() { > - true > - } > -fi > - > - > -#Find the instance number for the vtpm given the name of the domain > -# Parameters > -# - vmname : the name of the vm > -# Return value > -# Returns '0' if instance number could not be found, otherwise > -# it returns the instance number in the variable 'instance' > -function vtpmdb_find_instance () { > - local vmname ret instance > - vmname=$1 > - ret=0 > - > - instance=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( 1 != index($1,"#")) { \ > - if ( $1 == vmname ) { \ > - print $2; \ > - exit; \ > - } \ > - } \ > - }') > - if [ "$instance" != "" ]; then > - ret=$instance > - fi > - echo "$ret" > -} > - > - > -# Check whether a particular instance number is still available > -# returns "0" if it is not available, "1" otherwise. > -function vtpmdb_is_free_instancenum () { > - local instance instances avail i > - instance=$1 > - avail=1 > - #Allowed instance number range: 1-255 > - if [ $instance -eq 0 -o $instance -gt 255 ]; then > - avail=0 > - else > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - for i in $instances; do > - if [ $i -eq $instance ]; then > - avail=0 > - break > - fi > - done > - fi > - echo "$avail" > -} > - > - > -# Get an available instance number given the database > -# Returns an unused instance number > -function vtpmdb_get_free_instancenum () { > - local ctr instances don found > - instances=$(cat $VTPMDB | \ > - awk \ > - '{ \ > - if (1 != index($1,"#")) { \ > - printf("%s ",$2); \ > - } \ > - }') > - ctr=1 > - don=0 > - while [ $don -eq 0 ]; do > - found=0 > - for i in $instances; do > - if [ $i -eq $ctr ]; then > - found=1; > - break; > - fi > - done > - > - if [ $found -eq 0 ]; then > - don=1 > - break > - fi > - let ctr=ctr+1 > - done > - echo "$ctr" > -} > - > - > -# Add a domain name and instance number to the DB file > -function vtpmdb_add_instance () { > - local res vmname inst > - vmname=$1 > - inst=$2 > - > - if [ ! -f $VTPMDB ]; then > - echo "#Database for VM to vTPM association" > $VTPMDB > - echo "#1st column: domain name" >> $VTPMDB > - echo "#2nd column: TPM instance number" >> $VTPMDB > - fi > - res=$(vtpmdb_validate_entry $vmname $inst) > - if [ $res -eq 0 ]; then > - echo "$vmname $inst" >> $VTPMDB > - fi > -} > - > - > -#Validate whether an entry is the same as passed to this > -#function > -function vtpmdb_validate_entry () { > - local res rc vmname inst > - rc=0 > - vmname=$1 > - inst=$2 > - > - res=$(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - -vinst=$inst \ > - '{ \ > - if ( 1 == index($1,"#")) {\ > - } else \ > - if ( $1 == vmname && \ > - $2 == inst) { \ > - printf("1"); \ > - exit; \ > - } else \ > - if ( $1 == vmname || \ > - $2 == inst) { \ > - printf("2"); \ > - exit; \ > - } \ > - }') > - > - if [ "$res" == "1" ]; then > - rc=1 > - elif [ "$res" == "2" ]; then > - rc=2 > - fi > - echo "$rc" > -} > - > - > -#Remove an entry from the vTPM database given its domain name > -#and instance number > -function vtpmdb_remove_entry () { > - local vmname instance VTPMDB_TMP > - vmname=$1 > - instance=$2 > - VTPMDB_TMP="$VTPMDB".tmp > - > - $(cat $VTPMDB | \ > - awk -vvmname=$vmname \ > - '{ \ > - if ( $1 != vmname ) { \ > - print $0; \ > - } \ > - '} > $VTPMDB_TMP) > - if [ -e $VTPMDB_TMP ]; then > - mv -f $VTPMDB_TMP $VTPMDB > - vtpm_delete $instance > - else > - log err "Error creating temporary file '$VTPMDB_TMP'." > - fi > -} > - > - > -# Find the reason for the creation of this device: > -# Returns 'resume' or 'create' > -function vtpm_get_create_reason () { > - local resume > - resume=$(xenstore_read $XENBUS_PATH/resume) > - if [ "$resume" == "True" ]; then > - echo "resume" > - else > - echo "create" > - fi > -} > - > - > -#Create a vTPM instance > -# If no entry in the TPM database is found, the instance is > -# created and an entry added to the database. > -function vtpm_create_instance () { > - local res instance domname reason uuid > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - reason=$(vtpm_get_create_reason) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" == "0" -a "$reason" != "create" ]; then > - release_lock vtpmdb > - return > - fi > - > - if [ "$instance" == "0" ]; then > - #Try to give the preferred instance to the domain > - instance=$(xenstore_read "$XENBUS_PATH"/pref_instance) > - if [ "$instance" != "" ]; then > - res=$(vtpmdb_is_free_instancenum $instance) > - if [ $res -eq 0 ]; then > - instance=$(vtpmdb_get_free_instancenum) > - fi > - else > - instance=$(vtpmdb_get_free_instancenum) > - fi > - > - vtpm_create $instance > - > - if [ $vtpm_fatal_error -eq 0 ]; then > - if [ "$uuid" != "" ]; then > - vtpmdb_add_instance $uuid $instance > - else > - vtpmdb_add_instance $domname $instance > - fi > - fi > - else > - if [ "$reason" == "resume" ]; then > - vtpm_resume $instance > - else > - vtpm_start $instance > - fi > - fi > - > - release_lock vtpmdb > - > - xenstore_write $XENBUS_PATH/instance $instance > -} > - > - > -#Remove an instance when a VM is terminating or suspending. > -#Since it is assumed that the VM will appear again, the > -#entry is kept in the VTPMDB file. > -function vtpm_remove_instance () { > - local instance reason domname uuid > - #Stop script execution quietly if path does not exist (anymore) > - xenstore-exists "$XENBUS_PATH"/domain > - uuid=$(xenstore_read "$XENBUS_PATH"/uuid) > - > - claim_lock vtpmdb > - > - instance="0" > - > - if [ "$uuid" != "" ]; then > - instance=$(vtpmdb_find_instance $uuid) > - fi > - > - if [ "$instance" == "0" ]; then > - domname=$(xenstore_read "$XENBUS_PATH"/domain) > - instance=$(vtpmdb_find_instance $domname) > - fi > - > - if [ "$instance" != "0" ]; then > - vtpm_suspend $instance > - fi > - > - release_lock vtpmdb > -} > - > - > -#Remove an entry in the VTPMDB file given the domain's name > -#1st parameter: The name of the domain > -function vtpm_delete_instance () { > - local instance > - > - claim_lock vtpmdb > - > - instance=$(vtpmdb_find_instance $1) > - if [ "$instance" != "0" ]; then > - vtpmdb_remove_entry $1 $instance > - fi > - > - release_lock vtpmdb > -} > - > -# Determine whether the given address is local to this machine > -# Return values: > -# "-1" : the given machine name is invalid > -# "0" : this is not an address of this machine > -# "1" : this is an address local to this machine > -function vtpm_isLocalAddress() { > - local addr res > - addr=$(ping $1 -c 1 | \ > - awk '{ print substr($3,2,length($3)-2); exit }') > - if [ "$addr" == "" ]; then > - echo "-1" > - return > - fi > - res=$(ifconfig | grep "inet addr" | \ > - awk -vaddr=$addr \ > - '{ \ > - if ( addr == substr($2, 6)) {\ > - print "1"; \ > - } \ > - }' \ > - ) > - if [ "$res" == "" ]; then > - echo "0" > - return > - fi > - echo "1" > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migration_step() { > - local res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate $1 $2 $3 > - else > - vtpm_migrate_local > - fi > -} > - > -# Recover from migration due to an error. This function differentiates > -# between migration to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host the migration was going to > -# 2nd: name of the domain that was to be migrated > -# 3rd: the last successful migration step that was done > -function vtpm_recover() { > - local res > - res=$(vtpm_isLocalAddress $1) > - if [ "$res" == "0" ]; then > - vtpm_migrate_recover $1 $2 $3 > - fi > -} > - > - > -#Determine the domain id given a domain's name. > -#1st parameter: name of the domain > -#return value: domain id or -1 if domain id could not be determined > -function vtpm_domid_from_name () { > - local id name ids > - ids=$(xenstore-list /local/domain) > - for id in $ids; do > - name=$(xenstore-read /local/domain/$id/name) > - if [ "$name" == "$1" ]; then > - echo "$id" > - return > - fi > - done > - echo "-1" > -} > - > -#Determine the virtual TPM's instance number using the domain ID. > -#1st parm: domain ID > -function vtpm_uuid_by_domid() { > - echo $(xenstore-read /local/domain/0/backend/vtpm/$1/0/uuid) > -} > - > - > -# Determine the vTPM's UUID by the name of the VM > -function vtpm_uuid_from_vmname() { > - local domid=$(vtpm_domid_from_name $1) > - if [ "$domid" != "-1" ]; then > - echo $(vtpm_uuid_by_domid $domid) > - return > - fi > - echo "" > -} > - > -#Add a virtual TPM instance number and its associated domain name > -#to the VTPMDB file and activate usage of this virtual TPM instance > -#by writing the instance number into the xenstore > -#1st parm: name of virtual machine > -#2nd parm: instance of associated virtual TPM > -function vtpm_add_and_activate() { > - local domid=$(vtpm_domid_from_name $1) > - local vtpm_uuid=$(vtpm_uuid_from_vmname $1) > - if [ "$vtpm_uuid" != "" -a "$domid" != "-1" ]; then > - vtpmdb_add_instance $vtpm_uuid $2 > - xenstore-write backend/vtpm/$domid/0/instance $2 > - fi > -} > diff --git a/tools/hotplug/Linux/vtpm-delete b/tools/hotplug/Linux/vtpm-delete > deleted file mode 100644 > index b75b95b..0000000 > --- a/tools/hotplug/Linux/vtpm-delete > +++ /dev/null > @@ -1,18 +0,0 @@ > -#!/bin/bash > - > -# This scripts must be called the following way: > -# vtpm-delete > -# or > -# vtpm-delete --vmname > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > - > -if [ "$1" == "--vmname" ]; then > - vtpm_uuid=$(vtpm_uuid_from_vmname $2) > - if [ "$vtpm_uuid" != "" ];then > - vtpm_delete_instance $vtpm_uuid > - fi > -else > - vtpm_delete_instance $1 > -fi > diff --git a/tools/hotplug/Linux/vtpm-hotplug-common.sh b/tools/hotplug/Linux/vtpm-hotplug-common.sh > deleted file mode 100644 > index 9fd35e7..0000000 > --- a/tools/hotplug/Linux/vtpm-hotplug-common.sh > +++ /dev/null > @@ -1,35 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# Copyright (c) 2005 XenSource Ltd. > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/xen-hotplug-common.sh" > - > -findCommand "$@" > -if [ "$command" != "online" ] && > - [ "$command" != "offline" ] && > - [ "$command" != "add" ] && > - [ "$command" != "remove" ] > -then > - log err "Invalid command: $command" > - exit 1 > -fi > - > - > -XENBUS_PATH="${XENBUS_PATH:?}" > - > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/vtpm-impl b/tools/hotplug/Linux/vtpm-impl > deleted file mode 100644 > index 4f9a1fd..0000000 > --- a/tools/hotplug/Linux/vtpm-impl > +++ /dev/null > @@ -1,208 +0,0 @@ > -#!/bin/bash > -# =================================================================== > -# > -# Copyright (c) 2005, Intel Corp. > -# All rights reserved. > -# > -# Redistribution and use in source and binary forms, with or without > -# modification, are permitted provided that the following conditions > -# are met: > -# > -# * Redistributions of source code must retain the above copyright > -# notice, this list of conditions and the following disclaimer. > -# * Redistributions in binary form must reproduce the above > -# copyright notice, this list of conditions and the following > -# disclaimer in the documentation and/or other materials provided > -# with the distribution. > -# * Neither the name of Intel Corporation nor the names of its > -# contributors may be used to endorse or promote products derived > -# from this software without specific prior written permission. > -# > -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -# OF THE POSSIBILITY OF SUCH DAMAGE. > -# =================================================================== > - > -# | SRC | TAG | CMD SIZE | ORD |mtype|strt > -TPM_CMD_OPEN=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x01 > -TPM_CMD_RESM=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x11\\x01\\x00\\x00\\x01\\x01\\x02 > -TPM_CMD_CLOS=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x02 > -TPM_CMD_DELE=\\x00\\x00\\x00\\x00\\x01\\xc1\\x00\\x00\\x00\\x0e\\x01\\x00\\x00\\x03 > - > -TPM_TYPE_PVM=\\x01 > -TPM_TYPE_HVM=\\x02 > - > -TPM_SUCCESS=00000000 > - > -TX_VTPM_MANAGER=/var/vtpm/fifos/from_console.fifo > -RX_VTPM_MANAGER=/var/vtpm/fifos/to_console.fifo > - > -VTPM_MIG=/usr/bin/vtpm_migrator > - > -# -------------------- Helpers for binary streams ----------- > - > -function str_to_hex32() { > - printf "%0.8x" $1 > -} > - > -function hex32_to_bin() { > - local inst=$(str_to_hex32 $1); > - > - local n1=`echo $inst | sed 's/\(..\)....../\\\\x\1/'` > - local n2=`echo $inst | sed 's/..\(..\)..../\\\\x\1/'` > - local n3=`echo $inst | sed 's/....\(..\)../\\\\x\1/'` > - local n4=`echo $inst | sed 's/......\(..\)/\\\\x\1/'` > - > - echo "$n1$n2$n3$n4" > -} > - > -function vtpm_manager_cmd() { > - local cmd=$1; > - local inst=$2; > - local inst_bin=$(hex32_to_bin $inst); > - > - claim_lock vtpm_mgr > - > - #send cmd to vtpm_manager > - printf "$cmd$inst_bin" > $TX_VTPM_MANAGER > - > - #recv response > - set +e > - local resp_hex=`dd skip=10 bs=1 count=4 if=$RX_VTPM_MANAGER 2> /dev/null | xxd -ps` > - set -e > - > - release_lock vtpm_mgr > - > - #return whether the command was successful > - if [ $resp_hex -ne $TPM_SUCCESS ]; then > - vtpm_fatal_error=1 > - false > - else > - true > - fi > -} > - > -# Helper to get vm type to pass to vtpm_manager open/resume > -function vtpm_get_type() { > - local inst=$(xenstore_read $XENBUS_PATH/frontend-id) > - local vm=$(xenstore_read /local/domain/$inst/vm) > - if [ "$vm" != "" ]; then > - local ostype=$(xenstore-read $vm/image/ostype) > - if [ "$ostype" == "hvm" ]; then > - echo $TPM_TYPE_HVM; > - else > - echo $TPM_TYPE_PVM; > - fi > - fi > -} > - > -# ------------------ Command handlers ----------------- > - > -# Create new vtpm instance & set it up for use > -function vtpm_create () { > - # Creation is handled implicitly by the manager on first setup > - # so just set it up for use > - $(vtpm_start $1) > -} > - > -# Setup vtpm instance for use. > -function vtpm_start() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_OPEN$vmtype $1) > -} > - > -function vtpm_resume() { > - local vmtype=$(vtpm_get_type); > - $(vtpm_manager_cmd $TPM_CMD_RESM$vmtype $1) > -} > - > -# Reset the vtpm AKA clear PCRs > -function vtpm_reset() { > - #not used by current implemenation > - true > -} > - > -# Shutdown the vtpm while the vm is down > -# This could be a suspend of shutdown > -# we cannot distinquish, so save the state > -# and decide on startup if we should keep is > -function vtpm_suspend() { > - $(vtpm_manager_cmd $TPM_CMD_CLOS $1) > -} > - > - > -function vtpm_delete() { > - local inst=$1 > - if $(vtpm_manager_cmd $TPM_CMD_DELE $inst); then > - rm -f /var/vtpm/vtpm_dm_$1.data > - true > - else > - vtpm_fatal_error=1 > - false > - fi > -} > - > -# Perform a migration step. This function differentiates between migration > -# to the local host or to a remote machine. > -# Parameters: > -# 1st: destination host to migrate to > -# 2nd: name of the domain to migrate > -# 3rd: the migration step to perform > -function vtpm_migrate() { > - local instance res > - > - instance=$(vtpmdb_find_instance $2) > - if [ "$instance" == "" ]; then > - log err "VTPM Migratoin failed. Unable to translation of domain name" > - echo "Error: VTPM Migration failed while looking up instance number" > - fi > - > - case "$3" in > - 0) > - #Incicate migration supported > - echo "0" > - ;; > - > - 1) > - # Get Public Key from Destination > - # Call vtpm_manager's migration part 1 > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 2) > - # Call manager's migration step 2 and send result to destination > - # If successful remove from db > - claim_lock vtpm_mgr > - $VTPM_MIG $1 $2 $instance $3 > - release_lock vtpm_mgr > - ;; > - > - 3) > - if `ps x | grep "$VTPM_MIG $1"`; then > - log err "VTPM Migration failed to complete." > - echo "Error: VTPM Migration failed to complete." > - fi > - ;; > - esac > - > -} > - > - > -function vtpm_migrate_recover() { > - echo "Error: Recovery not supported yet" > -} > - > -function vtpm_migrate_local() { > - echo "Error: local vTPM migration not supported" > -} > diff --git a/tools/hotplug/Linux/vtpm-migration.sh b/tools/hotplug/Linux/vtpm-migration.sh > deleted file mode 100644 > index 7e38ae2..0000000 > --- a/tools/hotplug/Linux/vtpm-migration.sh > +++ /dev/null > @@ -1,19 +0,0 @@ > -# > -# Copyright (c) 2005 IBM Corporation > -# > -# This library is free software; you can redistribute it and/or > -# modify it under the terms of version 2.1 of the GNU Lesser General Public > -# License as published by the Free Software Foundation. > -# > -# This library is distributed in the hope that it will be useful, > -# but WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# Lesser General Public License for more details. > -# > -# You should have received a copy of the GNU Lesser General Public > -# License along with this library; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > -# > - > -dir=$(dirname "$0") > -. "$dir/vtpm-common.sh" > diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules > index c591a3f..a0d409e 100644 > --- a/tools/hotplug/Linux/xen-backend.rules > +++ b/tools/hotplug/Linux/xen-backend.rules > @@ -1,6 +1,5 @@ > SUBSYSTEM=="xen-backend", KERNEL=="tap*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/blktap $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vbd*", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/block $env{ACTION}" > -SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif2-*", RUN+="/etc/xen/scripts/vif2 $env{ACTION}" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online", RUN+="/etc/xen/scripts/vif-setup online type_if=vif" > SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif" > diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile > deleted file mode 100644 > index 7b3efa5..0000000 > --- a/tools/vtpm/Makefile > +++ /dev/null > @@ -1,74 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -# Dir name for emulator (as dom0 tpm driver) > -TPM_EMULATOR_DIR = tpm_emulator > -# Dir name for vtpm instance > -VTPM_DIR = vtpm > -ORIG_DIR = orig > - > -# Emulator tarball name > -TPM_EMULATOR_NAME = tpm_emulator-0.5.1 > -TPM_EMULATOR_TARFILE = $(TPM_EMULATOR_NAME).tar.gz > - > -GMP_HEADER = /usr/include/gmp.h > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: build_sub > - > -.PHONY: install > -install: build > - $(MAKE) -C $(VTPM_DIR) install-recursive > - > -.PHONY: clean > -clean: > - @if [ -d $(TPM_EMULATOR_DIR) ]; \ > - then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ > - fi > - @if [ -d $(VTPM_DIR) ]; \ > - then $(MAKE) -C $(VTPM_DIR) clean; \ > - fi > - > -.PHONY: mrproper > -mrproper: > - rm -f $(TPM_EMULATOR_TARFILE) tpm_emulator.patch.old vtpm.patch.old > - rm -rf $(TPM_EMULATOR_DIR) $(VTPM_DIR) $(ORIG_DIR) > - > -# Download Swiss emulator > -$(TPM_EMULATOR_TARFILE): > - wget http://download.berlios.de/tpm-emulator/$(TPM_EMULATOR_TARFILE) > - > -# Create vtpm dirs > -$(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch > - rm -rf $(VTPM_DIR) > - tar -xzf $(TPM_EMULATOR_TARFILE) > - mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) > - > - set -e; cd $(VTPM_DIR); \ > - patch -p1 < ../vtpm-0.5.1.patch; \ > - patch -p1 < ../vtpm-0.5.1-LDLIBS.patch > - > -orig: $(TPM_EMULATOR_TARFILE) > - mkdir $(ORIG_DIR); > - set -e; cd $(ORIG_DIR); \ > - tar -xzf ../$(TPM_EMULATOR_TARFILE); > - > -updatepatches: clean orig > - find $(VTPM_DIR) -name "*.orig" -print | xargs rm -f; > - mv vtpm.patch vtpm.patch.old; > - diff -uprN $(TPM_EMULATOR_DIR) $(VTPM_DIR) > vtpm.patch || true; > - > -.PHONY: build_sub > -build_sub: $(VTPM_DIR)/tpmd/tpmd > - set -e; if [ -e $(GMP_HEADER) ]; then \ > - $(MAKE) -C $(VTPM_DIR) version; \ > - $(MAKE) -C $(VTPM_DIR) all-recursive; \ > - else \ > - echo "=== Unable to build VTPMs. libgmp could not be found."; \ > - fi > - > diff --git a/tools/vtpm/README b/tools/vtpm/README > deleted file mode 100644 > index 2008cbd..0000000 > --- a/tools/vtpm/README > +++ /dev/null > @@ -1,45 +0,0 @@ > - > -Directory Structure > -=================== > -tools/vtpm/tpm_emulator-0.2b.tar.gz -> TPM Emulator downloaded at build time that will > - be patched and used for our vtpms > -tools/vtpm/vtpm.patch -> patch applied to tpm_emulator to make vtpm > -tools/vtpm/vtpm/ -> (created on build) tpm_emulator moved to ring 3, > - listens on a pair of fifos for TPM commands, > - persistent state is sent via named fifo to vtpm > - manager, which encrypts it and protects it. > -tools/vtpm/tpm_emulator.patch -> To allow for debugging and testing on non-TPM > - platforms, this patches the emulator to allow > - it to be inserted into the dom0 kernel > -tools/vtpm/tpm_emulator-0.2 -> (created on build) directory containing patched emulator > - > -Compile Flags > -=================== > -VTPM_MULTI_VM -> Defined (not finished): VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -Requirements > -============ > -- xen-unstable > -- IBM frontend/backend vtpm driver patch > -- vtpm_managerd > -- GNU MP Big number library (GMP) > - > -vtpmd Flow (for vtpm_manager. vtpmd never run by default) > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -tpm_emulator flow > -================== > -Read documentation in tpm_emulator-0.2 directory > diff --git a/tools/vtpm/Rules.mk b/tools/vtpm/Rules.mk > deleted file mode 100644 > index 548cff0..0000000 > --- a/tools/vtpm/Rules.mk > +++ /dev/null > @@ -1,26 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(DEPS) > - > -BUILD_EMULATOR = y > - > -# Make sure these are just rules > -.PHONY : all build install clean > diff --git a/tools/vtpm/tpm_emulator.patch b/tools/vtpm/tpm_emulator.patch > deleted file mode 100644 > index c34c665..0000000 > --- a/tools/vtpm/tpm_emulator.patch > +++ /dev/null > @@ -1,1919 +0,0 @@ > -diff -uprN orig/tpm_emulator-0.4/AUTHORS tpm_emulator/AUTHORS > ---- orig/tpm_emulator-0.4/AUTHORS 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/AUTHORS 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,2 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > -+INTEL Corp <> [Dropped to Ring3] > -diff -uprN orig/tpm_emulator-0.4/ChangeLog tpm_emulator/ChangeLog > ---- orig/tpm_emulator-0.4/ChangeLog 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/ChangeLog 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,3 +1,6 @@ > -+????-??-?? Intel Corp > -+ * Moved module out of kernel to run as a ring 3 app > -+ > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > - persistent data adapted > -diff -uprN orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c tpm_emulator/crypto/gmp_kernel_wrapper.c > ---- orig/tpm_emulator-0.4/crypto/gmp_kernel_wrapper.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/gmp_kernel_wrapper.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -24,15 +25,10 @@ int __gmp_junk; > - void __attribute__ ((regparm(0))) __gmp_assert_fail(const char *filename, > - int linenum, const char *expr) > - { > -- panic(KERN_CRIT TPM_MODULE_NAME "%s:%d: GNU MP assertion failed: %s\n", > -+ error("%s:%d: GNU MP assertion failed: %s\n", > - filename, linenum, expr); > - } > - > --void __attribute__ ((regparm(0))) abort(void) > --{ > -- panic(KERN_CRIT TPM_MODULE_NAME "GNU MP abort() was called\n"); > --} > -- > - /* overwrite GNU MP random functions (used by mpz/millerrabin.c) */ > - > - void __attribute__ ((regparm(0))) gmp_randinit(gmp_randstate_t rstate, > -@@ -77,20 +73,19 @@ void __attribute__ ((regparm(0))) mpz_ur > - > - void __attribute__ ((regparm(0))) *kernel_allocate(size_t size) > - { > -- void *ret = (void*)kmalloc(size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME > -- "GMP: cannot allocate memory (size=%u)\n", size); > -+ void *ret = (void*)malloc(size); > -+ if (!ret) error("GMP: cannot allocate memory (size=%Zu)\n", size); > - return ret; > - } > - > - void __attribute__ ((regparm(0))) *kernel_reallocate(void *oldptr, > - size_t old_size, size_t new_size) > - { > -- void *ret = (void*)kmalloc(new_size, GFP_KERNEL); > -- if (!ret) panic(KERN_CRIT TPM_MODULE_NAME "GMP: Cannot reallocate memory " > -- "(old_size=%u new_size=%u)\n", old_size, new_size); > -+ void *ret = (void*)malloc(new_size); > -+ if (!ret) error("GMP: Cannot reallocate memory " > -+ "(old_size=%Zu new_size=%Zu)\n", old_size, new_size); > - memcpy(ret, oldptr, old_size); > -- kfree(oldptr); > -+ free(oldptr); > - return ret; > - } > - > -@@ -99,7 +94,7 @@ void __attribute__ ((regparm(0))) kernel > - /* overwrite used memory */ > - if (blk_ptr != NULL) { > - memset(blk_ptr, 0, blk_size); > -- kfree(blk_ptr); > -+ free(blk_ptr); > - } > - } > - > -diff -uprN orig/tpm_emulator-0.4/crypto/rsa.c tpm_emulator/crypto/rsa.c > ---- orig/tpm_emulator-0.4/crypto/rsa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/crypto/rsa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -381,7 +382,7 @@ static int encode_message(int type, uint > - msg[0] = 0x00; > - get_random_bytes(&msg[1], SHA1_DIGEST_LENGTH); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1 + SHA1_DIGEST_LENGTH]); > - memset(&msg[1 + 2 * SHA1_DIGEST_LENGTH], 0x00, > - msg_len - data_len - 2 * SHA1_DIGEST_LENGTH - 2); > -@@ -429,7 +430,7 @@ static int decode_message(int type, uint > - mask_generation(&msg[1], SHA1_DIGEST_LENGTH, > - &msg[1 + SHA1_DIGEST_LENGTH], msg_len - SHA1_DIGEST_LENGTH - 1); > - sha1_init(&ctx); > -- sha1_update(&ctx, "TCPA", 4); > -+ sha1_update(&ctx, (uint8_t *) "TCPA", 4); > - sha1_final(&ctx, &msg[1]); > - if (memcmp(&msg[1], &msg[1 + SHA1_DIGEST_LENGTH], > - SHA1_DIGEST_LENGTH) != 0) return -1; > -diff -uprN orig/tpm_emulator-0.4/linux_module.c tpm_emulator/linux_module.c > ---- orig/tpm_emulator-0.4/linux_module.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.c 1969-12-31 16:00:00.000000000 -0800 > -@@ -1,195 +0,0 @@ > --/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -- * Copyright (C) 2004 Mario Strasser , > -- * > -- * This module is free software; you can redistribute it and/or modify > -- * it under the terms of the GNU General Public License as published > -- * by the Free Software Foundation; either version 2 of the License, > -- * or (at your option) any later version. > -- * > -- * This module is distributed in the hope that it will be useful, > -- * but WITHOUT ANY WARRANTY; without even the implied warranty of > -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -- * GNU General Public License for more details. > -- * > -- * $Id: linux_module.c 91 2006-03-13 13:51:41Z mast $ > -- */ > -- > --#include > --#include > --#include > --#include > --#include > --#include "linux_module.h" > --#include "tpm/tpm_emulator.h" > -- > --MODULE_LICENSE("GPL"); > --MODULE_AUTHOR("Mario Strasser "); > --MODULE_DESCRIPTION("Trusted Platform Module (TPM) Emulator"); > --MODULE_SUPPORTED_DEVICE(TPM_DEVICE_NAME); > -- > --/* module startup parameters */ > --char *startup = "save"; > --module_param(startup, charp, 0444); > --MODULE_PARM_DESC(startup, " Sets the startup mode of the TPM. " > -- "Possible values are 'clear', 'save' (default) and 'deactivated."); > --char *storage_file = "/var/tpm/tpm_emulator-1.2.0.2"; > --module_param(storage_file, charp, 0644); > --MODULE_PARM_DESC(storage_file, " Sets the persistent-data storage " > -- "file of the TPM."); > -- > --/* TPM lock */ > --static struct semaphore tpm_mutex; > -- > --/* TPM command response */ > --static struct { > -- uint8_t *data; > -- uint32_t size; > --} tpm_response; > -- > --/* module state */ > --#define STATE_IS_OPEN 0 > --static uint32_t module_state; > --static struct timespec old_time; > -- > --static int tpm_open(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- if (test_and_set_bit(STATE_IS_OPEN, (void*)&module_state)) return -EBUSY; > -- return 0; > --} > -- > --static int tpm_release(struct inode *inode, struct file *file) > --{ > -- debug("%s()", __FUNCTION__); > -- clear_bit(STATE_IS_OPEN, (void*)&module_state); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return 0; > --} > -- > --static ssize_t tpm_read(struct file *file, char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) { > -- count = min(count, (size_t)tpm_response.size - (size_t)*ppos); > -- count -= copy_to_user(buf, &tpm_response.data[*ppos], count); > -- *ppos += count; > -- if ((size_t)tpm_response.size == (size_t)*ppos) { > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } > -- } else { > -- count = 0; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --static ssize_t tpm_write(struct file *file, const char *buf, size_t count, loff_t *ppos) > --{ > -- debug("%s(%d)", __FUNCTION__, count); > -- down(&tpm_mutex); > -- *ppos = 0; > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command(buf, count, &tpm_response.data, > -- &tpm_response.size) != 0) { > -- count = -EILSEQ; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return count; > --} > -- > --#define TPMIOC_CANCEL _IO('T', 0x00) > --#define TPMIOC_TRANSMIT _IO('T', 0x01) > -- > --static int tpm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) > --{ > -- debug("%s(%d, %p)", __FUNCTION__, cmd, (char*)arg); > -- if (cmd == TPMIOC_TRANSMIT) { > -- uint32_t count = ntohl(*(uint32_t*)(arg + 2)); > -- down(&tpm_mutex); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > -- if (tpm_handle_command((char*)arg, count, &tpm_response.data, > -- &tpm_response.size) == 0) { > -- tpm_response.size -= copy_to_user((char*)arg, tpm_response.data, > -- tpm_response.size); > -- kfree(tpm_response.data); > -- tpm_response.data = NULL; > -- } else { > -- tpm_response.size = 0; > -- tpm_response.data = NULL; > -- } > -- up(&tpm_mutex); > -- return tpm_response.size; > -- } > -- return -1; > --} > -- > --struct file_operations fops = { > -- .owner = THIS_MODULE, > -- .open = tpm_open, > -- .release = tpm_release, > -- .read = tpm_read, > -- .write = tpm_write, > -- .ioctl = tpm_ioctl, > --}; > -- > --static struct miscdevice tpm_dev = { > -- .minor = TPM_DEVICE_MINOR, > -- .name = TPM_DEVICE_NAME, > -- .fops = &fops, > --}; > -- > --int __init init_tpm_module(void) > --{ > -- int res = misc_register(&tpm_dev); > -- if (res != 0) { > -- error("misc_register() failed for minor %d\n", TPM_DEVICE_MINOR); > -- return res; > -- } > -- /* initialize variables */ > -- sema_init(&tpm_mutex, 1); > -- module_state = 0; > -- tpm_response.data = NULL; > -- old_time = current_kernel_time(); > -- /* initialize TPM emulator */ > -- if (!strcmp(startup, "clear")) { > -- tpm_emulator_init(1); > -- } else if (!strcmp(startup, "save")) { > -- tpm_emulator_init(2); > -- } else if (!strcmp(startup, "deactivated")) { > -- tpm_emulator_init(3); > -- } else { > -- error("invalid startup mode '%s'; must be 'clear', " > -- "'save' (default) or 'deactivated", startup); > -- misc_deregister(&tpm_dev); > -- return -EINVAL; > -- } > -- return 0; > --} > -- > --void __exit cleanup_tpm_module(void) > --{ > -- tpm_emulator_shutdown(); > -- misc_deregister(&tpm_dev); > -- if (tpm_response.data != NULL) kfree(tpm_response.data); > --} > -- > --module_init(init_tpm_module); > --module_exit(cleanup_tpm_module); > -- > --uint64_t tpm_get_ticks(void) > --{ > -- struct timespec new_time = current_kernel_time(); > -- uint64_t ticks = (uint64_t)(new_time.tv_sec - old_time.tv_sec) * 1000000 > -- + (new_time.tv_nsec - old_time.tv_nsec) / 1000; > -- old_time = new_time; > -- return (ticks > 0) ? ticks : 1; > --} > -- > -diff -uprN orig/tpm_emulator-0.4/linux_module.h tpm_emulator/linux_module.h > ---- orig/tpm_emulator-0.4/linux_module.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/linux_module.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -17,54 +18,62 @@ > - #ifndef _LINUX_MODULE_H_ > - #define _LINUX_MODULE_H_ > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - #include > --#include > --#include > --#include > --#include > - > --/* module settings */ > -+#include > -+#define __BYTEORDER_HAS_U64__ > -+#ifdef LITTLE_ENDIAN > -+ #include > -+#else > -+ #include > -+#endif > - > -+/* module settings */ > -+#define min(A,B) ((A)<(B)?(A):(B)) > -+#ifndef STR > - #define STR(s) __STR__(s) > - #define __STR__(s) #s > -+#endif > - #include "tpm_version.h" > - > - #define TPM_DEVICE_MINOR 224 > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > --/* debug and log output functions */ > -- > - #ifdef DEBUG > --#define debug(fmt, ...) printk(KERN_DEBUG "%s %s:%d: Debug: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - #else > - #define debug(fmt, ...) > - #endif > --#define info(fmt, ...) printk(KERN_INFO "%s %s:%d: Info: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printk(KERN_ERR "%s %s:%d: Error: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printk(KERN_ALERT "%s %s:%d: Alert: " fmt "\n", \ > -- TPM_MODULE_NAME, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -+ __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > - static inline void *tpm_malloc(size_t size) > - { > -- return kmalloc(size, GFP_KERNEL); > -+ return malloc(size); > - } > - > - static inline void tpm_free(const void *ptr) > - { > -- if (ptr != NULL) kfree(ptr); > -+ if (ptr != NULL) free( (void *) ptr); > - } > - > - /* random numbers */ > - > -+//FIXME; > -+void get_random_bytes(void *buf, int nbytes); > -+ > - static inline void tpm_get_random_bytes(void *buf, int nbytes) > - { > - get_random_bytes(buf, nbytes); > -@@ -84,9 +93,9 @@ uint64_t tpm_get_ticks(void); > - #define CPU_TO_LE16(x) __cpu_to_le16(x) > - > - #define BE64_TO_CPU(x) __be64_to_cpu(x) > --#define LE64_TO_CPU(x) __be64_to_cpu(x) > -+#define LE64_TO_CPU(x) __le64_to_cpu(x) > - #define BE32_TO_CPU(x) __be32_to_cpu(x) > --#define LE32_TO_CPU(x) __be32_to_cpu(x) > -+#define LE32_TO_CPU(x) __le32_to_cpu(x) > - #define BE16_TO_CPU(x) __be16_to_cpu(x) > - #define LE16_TO_CPU(x) __le16_to_cpu(x) > - > -diff -uprN orig/tpm_emulator-0.4/Makefile tpm_emulator/Makefile > ---- orig/tpm_emulator-0.4/Makefile 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/Makefile 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,24 +1,40 @@ > - # Software-Based Trusted Platform Module (TPM) Emulator for Linux > - # Copyright (C) 2004 Mario Strasser > -+# Copyright (C) 2006 INTEL Corp. > - # > - # $Id: Makefile 115 2006-06-23 10:36:44Z mast $ > - > --# kernel settings > --KERNEL_RELEASE := $(shell uname -r) > --KERNEL_BUILD := /lib/modules/$(KERNEL_RELEASE)/build > --MOD_SUBDIR := misc > -+COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --MODULE_NAME := tpm_emulator > -+BIN := tpm_emulator > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > - > --# enable/disable DEBUG messages > --EXTRA_CFLAGS += -Wall -DDEBUG -g > -+# Installation program and options > -+INSTALL = install > -+INSTALL_PROG = $(INSTALL) -m0755 > -+INSTALL_DIR = $(INSTALL) -d -m0755 > -+ > -+# Xen tools installation directory > -+TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > -+ > -+CC := gcc > -+CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > -+CFLAGS += -I. -Itpm > -+ > -+# Is the simulator running in it's own vm? > -+#CFLAGS += -DVTPM_MULTI_VM > -+ > -+ifeq ($(COMPILE_ARCH),x86_64) > -+LIBDIR = lib64 > -+else > -+LIBDIR = lib > -+endif > - > - # GNU MP configuration > --GMP_LIB := /usr/lib/libgmp.a > -+GMP_LIB := /usr/$(LIBDIR)/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > - # sources and objects > -@@ -27,38 +43,32 @@ DIRS := . crypto tpm > - SRCS := $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.c)) > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - SRCS += $(foreach dir, $(DIRS), $(wildcard $(src)/$(dir)/*.h)) > --DISTSRC := ./README ./AUTHORS ./ChangeLog ./Makefile $(SRCS) > --DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR) > - > --obj-m := $(MODULE_NAME).o > --$(MODULE_NAME)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > -+obj-m := $(BIN) > -+$(BIN)-objs := $(patsubst $(src)/%.o, %.o, $(OBJS)) crypto/libgmp.a > - > - EXTRA_CFLAGS += -I$(src) -I$(src)/crypto -I$(src)/tpm > - > - # do not print "Entering directory ..." > - MAKEFLAGS += --no-print-directory > - > --all: $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules > -+all: $(BIN) > - > --install: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) modules_install > -- test -d /var/tpm || mkdir /var/tpm > -- test -c /dev/tpm || mknod /dev/tpm c 10 224 > -- chmod 666 /dev/tpm > -- depmod -a > -+$(BIN): $(src)/crypto/gmp.h $(src)/crypto/libgmp.a version $(SRCS) $(OBJS) > -+ $(CC) $(CFLAGS) $(OBJS) $(src)/crypto/libgmp.a -o $(BIN) > -+ > -+%.o: %.c > -+ $(CC) $(CFLAGS) -c $< -o $@ > -+ > -+install: $(BIN) > -+ $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -+ @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > -- @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) clean > -- rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a > -+ rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > - > --dist: $(DISTSRC) > -- rm -rf $(DISTDIR) > -- mkdir $(DISTDIR) > -- cp --parents $(DISTSRC) $(DISTDIR)/ > -- rm -f $(DISTDIR)/crypto/gmp.h > -- tar -chzf $(DISTDIR).tar.gz $(DISTDIR) > -- rm -rf $(DISTDIR) > -+mrproper: clean > -+ rm -f $(BIN) tpm_version.h > - > - $(src)/crypto/libgmp.a: > - test -f $(src)/crypto/libgmp.a || ln -s $(GMP_LIB) $(src)/crypto/libgmp.a > -@@ -88,4 +98,3 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -- > -diff -uprN orig/tpm_emulator-0.4/README tpm_emulator/README > ---- orig/tpm_emulator-0.4/README 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/README 2006-07-24 14:35:35.000000000 -0700 > -@@ -13,7 +13,8 @@ $Id: README 113 2006-06-18 12:38:13Z hst > - Copyright > - -------------------------------------------------------------------------- > - Copyright (C) 2004 Mario Strasser and Swiss Federal > --Institute of Technology (ETH) Zurich. > -+ Institute of Technology (ETH) Zurich. > -+Copyright (C) 2005 INTEL Corp > - > - This program is free software; you can redistribute it and/or modify > - it under the terms of the GNU General Public License as published by > -@@ -43,6 +44,12 @@ Example: > - GMP_LIB := /usr/lib/libgmp.a > - GMP_HEADER := /usr/include/gmp.h > - > -+GNU MP Library on 64 bit Systems > -+-------------------------------------------------------------------------- > -+Some 64-bit kernels have problems with importing the user-space gmp > -+library (/usr/lib*/libgmp.a) into kernel space. These kernels will require > -+that the gmp library be recompiled for kernel space with -mcmodel=kernel. > -+ > - Installation > - -------------------------------------------------------------------------- > - The compilation and installation process uses the build environment for > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_capability.c tpm_emulator/tpm/tpm_capability.c > ---- orig/tpm_emulator-0.4/tpm/tpm_capability.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_capability.c 2007-12-28 22:50:19.000000000 +0900 > -@@ -701,7 +701,10 @@ TPM_RESULT TPM_GetCapabilityOwner(TPM_VE > - TPM_RESULT res; > - > - info("TPM_GetCapabilityOwner()"); > -- > -+ > -+ if (!tpmData.permanent.flags.owned) { > -+ return TPM_NOSRK; > -+ } > - /* Verify owner authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > - if (res != TPM_SUCCESS) return res; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c tpm_emulator/tpm/tpm_cmd_handler.c > ---- orig/tpm_emulator-0.4/tpm/tpm_cmd_handler.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_cmd_handler.c 2007-09-12 20:23:00.000000000 +0900 > -@@ -565,7 +565,7 @@ static TPM_RESULT execute_TPM_Seal(TPM_R > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize >0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -@@ -798,7 +798,7 @@ static TPM_RESULT execute_TPM_Sealx(TPM_ > - if (tpm_unmarshal_TPM_KEY_HANDLE(&ptr, &len, &keyHandle) > - || tpm_unmarshal_TPM_ENCAUTH(&ptr, &len, &encAuth) > - || tpm_unmarshal_UINT32(&ptr, &len, &pcrInfoSize) > -- || tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo) > -+ || (pcrInfoSize > 0 && tpm_unmarshal_TPM_PCR_INFO(&ptr, &len, &pcrInfo)) > - || tpm_unmarshal_UINT32(&ptr, &len, &inDataSize) > - || tpm_unmarshal_BLOB(&ptr, &len, &inData, inDataSize) > - || len != 0) return TPM_BAD_PARAMETER; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_credentials.c tpm_emulator/tpm/tpm_credentials.c > ---- orig/tpm_emulator-0.4/tpm/tpm_credentials.c 2006-06-23 19:37:07.000000000 +0900 > -+++ tpm_emulator/tpm/tpm_credentials.c 2007-09-12 20:23:30.000000000 +0900 > -@@ -47,20 +47,20 @@ int tpm_compute_pubkey_checksum(TPM_NONC > - > - TPM_RESULT tpm_get_pubek(TPM_PUBKEY *pubEndorsementKey) > - { > -- UINT32 key_length; > -+ size_t key_length; > - if (!tpmData.permanent.data.endorsementKey.size) return TPM_NO_ENDORSEMENT; > - /* setup TPM_PUBKEY structure */ > -- key_length = tpmData.permanent.data.endorsementKey.size; > -- pubEndorsementKey->pubKey.keyLength = key_length >> 3; > -+ pubEndorsementKey->pubKey.keyLength = tpmData.permanent.data.endorsementKey.size >> 3; > - pubEndorsementKey->pubKey.key = tpm_malloc(pubEndorsementKey->pubKey.keyLength); > - if (pubEndorsementKey->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&tpmData.permanent.data.endorsementKey, > -- pubEndorsementKey->pubKey.key, > -- &pubEndorsementKey->pubKey.keyLength); > -+ pubEndorsementKey->pubKey.key, > -+ &key_length); > -+ pubEndorsementKey->pubKey.keyLength = key_length; > - pubEndorsementKey->algorithmParms.algorithmID = TPM_ALG_RSA; > - pubEndorsementKey->algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - pubEndorsementKey->algorithmParms.sigScheme = TPM_SS_NONE; > -- pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length; > -+ pubEndorsementKey->algorithmParms.parms.rsa.keyLength = key_length << 3; > - pubEndorsementKey->algorithmParms.parms.rsa.numPrimes = 2; > - pubEndorsementKey->algorithmParms.parms.rsa.exponentSize = 0; > - pubEndorsementKey->algorithmParms.parms.rsa.exponent = NULL; > -@@ -175,6 +175,7 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - { > - TPM_RESULT res; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -+ size_t key_length; > - info("TPM_OwnerReadInternalPub()"); > - /* verify authorization */ > - res = tpm_verify_auth(auth1, tpmData.permanent.data.ownerAuth, TPM_KH_OWNER); > -@@ -186,7 +187,8 @@ TPM_RESULT TPM_OwnerReadInternalPub(TPM_ > - publicPortion->pubKey.key = tpm_malloc(publicPortion->pubKey.keyLength); > - if (publicPortion->pubKey.key == NULL) return TPM_FAIL; > - rsa_export_modulus(&srk->key, publicPortion->pubKey.key, > -- &publicPortion->pubKey.keyLength); > -+ &key_length); > -+ publicPortion->pubKey.keyLength = key_length; > - publicPortion->algorithmParms.algorithmID = TPM_ALG_RSA; > - publicPortion->algorithmParms.encScheme = srk->encScheme; > - publicPortion->algorithmParms.sigScheme = srk->sigScheme; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_crypto.c tpm_emulator/tpm/tpm_crypto.c > ---- orig/tpm_emulator-0.4/tpm/tpm_crypto.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_crypto.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -182,7 +182,8 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ UINT32 length32; > -+ size_t length; > - info("TPM_CertifyKey()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -264,14 +265,15 @@ TPM_RESULT TPM_CertifyKey(TPM_KEY_HANDLE > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32=(UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - sha1_init(&sha1_ctx); > -- sha1_update(&sha1_ctx, buf, length); > -+ sha1_update(&sha1_ctx, buf, (size_t) length); > - sha1_final(&sha1_ctx, buf); > - res = tpm_sign(cert, auth1, FALSE, buf, SHA1_DIGEST_LENGTH, outData, outDataSize); > - tpm_free(buf); > -@@ -292,7 +294,8 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - TPM_KEY_DATA *cert, *key; > - sha1_ctx_t sha1_ctx; > - BYTE *buf, *p; > -- UINT32 length; > -+ size_t length; > -+ UINT32 length32; > - info("TPM_CertifyKey2()"); > - /* get keys */ > - cert = tpm_get_key(certHandle); > -@@ -362,8 +365,9 @@ TPM_RESULT TPM_CertifyKey2(TPM_KEY_HANDL > - /* compute the digest of the CERTIFY_INFO[2] structure and sign it */ > - length = sizeof_TPM_CERTIFY_INFO((*certifyInfo)); > - p = buf = tpm_malloc(length); > -+ length32 = (UINT32) length; > - if (buf == NULL > -- || tpm_marshal_TPM_CERTIFY_INFO(&p, &length, certifyInfo)) { > -+ || tpm_marshal_TPM_CERTIFY_INFO(&p, &length32, certifyInfo)) { > - free_TPM_KEY_PARMS(certifyInfo->algorithmParms); > - return TPM_FAIL; > - } > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_daa.c tpm_emulator/tpm/tpm_daa.c > ---- orig/tpm_emulator-0.4/tpm/tpm_daa.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_daa.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -716,14 +716,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -805,14 +805,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1489,14 +1489,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1712,14 +1712,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -1793,14 +1793,14 @@ TPM_RESULT TPM_DAA_Join(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -2918,14 +2918,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3143,7 +3143,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_update(&sha1, inputData1, inputSize1); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > - } > -@@ -3172,7 +3172,7 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_session.DAA_digest, > - sizeof(session->DAA_session.DAA_digest)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE*) "\x00", 1); > - rsa_export_modulus(&aikData->key, scratch, &size); > - sha1_update(&sha1, scratch, size); > - sha1_final(&sha1, (BYTE*) &session->DAA_session.DAA_digest); > -@@ -3229,14 +3229,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -@@ -3309,14 +3309,14 @@ TPM_RESULT TPM_DAA_Sign(TPM_HANDLE handl > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x00", 1); > -+ sha1_update(&sha1, (BYTE *) "\x00", 1); > - sha1_final(&sha1, scratch); > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_rekey, > - sizeof(session->DAA_tpmSpecific.DAA_rekey)); > - sha1_update(&sha1, (BYTE*) &session->DAA_tpmSpecific.DAA_count, > - sizeof(session->DAA_tpmSpecific.DAA_count)); > -- sha1_update(&sha1, "\x01", 1); > -+ sha1_update(&sha1, (BYTE *) "\x01", 1); > - sha1_final(&sha1, scratch + SHA1_DIGEST_LENGTH); > - mpz_init(f), mpz_init(q); > - mpz_import(f, 2 * SHA1_DIGEST_LENGTH, 1, 1, 0, 0, scratch); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_data.c tpm_emulator/tpm/tpm_data.c > ---- orig/tpm_emulator-0.4/tpm/tpm_data.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_data.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -40,6 +40,7 @@ static inline void init_pcr_attr(int pcr > - void tpm_init_data(void) > - { > - /* endorsement key */ > -+#ifndef TPM_GENERATE_EK > - uint8_t ek_n[] = "\xa8\xdb\xa9\x42\xa8\xf3\xb8\x06\x85\x90\x76\x93\xad\xf7" > - "\x74\xec\x3f\xd3\x3d\x9d\xe8\x2e\xff\x15\xed\x0e\xce\x5f\x93" > - "\x92\xeb\xd1\x96\x2b\x72\x18\x81\x79\x12\x9d\x9c\x40\xd7\x1a" > -@@ -77,6 +78,8 @@ void tpm_init_data(void) > - "\xd1\xc0\x8b\x5b\xa2\x2e\xa7\x15\xca\x50\x75\x10\x48\x9c\x2b" > - "\x18\xb9\x67\x8f\x5d\x64\xc3\x28\x9f\x2f\x16\x2f\x08\xda\x47" > - "\xec\x86\x43\x0c\x80\x99\x07\x34\x0f"; > -+#endif > -+ > - int i; > - /* reset all data to NULL, FALSE or 0 */ > - memset(&tpmData, 0, sizeof(tpmData)); > -@@ -152,44 +155,43 @@ void tpm_release_data(void) > - > - #ifdef TPM_STORE_TO_FILE > - > --#include > --#include > --#include > -+#include > -+#include > -+#include > -+#include > - > - #define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (IS_ERR(fp)) return -1; > -- set_fs(get_ds()); > -- res = fp->f_op->write(fp, data, data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ int fp; > -+ fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -+ res = write(fp, data, data_length); > -+ close(fp); > - return (res == data_length) ? 0 : -1; > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > - int res; > -- struct file *fp; > -- mm_segment_t old_fs = get_fs(); > -- fp = filp_open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- if (IS_ERR(fp)) return -1; > -- *data_length = (size_t)fp->f_dentry->d_inode->i_size; > -- /* *data_length = i_size_read(fp->f_dentry->d_inode); */ > -+ int fp, file_status; > -+ struct stat file_info; > -+ fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -+ file_status = fstat(fp, &file_info); > -+ if (file_status < 0) { > -+ close(fp); > -+ return -1; > -+ } > -+ > -+ *data_length = file_info.st_size; > - *data = tpm_malloc(*data_length); > - if (*data == NULL) { > -- filp_close(fp, NULL); > -+ close(fp); > - return -1; > - } > -- set_fs(get_ds()); > -- res = fp->f_op->read(fp, *data, *data_length, &fp->f_pos); > -- set_fs(old_fs); > -- filp_close(fp, NULL); > -+ res = read(fp, *data, *data_length); > -+ close(fp); > - if (res != *data_length) { > - tpm_free(*data); > - return -1; > -@@ -216,23 +218,30 @@ static int read_from_file(uint8_t **data > - int tpm_store_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ UINT32 buf_length, len; > - > - /* marshal data */ > -- buf_length = len = sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -- + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) + 2 > -- + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data); > -+ buf_length = len = 4 + sizeof_TPM_STCLEAR_FLAGS(tpmData.stclear.flags) > -+ + sizeof_TPM_PERMANENT_FLAGS(tpmData.permanent.flags) > -+ + sizeof_TPM_STANY_FLAGS(tpmData.stany.flags) + 2 > -+ + sizeof_TPM_STCLEAR_DATA(tpmData.stclear.data) > -+ + sizeof_TPM_PERMANENT_DATA(tpmData.permanent.data) > -+ + sizeof_TPM_STANY_DATA(tpmData.stany.data); > - buf = ptr = tpm_malloc(buf_length); > - if (buf == NULL > - || tpm_marshal_TPM_VERSION(&ptr, &len, &tpmData.permanent.data.version) > - || tpm_marshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_marshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_marshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.selfTestSucceeded) > - || tpm_marshal_BOOL(&ptr, &len, tpmData.permanent.flags.owned) > -- || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_marshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_marshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_marshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - if (write_to_file(buf, buf_length - len)) { > - tpm_free(buf); > - return -1; > -@@ -244,31 +253,36 @@ int tpm_store_permanent_data(void) > - int tpm_restore_permanent_data(void) > - { > - uint8_t *buf, *ptr; > -- size_t buf_length, len; > -+ size_t buf_length; > -+ UINT32 len; > - TPM_VERSION ver; > - > - /* read data */ > - if (read_from_file(&buf, &buf_length)) return -1; > - ptr = buf; > -- len = buf_length; > -+ len = (uint32_t) buf_length; > - /* unmarshal data */ > - if (tpm_unmarshal_TPM_VERSION(&ptr, &len, &ver) > - || memcmp(&ver, &tpmData.permanent.data.version, sizeof(TPM_VERSION)) > - || tpm_unmarshal_TPM_STCLEAR_FLAGS(&ptr, &len, &tpmData.stclear.flags) > - || tpm_unmarshal_TPM_PERMANENT_FLAGS(&ptr, &len, &tpmData.permanent.flags) > -+ || tpm_unmarshal_TPM_STANY_FLAGS(&ptr, &len, &tpmData.stany.flags) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.selfTestSucceeded) > - || tpm_unmarshal_BOOL(&ptr, &len, &tpmData.permanent.flags.owned) > -- || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data)) { > -+ || tpm_unmarshal_TPM_STCLEAR_DATA(&ptr, &len, &tpmData.stclear.data) > -+ || tpm_unmarshal_TPM_PERMANENT_DATA(&ptr, &len, &tpmData.permanent.data) > -+ || tpm_unmarshal_TPM_STANY_DATA(&ptr, &len, &tpmData.stany.data)) { > - tpm_free(buf); > - return -1; > - } > -+ > - tpm_free(buf); > - return 0; > - } > - > - int tpm_erase_permanent_data(void) > - { > -- int res = write_to_file("", 0); > -+ int res = write_to_file((uint8_t *) "", 0); > - return res; > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_deprecated.c tpm_emulator/tpm/tpm_deprecated.c > ---- orig/tpm_emulator-0.4/tpm/tpm_deprecated.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_deprecated.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -50,7 +51,7 @@ TPM_RESULT TPM_SaveKeyContext(TPM_KEY_HA > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveKeyContext()"); > -- res = TPM_SaveContext(keyHandle, TPM_RT_KEY, "SaveKeyContext..", > -+ res = TPM_SaveContext(keyHandle, TPM_RT_KEY, (BYTE*)"SaveKeyContext..", > - keyContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *keyContextSize; > -@@ -82,7 +83,7 @@ TPM_RESULT TPM_SaveAuthContext(TPM_AUTHH > - BYTE *ptr; > - UINT32 len; > - info("TPM_SaveAuthContext()"); > -- res = TPM_SaveContext(authHandle, TPM_RT_KEY, "SaveAuthContext.", > -+ res = TPM_SaveContext(authHandle, TPM_RT_KEY, (BYTE*)"SaveAuthContext.", > - authContextSize, &contextBlob); > - if (res != TPM_SUCCESS) return res; > - len = *authContextSize; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_emulator.h tpm_emulator/tpm/tpm_emulator.h > ---- orig/tpm_emulator-0.4/tpm/tpm_emulator.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_emulator.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,5 +1,6 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -22,7 +23,8 @@ > - /* TPM configuration */ > - #define TPM_STORE_TO_FILE 1 > - #undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+//#undef TPM_GENERATE_EK > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - > - #define TPM_MANUFACTURER 0x4554485A /* 'ETHZ' */ > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.c tpm_emulator/tpm/tpm_marshalling.c > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1312,7 +1312,7 @@ int tpm_unmarshal_TPM_STANY_FLAGS(BYTE * > - > - int tpm_marshal_RSA(BYTE **ptr, UINT32 *length, rsa_private_key_t *v) > - { > -- UINT32 m_len, e_len, q_len; > -+ size_t m_len, e_len, q_len; > - if (*length < sizeof_RSA((*v))) return -1; > - if (v->size > 0) { > - rsa_export_modulus(v, &(*ptr)[6], &m_len); > -@@ -1460,6 +1460,66 @@ int tpm_unmarshal_TPM_PERMANENT_DATA(BYT > - return 0; > - } > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_marshal_TPM_COUNT_ID(ptr, length, v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v) > -+{ > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceKey) > -+ || tpm_unmarshal_TPM_COUNT_ID(ptr, length, &v->countID) ) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_marshal_TPM_STRUCTURE_TAG(ptr, length, v->tag) > -+ || tpm_marshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_marshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_marshal_BOOL(ptr, length, v->auditSession) > -+ || tpm_marshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_marshal_UINT32(ptr, length, v->contextCount) > -+ || tpm_marshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_marshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_marshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_marshal_TPM_TRANSHANDLE(ptr, length, v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v) > -+{ > -+ UINT32 i; > -+ if (tpm_unmarshal_TPM_STRUCTURE_TAG(ptr, length, &v->tag) > -+ || tpm_unmarshal_TPM_NONCE(ptr, length, &v->contextNonceSession) > -+ || tpm_unmarshal_TPM_DIGEST(ptr, length, &v->auditDigest) > -+ || tpm_unmarshal_BOOL(ptr, length, &v->auditSession) > -+ || tpm_unmarshal_TPM_CURRENT_TICKS(ptr, length, &v->currentTicks) > -+ || tpm_unmarshal_UINT32(ptr, length, &v->contextCount) > -+ || tpm_unmarshal_UINT32_ARRAY(ptr, length, v->contextList, TPM_MAX_SESSION_LIST)) return -1; > -+ for (i = 0; i < TPM_MAX_SESSIONS; i++) { > -+ if (tpm_unmarshal_TPM_SESSION_DATA(ptr, length, &v->sessions[i])) return -1; > -+ } > -+ for (i = 0; i < TPM_MAX_SESSIONS_DAA; i++) { > -+ if (tpm_unmarshal_TPM_DAA_SESSION_DATA(ptr, length, &v->sessionsDAA[i])) return -1; > -+ } > -+ if (tpm_unmarshal_TPM_TRANSHANDLE(ptr, length, &v->transExclusive)) return -1; > -+ > -+ return 0; > -+} > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v) > - { > - if (tpm_marshal_BYTE(ptr, length, v->type) > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_marshalling.h tpm_emulator/tpm/tpm_marshalling.h > ---- orig/tpm_emulator-0.4/tpm/tpm_marshalling.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_marshalling.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -432,6 +432,12 @@ int tpm_unmarshal_TPM_KEY_DATA(BYTE **pt > - int tpm_marshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - int tpm_unmarshal_TPM_PERMANENT_DATA(BYTE **ptr, UINT32 *length, TPM_PERMANENT_DATA *); > - > -+int tpm_marshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+int tpm_unmarshal_TPM_STCLEAR_DATA(BYTE **ptr, UINT32 *length, TPM_STCLEAR_DATA *v); > -+ > -+int tpm_marshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+int tpm_unmarshal_TPM_STANY_DATA(BYTE **ptr, UINT32 *length, TPM_STANY_DATA *v); > -+ > - int tpm_marshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - int tpm_unmarshal_TPM_SESSION_DATA(BYTE **ptr, UINT32 *length, TPM_SESSION_DATA *v); > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_owner.c tpm_emulator/tpm/tpm_owner.c > ---- orig/tpm_emulator-0.4/tpm/tpm_owner.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_owner.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -108,7 +108,7 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - TPM_RESULT res; > - rsa_private_key_t *ek = &tpmData.permanent.data.endorsementKey; > - TPM_KEY_DATA *srk = &tpmData.permanent.data.srk; > -- UINT32 buf_size = ek->size >> 3; > -+ size_t buf_size = ek->size >> 3, key_length; > - BYTE buf[buf_size]; > - > - info("TPM_TakeOwnership()"); > -@@ -173,7 +173,8 @@ TPM_RESULT TPM_TakeOwnership(TPM_PROTOCO > - return TPM_FAIL; > - } > - rsa_export_modulus(&srk->key, srkPub->pubKey.key, > -- &srkPub->pubKey.keyLength); > -+ &key_length); > -+ srkPub->pubKey.keyLength = (UINT32) key_length; > - /* setup tpmProof and set state to owned */ > - tpm_get_random_bytes(tpmData.permanent.data.tpmProof.nonce, > - sizeof(tpmData.permanent.data.tpmProof.nonce)); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_startup.c tpm_emulator/tpm/tpm_startup.c > ---- orig/tpm_emulator-0.4/tpm/tpm_startup.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_startup.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -41,26 +41,29 @@ void TPM_Init(TPM_STARTUP_TYPE startupTy > - TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE startupType) > - { > - int i; > -+ int restore_fail; > - info("TPM_Startup(%d)", startupType); > - if (tpmData.stany.flags.postInitialise == FALSE) return TPM_INVALID_POSTINIT; > -- /* reset STANY_FLAGS */ > -- SET_TO_ZERO(&tpmData.stany.flags); > -- tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -- /* reset STANY_DATA (invalidates ALL sessions) */ > -- SET_TO_ZERO(&tpmData.stany.data); > -- tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -- /* init session-context nonce */ > -- SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > -+ > -+ /* try and restore state to get EK, SRK, etc */ > -+ restore_fail = tpm_restore_permanent_data(); > -+ > - /* set data and flags according to the given startup type */ > - if (startupType == TPM_ST_CLEAR) { > -- /* if available, restore permanent data */ > -- tpm_restore_permanent_data(); > -+ /* reset STANY_FLAGS */ > -+ SET_TO_ZERO(&tpmData.stany.flags); > -+ tpmData.stany.flags.tag = TPM_TAG_STANY_FLAGS; > -+ /* reset STANY_DATA (invalidates ALL sessions) */ > -+ SET_TO_ZERO(&tpmData.stany.data); > -+ tpmData.stany.data.tag = TPM_TAG_STANY_DATA; > -+ /* init session-context nonce */ > -+ SET_TO_RAND(&tpmData.stany.data.contextNonceSession); > - /* reset PCR values */ > - for (i = 0; i < TPM_NUM_PCR; i++) { > -- if (tpmData.permanent.data.pcrAttrib[i].pcrReset) > -- SET_TO_ZERO(tpmData.permanent.data.pcrValue[i].digest); > -+ if (!tpmData.permanent.data.pcrAttrib[i].pcrReset) > -+ SET_TO_ZERO(&tpmData.permanent.data.pcrValue[i].digest); > - else > -- SET_TO_0xFF(tpmData.permanent.data.pcrValue[i].digest); > -+ SET_TO_0xFF(&tpmData.permanent.data.pcrValue[i].digest); > - } > - /* reset STCLEAR_FLAGS */ > - SET_TO_ZERO(&tpmData.stclear.flags); > -@@ -79,7 +82,8 @@ TPM_RESULT TPM_Startup(TPM_STARTUP_TYPE > - /* init key-context nonce */ > - SET_TO_RAND(&tpmData.stclear.data.contextNonceKey); > - } else if (startupType == TPM_ST_STATE) { > -- if (tpm_restore_permanent_data()) { > -+ /* restore must have been successful for TPM_ST_STATE */ > -+ if (restore_fail) { > - error("restoring permanent data failed"); > - tpmData.permanent.data.testResult = "tpm_restore_permanent_data() failed"; > - tpmData.permanent.flags.selfTestSucceeded = FALSE; > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_storage.c tpm_emulator/tpm/tpm_storage.c > ---- orig/tpm_emulator-0.4/tpm/tpm_storage.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_storage.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -58,6 +58,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - BYTE *enc, UINT32 *enc_size) > - { > - UINT32 len; > -+ size_t enc_size32 = *enc_size; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -@@ -72,7 +73,7 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_SEALED_DATA(&ptr, &len, seal) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_SEALED_DATA((*seal)), > -- enc, enc_size)) { > -+ enc, &enc_size32)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > -@@ -85,7 +86,8 @@ int encrypt_sealed_data(TPM_KEY_DATA *ke > - int decrypt_sealed_data(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_SEALED_DATA *seal, BYTE **buf) > - { > -- UINT32 len; > -+ size_t len; > -+ UINT32 len32; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -96,8 +98,12 @@ int decrypt_sealed_data(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len, seal)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ){ > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = len; > -+ if (tpm_unmarshal_TPM_SEALED_DATA(&ptr, &len32, seal)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -240,11 +246,12 @@ TPM_RESULT TPM_Unseal(TPM_KEY_HANDLE par > - > - TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE keyHandle, UINT32 inDataSize, > - BYTE *inData, TPM_AUTH *auth1, > -- UINT32 *outDataSize, BYTE **outData) > -+ UINT32 *outDataSize32, BYTE **outData) > - { > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - int scheme; > -+ size_t outDataSize; > - > - info("TPM_UnBind()"); > - /* get key */ > -@@ -262,8 +269,8 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - /* the size of the input data muss be greater than zero */ > - if (inDataSize == 0) return TPM_BAD_PARAMETER; > - /* decrypt data */ > -- *outDataSize = inDataSize; > -- *outData = tpm_malloc(*outDataSize); > -+ outDataSize = inDataSize; > -+ *outData = tpm_malloc(outDataSize); > - if (*outData == NULL) return TPM_NOSPACE; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > -@@ -271,20 +278,21 @@ TPM_RESULT TPM_UnBind(TPM_KEY_HANDLE key > - default: tpm_free(*outData); return TPM_DECRYPT_ERROR; > - } > - if (rsa_decrypt(&key->key, scheme, inData, inDataSize, > -- *outData, outDataSize)) { > -+ *outData, &outDataSize)) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > - /* verify data if it is of type TPM_BOUND_DATA */ > - if (key->encScheme == TPM_ES_RSAESOAEP_SHA1_MGF1 > - || key->keyUsage != TPM_KEY_LEGACY) { > -- if (*outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > -+ if (outDataSize < 5 || memcmp(*outData, "\x01\x01\00\x00\x02", 5) != 0) { > - tpm_free(*outData); > - return TPM_DECRYPT_ERROR; > - } > -- *outDataSize -= 5; > -- memmove(*outData, &(*outData)[5], *outDataSize); > -+ outDataSize -= 5; > -+ memmove(*outData, &(*outData)[5], outDataSize); > - } > -+ *outDataSize32 = (UINT32) outDataSize; > - return TPM_SUCCESS; > - } > - > -@@ -334,12 +342,13 @@ int compute_pubkey_digest(TPM_PUBKEY *ke > - } > - > - int encrypt_private_key(TPM_KEY_DATA *key, TPM_STORE_ASYMKEY *store, > -- BYTE *enc, UINT32 *enc_size) > -+ BYTE *enc, UINT32 *enc_size32) > - { > - UINT32 len; > - BYTE *buf, *ptr; > - rsa_public_key_t pub_key; > - int scheme; > -+ size_t enc_size; > - switch (key->encScheme) { > - case TPM_ES_RSAESOAEP_SHA1_MGF1: scheme = RSA_ES_OAEP_SHA1; break; > - case TPM_ES_RSAESPKCSv15: scheme = RSA_ES_PKCSV15; break; > -@@ -351,11 +360,12 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - if (buf == NULL > - || tpm_marshal_TPM_STORE_ASYMKEY(&ptr, &len, store) > - || rsa_encrypt(&pub_key, scheme, buf, sizeof_TPM_STORE_ASYMKEY((*store)), > -- enc, enc_size)) { > -+ enc, &enc_size)) { > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return -1; > - } > -+ *enc_size32 = (UINT32) enc_size; > - tpm_free(buf); > - rsa_release_public_key(&pub_key); > - return 0; > -@@ -364,7 +374,8 @@ int encrypt_private_key(TPM_KEY_DATA *ke > - int decrypt_private_key(TPM_KEY_DATA *key, BYTE *enc, UINT32 enc_size, > - TPM_STORE_ASYMKEY *store, BYTE **buf) > - { > -- UINT32 len; > -+ UINT32 len32; > -+ size_t len; > - BYTE *ptr; > - int scheme; > - switch (key->encScheme) { > -@@ -375,8 +386,12 @@ int decrypt_private_key(TPM_KEY_DATA *ke > - len = enc_size; > - *buf = ptr = tpm_malloc(len); > - if (*buf == NULL > -- || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) > -- || tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len, store)) { > -+ || rsa_decrypt(&key->key, scheme, enc, enc_size, *buf, &len) ) { > -+ tpm_free(*buf); > -+ return -1; > -+ } > -+ len32 = (UINT32) len; > -+ if (tpm_unmarshal_TPM_STORE_ASYMKEY(&ptr, &len32, store)) { > - tpm_free(*buf); > - return -1; > - } > -@@ -394,7 +409,7 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - TPM_SESSION_DATA *session; > - TPM_STORE_ASYMKEY store; > - rsa_private_key_t rsa; > -- UINT32 key_length; > -+ size_t key_length; > - > - info("TPM_CreateWrapKey()"); > - /* get parent key */ > -@@ -450,11 +465,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - } > - } > - /* generate key and store it */ > -- key_length = keyInfo->algorithmParms.parms.rsa.keyLength; > -- if (rsa_generate_key(&rsa, key_length)) return TPM_FAIL; > -- wrappedKey->pubKey.keyLength = key_length >> 3; > -+ if (rsa_generate_key(&rsa, keyInfo->algorithmParms.parms.rsa.keyLength)) > -+ return TPM_FAIL; > -+ wrappedKey->pubKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 3; > - wrappedKey->pubKey.key = tpm_malloc(wrappedKey->pubKey.keyLength); > -- store.privKey.keyLength = key_length >> 4; > -+ store.privKey.keyLength = keyInfo->algorithmParms.parms.rsa.keyLength >> 4; > - store.privKey.key = tpm_malloc(store.privKey.keyLength); > - wrappedKey->encDataSize = parent->key.size >> 3; > - wrappedKey->encData = tpm_malloc(wrappedKey->encDataSize); > -@@ -466,9 +481,11 @@ TPM_RESULT TPM_CreateWrapKey(TPM_KEY_HAN > - tpm_free(wrappedKey->encData); > - return TPM_NOSPACE; > - } > -- rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -- &wrappedKey->pubKey.keyLength); > -- rsa_export_prime1(&rsa, store.privKey.key, &store.privKey.keyLength); > -+ rsa_export_modulus(&rsa, wrappedKey->pubKey.key, > -+ &key_length); > -+ wrappedKey->pubKey.keyLength = (UINT32) key_length; > -+ rsa_export_prime1(&rsa, store.privKey.key, &key_length); > -+ store.privKey.keyLength = (UINT32) key_length; > - rsa_release_private_key(&rsa); > - /* compute the digest of the wrapped key (without encData) */ > - if (compute_key_digest(wrappedKey, &store.pubDataDigest)) { > -@@ -602,6 +619,7 @@ TPM_RESULT TPM_LoadKey2(TPM_KEY_HANDLE p > - > - int tpm_setup_key_parms(TPM_KEY_DATA *key, TPM_KEY_PARMS *parms) > - { > -+ size_t key_length; > - parms->algorithmID = TPM_ALG_RSA; > - parms->encScheme = key->encScheme; > - parms->sigScheme = key->sigScheme; > -@@ -611,7 +629,8 @@ int tpm_setup_key_parms(TPM_KEY_DATA *ke > - parms->parms.rsa.exponent = tpm_malloc(parms->parms.rsa.exponentSize); > - if (parms->parms.rsa.exponent == NULL) return -1; > - rsa_export_exponent(&key->key, parms->parms.rsa.exponent, > -- &parms->parms.rsa.exponentSize); > -+ &key_length); > -+ parms->parms.rsa.exponentSize = (UINT32) key_length; > - parms->parmSize = 12 + parms->parms.rsa.exponentSize; > - return 0; > - } > -@@ -622,6 +641,7 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - TPM_RESULT res; > - TPM_KEY_DATA *key; > - TPM_DIGEST digest; > -+ size_t key_length; > - info("TPM_GetPubKey()"); > - /* get key */ > - if (keyHandle == TPM_KH_SRK > -@@ -650,8 +670,8 @@ TPM_RESULT TPM_GetPubKey(TPM_KEY_HANDLE > - pubKey->pubKey.keyLength = key->key.size >> 3; > - pubKey->pubKey.key = tpm_malloc(pubKey->pubKey.keyLength); > - if (pubKey->pubKey.key == NULL) return TPM_NOSPACE; > -- rsa_export_modulus(&key->key, pubKey->pubKey.key, > -- &pubKey->pubKey.keyLength); > -+ rsa_export_modulus(&key->key, pubKey->pubKey.key, &key_length); > -+ pubKey->pubKey.keyLength = (UINT32) key_length; > - if (tpm_setup_key_parms(key, &pubKey->algorithmParms) != 0) { > - error("TPM_GetPubKey(): tpm_setup_key_parms() failed."); > - tpm_free(pubKey->pubKey.key); > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_structures.h tpm_emulator/tpm/tpm_structures.h > ---- orig/tpm_emulator-0.4/tpm/tpm_structures.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_structures.h 2006-07-24 14:35:35.000000000 -0700 > -@@ -1958,6 +1958,7 @@ typedef struct tdTPM_DAA_ISSUER { > - TPM_DIGEST DAA_digest_gamma; > - BYTE DAA_generic_q[26]; > - } TPM_DAA_ISSUER; > -+#define sizeof_TPM_DAA_ISSUER(s) (2 + (20 * 6) + 26 ) > - > - /* > - * TPM_DAA_TPM ([TPM_Part2], Section 22.4) > -@@ -1973,6 +1974,7 @@ typedef struct tdTPM_DAA_TPM { > - TPM_DIGEST DAA_rekey; > - UINT32 DAA_count; > - } TPM_DAA_TPM; > -+#define sizeof_TPM_DAA_TPM(s) (2 + (4 * 20) + 4) > - > - /* > - * TPM_DAA_CONTEXT ([TPM_Part2], Section 22.5) > -@@ -1987,6 +1989,7 @@ typedef struct tdTPM_DAA_CONTEXT { > - BYTE DAA_scratch[256]; > - BYTE DAA_stage; > - } TPM_DAA_CONTEXT; > -+#define sizeof_TPM_DAA_CONTEXT(s) (2 + (3 * 20) + 256 + 1) > - > - /* > - * TPM_DAA_JOINDATA ([TPM_Part2], Section 22.6) > -@@ -1998,6 +2001,7 @@ typedef struct tdTPM_DAA_JOINDATA { > - BYTE DAA_join_u1[138]; > - TPM_DIGEST DAA_digest_n0; > - } TPM_DAA_JOINDATA; > -+#define sizeof_TPM_DAA_JOINDATA(s) (1 + 1 + 20) > - > - /* > - * TPM_DAA_BLOB ([TPM_Part2], Section 22.8) > -@@ -2202,6 +2206,7 @@ typedef struct tdTPM_STCLEAR_DATA { > - //UINT32 ownerReference; > - //BOOL disableResetLock; > - } TPM_STCLEAR_DATA; > -+#define sizeof_TPM_STCLEAR_DATA(s) (2 + 20 + 4) > - > - /* > - * TPM_SESSION_DATA > -@@ -2238,6 +2243,11 @@ typedef struct tdTPM_DAA_SESSION_DATA { > - TPM_DAA_JOINDATA DAA_joinSession; > - TPM_HANDLE handle; > - } TPM_DAA_SESSION_DATA; > -+#define sizeof_TPM_DAA_SESSION_DATA(s) ( 1 \ > -+ + sizeof_TPM_DAA_ISSUER(s.DAA_issuerSettings) \ > -+ + sizeof_TPM_DAA_TPM(s.DAA_tpmSpecific) \ > -+ + sizeof_TPM_DAA_CONTEXT(s.DAA_session) \ > -+ + sizeof_TPM_DAA_JOINDATA(s.DAA_joinSession) + 4) > - > - /* > - * TPM_STANY_DATA ([TPM_Part2], Section 7.6) > -@@ -2262,6 +2272,11 @@ typedef struct tdTPM_STANY_DATA { > - TPM_DAAHANDLE currentDAA; > - TPM_TRANSHANDLE transExclusive; > - } TPM_STANY_DATA; > -+#define sizeof_TPM_STANY_DATA(s) (2 + 20 + 20 + 1 \ > -+ + sizeof_TPM_CURRENT_TICKS(s.currentTicks) \ > -+ + 4 + (4 * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_SESSION_DATA(s.sessions[0]) * TPM_MAX_SESSION_LIST) \ > -+ + (sizeof_TPM_DAA_SESSION_DATA(s.sessionsDAA[0]) * TPM_MAX_SESSIONS_DAA) + 4) > - > - /* > - * TPM_DATA > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_testing.c tpm_emulator/tpm/tpm_testing.c > ---- orig/tpm_emulator-0.4/tpm/tpm_testing.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_testing.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -95,24 +96,24 @@ static int tpm_test_sha1(void) > - struct { > - uint8_t *data; uint32_t repetitions; uint8_t *digest; > - } test_cases[] = {{ > -- "abc", 1, > -- "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > -+ (uint8_t*)"abc", 1, > -+ (uint8_t*)"\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D" > - }, { > -- "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -- "\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > -+ (uint8_t*)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, > -+ (uint8_t*)"\x84\x98\x3E\x44\x1C\x3B\xD2\x6E\xBA\xAE\x4A\xA1\xF9\x51\x29\xE5\xE5\x46\x70\xF1" > - }, { > -- "a", 1000000, > -- "\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > -+ (uint8_t*)"a", 1000000, > -+ (uint8_t*)"\x34\xAA\x97\x3C\xD4\xC4\xDA\xA4\xF6\x1E\xEB\x2B\xDB\xAD\x27\x31\x65\x34\x01\x6F" > - }, { > -- "0123456701234567012345670123456701234567012345670123456701234567", 10, > -- "\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > -+ (uint8_t*)"0123456701234567012345670123456701234567012345670123456701234567", 10, > -+ (uint8_t*)"\xDE\xA3\x56\xA2\xCD\xDD\x90\xC7\xA7\xEC\xED\xC5\xEB\xB5\x63\x93\x4F\x46\x04\x52" > - }}; > - > - debug("tpm_test_sha1()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > - sha1_init(&ctx); > - for (j = 0; j < test_cases[i].repetitions; j++) > -- sha1_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ sha1_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - sha1_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > - } > -@@ -128,41 +129,41 @@ static int tpm_test_hmac(void) > - struct { > - uint8_t *key, key_len, *data, data_len, *digest; > - } test_cases[] = {{ > -- "\x0b", 20, "Hi There", 8, > -- "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > -+ (uint8_t*)"\x0b", 20, (uint8_t*)"Hi There", 8, > -+ (uint8_t*)"\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1\x46\xbe\x00" > - }, { > -- "Jefe", 4, "what do ya want for nothing?", 28, > -- "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > -+ (uint8_t*)"Jefe", 4, (uint8_t*)"what do ya want for nothing?", 28, > -+ (uint8_t*)"\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79" > - }, { > -- "\xaa", 20, "\xdd", 50, > -- "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > -+ (uint8_t*)"\xaa", 20, (uint8_t*)"\xdd", 50, > -+ (uint8_t*)"\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3" > - }, { > -- "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -- "\x15\x16\x17\x18\x19", 25, "\xcd", 50, > -- "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > -+ (uint8_t*)"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" > -+ "\x15\x16\x17\x18\x19", 25, (uint8_t*)"\xcd", 50, > -+ (uint8_t*)"\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda" > - }, { > -- "\x0c", 20, "Test With Truncation", 20, > -- "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > -+ (uint8_t*)"\x0c", 20, (uint8_t*)"Test With Truncation", 20, > -+ (uint8_t*)"\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04" > - }, { > -- "\xaa", 80, "Test Using Larger Than Block-Size Key - Hash Key First", 54, > -- "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > -+ (uint8_t*)"\xaa", 80, (uint8_t*)"Test Using Larger Than Block-Size Key - Hash Key First", 54, > -+ (uint8_t*)"\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12" > - }, { > -- "\xaa", 80, > -- "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -- "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > -+ (uint8_t*)"\xaa", 80, > -+ (uint8_t*)"Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data", 73, > -+ (uint8_t*)"\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91" > - }}; > - > - debug("tpm_test_hmac()"); > - for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) { > -- if (strlen(test_cases[i].key) < test_cases[i].key_len) { > -+ if (strlen((char*)test_cases[i].key) < test_cases[i].key_len) { > - uint8_t key[test_cases[i].key_len]; > - memset(key, test_cases[i].key[0], test_cases[i].key_len); > - hmac_init(&ctx, key, test_cases[i].key_len); > - } else { > - hmac_init(&ctx, test_cases[i].key, test_cases[i].key_len); > - } > -- for (j = 0; j < test_cases[i].data_len; j += strlen(test_cases[i].data)) { > -- hmac_update(&ctx, test_cases[i].data, strlen(test_cases[i].data)); > -+ for (j = 0; j < test_cases[i].data_len; j += strlen((char*)test_cases[i].data)) { > -+ hmac_update(&ctx, test_cases[i].data, strlen((char*)test_cases[i].data)); > - } > - hmac_final(&ctx, digest); > - if (memcmp(digest, test_cases[i].digest, SHA1_DIGEST_LENGTH) != 0) return -1; > -@@ -173,9 +174,9 @@ static int tpm_test_hmac(void) > - static int tpm_test_rsa_EK(void) > - { > - int res = 0; > -- char *data = "RSA PKCS #1 v1.5 Test-String"; > -+ uint8_t *data = (uint8_t*)"RSA PKCS #1 v1.5 Test-String"; > - uint8_t buf[256]; > -- size_t buf_len, data_len = strlen(data); > -+ size_t buf_len, data_len = strlen((char*)data); > - rsa_private_key_t priv_key; > - rsa_public_key_t pub_key; > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_ticks.c tpm_emulator/tpm/tpm_ticks.c > ---- orig/tpm_emulator-0.4/tpm/tpm_ticks.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_ticks.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -39,9 +40,7 @@ TPM_RESULT TPM_SetTickType(TPM_TICKTYPE > - TPM_RESULT TPM_GetTicks(TPM_CURRENT_TICKS *currentTime) > - { > - info("TPM_GetTicks()"); > -- memcpy(currentTime, &tpmData.stany.data.currentTicks, > -- sizeof(TPM_CURRENT_TICKS)); > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - TPM_RESULT TPM_TickStampBlob(TPM_KEY_HANDLE keyHandle, TPM_NONCE *antiReplay, > -@@ -49,64 +48,11 @@ TPM_RESULT TPM_TickStampBlob(TPM_KEY_HAN > - TPM_CURRENT_TICKS *currentTicks, > - UINT32 *sigSize, BYTE **sig) > - { > -- TPM_RESULT res; > -- TPM_KEY_DATA *key; > -- BYTE *info, *p; > -- UINT32 info_length, length; > - info("TPM_TickStampBlob()"); > -- /* get key */ > -- key = tpm_get_key(keyHandle); > -- if (key == NULL) return TPM_INVALID_KEYHANDLE; > -- /* verify authorization */ > -- res = tpm_verify_auth(auth1, key->usageAuth, keyHandle); > -- if (res != TPM_SUCCESS) return res; > -- if (key->keyUsage != TPM_KEY_SIGNING && key->keyUsage != TPM_KEY_LEGACY > -- && key->keyUsage != TPM_KEY_IDENTITY) return TPM_INVALID_KEYUSAGE; > -- /* get current ticks */ > -- TPM_GetTicks(currentTicks); > -- /* sign data using signature scheme PKCS1_SHA1 and TPM_SIGN_INFO container */ > -- *sigSize = key->key.size >> 3; > -- *sig = tpm_malloc(*sigSize); > -- if (*sig == NULL) return TPM_FAIL; > -- /* setup TPM_SIGN_INFO structure */ > -- info_length = 30 + sizeof(TPM_DIGEST) + sizeof_TPM_CURRENT_TICKS(currentTicks); > -- info = tpm_malloc(info_length); > -- if (info == NULL) { > -- tpm_free(*sig); > -- return TPM_FAIL; > -- } > -- memcpy(&info[0], "\x05\x00TSTP", 6); > -- memcpy(&info[6], antiReplay->nonce, 20); > -- *(UINT32*)&info[26] = CPU_TO_BE32(20 > -- + sizeof_TPM_CURRENT_TICKS(currentTicks)); > -- memcpy(&info[30], digestToStamp->digest, sizeof(TPM_DIGEST)); > -- p = &info[30 + sizeof(TPM_DIGEST)]; > -- length = sizeof_TPM_CURRENT_TICKS(currentTicks); > -- if (tpm_marshal_TPM_CURRENT_TICKS(&p, &length, currentTicks) > -- || rsa_sign(&key->key, RSA_SSA_PKCS1_SHA1, info, info_length, *sig)) { > -- tpm_free(*sig); > -- tpm_free(info); > -- return TPM_FAIL; > -- } > -- return TPM_SUCCESS; > -+ return TPM_DISABLED_CMD; > - } > - > - void tpm_update_ticks(void) > - { > -- if (tpmData.stany.data.currentTicks.tag == 0) { > -- tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickType = tpmData.permanent.data.tickType; > --*/ > -- tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, > -- sizeof(TPM_NONCE)); > -- tpmData.stany.data.currentTicks.tickRate = 1; > --/* removed since v1.2 rev 94 > -- tpmData.stany.data.currentTicks.tickSecurity = TICK_SEC_NO_CHECK; > --*/ > -- } else { > -- tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); > -- } > - } > - > -diff -uprN orig/tpm_emulator-0.4/tpm/tpm_transport.c tpm_emulator/tpm/tpm_transport.c > ---- orig/tpm_emulator-0.4/tpm/tpm_transport.c 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm/tpm_transport.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -189,7 +189,7 @@ static void decrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "in", 2); > -+ sha1_update(&sha1, (BYTE*)"in", 2); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -@@ -211,7 +211,7 @@ static void encrypt_wrapped_command(BYTE > - sha1_init(&sha1); > - sha1_update(&sha1, auth->nonceEven.nonce, sizeof(auth->nonceEven.nonce)); > - sha1_update(&sha1, auth->nonceOdd.nonce, sizeof(auth->nonceOdd.nonce)); > -- sha1_update(&sha1, "out", 3); > -+ sha1_update(&sha1, (BYTE*)"out", 3); > - sha1_update(&sha1, secret, sizeof(TPM_SECRET)); > - j = CPU_TO_BE32(i); > - sha1_update(&sha1, (BYTE*)&j, 4); > -diff -uprN orig/tpm_emulator-0.4/tpmd.c tpm_emulator/tpmd.c > ---- orig/tpm_emulator-0.4/tpmd.c 1969-12-31 16:00:00.000000000 -0800 > -+++ tpm_emulator/tpmd.c 2006-07-24 14:35:35.000000000 -0700 > -@@ -0,0 +1,156 @@ > -+/* Software-Based Trusted Platform Module (TPM) Emulator for Linux > -+ * Copyright (C) 2005 INTEL Corp > -+ * > -+ * This module is free software; you can redistribute it and/or modify > -+ * it under the terms of the GNU General Public License as published > -+ * by the Free Software Foundation; either version 2 of the License, > -+ * or (at your option) any later version. > -+ * > -+ * This module is distributed in the hope that it will be useful, > -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of > -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -+ * GNU General Public License for more details. > -+ * > -+ */ > -+ > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+ > -+#include "tpm_emulator.h" > -+ > -+#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > -+#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+ > -+#define BUFFER_SIZE 2048 > -+ > -+static int devurandom=0; > -+ > -+void get_random_bytes(void *buf, int nbytes) { > -+ > -+ if (devurandom == 0) { > -+ devurandom = open("/dev/urandom", O_RDONLY); > -+ } > -+ > -+ if (read(devurandom, buf, nbytes) != nbytes) { > -+ printf("Can't get random number.\n"); > -+ exit(-1); > -+ } > -+} > -+ > -+uint64_t tpm_get_ticks(void) > -+{ > -+ //struct timeval tv; > -+ //int gettimeofday(&tv, struct timezone *tz); > -+ return 0; > -+} > -+ > -+int main(int argc, char **argv) > -+{ > -+ uint8_t in[BUFFER_SIZE], *out; > -+ uint32_t out_size; > -+ int in_size, written; > -+ int i; > -+ struct stat file_info; > -+ > -+ int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+ if (argc < 2) { > -+ printf("Usage: tpmd clear|save|deactivated\n" ); > -+ return -1; > -+ } > -+ > -+ /* initialize TPM emulator */ > -+ if (!strcmp(argv[1], "clear")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(1); > -+ } else if (!strcmp(argv[1], "save")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(2); > -+ } else if (!strcmp(argv[1], "deactivated")) { > -+ printf("Initializing tpm: %s\n", argv[1]); > -+ tpm_emulator_init(3); > -+ } else { > -+ printf("invalid startup mode '%s'; must be 'clear', " > -+ "'save' (default) or 'deactivated", argv[1]); > -+ return -1; > -+ } > -+ > -+ if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -+ if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -+ printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -+ return -1; > -+ } > -+ } > -+ > -+ while (1) { > -+abort_command: > -+ if (tpm_rx_fh < 0) { > -+ tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ } > -+ > -+ if (tpm_rx_fh < 0) { > -+ printf("ERROR: failed to open devices to listen to guest.\n"); > -+ return -1; > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -+ } > -+ > -+ if (tpm_tx_fh < 0) { > -+ printf("ERROR: failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ if (in_size < 6) { // Magic size of minium TPM command > -+ printf("Recv[%d] to small: 0x", in_size); > -+ if (in_size <= 0) { > -+ close(tpm_rx_fh); > -+ tpm_rx_fh = -1; > -+ goto abort_command; > -+ } > -+ } else { > -+ printf("Recv[%d]: 0x", in_size); > -+ for (i=0; i< in_size; i++) > -+ printf("%x ", in[i]); > -+ printf("\n"); > -+ } > -+ > -+ > -+ if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -+ printf("ERROR: Handler Failed.\n"); > -+ } > -+ > -+ written = write(tpm_tx_fh, out, out_size); > -+ > -+ if (written != out_size ) { > -+ printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ } else { > -+ printf("Sent[%Zu]: ", out_size); > -+ } > -+ for (i=0; i< out_size; i++) > -+ printf("%x ", out[i]); > -+ printf("\n"); > -+ tpm_free(out); > -+ > -+ } // loop > -+ > -+ tpm_emulator_shutdown(); > -+ > -+ close(tpm_tx_fh); > -+ close(tpm_rx_fh); > -+ > -+} > -Binary files orig/tpm_emulator-0.4/tpm_emulator and tpm_emulator/tpm_emulator differ > -diff -uprN orig/tpm_emulator-0.4/tpm_version.h tpm_emulator/tpm_version.h > ---- orig/tpm_emulator-0.4/tpm_version.h 2006-06-23 03:37:07.000000000 -0700 > -+++ tpm_emulator/tpm_version.h 2006-07-24 14:35:41.000000000 -0700 > -@@ -2,5 +2,5 @@ > - #define _TPM_VERSION_H_ > - #define VERSION_MAJOR 0 > - #define VERSION_MINOR 4 > --#define VERSION_BUILD 1151058734 > -+#define VERSION_BUILD 1153776940 > - #endif /* _TPM_VERSION_H_ */ > diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > deleted file mode 100644 > index 95586c1..0000000 > --- a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch > +++ /dev/null > @@ -1,12 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile > -+++ tpm_emulator-0.5.1/tpmd/Makefile > -@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > - CFLAGS += -I../../../../tools/vtpm_manager/manager > --LDFLAGS += -lgmp > -+LDLIBS += -lgmp > - > - BINDIR := /usr/bin/ > - > diff --git a/tools/vtpm/vtpm-0.5.1.patch b/tools/vtpm/vtpm-0.5.1.patch > deleted file mode 100644 > index 2aeb745..0000000 > --- a/tools/vtpm/vtpm-0.5.1.patch > +++ /dev/null > @@ -1,766 +0,0 @@ > -diff -Naurp tpm_emulator-0.5.1/Makefile tpm5-test/Makefile > ---- tpm_emulator-0.5.1/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/Makefile 2009-07-15 09:45:28.000000000 -0400 > -@@ -10,7 +10,7 @@ VERSION_MINOR := 5 > - VERSION_BUILD := $(shell date +"%s") > - VERSION_SUFFIX := .1 > - > --SUBDIRS := tpmd tpmd_dev tddl > -+SUBDIRS := tpmd > - > - all: version all-recursive > - > -@@ -48,12 +48,12 @@ user_install: user > - modules_install: modules > - @$(MAKE) -C tpmd_dev install || exit -1 > - > --DIRS := . tpm crypto tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpm crypto tpmd > - DISTSRC := $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c)) > - DISTSRC += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.h)) > --DIRS := . tpmd tpmd_dev tddl tpmd_dev_openbsd > -+DIRS := . tpmd > - DISTSRC += $(foreach dir, $(DIRS), $(dir)/Makefile) > --DISTSRC += ./README ./AUTHORS ./ChangeLog tpmd_dev/tpmd_dev.rules.in > -+DISTSRC += ./README ./AUTHORS ./ChangeLog > - DISTDIR := tpm_emulator-$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_SUFFIX) > - > - dist: $(DISTSRC) > -diff -Naurp tpm_emulator-0.5.1/tpm/tpm_capability.c tpm5-test/tpm/tpm_capability.c > ---- tpm_emulator-0.5.1/tpm/tpm_capability.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpm/tpm_capability.c 2009-07-16 12:04:20.000000000 -0400 > -@@ -136,8 +136,19 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > -+ > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -189,8 +200,12 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > -+ > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > - debug("[TPM_CAP_PROP_ACTIVE_COUNTER]"); > -diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm5-test/tpmd/Makefile > ---- tpm_emulator-0.5.1/tpmd/Makefile 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/Makefile 2009-07-16 12:08:26.000000000 -0400 > -@@ -8,9 +8,10 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a > - -Wwrite-strings -Wsign-compare -Wno-multichar > - #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing > - CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing > -+CFLAGS += -I../../../../tools/vtpm_manager/manager > - LDFLAGS += -lgmp > - > --BINDIR := /usr/sbin/ > -+BINDIR := /usr/bin/ > - > - TPMD := tpmd > - DIRS := ../tpm ../crypto > -@@ -18,6 +19,8 @@ SRCS := $(foreach dir, $(DIRS), $(wil > - OBJS := $(patsubst %.c, %.o, $(SRCS)) > - OBJS := $(foreach dir, $(DIRS), $(patsubst $(dir)/%.o, %.o, $(filter $(dir)/%.o, $(OBJS)))) > - > -+VTPM_BIN := vtpmd > -+ > - vpath %.c $(strip $(DIRS)) > - > - all: $(TPMD) > -@@ -32,10 +35,8 @@ TPMD_GROUP ?= tss > - INSTALL ?= install > - > - install: $(TPMD) > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/lib/tpm > -- $(INSTALL) -m 755 -o $(TPMD_USER) -g $(TPMD_GROUP) -d $(DESTDIR)/var/run/tpm > - $(INSTALL) -D -d $(DESTDIR)/$(BINDIR) > -- $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR) > -+ $(INSTALL) -m 755 $(TPMD) $(DESTDIR)/$(BINDIR)/$(VTPM_BIN) > - > - .PHONY: all clean install > - > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpmd.c tpm5-test/tpmd/tpmd.c > ---- tpm_emulator-0.5.1/tpmd/tpmd.c 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpmd.c 2009-07-16 11:19:05.000000000 -0400 > -@@ -32,6 +32,9 @@ > - #include > - #include "tpm_emulator_config.h" > - #include "tpm/tpm_emulator.h" > -+#include "tpm/tpm_structures.h" > -+#include "tpm/tpm_marshalling.h" > -+#include "vtpm_manager.h" > - > - #define TPM_DAEMON_NAME "tpmd" > - #define TPM_CMD_BUF_SIZE 4096 > -@@ -39,6 +42,24 @@ > - #define TPM_RANDOM_DEVICE "/dev/urandom" > - #undef TPM_MKDIRS > - > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+ > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ static char *vtpm_rx_name=NULL; > -+#endif > -+ > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#define BUFFER_SIZE 2048 > -+ > - static volatile int stopflag = 0; > - static int is_daemon = 0; > - static int opt_debug = 0; > -@@ -49,6 +70,8 @@ static const char *opt_storage_file = "/ > - static uid_t opt_uid = 0; > - static gid_t opt_gid = 0; > - static int tpm_startup = 2; > -+static int vtpm_type = VTPM_TYPE_PVM; > -+int dmi_id = 0; > - static int rand_fh; > - > - void tpm_log(int priority, const char *fmt, ...) > -@@ -90,56 +113,241 @@ uint64_t tpm_get_ticks(void) > - > - int tpm_write_to_file(uint8_t *data, size_t data_length) > - { > -- int fh; > -- ssize_t res; > -- fh = open(opt_storage_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- if (fh < 0) return -1; > -- while (data_length > 0) { > -- res = write(fh, data, data_length); > -- if (res < 0) { > -- close(fh); > -- return -1; > -- } > -- data_length -= res; > -- data += res; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - int tpm_read_from_file(uint8_t **data, size_t *data_length) > - { > -- int fh; > -- ssize_t res; > -- size_t total_length; > -- fh = open(opt_storage_file, O_RDONLY); > -- if (fh < 0) return -1; > -- total_length = lseek(fh, 0, SEEK_END); > -- lseek(fh, 0, SEEK_SET); > -- *data = tpm_malloc(total_length); > -- if (*data == NULL) { > -- close(fh); > -- return -1; > -- } > -- *data_length = 0; > -- while (total_length > 0) { > -- res = read(fh, &(*data)[*data_length], total_length); > -- if (res < 0) { > -- close(fh); > -- tpm_free(*data); > -- return -1; > -- } > -- *data_length += res; > -- total_length -= res; > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ printf("Error in read_from_file:301\n"); > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > -+ printf("Error in read_from_file:325\n"); > -+ > -+ return -1; > -+ } > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) > -+ { > -+ printf("Error in read_from_file:335\n"); > -+ return -1; > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > - } > -- close(fh); > -- return 0; > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ printf("Error in read_from_file:352\n"); > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ printf("Error in read_from_file:375\n"); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ printf("Error in read_from_file:381\n"); > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > -+ if (res != (int)*data_length) { > -+ free(*data); > -+ printf("Error in read_from_file:398\n"); > -+ return -1; > -+ } else { > -+ return 0; > -+ } > -+ > -+ > -+ > - } > - > - static void print_usage(char *name) > - { > - printf("usage: %s [-d] [-f] [-s storage file] [-u unix socket name] " > -- "[-o user name] [-g group name] [-h] [startup mode]\n", name); > -+ "[-o user name] [-g group name] [-h]" > -+#ifdef VTPM_MULTI_VM > -+ "clear|save|deactivated\n", name); > -+#else > -+ "clear|save|deactivated pvm|hvm vtpmid\n", name); > -+#endif > - printf(" d : enable debug mode\n"); > - printf(" f : forces the application to run in the foreground\n"); > - printf(" s : storage file to use (default: %s)\n", opt_storage_file); > -@@ -205,7 +413,13 @@ static void parse_options(int argc, char > - exit(EXIT_SUCCESS); > - } > - } > -- if (optind < argc) { > -+ /*Make sure we have all required options*/ > -+#ifdef VTPM_MULTI_VM > -+#define EXTRA_OPTS 0 > -+#else > -+#define EXTRA_OPTS 2 > -+#endif > -+ if (optind < argc - EXTRA_OPTS ) { > - debug("startup mode = '%s'", argv[optind]); > - if (!strcmp(argv[optind], "clear")) { > - tpm_startup = 1; > -@@ -219,6 +433,25 @@ static void parse_options(int argc, char > - print_usage(argv[0]); > - exit(EXIT_SUCCESS); > - } > -+#ifndef VTPM_MULTI_VM > -+ ++optind; > -+ if(!strcmp(argv[optind], "pvm")) { > -+ vtpm_type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[optind], "hvm")) { > -+ vtpm_type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("Invalid vm mode '%s'; must be 'pvm', " > -+ "or 'hvm' ", argv[optind]); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > -+ } > -+ ++optind; > -+ dmi_id = atoi(argv[optind]); > -+#endif > -+ } else { > -+ error("Invalid number of arguments"); > -+ print_usage(argv[0]); > -+ exit(EXIT_SUCCESS); > - } > - } > - > -@@ -348,93 +581,180 @@ static int init_socket(const char *name) > - > - static void main_loop(void) > - { > -- int sock, fh, res; > -- int32_t in_len; > -+ int32_t in_len, written; > - uint32_t out_len; > -- uint8_t in[TPM_CMD_BUF_SIZE], *out; > -+ uint8_t in[TPM_CMD_BUF_SIZE], *out, *addressed_out; > -+ int guest_id=-1; > -+ int i; > -+ char *vtpm_rx_file=NULL; > -+ int res; > -+ > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > - struct sockaddr_un addr; > -- socklen_t addr_len; > -- fd_set rfds; > -- struct timeval tv; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifndef VTPM_MULTI_VM > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > - > - info("staring main loop"); > -- /* open UNIX socket */ > -- sock = init_socket(opt_socket_name); > -- if (sock < 0) exit(EXIT_FAILURE); > - /* init tpm emulator */ > -- debug("initializing TPM emulator: %d", tpm_startup); > -+#ifdef VTPM_MULTI_VM > -+ debug("initializing TPM emulator: state=%d", tpm_startup); > -+#else > -+ debug("initializing TPM emulator: state=%d, type=%d, id=%d", tpm_startup, vtpm_type, dmi_id); > -+#endif > - tpm_emulator_init(tpm_startup); > - /* start command processing */ > - while (!stopflag) { > - /* wait for incomming connections */ > - debug("waiting for connections..."); > -- FD_ZERO(&rfds); > -- FD_SET(sock, &rfds); > -- tv.tv_sec = 10; > -- tv.tv_usec = 0; > -- res = select(sock + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(sock) failed: %s", strerror(errno)); > -- break; > -- } else if (res == 0) { > -- continue; > -- } > -- addr_len = sizeof(addr); > -- fh = accept(sock, (struct sockaddr*)&addr, &addr_len); > -- if (fh < 0) { > -- error("accept() failed: %s", strerror(errno)); > -- continue; > -- } > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) > -+ { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > -+ } > -+ > -+ /*Error Checking*/ > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > -+ exit(-1); > -+ } > -+ > - /* receive and handle commands */ > - in_len = 0; > - do { > - debug("waiting for commands..."); > -- FD_ZERO(&rfds); > -- FD_SET(fh, &rfds); > -- tv.tv_sec = TPM_COMMAND_TIMEOUT; > -- tv.tv_usec = 0; > -- res = select(fh + 1, &rfds, NULL, NULL, &tv); > -- if (res < 0) { > -- error("select(fh) failed: %s", strerror(errno)); > -- close(fh); > -- break; > -- } else if (res == 0) { > --#ifdef TPMD_DISCONNECT_IDLE_CLIENTS > -- info("connection closed due to inactivity"); > -- close(fh); > -- break; > --#else > -- continue; > --#endif > -- } > -- in_len = read(fh, in, sizeof(in)); > -- if (in_len > 0) { > -+ > -+ in_len = read(vtpm_rx_fh, in, sizeof(in)); > -+ /*Magic size of minimum TPM command is 6*/ > -+ //FIXME Magic size check may not be required anymore > -+ if (in_len < 6) { > -+ info("Recv incomplete command of %d bytes.", in_len); > -+ if (in_len <= 0) { > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > -+ continue; > -+ } > -+ } else { > -+ /*Debug Printouts*/ > - debug("received %d bytes", in_len); > -+ debug_nostop("Recv[%d]: 0x", in_len); > -+ for (i=0; i< in_len; i++) > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > -+ /*Multiple Guest check*/ > -+ if (guest_id == -1) { > -+ guest_id = *((int32_t *) in); > -+ } else { > -+ if (guest_id != *((int32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ /*Open tx handle now*/ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ exit(-1); > -+ } > -+ > -+ /*Handle the TPM command now*/ > - out = NULL; > -- res = tpm_handle_command(in, in_len, &out, &out_len); > -+ res = tpm_handle_command(in + sizeof(uint32_t), in_len - sizeof(uint32_t), &out, &out_len); > - if (res < 0) { > - error("tpm_handle_command() failed"); > - } else { > - debug("sending %d bytes", out_len); > -+ //FIXME this prepending may or may not be needed > -+ /*Prepend the first 4 bytes of the in buffer.. why?*/ > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_len); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_len); > -+ out_len += sizeof(uint32_t); > -+ /*End Prepend*/ > -+ > -+ /*Perform write operation now*/ > - while (out_len > 0) { > -- res = write(fh, out, out_len); > -+ res = write(vtpm_tx_fh, addressed_out, out_len); > -+ > - if (res < 0) { > - error("write(%d) failed: %s", out_len, strerror(errno)); > - break; > -- } > -+ } else { > -+ debug_nostop("Sent[%Zu]: ", out_len); > -+ for (i=0; (unsigned int)i< out_len; i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > -+ } > - out_len -= res; > - } > - tpm_free(out); > -+ tpm_free(addressed_out); > - } > - } > - } while (in_len > 0); > -- close(fh); > -+ //close(fh); > - } > -+ > - /* shutdown tpm emulator */ > - tpm_emulator_shutdown(); > -- /* close socket */ > -- close(sock); > -- unlink(opt_socket_name); > -+ /* Close handles */ > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MULTI_VM > -+ close(vtpm_rx_fh); > -+ free(vtpm_rx_file); > -+#endif > - info("main loop stopped"); > - } > - > -@@ -450,12 +770,13 @@ int main(int argc, char **argv) > - /* open random device */ > - init_random(); > - /* init signal handlers */ > -- init_signal_handler(); > -+ //init_signal_handler(); > - /* unless requested otherwiese, fork and daemonize process */ > -- if (!opt_foreground) daemonize(); > -+ //if (!opt_foreground) daemonize(); > - /* start main processing loop */ > - main_loop(); > - info("stopping TPM Emulator daemon"); > - closelog(); > - return 0; > - } > -+ > -diff -Naurp tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h tpm5-test/tpmd/tpm_emulator_config.h > ---- tpm_emulator-0.5.1/tpmd/tpm_emulator_config.h 2008-02-14 03:22:48.000000000 -0500 > -+++ tpm5-test/tpmd/tpm_emulator_config.h 2009-07-16 11:25:26.000000000 -0400 > -@@ -29,23 +29,28 @@ > - > - /* TPM emulator configuration */ > - > --#undef TPM_STRONG_PERSISTENCE > --#undef TPM_GENERATE_EK > -+#define TPM_STRONG_PERSISTENCE > -+#define TPM_GENERATE_EK > - #undef TPM_GENERATE_SEED_DAA > - #undef TPM_MEMORY_ALIGNMENT_MANDATORY > - > -+extern int dmi_id; > -+ > - /* log macros */ > - > - void tpm_log(int priority, const char *fmt, ...); > - > --#define debug(fmt, ...) tpm_log(LOG_DEBUG, "%s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define info(fmt, ...) tpm_log(LOG_INFO, "%s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) tpm_log(LOG_ERR, "%s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) tpm_log(LOG_ALERT, "%s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) tpm_log(LOG_INFO, "VTPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) tpm_log(LOG_ERR, "VTPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) tpm_log(LOG_ALERT, "VTPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) tpm_log(LOG_DEBUG, "VTPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) tpm_log(LOG_DEBUG, fmt, ## __VA_ARGS__) > - > - /* min/max macros that also do strict type-checking */ > - > diff --git a/tools/vtpm/vtpm.patch b/tools/vtpm/vtpm.patch > deleted file mode 100644 > index e896b25..0000000 > --- a/tools/vtpm/vtpm.patch > +++ /dev/null > @@ -1,716 +0,0 @@ > -diff -uprN tpm_emulator/AUTHORS vtpm/AUTHORS > ---- tpm_emulator/AUTHORS 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/AUTHORS 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,3 +1,3 @@ > - Mario Strasser > - Heiko Stamer [DAA] > --INTEL Corp <> [Dropped to Ring3] > -+INTEL Corp <> [VTPM Extensions] > -diff -uprN tpm_emulator/ChangeLog vtpm/ChangeLog > ---- tpm_emulator/ChangeLog 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/ChangeLog 2006-12-13 16:38:52.000000000 -0800 > -@@ -1,5 +1,6 @@ > - ????-??-?? Intel Corp > - * Moved module out of kernel to run as a ring 3 app > -+ * Modified save_to_file and load_from_file to call xen VTPM manager > - > - 2006-06-23 Mario Strasser > - * tpm_startup.c: behaviour of ST_CLEAR and storage of > -diff -uprN tpm_emulator/linux_module.h vtpm/linux_module.h > ---- tpm_emulator/linux_module.h 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/linux_module.h 2007-01-09 14:49:06.000000000 -0800 > -@@ -44,18 +44,26 @@ > - #define TPM_DEVICE_NAME "tpm" > - #define TPM_MODULE_NAME "tpm_emulator" > - > -+/* debug and log output functions */ > -+extern int dmi_id; > -+ > - #ifdef DEBUG > --#define debug(fmt, ...) printf("TPMD: %s:%d: Debug: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_nostop(fmt, ...) printf("TPMD[%d]: %s:%d: Debug: " fmt, \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define debug_more(fmt, ...) printf( fmt, ## __VA_ARGS__ ) > - #else > - #define debug(fmt, ...) > -+#define debug_nostop(fmt, ...) > -+#define debug_more(fmt, ...) > - #endif > --#define info(fmt, ...) printf("TPMD: %s:%d: Info: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define error(fmt, ...) printf("TPMD: %s:%d: Error: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > --#define alert(fmt, ...) printf("TPMD: %s:%d: Alert: " fmt "\n", \ > -- __FILE__, __LINE__, ## __VA_ARGS__) > -+#define info(fmt, ...) printf("TPMD[%d]: %s:%d: Info: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define error(fmt, ...) printf("TPMD[%d]: %s:%d: Error: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > -+#define alert(fmt, ...) printf("TPMD[%d]: %s:%d: Alert: " fmt "\n", \ > -+ dmi_id, __FILE__, __LINE__, ## __VA_ARGS__) > - > - /* memory allocation */ > - > -diff -uprN tpm_emulator/Makefile vtpm/Makefile > ---- tpm_emulator/Makefile 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/Makefile 2006-12-13 16:38:52.000000000 -0800 > -@@ -7,7 +7,7 @@ > - COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) > - > - # module settings > --BIN := tpm_emulator > -+BIN := vtpmd > - VERSION_MAJOR := 0 > - VERSION_MINOR := 4 > - VERSION_BUILD := $(shell date +"%s") > -@@ -22,7 +22,7 @@ TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin > - > - CC := gcc > - CFLAGS += -g -Wall $(INCLUDE) -DDEBUG > --CFLAGS += -I. -Itpm > -+CFLAGS += -I. -Itpm -I../../vtpm_manager/manager > - > - # Is the simulator running in it's own vm? > - #CFLAGS += -DVTPM_MULTI_VM > -@@ -62,7 +62,6 @@ $(BIN): $(src)/crypto/gmp.h $(src)/crypt > - > - install: $(BIN) > - $(INSTALL_PROG) $(BIN) $(TOOLS_INSTALL_DIR) > -- @if [ ! -d "/var/tpm" ]; then mkdir /var/tpm; fi > - > - clean: > - rm -f $(src)/crypto/gmp.h $(src)/crypto/libgmp.a $(OBJS) > -@@ -98,3 +97,4 @@ version: > - @echo "#endif /* _TPM_VERSION_H_ */" >> $(src)/tpm_version.h > - > - .PHONY: all install clean dist gmp version > -+ > -diff -uprN tpm_emulator/tpm/tpm_capability.c vtpm/tpm/tpm_capability.c > ---- tpm_emulator/tpm/tpm_capability.c 2006-06-23 03:37:07.000000000 -0700 > -+++ vtpm/tpm/tpm_capability.c 2007-01-10 10:00:49.000000000 -0800 > -@@ -136,8 +136,18 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_TIS_TIMEOUT: > - debug("[TPM_CAP_PROP_TIS_TIMEOUT]"); > -- /* TODO: TPM_CAP_PROP_TIS_TIMEOUT */ > -- return TPM_FAIL; > -+ /* TODO: TPM_CAP_PROP_TIS_TIMEOUT: Measure these values and determine correct ones */ > -+ UINT32 len = *respSize = 16; > -+ BYTE *ptr = *resp = tpm_malloc(*respSize); > -+ if (ptr == NULL || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000) || > -+ tpm_marshal_UINT32(&ptr, &len, 200000)) { > -+ tpm_free(*resp); > -+ return TPM_FAIL; > -+ } > -+ return TPM_SUCCESS; > - > - case TPM_CAP_PROP_STARTUP_EFFECT: > - debug("[TPM_CAP_PROP_STARTUP_EFFECT]"); > -@@ -190,7 +200,11 @@ static TPM_RESULT cap_property(UINT32 su > - > - case TPM_CAP_PROP_DURATION: > - debug("[TPM_CAP_PROP_DURATION]"); > -- /* TODO: TPM_CAP_PROP_DURATION */ > -+ /* TODO: TPM_CAP_PROP_DURATION: Measure these values and return accurate ones */ > -+ BYTE dur[]= {0x0,0x0,0x0,0xc,0x0,0x7,0xa1,0x20,0x0,0x1e,0x84,0x80,0x11,0xe1,0xa3,0x0}; > -+ *respSize = 16; > -+ *resp = tpm_malloc(*respSize); > -+ memcpy(*resp,dur,16); > - return TPM_FAIL; > - > - case TPM_CAP_PROP_ACTIVE_COUNTER: > -diff -uprN tpm_emulator/tpm/tpm_cmd_handler.c vtpm/tpm/tpm_cmd_handler.c > ---- tpm_emulator/tpm/tpm_cmd_handler.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_cmd_handler.c 2008-02-28 14:43:28.000000000 -0500 > -@@ -94,12 +94,18 @@ void tpm_compute_out_param_digest(TPM_CO > - sha1_ctx_t sha1; > - UINT32 res = CPU_TO_BE32(rsp->result); > - UINT32 ord = CPU_TO_BE32(ordinal); > -+ UINT32 offset = 0; > - > - /* compute SHA1 hash */ > - sha1_init(&sha1); > - sha1_update(&sha1, (BYTE*)&res, 4); > - sha1_update(&sha1, (BYTE*)&ord, 4); > -- sha1_update(&sha1, rsp->param, rsp->paramSize); > -+ if (ordinal == TPM_ORD_LoadKey2) { > -+ offset = 4; > -+ } > -+ if (rsp->paramSize - offset > 0) { > -+ sha1_update(&sha1, rsp->param + offset, rsp->paramSize - offset); > -+ } > - sha1_final(&sha1, rsp->auth1->digest); > - if (rsp->auth2 != NULL) memcpy(rsp->auth2->digest, > - rsp->auth1->digest, sizeof(rsp->auth1->digest)); > -diff -uprN tpm_emulator/tpm/tpm_data.c vtpm/tpm/tpm_data.c > ---- tpm_emulator/tpm/tpm_data.c 2008-02-27 16:35:41.000000000 -0500 > -+++ vtpm/tpm/tpm_data.c 2008-02-27 16:35:40.000000000 -0500 > -@@ -1,6 +1,7 @@ > - /* Software-Based Trusted Platform Module (TPM) Emulator for Linux > - * Copyright (C) 2004 Mario Strasser , > - * Swiss Federal Institute of Technology (ETH) Zurich > -+ * Copyright (C) 2005 INTEL Corp > - * > - * This module is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published > -@@ -15,10 +16,15 @@ > - * $Id: tpm_data.c 98 2006-05-07 14:16:29Z hstamer $ > - */ > - > -+#include > -+#include > -+#include > -+#include > -+ > - #include "tpm_emulator.h" > - #include "tpm_structures.h" > - #include "tpm_marshalling.h" > --#include "linux_module.h" > -+#include "vtpm_manager.h" > - > - TPM_DATA tpmData; > - > -@@ -158,45 +164,232 @@ void tpm_release_data(void) > - #include > - #include > - #include > --#include > - > --#define TPM_STORAGE_FILE "/var/tpm/tpm_emulator-1.2." STR(VERSION_MAJOR) "." STR(VERSION_MINOR) > -+ static int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+ > -+#ifdef VTPM_MUTLI_VM > -+ #define DEV_FE "/dev/tpm" > -+#else > -+ #define VTPM_RX_FIFO_D "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -+ #define VTPM_TX_FIFO "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -+ > -+ extern int dmi_id; > -+ static char *vtpm_rx_name=NULL; > -+#endif > - > - static int write_to_file(uint8_t *data, size_t data_length) > - { > -- int res; > -- int fp; > -- fp = open(TPM_STORAGE_FILE, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); > -- res = write(fp, data, data_length); > -- close(fp); > -- return (res == data_length) ? 0 : -1; > -+ int res, out_data_size, in_header_size; > -+ BYTE *ptr, *out_data, *in_header; > -+ UINT32 result, len, in_rsp_size; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ > -+ printf("Saving NVM\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT + data_length; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV + data_length; > -+#endif > -+ > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_SAVENVM) > -+ || tpm_marshal_BYTE_ARRAY(&ptr, &len, data, data_length)) { > -+ free(out_data); > -+ return -1; > -+ } > -+ > -+ printf("\tSending SaveNVM Command.\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading SaveNVM header.\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_tx_fh); close(vtpm_rx_fh); > -+#endif > -+ > -+ printf("\tFinishing up SaveNVM\n"); > -+ return (0); > - } > - > - static int read_from_file(uint8_t **data, size_t *data_length) > - { > -- int res; > -- int fp, file_status; > -- struct stat file_info; > -- fp = open(TPM_STORAGE_FILE, O_RDONLY, 0); > -- file_status = fstat(fp, &file_info); > -- if (file_status < 0) { > -- close(fp); > -- return -1; > -- } > -+ int res, out_data_size, in_header_size; > -+ uint8_t *ptr, *out_data, *in_header; > -+ UINT16 tag = VTPM_TAG_REQ; > -+ UINT32 len, in_rsp_size, result; > -+#ifdef VTPM_MUTLI_VM > -+ int vtpm_rx_fh, vtpm_tx_fh; > -+#endif > -+ > -+ printf("Loading NVM.\n"); > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_FE, O_RDWR); > -+#else > -+ vtpm_tx_fh = open(VTPM_TX_FIFO, O_WRONLY); > -+#endif > -+ } > - > -- *data_length = file_info.st_size; > -- *data = tpm_malloc(*data_length); > -- if (*data == NULL) { > -- close(fp); > -+ if (vtpm_tx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Send request to VTPM Manager to encrypt data > -+#ifdef VTPM_MUTLI_VM > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ out_data_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ out_data = ptr = (BYTE *) malloc(len); > -+ > -+ if (ptr == NULL > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, dmi_id) > -+#endif > -+ || tpm_marshal_UINT16(&ptr, &len, tag) > -+#ifdef VTPM_MUTLI_VM > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size) > -+#else > -+ || tpm_marshal_UINT32(&ptr, &len, out_data_size - sizeof(uint32_t)) > -+#endif > -+ || tpm_marshal_UINT32(&ptr, &len, VTPM_ORD_LOADNVM)) { > -+ free(out_data); > - return -1; > - } > -- res = read(fp, *data, *data_length); > -- close(fp); > -+ > -+ printf("\tSending LoadNVM command\n"); > -+ res = write(vtpm_tx_fh, out_data, out_data_size); > -+ free(out_data); > -+ if (res != out_data_size) return -1; > -+ > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (vtpm_rx_name == NULL) { > -+ vtpm_rx_name = malloc(10 + strlen(VTPM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_name, VTPM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } > -+ vtpm_rx_fh = open(vtpm_rx_name, O_RDONLY); > -+#endif > -+ } > -+ > -+ if (vtpm_rx_fh < 0) { > -+ return -1; > -+ } > -+ > -+ // Read Header of response so we can get the size & status > -+#ifdef VTPM_MUTLI_VM > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_CLT; > -+#else > -+ in_header_size = len = VTPM_COMMAND_HEADER_SIZE_SRV; > -+#endif > -+ in_header = ptr = malloc(in_header_size); > -+ > -+ printf("\tReading LoadNVM header\n"); > -+ res = read(vtpm_rx_fh, in_header, in_header_size); > -+ > -+ if ( (res != in_header_size) > -+#ifndef VTPM_MUTLI_VM > -+ || tpm_unmarshal_UINT32(&ptr, &len, (UINT32*)&dmi_id) > -+#endif > -+ || tpm_unmarshal_UINT16(&ptr, &len, &tag) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &in_rsp_size) > -+ || tpm_unmarshal_UINT32(&ptr, &len, &result) ) { > -+ free(in_header); > -+ return -1; > -+ } > -+ free(in_header); > -+ > -+ if (result != VTPM_SUCCESS) { > -+ return -1; > -+ } > -+ > -+ // Read Encrypted data from VTPM Manager > -+ *data_length = in_rsp_size - VTPM_COMMAND_HEADER_SIZE_CLT; > -+ *data = (uint8_t *) malloc(*data_length); > -+ > -+ printf("\tReading clear data from LoadNVM.\n"); > -+ res = read(vtpm_rx_fh, *data, *data_length); > -+#ifdef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh);close(vtpm_tx_fh); > -+#endif > -+ > -+ printf("\tReturing from loading NVM\n"); > - if (res != *data_length) { > -- tpm_free(*data); > -- return -1; > -+ free(*data); > -+ return -1; > -+ } else { > -+ return 0; > - } > -- return 0; > -+ > - } > - > - #else > -diff -uprN tpm_emulator/tpmd.c vtpm/tpmd.c > ---- tpm_emulator/tpmd.c 2006-12-08 12:51:29.000000000 -0800 > -+++ vtpm/tpmd.c 2007-01-09 14:48:56.000000000 -0800 > -@@ -21,12 +21,24 @@ > - #include > - #include > - #include > -+#include > -+#include > -+#include > - > - #include "tpm_emulator.h" > -+#include "vtpm_manager.h" > - > --#define TPM_RX_FNAME "/var/tpm/tpm_in.fifo" > --#define TPM_TX_FNAME "/var/tpm/tpm_out.fifo" > -+#ifdef VTPM_MULTI_VM > -+ #define DEV_BE "/dev/vtpm" > -+#else > -+ #define PVM_RX_FIFO_D "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -+ #define PVM_TX_FIFO "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > - > -+ #define HVM_RX_FIFO_D "/var/vtpm/socks/%d.socket" > -+#endif > -+ > -+ int dmi_id; > -+ > - #define BUFFER_SIZE 2048 > - > - static int devurandom=0; > -@@ -38,7 +50,7 @@ void get_random_bytes(void *buf, int nby > - } > - > - if (read(devurandom, buf, nbytes) != nbytes) { > -- printf("Can't get random number.\n"); > -+ error("Can't get random number.\n"); > - exit(-1); > - } > - } > -@@ -52,105 +64,182 @@ uint64_t tpm_get_ticks(void) > - > - int main(int argc, char **argv) > - { > -- uint8_t in[BUFFER_SIZE], *out; > -+ uint8_t type, in[BUFFER_SIZE], *out, *addressed_out; > -+ char *vtpm_rx_file=NULL; > - uint32_t out_size; > - int in_size, written; > -- int i; > -- struct stat file_info; > -+ int i, guest_id=-1; > - > -- int tpm_tx_fh=-1, tpm_rx_fh=-1; > -+#ifndef VTPM_MULTI_VM > -+ int sockfd = -1; > -+ struct sockaddr_un addr; > -+ struct sockaddr_un client_addr; > -+ unsigned int client_length; > -+ > -+#endif > -+ > -+ int vtpm_tx_fh=-1, vtpm_rx_fh=-1; > -+#ifdef VTPM_MULTI_VM > - if (argc < 2) { > -- printf("Usage: tpmd clear|save|deactivated\n" ); > -+ error("Usage: tpmd clear|save|deactivated\n" ); > -+#else > -+ if (argc < 4) { > -+ error("Usage: tpmd clear|save|deactivated pvm|hvm vtpmid\n" ); > -+#endif > - return -1; > - } > - > -+#ifndef VTPM_MULTI_VM > -+ /* setup type of vm */ > -+ if (!strcmp(argv[2], "pvm")) { > -+ type = VTPM_TYPE_PVM; // Get commands from vTPM Manager through fifo > -+ } else if (!strcmp(argv[2], "hvm")) { > -+ type = VTPM_TYPE_HVM; // Get commands from qemu via socket > -+ } else { > -+ error("invalid vTPM type '%s'.\n", argv[2]); > -+ } > -+ > -+ dmi_id = atoi(argv[3]); > -+ > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_file = malloc(10 + strlen(PVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, PVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ } else { > -+ vtpm_rx_file = malloc(10 + strlen(HVM_RX_FIFO_D)); > -+ sprintf(vtpm_rx_file, HVM_RX_FIFO_D, (uint32_t) dmi_id); > -+ > -+ if ( (sockfd = socket(PF_UNIX,SOCK_STREAM,0)) < 0) { > -+ error("Unable to create socket. errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&addr, 0, sizeof(addr)); > -+ addr.sun_family = AF_UNIX; > -+ strcpy(addr.sun_path,vtpm_rx_file ); > -+ unlink(addr.sun_path); > -+ } > -+#endif > -+ > -+#ifdef VTPM_MULTI_VM > -+ info("Initializing tpm state: %s\n", argv[1]); > -+#else > -+ info("Initializing tpm state: %s, type: %s, id: %d\n", argv[1], argv[2], dmi_id); > -+#endif > -+ > - /* initialize TPM emulator */ > - if (!strcmp(argv[1], "clear")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(1); > -- } else if (!strcmp(argv[1], "save")) { > -- printf("Initializing tpm: %s\n", argv[1]); > -+ } else if (!strcmp(argv[1], "save")) { > - tpm_emulator_init(2); > - } else if (!strcmp(argv[1], "deactivated")) { > -- printf("Initializing tpm: %s\n", argv[1]); > - tpm_emulator_init(3); > - } else { > -- printf("invalid startup mode '%s'; must be 'clear', " > -+ error("invalid startup mode '%s'; must be 'clear', " > - "'save' (default) or 'deactivated", argv[1]); > - return -1; > - } > -- > -- if ( stat(TPM_RX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_RX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_RX_FNAME); > -- return -1; > -- } > -- } > -- > -- if ( stat(TPM_TX_FNAME, &file_info) == -1) { > -- if ( mkfifo(TPM_TX_FNAME, S_IWUSR | S_IRUSR ) ) { > -- printf("Failed to create fifo %s.\n", TPM_TX_FNAME); > -- return -1; > -- } > -- } > -- > -+ > - while (1) { > - abort_command: > -- if (tpm_rx_fh < 0) { > -- tpm_rx_fh = open(TPM_RX_FNAME, O_RDONLY); > -+ if (vtpm_rx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_rx_fh = open(DEV_BE, O_RDWR); > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_rx_fh = open(vtpm_rx_file, O_RDONLY); > -+ } else { > -+ if (bind(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { > -+ error("Unable to bind(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ if (listen(sockfd, 10) <0) { > -+ error("Unable to listen(). errno = %d\n", errno); > -+ exit (-1); > -+ } > -+ > -+ memset(&client_addr, 0, sizeof(client_addr)); > -+ client_length = sizeof(client_addr); > -+ > -+ vtpm_rx_fh = vtpm_tx_fh = accept(sockfd, (struct sockaddr *)&client_addr, &client_length); > -+ } > -+#endif > - } > - > -- if (tpm_rx_fh < 0) { > -- printf("ERROR: failed to open devices to listen to guest.\n"); > -+ if (vtpm_rx_fh < 0) { > -+ error("Failed to open devices to listen to guest.\n"); > - return -1; > - } > - > -- if (tpm_tx_fh < 0) { > -- tpm_tx_fh = open(TPM_TX_FNAME, O_WRONLY); > -- } > -- > -- if (tpm_tx_fh < 0) { > -- printf("ERROR: failed to open devices to respond to guest.\n"); > -- return -1; > -- } > -- > -- in_size = read(tpm_rx_fh, in, BUFFER_SIZE); > -+ in_size = read(vtpm_rx_fh, in, BUFFER_SIZE); > - if (in_size < 6) { // Magic size of minium TPM command > -- printf("Recv[%d] to small: 0x", in_size); > -+ info("Recv incomplete command of %d bytes.", in_size); > - if (in_size <= 0) { > -- close(tpm_rx_fh); > -- tpm_rx_fh = -1; > -+ close(vtpm_rx_fh); > -+ vtpm_rx_fh = -1; > - goto abort_command; > - } > - } else { > -- printf("Recv[%d]: 0x", in_size); > -+ debug_nostop("Recv[%d]: 0x", in_size); > - for (i=0; i< in_size; i++) > -- printf("%x ", in[i]); > -- printf("\n"); > -+ debug_more("%x ", in[i]); > -+ debug_more("\n"); > - } > - > -- > -- if (tpm_handle_command(in, in_size, &out, &out_size) != 0) { > -- printf("ERROR: Handler Failed.\n"); > -+ if (guest_id == -1) { > -+ guest_id = *((uint32_t *) in); > -+ } else { > -+ if (guest_id != *((uint32_t *) in) ) { > -+ error("WARNING: More than one guest attached\n"); > -+ } > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+#ifdef VTPM_MUTLI_VM > -+ vtpm_tx_fh = open(DEV_BE, O_RDWR); > -+ vtpm_rx_fh = vtpm_tx_fh; > -+#else > -+ if (type == VTPM_TYPE_PVM) { > -+ vtpm_tx_fh = open(PVM_TX_FIFO, O_WRONLY); > -+ } // No need to open the other direction for HVM > -+#endif > -+ } > -+ > -+ if (vtpm_tx_fh < 0) { > -+ error("Failed to open devices to respond to guest.\n"); > -+ return -1; > -+ } > -+ > -+ // Handle the command, but skip the domain id header > -+ if (tpm_handle_command(in + sizeof(uint32_t), in_size - sizeof(uint32_t), &out, &out_size) != 0) { > -+ error("Handler Failed.\n"); > - } > - > -- written = write(tpm_tx_fh, out, out_size); > -+ addressed_out = (uint8_t *) tpm_malloc(sizeof(uint32_t) + out_size); > -+ *(uint32_t *) addressed_out = *(uint32_t *) in; > -+ memcpy(addressed_out + sizeof(uint32_t), out, out_size); > -+ > -+ written = write(vtpm_tx_fh, addressed_out, out_size + sizeof(uint32_t)); > - > -- if (written != out_size ) { > -- printf("ERROR: Part of response not written %d/%d.\nAttempt: ", written, out_size); > -+ if (written != out_size + sizeof(uint32_t)) { > -+ error("Part of response not written %d/%d.\n", written, out_size); > - } else { > -- printf("Sent[%Zu]: ", out_size); > -+ debug_nostop("Sent[%Zu]: ", out_size + sizeof(uint32_t)); > -+ for (i=0; i< out_size+ sizeof(uint32_t); i++) > -+ debug_more("%x ", addressed_out[i]); > -+ debug_more("\n"); > - } > -- for (i=0; i< out_size; i++) > -- printf("%x ", out[i]); > -- printf("\n"); > - tpm_free(out); > -+ tpm_free(addressed_out); > - > - } // loop > - > - tpm_emulator_shutdown(); > - > -- close(tpm_tx_fh); > -- close(tpm_rx_fh); > -+ close(vtpm_tx_fh); > -+#ifndef VTPM_MUTLI_VM > -+ close(vtpm_rx_fh); > -+ free (vtpm_rx_file); > -+#endif > - > - } > diff --git a/tools/vtpm_manager/COPYING b/tools/vtpm_manager/COPYING > deleted file mode 100644 > index c4b86b7..0000000 > --- a/tools/vtpm_manager/COPYING > +++ /dev/null > @@ -1,32 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile > deleted file mode 100644 > index 632f41b..0000000 > --- a/tools/vtpm_manager/Makefile > +++ /dev/null > @@ -1,18 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../.. > - > -# Base definitions and rules > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -SUBDIRS = crypto tcs util manager migration > -OPENSSL_HEADER = /usr/include/openssl/crypto.h > - > -.PHONY: all clean install > -all clean install: %: subdirs-% > - > -.PHONY: mrproper > -mrproper: > - @set -e; for subdir in $(SUBDIRS); do \ > - $(MAKE) -C $$subdir $@; \ > - done > - > - > diff --git a/tools/vtpm_manager/README b/tools/vtpm_manager/README > deleted file mode 100644 > index f0d1e98..0000000 > --- a/tools/vtpm_manager/README > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -Directory Structure > -=================== > -tools/vtpm_manager/crypto -> crypto files > -tools/vtpm_manager/TCS -> TCS implementation > -tools/vtpm_manager/util -> Utility Library. Include disk-io and buffers. > -tools/vtpm_manager/manager -> VTPM Manager > - > -Compile Flags > -=================== > -LOGGING_MODULES -> How extensive logging happens > - see util/log.h for more info > - > -VTPM_MULTI_VM -> Defined: VTPMs run in their own VMs > - Not Defined (default): VTPMs are processes > - > -# Debugging flags that may disappear without notice in the future > - > -DUMMY_BACKEND -> vtpm_manager listens on /tmp/in.fifo and > - /tmp/out.fifo rather than backend > - > -MANUAL_DM_LAUNCH -> Must manually launch & kill VTPMs > - > -WELL_KNOWN_OWNER_AUTH -> Rather than randomly generating the password for the owner, > - use a well known value. This is useful for debugging and for > - poor bios which do not support clearing TPM if OwnerAuth is > - lost. However this has no protection from malicious app > - issuing a TPM_OwnerClear to wipe the TPM > - > -Requirements > -============ > -- xen-unstable > -- vtpm frontend/backend driver patch > -- OpenSSL Library > - > -Single-VM Flow > -============================ > -- Launch the VTPM manager (vtpm_managerd) which which begins listening to the BE with one thread > - and listens to a named fifo that is shared by the vtpms to commuincate with the manager. > -- VTPM Manager listens to TPM BE. > -- When xend launches a tpm frontend equipped VM it contacts the manager over the vtpm backend. > -- When the manager receives the open message from the BE, it launches a vtpm > -- Xend allows the VM to continue booting. > -- When a TPM request is issued to the front end, the front end transmits the TPM request to the backend. > -- The manager receives the TPM requests and uses a named fifo to forward the request to the vtpm. > -- The fifo listener begins listening for the reply from vtpm for the request. > -- Vtpm processes request and replies to manager over shared named fifo. > -- If needed, the vtpm may send a request to the vtpm_manager at any time to save it's secrets to disk. > -- Manager receives response from vtpm and passes it back to backend for forwarding to guest. > - > -NOTES: > -* SaveService SHOULD seal it's table before saving it to disk. However, > - the current Xen infrastructure does not provide a mechanism for this to be > - unsealed later. Specifically, the auth and wrapped key must be available ONLY > - to the service, or it's not even worth encrypting > - > - In the future the vtpm manager will be protected by an early boot mechanism > - that will allow for better protection of it's data. > - > -TODO: > -- Timeout on crashed vtpms > -- create lock for shared fifo for talking to vtpms. > diff --git a/tools/vtpm_manager/Rules.mk b/tools/vtpm_manager/Rules.mk > deleted file mode 100644 > index 651772b..0000000 > --- a/tools/vtpm_manager/Rules.mk > +++ /dev/null > @@ -1,59 +0,0 @@ > -# Base definitions and rules (XEN_ROOT must be defined in including Makefile) > -include $(XEN_ROOT)/tools/Rules.mk > - > -# > -# Tool definitions > -# > - > -# General compiler flags > -CFLAGS = -Werror -g3 > - > -# Generic project files > -HDRS = $(wildcard *.h) > -SRCS = $(wildcard *.c) > -OBJS = $(patsubst %.c,%.o,$(SRCS)) > - > -# Generic (non-header) dependencies > -$(SRCS): Makefile $(XEN_ROOT)/tools/Rules.mk $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -$(OBJS): $(SRCS) > - > --include $(FILES) > - > -# Make sure these are just rules > -.PHONY : all build install clean > - > -# > -# Project-specific definitions > -# > - > -# Need UNIX98 spec for pthread rwlocks > -CFLAGS += -D_GNU_SOURCE > - > -# Logging Level. See utils/tools.h for usage > -CFLAGS += -DLOGGING_MODULES="(BITMASK(VTPM_LOG_TCS)|BITMASK(VTPM_LOG_VTSP)|BITMASK(VTPM_LOG_VTPM))" > - > -# Silent Mode > -#CFLAGS += -DLOGGING_MODULES=0x0 > -#CFLAGS += -DLOGGING_MODULES=0xff > - > -# Use frontend/backend pairs between manager & DMs? > -#CFLAGS += -DVTPM_MULTI_VM > - > -# vtpm_manager listens on fifo's rather than backend > -#CFLAGS += -DDUMMY_BACKEND > - > -# TCS talks to fifo's rather than /dev/tpm. TPM Emulator assumed on fifos > -#CFLAGS += -DDUMMY_TPM > - > -# Do not have manager launch DMs. > -#CFLAGS += -DMANUAL_DM_LAUNCH > - > -# Fixed OwnerAuth > -#CFLAGS += -DWELL_KNOWN_OWNER_AUTH > - > -# Include > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/crypto > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/util > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/tcs > -CFLAGS += -I$(XEN_ROOT)/tools/vtpm_manager/manager > diff --git a/tools/vtpm_manager/crypto/Makefile b/tools/vtpm_manager/crypto/Makefile > deleted file mode 100644 > index 13b61c9..0000000 > --- a/tools/vtpm_manager/crypto/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libtcpaCrypto.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/crypto/crypto.c b/tools/vtpm_manager/crypto/crypto.c > deleted file mode 100644 > index 7dae655..0000000 > --- a/tools/vtpm_manager/crypto/crypto.c > +++ /dev/null > @@ -1,88 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.c > -// > -// This file will handle all the TPM Crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include "crypto.h" > -#include "log.h" > - > -/** > - * Initialize cryptography library > - * @rand: random seed > - * @size: size of @rand > - */ > -void Crypto_Init(const BYTE* rand, int size) { > - ERR_load_crypto_strings(); > - CRYPTO_malloc_init(); > - OpenSSL_add_all_algorithms(); > - SYM_CIPHER = EVP_aes_128_cbc(); > - RAND_poll(); > - if (rand == NULL) > - return; > - > - RAND_add(rand, size, size); > -} > - > -/** > - * Shutdown cryptography library > - */ > -void Crypto_Exit() { > - ERR_free_strings(); > - ERR_remove_state(0); > - EVP_cleanup(); > -} > - > - > -/** > - * Get random data > - * @data: (OUT) Random data > - * @size: Size of @data > - */ > -void Crypto_GetRandom(void* data, int size) { > - int result; > - > - result = RAND_pseudo_bytes((BYTE*) data, size); > - > - if (result <= 0) > - vtpmlogerror (VTPM_LOG_CRYPTO, "RAND_pseudo_bytes failed: %s\n", > - ERR_error_string (ERR_get_error(), NULL)); > -} > diff --git a/tools/vtpm_manager/crypto/crypto.h b/tools/vtpm_manager/crypto/crypto.h > deleted file mode 100644 > index 488d4d6..0000000 > --- a/tools/vtpm_manager/crypto/crypto.h > +++ /dev/null > @@ -1,175 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// crypto.h > -// > -// This file defines the TPM Crypto API > -// > -// ================================================================== > - > -#ifndef __CRYPTO_H__ > -#define __CRYPTO_H__ > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -#define CRYPTO_MAX_SIG_SIZE (2048 / 8) > -#define CRYPTO_MAX_RSA_KEY_SIZE (4096 / 8) //in bytes > - > -#define OAEP_P "TCPA" > -#define OAEP_P_SIZE 4 > - > -// Algorithms supported by crypto. Stored in CRYPTO_INFO.algorithmID > -#define CRYPTO_ALGORITH_RSA 0x01 > - > -// Supported Encryption Schemes CRYPTO_INFO.encScheme > -#define CRYPTO_ES_NONE 0x0001 > -#define CRYPTO_ES_RSAESPKCSv15 0x0002 > -#define CRYPTO_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// Supported Signature schemes CRYPTO_INFO.sigScheme > -#define CRYPTO_SS_NONE 0x0001 > -#define CRYPTO_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define CRYPTO_SS_RSASSAPKCS1v15_DER 0x0003 > - > -typedef struct CRYPTO_INFO { > - void *keyInfo; > - UINT32 algorithmID; > - UINT32 encScheme; > - UINT32 sigScheme; > -} CRYPTO_INFO; > - > - > -void Crypto_Init(const BYTE* rand, int size); > - > -void Crypto_Exit(); > - > -void Crypto_GetRandom(void* data, int size); > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest); > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest); /* presumably of 20 bytes */ > - > -void Crypto_SHA1Full( const BYTE* text, > - UINT32 size, > - BYTE* hash); //Complete 3part SHA1 > - > -// o_hash needs to be large enough to hold the digest, ie 20 bytes > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_hash); > - > -void Crypto_SHA1Start(UINT32* maxNumBytes); > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData); > -void Crypto_SHA1Complete( int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue); > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys); > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - /*[OUT]*/ CRYPTO_INFO* cryptoInfo); > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo); > - > -// > -// symmetric pack and unpack operations > -// > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen); > - > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread); > - > - > -// return 0 on success, -1 on error > -int Crypto_RSAEnc( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSADec( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData); > - > -// return 0 on success, -1 on error > -int Crypto_RSASign( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig); > - > -bool Crypto_RSAVerify( CRYPTO_INFO *keys, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig); > - > -//private: > -int RSA_verify_DER(int dtype, unsigned char *m, unsigned int m_len, > - unsigned char *sigbuf, unsigned int siglen, CRYPTO_INFO *key); > - > -int RSA_sign_DER(int type, unsigned char *m, unsigned int m_len, > - unsigned char *sigret, unsigned int *siglen, CRYPTO_INFO *key); > - > -#endif // __CRYPTO_H__ > diff --git a/tools/vtpm_manager/crypto/hash.c b/tools/vtpm_manager/crypto/hash.c > deleted file mode 100644 > index c73114a..0000000 > --- a/tools/vtpm_manager/crypto/hash.c > +++ /dev/null > @@ -1,153 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// hash.c > -// > -// This file will handle all the TPM Hash functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" // for TPM_SUCCESS > -#include "crypto.h" > - > -static SHA_CTX g_shaContext; > - > -void Crypto_HMAC( const BYTE* text, > - int text_len, > - const BYTE* key, > - int key_len, > - BYTE* digest) { > - if (text == NULL || key == NULL || text_len == 0 || key_len == 0) > - return; > - > - HMAC(EVP_sha1(), key, key_len, text, text_len, digest, NULL); > -} > - > -TPM_RESULT Crypto_HMAC_buf (const buffer_t * text, > - const buffer_t * key, > - BYTE * o_digest) { /* presumably of 20 bytes */ > - > - Crypto_HMAC (text->bytes, text->size, > - key->bytes, key->size, > - o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * SHA1 > - * (OUT) Create a SHA1 hash of text. Calls all three SHA1 steps internally > - */ > -void Crypto_SHA1Full( const BYTE* text, > - uint32_t size, > - BYTE* hash) { > - > - if (text == NULL || size == 0) > - return; > - > - // Run SHA1Start + SHAUpdate (if necessary) + SHAComplete > - uint32_t maxBytes; // Not used for anything > - Crypto_SHA1Start(&maxBytes); > - > - while (size > 64){ > - Crypto_SHA1Update(64, text); > - size -= 64; > - text += 64; > - } > - > - Crypto_SHA1Complete(size, text, hash); > -} > - > -// same thing using buffer_t > -TPM_RESULT Crypto_SHA1Full_buf (const buffer_t * buf, > - BYTE * o_digest) { > - > - if (buf->bytes == NULL || buf->size == 0) > - return TPM_BAD_PARAMETER; > - > - Crypto_SHA1Full (buf->bytes, buf->size, o_digest); > - > - return TPM_SUCCESS; > -} > - > - > -/* > - * Initialize SHA1 > - * (OUT) Maximum number of bytes that can be sent to SHA1Update. > - * Must be a multiple of 64 bytes. > - */ > -void Crypto_SHA1Start(uint32_t* maxNumBytes) { > - int max = SHA_CBLOCK; > - // Initialize the crypto library > - SHA1_Init(&g_shaContext); > - *maxNumBytes = max; > -} > - > -/* > - * Process SHA1 > - * @numBytes: (IN) The number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Bytes to be hashed. > - */ > -void Crypto_SHA1Update(int numBytes, const BYTE* hashData) { > - > - if (hashData == NULL || numBytes == 0 || numBytes%64 != 0) > - return; > - > - SHA1_Update(&g_shaContext, hashData, numBytes); > -} > - > -/* > - * Complete the SHA1 process > - * @hashDataSize: (IN) Number of bytes in hashData. > - * Must be a multiple of 64 bytes. > - * @hashData: (IN) Final bytes to be hashed. > - * @hashValue: (OUT) The output of the SHA-1 hash. > - */ > -void Crypto_SHA1Complete(int hashDataSize, > - const BYTE* hashData, > - BYTE* hashValue) { > - SHA1_Update(&g_shaContext, hashData, hashDataSize); > - SHA1_Final(hashValue, &g_shaContext); > -} > diff --git a/tools/vtpm_manager/crypto/rsa.c b/tools/vtpm_manager/crypto/rsa.c > deleted file mode 100644 > index 7737dc6..0000000 > --- a/tools/vtpm_manager/crypto/rsa.c > +++ /dev/null > @@ -1,434 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// rsa.c > -// > -// This file will handle all the TPM RSA crypto functionality > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "log.h" > - > -void Crypto_RSACreateKey( /*in*/ UINT32 keySize, > - /*in*/ UINT32 pubExpSize, > - /*in*/ BYTE *pubExp, > - /*out*/ UINT32 *privExpSize, > - /*out*/ BYTE *privExp, > - /*out*/ UINT32 *modulusSize, > - /*out*/ BYTE *modulus, > - /*out*/ CRYPTO_INFO *keys) { > - unsigned long e_value; > - > - if (pubExpSize == 0) // Default e = 2^16+1 > - e_value = (0x01 << 16) + 1; > - else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - e_value = (0x01 << 16) + 1; > - } > - > - RSA *rsa = RSA_generate_key(keySize, e_value, NULL, NULL); > - > - if (keys) { > - keys->keyInfo = rsa; > - keys->algorithmID = CRYPTO_ALGORITH_RSA; > - } > - > - if (modulus) *modulusSize = BN_bn2bin(rsa->n, modulus); > - if (privExp) *privExpSize = BN_bn2bin(rsa->d, privExp); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfo( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 privExpSize, > - /*[IN]*/ BYTE *privExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - rsa->d = BN_bin2bn(privExp, privExpSize, NULL); > -} > - > -// Create a CRYPTO_INFO struct from the BYTE * key parts. > -// If pubExp info is NULL, use TCG default. > -// If there is a remainder while calculating the privExp, return FALSE. > - > -void Crypto_RSABuildCryptoInfoPublic( /*[IN]*/ UINT32 pubExpSize, > - /*[IN]*/ BYTE *pubExp, > - /*[IN]*/ UINT32 modulusSize, > - /*[IN]*/ BYTE *modulus, > - CRYPTO_INFO* cryptoInfo) { > - cryptoInfo->keyInfo = RSA_new(); > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - rsa->e = BN_new(); > - > - if (pubExpSize == 0) { // Default e = 2^16+1 > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } else { > - // This is not supported, but the following line MIGHT work > - // under then assumption that the format is BigNum compatable > - // Though it's not in the spec, so who knows what it is. > - // Forcing the default. > - //BN_bin2bn(pubExp, pubExpSize, NULL); > - BN_set_bit(rsa->e, 16); > - BN_set_bit(rsa->e, 0); > - } > - > - rsa->n = BN_bin2bn(modulus, modulusSize, NULL); > - > -} > - > -int Crypto_RSAEnc( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - return -1; > - > - *outDataSize = 0; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - if (RSA_padding_add_PKCS1_type_2(paddedData, paddedDataSize, inData, inDataSize) <= 0) { > - rc = -1; > - goto abort_egress; > - } > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - if (RSA_padding_add_PKCS1_OAEP(paddedData,paddedDataSize,inData,inDataSize, (BYTE *) OAEP_P,OAEP_P_SIZE) <= 0 ) { > - rc = -1; > - goto abort_egress; > - } > - break; > - default: > - rc = -1; > - goto abort_egress; > - } > - > - rc = RSA_public_encrypt(paddedDataSize, paddedData, outData, rsa, RSA_NO_PADDING); > - if (rc == -1) > - goto abort_egress; > - > - *outDataSize = rc; > - > - if (rc > 0) rc = 0; > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (paddedData) > - free (paddedData); > - return rc; > - > -} > - > -int Crypto_RSADec( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *outDataSize, > - /*out*/ BYTE *outData) { > - > - RSA *rsa = (RSA *) key->keyInfo; > - UINT32 paddedDataSize = RSA_size (rsa); > - BYTE *paddedData = (BYTE *)malloc(sizeof(BYTE) * paddedDataSize); > - int rc; > - > - if (paddedData == NULL) > - goto abort_egress; > - > - rc = RSA_private_decrypt(inDataSize, inData, paddedData, rsa, RSA_NO_PADDING); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_private_decrypt: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - > - paddedDataSize = rc; > - > - switch (key->encScheme) { > - case CRYPTO_ES_RSAESPKCSv15: > - rc = RSA_padding_check_PKCS1_type_2 (outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa)); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_type_2: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - case CRYPTO_ES_RSAESOAEP_SHA1_MGF1: > - rc = RSA_padding_check_PKCS1_OAEP(outData, paddedDataSize, > - paddedData + 1, paddedDataSize - 1, > - RSA_size(rsa), > - (BYTE *) OAEP_P, OAEP_P_SIZE); > - if (rc == -1) { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA_padding_check_PKCS1_OAEP: %s\n", > - ERR_error_string(ERR_get_error(), NULL)); > - goto abort_egress; > - } > - *outDataSize = rc; > - break; > - default: > - *outDataSize = 0; > - } > - > - free(paddedData); paddedData = NULL; > - goto egress; > - > - abort_egress: > - > - if (paddedData) > - free (paddedData); > - return -1; > - > - egress: > - return 0; > -} > - > -// Signs either a SHA1 digest of a message or a DER encoding of a message > -// Textual messages MUST be encoded or Hashed before sending into this function > -// It will NOT SHA the message. > -int Crypto_RSASign( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - /*out*/ UINT32 *sigSize, > - /*out*/ BYTE *sig) { > - int status; > - unsigned int intSigSize; > - > - switch(key->sigScheme) { > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_sign(NID_sha1, inData, inDataSize, sig, &intSigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - // status = Crypto_RSA_sign_DER(NID_md5_sha1, inData, inDataSize, sig, &intSigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status == 0) { > - *sigSize = 0; > - vtpmlogerror(VTPM_LOG_CRYPTO, "%s\n", ERR_error_string(ERR_get_error(), NULL)); > - return -1; > - } > - > - *sigSize = (UINT32) intSigSize; > - return 0; > -} > - > -bool Crypto_RSAVerify( CRYPTO_INFO *key, > - UINT32 inDataSize, > - BYTE *inData, > - UINT32 sigSize, > - BYTE *sig) { > - int status; > - > - switch(key->sigScheme){ > - case CRYPTO_SS_RSASSAPKCS1v15_SHA1: > - status = RSA_verify(NID_sha1, inData, inDataSize, sig, sigSize, (RSA *) key->keyInfo); > - break; > - case CRYPTO_SS_RSASSAPKCS1v15_DER: > - //status = Crypto_RSA_verify_DER(NID_md5_sha1, inData, inDataSize, sig, sigSize, key); > - vtpmlogerror(VTPM_LOG_CRYPTO, "Crypto: Unimplemented sign type (%d)\n", key->sigScheme); > - status = 0; > - break; > - default: > - status = 0; > - } > - > - if (status) > - return(1); > - else { > - vtpmlogerror(VTPM_LOG_CRYPTO, "RSA verify: %s\n", ERR_error_string(ERR_get_error(), NULL)); > - return(0); > - } > - > -} > - > -// helper which packs everything into a BIO! > - > -// packs the parameters first, then the private key, then the public key > -// if *io_buf is NULL, allocate it here as needed. otherwise its size is in > -// *io_buflen > -TPM_RESULT Crypto_RSAPackCryptoInfo (const CRYPTO_INFO* cryptoInfo, > - BYTE ** io_buf, UINT32 * io_buflen) { > - TPM_RESULT status = TPM_SUCCESS; > - BYTE * buf; > - long len, outlen = *io_buflen; > - > - const long PARAMSLEN = 3*sizeof(UINT32); > - > - RSA *rsa = (RSA *) cryptoInfo->keyInfo; > - > - BIO *mem = BIO_new(BIO_s_mem()); > - > - > - // write the openssl keys to the BIO > - if ( i2d_RSAPrivateKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - if ( i2d_RSAPublicKey_bio (mem, rsa) == 0 ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_SIZE); > - } > - > - // get the buffer out > - len = BIO_get_mem_data (mem, &buf); > - > - // see if we need to allocate a return buffer > - if (*io_buf == NULL) { > - *io_buf = (BYTE*) malloc (PARAMSLEN + len); > - if (*io_buf == NULL) > - ERRORDIE (TPM_SIZE); > - } else { // *io_buf is already allocated > - if (outlen < len + PARAMSLEN) > - ERRORDIE (TPM_SIZE); // but not large enough! > - } > - > - // copy over the parameters (three UINT32's starting at algorithmID) > - memcpy (*io_buf, &cryptoInfo->algorithmID, PARAMSLEN); > - > - // copy over the DER keys > - memcpy (*io_buf + PARAMSLEN, buf, len); > - > - *io_buflen = len + PARAMSLEN; > - > - goto egress; > - > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > - > - > - > -// sets up ci, and returns the number of bytes read in o_lenread > -TPM_RESULT Crypto_RSAUnpackCryptoInfo (CRYPTO_INFO * ci, > - BYTE * in, UINT32 len, > - UINT32 * o_lenread) { > - > - TPM_RESULT status = TPM_SUCCESS; > - long l; > - BIO *mem; > - RSA *rsa; > - > - // first load up the params > - l = 3 * sizeof(UINT32); > - memcpy (&ci->algorithmID, in, l); > - len -= l; > - in += l; > - > - // and now the openssl keys, private first > - mem = BIO_new_mem_buf (in, len); > - > - if ( (rsa = d2i_RSAPrivateKey_bio (mem, NULL)) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - // now use the same RSA object and fill in the private key > - if ( d2i_RSAPublicKey_bio (mem, &rsa) == NULL ) { > - ERR_print_errors_fp (stderr); > - ERRORDIE (TPM_BAD_PARAMETER); > - } > - > - ci->keyInfo = rsa; // needs to be freed somehow later > - > - // FIXME: havent figured out yet how to tell how many bytes were read in the > - // above oprations! so o_lenread is not set > - > - goto egress; > - > - abort_egress: > - egress: > - > - BIO_free (mem); > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.c b/tools/vtpm_manager/crypto/sym_crypto.c > deleted file mode 100644 > index 3d86e19..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.c > +++ /dev/null > @@ -1,237 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.c > -// > -// Symmetric crypto portion of crypto > -// > -// ================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "sym_crypto.h" > - > -typedef enum crypt_op_type_t { > - CRYPT_ENCRYPT, > - CRYPT_DECRYPT > -} crypt_op_type_t; > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype); > - > - > -// this is initialized in Crypto_Init() > -const EVP_CIPHER * SYM_CIPHER = NULL; > - > -const BYTE ZERO_IV[EVP_MAX_IV_LENGTH] = {0}; > - > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits) { > - TPM_RESULT status = TPM_SUCCESS; > - > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init_copy (&key->key, keybits)); > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key) { > - int res; > - TPM_RESULT status = TPM_SUCCESS; > - > - // hmm, EVP_CIPHER_CTX_init does not return a value > - EVP_CIPHER_CTX_init (&key->context); > - > - key->cipher = SYM_CIPHER; > - > - TPMTRYRETURN( buffer_init (&key->key, EVP_CIPHER_key_length(key->cipher), NULL)) ; > - > - // and generate the key material > - res = RAND_pseudo_bytes (key->key.bytes, key->key.size); > - if (res < 0) > - ERRORDIE (TPM_SHORTRANDOM); > - > - > - goto egress; > - > - abort_egress: > - EVP_CIPHER_CTX_cleanup (&key->context); > - buffer_free (&key->key); > - > - egress: > - return status; > -} > - > - > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - buffer_init_const (&iv, EVP_MAX_IV_LENGTH, ZERO_IV); > - > - buffer_init (o_cipher, > - clear->size + > - EVP_CIPHER_iv_length(key->cipher) + > - EVP_CIPHER_block_size (key->cipher), > - 0); > - > - // copy the IV into the front > - buffer_copy (o_cipher, &iv); > - > - // make an alias into which we'll put the ciphertext > - buffer_init_alias (&cipher_alias, o_cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - TPMTRYRETURN( ossl_symcrypto_op (key, clear, &iv, &cipher_alias, CRYPT_ENCRYPT) ); > - > - // set the output size correctly > - o_cipher->size += cipher_alias.size; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > - > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear) { > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t iv, cipher_alias; > - > - // alias for the IV > - buffer_init_alias (&iv, cipher, 0, EVP_CIPHER_iv_length(key->cipher)); > - > - // make an alias to where the ciphertext is, after the IV > - buffer_init_alias (&cipher_alias, cipher, EVP_CIPHER_iv_length(key->cipher), 0); > - > - // prepare the output buffer > - TPMTRYRETURN( buffer_init (o_clear, > - cipher->size > - - EVP_CIPHER_iv_length(key->cipher) > - + EVP_CIPHER_block_size(key->cipher), > - 0) ); > - > - // and decrypt > - TPMTRYRETURN ( ossl_symcrypto_op (key, &cipher_alias, &iv, o_clear, CRYPT_DECRYPT) ); > - > - goto egress; > - > - abort_egress: > - buffer_free (o_clear); > - > - egress: > - > - return status; > -} > - > - > - > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key) { > - buffer_memset (&key->key, 0); > - buffer_free (&key->key); > - > - EVP_CIPHER_CTX_cleanup (&key->context); > - > - return TPM_SUCCESS; > -} > - > - > -TPM_RESULT ossl_symcrypto_op (symkey_t* key, > - const buffer_t* in, > - const buffer_t* iv, > - buffer_t * out, > - crypt_op_type_t optype) { > - TPM_RESULT status = TPM_SUCCESS; > - > - int inlen, outlen; > - tpm_size_t running; > - > - if ( ! EVP_CipherInit_ex (&key->context, > - key->cipher, NULL, key->key.bytes, iv->bytes, > - optype == CRYPT_ENCRYPT ? 1 : 0) ) > - ERRORDIE (TPM_FAIL); > - > - > - > - inlen = in->size; > - > - outlen = 0; > - running = 0; > - > - > - if ( ! EVP_CipherUpdate (&key->context, out->bytes, &outlen, in->bytes, inlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - if ( ! EVP_CipherFinal_ex (&key->context, out->bytes + running, &outlen) ) > - ERRORDIE (TPM_FAIL); > - > - running += outlen; > - > - out->size = running; > - > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/crypto/sym_crypto.h b/tools/vtpm_manager/crypto/sym_crypto.h > deleted file mode 100644 > index 7fb59a8..0000000 > --- a/tools/vtpm_manager/crypto/sym_crypto.h > +++ /dev/null > @@ -1,72 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// sym_crypto.h > -// > -// Symmetric Crypto > -// > -// ================================================================== > - > -#ifndef _SYM_CRYPTO_H > -#define _SYM_CRYPTO_H > - > -#include > -#include "buffer.h" > - > -typedef struct symkey_t { > - buffer_t key; > - > - EVP_CIPHER_CTX context; > - const EVP_CIPHER * cipher; > -} symkey_t; > - > -extern const EVP_CIPHER * SYM_CIPHER; > - > -TPM_RESULT Crypto_symcrypto_genkey (symkey_t * key); > - > -TPM_RESULT Crypto_symcrypto_initkey (symkey_t * key, const buffer_t* keybits); > - > - > -// these functions will allocate their output buffers > -TPM_RESULT Crypto_symcrypto_encrypt (symkey_t* key, > - const buffer_t* clear, > - buffer_t* o_cipher); > - > -TPM_RESULT Crypto_symcrypto_decrypt (symkey_t* key, > - const buffer_t* cipher, > - buffer_t* o_clear); > - > -// only free the internal parts, not the 'key' ptr > -TPM_RESULT Crypto_symcrypto_freekey (symkey_t * key); > - > -#endif /* _SYM_CRYPTO_H */ > diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile > deleted file mode 100644 > index a33c18a..0000000 > --- a/tools/vtpm_manager/manager/Makefile > +++ /dev/null > @@ -1,38 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = vtpm_managerd > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - if [ ! -d "$(DESTDIR)/var/vtpm/fifos" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/fifos; \ > - fi > - if [ ! -d "$(DESTDIR)/var/vtpm/socks" ]; \ > - then mkdir -p $(DESTDIR)/var/vtpm/socks; \ > - fi > - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BIN) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a > -LIBS += -lcrypto $(PTHREAD_LIBS) -lm > -CFLAGS += $(PTHREAD_CFLAGS) > -LDFLAGS += $(PTHREAD_LDFLAGS) > diff --git a/tools/vtpm_manager/manager/dmictl.c b/tools/vtpm_manager/manager/dmictl.c > deleted file mode 100644 > index 5c3cf7e..0000000 > --- a/tools/vtpm_manager/manager/dmictl.c > +++ /dev/null > @@ -1,266 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -// if dmi_res is non-null, then return a pointer to new object. > -// Also, this does not fill in the measurements. They should be filled by > -// design dependent code or saveNVM > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE dmi_type, VTPM_DMI_RESOURCE **dmi_res) { > - > - TPM_RESULT status=TPM_SUCCESS; > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - UINT32 *dmi_id_key=NULL; > - > - if ((new_dmi = (VTPM_DMI_RESOURCE *) malloc (sizeof(VTPM_DMI_RESOURCE))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - memset(new_dmi, 0, sizeof(VTPM_DMI_RESOURCE)); > - new_dmi->dmi_id = dmi_id; > - new_dmi->dmi_type = dmi_type; > - new_dmi->connected = FALSE; > - new_dmi->TCSContext = 0; > - > - new_dmi->NVMLocation = (char *) malloc(11 + strlen(DMI_NVM_FILE)); > - sprintf(new_dmi->NVMLocation, DMI_NVM_FILE, (uint32_t) new_dmi->dmi_id); > - > - if ((dmi_id_key = (UINT32 *) malloc (sizeof(UINT32))) == NULL) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - *dmi_id_key = new_dmi->dmi_id; > - > - // install into map > - if (!hashtable_insert(vtpm_globals->dmi_map, dmi_id_key, new_dmi)){ > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to insert instance into table. Aborting.\n", dmi_id); > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - if (dmi_res) > - *dmi_res = new_dmi; > - > - goto egress; > - > - abort_egress: > - if (new_dmi) { > - free(new_dmi->NVMLocation); > - free(new_dmi); > - } > - free(dmi_id_key); > - > - egress: > - return status; > -} > - > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res) { > - if (dmi_res == NULL) > - return TPM_SUCCESS; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) > - return(TPM_BAD_PARAMETER); > - > - TCS_CloseContext(dmi_res->TCSContext); > - dmi_res->connected = FALSE; > - > - vtpm_globals->connected_dmis--; > - > - return (VTPM_Close_DMI_Extra(dmi_res) ); > -} > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf) { > - > - VTPM_DMI_RESOURCE *new_dmi=NULL; > - TPM_RESULT status=TPM_FAIL; > - BYTE dmi_type, vm_type, startup_mode; > - UINT32 dmi_id; > - > - if (param_buf == NULL) { // Assume creation of Dom 0 control > - dmi_type = VTPM_TYPE_NON_MIGRATABLE; > - dmi_id = VTPM_CTL_DM; > - } else if (buffer_len(param_buf) != sizeof(BYTE) * 3 + sizeof(UINT32)) { > - vtpmloginfo(VTPM_LOG_VTPM, "New DMI command wrong length: %d.\n", buffer_len(param_buf)); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } else { > - vtpm_globals->connected_dmis++; // Put this here so we don't count Dom0 > - BSG_UnpackList( param_buf->bytes, 4, > - BSG_TYPE_BYTE, &dmi_type, > - BSG_TYPE_BYTE, &startup_mode, > - BSG_TYPE_BYTE, &vm_type, > - BSG_TYPE_UINT32, &dmi_id); > - } > - > - if ((dmi_type != VTPM_TYPE_NON_MIGRATABLE) && (dmi_type != VTPM_TYPE_MIGRATABLE)) { > - vtpmlogerror(VTPM_LOG_VTPM, "Creation of VTPM with illegal type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - new_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (new_dmi == NULL) { > - vtpmloginfo(VTPM_LOG_VTPM, "Creating new DMI instance %d attached.\n", dmi_id ); > - // Brand New DMI. Initialize the persistent pieces > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &new_dmi) ); > - } else > - vtpmloginfo(VTPM_LOG_VTPM, "Re-attaching DMI instance %d.\n", dmi_id); > - > - if (new_dmi->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach, currently attached instance %d. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (new_dmi->dmi_type == VTPM_TYPE_MIGRATED) { > - vtpmlogerror(VTPM_LOG_VTPM, "Attempt to re-attach previously migrated instance %d without recovering first. Ignoring\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Initialize the Non-persistent pieces > - TPMTRYRETURN( TCS_OpenContext(&new_dmi->TCSContext) ); > - > - new_dmi->connected = TRUE; > - > - // Design specific new DMI code. > - // Includes: create IPCs, Measuring DMI, and maybe launching DMI > - TPMTRYRETURN(VTPM_New_DMI_Extra(new_dmi, vm_type, startup_mode) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create DMI id=%d due to status=%s. Cleaning.\n", dmi_id, tpm_get_error_name(status)); > - close_dmi(new_dmi ); > - > - egress: > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Close_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size."); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Closing DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Trying to close nonexistent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (!dmi_res->connected) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-connected DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Close Dmi > - TPMTRYRETURN(close_dmi( dmi_res )); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Delete_DMI( const buffer_t *param_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *dmi_res=NULL; > - UINT32 dmi_id; > - > - if ((param_buf == NULL) || (buffer_len(param_buf) != sizeof(UINT32)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing DMI has bad size.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - BSG_UnpackList( param_buf->bytes, 1, > - BSG_TYPE_UINT32, &dmi_id); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Deleting DMI %d.\n", dmi_id); > - > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_remove(vtpm_globals->dmi_map, &dmi_id); > - if (dmi_res == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing non-existent DMI.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - //vtpm scripts delete file dmi_res->NVMLocation for us > - > - // Close DMI first > - TPMTRYRETURN(close_dmi( dmi_res )); > - free ( dmi_res ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/migration.c b/tools/vtpm_manager/manager/migration.c > deleted file mode 100644 > index 54da708..0000000 > --- a/tools/vtpm_manager/manager/migration.c > +++ /dev/null > @@ -1,307 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// dmictl.c > -// > -// Functions for creating and destroying DMIs > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpmpriv.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "log.h" > -#include "hashtable.h" > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi=NULL; > - UINT32 dmi_id; > - buffer_t dmi_state_abuf = NULL_BUF, enc_dmi_abuf = NULL_BUF, clear_dmi_blob = NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t enc_dmi_state_pack; > - > - BSG_UnpackList(param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &enc_dmi_state_pack) ; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating VTPM in dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming VTPM claims unavailable id: %d.\n", dmi_id); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** UnBind Blob **/ > - TPMTRYRETURN( buffer_init_alias_convert( &enc_dmi_abuf, > - enc_dmi_state_pack.size, > - enc_dmi_state_pack.data) ); > - > - TPMTRYRETURN( envelope_decrypt( &enc_dmi_abuf, > - vtpm_globals->manager_tcs_handle, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - &clear_dmi_blob) ); > - > - // Create new dmi > - TPMTRYRETURN( init_dmi(dmi_id, VTPM_TYPE_MIGRATABLE, &mig_dmi ) ); > - > - /** Open Blob **/ > - struct pack_buf_t dmi_state_pack; > - > - BSG_UnpackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - TPMTRYRETURN( buffer_init_alias_convert(&dmi_state_abuf, > - dmi_state_pack.size, > - dmi_state_pack.data) ); > - > - TPMTRYRETURN( VTPM_Handle_Save_NVM(mig_dmi, &dmi_state_abuf, NULL ) ); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration IN of instance %d failed because of %s.\n", dmi_id, tpm_get_error_name(status) ); > - > - egress: > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state_abuf); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Migrate_Out( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_DMI_RESOURCE *mig_dmi; > - UINT32 dmi_id; > - VTPM_MIGKEY_LIST *last_mig, *mig_key; > - buffer_t dmi_state=NULL_BUF, clear_dmi_blob=NULL_BUF; > - > - if (param_buf == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Migration Out Failed due to bad parameter.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - struct pack_buf_t name_pack; > - > - BSG_UnpackList( param_buf->bytes, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_SIZE32_DATA, &name_pack); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Migrating out dmi %d.\n", dmi_id); > - > - mig_dmi = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi_id); > - if (mig_dmi == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Non-existent VTPM instance (%d) in migration.\n", dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - if (mig_dmi->dmi_type != VTPM_TYPE_MIGRATABLE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Bad VTPM type (%d) in migration of instance (%d).\n", mig_dmi->dmi_type, dmi_id ); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Find migration key for dest **/ > - last_mig = NULL; > - mig_key = vtpm_globals->mig_keys; > - while (mig_key != NULL) { > - if (mig_key->name_size == name_pack.size) > - if (memcmp(mig_key->name, name_pack.data, name_pack.size) == 0) { > - break; > - } > - > - last_mig = mig_key; > - mig_key = mig_key->next; > - } > - > - if (!mig_key) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unknown Migration target host.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /** Mark vtpm as migrated **/ > - mig_dmi->dmi_type = VTPM_TYPE_MIGRATED; > - > - /** Build Blob **/ > - TPMTRYRETURN( VTPM_Handle_Load_NVM(mig_dmi, NULL, &dmi_state) ); > - > - TPMTRYRETURN( buffer_init(&clear_dmi_blob, sizeof(TPM_DIGEST) + sizeof(UINT32) + buffer_len(&dmi_state), NULL ) ); > - > - struct pack_constbuf_t dmi_state_pack; > - > - dmi_state_pack.size = buffer_len(&dmi_state); > - dmi_state_pack.data = dmi_state.bytes; > - > - BSG_PackList(clear_dmi_blob.bytes, 2, > - BSG_TPM_DIGEST, &mig_dmi->DMI_measurement, > - BSG_TPM_SIZE32_DATA, &dmi_state_pack); > - > - /** Bind Blob **/ > - TPMTRYRETURN( envelope_encrypt( &clear_dmi_blob, > - &mig_key->key, > - result_buf) ); > - > - if (last_mig) > - last_mig->next = mig_key->next; > - else > - vtpm_globals->mig_keys = mig_key->next; > - > - free(mig_key->name); > - free(mig_key); > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Migration OUT of instance %d failed because of %s. Migratoin recovery may be needed.\n", dmi_id, tpm_get_error_name(status) ); > - > - //TODO: Create and implement a policy for what happens to mig_key on failed migrations. > - > - egress: > - > - buffer_free(&clear_dmi_blob); > - buffer_free(&dmi_state); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Getting Migration Public Key.\n"); > - > - struct pack_buf_t pubkey_exp_pack, pubkey_mod_pack; > - TPM_KEY mig_key; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, vtpm_globals->storageKeyWrap.bytes , &mig_key); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - mig_key.algorithmParms.parms, > - &rsaKeyParms); > - > - pubkey_exp_pack.size = rsaKeyParms.exponentSize; > - pubkey_exp_pack.data = rsaKeyParms.exponent; > - pubkey_mod_pack.size = mig_key.pubKey.keyLength; > - pubkey_mod_pack.data = mig_key.pubKey.key; > - > - TPMTRYRETURN( buffer_init( result_buf, 2*sizeof(UINT32) + > - pubkey_exp_pack.size + > - pubkey_mod_pack.size, NULL ) ); > - > - BSG_PackList( result_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Get Migration Key failed because of %s.\n", tpm_get_error_name(status) ); > - egress: > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Load_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf) { > - > - TPM_RESULT status=TPM_FAIL; > - VTPM_MIGKEY_LIST *mig_key; > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loading Migration Public Key.\n"); > - > - //FIXME: Review all uses of unpacking pack_buf_t and ensure free. > - //FIXME: Review all declarations/initializations of buffer_t that could have a goto that skips them and then tries to free them > - > - struct pack_buf_t name_pack, pubkey_exp_pack, pubkey_mod_pack; > - > - //FIXME: scan list and verify name is not already in the list > - > - BSG_UnpackList( param_buf->bytes, 3, > - BSG_TPM_SIZE32_DATA, &name_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_exp_pack, > - BSG_TPM_SIZE32_DATA, &pubkey_mod_pack); > - > - //TODO: Maintain a persistent list for pub_keys. > - //TODO: Verify pub_key is trusted > - > - mig_key = (VTPM_MIGKEY_LIST *) malloc(sizeof(VTPM_MIGKEY_LIST)); > - memset(mig_key, 0, sizeof(VTPM_MIGKEY_LIST) ); > - mig_key->name_size = name_pack.size; > - mig_key->name = name_pack.data; > - > - mig_key->key.encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - Crypto_RSABuildCryptoInfoPublic( pubkey_exp_pack.size, > - pubkey_exp_pack.data, > - pubkey_mod_pack.size, > - pubkey_mod_pack.data, > - &mig_key->key); > - > - > - mig_key->next = vtpm_globals->mig_keys; > - vtpm_globals->mig_keys = mig_key; > - > - // free(name_pack.data); Do not free. data is now part of mig_key. > - free(pubkey_exp_pack.data); > - free(pubkey_mod_pack.data); > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/manager/securestorage.c b/tools/vtpm_manager/manager/securestorage.c > deleted file mode 100644 > index d5e6ffd..0000000 > --- a/tools/vtpm_manager/manager/securestorage.c > +++ /dev/null > @@ -1,512 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// securestorage.c > -// > -// Functions regarding securely storing DMI secrets. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "crypto.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "buffer.h" > -#include "log.h" > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data) { > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_cipher = NULL_BUF; > - > - UINT32 i; > - struct pack_constbuf_t symkey_cipher32, data_cipher32; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Input[%d]: 0x", buffer_len(inbuf)); > - for (i=0; i< buffer_len(inbuf); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", inbuf->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - // Generate a sym key and encrypt state with it > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_genkey (&symkey) ); > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_symcrypto_encrypt (&symkey, inbuf, &data_cipher) ); > - > - // Encrypt symmetric key > - TPMTRYRETURN( VTSP_Bind( asymkey, > - &symkey.key, > - &symkey_cipher) ); > - > - // Create output blob: symkey_size + symkey_cipher + state_cipher_size + state_cipher > - > - symkey_cipher32.size = buffer_len(&symkey_cipher); > - symkey_cipher32.data = symkey_cipher.bytes; > - > - data_cipher32.size = buffer_len(&data_cipher); > - data_cipher32.data = data_cipher.bytes; > - > - TPMTRYRETURN( buffer_init(sealed_data, 2 * sizeof(UINT32) + symkey_cipher32.size + data_cipher32.size, NULL)); > - > - BSG_PackList(sealed_data->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved %d bytes of E(symkey) + %d bytes of E(data)\n", buffer_len(&symkey_cipher), buffer_len(&data_cipher)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Enveloping Output[%d]: 0x", buffer_len(sealed_data)); > - for (i=0; i< buffer_len(sealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", sealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope encrypt\n."); > - > - egress: > - > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data) { > - > - TPM_RESULT status = TPM_SUCCESS; > - symkey_t symkey; > - buffer_t data_cipher = NULL_BUF, > - symkey_clear = NULL_BUF, > - symkey_cipher = NULL_BUF; > - struct pack_buf_t symkey_cipher32, data_cipher32; > - int i; > - > - memset(&symkey, 0, sizeof(symkey_t)); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypt Input[%d]: 0x", buffer_len(cipher) ); > - for (i=0; i< buffer_len(cipher); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cipher->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - BSG_UnpackList(cipher->bytes, 2, > - BSG_TPM_SIZE32_DATA, &symkey_cipher32, > - BSG_TPM_SIZE32_DATA, &data_cipher32); > - > - TPMTRYRETURN( buffer_init_alias_convert (&symkey_cipher, > - symkey_cipher32.size, > - symkey_cipher32.data) ); > - > - TPMTRYRETURN( buffer_init_alias_convert (&data_cipher, > - data_cipher32.size, > - data_cipher32.data) ); > - > - // Decrypt Symmetric Key > - TPMTRYRETURN( VTSP_Unbind( TCSContext, > - keyHandle, > - &symkey_cipher, > - key_usage_auth, > - &symkey_clear, > - &(vtpm_globals->keyAuth) ) ); > - > - // create symmetric key using saved bits > - Crypto_symcrypto_initkey (&symkey, &symkey_clear); > - > - // Decrypt State > - TPMTRY(TPM_DECRYPT_ERROR, Crypto_symcrypto_decrypt (&symkey, &data_cipher, unsealed_data) ); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Envelope Decrypte Output[%d]: 0x", buffer_len(unsealed_data)); > - for (i=0; i< buffer_len(unsealed_data); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", unsealed_data->bytes[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to envelope decrypt data\n."); > - > - egress: > - buffer_free ( &data_cipher); > - buffer_free ( &symkey_clear); > - buffer_free ( &symkey_cipher); > - Crypto_symcrypto_freekey (&symkey); > - > - return status; > -} > - > -TPM_RESULT VTPM_Handle_Save_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - long bytes_written; > - buffer_t sealed_NVM = NULL_BUF; > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Saving %d bytes of NVM.\n", buffer_len(inbuf)); > - > - TPMTRYRETURN( envelope_encrypt(inbuf, > - &vtpm_globals->storageKey, > - &sealed_NVM) ); > - > - // Write sealed blob off disk from NVMLocation > - // TODO: How to properly return from these. Do we care if we return failure > - // after writing the file? We can't get the old one back. > - // TODO: Backup old file and try and recover that way. > - fh = open(myDMI->NVMLocation, O_WRONLY | O_CREAT | O_TRUNC, S_IREAD | S_IWRITE); > - if ( (bytes_written = write(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM) ) != (long) buffer_len(&sealed_NVM))) { > - vtpmlogerror(VTPM_LOG_VTPM, "We just overwrote a DMI_NVM and failed to finish. %ld/%ld bytes.\n", bytes_written, (long)buffer_len(&sealed_NVM)); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - Crypto_SHA1Full (sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &myDMI->NVM_measurement); > - > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to save NVM\n."); > - > - egress: > - buffer_free(&sealed_NVM); > - return status; > -} > - > - > -/* Expected Params: inbuf = null, outbuf = sealed blob size, sealed blob.*/ > -TPM_RESULT VTPM_Handle_Load_NVM(VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - > - buffer_t sealed_NVM = NULL_BUF; > - long fh_size; > - int fh, stat_ret, i; > - struct stat file_stat; > - TPM_DIGEST sealedNVMHash; > - > - if (myDMI->NVMLocation == NULL) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to load NVM because the file name NULL.\n"); > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - //Read sealed blob off disk from NVMLocation > - fh = open(myDMI->NVMLocation, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - TPMTRYRETURN( buffer_init( &sealed_NVM, fh_size, NULL) ); > - if (read(fh, sealed_NVM.bytes, buffer_len(&sealed_NVM)) != fh_size) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Load_NVMing[%d],\n", buffer_len(&sealed_NVM)); > - > - Crypto_SHA1Full(sealed_NVM.bytes, buffer_len(&sealed_NVM), (BYTE *) &sealedNVMHash); > - > - // Verify measurement of sealed blob. > - if (memcmp(&sealedNVMHash, &myDMI->NVM_measurement, sizeof(TPM_DIGEST)) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM LoadNVM NVM measurement check failed.\n"); > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Correct hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&myDMI->NVM_measurement)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "Measured hash: "); > - for (i=0; i< sizeof(TPM_DIGEST); i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", ((BYTE*)&sealedNVMHash)[i]); > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_AUTHFAIL; > - goto abort_egress; > - } > - > - TPMTRYRETURN( envelope_decrypt(&sealed_NVM, > - myDMI->TCSContext, > - vtpm_globals->storageKeyHandle, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - outbuf) ); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load NVM\n."); > - > - egress: > - buffer_free( &sealed_NVM ); > - > - return status; > -} > - > - > -TPM_RESULT VTPM_SaveManagerData(void) { > - TPM_RESULT status=TPM_SUCCESS; > - int fh, dmis=-1; > - > - BYTE *flat_boot_key=NULL, *flat_dmis=NULL, *flat_enc=NULL; > - buffer_t clear_flat_global=NULL_BUF, enc_flat_global=NULL_BUF; > - UINT32 storageKeySize = buffer_len(&vtpm_globals->storageKeyWrap); > - UINT32 bootKeySize = buffer_len(&vtpm_globals->bootKeyWrap); > - struct pack_buf_t storage_key_pack = {storageKeySize, vtpm_globals->storageKeyWrap.bytes}; > - struct pack_buf_t boot_key_pack = {bootKeySize, vtpm_globals->bootKeyWrap.bytes}; > - BYTE vtpm_manager_gen = VTPM_MANAGER_GEN; > - > - struct hashtable_itr *dmi_itr; > - VTPM_DMI_RESOURCE *dmi_res; > - > - UINT32 boot_key_size = 0, flat_dmis_size = 0; > - > - // Initially fill these with buffer sizes for each data type. Later fill > - // in actual size, once flattened. > - boot_key_size = sizeof(UINT32) + // bootkeysize > - bootKeySize; // boot key > - > - TPMTRYRETURN(buffer_init(&clear_flat_global,sizeof(BYTE) + // manager version > - 3*sizeof(TPM_DIGEST) + // Auths > - sizeof(UINT32) +// storagekeysize > - storageKeySize, NULL) ); // storage key > - > - > - flat_boot_key = (BYTE *) malloc( boot_key_size ); > - flat_enc = (BYTE *) malloc( sizeof(UINT32) ); > - > - boot_key_size = BSG_PackList(flat_boot_key, 1, > - BSG_TPM_SIZE32_DATA, &boot_key_pack); > - > - BSG_PackList(clear_flat_global.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(envelope_encrypt(&clear_flat_global, > - &vtpm_globals->bootKey, > - &enc_flat_global) ); > - > - BSG_PackConst(buffer_len(&enc_flat_global), 4, flat_enc); > - > - // Per DMI values to be saved (if any exit) > - if (hashtable_count(vtpm_globals->dmi_map) > 1) { > - > - flat_dmis = (BYTE *) malloc( > - (hashtable_count(vtpm_globals->dmi_map) - 1) * // num DMIS (-1 for Dom0) > - (sizeof(UINT32) +sizeof(BYTE) + 2*sizeof(TPM_DIGEST)) ); // Per DMI info > - > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - dmis++; > - > - // No need to save dmi0. > - if (dmi_res->dmi_id == 0) > - continue; > - > - > - flat_dmis_size += BSG_PackList( flat_dmis + flat_dmis_size, 4, > - BSG_TYPE_UINT32, &dmi_res->dmi_id, > - BSG_TYPE_BYTE, &dmi_res->dmi_type, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - > - } while (hashtable_iterator_advance(dmi_itr)); > - } > - > - fh = open(STATE_FILE, O_WRONLY | O_CREAT, S_IREAD | S_IWRITE); > - if (fh == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to open %s file for write.\n", STATE_FILE); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if ( ( write(fh, flat_boot_key, boot_key_size) != boot_key_size ) || > - ( write(fh, flat_enc, sizeof(UINT32)) != sizeof(UINT32) ) || > - ( write(fh, enc_flat_global.bytes, buffer_len(&enc_flat_global)) != buffer_len(&enc_flat_global) ) || > - ( write(fh, flat_dmis, flat_dmis_size) != flat_dmis_size ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to completely write service data.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - goto egress; > - > - abort_egress: > - egress: > - > - free(flat_boot_key); > - free(flat_enc); > - buffer_free(&enc_flat_global); > - free(flat_dmis); > - close(fh); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Saved VTPM Manager state (status = %d, dmis = %d)\n", (int) status, dmis); > - return status; > -} > - > -TPM_RESULT VTPM_LoadManagerData(void) { > - > - TPM_RESULT status=TPM_SUCCESS; > - int fh, stat_ret, dmis=0; > - long fh_size = 0, step_size; > - BYTE *flat_table=NULL; > - buffer_t unsealed_data, enc_table_abuf; > - struct pack_buf_t storage_key_pack, boot_key_pack; > - UINT32 *dmi_id_key, enc_size; > - BYTE vtpm_manager_gen; > - > - VTPM_DMI_RESOURCE *dmi_res; > - UINT32 dmi_id; > - BYTE dmi_type; > - struct stat file_stat; > - > - TPM_HANDLE boot_key_handle; > - TPM_AUTHDATA boot_usage_auth; > - memset(&boot_usage_auth, 0, sizeof(TPM_AUTHDATA)); > - > - fh = open(STATE_FILE, O_RDONLY ); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - fh_size = file_stat.st_size; > - else { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - flat_table = (BYTE *) malloc(fh_size); > - > - if ((long) read(fh, flat_table, fh_size) != fh_size ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Read Boot Key > - step_size = BSG_UnpackList( flat_table, 2, > - BSG_TPM_SIZE32_DATA, &boot_key_pack, > - BSG_TYPE_UINT32, &enc_size); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->bootKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_init_alias_convert(&enc_table_abuf, enc_size, flat_table + step_size) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->bootKeyWrap, boot_key_pack.size, boot_key_pack.data) ); > - > - //Load Boot Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - &SRK_AUTH, > - &boot_key_handle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->bootKey, > - FALSE) ); > - > - TPMTRYRETURN( envelope_decrypt(&enc_table_abuf, > - vtpm_globals->manager_tcs_handle, > - boot_key_handle, > - (const TPM_AUTHDATA*) &boot_usage_auth, > - &unsealed_data) ); > - step_size += enc_size; > - > - if (*unsealed_data.bytes != VTPM_MANAGER_GEN) { > - // Once there is more than one gen, this will include some compatability stuff > - vtpmlogerror(VTPM_LOG_VTPM, "Warning: Manager Data file is gen %d, which this manager is gen %d.\n", vtpm_manager_gen, VTPM_MANAGER_GEN); > - } > - > - // Global Values needing to be saved > - BSG_UnpackList( unsealed_data.bytes, 4, > - BSG_TYPE_BYTE, &vtpm_manager_gen, > - BSG_TPM_AUTHDATA, &vtpm_globals->owner_usage_auth, > - BSG_TPM_SECRET, &vtpm_globals->storage_key_usage_auth, > - BSG_TPM_SIZE32_DATA, &storage_key_pack); > - > - TPMTRYRETURN(buffer_init(&vtpm_globals->storageKeyWrap, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(&vtpm_globals->storageKeyWrap, storage_key_pack.size, storage_key_pack.data) ); > - > - // Per DMI values to be saved > - while ( step_size < fh_size ){ > - if (fh_size - step_size < (long) (sizeof(UINT32) + sizeof(BYTE) + 2*sizeof(TPM_DIGEST))) { > - vtpmlogerror(VTPM_LOG_VTPM, "Encountered %ld extra bytes at end of manager state.\n", fh_size-step_size); > - step_size = fh_size; > - } else { > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TYPE_BYTE, &dmi_type); > - > - //TODO: Try and gracefully recover from problems. > - TPMTRYRETURN(init_dmi(dmi_id, dmi_type, &dmi_res) ); > - dmis++; > - > - step_size += BSG_UnpackList(flat_table + step_size, 2, > - BSG_TPM_DIGEST, &dmi_res->NVM_measurement, > - BSG_TPM_DIGEST, &dmi_res->DMI_measurement); > - } > - > - } > - > - vtpmloginfo(VTPM_LOG_VTPM, "Loaded saved state (dmis = %d).\n", dmis); > - goto egress; > - > - abort_egress: > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to load service data with error = %s\n", tpm_get_error_name(status)); > - egress: > - > - free(flat_table); > - close(fh); > - > - // TODO: Could be nice and evict BootKey. (Need to add EvictKey to VTSP. > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/tpmpassthrough.c b/tools/vtpm_manager/manager/tpmpassthrough.c > deleted file mode 100644 > index 9b1e5f8..0000000 > --- a/tools/vtpm_manager/manager/tpmpassthrough.c > +++ /dev/null > @@ -1,110 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmpassthrough.c > -// > -// Functions regarding passing DMI requests to HWTPM > -// > -// ================================================================== > - > -#include "tcg.h" > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "log.h" > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE *ord; > - > - ord = (TPM_COMMAND_CODE *) (inbuf->bytes + sizeof(TPM_TAG) + sizeof(UINT32)); > - > - switch (*ord) { > - > - // Forbidden for DMI use > - case TPM_ORD_TakeOwnership: > - case TPM_ORD_ChangeAuthOwner: > - case TPM_ORD_DirWriteAuth: > - case TPM_ORD_DirRead: > - case TPM_ORD_AuthorizeMigrationKey: > - case TPM_ORD_CreateMaintenanceArchive: > - case TPM_ORD_LoadMaintenanceArchive: > - case TPM_ORD_KillMaintenanceFeature: > - case TPM_ORD_LoadManuMaintPub: > - case TPM_ORD_ReadManuMaintPub: > - case TPM_ORD_SelfTestFull: > - case TPM_ORD_SelfTestStartup: > - case TPM_ORD_CertifySelfTest: > - case TPM_ORD_ContinueSelfTest: > - case TPM_ORD_GetTestResult: > - case TPM_ORD_Reset: > - case TPM_ORD_OwnerClear: > - case TPM_ORD_DisableOwnerClear: > - case TPM_ORD_ForceClear: > - case TPM_ORD_DisableForceClear: > - case TPM_ORD_GetCapabilityOwner: > - case TPM_ORD_OwnerSetDisable: > - case TPM_ORD_PhysicalEnable: > - case TPM_ORD_PhysicalDisable: > - case TPM_ORD_SetOwnerInstall: > - case TPM_ORD_PhysicalSetDeactivated: > - case TPM_ORD_SetTempDeactivated: > - case TPM_ORD_CreateEndorsementKeyPair: > - case TPM_ORD_GetAuditEvent: > - case TPM_ORD_GetAuditEventSigned: > - case TPM_ORD_GetOrdinalAuditStatus: > - case TPM_ORD_SetOrdinalAuditStatus: > - case TPM_ORD_SetRedirection: > - case TPM_ORD_FieldUpgrade: > - case TSC_ORD_PhysicalPresence: > - status = TPM_DISABLED_CMD; > - goto abort_egress; > - break; > - > - } // End ORD Switch > - > - // Call TCS with command > - > - TPMTRY(TPM_IOERROR, VTSP_RawTransmit( dmi->TCSContext,inbuf, outbuf) ); > - > - goto egress; > - > - abort_egress: > - vtpmloginfo(VTPM_LOG_VTPM, "TPM Command Failed in tpmpassthrough.\n"); > - egress: > - > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.c b/tools/vtpm_manager/manager/vtpm_ipc.c > deleted file mode 100644 > index 319dc83..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.c > +++ /dev/null > @@ -1,141 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.c Implements ipc routines using file io. This file can > -// be replaced with other ipc types. > -// > -// =================================================================== > - > -#include > -#include "vtpm_ipc.h" > -#include "vtpmpriv.h" > -#include "log.h" > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ipc_h, char* name, int flags, BOOL create) { > - ipc_h->name = name; > - ipc_h->flags = flags; > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - if (create) > - return(vtpm_ipc_create(ipc_h)); > - else > - return 0; > -} > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ipc_h) { > - int fh; > - struct stat file_info; > - > - if ((!ipc_h) || (!ipc_h->name)) > - return -1; > - > - if ( stat(ipc_h->name, &file_info) == -1) { > - if ( mkfifo(ipc_h->name, S_IWUSR | S_IRUSR ) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to create fifo %s.\n", ipc_h->name); > - return -1; > - } > - } > - > - ipc_h->fh = VTPM_IPC_CLOSED; > - > - return 0; > -} > - > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size){ > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for reading.\n", my_ipc_h->name); > - return -1; > - } > - > - result = read(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ipc_h, vtpm_ipc_handle_t *alt_ipc_h, BYTE *bytes, UINT32 size) { > - vtpm_ipc_handle_t *my_ipc_h; > - int result; > - > - if (ipc_h) { > - my_ipc_h = ipc_h; > - } else { > - my_ipc_h = alt_ipc_h; > - } > - > - if (my_ipc_h->fh == VTPM_IPC_CLOSED) { > - my_ipc_h->fh = open(my_ipc_h->name, my_ipc_h->flags); > - } > - > - if ( my_ipc_h->fh == VTPM_IPC_CLOSED ) { > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM ERROR: Can't open %s for writing.\n", my_ipc_h->name); > - return -1; > - } > - > - result = write(my_ipc_h->fh, bytes, size); > - if (result < 0) { > - my_ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > - return (result); > -} > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ipc_h) { > - > - if (ipc_h) { > - close(ipc_h->fh); > - ipc_h->fh = VTPM_IPC_CLOSED; > - } > - > -} > diff --git a/tools/vtpm_manager/manager/vtpm_ipc.h b/tools/vtpm_manager/manager/vtpm_ipc.h > deleted file mode 100644 > index 529c4a2..0000000 > --- a/tools/vtpm_manager/manager/vtpm_ipc.h > +++ /dev/null > @@ -1,71 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_ipc.h Header for interprocess communication between VTPM manager > -// and Guests or VTPMs > -// > -// =================================================================== > - > -#ifndef __VTPM_IO_H__ > -#define __VTPM_IO_H__ > - > -#include "tcg.h" > - > -#define VTPM_IPC_CLOSED -1 > - > -// Represents an (somewhat) abstracted io handle. > -typedef struct vtpm_ipc_handle_t { > - int fh; // IO handle. > - int flags; // Flags for opening. This may need to become > - // a void *, but for now files use an int. > - char *name; // Names for debugging as well as filenames > - // for file-based io. > -} vtpm_ipc_handle_t; > - > - > -int vtpm_ipc_init(vtpm_ipc_handle_t *ioh, char* name, int flags, BOOL create); > - > -// Create the file that needs opening. Used only for FIFOs > -// FYI: This may cause problems in other file IO schemes. We'll see. > -int vtpm_ipc_create(vtpm_ipc_handle_t *ioh); > - > -// Read size bytes. If FH isn't open, open it. > -int vtpm_ipc_read(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Write size bytes. If FH isn't open, open it. > -int vtpm_ipc_write(vtpm_ipc_handle_t *ioh, vtpm_ipc_handle_t *alt_ioh, BYTE *bytes, UINT32 size); > - > -// Mark file as closed and try and close it. Errors not reported. > -void vtpm_ipc_close(vtpm_ipc_handle_t *ioh); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_lock.c b/tools/vtpm_manager/manager/vtpm_lock.c > deleted file mode 100644 > index e737d60..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.c > +++ /dev/null > @@ -1,63 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.c Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#include > -#include "vtpm_lock.h" > - > -static pthread_rwlock_t vtpm_lock; > - > -void vtpm_lock_init() { > - > - pthread_rwlock_init( &vtpm_lock, NULL); > -} > - > -void vtpm_lock_destroy(){ > - pthread_rwlock_destroy(&vtpm_lock); > -} > - > -void vtpm_lock_rdlock(){ > - pthread_rwlock_rdlock(&vtpm_lock); > -} > - > -void vtpm_lock_wrlock(){ > - pthread_rwlock_wrlock(&vtpm_lock); > -} > - > -void vtpm_lock_unlock(){ > - pthread_rwlock_unlock(&vtpm_lock); > -} > - > diff --git a/tools/vtpm_manager/manager/vtpm_lock.h b/tools/vtpm_manager/manager/vtpm_lock.h > deleted file mode 100644 > index 53a339d..0000000 > --- a/tools/vtpm_manager/manager/vtpm_lock.h > +++ /dev/null > @@ -1,48 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_lock.h Provided controlled sync around access to vtpm structures > -// > -// =================================================================== > - > -#ifndef __VTPM_LOCK_H__ > -#define __VTPM_LOCK_H__ > - > -void vtpm_lock_init(); > -void vtpm_lock_destroy(); > - > -void vtpm_lock_rdlock(); > -void vtpm_lock_wrlock(); > -void vtpm_lock_unlock(); > - > -#endif > diff --git a/tools/vtpm_manager/manager/vtpm_manager.c b/tools/vtpm_manager/manager/vtpm_manager.c > deleted file mode 100644 > index e089f78..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.c > +++ /dev/null > @@ -1,285 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -#include "log.h" > -#include "buffer.h" > - > -VTPM_GLOBALS *vtpm_globals=NULL; > - > -// --------------------------- Well Known Auths -------------------------- > -const TPM_AUTHDATA SRK_AUTH = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > - > -#ifdef WELL_KNOWN_OWNER_AUTH > -static BYTE FIXED_OWNER_AUTH[20] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; > -#endif > - > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -// --------------------------- Functions ------------------------------ > - > -TPM_RESULT VTPM_Create_Manager(){ > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Auth for Owner > -#ifdef WELL_KNOWN_OWNER_AUTH > - memcpy(vtpm_globals->owner_usage_auth, FIXED_OWNER_AUTH, sizeof(TPM_AUTHDATA)); > -#else > - Crypto_GetRandom(vtpm_globals->owner_usage_auth, sizeof(TPM_AUTHDATA) ); > -#endif > - > - // Take Owership of TPM > - CRYPTO_INFO ek_cryptoInfo; > - > - status = VTSP_ReadPubek(vtpm_globals->manager_tcs_handle, &ek_cryptoInfo); > - > - // If we can read PubEK then there is no owner and we should take it. > - // We use the abilty to read the pubEK to flag that the TPM is owned. > - // FIXME: Change to just trying to take ownership and react to the status > - if (status == TPM_SUCCESS) { > - TPMTRYRETURN(VTSP_TakeOwnership(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &SRK_AUTH, > - &ek_cryptoInfo, > - &vtpm_globals->keyAuth)); > - > - TPMTRYRETURN(VTSP_DisablePubekRead(vtpm_globals->manager_tcs_handle, > - (const TPM_AUTHDATA*)&vtpm_globals->owner_usage_auth, > - &vtpm_globals->keyAuth)); > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to readEK meaning TPM has an owner. Creating Keys off existing SRK.\n"); > - } > - > - // Generate storage key's auth > - Crypto_GetRandom( &vtpm_globals->storage_key_usage_auth, > - sizeof(TPM_AUTHDATA) ); > - > - TCS_AUTH osap; > - TPM_AUTHDATA sharedsecret; > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&vtpm_globals->storage_key_usage_auth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->storageKeyWrap, > - &osap) ); > - > - // Generate boot key's auth > - TPM_AUTHDATA bootKeyWrapAuth; > - memset(&bootKeyWrapAuth, 0, sizeof(bootKeyWrapAuth)); > - > - TPMTRYRETURN( VTSP_OSAP(vtpm_globals->manager_tcs_handle, > - TPM_ET_KEYHANDLE, > - TPM_SRK_KEYHANDLE, > - &SRK_AUTH, > - &sharedsecret, > - &osap) ); > - > - osap.fContinueAuthSession = FALSE; > - > - // FIXME: This key protects the global secrets on disk. It should use TPM > - // PCR bindings to limit its use to legit configurations. > - // Current binds are open, implying a Trusted VM contains this code. > - // If this VM is not Trusted, use measurement and PCR bindings. > - TPMTRYRETURN( VTSP_CreateWrapKey( vtpm_globals->manager_tcs_handle, > - TPM_KEY_BIND, > - (const TPM_AUTHDATA*)&bootKeyWrapAuth, > - TPM_SRK_KEYHANDLE, > - (const TPM_AUTHDATA*)&sharedsecret, > - &vtpm_globals->bootKeyWrap, > - &osap) ); > - > - // Populate CRYPTO_INFO vtpm_globals->bootKey. This does not load it into the TPM > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->bootKeyWrap, > - NULL, > - NULL, > - NULL, > - &vtpm_globals->bootKey, > - TRUE ) ); > - > - TPMTRYRETURN( VTSP_SaveState(vtpm_globals->manager_tcs_handle) ); > - goto egress; > - > - abort_egress: > - exit(1); > - > - egress: > - vtpmloginfo(VTPM_LOG_VTPM, "Finished initialized new VTPM manager (Status = %d).\n", status); > - return status; > - > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -TPM_RESULT VTPM_Init_Manager() { > - TPM_RESULT status = TPM_FAIL, serviceStatus; > - BYTE *randomsead; > - UINT32 randomsize=256; > - > - if ((vtpm_globals = (VTPM_GLOBALS *) malloc(sizeof(VTPM_GLOBALS))) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - memset(vtpm_globals, 0, sizeof(VTPM_GLOBALS)); > - > - vtpm_globals->connected_dmis = 0; > - > - if ((vtpm_globals->dmi_map = create_hashtable(10, hashfunc32, equals32)) == NULL){ > - status = TPM_FAIL; > - goto abort_egress; > - } > - > - // Create new TCS Object > - vtpm_globals->manager_tcs_handle = 0; > - > - TPMTRYRETURN(TCS_create()); > - > - // Create TCS Context for service > - TPMTRYRETURN( TCS_OpenContext(&vtpm_globals->manager_tcs_handle ) ); > - > - TPMTRYRETURN( TCSP_GetRandom(vtpm_globals->manager_tcs_handle, > - &randomsize, > - &randomsead)); > - > - Crypto_Init(randomsead, randomsize); > - TPMTRYRETURN( TCS_FreeMemory (vtpm_globals->manager_tcs_handle, randomsead)); > - > - // Create OIAP session for service's authorized commands > - TPMTRYRETURN( VTSP_OIAP( vtpm_globals->manager_tcs_handle, > - &vtpm_globals->keyAuth) ); > - vtpm_globals->keyAuth.fContinueAuthSession = TRUE; > - > - vtpm_globals->mig_keys = NULL; > - > - // If fails, create new Manager. > - serviceStatus = VTPM_LoadManagerData(); > - if (serviceStatus == TPM_IOERROR) { > - vtpmloginfo(VTPM_LOG_VTPM, "Failed to read manager file. Assuming first time initialization.\n"); > - TPMTRYRETURN( VTPM_Create_Manager() ); > - TPMTRYRETURN( VTPM_SaveManagerData() ); > - } else if (serviceStatus != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to read existing manager file"); > - exit(1); > - } > - > - //Load Storage Key > - TPMTRYRETURN( VTSP_LoadKey( vtpm_globals->manager_tcs_handle, > - TPM_SRK_KEYHANDLE, > - &vtpm_globals->storageKeyWrap, > - &SRK_AUTH, > - &vtpm_globals->storageKeyHandle, > - &vtpm_globals->keyAuth, > - &vtpm_globals->storageKey, > - FALSE ) ); > - > - // Create entry for Dom0 for control messages > - TPMTRYRETURN( VTPM_Handle_New_DMI(NULL) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - return(status); > -} > - > -/////////////////////////////////////////////////////////////////////////////// > -void VTPM_Stop_Manager() { > - VTPM_DMI_RESOURCE *dmi_res; > - struct hashtable_itr *dmi_itr; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(vtpm_globals->dmi_map) > 0) { > - dmi_itr = hashtable_iterator(vtpm_globals->dmi_map); > - do { > - dmi_res = (VTPM_DMI_RESOURCE *) hashtable_iterator_value(dmi_itr); > - if (dmi_res->connected) > - close_dmi( dmi_res ); // Not really interested in return code > - > - } while (hashtable_iterator_advance(dmi_itr)); > - free (dmi_itr); > - } > - > - if ( VTPM_SaveManagerData() != TPM_SUCCESS ) > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to save manager data.\n"); > - > - TCS_CloseContext(vtpm_globals->manager_tcs_handle); > - TCS_destroy(); > - > - hashtable_destroy(vtpm_globals->dmi_map, 1); > - free(vtpm_globals); > - > - Crypto_Exit(); > - > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager stopped.\n"); > -} > diff --git a/tools/vtpm_manager/manager/vtpm_manager.h b/tools/vtpm_manager/manager/vtpm_manager.h > deleted file mode 100644 > index a324a8f..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager.h > +++ /dev/null > @@ -1,150 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager.h > -// > -// Public Interface header for VTPM Manager > -// > -// ================================================================== > - > -#ifndef __VTPM_MANAGER_H__ > -#define __VTPM_MANAGER_H__ > - > -#define VTPM_TAG_REQ 0x01c1 > -#define VTPM_TAG_RSP 0x01c4 > -#define COMMAND_BUFFER_SIZE 4096 > - > -// Header sizes. Note Header MAY include the DMI > -#define VTPM_COMMAND_HEADER_SIZE_CLT ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > -#define VTPM_COMMAND_HEADER_SIZE_SRV ( 4 + VTPM_COMMAND_HEADER_SIZE_CLT ) > -// sizeof( UINT32 + VTPM_COMMAND_HEADER_SIZE_CLT) > - > -//************************ Command Codes **************************** > -#define VTPM_ORD_BASE 0x0000 > -#define VTPM_PRIV_MASK 0x01000000 // Priviledged VTPM Command > -#define VTPM_PRIV_BASE (VTPM_ORD_BASE | VTPM_PRIV_MASK) > - > -// Non-priviledged VTPM Commands (From DMI's) > -#define VTPM_ORD_SAVENVM (VTPM_ORD_BASE + 1) // DMI Saves Secrets > -#define VTPM_ORD_LOADNVM (VTPM_ORD_BASE + 2) // DMI Loads Secrets > -#define VTPM_ORD_TPMCOMMAND (VTPM_ORD_BASE + 3) // DMI issues HW TPM Command > -#define VTPM_ORD_GET_MIG_KEY (VTPM_ORD_BASE + 4) // Get manager's migration key > -#define VTPM_ORD_LOAD_MIG_KEY (VTPM_ORD_BASE + 5) // load dest migration key > - > -// Priviledged VTPM Commands (From management console) > -#define VTPM_ORD_OPEN (VTPM_PRIV_BASE + 1) // Creates/reopens DMI > -#define VTPM_ORD_CLOSE (VTPM_PRIV_BASE + 2) // Closes a DMI > -#define VTPM_ORD_DELETE (VTPM_PRIV_BASE + 3) // Permemently Deletes DMI > -#define VTPM_ORD_MIGRATE_IN (VTPM_PRIV_BASE + 4) // Load migrated VTPM > -#define VTPM_ORD_MIGRATE_OUT (VTPM_PRIV_BASE + 5) // migrate VTPM to dest > - > -//************************ Return Codes **************************** > -#define VTPM_TYPE_PVM 1 // Paravirtualized Domain > -#define VTPM_TYPE_HVM 2 // HVM Domain > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > -#define VTPM_UNSUPPORTED 2 > -#define VTPM_FORBIDDEN 3 > -#define VTPM_RESTORE_CONTEXT_FAILED 4 > -#define VTPM_INVALID_REQUEST 5 > - > -//*********************** Parameter Values ************************* > -#define VTPM_TYPE_NON_MIGRATABLE 0x00 > -#define VTPM_TYPE_MIGRATABLE 0x01 > -#define VTPM_TYPE_MIGRATED 0xFF // VTPM has been migrated. > - // VTPM can be recovered or deleted only > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - dmi: 4 bytes // Source of message. > - // WARNING: This is prepended by the channel. > - // Thus it is received by VTPM Manager, > - // but not sent by DMI > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Open: > - Input Parameters: > - mig_type: 1 byte > - startup_mode: 1 byte // Cold Boot = 1, resume = 2, deactive = 3 > - domain type: 1 byte > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Close > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_Delete > - Input Parameters: > - instance_id: 4 bytes > - Output Parameters: > - None > - > -VTPM_SaveNVM > - Input Parameters: > - data: n bytes (Header indicates size of data) > - Output Parameters: > - None > - > -VTPM_LoadNVM > - Input Parameters: > - None > - Output Parameters: > - data: n bytes (Header indicates size of data) > - > -VTPM_TPMCommand > - Input Parameters: > - TPM Command Byte Stream: n bytes > - Output Parameters: > - TPM Reponse Byte Stream: n bytes > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/manager/vtpm_manager_handler.c b/tools/vtpm_manager/manager/vtpm_manager_handler.c > deleted file mode 100644 > index 2001074..0000000 > --- a/tools/vtpm_manager/manager/vtpm_manager_handler.c > +++ /dev/null > @@ -1,488 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_handler.c > -// > -// This file will house the main logic of the VTPM Manager > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "vtsp.h" > -#include "bsg.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > -#include "log.h" > -#include "buffer.h" > - > -#define vtpmhandlerloginfo(module,fmt,args...) vtpmloginfo (module, "[%s]: " fmt, thread_name, ##args ); > -#define vtpmhandlerloginfomore(module,fmt,args...) vtpmloginfomore (module, fmt, ##args ); > -#define vtpmhandlerlogerror(module,fmt,args...) vtpmlogerror (module, "[%s]: " fmt, thread_name, ##args ); > - > -// ---------------------- Prototypes ------------------- > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name); > - > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name); > - > -TPM_RESULT VTPM_Manager_Handler( vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Forward TPM cmds? > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *thread_name) { > - TPM_RESULT status = TPM_FAIL; // Should never return > - UINT32 dmi, in_param_size, cmd_size, out_param_size, out_message_size, reply_size; > - BYTE *cmd_header=NULL, *in_param=NULL, *out_message=NULL, *reply; > - buffer_t *command_buf=NULL, *result_buf=NULL; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - VTPM_DMI_RESOURCE *dmi_res; > - int size_read, size_write, i; > - BOOL add_header=TRUE; // This indicates to prepend a header on result_buf before sending > - > - cmd_header = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV); > - command_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - result_buf = (buffer_t *) malloc(sizeof(buffer_t)); > - > - // ------------------------ Main Loop -------------------------------- > - while(1) { > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "%s waiting for messages.\n", thread_name); > - > - // --------------------- Read Cmd from Sender ---------------- > - > - // Read command header > - size_read = vtpm_ipc_read(rx_ipc_h, NULL, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV[%d]: 0x", size_read); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s can't read from ipc. Errono = %d. Aborting... \n", thread_name, errno); > - goto abort_command; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command shorter than normal header (%d bytes). Aborting...\n", size_read); > - goto abort_command; > - } > - > - // Unpack header > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - // Using the header info, read the parameters of the command > - // Note that in_param_size is in the client's context > - cmd_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (cmd_size > 0) { > - in_param = (BYTE *) malloc(cmd_size); > - size_read = vtpm_ipc_read( rx_ipc_h, NULL, in_param, cmd_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error reading cmd from ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - if (size_read < (int) cmd_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d). Aborting...\n", size_read, cmd_size); > - goto abort_command; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } > - > - // Init the buffers used to handle the command and the response > - if ( (buffer_init_convert(command_buf, cmd_size, in_param) != TPM_SUCCESS) || > - (buffer_init(result_buf, 0, 0) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - goto abort_command; > - } > - > - // -------------- Dispatch Commands to Handlers ----------- > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK)) { > - vtpm_lock_wrlock(); > - } else { > - vtpm_lock_rdlock(); > - } > - > - if ( !(dmi_res = (VTPM_DMI_RESOURCE *) hashtable_search(vtpm_globals->dmi_map, &dmi)) || > - (!dmi_res->connected) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempted access to non-existent or disconnected DMI %d. Aborting...\n", dmi); > - status = TPM_BAD_PARAMETER; > - // We have no one to reply to, they don't exist. > - goto abort_command; > - } > - > - if (tag == VTPM_TAG_REQ) { > - > - status = vtpm_manager_handle_vtpm_cmd(dmi_res, ord, command_buf, result_buf, is_priv, thread_name); > - > - } else { // This is not a VTPM Command at all. > - if (fw_tpm) { > - status = vtpm_manager_handle_tpm_cmd(fw_tx_ipc_h, fw_rx_ipc_h, dmi_res, cmd_header, command_buf, result_buf, thread_name); > - > - // This means calling the DMI failed, not that the cmd failed in the DMI > - // Since the return will be interpretted by a TPM app, all errors are IO_ERRORs to the app > - if (status != TPM_SUCCESS) { > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - // Unlike all other commands, forwarded commands yield a result_buf that includes the DMI's status. This > - // should be forwarded to the caller VM > - add_header = FALSE; > - } else { > - // We are not supposed to forward TPM commands at all. > - int i; > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Attempt to use unsupported direct access to TPM.\n"); > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "Bad Command. dmi:%d, tag:%d, size:%d, ord:%d, Params: ", dmi, tag, in_param_size, ord); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - } // end else for is VTPM Command > - > - // ------------------- Respond to Sender ------------------ > - > - // Errors while handling responses jump here to reply with error messages > - // NOTE: Currently there are no recoverable errors in multi-VM mode. If one > - // is added to the code, this ifdef should be removed. > - // Also note this is NOT referring to errors in commands, but rather > - // this is about I/O errors and such. > -#ifndef VTPM_MULTI_VM > - abort_with_error: > -#endif > - > - if (add_header) { > - // Prepend VTPM header with destination DM stamped > - out_param_size = buffer_len(result_buf); > - out_message_size = VTPM_COMMAND_HEADER_SIZE_CLT + out_param_size; > - reply_size = VTPM_COMMAND_HEADER_SIZE_SRV + out_param_size; > - out_message = (BYTE *) malloc (reply_size); > - reply = out_message; > - > - BSG_PackList(out_message, 4, > - BSG_TYPE_UINT32, (BYTE *) &dmi, > - BSG_TPM_TAG, (BYTE *) &tag, > - BSG_TYPE_UINT32, (BYTE *) &out_message_size, > - BSG_TPM_RESULT, (BYTE *) &status); > - > - if (buffer_len(result_buf) > 0) > - memcpy(out_message + VTPM_COMMAND_HEADER_SIZE_SRV, result_buf->bytes, out_param_size); > - //Note: Send message + dmi_id > - } else { > - reply = result_buf->bytes; > - reply_size = buffer_len(result_buf); > - } > - size_write = vtpm_ipc_write(tx_ipc_h, (dmi_res ? dmi_res->tx_vtpm_ipc_h : NULL), reply, reply_size ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i < reply_size; i++) > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", reply[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s had error writing to ipc. Aborting... \n", thread_name); > - goto abort_command; > - } > - free(out_message); out_message=NULL; > - > - if (size_write < (int)reply_size) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "%s unable to write full command to ipc (%d/%d)\n", thread_name, size_write, reply_size); > - goto abort_command; > - } > - > - // On certain failures an error message cannot be sent. > - // This marks the beginning of cleanup in preperation for the next command. > - abort_command: > - //free buffers > - bzero(cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - //free(in_param); // This was converted to command_buf. No need to free > - buffer_free(result_buf); > - buffer_free(command_buf); > - > - // If we have a write lock, save the manager table > - if ((tag == VTPM_TAG_REQ) && (ord & VTPM_PRIV_MASK) && > - (VTPM_SaveManagerData() != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "ERROR: Unable to save manager data.\n"); > - } > - > - vtpm_lock_unlock(); > - add_header = TRUE; // Reset to the default > - } // End while(1) > - > -} > - > -///////////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_vtpm_cmd(VTPM_DMI_RESOURCE *dmi_res, > - TPM_COMMAND_CODE ord, > - buffer_t *command_buf, > - buffer_t *result_buf, > - BOOL is_priv, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - > - switch (ord) { > - case VTPM_ORD_SAVENVM: > - status= VTPM_Handle_Save_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOADNVM: > - status= VTPM_Handle_Load_NVM(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_TPMCOMMAND: > - status= VTPM_Handle_TPM_Command(dmi_res, > - command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_GET_MIG_KEY: > - status = VTPM_Handle_Get_Migration_key(command_buf, > - result_buf); > - break; > - > - case VTPM_ORD_LOAD_MIG_KEY: > - status = VTPM_Handle_Load_Migration_key(command_buf, > - result_buf); > - break; > - > - default: > - // Privileged handlers can do maintanance > - if (is_priv) { > - switch (ord) { > - case VTPM_ORD_OPEN: > - status = VTPM_Handle_New_DMI(command_buf); > - break; > - > - case VTPM_ORD_CLOSE: > - status = VTPM_Handle_Close_DMI(command_buf); > - break; > - > - case VTPM_ORD_DELETE: > - status = VTPM_Handle_Delete_DMI(command_buf); > - break; > - > - case VTPM_ORD_MIGRATE_IN: > - status = VTPM_Handle_Migrate_In(command_buf, result_buf); > - break; > - > - case VTPM_ORD_MIGRATE_OUT: > - status = VTPM_Handle_Migrate_Out(command_buf, result_buf); > - break; > - > - default: > - status = TPM_BAD_ORDINAL; > - } // switch > - } else { // is priv command > - > - status = TPM_BAD_ORDINAL; > - } // inner switch > - } // outer switch > - > - return(status); > -} > - > -///////////////////////////////////////////////////////////////////// > -TPM_RESULT vtpm_manager_handle_tpm_cmd(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - VTPM_DMI_RESOURCE *dmi_res, > - BYTE *cmd_header, > - buffer_t *param_buf, > - buffer_t *result_buf, > - char *thread_name) { > - > - TPM_RESULT status = TPM_FAIL; > - UINT32 dmi_dst; > - TPM_COMMAND_CODE ord; > - TPM_TAG tag_out; > - UINT32 dmi_cmd_size, in_param_size, adj_param_size; > - BYTE *dmi_cmd, *in_param; > - int size_read, size_write, i; > - > - //// Dom0 can't talk to the BE, so this must be a broken FE/BE or badness > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Illegal use of TPM command from dom0\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Forwarding command to DMI.\n"); > - > - //Forward TPM CMD stamped with dmi_id to DMI for handling > - if (buffer_len(param_buf)) { > - dmi_cmd = (BYTE *) malloc(VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf)); > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(param_buf); > - memcpy(dmi_cmd, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - memcpy(dmi_cmd + VTPM_COMMAND_HEADER_SIZE_SRV, param_buf->bytes, buffer_len(param_buf)); > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, dmi_cmd, dmi_cmd_size); > - > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", dmi_cmd[i]); > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - free(dmi_cmd); > - } else { > - dmi_cmd_size = VTPM_COMMAND_HEADER_SIZE_SRV; > - size_write = vtpm_ipc_write(tx_ipc_h, dmi_res->tx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV ); > - if (size_write > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "SENT (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error writing to DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } > - > - if (size_write != (int) dmi_cmd_size) > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Could not write entire command to DMI (%d/%d)\n", size_write, dmi_cmd_size); > - > - buffer_free(param_buf); > - > - // Read header for response to TPM command from DMI > - size_read = vtpm_ipc_read( rx_ipc_h, dmi_res->rx_tpm_ipc_h, cmd_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmhandlerloginfo(VTPM_LOG_VTPM_DEEP, "RECV (DMI): 0x"); > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from DMI. Aborting... \n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command from DMI shorter than normal header. Aborting...\n"); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(cmd_header, 4, > - BSG_TYPE_UINT32, &dmi_dst, > - BSG_TPM_TAG, &tag_out, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &status ); > - > - // If response has parameters, read them. > - // Note that in_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE_CLT; > - if (adj_param_size > 0) { > - in_param = (BYTE *) malloc(adj_param_size); > - size_read = vtpm_ipc_read(rx_ipc_h, dmi_res->rx_tpm_ipc_h, in_param, adj_param_size); > - if (size_read > 0) { > - for (i=0; i - vtpmhandlerloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param[i]); > - > - } else { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Error reading from BE. Aborting... \n"); > - goto abort_with_error; > - } > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Command read(%d) from DMI is shorter than header indicates(%d). Aborting...\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_with_error; > - } > - } else { > - in_param = NULL; > - vtpmhandlerloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - if ( (buffer_init(result_buf, VTPM_COMMAND_HEADER_SIZE_SRV, cmd_header) != TPM_SUCCESS) || > - (buffer_append_raw(result_buf, adj_param_size, in_param) != TPM_SUCCESS) ) { > - vtpmhandlerlogerror(VTPM_LOG_VTPM, "Failed to setup buffers. Aborting...\n"); > - status = TPM_FAIL; > - goto abort_with_error; > - } > - > - vtpmhandlerloginfo(VTPM_LOG_VTPM, "Sending DMI's response to guest.\n"); > - > - status = TPM_SUCCESS; > - > - abort_with_error: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c > deleted file mode 100644 > index cf58ba3..0000000 > --- a/tools/vtpm_manager/manager/vtpmd.c > +++ /dev/null > @@ -1,371 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmd.c > -// > -// Application > -// > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include "vtpm_manager.h" > -#include "vtpmpriv.h" > -#include "tcg.h" > -#include "log.h" > -#include "vtpm_ipc.h" > - > -#define TPM_EMULATOR_PATH "/usr/bin/vtpmd" > - > -#define VTPM_BE_FNAME "/dev/vtpm" > -#define VTPM_DUMMY_TX_BE_FNAME "/var/vtpm/fifos/dummy_out.fifo" > -#define VTPM_DUMMY_RX_BE_FNAME "/var/vtpm/fifos/dummy_in.fifo" > -#define VTPM_TX_TPM_FNAME "/var/vtpm/fifos/tpm_cmd_to_%d.fifo" > -#define VTPM_RX_TPM_FNAME "/var/vtpm/fifos/tpm_rsp_from_all.fifo" > -#define VTPM_TX_VTPM_FNAME "/var/vtpm/fifos/vtpm_rsp_to_%d.fifo" > -#define VTPM_RX_VTPM_FNAME "/var/vtpm/fifos/vtpm_cmd_from_all.fifo" > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > - > -#define VTPM_TYPE_PVM_STRING "pvm" > -#define VTPM_TYPE_HVM_STRING "hvm" > - > -struct vtpm_thread_params_s { > - vtpm_ipc_handle_t *tx_ipc_h; > - vtpm_ipc_handle_t *rx_ipc_h; > - BOOL fw_tpm; > - vtpm_ipc_handle_t *fw_tx_ipc_h; > - vtpm_ipc_handle_t *fw_rx_ipc_h; > - BOOL is_priv; > - char *thread_name; > -}; > - > -// This is needed to all extra_close_dmi to close this to prevent a > -// broken pipe when no DMIs are left. > -static vtpm_ipc_handle_t *g_rx_tpm_ipc_h; > - > -void *vtpm_manager_thread(void *arg_void) { > - TPM_RESULT *status = (TPM_RESULT *) malloc(sizeof(TPM_RESULT) ); > - struct vtpm_thread_params_s *arg = (struct vtpm_thread_params_s *) arg_void; > - > - *status = VTPM_Manager_Handler(arg->tx_ipc_h, arg->rx_ipc_h, > - arg->fw_tpm, arg->fw_tx_ipc_h, arg->fw_rx_ipc_h, > - arg->is_priv, arg->thread_name); > - > - return (status); > -} > - > - > -void signal_handler(int reason) { > - if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { > - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); > - } else { > - // For old Linux Thread machines, signals are delivered to each thread. Deal with them. > - vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); > - pthread_exit(NULL); > - } > - > - VTPM_Stop_Manager(); > - exit(-1); > -} > - > -struct sigaction ctl_c_handler; > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode) { > - > - TPM_RESULT status = TPM_SUCCESS; > - int fh; > - char dmi_id_str[11]; // UINT32s are up to 10 digits + NULL > - char *tx_vtpm_name, *tx_tpm_name, *vm_type_string; > - struct stat file_info; > - > - if (dmi_res->dmi_id == VTPM_CTL_DM) { > - dmi_res->tx_tpm_ipc_h = NULL; > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->tx_vtpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - } else { > - // Create a pair of fifo pipes > - dmi_res->rx_tpm_ipc_h = NULL; > - dmi_res->rx_vtpm_ipc_h = NULL; > - > - if ( ((dmi_res->tx_tpm_ipc_h = (vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((dmi_res->tx_vtpm_ipc_h =(vtpm_ipc_handle_t *) malloc (sizeof(vtpm_ipc_handle_t))) == NULL ) || > - ((tx_tpm_name = (char *) malloc(11 + strlen(VTPM_TX_TPM_FNAME))) == NULL ) || > - ((tx_vtpm_name =(char *) malloc(11 + strlen(VTPM_TX_VTPM_FNAME))) == NULL) ) { > - status =TPM_RESOURCES; > - goto abort_egress; > - } > - > - sprintf(tx_tpm_name, VTPM_TX_TPM_FNAME, (uint32_t) dmi_res->dmi_id); > - sprintf(tx_vtpm_name, VTPM_TX_VTPM_FNAME, (uint32_t) dmi_res->dmi_id); > - > - if ( (vtpm_ipc_init(dmi_res->tx_tpm_ipc_h, tx_tpm_name, O_WRONLY | O_NONBLOCK, TRUE) != 0) || > - (vtpm_ipc_init(dmi_res->tx_vtpm_ipc_h, tx_vtpm_name, O_WRONLY, TRUE) != 0) ) { //FIXME: O_NONBLOCK? > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Measure DMI > - // FIXME: This will measure DMI. Until then use a fixed DMI_Measurement value > - // Also, this mechanism is specific to 1 VM architecture. > - /* > - fh = open(TPM_EMULATOR_PATH, O_RDONLY); > - stat_ret = fstat(fh, &file_stat); > - if (stat_ret == 0) > - dmi_size = file_stat.st_size; > - else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not open vtpmd!!\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - dmi_buffer > - */ > - memset(&dmi_res->DMI_measurement, 0xcc, sizeof(TPM_DIGEST)); > - > - if (vm_type == VTPM_TYPE_PVM) > - vm_type_string = (BYTE *)&VTPM_TYPE_PVM_STRING; > - else > - vm_type_string = (BYTE *)&VTPM_TYPE_HVM_STRING; > - > - // Launch DMI > - sprintf(dmi_id_str, "%d", (int) dmi_res->dmi_id); > -#ifdef MANUAL_DM_LAUNCH > - vtpmlogerror(VTPM_LOG_VTPM, "Manually start VTPM with dmi=%s now.\n", dmi_id_str); > - dmi_res->dmi_pid = 0; > -#else > - pid_t pid = fork(); > - > - if (pid == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not fork to launch vtpm\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } else if (pid == 0) { > - switch (startup_mode) { > - case TPM_ST_CLEAR: > - execl (TPM_EMULATOR_PATH, "vtpmd", "clear", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_STATE: > - execl (TPM_EMULATOR_PATH, "vtpmd", "save", vm_type_string, dmi_id_str, NULL); > - break; > - case TPM_ST_DEACTIVATED: > - execl (TPM_EMULATOR_PATH, "vtpmd", "deactivated", vm_type_string, dmi_id_str, NULL); > - break; > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Returning from these at all is an error. > - vtpmlogerror(VTPM_LOG_VTPM, "Could not exec to launch vtpm\n"); > - } else { > - dmi_res->dmi_pid = pid; > - vtpmloginfo(VTPM_LOG_VTPM, "Launching DMI on PID = %d\n", pid); > - } > -#endif // MANUAL_DM_LAUNCH > - > - } // If DMI = VTPM_CTL_DM > - status = TPM_SUCCESS; > - > -abort_egress: > - return (status); > -} > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (vtpm_globals->connected_dmis == 0) { > - // No more DMI's connected. Close fifo to prevent a broken pipe. > - // This is hackish. Need to think of another way. > - vtpm_ipc_close(g_rx_tpm_ipc_h); > - } > - > - > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - vtpm_ipc_close(dmi_res->tx_tpm_ipc_h); > - vtpm_ipc_close(dmi_res->tx_vtpm_ipc_h); > - > - free(dmi_res->tx_tpm_ipc_h->name); > - free(dmi_res->tx_vtpm_ipc_h->name); > - > -#ifndef MANUAL_DM_LAUNCH > - if (dmi_res->dmi_id != VTPM_CTL_DM) { > - if (dmi_res->dmi_pid != 0) { > - vtpmloginfo(VTPM_LOG_VTPM, "Killing dmi on pid %d.\n", dmi_res->dmi_pid); > - if (kill(dmi_res->dmi_pid, SIGKILL) !=0) { > - vtpmloginfo(VTPM_LOG_VTPM, "DMI on pid %d is already dead.\n", dmi_res->dmi_pid); > - } else if (waitpid(dmi_res->dmi_pid, NULL, 0) != dmi_res->dmi_pid) { > - vtpmlogerror(VTPM_LOG_VTPM, "DMI on pid %d failed to stop.\n", dmi_res->dmi_pid); > - status = TPM_FAIL; > - } > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Could not kill dmi because it's pid was 0.\n"); > - status = TPM_FAIL; > - } > - } > -#endif > - > - } //endif ! dom0 > - return status; > -} > - > - > -int main(int argc, char **argv) { > - vtpm_ipc_handle_t *tx_be_ipc_h, *rx_be_ipc_h, rx_tpm_ipc_h, rx_vtpm_ipc_h, tx_hp_ipc_h, rx_hp_ipc_h; > - struct vtpm_thread_params_s be_thread_params, dmi_thread_params, hp_thread_params; > - pthread_t be_thread, dmi_thread, hp_thread; > - > -#ifdef DUMMY_BACKEND > - vtpm_ipc_handle_t tx_dummy_ipc_h, rx_dummy_ipc_h; > -#else > - vtpm_ipc_handle_t real_be_ipc_h; > -#endif > - > - vtpmloginfo(VTPM_LOG_VTPM, "Starting VTPM.\n"); > - > - // -------------------- Initialize Manager ----------------- > - if (VTPM_Init_Manager() != TPM_SUCCESS) { > - vtpmlogerror(VTPM_LOG_VTPM, "Closing vtpmd due to error during startup.\n"); > - return -1; > - } > - > - // -------------------- Setup Ctrl+C Handlers -------------- > - ctl_c_handler.sa_handler = signal_handler; > - sigemptyset(&ctl_c_handler.sa_mask); > - ctl_c_handler.sa_flags = 0; > - > - if (sigaction(SIGINT, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGINT handler. Ctl+break will not stop manager gently.\n"); > - > - // For easier debuggin with gdb > - if (sigaction(SIGHUP, &ctl_c_handler, NULL) == -1) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not install SIGHUP handler. Ctl+break will not stop manager gently.\n"); > - > - sigset_t sig_mask; > - sigemptyset(&sig_mask); > - sigaddset(&sig_mask, SIGPIPE); > - sigprocmask(SIG_BLOCK, &sig_mask, NULL); > - > - // ------------------- Set up file ipc structures ---------- > -#ifdef DUMMY_BACKEND > - if ( (vtpm_ipc_init(&tx_dummy_ipc_h, VTPM_DUMMY_TX_BE_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_dummy_ipc_h, VTPM_DUMMY_RX_BE_FNAME, O_RDWR, TRUE) != 0) ) { > - > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create Dummy BE FIFOs.\n"); > - exit(-1); > - } > - > - tx_be_ipc_h = &tx_dummy_ipc_h; > - rx_be_ipc_h = &rx_dummy_ipc_h; > -#else > - vtpm_ipc_init(&real_be_ipc_h, VTPM_BE_FNAME, O_RDWR, FALSE); > - > - tx_be_ipc_h = &real_be_ipc_h; > - rx_be_ipc_h = &real_be_ipc_h; > -#endif > - > - if ( (vtpm_ipc_init(&rx_tpm_ipc_h, VTPM_RX_TPM_FNAME, O_RDONLY, TRUE) != 0) || > - (vtpm_ipc_init(&rx_vtpm_ipc_h, VTPM_RX_VTPM_FNAME, O_RDWR, TRUE) != 0) || //FIXME: O_RDONLY? > - (vtpm_ipc_init(&tx_hp_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || > - (vtpm_ipc_init(&rx_hp_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to create initial FIFOs.\n"); > - exit(-1); > - } > - > - g_rx_tpm_ipc_h = &rx_tpm_ipc_h; > - > - // -------------------- Set up thread params ------------- > - > - be_thread_params.tx_ipc_h = tx_be_ipc_h; > - be_thread_params.rx_ipc_h = rx_be_ipc_h; > - be_thread_params.fw_tpm = TRUE; > - be_thread_params.fw_tx_ipc_h = NULL; > - be_thread_params.fw_rx_ipc_h = &rx_tpm_ipc_h; > - be_thread_params.is_priv = FALSE; > - be_thread_params.thread_name = "Backend Listener"; > - > - dmi_thread_params.tx_ipc_h = NULL; > - dmi_thread_params.rx_ipc_h = &rx_vtpm_ipc_h; > - dmi_thread_params.fw_tpm = FALSE; > - dmi_thread_params.fw_tx_ipc_h = NULL; > - dmi_thread_params.fw_rx_ipc_h = NULL; > - dmi_thread_params.is_priv = FALSE; > - dmi_thread_params.thread_name = "VTPM Listener"; > - > - hp_thread_params.tx_ipc_h = &tx_hp_ipc_h; > - hp_thread_params.rx_ipc_h = &rx_hp_ipc_h; > - hp_thread_params.fw_tpm = FALSE; > - hp_thread_params.fw_tx_ipc_h = NULL; > - hp_thread_params.fw_rx_ipc_h = NULL; > - hp_thread_params.is_priv = TRUE; > - hp_thread_params.thread_name = "Hotplug Listener"; > - > - // --------------------- Launch Threads ----------------- > - > - vtpm_lock_init(); > - > - vtpm_globals->master_pid = pthread_self(); > - > - if (pthread_create(&be_thread, NULL, vtpm_manager_thread, &be_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch BE Thread.\n"); > - exit(-1); > - } > - > - if (pthread_create(&dmi_thread, NULL, vtpm_manager_thread, &dmi_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch DMI Thread.\n"); > - exit(-1); > - } > - > - > - if (pthread_create(&hp_thread, NULL, vtpm_manager_thread, &hp_thread_params) != 0) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to launch HP Thread.\n"); > - exit(-1); > - } > - > - //Join the other threads until exit time. > - pthread_join(be_thread, NULL); > - pthread_join(dmi_thread, NULL); > - pthread_join(hp_thread, NULL); > - > - vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); > - > - VTPM_Stop_Manager(); > - vtpm_lock_destroy(); > - return 0; > -} > diff --git a/tools/vtpm_manager/manager/vtpmpriv.h b/tools/vtpm_manager/manager/vtpmpriv.h > deleted file mode 100644 > index 41e8d2d..0000000 > --- a/tools/vtpm_manager/manager/vtpmpriv.h > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpmpriv.h > -// > -// Structures and functions private to the manager > -// > -// ================================================================== > - > -#ifndef __VTPMPRIV_H__ > -#define __VTPMPRIV_H__ > - > -#include "vtpm_manager.h" > -#include "tcg.h" > -#include "tcs.h" > -#include "buffer.h" > -#include "crypto.h" > -#include "vtpm_ipc.h" > - > -#define VTPM_MANAGER_GEN 2 // This is incremented when the manager's table > - // is changed. It's used for backwards compatability > - > -#define STATE_FILE "/var/vtpm/VTPM" > -#define DMI_NVM_FILE "/var/vtpm/vtpm_dm_%d.data" > -#define VTPM_CTL_DM 0 > - > -// ------------------------ Private Structures ----------------------- > -typedef struct VTPM_DMI_RESOURCE_T { > - // I/O info for Manager to talk to DMI's and controllers > - vtpm_ipc_handle_t *tx_vtpm_ipc_h; // TX VTPM Results to DMI > - vtpm_ipc_handle_t *rx_vtpm_ipc_h; // RX VTPM Commands from DMI > - vtpm_ipc_handle_t *tx_tpm_ipc_h; // TX TPM Commands to DMI > - vtpm_ipc_handle_t *rx_tpm_ipc_h; // RX TPM Results from DMI > - > -#ifndef VTPM_MULTI_VM > - pid_t dmi_pid; > -#endif > - > - // Non-persistent Information > - bool connected; > - UINT32 dmi_domain_id; > - TCS_CONTEXT_HANDLE TCSContext; // TCS Handle > - char *NVMLocation; // NULL term string indicating location > - // of NVM. > - // Persistent Information about DMI > - UINT32 dmi_id; > - BYTE dmi_type; > - TPM_DIGEST NVM_measurement; // Equal to the SHA1 of the blob > - TPM_DIGEST DMI_measurement; // Correct measurement of the owning DMI > -} VTPM_DMI_RESOURCE; > - > -typedef struct tdVTPM_MIGKEY_LIST { > - UINT32 name_size; > - BYTE *name; // Name of destination (IP addr, domain name, etc) > - CRYPTO_INFO key; > - struct tdVTPM_MIGKEY_LIST *next; > -} VTPM_MIGKEY_LIST; > - > - > -typedef struct tdVTPM_GLOBALS { > - // Non-persistent data > -#ifndef VTPM_MULTI_VM > - pid_t master_pid; > -#endif > - > - int connected_dmis; // To close guest_rx when no dmis are connected > - > - struct hashtable *dmi_map; // Table of all DMI's known indexed by persistent instance # > - VTPM_MIGKEY_LIST *mig_keys; // Table of migration keys > - // Currently keys are loaded at migration time, > - // TODO: Make VTPM man store a keys persistently > - // and update script to check if key is needed > - // before fetching it. > - > - TCS_CONTEXT_HANDLE manager_tcs_handle; // TCS Handle used by manager > - TPM_HANDLE storageKeyHandle; // Key used by persistent store > - CRYPTO_INFO storageKey; // For software encryption > - CRYPTO_INFO bootKey; // For saving table > - TCS_AUTH keyAuth; // OIAP session for storageKey > - > - // Persistent Data > - TPM_AUTHDATA owner_usage_auth; // OwnerAuth of real TPM > - buffer_t storageKeyWrap; // Wrapped copy of storageKey > - TPM_AUTHDATA srk_usage_auth; > - TPM_AUTHDATA storage_key_usage_auth; > - > - buffer_t bootKeyWrap; // Wrapped copy of boot key > - > -}VTPM_GLOBALS; > - > -// --------------------------- Global Values -------------------------- > -extern VTPM_GLOBALS *vtpm_globals; // Key info and DMI states > -extern const TPM_AUTHDATA SRK_AUTH; // SRK Well Known Auth Value > - > -// ********************** VTPM Functions ************************* > -TPM_RESULT VTPM_Init_Manager(); // Start VTPM Service > -void VTPM_Stop_Manager(); // Stop VTPM Service > -TPM_RESULT VTPM_Manager_Handler(vtpm_ipc_handle_t *tx_ipc_h, > - vtpm_ipc_handle_t *rx_ipc_h, > - BOOL fw_tpm, // Should forward TPM cmds > - vtpm_ipc_handle_t *fw_tx_ipc_h, > - vtpm_ipc_handle_t *fw_rx_ipc_h, > - BOOL is_priv, > - char *client_name); > - > -// ********************** Command Handler Prototypes *********************** > - > -TPM_RESULT VTPM_Handle_Load_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_Save_NVM( VTPM_DMI_RESOURCE *myDMI, > - const buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_TPM_Command( VTPM_DMI_RESOURCE *dmi, > - buffer_t *inbuf, > - buffer_t *outbuf); > - > -TPM_RESULT VTPM_Handle_New_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Close_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Delete_DMI(const buffer_t *param_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_In( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Migrate_Out ( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_Handle_Get_Migration_key( const buffer_t *param_buf, > - buffer_t *result_buf); > - > -TPM_RESULT VTPM_SaveManagerData(void); > -TPM_RESULT VTPM_LoadManagerData(void); > - > -TPM_RESULT VTPM_New_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res, BYTE vm_type, BYTE startup_mode); > - > -TPM_RESULT VTPM_Close_DMI_Extra(VTPM_DMI_RESOURCE *dmi_res); > - > -// Helper functions > -TPM_RESULT close_dmi(VTPM_DMI_RESOURCE *dmi_res); > -TPM_RESULT init_dmi(UINT32 dmi_id, BYTE type, VTPM_DMI_RESOURCE **dmi_res); > - > -TPM_RESULT envelope_encrypt(const buffer_t *inbuf, > - CRYPTO_INFO *asymkey, > - buffer_t *sealed_data); > - > -TPM_RESULT envelope_decrypt(const buffer_t *cipher, > - TCS_CONTEXT_HANDLE TCSContext, > - TPM_HANDLE keyHandle, > - const TPM_AUTHDATA *key_usage_auth, > - buffer_t *unsealed_data); > - > -#endif // __VTPMPRIV_H__ > diff --git a/tools/vtpm_manager/manager/vtsp.c b/tools/vtpm_manager/manager/vtsp.c > deleted file mode 100644 > index fc8a66f..0000000 > --- a/tools/vtpm_manager/manager/vtsp.c > +++ /dev/null > @@ -1,1042 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.c > -// > -// Higher level interface to TCS for use in service. > -// > -// ================================================================== > - > -#include > -#include "tcg.h" > -#include "tcs.h" > -#include "bsg.h" > -#include "log.h" > -#include "crypto.h" > -#include "vtsp.h" > -#include "buffer.h" > - > -#define RSA_KEY_SIZE 0x0800 > - > -/*********************************************************************************** > - * GenerateAuth: Generate authorization info to be sent back to application > - * > - * Parameters: outParamDigestText The concatenation of output parameters to be SHA1ed > - * outParamDigestTextSize Size of inParamDigestText > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use shared secret > - * pAuth Authorization information from the application > - * > - * Return: TPM_SUCCESS Authorization data created > - * TPM_AUTHFAIL Invalid (NULL) HMACkey presented for OSAP > - *************************************************************************************/ > -TPM_RESULT GenerateAuth( /*[IN]*/ const BYTE *inParamDigestText, > - /*[IN]*/ UINT32 inParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth) { > - > - if (inParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - else { > - > - //Generate new OddNonce > - Crypto_GetRandom(auth->NonceOdd.nonce, sizeof(TPM_NONCE)); > - > - // Create SHA1 inParamDigest > - TPM_DIGEST inParamDigest; > - Crypto_SHA1Full(inParamDigestText, inParamDigestTextSize, (BYTE *) &inParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &inParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &(auth->HMAC)); > - > - return(TPM_SUCCESS); > - > - } > -} > - > -/*********************************************************************************** > - * VerifyAuth: Verify the authdata for a command requiring authorization > - * > - * Parameters: inParamDigestText The concatenation of parameters to be SHA1ed > - * inParamDigestTextSize Size of inParamDigestText > - * authDataUsage AuthDataUsage for the Entity being used > - * Key->authDataUsage or TPM_AUTH_OWNER > - * HMACkey Key to be used for HMACing > - * For OIAP use key.authUsage or PersistStore.ownerAuth > - * For OSAP use NULL (It will be aquired from the Auth Session) > - * If unknown (default), assume OIAP > - * sessionAuth A TCS_AUTH info for the session > - * pAuth Authorization information from the application > - * hContext If specified, on failed Auth, VerifyAuth will > - * generate a new OIAP session in place of themselves > - * destroyed session. > - * > - * Return: TPM_SUCCESS Authorization Verified > - * TPM_AUTHFAIL Authorization Failed > - * TPM_FAIL Failure during SHA1 routines > - *************************************************************************************/ > -TPM_RESULT VerifyAuth( /*[IN]*/ const BYTE *outParamDigestText, > - /*[IN]*/ UINT32 outParamDigestTextSize, > - /*[IN]*/ const TPM_SECRET *HMACkey, > - /*[IN,OUT]*/ TCS_AUTH *auth, > - /*[IN]*/ TCS_CONTEXT_HANDLE hContext) { > - if (outParamDigestText == NULL || auth == NULL) > - return (TPM_AUTHFAIL); > - > - > - // Create SHA1 inParamDigest > - TPM_DIGEST outParamDigest; > - Crypto_SHA1Full(outParamDigestText, outParamDigestTextSize, (BYTE *) &outParamDigest); > - > - // Create HMAC text. (Concat inParamsDigest with inAuthSetupParams). > - TPM_DIGEST hm; > - BYTE hmacText[sizeof(TPM_DIGEST) + (2 * sizeof(TPM_NONCE)) + sizeof(BOOL)]; > - > - BSG_PackList( hmacText, 4, > - BSG_TPM_DIGEST, &outParamDigest, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession) ); > - > - Crypto_HMAC((BYTE *) hmacText, sizeof(hmacText), > - (BYTE *) HMACkey, sizeof(TPM_DIGEST), (BYTE *) &hm); > - > - // Compare correct HMAC with provided one. > - if (memcmp (&hm, &(auth->HMAC), sizeof(TPM_DIGEST)) == 0) { // 0 indicates equality > - if (!auth->fContinueAuthSession) > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM by fContinue=0.\n", auth->AuthHandle); > - > - return (TPM_SUCCESS); > - } else { > - // If specified, reconnect the OIAP session. > - // NOTE: This only works for TCS's that never have a 0 context. > - if (hContext) { > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM due to failure.\n", auth->AuthHandle); > - VTSP_OIAP( hContext, auth); > - } > - return (TPM_AUTHFAIL); > - } > -} > - > -TPM_RESULT VTSP_OIAP(const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OIAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_OIAP(hContext, > - &auth->AuthHandle, > - &auth->NonceEven) ); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OIAP.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_OSAP(const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedSecret, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "OSAP.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_NONCE nonceEvenOSAP, nonceOddOSAP; > - > - Crypto_GetRandom((BYTE *) &nonceOddOSAP, sizeof(TPM_NONCE) ); > - > - TPMTRYRETURN( TCSP_OSAP( hContext, > - entityType, > - entityValue, > - nonceOddOSAP, > - &auth->AuthHandle, > - &auth->NonceEven, > - &nonceEvenOSAP) ); > - > - // Calculating Session Secret > - BYTE sharedSecretText[TPM_DIGEST_SIZE * 2]; > - > - BSG_PackList( sharedSecretText, 2, > - BSG_TPM_NONCE, &nonceEvenOSAP, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - Crypto_HMAC(sharedSecretText, sizeof(sharedSecretText), (BYTE *) usageAuth, TPM_DIGEST_SIZE, (BYTE *) sharedSecret); > - > - memset(&auth->HMAC, 0, sizeof(TPM_DIGEST)); > - auth->fContinueAuthSession = FALSE; > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x opened by TPM_OSAP.\n", auth->AuthHandle); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Terminate Handle.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - TPMTRYRETURN( TCSP_TerminateHandle(hContext, auth->AuthHandle) ); > - > - vtpmloginfo(VTPM_LOG_VTSP_DEEP, "Auth Session: 0x%x closed by TPM_TerminateHandle.\n", auth->AuthHandle); > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *crypto_info) { > - > - TPM_RESULT status; > - TPM_NONCE antiReplay; > - TPM_DIGEST checksum; > - BYTE *pubEKtext; > - UINT32 pubEKtextsize; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Reading Public EK.\n"); > - > - // GenerateAuth new nonceOdd > - Crypto_GetRandom(&antiReplay, sizeof(TPM_NONCE) ); > - > - > - TPMTRYRETURN( TCSP_ReadPubek( hContext, > - antiReplay, > - &pubEKtextsize, > - &pubEKtext, > - &checksum) ); > - > - > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - > - BSG_Unpack(BSG_TPM_PUBKEY, pubEKtext, (BYTE *) &pubEK); > - > - // Build CryptoInfo for the bindingKey > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - pubEK.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - pubEK.pubKey.keyLength, > - pubEK.pubKey.key, > - crypto_info); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - crypto_info->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - //crypto_info->encScheme = pubEK.algorithmParms.encScheme; > - crypto_info->algorithmID = pubEK.algorithmParms.algorithmID; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Taking Ownership of TPM.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_TakeOwnership; > - TPM_PROTOCOL_ID proto_id = TPM_PID_OWNER; > - BYTE *new_srk; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // vars for srkpubkey parameter > - TPM_KEY srkPub; > - TPM_KEY_PARMS srkKeyInfo = {TPM_ALG_RSA, TPM_ES_RSAESOAEP_SHA1_MGF1, TPM_SS_NONE, 12, 0}; > - BYTE srkRSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - srkKeyInfo.parms = (BYTE *) &srkRSAkeyInfo; > - > - struct pack_buf_t srkText; > - > - //These values are accurate for an enc(AuthData). > - struct pack_buf_t encOwnerAuth, encSrkAuth; > - > - encOwnerAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - encSrkAuth.data = (BYTE *)malloc(sizeof(BYTE) * 256); > - > - if (encOwnerAuth.data == NULL || encSrkAuth.data == NULL) { > - vtpmloginfo(VTPM_LOG_VTSP, "Could not malloc encrypted auths.\n"); > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) ownerAuth, &encOwnerAuth.size, encOwnerAuth.data); > - Crypto_RSAEnc(ek_cryptoInfo, sizeof(TPM_SECRET), (BYTE *) srkAuth, &encSrkAuth.size, encSrkAuth.data); > - > - > - // Build srk public key struct > - srkPub.ver = TPM_STRUCT_VER_1_1; > - srkPub.keyUsage = TPM_KEY_STORAGE; > - srkPub.keyFlags = 0x00; > - srkPub.authDataUsage = TPM_AUTH_ALWAYS; > - memcpy(&srkPub.algorithmParms, &srkKeyInfo, sizeof(TPM_KEY_PARMS)); > - srkPub.PCRInfoSize = 0; > - srkPub.PCRInfo = 0; > - srkPub.pubKey.keyLength= 0; > - srkPub.encDataSize = 0; > - > - srkText.data = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - srkText.size = BSG_Pack(BSG_TPM_KEY, (BYTE *) &srkPub, srkText.data); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 5, > - BSG_TPM_COMMAND_CODE,&command, > - BSG_TPM_PROTOCOL_ID, &proto_id, > - BSG_TPM_SIZE32_DATA, &encOwnerAuth, > - BSG_TPM_SIZE32_DATA, &encSrkAuth, > - BSG_TPM_KEY, &srkPub); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, ownerAuth, auth) ); > - > - new_srk = srkText.data; > - TPMTRYRETURN( TCSP_TakeOwnership ( hContext, > - proto_id, > - encOwnerAuth.size, > - encOwnerAuth.data, > - encSrkAuth.size, > - encSrkAuth.data, > - &srkText.size, > - &new_srk, > - auth ) ); > - > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, new_srk, srkText.size); > - paramTextSize += srkText.size; > - > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(srkText.data); > - free(encSrkAuth.data); > - free(encOwnerAuth.data); > - free(paramText); > - > - TCS_FreeMemory(hContext, new_srk); > - > - return status; > -} > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Disabling Pubek Read.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_DisablePubekRead; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - ownerAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_DisablePubekRead ( hContext, // in > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - ownerAuth, auth, > - hContext) ); > - goto egress; > - > - abort_egress: > - egress: > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth) { > - > - int i; > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_CreateWrapKey; > - > - vtpmloginfo(VTPM_LOG_VTSP, "Creating new key of type %d.\n", usage); > - > - // vars for Calculate encUsageAuth > - BYTE *paramText; > - UINT32 paramTextSize; > - > - // vars for Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - TPM_DIGEST XORKey1; > - UINT32 XORbufferSize; > - TPM_SECRET encUsageAuth, encMigrationAuth; > - > - // vars for Flatten newKey prototype > - BYTE *flatKey = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 flatKeySize = TCPA_MAX_BUFFER_LENGTH; > - struct pack_buf_t newKeyText; > - > - // Fill in newKey > - TPM_KEY newKey; > - > - BYTE RSAkeyInfo[12] = { 0x00, 0x00, (RSA_KEY_SIZE >> 8), 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00}; > - newKey.algorithmParms.algorithmID = TPM_ALG_RSA; > - newKey.algorithmParms.parms = (BYTE *) &RSAkeyInfo; > - newKey.algorithmParms.parmSize = 12; > - > - switch (usage) { > - case TPM_KEY_SIGNING: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Signing Key...\n"); > - newKey.keyUsage = TPM_KEY_SIGNING; > - newKey.algorithmParms.encScheme = TPM_ES_NONE; > - newKey.algorithmParms.sigScheme = TPM_SS_RSASSAPKCS1v15_SHA1; > - break; > - case TPM_KEY_STORAGE: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Storage Key...\n"); > - newKey.keyUsage = TPM_KEY_STORAGE; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - case TPM_KEY_BIND: > - vtpmloginfo(VTPM_LOG_VTSP, "Creating Binding Key...\n"); > - newKey.keyUsage = TPM_KEY_BIND; > - newKey.algorithmParms.encScheme = TPM_ES_RSAESOAEP_SHA1_MGF1; > - newKey.algorithmParms.sigScheme = TPM_SS_NONE; > - break; > - default: > - vtpmloginfo(VTPM_LOG_VTSP, "Cannot create key. Invalid Key Type.\n"); > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - > - newKey.ver = TPM_STRUCT_VER_1_1; > - > - newKey.keyFlags = 0; > - newKey.authDataUsage = TPM_AUTH_ALWAYS; > - newKey.pubKey.keyLength= 0; > - newKey.encDataSize = 0; > - newKey.encData = NULL; > - > - // FIXME: Support PCR bindings > - newKey.PCRInfoSize = 0; > - newKey.PCRInfo = NULL; > - > - // Calculate encUsageAuth > - XORbufferSize = BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven); > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey1); > - > - // FIXME: No support for migratable keys. > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encUsageAuth)[i] = ((BYTE *) &XORKey1)[i] ^ ((BYTE *) newKeyAuth)[i]; > - > - // Flatten newKey prototype > - flatKeySize = BSG_Pack(BSG_TPM_KEY, (BYTE *) &newKey, flatKey); > - newKeyText.data = flatKey; > - newKeyText.size = flatKeySize; > - > - // Generate HMAC > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_AUTHDATA, &encUsageAuth, > - BSG_TPM_AUTHDATA, &encMigrationAuth); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_CreateWrapKey( hContext, > - parentHandle, > - encUsageAuth, > - encMigrationAuth, > - &newKeyText.size, > - &newKeyText.data, > - auth) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command); > - memcpy(paramText + paramTextSize, newKeyText.data, newKeyText.size); > - paramTextSize += newKeyText.size; > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, 0) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(pubKeyBuf, 0, 0) ); > - TPMTRYRETURN(buffer_append_raw(pubKeyBuf, newKeyText.size, newKeyText.data) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(flatKey); > - free(paramText); > - TCS_FreeMemory(hContext, newKeyText.data); > - > - return status; > -} > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *auth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad) { > - > - > - vtpmloginfo(VTPM_LOG_VTSP, "Loading Key %s.\n", (!skipTPMLoad ? "into TPM" : "only into memory")); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_LoadKey; > - > - BYTE *paramText=NULL; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // SkipTPMLoad stops key from being loaded into TPM, but still generates CRYPTO_INFO for it > - if (! skipTPMLoad) { > - > - if ((rgbWrappedKeyBlob == NULL) || (parentAuth == NULL) || > - (newKeyHandle==NULL) || (auth==NULL)) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // Generate Extra TCS Parameters > - TPM_HANDLE phKeyHMAC; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 1, > - BSG_TPM_COMMAND_CODE, &command); > - > - memcpy(paramText + paramTextSize, rgbWrappedKeyBlob->bytes, buffer_len(rgbWrappedKeyBlob)); > - paramTextSize += buffer_len(rgbWrappedKeyBlob); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - parentAuth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_LoadKeyByBlob( hContext, > - hUnwrappingKey, > - buffer_len(rgbWrappedKeyBlob), > - rgbWrappedKeyBlob->bytes, > - auth, > - newKeyHandle, > - &phKeyHMAC) ); > - > - // Verify Auth > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_HANDLE, newKeyHandle); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - parentAuth, auth, > - hContext) ); > - } > - > - // Build cryptoinfo structure for software crypto function. > - if (cryptoinfo != NULL) { > - TPM_KEY newKey; > - > - // Unpack/return key structure > - BSG_Unpack(BSG_TPM_KEY, rgbWrappedKeyBlob->bytes , &newKey); > - TPM_RSA_KEY_PARMS rsaKeyParms; > - > - BSG_Unpack(BSG_TPM_RSA_KEY_PARMS, > - newKey.algorithmParms.parms, > - &rsaKeyParms); > - > - Crypto_RSABuildCryptoInfoPublic(rsaKeyParms.exponentSize, > - rsaKeyParms.exponent, > - newKey.pubKey.keyLength, > - newKey.pubKey.key, > - cryptoinfo); > - > - // Destroy rsaKeyParms > - BSG_Destroy(BSG_TPM_RSA_KEY_PARMS, &rsaKeyParms); > - > - // Set encryption scheme > - cryptoinfo->encScheme = CRYPTO_ES_RSAESOAEP_SHA1_MGF1; > - } > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Unbinding %d bytes of data.\n", buffer_len(bound_data)); > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_UnBind; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - struct pack_buf_t clear_data32; > - BYTE *clear_data_text; > - UINT32 clear_data_size; > - > - struct pack_buf_t bound_data32 = {bound_data->size, bound_data->bytes}; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &bound_data32); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - usage_auth, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_UnBind( hContext, > - key_handle, > - buffer_len(bound_data), > - bound_data->bytes, > - auth, > - &clear_data_size, > - &clear_data_text) ); > - > - > - // Verify Auth > - clear_data32.size = clear_data_size; > - clear_data32.data = clear_data_text; > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clear_data32); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - usage_auth, auth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init(clear_data, 0, 0)); > - TPMTRYRETURN(buffer_append_raw (clear_data, clear_data_size, clear_data_text) ); > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - free(paramText); > - TCS_FreeMemory(hContext, clear_data_text); > - > - return status; > -} > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData) > -{ > - vtpmloginfo(VTPM_LOG_VTSP, "Binding %d bytes of data.\n", buffer_len(inData)); > - TPM_RESULT status = TPM_SUCCESS; > - TPM_BOUND_DATA boundData; > - UINT32 i; > - > - // Fill boundData's accessory information > - boundData.ver = TPM_STRUCT_VER_1_1; > - boundData.payload = TPM_PT_BIND; > - boundData.payloadData = inData->bytes; > - > - // Pack boundData before encryption > - BYTE* flatBoundData = (BYTE *)malloc(sizeof(BYTE) * > - (sizeof(TPM_VERSION) + > - sizeof(TPM_PAYLOAD_TYPE) + > - buffer_len(inData))); > - if (flatBoundData == NULL) { > - return TPM_NOSPACE; > - } > - UINT32 flatBoundDataSize = 0; > - flatBoundDataSize = BSG_PackList( flatBoundData, 2, > - BSG_TPM_VERSION, &boundData.ver, > - BSG_TYPE_BYTE, &boundData.payload); > - > - memcpy(flatBoundData+flatBoundDataSize, inData->bytes, buffer_len(inData)); > - flatBoundDataSize += buffer_len(inData); > - > - BYTE out_tmp[RSA_KEY_SIZE/8]; // RSAEnc does not do blocking, So this is what will come out. > - UINT32 out_tmp_size; > - > - // Encrypt flatBoundData > - TPMTRY(TPM_ENCRYPT_ERROR, Crypto_RSAEnc( cryptoInfo, > - flatBoundDataSize, > - flatBoundData, > - &out_tmp_size, > - out_tmp) ); > - > - if (out_tmp_size > RSA_KEY_SIZE/8) { > - // The result of RSAEnc should be a fixed size based on key size. > - vtpmlogerror(VTPM_LOG_VTSP, "Enc buffer just overflowed.\n"); > - } > - > - buffer_init(outData, 0, NULL); > - buffer_append_raw(outData, out_tmp_size, out_tmp); > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Bind Generated[%d] = 0x", out_tmp_size); > - for(i = 0 ; i < out_tmp_size ; i++) { > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out_tmp[i]); > - } > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - goto egress; > - abort_egress: > - egress: > - > - // Free flatBoundData > - free(flatBoundData); > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Seal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate PCR_Info Struct from Comp > - TPM_PCR_INFO pcrInfo; > - UINT32 pcrInfoSize, flatpcrSize; > - BYTE flatpcr[3 + // PCR_Select = 3 1 byte banks > - sizeof(UINT16) + // 2 byte UINT16 > - sizeof(UINT32) + // PCR_Comp = 4 byte UINT32 > - 24 * sizeof(TPM_PCRVALUE) ]; // up to 24 PCRs > - > - if (pcrComp != NULL) { > - //printf("\n\tBinding to PCRs: "); > - //for(int i = 0 ; i < pcrComp->select.sizeOfSelect ; i++) > - //printf("%2.2x", pcrComp->select.pcrSelect[i]); > - > - memcpy(&pcrInfo.pcrSelection, &pcrComp->select, sizeof(TPM_PCR_SELECTION)); > - > - flatpcrSize = BSG_Pack(BSG_TPM_PCR_COMPOSITE, (BYTE *) pcrComp, flatpcr); > - Crypto_SHA1Full((BYTE *) flatpcr, flatpcrSize, (BYTE *) &(pcrInfo.digestAtRelease)); > - memset(&(pcrInfo.digestAtCreation), 0, sizeof(TPM_DIGEST)); > - pcrInfoSize = BSG_Pack(BSG_TPM_PCR_INFO, (BYTE *) &pcrInfo, flatpcr); > - } else { > - //printf("\n\tBinding to no PCRS."); > - pcrInfoSize = 0; > - } > - > - // Calculate encUsageAuth > - BYTE XORbuffer[sizeof(TPM_SECRET) + sizeof(TPM_NONCE)]; > - UINT32 XORbufferSize = sizeof(XORbuffer); > - TPM_DIGEST XORKey; > - TPM_ENCAUTH encAuth; > - > - BSG_PackList( XORbuffer, 2, > - BSG_TPM_SECRET, osapSharedSecret, > - BSG_TPM_NONCE, &auth->NonceEven ); > - > - Crypto_SHA1Full(XORbuffer, XORbufferSize, (BYTE *) &XORKey); > - > - int i; > - for (i=0; i < TPM_DIGEST_SIZE; i++) > - ((BYTE *) &encAuth)[i] = ((BYTE *) &XORKey)[i] ^ ((BYTE *) sealDataAuth)[i]; > - > - // Generate Extra TCS Parameters > - UINT32 inDataSize = buffer_len(inData); > - struct pack_buf_t inData_pack = {inDataSize, inData->bytes}; > - struct pack_buf_t pcrInfo_pack = {pcrInfoSize, flatpcr}; > - > - UINT32 sealedDataSize; > - BYTE *flatSealedData=NULL; > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 4, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_ENCAUTH, &encAuth, > - BSG_TPM_SIZE32_DATA, &pcrInfo_pack, > - BSG_TPM_SIZE32_DATA, &inData_pack); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - osapSharedSecret, auth) ); > - > - // Call TCS > - TPMTRYRETURN( TCSP_Seal( hContext, > - keyHandle, > - encAuth, > - pcrInfoSize, > - flatpcr, > - inDataSize, > - inData->bytes, > - auth, > - &sealedDataSize, > - &flatSealedData) ); > - > - // Unpack/return key structure > - BSG_Unpack( BSG_TPM_STORED_DATA, flatSealedData, sealedData ); > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - osapSharedSecret, auth, > - 0) ); > - > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, flatSealedData); > - > - free(paramText); > - return status; > -} > - > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth) { > - > - TPM_RESULT status = TPM_SUCCESS; > - TPM_COMMAND_CODE command = TPM_ORD_Unseal; > - > - BYTE *paramText; // Digest to make Auth. > - UINT32 paramTextSize; > - > - // Generate Extra TCS Parameters > - UINT32 sealDataSize, clearDataSize; > - BYTE *flatSealedData= (BYTE *) malloc(sizeof(TPM_VERSION) + > - 2 * sizeof(UINT32) + > - sealedData->sealInfoSize + > - sealedData->encDataSize), > - *clearData=NULL; > - > - sealDataSize = BSG_Pack(BSG_TPM_STORED_DATA, sealedData, flatSealedData ); > - > - paramText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - > - paramTextSize = BSG_PackList(paramText, 2, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_STORED_DATA, sealedData); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - key_usage_auth, auth) ); > - > - TPMTRYRETURN( GenerateAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth) ); > - // Call TCS > - TPMTRYRETURN( TCSP_Unseal( hContext, > - keyHandle, > - sealDataSize, > - flatSealedData, > - auth, > - dataAuth, > - &clearDataSize, > - &clearData) ); > - > - // Verify Auth > - struct pack_buf_t clearData_pack = {clearDataSize, clearData}; > - > - paramTextSize = BSG_PackList(paramText, 3, > - BSG_TPM_RESULT, &status, > - BSG_TPM_COMMAND_CODE, &command, > - BSG_TPM_SIZE32_DATA, &clearData_pack); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - key_usage_auth, auth, > - hContext) ); > - > - TPMTRYRETURN( VerifyAuth( paramText, paramTextSize, > - data_usage_auth, dataAuth, > - hContext) ); > - > - // Unpack/return key structure > - TPMTRYRETURN( buffer_init(outData, clearDataSize, clearData) ); > - > - goto egress; > - > - abort_egress: > - egress: > - > - if (flatSealedData) > - TCS_FreeMemory( hContext, clearData); > - > - free(paramText); > - return status; > -} > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Calling TPM_SaveState.\n"); > - > - TPM_RESULT status = TPM_SUCCESS; > - > - // Call TCS > - return ( TCSP_SaveState ( hContext ) ); > - > -} > - > - > -// Function Reaches into unsupported TCS command, beware. > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ) { > - > - vtpmloginfo(VTPM_LOG_VTSP, "Passthrough in use.\n"); > - TPM_RESULT status = TPM_SUCCESS; > - > - // Generate Extra TCS Parameters > - BYTE *resultText = (BYTE *) malloc(sizeof(BYTE) * TCPA_MAX_BUFFER_LENGTH); > - UINT32 resultTextSize = TCPA_MAX_BUFFER_LENGTH; > - > - // Call TCS > - TPMTRYRETURN( TCSP_RawTransmitData(buffer_len(inbuf), inbuf->bytes, > - &resultTextSize, resultText) ); > - > - // Unpack/return key structure > - TPMTRYRETURN(buffer_init (outbuf, resultTextSize, resultText) ); > - goto egress; > - > - abort_egress: > - > - egress: > - TCS_FreeMemory(hContext, resultText); > - free(resultText); > - return status; > -} > diff --git a/tools/vtpm_manager/manager/vtsp.h b/tools/vtpm_manager/manager/vtsp.h > deleted file mode 100644 > index 2fb0440..0000000 > --- a/tools/vtpm_manager/manager/vtsp.h > +++ /dev/null > @@ -1,126 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtsp.h > -// > -// Higher level interface to TCS. > -// > -// ================================================================== > - > -#ifndef __VTSP_H__ > -#define __VTSP_H__ > - > -#include "tcg.h" > -#include "tcs.h" > - > -#define KEY_BUFFER_SIZE 2048 > - > -TPM_RESULT VTSP_RawTransmit(const TCS_CONTEXT_HANDLE hContext, > - const buffer_t *inbuf, > - buffer_t *outbuf ); > - > -TPM_RESULT VTSP_OIAP( const TCS_CONTEXT_HANDLE hContext, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_OSAP( const TCS_CONTEXT_HANDLE hContext, > - const TPM_ENTITY_TYPE entityType, > - const UINT32 entityValue, > - const TPM_AUTHDATA *usageAuth, > - TPM_SECRET *sharedsecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_TerminateHandle(const TCS_CONTEXT_HANDLE hContext, > - const TCS_AUTH *auth); > - > -TPM_RESULT VTSP_ReadPubek( const TCS_CONTEXT_HANDLE hContext, > - CRYPTO_INFO *cypto_info); > - > -TPM_RESULT VTSP_TakeOwnership( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - const TPM_AUTHDATA *srkAuth, > - CRYPTO_INFO *ek_cryptoInfo, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_DisablePubekRead( const TCS_CONTEXT_HANDLE hContext, > - const TPM_AUTHDATA *ownerAuth, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_CreateWrapKey( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_USAGE usage, > - const TPM_AUTHDATA *newKeyAuth, > - const TCS_KEY_HANDLE parentHandle, > - const TPM_AUTHDATA *osapSharedSecret, > - buffer_t *pubKeyBuf, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_LoadKey(const TCS_CONTEXT_HANDLE hContext, > - const TCS_KEY_HANDLE hUnwrappingKey, > - const buffer_t *rgbWrappedKeyBlob, > - const TPM_AUTHDATA *parentAuth, > - TPM_HANDLE *newKeyHandle, > - TCS_AUTH *pAuth, > - CRYPTO_INFO *cryptoinfo, > - const BOOL skipTPMLoad); > - > -TPM_RESULT VTSP_Unbind( const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE key_handle, > - const buffer_t *bound_data, > - const TPM_AUTHDATA *usage_auth, > - buffer_t *clear_data, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Bind( CRYPTO_INFO *cryptoInfo, > - const buffer_t *inData, > - buffer_t *outData); > - > -TPM_RESULT VTSP_Seal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_AUTHDATA *sealDataAuth, > - const TPM_PCR_COMPOSITE *pcrComp, > - const buffer_t *inData, > - TPM_STORED_DATA *sealedData, > - const TPM_SECRET *osapSharedSecret, > - TCS_AUTH *auth); > - > -TPM_RESULT VTSP_Unseal(const TCS_CONTEXT_HANDLE hContext, > - const TPM_KEY_HANDLE keyHandle, > - const TPM_STORED_DATA *sealedData, > - const TPM_AUTHDATA *key_usage_auth, > - const TPM_AUTHDATA *data_usage_auth, > - buffer_t *outData, > - TCS_AUTH *auth, > - TCS_AUTH *dataAuth); > - > -TPM_RESULT VTSP_SaveState( const TCS_CONTEXT_HANDLE hContext); > - > -#endif //_VTSP_H_ > diff --git a/tools/vtpm_manager/migration/Makefile b/tools/vtpm_manager/migration/Makefile > deleted file mode 100644 > index e33ae95..0000000 > --- a/tools/vtpm_manager/migration/Makefile > +++ /dev/null > @@ -1,42 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -VPATH = ../manager > - > -BIND = vtpm_migratord > -BINC = vtpm_migrator > - > -SRCSD = vtpm_manager_if.c vtpm_migratord.c vtpm_migratord_handler.c vtpm_ipc.c > -SRCSC = vtpm_manager_if.c vtpm_migrator_if.c vtpm_migratorc.c vtpm_ipc.c > - > -OBJSD = $(patsubst %.c,%.o,$(SRCSD)) > -OBJSC = $(patsubst %.c,%.o,$(SRCSC)) > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIND) $(BINC) > - > -.PHONY: install > -install: build > - $(INSTALL_PROG) $(BIND) $(DESTDIR)$(BINDIR) > - $(INSTALL_PROG) $(BINC) $(DESTDIR)$(BINDIR) > - > -.PHONY: clean > -clean: > - rm -f $(BINC) $(BIND) > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIND): $(OBJSD) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -$(BINC): $(OBJSC) > - $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ > - > -# libraries > -LIBS += ../util/libTCGUtils.a > diff --git a/tools/vtpm_manager/migration/vtpm_manager_if.c b/tools/vtpm_manager/migration/vtpm_manager_if.c > deleted file mode 100644 > index 08986f4..0000000 > --- a/tools/vtpm_manager/migration/vtpm_manager_if.c > +++ /dev/null > @@ -1,186 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_manager_if.c > -// > -// Provides functions to call local vtpm manager interface (Hotplug) > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "vtpm_ipc.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_TX_HP_FNAME "/var/vtpm/fifos/from_console.fifo" > -#define VTPM_RX_HP_FNAME "/var/vtpm/fifos/to_console.fifo" > - > -static vtpm_ipc_handle_t tx_ipc_h, rx_ipc_h; > - > -TPM_RESULT vtpm_manager_open(){ > - > - if ( (vtpm_ipc_init(&tx_ipc_h, VTPM_TX_HP_FNAME, O_RDWR, TRUE) != 0) || //FIXME: wronly > - (vtpm_ipc_init(&rx_ipc_h, VTPM_RX_HP_FNAME, O_RDWR, TRUE) != 0) ) { //FIXME: rdonly > - vtpmlogerror(VTPM_LOG_VTPM, "Unable to connect to vtpm_manager.\n"); > - return TPM_IOERROR; > - } > - > - return TPM_SUCCESS; > -} > - > -void vtpm_manager_close() { > - > - vtpm_ipc_close(&tx_ipc_h); > - vtpm_ipc_close(&rx_ipc_h); > -} > - > - > -TPM_RESULT vtpm_manager_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *adj_command, response_header[VTPM_COMMAND_HEADER_SIZE_SRV]; > - UINT32 dmi_id=0, adj_command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_TAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - adj_command_size = VTPM_COMMAND_HEADER_SIZE_SRV + buffer_len(command_param_buf); > - adj_command = (BYTE *) malloc( adj_command_size ); > - if (!adj_command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - BSG_PackList(adj_command, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(adj_command + VTPM_COMMAND_HEADER_SIZE_SRV, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = vtpm_ipc_write(&tx_ipc_h, NULL, adj_command, adj_command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MGR): 0x"); > - for (i=0; i< adj_command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", adj_command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing VTPM Manager console.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) adj_command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to mgr (%d/%d)\n", size_write, adj_command_size); > - > - // Read header for response to manager command > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, response_header, VTPM_COMMAND_HEADER_SIZE_SRV); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MGR): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE_SRV) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from vtpm_manager shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 4, > - BSG_TYPE_UINT32, &dmi_id, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = vtpm_ipc_read(&rx_ipc_h, NULL, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from vtpm manager.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migrator.h b/tools/vtpm_manager/migration/vtpm_migrator.h > deleted file mode 100644 > index 8d52e66..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator.h > +++ /dev/null > @@ -1,104 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator.h > -// > -// Public Interface header for VTPM Migrator > -// > -// ================================================================== > - > -#ifndef __VTPM_MIGRATOR_H__ > -#define __VTPM_MIGRATOR_H__ > - > -#define VTPM_MTAG_REQ 0x02c1 > -#define VTPM_MTAG_RSP 0x02c4 > - > -// Header sizes. > -#define VTPM_COMMAND_HEADER_SIZE ( 2 + 4 + 4) > -// sizeof(TPM_TAG + UINT32 + TPM_COMMAND_CODE) > - > -//*********************** Connection Info ************************** > -#define VTPM_MIG_PORT 48879 > - > -//************************ Command Codes *************************** > -#define VTPM_MORD_MIG_STEP1 0x00 > -#define VTPM_MORD_MIG_STEP2 0x01 > -#define VTPM_MORD_MIG_STEP3 0x02 > -#define VTPM_MORD_MIG_STEP4 0x03 > - > -//************************ Return Codes **************************** > -#define VTPM_SUCCESS 0 > -#define VTPM_FAIL 1 > - > -/******************* Command Parameter API ************************* > - > -VTPM Command Format > - tpm tag: 2 bytes > - command size: 4 bytes // Size of command including header but not DMI > - ord: 4 bytes // Command ordinal above > - parameters: size - 10 bytes // Command Parameter > - > -VTPM Response Format > - tpm tag: 2 bytes > - response_size: 4 bytes > - status: 4 bytes > - parameters: size - 10 bytes > - > - > -VTPM_Mig_Phase1: > - Unsupported: (Handled by scripts) > - > -VTPM_Mig_Phase2 > - Input Parameters: > - domain_name_size: 4 bytes > - domain_name : domain_name_size bytes > - Output Parameters: > - pub_exp_size: 4 bytes > - pub_exp: pub_exp_size bytes > - pub_mod_size: 4 bytes > - pub_mod: pub_mod_size bytes > - > -VTPM_Mig_Phase3 > - Input Parameters: > - vtpm_state_size: 4 bytes > - vtpm_state: vtpm_state_size bytes > - Output Parameters: > - none > - > -VTPM_Mig_Phase4 > - Unsupported: (Handled by scripts) > - > - > -*********************************************************************/ > - > -#endif //_VTPM_MANAGER_H_ > diff --git a/tools/vtpm_manager/migration/vtpm_migrator_if.c b/tools/vtpm_manager/migration/vtpm_migrator_if.c > deleted file mode 100644 > index de48b2d..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migrator_if.c > +++ /dev/null > @@ -1,219 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// vtpm_migrator_if.c > -// > -// Provides functions to call open network connection & call > -// a function on the vtpm_migratord on the destination > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "bsg.h" > -#include "vtpm_migrator.h" > - > -static int sock_desc; > - > - > -TPM_RESULT vtpm_migratord_open(char *server_address){ > - > - TPM_RESULT status = TPM_FAIL; > - > - /* network variables */ > - struct in_addr ip_addr; > - struct sockaddr_in server_addr; > - int addr_len; > - struct hostent *dns_info=NULL; > - > - /* set up connection to server*/ > - dns_info = gethostbyname(server_address); > - ip_addr.s_addr = *((unsigned long *) dns_info->h_addr_list[0]); > - > - if(ip_addr.s_addr < 0) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - /* set up server variable */ > - memset((char *)&server_addr, 0, sizeof(server_addr)); > - server_addr.sin_family = AF_INET; > - server_addr.sin_port = htons(VTPM_MIG_PORT); > - server_addr.sin_addr.s_addr = ip_addr.s_addr; > - > - /* open socket, make connection */ > - sock_desc = socket(AF_INET, SOCK_STREAM, 0); > - > - if (sock_desc < 0 ) { > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (connect(sock_desc, > - (struct sockaddr *)&server_addr, > - sizeof(server_addr)) < 0 ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - status = TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > -void vtpm_migratord_close() { > - close(sock_desc); > -} > - > - > -TPM_RESULT vtpm_migratord_command(TPM_COMMAND_CODE ord, > - buffer_t *command_param_buf, > - TPM_RESULT *cmd_status, /* out */ > - buffer_t *result_param_buf) { > - > - TPM_RESULT status = TPM_FAIL; > - int size_read, size_write, i; > - BYTE *command, response_header[VTPM_COMMAND_HEADER_SIZE]; > - UINT32 dmi_id=0, command_size, out_param_size, adj_param_size; > - TPM_TAG tag=VTPM_MTAG_REQ; > - > - if ( (!command_param_buf) || (!result_param_buf) || (!cmd_status) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - command_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(command_param_buf); > - command = (BYTE *) malloc( command_size ); > - if (!command) { > - status = TPM_RESOURCES; > - goto abort_egress; > - } > - > - BSG_PackList(command, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &command_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - memcpy(command + VTPM_COMMAND_HEADER_SIZE, command_param_buf->bytes, buffer_len(command_param_buf)); > - > - size_write = write(sock_desc, command, command_size); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT (MIGd): 0x"); > - for (i=0; i< command_size; i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", command[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing to migration server via network.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_write != (int) command_size ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not write entire command to migration server (%d/%d)\n", size_write, command_size); > - > - // Read header for response > - size_read = read(sock_desc, response_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV (MIGd): 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", response_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from Migration Server.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from migration server shorter than std header.\n"); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - > - // Unpack response from DMI for TPM command > - BSG_UnpackList(response_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_COMMAND_CODE, cmd_status ); > - > - // If response has parameters, read them. > - adj_param_size = out_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - TPMTRYRETURN( buffer_init( result_param_buf, adj_param_size, NULL) ); > - size_read = read(sock_desc, result_param_buf->bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_param_buf->bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from migration server.\n"); > - goto abort_egress; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - status = TPM_IOERROR; > - goto abort_egress; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - status=TPM_SUCCESS; > - goto egress; > - > - abort_egress: > - egress: > - > - return status; > -} > - > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratorc.c b/tools/vtpm_manager/migration/vtpm_migratorc.c > deleted file mode 100644 > index 18b3bdb..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratorc.c > +++ /dev/null > @@ -1,211 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -TPM_RESULT handle_vtpm_mig_step2(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - UINT32 offset; > - struct pack_buf_t addr_data32; > - > - //===== Get Destination's Public Migration Key ====== > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP2, > - &out_param_buf, > - &cmd_status, > - &mig_key_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - //===== Load migration key into vtpm_manager ======== > - > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - sizeof(UINT32) + addr_data32.size +buffer_len(&mig_key_buf), > - NULL ) ) ; > - > - offset = BSG_PackList(out_param_buf.bytes, 1, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - memcpy(out_param_buf.bytes + offset , mig_key_buf.bytes, buffer_len(&mig_key_buf) ); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_LOAD_MIG_KEY, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free(&mig_key_buf); > - buffer_free(&out_param_buf); > - > - return status; > -} > - > - > -TPM_RESULT handle_vtpm_mig_step3(char *server_addr, > - char *name, > - UINT32 instance) { > - TPM_RESULT status, cmd_status; > - buffer_t out_param_buf=NULL_BUF, state_buf=NULL_BUF, empty_buf=NULL_BUF; > - struct pack_buf_t addr_data32, name_data32, state_data32; > - > - //===== Get vtpm state from vtpm_manager ======== > - addr_data32.data = (BYTE *)server_addr; > - addr_data32.size = strlen(server_addr) + 1; // Include the null > - > - TPMTRYRETURN ( buffer_init ( &out_param_buf, > - (2 * sizeof(UINT32)) + addr_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &addr_data32); > - > - TPMTRYRETURN ( vtpm_manager_open() ); > - > - TPMTRYRETURN ( vtpm_manager_command(VTPM_ORD_MIGRATE_OUT, > - &out_param_buf, > - &cmd_status, > - &state_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - TPMTRYRETURN( buffer_free( &out_param_buf ) ); > - > - //===== Send vtpm state to destination ====== > - name_data32.data = (BYTE *)name; > - name_data32.size = strlen(name) + 1; // Include the null > - state_data32.data = state_buf.bytes; > - state_data32.size = buffer_len(&state_buf); > - > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2 * sizeof(UINT32) + name_data32.size + state_data32.size, > - NULL ) ) ; > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_migratord_open(server_addr) ); > - > - TPMTRYRETURN( vtpm_migratord_command(VTPM_MORD_MIG_STEP3, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - vtpm_migratord_close(); > - > - TPMTRYRETURN(cmd_status); > - > - goto egress; > - > - abort_egress: > - egress: > - > - buffer_free( &out_param_buf); > - buffer_free( &state_buf); > - buffer_free( &empty_buf); > - > - return status; > -} > - > - > -// Usage vtpm_migrator addr domain_name instance step > - > -int main(int argc, char **argv) { > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - char *server_addr, *name; > - UINT32 instance, step; > - > - if (argc != 5) { > - vtpmlogerror(VTPM_LOG_VTPM, "Usage: vtpm_migrator addr vm_name instance step\n"); > - vtpmlogerror(VTPM_LOG_VTPM, " params given %d\n", argc); > - status= TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - server_addr = argv[1]; > - name = argv[2]; > - instance = atoi( argv[3] ); > - step = atoi( argv[4] ); > - > - switch (step) { > - case VTPM_MORD_MIG_STEP2: > - status = handle_vtpm_mig_step2(server_addr, name, instance); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - status = handle_vtpm_mig_step3(server_addr, name, instance); > - break; > - > - default: > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - break; > - } > - > - goto egress; > - abort_egress: > - egress: > - > - return status; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord.c b/tools/vtpm_manager/migration/vtpm_migratord.c > deleted file mode 100644 > index ea18c8c..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord.c > +++ /dev/null > @@ -1,202 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "log.h" > -#include "bsg.h" > -#include "buffer.h" > -#include "vtpm_migrator.h" > - > -void build_error_msg( buffer_t *buf, TPM_RESULT status) { > - TPM_TAG tag = VTPM_MTAG_RSP; > - UINT32 out_param_size = VTPM_COMMAND_HEADER_SIZE; > - > - buffer_init(buf, out_param_size, NULL); > - > - BSG_PackList(buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status ); > -} > - > -int main() { > - > - /* network variables */ > - int sock_descr, client_sock=-1, len; > - struct sockaddr_in addr; > - struct sockaddr_in client_addr; > - unsigned int client_length; > - int bytes; > - > - /* variables for processing of command */ > - TPM_RESULT status = TPM_FAIL; > - BYTE cmd_header[VTPM_COMMAND_HEADER_SIZE]; > - TPM_TAG tag; > - TPM_COMMAND_CODE ord; > - UINT32 in_param_size, adj_param_size; > - int i, size_read, size_write; > - buffer_t in_param_buf=NULL_BUF, result_buf=NULL_BUF; > - > - > - /* setup socket */ > - sock_descr = socket(AF_INET, SOCK_STREAM, 0); > - > - memset(&addr, 0, sizeof(addr)); > - addr.sin_family = AF_INET; > - addr.sin_addr.s_addr = htonl(INADDR_ANY); > - addr.sin_port = htons(VTPM_MIG_PORT); > - > - if (bind(sock_descr, (struct sockaddr *)&addr, sizeof(addr)) == -1 ) { > - vtpmlogerror(VTPM_LOG_VTPM, "Failed to bind to port %d.\n", VTPM_MIG_PORT); > - return 1; > - } > - > - listen(sock_descr, 10); > - > - for(;;) { > - // ============ clear client info and wait for connection ========== > - memset(&client_addr, 0, sizeof(client_addr)); > - client_length = sizeof(client_addr); > - > - vtpmloginfo(VTPM_LOG_VTPM, "Waiting for incoming migrations...\n"); > - client_sock=accept(sock_descr, &client_addr, &client_length); > - if (client_sock == -1) { > - vtpmlogerror(VTPM_LOG_VTPM, "Incoming connectionn failed.\n"); > - goto abort_command; > - } else { > - vtpmloginfo(VTPM_LOG_VTPM, "Incoming connection accepted.\n"); > - } > - > - // =================== Read incoming command ====================== > - size_read = read( client_sock, cmd_header, VTPM_COMMAND_HEADER_SIZE); > - if (size_read > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "RECV: 0x"); > - for (i=0; i - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", cmd_header[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - > - if (size_read < (int) VTPM_COMMAND_HEADER_SIZE) { > - vtpmlogerror(VTPM_LOG_VTPM, "Command from socket shorter than std header.\n"); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - // Unpack response from client > - BSG_UnpackList(cmd_header, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &in_param_size, > - BSG_TPM_COMMAND_CODE, &ord ); > - > - > - // If response has parameters, read them. > - // Note that out_param_size is in the client's context > - adj_param_size = in_param_size - VTPM_COMMAND_HEADER_SIZE; > - if (adj_param_size > 0) { > - buffer_init( &in_param_buf, adj_param_size, NULL); > - size_read = read(client_sock, in_param_buf.bytes, adj_param_size); > - if (size_read > 0) { > - for (i=0; i< size_read; i++) > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", in_param_buf.bytes[i]); > - > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error reading from socket.\n"); > - build_error_msg(&result_buf, TPM_IOERROR); > - goto abort_command_with_error; > - } > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - > - if (size_read < (int)adj_param_size) { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - vtpmlogerror(VTPM_LOG_VTPM, "Command read(%d) is shorter than header indicates(%d).\n", size_read, adj_param_size); > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - } else { > - vtpmloginfomore(VTPM_LOG_VTPM, "\n"); > - } > - > - /* Handle Command */ > - switch (ord) { > - case VTPM_MORD_MIG_STEP2: > - handle_vtpm_mig_step2(&in_param_buf, &result_buf); > - break; > - > - case VTPM_MORD_MIG_STEP3: > - handle_vtpm_mig_step3(&in_param_buf, &result_buf); > - break; > - > - default: > - build_error_msg(&result_buf, TPM_BAD_PARAMETER); > - goto abort_command_with_error; > - } > - > - abort_command_with_error: > - /* Write Response */ > - size_write = write(client_sock, result_buf.bytes, buffer_len(&result_buf)); > - > - if (size_write > 0) { > - vtpmloginfo(VTPM_LOG_VTPM_DEEP, "SENT: 0x"); > - for (i=0; i< buffer_len(&result_buf); i++) { > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "%x ", result_buf.bytes[i]); > - } > - vtpmloginfomore(VTPM_LOG_VTPM_DEEP, "\n"); > - } else { > - vtpmlogerror(VTPM_LOG_VTPM, "Error writing response to client.\n"); > - goto abort_command; > - } > - > - if (size_write != (int) buffer_len(&result_buf) ) > - vtpmlogerror(VTPM_LOG_VTPM, "Could not send entire response to client(%d/%d)\n", size_write, buffer_len(&result_buf)); > - > - abort_command: > - close(client_sock); > - buffer_free(&in_param_buf); > - buffer_free(&result_buf); > - > - } // For (;;) > - > - return 0; > -} > - > diff --git a/tools/vtpm_manager/migration/vtpm_migratord_handler.c b/tools/vtpm_manager/migration/vtpm_migratord_handler.c > deleted file mode 100644 > index 0a8a2d5..0000000 > --- a/tools/vtpm_manager/migration/vtpm_migratord_handler.c > +++ /dev/null > @@ -1,177 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "log.h" > -#include "vtpm_migrator.h" > -#include "vtpm_manager.h" > - > -#define VTPM_SH_CMD_HDR "bash -c \"cd /etc/xen/scripts; source /etc/xen/scripts/vtpm-common.sh;" > -#define VTPM_SH_CMD_FTR "\"" > -#define VTPM_SH_GETINST "vtpmdb_get_free_instancenum" > -#define VTPM_SH_ADD "vtpm_add_and_activate" > -#define VTPM_SH_RESUME "vtpm_resume" > - > -// This must be updated to the longest command name. Currently GETINST > -#define VTPM_SH_CMD_SIZE (strlen(VTPM_SH_CMD_HDR) + strlen(VTPM_SH_CMD_FTR) + 1 + strlen(VTPM_SH_GETINST) + 2) > - > -void handle_vtpm_mig_step2(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Call manager and get mig key =============== > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_GET_MIG_KEY, > - &out_param_buf, // Empty > - &cmd_status, > - &mig_key_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ==================== return the mig key ===================== > - out_param_size = VTPM_COMMAND_HEADER_SIZE + buffer_len(&mig_key_buf); > - > - TPMTRYRETURN( buffer_init(result_buf, > - out_param_size, > - NULL) ); > - > - BSG_PackList( result_buf->bytes, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, &out_param_size, > - BSG_TPM_RESULT, &status); > - > - memcpy(result_buf->bytes + VTPM_COMMAND_HEADER_SIZE, > - mig_key_buf.bytes, buffer_len(&mig_key_buf)); > - > - goto egress; > - > - abort_egress: > - buffer_free(result_buf); > - build_error_msg(result_buf, status); > - > - egress: > - return; > -} > - > -void handle_vtpm_mig_step3(buffer_t *in_param_buf, buffer_t *result_buf) > -{ > - TPM_TAG tag = VTPM_TAG_RSP; > - buffer_t out_param_buf= NULL_BUF, mig_key_buf=NULL_BUF, empty_buf=NULL_BUF; > - TPM_RESULT status=TPM_SUCCESS, cmd_status; > - UINT32 out_param_size, instance; > - char *shell_cmd_str=NULL; > - size_t shell_cmd_strlen; > - FILE *shell_f=NULL; > - > - if ( (!in_param_buf) || (!result_buf) ) { > - status = TPM_BAD_PARAMETER; > - goto abort_egress; > - } > - > - // ================= Read Parameters =============== > - struct pack_buf_t name_data32, state_data32; > - > - BSG_UnpackList(in_param_buf->bytes, 2, > - BSG_TPM_SIZE32_DATA, &name_data32, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - // Before using this string, protect us from a non-null term array. > - if (name_data32.data[name_data32.size -1] != 0x00) { > - name_data32.data[name_data32.size -1] = 0x00; > - } > - > - // ====== Call hotplug-script and get an instance ====== > - shell_cmd_strlen = VTPM_SH_CMD_SIZE + name_data32.size + 10; > - shell_cmd_str = (char *) malloc(shell_cmd_strlen); // 10 is just padding for the UINT32 > - > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_GETINST VTPM_SH_CMD_FTR); > - > - shell_f = popen(shell_cmd_str, "r"); > - fscanf(shell_f, "%d", &instance); > - pclose(shell_f); > - > - // ====== Call hotplug-script and add instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_ADD " %s %d" VTPM_SH_CMD_FTR, > - name_data32.data, instance); > - system(shell_cmd_str); > - > - // ========= Call vtpm_manager and load VTPM ======= > - TPMTRYRETURN( buffer_init( &out_param_buf, > - 2*sizeof(UINT32) + state_data32.size, > - NULL) ); > - > - BSG_PackList(out_param_buf.bytes, 2, > - BSG_TYPE_UINT32, &instance, > - BSG_TPM_SIZE32_DATA, &state_data32); > - > - TPMTRYRETURN( vtpm_manager_open() ); > - TPMTRYRETURN( vtpm_manager_command(VTPM_ORD_MIGRATE_IN, > - &out_param_buf, > - &cmd_status, > - &empty_buf) ); > - > - vtpm_manager_close(); > - > - TPMTRYRETURN(cmd_status); > - > - // ====== Call hotplug-script and resume instance ====== > - snprintf(shell_cmd_str, shell_cmd_strlen, > - VTPM_SH_CMD_HDR VTPM_SH_RESUME " %d" VTPM_SH_CMD_FTR, instance); > - system(shell_cmd_str); > - > - goto egress; > - abort_egress: > - egress: > - free(shell_cmd_str); > - > - // In this case no params come back, so reuse build_error_msg even for succes. > - build_error_msg(result_buf, status); > - return; > -} > - > diff --git a/tools/vtpm_manager/tcs/Makefile b/tools/vtpm_manager/tcs/Makefile > deleted file mode 100644 > index 11af91e..0000000 > --- a/tools/vtpm_manager/tcs/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCS.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/tcs/contextmgr.c b/tools/vtpm_manager/tcs/contextmgr.c > deleted file mode 100644 > index cf3803c..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.c > +++ /dev/null > @@ -1,224 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include "tcs.h" > -#include "contextmgr.h" > -#include "log.h" > -#include "hashtable.h" > - > -BYTE* AddMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize) { // in > - > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pBlock = NULL; > - > - // check incoming params > - if (pContextHandle == NULL || BlockSize == 0) > - return NULL; > - > - // Create New Block > - pBlock = (BLOCK *)malloc(sizeof(BLOCK)); > - if (pBlock == NULL) > - return (0); > - > - pBlock->aMemory = (BYTE *)malloc(sizeof(BYTE) * BlockSize); > - if (pBlock->aMemory == NULL) > - return (0); > - > - memset(pBlock->aMemory, 0, BlockSize); > - pBlock->nBlockSize = BlockSize; > - pBlock->pNextBlock = NULL; > - > - // search for the last block created where to add the > - // newly created block > - if(pContextHandle->pTopBlock != NULL) { > - pCurrentBlock = pContextHandle->pTopBlock; > - while(pCurrentBlock->pNextBlock != NULL) > - pCurrentBlock = pCurrentBlock->pNextBlock; > - > - > - pCurrentBlock->pNextBlock= pBlock; > - } else > - pContextHandle->pTopBlock = pBlock; > - > - > - pContextHandle->nBlockCount++; > - > - return pBlock->aMemory; > -} > - > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs) { // in > - BLOCK* pCurrentBlock = NULL; > - BLOCK* pParentBlock = NULL; > - BOOL bFound = FALSE; > - > - if (pContextHandle == NULL) > - return FALSE; > - > - > - // Search for the Block in the context by aMemory pointer > - pParentBlock = NULL; > - pCurrentBlock = pContextHandle->pTopBlock; > - > - while(pCurrentBlock != NULL) { > - // If aMemory block is found, delete it > - if(pCurrentBlock->aMemory == pTCPA_BYTEs || pTCPA_BYTEs == NULL) { > - // if it is the top Block, remove it from the top, > - // otherwise remove it from the ParentBlock and stitch > - // the NextBlock to the ParentBlock > - if(pParentBlock == NULL) > - pContextHandle->pTopBlock = pContextHandle->pTopBlock->pNextBlock; > - else > - pParentBlock->pNextBlock = pCurrentBlock->pNextBlock; > - > - // delete memory Block associated with pointer pTCPA_BYTEs > - free(pCurrentBlock->aMemory); > - pCurrentBlock->aMemory = NULL; > - > - free(pCurrentBlock); > - pCurrentBlock = pParentBlock; > - > - pContextHandle->nBlockCount--; > - bFound = TRUE; > - } > - > - if(pCurrentBlock != NULL) { > - pParentBlock = pCurrentBlock; > - pCurrentBlock = pCurrentBlock->pNextBlock; > - } > - } > - > - return bFound; > -} > - > -BOOL AddHandleToList(TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle) { // in > - HANDLE_LIST* pNewHandle = NULL; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Adding Handle to list\n"); > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle == NULL) > - return 0; > - > - pNewHandle = (HANDLE_LIST *)malloc(sizeof(HANDLE_LIST)); > - > - if (pNewHandle == NULL) > - return (0); > - > - pNewHandle->handle = handle; > - pNewHandle->type = type; > - pNewHandle->pNextHandle = pContextHandle->pHandleList; > - > - pContextHandle->pHandleList = pNewHandle; > - > - return 1; > -} > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle) { // in > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - HANDLE_LIST *pCurrentHandle = pContextHandle->pHandleList, > - *pLastHandle = pCurrentHandle; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Deleting Handle from list\n"); > - > - if (pContextHandle == NULL) > - return 0; > - > - while (1) { > - > - if (pCurrentHandle->handle == handle) { // Found element > - if (pCurrentHandle == pLastHandle) { // First element in list > - pContextHandle->pHandleList = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } else { // Ordinary element > - pLastHandle->pNextHandle = pCurrentHandle->pNextHandle; > - free(pCurrentHandle); > - } > - > - return 1; > - > - } else { // Not found yet; > - pLastHandle = pCurrentHandle; > - pCurrentHandle = pCurrentHandle->pNextHandle; > - if (pCurrentHandle == NULL) // Found end of list > - return 0; > - } > - > - } > -} > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle) { // in > - HANDLE_LIST* pCurrentHandle; > - BOOL returncode = TRUE; > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Freeing all handles for context\n"); > - > - if (pContextHandle == NULL) > - return 1; > - > - pCurrentHandle = pContextHandle->pHandleList; > - while (pCurrentHandle != NULL) { > - > - switch (pCurrentHandle->type) { > - case TPM_RT_KEY: > - returncode = returncode && !TCSP_EvictKey(pContextHandle->handle, pCurrentHandle->handle); > - break; > - case TPM_RT_AUTH: > - returncode = returncode && !TCSP_TerminateHandle(pContextHandle->handle, pCurrentHandle->handle); > - break; > - default: > - returncode = FALSE; > - } > - > - pCurrentHandle = pCurrentHandle->pNextHandle; > - > - } > - > - return 1; > -} > diff --git a/tools/vtpm_manager/tcs/contextmgr.h b/tools/vtpm_manager/tcs/contextmgr.h > deleted file mode 100644 > index e3fdf0f..0000000 > --- a/tools/vtpm_manager/tcs/contextmgr.h > +++ /dev/null > @@ -1,82 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// contextmgr.c > -// > -// This file contains the context management functions for TCS. > -// > -// ================================================================== > - > -#ifndef __CONTEXTMGR_H__ > -#define __CONTEXTMGR_H__ > - > -#include "tcg.h" > - > -#define BLOCK_SIZE 300 > - > -typedef struct block { > - int nBlockSize; > - BYTE* aMemory; > - struct block* pNextBlock; > -} BLOCK; > - > -typedef struct handle_List { > - TPM_HANDLE handle; > - TPM_RESOURCE_TYPE type; > - struct handle_List* pNextHandle; > -} HANDLE_LIST; > - > -typedef struct context_handle { > - TCS_CONTEXT_HANDLE handle; > - int nBlockCount; > - BLOCK* pTopBlock; > - HANDLE_LIST* pHandleList; > -} CONTEXT_HANDLE; > - > -BYTE* AddMemBlock( CONTEXT_HANDLE* pContextHandle, // in > - int BlockSize); // in > - > -BOOL DeleteMemBlock(CONTEXT_HANDLE* pContextHandle, // in > - BYTE* pTCPA_BYTEs); // in > - > - > -BOOL AddHandleToList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_RESOURCE_TYPE type, // in > - TPM_HANDLE handle); // in > - > -BOOL DeleteHandleFromList( TCS_CONTEXT_HANDLE hContext, // in > - TPM_HANDLE handle); // in > - > -BOOL FreeHandleList( CONTEXT_HANDLE* pContextHandle); // in > - > -#endif //_CONTEXTMGR_H_ > diff --git a/tools/vtpm_manager/tcs/tcs.c b/tools/vtpm_manager/tcs/tcs.c > deleted file mode 100644 > index 7c1378c..0000000 > --- a/tools/vtpm_manager/tcs/tcs.c > +++ /dev/null > @@ -1,1192 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.c > -// > -// This file contains the functions that implement a TCS. > -// > -// ================================================================== > - > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "tcs.h" > -#include "contextmgr.h" > -#include "tpmddl.h" > -#include "log.h" > -#include "hashtable.h" > -#include "hashtable_itr.h" > - > -// Static Global Vars for the TCS > -static int TCS_m_nCount = 0; > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -static BYTE InBuf [TCPA_MAX_BUFFER_LENGTH]; > -static BYTE OutBuf[TCPA_MAX_BUFFER_LENGTH]; > - > -struct hashtable *context_ht; > - > -// -------------------------- Hash table functions -------------------- > - > -static unsigned int hashfunc32(void *ky) { > - return (* (UINT32 *) ky); > -} > - > -static int equals32(void *k1, void *k2) { > - return (*(UINT32 *) k1 == *(UINT32 *) k2); > -} > - > -CONTEXT_HANDLE *LookupContext( TCS_CONTEXT_HANDLE hContext) { > - return( (CONTEXT_HANDLE *) hashtable_search(context_ht, &hContext) ); > -} > - > -// --------------------------------------------------------------------------------- > -// Initialization/Uninitialization SubComponent API > -// --------------------------------------------------------------------------------- > -TPM_RESULT TCS_create() { > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TPM_RESULT result = TPM_FAIL; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Constructing new TCS:\n"); > - hRes = TDDL_Open(); > - > - context_ht = create_hashtable(10, hashfunc32, equals32); > - > - if ((hRes == TDDL_SUCCESS) && (context_ht != NULL)) { > - result = TPM_SUCCESS; > - TCS_m_nCount++; > - } else { > - result = TPM_IOERROR; > - hashtable_destroy(context_ht, 1); > - } > - } else > - TCS_m_nCount++; > - > - return(result); > -} > - > - > -void TCS_destroy() > -{ > - TCS_m_nCount--; > - > - if (TCS_m_nCount == 0) { > - vtpmloginfo(VTPM_LOG_TCS, "Destructing TCS:\n"); > - TDDL_Close(); > - > - struct hashtable_itr *context_itr; > - TCS_CONTEXT_HANDLE *hContext; > - > - // Close all the TCS contexts. TCS should evict keys based on this > - if (hashtable_count(context_ht) > 0) { > - context_itr = hashtable_iterator(context_ht); > - do { > - hContext = (TCS_CONTEXT_HANDLE *) hashtable_iterator_key(context_itr); > - if (TCS_CloseContext(*hContext) != TPM_SUCCESS) > - vtpmlogerror(VTPM_LOG_TCS, "Failed to close context %d properly.\n", *hContext); > - > - } while (hashtable_iterator_advance(context_itr)); > - free(context_itr); > - } > - hashtable_destroy(context_ht, 1); > - } > - > -} > - > -TPM_RESULT TCS_Malloc( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr) {// out > - > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if (pContextHandle != NULL && ppMemPtr != NULL) { > - *ppMemPtr = (BYTE *)AddMemBlock(pContextHandle, MemSize); > - returnCode = TPM_SUCCESS; > - } > - > - return returnCode; > -} > - > -TPM_RESULT TCS_FreeMemory( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory) { // in > - TPM_RESULT returnCode = TPM_FAIL; > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if ( (pContextHandle != NULL && pMemory != NULL) && > - (DeleteMemBlock(pContextHandle, pMemory) == TRUE) ) > - returnCode = TPM_SUCCESS; > - > - > - return returnCode; > -} > - > -TPM_RESULT TCS_OpenContext(TCS_CONTEXT_HANDLE* hContext) { // out > - TPM_RESULT returnCode = TPM_FAIL; > - TCS_CONTEXT_HANDLE *newContext; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_OpenContext:\n"); > - > - if (hContext) { > - CONTEXT_HANDLE* pContextHandle = (CONTEXT_HANDLE *) malloc(sizeof(CONTEXT_HANDLE)); > - if (pContextHandle == NULL) > - return TPM_SIZE; > - > - // initialize to 0 > - pContextHandle->nBlockCount = 0; > - pContextHandle->pTopBlock = NULL; > - pContextHandle->pHandleList = NULL; > - > - // Create New Block > - AddMemBlock(pContextHandle, BLOCK_SIZE); > - > - newContext = (TCS_CONTEXT_HANDLE *) malloc(sizeof(TCS_CONTEXT_HANDLE)); > - *newContext = (TCS_CONTEXT_HANDLE) (((uintptr_t) pContextHandle >> 2) & 0xffffffff); > - > - if (hashtable_search(context_ht, &newContext) !=NULL) > - *newContext += 1; > - > - pContextHandle->handle = *newContext; > - if (!hashtable_insert(context_ht, newContext, pContextHandle)) { > - free(newContext); > - free(pContextHandle); > - returnCode = TPM_FAIL; > - } else { > - *hContext = *newContext; > - returnCode = TPM_SUCCESS; > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCS_CloseContext(TCS_CONTEXT_HANDLE hContext) {// in > - //FIXME: TCS SHOULD Track failed auths and make sure > - //we don't try and re-free them here. > - TPM_RESULT returnCode = TPM_FAIL; > - > - CONTEXT_HANDLE* pContextHandle = LookupContext(hContext); > - > - if(pContextHandle != NULL) { > - // Print test info > - vtpmloginfo(VTPM_LOG_TCS, "Calling TCS_CloseContext.\n"); > - > - // free memory for all the blocks > - DeleteMemBlock(pContextHandle, NULL ); > - pContextHandle->pTopBlock = NULL; > - > - FreeHandleList(pContextHandle); > - if (pContextHandle->pHandleList != NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - // Release the TPM's resources > - if (hashtable_remove(context_ht, &hContext) == NULL) > - vtpmlogerror(VTPM_LOG_TCS, "Not all handles evicted from TPM.\n"); > - > - free(pContextHandle); > - returnCode = TPM_SUCCESS; > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Finished closing context\n"); > - return(returnCode); > -} > - > -// ------------------------------------------------------------------ > -// Internal Functions > -// ------------------------------------------------------------------ > -int packAuth(BYTE* dst, TCS_AUTH* auth) { > - // CHECK: according to the command specs, the outgoing auth params are: > - // nonceEven > - // nonceOdd > - // continueAuthSession > - // auth digest for return params > - // > - // this is a bit different than this code... > - > - return BSG_PackList(dst, 4, > - BSG_TYPE_UINT32, &(auth->AuthHandle), > - BSG_TPM_NONCE, &(auth->NonceOdd), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -int unpackAuth(TCS_AUTH* auth, BYTE* src) { > - return BSG_UnpackList(src, 3, > - BSG_TPM_NONCE, &(auth->NonceEven), > - BSG_TYPE_BOOL, &(auth->fContinueAuthSession), > - BSG_TPM_AUTHDATA, &(auth->HMAC)); > -} > - > -// ------------------------------------------------------------------ > -// Authorization Commands > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCSP_OIAP(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OIAP; > - UINT32 paramSize = 0; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonce0 == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 2, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonce0); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_OSAP(TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_OSAP; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (authHandle == NULL || nonceEven == NULL || nonceEvenOSAP == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &entityType, > - BSG_TYPE_UINT32, &entityValue, > - BSG_TPM_NONCE, &nonceOddOSAP); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_UnpackList(OutBuf+i, 3, > - BSG_TYPE_UINT32, authHandle, > - BSG_TPM_NONCE, nonceEven, > - BSG_TPM_NONCE, nonceEvenOSAP); > - > - if (!AddHandleToList(hContext, TPM_RT_AUTH, *authHandle)) { > - vtpmlogerror(VTPM_LOG_TCS, "New AuthHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_TakeOwnership(TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_TakeOwnership; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (encOwnerAuth == NULL || encSrkAuth == NULL || SrkSize == NULL || *Srk == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT16, &protocolID, > - BSG_TYPE_UINT32, &encOwnerAuthSize); > - > - memcpy(InBuf+InLength, encOwnerAuth, encOwnerAuthSize); > - InLength += encOwnerAuthSize; > - InLength += BSG_Pack( BSG_TYPE_UINT32, > - &encSrkAuthSize, > - InBuf+InLength); > - memcpy(InBuf+InLength, encSrkAuth, encSrkAuthSize); > - InLength += encSrkAuthSize; > - memcpy(InBuf+InLength, *Srk, *SrkSize); > - InLength += *SrkSize; > - InLength += packAuth(InBuf+InLength, ownerAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, > - &InLength, > - InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY srkPub; > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &srkPub); > - unpackAuth(ownerAuth, OutBuf+i); > - > - // fill output params > - BYTE tempBuf[1024]; > - *SrkSize = BSG_Pack(BSG_TPM_KEY, &srkPub, tempBuf); > - if (TCS_Malloc(hContext, *SrkSize, Srk) == TPM_FAIL) { > - return(TPM_SIZE); > - } > - memcpy(*Srk, tempBuf, *SrkSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TakeOwnership Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth) { // in, out > - > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_DisablePubekRead; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - > - InLength += packAuth(InBuf+InLength, ownerAuth); > - > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS){ > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - unpackAuth(ownerAuth, OutBuf+i); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_DisablePubekRead Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_TerminateHandle(TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Terminate_Handle; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &handle); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, handle)) > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Print debug info > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_TerminateHandle Failed with return code %s\n", tpm_get_error_name(returnCode)); > - > - } > - > - return(returnCode); > -} > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Extend; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &pcrNum, > - BSG_TPM_DIGEST, &inDigest); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - > - // unpack to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND){ > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TPM_PCRVALUE, OutBuf+i, outDigest); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Extend Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Seal( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Seal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || pubAuth == NULL || SealedDataSize == NULL || SealedData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TPM_ENCAUTH, encAuth, > - BSG_TYPE_UINT32, &pcrInfoSize); > - memcpy(InBuf+InLength, PcrInfo, pcrInfoSize); > - InLength += pcrInfoSize; > - InLength += BSG_Pack(BSG_TYPE_UINT32, &inDataSize, InBuf+InLength); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, pubAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) > - == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_STORED_DATA sealedData; > - > - i += BSG_Unpack(BSG_TPM_STORED_DATA, OutBuf+i, &sealedData); > - unpackAuth(pubAuth, OutBuf+i); > - > - // fill SealedData > - BYTE tempBuf[1024]; > - *SealedDataSize = BSG_Pack(BSG_TPM_STORED_DATA, &sealedData, tempBuf); > - if (TCS_Malloc(hContext, *SealedDataSize, SealedData) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*SealedData, tempBuf, *SealedDataSize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Seal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_Unseal(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH2_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_Unseal; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (SealedData == NULL || parentAuth == NULL || dataAuth == NULL || > - DataSize == NULL || Data == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &parentHandle); > - memcpy(InBuf+InLength, SealedData, SealedDataSize); > - InLength += SealedDataSize; > - InLength += packAuth(InBuf+InLength, parentAuth); > - InLength += packAuth(InBuf+InLength, dataAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList( OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH2_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, DataSize); > - if (TCS_Malloc(hContext, *DataSize, Data) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*Data, OutBuf+i, *DataSize); > - i += *DataSize; > - i += unpackAuth(parentAuth, OutBuf+i); > - unpackAuth(dataAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_Unseal Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_UnBind(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_UnBind; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (inData == NULL || privAuth == NULL || outDataSize == NULL || outData == NULL) > - return TPM_BAD_PARAMETER; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 5, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &keyHandle, > - BSG_TYPE_UINT32, &inDataSize); > - memcpy(InBuf+InLength, inData, inDataSize); > - InLength += inDataSize; > - InLength += packAuth(InBuf+InLength, privAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "\n\tSending paramSize = %d", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, outDataSize); > - if (TCS_Malloc(hContext, *outDataSize, outData) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*outData, OutBuf+i, *outDataSize); > - i += *outDataSize; > - unpackAuth(privAuth, OutBuf+i); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_UnBind Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_CreateWrapKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth) // in, out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_CreateWrapKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pcKeySize == NULL || *prgbKey == NULL || pAuth == NULL) > - return TPM_BAD_PARAMETER; > - > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 6, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hWrappingKey, > - BSG_TPM_ENCAUTH, KeyUsageAuth, > - BSG_TPM_ENCAUTH, KeyMigrationAuth); > - memcpy(InBuf+InLength, *prgbKey, *pcKeySize); > - InLength += *pcKeySize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_RESULT, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - TPM_KEY wrappedKey; > - > - i += BSG_Unpack(BSG_TPM_KEY, OutBuf+i, &wrappedKey); > - unpackAuth(pAuth, OutBuf+i); > - > - // Fill prgbKey > - BYTE tempBuf[1024]; > - *pcKeySize = BSG_Pack(BSG_TPM_KEY, &wrappedKey, tempBuf); > - if (TCS_Malloc(hContext, *pcKeySize, prgbKey) == TPM_FAIL) > - return TPM_SIZE; > - > - memcpy(*prgbKey, tempBuf, *pcKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_CreateWrapKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_LoadKeyByBlob(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_AUTH1_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_LoadKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (rgbWrappedKeyBlob == NULL || pAuth == NULL || phKeyTCSI == NULL || phKeyHMAC == NULL) > - return TPM_BAD_PARAMETER; > - > - *phKeyHMAC = hUnwrappingKey; // the parent key is the one that the TPM use to make the HMAC calc > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hUnwrappingKey); > - memcpy(InBuf+InLength, rgbWrappedKeyBlob, cWrappedKeyBlobSize); > - InLength += cWrappedKeyBlobSize; > - InLength += packAuth(InBuf+InLength, pAuth); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_AUTH1_COMMAND) { > - // Extract the remaining output parameters > - i += BSG_Unpack(BSG_TYPE_UINT32, > - OutBuf+i, > - phKeyTCSI); > - unpackAuth(pAuth, OutBuf+i); > - > - if (!AddHandleToList(hContext, TPM_RT_KEY, *phKeyTCSI)) { > - vtpmlogerror(VTPM_LOG_TCS, "New KeyHandle not recorded\n"); > - } > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_LoadKeyByBlob Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_EvictKey(TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_EvictKey; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, &hKey); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (!DeleteHandleFromList(hContext, hKey)) { > - vtpmlogerror(VTPM_LOG_TCS, "KeyHandle not removed from list\n"); > - } > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_EvictKey Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > -TPM_RESULT TCSP_GetRandom(TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_GetRandom; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (bytesRequested == NULL || *randomBytes == NULL){ > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TYPE_UINT32, bytesRequested); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - BSG_Unpack(BSG_TYPE_UINT32, OutBuf+i, bytesRequested); > - if (TCS_Malloc(hContext, *bytesRequested, randomBytes) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*randomBytes, OutBuf+i+sizeof(UINT32), *bytesRequested); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_GetRandom Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_ReadPubek(TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum) // out > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_ReadPubek; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // check input params > - if (pubEndorsementKeySize == NULL || pubEndorsementKey == NULL || checksum == NULL) { > - return TPM_BAD_PARAMETER; > - } > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 4, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal, > - BSG_TPM_NONCE, &antiReplay); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - int i = BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - // Extract the remaining output parameters > - TPM_PUBKEY pubEK; > - i += BSG_UnpackList(OutBuf+i, 2, > - BSG_TPM_PUBKEY, &pubEK, > - BSG_TPM_DIGEST, checksum); > - > - // fill EndorsementKey > - BYTE tempBuf[1024]; > - *pubEndorsementKeySize = BSG_Pack(BSG_TPM_PUBKEY, &pubEK, tempBuf); > - if (TCS_Malloc(hContext, *pubEndorsementKeySize, pubEndorsementKey) == TPM_FAIL) { > - return TPM_SIZE; > - } > - memcpy(*pubEndorsementKey, tempBuf, *pubEndorsementKeySize); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_ReadPubek Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext) // in > -{ > - // setup input/output parameters block > - TPM_TAG tag = TPM_TAG_RQU_COMMAND; > - UINT32 paramSize = 0; > - TPM_COMMAND_CODE ordinal = TPM_ORD_SaveState; > - TPM_RESULT returnCode = TPM_SUCCESS; > - > - // setup the TPM driver input and output buffers > - TDDL_RESULT hRes = TDDL_E_FAIL; > - TDDL_UINT32 InLength = TCPA_MAX_BUFFER_LENGTH; > - TDDL_UINT32 OutLength = TCPA_MAX_BUFFER_LENGTH; > - > - // Convert Byte Input parameter in the input byte stream InBuf > - InLength = BSG_PackList(InBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &ordinal); > - // fill paramSize again as we now have the correct size > - BSG_Pack(BSG_TYPE_UINT32, &InLength, InBuf+2); > - > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Sending paramSize = %d\n", InLength); > - > - // call the TPM driver > - if ((hRes = TDDL_TransmitData(InBuf, InLength, OutBuf, &OutLength)) == TDDL_SUCCESS) { > - // unpack OutBuf to get the tag, paramSize, & returnCode > - BSG_UnpackList(OutBuf, 3, > - BSG_TPM_TAG, &tag, > - BSG_TYPE_UINT32, ¶mSize, > - BSG_TPM_COMMAND_CODE, &returnCode); > - > - if (returnCode == TPM_SUCCESS && tag == TPM_TAG_RSP_COMMAND) { > - vtpmloginfo(VTPM_LOG_TCS_DEEP, "Received paramSize : %d\n", paramSize); > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_SaveState Failed with return code %s\n", tpm_get_error_name(returnCode)); > - } > - } > - > - return(returnCode); > -} > - > - > -TPM_RESULT TCSP_RawTransmitData( UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData) { // out > - > - TDDL_RESULT hRes; > - > - vtpmloginfo(VTPM_LOG_TCS, "Calling TransmitData directly.\n"); > - //FIXME: Add Context Management > - hRes = TDDL_TransmitData( inData, > - inDataSize, > - outData, > - outDataSize); > - > - if (hRes == TDDL_SUCCESS) { > - return TPM_SUCCESS; > - } else { > - vtpmlogerror(VTPM_LOG_TCS, "TCSP_RawTransmitData Failed with return code %s\n", tpm_get_error_name(TPM_IOERROR)); > - return TPM_IOERROR; > - } > - > -} > diff --git a/tools/vtpm_manager/tcs/tcs.h b/tools/vtpm_manager/tcs/tcs.h > deleted file mode 100644 > index 83b9cd0..0000000 > --- a/tools/vtpm_manager/tcs/tcs.h > +++ /dev/null > @@ -1,245 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcs.h > -// > -// This file declares the TCS API > -// > -// ================================================================== > - > -#ifndef __TCS_H__ > -#define __TCS_H__ > - > -#include "tcg.h" > -#include "contextmgr.h" > -#include "buffer.h" > - > -#define HANDLE_NULL 0 > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -TPM_RESULT TCS_create(); > -void TCS_destroy(); > - > -TPM_RESULT TCS_OpenContext( /* OUT */ TCS_CONTEXT_HANDLE* hContext ); > - > -TPM_RESULT TCS_CloseContext ( /* IN */ TCS_CONTEXT_HANDLE hContext ); > - > -TPM_RESULT TCS_Malloc ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 MemSize, // in > - BYTE** ppMemPtr ); //out > - > -TPM_RESULT TCS_FreeMemory ( TCS_CONTEXT_HANDLE hContext, // in > - BYTE* pMemory); // in > - > -// ------------------------------------------------------------------ > -// Exposed API > -// ------------------------------------------------------------------ > - > -// TPM v1.1B Command Set > - > -// Authorzation > -TPM_RESULT TCSP_OIAP( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonce0 // out > - ); > - > -TPM_RESULT TCSP_OSAP ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_ENTITY_TYPE entityType, // in > - UINT32 entityValue, // in > - TPM_NONCE nonceOddOSAP, // in > - TCS_AUTHHANDLE* authHandle, // out > - TPM_NONCE* nonceEven, // out > - TPM_NONCE* nonceEvenOSAP // out > - ); > - > -TPM_RESULT TCSP_TakeOwnership ( TCS_CONTEXT_HANDLE hContext, // in > - UINT16 protocolID, // in > - UINT32 encOwnerAuthSize, // in > - BYTE* encOwnerAuth, // in > - UINT32 encSrkAuthSize, // in > - BYTE* encSrkAuth, // in > - UINT32* SrkSize, // in, out > - BYTE** Srk, // in, out > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DisablePubekRead ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_TerminateHandle ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle // in > - ); > - > -TPM_RESULT TCSP_FlushSpecific ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_AUTHHANDLE handle, // in > - TPM_RESOURCE_TYPE resourceType //in > - ); > - > -// TPM Mandatory > -TPM_RESULT TCSP_Extend ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_DIGEST inDigest, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_PcrRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_PCRINDEX pcrNum, // in > - TPM_PCRVALUE* outDigest // out > - ); > - > -TPM_RESULT TCSP_Quote ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_NONCE antiReplay, // in > - UINT32* PcrDataSize, // in, out > - BYTE** PcrData, // in, out > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_Seal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - TPM_ENCAUTH encAuth, // in > - UINT32 pcrInfoSize, // in > - BYTE* PcrInfo, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* pubAuth, // in, out > - UINT32* SealedDataSize, // out > - BYTE** SealedData // out > - ); > - > -TPM_RESULT TCSP_Unseal ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE parentHandle, // in > - UINT32 SealedDataSize, // in > - BYTE* SealedData, // in > - TCS_AUTH* parentAuth, // in, out > - TCS_AUTH* dataAuth, // in, out > - UINT32* DataSize, // out > - BYTE** Data // out > - ); > - > -TPM_RESULT TCSP_DirWriteAuth ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE newContents, // in > - TCS_AUTH* ownerAuth // in, out > - ); > - > -TPM_RESULT TCSP_DirRead ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_DIRINDEX dirIndex, // in > - TPM_DIRVALUE* dirValue // out > - ); > - > -TPM_RESULT TCSP_UnBind ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 inDataSize, // in > - BYTE* inData, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* outDataSize, // out > - BYTE** outData // out > - ); > - > -TPM_RESULT TCSP_CreateWrapKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hWrappingKey, // in > - TPM_ENCAUTH KeyUsageAuth, // in > - TPM_ENCAUTH KeyMigrationAuth, // in > - UINT32* pcKeySize, // in, out > - BYTE** prgbKey, // in, out > - TCS_AUTH* pAuth // in, out > - ); > - > -TPM_RESULT TCSP_LoadKeyByBlob ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hUnwrappingKey, // in > - UINT32 cWrappedKeyBlobSize, // in > - BYTE* rgbWrappedKeyBlob, // in > - TCS_AUTH* pAuth, // in, out > - TCS_KEY_HANDLE* phKeyTCSI, // out > - TCS_KEY_HANDLE* phKeyHMAC // out > - ); > - > -TPM_RESULT TCSP_GetPubKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey, // in > - TCS_AUTH* pAuth, // in, out > - UINT32* pcPubKeySize, // out > - BYTE** prgbPubKey // out > - ); > - > -TPM_RESULT TCSP_EvictKey ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE hKey // in > - ); > - > -TPM_RESULT TCSP_Sign ( TCS_CONTEXT_HANDLE hContext, // in > - TCS_KEY_HANDLE keyHandle, // in > - UINT32 areaToSignSize, // in > - BYTE* areaToSign, // in > - TCS_AUTH* privAuth, // in, out > - UINT32* sigSize, // out > - BYTE** sig // out > - ); > - > -TPM_RESULT TCSP_GetRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32* bytesRequested, // in, out > - BYTE** randomBytes // out > - ); > - > -TPM_RESULT TCSP_StirRandom ( TCS_CONTEXT_HANDLE hContext, // in > - UINT32 inDataSize, // in > - BYTE* inData // in > - ); > - > -TPM_RESULT TCSP_ReadPubek ( TCS_CONTEXT_HANDLE hContext, // in > - TPM_NONCE antiReplay, // in > - UINT32* pubEndorsementKeySize, // out > - BYTE** pubEndorsementKey, // out > - TPM_DIGEST* checksum // out > - ); > - > - > -// Non-Standard TCSP calls > -TPM_RESULT TCSP_SaveState(TCS_CONTEXT_HANDLE hContext); // in > - > -//Give direct access to TransmitData. > -// Key and Auth Management is done before transfering command to TDDL. > -TPM_RESULT TCSP_RawTransmitData(UINT32 inDataSize, // in > - BYTE *inData, // in > - UINT32 *outDataSize,// in/out > - BYTE *outData); // out > - > -///////////// Private Functions //////////////////// > -CONTEXT_HANDLE* LookupContext( TCS_CONTEXT_HANDLE hContext); > - > -#endif //TCS_H > diff --git a/tools/vtpm_manager/tcs/tpmddl.h b/tools/vtpm_manager/tcs/tpmddl.h > deleted file mode 100644 > index e7e54f1..0000000 > --- a/tools/vtpm_manager/tcs/tpmddl.h > +++ /dev/null > @@ -1,69 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tpmddl.c > -// > -// This file defines the TDDLI API > -// > -// ================================================================== > - > -#ifndef __TPMDDL_H__ > -#define __TPMDDL_H__ > - > -#define TDDL_CAP_PROP_MANUFACTURER 0x0001 > - > -#define TDDL_E_FAIL 1 > -#define TDDL_E_SUCCESS 0 > -#define TDDL_SUCCESS 0 > - > -typedef unsigned int TDDL_UINT32; > -typedef TDDL_UINT32 TDDL_RESULT; > -typedef unsigned char TDDL_BYTE; > - > -TDDL_RESULT TDDL_Open(); > -void TDDL_Close(); > -TDDL_RESULT TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize); > -TDDL_RESULT TDDL_GetStatus(); > -TDDL_RESULT TDDL_GetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > -TDDL_RESULT TDDL_SetCapability( TDDL_UINT32 cap, > - TDDL_UINT32 sub, > - TDDL_BYTE* buffer, > - TDDL_UINT32* size); > - > -#endif // __TPMDDL_H__ > diff --git a/tools/vtpm_manager/tcs/transmit.c b/tools/vtpm_manager/tcs/transmit.c > deleted file mode 100644 > index 74bbdca..0000000 > --- a/tools/vtpm_manager/tcs/transmit.c > +++ /dev/null > @@ -1,147 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "buffer.h" > -#include "log.h" > -#include "tpmddl.h" > - > -// flag to track whether TDDL has been opened > -static int g_TDDL_open = 0; > -static int g_tx_fd = -1; // the fd to the TPM > - > -#ifndef DUMMY_TPM > - #define TPM_TX_FNAME "/dev/tpm0" > - static int *g_rx_fdp = &g_tx_fd; > -#else > - #define TPM_TX_FNAME "/var/tpm/tpm_in.fifo" > - #define TPM_RX_FNAME "/var/tpm/tpm_out.fifo" > - static int g_rx_fd = -1; > - static int *g_rx_fdp = &g_rx_fd; // the fd to the TPM > -#endif > - > -TPM_RESULT > -TDDL_TransmitData( TDDL_BYTE* in, > - TDDL_UINT32 insize, > - TDDL_BYTE* out, > - TDDL_UINT32* outsize) { > - TPM_RESULT status = TPM_SUCCESS; > - TDDL_UINT32 i; > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Sending buffer = 0x"); > - for(i = 0 ; i < insize ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", in[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - ssize_t size = 0; > - > - // send the request > - size = write (g_tx_fd, in, insize); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "write() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - else if ((TDDL_UINT32) size < insize) { > - vtpmlogerror(VTPM_LOG_TXDATA, "Wrote %d instead of %d bytes!\n", (int) size, insize); > - // ... ? > - } > - > - // read the response > - size = read (*g_rx_fdp, out, TCPA_MAX_BUFFER_LENGTH); > - if (size < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "read() failed"); > - ERRORDIE (TPM_IOERROR); > - } > - > - vtpmloginfo(VTPM_LOG_TXDATA, "Receiving buffer = 0x"); > - for(i = 0 ; i < size ; i++) > - vtpmloginfomore(VTPM_LOG_TXDATA, "%2.2x ", out[i]); > - > - vtpmloginfomore(VTPM_LOG_TXDATA, "\n"); > - > - *outsize = size; > - // close connection > - goto egress; > - > - abort_egress: > - egress: > - return status; > -} > - > -TPM_RESULT TDDL_Open() { > - > - TDDL_RESULT status = TDDL_SUCCESS; > - > - if (g_TDDL_open) > - return TPM_FAIL; > - > -#ifdef DUMMY_TPM > - *g_rx_fdp = open (TPM_RX_FNAME, O_RDWR); > -#endif > - > - g_tx_fd = open (TPM_TX_FNAME, O_RDWR); > - if (g_tx_fd < 0) { > - vtpmlogerror(VTPM_LOG_TXDATA, "TPM open failed"); > - return TPM_IOERROR; > - } > - > - g_TDDL_open = 1; > - > - return status; > -} > - > -void TDDL_Close() { > - if (! g_TDDL_open) > - return; > - > - if (g_tx_fd>= 0) { > - if (close(g_tx_fd) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - g_tx_fd = -1; > - } > - > - if (*g_rx_fdp>= 0) { > - if (close(*g_rx_fdp) < 0) > - vtpmlogerror(VTPM_LOG_TXDATA, "closeing tpm failed"); > - *g_rx_fdp = -1; > - } > - > - g_TDDL_open = 0; > - > -} > diff --git a/tools/vtpm_manager/util/Makefile b/tools/vtpm_manager/util/Makefile > deleted file mode 100644 > index 36bc38f..0000000 > --- a/tools/vtpm_manager/util/Makefile > +++ /dev/null > @@ -1,24 +0,0 @@ > -XEN_ROOT = $(CURDIR)/../../.. > -include $(XEN_ROOT)/tools/vtpm_manager/Rules.mk > - > -BIN = libTCGUtils.a > - > -.PHONY: all > -all: build > - > -.PHONY: build > -build: $(BIN) > - > -.PHONY: install > -install: build > - > -.PHONY: clean > -clean: > - rm -f *.a *.so *.o *.rpm $(DEP_FILES) > - > -.PHONY: mrproper > -mrproper: clean > - rm -f *~ > - > -$(BIN): $(OBJS) > - $(AR) rcs $(BIN) $(OBJS) > diff --git a/tools/vtpm_manager/util/bsg.c b/tools/vtpm_manager/util/bsg.c > deleted file mode 100644 > index fa36ce7..0000000 > --- a/tools/vtpm_manager/util/bsg.c > +++ /dev/null > @@ -1,829 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.cpp > -// > -// This file will handle all the TPM Byte Stream functions > -// > -// ================================================================== > - > -#include > -#include > -#include > -#include > -#include "tcg.h" > -#include "crypto.h" > -#include "bsg.h" > -#include "log.h" > - > -static int g_log_recursion_level = 0; > - > -// a largest buffer size. if we get a buf size bigger than this when unpacking, > -// will complain! > -#define BSG_MAX_BUF_SIZE (1<<18) > - > -#define bsglog(fmt, ...) do { \ > - int __i; \ > - for (__i=0; __i < g_log_recursion_level; __i++) { \ > - vtpmloginfomore (VTPM_LOG_BSG, "%s", " "); \ > - } \ > - vtpmloginfomore (VTPM_LOG_BSG, fmt, __VA_ARGS__); \ > - } while (0) > - > - > -// FIXME: trigger the selfcheck--need to use glibc hook to do this > -//BOOL dummy1 = BSG_static_selfcheck(); > - > - > -// Interpretting Types > -// ------------------- > -// > -// Incoming Types are composed of two parts {format, info} squished into a > -// BSG_UINT32. The first 4 bits is a format spec indicating what type of > -// data it is. If the first 4 bits are zero the info corresponds to a value in > -// BSG_s_fmt[]. This is a structure whose composition is described in > -// BSG_s_fmt[]. If the value is non-zero, info corresponds to the size of the > -// data (in bytes) being passed in. For example a UINT32 being passed in would > -// have a format of (__FMT_CONST | 4). If both, the format and info are zero, > -// this is interpretted as the end of the structure, and the result is returned. > - > -// these flags are mutually exclusive, so I'll just make them > -// format values which indicate the semantics of the 'info' part and the source > -// data. The above description has been accordingly adjusted. > - > -// format values for determining what type of data the incoming type is > -// it's a 4 bit value, occupying the high 4 bits > -#define __FMT_CONST (1UL << 28) // Constant sized value > -#define __FMT_DATA (2UL << 28) // Believed to be raw data NOT {size,data} > -#define __FMT_SIZE (3UL << 28) // A size. Used in FMT_SIZE??_DATA. > -#define __FMT_HSIZE (4UL << 28) // A number of handles > -#define __FMT_PACKED (5UL << 28) // 'info' is unused; the source data consists > - // of {size32, data} but we're to pack only the > - // data as that is already packed, and so > - // can/must be unpacked without > - // explicitly reading it size > - > -#define __FMT_MASK 0x0FFFFFFFUL // this masks out the 4-bit format > -#define __FMT_MASK_SIZE(type) ((type) & __FMT_MASK) > -#define __FMT_MASK_FORMAT(type) ((type) & (~__FMT_MASK)) > - > -// constant (8/16/32-bits) > -#define FMT_U8 (__FMT_CONST | 1UL) > -#define FMT_U16 (__FMT_CONST | 2UL) > -#define FMT_U32 (__FMT_CONST | 4UL) > - > -// const with a compiler-computed size > -#define FMT_SIZEOF(type) (__FMT_CONST | sizeof(type)) > - > -// other data (size bytes) > -// Used primarily for DIGESTS -> FMT_DATA(20) > -#define FMT_DATA(size) (__FMT_DATA | ((BSG_UINT32) (size) & __FMT_MASK)) > - > -// 16/32-bit size followed by N bytes of data > -#define FMT_SIZE16_DATA (__FMT_SIZE | 2UL) > -#define FMT_SIZE32_DATA (__FMT_SIZE | 4UL) > - > -// 16-bit size followed by N key handles > -#define FMT_SIZE16_HANDLES (__FMT_HSIZE | 2UL) > - > -#define DIGEST_SIZE 20 > -typedef BSG_UINT32 BSG_HANDLE; > - > -// TCPA_AUTH has 11 fields! > -#define MAX_FIELDS 11 > -typedef struct BSG_Format > -{ > - BSG_Type type; > - const char* name; > - BSG_UINT32 fields[MAX_FIELDS + 1]; > -} BSG_Format; > - > -/* > - * TCPA structure data formats > - */ > -// this has to be manually kept in sync with the > -// Type enum!! the static_selfcheck() function should be used regularly! > -static BSG_Format s_fmt[] = > -{ > - {BSG_TYPE_UINT32, "BSG_TYPE_UINT32", {FMT_U32, 0}}, > - {BSG_TYPE_UINT16, "BSG_TYPE_UINT16", {FMT_U16, 0}}, > - {BSG_TYPE_BYTE, "BSG_TYPE_BYTE", {FMT_U8, 0}}, > - {BSG_TYPE_BOOL, "BSG_TYPE_BOOL", {FMT_U8, 0}}, > - {BSG_TPM_SIZE32_DATA, "BSG_TPM_SIZE32_DATA", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_TAG, "BSG_TPM_TAG", {FMT_SIZEOF(TPM_TAG), 0}}, > - {BSG_TPM_HANDLE, "BSG_TPM_HANDLE", {FMT_SIZEOF(TPM_HANDLE), 0}}, > - {BSG_TPM_RESULT, "BSG_TPM_RESULT", {FMT_SIZEOF(TPM_RESULT), 0}}, > - {BSG_TPM_RESOURCE_TYPE, "BSG_TPM_RESOURCE_TYPE", {FMT_SIZEOF(TPM_RESOURCE_TYPE), 0}}, > - {BSG_TPM_COMMAND_CODE, "BSG_TPM_COMMAND_CODE", {FMT_U32, 0}}, > - {BSG_TPM_AUTH_DATA_USAGE, "BSG_TPM_AUTH_DATA_USAGE", {FMT_U8, 0}}, > - {BSG_TPM_ALGORITHM_ID, "BSG_TPM_ALGORITHM_ID", {FMT_U32, 0}}, > - {BSG_TPM_PROTOCOL_ID, "BSG_TPM_PROTOCOL_ID", {FMT_SIZEOF(TPM_PROTOCOL_ID), 0}}, > - {BSG_TPM_KEY_USAGE, "BSG_TPM_KEY_USAGE", {FMT_U16, 0}}, > - {BSG_TPM_ENC_SCHEME, "BSG_TPM_ENC_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_SIG_SCHEME, "BSG_TPM_SIG_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_MIGRATE_SCHEME, "BSG_TPM_MIGRATE_SCHEME", {FMT_U16, 0}}, > - {BSG_TPM_KEY_FLAGS, "BSG_TPM_KEY_FLAGS", {FMT_U32, 0}}, > - > - {BSG_TPM_AUTHDATA, "BSG_TPM_AUTHDATA", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_SECRET, "BSG_TPM_SECRET", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_ENCAUTH, "BSG_TPM_ENCAUTH", {BSG_TPM_AUTHDATA, 0}}, > - {BSG_TPM_PAYLOAD_TYPE, "BSG_TPM_PAYLOAD_TYPE", {FMT_SIZEOF(TPM_PAYLOAD_TYPE), 0}}, > - > - {BSG_TPM_VERSION, "BSG_TPM_VERSION", {FMT_DATA(4), 0}}, // vers 1.2 > - {BSG_TPM_DIGEST, "BSG_TPM_DIGEST", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_COMPOSITE_HASH, "BSG_TPM_COMPOSITE_HASH", {BSG_TPM_DIGEST, 0}}, > - {BSG_TPM_CHOSENID_HASH, "BSG_TPM_CHOSENID_HASH", {BSG_TPM_DIGEST, 0}}, > - > - {BSG_TPM_NONCE, "BSG_TPM_NONCE", {FMT_DATA(DIGEST_SIZE), 0}}, > - {BSG_TPM_KEY_HANDLE, "BSG_TPM_KEY_HANDLE", {FMT_SIZEOF(TPM_KEY_HANDLE), 0}}, > - {BSG_TPM_KEY_HANDLE_LIST, "BSG_TPM_KEY_HANDLE_LIST", > - {FMT_SIZE16_HANDLES, 0}}, > - > - {BSG_TPM_KEY_PARMS, "BSG_TPM_KEY_PARMS", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_RSA_KEY_PARMS, "BSG_TPM_RSA_KEY_PARMS", { > - FMT_U32, FMT_U32, FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_PUBKEY, "BSG_TPM_STORE_PUBKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_PUBKEY, "BSG_TPM_PUBKEY", {BSG_TPM_KEY_PARMS, BSG_TPM_STORE_PUBKEY, 0}}, > - {BSG_TPM_KEY, "BSG_TPM_KEY", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, // the PCR_INFO > - BSG_TPM_STORE_PUBKEY, > - FMT_SIZE32_DATA, // the encrypted part > - 0}}, > - > - {BSG_TPM_MIGRATIONKEYAUTH, "BSG_TPM_MIGRATIONKEYAUTH", { > - BSG_TPM_PUBKEY, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_DIGEST, 0}}, > - > - {BSG_TCPA_AUDIT_EVENT, "TCPA_AUDIT_EVENT", { > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_RESULT, 0 }}, > - > - {BSG_TCPA_EVENT_CERT, "TCPA_EVENT_CERT", { > - BSG_TPM_DIGEST, > - BSG_TPM_DIGEST, > - FMT_DATA(2), > - FMT_SIZE32_DATA, 0}}, > - > - {BSG_TPM_PCR_SELECTION, "BSG_TPM_PCR_SELECTION", {FMT_SIZE16_DATA, 0} }, > - {BSG_TPM_PCR_COMPOSITE, "BSG_TPM_PCR_COMPOSITE", { BSG_TPM_PCR_SELECTION, > - FMT_SIZE32_DATA, > - 0} }, > - > - {BSG_TPM_PCR_INFO, "BSG_TPM_PCR_INFO", { BSG_TPM_PCR_SELECTION, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_COMPOSITE_HASH, > - 0} }, > - > - > - {BSG_TPM_STORED_DATA, "BSG_TPM_STORED_DATA", { > - BSG_TPM_VERSION, > - FMT_SIZE32_DATA, > - FMT_SIZE32_DATA, > - 0}}, > - {BSG_TPM_SYMMETRIC_KEY, "BSG_TPM_SYMMETRIC_KEY", { > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_ENC_SCHEME, > - FMT_SIZE16_DATA, > - 0}}, > - {BSG_TPM_STORE_PRIVKEY, "BSG_TPM_STORE_PRIVKEY", {FMT_SIZE32_DATA, 0}}, > - {BSG_TPM_STORE_ASYMKEY, "BSG_TPM_STORE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - {BSG_TPM_MIGRATE_ASYMKEY, "BSG_TPM_MIGRATE_ASYMKEY", { > - BSG_TPM_PAYLOAD_TYPE, > - BSG_TPM_SECRET, > - BSG_TPM_DIGEST, > - FMT_U32, > - BSG_TPM_STORE_PRIVKEY, > - 0}}, > - > - {BSG_TPM_QUOTE_INFO, "BSG_TPM_QUOTE_INFO", { > - BSG_TPM_VERSION, > - FMT_DATA(4), > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_NONCE, > - 0}}, > - > - {BSG_TPM_IDENTITY_CONTENTS, "BSG_TPM_IDENTITY_CONTENTS", { > - BSG_TPM_VERSION, > - FMT_U32, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_PUBKEY, > - 0}}, > - > - {BSG_TPM_PCRVALUE, "BSG_TPM_PCRVALUE", {FMT_DATA(DIGEST_SIZE), 0}}, > - > - {BSG_TCPA_PCR_FLAGS, "TCPA_PCR_FLAGS", { > - FMT_U8, > - FMT_U8, > - 0}}, > - > - {BSG_TCS_AUTH, "TCS_AUTH", { > - BSG_TYPE_UINT32, > - BSG_TPM_NONCE, > - BSG_TPM_NONCE, > - BSG_TYPE_BOOL, > - BSG_TPM_AUTHDATA, > - 0}}, > - > - {BSG_TPM_KEY_NONSENSITIVE, "BSG_TPM_KEY_NONSENSITIVE", { > - BSG_TPM_VERSION, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_KEY_PARMS, > - FMT_SIZE32_DATA, > - BSG_TPM_STORE_PUBKEY, > - 0}}, > - > - {BSG_PACKED, "BSG_PACKED", { > - __FMT_PACKED, > - 0 }}, > - > - {BSG_TYPE_MAX, "", {0}}, > -}; > - > - > -static const BSG_Format* find_format (BSG_Type t) { > - BSG_Format * f = s_fmt; > - > - if (t >= BSG_TYPE_MAX) { > - return NULL; > - } > - > - // WARNING: this depends on the enum and s_fmt[] array being in sync! make > - // sure to run the static_selfcheck() to make sure > - f = s_fmt + (t - BSG_TYPE_FIRST); > - > - return f; > -} > - > -// > -// a consistency-checking routine which can be run at compile time > -// (ie. immediately after compilation) > -// > -// tasks: > -// - verify that s_fmt has one entry per Type t, and that entry is at s_fmt[t] > -// > -// conditions: > -// - need that s_fmt[0] is the first type listed in the Type enum! ie the first > -// Type has value 0, not 1 > -// > -// FIXME: should have a function be passed in here which is called if the test > -// fails. Then the caller can decide what to do: abort, notify, whatever > -// > -BOOL BSG_static_selfcheck () > -{ > - int i; > - > - for (i=BSG_TYPE_FIRST; i <= BSG_TYPE_MAX; i++) { > - if (s_fmt[i - BSG_TYPE_FIRST].type != i) { > - bsglog ("%s\n", "BSG: static_selfcheck failed!\n"); > - bsglog ("failure at %i, allegedly %s\n", > - i, s_fmt[i - BSG_TYPE_FIRST].name); > - abort(); > - return FALSE; > - } > - } > - > - bsglog ("%s\n", "BSG: static_selfcheck success!"); > - return TRUE; > -} > - > - > -/** > - * Flatten a TCPA structure into a buffer in big-endian format > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * @dst: (OUT) flattened data > - * Returns: Flattened size or -1 for unknown types > - */ > -// make it so that it can just run through the whole process and return > -// the packed size, without packing anything. this will be done if dst is NULL. > -static int BSG_Pack_private(BSG_Type type, const BSG_BYTE** src, BSG_BYTE* dst) > -{ > - // check incoming parameters > - if (*src == NULL) > - return 0; > - > - const BSG_BYTE* s = *src; > - BSG_BYTE* d = dst; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) // We are dealing with a fixed length value eg. UINT32 > - { > - BSG_UINT32 val = 0; > - switch (size) { > - case 1: val = * (BYTE*) s; break; > - case 2: val = * (unsigned short*) s; break; > - case 4: val = * (BSG_UINT32*) s; break; > - } > - if (dst) > - BSG_PackConst(val, size, d); > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) { // We are dealing with raw data. Not sure when > - // this is used. > - > - if (dst) { > - bsglog ("BSG: __FMT_DATA size %d, src %p, dst %p\n", size, s, d); > - memcpy(d, s, size); > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) { // It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = 0; > - switch (size) { > - case 1: psize = * (BYTE*) s; break; > - case 2: psize = * (unsigned short*) s; break; > - case 4: psize = * (BSG_UINT32*) s; break; > - } > - > - if (dst) > - BSG_PackConst(psize, size, d); > - > - s += size; > - d += size; > - > - // now 's' points to an address, so cast it to BSG_BYTE** > - const BSG_BYTE* pdata = * ((BSG_BYTE**) s); > - s += sizeof(BSG_BYTE*); > - > - if (format == __FMT_HSIZE) {// This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* d2 = (BSG_HANDLE*) d; > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) > - d2[i] = BSG_UnpackConst((BSG_BYTE*)(p2 + i), 4); > - > - } > - d += psize * sizeof(BSG_HANDLE); > - } else {// If it's not psize handles, it's psize data. > - if (psize > 0) { > - if (dst) { > - bsglog ("BSG: __FMT_SIZE, size=%d, src=%p, dst=%p\n", > - psize, pdata, d); > - memcpy(d, pdata, psize); > - } > - } > - d += psize; > - } > - } else if (format == __FMT_PACKED) { > - // the source buffer is a pack_constbuf_t, which has a size and a > - // pointer. just copy the buffer value, the size is not included in the > - // output stream. > - pack_constbuf_t * buf = (pack_constbuf_t*) s; > - > - if (dst) { > - bsglog ("BSG: __FMT_PACKED, size=%d, src=%p, dst=%p\n", > - buf->size, buf->data, d); > - memcpy(d, buf->data, buf->size); > - } > - > - s += buf->size; > - d += buf->size; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmloginfo(VTPM_LOG_BSG, "BSG_Pack: cannot find type %d\n", type); > - return -1; > - } > - > - if (dst) > - bsglog ("BSG_Pack type %s\n", x->name); > - > - > - // iterate through the fields > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize; > - > - g_log_recursion_level++; > - fsize = BSG_Pack_private((BSG_Type) *f, &s, dst ? d : NULL); > - g_log_recursion_level--; > - > - if (fsize <= 0) > - return fsize; > - > - d += fsize; > - } > - } else { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Pack(): Unknown format %d\n", format); > - return -1; > - } > - > - *src = s; > - return (d - dst); > -} > - > -/** > - * Unflatten a TCPA structure from a buffer in big-endian format > - * @type: TCPA structure type > - * @src: flattened data > - * @dst: (IN) TCPA structure (OUT) end of TCPA structure > - * Returns: Flattened size > - * Note: Returns flattened size NOT the unpacked structure size > - */ > -static int BSG_Unpack_private(BSG_Type type, const BSG_BYTE* src, BSG_BYTE** dst) { > - // check incoming parameters > - if (src == NULL) > - return 0; > - > - > - const BSG_BYTE* s = src; > - BSG_BYTE* d = dst ? *dst:NULL; > - if (dst && !d) > - dst = NULL; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if (format == __FMT_CONST) {// We are dealing with a fixed length value ie. UINT32 > - > - BSG_UINT32 val = BSG_UnpackConst(s, size); > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) val; break; > - case 2: *(unsigned short*) d = (unsigned short) val; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) val; break; > - } > - } > - > - s += size; > - d += size; > - } else if (format == __FMT_DATA) {// We are dealing with raw data. Not sure when this is used. > - if (dst) > - memcpy(d, s, size); > - > - d += size; > - s += size; > - } else if (format == __FMT_SIZE || format == __FMT_HSIZE) {// It's a size, followed by that much data or handles > - > - BSG_UINT32 psize = BSG_UnpackConst(s, size); > - > - if (psize > BSG_MAX_BUF_SIZE) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack runs into var-sized data bigger than %u bytes!!\n", > - BSG_MAX_BUF_SIZE); > - return -1; > - } > - > - if (dst) { > - switch (size) { > - case 1: *(BYTE *) d = (BSG_BYTE) psize; break; > - case 2: *(unsigned short*) d = (unsigned short) psize; break; > - case 4: *(BSG_UINT32*) d = (BSG_UINT32) psize; break; > - } > - } > - > - s += size; > - d += size; > - > - BSG_BYTE* pdata = NULL; > - > - if (psize) { > - if (format == __FMT_HSIZE) { // This is a list of psize Handles > - if (dst) { > - BSG_HANDLE* s2 = (BSG_HANDLE*) s; > - pdata = (BSG_BYTE *)malloc(psize * sizeof(BSG_HANDLE)); > - if (!pdata) > - return -1; > - > - BSG_HANDLE* p2 = (BSG_HANDLE*) pdata; > - BSG_UINT32 i; > - for (i = 0; i < psize; i++) { > - BSG_PackConst(s2[i], 4, (BSG_BYTE*)(p2 + i)); > - } > - } > - s += psize * sizeof(BSG_HANDLE); > - } else { // If it's not psize handles, it's psize data. > - if (dst) { > - pdata = (BSG_BYTE *)malloc(sizeof(BSG_BYTE) * psize); > - if (!pdata) > - return -1; > - memcpy(pdata, s, psize); > - } > - s += psize; > - } > - } > - if (dst) > - *(void**) d = pdata; > - > - d += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking! > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return -1; > - } else if (format == 0) {// No flags are set. This is a structure & it should > - // be looked up in the bsg_s_fmt[] > - > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Unpack: cannot find type %d\n", type); > - return -1; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) { > - int fsize = BSG_Unpack_private((BSG_Type) *f, s, dst ? &d:NULL); > - if (fsize <= 0) > - return fsize; > - s += fsize; > - } > - } > - > - if (dst) > - *dst = d; > - return (s - src); > -} > - > -/** > - * Free memory associated with unpacked TCPA structure > - * @type: TCPA structure type > - * @src: (IN) TCPA structure (OUT) end of TCPA structure > - * Note: Destroy should be called on all structures created with Unpack > - * to ensure that any allocated memory is freed > - */ > -static void BSG_Destroy_private(BSG_Type type, BSG_BYTE** src) { > - BSG_BYTE* s = *src; > - > - BSG_UINT32 size = __FMT_MASK_SIZE(type); > - BSG_UINT32 format = __FMT_MASK_FORMAT(type); > - > - if ((src == NULL) || (*src == NULL)) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with NULL src\n"); > - return; > - } > - > - if (format == __FMT_CONST || format == __FMT_DATA) > - s += size; > - else if (format == __FMT_SIZE || format == __FMT_HSIZE) { > - s += size; > - BSG_BYTE* ptr = *(BSG_BYTE**) s; > - free(ptr); > - s += sizeof(void*); > - } else if (format == __FMT_PACKED) { > - > - // this doesn't make sense for unpacking, hence also for Destroy() > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy() called with format __FMT_PACKED. " > - "This does not make sense\n"); > - > - return; > - } else if (format == 0) { > - const BSG_Format* x = find_format (type); > - if (x == NULL) { > - vtpmlogerror(VTPM_LOG_BSG, "BSG_Destroy: cannot find type %d\n", type); > - return; > - } > - > - const BSG_UINT32* f = x->fields; > - for (; *f; f++) > - BSG_Destroy_private((BSG_Type) *f, &s); > - } > - > - *src = s; > -} > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst) > -{ > - const BSG_BYTE* src2 = (const BSG_BYTE*) src; > - return BSG_Pack_private(type, &src2, dst); > -} > - > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst) > -{ > - BSG_BYTE* dst2 = (BSG_BYTE*) dst; > - return BSG_Unpack_private(type, src, dst ? &dst2:NULL); > -} > - > -void BSG_Destroy(BSG_Type type, void* src) > -{ > - BSG_BYTE* src2 = (BSG_BYTE*) src; > - BSG_Destroy_private(type, &src2); > -} > - > -/** > - * Pack a 8/16/32-bit constant into a buffer in big-endian format > - * @val: constant value > - * @size: constant size in bytes (1, 2, or 4) > - * @dst: (OUT) buffer > - */ > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst) { > - bsglog ("BSG: PackConst on %d of size %i into address %p\n", val, size, dst); > - > - switch (size) { > - case 4: > - dst[0] = (BSG_BYTE)((val >> 24) & 0xff); > - dst[1] = (BSG_BYTE)((val >> 16) & 0xff); > - dst[2] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[3] = (BSG_BYTE)(val & 0xff); > - break; > - case 2: > - dst[0] = (BSG_BYTE)((val >> 8) & 0xff); > - dst[1] = (BSG_BYTE)(val & 0xff); > - break; > - case 1: > - dst[0] = (BSG_BYTE)(val & 0xff); > - break; > - } > -} > - > -/** > - * Unpack a 8/16/32-bit constant from a buffer in big-endian format > - * @src: buffer > - * @size: constant size in bytes (1, 2, or 4) > - */ > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size) { > - BSG_UINT32 val = 0; > - > - if (src == NULL) > - return 0; > - > - switch (size) { > - case 4: > - val = (((BSG_UINT32) src[0]) << 24 > - | ((BSG_UINT32) src[1]) << 16 > - | ((BSG_UINT32) src[2]) << 8 > - | (BSG_UINT32) src[3]); > - break; > - case 2: > - val = (((BSG_UINT32) src[0]) << 8 | (BSG_UINT32) src[1]); > - break; > - case 1: > - val = (BSG_UINT32) src[0]; > - break; > - } > - return val; > -} > - > -// Pack a list of parameters. Beware not to send values, but rather you must > -// send a pointer to your values Instead. This includes UINT32's. > -int BSG_PackList( BSG_BYTE* dst, int ParamCount, ... ) { > - int ParamNumber; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size=0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - //Strangeness with int is because gcc wanted an int rather than a enum of ints. > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - size += BSG_Pack(format, val, dst == NULL ? NULL : dst + size); > - } > - > - va_end (paramList); > - > - return size; > -} > - > -// Unpack a list of parameters. > -int BSG_UnpackList( const BSG_BYTE* src, int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type format; > - BSG_BYTE* val = NULL; > - int size = 0; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - format = (BSG_Type) va_arg( paramList, int ); > - val = va_arg( paramList, BSG_BYTE* ); > - > - size += BSG_Unpack(format, src + size, val); > - } > - > - va_end( paramList ); > - > - return size; > -} > - > -// Destroy any memory allocated by calls to unpack > -void BSG_DestroyList(int ParamCount, ... ) { > - int ParamNumber = 0; > - BSG_Type argType; > - BSG_BYTE* paramValue = NULL; > - > - va_list paramList; > - va_start( paramList, ParamCount ); > - > - for( ParamNumber = 1; ParamNumber <= ParamCount; ParamNumber++) { > - argType = (BSG_Type) va_arg( paramList, int ); > - paramValue = va_arg( paramList, BSG_BYTE* ); > - > - BSG_Destroy(argType, paramValue); > - } > - > - va_end( paramList ); > - > - return; > -} > - > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]) { > - int i; > - > - for (i = 0; i < numParams; i++) > - BSG_Destroy (params[i].type, params[i].addr); > - > - return TPM_SUCCESS; > -} > - > - > -// > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later > -// > - > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst) { > - int size = BSG_Pack (type, src, NULL); > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - size = BSG_Pack(type, src, dest); > - *o_dst = dest; > - return size; > -} > - > - > - > -int BSG_PackListMalloc(BSG_BYTE** outBuffer, int ParamCount, ... ) { > - va_list args; > - int size; > - > - va_start (args, ParamCount); > - size = BSG_PackList (NULL, ParamCount, args); > - va_end (args); > - > - BSG_BYTE * dest = (BSG_BYTE*) malloc (size); > - if (dest == NULL) > - return -1; > - > - va_start (args, ParamCount); > - size = BSG_PackList (dest, ParamCount, args); > - va_end (args); > - > - *outBuffer = dest; > - return size; > -} > diff --git a/tools/vtpm_manager/util/bsg.h b/tools/vtpm_manager/util/bsg.h > deleted file mode 100644 > index 0896812..0000000 > --- a/tools/vtpm_manager/util/bsg.h > +++ /dev/null > @@ -1,166 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// bsg.h > -// > -// This file contains API's for the TPM Byte Stream functions > -// > -// ================================================================== > - > -#ifndef __BSG_H__ > -#define __BSG_H__ > - > -#include > -#include "buffer.h" > - > -typedef unsigned int BSG_UINT32; > -typedef unsigned char BSG_BYTE; > - > -// forward decl > -struct pack_const_tuple_t; > - > -struct pack_tuple_t; > - > - > -/** > - * Byte stream generator > - */ > -// this has to be manually kept in sync with the > -// s_fmt array!! > -// but now we have a self-check function which can make sure things are well > -// (if used!) > -typedef enum BSG_Type > -{ > - BSG_TYPE_FIRST = 1, > - BSG_TYPE_UINT32 = 1, // start at 1 so that Type 0 only serves as an > - // unused/special value > - BSG_TYPE_UINT16, > - BSG_TYPE_BYTE, > - BSG_TYPE_BOOL, > - BSG_TPM_SIZE32_DATA, // a 32 bit unsigned size, followed by > - // a pointer to that much data. can pass a > - // struct pack_buf_t as the param > - BSG_TPM_TAG, > - BSG_TPM_HANDLE, > - BSG_TPM_RESULT, > - BSG_TPM_RESOURCE_TYPE, > - BSG_TPM_COMMAND_CODE, > - BSG_TPM_AUTH_DATA_USAGE, > - BSG_TPM_ALGORITHM_ID, > - BSG_TPM_PROTOCOL_ID, > - BSG_TPM_KEY_USAGE, > - BSG_TPM_ENC_SCHEME, > - BSG_TPM_SIG_SCHEME, > - BSG_TPM_MIGRATE_SCHEME, > - BSG_TPM_KEY_FLAGS, > - BSG_TPM_AUTHDATA, > - BSG_TPM_SECRET, > - BSG_TPM_ENCAUTH, > - BSG_TPM_PAYLOAD_TYPE, > - > - BSG_TPM_VERSION, > - BSG_TPM_DIGEST, > - BSG_TPM_COMPOSITE_HASH, > - BSG_TPM_CHOSENID_HASH, > - BSG_TPM_NONCE, > - BSG_TPM_KEY_HANDLE, > - BSG_TPM_KEY_HANDLE_LIST, > - BSG_TPM_KEY_PARMS, > - BSG_TPM_RSA_KEY_PARMS, > - BSG_TPM_STORE_PUBKEY, > - BSG_TPM_PUBKEY, > - BSG_TPM_KEY, > - > - BSG_TPM_MIGRATIONKEYAUTH, > - BSG_TCPA_AUDIT_EVENT, > - BSG_TCPA_EVENT_CERT, > - BSG_TPM_PCR_SELECTION, > - BSG_TPM_PCR_COMPOSITE, > - BSG_TPM_PCR_INFO, > - BSG_TPM_STORED_DATA, > - BSG_TPM_SYMMETRIC_KEY, > - BSG_TPM_STORE_PRIVKEY, > - BSG_TPM_STORE_ASYMKEY, > - BSG_TPM_MIGRATE_ASYMKEY, > - BSG_TPM_QUOTE_INFO, > - BSG_TPM_IDENTITY_CONTENTS, > - BSG_TPM_PCRVALUE, > - BSG_TCPA_PCR_FLAGS, > - BSG_TCS_AUTH, > - > - // this is the BSG_TPM_KEY struct without the encData field > - BSG_TPM_KEY_NONSENSITIVE, > - > - BSG_PACKED, > - > - BSG_TYPE_MAX > -} BSG_Type; > - > -struct pack_const_tuple_t { > - BSG_Type type; > - const void * addr; > -}; > - > - > -typedef struct pack_tuple_t { > - BSG_Type type; > - void * addr; > -} pack_tuple_t; > - > -int BSG_Pack(BSG_Type type, const void* src, BSG_BYTE* dst); > -int BSG_Unpack(BSG_Type type, const BSG_BYTE* src, void* dst); > -void BSG_Destroy(BSG_Type type, void* src); > - > -// wrappers of Pack and PackList which malloc the ouput buffer. to be freed > -// by the caller later. returns size of allocated buffer, or -1 in case > -// allocation failed > -int BSG_PackMalloc (BSG_Type type, const void* src, BSG_BYTE** o_dst); > -int BSG_PackListMalloc (BSG_BYTE** outBuffer, int ParamCount, ... ); > - > -// a va_list version of PackList > -int BSG_PackList(BSG_BYTE* outBuffer, int ParamCount, ... ); > -int BSG_UnpackList(const BSG_BYTE* inBuffer, int ParamCount, ... ); > -void BSG_DestroyList(int ParamCount, ... ); > - > -// wrapper of PackList which uses a buffer_t > -TPM_RESULT BSG_PackListBuf (buffer_t * o_buf, int ParamCount, ...); > - > -// and a tuple version > -TPM_RESULT BSG_DestroyTuple (int numParams, pack_tuple_t params[]); > - > -void BSG_PackConst(BSG_UINT32 val, int size, BSG_BYTE* dst); > -BSG_UINT32 BSG_UnpackConst(const BSG_BYTE* src, int size); > - > -BOOL BSG_static_selfcheck (); > - > -#endif > diff --git a/tools/vtpm_manager/util/buffer.c b/tools/vtpm_manager/util/buffer.c > deleted file mode 100644 > index df48bc2..0000000 > --- a/tools/vtpm_manager/util/buffer.c > +++ /dev/null > @@ -1,226 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > - > -#include > -#include > -#include > -#include > -#include > - > -#include "tcg.h" > -#include "bsg.h" > -#include "buffer.h" > - > -static TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize); > - > -// > -// buffer functions! > -// > - > -TPM_RESULT buffer_init (buffer_t * buf, tpm_size_t initsize, const BYTE* initval) { > - if (initsize == 0) { > - memset(buf, 0, sizeof(*buf)); > - return TPM_SUCCESS; > - } > - > - > - buf->bytes = (BYTE*) malloc (initsize); > - if (buf->bytes == NULL) > - return TPM_RESOURCES; > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - > - if (initval) > - memcpy (buf->bytes, initval, initsize); > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_convert (buffer_t * buf, tpm_size_t initsize, BYTE* initval) { > - > - buf->size = initsize; > - buf->alloc_size = initsize; > - buf->bytes = initval; > - > - buf->is_owner = TRUE; > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src) { > - TPM_RESULT status = buffer_init (buf, src->size, src->bytes); > - buf->is_owner = TRUE; > - > - return status; > -} > - > - > - > -// make an alias to a constant array > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val) { > - // TODO: try to enforce the const things somehow! > - buf->bytes = (BYTE*) val; > - buf->size = size; > - buf->alloc_size = 0; // this field is now unneeded > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t len) { > - if (offset + len > b->size) { > - return TPM_NOSPACE; > - } > - > - buf->bytes = b->bytes + offset; > - buf->size = len > 0 ? len : b->size - offset; > - > - //VS/ buf->alloc_size = 0; > - if (len ==0) > - buf->alloc_size = b->alloc_size - offset; > - else > - buf->alloc_size = MIN(b->alloc_size - offset, len); > - > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > -// make an alias buffer_t into bytestream, with given length > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, tpm_size_t size, BYTE* val) { > - > - buf->size = size; > - buf->alloc_size = size; > - buf->bytes = val; > - > - buf->is_owner = FALSE; > - > - return TPM_SUCCESS; > -} > - > - > - > -// copy into the start of dest > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src) > -{ > - TPM_RESULT status = TPM_SUCCESS; > - > - if (dest->alloc_size < src->size) { > - TPMTRYRETURN( buffer_priv_realloc (dest, src->size) ); > - } > - > - memcpy (dest->bytes, src->bytes, src->size); > - dest->size = src->size; > - > - //VS/ dest->is_owner = TRUE; > - > - abort_egress: > - > - return status; > -} > - > - > - > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b) { > - return (a->size == b->size && memcmp (a->bytes, b->bytes, a->size) == 0); > -} > - > - > -void buffer_memset (buffer_t * buf, BYTE b) { > - memset (buf->bytes, b, buf->size); > -} > - > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes) { > - TPM_RESULT status = TPM_SUCCESS; > - > - if (buf->alloc_size < buf->size + len) { > - TPMTRYRETURN( buffer_priv_realloc (buf, buf->size + len) ); > - } > - > - memcpy (buf->bytes + buf->size, bytes, len); > - > - buf->size += len; > - > - goto egress; > - > - abort_egress: > - > - egress: > - > - return status; > -} > - > -tpm_size_t buffer_len (const buffer_t* buf) { > - return buf->size; > -} > - > -TPM_RESULT buffer_free (buffer_t * buf) { > - if (buf && buf->is_owner && buf->bytes != NULL) { > - free (buf->bytes); > - buf->bytes = NULL; > - buf->size = buf->alloc_size = 0; > - > - } > - > - return TPM_SUCCESS; > -} > - > -TPM_RESULT buffer_priv_realloc (buffer_t * buf, tpm_size_t newsize) { > - > - // we want to realloc to twice the size, or the new size, whichever > - // bigger > - > - BYTE * tmpbuf = NULL; > - > - newsize = MAX (buf->alloc_size * 2, newsize); > - > - tmpbuf = (BYTE*) realloc (buf->bytes, newsize); > - if (tmpbuf == NULL) > - return TPM_SIZE; > - > - > - buf->bytes = tmpbuf; > - buf->alloc_size = newsize; > - > - return TPM_SUCCESS; > -} > diff --git a/tools/vtpm_manager/util/buffer.h b/tools/vtpm_manager/util/buffer.h > deleted file mode 100644 > index d8a9abc..0000000 > --- a/tools/vtpm_manager/util/buffer.h > +++ /dev/null > @@ -1,95 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_BUFFER_H__ > -#define __VTPM_BUFFER_H__ > - > -#include // for pointer NULL > -#include "tcg.h" > - > -typedef UINT32 tpm_size_t; > - > -// first version, probably will be expanded... > - > -#define NULL_BUF {0,0,0,0} > - > -typedef struct { > - // private!! > - tpm_size_t size, alloc_size; > - BYTE * bytes; > - > - BOOL is_owner; // do we own this buffer, and need to free it? > -} buffer_t; > - > -// allocate the buffer if initsize > 0, copying over initval if provided > -TPM_RESULT buffer_init (buffer_t * buf, > - tpm_size_t initsize, > - const BYTE* initval); > - > -// Create a new buffer from a BYTE *. Use buffer_free to destroy original BYTE * > -TPM_RESULT buffer_init_convert (buffer_t * buf, > - tpm_size_t initsize, > - BYTE* initval); > - > -// make an alias to a constant array, no copying > -TPM_RESULT buffer_init_const (buffer_t * buf, tpm_size_t size, const BYTE* val); > - > -// make an alias into buf, with given offset and length > -// if len = 0, make the alias go to the end of buf > -TPM_RESULT buffer_init_alias (buffer_t * buf, const buffer_t * b, > - tpm_size_t offset, tpm_size_t); > - > -// make an alias buffer into a bytestream > -TPM_RESULT buffer_init_alias_convert (buffer_t * buf, > - tpm_size_t size, BYTE* val); > - > -// "copy constructor" > -TPM_RESULT buffer_init_copy (buffer_t * buf, const buffer_t * src); > - > - > -// copy into the start of a > -TPM_RESULT buffer_copy (buffer_t * dest, const buffer_t* src); > - > -// are they equal? > -BOOL buffer_eq (const buffer_t * a, const buffer_t * b); > - > -// set the buffer to a constant byte > -void buffer_memset (buffer_t * buf, BYTE b); > - > -tpm_size_t buffer_len (const buffer_t* buf); > - > -TPM_RESULT buffer_free (buffer_t * buf); > - > -TPM_RESULT buffer_append_raw (buffer_t * buf, tpm_size_t len, const BYTE* bytes); > - > -#endif // _TOOLS_H_ > diff --git a/tools/vtpm_manager/util/hashtable.c b/tools/vtpm_manager/util/hashtable.c > deleted file mode 100644 > index aff0e2b..0000000 > --- a/tools/vtpm_manager/util/hashtable.c > +++ /dev/null > @@ -1,316 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.c > - * - tools/blktap2/drivers/hashtable.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include > -#include > -#include > -#include > - > -/* > -Credit for primes table: Aaron Krowne > - http://br.endernet.org/~akrowne/ > - http://planetmath.org/encyclopedia/GoodHashTablePrimes.html > -*/ > -static const unsigned int primes[] = { > -53, 97, 193, 389, > -769, 1543, 3079, 6151, > -12289, 24593, 49157, 98317, > -196613, 393241, 786433, 1572869, > -3145739, 6291469, 12582917, 25165843, > -50331653, 100663319, 201326611, 402653189, > -805306457, 1610612741 > -}; > -const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); > -const float max_load_factor = 0.65; > - > -/*****************************************************************************/ > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashf) (void*), > - int (*eqf) (void*,void*)) > -{ > - struct hashtable *h; > - unsigned int pindex, size = primes[0]; > - /* Check requested hashtable isn't too large */ > - if (minsize > (1u << 30)) return NULL; > - /* Enforce size as prime */ > - for (pindex=0; pindex < prime_table_length; pindex++) { > - if (primes[pindex] > minsize) { size = primes[pindex]; break; } > - } > - h = (struct hashtable *)malloc(sizeof(struct hashtable)); > - if (NULL == h) return NULL; /*oom*/ > - h->table = (struct entry **)malloc(sizeof(struct entry*) * size); > - if (NULL == h->table) { free(h); return NULL; } /*oom*/ > - memset(h->table, 0, size * sizeof(struct entry *)); > - h->tablelength = size; > - h->primeindex = pindex; > - h->entrycount = 0; > - h->hashfn = hashf; > - h->eqfn = eqf; > - h->loadlimit = (unsigned int) ceil(size * max_load_factor); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_init(&h->mutex, NULL); > -#endif > - return h; > -} > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k) > -{ > - unsigned int i = h->hashfn(k); > - i += ~(i << 9); > - i ^= ((i >> 14) | (i << 18)); /* >>> */ > - i += (i << 4); > - i ^= ((i >> 10) | (i << 22)); /* >>> */ > - return i; > -} > - > -/*****************************************************************************/ > -static int > -hashtable_expand(struct hashtable *h) > -{ > - /* Double the size of the table to accomodate more entries */ > - struct entry **newtable; > - struct entry *e; > - struct entry **pE; > - unsigned int newsize, i, index; > - /* Check we're not hitting max capacity */ > - if (h->primeindex == (prime_table_length - 1)) return 0; > - newsize = primes[++(h->primeindex)]; > - > - newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); > - if (NULL != newtable) > - { > - memset(newtable, 0, newsize * sizeof(struct entry *)); > - /* This algorithm is not 'stable'. ie. it reverses the list > - * when it transfers entries between the tables */ > - for (i = 0; i < h->tablelength; i++) { > - while (NULL != (e = h->table[i])) { > - h->table[i] = e->next; > - index = indexFor(newsize,e->h); > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - free(h->table); > - h->table = newtable; > - } > - /* Plan B: realloc instead */ > - else > - { > - newtable = (struct entry **) > - realloc(h->table, newsize * sizeof(struct entry *)); > - if (NULL == newtable) { (h->primeindex)--; return 0; } > - h->table = newtable; > - memset(newtable[h->tablelength], 0, newsize - h->tablelength); > - for (i = 0; i < h->tablelength; i++) { > - for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { > - index = indexFor(newsize,e->h); > - if (index == i) > - { > - pE = &(e->next); > - } > - else > - { > - *pE = e->next; > - e->next = newtable[index]; > - newtable[index] = e; > - } > - } > - } > - } > - h->tablelength = newsize; > - h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); > - return -1; > -} > - > -/*****************************************************************************/ > -unsigned int > -hashtable_count(struct hashtable *h) > -{ > - unsigned int count; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - count = h->entrycount; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return count; > -} > - > -/*****************************************************************************/ > -int > -hashtable_insert(struct hashtable *h, void *k, void *v) > -{ > - /* This method allows duplicate keys - but they shouldn't be used */ > - unsigned int index; > - struct entry *e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - if (++(h->entrycount) > h->loadlimit) > - { > - /* Ignore the return value. If expand fails, we should > - * still try cramming just this value into the existing table > - * -- we may not have memory for a larger table, but one more > - * element may be ok. Next time we insert, we'll try expanding again.*/ > - hashtable_expand(h); > - } > - e = (struct entry *)malloc(sizeof(struct entry)); > - if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ > - e->h = hash(h,k); > - index = indexFor(h->tablelength,e->h); > - e->k = k; > - e->v = v; > - e->next = h->table[index]; > - h->table[index] = e; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return -1; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_search(struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - unsigned int hashvalue, index; > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - e = h->table[index]; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return e->v; > - } > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -void * /* returns value associated with key */ > -hashtable_remove(struct hashtable *h, void *k) > -{ > - /* TODO: consider compacting the table when the load factor drops enough, > - * or provide a 'compact' method. */ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e; > - struct entry **pE; > - void *v; > - unsigned int hashvalue, index; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hash(h,k)); > - pE = &(h->table[index]); > - e = *pE; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - *pE = e->next; > - h->entrycount--; > - v = e->v; > - freekey(e->k); > - free(e); > - return v; > - } > - pE = &(e->next); > - e = e->next; > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return NULL; > -} > - > -/*****************************************************************************/ > -/* destroy */ > -void > -hashtable_destroy(struct hashtable *h, int free_values) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - unsigned int i; > - struct entry *e, *f; > - struct entry **table = h->table; > - if (free_values) > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f->v); free(f); } > - } > - } > - else > - { > - for (i = 0; i < h->tablelength; i++) > - { > - e = table[i]; > - while (NULL != e) > - { f = e; e = e->next; freekey(f->k); free(f); } > - } > - } > - free(h->table); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_destroy(&h->mutex); > -#endif > - free(h); > -} > diff --git a/tools/vtpm_manager/util/hashtable.h b/tools/vtpm_manager/util/hashtable.h > deleted file mode 100644 > index dedc60a..0000000 > --- a/tools/vtpm_manager/util/hashtable.h > +++ /dev/null > @@ -1,204 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable.h > - * - tools/blktap2/drivers/hashtable.h > - */ > - > -#ifndef __HASHTABLE_CWC22_H__ > -#define __HASHTABLE_CWC22_H__ > - > -struct hashtable; > - > -/* Example of use: > - * > - * struct hashtable *h; > - * struct some_key *k; > - * struct some_value *v; > - * > - * static unsigned int hash_from_key_fn( void *k ); > - * static int keys_equal_fn ( void *key1, void *key2 ); > - * > - * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); > - * k = (struct some_key *) malloc(sizeof(struct some_key)); > - * v = (struct some_value *) malloc(sizeof(struct some_value)); > - * > - * (initialise k and v to suitable values) > - * > - * if (! hashtable_insert(h,k,v) ) > - * { exit(-1); } > - * > - * if (NULL == (found = hashtable_search(h,k) )) > - * { printf("not found!"); } > - * > - * if (NULL == (found = hashtable_remove(h,k) )) > - * { printf("Not found\n"); } > - * > - */ > - > -/* Macros may be used to define type-safe(r) hashtable access functions, with > - * methods specialized to take known key and value types as parameters. > - * > - * Example: > - * > - * Insert this at the start of your file: > - * > - * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); > - * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); > - * > - * This defines the functions 'insert_some', 'search_some' and 'remove_some'. > - * These operate just like hashtable_insert etc., with the same parameters, > - * but their function signatures have 'struct some_key *' rather than > - * 'void *', and hence can generate compile time errors if your program is > - * supplying incorrect data as a key (and similarly for value). > - * > - * Note that the hash and key equality functions passed to create_hashtable > - * still take 'void *' parameters instead of 'some key *'. This shouldn't be > - * a difficult issue as they're only defined and passed once, and the other > - * functions will ensure that only valid keys are supplied to them. > - * > - * The cost for this checking is increased code size and runtime overhead > - * - if performance is important, it may be worth switching back to the > - * unsafe methods once your program has been debugged with the safe methods. > - * This just requires switching to some simple alternative defines - eg: > - * #define insert_some hashtable_insert > - * > - */ > - > -/***************************************************************************** > - * create_hashtable > - > - * @name create_hashtable > - * @param minsize minimum initial size of hashtable > - * @param hashfunction function for hashing keys > - * @param key_eq_fn function for determining key equality > - * @return newly created hashtable or NULL on failure > - */ > - > -struct hashtable * > -create_hashtable(unsigned int minsize, > - unsigned int (*hashfunction) (void*), > - int (*key_eq_fn) (void*,void*)); > - > -/***************************************************************************** > - * hashtable_insert > - > - * @name hashtable_insert > - * @param h the hashtable to insert into > - * @param k the key - hashtable claims ownership and will free on removal > - * @param v the value - does not claim ownership > - * @return non-zero for successful insertion > - * > - * This function will cause the table to expand if the insertion would take > - * the ratio of entries to table size over the maximum load factor. > - * > - * This function does not check for repeated insertions with a duplicate key. > - * The value returned when using a duplicate key is undefined -- when > - * the hashtable changes size, the order of retrieval of duplicate key > - * entries is reversed. > - * If in doubt, remove before insert. > - */ > - > -int > -hashtable_insert(struct hashtable *h, void *k, void *v); > - > -#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ > -int fnname (struct hashtable *h, keytype *k, valuetype *v) \ > -{ \ > - return hashtable_insert(h,k,v); \ > -} > - > -/***************************************************************************** > - * hashtable_search > - > - * @name hashtable_search > - * @param h the hashtable to search > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * > -hashtable_search(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_search(h,k)); \ > -} > - > -/***************************************************************************** > - * hashtable_remove > - > - * @name hashtable_remove > - * @param h the hashtable to remove the item from > - * @param k the key to search for - does not claim ownership > - * @return the value associated with the key, or NULL if none found > - */ > - > -void * /* returns value */ > -hashtable_remove(struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ > -valuetype * fnname (struct hashtable *h, keytype *k) \ > -{ \ > - return (valuetype *) (hashtable_remove(h,k)); \ > -} > - > - > -/***************************************************************************** > - * hashtable_count > - > - * @name hashtable_count > - * @param h the hashtable > - * @return the number of items stored in the hashtable > - */ > -unsigned int > -hashtable_count(struct hashtable *h); > - > - > -/***************************************************************************** > - * hashtable_destroy > - > - * @name hashtable_destroy > - * @param h the hashtable > - * @param free_values whether to call 'free' on the remaining values > - */ > - > -void > -hashtable_destroy(struct hashtable *h, int free_values); > - > -#endif /* __HASHTABLE_CWC22_H__ */ > diff --git a/tools/vtpm_manager/util/hashtable_itr.c b/tools/vtpm_manager/util/hashtable_itr.c > deleted file mode 100644 > index dcf42c8..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.c > +++ /dev/null > @@ -1,236 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.c > - */ > - > -#include "hashtable.h" > -#include "hashtable_private.h" > -#include "hashtable_itr.h" > -#include /* defines NULL */ > - > -/*****************************************************************************/ > -/* hashtable_iterator - iterator constructor */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h) > -{ > - unsigned int i, tablelength; > - struct hashtable_itr *itr = (struct hashtable_itr *) > - malloc(sizeof(struct hashtable_itr)); > - if (NULL == itr) return NULL; > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - itr->h = h; > - itr->e = NULL; > - itr->parent = NULL; > - tablelength = h->tablelength; > - itr->index = tablelength; > - if (0 == h->entrycount) { > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > - } > - > - for (i = 0; i < tablelength; i++) > - { > - if (NULL != h->table[i]) > - { > - itr->e = h->table[i]; > - itr->index = i; > - break; > - } > - } > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return itr; > -} > - > -/*****************************************************************************/ > -/* key - return the key of the (key,value) pair at the current position */ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void * > -hashtable_iterator_key(struct hashtable_itr *i) > -{ return i->e->k; } > - > -void * > -hashtable_iterator_value(struct hashtable_itr *i) > -{ return i->e->v; } > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - unsigned int j,tablelength; > - struct entry **table; > - struct entry *next; > - int ret; > - if (NULL == itr->e) { /* stupidity check */ > - ret = 0; > - goto egress; > - } > - > - next = itr->e->next; > - if (NULL != next) > - { > - itr->parent = itr->e; > - itr->e = next; > - ret = -1; > - goto egress; > - } > - > - tablelength = itr->h->tablelength; > - itr->parent = NULL; > - if (tablelength <= (j = ++(itr->index))) > - { > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - table = itr->h->table; > - while (NULL == (next = table[j])) > - { > - if (++j >= tablelength) > - { > - itr->index = tablelength; > - itr->e = NULL; > - ret = 0; > - goto egress; > - } > - } > - itr->index = j; > - itr->e = next; > - ret = -1; > - > - egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -/* remove - remove the entry at the current iterator position > - * and advance the iterator, if there is a successive > - * element. > - * If you want the value, read it before you remove: > - * beware memory leaks if you don't. > - * Returns zero if end of iteration. */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&itr->h->mutex); > -#endif > - struct entry *remember_e, *remember_parent; > - int ret; > - > - /* Do the removal */ > - if (NULL == (itr->parent)) > - { > - /* element is head of a chain */ > - itr->h->table[itr->index] = itr->e->next; > - } else { > - /* element is mid-chain */ > - itr->parent->next = itr->e->next; > - } > - /* itr->e is now outside the hashtable */ > - remember_e = itr->e; > - itr->h->entrycount--; > - freekey(remember_e->k); > - > - /* Advance the iterator, correcting the parent */ > - remember_parent = itr->parent; > - ret = hashtable_iterator_advance(itr); > - if (itr->parent == remember_e) { itr->parent = remember_parent; } > - free(remember_e); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&itr->h->mutex); > -#endif > - return ret; > -} > - > -/*****************************************************************************/ > -int /* returns zero if not found */ > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k) > -{ > -#ifdef HASHTABLE_THREADED > - pthread_mutex_lock(&h->mutex); > -#endif > - struct entry *e, *parent; > - unsigned int hashvalue, index; > - int ret; > - > - hashvalue = hash(h,k); > - index = indexFor(h->tablelength,hashvalue); > - > - e = h->table[index]; > - parent = NULL; > - while (NULL != e) > - { > - /* Check hash value to short circuit heavier comparison */ > - if ((hashvalue == e->h) && (h->eqfn(k, e->k))) > - { > - itr->index = index; > - itr->e = e; > - itr->parent = parent; > - itr->h = h; > - ret= -1; > - goto egress; > - } > - parent = e; > - e = e->next; > - } > - ret = 0; > - > -egress: > -#ifdef HASHTABLE_THREADED > - pthread_mutex_unlock(&h->mutex); > -#endif > - return ret; > -} > diff --git a/tools/vtpm_manager/util/hashtable_itr.h b/tools/vtpm_manager/util/hashtable_itr.h > deleted file mode 100644 > index 35654e0..0000000 > --- a/tools/vtpm_manager/util/hashtable_itr.h > +++ /dev/null > @@ -1,109 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/blktap2/drivers/hashtable_itr.h > - */ > - > - > -#ifndef __HASHTABLE_ITR_CWC22__ > -#define __HASHTABLE_ITR_CWC22__ > -#include "hashtable.h" > -#include "hashtable_private.h" /* needed to enable inlining */ > - > -/*****************************************************************************/ > -/* This struct is only concrete here to allow the inlining of two of the > - * accessor functions. */ > -struct hashtable_itr > -{ > - struct hashtable *h; > - struct entry *e; > - struct entry *parent; > - unsigned int index; > -}; > - > - > -/*****************************************************************************/ > -/* hashtable_iterator > - */ > - > -struct hashtable_itr * > -hashtable_iterator(struct hashtable *h); > - > -/*****************************************************************************/ > -/* hashtable_iterator_key > - * - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_key(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* value - return the value of the (key,value) pair at the current position */ > - > -void *hashtable_iterator_value(struct hashtable_itr *i); > - > -/*****************************************************************************/ > -/* advance - advance the iterator to the next element > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_advance(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* remove - remove current element and advance the iterator to the next element > - * NB: if you need the value to free it, read it before > - * removing. ie: beware memory leaks! > - * returns zero if advanced to end of table */ > - > -int > -hashtable_iterator_remove(struct hashtable_itr *itr); > - > -/*****************************************************************************/ > -/* search - overwrite the supplied iterator, to point to the entry > - * matching the supplied key. > - h points to the hashtable to be searched. > - * returns zero if not found. */ > -int > -hashtable_iterator_search(struct hashtable_itr *itr, > - struct hashtable *h, void *k); > - > -#define DEFINE_HASHTABLE_ITERATOR_SEARCH(fnname, keytype) \ > -int fnname (struct hashtable_itr *i, struct hashtable *h, keytype *k) \ > -{ \ > - return (hashtable_iterator_search(i,h,k)); \ > -} > - > - > - > -#endif /* __HASHTABLE_ITR_CWC22__*/ > diff --git a/tools/vtpm_manager/util/hashtable_private.h b/tools/vtpm_manager/util/hashtable_private.h > deleted file mode 100644 > index d87a7f9..0000000 > --- a/tools/vtpm_manager/util/hashtable_private.h > +++ /dev/null > @@ -1,96 +0,0 @@ > -/* > - * Copyright (c) 2005, Intel Corp > - * Copyright (c) 2002, Christopher Clark > - * All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * > - * * Neither the name of the original author; nor the names of any contributors > - * may be used to endorse or promote products derived from this software > - * without specific prior written permission. > - * > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER > - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, > - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, > - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR > - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -*/ > - > -/* > - * There are duplicates of this code in: > - * - tools/xenstore/hashtable_private.h > - * - tools/blktap2/drivers/hashtable_private.h > - */ > - > -#ifndef __HASHTABLE_PRIVATE_CWC22_H__ > -#define __HASHTABLE_PRIVATE_CWC22_H__ > - > -#include "hashtable.h" > -#ifdef HASHTABLE_THREADED > -#include > -#endif > - > -/*****************************************************************************/ > -struct entry > -{ > - void *k, *v; > - unsigned int h; > - struct entry *next; > -}; > - > -struct hashtable { > - unsigned int tablelength; > - struct entry **table; > - unsigned int entrycount; > - unsigned int loadlimit; > - unsigned int primeindex; > - unsigned int (*hashfn) (void *k); > - int (*eqfn) (void *k1, void *k2); > -#ifdef HASHTABLE_THREADED > - pthread_mutex_t mutex; > -#endif > -}; > - > -/*****************************************************************************/ > -unsigned int > -hash(struct hashtable *h, void *k); > - > -/*****************************************************************************/ > -/* indexFor */ > -static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) { > - return (hashvalue % tablelength); > -}; > - > -/* Only works if tablelength == 2^N */ > -/*static inline unsigned int > -indexFor(unsigned int tablelength, unsigned int hashvalue) > -{ > - return (hashvalue & (tablelength - 1u)); > -} > -*/ > - > -/*****************************************************************************/ > -#define freekey(X) free(X) > -/*define freekey(X) ; */ > - > - > -/*****************************************************************************/ > - > -#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ > diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c > deleted file mode 100644 > index 75fe91a..0000000 > --- a/tools/vtpm_manager/util/log.c > +++ /dev/null > @@ -1,142 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#include > -#include > -#include > - > -#include "buffer.h" > -#include "tcg.h" > - > -// Helper code for the consts, eg. to produce messages for error codes. > - > -typedef struct error_code_entry_t { > - TPM_RESULT code; > - char * code_name; > - char * msg; > -} error_code_entry_t; > - > -static const error_code_entry_t error_msgs [] = { > - { TPM_SUCCESS, "TPM_SUCCESS", "Successful completion of the operation" }, > - { TPM_AUTHFAIL, "TPM_AUTHFAIL", "Authentication failed" }, > - { TPM_BADINDEX, "TPM_BADINDEX", "The index to a PCR, DIR or other register is incorrect" }, > - { TPM_BAD_PARAMETER, "TPM_BAD_PARAMETER", "One or more parameter is bad" }, > - { TPM_AUDITFAILURE, "TPM_AUDITFAILURE", "An operation completed successfully but the auditing of that operation failed." }, > - { TPM_CLEAR_DISABLED, "TPM_CLEAR_DISABLED", "The clear disable flag is set and all clear operations now require physical access" }, > - { TPM_DEACTIVATED, "TPM_DEACTIVATED", "The TPM is deactivated" }, > - { TPM_DISABLED, "TPM_DISABLED", "The TPM is disabled" }, > - { TPM_DISABLED_CMD, "TPM_DISABLED_CMD", "The target command has been disabled" }, > - { TPM_FAIL, "TPM_FAIL", "The operation failed" }, > - { TPM_BAD_ORDINAL, "TPM_BAD_ORDINAL", "The ordinal was unknown or inconsistent" }, > - { TPM_INSTALL_DISABLED, "TPM_INSTALL_DISABLED", "The ability to install an owner is disabled" }, > - { TPM_INVALID_KEYHANDLE, "TPM_INVALID_KEYHANDLE", "The key handle presented was invalid" }, > - { TPM_KEYNOTFOUND, "TPM_KEYNOTFOUND", "The target key was not found" }, > - { TPM_INAPPROPRIATE_ENC, "TPM_INAPPROPRIATE_ENC", "Unacceptable encryption scheme" }, > - { TPM_MIGRATEFAIL, "TPM_MIGRATEFAIL", "Migration authorization failed" }, > - { TPM_INVALID_PCR_INFO, "TPM_INVALID_PCR_INFO", "PCR information could not be interpreted" }, > - { TPM_NOSPACE, "TPM_NOSPACE", "No room to load key." }, > - { TPM_NOSRK, "TPM_NOSRK", "There is no SRK set" }, > - { TPM_NOTSEALED_BLOB, "TPM_NOTSEALED_BLOB", "An encrypted blob is invalid or was not created by this TPM" }, > - { TPM_OWNER_SET, "TPM_OWNER_SET", "There is already an Owner" }, > - { TPM_RESOURCES, "TPM_RESOURCES", "The TPM has insufficient internal resources to perform the requested action." }, > - { TPM_SHORTRANDOM, "TPM_SHORTRANDOM", "A random string was too short" }, > - { TPM_SIZE, "TPM_SIZE", "The TPM does not have the space to perform the operation." }, > - { TPM_WRONGPCRVAL, "TPM_WRONGPCRVAL", "The named PCR value does not match the current PCR value." }, > - { TPM_BAD_PARAM_SIZE, "TPM_BAD_PARAM_SIZE", "The paramSize argument to the command has the incorrect value" }, > - { TPM_SHA_THREAD, "TPM_SHA_THREAD", "There is no existing SHA-1 thread." }, > - { TPM_SHA_ERROR, "TPM_SHA_ERROR", "The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error." }, > - { TPM_FAILEDSELFTEST, "TPM_FAILEDSELFTEST", "Self-test has failed and the TPM has shutdown." }, > - { TPM_AUTH2FAIL, "TPM_AUTH2FAIL", "The authorization for the second key in a 2 key function failed authorization" }, > - { TPM_BADTAG, "TPM_BADTAG", "The tag value sent to for a command is invalid" }, > - { TPM_IOERROR, "TPM_IOERROR", "An IO error occurred transmitting information to the TPM" }, > - { TPM_ENCRYPT_ERROR, "TPM_ENCRYPT_ERROR", "The encryption process had a problem." }, > - { TPM_DECRYPT_ERROR, "TPM_DECRYPT_ERROR", "The decryption process did not complete." }, > - { TPM_INVALID_AUTHHANDLE, "TPM_INVALID_AUTHHANDLE", "An invalid handle was used." }, > - { TPM_NO_ENDORSEMENT, "TPM_NO_ENDORSEMENT", "The TPM does not a EK installed" }, > - { TPM_INVALID_KEYUSAGE, "TPM_INVALID_KEYUSAGE", "The usage of a key is not allowed" }, > - { TPM_WRONG_ENTITYTYPE, "TPM_WRONG_ENTITYTYPE", "The submitted entity type is not allowed" }, > - { TPM_INVALID_POSTINIT, "TPM_INVALID_POSTINIT", "The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup" }, > - { TPM_INAPPROPRIATE_SIG, "TPM_INAPPROPRIATE_SIG", "Signed data cannot include additional DER information" }, > - { TPM_BAD_KEY_PROPERTY, "TPM_BAD_KEY_PROPERTY", "The key properties in TPM_KEY_PARMs are not supported by this TPM" }, > - > - { TPM_BAD_MIGRATION, "TPM_BAD_MIGRATION", "The migration properties of this key are incorrect." }, > - { TPM_BAD_SCHEME, "TPM_BAD_SCHEME", "The signature or encryption scheme for this key is incorrect or not permitted in this situation." }, > - { TPM_BAD_DATASIZE, "TPM_BAD_DATASIZE", "The size of the data (or blob) parameter is bad or inconsistent with the referenced key" }, > - { TPM_BAD_MODE, "TPM_BAD_MODE", "A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob." }, > - { TPM_BAD_PRESENCE, "TPM_BAD_PRESENCE", "Either the physicalPresence or physicalPresenceLock bits have the wrong value" }, > - { TPM_BAD_VERSION, "TPM_BAD_VERSION", "The TPM cannot perform this version of the capability" }, > - { TPM_NO_WRAP_TRANSPORT, "TPM_NO_WRAP_TRANSPORT", "The TPM does not allow for wrapped transport sessions" }, > - { TPM_AUDITFAIL_UNSUCCESSFUL, "TPM_AUDITFAIL_UNSUCCESSFUL", "TPM audit construction failed and the underlying command was returning a failure code also" }, > - { TPM_AUDITFAIL_SUCCESSFUL, "TPM_AUDITFAIL_SUCCESSFUL", "TPM audit construction failed and the underlying command was returning success" }, > - { TPM_NOTRESETABLE, "TPM_NOTRESETABLE", "Attempt to reset a PCR register that does not have the resettable attribute" }, > - { TPM_NOTLOCAL, "TPM_NOTLOCAL", "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport" }, > - { TPM_BAD_TYPE, "TPM_BAD_TYPE", "Make identity blob not properly typed" }, > - { TPM_INVALID_RESOURCE, "TPM_INVALID_RESOURCE", "When saving context identified resource type does not match actual resource" }, > - { TPM_NOTFIPS, "TPM_NOTFIPS", "The TPM is attempting to execute a command only available when in FIPS mode" }, > - { TPM_INVALID_FAMILY, "TPM_INVALID_FAMILY", "The command is attempting to use an invalid family ID" }, > - { TPM_NO_NV_PERMISSION, "TPM_NO_NV_PERMISSION", "The permission to manipulate the NV storage is not available" }, > - { TPM_REQUIRES_SIGN, "TPM_REQUIRES_SIGN", "The operation requires a signed command" }, > - { TPM_KEY_NOTSUPPORTED, "TPM_KEY_NOTSUPPORTED", "Wrong operation to load an NV key" }, > - { TPM_AUTH_CONFLICT, "TPM_AUTH_CONFLICT", "NV_LoadKey blob requires both owner and blob authorization" }, > - { TPM_AREA_LOCKED, "TPM_AREA_LOCKED", "The NV area is locked and not writtable" }, > - { TPM_BAD_LOCALITY, "TPM_BAD_LOCALITY", "The locality is incorrect for the attempted operation" }, > - { TPM_READ_ONLY, "TPM_READ_ONLY", "The NV area is read only and can't be written to" }, > - { TPM_PER_NOWRITE, "TPM_PER_NOWRITE", "There is no protection on the write to the NV area" }, > - { TPM_FAMILYCOUNT, "TPM_FAMILYCOUNT", "The family count value does not match" }, > - { TPM_WRITE_LOCKED, "TPM_WRITE_LOCKED", "The NV area has already been written to" }, > - { TPM_BAD_ATTRIBUTES, "TPM_BAD_ATTRIBUTES", "The NV area attributes conflict" }, > - { TPM_INVALID_STRUCTURE, "TPM_INVALID_STRUCTURE", "The structure tag and version are invalid or inconsistent" }, > - { TPM_KEY_OWNER_CONTROL, "TPM_KEY_OWNER_CONTROL", "The key is under control of the TPM Owner and can only be evicted by the TPM Owner." }, > - { TPM_BAD_COUNTER, "TPM_BAD_COUNTER", "The counter handle is incorrect" }, > - { TPM_NOT_FULLWRITE, "TPM_NOT_FULLWRITE", "The write is not a complete write of the area" }, > - { TPM_CONTEXT_GAP, "TPM_CONTEXT_GAP", "The gap between saved context counts is too large" }, > - { TPM_MAXNVWRITES, "TPM_MAXNVWRITES", "The maximum number of NV writes without an owner has been exceeded" }, > - { TPM_NOOPERATOR, "TPM_NOOPERATOR", "No operator authorization value is set" }, > - { TPM_RESOURCEMISSING, "TPM_RESOURCEMISSING", "The resource pointed to by context is not loaded" }, > - { TPM_DELEGATE_LOCK, "TPM_DELEGATE_LOCK", "The delegate administration is locked" }, > - { TPM_DELEGATE_FAMILY, "TPM_DELEGATE_FAMILY", "Attempt to manage a family other then the delegated family" }, > - { TPM_DELEGATE_ADMIN, "TPM_DELEGATE_ADMIN", "Delegation table management not enabled" }, > - { TPM_TRANSPORT_EXCLUSIVE, "TPM_TRANSPORT_EXCLUSIVE", "There was a command executed outside of an exclusive transport session" }, > -}; > - > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code) { > - // just do a linear scan for now > - unsigned i; > - for (i = 0; i < sizeof(error_msgs)/sizeof(error_msgs[0]); i++) > - if (code == error_msgs[i].code) > - return error_msgs[i].code_name; > - > - return("Unknown Error Code"); > -} > diff --git a/tools/vtpm_manager/util/log.h b/tools/vtpm_manager/util/log.h > deleted file mode 100644 > index 1f15f5b..0000000 > --- a/tools/vtpm_manager/util/log.h > +++ /dev/null > @@ -1,94 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > - > -#ifndef __VTPM_LOG_H__ > -#define __VTPM_LOG_H__ > - > -#include // for uint32_t > -#include // for pointer NULL > - > -// =========================== LOGGING ============================== > - > -// the logging module numbers > -#define VTPM_LOG_CRYPTO 1 > -#define VTPM_LOG_BSG 2 > -#define VTPM_LOG_TXDATA 3 > -#define VTPM_LOG_TCS 4 > -#define VTPM_LOG_TCS_DEEP 5 > -#define VTPM_LOG_VTSP 6 > -#define VTPM_LOG_VTPM 7 > -#define VTPM_LOG_VTPM_DEEP 8 > -#define VTPM_LOG_VTSP_DEEP 9 > - > -static char *module_names[] = { "", > - "CRYPTO", > - "BSG", > - "TXDATA", > - "TCS", > - "TCS", > - "VTSP", > - "VTPM", > - "VTPM", > - "VTSP" > - }; > - > -// Default to standard logging > -#ifndef LOGGING_MODULES > -#define LOGGING_MODULES (BITMASK(VTPM_LOG_VTPM)) > -#endif > - > -// bit-access macros > -#define BITMASK(idx) ( 1U << (idx) ) > -#define GETBIT(num,idx) ( ((num) & BITMASK(idx)) >> idx ) > -#define SETBIT(num,idx) (num) |= BITMASK(idx) > -#define CLEARBIT(num,idx) (num) &= ( ~ BITMASK(idx) ) > - > -#define vtpmloginfo(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, "INFO[%s]: " fmt, module_names[module], ##args); \ > - } > - > -#define vtpmloginfomore(module, fmt, args...) \ > - if (GETBIT (LOGGING_MODULES, module) == 1) { \ > - fprintf (stdout, fmt,##args); \ > - } > - > -#define vtpmlogerror(module, fmt, args...) \ > - fprintf (stderr, "ERROR[%s]: " fmt, module_names[module], ##args); > - > -//typedef UINT32 tpm_size_t; > - > -// helper function for the error codes: > -const char* tpm_get_error_name (TPM_RESULT code); > - > -#endif // _VTPM_LOG_H_ > diff --git a/tools/vtpm_manager/util/tcg.h b/tools/vtpm_manager/util/tcg.h > deleted file mode 100644 > index 5c42913..0000000 > --- a/tools/vtpm_manager/util/tcg.h > +++ /dev/null > @@ -1,503 +0,0 @@ > -// =================================================================== > -// > -// Copyright (c) 2005, Intel Corp. > -// All rights reserved. > -// > -// Redistribution and use in source and binary forms, with or without > -// modification, are permitted provided that the following conditions > -// are met: > -// > -// * Redistributions of source code must retain the above copyright > -// notice, this list of conditions and the following disclaimer. > -// * Redistributions in binary form must reproduce the above > -// copyright notice, this list of conditions and the following > -// disclaimer in the documentation and/or other materials provided > -// with the distribution. > -// * Neither the name of Intel Corporation nor the names of its > -// contributors may be used to endorse or promote products derived > -// from this software without specific prior written permission. > -// > -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > -// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, > -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > -// OF THE POSSIBILITY OF SUCH DAMAGE. > -// =================================================================== > -// > -// tcg.h > -// > -// This file contains all the structure and type definitions > -// > -// ================================================================== > - > -#ifndef __TCG_H__ > -#define __TCG_H__ > - > -// This pragma is used to disallow structure padding > -#pragma pack(push, 1) > - > -// *************************** TYPEDEFS ********************************* > -typedef unsigned char BYTE; > -typedef unsigned char BOOL; > -typedef unsigned short UINT16; > -typedef unsigned int UINT32; > -typedef unsigned long long UINT64; > - > -typedef UINT32 TPM_RESULT; > -typedef UINT32 TPM_PCRINDEX; > -typedef UINT32 TPM_DIRINDEX; > -typedef UINT32 TPM_HANDLE; > -typedef TPM_HANDLE TPM_AUTHHANDLE; > -typedef TPM_HANDLE TCPA_HASHHANDLE; > -typedef TPM_HANDLE TCPA_HMACHANDLE; > -typedef TPM_HANDLE TCPA_ENCHANDLE; > -typedef TPM_HANDLE TPM_KEY_HANDLE; > -typedef TPM_HANDLE TCPA_ENTITYHANDLE; > -typedef UINT32 TPM_RESOURCE_TYPE; > -typedef UINT32 TPM_COMMAND_CODE; > -typedef UINT16 TPM_PROTOCOL_ID; > -typedef BYTE TPM_AUTH_DATA_USAGE; > -typedef UINT16 TPM_ENTITY_TYPE; > -typedef UINT32 TPM_ALGORITHM_ID; > -typedef UINT16 TPM_KEY_USAGE; > -typedef UINT16 TPM_STARTUP_TYPE; > -typedef UINT32 TPM_CAPABILITY_AREA; > -typedef UINT16 TPM_ENC_SCHEME; > -typedef UINT16 TPM_SIG_SCHEME; > -typedef UINT16 TPM_MIGRATE_SCHEME; > -typedef UINT16 TPM_PHYSICAL_PRESENCE; > -typedef UINT32 TPM_KEY_FLAGS; > - > -#define TPM_DIGEST_SIZE 20 // Don't change this > -typedef BYTE TPM_AUTHDATA[TPM_DIGEST_SIZE]; > -typedef TPM_AUTHDATA TPM_SECRET; > -typedef TPM_AUTHDATA TPM_ENCAUTH; > -typedef BYTE TPM_PAYLOAD_TYPE; > -typedef UINT16 TPM_TAG; > - > -// Data Types of the TCS > -typedef UINT32 TCS_AUTHHANDLE; // Handle addressing a authorization session > -typedef UINT32 TCS_CONTEXT_HANDLE; // Basic context handle > -typedef UINT32 TCS_KEY_HANDLE; // Basic key handle > - > -// ************************* STRUCTURES ********************************** > - > -typedef struct TPM_VERSION { > - BYTE major; > - BYTE minor; > - BYTE revMajor; > - BYTE revMinor; > -} TPM_VERSION; > - > -static const TPM_VERSION TPM_STRUCT_VER_1_1 = { 1,1,0,0 }; > - > -typedef struct TPM_DIGEST { > - BYTE digest[TPM_DIGEST_SIZE]; > -} TPM_DIGEST; > - > -typedef TPM_DIGEST TPM_PCRVALUE; > -typedef TPM_DIGEST TPM_COMPOSITE_HASH; > -typedef TPM_DIGEST TPM_DIRVALUE; > -typedef TPM_DIGEST TPM_HMAC; > -typedef TPM_DIGEST TPM_CHOSENID_HASH; > - > -typedef struct TPM_NONCE { > - BYTE nonce[TPM_DIGEST_SIZE]; > -} TPM_NONCE; > - > -typedef struct TPM_KEY_PARMS { > - TPM_ALGORITHM_ID algorithmID; > - TPM_ENC_SCHEME encScheme; > - TPM_SIG_SCHEME sigScheme; > - UINT32 parmSize; > - BYTE* parms; > -} TPM_KEY_PARMS; > - > -typedef struct TPM_RSA_KEY_PARMS { > - UINT32 keyLength; > - UINT32 numPrimes; > - UINT32 exponentSize; > - BYTE* exponent; > -} TPM_RSA_KEY_PARMS; > - > -typedef struct TPM_STORE_PUBKEY { > - UINT32 keyLength; > - BYTE* key; > -} TPM_STORE_PUBKEY; > - > -typedef struct TPM_PUBKEY { > - TPM_KEY_PARMS algorithmParms; > - TPM_STORE_PUBKEY pubKey; > -} TPM_PUBKEY; > - > -typedef struct TPM_KEY { > - TPM_VERSION ver; > - TPM_KEY_USAGE keyUsage; > - TPM_KEY_FLAGS keyFlags; > - TPM_AUTH_DATA_USAGE authDataUsage; > - TPM_KEY_PARMS algorithmParms; > - UINT32 PCRInfoSize; > - BYTE* PCRInfo; // this should be a TPM_PCR_INFO, or NULL > - TPM_STORE_PUBKEY pubKey; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_KEY; > - > -typedef struct TPM_PCR_SELECTION { > - UINT16 sizeOfSelect; /// in bytes > - BYTE* pcrSelect; > -} TPM_PCR_SELECTION; > - > -typedef struct TPM_PCR_COMPOSITE { > - TPM_PCR_SELECTION select; > - UINT32 valueSize; > - TPM_PCRVALUE* pcrValue; > -} TPM_PCR_COMPOSITE; > - > - > -typedef struct TPM_PCR_INFO { > - TPM_PCR_SELECTION pcrSelection; > - TPM_COMPOSITE_HASH digestAtRelease; > - TPM_COMPOSITE_HASH digestAtCreation; > -} TPM_PCR_INFO; > - > - > -typedef struct TPM_BOUND_DATA { > - TPM_VERSION ver; > - TPM_PAYLOAD_TYPE payload; > - BYTE* payloadData; > -} TPM_BOUND_DATA; > - > -typedef struct TPM_STORED_DATA { > - TPM_VERSION ver; > - UINT32 sealInfoSize; > - BYTE* sealInfo; > - UINT32 encDataSize; > - BYTE* encData; > -} TPM_STORED_DATA; > - > -typedef struct TCS_AUTH { > - TCS_AUTHHANDLE AuthHandle; > - TPM_NONCE NonceOdd; // system > - TPM_NONCE NonceEven; // TPM > - BOOL fContinueAuthSession; > - TPM_AUTHDATA HMAC; > -} TCS_AUTH; > - > -// structures for dealing with sizes followed by buffers in all the > -// TCG structure. > -typedef struct pack_buf_t { > - UINT32 size; > - BYTE * data; > -} pack_buf_t; > - > -typedef struct pack_constbuf_t { > - UINT32 size; > - const BYTE* data; > -} pack_constbuf_t; > - > - > - > -// **************************** CONSTANTS ********************************* > - > -// BOOL values > -#define TRUE 0x01 > -#define FALSE 0x00 > - > -#define TCPA_MAX_BUFFER_LENGTH 0x2000 > - > -// > -// TPM_COMMAND_CODE values > -#define TPM_PROTECTED_ORDINAL 0x00000000UL > -#define TPM_UNPROTECTED_ORDINAL 0x80000000UL > -#define TPM_CONNECTION_ORDINAL 0x40000000UL > -#define TPM_VENDOR_ORDINAL 0x20000000UL > - > -#define TPM_ORD_OIAP (10UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OSAP (11UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuth (12UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_TakeOwnership (13UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymStart (14UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthAsymFinish (15UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ChangeAuthOwner (16UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Extend (20UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PcrRead (21UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Quote (22UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Seal (23UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Unseal (24UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirWriteAuth (25UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DirRead (26UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_UnBind (30UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateWrapKey (31UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKey (32UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetPubKey (33UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_EvictKey (34UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMigrationBlob (40UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReWrapKey (41UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ConvertMigrationBlob (42UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_AuthorizeMigrationKey (43UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateMaintenanceArchive (44UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadMaintenanceArchive (45UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_KillMaintenanceFeature (46UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadManuMaintPub (47UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadManuMaintPub (48UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifyKey (50UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Sign (60UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetRandom (70UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_StirRandom (71UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestFull (80UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SelfTestStartup (81UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CertifySelfTest (82UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ContinueSelfTest (83UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetTestResult (84UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Reset (90UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerClear (91UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableOwnerClear (92UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ForceClear (93UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisableForceClear (94UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilitySigned (100UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapability (101UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetCapabilityOwner (102UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerSetDisable (110UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalEnable (111UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalDisable (112UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOwnerInstall (113UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_PhysicalSetDeactivated (114UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetTempDeactivated (115UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_CreateEndorsementKeyPair (120UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_MakeIdentity (121UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ActivateIdentity (122UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_ReadPubek (124UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_OwnerReadPubek (125UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_DisablePubekRead (126UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEvent (130UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetAuditEventSigned (131UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_GetOrdinalAuditStatus (140UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetOrdinalAuditStatus (141UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Terminate_Handle (150UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Init (151UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveState (152UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_Startup (153UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SetRedirection (154UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Start (160UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Update (161UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1Complete (162UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SHA1CompleteExtend (163UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_FieldUpgrade (170UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveKeyContext (180UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadKeyContext (181UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_SaveAuthContext (182UL + TPM_PROTECTED_ORDINAL) > -#define TPM_ORD_LoadAuthContext (183UL + TPM_PROTECTED_ORDINAL) > -#define TSC_ORD_PhysicalPresence (10UL + TPM_CONNECTION_ORDINAL) > - > - > - > -// > -// TPM_RESULT values > -// > -// just put in the whole table from spec 1.2 > - > -#define TPM_BASE 0x0 // The start of TPM return codes > -#define TPM_VENDOR_ERROR 0x00000400 // Mask to indicate that the error code is vendor specific for vendor specific commands > -#define TPM_NON_FATAL 0x00000800 // Mask to indicate that the error code is a non-fatal failure. > - > -#define TPM_SUCCESS TPM_BASE // Successful completion of the operation > -#define TPM_AUTHFAIL TPM_BASE + 1 // Authentication failed > -#define TPM_BADINDEX TPM_BASE + 2 // The index to a PCR, DIR or other register is incorrect > -#define TPM_BAD_PARAMETER TPM_BASE + 3 // One or more parameter is bad > -#define TPM_AUDITFAILURE TPM_BASE + 4 // An operation completed successfully but the auditing of that operation failed. > -#define TPM_CLEAR_DISABLED TPM_BASE + 5 // The clear disable flag is set and all clear operations now require physical access > -#define TPM_DEACTIVATED TPM_BASE + 6 // The TPM is deactivated > -#define TPM_DISABLED TPM_BASE + 7 // The TPM is disabled > -#define TPM_DISABLED_CMD TPM_BASE + 8 // The target command has been disabled > -#define TPM_FAIL TPM_BASE + 9 // The operation failed > -#define TPM_BAD_ORDINAL TPM_BASE + 10 // The ordinal was unknown or inconsistent > -#define TPM_INSTALL_DISABLED TPM_BASE + 11 // The ability to install an owner is disabled > -#define TPM_INVALID_KEYHANDLE TPM_BASE + 12 // The key handle presented was invalid > -#define TPM_KEYNOTFOUND TPM_BASE + 13 // The target key was not found > -#define TPM_INAPPROPRIATE_ENC TPM_BASE + 14 // Unacceptable encryption scheme > -#define TPM_MIGRATEFAIL TPM_BASE + 15 // Migration authorization failed > -#define TPM_INVALID_PCR_INFO TPM_BASE + 16 // PCR information could not be interpreted > -#define TPM_NOSPACE TPM_BASE + 17 // No room to load key. > -#define TPM_NOSRK TPM_BASE + 18 // There is no SRK set > -#define TPM_NOTSEALED_BLOB TPM_BASE + 19 // An encrypted blob is invalid or was not created by this TPM > -#define TPM_OWNER_SET TPM_BASE + 20 // There is already an Owner > -#define TPM_RESOURCES TPM_BASE + 21 // The TPM has insufficient internal resources to perform the requested action. > -#define TPM_SHORTRANDOM TPM_BASE + 22 // A random string was too short > -#define TPM_SIZE TPM_BASE + 23 // The TPM does not have the space to perform the operation. > -#define TPM_WRONGPCRVAL TPM_BASE + 24 // The named PCR value does not match the current PCR value. > -#define TPM_BAD_PARAM_SIZE TPM_BASE + 25 // The paramSize argument to the command has the incorrect value > -#define TPM_SHA_THREAD TPM_BASE + 26 // There is no existing SHA-1 thread. > -#define TPM_SHA_ERROR TPM_BASE + 27 // The calculation is unable to proceed because the existing SHA-1 thread has already encountered an error. > -#define TPM_FAILEDSELFTEST TPM_BASE + 28 // Self-test has failed and the TPM has shutdown. > -#define TPM_AUTH2FAIL TPM_BASE + 29 // The authorization for the second key in a 2 key function failed authorization > -#define TPM_BADTAG TPM_BASE + 30 // The tag value sent to for a command is invalid > -#define TPM_IOERROR TPM_BASE + 31 // An IO error occurred transmitting information to the TPM > -#define TPM_ENCRYPT_ERROR TPM_BASE + 32 // The encryption process had a problem. > -#define TPM_DECRYPT_ERROR TPM_BASE + 33 // The decryption process did not complete. > -#define TPM_INVALID_AUTHHANDLE TPM_BASE + 34 // An invalid handle was used. > -#define TPM_NO_ENDORSEMENT TPM_BASE + 35 // The TPM does not a EK installed > -#define TPM_INVALID_KEYUSAGE TPM_BASE + 36 // The usage of a key is not allowed > -#define TPM_WRONG_ENTITYTYPE TPM_BASE + 37 // The submitted entity type is not allowed > -#define TPM_INVALID_POSTINIT TPM_BASE + 38 // The command was received in the wrong sequence relative to TPM_Init and a subsequent TPM_Startup > -#define TPM_INAPPROPRIATE_SIG TPM_BASE + 39 // Signed data cannot include additional DER information > -#define TPM_BAD_KEY_PROPERTY TPM_BASE + 40 // The key properties in TPM_KEY_PARMs are not supported by this TPM > - > -#define TPM_BAD_MIGRATION TPM_BASE + 41 // The migration properties of this key are incorrect. > -#define TPM_BAD_SCHEME TPM_BASE + 42 // The signature or encryption scheme for this key is incorrect or not permitted in this situation. > -#define TPM_BAD_DATASIZE TPM_BASE + 43 // The size of the data (or blob) parameter is bad or inconsistent with the referenced key > -#define TPM_BAD_MODE TPM_BASE + 44 // A mode parameter is bad, such as capArea or subCapArea for TPM_GetCapability, phsicalPresence parameter for TPM_PhysicalPresence, or migrationType for TPM_CreateMigrationBlob. > -#define TPM_BAD_PRESENCE TPM_BASE + 45 // Either the physicalPresence or physicalPresenceLock bits have the wrong value > -#define TPM_BAD_VERSION TPM_BASE + 46 // The TPM cannot perform this version of the capability > -#define TPM_NO_WRAP_TRANSPORT TPM_BASE + 47 // The TPM does not allow for wrapped transport sessions > -#define TPM_AUDITFAIL_UNSUCCESSFUL TPM_BASE + 48 // TPM audit construction failed and the underlying command was returning a failure code also > -#define TPM_AUDITFAIL_SUCCESSFUL TPM_BASE + 49 // TPM audit construction failed and the underlying command was returning success > -#define TPM_NOTRESETABLE TPM_BASE + 50 // Attempt to reset a PCR register that does not have the resettable attribute > -#define TPM_NOTLOCAL TPM_BASE + 51 // Attempt to reset a PCR register that requires locality and locality modifier not part of command transport > -#define TPM_BAD_TYPE TPM_BASE + 52 // Make identity blob not properly typed > -#define TPM_INVALID_RESOURCE TPM_BASE + 53 // When saving context identified resource type does not match actual resource > -#define TPM_NOTFIPS TPM_BASE + 54 // The TPM is attempting to execute a command only available when in FIPS mode > -#define TPM_INVALID_FAMILY TPM_BASE + 55 // The command is attempting to use an invalid family ID > -#define TPM_NO_NV_PERMISSION TPM_BASE + 56 // The permission to manipulate the NV storage is not available > -#define TPM_REQUIRES_SIGN TPM_BASE + 57 // The operation requires a signed command > -#define TPM_KEY_NOTSUPPORTED TPM_BASE + 58 // Wrong operation to load an NV key > -#define TPM_AUTH_CONFLICT TPM_BASE + 59 // NV_LoadKey blob requires both owner and blob authorization > -#define TPM_AREA_LOCKED TPM_BASE + 60 // The NV area is locked and not writtable > -#define TPM_BAD_LOCALITY TPM_BASE + 61 // The locality is incorrect for the attempted operation > -#define TPM_READ_ONLY TPM_BASE + 62 // The NV area is read only and can't be written to > -#define TPM_PER_NOWRITE TPM_BASE + 63 // There is no protection on the write to the NV area > -#define TPM_FAMILYCOUNT TPM_BASE + 64 // The family count value does not match > -#define TPM_WRITE_LOCKED TPM_BASE + 65 // The NV area has already been written to > -#define TPM_BAD_ATTRIBUTES TPM_BASE + 66 // The NV area attributes conflict > -#define TPM_INVALID_STRUCTURE TPM_BASE + 67 // The structure tag and version are invalid or inconsistent > -#define TPM_KEY_OWNER_CONTROL TPM_BASE + 68 // The key is under control of the TPM Owner and can only be evicted by the TPM Owner. > -#define TPM_BAD_COUNTER TPM_BASE + 69 // The counter handle is incorrect > -#define TPM_NOT_FULLWRITE TPM_BASE + 70 // The write is not a complete write of the area > -#define TPM_CONTEXT_GAP TPM_BASE + 71 // The gap between saved context counts is too large > -#define TPM_MAXNVWRITES TPM_BASE + 72 // The maximum number of NV writes without an owner has been exceeded > -#define TPM_NOOPERATOR TPM_BASE + 73 // No operator authorization value is set > -#define TPM_RESOURCEMISSING TPM_BASE + 74 // The resource pointed to by context is not loaded > -#define TPM_DELEGATE_LOCK TPM_BASE + 75 // The delegate administration is locked > -#define TPM_DELEGATE_FAMILY TPM_BASE + 76 // Attempt to manage a family other then the delegated family > -#define TPM_DELEGATE_ADMIN TPM_BASE + 77 // Delegation table management not enabled > -#define TPM_TRANSPORT_EXCLUSIVE TPM_BASE + 78 // There was a command executed outside of an exclusive transport session > - > -// TPM_STARTUP_TYPE values > -#define TPM_ST_CLEAR 0x0001 > -#define TPM_ST_STATE 0x0002 > -#define TPM_ST_DEACTIVATED 0x003 > - > -// TPM_TAG values > -#define TPM_TAG_RQU_COMMAND 0x00c1 > -#define TPM_TAG_RQU_AUTH1_COMMAND 0x00c2 > -#define TPM_TAG_RQU_AUTH2_COMMAND 0x00c3 > -#define TPM_TAG_RSP_COMMAND 0x00c4 > -#define TPM_TAG_RSP_AUTH1_COMMAND 0x00c5 > -#define TPM_TAG_RSP_AUTH2_COMMAND 0x00c6 > - > -// TPM_PAYLOAD_TYPE values > -#define TPM_PT_ASYM 0x01 > -#define TPM_PT_BIND 0x02 > -#define TPM_PT_MIGRATE 0x03 > -#define TPM_PT_MAINT 0x04 > -#define TPM_PT_SEAL 0x05 > - > -// TPM_ENTITY_TYPE values > -#define TPM_ET_KEYHANDLE 0x0001 > -#define TPM_ET_OWNER 0x0002 > -#define TPM_ET_DATA 0x0003 > -#define TPM_ET_SRK 0x0004 > -#define TPM_ET_KEY 0x0005 > - > -/// TPM_ResourceTypes > -#define TPM_RT_KEY 0x00000001 > -#define TPM_RT_AUTH 0x00000002 > -#define TPM_RT_TRANS 0x00000004 > -#define TPM_RT_CONTEXT 0x00000005 > - > -// TPM_PROTOCOL_ID values > -#define TPM_PID_OIAP 0x0001 > -#define TPM_PID_OSAP 0x0002 > -#define TPM_PID_ADIP 0x0003 > -#define TPM_PID_ADCP 0x0004 > -#define TPM_PID_OWNER 0x0005 > - > -// TPM_ALGORITHM_ID values > -#define TPM_ALG_RSA 0x00000001 > -#define TPM_ALG_DES 0x00000002 > -#define TPM_ALG_3DES 0X00000003 > -#define TPM_ALG_SHA 0x00000004 > -#define TPM_ALG_HMAC 0x00000005 > -#define TCPA_ALG_AES 0x00000006 > - > -// TPM_ENC_SCHEME values > -#define TPM_ES_NONE 0x0001 > -#define TPM_ES_RSAESPKCSv15 0x0002 > -#define TPM_ES_RSAESOAEP_SHA1_MGF1 0x0003 > - > -// TPM_SIG_SCHEME values > -#define TPM_SS_NONE 0x0001 > -#define TPM_SS_RSASSAPKCS1v15_SHA1 0x0002 > -#define TPM_SS_RSASSAPKCS1v15_DER 0x0003 > - > -// TPM_KEY_USAGE values > -#define TPM_KEY_EK 0x0000 > -#define TPM_KEY_SIGNING 0x0010 > -#define TPM_KEY_STORAGE 0x0011 > -#define TPM_KEY_IDENTITY 0x0012 > -#define TPM_KEY_AUTHCHANGE 0X0013 > -#define TPM_KEY_BIND 0x0014 > -#define TPM_KEY_LEGACY 0x0015 > - > -// TPM_AUTH_DATA_USAGE values > -#define TPM_AUTH_NEVER 0x00 > -#define TPM_AUTH_ALWAYS 0x01 > - > -// Key Handle of owner and srk > -#define TPM_OWNER_KEYHANDLE 0x40000001 > -#define TPM_SRK_KEYHANDLE 0x40000000 > - > -// ---------------------- Functions for checking TPM_RESULTs ----------------- > - > -#include > - > -// FIXME: Review use of these and delete unneeded ones. > - > -// these are really badly dependent on local structure: > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -#define ERRORDIE(s) do { status = s; \ > - fprintf (stderr, "*** ERRORDIE in %s at %s: %i\n", __func__, __FILE__, __LINE__); \ > - goto abort_egress; } \ > - while (0) > - > -// DEPENDS: local var 'status' of type TPM_RESULT > -// DEPENDS: label 'abort_egress' which cleans up and returns the status > -// Try command c. If it fails, set status to s and goto abort. > -#define TPMTRY(s,c) if (c != TPM_SUCCESS) { \ > - status = s; \ > - printf("ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } else {\ > - status = c; \ > - } > - > -// Try command c. If it fails, print error message, set status to actual return code. Goto abort > -#define TPMTRYRETURN(c) do { status = c; \ > - if (status != TPM_SUCCESS) { \ > - fprintf(stderr, "ERROR in %s at %s:%i code: %s.\n", __func__, __FILE__, __LINE__, tpm_get_error_name(status)); \ > - goto abort_egress; \ > - } \ > - } while(0) > - > - > -#pragma pack(pop) > - > -#endif //__TCPA_H__ > diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c > index 3b89223..0ba1d55 100644 > --- a/tools/xenstore/hashtable.c > +++ b/tools/xenstore/hashtable.c > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.c > - * - tools/vtpm_manager/util/hashtable.c > */ > > #include "hashtable.h" > diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h > index 8e6bb5b..4d68223 100644 > --- a/tools/xenstore/hashtable.h > +++ b/tools/xenstore/hashtable.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable.h > - * - tools/vtpm_manager/util/hashtable.h > */ > > #ifndef __HASHTABLE_CWC22_H__ > diff --git a/tools/xenstore/hashtable_private.h b/tools/xenstore/hashtable_private.h > index cabaffe..a08559d 100644 > --- a/tools/xenstore/hashtable_private.h > +++ b/tools/xenstore/hashtable_private.h > @@ -3,7 +3,6 @@ > /* > * There are duplicates of this code in: > * - tools/blktap2/drivers/hashtable_private.h > - * - tools/vtpm_manager/util/hashtable_private.h > */ > > #ifndef __HASHTABLE_PRIVATE_CWC22_H__ > diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac > index ad1eb78..c142140 100644 > --- a/tools/xm-test/configure.ac > +++ b/tools/xm-test/configure.ac > @@ -143,7 +143,6 @@ AC_CONFIG_FILES([ > tests/unpause/Makefile > tests/vcpu-pin/Makefile > tests/vcpu-disable/Makefile > - tests/vtpm/Makefile > tests/xapi/Makefile > tests/enforce_dom0_cpus/Makefile > tests/cpupool/Makefile > diff --git a/tools/xm-test/grouptest/default b/tools/xm-test/grouptest/default > index f0516b2..e04591b 100644 > --- a/tools/xm-test/grouptest/default > +++ b/tools/xm-test/grouptest/default > @@ -27,5 +27,4 @@ sysrq > unpause > vcpu-disable > vcpu-pin > -vtpm > xapi > diff --git a/tools/xm-test/grouptest/medium b/tools/xm-test/grouptest/medium > index bafc988..5c3e1b1 100644 > --- a/tools/xm-test/grouptest/medium > +++ b/tools/xm-test/grouptest/medium > @@ -22,4 +22,3 @@ sysrq 01_sysrq_basic_neg.test 02_sysrq_sync_pos.test > unpause > vcpu-disable > vcpu-pin > -vtpm > diff --git a/tools/xm-test/grouptest/xapi b/tools/xm-test/grouptest/xapi > index 3b04921..7a08b77 100644 > --- a/tools/xm-test/grouptest/xapi > +++ b/tools/xm-test/grouptest/xapi > @@ -1,2 +1 @@ > xapi > -vtpm 09_vtpm-xapi.test > diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py > index ae8c550..3ba7433 100644 > --- a/tools/xm-test/lib/XmTestLib/XenDomain.py > +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py > @@ -59,7 +59,6 @@ class XenConfig: > # These options need to be lists > self.defaultOpts["disk"] = [] > self.defaultOpts["vif"] = [] > - self.defaultOpts["vtpm"] = [] > > self.opts = self.defaultOpts > > diff --git a/tools/xm-test/tests/Makefile.am b/tools/xm-test/tests/Makefile.am > index 8d673ed..455f50c 100644 > --- a/tools/xm-test/tests/Makefile.am > +++ b/tools/xm-test/tests/Makefile.am > @@ -25,7 +25,6 @@ SUBDIRS = \ > unpause \ > vcpu-disable \ > vcpu-pin \ > - vtpm \ > enforce_dom0_cpus \ > save restore migrate \ > cpupool > diff --git a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py b/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > deleted file mode 100644 > index dfd1227..0000000 > --- a/tools/xm-test/tests/vtpm/01_vtpm-list_pos.py > +++ /dev/null > @@ -1,40 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# verify list > - > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > - > -try: > - domain.start(noConsole=True) > -except DomainError, e: > - if verbose: > - print e.extra > - vtpm_cleanup(domain.getName()) > - FAIL("Unable to create domain") > - > - > -domName = domain.getName() > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -status, output = traceCommand("xm vtpm-list %s" % domain.getId()) > -eyecatcher = "/local/domain/0/backend/vtpm" > -where = output.find(eyecatcher) > -if status != 0: > - FAIL("xm vtpm-list returned bad status, expected 0, status is %i" % status) > -elif where < 0: > - FAIL("Fail to list virtual TPM device") > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > deleted file mode 100644 > index a18cbab..0000000 > --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py > +++ /dev/null > @@ -1,49 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -domain.closeConsole() > - > -domain.stop() > - > -if not re.search("PCR-00:",run["output"]): > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > diff --git a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > deleted file mode 100644 > index b863f27..0000000 > --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py > +++ /dev/null > @@ -1,99 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > deleted file mode 100644 > index ccc8b73..0000000 > --- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > deleted file mode 100644 > index 57b87df..0000000 > --- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py > +++ /dev/null > @@ -1,93 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > deleted file mode 100644 > index c70691d..0000000 > --- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py > +++ /dev/null > @@ -1,125 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; suspend and resume the domain and > -# check list of pcrs again and validate extended pcr > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm save %s %s.save" % > - (domName, domName), > - timeout=30) > - > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm save did not succeed") > - > - try: > - status, ouptut = traceCommand("xm restore %s.save" % > - (domName), > - timeout=30) > - except TimeoutError, e: > - os.remove("%s.save" % domName) > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - os.remove("%s.save" % domName) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm restore did not succeed") > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > - > diff --git a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > deleted file mode 100644 > index 4ff3360..0000000 > --- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local live migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate -l %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > deleted file mode 100644 > index 27125fc..0000000 > --- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py > +++ /dev/null > @@ -1,119 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Positive Test: create domain with virtual TPM attached at build time, > -# extend a pcr > -# check list of pcrs; locally migrate the domain and > -# check list of pcrs again and validate extended pcr > -# This test does local (non-live) migration. > - > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > -import os.path > -import atexit > - > -config = {"vtpm":"instance=1,backend=0"} > -domain = XmTestDomain(extraConfig=config) > -domName = domain.getName() > -consoleHistory = "" > - > -try: > - console = domain.start() > -except DomainError, e: > - if verbose: > - print e.extra > - FAIL("Unable to create domain (%s)" % domName) > - > -atexit.register(vtpm_cleanup, vtpm_get_uuid(domid(domName))) > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("mknod /dev/tpm0 c 10 224") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while creating /dev/tpm0") > - > -try: > - run = console.runCmd("echo -ne \"\\x00\\xc1\\x00\\x00\\x00\\x22\\x00\\x00\\x00\\x14\\x00\\x00\\x00\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\0xf\\x10\\x11\\x12\\x13\\x14\" > seq; cat seq > /dev/tpm0") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("Error while extending PCR 0") > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Extend did not lead to expected result (1E A7 BD ...): \n%s" % run["output"]) > - > -consoleHistory = console.getHistory() > -domain.closeConsole() > - > -old_domid = domid(domName) > - > -loop = 0 > -while loop < 3: > - try: > - status, ouptut = traceCommand("xm migrate %s localhost" % > - domName, > - timeout=90) > - except TimeoutError, e: > - saveLog(consoleHistory) > - FAIL(str(e)) > - > - if status != 0: > - saveLog(consoleHistory) > - FAIL("xm migrate did not succeed. External device migration activated?") > - > - > - domName = domain.getName() > - new_domid = domid(domName) > - > - if (old_domid == new_domid): > - FAIL("xm migrate failed, domain id is still %s (loop=%d)" % > - (old_domid,loop)) > - > - try: > - console = domain.getConsole() > - except ConsoleError, e: > - FAIL(str(e)) > - > - try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > - except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("No result from dumping the PCRs") > - > - if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side") > - > - if not re.search("PCR-00: 1E A7 BD",run["output"]): > - saveLog(console.getHistory()) > - FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"]) > - > - loop += 1 > - > -domain.closeConsole() > - > -domain.stop() > diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > deleted file mode 100644 > index a1aa8b3..0000000 > --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py > +++ /dev/null > @@ -1,158 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -# Test to test the vtpm class through the Xen-API > -# > -# Tested methods: > -# VTPM: get_uuid, get_backend, get_by_uuid, get_record > -# create, destroy, get_VM > -# VM: get_VTPMS > - > -from XmTestLib import xapi > -from XmTestLib.XenAPIDomain import XmTestAPIDomain > -from XmTestLib import * > -from vtpm_utils import * > -import commands > -import os > - > -VTPM_RECORD_KEYS = [ 'backend', 'VM', 'uuid', 'other_config' ] > - > -try: > - # XmTestAPIDomain tries to establish a connection to XenD > - domain = XmTestAPIDomain() > -except Exception, e: > - SKIP("Skipping test. Error: %s" % str(e)) > -vm_uuid = domain.get_uuid() > - > -vtpmcfg = {} > -vtpmcfg['backend'] = DOM0_UUID > -vtpmcfg['VM'] = vm_uuid > - > -session = xapi.connect() > - > -vtpm_uuid = session.xenapi.VTPM.create(vtpmcfg) > - > -vtpm_be = session.xenapi.VTPM.get_backend(vtpm_uuid) > -if vtpm_be != vtpmcfg['backend']: > - FAIL("vTPM's backend is in '%s', expected: '%s'" % > - (vtpm_be, vtpmcfg['backend'])) > - > -vtpm_rec = session.xenapi.VTPM.get_record(vtpm_uuid) > - > -miss_keys = [] > -for k in VTPM_RECORD_KEYS: > - if k not in vtpm_rec.keys(): > - miss_keys.append(k) > -if len(miss_keys) > 0: > - FAIL("vTPM record is missing key(s): %s" % miss_keys) > - > -if vtpm_rec['uuid'] != vtpm_uuid: > - FAIL("vTPM record shows vtpm uuid '%s', expected: '%s'" % > - (vtpm_rec['uuid'], vtpm_uuid)) > -if vtpm_rec['VM'] != vm_uuid: > - FAIL("vTPM record shows VM uuid '%s', expected: '%s'" % > - (vtpm_rec['VM'], vm_uuid)) > -if vtpm_rec['backend'] != vtpmcfg['backend']: > - FAIL("vTPM record shows VM bakcned '%s', expected: '%s'" % > - (vtpm_rev['backend'], vtpmcfg['backend'])) > - > -badkeys = [] > -keys = vtpm_rec.keys() > -for k in keys: > - if k not in VTPM_RECORD_KEYS: > - badkeys.append(k) > -if len(badkeys) > 0: > - FAIL("Unexpected attributes in result: %s" % badkeys) > - > -if vm_uuid != session.xenapi.VTPM.get_VM(vtpm_uuid): > - FAIL("VM uuid from VTPM.get_VM different (%s) than expected (%s)." % > - (vm_ref, vm_uuid)) > - > -uuid = session.xenapi.VTPM.get_uuid(vtpm_uuid) > -if uuid != vtpm_uuid: > - FAIL("vTPM from VTPM.get_uuid different (%s) than expected (%s)." % > - (uuid, vtpm_uuid)) > - > -vtpm_ref = session.xenapi.VTPM.get_by_uuid(vtpm_uuid) > -if vtpm_ref != vtpm_uuid: > - FAIL("vTPM from VTPM.get_by_uuid different (%s) than expected (%s)." % > - (vtpm_ref, vtpm_uuid)) > - > -vm_vtpms = session.xenapi.VM.get_VTPMs(vm_uuid) > -if len(vm_vtpms) != 1: > - FAIL("Number of vTPMs from get_VTPMs is (%d) not what was expected (%d)" % > - (len(vm_vtpms), 1)) > -if vtpm_uuid not in vm_vtpms: > - FAIL("Other vTPM uuid (%s) returned from VM.get_VTPMs than expected (%s)" % > - (vm_vtpms[0], vtpm_uuid)) > - > -try: > - console = domain.start() > -except DomainError, e: > - FAIL("Unable to create domain.") > - > -try: > - console.sendInput("input") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("1. No result from dumping the PCRs") > - > -if re.search("No such file",run["output"]): > - FAIL("TPM frontend support not compiled into (domU?) kernel") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("1. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #Should never get here > - FAIL("Could destroy vTPM while VM is running") > -except: > - pass > - > -rc = session.xenapi.VM.suspend(vm_uuid) > -if rc: > - FAIL("Could not suspend VM") > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > - #May not throw an exception in 'suspend' state > -except: > - pass > - > -rc = session.xenapi.VM.resume(vm_uuid, False) > -if rc: > - FAIL("Could not resume VM") > - > -try: > - console = domain.getConsole() > -except ConsoleError, e: > - FAIL(str(e)) > - > -try: > - run = console.runCmd("cat /sys/devices/xen/vtpm-0/pcrs") > -except ConsoleError, e: > - saveLog(console.getHistory()) > - FAIL("2. No result from dumping the PCRs. vTPM has been removed?") > - > -if not re.search("PCR-00:",run["output"]): > - saveLog(console.getHistory()) > - FAIL("2. Virtual TPM is not working correctly on /dev/vtpm on backend side: \n%s" % run["output"]) > - > -domain.stop() > - > -try: > - session.xenapi.VTPM.destroy(vtpm_uuid) > -except: > - FAIL("Could NOT destroy vTPM while domain is halted.") > - > -domain.destroy() > diff --git a/tools/xm-test/tests/vtpm/Makefile.am b/tools/xm-test/tests/vtpm/Makefile.am > deleted file mode 100644 > index dd67e45..0000000 > --- a/tools/xm-test/tests/vtpm/Makefile.am > +++ /dev/null > @@ -1,27 +0,0 @@ > -SUBDIRS = > - > -TESTS = 01_vtpm-list_pos.test \ > - 02_vtpm-cat_pcrs.test \ > - 03_vtpm-susp_res.test \ > - 04_vtpm-loc_migr.test \ > - 05_vtpm-loc_migr.test \ > - 06_vtpm-susp_res_pcrs.test \ > - 07_vtpm-mig_pcrs.test \ > - 08_vtpm-mig_pcrs.test \ > - 09_vtpm-xapi.test > - > -XFAIL_TESTS = > - > -EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) vtpm_utils.py > -TESTS_ENVIRONMENT=@TENV@ > - > -%.test: %.py > - cp $< $@ > - chmod +x $@ > - > -clean-local: am_config_clean-local > - > -am_config_clean-local: > - rm -f *test > - rm -f *log > - rm -f *~ > diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py > deleted file mode 100644 > index 4e5b281..0000000 > --- a/tools/xm-test/tests/vtpm/vtpm_utils.py > +++ /dev/null > @@ -1,30 +0,0 @@ > -#!/usr/bin/python > - > -# Copyright (C) International Business Machines Corp., 2006 > -# Author: Stefan Berger > - > -from XmTestLib import * > - > -if ENABLE_HVM_SUPPORT: > - SKIP("vtpm tests not supported for HVM domains") > - > -status, output = traceCommand("COLUMNS=200 ; " > - "ps aux | grep vtpm_manager | grep -v grep") > -if output == "": > - SKIP("virtual TPM manager must be started to run this test; might " > - "need /dev/tpm0") > - > -def vtpm_cleanup(domName): > - traceCommand("/etc/xen/scripts/vtpm-delete " > - "`xenstore-read /local/domain/0/backend/vtpm/%s/0/uuid`" % > - str(domid(domName))) > - > -def vtpm_cleanup(uuid): > - from xen.xm import main > - if main.serverType != main.SERVER_XEN_API: > - traceCommand("/etc/xen/scripts/vtpm-delete %s" % uuid) > - > -def vtpm_get_uuid(domainid): > - s, o = traceCommand("xenstore-read " > - "/local/domain/0/backend/vtpm/%s/0/uuid" % domainid) > - return o > -- > 1.7.10.4 > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:11:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI9N-0006p5-2Y; Tue, 13 Nov 2012 15:11:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI9L-0006oZ-Fi for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:11:39 +0000 Received: from [85.158.138.51:52868] by server-11.bemta-3.messagelabs.com id 61/B1-19361-A2362A05; Tue, 13 Nov 2012 15:11:38 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352819498!21775298!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5819 invoked from network); 13 Nov 2012 15:11:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:11:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15781974" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:11:38 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 15:11:37 +0000 Message-ID: <1352819496.7491.89.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Fioravante, Matthew E." Date: Tue, 13 Nov 2012 15:11:36 +0000 In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> <1352819016.7491.84.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 15:07 +0000, Fioravante, Matthew E. wrote: > Xend/xm was not changed at all so it should work fine for people not > using vtpm. However it still "supports" vtpm devices from the old > process mode, which now will not work and possibly crash, hang, or > cause an error. It may be confusing to users to see vtpm support in > xm, thinking it will work with the new vtpm system. Are there any xm/xend docs which could be updated to clearly state that this stuff doesn't work? I'd also be happy with a patch which added a check and error message at the entry point (e.g. tools/python/xen/xm/create.py) without any attempt to root out the support from the underlying code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:11:53 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:11:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI9N-0006p5-2Y; Tue, 13 Nov 2012 15:11:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYI9L-0006oZ-Fi for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:11:39 +0000 Received: from [85.158.138.51:52868] by server-11.bemta-3.messagelabs.com id 61/B1-19361-A2362A05; Tue, 13 Nov 2012 15:11:38 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352819498!21775298!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5819 invoked from network); 13 Nov 2012 15:11:38 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:11:38 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15781974" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:11:38 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 15:11:37 +0000 Message-ID: <1352819496.7491.89.camel@zakaz.uk.xensource.com> From: Ian Campbell To: "Fioravante, Matthew E." Date: Tue, 13 Nov 2012 15:11:36 +0000 In-Reply-To: <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> <1352819016.7491.84.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 15:07 +0000, Fioravante, Matthew E. wrote: > Xend/xm was not changed at all so it should work fine for people not > using vtpm. However it still "supports" vtpm devices from the old > process mode, which now will not work and possibly crash, hang, or > cause an error. It may be confusing to users to see vtpm support in > xm, thinking it will work with the new vtpm system. Are there any xm/xend docs which could be updated to clearly state that this stuff doesn't work? I'd also be happy with a patch which added a check and error message at the entry point (e.g. tools/python/xen/xm/create.py) without any attempt to root out the support from the underlying code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:15:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:15:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYICb-00072H-QN; Tue, 13 Nov 2012 15:15:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYICa-00072A-Fn for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:15:00 +0000 Received: from [193.109.254.147:3773] by server-5.bemta-14.messagelabs.com id 9C/FD-10257-3F362A05; Tue, 13 Nov 2012 15:14:59 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352819693!10797672!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11355 invoked from network); 13 Nov 2012 15:14:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:14:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44420510" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:14:14 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:14:11 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIBm-0007r7-K7 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:14:10 +0000 Message-ID: <50A263C2.4050703@citrix.com> Date: Tue, 13 Nov 2012 15:14:10 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> In-Reply-To: <20121113144356.GG44675@ocelot.phlegethon.org> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>>> What about a little stub-asm return_from_nmi / reenable_nmis with >>>> something like: >>>> pushf >>>> pushq $__HYPERVISOR_CS >>>> pushq 1f >>>> iret >>>> 1: ... >>>> >>>> That should re-enable NMIs at whichever point we think is appropriate? >>> If an iret is what's needed then replacing self_nmi() with 'int $2' >>> (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of >>> the manual suggests that iret is indeed what we want, so: >> An IRET just cannot be the only thing that ends the NMI masked >> window. At least some forms of #VMENTER should have that >> effect too, as otherwise NMIs would remain masked for arbitrary >> periods of time. >> >> Further, under the assumption that the self_nmi() worked at least >> in some cases (since you likely tested it), there would also be room >> for the NMI not being masked when getting here. Which would get >> us into the stack trouble that Andrew mentioned in his reply. > I got the impression that Andrew and Malcolm were seeing a long loop of > exit/self_nmi()/enter/NMI/exit/..., Yes - thousands of instantaneous exits from the VM (the eip of the guest is always the same while this is going on), and this is trivial behaviour to demonstrate with a CPU-bound VCPU task. > eventually broken by a real > interrupt or an IPI causing (by its iret) the NMI to get delivered in > root mode. So the NMI does get handled, just not immediately. We are still not certain exactly what breaks the PCPU out of this cycle, but timer interrupts were seen as the first deviation from the above cycle. My interpretation of the Intel SDM manual along with the observable evidence, is that NMIs are disabled from the vmexit until the vmresume (as there appear to be no other irets on that path). The action of receiving a vmexit with reason NMI means that an external NMI has occurred and we should run the handler. With the current code, we raise a self_nmi(), which queues up a brand new NMI to interrupt us as soon as we vmresume and NMIs are re-enabled. > > The fact that there was a loop and not just a delay in the NMI handling > suggests that VMENTER does indeed re-enable NMIs (or at least > NMI-exiting) but I couldn't find that in the manual. In any case, I > think the int $2 version is correcter than the direct call as it also > disables normal interrupts. > > Tim. With the asm("int $2") solution, we jump into the NMI handler (on the NMI stack) with NMIs disabled (due to the vmexit), run the handler for the real NMI which caused the vmexit in the first place, then iret from the NMI handler which re-enables NMIs. We are then free to take NMIs for the remainder of the codepath back to the vmresume. The question then becomes whether we wish to enable NMIs or not, which affects whether we issue "int $2" or "do_nmi()". Can someone from Intel weigh in and confirm the exact behaviour of NMIs around this code? (Irrespective of this question at hand, having read that LWN article about nested NMIs, I am not certain that we are immune to the issue, so should think about implementing a similar fix) ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:15:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:15:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYICb-00072H-QN; Tue, 13 Nov 2012 15:15:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYICa-00072A-Fn for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:15:00 +0000 Received: from [193.109.254.147:3773] by server-5.bemta-14.messagelabs.com id 9C/FD-10257-3F362A05; Tue, 13 Nov 2012 15:14:59 +0000 X-Env-Sender: Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1352819693!10797672!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11355 invoked from network); 13 Nov 2012 15:14:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:14:55 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44420510" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:14:14 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:14:11 -0500 Received: from andrewcoop.uk.xensource.com ([10.80.2.18]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIBm-0007r7-K7 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:14:10 +0000 Message-ID: <50A263C2.4050703@citrix.com> Date: Tue, 13 Nov 2012 15:14:10 +0000 From: Andrew Cooper User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: xen-devel@lists.xen.org References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> In-Reply-To: <20121113144356.GG44675@ocelot.phlegethon.org> X-Enigmail-Version: 1.4.5 Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>>> What about a little stub-asm return_from_nmi / reenable_nmis with >>>> something like: >>>> pushf >>>> pushq $__HYPERVISOR_CS >>>> pushq 1f >>>> iret >>>> 1: ... >>>> >>>> That should re-enable NMIs at whichever point we think is appropriate? >>> If an iret is what's needed then replacing self_nmi() with 'int $2' >>> (i.e. the proposed patch) seems like a neater fix. And section 6.7.1 of >>> the manual suggests that iret is indeed what we want, so: >> An IRET just cannot be the only thing that ends the NMI masked >> window. At least some forms of #VMENTER should have that >> effect too, as otherwise NMIs would remain masked for arbitrary >> periods of time. >> >> Further, under the assumption that the self_nmi() worked at least >> in some cases (since you likely tested it), there would also be room >> for the NMI not being masked when getting here. Which would get >> us into the stack trouble that Andrew mentioned in his reply. > I got the impression that Andrew and Malcolm were seeing a long loop of > exit/self_nmi()/enter/NMI/exit/..., Yes - thousands of instantaneous exits from the VM (the eip of the guest is always the same while this is going on), and this is trivial behaviour to demonstrate with a CPU-bound VCPU task. > eventually broken by a real > interrupt or an IPI causing (by its iret) the NMI to get delivered in > root mode. So the NMI does get handled, just not immediately. We are still not certain exactly what breaks the PCPU out of this cycle, but timer interrupts were seen as the first deviation from the above cycle. My interpretation of the Intel SDM manual along with the observable evidence, is that NMIs are disabled from the vmexit until the vmresume (as there appear to be no other irets on that path). The action of receiving a vmexit with reason NMI means that an external NMI has occurred and we should run the handler. With the current code, we raise a self_nmi(), which queues up a brand new NMI to interrupt us as soon as we vmresume and NMIs are re-enabled. > > The fact that there was a loop and not just a delay in the NMI handling > suggests that VMENTER does indeed re-enable NMIs (or at least > NMI-exiting) but I couldn't find that in the manual. In any case, I > think the int $2 version is correcter than the direct call as it also > disables normal interrupts. > > Tim. With the asm("int $2") solution, we jump into the NMI handler (on the NMI stack) with NMIs disabled (due to the vmexit), run the handler for the real NMI which caused the vmexit in the first place, then iret from the NMI handler which re-enables NMIs. We are then free to take NMIs for the remainder of the codepath back to the vmresume. The question then becomes whether we wish to enable NMIs or not, which affects whether we issue "int $2" or "do_nmi()". Can someone from Intel weigh in and confirm the exact behaviour of NMIs around this code? (Irrespective of this question at hand, having read that LWN article about nested NMIs, I am not certain that we are immune to the issue, so should think about implementing a similar fix) ~Andrew > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel -- Andrew Cooper - Dom0 Kernel Engineer, Citrix XenServer T: +44 (0)1223 225 900, http://www.citrix.com _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:22:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:22:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIJ7-0007Q9-7w; Tue, 13 Nov 2012 15:21:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIJ6-0007Q4-8C for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:21:44 +0000 Received: from [85.158.139.83:25064] by server-12.bemta-5.messagelabs.com id 24/CA-02886-78562A05; Tue, 13 Nov 2012 15:21:43 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1352820102!18816432!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22217 invoked from network); 13 Nov 2012 15:21:42 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-8.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 15:21:42 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYIIw-000Crb-Kx; Tue, 13 Nov 2012 15:21:34 +0000 Date: Tue, 13 Nov 2012 15:21:34 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113152134.GH44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> <50A26D9C02000078000A8322@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A26D9C02000078000A8322@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 14:56 +0000 on 13 Nov (1352818572), Jan Beulich wrote: > >>> On 13.11.12 at 15:43, Tim Deegan wrote: > > The fact that there was a loop and not just a delay in the NMI handling > > suggests that VMENTER does indeed re-enable NMIs (or at least > > NMI-exiting) but I couldn't find that in the manual. In any case, I > > think the int $2 version is correcter than the direct call as it also > > disables normal interrupts. > > You're not commenting on the stack aspect and previous approach > at all: Assuming your self_nmi() approach at least worked > somewhere, that somewhere would be the place where the "int $2" > approach would break. In other words - are you confident that > NMI is _always_ masked when we get there (and hence your > earlier approach _never_ worked)? ISWYM. No, having thought about it a bit more, I'm not confident of that at all -- at this point in the exit handlers, interrupts are enabled, so we may already have had an IRET. So we'd be risking taking one NMI while handling another (whether we do int $2 or a direct call; it's bad in either case). :( I think that the NMI case needs to move to the top of the vmexit handler, beside the machine_check cases. Once it's there, either the direct call (+ artifical iret to clear the masking) or int $2 should be fine. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:22:00 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:22:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIJ7-0007Q9-7w; Tue, 13 Nov 2012 15:21:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIJ6-0007Q4-8C for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:21:44 +0000 Received: from [85.158.139.83:25064] by server-12.bemta-5.messagelabs.com id 24/CA-02886-78562A05; Tue, 13 Nov 2012 15:21:43 +0000 X-Env-Sender: tim@xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1352820102!18816432!1 X-Originating-IP: [81.29.64.94] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22217 invoked from network); 13 Nov 2012 15:21:42 -0000 Received: from ocelot.phlegethon.org (HELO mail.phlegethon.org) (81.29.64.94) by server-8.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 15:21:42 -0000 Received: from tjd by mail.phlegethon.org with local (Exim 4.67 (FreeBSD)) (envelope-from ) id 1TYIIw-000Crb-Kx; Tue, 13 Nov 2012 15:21:34 +0000 Date: Tue, 13 Nov 2012 15:21:34 +0000 From: Tim Deegan To: Jan Beulich Message-ID: <20121113152134.GH44675@ocelot.phlegethon.org> References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> <50A26D9C02000078000A8322@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <50A26D9C02000078000A8322@nat28.tlf.novell.com> User-Agent: Mutt/1.4.2.1i Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org At 14:56 +0000 on 13 Nov (1352818572), Jan Beulich wrote: > >>> On 13.11.12 at 15:43, Tim Deegan wrote: > > The fact that there was a loop and not just a delay in the NMI handling > > suggests that VMENTER does indeed re-enable NMIs (or at least > > NMI-exiting) but I couldn't find that in the manual. In any case, I > > think the int $2 version is correcter than the direct call as it also > > disables normal interrupts. > > You're not commenting on the stack aspect and previous approach > at all: Assuming your self_nmi() approach at least worked > somewhere, that somewhere would be the place where the "int $2" > approach would break. In other words - are you confident that > NMI is _always_ masked when we get there (and hence your > earlier approach _never_ worked)? ISWYM. No, having thought about it a bit more, I'm not confident of that at all -- at this point in the exit handlers, interrupts are enabled, so we may already have had an IRET. So we'd be risking taking one NMI while handling another (whether we do int $2 or a direct call; it's bad in either case). :( I think that the NMI case needs to move to the top of the vmexit handler, beside the machine_check cases. Once it's there, either the direct call (+ artifical iret to clear the masking) or int $2 should be fine. Tim. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:29:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:29:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIQL-0007rc-6g; Tue, 13 Nov 2012 15:29:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIQJ-0007rX-Fq for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:29:11 +0000 Received: from [85.158.143.99:27691] by server-2.bemta-4.messagelabs.com id 6E/0A-28922-64762A05; Tue, 13 Nov 2012 15:29:10 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352820550!28853294!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6155 invoked from network); 13 Nov 2012 15:29:10 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-216.messagelabs.com with SMTP; 13 Nov 2012 15:29:10 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 15:29:56 +0000 Message-Id: <50A2755402000078000A837D@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 15:29:08 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 16:02, "Zhang, Xiantao" wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> > If software cannot see it, then how to use it? If there still have an >> > approach to detect it, then xen can do it too and setup the context >> > entry as passthrough. >> >> We see it the latest at the point the fault occurs. So there are multiple >> options: >> a) if the device is "real" as in having a valid config space despite >> func 0 not advertising itself as multi-function, we have ways to >> discover the device (at boot time) > > I think current Xen logic also covers multi-function devices case. When Xen > boots up, it will scan all functions of devices on each bus, through reads > their vendor ID. If the vendor ID is valid, Xen deems this BDF has a real > device/function existed there Not anymore - we're now honoring the multi-function flag in _scan_pci_devices() (as Linux always did in its bus scan logic); see c/s 22337:7afd8dd1d6cb (with a subsequent adjustment in c/s 25869:59b3663316db). >> b) we could insert the context entry in the fault handler, assuming >> the device is able to recover > At least current VT-d doesn't have recovery fault supported, so each > triggered faults are fatal. Fatal in what sense? I would assume that if the driver retries the operation, it would succeed if the first fault causes the context entry to be inserted. >> c) we could provide a command line option to allow fake devices to >> be create > > Agree, this maybe a feasible solution I can figure out, so far. > >> d) we could create context entries for all BDFs, whether or not a >> device exists there > > As I said, this maybe bring security issue. Even for the iommu-passthrough > option, it is also not suggested to be used if security is considered. As said - it is clear that the basic thing here (using "iommu=dom0-passthrough") is already weakening security. So security isn't the concern in this discussion, that's left to whoever is intending to use that option. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:29:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:29:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIQL-0007rc-6g; Tue, 13 Nov 2012 15:29:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIQJ-0007rX-Fq for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:29:11 +0000 Received: from [85.158.143.99:27691] by server-2.bemta-4.messagelabs.com id 6E/0A-28922-64762A05; Tue, 13 Nov 2012 15:29:10 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-216.messagelabs.com!1352820550!28853294!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6155 invoked from network); 13 Nov 2012 15:29:10 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-13.tower-216.messagelabs.com with SMTP; 13 Nov 2012 15:29:10 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 15:29:56 +0000 Message-Id: <50A2755402000078000A837D@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 15:29:08 +0000 From: "Jan Beulich" To: "Xiantao Zhang" , "Yang Z Zhang" References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> In-Reply-To: Mime-Version: 1.0 Content-Disposition: inline Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 16:02, "Zhang, Xiantao" wrote: >> From: Jan Beulich [mailto:JBeulich@suse.com] >> > If software cannot see it, then how to use it? If there still have an >> > approach to detect it, then xen can do it too and setup the context >> > entry as passthrough. >> >> We see it the latest at the point the fault occurs. So there are multiple >> options: >> a) if the device is "real" as in having a valid config space despite >> func 0 not advertising itself as multi-function, we have ways to >> discover the device (at boot time) > > I think current Xen logic also covers multi-function devices case. When Xen > boots up, it will scan all functions of devices on each bus, through reads > their vendor ID. If the vendor ID is valid, Xen deems this BDF has a real > device/function existed there Not anymore - we're now honoring the multi-function flag in _scan_pci_devices() (as Linux always did in its bus scan logic); see c/s 22337:7afd8dd1d6cb (with a subsequent adjustment in c/s 25869:59b3663316db). >> b) we could insert the context entry in the fault handler, assuming >> the device is able to recover > At least current VT-d doesn't have recovery fault supported, so each > triggered faults are fatal. Fatal in what sense? I would assume that if the driver retries the operation, it would succeed if the first fault causes the context entry to be inserted. >> c) we could provide a command line option to allow fake devices to >> be create > > Agree, this maybe a feasible solution I can figure out, so far. > >> d) we could create context entries for all BDFs, whether or not a >> device exists there > > As I said, this maybe bring security issue. Even for the iommu-passthrough > option, it is also not suggested to be used if security is considered. As said - it is clear that the basic thing here (using "iommu=dom0-passthrough") is already weakening security. So security isn't the concern in this discussion, that's left to whoever is intending to use that option. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:33:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:33:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIUD-00086r-RY; Tue, 13 Nov 2012 15:33:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIUC-00086m-ND for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:33:12 +0000 Received: from [85.158.138.51:19043] by server-12.bemta-3.messagelabs.com id 1D/66-22757-33862A05; Tue, 13 Nov 2012 15:33:07 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1352820784!29854699!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3352 invoked from network); 13 Nov 2012 15:33:04 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-174.messagelabs.com with SMTP; 13 Nov 2012 15:33:04 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 15:34:02 +0000 Message-Id: <50A2763B02000078000A8384@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 15:32:59 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> <50A26D9C02000078000A8322@nat28.tlf.novell.com> <20121113152134.GH44675@ocelot.phlegethon.org> In-Reply-To: <20121113152134.GH44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 16:21, Tim Deegan wrote: > I think that the NMI case needs to move to the top of the vmexit > handler, beside the machine_check cases. Once it's there, either the > direct call (+ artifical iret to clear the masking) or int $2 should be > fine. Yes, that sounds like a viable thing (whether the artificial iret is going to be needed here [and not elsewhere] is a different thing, see my other response regarding the PV case). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:33:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:33:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIUD-00086r-RY; Tue, 13 Nov 2012 15:33:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIUC-00086m-ND for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:33:12 +0000 Received: from [85.158.138.51:19043] by server-12.bemta-3.messagelabs.com id 1D/66-22757-33862A05; Tue, 13 Nov 2012 15:33:07 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-174.messagelabs.com!1352820784!29854699!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3352 invoked from network); 13 Nov 2012 15:33:04 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-174.messagelabs.com with SMTP; 13 Nov 2012 15:33:04 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Tue, 13 Nov 2012 15:34:02 +0000 Message-Id: <50A2763B02000078000A8384@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Tue, 13 Nov 2012 15:32:59 +0000 From: "Jan Beulich" To: "Tim Deegan" References: <50A23F3102000078000A80BE@nat28.tlf.novell.com> <20121113114714.GB44675@ocelot.phlegethon.org> <20121113120555.GC44675@ocelot.phlegethon.org> <1352809049.7491.70.camel@zakaz.uk.xensource.com> <20121113123910.GE44675@ocelot.phlegethon.org> <50A2656C02000078000A82D4@nat28.tlf.novell.com> <20121113144356.GG44675@ocelot.phlegethon.org> <50A26D9C02000078000A8322@nat28.tlf.novell.com> <20121113152134.GH44675@ocelot.phlegethon.org> In-Reply-To: <20121113152134.GH44675@ocelot.phlegethon.org> Mime-Version: 1.0 Content-Disposition: inline Cc: Malcolm Crossley , "eddie.dong@intel.com" , Ian Campbell , "jun.nakajima@intel.com" , xen-devel Subject: Re: [Xen-devel] [PATCH] [RFC PATCH] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> On 13.11.12 at 16:21, Tim Deegan wrote: > I think that the NMI case needs to move to the top of the vmexit > handler, beside the machine_check cases. Once it's there, either the > direct call (+ artifical iret to clear the masking) or int $2 should be > fine. Yes, that sounds like a viable thing (whether the artificial iret is going to be needed here [and not elsewhere] is a different thing, see my other response regarding the PV case). Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:41:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:41:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIcD-0008NN-Qh; Tue, 13 Nov 2012 15:41:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIcB-0008NI-Ou for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:41:27 +0000 Received: from [85.158.139.211:53548] by server-13.bemta-5.messagelabs.com id 78/E7-27809-62A62A05; Tue, 13 Nov 2012 15:41:26 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352821284!18518336!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9918 invoked from network); 13 Nov 2012 15:41:26 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:41:26 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214346579" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:41:24 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:41:24 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIc7-0008FX-JB; Tue, 13 Nov 2012 15:41:23 +0000 Date: Tue, 13 Nov 2012 15:40:51 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: "xen-devel@lists.xensource.com" Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH v2 0/7] xen/arm: run on real hardware X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, this is a collection of fixes that I wrote trying to run Xen on a real Versatile Express Cortex A15 machine. Changes in v2: - rework the first patch to fix vgic emulation; - fix code style in head.S; - more comments in head.S; - always hook xen_fixmap in the pagetable but fill in the console fixmap only if EARLY_UART_ADDRESS; - detect the processor ID and call a processor specific initialization function; - move the ACTLR initialization to the CortexA15 initialization function; - move the ACTLR_* defines to processor-ca15.h; - use preprocessor definitions in kick_cpus; - do not manually increment the base address register, use an offset instead; - move kick_cpus to proc-ca15.S; - add a comment to described why we need a DSB at the beginning of write_pte; - do not issue ISB within write_pte, call isb() afterwards whenever appropriate; - issue DSB after DCCMVAC in write_pte to make sure that the data flush is completed before proceeding; - make flush_xen_dcache_va take a void* as argument; - introduce flush_xen_dcache_va_range; - return always at least 1 cpu from device_tree_cpus; - skip nodes with names that don't start with "cpu". Stefano Stabellini (7): xen/arm: pass the correct bit-per-interrupt argument to vgic_irq_rank xen/arm: setup the fixmap in head.S pl011: set baud and clock_hz to the right defaults for Versatile Express xen/arm: set the SMP bit in the ACTLR register xen/arm: wake up secondary cpus xen/arm: flush D-cache and I-cache when appropriate xen/arm: get the number of cpus from device tree xen/arch/arm/Makefile | 1 + xen/arch/arm/early_printk.c | 5 +- xen/arch/arm/gic.c | 4 +- xen/arch/arm/gic.h | 4 +- xen/arch/arm/head.S | 67 ++++++++++++++++++++++--------- xen/arch/arm/mm.c | 20 ++++++++- xen/arch/arm/mode_switch.S | 28 +++++++++++++ xen/arch/arm/proc-ca15.S | 28 +++++++++++++ xen/arch/arm/setup.c | 9 +++- xen/arch/arm/smpboot.c | 2 + xen/arch/arm/vgic.c | 25 ++++++------ xen/common/device_tree.c | 19 +++++++++ xen/drivers/char/pl011.c | 4 +- xen/include/asm-arm/cpregs.h | 1 + xen/include/asm-arm/page.h | 51 ++++++++++++++++++++++- xen/include/asm-arm/platform_vexpress.h | 17 ++++++++ xen/include/asm-arm/processor-ca15.h | 45 +++++++++++++++++++++ xen/include/asm-arm/processor.h | 3 + xen/include/xen/device_tree.h | 1 + 19 files changed, 285 insertions(+), 49 deletions(-) Cheers, Stefano _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:41:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:41:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIcD-0008NN-Qh; Tue, 13 Nov 2012 15:41:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIcB-0008NI-Ou for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:41:27 +0000 Received: from [85.158.139.211:53548] by server-13.bemta-5.messagelabs.com id 78/E7-27809-62A62A05; Tue, 13 Nov 2012 15:41:26 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1352821284!18518336!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9918 invoked from network); 13 Nov 2012 15:41:26 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:41:26 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214346579" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:41:24 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:41:24 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIc7-0008FX-JB; Tue, 13 Nov 2012 15:41:23 +0000 Date: Tue, 13 Nov 2012 15:40:51 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: "xen-devel@lists.xensource.com" Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Cc: "Tim \(Xen.org\)" , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH v2 0/7] xen/arm: run on real hardware X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi all, this is a collection of fixes that I wrote trying to run Xen on a real Versatile Express Cortex A15 machine. Changes in v2: - rework the first patch to fix vgic emulation; - fix code style in head.S; - more comments in head.S; - always hook xen_fixmap in the pagetable but fill in the console fixmap only if EARLY_UART_ADDRESS; - detect the processor ID and call a processor specific initialization function; - move the ACTLR initialization to the CortexA15 initialization function; - move the ACTLR_* defines to processor-ca15.h; - use preprocessor definitions in kick_cpus; - do not manually increment the base address register, use an offset instead; - move kick_cpus to proc-ca15.S; - add a comment to described why we need a DSB at the beginning of write_pte; - do not issue ISB within write_pte, call isb() afterwards whenever appropriate; - issue DSB after DCCMVAC in write_pte to make sure that the data flush is completed before proceeding; - make flush_xen_dcache_va take a void* as argument; - introduce flush_xen_dcache_va_range; - return always at least 1 cpu from device_tree_cpus; - skip nodes with names that don't start with "cpu". Stefano Stabellini (7): xen/arm: pass the correct bit-per-interrupt argument to vgic_irq_rank xen/arm: setup the fixmap in head.S pl011: set baud and clock_hz to the right defaults for Versatile Express xen/arm: set the SMP bit in the ACTLR register xen/arm: wake up secondary cpus xen/arm: flush D-cache and I-cache when appropriate xen/arm: get the number of cpus from device tree xen/arch/arm/Makefile | 1 + xen/arch/arm/early_printk.c | 5 +- xen/arch/arm/gic.c | 4 +- xen/arch/arm/gic.h | 4 +- xen/arch/arm/head.S | 67 ++++++++++++++++++++++--------- xen/arch/arm/mm.c | 20 ++++++++- xen/arch/arm/mode_switch.S | 28 +++++++++++++ xen/arch/arm/proc-ca15.S | 28 +++++++++++++ xen/arch/arm/setup.c | 9 +++- xen/arch/arm/smpboot.c | 2 + xen/arch/arm/vgic.c | 25 ++++++------ xen/common/device_tree.c | 19 +++++++++ xen/drivers/char/pl011.c | 4 +- xen/include/asm-arm/cpregs.h | 1 + xen/include/asm-arm/page.h | 51 ++++++++++++++++++++++- xen/include/asm-arm/platform_vexpress.h | 17 ++++++++ xen/include/asm-arm/processor-ca15.h | 45 +++++++++++++++++++++ xen/include/asm-arm/processor.h | 3 + xen/include/xen/device_tree.h | 1 + 19 files changed, 285 insertions(+), 49 deletions(-) Cheers, Stefano _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-0008W9-33; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdh-0008V1-Pp for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:02 +0000 Received: from [85.158.139.83:13859] by server-14.bemta-5.messagelabs.com id E9/AC-21768-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!4 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27147 invoked from network); 13 Nov 2012 15:43:00 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:43:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429021" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-FG; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:15 +0000 Message-ID: <1352821336-25837-6-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org - invalidate tlb after setting WXN; - flush D-cache and I-cache after relocation; - flush D-cache after writing to smp_up_cpu; - flush TLB before changing HTTBR; - flush I-cache after changing HTTBR; - flush I-cache and branch predictor after writing Xen text ptes. Changes in v2: - fix a wrong comment; - add a comment to described why we need a DSB at the beginning of write_pte; - do not issue ISB within write_pte, call isb() afterwards whenever appropriate; - issue DSB after DCCMVAC in write_pte to make sure that the data flush is completed before proceeding; - make flush_xen_dcache_va take a void* as argument; - introduce flush_xen_dcache_va_range. Signed-off-by: Stefano Stabellini --- xen/arch/arm/head.S | 9 +++++++ xen/arch/arm/mm.c | 18 +++++++++++++- xen/arch/arm/setup.c | 4 +++ xen/arch/arm/smpboot.c | 2 + xen/include/asm-arm/page.h | 51 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 79 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 3fe6412..4de4d95 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -278,8 +278,15 @@ paging: ldr r4, =boot_httbr /* VA of HTTBR value stashed by CPU 0 */ add r4, r4, r10 /* PA of it */ ldrd r4, r5, [r4] /* Actual value */ + dsb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb + isb mcrr CP64(r4, r5, HTTBR) + dsb + isb mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ mcr CP32(r0, BPIALL) /* Flush branch predictor */ dsb /* Ensure completion of TLB+BP flush */ isb @@ -292,6 +299,8 @@ paging: teq r2, #0 bne 1b dsb + mcr CP32(r0, DCCMVAC) /* flush D-Cache */ + dsb /* Here, the non-boot CPUs must wait again -- they're now running on * the boot CPU's pagetables so it's safe for the boot CPU to diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d0cd2c9..3d25153 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -32,6 +32,7 @@ #include #include +int __read_mostly cacheline_bytes = MIN_CACHELINE_BYTES; struct domain *dom_xen, *dom_io; /* Static start-of-day pagetables that we use before the allocators are up */ @@ -244,10 +245,17 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Change pagetables to the copy in the relocated Xen */ boot_httbr = (unsigned long) xen_pgtable + phys_offset; + flush_xen_dcache_va(&boot_httbr); + flush_xen_dcache_va_range((void*)dest_va, _end - _start); + isb(); + flush_xen_text_tlb(); + asm volatile ( STORE_CP64(0, HTTBR) /* Change translation base */ "dsb;" /* Ensure visibility of HTTBR update */ + "isb;" STORE_CP32(0, TLBIALLH) /* Flush hypervisor TLB */ + STORE_CP32(0, ICIALLU) /* Flush I-cache */ STORE_CP32(0, BPIALL) /* Flush branch predictor */ "dsb;" /* Ensure completion of TLB+BP flush */ "isb;" @@ -256,6 +264,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Undo the temporary map */ pte.bits = 0; write_pte(xen_second + second_table_offset(dest_va), pte); + isb(); flush_xen_text_tlb(); /* Link in the fixmap pagetable */ @@ -291,11 +300,14 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) >> PAGE_SHIFT); pte.pt.table = 1; write_pte(xen_second + second_linear_offset(XEN_VIRT_START), pte); - /* Have changed a mapping used for .text. Flush everything for safety. */ - flush_xen_text_tlb(); + /* ISB is needed because we changed the text mappings */ + isb(); /* From now on, no mapping may be both writable and executable. */ WRITE_CP32(READ_CP32(HSCTLR) | SCTLR_WXN, HSCTLR); + isb(); + /* Flush everything after setting WXN bit. */ + flush_xen_text_tlb(); } /* MMU setup for secondary CPUS (which already have paging enabled) */ @@ -303,6 +315,8 @@ void __cpuinit mmu_init_secondary_cpu(void) { /* From now on, no mapping may be both writable and executable. */ WRITE_CP32(READ_CP32(HSCTLR) | SCTLR_WXN, HSCTLR); + isb(); + flush_xen_text_tlb(); } /* Create Xen's mappings of memory. diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6fbcb81..a579a56 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -185,6 +185,10 @@ void __init start_xen(unsigned long boot_phys_offset, size_t fdt_size; int cpus, i; + cacheline_bytes = READ_CP32(CCSIDR); + if ( cacheline_bytes < MIN_CACHELINE_BYTES ) + panic("CPU has preposterously small cache lines"); + fdt = (void *)BOOT_MISC_VIRT_START + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c0750c0..f4fd512 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -105,6 +105,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Tell the next CPU to get ready */ /* TODO: handle boards where CPUIDs are not contiguous */ *gate = i; + flush_xen_dcache_va(gate); asm volatile("dsb; isb; sev"); /* And wait for it to respond */ while ( ready_cpus < i ) @@ -201,6 +202,7 @@ int __cpu_up(unsigned int cpu) /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ smp_up_cpu = cpu; + flush_xen_dcache_va(&smp_up_cpu); asm volatile("dsb; isb; sev"); while ( !cpu_online(cpu) ) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 9511c45..1b1d556 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -228,27 +228,72 @@ static inline lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr) return e; } -/* Write a pagetable entry */ +/* Write a pagetable entry. + * + * If the table entry is changing a text mapping, it is responsibility + * of the caller to issue an ISB after write_pte. + */ static inline void write_pte(lpae_t *p, lpae_t pte) { asm volatile ( + /* Ensure any writes have completed with the old mappings. */ + "dsb;" /* Safely write the entry (STRD is atomic on CPUs that support LPAE) */ "strd %0, %H0, [%1];" + "dsb;" /* Push this cacheline to the PoC so the rest of the system sees it. */ STORE_CP32(1, DCCMVAC) + /* Ensure that the data flush is completed before proceeding */ + "dsb;" : : "r" (pte.bits), "r" (p) : "memory"); } + +#define MIN_CACHELINE_BYTES 32 +extern int cacheline_bytes; + +/* Function for flushing medium-sized areas. + * if 'range' is large enough we might want to use model-specific + * full-cache flushes. */ +static inline void flush_xen_dcache_va_range(void *p, unsigned long size) +{ + void *end; + dsb(); /* So the CPU issues all writes to the range */ + for ( end = p + size; p < end; p += cacheline_bytes ) + WRITE_CP32((uint32_t) p, DCCMVAC); + dsb(); /* So we know the flushes happen before continuing */ +} + + +/* Macro for flushing a single small item. The predicate is always + * compile-time constant so this will compile down to 3 instructions in + * the common case. Make sure to call it with the correct type of + * pointer! */ +#define flush_xen_dcache_va(p) do { \ + typeof(p) _p = (p); \ + if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ + flush_xen_dcache_va_range(_p, sizeof *_p); \ + else \ + asm volatile ( \ + "dsb;" /* Finish all earlier writes */ \ + STORE_CP32(0, DCCMVAC) \ + "dsb;" /* Finish flush before continuing */ \ + : : "r" (_p), "m" (*_p)); \ +} while (0) + + /* * Flush all hypervisor mappings from the TLB and branch predictor. - * This is needed after changing Xen code mappings. + * This is needed after changing Xen code mappings. + * + * The caller needs to issue the necessary barriers before this functions. */ static inline void flush_xen_text_tlb(void) { register unsigned long r0 asm ("r0"); asm volatile ( - "dsb;" /* Ensure visibility of PTE writes */ STORE_CP32(0, TLBIALLH) /* Flush hypervisor TLB */ + STORE_CP32(0, ICIALLU) /* Flush I-cache */ STORE_CP32(0, BPIALL) /* Flush branch predictor */ "dsb;" /* Ensure completion of TLB+BP flush */ "isb;" -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdg-0008Uh-A0; Tue, 13 Nov 2012 15:43:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdf-0008US-BL for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:42:59 +0000 Received: from [85.158.139.211:37782] by server-11.bemta-5.messagelabs.com id D8/6A-03409-28A62A05; Tue, 13 Nov 2012 15:42:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352821376!19966884!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17150 invoked from network); 13 Nov 2012 15:42:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214346974" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-BM; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:12 +0000 Message-ID: <1352821336-25837-3-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 3/7] pl011: set baud and clock_hz to the right defaults for Versatile Express X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/drivers/char/pl011.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 6af45aa..6ccb73a 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -241,8 +241,8 @@ void __init pl011_init(int index, unsigned long register_base_address) uart = &pl011_com[index]; - uart->clock_hz = 7372800; - uart->baud = 115200; + uart->clock_hz = 0x16e3600; + uart->baud = 38400; uart->data_bits = 8; uart->parity = PARITY_NONE; uart->stop_bits = 1; -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-00004v-Rg; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008Ub-ON for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:03 +0000 Received: from [85.158.139.211:58313] by server-5.bemta-5.messagelabs.com id D6/CB-11353-68A62A05; Tue, 13 Nov 2012 15:43:02 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352821376!19966884!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17293 invoked from network); 13 Nov 2012 15:43:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:43:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214347008" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:43:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:43:01 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-H7; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:16 +0000 Message-ID: <1352821336-25837-7-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 7/7] xen/arm: get the number of cpus from device tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The system might have fewer cpus than the GIC supports. Changes in v2: - return always at least 1 cpu; - skip nodes with names that don't start with "cpu". Signed-off-by: Stefano Stabellini --- xen/arch/arm/gic.c | 4 +--- xen/arch/arm/gic.h | 2 +- xen/arch/arm/setup.c | 3 ++- xen/common/device_tree.c | 19 +++++++++++++++++++ xen/include/xen/device_tree.h | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 5f06e08..0c6fab9 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -304,7 +304,7 @@ static void __cpuinit gic_hyp_disable(void) } /* Set up the GIC */ -int __init gic_init(void) +void __init gic_init(void) { /* XXX FIXME get this from devicetree */ gic.dbase = GIC_BASE_ADDRESS + GIC_DR_OFFSET; @@ -328,8 +328,6 @@ int __init gic_init(void) gic.lr_mask = 0ULL; spin_unlock(&gic.lock); - - return gic.cpus; } /* Set up the per-CPU parts of the GIC for a secondary CPU */ diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h index b2e1d7f..1bf1b02 100644 --- a/xen/arch/arm/gic.h +++ b/xen/arch/arm/gic.h @@ -147,7 +147,7 @@ extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, /* Accept an interrupt from the GIC and dispatch its handler */ extern void gic_interrupt(struct cpu_user_regs *regs, int is_fiq); /* Bring up the interrupt controller, and report # cpus attached */ -extern int gic_init(void); +extern void gic_init(void); /* Bring up a secondary CPU's per-CPU GIC interface */ extern void gic_init_secondary_cpu(void); /* Take down a CPU's per-CPU GIC interface */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a579a56..632e7e3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -193,6 +193,7 @@ void __init start_xen(unsigned long boot_phys_offset, + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); + cpus = device_tree_cpus(fdt); cmdline_parse(device_tree_bootargs(fdt)); setup_pagetables(boot_phys_offset, get_xen_paddr()); @@ -203,7 +204,7 @@ void __init start_xen(unsigned long boot_phys_offset, console_init_preirq(); #endif - cpus = gic_init(); + gic_init(); make_cpus_ready(cpus, boot_phys_offset); percpu_init_areas(); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d1f0f4..5b6dab9 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -153,6 +153,25 @@ const char *device_tree_bootargs(const void *fdt) return prop->data; } +int device_tree_cpus(const void *fdt) +{ + int node = 0, depth = 1; + int cpus = 0; + + node = fdt_path_offset(fdt, "/cpus/cpu"); + if ( node < 0 ) + return 1; /* we have at least one cpu */ + + while ( node >= 0 && depth >= 0 ) { + if ( strncmp(fdt_get_name(fdt, node, NULL), "cpu", 3) ) + continue; + node = fdt_next_node(fdt, node, &depth); + cpus++; + } + + return cpus > 0 ? cpus : 1; +} + static int dump_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, void *data) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 4d010c0..46bc0f8 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -49,6 +49,7 @@ bool_t device_tree_node_matches(const void *fdt, int node, const char *match); int device_tree_for_each_node(const void *fdt, device_tree_node_func func, void *data); const char *device_tree_bootargs(const void *fdt); +int device_tree_cpus(const void *fdt); void device_tree_dump(const void *fdt); #endif -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-0008W9-33; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdh-0008V1-Pp for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:02 +0000 Received: from [85.158.139.83:13859] by server-14.bemta-5.messagelabs.com id E9/AC-21768-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!4 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27147 invoked from network); 13 Nov 2012 15:43:00 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:43:00 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429021" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-FG; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:15 +0000 Message-ID: <1352821336-25837-6-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 6/7] xen/arm: flush D-cache and I-cache when appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org - invalidate tlb after setting WXN; - flush D-cache and I-cache after relocation; - flush D-cache after writing to smp_up_cpu; - flush TLB before changing HTTBR; - flush I-cache after changing HTTBR; - flush I-cache and branch predictor after writing Xen text ptes. Changes in v2: - fix a wrong comment; - add a comment to described why we need a DSB at the beginning of write_pte; - do not issue ISB within write_pte, call isb() afterwards whenever appropriate; - issue DSB after DCCMVAC in write_pte to make sure that the data flush is completed before proceeding; - make flush_xen_dcache_va take a void* as argument; - introduce flush_xen_dcache_va_range. Signed-off-by: Stefano Stabellini --- xen/arch/arm/head.S | 9 +++++++ xen/arch/arm/mm.c | 18 +++++++++++++- xen/arch/arm/setup.c | 4 +++ xen/arch/arm/smpboot.c | 2 + xen/include/asm-arm/page.h | 51 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 79 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 3fe6412..4de4d95 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -278,8 +278,15 @@ paging: ldr r4, =boot_httbr /* VA of HTTBR value stashed by CPU 0 */ add r4, r4, r10 /* PA of it */ ldrd r4, r5, [r4] /* Actual value */ + dsb + mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + dsb + isb mcrr CP64(r4, r5, HTTBR) + dsb + isb mcr CP32(r0, TLBIALLH) /* Flush hypervisor TLB */ + mcr CP32(r0, ICIALLU) /* Flush I-cache */ mcr CP32(r0, BPIALL) /* Flush branch predictor */ dsb /* Ensure completion of TLB+BP flush */ isb @@ -292,6 +299,8 @@ paging: teq r2, #0 bne 1b dsb + mcr CP32(r0, DCCMVAC) /* flush D-Cache */ + dsb /* Here, the non-boot CPUs must wait again -- they're now running on * the boot CPU's pagetables so it's safe for the boot CPU to diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d0cd2c9..3d25153 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -32,6 +32,7 @@ #include #include +int __read_mostly cacheline_bytes = MIN_CACHELINE_BYTES; struct domain *dom_xen, *dom_io; /* Static start-of-day pagetables that we use before the allocators are up */ @@ -244,10 +245,17 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Change pagetables to the copy in the relocated Xen */ boot_httbr = (unsigned long) xen_pgtable + phys_offset; + flush_xen_dcache_va(&boot_httbr); + flush_xen_dcache_va_range((void*)dest_va, _end - _start); + isb(); + flush_xen_text_tlb(); + asm volatile ( STORE_CP64(0, HTTBR) /* Change translation base */ "dsb;" /* Ensure visibility of HTTBR update */ + "isb;" STORE_CP32(0, TLBIALLH) /* Flush hypervisor TLB */ + STORE_CP32(0, ICIALLU) /* Flush I-cache */ STORE_CP32(0, BPIALL) /* Flush branch predictor */ "dsb;" /* Ensure completion of TLB+BP flush */ "isb;" @@ -256,6 +264,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Undo the temporary map */ pte.bits = 0; write_pte(xen_second + second_table_offset(dest_va), pte); + isb(); flush_xen_text_tlb(); /* Link in the fixmap pagetable */ @@ -291,11 +300,14 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) >> PAGE_SHIFT); pte.pt.table = 1; write_pte(xen_second + second_linear_offset(XEN_VIRT_START), pte); - /* Have changed a mapping used for .text. Flush everything for safety. */ - flush_xen_text_tlb(); + /* ISB is needed because we changed the text mappings */ + isb(); /* From now on, no mapping may be both writable and executable. */ WRITE_CP32(READ_CP32(HSCTLR) | SCTLR_WXN, HSCTLR); + isb(); + /* Flush everything after setting WXN bit. */ + flush_xen_text_tlb(); } /* MMU setup for secondary CPUS (which already have paging enabled) */ @@ -303,6 +315,8 @@ void __cpuinit mmu_init_secondary_cpu(void) { /* From now on, no mapping may be both writable and executable. */ WRITE_CP32(READ_CP32(HSCTLR) | SCTLR_WXN, HSCTLR); + isb(); + flush_xen_text_tlb(); } /* Create Xen's mappings of memory. diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6fbcb81..a579a56 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -185,6 +185,10 @@ void __init start_xen(unsigned long boot_phys_offset, size_t fdt_size; int cpus, i; + cacheline_bytes = READ_CP32(CCSIDR); + if ( cacheline_bytes < MIN_CACHELINE_BYTES ) + panic("CPU has preposterously small cache lines"); + fdt = (void *)BOOT_MISC_VIRT_START + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c0750c0..f4fd512 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -105,6 +105,7 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Tell the next CPU to get ready */ /* TODO: handle boards where CPUIDs are not contiguous */ *gate = i; + flush_xen_dcache_va(gate); asm volatile("dsb; isb; sev"); /* And wait for it to respond */ while ( ready_cpus < i ) @@ -201,6 +202,7 @@ int __cpu_up(unsigned int cpu) /* Unblock the CPU. It should be waiting in the loop in head.S * for an event to arrive when smp_up_cpu matches its cpuid. */ smp_up_cpu = cpu; + flush_xen_dcache_va(&smp_up_cpu); asm volatile("dsb; isb; sev"); while ( !cpu_online(cpu) ) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 9511c45..1b1d556 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -228,27 +228,72 @@ static inline lpae_t mfn_to_p2m_entry(unsigned long mfn, unsigned int mattr) return e; } -/* Write a pagetable entry */ +/* Write a pagetable entry. + * + * If the table entry is changing a text mapping, it is responsibility + * of the caller to issue an ISB after write_pte. + */ static inline void write_pte(lpae_t *p, lpae_t pte) { asm volatile ( + /* Ensure any writes have completed with the old mappings. */ + "dsb;" /* Safely write the entry (STRD is atomic on CPUs that support LPAE) */ "strd %0, %H0, [%1];" + "dsb;" /* Push this cacheline to the PoC so the rest of the system sees it. */ STORE_CP32(1, DCCMVAC) + /* Ensure that the data flush is completed before proceeding */ + "dsb;" : : "r" (pte.bits), "r" (p) : "memory"); } + +#define MIN_CACHELINE_BYTES 32 +extern int cacheline_bytes; + +/* Function for flushing medium-sized areas. + * if 'range' is large enough we might want to use model-specific + * full-cache flushes. */ +static inline void flush_xen_dcache_va_range(void *p, unsigned long size) +{ + void *end; + dsb(); /* So the CPU issues all writes to the range */ + for ( end = p + size; p < end; p += cacheline_bytes ) + WRITE_CP32((uint32_t) p, DCCMVAC); + dsb(); /* So we know the flushes happen before continuing */ +} + + +/* Macro for flushing a single small item. The predicate is always + * compile-time constant so this will compile down to 3 instructions in + * the common case. Make sure to call it with the correct type of + * pointer! */ +#define flush_xen_dcache_va(p) do { \ + typeof(p) _p = (p); \ + if ( (sizeof *_p) > MIN_CACHELINE_BYTES ) \ + flush_xen_dcache_va_range(_p, sizeof *_p); \ + else \ + asm volatile ( \ + "dsb;" /* Finish all earlier writes */ \ + STORE_CP32(0, DCCMVAC) \ + "dsb;" /* Finish flush before continuing */ \ + : : "r" (_p), "m" (*_p)); \ +} while (0) + + /* * Flush all hypervisor mappings from the TLB and branch predictor. - * This is needed after changing Xen code mappings. + * This is needed after changing Xen code mappings. + * + * The caller needs to issue the necessary barriers before this functions. */ static inline void flush_xen_text_tlb(void) { register unsigned long r0 asm ("r0"); asm volatile ( - "dsb;" /* Ensure visibility of PTE writes */ STORE_CP32(0, TLBIALLH) /* Flush hypervisor TLB */ + STORE_CP32(0, ICIALLU) /* Flush I-cache */ STORE_CP32(0, BPIALL) /* Flush branch predictor */ "dsb;" /* Ensure completion of TLB+BP flush */ "isb;" -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdg-0008Uh-A0; Tue, 13 Nov 2012 15:43:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdf-0008US-BL for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:42:59 +0000 Received: from [85.158.139.211:37782] by server-11.bemta-5.messagelabs.com id D8/6A-03409-28A62A05; Tue, 13 Nov 2012 15:42:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352821376!19966884!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17150 invoked from network); 13 Nov 2012 15:42:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214346974" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-BM; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:12 +0000 Message-ID: <1352821336-25837-3-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 3/7] pl011: set baud and clock_hz to the right defaults for Versatile Express X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/drivers/char/pl011.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 6af45aa..6ccb73a 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -241,8 +241,8 @@ void __init pl011_init(int index, unsigned long register_base_address) uart = &pl011_com[index]; - uart->clock_hz = 7372800; - uart->baud = 115200; + uart->clock_hz = 0x16e3600; + uart->baud = 38400; uart->data_bits = 8; uart->parity = PARITY_NONE; uart->stop_bits = 1; -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-00004v-Rg; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008Ub-ON for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:03 +0000 Received: from [85.158.139.211:58313] by server-5.bemta-5.messagelabs.com id D6/CB-11353-68A62A05; Tue, 13 Nov 2012 15:43:02 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1352821376!19966884!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17293 invoked from network); 13 Nov 2012 15:43:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:43:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214347008" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:43:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:43:01 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-H7; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:16 +0000 Message-ID: <1352821336-25837-7-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 7/7] xen/arm: get the number of cpus from device tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The system might have fewer cpus than the GIC supports. Changes in v2: - return always at least 1 cpu; - skip nodes with names that don't start with "cpu". Signed-off-by: Stefano Stabellini --- xen/arch/arm/gic.c | 4 +--- xen/arch/arm/gic.h | 2 +- xen/arch/arm/setup.c | 3 ++- xen/common/device_tree.c | 19 +++++++++++++++++++ xen/include/xen/device_tree.h | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 5f06e08..0c6fab9 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -304,7 +304,7 @@ static void __cpuinit gic_hyp_disable(void) } /* Set up the GIC */ -int __init gic_init(void) +void __init gic_init(void) { /* XXX FIXME get this from devicetree */ gic.dbase = GIC_BASE_ADDRESS + GIC_DR_OFFSET; @@ -328,8 +328,6 @@ int __init gic_init(void) gic.lr_mask = 0ULL; spin_unlock(&gic.lock); - - return gic.cpus; } /* Set up the per-CPU parts of the GIC for a secondary CPU */ diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h index b2e1d7f..1bf1b02 100644 --- a/xen/arch/arm/gic.h +++ b/xen/arch/arm/gic.h @@ -147,7 +147,7 @@ extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, /* Accept an interrupt from the GIC and dispatch its handler */ extern void gic_interrupt(struct cpu_user_regs *regs, int is_fiq); /* Bring up the interrupt controller, and report # cpus attached */ -extern int gic_init(void); +extern void gic_init(void); /* Bring up a secondary CPU's per-CPU GIC interface */ extern void gic_init_secondary_cpu(void); /* Take down a CPU's per-CPU GIC interface */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index a579a56..632e7e3 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -193,6 +193,7 @@ void __init start_xen(unsigned long boot_phys_offset, + (atag_paddr & ((1 << SECOND_SHIFT) - 1)); fdt_size = device_tree_early_init(fdt); + cpus = device_tree_cpus(fdt); cmdline_parse(device_tree_bootargs(fdt)); setup_pagetables(boot_phys_offset, get_xen_paddr()); @@ -203,7 +204,7 @@ void __init start_xen(unsigned long boot_phys_offset, console_init_preirq(); #endif - cpus = gic_init(); + gic_init(); make_cpus_ready(cpus, boot_phys_offset); percpu_init_areas(); diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d1f0f4..5b6dab9 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -153,6 +153,25 @@ const char *device_tree_bootargs(const void *fdt) return prop->data; } +int device_tree_cpus(const void *fdt) +{ + int node = 0, depth = 1; + int cpus = 0; + + node = fdt_path_offset(fdt, "/cpus/cpu"); + if ( node < 0 ) + return 1; /* we have at least one cpu */ + + while ( node >= 0 && depth >= 0 ) { + if ( strncmp(fdt_get_name(fdt, node, NULL), "cpu", 3) ) + continue; + node = fdt_next_node(fdt, node, &depth); + cpus++; + } + + return cpus > 0 ? cpus : 1; +} + static int dump_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, void *data) { diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 4d010c0..46bc0f8 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -49,6 +49,7 @@ bool_t device_tree_node_matches(const void *fdt, int node, const char *match); int device_tree_for_each_node(const void *fdt, device_tree_node_func func, void *data); const char *device_tree_bootargs(const void *fdt); +int device_tree_cpus(const void *fdt); void device_tree_dump(const void *fdt); #endif -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdl-00005B-8P; Tue, 13 Nov 2012 15:43:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdj-0008Uv-28 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:03 +0000 Received: from [85.158.138.51:32016] by server-14.bemta-3.messagelabs.com id A1/16-12788-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352821378!21780108!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 832 invoked from network); 13 Nov 2012 15:42:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429020" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-Ej; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:14 +0000 Message-ID: <1352821336-25837-5-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 5/7] xen/arm: wake up secondary cpus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Secondary cpus are held by the firmware until we send an IPI to them. Changes in v2: - use preprocessor definitions in kick_cpus; - do not manually increment the base address register, use an offset instead; - move kick_cpus to proc-ca15.S. Signed-off-by: Stefano Stabellini --- xen/arch/arm/gic.h | 2 ++ xen/arch/arm/head.S | 8 ++++++-- xen/arch/arm/mode_switch.S | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/platform_vexpress.h | 17 +++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 xen/include/asm-arm/platform_vexpress.h diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h index b8f9f201..b2e1d7f 100644 --- a/xen/arch/arm/gic.h +++ b/xen/arch/arm/gic.h @@ -124,6 +124,7 @@ /* XXX: write this into the DT */ #define VGIC_IRQ_EVTCHN_CALLBACK 31 +#ifndef __ASSEMBLY__ extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); @@ -158,6 +159,7 @@ extern int gicv_setup(struct domain *d); extern void gic_save_state(struct vcpu *v); extern void gic_restore_state(struct vcpu *v); +#endif /* __ASSEMBLY__ */ #endif /* diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 25993d6..3fe6412 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -80,12 +80,12 @@ start: beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ -1: wfe - dsb +1: dsb ldr r0, =smp_up_cpu /* VA of gate */ add r0, r0, r10 /* PA of gate */ ldr r1, [r0] /* Which CPU is being booted? */ teq r1, r12 /* Is it us? */ + wfene bne 1b boot_cpu: @@ -99,6 +99,10 @@ boot_cpu: PRINT(" booting -\r\n") #endif + /* Wake up secondary cpus */ + teq r12, #0 + bleq kick_cpus + /* Check that this CPU has Hyp mode */ mrc CP32(r0, ID_PFR1) and r0, r0, #0xf000 /* Bits 12-15 define virt extensions */ diff --git a/xen/arch/arm/mode_switch.S b/xen/arch/arm/mode_switch.S index 83a682b..7ff2f9e 100644 --- a/xen/arch/arm/mode_switch.S +++ b/xen/arch/arm/mode_switch.S @@ -19,7 +19,35 @@ #include #include +#include #include +#include "gic.h" + + +/* XXX: Versatile Express specific code */ +/* wake up secondary cpus */ +.globl kick_cpus +kick_cpus: + /* write start paddr to v2m sysreg FLAGSSET register */ + ldr r0, =(V2M_SYS_MMIO_BASE) /* base V2M sysreg MMIO address */ + dsb + mov r2, #0xffffffff + str r2, [r0, #(V2M_SYS_FLAGSCLR)] + dsb + ldr r2, =start + add r2, r2, r10 + str r2, [r0, #(V2M_SYS_FLAGSSET)] + dsb + /* send an interrupt */ + ldr r0, =(GIC_BASE_ADDRESS + GIC_DR_OFFSET) /* base GICD MMIO address */ + mov r2, #0x1 + str r2, [r0, #(GICD_CTLR * 4)] /* enable distributor */ + mov r2, #0xfe0000 + str r2, [r0, #(GICD_SGIR * 4)] /* send IPI to everybody */ + dsb + str r2, [r0, #(GICD_CTLR * 4)] /* disable distributor */ + mov pc, lr + /* Get up a CPU into Hyp mode. Clobbers r0-r3. * diff --git a/xen/include/asm-arm/platform_vexpress.h b/xen/include/asm-arm/platform_vexpress.h new file mode 100644 index 0000000..3556af3 --- /dev/null +++ b/xen/include/asm-arm/platform_vexpress.h @@ -0,0 +1,17 @@ +#ifndef __ASM_ARM_PLATFORM_H +#define __ASM_ARM_PLATFORM_H + +/* V2M */ +#define V2M_SYS_MMIO_BASE (0x1c010000) +#define V2M_SYS_FLAGSSET (0x30) +#define V2M_SYS_FLAGSCLR (0x34) + +#endif /* __ASM_ARM_PLATFORM_H */ +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdl-00005B-8P; Tue, 13 Nov 2012 15:43:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdj-0008Uv-28 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:03 +0000 Received: from [85.158.138.51:32016] by server-14.bemta-3.messagelabs.com id A1/16-12788-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-3.tower-174.messagelabs.com!1352821378!21780108!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 832 invoked from network); 13 Nov 2012 15:42:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429020" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-Ej; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:14 +0000 Message-ID: <1352821336-25837-5-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 5/7] xen/arm: wake up secondary cpus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Secondary cpus are held by the firmware until we send an IPI to them. Changes in v2: - use preprocessor definitions in kick_cpus; - do not manually increment the base address register, use an offset instead; - move kick_cpus to proc-ca15.S. Signed-off-by: Stefano Stabellini --- xen/arch/arm/gic.h | 2 ++ xen/arch/arm/head.S | 8 ++++++-- xen/arch/arm/mode_switch.S | 28 ++++++++++++++++++++++++++++ xen/include/asm-arm/platform_vexpress.h | 17 +++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 xen/include/asm-arm/platform_vexpress.h diff --git a/xen/arch/arm/gic.h b/xen/arch/arm/gic.h index b8f9f201..b2e1d7f 100644 --- a/xen/arch/arm/gic.h +++ b/xen/arch/arm/gic.h @@ -124,6 +124,7 @@ /* XXX: write this into the DT */ #define VGIC_IRQ_EVTCHN_CALLBACK 31 +#ifndef __ASSEMBLY__ extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); @@ -158,6 +159,7 @@ extern int gicv_setup(struct domain *d); extern void gic_save_state(struct vcpu *v); extern void gic_restore_state(struct vcpu *v); +#endif /* __ASSEMBLY__ */ #endif /* diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 25993d6..3fe6412 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -80,12 +80,12 @@ start: beq boot_cpu /* If we're CPU 0, boot now */ /* Non-boot CPUs wait here to be woken up one at a time. */ -1: wfe - dsb +1: dsb ldr r0, =smp_up_cpu /* VA of gate */ add r0, r0, r10 /* PA of gate */ ldr r1, [r0] /* Which CPU is being booted? */ teq r1, r12 /* Is it us? */ + wfene bne 1b boot_cpu: @@ -99,6 +99,10 @@ boot_cpu: PRINT(" booting -\r\n") #endif + /* Wake up secondary cpus */ + teq r12, #0 + bleq kick_cpus + /* Check that this CPU has Hyp mode */ mrc CP32(r0, ID_PFR1) and r0, r0, #0xf000 /* Bits 12-15 define virt extensions */ diff --git a/xen/arch/arm/mode_switch.S b/xen/arch/arm/mode_switch.S index 83a682b..7ff2f9e 100644 --- a/xen/arch/arm/mode_switch.S +++ b/xen/arch/arm/mode_switch.S @@ -19,7 +19,35 @@ #include #include +#include #include +#include "gic.h" + + +/* XXX: Versatile Express specific code */ +/* wake up secondary cpus */ +.globl kick_cpus +kick_cpus: + /* write start paddr to v2m sysreg FLAGSSET register */ + ldr r0, =(V2M_SYS_MMIO_BASE) /* base V2M sysreg MMIO address */ + dsb + mov r2, #0xffffffff + str r2, [r0, #(V2M_SYS_FLAGSCLR)] + dsb + ldr r2, =start + add r2, r2, r10 + str r2, [r0, #(V2M_SYS_FLAGSSET)] + dsb + /* send an interrupt */ + ldr r0, =(GIC_BASE_ADDRESS + GIC_DR_OFFSET) /* base GICD MMIO address */ + mov r2, #0x1 + str r2, [r0, #(GICD_CTLR * 4)] /* enable distributor */ + mov r2, #0xfe0000 + str r2, [r0, #(GICD_SGIR * 4)] /* send IPI to everybody */ + dsb + str r2, [r0, #(GICD_CTLR * 4)] /* disable distributor */ + mov pc, lr + /* Get up a CPU into Hyp mode. Clobbers r0-r3. * diff --git a/xen/include/asm-arm/platform_vexpress.h b/xen/include/asm-arm/platform_vexpress.h new file mode 100644 index 0000000..3556af3 --- /dev/null +++ b/xen/include/asm-arm/platform_vexpress.h @@ -0,0 +1,17 @@ +#ifndef __ASM_ARM_PLATFORM_H +#define __ASM_ARM_PLATFORM_H + +/* V2M */ +#define V2M_SYS_MMIO_BASE (0x1c010000) +#define V2M_SYS_FLAGSSET (0x30) +#define V2M_SYS_FLAGSCLR (0x34) + +#endif /* __ASM_ARM_PLATFORM_H */ +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008VW-MU; Tue, 13 Nov 2012 15:43:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdh-0008Ul-2l for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:01 +0000 Received: from [85.158.139.83:13815] by server-8.bemta-5.messagelabs.com id 80/7A-06050-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27091 invoked from network); 13 Nov 2012 15:42:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429019" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-9i; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:11 +0000 Message-ID: <1352821336-25837-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 2/7] xen/arm: setup the fixmap in head.S X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Setup the fixmap mapping directly in head.S rather than having a temporary mapping only to re-do it later in C. Changes in v2: - fix code style; - more comments; - always hook xen_fixmap in the pagetable but fill in the console fixmap only if EARLY_UART_ADDRESS. Signed-off-by: Stefano Stabellini --- xen/arch/arm/early_printk.c | 5 ++--- xen/arch/arm/head.S | 40 +++++++++++++++++++++++----------------- xen/arch/arm/mm.c | 2 +- xen/arch/arm/setup.c | 2 -- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index 3e51252..bdf4c0e 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -17,12 +17,11 @@ #ifdef EARLY_UART_ADDRESS -static void __init early_putch(char c) +void __init early_putch(char c) { volatile uint32_t *r; - r = (uint32_t *)((EARLY_UART_ADDRESS & 0x001fffff) - + XEN_VIRT_START + (1 << 21)); + r = (uint32_t *)(XEN_VIRT_START + (1 << 21)); /* XXX: assuming a PL011 UART. */ while(*(r + 0x6) & 0x8) diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 9fdeda7..4506244 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -24,6 +24,7 @@ #define PT_PT 0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */ #define PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, P=1 */ #define PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, P=1 */ +#define PT_DEV_L3 0xe73 /* lev3: nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=1, P=1 */ #define PT_UPPER(x) (PT_##x & 0xf00) #define PT_LOWER(x) (PT_##x & 0x0ff) @@ -183,6 +184,18 @@ skip_bss: teq r12, #0 bne pt_ready + /* console fixmap */ +#ifdef EARLY_UART_ADDRESS + ldr r1, =xen_fixmap + add r1, r1, r10 /* r1 := paddr (xen_fixmap) */ + mov r3, #0 + lsr r2, r11, #12 + lsl r2, r2, #12 /* 4K aligned paddr of UART */ + orr r2, r2, #PT_UPPER(DEV_L3) + orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ + strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +#endif + /* Build the baseline idle pagetable's first-level entries */ ldr r1, =xen_second add r1, r1, r10 /* r1 := paddr (xen_second) */ @@ -205,17 +218,15 @@ skip_bss: ldr r4, =start lsr r4, #18 /* Slot for vaddr(start) */ strd r2, r3, [r1, r4] /* Map Xen there too */ -#ifdef EARLY_UART_ADDRESS - ldr r3, =(1<<(54-32)) /* NS for device mapping */ - lsr r2, r11, #21 - lsl r2, r2, #21 /* 2MB-aligned paddr of UART */ - orr r2, r2, #PT_UPPER(DEV) - orr r2, r2, #PT_LOWER(DEV) /* r2:r3 := 2MB dev map including UART */ + + /* xen_fixmap pagetable */ + ldr r2, =xen_fixmap + add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ + orr r2, r2, #PT_UPPER(PT) + orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ add r4, r4, #8 strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ -#else - add r4, r4, #8 /* Skip over unused fixmap slot */ -#endif + mov r3, #0x0 lsr r2, r8, #21 lsl r2, r2, #21 /* 2MB-aligned paddr of DTB */ @@ -236,13 +247,10 @@ pt_ready: mov pc, r1 /* Get a proper vaddr into PC */ paging: + #ifdef EARLY_UART_ADDRESS - /* Recover the UART address in the new address space. */ - lsl r11, #11 - lsr r11, #11 /* UART base's offset from 2MB base */ - adr r0, start - add r0, r0, #0x200000 /* vaddr of the fixmap's 2MB slot */ - add r11, r11, r0 /* r11 := vaddr (UART base address) */ + /* Use a virtual address to access the UART. */ + ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) #endif PRINT("- Ready -\r\n") @@ -261,8 +269,6 @@ paging: mcr CP32(r0, BPIALL) /* Flush branch predictor */ dsb /* Ensure completion of TLB+BP flush */ isb - /* Now, the UART is in its proper fixmap address */ - ldrne r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* Non-boot CPUs report that they've got this far */ ldr r0, =ready_cpus diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b0068d2..d0cd2c9 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -37,7 +37,7 @@ struct domain *dom_xen, *dom_io; /* Static start-of-day pagetables that we use before the allocators are up */ lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t xen_second[LPAE_ENTRIES*4] __attribute__((__aligned__(4096*4))); -static lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); static lpae_t xen_xenmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* Non-boot CPUs use this to find the correct pagetables. */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7568968..6fbcb81 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -194,9 +194,7 @@ void __init start_xen(unsigned long boot_phys_offset, setup_pagetables(boot_phys_offset, get_xen_paddr()); #ifdef EARLY_UART_ADDRESS - /* Map the UART */ /* TODO Need to get device tree or command line for UART address */ - set_fixmap(FIXMAP_CONSOLE, EARLY_UART_ADDRESS >> PAGE_SHIFT, DEV_SHARED); pl011_init(0, FIXMAP_ADDR(FIXMAP_CONSOLE)); console_init_preirq(); #endif -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008VA-8j; Tue, 13 Nov 2012 15:43:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdf-0008UU-NC for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:00 +0000 Received: from [85.158.139.83:26229] by server-16.bemta-5.messagelabs.com id F9/71-04786-28A62A05; Tue, 13 Nov 2012 15:42:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27003 invoked from network); 13 Nov 2012 15:42:57 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429016" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-8w; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:10 +0000 Message-ID: <1352821336-25837-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 1/7] xen/arm: pass the correct bit-per-interrupt argument to vgic_irq_rank X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Use 1 for registers that have 1 bit per irq. Changes in v2: - add case 1 to REG_RANK_NR rather than changing the implementation. Signed-off-by: Stefano Stabellini --- xen/arch/arm/vgic.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 3c3983f..3f7e757 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -47,6 +47,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) case 8: return n >> 3; case 4: return n >> 2; case 2: return n >> 1; + case 1: return n; default: BUG(); } } @@ -199,7 +200,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -208,7 +209,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICENABLER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -217,7 +218,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISPENDR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->ipend, dabt.sign, offset); @@ -226,7 +227,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICPENDR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->ipend, dabt.sign, offset); @@ -235,7 +236,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISACTIVER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -244,7 +245,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICACTIVER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -296,7 +297,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_CPENDSGIR ... GICD_CPENDSGIRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_CPENDSGIR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_CPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->pendsgi, dabt.sign, offset); @@ -305,7 +306,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_SPENDSGIR ... GICD_SPENDSGIRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_SPENDSGIR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_SPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->pendsgi, dabt.sign, offset); @@ -400,7 +401,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; @@ -411,7 +412,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->ienable &= ~*r; @@ -432,7 +433,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISACTIVER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -441,7 +442,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICACTIVER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008VW-MU; Tue, 13 Nov 2012 15:43:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdh-0008Ul-2l for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:01 +0000 Received: from [85.158.139.83:13815] by server-8.bemta-5.messagelabs.com id 80/7A-06050-48A62A05; Tue, 13 Nov 2012 15:43:00 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27091 invoked from network); 13 Nov 2012 15:42:59 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429019" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-9i; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:11 +0000 Message-ID: <1352821336-25837-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 2/7] xen/arm: setup the fixmap in head.S X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Setup the fixmap mapping directly in head.S rather than having a temporary mapping only to re-do it later in C. Changes in v2: - fix code style; - more comments; - always hook xen_fixmap in the pagetable but fill in the console fixmap only if EARLY_UART_ADDRESS. Signed-off-by: Stefano Stabellini --- xen/arch/arm/early_printk.c | 5 ++--- xen/arch/arm/head.S | 40 +++++++++++++++++++++++----------------- xen/arch/arm/mm.c | 2 +- xen/arch/arm/setup.c | 2 -- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c index 3e51252..bdf4c0e 100644 --- a/xen/arch/arm/early_printk.c +++ b/xen/arch/arm/early_printk.c @@ -17,12 +17,11 @@ #ifdef EARLY_UART_ADDRESS -static void __init early_putch(char c) +void __init early_putch(char c) { volatile uint32_t *r; - r = (uint32_t *)((EARLY_UART_ADDRESS & 0x001fffff) - + XEN_VIRT_START + (1 << 21)); + r = (uint32_t *)(XEN_VIRT_START + (1 << 21)); /* XXX: assuming a PL011 UART. */ while(*(r + 0x6) & 0x8) diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 9fdeda7..4506244 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -24,6 +24,7 @@ #define PT_PT 0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */ #define PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, P=1 */ #define PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, P=1 */ +#define PT_DEV_L3 0xe73 /* lev3: nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=1, P=1 */ #define PT_UPPER(x) (PT_##x & 0xf00) #define PT_LOWER(x) (PT_##x & 0x0ff) @@ -183,6 +184,18 @@ skip_bss: teq r12, #0 bne pt_ready + /* console fixmap */ +#ifdef EARLY_UART_ADDRESS + ldr r1, =xen_fixmap + add r1, r1, r10 /* r1 := paddr (xen_fixmap) */ + mov r3, #0 + lsr r2, r11, #12 + lsl r2, r2, #12 /* 4K aligned paddr of UART */ + orr r2, r2, #PT_UPPER(DEV_L3) + orr r2, r2, #PT_LOWER(DEV_L3) /* r2:r3 := 4K dev map including UART */ + strd r2, r3, [r1, #(FIXMAP_CONSOLE*8)] /* Map it in the first fixmap's slot */ +#endif + /* Build the baseline idle pagetable's first-level entries */ ldr r1, =xen_second add r1, r1, r10 /* r1 := paddr (xen_second) */ @@ -205,17 +218,15 @@ skip_bss: ldr r4, =start lsr r4, #18 /* Slot for vaddr(start) */ strd r2, r3, [r1, r4] /* Map Xen there too */ -#ifdef EARLY_UART_ADDRESS - ldr r3, =(1<<(54-32)) /* NS for device mapping */ - lsr r2, r11, #21 - lsl r2, r2, #21 /* 2MB-aligned paddr of UART */ - orr r2, r2, #PT_UPPER(DEV) - orr r2, r2, #PT_LOWER(DEV) /* r2:r3 := 2MB dev map including UART */ + + /* xen_fixmap pagetable */ + ldr r2, =xen_fixmap + add r2, r2, r10 /* r2 := paddr (xen_fixmap) */ + orr r2, r2, #PT_UPPER(PT) + orr r2, r2, #PT_LOWER(PT) /* r2:r3 := table map of xen_fixmap */ add r4, r4, #8 strd r2, r3, [r1, r4] /* Map it in the fixmap's slot */ -#else - add r4, r4, #8 /* Skip over unused fixmap slot */ -#endif + mov r3, #0x0 lsr r2, r8, #21 lsl r2, r2, #21 /* 2MB-aligned paddr of DTB */ @@ -236,13 +247,10 @@ pt_ready: mov pc, r1 /* Get a proper vaddr into PC */ paging: + #ifdef EARLY_UART_ADDRESS - /* Recover the UART address in the new address space. */ - lsl r11, #11 - lsr r11, #11 /* UART base's offset from 2MB base */ - adr r0, start - add r0, r0, #0x200000 /* vaddr of the fixmap's 2MB slot */ - add r11, r11, r0 /* r11 := vaddr (UART base address) */ + /* Use a virtual address to access the UART. */ + ldr r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) #endif PRINT("- Ready -\r\n") @@ -261,8 +269,6 @@ paging: mcr CP32(r0, BPIALL) /* Flush branch predictor */ dsb /* Ensure completion of TLB+BP flush */ isb - /* Now, the UART is in its proper fixmap address */ - ldrne r11, =FIXMAP_ADDR(FIXMAP_CONSOLE) /* Non-boot CPUs report that they've got this far */ ldr r0, =ready_cpus diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b0068d2..d0cd2c9 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -37,7 +37,7 @@ struct domain *dom_xen, *dom_io; /* Static start-of-day pagetables that we use before the allocators are up */ lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t xen_second[LPAE_ENTRIES*4] __attribute__((__aligned__(4096*4))); -static lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); +lpae_t xen_fixmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); static lpae_t xen_xenmap[LPAE_ENTRIES] __attribute__((__aligned__(4096))); /* Non-boot CPUs use this to find the correct pagetables. */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7568968..6fbcb81 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -194,9 +194,7 @@ void __init start_xen(unsigned long boot_phys_offset, setup_pagetables(boot_phys_offset, get_xen_paddr()); #ifdef EARLY_UART_ADDRESS - /* Map the UART */ /* TODO Need to get device tree or command line for UART address */ - set_fixmap(FIXMAP_CONSOLE, EARLY_UART_ADDRESS >> PAGE_SHIFT, DEV_SHARED); pl011_init(0, FIXMAP_ADDR(FIXMAP_CONSOLE)); console_init_preirq(); #endif -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008VA-8j; Tue, 13 Nov 2012 15:43:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdf-0008UU-NC for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:00 +0000 Received: from [85.158.139.83:26229] by server-16.bemta-5.messagelabs.com id F9/71-04786-28A62A05; Tue, 13 Nov 2012 15:42:58 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27003 invoked from network); 13 Nov 2012 15:42:57 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:57 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44429016" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-8w; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:10 +0000 Message-ID: <1352821336-25837-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 1/7] xen/arm: pass the correct bit-per-interrupt argument to vgic_irq_rank X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Use 1 for registers that have 1 bit per irq. Changes in v2: - add case 1 to REG_RANK_NR rather than changing the implementation. Signed-off-by: Stefano Stabellini --- xen/arch/arm/vgic.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 3c3983f..3f7e757 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -47,6 +47,7 @@ static inline int REG_RANK_NR(int b, uint32_t n) case 8: return n >> 3; case 4: return n >> 2; case 2: return n >> 1; + case 1: return n; default: BUG(); } } @@ -199,7 +200,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -208,7 +209,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICENABLER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->ienable; @@ -217,7 +218,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISPENDR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->ipend, dabt.sign, offset); @@ -226,7 +227,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICPENDR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICPENDR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->ipend, dabt.sign, offset); @@ -235,7 +236,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISACTIVER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -244,7 +245,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICACTIVER); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = rank->iactive; @@ -296,7 +297,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_CPENDSGIR ... GICD_CPENDSGIRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_CPENDSGIR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_CPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->pendsgi, dabt.sign, offset); @@ -305,7 +306,7 @@ static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) case GICD_SPENDSGIR ... GICD_SPENDSGIRN: if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_SPENDSGIR); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_SPENDSGIR); if ( rank == NULL) goto read_as_zero; vgic_lock_rank(v, rank); *r = byte_read(rank->pendsgi, dabt.sign, offset); @@ -400,7 +401,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISENABLER ... GICD_ISENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); tr = rank->ienable; @@ -411,7 +412,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICENABLER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICENABLER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->ienable &= ~*r; @@ -432,7 +433,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ISACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ISACTIVER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; @@ -441,7 +442,7 @@ static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != 2 ) goto bad_width; - rank = vgic_irq_rank(v, 8, gicd_reg - GICD_ICACTIVER); + rank = vgic_irq_rank(v, 1, gicd_reg - GICD_ICACTIVER); if ( rank == NULL) goto write_ignore; vgic_lock_rank(v, rank); rank->iactive &= ~*r; -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-0008WL-EV; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008Ub-2K for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:02 +0000 Received: from [85.158.139.83:13728] by server-5.bemta-5.messagelabs.com id 4B/BB-11353-38A62A05; Tue, 13 Nov 2012 15:42:59 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27045 invoked from network); 13 Nov 2012 15:42:58 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208,223";a="44429018" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-D2; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:13 +0000 Message-ID: <1352821336-25837-4-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 4/7] xen/arm: set the SMP bit in the ACTLR register X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >From the Cortex A15 manual: "Enables the processor to receive instruction cache, BTB, and TLB maintenance operations from other processors" ... "You must set this bit before enabling the caches and MMU, or performing any cache and TLB maintenance operations. The only time you must clear this bit is during a processor power-down sequence" Changes in v2: - detect the processor ID and call a processor specific initialization function; - move the ACTLR initialization to the CortexA15 initialization function; - move the ACTLR_* defines to processor-ca15.h. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/Makefile | 1 + xen/arch/arm/head.S | 10 +++++++ xen/arch/arm/proc-ca15.S | 28 +++++++++++++++++++++ xen/include/asm-arm/cpregs.h | 1 + xen/include/asm-arm/processor-ca15.h | 45 ++++++++++++++++++++++++++++++++++ xen/include/asm-arm/processor.h | 3 ++ 6 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 xen/arch/arm/proc-ca15.S create mode 100644 xen/include/asm-arm/processor-ca15.h diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 634b620..d3e34bc 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -13,6 +13,7 @@ obj-y += irq.o obj-y += kernel.o obj-y += mm.o obj-y += mode_switch.o +obj-y += proc-ca15.o obj-y += p2m.o obj-y += percpu.o obj-y += guestcopy.o diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 4506244..25993d6 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -19,6 +19,7 @@ #include #include +#include #include #define PT_PT 0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */ @@ -148,6 +149,15 @@ skip_bss: PRINT("- Setting up control registers -\r\n") + /* Read CPU ID */ + mrc CP32(r0, MIDR) + ldr r1, =(MIDR_MASK) + and r0, r0, r1 + /* Is this a Cortex A15? */ + ldr r1, =(CORTEX_A15_ID) + teq r0, r1 + bleq cortex_a15_init + /* Set up memory attribute type tables */ ldr r0, =MAIR0VAL ldr r1, =MAIR1VAL diff --git a/xen/arch/arm/proc-ca15.S b/xen/arch/arm/proc-ca15.S new file mode 100644 index 0000000..5a5bf64 --- /dev/null +++ b/xen/arch/arm/proc-ca15.S @@ -0,0 +1,28 @@ +/* + * xen/arch/arm/proc-ca15.S + * + * Cortex A15 specific initializations + * + * Copyright (c) 2011 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +.globl cortex_a15_init +cortex_a15_init: + /* Set up the SMP bit in ACTLR */ + mrc CP32(r0, ACTLR) + orr r0, r0, #(ACTLR_CA15_SMP) /* enable SMP bit*/ + mcr CP32(r0, ACTLR) + mov pc, lr diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 34a9e93..3b51845 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -104,6 +104,7 @@ /* Coprocessor 15 */ /* CP15 CR0: CPUID and Cache Type Registers */ +#define MIDR p15,0,c0,c0,0 /* Main ID Register */ #define MPIDR p15,0,c0,c0,5 /* Multiprocessor Affinity Register */ #define ID_PFR0 p15,0,c0,c1,0 /* Processor Feature Register 0 */ #define ID_PFR1 p15,0,c0,c1,1 /* Processor Feature Register 1 */ diff --git a/xen/include/asm-arm/processor-ca15.h b/xen/include/asm-arm/processor-ca15.h new file mode 100644 index 0000000..86231b3 --- /dev/null +++ b/xen/include/asm-arm/processor-ca15.h @@ -0,0 +1,45 @@ +#ifndef __ASM_ARM_PROCESSOR_CA15_H +#define __ASM_ARM_PROCESSOR_CA15_H + + +#define CORTEX_A15_ID (0x410FC0F0) + +/* ACTLR Auxiliary Control Register, Cortex A15 */ +#define ACTLR_CA15_SNOOP_DELAYED (1<<31) +#define ACTLR_CA15_MAIN_CLOCK (1<<30) +#define ACTLR_CA15_NEON_CLOCK (1<<29) +#define ACTLR_CA15_NONCACHE (1<<24) +#define ACTLR_CA15_INORDER_REQ (1<<23) +#define ACTLR_CA15_INORDER_LOAD (1<<22) +#define ACTLR_CA15_L2_TLB_PREFETCH (1<<21) +#define ACTLR_CA15_L2_IPA_PA_CACHE (1<<20) +#define ACTLR_CA15_L2_CACHE (1<<19) +#define ACTLR_CA15_L2_PA_CACHE (1<<18) +#define ACTLR_CA15_TLB (1<<17) +#define ACTLR_CA15_STRONGY_ORDERED (1<<16) +#define ACTLR_CA15_INORDER (1<<15) +#define ACTLR_CA15_FORCE_LIM (1<<14) +#define ACTLR_CA15_CP_FLUSH (1<<13) +#define ACTLR_CA15_CP_PUSH (1<<12) +#define ACTLR_CA15_LIM (1<<11) +#define ACTLR_CA15_SER (1<<10) +#define ACTLR_CA15_OPT (1<<9) +#define ACTLR_CA15_WFI (1<<8) +#define ACTLR_CA15_WFE (1<<7) +#define ACTLR_CA15_SMP (1<<6) +#define ACTLR_CA15_PLD (1<<5) +#define ACTLR_CA15_IP (1<<4) +#define ACTLR_CA15_MICRO_BTB (1<<3) +#define ACTLR_CA15_LOOP_ONE (1<<2) +#define ACTLR_CA15_LOOP_DISABLE (1<<1) +#define ACTLR_CA15_BTB (1<<0) + +#endif /* __ASM_ARM_PROCESSOR_CA15_H */ +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 3849b23..e0c0beb 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -3,6 +3,9 @@ #include +/* MIDR Main ID Register */ +#define MIDR_MASK 0xff0ffff0 + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 #define TTBCR_N_MASK 0x07 -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:43:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:43:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdk-0008WL-EV; Tue, 13 Nov 2012 15:43:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIdi-0008Ub-2K for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:43:02 +0000 Received: from [85.158.139.83:13728] by server-5.bemta-5.messagelabs.com id 4B/BB-11353-38A62A05; Tue, 13 Nov 2012 15:42:59 +0000 X-Env-Sender: Stefano.Stabellini@eu.citrix.com X-Msg-Ref: server-9.tower-182.messagelabs.com!1352821376!29383434!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27045 invoked from network); 13 Nov 2012 15:42:58 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:42:58 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208,223";a="44429018" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 15:42:56 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 10:42:56 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYIdW-0008Hy-D2; Tue, 13 Nov 2012 15:42:50 +0000 From: Stefano Stabellini To: Date: Tue, 13 Nov 2012 15:42:13 +0000 Message-ID: <1352821336-25837-4-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Cc: tim@xen.org, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 4/7] xen/arm: set the SMP bit in the ACTLR register X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >From the Cortex A15 manual: "Enables the processor to receive instruction cache, BTB, and TLB maintenance operations from other processors" ... "You must set this bit before enabling the caches and MMU, or performing any cache and TLB maintenance operations. The only time you must clear this bit is during a processor power-down sequence" Changes in v2: - detect the processor ID and call a processor specific initialization function; - move the ACTLR initialization to the CortexA15 initialization function; - move the ACTLR_* defines to processor-ca15.h. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan --- xen/arch/arm/Makefile | 1 + xen/arch/arm/head.S | 10 +++++++ xen/arch/arm/proc-ca15.S | 28 +++++++++++++++++++++ xen/include/asm-arm/cpregs.h | 1 + xen/include/asm-arm/processor-ca15.h | 45 ++++++++++++++++++++++++++++++++++ xen/include/asm-arm/processor.h | 3 ++ 6 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 xen/arch/arm/proc-ca15.S create mode 100644 xen/include/asm-arm/processor-ca15.h diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 634b620..d3e34bc 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -13,6 +13,7 @@ obj-y += irq.o obj-y += kernel.o obj-y += mm.o obj-y += mode_switch.o +obj-y += proc-ca15.o obj-y += p2m.o obj-y += percpu.o obj-y += guestcopy.o diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S index 4506244..25993d6 100644 --- a/xen/arch/arm/head.S +++ b/xen/arch/arm/head.S @@ -19,6 +19,7 @@ #include #include +#include #include #define PT_PT 0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */ @@ -148,6 +149,15 @@ skip_bss: PRINT("- Setting up control registers -\r\n") + /* Read CPU ID */ + mrc CP32(r0, MIDR) + ldr r1, =(MIDR_MASK) + and r0, r0, r1 + /* Is this a Cortex A15? */ + ldr r1, =(CORTEX_A15_ID) + teq r0, r1 + bleq cortex_a15_init + /* Set up memory attribute type tables */ ldr r0, =MAIR0VAL ldr r1, =MAIR1VAL diff --git a/xen/arch/arm/proc-ca15.S b/xen/arch/arm/proc-ca15.S new file mode 100644 index 0000000..5a5bf64 --- /dev/null +++ b/xen/arch/arm/proc-ca15.S @@ -0,0 +1,28 @@ +/* + * xen/arch/arm/proc-ca15.S + * + * Cortex A15 specific initializations + * + * Copyright (c) 2011 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +.globl cortex_a15_init +cortex_a15_init: + /* Set up the SMP bit in ACTLR */ + mrc CP32(r0, ACTLR) + orr r0, r0, #(ACTLR_CA15_SMP) /* enable SMP bit*/ + mcr CP32(r0, ACTLR) + mov pc, lr diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 34a9e93..3b51845 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -104,6 +104,7 @@ /* Coprocessor 15 */ /* CP15 CR0: CPUID and Cache Type Registers */ +#define MIDR p15,0,c0,c0,0 /* Main ID Register */ #define MPIDR p15,0,c0,c0,5 /* Multiprocessor Affinity Register */ #define ID_PFR0 p15,0,c0,c1,0 /* Processor Feature Register 0 */ #define ID_PFR1 p15,0,c0,c1,1 /* Processor Feature Register 1 */ diff --git a/xen/include/asm-arm/processor-ca15.h b/xen/include/asm-arm/processor-ca15.h new file mode 100644 index 0000000..86231b3 --- /dev/null +++ b/xen/include/asm-arm/processor-ca15.h @@ -0,0 +1,45 @@ +#ifndef __ASM_ARM_PROCESSOR_CA15_H +#define __ASM_ARM_PROCESSOR_CA15_H + + +#define CORTEX_A15_ID (0x410FC0F0) + +/* ACTLR Auxiliary Control Register, Cortex A15 */ +#define ACTLR_CA15_SNOOP_DELAYED (1<<31) +#define ACTLR_CA15_MAIN_CLOCK (1<<30) +#define ACTLR_CA15_NEON_CLOCK (1<<29) +#define ACTLR_CA15_NONCACHE (1<<24) +#define ACTLR_CA15_INORDER_REQ (1<<23) +#define ACTLR_CA15_INORDER_LOAD (1<<22) +#define ACTLR_CA15_L2_TLB_PREFETCH (1<<21) +#define ACTLR_CA15_L2_IPA_PA_CACHE (1<<20) +#define ACTLR_CA15_L2_CACHE (1<<19) +#define ACTLR_CA15_L2_PA_CACHE (1<<18) +#define ACTLR_CA15_TLB (1<<17) +#define ACTLR_CA15_STRONGY_ORDERED (1<<16) +#define ACTLR_CA15_INORDER (1<<15) +#define ACTLR_CA15_FORCE_LIM (1<<14) +#define ACTLR_CA15_CP_FLUSH (1<<13) +#define ACTLR_CA15_CP_PUSH (1<<12) +#define ACTLR_CA15_LIM (1<<11) +#define ACTLR_CA15_SER (1<<10) +#define ACTLR_CA15_OPT (1<<9) +#define ACTLR_CA15_WFI (1<<8) +#define ACTLR_CA15_WFE (1<<7) +#define ACTLR_CA15_SMP (1<<6) +#define ACTLR_CA15_PLD (1<<5) +#define ACTLR_CA15_IP (1<<4) +#define ACTLR_CA15_MICRO_BTB (1<<3) +#define ACTLR_CA15_LOOP_ONE (1<<2) +#define ACTLR_CA15_LOOP_DISABLE (1<<1) +#define ACTLR_CA15_BTB (1<<0) + +#endif /* __ASM_ARM_PROCESSOR_CA15_H */ +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 3849b23..e0c0beb 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -3,6 +3,9 @@ #include +/* MIDR Main ID Register */ +#define MIDR_MASK 0xff0ffff0 + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 #define TTBCR_N_MASK 0x07 -- 1.7.2.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 15:46:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:46:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIh8-00016u-8f; Tue, 13 Nov 2012 15:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIh6-00016R-LE for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:46:33 +0000 Received: from [85.158.139.83:41918] by server-1.bemta-5.messagelabs.com id 6E/87-05877-75B62A05; Tue, 13 Nov 2012 15:46:31 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352821589!30091028!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17500 invoked from network); 13 Nov 2012 15:46:30 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 15:46:30 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADFkQwY003516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 15:46:27 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADFkPBK010812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 15:46:26 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADFkPhT005587; Tue, 13 Nov 2012 09:46:25 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 07:46:25 -0800 Message-ID: <50A26B50.5090109@oracle.com> Date: Tue, 13 Nov 2012 10:46:24 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Keir Fraser References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------040402080502050701090706" X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Dan Magenheimer , xen-devel , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------040402080502050701090706 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/12/2012 01:25 PM, Keir Fraser wrote: > On 12/11/2012 15:01, "Zhigang Wang" wrote: > >> Hi Keir/Jan, >> >> Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested >> your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 >> >> Attached is the result. > The PVM result is weird, there is a small-ish slowdown for small domains, > becoming a very large %age slowdown as domain memory increases, and then > turning into a *speedup* as the memory size gets very large indeed. > > What are the error bars like on these measurements I wonder? One thing we > could do to allow PV guests doing 4k-at-a-time allocations through > alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the > filtering-and-flush out into populate_physmap() and increase_reservation(). > This is listed as a todo in the original patch (26056). > > To be honest I don't know why the original patch would make PV domain > creation slower, and certainly not by a varying %age depending on domain > memory size! > > -- Keir I did it second time. It seems the result (attached) is promising. I think the strange result is due to the order of testing: start_physical_machine -> test_hvm -> test_pvm. This time, I did: start_physical_machine -> test_pvm -> test_hvm. You can see the pvm memory allocation speed is not affected by your patch this time. So I believe this patch is excellent now. Thanks, Zhigang --------------040402080502050701090706 Content-Type: application/pdf; name="result.pdf" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="result.pdf" JVBERi0xLjQKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0 ZURlY29kZT4+CnN0cmVhbQp4nLWaSavcOBDH7/0pfB54PdptQ2NwLz7MLdAwh0dus8AcAskl X38klWSpu6tKykbArzHWX7X8VCrZEUc5fD18HoT/56QaxlkNX/4+/Pnb8OnwYfg8WHd0w6ic f8zM09EOs/+VH4BhYvjy7+F8P9zuhw9Pt9Rs4/DpaIb7X8Pvmxyc17j/834ScjEnoRZ1Enq/ GGGXj/c/MKl4a7fIX8bvN8iGMc/2uOVNipMYgx3TbtFM2aOl8ia8Kp28C/f/WA/qm1JMRz2M YgyD+3SkGY8KG+KdWIPNZ3EJf2y4XCn7lZDHiVCxoHILf+JlJVWsxs33KltUkaJti/bjKVuS R0FAynBRpIpTx5n3aM220CpGSZ/SZlzArY1UGV23itSUitWGjO6zRz7nhAog5ubZU/OE2Eoh ZoVPCDLkPUQuTryB+SxdqAAQdfY05IzSKpEuXCXRpQAszn+gi1OBXGg2F0AXrmKrVXdhVYAu VuW6e0SuF6CrzxZaBejqs4XOUaZL+Og80uVzwxUwZMg7AOHTqmGNcmnNiCEqrwWMLoMJMUyl LmB8QrSUfofjVPJCbdCFCaxVLm4dtavpTL406KJtiekBLkhbMl09Ks3aNSm/az/RpUm6tH8Y GfK+l/44u2z7oIQNaSWl0r7EMAp0oQLbc1plo4AxKuDTxpdBQAxVuZSi0YIDEOtSoW1JiGEq MDLtL3wFSIg1VXiPpDC+kXOjQXrUxsYKpKEj17y75Z1OsOs/FTPaiOSK7MENU6m37a5uDLel htaynaH2rTFhC4y8VXWRL45GhgaoU2rjK+SoeKm6NF3YVWm14Ll5qZWkVELQOeRYsrFRTghi IwF7VSVs60EQNcJWrqw9LRtpUC6ZfEASgqhKVb5BsYUg6tFacbO3CbRBCUE6ONcqzpfG0UD1 S/FtR0Kwz0HbUwVtiDtW1+klJY0gxu1rE8A55zMTF51EIaq3Vhs3vzYThZhKLsodSU8UkjFJ +y5caBWgEFXZSr7LOZnZfIHCllQOMbc2EoVNq9Re6ZltWJDovEjxQEsRuwszUw3XunCnq4gi Org++D+GqNn9YXpZpUGhHzpy3tyeSlkTRVTq+rQs6MWVUEQ92mt7ppqvrakPRKVkWfJ5+fMU NlVKM0huX4nClhT4pvmKliiUPlhoX8c3t2lPxoZXffr6sOopqXkKJ2XUkrrzsTveZKiVcZRT pYo91KIL66UWgvKy6rp1WSeNg7i2NuaPcrWcXB/2RqZp1OG4Q4eu2NRVxo2bWL0qZuceSqwa Sche9LYqQTy0+jW75QUs00YKdKjeDUlglPcyrT7yVa1ya29IeVgRi1KSnnYVvpAnVBGLtr0Y VOWqebCJoFJqVdddIUt3g4App5bP+B3dd4K0Q60c4Wi1dL7u85TQmGPHokJzSRewlS/H2oV9 mNQAHG5luZTTGx33VFlR0a2qrJf2dpFgRaWuO1vVm2ao/a3KiulVO1n14iff4IGl9arK/5AU HllSr+xG2d+NrVwJWtq+ehGUYtaqrA296rtS4zAKCEtHfIQBuXSc4BFGNdY9BWWNnvObL7Zo A8KYaNW2n0sPziGsWB8f3h8U7iRfxOeYh0bgLhV85Tf9ohxgRkWvlaOlJeY/VBkpQo2jPS/f EKq9uHEkNs52iFbbYYUkg7Xmc3R7UK7fhzFdc0jRKC2yVMzyJhV8BU+/ZbTYLW/mJMdlOsnw mVzOy9t4kuviL2d/EwZMMHhapH+M7pR9JVH49ELBlNcwjymSYMMtzLbBjWCEEtEIt4Qv+Brm jh/yjaAPiy4UiG+aXEWggoNKYfPGWePkzLxKzpTTSv9qp9UoKKepyX+K01qFszQV7G6X029g LIInDBjin49PjaQFk2As6PNcbnAjPj0H2MPCMKfdBM4Ao8P/VvkJeX8KwqsVfCDMHI6nP4bA Nwbif73n8BIKZW5kc3RyZWFtCmVuZG9iagoKMyAwIG9iagoxNDQ5CmVuZG9iagoKNSAwIG9i ago8PC9MZW5ndGggNiAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlPj4Kc3RyZWFtCnicM9AzVCjn AgAEKAExCmVuZHN0cmVhbQplbmRvYmoKCjYgMCBvYmoKMTQKZW5kb2JqCgo4IDAgb2JqCjw8 L0xlbmd0aCA5IDAgUi9GaWx0ZXIvRmxhdGVEZWNvZGUvTGVuZ3RoMSAxNzE2MD4+CnN0cmVh bQp4nN17C3RbxbXo7DlHP8u2jr7+W+dY/kqK5Vj+27KOY1uW4ySWEzuxHRzbsWVb+fgnOYkd IAaSkDhADKShaYCkkFICFJQQIBQobi+XthRuc1u4r1x6G7eX9r3bNk1eL+XdlsZ+M0dyflDe W+++td5aT/Y5Z8/ee/bM7NmzZ+85Umh8wo9i0TRikNi3vXf0uQefewIh9C5CoOvbEeIvN3wt g8DzCGHTwOjg9lznR39AiPkPhBSywW2TA//+YN4kQmpSxbZryN/b/1Hsn/IRKtlFECVDBBFc uFtBwDApZw5tD+3aHvvf9pHy+6Q8u22kr/fUM888h1BpPymv3N67a7Re7mRImfLzw73b/cVX 0MekfAEhpTg6EgwdRdZFhESO0kfH/aMlm35QTcoFpH8fEByQP/qJJaCcljHDyuQKpSpGHRsX r+G0Or3BaEpITEpOSU1LN/NChgX9f/2RvSt7F90huwsZ0aR0v+nDViAD2onQ4u9p6fp9YcP/ 3V4oI49z6A30Ajp5E+kAupPcn7sJ9yb6O/SsBB1H93+J2FfRM1HoCDqG7v2bfFvQPUTOKdL+ 9U8PwU6ir5KWz6NvEkPJACdpdWuU+hH64ReLgl/CD9FD6GnC+RB6hdyPE8vbjf+IHsJr0TD+ L8xd6G50kIzxBATQYcLfg07BRrSJYCOfTciPRm4ROoNm0TfQFFmF1z6yuxb/HcX99Zuk5weJ nKMogMZuqPE0/Jk+GDPp+/PoJQl31xJR4WW24JcxvvowKTyIBsnVCx+Sft7P1KA6mRZOkxVT 39He1rpubYuvec3qVU0rG70Nnvq62hU1orvaVVVZUV5WWlK8vMCRv8yem5OdlWnJEMyJBi2n iY9Tx6iUCrmMZTAge73F08OHs3vCbLbF611Gy5Zegui9AdET5gnKczNPmO+R2PibOUXCOXAL pxjhFK9xAsdXoapldr7ewoffq7Pw56GzpZ3A99dZOvjwJQleLcFstlSIIwVBIDX4+sShOj4M PXx92LNjaKa+p47IO6OOqbXU+mOW2dGZGDUB1QQK51pGz0BuNUgAzq2vOIORMo42G2ay6nv7 w76W9vq6FEHoWGZvDMdb6iQSqpVEhuW1YYUkkg/QrqND/Bn73Mx95zm0uccW22/p772tPcz0 krozTP3MzL1hrS2cZ6kL5019nEhG7g/bLXX1YRuV2rT2WjtN15uEsCyLs/Azf0JkOJZLv78Z 0xvFyLO4PyEKeoh6Z2Y8Ft4z0zPTe35xerOF5ywzZ2JjZ0briYaRr53UOr/47UMpYc99HWGu ZwgqooP1rG0K61s2todxlocf6iUY8u+2CGUpgrZjicf3t8iIKIKog+hUEOjAD50X0WZSCE+3 tEfKPNqcchaJDltHGPdQytwSxdhGKdNLlGvVeyxkNpvWtc+E2azGfks90fGh3vD0ZmJPW+hU WLhw/KcpgmVGp+XLHR0SL0961dgf4MOybKIWUuvGCsRSaJUZTirEfxp5XEohDWRrdXy5hYih cuot9T3R/x1DiUQAv8we9toiU9/aHhbrCCD2Rueo/kyBg9To7SFTFKiTpi/ssIyGDZYV1+aT dqs+sK5dqhKtFjbUhlFPX7RW2FFfR1vm62d66iJdoLIsLe2vIufi/JkiPuVFJypCHXWU2VRL 7Cq7fqa9fyBs7knpJyttgG9PEcJiB5ngDku7v4MaGtFQ3jxpTpBaDOPa1vamdZamls72smhH IgQqjs2qv0WMpT0lIoaYXFiZpeTbcQrTQRg5guA9BLCsqCL3sCJLSS6OKFzCUlNdUcW3Qwpa 4ibdCOfx9f66KB8t3yRURs2p1rskTU6LRE6tN0XoECKfZXZMyHy0YVJDSZXqXSIxWcQTEBwm YiQU1WUitXm+3eK3dFiG+LDoa6djo+qRtBxVhqTz6Fy13lS6QVlETUgg5KUCVWbYY0u5Ubnh Bql8rei9hdy4ROZnlJamdTNUuCUqEJGeN4YRNWGxTJsirX66ni2eXrKIyYqW1vPMGVGka3mI LtsZS2P/jGVde5XETTzIHSlTtC0daoKm1hXL7MSZrThjgQMtZ0Q4sK6z/VUSU/EHWtvPYsC1 PSs6zmQSWvurPNkrJCymWIqkBZ4WqKS1pKCU+FNeFRGalqishJDKfecBSTjlEg5Q33kcwXFL OExwbAQnSjj6IbOUOER0TPx3Pd9P5+f2jqGZng5q48hENEL+IQyWaqIdS/UZwPLYcIzFvyKs tqygeDfFuyN4OcUriGWACZbZp2a4esufEpfRzRKjOnLrl7WRCFiB8s8AclSdVbDKS4Vn5LKf V51lMAHRGYaiZRR9ViFX/bXqLFC8UytoswStUIf5hUz46sKQrO0vz9ax79FAAXUt/p79D9lR 5Ea/EoePVkNdNTxVCftLYO9yeCQXTgugFlIEm3BcYDvSTqfhQ1o4pICjGFhswHhvBfSUQMAI O7Rg7czLQ51iWA/6mmlVp1Lk9F6lsqgTmTmzaGYUZj2nN3l36Q/ov6pnKvVQdH7xiuggqJ1F 9xY9UsRUFIG+SOboHrFChxWarCC3gjWTje/uUcFaFdSpQCXTI7ezq6vrknTvuqQrL+/qspF/ cGzquuR02C4lcz/vSr5U6Li0vABRFui68QOGeGzhM3NK0xlnYTUuLsrHOfmy4qJq7CxMxwmK fMaSEY+NBgKny9j/qJ/96OjCnxf+OffV+Iq+hwbaHhgod48/3lO5c3uPJ7dl9q3xe749vTrh 9fji9bvXbd7XYnFve8BXc9eOwVU22NdxdLvr/PNZpZ01mWlV3Svq15dlm+LMtoqWrZ7+w7dZ 89ZO+gSnryTVUtXicLeUZOo0hNg6Ls3JAyRm+gOJiAW0/VWkXJwTMxVqr9oj+mLhROxiLI61 TCPLnOWCZd7CzllAY4FpC1jOE0Zen+BNTfTMJQFK4pIKkuaTriTJlEnJKEltRDqfjEPuS4Vu p5vqa+xSoa1rbGycqmwsmSjMBtUM1YNRa9ESzUiqIKBTS7SmAFe6p7W/emjf6rSXtAXtHnGw MffcOUzCK+au0tWFCWX++1qvOvDz9UP1lvzWXU1X75a9u3CnsKIsRyHZ7wZiZ4nsGpSKstBW Mb/TssWCO9O3pOM2xk+st1GlSmkQzWkwmwZpOdNZqMGsBW1BzlzOhRwmhw5Nn24h5iRDvqws Ge8zcTJfvImMxk2MwHFJW+4A25ij61JhdDSSBXQhOuXpZHJLShPiydxibXSq0yAnH+gAFWCw NI77Ju5PelzrGji27cpnq/aG+w+8MuL4tmb23mV9rRUs/I+2w4Plm7zLlm1sdEA6JH/1p3sr 24//ZCpx5tnH0lbu2SzNmXnxCrbK7MiEdosbcuMhED8ZfzCeyY2DQNxk3ME45hALLK+K825j b2cfZZ9jWVKK9Y6Y9piwKTbOxHAelfKwDJCMk/EyUcYqZNOJoJH7Yt0xEKPS6H2MNNz3upyX CqGLzp/TeSmh0NFFLN3WBWQVjHWNZcWTURVrLcXOUqfRabRoDSY6eGzNayv72R17i3f94AdO d/LyNKU67k/4J/f88Y/3XG1b41bKpaQBPUpyLQ3Jv2LQJpHnVdMqrFIph/Es6bkDDgMGYOUM Ig4RK7CMrt5kzuStk7XK+mUMibQ5UmIZuVwJIZQYMTSnzeGMrM4Ep6PL0cVdkjrsLBa0suIs 4piMj8Lgwvdg9VOw4Rhb9a/P/PqzxGOSvTxN+vJb0pd4lIAmxHWnMTycAMe5ZzkcwyQzVoaR xRpjs2IZ4nE0SdNiEpB/g6ITKTmlqGSU8m6zwWFoNnQb9hhkGsOPDYsGRmEQVVqvwaDQd6sY hQ65Jdux0ZUA1HSI3XA/T17yHBFnIZAFIBCDURRlE1goLGF/65p8eXJh85u45Y5v3149d+rU wj645xvHmQ9vOzFRd/Uj2V2ukcd69x+6+v5D1+w+SOy+ENWgr4uFk66DLjwZezAW41xiDDGy ZBm2JZJuyVKNqTgrK90j5qtGyvaUHS5jymqnDQ1GavsGY6rXaHQ3mBlgCmrnavHJWqiV1jtZ FEJLrqm8RaVKdnYbwGE4bMAGg8aXzOU7fcgkTQPxjF1jWrpO3JeIodB1suQrCwvpWiFLxdZl I8OWZWRTb+iG4qgDUORQn2AyRg3JSO2LOE1LPJNDHKgLFPGM0WCCx5881XLP0xv+PbViQ2VR a3W2/PWYssHjw+/+g7VSkx6fUZvtbMxPZORp9bdNWNbf1Wb9+xU7O4u7Dc8d3XpwTTpmK2s3 VaRocmqdWnHrGttrZxbyfS0sM6pUppS2lBS1VvL3ujeHijtY0BZ2Nrb3UL2uX9jAXGab0HJU jz4UvVPLZ5bjHYr9CuyvhrZYfyzurNhSgbOZEgZn6yBPAFVCUsJkwsEEVp5mStuRtj+NVTk8 YmFGQTzsib8Yj+MbpuUeGVVqS0KqVyaratAkQ0wy3yA24B83AGrgG2Ybwg2s72IDzDVAcwNM N5xswJoGRwO+0HCFQqDM02SU+sycpsZnNKl8xXLIloMcpSB3Id206FQUumFTF3W74+P0eeO+ NUYng1jfphs2LKrs0nRwSsq2UB+WjyP7lSnBSZ6lTjIBWoNcv+SwJXdXjXFm1+yAGP+Sbne/ q9+TjQ2VbaPewYe7bLbe4yPB0/mYYVj8LGAMF+3LfYMl9X01ZrO4ua5kcG3hwobshs1VyU0t GU271j+f11RhqZ957967Lzy4OtCbVF2ay6hsVY05f/37f/018/bY1wcKCga/PjpxYrM1v//x iB8ZJGs3lsQUucTiV0+wMJG8LxlPcTMc9mfB+iwyGx1CQGACFki1QJIRJlL2pWB5CuSkDYtK MdvqFZVwWAlK67RuWB/K3puN9dkc4sms0+kxp2d7kTL7AR3cptumu13HxOiSdVgXF0xUQHbE 85QTkyfa05WDw9bldHY5Ivq1EVsnpt61FBnQp7O4WnazsZMN0BAvVwjGQefDT5yYbs6s664o 6V7pUJxXrQg9uTVwaqzK2TY6dfv29Yn44p6JFx+8/fYD66s2VpvTqzoqtav2+ysKN89uapgO bRv0DwTKj0V08hq53Yk+IvFbvsgzRxGaRVhEPhRG8+gKks2ik2R4YhznRXAcIccl2vOx8UvU VzqNr/3dRx8R8hDxJUlEr5moDL0gFtxnhCnTjAl3KAIK3MlsYaYYphX3Y9xq6beELExrRn9G KIMpTq9Px/sKoZB67GUxcd69yZCVXJxcnzyRzJqSwThiMKBh0ZF1IgvPZkFWxbQjbZiL4WNw DFV3IlF3TJp1gueLEoNJxmNGbNQoioKyJLobObuk7beQ9vaWvZcGZuiamiPeNCMfiPXqqiEa bklbsDFSVNxiwWxSZfCZkd3np1z1d7+2w3vn4JqE51J3t6zc1bps+dlgz6MjrlcyvVs8y/tb nLlNW1bUDHqz4b0tZ/Y0bDoDcOp1SP1OT3rtsM+8scVz6Cf3beyunvjmaOOOdcvSarasWnNv f8WytinqR3qITnVRnX5HDJzOgSfV8JXYb8TiZ7RwTAshy14LDvF7+SM8M2WeMX/NzEylzKR8 LYXZnXwo+Xgy05m7JRd34ADGXCJRbokSstCwQ+/W42b9m3qM9Ly+QC/qw3qZQl+hHomJcQzz JMahqk3hs71p+qJgd+JIIk5MlFmDGYr4YIIa1FS7TuoxSGDTFVWv03GJ+/kmahROyV8TvUaU u3QHA46656jHKL3RX+g+p2Bdw943drTcPeA1PZe6c2PjZFsBNjZ2bSvtOb6t0r3rhZHf/fGt rMatnpohb47FM1RfOLiuGP/L6wu/fn2T4BltTtnYVj9z4T7HSmdK/e0vbN0e3r1i4dQLa2YG KvPbppoapjqcGZ6tkdzFR3RsITrWoxw0Kvo6sgJZ2COsFwYEZn3KQAruSAgkkO6QJGK/FtNg CatjQa2EScVBBd7B7GdIrgYKYqOzhpNkd8ubTh+mQVFSUKOwRA1R2sEjwf/ygk03x/wRrVy3 PPi8Kiyr950bGDx7T1PT3nNb/Gf2rnold82Yd1WoOTevebyxYbzZhr/7o4XfPbty5TNgfPcD SHiqtvaphX/74OmL+0rL9l385hO/uLey8t5fkHW+JrpGK9HPxK9MMTMMnsD7MJ6o2FeBJ5z7 nHjCsc+BJ+L2xeGprJksvFG7VYuT88CohB35+/MxWRSNOZA9XJK0vDtpJAnnJOUkxej54eXL yfjNeof+hJ6ZJSmWa1o9fDkGqB5KkkLJydz92XBb9rbs27OZmOzkbJxtCdoVXPAuNaxT96mD asagBtk1y5JyqKiPdFwibpLEQNdXLwkVyh2OLvK4NHYtj0LRZAotLWUcSaNKqPe0QXEkocq2 ZMhvcKNYYUxn2CT35IvBe14MVai+rbSt3LbywPH6wUnnwGbn8MbKfffsfDj2JbVv9+MdO57Z 5szwjqxpu3NtHuzr/WqgtGbrwUZt2W0rMvfvXdNdrHvUWLqpceyeqZH4rpmNyyr9B1ZXb1tf zbGqyvZR6mPXEt2nkZjRjl4SU9fHDcTtj2PasB9LzhG32fw23Gb1W3H2+cWfiR3xWi9RujwG kjKPZeKDmR9mYqZOALmFJxSLmqrbCA7jCSOeNYIxfzrTnDUs8Lx6+EJE7cnB3FwuMyTIuWBQ fY8aD6rBdIOCo5mJpFqngwTtEfc4nkzWtG15QfdY99g4XcE0eJeW8q2KjeSn0r5k0QtGgYn4 STZNvPO13SPfGK+Nf1mdW+/3esZb7FZirctW1RQnhB2McPWelILZvsDTO0T40ZbwHk/RximP Mbep0mJrnWqu2d5s51KzDPjTYws1WcXixBOR/Skg7dk03q4Tl02pZ9Q4QAxmWC5HJOvkYnmS daq76XsrHomoB00jGUKxoTi5LJHG0YV0mDTKpEOmzp/oFRstRcm4VCgW2NgtZ6cbXvcdOOe/ qmaeZC8/sfDBwj8ufPfcaaiHcsh/+FjETzhIH0ql/IPG/L6vaeCYHA7IYR/3FQ7v4CDRBDtM +01HTYxJJsYavbKNMVtjdscwMUoYSZCbMYzieYxpglKAfQSUKTFig0qTCdRyOdCOOkn/aP5E 06dxJ52ULofN2TUm7Vd0Bmi4XwxOrdMI8YyCXgIz9szVIbzvjbcXZjFnMCoXHpHpDQY5/BHc C98F933My39d9QCzU5aWmRV79ffK5JRkBdnlO4gtJhM/kIdcqAW9Ke6dyN2XiyeEfQKeSNuX hidS96XiicR9iXgqYSYBT+ln9HgqFqaUM0o8pZhR4Ou+o63eX4/bmvxNuLNmSw0uGjZah82a THMzMUuz0RxDLFVTba7G5mpH9YlqZrYaqtdNe6mZxmRqaifKy1c7JpIVqyeinlJa8WTJR1e8 ZJBkuZOpK+cucZeWVLG02qXnkmXSraS0OJ9ZOjJZWuLMLQ711nCUTS6fePn221/aWe5o9pdU drmF8tGntgdPj5QI7i6Xa2iV/Rcp1f2NDZvdqaaKAV/bYKnWkloXXN88Us/zxMDXjtalwcHO R4arq7c/0rF614ZiFRtfvWFL5cp7+sor+vaurNiywRXLxhRv2IVXFbe7LRZ3e7G13Zuf722/ +qSzu3HZspW9RTVbV1utq7dL9n4AIbmF5GWV+HuvIuvi/ItKtZc/vzgvLhIgo9KDUFy+50PH nx34ZQfkOTocBx2M3AFPOV52/JPjNw72oAN2OKDDAXKHyeFxMApHUqzn7TiQx5niSuJ+E/dp nEwZ95kLfuj60PVvLuY1FxxzwSEXBFyTLrzRBY0usLkqXfjPLvidCz50wY9c8MZ1JiAsea5y F05xgcoF7/zO9ZkLB0jyeMz1quuHLhkhr77OERFCm8LXGrrDBaSFJtdG11YXa3YBS5v4nQu/ 4HrThQl9j+smstoFX1ukYsRFuOgCIuYFKua4C++hndnqws0uqHRBpsRKWrvGdJzKOuzC/S5o coGbigWNy+zCEabdrkOuZ12vudgRqX6kqS2vuWhnGKkNkFoAIp8M5TNa6TIdx49oX6HfdYQO kXaVIUP4hFZ41vWRiyGVtrqgSKqkcUH5awT5mYs56YIQrRIZGxNpjrZFaKcoM0XvdrFE0AUX 4B7XrOuka87FktYLXOBwARL1LlBmFPtyuSQ5yeX0GkccMpIMrtAdSeAgEl500yyOpnGRTE76 jEU+41+IvYFyK7n7JvJN4cu1qpETO8ema9jIQqanPzbhxvM6eqjpTGeMTilzT3B+waEegwyO VaXlt9VYXqQp4DOAGcwkljX1irsPpzKJVb5+ce3OVZlnl7jw881balKWtd3RcvV+Zl1GU22B QmYvryTk4rTNW+ndftuD/fT4j/LZWu9cd/V+mqPT/ZissXiUgUJi5SR/kMeh1L2pmHpxPKk7 qMNHY5+KxWysIRarVSkqrJalyLB0sqxADeKsBjSZ0wWZkCkdgqRbvBczIanBTFJDgy+GS48e iUmxX5dt7PPhH3ARr8UJX5RgpP3lD2Nnd9fAr+98ZaLsjZymbXX1I2vy7KsD1fWja6w4feHj hd/W3ffTw7jAc99P7rvz1OacvL5Tu+/8xubcnM1PRX0IPkDGZ0bVYi5nLCCpkVGINXvm6D7J oYJIaqdESbl6kzcpVscpNNSSyDb0ni16Aqt1Sudht06aMZoaaR+IzA/DAKu3VfjKTblqXUF6 9YbSZKY6o2FFRUJCZXW5oXpjZZqC+YZMVtZ3sOUq/VoMki1sYP7KViAz/rFY+TADD2M4xsFR BPdzj3H4fvQYwlNpM2lfS2MCafBYOqRzJPd8SA/79TCuh/X6AT1+SAeMjiaNmYTEoUQl+dOm m7ljZthvhg4zeMyQZAa5GZRmnVZi1MpJACVkCyWCh0T3O4T9wlPCy8Lbwm+ET4XY79M7Fuhc Ln74b963BKBEvPfmKvK/WV8umAgpkjhQQgStfuQTAeYF+J7wEwGfE+CkAHcLDwk4JECPACuE tQIuEoAXAAs6AX8sfCJgifWUcE7AEme/EBKwxJgpFAn4y/nWU5kgMZqoTBiUWP+JdgAk3qO0 A/DFzEu84lOEm3Q1TId/RMA9wqiA64RWAfNCgYBZwSDgeeGKgN8S3hfwl/OVksFH2SDKBFEW iAr6HB0jgQrwCaxPmBZmhTmBdQiABE7ACjLTiE/XamJ9shQpx9c6yb/k9aKO6lYPFnVS3X/D wd3gxW4mS0UbBRxlzqhn6yojMVq5y5HoIM0uL7B1S0jbDSGJQLPa7JximuOWuAGc+nQmoZop 1TvxbdnNm3etyaggKbe2+YBTu7Bu7uMYszkRMwlp6THvf2fzYyOVrOJehtlxl40tvvpMSmen V6Wu8a1Nx1sQLP5yIcDOLPyORG8WMYHDPXgan8QXsIwCV4iLROjbIB3NOGjEyBQLRjN7eiFw 991kvZUv/p55mW1CpegNsS2Uvzcfjxj3GA8bma0myCoBawoYi0CGjRir01PScWajxYK8Ij0b wLP6k/qwntGXT6sbY8SkdG9MjN3bnNadhulBQU/5XDmeLodyum6sOVavuxy4ctDbZXk+HmXC bOaVTJyZyXPxPlmPelSNp0kSopYRz0jjce5S9EGUClSPY5F8xHbp5sOapbOEG3MQuP6OjAR8 JdQvSW/I5NEXZMzLlaNPBjY9Mr5adyJhdrqi15OTv3bCUzM9KP70nRd/mvqEqqCuLX8qZFu9 rcbW2dZUJoBt1c4WW5oYWGXe0MLl1BQsd1vNeq21fmD1keN3HjJYyy2alU328pw0Tp1kcaxo j+QFB4lDc8neld59BsU4RkGiM5ZjC1hGyUpaMSZ6WVapWlTBvAouqiCsmlPhEyoYpe8wzCpA KrgiEVSUXZuR5W1WAcHLNKwRrSPOmpi5G7rGbNctVBt5NeCkJ4b6YqeR0Tq1B8+dOyfjn3vu L/NsxWdvR/Km5QiRea8gLajFNY/hb2F8CIN0HPSQ4gkFDin2KrBHsV4xoGBylcAo8W45sHKD PFN+Sn5O/r78Y7lCIVcwaqiEjcDEgJhT6gVRa/CCmvY197Z+75wazqnhpBqOqIFMbkgNPWpo VYOohiJ1nbpfvVfNSsx841ovrwaS6SM1uCOUU2qWVWdKbBLTi85qr8SsM+d459XEE6h5tY/Y DauQ0HGcwStnfKwGFD66WUVCHqKJ7i6bbUxa07brQYnNYaNKckZeR3VH8yh6qgok7zOCYFyO v3L1Yabs6hb82kEm+9DBv/7zIWlO90q5+rtk73Sih0RVYPnkcjxpATMNwRMVMd796UfTcWNK RwpuZDtYvB+OAgZKdBMiiQ1O8sAXT1tleg/ScboC3RUdq9SFi8FdDKPFs8XYXAyLxTBXPF+M k7J8aZwOxRplDh+OvBGRUtbIMTw9gY/k5tI70Ki3AU4gPsZC0xtLNVNMX4LKyTw5aQ6uuzXb YdMWxnc/6cQM2aafpxv2OSAftvAbU+99943U6p76hu2N2dmN2zwrekQzzrj6TkdfcllBBquy VXlz2EsLHemlxiTTUOfC7xd+NXpysCB/4Kldocf7bPkDT0o2piA29mdiYxzeKJaWQyPgYwAl yIPwfnQU4QrNSg0myXJAM6k5qGGKmXoGf4UBZpDZyRBfF8/Fab0s3Z6rCUDWggprOM7G7eYw yxkitzquldvLHeHe4t7nlB9xcL0sS+GA5UDJMZiKWFTjjRhbsVqXopNuTbqNukO647of6T7S KRd18JbufR0+qYO9uiM63KODOl2rDvM6YHUGHf7+/HUGiqBEyihfAihRnkKJ8BFlheNUEmyk ciCCf+RzrUYeDOG7tb35z/dnqVl28MYOUC7l32oxgo80K/ZFGpaX3tgFuVsHX9LmTX26lYh9 OnDogFoxVmiwRgVk1TndkQ23+9bNc9ON5U03bq437cY3787Uxpc2WEKiO6zLIe2uNtLCmPTm uGtMsNy4lfo/WNg59weF3qCVy/UGo/LTN9mKq6LJXec2Gt0r3Cb8vYj/myG3ask3j4hFDA19 LyxFv1cQq0TzsisyfFEGYdmcDJ+QwahsWoY1MrMMX5EBwUtv3FKoR5bBYoQ8J7sgm5cRFiCC aLxMt/3rvlk6u6EvRsiinDkne/cvRSiSazCXo/5kt7ihLcOfgTsLtxRiab2UxHhisIpNYifZ gywrV5gU9F0hq/eIVnRYd1mHdcXTfINZDvLPOQ+jDqkdPiWHsiLphvQOzy05j+iRc/S1XUTZ 0ht4rCUZB31Blw9Fku8g+6WFbKIQdRhLB3tMseQj4IHdpwoxELdBfMdzxI3gq/98zW2s3Cq5 jeeHOsEAibikc3OMzWFVwZOf6XO8VTZVTFZBcTKMSn5j8KldwRObr/mNDUQn75D8JAdNiC2T HEwmQF8W9DHAe8xmpeck2Q9VeajBrAe9xZds5vfwh/mLPMvzyRyvHFVOKy8o55Uy+kq9RyrO EYRCqaTfvDDnQReKvFimAQYn5WBa5x2OsUT6oiKyD9z03Qvp8Ii98cUP6FPEwOqeuzQvq6oG j/TuOTtSmFnTPjhesfGBQTHu1fjxwOpBMQVndD06Vj20Lbb29k3l6x95b9f2b97R5kwo3LCj Lr5zi3PwUbR0nsP8gYw1i35nJoPsE/Q7M1ke0YfgBFokBpIzjaRvk8znsHM5oMmB6RzIWfrO TFKsZy4OUBwXVxA3H3eFnt1Ek/9I7h854vyi78z87dSb5txMeUJRm1v6rsz1RDu5eu0WT+fd rTlfllZHEmppbItX6Tfkif+3MmfEzF8nQEXeyjw8lTeT97U8ppir5/AER49ImZI0TxoukV4u XRFNxNmXpzam4vJUSKVbgLRhIEpSqUkpzhOH42jJSUrSIgGOQvGNxC7jOZXWGx9nSktVALLk WqDdAiaFxaIwMZo8K2elemt0FHobrVBkhWwr/NkKb1t/Y8WnrHDUCpNWKLF6rANWJskKn1jh ZUraaz1ixQPWHVZcLlUxSN/wUlo5jbSxqDQdGrqDsTGat+2/sX9qZ07Z4agdJu0wYIdWO5TY PXacZIdP7PAbO7xlh5ftcMwO++0QkljK7WCwZ9qx3A7v/JlWfdlOBbGBaFWVPcmOSc1X7bDe PmDfb2dIDRutBKTKx3b4pyWpT9jhiCR43A79lBuK7HV2nLHEe+xTO3zP/hM7PmeHp+yw1w47 aA/77XgFZQWTPduOWTv8yv5HO37fDm/bgYzlIYlzwL7DjpdGk0l5gaVjEj+IjuqsxEz7d9TO 1Nlb7bhkqd3Ap1QmvL80OCZk30vJHjIcJpOymOz4EzqE39jxEfspOyZjCEgDqKPUEju+Nsyn iAR8UBoi9NA+ZJKmmLJT9rfs79s/sbPTklqb7FAQVetnUrWTkmp2RzTSb2dS7HBFUt6PqKr2 2o/Yz9lZt52ElXbOjpUKGrHlxmu9KxRQpIAMBShS8xiNxpIbq/UuIzYlPU0AJgsTTxZagpN+ EYU+6Jf6NkX2v5uP1TZFd8XPJ5VfkG/eknPedLJ2s9xNn8eP3bBt3sxuI1toAtlDHY6xcSk7 dkaTVbJLSX9d9J/+kV2VyYec7By5Ih4UjLTFQoIpoaS0Gsg2e1OBPfqP31JqlTEqVYxSrzx7 YeEfz76iiFcQj6tScvK3vvuGgiOwUqnQKN4M42+n+LLtjmX27LXmqyvJ3iwk1PJZOdmZZtGI /+vVpOQVaRkWUqpNxheleHthA5vGrkbZqAIdEblA2WQZDlgnrXh/5lGSP9J50pPIutHcYcaN ig4F3s8cJb7qxoib+Muq6eWpGg/iOK6Au8KxSi5cBe4qGK2arcLmKlisgrmq+SqcavdlcCaN JkVZ4pP9b0TctmuJJ4m5if/8vCv9/OFdbtex0dDz+TIaakvO9Xkg8TebJK71u0ePdeW+kVi5 eWXVluZ8Gng39VUm4ozdF462tfdjvqAybaFDJs/xVlpVTKazIrmo0WH0PfjeXf2PbivL6Dl9 L91EK4ZPIOl3WqD93Ru/+G1dt6bqT8gc+Y3QO2+8+A9Lv2NZ/OXCBrmFRB70B0R46Qc4CCmq F9ag2us/ybnl1zSZ+PeoTrYedbFB9AC5NuByZCbPRwnuaVom13qCQ+Q5SJ6vkecQuXrI5SPX GnKtJVeAXA5ydcifQQekOvRJNgw2uPhL8iyH76OD5Lmc0PaSp4KUZygfgWkbB2TfX7xKaaRP dvQp9MAFXIh34Z8zB9j15G9ehmXPyTfJ31c8pCxQjit/pnpa3al+JzYx7mzchfg749/VDGkW tKu0s7pk3axuwcgbX4+ONhOtJVFhJIPnkAN1kh36cdkcwVEtpcL6azrpuaYfQBpSgmgtBRqJ wgxKRjuiMEt4ZqOwDMWjE1FYTuBvRWEFmkKvRWElMkBxFFaheGiMwmrShw3XfomXD8EoHIdG 4OtROB5VY460DqyKlObwmigMKJ2Jj8IYxTP2KMygIqYiCrOEZzgKy1Aqc18UlhP46SisQJ8w b0VhJcplz0dhFUpl56OwGpWxf43Cseg2WVEUjkO/kM1G4Xh0u3y4dmR0cjwwOBTic/vy+MKC glJ+rb+f9/aG7HzjcF8+X7NtGy8xBPlxf9A/vsPfn8+valxRv7amtbF5DR8I8r18aLy337+9 d3wrPzJwc/1Vgc3+8d5QYGSYX9c7HFzrH5zY1jteE+zzD/f7x/ll/C0MtxTX+8eDFF6eX1Ca v/w68RbW/0UnSM8HA8GQf5wgA8N8W/66fN7XG/IPh/je4X6+9VrF5oGBQJ9fQvb5x0O9hHkk NET6uWViPBDsD/TR1oL517pfOzI+OhLtUci/w8+v7g2F/MGR4aFQaLTC4di5c2d+b5S5j/Dm 941sd3wZLTQ56u/3BwODw2Tg+UOh7dtWkQ4NB0nHJ6QWSW9uVJlnZJhMzLYIj50P+v08FR8k 8gf8/aRro+MjW/x9ofyR8UHHzsDWgCMiLzA86LguhkqJtvOfq0181wgaRZNoHAXQIBpCIcSj XNSH8sizkKR3BaiUQGuRH/WTpxf1Eg47gRrRMOHKJ1AN2kb++BskBKWSnzz95LlDqks5V5Fa K1A9kVaDWgncjNYQbEDi7yVXiHD3El4/2k6e42grwY2ggS9tfxWpv1lqh1IChH+YUNeR0jCR S+sNognSPyqvhmD6CGZYamOc8C2TevVlEr6cul6iBK/hl5MeUY3lE+iLan651P+cJiI6H5Sk hCTZEc6AJLuNcKyTuHxSTaqFkNTasMTV+gUtNpMWB0h9qrPrnH2S7BApRySPEHgoqs8tRNfj Ug/6pXpLYwuSlj+vfWp748T6Rm7REe3dDqnN1RI+JNkSpQ1JpVES3TjI307pL5/w3Cy5Lyo3 X4K2E87/03ohsjJGJT36pVkeJLyRGc+XZG4nlrUqqqFhyd6phiZuGGNEN3/LyjzSM7Jitt0k h84sfdK6S70PRvs/ILUT0doouY8QvfslbedL2EFpjAEyhwEC3dg/OmODUdytvVnqy83j+X/Z NhONvXLQUfQFnzMq8TugoL/KkO4ngBUfgLmr8MJVQFchpvkz4D+DP/lyzX/05Jr/u8dqvuKx mbsv77mMNZebL3dfPnz5hcsy9a8/Tjf/6688Zs2vQPyVx2T+5bzH/OP5i/OX5xlx3lnimfck mv/FdbHtFy6m7SIwbT9nFs2aD8wfYOkmvpOY4vnx9+CNuSrzd33Z5te/k2tefBV850fPT59n pJeg53WFHvMr7leaXxl5Zc8rJ1554RXF6NmTZ8NnGc1ZmH0Jwi+B5iVQal50v3j5RWY6PBvG 4fBc+EKYcbzgfgGf/Fb4W3juWxe+hR3PuZ/DJ56FuWcuPIObTx8+jR2nR06/eXrxNPvo8Uyz 7ziMHIU3j8JRT5r5K0cSzHuOHD6yeIQpeFB8EE8/CKOHpw/j2cMwd/jCYdx8X/d9I/cx+z2L 5hP7YO89y82hoNscJCMYGa4yD3uKzcmQ2JbkTGxTOJk2ORlzD6F1k+s2z3Lzxk6vuZM89YW6 NhnRCVvItI0woGHcDL7cstiCxZbiMo/YkpXr+bHY6oNGD2/2EpkN5HrBAxc9lz142gOmQmOb FjRtXKGmDQNqAwRms8at6dbs0bAajUPTrBnRHNZc1CxqFG6Cu6xhSKg4bQIZnIfZM63rbLam 84rFtU1hhW9jGA6Es9bRu9jSGZYfCKO2zo3tZwAe6Nh3//1oRVpTuHBde7gnraMp3E8AkQLT BODSzpjQio5QMDRhox+IAChkswWDFAJaskVoEgS2ICETtmAoSAqhCRS0BUMQDJKFHCL4IGwi cDBI0UEgNcgVtEXEEwlE8CYigNxCEdHBIOEPkvrBxE3Erv8n4PJVwwplbmRzdHJlYW0KZW5k b2JqCgo5IDAgb2JqCjExNDMyCmVuZG9iagoKMTAgMCBvYmoKPDwvVHlwZS9Gb250RGVzY3Jp cHRvci9Gb250TmFtZS9CQUFBQUErTGliZXJhdGlvblNhbnMKL0ZsYWdzIDQKL0ZvbnRCQm94 Wy0yMDMgLTMwMyAxMDQ5IDkxMF0vSXRhbGljQW5nbGUgMAovQXNjZW50IDkwNQovRGVzY2Vu dCAtMjExCi9DYXBIZWlnaHQgOTEwCi9TdGVtViA4MAovRm9udEZpbGUyIDggMCBSCj4+CmVu ZG9iagoKMTEgMCBvYmoKPDwvTGVuZ3RoIDM4MS9GaWx0ZXIvRmxhdGVEZWNvZGU+PgpzdHJl YW0KeJxdkk1ugzAQRvecwst0EYFNsBMJIaUkSCz6o9IegMCQIhWDDFlw+3pm0lbqIujZns9+ jifMy1Np+yV8dWNTwSK63rYO5vHmGhAXuPY2kEq0fbPcR/RthnoKQp+t1nmBobTdmKZB+ObX 5sWtYnNsxws8BOGLa8H19io2H3nlx9Vtmr5gALuIKMgy0ULn93mqp+d6gJBS27L1y/2ybn3k r+B9nUAoGktWacYW5qluwNX2CkEaRZlIiyILwLb/1uKEI5eu+aydL5W+NIqSOPOsiPUeOWZO kHfEZoecEMcSWXM2QjZcT/N7ZoN8IFZUc+SsQn7k+TNyzvMa+cR8QD4zU7ZgRk8ZMaObZP8Y z5LsH6OnZP8Y7yLZX5+Q2V8XyOxv0Eeyv8FzJfsnVMP+hs5lf0017G+OyOyvaR/2N3gXyf46 R2Z/jW6K/TXuqdhf4/+g2N/gXRT7m4ge8f5a+JzYbz9tIpqbc75FqCmpN7Aregu/fTuNE6bo 9w0hJrz8CmVuZHN0cmVhbQplbmRvYmoKCjEyIDAgb2JqCjw8L1R5cGUvRm9udC9TdWJ0eXBl L1RydWVUeXBlL0Jhc2VGb250L0JBQUFBQStMaWJlcmF0aW9uU2FucwovRmlyc3RDaGFyIDAK L0xhc3RDaGFyIDM1Ci9XaWR0aHNbMzY1IDY2NiA1NTYgNTU2IDI3NyA1NTYgNjY2IDU1NiA1 NTYgMjc3IDU1NiAyNzcgNTU2IDU1NiA1NTYgNTU2CjU1NiA1NTYgNTU2IDU1NiA4MzMgNTU2 IDMzMyA1MDAgNTU2IDUwMCAyMjIgNTAwIDU1NiA1MDAgMjIyIDU1Ngo1MDAgNTU2IDcyMiA1 NTYgXQovRm9udERlc2NyaXB0b3IgMTAgMCBSCi9Ub1VuaWNvZGUgMTEgMCBSCj4+CmVuZG9i agoKMTMgMCBvYmoKPDwvRjEgMTIgMCBSCj4+CmVuZG9iagoKMTQgMCBvYmoKPDwvRm9udCAx MyAwIFIKL1Byb2NTZXRbL1BERi9UZXh0XQo+PgplbmRvYmoKCjEgMCBvYmoKPDwvVHlwZS9Q YWdlL1BhcmVudCA3IDAgUi9SZXNvdXJjZXMgMTQgMCBSL01lZGlhQm94WzAgMCA2MTIgNzky XS9Hcm91cDw8L1MvVHJhbnNwYXJlbmN5L0NTL0RldmljZVJHQi9JIHRydWU+Pi9Db250ZW50 cyAyIDAgUj4+CmVuZG9iagoKNCAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDcgMCBSL1Jl c291cmNlcyAxNCAwIFIvTWVkaWFCb3hbMCAwIDYxMiA3OTJdL0dyb3VwPDwvUy9UcmFuc3Bh cmVuY3kvQ1MvRGV2aWNlUkdCL0kgdHJ1ZT4+L0NvbnRlbnRzIDUgMCBSPj4KZW5kb2JqCgox NSAwIG9iago8PC9Db3VudCAxL0ZpcnN0IDE2IDAgUi9MYXN0IDE2IDAgUgo+PgplbmRvYmoK CjE2IDAgb2JqCjw8L0NvdW50IDAvVGl0bGU8RkVGRjAwNTMwMDY4MDA2NTAwNjUwMDc0MDAz MT4KL0Rlc3RbMSAwIFIvWFlaIDAgNzkyIDBdL1BhcmVudCAxNSAwIFI+PgplbmRvYmoKCjcg MCBvYmoKPDwvVHlwZS9QYWdlcwovUmVzb3VyY2VzIDE0IDAgUgovTWVkaWFCb3hbIDAgMCA2 MTIgNzkyIF0KL0tpZHNbIDEgMCBSIDQgMCBSIF0KL0NvdW50IDI+PgplbmRvYmoKCjE3IDAg b2JqCjw8L1R5cGUvQ2F0YWxvZy9QYWdlcyA3IDAgUgovT3BlbkFjdGlvblsxIDAgUiAvWFla IG51bGwgbnVsbCAxXQovT3V0bGluZXMgMTUgMCBSCj4+CmVuZG9iagoKMTggMCBvYmoKPDwv Q3JlYXRvcjxGRUZGMDA0MzAwNjEwMDZDMDA2Mz4KL1Byb2R1Y2VyPEZFRkYwMDRDMDA2OTAw NjIwMDcyMDA2NTAwNEYwMDY2MDA2NjAwNjkwMDYzMDA2NTAwMjAwMDMzMDAyRTAwMzQ+Ci9D cmVhdGlvbkRhdGUoRDoyMDEyMTExMzEwMTAyNy0wNScwMCcpPj4KZW5kb2JqCgp4cmVmCjAg MTkKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDE0MjM5IDAwMDAwIG4gCjAwMDAwMDAwMTkg MDAwMDAgbiAKMDAwMDAwMTUzOSAwMDAwMCBuIAowMDAwMDE0MzgyIDAwMDAwIG4gCjAwMDAw MDE1NjAgMDAwMDAgbiAKMDAwMDAwMTY0NSAwMDAwMCBuIAowMDAwMDE0Njg2IDAwMDAwIG4g CjAwMDAwMDE2NjQgMDAwMDAgbiAKMDAwMDAxMzE4MSAwMDAwMCBuIAowMDAwMDEzMjAzIDAw MDAwIG4gCjAwMDAwMTMzOTggMDAwMDAgbiAKMDAwMDAxMzg0OSAwMDAwMCBuIAowMDAwMDE0 MTUxIDAwMDAwIG4gCjAwMDAwMTQxODQgMDAwMDAgbiAKMDAwMDAxNDUyNSAwMDAwMCBuIAow MDAwMDE0NTgxIDAwMDAwIG4gCjAwMDAwMTQ3OTEgMDAwMDAgbiAKMDAwMDAxNDg5MiAwMDAw MCBuIAp0cmFpbGVyCjw8L1NpemUgMTkvUm9vdCAxNyAwIFIKL0luZm8gMTggMCBSCi9JRCBb IDxGRDM1RDM2NkFDNTkzM0Q5NzE1QzY5ODBDQjhGMTdDRD4KPEZEMzVEMzY2QUM1OTMzRDk3 MTVDNjk4MENCOEYxN0NEPiBdCi9Eb2NDaGVja3N1bSAvNkY5NTNCNkQxMkREMzE1NUY5MUZE NkY5RDY2RDQ0N0IKPj4Kc3RhcnR4cmVmCjE1MDU5CiUlRU9GCg== --------------040402080502050701090706 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------040402080502050701090706-- From xen-devel-bounces@lists.xen.org Tue Nov 13 15:46:42 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:46:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIh8-00016u-8f; Tue, 13 Nov 2012 15:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIh6-00016R-LE for xen-devel@lists.xen.org; Tue, 13 Nov 2012 15:46:33 +0000 Received: from [85.158.139.83:41918] by server-1.bemta-5.messagelabs.com id 6E/87-05877-75B62A05; Tue, 13 Nov 2012 15:46:31 +0000 X-Env-Sender: zhigang.x.wang@oracle.com X-Msg-Ref: server-3.tower-182.messagelabs.com!1352821589!30091028!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17500 invoked from network); 13 Nov 2012 15:46:30 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 15:46:30 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADFkQwY003516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 15:46:27 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADFkPBK010812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 15:46:26 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADFkPhT005587; Tue, 13 Nov 2012 09:46:25 -0600 Received: from zhigang.us.oracle.com (/10.149.236.110) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 07:46:25 -0800 Message-ID: <50A26B50.5090109@oracle.com> Date: Tue, 13 Nov 2012 10:46:24 -0500 From: Zhigang Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Keir Fraser References: In-Reply-To: Content-Type: multipart/mixed; boundary="------------040402080502050701090706" X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: Dan Magenheimer , xen-devel , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a multi-part message in MIME format. --------------040402080502050701090706 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/12/2012 01:25 PM, Keir Fraser wrote: > On 12/11/2012 15:01, "Zhigang Wang" wrote: > >> Hi Keir/Jan, >> >> Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested >> your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 >> >> Attached is the result. > The PVM result is weird, there is a small-ish slowdown for small domains, > becoming a very large %age slowdown as domain memory increases, and then > turning into a *speedup* as the memory size gets very large indeed. > > What are the error bars like on these measurements I wonder? One thing we > could do to allow PV guests doing 4k-at-a-time allocations through > alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the > filtering-and-flush out into populate_physmap() and increase_reservation(). > This is listed as a todo in the original patch (26056). > > To be honest I don't know why the original patch would make PV domain > creation slower, and certainly not by a varying %age depending on domain > memory size! > > -- Keir I did it second time. It seems the result (attached) is promising. I think the strange result is due to the order of testing: start_physical_machine -> test_hvm -> test_pvm. This time, I did: start_physical_machine -> test_pvm -> test_hvm. You can see the pvm memory allocation speed is not affected by your patch this time. So I believe this patch is excellent now. Thanks, Zhigang --------------040402080502050701090706 Content-Type: application/pdf; name="result.pdf" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="result.pdf" JVBERi0xLjQKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0 ZURlY29kZT4+CnN0cmVhbQp4nLWaSavcOBDH7/0pfB54PdptQ2NwLz7MLdAwh0dus8AcAskl X38klWSpu6tKykbArzHWX7X8VCrZEUc5fD18HoT/56QaxlkNX/4+/Pnb8OnwYfg8WHd0w6ic f8zM09EOs/+VH4BhYvjy7+F8P9zuhw9Pt9Rs4/DpaIb7X8Pvmxyc17j/834ScjEnoRZ1Enq/ GGGXj/c/MKl4a7fIX8bvN8iGMc/2uOVNipMYgx3TbtFM2aOl8ia8Kp28C/f/WA/qm1JMRz2M YgyD+3SkGY8KG+KdWIPNZ3EJf2y4XCn7lZDHiVCxoHILf+JlJVWsxs33KltUkaJti/bjKVuS R0FAynBRpIpTx5n3aM220CpGSZ/SZlzArY1UGV23itSUitWGjO6zRz7nhAog5ubZU/OE2Eoh ZoVPCDLkPUQuTryB+SxdqAAQdfY05IzSKpEuXCXRpQAszn+gi1OBXGg2F0AXrmKrVXdhVYAu VuW6e0SuF6CrzxZaBejqs4XOUaZL+Og80uVzwxUwZMg7AOHTqmGNcmnNiCEqrwWMLoMJMUyl LmB8QrSUfofjVPJCbdCFCaxVLm4dtavpTL406KJtiekBLkhbMl09Ks3aNSm/az/RpUm6tH8Y GfK+l/44u2z7oIQNaSWl0r7EMAp0oQLbc1plo4AxKuDTxpdBQAxVuZSi0YIDEOtSoW1JiGEq MDLtL3wFSIg1VXiPpDC+kXOjQXrUxsYKpKEj17y75Z1OsOs/FTPaiOSK7MENU6m37a5uDLel htaynaH2rTFhC4y8VXWRL45GhgaoU2rjK+SoeKm6NF3YVWm14Ll5qZWkVELQOeRYsrFRTghi IwF7VSVs60EQNcJWrqw9LRtpUC6ZfEASgqhKVb5BsYUg6tFacbO3CbRBCUE6ONcqzpfG0UD1 S/FtR0Kwz0HbUwVtiDtW1+klJY0gxu1rE8A55zMTF51EIaq3Vhs3vzYThZhKLsodSU8UkjFJ +y5caBWgEFXZSr7LOZnZfIHCllQOMbc2EoVNq9Re6ZltWJDovEjxQEsRuwszUw3XunCnq4gi Org++D+GqNn9YXpZpUGhHzpy3tyeSlkTRVTq+rQs6MWVUEQ92mt7ppqvrakPRKVkWfJ5+fMU NlVKM0huX4nClhT4pvmKliiUPlhoX8c3t2lPxoZXffr6sOopqXkKJ2XUkrrzsTveZKiVcZRT pYo91KIL66UWgvKy6rp1WSeNg7i2NuaPcrWcXB/2RqZp1OG4Q4eu2NRVxo2bWL0qZuceSqwa Sche9LYqQTy0+jW75QUs00YKdKjeDUlglPcyrT7yVa1ya29IeVgRi1KSnnYVvpAnVBGLtr0Y VOWqebCJoFJqVdddIUt3g4App5bP+B3dd4K0Q60c4Wi1dL7u85TQmGPHokJzSRewlS/H2oV9 mNQAHG5luZTTGx33VFlR0a2qrJf2dpFgRaWuO1vVm2ao/a3KiulVO1n14iff4IGl9arK/5AU HllSr+xG2d+NrVwJWtq+ehGUYtaqrA296rtS4zAKCEtHfIQBuXSc4BFGNdY9BWWNnvObL7Zo A8KYaNW2n0sPziGsWB8f3h8U7iRfxOeYh0bgLhV85Tf9ohxgRkWvlaOlJeY/VBkpQo2jPS/f EKq9uHEkNs52iFbbYYUkg7Xmc3R7UK7fhzFdc0jRKC2yVMzyJhV8BU+/ZbTYLW/mJMdlOsnw mVzOy9t4kuviL2d/EwZMMHhapH+M7pR9JVH49ELBlNcwjymSYMMtzLbBjWCEEtEIt4Qv+Brm jh/yjaAPiy4UiG+aXEWggoNKYfPGWePkzLxKzpTTSv9qp9UoKKepyX+K01qFszQV7G6X029g LIInDBjin49PjaQFk2As6PNcbnAjPj0H2MPCMKfdBM4Ao8P/VvkJeX8KwqsVfCDMHI6nP4bA Nwbif73n8BIKZW5kc3RyZWFtCmVuZG9iagoKMyAwIG9iagoxNDQ5CmVuZG9iagoKNSAwIG9i ago8PC9MZW5ndGggNiAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlPj4Kc3RyZWFtCnicM9AzVCjn AgAEKAExCmVuZHN0cmVhbQplbmRvYmoKCjYgMCBvYmoKMTQKZW5kb2JqCgo4IDAgb2JqCjw8 L0xlbmd0aCA5IDAgUi9GaWx0ZXIvRmxhdGVEZWNvZGUvTGVuZ3RoMSAxNzE2MD4+CnN0cmVh bQp4nN17C3RbxbXo7DlHP8u2jr7+W+dY/kqK5Vj+27KOY1uW4ySWEzuxHRzbsWVb+fgnOYkd IAaSkDhADKShaYCkkFICFJQQIBQobi+XthRuc1u4r1x6G7eX9r3bNk1eL+XdlsZ+M0dyflDe W+++td5aT/Y5Z8/ee/bM7NmzZ+85Umh8wo9i0TRikNi3vXf0uQefewIh9C5CoOvbEeIvN3wt g8DzCGHTwOjg9lznR39AiPkPhBSywW2TA//+YN4kQmpSxbZryN/b/1Hsn/IRKtlFECVDBBFc uFtBwDApZw5tD+3aHvvf9pHy+6Q8u22kr/fUM888h1BpPymv3N67a7Re7mRImfLzw73b/cVX 0MekfAEhpTg6EgwdRdZFhESO0kfH/aMlm35QTcoFpH8fEByQP/qJJaCcljHDyuQKpSpGHRsX r+G0Or3BaEpITEpOSU1LN/NChgX9f/2RvSt7F90huwsZ0aR0v+nDViAD2onQ4u9p6fp9YcP/ 3V4oI49z6A30Ajp5E+kAupPcn7sJ9yb6O/SsBB1H93+J2FfRM1HoCDqG7v2bfFvQPUTOKdL+ 9U8PwU6ir5KWz6NvEkPJACdpdWuU+hH64ReLgl/CD9FD6GnC+RB6hdyPE8vbjf+IHsJr0TD+ L8xd6G50kIzxBATQYcLfg07BRrSJYCOfTciPRm4ROoNm0TfQFFmF1z6yuxb/HcX99Zuk5weJ nKMogMZuqPE0/Jk+GDPp+/PoJQl31xJR4WW24JcxvvowKTyIBsnVCx+Sft7P1KA6mRZOkxVT 39He1rpubYuvec3qVU0rG70Nnvq62hU1orvaVVVZUV5WWlK8vMCRv8yem5OdlWnJEMyJBi2n iY9Tx6iUCrmMZTAge73F08OHs3vCbLbF611Gy5Zegui9AdET5gnKczNPmO+R2PibOUXCOXAL pxjhFK9xAsdXoapldr7ewoffq7Pw56GzpZ3A99dZOvjwJQleLcFstlSIIwVBIDX4+sShOj4M PXx92LNjaKa+p47IO6OOqbXU+mOW2dGZGDUB1QQK51pGz0BuNUgAzq2vOIORMo42G2ay6nv7 w76W9vq6FEHoWGZvDMdb6iQSqpVEhuW1YYUkkg/QrqND/Bn73Mx95zm0uccW22/p772tPcz0 krozTP3MzL1hrS2cZ6kL5019nEhG7g/bLXX1YRuV2rT2WjtN15uEsCyLs/Azf0JkOJZLv78Z 0xvFyLO4PyEKeoh6Z2Y8Ft4z0zPTe35xerOF5ywzZ2JjZ0briYaRr53UOr/47UMpYc99HWGu ZwgqooP1rG0K61s2todxlocf6iUY8u+2CGUpgrZjicf3t8iIKIKog+hUEOjAD50X0WZSCE+3 tEfKPNqcchaJDltHGPdQytwSxdhGKdNLlGvVeyxkNpvWtc+E2azGfks90fGh3vD0ZmJPW+hU WLhw/KcpgmVGp+XLHR0SL0961dgf4MOybKIWUuvGCsRSaJUZTirEfxp5XEohDWRrdXy5hYih cuot9T3R/x1DiUQAv8we9toiU9/aHhbrCCD2Rueo/kyBg9To7SFTFKiTpi/ssIyGDZYV1+aT dqs+sK5dqhKtFjbUhlFPX7RW2FFfR1vm62d66iJdoLIsLe2vIufi/JkiPuVFJypCHXWU2VRL 7Cq7fqa9fyBs7knpJyttgG9PEcJiB5ngDku7v4MaGtFQ3jxpTpBaDOPa1vamdZamls72smhH IgQqjs2qv0WMpT0lIoaYXFiZpeTbcQrTQRg5guA9BLCsqCL3sCJLSS6OKFzCUlNdUcW3Qwpa 4ibdCOfx9f66KB8t3yRURs2p1rskTU6LRE6tN0XoECKfZXZMyHy0YVJDSZXqXSIxWcQTEBwm YiQU1WUitXm+3eK3dFiG+LDoa6djo+qRtBxVhqTz6Fy13lS6QVlETUgg5KUCVWbYY0u5Ubnh Bql8rei9hdy4ROZnlJamdTNUuCUqEJGeN4YRNWGxTJsirX66ni2eXrKIyYqW1vPMGVGka3mI LtsZS2P/jGVde5XETTzIHSlTtC0daoKm1hXL7MSZrThjgQMtZ0Q4sK6z/VUSU/EHWtvPYsC1 PSs6zmQSWvurPNkrJCymWIqkBZ4WqKS1pKCU+FNeFRGalqishJDKfecBSTjlEg5Q33kcwXFL OExwbAQnSjj6IbOUOER0TPx3Pd9P5+f2jqGZng5q48hENEL+IQyWaqIdS/UZwPLYcIzFvyKs tqygeDfFuyN4OcUriGWACZbZp2a4esufEpfRzRKjOnLrl7WRCFiB8s8AclSdVbDKS4Vn5LKf V51lMAHRGYaiZRR9ViFX/bXqLFC8UytoswStUIf5hUz46sKQrO0vz9ax79FAAXUt/p79D9lR 5Ea/EoePVkNdNTxVCftLYO9yeCQXTgugFlIEm3BcYDvSTqfhQ1o4pICjGFhswHhvBfSUQMAI O7Rg7czLQ51iWA/6mmlVp1Lk9F6lsqgTmTmzaGYUZj2nN3l36Q/ov6pnKvVQdH7xiuggqJ1F 9xY9UsRUFIG+SOboHrFChxWarCC3gjWTje/uUcFaFdSpQCXTI7ezq6vrknTvuqQrL+/qspF/ cGzquuR02C4lcz/vSr5U6Li0vABRFui68QOGeGzhM3NK0xlnYTUuLsrHOfmy4qJq7CxMxwmK fMaSEY+NBgKny9j/qJ/96OjCnxf+OffV+Iq+hwbaHhgod48/3lO5c3uPJ7dl9q3xe749vTrh 9fji9bvXbd7XYnFve8BXc9eOwVU22NdxdLvr/PNZpZ01mWlV3Svq15dlm+LMtoqWrZ7+w7dZ 89ZO+gSnryTVUtXicLeUZOo0hNg6Ls3JAyRm+gOJiAW0/VWkXJwTMxVqr9oj+mLhROxiLI61 TCPLnOWCZd7CzllAY4FpC1jOE0Zen+BNTfTMJQFK4pIKkuaTriTJlEnJKEltRDqfjEPuS4Vu p5vqa+xSoa1rbGycqmwsmSjMBtUM1YNRa9ESzUiqIKBTS7SmAFe6p7W/emjf6rSXtAXtHnGw MffcOUzCK+au0tWFCWX++1qvOvDz9UP1lvzWXU1X75a9u3CnsKIsRyHZ7wZiZ4nsGpSKstBW Mb/TssWCO9O3pOM2xk+st1GlSmkQzWkwmwZpOdNZqMGsBW1BzlzOhRwmhw5Nn24h5iRDvqws Ge8zcTJfvImMxk2MwHFJW+4A25ij61JhdDSSBXQhOuXpZHJLShPiydxibXSq0yAnH+gAFWCw NI77Ju5PelzrGji27cpnq/aG+w+8MuL4tmb23mV9rRUs/I+2w4Plm7zLlm1sdEA6JH/1p3sr 24//ZCpx5tnH0lbu2SzNmXnxCrbK7MiEdosbcuMhED8ZfzCeyY2DQNxk3ME45hALLK+K825j b2cfZZ9jWVKK9Y6Y9piwKTbOxHAelfKwDJCMk/EyUcYqZNOJoJH7Yt0xEKPS6H2MNNz3upyX CqGLzp/TeSmh0NFFLN3WBWQVjHWNZcWTURVrLcXOUqfRabRoDSY6eGzNayv72R17i3f94AdO d/LyNKU67k/4J/f88Y/3XG1b41bKpaQBPUpyLQ3Jv2LQJpHnVdMqrFIph/Es6bkDDgMGYOUM Ig4RK7CMrt5kzuStk7XK+mUMibQ5UmIZuVwJIZQYMTSnzeGMrM4Ep6PL0cVdkjrsLBa0suIs 4piMj8Lgwvdg9VOw4Rhb9a/P/PqzxGOSvTxN+vJb0pd4lIAmxHWnMTycAMe5ZzkcwyQzVoaR xRpjs2IZ4nE0SdNiEpB/g6ITKTmlqGSU8m6zwWFoNnQb9hhkGsOPDYsGRmEQVVqvwaDQd6sY hQ65Jdux0ZUA1HSI3XA/T17yHBFnIZAFIBCDURRlE1goLGF/65p8eXJh85u45Y5v3149d+rU wj645xvHmQ9vOzFRd/Uj2V2ukcd69x+6+v5D1+w+SOy+ENWgr4uFk66DLjwZezAW41xiDDGy ZBm2JZJuyVKNqTgrK90j5qtGyvaUHS5jymqnDQ1GavsGY6rXaHQ3mBlgCmrnavHJWqiV1jtZ FEJLrqm8RaVKdnYbwGE4bMAGg8aXzOU7fcgkTQPxjF1jWrpO3JeIodB1suQrCwvpWiFLxdZl I8OWZWRTb+iG4qgDUORQn2AyRg3JSO2LOE1LPJNDHKgLFPGM0WCCx5881XLP0xv+PbViQ2VR a3W2/PWYssHjw+/+g7VSkx6fUZvtbMxPZORp9bdNWNbf1Wb9+xU7O4u7Dc8d3XpwTTpmK2s3 VaRocmqdWnHrGttrZxbyfS0sM6pUppS2lBS1VvL3ujeHijtY0BZ2Nrb3UL2uX9jAXGab0HJU jz4UvVPLZ5bjHYr9CuyvhrZYfyzurNhSgbOZEgZn6yBPAFVCUsJkwsEEVp5mStuRtj+NVTk8 YmFGQTzsib8Yj+MbpuUeGVVqS0KqVyaratAkQ0wy3yA24B83AGrgG2Ybwg2s72IDzDVAcwNM N5xswJoGRwO+0HCFQqDM02SU+sycpsZnNKl8xXLIloMcpSB3Id206FQUumFTF3W74+P0eeO+ NUYng1jfphs2LKrs0nRwSsq2UB+WjyP7lSnBSZ6lTjIBWoNcv+SwJXdXjXFm1+yAGP+Sbne/ q9+TjQ2VbaPewYe7bLbe4yPB0/mYYVj8LGAMF+3LfYMl9X01ZrO4ua5kcG3hwobshs1VyU0t GU271j+f11RhqZ957967Lzy4OtCbVF2ay6hsVY05f/37f/018/bY1wcKCga/PjpxYrM1v//x iB8ZJGs3lsQUucTiV0+wMJG8LxlPcTMc9mfB+iwyGx1CQGACFki1QJIRJlL2pWB5CuSkDYtK MdvqFZVwWAlK67RuWB/K3puN9dkc4sms0+kxp2d7kTL7AR3cptumu13HxOiSdVgXF0xUQHbE 85QTkyfa05WDw9bldHY5Ivq1EVsnpt61FBnQp7O4WnazsZMN0BAvVwjGQefDT5yYbs6s664o 6V7pUJxXrQg9uTVwaqzK2TY6dfv29Yn44p6JFx+8/fYD66s2VpvTqzoqtav2+ysKN89uapgO bRv0DwTKj0V08hq53Yk+IvFbvsgzRxGaRVhEPhRG8+gKks2ik2R4YhznRXAcIccl2vOx8UvU VzqNr/3dRx8R8hDxJUlEr5moDL0gFtxnhCnTjAl3KAIK3MlsYaYYphX3Y9xq6beELExrRn9G KIMpTq9Px/sKoZB67GUxcd69yZCVXJxcnzyRzJqSwThiMKBh0ZF1IgvPZkFWxbQjbZiL4WNw DFV3IlF3TJp1gueLEoNJxmNGbNQoioKyJLobObuk7beQ9vaWvZcGZuiamiPeNCMfiPXqqiEa bklbsDFSVNxiwWxSZfCZkd3np1z1d7+2w3vn4JqE51J3t6zc1bps+dlgz6MjrlcyvVs8y/tb nLlNW1bUDHqz4b0tZ/Y0bDoDcOp1SP1OT3rtsM+8scVz6Cf3beyunvjmaOOOdcvSarasWnNv f8WytinqR3qITnVRnX5HDJzOgSfV8JXYb8TiZ7RwTAshy14LDvF7+SM8M2WeMX/NzEylzKR8 LYXZnXwo+Xgy05m7JRd34ADGXCJRbokSstCwQ+/W42b9m3qM9Ly+QC/qw3qZQl+hHomJcQzz JMahqk3hs71p+qJgd+JIIk5MlFmDGYr4YIIa1FS7TuoxSGDTFVWv03GJ+/kmahROyV8TvUaU u3QHA46656jHKL3RX+g+p2Bdw943drTcPeA1PZe6c2PjZFsBNjZ2bSvtOb6t0r3rhZHf/fGt rMatnpohb47FM1RfOLiuGP/L6wu/fn2T4BltTtnYVj9z4T7HSmdK/e0vbN0e3r1i4dQLa2YG KvPbppoapjqcGZ6tkdzFR3RsITrWoxw0Kvo6sgJZ2COsFwYEZn3KQAruSAgkkO6QJGK/FtNg CatjQa2EScVBBd7B7GdIrgYKYqOzhpNkd8ubTh+mQVFSUKOwRA1R2sEjwf/ygk03x/wRrVy3 PPi8Kiyr950bGDx7T1PT3nNb/Gf2rnold82Yd1WoOTevebyxYbzZhr/7o4XfPbty5TNgfPcD SHiqtvaphX/74OmL+0rL9l385hO/uLey8t5fkHW+JrpGK9HPxK9MMTMMnsD7MJ6o2FeBJ5z7 nHjCsc+BJ+L2xeGprJksvFG7VYuT88CohB35+/MxWRSNOZA9XJK0vDtpJAnnJOUkxej54eXL yfjNeof+hJ6ZJSmWa1o9fDkGqB5KkkLJydz92XBb9rbs27OZmOzkbJxtCdoVXPAuNaxT96mD asagBtk1y5JyqKiPdFwibpLEQNdXLwkVyh2OLvK4NHYtj0LRZAotLWUcSaNKqPe0QXEkocq2 ZMhvcKNYYUxn2CT35IvBe14MVai+rbSt3LbywPH6wUnnwGbn8MbKfffsfDj2JbVv9+MdO57Z 5szwjqxpu3NtHuzr/WqgtGbrwUZt2W0rMvfvXdNdrHvUWLqpceyeqZH4rpmNyyr9B1ZXb1tf zbGqyvZR6mPXEt2nkZjRjl4SU9fHDcTtj2PasB9LzhG32fw23Gb1W3H2+cWfiR3xWi9RujwG kjKPZeKDmR9mYqZOALmFJxSLmqrbCA7jCSOeNYIxfzrTnDUs8Lx6+EJE7cnB3FwuMyTIuWBQ fY8aD6rBdIOCo5mJpFqngwTtEfc4nkzWtG15QfdY99g4XcE0eJeW8q2KjeSn0r5k0QtGgYn4 STZNvPO13SPfGK+Nf1mdW+/3esZb7FZirctW1RQnhB2McPWelILZvsDTO0T40ZbwHk/RximP Mbep0mJrnWqu2d5s51KzDPjTYws1WcXixBOR/Skg7dk03q4Tl02pZ9Q4QAxmWC5HJOvkYnmS daq76XsrHomoB00jGUKxoTi5LJHG0YV0mDTKpEOmzp/oFRstRcm4VCgW2NgtZ6cbXvcdOOe/ qmaeZC8/sfDBwj8ufPfcaaiHcsh/+FjETzhIH0ql/IPG/L6vaeCYHA7IYR/3FQ7v4CDRBDtM +01HTYxJJsYavbKNMVtjdscwMUoYSZCbMYzieYxpglKAfQSUKTFig0qTCdRyOdCOOkn/aP5E 06dxJ52ULofN2TUm7Vd0Bmi4XwxOrdMI8YyCXgIz9szVIbzvjbcXZjFnMCoXHpHpDQY5/BHc C98F933My39d9QCzU5aWmRV79ffK5JRkBdnlO4gtJhM/kIdcqAW9Ke6dyN2XiyeEfQKeSNuX hidS96XiicR9iXgqYSYBT+ln9HgqFqaUM0o8pZhR4Ou+o63eX4/bmvxNuLNmSw0uGjZah82a THMzMUuz0RxDLFVTba7G5mpH9YlqZrYaqtdNe6mZxmRqaifKy1c7JpIVqyeinlJa8WTJR1e8 ZJBkuZOpK+cucZeWVLG02qXnkmXSraS0OJ9ZOjJZWuLMLQ711nCUTS6fePn221/aWe5o9pdU drmF8tGntgdPj5QI7i6Xa2iV/Rcp1f2NDZvdqaaKAV/bYKnWkloXXN88Us/zxMDXjtalwcHO R4arq7c/0rF614ZiFRtfvWFL5cp7+sor+vaurNiywRXLxhRv2IVXFbe7LRZ3e7G13Zuf722/ +qSzu3HZspW9RTVbV1utq7dL9n4AIbmF5GWV+HuvIuvi/ItKtZc/vzgvLhIgo9KDUFy+50PH nx34ZQfkOTocBx2M3AFPOV52/JPjNw72oAN2OKDDAXKHyeFxMApHUqzn7TiQx5niSuJ+E/dp nEwZ95kLfuj60PVvLuY1FxxzwSEXBFyTLrzRBY0usLkqXfjPLvidCz50wY9c8MZ1JiAsea5y F05xgcoF7/zO9ZkLB0jyeMz1quuHLhkhr77OERFCm8LXGrrDBaSFJtdG11YXa3YBS5v4nQu/ 4HrThQl9j+smstoFX1ukYsRFuOgCIuYFKua4C++hndnqws0uqHRBpsRKWrvGdJzKOuzC/S5o coGbigWNy+zCEabdrkOuZ12vudgRqX6kqS2vuWhnGKkNkFoAIp8M5TNa6TIdx49oX6HfdYQO kXaVIUP4hFZ41vWRiyGVtrqgSKqkcUH5awT5mYs56YIQrRIZGxNpjrZFaKcoM0XvdrFE0AUX 4B7XrOuka87FktYLXOBwARL1LlBmFPtyuSQ5yeX0GkccMpIMrtAdSeAgEl500yyOpnGRTE76 jEU+41+IvYFyK7n7JvJN4cu1qpETO8ema9jIQqanPzbhxvM6eqjpTGeMTilzT3B+waEegwyO VaXlt9VYXqQp4DOAGcwkljX1irsPpzKJVb5+ce3OVZlnl7jw881balKWtd3RcvV+Zl1GU22B QmYvryTk4rTNW+ndftuD/fT4j/LZWu9cd/V+mqPT/ZissXiUgUJi5SR/kMeh1L2pmHpxPKk7 qMNHY5+KxWysIRarVSkqrJalyLB0sqxADeKsBjSZ0wWZkCkdgqRbvBczIanBTFJDgy+GS48e iUmxX5dt7PPhH3ARr8UJX5RgpP3lD2Nnd9fAr+98ZaLsjZymbXX1I2vy7KsD1fWja6w4feHj hd/W3ffTw7jAc99P7rvz1OacvL5Tu+/8xubcnM1PRX0IPkDGZ0bVYi5nLCCpkVGINXvm6D7J oYJIaqdESbl6kzcpVscpNNSSyDb0ni16Aqt1Sudht06aMZoaaR+IzA/DAKu3VfjKTblqXUF6 9YbSZKY6o2FFRUJCZXW5oXpjZZqC+YZMVtZ3sOUq/VoMki1sYP7KViAz/rFY+TADD2M4xsFR BPdzj3H4fvQYwlNpM2lfS2MCafBYOqRzJPd8SA/79TCuh/X6AT1+SAeMjiaNmYTEoUQl+dOm m7ljZthvhg4zeMyQZAa5GZRmnVZi1MpJACVkCyWCh0T3O4T9wlPCy8Lbwm+ET4XY79M7Fuhc Ln74b963BKBEvPfmKvK/WV8umAgpkjhQQgStfuQTAeYF+J7wEwGfE+CkAHcLDwk4JECPACuE tQIuEoAXAAs6AX8sfCJgifWUcE7AEme/EBKwxJgpFAn4y/nWU5kgMZqoTBiUWP+JdgAk3qO0 A/DFzEu84lOEm3Q1TId/RMA9wqiA64RWAfNCgYBZwSDgeeGKgN8S3hfwl/OVksFH2SDKBFEW iAr6HB0jgQrwCaxPmBZmhTmBdQiABE7ACjLTiE/XamJ9shQpx9c6yb/k9aKO6lYPFnVS3X/D wd3gxW4mS0UbBRxlzqhn6yojMVq5y5HoIM0uL7B1S0jbDSGJQLPa7JximuOWuAGc+nQmoZop 1TvxbdnNm3etyaggKbe2+YBTu7Bu7uMYszkRMwlp6THvf2fzYyOVrOJehtlxl40tvvpMSmen V6Wu8a1Nx1sQLP5yIcDOLPyORG8WMYHDPXgan8QXsIwCV4iLROjbIB3NOGjEyBQLRjN7eiFw 991kvZUv/p55mW1CpegNsS2Uvzcfjxj3GA8bma0myCoBawoYi0CGjRir01PScWajxYK8Ij0b wLP6k/qwntGXT6sbY8SkdG9MjN3bnNadhulBQU/5XDmeLodyum6sOVavuxy4ctDbZXk+HmXC bOaVTJyZyXPxPlmPelSNp0kSopYRz0jjce5S9EGUClSPY5F8xHbp5sOapbOEG3MQuP6OjAR8 JdQvSW/I5NEXZMzLlaNPBjY9Mr5adyJhdrqi15OTv3bCUzM9KP70nRd/mvqEqqCuLX8qZFu9 rcbW2dZUJoBt1c4WW5oYWGXe0MLl1BQsd1vNeq21fmD1keN3HjJYyy2alU328pw0Tp1kcaxo j+QFB4lDc8neld59BsU4RkGiM5ZjC1hGyUpaMSZ6WVapWlTBvAouqiCsmlPhEyoYpe8wzCpA KrgiEVSUXZuR5W1WAcHLNKwRrSPOmpi5G7rGbNctVBt5NeCkJ4b6YqeR0Tq1B8+dOyfjn3vu L/NsxWdvR/Km5QiRea8gLajFNY/hb2F8CIN0HPSQ4gkFDin2KrBHsV4xoGBylcAo8W45sHKD PFN+Sn5O/r78Y7lCIVcwaqiEjcDEgJhT6gVRa/CCmvY197Z+75wazqnhpBqOqIFMbkgNPWpo VYOohiJ1nbpfvVfNSsx841ovrwaS6SM1uCOUU2qWVWdKbBLTi85qr8SsM+d459XEE6h5tY/Y DauQ0HGcwStnfKwGFD66WUVCHqKJ7i6bbUxa07brQYnNYaNKckZeR3VH8yh6qgok7zOCYFyO v3L1Yabs6hb82kEm+9DBv/7zIWlO90q5+rtk73Sih0RVYPnkcjxpATMNwRMVMd796UfTcWNK RwpuZDtYvB+OAgZKdBMiiQ1O8sAXT1tleg/ScboC3RUdq9SFi8FdDKPFs8XYXAyLxTBXPF+M k7J8aZwOxRplDh+OvBGRUtbIMTw9gY/k5tI70Ki3AU4gPsZC0xtLNVNMX4LKyTw5aQ6uuzXb YdMWxnc/6cQM2aafpxv2OSAftvAbU+99943U6p76hu2N2dmN2zwrekQzzrj6TkdfcllBBquy VXlz2EsLHemlxiTTUOfC7xd+NXpysCB/4Kldocf7bPkDT0o2piA29mdiYxzeKJaWQyPgYwAl yIPwfnQU4QrNSg0myXJAM6k5qGGKmXoGf4UBZpDZyRBfF8/Fab0s3Z6rCUDWggprOM7G7eYw yxkitzquldvLHeHe4t7nlB9xcL0sS+GA5UDJMZiKWFTjjRhbsVqXopNuTbqNukO647of6T7S KRd18JbufR0+qYO9uiM63KODOl2rDvM6YHUGHf7+/HUGiqBEyihfAihRnkKJ8BFlheNUEmyk ciCCf+RzrUYeDOG7tb35z/dnqVl28MYOUC7l32oxgo80K/ZFGpaX3tgFuVsHX9LmTX26lYh9 OnDogFoxVmiwRgVk1TndkQ23+9bNc9ON5U03bq437cY3787Uxpc2WEKiO6zLIe2uNtLCmPTm uGtMsNy4lfo/WNg59weF3qCVy/UGo/LTN9mKq6LJXec2Gt0r3Cb8vYj/myG3ask3j4hFDA19 LyxFv1cQq0TzsisyfFEGYdmcDJ+QwahsWoY1MrMMX5EBwUtv3FKoR5bBYoQ8J7sgm5cRFiCC aLxMt/3rvlk6u6EvRsiinDkne/cvRSiSazCXo/5kt7ihLcOfgTsLtxRiab2UxHhisIpNYifZ gywrV5gU9F0hq/eIVnRYd1mHdcXTfINZDvLPOQ+jDqkdPiWHsiLphvQOzy05j+iRc/S1XUTZ 0ht4rCUZB31Blw9Fku8g+6WFbKIQdRhLB3tMseQj4IHdpwoxELdBfMdzxI3gq/98zW2s3Cq5 jeeHOsEAibikc3OMzWFVwZOf6XO8VTZVTFZBcTKMSn5j8KldwRObr/mNDUQn75D8JAdNiC2T HEwmQF8W9DHAe8xmpeck2Q9VeajBrAe9xZds5vfwh/mLPMvzyRyvHFVOKy8o55Uy+kq9RyrO EYRCqaTfvDDnQReKvFimAQYn5WBa5x2OsUT6oiKyD9z03Qvp8Ii98cUP6FPEwOqeuzQvq6oG j/TuOTtSmFnTPjhesfGBQTHu1fjxwOpBMQVndD06Vj20Lbb29k3l6x95b9f2b97R5kwo3LCj Lr5zi3PwUbR0nsP8gYw1i35nJoPsE/Q7M1ke0YfgBFokBpIzjaRvk8znsHM5oMmB6RzIWfrO TFKsZy4OUBwXVxA3H3eFnt1Ek/9I7h854vyi78z87dSb5txMeUJRm1v6rsz1RDu5eu0WT+fd rTlfllZHEmppbItX6Tfkif+3MmfEzF8nQEXeyjw8lTeT97U8ppir5/AER49ImZI0TxoukV4u XRFNxNmXpzam4vJUSKVbgLRhIEpSqUkpzhOH42jJSUrSIgGOQvGNxC7jOZXWGx9nSktVALLk WqDdAiaFxaIwMZo8K2elemt0FHobrVBkhWwr/NkKb1t/Y8WnrHDUCpNWKLF6rANWJskKn1jh ZUraaz1ixQPWHVZcLlUxSN/wUlo5jbSxqDQdGrqDsTGat+2/sX9qZ07Z4agdJu0wYIdWO5TY PXacZIdP7PAbO7xlh5ftcMwO++0QkljK7WCwZ9qx3A7v/JlWfdlOBbGBaFWVPcmOSc1X7bDe PmDfb2dIDRutBKTKx3b4pyWpT9jhiCR43A79lBuK7HV2nLHEe+xTO3zP/hM7PmeHp+yw1w47 aA/77XgFZQWTPduOWTv8yv5HO37fDm/bgYzlIYlzwL7DjpdGk0l5gaVjEj+IjuqsxEz7d9TO 1Nlb7bhkqd3Ap1QmvL80OCZk30vJHjIcJpOymOz4EzqE39jxEfspOyZjCEgDqKPUEju+Nsyn iAR8UBoi9NA+ZJKmmLJT9rfs79s/sbPTklqb7FAQVetnUrWTkmp2RzTSb2dS7HBFUt6PqKr2 2o/Yz9lZt52ElXbOjpUKGrHlxmu9KxRQpIAMBShS8xiNxpIbq/UuIzYlPU0AJgsTTxZagpN+ EYU+6Jf6NkX2v5uP1TZFd8XPJ5VfkG/eknPedLJ2s9xNn8eP3bBt3sxuI1toAtlDHY6xcSk7 dkaTVbJLSX9d9J/+kV2VyYec7By5Ih4UjLTFQoIpoaS0Gsg2e1OBPfqP31JqlTEqVYxSrzx7 YeEfz76iiFcQj6tScvK3vvuGgiOwUqnQKN4M42+n+LLtjmX27LXmqyvJ3iwk1PJZOdmZZtGI /+vVpOQVaRkWUqpNxheleHthA5vGrkbZqAIdEblA2WQZDlgnrXh/5lGSP9J50pPIutHcYcaN ig4F3s8cJb7qxoib+Muq6eWpGg/iOK6Au8KxSi5cBe4qGK2arcLmKlisgrmq+SqcavdlcCaN JkVZ4pP9b0TctmuJJ4m5if/8vCv9/OFdbtex0dDz+TIaakvO9Xkg8TebJK71u0ePdeW+kVi5 eWXVluZ8Gng39VUm4ozdF462tfdjvqAybaFDJs/xVlpVTKazIrmo0WH0PfjeXf2PbivL6Dl9 L91EK4ZPIOl3WqD93Ru/+G1dt6bqT8gc+Y3QO2+8+A9Lv2NZ/OXCBrmFRB70B0R46Qc4CCmq F9ag2us/ybnl1zSZ+PeoTrYedbFB9AC5NuByZCbPRwnuaVom13qCQ+Q5SJ6vkecQuXrI5SPX GnKtJVeAXA5ydcifQQekOvRJNgw2uPhL8iyH76OD5Lmc0PaSp4KUZygfgWkbB2TfX7xKaaRP dvQp9MAFXIh34Z8zB9j15G9ehmXPyTfJ31c8pCxQjit/pnpa3al+JzYx7mzchfg749/VDGkW tKu0s7pk3axuwcgbX4+ONhOtJVFhJIPnkAN1kh36cdkcwVEtpcL6azrpuaYfQBpSgmgtBRqJ wgxKRjuiMEt4ZqOwDMWjE1FYTuBvRWEFmkKvRWElMkBxFFaheGiMwmrShw3XfomXD8EoHIdG 4OtROB5VY460DqyKlObwmigMKJ2Jj8IYxTP2KMygIqYiCrOEZzgKy1Aqc18UlhP46SisQJ8w b0VhJcplz0dhFUpl56OwGpWxf43Cseg2WVEUjkO/kM1G4Xh0u3y4dmR0cjwwOBTic/vy+MKC glJ+rb+f9/aG7HzjcF8+X7NtGy8xBPlxf9A/vsPfn8+valxRv7amtbF5DR8I8r18aLy337+9 d3wrPzJwc/1Vgc3+8d5QYGSYX9c7HFzrH5zY1jteE+zzD/f7x/ll/C0MtxTX+8eDFF6eX1Ca v/w68RbW/0UnSM8HA8GQf5wgA8N8W/66fN7XG/IPh/je4X6+9VrF5oGBQJ9fQvb5x0O9hHkk NET6uWViPBDsD/TR1oL517pfOzI+OhLtUci/w8+v7g2F/MGR4aFQaLTC4di5c2d+b5S5j/Dm 941sd3wZLTQ56u/3BwODw2Tg+UOh7dtWkQ4NB0nHJ6QWSW9uVJlnZJhMzLYIj50P+v08FR8k 8gf8/aRro+MjW/x9ofyR8UHHzsDWgCMiLzA86LguhkqJtvOfq0181wgaRZNoHAXQIBpCIcSj XNSH8sizkKR3BaiUQGuRH/WTpxf1Eg47gRrRMOHKJ1AN2kb++BskBKWSnzz95LlDqks5V5Fa K1A9kVaDWgncjNYQbEDi7yVXiHD3El4/2k6e42grwY2ggS9tfxWpv1lqh1IChH+YUNeR0jCR S+sNognSPyqvhmD6CGZYamOc8C2TevVlEr6cul6iBK/hl5MeUY3lE+iLan651P+cJiI6H5Sk hCTZEc6AJLuNcKyTuHxSTaqFkNTasMTV+gUtNpMWB0h9qrPrnH2S7BApRySPEHgoqs8tRNfj Ug/6pXpLYwuSlj+vfWp748T6Rm7REe3dDqnN1RI+JNkSpQ1JpVES3TjI307pL5/w3Cy5Lyo3 X4K2E87/03ohsjJGJT36pVkeJLyRGc+XZG4nlrUqqqFhyd6phiZuGGNEN3/LyjzSM7Jitt0k h84sfdK6S70PRvs/ILUT0doouY8QvfslbedL2EFpjAEyhwEC3dg/OmODUdytvVnqy83j+X/Z NhONvXLQUfQFnzMq8TugoL/KkO4ngBUfgLmr8MJVQFchpvkz4D+DP/lyzX/05Jr/u8dqvuKx mbsv77mMNZebL3dfPnz5hcsy9a8/Tjf/6688Zs2vQPyVx2T+5bzH/OP5i/OX5xlx3lnimfck mv/FdbHtFy6m7SIwbT9nFs2aD8wfYOkmvpOY4vnx9+CNuSrzd33Z5te/k2tefBV850fPT59n pJeg53WFHvMr7leaXxl5Zc8rJ1554RXF6NmTZ8NnGc1ZmH0Jwi+B5iVQal50v3j5RWY6PBvG 4fBc+EKYcbzgfgGf/Fb4W3juWxe+hR3PuZ/DJ56FuWcuPIObTx8+jR2nR06/eXrxNPvo8Uyz 7ziMHIU3j8JRT5r5K0cSzHuOHD6yeIQpeFB8EE8/CKOHpw/j2cMwd/jCYdx8X/d9I/cx+z2L 5hP7YO89y82hoNscJCMYGa4yD3uKzcmQ2JbkTGxTOJk2ORlzD6F1k+s2z3Lzxk6vuZM89YW6 NhnRCVvItI0woGHcDL7cstiCxZbiMo/YkpXr+bHY6oNGD2/2EpkN5HrBAxc9lz142gOmQmOb FjRtXKGmDQNqAwRms8at6dbs0bAajUPTrBnRHNZc1CxqFG6Cu6xhSKg4bQIZnIfZM63rbLam 84rFtU1hhW9jGA6Es9bRu9jSGZYfCKO2zo3tZwAe6Nh3//1oRVpTuHBde7gnraMp3E8AkQLT BODSzpjQio5QMDRhox+IAChkswWDFAJaskVoEgS2ICETtmAoSAqhCRS0BUMQDJKFHCL4IGwi cDBI0UEgNcgVtEXEEwlE8CYigNxCEdHBIOEPkvrBxE3Erv8n4PJVwwplbmRzdHJlYW0KZW5k b2JqCgo5IDAgb2JqCjExNDMyCmVuZG9iagoKMTAgMCBvYmoKPDwvVHlwZS9Gb250RGVzY3Jp cHRvci9Gb250TmFtZS9CQUFBQUErTGliZXJhdGlvblNhbnMKL0ZsYWdzIDQKL0ZvbnRCQm94 Wy0yMDMgLTMwMyAxMDQ5IDkxMF0vSXRhbGljQW5nbGUgMAovQXNjZW50IDkwNQovRGVzY2Vu dCAtMjExCi9DYXBIZWlnaHQgOTEwCi9TdGVtViA4MAovRm9udEZpbGUyIDggMCBSCj4+CmVu ZG9iagoKMTEgMCBvYmoKPDwvTGVuZ3RoIDM4MS9GaWx0ZXIvRmxhdGVEZWNvZGU+PgpzdHJl YW0KeJxdkk1ugzAQRvecwst0EYFNsBMJIaUkSCz6o9IegMCQIhWDDFlw+3pm0lbqIujZns9+ jifMy1Np+yV8dWNTwSK63rYO5vHmGhAXuPY2kEq0fbPcR/RthnoKQp+t1nmBobTdmKZB+ObX 5sWtYnNsxws8BOGLa8H19io2H3nlx9Vtmr5gALuIKMgy0ULn93mqp+d6gJBS27L1y/2ybn3k r+B9nUAoGktWacYW5qluwNX2CkEaRZlIiyILwLb/1uKEI5eu+aydL5W+NIqSOPOsiPUeOWZO kHfEZoecEMcSWXM2QjZcT/N7ZoN8IFZUc+SsQn7k+TNyzvMa+cR8QD4zU7ZgRk8ZMaObZP8Y z5LsH6OnZP8Y7yLZX5+Q2V8XyOxv0Eeyv8FzJfsnVMP+hs5lf0017G+OyOyvaR/2N3gXyf46 R2Z/jW6K/TXuqdhf4/+g2N/gXRT7m4ge8f5a+JzYbz9tIpqbc75FqCmpN7Aregu/fTuNE6bo 9w0hJrz8CmVuZHN0cmVhbQplbmRvYmoKCjEyIDAgb2JqCjw8L1R5cGUvRm9udC9TdWJ0eXBl L1RydWVUeXBlL0Jhc2VGb250L0JBQUFBQStMaWJlcmF0aW9uU2FucwovRmlyc3RDaGFyIDAK L0xhc3RDaGFyIDM1Ci9XaWR0aHNbMzY1IDY2NiA1NTYgNTU2IDI3NyA1NTYgNjY2IDU1NiA1 NTYgMjc3IDU1NiAyNzcgNTU2IDU1NiA1NTYgNTU2CjU1NiA1NTYgNTU2IDU1NiA4MzMgNTU2 IDMzMyA1MDAgNTU2IDUwMCAyMjIgNTAwIDU1NiA1MDAgMjIyIDU1Ngo1MDAgNTU2IDcyMiA1 NTYgXQovRm9udERlc2NyaXB0b3IgMTAgMCBSCi9Ub1VuaWNvZGUgMTEgMCBSCj4+CmVuZG9i agoKMTMgMCBvYmoKPDwvRjEgMTIgMCBSCj4+CmVuZG9iagoKMTQgMCBvYmoKPDwvRm9udCAx MyAwIFIKL1Byb2NTZXRbL1BERi9UZXh0XQo+PgplbmRvYmoKCjEgMCBvYmoKPDwvVHlwZS9Q YWdlL1BhcmVudCA3IDAgUi9SZXNvdXJjZXMgMTQgMCBSL01lZGlhQm94WzAgMCA2MTIgNzky XS9Hcm91cDw8L1MvVHJhbnNwYXJlbmN5L0NTL0RldmljZVJHQi9JIHRydWU+Pi9Db250ZW50 cyAyIDAgUj4+CmVuZG9iagoKNCAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDcgMCBSL1Jl c291cmNlcyAxNCAwIFIvTWVkaWFCb3hbMCAwIDYxMiA3OTJdL0dyb3VwPDwvUy9UcmFuc3Bh cmVuY3kvQ1MvRGV2aWNlUkdCL0kgdHJ1ZT4+L0NvbnRlbnRzIDUgMCBSPj4KZW5kb2JqCgox NSAwIG9iago8PC9Db3VudCAxL0ZpcnN0IDE2IDAgUi9MYXN0IDE2IDAgUgo+PgplbmRvYmoK CjE2IDAgb2JqCjw8L0NvdW50IDAvVGl0bGU8RkVGRjAwNTMwMDY4MDA2NTAwNjUwMDc0MDAz MT4KL0Rlc3RbMSAwIFIvWFlaIDAgNzkyIDBdL1BhcmVudCAxNSAwIFI+PgplbmRvYmoKCjcg MCBvYmoKPDwvVHlwZS9QYWdlcwovUmVzb3VyY2VzIDE0IDAgUgovTWVkaWFCb3hbIDAgMCA2 MTIgNzkyIF0KL0tpZHNbIDEgMCBSIDQgMCBSIF0KL0NvdW50IDI+PgplbmRvYmoKCjE3IDAg b2JqCjw8L1R5cGUvQ2F0YWxvZy9QYWdlcyA3IDAgUgovT3BlbkFjdGlvblsxIDAgUiAvWFla IG51bGwgbnVsbCAxXQovT3V0bGluZXMgMTUgMCBSCj4+CmVuZG9iagoKMTggMCBvYmoKPDwv Q3JlYXRvcjxGRUZGMDA0MzAwNjEwMDZDMDA2Mz4KL1Byb2R1Y2VyPEZFRkYwMDRDMDA2OTAw NjIwMDcyMDA2NTAwNEYwMDY2MDA2NjAwNjkwMDYzMDA2NTAwMjAwMDMzMDAyRTAwMzQ+Ci9D cmVhdGlvbkRhdGUoRDoyMDEyMTExMzEwMTAyNy0wNScwMCcpPj4KZW5kb2JqCgp4cmVmCjAg MTkKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDE0MjM5IDAwMDAwIG4gCjAwMDAwMDAwMTkg MDAwMDAgbiAKMDAwMDAwMTUzOSAwMDAwMCBuIAowMDAwMDE0MzgyIDAwMDAwIG4gCjAwMDAw MDE1NjAgMDAwMDAgbiAKMDAwMDAwMTY0NSAwMDAwMCBuIAowMDAwMDE0Njg2IDAwMDAwIG4g CjAwMDAwMDE2NjQgMDAwMDAgbiAKMDAwMDAxMzE4MSAwMDAwMCBuIAowMDAwMDEzMjAzIDAw MDAwIG4gCjAwMDAwMTMzOTggMDAwMDAgbiAKMDAwMDAxMzg0OSAwMDAwMCBuIAowMDAwMDE0 MTUxIDAwMDAwIG4gCjAwMDAwMTQxODQgMDAwMDAgbiAKMDAwMDAxNDUyNSAwMDAwMCBuIAow MDAwMDE0NTgxIDAwMDAwIG4gCjAwMDAwMTQ3OTEgMDAwMDAgbiAKMDAwMDAxNDg5MiAwMDAw MCBuIAp0cmFpbGVyCjw8L1NpemUgMTkvUm9vdCAxNyAwIFIKL0luZm8gMTggMCBSCi9JRCBb IDxGRDM1RDM2NkFDNTkzM0Q5NzE1QzY5ODBDQjhGMTdDRD4KPEZEMzVEMzY2QUM1OTMzRDk3 MTVDNjk4MENCOEYxN0NEPiBdCi9Eb2NDaGVja3N1bSAvNkY5NTNCNkQxMkREMzE1NUY5MUZE NkY5RDY2RDQ0N0IKPj4Kc3RhcnR4cmVmCjE1MDU5CiUlRU9GCg== --------------040402080502050701090706 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------040402080502050701090706-- From xen-devel-bounces@lists.xen.org Tue Nov 13 15:56:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIqN-0001Up-Gt; Tue, 13 Nov 2012 15:56:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIqM-0001Uk-IR for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:56:06 +0000 Received: from [85.158.139.211:49330] by server-8.bemta-5.messagelabs.com id F7/73-06050-39D62A05; Tue, 13 Nov 2012 15:56:03 +0000 X-Env-Sender: cutter409@gmail.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352822161!20036383!1 X-Originating-IP: [209.85.213.171] X-SpamReason: No, hits=1.5 required=7.0 tests=HTML_00_10,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20631 invoked from network); 13 Nov 2012 15:56:03 -0000 Received: from mail-ye0-f171.google.com (HELO mail-ye0-f171.google.com) (209.85.213.171) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:56:03 -0000 Received: by mail-ye0-f171.google.com with SMTP id m11so1518329yen.30 for ; Tue, 13 Nov 2012 07:56:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=UJVA0nzhRohYvHuF8X1VXABR5eEHvqZmEJi+yXBE07U=; b=fLriSQdc4E2a/186ihW0mJUSMnK527kRXUE7Bo+a65q4RyoQLf6ndpGiBFC3XETfb7 LcRbHAdaUkB6TJ7+WA8EnDHyacifOf01A+9U/qinvoOFiBBf5QQl69Dpf25MsWpO0BRK WlRYqRgqE19tbI/MIHHZJwRWH5XszTAgJAIezVME3BTH+A8VsDmemR9hKRUDkR6xbCQh Rzj4k88RkUMOOoMrG0Efa1p+MfrD3oT+/SAKTtF3Q2ylsoUgMYVbrVFRoshXBzKyINMX T2jPy4yFRxYdMOP4eXOyxR1eoGN8zbT7+SQzgDnKAGKz1GalHHExMb05otUSuisjyAXI 56Jg== MIME-Version: 1.0 Received: by 10.58.221.130 with SMTP id qe2mr27618763vec.14.1352822161381; Tue, 13 Nov 2012 07:56:01 -0800 (PST) Received: by 10.220.162.144 with HTTP; Tue, 13 Nov 2012 07:56:01 -0800 (PST) Date: Tue, 13 Nov 2012 10:56:01 -0500 Message-ID: From: Cutter 409 To: xen-devel@lists.xensource.com Subject: [Xen-devel] Guest memory access hooking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============3961150325815961932==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============3961150325815961932== Content-Type: multipart/alternative; boundary=047d7bf0cabe5f9ad904ce62746b --047d7bf0cabe5f9ad904ce62746b Content-Type: text/plain; charset=ISO-8859-1 Hello all, I'm trying to do some research with malware, and I'm trying to get notifications on arbitrary guest page accesses (similar to what Ether does.) I've noticed the mem-event API and it seems like it might be close to what I need, but I can't find much documentation about how it works or how to use it. I know that that mem-event API works only with EPT, but is the code to change permissions modifying the guest page tables, or does it work via EPT? (Can the guest detect it?) Is there any documentation about usage, besides the xen-access.c test ? I'm also interested monitoring arbitrary page access via the shadow page tables. I've been reading through the code, but if anyone has any insight or some kind of push in the right direction, I'd really appreciate it. Thank you! --047d7bf0cabe5f9ad904ce62746b Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hello all,

I'm trying to do some research with malware, and I= 9;m trying to get notifications on arbitrary guest page accesses (similar t= o what Ether does.) I've noticed the mem-event API and it seems like it= might be close to what I need, but I can't find much documentation abo= ut how it works or how to use it.

I know that that mem-event API works only with EPT, but is the code to = change permissions modifying the guest page tables, or does it work via EPT= ? (Can the guest detect it?) Is there any documentation about usage, beside= s the xen-access.c test ?

I'm also interested monitoring arbitrary page access via the shadow= page tables. I've been reading through the code, but if anyone has any= insight or some kind of push in the right direction, I'd really apprec= iate it.

Thank you!
--047d7bf0cabe5f9ad904ce62746b-- --===============3961150325815961932== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============3961150325815961932==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 15:56:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 15:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIqN-0001Up-Gt; Tue, 13 Nov 2012 15:56:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIqM-0001Uk-IR for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 15:56:06 +0000 Received: from [85.158.139.211:49330] by server-8.bemta-5.messagelabs.com id F7/73-06050-39D62A05; Tue, 13 Nov 2012 15:56:03 +0000 X-Env-Sender: cutter409@gmail.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352822161!20036383!1 X-Originating-IP: [209.85.213.171] X-SpamReason: No, hits=1.5 required=7.0 tests=HTML_00_10,HTML_MESSAGE, ML_RADAR_SPEW_LINKS_14,RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20631 invoked from network); 13 Nov 2012 15:56:03 -0000 Received: from mail-ye0-f171.google.com (HELO mail-ye0-f171.google.com) (209.85.213.171) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 15:56:03 -0000 Received: by mail-ye0-f171.google.com with SMTP id m11so1518329yen.30 for ; Tue, 13 Nov 2012 07:56:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=UJVA0nzhRohYvHuF8X1VXABR5eEHvqZmEJi+yXBE07U=; b=fLriSQdc4E2a/186ihW0mJUSMnK527kRXUE7Bo+a65q4RyoQLf6ndpGiBFC3XETfb7 LcRbHAdaUkB6TJ7+WA8EnDHyacifOf01A+9U/qinvoOFiBBf5QQl69Dpf25MsWpO0BRK WlRYqRgqE19tbI/MIHHZJwRWH5XszTAgJAIezVME3BTH+A8VsDmemR9hKRUDkR6xbCQh Rzj4k88RkUMOOoMrG0Efa1p+MfrD3oT+/SAKTtF3Q2ylsoUgMYVbrVFRoshXBzKyINMX T2jPy4yFRxYdMOP4eXOyxR1eoGN8zbT7+SQzgDnKAGKz1GalHHExMb05otUSuisjyAXI 56Jg== MIME-Version: 1.0 Received: by 10.58.221.130 with SMTP id qe2mr27618763vec.14.1352822161381; Tue, 13 Nov 2012 07:56:01 -0800 (PST) Received: by 10.220.162.144 with HTTP; Tue, 13 Nov 2012 07:56:01 -0800 (PST) Date: Tue, 13 Nov 2012 10:56:01 -0500 Message-ID: From: Cutter 409 To: xen-devel@lists.xensource.com Subject: [Xen-devel] Guest memory access hooking X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============3961150325815961932==" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============3961150325815961932== Content-Type: multipart/alternative; boundary=047d7bf0cabe5f9ad904ce62746b --047d7bf0cabe5f9ad904ce62746b Content-Type: text/plain; charset=ISO-8859-1 Hello all, I'm trying to do some research with malware, and I'm trying to get notifications on arbitrary guest page accesses (similar to what Ether does.) I've noticed the mem-event API and it seems like it might be close to what I need, but I can't find much documentation about how it works or how to use it. I know that that mem-event API works only with EPT, but is the code to change permissions modifying the guest page tables, or does it work via EPT? (Can the guest detect it?) Is there any documentation about usage, besides the xen-access.c test ? I'm also interested monitoring arbitrary page access via the shadow page tables. I've been reading through the code, but if anyone has any insight or some kind of push in the right direction, I'd really appreciate it. Thank you! --047d7bf0cabe5f9ad904ce62746b Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hello all,

I'm trying to do some research with malware, and I= 9;m trying to get notifications on arbitrary guest page accesses (similar t= o what Ether does.) I've noticed the mem-event API and it seems like it= might be close to what I need, but I can't find much documentation abo= ut how it works or how to use it.

I know that that mem-event API works only with EPT, but is the code to = change permissions modifying the guest page tables, or does it work via EPT= ? (Can the guest detect it?) Is there any documentation about usage, beside= s the xen-access.c test ?

I'm also interested monitoring arbitrary page access via the shadow= page tables. I've been reading through the code, but if anyone has any= insight or some kind of push in the right direction, I'd really apprec= iate it.

Thank you!
--047d7bf0cabe5f9ad904ce62746b-- --===============3961150325815961932== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============3961150325815961932==-- From xen-devel-bounces@lists.xen.org Tue Nov 13 16:03:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:03:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIwv-0002Jr-CA; Tue, 13 Nov 2012 16:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIwu-0002Jm-8y for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:02:52 +0000 Received: from [85.158.138.51:55591] by server-13.bemta-3.messagelabs.com id F4/B3-24887-B2F62A05; Tue, 13 Nov 2012 16:02:51 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352822570!29817826!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5707 invoked from network); 13 Nov 2012 16:02:50 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:02:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15783448" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:02:46 +0000 Received: from Roger-2.local.net (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:02:45 +0000 From: Roger Pau Monne To: Date: Tue, 13 Nov 2012 17:02:19 +0100 Message-ID: <1352822539-56930-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: Roger Pau Monne Subject: [Xen-devel] [PATCH] qemu-stubdom: prevent useless medium change X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org cWVtdS1zdHViZG9tIHdhcyBzdHJpcHBpbmcgdGhlIHByZWZpeCBmcm9tIHRoZSAicGFyYW1zIiB4 ZW5zdG9yZQprZXkgaW4geGVuc3RvcmVfcGFyc2VfZG9tYWluX2NvbmZpZywgd2hpY2ggd2FzIHRo ZW4gc2F2ZWQgc3RyaXBwZWQgaW4KYSB2YXJpYWJsZS4gSW4geGVuc3RvcmVfcHJvY2Vzc19ldmVu dCB3ZSBjb21wYXJlIHRoZSAicGFyYW0iIGZyb20KeGVuc3RvcmUgKG5vdCBzdHJpcHBlZCkgd2l0 aCB0aGUgc3RyaXBwZWQgInBhcmFtIiBzYXZlZCBpbiB0aGUKdmFyaWFibGUsIHdoaWNoIGxlYWRz IHRvIGEgbWVkaXVtIGNoYW5nZSAoZXZlbiBpZiB0aGVyZSBpc24ndCBhbnkpLApzaW5jZSB3ZSBh cmUgY29tcGFyaW5nIHNvbWV0aGluZyBsaWtlIGFpbzovcGF0aC90by9maWxlIHdpdGgKL3BhdGgv dG8vZmlsZS4gVGhpcyBvbmx5IGhhcHBlbnMgb25lIHRpbWUsIHNpbmNlCnhlbnN0b3JlX3BhcnNl X2RvbWFpbl9jb25maWcgaXMgdGhlIG9ubHkgcGxhY2Ugd2hlcmUgd2Ugc3RyaXAgdGhlCnByZWZp eC4gVGhlIHJlc3VsdCBvZiB0aGlzIGJ1ZyBpcyB0aGUgZm9sbG93aW5nOgoKeHNfcmVhZF93YXRj aCgpIC0+IC9sb2NhbC9kb21haW4vMC9iYWNrZW5kL3FkaXNrLzE5LzU2MzIvcGFyYW1zIGhkYwpj bG9zZSg3KQpjbG9zZSBibGs6IGJhY2tlbmQ9L2xvY2FsL2RvbWFpbi8wL2JhY2tlbmQvcWRpc2sv MTkvNTYzMgpub2RlPS9sb2NhbC9kb21haW4vMTkvZGV2aWNlL3ZiZC81NjMyCihYRU4pIEhWTTE4 OiBIVk0gTG9hZGVyCihYRU4pIEhWTTE4OiBEZXRlY3RlZCBYZW4gdjQuMy11bnN0YWJsZQooWEVO KSBIVk0xODogWGVuYnVzIHJpbmdzIEAweGZlZmZjMDAwLCBldmVudCBjaGFubmVsIDQKKFhFTikg SFZNMTg6IFN5c3RlbSByZXF1ZXN0ZWQgUk9NQklPUwooWEVOKSBIVk0xODogQ1BVIHNwZWVkIGlz IDI0MDAgTUh6CihYRU4pIGlycS5jOjI3MDogRG9tMTggUENJIGxpbmsgMCBjaGFuZ2VkIDAgLT4g NQooWEVOKSBIVk0xODogUENJLUlTQSBsaW5rIDAgcm91dGVkIHRvIElSUTUKKFhFTikgaXJxLmM6 MjcwOiBEb20xOCBQQ0kgbGluayAxIGNoYW5nZWQgMCAtPiAxMAooWEVOKSBIVk0xODogUENJLUlT QSBsaW5rIDEgcm91dGVkIHRvIElSUTEwCihYRU4pIGlycS5jOjI3MDogRG9tMTggUENJIGxpbmsg MiBjaGFuZ2VkIDAgLT4gMTEKKFhFTikgSFZNMTg6IFBDSS1JU0EgbGluayAyIHJvdXRlZCB0byBJ UlExMQooWEVOKSBpcnEuYzoyNzA6IERvbTE4IFBDSSBsaW5rIDMgY2hhbmdlZCAwIC0+IDUKKFhF TikgSFZNMTg6IFBDSS1JU0EgbGluayAzIHJvdXRlZCB0byBJUlE1CihYRU4pIEhWTTE4OiBwY2kg ZGV2IDAxOjMgSU5UQS0+SVJRMTAKKFhFTikgSFZNMTg6IHBjaSBkZXYgMDM6MCBJTlRBLT5JUlE1 CihYRU4pIEhWTTE4OiBwY2kgZGV2IDA0OjAgSU5UQS0+SVJRNQooWEVOKSBIVk0xODogcGNpIGRl diAwMjowIGJhciAxMCBzaXplIGx4OiAwMjAwMDAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMzow IGJhciAxNCBzaXplIGx4OiAwMTAwMDAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMjowIGJhciAx NCBzaXplIGx4OiAwMDAwMTAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMzowIGJhciAxMCBzaXpl IGx4OiAwMDAwMDEwMAooWEVOKSBIVk0xODogcGNpIGRldiAwNDowIGJhciAxMCBzaXplIGx4OiAw MDAwMDEwMAooWEVOKSBIVk0xODogcGNpIGRldiAwNDowIGJhciAxNCBzaXplIGx4OiAwMDAwMDEw MAooWEVOKSBIVk0xODogcGNpIGRldiAwMToxIGJhciAyMCBzaXplIGx4OiAwMDAwMDAxMAooWEVO KSBIVk0xODogTXVsdGlwcm9jZXNzb3IgaW5pdGlhbGlzYXRpb246CihYRU4pIEhWTTE4OiAgLSBD UFUwIC4uLiAzNi1iaXQgcGh5cyAuLi4gZml4ZWQgTVRSUnMgLi4uIHZhciBNVFJScyBbMi84XSAu Li4gZG9uZS4KKFhFTikgSFZNMTg6ICAtIENQVTEgLi4uIDM2LWJpdCBwaHlzIC4uLiBmaXhlZCBN VFJScyAuLi4gdmFyIE1UUlJzIFsyLzhdIC4uLiBkb25lLgooWEVOKSBIVk0xODogVGVzdGluZyBI Vk0gZW52aXJvbm1lbnQ6CihYRU4pIEhWTTE4OiAgLSBSRVAgSU5TQiBhY3Jvc3MgcGFnZSBib3Vu ZGFyaWVzIC4uLiBwYXNzZWQKKFhFTikgSFZNMTg6ICAtIEdTIGJhc2UgTVNScyBhbmQgU1dBUEdT IC4uLiBwYXNzZWQKKFhFTikgSFZNMTg6IFBhc3NlZCAyIG9mIDIgdGVzdHMKKFhFTikgSFZNMTg6 IFdyaXRpbmcgU01CSU9TIHRhYmxlcyAuLi4KKFhFTikgSFZNMTg6IExvYWRpbmcgUk9NQklPUyAu Li4KKFhFTikgSFZNMTg6IDk2NjAgYnl0ZXMgb2YgUk9NQklPUyBoaWdoLW1lbW9yeSBleHRlbnNp b25zOgooWEVOKSBIVk0xODogICBSZWxvY2F0aW5nIHRvIDB4ZmMwMDEwMDAtMHhmYzAwMzViYyAu Li4gZG9uZQooWEVOKSBIVk0xODogQ3JlYXRpbmcgTVAgdGFibGVzIC4uLgooWEVOKSBIVk0xODog TG9hZGluZyBDaXJydXMgVkdBQklPUyAuLi4KKFhFTikgSFZNMTg6IExvYWRpbmcgUENJIE9wdGlv biBST00gLi4uCihYRU4pIEhWTTE4OiAgLSBNYW51ZmFjdHVyZXI6IGh0dHA6Ly9pcHhlLm9yZwoo WEVOKSBIVk0xODogIC0gUHJvZHVjdCBuYW1lOiBpUFhFCihYRU4pIEhWTTE4OiBPcHRpb24gUk9N czoKKFhFTikgSFZNMTg6ICBjMDAwMC1jOGZmZjogVkdBIEJJT1MKKFhFTikgSFZNMTg6ICBjOTAw MC1kOGZmZjogRXRoZXJib290IFJPTQooWEVOKSBIVk0xODogTG9hZGluZyBBQ1BJIC4uLgooWEVO KSBIVk0xODogdm04NiBUU1MgYXQgZmMwMGY2ODAKKFhFTikgSFZNMTg6IEJJT1MgbWFwOgooWEVO KSBIVk0xODogIGYwMDAwLWZmZmZmOiBNYWluIEJJT1MKKFhFTikgSFZNMTg6IEU4MjAgdGFibGU6 CihYRU4pIEhWTTE4OiAgWzAwXTogMDAwMDAwMDA6MDAwMDAwMDAgLSAwMDAwMDAwMDowMDA5ZTAw MDogUkFNCihYRU4pIEhWTTE4OiAgWzAxXTogMDAwMDAwMDA6MDAwOWUwMDAgLSAwMDAwMDAwMDow MDBhMDAwMDogUkVTRVJWRUQKKFhFTikgSFZNMTg6ICBIT0xFOiAwMDAwMDAwMDowMDBhMDAwMCAt IDAwMDAwMDAwOjAwMGUwMDAwCihYRU4pIEhWTTE4OiAgWzAyXTogMDAwMDAwMDA6MDAwZTAwMDAg LSAwMDAwMDAwMDowMDEwMDAwMDogUkVTRVJWRUQKKFhFTikgSFZNMTg6ICBbMDNdOiAwMDAwMDAw MDowMDEwMDAwMCAtIDAwMDAwMDAwOjNmODAwMDAwOiBSQU0KKFhFTikgSFZNMTg6ICBIT0xFOiAw MDAwMDAwMDozZjgwMDAwMCAtIDAwMDAwMDAwOmZjMDAwMDAwCihYRU4pIEhWTTE4OiAgWzA0XTog MDAwMDAwMDA6ZmMwMDAwMDAgLSAwMDAwMDAwMTowMDAwMDAwMDogUkVTRVJWRUQKKFhFTikgSFZN MTg6IEludm9raW5nIFJPTUJJT1MgLi4uCihYRU4pIEhWTTE4OiAkUmV2aXNpb246IDEuMjIxICQg JERhdGU6IDIwMDgvMTIvMDcgMTc6MzI6MjkgJAooWEVOKSBzdGR2Z2EuYzoxNDc6ZDE4IGVudGVy aW5nIHN0ZHZnYSBhbmQgY2FjaGluZyBtb2RlcwooWEVOKSBIVk0xODogVkdBQmlvcyAkSWQ6IHZn YWJpb3MuYyx2IDEuNjcgMjAwOC8wMS8yNyAwOTo0NDoxMiB2cnVwcGVydCBFeHAgJAooWEVOKSBI Vk0xODogQm9jaHMgQklPUyAtIGJ1aWxkOiAwNi8yMy85OQooWEVOKSBIVk0xODogJFJldmlzaW9u OiAxLjIyMSAkICREYXRlOiAyMDA4LzEyLzA3IDE3OjMyOjI5ICQKKFhFTikgSFZNMTg6IE9wdGlv bnM6IGFwbWJpb3MgcGNpYmlvcyBlbHRvcml0byBQTU0KKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4 OiBhdGEwLTA6IFBDSFM9MTYzODMvMTYvNjMgdHJhbnNsYXRpb249bGJhIExDSFM9MTAyNC8yNTUv NjMKKFhFTikgSFZNMTg6IGF0YTAgbWFzdGVyOiBRRU1VIEhBUkRESVNLIEFUQS03IEhhcmQtRGlz ayAoMTAyNDAgTUJ5dGVzKQooWEVOKSBIVk0xODogSURFIHRpbWUgb3V0CihYRU4pIEhWTTE4OiBh dGExIG1hc3RlcjogUUVNVSBEVkQtUk9NIEFUQVBJLTQgQ0QtUm9tL0RWRC1Sb20KKFhFTikgSFZN MTg6IElERSB0aW1lIG91dAooWEVOKSBIVk0xODoKKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4Ogoo WEVOKSBIVk0xODogUHJlc3MgRjEyIGZvciBib290IG1lbnUuCihYRU4pIEhWTTE4OgooWEVOKSBI Vk0xODogQm9vdGluZyBmcm9tIENELVJvbS4uLgooWEVOKSBIVk0xODogYXRhX2lzX3JlYWR5IHJl dHVybmVkIDEKKFhFTikgSFZNMTg6IENEUk9NIGJvb3QgZmFpbHVyZSBjb2RlIDogMDAwMwooWEVO KSBIVk0xODogQm9vdCBmcm9tIENELVJvbSBmYWlsZWQ6IGNvdWxkIG5vdCByZWFkIHRoZSBib290 IGRpc2sKKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4OgooWEVOKSBIVk0xODogTm8gYm9vdGFibGUg ZGV2aWNlLgooWEVOKSBIVk0xODogUG93ZXJpbmcgb2ZmIGluIDMwIHNlY29uZHMuCioqKioqKioq KioqKioqKioqKiogQkxLRlJPTlQgZm9yIC9sb2NhbC9kb21haW4vMTkvZGV2aWNlL3ZiZC81NjMy ICoqKioqKioqKioKCmJhY2tlbmQgYXQgL2xvY2FsL2RvbWFpbi8wL2JhY2tlbmQvcWRpc2svMTkv NTYzMgpGYWlsZWQgdG8gcmVhZAovbG9jYWwvZG9tYWluLzAvYmFja2VuZC9xZGlzay8xOS81NjMy L2ZlYXR1cmUtZmx1c2gtY2FjaGUuCjI4NDQyMCBzZWN0b3JzIG9mIDUxMiBieXRlcwoqKioqKioq KioqKioqKioqKioqKioqKioqKgpibGtfb3BlbigvbG9jYWwvZG9tYWluLzE5L2RldmljZS92YmQv NTYzMikgLT4gNwoKQXMgc2VlbiBpbiB0aGlzIHRyYWNlLCB0aGUgbWVkaXVtIGNoYW5nZSBoYXBw ZW5zIGp1c3Qgd2hlbiB0aGUKZ3Vlc3QgaXMgYm9vdGluZywgd2hpY2ggbGVhZHMgdG8gdGhlIGd1 ZXN0IG5vdCBiZWluZyBhYmxlIHRvIGJvb3QKYmVjYXVzZSB0aGUgQklPUyBpcyBub3QgYWJsZSB0 byBhY2Nlc3MgdGhlIGRldmljZS4KClRoaXMgaXMgYSByZWdyZXNzaW9uIGZyb20gWGVuIDQuMSwg d2hpY2ggaXMgYWJsZSB0byBib290IGZyb20gImZpbGU6LyIKYmFzZWQgYmFja2VuZHMgd2hlbiB1 c2luZyBzdHViZG9tYWlucy4KClNpZ25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2Vy LnBhdUBjaXRyaXguY29tPgotLS0KSW5kZW50YXRpb24gaW4gcWVtdS10cmFkaXRpb25hbCBpcyBu b3QgdW5pZm9ybSwgc28gSSd2ZSB1c2VkIDQgc3BhY2VzCmFzIHRhYnMgYW5kIHRyaWVkIHRvIGlu ZGVudCBpbiB0aGUgc2FtZSBsZXZlbC4KLS0tCiB4ZW5zdG9yZS5jIHwgICAxMCArKysrKystLS0t CiAxIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW5zdG9yZS5jIGIveGVuc3RvcmUuYwppbmRleCAxODU3MTYwLi5kM2E0NTg4IDEw MDY0NAotLS0gYS94ZW5zdG9yZS5jCisrKyBiL3hlbnN0b3JlLmMKQEAgLTYxNCw2ICs2MTQsMTIg QEAgdm9pZCB4ZW5zdG9yZV9wYXJzZV9kb21haW5fY29uZmlnKGludCBodm1fZG9taWQpCiAgICAg ICAgIGlmIChwYXNwcmludGYoJmRhbmdlcl9idWYsICIlcy9kZXZpY2UvdmJkLyVzIiwgZGFuZ2Vy X3BhdGgsIGVfZGFuZ2VyW2ldKSA9PSAtMSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCWlmIChi ZHJ2X29wZW4yKGJzLCBkYW5nZXJfYnVmLCBCRFJWX09fQ0FDSEVfV0IgLyogc25hcHNob3QgYW5k IHdyaXRlLWJhY2sgKi8sICZiZHJ2X3JhdykgPT0gMCkgeworICAgICAgICBpZiAocGFzcHJpbnRm KCZidWYsICIlcy9wYXJhbXMiLCBicGF0aCkgPT0gLTEpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIGZyZWUocGFyYW1zKTsKKyAgICAgICAgcGFyYW1zID0geHNfcmVhZCh4c2gs IFhCVF9OVUxMLCBidWYsICZsZW4pOworICAgICAgICBpZiAocGFyYW1zID09IE5VTEwpCisgICAg ICAgICAgICBjb250aW51ZTsKIAkgICAgcHN0cmNweShicy0+ZmlsZW5hbWUsIHNpemVvZihicy0+ ZmlsZW5hbWUpLCBwYXJhbXMpOwogCX0KICNlbHNlCkBAIC02NjcsMTEgKzY3Myw3IEBAIHZvaWQg eGVuc3RvcmVfcGFyc2VfZG9tYWluX2NvbmZpZyhpbnQgaHZtX2RvbWlkKQogCiAJZHJpdmVzX3Rh YmxlW25iX2RyaXZlc10uYmRydiA9IGJzOwogCWRyaXZlc190YWJsZVtuYl9kcml2ZXNdLnVzZWQg PSAxOwotI2lmZGVmIENPTkZJR19TVFVCRE9NCi0gICAgbWVkaWFfZmlsZW5hbWVbbmJfZHJpdmVz XSA9IHN0cmR1cChkYW5nZXJfYnVmKTsKLSNlbHNlCiAgICAgbWVkaWFfZmlsZW5hbWVbbmJfZHJp dmVzXSA9IHN0cmR1cChicy0+ZmlsZW5hbWUpOwotI2VuZGlmCiAJbmJfZHJpdmVzKys7CiAKICAg ICB9Ci0tIAoxLjcuNy41IChBcHBsZSBHaXQtMjYpCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK From xen-devel-bounces@lists.xen.org Tue Nov 13 16:03:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:03:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIwv-0002Jr-CA; Tue, 13 Nov 2012 16:02:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYIwu-0002Jm-8y for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:02:52 +0000 Received: from [85.158.138.51:55591] by server-13.bemta-3.messagelabs.com id F4/B3-24887-B2F62A05; Tue, 13 Nov 2012 16:02:51 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-8.tower-174.messagelabs.com!1352822570!29817826!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5707 invoked from network); 13 Nov 2012 16:02:50 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-8.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:02:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15783448" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:02:46 +0000 Received: from Roger-2.local.net (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:02:45 +0000 From: Roger Pau Monne To: Date: Tue, 13 Nov 2012 17:02:19 +0100 Message-ID: <1352822539-56930-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Cc: Roger Pau Monne Subject: [Xen-devel] [PATCH] qemu-stubdom: prevent useless medium change X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org cWVtdS1zdHViZG9tIHdhcyBzdHJpcHBpbmcgdGhlIHByZWZpeCBmcm9tIHRoZSAicGFyYW1zIiB4 ZW5zdG9yZQprZXkgaW4geGVuc3RvcmVfcGFyc2VfZG9tYWluX2NvbmZpZywgd2hpY2ggd2FzIHRo ZW4gc2F2ZWQgc3RyaXBwZWQgaW4KYSB2YXJpYWJsZS4gSW4geGVuc3RvcmVfcHJvY2Vzc19ldmVu dCB3ZSBjb21wYXJlIHRoZSAicGFyYW0iIGZyb20KeGVuc3RvcmUgKG5vdCBzdHJpcHBlZCkgd2l0 aCB0aGUgc3RyaXBwZWQgInBhcmFtIiBzYXZlZCBpbiB0aGUKdmFyaWFibGUsIHdoaWNoIGxlYWRz IHRvIGEgbWVkaXVtIGNoYW5nZSAoZXZlbiBpZiB0aGVyZSBpc24ndCBhbnkpLApzaW5jZSB3ZSBh cmUgY29tcGFyaW5nIHNvbWV0aGluZyBsaWtlIGFpbzovcGF0aC90by9maWxlIHdpdGgKL3BhdGgv dG8vZmlsZS4gVGhpcyBvbmx5IGhhcHBlbnMgb25lIHRpbWUsIHNpbmNlCnhlbnN0b3JlX3BhcnNl X2RvbWFpbl9jb25maWcgaXMgdGhlIG9ubHkgcGxhY2Ugd2hlcmUgd2Ugc3RyaXAgdGhlCnByZWZp eC4gVGhlIHJlc3VsdCBvZiB0aGlzIGJ1ZyBpcyB0aGUgZm9sbG93aW5nOgoKeHNfcmVhZF93YXRj aCgpIC0+IC9sb2NhbC9kb21haW4vMC9iYWNrZW5kL3FkaXNrLzE5LzU2MzIvcGFyYW1zIGhkYwpj bG9zZSg3KQpjbG9zZSBibGs6IGJhY2tlbmQ9L2xvY2FsL2RvbWFpbi8wL2JhY2tlbmQvcWRpc2sv MTkvNTYzMgpub2RlPS9sb2NhbC9kb21haW4vMTkvZGV2aWNlL3ZiZC81NjMyCihYRU4pIEhWTTE4 OiBIVk0gTG9hZGVyCihYRU4pIEhWTTE4OiBEZXRlY3RlZCBYZW4gdjQuMy11bnN0YWJsZQooWEVO KSBIVk0xODogWGVuYnVzIHJpbmdzIEAweGZlZmZjMDAwLCBldmVudCBjaGFubmVsIDQKKFhFTikg SFZNMTg6IFN5c3RlbSByZXF1ZXN0ZWQgUk9NQklPUwooWEVOKSBIVk0xODogQ1BVIHNwZWVkIGlz IDI0MDAgTUh6CihYRU4pIGlycS5jOjI3MDogRG9tMTggUENJIGxpbmsgMCBjaGFuZ2VkIDAgLT4g NQooWEVOKSBIVk0xODogUENJLUlTQSBsaW5rIDAgcm91dGVkIHRvIElSUTUKKFhFTikgaXJxLmM6 MjcwOiBEb20xOCBQQ0kgbGluayAxIGNoYW5nZWQgMCAtPiAxMAooWEVOKSBIVk0xODogUENJLUlT QSBsaW5rIDEgcm91dGVkIHRvIElSUTEwCihYRU4pIGlycS5jOjI3MDogRG9tMTggUENJIGxpbmsg MiBjaGFuZ2VkIDAgLT4gMTEKKFhFTikgSFZNMTg6IFBDSS1JU0EgbGluayAyIHJvdXRlZCB0byBJ UlExMQooWEVOKSBpcnEuYzoyNzA6IERvbTE4IFBDSSBsaW5rIDMgY2hhbmdlZCAwIC0+IDUKKFhF TikgSFZNMTg6IFBDSS1JU0EgbGluayAzIHJvdXRlZCB0byBJUlE1CihYRU4pIEhWTTE4OiBwY2kg ZGV2IDAxOjMgSU5UQS0+SVJRMTAKKFhFTikgSFZNMTg6IHBjaSBkZXYgMDM6MCBJTlRBLT5JUlE1 CihYRU4pIEhWTTE4OiBwY2kgZGV2IDA0OjAgSU5UQS0+SVJRNQooWEVOKSBIVk0xODogcGNpIGRl diAwMjowIGJhciAxMCBzaXplIGx4OiAwMjAwMDAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMzow IGJhciAxNCBzaXplIGx4OiAwMTAwMDAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMjowIGJhciAx NCBzaXplIGx4OiAwMDAwMTAwMAooWEVOKSBIVk0xODogcGNpIGRldiAwMzowIGJhciAxMCBzaXpl IGx4OiAwMDAwMDEwMAooWEVOKSBIVk0xODogcGNpIGRldiAwNDowIGJhciAxMCBzaXplIGx4OiAw MDAwMDEwMAooWEVOKSBIVk0xODogcGNpIGRldiAwNDowIGJhciAxNCBzaXplIGx4OiAwMDAwMDEw MAooWEVOKSBIVk0xODogcGNpIGRldiAwMToxIGJhciAyMCBzaXplIGx4OiAwMDAwMDAxMAooWEVO KSBIVk0xODogTXVsdGlwcm9jZXNzb3IgaW5pdGlhbGlzYXRpb246CihYRU4pIEhWTTE4OiAgLSBD UFUwIC4uLiAzNi1iaXQgcGh5cyAuLi4gZml4ZWQgTVRSUnMgLi4uIHZhciBNVFJScyBbMi84XSAu Li4gZG9uZS4KKFhFTikgSFZNMTg6ICAtIENQVTEgLi4uIDM2LWJpdCBwaHlzIC4uLiBmaXhlZCBN VFJScyAuLi4gdmFyIE1UUlJzIFsyLzhdIC4uLiBkb25lLgooWEVOKSBIVk0xODogVGVzdGluZyBI Vk0gZW52aXJvbm1lbnQ6CihYRU4pIEhWTTE4OiAgLSBSRVAgSU5TQiBhY3Jvc3MgcGFnZSBib3Vu ZGFyaWVzIC4uLiBwYXNzZWQKKFhFTikgSFZNMTg6ICAtIEdTIGJhc2UgTVNScyBhbmQgU1dBUEdT IC4uLiBwYXNzZWQKKFhFTikgSFZNMTg6IFBhc3NlZCAyIG9mIDIgdGVzdHMKKFhFTikgSFZNMTg6 IFdyaXRpbmcgU01CSU9TIHRhYmxlcyAuLi4KKFhFTikgSFZNMTg6IExvYWRpbmcgUk9NQklPUyAu Li4KKFhFTikgSFZNMTg6IDk2NjAgYnl0ZXMgb2YgUk9NQklPUyBoaWdoLW1lbW9yeSBleHRlbnNp b25zOgooWEVOKSBIVk0xODogICBSZWxvY2F0aW5nIHRvIDB4ZmMwMDEwMDAtMHhmYzAwMzViYyAu Li4gZG9uZQooWEVOKSBIVk0xODogQ3JlYXRpbmcgTVAgdGFibGVzIC4uLgooWEVOKSBIVk0xODog TG9hZGluZyBDaXJydXMgVkdBQklPUyAuLi4KKFhFTikgSFZNMTg6IExvYWRpbmcgUENJIE9wdGlv biBST00gLi4uCihYRU4pIEhWTTE4OiAgLSBNYW51ZmFjdHVyZXI6IGh0dHA6Ly9pcHhlLm9yZwoo WEVOKSBIVk0xODogIC0gUHJvZHVjdCBuYW1lOiBpUFhFCihYRU4pIEhWTTE4OiBPcHRpb24gUk9N czoKKFhFTikgSFZNMTg6ICBjMDAwMC1jOGZmZjogVkdBIEJJT1MKKFhFTikgSFZNMTg6ICBjOTAw MC1kOGZmZjogRXRoZXJib290IFJPTQooWEVOKSBIVk0xODogTG9hZGluZyBBQ1BJIC4uLgooWEVO KSBIVk0xODogdm04NiBUU1MgYXQgZmMwMGY2ODAKKFhFTikgSFZNMTg6IEJJT1MgbWFwOgooWEVO KSBIVk0xODogIGYwMDAwLWZmZmZmOiBNYWluIEJJT1MKKFhFTikgSFZNMTg6IEU4MjAgdGFibGU6 CihYRU4pIEhWTTE4OiAgWzAwXTogMDAwMDAwMDA6MDAwMDAwMDAgLSAwMDAwMDAwMDowMDA5ZTAw MDogUkFNCihYRU4pIEhWTTE4OiAgWzAxXTogMDAwMDAwMDA6MDAwOWUwMDAgLSAwMDAwMDAwMDow MDBhMDAwMDogUkVTRVJWRUQKKFhFTikgSFZNMTg6ICBIT0xFOiAwMDAwMDAwMDowMDBhMDAwMCAt IDAwMDAwMDAwOjAwMGUwMDAwCihYRU4pIEhWTTE4OiAgWzAyXTogMDAwMDAwMDA6MDAwZTAwMDAg LSAwMDAwMDAwMDowMDEwMDAwMDogUkVTRVJWRUQKKFhFTikgSFZNMTg6ICBbMDNdOiAwMDAwMDAw MDowMDEwMDAwMCAtIDAwMDAwMDAwOjNmODAwMDAwOiBSQU0KKFhFTikgSFZNMTg6ICBIT0xFOiAw MDAwMDAwMDozZjgwMDAwMCAtIDAwMDAwMDAwOmZjMDAwMDAwCihYRU4pIEhWTTE4OiAgWzA0XTog MDAwMDAwMDA6ZmMwMDAwMDAgLSAwMDAwMDAwMTowMDAwMDAwMDogUkVTRVJWRUQKKFhFTikgSFZN MTg6IEludm9raW5nIFJPTUJJT1MgLi4uCihYRU4pIEhWTTE4OiAkUmV2aXNpb246IDEuMjIxICQg JERhdGU6IDIwMDgvMTIvMDcgMTc6MzI6MjkgJAooWEVOKSBzdGR2Z2EuYzoxNDc6ZDE4IGVudGVy aW5nIHN0ZHZnYSBhbmQgY2FjaGluZyBtb2RlcwooWEVOKSBIVk0xODogVkdBQmlvcyAkSWQ6IHZn YWJpb3MuYyx2IDEuNjcgMjAwOC8wMS8yNyAwOTo0NDoxMiB2cnVwcGVydCBFeHAgJAooWEVOKSBI Vk0xODogQm9jaHMgQklPUyAtIGJ1aWxkOiAwNi8yMy85OQooWEVOKSBIVk0xODogJFJldmlzaW9u OiAxLjIyMSAkICREYXRlOiAyMDA4LzEyLzA3IDE3OjMyOjI5ICQKKFhFTikgSFZNMTg6IE9wdGlv bnM6IGFwbWJpb3MgcGNpYmlvcyBlbHRvcml0byBQTU0KKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4 OiBhdGEwLTA6IFBDSFM9MTYzODMvMTYvNjMgdHJhbnNsYXRpb249bGJhIExDSFM9MTAyNC8yNTUv NjMKKFhFTikgSFZNMTg6IGF0YTAgbWFzdGVyOiBRRU1VIEhBUkRESVNLIEFUQS03IEhhcmQtRGlz ayAoMTAyNDAgTUJ5dGVzKQooWEVOKSBIVk0xODogSURFIHRpbWUgb3V0CihYRU4pIEhWTTE4OiBh dGExIG1hc3RlcjogUUVNVSBEVkQtUk9NIEFUQVBJLTQgQ0QtUm9tL0RWRC1Sb20KKFhFTikgSFZN MTg6IElERSB0aW1lIG91dAooWEVOKSBIVk0xODoKKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4Ogoo WEVOKSBIVk0xODogUHJlc3MgRjEyIGZvciBib290IG1lbnUuCihYRU4pIEhWTTE4OgooWEVOKSBI Vk0xODogQm9vdGluZyBmcm9tIENELVJvbS4uLgooWEVOKSBIVk0xODogYXRhX2lzX3JlYWR5IHJl dHVybmVkIDEKKFhFTikgSFZNMTg6IENEUk9NIGJvb3QgZmFpbHVyZSBjb2RlIDogMDAwMwooWEVO KSBIVk0xODogQm9vdCBmcm9tIENELVJvbSBmYWlsZWQ6IGNvdWxkIG5vdCByZWFkIHRoZSBib290 IGRpc2sKKFhFTikgSFZNMTg6CihYRU4pIEhWTTE4OgooWEVOKSBIVk0xODogTm8gYm9vdGFibGUg ZGV2aWNlLgooWEVOKSBIVk0xODogUG93ZXJpbmcgb2ZmIGluIDMwIHNlY29uZHMuCioqKioqKioq KioqKioqKioqKiogQkxLRlJPTlQgZm9yIC9sb2NhbC9kb21haW4vMTkvZGV2aWNlL3ZiZC81NjMy ICoqKioqKioqKioKCmJhY2tlbmQgYXQgL2xvY2FsL2RvbWFpbi8wL2JhY2tlbmQvcWRpc2svMTkv NTYzMgpGYWlsZWQgdG8gcmVhZAovbG9jYWwvZG9tYWluLzAvYmFja2VuZC9xZGlzay8xOS81NjMy L2ZlYXR1cmUtZmx1c2gtY2FjaGUuCjI4NDQyMCBzZWN0b3JzIG9mIDUxMiBieXRlcwoqKioqKioq KioqKioqKioqKioqKioqKioqKgpibGtfb3BlbigvbG9jYWwvZG9tYWluLzE5L2RldmljZS92YmQv NTYzMikgLT4gNwoKQXMgc2VlbiBpbiB0aGlzIHRyYWNlLCB0aGUgbWVkaXVtIGNoYW5nZSBoYXBw ZW5zIGp1c3Qgd2hlbiB0aGUKZ3Vlc3QgaXMgYm9vdGluZywgd2hpY2ggbGVhZHMgdG8gdGhlIGd1 ZXN0IG5vdCBiZWluZyBhYmxlIHRvIGJvb3QKYmVjYXVzZSB0aGUgQklPUyBpcyBub3QgYWJsZSB0 byBhY2Nlc3MgdGhlIGRldmljZS4KClRoaXMgaXMgYSByZWdyZXNzaW9uIGZyb20gWGVuIDQuMSwg d2hpY2ggaXMgYWJsZSB0byBib290IGZyb20gImZpbGU6LyIKYmFzZWQgYmFja2VuZHMgd2hlbiB1 c2luZyBzdHViZG9tYWlucy4KClNpZ25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2Vy LnBhdUBjaXRyaXguY29tPgotLS0KSW5kZW50YXRpb24gaW4gcWVtdS10cmFkaXRpb25hbCBpcyBu b3QgdW5pZm9ybSwgc28gSSd2ZSB1c2VkIDQgc3BhY2VzCmFzIHRhYnMgYW5kIHRyaWVkIHRvIGlu ZGVudCBpbiB0aGUgc2FtZSBsZXZlbC4KLS0tCiB4ZW5zdG9yZS5jIHwgICAxMCArKysrKystLS0t CiAxIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW5zdG9yZS5jIGIveGVuc3RvcmUuYwppbmRleCAxODU3MTYwLi5kM2E0NTg4IDEw MDY0NAotLS0gYS94ZW5zdG9yZS5jCisrKyBiL3hlbnN0b3JlLmMKQEAgLTYxNCw2ICs2MTQsMTIg QEAgdm9pZCB4ZW5zdG9yZV9wYXJzZV9kb21haW5fY29uZmlnKGludCBodm1fZG9taWQpCiAgICAg ICAgIGlmIChwYXNwcmludGYoJmRhbmdlcl9idWYsICIlcy9kZXZpY2UvdmJkLyVzIiwgZGFuZ2Vy X3BhdGgsIGVfZGFuZ2VyW2ldKSA9PSAtMSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCWlmIChi ZHJ2X29wZW4yKGJzLCBkYW5nZXJfYnVmLCBCRFJWX09fQ0FDSEVfV0IgLyogc25hcHNob3QgYW5k IHdyaXRlLWJhY2sgKi8sICZiZHJ2X3JhdykgPT0gMCkgeworICAgICAgICBpZiAocGFzcHJpbnRm KCZidWYsICIlcy9wYXJhbXMiLCBicGF0aCkgPT0gLTEpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIGZyZWUocGFyYW1zKTsKKyAgICAgICAgcGFyYW1zID0geHNfcmVhZCh4c2gs IFhCVF9OVUxMLCBidWYsICZsZW4pOworICAgICAgICBpZiAocGFyYW1zID09IE5VTEwpCisgICAg ICAgICAgICBjb250aW51ZTsKIAkgICAgcHN0cmNweShicy0+ZmlsZW5hbWUsIHNpemVvZihicy0+ ZmlsZW5hbWUpLCBwYXJhbXMpOwogCX0KICNlbHNlCkBAIC02NjcsMTEgKzY3Myw3IEBAIHZvaWQg eGVuc3RvcmVfcGFyc2VfZG9tYWluX2NvbmZpZyhpbnQgaHZtX2RvbWlkKQogCiAJZHJpdmVzX3Rh YmxlW25iX2RyaXZlc10uYmRydiA9IGJzOwogCWRyaXZlc190YWJsZVtuYl9kcml2ZXNdLnVzZWQg PSAxOwotI2lmZGVmIENPTkZJR19TVFVCRE9NCi0gICAgbWVkaWFfZmlsZW5hbWVbbmJfZHJpdmVz XSA9IHN0cmR1cChkYW5nZXJfYnVmKTsKLSNlbHNlCiAgICAgbWVkaWFfZmlsZW5hbWVbbmJfZHJp dmVzXSA9IHN0cmR1cChicy0+ZmlsZW5hbWUpOwotI2VuZGlmCiAJbmJfZHJpdmVzKys7CiAKICAg ICB9Ci0tIAoxLjcuNy41IChBcHBsZSBHaXQtMjYpCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK From xen-devel-bounces@lists.xen.org Tue Nov 13 16:11:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ4Y-0002cn-Co; Tue, 13 Nov 2012 16:10:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ4W-0002ci-OB for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:10:44 +0000 Received: from [193.109.254.147:37431] by server-11.bemta-14.messagelabs.com id 65/37-29027-40172A05; Tue, 13 Nov 2012 16:10:44 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1352823040!3855839!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26956 invoked from network); 13 Nov 2012 16:10:42 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:10:42 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGAQLZ032199 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:10:27 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGAPSJ011745 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:10:25 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGAOqV017228; Tue, 13 Nov 2012 10:10:24 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:10:24 -0800 Date: Tue, 13 Nov 2012 17:10:00 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161000.GA2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] [PATCH 0/5] crash: Bundle of fixes for Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Here is next bundle of fixes for crash Xen support: - xen: Fix page tables caching issues, - xen: Use init_tss array or per_cpu__init_tss, - xen: Use per_cpu__crash_notes or crash_notes array, - xen: Try hard to get max_cpus value, - xen: Use cpu_present_map instead of cpu_online_map. All patches were tested with Xen versions up to 4.2. Daniel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:11:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:11:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ4Y-0002cn-Co; Tue, 13 Nov 2012 16:10:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ4W-0002ci-OB for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:10:44 +0000 Received: from [193.109.254.147:37431] by server-11.bemta-14.messagelabs.com id 65/37-29027-40172A05; Tue, 13 Nov 2012 16:10:44 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1352823040!3855839!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26956 invoked from network); 13 Nov 2012 16:10:42 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-14.tower-27.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:10:42 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGAQLZ032199 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:10:27 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGAPSJ011745 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:10:25 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGAOqV017228; Tue, 13 Nov 2012 10:10:24 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:10:24 -0800 Date: Tue, 13 Nov 2012 17:10:00 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161000.GA2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] [PATCH 0/5] crash: Bundle of fixes for Xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hi, Here is next bundle of fixes for crash Xen support: - xen: Fix page tables caching issues, - xen: Use init_tss array or per_cpu__init_tss, - xen: Use per_cpu__crash_notes or crash_notes array, - xen: Try hard to get max_cpus value, - xen: Use cpu_present_map instead of cpu_online_map. All patches were tested with Xen versions up to 4.2. Daniel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:12:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:12:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ5r-0002ja-VB; Tue, 13 Nov 2012 16:12:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ5q-0002jP-16 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:12:06 +0000 Received: from [85.158.139.83:60439] by server-14.bemta-5.messagelabs.com id 80/9B-21768-55172A05; Tue, 13 Nov 2012 16:12:05 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352823123!22870692!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10156 invoked from network); 13 Nov 2012 16:12:04 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:12:04 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGBs93001400 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:11:55 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGBsM0004352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:11:54 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGBrGO018443; Tue, 13 Nov 2012 10:11:54 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:11:53 -0800 Date: Tue, 13 Nov 2012 17:11:40 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161140.GB2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] [PATCH 1/5] xen: Fix page tables caching issues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Xen specific functions reading page tables utilize a form of cache to speed up reading process. However, some of them do not properly update info about cached data. In specific cases it leads to the situation in which functions attempting to use cached data in real read freshly loaded garbage. This patch fixes this issue by adding relevant updates for cached info data. Linux Kernel commit 250a41e0ecc433cdd553a364d0fc74c766425209 (xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID) helped to discover this issue. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/x86.c crash-6.1.0/x86.c --- crash-6.1.0.orig/x86.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/x86.c 2012-11-12 15:29:45.000000000 +0100 @@ -4684,6 +4684,7 @@ use_cr3: machdep->last_ptbl_read = BADADDR; machdep->last_pmd_read = BADADDR; + machdep->last_pgd_read = BADADDR; for (i = 0; i < xkd->p2m_frames; i++) { xkd->p2m_mfn_frame_list[i] = x86_xen_kdump_page_mfn(kvaddr); @@ -4698,6 +4699,7 @@ use_cr3: machdep->last_ptbl_read = 0; machdep->last_pmd_read = 0; + machdep->last_pgd_read = 0; pc->readmem = read_kdump; if (CRASHDEBUG(1)) fprintf(fp, "readmem (restore): read_kdump()\n"); @@ -4910,6 +4912,8 @@ x86_xendump_p2m_create(struct xendump_da if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find cr3 page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(1)) { fprintf(xd->ofp, "contents of page directory page:\n"); @@ -5008,6 +5012,8 @@ x86_pvops_xendump_p2m_create(struct xend if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find cr3 page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(1)) { fprintf(xd->ofp, "contents of page directory page:\n"); diff -Npru crash-6.1.0.orig/x86_64.c crash-6.1.0/x86_64.c --- crash-6.1.0.orig/x86_64.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/x86_64.c 2012-11-09 14:41:29.000000000 +0100 @@ -5653,6 +5653,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, if (!readmem(PTOB(mfn), PHYSADDR, machdep->pgd, PAGESIZE(), "xen kdump pud page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find pud page\n"); + + machdep->last_pgd_read = mfn; if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->pgd, @@ -5670,6 +5672,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, "xen kdump pmd page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find pmd page\n"); + machdep->last_pmd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->pmd, "contents of page middle directory page:"); @@ -5686,6 +5690,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, "xen kdump page table page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find page table page\n"); + machdep->last_ptbl_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->ptbl, "contents of page table page:"); @@ -6304,6 +6310,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find pud page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->pgd, "contents of page upper directory page:"); @@ -6319,6 +6327,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->pmd)) error(FATAL, "cannot read/find pmd page\n"); + machdep->last_pmd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->pmd, "contents of page middle directory page:"); @@ -6334,6 +6344,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->ptbl)) error(FATAL, "cannot read/find page table page\n"); + machdep->last_ptbl_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->ptbl, "contents of page table page:"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:12:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:12:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ5r-0002ja-VB; Tue, 13 Nov 2012 16:12:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ5q-0002jP-16 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:12:06 +0000 Received: from [85.158.139.83:60439] by server-14.bemta-5.messagelabs.com id 80/9B-21768-55172A05; Tue, 13 Nov 2012 16:12:05 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352823123!22870692!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10156 invoked from network); 13 Nov 2012 16:12:04 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-11.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:12:04 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGBs93001400 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:11:55 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGBsM0004352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:11:54 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGBrGO018443; Tue, 13 Nov 2012 10:11:54 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:11:53 -0800 Date: Tue, 13 Nov 2012 17:11:40 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161140.GB2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Subject: [Xen-devel] [PATCH 1/5] xen: Fix page tables caching issues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Xen specific functions reading page tables utilize a form of cache to speed up reading process. However, some of them do not properly update info about cached data. In specific cases it leads to the situation in which functions attempting to use cached data in real read freshly loaded garbage. This patch fixes this issue by adding relevant updates for cached info data. Linux Kernel commit 250a41e0ecc433cdd553a364d0fc74c766425209 (xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID) helped to discover this issue. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/x86.c crash-6.1.0/x86.c --- crash-6.1.0.orig/x86.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/x86.c 2012-11-12 15:29:45.000000000 +0100 @@ -4684,6 +4684,7 @@ use_cr3: machdep->last_ptbl_read = BADADDR; machdep->last_pmd_read = BADADDR; + machdep->last_pgd_read = BADADDR; for (i = 0; i < xkd->p2m_frames; i++) { xkd->p2m_mfn_frame_list[i] = x86_xen_kdump_page_mfn(kvaddr); @@ -4698,6 +4699,7 @@ use_cr3: machdep->last_ptbl_read = 0; machdep->last_pmd_read = 0; + machdep->last_pgd_read = 0; pc->readmem = read_kdump; if (CRASHDEBUG(1)) fprintf(fp, "readmem (restore): read_kdump()\n"); @@ -4910,6 +4912,8 @@ x86_xendump_p2m_create(struct xendump_da if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find cr3 page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(1)) { fprintf(xd->ofp, "contents of page directory page:\n"); @@ -5008,6 +5012,8 @@ x86_pvops_xendump_p2m_create(struct xend if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find cr3 page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(1)) { fprintf(xd->ofp, "contents of page directory page:\n"); diff -Npru crash-6.1.0.orig/x86_64.c crash-6.1.0/x86_64.c --- crash-6.1.0.orig/x86_64.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/x86_64.c 2012-11-09 14:41:29.000000000 +0100 @@ -5653,6 +5653,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, if (!readmem(PTOB(mfn), PHYSADDR, machdep->pgd, PAGESIZE(), "xen kdump pud page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find pud page\n"); + + machdep->last_pgd_read = mfn; if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->pgd, @@ -5670,6 +5672,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, "xen kdump pmd page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find pmd page\n"); + machdep->last_pmd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->pmd, "contents of page middle directory page:"); @@ -5686,6 +5690,8 @@ x86_64_xen_kdump_load_page(ulong kvaddr, "xen kdump page table page", RETURN_ON_ERROR)) error(FATAL, "cannot read/find page table page\n"); + machdep->last_ptbl_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(fp, machdep->ptbl, "contents of page table page:"); @@ -6304,6 +6310,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->pgd)) error(FATAL, "cannot read/find pud page\n"); + machdep->last_pgd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->pgd, "contents of page upper directory page:"); @@ -6319,6 +6327,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->pmd)) error(FATAL, "cannot read/find pmd page\n"); + machdep->last_pmd_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->pmd, "contents of page middle directory page:"); @@ -6334,6 +6344,8 @@ x86_64_xendump_load_page(ulong kvaddr, s if (!xc_core_mfn_to_page(mfn, machdep->ptbl)) error(FATAL, "cannot read/find page table page\n"); + machdep->last_ptbl_read = mfn; + if (CRASHDEBUG(7)) x86_64_debug_dump_page(xd->ofp, machdep->ptbl, "contents of page table page:"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:13:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:13:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6Y-0002nt-HH; Tue, 13 Nov 2012 16:12:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6W-0002na-Sb for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:12:49 +0000 Received: from [85.158.143.99:62530] by server-3.bemta-4.messagelabs.com id 24/DB-06841-08172A05; Tue, 13 Nov 2012 16:12:48 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352823166!18838688!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12742 invoked from network); 13 Nov 2012 16:12:47 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-8.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:12:47 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGCe2k002398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:12:41 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGCdUN029720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:12:40 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGCdKa028310; Tue, 13 Nov 2012 10:12:39 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:12:39 -0800 Date: Tue, 13 Nov 2012 17:12:25 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161225.GC2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 2/5] xen: Use init_tss array or per_cpu__init_tss X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) use per_cpu__init_tss instead of init_tss array. Take into account that. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/x86.c crash-6.1.0/x86.c --- crash-6.1.0.orig/x86.c 2012-11-13 14:45:58.000000000 +0100 +++ crash-6.1.0/x86.c 2012-11-13 14:48:13.000000000 +0100 @@ -5471,9 +5471,16 @@ x86_get_stackbase_hyper(ulong task) if (!xen_hyper_test_pcpu_id(pcpu)) { error(FATAL, "invalid pcpu number\n"); } - init_tss = symbol_value("init_tss"); + + if (symbol_exists("init_tss")) { + init_tss = symbol_value("init_tss"); + init_tss += XEN_HYPER_SIZE(tss_struct) * pcpu; + } else { + init_tss = symbol_value("per_cpu__init_tss"); + init_tss = xen_hyper_per_cpu(init_tss, pcpu); + } + buf = GETBUF(XEN_HYPER_SIZE(tss_struct)); - init_tss += XEN_HYPER_SIZE(tss_struct) * pcpu; if (!readmem(init_tss, KVADDR, buf, XEN_HYPER_SIZE(tss_struct), "init_tss", RETURN_ON_ERROR)) { error(FATAL, "cannot read init_tss.\n"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:13:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:13:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6Y-0002nt-HH; Tue, 13 Nov 2012 16:12:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6W-0002na-Sb for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:12:49 +0000 Received: from [85.158.143.99:62530] by server-3.bemta-4.messagelabs.com id 24/DB-06841-08172A05; Tue, 13 Nov 2012 16:12:48 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-8.tower-216.messagelabs.com!1352823166!18838688!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12742 invoked from network); 13 Nov 2012 16:12:47 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-8.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:12:47 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGCe2k002398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:12:41 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGCdUN029720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:12:40 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGCdKa028310; Tue, 13 Nov 2012 10:12:39 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:12:39 -0800 Date: Tue, 13 Nov 2012 17:12:25 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161225.GC2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 2/5] xen: Use init_tss array or per_cpu__init_tss X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) use per_cpu__init_tss instead of init_tss array. Take into account that. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/x86.c crash-6.1.0/x86.c --- crash-6.1.0.orig/x86.c 2012-11-13 14:45:58.000000000 +0100 +++ crash-6.1.0/x86.c 2012-11-13 14:48:13.000000000 +0100 @@ -5471,9 +5471,16 @@ x86_get_stackbase_hyper(ulong task) if (!xen_hyper_test_pcpu_id(pcpu)) { error(FATAL, "invalid pcpu number\n"); } - init_tss = symbol_value("init_tss"); + + if (symbol_exists("init_tss")) { + init_tss = symbol_value("init_tss"); + init_tss += XEN_HYPER_SIZE(tss_struct) * pcpu; + } else { + init_tss = symbol_value("per_cpu__init_tss"); + init_tss = xen_hyper_per_cpu(init_tss, pcpu); + } + buf = GETBUF(XEN_HYPER_SIZE(tss_struct)); - init_tss += XEN_HYPER_SIZE(tss_struct) * pcpu; if (!readmem(init_tss, KVADDR, buf, XEN_HYPER_SIZE(tss_struct), "init_tss", RETURN_ON_ERROR)) { error(FATAL, "cannot read init_tss.\n"); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:13:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:13:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ70-0002s6-WB; Tue, 13 Nov 2012 16:13:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6z-0002rk-Jx for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:13:17 +0000 Received: from [85.158.139.211:43621] by server-12.bemta-5.messagelabs.com id 09/44-02886-C9172A05; Tue, 13 Nov 2012 16:13:16 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1352823194!20031995!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDkxNzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28241 invoked from network); 13 Nov 2012 16:13:16 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:13:16 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGDAuV008283 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:13:11 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGD9lQ000815 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:13:10 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGD9gA023227; Tue, 13 Nov 2012 10:13:09 -0600 MIME-Version: 1.0 Message-ID: <8809ab93-4255-464b-88c2-28272980db16@default> Date: Tue, 13 Nov 2012 08:13:06 -0800 (PST) From: Dan Magenheimer To: Zhigang Wang , Keir Fraser References: <50A26B50.5090109@oracle.com> In-Reply-To: <50A26B50.5090109@oracle.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel , Jan Beulich , Konrad Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Zhigang Wang > Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 > > On 11/12/2012 01:25 PM, Keir Fraser wrote: > > On 12/11/2012 15:01, "Zhigang Wang" wrote: > > > >> Hi Keir/Jan, > >> > >> Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested > >> your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 > >> > >> Attached is the result. > > The PVM result is weird, there is a small-ish slowdown for small domains, > > becoming a very large %age slowdown as domain memory increases, and then > > turning into a *speedup* as the memory size gets very large indeed. > > > > What are the error bars like on these measurements I wonder? One thing we > > could do to allow PV guests doing 4k-at-a-time allocations through > > alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the > > filtering-and-flush out into populate_physmap() and increase_reservation(). > > This is listed as a todo in the original patch (26056). > > > > To be honest I don't know why the original patch would make PV domain > > creation slower, and certainly not by a varying %age depending on domain > > memory size! > > > > -- Keir > I did it second time. It seems the result (attached) is promising. > > I think the strange result is due to the order of testing: > start_physical_machine -> test_hvm -> test_pvm. > > This time, I did: start_physical_machine -> test_pvm -> test_hvm. > > You can see the pvm memory allocation speed is not affected by your patch this time. > > So I believe this patch is excellent now. I don't know about Keir's opinion, but to me the performance dependency on ordering is even more bizarre and still calls into question the acceptability of the patch. Customers aren't going to like being told that, for best results, they should launch all PV domains before their HVM domains. Is scrubbing still/ever done lazily? That might explain some of the weirdness. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:13:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:13:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ70-0002s6-WB; Tue, 13 Nov 2012 16:13:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ6z-0002rk-Jx for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:13:17 +0000 Received: from [85.158.139.211:43621] by server-12.bemta-5.messagelabs.com id 09/44-02886-C9172A05; Tue, 13 Nov 2012 16:13:16 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1352823194!20031995!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDkxNzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28241 invoked from network); 13 Nov 2012 16:13:16 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:13:16 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGDAuV008283 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:13:11 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGD9lQ000815 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:13:10 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGD9gA023227; Tue, 13 Nov 2012 10:13:09 -0600 MIME-Version: 1.0 Message-ID: <8809ab93-4255-464b-88c2-28272980db16@default> Date: Tue, 13 Nov 2012 08:13:06 -0800 (PST) From: Dan Magenheimer To: Zhigang Wang , Keir Fraser References: <50A26B50.5090109@oracle.com> In-Reply-To: <50A26B50.5090109@oracle.com> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel , Jan Beulich , Konrad Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > From: Zhigang Wang > Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 > > On 11/12/2012 01:25 PM, Keir Fraser wrote: > > On 12/11/2012 15:01, "Zhigang Wang" wrote: > > > >> Hi Keir/Jan, > >> > >> Recently I got a chance to access a big machine (2T mem/160 cpus) and I tested > >> your patch: http://xenbits.xen.org/hg/xen-unstable.hg/rev/177fdda0be56 > >> > >> Attached is the result. > > The PVM result is weird, there is a small-ish slowdown for small domains, > > becoming a very large %age slowdown as domain memory increases, and then > > turning into a *speedup* as the memory size gets very large indeed. > > > > What are the error bars like on these measurements I wonder? One thing we > > could do to allow PV guests doing 4k-at-a-time allocations through > > alloc_heap_pages() to benefit from the TLB-flush improvements, is pull the > > filtering-and-flush out into populate_physmap() and increase_reservation(). > > This is listed as a todo in the original patch (26056). > > > > To be honest I don't know why the original patch would make PV domain > > creation slower, and certainly not by a varying %age depending on domain > > memory size! > > > > -- Keir > I did it second time. It seems the result (attached) is promising. > > I think the strange result is due to the order of testing: > start_physical_machine -> test_hvm -> test_pvm. > > This time, I did: start_physical_machine -> test_pvm -> test_hvm. > > You can see the pvm memory allocation speed is not affected by your patch this time. > > So I believe this patch is excellent now. I don't know about Keir's opinion, but to me the performance dependency on ordering is even more bizarre and still calls into question the acceptability of the patch. Customers aren't going to like being told that, for best results, they should launch all PV domains before their HVM domains. Is scrubbing still/ever done lazily? That might explain some of the weirdness. Dan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:14:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:14:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ7z-00032u-KW; Tue, 13 Nov 2012 16:14:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ7y-00032X-Kn for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:14:18 +0000 Received: from [85.158.139.83:18555] by server-10.bemta-5.messagelabs.com id AB/1F-09257-9D172A05; Tue, 13 Nov 2012 16:14:17 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1352823255!21493487!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 951 invoked from network); 13 Nov 2012 16:14:17 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:14:17 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGE9CT004353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:14:10 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGE9Gu002902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:14:09 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGE84k024163; Tue, 13 Nov 2012 10:14:08 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:14:08 -0800 Date: Tue, 13 Nov 2012 17:13:54 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161354.GD2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 3/5] xen: Use per_cpu__crash_notes or crash_notes array X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) use crash_notes array instead of per_cpu__crash_notes. Take into account that. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/xen_hyper.c 2012-11-12 15:56:17.000000000 +0100 @@ -645,15 +645,22 @@ xen_hyper_dumpinfo_init(void) error(FATAL, "cannot malloc dumpinfo table context_xen_core_array space.\n"); } BZERO(xhdit->context_xen_core_array, size); - addr = symbol_value("per_cpu__crash_notes"); + if (symbol_exists("per_cpu__crash_notes")) + addr = symbol_value("per_cpu__crash_notes"); + else + get_symbol_data("crash_notes", sizeof(ulong), &addr); for (i = 0; i < machdep->get_smp_cpus(); i++) { ulong addr_notes; - addr_notes = xen_hyper_per_cpu(addr, i); + if (symbol_exists("per_cpu__crash_notes")) + addr_notes = xen_hyper_per_cpu(addr, i); + else + addr_notes = addr + i * STRUCT_SIZE("crash_note_range_t") + + MEMBER_OFFSET("crash_note_range_t", "start"); if (xhdit->note_ver == XEN_HYPER_ELF_NOTE_V4) { if (!readmem(addr_notes, KVADDR, &(xhdit->context_array[i].note), - sizeof(ulong), "per_cpu__crash_notes", RETURN_ON_ERROR)) { - error(WARNING, "cannot read per_cpu__crash_notes.\n"); + sizeof(ulong), "crash_notes", RETURN_ON_ERROR)) { + error(WARNING, "cannot read crash_notes.\n"); return; } } else { @@ -678,7 +685,7 @@ xen_hyper_dumpinfo_init(void) xhdit->xen_info_cpu = samp_cpuid; if (!xen_hyper_fill_elf_notes(xhdit->context_array[samp_cpuid].note, buf, XEN_HYPER_ELF_NOTE_FILL_T_NOTE)) { - error(FATAL, "cannot read per_cpu__crash_notes.\n"); + error(FATAL, "cannot read crash_notes.\n"); } bp = buf; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:14:30 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:14:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ7z-00032u-KW; Tue, 13 Nov 2012 16:14:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ7y-00032X-Kn for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:14:18 +0000 Received: from [85.158.139.83:18555] by server-10.bemta-5.messagelabs.com id AB/1F-09257-9D172A05; Tue, 13 Nov 2012 16:14:17 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-16.tower-182.messagelabs.com!1352823255!21493487!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 951 invoked from network); 13 Nov 2012 16:14:17 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-182.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:14:17 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGE9CT004353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:14:10 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGE9Gu002902 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:14:09 GMT Received: from abhmt114.oracle.com (abhmt114.oracle.com [141.146.116.66]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGE84k024163; Tue, 13 Nov 2012 10:14:08 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:14:08 -0800 Date: Tue, 13 Nov 2012 17:13:54 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161354.GD2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 3/5] xen: Use per_cpu__crash_notes or crash_notes array X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) use crash_notes array instead of per_cpu__crash_notes. Take into account that. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-09-27 21:19:15.000000000 +0200 +++ crash-6.1.0/xen_hyper.c 2012-11-12 15:56:17.000000000 +0100 @@ -645,15 +645,22 @@ xen_hyper_dumpinfo_init(void) error(FATAL, "cannot malloc dumpinfo table context_xen_core_array space.\n"); } BZERO(xhdit->context_xen_core_array, size); - addr = symbol_value("per_cpu__crash_notes"); + if (symbol_exists("per_cpu__crash_notes")) + addr = symbol_value("per_cpu__crash_notes"); + else + get_symbol_data("crash_notes", sizeof(ulong), &addr); for (i = 0; i < machdep->get_smp_cpus(); i++) { ulong addr_notes; - addr_notes = xen_hyper_per_cpu(addr, i); + if (symbol_exists("per_cpu__crash_notes")) + addr_notes = xen_hyper_per_cpu(addr, i); + else + addr_notes = addr + i * STRUCT_SIZE("crash_note_range_t") + + MEMBER_OFFSET("crash_note_range_t", "start"); if (xhdit->note_ver == XEN_HYPER_ELF_NOTE_V4) { if (!readmem(addr_notes, KVADDR, &(xhdit->context_array[i].note), - sizeof(ulong), "per_cpu__crash_notes", RETURN_ON_ERROR)) { - error(WARNING, "cannot read per_cpu__crash_notes.\n"); + sizeof(ulong), "crash_notes", RETURN_ON_ERROR)) { + error(WARNING, "cannot read crash_notes.\n"); return; } } else { @@ -678,7 +685,7 @@ xen_hyper_dumpinfo_init(void) xhdit->xen_info_cpu = samp_cpuid; if (!xen_hyper_fill_elf_notes(xhdit->context_array[samp_cpuid].note, buf, XEN_HYPER_ELF_NOTE_FILL_T_NOTE)) { - error(FATAL, "cannot read per_cpu__crash_notes.\n"); + error(FATAL, "cannot read crash_notes.\n"); } bp = buf; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8X-00038D-2m; Tue, 13 Nov 2012 16:14:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8V-00037s-R6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:14:52 +0000 Received: from [85.158.143.35:29856] by server-2.bemta-4.messagelabs.com id 11/5F-28922-BF172A05; Tue, 13 Nov 2012 16:14:51 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-21.messagelabs.com!1352823287!13431347!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19583 invoked from network); 13 Nov 2012 16:14:48 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:14:48 -0000 Received: from ([128.244.198.91]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.149012707; Tue, 13 Nov 2012 11:14:22 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Tue, 13 Nov 2012 11:14:22 -0500 From: "Fioravante, Matthew E." To: Ian Campbell Date: Tue, 13 Nov 2012 11:14:21 -0500 Thread-Topic: [PATCH VTPM 6/9] Remove the vtpm process model Thread-Index: Ac3BsSkajcG9bTGIQlOW4yhbbyRsmgACJokA Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A23D7AC1@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> <1352819016.7491.84.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> <1352819496.7491.89.camel@zakaz.uk.xensource.com> In-Reply-To: <1352819496.7491.89.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I actually just made a patch to remove it entirely and tested it and its working. I'll send it in the next update. -----Original Message----- From: Ian Campbell [mailto:Ian.Campbell@citrix.com] Sent: Tuesday, November 13, 2012 10:12 AM To: Fioravante, Matthew E. Cc: xen-devel@lists.xen.org; Stefano Stabellini Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model On Tue, 2012-11-13 at 15:07 +0000, Fioravante, Matthew E. wrote: > Xend/xm was not changed at all so it should work fine for people not > using vtpm. However it still "supports" vtpm devices from the old > process mode, which now will not work and possibly crash, hang, or > cause an error. It may be confusing to users to see vtpm support in > xm, thinking it will work with the new vtpm system. Are there any xm/xend docs which could be updated to clearly state that this stuff doesn't work? I'd also be happy with a patch which added a check and error message at the entry point (e.g. tools/python/xen/xm/create.py) without any attempt to root out the support from the underlying code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:08 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8X-00038D-2m; Tue, 13 Nov 2012 16:14:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8V-00037s-R6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:14:52 +0000 Received: from [85.158.143.35:29856] by server-2.bemta-4.messagelabs.com id 11/5F-28922-BF172A05; Tue, 13 Nov 2012 16:14:51 +0000 X-Env-Sender: matthew.fioravante@jhuapl.edu X-Msg-Ref: server-12.tower-21.messagelabs.com!1352823287!13431347!1 X-Originating-IP: [128.244.251.37] X-SpamReason: No, hits=0.0 required=7.0 tests=UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19583 invoked from network); 13 Nov 2012 16:14:48 -0000 Received: from piper.jhuapl.edu (HELO jhuapl.edu) (128.244.251.37) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:14:48 -0000 Received: from ([128.244.198.91]) by piper.jhuapl.edu with ESMTP with TLS id 5Y8HCH1.149012707; Tue, 13 Nov 2012 11:14:22 -0500 Received: from aplesstripe.dom1.jhuapl.edu ([128.244.198.211]) by aplexcas2.dom1.jhuapl.edu ([128.244.198.91]) with mapi; Tue, 13 Nov 2012 11:14:22 -0500 From: "Fioravante, Matthew E." To: Ian Campbell Date: Tue, 13 Nov 2012 11:14:21 -0500 Thread-Topic: [PATCH VTPM 6/9] Remove the vtpm process model Thread-Index: Ac3BsSkajcG9bTGIQlOW4yhbbyRsmgACJokA Message-ID: <068F06DC4D106941B297C0C5F9F446EA48A23D7AC1@aplesstripe.dom1.jhuapl.edu> References: <1351802150-19258-1-git-send-email-matthew.fioravante@jhuapl.edu> <1352803755.7491.47.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A229F471@aplesstripe.dom1.jhuapl.edu> <1352819016.7491.84.camel@zakaz.uk.xensource.com> <068F06DC4D106941B297C0C5F9F446EA48A23D7A30@aplesstripe.dom1.jhuapl.edu> <1352819496.7491.89.camel@zakaz.uk.xensource.com> In-Reply-To: <1352819496.7491.89.camel@zakaz.uk.xensource.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Cc: Stefano Stabellini , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH VTPM 6/9] Remove the vtpm process model X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I actually just made a patch to remove it entirely and tested it and its working. I'll send it in the next update. -----Original Message----- From: Ian Campbell [mailto:Ian.Campbell@citrix.com] Sent: Tuesday, November 13, 2012 10:12 AM To: Fioravante, Matthew E. Cc: xen-devel@lists.xen.org; Stefano Stabellini Subject: Re: [PATCH VTPM 6/9] Remove the vtpm process model On Tue, 2012-11-13 at 15:07 +0000, Fioravante, Matthew E. wrote: > Xend/xm was not changed at all so it should work fine for people not > using vtpm. However it still "supports" vtpm devices from the old > process mode, which now will not work and possibly crash, hang, or > cause an error. It may be confusing to users to see vtpm support in > xm, thinking it will work with the new vtpm system. Are there any xm/xend docs which could be updated to clearly state that this stuff doesn't work? I'd also be happy with a patch which added a check and error message at the entry point (e.g. tools/python/xen/xm/create.py) without any attempt to root out the support from the underlying code. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8y-0003Dl-H0; Tue, 13 Nov 2012 16:15:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8w-0003DP-Tx for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:15:19 +0000 Received: from [85.158.143.99:15996] by server-2.bemta-4.messagelabs.com id E5/00-28922-61272A05; Tue, 13 Nov 2012 16:15:18 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352823315!29803959!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9435 invoked from network); 13 Nov 2012 16:15:16 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:15:16 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGF94t005790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:15:10 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGF9Yj004779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:15:09 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGF8C3021283; Tue, 13 Nov 2012 10:15:08 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:15:08 -0800 Date: Tue, 13 Nov 2012 17:14:54 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161454.GE2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 4/5] xen: Try hard to get max_cpus value X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch improves max_cpus value calculation. First xen_hyper_get_cpu_info() tries to get it from nr_cpu_ids variable. If nr_cpu_ids does not exist then it attempts to read max_cpus variable. If it is not available estimate max_cpus value on the base of cpumask_t size. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-11-13 15:02:34.000000000 +0100 +++ crash-6.1.0/xen_hyper.c 2012-11-13 15:07:40.000000000 +0100 @@ -1883,13 +1883,28 @@ xen_hyper_get_uptime_hyper(void) void xen_hyper_get_cpu_info(void) { - ulong addr; + ulong addr, init_begin, init_end; ulong *cpumask; uint *cpu_idx; int i, j, cpus; XEN_HYPER_STRUCT_SIZE_INIT(cpumask_t, "cpumask_t"); - xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + + if (symbol_exists("nr_cpu_ids")) + get_symbol_data("nr_cpu_ids", sizeof(uint), &xht->max_cpus); + else { + init_begin = symbol_value("__init_begin"); + init_end = symbol_value("__init_end"); + addr = symbol_value("max_cpus"); + + if (addr >= init_begin && addr < init_end) + xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + else { + get_symbol_data("max_cpus", sizeof(xht->max_cpus), &xht->max_cpus); + if (XEN_HYPER_SIZE(cpumask_t) * 8 > xht->max_cpus) + xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + } + } if (xht->cpumask) { free(xht->cpumask); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:28 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8y-0003Dl-H0; Tue, 13 Nov 2012 16:15:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8w-0003DP-Tx for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:15:19 +0000 Received: from [85.158.143.99:15996] by server-2.bemta-4.messagelabs.com id E5/00-28922-61272A05; Tue, 13 Nov 2012 16:15:18 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352823315!29803959!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9435 invoked from network); 13 Nov 2012 16:15:16 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:15:16 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGF94t005790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:15:10 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGF9Yj004779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:15:09 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGF8C3021283; Tue, 13 Nov 2012 10:15:08 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:15:08 -0800 Date: Tue, 13 Nov 2012 17:14:54 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161454.GE2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Subject: [Xen-devel] [PATCH 4/5] xen: Try hard to get max_cpus value X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This patch improves max_cpus value calculation. First xen_hyper_get_cpu_info() tries to get it from nr_cpu_ids variable. If nr_cpu_ids does not exist then it attempts to read max_cpus variable. If it is not available estimate max_cpus value on the base of cpumask_t size. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-11-13 15:02:34.000000000 +0100 +++ crash-6.1.0/xen_hyper.c 2012-11-13 15:07:40.000000000 +0100 @@ -1883,13 +1883,28 @@ xen_hyper_get_uptime_hyper(void) void xen_hyper_get_cpu_info(void) { - ulong addr; + ulong addr, init_begin, init_end; ulong *cpumask; uint *cpu_idx; int i, j, cpus; XEN_HYPER_STRUCT_SIZE_INIT(cpumask_t, "cpumask_t"); - xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + + if (symbol_exists("nr_cpu_ids")) + get_symbol_data("nr_cpu_ids", sizeof(uint), &xht->max_cpus); + else { + init_begin = symbol_value("__init_begin"); + init_end = symbol_value("__init_end"); + addr = symbol_value("max_cpus"); + + if (addr >= init_begin && addr < init_end) + xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + else { + get_symbol_data("max_cpus", sizeof(xht->max_cpus), &xht->max_cpus); + if (XEN_HYPER_SIZE(cpumask_t) * 8 > xht->max_cpus) + xht->max_cpus = XEN_HYPER_SIZE(cpumask_t) * 8; + } + } if (xht->cpumask) { free(xht->cpumask); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ93-0003FA-UL; Tue, 13 Nov 2012 16:15:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ92-0003Ed-SQ for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:15:25 +0000 Received: from [85.158.139.83:63189] by server-10.bemta-5.messagelabs.com id 8B/D1-09257-C1272A05; Tue, 13 Nov 2012 16:15:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352823320!30086738!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29549 invoked from network); 13 Nov 2012 16:15:21 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:15:21 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15783931" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:15:16 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:15:15 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8t-0007QL-VL; Tue, 13 Nov 2012 16:15:16 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYJ8t-0007DS-KG; Tue, 13 Nov 2012 16:15:15 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 13 Nov 2012 16:15:15 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14386: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14386 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14386/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14385 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14385 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14385 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14385 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 8b93ac0c93f3 baseline version: xen a3cde70320ad ------------------------------------------------------------ People who touched revisions under test: Ian Campbell Jan Beulich Keir Fraser Matthew Daley Matthew Fioravante Ronny Hegewald Samuel Thibault ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=8b93ac0c93f3 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 8b93ac0c93f3 + branch=xen-unstable + revision=8b93ac0c93f3 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 8b93ac0c93f3 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 7 changesets with 51 changes to 50 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:15:35 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:15:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ93-0003FA-UL; Tue, 13 Nov 2012 16:15:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJ92-0003Ed-SQ for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:15:25 +0000 Received: from [85.158.139.83:63189] by server-10.bemta-5.messagelabs.com id 8B/D1-09257-C1272A05; Tue, 13 Nov 2012 16:15:24 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352823320!30086738!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29549 invoked from network); 13 Nov 2012 16:15:21 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:15:21 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15783931" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:15:16 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:15:15 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJ8t-0007QL-VL; Tue, 13 Nov 2012 16:15:16 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYJ8t-0007DS-KG; Tue, 13 Nov 2012 16:15:15 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Tue, 13 Nov 2012 16:15:15 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14386: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14386 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14386/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14385 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14385 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14385 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14385 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 8b93ac0c93f3 baseline version: xen a3cde70320ad ------------------------------------------------------------ People who touched revisions under test: Ian Campbell Jan Beulich Keir Fraser Matthew Daley Matthew Fioravante Ronny Hegewald Samuel Thibault ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-unstable + revision=8b93ac0c93f3 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-unstable 8b93ac0c93f3 + branch=xen-unstable + revision=8b93ac0c93f3 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-unstable + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-unstable.hg ++ : git://xenbits.xen.org/staging/qemu-xen-unstable.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-unstable ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-unstable.git ++ : daily-cron.xen-unstable + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-unstable.git + info_linux_tree xen-unstable + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-unstable.hg + hg push -r 8b93ac0c93f3 ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-unstable.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 7 changesets with 51 changes to 50 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:16:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:16:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJAJ-0003W6-F7; Tue, 13 Nov 2012 16:16:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJAI-0003Vp-Av for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:16:42 +0000 Received: from [85.158.143.35:56504] by server-2.bemta-4.messagelabs.com id FD/72-28922-96272A05; Tue, 13 Nov 2012 16:16:41 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352823367!12000928!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDkxNzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17185 invoked from network); 13 Nov 2012 16:16:12 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:16:12 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGG1dh012069 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:16:02 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGG0b5023420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:16:01 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGG0d1025797; Tue, 13 Nov 2012 10:16:00 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:16:00 -0800 Date: Tue, 13 Nov 2012 17:15:47 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161547.GF2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] [PATCH 5/5] xen: Use cpu_present_map instead of cpu_online_map X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) clear cpu_online_map during crash. In this case it is not possible to check which CPUs were available. cpu_present_map contains such information but it has different meaning. However, we do not have a choice and we must use cpu_present_map instead of cpu_online_map. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-11-13 15:08:41.000000000 +0100 +++ crash-6.1.0/xen_hyper.c 2012-11-13 15:09:03.000000000 +0100 @@ -1912,11 +1912,10 @@ xen_hyper_get_cpu_info(void) if((xht->cpumask = malloc(XEN_HYPER_SIZE(cpumask_t))) == NULL) { error(FATAL, "cannot malloc cpumask space.\n"); } - /* kakuma: It may be better to use cpu_present_map. */ - addr = symbol_value("cpu_online_map"); + addr = symbol_value("cpu_present_map"); if (!readmem(addr, KVADDR, xht->cpumask, - XEN_HYPER_SIZE(cpumask_t), "cpu_online_map", RETURN_ON_ERROR)) { - error(FATAL, "cannot read cpu_online_map.\n"); + XEN_HYPER_SIZE(cpumask_t), "cpu_present_map", RETURN_ON_ERROR)) { + error(FATAL, "cannot read cpu_present_map.\n"); } if (xht->cpu_idxs) { free(xht->cpu_idxs); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:16:51 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:16:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJAJ-0003W6-F7; Tue, 13 Nov 2012 16:16:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJAI-0003Vp-Av for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:16:42 +0000 Received: from [85.158.143.35:56504] by server-2.bemta-4.messagelabs.com id FD/72-28922-96272A05; Tue, 13 Nov 2012 16:16:41 +0000 X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352823367!12000928!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNDkxNzE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17185 invoked from network); 13 Nov 2012 16:16:12 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 16:16:12 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADGG1dh012069 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 16:16:02 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADGG0b5023420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 16:16:01 GMT Received: from abhmt109.oracle.com (abhmt109.oracle.com [141.146.116.61]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADGG0d1025797; Tue, 13 Nov 2012 10:16:00 -0600 Received: from host-192-168-1-59.local.net-space.pl (/89.174.63.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 08:16:00 -0800 Date: Tue, 13 Nov 2012 17:15:47 +0100 From: Daniel Kiper To: anderson@redhat.com, konrad.wilk@oracle.com, andrew.cooper3@citrix.com, olaf@aepfle.de, jbeulich@suse.com, ptesarik@suse.cz, crash-utility@redhat.com, kexec@lists.infradead.org, xen-devel@lists.xensource.com Message-ID: <20121113161547.GF2942@host-192-168-1-59.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Subject: [Xen-devel] [PATCH 5/5] xen: Use cpu_present_map instead of cpu_online_map X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Newer Xen versions (at least 4.2) clear cpu_online_map during crash. In this case it is not possible to check which CPUs were available. cpu_present_map contains such information but it has different meaning. However, we do not have a choice and we must use cpu_present_map instead of cpu_online_map. Signed-off-by: Daniel Kiper diff -Npru crash-6.1.0.orig/xen_hyper.c crash-6.1.0/xen_hyper.c --- crash-6.1.0.orig/xen_hyper.c 2012-11-13 15:08:41.000000000 +0100 +++ crash-6.1.0/xen_hyper.c 2012-11-13 15:09:03.000000000 +0100 @@ -1912,11 +1912,10 @@ xen_hyper_get_cpu_info(void) if((xht->cpumask = malloc(XEN_HYPER_SIZE(cpumask_t))) == NULL) { error(FATAL, "cannot malloc cpumask space.\n"); } - /* kakuma: It may be better to use cpu_present_map. */ - addr = symbol_value("cpu_online_map"); + addr = symbol_value("cpu_present_map"); if (!readmem(addr, KVADDR, xht->cpumask, - XEN_HYPER_SIZE(cpumask_t), "cpu_online_map", RETURN_ON_ERROR)) { - error(FATAL, "cannot read cpu_online_map.\n"); + XEN_HYPER_SIZE(cpumask_t), "cpu_present_map", RETURN_ON_ERROR)) { + error(FATAL, "cannot read cpu_present_map.\n"); } if (xht->cpu_idxs) { free(xht->cpu_idxs); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:22:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJFL-0004B6-C0; Tue, 13 Nov 2012 16:21:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJFJ-0004Az-7R for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:21:53 +0000 Received: from [85.158.139.83:17294] by server-10.bemta-5.messagelabs.com id E0/12-09257-0A372A05; Tue, 13 Nov 2012 16:21:52 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1352823711!25498007!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12786 invoked from network); 13 Nov 2012 16:21:52 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:21:52 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784186" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:21:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:21:26 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJEs-0007Sd-8R; Tue, 13 Nov 2012 16:21:26 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYJEs-0002Af-2c; Tue, 13 Nov 2012 16:21:26 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.29568.426761.422604@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 16:21:20 +0000 To: Jacek Konieczny In-Reply-To: <20121113132735.GD7561@jajo.eggsoft> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> <20121113132735.GD7561@jajo.eggsoft> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jacek Konieczny writes ("Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh"): > fcntl(3, F_GETFL) = 0x8401 (flags O_WRONLY|O_APPEND|O_LARGEFILE) So it seems perl is going out of its way to spot this earlier. That explains the mystery. Anyway the patch is fine. Acked-by: Ian Jackson _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:22:05 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:22:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJFL-0004B6-C0; Tue, 13 Nov 2012 16:21:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJFJ-0004Az-7R for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:21:53 +0000 Received: from [85.158.139.83:17294] by server-10.bemta-5.messagelabs.com id E0/12-09257-0A372A05; Tue, 13 Nov 2012 16:21:52 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-182.messagelabs.com!1352823711!25498007!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12786 invoked from network); 13 Nov 2012 16:21:52 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:21:52 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784186" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:21:26 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:21:26 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJEs-0007Sd-8R; Tue, 13 Nov 2012 16:21:26 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYJEs-0002Af-2c; Tue, 13 Nov 2012 16:21:26 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.29568.426761.422604@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 16:21:20 +0000 To: Jacek Konieczny In-Reply-To: <20121113132735.GD7561@jajo.eggsoft> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> <20121113132735.GD7561@jajo.eggsoft> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Jacek Konieczny writes ("Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh"): > fcntl(3, F_GETFL) = 0x8401 (flags O_WRONLY|O_APPEND|O_LARGEFILE) So it seems perl is going out of its way to spot this earlier. That explains the mystery. Anyway the patch is fine. Acked-by: Ian Jackson _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGS-0004Si-5c; Tue, 13 Nov 2012 16:23:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGR-0004SR-GS for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:03 +0000 Received: from [85.158.139.83:32149] by server-7.bemta-5.messagelabs.com id 8D/E0-23096-6E372A05; Tue, 13 Nov 2012 16:23:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1352823781!30133374!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25885 invoked from network); 13 Nov 2012 16:23:02 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784229" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:00 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:00 +0000 Message-ID: <1352823779.7491.94.camel@zakaz.uk.xensource.com> From: Ian Campbell To: xen-devel Date: Tue, 13 Nov 2012 16:22:59 +0000 Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The following series implements support for initial images and DTB in RAM, as opposed to in flash (dom0 kernel) or compiled into the hypervisor (DTB). It arranges to not clobber these with either the h/v text on relocation or with the heaps and frees them as appropriate. Most of this is independent of the specific bootloader protocol which is used to tell Xen where these modules actually are, but I have included a simple PoC bootloader protocol based around device tree which is similar to the protocol used by Linux to find its initrd (where /chosen/linux,initrd-{start,end} indicate the physical address). The PoC protocol is documented in docs/misc/arm/device-tree/booting.txt which is added by this series. I will post a patch against the boot-wrapper which implements the "bootloader" side of this protocol shortly. With that you can boot using the semi-hosting feature of the model (paths are host paths) like so: $MODEL linux-system-semi.axf -C cluster.cpu0.semihosting-cmd_line=\ '--kernel xen-arm.bin \ --module zImage earlyprintk=xenboot console=ttyAMA1 root=/dev/mmcblk0 ro \ --dtb vexpress-v2p-aem-v7a-xen.dtb -- dom0_mem=256M' Where xen-arm.bin, zImage and vexpress-v2p-aem-v7a-xen.dtb are all files in your $CWD. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGS-0004Si-5c; Tue, 13 Nov 2012 16:23:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGR-0004SR-GS for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:03 +0000 Received: from [85.158.139.83:32149] by server-7.bemta-5.messagelabs.com id 8D/E0-23096-6E372A05; Tue, 13 Nov 2012 16:23:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-182.messagelabs.com!1352823781!30133374!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25885 invoked from network); 13 Nov 2012 16:23:02 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:02 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784229" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:00 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:00 +0000 Message-ID: <1352823779.7491.94.camel@zakaz.uk.xensource.com> From: Ian Campbell To: xen-devel Date: Tue, 13 Nov 2012 16:22:59 +0000 Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The following series implements support for initial images and DTB in RAM, as opposed to in flash (dom0 kernel) or compiled into the hypervisor (DTB). It arranges to not clobber these with either the h/v text on relocation or with the heaps and frees them as appropriate. Most of this is independent of the specific bootloader protocol which is used to tell Xen where these modules actually are, but I have included a simple PoC bootloader protocol based around device tree which is similar to the protocol used by Linux to find its initrd (where /chosen/linux,initrd-{start,end} indicate the physical address). The PoC protocol is documented in docs/misc/arm/device-tree/booting.txt which is added by this series. I will post a patch against the boot-wrapper which implements the "bootloader" side of this protocol shortly. With that you can boot using the semi-hosting feature of the model (paths are host paths) like so: $MODEL linux-system-semi.axf -C cluster.cpu0.semihosting-cmd_line=\ '--kernel xen-arm.bin \ --module zImage earlyprintk=xenboot console=ttyAMA1 root=/dev/mmcblk0 ro \ --dtb vexpress-v2p-aem-v7a-xen.dtb -- dom0_mem=256M' Where xen-arm.bin, zImage and vexpress-v2p-aem-v7a-xen.dtb are all files in your $CWD. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGd-0004Vi-JW; Tue, 13 Nov 2012 16:23:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGb-0004V2-Tf for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:14 +0000 Received: from [193.109.254.147:8178] by server-16.bemta-14.messagelabs.com id 37/F3-09215-1F372A05; Tue, 13 Nov 2012 16:23:13 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352823792!3824472!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4178 invoked from network); 13 Nov 2012 16:23:12 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784240" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:12 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:12 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJGa-0007TH-AG; Tue, 13 Nov 2012 16:23:12 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYJGa-0002B1-6K; Tue, 13 Nov 2012 16:23:12 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.29680.90716.63517@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 16:23:12 +0000 To: Ian Campbell In-Reply-To: <1352739849.27833.308.camel@zakaz.uk.xensource.com> References: <509CB5FB.7020404@jp.fujitsu.com> <1352739849.27833.308.camel@zakaz.uk.xensource.com> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Kouya Shimura , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ian Campbell writes ("Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain"): > Acked-by: Ian Campbell > > and applied. > > Ian (J): Not sure if the test harness does much after the migration > phase but adding a few lifecycle ops as a sanity check might be useful? At least a reboot would probably be a good idea. I need to merge my two branches before I can make a change like that, though. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:21 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGd-0004Vi-JW; Tue, 13 Nov 2012 16:23:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGb-0004V2-Tf for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:14 +0000 Received: from [193.109.254.147:8178] by server-16.bemta-14.messagelabs.com id 37/F3-09215-1F372A05; Tue, 13 Nov 2012 16:23:13 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1352823792!3824472!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4178 invoked from network); 13 Nov 2012 16:23:12 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:12 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784240" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:12 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:12 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYJGa-0007TH-AG; Tue, 13 Nov 2012 16:23:12 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYJGa-0002B1-6K; Tue, 13 Nov 2012 16:23:12 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.29680.90716.63517@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 16:23:12 +0000 To: Ian Campbell In-Reply-To: <1352739849.27833.308.camel@zakaz.uk.xensource.com> References: <509CB5FB.7020404@jp.fujitsu.com> <1352739849.27833.308.camel@zakaz.uk.xensource.com> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Kouya Shimura , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ian Campbell writes ("Re: [Xen-devel] [PATCH] libxl: fix reboot failure of migrated domain"): > Acked-by: Ian Campbell > > and applied. > > Ian (J): Not sure if the test harness does much after the migration > phase but adding a few lifecycle ops as a sanity check might be useful? At least a reboot would probably be a good idea. I need to merge my two branches before I can make a change like that, though. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004aq-19; Tue, 13 Nov 2012 16:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGq-0004a5-Om for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:28 +0000 Received: from [85.158.138.51:51622] by server-8.bemta-3.messagelabs.com id 76/3D-07786-00472A05; Tue, 13 Nov 2012 16:23:28 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23003 invoked from network); 13 Nov 2012 16:23:27 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:27 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354944" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGm-0000Qd-V4; Tue, 13 Nov 2012 16:23:24 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:13 +0000 Message-ID: <1352823804-28482-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 01/12] arm: Enable build without CONFIG_DTB_FILE X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/Makefile | 4 ---- xen/arch/arm/xen.lds.S | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 634b620..bfac017 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -33,10 +33,6 @@ obj-y += hvm.o ifdef CONFIG_DTB_FILE obj-y += dtb.o AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" -else -# XXX: When running on the model there is no bootloader to provide a -# device tree. It must be linked into Xen. -$(error CONFIG_DTB_FILE must be set to the absolute filename of a DTB) endif ALL_OBJS := head.o $(ALL_OBJS) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index f0f4cd3..410d7db 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -123,9 +123,11 @@ SECTIONS } :text _end = . ; +#ifdef CONFIG_DTB_FILE /* Section for the device tree blob (if any). */ _sdtb = .; .dtb : { *(.dtb) } :text +#endif /* Sections to be discarded */ /DISCARD/ : { -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004aq-19; Tue, 13 Nov 2012 16:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGq-0004a5-Om for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:28 +0000 Received: from [85.158.138.51:51622] by server-8.bemta-3.messagelabs.com id 76/3D-07786-00472A05; Tue, 13 Nov 2012 16:23:28 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23003 invoked from network); 13 Nov 2012 16:23:27 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:27 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354944" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGm-0000Qd-V4; Tue, 13 Nov 2012 16:23:24 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:13 +0000 Message-ID: <1352823804-28482-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 01/12] arm: Enable build without CONFIG_DTB_FILE X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/Makefile | 4 ---- xen/arch/arm/xen.lds.S | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 634b620..bfac017 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -33,10 +33,6 @@ obj-y += hvm.o ifdef CONFIG_DTB_FILE obj-y += dtb.o AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" -else -# XXX: When running on the model there is no bootloader to provide a -# device tree. It must be linked into Xen. -$(error CONFIG_DTB_FILE must be set to the absolute filename of a DTB) endif ALL_OBJS := head.o $(ALL_OBJS) diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index f0f4cd3..410d7db 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -123,9 +123,11 @@ SECTIONS } :text _end = . ; +#ifdef CONFIG_DTB_FILE /* Section for the device tree blob (if any). */ _sdtb = .; .dtb : { *(.dtb) } :text +#endif /* Sections to be discarded */ /DISCARD/ : { -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004bg-E3; Tue, 13 Nov 2012 16:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGr-0004aP-Bw for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:29 +0000 Received: from [85.158.138.51:51654] by server-13.bemta-3.messagelabs.com id 6A/4E-24887-00472A05; Tue, 13 Nov 2012 16:23:28 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23026 invoked from network); 13 Nov 2012 16:23:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354945" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-11; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:15 +0000 Message-ID: <1352823804-28482-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 03/12] arm: handle xenheap which isn't at the start of RAM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- v2: Simplify page_to_virt by using mfn_to_virt & page_to_mfn as suggested by Tim. --- xen/include/asm-arm/mm.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index c0f5b1f..260af35 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -214,17 +214,15 @@ static inline struct page_info *virt_to_page(const void *v) ASSERT(va >= XENHEAP_VIRT_START); ASSERT(va < xenheap_virt_end); - return frame_table + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT); + return frame_table + + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT) + + xenheap_mfn_start + - frametable_base_mfn; } static inline void *page_to_virt(const struct page_info *pg) { - ASSERT((unsigned long)pg - FRAMETABLE_VIRT_START < frametable_virt_end); - return (void *)(XENHEAP_VIRT_START + - ((unsigned long)pg - FRAMETABLE_VIRT_START) / - (sizeof(*pg) / (sizeof(*pg) & -sizeof(*pg))) * - (PAGE_SIZE / (sizeof(*pg) & -sizeof(*pg)))); - + return mfn_to_virt(page_to_mfn(pg)); } struct domain *page_get_owner_and_reference(struct page_info *page); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:36 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004bg-E3; Tue, 13 Nov 2012 16:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGr-0004aP-Bw for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:29 +0000 Received: from [85.158.138.51:51654] by server-13.bemta-3.messagelabs.com id 6A/4E-24887-00472A05; Tue, 13 Nov 2012 16:23:28 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23026 invoked from network); 13 Nov 2012 16:23:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354945" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-11; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:15 +0000 Message-ID: <1352823804-28482-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 03/12] arm: handle xenheap which isn't at the start of RAM. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- v2: Simplify page_to_virt by using mfn_to_virt & page_to_mfn as suggested by Tim. --- xen/include/asm-arm/mm.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index c0f5b1f..260af35 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -214,17 +214,15 @@ static inline struct page_info *virt_to_page(const void *v) ASSERT(va >= XENHEAP_VIRT_START); ASSERT(va < xenheap_virt_end); - return frame_table + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT); + return frame_table + + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT) + + xenheap_mfn_start + - frametable_base_mfn; } static inline void *page_to_virt(const struct page_info *pg) { - ASSERT((unsigned long)pg - FRAMETABLE_VIRT_START < frametable_virt_end); - return (void *)(XENHEAP_VIRT_START + - ((unsigned long)pg - FRAMETABLE_VIRT_START) / - (sizeof(*pg) / (sizeof(*pg) & -sizeof(*pg))) * - (PAGE_SIZE / (sizeof(*pg) & -sizeof(*pg)))); - + return mfn_to_virt(page_to_mfn(pg)); } struct domain *page_get_owner_and_reference(struct page_info *page); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGw-0004dU-1m; Tue, 13 Nov 2012 16:23:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGu-0004aP-1X for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:32 +0000 Received: from [85.158.137.99:22003] by server-13.bemta-3.messagelabs.com id B0/6E-24887-30472A05; Tue, 13 Nov 2012 16:23:31 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352823809!18961018!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10620 invoked from network); 13 Nov 2012 16:23:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:30 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354949" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-Eg; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:22 +0000 Message-ID: <1352823804-28482-10-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 10/12] arm: discard boot modules after building domain 0. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/domain_build.c | 3 +++ xen/arch/arm/setup.c | 16 ++++++++++++++++ xen/include/asm-arm/setup.h | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a9e7f43..e96ed10 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "gic.h" #include "kernel.h" @@ -308,6 +309,8 @@ int construct_dom0(struct domain *d) dtb_load(&kinfo); kernel_load(&kinfo); + discard_initial_modules(); + clear_bit(_VPF_down, &v->pause_flags); memset(regs, 0, sizeof(*regs)); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 04d16a1..0b668fa 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -68,6 +68,22 @@ static void __init processor_id(void) READ_CP32(ID_ISAR3), READ_CP32(ID_ISAR4), READ_CP32(ID_ISAR5)); } +void __init discard_initial_modules(void) +{ + struct dt_module_info *mi = &early_info.modules; + int i; + + for ( i = 1; i <= mi->nr_mods; i++ ) + { + paddr_t s = mi->module[i].start; + paddr_t e = s + PAGE_ALIGN(mi->module[i].size); + + init_domheap_pages(s, e); + } + + mi->nr_mods = 0; +} + /* * Returns the end address of the highest region in the range s..e * with required size and alignment that does not conflict with the diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 8769f66..3267db0 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -9,6 +9,8 @@ void arch_get_xen_caps(xen_capabilities_info_t *info); int construct_dom0(struct domain *d); +void discard_initial_modules(void); + #endif /* * Local variables: -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGw-0004dU-1m; Tue, 13 Nov 2012 16:23:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGu-0004aP-1X for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:32 +0000 Received: from [85.158.137.99:22003] by server-13.bemta-3.messagelabs.com id B0/6E-24887-30472A05; Tue, 13 Nov 2012 16:23:31 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-217.messagelabs.com!1352823809!18961018!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10620 invoked from network); 13 Nov 2012 16:23:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:30 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354949" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-Eg; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:22 +0000 Message-ID: <1352823804-28482-10-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 10/12] arm: discard boot modules after building domain 0. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/domain_build.c | 3 +++ xen/arch/arm/setup.c | 16 ++++++++++++++++ xen/include/asm-arm/setup.h | 2 ++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a9e7f43..e96ed10 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "gic.h" #include "kernel.h" @@ -308,6 +309,8 @@ int construct_dom0(struct domain *d) dtb_load(&kinfo); kernel_load(&kinfo); + discard_initial_modules(); + clear_bit(_VPF_down, &v->pause_flags); memset(regs, 0, sizeof(*regs)); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 04d16a1..0b668fa 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -68,6 +68,22 @@ static void __init processor_id(void) READ_CP32(ID_ISAR3), READ_CP32(ID_ISAR4), READ_CP32(ID_ISAR5)); } +void __init discard_initial_modules(void) +{ + struct dt_module_info *mi = &early_info.modules; + int i; + + for ( i = 1; i <= mi->nr_mods; i++ ) + { + paddr_t s = mi->module[i].start; + paddr_t e = s + PAGE_ALIGN(mi->module[i].size); + + init_domheap_pages(s, e); + } + + mi->nr_mods = 0; +} + /* * Returns the end address of the highest region in the range s..e * with required size and alignment that does not conflict with the diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 8769f66..3267db0 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -9,6 +9,8 @@ void arch_get_xen_caps(xen_capabilities_info_t *info); int construct_dom0(struct domain *d); +void discard_initial_modules(void); + #endif /* * Local variables: -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGu-0004cM-8g; Tue, 13 Nov 2012 16:23:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004bA-T1 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:31 +0000 Received: from [85.158.138.51:51763] by server-1.bemta-3.messagelabs.com id 32/11-12169-20472A05; Tue, 13 Nov 2012 16:23:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23106 invoked from network); 13 Nov 2012 16:23:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354947" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-8V; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:19 +0000 Message-ID: <1352823804-28482-7-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 07/12] arm: const-correctness in virt_to_maddr X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell Acked-by: Acked-by: Tim Deegan --- v2: dropped one unnecessary const. --- xen/include/asm-arm/mm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 260af35..e95ece1 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -179,7 +179,7 @@ extern void clear_fixmap(unsigned map); #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) -static inline paddr_t virt_to_maddr(void *va) +static inline paddr_t virt_to_maddr(const void *va) { uint64_t par = va_to_par((uint32_t)va); return (par & PADDR_MASK & PAGE_MASK) | ((unsigned long) va & ~PAGE_MASK); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGu-0004cM-8g; Tue, 13 Nov 2012 16:23:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004bA-T1 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:31 +0000 Received: from [85.158.138.51:51763] by server-1.bemta-3.messagelabs.com id 32/11-12169-20472A05; Tue, 13 Nov 2012 16:23:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23106 invoked from network); 13 Nov 2012 16:23:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354947" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-8V; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:19 +0000 Message-ID: <1352823804-28482-7-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 07/12] arm: const-correctness in virt_to_maddr X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell Acked-by: Acked-by: Tim Deegan --- v2: dropped one unnecessary const. --- xen/include/asm-arm/mm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 260af35..e95ece1 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -179,7 +179,7 @@ extern void clear_fixmap(unsigned map); #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) -static inline paddr_t virt_to_maddr(void *va) +static inline paddr_t virt_to_maddr(const void *va) { uint64_t par = va_to_par((uint32_t)va); return (par & PADDR_MASK & PAGE_MASK) | ((unsigned long) va & ~PAGE_MASK); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004c2-Re; Tue, 13 Nov 2012 16:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004ah-22 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:30 +0000 Received: from [85.158.138.51:51716] by server-4.bemta-3.messagelabs.com id E5/30-30023-10472A05; Tue, 13 Nov 2012 16:23:29 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23067 invoked from network); 13 Nov 2012 16:23:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354946" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGm-0000Qd-WC; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:14 +0000 Message-ID: <1352823804-28482-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 02/12] arm: create a raw binary target. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is suitable for direct loading by a bootloader. Signed-off-by: Ian Campbell --- v2: Don't strip the .comment section, we don't have one any way. --- xen/arch/arm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index bfac017..92a4ccf 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -37,12 +37,16 @@ endif ALL_OBJS := head.o $(ALL_OBJS) -$(TARGET): $(TARGET)-syms +$(TARGET): $(TARGET)-syms $(TARGET).bin # XXX: VE model loads by VMA so instead of # making a proper ELF we link with LMA == VMA and adjust crudely $(OBJCOPY) --change-addresses +0x80000000 $< $@ $(STRIP) $@ +# +$(TARGET).bin: $(TARGET)-syms + objcopy -O binary -S $< $@ + #$(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 # ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ # `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004c2-Re; Tue, 13 Nov 2012 16:23:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGs-0004ah-22 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:30 +0000 Received: from [85.158.138.51:51716] by server-4.bemta-3.messagelabs.com id E5/30-30023-10472A05; Tue, 13 Nov 2012 16:23:29 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23067 invoked from network); 13 Nov 2012 16:23:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:28 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354946" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGm-0000Qd-WC; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:14 +0000 Message-ID: <1352823804-28482-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 02/12] arm: create a raw binary target. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is suitable for direct loading by a bootloader. Signed-off-by: Ian Campbell --- v2: Don't strip the .comment section, we don't have one any way. --- xen/arch/arm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index bfac017..92a4ccf 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -37,12 +37,16 @@ endif ALL_OBJS := head.o $(ALL_OBJS) -$(TARGET): $(TARGET)-syms +$(TARGET): $(TARGET)-syms $(TARGET).bin # XXX: VE model loads by VMA so instead of # making a proper ELF we link with LMA == VMA and adjust crudely $(OBJCOPY) --change-addresses +0x80000000 $< $@ $(STRIP) $@ +# +$(TARGET).bin: $(TARGET)-syms + objcopy -O binary -S $< $@ + #$(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 # ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ # `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGv-0004d9-M6; Tue, 13 Nov 2012 16:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004bU-F6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:31 +0000 Received: from [85.158.138.51:31819] by server-10.bemta-3.messagelabs.com id 14/86-19806-20472A05; Tue, 13 Nov 2012 16:23:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!5 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23133 invoked from network); 13 Nov 2012 16:23:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:30 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354948" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-B1; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:20 +0000 Message-ID: <1352823804-28482-8-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 08/12] device-tree: get_val cannot cope with cells > 2, add a BUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- v2: drop unrelated white space fixup --- xen/common/device_tree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index efd1663..7d3fd9f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -45,6 +45,8 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) { *val = 0; + BUG_ON( cells > 2 ); + while ( cells-- ) { *val <<= 32; -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:37 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGv-0004d9-M6; Tue, 13 Nov 2012 16:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJGt-0004bU-F6 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:31 +0000 Received: from [85.158.138.51:31819] by server-10.bemta-3.messagelabs.com id 14/86-19806-20472A05; Tue, 13 Nov 2012 16:23:30 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-174.messagelabs.com!1352823806!29850157!5 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAyODU4OTM=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23133 invoked from network); 13 Nov 2012 16:23:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-174.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:30 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="214354948" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-B1; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:20 +0000 Message-ID: <1352823804-28482-8-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 08/12] device-tree: get_val cannot cope with cells > 2, add a BUG X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- v2: drop unrelated white space fixup --- xen/common/device_tree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index efd1663..7d3fd9f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -45,6 +45,8 @@ static void __init get_val(const u32 **cell, u32 cells, u64 *val) { *val = 0; + BUG_ON( cells > 2 ); + while ( cells-- ) { *val <<= 32; -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004tE-FD; Tue, 13 Nov 2012 16:23:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHD-0004r6-CC for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:51 +0000 Received: from [85.158.143.35:50042] by server-3.bemta-4.messagelabs.com id F8/7D-06841-71472A05; Tue, 13 Nov 2012 16:23:51 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12696 invoked from network); 13 Nov 2012 16:23:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437586" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-4h; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:17 +0000 Message-ID: <1352823804-28482-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 05/12] arm: avoid placing Xen over any modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This will still fail if the modules are such that Xen is pushed out of the top 32M of RAM since it will then overlap with the domheap (or possibly xenheap). This will be dealt with later. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- v2: Xen is module 0, modules start at 1. --- xen/arch/arm/setup.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b0b30d6..587b1e7 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -68,17 +68,55 @@ static void __init processor_id(void) READ_CP32(ID_ISAR3), READ_CP32(ID_ISAR4), READ_CP32(ID_ISAR5)); } +/* + * Returns the end address of the highest region in the range s..e + * with required size and alignment that does not conflict with the + * modules from first_mod to nr_modules. + * + * For non-recursive callers first_mod should normally be 1. + */ +static paddr_t __init consider_modules(paddr_t s, paddr_t e, + uint32_t size, paddr_t align, + int first_mod) +{ + const struct dt_module_info *mi = &early_info.modules; + int i; + + s = (s+align-1) & ~(align-1); + e = e & ~(align-1); + + if ( s > e || e - s < size ) + return 0; + + for ( i = first_mod; i <= mi->nr_mods; i++ ) + { + paddr_t mod_s = mi->module[i].start; + paddr_t mod_e = mod_s + mi->module[i].size; + + if ( s < mod_e && mod_s < e ) + { + mod_e = consider_modules(mod_e, e, size, align, i+1); + if ( mod_e ) + return mod_e; + + return consider_modules(s, mod_s, size, align, i+1); + } + } + + return e; +} + /** * get_xen_paddr - get physical address to relocate Xen to * - * Xen is relocated to the top of RAM and aligned to a XEN_PADDR_ALIGN - * boundary. + * Xen is relocated to as near to the top of RAM as possible and + * aligned to a XEN_PADDR_ALIGN boundary. */ static paddr_t __init get_xen_paddr(void) { struct dt_mem_info *mi = &early_info.mem; paddr_t min_size; - paddr_t paddr = 0, t; + paddr_t paddr = 0; int i; min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1); @@ -86,17 +124,33 @@ static paddr_t __init get_xen_paddr(void) /* Find the highest bank with enough space. */ for ( i = 0; i < mi->nr_banks; i++ ) { - if ( mi->bank[i].size >= min_size ) + const struct membank *bank = &mi->bank[i]; + paddr_t s, e; + + if ( bank->size >= min_size ) { - t = mi->bank[i].start + mi->bank[i].size - min_size; - if ( t > paddr ) - paddr = t; + e = consider_modules(bank->start, bank->start + bank->size, + min_size, XEN_PADDR_ALIGN, 1); + if ( !e ) + continue; + + s = e - min_size; + + if ( s > paddr ) + paddr = s; } } if ( !paddr ) early_panic("Not enough memory to relocate Xen\n"); + early_printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + paddr, paddr + min_size); + + /* Xen is module 0 */ + early_info.modules.module[0].start = paddr; + early_info.modules.module[0].size = min_size; + return paddr; } -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:55 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004tE-FD; Tue, 13 Nov 2012 16:23:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHD-0004r6-CC for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:51 +0000 Received: from [85.158.143.35:50042] by server-3.bemta-4.messagelabs.com id F8/7D-06841-71472A05; Tue, 13 Nov 2012 16:23:51 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12696 invoked from network); 13 Nov 2012 16:23:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437586" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-4h; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:17 +0000 Message-ID: <1352823804-28482-5-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 05/12] arm: avoid placing Xen over any modules. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This will still fail if the modules are such that Xen is pushed out of the top 32M of RAM since it will then overlap with the domheap (or possibly xenheap). This will be dealt with later. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- v2: Xen is module 0, modules start at 1. --- xen/arch/arm/setup.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index b0b30d6..587b1e7 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -68,17 +68,55 @@ static void __init processor_id(void) READ_CP32(ID_ISAR3), READ_CP32(ID_ISAR4), READ_CP32(ID_ISAR5)); } +/* + * Returns the end address of the highest region in the range s..e + * with required size and alignment that does not conflict with the + * modules from first_mod to nr_modules. + * + * For non-recursive callers first_mod should normally be 1. + */ +static paddr_t __init consider_modules(paddr_t s, paddr_t e, + uint32_t size, paddr_t align, + int first_mod) +{ + const struct dt_module_info *mi = &early_info.modules; + int i; + + s = (s+align-1) & ~(align-1); + e = e & ~(align-1); + + if ( s > e || e - s < size ) + return 0; + + for ( i = first_mod; i <= mi->nr_mods; i++ ) + { + paddr_t mod_s = mi->module[i].start; + paddr_t mod_e = mod_s + mi->module[i].size; + + if ( s < mod_e && mod_s < e ) + { + mod_e = consider_modules(mod_e, e, size, align, i+1); + if ( mod_e ) + return mod_e; + + return consider_modules(s, mod_s, size, align, i+1); + } + } + + return e; +} + /** * get_xen_paddr - get physical address to relocate Xen to * - * Xen is relocated to the top of RAM and aligned to a XEN_PADDR_ALIGN - * boundary. + * Xen is relocated to as near to the top of RAM as possible and + * aligned to a XEN_PADDR_ALIGN boundary. */ static paddr_t __init get_xen_paddr(void) { struct dt_mem_info *mi = &early_info.mem; paddr_t min_size; - paddr_t paddr = 0, t; + paddr_t paddr = 0; int i; min_size = (_end - _start + (XEN_PADDR_ALIGN-1)) & ~(XEN_PADDR_ALIGN-1); @@ -86,17 +124,33 @@ static paddr_t __init get_xen_paddr(void) /* Find the highest bank with enough space. */ for ( i = 0; i < mi->nr_banks; i++ ) { - if ( mi->bank[i].size >= min_size ) + const struct membank *bank = &mi->bank[i]; + paddr_t s, e; + + if ( bank->size >= min_size ) { - t = mi->bank[i].start + mi->bank[i].size - min_size; - if ( t > paddr ) - paddr = t; + e = consider_modules(bank->start, bank->start + bank->size, + min_size, XEN_PADDR_ALIGN, 1); + if ( !e ) + continue; + + s = e - min_size; + + if ( s > paddr ) + paddr = s; } } if ( !paddr ) early_panic("Not enough memory to relocate Xen\n"); + early_printk("Placing Xen at 0x%"PRIpaddr"-0x%"PRIpaddr"\n", + paddr, paddr + min_size); + + /* Xen is module 0 */ + early_info.modules.module[0].start = paddr; + early_info.modules.module[0].size = min_size; + return paddr; } -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHD-0004sJ-FI; Tue, 13 Nov 2012 16:23:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHC-0004r6-BG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:50 +0000 Received: from [85.158.143.35:12030] by server-3.bemta-4.messagelabs.com id 08/6D-06841-51472A05; Tue, 13 Nov 2012 16:23:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12440 invoked from network); 13 Nov 2012 16:23:48 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:48 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437584" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-2A; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:16 +0000 Message-ID: <1352823804-28482-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 04/12] arm: parse modules from DT during early boot. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The bootloader should populate /chosen/module@/ for each module it wishes to pass to the hypervisor. The content of these nodes is described in docs/misc/arm/device-tree/booting.txt The hypervisor allows for 2 modules (@1==kernel and @2==initrd). Currently we don't do anything with them. Signed-off-by: Ian Campbell --- v2: Reserve the zeroeth module for Xen itself (not used yet) Use a more idiomatic DT layout Document said layout --- docs/misc/arm/device-tree/booting.txt | 27 ++++++++++++ xen/common/device_tree.c | 75 +++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 14 ++++++ 3 files changed, 116 insertions(+), 0 deletions(-) create mode 100644 docs/misc/arm/device-tree/booting.txt diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt new file mode 100644 index 0000000..2609450 --- /dev/null +++ b/docs/misc/arm/device-tree/booting.txt @@ -0,0 +1,27 @@ +Xen is passed the dom0 kernel and initrd via a reference in the /chosen +node of the device tree. + +Each node has the form /chosen/module@ and contains the following +properties: + +- compatible + + Must be "xen,multiboot-module" + +- start + + Physical address of the start of this module + +- end + + Physical address of the end of this module + +- bootargs (optional) + + Command line associated with this module + +The following modules are understood + +- 1 -- the domain 0 kernel +- 2 -- the domain 0 ramdisk + diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d1f0f4..efd1663 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -229,6 +229,79 @@ static void __init process_memory_node(const void *fdt, int node, } } +static void __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const u32 *cell; + paddr_t size; + int nr, depth, nr_modules = 0; + struct dt_mb_module *mod; + int len; + + for ( depth = 0; + depth >= 0; + node = fdt_next_node(fdt, node, &depth) ) + { + name = fdt_get_name(fdt, node, NULL); + if ( strncmp(name, "module@", strlen("module@")) == 0 ) { + + if ( fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) != 0 ) + early_panic("%s not a compatible module node\n", name); + + nr = simple_strtol(name + strlen("module@"), NULL, 10); + if ( nr <= 0 ) + early_panic("Invalid module number %d\n", nr); + + if ( nr > NR_MODULES ) + early_panic("too many modules %d > %d\n", nr, NR_MODULES); + if ( nr > nr_modules ) + nr_modules = nr; + + mod = &early_info.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "start", NULL); + if ( !prop ) + early_panic("no start for module %d\n", nr); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &size); + + prop = fdt_get_property(fdt, node, "end", NULL); + if ( !prop ) + early_panic("no end for module %d\n", nr); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->size, &size); + mod->size -= mod->start; + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + early_panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + } + } + + for ( nr = 1 ; nr < nr_modules ; nr++ ) + { + mod = &early_info.modules.module[nr]; + if ( !mod->start || !mod->size ) + early_panic("module %d missing / invalid\n", nr); + } + + early_info.modules.nr_mods = nr_modules; +} + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -236,6 +309,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_matches(fdt, node, "chosen") ) + process_chosen_node(fdt, node, name, address_cells, size_cells); return 0; } diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 4d010c0..c383677 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -15,6 +15,7 @@ #define DEVICE_TREE_MAX_DEPTH 16 #define NR_MEM_BANKS 8 +#define NR_MODULES 2 struct membank { paddr_t start; @@ -26,8 +27,21 @@ struct dt_mem_info { struct membank bank[NR_MEM_BANKS]; }; +struct dt_mb_module { + paddr_t start; + paddr_t size; + char cmdline[1024]; +}; + +struct dt_module_info { + int nr_mods; + /* Module 0 is Xen itself, followed by the provided modules-proper */ + struct dt_mb_module module[NR_MODULES + 1]; +}; + struct dt_early_info { struct dt_mem_info mem; + struct dt_module_info modules; }; typedef int (*device_tree_node_func)(const void *fdt, -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHD-0004sJ-FI; Tue, 13 Nov 2012 16:23:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHC-0004r6-BG for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:50 +0000 Received: from [85.158.143.35:12030] by server-3.bemta-4.messagelabs.com id 08/6D-06841-51472A05; Tue, 13 Nov 2012 16:23:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12440 invoked from network); 13 Nov 2012 16:23:48 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:48 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437584" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:25 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-2A; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:16 +0000 Message-ID: <1352823804-28482-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 04/12] arm: parse modules from DT during early boot. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The bootloader should populate /chosen/module@/ for each module it wishes to pass to the hypervisor. The content of these nodes is described in docs/misc/arm/device-tree/booting.txt The hypervisor allows for 2 modules (@1==kernel and @2==initrd). Currently we don't do anything with them. Signed-off-by: Ian Campbell --- v2: Reserve the zeroeth module for Xen itself (not used yet) Use a more idiomatic DT layout Document said layout --- docs/misc/arm/device-tree/booting.txt | 27 ++++++++++++ xen/common/device_tree.c | 75 +++++++++++++++++++++++++++++++++ xen/include/xen/device_tree.h | 14 ++++++ 3 files changed, 116 insertions(+), 0 deletions(-) create mode 100644 docs/misc/arm/device-tree/booting.txt diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt new file mode 100644 index 0000000..2609450 --- /dev/null +++ b/docs/misc/arm/device-tree/booting.txt @@ -0,0 +1,27 @@ +Xen is passed the dom0 kernel and initrd via a reference in the /chosen +node of the device tree. + +Each node has the form /chosen/module@ and contains the following +properties: + +- compatible + + Must be "xen,multiboot-module" + +- start + + Physical address of the start of this module + +- end + + Physical address of the end of this module + +- bootargs (optional) + + Command line associated with this module + +The following modules are understood + +- 1 -- the domain 0 kernel +- 2 -- the domain 0 ramdisk + diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d1f0f4..efd1663 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -229,6 +229,79 @@ static void __init process_memory_node(const void *fdt, int node, } } +static void __init process_chosen_node(const void *fdt, int node, + const char *name, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop; + const u32 *cell; + paddr_t size; + int nr, depth, nr_modules = 0; + struct dt_mb_module *mod; + int len; + + for ( depth = 0; + depth >= 0; + node = fdt_next_node(fdt, node, &depth) ) + { + name = fdt_get_name(fdt, node, NULL); + if ( strncmp(name, "module@", strlen("module@")) == 0 ) { + + if ( fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) != 0 ) + early_panic("%s not a compatible module node\n", name); + + nr = simple_strtol(name + strlen("module@"), NULL, 10); + if ( nr <= 0 ) + early_panic("Invalid module number %d\n", nr); + + if ( nr > NR_MODULES ) + early_panic("too many modules %d > %d\n", nr, NR_MODULES); + if ( nr > nr_modules ) + nr_modules = nr; + + mod = &early_info.modules.module[nr]; + + prop = fdt_get_property(fdt, node, "start", NULL); + if ( !prop ) + early_panic("no start for module %d\n", nr); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->start, &size); + + prop = fdt_get_property(fdt, node, "end", NULL); + if ( !prop ) + early_panic("no end for module %d\n", nr); + + cell = (const u32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, + &mod->size, &size); + mod->size -= mod->start; + + prop = fdt_get_property(fdt, node, "bootargs", &len); + if ( prop ) + { + if ( len > sizeof(mod->cmdline) ) + early_panic("module %d command line too long\n", nr); + + safe_strcpy(mod->cmdline, prop->data); + } + else + mod->cmdline[0] = 0; + } + } + + for ( nr = 1 ; nr < nr_modules ; nr++ ) + { + mod = &early_info.modules.module[nr]; + if ( !mod->start || !mod->size ) + early_panic("module %d missing / invalid\n", nr); + } + + early_info.modules.nr_mods = nr_modules; +} + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -236,6 +309,8 @@ static int __init early_scan_node(const void *fdt, { if ( device_tree_node_matches(fdt, node, "memory") ) process_memory_node(fdt, node, name, address_cells, size_cells); + else if ( device_tree_node_matches(fdt, node, "chosen") ) + process_chosen_node(fdt, node, name, address_cells, size_cells); return 0; } diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 4d010c0..c383677 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -15,6 +15,7 @@ #define DEVICE_TREE_MAX_DEPTH 16 #define NR_MEM_BANKS 8 +#define NR_MODULES 2 struct membank { paddr_t start; @@ -26,8 +27,21 @@ struct dt_mem_info { struct membank bank[NR_MEM_BANKS]; }; +struct dt_mb_module { + paddr_t start; + paddr_t size; + char cmdline[1024]; +}; + +struct dt_module_info { + int nr_mods; + /* Module 0 is Xen itself, followed by the provided modules-proper */ + struct dt_mb_module module[NR_MODULES + 1]; +}; + struct dt_early_info { struct dt_mem_info mem; + struct dt_module_info modules; }; typedef int (*device_tree_node_func)(const void *fdt, -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004sw-2B; Tue, 13 Nov 2012 16:23:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHC-0004r6-TB for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:51 +0000 Received: from [85.158.143.35:12100] by server-3.bemta-4.messagelabs.com id FD/6D-06841-61472A05; Tue, 13 Nov 2012 16:23:50 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12588 invoked from network); 13 Nov 2012 16:23:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437585" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-78; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:18 +0000 Message-ID: <1352823804-28482-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 06/12] arm: avoid allocating the heaps over modules or xen itself. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/setup.c | 89 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 78 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 587b1e7..04d16a1 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -73,7 +73,8 @@ static void __init processor_id(void) * with required size and alignment that does not conflict with the * modules from first_mod to nr_modules. * - * For non-recursive callers first_mod should normally be 1. + * For non-recursive callers first_mod should normally be 0 (all + * modules and Xen itself) or 1 (all modules but not Xen). */ static paddr_t __init consider_modules(paddr_t s, paddr_t e, uint32_t size, paddr_t align, @@ -106,6 +107,34 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return e; } +/* + * Return the end of the non-module region starting at s. In other + * words return s the start of the next modules after s. + * + * Also returns the end of that module in *n. + */ +static paddr_t __init next_module(paddr_t s, paddr_t *n) +{ + struct dt_module_info *mi = &early_info.modules; + paddr_t lowest = ~(paddr_t)0; + int i; + + for ( i = 0; i <= mi->nr_mods; i++ ) + { + paddr_t mod_s = mi->module[i].start; + paddr_t mod_e = mod_s + mi->module[i].size; + + if ( mod_s < s ) + continue; + if ( mod_s > lowest ) + continue; + lowest = mod_s; + *n = mod_e; + } + return lowest; +} + + /** * get_xen_paddr - get physical address to relocate Xen to * @@ -159,6 +188,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t ram_start; paddr_t ram_end; paddr_t ram_size; + paddr_t s, e; unsigned long ram_pages; unsigned long heap_pages, xenheap_pages, domheap_pages; unsigned long dtb_pages; @@ -176,22 +206,37 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) ram_pages = ram_size >> PAGE_SHIFT; /* - * Calculate the sizes for the heaps using these constraints: + * Locate the xenheap using these constraints: * - * - heaps must be 32 MiB aligned - * - must not include Xen itself - * - xen heap must be at most 1 GiB + * - must be 32 MiB aligned + * - must not include Xen itself or the boot modules + * - must be at most 1 GiB + * - must be at least 128M * - * XXX: needs a platform with at least 1GiB of RAM or the dom - * heap will be empty and no domains can be created. + * We try to allocate the largest xenheap possible within these + * constraints. */ - heap_pages = (ram_size >> PAGE_SHIFT) - (32 << (20 - PAGE_SHIFT)); + heap_pages = (ram_size >> PAGE_SHIFT); xenheap_pages = min(1ul << (30 - PAGE_SHIFT), heap_pages); + + do + { + e = consider_modules(ram_start, ram_end, xenheap_pages<>= 1; + } while ( xenheap_pages > 128<<(20-PAGE_SHIFT) ); + + if ( ! e ) + panic("Not not enough space for xenheap\n"); + domheap_pages = heap_pages - xenheap_pages; printk("Xen heap: %lu pages Dom heap: %lu pages\n", xenheap_pages, domheap_pages); - setup_xenheap_mappings(ram_start >> PAGE_SHIFT, xenheap_pages); + setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_pages); /* * Need a single mapped page for populating bootmem_region_list @@ -215,8 +260,30 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); /* Add non-xenheap memory */ - init_boot_pages(pfn_to_paddr(xenheap_mfn_start + xenheap_pages), - pfn_to_paddr(xenheap_mfn_start + xenheap_pages + domheap_pages)); + s = ram_start; + while ( s < ram_end ) + { + paddr_t n = ram_end; + + e = next_module(s, &n); + + if ( e == ~(paddr_t)0 ) + { + e = n = ram_end; + } + + /* Avoid the xenheap */ + if ( s < ((xenheap_mfn_start+xenheap_pages) << PAGE_SHIFT) + && (xenheap_mfn_start << PAGE_SHIFT) < e ) + { + e = pfn_to_paddr(xenheap_mfn_start); + n = pfn_to_paddr(xenheap_mfn_start+xenheap_pages); + } + + init_boot_pages(s, e); + + s = n; + } setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:56 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004sw-2B; Tue, 13 Nov 2012 16:23:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHC-0004r6-TB for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:51 +0000 Received: from [85.158.143.35:12100] by server-3.bemta-4.messagelabs.com id FD/6D-06841-61472A05; Tue, 13 Nov 2012 16:23:50 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1352823827!17537935!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12588 invoked from network); 13 Nov 2012 16:23:49 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:49 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437585" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:25 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-78; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:18 +0000 Message-ID: <1352823804-28482-6-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 06/12] arm: avoid allocating the heaps over modules or xen itself. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/setup.c | 89 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 78 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 587b1e7..04d16a1 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -73,7 +73,8 @@ static void __init processor_id(void) * with required size and alignment that does not conflict with the * modules from first_mod to nr_modules. * - * For non-recursive callers first_mod should normally be 1. + * For non-recursive callers first_mod should normally be 0 (all + * modules and Xen itself) or 1 (all modules but not Xen). */ static paddr_t __init consider_modules(paddr_t s, paddr_t e, uint32_t size, paddr_t align, @@ -106,6 +107,34 @@ static paddr_t __init consider_modules(paddr_t s, paddr_t e, return e; } +/* + * Return the end of the non-module region starting at s. In other + * words return s the start of the next modules after s. + * + * Also returns the end of that module in *n. + */ +static paddr_t __init next_module(paddr_t s, paddr_t *n) +{ + struct dt_module_info *mi = &early_info.modules; + paddr_t lowest = ~(paddr_t)0; + int i; + + for ( i = 0; i <= mi->nr_mods; i++ ) + { + paddr_t mod_s = mi->module[i].start; + paddr_t mod_e = mod_s + mi->module[i].size; + + if ( mod_s < s ) + continue; + if ( mod_s > lowest ) + continue; + lowest = mod_s; + *n = mod_e; + } + return lowest; +} + + /** * get_xen_paddr - get physical address to relocate Xen to * @@ -159,6 +188,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t ram_start; paddr_t ram_end; paddr_t ram_size; + paddr_t s, e; unsigned long ram_pages; unsigned long heap_pages, xenheap_pages, domheap_pages; unsigned long dtb_pages; @@ -176,22 +206,37 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) ram_pages = ram_size >> PAGE_SHIFT; /* - * Calculate the sizes for the heaps using these constraints: + * Locate the xenheap using these constraints: * - * - heaps must be 32 MiB aligned - * - must not include Xen itself - * - xen heap must be at most 1 GiB + * - must be 32 MiB aligned + * - must not include Xen itself or the boot modules + * - must be at most 1 GiB + * - must be at least 128M * - * XXX: needs a platform with at least 1GiB of RAM or the dom - * heap will be empty and no domains can be created. + * We try to allocate the largest xenheap possible within these + * constraints. */ - heap_pages = (ram_size >> PAGE_SHIFT) - (32 << (20 - PAGE_SHIFT)); + heap_pages = (ram_size >> PAGE_SHIFT); xenheap_pages = min(1ul << (30 - PAGE_SHIFT), heap_pages); + + do + { + e = consider_modules(ram_start, ram_end, xenheap_pages<>= 1; + } while ( xenheap_pages > 128<<(20-PAGE_SHIFT) ); + + if ( ! e ) + panic("Not not enough space for xenheap\n"); + domheap_pages = heap_pages - xenheap_pages; printk("Xen heap: %lu pages Dom heap: %lu pages\n", xenheap_pages, domheap_pages); - setup_xenheap_mappings(ram_start >> PAGE_SHIFT, xenheap_pages); + setup_xenheap_mappings((e >> PAGE_SHIFT) - xenheap_pages, xenheap_pages); /* * Need a single mapped page for populating bootmem_region_list @@ -215,8 +260,30 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) copy_from_paddr(device_tree_flattened, dtb_paddr, dtb_size, BUFFERABLE); /* Add non-xenheap memory */ - init_boot_pages(pfn_to_paddr(xenheap_mfn_start + xenheap_pages), - pfn_to_paddr(xenheap_mfn_start + xenheap_pages + domheap_pages)); + s = ram_start; + while ( s < ram_end ) + { + paddr_t n = ram_end; + + e = next_module(s, &n); + + if ( e == ~(paddr_t)0 ) + { + e = n = ram_end; + } + + /* Avoid the xenheap */ + if ( s < ((xenheap_mfn_start+xenheap_pages) << PAGE_SHIFT) + && (xenheap_mfn_start << PAGE_SHIFT) < e ) + { + e = pfn_to_paddr(xenheap_mfn_start); + n = pfn_to_paddr(xenheap_mfn_start+xenheap_pages); + } + + init_boot_pages(s, e); + + s = n; + } setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHG-0004vm-RV; Tue, 13 Nov 2012 16:23:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004tH-WE for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:53 +0000 Received: from [85.158.139.83:43969] by server-14.bemta-5.messagelabs.com id A2/19-21768-81472A05; Tue, 13 Nov 2012 16:23:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352823829!29549126!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20228 invoked from network); 13 Nov 2012 16:23:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437590" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:26 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-DR; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:21 +0000 Message-ID: <1352823804-28482-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 09/12] arm: load dom0 kernel from first boot module X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/kernel.c | 74 +++++++++++++++++++++++++++++++++++++----------- xen/arch/arm/kernel.h | 10 ++++++ 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 2d56130..7fb6268 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -65,13 +65,13 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) static void kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr = info->zimage.load_addr; + paddr_t paddr = info->zimage.kernel_addr; paddr_t len = info->zimage.len; - paddr_t flash = KERNEL_FLASH_ADDRESS; void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); unsigned long offs; - printk("Loading %"PRIpaddr" byte zImage from flash %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr": [", - len, flash, load_addr, load_addr + len); + printk("Loading zImage from %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr": [", + paddr, load_addr, load_addr + len); for ( offs = 0; offs < len; offs += PAGE_SIZE ) { paddr_t ma = gvirt_to_maddr(load_addr + offs); @@ -80,7 +80,7 @@ static void kernel_zimage_load(struct kernel_info *info) if ( ( offs % (1<<20) ) == 0 ) printk("."); - set_fixmap(FIXMAP_MISC, (flash+offs) >> PAGE_SHIFT, DEV_SHARED); + set_fixmap(FIXMAP_MISC, (paddr+offs) >> PAGE_SHIFT, DEV_SHARED); memcpy(dst, src, PAGE_SIZE); clear_fixmap(FIXMAP_MISC); @@ -92,30 +92,48 @@ static void kernel_zimage_load(struct kernel_info *info) /** * Check the image is a zImage and return the load address and length */ -static int kernel_try_zimage_prepare(struct kernel_info *info) +static int kernel_try_zimage_prepare(struct kernel_info *info, + paddr_t addr, paddr_t size) { uint32_t *zimage = (void *)FIXMAP_ADDR(FIXMAP_MISC); uint32_t start, end; struct minimal_dtb_header dtb_hdr; - set_fixmap(FIXMAP_MISC, KERNEL_FLASH_ADDRESS >> PAGE_SHIFT, DEV_SHARED); + set_fixmap(FIXMAP_MISC, addr >> PAGE_SHIFT, DEV_SHARED); + + zimage += addr & ~PAGE_MASK; if (zimage[ZIMAGE_MAGIC_OFFSET/4] != ZIMAGE_MAGIC) + { + clear_fixmap(FIXMAP_MISC); return -EINVAL; + } start = zimage[ZIMAGE_START_OFFSET/4]; end = zimage[ZIMAGE_END_OFFSET/4]; clear_fixmap(FIXMAP_MISC); + if ( end > addr + size ) + return -EINVAL; + /* * Check for an appended DTB. */ - copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr), DEV_SHARED); - if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { - end += be32_to_cpu(dtb_hdr.total_size); + if ( addr + end - start + sizeof(dtb_hdr) <= size ) + { + copy_from_paddr(&dtb_hdr, addr + end - start, + sizeof(dtb_hdr), DEV_SHARED); + if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { + end += be32_to_cpu(dtb_hdr.total_size); + + if ( end > addr + size ) + return -EINVAL; + } } + info->zimage.kernel_addr = addr; + /* * If start is zero, the zImage is position independent -- load it * at 32k from start of RAM. @@ -142,25 +160,26 @@ static void kernel_elf_load(struct kernel_info *info) free_xenheap_pages(info->kernel_img, info->kernel_order); } -static int kernel_try_elf_prepare(struct kernel_info *info) +static int kernel_try_elf_prepare(struct kernel_info *info, + paddr_t addr, paddr_t size) { int rc; - info->kernel_order = get_order_from_bytes(KERNEL_FLASH_SIZE); + info->kernel_order = get_order_from_bytes(size); info->kernel_img = alloc_xenheap_pages(info->kernel_order, 0); if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel.\n"); - copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE, DEV_SHARED); + copy_from_paddr(info->kernel_img, addr, size, DEV_SHARED); - if ( (rc = elf_init(&info->elf.elf, info->kernel_img, KERNEL_FLASH_SIZE )) != 0 ) - return rc; + if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) + goto err; #ifdef VERBOSE elf_set_verbose(&info->elf.elf); #endif elf_parse_binary(&info->elf.elf); if ( (rc = elf_xen_parse(&info->elf.elf, &info->elf.parms)) != 0 ) - return rc; + goto err; /* * TODO: can the ELF header be used to find the physical address @@ -170,15 +189,36 @@ static int kernel_try_elf_prepare(struct kernel_info *info) info->load = kernel_elf_load; return 0; +err: + free_xenheap_pages(info->kernel_img, info->kernel_order); + return rc; } int kernel_prepare(struct kernel_info *info) { int rc; - rc = kernel_try_zimage_prepare(info); + paddr_t start, size; + + if ( early_info.modules.nr_mods > 1 ) + panic("Cannot handle dom0 initrd yet\n"); + + if ( early_info.modules.nr_mods < 1 ) + { + printk("No boot modules found, trying flash\n"); + start = KERNEL_FLASH_ADDRESS; + size = KERNEL_FLASH_SIZE; + } + else + { + printk("Loading kernel from boot module 1\n"); + start = early_info.modules.module[1].start; + size = early_info.modules.module[1].size; + } + + rc = kernel_try_zimage_prepare(info, start, size); if (rc < 0) - rc = kernel_try_elf_prepare(info); + rc = kernel_try_elf_prepare(info, start, size); return rc; } diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index 4533568..2353e13 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -22,6 +22,7 @@ struct kernel_info { union { struct { + paddr_t kernel_addr; paddr_t load_addr; paddr_t len; } zimage; @@ -39,3 +40,12 @@ int kernel_prepare(struct kernel_info *info); void kernel_load(struct kernel_info *info); #endif /* #ifdef __ARCH_ARM_KERNEL_H__ */ + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:23:57 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:23:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHG-0004vm-RV; Tue, 13 Nov 2012 16:23:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHE-0004tH-WE for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:23:53 +0000 Received: from [85.158.139.83:43969] by server-14.bemta-5.messagelabs.com id A2/19-21768-81472A05; Tue, 13 Nov 2012 16:23:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-182.messagelabs.com!1352823829!29549126!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20228 invoked from network); 13 Nov 2012 16:23:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:50 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="44437590" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:26 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:23:26 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-DR; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:21 +0000 Message-ID: <1352823804-28482-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 09/12] arm: load dom0 kernel from first boot module X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Signed-off-by: Ian Campbell --- xen/arch/arm/kernel.c | 74 +++++++++++++++++++++++++++++++++++++----------- xen/arch/arm/kernel.h | 10 ++++++ 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 2d56130..7fb6268 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -65,13 +65,13 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) static void kernel_zimage_load(struct kernel_info *info) { paddr_t load_addr = info->zimage.load_addr; + paddr_t paddr = info->zimage.kernel_addr; paddr_t len = info->zimage.len; - paddr_t flash = KERNEL_FLASH_ADDRESS; void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC); unsigned long offs; - printk("Loading %"PRIpaddr" byte zImage from flash %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr": [", - len, flash, load_addr, load_addr + len); + printk("Loading zImage from %"PRIpaddr" to %"PRIpaddr"-%"PRIpaddr": [", + paddr, load_addr, load_addr + len); for ( offs = 0; offs < len; offs += PAGE_SIZE ) { paddr_t ma = gvirt_to_maddr(load_addr + offs); @@ -80,7 +80,7 @@ static void kernel_zimage_load(struct kernel_info *info) if ( ( offs % (1<<20) ) == 0 ) printk("."); - set_fixmap(FIXMAP_MISC, (flash+offs) >> PAGE_SHIFT, DEV_SHARED); + set_fixmap(FIXMAP_MISC, (paddr+offs) >> PAGE_SHIFT, DEV_SHARED); memcpy(dst, src, PAGE_SIZE); clear_fixmap(FIXMAP_MISC); @@ -92,30 +92,48 @@ static void kernel_zimage_load(struct kernel_info *info) /** * Check the image is a zImage and return the load address and length */ -static int kernel_try_zimage_prepare(struct kernel_info *info) +static int kernel_try_zimage_prepare(struct kernel_info *info, + paddr_t addr, paddr_t size) { uint32_t *zimage = (void *)FIXMAP_ADDR(FIXMAP_MISC); uint32_t start, end; struct minimal_dtb_header dtb_hdr; - set_fixmap(FIXMAP_MISC, KERNEL_FLASH_ADDRESS >> PAGE_SHIFT, DEV_SHARED); + set_fixmap(FIXMAP_MISC, addr >> PAGE_SHIFT, DEV_SHARED); + + zimage += addr & ~PAGE_MASK; if (zimage[ZIMAGE_MAGIC_OFFSET/4] != ZIMAGE_MAGIC) + { + clear_fixmap(FIXMAP_MISC); return -EINVAL; + } start = zimage[ZIMAGE_START_OFFSET/4]; end = zimage[ZIMAGE_END_OFFSET/4]; clear_fixmap(FIXMAP_MISC); + if ( end > addr + size ) + return -EINVAL; + /* * Check for an appended DTB. */ - copy_from_paddr(&dtb_hdr, KERNEL_FLASH_ADDRESS + end - start, sizeof(dtb_hdr), DEV_SHARED); - if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { - end += be32_to_cpu(dtb_hdr.total_size); + if ( addr + end - start + sizeof(dtb_hdr) <= size ) + { + copy_from_paddr(&dtb_hdr, addr + end - start, + sizeof(dtb_hdr), DEV_SHARED); + if (be32_to_cpu(dtb_hdr.magic) == DTB_MAGIC) { + end += be32_to_cpu(dtb_hdr.total_size); + + if ( end > addr + size ) + return -EINVAL; + } } + info->zimage.kernel_addr = addr; + /* * If start is zero, the zImage is position independent -- load it * at 32k from start of RAM. @@ -142,25 +160,26 @@ static void kernel_elf_load(struct kernel_info *info) free_xenheap_pages(info->kernel_img, info->kernel_order); } -static int kernel_try_elf_prepare(struct kernel_info *info) +static int kernel_try_elf_prepare(struct kernel_info *info, + paddr_t addr, paddr_t size) { int rc; - info->kernel_order = get_order_from_bytes(KERNEL_FLASH_SIZE); + info->kernel_order = get_order_from_bytes(size); info->kernel_img = alloc_xenheap_pages(info->kernel_order, 0); if ( info->kernel_img == NULL ) panic("Cannot allocate temporary buffer for kernel.\n"); - copy_from_paddr(info->kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE, DEV_SHARED); + copy_from_paddr(info->kernel_img, addr, size, DEV_SHARED); - if ( (rc = elf_init(&info->elf.elf, info->kernel_img, KERNEL_FLASH_SIZE )) != 0 ) - return rc; + if ( (rc = elf_init(&info->elf.elf, info->kernel_img, size )) != 0 ) + goto err; #ifdef VERBOSE elf_set_verbose(&info->elf.elf); #endif elf_parse_binary(&info->elf.elf); if ( (rc = elf_xen_parse(&info->elf.elf, &info->elf.parms)) != 0 ) - return rc; + goto err; /* * TODO: can the ELF header be used to find the physical address @@ -170,15 +189,36 @@ static int kernel_try_elf_prepare(struct kernel_info *info) info->load = kernel_elf_load; return 0; +err: + free_xenheap_pages(info->kernel_img, info->kernel_order); + return rc; } int kernel_prepare(struct kernel_info *info) { int rc; - rc = kernel_try_zimage_prepare(info); + paddr_t start, size; + + if ( early_info.modules.nr_mods > 1 ) + panic("Cannot handle dom0 initrd yet\n"); + + if ( early_info.modules.nr_mods < 1 ) + { + printk("No boot modules found, trying flash\n"); + start = KERNEL_FLASH_ADDRESS; + size = KERNEL_FLASH_SIZE; + } + else + { + printk("Loading kernel from boot module 1\n"); + start = early_info.modules.module[1].start; + size = early_info.modules.module[1].size; + } + + rc = kernel_try_zimage_prepare(info, start, size); if (rc < 0) - rc = kernel_try_elf_prepare(info); + rc = kernel_try_elf_prepare(info, start, size); return rc; } diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h index 4533568..2353e13 100644 --- a/xen/arch/arm/kernel.h +++ b/xen/arch/arm/kernel.h @@ -22,6 +22,7 @@ struct kernel_info { union { struct { + paddr_t kernel_addr; paddr_t load_addr; paddr_t len; } zimage; @@ -39,3 +40,12 @@ int kernel_prepare(struct kernel_info *info); void kernel_load(struct kernel_info *info); #endif /* #ifdef __ARCH_ARM_KERNEL_H__ */ + +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:24:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHO-00055N-8i; Tue, 13 Nov 2012 16:24:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHM-00052h-7B for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:24:00 +0000 Received: from [85.158.143.35:13020] by server-2.bemta-4.messagelabs.com id 37/DC-28922-F1472A05; Tue, 13 Nov 2012 16:23:59 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352823839!10193639!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9805 invoked from network); 13 Nov 2012 16:23:59 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784285" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:58 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:58 +0000 Message-ID: <50A2741D.70401@citrix.com> Date: Tue, 13 Nov 2012 17:23:57 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <1352734432.27833.280.camel@zakaz.uk.xensource.com> In-Reply-To: <1352734432.27833.280.camel@zakaz.uk.xensource.com> Cc: "port-xen@netbsd.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 12/11/12 16:33, Ian Campbell wrote: > On Sun, 2012-11-04 at 22:23 +0000, Roger Pau Monne wrote: >> @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) >> else >> sc->sc_cache_flush = 0; >> >> + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, >> + "feature-persistent", &feature_persistent, 10); >> + if (err) >> + feature_persistent = 0; >> + if (feature_persistent > 0) >> + sc->sc_persistent_grants = 1; >> + else >> + sc->sc_persistent_grants = 0; > > I can't find anywhere which reads sc->sc_persistent_grants? I've added this to be used for debugging mainly, but I think we should probably print it, to know if the backend supports persistent grants or not (like the Linux kernel does). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:24:04 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHO-00055N-8i; Tue, 13 Nov 2012 16:24:02 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHM-00052h-7B for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:24:00 +0000 Received: from [85.158.143.35:13020] by server-2.bemta-4.messagelabs.com id 37/DC-28922-F1472A05; Tue, 13 Nov 2012 16:23:59 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1352823839!10193639!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9805 invoked from network); 13 Nov 2012 16:23:59 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:23:59 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784285" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:23:58 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:23:58 +0000 Message-ID: <50A2741D.70401@citrix.com> Date: Tue, 13 Nov 2012 17:23:57 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <1352734432.27833.280.camel@zakaz.uk.xensource.com> In-Reply-To: <1352734432.27833.280.camel@zakaz.uk.xensource.com> Cc: "port-xen@netbsd.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 12/11/12 16:33, Ian Campbell wrote: > On Sun, 2012-11-04 at 22:23 +0000, Roger Pau Monne wrote: >> @@ -652,6 +686,15 @@ xbd_connect(struct xbd_xenbus_softc *sc) >> else >> sc->sc_cache_flush = 0; >> >> + err = xenbus_read_ul(NULL, sc->sc_xbusd->xbusd_otherend, >> + "feature-persistent", &feature_persistent, 10); >> + if (err) >> + feature_persistent = 0; >> + if (feature_persistent > 0) >> + sc->sc_persistent_grants = 1; >> + else >> + sc->sc_persistent_grants = 0; > > I can't find anywhere which reads sc->sc_persistent_grants? I've added this to be used for debugging mainly, but I think we should probably print it, to know if the backend supports persistent grants or not (like the Linux kernel does). _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:24:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHa-0005Gz-LV; Tue, 13 Nov 2012 16:24:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHZ-0005Eq-16 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:24:13 +0000 Received: from [85.158.143.99:15137] by server-1.bemta-4.messagelabs.com id 47/A0-27934-C2472A05; Tue, 13 Nov 2012 16:24:12 +0000 X-Env-Sender: dgdegra@tycho.nsa.gov X-Msg-Ref: server-2.tower-216.messagelabs.com!1352823851!24473487!1 X-Originating-IP: [63.239.67.9] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8016 invoked from network); 13 Nov 2012 16:24:11 -0000 Received: from emvm-gh1-uea08.nsa.gov (HELO nsa.gov) (63.239.67.9) by server-2.tower-216.messagelabs.com with SMTP; 13 Nov 2012 16:24:11 -0000 X-TM-IMSS-Message-ID: <793fee0800080fc5@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.3.1]) by nsa.gov ([63.239.67.9]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 DHE-RSA-AES256-SHA (256/256)) id 793fee0800080fc5 ; Tue, 13 Nov 2012 11:23:46 -0500 Received: from moss-nexus.epoch.ncsc.mil (moss-nexus [144.51.25.48]) by tarius.tycho.ncsc.mil (8.13.1/8.13.1) with ESMTP id qADGO3YY008576; Tue, 13 Nov 2012 11:24:03 -0500 Message-ID: <50A27423.6040104@tycho.nsa.gov> Date: Tue, 13 Nov 2012 11:24:03 -0500 From: Daniel De Graaf Organization: National Security Agency User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: D Sundstrom References: In-Reply-To: Cc: Pablo Llopis , xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/12/2012 08:15 AM, D Sundstrom wrote: > Thank you Pablo. > > It makes no difference if I run both the src-add and map from the same > domain or from different DomU domains. > Whichever DomU I run the map function in crashes immediately. Mapping your own grants (which is what the test run you showed did) might cause problems - although it's a bug that needs to be fixed, if so. You may want to try using the vchan-node2 tool (tools/libvchan) for testing and as an example user. > You mention Dom0. I just want to be clear that I'd like to share > between two DomU domains. Have you gotten this to work? That was the goal of gntalloc/libvchan - it should work (and has for me). > I also tried the userspace APIs provided by Xen such as > xc_gnttab_map_grant_ref() and these also crash. Of course, these use > the same driver IOCTLs, so this isn't a surprise. > > I'll need to see if I can get some debug info from the DomU kernel to > make progress. You might want to try booting your domU with console=hvc0 and look at xl console - that will usually give you useful backtraces. Without that, it's rather difficult to tell what the problem is. > If I can get this to work, are there any restrictions on sharing large > amounts of memory? Say 160Mb? Or are grant tables intended for a > small number of pages? There are restrictions within the modules (default is 1024 4K pages), and in Xen itself for the number of grant table and maptrack pages - but I think those can be adjusted via a boot parameter. The grant tables aren't currently intended to share large amounts of memory, so you may run in to some inefficiencies when doing the map/unmap. If you're using an IOMMU for one of the domUs, this may end up being especially costly. > Thanks, > David > > > > On Mon, Nov 12, 2012 at 5:36 AM, Pablo Llopis wrote: >> >> It is not clear from your output from which domain you are running >> each command. It looks like you are trying to issue a grant and map it >> from within the same domain. That's probably the reason it crashes. >> You are supposed to run this tool from both domains, running the calls >> which interface with gntalloc from one domain, and the calls which >> interface with gntdev from the other domain. >> In any case, the domid you have to specify in the map must be the >> domid of the domain which issued the grant. In other words, when >> creating a grant, the domid which is granted access is specified. When >> mapping a grant, the domid which issued the grant is specified. (i.e. >> If you did "src-add 8" from dom0 you should run map 0 1372 from domU >> 8) >> >>> > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > -- Daniel De Graaf National Security Agency _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:24:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:24:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHa-0005Gz-LV; Tue, 13 Nov 2012 16:24:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJHZ-0005Eq-16 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:24:13 +0000 Received: from [85.158.143.99:15137] by server-1.bemta-4.messagelabs.com id 47/A0-27934-C2472A05; Tue, 13 Nov 2012 16:24:12 +0000 X-Env-Sender: dgdegra@tycho.nsa.gov X-Msg-Ref: server-2.tower-216.messagelabs.com!1352823851!24473487!1 X-Originating-IP: [63.239.67.9] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8016 invoked from network); 13 Nov 2012 16:24:11 -0000 Received: from emvm-gh1-uea08.nsa.gov (HELO nsa.gov) (63.239.67.9) by server-2.tower-216.messagelabs.com with SMTP; 13 Nov 2012 16:24:11 -0000 X-TM-IMSS-Message-ID: <793fee0800080fc5@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.3.1]) by nsa.gov ([63.239.67.9]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 DHE-RSA-AES256-SHA (256/256)) id 793fee0800080fc5 ; Tue, 13 Nov 2012 11:23:46 -0500 Received: from moss-nexus.epoch.ncsc.mil (moss-nexus [144.51.25.48]) by tarius.tycho.ncsc.mil (8.13.1/8.13.1) with ESMTP id qADGO3YY008576; Tue, 13 Nov 2012 11:24:03 -0500 Message-ID: <50A27423.6040104@tycho.nsa.gov> Date: Tue, 13 Nov 2012 11:24:03 -0500 From: Daniel De Graaf Organization: National Security Agency User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121029 Thunderbird/16.0.2 MIME-Version: 1.0 To: D Sundstrom References: In-Reply-To: Cc: Pablo Llopis , xen-devel@lists.xen.org Subject: Re: [Xen-devel] Immediate kernel panic using gntdev device X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 11/12/2012 08:15 AM, D Sundstrom wrote: > Thank you Pablo. > > It makes no difference if I run both the src-add and map from the same > domain or from different DomU domains. > Whichever DomU I run the map function in crashes immediately. Mapping your own grants (which is what the test run you showed did) might cause problems - although it's a bug that needs to be fixed, if so. You may want to try using the vchan-node2 tool (tools/libvchan) for testing and as an example user. > You mention Dom0. I just want to be clear that I'd like to share > between two DomU domains. Have you gotten this to work? That was the goal of gntalloc/libvchan - it should work (and has for me). > I also tried the userspace APIs provided by Xen such as > xc_gnttab_map_grant_ref() and these also crash. Of course, these use > the same driver IOCTLs, so this isn't a surprise. > > I'll need to see if I can get some debug info from the DomU kernel to > make progress. You might want to try booting your domU with console=hvc0 and look at xl console - that will usually give you useful backtraces. Without that, it's rather difficult to tell what the problem is. > If I can get this to work, are there any restrictions on sharing large > amounts of memory? Say 160Mb? Or are grant tables intended for a > small number of pages? There are restrictions within the modules (default is 1024 4K pages), and in Xen itself for the number of grant table and maptrack pages - but I think those can be adjusted via a boot parameter. The grant tables aren't currently intended to share large amounts of memory, so you may run in to some inefficiencies when doing the map/unmap. If you're using an IOMMU for one of the domUs, this may end up being especially costly. > Thanks, > David > > > > On Mon, Nov 12, 2012 at 5:36 AM, Pablo Llopis wrote: >> >> It is not clear from your output from which domain you are running >> each command. It looks like you are trying to issue a grant and map it >> from within the same domain. That's probably the reason it crashes. >> You are supposed to run this tool from both domains, running the calls >> which interface with gntalloc from one domain, and the calls which >> interface with gntdev from the other domain. >> In any case, the domid you have to specify in the map must be the >> domid of the domain which issued the grant. In other words, when >> creating a grant, the domid which is granted access is specified. When >> mapping a grant, the domid which issued the grant is specified. (i.e. >> If you did "src-add 8" from dom0 you should run map 0 1372 from domU >> 8) >> >>> > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > -- Daniel De Graaf National Security Agency _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:25:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:25:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJIh-0005s6-BD; Tue, 13 Nov 2012 16:25:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJIf-0005rJ-MA for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:25:21 +0000 Received: from [85.158.143.99:60813] by server-2.bemta-4.messagelabs.com id 98/BE-28922-17472A05; Tue, 13 Nov 2012 16:25:21 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352823919!24505294!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32159 invoked from network); 13 Nov 2012 16:25:20 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:25:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784332" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:25:19 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:25:19 +0000 Message-ID: <1352823918.7491.96.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Ian Jackson Date: Tue, 13 Nov 2012 16:25:18 +0000 In-Reply-To: <20642.29568.426761.422604@mariner.uk.xensource.com> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> <20121113132735.GD7561@jajo.eggsoft> <20642.29568.426761.422604@mariner.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Jacek Konieczny Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 16:21 +0000, Ian Jackson wrote: > Jacek Konieczny writes ("Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh"): > > fcntl(3, F_GETFL) = 0x8401 (flags O_WRONLY|O_APPEND|O_LARGEFILE) > > So it seems perl is going out of its way to spot this earlier. > That explains the mystery. Looking at glibc it seems like it has had this test since the mid-nineties, so quite why we aren't seeing it elsewhere I can't explain (maybe bash buggily opens the fd RDWR?) > Anyway the patch is fine. > > Acked-by: Ian Jackson Yes, irrespective of why this patch does seem to be correct: Acked-by: Ian Campbell _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:25:26 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:25:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJIh-0005s6-BD; Tue, 13 Nov 2012 16:25:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJIf-0005rJ-MA for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 16:25:21 +0000 Received: from [85.158.143.99:60813] by server-2.bemta-4.messagelabs.com id 98/BE-28922-17472A05; Tue, 13 Nov 2012 16:25:21 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352823919!24505294!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32159 invoked from network); 13 Nov 2012 16:25:20 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:25:20 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784332" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:25:19 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:25:19 +0000 Message-ID: <1352823918.7491.96.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Ian Jackson Date: Tue, 13 Nov 2012 16:25:18 +0000 In-Reply-To: <20642.29568.426761.422604@mariner.uk.xensource.com> References: <1352469371-15457-1-git-send-email-jajcus@jajcus.net> <1352738557.27833.302.camel@zakaz.uk.xensource.com> <20121112180738.GA26672@aepfle.de> <20121112183457.GB2114@lolek.nigdzie> <20121112184047.GA28988@aepfle.de> <1352804909.7491.55.camel@zakaz.uk.xensource.com> <20121113132735.GD7561@jajo.eggsoft> <20642.29568.426761.422604@mariner.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: Olaf Hering , "xen-devel@lists.xensource.com" , Jacek Konieczny Subject: Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 16:21 +0000, Ian Jackson wrote: > Jacek Konieczny writes ("Re: [Xen-devel] [PATCH] Fix locking in tools/hotplug/Linux/locking.sh"): > > fcntl(3, F_GETFL) = 0x8401 (flags O_WRONLY|O_APPEND|O_LARGEFILE) > > So it seems perl is going out of its way to spot this earlier. > That explains the mystery. Looking at glibc it seems like it has had this test since the mid-nineties, so quite why we aren't seeing it elsewhere I can't explain (maybe bash buggily opens the fd RDWR?) > Anyway the patch is fine. > > Acked-by: Ian Jackson Yes, irrespective of why this patch does seem to be correct: Acked-by: Ian Campbell _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:39:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:39:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJVm-0007Fl-Oi; Tue, 13 Nov 2012 16:38:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJVl-0007Fg-8m for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:38:53 +0000 Received: from [85.158.137.99:8866] by server-1.bemta-3.messagelabs.com id 3A/B9-12169-C9772A05; Tue, 13 Nov 2012 16:38:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352824731!13816429!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32525 invoked from network); 13 Nov 2012 16:38:51 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:38:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784683" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:38:46 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:38:45 +0000 Message-ID: <1352824724.7491.103.camel@zakaz.uk.xensource.com> From: Ian Campbell To: xen-devel Date: Tue, 13 Nov 2012 16:38:44 +0000 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 16:22 +0000, Ian Campbell wrote: > I will post a patch against the boot-wrapper which implements the > "bootloader" side of this protocol shortly. See http://xenbits.xen.org/gitweb/?p=people/ianc/boot-wrapper.git;a=summary Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:39:07 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:39:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJVm-0007Fl-Oi; Tue, 13 Nov 2012 16:38:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJVl-0007Fg-8m for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:38:53 +0000 Received: from [85.158.137.99:8866] by server-1.bemta-3.messagelabs.com id 3A/B9-12169-C9772A05; Tue, 13 Nov 2012 16:38:52 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352824731!13816429!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32525 invoked from network); 13 Nov 2012 16:38:51 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:38:51 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15784683" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:38:46 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:38:45 +0000 Message-ID: <1352824724.7491.103.camel@zakaz.uk.xensource.com> From: Ian Campbell To: xen-devel Date: Tue, 13 Nov 2012 16:38:44 +0000 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH V2 00/12] arm: support for initial modules (e.g. dom0) and DTB supplied in RAM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 2012-11-13 at 16:22 +0000, Ian Campbell wrote: > I will post a patch against the boot-wrapper which implements the > "bootloader" side of this protocol shortly. See http://xenbits.xen.org/gitweb/?p=people/ianc/boot-wrapper.git;a=summary Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:50:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:50:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJgZ-0007g3-Ut; Tue, 13 Nov 2012 16:50:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJgZ-0007fy-02 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:50:03 +0000 Received: from [85.158.143.35:10464] by server-1.bemta-4.messagelabs.com id 66/85-27934-93A72A05; Tue, 13 Nov 2012 16:50:01 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1352825400!4692824!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13413 invoked from network); 13 Nov 2012 16:50:01 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:50:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15785078" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:50:00 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:50:00 +0000 Message-ID: <50A27A37.2090506@citrix.com> Date: Tue, 13 Nov 2012 17:49:59 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352363172.12977.87.camel@hastur.hellion.org.uk> <509D22E6.2090005@citrix.com> In-Reply-To: <509D22E6.2090005@citrix.com> Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 09/11/12 16:36, Roger Pau Monn=E9 wrote: > On 08/11/12 09:26, Ian Campbell wrote: >> On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: >>> Hi, >>> >>> I'm using a custom block script in my xen setup and when started, it >>> creates a new device node pointing to some network resources. >>> >>> Now I noticed that the script is called twice for the root block, the >>> first time for pygrub most likely, but is only stopped once ... I >>> don't mind creating two devices node, but then I need to destroy both >>> ... >>> >>> Is this a known issue ? >> >> Not one I've heard. Running "xl -vvv create" might provide some logs >> which give an idea what is going on, likewise the logging >> in /var/log/xen/... >> >> Roger -- any ideas? > = > Yes, I've been able to reproduce the error when using stubdoms, I'm > currently working on a fix. Have you seen this when using stubdomains > Sylvain? I've been thinking about this, and I think it's the right thing to do to call hotplug scripts twice when using stubdomains. Each script gets called for the corresponding PV interface of each guest. Here is a stripped trace of the creation of a guest with a stubdomain: [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/block add [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/block add [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/vif-bridge online [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/vif-bridge online [...] And the destruction: [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/block remove [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/vif-bridge offline [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/block remove [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/vif-bridge offline [...] So hotplug script gets called twice for both creation and destruction. Can you run a guest creation/destruction with -vvv and provide the output? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:50:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:50:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJgZ-0007g3-Ut; Tue, 13 Nov 2012 16:50:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJgZ-0007fy-02 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:50:03 +0000 Received: from [85.158.143.35:10464] by server-1.bemta-4.messagelabs.com id 66/85-27934-93A72A05; Tue, 13 Nov 2012 16:50:01 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1352825400!4692824!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13413 invoked from network); 13 Nov 2012 16:50:01 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:50:01 -0000 X-IronPort-AV: E=Sophos;i="4.80,767,1344211200"; d="scan'208";a="15785078" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:50:00 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 16:50:00 +0000 Message-ID: <50A27A37.2090506@citrix.com> Date: Tue, 13 Nov 2012 17:49:59 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Ian Campbell References: <1352363172.12977.87.camel@hastur.hellion.org.uk> <509D22E6.2090005@citrix.com> In-Reply-To: <509D22E6.2090005@citrix.com> Cc: Sylvain Munaut , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] Custom block script started twice for root block but only stopped once X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 09/11/12 16:36, Roger Pau Monn=E9 wrote: > On 08/11/12 09:26, Ian Campbell wrote: >> On Fri, 2012-11-02 at 10:37 +0000, Sylvain Munaut wrote: >>> Hi, >>> >>> I'm using a custom block script in my xen setup and when started, it >>> creates a new device node pointing to some network resources. >>> >>> Now I noticed that the script is called twice for the root block, the >>> first time for pygrub most likely, but is only stopped once ... I >>> don't mind creating two devices node, but then I need to destroy both >>> ... >>> >>> Is this a known issue ? >> >> Not one I've heard. Running "xl -vvv create" might provide some logs >> which give an idea what is going on, likewise the logging >> in /var/log/xen/... >> >> Roger -- any ideas? > = > Yes, I've been able to reproduce the error when using stubdoms, I'm > currently working on a fix. Have you seen this when using stubdomains > Sylvain? I've been thinking about this, and I think it's the right thing to do to call hotplug scripts twice when using stubdomains. Each script gets called for the corresponding PV interface of each guest. Here is a stripped trace of the creation of a guest with a stubdomain: [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/block add [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/block add [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/vif-bridge online [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/vif-bridge online [...] And the destruction: [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/block remove [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 47 - calling h= otplug script: /etc/xen/scripts/vif-bridge offline [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/block remove [...] libxl: debug: libxl_device.c:919:device_hotplug: for-domain: 46 - calling h= otplug script: /etc/xen/scripts/vif-bridge offline [...] So hotplug script gets called twice for both creation and destruction. Can you run a guest creation/destruction with -vvv and provide the output? _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:53:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:53:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjh-0007yH-Iw; Tue, 13 Nov 2012 16:53:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjg-0007y8-1M for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:53:16 +0000 Received: from [85.158.143.35:22620] by server-1.bemta-4.messagelabs.com id 34/0A-27934-BFA72A05; Tue, 13 Nov 2012 16:53:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352825581!13435561!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12281 invoked from network); 13 Nov 2012 16:53:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:53:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="44442777" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:53:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:53:00 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-IP; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: Date: Tue, 13 Nov 2012 16:23:24 +0000 Message-ID: <1352823804-28482-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell , Ian Campbell Subject: [Xen-devel] [PATCH 12/12] xen: strip /chosen/module@/* from dom0 device tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org These nodes are used by Xen to find the initial modules. Only drop the "xen,multiboot-module" compatible nodes in case someone else has a similar idea. Signed-off-by: Ian Campbell --- xen/arch/arm/domain_build.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7a964f7..d2158d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -179,6 +179,7 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, int depth = 0, last_depth = -1; u32 address_cells[DEVICE_TREE_MAX_DEPTH]; u32 size_cells[DEVICE_TREE_MAX_DEPTH]; + int parents[DEVICE_TREE_MAX_DEPTH]; int ret; for ( node = 0, depth = 0; @@ -196,10 +197,25 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, } while ( last_depth-- >= depth ) + { + parents[last_depth+1] = -1; fdt_end_node(kinfo->fdt); + } address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + parents[depth] = node; + + /* Skip /chosen/module@/ nodes */ + if ( depth == 2 && + device_tree_node_matches(fdt, parents[1], "chosen") && + device_tree_node_matches(fdt, node, "module") && + fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) == 0 ) + { + last_depth = depth - 1; + continue; + } fdt_begin_node(kinfo->fdt, name); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:53:31 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:53:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjh-0007yH-Iw; Tue, 13 Nov 2012 16:53:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjg-0007y8-1M for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:53:16 +0000 Received: from [85.158.143.35:22620] by server-1.bemta-4.messagelabs.com id 34/0A-27934-BFA72A05; Tue, 13 Nov 2012 16:53:15 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352825581!13435561!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12281 invoked from network); 13 Nov 2012 16:53:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:53:03 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="44442777" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:53:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:53:00 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-IP; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: Date: Tue, 13 Nov 2012 16:23:24 +0000 Message-ID: <1352823804-28482-12-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell , Ian Campbell Subject: [Xen-devel] [PATCH 12/12] xen: strip /chosen/module@/* from dom0 device tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org These nodes are used by Xen to find the initial modules. Only drop the "xen,multiboot-module" compatible nodes in case someone else has a similar idea. Signed-off-by: Ian Campbell --- xen/arch/arm/domain_build.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 7a964f7..d2158d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -179,6 +179,7 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, int depth = 0, last_depth = -1; u32 address_cells[DEVICE_TREE_MAX_DEPTH]; u32 size_cells[DEVICE_TREE_MAX_DEPTH]; + int parents[DEVICE_TREE_MAX_DEPTH]; int ret; for ( node = 0, depth = 0; @@ -196,10 +197,25 @@ static int write_nodes(struct domain *d, struct kernel_info *kinfo, } while ( last_depth-- >= depth ) + { + parents[last_depth+1] = -1; fdt_end_node(kinfo->fdt); + } address_cells[depth] = device_tree_get_u32(fdt, node, "#address-cells"); size_cells[depth] = device_tree_get_u32(fdt, node, "#size-cells"); + parents[depth] = node; + + /* Skip /chosen/module@/ nodes */ + if ( depth == 2 && + device_tree_node_matches(fdt, parents[1], "chosen") && + device_tree_node_matches(fdt, node, "module") && + fdt_node_check_compatible(fdt, node, + "xen,multiboot-module" ) == 0 ) + { + last_depth = depth - 1; + continue; + } fdt_begin_node(kinfo->fdt, name); -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:53:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:53:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjo-0007z1-VN; Tue, 13 Nov 2012 16:53:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjn-0007yl-6D for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:53:23 +0000 Received: from [85.158.143.35:23078] by server-2.bemta-4.messagelabs.com id 46/A5-28922-20B72A05; Tue, 13 Nov 2012 16:53:22 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352825581!13435561!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 13 Nov 2012 16:53:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:53:07 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="44442781" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:53:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:53:01 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-Fs; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:23 +0000 Message-ID: <1352823804-28482-11-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 11/12] arm: use /chosen/module@1/bootargs for domain 0 command line X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Fallback to xen,dom0-bootargs if this isn't present. Ideally this would use module1-args iff the kernel came from module@1/{start,end} and the existing xen,dom0-bootargs if the kernel came from flash, but this approach is simpler and has the same effect in practice. Signed-off-by: Ian Campbell --- v2: update for new DT layout --- xen/arch/arm/domain_build.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e96ed10..7a964f7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -86,8 +86,13 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int node, const char *name, int depth, u32 address_cells, u32 size_cells) { + const char *bootargs = NULL; int prop; + if ( early_info.modules.nr_mods >= 1 && + early_info.modules.module[1].cmdline[0] ) + bootargs = &early_info.modules.module[1].cmdline[0]; + for ( prop = fdt_first_property_offset(fdt, node); prop >= 0; prop = fdt_next_property_offset(fdt, prop) ) @@ -104,15 +109,22 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, prop_len = fdt32_to_cpu(p->len); /* - * In chosen node: replace bootargs with value from - * xen,dom0-bootargs. + * In chosen node: + * + * * remember xen,dom0-bootargs if we don't already have + * bootargs (from module #1, above). + * * remove bootargs and xen,dom0-bootargs. */ if ( device_tree_node_matches(fdt, node, "chosen") ) { if ( strcmp(prop_name, "bootargs") == 0 ) continue; - if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) - prop_name = "bootargs"; + else if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) + { + if ( !bootargs ) + bootargs = prop_data; + continue; + } } /* * In a memory node: adjust reg property. @@ -147,6 +159,14 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, xfree(new_data); } + if ( device_tree_node_matches(fdt, node, "chosen") && bootargs ) + fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs)); + + /* + * XXX should populate /chosen/linux,initrd-{start,end} here if we + * have module[2] + */ + if ( prop == -FDT_ERR_NOTFOUND ) return 0; return prop; -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 16:53:34 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 16:53:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjo-0007z1-VN; Tue, 13 Nov 2012 16:53:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYJjn-0007yl-6D for xen-devel@lists.xen.org; Tue, 13 Nov 2012 16:53:23 +0000 Received: from [85.158.143.35:23078] by server-2.bemta-4.messagelabs.com id 46/A5-28922-20B72A05; Tue, 13 Nov 2012 16:53:22 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1352825581!13435561!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAxODMxNzc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 13 Nov 2012 16:53:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 16:53:07 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="44442781" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 16:53:01 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 11:53:01 -0500 Received: from [10.80.246.74] (helo=army.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1TYJGn-0000Qd-Fs; Tue, 13 Nov 2012 16:23:25 +0000 From: Ian Campbell To: xen-devel@lists.xen.org Date: Tue, 13 Nov 2012 16:23:23 +0000 Message-ID: <1352823804-28482-11-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1352823779.7491.94.camel@zakaz.uk.xensource.com> References: <1352823779.7491.94.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Cc: Ian Campbell Subject: [Xen-devel] [PATCH 11/12] arm: use /chosen/module@1/bootargs for domain 0 command line X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Fallback to xen,dom0-bootargs if this isn't present. Ideally this would use module1-args iff the kernel came from module@1/{start,end} and the existing xen,dom0-bootargs if the kernel came from flash, but this approach is simpler and has the same effect in practice. Signed-off-by: Ian Campbell --- v2: update for new DT layout --- xen/arch/arm/domain_build.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e96ed10..7a964f7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -86,8 +86,13 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, int node, const char *name, int depth, u32 address_cells, u32 size_cells) { + const char *bootargs = NULL; int prop; + if ( early_info.modules.nr_mods >= 1 && + early_info.modules.module[1].cmdline[0] ) + bootargs = &early_info.modules.module[1].cmdline[0]; + for ( prop = fdt_first_property_offset(fdt, node); prop >= 0; prop = fdt_next_property_offset(fdt, prop) ) @@ -104,15 +109,22 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, prop_len = fdt32_to_cpu(p->len); /* - * In chosen node: replace bootargs with value from - * xen,dom0-bootargs. + * In chosen node: + * + * * remember xen,dom0-bootargs if we don't already have + * bootargs (from module #1, above). + * * remove bootargs and xen,dom0-bootargs. */ if ( device_tree_node_matches(fdt, node, "chosen") ) { if ( strcmp(prop_name, "bootargs") == 0 ) continue; - if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) - prop_name = "bootargs"; + else if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 ) + { + if ( !bootargs ) + bootargs = prop_data; + continue; + } } /* * In a memory node: adjust reg property. @@ -147,6 +159,14 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, xfree(new_data); } + if ( device_tree_node_matches(fdt, node, "chosen") && bootargs ) + fdt_property(kinfo->fdt, "bootargs", bootargs, strlen(bootargs)); + + /* + * XXX should populate /chosen/linux,initrd-{start,end} here if we + * have module[2] + */ + if ( prop == -FDT_ERR_NOTFOUND ) return 0; return prop; -- 1.7.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 17:14:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 17:14:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK43-0000vA-Dw; Tue, 13 Nov 2012 17:14:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK42-0000v0-1G for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 17:14:18 +0000 Received: from [85.158.139.83:27991] by server-1.bemta-5.messagelabs.com id DF/1A-05877-9EF72A05; Tue, 13 Nov 2012 17:14:17 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352826854!30096260!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13283 invoked from network); 13 Nov 2012 17:14:14 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 17:14:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15785820" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 17:14:11 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 17:14:10 +0000 Message-ID: <50A27FE2.1020201@citrix.com> Date: Tue, 13 Nov 2012 18:14:10 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Mukesh Rathor References: <20121112190934.5e702799@mantra.us.oracle.com> In-Reply-To: <20121112190934.5e702799@mantra.us.oracle.com> Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 04:09, Mukesh Rathor wrote: > Hi, > > I am wondering if there's libxl expert who can help me make some PVH > related changes to libxl, pref in the US time zone. I could consult on > irc or the phone. I wouldn't consider myself a libxl expert, but I've been working with it for some time (specially in the devices section) so if you need help I would like to give you a hand, (I'm in the EU timezone, GMT+1). > I find the libxl code hard to read, and don't > want to spend lot of time figuring it out if someone can just help > quickly. > > thanks, > Mukesh > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 17:14:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 17:14:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK43-0000vA-Dw; Tue, 13 Nov 2012 17:14:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK42-0000v0-1G for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 17:14:18 +0000 Received: from [85.158.139.83:27991] by server-1.bemta-5.messagelabs.com id DF/1A-05877-9EF72A05; Tue, 13 Nov 2012 17:14:17 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-2.tower-182.messagelabs.com!1352826854!30096260!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13283 invoked from network); 13 Nov 2012 17:14:14 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 17:14:14 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15785820" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 17:14:11 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 17:14:10 +0000 Message-ID: <50A27FE2.1020201@citrix.com> Date: Tue, 13 Nov 2012 18:14:10 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Mukesh Rathor References: <20121112190934.5e702799@mantra.us.oracle.com> In-Reply-To: <20121112190934.5e702799@mantra.us.oracle.com> Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/12 04:09, Mukesh Rathor wrote: > Hi, > > I am wondering if there's libxl expert who can help me make some PVH > related changes to libxl, pref in the US time zone. I could consult on > irc or the phone. I wouldn't consider myself a libxl expert, but I've been working with it for some time (specially in the devices section) so if you need help I would like to give you a hand, (I'm in the EU timezone, GMT+1). > I find the libxl code hard to read, and don't > want to spend lot of time figuring it out if someone can just help > quickly. > > thanks, > Mukesh > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 17:17:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 17:17:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK71-00014B-0t; Tue, 13 Nov 2012 17:17:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK6z-000142-CC for xen-devel@lists.xen.org; Tue, 13 Nov 2012 17:17:21 +0000 Received: from [85.158.139.83:46565] by server-15.bemta-5.messagelabs.com id 95/3D-26920-0A082A05; Tue, 13 Nov 2012 17:17:20 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352827039!22881499!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14046 invoked from network); 13 Nov 2012 17:17:19 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 17:17:19 -0000 Received: by mail-ea0-f173.google.com with SMTP id i13so234745eaa.32 for ; Tue, 13 Nov 2012 09:17:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=Udt8G89CjZCWeZ3qfkjflvVKF4pPv5UFDOLxj8CkTvU=; b=I43gUA2Oyy3Qv0wOGOubIbfn+8UmDrAVPrQwlAMseGjGduXy5Sk5HUFNJRRboLGxgW 6KEiGMQjdxnFqAT2IGOQj91smKXAP4KS8tIQ2MWk03z8RpbszmasNBaash3nCRBEcMf8 HwP0pfYI/A+KjDQ3r47ty8AglgrGHDp3BI5MWIUsvDY6Y1oIUpTapPJ7uIscxLVtB2WG biscyk9xIOuT+BtCr6Yw9Fa+v9JY49+pFz0p05KPc+5uB0JcQKJfzzI+gFEsAoAXbFhH re7aKjjWpX5rcfhnLQj1nnb+auhmSxiiH7W2YIw2uiC+uw5u1sAYzxxvLFSl6FXgdjE0 pY7w== Received: by 10.14.193.136 with SMTP id k8mr76875042een.30.1352827039707; Tue, 13 Nov 2012 09:17:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id g5sm23772989eem.4.2012.11.13.09.17.17 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 09:17:19 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 17:17:13 +0000 From: Keir Fraser To: Dan Magenheimer , Zhigang Wang Message-ID: Thread-Topic: [Xen-devel] VM memory allocation speed with cs 26056 Thread-Index: Ac3BwriwUGmtcRjAwEGgyTHMyo/+oQ== In-Reply-To: <8809ab93-4255-464b-88c2-28272980db16@default> Mime-version: 1.0 Cc: xen-devel , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 16:13, "Dan Magenheimer" wrote: >> I did it second time. It seems the result (attached) is promising. >> >> I think the strange result is due to the order of testing: >> start_physical_machine -> test_hvm -> test_pvm. >> >> This time, I did: start_physical_machine -> test_pvm -> test_hvm. >> >> You can see the pvm memory allocation speed is not affected by your patch >> this time. >> >> So I believe this patch is excellent now. > > I don't know about Keir's opinion, but to me the performance dependency > on ordering is even more bizarre and still calls into question the > acceptability of the patch. Customers aren't going to like being > told that, for best results, they should launch all PV domains before > their HVM domains. Yes it's very odd. I would want to see more runs to be convinced that nothing else weird is going on and affecting the results. If it is something to do with the movement of the TLB-flush filtering logic, it may just be a tiny difference being amplified by the vast number of times alloc_heap_pages() gets called. We should be able to actually *improve* PV build performance by pulling the flush filtering out into populate_physmap and increase_reservation. > Is scrubbing still/ever done lazily? That might explain some of > the weirdness. No lazy scrubbing any more. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 17:17:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 17:17:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK71-00014B-0t; Tue, 13 Nov 2012 17:17:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYK6z-000142-CC for xen-devel@lists.xen.org; Tue, 13 Nov 2012 17:17:21 +0000 Received: from [85.158.139.83:46565] by server-15.bemta-5.messagelabs.com id 95/3D-26920-0A082A05; Tue, 13 Nov 2012 17:17:20 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-11.tower-182.messagelabs.com!1352827039!22881499!1 X-Originating-IP: [209.85.215.173] X-SpamReason: No, hits=0.3 required=7.0 tests=RCVD_BY_IP X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14046 invoked from network); 13 Nov 2012 17:17:19 -0000 Received: from mail-ea0-f173.google.com (HELO mail-ea0-f173.google.com) (209.85.215.173) by server-11.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 17:17:19 -0000 Received: by mail-ea0-f173.google.com with SMTP id i13so234745eaa.32 for ; Tue, 13 Nov 2012 09:17:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=Udt8G89CjZCWeZ3qfkjflvVKF4pPv5UFDOLxj8CkTvU=; b=I43gUA2Oyy3Qv0wOGOubIbfn+8UmDrAVPrQwlAMseGjGduXy5Sk5HUFNJRRboLGxgW 6KEiGMQjdxnFqAT2IGOQj91smKXAP4KS8tIQ2MWk03z8RpbszmasNBaash3nCRBEcMf8 HwP0pfYI/A+KjDQ3r47ty8AglgrGHDp3BI5MWIUsvDY6Y1oIUpTapPJ7uIscxLVtB2WG biscyk9xIOuT+BtCr6Yw9Fa+v9JY49+pFz0p05KPc+5uB0JcQKJfzzI+gFEsAoAXbFhH re7aKjjWpX5rcfhnLQj1nnb+auhmSxiiH7W2YIw2uiC+uw5u1sAYzxxvLFSl6FXgdjE0 pY7w== Received: by 10.14.193.136 with SMTP id k8mr76875042een.30.1352827039707; Tue, 13 Nov 2012 09:17:19 -0800 (PST) Received: from [192.168.1.3] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id g5sm23772989eem.4.2012.11.13.09.17.17 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 09:17:19 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Tue, 13 Nov 2012 17:17:13 +0000 From: Keir Fraser To: Dan Magenheimer , Zhigang Wang Message-ID: Thread-Topic: [Xen-devel] VM memory allocation speed with cs 26056 Thread-Index: Ac3BwriwUGmtcRjAwEGgyTHMyo/+oQ== In-Reply-To: <8809ab93-4255-464b-88c2-28272980db16@default> Mime-version: 1.0 Cc: xen-devel , Jan Beulich , Konrad Rzeszutek Wilk Subject: Re: [Xen-devel] VM memory allocation speed with cs 26056 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 16:13, "Dan Magenheimer" wrote: >> I did it second time. It seems the result (attached) is promising. >> >> I think the strange result is due to the order of testing: >> start_physical_machine -> test_hvm -> test_pvm. >> >> This time, I did: start_physical_machine -> test_pvm -> test_hvm. >> >> You can see the pvm memory allocation speed is not affected by your patch >> this time. >> >> So I believe this patch is excellent now. > > I don't know about Keir's opinion, but to me the performance dependency > on ordering is even more bizarre and still calls into question the > acceptability of the patch. Customers aren't going to like being > told that, for best results, they should launch all PV domains before > their HVM domains. Yes it's very odd. I would want to see more runs to be convinced that nothing else weird is going on and affecting the results. If it is something to do with the movement of the TLB-flush filtering logic, it may just be a tiny difference being amplified by the vast number of times alloc_heap_pages() gets called. We should be able to actually *improve* PV build performance by pulling the flush filtering out into populate_physmap and increase_reservation. > Is scrubbing still/ever done lazily? That might explain some of > the weirdness. No lazy scrubbing any more. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:09:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:09:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYKvV-0002fF-4w; Tue, 13 Nov 2012 18:09:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYKvT-0002fA-3e for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:09:31 +0000 Received: from [85.158.143.35:20322] by server-3.bemta-4.messagelabs.com id C6/3A-06841-ADC82A05; Tue, 13 Nov 2012 18:09:30 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352830169!7158347!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 405 invoked from network); 13 Nov 2012 18:09:29 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:09:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15786993" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:09:25 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:09:24 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYKvN-00081n-1F; Tue, 13 Nov 2012 18:09:25 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYKvM-0001WH-Lt; Tue, 13 Nov 2012 18:09:24 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.36052.425566.123033@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 18:09:24 +0000 To: Ian Campbell In-Reply-To: <1349695144.18008.102.camel@zakaz.uk.xensource.com> References: <1349695144.18008.102.camel@zakaz.uk.xensource.com> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Olaf Hering , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ian Campbell writes ("Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request"): > On Fri, 2012-10-05 at 17:22 +0100, Olaf Hering wrote: > > The following 5 patches were sent shortly before 4.2 was released, so > > they were not considered (I think). I propose the vscsi changes and the > > stubdom parallel build change for inclusion in 4.2.1. > > I nearly skipped this because it said backport request but I spotted > that these were actually new patches to also be backported. I've now > acked the unacked ones and applied. ... > > Changes: I have backported these to 4.2: > > xend/pvscsi: fix passing of SCSI control LUNs > > xend/pvscsi: fix usage of persistant device names for SCSI devices > > xend/pvscsi: update sysfs parser for Linux 3.0 > > stubdom: fix parallel build by expanding CROSS_MAKE This one doesn't seem to actually need backporting, based on the description ? > > tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:09:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:09:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYKvV-0002fF-4w; Tue, 13 Nov 2012 18:09:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYKvT-0002fA-3e for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:09:31 +0000 Received: from [85.158.143.35:20322] by server-3.bemta-4.messagelabs.com id C6/3A-06841-ADC82A05; Tue, 13 Nov 2012 18:09:30 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352830169!7158347!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 405 invoked from network); 13 Nov 2012 18:09:29 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:09:29 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15786993" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:09:25 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:09:24 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYKvN-00081n-1F; Tue, 13 Nov 2012 18:09:25 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYKvM-0001WH-Lt; Tue, 13 Nov 2012 18:09:24 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.36052.425566.123033@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 18:09:24 +0000 To: Ian Campbell In-Reply-To: <1349695144.18008.102.camel@zakaz.uk.xensource.com> References: <1349695144.18008.102.camel@zakaz.uk.xensource.com> X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Cc: Olaf Hering , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ian Campbell writes ("Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request"): > On Fri, 2012-10-05 at 17:22 +0100, Olaf Hering wrote: > > The following 5 patches were sent shortly before 4.2 was released, so > > they were not considered (I think). I propose the vscsi changes and the > > stubdom parallel build change for inclusion in 4.2.1. > > I nearly skipped this because it said backport request but I spotted > that these were actually new patches to also be backported. I've now > acked the unacked ones and applied. ... > > Changes: I have backported these to 4.2: > > xend/pvscsi: fix passing of SCSI control LUNs > > xend/pvscsi: fix usage of persistant device names for SCSI devices > > xend/pvscsi: update sysfs parser for Linux 3.0 > > stubdom: fix parallel build by expanding CROSS_MAKE This one doesn't seem to actually need backporting, based on the description ? > > tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:16:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:16:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYL2B-00032P-8x; Tue, 13 Nov 2012 18:16:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYL29-00032K-Of for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:16:25 +0000 Received: from [85.158.137.99:11541] by server-5.bemta-3.messagelabs.com id 1F/65-26311-87E82A05; Tue, 13 Nov 2012 18:16:24 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-15.tower-217.messagelabs.com!1352830578!16606665!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNjA1NA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNjA1NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24857 invoked from network); 13 Nov 2012 18:16:18 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-15.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 18:16:18 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV67U= Received: from probook.site (ip-80-226-24-1.vodafone-net.de [80.226.24.1]) by smtp.strato.de (josoe mo36) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id x07116oADHbbCH ; Tue, 13 Nov 2012 19:16:17 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 87D0F189BA; Tue, 13 Nov 2012 19:15:59 +0100 (CET) Date: Tue, 13 Nov 2012 19:15:59 +0100 From: Olaf Hering To: Ian Jackson Message-ID: <20121113181559.GA31289@aepfle.de> References: <1349695144.18008.102.camel@zakaz.uk.xensource.com> <20642.36052.425566.123033@mariner.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20642.36052.425566.123033@mariner.uk.xensource.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 13, Ian Jackson wrote: > This one doesn't seem to actually need backporting, based on the > description ? > > > > tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT Sorry, that one appearently slipped into the list due to copy&paste. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:16:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:16:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYL2B-00032P-8x; Tue, 13 Nov 2012 18:16:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYL29-00032K-Of for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:16:25 +0000 Received: from [85.158.137.99:11541] by server-5.bemta-3.messagelabs.com id 1F/65-26311-87E82A05; Tue, 13 Nov 2012 18:16:24 +0000 X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-15.tower-217.messagelabs.com!1352830578!16606665!1 X-Originating-IP: [81.169.146.176] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNjA1NA==\n,sa_preprocessor: QmFkIElQOiA4MS4xNjkuMTQ2LjE3NiA9PiAyNjA1NA==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24857 invoked from network); 13 Nov 2012 18:16:18 -0000 Received: from mo-p04-ob.rzone.de (HELO mo-p04-ob.rzone.de) (81.169.146.176) by server-15.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 18:16:18 -0000 X-RZG-CLASS-ID: mo04 X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+zrwiavkK6tmQaLfmxtMZ80VwmRNV67U= Received: from probook.site (ip-80-226-24-1.vodafone-net.de [80.226.24.1]) by smtp.strato.de (josoe mo36) (RZmta 31.3 SBL|AUTH) with (DHE-RSA-AES256-SHA encrypted) ESMTPA id x07116oADHbbCH ; Tue, 13 Nov 2012 19:16:17 +0100 (CET) Received: by probook.site (Postfix, from userid 1000) id 87D0F189BA; Tue, 13 Nov 2012 19:15:59 +0100 (CET) Date: Tue, 13 Nov 2012 19:15:59 +0100 From: Olaf Hering To: Ian Jackson Message-ID: <20121113181559.GA31289@aepfle.de> References: <1349695144.18008.102.camel@zakaz.uk.xensource.com> <20642.36052.425566.123033@mariner.uk.xensource.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20642.36052.425566.123033@mariner.uk.xensource.com> User-Agent: Mutt/1.5.21.rev5558 (2012-10-16) Cc: Ian Campbell , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH 0 of 5] misc tools changes, backport request X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, Nov 13, Ian Jackson wrote: > This one doesn't seem to actually need backporting, based on the > description ? > > > > tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT Sorry, that one appearently slipped into the list due to copy&paste. Olaf _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:38:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:38:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLMs-0003cb-8x; Tue, 13 Nov 2012 18:37:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLMq-0003cW-5i for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:37:48 +0000 Received: from [85.158.143.35:13129] by server-2.bemta-4.messagelabs.com id 11/49-28922-B7392A05; Tue, 13 Nov 2012 18:37:47 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352831866!12018285!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18751 invoked from network); 13 Nov 2012 18:37:46 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:37:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15787410" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:37:46 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:37:45 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYLMn-0008B2-SP; Tue, 13 Nov 2012 18:37:45 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYLMn-0000YZ-9k; Tue, 13 Nov 2012 18:37:45 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.37747.982297.553297@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 18:37:39 +0000 To: , Frediano Ziglio , Roger Pau Monne , Jan Beulich X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Subject: [Xen-devel] Tools backports to 4.1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I have backported a number of the tools fixes from 4.2 to 4.1. This one looked like a good candidate but it looked like too big a job to bite off right now (the c/s is in 4.2): changeset: 25908:9ebebb1904fd user: Roger Pau Monne date: Fri Oct 26 17:02:22 2012 +0100 description: libfsimage: add ext4 support for CentOS 5.x This one (in qemu-xen-4.2-testing.git) needed adjusting which I hope I've done right: commit d94efd9aa814f17f3243dae91476dc42b5ad052e Author: Frediano Ziglio Date: Tue Aug 7 18:17:27 2012 +0100 mapcache: Fix invalidate if memory requested was not bucket aligned I was cautious about build system changes and didn't take any libxl backports. The full list of commits is below. changeset: 23394:8cd220183845 user: Matt Wilson date: Tue Nov 13 18:08:16 2012 +0000 files: docs/man/xmdomain.cfg.pod.5 description: docs: correct formatting errors in xmdomain.cfg This patch corrects the following errors produced by pod2man: Hey! The above document had some coding errors, which are explained below: Around line 301: You can't have =items (as at line 305) unless the first thing after the =over is an =item Around line 311: '=item' outside of any '=over' Signed-off-by: Matt Wilson Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 25840:c7e4b7e64303 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25885:c23d938e3e64 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23395:8931942405ea user: Olaf Hering date: Tue Nov 13 18:09:07 2012 +0000 files: tools/pygrub/src/pygrub description: pygrub: always append --args If a bootloader entry in menu.lst has no additional kernel command line options listed and the domU.cfg has 'bootargs="--args=something"' the additional arguments from the config file are not passed to the kernel. The reason for that incorrect behaviour is that run_grub appends arg only if the parsed config file has arguments listed. Fix this by appending args from image section and the config file separatly. To avoid adding to a NoneType initialize grubcfg['args'] to an empty string. This does not change behaviour but simplifies the code which appends the string. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 25941:795c493fe561 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25891:7e91c668bae2 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23396:30a7232b184d user: Olaf Hering date: Tue Nov 13 18:09:58 2012 +0000 files: tools/hotplug/Linux/network-nat description: hotplug/Linux: Remove tracing (bash -x) from network-nat script Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26006:8b6870d686d6 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25896:6adf0c7937bf Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23397:e9f906ff6539 user: Olaf Hering date: Tue Nov 13 18:10:06 2012 +0000 files: tools/xenballoon/xenballoond.init description: xenballoond.init: remove 4 from default runlevel Remove 4 from default runlevel in xenballoond.init. Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as reserved for local use, the local sysadmin is responsible for symlink creation in rc4.d. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26007:fe756682cc7f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25897:dcd4bf824284 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23398:0ac3938a6cee user: Olaf Hering date: Tue Nov 13 18:10:15 2012 +0000 files: tools/pygrub/src/pygrub description: pygrub: correct typo in --args assignment If pygrub was called with --args="some thing", then this string should be append to the kernel command line. But the last changeset 25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'. Rename the local variable which holds the string from the domain config file to avoid further confusion. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26018:ecc7627ca6d7 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25899:dbb1872bbb97 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23399:bfe09091c0c5 user: Joe Jin date: Tue Nov 13 18:11:09 2012 +0000 files: tools/python/xen/xend/XendStateStore.py description: tools: xend: fix wrong condition check for xml file In commit e8d40584, it intended to check xml file size and when empty will return, the condition should be "if os.path.getsize(xml_path) == 0" rather then "if not os.path.getsize(xml_path) == 0". Signed-off-by: Chuang Cao Signed-off-by: Joe Jin Reviewed-by: Konrad Rzeszutek Wilk Committed-by: Ian Campbell xen-unstable changeset: 26088:dd64a1bdbe3a Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25905:82b61b99d15d Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23400:0f01a15628da user: Olaf Hering date: Tue Nov 13 18:13:11 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: fix passing of SCSI control LUNs Currently pvscsi can not pass SCSI devices that have just a scsi_generic node. In the following example sg3 is a control LUN for the disk sdd. But vscsi=['4:0:2:0,0:0:0:0'] does not work because the internal 'devname' variable remains None. Later writing p-devname to xenstore fails because None is not a valid string variable. Since devname is used for just informational purpose use sg also as devname. carron:~ $ lsscsi -g [0:0:0:0] disk ATA FK0032CAAZP HPF2 /dev/sda /dev/sg0 [4:0:0:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdb /dev/sg1 [4:0:1:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdc /dev/sg2 [4:0:2:0] storage HP HSV400 0950 - /dev/sg3 [4:0:2:1] disk HP HSV400 0950 /dev/sdd /dev/sg4 [4:0:3:0] storage HP HSV400 0950 - /dev/sg5 [4:0:3:1] disk HP HSV400 0950 /dev/sde /dev/sg6 Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26008:eecb528583d7 Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25913:16ced2f387b9 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23401:c14e37335775 user: Olaf Hering date: Tue Nov 13 18:13:17 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: fix usage of persistant device names for SCSI devices Currently the callers of vscsi_get_scsidevices() do not pass a mask string. This will call "lsscsi -g '[]'", which causes a lsscsi syntax error. As a result the sysfs parser _vscsi_get_scsidevices() is used. But this parser is broken and the specified names in the config file are not found. Using a mask '*' if no mask was given will call lsscsi correctly and the following config is parsed correctly: vscsi=[ '/dev/sg3, 0:0:0:0', '/dev/disk/by-id/wwn-0x600508b4000cf1c30000800000410000, 0:0:0:1' ] Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26009:2dbfa4d2e107 Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25914:b8916af165b9 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23402:1104badf4151 tag: tip user: Olaf Hering date: Tue Nov 13 18:13:24 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: update sysfs parser for Linux 3.0 The sysfs parser for /sys/bus/scsi/devices understands only the layout of kernel version 2.6.16. This looks as follows: /sys/bus/scsi/devices/1:0:0:0/block:sda is a symlink to /sys/block/sda/ /sys/bus/scsi/devices/1:0:0:0/scsi_generic:sg1 is a symlink to /sys/class/scsi_generic/sg1 Both directories contain a 'dev' file with the major:minor information. This patch updates the used regex strings to match also the colon to make it more robust against possible future changes. In kernel version 3.0 the layout changed: /sys/bus/scsi/devices/ contains now additional symlinks to directories such as host1 and target1:0:0. This patch ignores these as they do not point to the desired scsi devices. They just clutter the devices array. The directory layout in '1:0:0:0' changed as well, the 'type:name' notation was replaced with 'type/name' directories: /sys/bus/scsi/devices/1:0:0:0/block/sda/ /sys/bus/scsi/devices/1:0:0:0/scsi_generic/sg1/ Both directories contain a 'dev' file with the major:minor information. This patch adds additional code to walk the subdir to find the 'dev' file to make sure the given subdirectory is really the kernel name. In addition this patch makes sure devname is not None. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26010:cff10030c6ea Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25915:839e5d95d483 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson commit b36c42985575cd6d761d39e5770e57a1f52832ae Author: Ian Jackson Date: Tue Nov 13 18:25:17 2012 +0000 mapcache: Fix invalidate if memory requested was not bucket aligned When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping is created pointing to the virtual address of location requested. The cached mapped entry is saved in last_address_vaddr with the memory location of the base virtual address (without bucket offset). However when this entry is invalidated the virtual address saved in the reverse mapping is used. This cause that the mapping is freed but the last_address_vaddr is not reset. Signed-off-by: Frediano Ziglio Acked-by: Ian Jackson Committed-by: Ian Jackson (cherry picked from commit d94efd9aa814f17f3243dae91476dc42b5ad052e) Conflicts: hw/xen_machine_fv.c Signed-off-by: Ian Jackson commit bdbf5a6aba74658b95756c8d7d26d664fbd9c83d Author: Stefano Stabellini Date: Thu Aug 30 16:11:32 2012 +0100 qemu-xen-trad: fix msi_translate with PV event delivery When switching from msitranslate to straight msi we need to make sure that we respect PV event delivery for the msi if the guest asked for it: - completely disable MSI on the device in pt_disable_msi_translate; - then enable MSI again (pt_msi_setup), mapping the correct pirq to it. Signed-off-by: Stefano Stabellini Tested-by: Rolu (cherry picked from commit 3e66da7266c84638c0e22a09c9d2b07529802576) commit dbd79be2d3d47c6a73f6292ffb8de9860cd80ad8 Author: Ian Jackson Date: Tue Aug 14 15:57:49 2012 +0100 Revert "qemu-xen-traditional: use O_DIRECT to open disk images for IDE" This reverts commit 1307e42a4b3c1102d75401bc0cffb4eb6c9b7a38. In fact after a lengthy discussion, we came up with the conclusion that WRITEBACK is OK for IDE. See: http://marc.info/?l=xen-devel&m=133311527009773 Therefore revert this which was committed in error. (cherry picked from commit effd5676225761abdab90becac519716515c3be4) -- _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 18:38:12 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 18:38:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLMs-0003cb-8x; Tue, 13 Nov 2012 18:37:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLMq-0003cW-5i for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:37:48 +0000 Received: from [85.158.143.35:13129] by server-2.bemta-4.messagelabs.com id 11/49-28922-B7392A05; Tue, 13 Nov 2012 18:37:47 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1352831866!12018285!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18751 invoked from network); 13 Nov 2012 18:37:46 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:37:46 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15787410" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:37:46 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:37:45 +0000 Received: from mariner.cam.xci-test.com ([10.80.2.22] helo=mariner.uk.xensource.com ident=Debian-exim) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYLMn-0008B2-SP; Tue, 13 Nov 2012 18:37:45 +0000 Received: from iwj by mariner.uk.xensource.com with local (Exim 4.72) (envelope-from ) id 1TYLMn-0000YZ-9k; Tue, 13 Nov 2012 18:37:45 +0000 From: Ian Jackson MIME-Version: 1.0 Message-ID: <20642.37747.982297.553297@mariner.uk.xensource.com> Date: Tue, 13 Nov 2012 18:37:39 +0000 To: , Frediano Ziglio , Roger Pau Monne , Jan Beulich X-Mailer: VM 8.1.0 under 23.2.1 (i486-pc-linux-gnu) Subject: [Xen-devel] Tools backports to 4.1 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org I have backported a number of the tools fixes from 4.2 to 4.1. This one looked like a good candidate but it looked like too big a job to bite off right now (the c/s is in 4.2): changeset: 25908:9ebebb1904fd user: Roger Pau Monne date: Fri Oct 26 17:02:22 2012 +0100 description: libfsimage: add ext4 support for CentOS 5.x This one (in qemu-xen-4.2-testing.git) needed adjusting which I hope I've done right: commit d94efd9aa814f17f3243dae91476dc42b5ad052e Author: Frediano Ziglio Date: Tue Aug 7 18:17:27 2012 +0100 mapcache: Fix invalidate if memory requested was not bucket aligned I was cautious about build system changes and didn't take any libxl backports. The full list of commits is below. changeset: 23394:8cd220183845 user: Matt Wilson date: Tue Nov 13 18:08:16 2012 +0000 files: docs/man/xmdomain.cfg.pod.5 description: docs: correct formatting errors in xmdomain.cfg This patch corrects the following errors produced by pod2man: Hey! The above document had some coding errors, which are explained below: Around line 301: You can't have =items (as at line 305) unless the first thing after the =over is an =item Around line 311: '=item' outside of any '=over' Signed-off-by: Matt Wilson Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 25840:c7e4b7e64303 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25885:c23d938e3e64 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23395:8931942405ea user: Olaf Hering date: Tue Nov 13 18:09:07 2012 +0000 files: tools/pygrub/src/pygrub description: pygrub: always append --args If a bootloader entry in menu.lst has no additional kernel command line options listed and the domU.cfg has 'bootargs="--args=something"' the additional arguments from the config file are not passed to the kernel. The reason for that incorrect behaviour is that run_grub appends arg only if the parsed config file has arguments listed. Fix this by appending args from image section and the config file separatly. To avoid adding to a NoneType initialize grubcfg['args'] to an empty string. This does not change behaviour but simplifies the code which appends the string. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 25941:795c493fe561 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25891:7e91c668bae2 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23396:30a7232b184d user: Olaf Hering date: Tue Nov 13 18:09:58 2012 +0000 files: tools/hotplug/Linux/network-nat description: hotplug/Linux: Remove tracing (bash -x) from network-nat script Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26006:8b6870d686d6 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25896:6adf0c7937bf Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23397:e9f906ff6539 user: Olaf Hering date: Tue Nov 13 18:10:06 2012 +0000 files: tools/xenballoon/xenballoond.init description: xenballoond.init: remove 4 from default runlevel Remove 4 from default runlevel in xenballoond.init. Similar to what changeset 24847:0900b1c905f1 does in xencommons, remove runlevel 4 from the other runlevel scripts. LSB defines runlevel 4 as reserved for local use, the local sysadmin is responsible for symlink creation in rc4.d. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26007:fe756682cc7f Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25897:dcd4bf824284 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23398:0ac3938a6cee user: Olaf Hering date: Tue Nov 13 18:10:15 2012 +0000 files: tools/pygrub/src/pygrub description: pygrub: correct typo in --args assignment If pygrub was called with --args="some thing", then this string should be append to the kernel command line. But the last changeset 25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'. Rename the local variable which holds the string from the domain config file to avoid further confusion. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26018:ecc7627ca6d7 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25899:dbb1872bbb97 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23399:bfe09091c0c5 user: Joe Jin date: Tue Nov 13 18:11:09 2012 +0000 files: tools/python/xen/xend/XendStateStore.py description: tools: xend: fix wrong condition check for xml file In commit e8d40584, it intended to check xml file size and when empty will return, the condition should be "if os.path.getsize(xml_path) == 0" rather then "if not os.path.getsize(xml_path) == 0". Signed-off-by: Chuang Cao Signed-off-by: Joe Jin Reviewed-by: Konrad Rzeszutek Wilk Committed-by: Ian Campbell xen-unstable changeset: 26088:dd64a1bdbe3a Backport-requested-by: Ian Campbell Committed-by: Ian Jackson xen-4.2-testing changeset: 25905:82b61b99d15d Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23400:0f01a15628da user: Olaf Hering date: Tue Nov 13 18:13:11 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: fix passing of SCSI control LUNs Currently pvscsi can not pass SCSI devices that have just a scsi_generic node. In the following example sg3 is a control LUN for the disk sdd. But vscsi=['4:0:2:0,0:0:0:0'] does not work because the internal 'devname' variable remains None. Later writing p-devname to xenstore fails because None is not a valid string variable. Since devname is used for just informational purpose use sg also as devname. carron:~ $ lsscsi -g [0:0:0:0] disk ATA FK0032CAAZP HPF2 /dev/sda /dev/sg0 [4:0:0:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdb /dev/sg1 [4:0:1:0] disk HP P2000G3 FC/iSCSI T100 /dev/sdc /dev/sg2 [4:0:2:0] storage HP HSV400 0950 - /dev/sg3 [4:0:2:1] disk HP HSV400 0950 /dev/sdd /dev/sg4 [4:0:3:0] storage HP HSV400 0950 - /dev/sg5 [4:0:3:1] disk HP HSV400 0950 /dev/sde /dev/sg6 Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26008:eecb528583d7 Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25913:16ced2f387b9 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23401:c14e37335775 user: Olaf Hering date: Tue Nov 13 18:13:17 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: fix usage of persistant device names for SCSI devices Currently the callers of vscsi_get_scsidevices() do not pass a mask string. This will call "lsscsi -g '[]'", which causes a lsscsi syntax error. As a result the sysfs parser _vscsi_get_scsidevices() is used. But this parser is broken and the specified names in the config file are not found. Using a mask '*' if no mask was given will call lsscsi correctly and the following config is parsed correctly: vscsi=[ '/dev/sg3, 0:0:0:0', '/dev/disk/by-id/wwn-0x600508b4000cf1c30000800000410000, 0:0:0:1' ] Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26009:2dbfa4d2e107 Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25914:b8916af165b9 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson changeset: 23402:1104badf4151 tag: tip user: Olaf Hering date: Tue Nov 13 18:13:24 2012 +0000 files: tools/python/xen/util/vscsi_util.py description: xend/pvscsi: update sysfs parser for Linux 3.0 The sysfs parser for /sys/bus/scsi/devices understands only the layout of kernel version 2.6.16. This looks as follows: /sys/bus/scsi/devices/1:0:0:0/block:sda is a symlink to /sys/block/sda/ /sys/bus/scsi/devices/1:0:0:0/scsi_generic:sg1 is a symlink to /sys/class/scsi_generic/sg1 Both directories contain a 'dev' file with the major:minor information. This patch updates the used regex strings to match also the colon to make it more robust against possible future changes. In kernel version 3.0 the layout changed: /sys/bus/scsi/devices/ contains now additional symlinks to directories such as host1 and target1:0:0. This patch ignores these as they do not point to the desired scsi devices. They just clutter the devices array. The directory layout in '1:0:0:0' changed as well, the 'type:name' notation was replaced with 'type/name' directories: /sys/bus/scsi/devices/1:0:0:0/block/sda/ /sys/bus/scsi/devices/1:0:0:0/scsi_generic/sg1/ Both directories contain a 'dev' file with the major:minor information. This patch adds additional code to walk the subdir to find the 'dev' file to make sure the given subdirectory is really the kernel name. In addition this patch makes sure devname is not None. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26010:cff10030c6ea Backport-requested-by: Olaf Hering Committed-by: Ian Jackson xen-4.2-testing changeset: 25915:839e5d95d483 Backport-requested-by: Ian Jackson Committed-by: Ian Jackson commit b36c42985575cd6d761d39e5770e57a1f52832ae Author: Ian Jackson Date: Tue Nov 13 18:25:17 2012 +0000 mapcache: Fix invalidate if memory requested was not bucket aligned When memory is mapped in qemu_map_cache with lock != 0 a reverse mapping is created pointing to the virtual address of location requested. The cached mapped entry is saved in last_address_vaddr with the memory location of the base virtual address (without bucket offset). However when this entry is invalidated the virtual address saved in the reverse mapping is used. This cause that the mapping is freed but the last_address_vaddr is not reset. Signed-off-by: Frediano Ziglio Acked-by: Ian Jackson Committed-by: Ian Jackson (cherry picked from commit d94efd9aa814f17f3243dae91476dc42b5ad052e) Conflicts: hw/xen_machine_fv.c Signed-off-by: Ian Jackson commit bdbf5a6aba74658b95756c8d7d26d664fbd9c83d Author: Stefano Stabellini Date: Thu Aug 30 16:11:32 2012 +0100 qemu-xen-trad: fix msi_translate with PV event delivery When switching from msitranslate to straight msi we need to make sure that we respect PV event delivery for the msi if the guest asked for it: - completely disable MSI on the device in pt_disable_msi_translate; - then enable MSI again (pt_msi_setup), mapping the correct pirq to it. Signed-off-by: Stefano Stabellini Tested-by: Rolu (cherry picked from commit 3e66da7266c84638c0e22a09c9d2b07529802576) commit dbd79be2d3d47c6a73f6292ffb8de9860cd80ad8 Author: Ian Jackson Date: Tue Aug 14 15:57:49 2012 +0100 Revert "qemu-xen-traditional: use O_DIRECT to open disk images for IDE" This reverts commit 1307e42a4b3c1102d75401bc0cffb4eb6c9b7a38. In fact after a lengthy discussion, we came up with the conclusion that WRITEBACK is OK for IDE. See: http://marc.info/?l=xen-devel&m=133311527009773 Therefore revert this which was committed in error. (cherry picked from commit effd5676225761abdab90becac519716515c3be4) -- _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:00:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:00:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLi4-0004HN-Su; Tue, 13 Nov 2012 18:59:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLi3-0004HI-8b for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:59:43 +0000 Received: from [85.158.139.83:45824] by server-16.bemta-5.messagelabs.com id 30/94-04786-E9892A05; Tue, 13 Nov 2012 18:59:42 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352833180!27409592!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16996 invoked from network); 13 Nov 2012 18:59:40 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:59:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15787754" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:59:35 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:59:34 +0000 Message-ID: <50A29896.3060705@citrix.com> Date: Tue, 13 Nov 2012 19:59:34 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Manuel Bouyer References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> In-Reply-To: <20121110104536.GA1027@antioche.eu.org> Cc: "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 10/11/12 11:45, Manuel Bouyer wrote: > On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: >> This patch implements persistent grants for xbd_xenbus (blkfront in >> Linux terminology). The effect of this change is to reduce the number >> of unmap operations performed, since they cause a (costly) TLB >> shootdown. This allows the I/O performance to scale better when a >> large number of VMs are performing I/O. >> >> On startup xbd_xenbus notifies the backend driver that it is using >> persistent grants. If the backend driver is not capable of persistent >> mapping, xbd_xenbus will still use the same grants, since it is >> compatible with the previous protocol, and simplifies the code >> complexity in xbd_xenbus. >> >> Each time a request is send to the backend driver, xbd_xenbus will >> check if there are free grants already mapped and will try to use one >> of those. If there are not enough grants already mapped, xbd_xenbus >> will request new grants, and they will be added to the list of free >> grants when the transaction is finished, so they can be reused. Data >> has to be copied from the request (struct buf) to the mapped grant, or >> from the mapped grant to the request, depending on the operation being >> performed. >> >> To test the performance impact of this patch I've benchmarked the >> number of IOPS performed simultaneously by 15 NetBSD DomU guests on a >> Linux Dom0 that supports persistent grants. The backend used to >> perform this tests was a ramdisk of size 1GB. >> >> Sum of IOPS >> Non-persistent 336718 >> Persistent 686010 >> >> As seen, there's a x2 increase in the total number of IOPS being >> performed. As a reference, using exactly the same setup Linux DomUs >> are able to achieve 1102019 IOPS, so there's still plenty of room for >> improvement. > > I'd like to see a similar test run against a NetBSD dom0. Also, how big > are your IOPs ? I've run some test on a NetBSD Dom0, but it is not a big box, it only has 8-ways. I've run 7 NetBSD DomUs on a NetBSD Dom0, and here are the results (again using a block size of 4k and a md based backend): Persistent frontend: 297688 IOPS Non-persistent frontend: 326497 IOPS This is consistent with the Linux graph on http://xenbits.xen.org/people/royger/persistent_grants/nonpers_read.png, which shows that there's a performance improvement when using at least 8 guests or more. I will also work on a persistent implementation for NetBSD xbd backend, but I don't think it's going to make a difference until we get a MP Dom0 (so it might be better to work on getting a MP Dom0 first). Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:00:01 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:00:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLi4-0004HN-Su; Tue, 13 Nov 2012 18:59:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLi3-0004HI-8b for xen-devel@lists.xen.org; Tue, 13 Nov 2012 18:59:43 +0000 Received: from [85.158.139.83:45824] by server-16.bemta-5.messagelabs.com id 30/94-04786-E9892A05; Tue, 13 Nov 2012 18:59:42 +0000 X-Env-Sender: roger.pau@citrix.com X-Msg-Ref: server-4.tower-182.messagelabs.com!1352833180!27409592!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16996 invoked from network); 13 Nov 2012 18:59:40 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-4.tower-182.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 18:59:40 -0000 X-IronPort-AV: E=Sophos;i="4.80,768,1344211200"; d="scan'208";a="15787754" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 18:59:35 +0000 Received: from Roger-2.local (10.31.3.235) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 18:59:34 +0000 Message-ID: <50A29896.3060705@citrix.com> Date: Tue, 13 Nov 2012 19:59:34 +0100 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Manuel Bouyer References: <1352067830-27804-1-git-send-email-roger.pau@citrix.com> <20121110104536.GA1027@antioche.eu.org> In-Reply-To: <20121110104536.GA1027@antioche.eu.org> Cc: "port-xen@NetBSD.org" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] [PATCH] xen: add persistent grants to xbd_xenbus X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 10/11/12 11:45, Manuel Bouyer wrote: > On Sun, Nov 04, 2012 at 11:23:50PM +0100, Roger Pau Monne wrote: >> This patch implements persistent grants for xbd_xenbus (blkfront in >> Linux terminology). The effect of this change is to reduce the number >> of unmap operations performed, since they cause a (costly) TLB >> shootdown. This allows the I/O performance to scale better when a >> large number of VMs are performing I/O. >> >> On startup xbd_xenbus notifies the backend driver that it is using >> persistent grants. If the backend driver is not capable of persistent >> mapping, xbd_xenbus will still use the same grants, since it is >> compatible with the previous protocol, and simplifies the code >> complexity in xbd_xenbus. >> >> Each time a request is send to the backend driver, xbd_xenbus will >> check if there are free grants already mapped and will try to use one >> of those. If there are not enough grants already mapped, xbd_xenbus >> will request new grants, and they will be added to the list of free >> grants when the transaction is finished, so they can be reused. Data >> has to be copied from the request (struct buf) to the mapped grant, or >> from the mapped grant to the request, depending on the operation being >> performed. >> >> To test the performance impact of this patch I've benchmarked the >> number of IOPS performed simultaneously by 15 NetBSD DomU guests on a >> Linux Dom0 that supports persistent grants. The backend used to >> perform this tests was a ramdisk of size 1GB. >> >> Sum of IOPS >> Non-persistent 336718 >> Persistent 686010 >> >> As seen, there's a x2 increase in the total number of IOPS being >> performed. As a reference, using exactly the same setup Linux DomUs >> are able to achieve 1102019 IOPS, so there's still plenty of room for >> improvement. > > I'd like to see a similar test run against a NetBSD dom0. Also, how big > are your IOPs ? I've run some test on a NetBSD Dom0, but it is not a big box, it only has 8-ways. I've run 7 NetBSD DomUs on a NetBSD Dom0, and here are the results (again using a block size of 4k and a md based backend): Persistent frontend: 297688 IOPS Non-persistent frontend: 326497 IOPS This is consistent with the Linux graph on http://xenbits.xen.org/people/royger/persistent_grants/nonpers_read.png, which shows that there's a performance improvement when using at least 8 guests or more. I will also work on a persistent implementation for NetBSD xbd backend, but I don't think it's going to make a difference until we get a MP Dom0 (so it might be better to work on getting a MP Dom0 first). Roger. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:15:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:15:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLxF-0004qP-L6; Tue, 13 Nov 2012 19:15:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLxE-0004qK-KS for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 19:15:24 +0000 Received: from [85.158.143.35:12744] by server-2.bemta-4.messagelabs.com id F6/81-28922-B4C92A05; Tue, 13 Nov 2012 19:15:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352834120!7164416!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22103 invoked from network); 13 Nov 2012 19:15:21 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 19:15:21 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADJEcBk000480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 19:14:39 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADJEaAE008903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 19:14:37 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADJEYBg003843; Tue, 13 Nov 2012 13:14:34 -0600 Received: from localhost.localdomain (/192.102.209.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 11:14:34 -0800 Date: Tue, 13 Nov 2012 14:14:28 -0500 From: Konrad Rzeszutek Wilk To: roger.pau@citrix.com, xen-devel@lists.xensource.com Message-ID: <20121113191428.GA12691@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: james.harper@bendigoit.com.au, martin.petersen@oracle.com, koverstreet@google.com, ronghui.duan@intel.com, justing@spectralogic.com, JBeulich@suse.com, joseph.glanville@orionvm.com.au Subject: [Xen-devel] Xen-blkback bugs/features X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Roger, Since you are taking a look at blkback and continuing the work that Oliver did with persistent grants (and btw, thanks for doing that!) I was wondering if you were also looking at some of the "todos" that were circulating around. One of them was the 4KB issue. If one hooks up bcache as backend into blkback, the I/Os don't seem to go anywhere. Both James Harper and .. I think the author of bcache were talking about this but it never got anywhere. The other one is expanding the segment limit. We have hard-coded it to be 11 but with existing use-cases (say SSDs) that is not enough. Intel had posted an RFC patchset that created a new ring for segments. SpectraLogic (Justin) did it by expanding the ring. Then there is the prototype work that Martin Peterson (really really prototype) to get DIF/DIX plumbed in xen-blkback/xen-blkfront. He needed 8 bytes per bio so he ended up creating a new ring to track that. I think those are the outstanding use-cases that I know off. So was wondering if you had thought/looked at some of this and had ideas - and were thinking to do something in the future? Thanks! P.S. I hope I have CC-ed everybody here. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:15:48 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:15:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLxF-0004qP-L6; Tue, 13 Nov 2012 19:15:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYLxE-0004qK-KS for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 19:15:24 +0000 Received: from [85.158.143.35:12744] by server-2.bemta-4.messagelabs.com id F6/81-28922-B4C92A05; Tue, 13 Nov 2012 19:15:23 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352834120!7164416!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22103 invoked from network); 13 Nov 2012 19:15:21 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 19:15:21 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADJEcBk000480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 19:14:39 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADJEaAE008903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 19:14:37 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADJEYBg003843; Tue, 13 Nov 2012 13:14:34 -0600 Received: from localhost.localdomain (/192.102.209.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 11:14:34 -0800 Date: Tue, 13 Nov 2012 14:14:28 -0500 From: Konrad Rzeszutek Wilk To: roger.pau@citrix.com, xen-devel@lists.xensource.com Message-ID: <20121113191428.GA12691@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: james.harper@bendigoit.com.au, martin.petersen@oracle.com, koverstreet@google.com, ronghui.duan@intel.com, justing@spectralogic.com, JBeulich@suse.com, joseph.glanville@orionvm.com.au Subject: [Xen-devel] Xen-blkback bugs/features X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Hey Roger, Since you are taking a look at blkback and continuing the work that Oliver did with persistent grants (and btw, thanks for doing that!) I was wondering if you were also looking at some of the "todos" that were circulating around. One of them was the 4KB issue. If one hooks up bcache as backend into blkback, the I/Os don't seem to go anywhere. Both James Harper and .. I think the author of bcache were talking about this but it never got anywhere. The other one is expanding the segment limit. We have hard-coded it to be 11 but with existing use-cases (say SSDs) that is not enough. Intel had posted an RFC patchset that created a new ring for segments. SpectraLogic (Justin) did it by expanding the ring. Then there is the prototype work that Martin Peterson (really really prototype) to get DIF/DIX plumbed in xen-blkback/xen-blkfront. He needed 8 bytes per bio so he ended up creating a new ring to track that. I think those are the outstanding use-cases that I know off. So was wondering if you had thought/looked at some of this and had ideas - and were thinking to do something in the future? Thanks! P.S. I hope I have CC-ed everybody here. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:53:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:53:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMXy-0005yJ-FO; Tue, 13 Nov 2012 19:53:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMXw-0005yE-P4 for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 19:53:20 +0000 Received: from [85.158.139.211:12723] by server-16.bemta-5.messagelabs.com id 7B/C5-04786-035A2A05; Tue, 13 Nov 2012 19:53:20 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352836397!20061364!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5187 invoked from network); 13 Nov 2012 19:53:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 19:53:19 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADJrDer008424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 19:53:14 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADJrCqp025734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 19:53:13 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADJrCd9029697; Tue, 13 Nov 2012 13:53:12 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 11:53:12 -0800 Date: Tue, 13 Nov 2012 11:53:10 -0800 From: Mukesh Rathor To: Ian Campbell Message-ID: <20121113115310.6773e92e@mantra.us.oracle.com> In-Reply-To: <1352800853.7491.22.camel@zakaz.uk.xensource.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Xen-devel@lists.xensource.com" , Roger Pau =?UTF-8?B?TW9ubsOp?= Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 10:00:53 +0000 Ian Campbell wrote: > On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > > Hi, > > > > I am wondering if there's libxl expert who can help me make some PVH > > related changes to libxl, pref in the US time zone. I could consult > > on irc or the phone. > > I think most of the libxl experts are in European time zones. Probably > the best bet is to just ask your questions either here or on IRC. Ian C/Roger: what are your handles on the #xen IRC? Mine: mrathor. thanks, Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 19:53:49 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 19:53:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMXy-0005yJ-FO; Tue, 13 Nov 2012 19:53:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMXw-0005yE-P4 for Xen-devel@lists.xensource.com; Tue, 13 Nov 2012 19:53:20 +0000 Received: from [85.158.139.211:12723] by server-16.bemta-5.messagelabs.com id 7B/C5-04786-035A2A05; Tue, 13 Nov 2012 19:53:20 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1352836397!20061364!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5187 invoked from network); 13 Nov 2012 19:53:19 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 19:53:19 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADJrDer008424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 19:53:14 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADJrCqp025734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 19:53:13 GMT Received: from abhmt107.oracle.com (abhmt107.oracle.com [141.146.116.59]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADJrCd9029697; Tue, 13 Nov 2012 13:53:12 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 11:53:12 -0800 Date: Tue, 13 Nov 2012 11:53:10 -0800 From: Mukesh Rathor To: Ian Campbell Message-ID: <20121113115310.6773e92e@mantra.us.oracle.com> In-Reply-To: <1352800853.7491.22.camel@zakaz.uk.xensource.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "Xen-devel@lists.xensource.com" , Roger Pau =?UTF-8?B?TW9ubsOp?= Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 10:00:53 +0000 Ian Campbell wrote: > On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > > Hi, > > > > I am wondering if there's libxl expert who can help me make some PVH > > related changes to libxl, pref in the US time zone. I could consult > > on irc or the phone. > > I think most of the libxl experts are in European time zones. Probably > the best bet is to just ask your questions either here or on IRC. Ian C/Roger: what are your handles on the #xen IRC? Mine: mrathor. thanks, Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 20:10:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 20:10:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMnk-0006TI-4J; Tue, 13 Nov 2012 20:09:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMni-0006TD-L8 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 20:09:38 +0000 Received: from [85.158.137.99:57027] by server-2.bemta-3.messagelabs.com id C1/9D-04744-109A2A05; Tue, 13 Nov 2012 20:09:37 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352837377!13837501!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18634 invoked from network); 13 Nov 2012 20:09:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 20:09:37 -0000 X-IronPort-AV: E=Sophos;i="4.83,768,1352073600"; d="scan'208";a="15788552" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 20:08:48 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 20:08:47 +0000 MIME-Version: 1.0 X-Mercurial-Node: 7d6fd0219dd791e5788ae5b7c43a396bb27964ec Message-ID: <7d6fd0219dd791e5788a.1352837304@malcolmc-Dell> User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 20:08:24 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: tim@xen.org, eddie.dong@intel.com, JBeulich@suse.com, jun.nakajima@intel.com, Ian.Campbell@citrix.com Subject: [Xen-devel] [PATCH V2] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. The INT 2 call will perform an IRET which will unblock later calls to the NMI handler, according to Intel SDM Volume 3 Chapter 6.7.1. We must ensure that the IRET from the INT 2 IRET is the first IRET issued to prevent losing an NMI. Moving the INT 2 call to before the interrupts are enabled should ensure we don't lose the NMI. Signed-off-by: Malcolm Crossley Acked-by: Tim Deegan diff -r 62885b3c34c8 -r 7d6fd0219dd7 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2269,6 +2269,14 @@ void vmx_vmexit_handler(struct cpu_user_ vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + else if ( vector == TRAP_nmi && + ( (intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8) ) ) + /* Must be called before interrupts are enabled to ensure + * the NMI handler code is run before the first IRET. The + * IRET unblocks subsequent NMI's (Intel SDM Vol 3, 6.7.1) + */ + asm volatile("int $2"); /* Real NMI, vector 2: normal processing */ break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2442,7 +2450,6 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 20:10:02 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 20:10:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMnk-0006TI-4J; Tue, 13 Nov 2012 20:09:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYMni-0006TD-L8 for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 20:09:38 +0000 Received: from [85.158.137.99:57027] by server-2.bemta-3.messagelabs.com id C1/9D-04744-109A2A05; Tue, 13 Nov 2012 20:09:37 +0000 X-Env-Sender: malcolm.crossley@citrix.com X-Msg-Ref: server-6.tower-217.messagelabs.com!1352837377!13837501!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18634 invoked from network); 13 Nov 2012 20:09:37 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-6.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 20:09:37 -0000 X-IronPort-AV: E=Sophos;i="4.83,768,1352073600"; d="scan'208";a="15788552" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 20:08:48 +0000 Received: from [127.0.1.1] (10.80.3.206) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 20:08:47 +0000 MIME-Version: 1.0 X-Mercurial-Node: 7d6fd0219dd791e5788ae5b7c43a396bb27964ec Message-ID: <7d6fd0219dd791e5788a.1352837304@malcolmc-Dell> User-Agent: Mercurial-patchbomb/2.3.2 Date: Tue, 13 Nov 2012 20:08:24 +0000 From: Malcolm Crossley To: xen-devel@lists.xensource.com Cc: tim@xen.org, eddie.dong@intel.com, JBeulich@suse.com, jun.nakajima@intel.com, Ian.Campbell@citrix.com Subject: [Xen-devel] [PATCH V2] xen: vmx: Use an INT 2 call to process real NMI's instead of self_nmi() in VMEXIT handler X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org The self_nmi() code cause's an NMI to be triggered by sending an APIC message to the local processor. Unfortunately there is a delay in the delivery of the APIC message and we may already have re-entered the HVM guest by the time the NMI is taken. This results in the VMEXIT code calling the self_nmi() function again. We have seen hundreds of iterations of this VMEXIT/VMENTER loop before the HVM guest resumes normal operation. Volume 3 Chapter 27 Section 1 of the Intel SDM states: An NMI causes subsequent NMIs to be blocked, but only after the VM exit completes. So we believe it is safe to directly invoke the INT call as NMI's should already be blocked. The INT 2 call will perform an IRET which will unblock later calls to the NMI handler, according to Intel SDM Volume 3 Chapter 6.7.1. We must ensure that the IRET from the INT 2 IRET is the first IRET issued to prevent losing an NMI. Moving the INT 2 call to before the interrupts are enabled should ensure we don't lose the NMI. Signed-off-by: Malcolm Crossley Acked-by: Tim Deegan diff -r 62885b3c34c8 -r 7d6fd0219dd7 xen/arch/x86/hvm/vmx/vmx.c --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2269,6 +2269,14 @@ void vmx_vmexit_handler(struct cpu_user_ vector = intr_info & INTR_INFO_VECTOR_MASK; if ( vector == TRAP_machine_check ) do_machine_check(regs); + else if ( vector == TRAP_nmi && + ( (intr_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI << 8) ) ) + /* Must be called before interrupts are enabled to ensure + * the NMI handler code is run before the first IRET. The + * IRET unblocks subsequent NMI's (Intel SDM Vol 3, 6.7.1) + */ + asm volatile("int $2"); /* Real NMI, vector 2: normal processing */ break; case EXIT_REASON_MCE_DURING_VMENTRY: do_machine_check(regs); @@ -2442,7 +2450,6 @@ void vmx_vmexit_handler(struct cpu_user_ (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI); - self_nmi(); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 22:24:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 22:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYOtS-0000bL-At; Tue, 13 Nov 2012 22:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYOtQ-0000bG-92 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 22:23:40 +0000 Received: from [85.158.137.99:34765] by server-11.bemta-3.messagelabs.com id B5/E6-19361-B68C2A05; Tue, 13 Nov 2012 22:23:39 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1352845416!17291090!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14184 invoked from network); 13 Nov 2012 22:23:38 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 22:23:38 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADMNYMm022801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 22:23:35 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADMNYNY017457 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 22:23:34 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADMNXQi019327; Tue, 13 Nov 2012 16:23:33 -0600 MIME-Version: 1.0 Message-ID: <4a60001b-b323-4d62-8e7a-456b0f5e553a@default> Date: Tue, 13 Nov 2012 14:23:29 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser , TimDeegan X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] Content-Type: multipart/mixed; boundary="__135284541349983992abhmt108.oracle.com" X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Zhigang Wang , Konrad Wilk , xen-devel@lists.xen.org Subject: [Xen-devel] [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --__135284541349983992abhmt108.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable This is a first cut of the hypervisor patch of the proposed XENMEM_claim_pages hypercall/subop. The goal of this hypercall is to attempt to atomically and very quickly determine if there are sufficient pages available in the system and, if so, "set aside" that quantity of pages for future allocations by that domain. Unlike an existing hypercall such as increase_reservation or populate_physmap, specific physical pageframes are not assigned to the domain because this cannot be done sufficiently quickly (especially for very large allocations in an arbitrarily fragmented system) and so the existing mechanisms result in classic time-of-check-time-of-use (TOCTOU) races. One can think of claiming as similar to a "lazy" allocation, but subsequent hypercalls are required to do the actual physical pageframe allocation. This patch is (so far) only compile-tested. I don't have a patch for the toolstack side, but I envision a "xl create --claim" option to maximize backwards compatibility while minimizing impact on existing toolstacks. Code overview: Though the hypercall simply does arithmetic within locks, some of the semantics in the code may be a bit subtle so let me explain a bit. The key variables (d->unclaimed_pages and total_unclaimed_pages) start at zero if no claim has yet been staked for any domain. (Perhaps a better name is "claimed_but_not_yet_possessed" but that's a bit unwieldy.) If no claim hypercalls are executed, there should be no impact on existing usage. When a claim is successfully staked by a domain, it is like a watermark but there is no record kept of the size of the claim. Instead, d->unclaimed_pages is set to the difference between d->tot_pages and the claim (d->tot_pages may normally be zero but see Note 1). When d->tot_pages increases or decreases, d->unclaimed_pages atomically decreases or increases. Once d->unclaimed_pages reaches zero, the claim is satisfied and d->unclaimed pages stays at zero -- unless a new claim is subsequently staked. See Note 2. The systemwide variable total_unclaimed_pages is always the sum of d->unclaimed_pages, across all domains. A non-domain- specific heap allocation will fail if total_unclaimed_pages exceeds free (plus, on tmem enabled systems, freeable) pages. Claim semantics may be modified by flags. The initial implementation has one flag, which discerns whether the caller would like tmem freeable pages to be considered in determining whether or not the claim can be successfully staked. Future flags may, for example, specify that the caller would like the claim to be successful only if there are sufficient pages available on a single node (per Dario's suggestion). Note 1: Tim: I'm thinking this may resolve your concern that the claim mechanism must be more complicated to handle restricted memory allocations and order>0 allocations. The proposed claim mechanism only guarantees a quantity of order=3D=3D0 pages; if restricted allocations are required, these are done first by the toolstack, and followed by the claim. Order>0 allocations still work if memory is not fragmented, but the claim mechanism doesn't guarantee anything but a quantity of order=3D=3D0 pages. Note 2: Tim: This arithmetic also indirectly implements the "claim auto-expire" discussed earlier. We certainly don't want a negative claim. It's possible that the toolstack need never call "unclaim" (and so such a hypercall/subop need not even exist) as long as domain_reset_unclaimed_pages() is called when a domain dies. This draft doesn't even provide unclaim... though if a reason for its existence is determined, it should be easy to add. Thanks for any feedback! Signed-off-by: Dan Magenheimer Diffstat: arch/x86/mm/mem_sharing.c | 4 - common/grant_table.c | 2=20 common/memory.c | 15 ++++++- common/page_alloc.c | 93 +++++++++++++++++++++++++++++++++++++++++= ++++- include/public/memory.h | 19 +++++++++ include/xen/mm.h | 7 +++ include/xen/sched.h | 1=20 7 files changed, 135 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 5103285..943a3b5 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -639,7 +639,7 @@ static int page_make_sharable(struct domain *d, } =20 page_set_owner(page, dom_cow); - d->tot_pages--; + domain_decrease_tot_pages(d, 1); drop_dom_ref =3D (d->tot_pages =3D=3D 0); page_list_del(page, &d->page_list); spin_unlock(&d->page_alloc_lock); @@ -680,7 +680,7 @@ static int page_make_private(struct domain *d, struct p= age_info *page) ASSERT(page_get_owner(page) =3D=3D dom_cow); page_set_owner(page, d); =20 - if ( d->tot_pages++ =3D=3D 0 ) + if ( domain_increase_tot_pages(d, 1) =3D=3D 0 ) get_domain(d); page_list_add_tail(page, &d->page_list); spin_unlock(&d->page_alloc_lock); diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 7912769..10ce78f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1656,7 +1656,7 @@ gnttab_transfer( } =20 /* Okay, add the page to 'e'. */ - if ( unlikely(e->tot_pages++ =3D=3D 0) ) + if ( unlikely(domain_increase_tot_pages(e, 1) =3D=3D 0) ) get_knownalive_domain(e); page_list_add_tail(page, &e->page_list); page_set_owner(page, e); diff --git a/xen/common/memory.c b/xen/common/memory.c index 83e2666..fc7b24c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -454,7 +454,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_= memory_exchange_t) arg) (j * (1UL << exch.out.extent_order))); =20 spin_lock(&d->page_alloc_lock); - d->tot_pages -=3D dec_count; + domain_decrease_tot_pages(d, dec_count); drop_dom_ref =3D (dec_count && !d->tot_pages); spin_unlock(&d->page_alloc_lock); =20 @@ -685,6 +685,19 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_= PARAM(void) arg) break; } =20 + case XENMEM_claim_pages: + + rc =3D rcu_lock_target_domain_by_id(domid, &d); + if ( rc ) + return rc; + + rc =3D domain_set_unclaimed_pages(d, reservation.nr_extents, + reservation.mem_flags); + + rcu_unlock_domain(d); + + break; + default: rc =3D arch_memory_op(op, arg); break; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 15ebc66..ddda9a1 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -238,6 +238,90 @@ static long midsize_alloc_zone_pages; #define MIDSIZE_ALLOC_FRAC 128 =20 static DEFINE_SPINLOCK(heap_lock); +static long total_unclaimed_pages; /* total outstanding claims by all doma= ins */ + +unsigned long domain_increase_tot_pages(struct domain *d, unsigned long pa= ges) +{ + long dom_before, dom_after, dom_claimed, sys_before, sys_after; + + ASSERT(spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&heap_lock); + d->tot_pages +=3D pages; + if ( d->unclaimed_pages ) + { + dom_before =3D d->unclaimed_pages; + dom_after =3D dom_before - pages; + if ( (dom_before > 0) && (dom_after < 0) ) + dom_claimed =3D 0; + else + dom_claimed =3D dom_after; +=09sys_before =3D total_unclaimed_pages; +=09sys_after =3D sys_before - (dom_before - dom_claimed); +=09BUG_ON( (sys_before > 0) && (sys_after < 0) ); + total_unclaimed_pages =3D sys_after; + d->unclaimed_pages =3D dom_claimed; + } + spin_unlock(&heap_lock); + return d->tot_pages; +} + +unsigned long domain_decrease_tot_pages(struct domain *d, unsigned long pa= ges) +{ + ASSERT(spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&heap_lock); + d->tot_pages -=3D pages; + if ( d->unclaimed_pages ) + { + d->unclaimed_pages +=3D pages; +=09total_unclaimed_pages +=3D pages; + } + spin_unlock(&heap_lock); + return d->tot_pages; +} + +int domain_set_unclaimed_pages(struct domain *d, unsigned long pages, + unsigned long flags) +{ + int ret =3D -ENOMEM; + unsigned long avail_pages; + + ASSERT(!spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + /* only one active claim per domain please */ + if ( d->unclaimed_pages ) +=09goto out; + avail_pages =3D total_avail_pages; + if ( !(flags & XENMEM_CLAIMF_free_only) ) + avail_pages +=3D tmem_freeable_pages(); + avail_pages -=3D total_unclaimed_pages; + if ( pages < avail_pages ) + { + /* ok if domain has allocated some pages before making a claim */ + d->unclaimed_pages =3D pages - d->tot_pages; + total_unclaimed_pages +=3D total_unclaimed_pages; + ret =3D 0; + } +out: + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); + return ret; +} + +void domain_reset_unclaimed_pages(struct domain *d) +{ + ASSERT(!spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + total_unclaimed_pages -=3D d->unclaimed_pages; + d->unclaimed_pages =3D 0; + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); +} =20 static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) @@ -442,6 +526,11 @@ static struct page_info *alloc_heap_pages( =20 spin_lock(&heap_lock); =20 + /* Claimed memory is considered not available */ + if ( total_unclaimed_pages + request > + total_avail_pages + tmem_freeable_pages() ) + goto not_found; + /* * TMEM: When available memory is scarce due to tmem absorbing it, all= ow * only mid-size allocations to avoid worst of fragmentation issues. @@ -1291,7 +1380,7 @@ int assign_pages( if ( unlikely(d->tot_pages =3D=3D 0) ) get_knownalive_domain(d); =20 - d->tot_pages +=3D 1 << order; + domain_increase_tot_pages(d, 1 << order); } =20 for ( i =3D 0; i < (1 << order); i++ ) @@ -1375,7 +1464,7 @@ void free_domheap_pages(struct page_info *pg, unsigne= d int order) page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); } =20 - d->tot_pages -=3D 1 << order; + domain_decrease_tot_pages(d, 1 << order); drop_dom_ref =3D (d->tot_pages =3D=3D 0); =20 spin_unlock_recursive(&d->page_alloc_lock); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index f1ddbc0..d8c8b4c 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -421,6 +421,25 @@ struct xen_mem_sharing_op { typedef struct xen_mem_sharing_op xen_mem_sharing_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); =20 +/* + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else -ENOMEM. + */ +#define XENMEM_claim_pages 24 +/* + * XENMEM_claim_pages flags: + * free_only: claim is successful only if sufficient free pages + * are available. If not set and tmem is enabled, hypervisor + * may also consider tmem "freeable" pages to satisfy the claim. + */ +#define _XENMEM_CLAIMF_free_only 0 +#define XENMEM_CLAIMF_free_only (1U<<_XENMEM_CLAIMF_free_only) + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ =20 #endif /* __XEN_PUBLIC_MEMORY_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 64a0cc1..120b93f 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -48,6 +48,13 @@ void free_xenheap_pages(void *v, unsigned int order); #define alloc_xenheap_page() (alloc_xenheap_pages(0,0)) #define free_xenheap_page(v) (free_xenheap_pages(v,0)) =20 +/* Claim handling */ +unsigned long domain_increase_tot_pages(struct domain *d, unsigned long pa= ges); +unsigned long domain_decrease_tot_pages(struct domain *d, unsigned long pa= ges); +int domain_set_unclaimed_pages( + struct domain *d, unsigned long pages, unsigned long flags); +void domain_reset_unclaimed_pages(struct domain *d); + /* Domain suballocator. These functions are *not* interrupt-safe.*/ void init_domheap_pages(paddr_t ps, paddr_t pe); struct page_info *alloc_domheap_pages( diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 6c55039..480ef39 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -242,6 +242,7 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages= ) */ unsigned int tot_pages; /* number of pages currently possese= d */ + unsigned int unclaimed_pages; /* pages claimed but not possessed = */ unsigned int max_pages; /* maximum value for tot_pages = */ atomic_t shr_pages; /* number of shared pages = */ atomic_t paged_pages; /* number of paged-out pages = */ --__135284541349983992abhmt108.oracle.com Content-Type: application/octet-stream; name="claim-121113.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="claim-121113.patch" ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9tZW1fc2hhcmluZy5jIGIveGVuL2FyY2gveDg2 L21tL21lbV9zaGFyaW5nLmMKaW5kZXggNTEwMzI4NS4uOTQzYTNiNSAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L21tL21lbV9zaGFyaW5nLmMKKysrIGIveGVuL2FyY2gveDg2L21tL21lbV9zaGFy aW5nLmMKQEAgLTYzOSw3ICs2MzksNyBAQCBzdGF0aWMgaW50IHBhZ2VfbWFrZV9zaGFyYWJsZShz dHJ1Y3QgZG9tYWluICpkLAogICAgIH0KIAogICAgIHBhZ2Vfc2V0X293bmVyKHBhZ2UsIGRvbV9j b3cpOwotICAgIGQtPnRvdF9wYWdlcy0tOworICAgIGRvbWFpbl9kZWNyZWFzZV90b3RfcGFnZXMo ZCwgMSk7CiAgICAgZHJvcF9kb21fcmVmID0gKGQtPnRvdF9wYWdlcyA9PSAwKTsKICAgICBwYWdl X2xpc3RfZGVsKHBhZ2UsICZkLT5wYWdlX2xpc3QpOwogICAgIHNwaW5fdW5sb2NrKCZkLT5wYWdl X2FsbG9jX2xvY2spOwpAQCAtNjgwLDcgKzY4MCw3IEBAIHN0YXRpYyBpbnQgcGFnZV9tYWtlX3By aXZhdGUoc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSkKICAgICBBU1NF UlQocGFnZV9nZXRfb3duZXIocGFnZSkgPT0gZG9tX2Nvdyk7CiAgICAgcGFnZV9zZXRfb3duZXIo cGFnZSwgZCk7CiAKLSAgICBpZiAoIGQtPnRvdF9wYWdlcysrID09IDAgKQorICAgIGlmICggZG9t YWluX2luY3JlYXNlX3RvdF9wYWdlcyhkLCAxKSA9PSAwICkKICAgICAgICAgZ2V0X2RvbWFpbihk KTsKICAgICBwYWdlX2xpc3RfYWRkX3RhaWwocGFnZSwgJmQtPnBhZ2VfbGlzdCk7CiAgICAgc3Bp bl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7CmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2dy YW50X3RhYmxlLmMgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKaW5kZXggNzkxMjc2OS4uMTBj ZTc4ZiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCisrKyBiL3hlbi9jb21t b24vZ3JhbnRfdGFibGUuYwpAQCAtMTY1Niw3ICsxNjU2LDcgQEAgZ250dGFiX3RyYW5zZmVyKAog ICAgICAgICB9CiAKICAgICAgICAgLyogT2theSwgYWRkIHRoZSBwYWdlIHRvICdlJy4gKi8KLSAg ICAgICAgaWYgKCB1bmxpa2VseShlLT50b3RfcGFnZXMrKyA9PSAwKSApCisgICAgICAgIGlmICgg dW5saWtlbHkoZG9tYWluX2luY3JlYXNlX3RvdF9wYWdlcyhlLCAxKSA9PSAwKSApCiAgICAgICAg ICAgICBnZXRfa25vd25hbGl2ZV9kb21haW4oZSk7CiAgICAgICAgIHBhZ2VfbGlzdF9hZGRfdGFp bChwYWdlLCAmZS0+cGFnZV9saXN0KTsKICAgICAgICAgcGFnZV9zZXRfb3duZXIocGFnZSwgZSk7 CmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL21lbW9yeS5jIGIveGVuL2NvbW1vbi9tZW1vcnkuYwpp bmRleCA4M2UyNjY2Li5mYzdiMjRjIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL21lbW9yeS5jCisr KyBiL3hlbi9jb21tb24vbWVtb3J5LmMKQEAgLTQ1NCw3ICs0NTQsNyBAQCBzdGF0aWMgbG9uZyBt ZW1vcnlfZXhjaGFuZ2UoWEVOX0dVRVNUX0hBTkRMRV9QQVJBTSh4ZW5fbWVtb3J5X2V4Y2hhbmdl X3QpIGFyZykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGogKiAoMVVMIDw8IGV4Y2gu b3V0LmV4dGVudF9vcmRlcikpKTsKIAogICAgICAgICAgICAgICAgIHNwaW5fbG9jaygmZC0+cGFn ZV9hbGxvY19sb2NrKTsKLSAgICAgICAgICAgICAgICBkLT50b3RfcGFnZXMgLT0gZGVjX2NvdW50 OworICAgICAgICAgICAgICAgIGRvbWFpbl9kZWNyZWFzZV90b3RfcGFnZXMoZCwgZGVjX2NvdW50 KTsKICAgICAgICAgICAgICAgICBkcm9wX2RvbV9yZWYgPSAoZGVjX2NvdW50ICYmICFkLT50b3Rf cGFnZXMpOwogICAgICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2sp OwogCkBAIC02ODUsNiArNjg1LDE5IEBAIGxvbmcgZG9fbWVtb3J5X29wKHVuc2lnbmVkIGxvbmcg Y21kLCBYRU5fR1VFU1RfSEFORExFX1BBUkFNKHZvaWQpIGFyZykKICAgICAgICAgYnJlYWs7CiAg ICAgfQogCisgICAgY2FzZSBYRU5NRU1fY2xhaW1fcGFnZXM6CisKKyAgICAgICAgcmMgPSByY3Vf bG9ja190YXJnZXRfZG9tYWluX2J5X2lkKGRvbWlkLCAmZCk7CisgICAgICAgIGlmICggcmMgKQor ICAgICAgICAgICAgcmV0dXJuIHJjOworCisgICAgICAgIHJjID0gZG9tYWluX3NldF91bmNsYWlt ZWRfcGFnZXMoZCwgcmVzZXJ2YXRpb24ubnJfZXh0ZW50cywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXNlcnZhdGlvbi5tZW1fZmxhZ3MpOworCisgICAgICAgIHJj dV91bmxvY2tfZG9tYWluKGQpOworCisgICAgICAgIGJyZWFrOworCiAgICAgZGVmYXVsdDoKICAg ICAgICAgcmMgPSBhcmNoX21lbW9yeV9vcChvcCwgYXJnKTsKICAgICAgICAgYnJlYWs7CmRpZmYg LS1naXQgYS94ZW4vY29tbW9uL3BhZ2VfYWxsb2MuYyBiL3hlbi9jb21tb24vcGFnZV9hbGxvYy5j CmluZGV4IDE1ZWJjNjYuLmRkZGE5YTEgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vcGFnZV9hbGxv Yy5jCisrKyBiL3hlbi9jb21tb24vcGFnZV9hbGxvYy5jCkBAIC0yMzgsNiArMjM4LDkwIEBAIHN0 YXRpYyBsb25nIG1pZHNpemVfYWxsb2Nfem9uZV9wYWdlczsKICNkZWZpbmUgTUlEU0laRV9BTExP Q19GUkFDIDEyOAogCiBzdGF0aWMgREVGSU5FX1NQSU5MT0NLKGhlYXBfbG9jayk7CitzdGF0aWMg bG9uZyB0b3RhbF91bmNsYWltZWRfcGFnZXM7IC8qIHRvdGFsIG91dHN0YW5kaW5nIGNsYWltcyBi eSBhbGwgZG9tYWlucyAqLworCit1bnNpZ25lZCBsb25nIGRvbWFpbl9pbmNyZWFzZV90b3RfcGFn ZXMoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBwYWdlcykKK3sKKyAgICBsb25nIGRv bV9iZWZvcmUsIGRvbV9hZnRlciwgZG9tX2NsYWltZWQsIHN5c19iZWZvcmUsIHN5c19hZnRlcjsK KworICAgIEFTU0VSVChzcGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAg QVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZoZWFw X2xvY2spOworICAgIGQtPnRvdF9wYWdlcyArPSBwYWdlczsKKyAgICBpZiAoIGQtPnVuY2xhaW1l ZF9wYWdlcyApCisgICAgeworICAgICAgICBkb21fYmVmb3JlID0gZC0+dW5jbGFpbWVkX3BhZ2Vz OworICAgICAgICBkb21fYWZ0ZXIgPSBkb21fYmVmb3JlIC0gcGFnZXM7CisgICAgICAgIGlmICgg KGRvbV9iZWZvcmUgPiAwKSAmJiAoZG9tX2FmdGVyIDwgMCkgKQorICAgICAgICAgICAgZG9tX2Ns YWltZWQgPSAwOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkb21fY2xhaW1lZCA9IGRvbV9h ZnRlcjsKKwlzeXNfYmVmb3JlID0gdG90YWxfdW5jbGFpbWVkX3BhZ2VzOworCXN5c19hZnRlciA9 IHN5c19iZWZvcmUgLSAoZG9tX2JlZm9yZSAtIGRvbV9jbGFpbWVkKTsKKwlCVUdfT04oIChzeXNf YmVmb3JlID4gMCkgJiYgKHN5c19hZnRlciA8IDApICk7CisgICAgICAgIHRvdGFsX3VuY2xhaW1l ZF9wYWdlcyA9IHN5c19hZnRlcjsKKyAgICAgICAgZC0+dW5jbGFpbWVkX3BhZ2VzID0gZG9tX2Ns YWltZWQ7CisgICAgfQorICAgIHNwaW5fdW5sb2NrKCZoZWFwX2xvY2spOworICAgIHJldHVybiBk LT50b3RfcGFnZXM7Cit9CisKK3Vuc2lnbmVkIGxvbmcgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdl cyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzKQoreworICAgIEFTU0VSVChz cGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lz X2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZoZWFwX2xvY2spOworICAgIGQt PnRvdF9wYWdlcyAtPSBwYWdlczsKKyAgICBpZiAoIGQtPnVuY2xhaW1lZF9wYWdlcyApCisgICAg eworICAgICAgICBkLT51bmNsYWltZWRfcGFnZXMgKz0gcGFnZXM7CisJdG90YWxfdW5jbGFpbWVk X3BhZ2VzICs9IHBhZ2VzOworICAgIH0KKyAgICBzcGluX3VubG9jaygmaGVhcF9sb2NrKTsKKyAg ICByZXR1cm4gZC0+dG90X3BhZ2VzOworfQorCitpbnQgZG9tYWluX3NldF91bmNsYWltZWRfcGFn ZXMoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBwYWdlcywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBmbGFncykKK3sKKyAgICBpbnQgcmV0ID0g LUVOT01FTTsKKyAgICB1bnNpZ25lZCBsb25nIGF2YWlsX3BhZ2VzOworCisgICAgQVNTRVJUKCFz cGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lz X2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2sp OworICAgIHNwaW5fbG9jaygmaGVhcF9sb2NrKTsKKyAgICAvKiBvbmx5IG9uZSBhY3RpdmUgY2xh aW0gcGVyIGRvbWFpbiBwbGVhc2UgKi8KKyAgICBpZiAoIGQtPnVuY2xhaW1lZF9wYWdlcyApCisJ Z290byBvdXQ7CisgICAgYXZhaWxfcGFnZXMgPSB0b3RhbF9hdmFpbF9wYWdlczsKKyAgICBpZiAo ICEoZmxhZ3MgJiBYRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSkgKQorICAgICAgICBhdmFpbF9wYWdl cyArPSB0bWVtX2ZyZWVhYmxlX3BhZ2VzKCk7CisgICAgYXZhaWxfcGFnZXMgLT0gdG90YWxfdW5j bGFpbWVkX3BhZ2VzOworICAgIGlmICggcGFnZXMgPCBhdmFpbF9wYWdlcyApCisgICAgeworICAg ICAgICAvKiBvayBpZiBkb21haW4gaGFzIGFsbG9jYXRlZCBzb21lIHBhZ2VzIGJlZm9yZSBtYWtp bmcgYSBjbGFpbSAqLworICAgICAgICBkLT51bmNsYWltZWRfcGFnZXMgPSBwYWdlcyAtIGQtPnRv dF9wYWdlczsKKyAgICAgICAgdG90YWxfdW5jbGFpbWVkX3BhZ2VzICs9IHRvdGFsX3VuY2xhaW1l ZF9wYWdlczsKKyAgICAgICAgcmV0ID0gMDsKKyAgICB9CitvdXQ6CisgICAgc3Bpbl91bmxvY2so JmhlYXBfbG9jayk7CisgICAgc3Bpbl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7CisgICAg cmV0dXJuIHJldDsKK30KKwordm9pZCBkb21haW5fcmVzZXRfdW5jbGFpbWVkX3BhZ2VzKHN0cnVj dCBkb21haW4gKmQpCit7CisgICAgQVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxv Y19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAg c3Bpbl9sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2spOworICAgIHNwaW5fbG9jaygmaGVhcF9sb2Nr KTsKKyAgICB0b3RhbF91bmNsYWltZWRfcGFnZXMgLT0gZC0+dW5jbGFpbWVkX3BhZ2VzOworICAg IGQtPnVuY2xhaW1lZF9wYWdlcyA9IDA7CisgICAgc3Bpbl91bmxvY2soJmhlYXBfbG9jayk7Cisg ICAgc3Bpbl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7Cit9CiAKIHN0YXRpYyB1bnNpZ25l ZCBsb25nIGluaXRfbm9kZV9oZWFwKGludCBub2RlLCB1bnNpZ25lZCBsb25nIG1mbiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsIGJvb2xfdCAq dXNlX3RhaWwpCkBAIC00NDIsNiArNTI2LDExIEBAIHN0YXRpYyBzdHJ1Y3QgcGFnZV9pbmZvICph bGxvY19oZWFwX3BhZ2VzKAogCiAgICAgc3Bpbl9sb2NrKCZoZWFwX2xvY2spOwogCisgICAgLyog Q2xhaW1lZCBtZW1vcnkgaXMgY29uc2lkZXJlZCBub3QgYXZhaWxhYmxlICovCisgICAgaWYgKCB0 b3RhbF91bmNsYWltZWRfcGFnZXMgKyByZXF1ZXN0ID4KKyAgICAgICAgIHRvdGFsX2F2YWlsX3Bh Z2VzICsgdG1lbV9mcmVlYWJsZV9wYWdlcygpICkKKyAgICAgICAgZ290byBub3RfZm91bmQ7CisK ICAgICAvKgogICAgICAqIFRNRU06IFdoZW4gYXZhaWxhYmxlIG1lbW9yeSBpcyBzY2FyY2UgZHVl IHRvIHRtZW0gYWJzb3JiaW5nIGl0LCBhbGxvdwogICAgICAqIG9ubHkgbWlkLXNpemUgYWxsb2Nh dGlvbnMgdG8gYXZvaWQgd29yc3Qgb2YgZnJhZ21lbnRhdGlvbiBpc3N1ZXMuCkBAIC0xMjkxLDcg KzEzODAsNyBAQCBpbnQgYXNzaWduX3BhZ2VzKAogICAgICAgICBpZiAoIHVubGlrZWx5KGQtPnRv dF9wYWdlcyA9PSAwKSApCiAgICAgICAgICAgICBnZXRfa25vd25hbGl2ZV9kb21haW4oZCk7CiAK LSAgICAgICAgZC0+dG90X3BhZ2VzICs9IDEgPDwgb3JkZXI7CisgICAgICAgIGRvbWFpbl9pbmNy ZWFzZV90b3RfcGFnZXMoZCwgMSA8PCBvcmRlcik7CiAgICAgfQogCiAgICAgZm9yICggaSA9IDA7 IGkgPCAoMSA8PCBvcmRlcik7IGkrKyApCkBAIC0xMzc1LDcgKzE0NjQsNyBAQCB2b2lkIGZyZWVf ZG9taGVhcF9wYWdlcyhzdHJ1Y3QgcGFnZV9pbmZvICpwZywgdW5zaWduZWQgaW50IG9yZGVyKQog ICAgICAgICAgICAgcGFnZV9saXN0X2RlbDIoJnBnW2ldLCAmZC0+cGFnZV9saXN0LCAmZC0+YXJj aC5yZWxtZW1fbGlzdCk7CiAgICAgICAgIH0KIAotICAgICAgICBkLT50b3RfcGFnZXMgLT0gMSA8 PCBvcmRlcjsKKyAgICAgICAgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdlcyhkLCAxIDw8IG9yZGVy KTsKICAgICAgICAgZHJvcF9kb21fcmVmID0gKGQtPnRvdF9wYWdlcyA9PSAwKTsKIAogICAgICAg ICBzcGluX3VubG9ja19yZWN1cnNpdmUoJmQtPnBhZ2VfYWxsb2NfbG9jayk7CmRpZmYgLS1naXQg YS94ZW4vaW5jbHVkZS9wdWJsaWMvbWVtb3J5LmggYi94ZW4vaW5jbHVkZS9wdWJsaWMvbWVtb3J5 LmgKaW5kZXggZjFkZGJjMC4uZDhjOGI0YyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvcHVibGlj L21lbW9yeS5oCisrKyBiL3hlbi9pbmNsdWRlL3B1YmxpYy9tZW1vcnkuaApAQCAtNDIxLDYgKzQy MSwyNSBAQCBzdHJ1Y3QgeGVuX21lbV9zaGFyaW5nX29wIHsKIHR5cGVkZWYgc3RydWN0IHhlbl9t ZW1fc2hhcmluZ19vcCB4ZW5fbWVtX3NoYXJpbmdfb3BfdDsKIERFRklORV9YRU5fR1VFU1RfSEFO RExFKHhlbl9tZW1fc2hhcmluZ19vcF90KTsKIAorLyoKKyAqIEF0dGVtcHQgdG8gc3Rha2UgYSBj bGFpbSBmb3IgYSBkb21haW4gb24gYSBxdWFudGl0eSBvZiBwYWdlcworICogb2Ygc3lzdGVtIFJB TSwgYnV0IF9ub3RfIGFzc2lnbiBzcGVjaWZpYyBwYWdlZnJhbWVzLiAgT25seQorICogYXJpdGht ZXRpYyBpcyBwZXJmb3JtZWQgc28gdGhlIGh5cGVyY2FsbCBpcyB2ZXJ5IGZhc3QgYW5kIG5lZWQK KyAqIG5vdCBiZSBwcmVlbXB0aWJsZSwgdGh1cyBzaWRlc3RlcHBpbmcgdGltZS1vZi1jaGVjay10 aW1lLW9mLXVzZQorICogcmFjZXMgZm9yIG1lbW9yeSBhbGxvY2F0aW9uLiAgUmV0dXJucyAwIGlm IHRoZSBoeXBlcnZpc29yIHBhZ2UKKyAqIGFsbG9jYXRvciBoYXMgYXRvbWljYWxseSBhbmQgc3Vj Y2Vzc2Z1bGx5IGNsYWltZWQgdGhlIHJlcXVlc3RlZAorICogbnVtYmVyIG9mIHBhZ2VzLCBlbHNl IC1FTk9NRU0uCisgKi8KKyNkZWZpbmUgWEVOTUVNX2NsYWltX3BhZ2VzICAgICAgICAgICAgICAg ICAgMjQKKy8qCisgKiBYRU5NRU1fY2xhaW1fcGFnZXMgZmxhZ3M6CisgKiAgZnJlZV9vbmx5OiBj bGFpbSBpcyBzdWNjZXNzZnVsIG9ubHkgaWYgc3VmZmljaWVudCBmcmVlIHBhZ2VzCisgKiAgICBh cmUgYXZhaWxhYmxlLiAgSWYgbm90IHNldCBhbmQgdG1lbSBpcyBlbmFibGVkLCBoeXBlcnZpc29y CisgKiAgICBtYXkgYWxzbyBjb25zaWRlciB0bWVtICJmcmVlYWJsZSIgcGFnZXMgdG8gc2F0aXNm eSB0aGUgY2xhaW0uCisgKi8KKyNkZWZpbmUgX1hFTk1FTV9DTEFJTUZfZnJlZV9vbmx5ICAgICAg ICAgICAgMAorI2RlZmluZSBYRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSAgICAgICAgICAgICAoMVU8 PF9YRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSkKKwogI2VuZGlmIC8qIGRlZmluZWQoX19YRU5fXykg fHwgZGVmaW5lZChfX1hFTl9UT09MU19fKSAqLwogCiAjZW5kaWYgLyogX19YRU5fUFVCTElDX01F TU9SWV9IX18gKi8KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3hlbi9tbS5oIGIveGVuL2luY2x1 ZGUveGVuL21tLmgKaW5kZXggNjRhMGNjMS4uMTIwYjkzZiAxMDA2NDQKLS0tIGEveGVuL2luY2x1 ZGUveGVuL21tLmgKKysrIGIveGVuL2luY2x1ZGUveGVuL21tLmgKQEAgLTQ4LDYgKzQ4LDEzIEBA IHZvaWQgZnJlZV94ZW5oZWFwX3BhZ2VzKHZvaWQgKnYsIHVuc2lnbmVkIGludCBvcmRlcik7CiAj ZGVmaW5lIGFsbG9jX3hlbmhlYXBfcGFnZSgpIChhbGxvY194ZW5oZWFwX3BhZ2VzKDAsMCkpCiAj ZGVmaW5lIGZyZWVfeGVuaGVhcF9wYWdlKHYpIChmcmVlX3hlbmhlYXBfcGFnZXModiwwKSkKIAor LyogQ2xhaW0gaGFuZGxpbmcgKi8KK3Vuc2lnbmVkIGxvbmcgZG9tYWluX2luY3JlYXNlX3RvdF9w YWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzKTsKK3Vuc2lnbmVkIGxv bmcgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBs b25nIHBhZ2VzKTsKK2ludCBkb21haW5fc2V0X3VuY2xhaW1lZF9wYWdlcygKKyAgICBzdHJ1Y3Qg ZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzLCB1bnNpZ25lZCBsb25nIGZsYWdzKTsKK3Zv aWQgZG9tYWluX3Jlc2V0X3VuY2xhaW1lZF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkKTsKKwogLyog RG9tYWluIHN1YmFsbG9jYXRvci4gVGhlc2UgZnVuY3Rpb25zIGFyZSAqbm90KiBpbnRlcnJ1cHQt c2FmZS4qLwogdm9pZCBpbml0X2RvbWhlYXBfcGFnZXMocGFkZHJfdCBwcywgcGFkZHJfdCBwZSk7 CiBzdHJ1Y3QgcGFnZV9pbmZvICphbGxvY19kb21oZWFwX3BhZ2VzKApkaWZmIC0tZ2l0IGEveGVu L2luY2x1ZGUveGVuL3NjaGVkLmggYi94ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaAppbmRleCA2YzU1 MDM5Li40ODBlZjM5IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaAorKysgYi94 ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaApAQCAtMjQyLDYgKzI0Miw3IEBAIHN0cnVjdCBkb21haW4K ICAgICBzdHJ1Y3QgcGFnZV9saXN0X2hlYWQgcGFnZV9saXN0OyAgLyogbGlua2VkIGxpc3QgKi8K ICAgICBzdHJ1Y3QgcGFnZV9saXN0X2hlYWQgeGVucGFnZV9saXN0OyAvKiBsaW5rZWQgbGlzdCAo c2l6ZSB4ZW5oZWFwX3BhZ2VzKSAqLwogICAgIHVuc2lnbmVkIGludCAgICAgdG90X3BhZ2VzOyAg ICAgICAvKiBudW1iZXIgb2YgcGFnZXMgY3VycmVudGx5IHBvc3Nlc2VkICovCisgICAgdW5zaWdu ZWQgaW50ICAgICB1bmNsYWltZWRfcGFnZXM7IC8qIHBhZ2VzIGNsYWltZWQgYnV0IG5vdCBwb3Nz ZXNzZWQgICAgKi8KICAgICB1bnNpZ25lZCBpbnQgICAgIG1heF9wYWdlczsgICAgICAgLyogbWF4 aW11bSB2YWx1ZSBmb3IgdG90X3BhZ2VzICAgICAgICAqLwogICAgIGF0b21pY190ICAgICAgICAg c2hyX3BhZ2VzOyAgICAgICAvKiBudW1iZXIgb2Ygc2hhcmVkIHBhZ2VzICAgICAgICAgICAgICov CiAgICAgYXRvbWljX3QgICAgICAgICBwYWdlZF9wYWdlczsgICAgIC8qIG51bWJlciBvZiBwYWdl ZC1vdXQgcGFnZXMgICAgICAgICAgKi8K --__135284541349983992abhmt108.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__135284541349983992abhmt108.oracle.com-- From xen-devel-bounces@lists.xen.org Tue Nov 13 22:24:10 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 22:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYOtS-0000bL-At; Tue, 13 Nov 2012 22:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYOtQ-0000bG-92 for xen-devel@lists.xen.org; Tue, 13 Nov 2012 22:23:40 +0000 Received: from [85.158.137.99:34765] by server-11.bemta-3.messagelabs.com id B5/E6-19361-B68C2A05; Tue, 13 Nov 2012 22:23:39 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-10.tower-217.messagelabs.com!1352845416!17291090!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA1OTk2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14184 invoked from network); 13 Nov 2012 22:23:38 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-217.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 13 Nov 2012 22:23:38 -0000 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qADMNYMm022801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 13 Nov 2012 22:23:35 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qADMNYNY017457 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Nov 2012 22:23:34 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qADMNXQi019327; Tue, 13 Nov 2012 16:23:33 -0600 MIME-Version: 1.0 Message-ID: <4a60001b-b323-4d62-8e7a-456b0f5e553a@default> Date: Tue, 13 Nov 2012 14:23:29 -0800 (PST) From: Dan Magenheimer To: Jan Beulich , Keir Fraser , TimDeegan X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] Content-Type: multipart/mixed; boundary="__135284541349983992abhmt108.oracle.com" X-Source-IP: acsinet21.oracle.com [141.146.126.237] Cc: Zhigang Wang , Konrad Wilk , xen-devel@lists.xen.org Subject: [Xen-devel] [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --__135284541349983992abhmt108.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable This is a first cut of the hypervisor patch of the proposed XENMEM_claim_pages hypercall/subop. The goal of this hypercall is to attempt to atomically and very quickly determine if there are sufficient pages available in the system and, if so, "set aside" that quantity of pages for future allocations by that domain. Unlike an existing hypercall such as increase_reservation or populate_physmap, specific physical pageframes are not assigned to the domain because this cannot be done sufficiently quickly (especially for very large allocations in an arbitrarily fragmented system) and so the existing mechanisms result in classic time-of-check-time-of-use (TOCTOU) races. One can think of claiming as similar to a "lazy" allocation, but subsequent hypercalls are required to do the actual physical pageframe allocation. This patch is (so far) only compile-tested. I don't have a patch for the toolstack side, but I envision a "xl create --claim" option to maximize backwards compatibility while minimizing impact on existing toolstacks. Code overview: Though the hypercall simply does arithmetic within locks, some of the semantics in the code may be a bit subtle so let me explain a bit. The key variables (d->unclaimed_pages and total_unclaimed_pages) start at zero if no claim has yet been staked for any domain. (Perhaps a better name is "claimed_but_not_yet_possessed" but that's a bit unwieldy.) If no claim hypercalls are executed, there should be no impact on existing usage. When a claim is successfully staked by a domain, it is like a watermark but there is no record kept of the size of the claim. Instead, d->unclaimed_pages is set to the difference between d->tot_pages and the claim (d->tot_pages may normally be zero but see Note 1). When d->tot_pages increases or decreases, d->unclaimed_pages atomically decreases or increases. Once d->unclaimed_pages reaches zero, the claim is satisfied and d->unclaimed pages stays at zero -- unless a new claim is subsequently staked. See Note 2. The systemwide variable total_unclaimed_pages is always the sum of d->unclaimed_pages, across all domains. A non-domain- specific heap allocation will fail if total_unclaimed_pages exceeds free (plus, on tmem enabled systems, freeable) pages. Claim semantics may be modified by flags. The initial implementation has one flag, which discerns whether the caller would like tmem freeable pages to be considered in determining whether or not the claim can be successfully staked. Future flags may, for example, specify that the caller would like the claim to be successful only if there are sufficient pages available on a single node (per Dario's suggestion). Note 1: Tim: I'm thinking this may resolve your concern that the claim mechanism must be more complicated to handle restricted memory allocations and order>0 allocations. The proposed claim mechanism only guarantees a quantity of order=3D=3D0 pages; if restricted allocations are required, these are done first by the toolstack, and followed by the claim. Order>0 allocations still work if memory is not fragmented, but the claim mechanism doesn't guarantee anything but a quantity of order=3D=3D0 pages. Note 2: Tim: This arithmetic also indirectly implements the "claim auto-expire" discussed earlier. We certainly don't want a negative claim. It's possible that the toolstack need never call "unclaim" (and so such a hypercall/subop need not even exist) as long as domain_reset_unclaimed_pages() is called when a domain dies. This draft doesn't even provide unclaim... though if a reason for its existence is determined, it should be easy to add. Thanks for any feedback! Signed-off-by: Dan Magenheimer Diffstat: arch/x86/mm/mem_sharing.c | 4 - common/grant_table.c | 2=20 common/memory.c | 15 ++++++- common/page_alloc.c | 93 +++++++++++++++++++++++++++++++++++++++++= ++++- include/public/memory.h | 19 +++++++++ include/xen/mm.h | 7 +++ include/xen/sched.h | 1=20 7 files changed, 135 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 5103285..943a3b5 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -639,7 +639,7 @@ static int page_make_sharable(struct domain *d, } =20 page_set_owner(page, dom_cow); - d->tot_pages--; + domain_decrease_tot_pages(d, 1); drop_dom_ref =3D (d->tot_pages =3D=3D 0); page_list_del(page, &d->page_list); spin_unlock(&d->page_alloc_lock); @@ -680,7 +680,7 @@ static int page_make_private(struct domain *d, struct p= age_info *page) ASSERT(page_get_owner(page) =3D=3D dom_cow); page_set_owner(page, d); =20 - if ( d->tot_pages++ =3D=3D 0 ) + if ( domain_increase_tot_pages(d, 1) =3D=3D 0 ) get_domain(d); page_list_add_tail(page, &d->page_list); spin_unlock(&d->page_alloc_lock); diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 7912769..10ce78f 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1656,7 +1656,7 @@ gnttab_transfer( } =20 /* Okay, add the page to 'e'. */ - if ( unlikely(e->tot_pages++ =3D=3D 0) ) + if ( unlikely(domain_increase_tot_pages(e, 1) =3D=3D 0) ) get_knownalive_domain(e); page_list_add_tail(page, &e->page_list); page_set_owner(page, e); diff --git a/xen/common/memory.c b/xen/common/memory.c index 83e2666..fc7b24c 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -454,7 +454,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_= memory_exchange_t) arg) (j * (1UL << exch.out.extent_order))); =20 spin_lock(&d->page_alloc_lock); - d->tot_pages -=3D dec_count; + domain_decrease_tot_pages(d, dec_count); drop_dom_ref =3D (dec_count && !d->tot_pages); spin_unlock(&d->page_alloc_lock); =20 @@ -685,6 +685,19 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_= PARAM(void) arg) break; } =20 + case XENMEM_claim_pages: + + rc =3D rcu_lock_target_domain_by_id(domid, &d); + if ( rc ) + return rc; + + rc =3D domain_set_unclaimed_pages(d, reservation.nr_extents, + reservation.mem_flags); + + rcu_unlock_domain(d); + + break; + default: rc =3D arch_memory_op(op, arg); break; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 15ebc66..ddda9a1 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -238,6 +238,90 @@ static long midsize_alloc_zone_pages; #define MIDSIZE_ALLOC_FRAC 128 =20 static DEFINE_SPINLOCK(heap_lock); +static long total_unclaimed_pages; /* total outstanding claims by all doma= ins */ + +unsigned long domain_increase_tot_pages(struct domain *d, unsigned long pa= ges) +{ + long dom_before, dom_after, dom_claimed, sys_before, sys_after; + + ASSERT(spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&heap_lock); + d->tot_pages +=3D pages; + if ( d->unclaimed_pages ) + { + dom_before =3D d->unclaimed_pages; + dom_after =3D dom_before - pages; + if ( (dom_before > 0) && (dom_after < 0) ) + dom_claimed =3D 0; + else + dom_claimed =3D dom_after; +=09sys_before =3D total_unclaimed_pages; +=09sys_after =3D sys_before - (dom_before - dom_claimed); +=09BUG_ON( (sys_before > 0) && (sys_after < 0) ); + total_unclaimed_pages =3D sys_after; + d->unclaimed_pages =3D dom_claimed; + } + spin_unlock(&heap_lock); + return d->tot_pages; +} + +unsigned long domain_decrease_tot_pages(struct domain *d, unsigned long pa= ges) +{ + ASSERT(spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&heap_lock); + d->tot_pages -=3D pages; + if ( d->unclaimed_pages ) + { + d->unclaimed_pages +=3D pages; +=09total_unclaimed_pages +=3D pages; + } + spin_unlock(&heap_lock); + return d->tot_pages; +} + +int domain_set_unclaimed_pages(struct domain *d, unsigned long pages, + unsigned long flags) +{ + int ret =3D -ENOMEM; + unsigned long avail_pages; + + ASSERT(!spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + /* only one active claim per domain please */ + if ( d->unclaimed_pages ) +=09goto out; + avail_pages =3D total_avail_pages; + if ( !(flags & XENMEM_CLAIMF_free_only) ) + avail_pages +=3D tmem_freeable_pages(); + avail_pages -=3D total_unclaimed_pages; + if ( pages < avail_pages ) + { + /* ok if domain has allocated some pages before making a claim */ + d->unclaimed_pages =3D pages - d->tot_pages; + total_unclaimed_pages +=3D total_unclaimed_pages; + ret =3D 0; + } +out: + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); + return ret; +} + +void domain_reset_unclaimed_pages(struct domain *d) +{ + ASSERT(!spin_is_locked(&d->page_alloc_lock)); + ASSERT(!spin_is_locked(&heap_lock)); + spin_lock(&d->page_alloc_lock); + spin_lock(&heap_lock); + total_unclaimed_pages -=3D d->unclaimed_pages; + d->unclaimed_pages =3D 0; + spin_unlock(&heap_lock); + spin_unlock(&d->page_alloc_lock); +} =20 static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) @@ -442,6 +526,11 @@ static struct page_info *alloc_heap_pages( =20 spin_lock(&heap_lock); =20 + /* Claimed memory is considered not available */ + if ( total_unclaimed_pages + request > + total_avail_pages + tmem_freeable_pages() ) + goto not_found; + /* * TMEM: When available memory is scarce due to tmem absorbing it, all= ow * only mid-size allocations to avoid worst of fragmentation issues. @@ -1291,7 +1380,7 @@ int assign_pages( if ( unlikely(d->tot_pages =3D=3D 0) ) get_knownalive_domain(d); =20 - d->tot_pages +=3D 1 << order; + domain_increase_tot_pages(d, 1 << order); } =20 for ( i =3D 0; i < (1 << order); i++ ) @@ -1375,7 +1464,7 @@ void free_domheap_pages(struct page_info *pg, unsigne= d int order) page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); } =20 - d->tot_pages -=3D 1 << order; + domain_decrease_tot_pages(d, 1 << order); drop_dom_ref =3D (d->tot_pages =3D=3D 0); =20 spin_unlock_recursive(&d->page_alloc_lock); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index f1ddbc0..d8c8b4c 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -421,6 +421,25 @@ struct xen_mem_sharing_op { typedef struct xen_mem_sharing_op xen_mem_sharing_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); =20 +/* + * Attempt to stake a claim for a domain on a quantity of pages + * of system RAM, but _not_ assign specific pageframes. Only + * arithmetic is performed so the hypercall is very fast and need + * not be preemptible, thus sidestepping time-of-check-time-of-use + * races for memory allocation. Returns 0 if the hypervisor page + * allocator has atomically and successfully claimed the requested + * number of pages, else -ENOMEM. + */ +#define XENMEM_claim_pages 24 +/* + * XENMEM_claim_pages flags: + * free_only: claim is successful only if sufficient free pages + * are available. If not set and tmem is enabled, hypervisor + * may also consider tmem "freeable" pages to satisfy the claim. + */ +#define _XENMEM_CLAIMF_free_only 0 +#define XENMEM_CLAIMF_free_only (1U<<_XENMEM_CLAIMF_free_only) + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ =20 #endif /* __XEN_PUBLIC_MEMORY_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 64a0cc1..120b93f 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -48,6 +48,13 @@ void free_xenheap_pages(void *v, unsigned int order); #define alloc_xenheap_page() (alloc_xenheap_pages(0,0)) #define free_xenheap_page(v) (free_xenheap_pages(v,0)) =20 +/* Claim handling */ +unsigned long domain_increase_tot_pages(struct domain *d, unsigned long pa= ges); +unsigned long domain_decrease_tot_pages(struct domain *d, unsigned long pa= ges); +int domain_set_unclaimed_pages( + struct domain *d, unsigned long pages, unsigned long flags); +void domain_reset_unclaimed_pages(struct domain *d); + /* Domain suballocator. These functions are *not* interrupt-safe.*/ void init_domheap_pages(paddr_t ps, paddr_t pe); struct page_info *alloc_domheap_pages( diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 6c55039..480ef39 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -242,6 +242,7 @@ struct domain struct page_list_head page_list; /* linked list */ struct page_list_head xenpage_list; /* linked list (size xenheap_pages= ) */ unsigned int tot_pages; /* number of pages currently possese= d */ + unsigned int unclaimed_pages; /* pages claimed but not possessed = */ unsigned int max_pages; /* maximum value for tot_pages = */ atomic_t shr_pages; /* number of shared pages = */ atomic_t paged_pages; /* number of paged-out pages = */ --__135284541349983992abhmt108.oracle.com Content-Type: application/octet-stream; name="claim-121113.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="claim-121113.patch" ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9tZW1fc2hhcmluZy5jIGIveGVuL2FyY2gveDg2 L21tL21lbV9zaGFyaW5nLmMKaW5kZXggNTEwMzI4NS4uOTQzYTNiNSAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L21tL21lbV9zaGFyaW5nLmMKKysrIGIveGVuL2FyY2gveDg2L21tL21lbV9zaGFy aW5nLmMKQEAgLTYzOSw3ICs2MzksNyBAQCBzdGF0aWMgaW50IHBhZ2VfbWFrZV9zaGFyYWJsZShz dHJ1Y3QgZG9tYWluICpkLAogICAgIH0KIAogICAgIHBhZ2Vfc2V0X293bmVyKHBhZ2UsIGRvbV9j b3cpOwotICAgIGQtPnRvdF9wYWdlcy0tOworICAgIGRvbWFpbl9kZWNyZWFzZV90b3RfcGFnZXMo ZCwgMSk7CiAgICAgZHJvcF9kb21fcmVmID0gKGQtPnRvdF9wYWdlcyA9PSAwKTsKICAgICBwYWdl X2xpc3RfZGVsKHBhZ2UsICZkLT5wYWdlX2xpc3QpOwogICAgIHNwaW5fdW5sb2NrKCZkLT5wYWdl X2FsbG9jX2xvY2spOwpAQCAtNjgwLDcgKzY4MCw3IEBAIHN0YXRpYyBpbnQgcGFnZV9tYWtlX3By aXZhdGUoc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSkKICAgICBBU1NF UlQocGFnZV9nZXRfb3duZXIocGFnZSkgPT0gZG9tX2Nvdyk7CiAgICAgcGFnZV9zZXRfb3duZXIo cGFnZSwgZCk7CiAKLSAgICBpZiAoIGQtPnRvdF9wYWdlcysrID09IDAgKQorICAgIGlmICggZG9t YWluX2luY3JlYXNlX3RvdF9wYWdlcyhkLCAxKSA9PSAwICkKICAgICAgICAgZ2V0X2RvbWFpbihk KTsKICAgICBwYWdlX2xpc3RfYWRkX3RhaWwocGFnZSwgJmQtPnBhZ2VfbGlzdCk7CiAgICAgc3Bp bl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7CmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2dy YW50X3RhYmxlLmMgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKaW5kZXggNzkxMjc2OS4uMTBj ZTc4ZiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCisrKyBiL3hlbi9jb21t b24vZ3JhbnRfdGFibGUuYwpAQCAtMTY1Niw3ICsxNjU2LDcgQEAgZ250dGFiX3RyYW5zZmVyKAog ICAgICAgICB9CiAKICAgICAgICAgLyogT2theSwgYWRkIHRoZSBwYWdlIHRvICdlJy4gKi8KLSAg ICAgICAgaWYgKCB1bmxpa2VseShlLT50b3RfcGFnZXMrKyA9PSAwKSApCisgICAgICAgIGlmICgg dW5saWtlbHkoZG9tYWluX2luY3JlYXNlX3RvdF9wYWdlcyhlLCAxKSA9PSAwKSApCiAgICAgICAg ICAgICBnZXRfa25vd25hbGl2ZV9kb21haW4oZSk7CiAgICAgICAgIHBhZ2VfbGlzdF9hZGRfdGFp bChwYWdlLCAmZS0+cGFnZV9saXN0KTsKICAgICAgICAgcGFnZV9zZXRfb3duZXIocGFnZSwgZSk7 CmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL21lbW9yeS5jIGIveGVuL2NvbW1vbi9tZW1vcnkuYwpp bmRleCA4M2UyNjY2Li5mYzdiMjRjIDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL21lbW9yeS5jCisr KyBiL3hlbi9jb21tb24vbWVtb3J5LmMKQEAgLTQ1NCw3ICs0NTQsNyBAQCBzdGF0aWMgbG9uZyBt ZW1vcnlfZXhjaGFuZ2UoWEVOX0dVRVNUX0hBTkRMRV9QQVJBTSh4ZW5fbWVtb3J5X2V4Y2hhbmdl X3QpIGFyZykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGogKiAoMVVMIDw8IGV4Y2gu b3V0LmV4dGVudF9vcmRlcikpKTsKIAogICAgICAgICAgICAgICAgIHNwaW5fbG9jaygmZC0+cGFn ZV9hbGxvY19sb2NrKTsKLSAgICAgICAgICAgICAgICBkLT50b3RfcGFnZXMgLT0gZGVjX2NvdW50 OworICAgICAgICAgICAgICAgIGRvbWFpbl9kZWNyZWFzZV90b3RfcGFnZXMoZCwgZGVjX2NvdW50 KTsKICAgICAgICAgICAgICAgICBkcm9wX2RvbV9yZWYgPSAoZGVjX2NvdW50ICYmICFkLT50b3Rf cGFnZXMpOwogICAgICAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2sp OwogCkBAIC02ODUsNiArNjg1LDE5IEBAIGxvbmcgZG9fbWVtb3J5X29wKHVuc2lnbmVkIGxvbmcg Y21kLCBYRU5fR1VFU1RfSEFORExFX1BBUkFNKHZvaWQpIGFyZykKICAgICAgICAgYnJlYWs7CiAg ICAgfQogCisgICAgY2FzZSBYRU5NRU1fY2xhaW1fcGFnZXM6CisKKyAgICAgICAgcmMgPSByY3Vf bG9ja190YXJnZXRfZG9tYWluX2J5X2lkKGRvbWlkLCAmZCk7CisgICAgICAgIGlmICggcmMgKQor ICAgICAgICAgICAgcmV0dXJuIHJjOworCisgICAgICAgIHJjID0gZG9tYWluX3NldF91bmNsYWlt ZWRfcGFnZXMoZCwgcmVzZXJ2YXRpb24ubnJfZXh0ZW50cywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXNlcnZhdGlvbi5tZW1fZmxhZ3MpOworCisgICAgICAgIHJj dV91bmxvY2tfZG9tYWluKGQpOworCisgICAgICAgIGJyZWFrOworCiAgICAgZGVmYXVsdDoKICAg ICAgICAgcmMgPSBhcmNoX21lbW9yeV9vcChvcCwgYXJnKTsKICAgICAgICAgYnJlYWs7CmRpZmYg LS1naXQgYS94ZW4vY29tbW9uL3BhZ2VfYWxsb2MuYyBiL3hlbi9jb21tb24vcGFnZV9hbGxvYy5j CmluZGV4IDE1ZWJjNjYuLmRkZGE5YTEgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24vcGFnZV9hbGxv Yy5jCisrKyBiL3hlbi9jb21tb24vcGFnZV9hbGxvYy5jCkBAIC0yMzgsNiArMjM4LDkwIEBAIHN0 YXRpYyBsb25nIG1pZHNpemVfYWxsb2Nfem9uZV9wYWdlczsKICNkZWZpbmUgTUlEU0laRV9BTExP Q19GUkFDIDEyOAogCiBzdGF0aWMgREVGSU5FX1NQSU5MT0NLKGhlYXBfbG9jayk7CitzdGF0aWMg bG9uZyB0b3RhbF91bmNsYWltZWRfcGFnZXM7IC8qIHRvdGFsIG91dHN0YW5kaW5nIGNsYWltcyBi eSBhbGwgZG9tYWlucyAqLworCit1bnNpZ25lZCBsb25nIGRvbWFpbl9pbmNyZWFzZV90b3RfcGFn ZXMoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBwYWdlcykKK3sKKyAgICBsb25nIGRv bV9iZWZvcmUsIGRvbV9hZnRlciwgZG9tX2NsYWltZWQsIHN5c19iZWZvcmUsIHN5c19hZnRlcjsK KworICAgIEFTU0VSVChzcGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAg QVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZoZWFw X2xvY2spOworICAgIGQtPnRvdF9wYWdlcyArPSBwYWdlczsKKyAgICBpZiAoIGQtPnVuY2xhaW1l ZF9wYWdlcyApCisgICAgeworICAgICAgICBkb21fYmVmb3JlID0gZC0+dW5jbGFpbWVkX3BhZ2Vz OworICAgICAgICBkb21fYWZ0ZXIgPSBkb21fYmVmb3JlIC0gcGFnZXM7CisgICAgICAgIGlmICgg KGRvbV9iZWZvcmUgPiAwKSAmJiAoZG9tX2FmdGVyIDwgMCkgKQorICAgICAgICAgICAgZG9tX2Ns YWltZWQgPSAwOworICAgICAgICBlbHNlCisgICAgICAgICAgICBkb21fY2xhaW1lZCA9IGRvbV9h ZnRlcjsKKwlzeXNfYmVmb3JlID0gdG90YWxfdW5jbGFpbWVkX3BhZ2VzOworCXN5c19hZnRlciA9 IHN5c19iZWZvcmUgLSAoZG9tX2JlZm9yZSAtIGRvbV9jbGFpbWVkKTsKKwlCVUdfT04oIChzeXNf YmVmb3JlID4gMCkgJiYgKHN5c19hZnRlciA8IDApICk7CisgICAgICAgIHRvdGFsX3VuY2xhaW1l ZF9wYWdlcyA9IHN5c19hZnRlcjsKKyAgICAgICAgZC0+dW5jbGFpbWVkX3BhZ2VzID0gZG9tX2Ns YWltZWQ7CisgICAgfQorICAgIHNwaW5fdW5sb2NrKCZoZWFwX2xvY2spOworICAgIHJldHVybiBk LT50b3RfcGFnZXM7Cit9CisKK3Vuc2lnbmVkIGxvbmcgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdl cyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzKQoreworICAgIEFTU0VSVChz cGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lz X2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZoZWFwX2xvY2spOworICAgIGQt PnRvdF9wYWdlcyAtPSBwYWdlczsKKyAgICBpZiAoIGQtPnVuY2xhaW1lZF9wYWdlcyApCisgICAg eworICAgICAgICBkLT51bmNsYWltZWRfcGFnZXMgKz0gcGFnZXM7CisJdG90YWxfdW5jbGFpbWVk X3BhZ2VzICs9IHBhZ2VzOworICAgIH0KKyAgICBzcGluX3VubG9jaygmaGVhcF9sb2NrKTsKKyAg ICByZXR1cm4gZC0+dG90X3BhZ2VzOworfQorCitpbnQgZG9tYWluX3NldF91bmNsYWltZWRfcGFn ZXMoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBwYWdlcywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBmbGFncykKK3sKKyAgICBpbnQgcmV0ID0g LUVOT01FTTsKKyAgICB1bnNpZ25lZCBsb25nIGF2YWlsX3BhZ2VzOworCisgICAgQVNTRVJUKCFz cGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxvY19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lz X2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAgc3Bpbl9sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2sp OworICAgIHNwaW5fbG9jaygmaGVhcF9sb2NrKTsKKyAgICAvKiBvbmx5IG9uZSBhY3RpdmUgY2xh aW0gcGVyIGRvbWFpbiBwbGVhc2UgKi8KKyAgICBpZiAoIGQtPnVuY2xhaW1lZF9wYWdlcyApCisJ Z290byBvdXQ7CisgICAgYXZhaWxfcGFnZXMgPSB0b3RhbF9hdmFpbF9wYWdlczsKKyAgICBpZiAo ICEoZmxhZ3MgJiBYRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSkgKQorICAgICAgICBhdmFpbF9wYWdl cyArPSB0bWVtX2ZyZWVhYmxlX3BhZ2VzKCk7CisgICAgYXZhaWxfcGFnZXMgLT0gdG90YWxfdW5j bGFpbWVkX3BhZ2VzOworICAgIGlmICggcGFnZXMgPCBhdmFpbF9wYWdlcyApCisgICAgeworICAg ICAgICAvKiBvayBpZiBkb21haW4gaGFzIGFsbG9jYXRlZCBzb21lIHBhZ2VzIGJlZm9yZSBtYWtp bmcgYSBjbGFpbSAqLworICAgICAgICBkLT51bmNsYWltZWRfcGFnZXMgPSBwYWdlcyAtIGQtPnRv dF9wYWdlczsKKyAgICAgICAgdG90YWxfdW5jbGFpbWVkX3BhZ2VzICs9IHRvdGFsX3VuY2xhaW1l ZF9wYWdlczsKKyAgICAgICAgcmV0ID0gMDsKKyAgICB9CitvdXQ6CisgICAgc3Bpbl91bmxvY2so JmhlYXBfbG9jayk7CisgICAgc3Bpbl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7CisgICAg cmV0dXJuIHJldDsKK30KKwordm9pZCBkb21haW5fcmVzZXRfdW5jbGFpbWVkX3BhZ2VzKHN0cnVj dCBkb21haW4gKmQpCit7CisgICAgQVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmZC0+cGFnZV9hbGxv Y19sb2NrKSk7CisgICAgQVNTRVJUKCFzcGluX2lzX2xvY2tlZCgmaGVhcF9sb2NrKSk7CisgICAg c3Bpbl9sb2NrKCZkLT5wYWdlX2FsbG9jX2xvY2spOworICAgIHNwaW5fbG9jaygmaGVhcF9sb2Nr KTsKKyAgICB0b3RhbF91bmNsYWltZWRfcGFnZXMgLT0gZC0+dW5jbGFpbWVkX3BhZ2VzOworICAg IGQtPnVuY2xhaW1lZF9wYWdlcyA9IDA7CisgICAgc3Bpbl91bmxvY2soJmhlYXBfbG9jayk7Cisg ICAgc3Bpbl91bmxvY2soJmQtPnBhZ2VfYWxsb2NfbG9jayk7Cit9CiAKIHN0YXRpYyB1bnNpZ25l ZCBsb25nIGluaXRfbm9kZV9oZWFwKGludCBub2RlLCB1bnNpZ25lZCBsb25nIG1mbiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsIGJvb2xfdCAq dXNlX3RhaWwpCkBAIC00NDIsNiArNTI2LDExIEBAIHN0YXRpYyBzdHJ1Y3QgcGFnZV9pbmZvICph bGxvY19oZWFwX3BhZ2VzKAogCiAgICAgc3Bpbl9sb2NrKCZoZWFwX2xvY2spOwogCisgICAgLyog Q2xhaW1lZCBtZW1vcnkgaXMgY29uc2lkZXJlZCBub3QgYXZhaWxhYmxlICovCisgICAgaWYgKCB0 b3RhbF91bmNsYWltZWRfcGFnZXMgKyByZXF1ZXN0ID4KKyAgICAgICAgIHRvdGFsX2F2YWlsX3Bh Z2VzICsgdG1lbV9mcmVlYWJsZV9wYWdlcygpICkKKyAgICAgICAgZ290byBub3RfZm91bmQ7CisK ICAgICAvKgogICAgICAqIFRNRU06IFdoZW4gYXZhaWxhYmxlIG1lbW9yeSBpcyBzY2FyY2UgZHVl IHRvIHRtZW0gYWJzb3JiaW5nIGl0LCBhbGxvdwogICAgICAqIG9ubHkgbWlkLXNpemUgYWxsb2Nh dGlvbnMgdG8gYXZvaWQgd29yc3Qgb2YgZnJhZ21lbnRhdGlvbiBpc3N1ZXMuCkBAIC0xMjkxLDcg KzEzODAsNyBAQCBpbnQgYXNzaWduX3BhZ2VzKAogICAgICAgICBpZiAoIHVubGlrZWx5KGQtPnRv dF9wYWdlcyA9PSAwKSApCiAgICAgICAgICAgICBnZXRfa25vd25hbGl2ZV9kb21haW4oZCk7CiAK LSAgICAgICAgZC0+dG90X3BhZ2VzICs9IDEgPDwgb3JkZXI7CisgICAgICAgIGRvbWFpbl9pbmNy ZWFzZV90b3RfcGFnZXMoZCwgMSA8PCBvcmRlcik7CiAgICAgfQogCiAgICAgZm9yICggaSA9IDA7 IGkgPCAoMSA8PCBvcmRlcik7IGkrKyApCkBAIC0xMzc1LDcgKzE0NjQsNyBAQCB2b2lkIGZyZWVf ZG9taGVhcF9wYWdlcyhzdHJ1Y3QgcGFnZV9pbmZvICpwZywgdW5zaWduZWQgaW50IG9yZGVyKQog ICAgICAgICAgICAgcGFnZV9saXN0X2RlbDIoJnBnW2ldLCAmZC0+cGFnZV9saXN0LCAmZC0+YXJj aC5yZWxtZW1fbGlzdCk7CiAgICAgICAgIH0KIAotICAgICAgICBkLT50b3RfcGFnZXMgLT0gMSA8 PCBvcmRlcjsKKyAgICAgICAgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdlcyhkLCAxIDw8IG9yZGVy KTsKICAgICAgICAgZHJvcF9kb21fcmVmID0gKGQtPnRvdF9wYWdlcyA9PSAwKTsKIAogICAgICAg ICBzcGluX3VubG9ja19yZWN1cnNpdmUoJmQtPnBhZ2VfYWxsb2NfbG9jayk7CmRpZmYgLS1naXQg YS94ZW4vaW5jbHVkZS9wdWJsaWMvbWVtb3J5LmggYi94ZW4vaW5jbHVkZS9wdWJsaWMvbWVtb3J5 LmgKaW5kZXggZjFkZGJjMC4uZDhjOGI0YyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvcHVibGlj L21lbW9yeS5oCisrKyBiL3hlbi9pbmNsdWRlL3B1YmxpYy9tZW1vcnkuaApAQCAtNDIxLDYgKzQy MSwyNSBAQCBzdHJ1Y3QgeGVuX21lbV9zaGFyaW5nX29wIHsKIHR5cGVkZWYgc3RydWN0IHhlbl9t ZW1fc2hhcmluZ19vcCB4ZW5fbWVtX3NoYXJpbmdfb3BfdDsKIERFRklORV9YRU5fR1VFU1RfSEFO RExFKHhlbl9tZW1fc2hhcmluZ19vcF90KTsKIAorLyoKKyAqIEF0dGVtcHQgdG8gc3Rha2UgYSBj bGFpbSBmb3IgYSBkb21haW4gb24gYSBxdWFudGl0eSBvZiBwYWdlcworICogb2Ygc3lzdGVtIFJB TSwgYnV0IF9ub3RfIGFzc2lnbiBzcGVjaWZpYyBwYWdlZnJhbWVzLiAgT25seQorICogYXJpdGht ZXRpYyBpcyBwZXJmb3JtZWQgc28gdGhlIGh5cGVyY2FsbCBpcyB2ZXJ5IGZhc3QgYW5kIG5lZWQK KyAqIG5vdCBiZSBwcmVlbXB0aWJsZSwgdGh1cyBzaWRlc3RlcHBpbmcgdGltZS1vZi1jaGVjay10 aW1lLW9mLXVzZQorICogcmFjZXMgZm9yIG1lbW9yeSBhbGxvY2F0aW9uLiAgUmV0dXJucyAwIGlm IHRoZSBoeXBlcnZpc29yIHBhZ2UKKyAqIGFsbG9jYXRvciBoYXMgYXRvbWljYWxseSBhbmQgc3Vj Y2Vzc2Z1bGx5IGNsYWltZWQgdGhlIHJlcXVlc3RlZAorICogbnVtYmVyIG9mIHBhZ2VzLCBlbHNl IC1FTk9NRU0uCisgKi8KKyNkZWZpbmUgWEVOTUVNX2NsYWltX3BhZ2VzICAgICAgICAgICAgICAg ICAgMjQKKy8qCisgKiBYRU5NRU1fY2xhaW1fcGFnZXMgZmxhZ3M6CisgKiAgZnJlZV9vbmx5OiBj bGFpbSBpcyBzdWNjZXNzZnVsIG9ubHkgaWYgc3VmZmljaWVudCBmcmVlIHBhZ2VzCisgKiAgICBh cmUgYXZhaWxhYmxlLiAgSWYgbm90IHNldCBhbmQgdG1lbSBpcyBlbmFibGVkLCBoeXBlcnZpc29y CisgKiAgICBtYXkgYWxzbyBjb25zaWRlciB0bWVtICJmcmVlYWJsZSIgcGFnZXMgdG8gc2F0aXNm eSB0aGUgY2xhaW0uCisgKi8KKyNkZWZpbmUgX1hFTk1FTV9DTEFJTUZfZnJlZV9vbmx5ICAgICAg ICAgICAgMAorI2RlZmluZSBYRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSAgICAgICAgICAgICAoMVU8 PF9YRU5NRU1fQ0xBSU1GX2ZyZWVfb25seSkKKwogI2VuZGlmIC8qIGRlZmluZWQoX19YRU5fXykg fHwgZGVmaW5lZChfX1hFTl9UT09MU19fKSAqLwogCiAjZW5kaWYgLyogX19YRU5fUFVCTElDX01F TU9SWV9IX18gKi8KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3hlbi9tbS5oIGIveGVuL2luY2x1 ZGUveGVuL21tLmgKaW5kZXggNjRhMGNjMS4uMTIwYjkzZiAxMDA2NDQKLS0tIGEveGVuL2luY2x1 ZGUveGVuL21tLmgKKysrIGIveGVuL2luY2x1ZGUveGVuL21tLmgKQEAgLTQ4LDYgKzQ4LDEzIEBA IHZvaWQgZnJlZV94ZW5oZWFwX3BhZ2VzKHZvaWQgKnYsIHVuc2lnbmVkIGludCBvcmRlcik7CiAj ZGVmaW5lIGFsbG9jX3hlbmhlYXBfcGFnZSgpIChhbGxvY194ZW5oZWFwX3BhZ2VzKDAsMCkpCiAj ZGVmaW5lIGZyZWVfeGVuaGVhcF9wYWdlKHYpIChmcmVlX3hlbmhlYXBfcGFnZXModiwwKSkKIAor LyogQ2xhaW0gaGFuZGxpbmcgKi8KK3Vuc2lnbmVkIGxvbmcgZG9tYWluX2luY3JlYXNlX3RvdF9w YWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzKTsKK3Vuc2lnbmVkIGxv bmcgZG9tYWluX2RlY3JlYXNlX3RvdF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBs b25nIHBhZ2VzKTsKK2ludCBkb21haW5fc2V0X3VuY2xhaW1lZF9wYWdlcygKKyAgICBzdHJ1Y3Qg ZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHBhZ2VzLCB1bnNpZ25lZCBsb25nIGZsYWdzKTsKK3Zv aWQgZG9tYWluX3Jlc2V0X3VuY2xhaW1lZF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkKTsKKwogLyog RG9tYWluIHN1YmFsbG9jYXRvci4gVGhlc2UgZnVuY3Rpb25zIGFyZSAqbm90KiBpbnRlcnJ1cHQt c2FmZS4qLwogdm9pZCBpbml0X2RvbWhlYXBfcGFnZXMocGFkZHJfdCBwcywgcGFkZHJfdCBwZSk7 CiBzdHJ1Y3QgcGFnZV9pbmZvICphbGxvY19kb21oZWFwX3BhZ2VzKApkaWZmIC0tZ2l0IGEveGVu L2luY2x1ZGUveGVuL3NjaGVkLmggYi94ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaAppbmRleCA2YzU1 MDM5Li40ODBlZjM5IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaAorKysgYi94 ZW4vaW5jbHVkZS94ZW4vc2NoZWQuaApAQCAtMjQyLDYgKzI0Miw3IEBAIHN0cnVjdCBkb21haW4K ICAgICBzdHJ1Y3QgcGFnZV9saXN0X2hlYWQgcGFnZV9saXN0OyAgLyogbGlua2VkIGxpc3QgKi8K ICAgICBzdHJ1Y3QgcGFnZV9saXN0X2hlYWQgeGVucGFnZV9saXN0OyAvKiBsaW5rZWQgbGlzdCAo c2l6ZSB4ZW5oZWFwX3BhZ2VzKSAqLwogICAgIHVuc2lnbmVkIGludCAgICAgdG90X3BhZ2VzOyAg ICAgICAvKiBudW1iZXIgb2YgcGFnZXMgY3VycmVudGx5IHBvc3Nlc2VkICovCisgICAgdW5zaWdu ZWQgaW50ICAgICB1bmNsYWltZWRfcGFnZXM7IC8qIHBhZ2VzIGNsYWltZWQgYnV0IG5vdCBwb3Nz ZXNzZWQgICAgKi8KICAgICB1bnNpZ25lZCBpbnQgICAgIG1heF9wYWdlczsgICAgICAgLyogbWF4 aW11bSB2YWx1ZSBmb3IgdG90X3BhZ2VzICAgICAgICAqLwogICAgIGF0b21pY190ICAgICAgICAg c2hyX3BhZ2VzOyAgICAgICAvKiBudW1iZXIgb2Ygc2hhcmVkIHBhZ2VzICAgICAgICAgICAgICov CiAgICAgYXRvbWljX3QgICAgICAgICBwYWdlZF9wYWdlczsgICAgIC8qIG51bWJlciBvZiBwYWdl ZC1vdXQgcGFnZXMgICAgICAgICAgKi8K --__135284541349983992abhmt108.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__135284541349983992abhmt108.oracle.com-- From xen-devel-bounces@lists.xen.org Tue Nov 13 23:43:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 23:43:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8O-00027b-Rs; Tue, 13 Nov 2012 23:43:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8N-00027W-8e for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 23:43:11 +0000 Received: from [85.158.137.99:23524] by server-10.bemta-3.messagelabs.com id AB/DA-19806-E0BD2A05; Tue, 13 Nov 2012 23:43:10 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352850189!18105728!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32289 invoked from network); 13 Nov 2012 23:43:09 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 23:43:09 -0000 X-IronPort-AV: E=Sophos;i="4.83,768,1352073600"; d="scan'208";a="15790395" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 23:43:05 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 23:43:04 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8G-0001Qh-Rj; Tue, 13 Nov 2012 23:43:04 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYQ8G-0004iv-8v; Tue, 13 Nov 2012 23:43:04 +0000 To: Message-ID: From: xen.org Date: Tue, 13 Nov 2012 23:43:04 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.1-testing test] 14387: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14387 xen-4.1-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14387/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail like 14149 test-amd64-amd64-xl-sedf 14 guest-localmigrate/x10 fail like 14149 Tests which did not succeed, but are not blocking: test-amd64-i386-qemuu-rhel6hvm-intel 11 leak-check/check fail never pass test-amd64-i386-qemuu-rhel6hvm-amd 11 leak-check/check fail never pass test-amd64-i386-rhel6hvm-intel 11 leak-check/check fail never pass test-amd64-i386-rhel6hvm-amd 11 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 13 guest-stop fail never pass test-i386-i386-xl-qemuu-winxpsp3 13 guest-stop fail never pass version targeted for testing: xen 26281a1650dc baseline version: xen 700d0f03d50a ------------------------------------------------------------ People who touched revisions under test: Chuang Cao Frediano Ziglio Ian Campbell Ian Jackson Jan Beulich Joe Jin Keir Fraser Matt Wilson Olaf Hering ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd fail test-amd64-i386-qemuu-rhel6hvm-amd fail test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel fail test-amd64-i386-qemuu-rhel6hvm-intel fail test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin pass test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.1-testing + revision=26281a1650dc + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.1-testing 26281a1650dc + branch=xen-4.1-testing + revision=26281a1650dc + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.1-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.1-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.1-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.1-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.1-testing.git ++ : daily-cron.xen-4.1-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.1-testing.git + info_linux_tree xen-4.1-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.1-testing.hg + hg push -r 26281a1650dc ssh://xen@xenbits.xensource.com/HG/xen-4.1-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.1-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 10 changesets with 10 changes to 7 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Tue Nov 13 23:43:46 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 13 Nov 2012 23:43:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8O-00027b-Rs; Tue, 13 Nov 2012 23:43:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8N-00027W-8e for xen-devel@lists.xensource.com; Tue, 13 Nov 2012 23:43:11 +0000 Received: from [85.158.137.99:23524] by server-10.bemta-3.messagelabs.com id AB/DA-19806-E0BD2A05; Tue, 13 Nov 2012 23:43:10 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-11.tower-217.messagelabs.com!1352850189!18105728!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTgzMTE=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32289 invoked from network); 13 Nov 2012 23:43:09 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-11.tower-217.messagelabs.com with RC4-SHA encrypted SMTP; 13 Nov 2012 23:43:09 -0000 X-IronPort-AV: E=Sophos;i="4.83,768,1352073600"; d="scan'208";a="15790395" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Nov 2012 23:43:05 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Tue, 13 Nov 2012 23:43:04 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYQ8G-0001Qh-Rj; Tue, 13 Nov 2012 23:43:04 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYQ8G-0004iv-8v; Tue, 13 Nov 2012 23:43:04 +0000 To: Message-ID: From: xen.org Date: Tue, 13 Nov 2012 23:43:04 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.1-testing test] 14387: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14387 xen-4.1-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14387/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-pcipt-intel 8 debian-fixup fail like 14149 test-amd64-amd64-xl-sedf 14 guest-localmigrate/x10 fail like 14149 Tests which did not succeed, but are not blocking: test-amd64-i386-qemuu-rhel6hvm-intel 11 leak-check/check fail never pass test-amd64-i386-qemuu-rhel6hvm-amd 11 leak-check/check fail never pass test-amd64-i386-rhel6hvm-intel 11 leak-check/check fail never pass test-amd64-i386-rhel6hvm-amd 11 leak-check/check fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 13 guest-stop fail never pass test-i386-i386-xl-qemuu-winxpsp3 13 guest-stop fail never pass version targeted for testing: xen 26281a1650dc baseline version: xen 700d0f03d50a ------------------------------------------------------------ People who touched revisions under test: Chuang Cao Frediano Ziglio Ian Campbell Ian Jackson Jan Beulich Joe Jin Keir Fraser Matt Wilson Olaf Hering ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd fail test-amd64-i386-qemuu-rhel6hvm-amd fail test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel fail test-amd64-i386-qemuu-rhel6hvm-intel fail test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin pass test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.1-testing + revision=26281a1650dc + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.1-testing 26281a1650dc + branch=xen-4.1-testing + revision=26281a1650dc + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.1-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.1-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.1-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.1-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.1-testing.git ++ : daily-cron.xen-4.1-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.1-testing.git + info_linux_tree xen-4.1-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.1-testing.hg + hg push -r 26281a1650dc ssh://xen@xenbits.xensource.com/HG/xen-4.1-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.1-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 10 changesets with 10 changes to 7 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 00:09:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 00:09:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQXG-0003RT-4R; Wed, 14 Nov 2012 00:08:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQXF-0003RO-JM for xen-devel@lists.xen.org; Wed, 14 Nov 2012 00:08:53 +0000 Received: from [85.158.139.211:9410] by server-6.bemta-5.messagelabs.com id F8/40-19321-411E2A05; Wed, 14 Nov 2012 00:08:52 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352851730!19626006!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA2MTE2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2951 invoked from network); 14 Nov 2012 00:08:51 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 00:08:51 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE08ULc012641 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 00:08:31 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE08TCA005099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 00:08:30 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE08TQb014601; Tue, 13 Nov 2012 18:08:29 -0600 MIME-Version: 1.0 Message-ID: <90421d4a-2b5e-49de-9c0f-e4c914980e7f@default> Date: Tue, 13 Nov 2012 16:08:26 -0800 (PST) From: Dan Magenheimer To: Ian Campbell , Ian Jackson References: <38bc9a60-827c-41f8-a667-e08960b8c135@default> In-Reply-To: <38bc9a60-827c-41f8-a667-e08960b8c135@default> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen-tmem-list-parse: fix ugly parse output X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ping? (Sorry if I am being too impatient... I just saw a tmem hypervisor fix go in and it reminded me to look for this tools fix.) > -----Original Message----- > From: Dan Magenheimer > Sent: Thursday, November 01, 2012 10:43 AM > To: Ian Campbell; Ian Jackson > Cc: xen-devel@lists.xen.org > Subject: [PATCH] xen-tmem-list-parse: fix ugly parse output > > Hmmm... It appears I never posted the corrected version of this patch > so it never made it upstream. See: > > http://lists.xen.org/archives/html/xen-devel/2011-11/msg00587.html > http://lists.xen.org/archives/html/xen-devel/2011-11/msg02145.html > > It would be good if this very minor fix was also applied to 4.2 > (and, if possible, 4.1). > > Thanks, > Dan > > =================== > > The program xen-tmem-list-parse parses the output of xm/xl tmem-list > into human-readable format. A missing NULL terminator sometimes > causes garbage to be spewed where the two-letter pool type > should be output. > > Signed-off-by: Dan Magenheimer > --- > tools/misc/xen-tmem-list-parse.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/tools/misc/xen-tmem-list-parse.c b/tools/misc/xen-tmem-list-parse.c > index 977e4d3..f32b107 100644 > --- a/tools/misc/xen-tmem-list-parse.c > +++ b/tools/misc/xen-tmem-list-parse.c > @@ -243,6 +243,7 @@ void parse_pool(char *s) > unsigned long long flush_objs = parse(s,"ot"); > > parse_string(s,"PT",pool_type,2); > + pool_type[2] = '\0'; > if (pool_type[1] == 'S') > return; /* no need to repeat print data for shared pools */ > printf("domid%lu,id%lu[%s]:pgp=%llu(max=%llu) obj=%llu(%llu) " > @@ -286,6 +287,7 @@ void parse_shared_pool(char *s) > unsigned long long flush_objs = parse(s,"ot"); > > parse_string(s,"PT",pool_type,2); > + pool_type[2] = '\0'; > parse_sharers(s,"SC",buf,BUFSIZE); > printf("poolid=%lu[%s] uuid=%llx.%llx, shared-by:%s: " > "pgp=%llu(max=%llu) obj=%llu(%llu) " > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 00:09:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 00:09:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQXG-0003RT-4R; Wed, 14 Nov 2012 00:08:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQXF-0003RO-JM for xen-devel@lists.xen.org; Wed, 14 Nov 2012 00:08:53 +0000 Received: from [85.158.139.211:9410] by server-6.bemta-5.messagelabs.com id F8/40-19321-411E2A05; Wed, 14 Nov 2012 00:08:52 +0000 X-Env-Sender: dan.magenheimer@oracle.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1352851730!19626006!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA2MTE2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2951 invoked from network); 14 Nov 2012 00:08:51 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 00:08:51 -0000 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE08ULc012641 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 00:08:31 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE08TCA005099 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 00:08:30 GMT Received: from abhmt108.oracle.com (abhmt108.oracle.com [141.146.116.60]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE08TQb014601; Tue, 13 Nov 2012 18:08:29 -0600 MIME-Version: 1.0 Message-ID: <90421d4a-2b5e-49de-9c0f-e4c914980e7f@default> Date: Tue, 13 Nov 2012 16:08:26 -0800 (PST) From: Dan Magenheimer To: Ian Campbell , Ian Jackson References: <38bc9a60-827c-41f8-a667-e08960b8c135@default> In-Reply-To: <38bc9a60-827c-41f8-a667-e08960b8c135@default> X-Priority: 3 X-Mailer: Oracle Beehive Extensions for Outlook 2.0.1.7 (607090) [OL 12.0.6661.5003 (x86)] X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Cc: xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] xen-tmem-list-parse: fix ugly parse output X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org Ping? (Sorry if I am being too impatient... I just saw a tmem hypervisor fix go in and it reminded me to look for this tools fix.) > -----Original Message----- > From: Dan Magenheimer > Sent: Thursday, November 01, 2012 10:43 AM > To: Ian Campbell; Ian Jackson > Cc: xen-devel@lists.xen.org > Subject: [PATCH] xen-tmem-list-parse: fix ugly parse output > > Hmmm... It appears I never posted the corrected version of this patch > so it never made it upstream. See: > > http://lists.xen.org/archives/html/xen-devel/2011-11/msg00587.html > http://lists.xen.org/archives/html/xen-devel/2011-11/msg02145.html > > It would be good if this very minor fix was also applied to 4.2 > (and, if possible, 4.1). > > Thanks, > Dan > > =================== > > The program xen-tmem-list-parse parses the output of xm/xl tmem-list > into human-readable format. A missing NULL terminator sometimes > causes garbage to be spewed where the two-letter pool type > should be output. > > Signed-off-by: Dan Magenheimer > --- > tools/misc/xen-tmem-list-parse.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/tools/misc/xen-tmem-list-parse.c b/tools/misc/xen-tmem-list-parse.c > index 977e4d3..f32b107 100644 > --- a/tools/misc/xen-tmem-list-parse.c > +++ b/tools/misc/xen-tmem-list-parse.c > @@ -243,6 +243,7 @@ void parse_pool(char *s) > unsigned long long flush_objs = parse(s,"ot"); > > parse_string(s,"PT",pool_type,2); > + pool_type[2] = '\0'; > if (pool_type[1] == 'S') > return; /* no need to repeat print data for shared pools */ > printf("domid%lu,id%lu[%s]:pgp=%llu(max=%llu) obj=%llu(%llu) " > @@ -286,6 +287,7 @@ void parse_shared_pool(char *s) > unsigned long long flush_objs = parse(s,"ot"); > > parse_string(s,"PT",pool_type,2); > + pool_type[2] = '\0'; > parse_sharers(s,"SC",buf,BUFSIZE); > printf("poolid=%lu[%s] uuid=%llx.%llx, shared-by:%s: " > "pgp=%llu(max=%llu) obj=%llu(%llu) " > -- > 1.7.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 00:38:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 00:38:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQzH-0004Q7-Hd; Wed, 14 Nov 2012 00:37:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQzG-0004Q2-29 for xen-devel@lists.xen.org; Wed, 14 Nov 2012 00:37:50 +0000 Received: from [85.158.138.51:65042] by server-14.bemta-3.messagelabs.com id 02/D7-12788-CD7E2A05; Wed, 14 Nov 2012 00:37:48 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352853466!29819419!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3OTEzOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20811 invoked from network); 14 Nov 2012 00:37:47 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-16.tower-174.messagelabs.com with SMTP; 14 Nov 2012 00:37:47 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 13 Nov 2012 16:37:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.83,247,1352102400"; d="scan'208";a="246617621" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by fmsmga001.fm.intel.com with ESMTP; 13 Nov 2012 16:37:43 -0800 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 16:37:42 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 16:37:42 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Wed, 14 Nov 2012 08:37:40 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFggAAyLdWAADp0YP//g6QAgAEdtPA= Date: Wed, 14 Nov 2012 00:37:39 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> <50A2755402000078000A837D@nat28.tlf.novell.com> In-Reply-To: <50A2755402000078000A837D@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 11:29 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 16:02, "Zhang, Xiantao" > wrote: > >> From: Jan Beulich [mailto:JBeulich@suse.com] > >> > If software cannot see it, then how to use it? If there still have > >> > an approach to detect it, then xen can do it too and setup the > >> > context entry as passthrough. > >> > >> We see it the latest at the point the fault occurs. So there are > >> multiple > >> options: > >> a) if the device is "real" as in having a valid config space despite > >> func 0 not advertising itself as multi-function, we have ways to > >> discover the device (at boot time) > > > > I think current Xen logic also covers multi-function devices case. > > When Xen boots up, it will scan all functions of devices on each bus, > > through reads their vendor ID. If the vendor ID is valid, Xen deems > > this BDF has a real device/function existed there > > Not anymore - we're now honoring the multi-function flag in > _scan_pci_devices() (as Linux always did in its bus scan logic); see c/s > 22337:7afd8dd1d6cb (with a subsequent adjustment in c/s > 25869:59b3663316db). > > >> b) we could insert the context entry in the fault handler, assuming > >> the device is able to recover > > At least current VT-d doesn't have recovery fault supported, so each > > triggered faults are fatal. > > Fatal in what sense? I would assume that if the driver retries the operation, it > would succeed if the first fault causes the context entry to be inserted. If the driver knows the fact, it should work. For VT-d without fault recovery capability, it should do nothing for the unknown translations which maybe faked by some malicious devices. > >> c) we could provide a command line option to allow fake devices to > >> be create > > > > Agree, this maybe a feasible solution I can figure out, so far. > > > >> d) we could create context entries for all BDFs, whether or not a > >> device exists there > > > > As I said, this maybe bring security issue. Even for the > > iommu-passthrough option, it is also not suggested to be used if security is > considered. > > As said - it is clear that the basic thing here (using > "iommu=dom0-passthrough") is already weakening security. So security isn't > the concern in this discussion, that's left to whoever is intending to use that > option. Okay, I vote your option C if don't care security. Xiantao _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 00:38:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 00:38:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQzH-0004Q7-Hd; Wed, 14 Nov 2012 00:37:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYQzG-0004Q2-29 for xen-devel@lists.xen.org; Wed, 14 Nov 2012 00:37:50 +0000 Received: from [85.158.138.51:65042] by server-14.bemta-3.messagelabs.com id 02/D7-12788-CD7E2A05; Wed, 14 Nov 2012 00:37:48 +0000 X-Env-Sender: xiantao.zhang@intel.com X-Msg-Ref: server-16.tower-174.messagelabs.com!1352853466!29819419!1 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDI3OTEzOQ==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20811 invoked from network); 14 Nov 2012 00:37:47 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-16.tower-174.messagelabs.com with SMTP; 14 Nov 2012 00:37:47 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 13 Nov 2012 16:37:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.83,247,1352102400"; d="scan'208";a="246617621" Received: from fmsmsx105.amr.corp.intel.com ([10.19.9.36]) by fmsmga001.fm.intel.com with ESMTP; 13 Nov 2012 16:37:43 -0800 Received: from fmsmsx101.amr.corp.intel.com (10.19.9.52) by FMSMSX105.amr.corp.intel.com (10.19.9.36) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 16:37:42 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX101.amr.corp.intel.com (10.19.9.52) with Microsoft SMTP Server (TLS) id 14.1.355.2; Tue, 13 Nov 2012 16:37:42 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.134]) by SHSMSX102.ccr.corp.intel.com ([169.254.2.123]) with mapi id 14.01.0355.002; Wed, 14 Nov 2012 08:37:40 +0800 From: "Zhang, Xiantao" To: Jan Beulich , "Zhang, Yang Z" Thread-Topic: [Xen-devel] iommu=dom0-passthrough behavior Thread-Index: AQHNwXYJqLF+2AjHBkK5l/uG97/aIZfnbfFggAAyLdWAADp0YP//g6QAgAEdtPA= Date: Wed, 14 Nov 2012 00:37:39 +0000 Message-ID: References: <5097DB9102000078000A65C7@nat28.tlf.novell.com> <50A20DE302000078000A7F6B@nat28.tlf.novell.com> <50A223DE02000078000A7FE6@nat28.tlf.novell.com> <50A23C0C02000078000A8085@nat28.tlf.novell.com> <50A2755402000078000A837D@nat28.tlf.novell.com> In-Reply-To: <50A2755402000078000A837D@nat28.tlf.novell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Cc: "wei.huang2@amd.com" , "weiwang.dd@gmail.com" , "Zhang, Xiantao" , xen-devel Subject: Re: [Xen-devel] iommu=dom0-passthrough behavior X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org > -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: Tuesday, November 13, 2012 11:29 PM > To: Zhang, Xiantao; Zhang, Yang Z > Cc: wei.huang2@amd.com; weiwang.dd@gmail.com; xen-devel > Subject: RE: [Xen-devel] iommu=dom0-passthrough behavior > > >>> On 13.11.12 at 16:02, "Zhang, Xiantao" > wrote: > >> From: Jan Beulich [mailto:JBeulich@suse.com] > >> > If software cannot see it, then how to use it? If there still have > >> > an approach to detect it, then xen can do it too and setup the > >> > context entry as passthrough. > >> > >> We see it the latest at the point the fault occurs. So there are > >> multiple > >> options: > >> a) if the device is "real" as in having a valid config space despite > >> func 0 not advertising itself as multi-function, we have ways to > >> discover the device (at boot time) > > > > I think current Xen logic also covers multi-function devices case. > > When Xen boots up, it will scan all functions of devices on each bus, > > through reads their vendor ID. If the vendor ID is valid, Xen deems > > this BDF has a real device/function existed there > > Not anymore - we're now honoring the multi-function flag in > _scan_pci_devices() (as Linux always did in its bus scan logic); see c/s > 22337:7afd8dd1d6cb (with a subsequent adjustment in c/s > 25869:59b3663316db). > > >> b) we could insert the context entry in the fault handler, assuming > >> the device is able to recover > > At least current VT-d doesn't have recovery fault supported, so each > > triggered faults are fatal. > > Fatal in what sense? I would assume that if the driver retries the operation, it > would succeed if the first fault causes the context entry to be inserted. If the driver knows the fact, it should work. For VT-d without fault recovery capability, it should do nothing for the unknown translations which maybe faked by some malicious devices. > >> c) we could provide a command line option to allow fake devices to > >> be create > > > > Agree, this maybe a feasible solution I can figure out, so far. > > > >> d) we could create context entries for all BDFs, whether or not a > >> device exists there > > > > As I said, this maybe bring security issue. Even for the > > iommu-passthrough option, it is also not suggested to be used if security is > considered. > > As said - it is clear that the basic thing here (using > "iommu=dom0-passthrough") is already weakening security. So security isn't > the concern in this discussion, that's left to whoever is intending to use that > option. Okay, I vote your option C if don't care security. Xiantao _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:22:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRfo-0000hj-Fj; Wed, 14 Nov 2012 01:21:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRfm-0000hH-ON for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 01:21:46 +0000 Received: from [85.158.143.99:34051] by server-2.bemta-4.messagelabs.com id 5B/0F-28922-A22F2A05; Wed, 14 Nov 2012 01:21:46 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352856104!29848576!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA2MTE2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13682 invoked from network); 14 Nov 2012 01:21:45 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 01:21:45 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE1Lf5u030679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 01:21:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE1LeuH018934 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 01:21:41 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE1LeoG028233; Tue, 13 Nov 2012 19:21:40 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 17:21:40 -0800 Date: Tue, 13 Nov 2012 17:21:38 -0800 From: Mukesh Rathor To: Ian Campbell Message-ID: <20121113172138.1d3274d9@mantra.us.oracle.com> In-Reply-To: <1352800853.7491.22.camel@zakaz.uk.xensource.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 10:00:53 +0000 Ian Campbell wrote: > On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > > Hi, > > > > I am wondering if there's libxl expert who can help me make some PVH > > related changes to libxl, pref in the US time zone. I could consult > > on irc or the phone. > > I think most of the libxl experts are in European time zones. Probably > the best bet is to just ask your questions either here or on IRC. For PVH, xc_dom_feature_translated is not returning true, looks like its not finding XENFEAT_auto_translated_physmap set in the elf??? I've modified the arch/x86/xen/xen-head.S file to include the PVH: ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb"FEATURES_PVH) where #define FEATURES_PVH "|writable_descriptor_tables" \ "|auto_translated_physmap" \ "|supervisor_mode_kernel" \ "|hvm_callback_vector" So, not sure why it's failing. In xc_dom_parse_image(), I see dom->parms.f_required is 0. I assume this is what the kernel is built with and should be filled with the values above? Presumably, dom->f_requested is what the library expects the kernel to have. I set it as: libxl__build_pv(): if (is_pvh) { printf("info..features:%s\n", info->u.pv.features); info->u.pv.features = strdup("auto_translated_physmap"); } which is temporary hack, and I wanna consult with libxl expert for the proper way to to this. I don't see any thing similar being done. I can't tell why f_active is there. I also see supported, may be thats the string of what the kernel supports. It is set to 0x11 ??? Hmm... Using readelf and hexeditor, I see the feature string properly set in vmlinux (assume its in bzImage too). So, not sure whats going on. thanks Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:22:14 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRfo-0000hj-Fj; Wed, 14 Nov 2012 01:21:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRfm-0000hH-ON for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 01:21:46 +0000 Received: from [85.158.143.99:34051] by server-2.bemta-4.messagelabs.com id 5B/0F-28922-A22F2A05; Wed, 14 Nov 2012 01:21:46 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-9.tower-216.messagelabs.com!1352856104!29848576!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiA2MTE2Ng==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13682 invoked from network); 14 Nov 2012 01:21:45 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-9.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 01:21:45 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE1Lf5u030679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 01:21:42 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE1LeuH018934 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 01:21:41 GMT Received: from abhmt101.oracle.com (abhmt101.oracle.com [141.146.116.53]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE1LeoG028233; Tue, 13 Nov 2012 19:21:40 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 17:21:40 -0800 Date: Tue, 13 Nov 2012 17:21:38 -0800 From: Mukesh Rathor To: Ian Campbell Message-ID: <20121113172138.1d3274d9@mantra.us.oracle.com> In-Reply-To: <1352800853.7491.22.camel@zakaz.uk.xensource.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 10:00:53 +0000 Ian Campbell wrote: > On Tue, 2012-11-13 at 03:09 +0000, Mukesh Rathor wrote: > > Hi, > > > > I am wondering if there's libxl expert who can help me make some PVH > > related changes to libxl, pref in the US time zone. I could consult > > on irc or the phone. > > I think most of the libxl experts are in European time zones. Probably > the best bet is to just ask your questions either here or on IRC. For PVH, xc_dom_feature_translated is not returning true, looks like its not finding XENFEAT_auto_translated_physmap set in the elf??? I've modified the arch/x86/xen/xen-head.S file to include the PVH: ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb"FEATURES_PVH) where #define FEATURES_PVH "|writable_descriptor_tables" \ "|auto_translated_physmap" \ "|supervisor_mode_kernel" \ "|hvm_callback_vector" So, not sure why it's failing. In xc_dom_parse_image(), I see dom->parms.f_required is 0. I assume this is what the kernel is built with and should be filled with the values above? Presumably, dom->f_requested is what the library expects the kernel to have. I set it as: libxl__build_pv(): if (is_pvh) { printf("info..features:%s\n", info->u.pv.features); info->u.pv.features = strdup("auto_translated_physmap"); } which is temporary hack, and I wanna consult with libxl expert for the proper way to to this. I don't see any thing similar being done. I can't tell why f_active is there. I also see supported, may be thats the string of what the kernel supports. It is set to 0x11 ??? Hmm... Using readelf and hexeditor, I see the feature string properly set in vmlinux (assume its in bzImage too). So, not sure whats going on. thanks Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:32:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:32:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRpT-00012k-Iu; Wed, 14 Nov 2012 01:31:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRpR-00012c-Qf for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 01:31:46 +0000 Received: from [85.158.143.99:47850] by server-3.bemta-4.messagelabs.com id 5B/8D-06841-184F2A05; Wed, 14 Nov 2012 01:31:45 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352856702!19026821!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNTA1Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14380 invoked from network); 14 Nov 2012 01:31:44 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 01:31:44 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE1Vehq018086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 01:31:41 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE1VdgO029757 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 01:31:40 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE1VdPd000624; Tue, 13 Nov 2012 19:31:39 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 17:31:39 -0800 Date: Tue, 13 Nov 2012 17:31:38 -0800 From: Mukesh Rathor To: Mukesh Rathor Message-ID: <20121113173138.61b21067@mantra.us.oracle.com> In-Reply-To: <20121113172138.1d3274d9@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> <20121113172138.1d3274d9@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 17:21:38 -0800 Mukesh Rathor wrote: > > > I can't tell why f_active is there. I also see supported, may be thats > the string of what the kernel supports. It is set to 0x11 ??? Debugging further, I see in xc_dom_parse_elf_kernel() after elf_parse_binary(), the strings are set as: type = XEN_ENT_STR, name = 0x3cadc2e116 "PAE_MODE", data = { str = 0x7ffff61e14b0 "yes", num = 0x7ffff61e14b0}}, { type = XEN_ENT_STR, name = 0x3cadc2dd2d "FEATURES", data = { str = 0x7ffff61e1414 "!writable_page_tables|pae_pgdir_above_4gb", num = 0x7ffff61e1414}}, {type = XEN_ENT_NONE, name = 0x0, data = { str = 0x0, num = 0x0}}, {type = XEN_ENT_LONG, So, may be it's not properly set in bzImage and something else needs to be done to get the correct strings there??? thanks Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:32:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:32:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRpT-00012k-Iu; Wed, 14 Nov 2012 01:31:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYRpR-00012c-Qf for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 01:31:46 +0000 Received: from [85.158.143.99:47850] by server-3.bemta-4.messagelabs.com id 5B/8D-06841-184F2A05; Wed, 14 Nov 2012 01:31:45 +0000 X-Env-Sender: mukesh.rathor@oracle.com X-Msg-Ref: server-14.tower-216.messagelabs.com!1352856702!19026821!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNTA1Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14380 invoked from network); 14 Nov 2012 01:31:44 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 01:31:44 -0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE1Vehq018086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 01:31:41 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE1VdgO029757 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 01:31:40 GMT Received: from abhmt110.oracle.com (abhmt110.oracle.com [141.146.116.62]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE1VdPd000624; Tue, 13 Nov 2012 19:31:39 -0600 Received: from mantra.us.oracle.com (/130.35.68.95) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 17:31:39 -0800 Date: Tue, 13 Nov 2012 17:31:38 -0800 From: Mukesh Rathor To: Mukesh Rathor Message-ID: <20121113173138.61b21067@mantra.us.oracle.com> In-Reply-To: <20121113172138.1d3274d9@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> <20121113172138.1d3274d9@mantra.us.oracle.com> Organization: Oracle Corporation X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Cc: "Xen-devel@lists.xensource.com" , Ian Campbell Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Tue, 13 Nov 2012 17:21:38 -0800 Mukesh Rathor wrote: > > > I can't tell why f_active is there. I also see supported, may be thats > the string of what the kernel supports. It is set to 0x11 ??? Debugging further, I see in xc_dom_parse_elf_kernel() after elf_parse_binary(), the strings are set as: type = XEN_ENT_STR, name = 0x3cadc2e116 "PAE_MODE", data = { str = 0x7ffff61e14b0 "yes", num = 0x7ffff61e14b0}}, { type = XEN_ENT_STR, name = 0x3cadc2dd2d "FEATURES", data = { str = 0x7ffff61e1414 "!writable_page_tables|pae_pgdir_above_4gb", num = 0x7ffff61e1414}}, {type = XEN_ENT_NONE, name = 0x0, data = { str = 0x0, num = 0x0}}, {type = XEN_ENT_LONG, So, may be it's not properly set in bzImage and something else needs to be done to get the correct strings there??? thanks Mukesh _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:50:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:50:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYS7N-0001TV-II; Wed, 14 Nov 2012 01:50:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYS7M-0001TQ-8n for xen-devel@lists.xen.org; Wed, 14 Nov 2012 01:50:16 +0000 Received: from [85.158.138.51:34319] by server-15.bemta-3.messagelabs.com id 66/7D-09445-7D8F2A05; Wed, 14 Nov 2012 01:50:15 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-10.tower-174.messagelabs.com!1352857783!25874236!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23950 invoked from network); 14 Nov 2012 01:49:55 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-10.tower-174.messagelabs.com with SMTP; 14 Nov 2012 01:49:55 -0000 Received: from [10.8.201.154] (unknown [131.193.31.118]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id 154EA1F01FA; Tue, 13 Nov 2012 19:49:28 -0600 (CST) Message-ID: <50A2F8A7.5000202@cs.uic.edu> Date: Tue, 13 Nov 2012 19:49:27 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> <20121110135218.GA5436@type> <509FC5F6.4050506@cs.uic.edu> In-Reply-To: <509FC5F6.4050506@cs.uic.edu> Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> + .byte 0x78,0x78,0x78,0x78,0x78 # jmp >>> hypercall_page + (__HYPERVISOR_iret * 32) >> Here we would also need a fixup table for the code at hypercall_page! > Nice catch! > >> A nicer fix would be to inline the hypercall code here. After a second thought, it seems to me such "expansion" of hypercall_page into fixup table is not necessary (and wrong). Insead, we can and need to mask out events before we doing a hypercall iret. I think it is safe (and must, see below) to do this because: 1. if event is disabled: doesn't hurt to mask it again; 2. if event is enabled: we disable event, and jumps to hypercall_page to make a hypercall iret, which eventually calls do_iret: In do_iret, line 309: /* Restore upcall mask from supplied EFLAGS.IF. */ vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & X86_EFLAGS_IF); No matter what the current value of upcall mask is, do_iret always retores it to the negation of rflags.IF saved on stack. In other words, it is safe to mask upcall mask before hypercall iret. And in fact, I am afraid it's necessary that we make it a must, because even one can guard against nested events in guest OS, but can never do so on hypercall page (because the code is in Xen). We should never jump to hypercall_page iret with events enabled. So we have to set upcall mask before the jump. I guess that's one of the reason why Xen always restores upcall mask from stack. >> Also, it would be good to check against critical section size change, in >> case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. >> For instance, stuff right after the table: >> >> .if (ecrit-scrit) != (critical_fixup_table_end - >> critical_fixup_table) >> .error "The critical has changed, the fixup table needs updating" >> .endif > Totally agree. And it somewhat saves the obligation of checking if the > table size matches the one of critical section by looking at > disassemble output. :-) > > Correct me if I am wrong, I think hypercall_page is mapped at runtime to guest OS by Xen. It's not actually part of the critical section of guest OS, at least not at compile time. So having a fixup table for the code at hypercall_page would cause such check to fail (mismatch). Following the discussion above, we could easily avoid such fixup table by mask out the events. I don't know if this make sense at all. :-) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 01:50:41 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 01:50:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYS7N-0001TV-II; Wed, 14 Nov 2012 01:50:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYS7M-0001TQ-8n for xen-devel@lists.xen.org; Wed, 14 Nov 2012 01:50:16 +0000 Received: from [85.158.138.51:34319] by server-15.bemta-3.messagelabs.com id 66/7D-09445-7D8F2A05; Wed, 14 Nov 2012 01:50:15 +0000 X-Env-Sender: xzhang@cs.uic.edu X-Msg-Ref: server-10.tower-174.messagelabs.com!1352857783!25874236!1 X-Originating-IP: [131.193.32.56] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23950 invoked from network); 14 Nov 2012 01:49:55 -0000 Received: from mailvm.cs.uic.edu (HELO mailvm.cs.uic.edu) (131.193.32.56) by server-10.tower-174.messagelabs.com with SMTP; 14 Nov 2012 01:49:55 -0000 Received: from [10.8.201.154] (unknown [131.193.31.118]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailvm.cs.uic.edu (Postfix) with ESMTP id 154EA1F01FA; Tue, 13 Nov 2012 19:49:28 -0600 (CST) Message-ID: <50A2F8A7.5000202@cs.uic.edu> Date: Tue, 13 Nov 2012 19:49:27 -0600 From: Xu Zhang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Samuel Thibault , "xen-devel@lists.xen.org" , gm281@cam.ac.uk References: <50871D90.50606@gmail.com> <20121025205653.GW5925@type.chello.at> <5098A674.5090203@cs.uic.edu> <20121110135218.GA5436@type> <509FC5F6.4050506@cs.uic.edu> In-Reply-To: <509FC5F6.4050506@cs.uic.edu> Subject: Re: [Xen-devel] Nested events in 64bit mini-OS X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org >>> + .byte 0x78,0x78,0x78,0x78,0x78 # jmp >>> hypercall_page + (__HYPERVISOR_iret * 32) >> Here we would also need a fixup table for the code at hypercall_page! > Nice catch! > >> A nicer fix would be to inline the hypercall code here. After a second thought, it seems to me such "expansion" of hypercall_page into fixup table is not necessary (and wrong). Insead, we can and need to mask out events before we doing a hypercall iret. I think it is safe (and must, see below) to do this because: 1. if event is disabled: doesn't hurt to mask it again; 2. if event is enabled: we disable event, and jumps to hypercall_page to make a hypercall iret, which eventually calls do_iret: In do_iret, line 309: /* Restore upcall mask from supplied EFLAGS.IF. */ vcpu_info(v, evtchn_upcall_mask) = !(iret_saved.rflags & X86_EFLAGS_IF); No matter what the current value of upcall mask is, do_iret always retores it to the negation of rflags.IF saved on stack. In other words, it is safe to mask upcall mask before hypercall iret. And in fact, I am afraid it's necessary that we make it a must, because even one can guard against nested events in guest OS, but can never do so on hypercall page (because the code is in Xen). We should never jump to hypercall_page iret with events enabled. So we have to set upcall mask before the jump. I guess that's one of the reason why Xen always restores upcall mask from stack. >> Also, it would be good to check against critical section size change, in >> case somebody e.g. changes a value, or a macro like XEN_PUT_VCPU_INFO. >> For instance, stuff right after the table: >> >> .if (ecrit-scrit) != (critical_fixup_table_end - >> critical_fixup_table) >> .error "The critical has changed, the fixup table needs updating" >> .endif > Totally agree. And it somewhat saves the obligation of checking if the > table size matches the one of critical section by looking at > disassemble output. :-) > > Correct me if I am wrong, I think hypercall_page is mapped at runtime to guest OS by Xen. It's not actually part of the critical section of guest OS, at least not at compile time. So having a fixup table for the code at hypercall_page would cause such check to fail (mismatch). Following the discussion above, we could easily avoid such fixup table by mask out the events. I don't know if this make sense at all. :-) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 04:03:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 04:03:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYUCA-00049e-W5; Wed, 14 Nov 2012 04:03:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYUC9-00049B-9F for xen-devel@lists.xensource.com; Wed, 14 Nov 2012 04:03:21 +0000 Received: from [85.158.143.99:27256] by server-3.bemta-4.messagelabs.com id 5D/C2-06841-80813A05; Wed, 14 Nov 2012 04:03:20 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1352865799!29796586!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg0Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1117 invoked from network); 14 Nov 2012 04:03:19 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 04:03:19 -0000 X-IronPort-AV: E=Sophos;i="4.83,247,1352073600"; d="scan'208";a="15791684" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 04:03:11 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 04:03:10 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYUBy-0002mt-K9; Wed, 14 Nov 2012 04:03:10 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYUBy-0004xP-8c; Wed, 14 Nov 2012 04:03:10 +0000 To: Message-ID: From: xen.org Date: Wed, 14 Nov 2012 04:03:10 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14388: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14388 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14388/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14332 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail like 14332 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-i386-i386-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass version targeted for testing: xen 839e5d95d483 baseline version: xen 651d965ee2c0 ------------------------------------------------------------ People who touched revisions under test: Ian Campbell Ian Jackson Olaf Hering ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.2-testing + revision=839e5d95d483 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.2-testing 839e5d95d483 + branch=xen-4.2-testing + revision=839e5d95d483 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.2-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.2-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git ++ : daily-cron.xen-4.2-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.2-testing.git + info_linux_tree xen-4.2-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.2-testing.hg + hg push -r 839e5d95d483 ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 3 changes to 1 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 04:03:52 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 04:03:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYUCA-00049e-W5; Wed, 14 Nov 2012 04:03:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYUC9-00049B-9F for xen-devel@lists.xensource.com; Wed, 14 Nov 2012 04:03:21 +0000 Received: from [85.158.143.99:27256] by server-3.bemta-4.messagelabs.com id 5D/C2-06841-80813A05; Wed, 14 Nov 2012 04:03:20 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-15.tower-216.messagelabs.com!1352865799!29796586!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg0Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1117 invoked from network); 14 Nov 2012 04:03:19 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-15.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 04:03:19 -0000 X-IronPort-AV: E=Sophos;i="4.83,247,1352073600"; d="scan'208";a="15791684" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 04:03:11 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 04:03:10 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYUBy-0002mt-K9; Wed, 14 Nov 2012 04:03:10 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYUBy-0004xP-8c; Wed, 14 Nov 2012 04:03:10 +0000 To: Message-ID: From: xen.org Date: Wed, 14 Nov 2012 04:03:10 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-4.2-testing test] 14388: tolerable FAIL - PUSHED X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14388 xen-4.2-testing real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14388/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14332 test-amd64-amd64-xl-sedf 11 guest-localmigrate fail like 14332 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-i386-i386-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-i386-i386-xl-winxpsp3 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-i386-i386-win 16 leak-check/check fail never pass test-i386-i386-xl-win 13 guest-stop fail never pass version targeted for testing: xen 839e5d95d483 baseline version: xen 651d965ee2c0 ------------------------------------------------------------ People who touched revisions under test: Ian Campbell Ian Jackson Olaf Hering ------------------------------------------------------------ jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-i386-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-i386-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-i386-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-i386-i386-win fail test-amd64-amd64-xl-win fail test-i386-i386-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-i386-i386-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail test-i386-i386-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Pushing revision : + branch=xen-4.2-testing + revision=839e5d95d483 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x '!=' x/export/home/osstest/repos/lock ']' ++ OSSTEST_REPOS_LOCK_LOCKED=/export/home/osstest/repos/lock ++ exec with-lock-ex -w /export/home/osstest/repos/lock ./ap-push xen-4.2-testing 839e5d95d483 + branch=xen-4.2-testing + revision=839e5d95d483 + . cri-lock-repos ++ . cri-common +++ umask 002 +++ getconfig Repos +++ perl -e ' use Osstest; readconfigonly(); print $c{Repos} or die $!; ' ++ repos=/export/home/osstest/repos ++ repos_lock=/export/home/osstest/repos/lock ++ '[' x/export/home/osstest/repos/lock '!=' x/export/home/osstest/repos/lock ']' + . cri-common ++ umask 002 + select_xenbranch + case "$branch" in + tree=xen + xenbranch=xen-4.2-testing + '[' xxen = xlinux ']' + linuxbranch=linux + : master + : tested/2.6.39.x + . ap-common ++ : xen@xenbits.xensource.com ++ : http://xenbits.xen.org/hg/staging/xen-4.2-testing.hg ++ : git://xenbits.xen.org/staging/qemu-xen-4.2-testing.git ++ : git://git.kernel.org ++ : git://git.kernel.org/pub/scm/linux/kernel/git ++ : git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : xen@xenbits.xensource.com:git/linux-pvops.git ++ : git://xenbits.xen.org/linux-pvops.git ++ : master ++ : git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git ++ : tested/2.6.39.x ++ : daily-cron.xen-4.2-testing ++ : http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27 ++ : git://xenbits.xen.org/staging/qemu-upstream-4.2-testing.git ++ : daily-cron.xen-4.2-testing + TREE_LINUX=xen@xenbits.xensource.com:git/linux-pvops.git + TREE_QEMU_UPSTREAM=xen@xenbits.xensource.com:git/qemu-upstream-4.2-testing.git + info_linux_tree xen-4.2-testing + case $1 in + return 1 + case "$branch" in + cd /export/home/osstest/repos/xen-4.2-testing.hg + hg push -r 839e5d95d483 ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg pushing to ssh://xen@xenbits.xensource.com/HG/xen-4.2-testing.hg searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 3 changesets with 3 changes to 1 files _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 05:54:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 05:54:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYVvM-0006Gx-2S; Wed, 14 Nov 2012 05:54:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYVvK-0006Gs-8v for xen-devel@lists.xensource.com; Wed, 14 Nov 2012 05:54:06 +0000 Received: from [85.158.143.99:29691] by server-1.bemta-4.messagelabs.com id 73/37-27934-DF133A05; Wed, 14 Nov 2012 05:54:05 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352872444!24533626!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg0Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27237 invoked from network); 14 Nov 2012 05:54:04 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 05:54:04 -0000 X-IronPort-AV: E=Sophos;i="4.83,248,1352073600"; d="scan'208";a="15792317" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 05:53:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 05:53:55 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYVv9-0003Nx-C1; Wed, 14 Nov 2012 05:53:55 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYVv9-0003j3-90; Wed, 14 Nov 2012 05:53:55 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 14 Nov 2012 05:53:55 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14389: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14389 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14389/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14386 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14386 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14386 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14386 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 8b93ac0c93f3 baseline version: xen 8b93ac0c93f3 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 05:54:40 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 05:54:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYVvM-0006Gx-2S; Wed, 14 Nov 2012 05:54:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYVvK-0006Gs-8v for xen-devel@lists.xensource.com; Wed, 14 Nov 2012 05:54:06 +0000 Received: from [85.158.143.99:29691] by server-1.bemta-4.messagelabs.com id 73/37-27934-DF133A05; Wed, 14 Nov 2012 05:54:05 +0000 X-Env-Sender: Ian.Jackson@eu.citrix.com X-Msg-Ref: server-2.tower-216.messagelabs.com!1352872444!24533626!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg0Mjk=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27237 invoked from network); 14 Nov 2012 05:54:04 -0000 Received: from smtp.ctxuk.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-2.tower-216.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 05:54:04 -0000 X-IronPort-AV: E=Sophos;i="4.83,248,1352073600"; d="scan'208";a="15792317" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 05:53:55 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 05:53:55 +0000 Received: from [10.80.248.135] (helo=woking.cam.xci-test.com) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1TYVv9-0003Nx-C1; Wed, 14 Nov 2012 05:53:55 +0000 Received: from osstest by woking.cam.xci-test.com with local (Exim 4.69) (envelope-from ) id 1TYVv9-0003j3-90; Wed, 14 Nov 2012 05:53:55 +0000 To: xen-devel@lists.xensource.com Message-ID: From: xen.org Date: Wed, 14 Nov 2012 05:53:55 +0000 MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com Subject: [Xen-devel] [xen-unstable test] 14389: tolerable FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org flight 14389 xen-unstable real [real] http://www.chiark.greenend.org.uk/~xensrcts/logs/14389/ Failures :-/ but no regressions. Regressions which are regarded as allowable (not blocking): test-amd64-amd64-xl-sedf-pin 10 guest-saverestore fail like 14386 test-amd64-amd64-xl-sedf 5 xen-boot fail like 14386 test-amd64-amd64-xl-qemuu-winxpsp3 9 guest-localmigrate fail like 14386 test-amd64-amd64-xl-qemuu-win7-amd64 9 guest-localmigrate fail like 14386 Tests which did not succeed, but are not blocking: test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass test-amd64-i386-win 16 leak-check/check fail never pass test-amd64-i386-xl-win-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass test-amd64-i386-win-vcpus1 16 leak-check/check fail never pass test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass test-amd64-amd64-xl-win 13 guest-stop fail never pass test-amd64-amd64-win 16 leak-check/check fail never pass version targeted for testing: xen 8b93ac0c93f3 baseline version: xen 8b93ac0c93f3 jobs: build-amd64 pass build-i386 pass build-amd64-oldkern pass build-i386-oldkern pass build-amd64-pvops pass build-i386-pvops pass test-amd64-amd64-xl pass test-amd64-i386-xl pass test-amd64-i386-rhel6hvm-amd pass test-amd64-i386-qemuu-rhel6hvm-amd pass test-amd64-amd64-xl-qemuu-win7-amd64 fail test-amd64-amd64-xl-win7-amd64 fail test-amd64-i386-xl-win7-amd64 fail test-amd64-i386-xl-credit2 pass test-amd64-amd64-xl-pcipt-intel fail test-amd64-i386-rhel6hvm-intel pass test-amd64-i386-qemuu-rhel6hvm-intel pass test-amd64-i386-xl-multivcpu pass test-amd64-amd64-pair pass test-amd64-i386-pair pass test-amd64-amd64-xl-sedf-pin fail test-amd64-amd64-pv pass test-amd64-i386-pv pass test-amd64-amd64-xl-sedf fail test-amd64-i386-win-vcpus1 fail test-amd64-i386-xl-win-vcpus1 fail test-amd64-i386-xl-winxpsp3-vcpus1 fail test-amd64-amd64-win fail test-amd64-i386-win fail test-amd64-amd64-xl-win fail test-amd64-amd64-xl-qemuu-winxpsp3 fail test-amd64-i386-xend-winxpsp3 fail test-amd64-amd64-xl-winxpsp3 fail ------------------------------------------------------------ sg-report-flight on woking.cam.xci-test.com logs: /home/xc_osstest/logs images: /home/xc_osstest/images Logs, config files, etc. are available at http://www.chiark.greenend.org.uk/~xensrcts/logs Test harness code can be found at http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary Published tested tree is already up to date. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 06:25:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 06:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYWPO-0006w0-2A; Wed, 14 Nov 2012 06:25:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYWPN-0006vv-7x for xen-devel@lists.xen.org; Wed, 14 Nov 2012 06:25:09 +0000 Received: from [85.158.143.35:13983] by server-2.bemta-4.messagelabs.com id 03/12-28922-44933A05; Wed, 14 Nov 2012 06:25:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352874305!17693114!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNTA1Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30998 invoked from network); 14 Nov 2012 06:25:06 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 06:25:06 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE6OwBQ028940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 06:24:59 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE6Ovim010807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 06:24:58 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE6Ove6023728; Wed, 14 Nov 2012 00:24:57 -0600 Received: from localhost.localdomain (/208.54.32.192) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 22:24:57 -0800 Date: Wed, 14 Nov 2012 01:24:53 -0500 From: Konrad Rzeszutek Wilk To: Sander Eikelenboom Message-ID: <20121114062451.GB24800@localhost.localdomain> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> <20121112163204.GB9575@phenom.dumpdata.com> <1945521669.20121112182055@eikelenboom.it> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1945521669.20121112182055@eikelenboom.it> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 06:20:55PM +0100, Sander Eikelenboom wrote: > > Monday, November 12, 2012, 5:32:04 PM, you wrote: > > > On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: > >> > >> Monday, November 12, 2012, 3:28:35 PM, you wrote: > >> > >> > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > >> >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > >> >> > Hey Ian, Xen-devel mailingl list, > >> >> > > >> >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or > >> >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > >> >> > the releases introduced this. The issue we are seeing is that a domU > >> >> > to domU communication breaks - this is with netperf/netserver talking to > >> >> > each other. > >> >> > > >> >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also > >> >> > (at least on some of my test hardware) exposed existing issues with > >> >> > drivers. The issue I have is that the 'skge' driver has a bug that has > >> >> > been there for ages (I tested way back to 3.0 and still saw it) were it > >> >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync > >> >> > somewhere. > >> >> > > >> >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > >> >> > OK. Even with synthetic driver (the fake one I posted somewhere) it > >> >> > dealt with compound pages properly (with debug or non-debug Xen > >> >> > hypervisor). > >> >> > >> >> The debug build is probably most interesting since it deliberately > >> >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > >> >> issues. > >> > >> > Right. My test env runs with that. And so far it only has issues > >> > with the skge one. > >> >> > >> >> > So was wondering if you had looked at this in more details? Any > >> >> > ideas? Or would it be more prudent to ask that once we know for sure > >> >> > which Linux release introduced the communication failures between > >> >> > guests? > >> >> > >> >> I've not looked at it any further I'm afraid. > >> >> > >> >> If these changes (be they in 3.5 or later, or earlier) are exposing > >> >> driver bugs then I suspect the netdev chaps would want to know about it. > >> > >> > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > >> > And is off checking v3.6. v3.7 is definitly a no go. > >> >> > >> >> FWIW I see the issue with tg3. > >> > >> After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. > > > Were you ever able to trigger the BUG_ON in the patch that Ian posted? > > What exact patch (or any other patch that can help you ) ? > (so i can try again to be sure) This one: http://lists.xen.org/archives/html/xen-devel/2012-10/msg00893.html _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 06:25:43 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 06:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYWPO-0006w0-2A; Wed, 14 Nov 2012 06:25:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYWPN-0006vv-7x for xen-devel@lists.xen.org; Wed, 14 Nov 2012 06:25:09 +0000 Received: from [85.158.143.35:13983] by server-2.bemta-4.messagelabs.com id 03/12-28922-44933A05; Wed, 14 Nov 2012 06:25:08 +0000 X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1352874305!17693114!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gNTA1Mzg=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30998 invoked from network); 14 Nov 2012 06:25:06 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 06:25:06 -0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qAE6OwBQ028940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 06:24:59 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qAE6Ovim010807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Nov 2012 06:24:58 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qAE6Ove6023728; Wed, 14 Nov 2012 00:24:57 -0600 Received: from localhost.localdomain (/208.54.32.192) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 13 Nov 2012 22:24:57 -0800 Date: Wed, 14 Nov 2012 01:24:53 -0500 From: Konrad Rzeszutek Wilk To: Sander Eikelenboom Message-ID: <20121114062451.GB24800@localhost.localdomain> References: <20121110135931.GD23686@localhost.localdomain> <1352714084.27833.137.camel@zakaz.uk.xensource.com> <20121112142835.GG19860@phenom.dumpdata.com> <711956045.20121112155024@eikelenboom.it> <20121112163204.GB9575@phenom.dumpdata.com> <1945521669.20121112182055@eikelenboom.it> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1945521669.20121112182055@eikelenboom.it> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet22.oracle.com [141.146.126.238] Cc: "annie.li@oracle.com" , Ian Campbell , "marcos.matsunaga@oracle.com" , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] domU to domU networking issues in v3.7? (netserver/netperf failing to communicate) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Mon, Nov 12, 2012 at 06:20:55PM +0100, Sander Eikelenboom wrote: > > Monday, November 12, 2012, 5:32:04 PM, you wrote: > > > On Mon, Nov 12, 2012 at 03:50:24PM +0100, Sander Eikelenboom wrote: > >> > >> Monday, November 12, 2012, 3:28:35 PM, you wrote: > >> > >> > On Mon, Nov 12, 2012 at 09:54:44AM +0000, Ian Campbell wrote: > >> >> On Sat, 2012-11-10 at 13:59 +0000, Konrad Rzeszutek Wilk wrote: > >> >> > Hey Ian, Xen-devel mailingl list, > >> >> > > >> >> > I think the issue of 70% traffic lost was actually introduced in v3.6 or > >> >> > perhaps v3.5. Annie and Marcos (CC-ed here) are looking to see which of > >> >> > the releases introduced this. The issue we are seeing is that a domU > >> >> > to domU communication breaks - this is with netperf/netserver talking to > >> >> > each other. > >> >> > > >> >> > Anyhow, I think the 3.7 compound page exacerbated the problem and also > >> >> > (at least on some of my test hardware) exposed existing issues with > >> >> > drivers. The issue I have is that the 'skge' driver has a bug that has > >> >> > been there for ages (I tested way back to 3.0 and still saw it) were it > >> >> > can not work with SWIOTLB. It is probably missing an pci_dma_sync > >> >> > somewhere. > >> >> > > >> >> > Anyhow the compound page got me to look at Xen-SWIOTLB and that looks > >> >> > OK. Even with synthetic driver (the fake one I posted somewhere) it > >> >> > dealt with compound pages properly (with debug or non-debug Xen > >> >> > hypervisor). > >> >> > >> >> The debug build is probably most interesting since it deliberately > >> >> allocates a non 1-1 p-to-m mapping so as to catch exactly these sorts of > >> >> issues. > >> > >> > Right. My test env runs with that. And so far it only has issues > >> > with the skge one. > >> >> > >> >> > So was wondering if you had looked at this in more details? Any > >> >> > ideas? Or would it be more prudent to ask that once we know for sure > >> >> > which Linux release introduced the communication failures between > >> >> > guests? > >> >> > >> >> I've not looked at it any further I'm afraid. > >> >> > >> >> If these changes (be they in 3.5 or later, or earlier) are exposing > >> >> driver bugs then I suspect the netdev chaps would want to know about it. > >> > >> > Right. Annie (CC-ed here) mentioned to me that v3.5 looks to work ok. > >> > And is off checking v3.6. v3.7 is definitly a no go. > >> >> > >> >> FWIW I see the issue with tg3. > >> > >> After the issues with netback where fixed, I'm seeing the issues with net_front reverting the single commit 5640f7685831e088fe6c2e1f863a6805962f8e81 (that was pointed out for netback) also makes these disappear. > > > Were you ever able to trigger the BUG_ON in the patch that Ian posted? > > What exact patch (or any other patch that can help you ) ? > (so i can try again to be sure) This one: http://lists.xen.org/archives/html/xen-devel/2012-10/msg00893.html _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 07:24:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 07:24:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYXKT-0008Sb-4L; Wed, 14 Nov 2012 07:24:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYXKR-0008ST-4y for xen-devel@lists.xen.org; Wed, 14 Nov 2012 07:24:07 +0000 Received: from [85.158.139.211:6372] by server-5.bemta-5.messagelabs.com id 6C/71-11353-61743A05; Wed, 14 Nov 2012 07:24:06 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352877841!20083718!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7140 invoked from network); 14 Nov 2012 07:24:01 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 07:24:01 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm2so3357051wib.14 for ; Tue, 13 Nov 2012 23:24:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=rupVRaarqyMfivDIy2ZhfKBhVlaCDSjXPVWb5otwiv4=; b=aNoGYU/SpxKddFS7pTm5Xx7VJY+8mBj63f33CdKsWi3dTWcN7k8e3wSGSMnBJFWnfq UNPoilYgjZJyZfmdVAqdmxPFS7ujnE4lPLmeLgkzlpMnRDlPJcART2qeU/g8dYoXtQDO obCGwkRKWPj9XOlddYPUTMZu9CZbktqmWIE9GCHtJqcq+Gj/tptQdBstzf4HhiZiGbwj xTSAB5ZwdblJrITg6nff8MGMy35dtYPwh9x3Py0+UpuK/2eArsCukqey0fooSwpV5hJv E+Mtz3zXHbzZTUTfEJtO+CfjHsIWbKTiUuf0ZqgxXRWLyvv13g5xqpq7PX1caXy9NUVE qt2Q== Received: by 10.180.97.72 with SMTP id dy8mr24332388wib.6.1352877841034; Tue, 13 Nov 2012 23:24:01 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b1sm1058512wix.11.2012.11.13.23.23.59 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 23:24:00 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 14 Nov 2012 07:23:56 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich , TimDeegan Message-ID: Thread-Topic: [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall Thread-Index: Ac3COQGjmuJBsRSXU0i4DSzzjCHyMw== In-Reply-To: <4a60001b-b323-4d62-8e7a-456b0f5e553a@default> Mime-version: 1.0 Cc: Zhigang Wang , Konrad Rzeszutek Wilk , xen-devel@lists.xen.org Subject: Re: [Xen-devel] [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 22:23, "Dan Magenheimer" wrote: > The key variables (d->unclaimed_pages and total_unclaimed_pages) > start at zero if no claim has yet been staked for any domain. > (Perhaps a better name is "claimed_but_not_yet_possessed" but that's > a bit unwieldy.) If no claim hypercalls are executed, there > should be no impact on existing usage. It would be nice if d->tot_pages adjustments didn't take the global heap_lock in this case. There's probably some way to bail out of those new update functions before doing the locked work, in that case. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 07:24:39 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 07:24:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYXKT-0008Sb-4L; Wed, 14 Nov 2012 07:24:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYXKR-0008ST-4y for xen-devel@lists.xen.org; Wed, 14 Nov 2012 07:24:07 +0000 Received: from [85.158.139.211:6372] by server-5.bemta-5.messagelabs.com id 6C/71-11353-61743A05; Wed, 14 Nov 2012 07:24:06 +0000 X-Env-Sender: keir.xen@gmail.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1352877841!20083718!1 X-Originating-IP: [209.85.212.173] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7140 invoked from network); 14 Nov 2012 07:24:01 -0000 Received: from mail-wi0-f173.google.com (HELO mail-wi0-f173.google.com) (209.85.212.173) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 07:24:01 -0000 Received: by mail-wi0-f173.google.com with SMTP id hm2so3357051wib.14 for ; Tue, 13 Nov 2012 23:24:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=user-agent:date:subject:from:to:cc:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=rupVRaarqyMfivDIy2ZhfKBhVlaCDSjXPVWb5otwiv4=; b=aNoGYU/SpxKddFS7pTm5Xx7VJY+8mBj63f33CdKsWi3dTWcN7k8e3wSGSMnBJFWnfq UNPoilYgjZJyZfmdVAqdmxPFS7ujnE4lPLmeLgkzlpMnRDlPJcART2qeU/g8dYoXtQDO obCGwkRKWPj9XOlddYPUTMZu9CZbktqmWIE9GCHtJqcq+Gj/tptQdBstzf4HhiZiGbwj xTSAB5ZwdblJrITg6nff8MGMy35dtYPwh9x3Py0+UpuK/2eArsCukqey0fooSwpV5hJv E+Mtz3zXHbzZTUTfEJtO+CfjHsIWbKTiUuf0ZqgxXRWLyvv13g5xqpq7PX1caXy9NUVE qt2Q== Received: by 10.180.97.72 with SMTP id dy8mr24332388wib.6.1352877841034; Tue, 13 Nov 2012 23:24:01 -0800 (PST) Received: from [192.168.1.88] (host86-178-46-35.range86-178.btcentralplus.com. [86.178.46.35]) by mx.google.com with ESMTPS id b1sm1058512wix.11.2012.11.13.23.23.59 (version=SSLv3 cipher=OTHER); Tue, 13 Nov 2012 23:24:00 -0800 (PST) User-Agent: Microsoft-Entourage/12.34.0.120813 Date: Wed, 14 Nov 2012 07:23:56 +0000 From: Keir Fraser To: Dan Magenheimer , Jan Beulich , TimDeegan Message-ID: Thread-Topic: [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall Thread-Index: Ac3COQGjmuJBsRSXU0i4DSzzjCHyMw== In-Reply-To: <4a60001b-b323-4d62-8e7a-456b0f5e553a@default> Mime-version: 1.0 Cc: Zhigang Wang , Konrad Rzeszutek Wilk , xen-devel@lists.xen.org Subject: Re: [Xen-devel] [RFC/PATCH] XENMEM_claim_pages (subop of an existing) hypercall X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On 13/11/2012 22:23, "Dan Magenheimer" wrote: > The key variables (d->unclaimed_pages and total_unclaimed_pages) > start at zero if no claim has yet been staked for any domain. > (Perhaps a better name is "claimed_but_not_yet_possessed" but that's > a bit unwieldy.) If no claim hypercalls are executed, there > should be no impact on existing usage. It would be nice if d->tot_pages adjustments didn't take the global heap_lock in this case. There's probably some way to bail out of those new update functions before doing the locked work, in that case. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 09:08:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 09:08:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYYwh-0002CT-O5; Wed, 14 Nov 2012 09:07:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYYwg-0002CM-8p for xen-devel@lists.xen.org; Wed, 14 Nov 2012 09:07:42 +0000 Received: from [85.158.143.35:9241] by server-1.bemta-4.messagelabs.com id AF/00-27934-D5F53A05; Wed, 14 Nov 2012 09:07:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352884060!7229399!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3680 invoked from network); 14 Nov 2012 09:07:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 14 Nov 2012 09:07:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 14 Nov 2012 09:07:39 +0000 Message-Id: <50A36D6B02000078000A8676@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 14 Nov 2012 09:07:39 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part8FBE714B.0__=" Subject: [Xen-devel] [PATCH] linux-2.6.18/scsifront: cleanup X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part8FBE714B.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline - properly type the shadow field tracking the active command - as a result, there's no need to also track the data direction - in turn, re-arranging shadow fields reduces the size of the structure on 64-bit architectures - there's no point in map_data_for_request() failing if there are no grant references available when none are needed anyway - don't redundantly include linux/version.h --- a/drivers/xen/scsifront/common.h +++ b/drivers/xen/scsifront/common.h @@ -80,21 +80,17 @@ struct vscsifrnt_shadow { * VSCSIIF_ACT_SCSI_CDB or VSCSIIF_ACT_SCSI_RESET */ unsigned char act; =09 + /* Number of pieces of scatter-gather */ + unsigned int nr_segments; + /* do reset function */ wait_queue_head_t wq_reset; /* reset work queue */ int wait_reset; /* reset work queue condition */ int32_t rslt_reset; /* reset response status */ /* (SUCESS or FAILED) */ =20 - /* for DMA_TO_DEVICE(1), DMA_FROM_DEVICE(2), DMA_NONE(3)=20 - requests */ - unsigned int sc_data_direction; -=09 - /* Number of pieces of scatter-gather */ - unsigned int nr_segments; - /* requested struct scsi_cmnd is stored from kernel */ - unsigned long req_scsi_cmnd; + struct scsi_cmnd *sc; int gref[VSCSIIF_SG_TABLESIZE]; }; =20 --- a/drivers/xen/scsifront/scsifront.c +++ b/drivers/xen/scsifront/scsifront.c @@ -28,8 +28,6 @@ * IN THE SOFTWARE. */ =20 - -#include #include "common.h" =20 static int get_id_from_freelist(struct vscsifrnt_info *info) @@ -57,8 +55,8 @@ static void add_id_to_freelist(struct vs =20 spin_lock_irqsave(&info->shadow_lock, flags); =20 - info->shadow[id].next_free =3D info->shadow_free; - info->shadow[id].req_scsi_cmnd =3D 0; + info->shadow[id].next_free =3D info->shadow_free; + info->shadow[id].sc =3D NULL; info->shadow_free =3D id; =20 spin_unlock_irqrestore(&info->shadow_lock, flags); @@ -111,7 +109,7 @@ static void scsifront_gnttab_done(struct { int i; =20 - if (s->sc_data_direction =3D=3D DMA_NONE) + if (s->sc->sc_data_direction =3D=3D DMA_NONE) return; =20 if (s->nr_segments) { @@ -138,7 +136,7 @@ static void scsifront_cdb_cmd_done(struc uint8_t sense_len; =20 id =3D ring_res->rqid; - sc =3D (struct scsi_cmnd *)info->shadow[id].req_scsi_cmnd; + sc =3D info->shadow[id].sc; =20 if (sc =3D=3D NULL) BUG(); @@ -252,7 +250,7 @@ static int map_data_for_request(struct v unsigned long buffer_pfn; unsigned int data_len =3D 0; =20 - if (sc->sc_data_direction =3D=3D DMA_NONE) + if (sc->sc_data_direction =3D=3D DMA_NONE || !sc->request_bufflen) return 0; =20 err =3D gnttab_alloc_grant_references(VSCSIIF_SG_TABLESIZE, = &gref_head); @@ -300,7 +298,7 @@ static int map_data_for_request(struct v ref_cnt++; } } - } else if (sc->request_bufflen) { + } else { unsigned long end =3D ((unsigned long)sc->request_buffer + sc->request_bufflen + PAGE_SIZE = - 1) >> PAGE_SHIFT; unsigned long start =3D (unsigned long)sc->request_buffer = >> PAGE_SHIFT; @@ -388,9 +386,8 @@ static int scsifront_queuecommand(struct ring_req->sc_data_direction =3D (uint8_t)sc->sc_data_direction; ring_req->timeout_per_command =3D (sc->timeout_per_command / HZ); =20 - info->shadow[rqid].req_scsi_cmnd =3D (unsigned long)sc; - info->shadow[rqid].sc_data_direction =3D sc->sc_data_direction; - info->shadow[rqid].act =3D ring_req->act; + info->shadow[rqid].sc =3D sc; + info->shadow[rqid].act =3D VSCSIIF_ACT_SCSI_CDB; =20 ref_cnt =3D map_data_for_request(info, sc, ring_req, rqid); if (ref_cnt < 0) { --- a/drivers/xen/scsifront/xenbus.c +++ b/drivers/xen/scsifront/xenbus.c @@ -33,7 +33,6 @@ * 2010, Samuel Kvasnica, IMS Nanofabrication AG */ =20 -#include #include "common.h" =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) --=__Part8FBE714B.0__= Content-Type: text/plain; name="xen-scsifront-cleanup.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-scsifront-cleanup.patch" scsifront: cleanup=0A=0A- properly type the shadow field tracking the = active command=0A- as a result, there's no need to also track the data = direction=0A- in turn, re-arranging shadow fields reduces the size of the = structure=0A on 64-bit architectures=0A- there's no point in map_data_for_= request() failing if there are no=0A grant references available when none = are needed anyway=0A- don't redundantly include linux/version.h=0A=0A--- = a/drivers/xen/scsifront/common.h=0A+++ b/drivers/xen/scsifront/common.h=0A@= @ -80,21 +80,17 @@ struct vscsifrnt_shadow {=0A * VSCSIIF_ACT_SCSI= _CDB or VSCSIIF_ACT_SCSI_RESET */=0A unsigned char act;=0A =0A+ /* = Number of pieces of scatter-gather */=0A+ unsigned int nr_segments;= =0A+=0A /* do reset function */=0A wait_queue_head_t = wq_reset; /* reset work queue */=0A int wait_reset; = /* reset work queue condition */=0A int32_t rslt_reset; = /* reset response status */=0A /* = (SUCESS or FAILED) */=0A =0A- /* for DMA_TO_DEVICE(1), DMA_FROM_D= EVICE(2), DMA_NONE(3) =0A- requests */=0A- unsigned int = sc_data_direction;=0A- =0A- /* Number of pieces of scatter-gather = */=0A- unsigned int nr_segments;=0A-=0A /* requested struct = scsi_cmnd is stored from kernel */=0A- unsigned long req_scsi_cmnd;=0A+ = struct scsi_cmnd *sc;=0A int gref[VSCSIIF_SG_TABLESIZE];=0A };=0A = =0A--- a/drivers/xen/scsifront/scsifront.c=0A+++ b/drivers/xen/scsifront/sc= sifront.c=0A@@ -28,8 +28,6 @@=0A * IN THE SOFTWARE.=0A */=0A =0A-=0A-#in= clude =0A #include "common.h"=0A =0A static int get_id_fro= m_freelist(struct vscsifrnt_info *info)=0A@@ -57,8 +55,8 @@ static void = add_id_to_freelist(struct vs=0A =0A spin_lock_irqsave(&info->shadow_loc= k, flags);=0A =0A- info->shadow[id].next_free =3D info->shadow_free;= =0A- info->shadow[id].req_scsi_cmnd =3D 0;=0A+ info->shadow[id].ne= xt_free =3D info->shadow_free;=0A+ info->shadow[id].sc =3D NULL;=0A = info->shadow_free =3D id;=0A =0A spin_unlock_irqrestore(&info->shado= w_lock, flags);=0A@@ -111,7 +109,7 @@ static void scsifront_gnttab_done(str= uct=0A {=0A int i;=0A =0A- if (s->sc_data_direction =3D=3D = DMA_NONE)=0A+ if (s->sc->sc_data_direction =3D=3D DMA_NONE)=0A = return;=0A =0A if (s->nr_segments) {=0A@@ -138,7 +136,7 @@ static void = scsifront_cdb_cmd_done(struc=0A uint8_t sense_len;=0A =0A id = =3D ring_res->rqid;=0A- sc =3D (struct scsi_cmnd *)info->shadow[id].req_scs= i_cmnd;=0A+ sc =3D info->shadow[id].sc;=0A =0A if (sc =3D=3D = NULL)=0A BUG();=0A@@ -252,7 +250,7 @@ static int map_data_fo= r_request(struct v=0A unsigned long buffer_pfn;=0A unsigned int = data_len =3D 0;=0A =0A- if (sc->sc_data_direction =3D=3D DMA_NONE)=0A+ if = (sc->sc_data_direction =3D=3D DMA_NONE || !sc->request_bufflen)=0A = return 0;=0A =0A err =3D gnttab_alloc_grant_references(VSCSIIF_SG_TA= BLESIZE, &gref_head);=0A@@ -300,7 +298,7 @@ static int map_data_for_request= (struct v=0A ref_cnt++;=0A = }=0A }=0A- } else if (sc->request_bufflen) {=0A+ } else = {=0A unsigned long end =3D ((unsigned long)sc->request_buffer= =0A + sc->request_bufflen + PAGE_SIZE = - 1) >> PAGE_SHIFT;=0A unsigned long start =3D (unsigned = long)sc->request_buffer >> PAGE_SHIFT;=0A@@ -388,9 +386,8 @@ static int = scsifront_queuecommand(struct=0A ring_req->sc_data_direction =3D = (uint8_t)sc->sc_data_direction;=0A ring_req->timeout_per_command =3D = (sc->timeout_per_command / HZ);=0A =0A- info->shadow[rqid].req_scsi_cmnd = =3D (unsigned long)sc;=0A- info->shadow[rqid].sc_data_direction =3D = sc->sc_data_direction;=0A- info->shadow[rqid].act =3D = ring_req->act;=0A+ info->shadow[rqid].sc =3D sc;=0A+ info->shado= w[rqid].act =3D VSCSIIF_ACT_SCSI_CDB;=0A =0A ref_cnt =3D map_data_for_re= quest(info, sc, ring_req, rqid);=0A if (ref_cnt < 0) {=0A--- a/drivers/= xen/scsifront/xenbus.c=0A+++ b/drivers/xen/scsifront/xenbus.c=0A@@ -33,7 = +33,6 @@=0A * 2010, Samuel Kvasnica, IMS Nanofabrication AG=0A */=0A = =0A-#include =0A #include "common.h"=0A =0A #if LINUX_VERS= ION_CODE < KERNEL_VERSION(2,6,11)=0A --=__Part8FBE714B.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part8FBE714B.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 14 09:08:13 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 09:08:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYYwh-0002CT-O5; Wed, 14 Nov 2012 09:07:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYYwg-0002CM-8p for xen-devel@lists.xen.org; Wed, 14 Nov 2012 09:07:42 +0000 Received: from [85.158.143.35:9241] by server-1.bemta-4.messagelabs.com id AF/00-27934-D5F53A05; Wed, 14 Nov 2012 09:07:41 +0000 X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1352884060!7229399!1 X-Originating-IP: [130.57.49.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3680 invoked from network); 14 Nov 2012 09:07:40 -0000 Received: from nat28.tlf.novell.com (HELO nat28.tlf.novell.com) (130.57.49.28) by server-9.tower-21.messagelabs.com with SMTP; 14 Nov 2012 09:07:40 -0000 Received: from EMEA1-MTA by nat28.tlf.novell.com with Novell_GroupWise; Wed, 14 Nov 2012 09:07:39 +0000 Message-Id: <50A36D6B02000078000A8676@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 12.0.0 Date: Wed, 14 Nov 2012 09:07:39 +0000 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part8FBE714B.0__=" Subject: [Xen-devel] [PATCH] linux-2.6.18/scsifront: cleanup X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part8FBE714B.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline - properly type the shadow field tracking the active command - as a result, there's no need to also track the data direction - in turn, re-arranging shadow fields reduces the size of the structure on 64-bit architectures - there's no point in map_data_for_request() failing if there are no grant references available when none are needed anyway - don't redundantly include linux/version.h --- a/drivers/xen/scsifront/common.h +++ b/drivers/xen/scsifront/common.h @@ -80,21 +80,17 @@ struct vscsifrnt_shadow { * VSCSIIF_ACT_SCSI_CDB or VSCSIIF_ACT_SCSI_RESET */ unsigned char act; =09 + /* Number of pieces of scatter-gather */ + unsigned int nr_segments; + /* do reset function */ wait_queue_head_t wq_reset; /* reset work queue */ int wait_reset; /* reset work queue condition */ int32_t rslt_reset; /* reset response status */ /* (SUCESS or FAILED) */ =20 - /* for DMA_TO_DEVICE(1), DMA_FROM_DEVICE(2), DMA_NONE(3)=20 - requests */ - unsigned int sc_data_direction; -=09 - /* Number of pieces of scatter-gather */ - unsigned int nr_segments; - /* requested struct scsi_cmnd is stored from kernel */ - unsigned long req_scsi_cmnd; + struct scsi_cmnd *sc; int gref[VSCSIIF_SG_TABLESIZE]; }; =20 --- a/drivers/xen/scsifront/scsifront.c +++ b/drivers/xen/scsifront/scsifront.c @@ -28,8 +28,6 @@ * IN THE SOFTWARE. */ =20 - -#include #include "common.h" =20 static int get_id_from_freelist(struct vscsifrnt_info *info) @@ -57,8 +55,8 @@ static void add_id_to_freelist(struct vs =20 spin_lock_irqsave(&info->shadow_lock, flags); =20 - info->shadow[id].next_free =3D info->shadow_free; - info->shadow[id].req_scsi_cmnd =3D 0; + info->shadow[id].next_free =3D info->shadow_free; + info->shadow[id].sc =3D NULL; info->shadow_free =3D id; =20 spin_unlock_irqrestore(&info->shadow_lock, flags); @@ -111,7 +109,7 @@ static void scsifront_gnttab_done(struct { int i; =20 - if (s->sc_data_direction =3D=3D DMA_NONE) + if (s->sc->sc_data_direction =3D=3D DMA_NONE) return; =20 if (s->nr_segments) { @@ -138,7 +136,7 @@ static void scsifront_cdb_cmd_done(struc uint8_t sense_len; =20 id =3D ring_res->rqid; - sc =3D (struct scsi_cmnd *)info->shadow[id].req_scsi_cmnd; + sc =3D info->shadow[id].sc; =20 if (sc =3D=3D NULL) BUG(); @@ -252,7 +250,7 @@ static int map_data_for_request(struct v unsigned long buffer_pfn; unsigned int data_len =3D 0; =20 - if (sc->sc_data_direction =3D=3D DMA_NONE) + if (sc->sc_data_direction =3D=3D DMA_NONE || !sc->request_bufflen) return 0; =20 err =3D gnttab_alloc_grant_references(VSCSIIF_SG_TABLESIZE, = &gref_head); @@ -300,7 +298,7 @@ static int map_data_for_request(struct v ref_cnt++; } } - } else if (sc->request_bufflen) { + } else { unsigned long end =3D ((unsigned long)sc->request_buffer + sc->request_bufflen + PAGE_SIZE = - 1) >> PAGE_SHIFT; unsigned long start =3D (unsigned long)sc->request_buffer = >> PAGE_SHIFT; @@ -388,9 +386,8 @@ static int scsifront_queuecommand(struct ring_req->sc_data_direction =3D (uint8_t)sc->sc_data_direction; ring_req->timeout_per_command =3D (sc->timeout_per_command / HZ); =20 - info->shadow[rqid].req_scsi_cmnd =3D (unsigned long)sc; - info->shadow[rqid].sc_data_direction =3D sc->sc_data_direction; - info->shadow[rqid].act =3D ring_req->act; + info->shadow[rqid].sc =3D sc; + info->shadow[rqid].act =3D VSCSIIF_ACT_SCSI_CDB; =20 ref_cnt =3D map_data_for_request(info, sc, ring_req, rqid); if (ref_cnt < 0) { --- a/drivers/xen/scsifront/xenbus.c +++ b/drivers/xen/scsifront/xenbus.c @@ -33,7 +33,6 @@ * 2010, Samuel Kvasnica, IMS Nanofabrication AG */ =20 -#include #include "common.h" =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) --=__Part8FBE714B.0__= Content-Type: text/plain; name="xen-scsifront-cleanup.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-scsifront-cleanup.patch" scsifront: cleanup=0A=0A- properly type the shadow field tracking the = active command=0A- as a result, there's no need to also track the data = direction=0A- in turn, re-arranging shadow fields reduces the size of the = structure=0A on 64-bit architectures=0A- there's no point in map_data_for_= request() failing if there are no=0A grant references available when none = are needed anyway=0A- don't redundantly include linux/version.h=0A=0A--- = a/drivers/xen/scsifront/common.h=0A+++ b/drivers/xen/scsifront/common.h=0A@= @ -80,21 +80,17 @@ struct vscsifrnt_shadow {=0A * VSCSIIF_ACT_SCSI= _CDB or VSCSIIF_ACT_SCSI_RESET */=0A unsigned char act;=0A =0A+ /* = Number of pieces of scatter-gather */=0A+ unsigned int nr_segments;= =0A+=0A /* do reset function */=0A wait_queue_head_t = wq_reset; /* reset work queue */=0A int wait_reset; = /* reset work queue condition */=0A int32_t rslt_reset; = /* reset response status */=0A /* = (SUCESS or FAILED) */=0A =0A- /* for DMA_TO_DEVICE(1), DMA_FROM_D= EVICE(2), DMA_NONE(3) =0A- requests */=0A- unsigned int = sc_data_direction;=0A- =0A- /* Number of pieces of scatter-gather = */=0A- unsigned int nr_segments;=0A-=0A /* requested struct = scsi_cmnd is stored from kernel */=0A- unsigned long req_scsi_cmnd;=0A+ = struct scsi_cmnd *sc;=0A int gref[VSCSIIF_SG_TABLESIZE];=0A };=0A = =0A--- a/drivers/xen/scsifront/scsifront.c=0A+++ b/drivers/xen/scsifront/sc= sifront.c=0A@@ -28,8 +28,6 @@=0A * IN THE SOFTWARE.=0A */=0A =0A-=0A-#in= clude =0A #include "common.h"=0A =0A static int get_id_fro= m_freelist(struct vscsifrnt_info *info)=0A@@ -57,8 +55,8 @@ static void = add_id_to_freelist(struct vs=0A =0A spin_lock_irqsave(&info->shadow_loc= k, flags);=0A =0A- info->shadow[id].next_free =3D info->shadow_free;= =0A- info->shadow[id].req_scsi_cmnd =3D 0;=0A+ info->shadow[id].ne= xt_free =3D info->shadow_free;=0A+ info->shadow[id].sc =3D NULL;=0A = info->shadow_free =3D id;=0A =0A spin_unlock_irqrestore(&info->shado= w_lock, flags);=0A@@ -111,7 +109,7 @@ static void scsifront_gnttab_done(str= uct=0A {=0A int i;=0A =0A- if (s->sc_data_direction =3D=3D = DMA_NONE)=0A+ if (s->sc->sc_data_direction =3D=3D DMA_NONE)=0A = return;=0A =0A if (s->nr_segments) {=0A@@ -138,7 +136,7 @@ static void = scsifront_cdb_cmd_done(struc=0A uint8_t sense_len;=0A =0A id = =3D ring_res->rqid;=0A- sc =3D (struct scsi_cmnd *)info->shadow[id].req_scs= i_cmnd;=0A+ sc =3D info->shadow[id].sc;=0A =0A if (sc =3D=3D = NULL)=0A BUG();=0A@@ -252,7 +250,7 @@ static int map_data_fo= r_request(struct v=0A unsigned long buffer_pfn;=0A unsigned int = data_len =3D 0;=0A =0A- if (sc->sc_data_direction =3D=3D DMA_NONE)=0A+ if = (sc->sc_data_direction =3D=3D DMA_NONE || !sc->request_bufflen)=0A = return 0;=0A =0A err =3D gnttab_alloc_grant_references(VSCSIIF_SG_TA= BLESIZE, &gref_head);=0A@@ -300,7 +298,7 @@ static int map_data_for_request= (struct v=0A ref_cnt++;=0A = }=0A }=0A- } else if (sc->request_bufflen) {=0A+ } else = {=0A unsigned long end =3D ((unsigned long)sc->request_buffer= =0A + sc->request_bufflen + PAGE_SIZE = - 1) >> PAGE_SHIFT;=0A unsigned long start =3D (unsigned = long)sc->request_buffer >> PAGE_SHIFT;=0A@@ -388,9 +386,8 @@ static int = scsifront_queuecommand(struct=0A ring_req->sc_data_direction =3D = (uint8_t)sc->sc_data_direction;=0A ring_req->timeout_per_command =3D = (sc->timeout_per_command / HZ);=0A =0A- info->shadow[rqid].req_scsi_cmnd = =3D (unsigned long)sc;=0A- info->shadow[rqid].sc_data_direction =3D = sc->sc_data_direction;=0A- info->shadow[rqid].act =3D = ring_req->act;=0A+ info->shadow[rqid].sc =3D sc;=0A+ info->shado= w[rqid].act =3D VSCSIIF_ACT_SCSI_CDB;=0A =0A ref_cnt =3D map_data_for_re= quest(info, sc, ring_req, rqid);=0A if (ref_cnt < 0) {=0A--- a/drivers/= xen/scsifront/xenbus.c=0A+++ b/drivers/xen/scsifront/xenbus.c=0A@@ -33,7 = +33,6 @@=0A * 2010, Samuel Kvasnica, IMS Nanofabrication AG=0A */=0A = =0A-#include =0A #include "common.h"=0A =0A #if LINUX_VERS= ION_CODE < KERNEL_VERSION(2,6,11)=0A --=__Part8FBE714B.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__Part8FBE714B.0__=-- From xen-devel-bounces@lists.xen.org Wed Nov 14 09:58:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 09:58:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZjv-0003Z7-29; Wed, 14 Nov 2012 09:58:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZjt-0003Z2-VR for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 09:58:34 +0000 Received: from [193.109.254.147:12287] by server-13.bemta-14.messagelabs.com id 0D/0F-11239-94B63A05; Wed, 14 Nov 2012 09:58:33 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352887112!8231166!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg1MTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31984 invoked from network); 14 Nov 2012 09:58:32 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 09:58:32 -0000 X-IronPort-AV: E=Sophos;i="4.83,249,1352073600"; d="scan'208";a="15796367" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 09:58:32 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 09:58:31 +0000 Message-ID: <1352887110.26873.15.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Mukesh Rathor Date: Wed, 14 Nov 2012 09:58:30 +0000 In-Reply-To: <20121113173138.61b21067@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> <20121113172138.1d3274d9@mantra.us.oracle.com> <20121113173138.61b21067@mantra.us.oracle.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-14 at 01:31 +0000, Mukesh Rathor wrote: > On Tue, 13 Nov 2012 17:21:38 -0800 > Mukesh Rathor wrote: > > > > > > > I can't tell why f_active is there. I also see supported, may be thats > > the string of what the kernel supports. It is set to 0x11 ??? > > Debugging further, I see in xc_dom_parse_elf_kernel() after > elf_parse_binary(), the strings are set as: > > type = XEN_ENT_STR, name = 0x3cadc2e116 "PAE_MODE", data = { > str = 0x7ffff61e14b0 "yes", num = 0x7ffff61e14b0}}, { > type = XEN_ENT_STR, name = 0x3cadc2dd2d "FEATURES", data = { > str = 0x7ffff61e1414 "!writable_page_tables|pae_pgdir_above_4gb", > num = 0x7ffff61e1414}}, {type = XEN_ENT_NONE, name = 0x0, data = { > str = 0x0, num = 0x0}}, {type = XEN_ENT_LONG, > > So, may be it's not properly set in bzImage and something else needs to > be done to get the correct strings there??? bzImage is a container for the ELF file, possibly things don't get parsed early enough by xc_dom in this case? Did you say that if you use the raw ELF file it works? I think in the default case you don't need to touch libxl here (yet), you need libxc to do the correct thing. Do you need to know if this is a PV vs PVH domain at XEN_DOMCTL_createdomain (aka xc_domain_create) time or can it be set later? My suspicion is that when the domain is created the kernel hasn't been parsed yet so the feature flags are not available. This would be easier to deal with if the PVH selection could be moved later on to the point where you are actually building the domain -- but I don't know how hard that would be. When I prototyped this stuff years ago I added XEN_DOMCTL_setfeatures which was called from xc_dom_parse_image: @@ -668,8 +669,26 @@ int xc_dom_parse_image(struct xc_dom_ima /* check features */ for ( i = 0; i < XENFEAT_NR_SUBMAPS; i++ ) { - dom->f_active[i] |= dom->f_requested[i]; /* cmd line */ - dom->f_active[i] |= dom->parms.f_required[i]; /* kernel */ + domctl.cmd = XEN_DOMCTL_setfeatures; + domctl.domain = dom->guest_domid; + + domctl.u.setfeatures.submap_idx = i; + domctl.u.setfeatures.submap = 0; + + domctl.u.setfeatures.submap |= dom->f_requested[i]; /* cmd line */ + domctl.u.setfeatures.submap |= dom->parms.f_required[i]; /* kernel */ + + xc_dom_printf(dom->xch, "requesting features[%d] = %#x", domctl.u.setfeatures.submap_idx, domctl.u.setfeatures.submap); + if (do_domctl(dom->xch, &domctl)) + { + xc_dom_panic(dom->xch, XC_INVALID_PARAM, + "%s: unable to set requested features\n", __FUNCTION__); + goto err; + } + + xc_dom_printf(dom->xch, "received features[%d] = %#x", domctl.u.setfeatures.submap_idx, domctl.u.setfeatures.submap); + dom->f_active[i] = domctl.u.setfeatures.submap; + if ( (dom->f_active[i] & dom->parms.f_supported[i]) != dom->f_active[i] ) { On the hypervisor side setting the features would enable "PVH" mode as appropriate. You only need to worry about libxl integration to allow the user to override these defaults, but shall we worry about that later once we have libxc sorted? BTW for the purposes of parallelising things up you could post the hypervisor side part of the series stuff + a patch to force enable PVH in libxc (obviously the last not to be applied) first then we can be reviewing the h/v side things while simultaneously figuring out how the tools side fits together. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 09:58:58 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 09:58:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZjv-0003Z7-29; Wed, 14 Nov 2012 09:58:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZjt-0003Z2-VR for Xen-devel@lists.xensource.com; Wed, 14 Nov 2012 09:58:34 +0000 Received: from [193.109.254.147:12287] by server-13.bemta-14.messagelabs.com id 0D/0F-11239-94B63A05; Wed, 14 Nov 2012 09:58:33 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1352887112!8231166!1 X-Originating-IP: [62.200.22.115] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjIuMjAwLjIyLjExNSA9PiAxMTg1MTc=\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31984 invoked from network); 14 Nov 2012 09:58:32 -0000 Received: from smtp.eu.citrix.com (HELO SMTP.EU.CITRIX.COM) (62.200.22.115) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 14 Nov 2012 09:58:32 -0000 X-IronPort-AV: E=Sophos;i="4.83,249,1352073600"; d="scan'208";a="15796367" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 14 Nov 2012 09:58:32 +0000 Received: from [10.80.2.42] (10.80.2.42) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.279.1; Wed, 14 Nov 2012 09:58:31 +0000 Message-ID: <1352887110.26873.15.camel@zakaz.uk.xensource.com> From: Ian Campbell To: Mukesh Rathor Date: Wed, 14 Nov 2012 09:58:30 +0000 In-Reply-To: <20121113173138.61b21067@mantra.us.oracle.com> References: <20121112190934.5e702799@mantra.us.oracle.com> <1352800853.7491.22.camel@zakaz.uk.xensource.com> <20121113172138.1d3274d9@mantra.us.oracle.com> <20121113173138.61b21067@mantra.us.oracle.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.3-1 MIME-Version: 1.0 Cc: "Xen-devel@lists.xensource.com" Subject: Re: [Xen-devel] PVH: libxl expertise... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org On Wed, 2012-11-14 at 01:31 +0000, Mukesh Rathor wrote: > On Tue, 13 Nov 2012 17:21:38 -0800 > Mukesh Rathor wrote: > > > > > > > I can't tell why f_active is there. I also see supported, may be thats > > the string of what the kernel supports. It is set to 0x11 ??? > > Debugging further, I see in xc_dom_parse_elf_kernel() after > elf_parse_binary(), the strings are set as: > > type = XEN_ENT_STR, name = 0x3cadc2e116 "PAE_MODE", data = { > str = 0x7ffff61e14b0 "yes", num = 0x7ffff61e14b0}}, { > type = XEN_ENT_STR, name = 0x3cadc2dd2d "FEATURES", data = { > str = 0x7ffff61e1414 "!writable_page_tables|pae_pgdir_above_4gb", > num = 0x7ffff61e1414}}, {type = XEN_ENT_NONE, name = 0x0, data = { > str = 0x0, num = 0x0}}, {type = XEN_ENT_LONG, > > So, may be it's not properly set in bzImage and something else needs to > be done to get the correct strings there??? bzImage is a container for the ELF file, possibly things don't get parsed early enough by xc_dom in this case? Did you say that if you use the raw ELF file it works? I think in the default case you don't need to touch libxl here (yet), you need libxc to do the correct thing. Do you need to know if this is a PV vs PVH domain at XEN_DOMCTL_createdomain (aka xc_domain_create) time or can it be set later? My suspicion is that when the domain is created the kernel hasn't been parsed yet so the feature flags are not available. This would be easier to deal with if the PVH selection could be moved later on to the point where you are actually building the domain -- but I don't know how hard that would be. When I prototyped this stuff years ago I added XEN_DOMCTL_setfeatures which was called from xc_dom_parse_image: @@ -668,8 +669,26 @@ int xc_dom_parse_image(struct xc_dom_ima /* check features */ for ( i = 0; i < XENFEAT_NR_SUBMAPS; i++ ) { - dom->f_active[i] |= dom->f_requested[i]; /* cmd line */ - dom->f_active[i] |= dom->parms.f_required[i]; /* kernel */ + domctl.cmd = XEN_DOMCTL_setfeatures; + domctl.domain = dom->guest_domid; + + domctl.u.setfeatures.submap_idx = i; + domctl.u.setfeatures.submap = 0; + + domctl.u.setfeatures.submap |= dom->f_requested[i]; /* cmd line */ + domctl.u.setfeatures.submap |= dom->parms.f_required[i]; /* kernel */ + + xc_dom_printf(dom->xch, "requesting features[%d] = %#x", domctl.u.setfeatures.submap_idx, domctl.u.setfeatures.submap); + if (do_domctl(dom->xch, &domctl)) + { + xc_dom_panic(dom->xch, XC_INVALID_PARAM, + "%s: unable to set requested features\n", __FUNCTION__); + goto err; + } + + xc_dom_printf(dom->xch, "received features[%d] = %#x", domctl.u.setfeatures.submap_idx, domctl.u.setfeatures.submap); + dom->f_active[i] = domctl.u.setfeatures.submap; + if ( (dom->f_active[i] & dom->parms.f_supported[i]) != dom->f_active[i] ) { On the hypervisor side setting the features would enable "PVH" mode as appropriate. You only need to worry about libxl integration to allow the user to override these defaults, but shall we worry about that later once we have libxc sorted? BTW for the purposes of parallelising things up you could post the hypervisor side part of the series stuff + a patch to force enable PVH in libxc (obviously the last not to be applied) first then we can be reviewing the h/v side things while simultaneously figuring out how the tools side fits together. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel From xen-devel-bounces@lists.xen.org Wed Nov 14 10:02:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 14 Nov 2012 10:02:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZn3-0003ll-M2; Wed, 14 Nov 2012 10:01:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1TYZn2-0003lc-C4 for xen-devel@lists.xensource.com; Wed, 14 Nov 2012 10:01:48 +0000 Received: from [85.158.143.99:18012] by server-2.bemta-4.messagelabs.com id 0B/E8-28922-B0C63A05; Wed, 14 Nov 2012 10:01:47 +0000 X-Env-Sender: juergen.gross@ts.fujitsu.com X-Msg-Ref: server-4.tower-216.messagelabs.com!1352887306!24597727!1 X-Originating-IP: [80.70.172.49] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogODAuNzAuMTcyLjQ5ID0+IDI2MzMyMw==\n X-StarScan-Received: X-StarScan-Version: 6.6.1.8; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13031 invoked from network); 14 Nov 2012 10:01:46 -0000 Received: from dgate10.ts.fujitsu.com (HELO dgate10.ts.fujitsu.com) (80.70.172.49) by server-4.tower-216.messagelabs.com with DHE-RSA-AES256-SHA encrypted SMTP; 14 Nov 2012 10:01:46 -0000 DomainKey-Signature: s=s1536a; d=ts.fujitsu.com; c=nofws; q=dns; h=X-SBRSScore:X-IronPort-AV:Received:X-IronPort-AV: Received:Received:Content-Type:MIME-Version:Subject: X-Mercurial-Node:Message-Id:Date:From:To; b=TKTG1aER4GqY+OfGb+AdicvoKVhhnGkMVF9d6tp03wlarTxOoM/xB4D0 DofYEDyqPKA9KX6fnnfGEcAcHzl29T0UDl7LhY8exGTvYo5Rug4mLrLCQ ym76eEfX85WpxPMQOW//LvnuxvwcN8lGfUSjbQnwxROYKVDQk6j3IKUS0 vXLM1iam9y9llP6ABS05VuZtx9wo2DnKHJRk8fn5jOo3NLZOw8iqu3n2A udx3kl0ImG8Tb1yVIxGS7q3ixa0k7; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ts.fujitsu.com; i=@ts.fujitsu.com; q=dns/txt; s=s1536b; t=1352887307; x=1384423307; h=mime-version:subject:message-id:date:from:to; bh=iNvULN/QWy/LrbTjKcgLFM6nd2OK7wAd+5LsnIjFnJc=; b=dlMyKcbuuD0GsWZObPZxEtzTNau3laJlHBfHegq2mAiPguijgqn8jF9k oVhVS5XXlWS2qgID02Mifx7izxh014d0f0oYuXNuYOksOtQJVQ4B0FKrR kdwJsUOx/vZRNuth2hFVmg3F7M8STeYETloCaPPQqzI3XLtaMb+B/DuSk f/SQ5iFqNp7MiANPDNgN4oc4uKwxHYuPhBtQihZo3FKAg0H4l7NRskarQ D/rYM+fjY5NOxVRPs+UcMDag/K/i3; X-SBRSScore: None X-IronPort-AV: E=Sophos;i="4.83,249,1352070000"; d="scan'208,217";a="128193062" Received: from abgdgate40u.abg.fsc.net ([172.25.138.90]) by dgate10u.abg.fsc.net with ESMTP; 14 Nov 2012 11:01:46 +0100 X-IronPort-AV: E=Sophos;i="4.83,248,1352070000"; d="scan'208,217";a="149928049" Received: from sanpedro.mch.fsc.net ([172.17.20.6]) by abgdgate40u.abg.fsc.net with SMTP; 14 Nov 2012 11:01:45 +0100 Received: from [172.17.21.25] (nehalem1.osd.mch.fsc.net [172.17.21.25]) by sanpedro.mch.fsc.net (Postfix) with ESMTP id BAC9976B6A5; Wed, 14 Nov 2012 11:01:45 +0100 (CET) Content-Type: multipart/mixed; boundary="===============6126879887583360703==" MIME-Version: 1.0 X-Mercurial-Node: 7c02a22ef82161c3930f996785b0a2565dba4c56 Message-Id: <7c02a22ef82161c3930f.1352886775@nehalem1> Date: Wed, 14 Nov 2012 10:52:55 +0100 From: Juergen Gross To: xen-devel@lists.xensource.com Subject: [Xen-devel] [PATCH] Support user domain create extensions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org --===============6126879887583360703== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit This patch supports arbitrary extensions to xl create by being able to specify a script which is run at domain creation. The script is specified in the xl config file and will be started at domain creation with following parameters: